gentoo resync : 08.01.2021

5 files changed, 199 insertions, 4 deletions

diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
index 8eff87d6d996..c572a95273d1 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -2,6 +2,8 @@ DIST genpatches-5.10-5.base.tar.xz 19928 BLAKE2B 6fe55e2d7b32871600fc8d97b644e22
 DIST genpatches-5.10-5.extras.tar.xz 1772 BLAKE2B 1c475a58e71f1d029676d627e31859d93970b59d300106dfb24839bec1545dc5f9185ae802c325f5f0f76bdfa9bec27514d8aa9c61388b5ff76b2ada1d742edd SHA512 96aad42f563cb5eab9944b660d51639c2ac30e9c4a5f4742796c5084d22dacf2789226cb7df804aad5b9450f5715945632bae1df6f22183eb6ab38494e16527c
 DIST genpatches-5.10-6.base.tar.xz 203736 BLAKE2B 9bc25d288cf6f0b7c8b93518484a3bdb4324627813ad4b03c4a8189637776b6a142bc1168ff34d0e50c539887a17d4ae26647cb508dee64de010407567b9107a SHA512 0314a323a35cd98d736010753dea6a267fefee0d648ca66f5cabafbbd760a6e2424ec86785c1a1d3da7b933afba01a09f13d9af73e2cd1b8303e9912e81cc28e
 DIST genpatches-5.10-6.extras.tar.xz 1772 BLAKE2B 955bd5eb78f0f523c1f15855b06e39347287b2135e1d779cf8580fe24614cc3770ba1269d25819025df04e51fababfa7cb8bc1351bbcd3b57e0713b8c5d25f2d SHA512 870baf5a1199ddf38d562d8fd1e018afb8ad3bdcbb73c2ada3f7be01e784379daefd48f757ed25500baa0b54a8ad96fc2f40a96bff00ce439a649003f3e24688
+DIST genpatches-5.10-7.base.tar.xz 227732 BLAKE2B 7986a80960a746e753c551bda8de8803e4a0914873126641e5968e96de075ab36814f004b9adbd54f3ac5bae4b50ac0bcbe26371c2f986b99558ae31cb0e1b09 SHA512 4baf8220a5e95146a3c239a636ca1da3ddc7b0c684e611ab2cb3b762c733b2c4d7d5ae75e741dfd58e5eeb03fb78cb91690f2e021cbff1dd5613baa93bb91351
+DIST genpatches-5.10-7.extras.tar.xz 1768 BLAKE2B 38cadd69b3f773df3b6e8b153922dfbc66c2f5f73b8191eb62c8dd0704fea4e235a0d7fe70b71a70d8642e6a7f90386cdc89b7489d240a4fa32dd3efb6661423 SHA512 8173e42df0bd203ce1d5ba104d8a96458998090763a39b04efef084765da352eccea71275bf80e3bdf9f4a625e2673a4f216b0401612a9f7bf5531a52dddd447
 DIST genpatches-5.4-81.base.tar.xz 2591356 BLAKE2B 63c0ef166e2691c6747a2b2a8317aeac286ddac1454ae1eba7a34035abeba67ea2627257d17f266fde57da0684f83cb102b465252a3b95075c1442123c2473e4 SHA512 88d4deb9002cfe6aa8a8045770cf5c7ffde8cf9bad324a72296b1a5202c94386807fad53460147420363b3c73613be424bb54000e5cade7baa4df254ef2c61ab
 DIST genpatches-5.4-81.extras.tar.xz 1772 BLAKE2B 93bedfbb023ab9d3913751cd242a4221b204685751f57d0ac31494fa8f8caf8e5faeb3ae10eed5332016f9a40b20670a6af6c4198eeae1136b14a3b28174beb7 SHA512 8776735a73aad4672d4b857d750f985ff6681f8e565a906106e2cfcd4d7839fa518d8fa19b39a0ac948736a3384656be44aad239ce2516786c797303f492ce01
 DIST genpatches-5.4-82.base.tar.xz 2792480 BLAKE2B 39960646116f5f85ee657a29557d8fd9e809ae9bc60aac349c91e7680f2a0565800ba37a478573098dbad41b686336a058985d2925e5046fa68eeaea8df25477 SHA512 6a76eebd7178e2ccc522477f53c36f74e6fd691f87c547dffa2602a516ad9a6a01f05c953e12bbe6ba9aa2ce34b176a6a081a22da40c7d86855e5dfc34098059
