Transition to EAPI 2 usedeps

Package-Manager: portage-2.1.6.7/cvs/Linux x86_64

4 files changed, 18 insertions, 40 deletions

diff --git a/x11-terms/eterm/ChangeLog b/x11-terms/eterm/ChangeLog
index 9491fba08bb6..937ff38a67c0 100644
--- a/x11-terms/eterm/ChangeLog
+++ b/x11-terms/eterm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-terms/eterm
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/eterm/ChangeLog,v 1.70 2009/01/24 11:33:15 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/eterm/ChangeLog,v 1.71 2009/03/08 20:08:58 gentoofan23 Exp $
+
+  08 Mar 2009; Thomas Anderson <gentoofan23@gentoo.org> eterm-0.9.5.ebuild,
+  eterm-9999.ebuild:
+  Transition to EAPI 2 usedeps
 
   24 Jan 2009; Alexis Ballier <aballier@gentoo.org> eterm-0.9.5.ebuild:
   there is no stable keyword for bsd...
diff --git a/x11-terms/eterm/Manifest b/x11-terms/eterm/Manifest
index 168ddbea2354..c25cb0e0688e 100644
--- a/x11-terms/eterm/Manifest
+++ b/x11-terms/eterm/Manifest
@@ -1,16 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST Eterm-0.9.5.tar.gz 796872 RMD160 19e006f0fe2bdd6a95818f11b96bb978b9cb6762 SHA1 f2d75354a48734f63f018f7173cebee81f2358c7 SHA256 63ad6e3d89571a72d8302274ebb00d569b8789e24fae038beaee7aa4b8362bd2
 DIST Eterm-bg-0.9.5.tar.gz 1883627 RMD160 acbab70cf5a22f1c45a16f5a8a92ed1e057a59a0 SHA1 26e81a1e91228c971c70ba06e006ef69490ef208 SHA256 8be436c38337557b77bb73d31a65c4dfe21966e84b7d3306e1e28c5c1e809c55
-EBUILD eterm-0.9.5.ebuild 2023 RMD160 74536f57815016756c616325b1996c76b7e6fbb0 SHA1 781cd612539a413846bf89fca24d09ecf82ab47f SHA256 15077c213b3456d033e5fecd94b910df1adb20b7f8e254e643e90c6f6daa74e8
-EBUILD eterm-9999.ebuild 2031 RMD160 b6f783592033ec2a08ccbd6855a45d71dabd4c47 SHA1 6f11ecee93cef907bdb49627c33c3665fa75163a SHA256 63126f1bb2345598936c0d56d769d9bd668ab8c1d8857a692f0684a7af14b00e
-MISC ChangeLog 9912 RMD160 73bde1ee8044b6a2d60a4fbe9c122410e70e4b7c SHA1 837ee449830ea8b15530431cab73d1e6a924e9de SHA256 c1c86e980c185c6d431d5ca40978d669344578d2ea125bf67b892b717dc8738b
+EBUILD eterm-0.9.5.ebuild 1791 RMD160 655b008a46a3bacebe2fafbad4e0bdb2b5c2d3a7 SHA1 c93217c901a7b455e02a0e650ff3ed5a7d2d1a0a SHA256 9a3390ed02feedabb8cff73c00d9f620482a4eb38d934b11335e635d96a39ec9
+EBUILD eterm-9999.ebuild 1800 RMD160 761becdbacb057a02d94d361d9673aae560aecb2 SHA1 ce90da92d5676c0412d8ca5fa88f952708162439 SHA256 18bbd8c5f55259a63ba57347f42b2521daa70ceeaacfbb1b1773d99621f5de38
+MISC ChangeLog 10044 RMD160 0d0e0a2c486b55e8ffd573d58c8caf8a5213293b SHA1 9ebf6e8ef3781552bc16ab818765d8fca809157b SHA256 ae8b8d9a6ee1f5e33aa464257c73e466ad965f76f4996a812a1d256a0cf85cc4
 MISC metadata.xml 726 RMD160 08e40c970e402151e24340dd3ebf92f777368e4d SHA1 e8a34e5c5ba68dbae8972a6a4ed2fcf722547108 SHA256 01d551b07a3fc283d12de89ee96587ac294b98abc24822e63c32e4e049caa3c3
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkl6/IEACgkQvFcC4BYPU0pPzQCgqyiBLZAI0SidAtkWUlMXfEQP
-qzkAoIAb0LK9j3TK7hzLAY5xqjaoQr7C
-=ChoP
------END PGP SIGNATURE-----
diff --git a/x11-terms/eterm/eterm-0.9.5.ebuild b/x11-terms/eterm/eterm-0.9.5.ebuild
index a5bf3a033c2d..55d43bb5de00 100644
--- a/x11-terms/eterm/eterm-0.9.5.ebuild
+++ b/x11-terms/eterm/eterm-0.9.5.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/eterm/eterm-0.9.5.ebuild,v 1.9 2009/01/24 11:33:15 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/eterm/eterm-0.9.5.ebuild,v 1.10 2009/03/08 20:08:58 gentoofan23 Exp $
 
