sys-kernel/gentoo-kernel: Bump to 6.9.3

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

2 files changed, 159 insertions, 0 deletions

diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
index 6acb0a06fdae..d98a50036304 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -32,6 +32,8 @@ DIST genpatches-6.8-15.base.tar.xz 941124 BLAKE2B 461b11b32b4a6a04fc2a94af5c4025
 DIST genpatches-6.8-15.extras.tar.xz 4052 BLAKE2B 45771b4b26f6aa70153baa6683d80daaa93e79fbf4359053a78da707b478b0ff7b538cb2888b2b1ca884ff4fa610c5cc680fba260bbf13d0f993cefc6b000d3a SHA512 c8a6b0f373426fb45c85dbb020bfe2d61ad72b2a02d019d1a42d65057620c1280118aa8db9e76bf8d1020d9aa4ca851278f2da05f5c4f0e52ab429efff33f8e1
 DIST genpatches-6.9-3.base.tar.xz 22900 BLAKE2B 6cc860e07ef37d83920accee580c0dc69592c2779e729739ed5457d411e5b9bd3ea6b73e57cbc4536f40172439365729ac1d0f921b19e7836c684cfa1fb556d5 SHA512 bd7391b1d987ab5ec9eeee698c04cee6587e6050954d0f54dd7ed382c79565a8929fe7ae9dcd32d4757ea96d4da78780b867455802d84c33dd185ff4bac0f328
 DIST genpatches-6.9-3.extras.tar.xz 4052 BLAKE2B 5c97314b601fac604449ffd391d3c1389bec1a5c5bebc3a7fc3678c44de8bee31431f01567ea7b239ac62c22c149d4e563f6f52336f0eced4a105b99a1a3b93d SHA512 84ef3f91d3c9823b7371022b276d3b5c7bb86fc7be00aaffeddca171438c21f70291e67c992fa75f7222fa964f049be2816bcf7e081e35fbbb31d68da8c5bd08
+DIST genpatches-6.9-4.base.tar.xz 158304 BLAKE2B cf964990abe6f7428e3a590752519f9a0bb16416186f06e6e377a33fc48acb42b38515e5a628f3394b418780fbb6b420636d6b896ea92906578e0bdf57b6125c SHA512 ad9e039a8a7ee29a5c258b42cd688737c9c575c097ced8d23792bbb2856480081a64cfc65488e5c0c8d5c6cdab9016be22183199ee8357c1c1ca372360035b1c
+DIST genpatches-6.9-4.extras.tar.xz 4048 BLAKE2B 7a47f3ef9bd870175c4373d064316fa746c3480a4075492fb04b4eca4496ab2c33c713875997a4fa33695177bbade0b6686f7d7e4f2cba110cd89a0f2017e2cd SHA512 5cd79406ad14a07fb95fc94a5aaee2bcd18f143996c111e16675b77402e9ee0917fd51f2a2023fd58d462caa2edfe5a950eb72bdb04870b185012b20ff302560
 DIST gentoo-kernel-config-g13.tar.gz 5759 BLAKE2B 831f89078e539c8b4ce244528dfd847c12a45b52d540eb10d85ec0d9deb1c14288d8de12456865c92d16e3523ec3595676787a8f3b79545d76870b0fb68deb5d SHA512 2a7230cce57a67e3333f9a88a311afe4a928e27ce76036747451cb77d3186569ad11d7a5b827748ad53290a17ad63637a8362ca896516f85ff0944a8d68265a6
 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
@@ -40,6 +42,7 @@ DIST kernel-aarch64-fedora.config.6.6.12-gentoo 271041 BLAKE2B 5af7c2f57cd6cd923
 DIST kernel-aarch64-fedora.config.6.8.12-gentoo 277881 BLAKE2B b9be1ed7eb5f88c747c356410a8d9a0beb516a2793ff2956e88186c320727f16940f97fc660478a2690422b237f2f0ba92b299353699867766ea4901eaac05cd SHA512 ce0993ffe6d7d6e7edfb19b2f857a085ec72fffbd0ac77c89afbf81c08eded20ee764d881dad7f55cb01507053acda7b11b3b3e832224586fc730aa1731bf6c0
 DIST kernel-aarch64-fedora.config.6.8.7-gentoo 277695 BLAKE2B e3f4270b1543b96391229d673a1dc097975b065b1ce5966ff3886e31e449cc0542c986085feaca7030e41fd0acad2b6921115c4d0f81234cf9f72ce4bfe84696 SHA512 4721995bd2100e2d90f67a3c21db3a5507a3001f5f409b2894fc1a9cad3ff159e1784d06aacc0254229aff40598f78e0a51355b6cfc5cf860bdaf4e8a30a5235
 DIST kernel-aarch64-fedora.config.6.9.1-gentoo 279240 BLAKE2B d25b0f719b05d64560ae0431fd5d8b36764cb6a8698d2c704c9a929199ba9dcc6480ab0313127720d21aa92094ed8b1f5228bff5c3569aa3ffa1acc29bb7f691 SHA512 348db83b70e05048f69d8acab34b569dead90938d45a6134f92825568813db05a2516f0d84cdd0c747340b697d77cf3183fa2f38fa5e862d32b318c118b3e497
