virtualbox packages: Bump to version 5.1.12

Package-Manager: Portage-2.3.3, Repoman-2.3.1

12 files changed, 1108 insertions, 0 deletions

diff --git a/app-emulation/virtualbox-additions/Manifest b/app-emulation/virtualbox-additions/Manifest
index 8cc3ab3b8ca9..c723c512eaa3 100644
--- a/app-emulation/virtualbox-additions/Manifest
+++ b/app-emulation/virtualbox-additions/Manifest
@@ -5,5 +5,6 @@ DIST VBoxGuestAdditions_5.0.26.iso 58232832 SHA256 7458ee5a7121a7d243fd6a7528ba4
 DIST VBoxGuestAdditions_5.0.28.iso 58460160 SHA256 ba73986c3a14266ed3d51924e2247dfc5cf320445db02e4e50fcf509794a4deb SHA512 3d8beb9f53c80363b0f555ad3e2f176c72f6a6c58641d35803871d4795bf77c07b8dbf7c6b78df4b34e5c8d449ea81b97879a700ab482063342fc1f63f5aacfe WHIRLPOOL dd3f43f1e90df539b8d112d0a74edbbd45ba6a0c726b7dc3242495c99ae61d8596aa79ef687334b852e8a6838a1b5f08765909de6dea6f8c24c72da8f81c47d2
 DIST VBoxGuestAdditions_5.0.30.iso 58458112 SHA256 096cf810de3d951c60c857e0b8cf534dd1237d0a09759ab696e8a2c579df75fd SHA512 cff0be3271603b2c7466b5cad7f0a43699444d7fb49ee9df656962623663156bfbaed83414480e45b277b8f4d2abb8b8f7caa30230a6be3328ad6faf6ef41de5 WHIRLPOOL 3b1a90c636c8b24e23bc8b168a7a8b074ba0a4c1bab732ab1e6ca5ac9ca0e28d0634730c395350d4bbddd5c6887c6832ca4fb45a3e9f1676f86a9e376999a7cc
 DIST VBoxGuestAdditions_5.1.10.iso 59408384 SHA256 29fa0af66a3dd273b0c383c4adee31a52061d52f57d176b67f444698300b8c41 SHA512 aa8b1a4bea270033bfaf5073c1a85cf6a0900853cc53275fe922ee5ac8b5b87a13329373c4fa6ae79c38a2c0654ecfc99d1bb4a94a16c32be0e830affb771390 WHIRLPOOL 0cd9b7928e6690fab74fc922e8c7b019b3fa07e64262e9b7c16705de9dfa61bd36fef61a1b84188e4928274b68304033969dcdc88f2342cf8afec4d05f08e001
+DIST VBoxGuestAdditions_5.1.12.iso 59369472 SHA256 13a0265cab971ac3e31e83959a68e377c7f014f429fa3a168c86fb2399df4321 SHA512 fa28f5cd5ae79ff82a45abd4cf9e3d4aa9f2c1ef2dc443b24fa616ac4366d2119c6da661bdb0ee1f610644386b20c20de64c4c95c87316a4b3c0eca95c254921 WHIRLPOOL e40e17e24dca867fd8f28cf32397cdaee5cb1f0362d125866ae69dfffbc502d6292f0c25cd04a75fbf7d9916dfbdc81a91b45efc7b222dca35964142330f95f5
 DIST VBoxGuestAdditions_5.1.6.iso 59258880 SHA256 cbcf9b9b1000e09911b3d20e1efe529aef8a945cf130f6abffc14a39522cc1ed SHA512 14548ef172609d1b3c4eec65b38cbe461f6a9240d0a77f4078de18c0b95c6bea59aa65ffb8bd1501843d00554e1bbf160cdb67628ff7a3e57c3aff4216d40f9b WHIRLPOOL 64f35f8b55df3ab49a159f405ab9762ff49087dd57d377938ef7568a919727d975badfb337ac26370054714f566131728fed501e42ddc637975513f423e3076d
 DIST VBoxGuestAdditions_5.1.8.iso 59314176 SHA256 347fd39df6ddee8079ad41fbc038e2fb64952a40255d75292e8e49a0a0cbf657 SHA512 bdf41fe0c2203c3abaca9ab948a53eeade67f1193a3c195fe15f460d5dcb8905c81d033ebf28569fbd134fe6b3b84c89a18b17d4c81f06ee393cac22df88e841 WHIRLPOOL 20f9f7facbbe5c8c409061a16659ccb5fa9f62dae2c335ca432fb9da597f8c7932e115716dfdf04812e0268af6b8241645f584cfaf8bddf956941212540318be
diff --git a/app-emulation/virtualbox-additions/virtualbox-additions-5.1.12.ebuild b/app-emulation/virtualbox-additions/virtualbox-additions-5.1.12.ebuild
new file mode 100644
index 000000000000..681471fe6929
--- /dev/null
+++ b/app-emulation/virtualbox-additions/virtualbox-additions-5.1.12.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit eutils
+
+MY_PN=VBoxGuestAdditions
+MY_PV="${PV/beta/BETA}"
+MY_PV="${MY_PV/rc/RC}"
+MY_P=${MY_PN}_${MY_PV}
+
+DESCRIPTION="CD image containing guest additions for VirtualBox"
+HOMEPAGE="http://www.virtualbox.org/"
+SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.iso"
+
+LICENSE="GPL-2+ LGPL-2.1+ MIT SGI-B-2.0 CDDL"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RESTRICT="mirror"
+
+RDEPEND="!app-emulation/virtualbox-bin
+	!=app-emulation/virtualbox-9999"
+
+S="${WORKDIR}"
+
+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-bin/Manifest b/app-emulation/virtualbox-bin/Manifest
index 3f5c0f6a7afa..321204b09714 100644
--- a/app-emulation/virtualbox-bin/Manifest
+++ b/app-emulation/virtualbox-bin/Manifest
@@ -5,6 +5,7 @@ DIST Oracle_VM_VirtualBox_Extension_Pack-5.0.26-108824.tar.gz 16425147 SHA256 2f
 DIST Oracle_VM_VirtualBox_Extension_Pack-5.0.28-111378.tar.gz 18960364 SHA256 1fb0c1bb37ee3c19af2add07e61b6a1837239e30a54b6f6474131f08c448a46d SHA512 55a127b9537c59ede23a5acf2b37926afd9d71a6a41fd104ea72655645469b50fa7717630a9064b5ec92b32cdb55282767f9e267e8a7c734e023a339aa9ff318 WHIRLPOOL 1729182ca0a195eb52ffa761e0bd502235049771978c1b781773fc70ecfe0885bb413675dcf3cd685d277c3ae9b0f510626dc2ba1318263ac671cb8875be3ccf
 DIST Oracle_VM_VirtualBox_Extension_Pack-5.0.30-112061.tar.gz 18968644 SHA256 f0880b7948bdc185d7e7be0fc98b551296ed9578f21e38d01b43771323a71a3d SHA512 d78676179f39b9c016bed2a5534f1392993c138137c8fe304fa7468b99f53fb112a2107f83d4ccc01c89d5f8175f6d1e7da0c75ef20438bd1224cedc5e3fc199 WHIRLPOOL f5c2bf3b73b70bf9d135bff2743afd874d7a8cb5e83e32ad972ed16e0c04275193f531fe3a35fea3f38e19f7c80959ae1d6e53ac8e67139ca997a2f7b23bfe05
 DIST Oracle_VM_VirtualBox_Extension_Pack-5.1.10-112026.tar.gz 19475614 SHA256 3982657fd4853bcbc79b9162e618545a479b65aca08e9ced43a904aeeba3ffa5 SHA512 5225f640424f7a35a76c009e67890a5314a2063f7e82a1ff2df806e2fa43a932f06c1873357c6b1b48c78c43ad2a3ececc77044e3a47934ffc240983e09804d9 WHIRLPOOL a4b1eae59a4a9212530ca65bf3fe9eae7bb69176eb1755f5948948884bfb981ef7081bca98397a99035fe433685a6412ddd507d747fe2fce868f9e0d0d93dad7
