14 files changed, 2 insertions, 747 deletions
diff --git a/x11-drivers/Manifest.gz b/x11-drivers/Manifest.gz
index 0aeaa947e6a0..7fb2fa678dbd 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 699e329e2353..c906a37890a1 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -17,7 +17,6 @@ AUX nvidia-settings-390.144-raw-ldflags.patch 468 BLAKE2B bf4c00a76351e6c3d1587b
 DIST NVIDIA-Linux-aarch64-510.108.03.run 211471630 BLAKE2B 4177e12907bb577d96734c33d0210eb753a763390aa1dde6e578d81dd47685bc3518af6c1dc2490e3ed488e9cede7e5705f8cf5e264f756de75d3a995c7d3f04 SHA512 fbd395d004d8a25d175958f8a9f9d4f19bc4e0662256e45cf9ed353613e2741f75e4fb2b87d5eb1625914c5ae3ab49e1b7025c8894d9e1cd0028a6d322836a67
 DIST NVIDIA-Linux-aarch64-515.86.01.run 221097882 BLAKE2B f8562f9ef1d29451792e00f5489ae7bf63d1a9c5a13354f119667e5572f473abe14a82383c7f61251213ef16463c064059316c7da09a5d61207823b17a7183bf SHA512 43161f86143b1558d1f558acf4a060f53f538ea20e6235f76be24916fe4a9c374869645c7abf39eba66f1c2ca35f5d2b04f199bd1341b7ee6c1fdc879cb3ef96
 DIST NVIDIA-Linux-aarch64-525.60.13.run 262321531 BLAKE2B 53e841251445b1e7e7321c31796fce5c9d82b70cd4a8cfaad588bf3ac2475321005657202404d850ae5ceb80cb58b743b640ede5f50b39a0a8e0e4d5391ae294 SHA512 1a5ca9fbf25ce26a59f295815491cef56df91c72ab775d7453e46af7ce123af6bdeae87085aa199717036b2c7bc4406df4da4d6238ca51d08b382fb3792bcc45
-DIST NVIDIA-Linux-aarch64-525.78.01.run 262708803 BLAKE2B 479e232c5ae4519ddf9ee0c7bb3faa3cb5c3786ebdf4517dcbe588e93b8aa4a5c87d19a78b810d5c57c63a08159021088b72f4a70a81eb62acb94f32ee110e19 SHA512 2b0213c317a3ea1f95561ecbfd5374b9a68cc7251c09f0245a7458ab4de81b0818dc455046fb6e72e562ec3a8f56f27bf34996664a2c28aa1014578fef5f21a0
 DIST NVIDIA-Linux-aarch64-525.85.05.run 262667903 BLAKE2B e6e4d2d8a90f5abbfc4d67ee1a74c062fcd91b4d46d247702e937d8e82c2ddeac19418a74908b90d31265819dfa93791c53cb111b41fe51732851c9d2e74c21e SHA512 85312583dbd55791273308aa3c3bf43241e0b28cbe850e56bd6997dcedd2db51af337d062587886ca4000cf39428a748c87d6e270648e09d4f0870856757a7d0
 DIST NVIDIA-Linux-x86-390.157.run 49417041 BLAKE2B 435b5e0e60468cc74b41cc5d9b5bb0105d29c11a2d408457835212a96519c9334ecf19278b36749d3ff7f498f5b0ae45a2efae2d428703dac21245c62f1efebe SHA512 dae9ac2c12f9ad90f7441e00e01a984147c577892421911d7f67f6a31e616ac1cb7d434bc9c7f58fbd9b8ae909521b5bece607a63c79588c0bb9d99c6bad5fb0
 DIST NVIDIA-Linux-x86_64-390.157.run 85835541 BLAKE2B 44b855cd11f3b2f231f9fb90492ae2e67a67ea3ea83c413e7c90956d38c9730a8bd0321281ae03c6afce633d102f5b499aed25622b9bfd31bdd2c98f0717e95b SHA512 4780503a4cff0180b1b1f37d20a6ba3438dd78b51fa7f69b98d35521835e5d61099129746929d51d63afa2d47b672b3e145e1e1897584dc3799e7f822c5b3a0a
@@ -26,46 +25,39 @@ DIST NVIDIA-Linux-x86_64-510.108.03.run 329603898 BLAKE2B ec7327628cc0d5929f91fa
 DIST NVIDIA-Linux-x86_64-515.86.01.run 363743089 BLAKE2B aa03a0f059da99fa549cd9d672cef0194f2b22b349470d80ce626b3f4afb89b1f130b451735f92f5a66dfec02735bd6395053be609668371991837e3be4026cb SHA512 9a31e14afc017e847f1208577f597c490adb63c256d6dff1a9eae56b65cf85374a604516b0be9da7a43e9af93b3c5aec47b2ffefd6b4050a4b7e55f348cf4e7b
 DIST NVIDIA-Linux-x86_64-525.47.06.run 415511798 BLAKE2B 8b35774fc2689c0e51159fbe23ffe084ca670209906ca106fc7364c6fe631080f0a0dcaa2d99d34da084e0e72a41ac6741a7e7df828eb07e47729631a456b864 SHA512 7efe2ef0ee26e788e0e8c09da3f6ee7b56dcaffdffd611f6a6c0228181d618a0dea65a174b5a233cbfba497790f771f8948c11c7b957aa0863fba76781d16548
 DIST NVIDIA-Linux-x86_64-525.60.13.run 413352607 BLAKE2B 7e97447ddeb1ea25e1853d3f34f84ebb6b2c5a727d97e4929d55f62f4f4f7ae1e4c863f1fbe088e0bc4ee83e6f5b2e9ce9182760b3bc3082ff1078f750747f5b SHA512 9895c8001b90b6367dbead1b34a86d49fa91171adcc72498fe537dc2e5959ef344e25b00091b662ba57bf751003ccff967e33262a3f64147ff0a253ecf582e46
-DIST NVIDIA-Linux-x86_64-525.78.01.run 414002395 BLAKE2B cad6e10311c9fa44e653d5af52814aa18c250328135e512a809a2a1b1489dd793711e24b62e17f40405584b660f4be9526c5993800f674f3725e1d2b62e57e62 SHA512 0e3f7ed3a284c4cd07f4b5854fc9cc3576de78a9219a5887a627631abb848311302ee43a14622daa4e4a63ded4e00669ef6855b7733b23ba01c50640a6e7621f
 DIST NVIDIA-Linux-x86_64-525.85.05.run 415131239 BLAKE2B 38bdcce884011cfc0a1b5d08807c0a163ac7807621f3ec69feabbdf27af9e0409491db893912776b05a45f8f56c06f281a84074ab8ff21a71774b890bdff2cf8 SHA512 db30b9186cdcf22b2dde267c08a10cadfc3d37190c57a26a71e282b0f661b187b5b28764418eacf8b2344ebfa8feb7480ae1de31b3bc3026feaf9482a3b51741
 DIST NVIDIA-kernel-module-source-515.86.01.tar.xz 7504412 BLAKE2B 20b1b9eb6e2fbc7adfa0b78c6acc88c9da8346888c3d1f1ec01a6c1252feccfc104e338605bfaf7617f0b78c7d0de05b32577394714be3575aa67b37c0e843ca SHA512 075fb8b9c3f43f21f51035460a9bc306b11214eb029e950a5bfbc283dc1d3403210ae303148442d31b2c5bf618923bd1762ab5a91234d005f50177fc02fa8ba4
 DIST NVIDIA-kernel-module-source-525.60.13.tar.xz 10027892 BLAKE2B 2484466566f45a19717179c9f548c9c76bcad209f98224069b35e98719a2c9e86a3db001fb33ea2f6e66ec1db7d02f0d9b830b8f754c43f7caa838b953746975 SHA512 39a8ffad71ea864efb34e94f301893a033d02c4dc737cb7e6d0c1df4f333287517682bb4945d1f8e1a26535ba6f60da66ae67074cda51f3cdf9f29497a194762
