Version bump. Removed old

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

18 files changed, 196 insertions, 150 deletions

diff --git a/app-emulation/virtualbox-additions/ChangeLog b/app-emulation/virtualbox-additions/ChangeLog
index b4581096ccd9..638f4943037e 100644
--- a/app-emulation/virtualbox-additions/ChangeLog
+++ b/app-emulation/virtualbox-additions/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/virtualbox-additions
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-additions/ChangeLog,v 1.69 2013/06/24 10:53:58 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-additions/ChangeLog,v 1.70 2013/07/08 14:50:31 polynomial-c Exp $
+
+*virtualbox-additions-4.2.16 (08 Jul 2013)
+
+  08 Jul 2013; Lars Wendler <polynomial-c@gentoo.org>
+  -virtualbox-additions-4.2.12.ebuild, +virtualbox-additions-4.2.16.ebuild:
+  Version bump. Removed old.
 
 *virtualbox-additions-4.2.14 (24 Jun 2013)
 
diff --git a/app-emulation/virtualbox-additions/Manifest b/app-emulation/virtualbox-additions/Manifest
index dd208c63ccf7..144dbe96ab72 100644
--- a/app-emulation/virtualbox-additions/Manifest
+++ b/app-emulation/virtualbox-additions/Manifest
@@ -2,27 +2,27 @@
 Hash: SHA256
 
 DIST VBoxGuestAdditions_4.1.26.iso 52281344 SHA256 d824f920ce69cf3710b980b972f9158e27d081e89b114a597b181eca1842687d SHA512 f4fb80a61f36a22d7bbeacc0e342671e0a3aa18c12fe90c35edf29e586bcb43157f0c20ce19bcbf7a48a5cd8568337d35afc44ae35f2f55f4cdd077600cbe747 WHIRLPOOL 0f81aece690cce386fa21d8e109cf7730ad91becbce68be7df21839dbfbf52252f360f9530a4af1d5b15bf38551c1b53d141bd05fdc61cc0c5e5b87b529d0e34
-DIST VBoxGuestAdditions_4.2.12.iso 59488256 SHA256 aed4730b643aca8daa0829e1122b7c8d592b9f6cea902a98e390c4d22373dfb8 SHA512 3746f4818014408cbb3d82a17e972f67fad58f81fb77b68a53f8cc997c8e7730afeaab848b4a5d1d4ad10bf1128dccda16dd3b33d900fc8106d2d0b4ec4c5874 WHIRLPOOL a8de229018dbf119e4454f16df090504aeada01ea03017736b25da4f10525f8798ed593b01d575d18845dfd7d3ff8dccc4b3aabfb7c231b12286573a952907af
 DIST VBoxGuestAdditions_4.2.14.iso 59633664 SHA256 9f08f13bbd818fb3ef9916658542ad0999c35e11afc1f6e8ff0b944405486e8a SHA512 8d3e55124d146c51f749a991b0fbca211ae1395ebcd5d50e35c4769df3444d08934acea8660a425abc302c6c0c4b8a0928b442c80753e8a7060e4bd0ebd1ac4f WHIRLPOOL bb7a9f66e3dfb725654eed65259c2a5f1b807aa67d33525cec8c23f1b1fed43d37e62fff237e8ad149444b0730e0b090ed712eab6a55d24c04891098f9c17227
+DIST VBoxGuestAdditions_4.2.16.iso 59633664 SHA256 cf2b0722da984a5f41a7814ee288262cbdf4c785630b2a7726c3daa6c5caa0c5 SHA512 9704c0cbc5d8be92a76b77af1d7d1b52cf9534e12c7ac4295b0a97f179a9fdfbddba9126ecc93f32067281d6eeb0091a6bf726ab61d8abc15e175699648b7604 WHIRLPOOL b02f2f633db6170eb6d54e7724531a0c6ef96103bde765fe901b5e92d22906b84ed23b93021fe9fa9725512d2d3a31d80430fee9ccd17aba1a5e9ec5200ff4c9
 EBUILD virtualbox-additions-4.1.26.ebuild 808 SHA256 1a54313e9c886be179ee323d4b51518e83447e1f5660192c694627b72c6372c0 SHA512 e3f3258a8d811017f4a6019d88781ce149c7385da010ac5234321e65b1dcd76f833a249f44e0112ab431adfb18419d939a9fa407ec9deaf74fd34073944689a4 WHIRLPOOL 5960a67122ce745e27a18fd324041ec7ad5067a6ac8bb1ff531cebf6a116e51a391d1bca6dba615ca21ac77c52143182611bcd2e7057849ec94838d077827109
-EBUILD virtualbox-additions-4.2.12.ebuild 863 SHA256 efe8c79084121a803cb5ade1b0fdfb977cbbe4565846cdd6f30f20a94cb23096 SHA512 b9b8ee86058adff78c3dfbbb28f21205bbdca78895e43496c39bfb9ef02ad2e1e2dbcaae706d68026eaed93a9e2ef93c50b28b43e0efa36ad3d1045aa7cdbcf6 WHIRLPOOL 648adb9a91fd687c021a6903c2c5b6e3cf09966786d55e7b48cb6b6da3bb649f285c6af3c2232ab56298bfd53c78cb9d49e3862037e1997b798690c7927c45bf
 EBUILD virtualbox-additions-4.2.14.ebuild 879 SHA256 c70db408bdbfac443b2d6c6f9b2fbce288ddb0da88ee0b0c3bf241b62243819d SHA512 360c7dc947271f3882abd9a5c96ed67331c38ebe22af95a4003f46047f9b5fd402ef76ade2f9fc12d722bf2e9bbd1885970d564cf236c8cc496db548e9564875 WHIRLPOOL 296d1c6bafd357b751796a71fa7ac61c4eb5dba5d94bfb01ab3521111cc9582d193e63a1cd4e136697f3b65ba23eac805adbb1f441e6340be6be6555eafb4a1c
-MISC ChangeLog 9039 SHA256 1efcfaec00dcbd44548b572975bb605ff0b5eaf03ccfba44ba9a852185e81e16 SHA512 115dc38ff72b0fa5485cce279c3384cd07c96358556c2ee6a10dc12ee748bd943d02ce57959ee83a40447d55605c99301432ab32273eae428eeef35707d3ad47 WHIRLPOOL 65ddc96614b65a059b4b80874bf2cc5113133132df948becb37e10f5104137fcfa413b519cca1b716688aa00b0e710bb3c1a64f58ebd92ca68359538ed344323
+EBUILD virtualbox-additions-4.2.16.ebuild 879 SHA256 9e1f2dfd6e1ffce842da788c4eec2948f7aa1f1a2abb6ddb3790adbbe6611f16 SHA512 05617d7b70564853bc0a54ec90d60b75d528a2a4f7baa83db506a007286ce395ecf35497a76333cc2354a976c16c2a5922c657ad94dafe09132bedf3ee05b9ca WHIRLPOOL 4fa4f2a4a5886ebfa8b159c329ebfc4c00fa9e68e26f826745dbe3a5b08dc0c9dfd9a6df7b9af93abc49d16c06e50ebc439263b558551e0b4f4a79e529bf5e98
+MISC ChangeLog 9243 SHA256 d7a0df916ab4221a0e8c34991b30151c7174a949a257f883224a7402b9ecc1c6 SHA512 481b607be8a838bdd57c3588bb5c0baa0b641a8b290b1993e56bd71cec8abe1fe34b4c38963e616d9a682946971c49b85ab0a69523e7796378c17ec40dc29376 WHIRLPOOL 41b9716b13b3742be0bea1f4d0d8c933d97b4b15ded1687f5f85752f845eecde84a7d44cc739e8bcd61267647125f69f99890f14f39f063fe84dae905aa21716
 MISC metadata.xml 343 SHA256 a140b9f7a9a02b10a4a9d0c1b42525fcc308931b04043a4d94db1e5623b7cd16 SHA512 f25b5b150709c22f08bbd26076bac479a146257e602e79f72139bb670bc234226c0141c801c0e939b7b352ee9f4b71ba7d1472702934d1d8308ca8776b66a7ca WHIRLPOOL 808eff318d191c163eeb7b21be94f4dc073a38b48d603c0ecd24c3d333df5a38cfbc1a8280e884aa75c71cb6450d17594797422170093d4153048390b7097a2d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRyCVHAAoJEPiazRVxLXTFShwQAKKA3+lvA0/RAYa/UNCDf9IL
