commit:     48948713f238a734ddc80071ddb60fa9e6d5a966
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Mon Feb  7 20:52:36 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon Feb  7 21:11:40 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48948713

x11-drivers/nvidia-drivers: drop vulnerable 470.94, 495.*

Users affected by bug #830482 (with unpatched Xorg) should
use stable 470.103.01 rather than vulnerable 495.44-r2.

Bug: https://bugs.gentoo.org/830482
Bug: https://bugs.gentoo.org/832867
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 x11-drivers/nvidia-drivers/Manifest                |  21 -
 .../nvidia-drivers/nvidia-drivers-470.94.ebuild    | 445 -------------------
 .../nvidia-drivers/nvidia-drivers-495.44-r2.ebuild | 493 ---------------------
 .../nvidia-drivers-495.46-r10.ebuild               | 462 -------------------
 4 files changed, 1421 deletions(-)

diff --git a/x11-drivers/nvidia-drivers/Manifest 
b/x11-drivers/nvidia-drivers/Manifest
index 687ee157f3a9..f45d7cc51628 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -1,55 +1,34 @@
 DIST NVIDIA-Linux-aarch64-460.91.03.run 111886330 BLAKE2B 
24ab316e216caa61f7edb4dbcb34541709d3229d495e6ead95e99db7403cddee03467ee28d007f0fa3c4f2fa267e1994533c90a7a67885e9e76d501ab0f8aaa5
 SHA512 
edcfd3b11afe625c8996cda488a8de2e0e40eb4b95c8cf0ead9e1226d7cee8140a83c247d745ceefe997a39cfcf3e3f9bde575d97aa39090f97f88817d89cb28
 DIST NVIDIA-Linux-aarch64-470.103.01.run 184497677 BLAKE2B 
13ad81da2fb8d887187b2685625c831b74db91729ff82553336c6d266312783c4a01675659ebfe4ad6d011c53d871e28e7522f948ef66c258dafea0e33794acd
 SHA512 
5a9881dd9204b81e78c2a5f29bb95682c3c4b334e520030c368f27e795995df0637a6265b1ca74197026d0de02a5f4e0cf7bb91fb6f2dcbbbb7607be9fcb7647
-DIST NVIDIA-Linux-aarch64-470.94.run 183639436 BLAKE2B 
a2e7af432e9d6a65e44c6b0af12b6d01048944c879aadb13c17ce13834d463ddbf3bda7029b16986fb5212f4d18f0c96010cb22ef014b5f2af0523e746cc2ca3
 SHA512 
e27b04ec5025b5ce1d6cd78306f55f5699032fc350f78fb7a731a82ec4691ba0764fd3e36d8738d38f17cafd93988c7542d55c370e219bdbab6d0e7eb2f9a5fd
-DIST NVIDIA-Linux-aarch64-495.44.run 210477242 BLAKE2B 
8fb5419be19ab4feab158fb43f142fdc1471b756f7d43afac1c9e787465a991e291cac725dda266b2f454022aea7cb3e249c6f132963a89c97564ef378e876b4
 SHA512 
4d2ed853bc3d7812652f3e677ca1cf56f1b2563bc0a43cee2cf4544f8d3b30d8f29ccc994fc8f95e2c8b40b04efdca066b616983bf2e2fb9247d2d9a8503d4ea
-DIST NVIDIA-Linux-aarch64-495.46.run 211122869 BLAKE2B 
2193f9de186b727af4f22999f6890c1b06a89e88308d5f0cc317b5b1088c62313b34efb4cbd782bc9565083191c443e5cd10b6c8cf89a988153c1abff4e9b1ec
 SHA512 
c830482fa75e841f33a32bd28e842892613968e3e23928f1e1fa45672ef2349fbd33af59341cc4e789f702163b17b10a861b071b42f90e037050769c83ae53b9
 DIST NVIDIA-Linux-aarch64-510.47.03.run 210713072 BLAKE2B 
ee775c9022c76adcb8e39661830d832b12ee53e5b6a33c9b98bf1532ef26bb49a2bb9e09bdd869517e8dab712af162e0263c3989b7023b4c34e27eb135fd9136
 SHA512 
1079910394542a123965f09a741a3690f68a96a8251995a6ca66c47711acbf93cef79f98110595667e19f895e024dc6fb6f57c470f80fe8075ffea74cfe05f94
 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-460.91.03.run 178201292 BLAKE2B 
4d407b7bb3a99ab71c62c3cd18dc3549c98a24e7af28276e6e6a21dd33efcab017fed3f782f6dfb060c4437cd718f19c2f9900de367cc47bf19fa2718a18ad55
 SHA512 
4ac11130fe5a8f1c26f459e9c19660b3ff6f23011e9f77b09ca948fc42609e523ecea70d3bf6def50a75b4a3079ab280018753fb6e53875d9bb8093a033e3b70
 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-470.94.run 272262854 BLAKE2B 
23785ec9d434f48793547a3a0d8708c0928b1926f9d8973d872f1745291095cba494310b2fa25a62f3d29bfb4f660fa1ef78d49da651d8a094a23d64ca110e8a
 SHA512 