-DIST NVIDIA-kernel-module-source-525.78.01.tar.xz 10077212 BLAKE2B 871b3510ca7c09f7dca4e605c2a5121bd32efb95e0858e14275478ab42e1e6bf658961d00f94bab9a0ce5020c12278e41cc20770f1461669076f0a4b6138da0d SHA512 8ea36aca5f3cab1787c0d23f6b20e836985bb62fd21186d706de15c1bf34d1f9f2312dba47fbc532cf6fa2aafa8e4613c620f3f11197fa8974bda7e5d5102e84
 DIST NVIDIA-kernel-module-source-525.85.05.tar.xz 10081192 BLAKE2B b80f1893fe18dcb62ad2d1daaa7c1642e8699c7acda0bf55a104e10824ece908e45e8202949262fce5459b3bebe3582fa52aa506333989388eea94d65e26da11 SHA512 1ed3e69d959d68a351541483cbf552730ec1748faee3bacf1b9f0099650bc3244ed11a4aee84e51187321f59fbedaa92d24a66439265c9f2e436db82a6876ee0
 DIST nvidia-installer-390.157.tar.bz2 150323 BLAKE2B 8058ca87a6dea956d564af9f7eab9b1fc82b1f2382bd5cb2f6d97cbe2e19292533522d5f8f2eacbeb16520372715fcb72f8f9b0998962af5d4e75522c8d74524 SHA512 93a7ece648602157496c8e27a88864ede341a100f5328a4c1a25faf8f0b94d252060e5e2f71d0c302fd0566c10773c30b76b3b5f431d8039b71c90a7969f7d7e
 DIST nvidia-installer-470.161.03.tar.bz2 146227 BLAKE2B 4c733877adbe5f44e2d112fe2401657c2e2809ff76d0eac29409be7c624e073d4a2fbcfb39eb706625d93d1f3c753d47271a6c2c660270824cfea350e07c751a SHA512 eab1308b85dd66ae4332aff766a237e77c763af45a0e62eba0958abcaa493950aa19edd95039d03e783d78d0ad1fe8348a13d5b64fa103410acfa6ad5f95a884
 DIST nvidia-installer-510.108.03.tar.bz2 144494 BLAKE2B de7c3f5c50350318a3e95bfbdd8fa7f51f187298497e88519f9d4719e26f310f2420ef8e500866cee0e6c22e888c4282a65e1edcc9c7e3d4d4799ff8e6856789 SHA512 b90efcc082b6de0ca42fe203ae0b60aafc8623377f31fd5262401e933bf630b11c843d5e02951374a9276e5d08eaa0c28bf2aa4987b8f9ae8719ada6e62ea7c1
 DIST nvidia-installer-515.86.01.tar.bz2 144637 BLAKE2B 840e2258224e0d19dfe092bc8e8d5986ff771a9fbacfc6c682c513e2757072b68252ebbe4ec8a491997db80f3e1c6879b9dc8f93134caf6f0e6ea3360253fbd9 SHA512 3f55ab79283f1730b5cf5898d9df97a78b8d86f0ac124af9e31c7a960f4a82e46bc262fc0cd8ae9c29c3bab65e2be1ca3565d0a470017a153fa58f61241b34b2
 DIST nvidia-installer-525.60.13.tar.bz2 147720 BLAKE2B ecda51de53d7e621d32b144469a3c543f73f3af919263d5c162c9bc6c5f3240b28402ec9b0fddcdec83548679b5368d33c9f9a25325fee3e6d01036948e2de2a SHA512 da5d5db7f028ffed1fed9b05b4090bcb352b9e954288644a433debd8b0b9c1f4439a8cc04be14b21b8c61045fc368060463b5996ffca0726fe080bb13b481666
-DIST nvidia-installer-525.78.01.tar.bz2 147736 BLAKE2B fdff4e699f1342e2fe18396c0e277b08789975d54c1cd60bec9eba3d1d695ac5d117791d25b91a3945c498e3c666c263cdaab6f1f5428fe0bf3b91d5e1c4bea0 SHA512 66f675d1ca1d53582f3a628d1910fcd20910c01869b9084eb47380b846dbd9f6bf214a4021bc858c4da55ebec3968ebb67e91b88d18a08ca69f187a6243bcd9a
 DIST nvidia-installer-525.85.05.tar.bz2 147738 BLAKE2B 08d1f0e8d50a51b2057d190c0fe17d0b5ba1e313541cfff3ccd782348d2049ff85ef7b4e0c2a6dbdbb074a51b536db04cc11b856d02e22c2775788155163db39 SHA512 9b59a0ae0f64974d67f95a55bf21b1cda887ce60a5f8de07d83684ed36271e0fab15d50105e56df7bb6343e2749e014d174c7c7cdd37981983f178c246348f9d
 DIST nvidia-modprobe-390.157.tar.bz2 35306 BLAKE2B 80d202b39c2f95ec0f909712c2e101483af50124092c32efb33bd98ff58ddfb97b737ff07f1ddc941f688c1b4c26a15f392566d522e18506771f10422fcd571c SHA512 109bbe24a3758b568ea65fe1e9d78f69fae6108ec0497b796c885a3912825fe04ffd7389a3e22987f1a10a2926bf6eaa384faabc59478aa3ee244dd3ac91c6d3
 DIST nvidia-modprobe-470.161.03.tar.bz2 38348 BLAKE2B a137e38463f806d25e91d81faefaabc5cd5e51e6537b0a9e641ff96b6029c522eca3766b46a240bd5d25cf04fc11c8eca6b1ae2cbdcc17bc7f0d059fcba67fc7 SHA512 f3b95c22b600b1e09797ff346b7bddb7d84abab01b5383b08626e3172cae8c84fcb3d0ce6425769eafad9602656704c51b934131b3e0b7512de82e5acafcfd15
 DIST nvidia-modprobe-510.108.03.tar.bz2 39055 BLAKE2B c195f55a60eb058b2da704d2aea245aab82a5129ac974cf0d5eeb6b39256c749b7b7de144e067887eac3fb03061d4f87a9c694429078d0eb0242227df1a65a3f SHA512 9ba4fd40b06ffc2f880944dc4b58155a746422cbb02cd17f6af59e3975d46861f182d9257fe654c35d991f7799d95a0a0ed0fe4bfac4426d997a22e3b270fd37
 DIST nvidia-modprobe-515.86.01.tar.bz2 39100 BLAKE2B 00157bc2cc78c58389772dd92c0e389420b93068c673153be32ae385efd50071ed9986c3bfe0d9242a539536c1cd3fd9c502ed7d00523aa653c7a9085a6333bb SHA512 14c82274bc87da0b4f2f8d3a53d02ea55fb003a32ed10a2259598db86655cccbf39fa6bded836cf2bb667c2eb842ae0ccfcf39fe32ee78ff291827673d02634c
 DIST nvidia-modprobe-525.60.13.tar.bz2 39980 BLAKE2B 58694b277ec9b6f16c2e6e3c001af56c7c09c2b461854c7d0fc2b88ffe8646917a5c5065d4fbcad982ccf6357d3185ff64296bee5197934d9a47c42ca57621f7 SHA512 05c16b639df1d8bb4dee3876a5eceddbd3fb2af8ff29afd9b119cc60448b3326df130baa681b8e66e88db1a1b8a1d49b655b3f5ddfe040e280c79ed84e6d59c8
-DIST nvidia-modprobe-525.78.01.tar.bz2 39979 BLAKE2B 0ba25b3fcb40f5528efdf06de0ca5ae0db584b5e3e66640b53b65358382381b06c160f8ff0b216dfbb6cbdbd49a87955714b4fa54bf11401e313e36cc22fdbf7 SHA512 c0eb2350f92735cbf302d941369a5ed2a28f7873f61739c89080f2b792e00f3f254405cb3c87c828d224cdca1435004e1f99bc404fe5f164e5ef65bcc9d8ec16
 DIST nvidia-modprobe-525.85.05.tar.bz2 40018 BLAKE2B c065dcf143af716c02bae44c86f4325a6c4714aa937c3ea8a54ee3b4cfdd96a86bbad8f481daf8493dbd0e1400e301d58492d9996d16098d649a9e73d8ee824d SHA512 bddef88dece5e06711a4b47b9762ede13431470f2d1082a217737f6bd726ee3278acb1ea526c24198033ee6bbc0add5398d5ce90ea00c9e189a49b13842d72fe
 DIST nvidia-persistenced-390.157.tar.bz2 48654 BLAKE2B 2cf6c92da90acff55e8c180a06b0c6a29d48be9fd8ca3c541202fd14f0697220fba6b66452942aa7ae7cc8821f5c5eb9fa8f7a31d2248624e5f9141d83a176b8 SHA512 70f0707ed6f2b877e69ef90cf782f66cbc9d2071db53ca09ceb7b89427b0fe176708517340621fa251539b7d481b238adeeb60261674eed74de1f62db6dbb72e
 DIST nvidia-persistenced-470.161.03.tar.bz2 46540 BLAKE2B 7a9af37c570fd50341a620cb8324294e4e29ebcd165f7254ca8c7a0d3010b40ee3f6721e2e6cddb5378629bc20014a4d916141e4109f6167c688c506c7e0852c SHA512 45c49cbb2a61fdcead639bf2032950f97a403fb70870c46c71003d30477bce2936bd2e2dc6ba234987cd2397dca958e83e78850289e70d07e4cb9818a8ddf8b9
 DIST nvidia-persistenced-510.108.03.tar.bz2 47222 BLAKE2B bed22370ff15df7097e927e07c444a405702f53b9e5591b816a5c0bf1d9f78a045571ece830db86d4724a9b0466a8d67f2e45ec010c69f603a9bce5cd2b8da48 SHA512 39df00ead66f7a6b0e001484333c0dda09fc30daf0df0c8fec4f5913fb88e7a2d214830e7f20632aaf89acdd9af1f11d78b50eacc10cc9bd2b534f390aad52f7
 DIST nvidia-persistenced-515.86.01.tar.bz2 47153 BLAKE2B a7d213790895876453d34580f563ee0aee98ee145fdd8e7bdb726f91298da0f16a4101922a908d367af3ffd6ce1418128f7c5dc0a1e2789143832dc1b96ffc35 SHA512 ffe735178b3b5a0430bae8678b5f7fca407a0389de7f57a1789f67d3b4087cf7c638e6ded8a1cf7ef3ca642d0f889d9f2795fa0e18291101ef1b2a9e3bc4a174
 DIST nvidia-persistenced-525.60.13.tar.bz2 48172 BLAKE2B 19ac0d405d6c9c4f4ae031c9b8376b8ed98257862864371686966f876233b3106c2f7796ffe8e63cb9d5a76345c02b99daae416108660bbe2fa018d39480ba1b SHA512 6d288a474adb77291e842c95cb6871056bcb27d1319944cb413bc9ee597347431b62e34d444d948ca94400560bdac4077ccc2d1198217f22b11d1ad6b9cbb65d