+DIST Oracle_VM_VirtualBox_Extension_Pack-5.1.12-112440.tar.gz 19474481 SHA256 03111380afb06122a494595e966dffe3e2779840e8698e27e80f87342b291286 SHA512 a3a17c3719646537fbcd586b0f784f450d4777242b52f345e2c70a94ec3da53adba128430277576e92accfa06d4a3b2f43dec861de1c9b088ecb2aff95bae273 WHIRLPOOL beedbbec409b1b87add933641389ef6e4deba6a4b0d374f6ce54289dd211653426986871054a1a4bf28ce8e11849e44719779fa660145689314c85a086788845
 DIST Oracle_VM_VirtualBox_Extension_Pack-5.1.6-110634.tar.gz 16919742 SHA256 607ac3636bd49a738d5c48159b39261369b5487f71fb10afa2ecf869627a12de SHA512 1cbadf0c5bbafa7f83996cd6cbe3cf42c4cbd644ff692269f684ea9e394880c8367fb8f7796a4e17d6dc9495e8b533d9498db4ba1e351204c0370ec5819df681 WHIRLPOOL e9741c01e091695f5058018dd79a08c788060ed2c6dbbfe1546d5f3d08fb16e49c2e22342daa2d007ea847aeb8d731343235a86589b5fbbba5cdebbcdfb55823
 DIST Oracle_VM_VirtualBox_Extension_Pack-5.1.8-111374.tar.gz 19457682 SHA256 d28bcd01c14eb07eedd2b964d1abe4876f0a7e0e89530e7ba285a5d6267bf322 SHA512 8539c4cb60b672a06b0f87763686af7f8b8a125ad02b7d30c76da17399aa95455bf9d7c5105072ff5b973fac89d09b7c21698dcf46779bfc1a306d524c1be5ef WHIRLPOOL 61b9f4a69629e8c75dcb86fccd2168d312a0a2e31ea5e51fd80dc0f7601508bc40510422bbaeb30a82fa76e19d87f6221eaafdeedcf1a20f0e902571749a70a0
 DIST VirtualBox-4.3.38-106717-Linux_amd64.run 80014802 SHA256 e09bacd60862c03f9685c71838360d1056cb9011291d64b03fa22b411c8d4963 SHA512 7be004c82c0ce20b87dda8cfa14de63f53faf9d45c870fff659230a734bacdf60a72b6b6171859653d2b135eaa25a9fccb0cd812e6b4c2d6fa295c05cf33b7b6 WHIRLPOOL fbc3fb1a338604ed0c0a0803fe97c159013543aaa8d6477ead26fbabfd3a06f907f1ff9ad2e670e12187c21d4b939dfe7f37d1d5c4a748afdbc34f344c04ede2
@@ -21,6 +22,8 @@ DIST VirtualBox-5.0.30-112061-Linux_amd64.run 84479441 SHA256 243f1290764b6da28c
 DIST VirtualBox-5.0.30-112061-Linux_x86.run 83721678 SHA256 1d62d1ab6a97a85c08edc20ec4449cd6058403d78abac401455682ad91081592 SHA512 9b19ee57a98edd1cd43a34db729334376bbfc1214edfc6c605094bd47d6cc7878439257a4b96b689db86436dbc3e3f997f518ebd7a8d6d8841dbfbdab175d853 WHIRLPOOL 44c680cc8ec8fb02a6641d962b1705e2e3aef4ec1a43f3566273325f80be667f96e58a1a03dfc279f886a100709c134edb1d1ecd4f823864d620b8dac869a900
 DIST VirtualBox-5.1.10-112026-Linux_amd64.run 87367122 SHA256 2b190706e7812e86d18feff70d8f28b1e5b0772f2c8476d8ba8f59ec57d7daaf SHA512 eca9efa5e31a12973f998ad2eb6102975e3f6434f2b5be798fbd0c085fe4a4fd9424bea3fe97d9c3f165d526b28ac5d2f2970a2dca5179fc9e2c4e797a7d5d9c WHIRLPOOL ff7ab19a36c2aeccdd76c0af88249940c94cc994e4b70dd9e5a8839c0ce814952ff379d0ccc81214feab3f8f0e500b57a71873c97bd5a00f8506a048e1fd486e
 DIST VirtualBox-5.1.10-112026-Linux_x86.run 86486478 SHA256 9489d543f9c977f3103f7f69167baff861cb7be2e4338e641835e60a8e1d29c7 SHA512 cb91712e99777f44a65772b2b6ebe2f882bc5b6468f2521536ed101871d627f9ef1d0875513c98757e1bb8af9756f6f2010f5a54b4ad2d217ce30d65f6f8c63a WHIRLPOOL 4c1b6271b32786510bbff04353ca96911befb91365f833e3fd95d6dffc7f88580af2baa2320e24b01923162b2013dba0c474f4a3e2ce4882ce51b4923dd97dda
+DIST VirtualBox-5.1.12-112440-Linux_amd64.run 87377362 SHA256 6d2e8bdba13be2d48975d2fe03b4fe510856ae69ef8c3d166a58cdb6ffb85752 SHA512 5592cf627f874cd73a3d8326955b9d640baa9771d5f81f9c62c928754a141e4c8ee116724299800fb816f02476227cf22d7bfd5fad16547abffd207a91aaa6e5 WHIRLPOOL 1da09c8aba4034b1a0665931ae1bc32ca48b701874467613052f5ee0468f42351e5ed0e174f2a13946b5238a9ff2ebc89f8c854579477d0e032298dc8478c12b
+DIST VirtualBox-5.1.12-112440-Linux_x86.run 86711758 SHA256 1fc4e93303894e31c9258e89c22bb5a6ced6a935b582bc3cbb7b6e44c386a429 SHA512 c746768b21def4b21265067135aef740b7e7437d74e27f038fcb0f860c17461d21fe1c3697b546d7b5f725c4a547ddee233388780365e941f1db426ea819a326 WHIRLPOOL eb2a1915c356d5d768e1e1982adcba34c5d6ef4ac573ff0eaf87e5a1d6188b346dcaccf202763b09a97011b902de21be0a6c9f646f47c3d4f3cf7e17743a077e
 DIST VirtualBox-5.1.6-110634-Linux_amd64.run 86998481 SHA256 530897a9278ad9ef115239582cc767d16d25146c7611035760f83d4ec7522078 SHA512 b19dba07ff07414cb651592c1eb8e7b10b4423b97fa6f088c906a2b72558d2d7ad43f434cfadf29e8c07e570f16615f12f02feae7bfb7c4b652f93eb4dde86a2 WHIRLPOOL d97c1f269976b19cb19378ab189a26ec304a46b0f18086102f276f953ea446fb64b0ecda0f7d9cf9b7c0eb962d623d1dd823873242ec6f8410ca288a7245ae3e
 DIST VirtualBox-5.1.6-110634-Linux_x86.run 86209997 SHA256 78deafb1ceba76994c1db20d73625b36e050e3c58203278e4b2999938bb5a7d3 SHA512 27cbd39b0a050985ff78ec852268d5995e97a8b5429c2edcb4dcecb091e17c81e2a6bc28dc5b64ad2cac1ab0e707275393b23c8d1f6a3d92fc77de53965c1669 WHIRLPOOL a00107f3547103dd4143e00a865adf446ebf4f14b34e4fcc4b6c17ca7eec281ed1b0730a158815ecc3ef81aa99463b6267083a235ac643b719143f7a1657ae42
 DIST VirtualBox-5.1.8-111374-Linux_amd64.run 87315922 SHA256 8913839928fb219a537618a839a0ae3b1aeae04a7888f6d52bfb6f2959c43ca5 SHA512 789ef674b45509ce35ba4ade54e02022ecb7d7869c7164a1011b45ced325e11575e3200cf1f8c36835541cca3278d574a8f428a967b2c8e3cbe1c9b8ea77d355 WHIRLPOOL 9c6174e7519dd9c4cf6f3698aeaf03a17140bd75e0be3c473603b199254bc7e35da4a72060ae67fb26bc63af0035942fe4485a1f23a3227c2c4020a9ec8985b5
@@ -32,5 +35,6 @@ DIST VirtualBoxSDK-5.0.26-108824.zip 9674060 SHA256 285bf821feb23f50bbabfa016c42
 DIST VirtualBoxSDK-5.0.28-111378.zip 9674263 SHA256 fa72c8d95f286f81ffdb945638064cf6b13a542446184f4b11b3d30ad9c5595c SHA512 b4a346b2196b568a37be5116d65f25ec274b489d5972e4f4bb9ddfbaf43f1044e33cd2dc8aab325914ced9af50269d919a0ccbc8f323477578a7603f302611b5 WHIRLPOOL 8ba7e66efc46882e8c8dbbd4d843cb4fa2882d805aed81e217b9fbaa61287b679c47ba0995252ca4275a484ae28036fa342cae0a7d4580816ec83085efd6e5e6
 DIST VirtualBoxSDK-5.0.30-112061.zip 9675696 SHA256 b184628df4028bcd00821d36f766fc1b70068f0c1846ad90555eeddcc862fcde SHA512 7a1863fb4e2c0966d1f185f6dee8bbb4066ea757108dbb2a541de9c85d548e5df09842f4ced18651684eb438f8ab76b12b5f7273e23b202c01edc7e0898c8af8 WHIRLPOOL fe60205dea450d313ff1155f47bea3e65977ca3648bfc56f52dc73362b24a6b1a497b5bb249365a491f8dd14ae947e8e6d3447de2bdf4cf842910b7805ebc24d
 DIST VirtualBoxSDK-5.1.10-112026.zip 9858551 SHA256 96f908a7bb2672b03aba3dc586a278562af1b3be4e70c326da96a32e41882484 SHA512 1916f1693041684c6c97dcba8768952cad4c3030e5026a001607fbcc6d5829256f55c4b42081ecce85b3b7a864bd9df4b8204ab8ac53e22c69ce21696e13f901 WHIRLPOOL 5a710ef43bd47a66b28f3fbd9938764d9822898bec760a56a51b0cea34153f9811295c8738c7993be4f2bc7df711eec0888bde3dcfe0bb060be62450ffc7025c
