gentoo auto-resync : 03:02:2023 - 21:11:18

3 files changed, 3 insertions, 115 deletions

diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index 0c5c56bb3bda..f1ea128de583 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -4,7 +4,6 @@ AUX nvidia-470.conf 1272 BLAKE2B 842aff5a34a6f6e62a914ac42a5e11c9f620e580303c470
 AUX nvidia-drivers-390.154-clang15-x86.patch 1085 BLAKE2B 5bb221407b280f2dde69ef2b37317606bec1c108dbc56653898cfa9318de6e47df21e5b38943212caf13bc6412f2427fad7c534491d868d03399091e2146daaa SHA512 1349c1c715b2f09e64a5e91412aceabc80041d070a6bbacfdf7038872f1f4a798bbc63277d47a25d1a5b28b573b3d5bd6295dadbbdbf245f5cfb0241879a3bc4
 AUX nvidia-drivers-390.154-clang15.patch 2915 BLAKE2B e9799aee3c6b814ecdc40e83d2e495acad046f18c88fe8c1b5fead1c9cd0fab3d0a0a2924730dadec5eb8ea1e2d2132c495298d6ab108c015721bab911a4da79 SHA512 6e1c99ae8efb06aa4fc3accb4cee55f43a6498f94fca064fd4b9b007a3555913a5cef042d4e74b6f24a3eb6f14988f810d0c848d34ae81835fbae8ec32cf0cf0
 AUX nvidia-drivers-470.141.03-clang15.patch 3757 BLAKE2B 9cec15b57c82c8e24f89a025a73bf78e3d7ea5df681cf803888ca4ad8b96976b433717d01c9fdad5036cb06376345bef64dd05287791ed0ce7dc2a06c8a79aab SHA512 10ed0fa6b1fdf24fbc18432a9b94b1c1b9d7d6003926272d3c924d72a298c1d3a8875b43a42472d701864fe9dda35d75f9cf7c51ca841d20b989ed46ed994311
-AUX nvidia-drivers-525.23-clang15.patch 3677 BLAKE2B bac9a6d47508f58bc6c83fe092ac3878806e541f3b1a5fe52e230693f07e5337ca2bb3efd58ff5d958de8e4db61782a502f9a77c5e805fcbae9e53220c43c0d3 SHA512 9aebbbd31d2b95e2ebaf590c06c221d6704c446fb30268b117a3a9e8eef2506d6bb0ce169b3cb83bf6c1819b2b8677297e105042291b4ba4926fb7fbf7212ca0
 AUX nvidia-drm-outputclass-390.conf 179 BLAKE2B 2a7d3bb2bb131db6ddf24c9fa157a1044e72a3229088654f4768f76eb871cdaacdee58e82be5504c1c0af928c343448b4d03f23d289a4479b64218d57fbd7a16 SHA512 8e5dfe54b9cf261d28c206ca1594183cba4945ed633a13ab4b1801b2ad4614ca10038ab7f0cf35dbf4eaa7b2de6e747c3be13ecb11d05740b22654626f09d774
 AUX nvidia-kernel-module-source-515.86.01-raw-ldflags.patch 628 BLAKE2B da490e4af1c898958df0ef656914e8bba3f7236fb1d2f94420a42d895d7f47ddc9cc173ef3b4b29f80ac880266767d54e76613dfc3defb1d4fe3f2b48377a71b SHA512 0a972c4efd219ddc8e814753c7c2bdea8fd0f0f3d2255bd0f9a4baab2a96319c8238cc027f602e399be9521467e110cffb1e0ee6b90f38867df49cd4c3b11c5d
 AUX nvidia-modprobe-390.141-uvm-perms.patch 563 BLAKE2B 9befd708ad2193e507583e066f306e11d55e82912f456e738d850b804d35331df2ca5de3a35e8ab551188c1103af762941098639fa9581b4437bc5e68595ddd6 SHA512 0546d51a86554985cd7cc036e7b8f65b457cd1a1c0549ef496422fa422d2757354a47b83247b100597f908c2653314878c721b3918ebc529cae4282824d4eada