-EtYKNX6kE7+jCTCaxtzszRncCi68kiiP2ScW/2nOuSZPRWMdZdWjKrpZnTie98YA
-twNS73x6KOr94VOuvWcCXmg6Avvn2k5gkKU1RjgkFfzZbRuMQvam6aq1JXKZvaSU
-WJbA6h4Rj0+oByiZJODVpfcadRqnYQYyIe9AATYlaQ0i+TaJ+t3KX12I11FWnkQu
-CwrKpQSVhK1DqNh73sCuqTo1//wF22qOgnwy6ICOFrkn8vGmmdZfaWs1CGX1Sz1s
-49p/b3sepvgyk2d/fp55v8PkJaOxqIMzhHyNPH4kkanpvK3a9QV6IXG3h+S5ITf2
-JYrpb6cuFEk03ntAZZ5JH3SB425CGcjwH7aEuaJ5PbycoHRpCGYHznJih06TSY0K
-67r4u508kO+DM4ydcWuLrKVgsTDMhGMYE4E7+ThToinP6FEb05q1wB+2hsNhqzLd
-Vv+AMsCMeBnhsV5w+EyGw+OS0smduC0KJbFTOlm5bDvvzrjaAk8WBKBQV1JY7rsO
-vDG9GFLCnfTJWf5iofquBui0GOhKMRhStR7ahNgDAb/9iersoC4BHfUFmfOcPjzV
-qCimV+BRX+xUw5hHWWTTsLhlHehTZVcdIvHjJ8XVeKULdqaVkWURM6Sn3TZVbTAC
-3Ys0y0MAyMg5nn/ZSPfq
-=CMd1
+iQIcBAEBCAAGBQJR2tG4AAoJEPiazRVxLXTFMGcQAJ79xL4rd3xGDySrYvqm1TIp
+l9/Xccvu30Z9ixNJXOygDSf5vkzVT6iz6/pNVp9LwobnK4BMGO847klrlRBbE/No
+fFR2rX4gyDNxutu3GD8+KlIqr+0EFziQZPso0J8g11ycJB5QadnZWHEZZuKoiGxe
+U5jP5nRWHMUMCvCsg4OkJ5jr9jBNzZRm6kpW7fTxn8Eh4YNDZEexyb6qi5FHUPec
+hikMmEBZb0hu5LzdDXbvW6IYshHT5SX0cB1GR8AgAnts3Xo7F/KDCnsbfgWh6hqp
+82QpAdtG9lwO5ZTc5pP0JJp1Wy7b3bRMLC0dQ//MSJbGUGlDrgnm6Ek/ZAUilJga
+xA+YbJxTt0pTFNvhDDpNUfGnldjZon16k6uDK+WNSIiHVJsTQ0z0k+XSoZdV1BW0
+c7Pdj13KqdiuCbimNda6V72Xiq1fU54bUSDfeacCVmRyc/yQuV3oVyXb0ziSl2Rr
+nFmvJhT4vS1tVwBVsU4nVrRJWcsdk4CtSKlTFWw6BSDw0MKLXbrbJ3V91zh5ohiQ
+bmaYaXT5mKKtFdjb556ZU9m+RtMP3hL6y93RdloS9J6GJy8f4e8eJK4y0rl3ANdg
+pJVPVAEs+GMFj2MnzNS4Rf3cP6F9yCYHl/aluW9yZMpy7ZvWPi7yLt9kK8CqLyu8
+EmQMRQdAsXqsBdRatgfS
+=5JI7
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/virtualbox-additions/virtualbox-additions-4.2.12.ebuild b/app-emulation/virtualbox-additions/virtualbox-additions-4.2.16.ebuild
index 5ea469c57e88..2f5bed4e3aca 100644
--- a/app-emulation/virtualbox-additions/virtualbox-additions-4.2.12.ebuild
+++ b/app-emulation/virtualbox-additions/virtualbox-additions-4.2.16.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-additions/virtualbox-additions-4.2.12.ebuild,v 1.2 2013/06/18 12:09:58 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-additions/virtualbox-additions-4.2.16.ebuild,v 1.1 2013/07/08 14:50:31 polynomial-c Exp $
 
-EAPI=2
+EAPI=5
 
 inherit eutils
 
@@ -24,6 +24,8 @@ RESTRICT="mirror"
 RDEPEND="!app-emulation/virtualbox-bin
 	!=app-emulation/virtualbox-9999"
 
+S="${WORKDIR}"
+
 src_unpack() {
 	return 0
 }
diff --git a/app-emulation/virtualbox-bin/ChangeLog b/app-emulation/virtualbox-bin/ChangeLog
index 4034de547c11..12a7cd641de3 100644
--- a/app-emulation/virtualbox-bin/ChangeLog
+++ b/app-emulation/virtualbox-bin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/virtualbox-bin
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/ChangeLog,v 1.158 2013/06/24 10:53:10 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/ChangeLog,v 1.159 2013/07/08 14:49:36 polynomial-c Exp $
+
+*virtualbox-bin-4.2.16 (08 Jul 2013)
+
+  08 Jul 2013; Lars Wendler <polynomial-c@gentoo.org>
+  -virtualbox-bin-4.2.12.ebuild, +virtualbox-bin-4.2.16.ebuild:
+  Version bump. Removed old.
 
 *virtualbox-bin-4.2.14 (24 Jun 2013)
 
diff --git a/app-emulation/virtualbox-bin/Manifest b/app-emulation/virtualbox-bin/Manifest
index 51d5b0eea036..dd633b12724e 100644
--- a/app-emulation/virtualbox-bin/Manifest
+++ b/app-emulation/virtualbox-bin/Manifest
@@ -8,36 +8,36 @@ AUX virtualbox-bin-3-wrapper 2931 SHA256 7ed4834ece201cb6a9da57e36a1a9b47bd05405
 AUX virtualbox-bin-config 28 SHA256 5326f7abdd1a7c8a8a44fd4ab269977ec115286059fc8a4c2fde6805c381236f SHA512 8086ef107aff0aa3e17f5fcb8ee5de4dd8a24cb119c3523e3e3a302819eb4258328adead1b6f40b96706539f4e1c43dbd5c055a16a304ac29f7f302ebf2e4c4c WHIRLPOOL a385c2b483967f1241cc36af895e7d8f64b9af324f276bb89ffe7a39f415fa403902f5f65d106a4db7ee1f9f4367c69dc00005c49ef1f5aaf47bf3298b0f6abf
 AUX virtualbox-bin.desktop-2 205 SHA256 5dd74e2f4d1717633aa44e909305c6995a20f03a5f1271fcd1c92b0803ab18ca SHA512 7e9555aaa317e1cb551e5ff591b9d20bbb76a738f9e923c13d206e02c1e6bfc8f4eb17b498b235ac0aa2062e4acbd5f24d2522de2da3cff2e12c264875bc476d WHIRLPOOL 134cecd8c614f6c1b63a929bb1f1a3460f8aa3c1308b17e970c80f7b47c0c9bc78eb74c24c9298c7ed43c66134fb69ebb1f16d4f3226b3d2528134009b0bcb07
 DIST Oracle_VM_VirtualBox_Extension_Pack-4.1.26-84997.tar.gz 10856343 SHA256 b392c2f8ed8d813a18597679a90eed9d76efd12d161373cbc5bd7de8165f5ce2 SHA512 581672dd46910cea77d0762d217f4e5afe28f5b45dcec68568885214e745af637a8588a96a85c5b8cb1b761ad68b05e8148d580f30ebf851228d34888c77998e WHIRLPOOL 6c9e3971259bfbf4f54ff6c7eb571f47bf78a51e5d1f4cce01529f7727444c366b70c343c1d0ebfc8fa1adb4bdd57ea4644f813f2991b6cb8f2d381a34f69372
-DIST Oracle_VM_VirtualBox_Extension_Pack-4.2.12-84980.tar.gz 11623302 SHA256 ad15a92e49095c2115bd1793b3b957d3eaf44af0f5d24bb53d6b4fc81c3e2fc4 SHA512 edd5f165ee846711d0e1c745652dcb62c91f3b674ace2ecc717cc57118b0a62ee880ce94683d0f0faec94872d992827580d167c2b1be7c5aa24d9c170da28f29 WHIRLPOOL 12e997d638191dcd55c3dbbfe68c99d46f120ac2438fff4ca9aac968940956ddbb0f2d88d042031d2058e9bcafa7540ea8bc0d624e9777413d821fcaa3ddd6fd
 DIST Oracle_VM_VirtualBox_Extension_Pack-4.2.14-86644.tar.gz 11639710 SHA256 5813cae72790de4893cadb839ffbd148290a44ec6913d901d84c9b3740ab1b1e SHA512 83195adb562974623a2d86d4d1f4197e552240875b9ddd787300fb3bd06ffd6a63d0cf860a8b8ac3ebd854996562c821bc737fb1e2be81841e65d1d9313a7099 WHIRLPOOL bcc459a1d68eaae49904dfeeaf5e935a3f6115274411fc7c9ce07877b1abf99b5d44b38ed53d3f657b86c64c875920038160691dcb7e2cef18d577b0f1e2c0a0
+DIST Oracle_VM_VirtualBox_Extension_Pack-4.2.16-86992.tar.gz 11651255 SHA256 8f88b1ebe69b770103e9151bebf6681c5e049eb5fac45ae8d52c43440aa0fa0d SHA512 bd7c4d0f13871485ffa69fa5b27db0d9e8b578e9335149dc7d34b5b8fe49a89d1122494590435ac269357249d3bfaf45aae1a0915e223f4b3c40c12618320782 WHIRLPOOL 92e7afc998b642861564c0f2d59be1414ac85b0864114c76a5954476d61f1a7a82ef2a9e9a88931333dfbbe866390c5aefb8b4df5606bdc0b0371cacf42907de
 DIST VirtualBox-4.1.26-84997-Linux_amd64.run 78611922 SHA256 53d68de15bbdff02212e5f1fede92ce026817e6757079b6bfe19e170b780c096 SHA512 ab231749a2a7394d820032bab274dc2b66a0aaf3ff0e2ea069524191a80158410d1a5d3615094c5d185f214f402b4f5cf14474b3443c06dd4cc9a6b584329747 WHIRLPOOL de1b6ccb48af500e453fda213876d0da56b26cf9e86a068d3234a6d52cdeaf572399e0be0342a969ea1b2e7d7e21b392ec8f3bc40c4b5cb0ab96eeaa036dcfb5
 DIST VirtualBox-4.1.26-84997-Linux_x86.run 78489038 SHA256 67c690b9a419bae86eaf621ef05a7ba497d55adead4aa27c5d61412960b2f0c2 SHA512 0db76dac6b1fbb9a46cb37dc6b66647ab1658f41a8890ff4b4dbd84933aaaacc0a569e84a6f49e30c96fece3574bd29e4e921dbd1260ab3c7ddb4cbc17e9aeca WHIRLPOOL 4fea84cb7dcdb4bd4f2d5c20efd5d0ec9d1d665c16b6f4ba29ab10d18fc9d098fe3bdd782c41653476eeba42fcfd2cbb4be010eb45f04678798fc629e36e9ad0
