gentoo auto-resync : 04:06:2024 - 00:07:50

3 files changed, 18 insertions, 19 deletions

diff --git a/app-emulation/virtualbox/Manifest b/app-emulation/virtualbox/Manifest
index 98b50e680bb9..28bd4cde0247 100644
--- a/app-emulation/virtualbox/Manifest
+++ b/app-emulation/virtualbox/Manifest
@@ -22,9 +22,9 @@ DIST virtualbox-patches-6.1.36.tar.bz2 2733 BLAKE2B dcfebfeca4873d382441515d48b4
 DIST virtualbox-patches-7.0.14.tar.bz2 6937 BLAKE2B da5f18efbba2a8f4701b3d29dc00784e4e80e18a18b029e5dce8c142eb4dc97637069bfc5081422064a7dc59dfacf503ebbdc3421caa96430dc53fa72988aa20 SHA512 57cc34b92e4626de5c445e34ae025da7ec0d752a60618c619a55c28bf7d6b1cc9dc81ea059b949b0f3e625568207e8084f9462faf487ca0daf2794e7f1feac36
 DIST virtualbox-patches-7.0.16.tar.bz2 6808 BLAKE2B d15fa2ca306375142c3e25d4759d2790b2bb9eb69e333a8773ad500b29dd127b401943abf59ca59d01858a3ed5551fb3a6c93c4c893c8de971a714ce5306d577 SHA512 a488cbc6660fe8637c44cd79d87156609af089988239a7e76fea8a3c7e6319512c574bef2e942b354b14ce671a8e75ab8b2160abf7c40963795ee8a545ecd992
 DIST virtualbox-patches-7.1.0_pre20240419.tar.bz2 5316 BLAKE2B 1a890b7d19cb252c7801b68c299676e2cd7a209a57a03cb39025e1a969a1c73142eb96154dae8469405f93d61969154428ea0fe3950a00d8a0a69dc8aefb4fc9 SHA512 ce4f850ce87652ef4eab039332048333949c94f0627bec8eb00d9689d7f8edcce372e2185ef8bbda9aef97781a2008b7c6464468cc38f3454dee862efc0ecdc9
-EBUILD virtualbox-6.1.50-r2.ebuild 18981 BLAKE2B 9265541084623c006ae3322a61bf31388bfc3d77f40550ec6383d93aa2759008003be18afa0ae6d240b542904d3c21ca9380cd4d54617ecbbb3a4f5b51099f07 SHA512 22dccdc3bcadf542181d3704174968a02240b67b2bf75206c455b2328f9eb907faf7a0bd7e2abde248dd491c88af46c2f0041ff93e4f9530aea63b4ba71e5797
+EBUILD virtualbox-6.1.50-r3.ebuild 18929 BLAKE2B 5361667320ccdc5534959f12f40665f7a8a19e8b09b0b172c3537bb0d93a7bb0117dc35114e27e7a6de35eefb0811aaf94c54568b32cd1dcc62524ec22d7b393 SHA512 54719ef39276acff779d399ed744d5aef88e6275dce7d06cec9fc611335d243b8dd1b817aea56fa5b93b96345f7b19dccdf8facdfc49e58d42524f9050ba7776
 EBUILD virtualbox-7.0.14-r2.ebuild 20784 BLAKE2B 371f4187b624e402d1de061c61e935abaab1901bd260449e57d0566e73e6578e23dfe3430ecff1906fe1e0f1a314c8990294a08cd6bb144bd330835cfb71e174 SHA512 237c0e6140d13a87ebcdeb32412d7da0885cc8d0814344cd7d194463c312214173ffc3c5b1064ac8076d6934c239bafc19f4fe4d9cf1dd073855c8b43298c706
-EBUILD virtualbox-7.0.18-r1.ebuild 20831 BLAKE2B e02e28f033aa9e199f8638871f4f57e9535a201f71c5406b06e540260fa5cd416a639d3ea3741cbf36f00eb643da66531449bf7747f867047a2c73d6e386c7e3 SHA512 92ae0a03b26092f8ace7d4dda0ed30301767e84e1bbe44840cfe75349946e6c3448b67cdd04dce2f466f1297d54c36ca854894bdb62b7d93ff57ef6ac62889b9
+EBUILD virtualbox-7.0.18-r1.ebuild 20842 BLAKE2B 041bb2782ffabb3ce830a94b3d98abec6214eb6fcecc7fe073e9156b9b74f4487d9f6a0ac7bc9f77933322ef66ce0c8536c9347766ad1bb50dee33d645adc315 SHA512 7e45639ca8255febea8a766d906d3730ec9d229834b3a3fe76cb5fc0fe2adaa909db6cb45c5cac3ed33f5af25a49b0270228bd75f3d5a1e5bf5cec9587fe2e26
 EBUILD virtualbox-7.0.18.ebuild 20836 BLAKE2B fc5a6c5796354b3eecf4e5a2f6e11f363b3cfd6753f5e73a885d78e39783eab2102358886fd08aac2aff2e1e79405a854e564251458703f6576efa2d4b00280e SHA512 dcdc6a069c3a0f88d1257d7606a8a9a3d7b009e413dbb2a45c9c0b98722d3ffa1ce7b34dcd1ee48f3993be86a123e243964235ef50e28bfdcbd427a469ec45b5
 EBUILD virtualbox-9999.ebuild 21626 BLAKE2B 001008613b2f24006cff0ddf9f5758d37d248541edb6a20c1d8942129987a82a3eafb4db19a2e7a32daae7b4de03d82b0a7a6b78b119f15201e64b783ea5531f SHA512 d42bed323f570e022f75c579e92fc220e8c5a344d9289d83a7b3f1a9a92cb8905935bd6e486e5bf29143fcdea13dc7b30adb74a5d4bf6759b193fea1523bfa4c
 MISC metadata.xml 948 BLAKE2B c074e494d9affda91addd2355f8e71616602102b4cc151d2b45efd04754f1f92621ecd313dbe3baa44c3301f57b61e9cff780d445c2ea3d19ce3d9c8ae05213a SHA512 5338812da9334aedf08dd7a31a4a07c7bfa8232e8f0de6af9de9ac0f5585397cea16e66cb73d56632efa4cf21386782108182d803de6ff45c08082a13dc5fed9
