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

[Michał Górny]

commit:     8b20ad5d8c48c71021bfa34c919bef8c6fe57122
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 22 11:52:57 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Dec 22 11:52:57 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b20ad5d

sys-kernel/gentoo-kernel: Remove old

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

 sys-kernel/gentoo-kernel/Manifest                  |   8 --
 .../gentoo-kernel/gentoo-kernel-5.10.84.ebuild     | 119 --------------------
 .../gentoo-kernel/gentoo-kernel-5.10.86.ebuild     | 124 ---------------------
 .../gentoo-kernel/gentoo-kernel-5.15.9.ebuild      | 124 ---------------------
 .../gentoo-kernel/gentoo-kernel-5.4.164.ebuild     |  91 ---------------
 5 files changed, 466 deletions(-)

diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
index 7d4d3e808d08..ef4f60ae21a1 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -1,19 +1,11 @@
-DIST genpatches-5.10-91.base.tar.xz 2708936 BLAKE2B 65251dd2fe437bf95f82ff3c3b82c58a4138a7b1ec84c232f8f80ee1355e61a7bf793e8a59de80bff8caa3a9a7b8d1b0dce990b536515fb2911cb27df67174b4 SHA512 92550863b8232a91b39445b392c6de7471f1f9c9c5fb541858ecd93d283fca2e500e937208d7a3922e8984ed41ec7396339b563c94d31c49c3aa28e4119da906
-DIST genpatches-5.10-91.extras.tar.xz 3844 BLAKE2B caf397547329c9656aea77d1c68bcf73819b2f5bcd5530f728ad315eac86fceaeda88aa1d3fcfad928e7c97f2a7b148c85500574a0a52130c3289a47de140a0b SHA512 ca5fa3a15abf90931b0c6e7eefb3d1253e934d2d71162e057fa99ddfc19524335e34fdbbc83a261ea97debd5051c823aeefc02d6a308eace1b44e9c0c736447f
 DIST genpatches-5.10-92.base.tar.xz 2744152 BLAKE2B 17fb94359b2c2c137093fb7d54a6e85b3a986837f6509a40815582e5e1cfae504b3340281199020388eef0be5406b9b7cdadd6395fc418c968dbbc22093965dc SHA512 53fe7c3b446a4fac5d1d10fe17e124414506c1f5fe53d810085c3f754a44cafbb54f3da7f3fd2000470edf4a834b4433d96c6ef63785b8019533624b46a8f351
 DIST genpatches-5.10-92.extras.tar.xz 3844 BLAKE2B 0adbc9d201b5ef2f9ccca1e05bd2b4d086ceae9545526bf92a5e9704d63827b3df1f0f784155a517c989cb9fc87fa3203cf45cb5cf8212b8b30dc03a318579fb SHA512 1ac5acb0734ce0ed89c0358ba13f14abc54e63ebb20ad7a32b2ab5e7491f26a0f9efccdb9322ae35c8b4dd29e64b9a27892fe04a92938e9b439ea13028a61f79
