Transition to EAPI 2 usedeps

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

4 files changed, 18 insertions, 30 deletions

diff --git a/x11-wm/openbox/ChangeLog b/x11-wm/openbox/ChangeLog
index c565b22ca0aa..26bb713b5226 100644
--- a/x11-wm/openbox/ChangeLog
+++ b/x11-wm/openbox/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-wm/openbox
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/ChangeLog,v 1.176 2009/01/09 15:18:46 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/ChangeLog,v 1.177 2009/03/08 19:53:05 gentoofan23 Exp $
+
+  08 Mar 2009; Thomas Anderson <gentoofan23@gentoo.org>
+  openbox-3.4.7.2.ebuild, openbox-3.4.8_rc1.ebuild:
+  Transition to EAPI 2 usedeps
 
   09 Jan 2009; Rémi Cardona <remi@gentoo.org> openbox-3.4.7.2.ebuild,
   openbox-3.4.8_rc1.ebuild:
diff --git a/x11-wm/openbox/Manifest b/x11-wm/openbox/Manifest
index ab1593d6711c..8e1bba7b5cc4 100644
--- a/x11-wm/openbox/Manifest
+++ b/x11-wm/openbox/Manifest
@@ -1,6 +1,6 @@
 DIST openbox-3.4.7.2.tar.gz 828190 RMD160 a5ab5f4c3db81625d512da48189e34aeeec244d8 SHA1 f34c3ec43b7e39bf57d64dbef97c35b68fea5254 SHA256 d11f2137a0fe1de6c36c999d29523ad68c05f22c5935ce8628a8cab7a2e4b000
 DIST openbox-3.4.8-rc1.tar.gz 798177 RMD160 9313005f229a57dbf75552e342478df41e51bfcc SHA1 527f8b09fd1c87037be9a65d187b411840fe5f43 SHA256 2e983f219782f4d69e8f6b0f445d0be39b7a8b9001888882e33fffbf3eaf38e8
-EBUILD openbox-3.4.7.2.ebuild 1524 RMD160 e8a4c7bf2ce7e086892d7477956b08748916514f SHA1 8798de89c85c1cff733d611112387422042338de SHA256 1877645bb352ac02115c7e3213bd13a5b062a2952d63146164b892a5c2054e04
-EBUILD openbox-3.4.8_rc1.ebuild 1574 RMD160 701a93eb1c7a8706fcc832827d86a58d6f0952f6 SHA1 57a215e362b95ac0de2bd33eb1fa97d97993f58a SHA256 212c71a047ac78b8340aec1f5d1f511a33e0c9c3e92f446f0f64390a0a416450
-MISC ChangeLog 27619 RMD160 51bf31f7d5ba0d3748d0564118cb42ad3deaacd7 SHA1 995a408ad4a266f9974a7431390262fce80ebc23 SHA256 0d9da574c4cea193cae8ac9b062fd22e212d2b7a6069eb6230721767e29a649e
+EBUILD openbox-3.4.7.2.ebuild 1301 RMD160 0f4b471568264828dbff4b794d8c7035c9f50f37 SHA1 8cfff23acfcd8594d6a7b8bc1072baef82d664fd SHA256 70b56bf86e8475b2a6cdf2d7fb3e234e5010eda3485835b91f362f6e8accc045
+EBUILD openbox-3.4.8_rc1.ebuild 1350 RMD160 690848eb1263319b0d51c6fb48339d4faa482250 SHA1 60ed7146828fe441b9826ca1ded345f760f1132c SHA256 6fbdbd7df23b77f03ac26cee87b73f044e2e836fdecaaff63d194317fec63b43
+MISC ChangeLog 27766 RMD160 90021b85da7c405abd19d44723a4971fdf4130fd SHA1 18d81527a40038afadc926ad1b1b1a5f121388b8 SHA256 b1cc8fd5f08a490f86ed1a6ed4d87dadf34cb726931cf613899565e6be76461c
 MISC metadata.xml 275 RMD160 fb3fd402ffdec971ebe6a0b4cd4e41e6946fa6e7 SHA1 a0325f84c22d02e6d2258bbaa26a3b36e7a3aca6 SHA256 3f69dc00aff67de9cd0277b781a9170bf85b3e7564f5cf053f5ee58dbc73d0cf
