Version bump. Removed old

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

16 files changed, 787 insertions, 34 deletions

diff --git a/app-emulation/virtualbox-additions/ChangeLog b/app-emulation/virtualbox-additions/ChangeLog
index 46c2f8303181..5867bc31db72 100644
--- a/app-emulation/virtualbox-additions/ChangeLog
+++ b/app-emulation/virtualbox-additions/ChangeLog
@@ -1,6 +1,14 @@
 # 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.64 2013/04/09 07:36:07 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-additions/ChangeLog,v 1.65 2013/04/13 20:31:58 polynomial-c Exp $
+
+*virtualbox-additions-4.2.12 (13 Apr 2013)
+*virtualbox-additions-4.1.26 (13 Apr 2013)
+
+  13 Apr 2013; Lars Wendler <polynomial-c@gentoo.org>
+  +virtualbox-additions-4.1.26.ebuild, -virtualbox-additions-4.2.8.ebuild,
+  +virtualbox-additions-4.2.12.ebuild:
+  Version bump. Removed old.
 
   09 Apr 2013; Patrick Lauer <patrick@gentoo.org> metadata.xml:
   Removing Alessio from metadata
diff --git a/app-emulation/virtualbox-additions/Manifest b/app-emulation/virtualbox-additions/Manifest
index 11951cba60c1..5cdfb5f6bc0e 100644
--- a/app-emulation/virtualbox-additions/Manifest
+++ b/app-emulation/virtualbox-additions/Manifest
@@ -1,8 +1,30 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST VBoxGuestAdditions_4.1.24.iso 53532672 SHA256 6db32584eb4e2ace0fd5fbbd9d63bdb8f50f0c28821d03dafd0ed1018d133cc7 SHA512 7c327b98468e2309084c34a9f3ce99391027f5aa9637cd07d1118c7079e00433e8ea0284884cabb1bc1e7dc6d8292eef4a7051842cbb96ff6d0f3d3ea19c756e WHIRLPOOL 23c98108f5ef7ec052965057c6be140bb553ddc10ca200339d53035ccd403133d18b222cfd0b7b00b08010d82c1a216c0cd8c194c6236e17ec8ee7149090b64b
+DIST VBoxGuestAdditions_4.1.26.iso 52281344 SHA256 d824f920ce69cf3710b980b972f9158e27d081e89b114a597b181eca1842687d SHA512 f4fb80a61f36a22d7bbeacc0e342671e0a3aa18c12fe90c35edf29e586bcb43157f0c20ce19bcbf7a48a5cd8568337d35afc44ae35f2f55f4cdd077600cbe747 WHIRLPOOL 0f81aece690cce386fa21d8e109cf7730ad91becbce68be7df21839dbfbf52252f360f9530a4af1d5b15bf38551c1b53d141bd05fdc61cc0c5e5b87b529d0e34
 DIST VBoxGuestAdditions_4.2.10.iso 57403392 SHA256 0494b0f802b3972cd7188b2079e340a29c5aa81abc05937be95706de2fe8d468 SHA512 d4074ed650c5fe58752bfed01193efa03215d063bf64c81057d15f53c7b49e36812260e4a14b5dddc5ea7020431a3033c917081938c437326a961e2b6f6c97d5 WHIRLPOOL ee08e1fcc9b6a5e772b171db0aaf4d32421ca21a296cdd888592bf019dc549ccd6c51a6fbdf34ca831b4745522c8d46bcdaf13816732561ce33b569f32f8ef87
-DIST VBoxGuestAdditions_4.2.8.iso 57415680 SHA256 04a5402d8dcdefc83ffb2785351ddc57758781a3759137974469189392ae4ad5 SHA512 8eef6a5fbe0547be4b3ab84159ff9783235039d8ab6dd811e321a7c6a3b76b692cb9b89529de60cd9abb481161ed968842c589571b3624baf2a3511eaf09c075 WHIRLPOOL 6bc5158e06c7532eb87b828cfbeebe1804e6e3b6f336325234a903c69e1bb5b51544eefb9a395de1241361fbee85911ef346dec5b2a0b309f57b61005fe0ce7d
+DIST VBoxGuestAdditions_4.2.12.iso 59488256 SHA256 aed4730b643aca8daa0829e1122b7c8d592b9f6cea902a98e390c4d22373dfb8 SHA512 3746f4818014408cbb3d82a17e972f67fad58f81fb77b68a53f8cc997c8e7730afeaab848b4a5d1d4ad10bf1128dccda16dd3b33d900fc8106d2d0b4ec4c5874 WHIRLPOOL a8de229018dbf119e4454f16df090504aeada01ea03017736b25da4f10525f8798ed593b01d575d18845dfd7d3ff8dccc4b3aabfb7c231b12286573a952907af
 EBUILD virtualbox-additions-4.1.24.ebuild 768 SHA256 5509ec88d42b309bd908f4c5eea92dc58aa9ec624ff8a1390b1c9298424a0678 SHA512 3a10610d278d2c359ac5dfe74f9f8afa71c7bf1b5fdac29cf463310644976908a27ca6c0c8f379b10d3b3bda8f960e00d292464e4a3bc219558543671a3c6b5a WHIRLPOOL 3a02eb92441dd454e776bcd85e1a17895acbf7787cef4589d9746568255c1cea1966e0bfaac9c71be8912fa03e0e11e991c59bffe94d68f4afdd15bc12a8a539
+EBUILD virtualbox-additions-4.1.26.ebuild 779 SHA256 66adcd690a1eab1f090fdebd742422743df280f46808b9b7fcca71d0a5056396 SHA512 44ae1109a24aab09e0ae4bc9b2e89f4d4d9adfe57464dc7178504125bd629bf8da3698bb46dd9aee05bf8a6585a0869289a34e77e1c44edbf9ebeeae78606c56 WHIRLPOOL acaac8ccb02f423cc6ed37b32ef72bad774c4568edab16202e557c74329f0e8dba19bc77c590f6bf4482d1b74d98eb441f616c6b7033b4097e9e246490f75b25
 EBUILD virtualbox-additions-4.2.10.ebuild 832 SHA256 ff0789dfb8495825b1b2db777223543d7a881ba724b0c101204f4fa0d50a571c SHA512 193e91f48b96ab53186fda2fcec45395e6ebb0f3f4202e476705d1840d4f9317070dc1e9cbc2d2944013185c53d71fea37ece4c52a3b4b2686dddd9ba875e68e WHIRLPOOL 5a20de9959dacb08995d3ba0a87367da6cd823852f8f22414b6bbc69a3ac67f67bce8ad23a83057ab1168f1fa7ee59dd3b926839fb57fd90775c525264f125f2
-EBUILD virtualbox-additions-4.2.8.ebuild 831 SHA256 bd59e78517067f683c43e7d7e9a0c0fb97cef21d2f5bac5f99f3cc9e1a3db24c SHA512 5adc05fbec8b41e31c0279607e1d142a41574865a11120c3c506c22f8a06a75132102e9962c3f9511f80755d2557a370c46b41350fb6ae78b08a4e0f8fe6bc48 WHIRLPOOL 3ea4bb6675a151922d0b88f80a0e9364afcd6643c318b849aafe11db2f161e71c94c34a0e44299173717eb13a5641f2c79d1f7466330e81ca04f15bbe2cb6402
-MISC ChangeLog 7972 SHA256 81628c3ebd7c6a956f56382097e8ea19711ed91c7b10644252a961989d8c97ad SHA512 e3944b8b125136c5fc2ca4b385f830ce326bf834cd0dd27d848f0479d054c5f78bb8b79fa120bc483cb458e67b7a3895066006ab8813953259723f73e362e19b WHIRLPOOL d854f697a67e679d69a6ef9689899d9cface1ad8effac7b6c9c3a9590b756c6d337f2aff9b32112ff4361c9805fc0660ee983514ee6476c80f7791bde92f7a4c
+EBUILD virtualbox-additions-4.2.12.ebuild 832 SHA256 94ac9ec0a102f9878f25c8c6af70f344ed357695bb3bcb9163578fa487e428d7 SHA512 cdde08f50a82ffb76adb83042917253365e9c52634fb182cf0b3578bd3b8c67fd974f00dfc67f35cc52a86a1937c521d26d7e7f4e761b594966933d61841a0ec WHIRLPOOL c49f5bf13c6316390e5641c024169ca3d8a1ba526debf552e2a78d8146647c419b266d8e6b4f6542b7d537501cce0841061387b0d4990bd84bdb5996d6c29cfb
+MISC ChangeLog 8262 SHA256 19f3f9655f8bd522fcbe906755bf90b2796db7762ab31745b76189218d4d3a35 SHA512 e8816d2b1fb1822cb948668d57eeda481291dae7e0345c56e8bd64ea894781f7c48f41722c57572b148a50d302019afad393451d34f0ff291920f80a8d81d0b5 WHIRLPOOL a560455565e8ec86a865e8a2fba010fea1761dd74affd8cc8b84ec86ce22f3b1d93a0229af1376f0899fe4c60cb75c3aae17f3ba5b2bd1cb8249f36b23efab26
 MISC metadata.xml 343 SHA256 a140b9f7a9a02b10a4a9d0c1b42525fcc308931b04043a4d94db1e5623b7cd16 SHA512 f25b5b150709c22f08bbd26076bac479a146257e602e79f72139bb670bc234226c0141c801c0e939b7b352ee9f4b71ba7d1472702934d1d8308ca8776b66a7ca WHIRLPOOL 808eff318d191c163eeb7b21be94f4dc073a38b48d603c0ecd24c3d333df5a38cfbc1a8280e884aa75c71cb6450d17594797422170093d4153048390b7097a2d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCAAGBQJRacDAAAoJEPiazRVxLXTFS78P/1rYe5ilqlkLHf56HIndobfF
