gentoo resync : 04.01.2022

7 files changed, 358 insertions, 6 deletions

diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
index 3be50e3ec9fa..784094a24392 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -1,11 +1,17 @@
 DIST genpatches-5.10-95.base.tar.xz 2769920 BLAKE2B 5de95da15985c9188801c6dfc413faa7fae2c534ccbc17ca3e8e3f70ff1422e00819b177cc4e1828eb6234ec110930af6e747089482e8efca010c1dd7fffa098 SHA512 4f6d6196406af59c3f9b7d9d069cf0d2186e45f10bccdaac0c1473520ed67606fd363d97b64eb53cb76c08c4d8e4198d67744af34a60e78419cc7c6ffe28a26f
 DIST genpatches-5.10-95.extras.tar.xz 3852 BLAKE2B 1deb0958934dfe7b0092ffe9254269fc8ca900cb526f4805e38d7c69e8d4d587b50a169b1a54d32ed83fdf481626f853ae56e007a21554d82a7befc598d571b2 SHA512 f3c5ca1aaa1f7ba0743fe0d0f3046e411547c09d3590766b76778dbdbe1221ffd3542f3231e6ac6a77773caf3327d28aaa7bcb767cdf132a4fac7cf8afd3e86c
+DIST genpatches-5.10-96.base.tar.xz 2787744 BLAKE2B 0d845fc9e5eb4cee41eb60756661d5220da31ea438a16a415431415a54503278b0fcd69cb8562e1c7c47ae794df4d0691a92ef034aa5650ece4b0ea29f56c73d SHA512 5424bb5c20f6b918abfa8b308ceae9dc321d1a8621e311ec1c492b9efd9bde41f695d12085b0c8eea16b8113832580b1ad831ff18a5354e5cac2e275d99bfdab
+DIST genpatches-5.10-96.extras.tar.xz 3852 BLAKE2B cd431b92e31f333d913f8607df5d3656dfb924c4dca63e86ac30e52b636773f82287481b4a51af57d51685bf55db2d0d5028bf3e5a3255de0481d277842681a7 SHA512 3612c26007ea77b2ef0657a1c11174f1468bbc1cce46cc189a829f66f1b242a54f29305ff405ed49356427f0283ffb23e5299ccefd7dc083492eb0143855bcd5
 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-13.base.tar.xz 604984 BLAKE2B c674c2eefbc18f2a8d182fa95606714b9a74420d7a3ebb32138b714743f11a7c7b278d77d33747bd1fa1a46e8f8e8364a9238ce3acee6134f889fae267ab0239 SHA512 0741c183cf8def586fc17fcb2a44d81dd5494ac9430a5ca07d239079f41a7a24bb686406e0ecfccdeb8a38e33e99831d2b355d0e8e65e8dd2e30db5f4b0bbe4d
 DIST genpatches-5.15-13.extras.tar.xz 3852 BLAKE2B 131550ddf5d1d67808b98040e88bb75d9020ee99b7907d0b79839a366c52e83c5bee6a322f12363ca0cfa9816d17b36002b5ace1620ef80b386ee8c09fd23866 SHA512 79fe958fcd5b3c4c7406374431e28a482b7512214c0ddbbf24d5f4a42e7feafb3f235f266b0023e666348c2c1888d1c678d726403b2f873d55991e5aaef4b74c