@@ -22,7 +21,7 @@ DIST NVIDIA-Linux-x86_64-390.157.run 85835541 BLAKE2B 44b855cd11f3b2f231f9fb9049
 DIST NVIDIA-Linux-x86_64-470.161.03.run 272397700 BLAKE2B eaa94b7398b3aaadf30c33c95c95b167094ca56114e2e3032978b0959264ac8b8663181485eb1af0282a59b43f912c0ecd48e5eadcb06b6fda601b357ac49bc7 SHA512 26b1640f9427847b68233ffacf5c4a07e75ed9923429dfc9e5de3d7e5c1f109dfaf0fe0a0639cbd47f056784ed3e00e2e741d5c84532df79590a0c9ffa5ba625
 DIST NVIDIA-Linux-x86_64-510.108.03.run 329603898 BLAKE2B ec7327628cc0d5929f91fa7dcf09d741341b15a509169d8de187f66a99a9196077362bd9a370ba5e294fd644a3aee1bd3abfc45f20c9cb5b05660d299c9e0479 SHA512 70fbd91b0dc5db119acf20654854c417bb14889e84145e2675dc893e7247a9c34f90820cddb8202cf5c3219abc286c7014b247a2ce94bdb5681a1bca96f41a29
 DIST NVIDIA-Linux-x86_64-515.86.01.run 363743089 BLAKE2B aa03a0f059da99fa549cd9d672cef0194f2b22b349470d80ce626b3f4afb89b1f130b451735f92f5a66dfec02735bd6395053be609668371991837e3be4026cb SHA512 9a31e14afc017e847f1208577f597c490adb63c256d6dff1a9eae56b65cf85374a604516b0be9da7a43e9af93b3c5aec47b2ffefd6b4050a4b7e55f348cf4e7b
-DIST NVIDIA-Linux-x86_64-525.47.06.run 415511798 BLAKE2B 8b35774fc2689c0e51159fbe23ffe084ca670209906ca106fc7364c6fe631080f0a0dcaa2d99d34da084e0e72a41ac6741a7e7df828eb07e47729631a456b864 SHA512 7efe2ef0ee26e788e0e8c09da3f6ee7b56dcaffdffd611f6a6c0228181d618a0dea65a174b5a233cbfba497790f771f8948c11c7b957aa0863fba76781d16548
+DIST NVIDIA-Linux-x86_64-525.47.07.run 413838999 BLAKE2B 6921e903f45d49eadec8a690d8c86fefd0bc534a4412fa1a076db4b5cd2840c0c2c4076ab4ec0b562b9888bd4f0061f7d260c1e14b88653e912b17079e85d17b SHA512 51417a35a10a165f64751ce6bc7da2ab182d467bf3e6d3fac876c009fa413e044e16a1f32abbcca71209f8f29c2184c358aa9f88eddfb4ee80cea6817e1ee725
 DIST NVIDIA-Linux-x86_64-525.85.05.run 415131239 BLAKE2B 38bdcce884011cfc0a1b5d08807c0a163ac7807621f3ec69feabbdf27af9e0409491db893912776b05a45f8f56c06f281a84074ab8ff21a71774b890bdff2cf8 SHA512 db30b9186cdcf22b2dde267c08a10cadfc3d37190c57a26a71e282b0f661b187b5b28764418eacf8b2344ebfa8feb7480ae1de31b3bc3026feaf9482a3b51741
 DIST NVIDIA-kernel-module-source-515.86.01.tar.xz 7504412 BLAKE2B 20b1b9eb6e2fbc7adfa0b78c6acc88c9da8346888c3d1f1ec01a6c1252feccfc104e338605bfaf7617f0b78c7d0de05b32577394714be3575aa67b37c0e843ca SHA512 075fb8b9c3f43f21f51035460a9bc306b11214eb029e950a5bfbc283dc1d3403210ae303148442d31b2c5bf618923bd1762ab5a91234d005f50177fc02fa8ba4
 DIST NVIDIA-kernel-module-source-525.85.05.tar.xz 10081192 BLAKE2B b80f1893fe18dcb62ad2d1daaa7c1642e8699c7acda0bf55a104e10824ece908e45e8202949262fce5459b3bebe3582fa52aa506333989388eea94d65e26da11 SHA512 1ed3e69d959d68a351541483cbf552730ec1748faee3bacf1b9f0099650bc3244ed11a4aee84e51187321f59fbedaa92d24a66439265c9f2e436db82a6876ee0
