gentoo auto-resync : 14:03:2023 - 00:16:42

3 files changed, 286 insertions, 0 deletions

diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
index 5a1f243ea415..a918b622aa1f 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -44,6 +44,8 @@ DIST genpatches-6.1-20.base.tar.xz 1052484 BLAKE2B 9599ee78ab289960d7d0c81db8d50
 DIST genpatches-6.1-20.extras.tar.xz 3808 BLAKE2B 4d121cdba86a63a5564f44f2b33841ec07d456da813070f73cdc2b983b5fe466e92b845a6c4d0959aedfa3ee9a8c57fde08a84aa6a31926d43a5ac68d4c168df SHA512 8b17882ee84adda037433b2ab13aaa378812f6d6f3e87246c1befe54c0254d1261b3fbdd89410f133ea35e798bbca597e392222ba1bfc93bf87e645600609dc2
 DIST genpatches-6.1-22.base.tar.xz 1112816 BLAKE2B 4fb3e3e6b08b201856257c72e297428e8ce90bac110452cb47df21799e140d18d7bf82f4fa36c331c9a199e63b1305d151b77aaa2f9735dbd0a049b7eac7b433 SHA512 06cdf0df64e699c9ab3daa122b2daa9bda56e2fce0497665fbe2fa488c1208ab0d13f84648f3fc8627aa2a325095be9a115b2bc656b9228fc78e98068d4d8685
 DIST genpatches-6.1-22.extras.tar.xz 3804 BLAKE2B 6350caa854108959e150ba1537044b9c781b24b740c632f30d0ca4de54d795c45993623fd0822131cec50cc46182a76c036e5481bd4617ee3ffb5c9f82258050 SHA512 5a48e06b4f9fb94d53b7175850c1876edcd76ac45c1188d754a9963388a2df23d510f8a30116a47db45f06f1274e25c6897957783f0e8eeb3d0e20ea626052f0
+DIST genpatches-6.1-23.base.tar.xz 1114724 BLAKE2B 35cef45469a4e42a736c5e94529a211dfc1b60a44e695243d4b936e85933efd685a6e8617abc4b20cd42f736979bda6b85fb66fe33f1d48ebe2cb53fb672a913 SHA512 c7cc6f174e7b1b3c5036b4861da9c5b5110c6857c4bca2585bc4090e84382688fe785ae23c3383246682bcf807368a31793921e160882a1dad5b929501c1001a
+DIST genpatches-6.1-23.extras.tar.xz 3808 BLAKE2B 328dc3054c6ce8f31bcef2d682301b7b9b06a6d8b3ae96adcaf187cc6bc85561dccd219bfedffd4171c3e8df9ce998d4e615bcf364223afe8e268198d3a9d403 SHA512 74e378f6efe8fcadd39e29aaec0d0cc3b2ae8edf909f06a0395a2732d4af1337a966490ff3986237f98086a8779deb1fa980506fcd6385061742187b9bb89da6
 DIST genpatches-6.2-2.base.tar.xz 9540 BLAKE2B dce2bb1156f0e9a7ca19b618d13729908001939d6ec6361ca6619808a120e61900b5f4de97b2bef0e63aef81a83c7e2a0d736f3c344d9a610eb5c6a21baeb111 SHA512 50aabf4c24dbf13595556314b2ba8f1d0219355bc79c0fddf05ef7a6d244fe3c54f95c733e02fbc032a582495c59688f415af5b62b3401b436cbb5f0ef3aa9ac
 DIST genpatches-6.2-2.extras.tar.xz 3804 BLAKE2B cdbf51c28ff1c3b974665f558ec774eb70874a3941b97f966ee90642f3a1c8732333348e891156a40455c8b80c2a2002fdf1515403eca7b8d075c28b09a2ed78 SHA512 cba0fe9b3d13f3b1f6ee413a44698694ef6b009918dfda76e4d8402e66f1e857bf889fd4eb7ae093e864f7015eb3fe14aa704a5a3b68b0b92ca494bfc4b43a71
 DIST genpatches-6.2-4.base.tar.xz 15256 BLAKE2B 4a6bc8f4b75be2afe87d3d29ebdd45cc6a6266717b793a611edcefad3b39c3f70f14533b538eb175f0c16e901006d52e09994072cf9375dc0606db0478472d18 SHA512 0351b19b50bff5922d916b215c8b5b04a31994973dbde9553b2f197009447c9d5dc992f0b9ee25bacdd1569477a0beed4e0359dec390ca4914ceeed3e73592f5