diff --git a/app-emulation/virtualbox/virtualbox-6.1.50-r2.ebuild b/app-emulation/virtualbox/virtualbox-6.1.50-r3.ebuild
index a41107315c77..fa179b79846c 100644
--- a/app-emulation/virtualbox/virtualbox-6.1.50-r2.ebuild
+++ b/app-emulation/virtualbox/virtualbox-6.1.50-r3.ebuild
@@ -37,7 +37,6 @@ IUSE="alsa debug doc dtrace headless java lvm +opus pam pax-kernel pch pulseaudi
 unset WATCOM #856769
 
 COMMON_DEPEND="
-	${PYTHON_DEPS}
 	acct-group/vboxusers
 	~app-emulation/virtualbox-modules-${PV}
 	>=dev-libs/libxslt-1.1.19
@@ -73,6 +72,7 @@ COMMON_DEPEND="
 	virtual/libcrypt:=
 	lvm? ( sys-fs/lvm2 )
 	opus? ( media-libs/opus )
+	python? ( ${PYTHON_DEPS} )
 	udev? ( >=virtual/udev-171 )
 	vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] )
 	vnc? ( >=net-libs/libvncserver-0.9.9 )
@@ -101,7 +101,6 @@ DEPEND="
 	pulseaudio? ( media-libs/libpulse )
 "
 BDEPEND="
-	${PYTHON_DEPS}
 	>=app-arch/tar-1.34-r2
 	>=dev-build/kbuild-0.1.9998.3127
 	<=dev-build/kbuild-0.1.9998.3500
@@ -122,6 +121,7 @@ BDEPEND="
 		dev-texlive/texlive-fontsextra
 	)
 	java? ( virtual/jdk:1.8 )
+	python? ( ${PYTHON_DEPS} )
 	qt5? ( dev-qt/linguist-tools:5 )
 "
 RDEPEND="
@@ -161,9 +161,8 @@ QA_PRESTRIPPED="
 
 REQUIRED_USE="
 	java? ( sdk )
-	python? ( sdk )
+	python? ( sdk ${PYTHON_REQUIRED_USE} )
 	vboxwebsrv? ( java )
-	${PYTHON_REQUIRED_USE}
 "
 
 PATCHES=(
@@ -199,10 +198,6 @@ pkg_pretend() {
 		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
 
 	# 749273
 	local d=${ROOT}
@@ -216,7 +211,7 @@ pkg_pretend() {
 
 pkg_setup() {
 	java-pkg-opt-2_pkg_setup
-	python-single-r1_pkg_setup
+	use python && python-single-r1_pkg_setup
 }
 
 src_prepare() {
@@ -350,13 +345,13 @@ src_configure() {
 		-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
+		cat >> AutoConfig.kmk <<-EOF || die
+			VBOX_WITH_PYTHON=1
+			VBOX_PATH_PYTHON_INC=$(python_get_includedir)
+			VBOX_LIB_PYTHON=$(python_get_library_path)
+		EOF
+
 		local mangled_python="${EPYTHON#python}"
 		mangled_python="${mangled_python/.}"
 
@@ -373,6 +368,10 @@ src_configure() {
 		EOF
 
 		chmod +x src/libs/xpcom18a4/python/gen_python_deps.py || die
+	else
+		cat >> AutoConfig.kmk <<-EOF || die
+			VBOX_WITH_PYTHON:=
+		EOF
 	fi
 }
 
diff --git a/app-emulation/virtualbox/virtualbox-7.0.18-r1.ebuild b/app-emulation/virtualbox/virtualbox-7.0.18-r1.ebuild
index 625c260d0476..1977c56b1a5d 100644
--- a/app-emulation/virtualbox/virtualbox-7.0.18-r1.ebuild
+++ b/app-emulation/virtualbox/virtualbox-7.0.18-r1.ebuild
@@ -34,7 +34,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="GPL-2+ GPL-3 LGPL-2.1 MIT dtrace? ( CDDL )"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="alsa dbus debug doc dtrace +gui java lvm nls pam pch pulseaudio +opengl python +sdk +sdl +udev vboxwebsrv vde +vmmraw vnc"
 
 unset WATCOM #856769
@@ -125,7 +125,6 @@ RDEPEND="
 	java? ( virtual/jre:1.8 )
 "
 BDEPEND="
-	${PYTHON_DEPS}
 	>=app-arch/tar-1.34-r2
 	>=dev-lang/yasm-0.6.2
 	dev-libs/libIDL
@@ -149,6 +148,7 @@ BDEPEND="
 	)
 	gui? ( dev-qt/linguist-tools:5 )
 	nls? ( dev-qt/linguist-tools:5 )
+	python? ( ${PYTHON_DEPS} )
 	java? ( virtual/jdk:1.8 )
 "