x11-drivers/nvidia-drivers: add 525.47.04:0/vulkan, drop 515.49.25

New major branch for vulkan, and as usual little sense in keeping
the old for 0/vulkan as it won't be getting new extensions anymore.
If can't use, revert to non-0/vulkan.

Signed-off-by: Ionen Wolkens <ionen@gentoo.org>

2 files changed, 11 insertions, 17 deletions

diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index d2a60428520b..7d84566c125d 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -5,39 +5,34 @@ 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.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.49.25.run 362202449 BLAKE2B 6ca62c747d62e3518e5d2f9926b41e7b0e297523d7f10164ad66c98328b710590932e1cfbf95322914c454cb38395a0f14ea3a881c6b91389db09782e21f9a23 SHA512 3d727d602919eb5569397c09a9dfe42f33d4f2f12c76c106638fe7c5fbe05b671cdb4d2946174cec730e5bb8d2d2a16a8afd622ab981d99475f72aa4f6239a2b
 DIST NVIDIA-Linux-x86_64-515.86.01.run 363743089 BLAKE2B aa03a0f059da99fa549cd9d672cef0194f2b22b349470d80ce626b3f4afb89b1f130b451735f92f5a66dfec02735bd6395053be609668371991837e3be4026cb SHA512 9a31e14afc017e847f1208577f597c490adb63c256d6dff1a9eae56b65cf85374a604516b0be9da7a43e9af93b3c5aec47b2ffefd6b4050a4b7e55f348cf4e7b
+DIST NVIDIA-Linux-x86_64-525.47.04.run 414269674 BLAKE2B 23c319cea6a48da3db1914fcad37298b80822aac675d58d7236710f60a7eb0b34bb46cdd71a558ca051da85431fe6ecd33b76c48419a412b599550f7f0eb11a0 SHA512 f612a82cb03d0e7564a30eb4ff0a2fff1d5b54ab4a0754f4a9865f786dad289fb3e69726651ebc841f594f8167105d158ccd810b5d609215245a93ff363dd0ad
 DIST NVIDIA-Linux-x86_64-525.60.13.run 413352607 BLAKE2B 7e97447ddeb1ea25e1853d3f34f84ebb6b2c5a727d97e4929d55f62f4f4f7ae1e4c863f1fbe088e0bc4ee83e6f5b2e9ce9182760b3bc3082ff1078f750747f5b SHA512 9895c8001b90b6367dbead1b34a86d49fa91171adcc72498fe537dc2e5959ef344e25b00091b662ba57bf751003ccff967e33262a3f64147ff0a253ecf582e46
 DIST NVIDIA-kernel-module-source-515.86.01.tar.xz 7504412 BLAKE2B 20b1b9eb6e2fbc7adfa0b78c6acc88c9da8346888c3d1f1ec01a6c1252feccfc104e338605bfaf7617f0b78c7d0de05b32577394714be3575aa67b37c0e843ca SHA512 075fb8b9c3f43f21f51035460a9bc306b11214eb029e950a5bfbc283dc1d3403210ae303148442d31b2c5bf618923bd1762ab5a91234d005f50177fc02fa8ba4
 DIST NVIDIA-kernel-module-source-525.60.13.tar.xz 10027892 BLAKE2B 2484466566f45a19717179c9f548c9c76bcad209f98224069b35e98719a2c9e86a3db001fb33ea2f6e66ec1db7d02f0d9b830b8f754c43f7caa838b953746975 SHA512 39a8ffad71ea864efb34e94f301893a033d02c4dc737cb7e6d0c1df4f333287517682bb4945d1f8e1a26535ba6f60da66ae67074cda51f3cdf9f29497a194762
 DIST nvidia-installer-390.157.tar.bz2 150323 BLAKE2B 8058ca87a6dea956d564af9f7eab9b1fc82b1f2382bd5cb2f6d97cbe2e19292533522d5f8f2eacbeb16520372715fcb72f8f9b0998962af5d4e75522c8d74524 SHA512 93a7ece648602157496c8e27a88864ede341a100f5328a4c1a25faf8f0b94d252060e5e2f71d0c302fd0566c10773c30b76b3b5f431d8039b71c90a7969f7d7e
 DIST nvidia-installer-470.161.03.tar.bz2 146227 BLAKE2B 4c733877adbe5f44e2d112fe2401657c2e2809ff76d0eac29409be7c624e073d4a2fbcfb39eb706625d93d1f3c753d47271a6c2c660270824cfea350e07c751a SHA512 eab1308b85dd66ae4332aff766a237e77c763af45a0e62eba0958abcaa493950aa19edd95039d03e783d78d0ad1fe8348a13d5b64fa103410acfa6ad5f95a884
 DIST nvidia-installer-510.108.03.tar.bz2 144494 BLAKE2B de7c3f5c50350318a3e95bfbdd8fa7f51f187298497e88519f9d4719e26f310f2420ef8e500866cee0e6c22e888c4282a65e1edcc9c7e3d4d4799ff8e6856789 SHA512 b90efcc082b6de0ca42fe203ae0b60aafc8623377f31fd5262401e933bf630b11c843d5e02951374a9276e5d08eaa0c28bf2aa4987b8f9ae8719ada6e62ea7c1
