[gentoo-commits] repo/gentoo:master commit in: sys-kernel/gentoo-kernel/

["Michał Górny" <mgorny@gentoo.org>]

commit:     d6d92ad2c537714b28aae0489eff33944d7a1895
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 13 14:40:32 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Sep 13 19:20:06 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6d92ad2

sys-kernel/gentoo-kernel: Bump to 6.4.16

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 sys-kernel/gentoo-kernel/Manifest                  |   6 +
 .../gentoo-kernel/gentoo-kernel-6.4.16.ebuild      | 147 +++++++++++++++++++++
 2 files changed, 153 insertions(+)

diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
index 93f1e8918038..abd057925f50 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -44,29 +44,35 @@ DIST genpatches-6.4-16.base.tar.xz 811436 BLAKE2B 1a1f92b35cafd3ee73cc9a04a94d72
 DIST genpatches-6.4-16.extras.tar.xz 3700 BLAKE2B a50cf572b21a1e91c2e84f05238f5d0301fd2b6596f98fb48fb962c4c4f2d17f91a95af4c3814d818ef53e1743523aa6ec45ac0b26c41bcb7e122a31f616d59e SHA512 534d7320c07134e41f6bd31547ab55f6e0d305b5bd7cb8c862f0d9454142e3aa273c64f50405a1230da32b9341dfdba0a1ab71121bb4a78819ddd5a9e6f320b2
 DIST genpatches-6.4-17.base.tar.xz 818408 BLAKE2B 71e3e8271b5ba2788bb52f42e8cf7846375856d0a946188c01e1e20f4bd2001817837910d9272c5e70cffd539d7f9e30dc89d7378501f18ebff678d699824e3b SHA512 bd11bee4f21132321da063dfd66f506e67e5528fa6aafddfb483067a0ca02e92ef71a83c02bbe601e434d5c77649f17c7e9d9e34ba1c9f06084eda79906b73a3
 DIST genpatches-6.4-17.extras.tar.xz 3696 BLAKE2B 6a9be135efa7a8fdc0ebafd41ed2f8794530e6052d3a955d6142c03d7f134d2157efbdaef071c0b0f362406e42a404f385bb4c73717b24e427a4a6e886ea1504 SHA512 191a861faefd72ce25d4a6bf873488e5b8625b70f46bd1bf1f36125483ecffcd00cb5c3a7a07e2cd5d97d5f140d8ddb9897e80fa010492e64435340eab9c76bd
+DIST genpatches-6.4-18.base.tar.xz 1040816 BLAKE2B 61ce7d234cba40c266e92dbab80b26e9958d9501fe884ed1fe45c25a89f2385259d5776049d7ce172c05d6829a92f591652544d7a3ce3ce7c81d09ce871800f5 SHA512 559a4e9690a72dc76a0ab38f463149dc9221bad128b59fdafc1250b964af2ccf573ee0d4e593e98811f83325a0d10772a6a6b32bbaef50aee3c5a0d1938677d7
+DIST genpatches-6.4-18.extras.tar.xz 3700 BLAKE2B b360eff83abdbed397db6405b6b68649a3d6f85a37716eb2f923d47dc3ae5d738ca49c29a58dd2f236c7f50dc233641e3df15b7b75a19364b0af6261afc36d4e SHA512 778791e5e9232bc432119d14a016c00e1a968af30f0a2dd931ebb4103f7f457db991eb1d9ca500d1a3c9295dbf87d9b4fab18ffaebbd46cc8c82077b27c344e6
 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
 DIST kernel-aarch64-fedora.config.5.15.19 242615 BLAKE2B 94e59440681535e38137b71814e1ae53f57a347f62cf31e0c1c8571ae43d9ae9be9957743c8cbc9ec74850c964eaabefe6799a28bc311ea7b99ee31391b47fb1 SHA512 fb77d3b73a215f97d70cd6d8c96ed20e497786b99ed7d7a7f2ed60cc1251289c1a4c7e058c41b5efac62e4a9b4b3d917dbdb11585955bba2b6584981430f4ddb
 DIST kernel-aarch64-fedora.config.6.1.7-gentoo 252811 BLAKE2B f6bad0d23132bf0dfbaa25db928a95f39763b6500fd1df9b4aeca4351e3e75f185891c0df96b111ad840e4bac431d74a9b11e7344e766ab49715663c89e4dbfc SHA512 41ebf195d8b656801d49c6bb693ebe1404b6725d70d88d93a75bc4af230030d65ef0701ea931846b022a3c598dcca068fbc38ecf6d064262b3f5b88e57060437
 DIST kernel-aarch64-fedora.config.6.4.12-gentoo 260188 BLAKE2B 94fe84900f7ab351cb5c1df9831a5141fd9ad4436511176471f1961d5d583928fc5b70c8a3e7b6c87738b942f82096d0dac0b05a632f458fe4dc6bd57e4f34fa SHA512 2bcb58ddaeec2903fcffecbe53380970c6740f91e6775b8ac3ff41a77df42eb6f773f608be25545b8ade0cb0e0f2a72bf00d26e7c47771859ca2d111fe875e35
