gentoo resync : 17.10.2017

3 files changed, 8 insertions, 222 deletions

diff --git a/app-emulation/virtualbox-guest-additions/Manifest b/app-emulation/virtualbox-guest-additions/Manifest
index c389a1f5d6df..cbc034069ea6 100644
--- a/app-emulation/virtualbox-guest-additions/Manifest
+++ b/app-emulation/virtualbox-guest-additions/Manifest
@@ -4,15 +4,14 @@ AUX virtualbox-guest-additions-5-localconfig 937 SHA256 eb62978e90ce925df841822c
 AUX virtualbox-guest-additions-8.initd 538 SHA256 6be7c321b362054aefef183f0c4b8404ea64d4232154756ddc79de1fca067952 SHA512 e01579b0ce980517a7b9e163915977a58c73594cf4c8484d20941449b9a21a4346ab1bb031b248ee438b350fa23b4bc78a1d6e501986b329564a4df487f5d3ca WHIRLPOOL 59cf99a3ca4c1df867a1399d6017a8d35ed7b323c698ce076cae4b83f8dc09ff6ece75bf69a37fed579bf9b1761a0064f24d10cdf85e093ad896f745bb42bc0f
 AUX virtualbox-guest-additions.service 411 SHA256 0b50116819c60f27ab0f9b171e00434f0be2cff8e6656af9e00229f6e07c2118 SHA512 b6226146f3591a778551e94ae2661e2ae3c6b761d20600d741eaaa03f43f0a2b841d2a44d9eec3a3768edb23b021cee94c7849d998ee4104ad60dad2df88df83 WHIRLPOOL 1e4e37ba43532340f8a7e344a69241e9e3ec7ce10d07ad3c30edad01270bfa42e8a86f38b48a6d98d0e19f3ddb910740a88e4da9ad23dc879abc2f05ddf4fba0
 AUX xorg.conf.vbox 274 SHA256 69475950240533abd2824a30ff08cc7d3ea246d9601ff7163115f8fc100612fb SHA512 ac2b14970dc6667ceec2dbdae52bc92cbad4aff020898ede156454e8a8a703354f15c7e19cfbd2bdd15e251493fd05cacfe814cabee0f9b4cf155e44860ed4c9 WHIRLPOOL 6bd0dba97e442c831451d58f85e5ce3bdf37fc90254db54cffbdbafe1521464e0e4aed89dd610d432c8b26dc48b98f120fd81594bded2dbb10c5eb7d7b26f938
-DIST VirtualBox-5.0.16.tar.bz2 111062984 SHA256 f5a44d33a1db911f445b2eb2d22d9293a96a535cba488b5a235577ef868fa63c SHA512 3da3a227360fb50d299e99770378f65e8cb99525377343fa8faff2360be66643d46f68323d6a8b8d4d26182082f171bb35ab2497167bf6df18827a5ea7742074 WHIRLPOOL ea709057c588f28820790c2b193decba9ee0c57e0f82aa4361ca87aef661315182e18b5ee29558e47ed92f6037eb91befa5390680661a7b9f2248c7819b4a85c
-DIST VirtualBox-5.0.40.tar.bz2 112997095 SHA256 e4275b7ada40b358e6e3bd1231b3a320aa06c72ae301283cac5adb42eaa8e4b5 SHA512 70cd4355591c5aed82148954bf55637a5dcdd1a5177dba78192e7c6eadfbf3f7023f352ba8f89d9eb3c3fc55b049f7c76af6bc94e04d1766d7fbe39e51a1393c WHIRLPOOL 9f471e63814c9d48063857f3b95410f5acdd4a3bd2716c525f2449f1eae95d0e91dbe5422374a49f31f8219daa155f716455f0259d131d93afb5cd9e13a7d467
 DIST VirtualBox-5.1.26.tar.bz2 115915813 SHA256 b5715035e681a11ef1475f83f9503d34a00f0276b89c572eebec363dda80c8a9 SHA512 680e9646a51a0a5923b3ded10007ee1c1e2a41c6d8a961d2b2540db6578bed2847154f4cac87e3cfe1118a62595b47c7df99da854f6c340e173b9eb8cacf2add WHIRLPOOL 9d7950ec3ec2cd9b8aaa0ea319f9f5089eed7d2cd2879d313426b448a27570b5582235aa46c5ad5a0fd4d0b967f8d58a963f001549232136d6a8609262af71d0
 DIST VirtualBox-5.1.28.tar.bz2 116427658 SHA256 ce7d4bf6535f70e3214abeb4866f7a8634aa3c7b6dedf8825e6ad80bd821398d SHA512 5c21fd535424d7fd9adbb51894ec6d37ecf00a63a850362bd7b61fedca5031e096641814130a97ad839c0bd7089dc3dc465509615aab2af3c5735ff71005670a WHIRLPOOL 2e3fbeb39083c2e69fb23200570781a8845780a6295553af48fa9155db132e37d0fc2fb26e8a45c52864f69f02e8a0d0cbd4c895e5fbb87ab9a51dd60c7c7904
