13 files changed, 859 insertions, 407 deletions
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index 7acf6ed678a1..c51a503ee0a6 100644
--- a/sys-kernel/Manifest.gz
+++ b/sys-kernel/Manifest.gz
diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index 45fbae756dde..89161d41b000 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -16,10 +16,14 @@ DIST genpatches-6.1-66.base.tar.xz 3766288 BLAKE2B 3cf0a62fbfcd492e5c16b4158bcf7
 DIST genpatches-6.1-66.extras.tar.xz 3816 BLAKE2B 8b2f2aa2f65d427c4ec39cdb988200d31d360f2ffde6f633838b0c3437c4efe8438e01ccd8e2de57d7f164c32d509e35a8be1ac4818841a7719a3cdce9e47717 SHA512 7f40e6153812cfe74de8ce376d4ae02868b6f246027cbce67e0714a139e60b4aa32743876c180f3b7b07e9b6fd07d2138e21ff5e6ced9571d29bf3e647b615c4
 DIST genpatches-6.1-67.base.tar.xz 3816044 BLAKE2B 9116263f1f3cbb472ad09ad785eb643cc4deb16f94936196c1dbb3d500b6e20447d07d434f4fbc59fe8cfc03076da0aa0ec22a3c6d93e09d0dfed6d6fdfe7add SHA512 609935fec85285a34e4fa6032f552230aeb7aed1caa867d34810a25f68c2295e0a8f886e0a093f111b1623ba364cfd6e17b237d670d42c8c539778810a02f681
 DIST genpatches-6.1-67.extras.tar.xz 3816 BLAKE2B 6aa8e9614221c2b9d84df9f75e5b8eb530ae8752b406ad698be86a8031b47940f9efb1de9bedfa0e466d0bad32dae60c5c639815785353a49e4b439de79a80ef SHA512 a911476dcfa9767f4adb946bcdcbe475e78f83753a7880a7e3a96aed347f1ec520ba8d75fe4e5565b2aded25965cecd3c7f79fa12009af043f7408200e27189a
+DIST genpatches-6.1-68.base.tar.xz 3834732 BLAKE2B 3fc3dd48708491bf32a17cbb8c23e531e2b95e60ebcbe3faa6fbe2c60e610aad9226d1846774ddd2af56e985371780e10a249a50e2ac46d7e482428f67b289d9 SHA512 28b810ad914e12035ef724f7dc4b3cc6226cccad4997804a9e3ba5a4f4a420f5f397eade002dd7a9231efc2b0c1850c40c44bf5daa358c24e42bb50da05141d8
+DIST genpatches-6.1-68.extras.tar.xz 3816 BLAKE2B 86fce6b028ed4c3b713cddfea42f56adf55e105c9defbb8f6a84bfe397f0163ee9759218c2b43bbe9f9f6838623816fd3c31887e5b05ac8e98235f01f750a4dd SHA512 23550c824e7f3a1507d1e124224f0c1f4b7bd3deb07750d392011d374352ee430acb84e55143f3bbaafb67f9ea28a6aabdee77ffe3a78d68691f30fefd4304cb
 DIST genpatches-6.5-10.base.tar.xz 631564 BLAKE2B 7a9fe483c7a6a040af5a1fc0fd99dd7d575a380240268bb61d68caf95613d53fac46edf6cb18633b6dd2e803c9360d3cc13f0160e6ccaf811ac8420f7dd30771 SHA512 506abb2a66c51e45ad3ebab0c3b921faaa890640c7236eed377aeb27dff9da552088ea8d8192b4f2e142c510c7d565a5c8431444fb39bd82948ec0e696c4b083
 DIST genpatches-6.5-10.extras.tar.xz 3704 BLAKE2B 4bfee3cf5f3af32c02f4df2b91437258a4bed38c4cd1fc8f8467020ffe1835ec86dee58a10d2e1775fdd6392c6a28552ea3a90ff5fd36504ed43cb7787ea7e5e SHA512 48589be11fcc969fd3f46475f8aa53047f191c5fec66918e84d178e14f531c209300808f7c2ddb479fb8409a344f205f59b72dd18b6d79d1ca924eab10f81f85
 DIST genpatches-6.5-11.base.tar.xz 690272 BLAKE2B b647ad0ef234e1470b72e4cefc091b48bc81b0591fa41d3741d25360d6c92d6b47cafe35a06c5246806072d11ec4839f76bca382f8cf38d0e76ddde9f4fa3bb0 SHA512 53da072920619acf21afa89f3df7b24c27c1798a1244aef3f21f76bcdcb38ad1ad79d07e3aba62b44773af57162c89bb77eb4c19b7056e0806926ec5951d149f
 DIST genpatches-6.5-11.extras.tar.xz 3704 BLAKE2B 21929f8a381175f9c33ac9df5f17388eb2f99adb00fac7783c612a2712db1d4b2f179b2fa6ac548b77a1d0e4c9c9d88e32cb393531c7e6ca680f9c98a037927a SHA512 f3643139bd6b2b324c477998b69418b80e40ae675dbef9bb34e26f138a10244ffcaf551de7c49623b8aa797ed7b9ba82e680a62b7996ed1bd1f8002b29b09cb4
+DIST genpatches-6.5-12.base.tar.xz 720508 BLAKE2B 429f4fbc3292ab46250bc1716212f369f888ee0219ab19baaf8a7e3634c012bcaa64820639b5650b5346cc93fffb3b00c8ba5ad48c3f0030e5db6102646ca60f SHA512 1b5de16a305f7cddc3125be3786347a037e25b8b53ad05c35c8efd57e624dbd7cf152898c3084847d6c9b77f5bc6df378644434e877434d40ad4fb0d08d6a37d
+DIST genpatches-6.5-12.extras.tar.xz 3704 BLAKE2B 3d18f544a455d1184eb9687a5c53c7dd348b12f736313a3bb9d3417e0f4458a8e7f962451ede58f45016af700014fea87cc3336b30ede9f899dd75369eaadc57 SHA512 0a8c8a23d99962e5f0028ef1ee8ba79cd20af0ccf6b08e554405ee964cf542b6758d0e2456612a410d7fdfca5572e4af7c4d1c3b65a9b426412c1b480b2d6475
 DIST genpatches-6.5-9.base.tar.xz 574412 BLAKE2B 339dc1d19a323c2143fdd394b324e8d73b6e21b833e48096b6ae312b188bd9f39811fcd7b93f900c6ceb6982eb6ca108b2ec617b8dc98fe2ec255ec3b002e31a SHA512 42873d29784c0d85434d7eee81ef2000a42164e20ef74c875b81ed8df96ec3632261485c38e17ffa41d94df200b69d8d0e663eb8c90ea741234e860aad9026e3
 DIST genpatches-6.5-9.extras.tar.xz 3704 BLAKE2B f45e43b281c9ad49870e72a7d4e3790f316076f438a5b45fbc53bf3fc29173675fae1e1b8ec170aa7609e0a87e79afbe033ffe7ee64d1ebdf2c1200fcdcbebca SHA512 888a87e165c64ee71b04b6f103666b4f699f790aadb58314253f63e82b0c245646f29fc3f139da2eb6a08db7c8f40c5239a359e81e3d7ff2b0d60b219f8756a8
 DIST gentoo-kernel-5.10.198-1.amd64.gpkg.tar 63139840 BLAKE2B ef7840035ca70fa40147551529e6fea01ec8a0a21b20d92eee53d38f65543c29dea9a1425680becb4944eed2cebc8404baa2d4463e0cd543358e015c10b17ccd SHA512 f5ce69bb2ed049a155b02e0ee6605fb6c62b91f9edb62e1a673a3b12a4d33f6e5ea7ef5e068b6fc909b1480dacfb5c32658be99ac591d6cd4c75a23ea20ee872
@@ -58,6 +62,14 @@ DIST gentoo-kernel-6.1.60-1.amd64.gpkg.tar 72581120 BLAKE2B 3053a4c8707436c3f479
 DIST gentoo-kernel-6.1.60-1.arm64.gpkg.tar 65576960 BLAKE2B 77a2d1fe197186620cf9cf6d66eb11e7a1ad72a4ce26783f686f42ddbe18005d38ac98be3ff9369535a9c0c346536325b23cd037e35d24f25a1f58cb26fa828e SHA512 9942ca4c56a3d813f9e38b91b2b1cde6f53e506e7deadcd5f772da008ac658ba5ea0ecce546ce45eadf7008b9dabd8bc09f9c1d046c83ca2632b29a87fe99311
 DIST gentoo-kernel-6.1.60-1.ppc64le.gpkg.tar 59842560 BLAKE2B 6da8e5e5e35f3ceb8bf47ddf6053396d920f484b944dccf344ea102b3ff322a6180b5e1c0948dd47bdc57a0e5b5ed10628a47c59434dac736f44dc5fae07e9bb SHA512 2967b93cf94b77a40d5cf190fd0db855ff15e15d18ac63ea3831cc10b865238c62208ceb68def7681e604b5beef20ac860738eb6e8a2c2421a565156cc97ec82
 DIST gentoo-kernel-6.1.60-1.x86.gpkg.tar 62095360 BLAKE2B b6fccd8e5495df2cfbdcb56e1a37db2c35b0d7a1773c756a25fa0a04aeda3135d8d76b1bbcaaa4c082035573e7d2da1b219827c0728bd8ba6f31fec78f8a9b73 SHA512 43aa8c618754704f0719cf713b63161a604a8b64730ee2ecae759ea9d6ba2cd2cfd7da552c7d0b7a6210607e86bbc332a1ef62a1aba8046597ab0172bfebae6a
