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

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

commit:     854ea1704c262d499f65bbba8a7f4e246a02c532
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 15 17:23:01 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Jun 15 19:06:32 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=854ea170

sys-kernel/gentoo-kernel: Bump to 5.18.4

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

 sys-kernel/gentoo-kernel/Manifest                  |   7 ++
 .../gentoo-kernel/gentoo-kernel-5.18.4.ebuild      | 137 +++++++++++++++++++++
 2 files changed, 144 insertions(+)

diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
index 1340cb3bada3..3a920e0600e4 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -34,6 +34,8 @@ DIST genpatches-5.17-18.base.tar.xz 1040972 BLAKE2B 71575497161db10073de3d7db41a
 DIST genpatches-5.17-18.extras.tar.xz 3932 BLAKE2B 754c044fcf38d26a062d977505b3a25f663b90f1cadfa1aee524946aab3b84fc08463602bb8d5681b3303f459d6180e43bd1ac25b0c830f3163a9b8cce5029a1 SHA512 f135e3724cd1ff190d3d117c4afb5559a8908e1483e6be3cd783c42c05b8c4ae5b37c0a1537fddb88ed800d9faf4fa8996641201cf0a6891e31be2a3dda2c558
 DIST genpatches-5.17-19.base.tar.xz 1122576 BLAKE2B 62a8ef6da90d967676754daec496101b7638c1301ab5bbde5d94f8186d66f7f5672c55b8f97ca64cef9a83da00a46db7ab804cadff62d3137ecdd2bd41885be1 SHA512 b5aaa9013bf2372a658e885ce37e3171077002881e95bd81da87ff1a69645d4daed0f7717b4d35441f25ad647dcbbe92ecbd01318eb449101bdc415409c60e41
 DIST genpatches-5.17-19.extras.tar.xz 3932 BLAKE2B 87ea5b908c969c61d8da8067f13f0b674a4f72c4614b576a5b7648cf6d6880e88735931314faa43a3f4907c4d75baa3f705908bb609b95af3d9de582dfc7989a SHA512 191eed3aa27c2a2dff28b79a45db4d2c703bc45f5f63eaafbc6229541138601b6462df8262d808fcb5155eb7d632aed85e26d06e13a4095e305a493345dd02e3
+DIST genpatches-5.18-7.base.tar.xz 431972 BLAKE2B f35163850c12f2610d487c7ed42b80b1f88b982f10476124d6e19b942ef1e2a012100325ff98807fa3664adc62116e843cc584d068335767c374d29d24f33b76 SHA512 9967d15c984f731dbfe7fb7c9bdb1270678efb565bccde88dd9c4bde6b3e93720d52c96db943110e07aa257401431e9bdc9f4149f9bd1cd983605ce369277d0c
+DIST genpatches-5.18-7.extras.tar.xz 3920 BLAKE2B dac0cba1f0a14780c6b8af044fc505466671360b06bc15c3ea1dc4b69ed1ab3978030d68d8417b52b972e7567dea8e42cdf3894b7bd86420bfdff3e7afb075b7 SHA512 cf97f18c7bd726494c0091303101ab3bee99cd9243a681eab4460c4f0c9edd5b03e23be3295a828f2eaee0af35d033eb8bd468dae2d981afba5af47a7ac20020
 DIST genpatches-5.4-199.base.tar.xz 4683396 BLAKE2B e1e66ce10c436bb196a5890e08d5beb8d0a1ece7f19f8fb3b1027747509cc7b6102ace634abdbd299dd48fbc8750f3bc127abe55014410b1d558b4aec497f475 SHA512 8a16d67794e864749fdcdbf413ec0fe996d3c4fb5f04f8c8a2d3001377c8b5d4d7007a96efaa3590fd4b595cccdea36d83c6dc292629566e5398f322658d80f4
 DIST genpatches-5.4-199.extras.tar.xz 1812 BLAKE2B 03b9ebf9d306256e58c895006038f4bb3d908590ef2f603487d9b970963c24acfbe78fbe862b2b493ab477e6e901aba332dc69916eb881fc42a79a62d7f81da4 SHA512 d100e876a9b64d662331d4a78b8531a71144bb70b789e0ab0b76e6957c368ee3a88025e040cd622dd4cf6e4da358a3636571ddf55b94e42dbc250a62a629baee
 DIST genpatches-5.4-200.base.tar.xz 4700404 BLAKE2B 8420d667947cf912a8d6419581377b5d7daea5a3c03e333403a4c0d0d55200afe4bd7f379c786ff5904c8f1cd1d7735cb7df95a5a5aad93fcb8b90a8750683d3 SHA512 771883d2b15e92dd5e2ea31e9566d3e1d210389323521be5af32fbea75c168d17e947bf004eb515c54f7b0880fa12fde236045bdeb35e08aec8b54465cb253d9
