gentoo resync : 08.10.2021

4 files changed, 321 insertions, 0 deletions

diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index 482693fcb391..a846fa37299b 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -23,8 +23,12 @@ DIST linux-5.10.69.tar.sign 991 BLAKE2B eba1042c07f142456affc9a7a52427a812d04118
 DIST linux-5.10.69.tar.xz 116436852 BLAKE2B 09cad7df49f95459e08766d2a98d74007ee42a1e845f50259f88301a9e6368fc34decec3776d8d736cbd08ee73863c72b1b02bc345193d065c86d27e3922ebf7 SHA512 a86a6becdac8359b59647c01048d8cc21316e3bf113df85511e9890ca99b887b2def1e3bf0310bac54a986adeebfa9c76c6c4b9b805183d7e9ae10944fc051e4
 DIST linux-5.10.70.tar.sign 991 BLAKE2B 2a7b6af50b66a8447156cbd191aab6b99d4cf2632c1de769eafc6eb111caa0ba4e571b78fdb7877eab390625181274a2e61492d0310d51911f646a86d1770854 SHA512 80574a393ef40439c41341a3ba46eff0422460e51485dab29c2250ff9fb3a8ee9a17a7960c957128df08dcdddea578d616c94d5d74166d96f45cd490fe1b1ab7
 DIST linux-5.10.70.tar.xz 116426828 BLAKE2B 3bdb1890f1dca4bc20f1e3a5d9295bf3c9e598390ce71694049f7818526b8aaa173e2d24465d4e9da66a37254eccfe3bd34b3898a9f1c72ba372c196f956ca22 SHA512 db69bfd232d3d573d970fad673710232000fd52ae7abc60f73cea8beda88e9c3383c12a1e583aa798a4134b8646ab3cc8a251c16b0f6e7ba3301cdda9ca19d62
+DIST linux-5.10.71.tar.sign 991 BLAKE2B 693c1d0b231eceb00cb17402f07608421283cbeb613426add63649d3d6ef81535a7d40ae8fe174bb355284c1d1b6ccc2450b3859e906491993dc3cfc9b85486f SHA512 707ef8f7141f368b533d9b52f9245d10bdc9c9cdfefd0beb1f67c56003b1ab334d031d28ab94029877fb3fe90ca27307e8177cb58005132829c2279330989839
+DIST linux-5.10.71.tar.xz 116444552 BLAKE2B 6428513c80f203fe154275cba89af6d075c132364c31c08a567ef7dc220f43e6b00530887db1ca23d42c7a9d2795b58dfbdcd98336b92075b1ed401d170a685c SHA512 14cc7c1de20e9700b850dfc27acdb4e9c88467f03cfd28da6611e78759eb688e33dcc04d2f905d9d69ccb9819e5b5f5c39e02e3be2e4de2747f671c7a57eee74
 DIST linux-5.13.19.tar.sign 991 BLAKE2B d26b1e733f84725318d8dbf1e9fcade7beeadc38a4a07aebf6be653ab0dff5c0a5533b5591e753745aeeeaa7650b2bf0d1942878b2243aac01b68d0ca81f8367 SHA512 a4c5ad726818ad7bcb87c3b6621abecdb17ea14ba6cc8686bf36ace3c0d16f8c5353b4f02f0b02b60967957d13172c3fa60b1415ce3d2dd1c0f8a852127a6c4e
 DIST linux-5.13.19.tar.xz 119374060 BLAKE2B 6a05829867d75705e0282418bd68c1b60a4f2cdced39803458d67c975f8aa3ed455300c19300d7c7cfad71d2e5750b0b0750f825aacb0fb3794eb5b7b3189cc6 SHA512 77f6279fe7de3c0dd35946b991fa190aa70f5e806fa6188a0a676dad0939e2a20136b3dfc659dcac7870b387ead328fcdc287c8a25b63120bea1ac960117990e