+YMzO2ylaUfQio/7ppxGnsGRjzQ5hQSOlBb9IXlqClTg4wdBJi0mnP2GxrQ6tdlLf
+WSjjoLBpk6Ao/2KyrjcKXMI664UjWrrs0yDC+tML4L5IyXH9CqQ4FJ3Pin5nP90X
+zMnlhKNEtOYCW+/egJpqcj38JufPL1JPWN12FbCc5J/854GjF8F+ovhm/ooGONZU
+lwwmrgPgf2fSeIREWbU8UFWOq7WkydvZqSIroZECa94NFLvHVI4m34y+zcyfPPLN
+yPhwqaACUgPZXVRC7ShsZkOdwEpsR+YDEPqOmIRCOtHZzlQzEpuLjuQ6tQF/TO2b
+GjpdYaN8CWaYAwSFluC+8gRESpRvjAvKULUpSM4VF/KgBYKgIkFK6EdeDv2+3rQ4
+XASreXC3St48yoLkctGPS5cNQrMna4YZ/O1oUgVtX4celO+VTKy485uwk+ciBwex
+T0GsKDB1Q5GsDVczr4DOO3/mJt9TCB5kw8AUqPAgG5Pd5wh5Nd995AY+7FTFKh/s
+vme6BOqJQXrzlRLang4nm3MYezGgvlGHzNZuNEItADEHLlhHr69/TAywaJPU4nOW
+mPhN1fhZK6tEIeZUV+8XaYJwvooZ3qgXu+9R/qoejDDvivXLIf5R57zK0Lm1xNwC
+caC0mQmlfIxpASdBiGum
+=Kbuh
+-----END PGP SIGNATURE-----
diff --git a/app-emulation/virtualbox-additions/virtualbox-additions-4.1.26.ebuild b/app-emulation/virtualbox-additions/virtualbox-additions-4.1.26.ebuild
new file mode 100644
index 000000000000..f41c110ae695
--- /dev/null
+++ b/app-emulation/virtualbox-additions/virtualbox-additions-4.1.26.ebuild
@@ -0,0 +1,32 @@
+# 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.1.26.ebuild,v 1.1 2013/04/13 20:31:58 polynomial-c Exp $
+
+EAPI=2
+
+inherit eutils
+
+MY_PN=VBoxGuestAdditions
+MY_P=${MY_PN}_${PV}
+
+DESCRIPTION="CD image containing guest additions for VirtualBox"
+HOMEPAGE="http://www.virtualbox.org/"
+SRC_URI="http://download.virtualbox.org/virtualbox/${PV}/${MY_P}.iso"
+
+LICENSE="PUEL"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RESTRICT="mirror"
+
+RDEPEND="!app-emulation/virtualbox-bin
+	!=app-emulation/virtualbox-9999"
+
+src_unpack() {
+	return 0
+}
+
+src_install() {
+	insinto /usr/share/${PN/-additions}
+	newins "${DISTDIR}"/${MY_P}.iso ${MY_PN}.iso
+}
diff --git a/app-emulation/virtualbox-additions/virtualbox-additions-4.2.8.ebuild b/app-emulation/virtualbox-additions/virtualbox-additions-4.2.12.ebuild
index b1efa9c7ed4d..b200802829ff 100644
--- a/app-emulation/virtualbox-additions/virtualbox-additions-4.2.8.ebuild
+++ b/app-emulation/virtualbox-additions/virtualbox-additions-4.2.12.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-additions/virtualbox-additions-4.2.8.ebuild,v 1.1 2013/02/28 16:03:19 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-additions/virtualbox-additions-4.2.12.ebuild,v 1.1 2013/04/13 20:31:58 polynomial-c Exp $
 
 EAPI=2
 
diff --git a/app-emulation/virtualbox-extpack-oracle/ChangeLog b/app-emulation/virtualbox-extpack-oracle/ChangeLog
index a036c1a1cdba..9222a0c3ac74 100644
--- a/app-emulation/virtualbox-extpack-oracle/ChangeLog
+++ b/app-emulation/virtualbox-extpack-oracle/ChangeLog
@@ -1,6 +1,15 @@
 # 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.42 2013/03/15 15:40:02 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-extpack-oracle/ChangeLog,v 1.43 2013/04/13 20:32:41 polynomial-c Exp $
+
+*virtualbox-extpack-oracle-4.2.12 (13 Apr 2013)
+*virtualbox-extpack-oracle-4.1.26 (13 Apr 2013)
+
+  13 Apr 2013; Lars Wendler <polynomial-c@gentoo.org>
+  +virtualbox-extpack-oracle-4.1.26.ebuild,
+  -virtualbox-extpack-oracle-4.2.8.ebuild,
+  +virtualbox-extpack-oracle-4.2.12.ebuild:
+  Version bump. Removed old.
 
 *virtualbox-extpack-oracle-4.2.10 (15 Mar 2013)
 
diff --git a/app-emulation/virtualbox-extpack-oracle/Manifest b/app-emulation/virtualbox-extpack-oracle/Manifest
index b2187bffa5e5..008fd1523552 100644
--- a/app-emulation/virtualbox-extpack-oracle/Manifest
+++ b/app-emulation/virtualbox-extpack-oracle/Manifest
@@ -2,27 +2,29 @@
 Hash: SHA256
 
 DIST Oracle_VM_VirtualBox_Extension_Pack-4.1.24-82872.tar.gz 10785167 SHA256 3e392eb6ca11558b339183ca1e94af66239b05f4b33892ad74576da9ea650941 SHA512 3b6810ec8c208c092e25d262701ea5b263dcdb3d152d57145d99da566e4ef9585688cdac787539466fdbb235662f735cd94ca8859abad22d726b5cd0c9ac28f4 WHIRLPOOL 275380721ad2c0b57c377bf8afb5966f2df6753674ea2f3f3a5970b3fd1badc58a9facc2c09a0dcfc9fa84f28bfc26e2c835998d7782acda1febde647bfc30d5
+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.10-84104.tar.gz 11523192 SHA256 3c28ada50fe524aa646e9dae2a31a64133d39e5e33055b8d05ab56bb4aff59e5 SHA512 a0c85f1f9e199235609cb5f67aea43f18516d4f8baf97e4a3e7e00bfad72439abe9168262208ac6d3748aa132370ef34367f1afa03626285251aa6aeb9edb5fb WHIRLPOOL 00a57a459fd7c633858020c3f795ce5de138efb07669683a9c89e808187a07eaeae8411f27fd310cd3c5a5107efc6a1b9be61cae28b3fc81e77b0af8e97d93b5
-DIST Oracle_VM_VirtualBox_Extension_Pack-4.2.8-83876.tar.gz 11520883 SHA256 fa579416f382b58c4e93d3740d076ceba728e28d987e51aced5865a46cb9111c SHA512 feec1cd75c0606043069382254d8b16ac3b4921cffed650b09c1b83400cda3bcddc172295eca94b09951ad5e6aa390a8fd0c0b40bd13011ed2c77fe106a212ec WHIRLPOOL 0e9f900c8834fe07aab316bbd1933a5f419aa37522a9403c808a953eecb5e281c5b818eea4ae4d318d15459bdec954c413ef22e65aed51e16b70efc81673417b
+DIST Oracle_VM_VirtualBox_Extension_Pack-4.2.12-84980.tar.gz 11623302 SHA256 ad15a92e49095c2115bd1793b3b957d3eaf44af0f5d24bb53d6b4fc81c3e2fc4 SHA512 edd5f165ee846711d0e1c745652dcb62c91f3b674ace2ecc717cc57118b0a62ee880ce94683d0f0faec94872d992827580d167c2b1be7c5aa24d9c170da28f29 WHIRLPOOL 12e997d638191dcd55c3dbbfe68c99d46f120ac2438fff4ca9aac968940956ddbb0f2d88d042031d2058e9bcafa7540ea8bc0d624e9777413d821fcaa3ddd6fd
 EBUILD virtualbox-extpack-oracle-4.1.24.ebuild 897 SHA256 c50097c433d4aea1ab8793c07ea927d5efbe1e114cbdadb1a40d84796c291ac1 SHA512 9328051058f7d0ee9e71a17c02c8924dd101ed05c0f3a4dd6e4421c39c18e2f01a4a25bef0937e68f347ad81e03a31ece6b2f8223abd98d5042d567f12da8cd2 WHIRLPOOL a669c46f80abdd408ebd2162e30d3d0e550da562dd97a82a62c7ebaf6e1a2f76fdcaf39f1a587885a1ecd22ce63ddb1a4fc41c2e698471c19beb6b5087436865
+EBUILD virtualbox-extpack-oracle-4.1.26.ebuild 908 SHA256 5b3f8b1050b7b93b4d25284172e775eeb906893ad554e09606acec2a6be5b44b SHA512 00e6e97be9a2c251cc58fe857907aa97aa0edfc8e52de00eec9758ccbfeb3095298ef26ac92dc64ef8feb0449d81822408f74e1bf59f35dd4ea7e35927cdf8ce WHIRLPOOL 2f739dc008aac4e19a63bc784ea5df871d04dd8299dea1d8d9998308b87c566a2d960a47df660c6c51b2438244ba4405b77304813672174342e004a7550c42a2
 EBUILD virtualbox-extpack-oracle-4.2.10.ebuild 961 SHA256 805fdf85c6d3c3a291a4cada9f6db05fabd1879f4bafd62132bcf4425c8c4288 SHA512 930e6ac0ce02731513db06f57c4ff4c9d519a8b4bb8b49ca64ace4c66c98398bdc2e213dcb4ead8aab96339f9f8101645960f0da2823833462247f3966147c2f WHIRLPOOL 86970703b49a61932b993f31351e635e988fecd56acfcf34a271e2754a3bc84f05c7b0b1f30ff27e71f9b9e2b98598a3d35587ce39a7a3d737deb329d282aca7
