[gentoo-commits] repo/gentoo:master commit in: sys-kernel/vanilla-kernel/

["Michał Górny" <mgorny@gentoo.org>]

commit:     ea5781729f9cf0f3ea9447850eb0f0becc5b07ea
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 28 06:29:54 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Aug 28 06:53:51 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea578172

sys-kernel/vanilla-kernel: Remove old

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

 sys-kernel/vanilla-kernel/Manifest                 |  12 ---
 .../vanilla-kernel/vanilla-kernel-5.10.52.ebuild   | 102 -------------------
 .../vanilla-kernel/vanilla-kernel-5.10.59.ebuild   | 102 -------------------
 .../vanilla-kernel/vanilla-kernel-5.13.11.ebuild   | 102 -------------------
 .../vanilla-kernel/vanilla-kernel-5.13.12.ebuild   | 102 -------------------
 .../vanilla-kernel/vanilla-kernel-5.4.134.ebuild   | 108 ---------------------
 .../vanilla-kernel/vanilla-kernel-5.4.141.ebuild   | 108 ---------------------
 7 files changed, 636 deletions(-)

diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index 2ea4c55c472..65ea881a8cc 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -17,26 +17,14 @@ DIST kernel-x86_64-fedora.config.5.10.12 206357 BLAKE2B 0eda9d4f3f973336cabd67c1
 DIST kernel-x86_64-fedora.config.5.12.5 211204 BLAKE2B 6276cd8eca1d82933cbd3e95608e334730b739936c27a922ac0a7319f64acbe46294c5920b67213b694ff9ccda5b0ca99e6e2519b496e608ddaa35b27e26ed3f SHA512 c6955e7cc1ad874a3af42136b7ed958f04905de8f337d83fc36d59fdde5a469f260f8f29e9f6ac516b3c138679de0e37949b144773e24a4892ebcc8f729845de
 DIST kernel-x86_64-fedora.config.5.13.9 213604 BLAKE2B 9f594a498744e03f8f87bb434d362aeff326b34b1bd4d0a6b0027ec3bd3d15bee554be4883a75d3c19ba2174481f3dfd23bb9d9d713485f6f8474f608515d5e2 SHA512 c11abe0a6a81221bfbd2af0ede4358b464a5bcc72eb46e153ef513b4f7e85e2beb9159234b264e5fccccb8767a89efccc6eb1abcaffcb10f6d3fa5cef6415405
 DIST kernel-x86_64.config.5.4.21 184907 BLAKE2B 0eb2b07c14cea7545350fcdf3a94f2a531f0137c502ebda9299cacf44da5385686e2049b480b28bc153c9d413d453cfe682b9655eefe70428cb720f57c7bd200 SHA512 f3b3ee6841555ac3a9cc11536a7d44e1a5a8df2bab14ba341fda7df1ceb0de45cf1c799a1d54a64f2858fd1272d348bb52cf269ffa396878c5402baf2730237f
