gentoo resync : 17.06.2021

4 files changed, 316 insertions, 0 deletions

diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
index 305a37e6d52a..a7eed54bc1f1 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -3,12 +3,18 @@ DIST genpatches-5.10-41.base.tar.xz 1421952 BLAKE2B 513d7aac0ee791d615fdaf336a29
 DIST genpatches-5.10-41.extras.tar.xz 1768 BLAKE2B 70b1c510506b1df8ef210b10a203711d07d0b170bb40a4619cfcb99754f20fc14b648f1c2f4516f3baebf327706444d6d8e375bc3277c03b2f623c959c863791 SHA512 198db6b840eb22deb594e336a3c64bb32c13a12ad682b5d431d0365d276b6412ada9594c85d274ecfb20ee2bf2045bc60dc244edf7d0c8d0ac1f21ecab4f9748
 DIST genpatches-5.10-47.base.tar.xz 1555884 BLAKE2B a4078ace7edfd91eb3ec2f63cb121571b2d5137837a33c96ed5e09201f34cf82fe3b7e88c6684f40a2125d88aeebe275e826ccb2d63b8bc96863edba5055643d SHA512 eea3cbb4b0a9c5979f4a7504eab5eb7e041601c78d3c1f4037c2eb91fe54e7e73c7bcbd88f6e69dc859f9eb7d029bc9f55b6ffa652bf6bc742013fa8d3b0c71a
 DIST genpatches-5.10-47.extras.tar.xz 3412 BLAKE2B 779b0a8bb908156bc902106a98e4308b3ebfe42ecfd5d651aab4dbb95c0ee890e353d26d51e1fdb7c7305419e8eda5103a01405be5b015ebeccde869798c68a4 SHA512 dadec8511140903f38e7d6657f3e8b750382cbb18271448d3d23a03962b0ceb4b70950d6dfdb643fc2223f53254b824a04d2eec540626a20a50b998a9ddfdc13
+DIST genpatches-5.10-48.base.tar.xz 1580692 BLAKE2B 85f19398f7a3967b471077c1957aa21ee6b34c1a0876ae6a64e5aaecec7a9c91274eeab73574e22961dd8f8e19bc4a69f4fcfb26e9809287ef0da964f64bd69c SHA512 20b894e85f002b057377b7685bc4a957ff1a2990ee6bf94d1db9e8ea1a3e9d20478445ae5aaaf005269505599c4a9b9b26a4ea7129d3c5e2ad18a530c4b6f5eb
+DIST genpatches-5.10-48.extras.tar.xz 3408 BLAKE2B 6f347e53aa1eabf134fdd4f234d794820d9aedf126084615fe5eaf29c8e8f30828678b9df544ed39a9ea47e9bd9e5b1a93ea94a90a7aaf1234354cdd011cbabb SHA512 3d19cb7079c56c7675a16302c272a1da1b72b902d66f341428747aa12d1fbf949366e12ed5501bc15d92ca89eb93b32eea283156ac5317a75f11806907e55cad
 DIST genpatches-5.12-11.base.tar.xz 611232 BLAKE2B af0db172fa831bc84b1935d387e3d7b360c5a94d8499b6fa204f21b7a822c844e88a87f4a2724d0b8b508676ee564dbbe304893bfdd3197d67c8f6aeae011cb2 SHA512 f422bc1aca29732db09184ca2fcf7478536a87e73b59325f063c73103c8ce425858baa78b185eab61a80dda15e3818b45a669c69f7898382aa3563b315ad45b3
 DIST genpatches-5.12-11.extras.tar.xz 3412 BLAKE2B 2eba600cd1e769a7252b063968b87cf5f54f285f791f84089fd1f3060e3400a76dd645841bbb213830cedf274e41959ed48cbee081d556c82f059e2a3de4db51 SHA512 2bc29ba1aa4b71b2407906f2c86339eb15fb124f964ddd3fa9f4a39dd94ac18fc95d0780cf1fdb99286b1a27aa88ada32665feffd9a3ca7f53bfb66f0212e7e2
