gentoo resync : 05.03.2021

4 files changed, 315 insertions, 0 deletions

diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index 4fe741980c63..47fb5c93ee97 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -19,12 +19,18 @@ DIST linux-5.10.18.tar.sign 991 BLAKE2B 2fce16ebaabfa28241ea267bf96c365d044315f7
 DIST linux-5.10.18.tar.xz 116263744 BLAKE2B c633632c8a2c80f238105878c1b4a062ae81e1c7e404b73572c0cb0dd458645cf46c0881cea96668c8cf40a9b12da2d4693e18495f8fee0627ceab87eea34236 SHA512 e9ab577036391692d7237e2d945d8a682afa4bc889f03934db4e1873db26df6404f7ae0cb989986ec64fdb529a3308c6c9c496247596ad43592c1d8fc52e9c46
 DIST linux-5.10.19.tar.sign 991 BLAKE2B 70ee178a74d6c1a779ea399875bb884b52f918e9a8a797fccae7fb26e7eff9eec1a0cc9421e43597d9d477d53d4a26a7fab4afb8f6280a67d48b171829a56bfe SHA512 af99693e0a30d625f346fc682b19bac68247af58574e9a78b2a5478cc0df4a5fca0a2a3ebc3c86f7d5451a6b1f87c0ff524336c4f09b49cfbfb4d21b9776309d
 DIST linux-5.10.19.tar.xz 116276000 BLAKE2B bda18c64b1d7be5cba5d3942386764a778a60b360eb47faeb3f2c84806835d2b325b75a00f5cc3a8a3680e0004ff339caa3a7a301cb6a453e838c92b9f89c3db SHA512 95a9e41d3b23a8b88e2a2ad12e6503efe577b80cff398b51ba7f6ccb0b73768a1cefb2cacb727dd54bd5b5638ad1d5cdabdb23c06aed37d726a59b190de1f2d6
+DIST linux-5.10.20.tar.sign 991 BLAKE2B d28c5eb090749842d5787bb114f22f1548decb03f86a45e03e1fb510af309c79cda74522d74514f52df24804cb8639843b7c71fcd97d2a257a606ff763d1c98b SHA512 99d82a0b754214b27908c813d97eee1a7d16f3f8e001be7b6193833a3ac086dd55632ac2c4cdeac8ba073cf7fbff99784a885fc33fab293b7700c16bd35c4219
+DIST linux-5.10.20.tar.xz 116279592 BLAKE2B 462b29fe4147a1a19be7a15eb4aa62cd8d363edf406d78e1b02591654ea983165091aeddc1925a21e4e16251464f978b92cb85ee451944172eb777690271c0e8 SHA512 487f96d0e9117c532fafbd0133ed514ead8238cde8bd285951a33853e5796a1c1407447278b321b61c59174fc2bd79d071b1354b5fe8dfca5acbd7fe623a6bde
 DIST linux-5.11.2.tar.sign 989 BLAKE2B 404589119de8a0bff3e0feb77a54eb98add568470d4260767830ecb488fec415a0eb79a87eb6b19963b26a78ab8944d4041a38a80dc515f42f14350dcf825fcc SHA512 497f0c06d43cede60cb60816bac0cc22a3c7976bb71bb2f2aedced69c44561b842bae94cf51d5cd0ed506c1eb5b58c038bbf17049176f074cd0e7442eded4fdc
 DIST linux-5.11.2.tar.xz 117609344 BLAKE2B 62f47c769998fa713cda9024a4ecbe7ba2140acde629082630c2c0b076b4e941b0a1e82f7d2b7cd4ed6e84759ea93de78e212ecbe1341d9055091d26d83286dc SHA512 16090ec6dea7a8c417ca7483b296902c9b55b423482ad8a881dffcaae76411806bc9502373efd6a51b0acefec3a44c19c5a7d42c5b76c1321183a4798a5959d3
