gentoo auto-resync : 16:09:2022 - 11:14:45

9 files changed, 206 insertions, 5 deletions

diff --git a/x11-drivers/Manifest.gz b/x11-drivers/Manifest.gz
index 37d75f860a55..06cbca055696 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 a22a28fcfb16..588aef950bf4 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -1,6 +1,8 @@
 AUX 95-nvidia-settings-r1 54 BLAKE2B 598067babb48bd0f5680300cf3cbb37ac804edb3131c47510d3350511b918cd47fcf44f1ccd4746e4a41f2f8aa36511f20c2c6f313010e89a79b7869771b9ee6 SHA512 de9edf678c64ca3d10c912397800b2cb651ef9108b33ece97a4cc1e86dad0a9e81986cca6b96cfe80740d9cb433de7ef93f29be45178db714ee408c7f6570ac7
 AUX nvidia-390.conf 797 BLAKE2B 7cb7dc58841d2e7cf28f677939031a20ff820e2d46f799177c6004d94e73c308d2a9ee81fca476ff7ab4846a275cce996f68a53a7a9f819c3d57b5dace1d40e2 SHA512 17cabfcaa4b7323c635d1491e46710624d13396c019591499993662a20df39c8e3fa843387594aeb66d70cf38ab9fde7bee85dd1ab37eaa637a315fd52328222
 AUX nvidia-470.conf 1272 BLAKE2B 842aff5a34a6f6e62a914ac42a5e11c9f620e580303c470057cec261f0804f2a9254a3d4928c2dbd1ae992e71d30c0880a5bcf3e89e725ae918738ebe001911f SHA512 615b42ffdaf070ac191b9dcd4b17ca261aef1eb1ed45514a5bdfae1d900202ae6b7218f0dc037800bb51eb6a3b96aecaa4aaecc1c349b3439fdec3640a3586fa
+AUX nvidia-drivers-390.154-clang15.patch 2747 BLAKE2B 79f259869ea39714eea5c08c56d509f6c704bbdec5f499a9b06737bd87be407f76442f641f7b5c8748b0d7ffc60fd6fff5b03d56e8a2ad70f4484ce74b5002a7 SHA512 2cd55702b3523d36629c518aab7ab2654c76e2eabf654cb075d6f9d043a9e9fd84a66bf30d4e320784b0fc63e0617cf3a72bd0815dd1c18960741fc12a781d46
+AUX nvidia-drivers-470.141.03-clang15.patch 3589 BLAKE2B 444adf74eeb1f2c096ea7f7362c60ff199ddd17ccfa38607b2e9e0507e3c01eecad63f820b33efe93e85a9e549f7c66341fa336289991e021e5ee3b5e1a46995 SHA512 14897475021b783a829ed1248caff29037ac9166f9d57ad81c249348362abb5749bea3e05c20eb5e881ebd5ae3907dd2eb0bc5df2ca122a96c9774463dbe1994
 AUX nvidia-drm-outputclass-390.conf 179 BLAKE2B 2a7d3bb2bb131db6ddf24c9fa157a1044e72a3229088654f4768f76eb871cdaacdee58e82be5504c1c0af928c343448b4d03f23d289a4479b64218d57fbd7a16 SHA512 8e5dfe54b9cf261d28c206ca1594183cba4945ed633a13ab4b1801b2ad4614ca10038ab7f0cf35dbf4eaa7b2de6e747c3be13ecb11d05740b22654626f09d774
 AUX nvidia-modprobe-390.141-uvm-perms.patch 563 BLAKE2B 9befd708ad2193e507583e066f306e11d55e82912f456e738d850b804d35331df2ca5de3a35e8ab551188c1103af762941098639fa9581b4437bc5e68595ddd6 SHA512 0546d51a86554985cd7cc036e7b8f65b457cd1a1c0549ef496422fa422d2757354a47b83247b100597f908c2653314878c721b3918ebc529cae4282824d4eada
 AUX nvidia-persistenced.confd 213 BLAKE2B dd57e63944a97a77e83a8373dd34ef2f56824dcfadcfbbb54cdf6eeac17066d78753bd1b21a9bad8f0437c279c95492319205c15b84b7f96e0515415dfddbc26 SHA512 a311b73bb47448538e5261ba658d42e923890c909c335eeac3cc90ad0ffd3fd5fb983df8e91077f3098eaa13b07f27b23dc24a4579b1df411ae272976ef089b3