+DIST kernel-aarch64-fedora.config.6.4.13-gentoo 260317 BLAKE2B 847f66694919fe7c5a6c24e8b70437e77da13dcbf0eb150a13c510a40b7f38decdda3e5f4d9314b3737fc23b95e291e8630af6a643c04db1c7006453dc1c7bd9 SHA512 400ec9845171bbfd58c6f136455dfcb80e31e3cfb25508e8642f817ca036f3534a7342fc9b5976f2ef11e7b8a3815c18512f5e3e1860438a94157d923c978d01
 DIST kernel-aarch64-fedora.config.6.4.3-gentoo 260188 BLAKE2B 94fe84900f7ab351cb5c1df9831a5141fd9ad4436511176471f1961d5d583928fc5b70c8a3e7b6c87738b942f82096d0dac0b05a632f458fe4dc6bd57e4f34fa SHA512 2bcb58ddaeec2903fcffecbe53380970c6740f91e6775b8ac3ff41a77df42eb6f773f608be25545b8ade0cb0e0f2a72bf00d26e7c47771859ca2d111fe875e35
 DIST kernel-aarch64.config.5.4.21 199104 BLAKE2B 578ad451a76204df2a9bbbe34b5cb27051d2ac5e2c33967f562b01338c43f35da6dc33a4c2cc67ea6c3b32b155729360d3748ec28dcaa750f18449245b2e8a09 SHA512 66e9a437beb350fdc59512c17b8f72c5b5bfacf2b35070d810d77e66f49cf7929026cc28ad44b04a016d61e65d9fb4a10af6996ba09b604bf97e9c467d08f8ff
 DIST kernel-i686-fedora.config.5.10.12 205412 BLAKE2B 92c715b7e2cd7dd74da7970c05981f520597d3e403ce82c8cf4eee31c9f1f50b638792a6bdb256ef5bfdc99f1bcd594e819e8f44dc6febb2ad9a854bad817f2b SHA512 69d8db11723ae1b40fdedfaace74d15bb63198cdb0485e0a1e5eba95b31217110c93a93e39cc7370cf45f1d3a8bc7f75ec096d6db5ea9ecb28ac6b56702ebb10
 DIST kernel-i686-fedora.config.5.15.19 222233 BLAKE2B 9e0f4dd37058f59610e46a87d3165039e76299d3c186fbfc3312101bac1b8b198de404075f5bbc6f5e2ba04cfd45f9d02bdf94b01c3ed11b9275f37f11ee7617 SHA512 49ffc39de86763e707a5c0c07c1367d34e9249615f29fdf97904d7b61a375a86fc4ba37a2f02b5f61e4c76ad65d9ba12716d2523af6faa003f6336d7ae61a953
 DIST kernel-i686-fedora.config.6.1.7-gentoo 228053 BLAKE2B 1b06ca68465d7833905b6236a6ccf9a594f44613cbd102990c1667c1ece53ad982fa3abbfe475333e3297331ce1cfadf27c00c3e7de6293e213278e8ca97cd3b SHA512 1ed70eb5254a04d99d28ad901d4556dfa7e8ec8b739a0a33040315718effe9348e75ca8ac19d3b33fa7b3dcad9b4bb0531075692087c0dbe57ec6a4d873a4b27
 DIST kernel-i686-fedora.config.6.4.12-gentoo 232961 BLAKE2B 29c51dfb59275b1066f25f4d47ced0c04ed599e821755b31364877b5d45fd9b8c3b1e8e60f933c8d02692f0e0a43c4e54e3222b151b691820cc661766a9ef1af SHA512 5c2a4260fd39111ad5ed9de3ba2477b059d189cfb90800a33514b9a6e439b141d53f5dc56abe4cdc73e0410a9bc076e7cd7f1556cc9f44fd890c371746d83220
