Version bump. Removed old

Package-Manager: portage-2.2.0_alpha187/cvs/Linux x86_64
Manifest-Sign-Key: 0x981CA6FC

3 files changed, 50 insertions, 38 deletions

diff --git a/app-emulation/virtualbox/Manifest b/app-emulation/virtualbox/Manifest
index 66798b8eb00c..9302ef16f594 100644
--- a/app-emulation/virtualbox/Manifest
+++ b/app-emulation/virtualbox/Manifest
@@ -10,30 +10,30 @@ AUX virtualbox-ose-3-config 38 SHA256 cc3cd896be49a421b06665683a22edb0fe17d6588f
 AUX virtualbox-ose-3-wrapper 2931 SHA256 7ed4834ece201cb6a9da57e36a1a9b47bd054057d2ac4a46343a9966ff460644 SHA512 adb6ba2b3252b19b4c0331c10a025d05fd2399642530ba9aec2efa2dc8dbea4188a95806935532ad8229db29f0767c3098ef7646204f5e540e291ceb350b76ac WHIRLPOOL b7d7e454cd5642e59bdf973bbfb7f7d52597b32b440630ec4ba08b8b89f91e4e5296a723429e1c9c5c72e6760264d0477e1232559631e54c85c98351cf170db5
 AUX virtualbox-ose.desktop-2 201 SHA256 fa7fc3dae940e768560559db944289c578acb691db2dcb51c8c85bfaf3298a25 SHA512 a678e237ad0451e8785f242ebf822b4f3b03d2e2280a62f71728f79bdcfc84d3465ee60cad90db75e64b2c89a1b0b224de00519728fb605df67ca7c9aee0874c WHIRLPOOL 080fc09f951f621976499e7721e1edaa6e89d6a3632c63d14806a23d1369ce1a7d3408a6375f8658f00603fccf69cef3b2f587e1861b02a09646262f365aee2c
 DIST VirtualBox-4.1.26.tar.bz2 74552384 SHA256 229773b45bb18374aa091d4ef585f3893307fb4ccb6f489055b048c0f93c36ab SHA512 da3dc07a390f423446190ba68221a9389423381def888a6eb754dc02fed75f0b99e41263ffc6d36f955b6018b8f7e928da55397bb544eae16cd5b0cbcc66ed89 WHIRLPOOL 9f5d74e44950d41887955250307bc1af99ca0007e3d4b0f6549b35ff3fb9a48d546f9b7dab6d346ac5a0e88bbb1af092665024d1e792aa9befdc04b6017c62bf
-DIST VirtualBox-4.2.12.tar.bz2 76876011 SHA256 eb65ecac94f63d6292a967d39cb5e28326404c10d0e8c2c50399eedb59c17ee6 SHA512 b345bf6fcae92c02b5943d89b3ca36522930744b0282a4c25815b76033a055388dde428adb2226eb8051e3a418f1edbf83b1a04ab340663e601757504a9fab6d WHIRLPOOL c5974adfdf6ad86ea2bd9951f59da72fee9d1a6f3b67546bcb112860eb23b293fb6f091bff9f76d53134f170461361bde214cd30a28b9959f1fa73bc424b3700
 DIST VirtualBox-4.2.14.tar.bz2 76888627 SHA256 f8f6dc19612f3c84a5c857b8e5c452b8db2cf3c8c52a678b6a00e5dd5831130d SHA512 e4ff703f255c2eefc15a0569baa7154a6011252c4e551695f26ae5711b495c5ebceed03da2868f05fa1ae12a57fd8d03eb46efb24d4516d32a08e5ed0648b6c2 WHIRLPOOL a4fe4cf9e768fd00332e0218acb7c6b7db3b19bb5a6a997662d8974b1e65dae5a017c88eca14f895c726926376c62216a914aecc94cb3dcbb4910e886bd09fb3
