gentoo auto-resync : 02:07:2023 - 22:04:01

3 files changed, 287 insertions, 0 deletions

diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
index 625c6393b0e7..8d8a0887ef6d 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -46,6 +46,8 @@ DIST genpatches-6.1-40.base.tar.xz 2034256 BLAKE2B 7a95fc06c6d7f6f3f658d35b21a27
 DIST genpatches-6.1-40.extras.tar.xz 3808 BLAKE2B ee4162db692e272773091d94d06bd2ba11fac8ca9bd4da96396eb450a7ea0c933e49ae9f6a27fc453c40079054d9140578c9d4c80a835f6ced71fad20a29247e SHA512 07a61941a6e0174d309da302bfdde21dce57a7449f3f8263d9005fe0a9c47feae2a5b508062cabaf53f92d6f06724e1acc3c71422e4a8e9215c515d989567a81
 DIST genpatches-6.1-41.base.tar.xz 2664364 BLAKE2B 411463f6532b87253491c5b4d05e4a76c2739408901eaedfcecc135c3e01303a30870e6133253e86b9e1ff10f9363dd7e2f0b5f68a85c7d1ec0e5f1443737820 SHA512 3227ed7184af3db4090c8e081b56f1fccd85f08298cf944c44ffdf808b7b17499191657a71e232e9c5dcaf68c1ca93902816c4dcdefc5f1240632816b87b2659
 DIST genpatches-6.1-41.extras.tar.xz 3808 BLAKE2B af183a6fd9ebd81ed22f8ecd36ba323e9c3aa438e72018ae1282bfd371874870a8a6d52b6488b1940a6eb65192cff46af7221967d4d473b2f3eafc963f0b5ed1 SHA512 fd26c56b8a9c5052e32c3ddaf7ff1379912f2aebc7b57bda68bb9f9bc0b316f8b5ae396e0547f205ab491acdc1fc9731acd87d13fdbb13508efbb6d6fa3154a4
+DIST genpatches-6.1-42.base.tar.xz 2681352 BLAKE2B 8d16c71a41bba911a9ed73e8ff55794caf34adee41a757072db78f4168b6cdde0abb979cc5f6d353a9fbc3c5911e30642b5e8125c1a32fa02e9c946f157442a9 SHA512 be7f76ed509a912fc1913ae7f8dee0ae6b2351cd2175319b341812cb5fbf00b2adc053f9711a991324f40ce77c095ab820fd57a00b7acd006400fd10fc94b575
+DIST genpatches-6.1-42.extras.tar.xz 3808 BLAKE2B 6a9159e3859740d4b14bd081aa6df1dbeeed5f322a3aa3df5b8cb942884b068e713815d7284f71ffcad95339928c120661c0b7a85e7c168b27d3daf88251bd18 SHA512 a6cb074fe4fafb8a336872ce7c5761ac1fe3e3e84836949803c4a46e9bf783d38a4ced188830158493f64518418c46228bc4f79f669258de5ac6b2e1714f7a4b
 DIST genpatches-6.3-10.base.tar.xz 593348 BLAKE2B e4d149963ca7d441b60d40af98939acdcc6163a09790ce103c78d33aa554de170136fbf8a4aa9285c5bde7fdd3cad54f73152d56038d7a299f8e69158b420d50 SHA512 7fddf9a02d8767c0236d8c3e1097a267d7f4961308eb08826299b596ba96b1e2fcaa84c22d986619e99aff3817f64fbc3740b87e5d0e1949dfe85d7f5450697f
 DIST genpatches-6.3-10.extras.tar.xz 3808 BLAKE2B 7a4885c76a17d73d7f03836d243bee424f5d4e4205a6547f1b4fcb709f4f6c2c4b1c61dd542b260a3e8dd724f98d851850eaf0930233988670c674a8a2928bae SHA512 f851bc9d10ad98ee74fb26344236670c0aaa218c4bf24eaf54e6376ca68d0626cc1d8f954a1dd3b61343dbd41a286d7c8d9a743ab50c295c0c729732cfb231c2
 DIST genpatches-6.3-11.base.tar.xz 641372 BLAKE2B 4b2463552d359412969bc50e8c46aac52c23fe83deaff66eddacb48148921b4f88b019bd05b81f4ae2eb71710cad18613e5001dd4ab999d461f35cedc4c31409 SHA512 7632ff13835b971d44f582853cc54d539bde0ef1ca511ac179ff49143c1bae21e82da0048b6c45d36da5aefd92fa788b108e3f01d6fbf16534394ad7b143833d