+DIST genpatches-5.15-14.base.tar.xz 639672 BLAKE2B 93976aee6245c420aa654981538f3dbdbeaa9898410d0ffef103158e3856b18dfebba293aba62e4adfcb0c402d803428637c7a7c7b78a6483b64ab816f3fe355 SHA512 37f506d21264ac54d3075890fdb5f6267039518f083961f13a1859e1c20a390be12071a95091d9b01f5aaff11623569f0bc663180e4b6741b765e64ff45af361
+DIST genpatches-5.15-14.extras.tar.xz 3852 BLAKE2B 09bb1bd3fffd353fe5454a033000632f9c76ede889e8550ddcdd507651e427e6b55fc65329ba89753b8b0d4e4bf4988d3c3e54a54cdf01e54b0e200d38fcbb68 SHA512 61bfb0e5d1f66b0b6b689c8e4474f22b8d2dbebd9233ea139c6da870cdb76c9a1559eb1469f91f4c3cc0eab5f2688dc7b843601ac10bf989bcdc3129510e06b2
 DIST genpatches-5.4-172.base.tar.xz 4281140 BLAKE2B 438ad10331e709a85f1ee2a8907a982cd545579940431220f763b1f68280d007d344627b0d1cf4406e2a439b76d20497e1f4aa6d103bb5569f119bc5174c545f SHA512 faa28b056e48873b41b78b540afe7db3200020f85f1ae516f7949f3cef453eccae9b6b8631d594ba8b1dc1b4d6b55b1e9c9379c4880eb4697bed956b0217bef4
 DIST genpatches-5.4-172.extras.tar.xz 1784 BLAKE2B 9d185d1ff33c56417bf9cfbe33efc6ce4b743a0ab9bdf419dbee14cde34d7c2d6d17884ace56880f75cc28a16b7e18a5e7b87f110c64bc7c84ceb81c7df85831 SHA512 cee6e49804ebc200dd7e308d2a59bfa0e381428caf69678bb6d406357a86398327a354bc2900096f82a77b47beea7fca7e5709cb390fbc1e0b7575c01d062024
+DIST genpatches-5.4-173.base.tar.xz 4294304 BLAKE2B 7622b34b82e901d2823f84ef4ccf282a9224dadf5a5248bbdc9b1328aaf476b50df5ea6d359af64507c30623d57a0a61f9205b5d48eb1137a404ef2ca4ec31c4 SHA512 34ce4139ccc9119546a88efb71f46b1172039f536e5072337270ab93b83429b2975a3c9cf4f112f280e62eaf506e62b48f775a4fb772a1a4de8681333be76a02
+DIST genpatches-5.4-173.extras.tar.xz 1784 BLAKE2B f01c9772a351ca0db5a44f8f13c80e30b73c546151ae543635a9d33a132f771133c6b8e1349971ab25a972e859a46e79cd64a07c7b4e1335544d7509690530cd SHA512 6b26c1e2025aa4952d23330a8b3878a11aab77e8451c2af728f2d98ab2ef64e415c6293179ace1cf08d91b887309eca9341870416c0fe2e901a397d29f035212
 DIST gentoo-kernel-config-5.13.4.tar.gz 4024 BLAKE2B 9b4e3205c356c791768b9de09057b55499519af5551165040c5ad50bd85b2886e34a9f8dfeea08c6a2113b903341c2bed897bc2615913cdfe3d13434d7be6f48 SHA512 55d9f2c72d164f81aede7ce5b2c703f8a426ad0a1a3323c0a304c9f07ed86aa06949ba2f42da115b977b810886a47a0126eda96ade853970a951c301eee5e12c
 DIST gentoo-kernel-config-5.15.5.tar.gz 4128 BLAKE2B e30fff372b0112cc05723463cb4e93de79b5b643483796402eb88a7e704706a4033af2dbab9424cf14b1d894b57fc053b969f5fbfa15cf74e30e3d045703918f SHA512 5e8c6945da5e9cfb8d20663910fc38ee36813067e1679e17bbf1dfc6fc0aa9125f1fc949d81937b297215925004e0ebfb3b55c7e707184b5ffcf23d28882113d
 DIST gentoo-kernel-config-5.4.114.tar.gz 1298 BLAKE2B e494041cd63ba53f055cfd555e359934d5054238bd096addd7965754e6708bada63398c4b315318f73130ed81c1391524388396775632248870721f1ce23f203 SHA512 225600db53532ee131dd83d10cecc97a83f4615975ff32f3f6190a15eace64707cb59490bb42940e4429f9054221b9d9a589ada443922062bb5ee18ecc42c26c
@@ -29,8 +35,11 @@ DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a936
 DIST linux-5.14.tar.xz 120669872 BLAKE2B 0047f5aaa3940dff97f4055ef544faafbbb5282128e6afe21d2f47d8dc8c395806a17016febfa050117d16f59e74b882cb8b9c5011d68f119c230d0a4d120524 SHA512 8e4f3ec3d36f774280f75dc7b004a43e09417af58f12e9c9f8348976659d4cfda7ad905f306f43fed66a27922e5c45db22e46bbfa7a0b9f365012380de3b6f64
 DIST linux-5.15.tar.xz 121913744 BLAKE2B 3921274b23f7938abdf3ed9334534b4581e13d7484303d3a5280eddb038999aaa8b836666a487472d9c4a219af0f06b9fecccaf348fb5510ab8762f4ef4b7e83 SHA512 d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e43b6f021709dc685eb0efa18d2aec327e4f88a79f405705a
 DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
