Version bump. Removed old

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

3 files changed, 39 insertions, 32 deletions

diff --git a/x11-drivers/xf86-video-virtualbox/ChangeLog b/x11-drivers/xf86-video-virtualbox/ChangeLog
index 5757cb0e2d1f..437200c02a8d 100644
--- a/x11-drivers/xf86-video-virtualbox/ChangeLog
+++ b/x11-drivers/xf86-video-virtualbox/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-drivers/xf86-video-virtualbox
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-virtualbox/ChangeLog,v 1.117 2013/06/24 10:57:30 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-virtualbox/ChangeLog,v 1.118 2013/07/08 14:51:45 polynomial-c Exp $
+
+*xf86-video-virtualbox-4.2.16 (08 Jul 2013)
+
+  08 Jul 2013; Lars Wendler <polynomial-c@gentoo.org>
+  -xf86-video-virtualbox-4.2.12.ebuild, +xf86-video-virtualbox-4.2.16.ebuild:
+  Version bump. Removed old.
 
 *xf86-video-virtualbox-4.2.14 (24 Jun 2013)
 
diff --git a/x11-drivers/xf86-video-virtualbox/Manifest b/x11-drivers/xf86-video-virtualbox/Manifest
index fc2c95f9c220..abd40bf79690 100644
--- a/x11-drivers/xf86-video-virtualbox/Manifest
+++ b/x11-drivers/xf86-video-virtualbox/Manifest
@@ -9,27 +9,27 @@ AUX xf86-video-virtualbox-4-makeself-check.patch 289 SHA256 31ddafbeef6d35696d76
 AUX xf86-video-virtualbox-4-mkisofs-check.patch 356 SHA256 0e72a5ef8d915c550fd92865b40c265153dc2d4621714a599d3a7172726b6fff SHA512 9c78927a4a8e99562582feef867f1b3e16663f04c88ebe7f19fd9e2e0c7632b041dc6294da57053645982040b50830f51391b27847467aac6e377062ca32997a WHIRLPOOL cd9ad5d9538467321b4ce56c37966f04edd2e74aaf1b849085675b1d08213b6a99179968adde9ad48aadb9ea67ca2f3283ef794be2f3ea6215ad4ff11031a778
 AUX xf86-video-virtualbox-link-lazy.patch 996 SHA256 976e922756f9f2f01f625b07a012d6f287811b3d099f1a855c9d4453cc4f5a3b SHA512 f7c1b13a12d91884f0faabc23af345cde06315b23900d12ba0fead64c7818c1aa721cd6710c905c2758bcb5cbec9f7ea3a8b515fcab14ef4965d4e1c27fbab94 WHIRLPOOL a3e3cc997172557086741ee3d689411b4f1964a480b800d315fbd3a43c2d507448840a4812d8e735428a543b9a0c1838736aad692dc6460f29489bdb4c2010ab
 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
 EBUILD xf86-video-virtualbox-4.1.26.ebuild 4713 SHA256 fa62b6aa4cac92a05101f51c51a92668f10dbbbc98fba350a0fa6cf8de32f854 SHA512 b532b8ea7083ff59bc7c176fc5ebcb2f877274207c8d3f89af0166f0d6cb03049ff49b6bc7dc5db5a12635b254085a5fce297fc8e164fbf3a64def45dcd85db5 WHIRLPOOL 73a9dd3aea519421b5fa585fe9151c85735181baab8793fb8a994d08702c41381ecbb660c0e710b18cdb5076e103ce52f0b12d4b5e08c6f52f12642c10b7f6ba
-EBUILD xf86-video-virtualbox-4.2.12.ebuild 4943 SHA256 a469318d9abcad5b5514e45ee5b103e4a76912a2c437764a98cec30098197562 SHA512 cf9770a8fb170e52a40c5b9d0916ef07ed0598e1bba87e2cab1cf605cf9a9579a2ee4e3b222f6a2d8b5985980d1935565b68e813560e6b04c88b18ea45691ef0 WHIRLPOOL b1749a1133e15d0ba23faac6e958268588117efa00b3fbe10c7085e33503b073c3b5526d50c6d0452d752be2c901a9de8d77f617326aa08ce4944d871b608041
 EBUILD xf86-video-virtualbox-4.2.14.ebuild 4925 SHA256 e16dea3f05538017c1012a6b4d61c33123a7b0cf2b52a3bfca16580fe054e85a SHA512 b4ec2ad2dbad7dd7cf99c22c3953d22cdcd4e925d3dc8f2438733d7bcf2ec6582430f828945ceb5c8731b501f127ebc252fd571f3e9940ee1801e1a52106272a WHIRLPOOL 9ae84891b61817aa710688061bafa39766abcc6efab3dec178d8be4f715bdadf13207dde924b49affbd6983e79a00f595b212c59f9b3e18fad21ce95e292f2c4
