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

[Michał Górny]

commit:     fbefab35c7079fb7307c1872c066da9106d7f6d8
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 22 11:53:01 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Dec 22 11:53:01 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fbefab35

sys-kernel/vanilla-kernel: Remove old

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

 sys-kernel/vanilla-kernel/Manifest                 |   8 --
 .../vanilla-kernel/vanilla-kernel-5.10.84.ebuild   | 125 --------------------
 .../vanilla-kernel/vanilla-kernel-5.10.86.ebuild   | 130 ---------------------
 .../vanilla-kernel/vanilla-kernel-5.15.9.ebuild    | 129 --------------------
 .../vanilla-kernel/vanilla-kernel-5.4.164.ebuild   | 102 ----------------
 5 files changed, 494 deletions(-)

diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index cf62fdfb1ee1..70d1c26ad32e 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -17,22 +17,14 @@ DIST kernel-x86_64-fedora.config.5.10.12 206357 BLAKE2B 0eda9d4f3f973336cabd67c1
 DIST kernel-x86_64-fedora.config.5.14.20 220444 BLAKE2B 7cd8a820ce47d8f9fa6271df0ed4330cdf43345676a5baadd6d32da22f7962bd4fc0ea436e0e86a82e1a35d585b509379e6c40d6a0065b44839e6db76c3950ff SHA512 3229eeaebd52a8f57790c23c8ac027a2cce3eb43a8ef9b6cb8e54cd8b24405dc31d203a81188dbfb4bade814adffba471051f434e2b947f3cce1fda5645e489c
 DIST kernel-x86_64-fedora.config.5.15.7 223682 BLAKE2B 6198dec51d2a473b5eba319383a00d0b640267b778bd291af992a67122a7d1bfcc1991a56c42e59ded64503e445baeca753cbde5ca4910b3cc4644819137f8bb SHA512 d73848535baa276a129ac5f0674dba24eca7bb56a8195d24cb1bdf6c68f17e8a1734dd67636ab73c103c2a42de1e7a9692c7f816406b1280ffaebc93cb465c5d
 DIST kernel-x86_64.config.5.4.21 184907 BLAKE2B 0eb2b07c14cea7545350fcdf3a94f2a531f0137c502ebda9299cacf44da5385686e2049b480b28bc153c9d413d453cfe682b9655eefe70428cb720f57c7bd200 SHA512 f3b3ee6841555ac3a9cc11536a7d44e1a5a8df2bab14ba341fda7df1ceb0de45cf1c799a1d54a64f2858fd1272d348bb52cf269ffa396878c5402baf2730237f
-DIST linux-5.10.84.tar.sign 991 BLAKE2B 26c63b10c0cbc91753a31bbcee350aa5208a0d6ab02ab0e85ee9c3d02da7014e5f23328e0a42d6b43a5f41cc28d5bf86762ed05e7c589686df44ed56c697bf52 SHA512 2c586585ba113737f3f7539f389018b7215f0e9d37df49a25cdd29270773a95ce25120dcba949a339905da0408fa345717dd04952f70393f393f74917b131e30
-DIST linux-5.10.84.tar.xz 116471800 BLAKE2B 6ae790887669980cfc545e88f87033f42f97efa353e0e429498edd7804c767c9b70f4bf30ae9de5e9ebfbb8f1f7b947cee560c2eb3199676be11edaf5adbf559 SHA512 33ac25c433c212fe5a43fc97ed01b67b638cf55144713780039d027c8475dd0e16f6a1c596dfac7e3699fc4a0156462664a2baf790a9d5aa45872a463fe5c1c0
 DIST linux-5.10.85.tar.sign 991 BLAKE2B a15ca5ba6b75d8ab118c7c578a33d47224f9b2c9382190ca1656c66e5391b6865c7a88cd33f6e28f0e905ac40995992c7d356fc666f692355bdf8dfb603d8fcd SHA512 6142795d2e689a4a4140122ec1559db02e78fd6c766e9d3ac4bafbbde2b4ab12bfeb7b6d7be91ce19b6e04e488eb15b90f3f56f83e2c999b7b64d37b7867bea8
 DIST linux-5.10.85.tar.xz 116476312 BLAKE2B 629b8423f29454b25a76165933ff82a50d8d80826465529814465862869a0721775f344c738731cc3895cad11043efdf76ed909c1db5782f55c608599a118064 SHA512 9c8d9fc12c48c7c1c4691ca95de4f06c148686618013546d848a3d463261961e473ac9abe909ba3b79d1bbd5291153c797cde577b10990c825ab14cc1ee0c21c