+DIST genpatches-5.12-12.base.tar.xz 650292 BLAKE2B 81b5a3b95390522c328acdb390fd1e8515028e55dee9a3693992ce2aa5c2defcea37b14c385d72e0c6a9b31f239c7d02eea45e4428332f477e897fa94c02d71e SHA512 bea0fee6fade3b1322a52ec2201b828ab28bfb3c0528ea562ac7e3cfaebeb758b971820a2b1ba695dafe219ceb2548c07713b3684491b893e6055ce4f8943916
+DIST genpatches-5.12-12.extras.tar.xz 3412 BLAKE2B 8fcf6c407be25db368dbb3e6be3907d3431228b5c39819dba7c67d61e5171a7ad9a86f3e117b99b9e0d626219ad9db0938c15c4b96c934b88f693a3e9661d458 SHA512 39750768e4822ea8e3f88540fc8ebad9fd721e2a3a8703102d58e30513b47069cb8a77e15e41d0f90d1d69053007bd476ce0741cd3135a428d039ebd426cdc57
 DIST genpatches-5.4-123.base.tar.xz 3488228 BLAKE2B 0fe5c3056c3cb060f4921e3b7a4046e03e4e777d033619f0496eda68c645c6209fb07713a4bc2565000f9c17e6203a8bc5392fc597dd49167bb0348988b53026 SHA512 e71b8f9d622d3ea2fa8165a39a27240ac007d899d7324c60240221d7761c1287f14b631b074536460702922b8daf00bc2714358aaf7f69ac257af7d5d5b18bd1
 DIST genpatches-5.4-123.extras.tar.xz 1772 BLAKE2B da9bc0d9513d010364506850d1c23d13e1a1ef8c4cb8d60e3430d12f4cc2ea87a74643ba9fa1a061eabdee9985b1931aab1b2587ee26bec9b2cf165b90fe83e5 SHA512 ff3b417825ba200b32abf888b6cf6e8d754526e57a30c06fbe4f961c84f67cd921b93b9848fc6b49f120b4cf8ddba9284755da73869db35327af7549d63f3cd1
 DIST genpatches-5.4-128.base.tar.xz 3571424 BLAKE2B a58c2b8f20730c3357ce30cbc8b24f0609bd7ca2a8f5d37780cfbe4edb560fa49bcf1925ec40dbf61aebfe9a87be0f35ade4b999509420eb0caf5731ce649e89 SHA512 c84d65acdc4274b528306af958b0c72851fdce008c9ed6f78965ea22f09f8668b6075cfda9101b2e7a7bc55ccea64491000b1aede8cffa4ad927c7c1bb003489
 DIST genpatches-5.4-128.extras.tar.xz 1772 BLAKE2B 3af29c49caf9303615ee76319d3da53295281e8fcaee54d37b122e47b745ded99a109db2eb31508dbe83a5997b7973287297d29af2ddd475bdab1a0bc05a1045 SHA512 27eb4d3327e24acd5f4601281f624439ff47bc6173ab58b23ab162a42df66bd02402f2e4f4e97a49b0b0b788b615869dc4a0dc3ce964247ff7bc6166fd9dc6c4
