commit:     513442f7a7c0593bbffe5075731ca43925d35f0e
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Nov  1 15:34:36 2016 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Nov  1 15:34:57 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=513442f7

virtualbox guest packages: Bump to versions 5.1.6 and 5.1.8

Package-Manager: portage-2.3.2
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 app-emulation/virtualbox-guest-additions/Manifest  |   2 +
 .../virtualbox-guest-additions-5.1.6.ebuild        | 218 ++++++++++++++++++++
 .../virtualbox-guest-additions-5.1.8.ebuild        | 218 ++++++++++++++++++++
 x11-drivers/xf86-video-virtualbox/Manifest         |   2 +
 ...ideo-virtualbox-5.1.4-Makefile.module.kms.patch |  11 ++
 .../xf86-video-virtualbox-5.1.6.ebuild             | 220 +++++++++++++++++++++
 .../xf86-video-virtualbox-5.1.8.ebuild             | 220 +++++++++++++++++++++
 7 files changed, 891 insertions(+)

diff --git a/app-emulation/virtualbox-guest-additions/Manifest 
b/app-emulation/virtualbox-guest-additions/Manifest
index 70f7832..05aac7a 100644
--- a/app-emulation/virtualbox-guest-additions/Manifest
+++ b/app-emulation/virtualbox-guest-additions/Manifest
@@ -2,3 +2,5 @@ DIST VirtualBox-4.3.38.tar.bz2 98437150 SHA256 
36f16d435acf04c1dce81df08ba0b522b
 DIST VirtualBox-4.3.40.tar.bz2 98760522 SHA256 
4bbea49ee1eaa600db7af64b05c8ce6a1f7585de08f4f85cd7b6f0f7a798bcc6 SHA512 
9af5266587206795b685f642633966d2d380130c559f64ce61d81137258b71fd7dfb9b97d67f54ddc2482c44bd226dee02b8ee1fb5f0ce0ec2044cfa1d364260
 WHIRLPOOL 
f0687e094f35af262c0e64a0859d95adc1a8becd434f73da8a0c952875bdc875210cb05040de868dc2d43626168ff3e220069b3976e58ec727fead9366d5c9dc
 DIST VirtualBox-5.0.16.tar.bz2 111062984 SHA256 
f5a44d33a1db911f445b2eb2d22d9293a96a535cba488b5a235577ef868fa63c SHA512 
3da3a227360fb50d299e99770378f65e8cb99525377343fa8faff2360be66643d46f68323d6a8b8d4d26182082f171bb35ab2497167bf6df18827a5ea7742074
 WHIRLPOOL 
ea709057c588f28820790c2b193decba9ee0c57e0f82aa4361ca87aef661315182e18b5ee29558e47ed92f6037eb91befa5390680661a7b9f2248c7819b4a85c
 DIST VirtualBox-5.0.20.tar.bz2 111231246 SHA256 
af9c0787aae22964a1192cefbf9aa91a40c1d41e5fea485adebf09ab922d4c2b SHA512 
a039455eed3715b9aa42e2dc6b65ea68b27899c0bcf0065a93c53d1093cce56ebf8a6982cd804208ef9e51794eab9c5c4f3b20550d41532fd4addbd7afda0f8e
 WHIRLPOOL 
f74f0a910e5e3f7b1704f57e9831f88b1036efbc61e3b97779f5b2a337ad70d55638b59f356c769d4b6bfd5955348d490f5080b04a3f494f25eb176944756cfd
+DIST VirtualBox-5.1.6.tar.bz2 114669517 SHA256 
2e0112b0d85841587b8f212e6ba8f6c35b31e1cce6b6999497dc917cd37e6911 SHA512 
7b10c203692a091b3de8dda147b386e17fa7d2bdb56031163e0551e54c1ff6a8e953361d51cc6f7bb6978544a6517e843b446e866aa1fa6f96b4677dda27daa4
 WHIRLPOOL 
ba6ea523dc06622854b304b408f2ce402d164ae4dbc5eeb4cc675c3e4c7d8e12db1a3bcee7d19f67d274ff92b32e143c111d5d732b463c48d72d4036910ce141
+DIST VirtualBox-5.1.8.tar.bz2 114688166 SHA256 
e447031de468aee746529b2cf60768922f9beff22a13c54284aa430f5e925933 SHA512 
178299173ee0062e23aee779faa893a42815d17163eab9ba2ed8b46be63a7110fe1690792de21514dc05ccd5a1752ea0f11357220e0e6f91f101dea3416e819c
 WHIRLPOOL 