-DIST linux-5.10.86.tar.sign 991 BLAKE2B 94e8b69fd6132c0265c0352e462fba2765ecf237891b89f98acd8af544048f89ddc14235878dc5c42b87b53649f86be6301e58b3b4e3489eb9ba3762ad79a512 SHA512 b0b21ee58ccb91b469590c9ca69f87bab3291df3ed99bd5db0c0512bec650e02634c616cc3579ea05b5f76695cffa7a237b7674abfd09cfa2ee176bb3294d1c2
-DIST linux-5.10.86.tar.xz 116476576 BLAKE2B 9a0a55a922f3fb14d39bff0ac1175664f4557534e0432425b6e6efba78b6b601df4e202efea119f919d3d81d58e6d6edbe903fdf0875925889cbf78fbc7f0ae2 SHA512 55c35f56dfffc4c05acb36cb02d0c444095ce50f09c46a68f94edf45a78de246c62d03786b36c6a55fa9378be2f62bf87d4b366c45d296facd0298bd3212b7b5
 DIST linux-5.10.87.tar.sign 991 BLAKE2B 757d7e7869bbb45994fa77cf6ad97be184abbe7060e09d80b41ae224f44504e350ced5c11614f7708960f10b6b2b77ca8b74d056436617a32e3f25f020bfbf0d SHA512 52a1f21ca87ffc86f8886814457987b35fd7b515611367c24a08c536788522a8a74caeb9b2130f28f52df02a5985f85a08eb5c95b1e64eedb76aba37f4e04fa8
 DIST linux-5.10.87.tar.xz 116483412 BLAKE2B c9a624641fad9c48289db27d35a4ce8afe2ad70287deea308a4a20abd0fba1247ba2985ba2c7bfa2f894e3b834510feb1f35f062788c093f629803faaa1cef4a SHA512 97fe37bd52d7d02519ed06737e94a5fcefff944e26e69b90abc4a7ee91fce031ad0778b0211365c225da57a2eb1bbc0236cb3482635137149ad5c5a2bf22e382
 DIST linux-5.14.21.tar.sign 991 BLAKE2B 159182d90911e738c0693c839441f679b66fa3e75c61bb55251552b1ebb7bf6ad018d66d0a83a8f88935b88c1f39fea1207a94f3fd4af3d1e5d148cf9293baf9 SHA512 1c2639bfec52b2f8cfc69504b7f474d1d7a96dc1793e8cd77a6160718a5f381c5e57e42339bd5361e83b86c84cda2500d18615bfc210bbe989c0560b275f4918
 DIST linux-5.14.21.tar.xz 120726436 BLAKE2B ced805df81421f328e2e08d50a33bf6ba54092e95c84d7c1c8ec25ad909c183f82c9966a074c274dd0d13b069b87c12c6f6d5593faf3c0813c4369f90fc4a24f SHA512 0f428cb7273de5b440b610b1a3709563e4ed955afb4df084750a8b43c45e5b000a5906780ff7079a8324fac0a8b7ecace778ab8bbf0511fba92d4dad160d7f87
 DIST linux-5.15.10.tar.sign 991 BLAKE2B 22e5f6b14793a97fcdf0b7f1e109d726cf541dccfb27c44fae4f39b76b4ffad2834171fd40e803bcad1a2a7ce6fc5a6754c7e1387e65991043d679619095915d SHA512 2580426744f80d756a57566fef7cd0d410e85c69514fcd1986dd40b82743342cb7ce0dbae0e8de56d8393037534cf5c8af6cc70f750b71b44a6204731c9c50c9
 DIST linux-5.15.10.tar.xz 121948408 BLAKE2B a21e5a965c0a4fe2e014961a6cc8f4c621fd9313a4b170f97fd3f77ae2494e721bf579e68d5836c167ed9fb6674784b20722501f6adc44d634073e74a82da765 SHA512 cd57fcb1e10ab380d3e9f99b46f3bd38bd4a05e00f53655f5a1a644da2612c9ec2dbc87fa3f87f06f1ef334f6e669025e8f144a11e9a4d64184f60e922b269f9
