gentoo auto-resync : 01:06:2024 - 00:07:06

6 files changed, 75 insertions, 35 deletions

diff --git a/app-emulation/wine-staging/Manifest b/app-emulation/wine-staging/Manifest
index 2af1cf24794d..32e66d73e178 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -10,9 +10,9 @@ DIST wine-staging-9.0.tar.gz 9577631 BLAKE2B 0012978f54c618e73d407dd49dccff02853
 DIST wine-staging-9.7.tar.gz 9573710 BLAKE2B 34eee97f51268c07d649f0ed498b5e92bbc8bb1d8cee860040ee660d968307a7d9d3b59305567c50338d2ce97b3071f615b8782ca74716b42904ae4514404316 SHA512 3c5f100f715c6b3399c356b304b8eca1e51706e03782f2f834965474a7efeca4174ae806dff85080cded93501e9cfcd097eca43230d9425c78ae73a6f4485c76
 DIST wine-staging-9.8.tar.gz 9580231 BLAKE2B 74d0b7d4eb49b5cb16abf17a2aae52bad9db04d3e207762f1d37a9f18870683c0115ce41b29e24edad827557de4a07235980588115b61fa86eeaaa5573460535 SHA512 8132c1fd98b55ef04993e894e11063e43ac1cae059f80e0dc3b2a4c6bf08a6ab80f7bdd02b97f62733f31850b41e5d2d6c5085b22bf873fc03ab67b79bdd3c1d
 DIST wine-staging-9.9.tar.gz 9593672 BLAKE2B 9f6fc7137bb447e52642caf7083ddd60a8d7a545f364dd1783b7adfbd2a80da8b89bc2199525b3c9d75f9f356f5548cf97ae1278361be1c6fb0f0e218c3cf336 SHA512 1b6b341a48a05f48587b7ecc0ead50058b2c1f8a47b6e52adbc7e4afff9bc633a6018e90b2e3ee6b720c59181095b793cd2bbfa7242aec6871f2f87f4db661c4
