gentoo resync : 09.07.2022

14 files changed, 31 insertions, 681 deletions

diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
index 8bf740be4f0c..6e0b50e29639 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -1,60 +1,47 @@
-DIST genpatches-5.10-132.base.tar.xz 3685068 BLAKE2B f46967d4a4fc013f6b7edb2e8ff427607a2521a53304bce80a371204f6a325ebb554db3a3e94178f1b6d4ee1bb71ddf254b7b991074378b080f0b2bdd01d9671 SHA512 1edf845da90e7c66d95d41d2d40141210cb7b9b786f29e5fc1c982d64d8b1a918f417364c6bc59f8b58ecfb8aa9b8e4df71e7752926ee68724a63b8c6213a14e
-DIST genpatches-5.10-132.extras.tar.xz 3868 BLAKE2B 207e7a4bd474202ad112c450b49e8ef3ead28eadfd1e35916a7ed7d2439c9b435ca2a6ccbb56a6e761b59580751c85993d3ffb6ade8908b8f1993638ac8cfa20 SHA512 ffdf7573a027e5fae644ab22358bdcf74c7d023e28d3cbd08f01dfc02f6776956320cd1bf4e91568de64bb6eaa88682f393a257233b310133f35b2badb4bee46
-DIST genpatches-5.10-133.base.tar.xz 3705140 BLAKE2B ea0136c10a49158b3baff338a098c00729cce01d1ef0c1d08b7f2e225d3e10b4b039be9d5265b93d55e7069752d9c224797b4bfe1032ea10910a4e70b78c0121 SHA512 fd2e06fb495c020768d671925301e359008f1c51fa49fffbb1cf8dc23b5793ecd1b563d2729b312a9929ca8df9a5bfa2f3bcdc4e4a099d299f80f65de9055882
-DIST genpatches-5.10-133.extras.tar.xz 3868 BLAKE2B 30b7a0fc22202becd9b3517aff1f4ac797f6dd1437b108d5c694307641e158c68078514d7c2e32456162ee558659391092ee6e8e5cd0e7d620481563165605d0 SHA512 8e3ad4883726c772d2988ce9618c8fd1236760ca87c6645e1c7bab99fd540ae9cc1371a566bcfcb52bd816e3c21f5c83821b4e77831efe4f1b89eea63b3ff544
-DIST genpatches-5.10-134.base.tar.xz 3707528 BLAKE2B e601b3a289541d53c140ebbc3616f5e12d642490148e579bb681ca866841998e05ede2afeba018b671a1ab471d284a015b781b725e4a3449ab93ce00e4c794ad SHA512 a5103de1223d9cf9431bf58ce76d58a7f8a6491a4301697d0011221e67c4e230e42c3eadc0c3882213b05d3a4baa7bbbbe0136530fb94e702ad43cd863740e7a
-DIST genpatches-5.10-134.extras.tar.xz 3868 BLAKE2B 85ed4b88733e22c7b0500719b0553b5f58d3f2195ce17b01f750c6af339579a5d7b043b7c9e29439318cbc4af4b834d4dc2f35bd42afa3d933f8f2c0a5b0a4e4 SHA512 24342bee361389b44f795f80af7b4142652c3c27b40281b96ebd9e844c1974a626c5801d9840826693dfaaabb06ffc8fb54b184b41b6a3a0b3cc8f41f836e468
-DIST genpatches-5.15-52.base.tar.xz 2177024 BLAKE2B 2fd4767dd3ae66cce6a179105389ce6e57ef0bf46f2ed5cb9a350d300472f813d22cdabbde4201acd6c76ca0c7701d09753351c12b4eea05fd1e93142ae4d526 SHA512 cc5fd2f260366f8b2715e09c4124d269b168bbacfd40ff36d6ab113419b30331ebd000adb01e5e6df4aff27487e528dc2f3e154b7df32d37e1f30f5c13e247be
-DIST genpatches-5.15-52.extras.tar.xz 3932 BLAKE2B 8735d0c2d8e5e3a14f01893109e8feb179d6632e0dc3254b57d7545fb6280ca09bf9c2baaef7ec02bf337cb0f1a0d42f2e44dea2168cfa2c2ad20969b64a178c SHA512 c461a48096d46bacfc4a2d89060b6e72584d74b215b3ba5c969529bfb4330672c15b7e5f015492e5b1ef081942eea60342a7d413af3fe28f2fde730b41553ac8
-DIST genpatches-5.15-53.base.tar.xz 2200544 BLAKE2B a6f1e11186e771abe56bb453d45f6228aed255ef6e7f8b93cde7cd22d5d6068dd7abc1a7025851ae27f7bf8e6076d5a78c009e940645fe39926ceff20cddece2 SHA512 bcb691818b050f1c9138827ca2c86bbfe43cf6521b9f802dc41c4ba4f6e42e11e79494cd54ac391bf1129fc30f7baf9272f81821df9ef8ad79e2553655606d39
-DIST genpatches-5.15-53.extras.tar.xz 3932 BLAKE2B ade13a83b27b14cf19f455539599aff1db3bc6caf99d07e746b292be702c49591519b63f754c4651ac3e0e867412cb5ffb588d5056cf6066c193e09a0c3feaf2 SHA512 438905963b586148d6385f24549343a6fc4d623f24aea089f52af44f772eaa62f0602d729b0232620d8ca08d440210dc7dbe7b5259a3fc232d603f574b5bf714
-DIST genpatches-5.15-54.base.tar.xz 2203912 BLAKE2B 36e27d2734e9a62b1900907ea3722a522ddc61c991b5c751dd09d055b9da0fa92bd0de3eeee8b1560ff9a60c8d80181904dd14b7db7878b499a07bb31b0b5f90 SHA512 e751fbd89b91dc59dd0ac87f906ad1c4ae69ccfcad97db616bddd0d25184c133cba8af1141f5e32f690199d6196d0a5035941b70576cd4dd80aea750d1ce0c27
-DIST genpatches-5.15-54.extras.tar.xz 3936 BLAKE2B 259497959ac6cd96036809fbc1634fa174e611f626b0f36c8003587ec0825fd75431b34329ecf4a9d9aeda3803986b2e3987f27d37e0fddf27eb83509c248548 SHA512 7c85e42f6195f6a0bdafbf0be5fbbab1b7a634a922c5233d1dfc2c29842fe4617888cdd7769584d2e918457bdd1a295b8761e354772d78b05cd1e917e9f71abb
-DIST genpatches-5.18-10.base.tar.xz 500696 BLAKE2B e6dfe7b2f752aa0cadb2de11ed7e9e77935abf4d61c99fdb4f6790853364c8b8b189d25b2190b3c85b51ef355b085d1ab740599a920843534f0d4a840fbe8733 SHA512 d425826ca98a5600262485aae057401c131e63b2b84ef6eaea287a433acd4b0f98e3899bd931ac73eda5651c57bcc4bec730469655d54aa1f176ebfda6724aa6
-DIST genpatches-5.18-10.extras.tar.xz 3924 BLAKE2B ea024b19777b6fd59ad5505eaff41db7dc793f5f29beca1d70c2ab60829f5864f1b78f9b809fa9443f995f70df82746d33ac9ce9453a564b77c3964b49afe822 SHA512 7468faea1020335f546c69d331aa864400687056a01cb54a888f3d4bbe6c9061fc2a5d519f93aa362b87df953bb13c06ea2dda403e48f63ca259a6990120ff5f
-DIST genpatches-5.18-8.base.tar.xz 440848 BLAKE2B 8a965867409cc340b13687eec9c7391bbaf26b770ba8d4b657b923226a539b7b68eabab6f12bae4bed09a0d198917373a6ab4f707831c652e2461a49f8dd4981 SHA512 057a00d62f4d8ba7be4ea26aeaa4bfbd5581b22ded85dae71aaa693621eda17532ac00bbeaaea1689f552ce2b95a04e9aade603f6236c2a265aa8fea8231c5d0
-DIST genpatches-5.18-8.extras.tar.xz 3924 BLAKE2B 3f575b12166621c67c9cf6ee15a76af551a039d142a85678abc10829e9a573641be8557b9b606352d46fa4d123e95071b2946447a6f53afef5b37eec5f342cf7 SHA512 7aab8d9d18dfb6129ee0e995450c9d9d759545a9fa2cde1d26dfc03d677b9133a310f3943cd77b5981830a6a1cff59463e85759ef5cd68bcb2838dd96104f590
-DIST genpatches-5.18-9.base.tar.xz 495452 BLAKE2B 244e049522e9b8586081b9eac59fec51184c532bca70fc1d451af1ded646df9bdc7e047cea0963fd07ae8aa04bd4158d64854a2d790ec90be37aa467c7e8b646 SHA512 b90abf747ae92bb4ac7ef94646aedc21a89080d10f8aecae63821d59c0ac29b3b94c0fc6b862d87eb8b86442c2d41cfe16e3a1341d3c146d2b3c678c2f2cdf9a
-DIST genpatches-5.18-9.extras.tar.xz 3924 BLAKE2B db49a915b2d7b6a357cbf27ef1185c936ecd6c8ab130d5fd548133459a2fb9a4037741dcb88ebf80da947fb7e252eff22bdd2ccb5436921f9f141eba085ff778 SHA512 a1ec3e8b1599401bfdc29d6acb3180ce9522df52f6d934c03208af86894f2cfa774b2a67f49adaa7eeca5f7e40ee8dbb45cfa2a7d02c895c0fa9ccf3355827c5
-DIST genpatches-5.4-203.base.tar.xz 4798932 BLAKE2B dc918ca3e7538b66b87a8bd8d2c673f56b71706d913007176de20014a2ebe38889541aa3441af7f4d6db69044779a1e54dadc122e59d180c15fe5131b8056aca SHA512 975dd953d5baf0e72e5718dd4979657597adc380559f41e769e94d294a08b272ba06080517d134a3b2611a6d4779cc3d8b423d869b7dec5e6c43af0634996871
-DIST genpatches-5.4-203.extras.tar.xz 1812 BLAKE2B c4f67f3fcd08b6d845c7fc6174a747e805ee2614ddc2733771cfeec8df5535a7e0a6b8c3528b23c7cd1127765094deb565d3e1b96bda5d1882510cdce4b050ea SHA512 029f4ba2b1fc2c581d343e9847b926ffbcbcd1c0a5cc45c28f35f2ca1572cffaf6ce75a9bfb42d2cd94f6a93ab5bdb8a3297636ddeb4be4afc66efa87a55d7cc
-DIST genpatches-5.4-205.base.tar.xz 4658076 BLAKE2B 172fc1760b7636d6d2de9014c36f792e7e85f81d36748e7fed87f6784647e3488acb401c26abead8703319616c83ed09bebaceb47f8f179b91ef3af3a2b4dc37 SHA512 03a2368388de8fa0977f0af58234060d2ce156d23fa5d954e49791182ad78d2bb66c7abe319323f184c3d344915083c961c8d7646f2ac7faa56d85a21fcb7c9e
-DIST genpatches-5.4-205.extras.tar.xz 1812 BLAKE2B 43a42c678c8788065209ca46d4e621f4f73493ea40c37cb39871a7850547572cd1484f56e67b08e34a94fcbf247f827a750d93c4cfb126bfa1a8bea852afee03 SHA512 95340a3d7098b312a7df149b98fab683d57c0a06e3a2c77facc6611e61a97eb8e820894a5cb5171b54d5f7b276ade96a83a229e60103047e2e67838afe518090
-DIST genpatches-5.4-206.base.tar.xz 4661532 BLAKE2B 9ef512d628faf560cd3d3e8c5c72773ec805e3f6a1f07de8f073a7b9eca3b4cb93b00fe0b78b581f43b121b5ad96e0c0791882c4f3b94e881db222e04dbfcf70 SHA512 c84219335a5a14d930290a2b9c07eae71baeeadf58de06814ef0ff01b157de123c619d4367745cdfeaf729125ed9c0e26922bf3741f53a31b90e74e33f766cc9
-DIST genpatches-5.4-206.extras.tar.xz 1812 BLAKE2B 31f5f53949e888dbf848cd1f8d06710dc8c302511c5dc7352dcf69585fd0b2bf61dbb0dd3fd2a75bd48d05daa9bb6d878427cee8aaa489d1c1b51cc8e8972b2a SHA512 472aeb71289bd91418afdb43004124a6599b8bf336d2b5db1c340766277c0950b25b18196fdf26b5405797eab5e85855abf97fff0da4c312301c195710c499eb
+DIST genpatches-5.10-137.base.tar.xz 3737796 BLAKE2B e0af05dc22c6f077a110518f9e0cd790798b8a68f5d40c409dac7ea1845b8d80741975cc11d588a8cad96aea474c98803cc0db7631575d295ecfc0a1b4080864 SHA512 f9dd222670326f89a9ba62360290a29d5185afd89efe8aa38292a025dae941b10c28ab047c1fc7e84506d43ee56fda0790280c52ffca482e3041596696437ff8
+DIST genpatches-5.10-137.extras.tar.xz 3868 BLAKE2B 97e6520ab0908d1270d10b6dab659899335aa405083e187822e7846a5034677fc77a05a20c33665ff9cd7b8a57fe95126b3c60218b0b5968967a866b241f03e1 SHA512 3945379ae2e5c2d5712788fdd27db2f74952686c319266897f649003198d0a5717c48c214f8e07310d6c489de8725e3cf4a74b4d05bcb4ae01332af175fbfbb9
+DIST genpatches-5.10-138.base.tar.xz 3762688 BLAKE2B 44039c709108f0b9a9ff95ffbcc35177536dcd1364424e3c555ea4611ca46d00cb13402d611bb9f7c839a2e2276d34818777edb206aef1cbf1a86a8a63fe5c45 SHA512 c9276637988fda74e346cda54dd86245e31a1be53dd10b42e3ffcb8b253d13b9209131925410a5c8797018bb940aa11db9120c921e87a45ae4f4396dd2e1f276
+DIST genpatches-5.10-138.extras.tar.xz 3868 BLAKE2B d08d8e425e323df25f3bad59bf71a0836b00b11855028d131d34a25938d9783ca85cb8ef5c9cae65eeec2a41280eb2cbf8816b94ee4c48c7a01d55dd4224f9ba SHA512 6ff612c0e8a050124a7f2bdfa2ff64f99bb0250e32f79b57855d9a95d7ea3182913ee016e63ae86413872791342c8eaea198929ae413dd0eb92eaefab4b953cc
+DIST genpatches-5.15-56.base.tar.xz 2245780 BLAKE2B 0f5e5d7c8a29f590598f4721307e3b1a316342cc31b8e5ab5496ed58b65470d19bed59ff40cf7b26bd4970eee04581ee8ac544eebe63c54063c161a55c828cea SHA512 0a1c4edd8f863f2c77a14cf48d79c35868ba8b2f02fb2436e1913e97c8285046ecbedc33e6faddf02a0c813e677492be0fc972e3731c733e488006602eb6119f
+DIST genpatches-5.15-56.extras.tar.xz 3932 BLAKE2B 2b167a35d9dfe16a18b22318ac4597147fb25bef53a66108c2f2e4d6e6d3df1c9d4b1fd6d63ba4a8078f94f8cd69d14b359123355ba266ef72b44f7d9addca9b SHA512 ce91556981720f3718921993eb15f5af623cad8dc40a36bec6cbb0d52153fd1288bf97927daab1b1e3ccd1451d4295b109ead0160c657a00c62c2d6f25fbc09f
+DIST genpatches-5.15-57.base.tar.xz 2275504 BLAKE2B 23dad9d2e9dfc1f77f6e39f8d9e68a6e3168d581136d50d53b3503278bb5e4abfc25e2f9fdab63eeed674e370bee8ae7cc5c54058f6942abaa4eeac49258d765 SHA512 b675437c320b28f4b4ee979fff5c32ea607fd795b090206b49d66fdb95fc2ca1b959fffd33b9e5241a160c2f19902efc8218f2c39eaaa312a5b4149282e08b99
+DIST genpatches-5.15-57.extras.tar.xz 3932 BLAKE2B 670c631eb992f3ea25caa61037c8eb5135fdc1c9dc9e9cc91122f753fc2755f5e8a22a832267bb5e620a604a450cec7fe80d6b6ecbeb7fa5e5db2356df6b2163 SHA512 8f3685cae1613b3e93d33d67746267c4860d839d0a9917bd9668c7d917c83ee1300e1f7fe14eac5dc34de94f440de0127b65a2f862bc821c354e8c36beabb1a5
+DIST genpatches-5.18-12.base.tar.xz 549680 BLAKE2B d6973dfb0d7749fadfc511b1092dedc67b3f8a57e2a117674113f43177bde8608b6106c4c84fbf5f5a161b9710cfad28a3c2fd419fb3c4088d98f9a504ae0cb8 SHA512 c7ad63058bb77c92d3ecf618a41164476a56f2b7b879c667c7fc9666fa1d7f81b599d6ffc5f0fbaa3223e7d399dbb6348ddd511598581083f7b78d505dd81e7c
+DIST genpatches-5.18-12.extras.tar.xz 3920 BLAKE2B 89642c29bae1b15664749c11e581ebf1d0b42801cbd3e436805faaacc419fa7d946a05e7d37bc8d056e36768d181b2e71dfdd6b28943ea112dad9f17a9c2bde1 SHA512 301cd52af9db5a8ec91891a0258a262261d87cf22cb01c27a531d0274ee23d0e928977abe8f5928d3dcba430d032a3cb418193bd1f3e09a923ca6e8718ec7420
+DIST genpatches-5.18-13.base.tar.xz 578484 BLAKE2B 03215db005e5a3668898b1ac4c25aeee5f20d6802d00b11d24d41f506ca9f730f031f5cde187f81406a3c75937d65f854acd3c0e2d2cf9f9cb3ba99454304180 SHA512 bdf29085cf76022aa21faaee63033e3231b9757282633eb5897717128bc340cbf38b12a2918b169b452e85aafc9fadac2645df414f877f43950a3147e00dea68
+DIST genpatches-5.18-13.extras.tar.xz 3928 BLAKE2B 21db8944e961dc054e69901d711a85d2965bc90dcdbcaac4d939e033d7b2007860f594e7bd3decdb5b2ed73b0e6b67872dcbd64a3301fc106cfd1c9c189f071d SHA512 21fe61063d2e4b3ff40664d700643693068aa73d1d5416272116001c7f4ab6a3c006824ad868fd4185fc20fe53647727874e7fff01450d5f5dc36aec84a6e55f
+DIST genpatches-5.4-208.base.tar.xz 4869104 BLAKE2B 3e9038248ddcfd22d67248e65199cca89bd2b8b3aa99aafcee63e5c294dc360c01d7d7eda809e1c18b06a9356363c575339197b2425bcafa8676cad68c17f90e SHA512 880fd09492e5cb0fa8a94e2df5fdf912be59210f1f142a456e3f80c31142e92bee3161bd77038b606616442cf3396b3961a24422de3056f72b4556d06262d3a5
+DIST genpatches-5.4-208.extras.tar.xz 1812 BLAKE2B 3e5b8cae462a748eb36af66c4ebc393fc09882a1fa23cce6f82a078ea5598c23c2ecbe7029d6e2060735fe342b3a7bb5c235dcf16081bba0f05a6b88501af991 SHA512 b550dce1b6d090959eaacd523ee1be258fbf9db84309054c3cce9beb0bae710ff2e1c23f480310072fb08f7456bdf825b3ba76d57e999fc1597368df93e65677
+DIST genpatches-5.4-209.base.tar.xz 4887256 BLAKE2B 56d7ea7975b228df055d1bd4cfc41b49890d815409a159772230c6e9d081061a9b438b525b5e8542eb03feb0bdfc1841e5bc5e14dd1570aff8f964862b192b00 SHA512 5ea69d50d836dad1f68f000c6c1f5bd8459dcbc4d50a4fbd4ba3241c4c87638850215c0207dfea6fe06cc596957e3cfa61a3dfc00f0b60513596da43d286615f
+DIST genpatches-5.4-209.extras.tar.xz 1812 BLAKE2B c1cb92a600e0827b133735f3c04a98e608f5dd0b69f53b3bd64ae03d8ff7b0189b0e00027ca073c4b80a77cc23f92ced5dc4bd4fd5912b538aa4ed3131d49b9a SHA512 8046b24112d6635f76cabb7d8e429d9859553440f80fd67152f051fddc6966ddc45e4a465ee946439c23b887282f5517ab12dc7f1862d5471d2815911a4ee2f5
 DIST gentoo-kernel-config-g1.tar.gz 4283 BLAKE2B 44dd51ec45ebc71bffcd6d85a2fefba053f7bce8035057f0bbe928e24816ad4ba03c9bf67dcfcd6d6d1833c0a2ea93e0fd486c2093664dc41ccce316e1e60588 SHA512 3a45f28df9d457df0fe0d185da8b10f4e35f49dad75075e041e8cf3cf6972fecc8145cd557b0bf3a8dea20ddffae0194f88e61c1e5098fa0a5ca301d40aeea2e
 DIST gentoo-kernel-config-g2.tar.gz 4359 BLAKE2B 965392fb5b3c1290c596d3e8593cfcf54e76cedd47de335c1b9658c1b35649af18a94639bf3df84507c797e6d7ea074f7f2a2579d2d01073478b30a4f167b2aa SHA512 d1bdef2e817799fcebbcdae1f3b1666f8ca70b0d5adca74014dd665f6b02c81b839220d8fe3794ea1202e1f2589d281344699864207c98b95d23a1d1f03bd42d
 DIST kernel-aarch64-fedora.config.5.10.12 223184 BLAKE2B a0246dac2f7a4ad6a55b611538d24382ac87a8960077811a859c9595ac67f961b4bccb7e139a89abc7c0e26e80832da5c94211fc658082f2e7dde984f14dd29d SHA512 7d803b347b136331db1ad6e22e0445fe0224c3e26cd7c034cbe9794915d457b492e05f77664865079874ec001351553652646e2e08d0fee31e30b841b0008f52
 DIST kernel-aarch64-fedora.config.5.15.19 242615 BLAKE2B 94e59440681535e38137b71814e1ae53f57a347f62cf31e0c1c8571ae43d9ae9be9957743c8cbc9ec74850c964eaabefe6799a28bc311ea7b99ee31391b47fb1 SHA512 fb77d3b73a215f97d70cd6d8c96ed20e497786b99ed7d7a7f2ed60cc1251289c1a4c7e058c41b5efac62e4a9b4b3d917dbdb11585955bba2b6584981430f4ddb