@@ -54,6 +56,8 @@ DIST genpatches-6.3-12.base.tar.xz 691736 BLAKE2B 533383ee5f0bce440f9ceff66b75d7
 DIST genpatches-6.3-12.extras.tar.xz 3808 BLAKE2B 08914680602e3a59ccdd2699b60b3707e40bd2dd28c87170e78701758f50ed2273d7b4b7e238cc6d6ae5819c48c2c8e744056e0ce964dfc900fad44dd628da5d SHA512 f99775c2aece8d77fb432fd9a013868d85cddba6546b6fa489c91b085b0ed35fc14e2e23c922d5b34f677994749e050f837112aa6c0ad171278481eca257606b
 DIST genpatches-6.3-13.base.tar.xz 754256 BLAKE2B ef146e227f2df785bb65d1cf8e50d786103aeed18a8f42e5584656f1999b943ac48db16d5cdc5917c03823364199284975837fabe9a777215373ae83e7206b99 SHA512 3df4532294febf47cb0291acdbf5ff137877186747ff7791f675686f2c08e14c0b8fd110e452c50172dc3d1b6a48bda604f6e577753380a4ab64502d0ec17724
 DIST genpatches-6.3-13.extras.tar.xz 3808 BLAKE2B 87d56c9b4869ed1741878e8dc03adf97c77872a7eda00697b21a72584393eeb89d9124299aa14aac9f4790e2a90adb42038a226e08ef01a7d1906a381c7a7d2e SHA512 8e5ef88f45333e6afcd139b83698eb7a250c7db6882fe0409361d91a52fa6997fe57ef8ae1d3e5eb4b9306efab0d2fbbc96a4a3808925f15c305df6514159fd8
+DIST genpatches-6.3-14.base.tar.xz 769112 BLAKE2B 5980cb83d7cc282d5fcca19385c3f4e3524a9a4a294b3e240391126de85f93f3f165ddedc4f70cee4da4f679eb84698e4f1925e7887f1622e6b935a27195f53c SHA512 31b8b2388476fde88c6128d82a394bca12baf550a8d64f9344831baef1d81b9649042ba4f7eff8dc33e68c02f8f73fc6a812de99bd940823f01c4a30348d16ee
+DIST genpatches-6.3-14.extras.tar.xz 3808 BLAKE2B d280e3791f1dc8aa1455666a7ec24188d8ad1e207f7cde4218bd30eefacdaf2bab8e2d21620077e3b02bdea06f03e936933de7d5f0cdd0303114901ee1bda703 SHA512 96abe3c0cb6f789026f10d1013b09c77d57c52c10ba46da5a6fb876f16540852d4604fd7838908fceebcbf651a6228af6fd213cdb535c905eae413973ee1f1dc
 DIST genpatches-6.3-8.base.tar.xz 502012 BLAKE2B 190e68ecc877c5520413129ad7d28f8a088775234c18f59f74a4675b1256c7da1d8dc1b323c232523fc3044f3dd4988a77ecacedda715ff3431f910b7b0d58b7 SHA512 02f4b62eb098d875e4c66325f2abc74917fe0d88c1c35ee84ee2a19da878addd27719e9e2a0dca145707335338eedc905407dcd54c6706ec18a2f0920fc082b6
 DIST genpatches-6.3-8.extras.tar.xz 3804 BLAKE2B 461a2a8fd04a4a7ef2f714f5472d2169b4119dbd42bac961feb6b890b8d7def33931ac8dbe423e9d8ee32e60d56ca01bcc4c814c18e445da8d8bbb9b58a6a717 SHA512 fc563f898ee88024d4b60eec567a7439893339c9f51b4eb9a09a0b16b1c7fa164260e63396ea923e776751dfdbd52d2cddace03f212419d4b145e38b5d670dad
 DIST genpatches-6.3-9.base.tar.xz 517548 BLAKE2B 1cb215f7a6dfb9723ad2b784aa463e097686e7aa230f50285f55167590d2e673f986081a9b2e37ff8f96ad206a61e2bc34ce36b6c22c652584d7dd6a18ebe20d SHA512 039e3c8bc8927d1bef377b451c957bc394186061fcd6027defe34df59000e40f2aae9924189e8e10d240fcf2197236e97f7fc5cc924c18917349e2c74a3d2125
