gentoo resync : 06.04.2022

10 files changed, 38 insertions, 492 deletions

diff --git a/x11-drivers/Manifest.gz b/x11-drivers/Manifest.gz
index 9bf6b6378ecd..9bf375522fa1 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 1931fb1c72df..45c797539d3a 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -9,42 +9,29 @@ AUX nvidia-settings-390.141-fno-common.patch 478 BLAKE2B 2b222b26049aeb669235061
 AUX nvidia-settings-390.144-desktop.patch 433 BLAKE2B 5f2eacf1cb1d8ad1ba2cd7163f967df3141a75cbeeab967eacd1459f61ac597c5123570d68e8c51fff324b23a81df52386815a7156ec77ae8886e86ac70974ea SHA512 96411bc1a752f10514e81996cfe077e479b19a41ea857b4a3d51a8675ce051bc366fc8b071eaf25f335a45ea2a5eddaa49309a946a70610de871e9ef2ae6cc75
 AUX nvidia-settings-390.144-no-gtk2.patch 367 BLAKE2B 59a60b103df6b187009417dca22caaf45292b94005d92df9e513804e5137959ffeda1d9abd5506cbb5c7be604023d2c59f0841190b03502542ad0c2d3f084a10 SHA512 421558442a2228f6ffdb82b2bd6862cbc286b8ba259c4970f54dcc445a988575864404f2c3933d2436d8d40de1bf0e34ee7ed855742c5d677094c260e32a1e66
 AUX nvidia-settings-390.144-raw-ldflags.patch 468 BLAKE2B bf4c00a76351e6c3d1587b4f71be61fac8cc516fa22da0a47538fede92b619eb77b1cc09222cd403175a2015eb2ca745e8cdca90c9dca1b938ca13a2e59810ba SHA512 1fc568bfd1faba1f7af4f4b07715912b7f1d8103626ec0c9fcbb465ded606059ca264f386fe415105ab9f95c4ab173bf4b784ea7380bf17ab6979f56fbd01757
-DIST NVIDIA-Linux-aarch64-510.54.run 211311685 BLAKE2B 506841254f9c9e78ee76bb32b17bc0e6f9934d0e6a565733d6e42605f1a7a2b9a12d999873851592f025e827f4177012c319baab5c0fc5cd1cf9f6f48590bc7b SHA512 9d872748dc0957c0754561582a1984a8f912c345a5e616116edfd86d629efb5674c29723c80ae47d458b23aaec6fc5a71724441dd7e11ba4f5b94f8b04591f81
 DIST NVIDIA-Linux-aarch64-510.60.02.run 211374897 BLAKE2B 76f31f07f3eb1b0de7a46bab72ef13316ffd18945f824a2d30200d852dbf5de155cd4cf6ec46638b00df9bcd34218f9f7f546b579da5e79561f467f68b20537f SHA512 fca54ba6abff197dbce55761a4755e98aebd16a851b54ba072c2a10296eadc7924adc102be6599d16052d94d9a0a4e260a0d63a098e039afe46210c65dfb3b32
 DIST NVIDIA-Linux-x86-390.147.run 49303088 BLAKE2B 5a3a02b88af1ee8699b0c6c3fa222d9176338f10437a88c874126c7bacf64ddc44d03d8a44542cba989129af6336e46cae775713458a16d78ea75e4e004dfffb SHA512 c5d47e2a8c034e158093feeefa2455ec49d676fbd1700118aedba0c3b84be4e2060402d0e27e50d1a674de10f369f8e5ca2da8c61f1d0560d2105d33d7238359
 DIST NVIDIA-Linux-x86_64-390.147.run 85930997 BLAKE2B a8085c9abc1c31251788a8f5abdc2090c9085b3028e364184244bbf24d822dc3266877c88b30f403507fa2dd511c68ec67e1f188d6b0f1f4d7d792881d5253fc SHA512 0d8bda32e916d71da2ea74bc12a4f3cb0a0c2ddda27511cf3c89bbf4aeb28db68f6b7261639d88dd1c0180b91213c09de930d233158268c5d9ab3b223510e964
 DIST NVIDIA-Linux-x86_64-470.103.01.run 272484410 BLAKE2B 42a19ed990f49d4ceefc1006f3e6e4b69135ad2aaf497c648b9afe7941a81aba3a51296cb14bc419352cdf70f850484d2a55784184fdb820186193501422d742 SHA512 3dc19774a6fef5e6ec0cb9451df4268f77cb31b0a9ede253bf9cf805a048ad457a7bfec852aaeab3e3e297b3353840a3d6c9c7ddc75d57b2b000ab4e0b15530b
-DIST NVIDIA-Linux-x86_64-470.62.22.run 272128606 BLAKE2B 727aac085a73c4c953ddb58a5b887b70eb65b5b89cdd556d122d89d351444fbed0adfa3c34627a9ab0d13c42ac93732d9fa023e580894117dd0c06098b386208 SHA512 9e9f6a665034495bbfd438567fb9a0998adbfcc979fd1e0370d355b4f312e4c1fb5162b15e5264cc89d3aca6dcaf84ce7ebfff0885ac783dfcd8be3b99b3b96f
-DIST NVIDIA-Linux-x86_64-510.54.run 328899755 BLAKE2B b83ebb1c978f902812d7dae2170eadfa1d52d36dc1e9ed61001c0483743ad8094268f101a4414353936339a4d064d54ad41cc229906ee7dbef3aa56af5315764 SHA512 1e65e96c1ae1cccd5cd483f2b65927e3594d28f3774459dfd094530f445f4b0f5368a3b7eebf4970bd2632438cca2cbb93af50a59a3a87a2c13d08ed5155164c
+DIST NVIDIA-Linux-x86_64-470.62.26.run 272619538 BLAKE2B dd68260661473b5d6a10be42eac376d662e9656ab63b24442f8aab4f7bfd916f6255650f931334fedb3c3023acbd2512a9bbaf698a01a0c3ea40d7eee84014bc SHA512 13cd30cea4c7390ea7e0c0a41842258b488082b358b0d9a13c21637b79efe470ae6ee4e86902ba81d01cb6be0700449c6f545d87aca2708f62be22530d41b693
 DIST NVIDIA-Linux-x86_64-510.60.02.run 328284028 BLAKE2B 9165e4763a34c3cf474c18dae7d2c548bb6d4edc21507afe67d046959e9f3fb758cf507dcdffcfbc0bf70cf2b677a193429127b3fe589af329fe6a671ac51e6f SHA512 ccc459bdf5f89a37f79a1831bac8c03980deaa13082b516d5e9c74a49e1aea7f1f6b03304705a95564a390bf0ca38df10b8c8b73e3470a31444dd5ebfd981cfd
 DIST nvidia-installer-390.147.tar.bz2 150157 BLAKE2B 3bf5317aaa3bdb0e6dc3b3e21ad3dbacf6dc782a643b0fa9badf354361891ab25660b57dd408e346f219d469af317a4851937e1cb77ffe59a39e9d98a92f3a40 SHA512 24bd8a2959062551abf2ea039ac95eba224d58c175f59f1386a6d43459ad43b2bddf17f00b53c1c71c45eca3b7a2281dcf05cc65030f6f8bed16d0f0b9f9c282
 DIST nvidia-installer-470.103.01.tar.bz2 146121 BLAKE2B 06da3693cf8edba849b802f2255dcf2086ba3846f83ef19a02cb813ea2c07a6904f8a49e263018fb8b40c9fece7ab4422d95a50d12030ae6815ec60a7edac055 SHA512 b080f32394a6163c34e152561b80cca9277a53e0b38c5225b91daddc2169403e2ff4cf63a30b488ee0c3a954b21d32065b5624fb9dd33e672313909b9096de02