@@ -39,9 +41,9 @@ DIST nvidia-xconfig-470.141.03.tar.bz2 108888 BLAKE2B 1701f6a7d81dd4eb7a17d79882
 DIST nvidia-xconfig-510.85.02.tar.bz2 109790 BLAKE2B 09313f0f423c52c81550e8d94b82b88961bdab702bfa2086ffe148b517f82cdaada0ef5e2e5074c6bef174d64661ced63b4c52108c021e7cdadcb7b55cf8f6dc SHA512 5b9a0055643c9368689fd5d0fd47ddfb6352d903913271a577f8b0a8f92e0ce9700287c512269e91285ea9f385dcb4ed9c33410d5244234be7a7f34242df9bab
 DIST nvidia-xconfig-515.65.01.tar.bz2 109681 BLAKE2B b41b3ec377c79af6906a47c826d9930cc5ea6e85e8404e6882f3bc03cfccfa03d8ef7c280453ab29edb208173aeb576d33df00f92c225a86bc3cb571b352cdbc SHA512 6f0752e32af6772e85bd2799ea2d895bd5b5faee4c1b6813eb839e75af43d07ef09be6606e7dfc40491e07c25333e9c4145465f97dc0338053e8be1c19220bf9
 DIST open-gpu-kernel-modules-515.49.15.tar.gz 7413872 BLAKE2B af04b65096832cfdde54025559585197d3c24700551b866a79d170eee9aefaa99e7e1a9357a8be4762ec7d39789a22610e3d031c04d2e589cbbf086ee34a5ffe SHA512 efadd610126281def49fb5f559dd5a115f2bde6058500862e359faaac7d095f578c496fbb150b8c99cad990a8214662c9fae4428aa8e7a8060f2405d194341ac