b70542af04691da623b494d49fcbd58c58b83388fdb1c7ea6dcc779755b595444a324f613840ccbba0d9029456668376fe6049a3e4496c6054efbbf1e0a59c0f
-DIST NVIDIA-Linux-x86_64-495.44.run 282259831 BLAKE2B 
ca11406a5b1b25d9691ec61d4125457c22438b8f0af0651043235f72ee75c4b264cfde7b04840bbec15c22bc5eb657a46326b49941e6c776a8990430cf052818
 SHA512 
bc9054e6028ba172906e6eb9a0b8f5cfc3ae74d57f3e95e0f9057879e3af07a4b19479e80d81e948872bc47bbd674f77f5f81d4debd2e2c3ce45058cd9211802
-DIST NVIDIA-Linux-x86_64-495.46.run 280886811 BLAKE2B 
156917245f37a5da9121cf570616d6367eec66998a50136f1db0c521fc725e68db27acd5741a9fc3e3d502a2c7e90ccde68a7e56346cb8f5fc65ea419c2f0576
 SHA512 
859548fa81478acb994b40434fc85824976b1f83bc15846290898854db84ea3c6550586a1d7e89ff3afa248310d2bcf4d2d52d5d8e91cf74e3f7e4108a7002ad
 DIST NVIDIA-Linux-x86_64-510.47.03.run 328823536 BLAKE2B 
1693b505ce019074394e508dac14c2b5e281f3f871ca84db180fbfebc96c04b2f51feb8fbe0358d4cc2148c14c37c1b603737bf27b794d9d23b2c49a2f36f956
 SHA512 
7488b1ae99acfa4cd6f8fd071a0e7652dcc9e499ff587d1dfdaf5d202a5b9daa43ed014876d2b2c9caf7f7c531ec380540f30833bb9790395cf159d177f2e803
 DIST nvidia-installer-390.147.tar.bz2 150157 BLAKE2B 
3bf5317aaa3bdb0e6dc3b3e21ad3dbacf6dc782a643b0fa9badf354361891ab25660b57dd408e346f219d469af317a4851937e1cb77ffe59a39e9d98a92f3a40
 SHA512 
24bd8a2959062551abf2ea039ac95eba224d58c175f59f1386a6d43459ad43b2bddf17f00b53c1c71c45eca3b7a2281dcf05cc65030f6f8bed16d0f0b9f9c282
 DIST nvidia-installer-460.91.03.tar.bz2 144463 BLAKE2B 
b8c381158f614331fbfd04dcfdd7227fcb3eb16cbe4e3cbcbb34ba6af2370b05ebd72dc46375b2099b950817e6a0565c418e62b6364f1d7269f78c1dce5f5535
 SHA512 
10c873597202a1d8aa0dc4629b1e64f8c1f65a68c91f6babe312cf9fabbb9257b77d03a3917c0f4f5d6994e90cf58c6c7d9a802a675ea3ef60b571c9b7abc391
 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-470.94.tar.gz 201064 BLAKE2B 
e8cdace018638567094e377731eaa324a2650c1ecded96f71dc9c0381112b300fa24b1c07d3051944483533fbe0605265fc963b8fd9f0fbf00a4089a9d68cffe
 SHA512 
31b304aa2e94c716c75afbf7b5ec7d04c51958bb7ef7ced1fbad8bb8d208a93428b8318628bb1c5ee44f49476a5fee8a13137fc48eb9c2ae79207f1e79850844
-DIST nvidia-installer-495.44.tar.bz2 147036 BLAKE2B 
a340d1629ab133d072cd7d673a474ec834c2cd71f35b2e98d837deaa6535a784c93978ec484c5060ff28cf845d5cffa08b368b3b8b18a7ddabb4a7cb1c7a0ad0
 SHA512 
9f9f592b2d73515a484720eb421774a28b39af0ba3fbea127d1987533ed0f42104f640da6211f9eee63cc1063aad68dddfe8d378e3ef590c7f77d54e56bbb8bd
-DIST nvidia-installer-495.46.tar.gz 202462 BLAKE2B 
2ad427e0c4df3ba1ef2faa7b92c4a21465961b6fb6d5f6f1997a8d1039b35341789168f82c0b9397f57f1574cb97418b69823fe5b5d321188a841e7347bb0f8c
 SHA512 
c2fc5935e6736ea6e146a711ff05267ec42da6b1f7286589556a77f97fa02e30dacf098f9e23319ebf70808ae93275bdf3309740c6210a7d57636b483f11be74
 DIST nvidia-installer-510.47.03.tar.bz2 144264 BLAKE2B 
1c0f5b2840794252f6458b4db9d293da265508e0d165a0c04487e9efa8f727a4b08a5b6a7fc36ded4efba18dd9f71a2b9a8bf13fc81914c63ba85d117da38139
 SHA512 
c91832d29e3b5f13bccc4d24533b5e8ffc7c71312fba1264332344b359c312a755c678b6ba76e6740aadbd532046822c73ae16a80b77b461a88bba4f863938fc
 DIST nvidia-modprobe-390.147.tar.bz2 35340 BLAKE2B 
