gentoo resync : 05.03.2021

4 files changed, 283 insertions, 0 deletions

diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
index a4ec0f4c337b..d1765941481d 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -4,14 +4,20 @@ DIST genpatches-5.10-20.base.tar.xz 551256 BLAKE2B fc2db45cc49ae771f3c87cd97ba36
 DIST genpatches-5.10-20.extras.tar.xz 1768 BLAKE2B e69295002cda9c81df01d0e20a6ae691f3d584dc91ae7bfe3cae777fae430829b6b4450c5f38f91a2aa42fcd9b6adfb89bc85642f30e8caf7cb34cd301f5261e SHA512 1bfce3155025596db1c1e90c4119812a83d1574519d16805574c84e0b8f5936b5e3a2e5400e92b59c2844b903b9517eb2b9d220054ebd3912af23a4b6914db7f
 DIST genpatches-5.10-22.base.tar.xz 554876 BLAKE2B 18d2a41fea4a8a95983a71185248f9fd27d2f4e8863419eaae66cf826ecd74218e0563804262368f3d23bee1f835b18869644af734f0baa8d1266a37ff495061 SHA512 7fca3a5fcd35425b0d6aa37cd0eb1146c6fec8ae5f4a462f058180057e956a4316a26a0c0600780014ffe2f632cf64f135f8d0b337ca6642a949c3654783a4c0
 DIST genpatches-5.10-22.extras.tar.xz 1772 BLAKE2B 3a72d1838aca6ca79985e06d9efc44a10bc3e766431c2ebca64b773c96be52cf27f121331585030e334d2eb7d1415deb34f42c265619b16186fb406baa12bd23 SHA512 81559580dda2d4ecbe693eb25d9d537f0d3dc3a01c1a863f17eff3b0e890a2850bdbb7ed5e856bf6b9c7dde944dd771710a8b64812391b5a3c214cc0e2c8538f
+DIST genpatches-5.10-23.base.tar.xz 721640 BLAKE2B ce1bc52582180682df3a74f5fb03f9646140fee1b90baf018121acec281c565880494725df08701a56f46e33717a06ce820d21917700e74c0d57d6306bc6cb79 SHA512 44b253cf5300b1c0561e92306b85ce7b51f926dba58325c439f6383504a5bde06401086b03e1ae23ec961b2ff78f5b9933c794a623c1f29be5452db64a61ca0c
+DIST genpatches-5.10-23.extras.tar.xz 1772 BLAKE2B 71ccb1fcdb038c28d8e35c5f93a3956cfd277df6cf9ee0b65a1984044bc032fc979066fb1f7cc103f3065d83b72ca2a5f6d7df76a163630127858827e1a34b6b SHA512 3854ebd16b7dc0fc3c2a5aa40bd74bdcc1be1597bd4196b488e40deeed5917c2df162c1b27079f38c3792b30de7f100e90bc9db42fcd12cdc9d3647e12c84182
 DIST genpatches-5.11-3.base.tar.xz 11280 BLAKE2B 83a975b07b3e04e19b008e5a5c4f08fa551b3558b68afb800cb3c886f782a21950d5ea1029b631a6caa2658f02e7ae819e8d8c137a076470120d94deab99e524 SHA512 0a8b19f888af853e6a12aff9d6675f7a9977fef92efa19e69c79a6325fc1626efe7aa9fec8c42ee65ba29f0757b166567679a54d0351f19ea502183e92a63ac5
 DIST genpatches-5.11-3.extras.tar.xz 1772 BLAKE2B 165d5928e6afc65544392186737efd1df9e1179591ef7edd85a1868971ea76016161a38a615e9e692c4515fe7fc19424a0cfd01420b5ec57a60c8d1d2d223cb7 SHA512 c74015c4e1b824c61db9e9deca6b30a839ae9a8fb5747cb6c46e2af99a9221f11bb971099554107bbfc58ea5389d96e810f9cf8e55d0bcc16a093eef941c6ec8
