gentoo auto-resync : 01:01:2024 - 23:49:35

3 files changed, 286 insertions, 0 deletions

diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index e98222911cb4..adda8f758321 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -38,6 +38,8 @@ DIST linux-6.1.68.tar.sign 989 BLAKE2B 646b5742ce3e7225e3f1a8f436a21aa4975c3d882
 DIST linux-6.1.68.tar.xz 135037496 BLAKE2B 35aaad87cf0fc957b2e9123e13c9971bfb5f04eeaecf4ff04d1fa3484556f12ed2dedc8beb8bf4d859f6f8dfab691cea7c46bffb2490e6de788933a91262d5e4 SHA512 249b3272af9bf6f8f2dc65859dd6e7cb150ac0521a52d482fc854db2d5268d559c40c64a413a9baa4870cfaff823c5fd1762e22370ee63ce10b2abe2a4bd2c33
 DIST linux-6.1.69.tar.sign 989 BLAKE2B 354a497dc3ba0b2c00f374f3339b3970b95b0a83b933d0ad24f3855129379a7a7829b381a0b9aa5eb9c899cb99f8ff4912f28841653a9436cd2149d118116ef2 SHA512 b19b5c33c40ad494181f75141653b77ff9ae0ede9e183da5e124f973e500a9d87824057153b3835cea29f3f33cae60b6ea4f3b3506b2d2c3941750834e760f57
 DIST linux-6.1.69.tar.xz 135035040 BLAKE2B 21038f291c7eb06f6fbe866132c0805d5784e3ed53dd089cfe97c95569701776d20e84f39e6d687ec7ddc06db9608045a16bc5b204a8a95f6fd269a1e8f41cc9 SHA512 70afe2642b58cb0a1a5b38867e00052b3236f7701d9d006f0d95c66f204935453e997bd8b4d28c890617e745e08610d39933ef0798ede13f230485a8222b9819
+DIST linux-6.1.70.tar.sign 989 BLAKE2B 25bd23eab2b1afcdd401f93946b73c05eb2fd2079ae01cfc0114b8af19ad0154e065b87f7bb32d4b756faaacdc1e5dd05df5fea89fd37feb4e9d1efa69402bac SHA512 1efd254c0ddb8911b9a71944d35dc2f832f36c200e0c71d364b736d0bddc09cac7d3604da996d97de12768d745575c62bc1dfeb255287c3cc78cfcc95cdfb784
+DIST linux-6.1.70.tar.xz 135042228 BLAKE2B e32727946bb9169bc903b051dfbbb1423b3fef3fe124162fe1125f1364b3ebd4ab8e4195a788f5102b056be7d23acd88e4a2d1da6f1e6c5546552bcefb1283a1 SHA512 e5ad2477005291d21168d9417f329b3ddee47d0af5ada3e7325490f2a673c9546458e84829aff0728f23a07d693470a7650ae64106e46aa76af4cbf92c22cd36
 DIST linux-6.6.5.tar.sign 987 BLAKE2B 88ce36e009471c9dc796f2ed36012a7e76d2d9e6e4f5a62b996019a131b37ac14916d949e964a1dd4824e6daed562011b87764f996bd756deba87b7a7ce1fafe SHA512 2cdb44bac311b64138170158e49157dab631b21fe7b938770ed92f096dc6d4c9ef68e6003f3d84b1ee62903e88c3dfc28b734d97f60bbca0e83385b2e27d8d01
 DIST linux-6.6.5.tar.xz 140039516 BLAKE2B 9d66d720f2f037cfd480835ab38807fe5aabcff09bd210c5cb0dc80bd3e1182434df9f04a286df4e8cbc508ac984ecba12d2098a3296e3aac60afad94c085876 SHA512 364df8c838a17742c67c4a919a4e8dbed2212bb5658f63d32d8c94ab765bf0b4e33ec524c0988427edf3d2bdfc7c04d1929024206131e26e04ce19d61ef6a89e
 DIST linux-6.6.6.tar.sign 987 BLAKE2B 56f75ef6ce549a3e35f9f774d0d9819e8755237851743bfa53277f6f3f3fc1d9753c27c86466a4f2b8abbd3a8d7c3be7a3007a61d2f47fc39644b913f6a89a0d SHA512 97e185e532d49a531a143596720c062b2e73acb17f1fde0ca96be5465b07a2286092c3084e00c0bfeec118413331342e88ad5c2a5ff220b0ea79af008182d82d
