gentoo resync : 04.01.2022

7 files changed, 381 insertions, 6 deletions

diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index 55de3b294497..f986c1bebb95 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -19,14 +19,23 @@ DIST kernel-x86_64-fedora.config.5.15.10 223671 BLAKE2B f45dcf49155b383c2b04ebcf
 DIST kernel-x86_64.config.5.4.21 184907 BLAKE2B 0eb2b07c14cea7545350fcdf3a94f2a531f0137c502ebda9299cacf44da5385686e2049b480b28bc153c9d413d453cfe682b9655eefe70428cb720f57c7bd200 SHA512 f3b3ee6841555ac3a9cc11536a7d44e1a5a8df2bab14ba341fda7df1ceb0de45cf1c799a1d54a64f2858fd1272d348bb52cf269ffa396878c5402baf2730237f
 DIST linux-5.10.88.tar.sign 991 BLAKE2B 8ba7edd3b3d0b96c5b9ab70d4290952c41327edd7e7cf707b84eca94714a1cf05577d8b6d8d7d419986ae384a268f36157edefe6b950a08aad08fc37d061102b SHA512 2c609b8baddd47db61091b9284a4786b1a22fb2848ec2d51a2b7b73232148a0e948ed35fcb39a7bff646f90ab6be28d81e12bd8358cd3161a88beeea8762d306
 DIST linux-5.10.88.tar.xz 116476744 BLAKE2B 89a496f0ec427061c04a5568bdfdf04ad4ca55b3c81853ae9f64d53608efd39d55d8f2074f7dbeb9424f6b9cf9b5d9674b98a05d24414dc0ccb076a9f9d27685 SHA512 b4400a65dee1e5e7bafff69012078e81467e9a7aeba0eaaa84137e7056b5b79893eb62ef4309a340b23770d3785a7d236e837e6f39f24e58db00a8b4d9190a4f
+DIST linux-5.10.89.tar.sign 991 BLAKE2B ffd758cf40031ee8ada07514218d9c03cbdbf21eeb5c37d711150fdd391bdaaff7808d5690433ded38229b2ae504532002a9a7aaffad588b187b9a5e4c9ae7b6 SHA512 0c1bac99bd1920250826f7d14194084cbd179b42fdb62c9ba371a62ecf309b9152aac4e2f1fd3d982e136887d9d98e302b3288e2d22fe124c3009955b6c9186e
+DIST linux-5.10.89.tar.xz 116486456 BLAKE2B d91cf085ec273b3ad3d128e4097d0841496c0e71fa330a09b2db878cc4a7c683f8444e7611f172ffee84fd2180a2037bdf57fdf4fc1e6995d3b044eb4ac1785c SHA512 a5c60d947246944c75bae0b62efa39580ecb9c1f57f141071de0055afde725c1d9ac95a78db55326b5e43388d44ba1c810b547239739115099297dc68e534674
 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.11.tar.sign 991 BLAKE2B 42bed55a97098e8af2c9f33852b94806710e2df15a9fa8fa2199a1f3be133b89b9505e79f3e9c9663fcc5482249334f34a1c7a9315fc40741ff7302a60c4c823 SHA512 5ff3d7d368dd4481e003b00ed926f601520f53de020a507c5f9af506679e57958db0967752a600ee80cadbb0b19d33368007fb1d3c298045b30faed964da4714
 DIST linux-5.15.11.tar.xz 121955784 BLAKE2B 37a264e50069e5b195b99a355944893e42c6fc05eb5fef7907855de4d31c693421e6fc578575ed141534b52ab9105dfd7697bdfec238cfa88e16a6c41f138ebd SHA512 5abe52981a9f493174afb908bc1c1a4901bc522c38c2da7ba15d5b907f06f9c4a684a47436697d79df8f598e166064d46add5661632a48275e0268411563f6b2
