gentoo auto-resync : 22:06:2023 - 01:20:39

3 files changed, 280 insertions, 0 deletions

diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index d453f6478947..5aa7421a5c54 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -60,6 +60,8 @@ DIST linux-6.1.33.tar.sign 989 BLAKE2B 786e48609d244fe23131505fe8a44b07fb1028a66
 DIST linux-6.1.33.tar.xz 134917572 BLAKE2B 47341263675a91985e5cf53c6908b19f1c55273198c16bfc4e237de04427282e72755c554816ccdbd7469f12a21a7595767fd56bea5421ca92623abcd08bde26 SHA512 02541074a597fe931370ca38d0de2689efec41073918725cc5678e7598f9017564c2a22548ab5c0eb474ed917dbb4bdbacd322aa56c1d8ec3e7cff9df200cffa
 DIST linux-6.1.34.tar.sign 989 BLAKE2B 565ae692b396592b0ec498e9eb3f691cf28ddbce779c6d8051afe42525ae13a6a24916c18fa418940807ab21a1b2da19e75607bc3d6743ff74bba9624df0575b SHA512 8c40f1641f7216e713a031c53bc54da389afdbd2eba750903a66850b8b214b771f8a1fc4aaab0e0d295f0eaaf18307efd90c9c08ab7aa61d7c9165bde89ebbe3
 DIST linux-6.1.34.tar.xz 134979752 BLAKE2B 8998cb16c6d9989bc78422142e9a25962739830f77e352c1ad5562f04fa96f495e195ee64963dd13c84189ce0db24b05d9dc7c13112bda64638d0032f1c475e3 SHA512 181a58f98f42fe584568a45d6360479d9b9fd686f03855926cb3cf7f1d4166f2d306b3966f3d77ba1c41a6ce578c37679cff64b46b9cf8f7daec2886ef62ad1d
+DIST linux-6.1.35.tar.sign 989 BLAKE2B e717c70ff3e9468799a1bb17960abb60ca1875ee4950238e0627c32f9266c15321b1c607c1b3c6f85643efac17a82efc3f5eaead73b4cf40e713c9f0ad34cc37 SHA512 934d23d90cc5aeeaa9c8e9bffbe6f97e1b0e6988e6c8212b830f224340b4ca88b93e2885e452839f7d7536a3a316586c584537d01ad5e7104ce18784b89b46b7
+DIST linux-6.1.35.tar.xz 134947896 BLAKE2B a52af7f223515da9e026c34f48fd078f7477ca6c06cca4930323fe885c18509bcafa243b39613cc8207fcf58d2dfb84baf833df068749b3d4827ad57c8939e8a SHA512 7945932912c955825f66ec72adf1ad9ff685a966e82d8a91e22919e8794b3d560c96aa0bba5376cf4b99690b4419e86ae2a7d5e52e056b858fde57a277417b33
 DIST linux-6.3.5.tar.sign 987 BLAKE2B 34ed1d758eb42af9d27b6aec986c9f52426b19ad9a7483d1b4eb1b4873e7e10efd9c102fa7e17d1fba5df15ba536ab77e6597b607dd07ea9012860fe9eff2c34 SHA512 a701dea5d297c217eb2b497a9441399c0f386f39f74f726f81872f8144d83973ec02ce533b7d48cb9c49d38a98c820668d684927983a001f7a8a27067f605867
 DIST linux-6.3.5.tar.xz 136926988 BLAKE2B 646a94591eae93db9301a11e5300579c8cce7d2a544727cb88efed86d05ba070a247498d9c83d7b7cdbead4e7d46537134c877813aa7f188dd36b403c58d0c11 SHA512 91a98c56191645c4ba32f657da59b6be92021b37a698eaf79e1ed3a79b959626386e7b69c8cb0c9eab0645c287a3e53393b1710158eca67b2f66a8d3eaec13de
 DIST linux-6.3.6.tar.sign 987 BLAKE2B db87514c0b906b3faeaeb55235234f32880de042fb2cfb05035186007d3cbbfa1051f80c54b8d9b2f93ca023e393ff3f360b8eb0dcebc3cd388122bc6cf990bb SHA512 f1c9c7d5f81906f45b6c7c2bab251f56a7fcc0ac11f59b5790e1fe5eee3bcca16da841d70055f15de4d03c24ef611520ea4339d989f4ab89354382997bebd148