@@ -46,6 +48,8 @@ DIST linux-6.6.7.tar.sign 987 BLAKE2B 41d1d20f5109cba63f81e9b2606d4bf1ab5f087aa7
 DIST linux-6.6.7.tar.xz 140029048 BLAKE2B 000c45693d074c79816ea61c8e46b58281eed5532903df92c466d3f062ec6a302e59c2782235b21d309976929659e581ff08c8d5b067bb02e7f0cc4e40593643 SHA512 aa0b09f355a31f33fd8d6a15987080355d25757832a38fbc4e553335e82e78a0b68a70380184094b3bc03e2c4de2d816a10dcfad49343d6936ba59db9a5c1985
 DIST linux-6.6.8.tar.sign 987 BLAKE2B d8293cb79cf31f1a6d907050adb3c023a577a3f83c812401f9a70edd5735aa5823211bfbec0a7a0157ce069ff3461e1d3ad46bea7b57cbe04f9b5b43a4b8dbc9 SHA512 391fa80f178ef0d52476b205ca16162976ba0d827d97a0c86031f8270f500d02b909ac96698c184a670185c2a89529b6a5ab2d9c6fce04f2b9ca0638f842443a
 DIST linux-6.6.8.tar.xz 140076264 BLAKE2B d6f58bfae29239f985c1aa329b19c2fdea1c08c79e819e60f85359e9ef00e97a7f72d74662df7d9def75ff85a3b4bdf36dc9ded578ee472e9b4efa7bf50fcd33 SHA512 aa43e54d86db2bd699b59c5c6e9fbaba6565f0052a8068c316468c7bb4cec8dc98b6c92218f6914c9c3313fece7498efe547c2fb2c8b344da882d40fc3e032a8
+DIST linux-6.6.9.tar.sign 987 BLAKE2B 947a3f09c87d9d02a8f8b5330d25cddc6f71ab501d2f52804ca0fa5394cdd5df27e413a17c1af5eba09afd0494328c122e76fec6a7792ba6c889c6d8ba7ab27a SHA512 e25e0b8cae76be052711c3113a7acfc0ecfd7e735fb0a3c7716ac8fdac689ff3f0ac51c6ea0677f3e585561f9c777dfb12b397ce25a323df7728b3352596f74c
+DIST linux-6.6.9.tar.xz 140052968 BLAKE2B c7deb1221716144b636018ee2936abe6397e15204c9bdb4cb5806f6bd303cd5d3f953a7da5865c4f211b866e4dfec4cd347c0a1a0a675f18b1a4ad197b099cec SHA512 a6a9608b158408bb55737505058ee8d64a901af38230bf31d2eee007c3530503154067e5d37c1f86c36b60ba5dc24771047c6e91de24ed6a256c2f9ecbb9c2dc
 EBUILD vanilla-kernel-5.10.203.ebuild 3769 BLAKE2B a819d95060bc10320257a1c35a843a763f89e702fe33d93a33770ec02eaaf32a432b6b17bd6485d9e2565c57afa8bcef706bc1cc41ae945b0357f6c7530d7f8b SHA512 539e37e22646fa009c09bc4d9334771e5d57c5d1f234ff668fb7d0fab2cab28fe8b9d7f57fb739f4b72070bfefe6d3e378e65574fee341bd80e219a16f112df2
 EBUILD vanilla-kernel-5.10.204.ebuild 3769 BLAKE2B a819d95060bc10320257a1c35a843a763f89e702fe33d93a33770ec02eaaf32a432b6b17bd6485d9e2565c57afa8bcef706bc1cc41ae945b0357f6c7530d7f8b SHA512 539e37e22646fa009c09bc4d9334771e5d57c5d1f234ff668fb7d0fab2cab28fe8b9d7f57fb739f4b72070bfefe6d3e378e65574fee341bd80e219a16f112df2
 EBUILD vanilla-kernel-5.10.205.ebuild 3769 BLAKE2B a819d95060bc10320257a1c35a843a763f89e702fe33d93a33770ec02eaaf32a432b6b17bd6485d9e2565c57afa8bcef706bc1cc41ae945b0357f6c7530d7f8b SHA512 539e37e22646fa009c09bc4d9334771e5d57c5d1f234ff668fb7d0fab2cab28fe8b9d7f57fb739f4b72070bfefe6d3e378e65574fee341bd80e219a16f112df2
