From 8cb1b7629fb6936b7008bd364b5e4ec3ecf6f6cd Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Tue, 19 Mar 2024 18:50:00 +0000
Subject: gentoo auto-resync : 19:03:2024 - 18:50:00

---
 app-emulation/Manifest.gz                       | Bin 15480 -> 15480 bytes
 app-emulation/virtualbox/Manifest               |   2 +-
 app-emulation/virtualbox/virtualbox-9999.ebuild |  15 +++++++++------
 3 files changed, 10 insertions(+), 7 deletions(-)

(limited to 'app-emulation')

diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index c715525c6f92..543c83e2b7af 100644
Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ
diff --git a/app-emulation/virtualbox/Manifest b/app-emulation/virtualbox/Manifest
index d8f6ae55e4ba..5db7287f8e18 100644
--- a/app-emulation/virtualbox/Manifest
+++ b/app-emulation/virtualbox/Manifest
@@ -26,5 +26,5 @@ EBUILD virtualbox-6.1.48-r2.ebuild 18946 BLAKE2B aad9adbb63d7252b67c4ac441900542
 EBUILD virtualbox-6.1.50-r2.ebuild 18982 BLAKE2B 0290f1ebcb0f31f211b92c7e7d64a9187886ce214d7a710df4676060789ae4d9d408cd25d50c97698ad67aad4384682ae87d6b6f4076f39e4722145245ed7314 SHA512 63e87fec69f8d1ec84bfa4ddb364ea029f7950d684ddbe6d58552c0582ae5dc782c08b58126f68a96219737ef72410196434a888781d6f367209c88302f67424
 EBUILD virtualbox-7.0.12-r2.ebuild 20777 BLAKE2B bb294e6143551fdd1553609e4f47c2e7451cc5907b8b5d180f0b0263097a1d21b63b1822b7e7579e4661b1d1831dcf0a8cced0cc906655a4cd76d1bdae6117f4 SHA512 888b6736c82b57bd364c4671f6cddea033c92798f7ba5cd1edd934b3c0edbf63dfbafddb61044cea2c9e5f4347eb2910a4c3a16ec7357b8c4f59fb6c6056dd26
 EBUILD virtualbox-7.0.14-r2.ebuild 20785 BLAKE2B 2b67f9feb5aeca76ee368fed058e70199c0eaa81c61dd1d6f45f7792535555369a6cca5b48036b2a471b8b2ae61daa4e25f98cb37eb2b74aa09d5e228d2e91a7 SHA512 753839ffe74dfc62a0cbd43cd93b6afbb3614cf64dc768ff22c0f42096225364e60099adb2b996f8cdd36b051a1f8b24d16f15760106a7f9a51d69ee4dd83f5b
-EBUILD virtualbox-9999.ebuild 21477 BLAKE2B a70cfbd38a696f88427ef7daeffe1a729e22b7b82dc355b28669ee9c60fb4ca8991bc081a81f826b8ea9eea25890e3b6d2960361aafae05ecd8a5ea0e39da274 SHA512 0e7749532c11a9787138a6e781b67d26f16f2c57b5f936269e1dc2723b541916b78bf39e73aeaed709080224fc02941b0e0b6a6c668f0339f6a656ae182eabc3
+EBUILD virtualbox-9999.ebuild 21624 BLAKE2B a3590b3abfa2f318ced4bbe4fe35c224a09229d199f215fa60e72a9de80bc561ec479f80ae3de3923d0adaf6160cbc825b7cc3d8f167cc46ceeb50bec8559634 SHA512 917b865d73c3c41c7c2b91140e0fcd7771dcf35dff54643ad10587012ea87ecef125b0f0e76cebcb519134fab9e248370bf86a027fc3b315e18747a92c2ec8c8
 MISC metadata.xml 870 BLAKE2B 26f9370557a12c17465e7ca2d63902a2ce5b2d65fbdf40f3b890bd89aca28a1816424caf579f71b762876e8e91b292c5ecbcbad985e9da1e1472e66a2eaf6965 SHA512 eb2e9114dc343062e9afd3b933a5d355be790febb4a18f741347072d305b7d63ed40a6a3b9d11b91eb8602d5d2d4f5cf6c2ebde278fb0d0df48a5c5647374e33