+DIST gentoo-kernel-6.1.61-1.amd64.gpkg.tar 72550400 BLAKE2B 76991287a439c0badfcd82f3f726128b6d0d2cf2fbb487e22d7f390c505ed90782360826b9e98b99f29e0a9c820b500b58931c8f0d6fc288a23511c572061113 SHA512 a9d92ef405fd646563e24f73fb679e0f7bb348240edeabf766f40f7e4836271395ab3de46547c1904a25c7ed1af0131b00b588841f6f17063afb2401bb7238d0
+DIST gentoo-kernel-6.1.61-1.arm64.gpkg.tar 65576960 BLAKE2B f1f10277e976c3643be5fa8e834ea7a9defee191984a0fdb2d5fc9b592c40e7e597a98b19c0948f26c30ff129bcfbfea85a09ea26c384c85454022cf6482c202 SHA512 031b405d4342ed4ef7d00fb94cd38d0afb3f7a0ace156b52b4c87241f6e1802b0befbb4790026c5e981d9e661fc257b3eb7eca7ed3db8e746a513394d80b6656
+DIST gentoo-kernel-6.1.61-1.ppc64le.gpkg.tar 59852800 BLAKE2B ec8d57bfd304e65b57e78332fc89ff1d4333f35c27beb52d1acbcbfafe3066b791302f7ca1f92d2c51f4ee6387e0d5a414eedd266fb0d6517d6c116046bf7593 SHA512 ac93acded9264150d228ed84f4594096f1ea23e9fd83fce744f7f92bea225887945f1a1349053a1ced83e240b95d80ca5a81e376586e343a033cb4ff6eac80e9
+DIST gentoo-kernel-6.1.61-1.x86.gpkg.tar 62115840 BLAKE2B 8db48c54d9b9dbd15b6b7104a687083e954346456d74544af4653d297274cfa14fcfbac5279b07a0cef9296e31a23870b8e15fe1b89d308ebbe77394200aa230 SHA512 7d84d461ad9215cd54789a8258c291cb99361c4d991e7ff57e42b802f1966f918c1ed94e070f4078eb577b831d03c103e29251003a64fe9891d34b266a82954c
+DIST gentoo-kernel-6.5.10-1.amd64.gpkg.tar 83722240 BLAKE2B cc31076b25edf689f7976a679fc5fdfb25d7f21c18562f32c47bb2d852b922dc50a4ab5d813725fdb64e2d06ab55ea22643cde733fac0d9379ed58b187a3d93b SHA512 7d689b10af6b471048e172be41d090e35774ba9b7cab5fd79cda489cd6224b47b16497cb73f840cdd4de8577096b734abddcc89f990f32d17473968a326db0fc
+DIST gentoo-kernel-6.5.10-1.arm64.gpkg.tar 73635840 BLAKE2B d7b0dd04cfed53281d679e6687d581d0d12c9096da1d36ecdbc38f83287a18b55bfa335fb8dabb623bb356df76321a61db147aa2a499a40072adffa210bc0a25 SHA512 ec9b958d660768dabdd26c633ed39b37f6264231849f7bd86d65a60938f496f69b0cb2cb1afe9d3a95987b8ca5c495507f5ca9d6e6df9f95ac87ccf46e0bd914
+DIST gentoo-kernel-6.5.10-1.ppc64le.gpkg.tar 64532480 BLAKE2B 5c6e81f5ee141dd958671aca5aaa10314198b3fc38d025f36263c1d1086e09b723b3c96688c2175ffc94f8e3a93316a47b2b8d185499e6fea31a9aeb36fce24c SHA512 ababeaa3f298d5503c6db664c67fbc73e32e0efca4cf14c00399808e86c0a3346b6304eb36264541d5a9ccc7e84091f63348d296442c09abce8f74951e360d55
+DIST gentoo-kernel-6.5.10-1.x86.gpkg.tar 67563520 BLAKE2B 9ffa4f434169c7672a202b6e4890cae9c68c212a8f3d584309ee1a29cdd66f27e36d5c73e66800473d3c9c42fd9df25346d22d9a933b2852e266ce6be9298525 SHA512 ebc3fae801e529c6262bc7d1eee12af3191038dcf6a1934367b253820e5e63956ded88aa5b6acf4bc0b2d72b8368eed7206485b64dbbce6449582ca25e4ec0c3
 DIST gentoo-kernel-6.5.7-1.amd64.gpkg.tar 83537920 BLAKE2B 90f9ab1b3214bfbfbad8450488c52e60d2534f9ff4eafcaf5d3c219b2d48b39590c3b5456ee10db41038cf0cab6d6468b4e8c53f714098d1611511ff5ee1cf69 SHA512 0ca65fb868f87843fab41942d7783a385151adf2ef203b17a9ae7753f85392812588cde1481b86febffe371ba71d0e6482cfdda12b0d4dc607025375a1db0e4a
 DIST gentoo-kernel-6.5.7-1.arm64.gpkg.tar 73390080 BLAKE2B cc4e26bc1a73405e4039c943cb0ba73bf215694cf5936e0f20bc9356c9dc3adf042901c9db771cfb586ccc6f524fa444539fc49019c77b4ac2ee0cd29dd97ebb SHA512 4a55ef7726e114f180627d3c0b1d7077812f7920a7bfc726e28e44d810f2a9af1bff74a8c0ff73d396247ea865c0045c49fbf054961e620127f12d483a9630ce
 DIST gentoo-kernel-6.5.7-1.ppc64le.gpkg.tar 64430080 BLAKE2B a79c67c1bef8d40eba08a9afde1919276eece3748ba35940609c2380c09926751bcfcfb6c415f869183e39e82758f9ec55feb401a40f5040c707ff1c879c6497 SHA512 9934976e2d009e72c63efeee9deba67fcef7a2e624d9660cdaa812a0479144931efe0663aa5e07124e0105277f8930a6bb9ae3f2fc90fddddb9069da71c51055
@@ -83,6 +95,8 @@ EBUILD gentoo-kernel-bin-6.1.57.ebuild 3025 BLAKE2B c020a8ed2bcad22f892c23eb542f
 EBUILD gentoo-kernel-bin-6.1.58.ebuild 3029 BLAKE2B 677551e644b14acdc03a67e7d72b73bcf4da98f6790f27f4ccbc1fb1e8a6dec38ba14dd99c5353dc33ad922e5fa82a6fcac6b8a619c1b3a91484f2bfa4fabdce SHA512 e8b83bbbad0b4babc82c9726bcaf7ffc998f28ef7be82389086c22124123fe27c46e6b4a6e11f1d46402312d6389137ad33c889e424ab90e273d8556f828950f
 EBUILD gentoo-kernel-bin-6.1.59.ebuild 3029 BLAKE2B 677551e644b14acdc03a67e7d72b73bcf4da98f6790f27f4ccbc1fb1e8a6dec38ba14dd99c5353dc33ad922e5fa82a6fcac6b8a619c1b3a91484f2bfa4fabdce SHA512 e8b83bbbad0b4babc82c9726bcaf7ffc998f28ef7be82389086c22124123fe27c46e6b4a6e11f1d46402312d6389137ad33c889e424ab90e273d8556f828950f
 EBUILD gentoo-kernel-bin-6.1.60.ebuild 3029 BLAKE2B 677551e644b14acdc03a67e7d72b73bcf4da98f6790f27f4ccbc1fb1e8a6dec38ba14dd99c5353dc33ad922e5fa82a6fcac6b8a619c1b3a91484f2bfa4fabdce SHA512 e8b83bbbad0b4babc82c9726bcaf7ffc998f28ef7be82389086c22124123fe27c46e6b4a6e11f1d46402312d6389137ad33c889e424ab90e273d8556f828950f