@@ -59,9 +63,11 @@ EBUILD vanilla-kernel-6.1.66.ebuild 3887 BLAKE2B c89d198cc5b48e3fb06e4fca0c98108
 EBUILD vanilla-kernel-6.1.67.ebuild 3887 BLAKE2B c89d198cc5b48e3fb06e4fca0c981083a9a04414def46e51ec8f6c44c7d7157c6d8a132eec8d0ba307ae50d1af54876469842a74027abecdd973b5cc19928ad3 SHA512 cf9e0deb874b83f923982f5a11379502bcda164237ad635c64ba60dac8e2d8b9256759be6b01cf3a3d55f5a412e8bc7aaf1ef641b5da071b70f66a9598ed6b58
 EBUILD vanilla-kernel-6.1.68.ebuild 3887 BLAKE2B c89d198cc5b48e3fb06e4fca0c981083a9a04414def46e51ec8f6c44c7d7157c6d8a132eec8d0ba307ae50d1af54876469842a74027abecdd973b5cc19928ad3 SHA512 cf9e0deb874b83f923982f5a11379502bcda164237ad635c64ba60dac8e2d8b9256759be6b01cf3a3d55f5a412e8bc7aaf1ef641b5da071b70f66a9598ed6b58
 EBUILD vanilla-kernel-6.1.69.ebuild 3887 BLAKE2B c89d198cc5b48e3fb06e4fca0c981083a9a04414def46e51ec8f6c44c7d7157c6d8a132eec8d0ba307ae50d1af54876469842a74027abecdd973b5cc19928ad3 SHA512 cf9e0deb874b83f923982f5a11379502bcda164237ad635c64ba60dac8e2d8b9256759be6b01cf3a3d55f5a412e8bc7aaf1ef641b5da071b70f66a9598ed6b58
+EBUILD vanilla-kernel-6.1.70.ebuild 3887 BLAKE2B c5d406c26ca7656d70c30b04ec6a63b67516a10553498c14be274e818b1a5124cf5b147a84b91733ae04866dc04a60ec777dd51cc6bcddf71ed23763ae069228 SHA512 ae9ce235f1fdf67212cfc744c50e897a44272027149a39e0f2b5adc5b8bbc6c485b965153019da033b110aad68e8ac893e16b1c4247abc24c26ac0faae4976f5
 EBUILD vanilla-kernel-6.1.9999.ebuild 3401 BLAKE2B 892c5605024b72860be2a59edc694f278c58190fca3992084696d3ef13e30e273184dbb77d0cdd0ddf340c1e54e4e8d26b10d97367233403f2968644c66db2cb SHA512 d3ee150f3f35be6b644c70110610ea475f881d7e281195862ce01de3f567a1e6c3e710f127f8cf6f5b780cb72829e2b41211e2df0c65b53239d73ba83dc29a53
 EBUILD vanilla-kernel-6.6.5.ebuild 3991 BLAKE2B 979f19a66d2da7694b7442cea0018cbfda19dbc5a3d26ec902f64db38ebf28c5a11b07d7f6819dfa72dbf5c5e7eed9c40e1157b82fb36a77868e0bd822758a57 SHA512 9a49c5ae519003b1c2f390cd859dfafc3763ebf0e77328d233a9a06e24e66925134927b56f007776b96800b1741cef73f4546286566f49563890e3efdd0e8595
 EBUILD vanilla-kernel-6.6.6.ebuild 3991 BLAKE2B 979f19a66d2da7694b7442cea0018cbfda19dbc5a3d26ec902f64db38ebf28c5a11b07d7f6819dfa72dbf5c5e7eed9c40e1157b82fb36a77868e0bd822758a57 SHA512 9a49c5ae519003b1c2f390cd859dfafc3763ebf0e77328d233a9a06e24e66925134927b56f007776b96800b1741cef73f4546286566f49563890e3efdd0e8595
 EBUILD vanilla-kernel-6.6.7.ebuild 4023 BLAKE2B 24eeaff90a8dc26391dcfd00f9edd1a84c284c209f58cb106db277f71a187f45c483245e192d07ee4b8c05f87a984ddfabf03563ea714513fb802281ad25758a SHA512 2d8fe1677e557b0fd3cdec3faeb1df49db52db0b4f2235ee7b79eef6810adb6879e92191571eb7894fcefcf0a2ea8aaf0a87da04cda61c166471b59fe087f496
 EBUILD vanilla-kernel-6.6.8.ebuild 4023 BLAKE2B 24eeaff90a8dc26391dcfd00f9edd1a84c284c209f58cb106db277f71a187f45c483245e192d07ee4b8c05f87a984ddfabf03563ea714513fb802281ad25758a SHA512 2d8fe1677e557b0fd3cdec3faeb1df49db52db0b4f2235ee7b79eef6810adb6879e92191571eb7894fcefcf0a2ea8aaf0a87da04cda61c166471b59fe087f496
