commit:     d66719f5cd1476433e895d82059c431688d40914
Author:     Viorel Munteanu <ceamac.paragon <AT> gmail <DOT> com>
AuthorDate: Thu Sep  1 08:08:17 2022 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Sep  5 12:39:17 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d66719f5

app-emulation/virtualbox: drop versions

Closes: https://bugs.gentoo.org/839990
Closes: https://bugs.gentoo.org/859391
Signed-off-by: Viorel Munteanu <ceamac.paragon <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/27149
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 app-emulation/virtualbox/Manifest                  |   3 -
 .../files/virtualbox-6.1.34-no-pam.patch           |  22 -
 .../files/virtualbox-6.1.34-python3.10.patch       |  13 -
 .../files/virtualbox-6.1.34-r3-python3.10.patch    | 122 ----
 .../files/virtualbox-6.1.34-vboxr0.patch           |  20 -
 .../virtualbox/virtualbox-6.1.32-r3.ebuild         | 517 ----------------
 .../virtualbox/virtualbox-6.1.34-r1.ebuild         | 506 ----------------
 .../virtualbox/virtualbox-6.1.34-r3.ebuild         | 535 -----------------
 .../virtualbox/virtualbox-6.1.34-r7.ebuild         | 636 --------------------
 app-emulation/virtualbox/virtualbox-6.1.36.ebuild  | 647 ---------------------
 10 files changed, 3021 deletions(-)

diff --git a/app-emulation/virtualbox/Manifest 
b/app-emulation/virtualbox/Manifest
index f0e2964cc09c..d98f18d2ee2d 100644
--- a/app-emulation/virtualbox/Manifest
+++ b/app-emulation/virtualbox/Manifest
@@ -1,6 +1,3 @@
-DIST VirtualBox-6.1.32.tar.bz2 165758238 BLAKE2B 
24873d7cc8bd306ea3552fe75379fbe7be767c85406042344eb047ed31184c3357aea07dda5e15c275f5036ae63106ef1d2e6524b143bc645a6b5ba0016f1391
 SHA512 
8bf7af6b8b4d3ba90f0e91589cf26400648436eb9da6d31c1a760460bfe5eb7311ac3220b4c9a98ac50e559641d3d5f559134be65288821038255de1c2c7ce1e
-DIST VirtualBox-6.1.34.tar.bz2 165761216 BLAKE2B 
d3c8f7d3d6f408e4c4275c2b2815e92819c871359501ec4fa7212bf7cdc852613e2e4703d8650371097a5bc805efa04ea75bb03ab83d24a869a677555f6e22d5
 SHA512 
46d63a9fd9df76af654af59fab5cf555858bc2c4b5dc34e2378d85ae784e6380b6def4aab06909a9b5e114a7297269f90cfb2c3d8d6529b423d703afbad18c64
 DIST VirtualBox-6.1.36.tar.bz2 165685382 BLAKE2B 
98dbb06450b9df650cb72493bcdea4b88fa9dd21f76d723fdc0bb2c1ab8266f67e972a7222dc9b5bd0d43754911710664bddace753995be025cf6bcc05a24ae5
 SHA512 
cc3b984a7da40c9bf14831808a2bc2bf7bf6821e53c25fa11cb4b4275feb1d4b0cb4a47d8a360b90c89e5a4038481efe8fe28ee22996dbefb6446761e88a8dec
 DIST VirtualBox-6.1.38.tar.bz2 165761175 BLAKE2B 
decda6e7a595f79e6ace6f8f6b8a7829223ac1422c3d280b6287a40ef942e773ad473f4fa4640a76f8fb825ebd8561c646f1b3d87922b1af55c138298b4c8f4f
 SHA512 
7a4f2dc80e3251b1da6d29d3c6f6b802527decc70497b1a1d1008c0ab3109c2039d131c587d6ec4786aea619546757655337c2ec3456243336ca13c6f6748116
-DIST virtualbox-6.1.12-patches-01.tar.xz 2528 BLAKE2B 
a5d7cde0daea41bee2e40e46569c725769927a31865d99d13b8b13c4903e59b4097f85da15dc592b9c7e8baf8ff805397af827620f107ba09a468b4d1198ecab
 SHA512 
f71d10a9fbce99c3f631ef30bcfa9d0e017e702ac509541b039e08ccbcd024beb93fde09c43d90af5d9d28f6842a7947f20e7950d3897da3e6d57859657e1123
 DIST virtualbox-patches-6.1.36.tar.bz2 2733 BLAKE2B 
dcfebfeca4873d382441515d48b4dfee9343bc7c83ea3cbb5002dbf7975143a79fae9a701b67dc35505e9ca03ff1b6293cb7c3279c4fdfda8ad21ba5fb9b7e87
 SHA512 
1bed5cdefbf8e7c4b0d9092ba4961ecf2262f27f35c71a91ef6f2e8fe8a1d92ed74f06bafbf58d70ba7165d933997f58073f4d4f4051e3ba5c0339b729066f57

diff --git a/app-emulation/virtualbox/files/virtualbox-6.1.34-no-pam.patch 
b/app-emulation/virtualbox/files/virtualbox-6.1.34-no-pam.patch
deleted file mode 100644
index 9266cece55bd..000000000000
--- a/app-emulation/virtualbox/files/virtualbox-6.1.34-no-pam.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-https://bugs.gentoo.org/843437
-https://www.virtualbox.org/changeset/94406/vbox
-
---- a/src/VBox/Runtime/Makefile.kmk
-+++ b/src/VBox/Runtime/Makefile.kmk
-@@ -324,4 +324,7 @@
- ifdef IPRT_WITH_FUTEX_BASED_SEMS
-  RuntimeR3_DEFS.linux  += IPRT_WITH_FUTEX_BASED_SEMS
-+endif
-+ifdef IPRT_WITHOUT_PAM
-+ RuntimeR3_DEFS        += IPRT_WITHOUT_PAM
- endif
- RuntimeR3_INCS         = \
---- a/src/VBox/Runtime/r3/posix/process-creation-posix.cpp
-+++ b/src/VBox/Runtime/r3/posix/process-creation-posix.cpp
-@@ -86,4 +86,5 @@
- 
- #if !defined(IPRT_USE_PAM) \
-+ && !defined(IPRT_WITHOUT_PAM) \
-  && ( defined(RT_OS_DARWIN) || defined(RT_OS_FREEBSD) || defined(RT_OS_LINUX) 
|| defined(RT_OS_NETBSD) || defined(RT_OS_OPENBSD) )
- # define IPRT_USE_PAM
-

