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

3 files changed, 280 insertions, 0 deletions

diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index 46ffe823dc85..53d646998e43 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -72,6 +72,8 @@ DIST linux-6.1.16.tar.sign 989 BLAKE2B 7b6cd99f171b948c15031cecc78eb88c6c9b39301
 DIST linux-6.1.16.tar.xz 134833708 BLAKE2B 6e61a45093f8a91668495cb0c0e9e9350a80581f772c3e1c42536bf66ab9e6952697b695faa3a53cb326644296dda0e70d671477536364e7b3d98476efaaea13 SHA512 ceb37f0e7e8b29648a0880f0d375224f8dfb19e612f9e5966a8a6d07755cced62b5a69ba88ae79f12b4e7a482e746fea4ebe9f2323e9b4967f0195f72f205642
 DIST linux-6.1.18.tar.sign 989 BLAKE2B 8ace1f508c142c54090354f04dc12c22f75e9dfc540f994a2fdc0bf0a55afe29596f47f7f3d28863eadcf0085a09e65f6103666cbd08fd4c95e9fcadefb02892 SHA512 a496d75070d6dd2613d6aded510fd2ba3b518c03bf46509376b0faa752ded71080ed20d1dfde0b8bd2427ce429428d938f451888c2867c2801cff3cbdb585eae
 DIST linux-6.1.18.tar.xz 134827948 BLAKE2B a63035abf31406397b2f517f2b947e4efae80495b0ec6da9b6ee77dff29d39f5431daeee8d6e4f6acdce5d8197f09663e7c48d4a68c2f31d4e4b7e724cc34028 SHA512 852194311ca357268b43541760de091fd85b56e6e42979a36d7a09f0411bc3baf4a3c833ba93276226f2566c2e94b757bf0a334274dd0f28703dd9c69f74886b
+DIST linux-6.1.19.tar.sign 989 BLAKE2B 56673fda63b67cc326774c3fcd6a5e08cc1aa81380f931940e8a0ef9ad76d475999678b6af5270181f6b8f27df71c367984ee471b73f8b56fd7a6ea1a1dca07b SHA512 68e72679cdd92ebd592eb77bb126b4721cf808e0a69c32e51977d9284a20114d7f13565b2de503a99a2da4de5ebf59d92e25f37444b35b52033aca5eaf40f200
+DIST linux-6.1.19.tar.xz 134856432 BLAKE2B 2988daff435d09babfe6e501a4b481b99206badf803c2e3510b283a42c4bb0c217e5bc479010c12c15e2d056d1dbb9d72c10f4e7fca3c9b500229e9ab90ba5d4 SHA512 06e714a70b6014a4f56b551952db899a526b9b3f7fdb11ca0f354d99e65fff1be9a3bc9522af98a93753568266233eff2f5e6f032921293ca2802587ff866ffd
 DIST linux-6.2.1.tar.sign 987 BLAKE2B 37c7a969bbdf12b86b72c245e632e0990154e4ae57ab35da8c3efa5e092d42ba758a88739b5628775635eb0f9e8e7b007111bf63426adc0ee0ade2d1a2f984bf SHA512 70c4ee9c0a39127e0893fa639e65488d11f8f9f342de76259f28ab709842860165a200d8ba986de627628f4689bd10b1e0c95a17db9e2c909e4d4ad2aa99297c
 DIST linux-6.2.1.tar.xz 136445896 BLAKE2B 72c221e68c6bfb19b49c15c491c2ec35db045c730487e409186819620b65b605046a03df8e0c173141d1893ecf7408576b266fe1b33baa72cd44aa26458da562 SHA512 79d3465955dd557dc599fa1c18c7a68699f4febdd7264fe4e223c694e879ef5bb65fff9fad1ec5599f894ad6519bad292efbd5b9990dac3223d843f5c22c65f2
 DIST linux-6.2.2.tar.sign 987 BLAKE2B ee5dae47aab443841f6073b2da066ec7cb625059ed1f300c623a1d38df995055ca84a0ae4d4215826de467a3355bccc3ab9a26bc228aec4f7f0a4b2d9cc92171 SHA512 42b166f3e5a5a3d6507a1bf7c7a8801cc8f3d7f663e3580847014cb404b7043cbe395f29528a482d70514ebc55db69105303b369ca12dfd7add2fd3125ecd6e1