+EAPI="2"
 inherit eutils autotools
 
 MY_P=Eterm-${PV}
@@ -34,7 +35,7 @@ DEPEND="x11-libs/libX11
 	x11-proto/xextproto
 	x11-proto/xproto
 	>=x11-libs/libast-0.6.1
-	media-libs/imlib2
+	media-libs/imlib2[X]
 	escreen? ( app-misc/screen )"
 
 if [[ ${PV} == "9999" ]] ; then
@@ -43,13 +44,6 @@ 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() {
 	if [[ ${PV} == "9999" ]] ; then
 		cvs_src_unpack
@@ -62,7 +56,7 @@ src_unpack() {
 	fi
 }
 
-src_compile() {
+src_configure() {
 	export TIC="true"
 	econf \
 		$(use_enable escreen) \
@@ -72,9 +66,7 @@ src_compile() {
 		$(use_enable sse2) \
 		$(use_enable unicode multi-charset) \
 		--with-delete=execute \
-		--with-backspace=auto \
-		|| die "conf failed"
-	emake || die "make failed"
+		--with-backspace=auto
 }
 
 src_install() {
diff --git a/x11-terms/eterm/eterm-9999.ebuild b/x11-terms/eterm/eterm-9999.ebuild
index 370082a09113..dd9e4d6f6ea7 100644
--- a/x11-terms/eterm/eterm-9999.ebuild
+++ b/x11-terms/eterm/eterm-9999.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2009 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.14 2009/01/10 13:18:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/eterm/eterm-9999.ebuild,v 1.15 2009/03/08 20:08:58 gentoofan23 Exp $
 
+EAPI="2"
 inherit eutils autotools
 
 MY_P=Eterm-${PV}
@@ -34,7 +35,7 @@ DEPEND="x11-libs/libX11
 	x11-proto/xextproto
 	x11-proto/xproto
 	>=x11-libs/libast-0.6.1
-	media-libs/imlib2
+	media-libs/imlib2[X]
 	escreen? ( app-misc/screen )"
 
 if [[ ${PV} == "9999" ]] ; then
@@ -43,13 +44,6 @@ 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() {
 	if [[ ${PV} == "9999" ]] ; then
 		cvs_src_unpack
@@ -62,7 +56,7 @@ src_unpack() {
 	fi
 }
 
-src_compile() {
+src_configure() {
 	export TIC="true"
 	econf \
 		$(use_enable escreen) \
@@ -72,9 +66,7 @@ src_compile() {
 		$(use_enable sse2) \
 		$(use_enable unicode multi-charset) \
 		--with-delete=execute \
-		--with-backspace=auto \
-		|| die "conf failed"
-	emake || die "make failed"
+		--with-backspace=auto
 }
 
 src_install() {