gentoo auto-resync : 23:08:2022 - 20:45:29

5 files changed, 33 insertions, 24 deletions

diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 803bd54ec7bb..45f06738057f 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/virtualbox/Manifest b/app-emulation/virtualbox/Manifest
index 21f888a0b467..878eda5f81fc 100644
--- a/app-emulation/virtualbox/Manifest
+++ b/app-emulation/virtualbox/Manifest
@@ -20,10 +20,10 @@ DIST VirtualBox-6.1.34.tar.bz2 165761216 BLAKE2B d3c8f7d3d6f408e4c4275c2b2815e92
 DIST VirtualBox-6.1.36.tar.bz2 165685382 BLAKE2B 98dbb06450b9df650cb72493bcdea4b88fa9dd21f76d723fdc0bb2c1ab8266f67e972a7222dc9b5bd0d43754911710664bddace753995be025cf6bcc05a24ae5 SHA512 cc3b984a7da40c9bf14831808a2bc2bf7bf6821e53c25fa11cb4b4275feb1d4b0cb4a47d8a360b90c89e5a4038481efe8fe28ee22996dbefb6446761e88a8dec
 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
-EBUILD virtualbox-6.1.32-r2.ebuild 14607 BLAKE2B 864c1c66961c1b04296580e87e62ec5d18f556f71857d120ebb6db5ce4d33005ab9769f698a902b6fb1028702ae686380337aed2500dedbd5ec3dabec8ea82ca SHA512 a65ad608a408c1ba38f0ae11f91167f0376c0777483f0bd4dc882e2da9144f2ac48f6a4f225eb8bb67bb369df5be38ffaa694e4e0a028bccaf26f7c92e6df887
+EBUILD virtualbox-6.1.32-r3.ebuild 14683 BLAKE2B de3ccf98d3f66d8e0e5774e8c1c14dea44150767b0bbbd07cfb401bc7e77f0a0742bf0f305549090e567dd263ee5b1518b518cded46d4ac282cc20d0d9da109e SHA512 4fb28372e47f941254ea947347f1b9f15f23030a629aa7300375efcb516f936db713ebcc7e8a1ae697cccbbe8deab0823c4f2f69cc126917f617357004c6f708
 EBUILD virtualbox-6.1.34-r1.ebuild 13699 BLAKE2B 01a96acd3f1e734536372baa60f0adca25d0153e5c7dc986ac51fa1bbd67a4e3e6fbf71a0b5865a5ab92f236e598c86dd4755c72e1a83ee95a44f714d6e0c877 SHA512 d647990d450c92d8eba46250e7a9f058c1f887fd0b0bc9b6223197973561a60bbef6f7e8133352baae034ae4014040bd325747644bc2eec286e56f71363ccab3
 EBUILD virtualbox-6.1.34-r3.ebuild 14573 BLAKE2B 110221a46466f9f053b231424840c73a00b665ced4d597fa7807500d65e18b189a8b8336e827d3caf40af251c60ad8b379578a978b7f5cb3c3d81c0cb8ae4da4 SHA512 3bbfd336e3b6306b04137314df32767dead2ba4f1821f1213ea32e5b00ce80e5e4d83df5b2647d846d5f91f9ee1efd2678dd4bd1767adfc7edba2cee856ba0c5
-EBUILD virtualbox-6.1.34-r6.ebuild 17645 BLAKE2B 5c76995ef49c60af3dcba9442aa84e8033244d7bd8235327513347457273015faec675ab317139871fabf6b6eeb0956edfac899edd8647c8d06c0e328ae49594 SHA512 341406607d99696423881f88c885087e170130645d7151ef5b622c63c010d7da52bdaf4cf9945158b8f78bb3662ad078bbeaaa4683b760c2a11aec7311b30bfb
+EBUILD virtualbox-6.1.34-r7.ebuild 17721 BLAKE2B 3ce2d1a5b9dc0f221d8d72ac7dbb56014bbc6ed40abfac3d2f72f03d475a62153e2f18be57e52b76196b87f6d0e36277d328f876ae7f9d1b3e5ab8d376d629d1 SHA512 917ea6bb8a4052d1be1b4b1d3516a4266fa4e3080ea410eeda7f0f3710707d4d6ec95e88bce7ad6e970af5711b467f51dc77fcb505476d0e446b7296c28763dc
 EBUILD virtualbox-6.1.36-r1.ebuild 18027 BLAKE2B de8e5abac4857365383f2190f63d09f026bc631df70f3023c14165c961e498d6f908b8af57ce780f5967c2f1515232fffe2ba1754ef495348eeb46b05618afff SHA512 7316888f34eb3dada895214b193d6b98d22d1426cce967077846381a0384fa7b74b783407403642ca9f618ae01e03e29b59607c4e768b683aea285b403c0a239
-EBUILD virtualbox-6.1.36.ebuild 17819 BLAKE2B 839fd78c73e4e483036fa98010b9013ee3ba4aaada77301f213df40266db9df8b34ad69ba3ddbfe75a6b858c022da269ca30037afb94cb275898bf0974012639 SHA512 3cb3e5ec9b0e1f6a744079cb18401f73b51e62f1c82b88615c66d34ae56735713feb20afa6f64a8b2386c580c4bdcb45da2fc0637ccb18ad82ca81fb2e532022
+EBUILD virtualbox-6.1.36.ebuild 17895 BLAKE2B 0e39abc0e54b2b2cc0583c20dc80edcf9498f84137659857344fb94293ad963412a200c4af09d14222221bc8bfcfc2ee78e2e5918a83a2b06317942ebe3381d7 SHA512 d173fdc24864ee3a805b620342bd49b7023639387e8fef09824b9f63195093df9c1e26037397dcdb719c8ffecd0eab35a69bc999054cfbd6b59cbe9c71c5f1bc
 MISC metadata.xml 931 BLAKE2B bda8433410b0bf400bee4795ce53cd85554463417beec3d7f60fe5fe090317b2d75671a2c091718d4d57c5cc8c2961e0e93fbf9f6d70c652f812317ce4fc1b20 SHA512 0d7e309078a5b5c5cf891da6e8581fce8563e9014e822e9c99d6c7c62a88173b2536fe2554ea22f93965dfccd505543fe2022e6c064acc8d836ced0150fe491f
