Unify ebuilds and add USE=X check for imlib2 #210653 by Thomas Anderson.

Package-Manager: portage-2.2_pre5

4 files changed, 96 insertions, 35 deletions

diff --git a/x11-terms/eterm/ChangeLog b/x11-terms/eterm/ChangeLog
index 2a2e6dd065d9..6e91a732ba7f 100644
--- a/x11-terms/eterm/ChangeLog
+++ b/x11-terms/eterm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-terms/eterm
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/eterm/ChangeLog,v 1.52 2008/03/31 05:05:56 ricmm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/eterm/ChangeLog,v 1.53 2008/04/08 17:47:42 vapier Exp $
+
+  08 Apr 2008; Mike Frysinger <vapier@gentoo.org> eterm-0.9.4.ebuild,
+  eterm-9999.ebuild:
+  Unify ebuilds and add USE=X check for imlib2 #210653 by Thomas Anderson.
 
   31 Mar 2008; <ricmm@gentoo.org> eterm-0.9.3-r4.ebuild, eterm-0.9.4.ebuild:
   Drop to ~mips due to unstable deps
diff --git a/x11-terms/eterm/Manifest b/x11-terms/eterm/Manifest
index 9b68da30a51f..bbb73f33c6ba 100644
--- a/x11-terms/eterm/Manifest
+++ b/x11-terms/eterm/Manifest
@@ -1,13 +1,16 @@
-AUX eterm-0.9.3-CARD64.patch 767 RMD160 9a02334dd6f0532b5f9fdbfb85be6e770e82615a SHA1 6d0f6d0e953ee40993d08f949b98cef55197e41d SHA256 3d8980217f80415b9bda567b8d055954d4b285222468713bb5f63d7335358ed1
-AUX eterm-0.9.3-deadkeys.patch 4673 RMD160 8983e4ebbe91d34fe97504081ff4549ba3d439f8 SHA1 fdf2bf224b9ac541a2da830a7ce1fcb7dda30399 SHA256 8a56a31c4af7dd1eba131ad6af467af7147baed4dc6169a0d972d4925cae9df9
-AUX eterm-0.9.3-gcc4.patch 570 RMD160 b3a3dd278c4d61de50289485304884ebe5545a3c SHA1 94d954711ec60881faaa35f89283c4d70bd5bb8c SHA256 a4a939d75eae068a300574d06ccd22fd4b3b21dd185b4d593c59cdfa992f16db
-AUX eterm-0.9.3-pixmap-colmod.patch 1004 RMD160 a0dd4959cb5bd2fa957a7a1472052131f18737b0 SHA1 5ae924cebb2abedf0a1ae4f2411e0dec0a6faf03 SHA256 13a86434aba0d9d39835a15ee349d22b63ee0dc3fb1a1006e4a5f1c3be04e368
-DIST Eterm-0.9.3.tar.gz 660767 RMD160 4e9f57807f1658cf8bea90219e296f4184f31452 SHA1 df12cb09676ca265d65b8b5ac61f1ec88d58c692 SHA256 b6ba658ac1e1b1c0705e10bf36bc9a5980eb8f458c18d5e4374c38b01d2ca76a
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST Eterm-0.9.4.tar.gz 814823 RMD160 ce5d7ba74b19e3c8992d104d00f10302c3e8150e SHA1 d63628098b3aa08c8f2bc1bd756683e5fd227995 SHA256 0eaeba125781276fe7300b320cd7c180f41ccd47d4dcbdb214ad89dd3fc5420a
-DIST Eterm-bg-0.9.3.tar.gz 1883627 RMD160 acbab70cf5a22f1c45a16f5a8a92ed1e057a59a0 SHA1 26e81a1e91228c971c70ba06e006ef69490ef208 SHA256 8be436c38337557b77bb73d31a65c4dfe21966e84b7d3306e1e28c5c1e809c55
 DIST Eterm-bg-0.9.4.tar.gz 1883627 RMD160 acbab70cf5a22f1c45a16f5a8a92ed1e057a59a0 SHA1 26e81a1e91228c971c70ba06e006ef69490ef208 SHA256 8be436c38337557b77bb73d31a65c4dfe21966e84b7d3306e1e28c5c1e809c55
