Convert built_with_use to use deps. #261562

Ack by polinomial-c and patrick.

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

3 files changed, 26 insertions, 20 deletions

diff --git a/app-emulation/virtualbox/ChangeLog b/app-emulation/virtualbox/ChangeLog
index e8388ab520f2..97003c7ed540 100644
--- a/app-emulation/virtualbox/ChangeLog
+++ b/app-emulation/virtualbox/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emulation/virtualbox
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/ChangeLog,v 1.110 2012/05/03 18:49:06 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/ChangeLog,v 1.111 2012/05/11 09:07:25 sera Exp $
+
+  11 May 2012; Ralph Sennhauser <sera@gentoo.org> virtualbox-9999.ebuild:
+  Convert built_with_use to use deps. #261562
+  Ack by polinomial-c and patrick.
 
   03 May 2012; Jeff Horelick <jdhore@gentoo.org> virtualbox-4.1.12.ebuild,
   virtualbox-4.1.14.ebuild:
diff --git a/app-emulation/virtualbox/Manifest b/app-emulation/virtualbox/Manifest
index 12c0acfa88d1..96462efd5093 100644
--- a/app-emulation/virtualbox/Manifest
+++ b/app-emulation/virtualbox/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 10-virtualbox.rules 576 RMD160 3dddd2ffa03bc214fea9d2e8b3363399ffd898e5 SHA1 6840d9e79790d01621ba79e00228071eda98355d SHA256 9fe8aaa16b42e6730a2ebd6cf0fbc9ad0db0f45e06e554cc4ae06b4dfc0045e1
 AUX vboxwebsrv-confd 683 RMD160 85af1add9897582d51a58f640c634611e1fc5bce SHA1 87df1674f5247a5980f5836055931d30245467c8 SHA256 57d15be05b11a5d2df838e144f3e91c6443b6afb6ea2c105254947be72759bc8
 AUX vboxwebsrv-initd 797 RMD160 6427267490429efcc8ae5f9df0731920856e02f3 SHA1 112f645e7f34740c12f25fa3d6bb2d531a0cf3c4 SHA256 51cafb25408343650ddcd8401ef0226c2df3cb5020a5ccdfd85e2de821a2ccf5
@@ -20,6 +23,17 @@ DIST VirtualBox-4.1.12.tar.bz2 73250628 RMD160 a3ee3e4dac21d969f5314c7269ca9ef9f
 DIST VirtualBox-4.1.14.tar.bz2 73260319 RMD160 68bb81486dad190a1bd74251ad32ee16d47be625 SHA1 126e61d5f7187d62b2b213b658912c83f49e6de6 SHA256 034cfd19d5dd701cd1375b994ad6f2d41c207b6760c6b8c5fe3005e53134dff8
 EBUILD virtualbox-4.1.12.ebuild 12211 RMD160 fd99ea8b19217bb590f9c8a0115f7f204403de5a SHA1 d1b9c553a682b153d69dfe7db77bda2d67481338 SHA256 1fd9775244b4da07410f5bc308718ec41961151951bb828275979444f41d1cc2
 EBUILD virtualbox-4.1.14.ebuild 12259 RMD160 6e662742a603470186e2cef05effbafa2f03b5df SHA1 13f07291633d6ea89512edfa3b72b0059de8a2ef SHA256 3f498d2c26fdcfb13dd15a3e29d345f3c553368d49b939e16fb47f2c237c700a
