gentoo auto-resync : 25:01:2025 - 06:47:11

4 files changed, 32 insertions, 16 deletions

diff --git a/app-emulation/virtualbox-guest-additions/Manifest b/app-emulation/virtualbox-guest-additions/Manifest
index b30491a40859..323fbaf0db16 100644
--- a/app-emulation/virtualbox-guest-additions/Manifest
+++ b/app-emulation/virtualbox-guest-additions/Manifest
@@ -2,6 +2,7 @@ AUX vboxclient.desktop 145 BLAKE2B c01f4c307cd965d271e19f31cab5f902126bdf49bd947
 AUX vboxguest-6.1.36-log-use-c99.patch 288 BLAKE2B 7a869ea9c46d91b64e6f062173bce10db25581b2390dad517016eb35cdae0727579e374318afdf749c3118436c667dacaf670f93698894b972b3badc60a80a43 SHA512 c66d75e77d84f081095de91248f236606b5e0bcc50a5525918fce979c97d84dddf6d10fc2a21832db74b5ef632949d9dee8ec30b4f1ab05bcec1aa75da681971
 AUX virtualbox-guest-additions-5-localconfig 937 BLAKE2B 4ad7e6520572ed5b3ee29c03b77fb1a4df5279e38929c4e6e446387f30eef9fd8f32b9f877db1074c0e28f9a461ec3114e7120f636e02ce41a72a81b1e69c62e SHA512 ccbc2db825060fd5044e42bf4e53271d6e64a7a400b09705230006367e696dd3bff384f1e4873bf2aedfec8e6fdc8f8ecc537cd5a1fe629727c2943371d13e40
 AUX virtualbox-guest-additions-7.0.8-fix-gcc13.patch 753 BLAKE2B 2c42f0d370d5be3c02278389a103dec8d7ee3515b61147aaccb4b47285329fa0b87edea392031c856b14c2527544c1ddccd1a3a23522d10fb60f40f4dbdac941 SHA512 76766339012cc60a5c360caf17d92547718d67c670a498085f30b99be7541b69ed3f9acc6e7916dfb131facc4343fdd0db27b981755250189c16df215a6aee15
+AUX virtualbox-guest-additions-7.1.6-disable-vboxvideo-module.patch 420 BLAKE2B 6049193d8adb5432bb07b0e333eacab16c7143e071838c70b2f53edb4a50eb7fb16d80def2dc421116b17be930e581951d84435b09a057dc3636c68f315b7403 SHA512 df25fc50aa40072687cb4f661a4ceda90de9c75622e27a0a5fb78b25323dcd45d369040ec9b5102fbe2cfb5396f753513d81090485eb21424a0711b5fa01d0c5
 AUX virtualbox-guest-additions-8.initd-r1 547 BLAKE2B 1b26fc26e95baa74d551f8a9cf62f698485d63a0487c4cc4fc9906b8ced191f078e2b794ef9db9488de9e92188c73812c16e37ff542f06e0d52a4dc62b631960 SHA512 81ccc8d3edd965feb55290cf1281a97a485f14fd1de07cd59479bd7746291d41abc45c2e7e209f17f7df057528be83c48f3e270b526e6b86d85c5ec4be2d3944
 AUX virtualbox-guest-additions.service 411 BLAKE2B f5f1c24a94764ca72a04879c27cd9fdc1e0c8a1440ac87674dad44a1493a9347e6e2b351ae2b71e050ba06ae9848168220d62981a9e0c984ea68bf48ea06b485 SHA512 b6226146f3591a778551e94ae2661e2ae3c6b761d20600d741eaaa03f43f0a2b841d2a44d9eec3a3768edb23b021cee94c7849d998ee4104ad60dad2df88df83
 AUX xorg.conf.vbox 274 BLAKE2B 3a3035fcbdbd5810c54505f5a5e6deefa1540e5e01a038babb62a40bd5b2de2dc5b228cabe55612d92a522e6ae92aa7ff4ff2ab26772c3b54ce95ebac4e7fc5a SHA512 ac2b14970dc6667ceec2dbdae52bc92cbad4aff020898ede156454e8a8a703354f15c7e19cfbd2bdd15e251493fd05cacfe814cabee0f9b4cf155e44860ed4c9