diff --git a/app-emulation/virtualbox/files/virtualbox-6.1.34-python3.10.patch 
b/app-emulation/virtualbox/files/virtualbox-6.1.34-python3.10.patch
deleted file mode 100644
index eacc77a7f5bc..000000000000
--- a/app-emulation/virtualbox/files/virtualbox-6.1.34-python3.10.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-https://bugs.gentoo.org/852152
-
---- VirtualBox-6.1.34/configure
-+++ VirtualBox-6.1.34/configure
-@@ -2027,7 +2027,7 @@
- }
- EOF
-   found=
--  SUPPYTHONLIBS="python2.7 python2.6 python3.1 python3.2 python3.3 python3.4 
python3.4m python3.5 python3.5m python3.6 python3.6m python3.7 python3.7m 
python3.8 python3.8m python3.9 python3.9m"
-+  SUPPYTHONLIBS="python2.7 python2.6 python3.1 python3.2 python3.3 python3.4 
python3.4m python3.5 python3.5m python3.6 python3.6m python3.7 python3.7m 
python3.8 python3.8m python3.9 python3.9m python3.10 python3.10m"
-   for p in $PYTHONDIR; do
-     for d in $SUPPYTHONLIBS; do
-       for b in lib/x86_64-linux-gnu lib/i386-linux-gnu lib64 lib/64 lib; do

diff --git 
a/app-emulation/virtualbox/files/virtualbox-6.1.34-r3-python3.10.patch 
b/app-emulation/virtualbox/files/virtualbox-6.1.34-r3-python3.10.patch
deleted file mode 100644
index e06e86910103..000000000000
--- a/app-emulation/virtualbox/files/virtualbox-6.1.34-r3-python3.10.patch
+++ /dev/null
@@ -1,122 +0,0 @@
-https://github.com/archlinux/svntogit-community/blob/b103146beee8b7c70d04685033a8536aed2e5aea/trunk/002-python310.patch
-https://github.com/archlinux/svntogit-community/blob/b103146beee8b7c70d04685033a8536aed2e5aea/trunk/003-pyunicode.patch
-
-https://www.virtualbox.org/changeset/90537/vbox
-https://www.virtualbox.org/changeset/86623/vbox
---- a/src/libs/xpcom18a4/python/src/module/_xpcom.cpp
-+++ b/src/libs/xpcom18a4/python/src/module/_xpcom.cpp
-@@ -84,7 +84,11 @@
- #  define MANGLE_MODULE_INIT(a_Name)    RT_CONCAT(a_Name, MODULE_NAME_SUFFIX)
- # endif
- # ifdef VBOX_PYXPCOM_VERSIONED
--#  if   PY_VERSION_HEX >= 0x03090000 && PY_VERSION_HEX < 0x030a0000
-+#  if   PY_VERSION_HEX >= 0x030a0000 && PY_VERSION_HEX < 0x030b0000
-+#   define MODULE_NAME    MANGLE_MODULE_NAME("VBoxPython3_10")
-+#   define initVBoxPython MANGLE_MODULE_INIT(PyInit_VBoxPython3_10)
-+
-+#  elif   PY_VERSION_HEX >= 0x03090000 && PY_VERSION_HEX < 0x030a0000
- #   define MODULE_NAME    MANGLE_MODULE_NAME("VBoxPython3_9")
- #   define initVBoxPython MANGLE_MODULE_INIT(PyInit_VBoxPython3_9)
- 
---- a/src/libs/xpcom18a4/python/Makefile.kmk
-+++ b/src/libs/xpcom18a4/python/Makefile.kmk
-@@ -4,7 +4,7 @@
- #
- 
- #
--# Copyright (C) 2009-2017 Oracle Corporation
-+# Copyright (C) 2009-2021 Oracle Corporation
- #
- # This file is part of VirtualBox Open Source Edition (OSE), as
- # available from http://www.virtualbox.org. This file is free software;
-@@ -20,7 +20,7 @@
- 
- #
- # List of supported Python versions, defining a number of
--# 
VBOX_PYTHON[26|27|31|32|32M|33|33M|34|34M|35|35M|36|36M|37|37M|38|38M|39|39M|DEF]_[INC|LIB]
 variables
-+# 
VBOX_PYTHON[26|27|31|32|32M|33|33M|34|34M|35|35M|36|36M|37|37M|38|38M|39|39M|310|310M|DEF]_[INC|LIB]
 variables
