sys-kernel/vanilla-kernel: Remove redundant versions

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

15 files changed, 0 insertions, 1114 deletions

diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index ea2fc9042e7b..aec239d62f54 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -7,24 +7,8 @@ DIST kernel-i686.config.5.4.21 183910 BLAKE2B 185126ffb85718bb73761d01683def80b6
 DIST kernel-x86_64-fedora.config.5.7.8 192882 BLAKE2B 23044bd3625d1ced686950c1322e91dd99eddb3128ab830c8862f5c949b66df67bc9ce38b810f4d54a35f9b9f11feb58d01450593ec513e132d789e3a50ac48b SHA512 b7770da1f608e8f0ec227dbeaf66491815e9fc4f8f08f01d2ad5877dd1946e73b315e8834f35cb5fc035fc3ac52ede8365107515d54b0792f326ad937d901625
 DIST kernel-x86_64-fedora.config.5.8.1 200074 BLAKE2B 05673cc7c5ae861faff6e823b8fadb9ce2f00864cc955d78733945abe6fa5842b5b74d0e41129cea92607bd907598b39127740dabd377cb25a2fbbcd54eae8b6 SHA512 c601c380163c66c9e351508dbc7ad3f10214eb04895257f721c808e8fa685770b9c898f48b3b05a5f76832fbf8c91e63278539dd9ef3e2c571997c844ecc7c8b
 DIST kernel-x86_64.config.5.4.21 184907 BLAKE2B 0eb2b07c14cea7545350fcdf3a94f2a531f0137c502ebda9299cacf44da5385686e2049b480b28bc153c9d413d453cfe682b9655eefe70428cb720f57c7bd200 SHA512 f3b3ee6841555ac3a9cc11536a7d44e1a5a8df2bab14ba341fda7df1ceb0de45cf1c799a1d54a64f2858fd1272d348bb52cf269ffa396878c5402baf2730237f