@@ -52,6 +54,8 @@ DIST genpatches-6.2-5.base.tar.xz 297244 BLAKE2B d76f6189b57b3c81ea8d8cde4a44645
 DIST genpatches-6.2-5.extras.tar.xz 3804 BLAKE2B 23df3f3d54c5c9d0db420803bf45861111addf7bd23efd65a928345103e5fcaa34639c18c4c72911ff9d17cfacf50063802af75674d9c2839b0448185ca0eeb1 SHA512 5727b99aca295c425c5ab67e8e25b3e7ce0101542d60374d3f54abcf66f336d303ea529b683ec0d82da5ad471b5399eadad2fc8cc1dba3c3b13eff1735d1c12f
 DIST genpatches-6.2-7.base.tar.xz 376376 BLAKE2B af978aac1a4f3c836e5223c25b7d24557044aed7a03b9ec0313cb86f5f5238e795ec2b88cf6ebe800d4ff86cad7f755b26f9d4deda87761ef73007ddd9ec678e SHA512 96373f80389db5b4a414794292278246eecacde3016ac80a35fb25382284c60f8d09d53096c05f7609dee00236698591aa881462d039e0c958aa32b080e2edb2
 DIST genpatches-6.2-7.extras.tar.xz 3808 BLAKE2B fec1e138d4601bdb4b6ac339bdbfcaab85b3b3dc74f8afb1a326fb519300e795f709bce695be0a98ed5efcd43dc585ce33c8cff09cc7bda48e28aa935928cdb3 SHA512 9ec16349c7db00b38ea19bfda59c3bf436e1bd4b23ab6eaea09ba7ed979b45506418f899832d7dce41158143d0d5adb97530f517a95364aa261bb25818166cfa
+DIST genpatches-6.2-8.base.tar.xz 378352 BLAKE2B bfdf83b6ed486ad759f6021e48fad9b980a87ba5c54c0f06dbb2af3dccc79b41c7065d5a3a11933d761da759d9b33b314c456b458c9c65f49de75dd2cd4402ee SHA512 48521d82fbb2475b7a477bcd87dbba073f6c72cfde784adb77e9b92c44bc1fae188179199aee9face7bf53538cc5f2cae491173da686a54182579d69585b54e6
+DIST genpatches-6.2-8.extras.tar.xz 3808 BLAKE2B 3bb072914898f6f80f3ceef2ac92d44b3dba7aba6232febd7f7ad48232a2d76c3de4414a0822d0c7d45f632f02441e640a0911fa38a24ca88373807e04806ed0 SHA512 a4c3ca924859b487463b20fd470c2f157e404c0380cc8721d9a9c787519b1471c88f72daf57398d0c8582ec966bd9939c2082ad3b3cd71f93b761bf4443f3a35
 DIST gentoo-kernel-config-g6.tar.gz 4562 BLAKE2B ad9e1b28f84916f12cd8b21feb2f4396d3d63f4cfae3e6b6fe93f919c98b0b4523b205711ab7acafa7121360f696eecb63b9f162dd12950e56dab1429cc13633 SHA512 d180122eb00d40126ea7d79224559904eb0ea574314f9a8d6be6b10f0f6a49f526eba1366ae8cd0a4fe23cd8ff5e292c8cab7e856a2c915d4162b75a03f8076b
 DIST gentoo-kernel-config-g7.tar.gz 4625 BLAKE2B 72ba0d038ee34ca5eb26d43bd373735aef3a50d02b414993ea05485e49d83d46df98a6cb0f6f3170a8ec0c99b557432fd9a11cbb92ff7c2837625a7f4469831e SHA512 2d74a8ca9f5402b4290ed93cd3ddba04a7f2ff42c8d8d3f2cbbe22fc20daa0fca119368daa8af39b7a26b1b99e4e3187c3c5d95886a651675ad94ff98d686628
 DIST kernel-aarch64-fedora.config.5.10.12 223184 BLAKE2B a0246dac2f7a4ad6a55b611538d24382ac87a8960077811a859c9595ac67f961b4bccb7e139a89abc7c0e26e80832da5c94211fc658082f2e7dde984f14dd29d SHA512 7d803b347b136331db1ad6e22e0445fe0224c3e26cd7c034cbe9794915d457b492e05f77664865079874ec001351553652646e2e08d0fee31e30b841b0008f52