-DIST nvidia-installer-515.65.01.tar.bz2 144675 BLAKE2B 19e5b67c6972ba8435b215a20c8bcd62dd8c1e9a6ae6eac3209f7d9116397f32c43a8f5d8dd8d6d63ac4c6348c610daedde2908b7fd80a8d03ef2c7246b8b9b2 SHA512 0784249253d5e69eabb8c948ad1648d23f59c8c5c4021b5274af2d640de37b5a8b8a55e6ab979cefc2271162bdfce42fd8cbf4640c3c20f5171a032c8b4c44c0
 DIST nvidia-installer-515.86.01.tar.bz2 144637 BLAKE2B 840e2258224e0d19dfe092bc8e8d5986ff771a9fbacfc6c682c513e2757072b68252ebbe4ec8a491997db80f3e1c6879b9dc8f93134caf6f0e6ea3360253fbd9 SHA512 3f55ab79283f1730b5cf5898d9df97a78b8d86f0ac124af9e31c7a960f4a82e46bc262fc0cd8ae9c29c3bab65e2be1ca3565d0a470017a153fa58f61241b34b2
 DIST nvidia-installer-525.60.13.tar.bz2 147720 BLAKE2B ecda51de53d7e621d32b144469a3c543f73f3af919263d5c162c9bc6c5f3240b28402ec9b0fddcdec83548679b5368d33c9f9a25325fee3e6d01036948e2de2a SHA512 da5d5db7f028ffed1fed9b05b4090bcb352b9e954288644a433debd8b0b9c1f4439a8cc04be14b21b8c61045fc368060463b5996ffca0726fe080bb13b481666
 DIST nvidia-modprobe-390.157.tar.bz2 35306 BLAKE2B 80d202b39c2f95ec0f909712c2e101483af50124092c32efb33bd98ff58ddfb97b737ff07f1ddc941f688c1b4c26a15f392566d522e18506771f10422fcd571c SHA512 109bbe24a3758b568ea65fe1e9d78f69fae6108ec0497b796c885a3912825fe04ffd7389a3e22987f1a10a2926bf6eaa384faabc59478aa3ee244dd3ac91c6d3
 DIST nvidia-modprobe-470.161.03.tar.bz2 38348 BLAKE2B a137e38463f806d25e91d81faefaabc5cd5e51e6537b0a9e641ff96b6029c522eca3766b46a240bd5d25cf04fc11c8eca6b1ae2cbdcc17bc7f0d059fcba67fc7 SHA512 f3b95c22b600b1e09797ff346b7bddb7d84abab01b5383b08626e3172cae8c84fcb3d0ce6425769eafad9602656704c51b934131b3e0b7512de82e5acafcfd15
 DIST nvidia-modprobe-510.108.03.tar.bz2 39055 BLAKE2B c195f55a60eb058b2da704d2aea245aab82a5129ac974cf0d5eeb6b39256c749b7b7de144e067887eac3fb03061d4f87a9c694429078d0eb0242227df1a65a3f SHA512 9ba4fd40b06ffc2f880944dc4b58155a746422cbb02cd17f6af59e3975d46861f182d9257fe654c35d991f7799d95a0a0ed0fe4bfac4426d997a22e3b270fd37