+EBUILD gentoo-kernel-bin-6.1.61.ebuild 3029 BLAKE2B 677551e644b14acdc03a67e7d72b73bcf4da98f6790f27f4ccbc1fb1e8a6dec38ba14dd99c5353dc33ad922e5fa82a6fcac6b8a619c1b3a91484f2bfa4fabdce SHA512 e8b83bbbad0b4babc82c9726bcaf7ffc998f28ef7be82389086c22124123fe27c46e6b4a6e11f1d46402312d6389137ad33c889e424ab90e273d8556f828950f
+EBUILD gentoo-kernel-bin-6.5.10.ebuild 3160 BLAKE2B 56befa90a572da973654c27f61d9303eebf75154eb8f381c87acf65b05ce70264690c36ff6d2896ead4d7aa6a26c5bbd9ff5a65ce32521cdee4910fd640cc276 SHA512 9c61b0fd4305f5ec716a3f1998875bb6268d3402466776e35e3413c2d69e255c9851cf15f0dd2f5d75d2f94208480f601f3b4cbaf09815cf63624432d5fef531
 EBUILD gentoo-kernel-bin-6.5.7.ebuild 3160 BLAKE2B 56befa90a572da973654c27f61d9303eebf75154eb8f381c87acf65b05ce70264690c36ff6d2896ead4d7aa6a26c5bbd9ff5a65ce32521cdee4910fd640cc276 SHA512 9c61b0fd4305f5ec716a3f1998875bb6268d3402466776e35e3413c2d69e255c9851cf15f0dd2f5d75d2f94208480f601f3b4cbaf09815cf63624432d5fef531
 EBUILD gentoo-kernel-bin-6.5.8.ebuild 3160 BLAKE2B 56befa90a572da973654c27f61d9303eebf75154eb8f381c87acf65b05ce70264690c36ff6d2896ead4d7aa6a26c5bbd9ff5a65ce32521cdee4910fd640cc276 SHA512 9c61b0fd4305f5ec716a3f1998875bb6268d3402466776e35e3413c2d69e255c9851cf15f0dd2f5d75d2f94208480f601f3b4cbaf09815cf63624432d5fef531
 EBUILD gentoo-kernel-bin-6.5.9.ebuild 3160 BLAKE2B 56befa90a572da973654c27f61d9303eebf75154eb8f381c87acf65b05ce70264690c36ff6d2896ead4d7aa6a26c5bbd9ff5a65ce32521cdee4910fd640cc276 SHA512 9c61b0fd4305f5ec716a3f1998875bb6268d3402466776e35e3413c2d69e255c9851cf15f0dd2f5d75d2f94208480f601f3b4cbaf09815cf63624432d5fef531
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.61.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.61.ebuild
new file mode 100644
index 000000000000..d2845437114c
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.61.ebuild
@@ -0,0 +1,127 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-install toolchain-funcs unpacker
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 7 ))
+BINPKG=${PF/-bin}-1
+
+DESCRIPTION="Pre-built Linux kernel 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
+	amd64? (
+		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.amd64.gpkg.tar
+	)
+	arm64? (
+		https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.arm64.gpkg.tar
+	)
+	ppc64? (
+		https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.ppc64le.gpkg.tar
+	)
+	x86? (
+		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.x86.gpkg.tar
+	)
+"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+BDEPEND="
+	sys-devel/bc
+	sys-devel/flex
+	virtual/libelf
+	app-alternatives/yacc
+"
+
+QA_PREBUILT='*'
+
+KV_LOCALVERSION='-gentoo-dist'
+KPV=${PV}${KV_LOCALVERSION}
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	cd "${MY_P}" || die
+	default
+}
+
+src_configure() {
+	# force ld.bfd if we can find it easily
+	local LD="$(tc-getLD)"
+	if type -P "${LD}.bfd" &>/dev/null; then
+		LD+=.bfd
+	fi
+
+	tc-export_build_env
+	local makeargs=(
+		V=1
+
+		HOSTCC="$(tc-getBUILD_CC)"
+		HOSTCXX="$(tc-getBUILD_CXX)"
+		HOSTCFLAGS="${BUILD_CFLAGS}"
+		HOSTLDFLAGS="${BUILD_LDFLAGS}"
+
+		CROSS_COMPILE=${CHOST}-
+		AS="$(tc-getAS)"
+		CC="$(tc-getCC)"
+		LD="${LD}"
+		AR="$(tc-getAR)"
+		NM="$(tc-getNM)"
+		STRIP=":"
+		OBJCOPY="$(tc-getOBJCOPY)"
+		OBJDUMP="$(tc-getOBJDUMP)"
+
+		# we need to pass it to override colliding Gentoo envvar
+		ARCH="$(tc-arch-kernel)"
+
+		O="${WORKDIR}"/modprep
+	)
+
+	mkdir modprep || die
+	cp "${BINPKG}/image/usr/src/linux-${KPV}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	kernel-install_test "${KPV}" \
+		"${WORKDIR}/${BINPKG}/image/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
+		"${BINPKG}/image/lib/modules/${KPV}"
+}
+
+src_install() {
+	mv "${BINPKG}"/image/{lib,usr} "${ED}"/ || die
+
+	# FIXME: requires proper mount-boot
+	if [[ -d ${BINPKG}/image/boot/dtbs ]]; then
+		mv "${BINPKG}"/image/boot "${ED}"/ || die
+	fi
+
+	# strip out-of-source build stuffs from modprep
+	# and then copy built files
+	find modprep -type f '(' \
+			-name Makefile -o \
+			-name '*.[ao]' -o \
+			'(' -name '.*' -a -not -name '.config' ')' \
+		')' -delete || die
+	rm modprep/source || die
+	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
+}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.5.10.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.5.10.ebuild
new file mode 100644
index 000000000000..c378c0fde329
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.5.10.ebuild
@@ -0,0 +1,132 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KERNEL_EFI_ZBOOT=1
+KERNEL_IUSE_SECUREBOOT=1
+inherit kernel-install toolchain-funcs unpacker
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 2 ))
+BINPKG=${PF/-bin}-1
+
+DESCRIPTION="Pre-built Linux kernel 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
+	amd64? (
+		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.amd64.gpkg.tar
+	)
+	arm64? (
+		https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.arm64.gpkg.tar
+	)
+	ppc64? (
+		https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.ppc64le.gpkg.tar
+	)
+	x86? (
+		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.x86.gpkg.tar
+	)
+"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+BDEPEND="
+	sys-devel/bc
+	sys-devel/flex
+	virtual/libelf
+	app-alternatives/yacc
+"
+
+QA_PREBUILT='*'
+
+KV_LOCALVERSION='-gentoo-dist'
+KPV=${PV}${KV_LOCALVERSION}
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	cd "${MY_P}" || die
+	default
+}
+
+src_configure() {
+	# force ld.bfd if we can find it easily
+	local LD="$(tc-getLD)"
+	if type -P "${LD}.bfd" &>/dev/null; then
+		LD+=.bfd
+	fi
+
+	tc-export_build_env
+	local makeargs=(
+		V=1
+
+		HOSTCC="$(tc-getBUILD_CC)"
+		HOSTCXX="$(tc-getBUILD_CXX)"
+		HOSTCFLAGS="${BUILD_CFLAGS}"
+		HOSTLDFLAGS="${BUILD_LDFLAGS}"
+
+		CROSS_COMPILE=${CHOST}-
+		AS="$(tc-getAS)"
+		CC="$(tc-getCC)"
+		LD="${LD}"
+		AR="$(tc-getAR)"
+		NM="$(tc-getNM)"
+		STRIP="$(tc-getSTRIP)"
+		OBJCOPY="$(tc-getOBJCOPY)"
+		OBJDUMP="$(tc-getOBJDUMP)"
+
+		# we need to pass it to override colliding Gentoo envvar
+		ARCH="$(tc-arch-kernel)"
+
+		O="${WORKDIR}"/modprep
+	)
+
+	mkdir modprep || die
+	cp "${BINPKG}/image/usr/src/linux-${KPV}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	kernel-install_test "${KPV}" \
+		"${WORKDIR}/${BINPKG}/image/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
+		"${BINPKG}/image/lib/modules/${KPV}"
+}
+
+src_install() {
+	mv "${BINPKG}"/image/{lib,usr} "${ED}"/ || die
+
+	# FIXME: requires proper mount-boot
+	if [[ -d ${BINPKG}/image/boot/dtbs ]]; then
+		mv "${BINPKG}"/image/boot "${ED}"/ || die
+	fi
+
+	# strip out-of-source build stuffs from modprep
+	# and then copy built files
+	find modprep -type f '(' \
+			-name Makefile -o \
+			-name '*.[ao]' -o \
+			'(' -name '.*' -a -not -name '.config' ')' \
+		')' -delete || die
+	rm modprep/source || die
+	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
+
+	# Modules were already stripped before signing
+	dostrip -x /lib/modules
+}
diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
index f3ec7052d5e8..827183d5abef 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -16,10 +16,14 @@ DIST genpatches-6.1-66.base.tar.xz 3766288 BLAKE2B 3cf0a62fbfcd492e5c16b4158bcf7
 DIST genpatches-6.1-66.extras.tar.xz 3816 BLAKE2B 8b2f2aa2f65d427c4ec39cdb988200d31d360f2ffde6f633838b0c3437c4efe8438e01ccd8e2de57d7f164c32d509e35a8be1ac4818841a7719a3cdce9e47717 SHA512 7f40e6153812cfe74de8ce376d4ae02868b6f246027cbce67e0714a139e60b4aa32743876c180f3b7b07e9b6fd07d2138e21ff5e6ced9571d29bf3e647b615c4
 DIST genpatches-6.1-67.base.tar.xz 3816044 BLAKE2B 9116263f1f3cbb472ad09ad785eb643cc4deb16f94936196c1dbb3d500b6e20447d07d434f4fbc59fe8cfc03076da0aa0ec22a3c6d93e09d0dfed6d6fdfe7add SHA512 609935fec85285a34e4fa6032f552230aeb7aed1caa867d34810a25f68c2295e0a8f886e0a093f111b1623ba364cfd6e17b237d670d42c8c539778810a02f681
 DIST genpatches-6.1-67.extras.tar.xz 3816 BLAKE2B 6aa8e9614221c2b9d84df9f75e5b8eb530ae8752b406ad698be86a8031b47940f9efb1de9bedfa0e466d0bad32dae60c5c639815785353a49e4b439de79a80ef SHA512 a911476dcfa9767f4adb946bcdcbe475e78f83753a7880a7e3a96aed347f1ec520ba8d75fe4e5565b2aded25965cecd3c7f79fa12009af043f7408200e27189a