diff --git a/x11-wm/openbox/openbox-3.4.7.2.ebuild b/x11-wm/openbox/openbox-3.4.7.2.ebuild
index b2c7b9836e93..c8221198d58e 100644
--- a/x11-wm/openbox/openbox-3.4.7.2.ebuild
+++ b/x11-wm/openbox/openbox-3.4.7.2.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/openbox/openbox-3.4.7.2.ebuild,v 1.9 2009/01/09 15:18:46 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/openbox-3.4.7.2.ebuild,v 1.10 2009/03/08 19:53:05 gentoofan23 Exp $
 
+EAPI="2"
 inherit eutils
 
 DESCRIPTION="A standards compliant, fast, light-weight, extensible window manager."
@@ -19,7 +20,7 @@ RDEPEND=">=dev-libs/glib-2.6
 	x11-libs/libXft
 	x11-libs/libXrandr
 	x11-libs/libXt
-	>=x11-libs/pango-1.8
+	>=x11-libs/pango-1.8[X]
 	nls? ( sys-devel/gettext )
 	startup-notification? ( >=x11-libs/startup-notification-0.8 )
 	xinerama? ( x11-libs/libXinerama )"
@@ -29,20 +30,11 @@ DEPEND="${RDEPEND}
 	x11-proto/xf86vidmodeproto
 	xinerama? ( x11-proto/xineramaproto )"
 
-pkg_setup() {
-	if ! built_with_use --missing true x11-libs/pango X; then
-		eerror "Please rebuild x11-libs/pango with the X USE flag enabled."
-		die "x11-libs/pango needs X USE flag"
-	fi
-}
-
-src_compile() {
+src_configure() {
 	econf \
 		--docdir=/usr/share/doc/${PF} \
 		$(use_enable nls) \
-		$(use_enable startup-notification) \
-		|| die "econf failed"
-	emake || die "emake failed"
+		$(use_enable startup-notification)
 }
 
 src_install() {
diff --git a/x11-wm/openbox/openbox-3.4.8_rc1.ebuild b/x11-wm/openbox/openbox-3.4.8_rc1.ebuild
index df6148c23ef9..a27df187210e 100644
--- a/x11-wm/openbox/openbox-3.4.8_rc1.ebuild
+++ b/x11-wm/openbox/openbox-3.4.8_rc1.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/openbox/openbox-3.4.8_rc1.ebuild,v 1.2 2009/01/09 15:18:46 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/openbox-3.4.8_rc1.ebuild,v 1.3 2009/03/08 19:53:05 gentoofan23 Exp $
 
+EAPI="2"
 inherit eutils
 
 MY_P=${P/_/-}
@@ -20,7 +21,7 @@ RDEPEND=">=dev-libs/glib-2.6
 	x11-libs/libXft
 	x11-libs/libXrandr
 	x11-libs/libXt
-	>=x11-libs/pango-1.8
+	>=x11-libs/pango-1.8[X]
 	nls? ( sys-devel/gettext )
 	startup-notification? ( >=x11-libs/startup-notification-0.8 )
 	xinerama? ( x11-libs/libXinerama )"
@@ -32,20 +33,11 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${MY_P}"
 
-pkg_setup() {
-	if ! built_with_use --missing true x11-libs/pango X; then
-		eerror "Please rebuild x11-libs/pango with the X USE flag enabled."
-		die "x11-libs/pango needs X USE flag"
-	fi
-}
-
-src_compile() {
+src_configure() {
 	econf \
 		--docdir=/usr/share/doc/${PF} \
 		$(use_enable nls) \
-		$(use_enable startup-notification) \
-		|| die "econf failed"
-	emake || die "emake failed"
+		$(use_enable startup-notification)
 }
 
 src_install() {