-DIST VirtualBox-4.2.12-84980-Linux_amd64.run 85134802 SHA256 fa3fe24d376b5dc8c93a1938954ecf7786a78082bb20eed4264dfcdef81d5f4b SHA512 15f60e27fae72e1444ec33eeb4b27f6f9b818a2417851dfc2682900ba422f491f66d67461e074385e5e72bb4e7f83d14b2ac628761098e6a7f53bb44a227ff72 WHIRLPOOL f8cb4d8378a0fbc22009ebe79a82389e7ed8d5f285ed16f4af5937ea086fd322a89892aba6232764822bb8f03cab2fbce491546bbc0d2b8678713d6e2ae465b3
-DIST VirtualBox-4.2.12-84980-Linux_x86.run 84807118 SHA256 4062f3cf97aa05158ae7f53171501de79c88a67fb061936953186b0891315322 SHA512 2ff305945e59c8087e8127e66554d75fa7692ef33a71097da0eb099156ad150694fc463c1e3cea792541531c0afe07641217a2224c8485358ab60b4eab7cbdbe WHIRLPOOL 7a90df8f124bfc88aca239c7090ea3fa59e7c0d357cae4e339f63dd45b4984941920ba128cb41a74534a79d0ee4edc3c51c99e2a3b3027d485490bfb5593a3c3
 DIST VirtualBox-4.2.14-86644-Linux_amd64.run 85288402 SHA256 03914540108ade1b18327fb38fb7daf158e2ffb81b901f5d13e265abe9d27761 SHA512 614c8748edc2effcbd96a60d2a70ad47f6331414ebdb6e9ccc66beb65206524f288ac60f7364b9376a21b1f9d195914a68a581997c47e4797267300b0d62682f WHIRLPOOL 54058eec4bd144aefea35d0aa4d280726e4f1cf481c26e2ee1116702564d2231e0ad0460854b2ae93ac6b6243142b3cf469bf192d3c4372bfe833d9b304c82d7
 DIST VirtualBox-4.2.14-86644-Linux_x86.run 85032398 SHA256 e742150882e402b3854292d41361f779f1b7a9d7a86404ddcaf964bfef470b72 SHA512 1a2f088929644a604d7b0580531bd920f0f77d83150994ebc4f4dd7b2c4fb5388e497789f4cc6eb97775f55b37287146481e08a57fa05b7643671183cd156eb2 WHIRLPOOL 4e59ebfa2b0dda2201e8b1d0ac6b9419bf826e71ff234f079ef8d1d9ee337f6d4708be21f5c16e16740e3f85d4ac1898db350800af80515d6fbc22c35e26e682
+DIST VirtualBox-4.2.16-86992-Linux_amd64.run 85237201 SHA256 68b6971aad1ad9cbd03dda542da14d42e883285378a63c81824b2c5d6b73847c SHA512 6c37afc5216c1b9cdba711f67623824d8afc0f3f3d084ce66417f90bae843ac6db336e551ebfe72a66dcab66e64fd7352e9e55163033f6f083160668fcb79d6f WHIRLPOOL 69ba8a8cce2b168d35c4b670be816886af6b6dfd5225679ebd94817d4c5563df38b49ef66b4db499601a7a439e1ba3b47939c7da3b78a0679aeaae1eae0eb78b
+DIST VirtualBox-4.2.16-86992-Linux_x86.run 85042638 SHA256 1e9993a73fe6522948d1753cea07a793639ad161f396b1cb82d068ec06d9e25b SHA512 d9de0708fc383f4530293455f8cb2b631572fc97f3df1ee371b620b9b7bfa52e14e73e4586bfff40aadf1cab80de048421c63c5e7e5023782855c7de246c6b38 WHIRLPOOL 2c2e9822755b883e4f2f391c3729647bfdb3679edb96fbd640d5fe80ee066b36499e92abb05831115ca9bec13828781c4b7124fd66b2421ca6fd35fd20f9fc89
 DIST VirtualBoxSDK-4.1.26-84997.zip 8805729 SHA256 5fbfd1773d0ef0bd72400b387cdf1b9a469499e442f400b98b22f9759c9f3026 SHA512 a888b622447a55157b5de23e7559ef9f45066bf55a4f082fdb1b4c313eecc84e908658239199c2b1f1c61bab2ab31ddb4ac597d648502cb28b9aa1053e2d954c WHIRLPOOL 4cb49c5041d50c068f2ae5d1772f4e1335c05a0fd6003aa54b9109536c090145e029e4c47c845f82ee7468cf262440ba15ee0bde7b9cc28d97f8ee25910a0756
-DIST VirtualBoxSDK-4.2.12-84980.zip 9719647 SHA256 b61fd0228ad33764f14b23833908b9a520f98985a5ab45d96bede4a8c47d71c3 SHA512 8e085ebb0a4053c7972054bb4e2452c15536bb88e5c28e4c40fb1b50eb2d1f4868176d88ec4afeec3a88a48678fcdcd770fd43654e540e0a39246fad8d63094d WHIRLPOOL 518e9e1eda7a46fe9095833ba7809b95adeb87b745c205ae060934f2dad7bc01148ae29c54f82280756bd3508456a1c824f95251a0e550125fe4b53f79a02ec3
 DIST VirtualBoxSDK-4.2.14-86644.zip 9720490 SHA256 50c6891c1ed31247afae652a8fe879b3579eca5f9b3d820f5fd3811d59f97248 SHA512 9281a61bfdbfba2ccc6c3aa410b004ed1a2253e83656571f6664595305de5165100b62e17d32d5ef402cfda885efa99827c57fab505d81dcce751e592e9ed305 WHIRLPOOL 76992b39b3ffe386956ae4f9a6d686bfb93d3e93d86205481b2b28e69f5eea567425ff81e4e8ed8b1ba9d601247f6269a10e77c95a0d72fe4f8424561187abfe
+DIST VirtualBoxSDK-4.2.16-86992.zip 9719862 SHA256 5cee82448e82c1dab1bf2d82a1d3090d15e39255ddfde9109058559694db5399 SHA512 6d5260892384d5a2b424ef6102cac2ae7e07105aa4f0fac8011a4079ed8d3c6338a7322361ee64c593863c09a5248e37882d97c2c29797b11264711318cb6d3f WHIRLPOOL 553eb2eff56bc3487266619c9bb1f0614a385e4cd85e72ec16932c5e6389868545d23a251a1cadc2535668ebe109d0171fd76dcf5fd74ca50861a02dfd4cd391
 EBUILD virtualbox-bin-4.1.26.ebuild 10337 SHA256 76e78b1f7c14c935a71c9f4eb12320c8a1965cdf404cf533b8d47456778371b2 SHA512 85af9f684d919a889e317b42b513fabe430e534f28a10e919152537e9c31bc6fde8b17f869af02f4ea62b47c76c4cf7f799345368a4df8e6eb6d6e30ab974ce0 WHIRLPOOL 6d36a73cf775be4ff8796dd159aeebdc57f89af1c1a97b54c361e71ef58a58d13a6efb0cccd36fd50003b8dea92af79d0d25c37c0d52687410d75edf2024a254
-EBUILD virtualbox-bin-4.2.12.ebuild 10408 SHA256 5cbcbc492c4b1ff30d922926358a6d04705be6d96d44c1444c892829db07ce62 SHA512 346e9f8e4376d5eaa8a401c413a3615fa4ce358442fe5ad07d528ff02b149cb0141f09a97ec0ab1fcf55da944a6a45add32140c2333b9037ec8a24c4fec3b0c7 WHIRLPOOL bc986f5eb74f4b9e4137b6e427bb36eb78f6b507862885a7fdefe6b3c41924f96169cd792cd051d46bfb71722b750dbf249ddad0e9c9edd2a9cca42c943d4bb9
 EBUILD virtualbox-bin-4.2.14.ebuild 10356 SHA256 ee8a097ccea31d623219638a508fa7c21144ef4c532a577e15680fbe8c799541 SHA512 4ebfb1068a383784bbeb56aa97ea5ed46bccc9933a5342bcd09376914d04295cc621652737c317a520b685756c14c0e48a1df96477d288d6b701d91d23b81e68 WHIRLPOOL dd459b52155dd4cd90701114c5e156bc12f4337a4e061cfe1519915be5cace83efefe4d412bc97f17eba294a2c855c140ce1ad628e00c31d08e1e50b668ac0a8