+DIST VirtualBox-4.2.16.tar.bz2 76904452 SHA256 ff0f8916d039120554d9d73c7cae1863d6161933374374ec2f5313892046d45a SHA512 3d7569e3e55b000ba76a5d31fd04bf6836b8dda101598266ecdaa05a7848765d8ee93bad4ad6e8da6fedc5db79598782eebfab2d6c4a4658d433c93fd45036bd WHIRLPOOL 54d902e65639927ffaaeb7b776156576b3b690ae100505f5a94bf2709ace2131ecac73013548a611c6e8dc38a3b5547681ad352f97b773f542d1e77818eb58a8
 DIST virtualbox-4.1.22-patches-01.tar.xz 3752 SHA256 2ff58f8d2bdfdcbf1ae4bbe9f68ad1256f1ae37091fd4b392582a062d206962f SHA512 9bba2a4352d52cddd27f55b4ad0e9de250c1d29359a8859f61fc413e53ac62206321c5e347391ca478b942967bd7974a3a469eb3bb133c79d7033692afe559dd WHIRLPOOL 1aa98913e7d4e1ddf5f775db200cddc18a7ed4d7dd915dda0dab6bffbf33bfd63a785cc7381bca74e4780e7dce21f18314dc093b9c6ba02addfd1330f3b61aa9
 DIST virtualbox-4.2.2-patches-01.tar.xz 3612 SHA256 5b844b3740bebfa0e7652cb6c5c89d94a333c7aa0873aa8a0aa653f7c9f3c06b SHA512 d12da10898c5bd440b6fd2211385bc223ff832fdce11b118cc56562903c8c87abcb1eeec3bbc2d4b5b22b1aa4a652e978277af7096a65276469be9e704a1aa69 WHIRLPOOL 58d43f0d2eeb30800b285c307871be64765301f7037d72752eb063286589fcccd12e6d8fd26610164701178fd497ca65127e91eb8f8d53db0889ccd7d7b988a9
 EBUILD virtualbox-4.1.26.ebuild 12266 SHA256 2ba37206085c8fac2a5e3ccfb52a46046c45fb15ad4dc48b05ad657519e9703a SHA512 315c43032442bc6f20ce3246bffaa93a853ad4614c006ff530fff6f2c5431fb5f0da8e0ffc7a37b634f03eb947028dcc56683e2b22d5983241c1dd6aba1ce55b WHIRLPOOL 29b4c74754e35e62fabeb808381834301d07fbc7798421e41e94f66b9e7b1600cf899be1442e736d6f58b9da189008d446caa3201d534c794195e798e1943e51