-EBUILD gentoo-kernel-5.10.88.ebuild 3569 BLAKE2B e1900df6f30eafceb2fcaf331ffa1b28d0f37ac9ea71962817e50e7c65d1961c78e9a1bb59b4f4714e7fc53142830dddd2fb194bb490bf028662af7ee697ab73 SHA512 b2c1873289fdde797827c2c805aa731c31ef293226e4b6754f29489ef983932a6b6f5abad2d546fe81a5d62e5fad7df0c554aee4fb3e690f7a9115a929f907ba
+EBUILD gentoo-kernel-5.10.88.ebuild 3569 BLAKE2B 392822ff7a8ae0fe39fb4fea6d417f16eb9d772c378aa0a0fda4b0f299dd8178dbbdbe8a48d4d5d27e859f2f86380bc70fe94357da367d281fd2cfa0862a497d SHA512 e8d6ed98d4fafe02e1d6d6651e24cd3ffe80f6c0dca3ced2998b492e44e1adda167212280660a3c0a6a702e6d4f6a3cd5a926b720eb9e31162cb6c949e8bb13d
+EBUILD gentoo-kernel-5.10.89.ebuild 3573 BLAKE2B 3628c2c1df1e479d16bec4c39b25949bbe55fcb61396b45b442525464b59b6cc4868fab38fd130ddb2690d5039ba6f047158df3c39ba93cd04fff8f41754bcdf SHA512 c13a59c1ddfcf6e38269872e03c6f2eec5e15ff63d46b2b06f69e649f3cbaed4fc59c0946be13f30917ea3a928c61bd0b0399da248a520e2adb488cdf87345c2
 EBUILD gentoo-kernel-5.14.21.ebuild 3131 BLAKE2B 68307b292c0248347412946bcf538d6544b21dc416d0562cb3cbf6d897d2782ab88205d2feb931fde43d4897169eb61eb87c9f9e7cd9161a462151acb5a4b45a SHA512 df621562cb4542e95cbc5137abddf2d6f665d6c5bde2a0a51a4421fd6efb1ddd1ea2f787627f134555380451c5b32a31365cdf5b5123cc5ee7edc31d4a13b1b4