+DIST kernel-aarch64-fedora.config.6.9.3-gentoo 279229 BLAKE2B 5a4d896f14f917ee0c2a239a765ada5cbc6656cb384e2d6095197d1114f9c0d6490bda5ad37c5fec74a9b4967886b3a57ded29607d97c05935dfd9d988035f47 SHA512 19a690b7da59e734ad769c0e72b1636bfb13d488171b9206175c6a8422c3e985dfacd8d051f371d2e64de6228b11087e73154f2c3e7a8713476ddfa076daab9c
 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
@@ -47,6 +50,7 @@ DIST kernel-i686-fedora.config.6.6.12-gentoo 242515 BLAKE2B dbb4df93a5c8ee34d687
 DIST kernel-i686-fedora.config.6.8.12-gentoo 246738 BLAKE2B 0e3c36f397e824254308d810b6ee6b3952f051b262b0caa881d8a169d8279d150ee9f573bfe03fc2374ae5adb42c764c479787f906f08674ac2fdaa16c3f8cc4 SHA512 73fffc9d9cf64309f3cac562a33b583dd1ac15bd568091d4d4f8fcc2433596a12d92c83880a02fd07d26141d092682ea8b57d9d59905dba408178a54d4d9a57f
 DIST kernel-i686-fedora.config.6.8.7-gentoo 246668 BLAKE2B 4726a7dba114cc320832d137306f072d5d69cc52aba7ffbc157858e43c6405c71fdec9812eba4f6fc98f169e156785beb54c8cedf70e56bbd8f353dd13692f29 SHA512 9009adff76b1f42c5188608ed29e227d44d55c55c11a0f31c4d60e0e60773e5a3bb527a827463ae1c7f4d37656e0e857d673cb8325b55c6a5c5e08c830024d90
 DIST kernel-i686-fedora.config.6.9.1-gentoo 248714 BLAKE2B 60b8cc73282abf31bf3267a1dff25a43ae1a7bcb35af7a49650cdcc9572fdd35b5d9d4831492e5368e4245831cefc87ca1e5c66ebdc6b2bd23c1737b54bff28b SHA512 514b2852f7ae07ee171fe7bba9af01d243ac585127d7f90972ea860324fe25c08a5f27477a5f0e8bad15066e3e3ef7e930c415141c8281c8715491a0507f1cd2
+DIST kernel-i686-fedora.config.6.9.3-gentoo 248714 BLAKE2B 60b8cc73282abf31bf3267a1dff25a43ae1a7bcb35af7a49650cdcc9572fdd35b5d9d4831492e5368e4245831cefc87ca1e5c66ebdc6b2bd23c1737b54bff28b SHA512 514b2852f7ae07ee171fe7bba9af01d243ac585127d7f90972ea860324fe25c08a5f27477a5f0e8bad15066e3e3ef7e930c415141c8281c8715491a0507f1cd2
 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
@@ -54,6 +58,7 @@ DIST kernel-ppc64le-fedora.config.6.6.12-gentoo 232147 BLAKE2B d67c2ab2d089ecdde
 DIST kernel-ppc64le-fedora.config.6.8.12-gentoo 234243 BLAKE2B 9ec10391d522bc3962c76ede4eb31a4435228a4902b99c39500fe080124e46a275ce1177ee9bbf972f55acd982c967513369a19fcf98b9b2a86b420290f7eb5e SHA512 bd40d51e2a27021879c36cf3a36a9fadcd8249f0e30717068126f31f1593aa85e79a87a27b48708adc59c883d26d7a35146d46aef7b98b909c4ec8ea75376f41
 DIST kernel-ppc64le-fedora.config.6.8.7-gentoo 234240 BLAKE2B e9ab5506caf4ed1df3a746e58f6698963a27df7b343fff2b3678f21f630014bcba1f23bef9968bad253025093b0cf2006ea7fb067e7394a23c7f9c1eaa110663 SHA512 44dc12c0e9c62df264b86ffff5c4d42c67ceec2e0a336a4dcaf6f2de5914e230a0919a55c2152cd2f6ad7b57479dd695ff77df6755e84c49580304a93a2027be
 DIST kernel-ppc64le-fedora.config.6.9.1-gentoo 235130 BLAKE2B c6469868de904d9d4740f5d5042c076c0bdfc4540e0fb43d6b7acb855b6be25352d2d445b71081603d1e5cb93f75a757cdced6b9a1680476a35e5b0a961f503c SHA512 c2fe8f693e869d7e0bb458cc6d5e2578c5b3a60c2a88c264088e830a636fa0d6429fcc2639b9a1e8dd5cc9b5330cb3495389818fb465f64178fe247486d5abe7