+DIST linux-5.14.10.tar.sign 991 BLAKE2B 899b62183a8e8d9ca26a5bc789c9c728db18f0fb44b7887ceece72b0ef4cfb99444ad20bc08714fd62e1d8c9a4fc4bc8a3c48bad09086723f205cba821bf6c44 SHA512 cdd41731a8502864a04dc5dc3b21cc2b149015bb7894f2f7ace9b571784ff5ab6d2e7aa48b90fa46840f18edfb7bcfda5cb042f34c58b7232b643673accbb7fe
+DIST linux-5.14.10.tar.xz 120693836 BLAKE2B 8875ce37b6579e51de0ed3c059d99fe26b3a2ab3e795161fbb8de8476f2e3e26ebc1e0c98c3fb1b904b43e954ddb0f91b30248c91307d20912963f2f13fd9925 SHA512 3194f505ca347705e8f782df1a2d0c9614b20524c5f0560d02ca32860b1e8902107fb6eaa80ed4e50bf1f1c909993452d5747b27abbea3efdd7037c40a7f9e76
 DIST linux-5.14.7.tar.sign 989 BLAKE2B fe033dfdb6f5ac14474a7e603c2edef98eb7318d065ca57bbf7f8bfea0d1fb38d4d62dc28a3b014a3cdf4be64d36b05463d5902afdb794ea1b609e5e2872e1e7 SHA512 4926f4bcf283e2afc3bd5e7340e3dda69c40e5bd45d1b9effeade05fc04595c0153e05f07b458013224c950feb967127520cf9c2ef6d0e303b7545f10e49a871
 DIST linux-5.14.7.tar.xz 120688920 BLAKE2B 861405cd1333958cb829017b6c1d6692a7256d179a48fad751bb02cd02ba09227ff210d9252c592a99d3820c1fbdcc3a6e133cbed31fdecb68ba9cf27dfc8f78 SHA512 ab1dd61a9e0e5ed82b38684d01fbc5c00fbf28acdd5ee754095a9fabe5a5fca7c220b37f80c2adbdd0bd46be461ded6397e40f7a827ea18035124f06756ad743
 DIST linux-5.14.8.tar.sign 989 BLAKE2B 2987fdf70a35ffbc5a8b63dd821f83e4eee25cea66518a41a91a48d22c5670f497abce18b94ca4a351122c78fd02c240a6a5fe9514873aa396ce2a79ddb83301 SHA512 ff7c67c99237b7f52942c54a9ee1f4a1272760232bb7e65d314484ad773d1fcb37070e404b458721e3d3d92f5849a001479a370c9bc3e5b5c72651ac33d1d8f8
@@ -37,14 +41,19 @@ DIST linux-5.4.149.tar.sign 991 BLAKE2B 879b5dc9582b207bcc3c7f596cd69b16b0aeae26
 DIST linux-5.4.149.tar.xz 109157092 BLAKE2B ae84c14229bb8b60d6e471b9ec5d972c7b25ffc1ed50763d8c2a3b5862adfa1deab28a7cdbcb06741e61fa6b6217d2392855d3a7e84c9313a9d07bfba16e426c SHA512 74cab8eeb345da9842ad87ea92563c928cb91b94bd056a250adf5b07f68f2ab28bce2f09a80e9ba3b1b6833807350f01a7661066cb08015d814a6886cca46783
 DIST linux-5.4.150.tar.sign 991 BLAKE2B 6292a8c6bc16f62201d95a170e5df7b1edd9f33ee4274a3ebaf908cabcabee740e376f92eefbcf36efbbca6200682622a80f573cf7f872978d263d2dd44595eb SHA512 cf6925f0f9307ec7ebb4345c84a74fdf98102e0a3866dc997c765f7f836be5101ae34d0655a4c5c1c632182da962ea49389056358661763eeacb4ed5814a094c
 DIST linux-5.4.150.tar.xz 109155076 BLAKE2B e34c474778d2ba1a619551fdb6c81be01ed0d155ab447bfcbe497c2258637b939fc1dda7d7161d8782e38d8c84e9fc94043d62a43698258594fdd6cfea8ac79b SHA512 5f6cc5852cb1e881027b8724920dd03b96f3ce2a58353ada6f7cf5bb0bffb3a8d4ded708f50963074ff41236e8c0aeaa7f81df0ac8e4f1147a7c4a0160c2c543