-EBUILD gentoo-kernel-5.15.11.ebuild 3566 BLAKE2B a5e00a4bc2818a65539956923905013ba3a39e001bf0f5e9374cb3e539601bcf2088d242335fc5c349b59d7830cc1f6eb2b3d1eb72bee2c768021a7ecfdc0b50 SHA512 1d2ff6e5cd2bde9f0144d0ef719aa841aad5a63301d7640837879e31b2ed679a312eeb72e03bca2326413c5f1f864207ccf2c3be5d3a3090b0ba11a69a1a3740
-EBUILD gentoo-kernel-5.4.168.ebuild 2801 BLAKE2B 39a42f62442577e8b017d8590ca98c19a91cc1f00bf904276026a6c9b38ec08ba0a2fe1c8a36a2ab124a3e07b90cfbdda432d8dfb561ac3bbde1da66193d6565 SHA512 727c455768973551b7807883e1c16b5ac24c7e2609727c966c7270a3438bdb610cea89b507f7981eeeea3fecbeeb5dcbcf6dadc9a8fdbc5e12a55d72b3f20725
+EBUILD gentoo-kernel-5.15.11.ebuild 3566 BLAKE2B 6c47a387abaf09ff1a42df3c6fe2bfad7c4f266448fd904751adf1b23ca95b92e908d82c4714e5ba0d1bf0dc262df9d5a4018dce146320e02be155c5ccd25402 SHA512 9d69eefa61be34896f0ae76e6f58d26ae8d28e615c70db1003715f032753c9b8442c81eee2d2a79c3433c64b378725273d11eb69c4ca7175c27b78db57f75263
+EBUILD gentoo-kernel-5.15.12.ebuild 3569 BLAKE2B 00385cb6dc3c824bfc800e70b05e5484ee19024d03be46ece166f3bae68b47162e78155bf70dd0d22dcaed0044f7e5d0ef944ea7a38746acb57db2dc7a55c038 SHA512 25c6faf7d080d96844fb607615435eb0482a8ca752719c457f08e49634e8f54096e2240d7c896ce57a7463f9071cab9ed913a96330cb8871c62ba5813daba9d1
+EBUILD gentoo-kernel-5.4.168.ebuild 2801 BLAKE2B 8ea777cbba56142ef34e73423da0f5e4a1dca399f7ad865e0ac6fb6217aafe5851b65a924c5331ff8e6a743c08efcded069869cd269fe6044653119f8262246c SHA512 ba623993bb18788d290122f454b86754036c43eb5692aa8a7e75ef3e026f7edd4020f387e4a8f9e4c60da689cd94b56011e6b3451b6c4f6ba67aa9c0f1c4e052
+EBUILD gentoo-kernel-5.4.169.ebuild 2805 BLAKE2B f0f8a58b8b4421f825636e1d72d10527c398b93595b9f0534da034f23217e0f4050608c2001de154cd2bfbb57132398f6fdb2c92eee10505344b87a8713c04a7 SHA512 b9f64b9ca0014724cc2719df1fe9809c12089c4f9de27ce57a26fc3ee03311f06f6237156cc49c0dc7448c328206bd3d73dd3a48964073fc6543095de3b26e56
 MISC metadata.xml 465 BLAKE2B ea1260a1638588a48d9dd776e9eabd9730a181af8416ba778c936fa2e80a2360be146d3cc80599e50e0a72ac709eb9538184aac87cb96528e445ed450e34f4af SHA512 c7b7b1a45fb7082b8d8d66cf5a387cc4f7207cd9488d1d5e1d6900f1e4147aa9290b5522a94d941a885f1599b5df2482b529e40912d2b2cff400ecd4b1704c41
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.88.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.88.ebuild
index 24ebd9a5c229..db0da98855c2 100644
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.88.ebuild
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.88.ebuild
@@ -79,7 +79,7 @@ src_prepare() {
 		ppc)
 			# assume powermac/powerbook defconfig
 			# we still package.use.force savedconfig
-			cp "${WORKDIR}"/linux-*/arch/powerpc/configs/pmac32_defconfig .config || die
+			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
 			;;
 		ppc64)
 			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.89.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.89.ebuild
new file mode 100644
index 000000000000..c59cb90ecb8c
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.89.ebuild
@@ -0,0 +1,124 @@
+# 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}/${MY_P}/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.11.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.11.ebuild
index f6954db073c9..e4ac32a70197 100644
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.11.ebuild
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.11.ebuild
@@ -78,7 +78,7 @@ src_prepare() {
 		ppc)
 			# assume powermac/powerbook defconfig
 			# we still package.use.force savedconfig
-			cp "${WORKDIR}"/linux-*/arch/powerpc/configs/pmac32_defconfig .config || die
+			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
 			;;
 		ppc64)
 			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.12.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.12.ebuild
new file mode 100644
index 000000000000..6af5d253a073
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.12.ebuild
@@ -0,0 +1,123 @@
+# 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 ))
+CONFIG_VER=5.15.10
+CONFIG_HASH=4882b85cc85fb2b7df396c4d671cc6432596eca0
+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}/${MY_P}/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.168.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.168.ebuild
index 676dbde3fd65..a1b029440734 100644
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.168.ebuild
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.168.ebuild
@@ -67,7 +67,7 @@ src_prepare() {
 		ppc)
 			# assume powermac/powerbook defconfig
 			# we still package.use.force savedconfig
-			cp "${WORKDIR}"/linux-*/arch/powerpc/configs/pmac32_defconfig .config || die
+			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
 			;;
 		ppc64)
 			cp "${DISTDIR}/kernel-ppc64le.config.${CONFIG_VER}" .config || die
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.169.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.169.ebuild
new file mode 100644
index 000000000000..990b8faae12f
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.169.ebuild
@@ -0,0 +1,96 @@
+# 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 ~ppc ~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
+			;;
+		ppc)
+			# assume powermac/powerbook defconfig
+			# we still package.use.force savedconfig
+			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .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[@]}"
+}