-EBUILD virtualbox-9999.ebuild 5702 RMD160 5910c24c277af2bac4f50c57ca97253994a16734 SHA1 782323a9c9a40ed52f350836f379a958b72a490b SHA256 1b2ab1d308157fa4adfb7827cdf8e4f6b643200876f02f96bd0b7bd9a6e45fb4
-MISC ChangeLog 12730 RMD160 622a089e4df8d309b6df52d2da4a67d3e641f38a SHA1 971bc0b84b7b4aa9340ee50e587e0a7ce848039f SHA256 fcab95ed29101fa1df113e7d9ded6c87c366e5bf0bf4a06d653ba16bb92c95c0
+EBUILD virtualbox-9999.ebuild 5123 RMD160 156f0db9eac03d04abcdbb317ca86342aa607ee2 SHA1 065aadeb3529cb796d233c4f642e4e6f7df313bb SHA256 92337dcad1af0d93046d87b02a8ab9986bc6d346ce1783797b887485fd3ccb6c
+MISC ChangeLog 12884 RMD160 e2476c5696413ebef168b2bf2940f2768790e8ce SHA1 4fdc17a0666b410e8e4f1791e41ff53fa39a2658 SHA256 170cc059291615dafc39e7b3519b4d853bc8a36606f99cec256560051c2ec491
 MISC metadata.xml 766 RMD160 1c69e37183d073f82b9fd2c8761b758cc33ccce8 SHA1 31295f3715624ada590d13fdc80c076380415ba0 SHA256 54cc5df43fbe674f4f04674566dfec523c0c912f8c94db26f4215727ab6850e5
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQEcBAEBAgAGBQJPrNbbAAoJEIUJ+svaV163AsAIAIYsJ+7qoD21d7Gm/maTl06Q
+9n16YW4hqPpC+dIhNmKwLg3tM6oCOleIH6iprSJkxRttItA6OYNEzdlNpuaTSuFH
+74rIrfd0nOxuHinu/7MWMqYrGwbISuYFOsSVfdD/rXLqYXkCV7a3F+Nvhm6ZGvPL
+ChOs28P7eY4d7X30d7YEtKYzd3wtfTVYHxQzCzv4y8HLPwtDSuYhu5sq7OKEQFaW
+jd+WvmUBnY3wsL7EUILnxpQwmEuU/iBFbLonV2lw14zHefQCmQ4g5Xc21/k4tDYX
+QuvU0DWEgzvG546J5ccrg8Hghtl9xZVqZp0FlNpTDI7cfYbBhb3gmA2xNK7QUDs=
+=arR+
+-----END PGP SIGNATURE-----
diff --git a/app-emulation/virtualbox/virtualbox-9999.ebuild b/app-emulation/virtualbox/virtualbox-9999.ebuild
index 57bc0e4f4277..9e87147a9dd1 100644
--- a/app-emulation/virtualbox/virtualbox-9999.ebuild
+++ b/app-emulation/virtualbox/virtualbox-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-9999.ebuild,v 1.28 2011/10/23 13:14:01 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-9999.ebuild,v 1.29 2012/05/11 09:07:25 sera Exp $
 
 EAPI=2
 
@@ -15,6 +15,7 @@ SLOT="0"
 KEYWORDS=""
 IUSE="alsa headless pulseaudio python +qt4 sdk"
 
+# The VBoxSDL frontend needs media-libs/libsdl[X] (bug #177335)
 RDEPEND="!app-emulation/virtualbox-bin
 	!app-emulation/virtualbox-additions
 	!app-emulation/virtualbox-modules
@@ -34,7 +35,7 @@ RDEPEND="!app-emulation/virtualbox-bin
 		)
 		x11-libs/libXcursor
 		x11-libs/libXinerama
-		media-libs/libsdl
+		media-libs/libsdl[X]
 		x11-libs/libXt
 		media-libs/mesa )
 	sys-apps/usermode-utilities
@@ -48,25 +49,12 @@ DEPEND="${RDEPEND}
 	media-libs/libpng
 	>=media-libs/alsa-lib-1.0.13
 	pulseaudio? ( media-sound/pulseaudio )
-	python? ( >=dev-lang/python-2.3 )"
+	python? ( >=dev-lang/python-2.3[threads] )"
 
 BUILD_TARGETS="all"
 MODULE_NAMES="vboxdrv(misc:${S}/out/linux.${ARCH}/release/bin/src:${S}/out/linux.${ARCH}/release/bin/src)"
 
 pkg_setup() {
-	# The VBoxSDL frontend needs media-libs/libsdl compiled
-	# with USE flag X enabled (bug #177335)
-	if ! built_with_use media-libs/libsdl X; then
-		eerror "media-libs/libsdl was compiled without the \"X\" USE flag enabled."
-		eerror "Please re-emerge media-libs/libsdl with USE=\"X\"."
-		die "media-libs/libsdl should be compiled with the \"X\" USE flag."
-	fi
-	if use python && ! built_with_use dev-lang/python threads ; then
-		eerror "dev-lang/python was compiled without the \"threads\" USE flag enabled."
-		eerror "Please re-emerge dev-lang/python with USE=\"threads\"."
-		die "dev-lang/python should be compiled with the \"threads\" USE flag."
-	fi
-
 	linux-mod_pkg_setup
 	BUILD_PARAMS="KERN_DIR=${KV_DIR} KERNOUT=${KV_OUT_DIR}"