gentoo resync : 05.12.2021

25 files changed, 634 insertions, 355 deletions

diff --git a/x11-drivers/Manifest.gz b/x11-drivers/Manifest.gz
index 92aadde4436b..d444c8636ff9 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 31e0d70a1099..cad57499f08e 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -7,50 +7,43 @@ AUX nvidia-persistenced.confd 213 BLAKE2B dd57e63944a97a77e83a8373dd34ef2f56824d
 AUX nvidia-persistenced.initd 404 BLAKE2B 2115075a9b0c9d0eeee55e2b3c531da82ae6aea5bf25bcedc618b108aeddab95c0ac852d6d9b96bd9bf6dba62a13db487d7c3627b244ef29c047bb7a137f2413 SHA512 34143639ca5456cacfbfcb2bc30e51dce02d9af4784791a84ba93a26f2f7f31f2dc75685bbed52138c35df310cca1c19072a5fab2b067f854550f5ee4d96aa9c
 AUX nvidia-settings-390.141-fno-common.patch 478 BLAKE2B 2b222b26049aeb6692350618bd1e4dff3c4f25452c1e18c5789fd3e85ffb3edba4c54c4cdf02aec95f65c7eafb2c01e39a76b888a4f0691de6279d2981ab4f5f SHA512 a6574bc7be6299ab6f7aa3b7872506cc135ffda5591f6d385f6828ca5691e964852b4461fde771130a17b315798f986c2af6e1108e9d2298dcdf3f786e665a93
 DIST NVIDIA-Linux-aarch64-460.91.03.run 111886330 BLAKE2B 24ab316e216caa61f7edb4dbcb34541709d3229d495e6ead95e99db7403cddee03467ee28d007f0fa3c4f2fa267e1994533c90a7a67885e9e76d501ab0f8aaa5 SHA512 edcfd3b11afe625c8996cda488a8de2e0e40eb4b95c8cf0ead9e1226d7cee8140a83c247d745ceefe997a39cfcf3e3f9bde575d97aa39090f97f88817d89cb28
-DIST NVIDIA-Linux-aarch64-470.82.00.run 183535007 BLAKE2B 8caa6afdb401240f90ffb007e438b39dc7af4131e39f37689cae3420d916b5de8aeb2ebaafcb20b1a595f37839a304c8e22df618faddb2e6f5e01dfab49f5a48 SHA512 21bda44e0b5ae18f3e0ca1e4ee86ced004bc54fe12f701ec087404ca50c95481ad96cd405bb4cfb76e47ca0e0234ee392128c685d2cbf85e33cd0608186bd9a5
 DIST NVIDIA-Linux-aarch64-470.86.run 183560501 BLAKE2B dab90940b4259ef65eedf775b4aaf5b25775241b78e7cff6181137dc580531ad96eff0f5c5a1c4f38797d0e4e05414384d00a11c6532105af63f087c2160d328 SHA512 785414e120b5abbc97b4af2645fef8ac8be586eeaf9c759cc2083a0ac0ae62a8c869afdea4e79cdc4f0c3e2de1700f7e0949441943ccc3176e2a42ceaa364245
 DIST NVIDIA-Linux-aarch64-495.44.run 210477242 BLAKE2B 8fb5419be19ab4feab158fb43f142fdc1471b756f7d43afac1c9e787465a991e291cac725dda266b2f454022aea7cb3e249c6f132963a89c97564ef378e876b4 SHA512 4d2ed853bc3d7812652f3e677ca1cf56f1b2563bc0a43cee2cf4544f8d3b30d8f29ccc994fc8f95e2c8b40b04efdca066b616983bf2e2fb9247d2d9a8503d4ea
 DIST NVIDIA-Linux-x86-390.144.run 49210937 BLAKE2B b7e6edb55af88be74e4322ff1d270388a60a9d9809314c3a0502f86ed97edb99dfcdd3c81c5f51e681c8fcc47ecbfecd124b4d733141d23726226a3965b4c1f1 SHA512 d962c7e7b4b9c4635a887767d34a49c401a89e5975a5e57fa83366ca824ab70d5b8a81f3dce2e05e0528afddc72d70b2fcd69a216bd16d75e7b88ec704390546
 DIST NVIDIA-Linux-x86_64-390.144.run 85000417 BLAKE2B 8ecfa768fb8fe92170ff5b82698a7fb22da8bc557ab2036464bf5650b6fffc7028e25a68e1f5638f6bc171eb45a4aba459465490c7a99aacd36dc769994062e8 SHA512 9503ebf41037a14deba995288a364768cb03fb682de8653a4b0c05955b23603443c41c4216c93eac7d7efc301734416012864ede728324ab47b93ff167d93da4
 DIST NVIDIA-Linux-x86_64-460.91.03.run 178201292 BLAKE2B 4d407b7bb3a99ab71c62c3cd18dc3549c98a24e7af28276e6e6a21dd33efcab017fed3f782f6dfb060c4437cd718f19c2f9900de367cc47bf19fa2718a18ad55 SHA512 4ac11130fe5a8f1c26f459e9c19660b3ff6f23011e9f77b09ca948fc42609e523ecea70d3bf6def50a75b4a3079ab280018753fb6e53875d9bb8093a033e3b70
-DIST NVIDIA-Linux-x86_64-470.62.07.run 272526158 BLAKE2B 1ead262eaecc4241b5019f043ddf11acc34acbb048abc1d3a01587d1673f4e806114ce68e3fed1053e17f17e4a450946a43aede156e0ea9a0bd5c8350d02c89c SHA512 73bc488ebba3fe6c5ac5b00e407dd64dbee8027fa088dc78c60df32bae1b777e37e493ea512718f5b08d8d41ac41efc60a4e5ad878e853472784365fe528ea45
-DIST NVIDIA-Linux-x86_64-470.82.00.run 272296454 BLAKE2B f28f4a66fb27ccf7967ad66f9dcacc306653895a5f9c63f49e7833f5ca37e6260df37fe28abff89cc2ff9e54491b39594117235e4e87d3b1e22e58de8e69fe5b SHA512 f4135efd748d8835e9719e6ef93a86c5646a4d771c63e31f0bdaa0cf6ddf25ce9356eca58c27addb988f4cbe88c9bdcc0536512a46915826261d8f4f4247ebd8
+DIST NVIDIA-Linux-x86_64-470.62.13.run 272974366 BLAKE2B 08f8e5828adf3823f0988abb67c0a2b92b80637b2a28e24f056884aabad69c7ac929c8c32594c3d63d8a1ee69f58f9a99cadab9b1a2bc3e42ddab3146ab7376c SHA512 5228bdb88a005bec9cd66f23197b0f1ee8b9d7c5c68b3d13352102125d21da67c6800cbe18215d77f2b3dc59a7ab9cdaf78f42b21e87b7eb8123bbc9f3b6a42e
 DIST NVIDIA-Linux-x86_64-470.86.run 273149806 BLAKE2B c7f5a64dfb6547856d5bccdce0fcce0f6180966961245508cdc96e672ae500940f35fad0a9b8e8e9692b5cc67d68504371e041364e3a367deb4e1c3c75222c20 SHA512 e541549967ee992b8e6812cb6a294307217e66c7380ec17ff143ddc637f6e3a5b6c807ba8e29bf4c3d6813d7589a41aa124e8a5709a484ecf7fedfe420598a06
 DIST NVIDIA-Linux-x86_64-495.44.run 282259831 BLAKE2B ca11406a5b1b25d9691ec61d4125457c22438b8f0af0651043235f72ee75c4b264cfde7b04840bbec15c22bc5eb657a46326b49941e6c776a8990430cf052818 SHA512 bc9054e6028ba172906e6eb9a0b8f5cfc3ae74d57f3e95e0f9057879e3af07a4b19479e80d81e948872bc47bbd674f77f5f81d4debd2e2c3ce45058cd9211802
 DIST nvidia-installer-390.144.tar.bz2 150017 BLAKE2B 1a633594ecb9b54ee5a1e3620263a95db30c1ddebf547ecc7f267e1f0b799bcdb44cc3ddd6c96eda085d9be5c8f691e92556296f250495d80eec0c2f155f5bd5 SHA512 e4c624afc18bd1d61264f93bdcbc72afe42687baadf31683a6dd11a45c6257f6a5185b91f4b3d4c0316b8eb03ed79511f9ad260ee9e6f299fc136f5dc2178e42
 DIST nvidia-installer-460.91.03.tar.bz2 144463 BLAKE2B b8c381158f614331fbfd04dcfdd7227fcb3eb16cbe4e3cbcbb34ba6af2370b05ebd72dc46375b2099b950817e6a0565c418e62b6364f1d7269f78c1dce5f5535 SHA512 10c873597202a1d8aa0dc4629b1e64f8c1f65a68c91f6babe312cf9fabbb9257b77d03a3917c0f4f5d6994e90cf58c6c7d9a802a675ea3ef60b571c9b7abc391
 DIST nvidia-installer-470.63.01.tar.bz2 146093 BLAKE2B 49f16fd7b27552013067410e3cfc80d44a4ec9c454d5db542caaa84b34e20cddabdeba2391d451aab39c832745fc2fbfc5bda3876a67859027d83b482d55118f SHA512 92d680d845abb39d77a51ccc47f1102825387b664e87fb2f5d976a0a4cc6baee508fe86bc92f5f0c77f1cec61506826b155ca1ef02708c39d145c9d897868397
-DIST nvidia-installer-470.82.00.tar.bz2 145932 BLAKE2B 787c65a36ad27a5703f2fbbb89055955875bb3645038f379ca4b34fbcd2833a20b24a515b49f0c5148b263af4d764765131ffcb44f2a7234166a4131a0ec08da SHA512 80718e8e86bf17e2cdc3796daf24a02e6f647974118849b250b18e44ae3f72c1a1cbdc1c53894012d25af1976d86c7eadea40a46883f510ab000b3dba0fdcbd0
 DIST nvidia-installer-470.86.tar.bz2 146359 BLAKE2B e1df27887ef7168dc50d54fd688fa04e80f79065c26386aa8f5f2b0726302a0dde51093d93c24d4145d0ff72cea14e76eee4fb9503c16a562c211dab9b2fdeaf SHA512 8bcc9a32d9f6c3cb778838124be5b112edf1b38753842bb436db74ae6448b4b7a367b79585f28bee9f2a41844e71083cea9b59beab99c14598a8d855ac432113
 DIST nvidia-installer-495.44.tar.bz2 147036 BLAKE2B a340d1629ab133d072cd7d673a474ec834c2cd71f35b2e98d837deaa6535a784c93978ec484c5060ff28cf845d5cffa08b368b3b8b18a7ddabb4a7cb1c7a0ad0 SHA512 9f9f592b2d73515a484720eb421774a28b39af0ba3fbea127d1987533ed0f42104f640da6211f9eee63cc1063aad68dddfe8d378e3ef590c7f77d54e56bbb8bd
 DIST nvidia-modprobe-390.144.tar.bz2 35308 BLAKE2B 1930c315aeb0e296c0d4795170d44a275da5ff8838fd8230559227852001b679fbca2830142ca7abcfa9c84626c9d9f222f7ab0cb3984d8d517f5ce431e5a9ea SHA512 d542c1a7634a8c5ff803ca79f2fc02b17b129185177226ad60625a4d246bbaf740719ff024dbde0f5aa8273949446561261d700a27cf88217c2572e69882142c
 DIST nvidia-modprobe-460.91.03.tar.bz2 38144 BLAKE2B 660b381f8757fe8862f7c4a971e44d3124afa3783d52af29543b8ed67486ba03b76c0b5d8dfadc5da8fdcc2c8799ec5f9c3016fd58e9c209fcc3ae897fb0436b SHA512 aa47a9c0744b8e11e87d2c0f300b13fee435cd5225444be7fb0b6bea49af33811dfa723a9ccfe904c7de2b5a8da36b707c1024eb495e3f0b587e3231a4bc4f39
 DIST nvidia-modprobe-470.63.01.tar.bz2 38357 BLAKE2B 906f966df5aafe5478550bb30b4d624247c2c621ecc5e21fa9aa0e37f1ffe39b3e44d70f24864d49c99c63d5a5045057f46b9b364f6f662bd5676b242fa3c265 SHA512 f41a168fe4b2278cd4cc53dd0e334e7e7dfccc91abd818b7e2b5d67c3a806d2ce5d1b11cd3cdc2f4507cc0baf42c3c5985784e19665c7a3bafb9ab433132271e