-DIST nvidia-persistenced-525.78.01.tar.bz2 48053 BLAKE2B 6eb784e14f5ed5b6850416958cf5ef7f1fd51454aff4502243cd294913b4b0d5ac3e2893b5bf954119b23d4988a8137e188b81a73e2b2ab9c3edeaa2ec0b5135 SHA512 aae183ca4b9d4c5bd31653d920e80965e924a7fc669c6d3bc3a4bf44bdba572133d1e4958953b57b74e72993526149a5a1614f1bc5c710684d6c96b6801a47b5
 DIST nvidia-persistenced-525.85.05.tar.bz2 48165 BLAKE2B b0d396e22b2ec2d09d156b0024d308edf65ff5de1afb5d20e1fa33329f84776b7892f69feb2707a4d199bcce491ff647f24368f312f65df575bbadbe8fa31584 SHA512 8154c49072079b55ac9b6ea784004c47a4906b0ba1f2ef1cfc7f90bc7cb2259b14dd5655d0b36496f2546719f9b928f68689e4f449186913286fa838fc1fec13
 DIST nvidia-settings-390.157.tar.bz2 1108938 BLAKE2B d9ec1ab5d7f157d74627272adf752a671dd17e2ede02069437b6180b927fe315b15cc6416d584ab2f038b76fe01e5b64514a834f24d88ac16676e55205fdecdd SHA512 b16699009bf56a1ff3b623a528c58061c4f5a2c5c4a373756a07bcd667743a1df7c733a572d2d0baa835a904ac2fda8a5c85890dcc00c3a0f223e0467aea902d
 DIST nvidia-settings-470.161.03.tar.bz2 1062425 BLAKE2B 20523f1e5ab39dfe8ac657afdfafe3d99df2cfb521a475f54804dd50233d4e2ac5dc5fb0e3394997963daa5d06bc2b55088ebdcbf894c16cc9d25aba316834c5 SHA512 61725a6f77930d9c12de6fef57d9f5bb93a5e62e60d0db1707b7f469bce00464192930c4f46e9074e7bcbc4922fc86e9b22ddfdf092f8f46b0c6820505e3b87e
 DIST nvidia-settings-510.108.03.tar.bz2 1075907 BLAKE2B 537d38bd6a5fdca0182af9a7604764c14fb832a1dd2f0d6f2eb1532f06f3822ed9e2190293c1300b7f8971990883ea491269e7ab4838cd724196742e21352ce0 SHA512 3eed794ad7988143719c6d905e375d514daa441d9ed71eca7eff6cae4cdf4fbf08331f9b0451bcd961920f1ffc1797a257943900eef45e225b312b61232275ef
 DIST nvidia-settings-515.86.01.tar.bz2 1080128 BLAKE2B eed02cf9b73fc12c1d862df71d7fe9a4e4e8486831d1940c6e5187b751abe02deb0ebc495d251ffcd401f8ce78b16077d5cd9272c0f472d8c6465a958bf66c85 SHA512 d2c50bf587f53336a1d80ae88b382ef04e8c9ef24893f8ec901934eebb1358038ed67ac7501d98257c486a0fe2e818edd91832b3f989311c061d7a8b85818229
 DIST nvidia-settings-525.60.13.tar.bz2 1085880 BLAKE2B 585b852a441a5e041ced713fdd6ad2a9a4b59785b2c985cbc5c0aa04f15027d1f6cca0713b04fcef7ecfe19d28c8720e5c7703308ec266bfd76489d31e38bb61 SHA512 f751c76e1688e0bbcc13bc83b7a3912c9a087d2fb268371c636a1a873dc7a3f7a25a5c61f17404e05ef32390a72ebe51a42bee7ffcc8bc12aaffab909cb7ec80
-DIST nvidia-settings-525.78.01.tar.bz2 1087150 BLAKE2B 3e038476665f9c19ad45e180dfd6ed7f1fa52ba7f85cf8a478c198820c8cade73ea82e42f0e1fb2f59ad1b3a2736fd2f0ed74a3888ea5ae3ed6e4c1c2a32a6a1 SHA512 6810786b531f602bc37ab6b39fd3e8dda1cd12a1a3039d3ec58dae21859e86476f9d407e45ab2e22e4febebf02e84a038047b694e3b95f40b5d09dfbe851f7fe
 DIST nvidia-settings-525.85.05.tar.bz2 1087280 BLAKE2B 2513d4b6e07c890249b2ab29ce1241666af8c939e5925854298ba858aca3e46f100a9327476cb75be0b056aee40153907780f021ff617d6fb8fe4d87604258b0 SHA512 f61f17f752392b7c39b7d5457b868eaa724020301288ce72621839135ed58b1c0979c491c111818d91f96e1253be74182aae6f538ade59e28071b420bd1a1a97
 DIST nvidia-xconfig-390.157.tar.bz2 107399 BLAKE2B 0cbb3b1ba508ddc3ba4a161c290b31bf7a67f67880bdbd01171a962c5fa97ca945b1ef17932403f8589309380743f1da632c728d8accb6d4e56dbd895e7486bb SHA512 50b390811c9bf091b14add41f886925b17496b41006b7d3981d2398caa65cf5db8a579c8cebed78278384bf3acc629befb07b54339c61abcc75852c0dcb8b8ca
 DIST nvidia-xconfig-470.161.03.tar.bz2 108669 BLAKE2B 6c12e38759ce64c5637d6301e2d5c89b8d53ad4df84beea276b76cf6927eb6ff9596534b7097088d41447886ebb79e00b037c747a47531b13a56373df7ef8969 SHA512 0cccb61c3b875b47fc78cda627aace3a730e7c267389e0fcd4ab780aefaae3c48d95d137becdba7fc12adb284ede9307c85a3ae347d31a57a6283fece6046a9a
 DIST nvidia-xconfig-510.108.03.tar.bz2 109729 BLAKE2B 48378155d57f9b4a2b58b044daa1f2f2ed9b897b77f0453f67c7b03200cc09689b628f88a87c0f4c8ae149f11cbe6364eda34c2636cc1e1fce33b799d8225138 SHA512 17462e7826225804685eaea4dba05252dce138f95c72285abe607ee1b2a6269d2f4e5c0833802037d29350d1218ed9982053871b0b08c4f5f329d497da299fab
 DIST nvidia-xconfig-515.86.01.tar.bz2 109747 BLAKE2B d6253f9d052be5aaa1a2be82bf4a36c971aae8b6e9f61e4ff5f27ec415d945bab8289678d6a2495ff7521c66478421090a452ceb19d87803de4290aeb7f69bba SHA512 f4e66f23d9227671158ee0b99b1ccc44f25dc6a910d3b00332d135fb94f21b67f581804b53a40945a652777c898e20069962721931c7b58d2c33d38925da5e35
 DIST nvidia-xconfig-525.60.13.tar.bz2 110584 BLAKE2B a06b951f91cef5ce17843876de5b5e5988f2e869f8d6a4478e186597698c3fb05daf176581cfb05bc3dadf79c817cf2df2b947b02f6152c2ea4b960f3aecf2df SHA512 ffba8aabfda510f6546d0c7786d935f432fbbc87ce78d38ce5f9fa22ab5862e7adee0f699b46bb73270b89b092d988af2fed3915b0c9be66d642d39a533fc880
-DIST nvidia-xconfig-525.78.01.tar.bz2 110578 BLAKE2B 60df3925fbacdc0b7e40d9390a42230996d892a015141d1920f45b023e9a6a8aff2d0042d192502b4bf544aea49196c4fa0e6211194e3da9033292a2551783b3 SHA512 9b6020359a2f22cbfd07b0493ef76154bf7664d0d7e380b5489a08484de13cdba412baf8c6fafa99c6ba224d7d1d0801bd08d7ef878cb812ef92bb4ec0787edb
 DIST nvidia-xconfig-525.85.05.tar.bz2 110595 BLAKE2B 249263ad84c72c5682836bc3717774b95238197319a88b35adb9174e6023c385c49bf95ed1bf89a6d4fef0ba445a9802e437324358bddbe999f61849ea68afc0 SHA512 b2cad5f509e817e1e9f43bfce279a512d5899dbbb3dae212161b1ce7237ac3598e335779fbb7abb8b77327827838d7d310522f0b0a014498cff26f4ed5824841
 DIST open-gpu-kernel-modules-525.47.06.tar.gz 10299729 BLAKE2B 945adf90945a0935bcd3bc9eecb93a45b307b5a042baa474ee27bd1f0f404df71e1c3adb3c3544236d8742572d8dbd8864c9a6bb88ff4cdc6573837841967a2a SHA512 b92316d2a35215786bd0a645d9c2560e5c7db4acaf7ee000d591dfe95aac87cb56843f731b710308e86d8d1bdf0add12fe1d494d5750f2b0e23430bf2c50a201
 EBUILD nvidia-drivers-390.157.ebuild 18429 BLAKE2B 1e2ea98beb53cf973c0318c5cbd30789c5a2533f3f82f1c7d0a33332379950b638f39e30c3f702aca8270e10950984c00a4e95f09ae25805d990084bc38d7e03 SHA512 388c84c2cd76a3eb85651a5f567105130250be78451e5e9ef872dba756bb1f9f3d0d93563838fa5c20afc8077a75aa30ceff409578bbcb5f7299e9df06a2c4a8
