Transition to EAPI 2 usedeps

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

6 files changed, 55 insertions, 77 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/Manifest b/x11-wm/fluxbox/Manifest
index 6002c63edc85..37ebd32983e5 100644
--- a/x11-wm/fluxbox/Manifest
+++ b/x11-wm/fluxbox/Manifest
@@ -11,10 +11,10 @@ AUX styles-menu-user 93 RMD160 2a6831b45ce1d655586b699d16c0547de201d187 SHA1 84a
 DIST fluxbox-1.0.0.tar.bz2 767586 RMD160 320b11a1cf96a757da079886cd6496b9d84ab202 SHA1 7985e35fbb170fda24b9e04610690cd04c7a8748 SHA256 3c27672fdd4709d7f5c7968b4197ef704fce82766f51a5bebf411953516794c5
 DIST fluxbox-1.1.0.1.tar.bz2 778639 RMD160 319158d5c618302a3505db8e58de60bef82ee251 SHA1 70d41a0192b77d2da491221185ce1a7ec4ebda3c SHA256 5876363c6cb13a68be86c193027634ced4333027b4edc23b511346166884f1fc
 DIST fluxbox-1.1.1.tar.bz2 777660 RMD160 aabfdd10c835d0ef903885646a7f34f7df75af17 SHA1 6d49deb6c4c7d73f7567e1cf7d2575c7edc4825f SHA256 903f676a71a301513cd0b3db17e49f88c8d91583793176c4c70358a3012cca34
-EBUILD fluxbox-1.0.0-r2.ebuild 3625 RMD160 1ab68ea1219a00d9e34a708ab097be1b8cfc9180 SHA1 a017665713d1f41241892e16e8e98f01b2fa2d07 SHA256 74c64bac3f707c733f0b02ba21d059ca68320266240e8018742041c459f3fb7d
-EBUILD fluxbox-1.0.0.ebuild 3481 RMD160 a5a5f742bdb561c2e21ef0e71e9bc4669637dbfe SHA1 29ed722fe4ab5824c8a4131ba48891da38cc7307 SHA256 35426d70765380a6acd92f7e6a48a68022bb615ec0e7d3ab3c3b8b576573e0c6
-EBUILD fluxbox-1.1.0.1.ebuild 3425 RMD160 21b1f1cbc62fbc1a837467e9b9ee814389ccc394 SHA1 06500c006c48c6814d3fd1f63517940d064225db SHA256 3da8ced619e7e9129c72cbfaff897e7ddebd6e3ffad496df4bf0f2f95330a09f
-EBUILD fluxbox-1.1.1.ebuild 3423 RMD160 03c21f6a6edc70466a4fd285707f00135b56323a SHA1 3e1f6dcd8bfebe9d4e49a8a41e6d067c1aa36246 SHA256 51081f0a1ac8b80a09b4ff5b0bf5e5ba8fa6d483a7e832bdf08f443451db4114
+EBUILD fluxbox-1.0.0-r2.ebuild 3276 RMD160 841ef4db96203fe011f1df58707f4b3277bc8113 SHA1 2903a80836247319ef209043199419dad14e68f0 SHA256 073d59b4454cdb15cb366bc1db8f1617a28f6de6bdef92360db2ac1a08fd2865
+EBUILD fluxbox-1.0.0.ebuild 3140 RMD160 5aeae8a078a67f9e6db1b9ac5daa70cc87d13bc4 SHA1 2af62fb34ba4ac56868db7f9e594b6ed2ae2f322 SHA256 e53bc5de76018b26269b8a89abd92b7633b13415cbb4d3957cca18bc259ddc4d
+EBUILD fluxbox-1.1.0.1.ebuild 3076 RMD160 0a9e59f20a774f86cacd70c035e05388c6339dd9 SHA1 4281e0cb7110a47206789a35331bd1ae8c4b3bee SHA256 718eaae3cf4f1dd9d03fc21fcebdc292a657761b4f71f7db9211977f16240594
+EBUILD fluxbox-1.1.1.ebuild 3074 RMD160 7fd98e94e9869be16e22307ca50a6e79c98d184e SHA1 416b3318369f4c5b647f3531625e2c4e3d280763 SHA256 e2bd20925400eb67277d8c25add5f26c8230371ab000b385075610966b9dd8d1
 EBUILD fluxbox-9999.ebuild 3123 RMD160 12a8c5b4bb7135046f0fc32caf1bd611c6ca7094 SHA1 33f27d2165a5f8c8da467117ca02834024d749d3 SHA256 af211353b7db6a039c7b371e59cb760a365d1a473ec9cf837f55a128a2f290c1
-MISC ChangeLog 48610 RMD160 a3e8ac6b7fd6cf27a4fa2b25c2ba1b6c4038f0e2 SHA1 52e2685fb357e5cb9f5a68bfb0f2032dca26e0a7 SHA256 5a70d7d6c98e1682d35486bb3c52dd4d3d2aaad5ad39df1a8018c8f5098bd772
+MISC ChangeLog 48802 RMD160 cfa7b23dd24978d2a3f78e23e95a9ccc6a26feb3 SHA1 e501218a4e63b33edb55e5633aba365ea36f3d0a SHA256 caf9028001e47291e6f039a1e654ae6e862505d39034ce132b9e36485f7f5267
 MISC metadata.xml 890 RMD160 c07e8a6d876e730c1608809d2b6294cf1511bbb3 SHA1 dd886d7bba0ff28bcda9f82d356bd1b1d0d183e8 SHA256 47616493ac1ab0f7858e5f7b55b61b3e17ec0cb992ce2a5f3858a47250a3926f
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"