@@ -12,6 +14,8 @@ DIST genpatches-5.4-87.base.tar.xz 2852988 BLAKE2B a8282ba7fde85ec400b85f1cc2263
 DIST genpatches-5.4-87.extras.tar.xz 1772 BLAKE2B c7a99559c06cbf8e2cf217655b5003bdab13127d4e7e93d5b67e3d83c31dce3ae6cc1ab6de7adb62c51ff6a91c2d2c4efff1377f7bb516ebac552f398e22df6e SHA512 c57ae9f86e050eeb929358fe1919213410b089d774c521ca2657fad7a6d8da221ba303fb404bdc303526ad6a0a9434c08ff7691454736fddcae2fd978cf506d9
 DIST genpatches-5.4-88.base.tar.xz 2936760 BLAKE2B ef7a26374e0602b3f2e9fff948829dbd756b8edc1ad833cafa49cec3af5cd771dc52777af079ef7ae4f7362453953828c1a7565823cdda0c9d0b4b0d74a57f94 SHA512 4f2bf7e63820df6c616a6122c8dd6812e056fc85d023f708f5f9a0f856ccbbcd4e3aeb3c1247d8ee2650e2d96b0c86c99de5b7d53e8117351d4378198a4ea52f
 DIST genpatches-5.4-88.extras.tar.xz 1772 BLAKE2B dd72b20e1fe7f1b5f566c3d588d24cdad04e40d0270c9be60dd14c07c6a4ec9760dc57dc709d78bfb8d91017b6a4d6bf4c45a65dc019e9eaf02e02a56133f145 SHA512 f4e449986ee4c90ac79234d14e0e336d2c8cb74589ad6371067669f94041ee3b848848d2498d27da57ec71b050079f5338a87111af6f8edb3127698d0a39b478
+DIST genpatches-5.4-89.base.tar.xz 2951348 BLAKE2B addc79a7135166b1f210820ccf6ccdc87c6177b71b15a0e0c9338be28cecb45fce0062c3b8d9e704410f1140ab6984d65c8aa9b49008008264d6cb6c7b0b2ba7 SHA512 13755cd0ed2132538272d0fb22d358be078c9838984ec8e5c8e2f45d06b0b09d7e8cf744cbbba25071923dd43e6d6eb6afa0598cadf3a24f231a6b9dc5b8ca43
+DIST genpatches-5.4-89.extras.tar.xz 1772 BLAKE2B ef78f0322ecd34026b6b3a4849032edfb10673613b9ff69ee62b05cd175779d19873712942a728100a28a5bd73b0bd601b94101dccad9d4c7f80b2b044f8e3a0 SHA512 5f1165b201ffdb5bb78e84be19f81adfaf5784adb152f2110a24bc199c933e6de81a3e9a27341a61820245130c7b9f109817580d6a1459b5f22328e8cfbc2ed4
 DIST gentoo-kernel-config-5.4.77-r1.tar.gz 1289 BLAKE2B 6612741cfbf458f4bd8915b476aac3aa6934e8bbab344da877fa4ad52b6133e01f5d44bf0e5d048e79e56c1a351774135ee55f1aa839b230e2418db7c5d9b123 SHA512 2a09dd85af37447b278847aeaad114ef47470726cec015ed5ee1b54b3080f4b2c48de8b2f7b817eeb4e27c753579cf0820053e22caa762cb1552116d8d69eba0
 DIST gentoo-kernel-config-5.9.8-r1.tar.gz 1198 BLAKE2B 8fc6d432e9d7e1f7f2be75c5741ab18be399066e9837a52023bebfbffe6299eabfa7e8e94822ef205bd443f6d75a75530cf0c3989dc0414a7c3e4ff06d4743bc SHA512 bc554f46ffb8a4422269e5d9b8e9e0c0f1ecd29fd008719f7ab027e87f4b4bb284d7854d1af2e1e5af0784043db79de058b38fd1ff0bf50d3086e8adc6254e1f
 DIST kernel-aarch64-fedora.config.5.10.2 223109 BLAKE2B 705c331b559994b437954e4a0d0405d1f084b0689460b79f89a938ac66fdddbfa617b78b2bfb07bf5a085e1d4e8cfe735554031bc1e2b2ceeb6ef680c50b26bd SHA512 e57e6efe8dbd935d9b7438019fd2b8b7e558deac5471816fac6a6228ca95badf74c99a4d479cc3820f62176626c4a2526f9c16523d1e445634168358c2d24232