+DIST genpatches-5.11-4.base.tar.xz 247120 BLAKE2B 64e8bb77aa399a797a9dd9726ba51a00ec43d850504680c52b9fe3ebc1277e1e2216a43719bd79b12e3267171f1031feab5adffc35bfffd87f91302b9f8714ee SHA512 9480fa377439c010f6aaae8c5ec6a512070cb30bb6171e31617dbb24ef54687d13bddf4768c5652d8e8c640d4c6b9c85fa0b434d8634d58154ee205db2c1cf28
+DIST genpatches-5.11-4.extras.tar.xz 1768 BLAKE2B 4e7641168121f833915d68989504a437d496debf78acd943350582b5594c112a73b240e01cdfedf65d352f925d7d4e2cbf2f6ea67dfad1200971a4f9da28996b SHA512 4e0788eeb2080728ef8161e5605c171c45740dac2d7b16c428cadb9bee09bd6f129f98a5790368eceef7b3f8d4f5e2ca5d12df52346bcb84c44fb826d72072f0
 DIST genpatches-5.4-101.base.tar.xz 3089116 BLAKE2B c6e716ab8d0e98d3b3b4c492d6a516ada65f5e77d375cb9164a080aabd94311c50a222135499eef9dcad3f80b29b831a3fe015c3006178651c2136620f9079c5 SHA512 1bdd6f8f23a6151298e2e2fec493c9a2e95a1a65f4a4b6ff95598f45d4fad783da2a596c05b5582ec3d82ed8d8aaf654706da768a1b248bdae37fb08481b3dc3
 DIST genpatches-5.4-101.extras.tar.xz 1768 BLAKE2B 44b92b9c288f4f10f499e5b6d2179b44ee3418890905341703901a71b703ff99e992d6e7424521e67d3b1f80e41286c2357187c66e9b1ae7c1feef430f0ed74a SHA512 e397f970bc3b68b91f059e4b4f2d6163f8416340096b16b040eed8a5242a001db37b0fe8c1fd2a54c73bf6121aa55efa1c362b7837e930b758bc3bd33f8dce09
 DIST genpatches-5.4-102.base.tar.xz 3090460 BLAKE2B fa17228e7cfebb2c128b73682cc97f9e96a1a3c4936f98b021ae3f21a1f6a1167c357db2570902ca554b6facf27d507a0d258c4a9e9898cacde502762306c2ca SHA512 e3b7b0826115a7f7c92f5509eafe25803ea943733a8be8404a333d54ac93c607704f742ab20576517a7ac6e5467a7dfc9c2a54205a10f3fcf4af9b2557a5da0d
 DIST genpatches-5.4-102.extras.tar.xz 1768 BLAKE2B e9bdc3e77e4cd6feb17c3b84b0b573f60b399262cfb5cf5893444afcda38b3017f41c5e00313fc5af30108d60fef2603dd3ce32cfd36b0e3644f85b782da0206 SHA512 bf88c37717a240a62f64cb7a04af13244ea3c5e531b160c649d39243184266de8e61e7c84f092b4b931760fa786dbe40523a0ed55eabc65824f63f0b330604d1
 DIST genpatches-5.4-104.base.tar.xz 3093716 BLAKE2B da8a9f572f4a22eb101a477ed2b2a81b0adaed65f1913c163b58dc958de661707733fb1e0d06e49ec342666ca0c212313d3a5fbca60c79779009b91361e23f42 SHA512 2ef214d2e4ea982c6702991519aaa183d6731f882fa59db5cc2d7832c7fcaf8de57dc2173f4a59922e5d90da2d046753b3eed609513c84c784c13d5be747303b
 DIST genpatches-5.4-104.extras.tar.xz 1768 BLAKE2B 7f335d61bd5f44cfa74ce2082259a48791ed90c21da4d05ff13c191adf1f658e68634c4cf9779274e6f775409695634ca40187754b0f9d50b406c26df26adbc4 SHA512 a8080605c59079063065d9bebc9d846ab8aab73f2f192f6c5becea2b51304a1e4d91e20d9aacd61f2cfa5b967bb8e30d620ddd60592017f308ad2f65ab7287a5
+DIST genpatches-5.4-105.base.tar.xz 3163684 BLAKE2B e11b77067fb714f827d68ca0773ae5f097a4234f89eb0ea5bb04ef6cbf39d416a676696a8a97e1473dbd36205b84e681f3b0e94dec8cdab5c111883a7f911285 SHA512 42217305887d22987bcc88565c02b4dfd864449c10726ce4e819c4b3fe8af6d2898fdd453ebfb95a45af90843000e219f5447def048ca52ac7c509219396c2cc
+DIST genpatches-5.4-105.extras.tar.xz 1772 BLAKE2B 049452ce9e48c45954a6f71218b38ff1adfea0b3e60452039687e860485dbb1e302b8d18595d64b9f2c2e3bf26d65ee747b876cbdf531745a68381b4cbf417d1 SHA512 d5b6915fc19c20fef72bcdb26a82d7e74d6c8af627d4fb50923a380514c6e505e2acd2d106f3a020a6508864d6f10451713346aeaad5d2f40088c4f36103ed5d
 DIST genpatches-5.4-96.base.tar.xz 3031600 BLAKE2B 9ba35f7958842a1fd4c9a7e7d3666ea1339ee5fadde6b771b78f67a8bb27c07e8dad8498e9b85fa0bcfd641f5aef9641793a02061b03becd372ea86245820895 SHA512 3edea8a4fc2a29e0f989089633256b270589ad77a225f3cef6e414c5877de1be8a4d5d9da28bfa4fba848f33ee322c4f01befcdf384c9271c97c90e2e2d3ad39
 DIST genpatches-5.4-96.extras.tar.xz 1772 BLAKE2B f33c734139f65245694d3cb98712733a901e89c79d05fab03de42d82d6e45ed3ec41ab4e17f2cd20be2ec31d469cf02a5efc7bad93832c67d3ad0bbf147b07e6 SHA512 8b7d6d058906b9c9afb7addba0c3072d70758bd75ea2989787beab5a3a83725541b4084c34cbb1e90b6cc8bb323a002dfca7065cc88fc834891f04397caa645c
 DIST genpatches-5.4-99.base.tar.xz 3064716 BLAKE2B f71d76c88a9932d3b0e1b45d065fa0946f36a3100e3b59c5ce4c373519119066973067e4bb74d094cd5b79e689affa4615faf40da75a730b62df2259d3361c43 SHA512 833a83d7aecb1a216783fdf57e0fda342fd481c74166d976326a8333dfb2a13bd61f1b20b749f17b3498756b6134f8538a971507427f4e955bc9128742a3be5f