-DIST kernel-aarch64-fedora.config.5.18.4-gentoo 242525 BLAKE2B d27e9b2f96f3d7968919eb2bd4f67b62543a9fbbeb2f1253a39046b4e3b9cfbff1266c21a98a2d86dbed1897bd41d8795726c6491d96bd1de25ad1a012fabaa5 SHA512 bf7758b7a24c4abd46e66f031e1da5081e324a383c710f60446f43296fa7543b3dad47c751ece8667ab0715e1605b104b6ceb36966a0f474ae4ec8641425914f
+DIST kernel-aarch64-fedora.config.5.18.9-gentoo 242551 BLAKE2B 6ee62379bf28cc3d77eedeceb8437762e43cde6953828c23554f98b3de3236a808317a268d0885ba92720c59d25f3a1d8cdfda63bc51717f53574d3e7be988c2 SHA512 8aecbf9c1dc43e0c848890ebe38748fb6ccbc61000d5a22a36067d3f7baa9e52faf159c9a071c84195a624303eed6fac468eaeaf633ac25d33290277aaee36e3
 DIST kernel-aarch64.config.5.4.21 199104 BLAKE2B 578ad451a76204df2a9bbbe34b5cb27051d2ac5e2c33967f562b01338c43f35da6dc33a4c2cc67ea6c3b32b155729360d3748ec28dcaa750f18449245b2e8a09 SHA512 66e9a437beb350fdc59512c17b8f72c5b5bfacf2b35070d810d77e66f49cf7929026cc28ad44b04a016d61e65d9fb4a10af6996ba09b604bf97e9c467d08f8ff
 DIST kernel-i686-fedora.config.5.10.12 205412 BLAKE2B 92c715b7e2cd7dd74da7970c05981f520597d3e403ce82c8cf4eee31c9f1f50b638792a6bdb256ef5bfdc99f1bcd594e819e8f44dc6febb2ad9a854bad817f2b SHA512 69d8db11723ae1b40fdedfaace74d15bb63198cdb0485e0a1e5eba95b31217110c93a93e39cc7370cf45f1d3a8bc7f75ec096d6db5ea9ecb28ac6b56702ebb10
 DIST kernel-i686-fedora.config.5.15.19 222233 BLAKE2B 9e0f4dd37058f59610e46a87d3165039e76299d3c186fbfc3312101bac1b8b198de404075f5bbc6f5e2ba04cfd45f9d02bdf94b01c3ed11b9275f37f11ee7617 SHA512 49ffc39de86763e707a5c0c07c1367d34e9249615f29fdf97904d7b61a375a86fc4ba37a2f02b5f61e4c76ad65d9ba12716d2523af6faa003f6336d7ae61a953