-MISC ChangeLog 30543 SHA256 65c5baa816f3c3c4d3aed1575a6ed04a58280c16d2c199461d87df03c63aa839 SHA512 0fdbf7a174d0d516824c1d46783cbe4b9ae66c2af39a393e83feef74792dca5ea0a7db14a449691c093bcfd18a3dbd4561e8554651b59143a560935a50a9bb3b WHIRLPOOL 1f5e387da5054d50141619fe3f7a1ca169b3a1248f4575d0ad0b7a52e015f16df4eb6d65fbd5622d4d8f701bd24c5caf7a373c50e39e888c9620d60acb414d3f
+EBUILD virtualbox-bin-4.2.16.ebuild 10356 SHA256 1b57eea631057a68138616cbb157361173faa2de31e933295ed38f93f5eccb29 SHA512 19a6a2f3040df08d3ae2ca873d86ea5039a5e096eb434427324485b9c6b8fdc771eb97f18bc3200f91a0a92ab4c8af252a7336890c79dbde852f00ac902cc5fa WHIRLPOOL ab29b2f541db5312971229ea2914e2c25b8a4dc7aab8a3c550742e431cf2be59b0503e4f6c9bd0c36a79805a1e223b22e9a778aa5e21cd3cbd6e65ac0fb76542
+MISC ChangeLog 30729 SHA256 8a9acb51defc74343ca44ff68b2821ab5590f2e51208671849b12096a7426c48 SHA512 9a596457dfefb3ed007233f6f29c3902361f273fade3aa4109827dd14615d6e0cbde2851000ba7bc58504e0b5ee1fb01bdfea618ce9f1de4e70ac24b4d1608ce WHIRLPOOL efbc3c84c5d640762d00f19f8e24a52bb6ca18e9455ac62746aea5c421e7b7c97160a2c84f63deb08425f331f530f7f9823cf23843d96da345eea3039b2b2534
 MISC metadata.xml 662 SHA256 1a43722470ad0c756ffba63e85224410ce461c6567fa41d649094c9d7b887b8c SHA512 6276b85358c9c1e24775caf3af3deca45634882a3be7b14c12a8f11e97163b3bb17afac955097b849b1646ff99321ed89373c4091c235c58c069e648646227d9 WHIRLPOOL 69268a11fef6d6cf15a8b6d0a104f1030c401c205777b10c7bfe82c4846482f8251942d674416798f45cf8dcbbe6897aea1f1d084e3283fd2597d76aa2f74600
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRyCUXAAoJEPiazRVxLXTFPEIP/25BHMb1qiSgezzkBFlzw8SH
-eFXcanMK3ynumGX5PbUODdL7y/Yijyem9gCo920jSB69N8WWuureMR5GLrkJyvT+
-2mWrEsTD4sYnFNzJtnS1LYq8xKJcXEF4cPB/YfKqpa5QsWJVRDgHcC5mZpvP6V34
-iOR2cnutg/dHeITwI8Lns2jMPooTRTG87aP0ixDXphUKsMYlJKQrAm8ovQdTjbdM
-GhtPYPOqNIj1yRR9wgtHzpU06t98fDpIlbqiS69qqWkizxorXJzY/Vu9vhQpHhhY
-mEOfuUcWy0BaNUbyscrQJ7dWo/MsO3v54g04iYIDjOObFUYuuME41XM2wMQ1/cH5
-kqOTwWOuz6PA9iHS7peorcH/v7pf1vSjY2zU8LEAeaqtrORv30hSbcOjnAf2d5lf
-WZLCT6oi9VJU+BKhzQS3ml3l1e/k4li+JVV0QKKzw8eXI57gJsGJsVIcSteGpM48
-0iGipq6VvaLouZBlUS9ApXqUq12IfCcPHuKsYUxAYuEj3nROB3WGOmGHoEUVymyZ
-/ofB0nyMqfntOG30HMm6yBP0UWu9MSISq+IGQO0+FPKfMeN5HsVnjloc0cFtuTUD
-6rUDb2B/fWuGI6MvSa0oinpqnYkhkrr8FiDywZV/79wBIZrZmJez+HtFR8Or0cx5
-BwGmFOv1JsFoMijdt2Sf
-=312K
+iQIcBAEBCAAGBQJR2tGBAAoJEPiazRVxLXTFM5YQANm6yd7C4G5TVpOp3OjJRUW5
++EuvstJfWk/ciStdrGOHmsNtF7b/HUk7cJDU3D5wZ2bW4JKnWki82pQwtAyXWLIp
+05AEYqdXtjuc1rCuZ/wfYAfj9PzkxUXdjwq8tp4exe70+hWmKGSHPYw888HgC1Ab
+YpJkNmJGuAfxW3PyS7ujPdD4hLK/ssZZl4wCISmEygonV5lybE/JRanzFm33teSX
+tA5sCp73nNX4B9OSdGtnwyrP3VOW26sTkGTLM19Z19rVDq/eFWmM766Dv5W+Vdm8
+w09oOoIGVXajLQeDjENcS87/Nzmy95/sJzwlXq9BXokLMAjZzecibQmdtSLOlgVN
+hgdn2e9X37Dz/StR9n/vk4NociSYb549NXfv0HpILyICKblDKPOuweWeTa9+chfZ
+IdStm1LpBCwskn8GKipyh/qaHXrBtSCXI6II0r8mmGg2pchEhtX+Q57ZDhiWU17X
+j6F3XExVbLJ4zd8Afn2Wr112w1Vo76FDbGQS8Tsc6G+3vKuU/BWP5OnIBI8Fbg6H
+Q+PEsa4IJrAIO5c533SCGiFjjm5cRjEIB0llTs1rlWO9pjkRwNEHaXtVCx7QCDE6
+CH3aBRj6el4e6vauAlc3aeXRllcDS+pNHfWfEaWGbUCgE3u5/t3Phb8blsuZye53
+OdO7CF0iVYO+GvEIUwHp
+=F4Qr
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-4.2.12.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-4.2.16.ebuild
index 9d9534480636..ba998cc3adc8 100644
--- a/app-emulation/virtualbox-bin/virtualbox-bin-4.2.12.ebuild
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-4.2.16.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/virtualbox-bin-4.2.12.ebuild,v 1.4 2013/05/06 20:44:33 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/virtualbox-bin-4.2.16.ebuild,v 1.1 2013/07/08 14:49:36 polynomial-c Exp $
 
-EAPI=2
+EAPI=5
 
 inherit eutils unpacker fdo-mime gnome2 pax-utils udev
 
 MY_PV=${PV/beta/BETA}
 MY_PV=${MY_PV/rc/RC}
-VBOX_PV=${MY_PV}-84980
+VBOX_PV=${MY_PV}-86992
 SDK_PV=${VBOX_PV}
 EXTP_PV=${SDK_PV}
 MY_P=VirtualBox-${VBOX_PV}-Linux
