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

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

commit:     6a89deb6aa6f7520964667c8c07a1555068bb256
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 27 14:19:33 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Jul 27 18:12:36 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a89deb6

sys-kernel/vanilla-kernel: Bump to 6.10.2

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

 sys-kernel/vanilla-kernel/Manifest                 |   6 +
 .../vanilla-kernel/vanilla-kernel-6.10.2.ebuild    | 143 +++++++++++++++++++++
 2 files changed, 149 insertions(+)

diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index e50f303b7fc4..5ff13cf2aa5c 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -3,24 +3,28 @@ DIST gentoo-kernel-config-g13.tar.gz 5759 BLAKE2B 831f89078e539c8b4ce244528dfd84
 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.10.1-gentoo 281641 BLAKE2B f4157148dda5fe453b055fea66756e380fbaaf0378b9d1f74044af4ccb5b3da9bc7448e8ec553d30632be1bfe83e961f5751458cc4018d1e8df531251d32e3d8 SHA512 0f5a492318891b295a226f70d5579095ce34d9b547410a1873131c455356ab576b5093b8d1d32a166a01e033802b083e72a7c0f1236495d36ab0d6cd367eebbf
 DIST kernel-aarch64-fedora.config.6.6.12-gentoo 271041 BLAKE2B 5af7c2f57cd6cd9230d9ab1a539a4b12b02cfdd777f5921b2d69329b171060a8085909a60eed9916aea504e8d9c9d1e907a61f0c6681ac75d5c64864052f821e SHA512 f744444f2840020dce2dc8473e3e562fa53ac1c34a641a9f322c2c7efd8fc4d9b3677479d3a31e705fa60beff0b1beca79ab78ad7dd4b6633d4499bebbfc76bd
 DIST kernel-aarch64-fedora.config.6.9.10-gentoo 279218 BLAKE2B 7ca670dd19cd52a4e452656a4f2a22894202edad74321158d79c4be0e8a0cdde1c15416acff4311488a3d3d7c4c8a59ab573f59d228741497b91fdd11b0d7b2a SHA512 750b503b6dca848e0aade39412eb5ceb4e853e4b92d8722122911818daa5b1a471bb5da7ccd3e8bda81ee0787f3ea0666c76a1f5118b7a5c0f37a364b9576db8
 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
+DIST kernel-i686-fedora.config.6.10.1-gentoo 250040 BLAKE2B 0cbc4d4a0ae82cb44be5aaad35f1d8beaa30eb829d31edf1a7296acff65ae2773dfa8b7da3cc0c02a08db1f355c7fd4fa080daf97b5d66c9b69c6c1f2e421ede SHA512 eee7747b6160e9caf6429e67d3471c4dd7f0f72a0613c0e19944c86b4e0a8025b737de41b6b072cc88f40331a2b2a780ae60c426957db36ff2015850a6d7bc39
 DIST kernel-i686-fedora.config.6.6.12-gentoo 242515 BLAKE2B dbb4df93a5c8ee34d687262cced152a07f412a89ef2e8122429477633424fdac80809ed57a5a6de72de05313ec91f266d37c3494426099621d047c0561ccb57e SHA512 a65fe3299b6d8f89373937d2a782aa1469ebf18954b00bbf2798cee952b9946d7fead795388c079cb508f6d431e49b2812fb6d845c8a0e3861a4a3bd11e81968
 DIST kernel-i686-fedora.config.6.9.10-gentoo 248703 BLAKE2B 31c8cd220013df3411164f4f0ed2751305502b19999237fd126311d6d9819e7f5a8e8a31460677a5ac16c0173a8e1faaa431d93aeca134a50239bb7d2d6c3b45 SHA512 ff25792295efe1e3592f0b04ef1cfa4265ad5999a5b98cf4fa9299e1a7bf320eaaac811bf7663ed5ebe0f0b8fd2635281a3aa0d478556e4c7d672d5102884d79
 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