-DIST nvidia-modprobe-515.65.01.tar.bz2 39122 BLAKE2B 3184c3478170b7a9758123e3aed68ce5318a92ed055e6a5fb4cdee8c4e00885da0d22dfbb7b453dcb45b596f709fadfaf13e736b4d2fbc0547d0d802d6dab7b2 SHA512 20360282a5f59cc2e7c25bbb87220c2c4d5d2f3c458147f59a689f7f37b2ce59308ba4306a9ab2be5af592e277bf754205fd8c9d53f7eb85454bdc0636a2f33e
 DIST nvidia-modprobe-515.86.01.tar.bz2 39100 BLAKE2B 00157bc2cc78c58389772dd92c0e389420b93068c673153be32ae385efd50071ed9986c3bfe0d9242a539536c1cd3fd9c502ed7d00523aa653c7a9085a6333bb SHA512 14c82274bc87da0b4f2f8d3a53d02ea55fb003a32ed10a2259598db86655cccbf39fa6bded836cf2bb667c2eb842ae0ccfcf39fe32ee78ff291827673d02634c
 DIST nvidia-modprobe-525.60.13.tar.bz2 39980 BLAKE2B 58694b277ec9b6f16c2e6e3c001af56c7c09c2b461854c7d0fc2b88ffe8646917a5c5065d4fbcad982ccf6357d3185ff64296bee5197934d9a47c42ca57621f7 SHA512 05c16b639df1d8bb4dee3876a5eceddbd3fb2af8ff29afd9b119cc60448b3326df130baa681b8e66e88db1a1b8a1d49b655b3f5ddfe040e280c79ed84e6d59c8
 DIST nvidia-persistenced-390.157.tar.bz2 48654 BLAKE2B 2cf6c92da90acff55e8c180a06b0c6a29d48be9fd8ca3c541202fd14f0697220fba6b66452942aa7ae7cc8821f5c5eb9fa8f7a31d2248624e5f9141d83a176b8 SHA512 70f0707ed6f2b877e69ef90cf782f66cbc9d2071db53ca09ceb7b89427b0fe176708517340621fa251539b7d481b238adeeb60261674eed74de1f62db6dbb72e
 DIST nvidia-persistenced-470.161.03.tar.bz2 46540 BLAKE2B 7a9af37c570fd50341a620cb8324294e4e29ebcd165f7254ca8c7a0d3010b40ee3f6721e2e6cddb5378629bc20014a4d916141e4109f6167c688c506c7e0852c SHA512 45c49cbb2a61fdcead639bf2032950f97a403fb70870c46c71003d30477bce2936bd2e2dc6ba234987cd2397dca958e83e78850289e70d07e4cb9818a8ddf8b9
 DIST nvidia-persistenced-510.108.03.tar.bz2 47222 BLAKE2B bed22370ff15df7097e927e07c444a405702f53b9e5591b816a5c0bf1d9f78a045571ece830db86d4724a9b0466a8d67f2e45ec010c69f603a9bce5cd2b8da48 SHA512 39df00ead66f7a6b0e001484333c0dda09fc30daf0df0c8fec4f5913fb88e7a2d214830e7f20632aaf89acdd9af1f11d78b50eacc10cc9bd2b534f390aad52f7
