gentoo auto-resync : 18:08:2023 - 15:36:15

3 files changed, 17 insertions, 7 deletions

diff --git a/x11-drivers/Manifest.gz b/x11-drivers/Manifest.gz
index 28b1d992ad7d..6cf279ddebcc 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 3ae4318faf72..2a2280637457 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -22,7 +22,7 @@ DIST NVIDIA-Linux-x86-390.157.run 49417041 BLAKE2B 435b5e0e60468cc74b41cc5d9b5bb
 DIST NVIDIA-Linux-x86_64-390.157.run 85835541 BLAKE2B 44b855cd11f3b2f231f9fb90492ae2e67a67ea3ea83c413e7c90956d38c9730a8bd0321281ae03c6afce633d102f5b499aed25622b9bfd31bdd2c98f0717e95b SHA512 4780503a4cff0180b1b1f37d20a6ba3438dd78b51fa7f69b98d35521835e5d61099129746929d51d63afa2d47b672b3e145e1e1897584dc3799e7f822c5b3a0a
 DIST NVIDIA-Linux-x86_64-470.199.02.run 273256770 BLAKE2B 5ceca89da4b4c7de701602d3dbf26e71a1163be26e0e5eac65354ecd40bfc8d68c981a6ef75b13e95079835c95ef7f9e10e5f95a0ed09beffd5bc22cb81a5330 SHA512 e1265b6266473af652e9d7bf85dcd76e312af281c5f4f158ab322e34d378738acb87c30cfff7bf1f6e1b238883e7f665d9fc5151b1e0078dd9aece5a52655405
 DIST NVIDIA-Linux-x86_64-525.125.06.run 414318862 BLAKE2B 204c53bbf579edf6d88c9ab4efcf82983a2b58262df4748076de96f3d67b107949407ae0c5ffe9bf6747783b1bcb9a9efc4a3c60d7161427b1c85ecfc494171a SHA512 a5f13b633d111d9dc928e8522cd916a2b756fccbf2dc532649762a3f9bdc5503bd57c9c698da8205c49e82720b45789413a1afc26be77d741f823b49ae2f333d
-DIST NVIDIA-Linux-x86_64-525.47.35.run 414996410 BLAKE2B c061e9b3afdbafead834d3aa462da0c50a4b67208bf2dab1d796236d0ca7cda406a6f7d0846d222635e0e900a03fa1f01d213df96c0a33f3e39d3b286a75962b SHA512 234e18a46c19048522d328f5804785c46d9d47e6df0713852d3afd80726219187ac8b19b3e391af8b839fcdd99413c3d6bb98bad6ba589bcd5a4021b8ea55309
+DIST NVIDIA-Linux-x86_64-535.43.08.run 340991388 BLAKE2B 3c397e30cc55eb6a1ff9693e8166f23aba89191776eddcc382fe57ab5afecba307f6bf69436affab3b434ae656e55c36dbd547e26eef6a8122f534089064d9ae SHA512 57a80286821b0def2c2b8424bb0b4cf80e14bdb6738abc3d6accfba72422693b4f86d61c0c9d7af0d6dadcddda30a097d9d7c6c782554e2e23e0c718f4310c07
 DIST NVIDIA-Linux-x86_64-535.86.05.run 340652483 BLAKE2B ce9aeb902ef6826383d076b828bab31349b72625f9b193ae05a45944e14f5fc87bc086c0caa232d94b215a595bc695b94e1c95c1507d9cf3a060595bf5f65db6 SHA512 92c3052f2fe206012853eef9462a6c58d055098e045e305c34a2e912e5b8542ae839a947c54ffc98d889a0c5cf1cecb6e3ad0e5907370926926cb1b50b53c336
 DIST NVIDIA-Linux-x86_64-535.98.run 340737533 BLAKE2B 363da4747fecf9ca1a3853f780c9a4b7efcb2a90d8a5bf10e0e9262c7fa69d43c2d54e4b6939337731bd5469f3731e3f458b4329e215414aebe307f6a27adb3c SHA512 d62289a5e90b2b4c4d63ccdf4a161e5f57c437a359ece1f2dc6738401fb5a9fea8fbdc479fc65fa703d55e709a23c957e5d779c53e406c385f141315924e0eb2
 DIST NVIDIA-kernel-module-source-525.125.06.tar.xz 10100204 BLAKE2B 1a7a9f56be4533b8106df25ddf65cd7756cde11fd3e01f96f1f34c7d18af764fcfefc1cf980fed6c0e586e614ccacef9e2cddbabb87c7d7f06a1b27d94f63466 SHA512 1319a2333988795f5b0850cfe769ab0f4c4364bdb516147b85890abb4695aea2553ca0febf9cfcf2f8eafb4c05c3e21f56356ad75e64416c9782b027495028e6