+DIST linux-5.4.151.tar.sign 991 BLAKE2B 26cc28a8ea886acbd2bf16e23be6e5368958a91f2e3d403ce7a90f94c427ffc05a3edb670367f4f3934cca31b0213b85743f98554fda6b1a7b50577cad90b391 SHA512 95fded48c138d70f5c7df0828c23b2575fed66fb703128b61e8f59de282569aab7f45bae6f2ba9f1dec256a96cda987023246b53f42102ac339b418b63e67be6
+DIST linux-5.4.151.tar.xz 109163992 BLAKE2B 12c2d24acab896ccf0d6edeea3d38fbfecda4621dddce4d5ef916b6face70a509cde8ae35ada5a65eb08c79afdbe4c84544a63e52c712d8d42682dd8559df296 SHA512 e210b9cdb47e5dc294688e23dffdd853bca96bdd613d6f476c291e1c949e185be2047735c69c01602c46d0bf767367975bf08b7b6976297b6a486529b0418982
 EBUILD vanilla-kernel-5.10.68.ebuild 2913 BLAKE2B 73f4bfbc33d65cabaf34762e6512d92a67735abecccebd91170ac7e9d3e925b2c3b127f8d27cb45a729e424c87ca0646668a9566f4f7a9a44724dc53142174b6 SHA512 2628599f32bed1adfc1e5d37883f0601c941ad2757bfd9c5eff839f5f9e0c7b5f3946213ac574f317be0fa8e5f4f17ae519d0ea33cd1680389c907485553e6c2
 EBUILD vanilla-kernel-5.10.69.ebuild 2913 BLAKE2B 73f4bfbc33d65cabaf34762e6512d92a67735abecccebd91170ac7e9d3e925b2c3b127f8d27cb45a729e424c87ca0646668a9566f4f7a9a44724dc53142174b6 SHA512 2628599f32bed1adfc1e5d37883f0601c941ad2757bfd9c5eff839f5f9e0c7b5f3946213ac574f317be0fa8e5f4f17ae519d0ea33cd1680389c907485553e6c2
 EBUILD vanilla-kernel-5.10.70.ebuild 2913 BLAKE2B 73f4bfbc33d65cabaf34762e6512d92a67735abecccebd91170ac7e9d3e925b2c3b127f8d27cb45a729e424c87ca0646668a9566f4f7a9a44724dc53142174b6 SHA512 2628599f32bed1adfc1e5d37883f0601c941ad2757bfd9c5eff839f5f9e0c7b5f3946213ac574f317be0fa8e5f4f17ae519d0ea33cd1680389c907485553e6c2
+EBUILD vanilla-kernel-5.10.71.ebuild 2913 BLAKE2B 73f4bfbc33d65cabaf34762e6512d92a67735abecccebd91170ac7e9d3e925b2c3b127f8d27cb45a729e424c87ca0646668a9566f4f7a9a44724dc53142174b6 SHA512 2628599f32bed1adfc1e5d37883f0601c941ad2757bfd9c5eff839f5f9e0c7b5f3946213ac574f317be0fa8e5f4f17ae519d0ea33cd1680389c907485553e6c2
 EBUILD vanilla-kernel-5.13.19.ebuild 2911 BLAKE2B 3bd4c0c39d864d5f47bb3c1982678cafce6582f058499d37759cf0a7c6b3d9801dba32919336c32e09ae304e2d518471cf8d250c0b5c25e2b02603f8ac9b7f9c SHA512 1771f396d100988ffa05ea691cc1013c185bf75742f9b41aa114a23258855147693bcf383ab382582d6a8976883e887f11be64bf9c273c369c12eac467c6cc24