+DIST VirtualBoxSDK-5.1.12-112440.zip 9859715 SHA256 9e2ad0608ef75c2305a5cdba44c0d54e5803e1b7d4f10503e23bdefe5c68a74e SHA512 0b7abf81c937bf706f3dfe353dc801c7b6ef56d6a3666bde2a2eb26bbd536d02c58735eb5038a78c161c01a5b300555b31769896c18556fcdd8f4fd9f42f2f84 WHIRLPOOL 6cbafa0bf610c94c90f2f5516d273aacdc0c697cab5e4b6597b278d89caca3a85e62289f2dcdacd083325b7465fcdb50a942a090e9e5c971e975094f2b3fdc0d
 DIST VirtualBoxSDK-5.1.6-110634.zip 9861672 SHA256 ecf5abaa1d73f4771659cd04bceff90f907c5cf60756c156ac0284ba9614a452 SHA512 97c8b3795049a590360a5a95594a4031cefa3439a17006222742fe732b5ed5fa8b747124a85975ae1f69defcf01af1137d4565fc7fb3b8774ff1d2004f313046 WHIRLPOOL d9a97aa766612586bf3259533f6a85a2ba7e936318995c17b0adfc57b0b486f92472cd47ea3716ca211eb4d67e81df94b45825bbf1c5afded7a71acba997aeac
 DIST VirtualBoxSDK-5.1.8-111374.zip 9860397 SHA256 62848668bf749e991edc21bd310e18684c13466b3322fe0921fe5ced4000bf84 SHA512 5b36922ec020487e8e16d97f1b3ff2fc40586224b779c600607136eb4eccdd2992618edc35bb9b12495d8ee894315c8ba08f3747b2a6d5b6edb0915629d3f005 WHIRLPOOL 4e22f955768b12ddc0b577b062e1cadbd50c9b2f34bb680c9c75d7acd3407b5f63d52f8ee3c0411aa5f34fd490d07cfeb0d5cb4063352fed4c643de1bdb8924f
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-5.1.12.112440.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-5.1.12.112440.ebuild
new file mode 100644
index 000000000000..0c5a78159b35
--- /dev/null
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-5.1.12.112440.ebuild
@@ -0,0 +1,288 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils fdo-mime gnome2 pax-utils python-r1 udev unpacker versionator
+
+MAIN_PV="$(get_version_component_range 1-3)"
+if [[ ${PV} = *_beta* ]] || [[ ${PV} = *_rc* ]] ; then
+	MY_PV="${MAIN_PV}_$(get_version_component_range 5)"
+	MY_PV="${MY_PV/beta/BETA}"
+	MY_PV="${MY_PV/rc/RC}"
+else
+	MY_PV="${MAIN_PV}"
+fi
+VBOX_BUILD_ID="$(get_version_component_range 4)"
+VBOX_PV="${MY_PV}-${VBOX_BUILD_ID}"
+MY_P="VirtualBox-${VBOX_PV}-Linux"
+# needed as sometimes the extpack gets another build ID
+EXTP_PV="${VBOX_PV}"
+EXTP_PN="Oracle_VM_VirtualBox_Extension_Pack"
+EXTP_P="${EXTP_PN}-${EXTP_PV}"
+# needed as sometimes the SDK gets another build ID
+SDK_PV="${VBOX_PV}"
+SDK_P="VirtualBoxSDK-${SDK_PV}"
+
+DESCRIPTION="Family of powerful x86 virtualization products for enterprise as well as home use"
+HOMEPAGE="http://www.virtualbox.org/"
+SRC_URI="amd64? ( http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}_amd64.run )
+	x86? ( http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}_x86.run )
+	http://download.virtualbox.org/virtualbox/${MY_PV}/${EXTP_P}.vbox-extpack -> ${EXTP_P}.tar.gz"
+
+LICENSE="GPL-2 PUEL"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+additions +chm headless python vboxwebsrv rdesktop-vrdp"
+RESTRICT="mirror"
+
+if [[ "${PV}" != *beta* ]] ; then
+	SRC_URI+="
+		sdk? ( http://download.virtualbox.org/virtualbox/${MY_PV}/${SDK_P}.zip )"
+	IUSE+=" sdk"
+fi
+
+DEPEND="app-arch/unzip
+	${PYTHON_DEPS}"
+
+RDEPEND="!!app-emulation/virtualbox
+	!app-emulation/virtualbox-additions
+	~app-emulation/virtualbox-modules-${MAIN_PV}
+	!headless? (
+		dev-libs/glib
+		media-libs/fontconfig
+		media-libs/freetype
+		media-libs/libpng
+		media-libs/libsdl[X]
+		x11-libs/libXcursor
+		x11-libs/libXext
+		x11-libs/libXfixes
+		x11-libs/libXft
+		x11-libs/libXi
+		x11-libs/libXinerama
+		x11-libs/libXrandr
+		x11-libs/libXrender
+		chm? ( dev-libs/expat )
+	)
+	dev-libs/libxml2
+	sys-fs/lvm2
+	x11-libs/libXau
+	x11-libs/libX11
+	x11-libs/libXt
+	x11-libs/libXmu
+	x11-libs/libSM
+	x11-libs/libICE
+	x11-libs/libXdmcp
+	${PYTHON_DEPS}"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+S=${WORKDIR}
+
+QA_PREBUILT="opt/VirtualBox/*"
+
+PYTHON_UPDATER_IGNORE="1"
+
+src_unpack() {
+	unpack_makeself ${MY_P}_${ARCH}.run
+	unpack ./VirtualBox.tar.bz2
+
+	mkdir "${S}"/${EXTP_PN} || die
+	pushd "${S}"/${EXTP_PN} &>/dev/null || die
+	unpack ${EXTP_P}.tar.gz
+	popd &>/dev/null || die
+
+	if [[ "${PV}" != *beta* ]] && use sdk ; then
+		unpack VirtualBoxSDK-${SDK_PV}.zip
+	fi
+}
+
+src_configure() {
+	:;
+}
+
+src_compile() {
+	:;
+}
+
+src_install() {
+	# create virtualbox configurations files
+	insinto /etc/vbox
+	newins "${FILESDIR}/${PN}-config" vbox.cfg
+
+	if ! use headless ; then
+		newmenu "${FILESDIR}"/${PN}.desktop-2 ${PN}.desktop
+
+		# set up symlinks (bug #572012)
+		dosym /opt/VirtualBox/virtualbox.xml /usr/share/mime/packages/virtualbox.xml
+
+		local size ico icofile
+		for size in 16 24 32 48 64 72 96 128 256 ; do
+			pushd "${S}"/icons/${size}x${size} &>/dev/null || die
+			if [[ -f "virtualbox.png" ]] ; then
+				doicon -s ${size} virtualbox.png
+			fi
+			for ico in hdd ova ovf vbox{,-extpack} vdi vdh vmdk ; do
+				icofile="virtualbox-${ico}.png"
+				if [[ -f "${icofile}" ]] ; then
+					doicon -s ${size} ${icofile}
+				fi
+			done
+			popd &>/dev/null || die
+		done
+		doicon -s scalable "${S}"/icons/scalable/virtualbox.svg
+		insinto /usr/share/pixmaps
+		newins "${S}"/icons/48x48/virtualbox.png ${PN}.png
+	fi
+
+	pushd "${S}"/${EXTP_PN} &>/dev/null || die
+	insinto /opt/VirtualBox/ExtensionPacks/${EXTP_PN}
+	doins -r linux.${ARCH}
+	doins ExtPack* PXE-Intel.rom
+	popd &>/dev/null || die
+	rm -rf "${S}"/${EXTP_PN}
+
+	insinto /opt/VirtualBox
+	dodir /opt/bin
+
+	doins UserManual.pdf
+
+	if [[ "${PV}" != *beta* ]] && use sdk ; then
+		doins -r sdk
+	fi
+
+	if use additions; then
+		doins -r additions
+	fi
+
+	if use vboxwebsrv; then
+		doins vboxwebsrv
+		fowners root:vboxusers /opt/VirtualBox/vboxwebsrv
+		fperms 0750 /opt/VirtualBox/vboxwebsrv
+		dosym /opt/VirtualBox/VBox.sh /opt/bin/vboxwebsrv
+		newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
+		newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
+	fi
+
+	if use rdesktop-vrdp; then
+		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
+		fowners root:vboxusers /opt/VirtualBox/kchmviewer
+		fperms 0750 /opt/VirtualBox/kchmviewer
+	fi
+
+	# This ebuild / package supports only py2.7.  When py3 comes is unknown.
+	# The compile phase makes VBoxPython2_7.so.
+	# py3 support would presumably require a binary pre-compiled by py3.
+	use python && doins VBoxPython.so VBoxPython2_7.so
+
+	rm -rf src rdesktop* deffiles install* routines.sh runlevel.sh \
+		vboxdrv.sh VBox.sh VBox.png vboxnet.sh additions VirtualBox.desktop \
+		VirtualBox.tar.bz2 LICENSE VBoxSysInfo.sh rdesktop* vboxwebsrv \
+		webtest kchmviewer VirtualBox.chm vbox-create-usb-node.sh \
+		90-vbox-usb.fdi uninstall.sh vboxshell.py vboxdrv-pardus.py \
+		VBoxPython?_*.so
+
+	if use headless ; then
+		rm -rf VBoxSDL VirtualBox VBoxKeyboard.so
+	fi
+
+	doins -r * || die
+
+	# create symlinks for working around unsupported $ORIGIN/.. in VBoxC.so (setuid)
+	dosym /opt/VirtualBox/VBoxVMM.so /opt/VirtualBox/components/VBoxVMM.so
+	dosym /opt/VirtualBox/VBoxREM.so /opt/VirtualBox/components/VBoxREM.so
+	dosym /opt/VirtualBox/VBoxRT.so /opt/VirtualBox/components/VBoxRT.so
+	dosym /opt/VirtualBox/VBoxDDU.so /opt/VirtualBox/components/VBoxDDU.so
+	dosym /opt/VirtualBox/VBoxXPCOM.so /opt/VirtualBox/components/VBoxXPCOM.so
+
+	local each
+	for each in VBox{Manage,SVC,XPCOMIPCD,Tunctl,NetAdpCtl,NetDHCP,NetNAT,TestOGL,ExtPackHelperApp}; do
+		fowners root:vboxusers /opt/VirtualBox/${each}
+		fperms 0750 /opt/VirtualBox/${each}
+		pax-mark -m "${D}"/opt/VirtualBox/${each}
+	done
+	# VBoxNetAdpCtl and VBoxNetDHCP binaries need to be suid root in any case..
+	fperms 4750 /opt/VirtualBox/VBoxNetAdpCtl
+	fperms 4750 /opt/VirtualBox/VBoxNetDHCP
+	fperms 4750 /opt/VirtualBox/VBoxNetNAT
+
+	if ! use headless ; then
+		# Hardened build: Mark selected binaries set-user-ID-on-execution
+		for each in VBox{SDL,Headless} VirtualBox; do
+			fowners root:vboxusers /opt/VirtualBox/${each}
+			fperms 4510 /opt/VirtualBox/${each}
+			pax-mark -m "${D}"/opt/VirtualBox/${each}
+		done
+
+		dosym /opt/VirtualBox/VBox.sh /opt/bin/VirtualBox
+		dosym /opt/VirtualBox/VBox.sh /opt/bin/VBoxSDL
+	else
+		# Hardened build: Mark selected binaries set-user-ID-on-execution
+		fowners root:vboxusers /opt/VirtualBox/VBoxHeadless
+		fperms 4510 /opt/VirtualBox/VBoxHeadless
+		pax-mark -m "${D}"/opt/VirtualBox/VBoxHeadless
+	fi
+
+	exeinto /opt/VirtualBox
+	newexe "${FILESDIR}/${PN}-3-wrapper" "VBox.sh"
+	fowners root:vboxusers /opt/VirtualBox/VBox.sh
+	fperms 0750 /opt/VirtualBox/VBox.sh
+
+	dosym /opt/VirtualBox/VBox.sh /opt/bin/VBoxManage
+	dosym /opt/VirtualBox/VBox.sh /opt/bin/VBoxVRDP
+	dosym /opt/VirtualBox/VBox.sh /opt/bin/VBoxHeadless
+	dosym /opt/VirtualBox/VBoxTunctl /opt/bin/VBoxTunctl
+
+	# set an env-variable for 3rd party tools
+	echo -n "VBOX_APP_HOME=/opt/VirtualBox" > "${T}/90virtualbox"
+	doenvd "${T}/90virtualbox"
+
+	local udevdir="$(get_udevdir)"
+	insinto ${udevdir}/rules.d
+	doins "${FILESDIR}"/10-virtualbox.rules
+	sed "s@%UDEVDIR%@${udevdir}@" \
+		-i "${D}"${udevdir}/rules.d/10-virtualbox.rules || die
+	# move udev scripts into ${udevdir} (bug #372491)
+	mv "${D}"/opt/VirtualBox/VBoxCreateUSBNode.sh "${D}"${udevdir} || die
+	fperms 0750 ${udevdir}/VBoxCreateUSBNode.sh
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+
+	gnome2_icon_cache_update
+
+	udevadm control --reload-rules && udevadm trigger --subsystem-match=usb
+
+	elog ""
+	if ! use headless ; then
+		elog "To launch VirtualBox just type: \"VirtualBox\""
+		elog ""
+	fi
+	elog "You must be in the vboxusers group to use VirtualBox."
+	elog ""
+	elog "For advanced networking setups you should emerge:"
+	elog "net-misc/bridge-utils and sys-apps/usermode-utilities"
+	elog ""
+	elog "Please visit http://www.virtualbox.org/wiki/Editions for"
+	elog "an overview about the different features of ${PN}"
+	elog "and virtualbox-ose"
+	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-extpack-oracle/Manifest b/app-emulation/virtualbox-extpack-oracle/Manifest
index 59a277541ae5..fbb59417fb1b 100644
--- a/app-emulation/virtualbox-extpack-oracle/Manifest
+++ b/app-emulation/virtualbox-extpack-oracle/Manifest
@@ -5,5 +5,6 @@ DIST Oracle_VM_VirtualBox_Extension_Pack-5.0.26-108824.tar.gz 16425147 SHA256 2f
 DIST Oracle_VM_VirtualBox_Extension_Pack-5.0.28-111378.tar.gz 18960364 SHA256 1fb0c1bb37ee3c19af2add07e61b6a1837239e30a54b6f6474131f08c448a46d SHA512 55a127b9537c59ede23a5acf2b37926afd9d71a6a41fd104ea72655645469b50fa7717630a9064b5ec92b32cdb55282767f9e267e8a7c734e023a339aa9ff318 WHIRLPOOL 1729182ca0a195eb52ffa761e0bd502235049771978c1b781773fc70ecfe0885bb413675dcf3cd685d277c3ae9b0f510626dc2ba1318263ac671cb8875be3ccf
 DIST Oracle_VM_VirtualBox_Extension_Pack-5.0.30-112061.tar.gz 18968644 SHA256 f0880b7948bdc185d7e7be0fc98b551296ed9578f21e38d01b43771323a71a3d SHA512 d78676179f39b9c016bed2a5534f1392993c138137c8fe304fa7468b99f53fb112a2107f83d4ccc01c89d5f8175f6d1e7da0c75ef20438bd1224cedc5e3fc199 WHIRLPOOL f5c2bf3b73b70bf9d135bff2743afd874d7a8cb5e83e32ad972ed16e0c04275193f531fe3a35fea3f38e19f7c80959ae1d6e53ac8e67139ca997a2f7b23bfe05
 DIST Oracle_VM_VirtualBox_Extension_Pack-5.1.10-112026.tar.gz 19475614 SHA256 3982657fd4853bcbc79b9162e618545a479b65aca08e9ced43a904aeeba3ffa5 SHA512 5225f640424f7a35a76c009e67890a5314a2063f7e82a1ff2df806e2fa43a932f06c1873357c6b1b48c78c43ad2a3ececc77044e3a47934ffc240983e09804d9 WHIRLPOOL a4b1eae59a4a9212530ca65bf3fe9eae7bb69176eb1755f5948948884bfb981ef7081bca98397a99035fe433685a6412ddd507d747fe2fce868f9e0d0d93dad7
+DIST Oracle_VM_VirtualBox_Extension_Pack-5.1.12-112440.tar.gz 19474481 SHA256 03111380afb06122a494595e966dffe3e2779840e8698e27e80f87342b291286 SHA512 a3a17c3719646537fbcd586b0f784f450d4777242b52f345e2c70a94ec3da53adba128430277576e92accfa06d4a3b2f43dec861de1c9b088ecb2aff95bae273 WHIRLPOOL beedbbec409b1b87add933641389ef6e4deba6a4b0d374f6ce54289dd211653426986871054a1a4bf28ce8e11849e44719779fa660145689314c85a086788845
 DIST Oracle_VM_VirtualBox_Extension_Pack-5.1.6-110634.tar.gz 16919742 SHA256 607ac3636bd49a738d5c48159b39261369b5487f71fb10afa2ecf869627a12de SHA512 1cbadf0c5bbafa7f83996cd6cbe3cf42c4cbd644ff692269f684ea9e394880c8367fb8f7796a4e17d6dc9495e8b533d9498db4ba1e351204c0370ec5819df681 WHIRLPOOL e9741c01e091695f5058018dd79a08c788060ed2c6dbbfe1546d5f3d08fb16e49c2e22342daa2d007ea847aeb8d731343235a86589b5fbbba5cdebbcdfb55823
 DIST Oracle_VM_VirtualBox_Extension_Pack-5.1.8-111374.tar.gz 19457682 SHA256 d28bcd01c14eb07eedd2b964d1abe4876f0a7e0e89530e7ba285a5d6267bf322 SHA512 8539c4cb60b672a06b0f87763686af7f8b8a125ad02b7d30c76da17399aa95455bf9d7c5105072ff5b973fac89d09b7c21698dcf46779bfc1a306d524c1be5ef WHIRLPOOL 61b9f4a69629e8c75dcb86fccd2168d312a0a2e31ea5e51fd80dc0f7601508bc40510422bbaeb30a82fa76e19d87f6221eaafdeedcf1a20f0e902571749a70a0
diff --git a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.1.12.112440.ebuild b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.1.12.112440.ebuild
new file mode 100644
index 000000000000..1d4488147c31
--- /dev/null
+++ b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.1.12.112440.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit eutils multilib versionator
+
+MAIN_PV="$(get_version_component_range 1-3)"
+if [[ ${PV} = *_beta* ]] || [[ ${PV} = *_rc* ]] ; then
+	MY_PV="${MAIN_PV}_$(get_version_component_range 5)"
+	DEP_PV="${MY_PV}"
+	MY_PV="${MY_PV/beta/BETA}"
+	MY_PV="${MY_PV/rc/RC}"
+else
+	MY_PV="${MAIN_PV}"
+	DEP_PV="${MAIN_PV}"
+fi
+VBOX_BUILD_ID="$(get_version_component_range 4)"
+MY_PN="Oracle_VM_VirtualBox_Extension_Pack"
+MY_P="${MY_PN}-${MY_PV}-${VBOX_BUILD_ID}"
+
+DESCRIPTION="PUEL extensions for VirtualBox"
+HOMEPAGE="http://www.virtualbox.org/"
+SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.vbox-extpack -> ${MY_P}.tar.gz"
+
+LICENSE="PUEL"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RESTRICT="mirror strip"
+
+RDEPEND="~app-emulation/virtualbox-${DEP_PV}"
+
+S="${WORKDIR}"
+
+QA_PREBUILT="/usr/lib*/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-guest-additions/Manifest b/app-emulation/virtualbox-guest-additions/Manifest
index 1c5fc845568d..ed44dd69f5ca 100644
--- a/app-emulation/virtualbox-guest-additions/Manifest
+++ b/app-emulation/virtualbox-guest-additions/Manifest
@@ -5,5 +5,6 @@ DIST VirtualBox-5.0.20.tar.bz2 111231246 SHA256 af9c0787aae22964a1192cefbf9aa91a
 DIST VirtualBox-5.0.28.tar.bz2 111513040 SHA256 21434481e00791014209aaf00ffa8dad0b393ba5abb270a241e9aa22285b910d SHA512 66698c6fb76f65102c969565d1d0d138dd022f02c581cd3dc8a09a7ffff2ec1e628b35aa99ae5904448b57eebc14017a441755567455cb4562b34ea2efdabd75 WHIRLPOOL 89b059a785ea2cddcf27f7c49a13bca939219b37fd33296edb6354236729e3cf81627fd9a16edd03a4f16e0896bee50dc13f75dc27e98e53b464d137825012dc
 DIST VirtualBox-5.0.30.tar.bz2 111511741 SHA256 105590354b12a8dfa92329ffd9b4e87a14d1037ae0e869638ae5ab35f584ee63 SHA512 6c2c6b4378c2936ac1cafbd10307792001bb814655679a6bd7a19abdbb633a643a02224ba7e3cf8d24bfd15fda1c9f0a408f3ab4ebda98bb63354d41b6092d88 WHIRLPOOL 85ec6727cef1a7c6eb0050463677ecae6774797040bdab1cc38d7b8f00b9c4d7499dc275eb0e6a679a457eb2586e6c84dcfbc2e0da93c09bc68b5b1faae3965d
 DIST VirtualBox-5.1.10.tar.bz2 114912508 SHA256 98073b1b2adee4e6553df73cb5bb6ea8ed7c3a41a475757716fd9400393bea40 SHA512 b4418545919adfa1f06d86dddf56f95bdfe1dd6664bbe4574765cbf8eb54273d8d56954e55d1afe8b2aab9fbc82055867a129e40eba30cc5baddd417f9a8f722 WHIRLPOOL edd54a8a35c90a4e428ea5704400137a1b65bbe98bc81b3e1216373eeff91d33bb670fee249d3fbdcadf39354af1e62a426ab5c67916078e41815a84d9a2e029
+DIST VirtualBox-5.1.12.tar.bz2 114950292 SHA256 e6f10b1b6f3eb1be2c5223f60569f8ce35468a4354ed53db12f4c9b419393d0d SHA512 0e63f778595aada4389a0d4f390aaa56fc1fb0ed0c4ce999f060787ce6d29462329d6543f34572111d2538cf49a54b799263fe04ebd115c2426506c28c809516 WHIRLPOOL 524e1b8238e80aa8460428db8269602b3ae190945726f40e59141d86c0d675d9c7ed60eac559af7debf8fc415d232063240ef8e626123dec09db2b9902dd8c4d
 DIST VirtualBox-5.1.6.tar.bz2 114669517 SHA256 2e0112b0d85841587b8f212e6ba8f6c35b31e1cce6b6999497dc917cd37e6911 SHA512 7b10c203692a091b3de8dda147b386e17fa7d2bdb56031163e0551e54c1ff6a8e953361d51cc6f7bb6978544a6517e843b446e866aa1fa6f96b4677dda27daa4 WHIRLPOOL ba6ea523dc06622854b304b408f2ce402d164ae4dbc5eeb4cc675c3e4c7d8e12db1a3bcee7d19f67d274ff92b32e143c111d5d732b463c48d72d4036910ce141
 DIST VirtualBox-5.1.8.tar.bz2 114688166 SHA256 e447031de468aee746529b2cf60768922f9beff22a13c54284aa430f5e925933 SHA512 178299173ee0062e23aee779faa893a42815d17163eab9ba2ed8b46be63a7110fe1690792de21514dc05ccd5a1752ea0f11357220e0e6f91f101dea3416e819c WHIRLPOOL 20ea8d253d177fd11c4349656aaa0f87f0fb76018511b345e85800d4dd8ab1e2e05c300a1f932670e5f5fac6ea547bfaa0a52b8526c4f363358911c770444a81
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.1.12.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.1.12.ebuild
new file mode 100644
index 000000000000..934595be7c29
--- /dev/null
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.1.12.ebuild
@@ -0,0 +1,220 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit eutils linux-mod systemd user toolchain-funcs
+
+MY_PV="${PV/beta/BETA}"
+MY_PV="${MY_PV/rc/RC}"
+MY_P=VirtualBox-${MY_PV}
+DESCRIPTION="VirtualBox kernel modules and user-space tools for Gentoo guests"
+HOMEPAGE="http://www.virtualbox.org/"
+SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="X"
+
+RDEPEND="X? ( 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-proto/glproto )
+	sys-apps/dbus
+	!!x11-drivers/xf86-input-virtualbox"
+DEPEND="${RDEPEND}
+	>=dev-util/kbuild-0.1.9998_pre20131130
+	>=dev-lang/yasm-0.6.2
+	sys-devel/bin86
+	sys-libs/pam
+	sys-power/iasl
+	X? ( x11-proto/renderproto )
+	!X? ( x11-proto/xproto )"
+PDEPEND="X? ( ~x11-drivers/xf86-video-virtualbox-${PV} )"
+
+BUILD_TARGETS="all"
+BUILD_TARGET_ARCH="${ARCH}"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	MODULE_NAMES="vboxguest(misc:${WORKDIR}/vboxguest:${WORKDIR}/vboxguest)
+		vboxsf(misc:${WORKDIR}/vboxsf:${WORKDIR}/vboxsf)"
+	use X && MODULE_NAMES+=" vboxvideo(misc:${WORKDIR}/vboxvideo::${WORKDIR}/vboxvideo)"
+
+	linux-mod_pkg_setup
+	BUILD_PARAMS="KERN_DIR=${KV_OUT_DIR} KERNOUT=${KV_OUT_DIR}"
+	enewgroup vboxguest
+	enewuser vboxguest -1 /bin/sh /dev/null vboxguest
+	# automount Error: VBoxServiceAutoMountWorker: Group "vboxsf" does not exist
+	enewgroup vboxsf
+}
+
+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
+	eapply "${FILESDIR}"/vboxguest-4.1.0-log-use-c99.patch
+	popd &>/dev/null || die
+
+	# Disable things unused or splitted into separate ebuilds
+	cp "${FILESDIR}/${PN}-5-localconfig" LocalConfig.kmk || die
+	use X || echo "VBOX_WITH_X11_ADDITIONS :=" >> LocalConfig.kmk
+
+	# stupid new header references...
+	for vboxheader in {product,revision,version}-generated.h ; do
+		for mdir in vbox{guest,sf} ; do
+			ln -sf "${S}"/out/linux.${ARCH}/release/${vboxheader} \
+				"${WORKDIR}/${mdir}/${vboxheader}"
+		done
+	done
+
+	# Remove pointless GCC version limitations in check_gcc()
+	sed -e "/\s*-o\s*\\\(\s*\$cc_maj\s*-eq\s*[5-9]\s*-a\s*\$cc_min\s*-gt\s*[0-5]\s*\\\)\s*\\\/d" \
+		-i configure || die
+
+	eapply_user
+}
+
+src_configure() {
+	# build the user-space tools, warnings are harmless
+	local cmd=(
+		./configure
+		--nofatal
+		--disable-xpcom
+		--disable-sdl-ttf
+		--disable-pulse
+		--disable-alsa
+		--with-gcc="$(tc-getCC)"
+		--with-g++="$(tc-getCXX)"
+		--target-arch=${ARCH}
+		--with-linux="${KV_OUT_DIR}"
+		--build-headless
+	)
+	echo "${cmd[@]}"
+	"${cmd[@]}" || die "configure failed"
+	source ./env.sh
+	export VBOX_GCC_OPT="${CFLAGS} ${CPPFLAGS}"
+}
+
+src_compile() {
+	MAKE="kmk" \
+	emake TOOL_YASM_AS=yasm \
+	VBOX_ONLY_ADDITIONS=1 \
+	KBUILD_VERBOSE=2
+
+	# 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 || die
+
+	insinto /sbin
+	newins mount.vboxsf mount.vboxsf
+	fperms 4755 /sbin/mount.vboxsf
+
+	newinitd "${FILESDIR}"/${PN}-8.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
+
+		pushd "${S}"/src/VBox/Additions/x11/Installer &>/dev/null \
+			|| die
+		newins 98vboxadd-xclient VBoxClient-all
+		fperms 0755 /usr/bin/VBoxClient-all
+		popd &>/dev/null || die
+	fi
+
+	# udev rule for vboxdrv
+	local udev_rules_dir="/lib/udev/rules.d"
+	dodir ${udev_rules_dir}
+	echo 'KERNEL=="vboxguest", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
+		>> "${D}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \
+		|| die
+	echo 'KERNEL=="vboxuser", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
+		>> "${D}/${udev_rules_dir}/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
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+}
+
+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 "The vboxsf group has been added to make automount services work."
+	elog "These services are part of the shared folders support."
+	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-modules/Manifest b/app-emulation/virtualbox-modules/Manifest
index 6cdd6104fcf1..600343569560 100644
--- a/app-emulation/virtualbox-modules/Manifest
+++ b/app-emulation/virtualbox-modules/Manifest
@@ -5,5 +5,6 @@ DIST vbox-kernel-module-src-5.0.26.tar.xz 595160 SHA256 9988ef07a618e3406a4ef778
 DIST vbox-kernel-module-src-5.0.28.tar.xz 596376 SHA256 3d0ced516260a20ad39c64013edb9ef561f6d7eed424ea87953704b748a82521 SHA512 2e249206128f7817a0e99cc6e422fb69cd81ca8b4c4e0a6eb7abadecd82da7c528817bd2d8a318a0ece1deb3972ebf7a038dcc1061b8517340490b21f9eb8f82 WHIRLPOOL 43dd8a458fd7e71a5bbbec52eda0be204629219939b8d9308a7fde76675eb6e9ed202b654539e777a172dee05d02875c8da7b3917eb003d84da7f374fe21b95c
 DIST vbox-kernel-module-src-5.0.30.tar.xz 596412 SHA256 98fce7b9a3f165a26af7e37bdca70f668ffda27e8c9fbcf9c4b5da3dbb8aa68b SHA512 7c2067ae60ff6b2188b26728e9c6e479a9789265d1e7f8e3bc04e65f4ad94900abcff51a9508f08414ae106240e24c16a590b64f906b5eab9ef8ca248a59d20b WHIRLPOOL f62c94453d32eebbf1511fc2fe1014735aecf47a4809c82565352b445dac98919910b223160a577300d89cd67a7109f6d3953d10bc38b8042e44de656e3f223d
 DIST vbox-kernel-module-src-5.1.10.tar.xz 613008 SHA256 478c67f279d8c0be0a9155028aa25d05c8a061a3db427e6b3574d82d86c371e3 SHA512 ce964f87c6304cade692671a7ca370313f5d3058cee4c9a5a1a9e0a2ba25f41b2d835a799d83e427ed12b74432ecdf895e11ae623ae25e18bbfa203514386c94 WHIRLPOOL 00445d5428b35aadbe1862a99b3602b760ea3d16324b9dcd31aa64ff0440d17cbdab2e6472d6deee78eeada20b50275c12610ce5640b83e0139a831831ef7a15