@@ -68,6 +70,8 @@ DIST linux-6.3.7.tar.sign 987 BLAKE2B a5ead8f4e76e4fbb320a8eaf494a09d6a969f37bf7
 DIST linux-6.3.7.tar.xz 136943112 BLAKE2B d26443196635af6a5ca339362cd573a24759ff57f4152ab2a5ced21bdc69a66296168fab0e9ea7755ef71edce3f9898cf64d2dc9aea0cfa2b126716c706ab7d6 SHA512 1e71941f44b47d9cb8bbae144b6dd352422ae185f34da3f85c3054dcd7eb2699e0a1c35f572f0f3fe67f1fdd0312a172ed54887ce35eadf12477d55ea64de27a
 DIST linux-6.3.8.tar.sign 987 BLAKE2B 4d437ba5d766b86c1b040fa5dd3ca84dc4e1d5fb2adcc4aa0772f91ca21eb97d7317fad026ea0b45c7938f743e2f306037758d6709e9e8e6d4dd61eacd81e5cc SHA512 2eeb3512bf9929abd009fd06c72d070a9a44304ae2f0c9ba737ced45e8864761775363eb292cd732d0855c763d660a077098abc7416d3180eb05327202167786
 DIST linux-6.3.8.tar.xz 136916532 BLAKE2B 07b1156f9f5a2673ea53308cd1e67eed34b6354b61b1bf4d8fa020da1976824bdf971239c24d28745964798db9d786e65868391431cd26c713e92128f568d47a SHA512 ae57f2525eb36730cee8eeed312b14c812d85c060037771c2f28f2f443483e0106545019255ce264ab02a3dd164847320050052cafd4cf65e4b88e901143aaf7
+DIST linux-6.3.9.tar.sign 987 BLAKE2B 56f06922c7659f55fc321aa2fdab44217feda7c03ebb4139cad16ea5accfddd6447027bc5d4e5fe5caca627b74554131f83c02b1ab54dca975d27512d1ab31a3 SHA512 845311e49f6bf319994353e803c6d370573be446ca833751a65047059d307ade3007c89824ad54208cd07f6992754c80dca1c9ad49d16cb16414112b1d0eddee
+DIST linux-6.3.9.tar.xz 136959644 BLAKE2B 8f2f75272d5d2a23c6694dffa2a20260310b5b958dbaf27c5bf74ce679cd929493116ff01e94444c3f891147869d09e9dee111cb52a04a8957ae5c8d94b4ee71 SHA512 e01ee91378b348bd1ce60a974b6b58ebb422b7b1964b145488fc2272a2b52f9bc2003501c216febcb6672213770de053720b6584d16690cbc00ca2ca633e18ac
 EBUILD vanilla-kernel-5.10.181.ebuild 3776 BLAKE2B 8123c455d8037eb8f221741523b7276ed013007d928fa7b76d4401b67a3d1d904a39519da67c466967ecd657aa2465175f4214d79a3e2ecd063df9bc19e72300 SHA512 46737c9425cad5c99bebb4f233a049e0f08d0539cc1a9eb3afdca285d081f778e6effbdaf012d0f0a58b92a64e14e33bb5b463ba4ec6e9ef45a8bd825b616e87
 EBUILD vanilla-kernel-5.10.182.ebuild 3776 BLAKE2B 8123c455d8037eb8f221741523b7276ed013007d928fa7b76d4401b67a3d1d904a39519da67c466967ecd657aa2465175f4214d79a3e2ecd063df9bc19e72300 SHA512 46737c9425cad5c99bebb4f233a049e0f08d0539cc1a9eb3afdca285d081f778e6effbdaf012d0f0a58b92a64e14e33bb5b463ba4ec6e9ef45a8bd825b616e87
 EBUILD vanilla-kernel-5.10.183.ebuild 3776 BLAKE2B 8123c455d8037eb8f221741523b7276ed013007d928fa7b76d4401b67a3d1d904a39519da67c466967ecd657aa2465175f4214d79a3e2ecd063df9bc19e72300 SHA512 46737c9425cad5c99bebb4f233a049e0f08d0539cc1a9eb3afdca285d081f778e6effbdaf012d0f0a58b92a64e14e33bb5b463ba4ec6e9ef45a8bd825b616e87
@@ -88,9 +92,11 @@ EBUILD vanilla-kernel-6.1.31.ebuild 3894 BLAKE2B ceb59b4d1f283b856477226d074a57d
 EBUILD vanilla-kernel-6.1.32.ebuild 3894 BLAKE2B ceb59b4d1f283b856477226d074a57d4f46201306ccbe33e6036445ad008a095bc72ef572fd31f1a26c63008e10f80ed10eae149526cf2eb7e16b1fa045022a1 SHA512 55818f504b9f43b0b866cebfc38a33951bbbc602dcf5cc938204a94b7e5854ef7c78217d644105c36bfc56a845a0bb5235bf55edbf80d9a467865847011c6132
 EBUILD vanilla-kernel-6.1.33.ebuild 3894 BLAKE2B ceb59b4d1f283b856477226d074a57d4f46201306ccbe33e6036445ad008a095bc72ef572fd31f1a26c63008e10f80ed10eae149526cf2eb7e16b1fa045022a1 SHA512 55818f504b9f43b0b866cebfc38a33951bbbc602dcf5cc938204a94b7e5854ef7c78217d644105c36bfc56a845a0bb5235bf55edbf80d9a467865847011c6132
 EBUILD vanilla-kernel-6.1.34.ebuild 3894 BLAKE2B ceb59b4d1f283b856477226d074a57d4f46201306ccbe33e6036445ad008a095bc72ef572fd31f1a26c63008e10f80ed10eae149526cf2eb7e16b1fa045022a1 SHA512 55818f504b9f43b0b866cebfc38a33951bbbc602dcf5cc938204a94b7e5854ef7c78217d644105c36bfc56a845a0bb5235bf55edbf80d9a467865847011c6132
