gentoo resync : 16.01.2020

4 files changed, 130 insertions, 9 deletions

diff --git a/app-emulation/virtualbox-modules/Manifest b/app-emulation/virtualbox-modules/Manifest
index c7903dccb069..ea05197614c7 100644
--- a/app-emulation/virtualbox-modules/Manifest
+++ b/app-emulation/virtualbox-modules/Manifest
@@ -6,12 +6,16 @@ AUX virtualbox.conf 38 BLAKE2B 4f03cb09a1cca36013beb2a38220115d63510fd0aa63e2df1
 AUX virtualbox.conf-r1 30 BLAKE2B 6308dedc75e2677cbdc844b53f51359e6b5745d3510636b04d08512122aeb6db81a1a18af156a8b9acccad395d390b24f9c27ed47413382cb6101266762de230 SHA512 5c6d31f527ca2db8d7fbeea759ac328eff42803d7940fd81ef12af22eb09f8913a0e561c35db1963e2a8b398ee288692817b5c8f3d439f2a6fd381769ec2ac8a
 DIST vbox-kernel-module-src-5.2.32.tar.xz 642428 BLAKE2B 0dda5cb5608c1eed22bea209564d53c5f7eab58ca620db2cc441e3c1ba9ad66609c4ef13df07fd29b691f2941a070f9852e8729cd386081df6a82ede345f33c5 SHA512 fadedab690cb7dee8b9a6747ed711d924bf3bce8999b24e7b64cb8738c53c2fa7372b1a8e8535e7e4ef0235aec02d4a3f1f67cd07d7621934fab684c5163329e
 DIST vbox-kernel-module-src-5.2.34.tar.xz 642756 BLAKE2B 8a1dacc71b0c033130db84f46ab6029839e4c95cd20b6c982716fde9a83070f4597a9418ef2747c5b5714eafd5c1453c67eb1477104cd1185baf408301bc0226 SHA512 2feefa7867c664f1a1af04181e6db4cf2ab18e8a42dc57afe5fe13d35de889c2a88b79eb43642e024d99decfdd79c42891989158016edb09d5001783c4cb7ac3
-DIST vbox-kernel-module-src-6.0.12.tar.xz 669148 BLAKE2B 2291e3fcb9f049ce5657288151d182dfc9a3d6d6e8e1b32047e4b682f35e56f0a5bb5d3ad7efbc98082d2d1823aeb821099e9878b8a237322e8900fb2e2d65de SHA512 e9d8fcbfc076bf4e7d4dc5954e0c24509273c6358ee2de9ddfa87ea650b69fdc31d223595d610c1dd921efd6620ba5285f7f6a10170e90e706bf731e3629dc51
+DIST vbox-kernel-module-src-5.2.36.tar.xz 643160 BLAKE2B 50f1aee4d56c8b78a5e7512cb843b4e36137c38b160ca0419b2061892f29a98edaa266afb8f94ee0952e4c8af57b41da24a7d70b43a5adf5c5a15b2a4ac867b9 SHA512 b8aa3e8de1573ac728dc00d85ffbb0c25cdb118af92f16f7a4c1a7d394526b8f3005aab1b4422af6251bdafb958c6dc86b31f13c1f35116c8ff39a9288aed277
 DIST vbox-kernel-module-src-6.0.14.tar.xz 669396 BLAKE2B e2dc77f33176af16be0fcad8851dd42eb2b7b21da35dc434951e3300e45fec4b516741f6122ae43aed2ee332323221098f047b5206ca63eb7741925a40682728 SHA512 1bcc78dff3305bb7186cec2a844188411a62fe32d0581c4de21843ee513925d5dfc9bd4dedb3cc90f0e1c165c7ae6d856590cc359e36cc8605b164c2c9979380