-DIST nvidia-modprobe-470.82.00.tar.bz2 38350 BLAKE2B 1324ac11fdb9a8b8fb3f5694aa22688835ca440349036c72ad08ceeb98a518a469d5dadeb167578652c8dcfeb6d50564eaa4688a03892916a0b2140ead8ccc47 SHA512 6d3faefdcd6ecdf45a196a369cfb67adb9e813f5cbbac1a094b900abd7273ee5a1bb93dc4cec90e45fd8595cf431dea97d0f380a517bad75fd2754b48d5eaa64
 DIST nvidia-modprobe-470.86.tar.bz2 38361 BLAKE2B eacef469888392d5993d018421e50cc594fadfcbe1367f13b68519c15d097759a91d3e294e3dc7391d2e3f93783fcd2e696ef25a7b4aad90abd18d992c480623 SHA512 5478bdd01aa7af79fcc6264b347b78bf68d2ade77eac388eb6968db72056859443778d0aad7bae1d5d63c01af332a21504fff13ac3e226446c8a71beef777860
 DIST nvidia-modprobe-495.44.tar.bz2 38377 BLAKE2B f1695c778c25d41795b1bda43df68a1dea9c3d16fc00acebe5948aeffd8aef174cb864d85260565fad8ac8c454ad3ad0cfb76529d9f88c3f10547de11492c61c SHA512 cdf7331609ce2a400f2b0e987bdbd2450a07e837971ac94b5ab746874259e6e7a4bff5eb8b9518f786365af74e8650f1c5ddfb745f867a6777825f550a6a74c0
 DIST nvidia-persistenced-390.144.tar.bz2 48672 BLAKE2B 82a92a33eb40971e56b772ffab121214f5675d0a8c618e356e7b55bc38ff9605fd2701d740d00a1e26c158c9df0ab38d0ba10891a3850f8e8cbee8fb231ba52d SHA512 4432f2dd18c7c91fd0d59e4f2bdf7254f58ed2a6b652d319c4f7ce674522da1797a68dd6939c38e71710dcd3b754ae7cc8c6e7acb47a76e13d2091e8a8ee99c8
 DIST nvidia-persistenced-460.91.03.tar.bz2 46160 BLAKE2B f7f34cc12de2a4d69184c60caf7a8e8025b58005ade0a3e9a1a0e95856055f7211a710a1145d674d8a2e97cf70a43175cbc5c9a5dabc49ce378623be1720c6ea SHA512 c3ff5875353c264cb224b3f512ff8308bf1b0b95282e34500d88da2574719c3c514581e5900841b089c2e6f0fe29198fa06a11668de8e21c59f9f96244a74757
 DIST nvidia-persistenced-470.63.01.tar.bz2 46544 BLAKE2B c2bbc76bc06db1dc963ed34731fc9ca9ad2145dad4326586a7e37a395ff8ffac940800138bec08cdfafa9eb8ab5b79412e66e78cb5ef58aca4ee476d31ce0c89 SHA512 6ae699cae67911f92ac2dae82856e0a4d31a8d47a3d2e8e6fbae6469f28960caab4a56aae1a1ac3de0339c78dedc344c09136ec922690abd9fb5abc96afba5ca
-DIST nvidia-persistenced-470.82.00.tar.bz2 46520 BLAKE2B a80af6109b72c93c2a5f23f8066b4715c2138ea2001eb7c584ecc1fa38d8fb9b78e6859acc26911c7658d8b8a1f13682fccf7b7b4acf882cd26391fd179741e4 SHA512 f33472e05583a39594119b899afe841b8676089bfd824abd4cf42c8cba3b24d1ac298e0def6b32ce55b9d1321bef7dae77c81aeed9c8d1758489ce6cd2e40be1
 DIST nvidia-persistenced-470.86.tar.bz2 46523 BLAKE2B 29b60ff1a4e7db8ff8a2b32ab6ff2efd5d5010cb66ba1678e76a55fbe4b9f51ced06f9939ee2b44d5e073d7cc5b7b246fd2a531d9607b452a9a85cf6519c783e SHA512 6194ebc246d305ad5cc4276c1d2fa06c383e28ee8accef0e39ef3dedf637684837c10b78ee2b96a0b77d3e6e5e3c3555fe12629984f8ebc6358b96e303cb81a2
 DIST nvidia-persistenced-495.44.tar.bz2 46259 BLAKE2B ed34bb3b82a24fe7e651eaf671469988f32a9fa4782f0a8d8f08499b85cee596996611f08fe8e26a295a3073ae6a5bd59c44a1d9c6db41138339656e932aa7df SHA512 d295caaad65336495e22ebf890f6a1d323b9fabd0fb4900c8d4e37044f472836327743fceb6d433bd1ef61dffe8a84a655ddf81b2eff085c7e913105a05cb47e
 DIST nvidia-settings-390.144.tar.bz2 1109104 BLAKE2B 6724f49c7e469f580206fc17308190bd346b6167348a8b8b3886209f58aca61b65eff30658484c1fee40af8c0d89fb62f73329b05a6ac45178ea4a6870e5aa85 SHA512 90afe201361d492c3152057d3ec46d68c0cd722fe0ea0587aa1156718017d59fb5f26f3db89d91d4680b2390617867dbe93bd14e1fb3dc70402527bfacf0ae5c
 DIST nvidia-settings-460.91.03.tar.bz2 1061093 BLAKE2B 13f1da07eda3a0e7e96ac69091e4a34fcd75a8f459a4db3840c64272dd54080694c4df3b7c326884ff032eb1b8708b5e19107b112afee2c80eed242281292b02 SHA512 172ea3366065aa30e71a5a47b31366d076477b8801a8a37e0d76972406e69c8872daa80011ee020960bc5e00163c4e9e5f63aa4f0dc726065671d76851b4ad71
 DIST nvidia-settings-470.63.01.tar.bz2 1062399 BLAKE2B b3193ef94cf3cde41cf2b5f38cc39c090e54b5c0f980bdf6bff318554d155cb3639d5d65baf7148b5a5d378f483b3235aaa4ffa0cd625b44e7dd4ffcb7156f00 SHA512 d8458f8e103de0a5026857009da6cd55e969fbc2481d526b7e22fac92e865f9f226a2670bd984b743be093acd0fcd1970c1a20819ca736b0582b645a5c4c6e1e
-DIST nvidia-settings-470.82.00.tar.bz2 1062116 BLAKE2B 091b66bb2ff1379735d2c1bb2090f86c41340ddfacca7c827e873233e6812583c2f37cc5dc434229c8c368e2b80198aa0de18738bcb19b31f969bef043c5d4cd SHA512 a746aba8b5c257fa5f6c76acdba680f821cdd2ddf421a3fd94facd5db5c810d0f27d9fb7a8633768188f45c79f77efb7ff0e8594c19385eda98f23550b031cfd
 DIST nvidia-settings-470.86.tar.bz2 1062317 BLAKE2B 348c0346cb224eacceb570c833d74dbafc79be0fa54cf1953a96ba4198e0c76784e482284fc6790edab31bdcff3a70fe870e4634c5442b455db9c92332b28747 SHA512 4a53f4d3f52e569c4957890fbc4a4c7b2429bbca5ec07901ebb20f1848cc9a5da3e36e206719419462076793bba0b51d37a11e0856be371a19f5b7f0f2da26e7
 DIST nvidia-settings-495.44.tar.bz2 1062420 BLAKE2B 98d5ac73f279bc3d415e3902946eca15fe4d61978dde5b21a96e9e1367129b9949078bd2c3778d344237ff4b9cf65a2921025a6410394f007dd97f441dc320f4 SHA512 e69bb32e47a43368de1959a0c8a877281bba0139119b1a34f6da86e006a8b0dce5bafe0fd017221be40a6bddcd93934e9479cbb8f04fb979b84f5f206835118e
 DIST nvidia-xconfig-390.144.tar.bz2 107147 BLAKE2B 1b6ea6dfbe33474cd3e9409a7559a38716c4ce8d2583354232225a2a7ec10c7dbc2163f07c6849f4929e16c2fad179d583daad8a67d9cba950a62209b8ebebfa SHA512 09bb3558be178deda4b26031560ebad4e98e68b6186e247d4638cbcb4bb5dc05937c6baeaf1cd4db5a7b7433af97c3150c526ed972ff51b6e1c7552235ec6b51
 DIST nvidia-xconfig-460.91.03.tar.bz2 108477 BLAKE2B d95505e508ca16d8ebe8c22c445a1b686c32a626c379b1b48e2a8101969fc03b90446953cc30e945da9388237fa1b9e5f83417aba1fb062d58866a523c256769 SHA512 4bb8f7fc42e7fa5e3897884bd7e722c4fe8ab1e4a87cad4136e1764cdd91d4795f817dcee63a20279315b4839d92fe5244d073ea2310c704f8aacd38bacb28a4
 DIST nvidia-xconfig-470.63.01.tar.bz2 109078 BLAKE2B 786d4be4e1aa23ecdd51b0c5628e27a42472f4f119979acc62d100e094d077be6c7b893353d7d31ea4a47fe99135c01ea4ca0b539da62379295644fcd7b38c79 SHA512 5a3b599cba4be7e272fb1fc3c1dc31c09b1f101f81e7d24a27cf88d96746d42c84ba89f5ebeb4f602e012e0aa04804015cab5cf24947e60131652f1e010e96e2
-DIST nvidia-xconfig-470.82.00.tar.bz2 108687 BLAKE2B 2c0880fe27f1742b51bc40392f8b966c5bb345001eebb66318dfe0f6d946cf2c525e3fb740d97f898fa0114413595360c9e84cf4f2100c68511488e1d2e7a710 SHA512 e48bdb93f0ccc1779c03015c00bf936300b43c07f619985c45739cd794b782f936be937454d2f449a6b8c919b2d1181d290917061b3b9a6e32ae6d15a83e156a
 DIST nvidia-xconfig-470.86.tar.bz2 108946 BLAKE2B 8711d46e18db89c94fe9986e3ea296504d1d4795be745f9ab9eac35e499220335fe882258bc52c1a9dedd7848c9715f8bf481e3690913204db71584b0913b85e SHA512 ea658567b7532ae3a33a1783ef224b7f57db34391280f529352cce042b8104ee8092b3585b7eef8cd5b295e4f8246e872d935c32edf746ca38651b2df21e7e6a
 DIST nvidia-xconfig-495.44.tar.bz2 108699 BLAKE2B 8027d9b14f16c792e0839746c549979017e52724a5826cad3b53cda0fa2638b6f7dfe72353e36b84084f4a56a004cd91f87ff1d1d9e542b5d760e47092268993 SHA512 624aa71f319d7d8e3383580eda5c6cfc986ef4c3a9c14493cd561cd3ba758763d79731bb7e7e03fc89d3b8a3a8b65cee324de1d9980b5725678ccd50cb26175e