+DIST genpatches-6.1-68.base.tar.xz 3834732 BLAKE2B 3fc3dd48708491bf32a17cbb8c23e531e2b95e60ebcbe3faa6fbe2c60e610aad9226d1846774ddd2af56e985371780e10a249a50e2ac46d7e482428f67b289d9 SHA512 28b810ad914e12035ef724f7dc4b3cc6226cccad4997804a9e3ba5a4f4a420f5f397eade002dd7a9231efc2b0c1850c40c44bf5daa358c24e42bb50da05141d8
+DIST genpatches-6.1-68.extras.tar.xz 3816 BLAKE2B 86fce6b028ed4c3b713cddfea42f56adf55e105c9defbb8f6a84bfe397f0163ee9759218c2b43bbe9f9f6838623816fd3c31887e5b05ac8e98235f01f750a4dd SHA512 23550c824e7f3a1507d1e124224f0c1f4b7bd3deb07750d392011d374352ee430acb84e55143f3bbaafb67f9ea28a6aabdee77ffe3a78d68691f30fefd4304cb
 DIST genpatches-6.5-10.base.tar.xz 631564 BLAKE2B 7a9fe483c7a6a040af5a1fc0fd99dd7d575a380240268bb61d68caf95613d53fac46edf6cb18633b6dd2e803c9360d3cc13f0160e6ccaf811ac8420f7dd30771 SHA512 506abb2a66c51e45ad3ebab0c3b921faaa890640c7236eed377aeb27dff9da552088ea8d8192b4f2e142c510c7d565a5c8431444fb39bd82948ec0e696c4b083
 DIST genpatches-6.5-10.extras.tar.xz 3704 BLAKE2B 4bfee3cf5f3af32c02f4df2b91437258a4bed38c4cd1fc8f8467020ffe1835ec86dee58a10d2e1775fdd6392c6a28552ea3a90ff5fd36504ed43cb7787ea7e5e SHA512 48589be11fcc969fd3f46475f8aa53047f191c5fec66918e84d178e14f531c209300808f7c2ddb479fb8409a344f205f59b72dd18b6d79d1ca924eab10f81f85
 DIST genpatches-6.5-11.base.tar.xz 690272 BLAKE2B b647ad0ef234e1470b72e4cefc091b48bc81b0591fa41d3741d25360d6c92d6b47cafe35a06c5246806072d11ec4839f76bca382f8cf38d0e76ddde9f4fa3bb0 SHA512 53da072920619acf21afa89f3df7b24c27c1798a1244aef3f21f76bcdcb38ad1ad79d07e3aba62b44773af57162c89bb77eb4c19b7056e0806926ec5951d149f
 DIST genpatches-6.5-11.extras.tar.xz 3704 BLAKE2B 21929f8a381175f9c33ac9df5f17388eb2f99adb00fac7783c612a2712db1d4b2f179b2fa6ac548b77a1d0e4c9c9d88e32cb393531c7e6ca680f9c98a037927a SHA512 f3643139bd6b2b324c477998b69418b80e40ae675dbef9bb34e26f138a10244ffcaf551de7c49623b8aa797ed7b9ba82e680a62b7996ed1bd1f8002b29b09cb4
+DIST genpatches-6.5-12.base.tar.xz 720508 BLAKE2B 429f4fbc3292ab46250bc1716212f369f888ee0219ab19baaf8a7e3634c012bcaa64820639b5650b5346cc93fffb3b00c8ba5ad48c3f0030e5db6102646ca60f SHA512 1b5de16a305f7cddc3125be3786347a037e25b8b53ad05c35c8efd57e624dbd7cf152898c3084847d6c9b77f5bc6df378644434e877434d40ad4fb0d08d6a37d
+DIST genpatches-6.5-12.extras.tar.xz 3704 BLAKE2B 3d18f544a455d1184eb9687a5c53c7dd348b12f736313a3bb9d3417e0f4458a8e7f962451ede58f45016af700014fea87cc3336b30ede9f899dd75369eaadc57 SHA512 0a8c8a23d99962e5f0028ef1ee8ba79cd20af0ccf6b08e554405ee964cf542b6758d0e2456612a410d7fdfca5572e4af7c4d1c3b65a9b426412c1b480b2d6475
 DIST genpatches-6.5-9.base.tar.xz 574412 BLAKE2B 339dc1d19a323c2143fdd394b324e8d73b6e21b833e48096b6ae312b188bd9f39811fcd7b93f900c6ceb6982eb6ca108b2ec617b8dc98fe2ec255ec3b002e31a SHA512 42873d29784c0d85434d7eee81ef2000a42164e20ef74c875b81ed8df96ec3632261485c38e17ffa41d94df200b69d8d0e663eb8c90ea741234e860aad9026e3
 DIST genpatches-6.5-9.extras.tar.xz 3704 BLAKE2B f45e43b281c9ad49870e72a7d4e3790f316076f438a5b45fbc53bf3fc29173675fae1e1b8ec170aa7609e0a87e79afbe033ffe7ee64d1ebdf2c1200fcdcbebca SHA512 888a87e165c64ee71b04b6f103666b4f699f790aadb58314253f63e82b0c245646f29fc3f139da2eb6a08db7c8f40c5239a359e81e3d7ff2b0d60b219f8756a8
 DIST gentoo-kernel-config-g10.tar.gz 5035 BLAKE2B e965f157b6dadb9c6e355ebe5f9c56625ac69f34a70d6238cd56faf76f7a6583242ea61283c45f2d2cc807ce258c2d405130109ac6e28155849a73871691ea9a SHA512 ad7419f1f183a0380896b3784ff4ab260ff850f2c055156c53f20d2bf3ea4350affaf37aef505e680928ae0f8882f12faeda02bdbd9fc26aed4aaae388290e95
@@ -57,6 +61,8 @@ EBUILD gentoo-kernel-6.1.57.ebuild 3974 BLAKE2B a29116981acdb1745ee0e74b13e2d944
 EBUILD gentoo-kernel-6.1.58.ebuild 3978 BLAKE2B 759fc1c0427d79419c1394f1b34af6188afdb46ca8bcdaf79003225ff0c599f0ce52e70be5cba8e22392cfce1c6a936e6b73f14463cd5ee5bb2cb57440f0b735 SHA512 48d89539cf03aee4d2f19aa35adaa370dde8f3504fa3ff07bf9a5fd45193334354f83d5240bdef3d51ee2d91b1b24e84acbfd725f922edcab4a72fbe72d311c6
 EBUILD gentoo-kernel-6.1.59.ebuild 3978 BLAKE2B 759fc1c0427d79419c1394f1b34af6188afdb46ca8bcdaf79003225ff0c599f0ce52e70be5cba8e22392cfce1c6a936e6b73f14463cd5ee5bb2cb57440f0b735 SHA512 48d89539cf03aee4d2f19aa35adaa370dde8f3504fa3ff07bf9a5fd45193334354f83d5240bdef3d51ee2d91b1b24e84acbfd725f922edcab4a72fbe72d311c6
 EBUILD gentoo-kernel-6.1.60.ebuild 3979 BLAKE2B c04f720c772323946514832e6f0ef407785e84e0e5901b698813271c629c5f2916f63ac52c55cbb2b73e5ee8db0c3e8ca61a67a54386ad43b0ec3dde4183a282 SHA512 849b5af98a41d8167b8ad500ea541359f87a491ee5657ff219ee74bc88e93dda0bd299c0e92646f441eab3a94b3b0aed2826cde585d9fd8451141d9c39411641