-DIST nvidia-installer-470.86.tar.bz2 146359 BLAKE2B e1df27887ef7168dc50d54fd688fa04e80f79065c26386aa8f5f2b0726302a0dde51093d93c24d4145d0ff72cea14e76eee4fb9503c16a562c211dab9b2fdeaf SHA512 8bcc9a32d9f6c3cb778838124be5b112edf1b38753842bb436db74ae6448b4b7a367b79585f28bee9f2a41844e71083cea9b59beab99c14598a8d855ac432113
-DIST nvidia-installer-510.54.tar.bz2 144392 BLAKE2B 0938d0dca690af563d253252cc7dfcfb5f666c4ee880f93a13a74870b69d2fec4a2c277aff870363318d11d63ba725ff74bad07a1ce357a0479eb673c2883064 SHA512 2d65a2fa4734e1f8364b3802125d489d93f10965b3de4828743c91ba8d93efb264405ca35958023d66f558614ece6751a1fdb7cf8ac6baf487058c53b1b00b18
 DIST nvidia-installer-510.60.02.tar.gz 199713 BLAKE2B 47f763effc9305fa267e9c3712cdb75f9d2c1ba77ff150b6e385a4137349f9dc11bd54c6ace257d5f597cb7ac3977e37c42c8dc9de85c2382e0fee26fd9fdfc9 SHA512 c4b50d90d9eb411612daffc8c04a7e82df911eeedc25fafc6fda0f618c0bdae3d134cb88870e580bd4a01d66a1e43d9d8f6d6a72486284176deff872b443c7a2
 DIST nvidia-modprobe-390.147.tar.bz2 35340 BLAKE2B acb49dea0c5d9d802b7c2f9f8127106bd6f9e2aaa7875941ca94c1d81377411e8d9c53357e7f9aa0170c87e349f6379a45391965e7897d0158951a4c0056a835 SHA512 a731fc990557f40fdd0fba45bcfeb99c315d0579a2d2f49bf6f84c55c91f52a9e65c358bc5a3882483ab8e9d66b546de31adcaba46a494bfc0836a0690c3d0db
 DIST nvidia-modprobe-470.103.01.tar.bz2 38347 BLAKE2B bd86b8f76d040ea9bad06312b24d839413515c24867e88174d40e9dd0d9006d42fa57f8e789a8a0e8859dd1c1122ef6e57ea25fdda08eedcba10d9291181245c SHA512 ea86b083dd82ff7d8926d337f2aeccbd73cd614a85579cfcbb4ad7225565aa54f151e6d2b5d35b96eb413c3673158025348416193db5045809d743cc98d65281
-DIST nvidia-modprobe-470.86.tar.bz2 38361 BLAKE2B eacef469888392d5993d018421e50cc594fadfcbe1367f13b68519c15d097759a91d3e294e3dc7391d2e3f93783fcd2e696ef25a7b4aad90abd18d992c480623 SHA512 5478bdd01aa7af79fcc6264b347b78bf68d2ade77eac388eb6968db72056859443778d0aad7bae1d5d63c01af332a21504fff13ac3e226446c8a71beef777860
-DIST nvidia-modprobe-510.54.tar.bz2 39062 BLAKE2B 1c218ab42de9a7eea274d633b2a4ac0e9412272e5d287e00233f306b7c7598e11e605d646297ba7c345a3b436486ed202561f6815b61e178c9e3a235ccb613ee SHA512 e3ab7bd4e4c56825ad7f81f1d1b85af6a2eba64cd7cdcf5617e58083cf5dbd53abb1a6c61c1db54e497b6b3517159a3fc6a54f24636ca8da0433c167b9446cea
 DIST nvidia-modprobe-510.60.02.tar.gz 44318 BLAKE2B 0eda5a6720d21c483c4bc71e1a1140ff48ed731a1a71e77012a2eda96299644133b3e482063969f709c290ef5e06f5db81deae8e9cf7204a2a8e394d7058b3af SHA512 c02d35175ae0fb661b4998686bcfd44a26969257d184c1ba7f11955adb17a7034cbf747c356cc7bb927a6ba6f0f3a0a8375a8ff4e56ea767e26cf968080eae36
 DIST nvidia-persistenced-390.147.tar.bz2 48712 BLAKE2B d8b2587c8b4374dcff198d8aae1468d30197d9b097badddbec34f0c41e3c4ab4f27b568f152a4c7a4416b3ee15194ae07442c45c50d086a6f4e7e69a5c54f42d SHA512 5877f7b0a40d54b1ca746b2fa1f1270d1ff605068dcf944e078d4cb547bc6f79c08ea9d4fbe3e94e8cd528b9721a89147d43ac849df71b2dc1d903fe1439c4a5
 DIST nvidia-persistenced-470.103.01.tar.bz2 46549 BLAKE2B ad25193ba3abe1a5a30233aedb1596822a4af1aa74e6862c4449567408bd84ab40526301f600bfeae938c443f26dfdabd7f912888cfd2e307fc7867d7750180e SHA512 00ab77bb84b90bfeced488353db674334796b10bbd9c8da9ed682d668db800aa7bbcba20033d21bbee6663f0659dd17daf3298cb1384f41a89409a5f3a162de6