+DIST genpatches-5.4-129.base.tar.xz 3586716 BLAKE2B c5be8295127bc1c16c1d24feea5793f7f52b1be2ff48db6494674430bcd608a1e0950da553e7c5418ffc70e8909da5158d54877412fcb1afdbe34733fd54f207 SHA512 0ffb95795a9300962cb4ab7c017859ceff7ea6322ad59592b4dfe98ef56fb86db9bd8bf5c243cef93a0502c849f2c466f33efa1df420126199f7fd0650dea3b2
+DIST genpatches-5.4-129.extras.tar.xz 1772 BLAKE2B aae80fd4b863f4a2552caf05fced29209f840d22b5bb9fa3eacd06ee7348e0fbee023512e331e3b2f515341ac9354fb7bd1f4e79e38be3a7d8696eaf257a547c SHA512 f0392e91fcf8402cf6d94bbc42b89bbbc028959c1e5243b5cd8e608950539ac81ba62836a1c7755ec01dcd7f8549c9c1898adb24c8a3c7c1a5d5e866cd7ef0dd
 DIST gentoo-kernel-config-5.10.32.tar.gz 1269 BLAKE2B 4a21a57d567d9a527ef829f375275c65347b2e6461b00e50099458c496af0a7b3b863a6e1d8421ad18c52c64c1c4cd7e5fd416673b67738cde6253af8a9f18db SHA512 a83ef22a7f9f83f01bd65a5470f0678111b0a7dcf1dc564e04264f68cc54833dbed4cccffe2864caf3ac14169611259f0bb786c1aefe194372d6d3f67fa64c00
 DIST gentoo-kernel-config-5.10.42.tar.gz 3992 BLAKE2B b04f585ccc823c25baafea011a5df9e4ed79f5537fb0c47726bb54d3f6197627b078a6f8510707a68edd9308f7ede84ca3f9bff78e64e06c9ea3d53db496c10f SHA512 5d42e1ac694441acb8ea13fa3e80615bd18f0932a37f50c3d34c8c2f95ef4dfa6541407ddcad802b4fb13468e0e85d8cd09ac37d3612260f9a81d081cb4b6713
 DIST gentoo-kernel-config-5.4.114.tar.gz 1298 BLAKE2B e494041cd63ba53f055cfd555e359934d5054238bd096addd7965754e6708bada63398c4b315318f73130ed81c1391524388396775632248870721f1ce23f203 SHA512 225600db53532ee131dd83d10cecc97a83f4615975ff32f3f6190a15eace64707cb59490bb42940e4429f9054221b9d9a589ada443922062bb5ee18ecc42c26c
@@ -29,7 +35,10 @@ DIST linux-5.12.tar.xz 118112412 BLAKE2B 842d921b9a73d2aaade763dbd2ec67bdfe0275b
 DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
 EBUILD gentoo-kernel-5.10.38.ebuild 2649 BLAKE2B 4a5b2c47d3b2c31ff70a8204ec7356a6c9771d67e727b270691703c508b49ac77f0d1e6249ee15a226be73f852c4d8dc7310bec54617799be08cca97ea6635a6 SHA512 e6df60ce2b59cdd066ba9b53e46ad6019617c825d82bb4d0ae05ef5c3741f396f6394735dfd9c58e3dec892f16be4501cafea449e11081e2c1892fcb826a01d9
 EBUILD gentoo-kernel-5.10.43.ebuild 3115 BLAKE2B b181170fcc157f8993e546ef416340fa8d4dc54da784f6ab4d959abfb5882f244aa0bedbf2bc9173544158387758930ebcaf2abcabc708780727fb9d43ad0cc0 SHA512 fc8c5c9591b0be1d88c28d8d3ba3c24125bae848ef20242e970f8db1b7960da6cfeac91422362f3e7f921cf9016608c878ed6d8f08193b650d6b1167b0312df5
+EBUILD gentoo-kernel-5.10.44.ebuild 3115 BLAKE2B b181170fcc157f8993e546ef416340fa8d4dc54da784f6ab4d959abfb5882f244aa0bedbf2bc9173544158387758930ebcaf2abcabc708780727fb9d43ad0cc0 SHA512 fc8c5c9591b0be1d88c28d8d3ba3c24125bae848ef20242e970f8db1b7960da6cfeac91422362f3e7f921cf9016608c878ed6d8f08193b650d6b1167b0312df5
 EBUILD gentoo-kernel-5.12.10.ebuild 3114 BLAKE2B 70462d1e30a5e19fc733f2cd099ad684a0160aac51a3f64ca22e0011aa26adfdc3db740160af90ebecd6fe9a60b5692de17ddbedcc97e7674c0948087bbb4e8d SHA512 1bde06bf6a8fb9d8bcd7666a50636f9e290dfff4bbf56312f582a821debc217a1d64b04d8d0e288efdd6c5878aba7fc0e3b646424b3c453bb9072af00cfea47d