- # which get picked up below.
- #
- ifeq ($(KBUILD_TARGET),darwin) # Relatively predictable, don't script.
-@@ -646,6 +646,52 @@
-  endif
- endif
- 
-+ifdef VBOX_PYTHON310_INC
-+#
-+# Python 3.10 version
-+#
-+DLLS += VBoxPython3_10
-+VBoxPython3_10_EXTENDS    = VBoxPythonBase
-+VBoxPython3_10_EXTENDS_BY = appending
-+VBoxPython3_10_TEMPLATE   = XPCOM
-+VBoxPython3_10_INCS       = $(VBOX_PYTHON310_INC)
-+VBoxPython3_10_LIBS       = $(VBOX_PYTHON310_LIB)
-+
-+ ifdef VBOX_WITH_32_ON_64_MAIN_API
-+  ifdef VBOX_PYTHON310_LIB_X86
-+DLLS += VBoxPython3_10_x86
-+VBoxPython3_10_x86_EXTENDS    = VBoxPythonBase_x86
-+VBoxPython3_10_x86_EXTENDS_BY = appending
-+VBoxPython3_10_x86_TEMPLATE   = XPCOM
-+VBoxPython3_10_x86_INCS       = $(VBOX_PYTHON310_INC)
-+VBoxPython3_10_x86_LIBS       = $(VBOX_PYTHON310_LIB_X86)
-+  endif
-+ endif
-+endif
-+
-+ifdef VBOX_PYTHON310M_INC
-+#
-+# Python 3.10 version with pymalloc
-+#
-+DLLS += VBoxPython3_10m
-+VBoxPython3_10m_EXTENDS    = VBoxPythonBase_m
-+VBoxPython3_10m_EXTENDS_BY = appending
-+VBoxPython3_10m_TEMPLATE   = XPCOM
-+VBoxPython3_10m_INCS       = $(VBOX_PYTHON310M_INC)
-+VBoxPython3_10m_LIBS       = $(VBOX_PYTHON310M_LIB)
-+
-+ ifdef VBOX_WITH_32_ON_64_MAIN_API
-+  ifdef VBOX_PYTHON310M_LIB_X86
-+DLLS += VBoxPython3_10m_x86
-+VBoxPython3_10m_x86_EXTENDS    = VBoxPythonBase_x86_m
-+VBoxPython3_10m_x86_EXTENDS_BY = appending
-+VBoxPython3_10m_x86_TEMPLATE_  = XPCOM
-+VBoxPython3_10m_x86_INCS       = $(VBOX_PYTHON310M_INC)
-+VBoxPython3_10m_x86_LIBS       = $(VBOX_PYTHON310M_LIB_X86)
-+  endif
-+ endif
-+endif
-+
- ifdef VBOX_PYTHONDEF_INC
- #
- # Python without versioning
-@@ -730,4 +776,3 @@
- 
- 
- include $(FILE_KBUILD_SUB_FOOTER)
--
-
---- a/src/libs/xpcom18a4/python/src/PyXPCOM.h
-+++ b/src/libs/xpcom18a4/python/src/PyXPCOM.h
-@@ -137,12 +137,14 @@
- #  define PyInt_Check(o) PyLong_Check(o)
- #  define PyInt_AsLong(o) PyLong_AsLong(o)
- #  define PyNumber_Int(o) PyNumber_Long(o)
--#  ifndef PyUnicode_AsUTF8
--#   define PyUnicode_AsUTF8(o) _PyUnicode_AsString(o)
-+#  if !defined(Py_LIMITED_API) && PY_VERSION_HEX <= 0x03030000 /* 3.3 added 
PyUnicode_AsUTF8AndSize */
-+#   ifndef PyUnicode_AsUTF8
-+#    define PyUnicode_AsUTF8(o) _PyUnicode_AsString(o)
-+#   endif
-+#   ifndef PyUnicode_AsUTF8AndSize
-+#    define PyUnicode_AsUTF8AndSize(o,s) _PyUnicode_AsStringAndSize(o,s)
-+#   endif
- #  endif
--#  ifndef PyUnicode_AsUTF8AndSize
--#   define PyUnicode_AsUTF8AndSize(o,s) _PyUnicode_AsStringAndSize(o,s)
--#  endif
- typedef struct PyMethodChain
- {
-     PyMethodDef *methods;
-

diff --git a/app-emulation/virtualbox/files/virtualbox-6.1.34-vboxr0.patch 
b/app-emulation/virtualbox/files/virtualbox-6.1.34-vboxr0.patch
deleted file mode 100644
index 8d8105edee9a..000000000000
--- a/app-emulation/virtualbox/files/virtualbox-6.1.34-vboxr0.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-https://www.virtualbox.org/ticket/20904
-
---- VirtualBox-6.1.34/Config.kmk
-+++ VirtualBox-6.1.34/Config.kmk
-@@ -4502,11 +4502,14 @@
- TEMPLATE_VBoxR0_TOOL                = $(VBOX_GCC_TOOL)
- TEMPLATE_VBoxR0_CFLAGS              = -fno-pie -nostdinc -g $(VBOX_GCC_pipe) 
$(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_C) \
-       $(VBOX_GCC_Wno-variadic-macros) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) 
-fno-strict-aliasing -fno-exceptions \
--      $(VBOX_GCC_fno-stack-protector) -fno-common 
$(VBOX_GCC_fvisibility-hidden) -std=gnu99 $(VBOX_GCC_IPRT_FMT_CHECK)
-+      $(VBOX_GCC_fno-stack-protector) -fno-common -ffreestanding 
$(VBOX_GCC_fvisibility-hidden) -std=gnu99 $(VBOX_GCC_IPRT_FMT_CHECK)
- TEMPLATE_VBoxR0_CXXFLAGS            = -fno-pie -nostdinc -g $(VBOX_GCC_pipe) 
$(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_CXX) \
-       $(VBOX_GCC_Wno-variadic-macros) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) 
-fno-strict-aliasing -fno-exceptions \
-       $(VBOX_GCC_fno-stack-protector) -fno-common 
$(VBOX_GCC_fvisibility-inlines-hidden) $(VBOX_GCC_fvisibility-hidden) \
-       -fno-rtti $(VBOX_GCC_IPRT_FMT_CHECK)
-+ if $(VBOX_GCC_VERSION_CC) >= 40500 # 4.1.2 complains, 4.5.2 is okay, didn't 
check which version inbetween made it okay with g++.
-+TEMPLATE_VBoxR0_CXXFLAGS           += -ffreestanding
-+ endif
- TEMPLATE_VBoxR0_CFLAGS.amd64        = -m64 -mno-red-zone -mno-sse -mno-mmx 
-mno-sse2 -mno-3dnow -fasynchronous-unwind-tables -ffreestanding
- TEMPLATE_VBoxR0_CXXFLAGS.amd64      = -m64 -mno-red-zone -mno-sse -mno-mmx 
-mno-sse2 -mno-3dnow -fasynchronous-unwind-tables
- TEMPLATE_VBoxR0_CXXFLAGS.freebsd    = -ffreestanding

diff --git a/app-emulation/virtualbox/virtualbox-6.1.32-r3.ebuild 
b/app-emulation/virtualbox/virtualbox-6.1.32-r3.ebuild
deleted file mode 100644
index 722a6987c670..000000000000
--- a/app-emulation/virtualbox/virtualbox-6.1.32-r3.ebuild
+++ /dev/null
@@ -1,517 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-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 lvm +opus pam pax-kernel pch 
pulseaudio +opengl python +qt5 +sdk +sdl +udev vboxwebsrv vnc"
-
-COMMON_DEPEND="
-       ${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? (
-               sdl? ( 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]
-                       virtual/glu
-               )
-               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
-               )
-       )
-       dev-libs/openssl:0=
-       virtual/libcrypt:=
-       lvm? ( sys-fs/lvm2 )
-       opus? ( media-libs/opus )
-       udev? ( >=virtual/udev-171 )
-       vnc? ( >=net-libs/libvncserver-0.9.9 )
-"
-DEPEND="
-       ${COMMON_DEPEND}
-       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.8 )
-"
-RDEPEND="
-       ${COMMON_DEPEND}
-       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
-
-       if ! use pch ; then
-               # bug #753323
-               printf '\n%s\n' "VBOX_WITHOUT_PRECOMPILED_HEADERS=1" \
-                       >> LocalConfig.kmk || die
-       fi
-
-       # 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
-               einfo "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 "${FILESDIR}/${PN}-6.1.26-configure-include-qt5-path.patch" 
#805365
-
-       eapply "${WORKDIR}/patches"
-
-       default
-}
-
-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 sdl '' --disable-sdl)
-                       $(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
-               if use sdl ; then
-                       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
-               fi
-
-               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
-               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_postinst() {
-       xdg_pkg_postinst
-
-       if use udev ; then
-               udevadm control --reload-rules \
-                       && udevadm trigger --subsystem-match=usb
-       fi
-
-       tmpfiles_process 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
-}

diff --git a/app-emulation/virtualbox/virtualbox-6.1.34-r1.ebuild 
b/app-emulation/virtualbox/virtualbox-6.1.34-r1.ebuild
deleted file mode 100644
index 3857ced6663f..000000000000
--- a/app-emulation/virtualbox/virtualbox-6.1.34-r1.ebuild
+++ /dev/null
@@ -1,506 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-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 lvm +opus pam pax-kernel pch 
pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc"
-
-COMMON_DEPEND="
-       ${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]
-                       virtual/glu
-               )
-               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
-               )
-       )
-       dev-libs/openssl:0=
-       virtual/libcrypt:=
-       lvm? ( sys-fs/lvm2 )
-       opus? ( media-libs/opus )
-       udev? ( >=virtual/udev-171 )
-       vnc? ( >=net-libs/libvncserver-0.9.9 )
-"
-DEPEND="
-       ${COMMON_DEPEND}
-       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.8 )
-"
-RDEPEND="
-       ${COMMON_DEPEND}
-       java? ( >=virtual/jre-1.6 )
-"
-
-QA_TEXTRELS="
-       usr/lib64/virtualbox/VMMR0.r0
-"
-
-QA_EXECSTACK="
-       usr/lib64/virtualbox/iPxeBaseBin
-       usr/lib64/virtualbox/VMMR0.r0
-       usr/lib64/virtualbox/VBoxDDR0.r0
-"
-
-QA_WX_LOAD="
-       usr/lib64/virtualbox/iPxeBaseBin
-"
-
-QA_PRESTRIPPED="
-       /usr/lib64/virtualbox/VMMR0.r0
-       /usr/lib64/virtualbox/VBoxDDR0.r0
-"
-
-S="${WORKDIR}/${MY_PN}-${DIR_PV:-${MY_PV}}"
-
-REQUIRED_USE="
-       java? ( sdk )
-       python? ( sdk )
-       vboxwebsrv? ( java )
-       ${PYTHON_REQUIRED_USE}
-"
-
-PATCHES=(
-       "${FILESDIR}/${P}-vboxr0.patch"
-       "${FILESDIR}/${PN}-6.1.34-python3.10.patch" #852152
-)
-
-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
-
-       if ! use pch ; then
-               # bug #753323
-               printf '\n%s\n' "VBOX_WITHOUT_PRECOMPILED_HEADERS=1" \
-                       >> LocalConfig.kmk || die
-       fi
-
-       # 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
-               einfo "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 "${FILESDIR}/${PN}-6.1.26-configure-include-qt5-path.patch" 
#805365
-
-       eapply "${WORKDIR}/patches"
-
-       default
-}
-
-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
-               local udevdir="$(get_udevdir)"
-               local udev_file="VBoxCreateUSBNode.sh"
-               local rules_file="10-virtualbox.rules"
-
-               insinto ${udevdir}
-               doins ${udev_file}
-               fowners root:vboxusers ${udevdir}/${udev_file}
-               fperms 0750 ${udevdir}/${udev_file}
-
-               insinto ${udevdir}/rules.d
-               sed "s@%UDEVDIR%@${udevdir}@" "${FILESDIR}"/${rules_file} \
-                       > "${T}"/${rules_file} || die
-               doins "${T}"/${rules_file}
-       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_postinst() {
-       xdg_pkg_postinst
-
-       if use udev ; then
-               udevadm control --reload-rules \
-                       && udevadm trigger --subsystem-match=usb
-       fi
-
-       tmpfiles_process 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}."
-       fi
-}