-EBUILD wine-staging-9.0.ebuild 15206 BLAKE2B 245d17f33556550562c0f7f608b9e003c6568799691c40da7372dd64f39cb30e065d8f35b6574bb9422fa927c48a923af686cb096521592c11c7f80dc25b95d5 SHA512 65929e3d7245ddcd9d63b4e419d7a84f683fc589ec49e9030e681b3cea4852baa74ca00aff614aba9730cc72a76ab3d4d9c8e407377458df7836a3a338efbac9
-EBUILD wine-staging-9.7.ebuild 15154 BLAKE2B fca2f4f8266b4073d1633dbba910b0e52ff83950f565d567959893d975b2c8148a773d9804cec45edb9cfc67be17df575dfb6fbb0dedbe0b62e073bbe4723b2a SHA512 17812a5f0eea0620376d3df103f12d7da20918e7a42cff0eb250cd9d8fa6839c39e3b11f570270a7b25be440777f8ad0143011b0f522122d504581e8214da67d
-EBUILD wine-staging-9.8.ebuild 15208 BLAKE2B 035c6bcdde3441f7c62a3edfbc9c2fd0e6f85df0b8843e05efcad9b7b6f18f9cf53015ee5bc7d8581b8d3519ac5ea81fdff1b90c8d81d319f98e1291fc16fd93 SHA512 4a17ed3549505918c98b86ad029f17958efa85e7542f97241eef6de651396e0f82a3f3d61194d3603d94335b9654fe5ea79fa0c9840b61b743539fe8357ec696
-EBUILD wine-staging-9.9.ebuild 15163 BLAKE2B 0c5db607c7f17c3162037f281c73f1d9e89399d8ea38f1db3e8573070b13e09152acff9d524ffd76574a92e6ded17330db00bbf6f6126f3c2d57196dabfdad38 SHA512 0331fdeab9f081ec0704a763b1f2dacce34a7d3772f665710ad5a6653358764be8362818d056aec32587fbddfcb5cbd1195dda9e911086578ffd2e94ccd62153
-EBUILD wine-staging-9999.ebuild 15163 BLAKE2B 0c5db607c7f17c3162037f281c73f1d9e89399d8ea38f1db3e8573070b13e09152acff9d524ffd76574a92e6ded17330db00bbf6f6126f3c2d57196dabfdad38 SHA512 0331fdeab9f081ec0704a763b1f2dacce34a7d3772f665710ad5a6653358764be8362818d056aec32587fbddfcb5cbd1195dda9e911086578ffd2e94ccd62153
+EBUILD wine-staging-9.0.ebuild 15677 BLAKE2B a60e2f72c3896f6de7b045ba51c41338531eb2dccd0b783725c1c793cddf4f17311c5941c99b0d29bc1b61607bb4e26c4114b3240b4c3b219927d26151406593 SHA512 affaba6aff52e930d8345a5b3c6ecf4df5479463f4bf8ad036b9215f7f802bc94efa5ac47897af11bdd9a12f5d93947fdda4407ddc75b937a489f783c9cf2389
+EBUILD wine-staging-9.7.ebuild 15625 BLAKE2B 3dc45c1ae1b49182d9347fbcbbecdb0247c3163a16310e81425c42b74a012eb4e07b5435defe3c70b77ac64c1cdc05be34e17c912b5ab1667d97c41ccae8aa11 SHA512 e6b6f3da849eecb39d6f5b3a126ec4ab715b225b5b49a31588a7df77c0d272dcc10acc30747fef5891c8ccbfa1598bd6e1fabb3f75290e251d6142c88c9871ec
+EBUILD wine-staging-9.8.ebuild 15679 BLAKE2B 5db2934a66d8df59dd3e4ed698e9c1c10362d95a59d4d1da8db9caa4a52beeda7081b721a4274d6e9a2e87fa80afc7ab54f61b1a7ed7726c46c5375d329b0147 SHA512 979a5b0464ee6c1569d2000d5765c0a1d5a3b179ce13061acf93d2ba7326ec7033110defef2c534f23463b767033016a95ea73853d9fc02b9315d3a7857186f6
+EBUILD wine-staging-9.9.ebuild 15634 BLAKE2B ffc3eb7ea4911dbbcaf1d63651e605d54846f864f9ab1b1764e622a66087743dbe036c17cafef7a09a791f97c0ce7cbe7e5e122f83d74a85560f993d10b10304 SHA512 b22cf4de29fc441c74d02778f089167d1fcebcd0a7cdfc50c967a4cb2e9230e86a849506979d90e426ff53aff6c93b37672c0850c2f666387ec794e4b36b9416
+EBUILD wine-staging-9999.ebuild 15634 BLAKE2B ffc3eb7ea4911dbbcaf1d63651e605d54846f864f9ab1b1764e622a66087743dbe036c17cafef7a09a791f97c0ce7cbe7e5e122f83d74a85560f993d10b10304 SHA512 b22cf4de29fc441c74d02778f089167d1fcebcd0a7cdfc50c967a4cb2e9230e86a849506979d90e426ff53aff6c93b37672c0850c2f666387ec794e4b36b9416
 MISC metadata.xml 2659 BLAKE2B 8a80b12643e82b98b71bc408e2fd79736da01c8f7d914c7a592cb685893ea3896bc44fecf0160faec803b284d3f6bb38cf36fb4745d9d43e0e1ced8702fcaf9d SHA512 a271e537318a4e90236c195f1f8c24c3255b5465345246627797d37238e2b6292d0734a9ab19542ee34fc1e9312dc4418694992f5ce3c53310228cc6bf14ef90