@@ -47,23 +49,28 @@ DIST kernel-aarch64-fedora.config.5.10.12 223184 BLAKE2B a0246dac2f7a4ad6a55b611
 DIST kernel-aarch64-fedora.config.5.15.19 242615 BLAKE2B 94e59440681535e38137b71814e1ae53f57a347f62cf31e0c1c8571ae43d9ae9be9957743c8cbc9ec74850c964eaabefe6799a28bc311ea7b99ee31391b47fb1 SHA512 fb77d3b73a215f97d70cd6d8c96ed20e497786b99ed7d7a7f2ed60cc1251289c1a4c7e058c41b5efac62e4a9b4b3d917dbdb11585955bba2b6584981430f4ddb
 DIST kernel-aarch64-fedora.config.5.17.11-gentoo 239036 BLAKE2B 7b4cfd0cb29d5a79f7af585ae019723da74de58eb0e756ebb783ca0e17a79b68ea751f9c7eb7f31f16adb334e2b746228b55bdebafe31195cde4a379aa865b48 SHA512 08de60599905b032d09ad263670f1501513366d89fc224e21c1689fef97f6ed28db9149becf7363f28f2983587cbefcb20ef99f6b5dab8ad24ad9320ee829790
 DIST kernel-aarch64-fedora.config.5.17.3-gentoo 238977 BLAKE2B 5f3a43fff7ddfe4dda03f00e7f4af761ff978bbc9c6d2fa73b605f60755a0d40e494428725a7728f5e2f5f58c9931d8d60b048d318e22c635588e546209dcfb2 SHA512 4c22514ec7d2d4ce87087aeae17a5f68efc3e70f48298895262d5dbc47623de6ada4254ee3a7f06a302d37af73d921470903f2f3a86fe5224e638bda882be7e5
+DIST kernel-aarch64-fedora.config.5.18.4-gentoo 242525 BLAKE2B d27e9b2f96f3d7968919eb2bd4f67b62543a9fbbeb2f1253a39046b4e3b9cfbff1266c21a98a2d86dbed1897bd41d8795726c6491d96bd1de25ad1a012fabaa5 SHA512 bf7758b7a24c4abd46e66f031e1da5081e324a383c710f60446f43296fa7543b3dad47c751ece8667ab0715e1605b104b6ceb36966a0f474ae4ec8641425914f
 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.5.17.11-gentoo 218149 BLAKE2B a1a4946185e678b9c42f8e524de25efea1a049714e07f8f64bc9482680fe4668bed2b6a91a7e63d4142cda50f3d3a05c64b62e4477d2411e0251546b6774b12c SHA512 9ad7a0a213637d9818b95ea86f5abb2c6d2fdd0929ddd15db32a0ab4c71c2ff808a066846bfd054a27dce4056942db98117414399484e1688c6dc7d7d8edd0b7
 DIST kernel-i686-fedora.config.5.17.3-gentoo 218090 BLAKE2B 1d972e6ed16c7dc1dd9959ae406af52d1cdc15f85f8ab376e4d7abb79d9e284a9a68442bde975f5f1a9bc64fffdaee96d1f41392238538b37f1b6f9652ecfcd6 SHA512 2c32cca1f20cf54f3e9b394f6e3f14f435bdd72fa22868416129bfd4253a3cc8f3164b6868e31292c2404a1c433944783279e03b45cce9bec3b2813cb4675b27
+DIST kernel-i686-fedora.config.5.18.4-gentoo 220827 BLAKE2B f73a4fb7d46e9275b5a0ab119aa8915cb7897a5652664efbd71596b5b3be6ee4cf9f9c7907ef3fe45ab2a2868512fad7b4b11213534d6260815ca4eca7593ae0 SHA512 afce5864ea980c1a7b53c187b483c6fa8eb88d11af9114d71b6177b4347d534d7f9dd68240c0cbb729e0da3cc01a5783b6e150d94708f1aabaa6c9956bacf06e
 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.5.17.11-gentoo 209309 BLAKE2B 4b94a9ebac017c2cd4240eef9bea7b65c0e0fb75e1f02d2e6585c0f352f91e1113e0fd8f527cb3d3f96e93c50eeee74186ba6c2574dd45bee515e031ed2bad9d SHA512 72c05e6e64ef8e2430ac2fe592dfcb0c5c8def60f2d53a9f2f7bc1e9f5a98faab2ace7ab73758c008bf004eb99bd91eb11be90198178b27636d7873e38ca6943
 DIST kernel-ppc64le-fedora.config.5.17.3-gentoo 209239 BLAKE2B 7c6fd8bdbd8331def5bb658359aeb3d52a9f0e72d9312699e00d852b6740250edb1c7a77ea76521b0be6a8ce41888aea4ce8734bb267cc1f3e216f2cbd6ab8d6 SHA512 f25199dd6cef4be45049fa7d6cc1dc1b8a93ddfeb3b3824e6ead76443c1ea30e31dfcd4ba66625eec74ed43ab255d1e21cb2a9011160cdc64f30c4b1fdcdb9b3