diff --git a/app-emulation/virtualbox/virtualbox-6.1.34-r3.ebuild 
b/app-emulation/virtualbox/virtualbox-6.1.34-r3.ebuild
deleted file mode 100644
index 1475e06f6fa0..000000000000
--- a/app-emulation/virtualbox/virtualbox-6.1.34-r3.ebuild
+++ /dev/null
@@ -1,535 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# This absolutely doesn't work with Python 3.10 yet as of 6.1.34.
-# Two problems:
-# 1. The build system (not just in configure, but in 
src/libs/xpcom18a4/python/Makefile.kmk)
-# insists on trying to detect various Python paths without giving choice of 
which is used;
-#
-# 2. None of that machinery mentioned in #1. is rigged up for Python 3.10+, and
-# the homebrew Makefile/kbuild stuff is a pain to understand.
-#
-# bug #785835, bug #856121
-PYTHON_COMPAT=( python3_{8,9} )
-inherit desktop edo java-pkg-opt-2 linux-info multilib optfeature 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";
-S="${WORKDIR}/${MY_PN}-${DIR_PV:-${MY_PV}}"
-
-LICENSE="GPL-2 dtrace? ( CDDL )"
-SLOT="0/$(ver_cut 1-2)"
-if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
-       KEYWORDS="~amd64"
-fi
-IUSE="alsa debug doc dtrace headless java lvm +opus pam pax-kernel pch 
pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc"
-
-COMMON_DEPEND="
-       ${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]
-                       virtual/glu
-               )
-               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
-               )
-       )
-       dev-libs/openssl:0=
-       virtual/libcrypt:=
-       lvm? ( sys-fs/lvm2 )
-       opus? ( media-libs/opus )
-       udev? ( >=virtual/udev-171 )
-       vnc? ( >=net-libs/libvncserver-0.9.9 )
-"
-# We're stuck on JDK (and JRE, I guess?) 1.8 because of need for wsimport
-# with USE="vboxwebsrv java". Note that we have to put things in DEPEND,
-# not (only, anyway) BDEPEND, as the eclass magic to set the environment 
variables
-# based on *DEPEND doesn't work for BDEPEND at least right now. See bug 
#832166.
-DEPEND="
-       ${COMMON_DEPEND}
-       alsa? ( >=media-libs/alsa-lib-1.0.13 )
-       !headless? (
-               x11-libs/libXinerama
-               opengl? ( virtual/opengl )
-       )
-       java? ( virtual/jdk:1.8 )
-       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.8 )
-"
-RDEPEND="
-       ${COMMON_DEPEND}
-       java? ( virtual/jre:1.8 )
-"
-
-QA_TEXTRELS="
-       usr/lib64/virtualbox/VMMR0.r0
-"
-
-QA_EXECSTACK="
-       usr/lib64/virtualbox/iPxeBaseBin
-       usr/lib64/virtualbox/VMMR0.r0
-       usr/lib64/virtualbox/VBoxDDR0.r0
-"
-
-QA_WX_LOAD="
-       usr/lib64/virtualbox/iPxeBaseBin
-"
-
-QA_PRESTRIPPED="
-       usr/lib64/virtualbox/VMMR0.r0
-       usr/lib64/virtualbox/VBoxDDR0.r0
-"
-
-REQUIRED_USE="
-       java? ( sdk )
-       python? ( sdk )
-       vboxwebsrv? ( java )
-       ${PYTHON_REQUIRED_USE}
-"
-
-PATCHES=(
-       "${FILESDIR}"/${P}-vboxr0.patch
-       "${FILESDIR}"/${PN}-6.1.34-python3.10.patch # bug #852152
-       "${FILESDIR}"/${PN}-6.1.34-no-pam.patch # bug #843437
-       "${FILESDIR}"/${PN}-6.1.26-configure-include-qt5-path.patch # bug 
#805365
-       "${FILESDIR}"/${PN}-6.1.34-r3-python.patch
-       "${WORKDIR}"/patches
-)
-
-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
-}
-
-src_prepare() {
-       default
-
-       # 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
-
-       # Remove shipped binaries (kBuild,yasm), see bug #232775
-       rm -r kBuild/bin tools || die
-
-       # Replace pointless GCC version check with something more sensible.
-       # 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
-
-       if ! use pch ; then
-               # bug #753323
-               printf '\n%s\n' "VBOX_WITHOUT_PRECOMPILED_HEADERS=1" \
-                       >> LocalConfig.kmk || die
-       fi
-
-       # 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
-               einfo "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
-}
-
-src_configure() {
-       tc-ld-disable-gold # bug #488176
-       tc-export CC CXX LD AR RANLIB
-       export HOST_CC="$(tc-getBUILD_CC)"
-
-       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
-
-       # bug #843437
-       cat >> LocalConfig.kmk <<-EOF || die
-               CFLAGS=${CFLAGS}
-               CXXFLAGS=${CXXFLAGS}
-       EOF
-
-       # not an autoconf script
-       edo ./configure "${myconf[@]}"
-
-       # Try to force usage of chosen Python implementation
-       # bug #856121, bug #785835
-       sed -i \
-               -e '/VBOX_WITH_PYTHON.*=/d' \
-               -e '/VBOX_PATH_PYTHON_INC.*=/d' \
-               -e '/VBOX_LIB_PYTHON.*=/d' \
-               AutoConfig.kmk || die
-
-       cat >> AutoConfig.kmk <<-EOF || die
-               VBOX_WITH_PYTHON=$(usex python 1 0)
-               VBOX_PATH_PYTHON_INC=$(python_get_includedir)
-               VBOX_LIB_PYTHON=$(python_get_library_path)
-       EOF
-}
-
-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
-               local udevdir="$(get_udevdir)"
-               local udev_file="VBoxCreateUSBNode.sh"
-               local rules_file="10-virtualbox.rules"
-
-               insinto ${udevdir}
-               doins ${udev_file}
-               fowners root:vboxusers ${udevdir}/${udev_file}
-               fperms 0750 ${udevdir}/${udev_file}
-
-               insinto ${udevdir}/rules.d
-               sed "s@%UDEVDIR%@${udevdir}@" "${FILESDIR}"/${rules_file} \
-                       > "${T}"/${rules_file} || die
-               doins "${T}"/${rules_file}
-       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_postinst() {
-       xdg_pkg_postinst
-
-       if use udev ; then
-               udevadm control --reload-rules
-               udevadm trigger --subsystem-match=usb
-       fi
-
-       tmpfiles_process 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 
"https://download.virtualbox.org/virtualbox/${DIR_PV:-${PV}}/UserManual.pdf";
-       elog ""
-
-       optfeature "Advanced networking setups" net-misc/bridge-utils 
sys-apps/usermode-utilities
-       optfeature "USB2, USB3, PXE boot, and VRDP support" 
app-emulation/virtualbox-extpack-oracle
-       optfeature "Guest additions ISO" app-emulation/virtualbox-additions
-
-       if ! use udev ; then
-               ewarn "Without USE=udev, USB devices will likely not work in 
${PN}."
-       fi
-}