-EBUILD virtualbox-4.2.12.ebuild 12161 SHA256 d442444644d319d7fc32b427a5b75ed207ee6eaa62c2bdde3bcaac75ff719e49 SHA512 aed87cede9499d9f8a71e96e88b3b49576b75f6bede3e2bd348d2c3d40d966660cc396fdb4fb84880e4461551255c313d641f217151659157fafc0027e18a6c0 WHIRLPOOL 6e6d433003bbdefd153a3859c612ba0a94eafe89eef7f1759a419640c21239c70df10f138b5e33ebdb44ffc9d2db4a2ff6b48ea8cb6b044bef627ba105b50c24
-EBUILD virtualbox-4.2.14.ebuild 12147 SHA256 62ee3690aac3724a657ad58c15fa9b8f9a58f8b999a0404193a9dbad55c24971 SHA512 804697857fcfab2ad8ff532b1a42e2e176ac52dfdf80884b98eccc7121c43f7e5714a646281c2c3017c33e5f9ea2dd49cfd541206c4a85bb58e149d7ec307001 WHIRLPOOL 1ba1914d2b8defb6c8bc2a534b3be6593ab2ffbd57c6a179329e6e734a056b4c19a266033423616205b57e906734e1ab2f85607314dfd86f7e8008e4eb97bba2
+EBUILD virtualbox-4.2.14.ebuild 12281 SHA256 f953d10418fb37edae3f1c24f9346f26297f6ed8a4f6f1e20b45067c496c25e4 SHA512 13b3f1000f5c9038116cb3fe81e79a6a220564cb0265e33a01a17820b95feb75b3073bd8093269d9df69b0689420e04f6e581fa3fec4f3a3b376b35144bf0ee7 WHIRLPOOL 8fe495aa52caf8d67691ecce7a818043ff79c20eedd50fd187a4a08208ede5182119c2c72ff8d2f6df2e2d4132ce2b505b4bab7ac02293134743c5d3d5471f34
+EBUILD virtualbox-4.2.16.ebuild 12281 SHA256 53495b50a3fb5b1828df60df7a753e2cae97b1476ebdea60b7dac6b94021b416 SHA512 533323eca01fbfa99447c3b990450f0bf16f0dcc64913b14f7a5bae26836848d1263a6e74a6b8a558fc6d7f9ae3b7539f7321cc365d164e34f4d96423e3449c4 WHIRLPOOL cc317e884bf71e6b77d224278d0105d33e8e8bbb9757f67067babe06849f252d3f0335075ccd991715a01af5159eff2177abd88632c30cdaca8d47598a5b08c3
 EBUILD virtualbox-9999.ebuild 5123 SHA256 8cd24ad4cc1fab5562d58ebcf531b3131796eb24c40489d98bfb2078cd0b3803 SHA512 3c4658a749419a64f7ed8636e62f385db059639d58a2152ac1b136f54f8577407ba0553f612511ea7819eb4e26727ab516f62b11faac5d2e4b6de73892206430 WHIRLPOOL 317967e118951cda333e6db60a6e8f37df7a53599d752271d8f29873caa1e9bb22774963e8972989516031516b293c5b8dd9f7f5e680ac785d7f16437bf8c2ca
 MISC ChangeLog 22247 SHA256 296bb4db71015e024d47d50da4440d48d03db65be0f15319bdee19cf06e29f17 SHA512 2e2fb5daacccb2592c11b4d588608a307a0a75d79f7747670cc8b414e93e87c74cdbb0477d36b00cd01d2c30311b7ca9046f989f739c35c59f76d5dd0c9fa163 WHIRLPOOL 008cddd1746d4a8b4fb626c425c8edbad5d1f3b1b5bdd8289aea33f49e040d3648241a19e3c74ca7fe28ede6362b4b2299bdeae0856f182c5daa9e71b0f886f8
 MISC metadata.xml 673 SHA256 5cf3053a2f23eff40c24dfdb7af90d4bf905df95a7406f6298ae9e5e547cbe79 SHA512 79b4b7477041212815e0b509016b692ac719625534ba93540ac5afe655e47ed2ed27d7ba51b494a49a6ac603733ba0b66a2a517f27e4d0e6b7563eb7d4e640ec WHIRLPOOL 6bcb7711e01036fa3ff064ffdc5021da6fca464d4da77d8e93d033304c7c1d3ed105723d5d5e7fa3328daec929c7c7a90c9c82572bb082765f286b53c3feb688
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRyCXMAAoJEPiazRVxLXTF1/gQAJ0cibXQnPzz7/GGhTwNOsOr
-hup54o6QWhmLcrrKfA72cqsx6oSl2KXNe4yPnjth4GFUg/+hsaIs5PPnPdjJAhnr
-7zybkAMGtaAAy787N3k/cQR5huibob0aqBoK0qDZVodQOx1PK/2TDruLEyEpXlsc
-zYZJkkAM8LRGy4YOoqyDpdZRI9XPLszQli5ubZiLLEhtw6963f5+HLOsaEhm87pA
-ezjgaxSOYQD9mm9iFIro85Qs69c732mj7qDpY/knKxCFyMsXTtHJGFKrEQzP//s/
-JEBZXfd7apMosXLyUhkbSdBgJkr2f83nrcHvd3u6xpTvRaJDmuRKHbVYGiuUiR8X
-WxWULmqDCZIBhP24hKAwzlJqRda39rtNptIF/eSorcHMK1rvpziZEK8VFogRG2gD
-IdS959vb37UOLd5ghw0jUmqJofaMePSxDgW5HpJvDwAte1dwqPNJ/FdA5jV0S/o7
-dbtQ1Lw8FwK5VYsYFZunkjzAqRPT8BTtVBnFuwx5O3dMt27rZX/yirM09KHktKgh
-LRwaDqDXgbv3vXIH3Da1/pHGBA4b0krYEVoiOd1nXCNK2zj7OO/BM9Sf9dhZdESp
-KhFEHUzFoB3rPfP7cV6CE11BG1KbrS7qWve8iE3qdSF2AtTwTaN6NBzzd3kreOch
-mN5Wwc2yX1fQfUkMV0RK
-=QuW7
+iQIcBAEBCAAGBQJR2tHrAAoJEPiazRVxLXTFugsQAKYLq57SCEFM3towgl1bpQko
+2ify4poyiJ80E0nHwcxkHFFlU6ED9bPOIac7cq0OKWL6+ua85L6Je2mMJ+yupsa7
+oNaxvDkyZ7Bqb39aanOqF9dhnpvC/iKFNQMoiaRRR7zS5tgjzrB3LhfmO9iocidH
+e8GTQbcBQIQanHlp1W+8jG+PTyhCPyeHTLuHxJ1nXyI3FMcGOHug5qbPGg8GezWW
+SGsdz8eT3n7V1a4QfPfQ7fTpXNgZ4BkHiPGNDAyl7zapzMVFBo2PmVWMfrWVVzY3
+RF7Ep60/4zNHjLiErpNLQi06K18k5C1G+auvEWMm/SBLpG+Iu8bIR0OwcJ3V8wUm
+GccbEsJyWS0gfqB6SpgvMDpcq6sey8H68wfSOwSTqiwTExUG7V2eVuRRnKhFr5+D
+U6axLrQY9zIikKSaZi6joSzKyisxDredzDwOUK526jd/E7Z0ZOXqpz3BysIW2NfL
+Ydb0Oc4wPrlk3ZDcNwOZacH1baM4XcecoirQTL1Jw+FMRv2C4z3RAbixkNMIwBZT
+FPtJZjJEZZQ6k/JMjIKj33OE0gSplkavk42ZRhv1MCB4iEvIsJsQLGVqf3S6WE0P
+LgYThhvy7lHTr7D7tSnRYoN+a4B2AFTlop+6oIh+w6odXuqcB5lUVOByM8cv4kuq
+91ftdbt2BV3qj39EYnst
+=2HMe
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/virtualbox/virtualbox-4.2.14.ebuild b/app-emulation/virtualbox/virtualbox-4.2.14.ebuild
index 94cb6df4f2dd..f53fdc246cd0 100644
--- a/app-emulation/virtualbox/virtualbox-4.2.14.ebuild
+++ b/app-emulation/virtualbox/virtualbox-4.2.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.2.14.ebuild,v 1.1 2013/06/24 10:56:11 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.2.14.ebuild,v 1.2 2013/07/08 14:51:21 polynomial-c Exp $
 
 EAPI=5
 