@@ -15,7 +16,7 @@ DIST virtualbox-patches-7.0.16.tar.bz2 6808 BLAKE2B d15fa2ca306375142c3e25d4759d
 DIST virtualbox-patches-7.1.0.tar.bz2 5952 BLAKE2B cb024f36249d7d312c9d0f9231c22a9609d45de1d4c82ca36672fea703765d437d7a414d810adb5eb5f2db92018b669c3b5d0c32372c5ced90f5e13f82344ffa SHA512 c6ef54b7d60f01f5f2b89c6fd7f8b7b509bc62bca0502114cedcbaaf9643445ea413bba481dcf43fb96b5b4d94d64395965682c1ee160d889213615c9272184c
 EBUILD virtualbox-guest-additions-6.1.50-r1.ebuild 7487 BLAKE2B 1473cc437f14f11d9a77c72b889ee0a872cacb58ec8919c4bb83a08000212d731864ce00533ca86c758764925f5a595d953d27942e0c0cda94e030a389905542 SHA512 070ea542766af91c52fea0c3835ddae7041d35a064d8a107f77b22a1361613c405b72307735f422abd84b8471626909bc128e91411dfd6188563df3ced777524
 EBUILD virtualbox-guest-additions-7.0.22.ebuild 7544 BLAKE2B 78aeb666e2db0db9e7d8120113e45ee31de38964492dbf725ff1256a817614f834cd546e680743e41a380abf97be97a7698ef0b874b182f069ce710dc6d0148a SHA512 fe700af6d72182109e7dd9dc96263b8b4f17aa381e35b3f196386b3effde9d65b4c4bb30e8c065585455a83240a00148276df38fd5e51c26d172c0bdc73ede20
-EBUILD virtualbox-guest-additions-7.0.24.ebuild 7546 BLAKE2B 2ca09054cf3a58a092db5640fe8807b52c1460b17dd5efd1336065456de7398aadae857a22941981bacd33e328ba69b24b4f56158e3732cfe117318a5b6b897c SHA512 8974dfb7718d392251defdecad7022d69e97078618a2be5cc4bcd23579dc1c426ccfe6e6f24d1c0426e5f6fdaa6499a7f1f252d1c973f8fea7192ec558da33e4
+EBUILD virtualbox-guest-additions-7.0.24-r1.ebuild 7515 BLAKE2B ba6aa17027ae6832a117ad008ad4fc9d10ba5e39369c629da7f07684e8d1e0eb8bbed964987b7be790875a4a9665eead08c7f8f0130430b5e61269961ef8c6bb SHA512 d07226a3e557965666c662f538697d1978f65d2377469a9640a34d5e8138af9928a842e2b07dd90355f76c8923e7d3470fac091dbcc6c3a724cda6a57af71a70
 EBUILD virtualbox-guest-additions-7.1.4.ebuild 7563 BLAKE2B 4f6ab2b65a4c8f9a7d65082f3e3ae7c4ecc1f9bf6ce60a3facd10f5c77621d837be2ae8791056350ac2cbe0e1250058e4047df27116a3aeae7075b78e000cf78 SHA512 8e8a34eb76f5f22fedbb86d05beee5db845dee855133d2fc0624c326111ba6c7e097cbd98c4afc2a74552d2a4e8ce2e4f7579fcccafb508bf2a78486cc96bb75