-DIST kernel-i686-fedora.config.5.18.4-gentoo 220827 BLAKE2B f73a4fb7d46e9275b5a0ab119aa8915cb7897a5652664efbd71596b5b3be6ee4cf9f9c7907ef3fe45ab2a2868512fad7b4b11213534d6260815ca4eca7593ae0 SHA512 afce5864ea980c1a7b53c187b483c6fa8eb88d11af9114d71b6177b4347d534d7f9dd68240c0cbb729e0da3cc01a5783b6e150d94708f1aabaa6c9956bacf06e
+DIST kernel-i686-fedora.config.5.18.9-gentoo 220827 BLAKE2B f73a4fb7d46e9275b5a0ab119aa8915cb7897a5652664efbd71596b5b3be6ee4cf9f9c7907ef3fe45ab2a2868512fad7b4b11213534d6260815ca4eca7593ae0 SHA512 afce5864ea980c1a7b53c187b483c6fa8eb88d11af9114d71b6177b4347d534d7f9dd68240c0cbb729e0da3cc01a5783b6e150d94708f1aabaa6c9956bacf06e
 DIST kernel-i686.config.5.4.21 183910 BLAKE2B 185126ffb85718bb73761d01683def80b6f002d7a7a6eddd8e858a30d8eadc863fb378d83a1cd2ed82b3540337fa66ae44475e31fb41ebc46d77005b6f54e5c0 SHA512 6307afc2295902e44fe65b1cccaa7a0260b295a5f21f1d67ec66197bd972bd3f5675b624f08d9da8b224cb3ec987d5c21cbd743599aeab9ac6214bc651f43476
 DIST kernel-ppc64le-fedora.config.5.10.12 192105 BLAKE2B 889141debb0656a358a3381bae14b5216b982acdfce0bc758f9445c16647807a68a788fb290199c2a1a23627bda1ef4c9405b3f5ac2a4176d1d2b55c71fb7db9 SHA512 3ab0f1401d9f50a61477c71369dede438f575d9d2c3a2f5c2cf36d624c2b59a938efca9c981b075511b3860c983eaaf5e5a9f877d659277f09ceba45edd43770
 DIST kernel-ppc64le-fedora.config.5.15.19 213339 BLAKE2B db6bbc9f402b8b48a2441e39d1a78dc112656ae842bc5594065cfd2ec3f6d462e4bde200e8736a70192af35fb3a5d1fc42683783a5b7620881f3a95bb0bc5f4d SHA512 b43439c24be8fa8bdd17d4c0beece799544ae45b2c289f0202fa5eb7a52dce0165a0cbc924b0decf877582af9688efd675cbfbd2313ff85fcc2c8563bba4b1ad