@@ -80,6 +82,8 @@ DIST linux-6.2.3.tar.sign 987 BLAKE2B 311b97575b921cd902adb714f8e362013d8b44f765
 DIST linux-6.2.3.tar.xz 136437004 BLAKE2B a6c740faf8349ae2f92ffe133afb40a763aaf178c1f3a4457572956d2fda7e09e3354dae48d594aca9cbab42d4d8d7be41036adef630275520d732902b7da812 SHA512 4df6a17d1f1234e3c98352c4a6b9071507988de454c21c8fd2310b4e0c2894b4bff7d3453c3271281ff798536562cfb85880be16c997df5e26c38575eb6ba96e
 DIST linux-6.2.5.tar.sign 987 BLAKE2B 5bf80100e780b38027c10b37987bb53b3d42e0a43ffdb336ad9e53551cd392ebada8ddebb1bb498d16ae140f051a606993fccda274e98fec466b1679c585172d SHA512 c3982cf10c11c8046b0c3a12eb5b6d0158304a891e4a9fd7ddd5ed36143b0c336c8ea27d313a14097b4a6a2204074a9758feee3d9f9cdb6ecb08a4a06f44006c
 DIST linux-6.2.5.tar.xz 136449360 BLAKE2B 510aab3dc724cfafcdae148cf8a6d4376b589d2534ea180bef85a6cd695b3f290f9050a2e655d5b515efb88b48da91c2c4ff65e4bd8ef1f74817c84980c4103c SHA512 72a9adafbdc63cabc42b6cb0a833de70e1784a9b45c47973c57df754e01900b34f9a2fb85f442ee4a7d8bec687f1f87835dc025c37bda6525dd1fbf2290f4e01
+DIST linux-6.2.6.tar.sign 987 BLAKE2B dc30795c15693b3ebdf05418aa418e4545d95731963035dbcc837367227e882a314a72a1e5110482df2b53d3ac54626384f4f7d26b41951b69f4413d76e01c73 SHA512 dd6ba22c6ad1a6ccb64b4b7cd77ef1ce8c6c5550026bdbda636f58e88ed91dc36aa7cf1c362ec1a42bb46d82369e5dd66a7aad1e663c20577b68d69962592887
+DIST linux-6.2.6.tar.xz 136460416 BLAKE2B 6c8e064752a4c3fa16d3f8ee2cf05716e82b0154f67c198f10864174d95169c99396390094ee5b1ce661b74b7d1e749ff86796af53428006bb882ea17d7ad21b SHA512 6164e45b003c9cf17e26a35cf43b20884fc0a5886bf759639cce414b4dc2af7da7a0d39a50b41ee7844cc52fc9e75190999a06880916dbcef68af35009006877
 EBUILD vanilla-kernel-5.10.167.ebuild 3776 BLAKE2B f17a71ce2af16261001d766fb6e9d280a9939bebe3d6df50dde64a04b662f43df2df41ff222d903fafd58ab981122103fb6020771eb82a4615fb532a8ad0dc5d SHA512 5a7d0ce4b2b601a6c1a891b09376d81a84d518f7faa387f68ffa707a916b7d325aa11424781e32042b392598bae5c99f718c408aeb96270f8256e287a8305d33
 EBUILD vanilla-kernel-5.10.168.ebuild 3776 BLAKE2B f17a71ce2af16261001d766fb6e9d280a9939bebe3d6df50dde64a04b662f43df2df41ff222d903fafd58ab981122103fb6020771eb82a4615fb532a8ad0dc5d SHA512 5a7d0ce4b2b601a6c1a891b09376d81a84d518f7faa387f68ffa707a916b7d325aa11424781e32042b392598bae5c99f718c408aeb96270f8256e287a8305d33
 EBUILD vanilla-kernel-5.10.169.ebuild 3776 BLAKE2B f17a71ce2af16261001d766fb6e9d280a9939bebe3d6df50dde64a04b662f43df2df41ff222d903fafd58ab981122103fb6020771eb82a4615fb532a8ad0dc5d SHA512 5a7d0ce4b2b601a6c1a891b09376d81a84d518f7faa387f68ffa707a916b7d325aa11424781e32042b392598bae5c99f718c408aeb96270f8256e287a8305d33
@@ -107,8 +111,10 @@ EBUILD vanilla-kernel-6.1.14.ebuild 3894 BLAKE2B 33a0975c3412120cc5cef7d64e4c89e
 EBUILD vanilla-kernel-6.1.15.ebuild 3894 BLAKE2B 33a0975c3412120cc5cef7d64e4c89e261676ea8b932f051cfae2b62c0c7e960b0c820a9af00e3ac8978630f103c88b2548a9dbfa9b8777b98fed45b5d993fb9 SHA512 abe01b978e9f4b6260856e13076367e2115845f13d017f8e85377dc6f3523561ab26824e785c7954bc71afd26a5577264c1e3d75e58cf3ff086252a5a9cb55f2
 EBUILD vanilla-kernel-6.1.16.ebuild 3894 BLAKE2B ceb59b4d1f283b856477226d074a57d4f46201306ccbe33e6036445ad008a095bc72ef572fd31f1a26c63008e10f80ed10eae149526cf2eb7e16b1fa045022a1 SHA512 55818f504b9f43b0b866cebfc38a33951bbbc602dcf5cc938204a94b7e5854ef7c78217d644105c36bfc56a845a0bb5235bf55edbf80d9a467865847011c6132
 EBUILD vanilla-kernel-6.1.18.ebuild 3894 BLAKE2B ceb59b4d1f283b856477226d074a57d4f46201306ccbe33e6036445ad008a095bc72ef572fd31f1a26c63008e10f80ed10eae149526cf2eb7e16b1fa045022a1 SHA512 55818f504b9f43b0b866cebfc38a33951bbbc602dcf5cc938204a94b7e5854ef7c78217d644105c36bfc56a845a0bb5235bf55edbf80d9a467865847011c6132