diff --git a/app-emulation/virtualbox/virtualbox-6.1.34-r7.ebuild 
b/app-emulation/virtualbox/virtualbox-6.1.34-r7.ebuild
deleted file mode 100644
index b18a640616f9..000000000000
--- a/app-emulation/virtualbox/virtualbox-6.1.34-r7.ebuild
+++ /dev/null
@@ -1,636 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# To add a new Python here:
-# 1. Patch src/libs/xpcom18a4/python/Makefile.kmk (copy the previous impl's 
logic)
-#    Do NOT skip this part. It'll end up silently not-building the Python 
extension
-#    or otherwise misbehaving if you do.
-#
-# 2. Then update PYTHON_COMPAT & set PYTHON_SINGLE_TARGET for testing w/ 
USE=python.
-#
-#  May need to look at other distros (e.g. Arch Linux) to find patches for 
newer
-#  Python versions as upstream tends to lag. Upstream may have patches on their
-#  trunk branch but not release branch.
-#
-#  See bug #785835, bug #856121.
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit desktop edo java-pkg-opt-2 linux-info multilib optfeature 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";
-S="${WORKDIR}/${MY_PN}-${DIR_PV:-${MY_PV}}"
-
-LICENSE="GPL-2 dtrace? ( CDDL )"
-SLOT="0/$(ver_cut 1-2)"
-if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
-       KEYWORDS="amd64"
-fi
-IUSE="alsa debug doc dtrace headless java lvm +opus pam pax-kernel pch 
pulseaudio +opengl python +qt5 +sdk +sdl +udev vboxwebsrv vnc"
-
-REQUIRED_USE="
-       java? ( sdk )
-       python? ( sdk )
-       vboxwebsrv? ( java )
-       ${PYTHON_REQUIRED_USE}
-"
-
-COMMON_DEPEND="
-       ${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? (
-               sdl? ( 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]
-                       virtual/glu
-               )
-               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
-               )
-       )
-       dev-libs/openssl:0=
-       virtual/libcrypt:=
-       lvm? ( sys-fs/lvm2 )
-       opus? ( media-libs/opus )
-       udev? ( >=virtual/udev-171 )
-       vnc? ( >=net-libs/libvncserver-0.9.9 )
-"
-# We're stuck on JDK (and JRE, I guess?) 1.8 because of need for wsimport
-# with USE="vboxwebsrv java". Note that we have to put things in DEPEND,
-# not (only, anyway) BDEPEND, as the eclass magic to set the environment 
variables
-# based on *DEPEND doesn't work for BDEPEND at least right now.
-#
-# There's a comment in Config.kmk about it
-# ("With Java 11 wsimport was removed, usually part of a separate install 
now.")
-# but it needs more investigation.
-#
-# See bug #832166.
-DEPEND="
-       ${COMMON_DEPEND}
-       alsa? ( >=media-libs/alsa-lib-1.0.13 )
-       !headless? (
-               x11-libs/libXinerama
-               opengl? ( virtual/opengl )
-       )
-       java? ( virtual/jdk:1.8 )
-       pam? ( sys-libs/pam )
-       pax-kernel? ( sys-apps/elfix )
-       pulseaudio? ( media-sound/pulseaudio )
-       vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] )
-"
-BDEPEND="
-       ${PYTHON_DEPS}
-       >=dev-util/kbuild-0.1.9998.3127
-       >=dev-lang/yasm-0.6.2
-       sys-apps/which
-       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.8 )
-       qt5? ( dev-qt/linguist-tools:5 )
-"
-RDEPEND="
-       ${COMMON_DEPEND}
-       java? ( virtual/jre:1.8 )
-"
-
-QA_FLAGS_IGNORED="
-       usr/lib64/virtualbox/VBoxDDR0.r0
-       usr/lib64/virtualbox/VMMR0.r0
-"
-
-QA_TEXTRELS="
-       usr/lib64/virtualbox/VMMR0.r0
-"
-
-QA_EXECSTACK="
-       usr/lib64/virtualbox/iPxeBaseBin
-       usr/lib64/virtualbox/VMMR0.r0
-       usr/lib64/virtualbox/VBoxDDR0.r0
-"
-
-QA_WX_LOAD="
-       usr/lib64/virtualbox/iPxeBaseBin
-"
-
-QA_PRESTRIPPED="
-       usr/lib64/virtualbox/VMMR0.r0
-       usr/lib64/virtualbox/VBoxDDR0.r0
-"
-
-PATCHES=(
-       "${FILESDIR}"/${P}-vboxr0.patch
-
-       # Upstream patch for USE=-pam
-       # bug #843437
-       "${FILESDIR}"/${PN}-6.1.34-no-pam.patch
-
-       "${FILESDIR}"/${PN}-6.1.26-configure-include-qt5-path.patch # bug 
#805365
-
-       # This patch is needed to avoid automagic detection based on a hardcoded
-       # list of Pythons in configure. It's necessary but not sufficient
-       # (see the rest of the ebuild's logic for the remainder) to handle
-       # proper Python selection.
-       "${FILESDIR}"/${PN}-6.1.34-r3-python.patch
-
-       # Patch grabbed from Arch Linux / upstream for Python 3.10 support
-       "${FILESDIR}"/${PN}-6.1.34-r3-python3.10.patch
-
-       # Downloaded patchset
-       "${WORKDIR}"/patches
-)
-
-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
-}
-
-src_prepare() {
-       default
-
-       # 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
-
-       # Remove shipped binaries (kBuild, yasm), see bug #232775
-       rm -r kBuild/bin tools || die
-
-       # Replace pointless GCC version check with something more sensible.
-       # 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
-
-       if ! use pch ; then
-               # bug #753323
-               printf '\n%s\n' "VBOX_WITHOUT_PRECOMPILED_HEADERS=1" \
-                       >> LocalConfig.kmk || die
-       fi
-
-       # 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
-               einfo "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
-}
-
-src_configure() {
-       tc-ld-disable-gold # bug #488176
-
-       tc-export AR CC CXX LD RANLIB
-       export HOST_CC="$(tc-getBUILD_CC)"
-
-       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 sdl '' --disable-sdl)
-                       $(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
-       edo ./configure "${myconf[@]}"
-
-       # Force usage of chosen Python implementation
-       # bug #856121, bug #785835
-       sed -i \
-               -e '/VBOX_WITH_PYTHON.*=/d' \
-               -e '/VBOX_PATH_PYTHON_INC.*=/d' \
-               -e '/VBOX_LIB_PYTHON.*=/d' \
-               AutoConfig.kmk || die
-
-       cat >> AutoConfig.kmk <<-EOF || die
-               VBOX_WITH_PYTHON=$(usev python 1)
-               VBOX_PATH_PYTHON_INC=$(python_get_includedir)
-               VBOX_LIB_PYTHON=$(python_get_library_path)
-       EOF
-
-       if use python ; then
-               local mangled_python="${EPYTHON#python}"
-               mangled_python="${mangled_python/.}"
-
-               # Stub out the script which defines what the Makefile ends up
-               # building for. gen_python_deps.py gets called by the Makefile
-               # with some args and it spits out a bunch of paths for a 
hardcoded
-               # list of Pythons. We just override it with what we're actually 
using.
-               # This minimises the amount of patching we have to do for new 
Pythons.
-               cat > src/libs/xpcom18a4/python/gen_python_deps.py <<-EOF || die
-                       
print("VBOX_PYTHON${mangled_python}_INC=$(python_get_includedir)")
-                       
print("VBOX_PYTHON${mangled_python}_LIB=$(python_get_library_path)")
-                       print("VBOX_PYTHONDEF_INC=$(python_get_includedir)")
-                       print("VBOX_PYTHONDEF_LIB=$(python_get_library_path)")
-               EOF
-
-               chmod +x src/libs/xpcom18a4/python/gen_python_deps.py || die
-       fi
-}
-
-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}"
-
-       local myemakeargs=(
-               VBOX_BUILD_PUBLISHER=_Gentoo
-               VBOX_WITH_VBOXIMGMOUNT=1
-
-               KBUILD_VERBOSE=2
-
-               AS="$(tc-getCC)"
-               CC="$(tc-getCC)"
-               CXX="$(tc-getCXX)"
-
-               TOOL_GCC3_CC="$(tc-getCC)"
-               TOOL_GCC3_LD="$(tc-getCC)"
-               TOOL_GCC3_AS="$(tc-getCC)"
-               TOOL_GCC3_AR="$(tc-getAR)"
-               TOOL_GCC3_OBJCOPY="$(tc-getOBJCOPY)"
-
-               TOOL_GXX3_CC="$(tc-getCC)"
-               TOOL_GXX3_CXX="$(tc-getCXX)"
-               TOOL_GXX3_LD="$(tc-getCXX)"
-               TOOL_GXX3_AS="$(tc-getCXX)"
-               TOOL_GXX3_AR="$(tc-getAR)"
-               TOOL_GXX3_OBJCOPY="$(tc-getOBJCOPY)"
-
-               TOOL_GCC3_CFLAGS="${CFLAGS}"
-               TOOL_GCC3_CXXFLAGS="${CXXFLAGS}"
-               VBOX_GCC_OPT="${CXXFLAGS}"
-               VBOX_NM="$(tc-getNM)"
-
-               TOOL_YASM_AS=yasm
-       )
-
-       if use amd64 && has_multilib_profile ; then
-               myemakeargs+=(
-                       CC32="$(tc-getCC) -m32"
-                       CXX32="$(tc-getCXX) -m32"
-
-                       TOOL_GCC32_CC="$(tc-getCC) -m32"
-                       TOOL_GCC32_CXX="$(tc-getCXX) -m32"
-                       TOOL_GCC32_LD="$(tc-getCC) -m32"
-                       TOOL_GCC32_AS="$(tc-getCC) -m32"
-                       TOOL_GCC32_AR="$(tc-getAR)"
-                       TOOL_GCC32_OBJCOPY="$(tc-getOBJCOPY)"
-
-                       TOOL_GXX32_CC="$(tc-getCC) -m32"
-                       TOOL_GXX32_CXX="$(tc-getCXX) -m32"
-                       TOOL_GXX32_LD="$(tc-getCXX) -m32"
-                       TOOL_GXX32_AS="$(tc-getCXX) -m32"
-                       TOOL_GXX32_AR="$(tc-getAR)"
-                       TOOL_GXX32_OBJCOPY="$(tc-getOBJCOPY)"
-               )
-       fi
-
-       MAKE="kmk" emake "${myemakeargs[@]}" 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
-               if use sdl ; then
-                       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
-               fi
-
-               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
-               local udevdir="$(get_udevdir)"
-               local udev_file="VBoxCreateUSBNode.sh"
-               local rules_file="10-virtualbox.rules"
-
-               insinto ${udevdir}
-               doins ${udev_file}
-               fowners root:vboxusers ${udevdir}/${udev_file}
-               fperms 0750 ${udevdir}/${udev_file}
-
-               insinto ${udevdir}/rules.d
-               sed "s@%UDEVDIR%@${udevdir}@" "${FILESDIR}"/${rules_file} \
-                       > "${T}"/${rules_file} || die
-               doins "${T}"/${rules_file}
-       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
-
-       if use python ; then
-               local mangled_python="${EPYTHON#python}"
-               mangled_python="${mangled_python/./_}"
-
-               local 
python_path_ext="${ED}/usr/$(get_libdir)/virtualbox/VBoxPython${mangled_python}.so"
-               if [[ ! -x "${python_path_ext}" ]] ; then
-                       eerror "Couldn't find ${python_path_ext}! Bindings were 
requested with USE=python"
-                       eerror "but none were installed. This may happen if 
support for a Python target"
-                       eerror "(listed in PYTHON_COMPAT in the ebuild) is 
incomplete within the Makefiles."
-                       die "Incomplete installation of Python bindings! File a 
bug with Gentoo!"
-               fi
-       fi
-
-       newtmpfiles "${FILESDIR}"/${PN}-vboxusb_tmpfilesd ${PN}-vboxusb.conf
-}
-
-pkg_postinst() {
-       xdg_pkg_postinst
-
-       if use udev ; then
-               udevadm control --reload-rules
-               udevadm trigger --subsystem-match=usb
-       fi
-
-       tmpfiles_process 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 
"https://download.virtualbox.org/virtualbox/${DIR_PV:-${PV}}/UserManual.pdf";
-       elog ""
-
-       optfeature "Advanced networking setups" net-misc/bridge-utils 
sys-apps/usermode-utilities
-       optfeature "USB2, USB3, PXE boot, and VRDP support" 
app-emulation/virtualbox-extpack-oracle
-       optfeature "Guest additions ISO" app-emulation/virtualbox-additions
-
-       if ! use udev ; then
-               ewarn "Without USE=udev, USB devices will likely not work in 
${PN}."
-       fi
-}