-DIST kernel-ppc64le-fedora.config.5.18.4-gentoo 211942 BLAKE2B f92e988198b08bd7a30976d92ba152ac2986324c223202dc73bb733c903015095498b529cb5dd3b3d86d678c7ca0adba7f4807e9046b8c8215b2e1ebd06e53d5 SHA512 4f1d85a3f858a6e240e0bc34b37a77f78cf128b19de78404de9f0463d0d3fa6e87b84e5710b7ce501b92e162d798b372fb6843e83b3821a77a73ead2385e9014
+DIST kernel-ppc64le-fedora.config.5.18.9-gentoo 211942 BLAKE2B f92e988198b08bd7a30976d92ba152ac2986324c223202dc73bb733c903015095498b529cb5dd3b3d86d678c7ca0adba7f4807e9046b8c8215b2e1ebd06e53d5 SHA512 4f1d85a3f858a6e240e0bc34b37a77f78cf128b19de78404de9f0463d0d3fa6e87b84e5710b7ce501b92e162d798b372fb6843e83b3821a77a73ead2385e9014
 DIST kernel-ppc64le.config.5.4.21 172003 BLAKE2B b53887cb44f7c378cb3866780f8e556e19fdb02130d3b0df01d97698d2a91f7d90a200012559f288e962935742c3fdb67dfb6711876fad37862fe55cdca5b5f6 SHA512 82df8d0be47e9eb20bd7db570539bb061d0b6e2101dc78a54596cf4d0b4e0c536041449304ff9240b051ee09b342ea336c5645e9a3b66a5dfb96d7778ff86008
 DIST kernel-x86_64-fedora.config.5.10.12 206357 BLAKE2B 0eda9d4f3f973336cabd67c1ac78f100aabde926354743e8dcb7ff84496f0de49210d45f99bc850a2096078b0b4687aa7fd965d999248559506004f2b29dac0c SHA512 b12f43d3c1a52a4915cd73db98874ce9ae6c425672c0f1c19ed1b1101341c868ebf1c9620bef5449752ec0d7342c1ce38fb77779d0f89b9267096a605ebf7a26
 DIST kernel-x86_64-fedora.config.5.15.19 223286 BLAKE2B 239995703c01dcb6d179133dd115bc0a57872c07d7a08afaf4d92cf6d78f0c17b19487b5b399ac7fdde5d460fa7931628147817a569fef2c3a62951c96054bdf SHA512 9bee4aff7e5ef4ada57bee7496aaf47b8fdd5c936c4c9b580660d130db0678eaecdebdbcab0dfcaf5c17a71f6419069840db10f5886806b6fc810f8a3619554f