acb49dea0c5d9d802b7c2f9f8127106bd6f9e2aaa7875941ca94c1d81377411e8d9c53357e7f9aa0170c87e349f6379a45391965e7897d0158951a4c0056a835
 SHA512 
a731fc990557f40fdd0fba45bcfeb99c315d0579a2d2f49bf6f84c55c91f52a9e65c358bc5a3882483ab8e9d66b546de31adcaba46a494bfc0836a0690c3d0db
 DIST nvidia-modprobe-460.91.03.tar.bz2 38144 BLAKE2B 
660b381f8757fe8862f7c4a971e44d3124afa3783d52af29543b8ed67486ba03b76c0b5d8dfadc5da8fdcc2c8799ec5f9c3016fd58e9c209fcc3ae897fb0436b
 SHA512 
aa47a9c0744b8e11e87d2c0f300b13fee435cd5225444be7fb0b6bea49af33811dfa723a9ccfe904c7de2b5a8da36b707c1024eb495e3f0b587e3231a4bc4f39
 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-470.94.tar.gz 43366 BLAKE2B 
b8e5fa22ab229eab0107f89b4f8f19e489b19e83044909e637fb1a2ea2692be55f8c5b264d89f9acce0617d8f0e37d02686be472e3f8c246b7545a906614990f
 SHA512 
6940ee2ac676cb9da2c7dabff9c23ca3f7e4dff9b7010fb442f56e9f9fe0bccde5b777e1f7f492c72d85b1a58bd142492b95aa9fb177a36b61c6142a051d888a
-DIST nvidia-modprobe-495.44.tar.bz2 38377 BLAKE2B 
f1695c778c25d41795b1bda43df68a1dea9c3d16fc00acebe5948aeffd8aef174cb864d85260565fad8ac8c454ad3ad0cfb76529d9f88c3f10547de11492c61c
 SHA512 
cdf7331609ce2a400f2b0e987bdbd2450a07e837971ac94b5ab746874259e6e7a4bff5eb8b9518f786365af74e8650f1c5ddfb745f867a6777825f550a6a74c0
-DIST nvidia-modprobe-495.46.tar.gz 43480 BLAKE2B 
32b6592ca1df822227adc9a05848e98b09cfbde676b152d432aaea43ba753ccd8451515b37e275ef58159c468502b7e6d8020ce82d140c63176cd2bbdc65d1aa
 SHA512 
1b6ba93ea72a6dbe345d360fc189ab3be038e2bf1bc93c8be2656aaaf0a81cd3a71aeefc244a71ad20db42a9e5f3145934a6c4cae70f0e8935d9891fe784676b
 DIST nvidia-modprobe-510.47.03.tar.bz2 39064 BLAKE2B 
6d8ce559474d5d7898af4274ead2d5c3846eda120e36ef6652de586bca6af7847b95c9fd40a9a935ada5fe452ef1b9ac1ec62f5ea9262faf241b6c20950cd5e3
 SHA512 
97166aa4ef1757ba60a75257f64f86cee1b50f4d4ee51bc38efdb75cdd99602fae1efe926de505ee1015fcffc1dab5c6830cf956ecf16d6a1c37f49e93677a8e
 DIST nvidia-persistenced-390.147.tar.bz2 48712 BLAKE2B 
d8b2587c8b4374dcff198d8aae1468d30197d9b097badddbec34f0c41e3c4ab4f27b568f152a4c7a4416b3ee15194ae07442c45c50d086a6f4e7e69a5c54f42d
 SHA512 
5877f7b0a40d54b1ca746b2fa1f1270d1ff605068dcf944e078d4cb547bc6f79c08ea9d4fbe3e94e8cd528b9721a89147d43ac849df71b2dc1d903fe1439c4a5
 DIST nvidia-persistenced-460.91.03.tar.bz2 46160 BLAKE2B 
f7f34cc12de2a4d69184c60caf7a8e8025b58005ade0a3e9a1a0e95856055f7211a710a1145d674d8a2e97cf70a43175cbc5c9a5dabc49ce378623be1720c6ea
 SHA512 
c3ff5875353c264cb224b3f512ff8308bf1b0b95282e34500d88da2574719c3c514581e5900841b089c2e6f0fe29198fa06a11668de8e21c59f9f96244a74757
 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-470.94.tar.gz 53991 BLAKE2B 
461fd202d58036f205ef4ad80a5584e7081f4bfd8ee2637764dca2965e00a7488661b6247f6eb3a1980c2e23c39227a545545dc08381e52662bb8411e593b76a
 SHA512 
998aa4c6ff9966fce893c5b6cdffce93703fec2c48382e13411a1d8c64eb9eacf567afe87d8bdd0b5d33426a73be1f01e3f84a3bda0f71ad855c221411297c2d
-DIST nvidia-persistenced-495.44.tar.bz2 46259 BLAKE2B 
ed34bb3b82a24fe7e651eaf671469988f32a9fa4782f0a8d8f08499b85cee596996611f08fe8e26a295a3073ae6a5bd59c44a1d9c6db41138339656e932aa7df
 SHA512 