@@ -208,15 +208,15 @@ src_install() {
 	doins UserManual.pdf
 
 	if use sdk ; then
-		doins -r sdk || die
+		doins -r sdk
 	fi
 
 	if use additions; then
-		doins -r additions || die
+		doins -r additions
 	fi
 
 	if use vboxwebsrv; then
-		doins vboxwebsrv || die
+		doins vboxwebsrv
 		fowners root:vboxusers /opt/VirtualBox/vboxwebsrv
 		fperms 0750 /opt/VirtualBox/vboxwebsrv
 		dosym /opt/VirtualBox/VBox.sh /opt/bin/vboxwebsrv
@@ -225,14 +225,14 @@ src_install() {
 	fi
 
 	if use rdesktop-vrdp; then
-		doins rdesktop-vrdp || die
-		doins -r rdesktop-vrdp-keymaps || die
+		doins rdesktop-vrdp
+		doins -r rdesktop-vrdp-keymaps
 		fperms 0750 /opt/VirtualBox/rdesktop-vrdp
 		dosym /opt/VirtualBox/rdesktop-vrdp /opt/bin/rdesktop-vrdp
 	fi
 
 	if ! use headless && use chm; then
-		doins kchmviewer VirtualBox.chm || die
+		doins kchmviewer VirtualBox.chm
 		fowners root:vboxusers /opt/VirtualBox/kchmviewer
 		fperms 0750 /opt/VirtualBox/kchmviewer
 	fi
@@ -241,7 +241,7 @@ src_install() {
 		local pyver
 		for pyver in 2.5 2.6 2.7; do
 			if has_version "=dev-lang/python-${pyver}*" && [ -f "${S}/VBoxPython${pyver/./_}.so" ] ; then
-				doins VBoxPython${pyver/./_}.so || die
+				doins VBoxPython${pyver/./_}.so
 			fi
 		done
 	fi
@@ -294,7 +294,7 @@ src_install() {
 	fi
 
 	exeinto /opt/VirtualBox
-	newexe "${FILESDIR}/${PN}-3-wrapper" "VBox.sh" || die
+	newexe "${FILESDIR}/${PN}-3-wrapper" "VBox.sh"
 	fowners root:vboxusers /opt/VirtualBox/VBox.sh
 	fperms 0750 /opt/VirtualBox/VBox.sh
 
diff --git a/app-emulation/virtualbox-extpack-oracle/ChangeLog b/app-emulation/virtualbox-extpack-oracle/ChangeLog
index a44fd046d6ec..255f2ac826cd 100644
--- a/app-emulation/virtualbox-extpack-oracle/ChangeLog
+++ b/app-emulation/virtualbox-extpack-oracle/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-emulation/virtualbox-extpack-oracle
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-extpack-oracle/ChangeLog,v 1.47 2013/06/24 12:31:04 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-extpack-oracle/ChangeLog,v 1.48 2013/07/08 14:50:54 polynomial-c Exp $
+
+*virtualbox-extpack-oracle-4.2.16 (08 Jul 2013)
+
+  08 Jul 2013; Lars Wendler <polynomial-c@gentoo.org>
+  -virtualbox-extpack-oracle-4.2.12.ebuild,
+  +virtualbox-extpack-oracle-4.2.16.ebuild:
+  Version bump. Removed old.
 
   24 Jun 2013; Lars Wendler <polynomial-c@gentoo.org>
   virtualbox-extpack-oracle-4.2.14.ebuild:
diff --git a/app-emulation/virtualbox-extpack-oracle/Manifest b/app-emulation/virtualbox-extpack-oracle/Manifest
index fbb6ab60c27b..5cf9190fb70d 100644
--- a/app-emulation/virtualbox-extpack-oracle/Manifest
+++ b/app-emulation/virtualbox-extpack-oracle/Manifest
@@ -2,27 +2,27 @@
 Hash: SHA256
 
 DIST Oracle_VM_VirtualBox_Extension_Pack-4.1.26-84997.tar.gz 10856343 SHA256 b392c2f8ed8d813a18597679a90eed9d76efd12d161373cbc5bd7de8165f5ce2 SHA512 581672dd46910cea77d0762d217f4e5afe28f5b45dcec68568885214e745af637a8588a96a85c5b8cb1b761ad68b05e8148d580f30ebf851228d34888c77998e WHIRLPOOL 6c9e3971259bfbf4f54ff6c7eb571f47bf78a51e5d1f4cce01529f7727444c366b70c343c1d0ebfc8fa1adb4bdd57ea4644f813f2991b6cb8f2d381a34f69372
-DIST Oracle_VM_VirtualBox_Extension_Pack-4.2.12-84980.tar.gz 11623302 SHA256 ad15a92e49095c2115bd1793b3b957d3eaf44af0f5d24bb53d6b4fc81c3e2fc4 SHA512 edd5f165ee846711d0e1c745652dcb62c91f3b674ace2ecc717cc57118b0a62ee880ce94683d0f0faec94872d992827580d167c2b1be7c5aa24d9c170da28f29 WHIRLPOOL 12e997d638191dcd55c3dbbfe68c99d46f120ac2438fff4ca9aac968940956ddbb0f2d88d042031d2058e9bcafa7540ea8bc0d624e9777413d821fcaa3ddd6fd
 DIST Oracle_VM_VirtualBox_Extension_Pack-4.2.14-86644.tar.gz 11639710 SHA256 5813cae72790de4893cadb839ffbd148290a44ec6913d901d84c9b3740ab1b1e SHA512 83195adb562974623a2d86d4d1f4197e552240875b9ddd787300fb3bd06ffd6a63d0cf860a8b8ac3ebd854996562c821bc737fb1e2be81841e65d1d9313a7099 WHIRLPOOL bcc459a1d68eaae49904dfeeaf5e935a3f6115274411fc7c9ce07877b1abf99b5d44b38ed53d3f657b86c64c875920038160691dcb7e2cef18d577b0f1e2c0a0
+DIST Oracle_VM_VirtualBox_Extension_Pack-4.2.16-86992.tar.gz 11651255 SHA256 8f88b1ebe69b770103e9151bebf6681c5e049eb5fac45ae8d52c43440aa0fa0d SHA512 bd7c4d0f13871485ffa69fa5b27db0d9e8b578e9335149dc7d34b5b8fe49a89d1122494590435ac269357249d3bfaf45aae1a0915e223f4b3c40c12618320782 WHIRLPOOL 92e7afc998b642861564c0f2d59be1414ac85b0864114c76a5954476d61f1a7a82ef2a9e9a88931333dfbbe866390c5aefb8b4df5606bdc0b0371cacf42907de
 EBUILD virtualbox-extpack-oracle-4.1.26.ebuild 897 SHA256 95cbc225fedfb23d1664c6d4cc88a42b0bf1684a868c846abf0100a14eb9ef1d SHA512 0be6a5296dcd87a68a3fd77c1ee8c6aff7adf65ab9758be2ea89d8b43e153ac9a8601d82698beb6ebfe41c1833b05ac3c4a58b33e996eb0c88115351f37b7618 WHIRLPOOL fb7908ac3ea63d823e359ab241622a19273e03fd7f7ed107ced23737a6ef167bdaf8ad8e031e10a98f0c27ef81d5d94b73255aa2a7dcc9384eab3d06771c1fc5
-EBUILD virtualbox-extpack-oracle-4.2.12.ebuild 961 SHA256 510d6db01ee9e4ab49f35bdce580a182f75f7426bdc9960fd361f3664765228a SHA512 7a89393db12bd445d053dbe0c631c59b60e1d1e37057ea26b3038e5c55749050616aace445cb18b2c42c717819b01410e7f87e929c49d89b79c0fad74cb7a729 WHIRLPOOL 96f1f3fdfe103b6f9ae474f7bc050ce69e44dec7c5f26531eb722faeb3aa550b593e4c62fef36d49cd69b8b738203cb68df41b19459c486d3b114e361f7633d2
 EBUILD virtualbox-extpack-oracle-4.2.14.ebuild 977 SHA256 e9960b337972483e9ddc3a0d918921a45f99173d01fbc272c8d98be8f0e06ddc SHA512 1f192d3a256615962bf9e390f8758595cffff46cf36200c3e8ffca7a0f3307c0faa23a13f4cbca0dcf6aa465cad29e84bf6f8cf9054f3df255a92ecd2fadc841 WHIRLPOOL 9deaae49ab0b3c86e345819721c651adf3f3e6453ca77739ebe7c5693c7da661c2ca79f3569275ba62d1da8b6cb30afccf569c9617d4b9630fde6e144c05dc8f
-MISC ChangeLog 9138 SHA256 7b2015e46da26634285e3f15a5a757087c5fdf497d1d38140bcca32456e5f897 SHA512 f6973977efe8c8e71099b88290b290011b95f1cb4c12b7c7945bcbf5598767a1abf980cb8f5e478e0de7946ca00f2153a613f0685b338bdcc0930829c98fbdcd WHIRLPOOL 8b11e04ce9b2fc9da13cd2e05a9d58858b3535e24851f718ec68ebd850c74c776ebe7e02d7024f0cb0a9b76427a100ea7944f2486f845c45e77fb4b5b0ea32e4
+EBUILD virtualbox-extpack-oracle-4.2.16.ebuild 977 SHA256 17a24eeb969b18b7af9db1c2591fd267aa7da9ecc8512f59dbbd967e6c9e93c3 SHA512 2fa5a268a184b7a3577698346045b45b382f8d4acc5a7ebec674fa01d460a34297755ca194e846f8ed54b531166360cb6e7974d7b5b7e61189e17c6ea281e1a1 WHIRLPOOL 3ee79f3c867f5f6c020d2fd1696921af4ffcc8acb7fe15b02ec408609cde0f6237fbee90b3249f4828e08290f31b8b80bd0560cf6f982a45f91340812f0c582a
+MISC ChangeLog 9359 SHA256 3e7caee039902fe6e45ff894028e4305f50e6f41381ed92fe0d7043d493f9824 SHA512 652692cab7b59d1c05c122f1a790ee7162446a724d941dbc5abb4d22db6ba57b595b6ab5f84fae5cc285e22f8127ad7bbac82616d016470f74ad41a8320c2003 WHIRLPOOL c90cb96468fc5fae145f994176803e7a0f1ca0d01aa2edc71fa9398b896d42115a45acef22b470f4dc645eb191ac9e08d82c519b96898738b78de28f635612a6
 MISC metadata.xml 343 SHA256 a140b9f7a9a02b10a4a9d0c1b42525fcc308931b04043a4d94db1e5623b7cd16 SHA512 f25b5b150709c22f08bbd26076bac479a146257e602e79f72139bb670bc234226c0141c801c0e939b7b352ee9f4b71ba7d1472702934d1d8308ca8776b66a7ca WHIRLPOOL 808eff318d191c163eeb7b21be94f4dc073a38b48d603c0ecd24c3d333df5a38cfbc1a8280e884aa75c71cb6450d17594797422170093d4153048390b7097a2d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRyDwJAAoJEPiazRVxLXTF/GkQAL+ulebCu1iq1VHlEkF03D7+
-KH/L6ST6ncYEEQGcVxyISihkFDS/CZYUZgdO4hH6V0VcIWzm4uJzmcP1hHtVh2G+
-GCkA+9kzr5ECZ6kZiEBezPNFhjHW55nbOpZJxJrRFhhGJ0YJpvf2JlYDUNeKYv0O
-/JaVIl/dpIlg4BJJVBgVx90DDyTHwXmENQsc7RQPsKsT1hk+K0216D8ZB0S6r6qZ
-WMDsfs4AUIIsfmqE04GprENVaWGmACSd3gSwGXZskGC4kh7ALUY46ABKmZX10YMi
-UgzUOMckoub/Ih8Bpr3StXrHdQ7e9aVJePY9l2pZUi4Yi9GC5D6Hs0IH8PKDHj+7
-koypTbruxsWCNpJ5LvLScU9dGlRM1JiT5vpDdIQa1Nj1kUCU6VU8KT/xaGK8I0MP
-bPUp8FXpdNu0kcmAym8miD6we2RVtQZ4k1jaKlhYt4U/Z9WVLJw5Ed+O3oV+b2dF
-Q6YcmFKQx4kJ6rTMpIa0SOPYPDIj+LxFXXxOHHEYDKRPHDk704dEhLkRzJl8zyp1
-h3Lkk5kpP1N3ezlux5pg/AiQZhvwFKM5s89Kwy/qhE4wk5BWdpNc8RZDC3PkvCKY
-jyvvL/ahgH0gWS2smsLUt5DyEwopGwB7Gxf+2xmq+IgJmny56wGbTOtE5keYId8Q
-zs5enb0XEI1wxscAwYSR
-=SirA
+iQIcBAEBCAAGBQJR2tHPAAoJEPiazRVxLXTF//AQAMMvBjYshWFP89a4fh+HSNdV
+Cwc+jyh2ZiIPnOCRFqeOeTGgbsyLT08nUH1rTNTONU31qmulS97C7q4zcSDDvsIt
+MkOAXqrdTb1Xtqn2UKH0lHohMAvnx0JJGxi7RucHru2MVynyF+x/wPRUlbmo9qHc
+Jvnu1MI4waxALuFV5ID+IcdGx7EV5m7ECZil4KbmFOEU8jp+KuXZThZIphHuvTCD
+JGg5wKeLpiAFCYzh5b4UnEMcCp8CUlhTsdP56tpMadOqttgNStORRqpDgUK/qg1R
+ZU77WfiDO3qrhDxwGPhdPVmsQBemT6MofkJXMUPlw2sVgzSL2ejgBkXThOZblHpI
+rQtFCGr1Bpcebmt9Sk3IgViJYztN6yiI697hugU5tOZCkfiG359Dw3eayKsyCeV0
+R2+amM+j8kGHeeJnpdCEFjQcaaU3eT7Qu3/+X3i0eYUgjWj8ggGEejlprZZu4blF
+4S+8SPKp6MBey8qkdqQEdOPJ18lVPKl0DK9EO4udqNxgZ/oh969R1lKqnZXCIYv0
+pOaYGGoUQpv/kjbPwcM2r9zqC8bYmv9n0teD/ZEpJbjfYkSkAOVpE14+c6Q6mMVV
+pQ+y68U72QK0m+YLQ52s+e3E2PHEOG2MoZd/1LIqlYPyvs8+BJY47a16Sg+sA6fF
+ygEwtzD8cckLavBo16bc
+=sMM2
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.2.12.ebuild b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.2.16.ebuild
index 52f4b4766db6..e2efc6a7271a 100644
--- a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.2.12.ebuild
+++ b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.2.16.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.2.12.ebuild,v 1.1 2013/04/13 20:32:41 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.2.16.ebuild,v 1.1 2013/07/08 14:50:54 polynomial-c Exp $
 
-EAPI=2
+EAPI=5
 
 inherit eutils multilib
 
-MY_BUILD="84980"
+MY_BUILD="86992"
 MY_PN="Oracle_VM_VirtualBox_Extension_Pack"
 MY_PV="${PV/beta/BETA}"
 MY_PV="${MY_PV/rc/RC}"
@@ -24,6 +24,8 @@ RESTRICT="mirror strip"
 
 RDEPEND="~app-emulation/virtualbox-${PV}"
 
+S="${WORKDIR}"
+
 QA_PREBUILT="/usr/$(get_libdir)/virtualbox/ExtensionPacks/${MY_PN}/.*"
 
 src_install() {
diff --git a/app-emulation/virtualbox-guest-additions/ChangeLog b/app-emulation/virtualbox-guest-additions/ChangeLog
index 0434ff4e5040..1cc788b60310 100644
--- a/app-emulation/virtualbox-guest-additions/ChangeLog
+++ b/app-emulation/virtualbox-guest-additions/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-emulation/virtualbox-guest-additions
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/ChangeLog,v 1.125 2013/06/24 10:58:49 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/ChangeLog,v 1.126 2013/07/08 14:52:10 polynomial-c Exp $
+
+*virtualbox-guest-additions-4.2.16 (08 Jul 2013)
+
+  08 Jul 2013; Lars Wendler <polynomial-c@gentoo.org>
+  -virtualbox-guest-additions-4.2.12.ebuild,
+  +virtualbox-guest-additions-4.2.16.ebuild:
+  Version bump. Removed old.
 
 *virtualbox-guest-additions-4.2.14 (24 Jun 2013)
 
diff --git a/app-emulation/virtualbox-guest-additions/Manifest b/app-emulation/virtualbox-guest-additions/Manifest
index 15191195f53a..3b97aa3c4932 100644
--- a/app-emulation/virtualbox-guest-additions/Manifest
+++ b/app-emulation/virtualbox-guest-additions/Manifest
@@ -9,27 +9,27 @@ AUX virtualbox-guest-additions-8.initd 747 SHA256 605e7fe4dea401547957db63e45f3f
 AUX virtualbox-guest-additions.service 380 SHA256 6cae46ea46551975200be64425cd1bb51aec4eaaf7aff330b1d8f823238aa57f SHA512 1b84ace1b6c31da871529a9c6406b0df943684083b00fd5eb9c2c270cedcaff694fdc305847178134d9f4163fe72a3b11f129d90c486ea99bde688ae621713f2 WHIRLPOOL 20d7392ae28afe05866f23a3df8bc71b34dec4627d20aaf6fc70c17bb8281737d00ad22f273ec342c01c4dfdfbc829a67c66fa67f4fc6bce1ef1b7572d6f264f
 AUX xorg.conf.vbox 274 SHA256 69475950240533abd2824a30ff08cc7d3ea246d9601ff7163115f8fc100612fb SHA512 ac2b14970dc6667ceec2dbdae52bc92cbad4aff020898ede156454e8a8a703354f15c7e19cfbd2bdd15e251493fd05cacfe814cabee0f9b4cf155e44860ed4c9 WHIRLPOOL 6bd0dba97e442c831451d58f85e5ce3bdf37fc90254db54cffbdbafe1521464e0e4aed89dd610d432c8b26dc48b98f120fd81594bded2dbb10c5eb7d7b26f938
 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 virtualbox-guest-additions-4.1.26.ebuild 5553 SHA256 1562998eb36b9e1d3f739de45afc8dd6a856f52aed7bb6865291f90c79694647 SHA512 ac7f6bfab46263f4e10ddd303af951c96db89f52aa0bb155c4cc2de3a1b34470e88986306edc16549987ca53525d71f754c07f5ca110845ddf990372754c01d8 WHIRLPOOL 753855766ce2af35d13ddd4ab83d084c34e41168ae1309dd8cf33686b6083a844184bbf2aa2600cc28fee2e52f226fdf994070a0f1c11bbdf10b274b17a9594f
-EBUILD virtualbox-guest-additions-4.2.12.ebuild 5669 SHA256 35cac8fabd2a54e7b986bfc78283e28dfd128d48311bf697c3e0ead419db8839 SHA512 0181d5b4e7ef777f341db68da655cd32d418eb7e5b3427ebcdf691d86bdee322324d164f3c46f43a8d1e2ef8071b2563b324450722f5f834d362764862d6b054 WHIRLPOOL 4f017f461698de9cdeedf28b64610f0fad79d901e773d42e0847e5d44b576f60071868745271411a3925cd0a145818f865ec9e30e5aff345ea5aa8eedab12f62
 EBUILD virtualbox-guest-additions-4.2.14.ebuild 5594 SHA256 2d51ac8b689a32107600e650edce2cf359ba12ea2a67f7a7c06950cb6937c445 SHA512 f83067bc1894648d34207d684f90a223d6d5ac4722dfba929c16773211b5c8560b887b7b6d2f484d7325fcbf1bc734fbbf4f58b712b18147189a067919a2f006 WHIRLPOOL 6f17ade1a5d041a473d5ea57ef85e7807d070befa0d7ca5a5deb93a93502636fc3eebc9f56575d987336b733e0b99ff12dd9e3b89547e3866193392c9add9058
-MISC ChangeLog 31928 SHA256 68463127f67322b30bf97afa7ab51ad86cc3b05a69e184244cf616456a8d739c SHA512 b7c4b19c3260a408927a9c6e00e635a2f93a9130dd0ccc80962b119f20c89e5eefe3218d2c32c43ccd352f323ec5791f915f395e24bb7993de028d5191336dab WHIRLPOOL fc4abe17e5f347d11f2180e6e531c732513d500f72385c7e7a19ba0d7a189d9aaca71339ad254b5ed4634ba968322cfb20eeb428d262cd8db2b09afe0bf40215
+EBUILD virtualbox-guest-additions-4.2.16.ebuild 5594 SHA256 6d9f040f915dc35662745a5482772c45a96815b2b332482ecd848a4a6718e44f SHA512 07ab7d5de14fcb449d2be77c450e90b7c6b8e51be5caf7890cfd4b8b0b97bb6428eb8331f89078dcb23532639637c795ee22f94bba5ed6f791dd0620c71d7ece WHIRLPOOL 4dd55188da29e960c75fc5588c9d6a1db2099b6a87155dbb76bcf02ecee3fb1453d59afcc6f70ee1d59ad6a151efc4c462614b50b77d212fa1e62d95b3dd230a
+MISC ChangeLog 32152 SHA256 5141094f77e96349cfa8b1fe3c7cbc99defd2fb847ef0a2b418aaaa7c9c7e66b SHA512 b3ac5efbc8f3059c5c4d4d27dbbacc69f523f92662dfd2038d5ad60902d3f615360b29d5a1b6d86f678bb0bfb944a91e9b09af530cf1c310aa21f33a81b0c5a6 WHIRLPOOL 56c6c4edbe98e2215b8935a98c14dc3280080615b07e395957c42f62fdb0ed4989303192044e98217bde543a7e10807747ff1ac307e5ddacc26915db6abe5754
 MISC metadata.xml 343 SHA256 b1babc5530c5f36a84bbfe48d2db7e24641b21aa0b5cf29cee1712f2f702958d SHA512 d0c45ebcc6897110251d5b8bc1d99d5689ff3ef6f61a4e2cf952c4d440a2a127da85be698373d83cdeb12739507695e548da6d203baf948dd109829025af679b WHIRLPOOL b5df0fb8d0a37140109faf8f9bddc4d3b4a7c26907d6d08dfe0f42632b1d583d071af359d73b6967ed0510642a0afbffbc7976ca313b9e9499d64f45a5fd50d6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRyCZqAAoJEPiazRVxLXTF8kAP/REipgp5FGHWPQoFfhqvMmU7
-snzMHpgXyZaiyeH2B6u+fSQ+had1MH8SgUepVm06mh+UObogDTxX3siUVBagfJIZ
-fynUnfzjhmoqVJZYSxWjZq/t2ee92XbdNEnP543UXAxCOhWHUYPvHXNyPAPHed7H
-lvRlQv9Ft6G+bdj2oCh/lAJGwHgaqT81H+siwRGfXDO7o9ONOHr5MeXLicCbbqj/
-2FK5XFjqCtOfnZVA1amQ5lq6JXFrF7HZErugaJDCcRSCa+Y2YIWB7UCHF4bTEB4T
-wqMQlKTsUqPSebXoRLPWtu7mCCJWJg3/xvUltPtltjlrAClijckpHXK4ZpH5eFMy
-VBHZde0Wp6SopPYmb6YEeJw9dTFt2fB/+Y/kr+7qmRvyhjBdfdOjLOF+w79CsbB7
-scvrzwtfXisrQtcMcxUKILWek8LBvJCC+y0W40BFwGeM6SHltQjuGm9jVV8TT2m8
-b75qIV+4/2a5GOpI7LtYMjd0z5z7T0pNFeVN5yjOXS4pbcYBzls/cFDRyZVGi9aH
-t/XPEFERfqhx4csUYpZUMQAhaFnPlHTrnpbdHbQqLmTNj8XMRU1K0xvwj5hv8A4e
-nw8pTsiT2rE8evjGVQiipsrigCWPC3RW4Yy+URAJDDaDNOB/GXtIB132kycShPVy
-ruhn78ns10P9eIb1gqL7
-=2VnD
+iQIcBAEBCAAGBQJR2tIbAAoJEPiazRVxLXTF82AQAKoomXjkjqJtEA9JweEm8ayb
+EC9VUQKZhNlV6tvbcQtEb8QLQUFurPJo4fviqGCL0puagR/dDMTt1OenOU2hgf92
+54sXSizhoGv/YuMSUR1CxKH8DXO6OM56W/YLgi2h3VmJVZ9tPtodMqsOiuJi0OmP
+5m7Wtc4XLpjxIl++rpa38KddH0YeMja4WQK3c6ATr95tLm+Zwt82S2mHK4BdcD4x
+tvHQQU4uL+Y+NPXWRBlAruv0w4Pi4oh/ToFpNh8/xyJZhxacHVdC/n5LRt2ObvgA
+lckUD+wfb8hJE6KojdGM7OoaIRt5b+bmv4B7i4TwKUC49yDaagXgJEdVMQtW04M3
+OZsVaYhFD3a5oA0YNsApnCUcuNmB3WAxSwyESNZyhsfqWHe47dh+DZTVCVIvaAaI
+TKdnSURMdeA4qnbSeyplb6L534dUgG5ezZsrXJDE5f0eupAdnXcz/hWNgALfRR1i
+knv2yU+fz5W5DkvQLlD3uvEcTpPn2xxn90svbmgtV7WWPhAdI1KEoQcK1OLKqtCF
+3RZkk607WQv1fF21orqIlnF42pHx9c9ngAMyHYsBs/bL8ut62o/kovn3sbLUWalk
+DSKKxnpMD65NMdWFjl9g4zLecJzcaJfewe9ND7DLgBv8JtLSIXg7MIPhFYdRumYG
+bj9uqsesZUuGi2KyqpZK
+=hr7w
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.2.12.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.2.16.ebuild
index af98f7ff6908..e32cc7389073 100644
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.2.12.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.2.16.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.2.12.ebuild,v 1.3 2013/06/18 12:19:35 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.2.16.ebuild,v 1.1 2013/07/08 14:52:10 polynomial-c Exp $
 
-EAPI=2
+EAPI=5
 
 inherit eutils linux-mod systemd user
 
@@ -102,15 +102,13 @@ src_compile() {
 		/src/VBox/Additions/linux/{sharedfolders,daemon} ; do
 				cd "${S}"${each}
 				MAKE="kmk" emake TOOL_YASM_AS=yasm \
-				KBUILD_PATH="${S}/kBuild" \
-				|| die "kmk VBoxControl failed"
+				KBUILD_PATH="${S}/kBuild"
 		done
 
 		if use X; then
 				cd "${S}"/src/VBox/Additions/x11/VBoxClient
 				MAKE="kmk" emake TOOL_YASM_AS=yasm \
-				KBUILD_PATH="${S}/kBuild" \
-				|| die "kmk VBoxClient failed"
+				KBUILD_PATH="${S}/kBuild"
 		fi
 
 		# Now creating the kernel modules. We must do this _after_
diff --git a/app-emulation/virtualbox-modules/ChangeLog b/app-emulation/virtualbox-modules/ChangeLog
index b1afc5559e45..0273b156c03e 100644
--- a/app-emulation/virtualbox-modules/ChangeLog
+++ b/app-emulation/virtualbox-modules/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/virtualbox-modules
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-modules/ChangeLog,v 1.129 2013/06/24 10:51:17 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-modules/ChangeLog,v 1.130 2013/07/08 14:50:05 polynomial-c Exp $
+
+*virtualbox-modules-4.2.16 (08 Jul 2013)
+
+  08 Jul 2013; Lars Wendler <polynomial-c@gentoo.org>
+  -virtualbox-modules-4.2.12.ebuild, +virtualbox-modules-4.2.16.ebuild:
+  Version bump. Removed old.
 
 *virtualbox-modules-4.2.14 (24 Jun 2013)
 
diff --git a/app-emulation/virtualbox-modules/Manifest b/app-emulation/virtualbox-modules/Manifest
index d3c805c77c7e..3aff20e45394 100644
--- a/app-emulation/virtualbox-modules/Manifest
+++ b/app-emulation/virtualbox-modules/Manifest
@@ -4,27 +4,27 @@ Hash: SHA256
 AUX create_vbox_modules_tarball.sh 661 SHA256 2c325859be34acb8589781dafd1e64e3d93c7995fcc1b3d41a549a2c8348de4e SHA512 1f6f1502fbf666b0afeb402290e8fdf0435a9e4356102fc0ee5c26635a8e9948b3fd427bad205a6163beebd2917b0a5d1f547afef3a549489cc0afe229722bf8 WHIRLPOOL d6b8eddbe9bbbe864db5c754cef5d7b31e43f7f388ee28b473479c241c71cba3cef83aaa3661e72511a2248832ec8420c84e1b056894623ef88a3d144989aff7
 AUX virtualbox-modules-4.1.4-pax-const.patch 2335 SHA256 d23da93fa1a3b7833766caa8329745ed7de7a5ed6ce1fecb090325fdc83e42f3 SHA512 8f5ffcd53f34e616b895013660e269e6031837411471abf69711df4fd5d745299dcb08d361eda0979dcfde7d9aafa0d24c99fcc9f3875fbf35771945f6b224a1 WHIRLPOOL b875d0747bdf3c2970d9dc84c7e4f6fac1bd37b85ba6086a981397c8b506a7af2709fa94317896650fd9ae98921d40f399e589b851eb2da2f9854eb1f443930c
 DIST vbox-kernel-module-src-4.1.26.tar.xz 460260 SHA256 69f7397a23b0a0fb55e2b9337d0770a4a1b2d11c2e53d9bc620f7629952bac8f SHA512 5b0312ddf71979d86ecb052e09efb6c19ae6c42a2f86c4cfd14f0b66e71d8e635713fd67f160f44195b77b350408d36ccd794bbbb6e3815cfdd174c4c29dbd00 WHIRLPOOL c1a351d1d5ba5b8bc50dc7a791ac3526aa1fc1fb12f1f8db412c774778eae010abab7d3cfdb3ba4e56dd72120c25ccc40d3b775fd14c67eeca71353110bf7291
-DIST vbox-kernel-module-src-4.2.12.tar.xz 492836 SHA256 f68078b9cdb4c76972b4e39421a6e5ced370b6159a38826c8acabe27f0231eb9 SHA512 b0f37d8b5454ffb4588eb60c667aec58e349b62253366bb3e89d8995dd5fc6ddf4fc8d8c2bd5054b9bf3ef5602428a2cd66f1d5aeaefb34255d7726f60fa9906 WHIRLPOOL e6a7f2f82a65782783616ab430b8bf3663970b7d598f33d8368e3c8f1bfc763b53937f8cb3c99937c8c104215c50a5de4cf8a1e5e17b76c23180a020945b57f9
 DIST vbox-kernel-module-src-4.2.14.tar.xz 493088 SHA256 c129a1cfcb1f1fca68443431e124a3904cf3952c4fdde1297d9f13da754f89ac SHA512 492ecba423abafb8c5e8f4a69450b16395019dc2920c15cad2341a2159a4b8cbcb2528258ddf3a0e43f68d701fa26d3b2b9e09db1b43676ae320065b3cc76dee WHIRLPOOL 1db5310d0b33eabcb758ec403cc71bca2a75e52be6a6e61487d231021a56ae12c2ecae8111e3c75f4c6b469bcb6a96cc3b99b875f9ca447ebe494cbed776f6ae
+DIST vbox-kernel-module-src-4.2.16.tar.xz 493896 SHA256 e7224dc0771a00895750e00c5162f93d486d4f0215187fc3092d17afd2d94c0f SHA512 8fe61b285596471e84dd7231a3b0709107ed7442dd179c886252297058a7e0ef907c3889b7d97e1f8a670fd61df23dbf657f7d5228c378215df531b20bb2cd7d WHIRLPOOL 4962bf4c765c3760522c3bc3b4427ee59d4b3e12db7527e520dd8d9dbd4d47b02a158cca299b03ec68a4f9094930185968122b4a756336bc917077f2b4e7982d
 EBUILD virtualbox-modules-4.1.26.ebuild 1591 SHA256 e8d6e593d608e5535d31e4d877ea498f68c6ff54b309823eada3689f90a3ecda SHA512 4b2990f208beb40a39e44bffdcd3bd5e810307b3bc3964b11b34a910253b5a0bfa8d81e571f8e939c0ca10a26f7c0ac9ec4e71588972bb8a862bdbc6c71aa6ea WHIRLPOOL 5e3cd1d50e7e678bb6b19355d7d2257f55b0336ed1f22b519d738238ba220cad00996f03ef631173faee942d55261876923d58a1b535b1b12a89ef4c3c0c5d33
-EBUILD virtualbox-modules-4.2.12.ebuild 1602 SHA256 5a3b0447914ebc38ba81641a14b0236d0f5c3cd41fc1b94d390a61e459241589 SHA512 f65999d01777aa0add3d9694120935b8429ec6af179df0dc42813d495e324cd66864fb591581730bfd11122aed62048559864e8e888bccc6df7527d48b83289a WHIRLPOOL 8579f29122e3ed0ca6bdb75070f0df048c2da719786a86691b8c455c60fcda22fc9fa1ef0e5d4b7e5b88383e7678a5947c2fb2aadf1bcde25242fba0340613e5
 EBUILD virtualbox-modules-4.2.14.ebuild 1602 SHA256 a624415bf4443c2cd2a2e1001c52eba4c106dfb1b0b0be81c9591de0cc40dc7f SHA512 f7ebb6ce7111853cb2e7489b7b1057da8d7446c7078cf998f3305c6c0c1d9a850d8b3d22377fb612933dd9140fda4fa371d2bfe79650d52009cede5a8e3c4636 WHIRLPOOL b15886dcc93ef6a2d0f6267b4915b6dcc8cbea6670d0079425ebbf0a1eb8d097e06a718faea3de17d50f25c3a2bdd36e62117ce6028f42571330c7bed894cf6a
-MISC ChangeLog 23359 SHA256 710f5017859fe5f3f60207ee75b690776ba08d77b33795db9e5e4dc2f64a8f54 SHA512 2ee123c13cbc2c4a50834a91a7f86de3e46354fe3a9daed3945f4f66384f3e4eecc5cbe8d97837ce64c987422187ea1ee82994344af847e0bac05b43a4a4355b WHIRLPOOL 4357bae008cd5c6aa9fa98ea88e8d8bbe660534ffb8f7f28ca6c1cfa304514c7692ce83bb383d44a8b949787c75bf8703038d308ff06481ccaedbdf6b961a0ae
+EBUILD virtualbox-modules-4.2.16.ebuild 1602 SHA256 fef85477829b05c9918f687ad7c64b165b2d1fd5662524d07c376b5ccd50a55a SHA512 16d638cb35906717a6adc950438a206e53c38ef3dd40e4229842d4c8fb2c2f973350330a4c9c0ed242c8024cd9c6fcee26f4fe6afd5f4a320180bc592a388792 WHIRLPOOL 7225f78e2deed48d689f9b1e9797981145e8cf487542e955666901e1685ae96515941f3c4d83d3a61c6bbf2c7a9fdcb8cedd27efb6ed03e7f14fea2eb30dd455
+MISC ChangeLog 23557 SHA256 fed9ba167bf85921550eeaf4b19637a5315da95bbb1c82388548a9591ae3e3d8 SHA512 99fb55d3040b089072858f4927b837b94dac40c8a59b8f61ead3df124000f6f5642b16b38ac8728ad7572b3b07d231b3c2d46b018da4b3438c389215a3ecde6e WHIRLPOOL 45817f54e87837369e8725cce917b12aadcdc7d23949491e4b3c6d280584ac89d318664ef58234fc3ab36ae5ed7e0c114dccdf9b85013b8e851aee05ae145d2c
 MISC metadata.xml 431 SHA256 dd5f585b5465db14257bab08b1e7fe6f9ceca47d631bb8418665dd4ab0819e77 SHA512 6269d132a33ffae160ed2b4b87618ef764b990bfdbdaf026401a0794b48fb2bd0c4203892a4e0e31904b84f967cd4ef5343dcfa6e2bdb9e755894d9906b38df8 WHIRLPOOL 8d8b65880991d6feecd562639e4da520247dae4418cb7869e03ae775be668898dd1a84141a4146f17d8c6e9e0a5d1a0fe5ecc64517b03f19bd2777ccf84f41c5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRyCSmAAoJEPiazRVxLXTFLhEP/iIndbasYaoLDPyB76XA0sYz
-c/hPbHNxpKBvBCg/303Khl5mEx0LBsRHzDUEsWGdj3ChWIru9HEDz9RKPKqpTw4O
-NJahQ51foDK5utvCgLUUD6GLEsVdwzPG2vVBfsZ8lK6zDfjn2pwX0GuHFU8mA+zL
-5iFPeS83aKzoK5pHnDuMOI1gf4CDN3jjhFLHAlGWGw2ZbZBUAN0ixpZAunifMXg0
-X+4+T23qgWcICZwFVMSXWsm99Hz+IL/Vzf7D5KkZxeqfD2rTfzCMUrLqppPe283m
-wzsT9+fSfgIIHg9H6AMW702jPIsrc4GMPbdF39QGj2GEUlvsM+GtUAosNGyehQZy
-HcNMzPmFna1KbILWCgaQdhE/doEXMgatI2bBqrJmNychpKN1z5F2p8b+1su6lZx7
-bQPFvWk55lan9pf0ZeQC+Md+Y7J7wJIk/7TyG96Wtn+ogeLE2Fnu1NEAdNv3wKN2
-FjTDRaSkNju1iJ1tMFNBFbH/4qbqMz0p4GmKTC857NcCS465aruWc40q80jy9JCV
-agnWLzJ5qtXC2+X+ZoXv72x0vfd4M64mzlpn81Jfp4JzlYlDWLeFCGHB/Dd+GCtR
-7lMywEftAo8c+ES09rsM3Im4uHTYTq87yhiWsml6vqLwjEe9mWIasoX5nZSF1rxW
-Bl7qF2neX+LIan+XPzj0
-=fNhp
+iQIcBAEBCAAGBQJR2tGeAAoJEPiazRVxLXTFGbcQAMJ0RbrfK1dJ6fw3GzDLWoxS
+y6/Ow4aFU1LCpfknT/EpeIrxfeC8By4yiuVd33bt/BNuUAKPOkIbYAkweAz1/eJC
+aZcEImH7DpiSwqtNirYd8e13MPlCcD8LnlIUKeEOkfUKBvFVYOevzxOFwQFdZVkJ
+cyHKgnOCMlryfz4D5evcNKoj1HDykAxkBU0Kn5b6mGygUm4iMod+mPr0RrBmuULy
+S6Dt/XkCEsh7A1GhfkWBAdos/2u4rihC+SQMya30l2tn/DSO9D0vJa163IUXCjG1
+HOApAddHR4xtv4Q62MihXX3GfpDYOXtUIGIPJaiuUUe99f671ZCjtYuZBbYDy0qV
+ag5wt49Ll60hBh85iLOHyEfCWNFG3cIOUes2tSCl0NfVPw6jMxVytwpyFDwEsWCs
+R5aTN4EjE2MeVqiny3psFg97xXaMwpab02AbV3oQ5R3ODgs2Y8FXM1R+yqhPb4YK
+7wO6XIkIq2CcRb4+RRZzvz2Qa4iksnWJO9pg5FJ4PX8c1RQflqd6aiapWx/ZUGNo
+dQ22bhCVI7bcnw55b1DkfGzcciIPFijBYN8yhSLhrRDMZcmBru2WC23QxEs7t2OT
+q9Gobo1wdIeICnhzWYQjZwaO39KqtkUDyrHgZEGESWIFAVeM/SEI+31FpKmw9D30
+elyOCOu+qrO5/dLI5Ee9
+=nLjx
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-4.2.12.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-4.2.16.ebuild
index 6d0fd393bb7c..6d92a1ea7cc6 100644
--- a/app-emulation/virtualbox-modules/virtualbox-modules-4.2.12.ebuild
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-4.2.16.ebuild
@@ -1,11 +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-modules/virtualbox-modules-4.2.12.ebuild,v 1.1 2013/04/13 20:11:36 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-modules/virtualbox-modules-4.2.16.ebuild,v 1.1 2013/07/08 14:50:05 polynomial-c Exp $
 
 # XXX: the tarball here is just the kernel modules split out of the binary
 #      package that comes from virtualbox-bin
 
-EAPI=4
+EAPI=5
 
 inherit eutils linux-mod user
 
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