+DIST linux-5.15.12.tar.sign 991 BLAKE2B 2eabe426cd804a5515a2fb2d65c763322d313ba81432ea2dc931172d592073735dac74615828dbf2b07d5fa66a562606cbe03f697578444c95c5b78cddca1910 SHA512 267a8f1b5813dc9c0c24b534de9890e398656bb4cf96294f3934c88297eaa36a773d9d89ef41c19ac411ef86aad9ebe463de0f9fef1c1b5df8b372852b64c526
+DIST linux-5.15.12.tar.xz 121949156 BLAKE2B 6e201ffe5832a998b9bc8f63e9fcbf7f0384d4e4abb1a68c2299b8362b51ddcfbc35639bfc836a84202bec3705f5bca1616396c16daa05d778659d286f63b6a8 SHA512 8b79f30c26a865578d771b0c1a8273ecbf19135e4844210cb31c81784311601b8f7adfe1b3a9bc75c6bed99dcad9a5ff5e1976494b64f0de45be3a6570336890
 DIST linux-5.4.168.tar.sign 991 BLAKE2B a581b74de0296ef69cd10686381571aa3c2e73b59dd495e78a7ba168dff85f7af3a3b7719419b767fe0b8380a904248d624bd1e17712327d2ebd62335943f8dd SHA512 bdd0a88b6199d57b3c86521e58a356a35273007fb421e5d3b80d40e4b9337c30fa1b982dba61673fda0ddc9e3107b8da5cbe4916364fbbe035ab5026befe1c74
 DIST linux-5.4.168.tar.xz 109188452 BLAKE2B 72e7da0a2a2d2ecef4b73b268db09a7cdb7a0e76cbbbfd7111ec727593f8eb60026ecd8102bedf9b13b393cfc9fdd4b5297ed4c48869152c09581d763e156552 SHA512 119856b47f2fb2d3560fedb60fc3dd432e5b150261c9d959e5e9426f7f6e03630fcade800b8e97fe6fc6edc717bc6a0a296c875c0dc771045b65d20b9df8a510
-EBUILD vanilla-kernel-5.10.88.ebuild 3738 BLAKE2B f0d652bed46a9c9989976a6c0af4e9fc23af6abb5806bbdc068e881ac518972776a0cec58bdee8be6e7efa1be4bf96b0b80d7f0c681e782bd0970dbcf4cf2cea SHA512 4116ba31864c6b4d9bfff1bbb002a2965aaa531eb9487c8fab8baeaddb6987efa710347ff6ea1abfdcc1db735a06c1d936b58cf05d7ffca19a6b84931264d4df
+DIST linux-5.4.169.tar.sign 991 BLAKE2B 9f1deaf031eec59ff36d5cf72b9154cda6fa9f4c90f588e7f59d9b2b12990e30d329ccd4127b52a52aedbcad06373f907e0903f0bfd76be98c78f135dee78cda SHA512 0683df80944f76eb8b4101237371fffd310f329662e8464452637e2fd46a86ccb4498d0e7781055c425e6ff6590e582b7641e8277ea22ac4084ed5b591352c45
+DIST linux-5.4.169.tar.xz 109192960 BLAKE2B 136c792f554832e6e52340ce935bf2f1b2b09c8bb8fab6889920b68bf27134e2d53f0228ec8ac31233a4b2a5b7faed87238d1c7d509ddd8c649ab8275a860e23 SHA512 43ba0a51c12e4366e0793217ce66dfefc13b83f0ab8a575a21058909e03f161410bff2aae272c64c5873779886d24d3fd0cc82655de5b20b428eca6cf681685e
+EBUILD vanilla-kernel-5.10.88.ebuild 3738 BLAKE2B af162b21a2028c2d5bf2dc9fb00fea10f05e9bc55571f2f1964591ec62566ff6a563b8b4a1c092e54064f51ac2911a77dc82a07c77878661fe63f692e67e5a43 SHA512 1f7e1b22e9fc3b5b1853d75a66c23e19a8b6edc094bfb48e00570815e07cf74c3545db877272a65e8986620a6fccc8a685bea81c2c27d05c792a30d3061434d7
+EBUILD vanilla-kernel-5.10.89.ebuild 3738 BLAKE2B af162b21a2028c2d5bf2dc9fb00fea10f05e9bc55571f2f1964591ec62566ff6a563b8b4a1c092e54064f51ac2911a77dc82a07c77878661fe63f692e67e5a43 SHA512 1f7e1b22e9fc3b5b1853d75a66c23e19a8b6edc094bfb48e00570815e07cf74c3545db877272a65e8986620a6fccc8a685bea81c2c27d05c792a30d3061434d7
 EBUILD vanilla-kernel-5.14.21.ebuild 2912 BLAKE2B 752ffb86053bbf3628386802b10dc2933faca9b2ca56e9ca49572f98b68730715b5c254822a34c29c5bcd2e79cb7b80715db7f6a6de8a095cca61449a7e18035 SHA512 7f56f05dc0319ce26009e7adf1f93fe1736c77e75e1f9ac2c5872c46eceaa957b6e67b54a602c1e2ad2798e45296332532061fd62ba2c9787b5555117e8ccddc