+DIST vbox-kernel-module-src-6.0.16.tar.xz 669392 BLAKE2B 19e718097ee4da75c8dc3b565735f0a378d94547911ec89af52d8dccb36d67391a2f6700575c374552cd4fc4eb8a7e3d6618a800380e473429bd3759e0d1f9c0 SHA512 8979da4cba07c9095778864af0fd29c0acf10d71ea587819954a349e8c193a03b2268bf80dca9004803d8cf2a40974994fcd1f2c6e2ac657b5032f6c04977793
 DIST vbox-kernel-module-src-6.1.0.tar.xz 664268 BLAKE2B 9007242bdfcc407283d183132867bef8cfcf75960e7032f1541be39e33c15de68ae1f49c0022422d776fe0397c1411c62866990efb55fe29f9dce27bf7b95b71 SHA512 a5b9f740589ca09b4115275e01d0da7d68535a927550a57007b75726c715422724593f4debc2a123fb8de43a27e49b372aba3832f17dda3ecfd8813d440a0cff
+DIST vbox-kernel-module-src-6.1.2.tar.xz 664844 BLAKE2B 4fbdbac98558309c4dd1a25e44f061e2c7386c418f40b0da364914d58cf69048d9c3b1693fb75ce590c63280e79a124433ce7ff4f8f08e327ab67c5d55a163cf SHA512 f26e38a35b0cbf3ca51d98299ea2018641a35c17df5b1bc8a50352738afaafcc95efc9e61efc7d7406e203f3e514125b8afd8ed4406c190f82fe83934a042158
 EBUILD virtualbox-modules-5.2.32.ebuild 1187 BLAKE2B 87f131dcdde7d6acf35a48183ed2423c20366d1c57bfde56b9c6b265006b049d6d5cf2f058867150f30cddfda308512907702208c15d4ae5a868c6e8d6468091 SHA512 80d1deb4b4142e7a4b718a460829ed99e5a4c24e50d65266263a872d247de519972bb13623881382ca8e12a4387e94f327fb9491728dff65ce8449244df0199f
 EBUILD virtualbox-modules-5.2.34.ebuild 1189 BLAKE2B 5edbc0952960db33bfa7f3d22266fac6785b6d01591e625e88818845667051e2a090ee34e7265dca082434d2da85dd84930bc71fab7e878f12dececa6320f0db SHA512 5701d91ab3bee88cfa0422f9d22c073f92faad72bbb8beb0ecee96ce78cdd51ef3b59c072c924b3ce267e31cbc4bcefc89376fe273de9dc35d508f3fbd6d59be
-EBUILD virtualbox-modules-6.0.12.ebuild 1316 BLAKE2B 996e40c230c441f6a5ba9020e2236a311594b3a02f56b0f50482f91e3dcec936be021ef18470681483c6f6ed3934430184a4b9a241abf413c9af2ce57734600c SHA512 6cbb8bfe065b65093d9c7566e2601ce3464c61f0afae12f35584bb3ba5ec3e8b850c99f864c021b6da66170819bea68b87cad8d6c796ac9d57ea8aac5842074f
+EBUILD virtualbox-modules-5.2.36.ebuild 1456 BLAKE2B c669afb1fbb69fdb15f3b928c8a1714376fc3994c095efee0e6eee9a13251769eae16259117f101cabef4d8faa6cd3c7a8656b70bde9d56b57e126c8d13e317a SHA512 953d735cb0fc9bc1bfbbc6139ccca1c25fd60b929b6defd2d7aed73003a20b476994f748aa3ead1dcfc1f0128ecec0ad3e8ce0556cf6fbfe620d0dc784371ad9
 EBUILD virtualbox-modules-6.0.14.ebuild 1299 BLAKE2B b5bc508eb0ff4f33c4b99217ae9b9b7d48e6506bd7440e790bd57d501a99878c5be6493cbae5c4095fa58213daf803150f8399b9e91f87b4f0ef5e4dbefe9967 SHA512 8c64966ce7f4e93783be079a1205cb7ddef010b0ec67eb92d12d7a700c1181d975b08105a4056718255ada775a762115403eac77c3ba96b857397977269cd9be