+DIST linux-5.11.3.tar.sign 989 BLAKE2B 32a3eaf0cf1ca17fdd3d541def9a6cfb04d6b9fa701df737cb7713c7969a7452a5b8366751c6538f5171af7875382f2c3706d968f41ddca49a00a46b5f108dd0 SHA512 719150274d08392b51564ac35c45a6ba987ec329d69af28351a0f8842114ca30ecf23d025594ea3ed8280adfff7ca88754f850f512acd493059c71c98d9a7c13
+DIST linux-5.11.3.tar.xz 117629864 BLAKE2B 9451bda48221ea58096682a4ce107194580a6fcaccb15d62b881c2ba8eddadbd46b010b20e2fa8e723674de0d29dd0a12749c9245db39b521659bc6cf2f270c5 SHA512 dccb2f5a186052a7e8a46293564d6c727ffeeebde31d764135020ac9a65bd51e2ee7d94ac1defcebce7cc73ace3e9620f88a236207e7f15c7d576038ed27adee
 DIST linux-5.4.100.tar.sign 991 BLAKE2B f1442b1523de568ed757ab3ba89d571b0c5d85a192718a85ec72736858c0025b09b0d22eee906d4300e41a8f24ab8d56eb0039ba0b46b63b049a16c8cd65153b SHA512 7e7e298917a6167aa9d3a61cd1423c5fad89fad06f66c1ac01277aba7000dcbb1558f978644558cc79b57d70b677016077f0f4cdc3eaa69e39cda75b0d5b18d7
 DIST linux-5.4.100.tar.xz 109081252 BLAKE2B 2647a326c55050c3f0340c2e7ce98761e8bc3d5900c74785eac779295ba6e84d99d65a2ba9ab575fb412bd5caf6db6d25b32ce9b10373cb3879de2cbafd861a0 SHA512 8483e34ac7ac59903d51ef2b5607fa2608a824d0f95548f3c8eeefe9a6b4be3bef44865df68960feacd02ed7bc8dbbb1625f0bb8e6626bbf096c2a0db474998a
 DIST linux-5.4.101.tar.sign 991 BLAKE2B f10908550c9ebe18dcc06839046ea215d5fa91cef48180836c2582a3200852dd005e39ff5ed6b203bc5ffb4098018fe2437d363ae84404370a9f40e8e92d446d SHA512 bcae0baa578b248d21b270106b5ba0b4ea23f383a24086ba04d7433c2df534ddac9f2373383407637cc3a8e81d14e3f5407dababc3b01333bbeafd36101e2f54
 DIST linux-5.4.101.tar.xz 109078848 BLAKE2B 9dd7727655005ba2bf906fbaac86107dbe541cd42878eb3fb96f9731e8196b4e059dbcd772e7c11c620ef784d09ed353f7d92e2388adecc0906d1c71fc8edea3 SHA512 225d5aeb1e0aad9f048cafe94477c8ea5123f26145681b2a2fe24f81dc61694f964b585b6cdc63eaf3898e5feb38159097cb611b9e2e2455de331e6a4875970e
+DIST linux-5.4.102.tar.sign 991 BLAKE2B 5a839b6415817715eae350f2c7e8f1b8711c41a1de5ac2e545d1538d5351e37198656b46f2a086d00905fa4f28bf5658f4abc608320e4015885f7dd675328361 SHA512 22cce67a245acd8b9a1c21a191e9ed10ee992631bf78f14f55b34b9f977650ee715302cfe4401b8681ce1758a63e25a6e6cbb7493d7fd3cc9ffab132056e631e
+DIST linux-5.4.102.tar.xz 109080872 BLAKE2B bb4a627999ce6ecea5a8cea0fdaac5b3443c9168a381b0ae8c86b1a07554cdfe0e0b395246398f21f082f153602335b1768fe060ddff4c3a83c4ee040ee708a3 SHA512 385a075e2d68d9d90c77183d743766fe5f6d9a279e8e4e73aeb916adae0fd17fc533cd944c14c5cd289e025f880dcb45211dac0ab7fc227afde4f8b7afd5689e
 DIST linux-5.4.94.tar.sign 989 BLAKE2B 779a725d0164c98bf2ebc0590af693eebb6fe71837e0f8642b376fb0fa4bc893e8c2b52a16bd0c1cab7aaff4295f6bf31b8fdb7c2d95bd8601eac74925e2211f SHA512 85ec9c16642aac5640d0486ba704b787e2e4156fccdf80f4d538b4d6524c914b64e6ba1d52bdda15b3601faec643d6656fa2cf57976a9afaff5265f9dea840e0
 DIST linux-5.4.94.tar.xz 109082512 BLAKE2B fac6683453e41065760cbdd170ea4a5f72778e39807389d2f4c4dd9165dc1727a875ee26e6e440089ec2d8e8b4dca9fa1e1dc02a9b217cada700f9a118ae7613 SHA512 2d9f0feeb9ba6871d31c8a5e281c8e3eed99ce7da3af3be4f222db37f082374f852021a5117a994c8cc37681e5f335329c9e430e7edb835de801c901765a505b
 DIST linux-5.4.97.tar.sign 989 BLAKE2B 767058a0c491aa1435d5dcd25d5f26ed1dd283cbb903063d00020e2a5e7a2a965b7774df3fe4e5484bb1c76e906e9622057f60420d9dfe31a5305d85b15e2d1e SHA512 09fc4efaf777d12cfeb61e7d24651ca68461c108666be90bf216ee5586cabf47976d60451f8cbdb636ff3f3a4b66b84edfc0255b26d3589f918c22aa394dd76a