@@ -102,8 +106,10 @@ EBUILD gentoo-kernel-6.1.14.ebuild 3917 BLAKE2B 4b98ef355f3bbefc7cf1b715a0875cc3
 EBUILD gentoo-kernel-6.1.15.ebuild 3919 BLAKE2B d0af04f3ff855b263afb00e61e2c03e0bd0e9a6820e246944a5d3cf8a614b13d3795d26e8bbc95f6b73bdc3701a67858eed0baab02d3ad97f81354e01b42858f SHA512 5f4803d5a8776dc5acd0513c532dcf810e0f3d19fafb3e5a4f0a4c35437e4cabf5966df9c9ffdca458be60dfa4cd23a72504d410faf5cffd7a2c0eaff1929e59
 EBUILD gentoo-kernel-6.1.16.ebuild 3919 BLAKE2B 64c9b54b79a6af1830e09c699540230a9592e6a0f1c1740616bb67558a21630ac9ab836cb15d0353f777523bf610e2f0c1c0e16955db7ee9343c85ddcb6100f8 SHA512 8bdf517026f34b3cc94e47a37a4624024a01482d51c734188ee06512b1ab9f4c7b1aced63df074956fe17c56f31290f802f9a8e0d435bd95df776866250494f9
 EBUILD gentoo-kernel-6.1.18.ebuild 3919 BLAKE2B 64c9b54b79a6af1830e09c699540230a9592e6a0f1c1740616bb67558a21630ac9ab836cb15d0353f777523bf610e2f0c1c0e16955db7ee9343c85ddcb6100f8 SHA512 8bdf517026f34b3cc94e47a37a4624024a01482d51c734188ee06512b1ab9f4c7b1aced63df074956fe17c56f31290f802f9a8e0d435bd95df776866250494f9
+EBUILD gentoo-kernel-6.1.19.ebuild 3917 BLAKE2B 5d89fb9d7feef73da0ed4d4ea853e70d7ceebe0c6a1c9355af4c4a8837b941cf5860894332d826615aa4d170c1d80fa4e3715adb6b7e98187346190991da51e7 SHA512 8a795adc34f40474c6770271da74966a64a01b088e0fa70e476548e1c1a451bdfd812d7fae0124f8fab1874a5e254939cede84262c4fee2e9dd1652201ee4a9c
 EBUILD gentoo-kernel-6.2.1.ebuild 3917 BLAKE2B 79ea19d126f3f6acb02b9c7e06fa236e32084786935f42acde73a9921ecde2ae747347813bb5d0e1379e32803795350d28af4e25065fadcbd352b964531f2090 SHA512 e7b2683919f435ef93f400d608c8a598c80d7d70752a86c04e1fe0fa2c90e964aa3a9b588e57a6553188fb09cfdd675d37769d6491b795013cce6075ae1511ef
 EBUILD gentoo-kernel-6.2.2.ebuild 3919 BLAKE2B 7c1fa5383985a9333e004bb33cfb1b71982f64a643b8ace2e411ae60af2a9fc170aa0d00ccd1a20d609b781b54c4a06f26d0e91505ce7746af4ca9d363108630 SHA512 a058f2bd702b52b0b13f1ba7e8666df2d59904e41d4ee89c7aa61b677713489dc109daf132d58fe9794f2749c82c003e67a1f9e9c97a87836bb09cad65026641
 EBUILD gentoo-kernel-6.2.3.ebuild 3919 BLAKE2B 7c1fa5383985a9333e004bb33cfb1b71982f64a643b8ace2e411ae60af2a9fc170aa0d00ccd1a20d609b781b54c4a06f26d0e91505ce7746af4ca9d363108630 SHA512 a058f2bd702b52b0b13f1ba7e8666df2d59904e41d4ee89c7aa61b677713489dc109daf132d58fe9794f2749c82c003e67a1f9e9c97a87836bb09cad65026641
 EBUILD gentoo-kernel-6.2.5.ebuild 3919 BLAKE2B 7c1fa5383985a9333e004bb33cfb1b71982f64a643b8ace2e411ae60af2a9fc170aa0d00ccd1a20d609b781b54c4a06f26d0e91505ce7746af4ca9d363108630 SHA512 a058f2bd702b52b0b13f1ba7e8666df2d59904e41d4ee89c7aa61b677713489dc109daf132d58fe9794f2749c82c003e67a1f9e9c97a87836bb09cad65026641