diff --git a/app-emulation/virtualbox/virtualbox-6.1.32-r2.ebuild b/app-emulation/virtualbox/virtualbox-6.1.32-r3.ebuild
index 96494cca02e5..722a6987c670 100644
--- a/app-emulation/virtualbox/virtualbox-6.1.32-r2.ebuild
+++ b/app-emulation/virtualbox/virtualbox-6.1.32-r3.ebuild
@@ -21,7 +21,7 @@ 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"
+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}
@@ -36,7 +36,7 @@ COMMON_DEPEND="
 	media-libs/libvpx:0=
 	sys-libs/zlib:=
 	!headless? (
-		media-libs/libsdl:0[X,video]
+		sdl? ( media-libs/libsdl:0[X,video] )
 		x11-libs/libX11
 		x11-libs/libxcb:=
 		x11-libs/libXcursor
@@ -253,6 +253,7 @@ src_configure() {
 	if ! use headless ; then
 		myconf+=(
 			$(usex opengl '' --disable-opengl)
+			$(usex sdl '' --disable-sdl)
 			$(usex qt5 '' --disable-qt)
 		)
 	else
@@ -360,12 +361,14 @@ src_install() {
 
 	if ! use headless ; then
 		vbox_inst rdesktop-vrdp
-		vbox_inst VBoxSDL 4750
-		pax-mark -m "${ED}"${vbox_inst_path}/VBoxSDL
+		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
+			for each in vboxsdl VBoxSDL ; do
+				dosym ${vbox_inst_path}/VBox /usr/bin/${each}
+			done
+		fi
 
 		if use qt5 ; then
 			vbox_inst VirtualBox
diff --git a/app-emulation/virtualbox/virtualbox-6.1.34-r6.ebuild b/app-emulation/virtualbox/virtualbox-6.1.34-r7.ebuild
index 7e63e28a4679..b18a640616f9 100644
--- a/app-emulation/virtualbox/virtualbox-6.1.34-r6.ebuild
+++ b/app-emulation/virtualbox/virtualbox-6.1.34-r7.ebuild
@@ -36,7 +36,7 @@ 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"
+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 )
@@ -58,7 +58,7 @@ COMMON_DEPEND="
 	media-libs/libvpx:0=
 	sys-libs/zlib:=
 	!headless? (
-		media-libs/libsdl:0[X,video]
+		sdl? ( media-libs/libsdl:0[X,video] )
 		x11-libs/libX11
 		x11-libs/libxcb:=
 		x11-libs/libXcursor
@@ -287,6 +287,7 @@ src_configure() {
 	if ! use headless ; then
 		myconf+=(
 			$(usex opengl '' --disable-opengl)
+			$(usex sdl '' --disable-sdl)
 			$(usex qt5 '' --disable-qt)
 		)
 	else
@@ -475,12 +476,14 @@ src_install() {
 
 	if ! use headless ; then
 		vbox_inst rdesktop-vrdp
-		vbox_inst VBoxSDL 4750
-		pax-mark -m "${ED}"${vbox_inst_path}/VBoxSDL
+		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
+			for each in vboxsdl VBoxSDL ; do
+				dosym ${vbox_inst_path}/VBox /usr/bin/${each}
+			done
+		fi
 
 		if use qt5 ; then
 			vbox_inst VirtualBox
diff --git a/app-emulation/virtualbox/virtualbox-6.1.36.ebuild b/app-emulation/virtualbox/virtualbox-6.1.36.ebuild
index 19b363fc34f3..db6bcc8ca893 100644
--- a/app-emulation/virtualbox/virtualbox-6.1.36.ebuild
+++ b/app-emulation/virtualbox/virtualbox-6.1.36.ebuild
@@ -36,7 +36,7 @@ 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"
+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
 
@@ -52,7 +52,7 @@ COMMON_DEPEND="
 	media-libs/libvpx:0=
 	sys-libs/zlib:=
 	!headless? (
-		media-libs/libsdl:0[X,video]
+		sdl? ( media-libs/libsdl:0[X,video] )
 		x11-libs/libX11
 		x11-libs/libxcb:=
 		x11-libs/libXcursor
@@ -285,6 +285,7 @@ src_configure() {
 	if ! use headless ; then
 		myconf+=(
 			$(usex opengl '' --disable-opengl)
+			$(usex sdl '' --disable-sdl)
 			$(usex qt5 '' --disable-qt)
 		)
 	else
@@ -480,12 +481,14 @@ src_install() {
 
 	if ! use headless ; then
 		vbox_inst rdesktop-vrdp
-		vbox_inst VBoxSDL 4750
-		pax-mark -m "${ED}"${vbox_inst_path}/VBoxSDL
+		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
+			for each in vboxsdl VBoxSDL ; do
+				dosym ${vbox_inst_path}/VBox /usr/bin/${each}
+			done
+		fi
 
 		if use qt5 ; then
 			vbox_inst VirtualBox