commit:     018494a7e701b3c4b044e621a27dae45a47a37aa
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 21 09:26:05 2021 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Wed Apr 21 09:27:50 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=018494a7

app-emulation/virtualbox*: Removed old

Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 app-emulation/virtualbox-additions/Manifest        |   1 -
 .../virtualbox-additions-6.1.16-r1.ebuild          |  34 --
 app-emulation/virtualbox-extpack-oracle/Manifest   |   1 -
 ...rtualbox-extpack-oracle-6.1.16.140961-r1.ebuild |  43 --
 app-emulation/virtualbox-guest-additions/Manifest  |   1 -
 .../virtualbox-guest-additions-6.1.16-r1.ebuild    | 221 ---------
 .../virtualbox-guest-additions-6.1.18.ebuild       | 221 ---------
 app-emulation/virtualbox-modules/Manifest          |   1 -
 .../virtualbox-modules-6.1.16-r1.ebuild            |  59 ---
 app-emulation/virtualbox/Manifest                  |   1 -
 .../virtualbox/virtualbox-6.1.16-r1.ebuild         | 512 ---------------------
 11 files changed, 1095 deletions(-)

diff --git a/app-emulation/virtualbox-additions/Manifest 
b/app-emulation/virtualbox-additions/Manifest
index 41ad93779b5..2a2940faca6 100644
--- a/app-emulation/virtualbox-additions/Manifest
+++ b/app-emulation/virtualbox-additions/Manifest
@@ -1,3 +1,2 @@
-DIST VBoxGuestAdditions_6.1.16.iso 60987392 BLAKE2B 
d4452f43c72ab8c49633f717f7a49257e14a8c6c7b60c6d61ee65ae5e4bcce00c30e19ba78d6f28fb85dfbc95ca6139aec2c7069e5afecae145dffc6ff38793a
 SHA512 
e7606fba6e7490318b7dbadff52578040e4370bbe81fa67e6653e798176eb929ed37e363792647ab3c6626ee9e32af40f63167521997af7b446c25173ff60280
 DIST VBoxGuestAdditions_6.1.18.iso 61157376 BLAKE2B 
e022cfbc70fa45889c1db7592f30814faf88d7614c30ebd3fccd0127732d7fec51423904a160797ac199315dcbe4791f025e2dc4754141bfef0862b11510626c
 SHA512 
07be8be75feb2d7d9bfc984ce34b955339d391580192817c2eb216b7577576a003dde310cc09f18c6b6bcf2e30ad548e1ee8bde0af420e4d1d43a3486861cf19
 DIST VBoxGuestAdditions_6.1.20.iso 61018112 BLAKE2B 
feb6a292b05e861a90fdc5db80bc15e9df593a365a866a31ab7afce704511463012c18d76dc928dc5ecd0d2a23bc518c37ad9cdc8b4b72397af3ddd4b3eb97d8
 SHA512 
122bd5d31ab5cac2fe0582d1d541b5e9d0e8e544e1b3c5afb2b2e2c8b26fbfa964d15053ccc256575753d31206bffc09380dabc79d93946b0e56b743d82e40fe