-DIST genpatches-5.10-93.base.tar.xz 2744560 BLAKE2B 485d90002a0dbd811eae853d5fd080683a915ee064e539432edf8c763ede0af8aab994381b3d62b13039fb7d5fbbf8840c9d964dab7577066303ac1d5e6ea165 SHA512 2eff7fc0db785913a3c43cb960a136d8209a727608c91157580e3c30a26a85f72f1befa07630ce9e2a8dbb73257e0e685f560f3deb2bfd831555b92ce1e4b910
-DIST genpatches-5.10-93.extras.tar.xz 3844 BLAKE2B 679a8530673988a4c3307aa322164bc2194299e9eeb5823571234d075839ec66ef8592ebdd324c0ef999e9297eafb897b04326ea207db76277837b1a3deb303d SHA512 46a3079a340dae831183878fda86f19fd687c6861a06f1eca900ebddb6efba98d773b6869d2ab0729d449e9506f8636ada5a063aef6267bf0324a7da74eb70b7
 DIST genpatches-5.10-94.base.tar.xz 2750672 BLAKE2B a504548a085dc347be062a5ce44c80983a9dea51389002c6a131678111007c41185572486ea3b2c3173114fcb93eed4dc3482442ffabe7a0aedf1f0b658ecdbb SHA512 c8be80f7b275f5ecc5a4efc5c7c031927a96199481078fbf0f38378b492f92d593689de7ee08de5ac1b7a5de1e838fcecaeba092d527aa45e5f73821b0be826b
 DIST genpatches-5.10-94.extras.tar.xz 3840 BLAKE2B 842c7a0ce6a2663fbe84b9e64ebdcd478b0c7c6f09e6cc445633bc6619f19c4330414f5087c6360f402aea60aea4bc7717b7c336720b858768b876aafcbbc95f SHA512 976232c1cb16c5eac908176645f077e7de3e98f3ad3f089dc8d77480fd88117e251dac3eb36564a4fba715d6dd0efe8c8bfe5bce6d4ce62ba1dfce85b79be9a6
 DIST genpatches-5.14-24.base.tar.xz 865892 BLAKE2B 5855b54e7ad2fe9fec353706d026b774c939f82967af5b57c41245762e0ea7fd18731faf1251b1b7aa814c2949d354ff24ce9f078dc68a5c8409490e5517462b SHA512 d83feb3e3c9a32df559fd25b598cb358987f076c107a233a8503390f85132fe6d2a62ee163482439308fa7a62d15aa83ebf9bebaabe0e631eb831fbbbfb700c8
 DIST genpatches-5.14-24.extras.tar.xz 3844 BLAKE2B b11a8019a920d12c848fdc34514ed7352217e41f659bb7935c6211132897e8f948a8ebfd281b89e67e3993e3e5a03f2f32b0b4d3b73f5d1228e65812cf6cbeea SHA512 a2b757955740078aa3891a6a696bd50fa35606bfc6dac0e739abe2869d5322554417b4bfd6a989d23a2d31bea14c06294747578025ffac3d77e8a91ea16f4ee6
-DIST genpatches-5.15-11.base.tar.xz 551644 BLAKE2B fc52fcd6b02396c6bb06cb9f5a19bc2e0701ba818cc24447f7d588344726a2152e444ae850936c10879dfb810cb2ee82c006752fb45de47885bb769c5d119a43 SHA512 0df194f7bc113a1e73fa8392285bf06bd42644ab4a3d8b5a5eca1ae88475cad3d931fad58834fef3ee1be76db0c79a29255dcb8afad62792591caaccf3d83d21
-DIST genpatches-5.15-11.extras.tar.xz 3844 BLAKE2B 667bc393b599d2e8d902d70f5494e93c647a99319bf8dae86dcea24f53de96faa29ff8c399e5a7fa610a47f606aef21532454ec08d256554a27055125fe7a033 SHA512 08ded339321593aae6a2b18aee4eeb4d56256f7732b90319060d1a80d7e7392d5fd3fd8b65fd307f40c83096a8ebd53a3a6e4f491a2623c702e9a32a37d1e89b
 DIST genpatches-5.15-12.base.tar.xz 562448 BLAKE2B f9bb15119aed4b64c5e4ec78cb108baea49615b2114d5d64e86b24c3fb6d1e010ca120a4e527924229fca20559c65d8a58002c80b1bc6a034c1bf557788c7d29 SHA512 1d1053b32fa4176e6b0fa50ebd3ca4b3ae7c5d2d8a9ee89133e6c189a9a9c86ddcc7f14b6948ef8360466f484c745150b93706401839d2b44390bf2dcc0b2ce5
 DIST genpatches-5.15-12.extras.tar.xz 3840 BLAKE2B 5253e52cf7ad63a16c6d94196303111cb08cc5132d45b09d560a36e02ede15c025c0c7bedc95d3e3ca1294f280472e19063d6eb789a80646f07fe95b61cd34d0 SHA512 68be9403d9fd50c40b61548d3f8d756472f25bb0818ff757529c45c35c3ec6440a4d123375696f75ba623f3bca8144b13bcb851e027625b219746072f895e08a