-DIST kernel-x86_64-fedora.config.5.18.4-gentoo 221797 BLAKE2B 1873ffeab78c7e9a8186d255dac5b7dc5fcdadfa97d6a265aaac1583006adc1c0a150eff6892f1a82e622f77122051d0eca5e2cc0d9b95f8d0e36212d6c47ed3 SHA512 7c2325a12de85bc1aa300b5f3846711a20d43817a60a68e7cae84ac6505b3deb158c9dd0871d86e148f46435f36549231566abe276ffc2ee8bb9dd2ac5c40960
+DIST kernel-x86_64-fedora.config.5.18.9-gentoo 221797 BLAKE2B 1873ffeab78c7e9a8186d255dac5b7dc5fcdadfa97d6a265aaac1583006adc1c0a150eff6892f1a82e622f77122051d0eca5e2cc0d9b95f8d0e36212d6c47ed3 SHA512 7c2325a12de85bc1aa300b5f3846711a20d43817a60a68e7cae84ac6505b3deb158c9dd0871d86e148f46435f36549231566abe276ffc2ee8bb9dd2ac5c40960
 DIST kernel-x86_64.config.5.4.21 184907 BLAKE2B 0eb2b07c14cea7545350fcdf3a94f2a531f0137c502ebda9299cacf44da5385686e2049b480b28bc153c9d413d453cfe682b9655eefe70428cb720f57c7bd200 SHA512 f3b3ee6841555ac3a9cc11536a7d44e1a5a8df2bab14ba341fda7df1ceb0de45cf1c799a1d54a64f2858fd1272d348bb52cf269ffa396878c5402baf2730237f
 DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1 SHA512 95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e
 DIST linux-5.15.tar.xz 121913744 BLAKE2B 3921274b23f7938abdf3ed9334534b4581e13d7484303d3a5280eddb038999aaa8b836666a487472d9c4a219af0f06b9fecccaf348fb5510ab8762f4ef4b7e83 SHA512 d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e43b6f021709dc685eb0efa18d2aec327e4f88a79f405705a
 DIST linux-5.18.tar.xz 129790264 BLAKE2B e2745a69eb70169e90505a9318a3993046eab3020496eecde7d8352ecda0eb71a25b21becf7ce93fc593507dce7d1cd61b94ddcdf82b3094d79c0d3d48508eeb SHA512 dbbc9d1395898a498fa4947fceda1781344fa5d360240f753810daa4fa88e519833e2186c4e582a8f1836e6413e9e85f6563c7770523b704e8702d67622f98b5
 DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