-DIST linux-5.10.52.tar.sign 991 BLAKE2B e438edeb31098c0f4ad455ff8814c4a6d4904c786652c6c404e39201c3e78cb6d4a26fe88296980ab40ca3cb769d5f0f08cce67587fae28377db3b4a7f357eb3 SHA512 6d7345a0a959d6101cf12afa6807fb35378d9455a8a09d769090fb9a6d899a1063714c4d72536d9519c37892d13a7fa9f1316518eb1afa633201ee5420da7e64
-DIST linux-5.10.52.tar.xz 116386612 BLAKE2B 60fb5dac282f68a2d8c969616ea391549fffd677a4d96da594fae82d747d2a0d4fe942754cc82c21ead0a2909081c194d33983c2d9f63eb86a9879ad6415862d SHA512 37262e3793ed433ee619e7b08c0ab64d34bbc66e29229025ada498edf45ab2c870569c0a3b17f026379c67153f277e90e1b301c95711638645bde025230201ef
-DIST linux-5.10.59.tar.sign 991 BLAKE2B 9d5e4c4f80a71af3e882bd381d2ee57c76284462b1fe9392208ebf2464af957bd49bcf38d56f7b4a34129bf0bf6ea70451e2966ad153d85bda48c72c179f3115 SHA512 16be8341f0c257aaff4741e9007ab3dea572ffae8a46b68de263285124d6f51f0a7e93bd0fce8c7da850c3d62ae0caf3e50f09dcfebb7c5f9fc545affea156ec
-DIST linux-5.10.59.tar.xz 116403980 BLAKE2B ea6c05bf9d288ed5e1b0d230262e1e0475ffd93da11f0d9014d3e216d33018116cf860182d70f09ede407ff06b75a6b86fdb8db50175f9764fd54cdebcde7d96 SHA512 a0b3b73a51bedb6413c86f416d63e25305116c8bab6ab494d92aad36b7615a50df95c4b43c6f4c4d4a9b808b1e0afc02519382d8bcbf4c48bbba80e753ac617c
 DIST linux-5.10.60.tar.sign 991 BLAKE2B 9c29c9d981e5f8ca8381a3953ed430117380a15505182d7854d681783b29d8ec444e8ce29233b63283c462bf95419e71db9932cd2dc4261321de5d1caf6abbb2 SHA512 8b60c36b97cd427f20e8e82cc63de7346c88a3081e38f4a6e499c53b72d9f2297f1cbbc08e6da112a3f37afaefcaeed22c70e51d7c91ff271a0799e0ecc31b86
 DIST linux-5.10.60.tar.xz 116406216 BLAKE2B 4b7d3cee0055c03ebbd7c79b1d6a6098f25c2205ab8daa1dd8ac416ff8c16f6026099cb906b61bd93ca5ef2b9fcd958a54c76265f61c439cbe5b75c6e3953345 SHA512 d0cc61498eb762e4f1d7408f721b946e0dccf4748905ba7ec320ad6b91a9042fd2e08a4742a3b3766bc1730152eb7e02a71ce64f935ec32384bd0cc1dade6f93
 DIST linux-5.10.61.tar.sign 991 BLAKE2B a5ff9fd5fe3831ae30cd92aa8f92232643fea3b6474e204493af1ace4de910255e8a94988a05274ca7b1342735160dc9ce41a71ce6b168924069f2e7eff843e9 SHA512 0fbf1b1b15ee4d981f0a05d39a3f67a3dcf4d32d61b7bf83d92423bea0ce95e34680130f71f8c12ab738867dc67d7a1f995b79044f0d5fcf87657ae7f2720496
 DIST linux-5.10.61.tar.xz 116400968 BLAKE2B 7513b33472fb0f3cbdaea6fbfd094f325303c407ae15f20f724b0ef07d24a82a1931b5f109dd2a8db9bd3fcbd8103535113693a83dada9420671abafd38b9a12 SHA512 1b3123288b82afe9f760fa5fa19c518c6e7c5ac5640659136a0a3277375ae891ebe85fc52f75acc5cec8be5596adc5adc421aa5445eedca485f0ab24f4abfd8e
 DIST linux-5.12.19.tar.sign 991 BLAKE2B 881e8f5df1f9503e7ba58b84351b2e4f0e90b63df2b14577bc65cca76f72c6a97f8ba2bef87c46a9d88a714bcf010f7b706c1bf57a68896390126c5902710a1f SHA512 fafe83c82fb1c7f67bcf8402fe4eb3363087324c7ab11ff15892021737685d945fc2ccefa78088f2645570bd763a6d7d846d7c1ff4f998d9af92f5f3e35cba48
 DIST linux-5.12.19.tar.xz 118204168 BLAKE2B 88e4c32cf196662a6a24e72b978019d6f8881a8523918029f4229a995c5fd957a5e01f42de9f53c7980df7e3de5ea6b069cc2c5f93852e615fe8fe78a1b131c6 SHA512 2d010d6d75052083300b1a629dbec25a39f6314a1871ed355133bb59946453915a2265f4ba26e60119ee0d05abb9859c5ee7d8fb8dd816c476ebfdb76d3399ef
