gentoo (leap year) resync : 29.02.2020

4 files changed, 29 insertions, 26 deletions

diff --git a/app-emulation/virtualbox-modules/Manifest b/app-emulation/virtualbox-modules/Manifest
index 298578c94e12..b5c80a894adc 100644
--- a/app-emulation/virtualbox-modules/Manifest
+++ b/app-emulation/virtualbox-modules/Manifest
@@ -5,17 +5,15 @@ AUX virtualbox-modules-6.0.14-kernel-5.4_rc6.patch 13688 BLAKE2B 15e900c3bb8d3d1
 AUX virtualbox.conf 38 BLAKE2B 4f03cb09a1cca36013beb2a38220115d63510fd0aa63e2df1f0dc755a9162f7c2efed32d8f9c98fcc1e36d48067471085d5b038c6e8b3118508fbaaaab3790f7 SHA512 63eba0963b3344ea7e7a0035560406899d878a0761cddef9853bec95deb9812b221e98f446f240070d6448d61d6ecbcf7a990bcd52863660e8f21cf9a98c0e1d
 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-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
+DIST vbox-kernel-module-src-6.1.4.tar.xz 664412 BLAKE2B b4cfe5b2792c8f5dc2bf6038f69e32d07aaead358b144e154806f404bcc0ffbb72d470db265b96f41ca714edc0588ce06748054b8358675c24848614253a7cfb SHA512 bb247a8d2450694937095bc9c263554f805c51676e2da726f124ce4f775c69bedab95286e8d00686e04c1d8fff67f6335aa29f51a0c0ec00b862ad4e56fe290c
 EBUILD virtualbox-modules-5.2.32.ebuild 1203 BLAKE2B 564094a44633e5193d26e88bc866b0354a3dbec67d08c6b09869c8863487fe30f939f9039a6f23fb9061e200ea428c728fa689e6db643c1710716d565bac42ed SHA512 f3ab32231d5c050d39bae1af958de61e4964b2146aed215d6eae95b96a3a2428b8411b2f9f7bf9f0e81259120f2229b81498cb8b4d9e7d18d511bfb223d4f16c
-EBUILD virtualbox-modules-5.2.34.ebuild 1205 BLAKE2B 347dfeb77f55c891218d876ac752fe0406b05f637cdc9de4d1ba73e47978742288e4d93bd4b57917cbf536c7a4448dbcd12fa30d9519d3832bcbafc18e902f0b SHA512 1f8f1404a522f2be006532c219a0c7ee65196bc32a00798631e1876c14446a79ce18ea4d4c93a8e96be4389fcc4e5f0ed50b61fbd54d1748192939cdb299250d
 EBUILD virtualbox-modules-5.2.36.ebuild 1472 BLAKE2B 76c697e33543678cae5e7c1840d5e2307378c453924a2c42d68e2adb4570b2531d31659e6166a975d2b987e80e61299d6480aa214601400704f56e45a3542775 SHA512 7880a11d683190338a388e488cfcb6a56ebb352e07f6433709f1254d0dbc113ac23abcfb1e87ead4eaaf35b27c85d45d122e56179b7d2781a38c47548ba1854b
-EBUILD virtualbox-modules-6.0.14.ebuild 1315 BLAKE2B 9171db15b195eb06cab18745bf1f1f591db74ef4f68c2f5487ddfe78a933a649ee8a6ca4a2d766481ca24dc2d73f8ec994b4733761d4970cedc59a44359f4af5 SHA512 21b6c8193920a77470e362790f4077931262bab8a63827ba66f27f7b3108c17b6f46b266823b385680697fd57d23615c09a5a6b22ca5f8658b95a08f6d1cb10e
+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.0.ebuild 1383 BLAKE2B 49ec09e740e17cf56540b68de9566518411562e638eb9bbe44f76edfc08743c270e14fb34249d14fba6407701cca29e16d23af20af6e51003db45f3d34437fb1 SHA512 dc43c637e81df020878240a9122ced15c5b53276df1379e1d87c6c6b0c365098a1058e05c3bcd02950a6dc5bbb8063b626a20a761365db07d3c48987398e2e7e
 EBUILD virtualbox-modules-6.1.2.ebuild 1445 BLAKE2B 81a87a298473d95592e4e462eb6c6c3bac473c432b1c35afa2e3780ccfb7895f6c1459d423496565605143cc69bf447f62f176d336fbdcb91002b8421e53db33 SHA512 eab1130033e8ce3cc8900d23260c97d963ebd6b5fe3a10bcad6320e454307350ed17e13d14085edb425d8226240c1648a5cd1b5a63887c3988a085ae9ee4ebe5
+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
 MISC metadata.xml 353 BLAKE2B d7de13b3a8966ab3bca54ae77f7f6c7dfd57f2c5941f09ab1b5f79ac798687ffaaa183afdf9c034a9d50fda8507a3aaa2ef0c11d0fdfa6e09a55a1bdb9f30f4a SHA512 40029c9a246dde5ed51119f42ec5448b7ae08a47ee4d6be201fef282305c809d7d3182abf807dd2444ffe1a980abcd670878567d948bcd3661a55c6848a37000
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-5.2.34.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-6.0.16-r1.ebuild
index db660e592340..0dac94ce21ac 100644
--- a/app-emulation/virtualbox-modules/virtualbox-modules-5.2.34.ebuild
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-6.0.16-r1.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"
@@ -15,6 +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 ~x86"
 IUSE="pax_kernel"
 
@@ -23,11 +24,18 @@ 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})"
+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"
 }
@@ -43,9 +51,5 @@ src_prepare() {
 src_install() {
 	linux-mod_src_install
 	insinto /usr/lib/modules-load.d/
-	doins "${FILESDIR}"/virtualbox.conf
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
+	newins "${FILESDIR}"/virtualbox.conf-r1 virtualbox.conf
 }
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-6.0.14.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-6.1.4-r1.ebuild
index fc87286d6f93..6ad5644e2ed2 100644
--- a/app-emulation/virtualbox-modules/virtualbox-modules-6.0.14.ebuild
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-6.1.4-r1.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"
@@ -16,7 +16,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 ~x86"
+KEYWORDS="~amd64"
 IUSE="pax_kernel"
 
 RDEPEND="!=app-emulation/virtualbox-9999"
@@ -24,15 +24,12 @@ 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})"
-
-PATCHES=(
-	"${FILESDIR}/${P}-kernel-5.4_rc6.patch"
-)
+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
 	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"
 }
@@ -48,9 +45,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
 }
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-6.1.0.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-6.1.4.ebuild
index d725a300fd15..79fd2c9e0fc5 100644
--- a/app-emulation/virtualbox-modules/virtualbox-modules-6.1.0.ebuild
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-6.1.4.ebuild
@@ -24,8 +24,10 @@ 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})"
+MODULESD_VBOXDRV_ENABLED="yes"
+MODULESD_VBOXNETADP_ENABLED="no"
+MODULESD_VBOXNETFLT_ENABLED="no"
 
 pkg_setup() {
 	enewgroup vboxusers
@@ -49,6 +51,6 @@ src_install() {
 
 pkg_postinst() {
 	# Remove vboxpci.ko from current running kernel
-	find /lib/modules/${KV_FULL}/misc -type f -name "vboxpci.ko" -delete || die
+	find /lib/modules/${KV_FULL}/misc -type f -name "vboxpci.ko" -delete
 	linux-mod_pkg_postinst
 }