@@ -112,7 +116,9 @@ EBUILD gentoo-kernel-6.1.33.ebuild 3919 BLAKE2B 94d646109f6ba20b49d1b536b60f8649
 EBUILD gentoo-kernel-6.1.34.ebuild 3919 BLAKE2B 94d646109f6ba20b49d1b536b60f864931c42a093a934c9a54d5bab61f84adf8d072a401c36e4f464125756d15373c159d835c8b64da9e68f364dd85360e13b1 SHA512 3e9d6bf7af0ee81645f3fa3410c6fdc5cd06876c952a77e3ae043634b15b3fd6370e83eef8f312a883df87d98dd9b228f7b4d30145b514cfa5037db0fbe6243e
 EBUILD gentoo-kernel-6.1.35.ebuild 3917 BLAKE2B 7d874950232c5ec963518170c249d974f7dfa7bf398517f09e6bf8f56663dd3407fa829d62a588c3ab6ad6bdf83ebe26641a00be837a44b88155c729bb95dca8 SHA512 c70e32185b12202830cc31889f7eb189b5bc1bec458dc57d5aa84712174b6c6e6f6526e1dfebe6bfd8f7c81ba85a4d53309cf22f6aa7aadfad7594f37eebeea3
 EBUILD gentoo-kernel-6.1.36.ebuild 3919 BLAKE2B 94d646109f6ba20b49d1b536b60f864931c42a093a934c9a54d5bab61f84adf8d072a401c36e4f464125756d15373c159d835c8b64da9e68f364dd85360e13b1 SHA512 3e9d6bf7af0ee81645f3fa3410c6fdc5cd06876c952a77e3ae043634b15b3fd6370e83eef8f312a883df87d98dd9b228f7b4d30145b514cfa5037db0fbe6243e
+EBUILD gentoo-kernel-6.1.37.ebuild 3919 BLAKE2B 94d646109f6ba20b49d1b536b60f864931c42a093a934c9a54d5bab61f84adf8d072a401c36e4f464125756d15373c159d835c8b64da9e68f364dd85360e13b1 SHA512 3e9d6bf7af0ee81645f3fa3410c6fdc5cd06876c952a77e3ae043634b15b3fd6370e83eef8f312a883df87d98dd9b228f7b4d30145b514cfa5037db0fbe6243e
 EBUILD gentoo-kernel-6.3.10.ebuild 3946 BLAKE2B 1fa6fcaa24bc13570986fb4fb0a62b456a9213cbf5b181b996dc99685e936a8cb57ad160e5a94b3635c5bb1b654766c9ef96df6089ab5d04784ac42f5264b3db SHA512 599cddf43b76a05d3d6e704475c89ead560b3ef6f1c930995acd90fedc5aa84afcd48f6d98927c63e4eb8a97d072f7c5164c53c5963eb8caaca385a1142c5278
+EBUILD gentoo-kernel-6.3.11.ebuild 3946 BLAKE2B 1fa6fcaa24bc13570986fb4fb0a62b456a9213cbf5b181b996dc99685e936a8cb57ad160e5a94b3635c5bb1b654766c9ef96df6089ab5d04784ac42f5264b3db SHA512 599cddf43b76a05d3d6e704475c89ead560b3ef6f1c930995acd90fedc5aa84afcd48f6d98927c63e4eb8a97d072f7c5164c53c5963eb8caaca385a1142c5278
 EBUILD gentoo-kernel-6.3.5.ebuild 3919 BLAKE2B ce36a0c01561205dfd8ae0c201499482c598a9a937585e76b8beb9d9f6f267bec97bba421094afe33633ef4f9e8c649f15276533e48105cfa2d3cb9722780f36 SHA512 de4378b2e5d63ad4bd5f245eb20d9e4cd1e05f35789765cb64f6f316cd2f6e4e74b1503717afaea84bad334ed15c9cfe1e6c69f49814e7008a8f00f71c9cd398
 EBUILD gentoo-kernel-6.3.6.ebuild 3919 BLAKE2B ce36a0c01561205dfd8ae0c201499482c598a9a937585e76b8beb9d9f6f267bec97bba421094afe33633ef4f9e8c649f15276533e48105cfa2d3cb9722780f36 SHA512 de4378b2e5d63ad4bd5f245eb20d9e4cd1e05f35789765cb64f6f316cd2f6e4e74b1503717afaea84bad334ed15c9cfe1e6c69f49814e7008a8f00f71c9cd398
 EBUILD gentoo-kernel-6.3.7.ebuild 3919 BLAKE2B ce36a0c01561205dfd8ae0c201499482c598a9a937585e76b8beb9d9f6f267bec97bba421094afe33633ef4f9e8c649f15276533e48105cfa2d3cb9722780f36 SHA512 de4378b2e5d63ad4bd5f245eb20d9e4cd1e05f35789765cb64f6f316cd2f6e4e74b1503717afaea84bad334ed15c9cfe1e6c69f49814e7008a8f00f71c9cd398
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.37.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.37.ebuild
new file mode 100644
index 000000000000..d77da3bdbc2e
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.37.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##*.} + 5 ))
+# 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/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/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.3.11.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.3.11.ebuild
new file mode 100644
index 000000000000..e7a2be111fdb
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.3.11.ebuild
@@ -0,0 +1,141 @@
+# Copyright 2020-2023 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
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 3 ))
+# 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 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/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/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[@]}"
+}