+EBUILD gentoo-kernel-6.2.6.ebuild 3917 BLAKE2B 806d6dae76bc53f0ef696c90c99d1427495ed8d02ba54581d8a2f967b09b53c8d6e872c9202a8438f99c5799098097572ef9728b711b007aa3c57869251af378 SHA512 892abfc44c337aa0c24edfcef665b9d9a106c01cfd1720c8df7e26b9ba0285de5d188be66518df27f168135a963cdad5cbbea57a654d34819f42d68b29da06b0
 MISC metadata.xml 465 BLAKE2B ea1260a1638588a48d9dd776e9eabd9730a181af8416ba778c936fa2e80a2360be146d3cc80599e50e0a72ac709eb9538184aac87cb96528e445ed450e34f4af SHA512 c7b7b1a45fb7082b8d8d66cf5a387cc4f7207cd9488d1d5e1d6900f1e4147aa9290b5522a94d941a885f1599b5df2482b529e40912d2b2cff400ecd4b1704c41
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.19.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.19.ebuild
new file mode 100644
index 000000000000..7d50cb442f7d
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.19.ebuild
@@ -0,0 +1,140 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-build toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 4 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo
+CONFIG_VER=6.1.7-gentoo
+GENTOO_CONFIG_VER=g7
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="
+	https://wiki.gentoo.org/wiki/Project:Distribution_Kernel
+	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/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	amd64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )
+	hppa? ( savedconfig )
+	riscv? ( savedconfig )"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel-bin:${SLOT}
+"
+BDEPEND="
+	debug? ( dev-util/pahole )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+QA_FLAGS_IGNORED="
+	usr/src/linux-.*/scripts/gcc-plugins/.*.so
+	usr/src/linux-.*/vmlinux
+	usr/src/linux-.*/arch/powerpc/kernel/vdso.*/vdso.*.so.dbg
+"
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	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
+			;;
+		hppa)
+			return
+			;;
+		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
+			;;
+		riscv)
+			return
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-gentoo-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/gentoo-kernel/gentoo-kernel-6.2.6.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.2.6.ebuild
new file mode 100644
index 000000000000..cd2a67326693
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.2.6.ebuild
@@ -0,0 +1,140 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-build toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 2 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo
+CONFIG_VER=6.2.0-gentoo
+GENTOO_CONFIG_VER=g7
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="
+	https://wiki.gentoo.org/wiki/Project:Distribution_Kernel
+	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/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	amd64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )
+	hppa? ( savedconfig )
+	riscv? ( savedconfig )"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel-bin:${SLOT}
+"
+BDEPEND="
+	debug? ( dev-util/pahole )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+QA_FLAGS_IGNORED="
+	usr/src/linux-.*/scripts/gcc-plugins/.*.so
+	usr/src/linux-.*/vmlinux
+	usr/src/linux-.*/arch/powerpc/kernel/vdso.*/vdso.*.so.dbg
+"
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	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
+			;;
+		hppa)
+			return
+			;;
+		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
+			;;
+		riscv)
+			return
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-gentoo-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[@]}"
+}