@@ -74,6 +66,5 @@ EBUILD nvidia-drivers-510.108.03.ebuild 19732 BLAKE2B eee07dcd758004f84dc0313194
 EBUILD nvidia-drivers-515.86.01.ebuild 21987 BLAKE2B a62fd126b0d9cf4529a686121993cd2d79058956be5a70a90fbb7ba3d11fa5b4e44a3d204253d96b0d9e99a0a41a57a1953cc0c102e58fb98222e7174281d4cf SHA512 619c3cd6e12c025ff80c1c48a7f41b6271b89ea804fe1a0cf414af0623bda7fdca70bd5af494205f370e225d2307ce7e4f6c1a0857e1737d86d4ef9fbe267c03
 EBUILD nvidia-drivers-525.47.06.ebuild 21795 BLAKE2B 9d97d47df6484700db1ea2c926a7381205e730fc1c5c3e51e47e8bc2040acc1845e8b09b945232bcc1ce261a1aedfa8d9fd996117e8ce7a35772392393ba5d9f SHA512 9e4acf2290ccf19c04f0ba10df517fc775f0554c479d6a4d1d5c5d2ee8b70217cad5ca5915fc98dc6ec10dfd8906034a7fa0f7060be83196caaad8975b4583f2
 EBUILD nvidia-drivers-525.60.13.ebuild 21783 BLAKE2B 58e48dfd160b23d1fff8294045c7ebcfc818f7d2879b03af633d30038a5dba63ca0dbe581db1f61200543fc94e2f2a08f0ef5cd9637a9978c7ec090ebe58cf73 SHA512 9ef115d8b67bda274a7ceba3644cc45add4e4de1f065aae72fb8f40d1c773a8ba2bc39b19b4d05b9185807146ef8c1b999e9c32c9ef9fa55b70fc0bba5fa2784
