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

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

commit:     89cc770bdbb1f3409ec89b5de33946b3007cbfd7
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 23 15:59:28 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Sep 24 02:28:38 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89cc770b

sys-kernel/gentoo-kernel: Bump to 6.5.5

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

 sys-kernel/gentoo-kernel/Manifest                  |   6 +
 .../gentoo-kernel/gentoo-kernel-6.5.5.ebuild       | 149 +++++++++++++++++++++
 2 files changed, 155 insertions(+)

diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
index 0363a5b4ad9e..8dcc564d6eb1 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -38,6 +38,8 @@ DIST genpatches-6.5-5.base.tar.xz 259352 BLAKE2B 57e87c7c7517a4f4860b90dc9054ba4
 DIST genpatches-6.5-5.extras.tar.xz 3700 BLAKE2B 6a9037df5d22ac2cdfc765e99f29660b694d1ae030b179b1efcbf4da086114c6e5befe93368841735f306c827354fec9e40c0bee057a2f1af963dc41679bdd91 SHA512 72b23278c5b84fcbc91143d29e2d769aebc337d45d372999f91f72b3be6802cd410df2735d79f19accd0a775b875f26276dc99c605352c987e790f626dad1051
 DIST genpatches-6.5-6.base.tar.xz 359376 BLAKE2B 1f549c4adf228ad742095464dca36c704d58b2ef5339c9be0b65ac1d48599bc2127dc6f70461fdad918d46b3ae8b6e18a5fcb98da5a4ab7bb6f7f89ea3701d5e SHA512 f341a401e95d8f34c6fd6edb35224eb6b9fbddcd6e29de52b33ad3b9f4346c822bf947a971ce512007e709e325b6141bd7e3782989740f0ae540a14bcefe593f
 DIST genpatches-6.5-6.extras.tar.xz 3696 BLAKE2B af6aff8421a6d4c205e93b38f4fc3294f609b8ce4f04a472d22ac867a8abe5458e2a29a4ac16d41298cd00d5a1ef589b4579317486464236843b839641b0e277 SHA512 089c87f1c476a391811aff7ef25ed6a0fe049d2738915dd5ecb951253762c9012b25d7e4abcbb5bbc81622aa16482ac7351797ef9c6b9ef9157c83e77fcea415
+DIST genpatches-6.5-7.base.tar.xz 428224 BLAKE2B 9038c1beda5e3778508a29ccb0f906520f93a505f9a45f7050c47814eaf2e474d46e3cb8760dcf5a3bfbc504c5c133f8dcd8b55261a3d0c824cb374a42d98801 SHA512 89942e28ec1c594401a4ecfd6ba240e334356be0f1f35e48dd9abb1f4ffd122a044a76079f214c534a6acada0db4b735a8fa8face05feeeba82e2b51231c0472
+DIST genpatches-6.5-7.extras.tar.xz 3696 BLAKE2B 0cba288c1d1c753e5a317e87432dbdc2e711635cd074b1daac3b40af683da939981eaa40b8d4291ad59d4abb92aba5fc97be134524e02b1c2c29653382d7f402 SHA512 ea3bcaffbf58f981388c2021baeea809a35a1b270cff6a0613dce2da8ff8431886612d22073c7a8d6462d20eb1f27d0c0518164c14e4af96b9393bb6a1a038e4
 DIST gentoo-kernel-config-g7.tar.gz 4625 BLAKE2B 72ba0d038ee34ca5eb26d43bd373735aef3a50d02b414993ea05485e49d83d46df98a6cb0f6f3170a8ec0c99b557432fd9a11cbb92ff7c2837625a7f4469831e SHA512 2d74a8ca9f5402b4290ed93cd3ddba04a7f2ff42c8d8d3f2cbbe22fc20daa0fca119368daa8af39b7a26b1b99e4e3187c3c5d95886a651675ad94ff98d686628
 DIST gentoo-kernel-config-g8.tar.gz 4663 BLAKE2B c832df9e2085c6ec2deef5b54195f24d2d8ee039655534f5d9c1d650e06ed2ebfe82e2e62d2119696944353321bc22eb91a0599b06c90f0ac22b280fd4aa81b6 SHA512 64c9a94935e7525152827a1d7ca79259f8770300c5865995d683b4c7ba5f21670681a60153ad268aa0a0ce6c2b18683e7faacdbdfb5adc6248387e7316dbb12e
 DIST gentoo-kernel-config-g9.tar.gz 4981 BLAKE2B 1881cb550ea9e274cb5bcc3bff5b1aa6f28bc218a09825c5ab3ba2bff4ee1826398c9fbecc513b6dd20d195fd5cf26e1e7c631bf66100ab1887705a8e04fc79d SHA512 9dc2f30a33aa19fed3006e93330210c9db613febd842467e40d51c47eccac1dbdcb5a7037e9174e92c29e2a85a52ef2c31bbe2a8cccc7a22320b3dccb8aab17a