@@ -52,12 +52,12 @@ DIST nvidia-xconfig-470.199.02.tar.bz2 108683 BLAKE2B 80e5b356f1b2a10b2f0d1a139b
 DIST nvidia-xconfig-525.125.06.tar.bz2 111119 BLAKE2B bd9ef08c361e969775522911a931a25b4512a59d9aa2f90ab1be1696161cd127f20c526b31173d0226408c74da14b5cb381c717d6b8b8b3975b2449e5beb7d9c SHA512 7595f88004aa23595364dd25db35986abb802de80c9e70c9f22367184859057140271dcfd8688ec9d686ca67ae85740c21300ddebd1dbd78af5660896154f3b4
 DIST nvidia-xconfig-535.86.05.tar.gz 145139 BLAKE2B 2f2af0d0975a483cfbdb922e6d15add620eb1575653a54a1f4916895b2e9450a4f9a7ac2af31ad6286fab76953e567c01f0430b901cb397019673c87a1f35f7b SHA512 384f4a23e356099d7e96da3b79f55de66061d8efd7ec8a016e84c76429ac9769e73927944b3e9e281b858690751406b2964eafd9fe71e74a0bf33e0f67c5e05a
 DIST nvidia-xconfig-535.98.tar.bz2 110497 BLAKE2B 679a902359365e68001661af6448be0fd26c028baf2d45c2566df3368df9378de94b77c969701dbd2f47dbf7decd3ee0a1404adabb01f4d4984772680183a8d9 SHA512 e519d2114f050c7750f490beca28dc9dcaa87df2a0a1f5d268048e88f6996ff32ad185750e6164602d3489d9c295e0e933c51c346b122eba629d28970d66dbf3