-EBUILD nvidia-drivers-525.78.01.ebuild 21784 BLAKE2B 3f24e1a3a59b51f585d90c0f18a551750d1f0ec005dbfe18c3c891727ca68e5d8b73fea00b591cfc74ec63daf28964552aa009d0b1f767ba9cee8b56d27e71d7 SHA512 8b93b31e19783ed2f6249289e97c5937882a428c6c5a14584baaae37f45571d907120645c062b9f5d6323d0148f3d587de3dcdf616d80bb2973b39ed944b87f1
-EBUILD nvidia-drivers-525.85.05.ebuild 21621 BLAKE2B 5a2e084315fb6f87d11cf374c7d15e4740c026870ca7c0230e315655be5bdfbe99d9e88667dbcbfbfcb6776bb873a3b32a68f4b1d84179f5b01e3a7f1cb45c53 SHA512 f057a23d9328d836ed3adef3128763764e849b5a57d1dca22b00396f6f424e5c5c59a0f991752170dfef5a64e6b0e993f8195feb56d92e2a5f908dd597794b4c
+EBUILD nvidia-drivers-525.85.05.ebuild 21620 BLAKE2B 673b6b64cdc4ad869ea576a2a9bdc0ee249e6eb5768cff5efb916787d4326af3120d4e26b116bd66230db0371b04b0437c96728b299d4d21d1cf4a167b9d1ccb SHA512 f141b6e88923f412f48c75d9f50215c04f8539d6008d7171bfa2448cfe0ea0ff390830b8deb296c2811ecc0360979966130cc36eb332f73c056832089f7c1d63
 MISC metadata.xml 1320 BLAKE2B f8aa8f9a39d6da284b60afb50087acf75744057628e79b77a95e6bebb1e386e9d1a819f41e73d3e94b8ab74322ec8e8b077ad6d2af0804a5c6f20b4dd5f2897d SHA512 9fb939f8c8892ce43afc4f577181474c88a0aae3cc58af57987000b82f6c52f3f7b40fc538fa8eae0d5dbaf1fe3734d84f72fda2106853edd945149b3f2d2747
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-525.78.01.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-525.78.01.ebuild
deleted file mode 100644
index 07785f965ba0..000000000000
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-525.78.01.ebuild
+++ /dev/null
@@ -1,632 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MODULES_OPTIONAL_USE="driver"
-inherit desktop flag-o-matic linux-mod multilib readme.gentoo-r1 \
-	systemd toolchain-funcs unpacker user-info
-
-NV_KERNEL_MAX="6.1"
-NV_URI="https://download.nvidia.com/XFree86/"
-
-DESCRIPTION="NVIDIA Accelerated Graphics Driver"
-HOMEPAGE="https://www.nvidia.com/download/index.aspx"
-SRC_URI="
-	amd64? ( ${NV_URI}Linux-x86_64/${PV}/NVIDIA-Linux-x86_64-${PV}.run )
-	arm64? ( ${NV_URI}Linux-aarch64/${PV}/NVIDIA-Linux-aarch64-${PV}.run )
-	$(printf "${NV_URI}%s/%s-${PV}.tar.bz2 " \
-		nvidia-{installer,modprobe,persistenced,settings,xconfig}{,})
-	${NV_URI}NVIDIA-kernel-module-source/NVIDIA-kernel-module-source-${PV}.tar.xz"
-# nvidia-installer is unused but here for GPL-2's "distribute sources"
-S="${WORKDIR}"
-
-LICENSE="NVIDIA-r2 BSD BSD-2 GPL-2 MIT ZLIB curl openssl"
-SLOT="0/${PV%%.*}"
-KEYWORDS="-* ~amd64 ~arm64"
-IUSE="+X abi_x86_32 abi_x86_64 +driver kernel-open persistenced +static-libs +tools wayland"
-REQUIRED_USE="kernel-open? ( driver )"
-
-COMMON_DEPEND="
-	acct-group/video
-	sys-libs/glibc
-	X? ( x11-libs/libpciaccess )
-	persistenced? (
-		acct-user/nvpd
-		net-libs/libtirpc:=
-	)
-	tools? (
-		>=app-accessibility/at-spi2-core-2.46:2
-		dev-libs/glib:2
-		dev-libs/jansson:=
-		media-libs/harfbuzz:=
-		x11-libs/cairo
-		x11-libs/gdk-pixbuf:2
-		x11-libs/gtk+:3[X]
-		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.10
-		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-drivers-525.23-clang15.patch
-	"${FILESDIR}"/nvidia-kernel-module-source-515.86.01-raw-ldflags.patch
-	"${FILESDIR}"/nvidia-modprobe-390.141-uvm-perms.patch
-	"${FILESDIR}"/nvidia-settings-390.144-desktop.patch
-	"${FILESDIR}"/nvidia-settings-390.144-raw-ldflags.patch
-)
-
-pkg_setup() {
-	use driver || return
-
-	local CONFIG_CHECK="
-		PROC_FS
-		~DRM_KMS_HELPER
-		~SYSVIPC
-		~!LOCKDEP
-		~!SLUB_DEBUG_ON
-		!DEBUG_MUTEXES"
-	local ERROR_DRM_KMS_HELPER="CONFIG_DRM_KMS_HELPER: is not set but needed for Xorg auto-detection
-	of drivers (no custom config), and for wayland / nvidia-drm.modeset=1.
-	Cannot be directly selected in the kernel's menuconfig, and may need
-	selection of a DRM device even if unused, e.g. CONFIG_DRM_AMDGPU=m or
-	DRM_I915=y, DRM_NOUVEAU=m also acceptable if a module and not built-in."
-
-	use amd64 && kernel_is -ge 5 8 && CONFIG_CHECK+=" X86_PAT" #817764
-
-	use kernel-open && CONFIG_CHECK+=" MMU_NOTIFIER" #843827
-	local ERROR_MMU_NOTIFIER="CONFIG_MMU_NOTIFIER: is not set but needed to build with USE=kernel-open.
-	Cannot be directly selected in the kernel's menuconfig, and may need
-	selection of another option that requires it such as CONFIG_KVM."
-
-	MODULE_NAMES="
-		nvidia(video:kernel)
-		nvidia-drm(video:kernel)
-		nvidia-modeset(video:kernel)
-		nvidia-peermem(video:kernel)
-		nvidia-uvm(video:kernel)"
-	use kernel-open &&
-		MODULE_NAMES=${MODULE_NAMES//:kernel/:kernel-module-source:kernel-module-source/kernel-open}
-
-	linux-mod_pkg_setup
-
-	[[ ${MERGE_TYPE} == binary ]] && return
-
-	# do some extra checks manually as it gets messy to handle builtin-only
-	# and some other conditional checks through CONFIG_CHECK
-	# TODO?: maybe move other custom checks here for uniformity
-	local warn=()
-
-	if linux_chkconfig_builtin DRM_NOUVEAU; then
-		# suggest =m given keeps KMS_HELPER enabled and can serve as fallback
-		warn+=(
-			"  CONFIG_DRM_NOUVEAU: is builtin (=y), and will prevent loading NVIDIA"
-			"    modules (can be safely kept as a module (=m) instead)."
-		)
-	fi
-
-	if linux_chkconfig_builtin DRM_SIMPLEDRM; then
-		# wrt prebuilts, Fedora is pushing =y and gentoo-kernel-bin uses its
-		# configs (bug #840439), but without Fedora's kernel patch to
-		# workaround this issue (which is unlikely to work for us anyway)
-		# https://github.com/NVIDIA/open-gpu-kernel-modules/issues/228
-		warn+=(
-			"  CONFIG_DRM_SIMPLEDRM: is builtin (=y), and may conflict with NVIDIA"
-			"    (i.e. blanks when X/wayland starts, and tty loses display)."
-			"    For prebuilt kernels, unfortunately no known good workarounds."
-		)
-	fi
-
-	if ! linux_chkconfig_present FB_EFI &&
-		! linux_chkconfig_present FB_SIMPLE &&
-		! linux_chkconfig_present FB_VESA
-	then
-		# nvidia-drivers does not handle the tty (beside mode restoration) but,
-		# given few options are viable, try to warn if all missing
-		warn+=(
-			"  CONFIG_FB_(EFI|SIMPLE|VESA): none set, but note at least one is normally"
-			"    needed to get a display for the tty console. In most cases, it is"
-			"    recommended to enable FB_EFI=y and disable FB_SIMPLE (can be quirky)."
-			"    Non-EFI systems are likely to want FB_VESA=y. Users with multiple GPUs"
-			"    or not using the tty may be able to safely ignore this warning."
-		)
-	fi
-
-	if kernel_is -ge 5 18 13; then
-		if linux_chkconfig_present FB_SIMPLE; then
-			warn+=(
-				"  CONFIG_FB_SIMPLE: is set, recommended to disable and switch to FB_EFI or"
-				"    FB_VESA as it currently may be broken with >=kernel-5.18.13 + NVIDIA:"
-				"    https://github.com/NVIDIA/open-gpu-kernel-modules/issues/341"
-				"    (feel free to ignore this if it works for you)"
-			)
-		fi
-
-		if linux_chkconfig_present SYSFB_SIMPLEFB &&
-			{ linux_chkconfig_present FB_EFI || linux_chkconfig_present FB_VESA; }
-		then
-			warn+=(
-				"  CONFIG_SYSFB_SIMPLEFB: is set, this may prevent FB_EFI or FB_VESA"
-				"    from providing a working tty console display (ignore if unused)."
-			)
-		fi
-	fi
-
-	(( ${#warn[@]} )) &&
-		ewarn "Detected potential configuration issues with used kernel:${warn[*]/#/$'\n'}"
-
-	BUILD_PARAMS='NV_VERBOSE=1 IGNORE_CC_MISMATCH=yes SYSSRC="${KV_DIR}" SYSOUT="${KV_OUT_DIR}"'
-	BUILD_TARGETS="modules"
-
-	# Try to match toolchain with kernel only for modules
-	# (experimental, ideally this should be handled in linux-mod.eclass)
-	nvidia-tc-set() {
-		local -n var=KERNEL_${1}
-		if [[ ! -v var ]]; then
-			read -r var < <(type -P "${@:2}") ||
-				die "failed to find in PATH at least one of: ${*:2}"
-			einfo "Forcing '${var}' for modules (set ${!var} to override)"
-		fi
-	}
-
-	local tool switch
-	if linux_chkconfig_present CC_IS_GCC; then
-		if ! tc-is-gcc; then
-			switch=
-			nvidia-tc-set CC {${CHOST}-,}gcc
-			nvidia-tc-set CXX {${CHOST}-,}g++ # needed by kernel-open
-		fi
-	elif linux_chkconfig_present CC_IS_CLANG; then
-		ewarn "Warning: using ${PN} with a clang-built kernel is largely untested"
-		if ! tc-is-clang; then
-			switch=llvm-
-			nvidia-tc-set CC {${CHOST}-,}clang
-			nvidia-tc-set CXX {${CHOST}-,}clang++
-		fi
-	fi
-
-	if linux_chkconfig_present LD_IS_BFD; then
-		# tc-ld-is-bfd needs https://github.com/gentoo/gentoo/pull/28355
-		[[ $(LC_ALL=C $(tc-getLD) --version 2>/dev/null) == "GNU ld"* ]] ||
-			nvidia-tc-set LD {${CHOST}-,}{ld.bfd,ld}
-	elif linux_chkconfig_present LD_IS_LLD; then
-		tc-ld-is-lld || nvidia-tc-set LD {${CHOST}-,}{ld.lld,lld}
-	fi
-
-	if [[ -v switch ]]; then
-		# only need llvm-nm for lto, but use complete set to be safe
-		for tool in AR NM OBJCOPY OBJDUMP READELF STRIP; do
-			case $(LC_ALL=C $(tc-get${tool}) --version 2>/dev/null) in
-				LLVM*|llvm*) [[ ! ${switch} ]];;
-				*) [[ ${switch} ]];;
-			esac && nvidia-tc-set ${tool} {${CHOST}-,}${switch}${tool,,}
-		done
-	fi
-
-	# pass unconditionally given exports are semi-ignored except CC/LD
-	for tool in CC CXX LD AR NM OBJCOPY OBJDUMP READELF STRIP; do
-		BUILD_PARAMS+=" ${tool}=\"\${KERNEL_${tool}:-\$(tc-get${tool})}\""
-	done
-
-	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
-
-	if kernel_is -gt ${NV_KERNEL_MAX/./ }; then
-		ewarn "Kernel ${KV_MAJOR}.${KV_MINOR} is either known to break this version of ${PN}"
-		ewarn "or was not tested with it. It is recommended to use one of:"
-		ewarn "  <=sys-kernel/gentoo-kernel-${NV_KERNEL_MAX}.x"
-		ewarn "  <=sys-kernel/gentoo-sources-${NV_KERNEL_MAX}.x"
-		ewarn "You are free to try or use /etc/portage/patches, but support will"
-		ewarn "not be given and issues wait until NVIDIA releases a fixed version"
-		ewarn "(Gentoo will not accept patches for this)."
-		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
-	mv NVIDIA-kernel-module-source-${PV} kernel-module-source || die
-
-	eapply --directory=kernel-module-source/kernel-open \
-		-p2 "${FILESDIR}"/nvidia-drivers-525.23-clang15.patch
-
-	default
-
-	# prevent detection of incomplete kernel DRM support (bug #603818)
-	sed 's/defined(CONFIG_DRM/defined(CONFIG_DRM_KMS_HELPER/g' \
-		-i kernel{,-module-source/kernel-open}/conftest.sh || die
-
-	# adjust service files
-	sed 's/__USER__/nvpd/' \
-		nvidia-persistenced/init/systemd/nvidia-persistenced.service.template \
-		> "${T}"/nvidia-persistenced.service || die
-	use !amd64 || sed -i "s|/usr|${EPREFIX}/opt|" systemd/system/nvidia-powerd.service || die
-
-	# enable nvidia-drm.modeset=1 by default with USE=wayland
-	cp "${FILESDIR}"/nvidia-470.conf "${T}"/nvidia.conf || die
-	use !wayland || sed -i '/^#.*modeset=1$/s/^#//' "${T}"/nvidia.conf || die
-
-	# makefile attempts to install wayland library even if not built
-	use wayland || sed -i 's/ WAYLAND_LIB_install$//' \
-		nvidia-settings/src/Makefile || die
-
-	# temporary option, nvidia will remove in the future
-	use !kernel-open ||
-		sed -i '/blacklist/a\
-\
-# Enable using kernel-open with workstation GPUs (experimental)\
-options nvidia NVreg_OpenRmEnableUnsupportedGpus=1' "${T}"/nvidia.conf || die
-}
-
-src_compile() {
-	tc-export AR CC CXX LD OBJCOPY OBJDUMP
-	local -x RAW_LDFLAGS="$(get_abi_LDFLAGS) $(raw-ldflags)" # raw-ldflags.patch
-
-	local xnvflags=-fPIC #840389
-	# lto static libraries tend to cause problems without fat objects
-	is-flagq '-flto@(|=*)' && xnvflags+=" $(test-flags-CC -ffat-lto-objects)"
-
-	NV_ARGS=(
-		PREFIX="${EPREFIX}"/usr
-		HOST_CC="$(tc-getBUILD_CC)"
-		HOST_LD="$(tc-getBUILD_LD)"
-		BUILD_GTK2LIB=
-		NV_USE_BUNDLED_LIBJANSSON=0
-		NV_VERBOSE=1 DO_STRIP= MANPAGE_GZIP= OUTPUTDIR=out
-		WAYLAND_AVAILABLE=$(usex wayland 1 0)
-		XNVCTRL_CFLAGS="${xnvflags}"
-	)
-
-	if use driver; then
-		if linux_chkconfig_present GCC_PLUGINS; then
-			mkdir "${T}"/plugin-test || die
-			echo "obj-m += test.o" > "${T}"/plugin-test/Kbuild || die
-			:> "${T}"/plugin-test/test.c || die
-			if [[ $(LC_ALL=C make -C "${KV_OUT_DIR}" ARCH="$(tc-arch-kernel)" \
-				HOSTCC="$(tc-getBUILD_CC)" CC="${CC}" M="${T}"/plugin-test 2>&1) \
-				=~ "error: incompatible gcc/plugin version" ]]
-			then
-				eerror "Detected kernel was built with a different gcc/plugin version,"
-				eerror "Please 'make clean' and rebuild your kernel with the current"
-				eerror "gcc (or re-emerge for distribution kernels, including kernel-bin)."
-				die "kernel ${KV_FULL} needs to be rebuilt"
-			fi
-		fi
-
-		local o_cflags=${CFLAGS} o_cxxflags=${CXXFLAGS} o_ldflags=${LDFLAGS}
-		if use kernel-open; then
-			# building the nvidia "blob" fails with lto, and also need
-			# to strip in case of a different toolchain for the kernel
-			filter-lto
-			strip-unsupported-flags
-		fi
-		linux-mod_src_compile
-		CFLAGS=${o_cflags} CXXFLAGS=${o_cxxflags} LDFLAGS=${o_ldflags}
-	fi
-
-	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
-		CFLAGS="-Wno-deprecated-declarations ${CFLAGS}" \
-			emake "${NV_ARGS[@]}" -C nvidia-settings
-	elif use static-libs; then
-		# pretend GTK+3 is available, not actually used (bug #880879)
-		emake "${NV_ARGS[@]}" BUILD_GTK3LIB=1 \
-			-C nvidia-settings/src out/libXNVCtrl.a
-	fi
-}
-
-src_install() {
-	local libdir=$(get_libdir) libdir32=$(ABI=x86 get_libdir)
-
-	NV_ARGS+=( DESTDIR="${D}" LIBDIR="${ED}"/usr/${libdir} )
-
-	local -A paths=(
-		[APPLICATION_PROFILE]=/usr/share/nvidia
-		[CUDA_ICD]=/etc/OpenCL/vendors
-		[EGL_EXTERNAL_PLATFORM_JSON]=/usr/share/egl/egl_external_platform.d
-		[FIRMWARE]=/lib/firmware/nvidia/${PV}
-		[GBM_BACKEND_LIB_SYMLINK]=/usr/${libdir}/gbm
-		[GLVND_EGL_ICD_JSON]=/usr/share/glvnd/egl_vendor.d
-		[VULKAN_ICD_JSON]=/usr/share/vulkan
-		[WINE_LIB]=/usr/${libdir}/nvidia/wine
-		[XORG_OUTPUTCLASS_CONFIG]=/usr/share/X11/xorg.conf.d
-
-		[GLX_MODULE_SHARED_LIB]=/usr/${libdir}/xorg/modules/extensions
-		[GLX_MODULE_SYMLINK]=/usr/${libdir}/xorg/modules
-		[XMODULE_SHARED_LIB]=/usr/${libdir}/xorg/modules
-	)
-
-	local skip_files=(
-		# nvidia_icd/layers(vulkan): skip with -X too as it uses libGLX_nvidia
-		$(usev !X "
-			libGLX_nvidia libglxserver_nvidia
-			nvidia_icd.json nvidia_layers.json")
-		$(usev !wayland libnvidia-vulkan-producer)
-		libGLX_indirect # non-glvnd unused fallback
-		libnvidia-{gtk,wayland-client} nvidia-{settings,xconfig} # from source
-		libnvidia-egl-gbm 15_nvidia_gbm # gui-libs/egl-gbm
-		libnvidia-egl-wayland 10_nvidia_wayland # gui-libs/egl-wayland
-	)
-	local skip_modules=(
-		$(usev !X "nvfbc vdpau xdriver")
-		$(usev !driver gsp)
-		installer nvpd # handled separately / built from source
-	)
-	local skip_types=(
-		GLVND_LIB GLVND_SYMLINK EGL_CLIENT.\* GLX_CLIENT.\* # media-libs/libglvnd
-		OPENCL_WRAPPER.\* # virtual/opencl
-		DOCUMENTATION DOT_DESKTOP .\*_SRC DKMS_CONF SYSTEMD_UNIT # handled separately / unused
-	)
-
-	local DOCS=(
-		README.txt NVIDIA_Changelog supported-gpus/supported-gpus.json
-		nvidia-settings/doc/{FRAMELOCK,NV-CONTROL-API}.txt
-	)
-	local HTML_DOCS=( html/. )
-	einstalldocs
-
-	local DISABLE_AUTOFORMATTING=yes
-	local DOC_CONTENTS="\
-Trusted users should be in the 'video' group to use NVIDIA devices.
-You can add yourself by using: gpasswd -a my-user video\
-$(usev driver "
-
-Like all out-of-tree kernel modules, it is necessary to rebuild
-${PN} after upgrading or rebuilding the Linux kernel
-by for example running \`emerge @module-rebuild\`. Alternatively,
-if using a distribution kernel (sys-kernel/gentoo-kernel{,-bin}),
-this can be automated by setting USE=dist-kernel globally.
-
-Loaded kernel modules also must not mismatch with the installed
-${PN} version (excluding -r revision), meaning should
-ensure \`eselect kernel list\` points to the kernel that will be
-booted before building and preferably reboot after upgrading
-${PN} (the ebuild will emit a warning if mismatching).
-
-See '${EPREFIX}/etc/modprobe.d/nvidia.conf' for modules options.")\
-$(use amd64 && usev !abi_x86_32 "
-
-Note that without USE=abi_x86_32 on ${PN}, 32bit applications
-(typically using wine / steam) will not be able to use GPU acceleration.")
-
-For general information on using ${PN}, please see:
-https://wiki.gentoo.org/wiki/NVIDIA/nvidia-drivers"
-	readme.gentoo_create_doc
-
-	if use driver; then
-		linux-mod_src_install
-
-		insinto /etc/modprobe.d
-		doins "${T}"/nvidia.conf
-
-		# used for gpu verification with binpkgs (not kept, see pkg_preinst)
-		insinto /usr/share/nvidia
-		doins supported-gpus/supported-gpus.json
-	fi
-
-	emake "${NV_ARGS[@]}" -C nvidia-modprobe install
-	fowners :video /usr/bin/nvidia-modprobe #505092
-	fperms 4710 /usr/bin/nvidia-modprobe
-
-	if use persistenced; then
-		emake "${NV_ARGS[@]}" -C nvidia-persistenced install
-		newconfd "${FILESDIR}"/nvidia-persistenced.confd nvidia-persistenced
-		newinitd "${FILESDIR}"/nvidia-persistenced.initd nvidia-persistenced
-		systemd_dounit "${T}"/nvidia-persistenced.service
-	fi
-
-	if use tools; then
-		emake "${NV_ARGS[@]}" -C nvidia-settings install
-
-		doicon nvidia-settings/doc/nvidia-settings.png
-		domenu nvidia-settings/doc/nvidia-settings.desktop
-
-		exeinto /etc/X11/xinit/xinitrc.d
-		newexe "${FILESDIR}"/95-nvidia-settings-r1 95-nvidia-settings
-	fi
-
-	if use static-libs; then
-		dolib.a nvidia-settings/src/out/libXNVCtrl.a
-
-		insinto /usr/include/NVCtrl
-		doins nvidia-settings/src/libXNVCtrl/NVCtrl{Lib,}.h
-	fi
-
-	use X && emake "${NV_ARGS[@]}" -C nvidia-xconfig install
-
-	# mimic nvidia-installer by reading .manifest to install files
-	# 0:file 1:perms 2:type 3+:subtype/arguments -:module
-	local m into
-	while IFS=' ' read -ra m; do
-		! [[ ${#m[@]} -ge 2 && ${m[-1]} =~ MODULE: ]] ||
-			[[ " ${m[0]##*/}" =~ ^(\ ${skip_files[*]/%/.*|\\} )$ ]] ||
-			[[ " ${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
-	: "$(systemd_get_sleepdir)"
-	exeinto "${_#"${EPREFIX}"}"
-	doexe systemd/system-sleep/nvidia
-	dobin systemd/nvidia-sleep.sh
-	systemd_dounit systemd/system/nvidia-{hibernate,resume,suspend}.service
-
-	dobin nvidia-bug-report.sh
-
-	# MODULE:powerd extras
-	if use amd64; then
-		systemd_dounit systemd/system/nvidia-powerd.service
-
-		insinto /usr/share/dbus-1/system.d
-		doins nvidia-dbus.conf
-	fi
-
-	# symlink non-versioned so nvidia-settings can use it even if misdetected
-	dosym nvidia-application-profiles-${PV}-key-documentation \
-		${paths[APPLICATION_PROFILE]}/nvidia-application-profiles-key-documentation
-
-	# don't attempt to strip firmware files (silences errors)
-	dostrip -x ${paths[FIRMWARE]}
-}
-
-pkg_preinst() {
-	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=$(egetent group video | cut -d: -f3)
-	[[ ${g} =~ ^[0-9]+$ ]] || die "Failed to determine video group id (got '${g}')"
-	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() {
-	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 kernel-open; then
-		ewarn
-		ewarn "Open source variant of ${PN} was selected, be warned it is experimental"
-		ewarn "and only usable with Turing / Ampere and later GPUs, aka GTX 1650+."
-		ewarn "Please also see: ${EROOT}/usr/share/doc/${PF}/html/kernel_open.html"
-		ewarn
-		ewarn "Many features are not yet implemented in the drivers and limitations are"
-		ewarn "to be expected. Please do not report non-build/packaging bugs to Gentoo."
-		ewarn "Switch back to USE=-kernel-open to restore functionality if needed for now."
-	fi
-
-	if use wayland && use driver && [[ ! -v NV_HAD_WAYLAND ]]; then
-		elog
-		elog "With USE=wayland, this version of ${PN} sets nvidia-drm.modeset=1"
-		elog "in '${EROOT}/etc/modprobe.d/nvidia.conf'. This feature is considered"
-		elog "experimental but is required for wayland."
-		elog
-		elog "If you experience issues, either disable wayland or edit nvidia.conf."
-		elog "Of note, may possibly cause issues with SLI and Reverse PRIME."
-	fi
-}
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-525.85.05.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-525.85.05.ebuild
index 8f1d78d8e724..60013f9aa119 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-525.85.05.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-525.85.05.ebuild
@@ -23,7 +23,7 @@ S="${WORKDIR}"
 
 LICENSE="NVIDIA-r2 BSD BSD-2 GPL-2 MIT ZLIB curl openssl"
 SLOT="0/${PV%%.*}"
-KEYWORDS="-* ~amd64 ~arm64"
+KEYWORDS="-* amd64 ~arm64"
 IUSE="+X abi_x86_32 abi_x86_64 +driver kernel-open persistenced +static-libs +tools wayland"
 REQUIRED_USE="kernel-open? ( driver )"
 
diff --git a/x11-drivers/xf86-input-elographics/Manifest b/x11-drivers/xf86-input-elographics/Manifest
index e1c125de7ddc..8a9fef5090f1 100644
--- a/x11-drivers/xf86-input-elographics/Manifest
+++ b/x11-drivers/xf86-input-elographics/Manifest
@@ -1,5 +1,3 @@
-DIST xf86-input-elographics-1.4.2.tar.bz2 306167 BLAKE2B 1bd32ece8e1b3465542af539e5a83c75e23023125b8a21018a4e59b5eb9585e349371b346aa042f2ffcf4ce92d7a8616fa5d2a50224298f928e72a726df6ce22 SHA512 90e9eb3441a78288fbfbb2b108f212b8cfa3d5aaf25a0e88a5e40783cd36bc2d60e02ba390a5f0071eaa37f77e61f0d7ce6d9dbde4f6db21a86ca3294decff97
 DIST xf86-input-elographics-1.4.3.tar.xz 261396 BLAKE2B 0320dc019d490c1f2bfdf9b2cf61ae1519959570d314921998c4bbb0fc54f7680391a6ffe15fbfbccb3743882daa4e275904e1ce773711df0df90918e5dbe4ae SHA512 3653beaa90d61b7827c9217774ca394de4d7d36a54f0d004702ff29c7b7f8960996a75a45d0db6f4a9921c71844c401072071c785cf371787bbd8941bac92986
-EBUILD xf86-input-elographics-1.4.2.ebuild 250 BLAKE2B b2f5ef09470309dc083935a8a239bab88da665eb8dd0b0ad7dee9867b35bc5fab9f2171a164c67f38e43393c379350b4c59ecb121887ee5350cb69afcbe0eda3 SHA512 f97643d45e6b403d61bea819681c4170df185a75bb30fc9d54ecbfa0779fcacc80ed3ccbb5d9621321ccf9c14a7f74f54ea14e819de5333ad5c4de6c2cf89fcc
 EBUILD xf86-input-elographics-1.4.3.ebuild 267 BLAKE2B ca70e27709a3ee94bc547115359f80b591399b51946b5fca05df7e80b188e2999b26b019d064da35accd57ea3d74894a5ab0d71ba7b3451ddb9c5c337208df70 SHA512 314b7adbcbe877c23c1a8b9d96edbbd9b92d5e26c65cb14b502e7cff87af73dbf0e057b4f21d1087e0fb7ce7d28504174d5ed2107f13518e87c528c41f57f958
 MISC metadata.xml 356 BLAKE2B 4abc357f727222f4241ccea330e678b2fcf6c08a13cb8e0e753c2f3073f38702be7b42754b5dbf73890cacba1f58288e832ed8c70d5d89914b850320daab488d SHA512 3a576f8ba94856cee1a76a88ff2a09d309ba7c7825151097ee91d6acbe0d8397f52d15a30ab5f1fb7c537be8fee0e40dd3cfe9c29fa461e0feecb9cdaf2d32bd
diff --git a/x11-drivers/xf86-input-elographics/xf86-input-elographics-1.4.2.ebuild b/x11-drivers/xf86-input-elographics/xf86-input-elographics-1.4.2.ebuild
deleted file mode 100644
index bab2aeea8ab1..000000000000
--- a/x11-drivers/xf86-input-elographics/xf86-input-elographics-1.4.2.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xorg-3
-
-DESCRIPTION="Elographics input driver"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ppc ppc64 sparc x86"
-IUSE=""
diff --git a/x11-drivers/xf86-input-joystick/Manifest b/x11-drivers/xf86-input-joystick/Manifest
index a13b6cf0b13e..396f6f10556c 100644
--- a/x11-drivers/xf86-input-joystick/Manifest
+++ b/x11-drivers/xf86-input-joystick/Manifest
@@ -1,5 +1,3 @@
-DIST xf86-input-joystick-1.6.3.tar.bz2 351846 BLAKE2B 3cbba17066cce241d6ed1a04ae26d4a875b994b47eb2d1078704d9dd109c9477ca367aebfec15b3358a7c857b91a8e751a83c2c4bab28f26b7aa6c02119463d8 SHA512 541c993bd37dd74d96d90060407d9fb9ebd3fbca352189a08c6b0c899c84609a1b5a3c1ea3febb4ceb5e2b881b54e45c75b8f9b2e475e16d7cffbbe42a3221e5
 DIST xf86-input-joystick-1.6.4.tar.xz 296132 BLAKE2B 2e24287bcf426e69ac87d2e000c94ce72807c5590a5399d9573f150e0353c93886d47ffb7d684bad119bb8dcf6cdfee14fe472ddb583f7f2554129ca8341fe30 SHA512 4e9127f125543060f9e6bc4b0aa384bc98a92acc52bfb240c9a114c565e0b24d2e9dcbc0e866845abc8aeb1e1a6c78cd5e3f0c0f22007aa93460b6a1910d67ef
-EBUILD xf86-input-joystick-1.6.3.ebuild 448 BLAKE2B 54308d38df6ef67aa82943512a99765e70cac0b773a3a7881d86cc8b1b6261365d8660b2210f3f77ea28daecfb3ddef1ddbfc44ef4dfe77389ce15e1f18314ba SHA512 06936669517ae3806329248627a98925f9d0020a5390485a758932516206c5979b126be0fd8ba9a87615f08daaece88f71f3d8aab345cd95e8ec6b012ebe46db
 EBUILD xf86-input-joystick-1.6.4.ebuild 452 BLAKE2B 23b58c50a0292cd3b60f125a478cb07660dc276a4ae5976e31b7a710793d5284c57272a2d7597e5005909ad3df4858e4ebd5dd4b4d021c7af55e6751c83fd061 SHA512 8d10c4a5e0a94ad0c3a702e23698e52ebd72ba1e11b65062dd351a184f0eff13b4f0ae4fb7d24e20df7d5d6a839f9fa227b46d4fa07ec3c4a51c8dd17d7fd953
 MISC metadata.xml 353 BLAKE2B 416df8494ec3f313842dd90a2de2f4e0cea9e920ecc7eb4901c92f1eb6b0830855b540ea6386c91fc929074a9865219a3671b71eb08d5e28325e7ef51e6f0afd SHA512 817cce01f2a3bb803c72b3eff54f781c013704a0ef517c79cece9992a90237f9537a8350f8382925791afdd62248f9ada79479a9fd80aa95c0e4214f3cd14000
diff --git a/x11-drivers/xf86-input-joystick/xf86-input-joystick-1.6.3.ebuild b/x11-drivers/xf86-input-joystick/xf86-input-joystick-1.6.3.ebuild
deleted file mode 100644
index 2885ec97bfab..000000000000
--- a/x11-drivers/xf86-input-joystick/xf86-input-joystick-1.6.3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xorg-3
-
-DESCRIPTION="X.Org driver for joystick input devices"
-
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ppc ppc64 sparc x86"
-
-RDEPEND="x11-base/xorg-server"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-src_install() {
-	xorg-3_src_install
-
-	insinto /usr/share/X11/xorg.conf.d
-	doins config/50-joystick-all.conf
-}
diff --git a/x11-drivers/xf86-video-ast/Manifest b/x11-drivers/xf86-video-ast/Manifest
index 6f9464766d59..96208ea2bdcf 100644
--- a/x11-drivers/xf86-video-ast/Manifest
+++ b/x11-drivers/xf86-video-ast/Manifest
@@ -1,5 +1,3 @@
-DIST xf86-video-ast-1.1.5.tar.bz2 339848 BLAKE2B 48ebb8f54307a467eb952ff57dce4cc9da11b627354c54e11426133dee029765390c8c61f0b724bfc66c2f86aa5938ddad49707847b50648d875dccf5c4be9fd SHA512 067c2ce3e74c83fe1531213308753cb80482d177c93009c99dc49e95bfa6ff058d81cc716d6c343b9ca1e0eb7aedf3b84beb12ad08b8cd4d9f43e11f9e192e8e
 DIST xf86-video-ast-1.1.6.tar.xz 317848 BLAKE2B 6336de38ec08da6014c40d6af50dee31f3a0b2bcacc96220100ed04c102d0f37292364c00e41c849151a3b3edefe4891c2037e282f130add0b1f5acb9f34d3e9 SHA512 8482fec8d6be577f293cb820e623544475163f713fd74ec415f899bf5e9cf9453ffe4f96e141da3671437ebf616b47395d30d4b10858053c5893f5f5b7575ef1
-EBUILD xf86-video-ast-1.1.5.ebuild 224 BLAKE2B 62b99a679af9ceff70e9070bd14b1bd393a48cb364c3e433315a0ea7c399852cc826d01b23f302af18898f632927186465194085a4be9bb40f1aab77c63d7595 SHA512 165b209858242f141c873e14506f0e786cf30bced24a415787ef75d8f48051aae349c54f9a8038e7b29093df8760dbccf32b862fb5260d01b07a6d6d3e956ac0
 EBUILD xf86-video-ast-1.1.6.ebuild 234 BLAKE2B 90da53c357b077cc9bd8daa30b203a58fe067530703f2a0506a05d6f0546c97d82a625368feb802b647b87594d2e5b0eec62b5122a4fb5521424a2820228fe15 SHA512 60cabeea82baca0a4b4401549c42dd2ee6a80c8eb8a8563812ddf4129001d91d3b6159b3cacd096c4c15fab2f608c766b1ccb65e16cf977107ba7285d79a4e7d
 MISC metadata.xml 348 BLAKE2B e67cfb03d00b751461ff7a3ce0ca0e57a330d38ea09b74ffcb4374b3010ef894018b9545c99cdb2c464dc7bcfe603a05de13432d9a8ffd021ad7a9b02bfd1100 SHA512 1c20a321be93ff558e7289e46d1a78619de8afb3c90af074303ed52433a40a81d55d37591e13a4b48649b8a2ec648efa13748ed9ac83afaf26b5020c666b623f
diff --git a/x11-drivers/xf86-video-ast/xf86-video-ast-1.1.5.ebuild b/x11-drivers/xf86-video-ast/xf86-video-ast-1.1.5.ebuild
deleted file mode 100644
index ff7da2486ff6..000000000000
--- a/x11-drivers/xf86-video-ast/xf86-video-ast-1.1.5.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xorg-3
-
-DESCRIPTION="X.Org driver for ASpeedTech cards"
-
-LICENSE="MIT"
-KEYWORDS="amd64 ~ppc ppc64 x86"
diff --git a/x11-drivers/xf86-video-r128/Manifest b/x11-drivers/xf86-video-r128/Manifest
index f3c6a91168b9..7102e426d748 100644
--- a/x11-drivers/xf86-video-r128/Manifest
+++ b/x11-drivers/xf86-video-r128/Manifest
@@ -1,5 +1,3 @@
-DIST xf86-video-r128-6.12.0.tar.bz2 483999 BLAKE2B f3433ce0289a7c356b69871ad4acb9ce9b0a947c1bf6ee9bf436a5d27ad1324fc81bb2d3c9be16ddf588f286ae092091dafd161c39ce8bc1bf20b6cb36ffdb72 SHA512 0e667e2cfa8a87a00846361d86528c93754c403c812b66798953fa4c857b2143b2c4c44885da467e7f910d8cb910b69492cdcb6f25e2197bae6617364d152e38
 DIST xf86-video-r128-6.12.1.tar.xz 438952 BLAKE2B 4a95c3498ea6f28540ae5aa29b05b432a6b69cd75871b9aa2a7cbfc4ae855177e45630c8a0f07801fa1034caf39b7d82e1c5fa389c930515ecb5450b4b9c90a2 SHA512 18b2408fe68161c32f84c7147717f8e6c6377e81e9d59e2f098843c54cd0ae757aab5059568da8c71ef38100807d56ee22447417c236c1b3deea292bb676e700
-EBUILD xf86-video-r128-6.12.0.ebuild 499 BLAKE2B 76151d12babe623c6fa063df6e4b015f7d92ed8a138868976ecd80f7f8e04e6ab0c792739b09360949d8a25362253387c93a202fb1784713a41ca34bd055c883 SHA512 0b8f0c855d6106f5f5456e2a13e3390190fca5b30405d71f2a4b6f65b1861867d77c27a52541a318351686da7a4dedc96588b78c2c9befd4a0c2fbefb24cf7f8
 EBUILD xf86-video-r128-6.12.1.ebuild 437 BLAKE2B a1e037a30029847a95f454357f9c7e96d1b3ff979d58d025e1d98469e9ce7fef1b58d643a45e7c78243efc9a580af92e696a9626bea7fe6a4d48bf85f6a5129b SHA512 2312b43c3d162125da965cacffde8f2002d92aaff8cf275045997023fd8b9a7e39ed1b046a962b1187aa30ffe4c355e43024ba37ee28f38d61f957422377426e
 MISC metadata.xml 349 BLAKE2B 0bc524edd9993bb3de0c9d3b0b4258377ade6b90cfdc93f805db2851a794819311dd0124199462c388a6d89efb9d6b391dd658772cd79adb19c96ddb998e1937 SHA512 a46e1ca2522c62720e1cd47f5af88ed8b5ea9a259ee5b02b86e83c7297e8ec32a71aacbabbfeee470a4f01f0c60d4e2fa902c9ea5d7eac5ce789a100de2ac558
diff --git a/x11-drivers/xf86-video-r128/xf86-video-r128-6.12.0.ebuild b/x11-drivers/xf86-video-r128/xf86-video-r128-6.12.0.ebuild
deleted file mode 100644
index c380d4b30b44..000000000000
--- a/x11-drivers/xf86-video-r128/xf86-video-r128-6.12.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-XORG_DRI=dri
-
-inherit flag-o-matic xorg-3
-
-DESCRIPTION="ATI Rage128 video driver"
-
-KEYWORDS="~alpha amd64 ~ia64 ~loong ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="dri"
-
-RDEPEND=">=x11-base/xorg-server-1.2"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	# always use C11 semantics
-	append-cflags -std=gnu11
-
-	local XORG_CONFIGURE_OPTIONS=(
-		$(use_enable dri)
-	)
-	xorg-3_src_configure
-}
diff --git a/x11-drivers/xf86-video-vesa/Manifest b/x11-drivers/xf86-video-vesa/Manifest
index 8827d28b3da3..e0a0d57d84ee 100644
--- a/x11-drivers/xf86-video-vesa/Manifest
+++ b/x11-drivers/xf86-video-vesa/Manifest
@@ -1,5 +1,3 @@
-DIST xf86-video-vesa-2.5.0.tar.bz2 304322 BLAKE2B aee8b59d769a72fb2890bbadde7fb87e2f527fb58eaf8b2ef515b0a1b7dc591c6afaf1d8692caaaefb741f475ed77bc0ed069be43a752103260bc85314a7a830 SHA512 36fd921f54f33eb25966b5f9ea1e1b3e9009965c012c8b9c676686b472111719921b80cf62dafc746058878253e21f0ef341a2ff2d650df22ca1e35e81716a8b
 DIST xf86-video-vesa-2.6.0.tar.xz 275572 BLAKE2B 18a4aae9125c03da183aea07403c2e0809adf18c963c4acda8b55130a2a22c9fa1b0dc02dbb3ea836a4e735396a660a1e55bec6482707c019f9bfd756442d6b9 SHA512 494e117c1e6e0ce4c66ac7798de54667862c62605bfd76dd9373447d40dcd0521100810c9285cbe9c159440e217954c0cad6d5219c5894e075509c7c0bc353c7
-EBUILD xf86-video-vesa-2.5.0.ebuild 623 BLAKE2B ab3420635068980df0be30496073d4b2917f89c67323a25af6356b56de3a0f75e535ccd9fb67518256b465d9706950d3e50d44b74733507084986232e9d98350 SHA512 ba18775c51b0c19c5cf368d11736543cac6cfecf1ea8176446d1cd2d791223ff8e62456b8bdb8535fc8756f92389e39087f6d58cc42af67cc9facf3c6fad3de3
 EBUILD xf86-video-vesa-2.6.0.ebuild 549 BLAKE2B 9cf2d9bc52b0937d1bdcf3238fc83ffc272ca09fc808c1ec9bdb382686b600366cf96a07f43c11af4ed2482adc31ff8bd60c767b37adb20679a7b37c4e9fa85f SHA512 29905bbde43185df8efbf60a4c695fc964276a67674e42e2f1a834968f2571f73890f5c90bd2394fbf379c74d8d2627b15c014c06cafb3e4e9e90c543eba89db
 MISC metadata.xml 349 BLAKE2B 0f62438da7f64ce6d8b6d7bdcaf97ad3065d2c7203f9e486e0862002a36c02f7cb07560848d20d6a7e349ff74ace198679affae82b4510dd464ed7027d23cbfb SHA512 f36c8c310d053c5246f313e89378ed38082683152cc56874fbf8863521de6f7eb4e3fdd0683c6d96cba726cc2789b5d69ad8712ec058dd10982e37e6f540f566
diff --git a/x11-drivers/xf86-video-vesa/xf86-video-vesa-2.5.0.ebuild b/x11-drivers/xf86-video-vesa/xf86-video-vesa-2.5.0.ebuild
deleted file mode 100644
index 2f085947bfdd..000000000000
--- a/x11-drivers/xf86-video-vesa/xf86-video-vesa-2.5.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit linux-info xorg-3
-
-DESCRIPTION="Generic VESA video driver"
-KEYWORDS="-* ~alpha amd64 x86"
-IUSE=""
-
-RDEPEND=">=x11-base/xorg-server-1.6
-	>=x11-libs/libpciaccess-0.12.901"
-DEPEND="${RDEPEND}"
-
-pkg_pretend() {
-	linux-info_pkg_setup
-
-	if ! linux_config_exists || ! linux_chkconfig_present DEVMEM; then
-		echo
-		ewarn "This driver requires /dev/mem support in your kernel"
-		ewarn "  Device Drivers --->"
-		ewarn "    Character devices  --->"
-		ewarn "      [*] /dev/mem virtual device support"
-		echo
-	fi
-}