Transition to EAPI 2 usedeps

(Portage version: 2.1.6.7/cvs/Linux x86_64)

4 files changed, 22 insertions, 32 deletions

diff --git a/x11-wm/enlightenment/ChangeLog b/x11-wm/enlightenment/ChangeLog
index 329b20f85ed8..f3f31b881300 100644
--- a/x11-wm/enlightenment/ChangeLog
+++ b/x11-wm/enlightenment/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-wm/enlightenment
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/enlightenment/ChangeLog,v 1.108 2009/02/21 07:08:09 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/enlightenment/ChangeLog,v 1.109 2009/03/08 19:34:16 gentoofan23 Exp $
+
+  08 Mar 2009; Thomas Anderson <gentoofan23@gentoo.org>
+  enlightenment-0.16.8.14.ebuild, enlightenment-0.16.8.15.ebuild,
+  enlightenment-0.16.9999.ebuild:
+  Transition to EAPI 2 usedeps
 
   21 Feb 2009; Mike Frysinger <vapier@gentoo.org> -files/e16,
   enlightenment-0.16.8.14.ebuild, enlightenment-0.16.8.15.ebuild,
diff --git a/x11-wm/enlightenment/enlightenment-0.16.8.14.ebuild b/x11-wm/enlightenment/enlightenment-0.16.8.14.ebuild
index cf2507b8c1ed..36673cd43777 100644
--- a/x11-wm/enlightenment/enlightenment-0.16.8.14.ebuild
+++ b/x11-wm/enlightenment/enlightenment-0.16.8.14.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-wm/enlightenment/enlightenment-0.16.8.14.ebuild,v 1.10 2009/02/21 07:08:09 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/enlightenment/enlightenment-0.16.8.14.ebuild,v 1.11 2009/03/08 19:34:16 gentoofan23 Exp $
 
+EAPI="2"
 inherit eutils
 
 DESCRIPTION="Enlightenment Window Manager"
@@ -15,8 +16,8 @@ IUSE="doc esd nls xcomposite xinerama xrandr"
 
 RDEPEND="esd? ( >=media-sound/esound-0.2.19 )
 	=media-libs/freetype-2*
-	>=media-libs/imlib2-1.3.0
-	!<x11-misc/e16keyedit-0.3
+	>=media-libs/imlib2-1.3.0[X]
+	!!<x11-misc/e16keyedit-0.3
 	x11-libs/libSM
 	x11-libs/libICE
 	x11-libs/libX11
@@ -44,11 +45,7 @@ PDEPEND="doc? ( app-doc/edox-data )"
 
 S=${WORKDIR}/e16-${PV/_pre?}
 
-pkg_setup() {
-	built_with_use media-libs/imlib2 X || die "emerge imlib2 with USE=X"
-}
-
-src_compile() {
+src_configure() {
 	econf \
 		$(use_enable nls) \
 		$(use_enable esd sound) \
@@ -59,9 +56,7 @@ src_compile() {
 		--enable-hints-ewmh \
 		--enable-fsstd \
 		--enable-zoom \
-		--with-imlib2 \
-		|| die
-	emake || die
+		--with-imlib2
 }
 
 src_install() {
diff --git a/x11-wm/enlightenment/enlightenment-0.16.8.15.ebuild b/x11-wm/enlightenment/enlightenment-0.16.8.15.ebuild
index 2e3db1c87d12..01e90a40ec50 100644
--- a/x11-wm/enlightenment/enlightenment-0.16.8.15.ebuild
+++ b/x11-wm/enlightenment/enlightenment-0.16.8.15.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-wm/enlightenment/enlightenment-0.16.8.15.ebuild,v 1.3 2009/02/21 07:08:09 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/enlightenment/enlightenment-0.16.8.15.ebuild,v 1.4 2009/03/08 19:34:16 gentoofan23 Exp $
 
+EAPI="2"
 if [[ ${PV} == *9999 ]] ; then
 	ESVN_REPO_URI="http://svn.enlightenment.org/svn/e/trunk/E16/e"
 	inherit subversion
@@ -25,7 +26,7 @@ IUSE="doc dbus esd nls xcomposite xinerama xrandr"
 RDEPEND="esd? ( >=media-sound/esound-0.2.19 )
 	dbus? ( sys-apps/dbus )
 	=media-libs/freetype-2*
-	>=media-libs/imlib2-1.3.0
+	>=media-libs/imlib2-1.3.0[X]
 	x11-libs/libSM
 	x11-libs/libICE
 	x11-libs/libX11
@@ -51,10 +52,6 @@ DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )"
 PDEPEND="doc? ( app-doc/edox-data )"
 
-pkg_setup() {
-	built_with_use media-libs/imlib2 X || die "emerge imlib2 with USE=X"
-}
-
 src_unpack() {
 	if [[ ${PV} == *9999 ]] ; then
 		subversion_src_unpack
@@ -65,7 +62,7 @@ src_unpack() {
 	fi
 }
 
-src_compile() {
+src_configure() {
 	econf \
 		$(use_enable nls) \
 		$(use_enable dbus) \
@@ -77,9 +74,7 @@ src_compile() {
 		--enable-hints-ewmh \
 		--enable-fsstd \
 		--enable-zoom \
-		--with-imlib2 \
-		|| die
-	emake || die
+		--with-imlib2
 }
 
 src_install() {
diff --git a/x11-wm/enlightenment/enlightenment-0.16.9999.ebuild b/x11-wm/enlightenment/enlightenment-0.16.9999.ebuild
index b242170bd4c1..6a8a40cec08b 100644
--- a/x11-wm/enlightenment/enlightenment-0.16.9999.ebuild
+++ b/x11-wm/enlightenment/enlightenment-0.16.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-wm/enlightenment/enlightenment-0.16.9999.ebuild,v 1.32 2009/02/21 07:08:09 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/enlightenment/enlightenment-0.16.9999.ebuild,v 1.33 2009/03/08 19:34:16 gentoofan23 Exp $
 
+EAPI="2"
 if [[ ${PV} == *9999 ]] ; then
 	ESVN_REPO_URI="http://svn.enlightenment.org/svn/e/trunk/E16/e"
 	inherit subversion
@@ -25,7 +26,7 @@ IUSE="doc dbus esd nls xcomposite xinerama xrandr"
 RDEPEND="esd? ( >=media-sound/esound-0.2.19 )
 	dbus? ( sys-apps/dbus )
 	=media-libs/freetype-2*
-	>=media-libs/imlib2-1.3.0
+	>=media-libs/imlib2-1.3.0[X]
 	x11-libs/libSM
 	x11-libs/libICE
 	x11-libs/libX11
@@ -51,10 +52,6 @@ DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )"
 PDEPEND="doc? ( app-doc/edox-data )"
 
-pkg_setup() {
-	built_with_use media-libs/imlib2 X || die "emerge imlib2 with USE=X"
-}
-
 src_unpack() {
 	if [[ ${PV} == *9999 ]] ; then
 		subversion_src_unpack
@@ -65,7 +62,7 @@ src_unpack() {
 	fi
 }
 
-src_compile() {
+src_configure() {
 	econf \
 		$(use_enable nls) \
 		$(use_enable dbus) \
@@ -77,9 +74,7 @@ src_compile() {
 		--enable-hints-ewmh \
 		--enable-fsstd \
 		--enable-zoom \
-		--with-imlib2 \
-		|| die
-	emake || die
+		--with-imlib2
 }
 
 src_install() {