@@ -51,11 +50,11 @@ DIST nvidia-xconfig-470.161.03.tar.bz2 108669 BLAKE2B 6c12e38759ce64c5637d6301e2
 DIST nvidia-xconfig-510.108.03.tar.bz2 109729 BLAKE2B 48378155d57f9b4a2b58b044daa1f2f2ed9b897b77f0453f67c7b03200cc09689b628f88a87c0f4c8ae149f11cbe6364eda34c2636cc1e1fce33b799d8225138 SHA512 17462e7826225804685eaea4dba05252dce138f95c72285abe607ee1b2a6269d2f4e5c0833802037d29350d1218ed9982053871b0b08c4f5f329d497da299fab
 DIST nvidia-xconfig-515.86.01.tar.bz2 109747 BLAKE2B d6253f9d052be5aaa1a2be82bf4a36c971aae8b6e9f61e4ff5f27ec415d945bab8289678d6a2495ff7521c66478421090a452ceb19d87803de4290aeb7f69bba SHA512 f4e66f23d9227671158ee0b99b1ccc44f25dc6a910d3b00332d135fb94f21b67f581804b53a40945a652777c898e20069962721931c7b58d2c33d38925da5e35
 DIST nvidia-xconfig-525.85.05.tar.bz2 110595 BLAKE2B 249263ad84c72c5682836bc3717774b95238197319a88b35adb9174e6023c385c49bf95ed1bf89a6d4fef0ba445a9802e437324358bddbe999f61849ea68afc0 SHA512 b2cad5f509e817e1e9f43bfce279a512d5899dbbb3dae212161b1ce7237ac3598e335779fbb7abb8b77327827838d7d310522f0b0a014498cff26f4ed5824841
-DIST open-gpu-kernel-modules-525.47.06.tar.gz 10299729 BLAKE2B 945adf90945a0935bcd3bc9eecb93a45b307b5a042baa474ee27bd1f0f404df71e1c3adb3c3544236d8742572d8dbd8864c9a6bb88ff4cdc6573837841967a2a SHA512 b92316d2a35215786bd0a645d9c2560e5c7db4acaf7ee000d591dfe95aac87cb56843f731b710308e86d8d1bdf0add12fe1d494d5750f2b0e23430bf2c50a201
+DIST open-gpu-kernel-modules-525.47.07.tar.gz 10306658 BLAKE2B 87243cffb77cd797eca51cf844c87bc9269f394635445043eaed1e554cf79341ba061aaab10018763baf1457c0ca54f1dd9cbdeab648cdf7273a2cd187fe5cfd SHA512 32948a8980e7240ee3d66185f2378e483b0a0b22513856fb22e09f91b020d3e6f4278c2b214c29a6c153cb375c3dcb6f5c73e5d22a00cbfc4bdd2e92f36ce94f
 EBUILD nvidia-drivers-390.157.ebuild 18429 BLAKE2B 1e2ea98beb53cf973c0318c5cbd30789c5a2533f3f82f1c7d0a33332379950b638f39e30c3f702aca8270e10950984c00a4e95f09ae25805d990084bc38d7e03 SHA512 388c84c2cd76a3eb85651a5f567105130250be78451e5e9ef872dba756bb1f9f3d0d93563838fa5c20afc8077a75aa30ceff409578bbcb5f7299e9df06a2c4a8
 EBUILD nvidia-drivers-470.161.03.ebuild 19402 BLAKE2B 9591b049c7a6f632f155e6f9e750d09c273b0e283bf97192fcdff873af8a6bf3db6a1dce2ebea46b7f5f08735ae72a8b297d1cfdb11e995193db6196d4f05edb SHA512 b47f60737f76cc7c24565868ca2c8a0e765e31643b200fb29ea181a73f563a64d660aeb2902586b7d618abe1b816cfa66d3aea9954df04a8af43708334df7873
 EBUILD nvidia-drivers-510.108.03.ebuild 19732 BLAKE2B eee07dcd758004f84dc0313194801bd3320dc75fba60b82125a8cdca46848ceec9d4873e91dd68b22f4400358883c83756895d2bf58abd4837e70f73132468e3 SHA512 4e626ffefa96437e924e3d93b59a73e4f2ce8f82696232de19c365c66f5cfb7a40722caf1d1a8c86bc32f832199dbef31f8187cc2d6adb5de5c66c7c5f2a6599
 EBUILD nvidia-drivers-515.86.01.ebuild 21987 BLAKE2B a62fd126b0d9cf4529a686121993cd2d79058956be5a70a90fbb7ba3d11fa5b4e44a3d204253d96b0d9e99a0a41a57a1953cc0c102e58fb98222e7174281d4cf SHA512 619c3cd6e12c025ff80c1c48a7f41b6271b89ea804fe1a0cf414af0623bda7fdca70bd5af494205f370e225d2307ce7e4f6c1a0857e1737d86d4ef9fbe267c03