diff --git a/app-emulation/wine-staging/wine-staging-9.0.ebuild b/app-emulation/wine-staging/wine-staging-9.0.ebuild
index c7ad9c55076f..f82e62bb333f 100644
--- a/app-emulation/wine-staging/wine-staging-9.0.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9.0.ebuild
@@ -464,12 +464,20 @@ pkg_postinst() {
 		ewarn "work, be warned that it is not unusual that installers or other helpers"
 		ewarn "will attempt to use 32bit and fail. If do not want full USE=abi_x86_32,"
 		ewarn "note the experimental/WIP USE=wow64 can allow 32bit without multilib."
-	elif use abi_x86_32 && { use opengl || use vulkan; } &&
-		has_version 'x11-drivers/nvidia-drivers[-abi_x86_32]'
-	then
-		ewarn "x11-drivers/nvidia-drivers is installed but is built without"
-		ewarn "USE=abi_x86_32 (ABI_X86=32), hardware acceleration with 32bit"
-		ewarn "applications under ${PN} will likely not be usable."
+	elif use abi_x86_32 && { use opengl || use vulkan; }; then
+		# difficult to tell what is needed from here, but try to warn
+		if has_version 'x11-drivers/nvidia-drivers'; then
+			if has_version 'x11-drivers/nvidia-drivers[-abi_x86_32]'; then
+				ewarn "x11-drivers/nvidia-drivers is installed but is built without"
+				ewarn "USE=abi_x86_32 (ABI_X86=32), hardware acceleration with 32bit"
+				ewarn "applications under ${PN} will likely not be usable."
+				ewarn "Multi-card setups may need this on media-libs/mesa as well."
+			fi
+		elif has_version 'media-libs/mesa[-abi_x86_32]'; then
+			ewarn "media-libs/mesa seems to be in use but is built without"
+			ewarn "USE=abi_x86_32 (ABI_X86=32), hardware acceleration with 32bit"
+			ewarn "applications under ${PN} will likely not be usable."
+		fi
 	fi
 
 	eselect wine update --if-unset || die
diff --git a/app-emulation/wine-staging/wine-staging-9.7.ebuild b/app-emulation/wine-staging/wine-staging-9.7.ebuild
index 1a169317c27f..24424d0c615d 100644
--- a/app-emulation/wine-staging/wine-staging-9.7.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9.7.ebuild
@@ -459,12 +459,20 @@ pkg_postinst() {
 		ewarn "work, be warned that it is not unusual that installers or other helpers"
 		ewarn "will attempt to use 32bit and fail. If do not want full USE=abi_x86_32,"
 		ewarn "note the experimental/WIP USE=wow64 can allow 32bit without multilib."
-	elif use abi_x86_32 && { use opengl || use vulkan; } &&
-		has_version 'x11-drivers/nvidia-drivers[-abi_x86_32]'
-	then
-		ewarn "x11-drivers/nvidia-drivers is installed but is built without"
-		ewarn "USE=abi_x86_32 (ABI_X86=32), hardware acceleration with 32bit"
-		ewarn "applications under ${PN} will likely not be usable."
+	elif use abi_x86_32 && { use opengl || use vulkan; }; then
+		# difficult to tell what is needed from here, but try to warn
+		if has_version 'x11-drivers/nvidia-drivers'; then
+			if has_version 'x11-drivers/nvidia-drivers[-abi_x86_32]'; then
+				ewarn "x11-drivers/nvidia-drivers is installed but is built without"
+				ewarn "USE=abi_x86_32 (ABI_X86=32), hardware acceleration with 32bit"
+				ewarn "applications under ${PN} will likely not be usable."
+				ewarn "Multi-card setups may need this on media-libs/mesa as well."
+			fi
+		elif has_version 'media-libs/mesa[-abi_x86_32]'; then
+			ewarn "media-libs/mesa seems to be in use but is built without"
+			ewarn "USE=abi_x86_32 (ABI_X86=32), hardware acceleration with 32bit"
+			ewarn "applications under ${PN} will likely not be usable."
+		fi
 	fi
 
 	optfeature "/dev/hidraw* access used for *some* controllers (e.g. DualShock4)" \
diff --git a/app-emulation/wine-staging/wine-staging-9.8.ebuild b/app-emulation/wine-staging/wine-staging-9.8.ebuild
index dff82e982ed2..5409f612826e 100644
--- a/app-emulation/wine-staging/wine-staging-9.8.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9.8.ebuild
@@ -460,12 +460,20 @@ pkg_postinst() {
 		ewarn "work, be warned that it is not unusual that installers or other helpers"
 		ewarn "will attempt to use 32bit and fail. If do not want full USE=abi_x86_32,"
 		ewarn "note the experimental/WIP USE=wow64 can allow 32bit without multilib."
-	elif use abi_x86_32 && { use opengl || use vulkan; } &&
-		has_version 'x11-drivers/nvidia-drivers[-abi_x86_32]'
-	then
-		ewarn "x11-drivers/nvidia-drivers is installed but is built without"
-		ewarn "USE=abi_x86_32 (ABI_X86=32), hardware acceleration with 32bit"
-		ewarn "applications under ${PN} will likely not be usable."
+	elif use abi_x86_32 && { use opengl || use vulkan; }; then
+		# difficult to tell what is needed from here, but try to warn
+		if has_version 'x11-drivers/nvidia-drivers'; then
+			if has_version 'x11-drivers/nvidia-drivers[-abi_x86_32]'; then
+				ewarn "x11-drivers/nvidia-drivers is installed but is built without"
+				ewarn "USE=abi_x86_32 (ABI_X86=32), hardware acceleration with 32bit"
+				ewarn "applications under ${PN} will likely not be usable."
+				ewarn "Multi-card setups may need this on media-libs/mesa as well."
+			fi
+		elif has_version 'media-libs/mesa[-abi_x86_32]'; then
+			ewarn "media-libs/mesa seems to be in use but is built without"
+			ewarn "USE=abi_x86_32 (ABI_X86=32), hardware acceleration with 32bit"
+			ewarn "applications under ${PN} will likely not be usable."
+		fi
 	fi
 
 	optfeature "/dev/hidraw* access used for *some* controllers (e.g. DualShock4)" \
diff --git a/app-emulation/wine-staging/wine-staging-9.9.ebuild b/app-emulation/wine-staging/wine-staging-9.9.ebuild
index c8f8d0cdc861..087ec27eccec 100644
--- a/app-emulation/wine-staging/wine-staging-9.9.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9.9.ebuild
@@ -459,12 +459,20 @@ pkg_postinst() {
 		ewarn "work, be warned that it is not unusual that installers or other helpers"
 		ewarn "will attempt to use 32bit and fail. If do not want full USE=abi_x86_32,"
 		ewarn "note the experimental/WIP USE=wow64 can allow 32bit without multilib."
-	elif use abi_x86_32 && { use opengl || use vulkan; } &&
-		has_version 'x11-drivers/nvidia-drivers[-abi_x86_32]'
-	then
-		ewarn "x11-drivers/nvidia-drivers is installed but is built without"
-		ewarn "USE=abi_x86_32 (ABI_X86=32), hardware acceleration with 32bit"
-		ewarn "applications under ${PN} will likely not be usable."
+	elif use abi_x86_32 && { use opengl || use vulkan; }; then
+		# difficult to tell what is needed from here, but try to warn
+		if has_version 'x11-drivers/nvidia-drivers'; then
+			if has_version 'x11-drivers/nvidia-drivers[-abi_x86_32]'; then
+				ewarn "x11-drivers/nvidia-drivers is installed but is built without"
+				ewarn "USE=abi_x86_32 (ABI_X86=32), hardware acceleration with 32bit"
+				ewarn "applications under ${PN} will likely not be usable."
+				ewarn "Multi-card setups may need this on media-libs/mesa as well."
+			fi
+		elif has_version 'media-libs/mesa[-abi_x86_32]'; then
+			ewarn "media-libs/mesa seems to be in use but is built without"
+			ewarn "USE=abi_x86_32 (ABI_X86=32), hardware acceleration with 32bit"
+			ewarn "applications under ${PN} will likely not be usable."
+		fi
 	fi
 
 	optfeature "/dev/hidraw* access used for *some* controllers (e.g. DualShock4)" \
diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-9999.ebuild
index c8f8d0cdc861..087ec27eccec 100644
--- a/app-emulation/wine-staging/wine-staging-9999.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9999.ebuild
@@ -459,12 +459,20 @@ pkg_postinst() {
 		ewarn "work, be warned that it is not unusual that installers or other helpers"
 		ewarn "will attempt to use 32bit and fail. If do not want full USE=abi_x86_32,"
 		ewarn "note the experimental/WIP USE=wow64 can allow 32bit without multilib."
-	elif use abi_x86_32 && { use opengl || use vulkan; } &&
-		has_version 'x11-drivers/nvidia-drivers[-abi_x86_32]'
-	then
-		ewarn "x11-drivers/nvidia-drivers is installed but is built without"
-		ewarn "USE=abi_x86_32 (ABI_X86=32), hardware acceleration with 32bit"
-		ewarn "applications under ${PN} will likely not be usable."
+	elif use abi_x86_32 && { use opengl || use vulkan; }; then
+		# difficult to tell what is needed from here, but try to warn
+		if has_version 'x11-drivers/nvidia-drivers'; then
+			if has_version 'x11-drivers/nvidia-drivers[-abi_x86_32]'; then
+				ewarn "x11-drivers/nvidia-drivers is installed but is built without"
+				ewarn "USE=abi_x86_32 (ABI_X86=32), hardware acceleration with 32bit"
+				ewarn "applications under ${PN} will likely not be usable."
+				ewarn "Multi-card setups may need this on media-libs/mesa as well."
+			fi
+		elif has_version 'media-libs/mesa[-abi_x86_32]'; then
+			ewarn "media-libs/mesa seems to be in use but is built without"
+			ewarn "USE=abi_x86_32 (ABI_X86=32), hardware acceleration with 32bit"
+			ewarn "applications under ${PN} will likely not be usable."
+		fi
 	fi
 
 	optfeature "/dev/hidraw* access used for *some* controllers (e.g. DualShock4)" \