-DIST linux-5.4.15-arch1.amd64.config 241498 BLAKE2B 2ba5eab2455c909878c36c6084718331042d0f6ab42127868ffb1522f4b53de38879e5707328968e943d1fa44cc504626af52b733829e943532931b49a612834 SHA512 582577bfe4139a8f50c5881cd5a9f24dc3da3124e464756f9efc3d39894eac378483d052e1142730585e40a45641166d309b5e1b5e379f4a5ea2d5ebb2d3314b
-DIST linux-5.4.15-arch1.i686.config 241195 BLAKE2B d3332b83a3d57c450bb1d5e85d83c71f3be730a15775b7e1d89cec2d72d28f1921987c63d95fe7bea6778efe0012ece6186449f07f6aca35ccf86805186c0f4c SHA512 187d88bdde7325d46b4bfee8d59ace88ab7dc377606b411e1249f9deee2b571ec42bac52c29d26d67bfadece2e77aad6d5e0255a95a84c200757cb05c69160a1
-DIST linux-5.4.40.tar.xz 109535980 BLAKE2B 4857f032d5333f3c16f0947f51d6fe632527cfd78e6c556b62f5356848ef3280244eef7ffaaa136589b10e151aad3087593f3518fd0fc6958d4647b786401169 SHA512 c8785d30f7b88f3a6e565789974ecf1a055900ab4b66e358070547506aecab57b5d34afb77140cb2aeb803498c407d34f7fc11c29fbba00f6d4dedea8dd8788a
-DIST linux-5.4.52.tar.xz 109563772 BLAKE2B 32995d32bfc9ee5d6a5669941897890fc765765f8a141740486f4ad6000fcdd4e4c7f3e9c8fdc7357fba70947cce99d493e8657321c0c836c4930075eacec7eb SHA512 ed0eac6cc07f9e3bc455c82f1594fb0a5310430d3abc3cc2058e1c75af7608aa1b6f70790573873d7e9e4fafdd17cd0bdd5624c6eed5d51dd1da12a873d78a8e
-DIST linux-5.4.53.tar.xz 109574076 BLAKE2B 3e15c19449149415e560cf2b602fec20d60d2b35187283edb4421e4909c3fc8d9c734eba60e7fcca6f3694feb95246cb7295b57e96773fc8d69b8a5ef14e55be SHA512 bf0c0164969ffe52792c15d24f630cb33cee60801252fb6e45b751f5cf6cf807dc8c97c77caff6fdc53d754b87715f27779978f0f5ecfb83836f9a8342f21615
-DIST linux-5.4.55.tar.xz 109570356 BLAKE2B 87ae06ef810727428acd8d7b823309c71b36d6cbf4614e3230d632aecc74bfc45cc7b363a77062f26073dae3d5199200908e21a64e276bfaa66e71648a3c91fe SHA512 6ce15984395698b28932ab1d66165e491588fd924e4880e4dca2c5665b636fb271b8028dd23354b81640ce7e12989807a71360144cb87708b7f239e021b2b56c
-DIST linux-5.4.56.tar.xz 109571188 BLAKE2B fc5ae5a5e45f8e2582f267b0c0bceaa0e82b2cf4ce3f6823cda7968ba6984b98fed0e70232e7ad0d90b200e1b1c916d40102be62e54ecb99a15e378d1400d2dc SHA512 317bd383bc396b3867aa7ff804c20d72e27dcbbb78d02dc488528e9a25f3aaaa7a91ad1098b5a0e66d9b3290a42758c1d0631518122593aa521450977d6c62c1
-DIST linux-5.4.58.tar.xz 109570484 BLAKE2B 868296844be43f256583b84f32ca44fc3263954bf6830c9bb601c1b70f413ac52f26b82925f0a73a4cd7e6b2070ac20cd097a836603feca18aaa0bb26e8242a6 SHA512 535230c1bd718829efcc78a5f06ba803e182565838ade3628591b5fe2c5ea592ba3245583e6fecc58aef781bbab7069e632e900f0b33474442524d8472acd27b
-DIST linux-5.4.59.tar.xz 109572660 BLAKE2B b12e469150c0e09e090d60e31dfb25d83e3c2d9a0e777f49c3eac57e724bef3076cc57f64c1be6462e1c3db70a9d24d49fd19dc8f9c5f89541c868bc45715a4a SHA512 e09805b83a7f632882b3c4a7900ddb5ed78b8ad51b111387fe9428f404c09a6d01216ff93ac7d96b107a32a07ce675f21757921286ea221d4561745c743bd51d
 DIST linux-5.4.60.tar.xz 109583396 BLAKE2B 1f6296eb9be00329b1eb015eafb4a965c575ded58b8618cfc0af3d15072c424afbbc029fad4d65e0af3bccc5963c4304c14b4a9d4763cfaec9b4596834a0f9b0 SHA512 fb9ebada932c17d0adbc099a1df31a7d97afe3be694665b1f8171e7159bda84a36a435ceecfdce6d492d8e5075ed4253c68029dcdf952e75a3fe7ee36646327b
