gentoo resync : 19.04.2018

3 files changed, 70 insertions, 3 deletions

diff --git a/app-emulation/virtualbox-modules/Manifest b/app-emulation/virtualbox-modules/Manifest
index d3a1036e7bbd..f246f9ad9f9b 100644
--- a/app-emulation/virtualbox-modules/Manifest
+++ b/app-emulation/virtualbox-modules/Manifest
@@ -5,10 +5,12 @@ AUX virtualbox-modules-5.2.8-pax-const.patch 1728 BLAKE2B 1a2e8c5946af5abcf443c8
 AUX virtualbox.conf 38 BLAKE2B 853f2ba0ac1627100241e778fa6c35ff4fc86e8c9c753f8aa23cb053ffacf966c131c5630d1fafd481d7b057acc3e9d6f8f1a22766db5d1cf61fffa38de7c01b SHA512 b61936fff57426d31efa6928eadb572cafe40a65d3e31a0eecb53dc784ba9d0a9e0ad5e419df74418b977f89c17873240c38e2ada95949e5252d879110d6094a
 DIST vbox-kernel-module-src-5.1.32.tar.xz 626600 BLAKE2B eb3243d62d1a22f41f5ea2307b13a3f5ce17a19edcecb0340f94d34995e557b016195443a53edc9d68a313d064008e5af04c7fff28540ec513c6e9a5955e02e0 SHA512 10ead68e53ae6bd72e39b31d536fc36e0999fe506a6d7fd6a6f9e462d539213ad65deb56e2b926baa5cc4b16fb4071d89e105889e873fda0e4a1f20387a7cd39
 DIST vbox-kernel-module-src-5.1.34.tar.xz 627576 BLAKE2B c1bd2af511824e5a74c3b85b73b7bc1664dd3651db3c17bbcba06b5ef8d9ba11c1a5c92bf28f443fb17aee1d057310f20a62c1a4608ce84eb087de61cbe67c25 SHA512 6176036a22d316e15c6560c124cfce9e93c6508a78e189bbe8e431ccf006b74d5f34ea747c9ca307bbd90e0c6fa414056ae0b56a5aa8124c2263de3d0dbf97d1
-DIST vbox-kernel-module-src-5.2.6.tar.xz 635096 BLAKE2B 8c168b9e1d3de395ef663ca81edf63939cb7670f769995c20f9d4cb4f87194b22812707bfd62d52dd85e19de2562c27c182aad22f40928358cf07a0c5ac15d79 SHA512 c85f94e08357a11574af306b00e71c445b80ef6dea6c47d9cf1003c0d9f36d265ebadd2ae27b3dd96f41cc544e501d3eb0551559bebf25d35b9861a282f489bc
+DIST vbox-kernel-module-src-5.1.36.tar.xz 628368 BLAKE2B 49a3dfc4ff573f793eefcfd9b645af6fa6fc63b54475921064be146d3d4bf4db61f48d82f62d65811597fa12b88331153f7491890527fde76f41426355552abb SHA512 c69739c72a5555fc3bca90186129fa4eeb5bd930c4396b416a8a88e6f84bcd9e7498a9bbc9381da648cf87d601d98249feac2e4de6d93d8b7aba46b22d3ec40f
+DIST vbox-kernel-module-src-5.2.10.tar.xz 637080 BLAKE2B 303fd6191247df0560f161b12665b95f372de1a18755b937f7af8fecab6669337ccaf22f635219080953795cb9bc4c80bc21a8273e28b5cf8ba3ba9cf930e2cd SHA512 56e837f19a63856dbd57379dd78bf46b90ddeb3a60df9d18a46a6480c7021040b7674599fd0b48a9c3db241756539bfaa88becf6e42acf8725e2bc89e3879773
 DIST vbox-kernel-module-src-5.2.8.tar.xz 636172 BLAKE2B 0a0be16ee830dbf60e9bd8e0aa977ad020374d65c4ea19689bd20f7399da87633ac9ef57e2297963937e4d5eb82173a50beacd8ddd1b54943fe8d24fe723e3f4 SHA512 8875048d827ebbedec37864e219033305a228903b01d7ca22b371b02de9b23099d3bc76ddef4887b633f1215e73daa5db6e35c8d2e21f90200f439b15792d05f
 EBUILD virtualbox-modules-5.1.32.ebuild 1585 BLAKE2B 880c04c95561aec23bbb9c2324a5cec2b17bd9fc77555d595560a85c5e3df42383ef00ee8cd488caabcc205eedfb7da3ef6e549b84d3abd248e7fd2c1979a7eb SHA512 5b48e0068a2e4012549465b5989c7563e135c9db4671eca02bccf75277f2aaa9ed74d3f3d58642b92403611729f5d9a259d262a32ebc499cabc976deb2d617b3
 EBUILD virtualbox-modules-5.1.34.ebuild 1587 BLAKE2B 234cd56aff2a2cc66f52538709a09205aad5278748ba3ec8004622a34a18a9e2d241d87cc1f50f6dffcc6dc0073327581eebdadf5e77c494ce3402fb3c6cf123 SHA512 dbe458080d79628c642890477282ad14ece9a5e6ef3a67af2d8609d786e8dc732bcb1715e9b7f4e6b8f33e0405c10411911f73cc3076f0c72e23fb2077577583