@@ -34,9 +40,12 @@ DIST linux-5.4.99.tar.xz 109078664 BLAKE2B f0a869edf3aa04a2211f039561fa16a419ebd
 EBUILD vanilla-kernel-5.10.17.ebuild 2822 BLAKE2B 15cc341a729d8c1c53af65cb73de5edaf010283208f54f13c46934266e753aececa19c274602a4cb05238d3af54d15c2b165792c8612ecc1018d80275c708a08 SHA512 2bd2a68c06d5555ce1b2bbdafe29668bfda4e04e0cbde1ef3f2f278a7b2210694c02664979eb156af210557aeffb2a5509f8d319e68440b2f3c7572f0afed6dd
 EBUILD vanilla-kernel-5.10.18.ebuild 2823 BLAKE2B 56ac7807af68bad4d36c3952cdfb343c837c1cf2eb41e757e191c7d29aac6649065402aed1b62c42dbd1fb32149868a21a8897e0dc61776f9d0bce91e62f1d81 SHA512 a9731abb7c0b861e4c4d2270e8b7fc7c32cdd68a7de6d90a1d92efa33d11239e3d0b0706135cce29367c3a98386c85c9c42b57e9635e6ddcc784500a01cc3e09
 EBUILD vanilla-kernel-5.10.19.ebuild 2823 BLAKE2B 56ac7807af68bad4d36c3952cdfb343c837c1cf2eb41e757e191c7d29aac6649065402aed1b62c42dbd1fb32149868a21a8897e0dc61776f9d0bce91e62f1d81 SHA512 a9731abb7c0b861e4c4d2270e8b7fc7c32cdd68a7de6d90a1d92efa33d11239e3d0b0706135cce29367c3a98386c85c9c42b57e9635e6ddcc784500a01cc3e09
+EBUILD vanilla-kernel-5.10.20.ebuild 2823 BLAKE2B 56ac7807af68bad4d36c3952cdfb343c837c1cf2eb41e757e191c7d29aac6649065402aed1b62c42dbd1fb32149868a21a8897e0dc61776f9d0bce91e62f1d81 SHA512 a9731abb7c0b861e4c4d2270e8b7fc7c32cdd68a7de6d90a1d92efa33d11239e3d0b0706135cce29367c3a98386c85c9c42b57e9635e6ddcc784500a01cc3e09
 EBUILD vanilla-kernel-5.11.2.ebuild 2822 BLAKE2B 6d6781cd321f571dc5f8c8674821b9b76e83238538fc730d917190b77570676b38307c306a08c4bb7b70009a83aba3d802235e9df27b91d5804e711e3f995f35 SHA512 38a90c645bfc688311cbf6ccc8aa76ae4e9aafb5dc90c8154dd4576234c374feb05d7c6db9f4841ae5d4437948de67b15b71dbca747386e82703afd63cf77623