-DIST linux-5.7.10.tar.xz 112722840 BLAKE2B 5b76a6b99ea0b1e38278db62951147edd2f0dcbc7c28d6fbf955beaa25344c62ee5b4d8c1c80e9e980a44d77b31dfc152b7e1d0fe0e57f5968f25b0d8a6d2dca SHA512 9568f87d593ae56dee4c7b8594f495a9c971558a3c73de8bb27336877bd5e71500ec08d880c5854e52ce338775bb9c30a98c1b9cdb789dbedba95bd3d86362ca
-DIST linux-5.7.12.tar.xz 112734632 BLAKE2B fb8f51e370f420a6f18329945addb05df3c264d06bcd7f03b6a9582ab2a13f843cd3ce99f6ce39546f882775ef473f335185ea54f38aab03e8956ae946f1e28f SHA512 8630936f2ea67fa4eaeea759f91dd71e35c294947ae6f71953ac3d99e5f93971f8c2b9e0eb18b09a35a3993e7ef648ca17160600aa07ea24f3beed44f3ed5a75
-DIST linux-5.7.13.tar.xz 112731816 BLAKE2B 8999dcaa23bf6c07e456b8fcb4b8d07a621737e72eb4f69db02b07bde0a3e73131019751d1c257434ef7380c583a914f5b81d802b82103800f6b44bde0ba4439 SHA512 60af6a81e86f7502b3ab94366107f638ac0656c4cc000d4393ab1b55dae1742cbde161b462a5de504285cd0baad22164dcac52cf38b8a0d98bfd5c638979fd71
-DIST linux-5.7.15.tar.xz 112731908 BLAKE2B d62cb30a94b62f8ef63d20aed5ad734343bda97bcfda72ea6e054622e0beaade87dcd78dee0f6288bbe4babc3e9956f926e89ba0e9c2b64b020d454daab60dc7 SHA512 f66219a6bb75538793005c5c23973ce05feb0acbde10fb87056e780dee4440db84bda4021a104bf9ffa2a86668f553a34be4803273fe5b63881c98c3528de1cb
-DIST linux-5.7.16.tar.xz 112732080 BLAKE2B 578e4e65bd4f96e8a1ab462fd7b6ca5450d7cc51fe24bb9df1d664188a61d755f91185674f9b503051ff771336d2fc75f37f04d0ea93a5f6738556802097f6d9 SHA512 2a923d09f07e637f1196a360ef71c5e4c032c65826ad209344efd4ceeaa4678b72bb98f6f4e49ce0a98f905f99d545eda6551d8b4c56d5f56dcee703b93fbd1e
 DIST linux-5.7.17.tar.xz 112744000 BLAKE2B ef73f9c940d678465d1ff2c4eb880b6878827f563942666aab0fb49be9c24d6a12a78a2c569c9cb35023c82a195945b392ca00a933726701c0cff092f71141b6 SHA512 e4618e3d28882b81699892eb04b266a3e0b508806d02bd9671c84027a5a343535561b7094755ab6358ffd72e9ce5a2296b126ce9218a334b260c31535e2de59f