+DIST VirtualBox-5.1.30.tar.bz2 116510730 SHA256 6059b0986c9cdacc533177867634a76331ceccdcd46dddd111a50d1c42846d0b SHA512 6c44d9593f4815644a484b306e621fe7eca224002f85d89c00f2470300f2c78dbfe50ffda61d2c2465df14ca77c70a2ab86f1a05116feeee9f5833857eb18dee WHIRLPOOL dc1701211cc8247cb23800557cf7e2d34e5063806c5b22cd2c38454531ca390902fd6a764bfc17d14d33ec055de2d924853c9ed6c3ba29fb7998455f06109b6f
 DIST virtualbox-5.1.24-patches-01.tar.xz 2708 SHA256 8ea5e08da07d555a4868abf6f4d689c2f6695bdb773010a01915fcc6c354f361 SHA512 0028e593818013f809831ac5a73eec63988c0aefb4b309fb3c928efbea8db8b8f46bd7c82f156396adc704f0567474df262dfe9bb6e09af0b2c23528fe2c6e2d WHIRLPOOL 5a1af78c2767608d2b1c2a4b262dbce038d2b6ed9d0499eb60ac1eb64fd6b832efdbafc2b85881ac67efd8794adcc3490fcbf61b74ad7ae576d52e8aff597b04
-EBUILD virtualbox-guest-additions-5.0.16.ebuild 5822 SHA256 ff1cd0ddf3977aa913d64fb1ee609da761b85d9f23914a8b2246fb67c4c85d44 SHA512 c9050e6db8d994590ca6bc1451faa8c27de0f3e5eac28fc6e549896602c3bdc3fd5d3ed1825ecd570d297597082f3955a86d0fb4d68b97a0621d62a539d91d4d WHIRLPOOL b78a14608827880d10a2f89f462593676e1dffd59e90d0e00aceaa319b4af9a05311cdfb95ffff423693b8ab7f0f5df3b511ed61cf8c1074600b0956e90b3dfe
-EBUILD virtualbox-guest-additions-5.0.40.ebuild 5923 SHA256 5bd5d48347467f7f8ee38f7164128f33770febc85dbd8fa1029c415ca586d434 SHA512 d772c07861a97daefcc64df711d7bde81916a3c1bacb9a4fa4611b894bb996f8f5a4a5789d3248f486c516e74cf7edfc49fe8bd7a27c62c673127e66c3151975 WHIRLPOOL b6504e6307713ef44fb2caeb382a42a625c24a76296596fdb235545584a287f9e469d426927441055927c1b638293a74b7a001c31ded76bde02b411877f7d744
+DIST virtualbox-5.1.30-patches-02.tar.xz 2608 SHA256 25922641e19911fe41d63a348702ed2dcab2ef79379ea236c5da6c36f77a75a5 SHA512 8a490f7cc44e40262fc47819736251c177adb635256794e9500f52729197c85211d5b0c0d000268089953a4c185872a8ba03c5d42df6b80f05eac8b81335320a WHIRLPOOL 3a7ebadf5cc8ba71fe4e4fe43d529ce72dbe95c40838d66112418ad335cb1b1cf7b6aa37fa71ccc6d50044486cb0eef52e59567530935e5a0ed83e9c3f67ec36
 EBUILD virtualbox-guest-additions-5.1.26.ebuild 6048 SHA256 62d3139ed1475c02689e1965a76a56ce9b1eccd2d08467065716862eacdc6494 SHA512 490852f4835df995de2160e565d9e87bfb0b51c06b3bb30a2a7abc871d75d2724e7edd820a600b0455adb6d2fad7a39d1ed3a84be538c0d535a011ea8c026578 WHIRLPOOL 8137ae3fb46e651c38efef0cab258a5ad23a40a901ad99cafdfaf4b6ca5b315e7faa99fa4687ba3432af2de913e70dbff1ca964f1da8780d2a2baaeadfa208b7
 EBUILD virtualbox-guest-additions-5.1.28.ebuild 6050 SHA256 ad1f1c8cd3333d9f4ff5e2e36ada65ac0912374f20df98431636bb746d5f8db8 SHA512 a2f9afaf104f601a1440580715f13d30b916cd0599631f574e66750acad04abe6ae0531de4f659bfdc8786822d1025b146b50434ec97e1fe76778d54eadde5aa WHIRLPOOL ec417545417659321901ea38b109b580626bdb2fa17dfe84254e7f30b802ec572a90dd34d5f06a73b9c258638332b4e6e549ef32b57b535f2c6ed9a3e978b6a8