-DIST nvidia-persistenced-470.86.tar.bz2 46523 BLAKE2B 29b60ff1a4e7db8ff8a2b32ab6ff2efd5d5010cb66ba1678e76a55fbe4b9f51ced06f9939ee2b44d5e073d7cc5b7b246fd2a531d9607b452a9a85cf6519c783e SHA512 6194ebc246d305ad5cc4276c1d2fa06c383e28ee8accef0e39ef3dedf637684837c10b78ee2b96a0b77d3e6e5e3c3555fe12629984f8ebc6358b96e303cb81a2
-DIST nvidia-persistenced-510.54.tar.bz2 47096 BLAKE2B e7e78ad6f31964e6ee3854ce663f37f200171ab09ad1ac2749e069eace14f7ab821cb11682de614f9b22c4185b6d976308981a4724ec82ac684f307762ebb018 SHA512 52b94b51451d26984209e720aef236f3096cee80e29ff011ebd214247db0550b34e64baf59219065fcb8d005b105a685b042e029bb487ff0d16a5d908176b0eb
 DIST nvidia-persistenced-510.60.02.tar.gz 54682 BLAKE2B fe04a72a1a572e443031bcbff2c328d45e0a5dd1dc9345b88c5095741e343418ccf9e32d63542e27b0c1ea7c51c4f86c9d2154ae7ccd131a941f27291714c369 SHA512 d31c07b1f29a8bf7074584550e68a53ad21c2b7378f9934c1302b96341aabc4360a910bbd7cab6b09fbc0c92685613660d088c5f50ec5b787e2c4aa4742cc865
 DIST nvidia-settings-390.147.tar.bz2 1109104 BLAKE2B b0a2e0c832901db65f41e54d66d61abd9afbc528d1e8095e314d7ce5c1bf73c7bc8cc1857d909d9eab2e3b9ee97831c15c52f2725a8c9f84e00416c4e3db23d1 SHA512 67c30df042b9a9b923f05a26bd2e0bd85487fab0fe2c730ac48025561d652ff0f7455a56cc7951ed8ba2a300e019fa0e52fcd912b644d0d88fd2ac0e63de2327
 DIST nvidia-settings-470.103.01.tar.bz2 1062124 BLAKE2B a9b95174a2309668951bb090812c9d2098d7bdefa210b396523eb59887fb3ea62f517398ab63cc9cfb395f90e6535c308fd43fb0ac406afba17713e01e98b19d SHA512 62be59eae75965762b5caf6bfb71ca993ee23cc0d12d385a7e67e62c8f9180555078dfae736cc6d6bc0b52525780e32e0b76152c5e4a1be669c6dd181c0f2465
-DIST nvidia-settings-470.86.tar.bz2 1062317 BLAKE2B 348c0346cb224eacceb570c833d74dbafc79be0fa54cf1953a96ba4198e0c76784e482284fc6790edab31bdcff3a70fe870e4634c5442b455db9c92332b28747 SHA512 4a53f4d3f52e569c4957890fbc4a4c7b2429bbca5ec07901ebb20f1848cc9a5da3e36e206719419462076793bba0b51d37a11e0856be371a19f5b7f0f2da26e7
-DIST nvidia-settings-510.54.tar.bz2 1075596 BLAKE2B b91094ed2da276738e5264e5ae001e3c3d5a0c8c8a086cea5c4fb6541f3b3c3d86bb523921498ffc99edf5c0bcaaa7b4d1ee0b95f8263b0d87b34fff54c61728 SHA512 02251364ca0aa4a7a06c6faa047b4fa12621f361bcd0236ce6b9544899aa718440d7f72996f3b1a9a958b6cbbc78ebe5bc5070c00705947e92d3b279e64cf042
 DIST nvidia-settings-510.60.02.tar.gz 1247321 BLAKE2B 0d52a730bc50db58aaf2df435b49a7dd036027ae0da0418c96b85e7e0ce793185d40eeb59b4bf2a03187999c047b9da38ecf86942e9095496546c0dedfe63ea8 SHA512 ca2c53854ce07c3ba5c6878ed069518497365cdfab8972406435d168eb3840b767dc49b9d0ecad79ee3160abccb73c494fbbbc3101b1e4f21acf34f31f379339
 DIST nvidia-xconfig-390.147.tar.bz2 107426 BLAKE2B c7004dab351581176a4e00fc099a12374cb29f3306769724c874a17600d6c11e79ac807fe218022d72ccf83ed33789d2378b0cdba35e5f94458e30631d725384 SHA512 a530c649ff7e75706ba37072ee58d64d4758348a45b953396a0e9d2608e1d7c3d299298cb50b1e8ee0bf2f6f8817bca64637b77e18aab0685a4edd630f18fb9a
 DIST nvidia-xconfig-470.103.01.tar.bz2 108687 BLAKE2B 2e5de637f9ba7bb516fd1a6801f8ee5be2934f99503bd20a62eaf87c0105d7624ef8de993614b1316ea8d203f9b7a6be07d3c9d5005d8a6306b7fc89cc0bb443 SHA512 abbabb3bf650395237759cbfaa39565893156ae87d07855bc96bfa0f46e10f34fd9efb628ef184f4dd525f80c63c62938b9661c9a4f3f5e1e5420ae1fdf26f0e
-DIST nvidia-xconfig-470.86.tar.bz2 108946 BLAKE2B 8711d46e18db89c94fe9986e3ea296504d1d4795be745f9ab9eac35e499220335fe882258bc52c1a9dedd7848c9715f8bf481e3690913204db71584b0913b85e SHA512 ea658567b7532ae3a33a1783ef224b7f57db34391280f529352cce042b8104ee8092b3585b7eef8cd5b295e4f8246e872d935c32edf746ca38651b2df21e7e6a
-DIST nvidia-xconfig-510.54.tar.bz2 109736 BLAKE2B 3951aab72cef525fc5b9d9794ca78ce72ab2257aec4fe7e07ad2975e92991d78080eeedd936d033803b57544480609206c6c8032ae636ca2290e69aa06f0cd72 SHA512 70f71a8be805819eb9cd7ceb51a6cf17408e45dc8d5d25b250b205c785b90459b263eb8340c708fd473eb2563753e3d8808138a2db7e21807d74fc718d787b0c
 DIST nvidia-xconfig-510.60.02.tar.gz 144024 BLAKE2B ce0b858bb41db589d04dd5bc19f0bd83a35e337fa00834b04cc215497dd1ca9906b3277378be51d6c124ff1b2574e0a3d5163d41e6c8e4f2b06f71ee15aeeb88 SHA512 77eeb06639d903f91d256ed2955ee813a8f70aa3336b98c9f1d7258523f2dc806c81ba5e26325f799722adcf8993f947113381bea40ee94d9f342475390eb3d7
