sys-kernel/vanilla-kernel: Remove old

Signed-off-by: Michał Górny <mgorny@gentoo.org>

14 files changed, 0 insertions, 1824 deletions

diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index 8d16aed6b6b3..503221381a85 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -1,42 +1,13 @@
-DIST kernel-aarch64-fedora.config.5.8.5 215148 BLAKE2B c71380f46c1b37e9e17bab6d78907114369b377bcbdb54afa2c35b6a222937fd061f25309d8de0cc78ef2329ede7192722270acceeaa3da4629a5f58d8fee809 SHA512 e86e2c60e88b1ea5968db1a471d7d928ccb3146fe850f8f2813ef315f2de0cbfa0daa2f6828dee71acb2299f65f05fc0b6f1572a82fb146ae9f53a905fe94e97
-DIST kernel-aarch64-fedora.config.5.9.0 217558 BLAKE2B 38e3c31b710c30d29dbf0b5304c2b9e0615af08ec11a01318bc0c4811b91a0803a96483e986f3dd83369b14e9329bdeb0e0d834761af9a644d831eba43eb910d SHA512 d38d05aef2a809207a186eacc365118d68e7ef82939b45ac5b9038cb493c771f8fa10009a0082f36c79c2e6b5b2ec193a6b1f50bc51a6190b77f57ab7cf237a1
 DIST kernel-aarch64-fedora.config.5.9.2 217893 BLAKE2B 03a36c1fe81a16b434cd94bad3984bf8984808b2e7092089f9a23a565c6d9bc8a512baa4e5754633783ef47feb6cc67010a0093f096e5a15db0f13aaaf6d6426 SHA512 ebe29150ae625cf2f285649984c27246ef85cc13f0b5d4e40dd3ef479489aaa09b6ee4aee859d6e4361dd7e7b4432db8aec077a099a25e90609b9eac2d42802d
 DIST kernel-aarch64.config.5.4.21 199104 BLAKE2B 578ad451a76204df2a9bbbe34b5cb27051d2ac5e2c33967f562b01338c43f35da6dc33a4c2cc67ea6c3b32b155729360d3748ec28dcaa750f18449245b2e8a09 SHA512 66e9a437beb350fdc59512c17b8f72c5b5bfacf2b35070d810d77e66f49cf7929026cc28ad44b04a016d61e65d9fb4a10af6996ba09b604bf97e9c467d08f8ff
-DIST kernel-i686-fedora.config.5.8.5 199121 BLAKE2B f6e16e6faac6e730eb4c9c3edc1c173b2988b49fe677d34ef1540541911b8f76e5bdc166327d73237c78c1769d484de18864044c91b7da253795506c674d7303 SHA512 0a2c9abaae11ac1ec2e43da4b53fd1731a9bec983a7fda7b9e20f1d25b816e6b0bd217b255ca95b02a8b6530e923b4fc7de770f6a66411045712e7de61d431af
-DIST kernel-i686-fedora.config.5.9.0 201027 BLAKE2B 1939ffac8baf290e9c0ab6bff25a365af8c674b360e3adc5e9bfd710473abbd38a124f5279b2259cbc0c9345e0ca5b667c67324b194742693561c91528cf1793 SHA512 e5ba77e899360cef9dc45a5b5baf646aed04fdeb771727a6696f156bd0aa8aed4dbac13ffd78779e1b1ac657c1f9569bcb2d0c3bcd4be2063d7a1b68e6aab983
 DIST kernel-i686-fedora.config.5.9.2 201362 BLAKE2B 93e5dbbeec7761d777b8cf8795b38dd6a727f07c58176013dc5d18c60165af21c6e0e9140c7c7217fcc31f9b9a9c959be9d3ef0f853035986605fc513e7c70c1 SHA512 7bb41160333fa0f751c80ec9ad1e49ef991c26e05575a1e5fb41967bd984c91294629d91624eacbbdf2f307a28f9de8c994a9a7bef63cc933b0e13727dd33619
 DIST kernel-i686.config.5.4.21 183910 BLAKE2B 185126ffb85718bb73761d01683def80b6f002d7a7a6eddd8e858a30d8eadc863fb378d83a1cd2ed82b3540337fa66ae44475e31fb41ebc46d77005b6f54e5c0 SHA512 6307afc2295902e44fe65b1cccaa7a0260b295a5f21f1d67ec66197bd972bd3f5675b624f08d9da8b224cb3ec987d5c21cbd743599aeab9ac6214bc651f43476
-DIST kernel-ppc64le-fedora.config.5.8.5 185766 BLAKE2B 27330c7806923eb4a3346df2abb5f253ca044a02afe72a89c6ce006d149966d65b4ba3e114b5ebefae987565279510c05d33dbc89c36c5e78e2e88732f5125f2 SHA512 8b621e0584624ccc24580951fc116478506a7465715449a53e70f46c99d0210bf08063a4fd5b87e4624f5ce179e6a6316f23723839c0e64e57a2ee58e4de59fe
-DIST kernel-ppc64le-fedora.config.5.9.0 187611 BLAKE2B 0fcf6d09edb2afbaac88e8588bf3f0daba4a6b810ab3d88121c1c55790b8dabe24ab02f9b042b775a909e29d3e43b7cded8120417823712409d3388a93ad5996 SHA512 cb76b2a140a8362c1925a4bb8d048990feb81c625da95f170d7ab986fc0d0cdfaef79acfdf4e5f167fc70efc42da80c1038ee37f7ce3bbcd3782c5beed6607f3
 DIST kernel-ppc64le-fedora.config.5.9.2 187957 BLAKE2B ae15f248000095a593ca67223818379eaec9dc878049eb36c5812ef70bd27bb5159ef16faffd4fa0f26ba5d4fdb907cb8658ff3fc34c93746f04f428d3598d98 SHA512 c331ec3301baeedaefe2e31e3fdc5e9ae48070e8e4f8e3469efb4a9907e4ceaa38748dc1fc99305b630e06c68993007182d3ada3cb9c518a81414b29c854fb88
 DIST kernel-ppc64le.config.5.4.21 172003 BLAKE2B b53887cb44f7c378cb3866780f8e556e19fdb02130d3b0df01d97698d2a91f7d90a200012559f288e962935742c3fdb67dfb6711876fad37862fe55cdca5b5f6 SHA512 82df8d0be47e9eb20bd7db570539bb061d0b6e2101dc78a54596cf4d0b4e0c536041449304ff9240b051ee09b342ea336c5645e9a3b66a5dfb96d7778ff86008
-DIST kernel-x86_64-fedora.config.5.8.5 200052 BLAKE2B be804fd499527a6c6927365c0350b51b3351da9a4e3f75bcbcc44d1a1b21d001d4907e6028ceb7ec6d5c812ea190d369ca6de4ae2c21a293342b6af33b8e5e65 SHA512 40ba21b0597702d3cff9eb3c1fab98784229ba78702bbb0fae2264b145a2e433615522e300cff1f9c9c52067431116b80a8db92e1263bd1a9070adbbd068f982
-DIST kernel-x86_64-fedora.config.5.9.0 201958 BLAKE2B f210399099661f9f643b0b1fe6cfd82675fb71b4c63c8ee07645771960df2936370680e704b1494c6e66ff570a4a4dcd2c16ef521be4a29c21e1b12abbf71875 SHA512 f9c7ed7b9a8c351c841b527c352a72aeb36ed368dcf9060ff2c4c92364419cc256752d3fde76593d177cf40389a2b9dd9ac7bc05462539433d3829a429b74eca
 DIST kernel-x86_64-fedora.config.5.9.2 202282 BLAKE2B 5172fb3f682f912b14c4b2f15e04db4be6362d1291bc03b03352d00224aec387d4fe04150a617f9a8e84999aeabfda51f79e0978998ee232cc1c6f2ee130b74b SHA512 36375384215aef89b52b365a9ff82d732a42336c51e144ddc39b16f1fbafb858bdf0d1f5d06bb4927183bcaf8943caf15adfe2428fafa85db70a198e53854155
 DIST kernel-x86_64.config.5.4.21 184907 BLAKE2B 0eb2b07c14cea7545350fcdf3a94f2a531f0137c502ebda9299cacf44da5385686e2049b480b28bc153c9d413d453cfe682b9655eefe70428cb720f57c7bd200 SHA512 f3b3ee6841555ac3a9cc11536a7d44e1a5a8df2bab14ba341fda7df1ceb0de45cf1c799a1d54a64f2858fd1272d348bb52cf269ffa396878c5402baf2730237f
 DIST linux-5.4.72.tar.xz 109606972 BLAKE2B 90dfea3370a78742c851d7c9ee21c6fe17204f6c6825f82ebef4bf9c23bb59ae62bafc71cd4bdccad151c6042a33c43df8449d10e93f71d41bdfe3006255b5ba SHA512 6f8b191732b1f73249f8d350500ade946f61309791b3c4021deec80e4781738141afd5e4a11d071d329ec792fc87ce2e6386e151417db0fbf344b6a5659bddf7