+EBUILD virtualbox-modules-6.0.16.ebuild 1468 BLAKE2B 4ae5867928772b4463b8ec7dc42451dc10853881a3c1706232a21d2a4cf58f3a7fd0c08d6882c9c032aeaf8e9ca69fa5b38dc6e559e3b5557e1cd232659baf7b SHA512 d54f8790a103877306b8ea4c2214346fa6cd599dde01c8e775c478b03210005f37a9b009faf374ccb12888115e718c1790cebf9086506cf580ef04f3e05ec4f7
 EBUILD virtualbox-modules-6.1.0.ebuild 1367 BLAKE2B 0a4cbd903953270f18cfedcce0f96ede2a11d8bc5eb60af1554489a1c1c05ebf22dabf98cf36f4567ec561d3856c660eeeeb7569757b29bd677fd7ea0fba5672 SHA512 caf19757da92022adebf00b7e9e05f404d4085e5885042ee589bb6b662d68b06228d4cdd2341fd3d83dd1529b5fa3bdf7556126793b867022e77cdfe4648be99
+EBUILD virtualbox-modules-6.1.2.ebuild 1429 BLAKE2B ef6d94ca60d2be43b507b20d829014b3e3d1df3edafd829c6ffa44bf3e0785242a3b91d6a1540f7bccb5e5818595dbfc8e716eec8f6a215d8c090657ed42c3c2 SHA512 3ba714a4a3937710b9bd47ea474922336acc6861dd73520bb154b6cce41dcf7a7672d8e65ecac986483ac7460d210f5b7d2cb1bca808c9fb879f3e4a9992226c
 MISC metadata.xml 353 BLAKE2B d7de13b3a8966ab3bca54ae77f7f6c7dfd57f2c5941f09ab1b5f79ac798687ffaaa183afdf9c034a9d50fda8507a3aaa2ef0c11d0fdfa6e09a55a1bdb9f30f4a SHA512 40029c9a246dde5ed51119f42ec5448b7ae08a47ee4d6be201fef282305c809d7d3182abf807dd2444ffe1a980abcd670878567d948bcd3661a55c6848a37000
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-5.2.36.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-5.2.36.ebuild
new file mode 100644
index 000000000000..0f3180482f1f
--- /dev/null
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-5.2.36.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2020 Gentoo Authors
+# 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=7
+
+inherit linux-mod user
+
+MY_P="vbox-kernel-module-src-${PV}"
+DESCRIPTION="Kernel Modules for Virtualbox"
+HOMEPAGE="https://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"
+MODULE_NAMES="vboxdrv(misc:${S}) vboxnetflt(misc:${S}) vboxnetadp(misc:${S}) vboxpci(misc:${S})"
+MODULESD_VBOXDRV_ENABLED="yes"
+MODULESD_VBOXNETADP_ENABLED="no"
+MODULESD_VBOXNETFLT_ENABLED="no"
+# The following is a security measure that comes directly from usptream.
+# Do NOT remove this!!!
+MODULESD_VBOXPCI_ADDITIONS=(
+	"blacklist vboxpci"
+	"install vboxpci /bin/true"
+)
+
+pkg_setup() {
+	enewgroup vboxusers
+	linux-mod_pkg_setup
+	BUILD_PARAMS="CC=$(tc-getBUILD_CC) KERN_DIR=${KV_DIR} KERN_VER=${KV_FULL} O=${KV_OUT_DIR} V=1 KBUILD_VERBOSE=1"
+}
+
+src_prepare() {
+	if use pax_kernel && kernel_is -ge 3 0 0 ; then
+		eapply -p0 "${FILESDIR}"/${PN}-5.2.8-pax-const.patch
+	fi
+
+	default
+}
+
+src_install() {
+	linux-mod_src_install
+	insinto /usr/lib/modules-load.d/
+	newins "${FILESDIR}"/virtualbox.conf-r1 virtualbox.conf
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+}
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-6.0.16.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-6.0.16.ebuild
new file mode 100644
index 000000000000..732a710260d6
--- /dev/null
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-6.0.16.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2020 Gentoo Authors
+# 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=7
+
+inherit linux-mod user
+
+MY_P="vbox-kernel-module-src-${PV}"
+DESCRIPTION="Kernel Modules for Virtualbox"
+HOMEPAGE="https://www.virtualbox.org/"
+SRC_URI="https://dev.gentoo.org/~polynomial-c/virtualbox/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
+KEYWORDS="~amd64 ~x86"
+IUSE="pax_kernel"
+
+RDEPEND="!=app-emulation/virtualbox-9999"
+
+S="${WORKDIR}"
+
+BUILD_TARGETS="all"
+MODULE_NAMES="vboxdrv(misc:${S}) vboxnetflt(misc:${S}) vboxnetadp(misc:${S}) vboxpci(misc:${S})"
+MODULESD_VBOXDRV_ENABLED="yes"
+MODULESD_VBOXNETADP_ENABLED="no"
+MODULESD_VBOXNETFLT_ENABLED="no"
+# The following is a security measure that comes directly from usptream.
+# Do NOT remove this!!!
+MODULESD_VBOXPCI_ADDITIONS=(
+	"blacklist vboxpci"
+	"install vboxpci /bin/true"
+)
+
+pkg_setup() {
+	enewgroup vboxusers
+	linux-mod_pkg_setup
+	BUILD_PARAMS="CC=$(tc-getBUILD_CC) KERN_DIR=${KV_DIR} KERN_VER=${KV_FULL} O=${KV_OUT_DIR} V=1 KBUILD_VERBOSE=1"
+}
+
+src_prepare() {
+	if use pax_kernel && kernel_is -ge 3 0 0 ; then
+		eapply -p0 "${FILESDIR}"/${PN}-5.2.8-pax-const.patch
+	fi
+
+	default
+}
+
+src_install() {
+	linux-mod_src_install
+	insinto /usr/lib/modules-load.d/
+	newins "${FILESDIR}"/virtualbox.conf-r1 virtualbox.conf
+}
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-6.0.12.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-6.1.2.ebuild
index 90528f502491..1ebd52459dd1 100644
--- a/app-emulation/virtualbox-modules/virtualbox-modules-6.0.12.ebuild
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-6.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # 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
@@ -16,18 +16,18 @@ SRC_URI="https://dev.gentoo.org/~polynomial-c/virtualbox/${MY_P}.tar.xz"
 LICENSE="GPL-2"
 SLOT="0"
 [[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64"
 IUSE="pax_kernel"
 
 RDEPEND="!=app-emulation/virtualbox-9999"
 
-PATCHES=( "${FILESDIR}"/${PN}-6.0.12-linux-5.3+-compatibility.patch )
-
 S="${WORKDIR}"
 
 BUILD_TARGETS="all"
-BUILD_TARGET_ARCH="${ARCH}"
-MODULE_NAMES="vboxdrv(misc:${S}) vboxnetflt(misc:${S}) vboxnetadp(misc:${S}) vboxpci(misc:${S})"
+MODULE_NAMES="vboxdrv(misc:${S}) vboxnetflt(misc:${S}) vboxnetadp(misc:${S})"
+MODULESD_VBOXDRV_ENABLED="yes"
+MODULESD_VBOXNETADP_ENABLED="no"
+MODULESD_VBOXNETFLT_ENABLED="no"
 
 pkg_setup() {
 	enewgroup vboxusers
@@ -46,9 +46,11 @@ src_prepare() {
 src_install() {
 	linux-mod_src_install
 	insinto /usr/lib/modules-load.d/
-	doins "${FILESDIR}"/virtualbox.conf
+	newins "${FILESDIR}"/virtualbox.conf-r1 virtualbox.conf
 }
 
 pkg_postinst() {
+	# Remove vboxpci.ko from current running kernel
+	find /lib/modules/${KV_FULL}/misc -type f -name "vboxpci.ko" -delete
 	linux-mod_pkg_postinst
 }