diff --git a/app-emulation/virtualbox/virtualbox-6.1.36.ebuild 
b/app-emulation/virtualbox/virtualbox-6.1.36.ebuild
deleted file mode 100644
index db6bcc8ca893..000000000000
--- a/app-emulation/virtualbox/virtualbox-6.1.36.ebuild
+++ /dev/null
@@ -1,647 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# To add a new Python here:
-# 1. Patch src/libs/xpcom18a4/python/Makefile.kmk (copy the previous impl's 
logic)
-#    Do NOT skip this part. It'll end up silently not-building the Python 
extension
-#    or otherwise misbehaving if you do.
-#
-# 2. Then update PYTHON_COMPAT & set PYTHON_SINGLE_TARGET for testing w/ 
USE=python.
-#
-#  May need to look at other distros (e.g. Arch Linux) to find patches for 
newer
-#  Python versions as upstream tends to lag. Upstream may have patches on their
-#  trunk branch but not release branch.
-#
-#  See bug #785835, bug #856121.
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit desktop edo flag-o-matic java-pkg-opt-2 linux-info multilib optfeature 
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://gitweb.gentoo.org/proj/virtualbox-patches.git/snapshot/virtualbox-patches-${MY_PV}.tar.bz2";
-S="${WORKDIR}/${MY_PN}-${DIR_PV:-${MY_PV}}"
-
-LICENSE="GPL-2 dtrace? ( CDDL )"
-SLOT="0/$(ver_cut 1-2)"
-if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
-       KEYWORDS="~amd64"
-fi
-IUSE="alsa debug doc dtrace headless java lvm +opus pam pax-kernel pch 
pulseaudio +opengl python +qt5 +sdk +sdl +udev vboxwebsrv vnc"
-
-unset WATCOM #856769
-
-COMMON_DEPEND="
-       ${PYTHON_DEPS}
-       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? (
-               sdl? ( 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]
-                       virtual/glu
-               )
-               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
-               )
-       )
-       dev-libs/openssl:0=
-       virtual/libcrypt:=
-       lvm? ( sys-fs/lvm2 )
-       opus? ( media-libs/opus )
-       udev? ( >=virtual/udev-171 )
-       vnc? ( >=net-libs/libvncserver-0.9.9 )
-"
-# We're stuck on JDK (and JRE, I guess?) 1.8 because of need for wsimport
-# with USE="vboxwebsrv java". Note that we have to put things in DEPEND,
-# not (only, anyway) BDEPEND, as the eclass magic to set the environment 
variables
-# based on *DEPEND doesn't work for BDEPEND at least right now.
-#
-# There's a comment in Config.kmk about it
-# ("With Java 11 wsimport was removed, usually part of a separate install 
now.")
-# but it needs more investigation.
-#
-# See bug #832166.
-DEPEND="
-       ${COMMON_DEPEND}
-       alsa? ( >=media-libs/alsa-lib-1.0.13 )
-       !headless? (
-               x11-libs/libXinerama
-               opengl? ( virtual/opengl )
-       )
-       java? ( virtual/jdk:1.8 )
-       pam? ( sys-libs/pam )
-       pax-kernel? ( sys-apps/elfix )
-       pulseaudio? ( media-sound/pulseaudio )
-       vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] )
-"
-BDEPEND="
-       ${PYTHON_DEPS}
-       >=dev-util/kbuild-0.1.9998.3127
-       >=dev-lang/yasm-0.6.2
-       sys-apps/which
-       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.8 )
-       qt5? ( dev-qt/linguist-tools:5 )
-"
-RDEPEND="
-       ${COMMON_DEPEND}
-       java? ( virtual/jre:1.8 )
-"
-
-QA_FLAGS_IGNORED="
-       usr/lib64/virtualbox/VBoxDDR0.r0
-       usr/lib64/virtualbox/VMMR0.r0
-"
-
-QA_TEXTRELS="
-       usr/lib64/virtualbox/VMMR0.r0
-"
-
-QA_EXECSTACK="
-       usr/lib64/virtualbox/iPxeBaseBin
-       usr/lib64/virtualbox/VMMR0.r0
-       usr/lib64/virtualbox/VBoxDDR0.r0
-"
-
-QA_WX_LOAD="
-       usr/lib64/virtualbox/iPxeBaseBin
-"
-
-QA_PRESTRIPPED="
-       usr/lib64/virtualbox/VMMR0.r0
-       usr/lib64/virtualbox/VBoxDDR0.r0
-"
-
-REQUIRED_USE="
-       java? ( sdk )
-       python? ( sdk )
-       vboxwebsrv? ( java )
-       ${PYTHON_REQUIRED_USE}
-"
-
-PATCHES=(
-       "${FILESDIR}"/${PN}-6.1.26-configure-include-qt5-path.patch # bug 
#805365
-
-       # This patch is needed to avoid automagic detection based on a hardcoded
-       # list of Pythons in configure. It's necessary but not sufficient
-       # (see the rest of the ebuild's logic for the remainder) to handle
-       # proper Python selection.
-       "${FILESDIR}"/${PN}-6.1.34-r3-python.patch
-
-       # Patch grabbed from Arch Linux / upstream for Python 3.10 support
-       "${FILESDIR}"/${PN}-6.1.36-python3.10.patch
-
-       # Downloaded patchset
-       "${WORKDIR}"/virtualbox-patches-${MY_PV}/patches
-)
-
-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
-}
-
-src_prepare() {
-       default
-
-       # 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
-
-       # Remove shipped binaries (kBuild, yasm), see bug #232775
-       rm -r kBuild/bin tools || die
-
-       # Replace pointless GCC version check with something more sensible.
-       # 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
-
-       if ! use pch ; then
-               # bug #753323
-               printf '\n%s\n' "VBOX_WITHOUT_PRECOMPILED_HEADERS=1" \
-                       >> LocalConfig.kmk || die
-       fi
-
-       # 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
-               einfo "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
-}
-
-src_configure() {
-       tc-ld-disable-gold # bug #488176
-
-       #856811 turns out having march defined produces buggy executables
-       filter-flags -march=* -mtune=* -mcpu=*
-
-       tc-export AR CC CXX LD RANLIB
-       export HOST_CC="$(tc-getBUILD_CC)"
-
-       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 sdl '' --disable-sdl)
-                       $(usex qt5 '' --disable-qt)
-               )
-       else
-               myconf+=(
-                       --build-headless
-                       --disable-opengl
-               )
-       fi
-
-       if use amd64 && ! has_multilib_profile ; then
-               myconf+=( --disable-vmmraw )
-       fi
-
-       # bug #843437
-       cat >> LocalConfig.kmk <<-EOF || die
-               CXXFLAGS=${CXXFLAGS}
-               CFLAGS=${CFLAGS}
-       EOF
-
-       # not an autoconf script
-       edo ./configure "${myconf[@]}"
-
-       # Force usage of chosen Python implementation
-       # bug #856121, bug #785835
-       sed -i \
-               -e '/VBOX_WITH_PYTHON.*=/d' \
-               -e '/VBOX_PATH_PYTHON_INC.*=/d' \
-               -e '/VBOX_LIB_PYTHON.*=/d' \
-               AutoConfig.kmk || die
-
-       cat >> AutoConfig.kmk <<-EOF || die
-               VBOX_WITH_PYTHON=$(usev python 1)
-               VBOX_PATH_PYTHON_INC=$(python_get_includedir)
-               VBOX_LIB_PYTHON=$(python_get_library_path)
-       EOF
-
-       if use python ; then
-               local mangled_python="${EPYTHON#python}"
-               mangled_python="${mangled_python/.}"
-
-               # Stub out the script which defines what the Makefile ends up
-               # building for. gen_python_deps.py gets called by the Makefile
-               # with some args and it spits out a bunch of paths for a 
hardcoded
-               # list of Pythons. We just override it with what we're actually 
using.
-               # This minimises the amount of patching we have to do for new 
Pythons.
-               cat > src/libs/xpcom18a4/python/gen_python_deps.py <<-EOF || die
-                       
print("VBOX_PYTHON${mangled_python}_INC=$(python_get_includedir)")
-                       
print("VBOX_PYTHON${mangled_python}_LIB=$(python_get_library_path)")
-                       print("VBOX_PYTHONDEF_INC=$(python_get_includedir)")
-                       print("VBOX_PYTHONDEF_LIB=$(python_get_library_path)")
-               EOF
-
-               chmod +x src/libs/xpcom18a4/python/gen_python_deps.py || die
-       fi
-}
-
-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}"
-
-       local myemakeargs=(
-               VBOX_BUILD_PUBLISHER=_Gentoo
-               VBOX_WITH_VBOXIMGMOUNT=1
-
-               KBUILD_VERBOSE=2
-
-               AS="$(tc-getCC)"
-               CC="$(tc-getCC)"
-               CXX="$(tc-getCXX)"
-
-               TOOL_GCC3_CC="$(tc-getCC)"
-               TOOL_GCC3_LD="$(tc-getCC)"
-               TOOL_GCC3_AS="$(tc-getCC)"
-               TOOL_GCC3_AR="$(tc-getAR)"
-               TOOL_GCC3_OBJCOPY="$(tc-getOBJCOPY)"
-
-               TOOL_GXX3_CC="$(tc-getCC)"
-               TOOL_GXX3_CXX="$(tc-getCXX)"
-               TOOL_GXX3_LD="$(tc-getCXX)"
-               TOOL_GXX3_AS="$(tc-getCXX)"
-               TOOL_GXX3_AR="$(tc-getAR)"
-               TOOL_GXX3_OBJCOPY="$(tc-getOBJCOPY)"
-
-               TOOL_GCC3_CFLAGS="${CFLAGS}"
-               TOOL_GCC3_CXXFLAGS="${CXXFLAGS}"
-               VBOX_GCC_OPT="${CXXFLAGS}"
-               VBOX_NM="$(tc-getNM)"
-
-               TOOL_YASM_AS=yasm
-       )
-
-       if use amd64 && has_multilib_profile ; then
-               myemakeargs+=(
-                       CC32="$(tc-getCC) -m32"
-                       CXX32="$(tc-getCXX) -m32"
-
-                       TOOL_GCC32_CC="$(tc-getCC) -m32"
-                       TOOL_GCC32_CXX="$(tc-getCXX) -m32"
-                       TOOL_GCC32_LD="$(tc-getCC) -m32"
-                       TOOL_GCC32_AS="$(tc-getCC) -m32"
-                       TOOL_GCC32_AR="$(tc-getAR)"
-                       TOOL_GCC32_OBJCOPY="$(tc-getOBJCOPY)"
-
-                       TOOL_GXX32_CC="$(tc-getCC) -m32"
-                       TOOL_GXX32_CXX="$(tc-getCXX) -m32"
-                       TOOL_GXX32_LD="$(tc-getCXX) -m32"
-                       TOOL_GXX32_AS="$(tc-getCXX) -m32"
-                       TOOL_GXX32_AR="$(tc-getAR)"
-                       TOOL_GXX32_OBJCOPY="$(tc-getOBJCOPY)"
-               )
-       fi
-
-       MAKE="kmk" emake "${myemakeargs[@]}" 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
-               if use sdl ; then
-                       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
-               fi
-
-               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
-               local udevdir="$(get_udevdir)"
-               local udev_file="VBoxCreateUSBNode.sh"
-               local rules_file="10-virtualbox.rules"
-
-               insinto ${udevdir}
-               doins ${udev_file}
-               fowners root:vboxusers ${udevdir}/${udev_file}
-               fperms 0750 ${udevdir}/${udev_file}
-
-               insinto ${udevdir}/rules.d
-               sed "s@%UDEVDIR%@${udevdir}@" "${FILESDIR}"/${rules_file} \
-                       > "${T}"/${rules_file} || die
-               doins "${T}"/${rules_file}
-       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
-
-       if use python ; then
-               local mangled_python="${EPYTHON#python}"
-               mangled_python="${mangled_python/./_}"
-
-               local 
python_path_ext="${ED}/usr/$(get_libdir)/virtualbox/VBoxPython${mangled_python}.so"
-               if [[ ! -x "${python_path_ext}" ]] ; then
-                       eerror "Couldn't find ${python_path_ext}! Bindings were 
requested with USE=python"
-                       eerror "but none were installed. This may happen if 
support for a Python target"
-                       eerror "(listed in PYTHON_COMPAT in the ebuild) is 
incomplete within the Makefiles."
-                       die "Incomplete installation of Python bindings! File a 
bug with Gentoo!"
-               fi
-       fi
-
-       newtmpfiles "${FILESDIR}"/${PN}-vboxusb_tmpfilesd ${PN}-vboxusb.conf
-}
-
-pkg_postinst() {
-       xdg_pkg_postinst
-
-       if use udev ; then
-               udev_reload
-               udevadm trigger --subsystem-match=usb
-       fi
-
-       tmpfiles_process 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 
"https://download.virtualbox.org/virtualbox/${DIR_PV:-${PV}}/UserManual.pdf";
-       elog ""
-
-       optfeature "Advanced networking setups" net-misc/bridge-utils 
sys-apps/usermode-utilities
-       optfeature "USB2, USB3, PXE boot, and VRDP support" 
app-emulation/virtualbox-extpack-oracle
-       optfeature "Guest additions ISO" app-emulation/virtualbox-additions
-
-       if ! use udev ; then
-               ewarn "Without USE=udev, USB devices will likely not work in 
${PN}."
-       fi
-}
-
-pkg_postrm() {
-       xdg_pkg_postrm
-
-       use udev && udev_reload
-}

Reply via email to