-EBUILD virtualbox-extpack-oracle-4.2.8.ebuild 960 SHA256 a81ea509bba5ff21fb546c14c0db2d1b32e44be63f44503b2fb7f9f401cf2fc9 SHA512 66c94c93bfb92f4b1f2e4f9a015ebb844adcf4bfd133f743190cf8642d7e1699e2c12a09d5563874f405fb811f8f7e0dcd5e37f2a3d7b2c3dd388a83d1a9e1b7 WHIRLPOOL abb0c8d7f7b4f2b76a81d282dc052e31f51132b0405eb7c595aba1343f229084b69429daf6bea0df23aaab9ee4e25c147c5c44fc3a477e13019ce46cc3523a35
-MISC ChangeLog 8167 SHA256 8878416fa26b7e062ace46e1d9d4d3cac10f497a907cd63c2ffcd944a4a6b52d SHA512 70d9f73fd3b1b4f1c6e15d1c8d4eea6e37009019bdaf68eb60a447cba1870326211677844ed9d4a914e7fff0c01838cb0795b732ac5abcdb5a9a00ec72641685 WHIRLPOOL 2f03b78823796d38bc2928f58e6b598a2c9598aedfe5559ef197c8295009c22aabff2cd3eb9ff3de635f6ee37971b44b75c17a672a00943efc7775af8b382d06
+EBUILD virtualbox-extpack-oracle-4.2.12.ebuild 961 SHA256 510d6db01ee9e4ab49f35bdce580a182f75f7426bdc9960fd361f3664765228a SHA512 7a89393db12bd445d053dbe0c631c59b60e1d1e37057ea26b3038e5c55749050616aace445cb18b2c42c717819b01410e7f87e929c49d89b79c0fad74cb7a729 WHIRLPOOL 96f1f3fdfe103b6f9ae474f7bc050ce69e44dec7c5f26531eb722faeb3aa550b593e4c62fef36d49cd69b8b738203cb68df41b19459c486d3b114e361f7633d2
+MISC ChangeLog 8479 SHA256 3b33c7b952fad18da453c8ad83aef9ef5a9de3d4a4b9de2a6e08008ec7b1e6c8 SHA512 5acc059e7f991049f4fd69e0117928ddb073889fdcbb6719bc236cbb603bd827a1dcc5b939ab3ac761bae2bce718717a7996ce78fe885a4a8d59eed6faaaae3b WHIRLPOOL b7e0d713ae30dc40dc3a81e464d2e6d19d5a1868ac516653c5b3bac563a9869d40b23aad631a8b3f5586c1fb4082dde0fefd81f558c092f8fbe2895d1e3e27a1
 MISC metadata.xml 343 SHA256 a140b9f7a9a02b10a4a9d0c1b42525fcc308931b04043a4d94db1e5623b7cd16 SHA512 f25b5b150709c22f08bbd26076bac479a146257e602e79f72139bb670bc234226c0141c801c0e939b7b352ee9f4b71ba7d1472702934d1d8308ca8776b66a7ca WHIRLPOOL 808eff318d191c163eeb7b21be94f4dc073a38b48d603c0ecd24c3d333df5a38cfbc1a8280e884aa75c71cb6450d17594797422170093d4153048390b7097a2d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRQ0DTAAoJEPiazRVxLXTFSHMP/i8efn/Ag31RhoHbvlXXcyXo
-tPWv5ztHSYWotsuqt4/slGdexjqTWGbJskRq+0HbZ29ty9jTyUZ01XxWVrtQbDBm
-6uO9yB8z9e30KoIMoWoIiHZ1QmI1Uw4ABP36WiWOtKnOqWtrKcxjPIlRtiVz4bLt
-MmDK1CQzrafwoJYJqR85UUDoGBY355Z/s/IncDAKRJAXY3DZRNa773Cm0+vfYmsL
-se+S3wczB8ivUkxgjmFcMG79TdgdSXwFPTfz1l7ZJaWXC4wzC2TZGxqxsr8AnVJr
-VcRLB4XB1ItF7HRZLtL0Gcs2FX02wEWSrFbJ1TaXZ30EbV005iQ71i6IG/V8kGZg
-jLkOEaVbmhHO6sJoCgUx7IWuaYRfmGBllF3I5wwDLwAL6gU5zq6svPj31AynazsS
-amW61u5edwRPl9fF1ZqwzH/Vi5fXnAgnDW4hicAh5W7rWhm2LVM8Frtr009+vL7c
-ZDtwj06Hv50330g0u2oRsaox2FioKkcW4vCvVNYqKQJbz78jK+QZA+WkhkSL/Pl3
-gwmy5p3i1yHOL+pGJfJ6kD+oY0BaaqJ+hOVbQBf5abQomY6v0SLHeSOZl6Uyk0ga
-KNMCrIbzcMoxhBcaV5+Kl3IIHSz7n6McfgYG3s/gLIy8Maj2TdzIzkIngXYds3NF
-HSbMVnCKJbqvXavSJgYs
-=J53h
+iQIcBAEBCAAGBQJRacDqAAoJEPiazRVxLXTFfacP/3BZUoho2FtrlyJNGjLj/i8O
+HcSWB1u1AHK/h68of3ZNLIJQHCI1LPu1HtBd2d5HnsoeMFN66td8ZknOpYQpvjJC
+ucNVXJyQbWuxTha7sxSqA6kfCkEUpyUFi4MKG7AYm96qmayYJnhhfEKOh99gPVtk
+zzC5Z+xuKqS0GJ9UXg6adkmLNfZoAOjENE/z7r3zqvSIUPF4qurSzfFWyqZXf06l
+WMOakLVZl+AgPnlPeIA1jK/mSyK5X/9ys3WqDzb1orHuNo05s9npdeI3Ol9njU9g
+AZBHR9d6jagwq/NNuFFeHcG6QriG27EMFRspIX6gysZAtF/mlCp+04mzZmmIQITd
+IpdhyOYvXDmYtcRUayWIUemugmwaQln+VuqlXP2E+XPIYb66Xd9VSQCNU62o1ByW
+hmKMOYmiH8Noc9t81KsNn7m8rUwH5z5aSq6dyHLYrALtohiEjfZf90iNYc5sstM6
+s2vuRwygBRWD29KrZ/+HyzGR03EM3Y6Qj3i5Tv9fPDhElXRbtSPfZHNYSByC1XIt
+d2UrzBnXsHGvYwSeYnPqK7m/p1HsK2SUyg6zORk6T3mAD9RulmdvDm4355cAKjRp
+nDIKy9WGQfZvBQTPq/bWN/1s7ylviTfzkZlQM1rHY4NomGjLSrehxkyVrZoHUPvU
+7IV77A6tPnyvjr2Q3OOB
+=6GON
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.1.26.ebuild b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.1.26.ebuild
new file mode 100644
index 000000000000..5a290d8706ee
--- /dev/null
+++ b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.1.26.ebuild
@@ -0,0 +1,31 @@
+# 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.1.26.ebuild,v 1.1 2013/04/13 20:32:41 polynomial-c Exp $
+
+EAPI=2
+
+inherit eutils multilib
+
+MY_BUILD="84997"
+MY_PN="Oracle_VM_VirtualBox_Extension_Pack"
+MY_P="${MY_PN}-${PV}-${MY_BUILD}"
+
+DESCRIPTION="PUEL extensions for VirtualBox"
+HOMEPAGE="http://www.virtualbox.org/"
+SRC_URI="http://download.virtualbox.org/virtualbox/${PV}/${MY_P}.vbox-extpack -> ${MY_P}.tar.gz"
+
+LICENSE="PUEL"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RESTRICT="mirror strip"
+
+RDEPEND="~app-emulation/virtualbox-${PV}"
+
+QA_PREBUILT="/usr/$(get_libdir)/virtualbox/ExtensionPacks/${MY_PN}/.*"
+
+src_install() {
+	insinto /usr/$(get_libdir)/virtualbox/ExtensionPacks/${MY_PN}
+	doins -r linux.${ARCH}
+	doins ExtPack* PXE-Intel.rom
+}
diff --git a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.2.8.ebuild b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.2.12.ebuild
index 3fee8d905f97..52f4b4766db6 100644
--- a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.2.8.ebuild
+++ b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.2.12.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.8.ebuild,v 1.1 2013/02/28 16:03:42 polynomial-c Exp $
+# $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 $
 
 EAPI=2
 
 inherit eutils multilib
 
-MY_BUILD="83876"
+MY_BUILD="84980"
 MY_PN="Oracle_VM_VirtualBox_Extension_Pack"
 MY_PV="${PV/beta/BETA}"
 MY_PV="${MY_PV/rc/RC}"
diff --git a/app-emulation/virtualbox-guest-additions/ChangeLog b/app-emulation/virtualbox-guest-additions/ChangeLog
index 23e7ef1116a0..727a0266308f 100644
--- a/app-emulation/virtualbox-guest-additions/ChangeLog
+++ b/app-emulation/virtualbox-guest-additions/ChangeLog
@@ -1,6 +1,15 @@
 # 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.119 2013/04/09 07:44:46 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/ChangeLog,v 1.120 2013/04/13 20:35:58 polynomial-c Exp $
+
+*virtualbox-guest-additions-4.2.12 (13 Apr 2013)
+*virtualbox-guest-additions-4.1.26 (13 Apr 2013)
+
+  13 Apr 2013; Lars Wendler <polynomial-c@gentoo.org>
+  +virtualbox-guest-additions-4.1.26.ebuild,
+  -virtualbox-guest-additions-4.2.8.ebuild,
+  +virtualbox-guest-additions-4.2.12.ebuild:
+  Version bump. Removed old.
 
   09 Apr 2013; Patrick Lauer <patrick@gentoo.org> metadata.xml:
   Removing Alessio from metadata
diff --git a/app-emulation/virtualbox-guest-additions/Manifest b/app-emulation/virtualbox-guest-additions/Manifest
index 61d521fad617..e1eb092c45d6 100644
--- a/app-emulation/virtualbox-guest-additions/Manifest
+++ b/app-emulation/virtualbox-guest-additions/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX vboxclient.desktop 145 SHA256 0e310fbb8defee6842f5fc9d2cf124a4ca7a0d1121074cf1aa2e1bea5900f905 SHA512 90e2ff4b8a67120f7f3c116676c7553243a1bf3c9a76f71ef471bc556c4eee55953e6a5dde952688d4892d469149db8704a921a14755eea66b1789805fe3ca42 WHIRLPOOL 31ee9fddce785e78706e579aa9260695e80bc72dcd2cae33212885a3d57e7d10e6bd3ec652ea1429a7fdc5d0b1c7c8855669afc38c21b12114b237329779abc4
 AUX vboxguest-4.1.0-log-use-c99.patch 389 SHA256 9a7d87f9a00586251b9ba24e598946f5ce2908dbe5a4996246bc81c2f739ec50 SHA512 bf9ffa89b0b9e17bb5e87476bfcac3246bc047f2365c75159bf8c8ffed3b89c9fedab8390badf164eea82c71b082c8ba95e598e0fb19fc795019b68ef644e9a0 WHIRLPOOL 930c144d36c83cdb4f68165282927b61f0f1fcfa3245f11aa2b07c7c61739ae29cca6436d2d2b9391575922c572634d13e9a027d00d26e276c8da664b1328bff
 AUX virtualbox-guest-additions-3-localconfig 937 SHA256 477e3d4556a2b12c3c6125c4fecc63092b1f7879756941e53832d04a7c1eb682 SHA512 2105f997a2aced3a6a7f0abd3727c6d18a5d7e6b68fbaa0706b9cf1e09af413a1c5026abeb8f72427c31f2b271408d3e55ae0d17b903052772cb070d37b6e71d WHIRLPOOL cd472e0073d822a0b71b8d272ec9f3590650150ca910ba193a567d0c59f949d645d9cae31853e955cbcc0408e90acff47a974bad2e89bed9b2089965c5066f83