d295caaad65336495e22ebf890f6a1d323b9fabd0fb4900c8d4e37044f472836327743fceb6d433bd1ef61dffe8a84a655ddf81b2eff085c7e913105a05cb47e
-DIST nvidia-persistenced-495.46.tar.gz 53692 BLAKE2B 
0c449f2a870d3e29d7119250ecab962dca55a81f6cbbd110be05a7b8a739ca1f130ba255712425fe7f3d770a83f819c40c2464df2ca4c03b94df075d33f034b5
 SHA512 
402db637fff090dfea2bf26d44060297e21f53c23bb2abdd22e945f90d2fb5141621fa73b732257bb2fab488522b669af9b03c821467dc23f6b9f4dc00998917
 DIST nvidia-persistenced-510.47.03.tar.bz2 47100 BLAKE2B 
89a5ea2be6787868224134129b5f97c37d7cb0d17fb2bc4c49ce5dea0fac3c7555f08c0f850bc0487208d2b8d570406526812c01fbdb7bed7cb4669dd31e3f0e
 SHA512 
00e65a042bd590a119b0952ea587475ca3fc6cf1baacf7a97f813ab343800145cb8ce4baf809d7f4c955477cebdf98b300364501df67f625b5143719399ea0a8
 DIST nvidia-settings-390.147.tar.bz2 1109104 BLAKE2B 
b0a2e0c832901db65f41e54d66d61abd9afbc528d1e8095e314d7ce5c1bf73c7bc8cc1857d909d9eab2e3b9ee97831c15c52f2725a8c9f84e00416c4e3db23d1
 SHA512 
67c30df042b9a9b923f05a26bd2e0bd85487fab0fe2c730ac48025561d652ff0f7455a56cc7951ed8ba2a300e019fa0e52fcd912b644d0d88fd2ac0e63de2327
 DIST nvidia-settings-460.91.03.tar.bz2 1061093 BLAKE2B 
13f1da07eda3a0e7e96ac69091e4a34fcd75a8f459a4db3840c64272dd54080694c4df3b7c326884ff032eb1b8708b5e19107b112afee2c80eed242281292b02
 SHA512 
172ea3366065aa30e71a5a47b31366d076477b8801a8a37e0d76972406e69c8872daa80011ee020960bc5e00163c4e9e5f63aa4f0dc726065671d76851b4ad71
 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-470.94.tar.gz 1235132 BLAKE2B 
7f46d7225b18c2e287d1d6aa72408dcfbd2a6afacb02679c6d229de02518aa3d584a1987841914079a23b424eb18ff9b13d6ca28d63b3d539c7b271213fb6b26
 SHA512 
d8a8a1574d27ec77e25e13bbfff60b3e673b125c2053788c83481c3684af8cb51c2ae19267b01827bb4c53eef84645a9d9a4ea840159414bf51162148067652d
-DIST nvidia-settings-495.44.tar.bz2 1062420 BLAKE2B 
98d5ac73f279bc3d415e3902946eca15fe4d61978dde5b21a96e9e1367129b9949078bd2c3778d344237ff4b9cf65a2921025a6410394f007dd97f441dc320f4
 SHA512 
e69bb32e47a43368de1959a0c8a877281bba0139119b1a34f6da86e006a8b0dce5bafe0fd017221be40a6bddcd93934e9479cbb8f04fb979b84f5f206835118e
-DIST nvidia-settings-495.46.tar.gz 1235052 BLAKE2B 
aa4396b56a41f19f0876a135b6c2de0f74b3d8a50fb7ad51b00394868c3354cb85d0cb54dac146537010ea4d091daf02149e5ffc5d59f8ca27f2e08b9d798dd3
 SHA512 
f9019d651f482aa35ccade111dabcc6d21e2dcb229a6102d5b8c9c72df648fa053a01bf0d3efef27d974aed2a23cbfc5022ebb6e9a93eba309b0863068d2423a
 DIST nvidia-settings-510.47.03.tar.bz2 1075444 BLAKE2B 
6b8b215ec94e12fbb82f4468cb8b3368eee7185840ea64d388c9a556d2355d864f32c66cb7ad4b9132b7494e642c2804ee1736d3ffa337ff7240dc950854a7bc
 SHA512 
6e522bfa39f74556d315fb04c8f2ba7e9e7bd0adbc5a73a926b33fc8ee367ac07a9020cbaafe2dbe574e1b07f27fd03c9ac920df1ac6bd42be80335d04186b31
 DIST nvidia-xconfig-390.147.tar.bz2 107426 BLAKE2B 
c7004dab351581176a4e00fc099a12374cb29f3306769724c874a17600d6c11e79ac807fe218022d72ccf83ed33789d2378b0cdba35e5f94458e30631d725384
 SHA512 
a530c649ff7e75706ba37072ee58d64d4758348a45b953396a0e9d2608e1d7c3d299298cb50b1e8ee0bf2f6f8817bca64637b77e18aab0685a4edd630f18fb9a
 DIST nvidia-xconfig-460.91.03.tar.bz2 108477 BLAKE2B 
d95505e508ca16d8ebe8c22c445a1b686c32a626c379b1b48e2a8101969fc03b90446953cc30e945da9388237fa1b9e5f83417aba1fb062d58866a523c256769
 SHA512 