-EBUILD nvidia-drivers-525.47.06.ebuild 21795 BLAKE2B 9d97d47df6484700db1ea2c926a7381205e730fc1c5c3e51e47e8bc2040acc1845e8b09b945232bcc1ce261a1aedfa8d9fd996117e8ce7a35772392393ba5d9f SHA512 9e4acf2290ccf19c04f0ba10df517fc775f0554c479d6a4d1d5c5d2ee8b70217cad5ca5915fc98dc6ec10dfd8906034a7fa0f7060be83196caaad8975b4583f2
+EBUILD nvidia-drivers-525.47.07.ebuild 21632 BLAKE2B c77d8a0ff9d893200ea787a1d54a082740fabbd09ab6f0001198a1bfc54300caa0977e978528a3be540cb280635122c532118a83641b31d1bd97b4dc084cd7c9 SHA512 69b4def463f5c9ba77fa1fbee7fd848c42ab5ce348b24884ad043eec86484c65c25dd4bcf5150099888bea271f5bcb8d97bb8681ea4c7c70ab5c104077b2ec1e
 EBUILD nvidia-drivers-525.85.05.ebuild 21620 BLAKE2B 673b6b64cdc4ad869ea576a2a9bdc0ee249e6eb5768cff5efb916787d4326af3120d4e26b116bd66230db0371b04b0437c96728b299d4d21d1cf4a167b9d1ccb SHA512 f141b6e88923f412f48c75d9f50215c04f8539d6008d7171bfa2448cfe0ea0ff390830b8deb296c2811ecc0360979966130cc36eb332f73c056832089f7c1d63
 MISC metadata.xml 1320 BLAKE2B f8aa8f9a39d6da284b60afb50087acf75744057628e79b77a95e6bebb1e386e9d1a819f41e73d3e94b8ab74322ec8e8b077ad6d2af0804a5c6f20b4dd5f2897d SHA512 9fb939f8c8892ce43afc4f577181474c88a0aae3cc58af57987000b82f6c52f3f7b40fc538fa8eae0d5dbaf1fe3734d84f72fda2106853edd945149b3f2d2747