@@ -37,9 +43,12 @@ DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6
 EBUILD gentoo-kernel-5.10.17.ebuild 2590 BLAKE2B b2fb7e0a3d8741138c1659f6c08b3adb05291e08d28fdccd8c88f2d58a6664e120a64e6e2bb2249524da9b1a6ca1c920492339846d97507a73856f30fd7db93e SHA512 84962b6a2fd2ea9bcbc0b089866942eb4e4a5e059bf30a73e5dba7c244ac4aeeca7cd92cd5efe9060bcfdbc47a705cab149b8465a2eb4c5600c3a9dc8b8accf8
 EBUILD gentoo-kernel-5.10.18.ebuild 2593 BLAKE2B 5d14c68a39155276d7ba5d775e03bc80ca46093f4519c680c0648785651f6ddc55cc83403d9d6ab3fe6717dd5efeedaa6fe5dd146eef362fb148b69a1e5ff69a SHA512 3a480ccf13edffabdcdecb44b2d0212d3135d381747b3b55a9120aa2cf0798bfdab8fc79ac02012fe7475bad3f0b5c062d6b9a2077ee85696d1c99aa6bb0a34f
 EBUILD gentoo-kernel-5.10.19.ebuild 2593 BLAKE2B f18a2b4c44fd8e37b71fe934be6ad39b4f01400e0c0546c76d66e4e671624e2b722cb61ba29c2d67927ee34c423ed4089ee3aac34b7766edfa807076e37452a0 SHA512 ae0bee937053c7890a844f769642abbc78cc28ae1514bd54634c71e1e1941afd78dc25a146985ddb866702a07809b0fe3e4e85a750d0b78d7e34702c7f6fb1fb
+EBUILD gentoo-kernel-5.10.20.ebuild 2591 BLAKE2B f60aedbd9e5c56bd3d1925a5afe285130bcc0a2a7658f317747f2eaa10922bbe0b293a1d350c4308d7f85ce613c536480c786b1098c0b4629dcdc60226ce60a2 SHA512 98efad4a9a5b1e737de8bcc67eb5d3f2b86da77cc2948e0a3754af0355fe4be645e69a22e5b1d712ed4e608a19ae7b0b0fececa2e87ffa8e5941e1251146c3a4
 EBUILD gentoo-kernel-5.11.2.ebuild 2590 BLAKE2B c4b2474b3aa266eb0854c146e4d49cdfd909aa35b6ec1e8080ae02f6b6bcc63122d62337b0e94f300ed2f75e64f2e05bec128ca87ac7b9e16cb2798f44204067 SHA512 af7bc24cd676c977f8a6968659abac815cb0480f2f5dc7b587ae388f21c60119e063380fd06a6562dd24222fdacb98350d8c1e4d0e7ade5cf03c435ebb2aef08