+DIST kernel-ppc64le-fedora.config.6.10.1-gentoo 237077 BLAKE2B a1d816e8015e1c2548c9323e5c595b18ebee2e5d79a9269a3aadc3daee658a2c54fcce97f7182901610fd51dc667c24699345be9e1b28d736d4acf3c41b6b2a5 SHA512 945a529c5dfe3ef92ccb3699d00e28aa1620c4de52fcd611a5c09971bed16a40594c888fa360270fc74b6cf2ea7a973cfa230d35fec4972dcb224d58ec695106
 DIST kernel-ppc64le-fedora.config.6.6.12-gentoo 232147 BLAKE2B d67c2ab2d089ecdde3879129d2b1f85a592adae811ed053d00d4ff120e6bb44546bb41d74817be558adb1d669d06f3dd50e6ea542c8a9c2f13672f77f4e4eed5 SHA512 b130b4c57959c0f7be983334b08354640d5e2946bfdd956d6c5b895f816f6177d5fa4bb1c4382cca5c4dd4723aac42e9e89a002b71d86f4eb30f755008f8f9af
 DIST kernel-ppc64le-fedora.config.6.9.10-gentoo 235119 BLAKE2B cb102f3108655ae426f057cc739642fb36688e85e7992b5669e2adf94f4ff47498b4a784afd9b82f69bc2318378ad2af589a9ba99f75935389480fe341526b5c SHA512 0fbb4bfea7c651905a36625d07cc3ee1de233f576578dbcf5dc8ef8ac23f2848d75a22a0239c7d94fa3ab141540e0af1e3583945886c72da5aa1a6b720e4ab40
 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
+DIST kernel-x86_64-fedora.config.6.10.1-gentoo 251109 BLAKE2B 511862bd42123b8e8072be0d3a2693187713eebc73d8938770b862ffa25e7a6f69225971aa6bbcc1adc0e8d43863514e9f2ed1dc1035f044d9b402e122a6144b SHA512 af5e3c7eb64535f875883e61bbcb018dd1aa25f661d7e4fc985da3165be074037045f97cc2d6b1882edc9d07aa83c78358867c6742babdf19d9515108c74c44c
 DIST kernel-x86_64-fedora.config.6.6.12-gentoo 243607 BLAKE2B 7e670d37c6471e50aa0ba395570cd0173af0210afe63faa48d7a147327110652e3aab5c339cf10ed22a6a20e81e505aee84311beb21fda3eb577e06ea55ecac8 SHA512 c484403a60670dd006ecbe65240cb00d97e8b3fe22d1169c5b6ccb92bcdbddb3ecd474d2b57880b30baf6a38bcef11fc8d56b8b0b02fcddd859833c3640cdc9c
 DIST kernel-x86_64-fedora.config.6.9.10-gentoo 249751 BLAKE2B 6b2762592f74c7ed7684517f52070588dcaf2c14004d5293286edc8511d548d1a08401991cfc3f39ab60442d17182ae91182d84e68cfd5c0ed50dd3906e35382 SHA512 9fe030ef44abecd84e55a836745e0039b9f0fcd62c68a9702698e41b61c059d8358a223120f066d183363f7866a61bebc4cf631f389b5f06c3e43146154676e1
 DIST kernel-x86_64-fedora.config.6.9.3-gentoo 249762 BLAKE2B 077e4e37ac8c4287342106ed9ec4319f8db41b9293e72e9b8f7cec56a346b4ae42640ee02526108a3384631f140922c1eb5000a50bd8f3ade43bca4903036737 SHA512 9051567f6d68443d8b2525d203d827f3856e95bd721ec3bdfcc8865696152b65fcee114ca2629906e66abdca7dcc7549f79d8bc6574c7816fa08f9bf25779c8e
@@ -48,6 +52,8 @@ DIST linux-6.1.98.tar.sign 989 BLAKE2B be83fd5d7c323b69450992ca460af2a7f937297ad
 DIST linux-6.1.98.tar.xz 135161992 BLAKE2B 18f868d7578be707da10e86b4c74793656d53f133819c6c03355689f9480c47c6c46008f7d7ea55020cfe0e7808fc6a0240fc55ab4642573d619d174adfb57d9 SHA512 3d0670c347595993f615945cda4cedc589782d2c1c4b3be01dcb62c81428e7895c775cfcd10d0f64e9e4fa0e60638752edc07c0bfc78ae243f6e483ef2320436
 DIST linux-6.1.99.tar.sign 989 BLAKE2B 139dfd90187bb0ba643fc2cba9fc39f2a1d5a1e08675914a0aa10916823902f131c8c176cb8fa041e9c7327820ba765cae133a1d73b54f56dd45123d08c5990a SHA512 8bbe38c1db28485f4679ca9529746ea8afbb5cb7bf018920cbba208397d8b0c8d60ac8c2db69fb99b7777e2f3882ee11f33e0d2a905d7b6def88ca24797971a6
 DIST linux-6.1.99.tar.xz 135172120 BLAKE2B 155544c5956c3fe8850b0ef1cc044341e1567636fd66e8041a97565ef215dad10a96726387bc492fb7ebe6dd896afa63a40402c872c623e2135730746db9350e SHA512 664e661c81206b0abcbadaf7c2b47bf83dea2d888f4c39f22c9d522a9be229dcf8a12d1caf3a8e9aea0d249bb4b31b4b468ea6c6c84bce6384f5e0fb53193548