-EBUILD eterm-0.9.3-r4.ebuild 1767 RMD160 c1005b2f65742d1c8792e573d5cc2dbadc6153e3 SHA1 be0c42ca211b66bc9f4eee7a5b1474b314d8b676 SHA256 d098fd65dd64c034c4e652a4806e38d101239831cc4fa4152992fe4744fca2d1
-EBUILD eterm-0.9.4.ebuild 1555 RMD160 3b4b884e0db7565ce7b62c7d14bd36328be9bead SHA1 627c13eeeb91e0cc714c7c9a01e7dfdfc3474488 SHA256 3f02776fba3ff2191c463daaba994f1f0c190717b47a989adaebb69d43ef7e1c
-EBUILD eterm-9999.ebuild 1620 RMD160 9b6a103fb1d2f9c1eae96b03af3a920612d3d8de SHA1 92dc9021932a506940f169fcca6130b9c14877f9 SHA256 644718ea8f5e31617d8077a7c293477cba792f67282d0c9847f5925ab969c91a
-MISC ChangeLog 7668 RMD160 8f191b294787247b892ac60c2bd9614883c62bc1 SHA1 a90a61a7963099918db0ad6faa05aea70c125a54 SHA256 806364924d4154bf4d1daaf16307d344d1a865bfe29d27a468179fb5c855d35a
+EBUILD eterm-0.9.4.ebuild 2197 RMD160 ac30155855c345a03132a7cbb2dede7c8c2e7092 SHA1 7bb2c5a268743061fa3e35010c5f92ee6698f4e5 SHA256 3e0043fec87dbd268adcf199b47ec09533e5fa51a8adc4a20b798f732ae62b52
+EBUILD eterm-9999.ebuild 2132 RMD160 3967881806279c44aed8039586f0dad344c76b90 SHA1 49c2a9148cd109cd3f86ec0c34c420917883f8d6 SHA256 366eefe69acaa0b23ece7279c0d411e4f12af97000cdd5e874c04549a6d6674b
+MISC ChangeLog 7836 RMD160 b10b15965b51cf028c849563d0a8b4345db3a5f0 SHA1 0a34a99a97db82112de8d9423e5fde38b01d4a23 SHA256 d320eca40b846bca1da1a45359372033fa858bc23d1e103431f3ac080af12206
 MISC metadata.xml 631 RMD160 dd452ed952bf8af5be6f558ef0180fbf64b49a06 SHA1 0c2dd0db46804766fbde9091354837b125525d9a SHA256 04cc5c3f1f4f78e06665c63d960af3349d1aa80760294b106e098c0b396af871
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFH+6/Ej9hvisErhMIRAsmbAJ43JYBMVQKbi/2Vxj7bOPX1sSkfxQCg3iJc
+h+nXTxeKHrTB4qZtLbu57OY=
+=ZBSZ
+-----END PGP SIGNATURE-----
diff --git a/x11-terms/eterm/eterm-0.9.4.ebuild b/x11-terms/eterm/eterm-0.9.4.ebuild
index dc41ace1048f..9a746ef3ff64 100644
--- a/x11-terms/eterm/eterm-0.9.4.ebuild
+++ b/x11-terms/eterm/eterm-0.9.4.ebuild
@@ -1,16 +1,28 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/eterm/eterm-0.9.4.ebuild,v 1.16 2008/03/31 05:05:56 ricmm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/eterm/eterm-0.9.4.ebuild,v 1.17 2008/04/08 17:47:42 vapier Exp $
 
 inherit eutils
 
 MY_P=Eterm-${PV}
+
+if [[ ${PV} == "9999" ]] ; then
+	#ECVS_SERVER="cvs.sourceforge.net:/cvsroot/enlightenment"
+	ECVS_SERVER="anoncvs.enlightenment.org:/var/cvs/e"
+	ECVS_MODULE="eterm/Eterm"
+	inherit cvs
+fi
+
 DESCRIPTION="A vt102 terminal emulator for X"
 HOMEPAGE="http://www.eterm.org/"