-EBUILD nvidia-drivers-390.154.ebuild 14396 BLAKE2B 2f9cd44e92748a29c5f697832f71f3be838c7326814437597dda644eb6d708026f9ac42ffbe88ee0a91e91b57441da8ecdea6ddca77fbc00a335127a6899668c SHA512 8a2d979a80e627b170ce29e745fd8aae16b2273812f7311a19483902e0a25ca29067c577f12f04bd68faec00bbbe2af4f8f60abad589eb8397f5994511d43caf
-EBUILD nvidia-drivers-470.141.03.ebuild 15064 BLAKE2B a29b1b3533bc9929ca1571c88d167f012cfbf5923c7a444622faeb9ac21ed1c1c9bbad79f8ff3a63491ed3e193a0e4a8427b7d2e7c06c31eb1ac9ac155a663dc SHA512 afdb36784f829a2cd1cfc2cebd68b6ae6531903ca4e59ad2ae9fbaeed2fc17dd79a800cfbf9332d20b86c2f09603511c371d026bc82666a61882c4761aaaeb2b
-EBUILD nvidia-drivers-510.85.02.ebuild 15394 BLAKE2B 1e039ef3915259044c8726bce0b8469f50321e201f5d7a1d56d165287f175bdd50e0ca17afae3a115e318b71ea5ba3db1a515d8d51ee6387e73b28bd1782bc3c SHA512 0ed1b8e2276b619027c8db06e92f9ee91788ecac1e251cfe9a3e1f02361fca3cf416291f78fd2369431e7fd4ec1b3aee35facc12b3aa6a5ad0e107770fd79401
-EBUILD nvidia-drivers-515.49.15.ebuild 17061 BLAKE2B 547fd6c784ab62bec31dd2ca21e6c6665cb87c0bb90bcea45ca9d688644183576d4e63e2fa4c8dcbc069478b5ae9d42c59f496c1cfdebcbc7a649101daf9b79d SHA512 4482a43d34a692fe44f213095876a4dda41431bf6fb9fe5883a34141a66648b5515d9fbfb6090fbee4080bfbfa64c1064a2b50d9400dbc51410b660cd746ac95
-EBUILD nvidia-drivers-515.65.01.ebuild 17061 BLAKE2B 2e2d377e7cb0f1d3313ea2c3dc3c9fd3451ebf4b7dc2a36862c7ec96350280095fd73106ce1761f9ce03c5aef672e7fcad50f63a6a66a8f4ae9e6651c4119278 SHA512 d715a50c37322b0a935f8002ba16a9700fc6b27ed9656b4b35359329c7a4bf1d9af3a10ec67d326d910b62bbb9905c9adebb809c980c45a77a7030cea591d4a0
+EBUILD nvidia-drivers-390.154.ebuild 14448 BLAKE2B edbe0587fc377c3ce247d98a26378d5c9302a97a5f2eb0f915e58f2c847828ae0211eea951258a4e9ab8b1fd6ec5e3dcbc63c29f57e8e534951c6b6c9204ded8 SHA512 15f135eddb99fa58473b970d1784f9515c8b535d234c9b8a6a244e489166d698115056444b8837bcda45d1d562d437ff2b3cd186388370958b793474d8b78c64
+EBUILD nvidia-drivers-470.141.03.ebuild 15119 BLAKE2B 243d8752e56a3fe2aa3ee21da961a94b9a07dd00d4c4b73ffd49523c6f2da2e7090827efe9f887e0b08621b424fd29f35d6839dc73320796c3294e1b3ee6f0f3 SHA512 23cfa3cae40ca0391612c8b93eb2867363cc22551ad46e571ed339612d7d83532f9f9e215c20752e6a3abdbe43b9a6625723f34d4b88c2c38db22e2185b71f6b
+EBUILD nvidia-drivers-510.85.02.ebuild 15449 BLAKE2B 528121f81e372d1a16946ced773976e9af182fe4b13e415686ad1431b5f2be20d72303692ec7a3eb1401f1dfeacf24907a8330529167e7f8601dbd0c85dae206 SHA512 66405ba00b026e8b997136a4a7372ef7031d6883c08004223708458c498ecc42f8e7ddd9890456ad9ecfce7b5a9ac2f29efda469e5da216eac6d857dc603cd7b
+EBUILD nvidia-drivers-515.49.15.ebuild 17232 BLAKE2B 006f4f12ba1f51c20ac49ba75a317e2893e5333b8cab45f52bc0b90063ef95bea3cc9565d2a17c614dc10865f81a894bdf17b164b48cf679e78428a2022a1b53 SHA512 4402afd0ee701f3ccb81c83ab0825dda1527865dc6e854b620d96ff70e958b66a772c8fbbd1bb5fd4ea38f5d96aa4072b140446f9ecc39c1daab2fcf7c953ba8
+EBUILD nvidia-drivers-515.65.01.ebuild 17232 BLAKE2B ff521104f0a4820125de6f7412a6db069344659729f6adc0971caa8a0acd0c9c36391cadd01aee8113c4ef50030e63a316331d25c6b48e70dac9159f28b30795 SHA512 95d86047be067c3ed3f53c70cab233564870f25c6d79665db1d4f6fd98740ff8eb58f8447c5351f5892257c8aad61551b5257c60bd9dc00053d4cffd6f62808a
 MISC metadata.xml 1320 BLAKE2B f8aa8f9a39d6da284b60afb50087acf75744057628e79b77a95e6bebb1e386e9d1a819f41e73d3e94b8ab74322ec8e8b077ad6d2af0804a5c6f20b4dd5f2897d SHA512 9fb939f8c8892ce43afc4f577181474c88a0aae3cc58af57987000b82f6c52f3f7b40fc538fa8eae0d5dbaf1fe3734d84f72fda2106853edd945149b3f2d2747
