gentoo resync : 16.01.2021

10 files changed, 75 insertions, 505 deletions

diff --git a/x11-drivers/Manifest.gz b/x11-drivers/Manifest.gz
index e92b757902cf..aa860ea099a1 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 1ae8163153c6..7adb1462c4d6 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -13,6 +13,7 @@ DIST NVIDIA-Linux-aarch64-460.91.03.run 111886330 BLAKE2B 24ab316e216caa61f7edb4
 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.39.01.run 211307577 BLAKE2B 15d6a21ac81edbaa939044eb2654b77bb6aaa223853cb8fdc7633467da0bb120a738dc8a63d4f541031444a3f9184d8de6f9030a6bbaacd49ede3db0b06d7b15 SHA512 c61e7d0e83c00f2225c170b8ccfdf63c9fa9fc2bb09df88a8e113e30c765582c1f93422a190d325d9a2cb8922d8b9166c88ba3fa15c4c85043b7436dae03cd37
 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
@@ -20,42 +21,47 @@ DIST NVIDIA-Linux-x86_64-470.62.16.run 270377842 BLAKE2B 6f6263a8652c07e8da7dfc6
 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.39.01.run 328334484 BLAKE2B 8c765d5660feed9f36760e142acb54e933097f69744c470cb3f9ac9aeae744a6198cf0856eecbe31bd0eae8ef3008b1b8bba2eeb93b6e46b5b31b6b7acb6978b SHA512 0c7ec6dd585d339f44ff10475abd614c9487bf399aed8bf1546cd95bbcbe3b2938cd52cea402d46e439252fc5fe0e03908f9821fa66f475ffe5573b266047a14
 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.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.39.01.tar.bz2 144519 BLAKE2B e87128ccd71f891339407414d2f02a3fb2aa2bb5492900c40967382ed2cee498b8f8faa7dac80cf0465575ab7755e58e31108dca847e279c554eb5b0cf82733a SHA512 fe6057aaa1138d7a5dd78c73a02d7ebebce6857f6ad1cbca424e4d419abc81bb47ba6167dd2e9af0a8f76eb19dfa0ea906a50eab7c19200de43f6930068e738c
 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.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.39.01.tar.bz2 39072 BLAKE2B ec169397415d3c003f4212b4b0221e820dce8bb9b1857d58397c1857fffe5829f49b644ae78766bc91860b9652f515f37eedd2adf1c0620ba258ea6b64f40d8f SHA512 9f236f16c07008129fb328e65d66cc93e668668848bca233e9972615a7deb18387c0937f09d7830c59d8559766943d27e84fc1488a6042cb5ec2f69dca2a817d
 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.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.39.01.tar.bz2 47087 BLAKE2B ab1db89a075f13095b8a377bcdb78fb749b934262805032a885b0fd16894218f0306d58a339aefe64bcfe85aa3f0fa5b9429fa6c4ed1674c9fe598fd1cfe45a8 SHA512 1e1cbe6a8842f4740a9b63180ebc58ef9c09390061a70d7ccc3f2791ed0e4b74ab9b7d0dddc94f5292576a6d3d518bf8365b6ca439b6eb8cbb3fdb8da33b843c
 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.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.39.01.tar.bz2 1074854 BLAKE2B bd1fe4ce6c04c1be4925744e309e2bdd4f31f2de6abba8e7a32014a93a9da6b776ff1dbb2f81ccb6045c975a37614305825b19e519b8969a53d54a16cd9eb06d SHA512 24a2e576fcb47e1f2fa596426d2ef3181afaeb9739f2782af4878840bcfcf54241a6d5f4df2902f70ede0164a46733d19eb7022d399e1419e2f14a5bdfc75c0c
 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.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