diff --git 
a/app-emulation/virtualbox-additions/virtualbox-additions-6.1.16-r1.ebuild 
b/app-emulation/virtualbox-additions/virtualbox-additions-6.1.16-r1.ebuild
deleted file mode 100644
index 5f7f607a912..00000000000
--- a/app-emulation/virtualbox-additions/virtualbox-additions-6.1.16-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN=VBoxGuestAdditions
-MY_PV="${PV/beta/BETA}"
-MY_PV="${MY_PV/rc/RC}"
-MY_P=${MY_PN}_${MY_PV}
-
-DESCRIPTION="CD image containing guest additions for VirtualBox"
-HOMEPAGE="https://www.virtualbox.org/";
-SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.iso";
-
-LICENSE="GPL-2+ LGPL-2.1+ MIT SGI-B-2.0 CDDL"
-SLOT="0/$(ver_cut 1-2)"
-[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
-KEYWORDS="amd64"
-IUSE=""
-RESTRICT="mirror"
-
-RDEPEND="!app-emulation/virtualbox-bin
-       !=app-emulation/virtualbox-9999"
-
-S="${WORKDIR}"
-
-src_unpack() {
-       return 0
-}
-
-src_install() {
-       insinto /usr/share/${PN/-additions}
-       newins "${DISTDIR}"/${MY_P}.iso ${MY_PN}.iso
-}

diff --git a/app-emulation/virtualbox-extpack-oracle/Manifest 
b/app-emulation/virtualbox-extpack-oracle/Manifest
index df7d9b228fe..fd429023b0c 100644
--- a/app-emulation/virtualbox-extpack-oracle/Manifest
+++ b/app-emulation/virtualbox-extpack-oracle/Manifest
@@ -1,3 +1,2 @@
-DIST Oracle_VM_VirtualBox_Extension_Pack-6.1.16-140961.tar.gz 11145670 BLAKE2B 
86e620ebaea9803b9bf633990a39d9e2828fbe70cdc98cbb6ba98accc374e0ea2300a7135cae0f0ec8d13184ccc8e0ff075ca1f81132ed97206f14c20adeb3bc
 SHA512 
89b9c709da1c4b8268c4c1849e074f4d8dc76a36663b401c9ea63f02422bec50e2b77056289144bb161b1dd226b78687379d6ab86281112a71561c1777f525fb
 DIST Oracle_VM_VirtualBox_Extension_Pack-6.1.18-142142.tar.gz 11157510 BLAKE2B 
d9ee20abac79ed5de03c39d1e6af3a5f18c5416149e9e64ebe9dfc4a937bd72b6590a2daaccc820e3ee6c6efcfd0c1c8e29bf3844cbbb929f13052415e16f2bb
 SHA512 
3686b1c5dbdc5b28c172b4885c30ca9a444bc10dc7984df14a17e1dcc571456b06e80ad38e1409de8692c483c56f397162a53bd3dc6956d9ca91875fda0bda4e
 DIST Oracle_VM_VirtualBox_Extension_Pack-6.1.20-143896.tar.gz 11132930 BLAKE2B 
a26e05d9869a52187b379b24ed556c6296772d1360b6f7d61afe17c2818351b5ee2256398e0d53a16d2b6014540f343f7f13539c3d5529f079ac363b48ea0d6e
 SHA512 
85cd8327860c253ce2f871dd1138d18d97b8706f64a3dafaaf340a43d8f44f7ee696a1f845761e7c8d6dcf11c7afd1618798194482b6e09cbe7e2657d980116a

diff --git 
a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.1.16.140961-r1.ebuild
 
b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.1.16.140961-r1.ebuild
deleted file mode 100644
index 54db34dd7a1..00000000000
--- 
a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.1.16.140961-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib
-
-MAIN_PV="$(ver_cut 1-3)"
-if [[ ${PV} = *_beta* ]] || [[ ${PV} = *_rc* ]] ; then
-       MY_PV="${MAIN_PV}_$(ver_cut 5-6)"
-       DEP_PV="${MY_PV}"
-       MY_PV="${MY_PV/beta/BETA}"
-       MY_PV="${MY_PV/rc/RC}"
-else
-       MY_PV="${MAIN_PV}"
-       DEP_PV="${MAIN_PV}"
-fi
-VBOX_BUILD_ID="$(ver_cut 4)"
-MY_PN="Oracle_VM_VirtualBox_Extension_Pack"
-MY_P="${MY_PN}-${MY_PV}-${VBOX_BUILD_ID}"
-
-DESCRIPTION="PUEL extensions for VirtualBox"
-HOMEPAGE="https://www.virtualbox.org/";
-SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.vbox-extpack
 -> ${MY_P}.tar.gz"
-
-LICENSE="PUEL"
-SLOT="0/$(ver_cut 1-2)"
-[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
-KEYWORDS="amd64"
-IUSE=""
-RESTRICT="bindist mirror strip"
-
-RDEPEND="=app-emulation/virtualbox-${DEP_PV}*"
-
-S="${WORKDIR}"
-
-QA_PREBUILT="/usr/lib*/virtualbox/ExtensionPacks/${MY_PN}/.*"
-
-src_install() {
-       insinto /usr/$(get_libdir)/virtualbox/ExtensionPacks/${MY_PN}
-       doins -r linux.${ARCH}
-       doins ExtPack* PXE-Intel.rom
-}

diff --git a/app-emulation/virtualbox-guest-additions/Manifest 
b/app-emulation/virtualbox-guest-additions/Manifest
index 687fce73017..968fcf004b6 100644
--- a/app-emulation/virtualbox-guest-additions/Manifest
+++ b/app-emulation/virtualbox-guest-additions/Manifest
@@ -1,4 +1,3 @@
-DIST VirtualBox-6.1.16.tar.bz2 165470821 BLAKE2B 
13376322d0ce2ea3ed826c61816ff19c8ce1f022f6cb1f1b0c291d72354cbe574a01589a6dcc39de10080ba32d5961ca980e75fe11c7401736bf8f7e5443d166
 SHA512 
4373eb35934f894e419e1441f6368e646e4a84b963a0ecf1e5c71bbf0231de0b0e52f4c4377b8cd2d956bc7a11346a9da2285988bf1e4c743971c413c6529421
 DIST VirtualBox-6.1.18.tar.bz2 165507486 BLAKE2B 
3cf18f30671426f533838eb0579928b08ce022b832d509e70274978efce2e3e0e14dc8fbf258ef9a1ce8a3d666081863aa6971340e04600434f58136fe5c221a
 SHA512 
41cb4bd42429b09836c59ef9867dd3d35d0d5512ff6e515a7f8688ed444c079ce353a84f0d45b607ccf08424782d5de09b264f51b2c41a9ec34eb834458c293c
 DIST VirtualBox-6.1.20.tar.bz2 165569564 BLAKE2B 
cf8c110e78e7d7bef3e3243a8966f4d816dacc8dad6cc44737023a13f1b89dfb50661f6dabc742f328e5c03556ec82e7a22f5c1b97cfef774652ec901e733e5d
 SHA512 
b5af4e04e1a52c85b20226a274fac93712b79d426c0268cce3f2a337616a03161a55522ecddd13844bfc24a6808ba3d651366e74ce657cc6f8fd64c34ae745a4
 DIST virtualbox-6.1.12-patches-01.tar.xz 2528 BLAKE2B 
a5d7cde0daea41bee2e40e46569c725769927a31865d99d13b8b13c4903e59b4097f85da15dc592b9c7e8baf8ff805397af827620f107ba09a468b4d1198ecab
 SHA512 
f71d10a9fbce99c3f631ef30bcfa9d0e017e702ac509541b039e08ccbcd024beb93fde09c43d90af5d9d28f6842a7947f20e7950d3897da3e6d57859657e1123

diff --git 
a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.16-r1.ebuild
 
b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.16-r1.ebuild
deleted file mode 100644
index 5000d477eb1..00000000000
--- 
a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.16-r1.ebuild
+++ /dev/null
@@ -1,221 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit linux-mod systemd toolchain-funcs
-
-MY_PN="VirtualBox"
-MY_PV="${PV/beta/BETA}"
-MY_PV="${MY_PV/rc/RC}"
-MY_P="${MY_PN}-${MY_PV}"
-[[ "${PV}" == *a ]] && DIR_PV="$(ver_cut 1-3)"
-
-DESCRIPTION="VirtualBox kernel modules and user-space tools for Gentoo guests"
-HOMEPAGE="https://www.virtualbox.org/";
-SRC_URI="https://download.virtualbox.org/virtualbox/${DIR_PV:-${MY_PV}}/${MY_P}.tar.bz2
-       
https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-6.1.12-patches-01.tar.xz";
-
-LICENSE="GPL-2"
-SLOT="0/$(ver_cut 1-2)"
-[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
-KEYWORDS="amd64 x86"
-IUSE="X"
-
-# automount Error: VBoxServiceAutoMountWorker: Group "vboxsf" does not exist
-RDEPEND="
-       acct-group/vboxguest
-       acct-group/vboxsf
-       acct-user/vboxguest
-       X? ( 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 )
-       sys-apps/dbus
-"
-DEPEND="
-       ${RDEPEND}
-       >=dev-util/kbuild-0.1.9998.3127
-       >=dev-lang/yasm-0.6.2
-       sys-devel/bin86
-       sys-libs/pam
-       sys-power/iasl
-       x11-base/xorg-proto
-"
-PDEPEND="
-       X? ( x11-drivers/xf86-video-vboxvideo )
-"
-BUILD_TARGETS="all"
-BUILD_TARGET_ARCH="${ARCH}"
-
-S="${WORKDIR}/${MY_PN}-${DIR_PV:-${PV}}"
-VBOX_MOD_SRC_DIR="${S}/out/linux.${ARCH}/release/bin/additions/src"
-
-pkg_setup() {
-       export DISTCC_DISABLE=1 #674256
-       
MODULE_NAMES="vboxguest(misc:${VBOX_MOD_SRC_DIR}/vboxguest:${VBOX_MOD_SRC_DIR}/vboxguest)
-               
vboxsf(misc:${VBOX_MOD_SRC_DIR}/vboxsf:${VBOX_MOD_SRC_DIR}/vboxsf)"
-       use X && MODULE_NAMES+=" 
vboxvideo(misc:${VBOX_MOD_SRC_DIR}/vboxvideo::${VBOX_MOD_SRC_DIR}/vboxvideo)"
-
-       linux-mod_pkg_setup
-       BUILD_PARAMS="KERN_DIR=/lib/modules/${KV_FULL}/build 
KERNOUT=${KV_OUT_DIR} KBUILD_EXTRA_SYMBOLS=${S}/Module.symvers"
-}
-
-src_prepare() {
-       # Remove shipped binaries (kBuild,yasm), see bug #232775
-       rm -r kBuild/bin tools || die
-
-       # Provide kernel sources
-       pushd src/VBox/Additions &>/dev/null || die
-       ebegin "Extracting guest kernel module sources"
-       kmk GuestDrivers-src vboxguest-src vboxsf-src vboxvideo-src &>/dev/null 
|| die
-       eend
-       popd &>/dev/null || die
-
-       # PaX fixes (see bug #298988)
-       pushd "${VBOX_MOD_SRC_DIR}" &>/dev/null || die
-       eapply "${FILESDIR}"/vboxguest-6.0.6-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
-
-       # Remove pointless GCC version check
-       sed -e '/^check_gcc$/d' -i configure || die
-
-       eapply "${WORKDIR}/patches"
-
-       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 \
-       VBOX_BUILD_PUBLISHER=_Gentoo \
-       TOOL_GXX3_CC="$(tc-getCC)" TOOL_GXX3_CXX="$(tc-getCXX)" \
-       TOOL_GXX3_LD="$(tc-getCXX)" VBOX_GCC_OPT="${CXXFLAGS}" \
-       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"' \
-               >> 
"${ED}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \
-               || die
-       echo 'KERNEL=="vboxuser", OWNER="vboxguest", GROUP="vboxguest", 
MODE="0660"' \
-               >> 
"${ED}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \
-               || die
-
-       # VBoxClient autostart file
-       insinto /etc/xdg/autostart
-       doins "${FILESDIR}"/vboxclient.desktop
-
-       # sample xorg.conf
-       dodoc "${FILESDIR}"/xorg.conf.vbox
-       docompress -x "${ED}"/usr/share/doc/${PF}/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-6.1.18.ebuild
 
b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.18.ebuild
deleted file mode 100644
index 5000d477eb1..00000000000
--- 
a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.18.ebuild
+++ /dev/null
@@ -1,221 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit linux-mod systemd toolchain-funcs
-
-MY_PN="VirtualBox"
-MY_PV="${PV/beta/BETA}"
-MY_PV="${MY_PV/rc/RC}"
-MY_P="${MY_PN}-${MY_PV}"
-[[ "${PV}" == *a ]] && DIR_PV="$(ver_cut 1-3)"
-
-DESCRIPTION="VirtualBox kernel modules and user-space tools for Gentoo guests"
-HOMEPAGE="https://www.virtualbox.org/";
-SRC_URI="https://download.virtualbox.org/virtualbox/${DIR_PV:-${MY_PV}}/${MY_P}.tar.bz2
-       
https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-6.1.12-patches-01.tar.xz";
-
-LICENSE="GPL-2"
-SLOT="0/$(ver_cut 1-2)"
-[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
-KEYWORDS="amd64 x86"
-IUSE="X"
-
-# automount Error: VBoxServiceAutoMountWorker: Group "vboxsf" does not exist
-RDEPEND="
-       acct-group/vboxguest
-       acct-group/vboxsf
-       acct-user/vboxguest
-       X? ( 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 )
-       sys-apps/dbus
-"
-DEPEND="
-       ${RDEPEND}
-       >=dev-util/kbuild-0.1.9998.3127
-       >=dev-lang/yasm-0.6.2
-       sys-devel/bin86
-       sys-libs/pam
-       sys-power/iasl
-       x11-base/xorg-proto
-"
-PDEPEND="
-       X? ( x11-drivers/xf86-video-vboxvideo )
-"
-BUILD_TARGETS="all"
-BUILD_TARGET_ARCH="${ARCH}"
-
-S="${WORKDIR}/${MY_PN}-${DIR_PV:-${PV}}"
-VBOX_MOD_SRC_DIR="${S}/out/linux.${ARCH}/release/bin/additions/src"
-
-pkg_setup() {
-       export DISTCC_DISABLE=1 #674256
-       
MODULE_NAMES="vboxguest(misc:${VBOX_MOD_SRC_DIR}/vboxguest:${VBOX_MOD_SRC_DIR}/vboxguest)
-               
vboxsf(misc:${VBOX_MOD_SRC_DIR}/vboxsf:${VBOX_MOD_SRC_DIR}/vboxsf)"
-       use X && MODULE_NAMES+=" 
vboxvideo(misc:${VBOX_MOD_SRC_DIR}/vboxvideo::${VBOX_MOD_SRC_DIR}/vboxvideo)"
-
-       linux-mod_pkg_setup
-       BUILD_PARAMS="KERN_DIR=/lib/modules/${KV_FULL}/build 
KERNOUT=${KV_OUT_DIR} KBUILD_EXTRA_SYMBOLS=${S}/Module.symvers"
-}
-
-src_prepare() {
-       # Remove shipped binaries (kBuild,yasm), see bug #232775
-       rm -r kBuild/bin tools || die
-
-       # Provide kernel sources
-       pushd src/VBox/Additions &>/dev/null || die
-       ebegin "Extracting guest kernel module sources"
-       kmk GuestDrivers-src vboxguest-src vboxsf-src vboxvideo-src &>/dev/null 
|| die
-       eend
-       popd &>/dev/null || die
-
-       # PaX fixes (see bug #298988)
-       pushd "${VBOX_MOD_SRC_DIR}" &>/dev/null || die
-       eapply "${FILESDIR}"/vboxguest-6.0.6-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
-
-       # Remove pointless GCC version check
-       sed -e '/^check_gcc$/d' -i configure || die
-
-       eapply "${WORKDIR}/patches"
-
-       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 \
-       VBOX_BUILD_PUBLISHER=_Gentoo \
-       TOOL_GXX3_CC="$(tc-getCC)" TOOL_GXX3_CXX="$(tc-getCXX)" \
-       TOOL_GXX3_LD="$(tc-getCXX)" VBOX_GCC_OPT="${CXXFLAGS}" \
-       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"' \
-               >> 
"${ED}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \
-               || die
-       echo 'KERNEL=="vboxuser", OWNER="vboxguest", GROUP="vboxguest", 
MODE="0660"' \
-               >> 
"${ED}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \
-               || die
-
-       # VBoxClient autostart file
-       insinto /etc/xdg/autostart
-       doins "${FILESDIR}"/vboxclient.desktop
-
-       # sample xorg.conf
-       dodoc "${FILESDIR}"/xorg.conf.vbox
-       docompress -x "${ED}"/usr/share/doc/${PF}/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-modules/Manifest 
b/app-emulation/virtualbox-modules/Manifest
index 8083d5fe90f..4b7d2a47f56 100644
--- a/app-emulation/virtualbox-modules/Manifest
+++ b/app-emulation/virtualbox-modules/Manifest
@@ -1,3 +1,2 @@
-DIST vbox-kernel-module-src-6.1.16.tar.xz 671736 BLAKE2B 
8b2153874ee7a63f88679a5372215e89def49622caa7679a5c2410423eaf23ced18ece79d638fc96db40fac88857db7568dd72dd8e05371b14add3553d61d3a7
 SHA512 
c51dfad5f9578ad43e2fbdd35a70659640030108006f89d362bc25dead99eb3b39a78d403633b3813f62f5b510eff22d826a2750b9c88f5fcb1cde6531295bff
 DIST vbox-kernel-module-src-6.1.18.tar.xz 672004 BLAKE2B 
7199ba2a5020e5ab51d82735df16aee78ece74db232733b932c380f90dffd589a72613120bbd5c580381ab6f6308abb8d12f69855b9c0a8345bfb8587d022019
 SHA512 
49b54898b2701774fdeec0cd99dd51a1dd71ffd9be38e125fde73f0c64a697138d13bddbb0ed0e9582d354fa0394608084effb68bd35b266c87f6e3b44c6f342
 DIST vbox-kernel-module-src-6.1.20.tar.xz 672188 BLAKE2B 
0b2ef1e02ce6f55211703946dc53df0fe949a94bac2caf050d31a78e674c2934d5cfaf788da2246000d1dc99218a572cb02272a1a92f4df913fcf7635b65a98b
 SHA512 
4fdc16258ec03c720c81b62c680addcbde8257a58a94b3bca8eefd378c126833d84f7f4fa7bb76fcd7c761983f8626d121b2d31d761f608ca7cce6a689ec0469

diff --git 
a/app-emulation/virtualbox-modules/virtualbox-modules-6.1.16-r1.ebuild 
b/app-emulation/virtualbox-modules/virtualbox-modules-6.1.16-r1.ebuild
deleted file mode 100644
index 0519b12c7cd..00000000000
--- a/app-emulation/virtualbox-modules/virtualbox-modules-6.1.16-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# 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=7
-
-inherit linux-mod toolchain-funcs
-
-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/$(ver_cut 1-2)"
-[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
-KEYWORDS="amd64"
-IUSE="pax_kernel"
-
-RDEPEND="!=app-emulation/virtualbox-9999"
-
-S="${WORKDIR}"
-
-BUILD_TARGETS="all"
-MODULE_NAMES="vboxdrv(misc:${S}) vboxnetflt(misc:${S}) vboxnetadp(misc:${S})"
-MODULESD_VBOXDRV_ENABLED="yes"
-MODULESD_VBOXNETADP_ENABLED="no"
-MODULESD_VBOXNETFLT_ENABLED="no"
-
-PATCHES=(
-       "${FILESDIR}/${P}-linux-5.10-r0drv-memobj-fix-r0.patch" #751328
-)
-
-pkg_setup() {
-       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"
-}
-
-src_prepare() {
-       if use pax_kernel && kernel_is -ge 3 0 0 ; then
-               eapply -p0 "${FILESDIR}"/${PN}-5.2.8-pax-const.patch
-       fi
-
-       default
-}
-
-src_install() {
-       linux-mod_src_install
-       insinto /usr/lib/modules-load.d/
-       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/Manifest 
b/app-emulation/virtualbox/Manifest
index 687fce73017..968fcf004b6 100644
--- a/app-emulation/virtualbox/Manifest
+++ b/app-emulation/virtualbox/Manifest
@@ -1,4 +1,3 @@
-DIST VirtualBox-6.1.16.tar.bz2 165470821 BLAKE2B 
13376322d0ce2ea3ed826c61816ff19c8ce1f022f6cb1f1b0c291d72354cbe574a01589a6dcc39de10080ba32d5961ca980e75fe11c7401736bf8f7e5443d166
 SHA512 
4373eb35934f894e419e1441f6368e646e4a84b963a0ecf1e5c71bbf0231de0b0e52f4c4377b8cd2d956bc7a11346a9da2285988bf1e4c743971c413c6529421
 DIST VirtualBox-6.1.18.tar.bz2 165507486 BLAKE2B 
3cf18f30671426f533838eb0579928b08ce022b832d509e70274978efce2e3e0e14dc8fbf258ef9a1ce8a3d666081863aa6971340e04600434f58136fe5c221a
 SHA512 
41cb4bd42429b09836c59ef9867dd3d35d0d5512ff6e515a7f8688ed444c079ce353a84f0d45b607ccf08424782d5de09b264f51b2c41a9ec34eb834458c293c
 DIST VirtualBox-6.1.20.tar.bz2 165569564 BLAKE2B 
cf8c110e78e7d7bef3e3243a8966f4d816dacc8dad6cc44737023a13f1b89dfb50661f6dabc742f328e5c03556ec82e7a22f5c1b97cfef774652ec901e733e5d
 SHA512 
b5af4e04e1a52c85b20226a274fac93712b79d426c0268cce3f2a337616a03161a55522ecddd13844bfc24a6808ba3d651366e74ce657cc6f8fd64c34ae745a4
 DIST virtualbox-6.1.12-patches-01.tar.xz 2528 BLAKE2B 
a5d7cde0daea41bee2e40e46569c725769927a31865d99d13b8b13c4903e59b4097f85da15dc592b9c7e8baf8ff805397af827620f107ba09a468b4d1198ecab
 SHA512 
f71d10a9fbce99c3f631ef30bcfa9d0e017e702ac509541b039e08ccbcd024beb93fde09c43d90af5d9d28f6842a7947f20e7950d3897da3e6d57859657e1123

diff --git a/app-emulation/virtualbox/virtualbox-6.1.16-r1.ebuild 
b/app-emulation/virtualbox/virtualbox-6.1.16-r1.ebuild
deleted file mode 100644
index f6f373e8a64..00000000000
--- a/app-emulation/virtualbox/virtualbox-6.1.16-r1.ebuild
+++ /dev/null
@@ -1,512 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-inherit desktop flag-o-matic java-pkg-opt-2 linux-info pax-utils 
python-single-r1 tmpfiles toolchain-funcs udev xdg
-
-MY_PN="VirtualBox"
-MY_PV="${PV/beta/BETA}"
-MY_PV="${MY_PV/rc/RC}"
-MY_P=${MY_PN}-${MY_PV}
-[[ "${PV}" == *a ]] && DIR_PV="$(ver_cut 1-3)"
-
-DESCRIPTION="Family of powerful x86 virtualization products for enterprise and 
home use"
-HOMEPAGE="https://www.virtualbox.org/";
-SRC_URI="https://download.virtualbox.org/virtualbox/${DIR_PV:-${MY_PV}}/${MY_P}.tar.bz2
-       
https://dev.gentoo.org/~polynomial-c/${PN}/patchsets/${PN}-6.1.12-patches-01.tar.xz";
-
-LICENSE="GPL-2 dtrace? ( CDDL )"
-SLOT="0/$(ver_cut 1-2)"
-[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
-KEYWORDS="amd64"
-IUSE="alsa debug doc dtrace headless java libressl lvm +opus pam pax_kernel 
pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc"
-
-CDEPEND="
-       ${PYTHON_DEPS}
-       !app-emulation/virtualbox-bin
-       acct-group/vboxusers
-       ~app-emulation/virtualbox-modules-${DIR_PV:-${PV}}
-       dev-libs/libIDL
-       >=dev-libs/libxslt-1.1.19
-       net-misc/curl
-       dev-libs/libxml2
-       media-libs/libpng:0=
-       media-libs/libvpx:0=
-       sys-libs/zlib:=
-       !headless? (
-               media-libs/libsdl:0[X,video]
-               x11-libs/libX11
-               x11-libs/libxcb:=
-               x11-libs/libXcursor
-               x11-libs/libXext
-               x11-libs/libXmu
-               x11-libs/libXt
-               opengl? ( media-libs/libglvnd[X] )
-               qt5? (
-                       dev-qt/qtcore:5
-                       dev-qt/qtgui:5
-                       dev-qt/qtprintsupport:5
-                       dev-qt/qtwidgets:5
-                       dev-qt/qtx11extras:5
-                       opengl? ( dev-qt/qtopengl:5 )
-                       x11-libs/libXinerama
-               )
-       )
-       libressl? ( dev-libs/libressl:= )
-       !libressl? ( dev-libs/openssl:0= )
-       lvm? ( sys-fs/lvm2 )
-       opus? ( media-libs/opus )
-       udev? ( >=virtual/udev-171 )
-       vnc? ( >=net-libs/libvncserver-0.9.9 )
-"
-DEPEND="
-       ${CDEPEND}
-       alsa? ( >=media-libs/alsa-lib-1.0.13 )
-       !headless? (
-               x11-libs/libXinerama
-               opengl? ( virtual/opengl )
-       )
-       pam? ( sys-libs/pam )
-       pax_kernel? ( sys-apps/elfix )
-       pulseaudio? ( media-sound/pulseaudio )
-       qt5? ( dev-qt/linguist-tools:5 )
-       vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] )
-"
-BDEPEND="
-       ${PYTHON_DEPS}
-       >=dev-util/kbuild-0.1.9998.3127
-       >=dev-lang/yasm-0.6.2
-       sys-devel/bin86
-       sys-libs/libcap
-       sys-power/iasl
-       virtual/pkgconfig
-       doc? (
-               app-text/docbook-sgml-dtd:4.4
-               dev-texlive/texlive-basic
-               dev-texlive/texlive-latex
-               dev-texlive/texlive-latexrecommended
-               dev-texlive/texlive-latexextra
-               dev-texlive/texlive-fontsrecommended
-               dev-texlive/texlive-fontsextra
-       )
-       java? ( >=virtual/jdk-1.6 )
-"
-RDEPEND="
-       ${CDEPEND}
-       java? ( >=virtual/jre-1.6 )
-"
-
-QA_TEXTRELS_x86="usr/lib/virtualbox-ose/VBoxGuestPropSvc.so
-       usr/lib/virtualbox/VBoxSDL.so
-       usr/lib/virtualbox/VBoxSharedFolders.so
-       usr/lib/virtualbox/VBoxDD2.so
-       usr/lib/virtualbox/VBoxOGLrenderspu.so
-       usr/lib/virtualbox/VBoxPython.so
-       usr/lib/virtualbox/VBoxDD.so
-       usr/lib/virtualbox/VBoxDDU.so
-       usr/lib/virtualbox/VBoxREM64.so
-       usr/lib/virtualbox/VBoxSharedClipboard.so
-       usr/lib/virtualbox/VBoxHeadless.so
-       usr/lib/virtualbox/VBoxRT.so
-       usr/lib/virtualbox/VBoxREM.so
-       usr/lib/virtualbox/VBoxSettings.so
-       usr/lib/virtualbox/VBoxKeyboard.so
-       usr/lib/virtualbox/VBoxSharedCrOpenGL.so
-       usr/lib/virtualbox/VBoxVMM.so
-       usr/lib/virtualbox/VirtualBox.so
-       usr/lib/virtualbox/VBoxOGLhosterrorspu.so
-       usr/lib/virtualbox/components/VBoxC.so
-       usr/lib/virtualbox/components/VBoxSVCM.so
-       usr/lib/virtualbox/components/VBoxDDU.so
-       usr/lib/virtualbox/components/VBoxRT.so
-       usr/lib/virtualbox/components/VBoxREM.so
-       usr/lib/virtualbox/components/VBoxVMM.so
-       usr/lib/virtualbox/VBoxREM32.so
-       usr/lib/virtualbox/VBoxPython2_7.so
-       usr/lib/virtualbox/VBoxXPCOMC.so
-       usr/lib/virtualbox/VBoxOGLhostcrutil.so
-       usr/lib/virtualbox/VBoxNetDHCP.so
-       usr/lib/virtualbox/VBoxNetNAT.so"
-
-S="${WORKDIR}/${MY_PN}-${DIR_PV:-${MY_PV}}"
-
-REQUIRED_USE="
-       java? ( sdk )
-       python? ( sdk )
-       vboxwebsrv? ( java )
-       ${PYTHON_REQUIRED_USE}
-"
-
-pkg_pretend() {
-       if ! use headless && ! use qt5 ; then
-               einfo "No USE=\"qt5\" selected, this build will not include any 
Qt frontend."
-       elif use headless && use qt5 ; then
-               einfo "You selected USE=\"headless qt5\", defaulting to"
-               einfo "USE=\"headless\", this build will not include any X11/Qt 
frontend."
-       fi
-
-       if ! use opengl ; then
-               einfo "No USE=\"opengl\" selected, this build will lack"
-               einfo "the OpenGL feature."
-       fi
-       if ! use python ; then
-               einfo "You have disabled the \"python\" USE flag. This will 
only"
-               einfo "disable the python bindings being installed."
-       fi
-}
-
-pkg_setup() {
-       java-pkg-opt-2_pkg_setup
-       python-single-r1_pkg_setup
-
-       tc-ld-disable-gold #bug 488176
-       tc-export CC CXX LD AR RANLIB
-       export HOST_CC="$(tc-getBUILD_CC)"
-}
-
-src_prepare() {
-       # Remove shipped binaries (kBuild,yasm), see bug #232775
-       rm -r kBuild/bin tools || die
-
-       # Replace pointless GCC version check with something less stupid.
-       # This is needed for the qt5 version check.
-       sed -e 's@^check_gcc$@cc_maj="$(${CC} -dumpversion | cut -d. -f1)" ; 
cc_min="$(${CC} -dumpversion | cut -d. -f2)"@' \
-               -i configure || die
-
-       # Disable things unused or split into separate ebuilds
-       sed -e "s@MY_LIBDIR@$(get_libdir)@" \
-               "${FILESDIR}"/${PN}-5-localconfig > LocalConfig.kmk || die
-
-       # Respect LDFLAGS
-       sed -e "s@_LDFLAGS\.${ARCH}*.*=@& ${LDFLAGS}@g" \
-               -i Config.kmk src/libs/xpcom18a4/Config.kmk || die
-
-       # Do not use hard-coded ld (related to bug #488176)
-       sed -e '/QUIET)ld /s@ld @$(LD) @' \
-               -i src/VBox/Devices/PC/ipxe/Makefile.kmk || die
-
-       # Use PAM only when pam USE flag is enbaled (bug #376531)
-       if ! use pam ; then
-               elog "Disabling PAM removes the possibility to use the VRDP 
features."
-               sed -i 's@^.*VBOX_WITH_PAM@#VBOX_WITH_PAM@' Config.kmk || die
-               sed -i 's@\(.*/auth/Makefile.kmk.*\)@#\1@' \
-                       src/VBox/HostServices/Makefile.kmk || die
-       fi
-
-       # add correct java path
-       if use java ; then
-               sed "s@/usr/lib/jvm/java-6-sun@$(java-config -O)@" \
-                       -i "${S}"/Config.kmk || die
-               java-pkg-opt-2_src_prepare
-       fi
-
-       # Only add nopie patch when we're on hardened
-       if gcc-specs-pie ; then
-               eapply "${FILESDIR}/050_virtualbox-5.2.8-nopie.patch"
-       fi
-
-       # Only add paxmark patch when we're on pax_kernel
-       if use pax_kernel ; then
-               eapply "${FILESDIR}"/virtualbox-5.2.8-paxmark-bldprogs.patch
-       fi
-
-       eapply "${WORKDIR}/patches"
-
-       eapply_user
-}
-
-doecho() {
-       echo "$@"
-       "$@" || die
-}
-
-src_configure() {
-       local myconf=(
-               --with-gcc="$(tc-getCC)"
-               --with-g++="$(tc-getCXX)"
-               --disable-dbus
-               --disable-kmods
-               $(usex alsa '' --disable-alsa)
-               $(usex debug --build-debug '')
-               $(usex doc '' --disable-docs)
-               $(usex java '' --disable-java)
-               $(usex lvm '' --disable-devmapper)
-               $(usex opus '' --disable-libopus)
-               $(usex pulseaudio '' --disable-pulse)
-               $(usex python '' --disable-python)
-               $(usex vboxwebsrv --enable-webservice '')
-               $(usex vnc --enable-vnc '')
-       )
-       if ! use headless ; then
-               myconf+=(
-                       $(usex opengl '' --disable-opengl)
-                       $(usex qt5 '' --disable-qt)
-               )
-       else
-               myconf+=(
-                       --build-headless
-                       --disable-opengl
-               )
-       fi
-       if use amd64 && ! has_multilib_profile ; then
-               myconf+=( --disable-vmmraw )
-       fi
-       # not an autoconf script
-       doecho ./configure ${myconf[@]}
-}
-
-src_compile() {
-       source ./env.sh || die
-
-       # Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529)
-       MAKEJOBS=$(grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< 
${MAKEOPTS}) #'
-       MAKELOAD=$(grep -Eo 
'(\-l|\-\-load-average)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS}) #'
-       MAKEOPTS="${MAKEJOBS} ${MAKELOAD}"
-       MAKE="kmk" emake \
-               VBOX_BUILD_PUBLISHER=_Gentoo \
-               TOOL_GXX3_CC="$(tc-getCC)" TOOL_GXX3_CXX="$(tc-getCXX)" \
-               TOOL_GXX3_LD="$(tc-getCXX)" VBOX_GCC_OPT="${CXXFLAGS}" \
-               TOOL_YASM_AS=yasm KBUILD_VERBOSE=2 \
-               VBOX_WITH_VBOXIMGMOUNT=1 \
-               all
-}
-
-src_install() {
-       cd "${S}"/out/linux.${ARCH}/$(usex debug debug release)/bin || die
-
-       local vbox_inst_path="/usr/$(get_libdir)/${PN}" each size ico icofile
-
-       vbox_inst() {
-               local binary="${1}"
-               local perms="${2:-0750}"
-               local path="${3:-${vbox_inst_path}}"
-
-               [[ -n "${binary}" ]] || die "vbox_inst: No binary given!"
-               [[ ${perms} =~ ^[[:digit:]]+{4}$ ]] || die "vbox_inst: perms 
must consist of four digits."
-
-               insinto ${path}
-               doins ${binary}
-               fowners root:vboxusers ${path}/${binary}
-               fperms ${perms} ${path}/${binary}
-       }
-
-       # Create configuration files
-       insinto /etc/vbox
-       newins "${FILESDIR}/${PN}-4-config" vbox.cfg
-
-       # Set the correct libdir
-       sed \
-               -e "s@MY_LIBDIR@$(get_libdir)@" \
-               -i "${ED}"/etc/vbox/vbox.cfg || die "vbox.cfg sed failed"
-
-       # Install the wrapper script
-       exeinto ${vbox_inst_path}
-       newexe "${FILESDIR}/${PN}-ose-6-wrapper" "VBox"
-       fowners root:vboxusers ${vbox_inst_path}/VBox
-       fperms 0750 ${vbox_inst_path}/VBox
-
-       # Install binaries and libraries
-       insinto ${vbox_inst_path}
-       doins -r components
-
-       for each in 
VBox{Autostart,BalloonCtrl,BugReport,CpuReport,ExtPackHelperApp,Manage,SVC,Tunctl,VMMPreload,XPCOMIPCD}
 vboximg-mount *so *r0 iPxeBaseBin ; do
-               vbox_inst ${each}
-       done
-
-       # These binaries need to be suid root.
-       for each in VBox{Headless,Net{AdpCtl,DHCP,NAT}} ; do
-               vbox_inst ${each} 4750
-       done
-
-       # Install EFI Firmware files (bug #320757)
-       for each in VBoxEFI{32,64}.fd ; do
-               vbox_inst ${each} 0644
-       done
-
-       # VBoxSVC and VBoxManage need to be pax-marked (bug #403453)
-       # VBoxXPCOMIPCD (bug #524202)
-       for each in VBox{Headless,Manage,SVC,XPCOMIPCD} ; do
-               pax-mark -m "${ED}"${vbox_inst_path}/${each}
-       done
-
-       # Symlink binaries to the shipped wrapper
-       for each in vbox{autostart,balloonctrl,bugreport,headless,manage} 
VBox{Autostart,BalloonCtrl,BugReport,Headless,Manage,VRDP} ; do
-               dosym ${vbox_inst_path}/VBox /usr/bin/${each}
-       done
-       dosym ${vbox_inst_path}/VBoxTunctl /usr/bin/VBoxTunctl
-       dosym ${vbox_inst_path}/vboximg-mount /usr/bin/vboximg-mount
-
-       if use pam ; then
-               # VRDPAuth only works with this (bug #351949)
-               dosym VBoxAuth.so ${vbox_inst_path}/VRDPAuth.so
-       fi
-
-       # set an env-variable for 3rd party tools
-       echo -n "VBOX_APP_HOME=${vbox_inst_path}" > "${T}/90virtualbox"
-       doenvd "${T}/90virtualbox"
-
-       if ! use headless ; then
-               vbox_inst rdesktop-vrdp
-               vbox_inst VBoxSDL 4750
-               pax-mark -m "${ED}"${vbox_inst_path}/VBoxSDL
-
-               for each in vboxsdl VBoxSDL ; do
-                       dosym ${vbox_inst_path}/VBox /usr/bin/${each}
-               done
-
-               if use qt5 ; then
-                       vbox_inst VirtualBox
-                       vbox_inst VirtualBoxVM 4750
-                       for each in VirtualBox{,VM} ; do
-                               pax-mark -m "${ED}"${vbox_inst_path}/${each}
-                       done
-
-                       if use opengl ; then
-                               vbox_inst VBoxTestOGL
-                               pax-mark -m "${ED}"${vbox_inst_path}/VBoxTestOGL
-                       fi
-
-                       for each in virtualbox{,vm} VirtualBox{,VM} ; do
-                               dosym ${vbox_inst_path}/VBox /usr/bin/${each}
-                       done
-
-                       insinto /usr/share/${PN}
-                       doins -r nls
-                       doins -r UnattendedTemplates
-
-                       domenu ${PN}.desktop
-               fi
-
-               pushd "${S}"/src/VBox/Artwork/OSE &>/dev/null || die
-               for size in 16 32 48 64 128 ; do
-                       newicon -s ${size} ${PN}-${size}px.png ${PN}.png
-               done
-               newicon ${PN}-48px.png ${PN}.png
-               doicon -s scalable ${PN}.svg
-               popd &>/dev/null || die
-               pushd "${S}"/src/VBox/Artwork/other &>/dev/null || die
-               for size in 16 24 32 48 64 72 96 128 256 512 ; do
-                       for ico in hdd ova ovf vbox{,-extpack} vdi vdh vmdk ; do
-                               icofile="${PN}-${ico}-${size}px.png"
-                               if [[ -f "${icofile}" ]] ; then
-                                       newicon -s ${size} ${icofile} 
${PN}-${ico}.png
-                               fi
-                       done
-               done
-               popd &>/dev/null || die
-       fi
-
-       if use lvm ; then
-               vbox_inst VBoxVolInfo 4750
-               dosym ${vbox_inst_path}/VBoxVolInfo /usr/bin/VBoxVolInfo
-       fi
-
-       if use sdk ; then
-               insinto ${vbox_inst_path}
-               doins -r sdk
-
-               if use java ; then
-                       java-pkg_regjar 
"${ED}/${vbox_inst_path}/sdk/bindings/xpcom/java/vboxjxpcom.jar"
-                       java-pkg_regso 
"${ED}/${vbox_inst_path}/libvboxjxpcom.so"
-               fi
-       fi
-
-       if use udev ; then
-               # New way of handling USB device nodes for VBox (bug #356215)
-               local udevdir="$(get_udevdir)"
-               insinto ${udevdir}
-               doins VBoxCreateUSBNode.sh
-               fowners root:vboxusers ${udevdir}/VBoxCreateUSBNode.sh
-               fperms 0750 ${udevdir}/VBoxCreateUSBNode.sh
-               insinto ${udevdir}/rules.d
-               sed "s@%UDEVDIR%@${udevdir}@" "${FILESDIR}"/10-virtualbox.rules 
\
-                       > "${T}"/10-virtualbox.rules || die
-               doins "${T}"/10-virtualbox.rules
-       fi
-
-       if use vboxwebsrv ; then
-               vbox_inst vboxwebsrv
-               dosym ${vbox_inst_path}/VBox /usr/bin/vboxwebsrv
-               newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
-               newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
-       fi
-
-       # Remove dead symlinks (bug #715338)
-       find "${ED}"/usr/$(get_libdir)/${PN} -xtype l -delete || die
-
-       # Fix version string in extensions or else they don't get accepted
-       # by the virtualbox host process (see bug #438930)
-       find ExtensionPacks -type f -name "ExtPack.xml" -print0 \
-               | xargs --no-run-if-empty --null sed -i '/Version/s@_Gentoo@@' \
-               || die
-
-       local extensions_dir="${vbox_inst_path}/ExtensionPacks"
-
-       if use vnc ; then
-               insinto ${extensions_dir}
-               doins -r ExtensionPacks/VNC
-       fi
-
-       if use dtrace ; then
-               insinto ${extensions_dir}
-               doins -r ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack
-       fi
-
-       if use doc ; then
-               dodoc UserManual.pdf
-       fi
-
-       newtmpfiles "${FILESDIR}"/${PN}-vboxusb_tmpfilesd ${PN}-vboxusb.conf
-}
-
-pkg_preinst() {
-       xdg_pkg_preinst
-}
-
-pkg_postinst() {
-       xdg_pkg_postinst
-
-       if use udev ; then
-               udevadm control --reload-rules \
-                       && udevadm trigger --subsystem-match=usb
-       fi
-
-       tmpfiles_process /usr/lib/tmpfiles.d/virtualbox-vboxusb.conf
-
-       if ! use headless && use qt5 ; then
-               elog "To launch VirtualBox just type: \"virtualbox\"."
-       fi
-       elog "You must be in the vboxusers group to use VirtualBox."
-       elog ""
-       elog "The latest user manual is available for download at:"
-       elog 
"http://download.virtualbox.org/virtualbox/${DIR_PV:-${PV}}/UserManual.pdf";
-       elog ""
-       elog "For advanced networking setups you should emerge:"
-       elog "net-misc/bridge-utils and sys-apps/usermode-utilities"
-       elog ""
-       elog "Starting with version 4.0.0, ${PN} has USB-1 support."
-       elog "For USB-2 support, PXE-boot ability and VRDP support please 
emerge"
-       elog "  app-emulation/virtualbox-extpack-oracle"
-       elog "package."
-       elog "Starting with version 5.0.0, ${PN} no longer has the 
\"additions\" and"
-       elog "the \"extension\" USE flag. For installation of the guest 
additions ISO"
-       elog "image, please emerge"
-       elog "  app-emulation/virtualbox-additions"
-       elog "and for the USB2, USB3, VRDP and PXE boot ROM modules, please 
emerge"
-       elog "  app-emulation/virtualbox-extpack-oracle"
-       if ! use udev ; then
-               elog ""
-               elog "WARNING!"
-               elog "Without USE=udev, USB devices will likely not work in 
${PN}."
-       elif [[ -e "${ROOT}/etc/udev/rules.d/10-virtualbox.rules" ]] ; then
-               elog ""
-               elog "Please remove 
\"${ROOT}/etc/udev/rules.d/10-virtualbox.rules\""
-               elog "or else USB in ${PN} won't work."
-       fi
-}
-
-pkg_postrm() {
-       xdg_pkg_postrm
-}

Reply via email to