sys-kernel/vanilla-kernel: Bump to 6.1.3

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

2 files changed, 141 insertions, 0 deletions

diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index d5b434c1733c..4af8ad583041 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -1,28 +1,33 @@
 DIST gentoo-kernel-config-g1.tar.gz 4283 BLAKE2B 44dd51ec45ebc71bffcd6d85a2fefba053f7bce8035057f0bbe928e24816ad4ba03c9bf67dcfcd6d6d1833c0a2ea93e0fd486c2093664dc41ccce316e1e60588 SHA512 3a45f28df9d457df0fe0d185da8b10f4e35f49dad75075e041e8cf3cf6972fecc8145cd557b0bf3a8dea20ddffae0194f88e61c1e5098fa0a5ca301d40aeea2e
 DIST gentoo-kernel-config-g3.tar.gz 4411 BLAKE2B 00edc4b5dc943834bc7ee977382b2960160888db00a25c5a7f73968784aa39a2b3b69f0bbda89b3ce8eb55e746006cff2839481493ac8bfca6a21de2299564f7 SHA512 44beae869bebf5445655dafe1facc47c3dbe602b34c5bf2fa984a581bfe3250fa0df908b8807c333c2e66ab9d1a2bb8026e22140f2a1f522d0dd647c96ca4d5e
+DIST gentoo-kernel-config-g4.tar.gz 4459 BLAKE2B 8a481315e427c2da5d14847bfa00e7904aec8cbe6dddde504bc4ce016a19b8c9f67d09dd1bc2f6feea22368b91555a74a045ae1d0f9aa1395616f008e74dbdc5 SHA512 c4b1d3a67cf614f0f9c0af4adaa23d97c0e91b467a1e69f88a0994760c187bfb403fffc0a5fdeb09f9fc4af849013f7f993cd55a8a4a82ba32309475f09deef5
 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.5.19.13-gentoo 246842 BLAKE2B 4a824d02999749a0404437cae28721576511e06a5eaa9ebb1b1479c74e2b54402c440be7ea9159bf304661d4baaa5381c36b266ac0bba0b9bf3820eb04c6e4e0 SHA512 8862cf24b177ef3871f118712ceace2b496b04a488b045bbe3d83ab22942f064995486f5534630321faaa96ce60e5f237c4ded24a5468bea6e365aa3ea9f09c4
 DIST kernel-aarch64-fedora.config.6.0.8-gentoo 249703 BLAKE2B d62624ff7072694a5ad98084925fbc892ac381fec0fce0aa01309df06ce9f115b0aaecf578a3e2ce6e6c3b25de9fe14d0c5b4ec2182fdf21dff30ed393ebbd8a SHA512 dc7d2aaa191f0ee2a61b563716c60dd1d62c741f16b6599dbc97a86e076cd5af7c93c264cf94ee4ab5570c7dc268ff50076372a8ffceeed4d0731b6b88757f9c
 DIST kernel-aarch64-fedora.config.6.1.0-gentoo 253136 BLAKE2B d9b56f81336b532559590e64960623eb124a42aeb701c037da0b4c412bcc847c51715f8cf9dfe8b5879dec3c4a44ff592cc4383fcba9bba36ee04205d6417e75 SHA512 48789b44755c3f43239e7e0b30a4be45cff398e20dabacbfa253987fa602d9c9b2e86d1d51795757d583ab704adace455099e22c7b8297a7ed19b119c7425b3c
+DIST kernel-aarch64-fedora.config.6.1.2-gentoo 253196 BLAKE2B 92483220cb6820926478ed830d14c156d2c51e16eaf1bf05699958e23374dd61f38b2aa9c8385eb8aed0a00a4cd3b1d9373aa2d5f851f1cc13cf3c68932c9907 SHA512 09ce9f3f2b11361e4a641cfe95ff89098d2c8fa97957e1b74a1a7ae6db72cbe400593a498c10ff175be98fd506292cf25c8f315719b4d6cb7f72047746126d12
 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.19.13-gentoo 223571 BLAKE2B d56f8e019b0c58023b08ee358a9af46679ca0f734c075ba6cd65dd6e3277640c0b7683e5707c48f687644d815a3840eb58351c0dee84fe9ec1dcea525fb2e1e8 SHA512 0d9fa0592b6a9414f2967677c048a9e014a0e0d43274eea4fe10f8099befae7389bbcd033f4fb36c7c44bd30c2fb197e860151e27c10dc354fe9a86a8bb65e94
 DIST kernel-i686-fedora.config.6.0.8-gentoo 225904 BLAKE2B 4ff7e1866d3a76b34e462a20d539ea0a9a588b3588c222c1b17737414c7e883f68095959d68e374819a1e14079e410fa049cf6d264bd4995299299275de95b5b SHA512 6c518d1dd2130dfcb8001d97df66dd10cdc55e6e4d7a751d9a01978d2c47735a63a9c4e04e42965484ecff42255aa82f7d6725f018b0436140511ca6b4b7bc6a
 DIST kernel-i686-fedora.config.6.1.0-gentoo 228266 BLAKE2B 63759e0111877d4ced283970909904a581d75fa71d5e0e0d5afc0ff426c67a6c334b23986c22eece9e8a000bbb277877a9e8791f2c76801ce6f3a285b470a2e8 SHA512 3bda0cf66427130bf4c66323e0ef575561d5b7fe2d4097a4fcc42d41e38cf2aa9a50f884ea7cf06f2270b1dd08a44a8367e9aed068dab087ccd7aa76d91cdd4b