diff --git a/x11-drivers/nvidia-drivers/files/nvidia-drivers-525.23-clang15.patch b/x11-drivers/nvidia-drivers/files/nvidia-drivers-525.23-clang15.patch
deleted file mode 100644
index 74d022947992..000000000000
--- a/x11-drivers/nvidia-drivers/files/nvidia-drivers-525.23-clang15.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-Kernel's makefiles pass -Werror=strict-prototypes which
-can trigger errors depending on compiler defaults.
-https://bugs.gentoo.org/870238
-https://github.com/NVIDIA/open-gpu-kernel-modules/issues/377
---- a/kernel/nvidia/nvlink_linux.c
-+++ b/kernel/nvidia/nvlink_linux.c
-@@ -560 +560 @@
--void * nvlink_allocLock()
-+void * nvlink_allocLock(void)
---- a/kernel/nvidia/os-interface.c
-+++ b/kernel/nvidia/os-interface.c
-@@ -1169 +1169 @@
--NvU32 NV_API_CALL os_get_cpu_number()
-+NvU32 NV_API_CALL os_get_cpu_number(void)
-@@ -1176 +1176 @@
--NvU32 NV_API_CALL os_get_cpu_count()
-+NvU32 NV_API_CALL os_get_cpu_count(void)
-@@ -1256 +1256 @@
--void NV_API_CALL os_dump_stack()
-+void NV_API_CALL os_dump_stack(void)
---- a/kernel/nvidia-uvm/uvm_common.c
-+++ b/kernel/nvidia-uvm/uvm_common.c
-@@ -37 +37 @@
--bool uvm_debug_prints_enabled()
-+bool uvm_debug_prints_enabled(void)
---- a/kernel/nvidia-uvm/uvm_gpu_access_counters.c
-+++ b/kernel/nvidia-uvm/uvm_gpu_access_counters.c
-@@ -1721 +1721 @@
--NV_STATUS uvm_perf_access_counters_init()
-+NV_STATUS uvm_perf_access_counters_init(void)
-@@ -1732 +1732 @@
--void uvm_perf_access_counters_exit()
-+void uvm_perf_access_counters_exit(void)
---- a/kernel/nvidia-uvm/uvm_lock.c
-+++ b/kernel/nvidia-uvm/uvm_lock.c
-@@ -337 +337 @@
--bool __uvm_thread_check_all_unlocked()
-+bool __uvm_thread_check_all_unlocked(void)
---- a/kernel/nvidia-uvm/uvm_migrate.c
-+++ b/kernel/nvidia-uvm/uvm_migrate.c
-@@ -798 +798 @@
--NV_STATUS uvm_migrate_init()
-+NV_STATUS uvm_migrate_init(void)
-@@ -824 +824 @@
--void uvm_migrate_exit()
-+void uvm_migrate_exit(void)
---- a/kernel/nvidia-uvm/uvm_migrate_pageable.c
-+++ b/kernel/nvidia-uvm/uvm_migrate_pageable.c
-@@ -1004 +1004 @@
--NV_STATUS uvm_migrate_pageable_init()
-+NV_STATUS uvm_migrate_pageable_init(void)
-@@ -1013 +1013 @@
--void uvm_migrate_pageable_exit()
-+void uvm_migrate_pageable_exit(void)
---- a/kernel/nvidia-uvm/uvm_perf_heuristics.c
-+++ b/kernel/nvidia-uvm/uvm_perf_heuristics.c
-@@ -31 +31 @@
--NV_STATUS uvm_perf_heuristics_init()
-+NV_STATUS uvm_perf_heuristics_init(void)
-@@ -50 +50 @@
--void uvm_perf_heuristics_exit()
-+void uvm_perf_heuristics_exit(void)
---- a/kernel/nvidia-uvm/uvm_perf_prefetch.c
-+++ b/kernel/nvidia-uvm/uvm_perf_prefetch.c
-@@ -428 +428 @@
--NV_STATUS uvm_perf_prefetch_init()
-+NV_STATUS uvm_perf_prefetch_init(void)
---- a/kernel/nvidia-uvm/uvm_perf_thrashing.c
-+++ b/kernel/nvidia-uvm/uvm_perf_thrashing.c
-@@ -1946 +1946 @@
--NV_STATUS uvm_perf_thrashing_init()
-+NV_STATUS uvm_perf_thrashing_init(void)
-@@ -2005 +2005 @@
--void uvm_perf_thrashing_exit()
-+void uvm_perf_thrashing_exit(void)
---- a/kernel/nvidia-uvm/uvm_procfs.c
-+++ b/kernel/nvidia-uvm/uvm_procfs.c
-@@ -49 +49 @@
--NV_STATUS uvm_procfs_init()
-+NV_STATUS uvm_procfs_init(void)
-@@ -69 +69 @@
--void uvm_procfs_exit()
-+void uvm_procfs_exit(void)
-@@ -74 +74 @@
--struct proc_dir_entry *uvm_procfs_get_gpu_base_dir()
-+struct proc_dir_entry *uvm_procfs_get_gpu_base_dir(void)
-@@ -79 +79 @@
--struct proc_dir_entry *uvm_procfs_get_cpu_base_dir()
-+struct proc_dir_entry *uvm_procfs_get_cpu_base_dir(void)
---- a/kernel/nvidia-uvm/uvm_push.c
-+++ b/kernel/nvidia-uvm/uvm_push.c
-@@ -292 +292 @@
--bool uvm_push_info_is_tracking_descriptions()
-+bool uvm_push_info_is_tracking_descriptions(void)
-@@ -297 +297 @@
--bool uvm_push_info_is_tracking_acquires()
-+bool uvm_push_info_is_tracking_acquires(void)
---- a/kernel/nvidia-uvm/uvm_thread_context.c
-+++ b/kernel/nvidia-uvm/uvm_thread_context.c
-@@ -104 +104 @@
--bool uvm_thread_context_wrapper_is_used()
-+bool uvm_thread_context_wrapper_is_used(void)
---- a/kernel/nvidia-uvm/uvm_tools.c
-+++ b/kernel/nvidia-uvm/uvm_tools.c
-@@ -2207 +2207 @@
--void uvm_tools_flush_events()
-+void uvm_tools_flush_events(void)
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-525.47.06.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-525.47.07.ebuild
index b11dac8478a7..cb22915a48a9 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-525.47.06.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-525.47.07.ebuild
@@ -82,7 +82,6 @@ BDEPEND="
 QA_PREBUILT="lib/firmware/* opt/bin/* usr/lib*"
 
 PATCHES=(
-	"${FILESDIR}"/nvidia-drivers-525.23-clang15.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
@@ -268,9 +267,6 @@ src_prepare() {
 	rm nvidia-xconfig && mv nvidia-xconfig{-${NV_PIN},} || die
 	mv open-gpu-kernel-modules-${PV} kernel-module-source || die
 
-	eapply --directory=kernel-module-source/kernel-open \
-		-p2 "${FILESDIR}"/nvidia-drivers-525.23-clang15.patch
-
 	default
 
 	# prevent detection of incomplete kernel DRM support (bug #603818)