@@ -5,10 +8,29 @@ AUX virtualbox-guest-additions-7.initd 1123 SHA256 5cbeeac4b59f8187d8da20afcf52d
 AUX virtualbox-guest-additions-8.initd 747 SHA256 605e7fe4dea401547957db63e45f3f75ae2da3544b0ff1f3279fcf07217d5aac SHA512 f560aaf58769448da7a248c9ff8e02927365b8e174a9ec32c21b067cd48d8691de33ac18f36caa86e9ab6dd5a3b93c2a211d051b2c1564ad16b05f080e92df6b WHIRLPOOL cdaa31e020f36f05b66d9492ad9bd935c9df6d758160ca0f37e28924f43d6c4e21fca232d336c1b0e610dca7b536a1e682df32313073f8c340e77cdb5beaebac
 AUX xorg.conf.vbox 274 SHA256 69475950240533abd2824a30ff08cc7d3ea246d9601ff7163115f8fc100612fb SHA512 ac2b14970dc6667ceec2dbdae52bc92cbad4aff020898ede156454e8a8a703354f15c7e19cfbd2bdd15e251493fd05cacfe814cabee0f9b4cf155e44860ed4c9 WHIRLPOOL 6bd0dba97e442c831451d58f85e5ce3bdf37fc90254db54cffbdbafe1521464e0e4aed89dd610d432c8b26dc48b98f120fd81594bded2dbb10c5eb7d7b26f938
 DIST VirtualBox-4.1.24.tar.bz2 74612732 SHA256 74008b8e8942045668c1b7d06b0a4bb5fe8464066e343e3a2e1ba30b94ce8a7f SHA512 b4967621f848ff50d23e5f1afa63c2109cd10a602e6c742966ae7eef882417808cdc93edad67f55a0005fe3e4905034b08a1d21dcf242a9cc1e653ebef459174 WHIRLPOOL 0544cd637bfcc6cf7a502aa6fe27cb697ba4d570400ee2f7055406fca6deaed1b4b31e80de8e7d09a15152bfabe311d56a4ff256ae8f8f2940aa842c1701f941
+DIST VirtualBox-4.1.26.tar.bz2 74552384 SHA256 229773b45bb18374aa091d4ef585f3893307fb4ccb6f489055b048c0f93c36ab SHA512 da3dc07a390f423446190ba68221a9389423381def888a6eb754dc02fed75f0b99e41263ffc6d36f955b6018b8f7e928da55397bb544eae16cd5b0cbcc66ed89 WHIRLPOOL 9f5d74e44950d41887955250307bc1af99ca0007e3d4b0f6549b35ff3fb9a48d546f9b7dab6d346ac5a0e88bbb1af092665024d1e792aa9befdc04b6017c62bf
 DIST VirtualBox-4.2.10.tar.bz2 76395446 SHA256 a9246b65e28f0e6e1ab3fd0180294c9dac78fdad3d61b642f9bc5a84b6a4d2b9 SHA512 8c03a266a7378f3516f439441533c5b20bdb2b2caed9851c75d598e0c42ef6f3a65f3a684fbf02cde1508c4e4baac336ab469cafeaefb6bac6cc6019e2a5c0fd WHIRLPOOL 5c9d41e37011404184a663e139438df3ea989d15dfcf298b82962d5d1a92bf2344ea5784845d8c5037ddda337138ea53d6aa21ac57351b3b9f9740e1d853e629
-DIST VirtualBox-4.2.8.tar.bz2 76412088 SHA256 f336af12244db74e6564dc22e438bbcba70f994aaf0d117fdf70caca9fab1b78 SHA512 70eab0aa0c760937a99d4d199be81cd828bc37d656a796a5cdd25fd3869b6873d2bfac4fa1c719a9a79431312524c21bba995b9a6be8a8bcb8eb2444cca32c08 WHIRLPOOL 54642eaf1c495f46338c348e6f5abb29bf6e17b85d2dae1fd4b4988eebec7dda8a8dad903060b2ef3fa65c4e1aaecdc43bd384f7b993b16f59be86e4fb8d0355
+DIST VirtualBox-4.2.12.tar.bz2 76876011 SHA256 eb65ecac94f63d6292a967d39cb5e28326404c10d0e8c2c50399eedb59c17ee6 SHA512 b345bf6fcae92c02b5943d89b3ca36522930744b0282a4c25815b76033a055388dde428adb2226eb8051e3a418f1edbf83b1a04ab340663e601757504a9fab6d WHIRLPOOL c5974adfdf6ad86ea2bd9951f59da72fee9d1a6f3b67546bcb112860eb23b293fb6f091bff9f76d53134f170461361bde214cd30a28b9959f1fa73bc424b3700
 EBUILD virtualbox-guest-additions-4.1.24.ebuild 5543 SHA256 bee609711f210cda0aea798fde54e0ba5a2bd69f863a95cad8a901ee3395a3f4 SHA512 84a217ae5746c7be6f6b3802778f6e92f010a51f8b8af624f85217a348a79512bb0fe96399971797da029d4ebd5c5cb57bfcc42cbe5445bed3e34bd8e5a83dff WHIRLPOOL 6df529b02451b5ea4affd4df21ca8965b27324eef5fd81fc98ca3972913cbbde513d226f3da78af7c8b1647de8661b6d508f0ef6b9a3295a3940838b79cded82
+EBUILD virtualbox-guest-additions-4.1.26.ebuild 5554 SHA256 1b36fea34726212abb53ab0d8f154edc65b13fd12464972573017473f0cc2752 SHA512 959c5c20a817b0d58cfb0dcaf5d33bffde0fcf35f53674f303e5c89d2cc8b51e11707d16472aa33843a1f4d9855caed67db2ab1b4649b11ef58abdcc529108d4 WHIRLPOOL b8bb3d54d8df86e54266f52056c7be4ecb70a357466d835d478a0c9e401e83a9fabf52a121019679ef4b121513fc27caf0a7b1f0794312e5e0614f12f4b5c718
 EBUILD virtualbox-guest-additions-4.2.10.ebuild 5614 SHA256 2c6fc14cd48bd34cd07658620a6fa8527d38d522f02435584a088f2b8427ed06 SHA512 2c4c6d9b4a6a5ea9797b2e385ebe0dea5aeac74e7078da220b1f432c2a95b0224b0a8dc1095b5d0e8e69da69fb1dd56e4350d393dad1375ab9564a296e8009d4 WHIRLPOOL 0a9c95081895a615920af391bb33a87891c566d56c5e4638e7b6885570bf6a89a6518b66fd46d352ceeea6cceca393205adc2d4a1a9179e7e1e455956a96d126