-EBUILD virtualbox-guest-additions-7.1.6.ebuild 7565 BLAKE2B 020e20bf61b29b9e91a097fd5ebbf4eec80ca21173db094206aee78e771dd991a4c1f9aa67480e357057ed7379603c36f110c31683b899f70396df88cd72a1dc SHA512 b715b3c30d1a2c5ffed0b49dbb1d9c919247f68e5af54bc6e024ded0006f7a970c7cbe03b65ccf43dc89a3b6436d3c94e19e867b428ce4e7882a138b101dcbf9
+EBUILD virtualbox-guest-additions-7.1.6-r1.ebuild 7534 BLAKE2B a262a9d570c7000e0bfa97d6083577193f18c0c51b7b3cdbb36379b3be8b26a0ee5f43fb146675e7ea577523c1df4158a7a95e9c7257b47e2f50ac7fba7c47eb SHA512 862ca6cfc6c36798fd323517e783f9430f51207eb76c3fdb5e85e3c140cbc1215858f7490c348fec27741f356ea705bd5992552098499645c23af3092e2da0a3
 MISC metadata.xml 255 BLAKE2B 9386ef3bdb55211441f303528b31f8ccd9ad9039744400e859574a424fa1f366a989fe78f5c10038f3dd9b06a6a389e4a7e643b3eac0dc93a79ac4cc3b4c5423 SHA512 6c158e12464285afd44b70d0653b65f65da1c523fc2b1b07eb6d2dec56f58234bb31cb9dc36238cd6dfc20031b4d58c04e7c1678cc9f917194403ad8a209513f