-DIST genpatches-5.4-168.base.tar.xz 4237544 BLAKE2B 302f72ad789134fbd008effd19494744288855506c9fd29d97b8509b633b00fa67bf8b2d8c839565ea3cc2be9923e561da44d41daeacc97db0abcb4a240f7710 SHA512 8220ef3a384b11b4cf75ee7d6cd678d6f06be97a391f9f427a24b418df0b079f19d31e659b8cb1a596d1b611bfe6fc01c3ae63229004f71ce729ef6c19a4a705
-DIST genpatches-5.4-168.extras.tar.xz 1788 BLAKE2B e99f5ef8b46b5cdf0a47426f70e9811a3172c3ca005e167ae85bf3ec134cc9dfbcd4ca14c24148e0cf9183550a443018ff3c7a34d8a5d1936ea9ed4a82325000 SHA512 f8c8574668dc81f2f1bb225de55dd0e3a37b22becfe46bb9516c67422dcf46a44f70b23c7c4a1549e0caa28f8a69042076a6ffcaee3dd442be63bc343c07e5d9
 DIST genpatches-5.4-170.base.tar.xz 4264172 BLAKE2B e0c911b0f78caf914d204f3925ca6168feb11c6f6c89d5eb83398847c050ec4fbd7bc397bd7c921dc25e587e85c7233fa786efbe81344945de0a129385d3e258 SHA512 58d02127525031a8414679e6a499be178138b583dabaa232e24189de8aa69d1eabb772804179c0e8c895f8e90da373f1b22a57a59574cee3387f5e6d34cc9da4
 DIST genpatches-5.4-170.extras.tar.xz 1788 BLAKE2B fc12d252ce429b286a59f815c7fe95a3e7910717e8782ba732c387b3916235e79d817c506927965cc9090a948a0206dd627f770750fa688e122eeddcc62d68f2 SHA512 0536a4fa513fe4d4c7f90697cf27e501605087eb6c32eb3ef6d0888d84d227c2fa0345dbec790ec273583abb4cb4d7f878ec569ebc88455fab689aedc4d53b24
 DIST genpatches-5.4-171.base.tar.xz 4266980 BLAKE2B fbe50a31c7bdaa077c8f6d63884b2b2f3124d1d14d54d2aa169a48e06a6f9cf03bfbe85ee43708b078ae91190331493433e42a01ff87c5a791bee4afc2c12299 SHA512 e8e2e28f84676e9a1456480e742123e514df5716d29a9ee5d68e7992f860068e9f27367caef7118e013a5fb8b1b30f6db6ad4361397c9c55b20fa23738f77792

diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.84.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.84.ebuild
deleted file mode 100644
index 4cef750bb386..000000000000
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.84.ebuild
+++ /dev/null
@@ -1,119 +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
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 7 ))
-# 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 with Gentoo patches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
-		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
-			-> kernel-x86_64-fedora.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
-			-> kernel-aarch64-fedora.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
-			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
-			-> kernel-i686-fedora.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-IUSE="debug hardened"
-REQUIRED_USE="arm? ( savedconfig )"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/pahole )"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-
-QA_FLAGS_IGNORED="
-	usr/src/linux-.*/scripts/gcc-plugins/.*.so
-	usr/src/linux-.*/vmlinux
-"
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	default
-
-	local biendian=false
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			biendian=true
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
-			biendian=true
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	local myversion="-gentoo-dist"
-	use hardened && myversion+="-hardened"
-	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
-	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
-
-	local merge_configs=(
-		"${T}"/version.config
-		"${dist_conf_path}"/base.config
-	)
-	use debug || merge_configs+=(
-		"${dist_conf_path}"/no-debug.config
-	)
-	if use hardened; then
-		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
-
-		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
-
-		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
-			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
-		fi
-	fi
-
-	# this covers ppc64 and aarch64_be only for now
-	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
-		merge_configs+=( "${dist_conf_path}/big-endian.config" )
-	fi
-
-	kernel-build_merge_configs "${merge_configs[@]}"
-}

diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.86.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.86.ebuild
deleted file mode 100644
index 6eb4ef17fc17..000000000000
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.86.ebuild
+++ /dev/null
@@ -1,124 +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
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 7 ))
-# 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 with Gentoo patches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
-		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
-			-> kernel-x86_64-fedora.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
-			-> kernel-aarch64-fedora.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
-			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
-			-> kernel-i686-fedora.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="debug hardened"
-REQUIRED_USE="arm? ( savedconfig )"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/pahole )"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-
-QA_FLAGS_IGNORED="
-	usr/src/linux-.*/scripts/gcc-plugins/.*.so
-	usr/src/linux-.*/vmlinux
-"
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	default
-
-	local biendian=false
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			biendian=true
-			;;
-		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="-gentoo-dist"
-	use hardened && myversion+="-hardened"
-	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
-	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
-
-	local merge_configs=(
-		"${T}"/version.config
-		"${dist_conf_path}"/base.config
-	)
-	use debug || merge_configs+=(
-		"${dist_conf_path}"/no-debug.config
-	)
-	if use hardened; then
-		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
-
-		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
-
-		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
-			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
-		fi
-	fi
-
-	# this covers ppc64 and aarch64_be only for now
-	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
-		merge_configs+=( "${dist_conf_path}/big-endian.config" )
-	fi
-
-	kernel-build_merge_configs "${merge_configs[@]}"
-}

diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.9.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.9.ebuild
deleted file mode 100644
index 0e8ec8a7ecb3..000000000000
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.9.ebuild
+++ /dev/null
@@ -1,124 +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
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 2 ))
-# 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 with Gentoo patches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
-		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
-			-> kernel-x86_64-fedora.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
-			-> kernel-aarch64-fedora.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
-			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
-			-> kernel-i686-fedora.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="debug hardened"
-REQUIRED_USE="arm? ( savedconfig )"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/pahole )"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-
-QA_FLAGS_IGNORED="
-	usr/src/linux-.*/scripts/gcc-plugins/.*.so
-	usr/src/linux-.*/vmlinux
-	usr/src/linux-.*/arch/powerpc/kernel/vdso.*/vdso.*.so.dbg
-"
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	default
-
-	local biendian=false
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			biendian=true
-			;;
-		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="-gentoo-dist"
-	use hardened && myversion+="-hardened"
-	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
-	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
-
-	local merge_configs=(
-		"${T}"/version.config
-		"${dist_conf_path}"/base.config
-	)
-	use debug || merge_configs+=(
-		"${dist_conf_path}"/no-debug.config
-	)
-	if use hardened; then
-		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
-
-		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
-
-		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
-			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
-		fi
-	fi
-
-	# this covers ppc64 and aarch64_be only for now
-	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
-		merge_configs+=( "${dist_conf_path}/big-endian.config" )
-	fi
-
-	kernel-build_merge_configs "${merge_configs[@]}"
-}

diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.164.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.164.ebuild
deleted file mode 100644
index 91427de34e4f..000000000000
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.164.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 4 ))
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.4.21
-CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
-GENTOO_CONFIG_VER=5.4.114
-
-DESCRIPTION="Linux kernel built with Gentoo patches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
-		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64.config
-			-> kernel-x86_64.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config
-			-> kernel-aarch64.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le.config
-			-> kernel-ppc64le.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config
-			-> kernel-i686.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 arm64 ppc64 x86"
-IUSE="debug"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/pahole )"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" .config || die
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	echo 'CONFIG_LOCALVERSION="-gentoo-dist"' > "${T}"/version.config || die
-	local merge_configs=(
-		"${T}"/version.config
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
-	)
-	use debug || merge_configs+=(
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
-	)
-	[[ ${ARCH} == x86 ]] && merge_configs+=(
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/32-bit.config
-	)
-
-	kernel-build_merge_configs "${merge_configs[@]}"
-}