-DIST linux-5.13.11.tar.sign 991 BLAKE2B aca5b5f10711842ca5f6c7d4a81eb83414d99dcbeec6944a2fe74d0488acfabd0f538b9432b884d52f7a8f18f3277c494e106e1ab6e009b2bae51ae7173ddb7b SHA512 2cfc7a3a464796b4fa376bc908e95e4435e4073ab3d532f4cfbc252eb75699524c079ca7af63bb4c301819ab3afd57524ad5e46bd7121c491ab8cf22f72ee3b9
-DIST linux-5.13.11.tar.xz 119350296 BLAKE2B c266ced0839680fffee79b2d75fa119dcb54df1cb4253b14ca246f25e8dfa9b6ff579e4d4e67c7d9ce9d52c960f1ba22243bf576f87db5a41fb808d77777c7b4 SHA512 3918f81128a312d4bc469a7dda7cc7b5cf74d3469428425c41840e729f5f1720bf79d764e7e751a00ccd5917b29da7d6575fc5fcfdd5bba118b10d94919d0b9a
-DIST linux-5.13.12.tar.sign 991 BLAKE2B dcb45b016d88f80db8b0844d09285f1c6ee884dd886582a8f39fe71b2eef6b1fadd002d341575cffc5f554242581bc34ce57455ee81bcfb323e7b165e4e63081 SHA512 fc1e0d8b0b1c00c21ec41ad112e1e78d17ac9c45b4c46a0bda47b5170f3fba61c9b7a48b2d8cb8a8ce8d8087a65668712d6e29e6234fd7a8b5dc9c552fceefa8
-DIST linux-5.13.12.tar.xz 119341264 BLAKE2B c00bb23827047e4c05f2ed7f2a28b95cbd94665d675ef84c165323d2d452a5fb1bdf250dd2cc628c349a6861964dbf6165d86011b11fd31e212d25a45f73d63a SHA512 b01fc715197b1d00647d1602e5d965c788575ed0fc2c641fb237c4bf1c68b252e427fdffeda941b62fed2b78f57b9984d1f57a729f64feabe2469b959143236c
 DIST linux-5.13.13.tar.sign 991 BLAKE2B a5f1e6ccba62297a46d60f8c33539aa04737c131dc98b72d7594597464ef6ae85adbe9a408febb9513413b293bb9601ddf864e8aa8eab34b2183f53216deb6b3 SHA512 c6d7d3e2a35f4d753f9898300cbfe5e250790dc7a12cbcf6968be15d372565a0c2952ebda82ff2870520d6e682a3e7354d726f2ade59549d3b2129857629a67d
 DIST linux-5.13.13.tar.xz 119340816 BLAKE2B c763adef68a11c42a6e9435522300c5327a9dd3c8b25f1c41e0fdc536e224aac83dbb13d86bb52973304520f1cc28c4c9158baddf6087af54b1e5fbe010be485 SHA512 67c3d0ef8fc378616a318a0d6796acf839dcda4accee3dc815c0f0697694cf178474fe15d98fa9bb7871dfa353aee416212430be5af85bf74647e3968b5c1b71