-MISC ChangeLog 25270 SHA256 45bfdf0d6d2d1628bfba81fbb620be3f46ac4570ad7114b4b5141a08f880cc6b SHA512 9716080c5289644e30062ed37ed6e9d6aa6d5fca53dac8992fda370fc16594b00a26e959c0e3173a0353ea38d91f3d63cd9fe4508b6d2472afe9f156dc804703 WHIRLPOOL 14900466416363dd6aac1c72f56d2099a0bb71ed7559bc2c0b6ad9f911af641149040a5180d7fed29bfcc25b8df1e667345f600179c2287711100130bc310560
+EBUILD xf86-video-virtualbox-4.2.16.ebuild 4925 SHA256 d97db087f76b235d581fc16b62248b430a01a87ea2df995399585c640ac33cab SHA512 86b291d6d24d85d2bb99177596e586cf02a4d13e696e950ba9cc39ca5c0664d75703f1f6f311644534a28e210c996e848de11bec2653b7db86f7ced7acb08de6 WHIRLPOOL 30ca523f41ba14c3f7b2a462c0a8fc1685c2c2d767daf650db8f97b229c4c7d79af0b86aff12dcde0763fa654d0e1ed0bbee6864a374fb1c4366d95e793f1117
+MISC ChangeLog 25477 SHA256 ec772db106bced41dd7eb083a6c13ebc261cf501789f087dad4d8693b17b4024 SHA512 7f4b1613fcb38fdb961fe6db93eac5fe805afcdf2e8015ece78b91638b8feb7f58d4365a2a9b0cdad18d35bc09e60bdcf9a20b09c9b9cdfb44c827c2059d8f57 WHIRLPOOL 95781a032949ab613dc34b6906b25617b02cfecec8cbe3e85d3ca70430ed3f5fda8ad710661640ff4d7ccf194b46a5a80ded1313e38abc2017c8151a4025e51b
 MISC metadata.xml 359 SHA256 ab2e6dee370bc02d436bf0c03dbdaa826c9ceae9a4678975242e1fe7f3855608 SHA512 add99ae916087d7466647e197d30ae21049ead1fa892539e6081b0bc88f9cf19c12492984576a00581a35a2ae323528f417e48cc04a12152e3fde63da2f37cdf WHIRLPOOL 459e98c740f891deb8ba95788b0a9ecd609744bdf13e60c1086d9e7981951b5767ce1e44e63e4793dd75718e27ed3a24ad0de806f15459f0c8bd251a73996975
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRyCYcAAoJEPiazRVxLXTFyzgQALwSs398g/YCjRwu4TV/eV7Q
-Abj/UX0c1vJQATrz4I2vhn6Ej36liM/XgYGx14V47wegeOzwHf43IrQEbqrNFVwx
-kqozwfVkIoGxt1M27rIlUZ3C0LjSkja8mrK+/gsPALf2vZhx/im6cbrwoCWpbkg6
-0KgVmxUEp/gaPL+F058MfMSKS+/YpKSJJUXyC9R131PavRtmeO6pzlXxUpU8QJr0
-9s9FLeREDHCvhxnL8ikWsUjbTU4xNINjIGpZnboxaN1Ho2l6SM592C3fY2d6xwVO
-b7GznphPf0xqTBENnphMLjVU+poU08IBzotCyOSLwQ7kd1EAHvFkOFX9o8B+eLPw
-M5f1SUAWS1Yq4ozg4qYRyxP2OrO3s5etszfiQkQQAwHpl3FeIJ8R1ksjTsdyYmeg
-kHUp16XgOJt5g/fG8v/+yeF0R2w0nJBjMpWWH+lHhlFF0lWRiynMiTumKrA5qdnP
-vJrqXD4k80zRhQdxBh2UdJbhh0fjYBkBxP+M0/63UmuW4h1n10a9zzQ5RtAddOxx
-HB2ELoUlBphhU8C9y8eFTAVTsLRse0NbJvKUfKaeBnNfebUrvNaVV0veYDkLcyz7
-8BxQYKRM0AsfFxJfGP+Cfa64QpPwxbkb2FVMzxKduYw1+zhpg99QWv0cWaxSytrs
-41Pao4AgwA/qhPaRHEmc
-=KJTg
+iQIcBAEBCAAGBQJR2tICAAoJEPiazRVxLXTFxf8P/00y2JZi1JM/k1Ns9jYKg7um
+OB2M8+Hr5Uhp8a8+vJqZcfPRFMB6DJEGM7+cv+iPWeEVswBrATxAYfpcoHdBcAk0
+NXRLWoaWBzrKi5VnPOqV4o54XCz0vkgWQ35dzgCGStDxMHb/8BckAnC0PANSV/oy
+Vb/OxruwRWTdM/ZTss6LdGVauA8xxIqjSsgk0fbLNlqtsn8RDrgqnAlbuidMsPGS
+qIA0bT8rQYBlzz0cH0ceFjrif6ZIAexObswplURBCFpye996SXtMJUf4l4Mu4RCJ
+GDwvOulXmn3yZbsDQ59UGvkOG5VVNp+WBx1/orWNUwI1Y4M8a2Kr13uDHbwUV7pm
+nb1mQyDWdHo3ASPNwZ8kg3fg7isI2s/5rc4/u/uq/abSFv9CCtqrZ8+t6IbYT0lg
+I0Tf/l8IiU20D8+HOF5XL/UurjvneINeTumg0C7l2Lh2vE9ercon7Qmq9FnXWl/4
+XhOJRv7VOLWpgS7Gb4KFIpBnwIEq+zqFsOzE44pm4/yVIPXUfhnc9nVXuuq6lH2B
+6boUuvVkkfd6poZMSN2i5PM3LsNyLvPYhon3O4nfR3aoH4Dh1aAXLk6lQYxwW5IN
+NrthdfpUlCvPhiI3TpZSzanuWoICfBdg+2s7LQrltzgMtkThwOqytFz8aijg4u/s
+Lyf3tF5lYgBXWssE32Sd
+=uCtb
 -----END PGP SIGNATURE-----