-EBUILD virtualbox-guest-additions-4.2.8.ebuild 5613 SHA256 682a0453e97ab45afc9f30fbf268aed511622e5a2a471bf8fcfecb5ca9386d7b SHA512 103dc2d8d8e10277557c61f43079cb31a6c44da1060bdda9747c7a81873437cbb6c6c90a30766bc34833868f7175fc7cfe80fb5d80a303b08dd75851a032b906 WHIRLPOOL 559eb1de5ece3f0f0ce0ba3f99a2ce362ff6a897ab805f01e5dabc0ef07bc7c9c7e6b6a30a94c27dd45153b9899baa77485f3fca049cda1eca7b94aa6e44c432
-MISC ChangeLog 30587 SHA256 495f7ba02ecdc4b624705c24f311816931deb3f7c6594afedc0c7cfa0b009a07 SHA512 a6298e1da1566d356fd6d3b0fcbb1aa32c625d61de529c64845c899cbb8003ebaff9198dd4b14e2dd42471fd894140cabf6fb54c5f0caaf680c08397458b75dd WHIRLPOOL 7bc0d43819e05d2f10179aa04b6be75b96ddc29408fcd786a366fefbcaf8fad933b27bc69d758c078cf9aca76f0485a02ce90613388f4d8ad64fd0a521fe67a9
+EBUILD virtualbox-guest-additions-4.2.12.ebuild 5614 SHA256 b22f7099a0032290e729d01f3f66677bf20a9e29e2880ee646c52655f50e7654 SHA512 1941a2123ac2cb4e34a6dffa407bf03be20939d5559f3c4dd36a0462513f0b6b3e04da6209c9eed1dbd9e958e8671782c9a00fcee976fd2169b14a4cc396b409 WHIRLPOOL 2767d27e29657730e74ae6066571f3d559ea43285f1078c271c52ed83361d4b61efda2c485d5e69aac5de2c53f045ba19a3195fd520dda7b19f99a2020bc049c
+MISC ChangeLog 30909 SHA256 6eb37382a0880d1a1c6fd6c7bce8233e82227451bb0aed82accbd8854778ae12 SHA512 3e605d82b79d7514c49fab4ef6f0760f2d7aeccb3bae4bd6fa93babdbaa9de369f19ce6f289285ee98969192e195d6ddfd231a5875bb2e40f34580582d1dd818 WHIRLPOOL ef7f414868c770dcc8cda2344695cd7ce93b905876f7b64ae1383636a7f7c4a32272e19b6d35253811706ceba3541e3df365bbd539a2dbd3aad58c5c83f72ef8
 MISC metadata.xml 343 SHA256 b1babc5530c5f36a84bbfe48d2db7e24641b21aa0b5cf29cee1712f2f702958d SHA512 d0c45ebcc6897110251d5b8bc1d99d5689ff3ef6f61a4e2cf952c4d440a2a127da85be698373d83cdeb12739507695e548da6d203baf948dd109829025af679b WHIRLPOOL b5df0fb8d0a37140109faf8f9bddc4d3b4a7c26907d6d08dfe0f42632b1d583d071af359d73b6967ed0510642a0afbffbc7976ca313b9e9499d64f45a5fd50d6
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCAAGBQJRacGvAAoJEPiazRVxLXTF6o4QALEV1dfYx8FQAkxB4IgSD+Z0
+gFajuq+h669yR3k2wz9Fkn4A0J+2soUu2iXLsaBLwe0WabbwWzhd1Kzmf+4hLmXg
+6qG0z2FEBcqwnRQlqtLH0gWy+KedsU7P3jkRr3S+hzSlap1GTd0ZQCF0goXMP4Vo
+d7vvjejORrGZrhHqcNNAh28fSo4Gb5RCeGxOu59LEl1lw/gTCS9QWscSxd7C9bCa
+LHKKKDhvfHr48Y+8ND+sXs/b2nfmmrUJYITB2NRMXCdd95nZjh43GGQ7JuIDrv7f
+juXCFyGZH9LSFw9GHbRJeMwK1OBERouyRW29zTYv3XDlR/ZOWHCHzhKpUzqKye+q
+x+g3ZwqW3lJIn+JNyIb74suZWUZCkVPhfIsJbSGxPDrOp4HiSbjfUWrBLGKFreWr
+iiJafKlZ51FSKX3w/vCAUnWyXsJhPVSjYgptzMOD/zk7d7mk30+FxifGfFBks72W
+Fhp7V6tdkCaa+8zBbopLRSsWWFSmqm4rs6y0sRt2BfgwqUIa7yNRHkMWu2+KWRex
+2tiQ7Veqx3RB0RsmyBVFkwnd+xfYzCv6QOMlHtnhOO0P+69PIqaR/c1aa91dTSLC
+zSRRHjzA6hPNlsXQX44vwdRfwJ8GLeRENafPvV+Kb7s9rTKrmgHEJJyrpnvdqbrk
+BTMGN5nXWzNQLbhO2bel
+=hoaH
+-----END PGP SIGNATURE-----
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.1.26.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.1.26.ebuild
new file mode 100644
index 000000000000..5118f4735f10
--- /dev/null
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.1.26.ebuild
@@ -0,0 +1,199 @@
+# 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.1.26.ebuild,v 1.1 2013/04/13 20:35:58 polynomial-c Exp $
+
+EAPI=2
+
+inherit eutils linux-mod user
+
+MY_P=VirtualBox-${PV}
+DESCRIPTION="VirtualBox kernel modules and user-space tools for Linux guests"
+HOMEPAGE="http://www.virtualbox.org/"
+SRC_URI="http://download.virtualbox.org/virtualbox/${PV}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="X"
+
+RDEPEND="X? ( ~x11-drivers/xf86-video-virtualbox-${PV}
+			 x11-apps/xrandr
+			 x11-apps/xrefresh
+			 x11-libs/libXmu
+			 x11-libs/libX11
+			 x11-libs/libXt
+			 x11-libs/libXext
+			 x11-libs/libXau
+			 x11-libs/libXdmcp
+			 x11-libs/libSM
+			 x11-libs/libICE )
+	!!x11-drivers/xf86-input-virtualbox"
+DEPEND="${RDEPEND}
+		>=dev-util/kbuild-0.1.999
+		>=dev-lang/yasm-0.6.2
+		sys-devel/bin86
+		sys-devel/dev86
+		sys-libs/pam
+		sys-power/iasl
+		X? ( x11-proto/renderproto )
+		!X? ( x11-proto/xproto )"
+
+BUILD_TARGETS="all"
+BUILD_TARGET_ARCH="${ARCH}"
+MODULE_NAMES="vboxguest(misc:${WORKDIR}/vboxguest:${WORKDIR}/vboxguest)
+			vboxsf(misc:${WORKDIR}/vboxsf:${WORKDIR}/vboxsf)"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+		linux-mod_pkg_setup
+		BUILD_PARAMS="KERN_DIR=${KV_DIR} KERNOUT=${KV_OUT_DIR}"
+		enewgroup vboxguest
+		enewuser vboxguest -1 /bin/sh /dev/null vboxguest
+}
+
+src_unpack() {
+	unpack ${A}
+
+	# Create and unpack a tarball with the sources of the Linux guest
+	# kernel modules, to include all the needed files
+	"${S}"/src/VBox/Additions/linux/export_modules "${WORKDIR}/vbox-kmod.tar.gz"
+	unpack ./vbox-kmod.tar.gz
+
+	# Remove shipped binaries (kBuild,yasm), see bug #232775
+	cd "${S}"
+	rm -rf kBuild/bin tools
+}
+
+src_prepare() {
+	# PaX fixes (see bug #298988)
+	pushd "${WORKDIR}" &>/dev/null || die
+	epatch "${FILESDIR}"/vboxguest-4.1.0-log-use-c99.patch
+	popd &>/dev/null || die
+
+	# Disable things unused or splitted into separate ebuilds
+	cp "${FILESDIR}/${PN}-3-localconfig" LocalConfig.kmk
+
+	# stupid new header references...
+	for vboxheader in {product,revision}-generated.h ; do
+		for mdir in vbox{guest,sf} ; do
+			ln -sf "${S}"/out/linux.${ARCH}/release/${vboxheader} \
+				"${WORKDIR}/${mdir}/${vboxheader}"
+		done
+	done
+}
+
+src_configure() {
+		# build the user-space tools, warnings are harmless
+		./configure --nofatal \
+		--disable-xpcom \
+		--disable-sdl-ttf \
+		--disable-pulse \
+		--disable-alsa \
+		--build-headless || die "configure failed"
+}
+
+src_compile() {
+		source ./env.sh
+
+		for each in /src/VBox/{Runtime,Additions/common} \
+		/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"
+		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"
+		fi
+
+		# Now creating the kernel modules. We must do this _after_
+		# we compiled the user-space tools as we need two of the
+		# automatically generated header files. (>=3.2.0)
+		linux-mod_src_compile
+}
+
+src_install() {
+		linux-mod_src_install
+
+		cd "${S}"/out/linux.${ARCH}/release/bin/additions
+
+		insinto /sbin
+		newins mount.vboxsf mount.vboxsf
+		fperms 4755 /sbin/mount.vboxsf
+
+		newinitd "${FILESDIR}"/${PN}-7.initd ${PN}
+
+		insinto /usr/sbin/
+		newins VBoxService vboxguest-service
+		fperms 0755 /usr/sbin/vboxguest-service
+
+		insinto /usr/bin
+		doins VBoxControl
+		fperms 0755 /usr/bin/VBoxControl
+
+		# VBoxClient user service and xrandr wrapper
+		if use X; then
+			doins VBoxClient
+			fperms 0755 /usr/bin/VBoxClient
+
+			cd "${S}"/src/VBox/Additions/x11/Installer
+			newins 98vboxadd-xclient VBoxClient-all
+			fperms 0755 /usr/bin/VBoxClient-all
+		fi
+
+		# udev rule for vboxdrv
+		dodir /lib/udev/rules.d
+		echo 'KERNEL=="vboxguest", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
+		>> "${D}/lib/udev/rules.d/60-virtualbox-guest-additions.rules" \
+			|| die
+		echo 'KERNEL=="vboxuser", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
+		>> "${D}/lib/udev/rules.d/60-virtualbox-guest-additions.rules" \
+			|| die
+
+		# VBoxClient autostart file
+		insinto /etc/xdg/autostart
+		doins "${FILESDIR}"/vboxclient.desktop
+
+		# sample xorg.conf
+		insinto /usr/share/doc/${PF}
+		doins "${FILESDIR}"/xorg.conf.vbox
+}
+
+pkg_postinst() {
+		linux-mod_pkg_postinst
+		if ! use X ; then
+			elog "use flag X is off, enable it to install the"
+			elog "X Window System video driver."
+		fi
+		elog ""
+		elog "Please add users to the \"vboxguest\" group so they can"
+		elog "benefit from seamless mode, auto-resize and clipboard."
+		elog ""
+		elog "Please add:"
+		elog "/etc/init.d/${PN}"
+		elog "to the default runlevel in order to start"
+		elog "needed services."
+		elog "To use the VirtualBox X driver, use the following"
+		elog "file as your /etc/X11/xorg.conf:"
+		elog "    /usr/share/doc/${PF}/xorg.conf.vbox"
+		elog ""
+		elog "Also make sure you use the Mesa library for OpenGL:"
+		elog "    eselect opengl set xorg-x11"
+		elog ""
+		elog "An autostart .desktop file has been installed to start"
+		elog "VBoxClient in desktop sessions."
+		elog ""
+		elog "You can mount shared folders with:"
+		elog "    mount -t vboxsf <shared_folder_name> <mount_point>"
+		elog ""
+		elog "Warning:"
+		elog "this ebuild is only needed if you are running gentoo"
+		elog "inside a VirtualBox Virtual Machine, you don't need"
+		elog "it to run VirtualBox itself."
+		elog ""
+}
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.2.8.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.2.12.ebuild
index c3b1d8fec2d3..584cad6f8711 100644
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.2.8.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.2.12.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-guest-additions/virtualbox-guest-additions-4.2.8.ebuild,v 1.1 2013/02/28 16:05:19 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.2.12.ebuild,v 1.1 2013/04/13 20:35:58 polynomial-c Exp $
 
 EAPI=2
 