@@ -46,24 +48,28 @@ DIST kernel-aarch64-fedora.config.5.15.19 242615 BLAKE2B 94e59440681535e38137b71
 DIST kernel-aarch64-fedora.config.6.1.7-gentoo 252811 BLAKE2B f6bad0d23132bf0dfbaa25db928a95f39763b6500fd1df9b4aeca4351e3e75f185891c0df96b111ad840e4bac431d74a9b11e7344e766ab49715663c89e4dbfc SHA512 41ebf195d8b656801d49c6bb693ebe1404b6725d70d88d93a75bc4af230030d65ef0701ea931846b022a3c598dcca068fbc38ecf6d064262b3f5b88e57060437
 DIST kernel-aarch64-fedora.config.6.4.13-gentoo 260317 BLAKE2B 847f66694919fe7c5a6c24e8b70437e77da13dcbf0eb150a13c510a40b7f38decdda3e5f4d9314b3737fc23b95e291e8630af6a643c04db1c7006453dc1c7bd9 SHA512 400ec9845171bbfd58c6f136455dfcb80e31e3cfb25508e8642f817ca036f3534a7342fc9b5976f2ef11e7b8a3815c18512f5e3e1860438a94157d923c978d01
 DIST kernel-aarch64-fedora.config.6.5.2-gentoo 268615 BLAKE2B b32bf416971e95bc9f242da3c2d0149550c856f54fd21699dade735d22fba1f74c722ac10f3808cc49c76b1553f92a7871495ce1e5eb192ac423bff021810452 SHA512 55d9efcd75807e9e29d7337f799345fa39e7062319d201c66878230c088db1ef5c856cbb1937ae03e32c056ff532a7fa99df95b3e7896120a11fa5e51a2e10f8
+DIST kernel-aarch64-fedora.config.6.5.4-gentoo 268615 BLAKE2B b32bf416971e95bc9f242da3c2d0149550c856f54fd21699dade735d22fba1f74c722ac10f3808cc49c76b1553f92a7871495ce1e5eb192ac423bff021810452 SHA512 55d9efcd75807e9e29d7337f799345fa39e7062319d201c66878230c088db1ef5c856cbb1937ae03e32c056ff532a7fa99df95b3e7896120a11fa5e51a2e10f8
 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.13-gentoo 232961 BLAKE2B 29c51dfb59275b1066f25f4d47ced0c04ed599e821755b31364877b5d45fd9b8c3b1e8e60f933c8d02692f0e0a43c4e54e3222b151b691820cc661766a9ef1af SHA512 5c2a4260fd39111ad5ed9de3ba2477b059d189cfb90800a33514b9a6e439b141d53f5dc56abe4cdc73e0410a9bc076e7cd7f1556cc9f44fd890c371746d83220
 DIST kernel-i686-fedora.config.6.5.2-gentoo 241061 BLAKE2B b6d0c48f73b5bb188b202e71b49815571512221974b8a6725d0104398314dedaa385a83f29af4977e80ecce5c6335375607fd1073eff77c4d59f1d4310f95571 SHA512 d70ec67c5a1e5b1c2ca19901dede663ceb175b2b82368f84cda9433cdb446dc30a78217d363790a6f665fdafd16716cb33526c5bc03b276b463c28ce4d0d13df