4bb8f7fc42e7fa5e3897884bd7e722c4fe8ab1e4a87cad4136e1764cdd91d4795f817dcee63a20279315b4839d92fe5244d073ea2310c704f8aacd38bacb28a4
 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-470.94.tar.gz 142577 BLAKE2B 
0687d78a05d4b990bad18a27544874dc79fdef7a7d5e7f5393f10ad7e874cfe51b27919ab61e2c7670e0d89848f80f68660eac0294bab27f004b8c98b650a102
 SHA512 
88611ed7a0894c218ad536a9819182a1f94d85c24bc3ef1b2959134147ba8d623bf1b35bd8f30ad2367704b3846f23d84ebe5b94f08936ec97ed26ac63d40add
-DIST nvidia-xconfig-495.44.tar.bz2 108699 BLAKE2B 
8027d9b14f16c792e0839746c549979017e52724a5826cad3b53cda0fa2638b6f7dfe72353e36b84084f4a56a004cd91f87ff1d1d9e542b5d760e47092268993
 SHA512 
624aa71f319d7d8e3383580eda5c6cfc986ef4c3a9c14493cd561cd3ba758763d79731bb7e7e03fc89d3b8a3a8b65cee324de1d9980b5725678ccd50cb26175e
-DIST nvidia-xconfig-495.46.tar.gz 142633 BLAKE2B 
1df2a080dba81b3c9e984a1d2e7d49f3e8adf9f1afb28dfe6a41a9f54b03e4830d42851a16583703c2bf88f11989851aaf23fc8dad0d3b5f2f8c3885dbb5db7e
 SHA512 
b60d65e421460e4bdad579b36a141e82b869d34ca21849bdc33a445466c1b8ab505ab4ab82d6801e05f85dcac286566ec792d8c7708ba511aebfebc29ec0447d
 DIST nvidia-xconfig-510.47.03.tar.bz2 109758 BLAKE2B 
503ea2850ab5f64648f84675da66e4d0fa50bccdc10355df9295987cc7c3c744076671030b9bda619c22e9c8e824be13dd852d33227cabacde102282acf95796
 SHA512 
45ca5ddcb744b27ba4661aef38496782ced640945f659894e262b239f565afd1ec5aab254b62ab87c00ca4cda346bc91ec70738736724aedf79c7845b4a0b03a

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-470.94.ebuild 
b/x11-drivers/nvidia-drivers/nvidia-drivers-470.94.ebuild
deleted file mode 100644
index 3da2d49715ad..000000000000
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-470.94.ebuild
+++ /dev/null
@@ -1,445 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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/";
-
-DESCRIPTION="NVIDIA Accelerated Graphics Driver"
-HOMEPAGE="https://www.nvidia.com/download/index.aspx";
-SRC_URI="
-       amd64? ( 
https://us.download.nvidia.com/XFree86/Linux-x86_64/${PV}/NVIDIA-Linux-x86_64-${PV}.run
 )
-       arm64? ( 
https://us.download.nvidia.com/XFree86/aarch64/${PV}/NVIDIA-Linux-aarch64-${PV}.run
 )