-EBUILD nvidia-drivers-390.147.ebuild 13646 BLAKE2B 6c7061118d42bd9528aff678f71e6cfcd006ea4695a0cd5604bada65c3ca5b873f558076203faa87b22a86b8ba717fd1bb3f3c448eca8828a85b192a316f3b44 SHA512 1f4715ca10f531cd9fc4e537a9dfc22f1381941106905c96ab31cbe5af62afcb034d81c7bfdbdf78b02a05217d24aaf67ebefe0cc9b2bf93bfd2088ef070ec15
-EBUILD nvidia-drivers-460.91.03-r2.ebuild 12894 BLAKE2B 3cc01a059252c7dd63e4340e260c1ba091319769b9d0138579d187cf092c8b3b9bfe0e5f8e51c1536656b8906e6d9b4358d1c8bc1e24e11fd0ea17c904cf0336 SHA512 5cfe126ae497f3c73e944c2b48fda7c49b5adbd0ac590328355a60d5066ef5c841969af140c7ebd28dd08fa749090d4869a49fd3949b1ff9b4fe5493bb05cbe4
-EBUILD nvidia-drivers-470.62.16.ebuild 14265 BLAKE2B 7d443fd095d866947a56f0005230ae85c0ec9294bf5694bde721dad3ee8b6f7d8b42c276e002709ea8d23a9c970ef51ce5c2fdf9ed77c99f866cb75303f35c35 SHA512 2556aa639265699c361dfb2bc5941ce7f87d15ccce0e3e3d1c72e8c1b4fad0755a07b57cbc13ff2ceae73a45a859f81b1dc8efe11ed57dbd73a405a229887d5b
-EBUILD nvidia-drivers-470.94.ebuild 14387 BLAKE2B a89c5d99f90ac8c9a6946cd5d2a30f9bc4c955f133478ab18be91914198063505813feefd8eb9ae40c0c8c03b60181f06e94f63fd076c92956fcb9e67faa744e SHA512 6449acef2f943e8804674f9db2c6bb3b0917d7dcb3aa4364da760aad2c4bf7e46f4b7fb194e389cedf05655155d70115ffe7d59a1726e986afb7e47011676ba6
-EBUILD nvidia-drivers-495.44-r2.ebuild 14465 BLAKE2B 5f466d76f22f33d9e0e2c5e8afbda2b6b01926cfbec0e180421125a264d79d091b52c8e53360d9b9dd70be87569f577afc50ef6d566d9ac3201e277f8f9ac9b0 SHA512 991251c5caaa408f64d7b9c984faa8aed3c6c20d267efc371ef6b3458cf6c419245379a62e31d816b422d69e8c76bba7b23bff17e96a048f8c8226a7b348934d
-EBUILD nvidia-drivers-495.46-r10.ebuild 15193 BLAKE2B 12b808239dd8fe0f3398e8c37fe0d3ff852f422c54bc3a1d37553597ac4f64e52836f57cc88de4093765ea48d533819a00b032411055f9c272fcb8f00a4d6251 SHA512 a5608f46791a7370d90fbf903963f0c9e6fdeee3552933e8e8704b018560024ea5e03c236192e645cf7b594d211a6dd686df67df5cd785282d2fe04b53b117f8
-EBUILD nvidia-drivers-495.46-r20.ebuild 15176 BLAKE2B 9d5b6d9b22b7cbd979fc783861eff787cd85813b99091872726f912300c58fa7f9504893a1fabaee7ef65ec1d5d8b4619db61d871a36da2d4cbe048c38d48ade SHA512 c281a2f5661f83d2f5a3117968dc55ffa4376fa65c49427a30f55a2e659f1b50cd7df6dd5b699446a16e29b424467a1527e5f8ea6bba4a48df3ab4cc2d063959
-EBUILD nvidia-drivers-495.46.ebuild 14392 BLAKE2B 5394a084f4c0c46c39f1447cc48c5219ea9eca3d88ed4ce980436bd563262cdb4c2394ad99b551ace18fea9551aef726235e2c8124fef8f773d01ae67972d333 SHA512 1b341595da4f6e1f6c97ef712673007ce172f72d785adcd48446d3bc29cebf2ce39a15678733c504e82c0de3d7365333c13c52168808530dd91d2c053e00588a
+DIST nvidia-xconfig-510.39.01.tar.bz2 110127 BLAKE2B c2f3d7e61e7e64eb29a29ac632074ca8d27d65d29f590c7f95102858f41ab4da9dc11bd7947c366bbe54d66b7e0d63dad5032fdbc056fa3212db080f56be5ec2 SHA512 fcb2f8c99401c2abbee541645daaf296071b860fe3ba797f00a1c68f281c58923517635cb574927d7d0b5dcfa7144e5620c175171855a0966481348c4400dcb8
+EBUILD nvidia-drivers-390.147.ebuild 13864 BLAKE2B dd7dc4aab7036b3ffc6a3f69b86c775607fae5396fffcd48d6169ac9093e56e689699a64150b1e3180b2204d2d7b0226ec7e93e2fdf260ce1bbe7b45d4ee89b7 SHA512 120f14ae0f1203e0a8bfbfd78007276c0da42eab66bcfe6126e0991d9b054d86b779be08bace6cfd8888dd9da93ea20644781df3501d5daedab56e0a2364abdb
+EBUILD nvidia-drivers-460.91.03-r2.ebuild 13112 BLAKE2B 43b4c03e4bf7ea37f66acf66685443b241cf2444008801c311231ed828cf318256c125afa7f0705b81eddfccb31a43470b1fdcd41e392881ebb2c85622c6c0bf SHA512 bb2eb134ff800f59cd0c009f1c288bb37bdab48c5af87af35d46d06323c95062f68a1962ed8f487de20df5334ffc7c6cec80ba266ca179fdf0a980b6f10e4bcc
+EBUILD nvidia-drivers-470.62.16.ebuild 14483 BLAKE2B 1e26b388edf86cc5a069f3a74d1977c3c3cd16c2aec014ad758fa1d19528ba28104ade914ecb861edde293d30a2eb95f597ca02887dc191a2740cd0bb0a73ca4 SHA512 3417a9d97e4df56824ff8fab882e125ecfe8271534dbf7139f9e3b6e1a7aa092737fae0429e195f367d430d7a861de551020fb6aca8b407b24d2545f97d4be01
+EBUILD nvidia-drivers-470.94.ebuild 14605 BLAKE2B f1cb994d2375cf93f02c7fb9e96540ce7bf0c881b51366e5898f47f327b222f768878a08051362236a71cd5db38b58ba6028dfb3e83115af7f06f4414f2f3632 SHA512 2a0c4d0e5ede5c771cdabc6342289161f982a621881c30b1f763ea5c8e401f3ceb857caccdf24f9d872c217f6d7c72aafd974232e905088e0d89a22a8cce0584
+EBUILD nvidia-drivers-495.44-r2.ebuild 14683 BLAKE2B d80d1a8c8aa750bf36331da93e30e76067a29a851537a42bb6fcd85d787810c09c910d81678d24a4cc200e407056173c84961682299c129cb2187339fce6d58e SHA512 69c22a101b8f42656c7dd3167b184454e1369dc28692209952438c1f757ddf590989892d5df4461b09e59cce5270932fed93b151f526bce935ee85abd02147b9
+EBUILD nvidia-drivers-495.46-r10.ebuild 15411 BLAKE2B e508c90b03d03a7b9be58443df93d76d9f5caa4c49680da423b5e7dba43f9ab6e6436e2f59b63cb4ba8fed2d192783939f66aab70bdd39687abaf46357f6fc60 SHA512 cc511aa908e1ef543e6027821604cfe616c4bb7d8251d03a1021891a2f4421741eed6331efdc4d1ea9e9e596bd7422855224d386d9c90f7a8f9131b5f7801921
+EBUILD nvidia-drivers-510.39.01.ebuild 14768 BLAKE2B ac45c06f27231061954317b79d940371fd3058184797888a3f57c938fd46e68531387530e534ac95acb3dacaafc3ec4dbcc1a1f37d105df0088cc3a019ef58fb SHA512 49c51bf5f823935a3093f9453cbd2442960b700ec5ade0ef12f478c6bf66991ab70bbc7084c07b6d39df3e2fb2c5f278e59df1ec16b13d63f49a0f0f452d4814
 MISC metadata.xml 1006 BLAKE2B 1dc4f01e5eae548e70fb0ef6f816910ae0d282c7a97e552de62354bef162895d60f87dc21306523e530325b55b646b1d4c16182a710c5bb01389521c36e408f4 SHA512 5db62ce94374226c20e67aa89c61c83b581affb7383b082076db69349d0a76aeca806593072d1ae2a9ac01d34955c826dd8145081988adee4069aadae654aff9
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-390.147.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-390.147.ebuild
index 27bc1f65bc9b..9d31c7cbbde0 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-390.147.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-390.147.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -96,7 +96,10 @@ pkg_setup() {
 	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.
-	Note: DRM_SIMPLEDRM may cause issues and is better disabled for now."
+	Note: DRM_SIMPLEDRM may cause issues and may be better disabled for now."
+	local ERROR_DRM_SIMPLEDRM="CONFIG_DRM_SIMPLEDRM: is set but may or may not lead to a blank
+	console with a NVIDIA GPU. If you experience issues, try
+	disabling it and instead use FB_EFI or FB_SIMPLE for now."
 
 	kernel_is -ge 5 8 && CONFIG_CHECK+=" X86_PAT" #817764
 
@@ -130,8 +133,8 @@ pkg_setup() {
 	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}"
-		ewarn "  <=sys-kernel/gentoo-sources-${NV_KERNEL_MAX}"
+		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
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-460.91.03-r2.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-460.91.03-r2.ebuild
index d04eeb51e29c..61cd98588ec9 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-460.91.03-r2.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-460.91.03-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -94,7 +94,10 @@ pkg_setup() {
 	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.
-	Note: DRM_SIMPLEDRM may cause issues and is better disabled for now."
+	Note: DRM_SIMPLEDRM may cause issues and may be better disabled for now."
+	local ERROR_DRM_SIMPLEDRM="CONFIG_DRM_SIMPLEDRM: is set but may or may not lead to a blank
+	console with a NVIDIA GPU. If you experience issues, try
+	disabling it and instead use FB_EFI or FB_SIMPLE for now."
 
 	use amd64 && kernel_is -ge 5 8 && CONFIG_CHECK+=" X86_PAT" #817764
 
@@ -127,8 +130,8 @@ pkg_setup() {
 	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}"
-		ewarn "  <=sys-kernel/gentoo-sources-${NV_KERNEL_MAX}"
+		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
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-470.62.16.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-470.62.16.ebuild
index 6de4753fb633..d8e4a49beeb8 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-470.62.16.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-470.62.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -98,7 +98,10 @@ pkg_setup() {
 	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.
-	Note: DRM_SIMPLEDRM may cause issues and is better disabled for now."
+	Note: DRM_SIMPLEDRM may cause issues and may be better disabled for now."
+	local ERROR_DRM_SIMPLEDRM="CONFIG_DRM_SIMPLEDRM: is set but may or may not lead to a blank
+	console with a NVIDIA GPU. If you experience issues, try
+	disabling it and instead use FB_EFI or FB_SIMPLE for now."
 
 	use amd64 && kernel_is -ge 5 8 && CONFIG_CHECK+=" X86_PAT" #817764
 
@@ -132,8 +135,8 @@ pkg_setup() {
 	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}"
-		ewarn "  <=sys-kernel/gentoo-sources-${NV_KERNEL_MAX}"
+		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
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-470.94.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-470.94.ebuild
index bba3a75169aa..f3cf9ad5a687 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-470.94.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-470.94.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -98,7 +98,10 @@ pkg_setup() {
 	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.
-	Note: DRM_SIMPLEDRM may cause issues and is better disabled for now."
+	Note: DRM_SIMPLEDRM may cause issues and may be better disabled for now."
+	local ERROR_DRM_SIMPLEDRM="CONFIG_DRM_SIMPLEDRM: is set but may or may not lead to a blank
+	console with a NVIDIA GPU. If you experience issues, try
+	disabling it and instead use FB_EFI or FB_SIMPLE for now."
 
 	use amd64 && kernel_is -ge 5 8 && CONFIG_CHECK+=" X86_PAT" #817764
 
@@ -132,8 +135,8 @@ pkg_setup() {
 	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}"
-		ewarn "  <=sys-kernel/gentoo-sources-${NV_KERNEL_MAX}"
+		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
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-495.44-r2.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-495.44-r2.ebuild
index cb68478d1349..9450abe262e9 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-495.44-r2.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-495.44-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -100,7 +100,10 @@ pkg_setup() {
 	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.
-	Note: DRM_SIMPLEDRM may cause issues and is better disabled for now."
+	Note: DRM_SIMPLEDRM may cause issues and may be better disabled for now."
+	local ERROR_DRM_SIMPLEDRM="CONFIG_DRM_SIMPLEDRM: is set but may or may not lead to a blank
+	console with a NVIDIA GPU. If you experience issues, try
+	disabling it and instead use FB_EFI or FB_SIMPLE for now."
 
 	use amd64 && kernel_is -ge 5 8 && CONFIG_CHECK+=" X86_PAT" #817764
 
@@ -134,8 +137,8 @@ pkg_setup() {
 	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}"
-		ewarn "  <=sys-kernel/gentoo-sources-${NV_KERNEL_MAX}"
+		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
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-495.46-r10.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-495.46-r10.ebuild
index 9983bd4e0e6b..79114a2201a3 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-495.46-r10.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-495.46-r10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -100,7 +100,10 @@ pkg_setup() {
 	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.
-	Note: DRM_SIMPLEDRM may cause issues and is better disabled for now."
+	Note: DRM_SIMPLEDRM may cause issues and may be better disabled for now."
+	local ERROR_DRM_SIMPLEDRM="CONFIG_DRM_SIMPLEDRM: is set but may or may not lead to a blank
+	console with a NVIDIA GPU. If you experience issues, try
+	disabling it and instead use FB_EFI or FB_SIMPLE for now."
 
 	use amd64 && kernel_is -ge 5 8 && CONFIG_CHECK+=" X86_PAT" #817764
 
@@ -134,8 +137,8 @@ pkg_setup() {
 	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}"
-		ewarn "  <=sys-kernel/gentoo-sources-${NV_KERNEL_MAX}"
+		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
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-495.46-r20.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-495.46-r20.ebuild
deleted file mode 100644
index 6ef95b7be24f..000000000000
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-495.46-r20.ebuild
+++ /dev/null
@@ -1,461 +0,0 @@
-# Copyright 1999-2021 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
-	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
-		~!DRM_SIMPLEDRM
-		~!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.
-	Note: DRM_SIMPLEDRM may cause issues and is better disabled for now."
-
-	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}"
-		ewarn "  <=sys-kernel/gentoo-sources-${NV_KERNEL_MAX}"
-		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-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=(
-		$(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."
-}
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-495.46.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-510.39.01.ebuild
index 38e290de75f8..d4362145a76a 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-495.46.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-510.39.01.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,14 +7,14 @@ 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_KERNEL_MAX="5.16"
 
 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 " \
+	$(printf "https://download.nvidia.com/XFree86/%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}"
@@ -26,6 +26,7 @@ IUSE="+X abi_x86_32 abi_x86_64 +driver persistenced static-libs +tools wayland"
 
 COMMON_DEPEND="
 	acct-group/video
+	X? ( x11-libs/libpciaccess )
 	persistenced? (
 		acct-user/nvpd
 		net-libs/libtirpc:=
@@ -51,10 +52,9 @@ RDEPEND="
 		x11-libs/libXext[abi_x86_32(-)?]
 	)
 	wayland? (
+		gui-libs/egl-gbm
 		>=gui-libs/egl-wayland-1.1.7-r1
 		media-libs/libglvnd
-		>=media-libs/mesa-21.2[gbm(+)]
-		x11-libs/libdrm
 	)"
 DEPEND="
 	${COMMON_DEPEND}
@@ -99,7 +99,10 @@ pkg_setup() {
 	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.
-	Note: DRM_SIMPLEDRM may cause issues and is better disabled for now."
+	Note: DRM_SIMPLEDRM may cause issues and may be better disabled for now."
+	local ERROR_DRM_SIMPLEDRM="CONFIG_DRM_SIMPLEDRM: is set but may or may not lead to a blank
+	console with a NVIDIA GPU. If you experience issues, try
+	disabling it and instead use FB_EFI or FB_SIMPLE for now."
 
 	use amd64 && kernel_is -ge 5 8 && CONFIG_CHECK+=" X86_PAT" #817764
 
@@ -133,8 +136,8 @@ pkg_setup() {
 	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}"
-		ewarn "  <=sys-kernel/gentoo-sources-${NV_KERNEL_MAX}"
+		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
@@ -156,9 +159,11 @@ src_prepare() {
 	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
+	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
@@ -218,11 +223,10 @@ src_install() {
 		$(usex X '' '
 			libGLX_nvidia libglxserver_nvidia
 			nvidia_icd.json nvidia_layers.json')
-		$(usex wayland '' '
-			libnvidia-egl-gbm 15_nvidia_gbm
-			libnvidia-vulkan-producer')
+		$(usex 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=(
@@ -363,7 +367,10 @@ https://wiki.gentoo.org/wiki/NVIDIA/nvidia-drivers"
 	exeinto /lib/systemd/system-sleep
 	doexe systemd/system-sleep/nvidia
 	dobin systemd/nvidia-sleep.sh
-	systemd_dounit systemd/system/nvidia-{hibernate,resume,suspend}.service
+	systemd_dounit systemd/system/nvidia-{hibernate,powerd,resume,suspend}.service
+
+	insinto /usr/share/dbus-1/system.d
+	doins nvidia-dbus.conf
 
 	dobin nvidia-bug-report.sh
 }