+DIST kernel-ppc64le-fedora.config.6.9.3-gentoo 235130 BLAKE2B c6469868de904d9d4740f5d5042c076c0bdfc4540e0fb43d6b7acb855b6be25352d2d445b71081603d1e5cb93f75a757cdced6b9a1680476a35e5b0a961f503c SHA512 c2fe8f693e869d7e0bb458cc6d5e2578c5b3a60c2a88c264088e830a636fa0d6429fcc2639b9a1e8dd5cc9b5330cb3495389818fb465f64178fe247486d5abe7
 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
@@ -61,6 +66,7 @@ DIST kernel-x86_64-fedora.config.6.6.12-gentoo 243607 BLAKE2B 7e670d37c6471e50aa
 DIST kernel-x86_64-fedora.config.6.8.12-gentoo 247787 BLAKE2B 2563fc5a02ad499f2f96c0219015b4cbdfaed79500370c4274172b9842efcc8679b9c25d717850a181daed21333a8643e8870213c91dfb2e1bd24de185b5007f SHA512 55a4415dde417b13cf22c8c9ea529bcda1d82a713f831be6e350bb82d0a7cc50d7a6ed64902143c5cdd351e3f0dc4d0cade268f64a25b826c7b5be5e4b74dd4e
 DIST kernel-x86_64-fedora.config.6.8.7-gentoo 247759 BLAKE2B 1005d5b08b75419ecfcca207b407ec3a80e644d8b8feb03ce70880de79ea4ff17f56175b7c3c4ffa8279ca42edd154161ff10e89fbefc43d71f4c0eb614a094a SHA512 fd2d6ef4d2b426509c6ad42cf29fe1663a95a9ef4277e9cf300c825e58689e2eabd37932c55ebabc11cfc2694423b75cd215f206ee925ae8945ead61266c02cd
 DIST kernel-x86_64-fedora.config.6.9.1-gentoo 249762 BLAKE2B 077e4e37ac8c4287342106ed9ec4319f8db41b9293e72e9b8f7cec56a346b4ae42640ee02526108a3384631f140922c1eb5000a50bd8f3ade43bca4903036737 SHA512 9051567f6d68443d8b2525d203d827f3856e95bd721ec3bdfcc8865696152b65fcee114ca2629906e66abdca7dcc7549f79d8bc6574c7816fa08f9bf25779c8e
+DIST kernel-x86_64-fedora.config.6.9.3-gentoo 249762 BLAKE2B 077e4e37ac8c4287342106ed9ec4319f8db41b9293e72e9b8f7cec56a346b4ae42640ee02526108a3384631f140922c1eb5000a50bd8f3ade43bca4903036737 SHA512 9051567f6d68443d8b2525d203d827f3856e95bd721ec3bdfcc8865696152b65fcee114ca2629906e66abdca7dcc7549f79d8bc6574c7816fa08f9bf25779c8e
 DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1 SHA512 95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e
 DIST linux-5.15.tar.xz 121913744 BLAKE2B 3921274b23f7938abdf3ed9334534b4581e13d7484303d3a5280eddb038999aaa8b836666a487472d9c4a219af0f06b9fecccaf348fb5510ab8762f4ef4b7e83 SHA512 d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e43b6f021709dc685eb0efa18d2aec327e4f88a79f405705a
 DIST linux-6.1.tar.xz 134728520 BLAKE2B ae60257860b2bd1bd708d183f0443afc60ebbd2b3d535c45e44c2e541bd0928530a3b62de6385dd4e4726ebbedcc0a871d4f3ffb4105b9f1f6d8ed7467f5688e SHA512 6ed2a73c2699d0810e54753715635736fc370288ad5ce95c594f2379959b0e418665cd71bc512a0273fe226fe90074d8b10d14c209080a6466498417a4fdda68
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.9.3.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.9.3.ebuild
new file mode 100644
index 000000000000..694d7c73a94e
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.9.3.ebuild
@@ -0,0 +1,153 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KERNEL_IUSE_GENERIC_UKI=1
+KERNEL_IUSE_MODULES_SIGN=1
+
+inherit kernel-build toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 1 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo
+CONFIG_VER=6.9.3-gentoo
+GENTOO_CONFIG_VER=g13
+
+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}
+
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~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
+			;;
+		loong)
+			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[@]}"
+}