gentoo resync : 03.01.2018

20 files changed, 20 insertions, 1214 deletions

diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 42d2c743de3e..0e6d5a896d8a 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/docker/Manifest b/app-emulation/docker/Manifest
index 0175fc0261ca..1375431f16d7 100644
--- a/app-emulation/docker/Manifest
+++ b/app-emulation/docker/Manifest
@@ -3,6 +3,6 @@ DIST docker-17.11.0.tar.gz 10649392 BLAKE2B fff44885f535020bfd8cd6ab9c347df12610
 DIST docker-17.12.0.tar.gz 11011208 BLAKE2B aee4a1b8af69b2418c62b0f5fc8cf6b1a0945ccbc870572e5835ec23bd9b6d5919fe9e8170b9d3c20eea479fec05aa97f380e1229b09cccbdbca9ed2baaa9f0b SHA512 1a4dfc86dc6c85c78d2abf4f559e5efe0fb22d915997f047fa6641e2aefb3e2fc6cb0124b6a0fc69abfc09ac8b261ebbd4d80b380cf9eb4304d3e1a423957b67
 EBUILD docker-17.09.1.ebuild 8766 BLAKE2B 79466ae75ff1b04af6fa51414d0d63b56f400d8c5879bd53ce37a99f824720559c323fad6129da7720ed252c9b5f70d3cb2d63afe25eaa177072272b98e5da3b SHA512 744bf909f82262827d04307bc71f9ec18ce194e3e213ce8f0ebfe172565d84d9c31ccf92ccf9ccadf7457780246427e82cd1f2082a49524e6b35d17ffec6131e
 EBUILD docker-17.11.0.ebuild 8772 BLAKE2B b912ef908bd41857144ef72076da4a14ada29edafb26662b8f5c2ae3e377e10f35d8e6113d7ced3a4bdfd29273f1f9a94e92313b8e844423dfea9cf85bd5536f SHA512 a7617ac4beef9492a918d0e7379c3a1b3ba38970a079ba96492851cec05346a629e2fe84a9bfed487c49442c257b14db5f60fed22c9546ea267f4a9aff0014ab
-EBUILD docker-17.12.0.ebuild 8773 BLAKE2B d5e28d1f014748b80561f6434869f745b1baaf96e879880adbc2e50f167daf75ee25d346fffe3dfbfc314473cc09cbc75af82209143a39c50f11ce6394e4cefe SHA512 bd36e73b7e389fad7eb52fb9462bcab4620dcb44b4b92fd06d8dc2d2e0ffb2e0f5e6f209a58916fcf70ee0e06260c7c5e9a4cb6e951900e2813f8917fa572ffa
+EBUILD docker-17.12.0.ebuild 8773 BLAKE2B 223c867de2b3d14e1b997eb03f24384cadb4d1d6f2f1e8e3b66ac1e34864fe9d63062123c2f14b247b306edb62d1b5c0077eed6219f2e13c511293693350964d SHA512 e1b393ef6ea4e371e80c317e6852bf3fecd3dfa51e901ee79eb9ef7754d41441f2c2df45890019b55cd6690dda305f542b889e517783e6ea87273035e7ac83b1
 EBUILD docker-9999.ebuild 8077 BLAKE2B c6ee72c20ec0275500268b0c50af3609f164058ee69fd4dbd855c13d3fdeace8fb556750530e3517f769d5b24002ef6f457d3ea02041ec62d1069dfa06a45a4f SHA512 a2ec513765edbfb246460aaf41beae4a24e4fc8413ce20702785ac7403de7a0567017dc205b864d343dabfdeff7405e734a9ea9a9584322862b9b19005c285a4
 MISC metadata.xml 1637 BLAKE2B 14c56a84e41ebd76827cf37c27fe21259ca06e00d8c7fe318bd5eca609a77a9e23fc5ea13caba1616e47d17978402f715e6a8bc40643ce0cfb3ee87494ee6858 SHA512 bdaea32036a7f65f7015634d45bdf4f13322f3266cda389b49d2c57ad86e9811731194af5786e312d5ea40dab8b8eb78fc7b79a2ffee186b8eaabae9cc3c7a1b
diff --git a/app-emulation/docker/docker-17.12.0.ebuild b/app-emulation/docker/docker-17.12.0.ebuild
index 0a2445ceb541..9dc16b296175 100644
--- a/app-emulation/docker/docker-17.12.0.ebuild
+++ b/app-emulation/docker/docker-17.12.0.ebuild
@@ -17,7 +17,7 @@ else
 	else
 		MY_PV="$PV-ce"
 	fi
-	DOCKER_GITCOMMIT="1caf76c"
+	DOCKER_GITCOMMIT="486a48d"
 	EGIT_COMMIT="v${MY_PV}"
 	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm"
diff --git a/app-emulation/lxc/Manifest b/app-emulation/lxc/Manifest
index f733162206ad..01c57903f404 100644
--- a/app-emulation/lxc/Manifest
+++ b/app-emulation/lxc/Manifest
@@ -3,7 +3,6 @@ AUX lxc-1.0.11-major.patch 1410 BLAKE2B b65a9878986d438720743ae984ec6b2f989b95c8
 AUX lxc-1.0.8-bash-completion.patch 1324 BLAKE2B db46fa3943f4006b7dda9fabe7ff33d507a26cf742ff40bfc183aef182521d770c600bf107e828ab0c7a8ff7d4c2f8db7aaaf87e996529c1d4c9098cc122383b SHA512 0d6293efa1080b568f8f2d64f41406ae6f07109eeb80e3d2a509246fa145c70c4128c4b8c38347b5b7e9bb0a69e2cc11f0c4e8e3ac2b6f74b57836216e5290db
 AUX lxc-2.0.5-omit-sysconfig.patch 259 BLAKE2B 977e151fbb8c9d98e89aaa5ee0426e64ab4286b4440af1582086a0ced8c6568efb470ccf68786da6ea52c82d1f4e81feac45bec411febc04fc31d108f05ccde2 SHA512 0aed9aca687accc6df79e97f48ab333043256e8ae68c8643f2b2452cc8013191238867d64ec71f7d399c59a43d3ba698b35d965090c5cb149b4f41302432e6e7
 AUX lxc-2.0.6-bash-completion.patch 919 BLAKE2B a364398ad6fe44213ba1097e961813d4cbc71efbaf25f90a44201dc95151b7676dbe1c086b3a34fb38ffb9ef2a5ebb25f9885e809c11ec1b1e9a6516f48a3ae1 SHA512 caa90c8bad2a79b4e42b781f00d6f2a7be37fc5c5301592b026c88db2652c90871be940c86a9156f03bc186f76cf2068a2d3084e9abc7a5896ea081885085d41
-AUX lxc-2.0.6-major.patch 1834 BLAKE2B 6793238e1d96ac5c4f802fa845ec42a6e2c9baf0215bd55fb2f7aea27571ffdc75ce435e9a7702a92350f78e19fb8af58a03ed76bbd30cf894681dac4d51c9a0 SHA512 274e2d138e32645aca2ab954e24db02c4d7c5750a781ebf3d81c69c7eeade06b33a3c8ac36a16548a58f6d7f518977fb2df09e22de96d966de542f470720b398
 AUX lxc.initd.3 3273 BLAKE2B fe7c2b24ef6758bf3f615be36de49246cb99e1d0e073d484f7af22036330c804717265f820e704cc0fcdbcba12b4e0266a81aad008b42ca13873d96c5c4e4ea9 SHA512 38b4b4d4cc8473d5836ac5c4a0824099ea9037e11c6624db53d977f0dcd2dfec3731db5d71a47dc5ebd4fa723cca50dfa9bf39f317e8d146f2a278ef3c9c83a8
 AUX lxc.initd.5 3282 BLAKE2B 29dbc1177ee9afe203cad36b62f4dd76df76946f1b647fdbff87d5ba840ffc62594f2bf2488b90600625a463dc17642e8853580a15b5cc8399d49d25faccca73 SHA512 6f72701fa42d41b39647a95ec45ca4d669a08a300f54b39715bbb554001bf662b9173cdacc2cb49b8e1093f5fcef971a1fd8270164c73a8e49d1b66dcbe7408d
 AUX lxc_at.service 232 BLAKE2B 12dd7142330cbaeda69d5f4c6ef14dae6ab435d2668e4a3279d8d54dac05f54a877afdc1705aa5a18db1855d6bcf68518f86431aa5105058598e97604fe00133 SHA512 4c3bab4f2cc9aea8b0753dcaf2fd7ed5f1cd7d97d286d6204b2fc17505b6edaac2f536bbda5c1466856311d0e93d75de91dec51e9b0f665d67afedbf40c19170
