gentoo auto-resync : 05:06:2023 - 09:36:29

3 files changed, 11 insertions, 21 deletions

diff --git a/x11-drivers/Manifest.gz b/x11-drivers/Manifest.gz
index d0384d0a786e..631bbd67da5c 100644
--- a/x11-drivers/Manifest.gz
+++ b/x11-drivers/Manifest.gz
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index 15c8ceebfc1e..9353af28d5dd 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -67,5 +67,5 @@ EBUILD nvidia-drivers-515.105.01-r1.ebuild 19243 BLAKE2B 22d070f747c84f8ccc549ac
 EBUILD nvidia-drivers-525.116.04-r1.ebuild 19121 BLAKE2B 25c779152febf6701d3999d5e7d3293541aab1d569b9e4b494a463965ee028d150d23e1cf0d670630af7c894f30aca5ed399d0afe9828e11bfc7eb39f7c79bfd SHA512 2464b8cc7bc336e728c922832fc8316a9c69f7593d3b908e891ce3c2033ae89434b5232a8c001d86ffc77baaf47f89c0296ade4eda30992fd9219a0e47706014
 EBUILD nvidia-drivers-525.47.26-r1.ebuild 19132 BLAKE2B 1977a4b2bc54167e0df506dc5c0f2772d3f41a4f05cef0d61502876beb6b8c49d99104fb233d5b00c4a400b35103d5c2fa5dfd9eb59808989c90e1dc8a40020a SHA512 326cd31ddf4641ae6847c5f032986b51b24d9c52728f91cbd0e86fd698a4d05c7173ba9ea5b301fc8c183683b152af8839e97e28d799510cbfebbae4c0b2d4da
 EBUILD nvidia-drivers-530.41.03-r1.ebuild 19124 BLAKE2B 9340c2c19bea68637315edab1c3b8ecf26a1502b35f5082156192d2c2fc4d60008fd5e4188885586481a26e9709c947aba2122bbc792fc1e09e381477d6034ee SHA512 48c66a92b150648a16ca311d4a0b319ba980082140490996c6ef0df6af24b26d915da11abacce6e9df9afbcdc22c2846632f4ed7a6572e9425b315e63c15e38f
-EBUILD nvidia-drivers-535.43.02-r1.ebuild 19609 BLAKE2B 0e281e6568902597662b4fc83a232995ce9a3cea45aade75180ae527d759c988a061c082fb1eb712659c201719af94e66e0c04a12b331e6836bd4bbb0c073fd1 SHA512 0b5f51e7193bf4782bce88f8ef86151a3592204b412067452001092535eefa752262779a6cabd39d3633f21b24992d1ffc20f9a1a61621dd1625de19f89dd3c9
+EBUILD nvidia-drivers-535.43.02-r1.ebuild 19674 BLAKE2B b3f1a8b9bdb915a143349bdb50c397a0274a039bf7d2556c0246328af6c324e0f37be5f7b5b5bf220e3cb0cb215cd6d0fd5ed3af62397eccae8309ad1857f063 SHA512 ae32361f3e65f95d419a70ce92e03cd4767c1f4738111cdc3062ef1299cafb7a9f89dab121b3d3a1cb8811c5f8b793831b696683b6c06437a96ebf034ccda0c5
 MISC metadata.xml 1281 BLAKE2B 2d2dd88b6c8afbe3b8d4799813fcc65a7102dfaf47fd6266ebd627acce1dde00acdf69d9d85193886cdce3e6553e261987647d12737cdec701ea4f9ba865366b SHA512 00100ef8ec37c1703a2bae7de811ded281c5dcf373407e22e9b359a92feac3ceefb007ed2980ad05cfcc7a698e5434e4cc7e2fc5c6ab82a3d60b679d984963c4
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-535.43.02-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-535.43.02-r1.ebuild
index 7afdf2eec78b..1f3fc2044bc9 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-535.43.02-r1.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-535.43.02-r1.ebuild
@@ -28,14 +28,13 @@ SLOT="0/${PV%%.*}"
 IUSE="+X abi_x86_32 abi_x86_64 kernel-open persistenced +static-libs +tools wayland"
 REQUIRED_USE="kernel-open? ( modules )"
 
+# wrt openssl, can only use exactly :0/1.1 *or* :0/3 (prebuilt) but depend on
+# a simple >=1.1 given a || ( ) block confuses portage with subslot "rebuilds"
+# TODO: change to a hard dependency on exactly :0/3 when :0/1.1 loses relevance
 COMMON_DEPEND="
 	acct-group/video
 	sys-libs/glibc
-	dev-libs/openssl:=
-	|| (
-		dev-libs/openssl:0/3
-		dev-libs/openssl:0/1.1
-	)
+	>=dev-libs/openssl-1.1:=
 	X? ( x11-libs/libpciaccess )
 	persistenced? (
 		acct-user/nvpd
@@ -312,6 +311,10 @@ src_install() {
 		libnvidia-egl-gbm 15_nvidia_gbm # gui-libs/egl-gbm
 		libnvidia-egl-wayland 10_nvidia_wayland # gui-libs/egl-wayland
 	)
+	# TODO: hard-depend on openssl:0/3, drop this, and add pkcs11.so above
+	has_version 'dev-libs/openssl:0/3' &&
+		skip_files+=( libnvidia-pkcs11.so ) ||
+		skip_files+=( libnvidia-pkcs11-openssl3.so )
 	local skip_modules=(
 		$(usev !X "nvfbc vdpau xdriver")
 		$(usev !modules gsp)
@@ -437,21 +440,8 @@ https://wiki.gentoo.org/wiki/NVIDIA/nvidia-drivers"
 			dosym ${m[4]} ${into}/${m[0]}
 			continue
 		fi
-
-		case ${m[0]} in
-			libnvidia-ngx.so*|libnvidia-egl-gbm.so*)
-				# soname is missing from the manifest
-				dosym ${m[0]} ${into}/${m[0]%.so*}.so.1
-			;;
-			libnvidia-pkcs11.so*)
-				# TODO: always skip when can reasonably depend only on 3
-				# (currently relies on subslot rebuilds to pick)
-				has_version 'dev-libs/openssl:0/1.1' || continue
-			;;
-			libnvidia-pkcs11-openssl3.so*)
-				has_version 'dev-libs/openssl:0/3' || continue
-			;;
-		esac
+		[[ ${m[0]} =~ ^libnvidia-ngx.so|^libnvidia-egl-gbm.so ]] &&
+			dosym ${m[0]} ${into}/${m[0]%.so*}.so.1 # soname not in .manifest
 
 		printf -v m[1] %o $((m[1] | 0200)) # 444->644
 		insopts -m${m[1]}