-EBUILD gentoo-kernel-5.10.123.ebuild 3598 BLAKE2B 2d58b845b166e504cd5e4b9244920a2d5fa8210af5d1b5c698024c86c62fef955f69e8ea5d60941b1eba40bc5099bf1b4e38b886f6082ad71639452087c1fb4b SHA512 96e3cdae110a1f6aba5b85f2577f8cacdf24d2eab7d92c40700ccc0034f0ed5ce37924ee354ee99bc03288489cfaf17f7a0b38c5020a720a9330f3c60faa09b7
-EBUILD gentoo-kernel-5.10.124.ebuild 3602 BLAKE2B 96f51a1768637f8c570d4dee63cef59613d752604ad10527d45579296d639d01653228038b834dd9ff3514f01f64aebc828e978460ca4ddd1578c86412edb9c8 SHA512 9f7832e9f3ff018b75a2372e6f1e721949ac09e511c41219b230802894cb23ad0e635eb0f9bd793ede93946f11853835173f7fab9c14f07e423afc550c06835e
-EBUILD gentoo-kernel-5.10.125.ebuild 3602 BLAKE2B 96f51a1768637f8c570d4dee63cef59613d752604ad10527d45579296d639d01653228038b834dd9ff3514f01f64aebc828e978460ca4ddd1578c86412edb9c8 SHA512 9f7832e9f3ff018b75a2372e6f1e721949ac09e511c41219b230802894cb23ad0e635eb0f9bd793ede93946f11853835173f7fab9c14f07e423afc550c06835e
-EBUILD gentoo-kernel-5.15.48.ebuild 3595 BLAKE2B a20863e70f3ad319f36acd163c232939bef6b8336174211c3268cfe86b734c096be052728dbe5760d07674e2d73521a362f7efc248b0ab988e9b663da2fa75e6 SHA512 18bf9037ac3aa860a82e18e63108109a1d80c3c71fb07e39fce8b9782255525c7449412b1c81c89aebcb56ffdb258d8bd1382ce6c80abac720c34a40b00ec861
-EBUILD gentoo-kernel-5.15.49.ebuild 3599 BLAKE2B 166a462972d13245f59f4806e490d5d753a7f92e424aaf0c749f1cfe2d5767027ed0259862cbaff715800081b7c289a49703968602e663eae7971342fd1c5a6c SHA512 37b83b8e617ee511971e2ac9e911479b6db1f089a4d99e04f5dc3eb80ca08d7557b29b8b21cc91d91613da18182ffac048691eb33b689890f45828253ecfe010
-EBUILD gentoo-kernel-5.15.50.ebuild 3599 BLAKE2B 166a462972d13245f59f4806e490d5d753a7f92e424aaf0c749f1cfe2d5767027ed0259862cbaff715800081b7c289a49703968602e663eae7971342fd1c5a6c SHA512 37b83b8e617ee511971e2ac9e911479b6db1f089a4d99e04f5dc3eb80ca08d7557b29b8b21cc91d91613da18182ffac048691eb33b689890f45828253ecfe010
-EBUILD gentoo-kernel-5.18.5-r1.ebuild 3817 BLAKE2B 8c7a7a78a22fa60e937a74c22bbabac16d1f5899be1eeb2e046464a359efd75ac2836777dc1e811f93c2c9c5de2eeaeaf67a29283141c826742999beaff2ed9d SHA512 dd5a3b3ad3178f53bb17e3540978dd874dca8ec9dd6f9e20ab22b71a0eaf4dadcc57a4039d03af7ca07bb298db76165f803a046eacf6d3f5eb20e7698d3d8cfb
-EBUILD gentoo-kernel-5.18.5.ebuild 3883 BLAKE2B aee12d1990db4d6eb08184f8dc1f16e978f140910b441cebd9e2d3640dfa37c74b4b0e7c030d342e84692f5288d6e1a6270e86089a53867c9ec1ffd81e86c299 SHA512 175e7a1af5766980fdefa0e56d5c0f3789c1d5a7a60549d980bd74b6d0a09a95dfa566b458e392b0057f4420b79f05ac97aa24e58bd5e8e413bca5a63e670d3e
-EBUILD gentoo-kernel-5.18.6.ebuild 3859 BLAKE2B 02052ffe572213d5271f6922e59ff67084dd5ffa45bcdd3ebcd98295550673658d8d19d11d7eb65e7cdb686c0b2044f3077d1873a255f35b75412944730a494e SHA512 78a60fd122e894c3a41aa8856fb9dcefc50798297b910a45ee320d7bb4045122ae1ee1bb53b9c2f0ba1a6d6704f3c4d3f3ee053e34ff6835c533c319df4e84f1
-EBUILD gentoo-kernel-5.18.7.ebuild 3859 BLAKE2B 02052ffe572213d5271f6922e59ff67084dd5ffa45bcdd3ebcd98295550673658d8d19d11d7eb65e7cdb686c0b2044f3077d1873a255f35b75412944730a494e SHA512 78a60fd122e894c3a41aa8856fb9dcefc50798297b910a45ee320d7bb4045122ae1ee1bb53b9c2f0ba1a6d6704f3c4d3f3ee053e34ff6835c533c319df4e84f1
-EBUILD gentoo-kernel-5.4.199.ebuild 2799 BLAKE2B 65c1618e3b44df28bd60944cdae55aa5364a2b4a51553ecb4e398513155fe5e43ab2c3fbc6479f3374c219bb5c2f1bfe53322c551aba15d22c580e0479e6d278 SHA512 74cc32e6e52e1a2fac22513b1e0bae80d72410445567f70e3d0760ad43fb4d234a961abdf59f2c0731371290233dd248ceb1827c4453486fcc16cb1bd7bf894e
-EBUILD gentoo-kernel-5.4.200.ebuild 2803 BLAKE2B 8aac73c55ef615de26496e74eb22f0c578f333f2d211535c9a0613f9e2b19f181245a1dcf394ffec75bec308855792ee8edf21c77a9d6c42f3249789cb15bfa6 SHA512 465a4c4f2df9f2332ac7eee6f8e5dc140e02e55ff9fac94bf465604f33d51f3b1cfcad1160bc071233e1a6e40fb15c984a26f1b2377fcdf5d7aa3a9b6536816b
-EBUILD gentoo-kernel-5.4.201.ebuild 2803 BLAKE2B 8aac73c55ef615de26496e74eb22f0c578f333f2d211535c9a0613f9e2b19f181245a1dcf394ffec75bec308855792ee8edf21c77a9d6c42f3249789cb15bfa6 SHA512 465a4c4f2df9f2332ac7eee6f8e5dc140e02e55ff9fac94bf465604f33d51f3b1cfcad1160bc071233e1a6e40fb15c984a26f1b2377fcdf5d7aa3a9b6536816b
+EBUILD gentoo-kernel-5.10.128.ebuild 3598 BLAKE2B 2d58b845b166e504cd5e4b9244920a2d5fa8210af5d1b5c698024c86c62fef955f69e8ea5d60941b1eba40bc5099bf1b4e38b886f6082ad71639452087c1fb4b SHA512 96e3cdae110a1f6aba5b85f2577f8cacdf24d2eab7d92c40700ccc0034f0ed5ce37924ee354ee99bc03288489cfaf17f7a0b38c5020a720a9330f3c60faa09b7
+EBUILD gentoo-kernel-5.10.129.ebuild 3602 BLAKE2B 96f51a1768637f8c570d4dee63cef59613d752604ad10527d45579296d639d01653228038b834dd9ff3514f01f64aebc828e978460ca4ddd1578c86412edb9c8 SHA512 9f7832e9f3ff018b75a2372e6f1e721949ac09e511c41219b230802894cb23ad0e635eb0f9bd793ede93946f11853835173f7fab9c14f07e423afc550c06835e
+EBUILD gentoo-kernel-5.15.52.ebuild 3595 BLAKE2B a20863e70f3ad319f36acd163c232939bef6b8336174211c3268cfe86b734c096be052728dbe5760d07674e2d73521a362f7efc248b0ab988e9b663da2fa75e6 SHA512 18bf9037ac3aa860a82e18e63108109a1d80c3c71fb07e39fce8b9782255525c7449412b1c81c89aebcb56ffdb258d8bd1382ce6c80abac720c34a40b00ec861
+EBUILD gentoo-kernel-5.15.53.ebuild 3599 BLAKE2B 166a462972d13245f59f4806e490d5d753a7f92e424aaf0c749f1cfe2d5767027ed0259862cbaff715800081b7c289a49703968602e663eae7971342fd1c5a6c SHA512 37b83b8e617ee511971e2ac9e911479b6db1f089a4d99e04f5dc3eb80ca08d7557b29b8b21cc91d91613da18182ffac048691eb33b689890f45828253ecfe010
+EBUILD gentoo-kernel-5.18.10.ebuild 3859 BLAKE2B 39a5bf5ba05e8966d0c154ca944547d1d0fcaa320c278de676259385b59da46c41dad6cfb5a4d384e70283668a6bb8c89e297b55117ac479a307f02ddeff351c SHA512 98446575d30ca3131c36c2642cd14ce6a8e0b4053ad94da0e6cec93c82f92add00ef0c34fc18800643347c9ecbc9830ba6103485f43e991cbd4460ad37f9caa9
+EBUILD gentoo-kernel-5.18.9.ebuild 3859 BLAKE2B 39a5bf5ba05e8966d0c154ca944547d1d0fcaa320c278de676259385b59da46c41dad6cfb5a4d384e70283668a6bb8c89e297b55117ac479a307f02ddeff351c SHA512 98446575d30ca3131c36c2642cd14ce6a8e0b4053ad94da0e6cec93c82f92add00ef0c34fc18800643347c9ecbc9830ba6103485f43e991cbd4460ad37f9caa9
+EBUILD gentoo-kernel-5.4.203.ebuild 2799 BLAKE2B faf615c3252cf128099b4b7359422d78b19be5b647e89e4524b519e75e1fe9a8e778398cce27093e6be22c7977f18a996a6f7e72afa813d6a8369fa9f2395e05 SHA512 70a94b7bcb72a3adb27fd4707a7a4b53d952d37857dc22a3523846faa8f77c7309017264e8601f22c4ab01c3b2726a1dbe1b0f5dd2d81c7ea28c5b486265f8d6
+EBUILD gentoo-kernel-5.4.204.ebuild 2803 BLAKE2B 8aac73c55ef615de26496e74eb22f0c578f333f2d211535c9a0613f9e2b19f181245a1dcf394ffec75bec308855792ee8edf21c77a9d6c42f3249789cb15bfa6 SHA512 465a4c4f2df9f2332ac7eee6f8e5dc140e02e55ff9fac94bf465604f33d51f3b1cfcad1160bc071233e1a6e40fb15c984a26f1b2377fcdf5d7aa3a9b6536816b
 MISC metadata.xml 465 BLAKE2B ea1260a1638588a48d9dd776e9eabd9730a181af8416ba778c936fa2e80a2360be146d3cc80599e50e0a72ac709eb9538184aac87cb96528e445ed450e34f4af SHA512 c7b7b1a45fb7082b8d8d66cf5a387cc4f7207cd9488d1d5e1d6900f1e4147aa9290b5522a94d941a885f1599b5df2482b529e40912d2b2cff400ecd4b1704c41
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.125.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.125.ebuild
deleted file mode 100644
index 161f70398d65..000000000000
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.125.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build toolchain-funcs
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 9 ))
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.10.12
-CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530
-GENTOO_CONFIG_VER=g1
-
-DESCRIPTION="Linux kernel built with Gentoo patches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	https://github.com/mgorny/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
-		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
-			-> kernel-x86_64-fedora.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
-			-> kernel-aarch64-fedora.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
-			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
-			-> kernel-i686-fedora.config.${CONFIG_VER}
-	)
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE="debug hardened"
-REQUIRED_USE="arm? ( savedconfig )"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel-bin:${SLOT}
-"
-BDEPEND="
-	debug? ( dev-util/pahole )
-"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}
-"
-
-QA_FLAGS_IGNORED="
-	usr/src/linux-.*/scripts/gcc-plugins/.*.so
-	usr/src/linux-.*/vmlinux
-"
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	default
-
-	local biendian=false
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			biendian=true
-			;;
-		hppa)
-			return
-			;;
-		ppc)
-			# assume powermac/powerbook defconfig
-			# we still package.use.force savedconfig
-			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
-			biendian=true
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	local myversion="-gentoo-dist"
-	use hardened && myversion+="-hardened"
-	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
-	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
-
-	local merge_configs=(
-		"${T}"/version.config
-		"${dist_conf_path}"/base.config
-	)
-	use debug || merge_configs+=(
-		"${dist_conf_path}"/no-debug.config
-	)
-	if use hardened; then
-		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
-
-		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
-
-		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
-			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
-		fi
-	fi
-
-	# this covers ppc64 and aarch64_be only for now
-	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
-		merge_configs+=( "${dist_conf_path}/big-endian.config" )
-	fi
-
-	kernel-build_merge_configs "${merge_configs[@]}"
-}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.123.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.128.ebuild
index d3b655df2223..d3b655df2223 100644
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.123.ebuild
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.128.ebuild
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.124.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.129.ebuild
index 161f70398d65..161f70398d65 100644
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.124.ebuild
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.129.ebuild
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.50.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.50.ebuild
deleted file mode 100644
index 3e9875ab5936..000000000000
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.50.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build toolchain-funcs
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 4 ))
-CONFIG_VER=5.15.19
-CONFIG_HASH=ec69da7a42b5b7c3da91572ef22097b069ddbd01
-GENTOO_CONFIG_VER=g1
-
-DESCRIPTION="Linux kernel built with Gentoo patches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	https://github.com/mgorny/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
-		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
-			-> kernel-x86_64-fedora.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
-			-> kernel-aarch64-fedora.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
-			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
-			-> kernel-i686-fedora.config.${CONFIG_VER}
-	)
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE="debug hardened"
-REQUIRED_USE="arm? ( savedconfig )"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel-bin:${SLOT}
-"
-BDEPEND="
-	debug? ( dev-util/pahole )
-"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}
-"
-
-QA_FLAGS_IGNORED="
-	usr/src/linux-.*/scripts/gcc-plugins/.*.so
-	usr/src/linux-.*/vmlinux
-	usr/src/linux-.*/arch/powerpc/kernel/vdso.*/vdso.*.so.dbg
-"
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	default
-
-	local biendian=false
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			biendian=true
-			;;
-		hppa)
-			return
-			;;
-		ppc)
-			# assume powermac/powerbook defconfig
-			# we still package.use.force savedconfig
-			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
-			biendian=true
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	local myversion="-gentoo-dist"
-	use hardened && myversion+="-hardened"
-	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
-	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
-
-	local merge_configs=(
-		"${T}"/version.config
-		"${dist_conf_path}"/base.config
-	)
-	use debug || merge_configs+=(
-		"${dist_conf_path}"/no-debug.config
-	)
-	if use hardened; then
-		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
-
-		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
-
-		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
-			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
-		fi
-	fi
-
-	# this covers ppc64 and aarch64_be only for now
-	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
-		merge_configs+=( "${dist_conf_path}/big-endian.config" )
-	fi
-
-	kernel-build_merge_configs "${merge_configs[@]}"
-}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.48.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.52.ebuild
index 68008deb98f3..68008deb98f3 100644
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.48.ebuild
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.52.ebuild
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.49.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.53.ebuild
index 3e9875ab5936..3e9875ab5936 100644
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.49.ebuild
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.53.ebuild
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.18.6.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.18.10.ebuild
index 1ba27417d51c..bb4ea09fc811 100644
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.18.6.ebuild
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.18.10.ebuild
@@ -9,7 +9,7 @@ MY_P=linux-${PV%.*}
 GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 3 ))
 # https://koji.fedoraproject.org/koji/packageinfo?packageID=8
 # forked to https://github.com/mgorny/fedora-kernel-config-for-gentoo