+DIST vbox-kernel-module-src-5.1.12.tar.xz 613492 SHA256 c02010620ea4053a368320df6c90b0a8dda3bd2e16db2e4558b681037915cb4c SHA512 6a9d9546b1cd588715713947c50f4c908a753efe738814a77b144f1d87d852811fcc41c57b78135c23c383526bf108f5b067b2578afc68eac3a72dd3715ff866 WHIRLPOOL 8d6d8a80ff89daa94b91b8d6f34e7662c41b7de910e6c7add3cf876730c6a115b5f4cddd2756c0d88ce393f0f31faa43f98afe7b1ab42df34177d148d9fdac7a
 DIST vbox-kernel-module-src-5.1.6.tar.xz 610772 SHA256 06355e4e98500e02abffb62653ce4500c046ebbb93578f86747111aabdbc6613 SHA512 ead370ce2bb880e587cf6092628fc18590ef2151b21616e6a366faaf6b47fc17b515b3188b8a1d8a00c4c9624113fe79c2095dca72a6394b3cf337328efd053f WHIRLPOOL 334b7285a715382d877305d54afae8fea2cee5318ce6181d5de9eaae2bca52056e7ba280ad8303222cf760b030211312938e1c1bfb6bca3e8b9d1caa3665951a
 DIST vbox-kernel-module-src-5.1.8.tar.xz 612740 SHA256 a9448ae2cb0468b9dbc94cbcdafc7d8c49787bc6246e69d9cc905dfe61d0f3c8 SHA512 56ebaaab238d1a4b9b632cea9a9653849c88af23fff64bf6fb7b96b9a0890108f83fca33562abbad51358dd5757c57b619beb466f703bb2bf1d103631655ec45 WHIRLPOOL 396a44167f337e9a0acd1cee2cd325d493486786976ce9a34f44eee7fb2443730fc57a07a7e89f0f190a8cc6f5bc89692066af44a34a86a61b63a5c20e112cba
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-5.1.12.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-5.1.12.ebuild
new file mode 100644
index 000000000000..76cc8f0e241b
--- /dev/null
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-5.1.12.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# XXX: the tarball here is just the kernel modules split out of the binary
+#      package that comes from virtualbox-bin
+
+EAPI=6
+
+inherit eutils linux-mod user
+
+MY_P=vbox-kernel-module-src-${PV}
+DESCRIPTION="Kernel Modules for Virtualbox"
+HOMEPAGE="http://www.virtualbox.org/"
+SRC_URI="https://dev.gentoo.org/~polynomial-c/virtualbox/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="pax_kernel"
+
+RDEPEND="!=app-emulation/virtualbox-9999"
+
+S=${WORKDIR}
+
+BUILD_TARGETS="all"
+BUILD_TARGET_ARCH="${ARCH}"
+MODULE_NAMES="vboxdrv(misc:${S}) vboxnetflt(misc:${S}) vboxnetadp(misc:${S}) vboxpci(misc:${S})"
+
+pkg_setup() {
+	enewgroup vboxusers
+
+	CONFIG_CHECK="!TRIM_UNUSED_KSYMS"
+	ERROR_TRIM_UNUSED_KSYMS="The kernel option CONFIG_TRIM_UNUSED_KSYMS removed kernel symbols that are needed by ${PN} to load correctly."
+
+	linux-mod_pkg_setup
+
+	BUILD_PARAMS="KERN_DIR=${KV_DIR} KERNOUT=${KV_OUT_DIR} V=1 KBUILD_VERBOSE=1"
+}
+
+src_prepare() {
+	if kernel_is -ge 2 6 33 ; then
+		# evil patch for new kernels - header moved
+		grep -lR linux/autoconf.h *  | xargs sed -i -e 's:<linux/autoconf.h>:<generated/autoconf.h>:'
+	fi
+
+	if use pax_kernel && kernel_is -ge 3 0 0 ; then
+		epatch "${FILESDIR}"/${PN}-4.1.4-pax-const.patch
+	fi
+
+	default
+}
+
+src_install() {
+	linux-mod_src_install
+	insinto /usr/lib/modules-load.d/
+	doins "${FILESDIR}"/virtualbox.conf
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+	elog "If you are using sys-apps/openrc, please add \"vboxdrv\", \"vboxnetflt\","
+	elog "\"vboxnetadp\" and \"vboxpci\" to:"
+	elog "  /etc/conf.d/modules"
+}
diff --git a/app-emulation/virtualbox/Manifest b/app-emulation/virtualbox/Manifest
index 02b4204e0e56..55ae53418146 100644
--- a/app-emulation/virtualbox/Manifest
+++ b/app-emulation/virtualbox/Manifest
@@ -5,6 +5,7 @@ DIST VirtualBox-5.0.26.tar.bz2 111244869 SHA256 78dec1369d2c8feefea3c682d95e76c0
 DIST VirtualBox-5.0.28.tar.bz2 111513040 SHA256 21434481e00791014209aaf00ffa8dad0b393ba5abb270a241e9aa22285b910d SHA512 66698c6fb76f65102c969565d1d0d138dd022f02c581cd3dc8a09a7ffff2ec1e628b35aa99ae5904448b57eebc14017a441755567455cb4562b34ea2efdabd75 WHIRLPOOL 89b059a785ea2cddcf27f7c49a13bca939219b37fd33296edb6354236729e3cf81627fd9a16edd03a4f16e0896bee50dc13f75dc27e98e53b464d137825012dc
 DIST VirtualBox-5.0.30.tar.bz2 111511741 SHA256 105590354b12a8dfa92329ffd9b4e87a14d1037ae0e869638ae5ab35f584ee63 SHA512 6c2c6b4378c2936ac1cafbd10307792001bb814655679a6bd7a19abdbb633a643a02224ba7e3cf8d24bfd15fda1c9f0a408f3ab4ebda98bb63354d41b6092d88 WHIRLPOOL 85ec6727cef1a7c6eb0050463677ecae6774797040bdab1cc38d7b8f00b9c4d7499dc275eb0e6a679a457eb2586e6c84dcfbc2e0da93c09bc68b5b1faae3965d
 DIST VirtualBox-5.1.10.tar.bz2 114912508 SHA256 98073b1b2adee4e6553df73cb5bb6ea8ed7c3a41a475757716fd9400393bea40 SHA512 b4418545919adfa1f06d86dddf56f95bdfe1dd6664bbe4574765cbf8eb54273d8d56954e55d1afe8b2aab9fbc82055867a129e40eba30cc5baddd417f9a8f722 WHIRLPOOL edd54a8a35c90a4e428ea5704400137a1b65bbe98bc81b3e1216373eeff91d33bb670fee249d3fbdcadf39354af1e62a426ab5c67916078e41815a84d9a2e029