-EBUILD nvidia-drivers-390.144.ebuild 11711 BLAKE2B dda27ed4e208204e00a0ea07353d6dc07d2324c7c7366e9b25a143f4d0a0a31144a8e6c61f2420fc3c88f4f6d86f4e582b7e8a84845f40d658c598991e1b3f25 SHA512 bfab5c364f04f87cc5ab13b04f65e9037a8e2f19202419797837e0e0c1396f1c822f853a5ae1477cb9b7c76e1761314bc2015569fe15fc95fcb3ce118bbdc565
-EBUILD nvidia-drivers-460.91.03.ebuild 11875 BLAKE2B edc8991dae9896d93f8542a7e2c9274d6e90f23e9c17bcd9c81b82bae15d3871b36cce43e88530b559766a257196f3562fe2529e0dfa85788fa7b8968e2923ca SHA512 039d69b5a1d202a1701e1a662aeec1055540e93aec0bf8f5fa45fb8da5ab68ec561c3cad670600eeb00aec9251aab22b6e4cf7b675be869f91457b3e73b6f67b
-EBUILD nvidia-drivers-470.62.07.ebuild 13899 BLAKE2B c9e9628a5719fdf216dac5af6a84d4823e1cf1226df54820557baf1f76e3e4ddb0e0da94a62e88bf77df2a9041b00b63337ce15784167dcd7d7c00ac9e6e5771 SHA512 c5901655c9448a015541be100dba5f9fb16d6163277a739e0c98e06ee822db8834ae74e06540f9410d4492875c237cce38cb3fd7ebc4bbc76b486bc21c100850
-EBUILD nvidia-drivers-470.82.00.ebuild 13782 BLAKE2B b6771c81e0234c707c2590acdfc7f25f0cf7de009248bf85b632d62c6f266959ae28551eff62e23cc5e4014b967d308f1591ceaff889d3f5a234c5e242d38cb2 SHA512 2a788f115c3a3ba784c7ac4a0e1b31e30075a46a281f562b7d12a18d801f815f1a4c49392617845f327a8fcc70ff6e5df5046af4c69b3238b96d25e24b3d5b0f
-EBUILD nvidia-drivers-470.86.ebuild 13783 BLAKE2B dfb5a935fa136e8a47136a7bda0aff15e59afcfe5af4996371d1c26de04add832a2d3cbc56a338484f96f71b066c9dae269d624f6e2398130a12eef811d76526 SHA512 b14d55c7456f3607054721e36bf5b5f44b34135f1246e1c12bb76e6594a02adb0fc8dae752cfe6124add23a5041f0c95578a162476de2b9a105f5152f9a55bc6
-EBUILD nvidia-drivers-495.44.ebuild 14599 BLAKE2B 168834d0277811dae270a1e413afcbad1cc215a44634e40f4c4e93a3c86e7c1dbb315ee58370ce16703ac1912f1ab73da27a77a79de5f8a42deb55c1f85a2c4a SHA512 f5e7bd25861ddba1caa40334402282987ec7bbe19994dea921378ad0e8321307997c279ed72f7a0b36e2ccf5a08f5dc1e7dc1e908b857faae9e652b7333de2fb
+EBUILD nvidia-drivers-390.144-r1.ebuild 12258 BLAKE2B f7335d0aea8f249c445fbb2798c3823b34376d01fafcad56e264ea50e736101d761f11c7912d0b36e53cd5a5bbc734c67466a626eea13a1287c8b3d1efd3e58d SHA512 0ca5bde83dc1228318c61aed962e51de220779abd2c87ef5a9be730a6ced33b44c021b6254a92751af0d6562939a78bd42bdc6c9061aa837f9622bc18b0e2744
+EBUILD nvidia-drivers-460.91.03-r1.ebuild 12419 BLAKE2B 3d432572e0c2aa2f4763fa6c72e496b8e4f9a68005b66ed61a878443ead6822d5d087df26c3d4b947814cf70dff828b6016beced479c88eec52c9c94136e9bfd SHA512 f6cbca725d66a8452a036e51c62218f2bff56210ba8d79c12fd3bd8d013fdf2360cedbbd4c0f536ee4eb812c76c3c944804549c140235d1258775bc6209893c7
+EBUILD nvidia-drivers-470.62.13.ebuild 14389 BLAKE2B 0a7f87221700220122e3a27b4e5f1efc5bf8dd132c7f3d16f8b4d05cf8088ebf8a639a835b1f5251adc575faf99c72ac5a2c6d03354778d499a4adc7ae2e7e12 SHA512 8401940a7e306134377980fe529ca48c7795cd7fdf977254c2dfda03459350ecee456ae7f7c17c0ff818eb24f3f447d97062ccc255e252110c0d40414fdcdd9d
+EBUILD nvidia-drivers-470.86-r1.ebuild 14272 BLAKE2B ac33cfbb755186dc926cd588a3717627c96d1a6c0069eb8e4bbbcc88299fb2f1ca5b79d5ef1976ab2f04907f8dbaf18fbab72af09f48e8d9b8a634c6de7de87b SHA512 758522fe1c594ee717a55bce926eb41b551a955068aacca7b3784efaaec02d58ab886cd46322218f1b2bb8d3ae3d0b27f21d5eb2749ad0a0ddbd62b129bdbf18
+EBUILD nvidia-drivers-495.44-r2.ebuild 15890 BLAKE2B fe1b0aaef223cfe6bda708fec7d73fd6cda59d10803b90368aa7b6722eaed6e73f108f39ed4447f391a415b2b5ad909320aef48bba222a2bc42b2dd96eaddd81 SHA512 aa5d4fec51b6d6105750c155224bed0fd3d19adcf54a9e29a7ba8ceae5dc298d1a976b04c70170fe5d77cb19c7d0fc41ef12ded6783e28b09a8496c93dedfde4
+EBUILD nvidia-drivers-495.44.ebuild 15089 BLAKE2B 586e009a81f18ceaf4513e497643e30dcbab44742533e4c8d35ff422471e3dc108aaa2f9ba962007865d5e57371063b79abe777490bb7868193f538cf2f6e59b SHA512 4506fbb410ef28c6598e03192759d9b3a6ef68dd4ad0620bbb3eacdce1af757be502339836fb31b0fcdf269b46fdcd2e79c7ce75b9fa62afde330e557d002253
 MISC metadata.xml 902 BLAKE2B 4c8373f3c7ac73f1f2b18e9c4a9a95868fe2c780aa4b200e366823e6094cd28a74e7a6e2a4dcbe1df3b711ddc753d497e9bd43ae677f1bdddd0e20aa3997beb1 SHA512 0d165817d0cdb0bbe3c8c4e096e058ba8f4ba8bdb92fa4705b68412dce07213c73c522fd35b3f93da963a5f24f03725e32d6db63c75e01c93a8be4c7f2c1fa4a
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-390.144.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-390.144-r1.ebuild
index 118b158ca051..1004d1b629b8 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-390.144.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-390.144-r1.ebuild
@@ -69,6 +69,7 @@ BDEPEND="
 	app-misc/pax-utils
 	sys-devel/m4
 	virtual/pkgconfig"
+PDEPEND="X? ( <x11-base/xorg-server-1.21 )"
 
 QA_PREBUILT="opt/* usr/lib*"
 