-DIST nvidia-persistenced-515.65.01.tar.bz2 47160 BLAKE2B 841efe6670228fc7dca061e50e1d3ae5f281bf38eeacb95be2ea3c66f4fbcb7447ceea803fe1b80a7a4e7a5130698ea442e72fc8875a8043541a32cc80080f0a SHA512 7328303ac0ae62f2f7f5bdf4747d4820dd9f0174702d58cae0e701213346c1bd86cbcc51647d635ba501b1fb4e4cfbcd7b39e46e12b0b626c189666aaef6d2c4
 DIST nvidia-persistenced-515.86.01.tar.bz2 47153 BLAKE2B a7d213790895876453d34580f563ee0aee98ee145fdd8e7bdb726f91298da0f16a4101922a908d367af3ffd6ce1418128f7c5dc0a1e2789143832dc1b96ffc35 SHA512 ffe735178b3b5a0430bae8678b5f7fca407a0389de7f57a1789f67d3b4087cf7c638e6ded8a1cf7ef3ca642d0f889d9f2795fa0e18291101ef1b2a9e3bc4a174
 DIST nvidia-persistenced-525.60.13.tar.bz2 48172 BLAKE2B 19ac0d405d6c9c4f4ae031c9b8376b8ed98257862864371686966f876233b3106c2f7796ffe8e63cb9d5a76345c02b99daae416108660bbe2fa018d39480ba1b SHA512 6d288a474adb77291e842c95cb6871056bcb27d1319944cb413bc9ee597347431b62e34d444d948ca94400560bdac4077ccc2d1198217f22b11d1ad6b9cbb65d
 DIST nvidia-settings-390.157.tar.bz2 1108938 BLAKE2B d9ec1ab5d7f157d74627272adf752a671dd17e2ede02069437b6180b927fe315b15cc6416d584ab2f038b76fe01e5b64514a834f24d88ac16676e55205fdecdd SHA512 b16699009bf56a1ff3b623a528c58061c4f5a2c5c4a373756a07bcd667743a1df7c733a572d2d0baa835a904ac2fda8a5c85890dcc00c3a0f223e0467aea902d
 DIST nvidia-settings-470.161.03.tar.bz2 1062425 BLAKE2B 20523f1e5ab39dfe8ac657afdfafe3d99df2cfb521a475f54804dd50233d4e2ac5dc5fb0e3394997963daa5d06bc2b55088ebdcbf894c16cc9d25aba316834c5 SHA512 61725a6f77930d9c12de6fef57d9f5bb93a5e62e60d0db1707b7f469bce00464192930c4f46e9074e7bcbc4922fc86e9b22ddfdf092f8f46b0c6820505e3b87e
 DIST nvidia-settings-510.108.03.tar.bz2 1075907 BLAKE2B 537d38bd6a5fdca0182af9a7604764c14fb832a1dd2f0d6f2eb1532f06f3822ed9e2190293c1300b7f8971990883ea491269e7ab4838cd724196742e21352ce0 SHA512 3eed794ad7988143719c6d905e375d514daa441d9ed71eca7eff6cae4cdf4fbf08331f9b0451bcd961920f1ffc1797a257943900eef45e225b312b61232275ef
-DIST nvidia-settings-515.65.01.tar.bz2 1079461 BLAKE2B 95fccb9121ea1844c6f37024054d3a7cae73c93f6578714f15c84173b3dbb21dd6f23c1cbce744d7deedbd9f3d2a9bf80a4d057928ec59402bcbdf718e65de3c SHA512 ae3a127c28b5857a3dfec291e2a7f2ce7c6f1ece82890bdfa2f6f9d5506cc092b771e93d093621c4861ca7983d05741b0146a4f243f3b921447f287c88a839cc
 DIST nvidia-settings-515.86.01.tar.bz2 1080128 BLAKE2B eed02cf9b73fc12c1d862df71d7fe9a4e4e8486831d1940c6e5187b751abe02deb0ebc495d251ffcd401f8ce78b16077d5cd9272c0f472d8c6465a958bf66c85 SHA512 d2c50bf587f53336a1d80ae88b382ef04e8c9ef24893f8ec901934eebb1358038ed67ac7501d98257c486a0fe2e818edd91832b3f989311c061d7a8b85818229
 DIST nvidia-settings-525.60.13.tar.bz2 1085880 BLAKE2B 585b852a441a5e041ced713fdd6ad2a9a4b59785b2c985cbc5c0aa04f15027d1f6cca0713b04fcef7ecfe19d28c8720e5c7703308ec266bfd76489d31e38bb61 SHA512 f751c76e1688e0bbcc13bc83b7a3912c9a087d2fb268371c636a1a873dc7a3f7a25a5c61f17404e05ef32390a72ebe51a42bee7ffcc8bc12aaffab909cb7ec80
 DIST nvidia-xconfig-390.157.tar.bz2 107399 BLAKE2B 0cbb3b1ba508ddc3ba4a161c290b31bf7a67f67880bdbd01171a962c5fa97ca945b1ef17932403f8589309380743f1da632c728d8accb6d4e56dbd895e7486bb SHA512 50b390811c9bf091b14add41f886925b17496b41006b7d3981d2398caa65cf5db8a579c8cebed78278384bf3acc629befb07b54339c61abcc75852c0dcb8b8ca
 DIST nvidia-xconfig-470.161.03.tar.bz2 108669 BLAKE2B 6c12e38759ce64c5637d6301e2d5c89b8d53ad4df84beea276b76cf6927eb6ff9596534b7097088d41447886ebb79e00b037c747a47531b13a56373df7ef8969 SHA512 0cccb61c3b875b47fc78cda627aace3a730e7c267389e0fcd4ab780aefaae3c48d95d137becdba7fc12adb284ede9307c85a3ae347d31a57a6283fece6046a9a
 DIST nvidia-xconfig-510.108.03.tar.bz2 109729 BLAKE2B 48378155d57f9b4a2b58b044daa1f2f2ed9b897b77f0453f67c7b03200cc09689b628f88a87c0f4c8ae149f11cbe6364eda34c2636cc1e1fce33b799d8225138 SHA512 17462e7826225804685eaea4dba05252dce138f95c72285abe607ee1b2a6269d2f4e5c0833802037d29350d1218ed9982053871b0b08c4f5f329d497da299fab