diff --git a/x11-drivers/nvidia-drivers/files/nvidia-drivers-390.154-clang15.patch b/x11-drivers/nvidia-drivers/files/nvidia-drivers-390.154-clang15.patch
new file mode 100644
index 000000000000..85d502ca662f
--- /dev/null
+++ b/x11-drivers/nvidia-drivers/files/nvidia-drivers-390.154-clang15.patch
@@ -0,0 +1,81 @@
+https://bugs.gentoo.org/870238
+--- a/kernel/nvidia/nvlink_linux.c
++++ b/kernel/nvidia/nvlink_linux.c
+@@ -639 +639 @@
+-void * NVLINK_API_CALL nvlink_allocLock()
++void * NVLINK_API_CALL nvlink_allocLock(void)
+--- a/kernel/nvidia/os-interface.c
++++ b/kernel/nvidia/os-interface.c
+@@ -879 +879 @@
+-NV_STATUS NV_API_CALL os_flush_cpu_cache()
++NV_STATUS NV_API_CALL os_flush_cpu_cache(void)
+@@ -886 +886 @@
+-NV_STATUS NV_API_CALL os_flush_cpu_cache_all()
++NV_STATUS NV_API_CALL os_flush_cpu_cache_all(void)
+@@ -944 +944 @@
+-void NV_API_CALL os_flush_cpu_write_combine_buffer()
++void NV_API_CALL os_flush_cpu_write_combine_buffer(void)
+@@ -1073 +1073 @@
+-NvU32 NV_API_CALL os_get_cpu_number()
++NvU32 NV_API_CALL os_get_cpu_number(void)
+@@ -1080 +1080 @@
+-NvU32 NV_API_CALL os_get_cpu_count()
++NvU32 NV_API_CALL os_get_cpu_count(void)
+@@ -1155 +1155 @@
+-void NV_API_CALL os_dump_stack()
++void NV_API_CALL os_dump_stack(void)
+--- a/kernel/nvidia-uvm/uvm8_lock.c
++++ b/kernel/nvidia-uvm/uvm8_lock.c
+@@ -312 +312 @@
+-bool __uvm_thread_check_all_unlocked()
++bool __uvm_thread_check_all_unlocked(void)
+--- a/kernel/nvidia-uvm/uvm8_perf_heuristics.c
++++ b/kernel/nvidia-uvm/uvm8_perf_heuristics.c
+@@ -29 +29 @@
+-NV_STATUS uvm_perf_heuristics_init()
++NV_STATUS uvm_perf_heuristics_init(void)
+@@ -44 +44 @@
+-void uvm_perf_heuristics_exit()
++void uvm_perf_heuristics_exit(void)
+--- a/kernel/nvidia-uvm/uvm8_perf_prefetch.c
++++ b/kernel/nvidia-uvm/uvm8_perf_prefetch.c
+@@ -462 +462 @@
+-NV_STATUS uvm_perf_prefetch_init()
++NV_STATUS uvm_perf_prefetch_init(void)
+@@ -500 +500 @@
+-void uvm_perf_prefetch_exit()
++void uvm_perf_prefetch_exit(void)
+--- a/kernel/nvidia-uvm/uvm8_perf_thrashing.c
++++ b/kernel/nvidia-uvm/uvm8_perf_thrashing.c
+@@ -1324 +1324 @@
+-NV_STATUS uvm_perf_thrashing_init()
++NV_STATUS uvm_perf_thrashing_init(void)
+@@ -1401 +1401 @@
+-void uvm_perf_thrashing_exit()
++void uvm_perf_thrashing_exit(void)
+--- a/kernel/nvidia-uvm/uvm8_procfs.c
++++ b/kernel/nvidia-uvm/uvm8_procfs.c
+@@ -61 +61 @@
+-NV_STATUS uvm_procfs_init()
++NV_STATUS uvm_procfs_init(void)
+@@ -77 +77 @@
+-void uvm_procfs_exit()
++void uvm_procfs_exit(void)
+@@ -106 +106 @@
+-struct proc_dir_entry *uvm_procfs_get_gpu_base_dir()
++struct proc_dir_entry *uvm_procfs_get_gpu_base_dir(void)
+--- a/kernel/nvidia-uvm/uvm8_push.c
++++ b/kernel/nvidia-uvm/uvm8_push.c
+@@ -103 +103 @@
+-bool uvm_push_info_is_tracking_descriptions()
++bool uvm_push_info_is_tracking_descriptions(void)
+--- a/kernel/nvidia-uvm/uvm8_tools.c
++++ b/kernel/nvidia-uvm/uvm8_tools.c
+@@ -2041 +2041 @@
+-void uvm_tools_flush_events()
++void uvm_tools_flush_events(void)
+--- a/kernel/nvidia-uvm/uvm_common.c
++++ b/kernel/nvidia-uvm/uvm_common.c
+@@ -63 +63 @@
+-bool uvm_debug_prints_enabled()
++bool uvm_debug_prints_enabled(void)
diff --git a/x11-drivers/nvidia-drivers/files/nvidia-drivers-470.141.03-clang15.patch b/x11-drivers/nvidia-drivers/files/nvidia-drivers-470.141.03-clang15.patch
new file mode 100644
index 000000000000..71cb6cf7e980
--- /dev/null
+++ b/x11-drivers/nvidia-drivers/files/nvidia-drivers-470.141.03-clang15.patch
@@ -0,0 +1,107 @@
+https://bugs.gentoo.org/870238
+--- a/kernel/nvidia/nvlink_linux.c
++++ b/kernel/nvidia/nvlink_linux.c
+@@ -571 +571 @@
+-void * nvlink_allocLock()
++void * nvlink_allocLock(void)
+--- a/kernel/nvidia/os-interface.c
++++ b/kernel/nvidia/os-interface.c
+@@ -1076 +1076 @@
+-NvU32 NV_API_CALL os_get_cpu_number()
++NvU32 NV_API_CALL os_get_cpu_number(void)
+@@ -1083 +1083 @@
+-NvU32 NV_API_CALL os_get_cpu_count()
++NvU32 NV_API_CALL os_get_cpu_count(void)
+@@ -1136 +1136 @@
+-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
+@@ -1527 +1527 @@
+-NV_STATUS uvm_perf_access_counters_init()
++NV_STATUS uvm_perf_access_counters_init(void)
+@@ -1538 +1538 @@
+-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
+@@ -795 +795 @@
+-NV_STATUS uvm_migrate_init()
++NV_STATUS uvm_migrate_init(void)
+@@ -821 +821 @@
+-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
+@@ -979 +979 @@
+-NV_STATUS uvm_migrate_pageable_init()
++NV_STATUS uvm_migrate_pageable_init(void)
+@@ -988 +988 @@
+-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
+@@ -463 +463 @@
+-NV_STATUS uvm_perf_prefetch_init()
++NV_STATUS uvm_perf_prefetch_init(void)
+@@ -501 +501 @@
+-void uvm_perf_prefetch_exit()
++void uvm_perf_prefetch_exit(void)
+--- a/kernel/nvidia-uvm/uvm_perf_thrashing.c
++++ b/kernel/nvidia-uvm/uvm_perf_thrashing.c
+@@ -1955 +1955 @@
+-NV_STATUS uvm_perf_thrashing_init()
++NV_STATUS uvm_perf_thrashing_init(void)
+@@ -2014 +2014 @@
+-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)
+@@ -98 +98 @@
+-struct proc_dir_entry *uvm_procfs_get_gpu_base_dir()
++struct proc_dir_entry *uvm_procfs_get_gpu_base_dir(void)
+@@ -103 +103 @@
+-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
+@@ -245 +245 @@
+-bool uvm_push_info_is_tracking_descriptions()
++bool uvm_push_info_is_tracking_descriptions(void)
+@@ -250 +250 @@
+-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
+@@ -2144 +2144 @@
+-void uvm_tools_flush_events()
++void uvm_tools_flush_events(void)
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-390.154.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-390.154.ebuild
index a13b4048b927..b73a7c2ccd4e 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-390.154.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-390.154.ebuild
@@ -73,6 +73,7 @@ BDEPEND="
 QA_PREBUILT="opt/bin/* usr/lib*"
 
 PATCHES=(
+	"${FILESDIR}"/nvidia-drivers-390.154-clang15.patch
 	"${FILESDIR}"/nvidia-modprobe-390.141-uvm-perms.patch
 	"${FILESDIR}"/nvidia-settings-390.141-fno-common.patch
 	"${FILESDIR}"/nvidia-settings-390.144-desktop.patch
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-470.141.03.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-470.141.03.ebuild
index de3196b87ae6..cc7b2513a5a3 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-470.141.03.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-470.141.03.ebuild
@@ -76,6 +76,7 @@ BDEPEND="
 QA_PREBUILT="lib/firmware/* opt/bin/* usr/lib*"
 
 PATCHES=(
+	"${FILESDIR}"/nvidia-drivers-470.141.03-clang15.patch
 	"${FILESDIR}"/nvidia-modprobe-390.141-uvm-perms.patch
 	"${FILESDIR}"/nvidia-settings-390.144-desktop.patch
 	"${FILESDIR}"/nvidia-settings-390.144-no-gtk2.patch
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-510.85.02.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-510.85.02.ebuild
index 35ec0faaa70c..632cee27f396 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-510.85.02.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-510.85.02.ebuild
@@ -79,6 +79,7 @@ BDEPEND="
 QA_PREBUILT="lib/firmware/* opt/bin/* usr/lib*"
 
 PATCHES=(
+	"${FILESDIR}"/nvidia-drivers-470.141.03-clang15.patch
 	"${FILESDIR}"/nvidia-modprobe-390.141-uvm-perms.patch
 	"${FILESDIR}"/nvidia-settings-390.144-desktop.patch
 	"${FILESDIR}"/nvidia-settings-390.144-no-gtk2.patch
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-515.49.15.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-515.49.15.ebuild
index c2597443890a..628cd1a50969 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-515.49.15.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-515.49.15.ebuild
@@ -81,6 +81,7 @@ BDEPEND="
 QA_PREBUILT="lib/firmware/* opt/bin/* usr/lib*"
 
 PATCHES=(
+	"${FILESDIR}"/nvidia-drivers-470.141.03-clang15.patch
 	"${FILESDIR}"/nvidia-modprobe-390.141-uvm-perms.patch
 	"${FILESDIR}"/nvidia-settings-390.144-desktop.patch
 	"${FILESDIR}"/nvidia-settings-390.144-no-gtk2.patch
@@ -164,6 +165,9 @@ 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-470.141.03-clang15.patch
+
 	default
 
 	# prevent detection of incomplete kernel DRM support (bug #603818)
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-515.65.01.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-515.65.01.ebuild
index f48badecc24c..c95218f51107 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-515.65.01.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-515.65.01.ebuild
@@ -81,6 +81,7 @@ BDEPEND="
 QA_PREBUILT="lib/firmware/* opt/bin/* usr/lib*"
 
 PATCHES=(
+	"${FILESDIR}"/nvidia-drivers-470.141.03-clang15.patch
 	"${FILESDIR}"/nvidia-modprobe-390.141-uvm-perms.patch
 	"${FILESDIR}"/nvidia-settings-390.144-desktop.patch
 	"${FILESDIR}"/nvidia-settings-390.144-no-gtk2.patch
@@ -164,6 +165,9 @@ src_prepare() {
 	rm nvidia-xconfig && mv nvidia-xconfig{-${PV},} || die
 	mv NVIDIA-kernel-module-source-${PV} kernel-module-source || die
 
+	eapply --directory=kernel-module-source/kernel-open \
+		-p2 "${FILESDIR}"/nvidia-drivers-470.141.03-clang15.patch
+
 	default
 
 	# prevent detection of incomplete kernel DRM support (bug #603818)