+EBUILD vanilla-kernel-6.6.9.ebuild 4023 BLAKE2B 92b3faade9e526e8cd2d27dbd0a3a486189ba28aff820bc449dee97d2abe5945a03248367c917cb9ecfe195dc918358aa06377177d6eddafbae6c645e7fe5630 SHA512 ecea7c4c34a5022fdc5599b95acb2478b21bcc2457ba793671f361f320ff8751426fe3fce483a44335f486d558d8c23e6b3d434581703825773edb3e5dfd3f5a
 MISC metadata.xml 353 BLAKE2B cd022bd01b289ae703ae6ef6c2539fcfce833206c55e328ba02fc42b360d60f76b1920927b259dbb199724e6d3e7b0f68ba2044680d962d3cd03a973475582ff SHA512 10b10fd24801843108a71ca7d0c27514965b0a15a60da4d9b521fc41493448a1b1685ae3278dbd46cede0d069e51dede402d2c1448c8ae6a7fcfce8acf415bf3
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.70.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.70.ebuild
new file mode 100644
index 000000000000..af7961f3fb66
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.70.ebuild
@@ -0,0 +1,137 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-build toolchain-funcs verify-sig
+
+MY_P=linux-${PV}
+# 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=g11
+
+DESCRIPTION="Linux kernel built from vanilla upstream sources"
+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://github.com/projg2/gentoo-kernel-config/archive/${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://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 ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )"
+
+BDEPEND="
+	debug? ( dev-util/pahole )
+	verify-sig? ( sec-keys/openpgp-keys-kernel )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/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
+
+	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
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-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/vanilla-kernel/vanilla-kernel-6.6.9.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.9.ebuild
new file mode 100644
index 000000000000..117098af327e
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.9.ebuild
@@ -0,0 +1,143 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KERNEL_IUSE_MODULES_SIGN=1
+inherit kernel-build toolchain-funcs verify-sig
+
+MY_P=linux-${PV}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo
+CONFIG_VER=6.6.4-gentoo
+GENTOO_CONFIG_VER=g11
+
+DESCRIPTION="Linux kernel built from vanilla upstream sources"
+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://github.com/projg2/gentoo-kernel-config/archive/${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://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 ~loong ~ppc ~ppc64 ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )"
+
+BDEPEND="
+	debug? ( dev-util/pahole )
+	verify-sig? ( sec-keys/openpgp-keys-kernel )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/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
+
+	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
+			;;
+		loong)
+			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
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-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
+
+	use secureboot && merge_configs+=( "${dist_conf_path}/secureboot.config" )
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}