gentoo resync : 25.04.2020

4 files changed, 16 insertions, 13 deletions

diff --git a/app-emulation/virtualbox-modules/Manifest b/app-emulation/virtualbox-modules/Manifest
index c5389db4a721..f50e5c586862 100644
--- a/app-emulation/virtualbox-modules/Manifest
+++ b/app-emulation/virtualbox-modules/Manifest
@@ -6,14 +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.36.tar.xz 643160 BLAKE2B 50f1aee4d56c8b78a5e7512cb843b4e36137c38b160ca0419b2061892f29a98edaa266afb8f94ee0952e4c8af57b41da24a7d70b43a5adf5c5a15b2a4ac867b9 SHA512 b8aa3e8de1573ac728dc00d85ffbb0c25cdb118af92f16f7a4c1a7d394526b8f3005aab1b4422af6251bdafb958c6dc86b31f13c1f35116c8ff39a9288aed277
+DIST vbox-kernel-module-src-5.2.40.tar.xz 644200 BLAKE2B 0083423831bcec17f4960747c3ae939a8b4a5d2f89d6f09ad88308b078035bc6f068314d2c74182c9bb7ea0007e9c6a5b3eaa8f48ce58330294a78f66ed3faa5 SHA512 b62359104fdd0a1fd2b506cec2e4b71fa9582f1a89088d3a45791835981e1cd2e0895861b688cfbd7306454aa66c18bcd1444b26181f084b7af69f43d3e9b499
 DIST vbox-kernel-module-src-6.0.16.tar.xz 669392 BLAKE2B 19e718097ee4da75c8dc3b565735f0a378d94547911ec89af52d8dccb36d67391a2f6700575c374552cd4fc4eb8a7e3d6618a800380e473429bd3759e0d1f9c0 SHA512 8979da4cba07c9095778864af0fd29c0acf10d71ea587819954a349e8c193a03b2268bf80dca9004803d8cf2a40974994fcd1f2c6e2ac657b5032f6c04977793
-DIST vbox-kernel-module-src-6.1.2.tar.xz 664844 BLAKE2B 4fbdbac98558309c4dd1a25e44f061e2c7386c418f40b0da364914d58cf69048d9c3b1693fb75ce590c63280e79a124433ce7ff4f8f08e327ab67c5d55a163cf SHA512 f26e38a35b0cbf3ca51d98299ea2018641a35c17df5b1bc8a50352738afaafcc95efc9e61efc7d7406e203f3e514125b8afd8ed4406c190f82fe83934a042158
+DIST vbox-kernel-module-src-6.0.20.tar.xz 670656 BLAKE2B ccd4130272545e57fa64f56adcc3b16d96dac2e6e44f8057a447fddb9c51e3be7729298b835b7e335a7d0e58e0603d96ee084547375a331209cf6fa3751868cd SHA512 fa7fd8dbff39bf65852522481c4725be7aeedb3052f7a628f15defd78dd8353ae3466a294f25bc51b555db9da774ad8ca756fa8d01f45af250ab57f7e2ce7193
 DIST vbox-kernel-module-src-6.1.4.tar.xz 664412 BLAKE2B b4cfe5b2792c8f5dc2bf6038f69e32d07aaead358b144e154806f404bcc0ffbb72d470db265b96f41ca714edc0588ce06748054b8358675c24848614253a7cfb SHA512 bb247a8d2450694937095bc9c263554f805c51676e2da726f124ce4f775c69bedab95286e8d00686e04c1d8fff67f6335aa29f51a0c0ec00b862ad4e56fe290c