20ea8d253d177fd11c4349656aaa0f87f0fb76018511b345e85800d4dd8ab1e2e05c300a1f932670e5f5fac6ea547bfaa0a52b8526c4f363358911c770444a81

diff --git 
a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.1.6.ebuild
 
b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.1.6.ebuild
new file mode 100644
index 00000000..99fe674
--- /dev/null
+++ 
b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.1.6.ebuild
@@ -0,0 +1,218 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 limitations in check_gcc()
+       sed -e 
"/\s*-o\s*\\\(\s*\$cc_maj\s*-eq\s*[5-9]\s*-a\s*\$cc_min\s*-gt\s*[0-5]\s*\\\)\s*\\\/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.1.8.ebuild
 
b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.1.8.ebuild
new file mode 100644
index 00000000..99fe674
--- /dev/null
+++ 
b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.1.8.ebuild
@@ -0,0 +1,218 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 limitations in check_gcc()
+       sed -e 
"/\s*-o\s*\\\(\s*\$cc_maj\s*-eq\s*[5-9]\s*-a\s*\$cc_min\s*-gt\s*[0-5]\s*\\\)\s*\\\/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/x11-drivers/xf86-video-virtualbox/Manifest 
b/x11-drivers/xf86-video-virtualbox/Manifest
index 70f7832..05aac7a 100644
--- a/x11-drivers/xf86-video-virtualbox/Manifest
+++ b/x11-drivers/xf86-video-virtualbox/Manifest
@@ -2,3 +2,5 @@ DIST VirtualBox-4.3.38.tar.bz2 98437150 SHA256 
36f16d435acf04c1dce81df08ba0b522b
 DIST VirtualBox-4.3.40.tar.bz2 98760522 SHA256 
4bbea49ee1eaa600db7af64b05c8ce6a1f7585de08f4f85cd7b6f0f7a798bcc6 SHA512 
9af5266587206795b685f642633966d2d380130c559f64ce61d81137258b71fd7dfb9b97d67f54ddc2482c44bd226dee02b8ee1fb5f0ce0ec2044cfa1d364260
 WHIRLPOOL 
f0687e094f35af262c0e64a0859d95adc1a8becd434f73da8a0c952875bdc875210cb05040de868dc2d43626168ff3e220069b3976e58ec727fead9366d5c9dc
 DIST VirtualBox-5.0.16.tar.bz2 111062984 SHA256 
f5a44d33a1db911f445b2eb2d22d9293a96a535cba488b5a235577ef868fa63c SHA512 
3da3a227360fb50d299e99770378f65e8cb99525377343fa8faff2360be66643d46f68323d6a8b8d4d26182082f171bb35ab2497167bf6df18827a5ea7742074
 WHIRLPOOL 
ea709057c588f28820790c2b193decba9ee0c57e0f82aa4361ca87aef661315182e18b5ee29558e47ed92f6037eb91befa5390680661a7b9f2248c7819b4a85c
 DIST VirtualBox-5.0.20.tar.bz2 111231246 SHA256 
af9c0787aae22964a1192cefbf9aa91a40c1d41e5fea485adebf09ab922d4c2b SHA512 
a039455eed3715b9aa42e2dc6b65ea68b27899c0bcf0065a93c53d1093cce56ebf8a6982cd804208ef9e51794eab9c5c4f3b20550d41532fd4addbd7afda0f8e
 WHIRLPOOL 
f74f0a910e5e3f7b1704f57e9831f88b1036efbc61e3b97779f5b2a337ad70d55638b59f356c769d4b6bfd5955348d490f5080b04a3f494f25eb176944756cfd
+DIST VirtualBox-5.1.6.tar.bz2 114669517 SHA256 
2e0112b0d85841587b8f212e6ba8f6c35b31e1cce6b6999497dc917cd37e6911 SHA512 
7b10c203692a091b3de8dda147b386e17fa7d2bdb56031163e0551e54c1ff6a8e953361d51cc6f7bb6978544a6517e843b446e866aa1fa6f96b4677dda27daa4
 WHIRLPOOL 
ba6ea523dc06622854b304b408f2ce402d164ae4dbc5eeb4cc675c3e4c7d8e12db1a3bcee7d19f67d274ff92b32e143c111d5d732b463c48d72d4036910ce141
+DIST VirtualBox-5.1.8.tar.bz2 114688166 SHA256 
e447031de468aee746529b2cf60768922f9beff22a13c54284aa430f5e925933 SHA512 
178299173ee0062e23aee779faa893a42815d17163eab9ba2ed8b46be63a7110fe1690792de21514dc05ccd5a1752ea0f11357220e0e6f91f101dea3416e819c
 WHIRLPOOL 