-DIST linux-5.15.9.tar.sign 989 BLAKE2B 144881cdc74ab178e4f6dd85f46ae24e0b2a7a75141bb1d0f733a67eb101704a3f9b39286fe59d24df5abe0eb6940caf2a5ee0f8440097d5d865744fc7bcaeac SHA512 7e66ff01b20261f56ee3f0833ec5d7da071a43aaf4ac8c13d9bd94fec8097f1845128e630548b80f325c00fbf738af5e5f617d53c9531eda713f77578321b6bd
-DIST linux-5.15.9.tar.xz 121937348 BLAKE2B 41f251bdc4d0bfae6739125b03f3d73ec0270a228304987c8ec90af47834d8cb6a1d7cbd3b193fa5f3903144610bf50de3522bd50925e39725a8f36030e4fa5e SHA512 541f6f5c774d3af0c04cc84a95819c2fa543ff912448a6c1483508ba66dc3498b57208cad81aad2936a320a8ddf218a661757ee6e32cdad8d7c5978d9d4366a2
-DIST linux-5.4.164.tar.sign 991 BLAKE2B 59483d1ee9790b771e7d1ffb1d1c3286f3db1d78fdec6eeaf0501748f6d35fefbe3572f9f64924f73dfb50db847392a32e6f9c4b71174b04a3def7757a2c9903 SHA512 d77c0210f03f5dc177f7231f7ce98fabe466eab7d93eb682daf63f72744f88c8d69a85934b1cb16e623c565b2893540fc4129273d4063270a4d7580f4d129e37
-DIST linux-5.4.164.tar.xz 109190032 BLAKE2B 01a65117c237d551c363149504ba690e9ae801fe587d53c24d2b01e4f7b4b264271077a819c6ad772c2f995bf87a242d271a5446d1378d4ac7d81e13caf9da3e SHA512 4a9cb4063707f7bc1a7390ef74f5c8fe4176ef37d3f27ccd97ab40c4935aa746652e93401bd1b1be5b01283b470597e8979fbbdbf6efb726fe3154d3c8fd9eef
 DIST linux-5.4.166.tar.sign 991 BLAKE2B 0051ff905ade9e7c4c5089602f940d643301e6f45ccc460a5c394046280e6dc5e58837d9b30115eb22d5cbcfde89707d1a1d1721f1ca4b7daba5bac465a1b39e SHA512 7469a77ec4006584307a7af780f4737d52b8d8a5f1f039107d2210e8b5aca0fc83b0c9cee9d80dd85db2070fc98837274519bfdcb03d115ad377963184ea83f8
 DIST linux-5.4.166.tar.xz 109194364 BLAKE2B 531351c5ef90466073bdf19ddc4eb7ababb87c8343c10c9c61c236bb96c47524935733d25603781ec4412fedef8fe8ebffcec893b4283fc91181ec3201b29acb SHA512 5550095b77209f33e799ce1fd8d85289ce9b76315e50d3b1216e581457d279c7763df050e8a2e78748de87da4f5aefcdc4e437f3c54ffea86c026a0caa4f08aa
 DIST linux-5.4.167.tar.sign 991 BLAKE2B ba73a1a1aebaa749ba6b1f61fccb03712b7d6f179b125b54436f485c5e7b943157aa6ac86ba0c9277a245539c276901eb5e102ee776cd3f7c4a92db3c721241b SHA512 41ed244c64d402c16bd57afa4746e262e5b1d0329d99f3dccd617af6fbfa43b340fd66789f0816ff4d7c5cbe04173c1ee04bd6c7eeb751049e7272913b3b33c1

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.84.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.84.ebuild
deleted file mode 100644
index 218c0951f106..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.84.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build toolchain-funcs 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.15.5
-
-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 hardened"
-REQUIRED_USE="arm? ( savedconfig )"
-
-RDEPEND="
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/pahole )
-	verify-sig? ( sec-keys/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
-
-	local biendian=false
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			biendian=true
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
-			biendian=true
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	local myversion="-dist"
-	use hardened && myversion+="-hardened"
-	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
-	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
-
-	local merge_configs=(
-		"${T}"/version.config
-		"${dist_conf_path}"/base.config
-	)
-	use debug || merge_configs+=(
-		"${dist_conf_path}"/no-debug.config
-	)
-	if use hardened; then
-		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
-
-		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
-
-		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
-			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
-		fi
-	fi
-
-	# this covers ppc64 and aarch64_be only for now
-	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
-		merge_configs+=( "${dist_conf_path}/big-endian.config" )
-	fi
-
-	kernel-build_merge_configs "${merge_configs[@]}"
-}

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.86.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.86.ebuild
deleted file mode 100644
index ee6eb2c658fe..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.86.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build toolchain-funcs 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.15.5
-
-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 ~ppc ~ppc64 ~x86"
-IUSE="debug hardened"
-REQUIRED_USE="arm? ( savedconfig )"
-
-RDEPEND="
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/pahole )
-	verify-sig? ( sec-keys/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
-
-	local biendian=false
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			biendian=true
-			;;
-		ppc)
-			# assume powermac/powerbook defconfig
-			# we still package.use.force savedconfig
-			cp "${WORKDIR}"/linux-*/arch/powerpc/configs/pmac32_defconfig .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
-			biendian=true
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	local myversion="-dist"
-	use hardened && myversion+="-hardened"
-	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
-	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
-
-	local merge_configs=(
-		"${T}"/version.config
-		"${dist_conf_path}"/base.config
-	)
-	use debug || merge_configs+=(
-		"${dist_conf_path}"/no-debug.config
-	)
-	if use hardened; then
-		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
-
-		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
-
-		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
-			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
-		fi
-	fi
-
-	# this covers ppc64 and aarch64_be only for now
-	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
-		merge_configs+=( "${dist_conf_path}/big-endian.config" )
-	fi
-
-	kernel-build_merge_configs "${merge_configs[@]}"
-}

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.9.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.9.ebuild
deleted file mode 100644
index 1f45374d8606..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.9.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build toolchain-funcs verify-sig
-
-MY_P=linux-${PV}
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.15.7
-CONFIG_HASH=75f4ca5dedd2fedad91907906fec606a61c4046b
-GENTOO_CONFIG_VER=5.15.5
-
-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 ~ppc ~ppc64 ~x86"
-IUSE="debug hardened"
-REQUIRED_USE="arm? ( savedconfig )"
-
-RDEPEND="
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/pahole )
-	verify-sig? ( sec-keys/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
-
-	local biendian=false
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			biendian=true
-			;;
-		ppc)
-			# assume powermac/powerbook defconfig
-			# we still package.use.force savedconfig
-			cp "${WORKDIR}"/linux-*/arch/powerpc/configs/pmac32_defconfig .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
-			biendian=true
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	local myversion="-dist"
-	use hardened && myversion+="-hardened"
-	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
-	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
-
-	local merge_configs=(
-		"${T}"/version.config
-		"${dist_conf_path}"/base.config
-	)
-	use debug || merge_configs+=(
-		"${dist_conf_path}"/no-debug.config
-	)
-	if use hardened; then
-		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
-
-		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
-
-		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
-			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
-		fi
-	fi
-
-	# this covers ppc64 and aarch64_be only for now
-	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
-		merge_configs+=( "${dist_conf_path}/big-endian.config" )
-	fi
-
-	kernel-build_merge_configs "${merge_configs[@]}"
-}

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.164.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.164.ebuild
deleted file mode 100644
index 9bff82fb16e3..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.164.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.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? ( sec-keys/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.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[@]}"
-}