@@ -70,7 +70,7 @@ DEPEND="${RDEPEND}
 	!headless? ( x11-libs/libXinerama )
 	pulseaudio? ( media-sound/pulseaudio )
 	vboxwebsrv? ( >=net-libs/gsoap-2.7.13 )
-	python? ( ${PYTHON_DEPS} )"
+	${PYTHON_DEPS}"
 PDEPEND="additions? ( ~app-emulation/virtualbox-additions-${PV} )
 	extensions? ( ~app-emulation/virtualbox-extpack-oracle-${PV} )"
 
@@ -112,9 +112,9 @@ REQUIRED_USE="
 	java? ( sdk )
 	python? (
 		( sdk )
-		( ${PYTHON_REQUIRED_USE} )
 	)
 	vboxwebsrv? ( java )
+	${PYTHON_REQUIRED_USE}
 "
 
 pkg_setup() {
@@ -130,6 +130,10 @@ pkg_setup() {
 		einfo "No USE=\"opengl\" selected, this build will lack"
 		einfo "the OpenGL feature."
 	fi
+	if ! use python ; then
+		einfo "You have disabled the \"python\" USE flag. This will only"
+		einfo "disable the python bindings being installed."
+	fi
 	java-pkg-opt-2_pkg_setup
 	python-single-r1_pkg_setup
 }
diff --git a/app-emulation/virtualbox/virtualbox-4.2.12.ebuild b/app-emulation/virtualbox/virtualbox-4.2.16.ebuild
index 0322f301d827..5fc290879e92 100644
--- a/app-emulation/virtualbox/virtualbox-4.2.12.ebuild
+++ b/app-emulation/virtualbox/virtualbox-4.2.16.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.2.12.ebuild,v 1.1 2013/04/13 20:33:35 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.2.16.ebuild,v 1.1 2013/07/08 14:51:21 polynomial-c Exp $
 
-EAPI=4
+EAPI=5
 
-inherit eutils fdo-mime flag-o-matic linux-info multilib pax-utils python qt4-r2 toolchain-funcs java-pkg-opt-2 udev
+PYTHON_COMPAT=( python2_7 )
+inherit eutils fdo-mime flag-o-matic linux-info multilib pax-utils python-single-r1 qt4-r2 toolchain-funcs java-pkg-opt-2 udev
 
 MY_PV="${PV/beta/BETA}"
 MY_PV="${MY_PV/rc/RC}"
@@ -68,7 +69,8 @@ DEPEND="${RDEPEND}
 	alsa? ( >=media-libs/alsa-lib-1.0.13 )
 	!headless? ( x11-libs/libXinerama )
 	pulseaudio? ( media-sound/pulseaudio )
-	vboxwebsrv? ( >=net-libs/gsoap-2.7.13 )"
+	vboxwebsrv? ( >=net-libs/gsoap-2.7.13 )
+	${PYTHON_DEPS}"
 PDEPEND="additions? ( ~app-emulation/virtualbox-additions-${PV} )
 	extensions? ( ~app-emulation/virtualbox-extpack-oracle-${PV} )"
 
@@ -108,8 +110,11 @@ QA_TEXTRELS_x86="usr/lib/virtualbox-ose/VBoxGuestPropSvc.so
 
 REQUIRED_USE="
 	java? ( sdk )
-	python? ( sdk )
+	python? (
+		( sdk )
+	)
 	vboxwebsrv? ( java )
+	${PYTHON_REQUIRED_USE}
 "
 
 pkg_setup() {
@@ -125,9 +130,12 @@ pkg_setup() {
 		einfo "No USE=\"opengl\" selected, this build will lack"
 		einfo "the OpenGL feature."
 	fi
+	if ! use python ; then
+		einfo "You have disabled the \"python\" USE flag. This will only"
+		einfo "disable the python bindings being installed."
+	fi
 	java-pkg-opt-2_pkg_setup
-	python_set_active_version 2
-	python_pkg_setup
+	python-single-r1_pkg_setup
 }
 
 src_prepare() {
@@ -215,7 +223,7 @@ src_compile() {
 		TOOL_GCC3_CFLAGS="${CFLAGS}" TOOL_GCC3_CXXFLAGS="${CXXFLAGS}" \
 		VBOX_GCC_OPT="${CXXFLAGS}" \
 		TOOL_YASM_AS=yasm KBUILD_PATH="${S}/kBuild" \
-		all || die "kmk failed"
+		all
 }
 
 src_install() {
@@ -232,7 +240,7 @@ src_install() {
 
 	# Symlink binaries to the shipped wrapper
 	exeinto /usr/$(get_libdir)/${PN}
-	newexe "${FILESDIR}/${PN}-ose-3-wrapper" "VBox" || die
+	newexe "${FILESDIR}/${PN}-ose-3-wrapper" "VBox"
 	fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBox
 	fperms 0750 /usr/$(get_libdir)/${PN}/VBox
 
@@ -243,14 +251,14 @@ src_install() {
 
 	# Install binaries and libraries
 	insinto /usr/$(get_libdir)/${PN}
-	doins -r components || die
+	doins -r components
 
 	if use sdk ; then
-		doins -r sdk || die
+		doins -r sdk
 	fi
 
 	if use vboxwebsrv ; then
-		doins vboxwebsrv || die
+		doins vboxwebsrv
 		fowners root:vboxusers /usr/$(get_libdir)/${PN}/vboxwebsrv
 		fperms 0750 /usr/$(get_libdir)/${PN}/vboxwebsrv
 		dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/vboxwebsrv
@@ -259,7 +267,7 @@ src_install() {
 	fi
 
 	for each in VBox{Manage,SVC,XPCOMIPCD,Tunctl,NetAdpCtl,NetDHCP,ExtPackHelperApp} *so *r0 *gc ; do
-		doins $each || die
+		doins $each
 		fowners root:vboxusers /usr/$(get_libdir)/${PN}/${each}
 		fperms 0750 /usr/$(get_libdir)/${PN}/${each}
 	done
@@ -272,14 +280,14 @@ src_install() {
 
 	if ! use headless ; then
 		for each in VBox{SDL,Headless} ; do
-			doins $each || die
+			doins $each
 			fowners root:vboxusers /usr/$(get_libdir)/${PN}/${each}
 			fperms 4750 /usr/$(get_libdir)/${PN}/${each}
 			pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/${each}
 		done
 
 		if use opengl && use qt4 ; then
-			doins VBoxTestOGL || die
+			doins VBoxTestOGL
 			fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBoxTestOGL
 			fperms 0750 /usr/$(get_libdir)/${PN}/VBoxTestOGL
 		fi
@@ -287,7 +295,7 @@ src_install() {
 		dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxSDL
 
 		if use qt4 ; then
-			doins VirtualBox || die
+			doins VirtualBox
 			fowners root:vboxusers /usr/$(get_libdir)/${PN}/VirtualBox
 			fperms 4750 /usr/$(get_libdir)/${PN}/VirtualBox
 			pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VirtualBox
@@ -304,7 +312,7 @@ src_install() {
 		newicon ${PN}-48px.png ${PN}.png
 		popd &>/dev/null || die
 	else
-		doins VBoxHeadless || die
+		doins VBoxHeadless
 		fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBoxHeadless
 		fperms 4750 /usr/$(get_libdir)/${PN}/VBoxHeadless
 		pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VBoxHeadless
@@ -314,8 +322,8 @@ src_install() {
 	# Install EFI Firmware files (bug #320757)
 	pushd "${S}"/src/VBox/Devices/EFI/FirmwareBin &>/dev/null || die
 	for fwfile in VBoxEFI{32,64}.fd ; do
-		doins ${fwfile} || die
-		fowners root:vboxusers /usr/$(get_libdir)/${PN}/${fwfile} || die
+		doins ${fwfile}
+		fowners root:vboxusers /usr/$(get_libdir)/${PN}/${fwfile}
 	done
 	popd &>/dev/null || die