+DIST kernel-ppc64le-fedora.config.5.18.4-gentoo 211942 BLAKE2B f92e988198b08bd7a30976d92ba152ac2986324c223202dc73bb733c903015095498b529cb5dd3b3d86d678c7ca0adba7f4807e9046b8c8215b2e1ebd06e53d5 SHA512 4f1d85a3f858a6e240e0bc34b37a77f78cf128b19de78404de9f0463d0d3fa6e87b84e5710b7ce501b92e162d798b372fb6843e83b3821a77a73ead2385e9014
 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.5.17.11-gentoo 219087 BLAKE2B cec0c1948960ec5363830ece7be7d3060c74eb689e801af229017a9d9804cf9ef546168669d65598d33fd5b2f4ac9aaceeeafd33f92ddeb8f185cb507f56b417 SHA512 c1602e8a8401311ca82972278476916f634dc8ae810a0902bfe0d415d2670b3bceba59f016ed90669eb73b1a9dfaab35cba4a1b4428e0fbaa6ccd2701871af39
 DIST kernel-x86_64-fedora.config.5.17.3-gentoo 219028 BLAKE2B a8a3e2f31315d6aaf19c6771db94a3549379fd48a33b29b00d0311a36325ba8e9f124b5962a447aa8bf63b01f714298f4fca7ff071db165f183ce9023e2b4cf2 SHA512 8c7937310b8e9cbaefe4d6910595df373edfea5a56e439671583c98a752eb5d9029bcb32178ea6b09e6847e55e71dd9ab94e0adb149626ce04c8a9e8f6d7a145
+DIST kernel-x86_64-fedora.config.5.18.4-gentoo 221797 BLAKE2B 1873ffeab78c7e9a8186d255dac5b7dc5fcdadfa97d6a265aaac1583006adc1c0a150eff6892f1a82e622f77122051d0eca5e2cc0d9b95f8d0e36212d6c47ed3 SHA512 7c2325a12de85bc1aa300b5f3846711a20d43817a60a68e7cae84ac6505b3deb158c9dd0871d86e148f46435f36549231566abe276ffc2ee8bb9dd2ac5c40960
 DIST kernel-x86_64.config.5.4.21 184907 BLAKE2B 0eb2b07c14cea7545350fcdf3a94f2a531f0137c502ebda9299cacf44da5385686e2049b480b28bc153c9d413d453cfe682b9655eefe70428cb720f57c7bd200 SHA512 f3b3ee6841555ac3a9cc11536a7d44e1a5a8df2bab14ba341fda7df1ceb0de45cf1c799a1d54a64f2858fd1272d348bb52cf269ffa396878c5402baf2730237f
 DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1 SHA512 95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e
 DIST linux-5.15.tar.xz 121913744 BLAKE2B 3921274b23f7938abdf3ed9334534b4581e13d7484303d3a5280eddb038999aaa8b836666a487472d9c4a219af0f06b9fecccaf348fb5510ab8762f4ef4b7e83 SHA512 d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e43b6f021709dc685eb0efa18d2aec327e4f88a79f405705a
 DIST linux-5.17.tar.xz 128399340 BLAKE2B 82dc4a45cc25c781ac67aa6ed1e4c369544154960f41c4634d47621f381159687a227054976d078524cda28884d395a15f7542fe44ca74ce98ca6ff54a81d6d0 SHA512 89f0a7ca69d20a539d4b612a7028a30a5e98b402e4b6b88516f14237e5da4b626d7929eab8b40fccc90766e8f3bae87e9858a19077ffad20d8204acf18794f5b
+DIST linux-5.18.tar.xz 129790264 BLAKE2B e2745a69eb70169e90505a9318a3993046eab3020496eecde7d8352ecda0eb71a25b21becf7ce93fc593507dce7d1cd61b94ddcdf82b3094d79c0d3d48508eeb SHA512 dbbc9d1395898a498fa4947fceda1781344fa5d360240f753810daa4fa88e519833e2186c4e582a8f1836e6413e9e85f6563c7770523b704e8702d67622f98b5
 DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f

diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.18.4.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.18.4.ebuild
new file mode 100644
index 000000000000..bfe89d1f938d
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.18.4.ebuild
@@ -0,0 +1,137 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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/mgorny/fedora-kernel-config-for-gentoo
+CONFIG_VER=5.18.4-gentoo
+GENTOO_CONFIG_VER=g1
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="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/mgorny/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	amd64? (
+		https://raw.githubusercontent.com/mgorny/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://raw.githubusercontent.com/mgorny/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://raw.githubusercontent.com/mgorny/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://raw.githubusercontent.com/mgorny/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[@]}"
+}