-DIST open-gpu-kernel-modules-525.47.35.tar.gz 10323862 BLAKE2B 2b3bc18c14755b8ad424d38356fc0f10e2b4b081b034a86ea7a6510529eb7ac08b7c947a0ef5c00adb55b51086dff85e9e5614dc5911a97cbaadeae320339644 SHA512 72201beacf236aad8dd78bc8b73a794f98eaf2c0b60792bbae4f1466c42315d32e0486714d10aaaf28d0748464f95ddc63ab26b9b9f18ee2604690b31053b868
+DIST open-gpu-kernel-modules-535.43.08.tar.gz 12705398 BLAKE2B 555703b45b34f7129bb2e4d44f2bf4bb85e32bdfdc659c695aac1fe543cd82b216d80cacca186d028f4553e18f8e676fd5e158a30446b78a783b03574f6fbb5b SHA512 f03a6f6281264e14053f729be08959038e467d45bf82e247e1998635deeac9906f4c9b9716c7e6be358e20facdbb41c2781b897b2caa7d2f689ce333d0521ffb
 DIST open-gpu-kernel-modules-535.86.05.tar.gz 12698016 BLAKE2B d0534a2e6b966065f15526c9c699fc4f47cbc12e4bcdba5b5e9d34a920e12aab994009aef158b336ad59ec0cde98bd5686fe606d8bec25ac2aaab49492d37e77 SHA512 da1964921f2f0a07e136ad5301b633c01d1e045b5fbb4ebb32f5d57471a89e649a1b653bbbb62e97755d070ce911c442ceaac2fb3d81baa53af75f4123075308
 EBUILD nvidia-drivers-390.157.ebuild 14000 BLAKE2B 805fa37475ab2580dcd4f5d24947ff401e6d7932e79cfa3994d0b362f33672e15fe99a812458c44d2dd2012e3a4e9965203edacd9cfc99e35f895c90e1324139 SHA512 68ad898a113db55ff402ce95c30363ff32e18d907362a96d8169b54a671894c9767843a500d1f620ac01ef9ccdbd9a5878dfbb955836f214072ec7b0b0e860cf
 EBUILD nvidia-drivers-470.199.02.ebuild 14656 BLAKE2B 4f67bea9cf732e0aa4a8333687a1f47c8fd657d1af648a5f38c595fcea084445e2ca7f6e8ab2d9d9646e1ffe1b7cb39df7564288880050121cf0c289427024b6 SHA512 8db360878365d1be726eaaf5c1645d863faf6324e9ac57151ace55071690c9fb974804ca5f915c0a760a74e72a22548013bc5fae34bcff86c39c17b59f8300fe
 EBUILD nvidia-drivers-525.125.06.ebuild 16927 BLAKE2B 80fe5d386129c1a4b7ca9e7e22e0f14330f627faeb7c78c7615c8a32ce4d8e618efa75cf336c741bceaaac4a9732559d981bd42fefe3584c573f9285c272a54d SHA512 a11f17bdec37f96a60cc63db54957be4110a2da243b8c500cb28cac2393ac26a7c7bb40a0e18e13d2c7001a2f40a7c342caa8b3a2542d9b2c956e4e88719fb8b
-EBUILD nvidia-drivers-525.47.35.ebuild 16938 BLAKE2B dc0fa99a0417af3db07b49d5afff6fd6afe5ba569752bb3fa5bed3fc44fa17d20822cf315eb1a6c00cdd51b6e323cedb260e2a6554b47b6febebcb738e1f79dd SHA512 6c9839a29402f266f2ff86129b3fc1bba21d6afe34d607a9e1a2d31162e79bf6c3c77b3cd61b261307122a913a4e4fccbed39f14f5c48be45f82ba30a93a067a
+EBUILD nvidia-drivers-535.43.08.ebuild 17436 BLAKE2B 83b9aff25f9c851d6a78f506f94930acb0eb343f7165380f0a8c824557139e81b538ed09c1547b393fb75ee851463e8c235fee63fa9731184e5a999ab14967c6 SHA512 1a73fc8b395b8cf3054c5914a9bc9db08c032ce645db3dff5acd46f24fdc5485e59a537bfbc6f5bd16dd75eaa00f58275de4d73392207459aaa1ec1c72838dd2
 EBUILD nvidia-drivers-535.86.05.ebuild 17680 BLAKE2B e66457f15a8d006c2b8765b4faadb8250f7c930a43442f8d2843ce049c2605e793f0802b08d1e41c2783d2cc990f212e79cfffdee2c3af632f6825c854182810 SHA512 5ba968c51f5eb27c683db645ed6d9e4fdf2365ec93e93860d53f2556544b2f4f9712f19f3d550359da3d729a3967e15438d5a222e236c524f64cc9db5780c2ec
 EBUILD nvidia-drivers-535.98.ebuild 17430 BLAKE2B 072906c5a76f30b743b5eb9dff30399d7fef5a97d9a3dd617a880414978b7acf4202c8207f45b81941f0f71c6e489f9ce914aeee5c5432fe77c763c7f9688111 SHA512 d4ce9ad041f3c2472d86b878ca03050abd328fb4747b7132fb1423abe7f6514dc8e6f2d7ccb9a8c96f95bb7c6c0402903261bce62761279c49be045f0607fd88
 MISC metadata.xml 1276 BLAKE2B 9fd18d8984ae4440f9623426edea81096b3aef9e591737d45f434848a24d50bda3ea6fa14fa412a9a59404b6256f00147b1a4650cf5f7a1a1445363fd844b522 SHA512 e46e21f95ea3b84dae5dee6bd2fa61efa4df7ebbf9ecb8033d5d590ad05c1343119822a50a156c3a46fcec5fbd1977cb6d6fc74c32e64ac4e8ded9760f09d91c
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-525.47.35.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-535.43.08.ebuild
index 72ebe0da9465..c4f1522ec324 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-525.47.35.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-535.43.08.ebuild
@@ -8,7 +8,7 @@ inherit desktop flag-o-matic linux-mod-r1 multilib readme.gentoo-r1
 inherit systemd toolchain-funcs unpacker user-info
 
 MODULES_KERNEL_MAX=6.4