+EBUILD vanilla-kernel-6.1.35.ebuild 3894 BLAKE2B ceb59b4d1f283b856477226d074a57d4f46201306ccbe33e6036445ad008a095bc72ef572fd31f1a26c63008e10f80ed10eae149526cf2eb7e16b1fa045022a1 SHA512 55818f504b9f43b0b866cebfc38a33951bbbc602dcf5cc938204a94b7e5854ef7c78217d644105c36bfc56a845a0bb5235bf55edbf80d9a467865847011c6132
 EBUILD vanilla-kernel-6.1.9999.ebuild 3413 BLAKE2B 3e286878f8ad61cd41dfab86e7f5a143f3e165af8fbffa7277d1c5b0a712fbdde55440d069383e273b029967c108ee02caeddf5b6782d966ff3d47bc13763a01 SHA512 4adf01bafd3116668c406ab443e3b45bb37c182ad01931d32ce08eadea26d66df7657eba9f4f199009fb80adca108cb2401fb0a6e3c1c94b2dd77399303dc818
 EBUILD vanilla-kernel-6.3.5.ebuild 3894 BLAKE2B acee4c86bce7612f272ac8ec0f47fbe08bd4cc6db499989c6d8fae38be3ee95c2c4f3666b395506a31f3a5b83745f58f3a7ed0516a97215ff94310342eb3300a SHA512 00e190e1ca517847c6123e2cfd18196c20b032f0c4a49ba66331ac969b120500ca2856d31b97082ed86195f9280980ba8ba52005839105c4056022902e86d4d1
 EBUILD vanilla-kernel-6.3.6.ebuild 3894 BLAKE2B acee4c86bce7612f272ac8ec0f47fbe08bd4cc6db499989c6d8fae38be3ee95c2c4f3666b395506a31f3a5b83745f58f3a7ed0516a97215ff94310342eb3300a SHA512 00e190e1ca517847c6123e2cfd18196c20b032f0c4a49ba66331ac969b120500ca2856d31b97082ed86195f9280980ba8ba52005839105c4056022902e86d4d1
 EBUILD vanilla-kernel-6.3.7.ebuild 3894 BLAKE2B acee4c86bce7612f272ac8ec0f47fbe08bd4cc6db499989c6d8fae38be3ee95c2c4f3666b395506a31f3a5b83745f58f3a7ed0516a97215ff94310342eb3300a SHA512 00e190e1ca517847c6123e2cfd18196c20b032f0c4a49ba66331ac969b120500ca2856d31b97082ed86195f9280980ba8ba52005839105c4056022902e86d4d1
 EBUILD vanilla-kernel-6.3.8.ebuild 3894 BLAKE2B fde25007175b9e4ca4d9b8f9c6ede5324b26d9ecd455be3c78e829e866ddecee897daa2c78e4a574db439578e0fb4aa0bf936cd78126bfe3e6314c81632f890d SHA512 d5ccdba5652ae1ebe30d2f52a2b7bf31daa9e5ae16b57e11c5ee2460add96f60dfa1fd54828e806be6e421e7d06021f76f2e1ed69601bb4a885c62c04ceef426
+EBUILD vanilla-kernel-6.3.9.ebuild 3894 BLAKE2B fde25007175b9e4ca4d9b8f9c6ede5324b26d9ecd455be3c78e829e866ddecee897daa2c78e4a574db439578e0fb4aa0bf936cd78126bfe3e6314c81632f890d SHA512 d5ccdba5652ae1ebe30d2f52a2b7bf31daa9e5ae16b57e11c5ee2460add96f60dfa1fd54828e806be6e421e7d06021f76f2e1ed69601bb4a885c62c04ceef426
 MISC metadata.xml 353 BLAKE2B cd022bd01b289ae703ae6ef6c2539fcfce833206c55e328ba02fc42b360d60f76b1920927b259dbb199724e6d3e7b0f68ba2044680d962d3cd03a973475582ff SHA512 10b10fd24801843108a71ca7d0c27514965b0a15a60da4d9b521fc41493448a1b1685ae3278dbd46cede0d069e51dede402d2c1448c8ae6a7fcfce8acf415bf3
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.35.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.35.ebuild
new file mode 100644
index 000000000000..e3a0c5f7f691
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.35.ebuild
@@ -0,0 +1,137 @@
+# Copyright 2020-2023 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=g7
+
+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=${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
+
+	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.3.9.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.3.9.ebuild
new file mode 100644
index 000000000000..8cfee9d755a6
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.3.9.ebuild
@@ -0,0 +1,137 @@
+# Copyright 2020-2023 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.3.7-gentoo
+GENTOO_CONFIG_VER=g7
+
+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=${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
+
+	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[@]}"
+}