diff --git a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.2.12.ebuild b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.2.16.ebuild
index c5e73a5252cb..b4d70e387712 100644
--- a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.2.12.ebuild
+++ b/x11-drivers/xf86-video-virtualbox/xf86-video-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/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.2.12.ebuild,v 1.2 2013/04/14 08:00:46 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.2.16.ebuild,v 1.1 2013/07/08 14:51:45 polynomial-c Exp $
 
-EAPI=2
+EAPI=5
 
-inherit eutils linux-mod multilib python versionator toolchain-funcs
+PYTHON_COMPAT=( python2_7 )
+inherit eutils linux-mod multilib python-single-r1 versionator toolchain-funcs
 
 MY_PV="${PV/beta/BETA}"
 MY_PV="${PV/rc/RC}"
@@ -22,7 +23,7 @@ RDEPEND="<x11-base/xorg-server-1.14.99[-minimal]
 	x11-libs/libXcomposite"
 DEPEND="${RDEPEND}
 	>=dev-util/kbuild-0.1.9998_pre20120806
-	=dev-lang/python-2*
+	${PYTHON_DEPS}
 	>=dev-lang/yasm-0.6.2
 	sys-power/iasl
 	x11-proto/fontsproto
@@ -39,6 +40,8 @@ DEPEND="${RDEPEND}
 	dri? (  x11-proto/xf86driproto
 		>=x11-libs/libdrm-2.4.5 )"
 
+REQUIRED_USE=( "${PYTHON_REQUIRED_USE}" )
+
 BUILD_TARGETS="all"
 BUILD_TARGET_ARCH="${ARCH}"
 MODULE_NAMES="vboxvideo(misc:${WORKDIR}/vboxvideo_drm:${WORKDIR}/vboxvideo_drm)"
@@ -51,8 +54,7 @@ pkg_setup() {
 	linux-mod_pkg_setup
 	BUILD_PARAMS="KERN_DIR=${KV_DIR} KERNOUT=${KV_OUT_DIR}"
 
-	python_set_active_version 2
-	python_pkg_setup
+	python-single-r1_pkg_setup
 }
 
 src_prepare() {
@@ -107,8 +109,7 @@ src_compile() {
 		/src/VBox/Additions/x11/vboxvideo ; do
 			cd "${S}"${each}
 			MAKE="kmk" emake TOOL_YASM_AS=yasm \
-			KBUILD_PATH="${S}/kBuild" \
-				|| die "kmk failed"
+			KBUILD_PATH="${S}/kBuild"
 	done
 
 	if use dri; then
@@ -129,27 +130,27 @@ src_install() {
 
 #	# xorg-server-1.14.x
 	if has_version ">=x11-base/xorg-server-1.13.99" ; then
-		newins vboxvideo_drv_114.so vboxvideo_drv.so || die
+		newins vboxvideo_drv_114.so vboxvideo_drv.so
 	# xorg-server-1.13.x
 	elif has_version ">=x11-base/xorg-server-1.12.99" ; then
-		newins vboxvideo_drv_113.so vboxvideo_drv.so || die
+		newins vboxvideo_drv_113.so vboxvideo_drv.so
 	# xorg-server-1.12.x
 	elif has_version ">=x11-base/xorg-server-1.12" ; then
-		newins vboxvideo_drv_112.so vboxvideo_drv.so || die
+		newins vboxvideo_drv_112.so vboxvideo_drv.so
 	# xorg-server-1.11.x
 	elif has_version ">=x11-base/xorg-server-1.11" ; then
-		newins vboxvideo_drv_111.so vboxvideo_drv.so || die
+		newins vboxvideo_drv_111.so vboxvideo_drv.so
 	# xorg-server-1.10.x
 	elif has_version ">=x11-base/xorg-server-1.10" ; then
-		newins vboxvideo_drv_110.so vboxvideo_drv.so || die
+		newins vboxvideo_drv_110.so vboxvideo_drv.so
 	# xorg-server-1.9.x
 	else
-		newins vboxvideo_drv_19.so vboxvideo_drv.so || die
+		newins vboxvideo_drv_19.so vboxvideo_drv.so
 	fi
 
 	# Guest OpenGL driver
 	insinto /usr/$(get_libdir)
-	doins -r VBoxOGL* || die
+	doins -r VBoxOGL*
 
 	if use dri ; then
 		dosym /usr/$(get_libdir)/VBoxOGL.so /usr/$(get_libdir)/dri/vboxvideo_dri.so