-EBUILD nvidia-drivers-390.147.ebuild 13644 BLAKE2B 408ead02b8b870d70b17f5e5d39fdd897086eeb4015e684099eabe1c2b059ee05d7c88ca984607b847de0e2f8f3ca0275986fd79c2417702db296294e23fcb76 SHA512 85a092f261bca7e1c694b624dd0ac88db0399d40faf83227efd455062e2e4d7946bb368e8fa6bd506576b02866380571e9d56ca7491841c996e8cad303adcdf0
-EBUILD nvidia-drivers-470.103.01.ebuild 14205 BLAKE2B ca2da7b691413160b1608ea644e3fe7bcc95b83a71f8a5a01e202d805c4f9c6ab6d3fea69478286538362f33fbe2bee4715aea464c0d4e6cb02b66a0095ed746 SHA512 a4e8cf597900c7c9e4abf125e793e62a98d2d9f0f171180a980f1166bede22816fdd5a54eb4afec460a18dc5461ae6afc802b9a8f88289a16d2a5dc4de4b6308
-EBUILD nvidia-drivers-470.62.22.ebuild 14270 BLAKE2B e4b1d38bd438ff0675f657df4cd5b3e189199e9b7da8c375a630bd7b270e6f53c9a01c2d9f26556e3252901d96ed0a0728bc795e4b164db5a6878deaa695e997 SHA512 649e6391a0f7e962e7b70c0f778d12edf9ff7b70ac6b69e9c0811b4b0463b7e0e5ae1acbfb58489811df9845a11b19fc438806fcc6fe2b51f3535b6d116063eb
-EBUILD nvidia-drivers-510.54.ebuild 14635 BLAKE2B 65ab10fa4f1e15cc0402db7a170f403502b5307af4d90d305d10de3ae4409ff1419ea5c9643bd9c3f0d8b4b99ecbe196b857c0578d4da500dfd09b02492db4c1 SHA512 e426e117095fe51e5c8dbd8567e71a4955359bfaa06d3b799ba83030faa1575d16b85f0c03974a0d40e343364c82bafdbb29d2932d866c2e7c5e8d4ac52d5b3c
-EBUILD nvidia-drivers-510.60.02.ebuild 14693 BLAKE2B a1e0cdf84907ae68ac6839cbf53b8aeead4975b3c408bf0c20f73df9f55183fa80bebd41d39119ada923bd8116d5fa7921a1466eb1193dc5760b03927b0da3c1 SHA512 d1c6bb5c7e56a0fd5faf335dddf5e9905319d97a54e6bc2f7e544ee8ee31ac8a190b62129ffcf3b6d2d4ce95d398aab85203786fcb706515a4ae607745a0a540
-MISC metadata.xml 1006 BLAKE2B 1dc4f01e5eae548e70fb0ef6f816910ae0d282c7a97e552de62354bef162895d60f87dc21306523e530325b55b646b1d4c16182a710c5bb01389521c36e408f4 SHA512 5db62ce94374226c20e67aa89c61c83b581affb7383b082076db69349d0a76aeca806593072d1ae2a9ac01d34955c826dd8145081988adee4069aadae654aff9
+EBUILD nvidia-drivers-390.147.ebuild 13645 BLAKE2B 4fa43339a057c84434f28d49999c4666401ae2a0b4ef10e9917601a93da82d471792ad17c6c29253a63ebcdfb287521e466211c0db744a76dd48eae4062de889 SHA512 f7dfcbb83d86ed3e05aeac131b0617a3f67493fa2b5789ff7a23fa6c66b5adfb5dbfa64fd9ee385b77fbb81ff1e05e0c750d8c5c362e2e67d74698de83adccc3
+EBUILD nvidia-drivers-470.103.01.ebuild 14206 BLAKE2B 3e24ba36a72c36c4e33560e2901a965027d326082f82db0611d494e46ac36f0db1fd99a3fb758a4e8e8cd5c58be73f38bceb6ef5a2222cf7d85758fe65e36216 SHA512 5119e2661055e7b07b78a4eaa95d55b026e33e4c9577307c0e1da1620b1cd1a72faf30bab7df5e0f873e72254ea54bd793a1e0f9559c7bb05d4eed042628ea3d
+EBUILD nvidia-drivers-470.62.26.ebuild 14239 BLAKE2B 3ba9eb4114301a2ecd6e9569e7ca5e6aaef682dde4d3afb36ca601dec84f67b1e13fa3344d35a3eb0d9127b229f21eee30f5dad9c944cd9368646334d309ae59 SHA512 d77cc23914644c63bee985a9deb9f1b308d284fd545e5df191a8cb5a9d11ee16b3efdb309d659b64dc41bb07e7cd0af7554d749440c3fb68250cb2a8d012dcaf
+EBUILD nvidia-drivers-510.60.02.ebuild 14694 BLAKE2B 37d3ba9eab15fa3b1a7802cf09fbfc0a1f894e44c80fa6dbda5f99bc00951db0dec4a8f704b9291caaddd3551e80db1eba4aa04599e0898589f1b5fdbefe19ab SHA512 c368c11032a52eb1693c291fb2d238d24500cb86d5eafbd38e3434a0663e3e45388755a4244e7b2fad0c350c0b51e64ba5997ed8c54e93420da51d9d8bbb0646
+MISC metadata.xml 1116 BLAKE2B 479c5a58e636b0e3f6600575dce8d4fddfc69e74a0a1e0859a50b829b3781e8a24a687d6d740feeb8e291d2d28d6575490cc1f9733c90cb6cb9a36bd2d47be8f SHA512 1c5c91d847b051b120a5e5faea974b99a18b19ab472ab84b9d6e35c0e1b1a7975e9f35317dc016b19c80d7b6256a1ce07b78132fa0de651d35aad28b91d68b99
diff --git a/x11-drivers/nvidia-drivers/metadata.xml b/x11-drivers/nvidia-drivers/metadata.xml
index ed2291926c60..564715704a61 100644
--- a/x11-drivers/nvidia-drivers/metadata.xml
+++ b/x11-drivers/nvidia-drivers/metadata.xml
@@ -12,6 +12,7 @@
 	<use>
 		<flag name="driver">Install kernel driver modules</flag>
 		<flag name="persistenced">Install the persistence daemon for keeping devices state when unused</flag>
+		<flag name="static-libs">Install the XNVCtrl static library for accessing sensors and other features</flag>
 		<flag name="tools">Install additional tools such as nvidia-settings</flag>
 	</use>
 	<upstream>
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-390.147.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-390.147.ebuild
index 855c691be4ae..6f78688c0c24 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-390.147.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-390.147.ebuild
@@ -23,7 +23,7 @@ S="${WORKDIR}"
 LICENSE="NVIDIA-r2 BSD BSD-2 GPL-2 MIT"
 SLOT="0/${PV%%.*}"
 KEYWORDS="-* amd64 x86"
-IUSE="+X abi_x86_32 abi_x86_64 +driver persistenced static-libs +tools"
+IUSE="+X abi_x86_32 abi_x86_64 +driver persistenced +static-libs +tools"
 
 COMMON_DEPEND="
 	acct-group/video
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-470.103.01.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-470.103.01.ebuild
index 337778712041..c72d3a22a87d 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-470.103.01.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-470.103.01.ebuild
@@ -22,7 +22,7 @@ S="${WORKDIR}"
 LICENSE="NVIDIA-r2 BSD BSD-2 GPL-2 MIT ZLIB curl openssl"
 SLOT="0/${PV%%.*}"
 KEYWORDS="-* amd64"
-IUSE="+X abi_x86_32 abi_x86_64 +driver persistenced static-libs +tools wayland"
+IUSE="+X abi_x86_32 abi_x86_64 +driver persistenced +static-libs +tools wayland"
 
 COMMON_DEPEND="
 	acct-group/video
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-470.62.22.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-470.62.26.ebuild
index 72fac388500d..3b539a6e7020 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-470.62.22.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-470.62.26.ebuild
@@ -1,21 +1,20 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 MODULES_OPTIONAL_USE="driver"
 inherit desktop flag-o-matic linux-mod multilib readme.gentoo-r1 \
 	systemd toolchain-funcs unpacker
 
 NV_KERNEL_MAX="5.15"