20ea8d253d177fd11c4349656aaa0f87f0fb76018511b345e85800d4dd8ab1e2e05c300a1f932670e5f5fac6ea547bfaa0a52b8526c4f363358911c770444a81

diff --git 
a/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-5.1.4-Makefile.module.kms.patch
 
b/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-5.1.4-Makefile.module.kms.patch
new file mode 100644
index 00000000..f34ac66
--- /dev/null
+++ 
b/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-5.1.4-Makefile.module.kms.patch
@@ -0,0 +1,11 @@
+--- a/src/VBox/Additions/linux/drm/Makefile.module.kms
++++ b/src/VBox/Additions/linux/drm/Makefile.module.kms
+@@ -43,7 +43,7 @@ else
+  MANGLING := $(KBUILD_EXTMOD)/include/VBox/VBoxGuestMangling.h
+ endif
+ MOD_CFLAGS = -Wno-declaration-after-statement -fshort-wchar -include 
$(MANGLING) -fno-pie
+-MOD_INCL   = $(addprefix -I$(KBUILD_EXTMOD),/ /include)
++MOD_INCL   = $(addprefix -I$(KBUILD_EXTMOD),/ /include /r0drv/linux)
+ # What on earth is this?
+ MOD_INCL  += $(addprefix -I$(KBUILD_EXTMOD)/vboxvideo,/ /include)
+ MOD_INCL  += -Iinclude/drm