+EBUILD gentoo-kernel-5.12.11.ebuild 3114 BLAKE2B 70462d1e30a5e19fc733f2cd099ad684a0160aac51a3f64ca22e0011aa26adfdc3db740160af90ebecd6fe9a60b5692de17ddbedcc97e7674c0948087bbb4e8d SHA512 1bde06bf6a8fb9d8bcd7666a50636f9e290dfff4bbf56312f582a821debc217a1d64b04d8d0e288efdd6c5878aba7fc0e3b646424b3c453bb9072af00cfea47d
 EBUILD gentoo-kernel-5.4.120.ebuild 2818 BLAKE2B aa94f3446a0a3adc6491ab27f321c7d098e8c71e65731671af35928d8076c7ced15e18de3cd8080f47c71ad8dd2ffb1d2814ac697966cf1dee0f09dc3685e39a SHA512 36a81ed7856c80169da08e494a399c19d2d0a722cb031ba99d6f8a9fdba2022cbeefa0aca8758784f716a99b49336d95579571d4959a2237bcf7345091fe6509
 EBUILD gentoo-kernel-5.4.125.ebuild 2822 BLAKE2B 2959f3b551ba9e1b275bd3b6c4b1d3c64c7c295fb6b63a5496680ae1e42f40812e4114c0034a2493e2b6bd93fb323a1176e815b9ff1883b3ec4e9304beec6037 SHA512 28da53ae1d4380489599d320992dc9ae54bfec92030160c2a278dffa2c0bd895f9f5005e085b97f664dea86f0013dc382e93045a0ed08dd096deac57541d642d
+EBUILD gentoo-kernel-5.4.126.ebuild 2822 BLAKE2B 2959f3b551ba9e1b275bd3b6c4b1d3c64c7c295fb6b63a5496680ae1e42f40812e4114c0034a2493e2b6bd93fb323a1176e815b9ff1883b3ec4e9304beec6037 SHA512 28da53ae1d4380489599d320992dc9ae54bfec92030160c2a278dffa2c0bd895f9f5005e085b97f664dea86f0013dc382e93045a0ed08dd096deac57541d642d
 MISC metadata.xml 464 BLAKE2B 8f1b0ec7ef58c31bba668cd26cb39bdd0e676c22fc9def7802ea02c6fdaa32ca2d129519c51dcf7a6711ff2f5e22b3e8fa10ed5667b129f9be698bf828644c98 SHA512 2b01cf5cd40c16da8bfe767614ec47c8b95ed915a9cf3208276dbd75c9e7c065cc43c036d0e141433b6d19c2cee88fc8ae344ed596d8c1caa31c05e722373a06
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.44.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.44.ebuild
new file mode 100644
index 000000000000..5151cab9b14f
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.44.ebuild
@@ -0,0 +1,105 @@
+# 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.10.12
+CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530
+GENTOO_CONFIG_VER=5.10.42
+
+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"
+
+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-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local 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
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.12.11.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.12.11.ebuild
new file mode 100644
index 000000000000..5597a415b914
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.12.11.ebuild
@@ -0,0 +1,105 @@
+# 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##*.} + 1 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.12.5
+CONFIG_HASH=17639df044f5f81bbf267f566426eae4a5187875
+GENTOO_CONFIG_VER=5.10.42
+
+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"
+
+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-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local 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
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.126.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.126.ebuild
new file mode 100644
index 000000000000..030d19868e30
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.126.ebuild
@@ -0,0 +1,97 @@
+# 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##*.} + 3 ))
+# 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}"
+
+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() {
+	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[@]}"
+}