+EBUILD gentoo-kernel-6.1.61.ebuild 3979 BLAKE2B c04f720c772323946514832e6f0ef407785e84e0e5901b698813271c629c5f2916f63ac52c55cbb2b73e5ee8db0c3e8ca61a67a54386ad43b0ec3dde4183a282 SHA512 849b5af98a41d8167b8ad500ea541359f87a491ee5657ff219ee74bc88e93dda0bd299c0e92646f441eab3a94b3b0aed2826cde585d9fd8451141d9c39411641
+EBUILD gentoo-kernel-6.5.10.ebuild 4083 BLAKE2B 45a8f8678bf06bc39b349d1a1cc4b29a825e4fe7ae0649c723272aa0da2d9b77a3fcd14eb5d53ade9a0131da0ad6aa321f3a0c4a0c25bb21e9ed88994bf1a004 SHA512 2d85339dea6d07f377d7b18b6b7a38fe8059ed7c712e0cfb334616a97360238d31e560bbea8cc901eb6ea0fee1ffedf007c563f0b45fffd7a46eaaaf0b5d54cd
 EBUILD gentoo-kernel-6.5.7.ebuild 4082 BLAKE2B a3e0ab5e744b1a2e141fe23a78ea0dc958b162931a86fd67b1c19d61ea7826ac82300ec3aab9b6845f394fe0ce4d9fd21c957aae5f4dab5eef0e1357af27636f SHA512 8b8f71c5100900b142ce1c0d577e0bbcf24557639a5db15e4696cc724e0fa4652dcdc7f8553616a9d494229a33be8f6d95a07091a572a93fd7b0d3f253851dbc
 EBUILD gentoo-kernel-6.5.8.ebuild 4082 BLAKE2B a3e0ab5e744b1a2e141fe23a78ea0dc958b162931a86fd67b1c19d61ea7826ac82300ec3aab9b6845f394fe0ce4d9fd21c957aae5f4dab5eef0e1357af27636f SHA512 8b8f71c5100900b142ce1c0d577e0bbcf24557639a5db15e4696cc724e0fa4652dcdc7f8553616a9d494229a33be8f6d95a07091a572a93fd7b0d3f253851dbc
 EBUILD gentoo-kernel-6.5.9.ebuild 4083 BLAKE2B 45a8f8678bf06bc39b349d1a1cc4b29a825e4fe7ae0649c723272aa0da2d9b77a3fcd14eb5d53ade9a0131da0ad6aa321f3a0c4a0c25bb21e9ed88994bf1a004 SHA512 2d85339dea6d07f377d7b18b6b7a38fe8059ed7c712e0cfb334616a97360238d31e560bbea8cc901eb6ea0fee1ffedf007c563f0b45fffd7a46eaaaf0b5d54cd
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.61.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.61.ebuild
new file mode 100644
index 000000000000..5eb6a81e331d
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.61.ebuild
@@ -0,0 +1,146 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-build toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 7 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo
+CONFIG_VER=6.1.7-gentoo
+GENTOO_CONFIG_VER=g10
+
+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
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.5.10.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.5.10.ebuild
new file mode 100644
index 000000000000..8ee35da11de4
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.5.10.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.8-gentoo
+GENTOO_CONFIG_VER=g10
+
+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[@]}"
+}
diff --git a/sys-kernel/linux-firmware/Manifest b/sys-kernel/linux-firmware/Manifest
index 52037dd90279..3c5ddf85816f 100644
--- a/sys-kernel/linux-firmware/Manifest
+++ b/sys-kernel/linux-firmware/Manifest
@@ -1,10 +1,8 @@
-DIST linux-firmware-20230625_p20230724.tar.gz 441906566 BLAKE2B 5bed31d9ad78440bb12feeacb1ba27a07ad30b0eb8c7bfd03a4e7a7590012af1f9535a49fbf031abf79dd05ca90be79566f06db6f955910edfdca61281831c67 SHA512 daaf07422eb6f3e1b50f8a5dba5bfff747fe6750c0210ab798745f61d774eef7642ab45b9b404c668cf017d6b7fcf89c34bce9e6c77053b1b81f1a3498c5be18
 DIST linux-firmware-20230804.tar.xz 295170972 BLAKE2B 48eca78ab97ef5ac335dd2bfd043cf3e67c52c68cb8b3eb152725e04838a7662dafa9745add6fc786bf87d275809b51a07496fbdaf4607a89e2787388fe1d1cd SHA512 b7fdffd49530223394a0896608a746395cbe9d1a3ca7e4e744bc8381e937845e085f08e2b56854a233426164072f4c365b281db2f0dbb47192a97a94ada8fae6
 DIST linux-firmware-20230919.tar.xz 314110436 BLAKE2B 053142b7b534905e53b59149c20ff88ce52373dc56dd6d283ea8dc93a96891efe74a64b3a5e5b69f6e0fba90c20a03fe1a5d8450e73650201fbc26eeb52fa5e8 SHA512 e91dc432affd55f3b1337cd46eaf6c83054c3a700996e2324399ee160ec91fd0cdfcee3be35c4456c35f0b54d1d22d326d2f62d53b17d8bfa5495b7dcd73a332
 DIST linux-firmware-20231030.tar.xz 317290700 BLAKE2B 3f2f7cd177adabba683d98f048d0fb24f6872168e0a7a43b4521fd43970428af881e54093cc247cf394f714a845db2c0d85387d93305dd1b2c08b359c1f0abb8 SHA512 0a747df0ac6fe1577578021d394b94a5db517b368b17d14a3a580bb361f5112b293ee2f9c56f51b0471118fcc3983c037afea702028370b95715bc9d06672191
-EBUILD linux-firmware-20230625_p20230724.ebuild 11236 BLAKE2B b8c589d73300df9b6ecb415abffdb2feea665bbefab66de5b0ead1ec38773ed8f1770747ff99b98dccf35faf603102f8a7a557245cb8b1549e38b4f55b72a5bb SHA512 ea77fb1cbb89246c9ddef62ff3aac3fdcdd61d8a3af6b6acd18805b67111395ab7f7415c16b2547a19d4d928100d1c73cfbc4c818d95cc0db018876c6b1f53fd
 EBUILD linux-firmware-20230804.ebuild 11196 BLAKE2B 2ba77bdaba0758932889c2fbc04df410f10a7535f482490779545445e1af06448a467b40ca6c32f36bba870bd482685facfb0d4d2bfcebfba6b043a1167c053e SHA512 8c51e94c77cb3500fbf02adf5472e40702e09bf93ba5f1cc78b02f984bbcedba393a12c55ba11c2acdbc5b270c0ce5f7c07ca8dd6fb4a058f782ebed504cf88a
 EBUILD linux-firmware-20230919.ebuild 11196 BLAKE2B 2ba77bdaba0758932889c2fbc04df410f10a7535f482490779545445e1af06448a467b40ca6c32f36bba870bd482685facfb0d4d2bfcebfba6b043a1167c053e SHA512 8c51e94c77cb3500fbf02adf5472e40702e09bf93ba5f1cc78b02f984bbcedba393a12c55ba11c2acdbc5b270c0ce5f7c07ca8dd6fb4a058f782ebed504cf88a
-EBUILD linux-firmware-20231030.ebuild 11204 BLAKE2B 066c6a8347a4e9ab45c06a584172ee91f88c3459032602021f62c8a1cff5262ec5c7e03e649d339cb6fbcb2bd7af3cff9a4dbbf010b53c7449d0371413e04cf5 SHA512 83db43336064c576d5d5be7929a23ed906f8ee593f89e69280d0375895e6a7fb9ca274ed5fac63e4af15b6ae468ec394b20d7f2345b65825f027754b78130884
+EBUILD linux-firmware-20231030.ebuild 11196 BLAKE2B 2ba77bdaba0758932889c2fbc04df410f10a7535f482490779545445e1af06448a467b40ca6c32f36bba870bd482685facfb0d4d2bfcebfba6b043a1167c053e SHA512 8c51e94c77cb3500fbf02adf5472e40702e09bf93ba5f1cc78b02f984bbcedba393a12c55ba11c2acdbc5b270c0ce5f7c07ca8dd6fb4a058f782ebed504cf88a
 EBUILD linux-firmware-99999999.ebuild 11204 BLAKE2B 066c6a8347a4e9ab45c06a584172ee91f88c3459032602021f62c8a1cff5262ec5c7e03e649d339cb6fbcb2bd7af3cff9a4dbbf010b53c7449d0371413e04cf5 SHA512 83db43336064c576d5d5be7929a23ed906f8ee593f89e69280d0375895e6a7fb9ca274ed5fac63e4af15b6ae468ec394b20d7f2345b65825f027754b78130884
 MISC metadata.xml 1192 BLAKE2B 52efc1e40ffdac04c33fd2c50a1b7a03f775e16c6aaac19f1a7c9c54f853f7f3dd37fd52e4cf7fcc05bf17d45e4d7956deff7b552b1b568005feca60d967fa23 SHA512 e1214670c10573aee4e272b45bb9c21c85b15d520e77f57fa1decf8c7bb1dd765bdf6b878b6c52a8455f9569735b806caf053dc7934ce74c7088b991ebb705a2