diff --git a/app-emulation/virtualbox/ChangeLog b/app-emulation/virtualbox/ChangeLog
index 9933841bdaa2..abd2b8072650 100644
--- a/app-emulation/virtualbox/ChangeLog
+++ b/app-emulation/virtualbox/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-emulation/virtualbox
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/ChangeLog,v 1.151 2013/04/09 07:33:55 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/ChangeLog,v 1.152 2013/04/13 20:33:35 polynomial-c Exp $
+
+*virtualbox-4.2.12 (13 Apr 2013)
+*virtualbox-4.1.26 (13 Apr 2013)
+
+  13 Apr 2013; Lars Wendler <polynomial-c@gentoo.org>
+  +virtualbox-4.1.26.ebuild, -virtualbox-4.2.8.ebuild,
+  +virtualbox-4.2.12.ebuild:
+  Version bump. Removed old.
 
   09 Apr 2013; Patrick Lauer <patrick@gentoo.org> metadata.xml:
   Removing Alessio from metadata
diff --git a/app-emulation/virtualbox/Manifest b/app-emulation/virtualbox/Manifest
index d4b30bce3e7b..a029239dbf5c 100644
--- a/app-emulation/virtualbox/Manifest
+++ b/app-emulation/virtualbox/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX 10-virtualbox.rules 576 SHA256 12d1900c59fc92db58d6c32d15130d5b909853e4bc8205898439fd0510d15050 SHA512 12128375244e0fb090674e5a11cc70178f3c6208040830c009284addb91db7dc0a2d3cbd5d1056944782e936a63b0bcef03be0135683646c41d540413805f0ba WHIRLPOOL 489b5221a143f2f5f84f9695d1d3679b75e86b90502706a248e7f20b812709100a86713ca36a5266aae397a588876643f68084b1fdc872f9587571c6b07daaa5
 AUX vboxwebsrv-confd 683 SHA256 57d15be05b11a5d2df838e144f3e91c6443b6afb6ea2c105254947be72759bc8 SHA512 cc1bfe93733cc06fcab5384f6fc6b0e88cfff93b07b6ea3ef5f8226bab24249ecf9c0f857568527ebd257d4e5be987b5699d26e09940dc221917daf58492b184 WHIRLPOOL d7cec4f07dfa53623106bc47100068b2552a99c2114e166fb33e32b0e4c8f9b3517c87d31e83c7cadb8375a1584a2c3a653bca0f4339955af6fc610f0d1ec88f
 AUX vboxwebsrv-initd 797 SHA256 51cafb25408343650ddcd8401ef0226c2df3cb5020a5ccdfd85e2de821a2ccf5 SHA512 60d2d1ad58e8f887d6a9b6a47a520ca84aa0e2e043571176bdc887ce76be063e443a980ea8f1b941394d533d69a434a1ca6a5c0cb8bd6b9cd4f38c1af2e10bbe WHIRLPOOL 3d22cef4e224738c504313a26e2c78915f49b42f4498309157e351805ceb8f6f9c25cea40dc51d4e58d6741b60c0206dc16ab9b48e26145ba2e6d5e41a91f266
@@ -7,13 +10,32 @@ 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.24.tar.bz2 74612732 SHA256 74008b8e8942045668c1b7d06b0a4bb5fe8464066e343e3a2e1ba30b94ce8a7f SHA512 b4967621f848ff50d23e5f1afa63c2109cd10a602e6c742966ae7eef882417808cdc93edad67f55a0005fe3e4905034b08a1d21dcf242a9cc1e653ebef459174 WHIRLPOOL 0544cd637bfcc6cf7a502aa6fe27cb697ba4d570400ee2f7055406fca6deaed1b4b31e80de8e7d09a15152bfabe311d56a4ff256ae8f8f2940aa842c1701f941
+DIST VirtualBox-4.1.26.tar.bz2 74552384 SHA256 229773b45bb18374aa091d4ef585f3893307fb4ccb6f489055b048c0f93c36ab SHA512 da3dc07a390f423446190ba68221a9389423381def888a6eb754dc02fed75f0b99e41263ffc6d36f955b6018b8f7e928da55397bb544eae16cd5b0cbcc66ed89 WHIRLPOOL 9f5d74e44950d41887955250307bc1af99ca0007e3d4b0f6549b35ff3fb9a48d546f9b7dab6d346ac5a0e88bbb1af092665024d1e792aa9befdc04b6017c62bf
 DIST VirtualBox-4.2.10.tar.bz2 76395446 SHA256 a9246b65e28f0e6e1ab3fd0180294c9dac78fdad3d61b642f9bc5a84b6a4d2b9 SHA512 8c03a266a7378f3516f439441533c5b20bdb2b2caed9851c75d598e0c42ef6f3a65f3a684fbf02cde1508c4e4baac336ab469cafeaefb6bac6cc6019e2a5c0fd WHIRLPOOL 5c9d41e37011404184a663e139438df3ea989d15dfcf298b82962d5d1a92bf2344ea5784845d8c5037ddda337138ea53d6aa21ac57351b3b9f9740e1d853e629
-DIST VirtualBox-4.2.8.tar.bz2 76412088 SHA256 f336af12244db74e6564dc22e438bbcba70f994aaf0d117fdf70caca9fab1b78 SHA512 70eab0aa0c760937a99d4d199be81cd828bc37d656a796a5cdd25fd3869b6873d2bfac4fa1c719a9a79431312524c21bba995b9a6be8a8bcb8eb2444cca32c08 WHIRLPOOL 54642eaf1c495f46338c348e6f5abb29bf6e17b85d2dae1fd4b4988eebec7dda8a8dad903060b2ef3fa65c4e1aaecdc43bd384f7b993b16f59be86e4fb8d0355
+DIST VirtualBox-4.2.12.tar.bz2 76876011 SHA256 eb65ecac94f63d6292a967d39cb5e28326404c10d0e8c2c50399eedb59c17ee6 SHA512 b345bf6fcae92c02b5943d89b3ca36522930744b0282a4c25815b76033a055388dde428adb2226eb8051e3a418f1edbf83b1a04ab340663e601757504a9fab6d WHIRLPOOL c5974adfdf6ad86ea2bd9951f59da72fee9d1a6f3b67546bcb112860eb23b293fb6f091bff9f76d53134f170461361bde214cd30a28b9959f1fa73bc424b3700
 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.24.ebuild 12271 SHA256 cb449b39176e1d19043595eb4f8cc84db1bf9d1fea68639de7c56829e07447b3 SHA512 cc1bdd1c0f13db805754a4c796517f5407805a3a1b8802dbbb66d4fe62cfb0cfb2468ce99ea9de913b6d4843cf23b182d962bbea392f3748903529e8ab916d16 WHIRLPOOL 3cd71c05145bf9021197fd2ef9a886715b60f2fcf551cede3ec79c545fad46ff163ea985ff22e8546247c7be3a9199bc917549432c72ef5c801095087d3a9b20
+EBUILD virtualbox-4.1.26.ebuild 12277 SHA256 9e0774e418d34da901cc89a48b1ee21777b8bae83b32ed93b66fe99f444218c0 SHA512 fd18827b89e46326b3080bb85adb098ee6b8a606a92cf266faa430c7697cb6ce31dbd99bdccac73fc42034d938811af28b5126811ef2eefcb1dc275d7daab01e WHIRLPOOL 443686057dcdf2c7da450396db42873d61c4b35b4fb49b73d97120a04121e2ac33b1c2767b24ccbd6895e9815ddd375f6f92cd2e2142fd0f06ddffc1ba9b6bea
 EBUILD virtualbox-4.2.10.ebuild 12161 SHA256 fb48513cbfebb9fc801aae5a62f7687356d588fe6cb959ff8feb86c1a22d7aa9 SHA512 862a077a28601da1f52e8fed1e69f4606e5f81d17890c54d93a73ca949abe833eb6e271ad636568013b12532e0c1b1fa3f1c32d8987fe8eb7303a535e20d79c3 WHIRLPOOL 1fcda246063c7a2c63a66dc7b4a1d791da4038fe7b814640c84546e342ee2a9bfb475dfef49836548c96182fa701c1e17aa31366368d361d6c1cfe93405b98f3
-EBUILD virtualbox-4.2.8.ebuild 12156 SHA256 24450173914963763405816fff3448c44ae9789f1368292c336134cecb8e7565 SHA512 4d46f829b26f5eb5eac9d30bc9993cf61abfc459e1edf2d1ed34c46286d608512096efa6cc99b35f647485fec05f5c1488d424bc9ef2c8509c81166cdf8e6e6a WHIRLPOOL a5996c81770cb29ea8181ffe850af10495450c1ce3c9295c2eb65a91557dd8b482aa103c4de252fb7533825f75f4cfcc287e5c85968ce317ab58759781cfec6b
+EBUILD virtualbox-4.2.12.ebuild 12161 SHA256 d442444644d319d7fc32b427a5b75ed207ee6eaa62c2bdde3bcaac75ff719e49 SHA512 aed87cede9499d9f8a71e96e88b3b49576b75f6bede3e2bd348d2c3d40d966660cc396fdb4fb84880e4461551255c313d641f217151659157fafc0027e18a6c0 WHIRLPOOL 6e6d433003bbdefd153a3859c612ba0a94eafe89eef7f1759a419640c21239c70df10f138b5e33ebdb44ffc9d2db4a2ff6b48ea8cb6b044bef627ba105b50c24
 EBUILD virtualbox-9999.ebuild 5123 SHA256 8cd24ad4cc1fab5562d58ebcf531b3131796eb24c40489d98bfb2078cd0b3803 SHA512 3c4658a749419a64f7ed8636e62f385db059639d58a2152ac1b136f54f8577407ba0553f612511ea7819eb4e26727ab516f62b11faac5d2e4b6de73892206430 WHIRLPOOL 317967e118951cda333e6db60a6e8f37df7a53599d752271d8f29873caa1e9bb22774963e8972989516031516b293c5b8dd9f7f5e680ac785d7f16437bf8c2ca
