Transition to EAPI 2 usedeps

(Portage version: 2.1.6.7/cvs/Linux x86_64)

5 files changed, 50 insertions, 72 deletions

diff --git a/x11-wm/fluxbox/ChangeLog b/x11-wm/fluxbox/ChangeLog
index c656ed5c2b01..7c396e01cc08 100644
--- a/x11-wm/fluxbox/ChangeLog
+++ b/x11-wm/fluxbox/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-wm/fluxbox
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.262 2009/01/09 15:03:15 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.263 2009/03/08 19:47:56 gentoofan23 Exp $
+
+  08 Mar 2009; Thomas Anderson <gentoofan23@gentoo.org>
+  fluxbox-1.0.0.ebuild, fluxbox-1.0.0-r2.ebuild, fluxbox-1.1.0.1.ebuild,
+  fluxbox-1.1.1.ebuild:
+  Transition to EAPI 2 usedeps
 
   09 Jan 2009; Rémi Cardona <remi@gentoo.org> fluxbox-1.0.0.ebuild,
   fluxbox-1.0.0-r2.ebuild, fluxbox-1.1.0.1.ebuild, fluxbox-1.1.1.ebuild,
diff --git a/x11-wm/fluxbox/fluxbox-1.0.0-r2.ebuild b/x11-wm/fluxbox/fluxbox-1.0.0-r2.ebuild
index 8f8075c5c4f6..cb90fbab2538 100644
--- a/x11-wm/fluxbox/fluxbox-1.0.0-r2.ebuild
+++ b/x11-wm/fluxbox/fluxbox-1.0.0-r2.ebuild
@@ -1,8 +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/fluxbox/fluxbox-1.0.0-r2.ebuild,v 1.8 2009/01/09 15:03:15 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-1.0.0-r2.ebuild,v 1.9 2009/03/08 19:47:56 gentoofan23 Exp $
 
-EAPI=1
+EAPI="2"
 inherit eutils
 
 IUSE="nls xinerama truetype kde gnome +imlib +slit +toolbar vim-syntax"
@@ -23,11 +23,11 @@ RDEPEND="x11-libs/libXpm
 	x11-apps/xmessage
 	x11-libs/libXft
 	truetype? ( media-libs/freetype )
-	imlib? ( >=media-libs/imlib2-1.2.0 )
+	imlib? ( >=media-libs/imlib2-1.2.0[X] )
 	vim-syntax? ( app-vim/fluxbox-syntax )
-	!<x11-themes/fluxbox-styles-fluxmod-20040809-r1
-	!<=x11-misc/fluxconf-0.9.9
-	!<=x11-misc/fbdesk-1.2.1"
+	!!<x11-themes/fluxbox-styles-fluxmod-20040809-r1
+	!!<=x11-misc/fluxconf-0.9.9
+	!!<=x11-misc/fbdesk-1.2.1"
 DEPEND="nls? ( sys-devel/gettext )
 	x11-proto/xextproto
 	xinerama? ( x11-proto/xineramaproto )
@@ -38,15 +38,6 @@ SLOT="0"
 LICENSE="MIT"
 KEYWORDS="alpha amd64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
 
-pkg_setup() {
-	if use imlib && ! built_with_use media-libs/imlib2 X ; then
-			eerror "To build fluxbox with imlib in USE, you need an X enabled"
-			eerror "media-libs/imlib2 . Either recompile imlib2 with the X"
-			eerror "USE flag turned on or disable the imlib USE flag for fluxbox."
-			die "USE=imlib requires imlib2 with USE=X"
-	fi
-}
-
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
@@ -73,7 +64,7 @@ src_unpack() {
 		version.h.in || die "version sed failed"
 }
 