-SRC_URI="http://www.eterm.org/download/${MY_P}.tar.gz
-	!minimal? ( http://www.eterm.org/download/Eterm-bg-${PV}.tar.gz )
-	mirror://sourceforge/eterm/${MY_P}.tar.gz
-	!minimal? ( mirror://sourceforge/eterm/Eterm-bg-${PV}.tar.gz )"
+if [[ ${PV} == "9999" ]] ; then
+	SRC_URI=""
+else
+	SRC_URI="http://www.eterm.org/download/${MY_P}.tar.gz
+		!minimal? ( http://www.eterm.org/download/Eterm-bg-${PV}.tar.gz )
+		mirror://sourceforge/eterm/${MY_P}.tar.gz
+		!minimal? ( mirror://sourceforge/eterm/Eterm-bg-${PV}.tar.gz )"
+fi
 
 LICENSE="BSD"
 SLOT="0"
@@ -29,12 +41,29 @@ DEPEND="x11-libs/libX11
 	etwin? ( app-misc/twin )
 	escreen? ( app-misc/screen )"
 
-S=${WORKDIR}/${MY_P}
+if [[ ${PV} == "9999" ]] ; then
+	S=${WORKDIR}/${ECVS_MODULE}
+else
+	S=${WORKDIR}/${MY_P}
+fi
 
+pkg_setup() {
+	if ! built_with_use media-libs/imlib2 X ; then
+		eerror "media-libs/imlib2 was built without X support."
+		eerror "Please add emerge it with USE=X."
+		die "imlib2 needs USE=X"
+	fi
+}
 src_unpack() {
-	unpack ${MY_P}.tar.gz
-	cd "${S}"
-	use minimal || unpack Eterm-bg-${PV}.tar.gz
+	if [[ ${PV} == "9999" ]] ; then
+		cvs_src_unpack
+		cd "${S}"
+		NOCONFIGURE=yes ./autogen.sh || die "autogen failed"
+	else
+		unpack ${MY_P}.tar.gz
+		cd "${S}"
+		use minimal || unpack Eterm-bg-${PV}.tar.gz
+	fi
 }
 
 src_compile() {
diff --git a/x11-terms/eterm/eterm-9999.ebuild b/x11-terms/eterm/eterm-9999.ebuild
index 982f535a2dcd..3d5dde308f87 100644
--- a/x11-terms/eterm/eterm-9999.ebuild
+++ b/x11-terms/eterm/eterm-9999.ebuild
@@ -1,20 +1,28 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/eterm/eterm-9999.ebuild,v 1.10 2007/07/22 05:44:55 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/eterm/eterm-9999.ebuild,v 1.11 2008/04/08 17:47:42 vapier Exp $
 
-#ECVS_SERVER="cvs.sourceforge.net:/cvsroot/enlightenment"
-ECVS_SERVER="anoncvs.enlightenment.org:/var/cvs/e"
-ECVS_MODULE="eterm/Eterm"
-inherit eutils cvs
+inherit eutils
 
 MY_P=Eterm-${PV}
+
+if [[ ${PV} == "9999" ]] ; then
+	#ECVS_SERVER="cvs.sourceforge.net:/cvsroot/enlightenment"
+	ECVS_SERVER="anoncvs.enlightenment.org:/var/cvs/e"
+	ECVS_MODULE="eterm/Eterm"
+	inherit cvs
+fi
+
 DESCRIPTION="A vt102 terminal emulator for X"
 HOMEPAGE="http://www.eterm.org/"
-SRC_URI=""
-#http://www.eterm.org/download/${MY_P}.tar.gz
-#	http://www.eterm.org/download/Eterm-bg-${PV}.tar.gz
-#	mirror://sourceforge/eterm/${MY_P}.tar.gz
-#	mirror://sourceforge/eterm/Eterm-bg-${PV}.tar.gz"
+if [[ ${PV} == "9999" ]] ; then
+	SRC_URI=""
+else
+	SRC_URI="http://www.eterm.org/download/${MY_P}.tar.gz
+		!minimal? ( http://www.eterm.org/download/Eterm-bg-${PV}.tar.gz )
+		mirror://sourceforge/eterm/${MY_P}.tar.gz
+		!minimal? ( mirror://sourceforge/eterm/Eterm-bg-${PV}.tar.gz )"
+fi
 
 LICENSE="BSD"
 SLOT="0"
@@ -33,12 +41,29 @@ DEPEND="x11-libs/libX11
 	etwin? ( app-misc/twin )
 	escreen? ( app-misc/screen )"
 
-S=${WORKDIR}/${ECVS_MODULE}
+if [[ ${PV} == "9999" ]] ; then
+	S=${WORKDIR}/${ECVS_MODULE}
+else
+	S=${WORKDIR}/${MY_P}
+fi
 
+pkg_setup() {
+	if ! built_with_use media-libs/imlib2 X ; then
+		eerror "media-libs/imlib2 was built without X support."
+		eerror "Please add emerge it with USE=X."
+		die "imlib2 needs USE=X"
+	fi
+}
 src_unpack() {
-	cvs_src_unpack
-	cd "${S}"
-	NOCONFIGURE=yes ./autogen.sh || die "autogen failed"
+	if [[ ${PV} == "9999" ]] ; then
+		cvs_src_unpack
+		cd "${S}"
+		NOCONFIGURE=yes ./autogen.sh || die "autogen failed"
+	else
+		unpack ${MY_P}.tar.gz
+		cd "${S}"
+		use minimal || unpack Eterm-bg-${PV}.tar.gz
+	fi
 }
 
 src_compile() {