+DIST kernel-i686-fedora.config.6.4.13-gentoo 232961 BLAKE2B 29c51dfb59275b1066f25f4d47ced0c04ed599e821755b31364877b5d45fd9b8c3b1e8e60f933c8d02692f0e0a43c4e54e3222b151b691820cc661766a9ef1af SHA512 5c2a4260fd39111ad5ed9de3ba2477b059d189cfb90800a33514b9a6e439b141d53f5dc56abe4cdc73e0410a9bc076e7cd7f1556cc9f44fd890c371746d83220
 DIST kernel-i686-fedora.config.6.4.3-gentoo 232810 BLAKE2B d68818234ecf03a26b0593be604daf2c45880dbd5fadcf66202b5b993733e3d21b56fcb4fc2b0ef87f502aaf83e8c671bf961e5a645ae87a60c3222b2b849410 SHA512 a4abda9f60e03a7a91340c55efb9e0149970194cfda7d457ca1669ad21f38dec93e0beb7f4e9f9185dcca04b76c7f16e5537327260fd60c04e3f7804d98db983
 DIST kernel-i686.config.5.4.21 183910 BLAKE2B 185126ffb85718bb73761d01683def80b6f002d7a7a6eddd8e858a30d8eadc863fb378d83a1cd2ed82b3540337fa66ae44475e31fb41ebc46d77005b6f54e5c0 SHA512 6307afc2295902e44fe65b1cccaa7a0260b295a5f21f1d67ec66197bd972bd3f5675b624f08d9da8b224cb3ec987d5c21cbd743599aeab9ac6214bc651f43476
 DIST kernel-ppc64le-fedora.config.5.10.12 192105 BLAKE2B 889141debb0656a358a3381bae14b5216b982acdfce0bc758f9445c16647807a68a788fb290199c2a1a23627bda1ef4c9405b3f5ac2a4176d1d2b55c71fb7db9 SHA512 3ab0f1401d9f50a61477c71369dede438f575d9d2c3a2f5c2cf36d624c2b59a938efca9c981b075511b3860c983eaaf5e5a9f877d659277f09ceba45edd43770
 DIST kernel-ppc64le-fedora.config.5.15.19 213339 BLAKE2B db6bbc9f402b8b48a2441e39d1a78dc112656ae842bc5594065cfd2ec3f6d462e4bde200e8736a70192af35fb3a5d1fc42683783a5b7620881f3a95bb0bc5f4d SHA512 b43439c24be8fa8bdd17d4c0beece799544ae45b2c289f0202fa5eb7a52dce0165a0cbc924b0decf877582af9688efd675cbfbd2313ff85fcc2c8563bba4b1ad
 DIST kernel-ppc64le-fedora.config.6.1.7-gentoo 218278 BLAKE2B f4dda4430e9801c4660be4bbf6e4b37052e720656e77c928adb7176ff3dba55feb2fe66dd564d41a181809488941cf392ec9c94d786e4a3d813fbe5d683d305f SHA512 a5e12ab1045fae61b494938047cf1c2a3c34693d3d242968e4ab564a012c70e6d232b9d5333347f5ba114a64bb59dd96919b38c5a1327fb8c5154ef40ad28d2c
 DIST kernel-ppc64le-fedora.config.6.4.12-gentoo 223150 BLAKE2B 4a4685f6687568b1a7462e6fe9ea68eeb1a05d32d5402f893e1f6ef5d0061c651788bdcbb2980ef5f2675668dbad433e1c3370a4668f03b54233b1b39caf71f3 SHA512 42f8c255f2a8a8fa3eb6285c690bf2baa77ebecf11ecf141dd058b51afe959e74103ca5eac284b20e78abe7843ea0c82d0ac83efcb5dd15e13c2266d06dd8074