+EBUILD virtualbox-guest-additions-5.1.30.ebuild 6050 SHA256 4cd9684008607fbd0909923bb9313097c1b6fbd641df6d58aac8d6d57a9dd3f2 SHA512 afa2e7db59c36f9e0d579777d1f446215e2d48b3414ef7ee2ae51e8e464c1f2b51ae4bfcb1b565329c0f41ffc253ec5a76cd87a8d78c1945d87e162e53ac1eba WHIRLPOOL 391bd1f089c7bd8b6c5d9f146b085fdc5b12a476e74162eb287602ba2fe30073d8a456f0b14f64809ad6dedd14831f099a28ccb92814ed6feaaa7e347c29c0c5
 MISC ChangeLog 11970 SHA256 d77a0dda1714fe3b9ea29b755e8687253d5ae1784c99749adcbeb0d8841c0888 SHA512 ad4718081ccff3c8c0b3997bfe5939731537f57c214242481cdd61437cd62d7d8bc42d0959fafd573f8f714d8e42fd2d097b0ecf334a4c26e96a2098a901ae93 WHIRLPOOL 141849515d9dcbdd018e943c906ba4b1862228f9051e7eb8c1eb559ff9adc5e84111c4ed6e4ec5b4e18d60f50e28ed6ee138adb66246993982df4eea4567eb2b
 MISC ChangeLog-2015 39779 SHA256 8c71f1b8454c0467a5d3b7e4ea66faac6a8247faff68a6b7af629f69aeca9d58 SHA512 90c70074b7227f2314bf820a832538c308d2c2c063a6e4a6fe5e1ed7dac9f5bc9fecfb02d9f2e7e25d2366a644861c177945ccbcbddd1111939dea28c1b0146a WHIRLPOOL 6487ee2e3d2a1b3abb9d2f37ac5638a61eaa8040a937a7548f6a67db8ddb8b680eb22c409592c1a0e66d656cdd82f0ee8f283bff530773897c8cbccdcd9bdd97
 MISC metadata.xml 407 SHA256 a07752ac478a75b8186129fcab7d7fc7b239adf7a03d52a275a1d61c66b54aa6 SHA512 e28c65e666d3f78cc8752c3f8af0d7e5494b4a2f93fdc98cf71110424aa9a72b68ee40aa299c46a7048d375a1f52bd0f03efd12d5e88226a4934989e7634afc2 WHIRLPOOL 38d004ad7163b0ba06c7b86c4e02612a94ff449f1d8a0be61fe705bd1a4bd8c88c8cab27fd5103110663f7b0de9f131b204aa92b7c3584cef93f0bde957c7248
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.0.16.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.0.16.ebuild
deleted file mode 100644
index 8f9b4fb18a6b..000000000000
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.0.16.ebuild
+++ /dev/null
@@ -1,216 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils linux-mod systemd user toolchain-funcs
-
-MY_PV="${PV/beta/BETA}"
-MY_PV="${MY_PV/rc/RC}"
-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"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="X"
-
-RDEPEND="X? ( ~x11-drivers/xf86-video-virtualbox-${PV}
-		x11-apps/xrandr
-		x11-apps/xrefresh
-		x11-libs/libXmu
-		x11-libs/libX11
-		x11-libs/libXt
-		x11-libs/libXext
-		x11-libs/libXau
-		x11-libs/libXdmcp
-		x11-libs/libSM
-		x11-libs/libICE
-		x11-proto/glproto )
-	sys-apps/dbus
-	!!x11-drivers/xf86-input-virtualbox"
-DEPEND="${RDEPEND}
-	>=dev-util/kbuild-0.1.9998_pre20131130
-	>=dev-lang/yasm-0.6.2
-	sys-devel/bin86
-	sys-libs/pam
-	sys-power/iasl
-	X? ( x11-proto/renderproto )
-	!X? ( x11-proto/xproto )"
-
-BUILD_TARGETS="all"
-BUILD_TARGET_ARCH="${ARCH}"
-MODULE_NAMES="vboxguest(misc:${WORKDIR}/vboxguest:${WORKDIR}/vboxguest)
-		vboxsf(misc:${WORKDIR}/vboxsf:${WORKDIR}/vboxsf)"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	linux-mod_pkg_setup
-	BUILD_PARAMS="KERN_DIR=${KV_OUT_DIR} KERNOUT=${KV_OUT_DIR}"
-	enewgroup vboxguest
-	enewuser vboxguest -1 /bin/sh /dev/null vboxguest
-	# automount Error: VBoxServiceAutoMountWorker: Group "vboxsf" does not exist
-	enewgroup vboxsf
-}
-
-src_unpack() {
-	unpack ${A}
-
-	# 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"
-	unpack ./vbox-kmod.tar.gz
-
-	# Remove shipped binaries (kBuild,yasm), see bug #232775
-	cd "${S}"
-	rm -rf kBuild/bin tools
-}
-
-src_prepare() {
-	# PaX fixes (see bug #298988)
-	pushd "${WORKDIR}" &>/dev/null || die
-	eapply "${FILESDIR}"/vboxguest-4.1.0-log-use-c99.patch
-	popd &>/dev/null || die
-
-	# Disable things unused or splitted into separate ebuilds
-	cp "${FILESDIR}/${PN}-5-localconfig" LocalConfig.kmk || die
-	use X || echo "VBOX_WITH_X11_ADDITIONS :=" >> LocalConfig.kmk
-
-	# stupid new header references...
-	for vboxheader in {product,revision,version}-generated.h ; do
-		for mdir in vbox{guest,sf} ; do
-			ln -sf "${S}"/out/linux.${ARCH}/release/${vboxheader} \
-				"${WORKDIR}/${mdir}/${vboxheader}"
-		done
-	done
-
-	# Remove pointless GCC version check
-	sed -e '/^check_gcc$/d' -i configure || die
-
-	eapply_user
-}
-
-src_configure() {
-	# build the user-space tools, warnings are harmless
-	local cmd=(
-		./configure
-		--nofatal
-		--disable-xpcom
-		--disable-sdl-ttf
-		--disable-pulse
-		--disable-alsa
-		--with-gcc="$(tc-getCC)"
-		--with-g++="$(tc-getCXX)"
-		--target-arch=${ARCH}
-		--with-linux="${KV_OUT_DIR}"
-		--build-headless
-	)
-	echo "${cmd[@]}"
-	"${cmd[@]}" || die "configure failed"
-	source ./env.sh
-	export VBOX_GCC_OPT="${CFLAGS} ${CPPFLAGS}"
-}
-
-src_compile() {
-	MAKE="kmk" \
-	emake TOOL_YASM_AS=yasm \
-	VBOX_ONLY_ADDITIONS=1 \
-	KBUILD_VERBOSE=2
-
-	# Now creating the kernel modules. We must do this _after_
-	# we compiled the user-space tools as we need two of the
-	# automatically generated header files. (>=3.2.0)
-	linux-mod_src_compile
-}
-
-src_install() {
-	linux-mod_src_install
-
-	cd "${S}"/out/linux.${ARCH}/release/bin/additions || die
-
-	insinto /sbin
-	newins mount.vboxsf mount.vboxsf
-	fperms 4755 /sbin/mount.vboxsf
-
-	newinitd "${FILESDIR}"/${PN}-8.initd ${PN}
-
-	insinto /usr/sbin/
-	newins VBoxService vboxguest-service
-	fperms 0755 /usr/sbin/vboxguest-service
-
-	insinto /usr/bin
-	doins VBoxControl
-	fperms 0755 /usr/bin/VBoxControl
-
-	# VBoxClient user service and xrandr wrapper
-	if use X ; then
-		doins VBoxClient
-		fperms 0755 /usr/bin/VBoxClient
-
-		pushd "${S}"/src/VBox/Additions/x11/Installer &>/dev/null \
-			|| die
-		newins 98vboxadd-xclient VBoxClient-all
-		fperms 0755 /usr/bin/VBoxClient-all
-		popd &>/dev/null || die
-	fi
-
-	# udev rule for vboxdrv
-	local udev_rules_dir="/lib/udev/rules.d"
-	dodir ${udev_rules_dir}
-	echo 'KERNEL=="vboxguest", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
-		>> "${D}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \
-		|| die
-	echo 'KERNEL=="vboxuser", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
-		>> "${D}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \
-		|| die
-
-	# VBoxClient autostart file
-	insinto /etc/xdg/autostart
-	doins "${FILESDIR}"/vboxclient.desktop
-
-	# sample xorg.conf
-	insinto /usr/share/doc/${PF}
-	doins "${FILESDIR}"/xorg.conf.vbox
-
-	systemd_dounit "${FILESDIR}/${PN}.service"
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-	if ! use X ; then
-		elog "use flag X is off, enable it to install the"
-		elog "X Window System video driver."
-	fi
-	elog ""
-	elog "Please add users to the \"vboxguest\" group so they can"
-	elog "benefit from seamless mode, auto-resize and clipboard."
-	elog ""
-	elog "The vboxsf group has been added to make automount services work."
-	elog "These services are part of the shared folders support."
-	elog ""
-	elog "Please add:"
-	elog "/etc/init.d/${PN}"
-	elog "to the default runlevel in order to start"
-	elog "needed services."
-	elog "To use the VirtualBox X driver, use the following"
-	elog "file as your /etc/X11/xorg.conf:"
-	elog "    /usr/share/doc/${PF}/xorg.conf.vbox"
-	elog ""
-	elog "Also make sure you use the Mesa library for OpenGL:"
-	elog "    eselect opengl set xorg-x11"
-	elog ""
-	elog "An autostart .desktop file has been installed to start"
-	elog "VBoxClient in desktop sessions."
-	elog ""
-	elog "You can mount shared folders with:"
-	elog "    mount -t vboxsf <shared_folder_name> <mount_point>"
-	elog ""
-	elog "Warning:"
-	elog "this ebuild is only needed if you are running gentoo"
-	elog "inside a VirtualBox Virtual Machine, you don't need"
-	elog "it to run VirtualBox itself."
-	elog ""
-}
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.0.40.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.1.30.ebuild
index 6e24c6b0f084..d37a6f291d30 100644
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.0.40.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.1.30.ebuild
@@ -10,11 +10,12 @@ MY_PV="${MY_PV/rc/RC}"
 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"
+SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2
+	https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-5.1.30-patches-02.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="X"
 
 RDEPEND="X? ( x11-apps/xrandr
@@ -92,6 +93,8 @@ src_prepare() {
 	# Remove pointless GCC version check
 	sed -e '/^check_gcc$/d' -i configure || die
 
+	eapply "${WORKDIR}/patches"
+
 	eapply_user
 }