@@ -25,10 +29,12 @@ DIST kernel-x86_64.config.5.4.21 184907 BLAKE2B 0eb2b07c14cea7545350fcdf3a94f2a5
 DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1 SHA512 95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e
 DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
 EBUILD gentoo-kernel-5.10.3.ebuild 2548 BLAKE2B e094a032a081c39cd3e67da45295a3050493d3a0b1c46f5c990047c05515f98400bb291ebabb6ab42045d3099cea9a10aacea25fc456c21233e4346e21fc4d09 SHA512 86eb48538e522fd25a74cdbfebe511f36bd037c3749f244e92d1a2e687c4cc8767c5a77dfd3fd5d1ae277ae87de3d529b26bd67c45939c3e1a5b409383f7d309
-EBUILD gentoo-kernel-5.10.4.ebuild 2548 BLAKE2B e094a032a081c39cd3e67da45295a3050493d3a0b1c46f5c990047c05515f98400bb291ebabb6ab42045d3099cea9a10aacea25fc456c21233e4346e21fc4d09 SHA512 86eb48538e522fd25a74cdbfebe511f36bd037c3749f244e92d1a2e687c4cc8767c5a77dfd3fd5d1ae277ae87de3d529b26bd67c45939c3e1a5b409383f7d309
+EBUILD gentoo-kernel-5.10.4.ebuild 2593 BLAKE2B e04fb575e6c0912d0d138dcf71f6f26142c580eb9667cfdcad981ea902ad61dfbd6b438c360adad558fc0d1261ea43815e7c09e6ee790f7edfeaf3f0889f8525 SHA512 788ef38fac153ec8f2a66daeb451ff0b92bf84fe8aca9149dc84338012a139988d00aedc779aa48e459f51127918d0addd321cd08eca841c2b48a92e456019e2
+EBUILD gentoo-kernel-5.10.5.ebuild 2593 BLAKE2B e04fb575e6c0912d0d138dcf71f6f26142c580eb9667cfdcad981ea902ad61dfbd6b438c360adad558fc0d1261ea43815e7c09e6ee790f7edfeaf3f0889f8525 SHA512 788ef38fac153ec8f2a66daeb451ff0b92bf84fe8aca9149dc84338012a139988d00aedc779aa48e459f51127918d0addd321cd08eca841c2b48a92e456019e2
 EBUILD gentoo-kernel-5.4.80-r1.ebuild 2717 BLAKE2B 63f07537715900e1bfbb639dee03bb7503b4854c1b7117b948c49705b0cf2da0442f34323f538e68be705436a1a896d178d4725f1f2cc13a3105b2cb3c383f25 SHA512 fc5eaf07ad3b5baef9e76f3745ddcdd03effdb689ab7b3bcc17c5c404b17d62673f223dbf8ce50250c068a33d9db3e0ac9fc68d7658b742bed238f97d66d5953
 EBUILD gentoo-kernel-5.4.80.ebuild 2717 BLAKE2B e34b097d2e908d4b6f8059184ee11205dd92b2fb5fa432f83126b202434cc83c7c8aa0bfbf418ea12a1003ea63731b6e359dc7502f865af81893d232c966e1cb SHA512 809422454154ff199423b460799c20bb6070cfe36174a4ec89b43aea5a4d1fff2136f46696526617809d7acfb63e028f0eb778d2de552ba1001497a8bc25c9c3
 EBUILD gentoo-kernel-5.4.83.ebuild 2717 BLAKE2B d9c849b91fba6f9603e3ec5c336c87ee1af766ef6f1ad14f4c5567f33976011bf641bd235236a8b9c88abb76d5ab085ebdc5bd90e7a5c3eab3208f8343f203ab SHA512 40f325556c8b301b0030ea817415495987084ef719d7a1f9446fe090a79e97bbeb3fe3138a4d6198aa1c4bd07bf465dbfa304d66c936738bc2168ecb9658b257
 EBUILD gentoo-kernel-5.4.85.ebuild 2719 BLAKE2B 7bddd3ad74b8b2169923146f98b00913bd67017dba785bf561c3613448da3c5a30b3adb1dcd72625614ae4f46f7726bc9b7cd6c1f2457a3fa41acc829b32dc7a SHA512 1a58d81ed2717febcf73efe4e656d90c55b609e6ea3da89affb58dcadfac6246845c7c65cb0408c0272620c217225c4e3ebfacc2c67bfe631480ffd56be7dadb