+EBUILD vanilla-kernel-6.1.19.ebuild 3894 BLAKE2B ceb59b4d1f283b856477226d074a57d4f46201306ccbe33e6036445ad008a095bc72ef572fd31f1a26c63008e10f80ed10eae149526cf2eb7e16b1fa045022a1 SHA512 55818f504b9f43b0b866cebfc38a33951bbbc602dcf5cc938204a94b7e5854ef7c78217d644105c36bfc56a845a0bb5235bf55edbf80d9a467865847011c6132
 EBUILD vanilla-kernel-6.2.1.ebuild 3894 BLAKE2B 255c844fd54ae440e02ee41e09a1c7932bbf94039d733aea21cc6ce013a81448fbabdc12b842dc149109fa3a56d340f04fb3889140e48ad5df4b61ad923ce763 SHA512 04af9a4f274095bcfe414ade9c7836ec2d20acbe520b99643012eaa1960739b6b51d85cb0cd1226d12164cd3d5f944ff3f7ca1d606df8cc0768de4e1bb394cfa
 EBUILD vanilla-kernel-6.2.2.ebuild 3894 BLAKE2B 255c844fd54ae440e02ee41e09a1c7932bbf94039d733aea21cc6ce013a81448fbabdc12b842dc149109fa3a56d340f04fb3889140e48ad5df4b61ad923ce763 SHA512 04af9a4f274095bcfe414ade9c7836ec2d20acbe520b99643012eaa1960739b6b51d85cb0cd1226d12164cd3d5f944ff3f7ca1d606df8cc0768de4e1bb394cfa
 EBUILD vanilla-kernel-6.2.3.ebuild 3894 BLAKE2B 255c844fd54ae440e02ee41e09a1c7932bbf94039d733aea21cc6ce013a81448fbabdc12b842dc149109fa3a56d340f04fb3889140e48ad5df4b61ad923ce763 SHA512 04af9a4f274095bcfe414ade9c7836ec2d20acbe520b99643012eaa1960739b6b51d85cb0cd1226d12164cd3d5f944ff3f7ca1d606df8cc0768de4e1bb394cfa
 EBUILD vanilla-kernel-6.2.5.ebuild 3894 BLAKE2B 255c844fd54ae440e02ee41e09a1c7932bbf94039d733aea21cc6ce013a81448fbabdc12b842dc149109fa3a56d340f04fb3889140e48ad5df4b61ad923ce763 SHA512 04af9a4f274095bcfe414ade9c7836ec2d20acbe520b99643012eaa1960739b6b51d85cb0cd1226d12164cd3d5f944ff3f7ca1d606df8cc0768de4e1bb394cfa
+EBUILD vanilla-kernel-6.2.6.ebuild 3894 BLAKE2B 255c844fd54ae440e02ee41e09a1c7932bbf94039d733aea21cc6ce013a81448fbabdc12b842dc149109fa3a56d340f04fb3889140e48ad5df4b61ad923ce763 SHA512 04af9a4f274095bcfe414ade9c7836ec2d20acbe520b99643012eaa1960739b6b51d85cb0cd1226d12164cd3d5f944ff3f7ca1d606df8cc0768de4e1bb394cfa
 MISC metadata.xml 353 BLAKE2B cd022bd01b289ae703ae6ef6c2539fcfce833206c55e328ba02fc42b360d60f76b1920927b259dbb199724e6d3e7b0f68ba2044680d962d3cd03a973475582ff SHA512 10b10fd24801843108a71ca7d0c27514965b0a15a60da4d9b521fc41493448a1b1685ae3278dbd46cede0d069e51dede402d2c1448c8ae6a7fcfce8acf415bf3
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.19.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.19.ebuild
new file mode 100644
index 000000000000..e3a0c5f7f691
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.19.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.2.6.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.2.6.ebuild
new file mode 100644
index 000000000000..750a7d7f1f80
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.2.6.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.2.0-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[@]}"
+}