+DIST kernel-ppc64le-fedora.config.6.4.13-gentoo 223242 BLAKE2B 1bce8c83f6b502d2ba52239a6f1470b28dbda8ceaba726ac5e10e28fbb307740937cf0c76de07c4d17993f4fe97adb42cb4febb11a47bc58698eb6a61c2df45c SHA512 2809fda6bfa9b548545f932ef562cfbc909e3a60c3ef8c43e76edf712dd7617c1f66eb9a497d8b94f459702fa01a131f0b258f038b424ecb47ae1705a8e473ce
 DIST kernel-ppc64le-fedora.config.6.4.3-gentoo 223150 BLAKE2B 4a4685f6687568b1a7462e6fe9ea68eeb1a05d32d5402f893e1f6ef5d0061c651788bdcbb2980ef5f2675668dbad433e1c3370a4668f03b54233b1b39caf71f3 SHA512 42f8c255f2a8a8fa3eb6285c690bf2baa77ebecf11ecf141dd058b51afe959e74103ca5eac284b20e78abe7843ea0c82d0ac83efcb5dd15e13c2266d06dd8074
 DIST kernel-ppc64le.config.5.4.21 172003 BLAKE2B b53887cb44f7c378cb3866780f8e556e19fdb02130d3b0df01d97698d2a91f7d90a200012559f288e962935742c3fdb67dfb6711876fad37862fe55cdca5b5f6 SHA512 82df8d0be47e9eb20bd7db570539bb061d0b6e2101dc78a54596cf4d0b4e0c536041449304ff9240b051ee09b342ea336c5645e9a3b66a5dfb96d7778ff86008
 DIST kernel-x86_64-fedora.config.5.10.12 206357 BLAKE2B 0eda9d4f3f973336cabd67c1ac78f100aabde926354743e8dcb7ff84496f0de49210d45f99bc850a2096078b0b4687aa7fd965d999248559506004f2b29dac0c SHA512 b12f43d3c1a52a4915cd73db98874ce9ae6c425672c0f1c19ed1b1101341c868ebf1c9620bef5449752ec0d7342c1ce38fb77779d0f89b9267096a605ebf7a26
 DIST kernel-x86_64-fedora.config.5.15.19 223286 BLAKE2B 239995703c01dcb6d179133dd115bc0a57872c07d7a08afaf4d92cf6d78f0c17b19487b5b399ac7fdde5d460fa7931628147817a569fef2c3a62951c96054bdf SHA512 9bee4aff7e5ef4ada57bee7496aaf47b8fdd5c936c4c9b580660d130db0678eaecdebdbcab0dfcaf5c17a71f6419069840db10f5886806b6fc810f8a3619554f
 DIST kernel-x86_64-fedora.config.6.1.7-gentoo 228685 BLAKE2B e68236ccc1d51b2aff850eda9f3197b7ea95b8a88716bc7b07dad30348a86fdbb99a948060300dddae73ca82267d851d357f1c9547a9dcefae1364deebdbd124 SHA512 42bec2ddb9cf7eb6e84bbdeb23eb98dc11c9cea41f6134b776010c6b36833b520a290f0ef0145379de15c7f7834398fa5e3aaabd7258d7d4e89567faa09eeb4c
 DIST kernel-x86_64-fedora.config.6.4.12-gentoo 233494 BLAKE2B 15481955940dc58447f9527dde755e6a6e3e4db86ea1a7fbb0f31d32ba3146d6773b068594425d4aa4c72df5fe65076bb08271473b69d4563d08c17012992611 SHA512 c2ff9676d6792f6c49dce5237fba97100b7e3659196ce8e3b4db4f727cf0f379665b2351c1a9f62dfdf45696940bbd76c5fa890f0849029614a2eed0a1efc169
+DIST kernel-x86_64-fedora.config.6.4.13-gentoo 233645 BLAKE2B eb7ae19723832fdd55ba3f5b06bcffb5be4896329c662370a7ef23586f497db0ff99e682b67da96196200ba574beca8bd95521ada7ebeb2fd3d577a3c9f4f850 SHA512 91830f733ef345c41414822200e39487120d8592ac5f9bd4dc6ef76ee090a5f0e93ecbe361c6d608b865b8b45f2dd35477cd52dd0bed89d93a3a3b63b349530e
 DIST kernel-x86_64-fedora.config.6.4.3-gentoo 233494 BLAKE2B 15481955940dc58447f9527dde755e6a6e3e4db86ea1a7fbb0f31d32ba3146d6773b068594425d4aa4c72df5fe65076bb08271473b69d4563d08c17012992611 SHA512 c2ff9676d6792f6c49dce5237fba97100b7e3659196ce8e3b4db4f727cf0f379665b2351c1a9f62dfdf45696940bbd76c5fa890f0849029614a2eed0a1efc169
 DIST kernel-x86_64.config.5.4.21 184907 BLAKE2B 0eb2b07c14cea7545350fcdf3a94f2a531f0137c502ebda9299cacf44da5385686e2049b480b28bc153c9d413d453cfe682b9655eefe70428cb720f57c7bd200 SHA512 f3b3ee6841555ac3a9cc11536a7d44e1a5a8df2bab14ba341fda7df1ceb0de45cf1c799a1d54a64f2858fd1272d348bb52cf269ffa396878c5402baf2730237f
 DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1 SHA512 95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e

diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.4.16.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.4.16.ebuild
new file mode 100644
index 000000000000..2c9e39549b0b
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.4.16.ebuild
@@ -0,0 +1,147 @@
+# 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##*.} + 2 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo
+CONFIG_VER=6.4.13-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 ~sparc ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="
+	arm? ( savedconfig )
+	hppa? ( savedconfig )
+	riscv? ( savedconfig )
+	sparc? ( 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
+			;;
+		sparc)
+			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[@]}"
+}