-NV_PIN=525.125.06
+NV_PIN=535.98
 
 DESCRIPTION="NVIDIA Accelerated Graphics Driver"
 HOMEPAGE="https://developer.nvidia.com/vulkan-driver"
@@ -22,15 +22,19 @@ SRC_URI="
 # nvidia-installer is unused but here for GPL-2's "distribute sources"
 S="${WORKDIR}"
 
-LICENSE="NVIDIA-r2 BSD BSD-2 GPL-2 MIT ZLIB curl openssl"
+LICENSE="NVIDIA-r2 Apache-2.0 BSD BSD-2 GPL-2 MIT ZLIB curl openssl"
 SLOT="0/vulkan"
 KEYWORDS="-* ~amd64"
 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-1.1:=
 	X? ( x11-libs/libpciaccess )
 	persistenced? (
 		acct-user/nvpd
@@ -82,11 +86,10 @@ BDEPEND="
 QA_PREBUILT="lib/firmware/* opt/bin/* usr/lib*"
 
 PATCHES=(
-	"${FILESDIR}"/nvidia-drivers-525.116.04-clang-unused-option.patch
 	"${FILESDIR}"/nvidia-kernel-module-source-515.86.01-raw-ldflags.patch
 	"${FILESDIR}"/nvidia-modprobe-390.141-uvm-perms.patch
-	"${FILESDIR}"/nvidia-settings-390.144-desktop.patch
 	"${FILESDIR}"/nvidia-settings-390.144-raw-ldflags.patch
+	"${FILESDIR}"/nvidia-settings-530.30.02-desktop.patch
 )
 
 pkg_setup() {
@@ -230,6 +233,7 @@ src_install() {
 		[FIRMWARE]=/lib/firmware/nvidia/${PV}
 		[GBM_BACKEND_LIB_SYMLINK]=/usr/${libdir}/gbm
 		[GLVND_EGL_ICD_JSON]=/usr/share/glvnd/egl_vendor.d
+		[OPENGL_DATA]=/usr/share/nvidia
 		[VULKAN_ICD_JSON]=/usr/share/vulkan
 		[WINE_LIB]=/usr/${libdir}/nvidia/wine
 		[XORG_OUTPUTCLASS_CONFIG]=/usr/share/X11/xorg.conf.d
@@ -247,6 +251,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)
@@ -355,6 +363,8 @@ documentation that is installed alongside this README."
 
 		if [[ -v 'paths[${m[2]}]' ]]; then
 			into=${paths[${m[2]}]}
+		elif [[ ${m[2]} == EXPLICIT_PATH ]]; then
+			into=${m[3]}
 		elif [[ ${m[2]} == *_BINARY ]]; then
 			into=/opt/bin
 		elif [[ ${m[3]} == COMPAT32 ]]; then