-DIST linux-5.4.134.tar.sign 991 BLAKE2B d5b705ecf03edfac4274ee6a3d8930e1e022d8e19970822822ac7e75d0ec97a3d50d1c3f2057ecbcd12fd8078a00a314bb8991c4f043ca5cb1db94c53a3264e7 SHA512 cb312e065218605520c8e445032bfde209cb941945947988369e6fdb9900c6843aefd03dcb3c913f8b7a59ad588b7dcea86ccae1aae29566579a19285f4a84a6
-DIST linux-5.4.134.tar.xz 109136880 BLAKE2B c9bfcfdbd6e30fc265cbc16eec5f0014acf8c63cf8271d6a436c1da5126013fbb2b08de2e552707203cc50e8991d9aa78ca8cc7ed67ddf20e3d2d08b825a4659 SHA512 7b5faa3f1c64d2b270f93416b5031407aa3181ee8029f3a576c8f09ac034fd0771f362068c41bbbb546d14b1d389042e8cb940f493d2ff9e3e4173cba1633c93
-DIST linux-5.4.141.tar.sign 991 BLAKE2B 0abf2870a1a4103753e20062371305d691057b63a03dc4bce5cad6a1afa20bfdebe43317a166597afb66d5ef234dfbe8b5e63584152b5af8076ac4401188fbb7 SHA512 2208f80cb39819dea5151144fc44a2d87b2f143479865ac0acf341fabeaa569258d982ba71c1753703865383db085ad437d22bcafa179a8dd1e43ddb5ce285d1
-DIST linux-5.4.141.tar.xz 109156968 BLAKE2B e4f99e256b9fde7b65146d95a3a7a027cd1954ff07a9b5828fe1cdf916a40f775bc5c90d24081d34b3d39c04fe50481ee4cf909178dd2026873b72734bd15a43 SHA512 267011d5c4dcaa8118dae0894d14725cbefd936f7e66f2fedeefcb33a9baf4033d964536f3733ada35227995e5f7cdfbc6375a7bcb32fe75bf54c6576ae178f6
 DIST linux-5.4.142.tar.sign 991 BLAKE2B 2d441365323df4e0ed023917a5d9eeff671e29d1afef32813d6ff4cf554a191237e27acc1c1192817007a262bc8e5d8f42d7aa14ff0add7cdbd656fb20cecdcb SHA512 728a40e0cee11d6300ee3b1f13b329496de0d5e31872dc8335169396b077678c8bde4361c5fbdad3e54f8761dca507cea71bf8cbf5ea675c9c8d7b055c073e2c
 DIST linux-5.4.142.tar.xz 109145144 BLAKE2B 680d4a81fb20005d39dd6d1b512b0e744cc7d6fcdb45e6d67c166d7ca7dff83acd49cb14fa4a38369d77bc91cac0b36190a5b1f042495c40fee9b5e7ecfb2dd2 SHA512 fb9b9f345bb1d46e48adbaac7b12ace50f279451793ac3671b007447d3e38a59d9b9ecbc55866fa2a6850babfcd1ef7528234f2ad73e68845a858b3b7a1d573c
 DIST linux-5.4.143.tar.sign 991 BLAKE2B 4d2d5f6cd7c78234e074d59a004b1a96f86746a9b692d7acfa8afe6ce5bd40a02c86c7e53d2749c71956b7a5862bb0d4f46b79b1a6211e93028b53728db4b477 SHA512 f8fde6c2b06c3a7ab9b375f90177e1809460514a95bb78c1533bc55df00b80e09c87145b67d5ea336dc3d25fb9406d7b6818695de1ce0ed1ead60fd3df3173a5

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.52.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.52.ebuild
deleted file mode 100644
index 12c958a4bb2..00000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.52.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 2020-2021 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.10.12
-CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530
-GENTOO_CONFIG_VER=5.10.32
-
-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
-	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
-		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
-	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/pahole )
-	verify-sig? ( app-crypt/openpgp-keys-kernel )"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
-
-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"
-		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
-	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
-
-	echo 'CONFIG_LOCALVERSION="-dist"' > "${T}"/version.config || die
-	local merge_configs=(
-		"${T}"/version.config
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
-	)
-	use debug || merge_configs+=(
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
-	)
-	kernel-build_merge_configs "${merge_configs[@]}"
-}

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.59.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.59.ebuild
deleted file mode 100644
index 12c958a4bb2..00000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.59.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 2020-2021 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.10.12
-CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530
-GENTOO_CONFIG_VER=5.10.32
-
-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
-	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
-		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
-	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/pahole )
-	verify-sig? ( app-crypt/openpgp-keys-kernel )"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
-
-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"
-		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
-	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
-
-	echo 'CONFIG_LOCALVERSION="-dist"' > "${T}"/version.config || die
-	local merge_configs=(
-		"${T}"/version.config
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
-	)
-	use debug || merge_configs+=(
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
-	)
-	kernel-build_merge_configs "${merge_configs[@]}"
-}

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.13.11.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.13.11.ebuild
deleted file mode 100644
index c39db41a95b..00000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.13.11.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 2020-2021 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.13.9
-CONFIG_HASH=eb52b35e8cb097413357b578903bd18eb76051c0
-GENTOO_CONFIG_VER=5.13.4
-
-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
-	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
-		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
-	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/pahole )
-	verify-sig? ( app-crypt/openpgp-keys-kernel )"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
-
-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"
-		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
-	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
-
-	echo 'CONFIG_LOCALVERSION="-dist"' > "${T}"/version.config || die
-	local merge_configs=(
-		"${T}"/version.config
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
-	)
-	use debug || merge_configs+=(
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
-	)
-	kernel-build_merge_configs "${merge_configs[@]}"
-}

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.13.12.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.13.12.ebuild
deleted file mode 100644
index c39db41a95b..00000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.13.12.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 2020-2021 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.13.9
-CONFIG_HASH=eb52b35e8cb097413357b578903bd18eb76051c0
-GENTOO_CONFIG_VER=5.13.4
-
-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
-	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
-		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
-	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/pahole )
-	verify-sig? ( app-crypt/openpgp-keys-kernel )"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
-
-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"
-		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
-	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
-
-	echo 'CONFIG_LOCALVERSION="-dist"' > "${T}"/version.config || die
-	local merge_configs=(
-		"${T}"/version.config
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
-	)
-	use debug || merge_configs+=(
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
-	)
-	kernel-build_merge_configs "${merge_configs[@]}"
-}

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.134.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.134.ebuild
deleted file mode 100644
index dc33930084a..00000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.134.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 2020-2021 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
-GENTOO_CONFIG_VER=5.4.114
-
-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
-	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
-		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
-	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/pahole )
-	verify-sig? ( app-crypt/openpgp-keys-kernel )"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-
-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"
-		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
-	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
-
-	echo 'CONFIG_LOCALVERSION="-dist"' > "${T}"/version.config || die
-	local merge_configs=(
-		"${T}"/version.config
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
-	)
-	use debug || merge_configs+=(
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
-	)
-	[[ ${ARCH} == x86 ]] && merge_configs+=(
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/32-bit.config
-	)
-
-	kernel-build_merge_configs "${merge_configs[@]}"
-}

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.141.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.141.ebuild
deleted file mode 100644
index dc33930084a..00000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.141.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 2020-2021 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
-GENTOO_CONFIG_VER=5.4.114
-
-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
-	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
-		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
-	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/pahole )
-	verify-sig? ( app-crypt/openpgp-keys-kernel )"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-
-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"
-		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
-	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
-
-	echo 'CONFIG_LOCALVERSION="-dist"' > "${T}"/version.config || die
-	local merge_configs=(
-		"${T}"/version.config
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
-	)
-	use debug || merge_configs+=(
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
-	)
-	[[ ${ARCH} == x86 ]] && merge_configs+=(
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/32-bit.config
-	)
-
-	kernel-build_merge_configs "${merge_configs[@]}"
-}