-NV_URI="https://download.nvidia.com/XFree86/"
-NV_PIN="470.86"
+NV_PIN="470.103.01"
 
 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
-	$(printf "${NV_URI}%s/%s-${NV_PIN}.tar.bz2 " \
+	$(printf "https://download.nvidia.com/XFree86/%s/%s-${NV_PIN}.tar.bz2 " \
 		nvidia-{installer,modprobe,persistenced,settings,xconfig}{,})"
 # nvidia-installer is unused but here for GPL-2's "distribute sources"
 S="${WORKDIR}"
@@ -23,7 +22,7 @@ S="${WORKDIR}"
 LICENSE="NVIDIA-r2 BSD BSD-2 GPL-2 MIT ZLIB curl openssl"
 SLOT="0/vulkan"
 KEYWORDS="-* ~amd64"
-IUSE="+X abi_x86_32 abi_x86_64 +driver persistenced static-libs +tools wayland"
+IUSE="+X abi_x86_32 abi_x86_64 +driver persistenced +static-libs +tools wayland"
 
 COMMON_DEPEND="
 	acct-group/video
@@ -213,18 +212,18 @@ src_install() {
 
 	local skip_files=(
 		# nvidia_icd/layers(vulkan): skip with -X too as it uses libGLX_nvidia
-		$(usex X '' '
+		$(usev !X "
 			libGLX_nvidia libglxserver_nvidia
 			libnvidia-ifr
-			nvidia_icd.json nvidia_layers.json')
-		$(usex wayland '' 'libnvidia-vulkan-producer')
+			nvidia_icd.json nvidia_layers.json")
+		$(usev !wayland libnvidia-vulkan-producer)
 		libGLX_indirect # non-glvnd unused fallback
 		libnvidia-gtk nvidia-{settings,xconfig} # built from source
 		libnvidia-egl-wayland 10_nvidia_wayland # gui-libs/egl-wayland
 	)
 	local skip_modules=(
-		$(usex X '' 'nvfbc vdpau xdriver')
-		$(usex driver '' 'gsp')
+		$(usev !X "nvfbc vdpau xdriver")
+		$(usev !driver gsp)
 		installer nvpd # handled separately / built from source
 	)
 	local skip_types=(
@@ -244,7 +243,7 @@ src_install() {
 	local DOC_CONTENTS="\
 Trusted users should be in the 'video' group to use NVIDIA devices.
 You can add yourself by using: gpasswd -a my-user video\
-$(usex driver "
+$(usev driver "
 
 Like all out-of-tree kernel modules, it is necessary to rebuild
 ${PN} after upgrading or rebuilding the Linux kernel
@@ -258,8 +257,8 @@ ensure \`eselect kernel list\` points to the kernel that will be
 booted before building and preferably reboot after upgrading
 ${PN} (the ebuild will emit a warning if mismatching).
 
-See '${EPREFIX}/etc/modprobe.d/nvidia.conf' for modules options." '')\
-$(use amd64 && usex abi_x86_32 '' "
+See '${EPREFIX}/etc/modprobe.d/nvidia.conf' for modules options.")\
+$(use amd64 && usev !abi_x86_32 "
 
 Note that without USE=abi_x86_32 on ${PN}, 32bit applications
 (typically using wine / steam) will not be able to use GPU acceleration.")
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-510.54.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-510.54.ebuild
deleted file mode 100644
index 409ecc83c734..000000000000
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-510.54.ebuild
+++ /dev/null
@@ -1,457 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MODULES_OPTIONAL_USE="driver"
-inherit desktop flag-o-matic linux-mod multilib readme.gentoo-r1 \
-	systemd toolchain-funcs unpacker
-
-NV_KERNEL_MAX="5.17"
-NV_URI="https://download.nvidia.com/XFree86/"
-
-DESCRIPTION="NVIDIA Accelerated Graphics Driver"
-HOMEPAGE="https://www.nvidia.com/download/index.aspx"
-SRC_URI="
-	amd64? ( ${NV_URI}Linux-x86_64/${PV}/NVIDIA-Linux-x86_64-${PV}.run )
-	arm64? ( ${NV_URI}Linux-aarch64/${PV}/NVIDIA-Linux-aarch64-${PV}.run )
-	$(printf "${NV_URI}%s/%s-${PV}.tar.bz2 " \
-		nvidia-{installer,modprobe,persistenced,settings,xconfig}{,})"
-# 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"
-SLOT="0/${PV%%.*}"
-KEYWORDS="-* ~amd64 ~arm64"
-IUSE="+X abi_x86_32 abi_x86_64 +driver persistenced static-libs +tools wayland"
-
-COMMON_DEPEND="
-	acct-group/video
-	sys-libs/glibc
-	X? ( x11-libs/libpciaccess )
-	persistenced? (
-		acct-user/nvpd
-		net-libs/libtirpc:=
-	)
-	tools? (
-		dev-libs/atk
-		dev-libs/glib:2
-		dev-libs/jansson:=
-		media-libs/harfbuzz:=
-		x11-libs/cairo
-		x11-libs/gdk-pixbuf:2
-		x11-libs/gtk+:3
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXxf86vm
-		x11-libs/pango
-	)"
-RDEPEND="
-	${COMMON_DEPEND}
-	X? (
-		media-libs/libglvnd[X,abi_x86_32(-)?]
-		x11-libs/libX11[abi_x86_32(-)?]
-		x11-libs/libXext[abi_x86_32(-)?]
-	)
-	wayland? (
-		gui-libs/egl-gbm
-		>=gui-libs/egl-wayland-1.1.7-r1
-		media-libs/libglvnd
-	)"
-DEPEND="
-	${COMMON_DEPEND}
-	static-libs? (
-		x11-libs/libX11
-		x11-libs/libXext
-	)
-	tools? (
-		media-libs/libglvnd
-		sys-apps/dbus
-		x11-base/xorg-proto
-		x11-libs/libXrandr
-		x11-libs/libXv
-		x11-libs/libvdpau
-	)"
-BDEPEND="
-	sys-devel/m4
-	virtual/pkgconfig"
-
-QA_PREBUILT="lib/firmware/* opt/bin/* usr/lib*"
-
-PATCHES=(
-	"${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
-)
-
-pkg_setup() {
-	use driver || return
-
-	local CONFIG_CHECK="
-		PROC_FS
-		~DRM_KMS_HELPER
-		~SYSVIPC
-		~!LOCKDEP
-		~!SLUB_DEBUG_ON
-		!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."
-
-	use amd64 && kernel_is -ge 5 8 && CONFIG_CHECK+=" X86_PAT" #817764
-
-	MODULE_NAMES="
-		nvidia(video:kernel)
-		nvidia-drm(video:kernel)
-		nvidia-modeset(video:kernel)
-		nvidia-peermem(video:kernel)
-		nvidia-uvm(video:kernel)"
-
-	linux-mod_pkg_setup
-
-	[[ ${MERGE_TYPE} == binary ]] && return
-
-	BUILD_PARAMS='NV_VERBOSE=1 IGNORE_CC_MISMATCH=yes SYSSRC="${KV_DIR}" SYSOUT="${KV_OUT_DIR}"'
-	BUILD_TARGETS="modules"
-
-	if linux_chkconfig_present CC_IS_CLANG; then
-		ewarn "Warning: building ${PN} with a clang-built kernel is experimental"
-
-		BUILD_PARAMS+=' CC=${CHOST}-clang'
-		if linux_chkconfig_present LD_IS_LLD; then
-			BUILD_PARAMS+=' LD=ld.lld'
-			if linux_chkconfig_present LTO_CLANG_THIN; then
-				# kernel enables cache by default leading to sandbox violations
-				BUILD_PARAMS+=' ldflags-y=--thinlto-cache-dir= LDFLAGS_MODULE=--thinlto-cache-dir='
-			fi
-		fi
-	fi
-
-	if kernel_is -gt ${NV_KERNEL_MAX/./ }; then
-		ewarn "Kernel ${KV_MAJOR}.${KV_MINOR} is either known to break this version of ${PN}"
-		ewarn "or was not tested with it. It is recommended to use one of:"
-		ewarn "  <=sys-kernel/gentoo-kernel-${NV_KERNEL_MAX}.x"
-		ewarn "  <=sys-kernel/gentoo-sources-${NV_KERNEL_MAX}.x"
-		ewarn "You are free to try or use /etc/portage/patches, but support will"
-		ewarn "not be given and issues wait until NVIDIA releases a fixed version."
-		ewarn
-		ewarn "Do _not_ file a bug report if run into issues."
-		ewarn
-	fi
-}
-
-src_prepare() {
-	# make patches usable across versions
-	rm nvidia-modprobe && mv nvidia-modprobe{-${PV},} || die
-	rm nvidia-persistenced && mv nvidia-persistenced{-${PV},} || die
-	rm nvidia-settings && mv nvidia-settings{-${PV},} || die
-	rm nvidia-xconfig && mv nvidia-xconfig{-${PV},} || die
-
-	default
-
-	# prevent detection of incomplete kernel DRM support (bug #603818)
-	sed 's/defined(CONFIG_DRM/defined(CONFIG_DRM_KMS_HELPER/g' \
-		-i kernel/conftest.sh || die
-
-	# adjust service files
-	sed 's/__USER__/nvpd/' \
-		nvidia-persistenced/init/systemd/nvidia-persistenced.service.template \
-		> "${T}"/nvidia-persistenced.service || die
-	use !amd64 || sed -i "s|/usr|${EPREFIX}/opt|" systemd/system/nvidia-powerd.service || die
-
-	# enable nvidia-drm.modeset=1 by default with USE=wayland
-	cp "${FILESDIR}"/nvidia-470.conf "${T}"/nvidia.conf || die
-	use !wayland || sed -i '/^#.*modeset=1$/s/^#//' "${T}"/nvidia.conf || die
-}
-
-src_compile() {
-	tc-export AR CC LD OBJCOPY
-
-	NV_ARGS=(
-		PREFIX="${EPREFIX}"/usr
-		HOST_CC="$(tc-getBUILD_CC)"
-		HOST_LD="$(tc-getBUILD_LD)"
-		NV_USE_BUNDLED_LIBJANSSON=0
-		NV_VERBOSE=1 DO_STRIP= MANPAGE_GZIP= OUTPUTDIR=out
-	)
-
-	use driver && linux-mod_src_compile
-
-	emake "${NV_ARGS[@]}" -C nvidia-modprobe
-	use persistenced && emake "${NV_ARGS[@]}" -C nvidia-persistenced
-	use X && emake "${NV_ARGS[@]}" -C nvidia-xconfig
-
-	if use tools; then
-		# cflags: avoid noisy logs, only use here and set first to let override
-		# ldflags: abi currently needed if LD=ld.lld
-		CFLAGS="-Wno-deprecated-declarations ${CFLAGS}" \
-			RAW_LDFLAGS="$(get_abi_LDFLAGS) $(raw-ldflags)" \
-			emake "${NV_ARGS[@]}" -C nvidia-settings
-	elif use static-libs; then
-		emake "${NV_ARGS[@]}" -C nvidia-settings/src out/libXNVCtrl.a
-	fi
-}
-
-src_install() {
-	local libdir=$(get_libdir) libdir32=$(ABI=x86 get_libdir)
-
-	NV_ARGS+=( DESTDIR="${D}" LIBDIR="${ED}"/usr/${libdir} )
-
-	local -A paths=(
-		[APPLICATION_PROFILE]=/usr/share/nvidia
-		[CUDA_ICD]=/etc/OpenCL/vendors
-		[EGL_EXTERNAL_PLATFORM_JSON]=/usr/share/egl/egl_external_platform.d
-		[FIRMWARE]=/lib/firmware/nvidia/${PV}
-		[GBM_BACKEND_LIB_SYMLINK]=/usr/${libdir}/gbm
-		[GLVND_EGL_ICD_JSON]=/usr/share/glvnd/egl_vendor.d
-		[VULKAN_ICD_JSON]=/usr/share/vulkan
-		[WINE_LIB]=/usr/${libdir}/nvidia/wine
-		[XORG_OUTPUTCLASS_CONFIG]=/usr/share/X11/xorg.conf.d
-
-		[GLX_MODULE_SHARED_LIB]=/usr/${libdir}/xorg/modules/extensions
-		[GLX_MODULE_SYMLINK]=/usr/${libdir}/xorg/modules
-		[XMODULE_SHARED_LIB]=/usr/${libdir}/xorg/modules
-	)
-
-	local skip_files=(
-		# nvidia_icd/layers(vulkan): skip with -X too as it uses libGLX_nvidia
-		$(usev !X "
-			libGLX_nvidia libglxserver_nvidia
-			nvidia_icd.json nvidia_layers.json")
-		$(usev !wayland libnvidia-vulkan-producer)
-		libGLX_indirect # non-glvnd unused fallback
-		libnvidia-gtk nvidia-{settings,xconfig} # built from source
-		libnvidia-egl-gbm 15_nvidia_gbm # gui-libs/egl-gbm
-		libnvidia-egl-wayland 10_nvidia_wayland # gui-libs/egl-wayland
-	)
-	local skip_modules=(
-		$(usev !X "nvfbc vdpau xdriver")
-		$(usev !driver gsp)
-		installer nvpd # handled separately / built from source
-	)
-	local skip_types=(
-		GLVND_LIB GLVND_SYMLINK EGL_CLIENT.\* GLX_CLIENT.\* # media-libs/libglvnd
-		OPENCL_WRAPPER.\* # virtual/opencl
-		DOCUMENTATION DOT_DESKTOP .\*_SRC DKMS_CONF SYSTEMD_UNIT # handled separately / unused
-	)
-
-	local DOCS=(
-		README.txt NVIDIA_Changelog supported-gpus/supported-gpus.json
-		nvidia-settings/doc/{FRAMELOCK,NV-CONTROL-API}.txt
-	)
-	local HTML_DOCS=( html/. )
-	einstalldocs
-
-	local DISABLE_AUTOFORMATTING=yes
-	local DOC_CONTENTS="\
-Trusted users should be in the 'video' group to use NVIDIA devices.
-You can add yourself by using: gpasswd -a my-user video\
-$(usev driver "
-
-Like all out-of-tree kernel modules, it is necessary to rebuild
-${PN} after upgrading or rebuilding the Linux kernel
-by for example running \`emerge @module-rebuild\`. Alternatively,
-if using a distribution kernel (sys-kernel/gentoo-kernel{,-bin}),
-this can be automated by setting USE=dist-kernel globally.
-
-Loaded kernel modules also must not mismatch with the installed
-${PN} version (excluding -r revision), meaning should
-ensure \`eselect kernel list\` points to the kernel that will be
-booted before building and preferably reboot after upgrading
-${PN} (the ebuild will emit a warning if mismatching).
-
-See '${EPREFIX}/etc/modprobe.d/nvidia.conf' for modules options.")\
-$(use amd64 && usev !abi_x86_32 "
-
-Note that without USE=abi_x86_32 on ${PN}, 32bit applications
-(typically using wine / steam) will not be able to use GPU acceleration.")
-
-For general information on using ${PN}, please see:
-https://wiki.gentoo.org/wiki/NVIDIA/nvidia-drivers"
-	readme.gentoo_create_doc
-
-	if use driver; then
-		linux-mod_src_install
-
-		insinto /etc/modprobe.d
-		doins "${T}"/nvidia.conf
-
-		# used for gpu verification with binpkgs (not kept, see pkg_preinst)
-		insinto /usr/share/nvidia
-		doins supported-gpus/supported-gpus.json
-	fi
-
-	emake "${NV_ARGS[@]}" -C nvidia-modprobe install
-	fowners :video /usr/bin/nvidia-modprobe #505092
-	fperms 4710 /usr/bin/nvidia-modprobe
-
-	if use persistenced; then
-		emake "${NV_ARGS[@]}" -C nvidia-persistenced install
-		newconfd "${FILESDIR}"/nvidia-persistenced.confd nvidia-persistenced
-		newinitd "${FILESDIR}"/nvidia-persistenced.initd nvidia-persistenced
-		systemd_dounit "${T}"/nvidia-persistenced.service
-	fi
-
-	if use tools; then
-		emake "${NV_ARGS[@]}" -C nvidia-settings install
-
-		doicon nvidia-settings/doc/nvidia-settings.png
-		domenu nvidia-settings/doc/nvidia-settings.desktop
-
-		exeinto /etc/X11/xinit/xinitrc.d
-		newexe "${FILESDIR}"/95-nvidia-settings-r1 95-nvidia-settings
-	fi
-
-	if use static-libs; then
-		dolib.a nvidia-settings/src/out/libXNVCtrl.a
-
-		insinto /usr/include/NVCtrl
-		doins nvidia-settings/src/libXNVCtrl/NVCtrl{Lib,}.h
-	fi
-
-	use X && emake "${NV_ARGS[@]}" -C nvidia-xconfig install
-
-	# mimic nvidia-installer by reading .manifest to install files
-	# 0:file 1:perms 2:type 3+:subtype/arguments -:module
-	local m into
-	while IFS=' ' read -ra m; do
-		! [[ ${#m[@]} -ge 2 && ${m[-1]} =~ MODULE: ]] ||
-			eval '[[ " ${m[0]##*/}" =~ ^(\ '${skip_files[*]/%/.*|\\}' )$ ]]' ||
-			eval '[[ " ${m[2]}" =~ ^(\ '${skip_types[*]/%/|\\}' )$ ]]' ||
-			has ${m[-1]#MODULE:} "${skip_modules[@]}" && continue
-
-		case ${m[2]} in
-			MANPAGE)
-				gzip -dc ${m[0]} | newman - ${m[0]%.gz}; assert
-				continue
-			;;
-			GBM_BACKEND_LIB_SYMLINK) m[4]=../${m[4]};; # missing ../
-			VDPAU_SYMLINK) m[4]=vdpau/; m[5]=${m[5]#vdpau/};; # .so to vdpau/
-		esac
-
-		if [[ -v paths[${m[2]}] ]]; then
-			into=${paths[${m[2]}]}
-		elif [[ ${m[2]} =~ _BINARY$ ]]; then
-			into=/opt/bin
-		elif [[ ${m[3]} == COMPAT32 ]]; then
-			use abi_x86_32 || continue
-			into=/usr/${libdir32}
-		elif [[ ${m[2]} =~ _LIB$|_SYMLINK$ ]]; then
-			into=/usr/${libdir}
-		else
-			die "No known installation path for ${m[0]}"
-		fi
-		[[ ${m[3]: -2} == ?/ ]] && into+=/${m[3]%/}
-		[[ ${m[4]: -2} == ?/ ]] && into+=/${m[4]%/}
-
-		if [[ ${m[2]} =~ _SYMLINK$ ]]; then
-			[[ ${m[4]: -1} == / ]] && m[4]=${m[5]}
-			dosym ${m[4]} ${into}/${m[0]}
-			continue
-		fi
-		[[ ${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]}
-		insinto ${into}
-		doins ${m[0]}
-	done < .manifest || die
-
-	# MODULE:installer non-skipped extras
-	exeinto /lib/systemd/system-sleep
-	doexe systemd/system-sleep/nvidia
-	dobin systemd/nvidia-sleep.sh
-	systemd_dounit systemd/system/nvidia-{hibernate,resume,suspend}.service
-
-	dobin nvidia-bug-report.sh
-
-	# MODULE:powerd extras
-	if use amd64; then
-		systemd_dounit systemd/system/nvidia-powerd.service
-
-		insinto /usr/share/dbus-1/system.d
-		doins nvidia-dbus.conf
-	fi
-}
-
-pkg_preinst() {
-	has_version "${CATEGORY}/${PN}[abi_x86_32]" && NV_HAD_ABI32=
-	has_version "${CATEGORY}/${PN}[wayland]" && NV_HAD_WAYLAND=
-
-	use driver || return
-	linux-mod_pkg_preinst
-
-	# set video group id based on live system (bug #491414)
-	local g=$(getent group video | cut -d: -f3)
-	[[ ${g} ]] || die "Failed to determine video group id"
-	sed -i "s/@VIDEOGID@/${g}/" "${ED}"/etc/modprobe.d/nvidia.conf || die
-
-	# try to find driver mismatches using temporary supported-gpus.json
-	for g in $(grep -l 0x10de /sys/bus/pci/devices/*/vendor 2>/dev/null); do
-		g=$(grep -io "\"devid\":\"$(<${g%vendor}device)\"[^}]*branch\":\"[0-9]*" \
-			"${ED}"/usr/share/nvidia/supported-gpus.json 2>/dev/null)
-		if [[ ${g} ]]; then
-			g=$((${g##*\"}+1))
-			if ver_test -ge ${g}; then
-				NV_LEGACY_MASK=">=${CATEGORY}/${PN}-${g}"
-				break
-			fi
-		fi
-	done
-	rm "${ED}"/usr/share/nvidia/supported-gpus.json || die
-}
-
-pkg_postinst() {
-	use driver && linux-mod_pkg_postinst
-
-	readme.gentoo_print_elog
-
-	if [[ -r /proc/driver/nvidia/version &&
-		$(</proc/driver/nvidia/version) != *"  ${PV}  "* ]]; then
-		ewarn "Currently loaded NVIDIA modules do not match the newly installed"
-		ewarn "libraries and may prevent launching GPU-accelerated applications."
-		use driver && ewarn "The easiest way to fix this is usually to reboot."
-	fi
-
-	if [[ $(</proc/cmdline) == *slub_debug=[!-]* ]]; then
-		ewarn "Detected that the current kernel command line is using 'slub_debug=',"
-		ewarn "this may lead to system instability/freezes with this version of"
-		ewarn "${PN}. Bug: https://bugs.gentoo.org/796329"
-	fi
-
-	if [[ -v NV_LEGACY_MASK ]]; then
-		ewarn
-		ewarn "***WARNING***"
-		ewarn
-		ewarn "You are installing a version of ${PN} known not to work"
-		ewarn "with a GPU of the current system. If unwanted, add the mask:"
-		if [[ -d ${EROOT}/etc/portage/package.mask ]]; then
-			ewarn "  echo '${NV_LEGACY_MASK}' > ${EROOT}/etc/portage/package.mask/${PN}"
-		else
-			ewarn "  echo '${NV_LEGACY_MASK}' >> ${EROOT}/etc/portage/package.mask"
-		fi
-		ewarn "...then downgrade to a legacy branch if possible. For details, see:"
-		ewarn "https://www.nvidia.com/object/IO_32667.html"
-	fi
-
-	if use !abi_x86_32 && [[ -v NV_HAD_ABI32 ]]; then
-		elog
-		elog "USE=abi_x86_32 is disabled, 32bit applications will not be able to"
-		elog "use nvidia-drivers for acceleration without it (e.g. commonly used"
-		elog "with app-emulation/wine-* or steam). Re-enable if needed."
-	fi
-
-	if use wayland && use driver && [[ ! -v NV_HAD_WAYLAND ]]; then
-		elog
-		elog "With USE=wayland, this version of ${PN} sets nvidia-drm.modeset=1"
-		elog "in '${EROOT}/etc/modprobe.d/nvidia.conf'. This feature is considered"
-		elog "experimental but is required for wayland."
-		elog
-		elog "If you experience issues, either disable wayland or edit nvidia.conf."
-		elog "Of note, may possibly cause issues with SLI and Reverse PRIME."
-	fi
-}
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-510.60.02.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-510.60.02.ebuild
index cc4ee152c12f..fbf63c3390ce 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-510.60.02.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-510.60.02.ebuild
@@ -22,7 +22,7 @@ S="${WORKDIR}"
 LICENSE="NVIDIA-r2 BSD BSD-2 GPL-2 MIT ZLIB curl openssl"
 SLOT="0/${PV%%.*}"
 KEYWORDS="-* ~amd64 ~arm64"
-IUSE="+X abi_x86_32 abi_x86_64 +driver persistenced static-libs +tools wayland"
+IUSE="+X abi_x86_32 abi_x86_64 +driver persistenced +static-libs +tools wayland"
 
 COMMON_DEPEND="
 	acct-group/video
diff --git a/x11-drivers/xf86-video-dummy/Manifest b/x11-drivers/xf86-video-dummy/Manifest
index f32219aa26f3..0429c198c0c2 100644
--- a/x11-drivers/xf86-video-dummy/Manifest
+++ b/x11-drivers/xf86-video-dummy/Manifest
@@ -1,3 +1,5 @@
 DIST xf86-video-dummy-0.3.8.tar.bz2 302353 BLAKE2B 1327db3aeec2ff7e3ff0876b25eace6fcdc7fc428967dee9f0b8ee4c22dd7904dcb47d5433bdc14ab56638225b2d33f3a26543dc9e6041c60af4135c1555f798 SHA512 f534113fd9987e44d2e0d0c53bd1b71be4ba69ec239ecec4aba8fcdcc10597722c54cbc01da38e0975ac7660e4e4028330e4cdd369e755c25ec059d2dfabad80
+DIST xf86-video-dummy-0.4.0.tar.xz 258452 BLAKE2B 8364a705bac5bc0bf2767be30b23a67753cb9232a58819c5b3ea3fa91769049e38cb04a5504b34e4aa5978f45a17617b999541333e3a1ee66d30892f281d7cc8 SHA512 1150a84c4f17215b9c579d8ce9399d547a01970bf7b5396653f14beb13a62deefe3008bf3ad6a2c5c0f46da4cbc0b840c18a7dff339e3b882d108183fa1d30d9
 EBUILD xf86-video-dummy-0.3.8.ebuild 475 BLAKE2B f2d8127e457dea06bd3dca38808cb80f597a85275572ce1806cad20f3b76dd3a00b5934576c88f8776d6d39f293ad38efbc38ece53370972c2b320071b0e2475 SHA512 68caf4e84367b2429af6f1b1ff30598fae369485db667a97ac2867289f2179927c4d6d645d05f25a1842539fa8eef650882b3e00cc0d93a9c7a1c5065b0cd250
+EBUILD xf86-video-dummy-0.4.0.ebuild 352 BLAKE2B 055b34fdbaf3d94dc144bf14b2ee20b011bae9e6be867754561ebe7da2e891b1f9138616cc3c88bca2a7b84c05184f4bb9a5320f4f39e0210d6b7d19ebb6cd04 SHA512 8dbb8299e13d76a73d5603644c74c916e4456aec54d0a5e11f3c9ffe0d4495ed7e02659aeade56ae1b9ac16a6d83f396236bc0e041353c0aaff5df0c9fdb514d
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-drivers/xf86-video-dummy/xf86-video-dummy-0.4.0.ebuild b/x11-drivers/xf86-video-dummy/xf86-video-dummy-0.4.0.ebuild
new file mode 100644
index 000000000000..5070928b2981
--- /dev/null
+++ b/x11-drivers/xf86-video-dummy/xf86-video-dummy-0.4.0.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+XORG_TARBALL_SUFFIX=xz
+inherit xorg-3
+
+DESCRIPTION="X.Org driver for dummy cards"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND=""
+DEPEND="x11-base/xorg-proto"