+DIST kernel-i686-fedora.config.6.1.2-gentoo 228267 BLAKE2B 51c15ad3d0371212c94e3e79832df10f845e242ec3ed7d1e8cee1d00b467d1892454b9c10f83c53e271a40952fa69678b3ede74133d330df2f28bbcbf1afaa62 SHA512 09309d861c15e9b2ba10ccac60679bc0fbf1b9625f78de640b0d7914472b3cfcd8b34f996c399de3e31d86c5bdb1dd394005986a317d24b04dc2e82188735f74
 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.19.13-gentoo 213984 BLAKE2B 9abc1d2e03bb34908019dbbc4e54d3d176acddca6e7af72fe73461e60eb249486c4e8a81bfe2515849aa26939d9abef5e981deeaa55605b34bb59552cd3444fe SHA512 d857ce4178950a96ff029c3c9870211424e1c5e95dfef88d25d6d1d517493a6fd95d9d398f42b8a6cf72482b07789be38f674dd4a2b9855da57c8391b0c2708d
 DIST kernel-ppc64le-fedora.config.6.0.8-gentoo 215817 BLAKE2B 75cb973385e1580b5d3b03762db6ad830e1cf2d6748a5f2591a0296d98c6e3fb9f3730c333e3dc85c8b06ebac41716a3e762e3b612017dbf7db75c7e4bc90872 SHA512 a568e97367927fb5e390ff7d30eba9b27ef27c89f8a20c02919589b8098205d94970685e386ca559b9d92898dd75a3a34b4113426dd2fa95bb025de284573a5a
 DIST kernel-ppc64le-fedora.config.6.1.0-gentoo 218534 BLAKE2B 93e252ec2360cd61666be36a4154619a54536a55bbc45ee5b938deedbb859e2a28edf73876bf65bba5234b72f5dcbd4471cb7b70674021f78156762d3c1ab719 SHA512 efaf13a73dbf9426a4f696ade2e009a77b80873b59549c098fbd913bec9ea91c2e636564e0a99dda520d044d61c2aef65ad7bf6faf18643584263ba07584e85c
+DIST kernel-ppc64le-fedora.config.6.1.2-gentoo 218535 BLAKE2B 2655ce32ab464eaa18b9fa10355b39cbbafa425c99ce78381d443783f06dee6c836b16d9f870cfce09deac5c4022aff76e1921a34fb377036731fb0b577c7792 SHA512 7c0c2a83236f98fa63778b581d6498fb9321312730c68640f6c00a17294142f01c09ece7df8b623d73c0bf04b32b62339dba832ef7fd43f8e2a4b6b0432d5bf8
 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.19.13-gentoo 224246 BLAKE2B 6dd95fc7a8bd38387a3bfd6c00733220b34091961c8437cdac61e4376de8b35529808f3b8e2db91c1a0c90e1115395df153f94107e6f9884a61bf646cb40d25e SHA512 1393e6315581a4934a35f3e66146d014ad154025fbc71245bd4b6e7639952387449b69df41605df8590a4d363a5aab5111b442b1a9f56b4d2996ca416f7e5c23
 DIST kernel-x86_64-fedora.config.6.0.8-gentoo 226579 BLAKE2B 61661976712081684f28daf26559b489f1e9e0bae749c2ab19f8de7154c86408791fc5333ff589b277fe060bf44edf02b525f0233e44fdcb3c90e519b51f6fc9 SHA512 5dc327afaa87e51330881f5f8b1b83d7cad360626744023fe98146390c8a745da00f60c6f7363e594eee87bc4dc27970af88e9e31a415267b0d2752bea8ca08d
 DIST kernel-x86_64-fedora.config.6.1.0-gentoo 228930 BLAKE2B 947829257514fd7e5bd819cc008b096bd5d8fb23c5cc32fe7f27074b2d7b19cb4bdbd11ce00f6f300f53ae66ab792f443d702309a23771eca23b85d94706a114 SHA512 ab85c5111270537cd6351589720439e3aba6d9ec6c6fa2f81d353101362a2b9468727c555df9902d93aa67d91a42604d05e127f040bdc17325d67f7b83f6ee25