-src_compile() {
+src_configure() {
 	econf \
 		$(use_enable nls) \
 		$(use_enable xinerama) \
@@ -85,9 +76,11 @@ src_compile() {
 		$(use_enable toolbar ) \
 		--sysconfdir=/etc/X11/${PN} \
 		--with-style=/usr/share/fluxbox/styles/Emerge \
-		${myconf} || die "configure failed"
+		${myconf}
+}
 
-	emake || die "make failed"
+src_compile() {
+	default
 
 	ebegin "Creating a menu file (may take a while)"
 	mkdir -p "${T}/home/.fluxbox" || die "mkdir home failed"
diff --git a/x11-wm/fluxbox/fluxbox-1.0.0.ebuild b/x11-wm/fluxbox/fluxbox-1.0.0.ebuild
index 8565eaac10f1..93f218bb094e 100644
--- a/x11-wm/fluxbox/fluxbox-1.0.0.ebuild
+++ b/x11-wm/fluxbox/fluxbox-1.0.0.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/fluxbox/fluxbox-1.0.0.ebuild,v 1.9 2009/01/09 15:03:15 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-1.0.0.ebuild,v 1.10 2009/03/08 19:47:56 gentoofan23 Exp $
 
+EAPI="2"
 inherit eutils
 
 IUSE="nls xinerama truetype kde gnome imlib disableslit disabletoolbar"
@@ -22,10 +23,10 @@ RDEPEND="x11-libs/libXpm
 	x11-apps/xmessage
 	x11-libs/libXft
 	truetype? ( media-libs/freetype )
-	imlib? ( >=media-libs/imlib2-1.2.0 )
-	!<x11-themes/fluxbox-styles-fluxmod-20040809-r1
-	!<=x11-misc/fluxconf-0.9.9
-	!<=x11-misc/fbdesk-1.2.1"
+	imlib? ( >=media-libs/imlib2-1.2.0[X] )
+	!!<x11-themes/fluxbox-styles-fluxmod-20040809-r1
+	!!<=x11-misc/fluxconf-0.9.9
+	!!<=x11-misc/fbdesk-1.2.1"
 DEPEND="nls? ( sys-devel/gettext )
 	x11-proto/xextproto
 	xinerama? ( x11-proto/xineramaproto )
@@ -36,15 +37,6 @@ SLOT="0"
 LICENSE="MIT"
 KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
 
-pkg_setup() {
-	if use imlib && ! built_with_use media-libs/imlib2 X ; then
-			eerror "To build fluxbox with imlib in USE, you need an X enabled"
-			eerror "media-libs/imlib2 . Either recompile imlib2 with the X"
-			eerror "USE flag turned on or disable the imlib USE flag for fluxbox."
-			die "USE=imlib requires imlib2 with USE=X"
-	fi
-}
-
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
@@ -65,7 +57,7 @@ src_unpack() {
 		version.h.in || die "version sed failed"
 }
 
-src_compile() {
+src_configure() {
 	econf \
 		$(use_enable nls) \
 		$(use_enable xinerama) \
@@ -77,9 +69,11 @@ src_compile() {
 		$(use_enable !disabletoolbar toolbar ) \
 		--sysconfdir=/etc/X11/${PN} \
 		--with-style=/usr/share/fluxbox/styles/Emerge \
-		${myconf} || die "configure failed"
+		${myconf}
+}
 
-	emake || die "make failed"
+src_compile() {
+	default
 
 	ebegin "Creating a menu file (may take a while)"
 	mkdir -p "${T}/home/.fluxbox" || die "mkdir home failed"
diff --git a/x11-wm/fluxbox/fluxbox-1.1.0.1.ebuild b/x11-wm/fluxbox/fluxbox-1.1.0.1.ebuild
index a5c987098197..0fedf3e12e05 100644
--- a/x11-wm/fluxbox/fluxbox-1.1.0.1.ebuild
+++ b/x11-wm/fluxbox/fluxbox-1.1.0.1.ebuild
@@ -1,8 +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/fluxbox/fluxbox-1.1.0.1.ebuild,v 1.2 2009/01/09 15:03:15 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-1.1.0.1.ebuild,v 1.3 2009/03/08 19:47:56 gentoofan23 Exp $
 
-EAPI=1
+EAPI="2"
 inherit eutils
 
 IUSE="nls xinerama truetype gnome +imlib +slit +toolbar vim-syntax"
@@ -23,11 +23,11 @@ RDEPEND="x11-libs/libXpm
 	x11-apps/xmessage
 	x11-libs/libXft
 	truetype? ( media-libs/freetype )
-	imlib? ( >=media-libs/imlib2-1.2.0 )
+	imlib? ( >=media-libs/imlib2-1.2.0[X] )
 	vim-syntax? ( app-vim/fluxbox-syntax )
-	!<x11-themes/fluxbox-styles-fluxmod-20040809-r1
-	!<=x11-misc/fluxconf-0.9.9
-	!<=x11-misc/fbdesk-1.2.1"
+	!!<x11-themes/fluxbox-styles-fluxmod-20040809-r1
+	!!<=x11-misc/fluxconf-0.9.9
+	!!<=x11-misc/fbdesk-1.2.1"
 DEPEND="nls? ( sys-devel/gettext )
 	x11-proto/xextproto
 	xinerama? ( x11-proto/xineramaproto )
@@ -38,15 +38,6 @@ SLOT="0"
 LICENSE="MIT"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 
-pkg_setup() {
-	if use imlib && ! built_with_use media-libs/imlib2 X ; then
-			eerror "To build fluxbox with imlib in USE, you need an X enabled"
-			eerror "media-libs/imlib2 . Either recompile imlib2 with the X"
-			eerror "USE flag turned on or disable the imlib USE flag for fluxbox."
-			die "USE=imlib requires imlib2 with USE=X"
-	fi
-}
-
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
@@ -67,7 +58,7 @@ src_unpack() {
 		version.h.in || die "version sed failed"
 }
 
-src_compile() {
+src_configure() {
 	econf \
 		$(use_enable nls) \
 		$(use_enable xinerama) \
@@ -78,9 +69,11 @@ src_compile() {
 		$(use_enable toolbar ) \
 		--sysconfdir=/etc/X11/${PN} \
 		--with-style=/usr/share/fluxbox/styles/Emerge \
-		${myconf} || die "configure failed"
+		${myconf}
+}
 
-	emake || die "make failed"
+src_compile() {
+	default
 
 	ebegin "Creating a menu file (may take a while)"
 	mkdir -p "${T}/home/.fluxbox" || die "mkdir home failed"
diff --git a/x11-wm/fluxbox/fluxbox-1.1.1.ebuild b/x11-wm/fluxbox/fluxbox-1.1.1.ebuild
index db98fc38fcb9..af382f793a77 100644
--- a/x11-wm/fluxbox/fluxbox-1.1.1.ebuild
+++ b/x11-wm/fluxbox/fluxbox-1.1.1.ebuild
@@ -1,8 +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/fluxbox/fluxbox-1.1.1.ebuild,v 1.2 2009/01/09 15:03:15 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-1.1.1.ebuild,v 1.3 2009/03/08 19:47:56 gentoofan23 Exp $
 
-EAPI=1
+EAPI="2"
 inherit eutils
 
 IUSE="nls xinerama truetype gnome +imlib +slit +toolbar vim-syntax"
@@ -23,11 +23,11 @@ RDEPEND="x11-libs/libXpm
 	x11-apps/xmessage
 	x11-libs/libXft
 	truetype? ( media-libs/freetype )
-	imlib? ( >=media-libs/imlib2-1.2.0 )
+	imlib? ( >=media-libs/imlib2-1.2.0[X] )
 	vim-syntax? ( app-vim/fluxbox-syntax )
-	!<x11-themes/fluxbox-styles-fluxmod-20040809-r1
-	!<=x11-misc/fluxconf-0.9.9
-	!<=x11-misc/fbdesk-1.2.1"
+	!!<x11-themes/fluxbox-styles-fluxmod-20040809-r1
+	!!<=x11-misc/fluxconf-0.9.9
+	!!<=x11-misc/fbdesk-1.2.1"
 DEPEND="nls? ( sys-devel/gettext )
 	x11-proto/xextproto
 	xinerama? ( x11-proto/xineramaproto )
@@ -38,15 +38,6 @@ SLOT="0"
 LICENSE="MIT"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 
-pkg_setup() {
-	if use imlib && ! built_with_use media-libs/imlib2 X ; then
-			eerror "To build fluxbox with imlib in USE, you need an X enabled"
-			eerror "media-libs/imlib2 . Either recompile imlib2 with the X"
-			eerror "USE flag turned on or disable the imlib USE flag for fluxbox."
-			die "USE=imlib requires imlib2 with USE=X"
-	fi
-}
-
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
@@ -67,7 +58,7 @@ src_unpack() {
 		version.h.in || die "version sed failed"
 }
 
-src_compile() {
+src_configure() {
 	econf \
 		$(use_enable nls) \
 		$(use_enable xinerama) \
@@ -78,9 +69,11 @@ src_compile() {
 		$(use_enable toolbar ) \
 		--sysconfdir=/etc/X11/${PN} \
 		--with-style=/usr/share/fluxbox/styles/Emerge \
-		${myconf} || die "configure failed"
+		${myconf}
+}
 
-	emake || die "make failed"
+src_compile() {
+	default
 
 	ebegin "Creating a menu file (may take a while)"
 	mkdir -p "${T}/home/.fluxbox" || die "mkdir home failed"