-DIST nvidia-xconfig-515.65.01.tar.bz2 109681 BLAKE2B b41b3ec377c79af6906a47c826d9930cc5ea6e85e8404e6882f3bc03cfccfa03d8ef7c280453ab29edb208173aeb576d33df00f92c225a86bc3cb571b352cdbc SHA512 6f0752e32af6772e85bd2799ea2d895bd5b5faee4c1b6813eb839e75af43d07ef09be6606e7dfc40491e07c25333e9c4145465f97dc0338053e8be1c19220bf9
 DIST nvidia-xconfig-515.86.01.tar.bz2 109747 BLAKE2B d6253f9d052be5aaa1a2be82bf4a36c971aae8b6e9f61e4ff5f27ec415d945bab8289678d6a2495ff7521c66478421090a452ceb19d87803de4290aeb7f69bba SHA512 f4e66f23d9227671158ee0b99b1ccc44f25dc6a910d3b00332d135fb94f21b67f581804b53a40945a652777c898e20069962721931c7b58d2c33d38925da5e35
 DIST nvidia-xconfig-525.60.13.tar.bz2 110584 BLAKE2B a06b951f91cef5ce17843876de5b5e5988f2e869f8d6a4478e186597698c3fb05daf176581cfb05bc3dadf79c817cf2df2b947b02f6152c2ea4b960f3aecf2df SHA512 ffba8aabfda510f6546d0c7786d935f432fbbc87ce78d38ce5f9fa22ab5862e7adee0f699b46bb73270b89b092d988af2fed3915b0c9be66d642d39a533fc880
-DIST open-gpu-kernel-modules-515.49.25.tar.gz 7418303 BLAKE2B 8d520dfbb2669a1b2c7ec959106579a1fe2051906a9e6d2d5188ca5ea94753032fd7e70d96495e20a3efae4f871f25921e01046fa52811d6be6998ec456189a6 SHA512 32657af1fdede0adf5e5ccbc24b9d85121b4ea2952786963ff0a42ac130ceec8c3df627b8211f92a25fd9640fa7be20835860db91bd6148fee516ad80a7a831d
+DIST open-gpu-kernel-modules-525.47.04.tar.gz 10254204 BLAKE2B 0cea11c7cdc88602c4eb6262d26ff9843f4f3be75a1b524caf0f58b092c681e87006f264a7d61a3ced7051544bd1f036060786585ba63086d085ec34ff4b7922 SHA512 ddf55e2ae391ba884aaf3703f7c26dd167f7bb1720062d015735d1216441089597ea33ef540c384b630e3655dde65470bc430bb70d3f43abaa7fda23106e86f3
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-515.49.25.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-525.47.04.ebuild
index b68b3849c29c..cb4b15e6013e 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-515.49.25.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-525.47.04.ebuild
@@ -8,12 +8,13 @@ inherit desktop flag-o-matic linux-mod multilib readme.gentoo-r1 \
 	systemd toolchain-funcs unpacker user-info
 
 NV_KERNEL_MAX="6.1"