+EBUILD vanilla-kernel-5.14.10.ebuild 2911 BLAKE2B 6020b3ffa4c88d614a6e375991aabb5034ff0141310485f5e77d9ea6edb8cb02eed43960cb55e737f2baf258a29167064ecd97d5d9aedb2cd37eed681aaf7a30 SHA512 6660d9e55b1693d9be31d52d29103ab73cc9557196c776679d2ba8a5f7f5576a3305963449f43e81b7b4f3021a88d9e4ca0518fea1447f85ceb48670d7bc0456
 EBUILD vanilla-kernel-5.14.7.ebuild 2911 BLAKE2B 6020b3ffa4c88d614a6e375991aabb5034ff0141310485f5e77d9ea6edb8cb02eed43960cb55e737f2baf258a29167064ecd97d5d9aedb2cd37eed681aaf7a30 SHA512 6660d9e55b1693d9be31d52d29103ab73cc9557196c776679d2ba8a5f7f5576a3305963449f43e81b7b4f3021a88d9e4ca0518fea1447f85ceb48670d7bc0456
 EBUILD vanilla-kernel-5.14.8.ebuild 2911 BLAKE2B 6020b3ffa4c88d614a6e375991aabb5034ff0141310485f5e77d9ea6edb8cb02eed43960cb55e737f2baf258a29167064ecd97d5d9aedb2cd37eed681aaf7a30 SHA512 6660d9e55b1693d9be31d52d29103ab73cc9557196c776679d2ba8a5f7f5576a3305963449f43e81b7b4f3021a88d9e4ca0518fea1447f85ceb48670d7bc0456
 EBUILD vanilla-kernel-5.14.9.ebuild 2911 BLAKE2B 6020b3ffa4c88d614a6e375991aabb5034ff0141310485f5e77d9ea6edb8cb02eed43960cb55e737f2baf258a29167064ecd97d5d9aedb2cd37eed681aaf7a30 SHA512 6660d9e55b1693d9be31d52d29103ab73cc9557196c776679d2ba8a5f7f5576a3305963449f43e81b7b4f3021a88d9e4ca0518fea1447f85ceb48670d7bc0456
 EBUILD vanilla-kernel-5.4.148.ebuild 3073 BLAKE2B 6038d04284e4343059e7664c466935a0a022da16a8da1c65e0a3077f87374f6aa61b38e1d5af8ab33f3c4c7e9ea5d9d2272f80348e05574d84f7edac1d7fb865 SHA512 8497553ccc9b2961a0b8f4ccf082106d40ebb6bee06658489523eb7670f313cb3a4ee0ad27a99ca113578f784c6d7ec9c63b39ddbc414c74ae2c12a088889e9e
 EBUILD vanilla-kernel-5.4.149.ebuild 3073 BLAKE2B 6038d04284e4343059e7664c466935a0a022da16a8da1c65e0a3077f87374f6aa61b38e1d5af8ab33f3c4c7e9ea5d9d2272f80348e05574d84f7edac1d7fb865 SHA512 8497553ccc9b2961a0b8f4ccf082106d40ebb6bee06658489523eb7670f313cb3a4ee0ad27a99ca113578f784c6d7ec9c63b39ddbc414c74ae2c12a088889e9e
 EBUILD vanilla-kernel-5.4.150.ebuild 3073 BLAKE2B 6038d04284e4343059e7664c466935a0a022da16a8da1c65e0a3077f87374f6aa61b38e1d5af8ab33f3c4c7e9ea5d9d2272f80348e05574d84f7edac1d7fb865 SHA512 8497553ccc9b2961a0b8f4ccf082106d40ebb6bee06658489523eb7670f313cb3a4ee0ad27a99ca113578f784c6d7ec9c63b39ddbc414c74ae2c12a088889e9e
+EBUILD vanilla-kernel-5.4.151.ebuild 3073 BLAKE2B 6038d04284e4343059e7664c466935a0a022da16a8da1c65e0a3077f87374f6aa61b38e1d5af8ab33f3c4c7e9ea5d9d2272f80348e05574d84f7edac1d7fb865 SHA512 8497553ccc9b2961a0b8f4ccf082106d40ebb6bee06658489523eb7670f313cb3a4ee0ad27a99ca113578f784c6d7ec9c63b39ddbc414c74ae2c12a088889e9e
 MISC metadata.xml 353 BLAKE2B cd022bd01b289ae703ae6ef6c2539fcfce833206c55e328ba02fc42b360d60f76b1920927b259dbb199724e6d3e7b0f68ba2044680d962d3cd03a973475582ff SHA512 10b10fd24801843108a71ca7d0c27514965b0a15a60da4d9b521fc41493448a1b1685ae3278dbd46cede0d069e51dede402d2c1448c8ae6a7fcfce8acf415bf3
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.71.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.71.ebuild
new file mode 100644
index 000000000000..12c958a4bb2d
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.71.ebuild
@@ -0,0 +1,102 @@
+# 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.10.12
+CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530
+GENTOO_CONFIG_VER=5.10.32
+
+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"
+REQUIRED_USE="
+	arm? ( savedconfig )"
+
+RDEPEND="
+	!sys-kernel/vanilla-kernel-bin:${SLOT}"
+BDEPEND="
+	debug? ( dev-util/pahole )
+	verify-sig? ( app-crypt/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-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
+
+	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
+	)
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.14.10.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.14.10.ebuild
new file mode 100644
index 000000000000..d3a06ae09749
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.14.10.ebuild
@@ -0,0 +1,102 @@
+# 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.14.6
+CONFIG_HASH=416de8884575795f040923fb460e7fc5e5d67102
+GENTOO_CONFIG_VER=5.13.4
+
+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"
+REQUIRED_USE="
+	arm? ( savedconfig )"
+
+RDEPEND="
+	!sys-kernel/vanilla-kernel-bin:${SLOT}"
+BDEPEND="
+	debug? ( dev-util/pahole )
+	verify-sig? ( app-crypt/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-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
+
+	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
+	)
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.151.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.151.ebuild
new file mode 100644
index 000000000000..dc33930084ad
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.151.ebuild
@@ -0,0 +1,108 @@
+# 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? ( app-crypt/openpgp-keys-kernel )"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
+
+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_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[@]}"
+}