+DIST VirtualBox-5.1.12.tar.bz2 114950292 SHA256 e6f10b1b6f3eb1be2c5223f60569f8ce35468a4354ed53db12f4c9b419393d0d SHA512 0e63f778595aada4389a0d4f390aaa56fc1fb0ed0c4ce999f060787ce6d29462329d6543f34572111d2538cf49a54b799263fe04ebd115c2426506c28c809516 WHIRLPOOL 524e1b8238e80aa8460428db8269602b3ae190945726f40e59141d86c0d675d9c7ed60eac559af7debf8fc415d232063240ef8e626123dec09db2b9902dd8c4d
 DIST VirtualBox-5.1.6.tar.bz2 114669517 SHA256 2e0112b0d85841587b8f212e6ba8f6c35b31e1cce6b6999497dc917cd37e6911 SHA512 7b10c203692a091b3de8dda147b386e17fa7d2bdb56031163e0551e54c1ff6a8e953361d51cc6f7bb6978544a6517e843b446e866aa1fa6f96b4677dda27daa4 WHIRLPOOL ba6ea523dc06622854b304b408f2ce402d164ae4dbc5eeb4cc675c3e4c7d8e12db1a3bcee7d19f67d274ff92b32e143c111d5d732b463c48d72d4036910ce141
 DIST VirtualBox-5.1.8.tar.bz2 114688166 SHA256 e447031de468aee746529b2cf60768922f9beff22a13c54284aa430f5e925933 SHA512 178299173ee0062e23aee779faa893a42815d17163eab9ba2ed8b46be63a7110fe1690792de21514dc05ccd5a1752ea0f11357220e0e6f91f101dea3416e819c WHIRLPOOL 20ea8d253d177fd11c4349656aaa0f87f0fb76018511b345e85800d4dd8ab1e2e05c300a1f932670e5f5fac6ea547bfaa0a52b8526c4f363358911c770444a81
 DIST virtualbox-4.3.16-patches-01.tar.xz 4288 SHA256 270c4f01b2c13c4133987b3acc073dfbf78840212cf09f083dbf8fc80407ce6f SHA512 595f88c4b388b4807347c15c1750ec73aceba1c82ad993e9a05c7b78dfece7b679aff0338b3a48e2ccee7911fb5ed0dba803052332a270230078551f747052bc WHIRLPOOL 2157ee3fb9beed906cff28647c869e37d62551ad8c93801c0f0ec6893675f11786aa6d92acf11c348d30aa58b6e03a3faa879c664dddac6e5b8525035986c9ca