-DIST linux-5.4.73.tar.xz 109611940 BLAKE2B df2e3af9e3d6605769de7d4fb0a6fe24d259d59e48a6cc4d4eea2dbcca7cd6cdcf36370401fd12a1ecf3da5887e98b20176fb551758c41ecdb737c6e7813e8f6 SHA512 c5b285d5511888576ed775810294f53612f68b834f119b41127bfcbd6fa3fdfd710f56a5589af8a933e6148fed93f4a23ff48ca9c4b9682d6de2e9039c4bd3bc
-DIST linux-5.4.74.tar.sign 989 BLAKE2B 5aa44c868beeb50f49ee0a4be705da864b991d8cf220084106d962ef28038a53edf8f52117e446d68e36987460235209c0f830c5f205732c5de672d1074413cf SHA512 7cb4608aead5b9da74bb05d3d8691ffb5c53842daa7010208cf8750e2733ec7ae2bff1f13f12b240b1e50724c204f230d145cb1038d248f097e5151266463c89
-DIST linux-5.4.74.tar.xz 109609988 BLAKE2B 4bec2074e2f3ac587b35f67531d2a2feaf1c6e76b7c1325a43cc4c7d7171f1a21f2c3f6e3b7bc4ffc64dcfa65633f9f05c600c275063f3828c41028f044714e9 SHA512 1085e2a773ba9d3aa013673c5ee1bd0769f48e3791d0c964d56854f7a8566671147454450600738c83b7443fc1e2546b0dacd3ee92c7572240a92c49b9784790
-DIST linux-5.4.75.tar.sign 989 BLAKE2B b2cee7f5ee53fb4c066d7391ff0e29324962e568fe87de3025974ed42f8995105c8f6a4e189287175b9f948f54474442a002c62a4a82a56ee54246ec2e67daaa SHA512 c9796a7f2703700838b930aeb732b110616ab836d57f13b75f77895c696d2d6098770fc1b928671aadd15b79b8cf87f9937720e69e65e3cee8563593360c9041
-DIST linux-5.4.75.tar.xz 109625656 BLAKE2B cbbf92617f92fcea597c23150527f2c9a73b30b42864c49df4e0fd75c711d355ae3674ea5e2a09f33e24afc95112203134e031bc084280524703b5ce30b356c1 SHA512 532848826931b972fa829b7fb4573f629165e74e2a8257f1eb203097485852aebdab484fe49c46f04c5c6bd2d7e9e522d4204fcf3768e8b40f250b1a4c32ba45
-DIST linux-5.4.76.tar.sign 989 BLAKE2B 0eb77018c8531edd1e47dfbb61d030d52ae3a2927805f02b612d83d5ed98d00aee5d4f0a58f3517fc1b2b6a75b102b232aca2905299499b00f00ffb102e3799a SHA512 723e9bec043e9ecc66dd588a10f3e14f2af1df70ac157aed7ec6a6e9a8551eab96b1da228680be9dac837220b37ebcbfcc3b95dd1a2c30801227d287efb58d35
-DIST linux-5.4.76.tar.xz 109619252 BLAKE2B 9e2bb643dcfbb831c5d725717c8e80922a5f6876c3e02b502971a04ab4fa35819bbb22ab58fabdacf4e288b84bed964780fb104ca954174e2a8547c80bca3379 SHA512 94ba200a528cf98d763bba5839acf28255292ade8305f1d2665f1720a0b6b5d54f2c6594b50357ab59aa6c0a48b065788174b21ca5a8572165ce3c0c1e947af6
 DIST linux-5.4.77.tar.sign 989 BLAKE2B d79c13fa311bd79dd690673f6f75cc308c28aea15ffb5c91b22717cc9c538eb7980dcada74e811939ea440f6b9a4843f9259f9f7d5be9521af2fd52ea676dcad SHA512 c7df7e53d4e463c4c776f3996ce7856f34bc63f1c4e32c58f1518d33e784d496945e394c5488807e9d02e3f51aa21e45bdd12a9a2377ea3ab9ea779aeed1ee1f
 DIST linux-5.4.77.tar.xz 109619220 BLAKE2B a89f698636cb913574dda1be8794955c79ae6e221a05bd16afdf555a3a142679309b0c494912b0020bc59c315e0e793042bd504ff076cd910d36e62c943a4661 SHA512 f8501bac63b8d5d9d263eaebf6ab3d9a70a7c26fa39c186c31ce1936647bb08efb19bdbe4a8f2912c37616d370bbdd05bec395d6d818fad235c38832b9d9cb87