+DIST linux-6.10.2.tar.sign 989 BLAKE2B a49737993f3a525dc2963bf11bc96b7396ea753a0dc60d8d9cd53150706d027c6eafea5cb3edc615963fce0cadc56d0431668b20d1ac12192264e34225b0084e SHA512 9fe19c7dfd8ee31e7561cf21c03422c05f73223706631a5ee1cdcb02dc417d11ef0374b9ea22fd263cb3f6e01fa2a63782fb6f54d722a624a5e3320545196576
+DIST linux-6.10.2.tar.xz 145157612 BLAKE2B ab1d2e79a1bb8a9b78ab5b1af93db7ef356cb5e14bba1121bbd3ae06b9589c8bfc32bab373acdd0ecf965ac132130e7eb34e70b35a9df1bd85b49dab97e2c02a SHA512 1c121e3c9c8402ec46581b38c736630d25297dc3e981cb69d47b95e2cd3204cd93c6c15c02b81fc53d62c49ded462ab6a0bb4d94b506ec0f9c366e47a1c92606
 DIST linux-6.6.35.tar.sign 989 BLAKE2B d5a5dfeb1e92c11107b71d6b2965d2a595e51fd3244abce72f9fdd0cd4405b562602695015e3cb8944f9ac0d999566c0007569b5141cb5f42d32458c20166f0a SHA512 dc98406c4b15a0e15623694e88b881cdbf082ae48f8e737d96bbeb1cec1c8ca6c9c5448b359447c6bfe34e8f1f6807efaa114dbe23097079e5046996134aad8c
 DIST linux-6.6.35.tar.xz 140269708 BLAKE2B 93fff6421875329ab7d7ad2f0a0d3d1377c1eb42df295638c967eced3551b08986445b5e47b9d3bd1b24f93d3feeed43b1aba77f6912dc13449d956be3616571 SHA512 a94a75eec75f43fcab56a425927eeb299ec8eb72a056b26e9c629ec66fc5b65badf0403612549dfd4bc01b620451924ec30b980403a47cf723e98ab57775b6d2
 DIST linux-6.6.37.tar.sign 989 BLAKE2B bf4db9046bb721ea6020c967e67592fcd0c6fbc3b2675275d567181e901495115e2199d83a811a9f825b70b00cc977dba25a3e26556f2325903ca8a106731eb3 SHA512 df30b7a643b58093ef0fa8ba6da0c0c8254fcca72443da03702293b20e668ada73a2fbf37eed4b64fd1d5d243f106055b0dc6728bed577df31ffbe71eb1caf9f

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.10.2.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.10.2.ebuild
new file mode 100644
index 000000000000..fe28dad4c959
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.10.2.ebuild
@@ -0,0 +1,143 @@
+# Copyright 2020-2024 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 verify-sig
+
+MY_P=linux-${PV}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo
+CONFIG_VER=6.10.1-gentoo
+GENTOO_CONFIG_VER=g13
+
+DESCRIPTION="Linux kernel built from vanilla upstream sources"
+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://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	verify-sig? (
+		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
+	)
+	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 ~loong ~ppc ~ppc64 ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )"
+
+BDEPEND="
+	debug? ( dev-util/pahole )
+	verify-sig? ( sec-keys/openpgp-keys-kernel )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/kernel.org.asc
+
+src_unpack() {
+	if use verify-sig; then
+		einfo "Unpacking linux-${PV}.tar.xz ..."
+		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
+			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
+		assert "Unpack failed"
+		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	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
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-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[@]}"
+}