+DIST vbox-kernel-module-src-6.1.6.tar.xz 667048 BLAKE2B 00cdddc108d54cb829e771eac1c95f254e97465960b50f6f95595cf4f25485146d9d807de903152f3472a9e57246379f15ea82f6464fc00053e4b6b6e9dbeebe SHA512 5fb91051d6f41c25f4ac642249f2dac289c06134d3815578c094db089dc36903a573913933c34d32e8bbf5d704f7225eabb849fd559430247a89a713f059012e
 EBUILD virtualbox-modules-5.2.32.ebuild 1203 BLAKE2B 564094a44633e5193d26e88bc866b0354a3dbec67d08c6b09869c8863487fe30f939f9039a6f23fb9061e200ea428c728fa689e6db643c1710716d565bac42ed SHA512 f3ab32231d5c050d39bae1af958de61e4964b2146aed215d6eae95b96a3a2428b8411b2f9f7bf9f0e81259120f2229b81498cb8b4d9e7d18d511bfb223d4f16c
 EBUILD virtualbox-modules-5.2.36.ebuild 1471 BLAKE2B 3470de73e2295b5e3e23ab0ca3a4d0d1b87651c7394f7e74caec4357ba9d8a52f882af11fdbf75e7ad1e77ad645028450bf5fcc919616e20b36d47338b1b708a SHA512 494ef76097b12598f99bca623d0099ccacf129cd591ea6f5e16a5e147ed1d9a093708eebcac3d28f5b654586717a0001d675ecc294d747fe42298f3c1963d22b
+EBUILD virtualbox-modules-5.2.40.ebuild 1471 BLAKE2B 3470de73e2295b5e3e23ab0ca3a4d0d1b87651c7394f7e74caec4357ba9d8a52f882af11fdbf75e7ad1e77ad645028450bf5fcc919616e20b36d47338b1b708a SHA512 494ef76097b12598f99bca623d0099ccacf129cd591ea6f5e16a5e147ed1d9a093708eebcac3d28f5b654586717a0001d675ecc294d747fe42298f3c1963d22b
 EBUILD virtualbox-modules-6.0.16-r1.ebuild 1458 BLAKE2B ab41e8a5636a52182198d2f0696f29885542a6dfb3ca65fbd315606905b42300e02f451391ea5517e02c963e6296f2af44ad3e639082bd32085f7eedfffa530b SHA512 7e326b960ccc58174fffd07046f2e6d5289ee4dca3031fa1c517b3f4e3c3aaf6dfee44382f6af4372ba6d96d0e7252c73519910ad50bbc3bcc02362b53b7f0be
-EBUILD virtualbox-modules-6.0.16.ebuild 1484 BLAKE2B d477ab2b18bb21a0d24bfac1cc2e81e0ca3dae9b9b1ce4442d14b3a8aab2c98e638118d51b43e24d972c1e72afb9836dbdf570ddbca1827ce949afc4eaff527e SHA512 b45be21e1f33dca217c4d4b38d742a4c937c75aeb75596c790122ceea0212e2f054444e77e63ee97e318e4f02f3f19403d071447b84333669334e298a2ddf624
-EBUILD virtualbox-modules-6.1.2.ebuild 1445 BLAKE2B 81a87a298473d95592e4e462eb6c6c3bac473c432b1c35afa2e3780ccfb7895f6c1459d423496565605143cc69bf447f62f176d336fbdcb91002b8421e53db33 SHA512 eab1130033e8ce3cc8900d23260c97d963ebd6b5fe3a10bcad6320e454307350ed17e13d14085edb425d8226240c1648a5cd1b5a63887c3988a085ae9ee4ebe5
+EBUILD virtualbox-modules-6.0.20.ebuild 1458 BLAKE2B ab41e8a5636a52182198d2f0696f29885542a6dfb3ca65fbd315606905b42300e02f451391ea5517e02c963e6296f2af44ad3e639082bd32085f7eedfffa530b SHA512 7e326b960ccc58174fffd07046f2e6d5289ee4dca3031fa1c517b3f4e3c3aaf6dfee44382f6af4372ba6d96d0e7252c73519910ad50bbc3bcc02362b53b7f0be
 EBUILD virtualbox-modules-6.1.4-r1.ebuild 1419 BLAKE2B ff41b1aded92f404c199e42076227efd4f5fde305fbd67e4a3b1f198c58a54786f72ba0e7eaf0e789a7bd13d67c1435e91f96e329362498187234a8918d29ac1 SHA512 d12adaafe5d3369dc793e9051ca3eedb10e52a76a9d0ea1805e6476808831613a93eaf71c93a836b075af2c822580e35e2b26e03216abdbecc3b44f83cfb6345