diff --git 
a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.1.6.ebuild 
b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.1.6.ebuild
new file mode 100644
index 00000000..780bd87
--- /dev/null
+++ b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.1.6.ebuild
@@ -0,0 +1,220 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+inherit eutils linux-mod multilib python-single-r1 versionator toolchain-funcs
+
+MY_PV="${PV/beta/BETA}"
+MY_PV="${MY_PV/rc/RC}"
+MY_P=VirtualBox-${MY_PV}
+DESCRIPTION="VirtualBox video driver"
+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="dri"
+
+RDEPEND=">=x11-base/xorg-server-1.7:=[-minimal]
+       x11-libs/libXcomposite"
+DEPEND="${RDEPEND}
+       >=dev-util/kbuild-0.1.9998_pre20131130
+       ${PYTHON_DEPS}
+       >=dev-lang/yasm-0.6.2
+       >=sys-devel/gcc-4.9.0
+       sys-power/iasl
+       x11-proto/fontsproto
+       x11-proto/randrproto
+       x11-proto/renderproto
+       x11-proto/resourceproto
+       x11-proto/scrnsaverproto
+       x11-proto/xextproto
+       x11-proto/xineramaproto
+       x11-proto/xproto
+       x11-libs/libXdmcp
+       x11-libs/libXau
+       x11-libs/libX11
+       x11-libs/libXfixes
+       x11-libs/libXext
+       dri? (  x11-proto/xf86driproto
+               >=x11-libs/libdrm-2.4.5 )"
+
+REQUIRED_USE=( "${PYTHON_REQUIRED_USE}" )
+
+BUILD_TARGETS="all"
+BUILD_TARGET_ARCH="${ARCH}"
+S="${WORKDIR}/${MY_P}"
+MODULES_SRC_DIR="${S}/src/VBox/Additions/linux/drm"
+MODULE_NAMES="vboxvideo(misc:${MODULES_SRC_DIR}:${MODULES_SRC_DIR})"
+
+PATCHES=(
+       # Ugly hack to build the opengl part of the video driver
+       "${FILESDIR}/${PN}-2.2.0-enable-opengl.patch"
+
+       # unset useless/problematic checks in configure
+       "${FILESDIR}/${PN}-5.0.0_beta3-configure_checks.patch"
+)
+
+QA_TEXTRELS_x86="usr/lib/VBoxOGL.so"
+
+pkg_setup() {
+       if [ "${MERGE_TYPE}" != "binary" ]; then
+               version_is_at_least 4.9 $(gcc-version) || die "Please set gcc 
4.9 or higher as active in gcc-config to build ${PN}"
+       fi
+
+       CONFIG_CHECK="~DRM ~DRM_TTM"
+       linux-mod_pkg_setup
+       BUILD_PARAMS="KERN_DIR=${KV_OUT_DIR} KERNOUT=${KV_OUT_DIR}"
+
+       python-single-r1_pkg_setup
+}
+
+src_prepare() {
+       # Prepare the vboxvideo_drm Makefiles and build dir
+       eapply "${FILESDIR}"/${PN}-5.1.4-Makefile.module.kms.patch
+
+       # Remove shipped binaries (kBuild,yasm), see bug #232775
+       rm -r kBuild/bin tools || die
+
+       # Disable things unused or splitted into separate ebuilds
+       cp "${FILESDIR}/${PN}-5-localconfig" LocalConfig.kmk || die
+
+       # Remove pointless GCC version limitations in check_gcc()
+       sed -e 
"/\s*-o\s*\\\(\s*\$cc_maj\s*-eq\s*[5-9]\s*-a\s*\$cc_min\s*-gt\s*[0-5]\s*\\\)\s*\\\/d"
 \
+               -i configure || die
+
+       default
+
+       # link with lazy on hardened #394757
+       sed '/^TEMPLATE_VBOXR3EXE_LDFLAGS.linux/s/$/ -Wl,-z,lazy/' \
+               -i Config.kmk || die
+}
+
+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() {
+       local each targets=(
+               Runtime
+               Additions/common/VBoxGuestLib
+               GuestHost/OpenGL
+               Additions/x11/x11stubs
+               Additions/common/crOpenGL
+               Additions/x11/vboxvideo
+       )
+
+       # need to use the upstream build system to create necessary objects 
properly
+       use dri && targets+=( Additions/linux/drm )
+
+       for each in ${targets[@]} ; do
+               pushd "${S}"/src/VBox/${each} $>/dev/null || die
+               MAKE="kmk" \
+               emake TOOL_YASM_AS=yasm \
+               VBOX_USE_SYSTEM_XORG_HEADERS=1 \
+               KBUILD_PATH="${S}/kBuild" \
+               KBUILD_VERBOSE=2
+               popd &>/dev/null || die
+       done
+
+       if use dri; then
+               local objdir="out/linux.${ARCH}/release/obj/vboxvideo_drm"
+               # We need a Makefile, so use Makefile.module.kms
+               ln -s Makefile.module.kms "${MODULES_SRC_DIR}"/Makefile || die
+               # All of these are expected to be in $(KBUILD_EXTMOD)/ so 
symlink them into place
+               targets=(
+                       include
+                       src/VBox/Runtime/r0drv
+                       src/VBox/Installer/linux/Makefile.include.{head,foot}er
+                       
out/linux.${ARCH}/release/{product,version,revision}-generated.h
+               )
+               for each in ${targets[@]} ; do
+                       ln -s "${S}"/${each} \
+                               "${MODULES_SRC_DIR}"/${each##*/} || die
+               done
+               # see the vboxvideo_drm_SOURCES list in Makefile.kmk for the 
below,
+               # and replace '..' with 'dt'
+               targets=(
+                       dt/dt/common/VBoxVideo/HGSMIBase.o
+                       dt/dt/common/VBoxVideo/Modesetting.o
+                       dt/dt/common/VBoxVideo/VBVABase.o
+                       dt/dt/dt/GuestHost/HGSMI/HGSMICommon.o
+                       dt/dt/dt/GuestHost/HGSMI/HGSMIMemAlloc.o
+                       dt/dt/dt/Runtime/common/alloc/heapoffset.o
+               )
+               for each in ${targets[@]} ; do
+                       ln -s "${S}"/${objdir}/${each} \
+                               "${MODULES_SRC_DIR}" || die
+                       ln -s "${S}"/${objdir}/${each}.dep \
+                               "${MODULES_SRC_DIR}" || die
+               done
+
+               # 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)
+               pushd "${MODULES_SRC_DIR}" &>/dev/null || die
+               linux-mod_src_compile
+               popd &>/dev/null || die
+       fi
+}
+
+src_install() {
+       if use dri; then
+               pushd "${MODULES_SRC_DIR}" &>/dev/null || die
+               linux-mod_src_install
+               popd &>/dev/null || die
+       fi
+
+       cd "${S}/out/linux.${ARCH}/release/bin/additions" || die
+       insinto /usr/$(get_libdir)/xorg/modules/drivers
+       newins vboxvideo_drv_system.so vboxvideo_drv.so
+
+       # Guest OpenGL driver
+       insinto /usr/$(get_libdir)
+       doins -r VBoxOGL*
+
+       if use dri ; then
+               dosym /usr/$(get_libdir)/VBoxOGL.so \
+                       /usr/$(get_libdir)/dri/vboxvideo_dri.so
+       fi
+}
+
+pkg_postinst() {
+       elog "You need to edit the file /etc/X11/xorg.conf and set:"
+       elog ""
+       elog "  Driver  \"vboxvideo\""
+       elog ""
+       elog "in the Graphics device section (Section \"Device\")"
+       elog ""
+       if use dri; then
+               elog "To use the kernel drm video driver, please add:"
+               elog "\"${MODULE_NAMES%(*}\" to:"
+               if has_version sys-apps/openrc ; then
+                       elog "/etc/conf.d/modules"
+               else
+                       elog 
"/etc/modules.autoload.d/kernel-${KV_MAJOR}.${KV_MINOR}"
+               fi
+               elog ""
+       fi
+}

diff --git 
a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.1.8.ebuild 
b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.1.8.ebuild
new file mode 100644
index 00000000..780bd87
--- /dev/null
+++ b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.1.8.ebuild
@@ -0,0 +1,220 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+inherit eutils linux-mod multilib python-single-r1 versionator toolchain-funcs
+
+MY_PV="${PV/beta/BETA}"
+MY_PV="${MY_PV/rc/RC}"
+MY_P=VirtualBox-${MY_PV}
+DESCRIPTION="VirtualBox video driver"
+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="dri"
+
+RDEPEND=">=x11-base/xorg-server-1.7:=[-minimal]
+       x11-libs/libXcomposite"
+DEPEND="${RDEPEND}
+       >=dev-util/kbuild-0.1.9998_pre20131130
+       ${PYTHON_DEPS}
+       >=dev-lang/yasm-0.6.2
+       >=sys-devel/gcc-4.9.0
+       sys-power/iasl
+       x11-proto/fontsproto
+       x11-proto/randrproto
+       x11-proto/renderproto
+       x11-proto/resourceproto
+       x11-proto/scrnsaverproto
+       x11-proto/xextproto
+       x11-proto/xineramaproto
+       x11-proto/xproto
+       x11-libs/libXdmcp
+       x11-libs/libXau
+       x11-libs/libX11
+       x11-libs/libXfixes
+       x11-libs/libXext
+       dri? (  x11-proto/xf86driproto
+               >=x11-libs/libdrm-2.4.5 )"
+
+REQUIRED_USE=( "${PYTHON_REQUIRED_USE}" )
+
+BUILD_TARGETS="all"
+BUILD_TARGET_ARCH="${ARCH}"
+S="${WORKDIR}/${MY_P}"
+MODULES_SRC_DIR="${S}/src/VBox/Additions/linux/drm"
+MODULE_NAMES="vboxvideo(misc:${MODULES_SRC_DIR}:${MODULES_SRC_DIR})"
+
+PATCHES=(
+       # Ugly hack to build the opengl part of the video driver
+       "${FILESDIR}/${PN}-2.2.0-enable-opengl.patch"
+
+       # unset useless/problematic checks in configure
+       "${FILESDIR}/${PN}-5.0.0_beta3-configure_checks.patch"
+)
+
+QA_TEXTRELS_x86="usr/lib/VBoxOGL.so"
+
+pkg_setup() {
+       if [ "${MERGE_TYPE}" != "binary" ]; then
+               version_is_at_least 4.9 $(gcc-version) || die "Please set gcc 
4.9 or higher as active in gcc-config to build ${PN}"
+       fi
+
+       CONFIG_CHECK="~DRM ~DRM_TTM"
+       linux-mod_pkg_setup
+       BUILD_PARAMS="KERN_DIR=${KV_OUT_DIR} KERNOUT=${KV_OUT_DIR}"
+
+       python-single-r1_pkg_setup
+}
+
+src_prepare() {
+       # Prepare the vboxvideo_drm Makefiles and build dir
+       eapply "${FILESDIR}"/${PN}-5.1.4-Makefile.module.kms.patch
+
+       # Remove shipped binaries (kBuild,yasm), see bug #232775
+       rm -r kBuild/bin tools || die
+
+       # Disable things unused or splitted into separate ebuilds
+       cp "${FILESDIR}/${PN}-5-localconfig" LocalConfig.kmk || die
+
+       # Remove pointless GCC version limitations in check_gcc()
+       sed -e 
"/\s*-o\s*\\\(\s*\$cc_maj\s*-eq\s*[5-9]\s*-a\s*\$cc_min\s*-gt\s*[0-5]\s*\\\)\s*\\\/d"
 \
+               -i configure || die
+
+       default
+
+       # link with lazy on hardened #394757
+       sed '/^TEMPLATE_VBOXR3EXE_LDFLAGS.linux/s/$/ -Wl,-z,lazy/' \
+               -i Config.kmk || die
+}
+
+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() {
+       local each targets=(
+               Runtime
+               Additions/common/VBoxGuestLib
+               GuestHost/OpenGL
+               Additions/x11/x11stubs
+               Additions/common/crOpenGL
+               Additions/x11/vboxvideo
+       )
+
+       # need to use the upstream build system to create necessary objects 
properly
+       use dri && targets+=( Additions/linux/drm )
+
+       for each in ${targets[@]} ; do
+               pushd "${S}"/src/VBox/${each} $>/dev/null || die
+               MAKE="kmk" \
+               emake TOOL_YASM_AS=yasm \
+               VBOX_USE_SYSTEM_XORG_HEADERS=1 \
+               KBUILD_PATH="${S}/kBuild" \
+               KBUILD_VERBOSE=2
+               popd &>/dev/null || die
+       done
+
+       if use dri; then
+               local objdir="out/linux.${ARCH}/release/obj/vboxvideo_drm"
+               # We need a Makefile, so use Makefile.module.kms
+               ln -s Makefile.module.kms "${MODULES_SRC_DIR}"/Makefile || die
+               # All of these are expected to be in $(KBUILD_EXTMOD)/ so 
symlink them into place
+               targets=(
+                       include
+                       src/VBox/Runtime/r0drv
+                       src/VBox/Installer/linux/Makefile.include.{head,foot}er
+                       
out/linux.${ARCH}/release/{product,version,revision}-generated.h
+               )
+               for each in ${targets[@]} ; do
+                       ln -s "${S}"/${each} \
+                               "${MODULES_SRC_DIR}"/${each##*/} || die
+               done
+               # see the vboxvideo_drm_SOURCES list in Makefile.kmk for the 
below,
+               # and replace '..' with 'dt'
+               targets=(
+                       dt/dt/common/VBoxVideo/HGSMIBase.o
+                       dt/dt/common/VBoxVideo/Modesetting.o
+                       dt/dt/common/VBoxVideo/VBVABase.o
+                       dt/dt/dt/GuestHost/HGSMI/HGSMICommon.o
+                       dt/dt/dt/GuestHost/HGSMI/HGSMIMemAlloc.o
+                       dt/dt/dt/Runtime/common/alloc/heapoffset.o
+               )
+               for each in ${targets[@]} ; do
+                       ln -s "${S}"/${objdir}/${each} \
+                               "${MODULES_SRC_DIR}" || die
+                       ln -s "${S}"/${objdir}/${each}.dep \
+                               "${MODULES_SRC_DIR}" || die
+               done
+
+               # 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)
+               pushd "${MODULES_SRC_DIR}" &>/dev/null || die
+               linux-mod_src_compile
+               popd &>/dev/null || die
+       fi
+}
+
+src_install() {
+       if use dri; then
+               pushd "${MODULES_SRC_DIR}" &>/dev/null || die
+               linux-mod_src_install
+               popd &>/dev/null || die
+       fi
+
+       cd "${S}/out/linux.${ARCH}/release/bin/additions" || die
+       insinto /usr/$(get_libdir)/xorg/modules/drivers
+       newins vboxvideo_drv_system.so vboxvideo_drv.so
+
+       # Guest OpenGL driver
+       insinto /usr/$(get_libdir)
+       doins -r VBoxOGL*
+
+       if use dri ; then
+               dosym /usr/$(get_libdir)/VBoxOGL.so \
+                       /usr/$(get_libdir)/dri/vboxvideo_dri.so
+       fi
+}
+
+pkg_postinst() {
+       elog "You need to edit the file /etc/X11/xorg.conf and set:"
+       elog ""
+       elog "  Driver  \"vboxvideo\""
+       elog ""
+       elog "in the Graphics device section (Section \"Device\")"
+       elog ""
+       if use dri; then
+               elog "To use the kernel drm video driver, please add:"
+               elog "\"${MODULE_NAMES%(*}\" to:"
+               if has_version sys-apps/openrc ; then
+                       elog "/etc/conf.d/modules"
+               else
+                       elog 
"/etc/modules.autoload.d/kernel-${KV_MAJOR}.${KV_MINOR}"
+               fi
+               elog ""
+       fi
+}

Reply via email to