-EBUILD virtualbox-modules-5.2.6.ebuild 1345 BLAKE2B c88b63cbc94e33af18f76bac3ec977eca0fca315e799b584a6337bba8c8116e58264ced4608df2b7e8c2e38823b8bbf9c082eeea085cb21a3aa9a4958566ccbe SHA512 1f239cc64421643fa6dfd28da712f9e352810b6e57d1b2e205534c3be583b405aee622d473be05d38ac5e85588350ada13777897250b50b83a0deee7b0c3dbde
+EBUILD virtualbox-modules-5.1.36.ebuild 1587 BLAKE2B 234cd56aff2a2cc66f52538709a09205aad5278748ba3ec8004622a34a18a9e2d241d87cc1f50f6dffcc6dc0073327581eebdadf5e77c494ce3402fb3c6cf123 SHA512 dbe458080d79628c642890477282ad14ece9a5e6ef3a67af2d8609d786e8dc732bcb1715e9b7f4e6b8f33e0405c10411911f73cc3076f0c72e23fb2077577583
+EBUILD virtualbox-modules-5.2.10.ebuild 1349 BLAKE2B aedb499c747c2d989090144f652365ad550f578edb98d454c6e34e3efb3d86a780f12c2b09e382c685ce103ac94419432b83e163b64d68ade370898eb4dc2ed8 SHA512 8f377b5f4ab0f8c1ab98b93cfd00480a91033596ba59a604c9af00f857012f432c41a5b097b795182699ae9869eb9090b788dbdb2addbca1f0c0148cb6c09b55
 EBUILD virtualbox-modules-5.2.8.ebuild 1349 BLAKE2B aedb499c747c2d989090144f652365ad550f578edb98d454c6e34e3efb3d86a780f12c2b09e382c685ce103ac94419432b83e163b64d68ade370898eb4dc2ed8 SHA512 8f377b5f4ab0f8c1ab98b93cfd00480a91033596ba59a604c9af00f857012f432c41a5b097b795182699ae9869eb9090b788dbdb2addbca1f0c0148cb6c09b55
 MISC metadata.xml 502 BLAKE2B 043fc7e11b803453d5c193562322ade34ce17f5966c5ba6f557c605174bab43a47fe374684b7f3b10a87d92429c70006abc2759169124c0b29ad28ad4c181b46 SHA512 399c87acfd980b7dc29b42d7eeeead868bc8e9efc085f23aa97507d9da6f4af272e747172c4d5d6c1dfe15dc125193a72a5d6ca47ec82615345e239ff26246e4
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-5.1.36.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-5.1.36.ebuild
new file mode 100644
index 000000000000..36cdb4815a37
--- /dev/null
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-5.1.36.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2018 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="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"
+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
+		eapply "${FILESDIR}"/${PN}-4.1.4-pax-const.patch
+	fi
+
+	if kernel_is -ge 4 14 0 ; then
+		eapply "${FILESDIR}"/${PN}-5.1.30-udp.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
+}
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-5.2.6.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-5.2.10.ebuild
index 91e66b6535c9..81bd3967d83a 100644
--- a/app-emulation/virtualbox-modules/virtualbox-modules-5.2.6.ebuild
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-5.2.10.ebuild
@@ -39,7 +39,7 @@ pkg_setup() {
 
 src_prepare() {
 	if use pax_kernel && kernel_is -ge 3 0 0 ; then
-		eapply "${FILESDIR}"/${PN}-4.1.4-pax-const.patch
+		eapply -p0 "${FILESDIR}"/${PN}-5.2.8-pax-const.patch
 	fi
 
 	default