-MISC ChangeLog 21582 SHA256 2f93f43a0b924820c0535601f31587b7e85fd86c88cb456ab1f68f2e20e6d691 SHA512 6ccc6ad41b23f9faa6d57b68742836d53fb478a702b95bb68c5e66c4ea4cf83e66b062dc68b67f4416f6ec2d48f565b735051b6cff9a73fa153cd459005d5926 WHIRLPOOL f6b04c5f189b6ed8b613b30ed3d07f1a2a6fdc58abda525535680c413732ecf1c941c06d9ec0679397a2ab0c85cb424f7b7a818d508c80f756eb5e73564cb4a4
+MISC ChangeLog 21822 SHA256 7b86ed38e1edc15ad3d6ddea747f29f5de09fe84f1775cfa8e341b330dd1ab9d SHA512 27b8eb42df72aa8ac8c1d950939347d450dc56deeb6e611f741cdeaf8a691066dde4a9305baf8199b5c4d9e5f3f4504e103217c578b8c882a4506eb292670a64 WHIRLPOOL 18ea4332f4d095231fd6372b446d9a327c8e5ec7cda4ddb25800dce5a35ae99a49876df9c70f39caa2da74ac4f3d683b46973a70f53b6c4768f0142e4e2e0327
 MISC metadata.xml 673 SHA256 5cf3053a2f23eff40c24dfdb7af90d4bf905df95a7406f6298ae9e5e547cbe79 SHA512 79b4b7477041212815e0b509016b692ac719625534ba93540ac5afe655e47ed2ed27d7ba51b494a49a6ac603733ba0b66a2a517f27e4d0e6b7563eb7d4e640ec WHIRLPOOL 6bcb7711e01036fa3ff064ffdc5021da6fca464d4da77d8e93d033304c7c1d3ed105723d5d5e7fa3328daec929c7c7a90c9c82572bb082765f286b53c3feb688
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCAAGBQJRacEgAAoJEPiazRVxLXTFnTcP/1W2FDqfRlBCFpyWuKRe9TpN
++fdM1UTOBRVYlduvDqVQ9+2JcfVsBX8O3rUpRImuVN4CxvIu+VCbLA3xvTyhDsuO
+WOSdNAxtFFQVD5zZSvmg6N9tscZGo5ydXUDyTd0MrUeXJ/PaGSMqJhBg262loC/B
+Hqczbdii+msJ8mVdI1w//MiKgc8eLi7oQCpPjmkKJ4mG0EjflS6mcc+QVBmmb8p5
+FYjW5/UHRf/6qobCzqhKW8EV1CrDXAfJDyKB23a3toQs7VRwCOgzV34Hx3u7V1OD
+3xnjqn4L5D6jryDdv6bsM2N8pxzaFuAHLjCvu2hj77Bjfku6zxL7eSo55gamiy0Q
+JVfYEW/L08rSFia2/pAUYfuprhoxGI2DBaZTw6sTdxbWj75Q78OKQePbsYoxfrLb
+6Nuz3X3ZonRhIRXsoT/aXH+RL4ozpxnrdQOW2hE+rhHRwS7l2Ewg0z02TUCrOFvW
+6dmkbYqRkG9Cv1uzKsfrwyafGURM9zzmQ1Yqy9+8NsaiPB9RLKQ8h5dMi4UzXvHB
+W+wjDh/NaT4UCqOCCjovy0HePiXEH1VSTIDaP9pxdEvP4RFwzIrl9FrVnemk0GiJ
+mp3LJ4Drhl3MAbzGEk2sLOkMlbye1sdlmNtBRY+KGHV3DiA7SvglnojyAesjy88L
+0JkPXBEWTdEgH/gdjXfh
+=rIqr
+-----END PGP SIGNATURE-----
diff --git a/app-emulation/virtualbox/virtualbox-4.1.26.ebuild b/app-emulation/virtualbox/virtualbox-4.1.26.ebuild
new file mode 100644
index 000000000000..ef2e57d3234c
--- /dev/null
+++ b/app-emulation/virtualbox/virtualbox-4.1.26.ebuild
@@ -0,0 +1,389 @@
+# 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.1.26.ebuild,v 1.1 2013/04/13 20:33:35 polynomial-c Exp $
+
+EAPI=4
+
+inherit eutils fdo-mime flag-o-matic linux-info multilib pax-utils python qt4-r2 toolchain-funcs java-pkg-opt-2 udev
+
+if [[ ${PV} == "9999" ]] ; then
+	# XXX: should finish merging the -9999 ebuild into this one ...
+	ESVN_REPO_URI="http://www.virtualbox.org/svn/vbox/trunk"
+	inherit linux-mod subversion
+else
+	MY_P=VirtualBox-${PV}
+	SRC_URI="http://download.virtualbox.org/virtualbox/${PV}/${MY_P}.tar.bz2"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+DESCRIPTION="Family of powerful x86 virtualization products for enterprise as well as home use"
+HOMEPAGE="http://www.virtualbox.org/"
+SRC_URI="${SRC_URI}
+	http://dev.gentoo.org/~polynomial-c/${PN}/patchsets/${PN}-4.1.22-patches-01.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+additions alsa doc extensions headless java pam pulseaudio +opengl python +qt4 +sdk vboxwebsrv vnc"
+
+RDEPEND="!app-emulation/virtualbox-bin
+	~app-emulation/virtualbox-modules-${PV}
+	dev-libs/libIDL
+	>=dev-libs/libxslt-1.1.19
+	net-misc/curl
+	dev-libs/openssl
+	dev-libs/libxml2
+	sys-libs/zlib
+	!headless? (
+		qt4? (
+			dev-qt/qtgui:4
+			dev-qt/qtcore:4
+			opengl? ( dev-qt/qtopengl:4 )
+			x11-libs/libXinerama
+		)
+		opengl? ( virtual/opengl media-libs/freeglut )
+		x11-libs/libX11
+		x11-libs/libXcursor
+		x11-libs/libXext
+		x11-libs/libXmu
+		x11-libs/libXt
+		media-libs/libsdl:0[X,video]
+	)
+	vnc? ( >=net-libs/libvncserver-0.9.9 )
+	java? ( || ( virtual/jre:1.7 virtual/jre:1.6 ) )"
+DEPEND="${RDEPEND}
+	>=dev-util/kbuild-0.1.999
+	>=dev-lang/yasm-0.6.2
+	sys-devel/bin86
+	sys-devel/dev86
+	sys-power/iasl
+	media-libs/libpng
+	pam? ( sys-libs/pam )
+	sys-libs/libcap
+	doc? (
+		dev-texlive/texlive-basic
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexrecommended
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-fontsextra
+	)
+	java? ( || ( virtual/jdk:1.7 virtual/jdk:1.6 ) )
+	virtual/pkgconfig
+	alsa? ( >=media-libs/alsa-lib-1.0.13 )
+	!headless? ( x11-libs/libXinerama )
+	pulseaudio? ( media-sound/pulseaudio )
+	vboxwebsrv? ( >=net-libs/gsoap-2.7.13 )"
+PDEPEND="additions? ( ~app-emulation/virtualbox-additions-${PV} )
+	extensions? ( ~app-emulation/virtualbox-extpack-oracle-${PV} )"
+
+QA_TEXTRELS_x86="usr/lib/virtualbox-ose/VBoxGuestPropSvc.so
+	usr/lib/virtualbox/VBoxSDL.so
+	usr/lib/virtualbox/VBoxSharedFolders.so
+	usr/lib/virtualbox/VBoxDD2.so
+	usr/lib/virtualbox/VBoxOGLrenderspu.so
+	usr/lib/virtualbox/VBoxPython.so
+	usr/lib/virtualbox/VBoxDD.so
+	usr/lib/virtualbox/VBoxDDU.so
+	usr/lib/virtualbox/VBoxREM64.so
+	usr/lib/virtualbox/VBoxSharedClipboard.so
+	usr/lib/virtualbox/VBoxHeadless.so
+	usr/lib/virtualbox/VBoxRT.so
+	usr/lib/virtualbox/VBoxREM.so
+	usr/lib/virtualbox/VBoxSettings.so
+	usr/lib/virtualbox/VBoxKeyboard.so
+	usr/lib/virtualbox/VBoxSharedCrOpenGL.so
+	usr/lib/virtualbox/VBoxVMM.so
+	usr/lib/virtualbox/VirtualBox.so
+	usr/lib/virtualbox/VBoxOGLhosterrorspu.so
+	usr/lib/virtualbox/components/VBoxC.so
+	usr/lib/virtualbox/components/VBoxSVCM.so
+	usr/lib/virtualbox/components/VBoxDDU.so
+	usr/lib/virtualbox/components/VBoxRT.so
+	usr/lib/virtualbox/components/VBoxREM.so
+	usr/lib/virtualbox/components/VBoxVMM.so
+	usr/lib/virtualbox/VBoxREM32.so
+	usr/lib/virtualbox/VBoxPython2_4.so
+	usr/lib/virtualbox/VBoxPython2_5.so
+	usr/lib/virtualbox/VBoxPython2_6.so
+	usr/lib/virtualbox/VBoxPython2_7.so
+	usr/lib/virtualbox/VBoxXPCOMC.so
+	usr/lib/virtualbox/VBoxOGLhostcrutil.so
+	usr/lib/virtualbox/VBoxNetDHCP.so"
+
+REQUIRED_USE="
+	java? ( sdk )
+	python? ( sdk )
+	vboxwebsrv? ( java )
+"
+
+pkg_setup() {
+	if ! use headless && ! use qt4 ; then
+		einfo "No USE=\"qt4\" selected, this build will not include"
+		einfo "any Qt frontend."
+	elif use headless && use qt4 ; then
+		einfo "You selected USE=\"headless qt4\", defaulting to"
+		einfo "USE=\"headless\", this build will not include any X11/Qt frontend."
+	fi
+
+	if ! use opengl ; then
+		einfo "No USE=\"opengl\" selected, this build will lack"
+		einfo "the OpenGL feature."
+	fi
+	java-pkg-opt-2_pkg_setup
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	# Remove shipped binaries (kBuild,yasm), see bug #232775
+	rm -rf kBuild/bin tools
+
+	# Disable things unused or split into separate ebuilds
+	sed -e "s@MY_LIBDIR@$(get_libdir)@" \
+		"${FILESDIR}"/${PN}-4-localconfig > LocalConfig.kmk || die
+
+	# Respect LDFLAGS
+	sed -e "s@_LDFLAGS\.${ARCH}*.*=@& ${LDFLAGS}@g" \
+		-i Config.kmk src/libs/xpcom18a4/Config.kmk || die
+
+	# Use PAM only when pam USE flag is enbaled (bug #376531)
+	if ! use pam ; then
+		elog "Disabling PAM removes the possibility to use the VRDP features."
+		sed -i 's@^.*VBOX_WITH_PAM@#VBOX_WITH_PAM@' Config.kmk || die
+		sed -i 's@\(.*/auth/Makefile.kmk.*\)@#\1@' \
+			src/VBox/HostServices/Makefile.kmk || die
+	fi
+
+	# add correct java path
+	if use java ; then
+		sed "s@/usr/lib/jvm/java-6-sun@$(java-config -O)@" \
+			-i "${S}"/Config.kmk || die
+		java-pkg-opt-2_src_prepare
+	fi
+
+	if ! gcc-specs-pie ; then
+		EPATCH_EXCLUDE="050_${PN}-4.1.20-nopie.patch"
+	fi
+
+	EPATCH_SUFFIX="patch" \
+	EPATCH_FORCE="yes" \
+	epatch "${WORKDIR}"/patches
+
+	# fix location of ifconfig binary (bug #455902)
+	local ifcfg="$(type -p ifconfig)"
+	if [ "${ifcfg}" != "/sbin/ifconfig" ] ; then
+		sed "/VBOXADPCTL_IFCONFIG_PATH/s@/sbin/ifconfig@${ifcfg}@" \
+			-i "${S}"/src/apps/adpctl/VBoxNetAdpCtl.cpp \
+			|| die
+	fi
+}
+
+src_configure() {
+	local myconf
+	use alsa       || myconf+=" --disable-alsa"
+	use opengl     || myconf+=" --disable-opengl"
+	use pulseaudio || myconf+=" --disable-pulse"
+	use python     || myconf+=" --disable-python"
+	use java       || myconf+=" --disable-java"
+	use vboxwebsrv && myconf+=" --enable-webservice"
+	use vnc        && myconf+=" --enable-vnc"
+	use doc        || myconf+=" --disable-docs"
+	if ! use headless ; then
+		use qt4 || myconf+=" --disable-qt4"
+	else
+		myconf+=" --build-headless --disable-opengl"
+	fi
+	# not an autoconf script
+	./configure \
+		--with-gcc="$(tc-getCC)" \
+		--with-g++="$(tc-getCXX)" \
+		--disable-kmods \
+		--disable-dbus \
+		${myconf} \
+		|| die "configure failed"
+}
+
+src_compile() {
+	source ./env.sh
+
+	# Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529)
+	# and strip all flags
+	# strip-flags
+
+	MAKE="kmk" emake \
+		VBOX_VERSION_STRING='$(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD)'_Gentoo_ \
+		TOOL_GCC3_CC="$(tc-getCC)" TOOL_GCC3_CXX="$(tc-getCXX)" \
+		TOOL_GCC3_AS="$(tc-getCC)" TOOL_GCC3_AR="$(tc-getAR)" \
+		TOOL_GCC3_LD="$(tc-getCXX)" TOOL_GCC3_LD_SYSMOD="$(tc-getLD)" \
+		TOOL_GCC3_CFLAGS="${CFLAGS}" TOOL_GCC3_CXXFLAGS="${CXXFLAGS}" \
+		VBOX_GCC_OPT="${CXXFLAGS}" \
+		TOOL_YASM_AS=yasm KBUILD_PATH="${S}/kBuild" \
+		all || die "kmk failed"
+}
+
+src_install() {
+	cd "${S}"/out/linux.${ARCH}/release/bin || die
+
+	# Create configuration files
+	insinto /etc/vbox
+	newins "${FILESDIR}/${PN}-4-config" vbox.cfg
+
+	# Set the right libdir
+	sed -i \
+		-e "s@MY_LIBDIR@$(get_libdir)@" \
+		"${D}"/etc/vbox/vbox.cfg || die "vbox.cfg sed failed"
+
+	# Symlink binaries to the shipped wrapper
+	exeinto /usr/$(get_libdir)/${PN}
+	newexe "${FILESDIR}/${PN}-ose-3-wrapper" "VBox" || die
+	fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBox
+	fperms 0750 /usr/$(get_libdir)/${PN}/VBox
+
+	dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxManage
+	dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxVRDP
+	dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxHeadless
+	dosym /usr/$(get_libdir)/${PN}/VBoxTunctl /usr/bin/VBoxTunctl
+
+	# Install binaries and libraries
+	insinto /usr/$(get_libdir)/${PN}
+	doins -r components || die
+
+	if use sdk ; then
+		doins -r sdk || die
+	fi
+
+	if use vboxwebsrv ; then
+		doins vboxwebsrv || die
+		fowners root:vboxusers /usr/$(get_libdir)/${PN}/vboxwebsrv
+		fperms 0750 /usr/$(get_libdir)/${PN}/vboxwebsrv
+		dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/vboxwebsrv
+		newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
+		newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
+	fi
+
+	for each in VBox{Manage,SVC,XPCOMIPCD,Tunctl,NetAdpCtl,NetDHCP,ExtPackHelperApp} *so *r0 *gc ; do
+		doins $each || die
+		fowners root:vboxusers /usr/$(get_libdir)/${PN}/${each}
+		fperms 0750 /usr/$(get_libdir)/${PN}/${each}
+	done
+	# VBoxNetAdpCtl and VBoxNetDHCP binaries need to be suid root in any case..
+	fperms 4750 /usr/$(get_libdir)/${PN}/VBoxNetAdpCtl
+	fperms 4750 /usr/$(get_libdir)/${PN}/VBoxNetDHCP
+
+	# VBoxSVC needs to be pax-marked (bug #403453)
+	pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VBoxSVC || die
+
+	if ! use headless ; then
+		for each in VBox{SDL,Headless} ; do
+			doins $each || die
+			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
+			fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBoxTestOGL
+			fperms 0750 /usr/$(get_libdir)/${PN}/VBoxTestOGL
+		fi
+
+		dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxSDL
+
+		if use qt4 ; then
+			doins VirtualBox || die
+			fowners root:vboxusers /usr/$(get_libdir)/${PN}/VirtualBox
+			fperms 4750 /usr/$(get_libdir)/${PN}/VirtualBox
+			pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VirtualBox
+
+			dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VirtualBox
+
+			newmenu "${FILESDIR}"/${PN}-ose.desktop-2 ${PN}.desktop
+		fi
+
+		pushd "${S}"/src/VBox/Resources/OSE &>/dev/null || die
+		for size in 16 32 48 64 128 ; do
+			newicon -s ${size} ${PN}-${size}px.png ${PN}.png
+		done
+		newicon ${PN}-48px.png ${PN}.png
+		popd &>/dev/null || die
+	else
+		doins VBoxHeadless || die
+		fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBoxHeadless
+		fperms 4750 /usr/$(get_libdir)/${PN}/VBoxHeadless
+		pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VBoxHeadless
+	fi
+
+	insinto /usr/$(get_libdir)/${PN}
+	# 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
+	done
+	popd &>/dev/null || die
+
+	# New way of handling USB device nodes for VBox (bug #356215)
+	local udevdir="$(udev_get_udevdir)"
+	insinto ${udevdir}
+	doins VBoxCreateUSBNode.sh
+	fowners root:vboxusers ${udevdir}/VBoxCreateUSBNode.sh
+	fperms 0750 ${udevdir}/VBoxCreateUSBNode.sh
+	insinto ${udevdir}/rules.d
+	doins "${FILESDIR}"/10-virtualbox.rules
+	sed "s@%UDEVDIR%@${udevdir}@" \
+		-i "${D}"${udevdir}/rules.d/10-virtualbox.rules || die
+
+	insinto /usr/share/${PN}
+	if ! use headless && use qt4 ; then
+		doins -r nls
+	fi
+
+	# VRDPAuth only works with this (bug #351949)
+	dosym VBoxAuth.so  /usr/$(get_libdir)/${PN}/VRDPAuth.so
+
+	# set an env-variable for 3rd party tools
+	echo -n "VBOX_APP_HOME=/usr/$(get_libdir)/${PN}" > "${T}/90virtualbox"
+	doenvd "${T}/90virtualbox"
+
+	if use java ; then
+		java-pkg_regjar "${D}/usr/$(get_libdir)/${PN}/sdk/bindings/xpcom/java/vboxjxpcom.jar"
+		java-pkg_regso "${D}/usr/$(get_libdir)/${PN}/libvboxjxpcom.so"
+	fi
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+
+	udevadm control --reload-rules && udevadm trigger --subsystem-match=usb
+
+	if ! use headless && use qt4 ; then
+		elog "To launch VirtualBox just type: \"VirtualBox\"."
+	fi
+	elog "You must be in the vboxusers group to use VirtualBox."
+	elog ""
+	elog "The latest user manual is available for download at:"
+	elog "http://download.virtualbox.org/virtualbox/${PV}/UserManual.pdf"
+	elog ""
+	elog "For advanced networking setups you should emerge:"
+	elog "net-misc/bridge-utils and sys-apps/usermode-utilities"
+	elog ""
+	elog "IMPORTANT!"
+	elog "If you upgrade from app-emulation/virtualbox-ose make sure to run"
+	elog "\"env-update\" as root and logout and relogin as the user you wish"
+	elog "to run ${PN} as."
+	elog ""
+	elog "Starting with version 4.0.0, ${PN} has USB-1 support."
+	elog "For USB-2 support, PXE-boot ability and VRDP support please emerge"
+	elog "  app-emulation/virtualbox-extpack-oracle"
+	elog "package."
+	if [ -e "${ROOT}/etc/udev/rules.d/10-virtualbox.rules" ] ; then
+		elog ""
+		elog "Please remove \"${ROOT}/etc/udev/rules.d/10-virtualbox.rules\""
+		elog "or else USB in ${PN} won't work."
+	fi
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}
diff --git a/app-emulation/virtualbox/virtualbox-4.2.8.ebuild b/app-emulation/virtualbox/virtualbox-4.2.12.ebuild
index ebc59c7e3658..0322f301d827 100644
--- a/app-emulation/virtualbox/virtualbox-4.2.8.ebuild
+++ b/app-emulation/virtualbox/virtualbox-4.2.12.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.8.ebuild,v 1.3 2013/03/02 19:25:52 hwoarang Exp $
+# $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 $
 
 EAPI=4