-CONFIG_VER=5.18.4-gentoo
+CONFIG_VER=5.18.9-gentoo
 GENTOO_CONFIG_VER=g2
 
 DESCRIPTION="Linux kernel built with Gentoo patches"
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.18.5-r1.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.18.5-r1.ebuild
deleted file mode 100644
index a247ab0f8610..000000000000
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.18.5-r1.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build toolchain-funcs
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 3 ))
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-# forked to https://github.com/mgorny/fedora-kernel-config-for-gentoo
-CONFIG_VER=5.18.4-gentoo
-GENTOO_CONFIG_VER=g2
-
-DESCRIPTION="Linux kernel built with Gentoo patches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	https://github.com/mgorny/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
-		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
-	amd64? (
-		https://raw.githubusercontent.com/mgorny/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-x86_64-fedora.config
-			-> kernel-x86_64-fedora.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://raw.githubusercontent.com/mgorny/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-aarch64-fedora.config
-			-> kernel-aarch64-fedora.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://raw.githubusercontent.com/mgorny/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-ppc64le-fedora.config
-			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
-	)
-	x86? (
-		https://raw.githubusercontent.com/mgorny/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-i686-fedora.config
-			-> kernel-i686-fedora.config.${CONFIG_VER}
-	)
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64"
-IUSE="debug hardened"
-REQUIRED_USE="arm? ( savedconfig )
-	hppa? ( savedconfig )
-	riscv? ( savedconfig )"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel-bin:${SLOT}
-"
-BDEPEND="
-	debug? ( dev-util/pahole )
-"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}
-"
-
-QA_FLAGS_IGNORED="
-	usr/src/linux-.*/scripts/gcc-plugins/.*.so
-	usr/src/linux-.*/vmlinux
-	usr/src/linux-.*/arch/powerpc/kernel/vdso.*/vdso.*.so.dbg
-"
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	default
-
-	local biendian=false
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			biendian=true
-			;;
-		hppa)
-			return
-			;;
-		ppc)
-			# assume powermac/powerbook defconfig
-			# we still package.use.force savedconfig
-			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
-			biendian=true
-			;;
-		riscv)
-			return
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	local myversion="-gentoo-dist"
-	use hardened && myversion+="-hardened"
-	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
-	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
-
-	local merge_configs=(
-		"${T}"/version.config
-		"${dist_conf_path}"/base.config
-	)
-	use debug || merge_configs+=(
-		"${dist_conf_path}"/no-debug.config
-	)
-	if use hardened; then
-		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
-
-		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
-
-		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
-			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
-		fi
-	fi
-
-	# this covers ppc64 and aarch64_be only for now
-	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
-		merge_configs+=( "${dist_conf_path}/big-endian.config" )
-	fi
-
-	kernel-build_merge_configs "${merge_configs[@]}"
-}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.18.5.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.18.5.ebuild
deleted file mode 100644
index 178362fbfb66..000000000000
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.18.5.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build toolchain-funcs
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 3 ))
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-# forked to https://github.com/mgorny/fedora-kernel-config-for-gentoo
-CONFIG_VER=5.18.4-gentoo
-# update to g2 on bump!
-GENTOO_CONFIG_VER=g1
-
-DESCRIPTION="Linux kernel built with Gentoo patches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	https://github.com/mgorny/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
-		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
-	amd64? (
-		https://raw.githubusercontent.com/mgorny/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-x86_64-fedora.config
-			-> kernel-x86_64-fedora.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://raw.githubusercontent.com/mgorny/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-aarch64-fedora.config
-			-> kernel-aarch64-fedora.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://raw.githubusercontent.com/mgorny/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-ppc64le-fedora.config
-			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
-	)
-	x86? (
-		https://raw.githubusercontent.com/mgorny/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-i686-fedora.config
-			-> kernel-i686-fedora.config.${CONFIG_VER}
-	)
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
-IUSE="debug hardened"
-REQUIRED_USE="arm? ( savedconfig )
-	hppa? ( savedconfig )
-	riscv? ( savedconfig )"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel-bin:${SLOT}
-"
-BDEPEND="
-	debug? ( dev-util/pahole )
-"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}
-"
-
-QA_FLAGS_IGNORED="
-	usr/src/linux-.*/scripts/gcc-plugins/.*.so
-	usr/src/linux-.*/vmlinux
-	usr/src/linux-.*/arch/powerpc/kernel/vdso.*/vdso.*.so.dbg
-"
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	default
-
-	local biendian=false
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			biendian=true
-			;;
-		hppa)
-			return
-			;;
-		ppc)
-			# assume powermac/powerbook defconfig
-			# we still package.use.force savedconfig
-			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
-			biendian=true
-			;;
-		riscv)
-			return
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	local myversion="-gentoo-dist"
-	use hardened && myversion+="-hardened"
-	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
-	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
-
-	local merge_configs=(
-		"${T}"/version.config
-		"${dist_conf_path}"/base.config
-	)
-	use debug || merge_configs+=(
-		"${dist_conf_path}"/no-debug.config
-	)
-	if use hardened; then
-		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
-
-		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
-
-		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
-			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
-		fi
-	fi
-
-	# this covers ppc64 and aarch64_be only for now
-	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
-		merge_configs+=( "${dist_conf_path}/big-endian.config" )
-	fi
-
-	kernel-build_merge_configs "${merge_configs[@]}"
-}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.18.7.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.18.9.ebuild
index 1ba27417d51c..bb4ea09fc811 100644
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.18.7.ebuild
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.18.9.ebuild
@@ -9,7 +9,7 @@ MY_P=linux-${PV%.*}
 GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 3 ))
 # https://koji.fedoraproject.org/koji/packageinfo?packageID=8
 # forked to https://github.com/mgorny/fedora-kernel-config-for-gentoo