-DIST linux-5.8.16.tar.xz 114513732 BLAKE2B 3f75ba3272a066c55845cf7d5e33f340d76e9b9d024b1d182be4067ba1d621bd44c78ee89bea1f7329b7e83933a23e8ed34e2eda0e415cc3a4b4e6863da2dfde SHA512 7d191257a70d2eeccd5db80ff03a8356bb5a2a5eba1f04acf2558d81fa764d18ef025315e992fe64b62b8ccdcdf4d9d9efe3b35ecf57ebc55746c976b391df0e
-DIST linux-5.8.17.tar.xz 114533684 BLAKE2B de4a89df5ad9d7624b604ae66371a0e799ef2c2c0d23f37eed657bfdfbd772d3499a9b79eb27b28987e1d9a6e7fa757c78d4253a442daa5051dc4d178919ded3 SHA512 6b87381c02612c878d49cdee5afaf4ba986d56dc3d64c024c25f9fe66ab2911ef29de6e45cf2d4c0aa7a417e849df59d34d74ec0a3702f812705779e3d7462e4
-DIST linux-5.8.18.tar.sign 989 BLAKE2B 9f1bc3e72ef5559ad4a473ea6caf51b2ecedb033b2972ab74a293a839f17da7adac80ac55bf84ce81405b21da511a5537ac40271b96a116bd92e3e067fe1c95c SHA512 c1c1dd87f7305ee20ef6e06b89342865aeab672ae725b5f349528ac09b07b9e15816075e37fb5b62a2d0933882b0aec7e835ed96eb43a58872bcaca3ecb03158
-DIST linux-5.8.18.tar.xz 114530192 BLAKE2B 0c5b631b3ab1e00cbec4dc1cf477b634475ed187e19324dfc54f38c36291186a5c3e46fb7495e5421463973fccb98539e39bc06c782f11a018ca7cea21453a3f SHA512 77429204cfb88c6775d911f03b658b62095b6f592421d985daae5da25e9deef51dfb463c3394ea69e5d0861f5c7f14496037cfad3862c9445cc54a7878e9af9b
-DIST linux-5.9.1.tar.xz 115502916 BLAKE2B 65eeccf077194ce03d5dbc1e8ea8f6022d709bc930945a49880fb87d71992e0614cf5ee92eb1b60fe2e3ed41fe17f0c176bbbad5f2cf0a2a349e1b08e6236558 SHA512 96af08c1dc964e5dbb3d221880ef8ca246f13370d2dc2f5ae64039f0352efc687c7446a2b4f86dad553b776ee75f78bbf58bb9bc845c9b57a9013ece63264874
-DIST linux-5.9.2.tar.xz 115519708 BLAKE2B 22ba992df3a1d73fa16efb31bb0d62eacd106fb6f4d6dd1ebe522dc09b94c8df689cdb594ed105076ab5e1be4bd00eb834019dc19b6f58f6bee04f53e5de961e SHA512 98efc0d10e76685eb3280546d8d9b0251062a8ede05959d0de95df18414d2a07ced0a585ba58dd5aad188ad2761d7c5150cd8a8435a6bb53d692702f434732a9
-DIST linux-5.9.3.tar.sign 987 BLAKE2B 9419f8d7a592ea26ced8022b61d04fbc7df8fac8fb5b0df58e97cf63d3ded29653ff950092d61be1211a23b91311fb7bacad7ed54fa6fd3e6823b9180c6adc50 SHA512 74e82b6e495ece56c3300d4362c55b91274dfd97121ce7290901c98b95ddf53c839cd45a04e8f5820865a12462286dd3105066013734e20d851a1498fe26443f
-DIST linux-5.9.3.tar.xz 115525348 BLAKE2B 9f739fe4eb5d6ba38df54cee41d7342076fbd757fd25f50614ff3681ec9ed9afd9a5e134831a64e1fbcf4c31d2436ad2892cd6e9c50f664abbe6dbaa7ef2856e SHA512 5207dfb30803e1daeb4025dbf2887ebd4fa37f1b5ddadb2dda1f2ab1815309ec9d4a9fad61922b0ce28c422f61ef94b88de16c911956734634cc47c4f5031b3d
-DIST linux-5.9.4.tar.sign 987 BLAKE2B ef16d6d1adabac9de4126e125c015cdde190585e338cda2ad9f51dc91c3efe3cef80545c9b2a8f9157ad73ac447d53d48937df6170a62e51db71b48684eb694b SHA512 8b796fcf8cf751ff5d97062b9d12f5750e516e766b1d22d74d2c7c08d7bc02b3d292eb4f81797e76e684f473f9fc13c9b42ee7fda0615a0613d4800aade3c044
-DIST linux-5.9.4.tar.xz 115517728 BLAKE2B 5c1e15c5a31cc80be69f9904fcc2a1ac0eb0d4d75095047698cb2ecf196efc7528efe6be91b6670b27a25eae1ee2065493c4e25ccd7537d73571975b83856c0a SHA512 911e9b437df70f9c092e14f7daf22a62026f6aaadfcb599d27c88aaf8bbedc87cc917cff5a84c3ea3dca9f9a9e094a4228ed4480131bfa8adcf895f77518358b
-DIST linux-5.9.6.tar.sign 987 BLAKE2B c6d3bb933ea3da8e71bf7f954ef7a39cf4172571a0de2126b0270f9b9a30eaba6a8b28df37a828146c1636919214b4fe7258fd0fa34d73a2183ca2112158e1b1 SHA512 21961cc9450f420c7f541b0955bc1a19b5b640a2a3c7945b69be763884aa273e2ec9296dfac93cb9729167f4ac510d356c0e807211a881e82d7d1d711dbef8e3
-DIST linux-5.9.6.tar.xz 115547768 BLAKE2B c1a547d4af558bf364f2c1699e529deefeb5bd9322b7cfe8c034a0414d9e69dc96e27bd4011ce105f02d9787ca0e18e4c3d9c7581ccc486e45995f4fc493d932 SHA512 0a01d7d503959c20a8dd62a3fa1b44b5b4650aac2fdb8f481b81a1321fcf2565049927418422dd1013e2d54af2a0b27a82cfbe8c1cb0843d8b840adef45d5db1
-DIST linux-5.9.7.tar.sign 987 BLAKE2B eb062daf9e49814c36b89f851d42be11f3527f0c6ed35df4baa660370056936fcb67951fe6a494f59d4a0f4f2a73c195e9e092b0b66ecf4bc10cda39faa1fe6e SHA512 986991d2b13df63b2c09e4b86329d48f243a256ecbfa8308fb23ea9680b904216fa68ff93c763a70290c3c0f90e5d95419af9db63c029afee7d0897ac46ccfd6
-DIST linux-5.9.7.tar.xz 115538096 BLAKE2B 27fa82f1b174a43e1771ec322521c1f1425a042da2cbf1aa4b76bf0ac66172c8e104c1bf942ee0ecf3c3da1b16906c4d007bf45dbb7d2013b2326a592da3547e SHA512 1b47a90a8d3a66499417a1fc2275b4b1c4d095d1ee5d29089f22c3f078a96760b6293b51a5db3245111e4e41e1b781d692f2994fb07009afd46b5158e689c554
 DIST linux-5.9.8.tar.sign 987 BLAKE2B bbe7c04acb6b3f61333e96582fc3d64834bb51c79f7f1d1eac455d6b89b62b614e8975adf01d2dda0b3a43813b32abe51f65f111e4ef68a0b4da9b26e22dafc8 SHA512 1e3ba4a90414372790718adabf3d8311cc6cca91601f048c8c7b2efdad6cd7ab9628a906407168df92aa6cfdf6ad93a9d9341a9f31bd8d46d9e808f4c9edf848
 DIST linux-5.9.8.tar.xz 115540828 BLAKE2B 27b8820bbd7ea278b47e1c208efeeb41c890276ae59d33971ab0d8ba0081d45e57c579f9390c5e3019a4f3beebaf17a29a959e1b6cadb9e1824ea4e568f90205 SHA512 063e853ccebe3e9422407dd4ed7f74a6202546761d4eb542035b3d71d0478efba9daa6eaeb1e2452c13d3093dd64729d9fd2df17945319b9535724d95be94a69
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.73.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.73.ebuild
deleted file mode 100644
index ee1e12c459a7..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.73.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build
-
-MY_P=linux-${PV}
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.4.21
-CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
-
-DESCRIPTION="Linux kernel built from vanilla upstream sources"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	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 ~x86"
-IUSE="debug"
-
-RDEPEND="
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/dwarves )"
-
-pkg_pretend() {
-	ewarn "Starting with 5.4.52, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_prepare() {
-	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
-			;;
-		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
-
-	local config_tweaks=(
-		# replace (none) with gentoo
-		-e 's:^CONFIG_DEFAULT_HOSTNAME=:&"gentoo":'
-		# we do support x32
-		-e '/CONFIG_X86_X32/s:.*:CONFIG_X86_X32=y:'
-		# disable signatures
-		-e '/CONFIG_MODULE_SIG/d'
-		-e '/CONFIG_SECURITY_LOCKDOWN/d'
-		-e '/CONFIG_KEXEC_SIG/d'
-		-e '/CONFIG_KEXEC_BZIMAGE_VERIFY_SIG/d'
-		-e '/CONFIG_SYSTEM_EXTRA_CERTIFICATE/d'
-		-e '/CONFIG_SIGNATURE/d'
-		# remove massive array of LSMs
-		-e 's/CONFIG_LSM=.*/CONFIG_LSM="yama"/'
-		-e 's/CONFIG_DEFAULT_SECURITY_SELINUX=y/CONFIG_DEFAULT_SECURITY_DAC=y/'
-		# nobody actually wants fips
-		-e '/CONFIG_CRYPTO_FIPS/d'
-		# these tests are really not necessary
-		-e 's/.*CONFIG_CRYPTO_MANAGER_DISABLE_TESTS.*/CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y/'
-		# probably not needed by anybody but developers
-		-e '/CONFIG_CRYPTO_STATS/d'
-		# 1000hz is excessive for laptops
-		-e 's/CONFIG_HZ_1000=y/CONFIG_HZ_300=y/'
-		# nobody is using this kernel on insane super computers
-		-e 's/CONFIG_NR_CPUS=.*/CONFIG_NR_CPUS=512/'
-		# we're not actually producing live patches for folks
-		-e 's/CONFIG_LIVEPATCH=y/CONFIG_LIVEPATCH=n/'
-		# this slows down networking in general
-		-e 's/CONFIG_IP_FIB_TRIE_STATS=y/CONFIG_IP_FIB_TRIE_STATS=n/'
-		# include font for normal and hidpi screens
-		-e 's/.*CONFIG_FONTS.*/CONFIG_FONTS=y\nCONFIG_FONT_8x16=y\nCONFIG_FONT_TER16x32=y/'
-		# we don't need to actually install system headers from this ebuild
-		-e '/CONFIG_HEADERS_INSTALL/d'
-		# enable /proc/config.gz, used by linux-info.eclass
-		-e '/CONFIG_IKCONFIG/s:.*:CONFIG_IKCONFIG=y\nCONFIG_IKCONFIG_PROC=y:'
-		# WireGuard was backported to 5.4 but we use old configs (#739128)
-		-e '$aCONFIG_WIREGUARD=m'
-	)
-	use debug || config_tweaks+=(
-		-e '/CONFIG_DEBUG_INFO/d'
-		-e '/CONFIG_DEBUG_RODATA_TEST/d'
-		-e '/CONFIG_DEBUG_VM/d'
-		-e '/CONFIG_DEBUG_SHIRQ/d'
-		-e '/CONFIG_DEBUG_LIST/d'
-		-e '/CONFIG_BUG_ON_DATA_CORRUPTION/d'
-		-e '/CONFIG_TORTURE_TEST/d'
-		-e '/CONFIG_BOOTTIME_TRACING/d'
-		-e '/CONFIG_RING_BUFFER_BENCHMARK/d'
-		-e '/CONFIG_X86_DECODER_SELFTEST/d'
-		-e '/CONFIG_KGDB/d'
-	)
-	[[ ${ARCH} == x86 ]] && config_tweaks+=(
-		# fix autoenabling 64bit
-		-e '2i\
-# CONFIG_64BIT is not set'
-	)
-	sed -i "${config_tweaks[@]}" .config || die
-}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.74.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.74.ebuild
deleted file mode 100644
index 044218e07529..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.74.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build verify-sig
-
-MY_P=linux-${PV}
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.4.21
-CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
-
-DESCRIPTION="Linux kernel built from vanilla upstream sources"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	verify-sig? (
-		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
-	)
-	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 ~x86"
-IUSE="debug"
-
-RDEPEND="
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/dwarves )
-	verify-sig? ( app-crypt/openpgp-keys-kernel )"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
-
-pkg_pretend() {
-	ewarn "Starting with 5.4.52, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_unpack() {
-	if use verify-sig; then
-		einfo "Unpacking linux-${PV}.tar.xz ..."
-		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
-			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
-		assert "Unpack failed"
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	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
-			;;
-		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
-
-	local config_tweaks=(
-		# replace (none) with gentoo
-		-e 's:^CONFIG_DEFAULT_HOSTNAME=:&"gentoo":'
-		# we do support x32
-		-e '/CONFIG_X86_X32/s:.*:CONFIG_X86_X32=y:'
-		# disable signatures
-		-e '/CONFIG_MODULE_SIG/d'
-		-e '/CONFIG_SECURITY_LOCKDOWN/d'
-		-e '/CONFIG_KEXEC_SIG/d'
-		-e '/CONFIG_KEXEC_BZIMAGE_VERIFY_SIG/d'
-		-e '/CONFIG_SYSTEM_EXTRA_CERTIFICATE/d'
-		-e '/CONFIG_SIGNATURE/d'
-		# remove massive array of LSMs
-		-e 's/CONFIG_LSM=.*/CONFIG_LSM="yama"/'
-		-e 's/CONFIG_DEFAULT_SECURITY_SELINUX=y/CONFIG_DEFAULT_SECURITY_DAC=y/'
-		# nobody actually wants fips
-		-e '/CONFIG_CRYPTO_FIPS/d'
-		# these tests are really not necessary
-		-e 's/.*CONFIG_CRYPTO_MANAGER_DISABLE_TESTS.*/CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y/'
-		# probably not needed by anybody but developers
-		-e '/CONFIG_CRYPTO_STATS/d'
-		# 1000hz is excessive for laptops
-		-e 's/CONFIG_HZ_1000=y/CONFIG_HZ_300=y/'
-		# nobody is using this kernel on insane super computers
-		-e 's/CONFIG_NR_CPUS=.*/CONFIG_NR_CPUS=512/'
-		# we're not actually producing live patches for folks
-		-e 's/CONFIG_LIVEPATCH=y/CONFIG_LIVEPATCH=n/'
-		# this slows down networking in general
-		-e 's/CONFIG_IP_FIB_TRIE_STATS=y/CONFIG_IP_FIB_TRIE_STATS=n/'
-		# include font for normal and hidpi screens
-		-e 's/.*CONFIG_FONTS.*/CONFIG_FONTS=y\nCONFIG_FONT_8x16=y\nCONFIG_FONT_TER16x32=y/'
-		# we don't need to actually install system headers from this ebuild
-		-e '/CONFIG_HEADERS_INSTALL/d'
-		# enable /proc/config.gz, used by linux-info.eclass
-		-e '/CONFIG_IKCONFIG/s:.*:CONFIG_IKCONFIG=y\nCONFIG_IKCONFIG_PROC=y:'
-		# WireGuard was backported to 5.4 but we use old configs (#739128)
-		-e '$aCONFIG_WIREGUARD=m'
-	)
-	use debug || config_tweaks+=(
-		-e '/CONFIG_DEBUG_INFO/d'
-		-e '/CONFIG_DEBUG_RODATA_TEST/d'
-		-e '/CONFIG_DEBUG_VM/d'
-		-e '/CONFIG_DEBUG_SHIRQ/d'
-		-e '/CONFIG_DEBUG_LIST/d'
-		-e '/CONFIG_BUG_ON_DATA_CORRUPTION/d'
-		-e '/CONFIG_TORTURE_TEST/d'
-		-e '/CONFIG_BOOTTIME_TRACING/d'
-		-e '/CONFIG_RING_BUFFER_BENCHMARK/d'
-		-e '/CONFIG_X86_DECODER_SELFTEST/d'
-		-e '/CONFIG_KGDB/d'
-	)
-	[[ ${ARCH} == x86 ]] && config_tweaks+=(
-		# fix autoenabling 64bit
-		-e '2i\
-# CONFIG_64BIT is not set'
-	)
-	sed -i "${config_tweaks[@]}" .config || die
-}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.75.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.75.ebuild
deleted file mode 100644
index 044218e07529..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.75.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build verify-sig
-
-MY_P=linux-${PV}
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.4.21
-CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
-
-DESCRIPTION="Linux kernel built from vanilla upstream sources"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	verify-sig? (
-		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
-	)
-	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 ~x86"
-IUSE="debug"
-
-RDEPEND="
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/dwarves )
-	verify-sig? ( app-crypt/openpgp-keys-kernel )"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
-
-pkg_pretend() {
-	ewarn "Starting with 5.4.52, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_unpack() {
-	if use verify-sig; then
-		einfo "Unpacking linux-${PV}.tar.xz ..."
-		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
-			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
-		assert "Unpack failed"
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	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
-			;;
-		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
-
-	local config_tweaks=(
-		# replace (none) with gentoo
-		-e 's:^CONFIG_DEFAULT_HOSTNAME=:&"gentoo":'
-		# we do support x32
-		-e '/CONFIG_X86_X32/s:.*:CONFIG_X86_X32=y:'
-		# disable signatures
-		-e '/CONFIG_MODULE_SIG/d'
-		-e '/CONFIG_SECURITY_LOCKDOWN/d'
-		-e '/CONFIG_KEXEC_SIG/d'
-		-e '/CONFIG_KEXEC_BZIMAGE_VERIFY_SIG/d'
-		-e '/CONFIG_SYSTEM_EXTRA_CERTIFICATE/d'
-		-e '/CONFIG_SIGNATURE/d'
-		# remove massive array of LSMs
-		-e 's/CONFIG_LSM=.*/CONFIG_LSM="yama"/'
-		-e 's/CONFIG_DEFAULT_SECURITY_SELINUX=y/CONFIG_DEFAULT_SECURITY_DAC=y/'
-		# nobody actually wants fips
-		-e '/CONFIG_CRYPTO_FIPS/d'
-		# these tests are really not necessary
-		-e 's/.*CONFIG_CRYPTO_MANAGER_DISABLE_TESTS.*/CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y/'
-		# probably not needed by anybody but developers
-		-e '/CONFIG_CRYPTO_STATS/d'
-		# 1000hz is excessive for laptops
-		-e 's/CONFIG_HZ_1000=y/CONFIG_HZ_300=y/'
-		# nobody is using this kernel on insane super computers
-		-e 's/CONFIG_NR_CPUS=.*/CONFIG_NR_CPUS=512/'
-		# we're not actually producing live patches for folks
-		-e 's/CONFIG_LIVEPATCH=y/CONFIG_LIVEPATCH=n/'
-		# this slows down networking in general
-		-e 's/CONFIG_IP_FIB_TRIE_STATS=y/CONFIG_IP_FIB_TRIE_STATS=n/'
-		# include font for normal and hidpi screens
-		-e 's/.*CONFIG_FONTS.*/CONFIG_FONTS=y\nCONFIG_FONT_8x16=y\nCONFIG_FONT_TER16x32=y/'
-		# we don't need to actually install system headers from this ebuild
-		-e '/CONFIG_HEADERS_INSTALL/d'
-		# enable /proc/config.gz, used by linux-info.eclass
-		-e '/CONFIG_IKCONFIG/s:.*:CONFIG_IKCONFIG=y\nCONFIG_IKCONFIG_PROC=y:'
-		# WireGuard was backported to 5.4 but we use old configs (#739128)
-		-e '$aCONFIG_WIREGUARD=m'
-	)
-	use debug || config_tweaks+=(
-		-e '/CONFIG_DEBUG_INFO/d'
-		-e '/CONFIG_DEBUG_RODATA_TEST/d'
-		-e '/CONFIG_DEBUG_VM/d'
-		-e '/CONFIG_DEBUG_SHIRQ/d'
-		-e '/CONFIG_DEBUG_LIST/d'
-		-e '/CONFIG_BUG_ON_DATA_CORRUPTION/d'
-		-e '/CONFIG_TORTURE_TEST/d'
-		-e '/CONFIG_BOOTTIME_TRACING/d'
-		-e '/CONFIG_RING_BUFFER_BENCHMARK/d'
-		-e '/CONFIG_X86_DECODER_SELFTEST/d'
-		-e '/CONFIG_KGDB/d'
-	)
-	[[ ${ARCH} == x86 ]] && config_tweaks+=(
-		# fix autoenabling 64bit
-		-e '2i\
-# CONFIG_64BIT is not set'
-	)
-	sed -i "${config_tweaks[@]}" .config || die
-}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.76.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.76.ebuild
deleted file mode 100644
index 044218e07529..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.76.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build verify-sig
-
-MY_P=linux-${PV}
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.4.21
-CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
-
-DESCRIPTION="Linux kernel built from vanilla upstream sources"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	verify-sig? (
-		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
-	)
-	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 ~x86"
-IUSE="debug"
-
-RDEPEND="
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/dwarves )
-	verify-sig? ( app-crypt/openpgp-keys-kernel )"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
-
-pkg_pretend() {
-	ewarn "Starting with 5.4.52, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_unpack() {
-	if use verify-sig; then
-		einfo "Unpacking linux-${PV}.tar.xz ..."
-		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
-			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
-		assert "Unpack failed"
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	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
-			;;
-		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
-
-	local config_tweaks=(
-		# replace (none) with gentoo
-		-e 's:^CONFIG_DEFAULT_HOSTNAME=:&"gentoo":'
-		# we do support x32
-		-e '/CONFIG_X86_X32/s:.*:CONFIG_X86_X32=y:'
-		# disable signatures
-		-e '/CONFIG_MODULE_SIG/d'
-		-e '/CONFIG_SECURITY_LOCKDOWN/d'
-		-e '/CONFIG_KEXEC_SIG/d'
-		-e '/CONFIG_KEXEC_BZIMAGE_VERIFY_SIG/d'
-		-e '/CONFIG_SYSTEM_EXTRA_CERTIFICATE/d'
-		-e '/CONFIG_SIGNATURE/d'
-		# remove massive array of LSMs
-		-e 's/CONFIG_LSM=.*/CONFIG_LSM="yama"/'
-		-e 's/CONFIG_DEFAULT_SECURITY_SELINUX=y/CONFIG_DEFAULT_SECURITY_DAC=y/'
-		# nobody actually wants fips
-		-e '/CONFIG_CRYPTO_FIPS/d'
-		# these tests are really not necessary
-		-e 's/.*CONFIG_CRYPTO_MANAGER_DISABLE_TESTS.*/CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y/'
-		# probably not needed by anybody but developers
-		-e '/CONFIG_CRYPTO_STATS/d'
-		# 1000hz is excessive for laptops
-		-e 's/CONFIG_HZ_1000=y/CONFIG_HZ_300=y/'
-		# nobody is using this kernel on insane super computers
-		-e 's/CONFIG_NR_CPUS=.*/CONFIG_NR_CPUS=512/'
-		# we're not actually producing live patches for folks
-		-e 's/CONFIG_LIVEPATCH=y/CONFIG_LIVEPATCH=n/'
-		# this slows down networking in general
-		-e 's/CONFIG_IP_FIB_TRIE_STATS=y/CONFIG_IP_FIB_TRIE_STATS=n/'
-		# include font for normal and hidpi screens
-		-e 's/.*CONFIG_FONTS.*/CONFIG_FONTS=y\nCONFIG_FONT_8x16=y\nCONFIG_FONT_TER16x32=y/'
-		# we don't need to actually install system headers from this ebuild
-		-e '/CONFIG_HEADERS_INSTALL/d'
-		# enable /proc/config.gz, used by linux-info.eclass
-		-e '/CONFIG_IKCONFIG/s:.*:CONFIG_IKCONFIG=y\nCONFIG_IKCONFIG_PROC=y:'
-		# WireGuard was backported to 5.4 but we use old configs (#739128)
-		-e '$aCONFIG_WIREGUARD=m'
-	)
-	use debug || config_tweaks+=(
-		-e '/CONFIG_DEBUG_INFO/d'
-		-e '/CONFIG_DEBUG_RODATA_TEST/d'
-		-e '/CONFIG_DEBUG_VM/d'
-		-e '/CONFIG_DEBUG_SHIRQ/d'
-		-e '/CONFIG_DEBUG_LIST/d'
-		-e '/CONFIG_BUG_ON_DATA_CORRUPTION/d'
-		-e '/CONFIG_TORTURE_TEST/d'
-		-e '/CONFIG_BOOTTIME_TRACING/d'
-		-e '/CONFIG_RING_BUFFER_BENCHMARK/d'
-		-e '/CONFIG_X86_DECODER_SELFTEST/d'
-		-e '/CONFIG_KGDB/d'
-	)
-	[[ ${ARCH} == x86 ]] && config_tweaks+=(
-		# fix autoenabling 64bit
-		-e '2i\
-# CONFIG_64BIT is not set'
-	)
-	sed -i "${config_tweaks[@]}" .config || die
-}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.8.16.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.8.16.ebuild
deleted file mode 100644
index 540a5ea3c744..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.8.16.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build
-
-MY_P=linux-${PV}
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.8.5
-CONFIG_HASH=af8da8d54d21231fd8c7b943216bb985f0a4e223
-
-DESCRIPTION="Linux kernel built from vanilla upstream sources"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	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 ~ppc64 ~x86"
-IUSE="debug"
-REQUIRED_USE="
-	arm? ( savedconfig )"
-
-RDEPEND="
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/dwarves )"
-
-pkg_pretend() {
-	ewarn "Starting with 5.7.9, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_prepare() {
-	default
-
-	# 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
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	local config_tweaks=(
-		# replace (none) with gentoo
-		-e 's:^CONFIG_DEFAULT_HOSTNAME=:&"gentoo":'
-		# we do support x32
-		-e '/CONFIG_X86_X32/s:.*:CONFIG_X86_X32=y:'
-		# disable signatures
-		-e '/CONFIG_MODULE_SIG/d'
-		-e '/CONFIG_SECURITY_LOCKDOWN/d'
-		-e '/CONFIG_KEXEC_SIG/d'
-		-e '/CONFIG_KEXEC_BZIMAGE_VERIFY_SIG/d'
-		-e '/CONFIG_SYSTEM_EXTRA_CERTIFICATE/d'
-		-e '/CONFIG_SIGNATURE/d'
-		# remove massive array of LSMs
-		-e 's/CONFIG_LSM=.*/CONFIG_LSM="yama"/'
-		-e 's/CONFIG_DEFAULT_SECURITY_SELINUX=y/CONFIG_DEFAULT_SECURITY_DAC=y/'
-		# nobody actually wants fips
-		-e '/CONFIG_CRYPTO_FIPS/d'
-		# these tests are really not necessary
-		-e 's/.*CONFIG_CRYPTO_MANAGER_DISABLE_TESTS.*/CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y/'
-		# probably not needed by anybody but developers
-		-e '/CONFIG_CRYPTO_STATS/d'
-		# 1000hz is excessive for laptops
-		-e 's/CONFIG_HZ_1000=y/CONFIG_HZ_300=y/'
-		# nobody is using this kernel on insane super computers
-		-e 's/CONFIG_NR_CPUS=.*/CONFIG_NR_CPUS=512/'
-		# we're not actually producing live patches for folks
-		-e 's/CONFIG_LIVEPATCH=y/CONFIG_LIVEPATCH=n/'
-		# this slows down networking in general
-		-e 's/CONFIG_IP_FIB_TRIE_STATS=y/CONFIG_IP_FIB_TRIE_STATS=n/'
-		# include font for normal and hidpi screens
-		-e 's/.*CONFIG_FONTS.*/CONFIG_FONTS=y\nCONFIG_FONT_8x16=y\nCONFIG_FONT_TER16x32=y/'
-		# we don't need to actually install system headers from this ebuild
-		-e '/CONFIG_HEADERS_INSTALL/d'
-		# enable /proc/config.gz, used by linux-info.eclass
-		-e '/CONFIG_IKCONFIG/s:.*:CONFIG_IKCONFIG=y\nCONFIG_IKCONFIG_PROC=y:'
-	)
-	use debug || config_tweaks+=(
-		-e '/CONFIG_DEBUG_INFO/d'
-		-e '/CONFIG_DEBUG_RODATA_TEST/d'
-		-e '/CONFIG_DEBUG_VM/d'
-		-e '/CONFIG_DEBUG_SHIRQ/d'
-		-e '/CONFIG_DEBUG_LIST/d'
-		-e '/CONFIG_BUG_ON_DATA_CORRUPTION/d'
-		-e '/CONFIG_TORTURE_TEST/d'
-		-e '/CONFIG_BOOTTIME_TRACING/d'
-		-e '/CONFIG_RING_BUFFER_BENCHMARK/d'
-		-e '/CONFIG_X86_DECODER_SELFTEST/d'
-		-e '/CONFIG_KGDB/d'
-	)
-	sed -i "${config_tweaks[@]}" .config || die
-}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.8.17.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.8.17.ebuild
deleted file mode 100644
index 540a5ea3c744..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.8.17.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build
-
-MY_P=linux-${PV}
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.8.5
-CONFIG_HASH=af8da8d54d21231fd8c7b943216bb985f0a4e223
-
-DESCRIPTION="Linux kernel built from vanilla upstream sources"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	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 ~ppc64 ~x86"
-IUSE="debug"
-REQUIRED_USE="
-	arm? ( savedconfig )"
-
-RDEPEND="
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/dwarves )"
-
-pkg_pretend() {
-	ewarn "Starting with 5.7.9, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_prepare() {
-	default
-
-	# 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
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	local config_tweaks=(
-		# replace (none) with gentoo
-		-e 's:^CONFIG_DEFAULT_HOSTNAME=:&"gentoo":'
-		# we do support x32
-		-e '/CONFIG_X86_X32/s:.*:CONFIG_X86_X32=y:'
-		# disable signatures
-		-e '/CONFIG_MODULE_SIG/d'
-		-e '/CONFIG_SECURITY_LOCKDOWN/d'
-		-e '/CONFIG_KEXEC_SIG/d'
-		-e '/CONFIG_KEXEC_BZIMAGE_VERIFY_SIG/d'
-		-e '/CONFIG_SYSTEM_EXTRA_CERTIFICATE/d'
-		-e '/CONFIG_SIGNATURE/d'
-		# remove massive array of LSMs
-		-e 's/CONFIG_LSM=.*/CONFIG_LSM="yama"/'
-		-e 's/CONFIG_DEFAULT_SECURITY_SELINUX=y/CONFIG_DEFAULT_SECURITY_DAC=y/'
-		# nobody actually wants fips
-		-e '/CONFIG_CRYPTO_FIPS/d'
-		# these tests are really not necessary
-		-e 's/.*CONFIG_CRYPTO_MANAGER_DISABLE_TESTS.*/CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y/'
-		# probably not needed by anybody but developers
-		-e '/CONFIG_CRYPTO_STATS/d'
-		# 1000hz is excessive for laptops
-		-e 's/CONFIG_HZ_1000=y/CONFIG_HZ_300=y/'
-		# nobody is using this kernel on insane super computers
-		-e 's/CONFIG_NR_CPUS=.*/CONFIG_NR_CPUS=512/'
-		# we're not actually producing live patches for folks
-		-e 's/CONFIG_LIVEPATCH=y/CONFIG_LIVEPATCH=n/'
-		# this slows down networking in general
-		-e 's/CONFIG_IP_FIB_TRIE_STATS=y/CONFIG_IP_FIB_TRIE_STATS=n/'
-		# include font for normal and hidpi screens
-		-e 's/.*CONFIG_FONTS.*/CONFIG_FONTS=y\nCONFIG_FONT_8x16=y\nCONFIG_FONT_TER16x32=y/'
-		# we don't need to actually install system headers from this ebuild
-		-e '/CONFIG_HEADERS_INSTALL/d'
-		# enable /proc/config.gz, used by linux-info.eclass
-		-e '/CONFIG_IKCONFIG/s:.*:CONFIG_IKCONFIG=y\nCONFIG_IKCONFIG_PROC=y:'
-	)
-	use debug || config_tweaks+=(
-		-e '/CONFIG_DEBUG_INFO/d'
-		-e '/CONFIG_DEBUG_RODATA_TEST/d'
-		-e '/CONFIG_DEBUG_VM/d'
-		-e '/CONFIG_DEBUG_SHIRQ/d'
-		-e '/CONFIG_DEBUG_LIST/d'
-		-e '/CONFIG_BUG_ON_DATA_CORRUPTION/d'
-		-e '/CONFIG_TORTURE_TEST/d'
-		-e '/CONFIG_BOOTTIME_TRACING/d'
-		-e '/CONFIG_RING_BUFFER_BENCHMARK/d'
-		-e '/CONFIG_X86_DECODER_SELFTEST/d'
-		-e '/CONFIG_KGDB/d'
-	)
-	sed -i "${config_tweaks[@]}" .config || die
-}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.8.18.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.8.18.ebuild
deleted file mode 100644
index d59b9d257458..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.8.18.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build verify-sig
-
-MY_P=linux-${PV}
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.8.5
-CONFIG_HASH=af8da8d54d21231fd8c7b943216bb985f0a4e223
-
-DESCRIPTION="Linux kernel built from vanilla upstream sources"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	verify-sig? (
-		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
-	)
-	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 ~ppc64 ~x86"
-IUSE="debug"
-REQUIRED_USE="
-	arm? ( savedconfig )"
-
-RDEPEND="
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/dwarves )
-	verify-sig? ( app-crypt/openpgp-keys-kernel )"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
-
-pkg_pretend() {
-	ewarn "Starting with 5.7.9, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_unpack() {
-	if use verify-sig; then
-		einfo "Unpacking linux-${PV}.tar.xz ..."
-		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
-			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
-		assert "Unpack failed"
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	default
-
-	# 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
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	local config_tweaks=(
-		# replace (none) with gentoo
-		-e 's:^CONFIG_DEFAULT_HOSTNAME=:&"gentoo":'
-		# we do support x32
-		-e '/CONFIG_X86_X32/s:.*:CONFIG_X86_X32=y:'
-		# disable signatures
-		-e '/CONFIG_MODULE_SIG/d'
-		-e '/CONFIG_SECURITY_LOCKDOWN/d'
-		-e '/CONFIG_KEXEC_SIG/d'
-		-e '/CONFIG_KEXEC_BZIMAGE_VERIFY_SIG/d'
-		-e '/CONFIG_SYSTEM_EXTRA_CERTIFICATE/d'
-		-e '/CONFIG_SIGNATURE/d'
-		# remove massive array of LSMs
-		-e 's/CONFIG_LSM=.*/CONFIG_LSM="yama"/'
-		-e 's/CONFIG_DEFAULT_SECURITY_SELINUX=y/CONFIG_DEFAULT_SECURITY_DAC=y/'
-		# nobody actually wants fips
-		-e '/CONFIG_CRYPTO_FIPS/d'
-		# these tests are really not necessary
-		-e 's/.*CONFIG_CRYPTO_MANAGER_DISABLE_TESTS.*/CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y/'
-		# probably not needed by anybody but developers
-		-e '/CONFIG_CRYPTO_STATS/d'
-		# 1000hz is excessive for laptops
-		-e 's/CONFIG_HZ_1000=y/CONFIG_HZ_300=y/'
-		# nobody is using this kernel on insane super computers
-		-e 's/CONFIG_NR_CPUS=.*/CONFIG_NR_CPUS=512/'
-		# we're not actually producing live patches for folks
-		-e 's/CONFIG_LIVEPATCH=y/CONFIG_LIVEPATCH=n/'
-		# this slows down networking in general
-		-e 's/CONFIG_IP_FIB_TRIE_STATS=y/CONFIG_IP_FIB_TRIE_STATS=n/'
-		# include font for normal and hidpi screens
-		-e 's/.*CONFIG_FONTS.*/CONFIG_FONTS=y\nCONFIG_FONT_8x16=y\nCONFIG_FONT_TER16x32=y/'
-		# we don't need to actually install system headers from this ebuild
-		-e '/CONFIG_HEADERS_INSTALL/d'
-		# enable /proc/config.gz, used by linux-info.eclass
-		-e '/CONFIG_IKCONFIG/s:.*:CONFIG_IKCONFIG=y\nCONFIG_IKCONFIG_PROC=y:'
-	)
-	use debug || config_tweaks+=(
-		-e '/CONFIG_DEBUG_INFO/d'
-		-e '/CONFIG_DEBUG_RODATA_TEST/d'
-		-e '/CONFIG_DEBUG_VM/d'
-		-e '/CONFIG_DEBUG_SHIRQ/d'
-		-e '/CONFIG_DEBUG_LIST/d'
-		-e '/CONFIG_BUG_ON_DATA_CORRUPTION/d'
-		-e '/CONFIG_TORTURE_TEST/d'
-		-e '/CONFIG_BOOTTIME_TRACING/d'
-		-e '/CONFIG_RING_BUFFER_BENCHMARK/d'
-		-e '/CONFIG_X86_DECODER_SELFTEST/d'
-		-e '/CONFIG_KGDB/d'
-	)
-	sed -i "${config_tweaks[@]}" .config || die
-}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.9.1.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.9.1.ebuild
deleted file mode 100644
index ccd3e3d3e79d..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.9.1.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build
-
-MY_P=linux-${PV}
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.9.0
-CONFIG_HASH=aa6d9438d030fa4682d5d450481085c901503da5
-
-DESCRIPTION="Linux kernel built from vanilla upstream sources"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	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 ~ppc64 ~x86"
-IUSE="debug"
-REQUIRED_USE="
-	arm? ( savedconfig )"
-
-RDEPEND="
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/dwarves )"
-
-pkg_pretend() {
-	ewarn "Starting with 5.7.9, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_prepare() {
-	default
-
-	# 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
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	local config_tweaks=(
-		# replace (none) with gentoo
-		-e 's:^CONFIG_DEFAULT_HOSTNAME=:&"gentoo":'
-		# we do support x32
-		-e '/CONFIG_X86_X32/s:.*:CONFIG_X86_X32=y:'
-		# disable signatures
-		-e '/CONFIG_MODULE_SIG/d'
-		-e '/CONFIG_SECURITY_LOCKDOWN/d'
-		-e '/CONFIG_KEXEC_SIG/d'
-		-e '/CONFIG_KEXEC_BZIMAGE_VERIFY_SIG/d'
-		-e '/CONFIG_SYSTEM_EXTRA_CERTIFICATE/d'
-		-e '/CONFIG_SIGNATURE/d'
-		# remove massive array of LSMs
-		-e 's/CONFIG_LSM=.*/CONFIG_LSM="yama"/'
-		-e 's/CONFIG_DEFAULT_SECURITY_SELINUX=y/CONFIG_DEFAULT_SECURITY_DAC=y/'
-		# nobody actually wants fips
-		-e '/CONFIG_CRYPTO_FIPS/d'
-		# these tests are really not necessary
-		-e 's/.*CONFIG_CRYPTO_MANAGER_DISABLE_TESTS.*/CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y/'
-		# probably not needed by anybody but developers
-		-e '/CONFIG_CRYPTO_STATS/d'
-		# 1000hz is excessive for laptops
-		-e 's/CONFIG_HZ_1000=y/CONFIG_HZ_300=y/'
-		# nobody is using this kernel on insane super computers
-		-e 's/CONFIG_NR_CPUS=.*/CONFIG_NR_CPUS=512/'
-		# we're not actually producing live patches for folks
-		-e 's/CONFIG_LIVEPATCH=y/CONFIG_LIVEPATCH=n/'
-		# this slows down networking in general
-		-e 's/CONFIG_IP_FIB_TRIE_STATS=y/CONFIG_IP_FIB_TRIE_STATS=n/'
-		# include font for normal and hidpi screens
-		-e 's/.*CONFIG_FONTS.*/CONFIG_FONTS=y\nCONFIG_FONT_8x16=y\nCONFIG_FONT_TER16x32=y/'
-		# we don't need to actually install system headers from this ebuild
-		-e '/CONFIG_HEADERS_INSTALL/d'
-		# enable /proc/config.gz, used by linux-info.eclass
-		-e '/CONFIG_IKCONFIG/s:.*:CONFIG_IKCONFIG=y\nCONFIG_IKCONFIG_PROC=y:'
-	)
-	use debug || config_tweaks+=(
-		-e '/CONFIG_DEBUG_INFO/d'
-		-e '/CONFIG_DEBUG_RODATA_TEST/d'
-		-e '/CONFIG_DEBUG_VM/d'
-		-e '/CONFIG_DEBUG_SHIRQ/d'
-		-e '/CONFIG_DEBUG_LIST/d'
-		-e '/CONFIG_BUG_ON_DATA_CORRUPTION/d'
-		-e '/CONFIG_TORTURE_TEST/d'
-		-e '/CONFIG_BOOTTIME_TRACING/d'
-		-e '/CONFIG_RING_BUFFER_BENCHMARK/d'
-		-e '/CONFIG_X86_DECODER_SELFTEST/d'
-		-e '/CONFIG_KGDB/d'
-	)
-	sed -i "${config_tweaks[@]}" .config || die
-}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.9.2.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.9.2.ebuild
deleted file mode 100644
index 634d6fe9b8ee..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.9.2.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build
-
-MY_P=linux-${PV}
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.9.2
-CONFIG_HASH=94a4277f8827d1b2c911deabe56e7d929dc93146
-
-DESCRIPTION="Linux kernel built from vanilla upstream sources"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	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 ~ppc64 ~x86"
-IUSE="debug"
-REQUIRED_USE="
-	arm? ( savedconfig )"
-
-RDEPEND="
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/dwarves )"
-
-pkg_pretend() {
-	ewarn "Starting with 5.7.9, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_prepare() {
-	default
-
-	# 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
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	local config_tweaks=(
-		# replace (none) with gentoo
-		-e 's:^CONFIG_DEFAULT_HOSTNAME=:&"gentoo":'
-		# we do support x32
-		-e '/CONFIG_X86_X32/s:.*:CONFIG_X86_X32=y:'
-		# disable signatures
-		-e '/CONFIG_MODULE_SIG/d'
-		-e '/CONFIG_SECURITY_LOCKDOWN/d'
-		-e '/CONFIG_KEXEC_SIG/d'
-		-e '/CONFIG_KEXEC_BZIMAGE_VERIFY_SIG/d'
-		-e '/CONFIG_SYSTEM_EXTRA_CERTIFICATE/d'
-		-e '/CONFIG_SIGNATURE/d'
-		# remove massive array of LSMs
-		-e 's/CONFIG_LSM=.*/CONFIG_LSM="yama"/'
-		-e 's/CONFIG_DEFAULT_SECURITY_SELINUX=y/CONFIG_DEFAULT_SECURITY_DAC=y/'
-		# nobody actually wants fips
-		-e '/CONFIG_CRYPTO_FIPS/d'
-		# these tests are really not necessary
-		-e 's/.*CONFIG_CRYPTO_MANAGER_DISABLE_TESTS.*/CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y/'
-		# probably not needed by anybody but developers
-		-e '/CONFIG_CRYPTO_STATS/d'
-		# 1000hz is excessive for laptops
-		-e 's/CONFIG_HZ_1000=y/CONFIG_HZ_300=y/'
-		# nobody is using this kernel on insane super computers
-		-e 's/CONFIG_NR_CPUS=.*/CONFIG_NR_CPUS=512/'
-		# we're not actually producing live patches for folks
-		-e 's/CONFIG_LIVEPATCH=y/CONFIG_LIVEPATCH=n/'
-		# this slows down networking in general
-		-e 's/CONFIG_IP_FIB_TRIE_STATS=y/CONFIG_IP_FIB_TRIE_STATS=n/'
-		# include font for normal and hidpi screens
-		-e 's/.*CONFIG_FONTS.*/CONFIG_FONTS=y\nCONFIG_FONT_8x16=y\nCONFIG_FONT_TER16x32=y/'
-		# we don't need to actually install system headers from this ebuild
-		-e '/CONFIG_HEADERS_INSTALL/d'
-		# enable /proc/config.gz, used by linux-info.eclass
-		-e '/CONFIG_IKCONFIG/s:.*:CONFIG_IKCONFIG=y\nCONFIG_IKCONFIG_PROC=y:'
-	)
-	use debug || config_tweaks+=(
-		-e '/CONFIG_DEBUG_INFO/d'
-		-e '/CONFIG_DEBUG_RODATA_TEST/d'
-		-e '/CONFIG_DEBUG_VM/d'
-		-e '/CONFIG_DEBUG_SHIRQ/d'
-		-e '/CONFIG_DEBUG_LIST/d'
-		-e '/CONFIG_BUG_ON_DATA_CORRUPTION/d'
-		-e '/CONFIG_TORTURE_TEST/d'
-		-e '/CONFIG_BOOTTIME_TRACING/d'
-		-e '/CONFIG_RING_BUFFER_BENCHMARK/d'
-		-e '/CONFIG_X86_DECODER_SELFTEST/d'
-		-e '/CONFIG_KGDB/d'
-	)
-	sed -i "${config_tweaks[@]}" .config || die
-}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.9.3.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.9.3.ebuild
deleted file mode 100644
index 63c2f94bed05..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.9.3.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build verify-sig
-
-MY_P=linux-${PV}
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.9.2
-CONFIG_HASH=94a4277f8827d1b2c911deabe56e7d929dc93146
-
-DESCRIPTION="Linux kernel built from vanilla upstream sources"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	verify-sig? (
-		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
-	)
-	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 ~ppc64 ~x86"
-IUSE="debug"
-REQUIRED_USE="
-	arm? ( savedconfig )"
-
-RDEPEND="
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/dwarves )
-	verify-sig? ( app-crypt/openpgp-keys-kernel )"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
-
-pkg_pretend() {
-	ewarn "Starting with 5.7.9, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_unpack() {
-	if use verify-sig; then
-		einfo "Unpacking linux-${PV}.tar.xz ..."
-		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
-			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
-		assert "Unpack failed"
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	default
-
-	# 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
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	local config_tweaks=(
-		# replace (none) with gentoo
-		-e 's:^CONFIG_DEFAULT_HOSTNAME=:&"gentoo":'
-		# we do support x32
-		-e '/CONFIG_X86_X32/s:.*:CONFIG_X86_X32=y:'
-		# disable signatures
-		-e '/CONFIG_MODULE_SIG/d'
-		-e '/CONFIG_SECURITY_LOCKDOWN/d'
-		-e '/CONFIG_KEXEC_SIG/d'
-		-e '/CONFIG_KEXEC_BZIMAGE_VERIFY_SIG/d'
-		-e '/CONFIG_SYSTEM_EXTRA_CERTIFICATE/d'
-		-e '/CONFIG_SIGNATURE/d'
-		# remove massive array of LSMs
-		-e 's/CONFIG_LSM=.*/CONFIG_LSM="yama"/'
-		-e 's/CONFIG_DEFAULT_SECURITY_SELINUX=y/CONFIG_DEFAULT_SECURITY_DAC=y/'
-		# nobody actually wants fips
-		-e '/CONFIG_CRYPTO_FIPS/d'
-		# these tests are really not necessary
-		-e 's/.*CONFIG_CRYPTO_MANAGER_DISABLE_TESTS.*/CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y/'
-		# probably not needed by anybody but developers
-		-e '/CONFIG_CRYPTO_STATS/d'
-		# 1000hz is excessive for laptops
-		-e 's/CONFIG_HZ_1000=y/CONFIG_HZ_300=y/'
-		# nobody is using this kernel on insane super computers
-		-e 's/CONFIG_NR_CPUS=.*/CONFIG_NR_CPUS=512/'
-		# we're not actually producing live patches for folks
-		-e 's/CONFIG_LIVEPATCH=y/CONFIG_LIVEPATCH=n/'
-		# this slows down networking in general
-		-e 's/CONFIG_IP_FIB_TRIE_STATS=y/CONFIG_IP_FIB_TRIE_STATS=n/'
-		# include font for normal and hidpi screens
-		-e 's/.*CONFIG_FONTS.*/CONFIG_FONTS=y\nCONFIG_FONT_8x16=y\nCONFIG_FONT_TER16x32=y/'
-		# we don't need to actually install system headers from this ebuild
-		-e '/CONFIG_HEADERS_INSTALL/d'
-		# enable /proc/config.gz, used by linux-info.eclass
-		-e '/CONFIG_IKCONFIG/s:.*:CONFIG_IKCONFIG=y\nCONFIG_IKCONFIG_PROC=y:'
-	)
-	use debug || config_tweaks+=(
-		-e '/CONFIG_DEBUG_INFO/d'
-		-e '/CONFIG_DEBUG_RODATA_TEST/d'
-		-e '/CONFIG_DEBUG_VM/d'
-		-e '/CONFIG_DEBUG_SHIRQ/d'
-		-e '/CONFIG_DEBUG_LIST/d'
-		-e '/CONFIG_BUG_ON_DATA_CORRUPTION/d'
-		-e '/CONFIG_TORTURE_TEST/d'
-		-e '/CONFIG_BOOTTIME_TRACING/d'
-		-e '/CONFIG_RING_BUFFER_BENCHMARK/d'
-		-e '/CONFIG_X86_DECODER_SELFTEST/d'
-		-e '/CONFIG_KGDB/d'
-	)
-	sed -i "${config_tweaks[@]}" .config || die
-}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.9.4.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.9.4.ebuild
deleted file mode 100644
index 63c2f94bed05..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.9.4.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build verify-sig
-
-MY_P=linux-${PV}
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.9.2
-CONFIG_HASH=94a4277f8827d1b2c911deabe56e7d929dc93146
-
-DESCRIPTION="Linux kernel built from vanilla upstream sources"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	verify-sig? (
-		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
-	)
-	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 ~ppc64 ~x86"
-IUSE="debug"
-REQUIRED_USE="
-	arm? ( savedconfig )"
-
-RDEPEND="
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/dwarves )
-	verify-sig? ( app-crypt/openpgp-keys-kernel )"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
-
-pkg_pretend() {
-	ewarn "Starting with 5.7.9, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_unpack() {
-	if use verify-sig; then
-		einfo "Unpacking linux-${PV}.tar.xz ..."
-		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
-			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
-		assert "Unpack failed"
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	default
-
-	# 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
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	local config_tweaks=(
-		# replace (none) with gentoo
-		-e 's:^CONFIG_DEFAULT_HOSTNAME=:&"gentoo":'
-		# we do support x32
-		-e '/CONFIG_X86_X32/s:.*:CONFIG_X86_X32=y:'
-		# disable signatures
-		-e '/CONFIG_MODULE_SIG/d'
-		-e '/CONFIG_SECURITY_LOCKDOWN/d'
-		-e '/CONFIG_KEXEC_SIG/d'
-		-e '/CONFIG_KEXEC_BZIMAGE_VERIFY_SIG/d'
-		-e '/CONFIG_SYSTEM_EXTRA_CERTIFICATE/d'
-		-e '/CONFIG_SIGNATURE/d'
-		# remove massive array of LSMs
-		-e 's/CONFIG_LSM=.*/CONFIG_LSM="yama"/'
-		-e 's/CONFIG_DEFAULT_SECURITY_SELINUX=y/CONFIG_DEFAULT_SECURITY_DAC=y/'
-		# nobody actually wants fips
-		-e '/CONFIG_CRYPTO_FIPS/d'
-		# these tests are really not necessary
-		-e 's/.*CONFIG_CRYPTO_MANAGER_DISABLE_TESTS.*/CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y/'
-		# probably not needed by anybody but developers
-		-e '/CONFIG_CRYPTO_STATS/d'
-		# 1000hz is excessive for laptops
-		-e 's/CONFIG_HZ_1000=y/CONFIG_HZ_300=y/'
-		# nobody is using this kernel on insane super computers
-		-e 's/CONFIG_NR_CPUS=.*/CONFIG_NR_CPUS=512/'
-		# we're not actually producing live patches for folks
-		-e 's/CONFIG_LIVEPATCH=y/CONFIG_LIVEPATCH=n/'
-		# this slows down networking in general
-		-e 's/CONFIG_IP_FIB_TRIE_STATS=y/CONFIG_IP_FIB_TRIE_STATS=n/'
-		# include font for normal and hidpi screens
-		-e 's/.*CONFIG_FONTS.*/CONFIG_FONTS=y\nCONFIG_FONT_8x16=y\nCONFIG_FONT_TER16x32=y/'
-		# we don't need to actually install system headers from this ebuild
-		-e '/CONFIG_HEADERS_INSTALL/d'
-		# enable /proc/config.gz, used by linux-info.eclass
-		-e '/CONFIG_IKCONFIG/s:.*:CONFIG_IKCONFIG=y\nCONFIG_IKCONFIG_PROC=y:'
-	)
-	use debug || config_tweaks+=(
-		-e '/CONFIG_DEBUG_INFO/d'
-		-e '/CONFIG_DEBUG_RODATA_TEST/d'
-		-e '/CONFIG_DEBUG_VM/d'
-		-e '/CONFIG_DEBUG_SHIRQ/d'
-		-e '/CONFIG_DEBUG_LIST/d'
-		-e '/CONFIG_BUG_ON_DATA_CORRUPTION/d'
-		-e '/CONFIG_TORTURE_TEST/d'
-		-e '/CONFIG_BOOTTIME_TRACING/d'
-		-e '/CONFIG_RING_BUFFER_BENCHMARK/d'
-		-e '/CONFIG_X86_DECODER_SELFTEST/d'
-		-e '/CONFIG_KGDB/d'
-	)
-	sed -i "${config_tweaks[@]}" .config || die
-}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.9.6.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.9.6.ebuild
deleted file mode 100644
index 63c2f94bed05..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.9.6.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build verify-sig
-
-MY_P=linux-${PV}
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.9.2
-CONFIG_HASH=94a4277f8827d1b2c911deabe56e7d929dc93146
-
-DESCRIPTION="Linux kernel built from vanilla upstream sources"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	verify-sig? (
-		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
-	)
-	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 ~ppc64 ~x86"
-IUSE="debug"
-REQUIRED_USE="
-	arm? ( savedconfig )"
-
-RDEPEND="
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/dwarves )
-	verify-sig? ( app-crypt/openpgp-keys-kernel )"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
-
-pkg_pretend() {
-	ewarn "Starting with 5.7.9, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_unpack() {
-	if use verify-sig; then
-		einfo "Unpacking linux-${PV}.tar.xz ..."
-		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
-			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
-		assert "Unpack failed"
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	default
-
-	# 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
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	local config_tweaks=(
-		# replace (none) with gentoo
-		-e 's:^CONFIG_DEFAULT_HOSTNAME=:&"gentoo":'
-		# we do support x32
-		-e '/CONFIG_X86_X32/s:.*:CONFIG_X86_X32=y:'
-		# disable signatures
-		-e '/CONFIG_MODULE_SIG/d'
-		-e '/CONFIG_SECURITY_LOCKDOWN/d'
-		-e '/CONFIG_KEXEC_SIG/d'
-		-e '/CONFIG_KEXEC_BZIMAGE_VERIFY_SIG/d'
-		-e '/CONFIG_SYSTEM_EXTRA_CERTIFICATE/d'
-		-e '/CONFIG_SIGNATURE/d'
-		# remove massive array of LSMs
-		-e 's/CONFIG_LSM=.*/CONFIG_LSM="yama"/'
-		-e 's/CONFIG_DEFAULT_SECURITY_SELINUX=y/CONFIG_DEFAULT_SECURITY_DAC=y/'
-		# nobody actually wants fips
-		-e '/CONFIG_CRYPTO_FIPS/d'
-		# these tests are really not necessary
-		-e 's/.*CONFIG_CRYPTO_MANAGER_DISABLE_TESTS.*/CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y/'
-		# probably not needed by anybody but developers
-		-e '/CONFIG_CRYPTO_STATS/d'
-		# 1000hz is excessive for laptops
-		-e 's/CONFIG_HZ_1000=y/CONFIG_HZ_300=y/'
-		# nobody is using this kernel on insane super computers
-		-e 's/CONFIG_NR_CPUS=.*/CONFIG_NR_CPUS=512/'
-		# we're not actually producing live patches for folks
-		-e 's/CONFIG_LIVEPATCH=y/CONFIG_LIVEPATCH=n/'
-		# this slows down networking in general
-		-e 's/CONFIG_IP_FIB_TRIE_STATS=y/CONFIG_IP_FIB_TRIE_STATS=n/'
-		# include font for normal and hidpi screens
-		-e 's/.*CONFIG_FONTS.*/CONFIG_FONTS=y\nCONFIG_FONT_8x16=y\nCONFIG_FONT_TER16x32=y/'
-		# we don't need to actually install system headers from this ebuild
-		-e '/CONFIG_HEADERS_INSTALL/d'
-		# enable /proc/config.gz, used by linux-info.eclass
-		-e '/CONFIG_IKCONFIG/s:.*:CONFIG_IKCONFIG=y\nCONFIG_IKCONFIG_PROC=y:'
-	)
-	use debug || config_tweaks+=(
-		-e '/CONFIG_DEBUG_INFO/d'
-		-e '/CONFIG_DEBUG_RODATA_TEST/d'
-		-e '/CONFIG_DEBUG_VM/d'
-		-e '/CONFIG_DEBUG_SHIRQ/d'
-		-e '/CONFIG_DEBUG_LIST/d'
-		-e '/CONFIG_BUG_ON_DATA_CORRUPTION/d'
-		-e '/CONFIG_TORTURE_TEST/d'
-		-e '/CONFIG_BOOTTIME_TRACING/d'
-		-e '/CONFIG_RING_BUFFER_BENCHMARK/d'
-		-e '/CONFIG_X86_DECODER_SELFTEST/d'
-		-e '/CONFIG_KGDB/d'
-	)
-	sed -i "${config_tweaks[@]}" .config || die
-}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.9.7.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.9.7.ebuild
deleted file mode 100644
index 63c2f94bed05..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.9.7.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build verify-sig
-
-MY_P=linux-${PV}
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.9.2
-CONFIG_HASH=94a4277f8827d1b2c911deabe56e7d929dc93146
-
-DESCRIPTION="Linux kernel built from vanilla upstream sources"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	verify-sig? (
-		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
-	)
-	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 ~ppc64 ~x86"
-IUSE="debug"
-REQUIRED_USE="
-	arm? ( savedconfig )"
-
-RDEPEND="
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/dwarves )
-	verify-sig? ( app-crypt/openpgp-keys-kernel )"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
-
-pkg_pretend() {
-	ewarn "Starting with 5.7.9, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_unpack() {
-	if use verify-sig; then
-		einfo "Unpacking linux-${PV}.tar.xz ..."
-		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
-			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
-		assert "Unpack failed"
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	default
-
-	# 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
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	local config_tweaks=(
-		# replace (none) with gentoo
-		-e 's:^CONFIG_DEFAULT_HOSTNAME=:&"gentoo":'
-		# we do support x32
-		-e '/CONFIG_X86_X32/s:.*:CONFIG_X86_X32=y:'
-		# disable signatures
-		-e '/CONFIG_MODULE_SIG/d'
-		-e '/CONFIG_SECURITY_LOCKDOWN/d'
-		-e '/CONFIG_KEXEC_SIG/d'
-		-e '/CONFIG_KEXEC_BZIMAGE_VERIFY_SIG/d'
-		-e '/CONFIG_SYSTEM_EXTRA_CERTIFICATE/d'
-		-e '/CONFIG_SIGNATURE/d'
-		# remove massive array of LSMs
-		-e 's/CONFIG_LSM=.*/CONFIG_LSM="yama"/'
-		-e 's/CONFIG_DEFAULT_SECURITY_SELINUX=y/CONFIG_DEFAULT_SECURITY_DAC=y/'
-		# nobody actually wants fips
-		-e '/CONFIG_CRYPTO_FIPS/d'
-		# these tests are really not necessary
-		-e 's/.*CONFIG_CRYPTO_MANAGER_DISABLE_TESTS.*/CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y/'
-		# probably not needed by anybody but developers
-		-e '/CONFIG_CRYPTO_STATS/d'
-		# 1000hz is excessive for laptops
-		-e 's/CONFIG_HZ_1000=y/CONFIG_HZ_300=y/'
-		# nobody is using this kernel on insane super computers
-		-e 's/CONFIG_NR_CPUS=.*/CONFIG_NR_CPUS=512/'
-		# we're not actually producing live patches for folks
-		-e 's/CONFIG_LIVEPATCH=y/CONFIG_LIVEPATCH=n/'
-		# this slows down networking in general
-		-e 's/CONFIG_IP_FIB_TRIE_STATS=y/CONFIG_IP_FIB_TRIE_STATS=n/'
-		# include font for normal and hidpi screens
-		-e 's/.*CONFIG_FONTS.*/CONFIG_FONTS=y\nCONFIG_FONT_8x16=y\nCONFIG_FONT_TER16x32=y/'
-		# we don't need to actually install system headers from this ebuild
-		-e '/CONFIG_HEADERS_INSTALL/d'
-		# enable /proc/config.gz, used by linux-info.eclass
-		-e '/CONFIG_IKCONFIG/s:.*:CONFIG_IKCONFIG=y\nCONFIG_IKCONFIG_PROC=y:'
-	)
-	use debug || config_tweaks+=(
-		-e '/CONFIG_DEBUG_INFO/d'
-		-e '/CONFIG_DEBUG_RODATA_TEST/d'
-		-e '/CONFIG_DEBUG_VM/d'
-		-e '/CONFIG_DEBUG_SHIRQ/d'
-		-e '/CONFIG_DEBUG_LIST/d'
-		-e '/CONFIG_BUG_ON_DATA_CORRUPTION/d'
-		-e '/CONFIG_TORTURE_TEST/d'
-		-e '/CONFIG_BOOTTIME_TRACING/d'
-		-e '/CONFIG_RING_BUFFER_BENCHMARK/d'
-		-e '/CONFIG_X86_DECODER_SELFTEST/d'
-		-e '/CONFIG_KGDB/d'
-	)
-	sed -i "${config_tweaks[@]}" .config || die
-}