-EBUILD virtualbox-modules-6.1.4.ebuild 1445 BLAKE2B 81a87a298473d95592e4e462eb6c6c3bac473c432b1c35afa2e3780ccfb7895f6c1459d423496565605143cc69bf447f62f176d336fbdcb91002b8421e53db33 SHA512 eab1130033e8ce3cc8900d23260c97d963ebd6b5fe3a10bcad6320e454307350ed17e13d14085edb425d8226240c1648a5cd1b5a63887c3988a085ae9ee4ebe5
+EBUILD virtualbox-modules-6.1.6.ebuild 1419 BLAKE2B ff41b1aded92f404c199e42076227efd4f5fde305fbd67e4a3b1f198c58a54786f72ba0e7eaf0e789a7bd13d67c1435e91f96e329362498187234a8918d29ac1 SHA512 d12adaafe5d3369dc793e9051ca3eedb10e52a76a9d0ea1805e6476808831613a93eaf71c93a836b075af2c822580e35e2b26e03216abdbecc3b44f83cfb6345
 MISC metadata.xml 353 BLAKE2B d7de13b3a8966ab3bca54ae77f7f6c7dfd57f2c5941f09ab1b5f79ac798687ffaaa183afdf9c034a9d50fda8507a3aaa2ef0c11d0fdfa6e09a55a1bdb9f30f4a SHA512 40029c9a246dde5ed51119f42ec5448b7ae08a47ee4d6be201fef282305c809d7d3182abf807dd2444ffe1a980abcd670878567d948bcd3661a55c6848a37000
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-6.1.4.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-5.2.40.ebuild
index 79fd2c9e0fc5..9a370bd79a45 100644
--- a/app-emulation/virtualbox-modules/virtualbox-modules-6.1.4.ebuild
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-5.2.40.ebuild
@@ -15,8 +15,7 @@ SRC_URI="https://dev.gentoo.org/~polynomial-c/virtualbox/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
-KEYWORDS="~amd64"
+KEYWORDS="amd64 ~x86"
 IUSE="pax_kernel"
 
 RDEPEND="!=app-emulation/virtualbox-9999"
@@ -24,10 +23,16 @@ RDEPEND="!=app-emulation/virtualbox-9999"
 S="${WORKDIR}"
 
 BUILD_TARGETS="all"
-MODULE_NAMES="vboxdrv(misc:${S}) vboxnetflt(misc:${S}) vboxnetadp(misc:${S})"
+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
@@ -50,7 +55,5 @@ src_install() {
 }
 
 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
 }
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-6.0.16.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-6.0.20.ebuild
index 273b3fee8640..0dac94ce21ac 100644
--- a/app-emulation/virtualbox-modules/virtualbox-modules-6.0.16.ebuild
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-6.0.20.ebuild
@@ -6,7 +6,7 @@
 
 EAPI=7
 
-inherit linux-mod toolchain-funcs user
+inherit linux-mod toolchain-funcs
 
 MY_P="vbox-kernel-module-src-${PV}"
 DESCRIPTION="Kernel Modules for Virtualbox"
@@ -36,7 +36,6 @@ MODULESD_VBOXPCI_ADDITIONS=(
 )
 
 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"
 }
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-6.1.2.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-6.1.6.ebuild
index 79fd2c9e0fc5..6ad5644e2ed2 100644
--- a/app-emulation/virtualbox-modules/virtualbox-modules-6.1.2.ebuild
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-6.1.6.ebuild
@@ -6,7 +6,7 @@
 
 EAPI=7
 
-inherit linux-mod toolchain-funcs user
+inherit linux-mod toolchain-funcs
 
 MY_P="vbox-kernel-module-src-${PV}"
 DESCRIPTION="Kernel Modules for Virtualbox"
@@ -30,7 +30,6 @@ MODULESD_VBOXNETADP_ENABLED="no"
 MODULESD_VBOXNETFLT_ENABLED="no"
 
 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"
 }