-EBUILD vanilla-kernel-5.15.11.ebuild 3737 BLAKE2B a8b8febd8d1724416b491a42f2807d570b686eb24811cb4d403b715d9fe4f39d372de319ed55416817cda5f7551dc650a2248bbb09e660ec30bf7917fbf7f589 SHA512 79764464615532de1271dc215e77d4de79f24297765d9c3490175860d95c8c0ce70026bd752a1f41a819b80d42bc5ae88c432977a6eaac7a726c8f28db94f5c4
-EBUILD vanilla-kernel-5.4.168.ebuild 3055 BLAKE2B 4d84f9ad4cba6e5efb32b16d4eff0ef34703389994a22c77dfb96da59144dc0d739e417be44bc20dd1e4a7bacdeeddf983c0f1f1aebac0c58171f512667b7017 SHA512 05e14e6dd7826439b45fa48486a4efcfcec6685855cdeed1a306426353f7d9a7dd4c775d9068076a8369b181278dd1c3cb029b375a026ed47d00de703136aa3f
+EBUILD vanilla-kernel-5.15.11.ebuild 3737 BLAKE2B b7c6af9f2182a3f4de7100063a9ee202475dda1343b7d139b7f9b46d0a67814e8e31e9abdad48372e76d6db792bfcec48f420731ece64fbd2aea0a172c14b046 SHA512 31d04ec1207726e6bee34ecab83cc6e9b31abc1cdc0aaaf7e0817b59c8b93d689d7f8237fd507d41d8f84e160b660c387c50f37800842fbdff916b26c618439b
+EBUILD vanilla-kernel-5.15.12.ebuild 3737 BLAKE2B b7c6af9f2182a3f4de7100063a9ee202475dda1343b7d139b7f9b46d0a67814e8e31e9abdad48372e76d6db792bfcec48f420731ece64fbd2aea0a172c14b046 SHA512 31d04ec1207726e6bee34ecab83cc6e9b31abc1cdc0aaaf7e0817b59c8b93d689d7f8237fd507d41d8f84e160b660c387c50f37800842fbdff916b26c618439b
+EBUILD vanilla-kernel-5.4.168.ebuild 3055 BLAKE2B 20d1dbe371aafb0b411bc062d55429078fa55a3daa657a6a09a568b6f910aad93310675b9be27696e367b817b1384fff43659f7a1272b7370c7345a954b19458 SHA512 528fdfdce1c8487fdc3f4f5ce2e1e84f9b60ee5991d05110aedbdb021657f8cf0ce8c99e1e4ff874055bc58a0b3b3557212f68b8495ffdf5a5a4518a3198ed44
+EBUILD vanilla-kernel-5.4.169.ebuild 3055 BLAKE2B 20d1dbe371aafb0b411bc062d55429078fa55a3daa657a6a09a568b6f910aad93310675b9be27696e367b817b1384fff43659f7a1272b7370c7345a954b19458 SHA512 528fdfdce1c8487fdc3f4f5ce2e1e84f9b60ee5991d05110aedbdb021657f8cf0ce8c99e1e4ff874055bc58a0b3b3557212f68b8495ffdf5a5a4518a3198ed44
 MISC metadata.xml 353 BLAKE2B cd022bd01b289ae703ae6ef6c2539fcfce833206c55e328ba02fc42b360d60f76b1920927b259dbb199724e6d3e7b0f68ba2044680d962d3cd03a973475582ff SHA512 10b10fd24801843108a71ca7d0c27514965b0a15a60da4d9b521fc41493448a1b1685ae3278dbd46cede0d069e51dede402d2c1448c8ae6a7fcfce8acf415bf3
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.88.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.88.ebuild
index ee6eb2c658fe..2d0af917a6cc 100644
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.88.ebuild
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.88.ebuild
@@ -85,7 +85,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/vanilla-kernel/vanilla-kernel-5.10.89.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.89.ebuild
new file mode 100644
index 000000000000..2d0af917a6cc
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.89.ebuild
@@ -0,0 +1,130 @@
+# 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}/${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="-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.11.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.11.ebuild
index fe8dc841eb14..f7731de3f3a6 100644
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.11.ebuild
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.11.ebuild
@@ -84,7 +84,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/vanilla-kernel/vanilla-kernel-5.15.12.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.12.ebuild
new file mode 100644
index 000000000000..f7731de3f3a6
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.12.ebuild
@@ -0,0 +1,129 @@
+# 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.10
+CONFIG_HASH=4882b85cc85fb2b7df396c4d671cc6432596eca0
+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}/${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="-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.168.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.168.ebuild
index 6d5a8965a422..28ef1d255fa0 100644
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.168.ebuild
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.168.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.config.${CONFIG_VER}" .config || die
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.169.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.169.ebuild
new file mode 100644
index 000000000000..28ef1d255fa0
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.169.ebuild
@@ -0,0 +1,107 @@
+# 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 ~ppc ~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
+			;;
+		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="-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[@]}"
+}