-NV_PIN="515.65.01"
+NV_PIN="525.60.13"
 
 DESCRIPTION="NVIDIA Accelerated Graphics Driver"
 HOMEPAGE="https://developer.nvidia.com/vulkan-driver"
 SRC_URI="
-	https://developer.nvidia.com/vulkan-beta-${PV//.}-linux -> NVIDIA-Linux-x86_64-${PV}.run
+	https://developer.nvidia.com/downloads/vulkan-beta-${PV//.}-linux
+		-> NVIDIA-Linux-x86_64-${PV}.run
 	$(printf "https://download.nvidia.com/XFree86/%s/%s-${NV_PIN}.tar.bz2 " \
 		nvidia-{installer,modprobe,persistenced,settings,xconfig}{,})
 	https://github.com/NVIDIA/open-gpu-kernel-modules/archive/refs/tags/${PV}.tar.gz
@@ -81,11 +82,10 @@ BDEPEND="
 QA_PREBUILT="lib/firmware/* opt/bin/* usr/lib*"
 
 PATCHES=(
-	"${FILESDIR}"/nvidia-drivers-470.141.03-clang15.patch
+	"${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
-	"${FILESDIR}"/nvidia-settings-390.144-no-gtk2.patch
 	"${FILESDIR}"/nvidia-settings-390.144-raw-ldflags.patch
 )
 
@@ -98,16 +98,12 @@ pkg_setup() {
 		~SYSVIPC
 		~!LOCKDEP
 		~!SLUB_DEBUG_ON
-		~!X86_KERNEL_IBT
 		!DEBUG_MUTEXES"
 	local ERROR_DRM_KMS_HELPER="CONFIG_DRM_KMS_HELPER: is not set but needed for Xorg auto-detection
 	of drivers (no custom config), and for wayland / nvidia-drm.modeset=1.
 	Cannot be directly selected in the kernel's menuconfig, and may need
 	selection of a DRM device even if unused, e.g. CONFIG_DRM_AMDGPU=m or
 	DRM_I915=y, DRM_NOUVEAU=m also acceptable if a module and not built-in."
-	local ERROR_X86_KERNEL_IBT="CONFIG_X86_KERNEL_IBT: is set, be warned the modules may not load.
-	If run into problems, either unset or pass ibt=off to the kernel.
-	https://github.com/NVIDIA/open-gpu-kernel-modules/issues/256"
 
 	use amd64 && kernel_is -ge 5 8 && CONFIG_CHECK+=" X86_PAT" #817764
 
@@ -233,7 +229,7 @@ src_prepare() {
 	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
+		-p2 "${FILESDIR}"/nvidia-drivers-525.23-clang15.patch
 
 	default
 
@@ -271,6 +267,7 @@ src_compile() {
 		PREFIX="${EPREFIX}"/usr
 		HOST_CC="$(tc-getBUILD_CC)"
 		HOST_LD="$(tc-getBUILD_LD)"
+		BUILD_GTK2LIB=
 		NV_USE_BUNDLED_LIBJANSSON=0
 		NV_VERBOSE=1 DO_STRIP= MANPAGE_GZIP= OUTPUTDIR=out
 		WAYLAND_AVAILABLE=$(usex wayland 1 0)
@@ -304,7 +301,9 @@ src_compile() {
 		CFLAGS="-Wno-deprecated-declarations ${CFLAGS}" \
 			emake "${NV_ARGS[@]}" -C nvidia-settings
 	elif use static-libs; then
-		emake "${NV_ARGS[@]}" -C nvidia-settings/src out/libXNVCtrl.a
+		# pretend GTK+3 is available, not actually used (bug #880879)
+		emake "${NV_ARGS[@]}" BUILD_GTK3LIB=1 \
+			-C nvidia-settings/src out/libXNVCtrl.a
 	fi
 }