diff --git a/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-7.1.6-disable-vboxvideo-module.patch b/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-7.1.6-disable-vboxvideo-module.patch
new file mode 100644
index 000000000000..1ccf0baa3740
--- /dev/null
+++ b/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-7.1.6-disable-vboxvideo-module.patch
@@ -0,0 +1,19 @@
+The vboxvideo module is deprecated.
+Do not build it when VBOX_NO_LEGACY_XORG_X11 is defined.
+
+--- a/src/VBox/Additions/linux/drm/Makefile.kmk
++++ b/src/VBox/Additions/linux/drm/Makefile.kmk
+@@ -25,6 +25,8 @@
+ # SPDX-License-Identifier: GPL-3.0-only
+ #
+ 
++ifndef VBOX_NO_LEGACY_XORG_X11
++
+ SUB_DEPTH = ../../../../..
+ include $(KBUILD_PATH)/subheader.kmk
+ 
+@@ -50,3 +52,4 @@
+ 
+ include $(FILE_KBUILD_SUB_FOOTER)
+ 
++endif
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-7.0.24.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-7.0.24-r1.ebuild
index 7c809f94b95c..272679693d42 100644
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-7.0.24.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-7.0.24-r1.ebuild
@@ -93,7 +93,7 @@ src_prepare() {
 	# Provide kernel sources
 	pushd src/VBox/Additions &>/dev/null || die
 	ebegin "Extracting guest kernel module sources"
-	kmk GuestDrivers-src vboxguest-src vboxsf-src vboxvideo-src &>/dev/null
+	kmk GuestDrivers-src vboxguest-src vboxsf-src &>/dev/null
 	eend $? || die
 	popd &>/dev/null || die
 
@@ -102,7 +102,9 @@ src_prepare() {
 
 	# Disable things unused or splitted into separate ebuilds
 	cp "${FILESDIR}/${PN}-5-localconfig" LocalConfig.kmk || die
-	if ! use gui; then
+	if use gui; then
+		echo "VBOX_NO_LEGACY_XORG_X11 := 1" >> LocalConfig.kmk || die
+	else
 		echo "VBOX_WITH_X11_ADDITIONS :=" >> LocalConfig.kmk || die
 	fi
 
@@ -112,6 +114,7 @@ src_prepare() {
 	# Respect LDFLAGS (bug #759100)
 	sed -i -e '/TEMPLATE_VBoxR3Exe_LDFLAGS.linux[    ]*=/ s/$/ $(CCLDFLAGS)/' Config.kmk || die
 
+	eapply "${FILESDIR}"/${PN}-7.1.6-disable-vboxvideo-module.patch
 	eapply "${WORKDIR}/virtualbox-patches-7.0.16/patches"
 	eapply_user
 }
@@ -197,7 +200,6 @@ src_compile() {
 	# Move this here for bug 836037
 	local modargs=( KERN_DIR="${KV_OUT_DIR}" KERN_VER="${KV_FULL}" )
 	local modlist=( vboxguest vboxsf )
-	use gui && modlist+=( vboxvideo )
 	modlist=( "${modlist[@]/%/=misc:${VBOX_MOD_SRC_DIR}}" )
 	linux-mod-r1_src_compile
 }
@@ -261,10 +263,6 @@ src_install() {
 	insinto /etc/xdg/autostart
 	doins "${FILESDIR}"/vboxclient.desktop
 
-	# sample xorg.conf
-	dodoc "${FILESDIR}"/xorg.conf.vbox
-	docompress -x "${ED}"/usr/share/doc/${PF}/xorg.conf.vbox
-
 	systemd_dounit "${FILESDIR}/${PN}.service"
 
 	readme.gentoo_create_doc
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-7.1.6.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-7.1.6-r1.ebuild
index 81cd398e4bc3..ea448bd33c03 100644
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-7.1.6.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-7.1.6-r1.ebuild
@@ -94,7 +94,7 @@ src_prepare() {
 	# Provide kernel sources
 	pushd src/VBox/Additions &>/dev/null || die
 	ebegin "Extracting guest kernel module sources"
-	kmk GuestDrivers-src vboxguest-src vboxsf-src vboxvideo-src &>/dev/null
+	kmk GuestDrivers-src vboxguest-src vboxsf-src &>/dev/null
 	eend $? || die
 	popd &>/dev/null || die
 
@@ -103,7 +103,9 @@ src_prepare() {
 
 	# Disable things unused or splitted into separate ebuilds
 	cp "${FILESDIR}/${PN}-5-localconfig" LocalConfig.kmk || die
-	if ! use gui; then
+	if use gui; then
+		echo "VBOX_NO_LEGACY_XORG_X11 := 1" >> LocalConfig.kmk || die
+	else
 		echo "VBOX_WITH_X11_ADDITIONS :=" >> LocalConfig.kmk || die
 	fi
 
@@ -113,6 +115,7 @@ src_prepare() {
 	# Respect LDFLAGS (bug #759100)
 	sed -i -e '/TEMPLATE_VBoxR3Exe_LDFLAGS.linux[    ]*=/ s/$/ $(CCLDFLAGS)/' Config.kmk || die
 
+	eapply "${FILESDIR}"/${PN}-7.1.6-disable-vboxvideo-module.patch
 	eapply "${WORKDIR}/virtualbox-patches-7.1.0/patches"
 	eapply_user
 }
@@ -198,7 +201,6 @@ src_compile() {
 	# Move this here for bug 836037
 	local modargs=( KERN_DIR="${KV_OUT_DIR}" KERN_VER="${KV_FULL}" )
 	local modlist=( vboxguest vboxsf )
-	use gui && modlist+=( vboxvideo )
 	modlist=( "${modlist[@]/%/=misc:${VBOX_MOD_SRC_DIR}}" )
 	linux-mod-r1_src_compile
 }
@@ -262,10 +264,6 @@ src_install() {
 	insinto /etc/xdg/autostart
 	doins "${FILESDIR}"/vboxclient.desktop
 
-	# sample xorg.conf
-	dodoc "${FILESDIR}"/xorg.conf.vbox
-	docompress -x "${ED}"/usr/share/doc/${PF}/xorg.conf.vbox
-
 	systemd_dounit "${FILESDIR}/${PN}.service"
 
 	readme.gentoo_create_doc