-       $(printf "https://github.com/NVIDIA/%s/archive/refs/tags/${PV}.tar.gz 
-> %s-${PV}.tar.gz " \
-               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"
-IUSE="+X abi_x86_32 abi_x86_64 +driver persistenced static-libs +tools wayland"
-
-COMMON_DEPEND="
-       acct-group/video
-       sys-libs/glibc
-       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-wayland-1.1.7
-               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
-
-       sed 's/__USER__/nvpd/' \
-               
nvidia-persistenced/init/systemd/nvidia-persistenced.service.template \
-               > "${T}"/nvidia-persistenced.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}
-               [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=(
-               $(usex X '' '
-                       libGLX_nvidia libglxserver_nvidia
-                       libnvidia-ifr
-                       nvidia_icd.json nvidia_layers.json')
-               $(usex 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')
-               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 # 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\
-$(usex 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 && usex 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
-                       ;;
-                       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 ]] &&
-                       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
-}
-
-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."
-               elog
-               elog "This version of ${PN} only supports EGLStream which is 
only"
-               elog "supported by a few wayland compositors (e.g. kwin / 
mutter, not sway)."
-       fi
-}

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-495.44-r2.ebuild 
b/x11-drivers/nvidia-drivers/nvidia-drivers-495.44-r2.ebuild
deleted file mode 100644
index 8d634642a59a..000000000000
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-495.44-r2.ebuild
+++ /dev/null
@@ -1,493 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MODULES_OPTIONAL_USE="driver"
-inherit desktop eapi8-dosym linux-mod multilib-build \
-       readme.gentoo-r1 systemd toolchain-funcs unpacker
-
-NV_KERNEL_MAX="5.15"
-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 )
-       ${NV_URI}nvidia-installer/nvidia-installer-${PV}.tar.bz2
-       ${NV_URI}nvidia-modprobe/nvidia-modprobe-${PV}.tar.bz2
-       ${NV_URI}nvidia-persistenced/nvidia-persistenced-${PV}.tar.bz2
-       ${NV_URI}nvidia-settings/nvidia-settings-${PV}.tar.bz2
-       ${NV_URI}nvidia-xconfig/nvidia-xconfig-${PV}.tar.bz2"
-# nvidia-installer is unused but here for GPL-2's "distribute sources"
-S="${WORKDIR}"
-
-LICENSE="NVIDIA-r2 BSD GPL-2 MIT ZLIB"
-SLOT="0/${PV%%.*}"
-KEYWORDS="-* ~amd64"
-IUSE="+X +driver static-libs +tools wayland"
-RESTRICT="bindist"
-
-COMMON_DEPEND="
-       acct-group/video
-       acct-user/nvpd
-       net-libs/libtirpc:=
-       sys-libs/glibc
-       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,${MULTILIB_USEDEP}]
-               x11-libs/libX11[${MULTILIB_USEDEP}]
-               x11-libs/libXext[${MULTILIB_USEDEP}]
-       )
-       wayland? (
-               >=gui-libs/egl-wayland-1.1.7-r1
-               media-libs/libglvnd
-               >=media-libs/mesa-21.2[gbm(+)]
-               x11-libs/libdrm
-       )"
-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="
-       app-misc/pax-utils
-       sys-devel/m4
-       virtual/pkgconfig"
-
-QA_PREBUILT="lib/firmware/* opt/bin/* usr/lib*"
-
-PATCHES=(
-       "${FILESDIR}"/nvidia-modprobe-390.141-uvm-perms.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" # defaults' clean sometimes deletes 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 nvidia-drivers"
-               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 user 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
-
-       sed -e '/Exec=\|Icon=/s/_.*/nvidia-settings/' \
-               -e '/Categories=/s/_.*/System;Settings;/' \
-               -i nvidia-settings/doc/nvidia-settings.desktop || die
-
-       # remove gtk2 support (bug #592730)
-       sed '/^GTK2LIB = /d;/INSTALL.*GTK2LIB/,+1d' \
-               -i nvidia-settings/src/Makefile || die
-
-       sed 's/__USER__/nvpd/' \
-               
nvidia-persistenced/init/systemd/nvidia-persistenced.service.template \
-               > nvidia-persistenced.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
-
-       gzip -d nvidia-{cuda-mps-control,smi}.1.gz || die
-
-       # temporary workaround for dbus powerd spam in 495 series
-       # (jz -> jmp after nvidia.powerd.server, need RESTRICT=bindist)
-       # 
https://forums.developer.nvidia.com/t/bug-nvidia-v495-29-05-driver-spamming-dbus-enabled-applications-with-invalid-messages/192892/14
-       if use amd64; then
-               sed 
's/\x0f\x84\[\x01\x00\x00\x4c\x8d/\xe9\x5c\x01\x00\x00\x00\x4c\x8d/' \
-                       -i libnvidia-glcore.so.495.44 || die
-               sed 
's/\x0f\x84\x65\x01\x00\x00\x83\xec\x08\x89/\xe9\x66\x01\x00\x00\x00\x83\xec\x08\x89/'
 \
-                       -i 32/libnvidia-glcore.so.495.44 || die
-       fi
-}
-
-src_compile() {
-       nvidia-drivers_make() {
-               emake -C nvidia-${1} ${2} \
-                       PREFIX="${EPREFIX}/usr" \
-                       HOST_CC="$(tc-getBUILD_CC)" \
-                       HOST_LD="$(tc-getBUILD_LD)" \
-                       NV_USE_BUNDLED_LIBJANSSON=0 \
-                       NV_VERBOSE=1 DO_STRIP= OUTPUTDIR=out
-       }
-
-       tc-export AR CC LD OBJCOPY
-
-       # may no longer be relevant but kept as a safety
-       export DISTCC_DISABLE=1 CCACHE_DISABLE=1
-
-       use driver && linux-mod_src_compile
-
-       nvidia-drivers_make modprobe
-       nvidia-drivers_make persistenced
-       use X && nvidia-drivers_make xconfig
-
-       if use tools; then
-               nvidia-drivers_make settings
-       elif use static-libs; then
-               nvidia-drivers_make settings/src out/libXNVCtrl.a
-       fi
-}
-
-src_install() {
-       nvidia-drivers_make_install() {
-               emake -C nvidia-${1} install \
-                       DESTDIR="${D}" \
-                       PREFIX="${EPREFIX}/usr" \
-                       LIBDIR="${ED}/usr/$(get_libdir)" \
-                       NV_USE_BUNDLED_LIBJANSSON=0 \
-                       NV_VERBOSE=1 DO_STRIP= MANPAGE_GZIP= OUTPUTDIR=out
-       }
-
-       nvidia-drivers_libs_install() {
-               local libs=(
-                       EGL_nvidia
-                       GLESv1_CM_nvidia
-                       GLESv2_nvidia
-                       cuda
-                       nvcuvid
-                       nvidia-allocator
-                       nvidia-eglcore
-                       nvidia-encode
-                       nvidia-glcore
-                       nvidia-glsi
-                       nvidia-glvkspirv
-                       nvidia-ml
-                       nvidia-opencl
-                       nvidia-opticalflow
-                       nvidia-ptxjitcompiler
-                       nvidia-tls
-                       $(usex X '
-                               GLX_nvidia
-                               nvidia-fbc
-                               vdpau_nvidia
-                       ' '')
-                       $(usex amd64 nvidia-compiler '')
-               )
-
-               local libdir=.
-               if [[ ${ABI} == x86 ]]; then
-                       libdir+=/32
-               else
-                       libs+=(
-                               libnvidia-nvvm.so.4.0.0
-                               nvidia-cfg
-                               nvidia-ngx
-                               nvidia-rtcore
-                               nvoptix
-                               $(usex wayland '
-                                       libnvidia-egl-gbm.so.1.1.0
-                                       nvidia-vulkan-producer
-                               ' '')
-                       )
-               fi
-
-               local lib soname
-               for lib in "${libs[@]}"; do
-                       [[ ${lib:0:3} != lib ]] && lib=lib${lib}.so.${PV}
-
-                       # auto-detect soname and create appropriate symlinks
-                       soname=$(scanelf -qF'%S#F' ${lib}) || die "Scanning 
${lib} failed"
-                       if [[ ${soname} && ${soname} != ${lib} ]]; then
-                               ln -s ${lib} ${libdir}/${soname} || die
-                       fi
-                       ln -s ${lib} ${libdir}/${lib%.so*}.so || die
-
-                       dolib.so ${libdir}/${lib%.so*}*
-               done
-       }
-
-       if use driver; then
-               linux-mod_src_install
-
-               insinto /etc/modprobe.d
-               doins "${T}"/nvidia.conf
-
-               insinto /lib/firmware/nvidia/${PV}
-               doins firmware/gsp.bin
-
-               # used for gpu verification with binpkgs (not kept)
-               insinto /usr/share/nvidia
-               doins supported-gpus/supported-gpus.json
-       fi
-
-       if use X; then
-               exeinto /usr/$(get_libdir)/xorg/modules/drivers
-               doexe nvidia_drv.so
-
-               exeinto /usr/$(get_libdir)/xorg/modules/extensions
-               newexe libglxserver_nvidia.so{.${PV},}
-
-               insinto /usr/share/X11/xorg.conf.d
-               newins {,50-}nvidia-drm-outputclass.conf
-
-               # vulkan icd uses libGLX_nvidia.so and so requires X
-               insinto /usr/share/vulkan/icd.d
-               doins nvidia_icd.json
-               insinto /usr/share/vulkan/implicit_layer.d
-               doins nvidia_layers.json
-       fi
-
-       if use wayland; then
-               insinto /usr/share/egl/egl_external_platform.d
-               doins 15_nvidia_gbm.json
-
-               dosym8 -r 
/usr/$(get_libdir)/{libnvidia-allocator.so.1,gbm/nvidia-drm_gbm.so}
-       fi
-
-       insinto /usr/share/glvnd/egl_vendor.d
-       doins 10_nvidia.json
-
-       insinto /etc/OpenCL/vendors
-       doins nvidia.icd
-
-       insinto /etc/nvidia
-       newins nvidia-application-profiles{-${PV},}-rc
-
-       # install built helpers
-       nvidia-drivers_make_install modprobe
-       # allow video group to load mods and create devs (bug #505092)
-       fowners :video /usr/bin/nvidia-modprobe
-       fperms 4710 /usr/bin/nvidia-modprobe
-
-       nvidia-drivers_make_install persistenced
-       newconfd "${FILESDIR}"/nvidia-persistenced.confd nvidia-persistenced
-       newinitd "${FILESDIR}"/nvidia-persistenced.initd nvidia-persistenced
-       systemd_dounit nvidia-persistenced.service
-
-       use X && nvidia-drivers_make_install xconfig
-
-       if use tools; then
-               nvidia-drivers_make_install settings
-               doicon nvidia-settings/doc/nvidia-settings.png
-               domenu nvidia-settings/doc/nvidia-settings.desktop
-
-               insinto /usr/share/nvidia
-               newins nvidia-application-profiles{-${PV},}-key-documentation
-
-               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
-
-       # install prebuilt-only helpers
-       exeinto /opt/bin
-
-       doexe nvidia-cuda-mps-control
-       doman nvidia-cuda-mps-control.1
-       doexe nvidia-cuda-mps-server
-
-       doexe nvidia-debugdump
-       dobin nvidia-bug-report.sh
-
-       doexe nvidia-ngx-updater
-
-       doexe nvidia-smi
-       doman nvidia-smi.1
-
-       # install prebuilt-only libraries
-       multilib_foreach_abi nvidia-drivers_libs_install
-
-       # install dlls for optional use with proton/wine
-       insinto /usr/$(get_libdir)/nvidia/wine
-       use amd64 && doins {_,}nvngx.dll
-
-       # install systemd sleep services
-       exeinto /lib/systemd/system-sleep
-       doexe systemd/system-sleep/nvidia
-       dobin systemd/nvidia-sleep.sh
-       systemd_dounit systemd/system/nvidia-{hibernate,resume,suspend}.service
-
-       # create README.gentoo
-       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
-
-See '${EPREFIX}/etc/modprobe.d/nvidia.conf' for modules options.
-
-For general information on using nvidia-drivers, please see:
-https://wiki.gentoo.org/wiki/NVIDIA/nvidia-drivers";
-       readme.gentoo_create_doc
-
-       local DOCS=(
-               README.txt NVIDIA_Changelog supported-gpus/supported-gpus.json
-               nvidia-settings/doc/{FRAMELOCK,NV-CONTROL-API}.txt
-       )
-       local HTML_DOCS=( html/. )
-       einstalldocs
-}
-
-pkg_preinst() {
-       has_version "${CATEGORY}/${PN}[abi_x86_32]" && NV_HAD_ABI32=1
-       has_version "${CATEGORY}/${PN}[wayland]" && NV_HAD_WAYLAND=1
-
-       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 &&
-               $(grep -o '  [0-9.]*  ' /proc/driver/nvidia/version) != "  
${PV}  " ]]; then
-               ewarn "Currently loaded NVIDIA modules do not match the newly 
installed"
-               ewarn "libraries and will lead to GPU-using application issues."
-               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 [[ ${NV_LEGACY_MASK} ]]; then
-               ewarn
-               ewarn "***WARNING***"
-               ewarn
-               ewarn "You are installing a version of nvidia-drivers 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 && [[ ${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-*). Re-enable if needed."
-       fi
-
-       if use wayland && use driver && [[ ! ${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 EGLStream (used for 
wayland acceleration"
-               elog "in compositors that support it)."
-               elog
-               elog "If you experience issues, please comment out the option 
from nvidia.conf."
-               elog "Of note, may possibly cause issues with SLI and Reverse 
PRIME."
-       fi
-
-       ewarn
-       ewarn "This revision of ${PN} is applying a binary patch to prevent 
heavy"
-       ewarn "dbus spamming while using OpenGL. If you experience issues, 
please try to"
-       ewarn "mask =${CATEGORY}/${PN}-${PVR} to use NVIDIA's intended version."
-}

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-495.46-r10.ebuild 
b/x11-drivers/nvidia-drivers/nvidia-drivers-495.46-r10.ebuild
deleted file mode 100644
index b5c5e7ed205f..000000000000
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-495.46-r10.ebuild
+++ /dev/null
@@ -1,462 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MODULES_OPTIONAL_USE="driver"
-inherit desktop flag-o-matic linux-mod multilib readme.gentoo-r1 \
-       systemd toolchain-funcs unpacker
-
-NV_KERNEL_MAX="5.15"
-
-DESCRIPTION="NVIDIA Accelerated Graphics Driver"
-HOMEPAGE="https://www.nvidia.com/download/index.aspx";
-SRC_URI="
-       amd64? ( 
https://us.download.nvidia.com/XFree86/Linux-x86_64/${PV}/NVIDIA-Linux-x86_64-${PV}.run
 )
-       arm64? ( 
https://us.download.nvidia.com/XFree86/aarch64/${PV}/NVIDIA-Linux-aarch64-${PV}.run
 )
-       $(printf "https://github.com/NVIDIA/%s/archive/refs/tags/${PV}.tar.gz 
-> %s-${PV}.tar.gz " \
-               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"
-IUSE="+X abi_x86_32 abi_x86_64 +driver persistenced static-libs +tools wayland"
-RESTRICT="bindist"
-
-COMMON_DEPEND="
-       acct-group/video
-       sys-libs/glibc
-       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-wayland-1.1.7-r1
-               media-libs/libglvnd
-               >=media-libs/mesa-21.2[gbm(+)]
-               x11-libs/libdrm
-       )"
-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
-
-       sed 's/__USER__/nvpd/' \
-               
nvidia-persistenced/init/systemd/nvidia-persistenced.service.template \
-               > "${T}"/nvidia-persistenced.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
-
-       # temporary workaround for dbus powerd spam in 495 series
-       # (jz -> jmp after nvidia.powerd.server, need RESTRICT=bindist)
-       # 
https://forums.developer.nvidia.com/t/bug-nvidia-v495-29-05-driver-spamming-dbus-enabled-applications-with-invalid-messages/192892/14
-       if use amd64; then
-               sed 
's/\x0f\x84\[\x01\x00\x00\x4c\x8d/\xe9\x5c\x01\x00\x00\x00\x4c\x8d/' \
-                       -i libnvidia-glcore.so.495.46 || die
-               sed 
's/\x0f\x84\x65\x01\x00\x00\x83\xec\x08\x89/\xe9\x66\x01\x00\x00\x00\x83\xec\x08\x89/'
 \
-                       -i 32/libnvidia-glcore.so.495.46 || die
-       fi
-}
-
-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=(
-               $(usex X '' '
-                       libGLX_nvidia libglxserver_nvidia
-                       nvidia_icd.json nvidia_layers.json')
-               $(usex wayland '' '
-                       libnvidia-egl-gbm 15_nvidia_gbm
-                       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')
-               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 # 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\
-$(usex 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 && usex 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
-}
-
-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
-
-       ewarn
-       ewarn "This revision of ${PN} is applying a binary patch to prevent 
heavy"
-       ewarn "dbus spamming while using OpenGL. If you experience issues, 
please try to"
-       ewarn "mask =${CATEGORY}/${PN}-${PVR} to use NVIDIA's intended version."
-}

Reply via email to