-CONFIG_VER=5.18.4-gentoo
+CONFIG_VER=5.18.9-gentoo
 GENTOO_CONFIG_VER=g2
 
 DESCRIPTION="Linux kernel built with Gentoo patches"
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.199.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.199.ebuild
deleted file mode 100644
index bbb1c4778144..000000000000
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.199.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 4 ))
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.4.21
-CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
-GENTOO_CONFIG_VER=g1
-
-DESCRIPTION="Linux kernel built with Gentoo patches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	https://github.com/mgorny/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
-		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64.config
-			-> kernel-x86_64.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config
-			-> kernel-aarch64.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le.config
-			-> kernel-ppc64le.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config
-			-> kernel-i686.config.${CONFIG_VER}
-	)
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 arm64 ~ppc ppc64 x86"
-IUSE="debug"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel-bin:${SLOT}
-"
-BDEPEND="
-	debug? ( dev-util/pahole )
-"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}
-"
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" .config || die
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die
-			;;
-		ppc)
-			# assume powermac/powerbook defconfig
-			# we still package.use.force savedconfig
-			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	echo 'CONFIG_LOCALVERSION="-gentoo-dist"' > "${T}"/version.config || die
-	local merge_configs=(
-		"${T}"/version.config
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
-	)
-	use debug || merge_configs+=(
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
-	)
-	[[ ${ARCH} == x86 ]] && merge_configs+=(
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/32-bit.config
-	)
-
-	kernel-build_merge_configs "${merge_configs[@]}"
-}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.201.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.203.ebuild
index bf4c0106cbb7..dd5f9148ba84 100644
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.201.ebuild
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.203.ebuild
@@ -40,7 +40,7 @@ SRC_URI+="
 S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc ppc64 x86"
 IUSE="debug"
 
 RDEPEND="
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.200.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.204.ebuild
index bf4c0106cbb7..bf4c0106cbb7 100644
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.200.ebuild
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.204.ebuild