diff --git a/app-emulation/virtualbox/virtualbox-9999.ebuild b/app-emulation/virtualbox/virtualbox-9999.ebuild
index 25a390ed1bc9..fa51d3f6c124 100644
--- a/app-emulation/virtualbox/virtualbox-9999.ebuild
+++ b/app-emulation/virtualbox/virtualbox-9999.ebuild
@@ -48,13 +48,12 @@ IUSE="alsa dbus debug doc dtrace +gui java lvm nls pam pch pulseaudio +opengl py
 
 unset WATCOM #856769
 
-# <libxml2-2.12.0: bug #922445
 COMMON_DEPEND="
 	${PYTHON_DEPS}
 	acct-group/vboxusers
 	app-arch/xz-utils
 	dev-libs/libtpms
-	<dev-libs/libxml2-2.12.0
+	dev-libs/libxml2
 	dev-libs/openssl:0=
 	media-libs/libpng:0=
 	media-libs/libvpx:0=
@@ -63,7 +62,6 @@ COMMON_DEPEND="
 	dbus? ( sys-apps/dbus )
 	gui? (
 		dev-qt/qtbase:6[widgets]
-		dev-qt/qt5compat:6
 		dev-qt/qtscxml:6
 		dev-qt/qttools:6[assistant]
 		x11-libs/libX11
@@ -129,6 +127,7 @@ DEPEND="
 "
 RDEPEND="
 	${COMMON_DEPEND}
+	!app-emulation/virtualbox-modules
 	gui? ( x11-libs/libxcb:= )
 	java? ( virtual/jre:1.8 )
 "
@@ -549,7 +548,7 @@ src_install() {
 	insinto ${vbox_inst_path}
 	doins -r components
 
-	for each in VBox{Autostart,BalloonCtrl,BugReport,CpuReport,ExtPackHelperApp,Manage,SVC,VMMPreload,XPCOMIPCD} \
+	for each in VBox{Autostart,BalloonCtrl,BugReport,CpuReport,ExtPackHelperApp,Manage,SVC,VMMPreload} \
 		vboximg-mount vbox-img *so *r0; do
 		vbox_inst ${each}
 	done
@@ -710,7 +709,7 @@ src_install() {
 		fi
 
 		# 378871
-		local installer_dir="${ED}/usr/$(get_libdir)/virtualbox/sdk/installer"
+		local installer_dir="${ED}/usr/$(get_libdir)/virtualbox/sdk/installer/python/vboxapi/src"
 		pushd "${installer_dir}" &> /dev/null || die
 		sed -e "s;%VBOX_INSTALL_PATH%;${vbox_inst_path};" \
 			-e "s;%VBOX_SDK_PATH%;${vbox_inst_path}/sdk;" \
@@ -719,10 +718,14 @@ src_install() {
 		find vboxapi -name \*.py -exec sed -e "1 i\#! ${PYTHON}" -i {} \+ || die
 		python_domodule vboxapi
 		popd &> /dev/null || die
+
+		# upstream added a /bin/sh stub here
+		# use /usr/bin/python3, python_doscript will take care of it
+		sed -e '1 i #! /usr/bin/python3' -i vboxshell.py
 		python_doscript vboxshell.py
 
 		# do not install the installer
-		rm -r "${installer_dir}" || die
+		rm -r "${installer_dir%vboxapi*}" || die
 	fi
 
 	newtmpfiles "${FILESDIR}"/${PN}-vboxusb_tmpfilesd ${PN}-vboxusb.conf
-- 
cgit v1.2.3