diff --git a/app-emulation/virtualbox/virtualbox-5.1.12.ebuild b/app-emulation/virtualbox/virtualbox-5.1.12.ebuild
new file mode 100644
index 000000000000..78f1339d3555
--- /dev/null
+++ b/app-emulation/virtualbox/virtualbox-5.1.12.ebuild
@@ -0,0 +1,447 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+inherit eutils fdo-mime flag-o-matic java-pkg-opt-2 linux-info multilib pax-utils python-single-r1 toolchain-funcs udev
+
+MY_PV="${PV/beta/BETA}"
+MY_PV="${MY_PV/rc/RC}"
+MY_P=VirtualBox-${MY_PV}
+SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2
+	https://dev.gentoo.org/~polynomial-c/${PN}/patchsets/${PN}-5.1.6-patches-01.tar.xz"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Family of powerful x86 virtualization products for enterprise and home use"
+HOMEPAGE="http://www.virtualbox.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa debug doc headless java libressl lvm pam pulseaudio +opengl python +qt5 +sdk +udev 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/libxml2
+	media-libs/libpng:0=
+	media-libs/libvpx:0=
+	sys-libs/zlib
+	!headless? (
+		media-libs/libsdl:0[X,video]
+		x11-libs/libX11
+		x11-libs/libXcursor
+		x11-libs/libXext
+		x11-libs/libXmu
+		x11-libs/libXt
+		opengl? ( virtual/opengl media-libs/freeglut )
+		qt5? (
+			dev-qt/qtcore:5
+			dev-qt/qtgui:5
+			dev-qt/qtprintsupport:5
+			dev-qt/qtwidgets:5
+			dev-qt/qtx11extras:5
+			opengl? ( dev-qt/qtopengl:5 )
+			x11-libs/libXinerama
+		)
+	)
+	java? ( >=virtual/jre-1.6:= )
+	libressl? ( dev-libs/libressl:= )
+	!libressl? ( dev-libs/openssl:0= )
+	lvm? ( sys-fs/lvm2 )
+	udev? ( >=virtual/udev-171 )
+	vnc? ( >=net-libs/libvncserver-0.9.9 )"
+DEPEND="${RDEPEND}
+	>=dev-util/kbuild-0.1.9998_pre20131130-r1
+	>=dev-lang/yasm-0.6.2
+	sys-devel/bin86
+	sys-libs/libcap
+	sys-power/iasl
+	virtual/pkgconfig
+	alsa? ( >=media-libs/alsa-lib-1.0.13 )
+	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
+	)
+	!headless? ( x11-libs/libXinerama )
+	java? ( >=virtual/jre-1.6:= )
+	pam? ( sys-libs/pam )
+	pulseaudio? ( media-sound/pulseaudio )
+	qt5? ( dev-qt/linguist-tools:5 )
+	vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] )
+	${PYTHON_DEPS}"
+
+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_7.so
+	usr/lib/virtualbox/VBoxXPCOMC.so
+	usr/lib/virtualbox/VBoxOGLhostcrutil.so
+	usr/lib/virtualbox/VBoxNetDHCP.so
+	usr/lib/virtualbox/VBoxNetNAT.so"
+
+REQUIRED_USE="
+	java? ( sdk )
+	python? ( sdk )
+	vboxwebsrv? ( java )
+	${PYTHON_REQUIRED_USE}
+"
+
+pkg_setup() {
+	if ! use headless && ! use qt5 ; then
+		einfo "No USE=\"qt5\" selected, this build will not include any Qt frontend."
+	elif use headless && use qt5 ; then
+		einfo "You selected USE=\"headless qt5\", 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
+	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
+
+	tc-ld-disable-gold #bug 488176
+	tc-export CC CXX LD AR RANLIB
+	export HOST_CC="$(tc-getBUILD_CC)"
+}
+
+src_prepare() {
+	# Remove shipped binaries (kBuild,yasm), see bug #232775
+	rm -r kBuild/bin tools || die
+
+	# Remove pointless GCC version limitations in check_gcc()
+	sed -e "/\s*-o\s*\\\(\s*\$cc_maj\s*-eq\s*[5-9]\s*-a\s*\$cc_min\s*-gt\s*[0-5]\s*\\\)\s*\\\/d" \
+		-i configure || die
+
+	# Disable things unused or split into separate ebuilds
+	sed -e "s@MY_LIBDIR@$(get_libdir)@" \
+		"${FILESDIR}"/${PN}-5-localconfig > LocalConfig.kmk || die
+
+	# Respect LDFLAGS
+	sed -e "s@_LDFLAGS\.${ARCH}*.*=@& ${LDFLAGS}@g" \
+		-i Config.kmk src/libs/xpcom18a4/Config.kmk || die
+
+	# Do not use hard-coded ld (related to bug #488176)
+	sed -e '/QUIET)ld /s@ld @$(LD) @' \
+		-i src/VBox/Devices/PC/ipxe/Makefile.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
+
+	# Only add nopie patch when we're on hardened
+	if ! gcc-specs-pie ; then
+		rm "${WORKDIR}"/patches/050_${PN}-*-nopie.patch || die
+	fi
+
+	eapply "${WORKDIR}/patches"
+
+	eapply_user
+}
+
+src_configure() {
+	local myconf=()
+	use alsa       || myconf+=( --disable-alsa )
+	use debug      && myconf+=( --build-debug )
+	use doc        || myconf+=( --disable-docs )
+	use java       || myconf+=( --disable-java )
+	use lvm        || myconf+=( --disable-devmapper )
+	use opengl     || myconf+=( --disable-opengl )
+	use pulseaudio || myconf+=( --disable-pulse )
+	use python     || myconf+=( --disable-python )
+	use vboxwebsrv && myconf+=( --enable-webservice )
+	use vnc        && myconf+=( --enable-vnc )
+	if ! use headless ; then
+		use qt5 || myconf+=( --disable-qt )
+	else
+		myconf+=( --build-headless --disable-opengl )
+	fi
+	if use amd64 && ! has_multilib_profile ; then
+		myconf+=( --disable-vmmraw )
+	fi
+	# not an autoconf script
+	./configure \
+		--with-gcc="$(tc-getCC)" \
+		--with-g++="$(tc-getCXX)" \
+		--disable-dbus \
+		--disable-kmods \
+		${myconf[@]} \
+		|| die "configure failed"
+}
+
+src_compile() {
+	source ./env.sh || die
+
+	# Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529)
+	MAKEJOBS=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+')
+	MAKELOAD=$(echo ${MAKEOPTS} | egrep -o '(\-l|\-\-load-average)(=?|[[:space:]]*)[[:digit:]]+') #'
+	MAKEOPTS="${MAKEJOBS} ${MAKELOAD}"
+	MAKE="kmk" emake \
+		VBOX_BUILD_PUBLISHER=_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_VERBOSE=2 \
+		all
+}
+
+src_install() {
+	local binpath="release"
+	use debug && binpath="debug"
+	cd "${S}"/out/linux.${ARCH}/${binpath}/bin || die
+
+	local vbox_inst_path="/usr/$(get_libdir)/${PN}" each fwfile size ico icofile
+
+	vbox_inst() {
+		local binary="${1}"
+		local perms="${2:-0750}"
+		local path="${3:-${vbox_inst_path}}"
+
+		[[ -n "${binary}" ]] || die "vbox_inst: No binray given!"
+		[[ ${perms} =~ ^[[:digit:]]+{4}$ ]] || die "vbox_inst: perms must consist of four digits."
+
+		insinto ${path}
+		doins ${binary}
+		fowners root:vboxusers ${path}/${binary}
+		fperms ${perms} ${path}/${binary}
+	}
+
+	# Create configuration files
+	insinto /etc/vbox
+	newins "${FILESDIR}/${PN}-4-config" vbox.cfg
+
+	# Set the correct libdir
+	sed \
+		-e "s@MY_LIBDIR@$(get_libdir)@" \
+		-i "${D}"/etc/vbox/vbox.cfg || die "vbox.cfg sed failed"
+
+	# Install the wrapper script
+	exeinto ${vbox_inst_path}
+	newexe "${FILESDIR}/${PN}-ose-5-wrapper" "VBox"
+	fowners root:vboxusers ${vbox_inst_path}/VBox
+	fperms 0750 ${vbox_inst_path}/VBox
+
+	# Install binaries and libraries
+	insinto ${vbox_inst_path}
+	doins -r components
+
+	# *.rc files for x86_64 are only available on multilib systems
+	local rcfiles="*.rc"
+	if use amd64 && ! has_multilib_profile ; then
+		rcfiles=""
+	fi
+	for each in VBox{ExtPackHelperApp,Manage,SVC,Tunctl,XPCOMIPCD} *so *r0 ${rcfiles} ; do
+		vbox_inst ${each}
+	done
+
+	# These binaries need to be suid root.
+	for each in VBox{Headless,Net{AdpCtl,DHCP,NAT}} ; do
+		vbox_inst ${each} 4750
+	done
+
+	# Install EFI Firmware files (bug #320757)
+	pushd "${S}"/src/VBox/Devices/EFI/FirmwareBin &>/dev/null || die
+	for fwfile in VBoxEFI{32,64}.fd ; do
+		vbox_inst ${fwfile} 0644
+	done
+	popd &>/dev/null || die
+
+	# VBoxSVC and VBoxManage need to be pax-marked (bug #403453)
+	# VBoxXPCOMIPCD (bug #524202)
+	for each in VBox{Headless,Manage,SVC,XPCOMIPCD} ; do
+		pax-mark -m "${D}"${vbox_inst_path}/${each}
+	done
+
+	# Symlink binaries to the shipped wrapper
+	for each in vbox{headless,manage} VBox{Headless,Manage,VRDP} ; do
+		dosym ${vbox_inst_path}/VBox /usr/bin/${each}
+	done
+	dosym ${vbox_inst_path}/VBoxTunctl /usr/bin/VBoxTunctl
+
+	# VRDPAuth only works with this (bug #351949)
+	dosym VBoxAuth.so ${vbox_inst_path}/VRDPAuth.so
+
+	# set an env-variable for 3rd party tools
+	echo -n "VBOX_APP_HOME=${vbox_inst_path}" > "${T}/90virtualbox"
+	doenvd "${T}/90virtualbox"
+
+	if ! use headless ; then
+		vbox_inst VBoxSDL 4750
+		pax-mark -m "${D}"${vbox_inst_path}/VBoxSDL
+
+		for each in vboxsdl VBoxSDL ; do
+			dosym ${vbox_inst_path}/VBox /usr/bin/${each}
+		done
+
+		if use qt5 ; then
+			vbox_inst VirtualBox 4750
+			pax-mark -m "${D}"${vbox_inst_path}/VirtualBox
+
+			if use opengl ; then
+				vbox_inst VBoxTestOGL
+				pax-mark -m "${D}"${vbox_inst_path}/VBoxTestOGL
+			fi
+
+			for each in virtualbox VirtualBox ; do
+				dosym ${vbox_inst_path}/VBox /usr/bin/${each}
+			done
+
+			insinto /usr/share/${PN}
+			doins -r nls
+
+			newmenu "${FILESDIR}"/${PN}-ose.desktop-2 ${PN}.desktop
+		fi
+
+		pushd "${S}"/src/VBox/Artwork/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
+		doicon -s scalable ${PN}.svg
+		popd &>/dev/null || die
+		pushd "${S}"/src/VBox/Artwork/other &>/dev/null || die
+		for size in 16 24 32 48 64 72 96 128 256 512 ; do
+			for ico in hdd ova ovf vbox{,-extpack} vdi vdh vmdk ; do
+				icofile="${PN}-${ico}-${size}px.png"
+				if [[ -f "${icofile}" ]] ; then
+					newicon -s ${size} ${icofile} ${PN}-${ico}.png
+				fi
+			done
+		done
+		popd &>/dev/null || die
+	fi
+
+	if use lvm ; then
+		vbox_inst VBoxVolInfo 4750
+		dosym ${vbox_inst_path}/VBoxVolInfo /usr/bin/VBoxVolInfo
+	fi
+
+	if use sdk ; then
+		insinto ${vbox_inst_path}
+		doins -r sdk
+
+		if use java ; then
+			java-pkg_regjar "${D}${vbox_inst_path}/sdk/bindings/xpcom/java/vboxjxpcom.jar"
+			java-pkg_regso "${D}${vbox_inst_path}/libvboxjxpcom.so"
+		fi
+	fi
+
+	if use udev ; then
+		# New way of handling USB device nodes for VBox (bug #356215)
+		local udevdir="$(get_udevdir)"
+		insinto ${udevdir}
+		doins VBoxCreateUSBNode.sh
+		fowners root:vboxusers ${udevdir}/VBoxCreateUSBNode.sh
+		fperms 0750 ${udevdir}/VBoxCreateUSBNode.sh
+		insinto ${udevdir}/rules.d
+		sed "s@%UDEVDIR%@${udevdir}@" "${FILESDIR}"/10-virtualbox.rules \
+			> "${T}"/10-virtualbox.rules || die
+		doins "${T}"/10-virtualbox.rules
+	fi
+
+	if use vboxwebsrv ; then
+		vbox_inst vboxwebsrv
+		dosym ${vbox_inst_path}/VBox /usr/bin/vboxwebsrv
+		newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
+		newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
+	fi
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+
+	if use udev ; then
+		udevadm control --reload-rules \
+			&& udevadm trigger --subsystem-match=usb
+	fi
+
+	if ! use headless && use qt5 ; 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."
+	elog "Starting with version 5.0.0, ${PN} no longer has the \"additions\" and"
+	elog "the \"extension\" USE flag. For installation of the guest additions ISO"
+	elog "image, please emerge"
+	elog "  app-emulation/virtualbox-additions"
+	elog "and for the USB2, USB3, VRDP and PXE boot ROM modules, please emerge"
+	elog "  app-emulation/virtualbox-extpack-oracle"
+	if ! use udev ; then
+		elog ""
+		elog "WARNING!"
+		elog "Without USE=udev, USB devices will likely not work in ${PN}."
+	elif [ -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
+}