+EBUILD vanilla-kernel-5.11.3.ebuild 2822 BLAKE2B 6d6781cd321f571dc5f8c8674821b9b76e83238538fc730d917190b77570676b38307c306a08c4bb7b70009a83aba3d802235e9df27b91d5804e711e3f995f35 SHA512 38a90c645bfc688311cbf6ccc8aa76ae4e9aafb5dc90c8154dd4576234c374feb05d7c6db9f4841ae5d4437948de67b15b71dbca747386e82703afd63cf77623
 EBUILD vanilla-kernel-5.4.100.ebuild 2982 BLAKE2B 655e423abffef1c98d8c71ccf1472757ba29a60564913daebbffd5e126ae23491efa4161d98dd375eb2d6bf95b4f2cca863454b02d8b2d7c51a7e672c3e9add7 SHA512 fda28864e7e8a93a4d2a20247b90aa178967b3c3c9d564063e75897d6cd0aacd04cf9d8711f6103f7aa0be9d28b1344beb5820d04a5eae4ff3b93dc669cb8a19
 EBUILD vanilla-kernel-5.4.101.ebuild 2982 BLAKE2B 655e423abffef1c98d8c71ccf1472757ba29a60564913daebbffd5e126ae23491efa4161d98dd375eb2d6bf95b4f2cca863454b02d8b2d7c51a7e672c3e9add7 SHA512 fda28864e7e8a93a4d2a20247b90aa178967b3c3c9d564063e75897d6cd0aacd04cf9d8711f6103f7aa0be9d28b1344beb5820d04a5eae4ff3b93dc669cb8a19
+EBUILD vanilla-kernel-5.4.102.ebuild 2982 BLAKE2B 655e423abffef1c98d8c71ccf1472757ba29a60564913daebbffd5e126ae23491efa4161d98dd375eb2d6bf95b4f2cca863454b02d8b2d7c51a7e672c3e9add7 SHA512 fda28864e7e8a93a4d2a20247b90aa178967b3c3c9d564063e75897d6cd0aacd04cf9d8711f6103f7aa0be9d28b1344beb5820d04a5eae4ff3b93dc669cb8a19
 EBUILD vanilla-kernel-5.4.94.ebuild 2982 BLAKE2B 655e423abffef1c98d8c71ccf1472757ba29a60564913daebbffd5e126ae23491efa4161d98dd375eb2d6bf95b4f2cca863454b02d8b2d7c51a7e672c3e9add7 SHA512 fda28864e7e8a93a4d2a20247b90aa178967b3c3c9d564063e75897d6cd0aacd04cf9d8711f6103f7aa0be9d28b1344beb5820d04a5eae4ff3b93dc669cb8a19
 EBUILD vanilla-kernel-5.4.97.ebuild 2982 BLAKE2B 655e423abffef1c98d8c71ccf1472757ba29a60564913daebbffd5e126ae23491efa4161d98dd375eb2d6bf95b4f2cca863454b02d8b2d7c51a7e672c3e9add7 SHA512 fda28864e7e8a93a4d2a20247b90aa178967b3c3c9d564063e75897d6cd0aacd04cf9d8711f6103f7aa0be9d28b1344beb5820d04a5eae4ff3b93dc669cb8a19
 EBUILD vanilla-kernel-5.4.99.ebuild 2982 BLAKE2B 655e423abffef1c98d8c71ccf1472757ba29a60564913daebbffd5e126ae23491efa4161d98dd375eb2d6bf95b4f2cca863454b02d8b2d7c51a7e672c3e9add7 SHA512 fda28864e7e8a93a4d2a20247b90aa178967b3c3c9d564063e75897d6cd0aacd04cf9d8711f6103f7aa0be9d28b1344beb5820d04a5eae4ff3b93dc669cb8a19
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.20.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.20.ebuild
new file mode 100644
index 000000000000..9fe09baa8621
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.20.ebuild
@@ -0,0 +1,100 @@
+# 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.18
+
+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/dwarves )
+	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
+
+	local merge_configs=(
+		"${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.11.3.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.11.3.ebuild
new file mode 100644
index 000000000000..6faf44c48778
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.11.3.ebuild
@@ -0,0 +1,100 @@
+# 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.11.1
+CONFIG_HASH=07992209452cd7ba529ffdbdd83d01d44cd8ae14
+GENTOO_CONFIG_VER=5.10.18
+
+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/dwarves )
+	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
+
+	local merge_configs=(
+		"${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.102.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.102.ebuild
new file mode 100644
index 000000000000..f8ec23f5913a
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.102.ebuild
@@ -0,0 +1,106 @@
+# 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.89
+
+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/dwarves )
+	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
+
+	local merge_configs=(
+		"${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[@]}"
+}