diff --git a/app-emulation/lxc/files/lxc-2.0.6-major.patch b/app-emulation/lxc/files/lxc-2.0.6-major.patch
deleted file mode 100644
index beb379a53882..000000000000
--- a/app-emulation/lxc/files/lxc-2.0.6-major.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-Adapt to future removal of major()/minor()/makedev() from <sys/types.h>
-
-Gentoo removed it in glibc-2.24.
-
-https://bugs.gentoo.org/575232
-https://bugs.gentoo.org/604360
-diff --git a/configure.ac b/configure.ac
-index 4640c0d..71e6450 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -620,4 +620,7 @@ AC_CHECK_DECLS([PR_CAPBSET_DROP], [], [], [#include <sys/prctl.h>])
- AC_CHECK_HEADERS([sys/signalfd.h pty.h ifaddrs.h sys/capability.h sys/personality.h utmpx.h sys/timerfd.h])
- 
-+# lookup major()/minor()/makedev()
-+AC_HEADER_MAJOR
-+
- # Check for some syscalls functions
- AC_CHECK_FUNCS([setns pivot_root sethostname unshare rand_r confstr faccessat])
-diff --git a/src/lxc/bdev/lxclvm.c b/src/lxc/bdev/lxclvm.c
-index 3d41b10..419d1c2 100644
---- a/src/lxc/bdev/lxclvm.c
-+++ b/src/lxc/bdev/lxclvm.c
-@@ -33,8 +33,17 @@
- 
- #include "bdev.h"
-+#include "config.h"
- #include "log.h"
- #include "lxclvm.h"
- #include "utils.h"
- 
-+/* major()/minor() */
-+#ifdef MAJOR_IN_MKDEV
-+#    include <sys/mkdev.h>
-+#endif
-+#ifdef MAJOR_IN_SYSMACROS
-+#    include <sys/sysmacros.h>
-+#endif
-+
- lxc_log_define(lxclvm, lxc);
- 
-diff --git a/src/lxc/conf.c b/src/lxc/conf.c
-index c54ee41..9a00e7f 100644
---- a/src/lxc/conf.c
-+++ b/src/lxc/conf.c
-@@ -40,4 +40,12 @@
- #include <time.h>
- 
-+/* makedev() */
-+#ifdef MAJOR_IN_MKDEV
-+#    include <sys/mkdev.h>
-+#endif
-+#ifdef MAJOR_IN_SYSMACROS
-+#    include <sys/sysmacros.h>
-+#endif
-+
- #ifdef HAVE_STATVFS
- #include <sys/statvfs.h>
-diff --git a/src/lxc/lxccontainer.c b/src/lxc/lxccontainer.c
-index 3a9e1e3..fe75fcc 100644
---- a/src/lxc/lxccontainer.c
-+++ b/src/lxc/lxccontainer.c
-@@ -62,4 +62,12 @@
- #include "version.h"
- 
-+/* major()/minor() */
-+#ifdef MAJOR_IN_MKDEV
-+#    include <sys/mkdev.h>
-+#endif
-+#ifdef MAJOR_IN_SYSMACROS
-+#    include <sys/sysmacros.h>
-+#endif
-+
- #if HAVE_IFADDRS_H
- #include <ifaddrs.h>
diff --git a/app-emulation/virtualbox-additions/Manifest b/app-emulation/virtualbox-additions/Manifest
index 6d806e5dfadf..6b6c0ce9071b 100644
--- a/app-emulation/virtualbox-additions/Manifest
+++ b/app-emulation/virtualbox-additions/Manifest
@@ -1,8 +1,6 @@
-DIST VBoxGuestAdditions_5.1.26.iso 59496448 BLAKE2B c2ea9dac192b09efb41daf57fd12541fc86ae13a21eb5650e2b2bb2256c13b3cfd00f0020d12d92eaa3dead9b3a7928cf766be7d58e2e2b7d5116d5b0d7d7c9c SHA512 5329ce9bb787efed088a9f89412974cef3a982a351c0053b3daf15a9c95c55f99556e2b86cdcd39c168042503eb00eaa83fb99f8f5c4c97d177dd2b61bb33f5d
 DIST VBoxGuestAdditions_5.1.30.iso 59494400 BLAKE2B 37f70eb8dd17e0492a106fa5e2cea1ed93b0a0a955e75a3a32d5bd45c447c6c4ff8e78e13b19922a34e8e982d1de5bbf0815a8e81c2a8ea2596477318d7acbf5 SHA512 3205444339a0c85a3b234ba462add21033b5b3eee18eecc15b150b21f5f9f1aadb92b7049bef6be1201e1acfd1edd6f2924c38d56a52770113c8401bcca9abcb
 DIST VBoxGuestAdditions_5.2.2.iso 60481536 BLAKE2B 560dc43a901cfaad4d9d6ca6f065614751765de7d78575c0dfe7d8ebcb0bf828a2b676ae91f6b346f179065e0f093e54742821c8a60765ec347d07288ae7b9fe SHA512 3c75468821287e4abe80e319ea8d4cd66c3075061610f74619c474b8c5bd8542ab55fe8747cb710e34863fcbc056b03c9256ad7d4b32fe9b0b56d74c4d93f3b5
 DIST VBoxGuestAdditions_5.2.4.iso 57868288 BLAKE2B 8affaa8a4bfdc434081e62a194b751fc143f748995b769cf565497751787a15fafc627b994ef8d30ea98275039cf8d85e6e5cdc3a7d806961f063c9c6fd1423d SHA512 51445f43ed337f7ea850b599c7dc80837e697de0ef1eb33e79b2dccadda50c1cb1fd37e98387648564cb47c4d593f7138e68410033c83ec0a4a65f04a057723d
-EBUILD virtualbox-additions-5.1.26.ebuild 727 BLAKE2B 6d7493b2ff01130ecc416dca8fa0fa11813904787a0707729ca7e179a573bc8024328b260e3eee67141672e2ba0c4fcedad1a49451cefec01d07487c85fe58de SHA512 7b86aa30735d2282551667ff47ffeb1fb2fb10af9ba05315c73407dc19ac4b9a7e2dca6515b748ab89f6546d5b5a7c206a0e53ab421ed949c404394e6be9999d
 EBUILD virtualbox-additions-5.1.30.ebuild 727 BLAKE2B 6d7493b2ff01130ecc416dca8fa0fa11813904787a0707729ca7e179a573bc8024328b260e3eee67141672e2ba0c4fcedad1a49451cefec01d07487c85fe58de SHA512 7b86aa30735d2282551667ff47ffeb1fb2fb10af9ba05315c73407dc19ac4b9a7e2dca6515b748ab89f6546d5b5a7c206a0e53ab421ed949c404394e6be9999d
 EBUILD virtualbox-additions-5.2.2.ebuild 729 BLAKE2B 9d3eaae2546cdc5a3b174b250100e1b894cf227dfe64583239a17de8a7324ccc8b1de14532cc16da695c38eecfcd8ff1958fb7508f3e0d0b145f5becb30912ce SHA512 b3c4774741bc62a014e57f26de9cb0ee4366d8ad31a6ffa51101085e591af034f44e1de156227719d7bf8bf12120528524380b0c782777f2bc98b0e8e11cd0b8
 EBUILD virtualbox-additions-5.2.4.ebuild 729 BLAKE2B 9d3eaae2546cdc5a3b174b250100e1b894cf227dfe64583239a17de8a7324ccc8b1de14532cc16da695c38eecfcd8ff1958fb7508f3e0d0b145f5becb30912ce SHA512 b3c4774741bc62a014e57f26de9cb0ee4366d8ad31a6ffa51101085e591af034f44e1de156227719d7bf8bf12120528524380b0c782777f2bc98b0e8e11cd0b8
diff --git a/app-emulation/virtualbox-additions/virtualbox-additions-5.1.26.ebuild b/app-emulation/virtualbox-additions/virtualbox-additions-5.1.26.ebuild
deleted file mode 100644
index 4fd01d14b29e..000000000000
--- a/app-emulation/virtualbox-additions/virtualbox-additions-5.1.26.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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 6339d9c1eff5..6656ca697f88 100644
--- a/app-emulation/virtualbox-bin/Manifest
+++ b/app-emulation/virtualbox-bin/Manifest
@@ -4,23 +4,18 @@ AUX vboxwebsrv-initd 674 BLAKE2B be1cb2574ff5e9e1efc6a137d18e67b2ecbe0e94b6a3a2d
 AUX virtualbox-bin-3-wrapper 2931 BLAKE2B bb8a72f749996b945d42a3d94ab895ee5b234bed907e6d1e055993f34a2459720bd8b0c56b61eae9c2e159e2b820d5117a6f9bed6ebfc3b327fa133c8f3aa812 SHA512 adb6ba2b3252b19b4c0331c10a025d05fd2399642530ba9aec2efa2dc8dbea4188a95806935532ad8229db29f0767c3098ef7646204f5e540e291ceb350b76ac
 AUX virtualbox-bin-config 28 BLAKE2B 86d452db92ceb19e9389ca83c800955066b84f4c3a289ff56cd0d7638a0a3d47891e670e070be9f3bcc30d730982237fc9211d1a9bbdbf8429c7ca80d25fbcc1 SHA512 8086ef107aff0aa3e17f5fcb8ee5de4dd8a24cb119c3523e3e3a302819eb4258328adead1b6f40b96706539f4e1c43dbd5c055a16a304ac29f7f302ebf2e4c4c
 AUX virtualbox-bin.desktop-2 205 BLAKE2B cb0ab2e87d0e82e88656f3288eb4af255fd1c9f732dbd6e1aa545d30d4176526fa38aebd3eccb4acb46c638056504be37231dc042fa030fcb04020e00d7d401c SHA512 7e9555aaa317e1cb551e5ff591b9d20bbb76a738f9e923c13d206e02c1e6bfc8f4eb17b498b235ac0aa2062e4acbd5f24d2522de2da3cff2e12c264875bc476d
-DIST Oracle_VM_VirtualBox_Extension_Pack-5.1.26-117224.tar.gz 19624237 BLAKE2B 593d70c49e47b49cc64d1c4c8f78703e6cd608f4ef6ab836492822429d213c1b70323cfe7847a206d284821572431423a841e8d802a3f47519818906cee63e39 SHA512 c6e31e8fb26b8ca32c423d14e85e15f6372a030ec40e9f06ce1e1234913d3586cc58d46819684c99cf3ced37f35d0a964339199cad5cf43580c88bf1afa63ef6
 DIST Oracle_VM_VirtualBox_Extension_Pack-5.1.30-118389.tar.gz 19624724 BLAKE2B de52acef8ad0785e576b361721d3a2f0b3d7e3820964d7e47fb6ffa7fd33bc4126f0e496396a412994e5eadc17fbd72699295865aa520f5e4b7a8ca53007e905 SHA512 6b468879f0fb6d6f916c40fb60f418457c526c20ebb1a6253bfc38392e0ae965e3b54590173b0d974070ced1646db82035950fb7dd54b22e20f4ad29850d6cf4
 DIST Oracle_VM_VirtualBox_Extension_Pack-5.2.2-119230.tar.gz 19504049 BLAKE2B ff3be5b81c409c33d7c831e2bba6df7d7ab87e6422d8cc4cbc3599f75c84100fceec5547b8f9b44d204941b48102a23a4c2183340ec017159ae7c37e07d21813 SHA512 cf3f08f7ee966b5a991fe029b3d4014f333678f0fddb9d75589695811dc4d780651a6dbdddf55a6466631bf8a9dce099256468490847229ac2c26dba9fc57d27
 DIST Oracle_VM_VirtualBox_Extension_Pack-5.2.4-119785.tar.gz 19465971 BLAKE2B eb37636ba0c856654ee0a06fb09fea848cef834cf75dcabf92d2a52994b0e2add74539213d9c3f7793496ffeaa35e623ebd9068e5dd5c7cfa8944e6a14ad2448 SHA512 97f496c9e3ef63a513c6fc31127459136b2bbef885a277d30c832831f079e3fbe8c6900b1799db1a4497a32b116cafb2fe982bd28a201da8d6f4222f70c548d8
-DIST VirtualBox-5.1.26-117224-Linux_amd64.run 87981522 BLAKE2B a1067daca90eb45509aa314d8e346f565cca845c8ec2fdbe6d27ec6d12e4cf6a288638a083295da62858bcda44b2f97720475b246e9e03013ab68c9c5e191720 SHA512 9b486fd52918469fdffaa39bbef234d22fad9d3b562fa04443bf6c1040e744db6dc9bd103ead299127b82c5d4bc96c1e05f677cacd623affa6569408c8d26df5
-DIST VirtualBox-5.1.26-117224-Linux_x86.run 87090639 BLAKE2B 89ec5ed5a9c0a5c16fbe4e3bbab5035c027d1c24ca561536a9c7e1924a5b7b5ddd180aa798212a3dc213439dc844761b73212d7fb1ed7611b0a91b078e96c950 SHA512 3aafad5374dc79c0fdd9bf1da6708ae4ce2f43d9fce3222326424bf03d6b73a7283ba5ebeb01a9ab6b24eeb8a8ec7c23af84e40f3edeb512c2101c329f4091e7
 DIST VirtualBox-5.1.30-118389-Linux_amd64.run 88186323 BLAKE2B 4700613906658a223134130e99eb4f669ffc875e732e9b43d237926b9a33d385d6056240ae5f498d13b6a0cf26c600b293657fc64c838db498bd3935fa23a8e4 SHA512 b6312abbf5c0e4bf22aca50a81d297a0ed21d5b4b72242e21750ac088c56817dc90ac1ae068dd9006f4f736130510f26f55793b8c09999c590da09908e304280
 DIST VirtualBox-5.1.30-118389-Linux_x86.run 87397839 BLAKE2B cc0fb245f98883dc19cfc9a64d8c7a9593d8ae784895a9a8224c146779ab65901052ba5d62f57c9cd5bc46d23e208cc97046fd6641eb8848e90c4828bd745813 SHA512 643ef90453e3a6a6d3fbb365176a72de1743230a58ee45f1cb22fd8bb57c9cfe6013ec1ffdb0076a248d1987a1e3fea13ca71ef9ca983cb8e6378d30c76451fb
 DIST VirtualBox-5.2.2-119230-Linux_amd64.run 90346949 BLAKE2B f6ae64b7b9b5ad41865a12792bd611d05c8899250c1740fcfabc0c6c07ce495e143b29c8bc8b5b2c2dbe690076c8593c030de4374af9d31a82e99dc9c58fec40 SHA512 a99d0922b341b821976bc944a5882d2804ca7ceb565a9512ce86c3968fb0d27dc533009dde51bea4881d729c97277597d329927183be4ffd081b5ed73c8f5ec3
 DIST VirtualBox-5.2.2-119230-Linux_x86.run 89548224 BLAKE2B de4cfd7a21caa49bc5752bfe097e99ec5e55eb9abcfafc34eb9f74e88c12fb6d0af1754e88180daf7f420ca3b968a25a3a0d6b878ebe6f7eb51c543ed24fbb1d SHA512 cd83828fdde57ac6c9b1bed58a8500c7ad2d2e83b83a4ffe304addd1d5df277dbddebc1e9c779030e5352b66b6a7505309fb0b5cfbbb575f122a7f126c397591
 DIST VirtualBox-5.2.4-119785-Linux_amd64.run 88575441 BLAKE2B c0cdf3cb1c17f1de000926e0b1db9902c965040723a62de95ef518bd4180ce95d4c2c5830abbdbf65823447af22d71f574b85e8ccc322ddc05137556f4381401 SHA512 f5741e29348a7a307146b8f34e0e9c4bccd8368879ba7c4e3836de21ad014f31ecf1bb7033173f8651483d4a11ffca7c8b475f9149474533cd7ab8c31ba8cbb9
 DIST VirtualBox-5.2.4-119785-Linux_x86.run 87653837 BLAKE2B 069005e59da03e9cc6d8ef3cc296c192095c4b37bc17de5e768d13f46e1d8bdd7573e6b1a2b359cee5a37c2a2bb9808707317c07b4dd3d76cbbc0ed0824f55bb SHA512 245a90b8312988d6b19765ecd404bc569b370c400353294a564dde4ab57a006fda3e24dd423d7ba3afdfcd20484b95adc86d598ebbd640f1742d9c92ed010021
-DIST VirtualBoxSDK-5.1.26-117224.zip 9860247 BLAKE2B 6525792471a71aca9824e2fa9a0c9b722f248bf4873f3f683a04ab335bb06257fd051e1baeb2c106d663c09e805f88784bb01614042660949566766002183b4e SHA512 d2bef837d61bfb35ba550f004345c2c412c2f62da23ffded6dff8aa33281fdce7c0a8f6b70c131b35e04c34ca0a4221bf97a78e65a470c657980572ebedb0774
 DIST VirtualBoxSDK-5.1.30-118389.zip 9861374 BLAKE2B 4890a76c5bdf6ec8215095ce3246ee518a6cf527136fd896bec3503175115de05e52f946b5c44fa82ecb087900a5eb4f2bbd0cfa79a4eba94ba4d48f757f9604 SHA512 89d3407860f202329e5958e724b848884a9047f01000090d1000bce22005311b3650c1ef1fb1fc998c29cc77887af856b64a5ac76154408cae7b921860d8a9f1
 DIST VirtualBoxSDK-5.2.2-119230.zip 10146673 BLAKE2B 8bdb6ffcd9e0a59c5a27676a9cd71c402b6a8dd7c03fc7e543e620e3f96b02f252e46432b3724fad508953636a9643731fe60c7cad2ef79a107d83ea154aca3b SHA512 2bfd6e391af3ad55dfced0dcf551112c364317b226bdc29bab42420055c2dc6053f9ab5ce28eace15bb9c7680ddc83c0bc77c53938d05d507cdd51a6c781a27f
 DIST VirtualBoxSDK-5.2.4-119785.zip 10150272 BLAKE2B 58b16d12f6d2939ef0a45e0bf627f7977740ef9c3f277935c624f6b226cfa84390ea3d74a840c9da85bfc392b60ecebb2a8bc1dae51db92848bea42deaaea536 SHA512 b23637d9eb086c999733a5a0725a8a97ade5af11ccb7fa6e74bd20281270333d551ea22ae404f462726a2250593b624cbbb8169af9d16a07bd2383bdc74da92e
-EBUILD virtualbox-bin-5.1.26.117224.ebuild 8374 BLAKE2B 6ede0b42eae71f3cb90571607182fdedebd609642a1086a88990d31487db9688719271c068d9aedf3cb70a75dc59175b0456682415d22577ba8d09d9448fa1cb SHA512 f56f6be68888456ff843aa4c0d104026b2d17dcd32259e8ef2a716407494314952fc03560c14e5f13af96885587310d2d38404163745c1dc0a3c089b1d3444fe
 EBUILD virtualbox-bin-5.1.30.118389.ebuild 8374 BLAKE2B 6ede0b42eae71f3cb90571607182fdedebd609642a1086a88990d31487db9688719271c068d9aedf3cb70a75dc59175b0456682415d22577ba8d09d9448fa1cb SHA512 f56f6be68888456ff843aa4c0d104026b2d17dcd32259e8ef2a716407494314952fc03560c14e5f13af96885587310d2d38404163745c1dc0a3c089b1d3444fe
 EBUILD virtualbox-bin-5.2.2.119230.ebuild 8376 BLAKE2B 396e12d24098e7274d5b538a3b656b6bc5b28ccf965e297fc9ea18b3b090408d006e34da46970a75d6d3f40653528c74fa7151893ef112f850ad444f80d06ae7 SHA512 40a0618b48b9981fb9295e1e2a0b3373dd7145022b32aecc497ec7321534887c50c45645e5b6a22c5962c8e892c213a3cd8540711566b2f2b0e73ae63cb6ff61
 EBUILD virtualbox-bin-5.2.4.119785.ebuild 8376 BLAKE2B 396e12d24098e7274d5b538a3b656b6bc5b28ccf965e297fc9ea18b3b090408d006e34da46970a75d6d3f40653528c74fa7151893ef112f850ad444f80d06ae7 SHA512 40a0618b48b9981fb9295e1e2a0b3373dd7145022b32aecc497ec7321534887c50c45645e5b6a22c5962c8e892c213a3cd8540711566b2f2b0e73ae63cb6ff61
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-5.1.26.117224.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-5.1.26.117224.ebuild
deleted file mode 100644
index fa2dda552ac8..000000000000
--- a/app-emulation/virtualbox-bin/virtualbox-bin-5.1.26.117224.ebuild
+++ /dev/null
@@ -1,287 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils xdg-utils 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 and 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 ../VBoxVMM.so /opt/VirtualBox/components/VBoxVMM.so
-	dosym ../VBoxREM.so /opt/VirtualBox/components/VBoxREM.so
-	dosym ../VBoxRT.so /opt/VirtualBox/components/VBoxRT.so
-	dosym ../VBoxDDU.so /opt/VirtualBox/components/VBoxDDU.so
-	dosym ../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 ../VirtualBox/VBox.sh /opt/bin/VirtualBox
-		dosym ../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 ../VirtualBox/VBox.sh /opt/bin/VBoxManage
-	dosym ../VirtualBox/VBox.sh /opt/bin/VBoxVRDP
-	dosym ../VirtualBox/VBox.sh /opt/bin/VBoxHeadless
-	dosym ../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() {
-	xdg_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() {
-	xdg_desktop_database_update
-}
diff --git a/app-emulation/virtualbox-extpack-oracle/Manifest b/app-emulation/virtualbox-extpack-oracle/Manifest
index b5e3ee431524..06a9a435ac33 100644
--- a/app-emulation/virtualbox-extpack-oracle/Manifest
+++ b/app-emulation/virtualbox-extpack-oracle/Manifest
@@ -1,8 +1,6 @@
-DIST Oracle_VM_VirtualBox_Extension_Pack-5.1.26-117224.tar.gz 19624237 BLAKE2B 593d70c49e47b49cc64d1c4c8f78703e6cd608f4ef6ab836492822429d213c1b70323cfe7847a206d284821572431423a841e8d802a3f47519818906cee63e39 SHA512 c6e31e8fb26b8ca32c423d14e85e15f6372a030ec40e9f06ce1e1234913d3586cc58d46819684c99cf3ced37f35d0a964339199cad5cf43580c88bf1afa63ef6
 DIST Oracle_VM_VirtualBox_Extension_Pack-5.1.30-118389.tar.gz 19624724 BLAKE2B de52acef8ad0785e576b361721d3a2f0b3d7e3820964d7e47fb6ffa7fd33bc4126f0e496396a412994e5eadc17fbd72699295865aa520f5e4b7a8ca53007e905 SHA512 6b468879f0fb6d6f916c40fb60f418457c526c20ebb1a6253bfc38392e0ae965e3b54590173b0d974070ced1646db82035950fb7dd54b22e20f4ad29850d6cf4
 DIST Oracle_VM_VirtualBox_Extension_Pack-5.2.2-119230.tar.gz 19504049 BLAKE2B ff3be5b81c409c33d7c831e2bba6df7d7ab87e6422d8cc4cbc3599f75c84100fceec5547b8f9b44d204941b48102a23a4c2183340ec017159ae7c37e07d21813 SHA512 cf3f08f7ee966b5a991fe029b3d4014f333678f0fddb9d75589695811dc4d780651a6dbdddf55a6466631bf8a9dce099256468490847229ac2c26dba9fc57d27
 DIST Oracle_VM_VirtualBox_Extension_Pack-5.2.4-119785.tar.gz 19465971 BLAKE2B eb37636ba0c856654ee0a06fb09fea848cef834cf75dcabf92d2a52994b0e2add74539213d9c3f7793496ffeaa35e623ebd9068e5dd5c7cfa8944e6a14ad2448 SHA512 97f496c9e3ef63a513c6fc31127459136b2bbef885a277d30c832831f079e3fbe8c6900b1799db1a4497a32b116cafb2fe982bd28a201da8d6f4222f70c548d8
-EBUILD virtualbox-extpack-oracle-5.1.26.117224.ebuild 1085 BLAKE2B aa3c98d0f7816f32be63ef9ae0f5839e86693fbdb5a388bfcf3bb35a7b5750d99d8aa817bb07f40e99b219264a192b5b5bac5445c3fc65fe26c5ace6e92fb94f SHA512 a018d8881652c86d254cb87b68bd134d51930009f815001a6e06a3f40539305dcc3846395f8f59312506a74a9e517c0bb63c1a22d53be60b14a999f66617b79a
 EBUILD virtualbox-extpack-oracle-5.1.30.118389.ebuild 1085 BLAKE2B aa3c98d0f7816f32be63ef9ae0f5839e86693fbdb5a388bfcf3bb35a7b5750d99d8aa817bb07f40e99b219264a192b5b5bac5445c3fc65fe26c5ace6e92fb94f SHA512 a018d8881652c86d254cb87b68bd134d51930009f815001a6e06a3f40539305dcc3846395f8f59312506a74a9e517c0bb63c1a22d53be60b14a999f66617b79a
 EBUILD virtualbox-extpack-oracle-5.2.2.119230.ebuild 1087 BLAKE2B 7438822221f0c3f20dafc2460dfd0831d83fd8b1819b91c4e6dd21c827611f0adbd23b6d1fc05f11856724e8c97d163b3b17de6b6d0a5e54f7fd83b2df03a5c2 SHA512 dcf3ae05bd9bad1806fed11baa6a182971f2dfd448b7b015cd5191d984dc1f8335b206030feac3fc64e1e21a9d55ab1ad5c4f6d9ed806cb25770c92f1eb110d9
 EBUILD virtualbox-extpack-oracle-5.2.4.119785.ebuild 1087 BLAKE2B 7438822221f0c3f20dafc2460dfd0831d83fd8b1819b91c4e6dd21c827611f0adbd23b6d1fc05f11856724e8c97d163b3b17de6b6d0a5e54f7fd83b2df03a5c2 SHA512 dcf3ae05bd9bad1806fed11baa6a182971f2dfd448b7b015cd5191d984dc1f8335b206030feac3fc64e1e21a9d55ab1ad5c4f6d9ed806cb25770c92f1eb110d9
diff --git a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.1.26.117224.ebuild b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.1.26.117224.ebuild
deleted file mode 100644
index 3c6c739d35e3..000000000000
--- a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.1.26.117224.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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 1431f06e1250..46104a5e076e 100644
--- a/app-emulation/virtualbox-guest-additions/Manifest
+++ b/app-emulation/virtualbox-guest-additions/Manifest
@@ -4,13 +4,10 @@ AUX virtualbox-guest-additions-5-localconfig 937 BLAKE2B 4ad7e6520572ed5b3ee29c0
 AUX virtualbox-guest-additions-8.initd 538 BLAKE2B f720a0f9de10c5240f1ac8a590c4e5de2ada767a06341f9259a9e491660e796640dd4a251fbbf85f66786b8ec829357aa51546e502ca99452fa998ce20031637 SHA512 e01579b0ce980517a7b9e163915977a58c73594cf4c8484d20941449b9a21a4346ab1bb031b248ee438b350fa23b4bc78a1d6e501986b329564a4df487f5d3ca
 AUX virtualbox-guest-additions.service 411 BLAKE2B f5f1c24a94764ca72a04879c27cd9fdc1e0c8a1440ac87674dad44a1493a9347e6e2b351ae2b71e050ba06ae9848168220d62981a9e0c984ea68bf48ea06b485 SHA512 b6226146f3591a778551e94ae2661e2ae3c6b761d20600d741eaaa03f43f0a2b841d2a44d9eec3a3768edb23b021cee94c7849d998ee4104ad60dad2df88df83
 AUX xorg.conf.vbox 274 BLAKE2B 3a3035fcbdbd5810c54505f5a5e6deefa1540e5e01a038babb62a40bd5b2de2dc5b228cabe55612d92a522e6ae92aa7ff4ff2ab26772c3b54ce95ebac4e7fc5a SHA512 ac2b14970dc6667ceec2dbdae52bc92cbad4aff020898ede156454e8a8a703354f15c7e19cfbd2bdd15e251493fd05cacfe814cabee0f9b4cf155e44860ed4c9
-DIST VirtualBox-5.1.26.tar.bz2 115915813 BLAKE2B c770420804fd0bcbe5582fccfefc55b6d69a603a99cc9ba26e72f6c1947a3e2bcbc5e9e1aa0185d544fb37b10db8233aa4c5cd14777138f63c2959a3ca5e6954 SHA512 680e9646a51a0a5923b3ded10007ee1c1e2a41c6d8a961d2b2540db6578bed2847154f4cac87e3cfe1118a62595b47c7df99da854f6c340e173b9eb8cacf2add
 DIST VirtualBox-5.1.30.tar.bz2 116510730 BLAKE2B fe1d9ea37aa33a6aa6a78aebb469e267b9412e96cadc0a5287c263e8be21fdd0c9035a03e31ca954bef99eb5c05416de2bdfde5a657daa9a61eb795815d33542 SHA512 6c44d9593f4815644a484b306e621fe7eca224002f85d89c00f2470300f2c78dbfe50ffda61d2c2465df14ca77c70a2ab86f1a05116feeee9f5833857eb18dee
 DIST VirtualBox-5.2.2.tar.bz2 118424845 BLAKE2B c918ff1d3989d2d94cec807b596b5daceece6388575f40c70b3581288be664e39cd0f0dae974516d1122110d5660185bac7bcf336418d8f44455290cafb52a7d SHA512 415956cfe987a20eb0a372288c29f0e388bd706a3b94ff69b92ef5bbf2e9aecd75761a56f5421ef97d165f756cd7fd46b9eaf16b74b7d2460b831d7f03aae7dc
 DIST VirtualBox-5.2.4.tar.bz2 118481693 BLAKE2B 874f5e65d97befaf72767626a1f3271a0b7c30f8dc998dc10aee9478039cecd14ce11c9c624ba596c09641aae9a41ca91ae33e5a82218bc8acd8cd32ebb727e1 SHA512 19cb168393098fd28ab2017a27d09a558721d57b31c5d3610deb68a17dfa7fd7ffe9ad7be18714a314724ab5ecb54e7ab5fb76183e8e89afbed2da79649e2798
-DIST virtualbox-5.1.24-patches-01.tar.xz 2708 BLAKE2B 6779a7ad1b013cf2e735817eae9785451c6a91e4a61558a650cfdc67d80b63db0eb33992a3207b0acc1e80b75caef14d9d291705ca7b3c96c4185c31e585e92d SHA512 0028e593818013f809831ac5a73eec63988c0aefb4b309fb3c928efbea8db8b8f46bd7c82f156396adc704f0567474df262dfe9bb6e09af0b2c23528fe2c6e2d
 DIST virtualbox-5.1.30-patches-02.tar.xz 2608 BLAKE2B 08b05a26622a7acec455f6d0dc72858f5f2758488e50d219f83c3d12606419d48e9d99302cde5a275929fe79af900c1b3ea3957fe9dfdaa952aaa0da9933291a SHA512 8a490f7cc44e40262fc47819736251c177adb635256794e9500f52729197c85211d5b0c0d000268089953a4c185872a8ba03c5d42df6b80f05eac8b81335320a
-EBUILD virtualbox-guest-additions-5.1.26.ebuild 6048 BLAKE2B adbf24bb4de0120426b51c42b7f1897769f64fc72c353593ca38917e1d834b9788a0a1ced9a049d1dcb18108ecaa01c0daa980b6518fd503219b3b4e1a76f791 SHA512 490852f4835df995de2160e565d9e87bfb0b51c06b3bb30a2a7abc871d75d2724e7edd820a600b0455adb6d2fad7a39d1ed3a84be538c0d535a011ea8c026578
 EBUILD virtualbox-guest-additions-5.1.30.ebuild 6048 BLAKE2B b6541f7ccd93d301d76515945533474f87e51c8b85d3434bf9b090b9e99ac4bdca083d19dc2408c37746c38b0ab169f3b103da12468cab2a45f848352367fbca SHA512 75b70e9f6c2c05d1c7840473e1f5b2d2764c12393832a8a9570f98c3b0aef88c39a44c30311ea7bfa4153b303addb25d66795d73bcff964407d2086568ce3d7f
 EBUILD virtualbox-guest-additions-5.2.2.ebuild 6152 BLAKE2B 5f146f8df88f13991d0332d5b6f573e240041b77450216e917d28773ede08008b3038d2d70644bcfa54c880030fddb299732086403e126acf2839ea84b89c83d SHA512 cb5772b2c311acd106a24358ca9516318c480e133bbc3dfd01f76aaab4adf215db37a1c38afdf70dc88c9ba7642952b20e0cb9e23acb419c1e447cfa40fa4eae
 EBUILD virtualbox-guest-additions-5.2.4.ebuild 6152 BLAKE2B 5f146f8df88f13991d0332d5b6f573e240041b77450216e917d28773ede08008b3038d2d70644bcfa54c880030fddb299732086403e126acf2839ea84b89c83d SHA512 cb5772b2c311acd106a24358ca9516318c480e133bbc3dfd01f76aaab4adf215db37a1c38afdf70dc88c9ba7642952b20e0cb9e23acb419c1e447cfa40fa4eae
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.1.26.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.1.26.ebuild
deleted file mode 100644
index 6d9fa5fc7d0b..000000000000
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.1.26.ebuild
+++ /dev/null
@@ -1,221 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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
-	https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-5.1.24-patches-01.tar.xz"
-
-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 check
-	sed -e '/^check_gcc$/d' -i configure || die
-
-	eapply "${WORKDIR}/patches"
-
-	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 da76c87e3e93..0c06158d29be 100644
--- a/app-emulation/virtualbox-modules/Manifest
+++ b/app-emulation/virtualbox-modules/Manifest
@@ -2,11 +2,9 @@ AUX create_vbox_modules_tarball.sh 896 BLAKE2B 4153a8fa67cd8fe7187f3c4232691b1de
 AUX virtualbox-modules-4.1.4-pax-const.patch 2335 BLAKE2B 9d23df0a04e70765b0eb1ec123e7b835a8e3c35d5c89c08239cc3dedcbcf7a34ce49324ab607490738639a1b5d7febef9083ee4b6c3344112695bc2ee079081b SHA512 8f5ffcd53f34e616b895013660e269e6031837411471abf69711df4fd5d745299dcb08d361eda0979dcfde7d9aafa0d24c99fcc9f3875fbf35771945f6b224a1
 AUX virtualbox-modules-5.1.30-udp.patch 1239 BLAKE2B d49d96894bae2fdedc2b8a825c849a99ad0cf36a92cc4d89881ce72a0b7ebd53174f39e298c119670654932b790113fe7fbc3a3bae552f2c597cad20a370141f SHA512 f22e6c8edc360e0f97b207ba9a046042ef1898c10c724d9519badef004858720040caef12bffa1ed0f07517ae2d0b831973a0e4ef8ffb239a26faf62706b0618
 AUX virtualbox.conf 38 BLAKE2B 853f2ba0ac1627100241e778fa6c35ff4fc86e8c9c753f8aa23cb053ffacf966c131c5630d1fafd481d7b057acc3e9d6f8f1a22766db5d1cf61fffa38de7c01b SHA512 b61936fff57426d31efa6928eadb572cafe40a65d3e31a0eecb53dc784ba9d0a9e0ad5e419df74418b977f89c17873240c38e2ada95949e5252d879110d6094a
-DIST vbox-kernel-module-src-5.1.26.tar.xz 625384 BLAKE2B f3f0676854e7c597281c4937e2753a117844f584248c824bce2f931adb3f1ee234b71b60f701da7043916fe716c3973ede0f39d6614c60a483fedf34cc70d49e SHA512 c77e0d8dfade2abac95162e7e7a424be4875e44d43bcf2a13e0e50caa69f5fd0d21c77f03bb2cd4cbd5df4ab31e9fbd49ecd9220a49af8cd10081b960e014010
 DIST vbox-kernel-module-src-5.1.30.tar.xz 625424 BLAKE2B 00d33cad237af1f0d5b4dbea38f84e0327d10d97fc309a8c7536433cb4fddf3614e6de160646077040b4fdc6dd126cfa2250081084ca0243cc572d9f5e9d5dfd SHA512 8e2113584e63e2ace71b708dc77428fd09167a1bded12b47312a5a8f85ef448e17f76b4300dba4c8ec99d7f8cb278cef039c6282c676e35b8f200bafb5c4770a
 DIST vbox-kernel-module-src-5.2.2.tar.xz 633924 BLAKE2B 85307332f3b0eaea1832b357c4f44a90c38165caaf3dae5d073a92f04f7d1ddf440e8a53fecf2dab4f0179002051382fa4fe1af8be12279bfc921f578c1743a1 SHA512 ec513912567bf58f367f08e212a5d3b82e7caae5fec6985f2253ee9405907b567c8cbd2dea277ddef1344711927eb75525f95d6204ef07cb1325d22185ccb5a4
 DIST vbox-kernel-module-src-5.2.4.tar.xz 634212 BLAKE2B d8be416f958f672c2ab50b5197f708bc1febca292d5262eec710c07561be7de810fb1dfd5961ef9367c91e0ac1b6033419f85444471e8d40406d4ab860de2a23 SHA512 3c2113a8781cde1a44954267ee469db91c843305a5b1468b1fd346af3f3626a3d98c8a958ec0e255401f569f75e652dbbb1a85fd6cc6b203cf170745c630cee1
-EBUILD virtualbox-modules-5.1.26.ebuild 1656 BLAKE2B f4f00b5fc80875046f5339c4d29340eb4d14ecece2de7fdbd51c73f0c1928e5dcadc58737aec3cc157d698ffd279e62602855ebaa1e889b0597a7296fdaf5c05 SHA512 bdb8d8f9f6ef4db63fb6039b136e49d5e7e52cff9a6ed476ad404c81d161655d9458caa267c8705ed4bfb84bf1677622584973f6b0adb413601d57810fab6690
 EBUILD virtualbox-modules-5.1.30.ebuild 1739 BLAKE2B ee506a122a4f99f714d23f2ec8cf4c094d5bc9a591b1a6465110e78623944c1922dbab68bdaf388bffbc59cbf426a6c31cf46179a87e8e7fce5fe7f462d8e6c6 SHA512 3282bab435ac11bc356cb8aedc384c5686d8480dbec352b39e80331c488c1a8f8dd87e80dfa2ac778a95f345f4f706c297ed360ff3b5d41c6c67b6e07a16d510
 EBUILD virtualbox-modules-5.2.2.ebuild 1539 BLAKE2B 7373f5601523925aa857f6bfab1a9e02f5ad661268a35863ac517eee2f9a031bde56d2421781d7ecdde57d2e1d97a97f89ecde20465b75e9c08fb1d5d3f34e06 SHA512 2552d089f4bfaf70baee371235e169eb33706d293daf17a35f6ad810ad3eecd323a480863474a4d0908c6a0d2e1d0800daf4d5de326d70a4b59add75f9002f00
 EBUILD virtualbox-modules-5.2.4.ebuild 1499 BLAKE2B b5a34d365a0b3372c72b7c9a56e5a7ebcd86ab799731dca63b5e074c9010cd44af554add0cb5b0aa74dcfea7c5c7bd3f19bdbc152681f1c7fa43e970f8a8d8c1 SHA512 1a72712277d4517fa8dc6c5fad96032ef1792a3cea95703d7e66c43816e13e00c1ac232f3b0404e27726fcaa12ab7b6ea5006df76b5cc961043630b811acd116
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-5.1.26.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-5.1.26.ebuild
deleted file mode 100644
index fc282ccbb370..000000000000
--- a/app-emulation/virtualbox-modules/virtualbox-modules-5.1.26.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# 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} O=${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 ee313bbea6ec..03ee23ff21ae 100644
--- a/app-emulation/virtualbox/Manifest
+++ b/app-emulation/virtualbox/Manifest
@@ -7,15 +7,12 @@ AUX virtualbox-5-localconfig 1553 BLAKE2B dc1e946e97eb6b19a99b5ecf34640ef09c4446
 AUX virtualbox-5.1.4-paxmark-bldprogs.patch 2642 BLAKE2B f8c25139dc58f6f2a9def4c3535457013a8f9ab9065d23ab858daede5d32b90a6387a0daab1fa39fad706f809799ba58405c2994c902d224cbf07118fe1af5b9 SHA512 40971ee2a2453cd830b118ee2d1d05468beec60b5c15fc36b2a01c30a454823bfc666149671f03ccbfd82abe1041e50c7d36d670da506cfb9b9faab9edcc83ee
 AUX virtualbox-ose-5-wrapper 3405 BLAKE2B 92001ed3397a22abb5955617451bfb78d1f1f62f9be99cf87c57c42d118abb42b9436a0a83736d882b34360c9f8e67f9a8adaeffe7e9a3456c4ddc93a7850e53 SHA512 96f9ab8e2a83b5aebbb66916cbca0a7af0e2d69285296fe87869f096149791e0491dec2408f21f7249b68d928eebe396ab710a4ec6b6d6bc9c67120d323effa0
 AUX virtualbox-ose.desktop-2 201 BLAKE2B 05fbf657e8c1d8ec46f1b88e681efd50a4e5ab2a0f32f3fd25ca956e1e9bff6357c69a96628e3eba26b01869b6dc596f68f739f9330fa3018c186dfa0fdcea06 SHA512 a678e237ad0451e8785f242ebf822b4f3b03d2e2280a62f71728f79bdcfc84d3465ee60cad90db75e64b2c89a1b0b224de00519728fb605df67ca7c9aee0874c
-DIST VirtualBox-5.1.26.tar.bz2 115915813 BLAKE2B c770420804fd0bcbe5582fccfefc55b6d69a603a99cc9ba26e72f6c1947a3e2bcbc5e9e1aa0185d544fb37b10db8233aa4c5cd14777138f63c2959a3ca5e6954 SHA512 680e9646a51a0a5923b3ded10007ee1c1e2a41c6d8a961d2b2540db6578bed2847154f4cac87e3cfe1118a62595b47c7df99da854f6c340e173b9eb8cacf2add
 DIST VirtualBox-5.1.30.tar.bz2 116510730 BLAKE2B fe1d9ea37aa33a6aa6a78aebb469e267b9412e96cadc0a5287c263e8be21fdd0c9035a03e31ca954bef99eb5c05416de2bdfde5a657daa9a61eb795815d33542 SHA512 6c44d9593f4815644a484b306e621fe7eca224002f85d89c00f2470300f2c78dbfe50ffda61d2c2465df14ca77c70a2ab86f1a05116feeee9f5833857eb18dee
 DIST VirtualBox-5.2.2.tar.bz2 118424845 BLAKE2B c918ff1d3989d2d94cec807b596b5daceece6388575f40c70b3581288be664e39cd0f0dae974516d1122110d5660185bac7bcf336418d8f44455290cafb52a7d SHA512 415956cfe987a20eb0a372288c29f0e388bd706a3b94ff69b92ef5bbf2e9aecd75761a56f5421ef97d165f756cd7fd46b9eaf16b74b7d2460b831d7f03aae7dc
 DIST VirtualBox-5.2.4.tar.bz2 118481693 BLAKE2B 874f5e65d97befaf72767626a1f3271a0b7c30f8dc998dc10aee9478039cecd14ce11c9c624ba596c09641aae9a41ca91ae33e5a82218bc8acd8cd32ebb727e1 SHA512 19cb168393098fd28ab2017a27d09a558721d57b31c5d3610deb68a17dfa7fd7ffe9ad7be18714a314724ab5ecb54e7ab5fb76183e8e89afbed2da79649e2798
-DIST virtualbox-5.1.24-patches-01.tar.xz 2708 BLAKE2B 6779a7ad1b013cf2e735817eae9785451c6a91e4a61558a650cfdc67d80b63db0eb33992a3207b0acc1e80b75caef14d9d291705ca7b3c96c4185c31e585e92d SHA512 0028e593818013f809831ac5a73eec63988c0aefb4b309fb3c928efbea8db8b8f46bd7c82f156396adc704f0567474df262dfe9bb6e09af0b2c23528fe2c6e2d
 DIST virtualbox-5.1.30-patches-02.tar.xz 2608 BLAKE2B 08b05a26622a7acec455f6d0dc72858f5f2758488e50d219f83c3d12606419d48e9d99302cde5a275929fe79af900c1b3ea3957fe9dfdaa952aaa0da9933291a SHA512 8a490f7cc44e40262fc47819736251c177adb635256794e9500f52729197c85211d5b0c0d000268089953a4c185872a8ba03c5d42df6b80f05eac8b81335320a
 DIST virtualbox-5.2.0-patches-01.tar.xz 2460 BLAKE2B d3f973dc7ee0557c360f801c3bf84065a7e7bc9960984398b8f86d71fab32c59774e970c6cf873be07bcb9666af168570e8a78705a5999b1fc5d863dbbc6e538 SHA512 b91278dd81a50e412f5a281c72949f591a1c53303080549b74b28763cab9e3948948afb0256e0453d17736683cca3372a8e9c6d63f02f3eff3ef92c2a1ea332b
-EBUILD virtualbox-5.1.26.ebuild 13854 BLAKE2B 31cab7cbb9711d56ded8c764ad520031b813a3340ca5855504f73c81f6f55305df8052b0870f732ac5fbbd69d3aa0a523baf8d6b83ab914513f48970806af099 SHA512 565ae4bb7ab2139ea3ab8ae80f613ef758d60d1fb77599334276d46f3c30ad3c0ac5a6a54ab3c5e5fb78bfafdffe169418e6ddd6c45890ff7ff7b2e13b9d6b2b
-EBUILD virtualbox-5.1.30.ebuild 13854 BLAKE2B 0ea8cc8370f5610eb59567ff9009f83ff336d956cd9b5514f09550a6f84ad0a97067be93e9f5f9d971570c8c1eca9deace412d8cc4f35de02517f6d69272deff SHA512 ba06613be809eb4539f743ac5dccb29e38df5b5d734f304a40c5700f1d377cfdaceb884728b1ed5a42545cf0e9f38da7c80980b286ce71b43eca783c87e24970
-EBUILD virtualbox-5.2.2.ebuild 13845 BLAKE2B 2cd7c3030520556b792c82c0517fbc0f8a724da4b2faa6dacdebb8cdf6f57282ec45a324615c5b927cb40e9d4f99bc519fee73f6f618de0cbdbfc6c6f0a27884 SHA512 d03cae82af1b6065411f0f124b8aeab674d3864eaa02bd4da8c29d0788369f0960ad54e26e98673cde70f554a3ef5bc755735bbf14de7b3fdfa37e9e404537f0
-EBUILD virtualbox-5.2.4.ebuild 13845 BLAKE2B 2cd7c3030520556b792c82c0517fbc0f8a724da4b2faa6dacdebb8cdf6f57282ec45a324615c5b927cb40e9d4f99bc519fee73f6f618de0cbdbfc6c6f0a27884 SHA512 d03cae82af1b6065411f0f124b8aeab674d3864eaa02bd4da8c29d0788369f0960ad54e26e98673cde70f554a3ef5bc755735bbf14de7b3fdfa37e9e404537f0
+EBUILD virtualbox-5.1.30.ebuild 13879 BLAKE2B 710bc0860cb92d07f23863550306e58ef464f6e1c57d125771b691a7caa88f0ee08ef0c6d56b3fb7390500354a823d944ca32b3f3e9fc99bd7db29b135752a11 SHA512 6ac9319d23c3dfeea7855ca3cb3f97662033d118e94d4eebe388b1d73235d274ebb12980d38d0b3030cf62c20119ecf21a5b0b1da6fb82fbf116ae7423a6bc0a
+EBUILD virtualbox-5.2.2.ebuild 13870 BLAKE2B a309ccb4e128a738c42afc4537d5e8c4a9430a4671c2963871a11eb7d762b867bda6f298f913bd6726aecda3db913798a21291a837b4bb1a551cbe55aea79546 SHA512 8d343dd8c173ed96a93f8f7fb518b048a3082cadf32fe949a6e4cdb48c272ad44e85c44df55c0dd9d12606ec0a89da83a8dd5429661a94e684f1f375f8bb8021
+EBUILD virtualbox-5.2.4.ebuild 13870 BLAKE2B a309ccb4e128a738c42afc4537d5e8c4a9430a4671c2963871a11eb7d762b867bda6f298f913bd6726aecda3db913798a21291a837b4bb1a551cbe55aea79546 SHA512 8d343dd8c173ed96a93f8f7fb518b048a3082cadf32fe949a6e4cdb48c272ad44e85c44df55c0dd9d12606ec0a89da83a8dd5429661a94e684f1f375f8bb8021
 MISC metadata.xml 950 BLAKE2B 98d5a25b631c928a86d8b716936c497aaba8f7bcbb0441c771acbf9998a89168bdfcb5d09e03d58e3403b3d90dd6acb611b1d47f4a0e4bf87a17c2f03ecc78ec SHA512 f09b74c1738a060749799ef652162824b40812de13558582cc660b57f1c379eb2d915ab53c1f2d55bb0c6cf4f917e0a6e55dabb5bde8b592a1eeaf34c3078363
diff --git a/app-emulation/virtualbox/virtualbox-5.1.26.ebuild b/app-emulation/virtualbox/virtualbox-5.1.26.ebuild
deleted file mode 100644
index 40f87adb01dd..000000000000
--- a/app-emulation/virtualbox/virtualbox-5.1.26.ebuild
+++ /dev/null
@@ -1,459 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-inherit eutils flag-o-matic java-pkg-opt-2 linux-info multilib pax-utils python-single-r1 toolchain-funcs udev xdg-utils
-
-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.24-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 pax_kernel 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? (
-		app-text/docbook-sgml-dtd:4.4
-		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 )
-	pax_kernel? ( sys-apps/elfix )
-	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
-
-	# Replace pointless GCC version check with something less stupid.
-	# This is needed for the qt5 version check.
-	sed -e 's@^check_gcc$@cc_maj="$(gcc -dumpversion | cut -d. -f1)" ; cc_min="$(gcc -dumpversion | cut -d. -f2)"@' -i configure || die
-
-	# Don't use "echo -n"
-	sed 's@ECHO_N="echo -n"@ECHO_N="printf"@' -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
-		eapply "${FILESDIR}/050_virtualbox-5.1.24-nopie.patch"
-	fi
-
-	# Only add paxmark patch when we're on pax_kernel
-	if use pax_kernel ; then
-		eapply "${FILESDIR}"/virtualbox-5.1.4-paxmark-bldprogs.patch
-	fi
-
-	eapply "${WORKDIR}/patches"
-
-	eapply_user
-}
-
-src_configure() {
-	local myconf=(
-		--with-gcc="$(tc-getCC)"
-		--with-g++="$(tc-getCXX)"
-		--disable-dbus
-		--disable-kmods
-	)
-	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 ${myconf[@]} || die "configure failed"
-}
-
-src_compile() {
-	source ./env.sh || die
-
-	# Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529)
-	MAKEJOBS=$(grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS}) #'
-	MAKELOAD=$(grep -Eo '(\-l|\-\-load-average)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS}) #'
-	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
-
-	if use doc ; then
-		dodoc UserManual.pdf
-	fi
-}
-
-pkg_postinst() {
-	xdg_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() {
-	xdg_desktop_database_update
-}
diff --git a/app-emulation/virtualbox/virtualbox-5.1.30.ebuild b/app-emulation/virtualbox/virtualbox-5.1.30.ebuild
index 9a20365745cc..31a7801b26bc 100644
--- a/app-emulation/virtualbox/virtualbox-5.1.30.ebuild
+++ b/app-emulation/virtualbox/virtualbox-5.1.30.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -316,8 +316,10 @@ src_install() {
 	done
 	dosym ${vbox_inst_path}/VBoxTunctl /usr/bin/VBoxTunctl
 
-	# VRDPAuth only works with this (bug #351949)
-	dosym VBoxAuth.so ${vbox_inst_path}/VRDPAuth.so
+	if use pam ; then
+		# VRDPAuth only works with this (bug #351949)
+		dosym VBoxAuth.so ${vbox_inst_path}/VRDPAuth.so
+	fi
 
 	# set an env-variable for 3rd party tools
 	echo -n "VBOX_APP_HOME=${vbox_inst_path}" > "${T}/90virtualbox"
diff --git a/app-emulation/virtualbox/virtualbox-5.2.2.ebuild b/app-emulation/virtualbox/virtualbox-5.2.2.ebuild
index f6ef3647989f..292349146a95 100644
--- a/app-emulation/virtualbox/virtualbox-5.2.2.ebuild
+++ b/app-emulation/virtualbox/virtualbox-5.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -316,8 +316,10 @@ src_install() {
 	done
 	dosym ${vbox_inst_path}/VBoxTunctl /usr/bin/VBoxTunctl
 
-	# VRDPAuth only works with this (bug #351949)
-	dosym VBoxAuth.so ${vbox_inst_path}/VRDPAuth.so
+	if use pam ; then
+		# VRDPAuth only works with this (bug #351949)
+		dosym VBoxAuth.so ${vbox_inst_path}/VRDPAuth.so
+	fi
 
 	# set an env-variable for 3rd party tools
 	echo -n "VBOX_APP_HOME=${vbox_inst_path}" > "${T}/90virtualbox"
diff --git a/app-emulation/virtualbox/virtualbox-5.2.4.ebuild b/app-emulation/virtualbox/virtualbox-5.2.4.ebuild
index f6ef3647989f..292349146a95 100644
--- a/app-emulation/virtualbox/virtualbox-5.2.4.ebuild
+++ b/app-emulation/virtualbox/virtualbox-5.2.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -316,8 +316,10 @@ src_install() {
 	done
 	dosym ${vbox_inst_path}/VBoxTunctl /usr/bin/VBoxTunctl
 
-	# VRDPAuth only works with this (bug #351949)
-	dosym VBoxAuth.so ${vbox_inst_path}/VRDPAuth.so
+	if use pam ; then
+		# VRDPAuth only works with this (bug #351949)
+		dosym VBoxAuth.so ${vbox_inst_path}/VRDPAuth.so
+	fi
 
 	# set an env-variable for 3rd party tools
 	echo -n "VBOX_APP_HOME=${vbox_inst_path}" > "${T}/90virtualbox"