gentoo resync : 20.12.2017

2 files changed, 18 insertions, 11 deletions

diff --git a/app-emulation/virtualbox-guest-additions/Manifest b/app-emulation/virtualbox-guest-additions/Manifest
index 891a909da4d0..fa02214a056d 100644
--- a/app-emulation/virtualbox-guest-additions/Manifest
+++ b/app-emulation/virtualbox-guest-additions/Manifest
@@ -5,11 +5,11 @@ AUX virtualbox-guest-additions-8.initd 538 BLAKE2B f720a0f9de10c5240f1ac8a590c4e
 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.28.tar.bz2 116427658 BLAKE2B cf18e3677962b5ae5c32dade4a6054e3bc35d5b4a7422ee77529150a9a55893d88b0b5c73504caa9a7fa58d178788a6383ac933e818bc4e8b972d7f4ac6b8522 SHA512 5c21fd535424d7fd9adbb51894ec6d37ecf00a63a850362bd7b61fedca5031e096641814130a97ad839c0bd7089dc3dc465509615aab2af3c5735ff71005670a
 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.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.28.ebuild 6050 BLAKE2B aa3f0055c92c12ab2361690ea7928f2e2a5b8785811eda4194b82ac9a6d573833082608168767d49c0798bb0e24a24971da46c1833bb2f021ccd9488ca4a0238 SHA512 a2f9afaf104f601a1440580715f13d30b916cd0599631f574e66750acad04abe6ae0531de4f659bfdc8786822d1025b146b50434ec97e1fe76778d54eadde5aa
 EBUILD virtualbox-guest-additions-5.1.30.ebuild 6050 BLAKE2B 2c46676c7e908dcbf180c293552f9b36f53b152de4fa0954de619a94c3be97ece7797c999b37dd0020be7131e9dc2e48fafecce0c0538579217e0daa4e00fed9 SHA512 afa2e7db59c36f9e0d579777d1f446215e2d48b3414ef7ee2ae51e8e464c1f2b51ae4bfcb1b565329c0f41ffc253ec5a76cd87a8d78c1945d87e162e53ac1eba
+EBUILD virtualbox-guest-additions-5.2.2.ebuild 6152 BLAKE2B 5f146f8df88f13991d0332d5b6f573e240041b77450216e917d28773ede08008b3038d2d70644bcfa54c880030fddb299732086403e126acf2839ea84b89c83d SHA512 cb5772b2c311acd106a24358ca9516318c480e133bbc3dfd01f76aaab4adf215db37a1c38afdf70dc88c9ba7642952b20e0cb9e23acb419c1e447cfa40fa4eae
 MISC metadata.xml 407 BLAKE2B f1d23bcb66043219615b3aaf7ead87df8b8c12f09e3a1cd0b919268cc5282f0ebadacfce7860d12715a75209219166f39d6b2b89509e9920dc7c5507db146176 SHA512 e28c65e666d3f78cc8752c3f8af0d7e5494b4a2f93fdc98cf71110424aa9a72b68ee40aa299c46a7048d375a1f52bd0f03efd12d5e88226a4934989e7634afc2
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.1.28.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.2.ebuild
index 3ed0d06ac32a..ac4efcb4574e 100644
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.1.28.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.2.ebuild
@@ -11,14 +11,15 @@ 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"
+	https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-5.1.30-patches-02.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="X"
 
-RDEPEND="X? ( x11-apps/xrandr
+RDEPEND="
+	X? ( x11-apps/xrandr
 		x11-apps/xrefresh
 		x11-libs/libXmu
 		x11-libs/libX11
@@ -30,17 +31,22 @@ RDEPEND="X? ( x11-apps/xrandr
 		x11-libs/libICE
 		x11-proto/glproto )
 	sys-apps/dbus
-	!!x11-drivers/xf86-input-virtualbox"
-DEPEND="${RDEPEND}
-	>=dev-util/kbuild-0.1.9998_pre20131130
+	!!x11-drivers/xf86-input-virtualbox
+	!x11-drivers/xf86-video-virtualbox
+"
+DEPEND="
+	${RDEPEND}
+	>=dev-util/kbuild-0.1.9998.3127
 	>=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} )"
-
+	!X? ( x11-proto/xproto )
+"
+PDEPEND="
+	X? ( x11-drivers/xf86-video-vboxvideo )
+"
 BUILD_TARGETS="all"
 BUILD_TARGET_ARCH="${ARCH}"
 
@@ -64,7 +70,7 @@ src_unpack() {
 
 	# 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"
+	"${S}"/src/VBox/Additions/linux/export_modules.sh "${WORKDIR}/vbox-kmod.tar.gz"
 	unpack ./vbox-kmod.tar.gz
 
 	# Remove shipped binaries (kBuild,yasm), see bug #232775
@@ -93,6 +99,7 @@ src_prepare() {
 	# Remove pointless GCC version check
 	sed -e '/^check_gcc$/d' -i configure || die
 
+	rm "${WORKDIR}/patches/011_virtualbox-5.1.30-sysmacros.patch" || die
 	eapply "${WORKDIR}/patches"
 
 	eapply_user