+EBUILD gentoo-kernel-5.11.3.ebuild 2590 BLAKE2B c4b2474b3aa266eb0854c146e4d49cdfd909aa35b6ec1e8080ae02f6b6bcc63122d62337b0e94f300ed2f75e64f2e05bec128ca87ac7b9e16cb2798f44204067 SHA512 af7bc24cd676c977f8a6968659abac815cb0480f2f5dc7b587ae388f21c60119e063380fd06a6562dd24222fdacb98350d8c1e4d0e7ade5cf03c435ebb2aef08
 EBUILD gentoo-kernel-5.4.100.ebuild 2761 BLAKE2B 5372389797ccad85d86d0d5f85aeebc4252ec61de616952b11a38ab92e185a939c3d7d6ca33812644cef968d4c75da52335813f67ab88949231db9704ce59084 SHA512 e25f274c6049eb8f988fe55140b6cda58b314dea3519a875256cdd09d159ea4494f706449d6b14206d08fd9438eeedb8aad9ac3024c8f4b5d41f84e6aa48aa82
 EBUILD gentoo-kernel-5.4.101.ebuild 2759 BLAKE2B 09e0829a8ebddefc5ae14ea9423034c5296a78594fb1782820a53f69c5a8f4aa80e5c9997172cf3e675f1cdbe5961eff85ee480db2accf6533624faed2f82a31 SHA512 10e415565cfd450bd42a9fd20a22eb94b6b4e507f63201d4f9b91affc5b81b27ce5fceff23840397d308c30aa4f58b59a22040616278de69a3ca89ed5445901b
+EBUILD gentoo-kernel-5.4.102.ebuild 2759 BLAKE2B 09e0829a8ebddefc5ae14ea9423034c5296a78594fb1782820a53f69c5a8f4aa80e5c9997172cf3e675f1cdbe5961eff85ee480db2accf6533624faed2f82a31 SHA512 10e415565cfd450bd42a9fd20a22eb94b6b4e507f63201d4f9b91affc5b81b27ce5fceff23840397d308c30aa4f58b59a22040616278de69a3ca89ed5445901b
 EBUILD gentoo-kernel-5.4.94.ebuild 2755 BLAKE2B 499af207ca80ab31469a3c17f87fa1ae41c9a63ea6aebf209d3b7f158d0d1c7cc59cf0ab35ee80c576903ea0cf1a87fb45a8715de253ddb5e419007143ceb854 SHA512 65ee2c28a0166387dac04d0e02d6bc2e1b9dfe246aead3c63b4159d8ed167de7ac894d05828888047f66e422f088f5872dd288d316887c9572692d5481bc68cd
 EBUILD gentoo-kernel-5.4.97.ebuild 2757 BLAKE2B 87c8583df30d18016b1880759e77cd0277d6cabb021837846574b976d32ffe30aa401e6bba6063013762b04d1233eef3b47f03cc7d828e6b7c45dad2f1c249cf SHA512 a3b2b1da6f7c989a623d0f0b096880f04c4b98b53e06b6d01732ad0d76d3611399120643f241c30deb2a07717786115d8f7941c28e44aa3175b77e94bcb7dfb7
 EBUILD gentoo-kernel-5.4.99.ebuild 2759 BLAKE2B f24519c76a3203db697d875eb0b0a0782d97cab05866b25bf42dfd25502d36d26477eb7bd86f4cf231c90d8adbdb244e487e88a52de862ef796077a672c618a8 SHA512 a43f194f27242f2cbe04076a0534742b5b5cfe3d5f6d6c2b72281e3a2e918a1b42c54bf753d9bf1bb22021d51e861933124e618ba8b700955789d0ded57f34ec
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.20.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.20.ebuild
new file mode 100644
index 000000000000..798dd6bdb5ec
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.20.ebuild
@@ -0,0 +1,89 @@
+# 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.10.12
+CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530
+GENTOO_CONFIG_VER=5.10.18
+
+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/~alicef/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~alicef/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"
+REQUIRED_USE="arm? ( savedconfig )"
+
+RDEPEND="
+	!sys-kernel/vanilla-kernel:${SLOT}
+	!sys-kernel/vanilla-kernel-bin:${SLOT}"
+BDEPEND="
+	debug? ( dev-util/dwarves )"
+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-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/gentoo-kernel/gentoo-kernel-5.11.3.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.11.3.ebuild
new file mode 100644
index 000000000000..498040ab71be
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.11.3.ebuild
@@ -0,0 +1,89 @@
+# 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.11.1
+CONFIG_HASH=07992209452cd7ba529ffdbdd83d01d44cd8ae14
+GENTOO_CONFIG_VER=5.10.18
+
+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/~alicef/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~alicef/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"
+REQUIRED_USE="arm? ( savedconfig )"
+
+RDEPEND="
+	!sys-kernel/vanilla-kernel:${SLOT}
+	!sys-kernel/vanilla-kernel-bin:${SLOT}"
+BDEPEND="
+	debug? ( dev-util/dwarves )"
+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-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/gentoo-kernel/gentoo-kernel-5.4.102.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.102.ebuild
new file mode 100644
index 000000000000..7c3266150716
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.102.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##*.} + 3 ))
+# 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 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/~alicef/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~alicef/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/vanilla-kernel:${SLOT}
+	!sys-kernel/vanilla-kernel-bin:${SLOT}"
+BDEPEND="
+	debug? ( dev-util/dwarves )"
+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
+
+	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[@]}"
+}