-DIST linux-5.8.1.tar.xz 114458544 BLAKE2B 40d5bdd654b9c9771c5adca3b068e383390cfd643ad10cbc189b05257c0fe2095c8c76b316430fab8e6adee887ddac31665df8c97c477b73a613669a60d4aad8 SHA512 d294f6d88dca47e3cbedbd0219f2b662572aa0f12fc1913ae79513362cf0932e3a8009c775e5d0d43957dfb1c79f560a38de07fbed169e171f8af25af29b14f5
-DIST linux-5.8.2.tar.xz 114464464 BLAKE2B ee0cc2de6c4046dd5215d4bedf2f1cc7d511d161f8083781953587b05f71445af06070a82ac44db50e72a8be069a4c02d13eca58157e15f601f69769664228ac SHA512 3c82ad4ca86c5ac7864fb12b32de1163143d118e02307f35c3f29f7cf23a3cbb874953c7eff39b7ff6240a6d0cbb7aa3f4a5a833a2eedd08d074c64dd7e2e5b8
 DIST linux-5.8.3.tar.xz 114473912 BLAKE2B 9d2913bbaf4afabd8f654abd0a2a3c62df043a613cbc2518944f5889d1a760ab6401e76d0b67b0cc9fbe05c8a0e280fe9b2ebf125f50ff5962f097956642fd8e SHA512 a23973139bf105e202621f6181be366e1a933aefd1da9a347d3a19c0917ba16dd271b5c8d90a8c527791fb0f7535a1cc1bbecd118598b500c881d16ff7d64157
 DIST tinycorelinux-10.1-amd64.qcow2 16842752 BLAKE2B e013e76503c335739a9623c0901ca791937a0e6b177854535cadec1e2c2cd2df588283ed3128cf652595f32264fbfe5b3bd3a8c97665fd4da344e308535be366 SHA512 c3aeb20ff8769da9211694b7f701907cc7ae7582cdfad2c2fdc008d97ebcbd9dc08245b4e8f8450e1cb304bd705345a11fe79f901a47979fee91443841d55641
 DIST tinycorelinux-10.1-x86.qcow2 14876672 BLAKE2B 3c760eb7438b13261e52ecfaa33a53649ced95f1ab40aae52134b8cdc31a16d7aa0d6a6dd716e268ed148e9d77a10b7c700b141b61d70c82d271ffe88e8e2a3c SHA512 9964538dc42f232a11949f74b61d46422ea5da3bdc253a217119bd0b8a750c40fd2da0b07157067be9ac0226472614f210a1248114df0d331df390979867a895
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.40.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.40.ebuild
deleted file mode 100644
index cc5e365bda59..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.40.ebuild
+++ /dev/null
@@ -1,65 +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://git.archlinux.org/svntogit/packages.git/log/trunk/config?h=packages/linux
-AMD64_CONFIG_VER=5.4.15-arch1
-AMD64_CONFIG_HASH=dc8d69b59a7a529ec5aaeb6b32b16e59a3cc1569
-# https://git.archlinux32.org/packages/log/core/linux/config.i686
-I686_CONFIG_VER=5.4.15-arch1
-I686_CONFIG_HASH=1ad219bd3f0ab439a81ed01fec7660eeea7daa0e
-
-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://git.archlinux.org/svntogit/packages.git/plain/trunk/config?h=packages/linux&id=${AMD64_CONFIG_HASH}
-			-> linux-${AMD64_CONFIG_VER}.amd64.config
-	)
-	x86? (
-		https://git.archlinux32.org/packages/plain/core/linux/config.i686?id=${I686_CONFIG_HASH}
-			-> linux-${I686_CONFIG_VER}.i686.config
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-
-src_prepare() {
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}"/linux-${AMD64_CONFIG_VER}.amd64.config .config || die
-			;;
-		x86)
-			cp "${DISTDIR}"/linux-${I686_CONFIG_VER}.i686.config .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	local config_tweaks=(
-		# shove arch under the carpet!
-		-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'
-		# disable compression to allow stripping
-		-e '/CONFIG_MODULE_COMPRESS/d'
-		# disable gcc plugins to unbreak distcc
-		-e '/CONFIG_GCC_PLUGIN_STRUCTLEAK/d'
-	)
-	sed -i "${config_tweaks[@]}" .config || die
-}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.52.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.52.ebuild
deleted file mode 100644
index 751244a438b1..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.52.ebuild
+++ /dev/null
@@ -1,76 +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}
-	)
-	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 ~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
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	local config_tweaks=(
-		# shove arch under the carpet!
-		-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'
-	)
-	use debug || config_tweaks+=(
-		-e '/CONFIG_DEBUG_INFO/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.53.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.53.ebuild
deleted file mode 100644
index 751244a438b1..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.53.ebuild
+++ /dev/null
@@ -1,76 +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}
-	)
-	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 ~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
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	local config_tweaks=(
-		# shove arch under the carpet!
-		-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'
-	)
-	use debug || config_tweaks+=(
-		-e '/CONFIG_DEBUG_INFO/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.55.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.55.ebuild
deleted file mode 100644
index 751244a438b1..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.55.ebuild
+++ /dev/null
@@ -1,76 +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}
-	)
-	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 ~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
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	local config_tweaks=(
-		# shove arch under the carpet!
-		-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'
-	)
-	use debug || config_tweaks+=(
-		-e '/CONFIG_DEBUG_INFO/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.56.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.56.ebuild
deleted file mode 100644
index 751244a438b1..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.56.ebuild
+++ /dev/null
@@ -1,76 +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}
-	)
-	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 ~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
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	local config_tweaks=(
-		# shove arch under the carpet!
-		-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'
-	)
-	use debug || config_tweaks+=(
-		-e '/CONFIG_DEBUG_INFO/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.58.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.58.ebuild
deleted file mode 100644
index d2655d6349c6..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.58.ebuild
+++ /dev/null
@@ -1,83 +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}
-	)
-	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
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	local config_tweaks=(
-		# shove arch under the carpet!
-		-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'
-	)
-	use debug || config_tweaks+=(
-		-e '/CONFIG_DEBUG_INFO/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.59.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.59.ebuild
deleted file mode 100644
index d2655d6349c6..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.59.ebuild
+++ /dev/null
@@ -1,83 +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}
-	)
-	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
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	local config_tweaks=(
-		# shove arch under the carpet!
-		-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'
-	)
-	use debug || config_tweaks+=(
-		-e '/CONFIG_DEBUG_INFO/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.7.10.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.7.10.ebuild
deleted file mode 100644
index 079fc98c2af1..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.7.10.ebuild
+++ /dev/null
@@ -1,77 +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.7.8
-CONFIG_HASH=14d239184a721485a823f30f5aede1c6190558ad
-
-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}
-	)
-	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 ~x86"
-IUSE="debug"
-REQUIRED_USE="
-	arm? ( savedconfig )
-	arm64? ( 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
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm|arm64)
-			return
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	local config_tweaks=(
-		# shove arch under the carpet!
-		-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'
-	)
-	use debug || config_tweaks+=(
-		-e '/CONFIG_DEBUG_INFO/d'
-	)
-	sed -i "${config_tweaks[@]}" .config || die
-}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.7.12.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.7.12.ebuild
deleted file mode 100644
index 079fc98c2af1..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.7.12.ebuild
+++ /dev/null
@@ -1,77 +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.7.8
-CONFIG_HASH=14d239184a721485a823f30f5aede1c6190558ad
-
-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}
-	)
-	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 ~x86"
-IUSE="debug"
-REQUIRED_USE="
-	arm? ( savedconfig )
-	arm64? ( 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
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm|arm64)
-			return
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	local config_tweaks=(
-		# shove arch under the carpet!
-		-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'
-	)
-	use debug || config_tweaks+=(
-		-e '/CONFIG_DEBUG_INFO/d'
-	)
-	sed -i "${config_tweaks[@]}" .config || die
-}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.7.13.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.7.13.ebuild
deleted file mode 100644
index 079fc98c2af1..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.7.13.ebuild
+++ /dev/null
@@ -1,77 +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.7.8
-CONFIG_HASH=14d239184a721485a823f30f5aede1c6190558ad
-
-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}
-	)
-	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 ~x86"
-IUSE="debug"
-REQUIRED_USE="
-	arm? ( savedconfig )
-	arm64? ( 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
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm|arm64)
-			return
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	local config_tweaks=(
-		# shove arch under the carpet!
-		-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'
-	)
-	use debug || config_tweaks+=(
-		-e '/CONFIG_DEBUG_INFO/d'
-	)
-	sed -i "${config_tweaks[@]}" .config || die
-}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.7.15.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.7.15.ebuild
deleted file mode 100644
index da392ebe6f5e..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.7.15.ebuild
+++ /dev/null
@@ -1,83 +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.7.8
-CONFIG_HASH=14d239184a721485a823f30f5aede1c6190558ad
-
-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}
-	)
-	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 ~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
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	local config_tweaks=(
-		# shove arch under the carpet!
-		-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'
-	)
-	use debug || config_tweaks+=(
-		-e '/CONFIG_DEBUG_INFO/d'
-	)
-	sed -i "${config_tweaks[@]}" .config || die
-}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.7.16.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.7.16.ebuild
deleted file mode 100644
index da392ebe6f5e..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.7.16.ebuild
+++ /dev/null
@@ -1,83 +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.7.8
-CONFIG_HASH=14d239184a721485a823f30f5aede1c6190558ad
-
-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}
-	)
-	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 ~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
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	local config_tweaks=(
-		# shove arch under the carpet!
-		-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'
-	)
-	use debug || config_tweaks+=(
-		-e '/CONFIG_DEBUG_INFO/d'
-	)
-	sed -i "${config_tweaks[@]}" .config || die
-}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.8.1.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.8.1.ebuild
deleted file mode 100644
index 9da43339c7d6..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.8.1.ebuild
+++ /dev/null
@@ -1,83 +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.1
-CONFIG_HASH=47a895f435cccb2cb14eb5d0c52d2f6d4d904907
-
-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}
-	)
-	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 ~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
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	local config_tweaks=(
-		# shove arch under the carpet!
-		-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'
-	)
-	use debug || config_tweaks+=(
-		-e '/CONFIG_DEBUG_INFO/d'
-	)
-	sed -i "${config_tweaks[@]}" .config || die
-}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.8.2.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.8.2.ebuild
deleted file mode 100644
index 9da43339c7d6..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.8.2.ebuild
+++ /dev/null
@@ -1,83 +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.1
-CONFIG_HASH=47a895f435cccb2cb14eb5d0c52d2f6d4d904907
-
-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}
-	)
-	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 ~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
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	local config_tweaks=(
-		# shove arch under the carpet!
-		-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'
-	)
-	use debug || config_tweaks+=(
-		-e '/CONFIG_DEBUG_INFO/d'
-	)
-	sed -i "${config_tweaks[@]}" .config || die
-}