-EBUILD gentoo-kernel-5.4.86.ebuild 2719 BLAKE2B 7bddd3ad74b8b2169923146f98b00913bd67017dba785bf561c3613448da3c5a30b3adb1dcd72625614ae4f46f7726bc9b7cd6c1f2457a3fa41acc829b32dc7a SHA512 1a58d81ed2717febcf73efe4e656d90c55b609e6ea3da89affb58dcadfac6246845c7c65cb0408c0272620c217225c4e3ebfacc2c67bfe631480ffd56be7dadb
+EBUILD gentoo-kernel-5.4.86.ebuild 2764 BLAKE2B 3eb92ca24dc1419f510da2c8202952de61037a5d0a1867c67bd801969dca165d96388e611b5e4d44e34ebfa24fb29eefde6d06a8390663f9eb1ac8542b8a8a6c SHA512 f0d864b631392b3adb3c8da5dbc0cc3f780276ecdddb91f8feef22255f019c74eb2b3f7a6307bb0f94fa869581e40d749748ff5394e9dfc586a9bf63c21048f5
+EBUILD gentoo-kernel-5.4.87.ebuild 2764 BLAKE2B 3eb92ca24dc1419f510da2c8202952de61037a5d0a1867c67bd801969dca165d96388e611b5e4d44e34ebfa24fb29eefde6d06a8390663f9eb1ac8542b8a8a6c SHA512 f0d864b631392b3adb3c8da5dbc0cc3f780276ecdddb91f8feef22255f019c74eb2b3f7a6307bb0f94fa869581e40d749748ff5394e9dfc586a9bf63c21048f5
 MISC metadata.xml 352 BLAKE2B d45c3f23945883bcb819c225e43715f5cfd86090f3e928dfb62b26a7b38b98421ee0c0d3b4fe9ebdb9de39c294cbc288c1731e9493f69436a6916034d8b834d9 SHA512 e3b9651b8f0fa3b07626b4cfb01456e4ecea1ae053ad9e9e1b3c925a5de601b35c9f3983535d62edae9ef49a40fe4c319e013542908839f30415f6ad85463e24
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.4.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.4.ebuild
index 5ec7b92ee625..4ce45ac9ba10 100644
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.4.ebuild
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -47,6 +47,8 @@ RDEPEND="
 	!sys-kernel/vanilla-kernel-bin:${SLOT}"
 BDEPEND="
 	debug? ( dev-util/dwarves )"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
 
 src_prepare() {
 	local PATCHES=(
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.5.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.5.ebuild
new file mode 100644
index 000000000000..4ce45ac9ba10
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.5.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##*.} + 2 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.10.2
+CONFIG_HASH=b40ee468dab9a27cca8b91fef64d1d43ce0ed1b2
+GENTOO_CONFIG_VER=5.9.8-r1
+
+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 ~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.86.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.86.ebuild
index 0c806189a34d..8b2996c9a517 100644
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.86.ebuild
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.86.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -46,6 +46,8 @@ RDEPEND="
 	!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"
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.87.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.87.ebuild
new file mode 100644
index 000000000000..8b2996c9a517
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.87.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##*.} + 2 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.4.21
+CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
+GENTOO_CONFIG_VER=5.4.77-r1
+
+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 ~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[@]}"
+}