+DIST kernel-i686-fedora.config.6.5.4-gentoo 241072 BLAKE2B 69fdc02f2df9245b22684a96f839a7595de965f349093f971081a88d3658dec605def01230650df0285acdd4f9fdf670c0571920df355740be65ffd78819f9ad SHA512 d0423a5976041fe033d4fc5cf5e404619eac91af8f144251ed0275a5ea4c7db757dd6b3666a4b99a2eef9914745a95670a83b540558af60ebc8da7a1f7b13fad
 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.13-gentoo 223242 BLAKE2B 1bce8c83f6b502d2ba52239a6f1470b28dbda8ceaba726ac5e10e28fbb307740937cf0c76de07c4d17993f4fe97adb42cb4febb11a47bc58698eb6a61c2df45c SHA512 2809fda6bfa9b548545f932ef562cfbc909e3a60c3ef8c43e76edf712dd7617c1f66eb9a497d8b94f459702fa01a131f0b258f038b424ecb47ae1705a8e473ce
 DIST kernel-ppc64le-fedora.config.6.5.2-gentoo 230704 BLAKE2B f187769e1e606254d1cc2cb8621bb02dfa6636975c8b3e04afb239d54a309ed1e7fa9c7a738f3df833a6093f3796daa19f6a2184bcaf0a2d344612b9a8468156 SHA512 38ac6f9c18fe167277c0871e7cd445a33edf3a8432382b6a39af5a74f438e1513d40368b55cc7aa9456733613ec9a14bcc4a51dc8c7d4f645cf1dfe9894bb10d
+DIST kernel-ppc64le-fedora.config.6.5.4-gentoo 230715 BLAKE2B 714559c2b2354751a32ca4d47ab51f2434251ee1befba9147c432f3c946335b28951d9222faed3069b03c3bf131d12a8271ffe3bac6fa1b0ca4398a917d19450 SHA512 812b135c6930357a9554be88906175e8897f4d8a304be2a479e938991a956cd0331387abc18d2098fdd97c48ce76843ae401a6673b83f2e5f7aaa03fd422401e
 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.13-gentoo 233645 BLAKE2B eb7ae19723832fdd55ba3f5b06bcffb5be4896329c662370a7ef23586f497db0ff99e682b67da96196200ba574beca8bd95521ada7ebeb2fd3d577a3c9f4f850 SHA512 91830f733ef345c41414822200e39487120d8592ac5f9bd4dc6ef76ee090a5f0e93ecbe361c6d608b865b8b45f2dd35477cd52dd0bed89d93a3a3b63b349530e
 DIST kernel-x86_64-fedora.config.6.5.2-gentoo 241636 BLAKE2B 1f59ae0253dccb33777404ffcc933fdf0969af8cfc78cf9fdea6c167484e368ed22d27d505f84ad1394e06cec59e3465305b6724ed28760c0820d457f6e2c894 SHA512 359b36c69bbdd4a8bc5853aabac57b9b6a9c3f3a31300772a7d16a4ac7ce443e5940d84d96cf6317f067fc5f8b7eef0d2698a3ce8196b71279fc13ed6635145d
+DIST kernel-x86_64-fedora.config.6.5.4-gentoo 241647 BLAKE2B 8f72de8eb9ea6abf9b752e9c79e708c4a7bb7a1f5c9403abb6b2599a4f0849289c484715334b115c8e6da959b8e96b21a27934dd32d3ef54cf176dd563e4b936 SHA512 c8e22f29469d7a313f71bf7918f80a308671f6f9d59b4cec4af74f760e0895975b61472a49de5c092949e584a77db6470d0703828c0a520f8c41496837c8e825
 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

diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.5.5.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.5.5.ebuild
new file mode 100644
index 000000000000..1576a940ed34
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.5.5.ebuild
@@ -0,0 +1,149 @@
+# 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.5.4-gentoo
+GENTOO_CONFIG_VER=g9
+
+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
+
+	use secureboot && merge_configs+=( "${dist_conf_path}/secureboot.config" )
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}