diff --git a/sys-kernel/linux-firmware/linux-firmware-20230625_p20230724.ebuild b/sys-kernel/linux-firmware/linux-firmware-20230625_p20230724.ebuild
deleted file mode 100644
index 706b523565ca..000000000000
--- a/sys-kernel/linux-firmware/linux-firmware-20230625_p20230724.ebuild
+++ /dev/null
@@ -1,403 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit linux-info mount-boot savedconfig multiprocessing
-
-# In case this is a real snapshot, fill in commit below.
-# For normal, tagged releases, leave blank
-MY_COMMIT="59fbffa9ec8e4b0b31d2d13e715cf6580ad0e99c"
-
-if [[ ${PV} == 99999999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/${PN}.git"
-else
-	if [[ -n "${MY_COMMIT}" ]]; then
-		SRC_URI="https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/snapshot/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
-		S="${WORKDIR}/${MY_COMMIT}"
-	else
-		SRC_URI="https://mirrors.edge.kernel.org/pub/linux/kernel/firmware/${P}.tar.xz"
-	fi
-
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-fi
-
-DESCRIPTION="Linux firmware files"
-HOMEPAGE="https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git"
-
-LICENSE="GPL-2 GPL-2+ GPL-3 BSD MIT || ( MPL-1.1 GPL-2 )
-	redistributable? ( linux-fw-redistributable BSD-2 BSD BSD-4 ISC MIT )
-	unknown-license? ( all-rights-reserved )"
-SLOT="0"
-IUSE="compress-xz compress-zstd initramfs +redistributable savedconfig unknown-license"
-REQUIRED_USE="initramfs? ( redistributable )
-	?? ( compress-xz compress-zstd )"
-
-RESTRICT="binchecks strip test
-	unknown-license? ( bindist )"
-
-BDEPEND="initramfs? ( app-arch/cpio )
-	compress-xz? ( app-arch/xz-utils )
-	compress-zstd? ( app-arch/zstd )"
-
-#add anything else that collides to this
-RDEPEND="!savedconfig? (
-		redistributable? (
-			!sys-firmware/alsa-firmware[alsa_cards_ca0132]
-			!sys-block/qla-fc-firmware
-			!sys-firmware/iwl1000-ucode
-			!sys-firmware/iwl6005-ucode
-			!sys-firmware/iwl6030-ucode
-			!sys-firmware/iwl3160-ucode
-			!sys-firmware/iwl7260-ucode
-			!sys-firmware/iwl3160-7260-bt-ucode
-			!sys-firmware/raspberrypi-wifi-ucode
-		)
-		unknown-license? (
-			!sys-firmware/alsa-firmware[alsa_cards_korg1212]
-			!sys-firmware/alsa-firmware[alsa_cards_maestro3]
-			!sys-firmware/alsa-firmware[alsa_cards_sb16]
-			!sys-firmware/alsa-firmware[alsa_cards_ymfpci]
-		)
-	)"
-
-QA_PREBUILT="*"
-
-pkg_setup() {
-	if use compress-xz || use compress-zstd ; then
-		local CONFIG_CHECK
-
-		if kernel_is -ge 5 19; then
-			use compress-xz && CONFIG_CHECK="~FW_LOADER_COMPRESS_XZ"
-			use compress-zstd && CONFIG_CHECK="~FW_LOADER_COMPRESS_ZSTD"
-		else
-			use compress-xz && CONFIG_CHECK="~FW_LOADER_COMPRESS"
-			if use compress-zstd; then
-				eerror "Kernels <5.19 do not support ZSTD-compressed firmware files"
-			fi
-		fi
-		linux-info_pkg_setup
-	fi
-}
-
-pkg_pretend() {
-	use initramfs && mount-boot_pkg_pretend
-}
-
-src_unpack() {
-	if [[ ${PV} == 99999999* ]]; then
-		git-r3_src_unpack
-	else
-		default
-		# rename directory from git snapshot tarball
-		if [[ ${#GIT_COMMIT} -gt 8 ]]; then
-			mv ${PN}-*/ ${P} || die
-		fi
-	fi
-}
-
-src_prepare() {
-	default
-
-	find . -type f -not -perm 0644 -print0 \
-		| xargs --null --no-run-if-empty chmod 0644 \
-		|| die
-
-	chmod +x copy-firmware.sh || die
-
-	if use initramfs; then
-		if [[ -d "${S}/amd-ucode" ]]; then
-			local UCODETMP="${T}/ucode_tmp"
-			local UCODEDIR="${UCODETMP}/kernel/x86/microcode"
-			mkdir -p "${UCODEDIR}" || die
-			echo 1 > "${UCODETMP}/early_cpio"
-
-			local amd_ucode_file="${UCODEDIR}/AuthenticAMD.bin"
-			cat "${S}"/amd-ucode/*.bin > "${amd_ucode_file}" || die "Failed to concat amd cpu ucode"
-
-			if [[ ! -s "${amd_ucode_file}" ]]; then
-				die "Sanity check failed: '${amd_ucode_file}' is empty!"
-			fi
-
-			pushd "${UCODETMP}" &>/dev/null || die
-			find . -print0 | cpio --quiet --null -o -H newc -R 0:0 > "${S}"/amd-uc.img
-			popd &>/dev/null || die
-			if [[ ! -s "${S}/amd-uc.img" ]]; then
-				die "Failed to create '${S}/amd-uc.img'!"
-			fi
-		else
-			# If this will ever happen something has changed which
-			# must be reviewed
-			die "'${S}/amd-ucode' not found!"
-		fi
-	fi
-
-	# whitelist of misc files
-	local misc_files=(
-		copy-firmware.sh
-		WHENCE
-		README
-	)
-
-	# whitelist of images with a free software license
-	local free_software=(
-		# keyspan_pda (GPL-2+)
-		keyspan_pda/keyspan_pda.fw
-		keyspan_pda/xircom_pgs.fw
-		# dsp56k (GPL-2+)
-		dsp56k/bootstrap.bin
-		# ath9k_htc (BSD GPL-2+ MIT)
-		ath9k_htc/htc_7010-1.4.0.fw
-		ath9k_htc/htc_9271-1.4.0.fw
-		# pcnet_cs, 3c589_cs, 3c574_cs, serial_cs (dual GPL-2/MPL-1.1)
-		cis/LA-PCM.cis
-		cis/PCMLM28.cis
-		cis/DP83903.cis
-		cis/NE2K.cis
-		cis/tamarack.cis
-		cis/PE-200.cis
-		cis/PE520.cis
-		cis/3CXEM556.cis
-		cis/3CCFEM556.cis
-		cis/MT5634ZLX.cis
-		cis/RS-COM-2P.cis
-		cis/COMpad2.cis
-		cis/COMpad4.cis
-		# serial_cs (GPL-3)
-		cis/SW_555_SER.cis
-		cis/SW_7xx_SER.cis
-		cis/SW_8xx_SER.cis
-		# dvb-ttpci (GPL-2+)
-		av7110/bootcode.bin
-		# usbdux, usbduxfast, usbduxsigma (GPL-2+)
-		usbdux_firmware.bin
-		usbduxfast_firmware.bin
-		usbduxsigma_firmware.bin
-		# brcmfmac (GPL-2+)
-		brcm/brcmfmac4330-sdio.Prowise-PT301.txt
-		brcm/brcmfmac43340-sdio.meegopad-t08.txt
-		brcm/brcmfmac43362-sdio.cubietech,cubietruck.txt
-		brcm/brcmfmac43362-sdio.lemaker,bananapro.txt
-		brcm/brcmfmac43430a0-sdio.jumper-ezpad-mini3.txt
-		"brcm/brcmfmac43430a0-sdio.ONDA-V80 PLUS.txt"
-		brcm/brcmfmac43430-sdio.AP6212.txt
-		brcm/brcmfmac43430-sdio.Hampoo-D2D3_Vi8A1.txt
-		brcm/brcmfmac43430-sdio.MUR1DX.txt
-		brcm/brcmfmac43430-sdio.raspberrypi,3-model-b.txt
-		brcm/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt
-		brcm/brcmfmac4356-pcie.gpd-win-pocket.txt
-		# isci (GPL-2)
-		isci/isci_firmware.bin
-		# carl9170 (GPL-2+)
-		carl9170-1.fw
-		# atusb (GPL-2+)
-		atusb/atusb-0.2.dfu
-		atusb/atusb-0.3.dfu
-		atusb/rzusb-0.3.bin
-		# mlxsw_spectrum (dual BSD/GPL-2)
-		mellanox/mlxsw_spectrum-13.1420.122.mfa2
-		mellanox/mlxsw_spectrum-13.1530.152.mfa2
-		mellanox/mlxsw_spectrum-13.1620.192.mfa2
-		mellanox/mlxsw_spectrum-13.1702.6.mfa2
-		mellanox/mlxsw_spectrum-13.1703.4.mfa2
-		mellanox/mlxsw_spectrum-13.1910.622.mfa2
-		mellanox/mlxsw_spectrum-13.2000.1122.mfa2
-	)
-
-	# blacklist of images with unknown license
-	local unknown_license=(
-		korg/k1212.dsp
-		ess/maestro3_assp_kernel.fw
-		ess/maestro3_assp_minisrc.fw
-		yamaha/ds1_ctrl.fw
-		yamaha/ds1_dsp.fw
-		yamaha/ds1e_ctrl.fw
-		ttusb-budget/dspbootcode.bin
-		emi62/bitstream.fw
-		emi62/loader.fw
-		emi62/midi.fw
-		emi62/spdif.fw
-		ti_3410.fw
-		ti_5052.fw
-		mts_mt9234mu.fw
-		mts_mt9234zba.fw
-		whiteheat.fw
-		whiteheat_loader.fw
-		cpia2/stv0672_vp4.bin
-		vicam/firmware.fw
-		edgeport/boot.fw
-		edgeport/boot2.fw
-		edgeport/down.fw
-		edgeport/down2.fw
-		edgeport/down3.bin
-		sb16/mulaw_main.csp
-		sb16/alaw_main.csp
-		sb16/ima_adpcm_init.csp
-		sb16/ima_adpcm_playback.csp
-		sb16/ima_adpcm_capture.csp
-		sun/cassini.bin
-		acenic/tg1.bin
-		acenic/tg2.bin
-		adaptec/starfire_rx.bin
-		adaptec/starfire_tx.bin
-		yam/1200.bin
-		yam/9600.bin
-		ositech/Xilinx7OD.bin
-		qlogic/isp1000.bin
-		myricom/lanai.bin
-		yamaha/yss225_registers.bin
-		lgs8g75.fw
-	)
-
-	if use !unknown-license; then
-		einfo "Removing files with unknown license ..."
-		rm -v "${unknown_license[@]}" || die
-	fi
-
-	if use !redistributable; then
-		# remove files _not_ in the free_software or unknown_license lists
-		# everything else is confirmed (or assumed) to be redistributable
-		# based on upstream acceptance policy
-		einfo "Removing non-redistributable files ..."
-		local OLDIFS="${IFS}"
-		local IFS=$'\n'
-		set -o pipefail
-		find ! -type d -printf "%P\n" \
-			| grep -Fvx -e "${misc_files[*]}" -e "${free_software[*]}" -e "${unknown_license[*]}" \
-			| xargs -d '\n' --no-run-if-empty rm -v
-
-		[[ ${?} -ne 0 ]] && die "Failed to remove non-redistributable files"
-
-		IFS="${OLDIFS}"
-	fi
-
-	restore_config ${PN}.conf
-}
-
-src_install() {
-	./copy-firmware.sh -v "${ED}/lib/firmware" || die
-
-	pushd "${ED}/lib/firmware" &>/dev/null || die
-
-	# especially use !redistributable will cause some broken symlinks
-	einfo "Removing broken symlinks ..."
-	find * -xtype l -print -delete || die
-
-	if use savedconfig; then
-		if [[ -s "${S}/${PN}.conf" ]]; then
-			local files_to_keep="${T}/files_to_keep.lst"
-			grep -v '^#' "${S}/${PN}.conf" 2>/dev/null > "${files_to_keep}" || die
-			[[ -s "${files_to_keep}" ]] || die "grep failed, empty config file?"
-
-			einfo "Applying USE=savedconfig; Removing all files not listed in config ..."
-			find ! -type d -printf "%P\n" \
-				| grep -Fvx -f "${files_to_keep}" \
-				| xargs -d '\n' --no-run-if-empty rm -v
-
-			if [[ ${PIPESTATUS[0]} -ne 0 ]]; then
-				die "Find failed to print installed files"
-			elif [[ ${PIPESTATUS[1]} -eq 2 ]]; then
-				# grep returns exit status 1 if no lines were selected
-				# which is the case when we want to keep all files
-				die "Grep failed to select files to keep"
-			elif [[ ${PIPESTATUS[2]} -ne 0 ]]; then
-				die "Failed to remove files not listed in config"
-			fi
-		fi
-	fi
-
-	# remove empty directories, bug #396073
-	find -type d -empty -delete || die
-
-	# sanity check
-	if ! ( shopt -s failglob; : * ) 2>/dev/null; then
-		eerror "No files to install. Check your USE flag settings"
-		eerror "and the list of files in your saved configuration."
-		die "Refusing to install an empty package"
-	fi
-
-	# create config file
-	echo "# Remove files that shall not be installed from this list." > "${S}"/${PN}.conf || die
-	find * ! -type d >> "${S}"/${PN}.conf || die
-	save_config "${S}"/${PN}.conf
-
-	if use compress-xz || use compress-zstd; then
-		einfo "Compressing firmware ..."
-		local target
-		local ext
-		local compressor
-
-		if use compress-xz; then
-			ext=xz
-			compressor="xz -T1 -C crc32"
-		elif use compress-zstd; then
-			ext=zst
-			compressor="zstd -15 -T1 -C -q --rm"
-		fi
-
-		# rename symlinks
-		while IFS= read -r -d '' f; do
-			# skip symlinks pointing to directories
-			[[ -d ${f} ]] && continue
-
-			target=$(readlink "${f}")
-			[[ $? -eq 0 ]] || die
-			ln -sf "${target}".${ext} "${f}" || die
-			mv -T "${f}" "${f}".${ext} || die
-		done < <(find . -type l -print0) || die
-
-		find . -type f ! -path "./amd-ucode/*" -print0 | \
-			xargs -0 -P $(makeopts_jobs) -I'{}' ${compressor} '{}' || die
-
-	fi
-
-	popd &>/dev/null || die
-
-	if use initramfs ; then
-		insinto /boot
-		doins "${S}"/amd-uc.img
-	fi
-}
-
-pkg_preinst() {
-	if use savedconfig; then
-		ewarn "USE=savedconfig is active. You must handle file collisions manually."
-	fi
-
-	# Fix 'symlink is blocked by a directory' Bug #871315
-	if has_version "<${CATEGORY}/${PN}-20220913-r2" ; then
-		rm -rf "${EROOT}"/lib/firmware/qcom/LENOVO/21BX
-	fi
-
-	# Make sure /boot is available if needed.
-	use initramfs && mount-boot_pkg_preinst
-}
-
-pkg_postinst() {
-	elog "If you are only interested in particular firmware files, edit the saved"
-	elog "configfile and remove those that you do not want."
-
-	local ver
-	for ver in ${REPLACING_VERSIONS}; do
-		if ver_test ${ver} -lt 20190514; then
-			elog
-			elog 'Starting with version 20190514, installation of many firmware'
-			elog 'files is controlled by USE flags. Please review your USE flag'
-			elog 'and package.license settings if you are missing some files.'
-			break
-		fi
-	done
-
-	# Don't forget to umount /boot if it was previously mounted by us.
-	use initramfs && mount-boot_pkg_postinst
-}
-
-pkg_prerm() {
-	# Make sure /boot is mounted so that we can remove /boot/amd-uc.img!
-	use initramfs && mount-boot_pkg_prerm
-}
-
-pkg_postrm() {
-	# Don't forget to umount /boot if it was previously mounted by us.
-	use initramfs && mount-boot_pkg_postrm
-}
diff --git a/sys-kernel/linux-firmware/linux-firmware-20231030.ebuild b/sys-kernel/linux-firmware/linux-firmware-20231030.ebuild
index feed015c3e3e..c7bc4aeff108 100644
--- a/sys-kernel/linux-firmware/linux-firmware-20231030.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-20231030.ebuild
@@ -19,7 +19,7 @@ else
 		SRC_URI="https://mirrors.edge.kernel.org/pub/linux/kernel/firmware/${P}.tar.xz"
 	fi
 
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 fi
 
 DESCRIPTION="Linux firmware files"
diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index b00d580d99c6..8ec5d9992de6 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -44,6 +44,10 @@ DIST linux-6.1.59.tar.sign 989 BLAKE2B 39c2986f32d44ecb44abb3ad2142bb704bec80969
 DIST linux-6.1.59.tar.xz 134985728 BLAKE2B 8b805f75f745e6fff9d7628fb1702475ad4c94010f764d733e1c1b4d860f6e593a79ccb8aa3a8c6c0de2ffdc2c192aaa661966549a7383ceb026a59e0d949e49 SHA512 0dbaa1d4363ef0ae25bdcbbf3a330aa8a2a9383939584954653223c58b142e8074f0e25e195c522b44e150e2153b746c43c2eed5fa1309aae2839cb2446cc7a4
 DIST linux-6.1.60.tar.sign 989 BLAKE2B ac930d10be651459fe169c44b4d7a2b5f1097e907aff55e6e6c48d42aa2b5976730d21e521c8a79a0fd74cdac0be01df68527b6ec11cecbd89b79b676342f1b1 SHA512 42146c56bf8270e05c488a5829baccf403a4b088b7312478f5fcb78b0e4742a0d20867e89ff17d3479f177ddab817dee832dca4fb5eedf0d8412ae8673b782d1
 DIST linux-6.1.60.tar.xz 134984880 BLAKE2B 6d6723dd839b9003ea2a46be849e36516a97497ba3743860c8081795b372c70536465c46defd6ab4f97e81127b1bf40d78270b1a3a721a7331a935d1ef8417c4 SHA512 cef40235428a09e5f7807a8be83af9a5ab90e841049a04f9f851e69e602aeab5a50f523cae5d5928d345c11b728608eba7754b173be0c023c7ee564cfaf4b20a
+DIST linux-6.1.61.tar.sign 989 BLAKE2B 238d6292e5e59cc6b64bc53c499fca901000ac247f3ccb8be897830113564c095e79da405bbd63bf76cee9c878cde47076c508d5ae944ad115b21ded340bfc03 SHA512 2bc5b580cd1ce5dce00c5ab0695aebaf29adf774f798a4232c74c7313a4114ccd25a01a30dae2e5db04ecab3b55c7591d8d7cdbdef58a8d1ad6cb98146233f90
+DIST linux-6.1.61.tar.xz 134973932 BLAKE2B b5177aec27fb2fd0e6c846b34194c35a2435894f46ef74f282c3dd5f06b1e01c968fe50664a6e1342d0098f709a90a0d7ece0b2780f90c684889e93876cccc87 SHA512 cc4bc51abca165701ad0a5a13e2b4b0fe7f55a3ea1d0d709b714d490b1952058ed1ed3934554827b6edbaedf9609bc0e1aaa0bb238672e040ed47c34d3723b97
+DIST linux-6.5.10.tar.sign 989 BLAKE2B 01558584b85315a109e03b2b45ec18132d1d166d17ac3b01f5950bd023af1093da942446b2c8944f834c60823a1445d2b6eaaf9e14988f372ba8e1b4d6188fdd SHA512 338e66b81e859e879747333365b354034c4da5e705039fa880eda4f48644829851ce39da7477b0a4bc514f54153e5138bae0b2208f658b05a6c3c295c5af2a47
+DIST linux-6.5.10.tar.xz 138982152 BLAKE2B 6a2b93c3419edba1c8c6eddb82d6daaee64129e86575afc647e22088fe65baed2d9db43f2e606522332b1ce58e15ef16bb004b1e09cb641d9d7be15b437f71e1 SHA512 dfdc1b06c210e05060ef8235dc6eb158528d6dca51b9b55fdee94fce73f83e2fa81d5776dd4add88915ef9bb10ce986c2c9592ff1eeb744cda4e90e32b6449a1
 DIST linux-6.5.7.tar.sign 987 BLAKE2B e6cdbc33ee1f522ed3f30e144902f3a62bc10763e55047637c647445db29faa4014eefdd7beb92d700ba79d6bbbcf22b682883afbb2a1f16a6541c854c061d7d SHA512 35ef9733fd0233ba60c693f49d7b8c7d08ef9bf6eabe601ac37fbb6310ed2174813b3b4f8cb0804a1e80d276e8871b249b0fdca4f730d26b96472dbd0269b333
 DIST linux-6.5.7.tar.xz 138955500 BLAKE2B a9bed9907bf4b22c08df8a8beaaf923648e4f0f1a4b00c11012871094e7c06a127e54bc1935edb8afc92999456c01ebabd04bc542a0e2fa16de0852a5f4be681 SHA512 38eeff75ad99f43cf230cc440e53988646b86a5f06c08b8390722fa765c12cb97bd51ef39d28d7c2fcd982712bf76aec41e8dab9c3774d148dd9f0a33de10c8d
 DIST linux-6.5.8.tar.sign 987 BLAKE2B a5cc0238804fd53c50b60c5919f81ce14ca70777d9687342bd50dc6ee7ce8d2bb3d513c7f40403b4766e00bdada0fdb808334011186232a9d696948d0058cef5 SHA512 3e3702923e4990f4b52c69a77f22da4d12b4e041f7e988b284e4d64e1346605d220449ba0e4ce8f9f87024a9b72f548aceb697a8d9f69736e50084d4402e4cfb
@@ -62,7 +66,9 @@ EBUILD vanilla-kernel-6.1.57.ebuild 3886 BLAKE2B cadfd4371fa21bfcea4e1df9bd16f03
 EBUILD vanilla-kernel-6.1.58.ebuild 3886 BLAKE2B cadfd4371fa21bfcea4e1df9bd16f034ecd4a09d997aa1be7a7ebb0dc1230f4399ebd5a3d4af7fefee26d331f6214ffd4d8c20a9d24c8d9d6a4c2d1d9051b662 SHA512 dc856c50570caa20a76f24de8b53110c603fc328a60f5c0c459579a5c0bb3bee375a5fa0cebe7ed5a87f6efffe696f76bae301cce0a41bbedae668dcba4ddef8
 EBUILD vanilla-kernel-6.1.59.ebuild 3886 BLAKE2B cadfd4371fa21bfcea4e1df9bd16f034ecd4a09d997aa1be7a7ebb0dc1230f4399ebd5a3d4af7fefee26d331f6214ffd4d8c20a9d24c8d9d6a4c2d1d9051b662 SHA512 dc856c50570caa20a76f24de8b53110c603fc328a60f5c0c459579a5c0bb3bee375a5fa0cebe7ed5a87f6efffe696f76bae301cce0a41bbedae668dcba4ddef8
 EBUILD vanilla-kernel-6.1.60.ebuild 3887 BLAKE2B 4311b56f03f773216556a4ace9fe55af8337887717632d958f036c935568050ff73ab016b0841e3bf23689dd06fbccf976d1a054cf76ec63d8099d8419cb69bf SHA512 3361989ac92751e76dcab2de0b5b50b229db6860af425f964396137a4a3c955b6ab4f2c2f7b036787368586f0c408e12f1f092fb2d808c08e70459106ee7b046
+EBUILD vanilla-kernel-6.1.61.ebuild 3887 BLAKE2B 4311b56f03f773216556a4ace9fe55af8337887717632d958f036c935568050ff73ab016b0841e3bf23689dd06fbccf976d1a054cf76ec63d8099d8419cb69bf SHA512 3361989ac92751e76dcab2de0b5b50b229db6860af425f964396137a4a3c955b6ab4f2c2f7b036787368586f0c408e12f1f092fb2d808c08e70459106ee7b046
 EBUILD vanilla-kernel-6.1.9999.ebuild 3413 BLAKE2B 3e286878f8ad61cd41dfab86e7f5a143f3e165af8fbffa7277d1c5b0a712fbdde55440d069383e273b029967c108ee02caeddf5b6782d966ff3d47bc13763a01 SHA512 4adf01bafd3116668c406ab443e3b45bb37c182ad01931d32ce08eadea26d66df7657eba9f4f199009fb80adca108cb2401fb0a6e3c1c94b2dd77399303dc818
+EBUILD vanilla-kernel-6.5.10.ebuild 3991 BLAKE2B 3fabd60ebc2bbe820d0d116c29e36d27dadd635706f0e49cbac99064535a7f34b4efc194a98175a5ec9d7241bddee8b9f23c44cf92bc65daedd0e1523947242d SHA512 76f09d30e52d79536c2dfd9e84c6932a46fa261d259940847fe1110a412c53c58a97a849d6fd715301d369dd229bd5d6760777cfd47bccb5a9651b43eb767ec0
 EBUILD vanilla-kernel-6.5.7.ebuild 3990 BLAKE2B 7063088ff5362a19dd6ea80d0e48015dcd65c64957a594f12c98b1a97ec8184014eef33048d6926a30131da2b236bb5a3b86441d1288f05bb8f0705690e232b0 SHA512 f2e63950879db1e27778f2eb8055b2d196e2b087dc63168914194617c7623a18629ea9071851b6597d1597d8e3a756f9865e9528fb0a229404b9393ef1d48f5d
 EBUILD vanilla-kernel-6.5.8.ebuild 3990 BLAKE2B 7063088ff5362a19dd6ea80d0e48015dcd65c64957a594f12c98b1a97ec8184014eef33048d6926a30131da2b236bb5a3b86441d1288f05bb8f0705690e232b0 SHA512 f2e63950879db1e27778f2eb8055b2d196e2b087dc63168914194617c7623a18629ea9071851b6597d1597d8e3a756f9865e9528fb0a229404b9393ef1d48f5d
 EBUILD vanilla-kernel-6.5.9.ebuild 3991 BLAKE2B 3fabd60ebc2bbe820d0d116c29e36d27dadd635706f0e49cbac99064535a7f34b4efc194a98175a5ec9d7241bddee8b9f23c44cf92bc65daedd0e1523947242d SHA512 76f09d30e52d79536c2dfd9e84c6932a46fa261d259940847fe1110a412c53c58a97a849d6fd715301d369dd229bd5d6760777cfd47bccb5a9651b43eb767ec0
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.61.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.61.ebuild
new file mode 100644
index 000000000000..01d5d706064b
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.61.ebuild
@@ -0,0 +1,137 @@
+# 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.7-gentoo
+GENTOO_CONFIG_VER=g10
+
+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 ~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
+			;;
+		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[@]}"
+}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.5.10.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.5.10.ebuild
new file mode 100644
index 000000000000..c518ad25e7c2
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.5.10.ebuild
@@ -0,0 +1,140 @@
+# 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 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.5.8-gentoo
+GENTOO_CONFIG_VER=g10
+
+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 ~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
+			;;
+		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[@]}"
+}