@@ -96,9 +97,11 @@ pkg_setup() {
 		!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 optional nvidia-drm.modeset=1.
-	Cannot be directly selected in the kernel's menuconfig, so enable
-	options such as CONFIG_DRM_FBDEV_EMULATION instead.
-	390.xx branch: also used by a GLX workaround needed for OpenGL."
+	With 390.xx drivers, also used by a GLX workaround needed for OpenGL.
+	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 || use x86 && kernel_is -ge 5 8 && CONFIG_CHECK+=" X86_PAT" #817764
 
@@ -142,7 +145,7 @@ src_prepare() {
 	fi
 
 	# prevent detection of incomplete kernel DRM support (bug #603818)
-	sed 's/defined(CONFIG_DRM)/defined(CONFIG_DRM_KMS_HELPER)/' \
+	sed 's/defined(CONFIG_DRM/defined(CONFIG_DRM_KMS_HELPER/g' \
 		-i kernel/conftest.sh || die
 
 	sed -e '/Exec=\|Icon=/s/_.*/nvidia-settings/' \
@@ -356,7 +359,8 @@ https://wiki.gentoo.org/wiki/NVIDIA/nvidia-drivers"
 }
 
 pkg_preinst() {
-	has_version "x11-drivers/nvidia-drivers[wayland]" && NV_HAD_WAYLAND=1
+	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
@@ -386,7 +390,15 @@ pkg_postinst() {
 		elog "Other functions, like OpenGL, will continue to work."
 	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 [[ ${NV_HAD_WAYLAND} ]]; then
+		elog
 		elog "Support for EGLStream (egl-wayland) is no longer offered with legacy"
 		elog "nvidia-drivers. It is recommended to use nouveau drivers for wayland."
 	fi
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-460.91.03.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-460.91.03-r1.ebuild
index 8929d0efa1ec..416d84b7d48a 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-460.91.03.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-460.91.03-r1.ebuild
@@ -69,6 +69,7 @@ BDEPEND="
 	app-misc/pax-utils
 	sys-devel/m4
 	virtual/pkgconfig"
+PDEPEND="X? ( <x11-base/xorg-server-1.21 )"
 
 QA_PREBUILT="opt/* usr/lib*"
 
@@ -94,8 +95,10 @@ pkg_setup() {
 		!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, so enable
-	options such as CONFIG_DRM_FBDEV_EMULATION instead."
+	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
 
@@ -132,7 +135,7 @@ src_prepare() {
 	default
 
 	# prevent detection of incomplete kernel DRM support (bug #603818)
-	sed 's/defined(CONFIG_DRM)/defined(CONFIG_DRM_KMS_HELPER)/' \
+	sed 's/defined(CONFIG_DRM/defined(CONFIG_DRM_KMS_HELPER/g' \
 		-i kernel/conftest.sh || die
 
 	sed -e '/Exec=\|Icon=/s/_.*/nvidia-settings/' \
@@ -357,6 +360,8 @@ https://wiki.gentoo.org/wiki/NVIDIA/nvidia-drivers"
 }
 
 pkg_preinst() {
+	has_version "${CATEGORY}/${PN}[abi_x86_32]" && NV_HAD_ABI32=1
+
 	use driver || return
 	linux-mod_pkg_preinst
 
@@ -406,6 +411,13 @@ pkg_postinst() {
 		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
+
 	# Try to show this message only to users that may really need it
 	# given the workaround is discouraged and usage isn't widespread.
 	if use X && [[ ${REPLACING_VERSIONS} ]] &&
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-470.62.07.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-470.62.13.ebuild
index e0de37e6d8c2..0cc7549b27a9 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-470.62.07.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-470.62.13.ebuild
@@ -100,8 +100,10 @@ pkg_setup() {
 		!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, so enable
-	options such as CONFIG_DRM_FBDEV_EMULATION instead."
+	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."
 
 	kernel_is -ge 5 8 && CONFIG_CHECK+=" X86_PAT" #817764
 
@@ -155,7 +157,7 @@ src_prepare() {
 	default
 
 	# prevent detection of incomplete kernel DRM support (bug #603818)
-	sed 's/defined(CONFIG_DRM)/defined(CONFIG_DRM_KMS_HELPER)/' \
+	sed 's/defined(CONFIG_DRM/defined(CONFIG_DRM_KMS_HELPER/g' \
 		-i kernel/conftest.sh || die
 
 	sed -e '/Exec=\|Icon=/s/_.*/nvidia-settings/' \
@@ -390,6 +392,9 @@ https://wiki.gentoo.org/wiki/NVIDIA/nvidia-drivers"
 }
 
 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
 
@@ -411,8 +416,6 @@ pkg_preinst() {
 		fi
 	done
 	rm "${ED}"/usr/share/nvidia/supported-gpus.json || die
-
-	has_version "x11-drivers/nvidia-drivers[wayland]" && NV_HAD_WAYLAND=1
 }
 
 pkg_postinst() {
@@ -446,6 +449,13 @@ pkg_postinst() {
 		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"
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-470.82.00.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-470.86-r1.ebuild
index 3d1a96254bf1..09afc857b0b1 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-470.82.00.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-470.86-r1.ebuild
@@ -94,8 +94,10 @@ pkg_setup() {
 		!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, so enable
-	options such as CONFIG_DRM_FBDEV_EMULATION instead."
+	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
 
@@ -149,7 +151,7 @@ src_prepare() {
 	default
 
 	# prevent detection of incomplete kernel DRM support (bug #603818)
-	sed 's/defined(CONFIG_DRM)/defined(CONFIG_DRM_KMS_HELPER)/' \
+	sed 's/defined(CONFIG_DRM/defined(CONFIG_DRM_KMS_HELPER/g' \
 		-i kernel/conftest.sh || die
 
 	sed -e '/Exec=\|Icon=/s/_.*/nvidia-settings/' \
@@ -385,6 +387,9 @@ https://wiki.gentoo.org/wiki/NVIDIA/nvidia-drivers"
 }
 
 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
 
@@ -406,8 +411,6 @@ pkg_preinst() {
 		fi
 	done
 	rm "${ED}"/usr/share/nvidia/supported-gpus.json || die
-
-	has_version "x11-drivers/nvidia-drivers[wayland]" && NV_HAD_WAYLAND=1
 }
 
 pkg_postinst() {
@@ -443,6 +446,13 @@ pkg_postinst() {
 		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"
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-470.86.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-495.44-r2.ebuild
index c8bdaa813a90..2d3b9d77fc0b 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-470.86.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-495.44-r2.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 MODULES_OPTIONAL_USE="driver"
-inherit desktop linux-mod multilib-build \
+inherit desktop eapi8-dosym linux-mod multilib-build \
 	readme.gentoo-r1 systemd toolchain-funcs unpacker
 
 NV_KERNEL_MAX="5.15"
@@ -23,10 +23,11 @@ SRC_URI="
 # nvidia-installer is unused but here for GPL-2's "distribute sources"
 S="${WORKDIR}"
 
-LICENSE="NVIDIA-r2 GPL-2 MIT ZLIB"
+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
@@ -55,6 +56,8 @@ RDEPEND="
 	wayland? (
 		>=gui-libs/egl-wayland-1.1.7-r1
 		media-libs/libglvnd
+		>=media-libs/mesa-21.2[gbm(+)]
+		x11-libs/libdrm
 	)"
 DEPEND="
 	${COMMON_DEPEND}
@@ -94,8 +97,10 @@ pkg_setup() {
 		!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, so enable
-	options such as CONFIG_DRM_FBDEV_EMULATION instead."
+	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
 
@@ -149,7 +154,7 @@ src_prepare() {
 	default
 
 	# prevent detection of incomplete kernel DRM support (bug #603818)
-	sed 's/defined(CONFIG_DRM)/defined(CONFIG_DRM_KMS_HELPER)/' \
+	sed 's/defined(CONFIG_DRM/defined(CONFIG_DRM_KMS_HELPER/g' \
 		-i kernel/conftest.sh || die
 
 	sed -e '/Exec=\|Icon=/s/_.*/nvidia-settings/' \
@@ -169,6 +174,16 @@ src_prepare() {
 	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() {
@@ -227,12 +242,11 @@ src_install() {
 			nvidia-opticalflow
 			nvidia-ptxjitcompiler
 			nvidia-tls
-			$(usex X "
+			$(usex X '
 				GLX_nvidia
 				nvidia-fbc
 				vdpau_nvidia
-				$(usex amd64 nvidia-ifr '')
-			" '')
+			' '')
 			$(usex amd64 nvidia-compiler '')
 		)
 
@@ -242,12 +256,14 @@ src_install() {
 		else
 			libs+=(
 				libnvidia-nvvm.so.4.0.0
-				nvidia-cbl
 				nvidia-cfg
+				nvidia-ngx
 				nvidia-rtcore
 				nvoptix
-				$(usex amd64 nvidia-ngx '')
-				$(usex wayland nvidia-vulkan-producer '')
+				$(usex wayland '
+					libnvidia-egl-gbm.so.1.1.0
+					nvidia-vulkan-producer
+				' '')
 			)
 		fi
 
@@ -273,7 +289,7 @@ src_install() {
 		doins "${T}"/nvidia.conf
 
 		insinto /lib/firmware/nvidia/${PV}
-		use amd64 && doins firmware/gsp.bin
+		doins firmware/gsp.bin
 
 		# used for gpu verification with binpkgs (not kept)
 		insinto /usr/share/nvidia
@@ -297,6 +313,13 @@ src_install() {
 		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
 
@@ -348,6 +371,8 @@ src_install() {
 	doexe nvidia-debugdump
 	dobin nvidia-bug-report.sh
 
+	doexe nvidia-ngx-updater
+
 	doexe nvidia-smi
 	doman nvidia-smi.1
 
@@ -385,6 +410,9 @@ https://wiki.gentoo.org/wiki/NVIDIA/nvidia-drivers"
 }
 
 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
 
@@ -406,8 +434,6 @@ pkg_preinst() {
 		fi
 	done
 	rm "${ED}"/usr/share/nvidia/supported-gpus.json || die
-
-	has_version "x11-drivers/nvidia-drivers[wayland]" && NV_HAD_WAYLAND=1
 }
 
 pkg_postinst() {
@@ -443,6 +469,13 @@ pkg_postinst() {
 		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"
@@ -454,6 +487,18 @@ pkg_postinst() {
 		elog "Of note, may possibly cause issues with SLI and Reverse PRIME."
 	fi
 
+	if use wayland && [[ ${REPLACING_VERSIONS} ]] &&
+		ver_test ${REPLACING_VERSIONS} -lt 495.29.05; then
+		elog
+		elog "While this version of ${PN} adds GBM support (allowing a wider"
+		elog "range of wayland compositors, such as sway), be warned it is very"
+		elog "experimental. While not essential, some features also need"
+		elog ">=egl-wayland-1.1.8 which is known to cause EGLStream regressions."
+		elog
+		elog "If lacking a cursor with wlroots, try WLR_NO_HARDWARE_CURSORS=1"
+		elog "Also of interest: __GLX_VENDOR_LIBRARY_NAME=nvidia, GBM_BACKEND=nvidia-drm"
+	fi
+
 	# Try to show this message only to users that may really need it
 	# given the workaround is discouraged and usage isn't widespread.
 	if use X && [[ ${REPLACING_VERSIONS} ]] &&
@@ -469,4 +514,9 @@ pkg_postinst() {
 		elog 'USE="suid -elogind -systemd" if wish to keep using this feature.'
 		elog "Bug: https://bugs.gentoo.org/784248"
 	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.44.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-495.44.ebuild
index bc8689cc2750..7d5b9d3dfce6 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-495.44.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-495.44.ebuild
@@ -96,8 +96,10 @@ pkg_setup() {
 		!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, so enable
-	options such as CONFIG_DRM_FBDEV_EMULATION instead."
+	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
 
@@ -151,7 +153,7 @@ src_prepare() {
 	default
 
 	# prevent detection of incomplete kernel DRM support (bug #603818)
-	sed 's/defined(CONFIG_DRM)/defined(CONFIG_DRM_KMS_HELPER)/' \
+	sed 's/defined(CONFIG_DRM/defined(CONFIG_DRM_KMS_HELPER/g' \
 		-i kernel/conftest.sh || die
 
 	sed -e '/Exec=\|Icon=/s/_.*/nvidia-settings/' \
@@ -397,6 +399,9 @@ https://wiki.gentoo.org/wiki/NVIDIA/nvidia-drivers"
 }
 
 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
 
@@ -418,8 +423,6 @@ pkg_preinst() {
 		fi
 	done
 	rm "${ED}"/usr/share/nvidia/supported-gpus.json || die
-
-	has_version "x11-drivers/nvidia-drivers[wayland]" && NV_HAD_WAYLAND=1
 }
 
 pkg_postinst() {
@@ -455,6 +458,13 @@ pkg_postinst() {
 		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"
diff --git a/x11-drivers/xf86-input-libinput/Manifest b/x11-drivers/xf86-input-libinput/Manifest
index a0929b81df7f..dd7a58ae0f74 100644
--- a/x11-drivers/xf86-input-libinput/Manifest
+++ b/x11-drivers/xf86-input-libinput/Manifest
@@ -1,5 +1,3 @@
-DIST xf86-input-libinput-1.1.0.tar.bz2 380727 BLAKE2B 03f394340bb79ee928509471200434fd8efa1385a1747bd1c95743e2d235f806c7b2816496ec74518c18dc967c6761ea779d0c66b525aa80ac6a36bb80c4a45b SHA512 7def9a4834a9203d1672613b1a4b384a0eb3d664818865b375969bf9ca96c512b752859acc8916de9224f7e488f8d59953308e53b983dfa8031ca01fd707fa2b
 DIST xf86-input-libinput-1.2.0.tar.bz2 358985 BLAKE2B f6fc97c4cb81ae61604d2a56063127a5a9a548c529eda9c506a77d8591b9a439cd0fac9c471e7429fddac6e8c4c043087e53d5113ac62c8bdb5b11381f3d5dce SHA512 ebff9490d33fd7495df2e03203060a76b3274f0e638bc92f3d95257fac57cdb9dac308e90e54006fe9522b6de3b1f1c38fd5f0b0b75b7051e5422290f43de52d
-EBUILD xf86-input-libinput-1.1.0.ebuild 453 BLAKE2B 18f1936cfb02fc61b38a0dd17f1e8d177f8f1a0cb5c90d451639928a164d1e8ba7807453e370c6a81e66eec94cfcbc756ba29e35673249b150acd6675d8b13a3 SHA512 e117b2482b76d2e4e801299de70b2e7046e6681dfe6930a53cb948d9b293a7f114d464de07aae9e58c3c58a39313dc3021c9cd130fcc37715cc54d0e6ab97146
-EBUILD xf86-input-libinput-1.2.0.ebuild 459 BLAKE2B 486b29a3411c09fceec5e2522f2494cbab36f10c93f538a6bc774433bd07fe847f35fd527aad8473a0e2a86e8c4d5f5fb48ae0c51a2580509ff69c08bfaace48 SHA512 6187321c979e7c28be153fa07c9c893d024dff3dee2b9cf2744001f1cc00024728292d80227c856f060b27ec76fe4d6a3a4341809ffae4e7afb80f4103f1104d
+EBUILD xf86-input-libinput-1.2.0.ebuild 454 BLAKE2B 7cb15de648a06c86648c4aa94935885ed7db9e064fa470a26b3f39e195d87ff5f9ac641a651c768d73de9c385aafcfa308f7ad23284e3856c8fb5608c4b14bd8 SHA512 abd2e1f4df6fd48de8ecf837e520101b496052541aaa055796e1ac35425299fb82a899d4b396fb1c546d537b09512bd263969cf9e2c430e09dbc8055fe97e69f
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-drivers/xf86-input-libinput/xf86-input-libinput-1.1.0.ebuild b/x11-drivers/xf86-input-libinput/xf86-input-libinput-1.1.0.ebuild
deleted file mode 100644
index 2d726d024f1f..000000000000
--- a/x11-drivers/xf86-input-libinput/xf86-input-libinput-1.1.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit linux-info xorg-3
-
-DESCRIPTION="X.org input driver based on libinput"
-
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE=""
-
-RDEPEND=">=dev-libs/libinput-1.11.0:0="
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-DOCS=( "README.md" )
-
-pkg_pretend() {
-	CONFIG_CHECK="~TIMERFD"
-	check_extra_config
-}
diff --git a/x11-drivers/xf86-input-libinput/xf86-input-libinput-1.2.0.ebuild b/x11-drivers/xf86-input-libinput/xf86-input-libinput-1.2.0.ebuild
index ff216fb17a92..015cc4b53f82 100644
--- a/x11-drivers/xf86-input-libinput/xf86-input-libinput-1.2.0.ebuild
+++ b/x11-drivers/xf86-input-libinput/xf86-input-libinput-1.2.0.ebuild
@@ -7,7 +7,7 @@ inherit linux-info xorg-3
 
 DESCRIPTION="X.org input driver based on libinput"
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND=">=dev-libs/libinput-1.11.0:0="
 DEPEND="${RDEPEND}
diff --git a/x11-drivers/xf86-video-amdgpu/Manifest b/x11-drivers/xf86-video-amdgpu/Manifest
index c87248ab5d7f..5b33cbbdcab5 100644
--- a/x11-drivers/xf86-video-amdgpu/Manifest
+++ b/x11-drivers/xf86-video-amdgpu/Manifest
@@ -1,7 +1,4 @@
-AUX xf86-video-amdgpu-19.1.0-Fix-link-failure-with-gcc-10.patch 848 BLAKE2B a4f7b14f2c3568ea3b0a1d568e8a144b8e7a1872b8723ba4d452df2c75e814eae3aa9cb336ad0c4a44639f10ea6cc66a9bce6d0ad33b730fd45f50f7d77b6df4 SHA512 1f4e580a11ddee24114a5f7692ec8331eafe57492f7f59461f8043132a2fc48d71adce2f7a831b6394804161689c13023711178c25fb34c2d299a9dada603fe4
-DIST xf86-video-amdgpu-19.1.0.tar.bz2 441746 BLAKE2B 75906c9b2200174711360e8cf095b8537e62618747afe5ec13f5a36ad8b61001b94e9df675df2026a61e66b6ea05e0e022640d487851d62ca4ed5ce61dd5aae7 SHA512 ccdaa2378492da1a2f3d18fedacd1318c4708da534a8a959276a82730d5420619d83ad1ec8d7835c55655fe56123cd9bffb44e6223c5a97033c01f598af4a173
 DIST xf86-video-amdgpu-21.0.0.tar.bz2 448400 BLAKE2B c7a90606b37b646b946f76d083b3d59755df331ffb7e83e4e65a821a8c0e556504b20207d6bb86e80ea98646184549b6388727df543e1e2cbab37600e243fa72 SHA512 44ccc8ddc36f09d1608cf58b6cf85dda090671c46c5643e9453f7d67f4d6850c3c9753eba43539d45773198b8042898a50153b5225780e4b2852410c5521314a
-EBUILD xf86-video-amdgpu-19.1.0.ebuild 629 BLAKE2B 1f93b25f75de10b7e3b71fd8d5a78370d6395978f5ef82695979ae9ff3ca6618c834e77acde34bffa6e92e30cb56267a8dc3a2045fbd4e1979c87084bd31d64a SHA512 fac323b81cc04858c3e000fecde83b660c20563bbfacf083f22dc56c7795a878e8aec03dd15928752bce19b5326480172fb89c4decf43350938f2376d7ce7fb6
-EBUILD xf86-video-amdgpu-21.0.0.ebuild 563 BLAKE2B 442e7b6efc5090b7b28f76f3fcd8cd38ed8244310c1d69f9089a0356c5b495121ae347417ecbb3e14269a49d6a08bdec72300c6fe3b19da7dfae0059263a8724 SHA512 8af569eba0ad63afe7fea572787dccbccc01387f32f83953640d3d2bc1b4eac70a8798529ae8e61d4c364af3f2868a85a7f1b51dbfbef084239f227b356fc643
+EBUILD xf86-video-amdgpu-21.0.0.ebuild 561 BLAKE2B 0525c53ecf1b2a7b3fe8d4e1823e50d390cdbde0b89df0c9267238a00dcfb515ba7c40dd34dbf5326de4fb4afe2aa886253208364788f0439538476e6ef902a0 SHA512 915f463eb31af478da19ed6dc8caa8d3d0d27de5ae517de3594a3ed575b71c4c02369f00aba21ffc63b3c95afeda9fd839866856562c4f6866d0531df66d8716
 EBUILD xf86-video-amdgpu-9999.ebuild 557 BLAKE2B 4acc38d1587451eb60056590aa5a6f578f2a3b190ebe77c76e7807ff9ac7280bc88e428a2b980d06c396d3c82fad76b869961cb33852a2156a39605f3f3d135f SHA512 6456b7b9c1ec69d93455a5ab260baaa83412474d0cb9ec904138fc9e31ab3f9455bbe2fcdac4ecf1d1653d1fefcf3389ed7f9779fb5d5c1c70906a97a4455b14
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-drivers/xf86-video-amdgpu/files/xf86-video-amdgpu-19.1.0-Fix-link-failure-with-gcc-10.patch b/x11-drivers/xf86-video-amdgpu/files/xf86-video-amdgpu-19.1.0-Fix-link-failure-with-gcc-10.patch
deleted file mode 100644
index cab3d1b11d12..000000000000
--- a/x11-drivers/xf86-video-amdgpu/files/xf86-video-amdgpu-19.1.0-Fix-link-failure-with-gcc-10.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From edcbe5f52ddfceee3d66d69bbcebbceac06b6d0d Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Tue, 4 Feb 2020 16:38:06 -0500
-Subject: [PATCH] Fix link failure with gcc 10
-
-Without the 'extern' this looks like a definition not just a
-declaration, in every file that includes the header. gcc 10 is stricter
-about this kind of multiple definition.
----
- src/drmmode_display.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/drmmode_display.h b/src/drmmode_display.h
-index 803ac3c..9c0f25a 100644
---- a/src/drmmode_display.h
-+++ b/src/drmmode_display.h
-@@ -289,7 +289,7 @@ Bool drmmode_wait_vblank(xf86CrtcPtr crtc, drmVBlankSeqType type,
- 			 uint64_t *ust, uint32_t *result_seq);
- 
- 
--miPointerSpriteFuncRec drmmode_sprite_funcs;
-+extern miPointerSpriteFuncRec drmmode_sprite_funcs;
- 
- 
- #endif
--- 
-2.26.2
-
diff --git a/x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-19.1.0.ebuild b/x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-19.1.0.ebuild
deleted file mode 100644
index e784f9deaa06..000000000000
--- a/x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-19.1.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-XORG_DRI="always"
-inherit xorg-3
-
-if [[ ${PV} == 9999* ]]; then
-	SRC_URI=""
-else
-	KEYWORDS="amd64 ppc64 ~riscv x86"
-fi
-
-DESCRIPTION="Accelerated Open Source driver for AMDGPU cards"
-
-IUSE="udev"
-
-RDEPEND=">=x11-libs/libdrm-2.4.89[video_cards_amdgpu]
-	x11-base/xorg-server[-minimal]
-	udev? ( virtual/libudev:= )"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-Fix-link-failure-with-gcc-10.patch
-)
-
-src_configure() {
-	local XORG_CONFIGURE_OPTIONS=(
-		--enable-glamor
-		$(use_enable udev)
-	)
-	xorg-3_src_configure
-}
diff --git a/x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-21.0.0.ebuild b/x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-21.0.0.ebuild
index 8d9d0c8ed25b..9576e9abf56e 100644
--- a/x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-21.0.0.ebuild
+++ b/x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-21.0.0.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 if [[ ${PV} == 9999* ]]; then
 	SRC_URI=""
 else
-	KEYWORDS="amd64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ppc64 ~riscv x86"
 fi
 
 DESCRIPTION="Accelerated Open Source driver for AMDGPU cards"
diff --git a/x11-drivers/xf86-video-ati/Manifest b/x11-drivers/xf86-video-ati/Manifest
index 4a170003621b..2e6d26424b44 100644
--- a/x11-drivers/xf86-video-ati/Manifest
+++ b/x11-drivers/xf86-video-ati/Manifest
@@ -1,5 +1,7 @@
 AUX xf86-video-ati-19.1.0-Fix-link-failure-with-gcc-10.patch 991 BLAKE2B 30fab6591259a5fa2eeb917543b5ac91c632d9e21bb5271662f36619513582c26a8a4797e2b20491dbe1c384ca81098f3f5ef10ef4a673cc2442b0e4739dc47c SHA512 4022480caca968578ba62ac2a439b21f335b779e326df7d1838b3276e988dd3675bd225921beed08995f0a95df6989588bd673ab11828d0eb3a7132fc9271569
+AUX xf86-video-ati-19.1.0-xserver-21-build-fixes.patch 14203 BLAKE2B 20cbd16568b8e5b32e8cd806db689cc8ce6c18e3749030dc5d107e735f208303583359aec581f4e44cf525b9ff0ae1088466790eb517d12f39b670d137026fc9 SHA512 c0c77c571cfd4a18ca4363fe52c8a188281a7be533a41fbd4265d30b0098442a0626aa5af0e8d8c60c89157b4dff6a60262eb0ba5ff0cee8e79703287ea0aa87
 DIST xf86-video-ati-19.1.0.tar.bz2 904558 BLAKE2B 424e8b3c6fa14fa4f0bc00940bdf1008400f25ce7103b13ecefdbda9e629239c5ab011952d19c305251e9c0008650da3db0eb91055d5585e2b1c3dd108a74d86 SHA512 73a81f6c492daf2e89067fb52b3033dc0fe6841f109627ddca1aee54a45a738c8c134443753a2a2aaa2c131e1d560057ebc76351ff2304c16407df3ff568fcd6
+EBUILD xf86-video-ati-19.1.0-r1.ebuild 1037 BLAKE2B 2f99deb1347a584ec0b2b0db288a4e32b05c124e2d587823ccdf93faaff276c4c60700d0cd68768e32ebbf54d1c61137d785898da7639bc0fbffa426049a8c9d SHA512 b44a8697ecb0c45df41c0fe565b70941fafcdb4fb2c245aaff49a3e0f0a14ba5a9c31ecb9adf6f43ec09134c1ac3459c479c939b4cfe4d4728a737bb99ea977a
 EBUILD xf86-video-ati-19.1.0.ebuild 983 BLAKE2B 056cf5c07d6dc32b6c573abaf2d6e5120d04d2a5dbf014577ff95ab56efc605a1c566a3565ed68575cce94d421e797848200ba30b1d064d209eeaddbd1201058 SHA512 697c50e8e66b57b087b9cf7fb2a61b0df6ca194bc0054dc168a4c97ce40300529603eebbc607f6f54c6d37fc0a20b8b118ffa5864910e132f3347b8e72bdae5e
 EBUILD xf86-video-ati-9999.ebuild 913 BLAKE2B 96603c56be3ac72e07990c37686089b369709b07d99714a5843fee3a1b5b552c26d5d218b0949cd0c79c35745d4c2d71d29932a44e22c2e90d6a8e8ea0f1bf4d SHA512 17472bfb7714d2f589f86ac359acb0d63fe35c041571b5573919d1100167516d036695af370f44d4e49a11ca1aac1955c033005ddd2e83a369942857f5801416
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-drivers/xf86-video-ati/files/xf86-video-ati-19.1.0-xserver-21-build-fixes.patch b/x11-drivers/xf86-video-ati/files/xf86-video-ati-19.1.0-xserver-21-build-fixes.patch
new file mode 100644
index 000000000000..6666e0af6916
--- /dev/null
+++ b/x11-drivers/xf86-video-ati/files/xf86-video-ati-19.1.0-xserver-21-build-fixes.patch
@@ -0,0 +1,368 @@
+From 8da3e4561ef82bb78c9a17b8cd8bf139b9cfd680 Mon Sep 17 00:00:00 2001
+From: Dave Airlie <airlied@redhat.com>
+Date: Mon, 13 Jul 2020 09:11:28 +1000
+Subject: ati: cleanup terminology to use primary/secondary
+
+The X server changed some API/ABIs here.
+
+Based on amdgpu patch by Michel
+---
+ man/radeon.man        |  2 +-
+ src/compat-api.h      |  6 +++++
+ src/drmmode_display.c |  4 +--
+ src/evergreen_state.h |  2 +-
+ src/r600_state.h      |  2 +-
+ src/radeon.h          | 10 +++----
+ src/radeon_exa.c      |  2 +-
+ src/radeon_glamor.c   |  2 +-
+ src/radeon_kms.c      | 74 +++++++++++++++++++++++++--------------------------
+ 9 files changed, 55 insertions(+), 49 deletions(-)
+
+diff --git a/man/radeon.man b/man/radeon.man
+index dcebf537..247dcdb7 100644
+--- a/man/radeon.man
++++ b/man/radeon.man
+@@ -290,7 +290,7 @@ on. If this option is set, the default value of the property is 'on' or 'off'
+ accordingly. If this option isn't set, the default value of the property is
+ .B auto,
+ which means that TearFree is on for rotated outputs, outputs with RandR
+-transforms applied and for RandR 1.4 slave outputs, otherwise off.
++transforms applied and for RandR 1.4 secondary outputs, otherwise off.
+ .TP
+ .BI "Option \*qAccelMethod\*q \*q" "string" \*q
+ Chooses between available acceleration architectures.  Valid values are
+diff --git a/src/compat-api.h b/src/compat-api.h
+index f4e7524f..def6d3e4 100644
+--- a/src/compat-api.h
++++ b/src/compat-api.h
+@@ -34,4 +34,10 @@
+ #define BLOCKHANDLER_ARGS pScreen, pTimeout, pReadmask
+ #endif
+ 
++#if ABI_VIDEODRV_VERSION < SET_ABI_VERSION(25, 2)
++#define current_primary current_master
++#define primary_pixmap master_pixmap
++#define secondary_dst slave_dst
++#endif
++
+ #endif
+diff --git a/src/drmmode_display.c b/src/drmmode_display.c
+index 72f96a0c..3099a729 100644
+--- a/src/drmmode_display.c
++++ b/src/drmmode_display.c
+@@ -720,7 +720,7 @@ drmmode_crtc_prime_scanout_update(xf86CrtcPtr crtc, DisplayModePtr mode,
+ 		xorg_list_for_each_entry(dirty, &screen->pixmap_dirty_list,
+ 					 ent) {
+ 			if (radeon_dirty_src_equals(dirty, drmmode_crtc->prime_scanout_pixmap)) {
+-				dirty->slave_dst =
++				dirty->secondary_dst =
+ 					drmmode_crtc->scanout[scanout_id].pixmap;
+ 				break;
+ 			}
+@@ -1356,7 +1356,7 @@ drmmode_set_scanout_pixmap(xf86CrtcPtr crtc, PixmapPtr ppix)
+ 
+ 	xorg_list_for_each_entry(dirty, &screen->pixmap_dirty_list, ent) {
+ 		if (radeon_dirty_src_equals(dirty, drmmode_crtc->prime_scanout_pixmap)) {
+-			PixmapStopDirtyTracking(dirty->src, dirty->slave_dst);
++			PixmapStopDirtyTracking(dirty->src, dirty->secondary_dst);
+ 			break;
+ 		}
+ 	}
+diff --git a/src/evergreen_state.h b/src/evergreen_state.h
+index 7e54e1c7..34ba87b6 100644
+--- a/src/evergreen_state.h
++++ b/src/evergreen_state.h
+@@ -350,7 +350,7 @@ extern void *RADEONEXACreatePixmap2(ScreenPtr pScreen, int width, int height,
+ 				    int *new_pitch);
+ extern void RADEONEXADestroyPixmap(ScreenPtr pScreen, void *driverPriv);
+ extern Bool RADEONEXAPixmapIsOffscreen(PixmapPtr pPix);
+-extern Bool RADEONEXASharePixmapBacking(PixmapPtr ppix, ScreenPtr slave, void **handle_p);
++extern Bool RADEONEXASharePixmapBacking(PixmapPtr ppix, ScreenPtr secondary, void **handle_p);
+ extern Bool RADEONEXASetSharedPixmapBacking(PixmapPtr ppix, void *handle);
+ 
+ #endif
+diff --git a/src/r600_state.h b/src/r600_state.h
+index 34345996..567c3ca2 100644
+--- a/src/r600_state.h
++++ b/src/r600_state.h
+@@ -321,6 +321,6 @@ extern void *RADEONEXACreatePixmap2(ScreenPtr pScreen, int width, int height,
+ 				    int *new_pitch);
+ extern void RADEONEXADestroyPixmap(ScreenPtr pScreen, void *driverPriv);
+ extern Bool RADEONEXAPixmapIsOffscreen(PixmapPtr pPix);
+-extern Bool RADEONEXASharePixmapBacking(PixmapPtr ppix, ScreenPtr slave, void **handle_p);
++extern Bool RADEONEXASharePixmapBacking(PixmapPtr ppix, ScreenPtr secondary, void **handle_p);
+ extern Bool RADEONEXASetSharedPixmapBacking(PixmapPtr ppix, void *handle);
+ #endif
+diff --git a/src/radeon.h b/src/radeon.h
+index e4a2ba66..68d7756a 100644
+--- a/src/radeon.h
++++ b/src/radeon.h
+@@ -182,18 +182,18 @@ typedef enum {
+ 
+ 
+ static inline ScreenPtr
+-radeon_master_screen(ScreenPtr screen)
++radeon_primary_screen(ScreenPtr screen)
+ {
+-    if (screen->current_master)
+-	return screen->current_master;
++    if (screen->current_primary)
++	return screen->current_primary;
+ 
+     return screen;
+ }
+ 
+ static inline ScreenPtr
+-radeon_dirty_master(PixmapDirtyUpdatePtr dirty)
++radeon_dirty_primary(PixmapDirtyUpdatePtr dirty)
+ {
+-    return radeon_master_screen(dirty->slave_dst->drawable.pScreen);
++    return radeon_primary_screen(dirty->secondary_dst->drawable.pScreen);
+ }
+ 
+ static inline DrawablePtr
+diff --git a/src/radeon_exa.c b/src/radeon_exa.c
+index 268155ed..320ff992 100644
+--- a/src/radeon_exa.c
++++ b/src/radeon_exa.c
+@@ -282,7 +282,7 @@ void RADEONEXADestroyPixmap(ScreenPtr pScreen, void *driverPriv)
+     free(driverPriv);
+ }
+ 
+-Bool RADEONEXASharePixmapBacking(PixmapPtr ppix, ScreenPtr slave, void **fd_handle)
++Bool RADEONEXASharePixmapBacking(PixmapPtr ppix, ScreenPtr seconndary, void **fd_handle)
+ {
+     struct radeon_exa_pixmap_priv *driver_priv = exaGetPixmapDriverPrivate(ppix);
+ 
+diff --git a/src/radeon_glamor.c b/src/radeon_glamor.c
+index f1098381..ccf99941 100644
+--- a/src/radeon_glamor.c
++++ b/src/radeon_glamor.c
+@@ -366,7 +366,7 @@ radeon_glamor_set_pixmap_bo(DrawablePtr drawable, PixmapPtr pixmap)
+ 
+ 
+ static Bool
+-radeon_glamor_share_pixmap_backing(PixmapPtr pixmap, ScreenPtr slave,
++radeon_glamor_share_pixmap_backing(PixmapPtr pixmap, ScreenPtr secondary,
+ 				   void **handle_p)
+ {
+ 	ScreenPtr screen = pixmap->drawable.pScreen;
+diff --git a/src/radeon_kms.c b/src/radeon_kms.c
+index b3db7c41..62962d61 100644
+--- a/src/radeon_kms.c
++++ b/src/radeon_kms.c
+@@ -559,8 +559,8 @@ dirty_region(PixmapDirtyUpdatePtr dirty)
+ 	if (dirty->rotation != RR_Rotate_0) {
+ 		dstregion = transform_region(damageregion,
+ 					     &dirty->f_inverse,
+-					     dirty->slave_dst->drawable.width,
+-					     dirty->slave_dst->drawable.height);
++					     dirty->secondary_dst->drawable.width,
++					     dirty->secondary_dst->drawable.height);
+ 	} else
+ #endif
+ 	{
+@@ -568,7 +568,7 @@ dirty_region(PixmapDirtyUpdatePtr dirty)
+ 
+ 	    dstregion = RegionDuplicate(damageregion);
+ 	    RegionTranslate(dstregion, -dirty->x, -dirty->y);
+-	    PixmapRegionInit(&pixregion, dirty->slave_dst);
++	    PixmapRegionInit(&pixregion, dirty->secondary_dst);
+ 	    RegionIntersect(dstregion, dstregion, &pixregion);
+ 	    RegionUninit(&pixregion);
+ 	}
+@@ -585,8 +585,8 @@ redisplay_dirty(PixmapDirtyUpdatePtr dirty, RegionPtr region)
+ 	if (RegionNil(region))
+ 		goto out;
+ 
+-	if (dirty->slave_dst->master_pixmap)
+-	    DamageRegionAppend(&dirty->slave_dst->drawable, region);
++	if (dirty->secondary_dst->primary_pixmap)
++	    DamageRegionAppend(&dirty->secondary_dst->drawable, region);
+ 
+ #ifdef HAS_DIRTYTRACKING_ROTATION
+ 	PixmapSyncDirtyHelper(dirty);
+@@ -595,8 +595,8 @@ redisplay_dirty(PixmapDirtyUpdatePtr dirty, RegionPtr region)
+ #endif
+ 
+ 	radeon_cs_flush_indirect(src_scrn);
+-	if (dirty->slave_dst->master_pixmap)
+-	    DamageRegionProcessPending(&dirty->slave_dst->drawable);
++	if (dirty->secondary_dst->primary_pixmap)
++	    DamageRegionProcessPending(&dirty->secondary_dst->drawable);
+ 
+ out:
+ 	DamageEmpty(dirty->damage);
+@@ -613,12 +613,12 @@ radeon_prime_scanout_update_abort(xf86CrtcPtr crtc, void *event_data)
+ void
+ radeon_sync_shared_pixmap(PixmapDirtyUpdatePtr dirty)
+ {
+-    ScreenPtr master_screen = radeon_dirty_master(dirty);
++    ScreenPtr primary_screen = radeon_dirty_primary(dirty);
+     PixmapDirtyUpdatePtr ent;
+     RegionPtr region;
+ 
+-    xorg_list_for_each_entry(ent, &master_screen->pixmap_dirty_list, ent) {
+-	if (!radeon_dirty_src_equals(dirty, ent->slave_dst))
++    xorg_list_for_each_entry(ent, &primary_screen->pixmap_dirty_list, ent) {
++	if (!radeon_dirty_src_equals(dirty, ent->secondary_dst))
+ 	    continue;
+ 
+ 	region = dirty_region(ent);
+@@ -631,45 +631,45 @@ radeon_sync_shared_pixmap(PixmapDirtyUpdatePtr dirty)
+ #if HAS_SYNC_SHARED_PIXMAP
+ 
+ static Bool
+-master_has_sync_shared_pixmap(ScrnInfoPtr scrn, PixmapDirtyUpdatePtr dirty)
++primary_has_sync_shared_pixmap(ScrnInfoPtr scrn, PixmapDirtyUpdatePtr dirty)
+ {
+-    ScreenPtr master_screen = radeon_dirty_master(dirty);
++    ScreenPtr primary_screen = radeon_dirty_primary(dirty);
+ 
+-    return !!master_screen->SyncSharedPixmap;
++    return !!primary_screen->SyncSharedPixmap;
+ }
+ 
+ static Bool
+-slave_has_sync_shared_pixmap(ScrnInfoPtr scrn, PixmapDirtyUpdatePtr dirty)
++secondary_has_sync_shared_pixmap(ScrnInfoPtr scrn, PixmapDirtyUpdatePtr dirty)
+ {
+-    ScreenPtr slave_screen = dirty->slave_dst->drawable.pScreen;
++    ScreenPtr secondary_screen = dirty->secondary_dst->drawable.pScreen;
+ 
+-    return !!slave_screen->SyncSharedPixmap;
++    return !!secondary_screen->SyncSharedPixmap;
+ }
+ 
+ static void
+ call_sync_shared_pixmap(PixmapDirtyUpdatePtr dirty)
+ {
+-    ScreenPtr master_screen = radeon_dirty_master(dirty);
++    ScreenPtr primary_screen = radeon_dirty_primary(dirty);
+ 
+-    master_screen->SyncSharedPixmap(dirty);
++    primary_screen->SyncSharedPixmap(dirty);
+ }
+ 
+ #else /* !HAS_SYNC_SHARED_PIXMAP */
+ 
+ static Bool
+-master_has_sync_shared_pixmap(ScrnInfoPtr scrn, PixmapDirtyUpdatePtr dirty)
++primary_has_sync_shared_pixmap(ScrnInfoPtr scrn, PixmapDirtyUpdatePtr dirty)
+ {
+-    ScrnInfoPtr master_scrn = xf86ScreenToScrn(radeon_dirty_master(dirty));
++    ScrnInfoPtr primary_scrn = xf86ScreenToScrn(radeon_dirty_primary(dirty));
+ 
+-    return master_scrn->driverName == scrn->driverName;
++    return primary_scrn->driverName == scrn->driverName;
+ }
+ 
+ static Bool
+-slave_has_sync_shared_pixmap(ScrnInfoPtr scrn, PixmapDirtyUpdatePtr dirty)
++secondary_has_sync_shared_pixmap(ScrnInfoPtr scrn, PixmapDirtyUpdatePtr dirty)
+ {
+-    ScrnInfoPtr slave_scrn = xf86ScreenToScrn(dirty->slave_dst->drawable.pScreen);
++    ScrnInfoPtr secondary_scrn = xf86ScreenToScrn(dirty->secondary_dst->drawable.pScreen);
+ 
+-    return slave_scrn->driverName == scrn->driverName;
++    return secondary_scrn->driverName == scrn->driverName;
+ }
+ 
+ static void
+@@ -684,12 +684,12 @@ call_sync_shared_pixmap(PixmapDirtyUpdatePtr dirty)
+ static xf86CrtcPtr
+ radeon_prime_dirty_to_crtc(PixmapDirtyUpdatePtr dirty)
+ {
+-    ScreenPtr screen = dirty->slave_dst->drawable.pScreen;
++    ScreenPtr screen = dirty->secondary_dst->drawable.pScreen;
+     ScrnInfoPtr scrn = xf86ScreenToScrn(screen);
+     xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
+     int c;
+ 
+-    /* Find the CRTC which is scanning out from this slave pixmap */
++    /* Find the CRTC which is scanning out from this secondary pixmap */
+     for (c = 0; c < xf86_config->num_crtc; c++) {
+ 	xf86CrtcPtr xf86_crtc = xf86_config->crtc[c];
+ 	drmmode_crtc_private_ptr drmmode_crtc = xf86_crtc->driver_private;
+@@ -714,7 +714,7 @@ radeon_prime_scanout_do_update(xf86CrtcPtr crtc, unsigned scanout_id)
+ 	if (radeon_dirty_src_equals(dirty, drmmode_crtc->prime_scanout_pixmap)) {
+ 	    RegionPtr region;
+ 
+-	    if (master_has_sync_shared_pixmap(scrn, dirty))
++	    if (primary_has_sync_shared_pixmap(scrn, dirty))
+ 		call_sync_shared_pixmap(dirty);
+ 
+ 	    region = dirty_region(dirty);
+@@ -727,7 +727,7 @@ radeon_prime_scanout_do_update(xf86CrtcPtr crtc, unsigned scanout_id)
+ 		radeon_cs_flush_indirect(scrn);
+ 		RegionCopy(&drmmode_crtc->scanout_last_region, region);
+ 		RegionTranslate(region, -crtc->x, -crtc->y);
+-		dirty->slave_dst = drmmode_crtc->scanout[scanout_id].pixmap;
++		dirty->secondary_dst = drmmode_crtc->scanout[scanout_id].pixmap;
+ 	    }
+ 
+ 	    redisplay_dirty(dirty, region);
+@@ -754,7 +754,7 @@ radeon_prime_scanout_update_handler(xf86CrtcPtr crtc, uint32_t frame, uint64_t u
+ static void
+ radeon_prime_scanout_update(PixmapDirtyUpdatePtr dirty)
+ {
+-    ScreenPtr screen = dirty->slave_dst->drawable.pScreen;
++    ScreenPtr screen = dirty->secondary_dst->drawable.pScreen;
+     ScrnInfoPtr scrn = xf86ScreenToScrn(screen);
+     RADEONEntPtr pRADEONEnt = RADEONEntPriv(scrn);
+     xf86CrtcPtr xf86_crtc = radeon_prime_dirty_to_crtc(dirty);
+@@ -818,7 +818,7 @@ radeon_prime_scanout_update(PixmapDirtyUpdatePtr dirty)
+ static void
+ radeon_prime_scanout_flip(PixmapDirtyUpdatePtr ent)
+ {
+-    ScreenPtr screen = ent->slave_dst->drawable.pScreen;
++    ScreenPtr screen = ent->secondary_dst->drawable.pScreen;
+     ScrnInfoPtr scrn = xf86ScreenToScrn(screen);
+     RADEONEntPtr pRADEONEnt = RADEONEntPriv(scrn);
+     xf86CrtcPtr crtc = radeon_prime_dirty_to_crtc(ent);
+@@ -893,11 +893,11 @@ radeon_dirty_update(ScrnInfoPtr scrn)
+ 		if (screen->isGPU) {
+ 			PixmapDirtyUpdatePtr region_ent = ent;
+ 
+-			if (master_has_sync_shared_pixmap(scrn, ent)) {
+-				ScreenPtr master_screen = radeon_dirty_master(ent);
++			if (primary_has_sync_shared_pixmap(scrn, ent)) {
++				ScreenPtr primary_screen = radeon_dirty_primary(ent);
+ 
+-				xorg_list_for_each_entry(region_ent, &master_screen->pixmap_dirty_list, ent) {
+-					if (radeon_dirty_src_equals(ent, region_ent->slave_dst))
++				xorg_list_for_each_entry(region_ent, &primary_screen->pixmap_dirty_list, ent) {
++					if (radeon_dirty_src_equals(ent, region_ent->secondary_dst))
+ 						break;
+ 				}
+ 			}
+@@ -921,7 +921,7 @@ radeon_dirty_update(ScrnInfoPtr scrn)
+ 
+ 			RegionDestroy(region);
+ 		} else {
+-			if (slave_has_sync_shared_pixmap(scrn, ent))
++			if (secondary_has_sync_shared_pixmap(scrn, ent))
+ 				continue;
+ 
+ 			region = dirty_region(ent);
+@@ -1216,7 +1216,7 @@ static void RADEONBlockHandler_KMS(BLOCKHANDLER_ARGS_DECL)
+     (*pScreen->BlockHandler) (BLOCKHANDLER_ARGS);
+     pScreen->BlockHandler = RADEONBlockHandler_KMS;
+ 
+-    if (!xf86ScreenToScrn(radeon_master_screen(pScreen))->vtSema)
++    if (!xf86ScreenToScrn(radeon_primary_screen(pScreen))->vtSema)
+ 	return;
+ 
+     if (!pScreen->isGPU)
+@@ -2584,7 +2584,7 @@ CARD32 cleanup_black_fb(OsTimerPtr timer, CARD32 now, pointer data)
+     xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
+     int c;
+ 
+-    if (xf86ScreenToScrn(radeon_master_screen(screen))->vtSema)
++    if (xf86ScreenToScrn(radeon_primary_screen(screen))->vtSema)
+ 	return 0;
+ 
+     /* Unreference the all-black FB created by RADEONLeaveVT_KMS. After
+-- 
+cgit v1.2.1
+
diff --git a/x11-drivers/xf86-video-ati/xf86-video-ati-19.1.0-r1.ebuild b/x11-drivers/xf86-video-ati/xf86-video-ati-19.1.0-r1.ebuild
new file mode 100644
index 000000000000..37f523607eb2
--- /dev/null
+++ b/x11-drivers/xf86-video-ati/xf86-video-ati-19.1.0-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+XORG_DRI=always
+inherit linux-info xorg-3
+
+if [[ ${PV} == 9999* ]]; then
+	SRC_URI=""
+else
+	KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+DESCRIPTION="ATI video driver"
+HOMEPAGE="https://www.x.org/wiki/ati/"
+
+IUSE="udev"
+
+RDEPEND=">=x11-libs/libdrm-2.4.89[video_cards_radeon]
+	>=x11-libs/libpciaccess-0.8.0
+	x11-base/xorg-server[-minimal]
+	udev? ( virtual/libudev:= )"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-Fix-link-failure-with-gcc-10.patch
+	"${FILESDIR}"/${P}-xserver-21-build-fixes.patch
+)
+
+pkg_pretend() {
+	if use kernel_linux; then
+		if kernel_is -ge 3 9; then
+			CONFIG_CHECK="~!DRM_RADEON_UMS ~!FB_RADEON"
+		else
+			CONFIG_CHECK="~DRM_RADEON_KMS ~!FB_RADEON"
+		fi
+	fi
+	check_extra_config
+}
+
+pkg_setup() {
+	linux-info_pkg_setup
+	xorg-3_pkg_setup
+}
+
+src_configure() {
+	local XORG_CONFIGURE_OPTIONS=(
+		--enable-glamor
+		$(use_enable udev)
+	)
+	xorg-3_src_configure
+}
diff --git a/x11-drivers/xf86-video-intel/Manifest b/x11-drivers/xf86-video-intel/Manifest
index 5a594031fc4a..eb4deb451cc9 100644
--- a/x11-drivers/xf86-video-intel/Manifest
+++ b/x11-drivers/xf86-video-intel/Manifest
@@ -1,9 +1,4 @@
-AUX xf86-video-intel-gcc-pr65873.patch 471 BLAKE2B 578e8aeffa803b127f436263773a139849ccc30afdf46a776538c7e23ea1a1577a6673eb4e39c6fc650c0b4b5b7db3466786452a711fd6cddcacc925d3c4ef6c SHA512 584ee7e954c69973ad00ae07f25199081b13636e6573eae2736f4521a7a238d88e3744cbe07daa7d4620b5124cefdfeb03204f097fd17794a12ffd36a90628b0
-DIST xf86-video-intel-2.99.917_p20200310.tar.bz2 1249330 BLAKE2B 7ba7566b946cf2c4ce60170912fe517f8c004a477a0edc2a1a9c4dbc476f3bdbea5b39a3ade4d15854cda2cc1146eca47d5fe8b311dfe36cd5ac39cf390142ea SHA512 764517e2413937ec8486d473e0cb0b98146fbaa2cff15cb01757f2263c29a2fa9279338fc801bdafe4e6b38428f8e771a7ee14fa223ba5711a4369e719258cd0
-DIST xf86-video-intel-2.99.917_p20200515.tar.bz2 1250303 BLAKE2B 81fca6a4ccfd01c49f70b741e80080e410044bcc51345ff886ec1d74e9ed1020263927ec1a67052ddcfded0f4027369a87b47ebcdbbf5066d813a7e82fae290f SHA512 29fea01332438ad7616bae56a926f5c6fa08f93f67c23a0bb38f775719f12b15fba5bcb096c0665948f80d3ff6b7c108f360e44aae008192ef6c9b21187b4bbb
 DIST xf86-video-intel-2.99.917_p20201215.tar.bz2 1250622 BLAKE2B ddcbd84ee125528fe82f0a369f8e768d218eb0d9c4fc00cbe4a921d6267a846eccc001e3dd765f8cdaf7a38c461357831cd9675acfdfd3cc6ac282ec4b6f4b67 SHA512 29526fe191a95c2df5a3e168150b8c7f759dfdc9a4912e28887ec51be05304a9f552d21c990a37a90d6299e64df4bb1fba051c1d0ad25606dc52f801cd30b60d
-EBUILD xf86-video-intel-2.99.917_p20200310.ebuild 2080 BLAKE2B b7cb96dd2846b0a930dcb673beef59311a70d7e9e17449a10dfdc91cf68004ac6decdd117e38a623f2f0b76a1d1845d9465358f3acd1092f516d544ada14b750 SHA512 f96023d34f7047ab423872d870ca22dd662b8cdece5e32cc9b1a0a7014ec15aeefa2fe05e8039d51313311ae7b2bb159887d4f32f0aa796c984091a5c3700a5a
-EBUILD xf86-video-intel-2.99.917_p20200515.ebuild 2080 BLAKE2B ee1369b92e4ea79c4e473d4d9cb8522632cdacbbe21c053250ab62cbfeab88591b3e2b66bbb1564f4e51061a74031b678bc994e566a1768406e312c49a45da5a SHA512 1d9da099158c74dc9779b552adaa1ea137f3e96fc2c53e19b4e24dbe17c5db2808f16686b16dc36e33aba07a0d839cc89e914eed1fab0276ffec385b15715223
 EBUILD xf86-video-intel-2.99.917_p20201215.ebuild 2028 BLAKE2B 85d72fc92f7f1ccf2769b1fda93a6de553f3b172b00e116bdfac20ac3afba823a4bc247d243a9f15111f8bf96245574a6aed074f0464857c517b515e77da4e17 SHA512 8ec6a8b5a588bf34a1c309811bd9c3e845739bf18136e0a292d16979186d7566baced46c3da7ebe712dd09bfc74fe5c8f207785abc21957e7d7c6ef45529f298
 EBUILD xf86-video-intel-9999.ebuild 1990 BLAKE2B 29f2738249bb4b10db97f81567ab4e7921014fa1000c8cc53d5bdde02b9905f05a7be12bcee32583c1277e47e3fb1e962399c95ccc71681d131c28c37f4ff5d5 SHA512 5c7c28933fc38ca76374972f3cd4285a48e6ea292c4367356458e67e43045228c252626369f124058c7210ed40bf15c77e656f6ac1ebd428bea60a09cd90f1f6
 MISC metadata.xml 559 BLAKE2B fe8c1aeb0b8f05050a6285c54f5a7aaa5847352fa54463e05c8eb289512d9f5ff887ffed2ed5e3ec7cb091ab8d2b77cb380676ba631f661acc86dae36bfe530b SHA512 1243d1134477cf095c24d1054c7efcd3a7c0d5f37e7b4f7d1ab853814e97885a3e69ac058f5d493be4ab7cf56f5bddff5d057eb4cc3f454b0aed18410a4ff10c
diff --git a/x11-drivers/xf86-video-intel/files/xf86-video-intel-gcc-pr65873.patch b/x11-drivers/xf86-video-intel/files/xf86-video-intel-gcc-pr65873.patch
deleted file mode 100644
index ed05bce9a26c..000000000000
--- a/x11-drivers/xf86-video-intel/files/xf86-video-intel-gcc-pr65873.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up xf86-video-intel-20150520/src/sna/compiler.h.jx xf86-video-intel-20150520/src/sna/compiler.h
---- xf86-video-intel-20150520/src/sna/compiler.h.jx	2015-05-19 07:44:26.000000000 -0400
-+++ xf86-video-intel-20150520/src/sna/compiler.h	2015-05-20 12:53:54.797918726 -0400
-@@ -64,7 +64,7 @@
- #endif
- 
- #if HAS_GCC(4, 6) && defined(__OPTIMIZE__)
--#define fast __attribute__((optimize("Ofast")))
-+#define fast __attribute__((optimize("O3")))
- #else
- #define fast
- #endif
diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917_p20200310.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917_p20200310.ebuild
deleted file mode 100644
index 7d746cb68ce2..000000000000
--- a/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917_p20200310.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-XORG_DRI=dri
-XORG_EAUTORECONF=yes
-inherit linux-info xorg-3 flag-o-matic
-
-if [[ ${PV} == 9999* ]]; then
-	SRC_URI=""
-else
-	KEYWORDS="amd64 x86"
-	COMMIT_ID="652d93cbbdc159c0883f1b626ea48e28bac63ae3"
-	SRC_URI="https://gitlab.freedesktop.org/xorg/driver/xf86-video-intel/-/archive/${COMMIT_ID}/${P}.tar.bz2"
-	S="${WORKDIR}/${PN}-${COMMIT_ID}"
-fi
-
-DESCRIPTION="X.Org driver for Intel cards"
-
-IUSE="debug +sna tools +udev uxa xvmc"
-
-REQUIRED_USE="
-	|| ( sna uxa )
-"
-RDEPEND="
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXScrnSaver
-	>=x11-libs/pixman-0.27.1
-	>=x11-libs/libdrm-2.4.52[video_cards_intel]
-	>=x11-base/xorg-server-1.18
-	tools? (
-		x11-libs/libX11
-		x11-libs/libxcb
-		x11-libs/libXcursor
-		x11-libs/libXdamage
-		x11-libs/libXinerama
-		x11-libs/libXrandr
-		x11-libs/libXrender
-		x11-libs/libxshmfence
-		x11-libs/libXtst
-	)
-	udev? (
-		virtual/libudev:=
-	)
-	xvmc? (
-		>=x11-libs/libXvMC-1.0.12-r1
-		>=x11-libs/libxcb-1.5
-		x11-libs/xcb-util
-	)
-"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-gcc-pr65873.patch
-)
-
-pkg_setup() {
-	linux-info_pkg_setup
-	xorg-3_pkg_setup
-}
-
-src_configure() {
-	# bug #582910
-	replace-flags -Os -O2
-
-	local XORG_CONFIGURE_OPTIONS=(
-		--disable-dri1
-		$(use_enable debug)
-		$(use_enable dri)
-		$(use_enable dri dri3)
-		$(usex dri "--with-default-dri=3")
-		$(use_enable sna)
-		$(use_enable tools)
-		$(use_enable udev)
-		$(use_enable uxa)
-		$(use_enable xvmc)
-	)
-	xorg-3_src_configure
-}
-
-pkg_postinst() {
-	if linux_config_exists && \
-		kernel_is -lt 4 3 && ! linux_chkconfig_present DRM_I915_KMS; then
-		echo
-		ewarn "This driver requires KMS support in your kernel"
-		ewarn "  Device Drivers --->"
-		ewarn "    Graphics support --->"
-		ewarn "      Direct Rendering Manager (XFree86 4.1.0 and higher DRI support)  --->"
-		ewarn "      <*>   Intel 830M, 845G, 852GM, 855GM, 865G (i915 driver)  --->"
-		ewarn "	      i915 driver"
-		ewarn "      [*]       Enable modesetting on intel by default"
-		echo
-	fi
-}
diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917_p20200515.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917_p20200515.ebuild
deleted file mode 100644
index e8541630cea6..000000000000
--- a/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917_p20200515.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-XORG_DRI=dri
-XORG_EAUTORECONF=yes
-inherit linux-info xorg-3 flag-o-matic
-
-if [[ ${PV} == 9999* ]]; then
-	SRC_URI=""
-else
-	KEYWORDS="amd64 x86"
-	COMMIT_ID="5ca3ac1a90af177eb111a965e9b4dd8a27cc58fc"
-	SRC_URI="https://gitlab.freedesktop.org/xorg/driver/xf86-video-intel/-/archive/${COMMIT_ID}/${P}.tar.bz2"
-	S="${WORKDIR}/${PN}-${COMMIT_ID}"
-fi
-
-DESCRIPTION="X.Org driver for Intel cards"
-
-IUSE="debug +sna tools +udev uxa xvmc"
-
-REQUIRED_USE="
-	|| ( sna uxa )
-"
-RDEPEND="
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXScrnSaver
-	>=x11-libs/pixman-0.27.1
-	>=x11-libs/libdrm-2.4.52[video_cards_intel]
-	>=x11-base/xorg-server-1.18
-	tools? (
-		x11-libs/libX11
-		x11-libs/libxcb
-		x11-libs/libXcursor
-		x11-libs/libXdamage
-		x11-libs/libXinerama
-		x11-libs/libXrandr
-		x11-libs/libXrender
-		x11-libs/libxshmfence
-		x11-libs/libXtst
-	)
-	udev? (
-		virtual/libudev:=
-	)
-	xvmc? (
-		>=x11-libs/libXvMC-1.0.12-r1
-		>=x11-libs/libxcb-1.5
-		x11-libs/xcb-util
-	)
-"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-gcc-pr65873.patch
-)
-
-pkg_setup() {
-	linux-info_pkg_setup
-	xorg-3_pkg_setup
-}
-
-src_configure() {
-	# bug #582910
-	replace-flags -Os -O2
-
-	local XORG_CONFIGURE_OPTIONS=(
-		--disable-dri1
-		$(use_enable debug)
-		$(use_enable dri)
-		$(use_enable dri dri3)
-		$(usex dri "--with-default-dri=3")
-		$(use_enable sna)
-		$(use_enable tools)
-		$(use_enable udev)
-		$(use_enable uxa)
-		$(use_enable xvmc)
-	)
-	xorg-3_src_configure
-}
-
-pkg_postinst() {
-	if linux_config_exists && \
-		kernel_is -lt 4 3 && ! linux_chkconfig_present DRM_I915_KMS; then
-		echo
-		ewarn "This driver requires KMS support in your kernel"
-		ewarn "  Device Drivers --->"
-		ewarn "    Graphics support --->"
-		ewarn "      Direct Rendering Manager (XFree86 4.1.0 and higher DRI support)  --->"
-		ewarn "      <*>   Intel 830M, 845G, 852GM, 855GM, 865G (i915 driver)  --->"
-		ewarn "	      i915 driver"
-		ewarn "      [*]       Enable modesetting on intel by default"
-		echo
-	fi
-}
diff --git a/x11-drivers/xf86-video-nouveau/Manifest b/x11-drivers/xf86-video-nouveau/Manifest
index 088fa2a5dfb4..49c617c62523 100644
--- a/x11-drivers/xf86-video-nouveau/Manifest
+++ b/x11-drivers/xf86-video-nouveau/Manifest
@@ -1,3 +1,4 @@
+AUX xf86-video-nouveau-1.0.17-xorg-server-API-rename.patch 1590 BLAKE2B 930c5b4a5d22f45c3a64bf3332bab683e176917adb6634517e1b1f00e2faef428ce52e48a45481e2f0f3277cef8dca327ddf7915f1b41bbd58cc1ab0b25e68ad SHA512 c2c221b9defe175290a5f76bea6aacc671deefd1d292888e7ce1bc8dbdd598e37191e775d9b4b044183f8eb62219ec86a09144df79989e2a714f26ea825c422a
 DIST xf86-video-nouveau-1.0.17.tar.bz2 632535 BLAKE2B 8f4a3e749dbf46f6723f65b7bdffdf32e40fb194a18cb9951af297d7c3bcc34cc4ee6eed4687c42a385c259f37d1438ca7c9eda7594a3426704b358e1cda36fb SHA512 adba58ba5298d1a5b3f9f8540f9ef2cb2e10e47bba8e374103ec2e1f92e915f5f4393ed0021168cd649646e12315135a1efcdf77e8fb1648e1295914d87279b2
-EBUILD xf86-video-nouveau-1.0.17.ebuild 619 BLAKE2B b9b60840274196d73ed5677e47ecd8b4836232dc4226d66f41d0d9e7fccd614ecc2526ba61b077d7a0d407d32faf233bcef1043d9ca3f881b5a68bb712e8bc40 SHA512 62cdcea4973125103e009980a65751baaf1a45805c8c1f19da1b7648b1d05a79544c5a60400723562733b4af87f9a67e343c18751f0d4d98f9ed6ce0762637f3
+EBUILD xf86-video-nouveau-1.0.17.ebuild 681 BLAKE2B 1d90a6a6f5bc370456651edecf0923c75f3587de37f4de03a72a73d259f367757d0614a233c1997b5bee911f3d85889337a0c07d6ff39ecc2d2b66f8640cd83c SHA512 e38c8ec663cb3abfc9526a77a06aa401d70a3be7e483dc0defe99f0871862fea4fd580c4f5c155198c8e3aa39fc4312b3943ca1c38a0e687882534106787541b
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-drivers/xf86-video-nouveau/files/xf86-video-nouveau-1.0.17-xorg-server-API-rename.patch b/x11-drivers/xf86-video-nouveau/files/xf86-video-nouveau-1.0.17-xorg-server-API-rename.patch
new file mode 100644
index 000000000000..cb9b6e0f4eec
--- /dev/null
+++ b/x11-drivers/xf86-video-nouveau/files/xf86-video-nouveau-1.0.17-xorg-server-API-rename.patch
@@ -0,0 +1,52 @@
+https://cgit.freedesktop.org/nouveau/xf86-video-nouveau/commit/?id=e80e73ced69b15662103d0fd6837db4ce6c6eb5b
+https://bugs.gentoo.org/827878
+
+From: Dave Airlie <airlied@redhat.com>
+Date: Mon, 13 Jul 2020 09:20:15 +1000
+Subject: nouveau: fixup driver for new X server ABI
+
+--- a/src/compat-api.h
++++ b/src/compat-api.h
+@@ -102,4 +102,8 @@
+ 
+ #endif
+ 
++#if ABI_VIDEODRV_VERSION < SET_ABI_VERSION(25, 2)
++#define secondary_dst slave_dst
++#endif
++
+ #endif
+--- a/src/nouveau_exa.c
++++ b/src/nouveau_exa.c
+@@ -157,7 +157,7 @@ nouveau_exa_destroy_pixmap(ScreenPtr pScreen, void *priv)
+ 
+ #ifdef NOUVEAU_PIXMAP_SHARING
+ static Bool
+-nouveau_exa_share_pixmap_backing(PixmapPtr ppix, ScreenPtr slave, void **handle_p)
++nouveau_exa_share_pixmap_backing(PixmapPtr ppix, ScreenPtr secondary, void **handle_p)
+ {
+ 	struct nouveau_bo *bo = nouveau_pixmap_bo(ppix);
+ 	struct nouveau_pixmap *nvpix = nouveau_pixmap(ppix);
+--- a/src/nv_driver.c
++++ b/src/nv_driver.c
+@@ -559,16 +559,16 @@ redisplay_dirty(ScreenPtr screen, PixmapDirtyUpdatePtr dirty)
+ {
+ 	RegionRec pixregion;
+ 
+-	PixmapRegionInit(&pixregion, dirty->slave_dst);
++	PixmapRegionInit(&pixregion, dirty->secondary_dst);
+ 
+-	DamageRegionAppend(&dirty->slave_dst->drawable, &pixregion);
++	DamageRegionAppend(&dirty->secondary_dst->drawable, &pixregion);
+ #ifdef HAS_DIRTYTRACKING_ROTATION
+ 	PixmapSyncDirtyHelper(dirty);
+ #else
+ 	PixmapSyncDirtyHelper(dirty, &pixregion);
+ #endif
+ 
+-	DamageRegionProcessPending(&dirty->slave_dst->drawable);
++	DamageRegionProcessPending(&dirty->secondary_dst->drawable);
+ 	RegionUninit(&pixregion);
+ }
+ 
+cgit v1.2.1
diff --git a/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-1.0.17.ebuild b/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-1.0.17.ebuild
index af511dafe0b2..c9a67c0af74d 100644
--- a/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-1.0.17.ebuild
+++ b/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-1.0.17.ebuild
@@ -22,3 +22,7 @@ RDEPEND=">=x11-libs/libdrm-2.4.60[video_cards_nouveau]
 	>=x11-libs/libpciaccess-0.10
 	virtual/libudev:="
 DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-xorg-server-API-rename.patch
+)