+DIST kernel-x86_64-fedora.config.6.1.2-gentoo 228931 BLAKE2B 9cecffddfc2799acbd2a1f4119fe41f0b591be4d8ac40c673e8d53c42e9d03f8b43656b679bc723011b77237369314ecadfc4f25d28ac81249dc0582d33ccc3e SHA512 501942a4c1362ae9ebdf55737792c65fd6f94daf6744ca7535a2c4fd5212f883f43911743486b90637eb49abaeeeec6d9ffe6ad07606e66c59296dab58f516f9
 DIST kernel-x86_64.config.5.4.21 184907 BLAKE2B 0eb2b07c14cea7545350fcdf3a94f2a531f0137c502ebda9299cacf44da5385686e2049b480b28bc153c9d413d453cfe682b9655eefe70428cb720f57c7bd200 SHA512 f3b3ee6841555ac3a9cc11536a7d44e1a5a8df2bab14ba341fda7df1ceb0de45cf1c799a1d54a64f2858fd1272d348bb52cf269ffa396878c5402baf2730237f
 DIST linux-5.10.161.tar.sign 993 BLAKE2B 9237c5037a39e92c2eca9b2c16de865ca5ad1155fe937e781027aeab18d353c4fbdafaa912c27e73c6f64a4e788b8f1cf5b0317572dbd87dfee27074bb715679 SHA512 9fd26a9b250f38d395d9206a7d87f4b710a72774284a48b99f9fada48e241a513bebc8552247f951d498d453fd32fc06a93987e95548f39c861a0671d1fc9e0c
 DIST linux-5.10.161.tar.xz 120516432 BLAKE2B b35e08b3ed843fe0d0ea2a08728f192ab795b61438a60c148097c8bc00c1bdc9b6bca925bf4e3cd124ac3c5d50920f2bf1a481c24a97b8787c012e3df993d8bb SHA512 aad3c70cc6eef39623ba038e74fc5435764ab81cf8782d44ab07c50f50c66f303d1cd49b439aee46193caaa43f4c322924691ea5e3ac2b01142420efe11700d5
@@ -40,3 +45,5 @@ DIST linux-6.1.1.tar.sign 987 BLAKE2B a240a6428c456557362103620cb9d0d9eb0eb57d7e
 DIST linux-6.1.1.tar.xz 134730676 BLAKE2B 8d25e501419dfe800b9cbbe219c39883be67a80e015c1c6034e83a9b142aa16bfc4db14a788a5331f6c44c03ca013f0c73e028b207e2e424dff1d3924d9a58fc SHA512 c303f53ace62cf5b860934130fa5c34d2a43e7719959bcc3f2b7f0e753ecca550da4d0dc52409b6b6dc1c9c515cbab75427a15e51b58e9f8b1ce12982d82d629
 DIST linux-6.1.2.tar.sign 987 BLAKE2B 496c6817ca39458b0ef0853b84bcd89b5caa76b63739730056376713266d49298328342d1716980a244f00c57c74de03a6d36d6a80542590bb642ee2bb92e1e4 SHA512 c338bf4e330dab849c568a747209b8665e8cbb27ad7870eb26c41e66b828b2f8edeb03a3f02ac35523b1e2896f0156d5ba0f1f1900351dccaa1b4d5db6590317
 DIST linux-6.1.2.tar.xz 134757304 BLAKE2B 0bca96ecd7ef972ee436f790c84e7d35c4a592dfbf1bd27fd9d66c8d3aacab311bb4ee06c42f22079b20c7fbe8ae9df12844f699a673d7e534f76b5f5b6ce788 SHA512 a906c15b1eb4f3015b1d9a0e6a321b5a399e77ccd0127cb8caabbe7cb337e77a85a432bac4763ab5448d86dd319441eef865aad41939ca1f796663c2b52170e6
+DIST linux-6.1.3.tar.sign 987 BLAKE2B 0b3ce2aaf73f676ed680633bfd0cdc6da8eea231b1bed22359512a43eb4e6a08b5d94b3502c15b33aa98ebfee03a1360a1755706b5fab09a6796491e2ffd68c0 SHA512 112db39f21c260f632f45ae13f1e74a96897dbab522e5c8177c2aea9886ba13e5e74a48aba5d76c1fd12b802baf843204a1ed597c5cb627a424af3fef1b4f2b4
+DIST linux-6.1.3.tar.xz 134747072 BLAKE2B 0ec03d153778032d8ada33c1e3c44579d889978a0b20118c103ac96676fd4b9d96ee9828d7c9f2c25fe4eb1e469922bd389c01293b43dc5080bd9f360a9bd60c SHA512 05294aa24b805253ab9a5faca626e267982677e83f12657c233b8d00d91bf8a77c967a84dd83048e929f81b9e3b416c2906e01a27dde30e2406a079605c0d8c9
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.3.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.3.ebuild
new file mode 100644
index 000000000000..98ca0a57d5be
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.3.ebuild
@@ -0,0 +1,134 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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.1.2-gentoo
+GENTOO_CONFIG_VER=g4
+
+DESCRIPTION="Linux kernel built from vanilla upstream sources"
+HOMEPAGE="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 ~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=${BROOT}/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
+			;;
+		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
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}