Adding metadata

33 files changed, 527 insertions, 327 deletions

diff --git a/sys-kernel/genkernel/genkernel-4.3.10.ebuild b/sys-kernel/genkernel/genkernel-4.3.10.ebuild
index 7b781c213b95..6e9bc65910f9 100644
--- a/sys-kernel/genkernel/genkernel-4.3.10.ebuild
+++ b/sys-kernel/genkernel/genkernel-4.3.10.ebuild
@@ -94,7 +94,7 @@ if [[ ${PV} == 9999* ]] ; then
 else
 	SRC_URI="https://dev.gentoo.org/~bkohler/dist/${P}.tar.xz
 		${COMMON_URI}"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 fi
 
 DESCRIPTION="Gentoo automatic kernel building scripts"
diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index c645b4919659..dab3e28873d4 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -34,6 +34,8 @@ DIST genpatches-6.6-15.base.tar.xz 705240 BLAKE2B 35353cfc627d8b2b71e0e117db8808
 DIST genpatches-6.6-15.extras.tar.xz 3704 BLAKE2B 4808b3b5295768d7d352ec902a53c010d0e76ac322d399114512704115884d3735e34f86793e7c9de596fe1ad0d104eaf979ba0ae442a3c83d0d6b27823e8458 SHA512 eedc4198cb08b2f7d6daa17c298822a4235495416d453419efff71fb6127119679fb271bb5aced58974e496a66e81764e3eb454a96a6e4dcf403545a45fefb0f
 DIST genpatches-6.6-16.base.tar.xz 750868 BLAKE2B 13af5286f51a69dd0ad7b2543bcf0d933865e14c4c865e495f3225a8740bd7579858cbbd72a2099333e8dc241900c166730d4c812183f2636bf3d4049156a71b SHA512 70864a69f8bdb28f8fa3515a33be510a2c529a5c3bc767aede2dae1c290869491d776336be9983259685af9fee2d2bc61c821d0103c47e91b69078bf81fe2c63
 DIST genpatches-6.6-16.extras.tar.xz 3704 BLAKE2B a33d9a80926abd8318f124fa6aa25f7181b88a6965c17908232ef2b866a27a5e856e464895994599265e0e57d8e1f81561758df4670f25ef5694e5d5f535ba95 SHA512 8ee1686a16886320b698ac0e3767804fc9bbaf595335203fb2899c727a0ca0f3e551ac13b3cbb97cec8d91e77257aa1da75669f1c41d263960875e9d31303b1a
+DIST genpatches-6.7-3.base.tar.xz 19844 BLAKE2B 69f53a7bf61154f3644919b870ed4434ccd7ceeeb8c57e14c274c7be28a1f6c5b0af7975f4c0ef131ff5b53f3afa0a1a4b7c7db92202e11e3c1647524e8e9444 SHA512 5022aeb1970e8652b5f82d09642c22970bcae0e01deefbc0271cab9c054bd21ae4c3835f4fff0a22d14f5fa7495211a95c50b35535586dcdca3c2b1f45ce05a1
+DIST genpatches-6.7-3.extras.tar.xz 3700 BLAKE2B ce7bc87494eec57d39330b1de3462b99a088781bca0beefad667674bbd9eaa2f2413c712638d16ef8c335b6a0e353aec83f4eb69e3da53a88d51ca6853d3254c SHA512 43558eb7a699d5e24c8f2bea13689adaacc6c7c58b4975c3d204a4c2278620032add6ca6017c3fc6ae70ade7e3e227a655deb989b85ef05acb05804d33475ec6
 DIST gentoo-kernel-5.10.205-1.amd64.gpkg.tar 63252480 BLAKE2B 52cf3967ac881aa557da92d11a021c2509b5e6920cb04be415c626bea66e08579481b61d6897d8e88fd830d18461e6c41423aea398fa1f00aed581300cc1403a SHA512 295945d6ca4ed5322918662531b353867522782f243aba54f3cbbe22b515059e54b40bf124020c1d8315c27a491d7af894a8331e1395f44c0d763297d36e58a2
 DIST gentoo-kernel-5.10.205-1.arm64.gpkg.tar 56729600 BLAKE2B 62ecf66572c0b5da944e3200f7b0d1ba3e12231e66c5e90b1415becb0fd80d49da34b57fa5d20898f7c0085be25edc9ba939daa400e7587d6ac9836ede944f94 SHA512 5b5530f160b7119a200a4fb7c247aeff76055e92be92289d02be37f886dc522c076a19013d518df348f5fe352c758343c6ad61d7b0a819609f8020e2321de6e1
 DIST gentoo-kernel-5.10.205-1.ppc64le.gpkg.tar 52879360 BLAKE2B 2ba47d25e79ad05473f8ae87c08039bd858daf5d67ba6746f01bc57b6f7515a76e91c34fec101d514e81caf4a4103f65be43a4351a5c509056fd53da98f0da8e SHA512 4817b60666808ed734d84f2bb0f2e2c051d3a908eb24c70ef8607536d3aff782925aa231bb0d8180e53224cdf30c426643ff375e7b3f5f047d50411eddf6d178
@@ -106,7 +108,12 @@ DIST gentoo-kernel-6.6.9-1.amd64.gpkg.tar 145643520 BLAKE2B ceae9156ae6c37c45b01
 DIST gentoo-kernel-6.6.9-1.arm64.gpkg.tar 118558720 BLAKE2B 170d7f90400b9bdc0d4e98f7871d4f7622c670bac8baefd77ce531a11acfbb34e5ce4c4fe727918009b2980985c6c8d5d15d1859f2e129762c68efba3d3a621b SHA512 e7e56d77eb5391579fa1e8b5a6ced2c383e53c56b4079578f14a0ad5364405fc2e0088c6ab0851e5f8eb461912bec0b3d377560cf551b35cab3039ba750f76ff
 DIST gentoo-kernel-6.6.9-1.ppc64le.gpkg.tar 64337920 BLAKE2B 93a44b217ad4a3d7c1ce253554238e5d04da795f3eaf1c94fd44294eefe1c56130bda61985ce759dbc98f851c7da910934a777046f22984b6521867db6d69a05 SHA512 1d55ac1965e86783a290437bb654d727899a19d3953d428097fc9b169bb732227d8042ceadde85449278aaa323dff8827bf751c520cbbc8f36c7c742298d486b
 DIST gentoo-kernel-6.6.9-1.x86.gpkg.tar 68259840 BLAKE2B 86c05ed50692df9fae4daefc0448970f34b52c940db70803c6e8b259f12d9bdc1e8539f6d8b7c92886c19e9d84e6a20072c6d4f7b284cc9a0e0bbd67b30cfe9d SHA512 157a67acbbd6f5731b31fba5861316aab90ba9d9254bb4623582c15d45508eaed7903af56b64fe7c3fbebbd28c4b6b3d6f3670b952b84e2fa2ac1260f1fef509
+DIST gentoo-kernel-6.7.1-1.amd64.gpkg.tar 148244480 BLAKE2B 331554d8368fbf7e066e57859875dc04bfed10e1b7d937ef149af894214e6a0350f43f8c3b87fc3590e01f7eab3c5b94fe03a5632bb606fc435a0f63fe06fda2 SHA512 c6e5f6646669e390b06db010ab2e30a803a3d15b7f898b45c565cc58426161f4c9f12529e8d7beedec57c153de0cd9c1a73c25099c5c75a0ab66e2730ce12f51
+DIST gentoo-kernel-6.7.1-1.arm64.gpkg.tar 120647680 BLAKE2B 1ec1a5470c5f97bfa12e4e90ee58aa057c96a120ad8acd0fe62f858f8b685ac19f0759e76bf6d435243aa1b9d3dcdee4457b05eef2e2839b6d3589b38269dfab SHA512 35d41bf8df7fb65f8838c74d55afe005028af686859833e4bec8a86b061a804e48a425b77f222c3551188ccbd7b51b75491f5a13b69dd895cec9fc6405d59316
+DIST gentoo-kernel-6.7.1-1.ppc64le.gpkg.tar 65484800 BLAKE2B c0dc567e77b591a0d93a94d2f9f07f091f48ea5dee481d47dccd7b148617be56cb38d6f89da010bfe344eab0f396f556221a9e6df54a1353c4fd6cbfb9dba4f7 SHA512 04cf5db20c604999aed94e9bf3d69b546b6247a9ca68cd1bc187b52ef82b4c890538d5aaa976ba596224b2850e63505ae3fbab8f569e7f0c030569469e6ee302
+DIST gentoo-kernel-6.7.1-1.x86.gpkg.tar 69447680 BLAKE2B 9a9aca80ff60e42a5e872d4adfbf4e9271d4d7512270387635374a548ddec54a3e168bbbadc5e6c8cc7bc237cebbc22d41adb665a0c025f36663b429a5bb06a7 SHA512 c458b99b01c04bddf5fa816595b53cdc36c4a71b897a3434764f424b631f23670caf555ee3ef1b247b7293cb115568ca96ebe10c1b5fcac2892a4c49d47f8bcc
 DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1 SHA512 95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e
 DIST linux-5.15.tar.xz 121913744 BLAKE2B 3921274b23f7938abdf3ed9334534b4581e13d7484303d3a5280eddb038999aaa8b836666a487472d9c4a219af0f06b9fecccaf348fb5510ab8762f4ef4b7e83 SHA512 d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e43b6f021709dc685eb0efa18d2aec327e4f88a79f405705a
 DIST linux-6.1.tar.xz 134728520 BLAKE2B ae60257860b2bd1bd708d183f0443afc60ebbd2b3d535c45e44c2e541bd0928530a3b62de6385dd4e4726ebbedcc0a871d4f3ffb4105b9f1f6d8ed7467f5688e SHA512 6ed2a73c2699d0810e54753715635736fc370288ad5ce95c594f2379959b0e418665cd71bc512a0273fe226fe90074d8b10d14c209080a6466498417a4fdda68
 DIST linux-6.6.tar.xz 140064536 BLAKE2B 5f02fd8696d42f7ec8c5fbadec8e7270bdcfcb1f9844a6c4db3e1fd461c93ce1ccda650ca72dceb4890ebcbbf768ba8fba0bce91efc49fbd2c307b04e95665f2 SHA512 458b2c34d46206f9b4ccbac54cc57aeca1eaecaf831bc441e59701bac6eadffc17f6ce24af6eadd0454964e843186539ac0d63295ad2cc32d112b60360c39a35
+DIST linux-6.7.tar.xz 141406528 BLAKE2B cecdbd19905e43e485ab73b352ced18b37f2a138c97a6956cadcda5d3d271001117dc1cf896b166ff019fc7f405f9539e2ed0d6112b0890efb04d182adf4fd0e SHA512 de06de556191614bd9daf077ae239360352a402bab407748e67f1e5108c92fd933e451707840ab22fe0f9976db3d1e1b60ca9d41cf894f015ca09b3f652b74ad
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.208.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.208.ebuild
index 1a44f330be18..0b71803c0562 100644
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.208.ebuild
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.208.ebuild
@@ -35,7 +35,7 @@ SRC_URI+="
 S=${WORKDIR}
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 arm64 ppc64 x86"
 
 RDEPEND="
 	!sys-kernel/gentoo-kernel:${SLOT}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.147.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.147.ebuild
index 1a845828a60b..4644c6fd7294 100644
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.147.ebuild
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.147.ebuild
@@ -35,7 +35,7 @@ SRC_URI+="
 S=${WORKDIR}
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 arm64 ppc64 x86"
 
 RDEPEND="
 	!sys-kernel/gentoo-kernel:${SLOT}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.74.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.74.ebuild
index 1a845828a60b..a45b646a0adf 100644
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.74.ebuild
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.74.ebuild
@@ -35,7 +35,7 @@ SRC_URI+="
 S=${WORKDIR}
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 arm64 ppc64 ~x86"
 
 RDEPEND="
 	!sys-kernel/gentoo-kernel:${SLOT}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.13.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.13.ebuild
index 9055f90433bd..c471496e5cd4 100644
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.13.ebuild
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.13.ebuild
@@ -38,7 +38,7 @@ SRC_URI+="
 "
 S=${WORKDIR}
 
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ppc64 x86"
 
 RDEPEND="
 	!sys-kernel/gentoo-kernel:${SLOT}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.7.1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.7.1.ebuild
new file mode 100644
index 000000000000..44d02e88809f
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.7.1.ebuild
@@ -0,0 +1,161 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KERNEL_EFI_ZBOOT=1
+KERNEL_IUSE_GENERIC_UKI=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}
+
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+BDEPEND="
+	app-alternatives/bc
+	app-alternatives/lex
+	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
+	)
+
+	local kernel_dir="${BINPKG}/image/usr/src/linux-${KPV}"
+	local image="${kernel_dir}/$(dist-kernel_get_image_path)"
+	local uki="${image%/*}/uki.efi"
+	if [[ -s ${uki} ]]; then
+		# We need to extract the plain image for the test phase
+		# and USE=-generic-uki.
+		kernel-install_extract_from_uki linux "${uki}" "${image}"
+	fi
+
+	mkdir modprep || die
+	cp "${kernel_dir}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	local kernel_dir="${BINPKG}/image/usr/src/linux-${KPV}"
+	kernel-install_test "${KPV}" \
+		"${WORKDIR}/${kernel_dir}/$(dist-kernel_get_image_path)" \
+		"${BINPKG}/image/lib/modules/${KPV}"
+}
+
+src_install() {
+	local kernel_dir="${BINPKG}/image/usr/src/linux-${KPV}"
+	local image="${kernel_dir}/$(dist-kernel_get_image_path)"
+	local uki="${image%/*}/uki.efi"
+	if [[ -s ${uki} ]]; then
+		# Keep the kernel image type we don't want out of install tree
+		# Replace back with placeholder
+		if use generic-uki; then
+			> "${image}" || die
+		else
+			> "${uki}" || die
+		fi
+	fi
+
+	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
+
+	# Update timestamps on all modules to ensure cleanup works correctly
+	# when switching USE=modules-compress.
+	find "${ED}/lib" -name '*.ko' -exec touch {} + || die
+
+	# Modules were already stripped before signing
+	dostrip -x /lib/modules
+	kernel-install_compress_modules
+}
diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
index 1411e7a3e2c4..97d36b8c04f8 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -34,28 +34,35 @@ DIST genpatches-6.6-15.base.tar.xz 705240 BLAKE2B 35353cfc627d8b2b71e0e117db8808
 DIST genpatches-6.6-15.extras.tar.xz 3704 BLAKE2B 4808b3b5295768d7d352ec902a53c010d0e76ac322d399114512704115884d3735e34f86793e7c9de596fe1ad0d104eaf979ba0ae442a3c83d0d6b27823e8458 SHA512 eedc4198cb08b2f7d6daa17c298822a4235495416d453419efff71fb6127119679fb271bb5aced58974e496a66e81764e3eb454a96a6e4dcf403545a45fefb0f
 DIST genpatches-6.6-16.base.tar.xz 750868 BLAKE2B 13af5286f51a69dd0ad7b2543bcf0d933865e14c4c865e495f3225a8740bd7579858cbbd72a2099333e8dc241900c166730d4c812183f2636bf3d4049156a71b SHA512 70864a69f8bdb28f8fa3515a33be510a2c529a5c3bc767aede2dae1c290869491d776336be9983259685af9fee2d2bc61c821d0103c47e91b69078bf81fe2c63
 DIST genpatches-6.6-16.extras.tar.xz 3704 BLAKE2B a33d9a80926abd8318f124fa6aa25f7181b88a6965c17908232ef2b866a27a5e856e464895994599265e0e57d8e1f81561758df4670f25ef5694e5d5f535ba95 SHA512 8ee1686a16886320b698ac0e3767804fc9bbaf595335203fb2899c727a0ca0f3e551ac13b3cbb97cec8d91e77257aa1da75669f1c41d263960875e9d31303b1a
+DIST genpatches-6.7-3.base.tar.xz 19844 BLAKE2B 69f53a7bf61154f3644919b870ed4434ccd7ceeeb8c57e14c274c7be28a1f6c5b0af7975f4c0ef131ff5b53f3afa0a1a4b7c7db92202e11e3c1647524e8e9444 SHA512 5022aeb1970e8652b5f82d09642c22970bcae0e01deefbc0271cab9c054bd21ae4c3835f4fff0a22d14f5fa7495211a95c50b35535586dcdca3c2b1f45ce05a1
+DIST genpatches-6.7-3.extras.tar.xz 3700 BLAKE2B ce7bc87494eec57d39330b1de3462b99a088781bca0beefad667674bbd9eaa2f2413c712638d16ef8c335b6a0e353aec83f4eb69e3da53a88d51ca6853d3254c SHA512 43558eb7a699d5e24c8f2bea13689adaacc6c7c58b4975c3d204a4c2278620032add6ca6017c3fc6ae70ade7e3e227a655deb989b85ef05acb05804d33475ec6
 DIST gentoo-kernel-config-g11.tar.gz 5077 BLAKE2B dc17ded74f79baddd703a78084113b85e7130877b300b5fe60453cde515fe37c52ece7877049bb0ef384f74ecfc73d59d7d4a513f8fef7bf4f651599946383e8 SHA512 e91156765ef2a48396370f884fdecd7bb1d600e5167f6bad51130520f886e9198adae375adf3e40fa803abc5d5482057775fb0275ab2589bd8f94d8af4a03c4e
 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.6.12-gentoo 271041 BLAKE2B 5af7c2f57cd6cd9230d9ab1a539a4b12b02cfdd777f5921b2d69329b171060a8085909a60eed9916aea504e8d9c9d1e907a61f0c6681ac75d5c64864052f821e SHA512 f744444f2840020dce2dc8473e3e562fa53ac1c34a641a9f322c2c7efd8fc4d9b3677479d3a31e705fa60beff0b1beca79ab78ad7dd4b6633d4499bebbfc76bd
 DIST kernel-aarch64-fedora.config.6.6.4-gentoo 271020 BLAKE2B 63caa50c84cf2a5f0f5ae51d9924e6d62bee4cfdd7479e19fdcd24860f072ae447ff30252f1b43da4f5b6b448bec245e830cd475de86a83d20192fa625531f79 SHA512 e47590731cd9918f8d7f64731746b63fe66c68b6009c6b79acbff116f5d008b2e159b2647f4f2330f05b9638111ea366f5c2ce47b88665201828a1a8aedc278a
+DIST kernel-aarch64-fedora.config.6.7.0-gentoo 276120 BLAKE2B 9288ac16c532e2122e9d870d7c7c266c4f408e383326c98db509a44ea0b587cc499cbc482e96fbf961cc021ffbb3f9b16efac81c7b289e2d7d514117781a8ab7 SHA512 cf47d4467beba74a3e9f0d99a009242e14b3e09bbbd0f5bf28af86379caa59366de68dc3eaab921d610c7e726056141eb03c0d8db6dab6388ba3136676cc937d
 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.6.12-gentoo 242515 BLAKE2B dbb4df93a5c8ee34d687262cced152a07f412a89ef2e8122429477633424fdac80809ed57a5a6de72de05313ec91f266d37c3494426099621d047c0561ccb57e SHA512 a65fe3299b6d8f89373937d2a782aa1469ebf18954b00bbf2798cee952b9946d7fead795388c079cb508f6d431e49b2812fb6d845c8a0e3861a4a3bd11e81968
 DIST kernel-i686-fedora.config.6.6.4-gentoo 243218 BLAKE2B 745df259d518ef86c6a8462bc9e764a26c6ec41cb7ce4c56a0d4f973d04938d289258a506424cdfe363687d1998d04b2b259a7e1ac55c062a389f1d3ce6e0b4a SHA512 fd683d6d40c7ecb6eb18e0a4457ae6bbf6641e0b2e185b83304128c6996b73f98a95330d39413b7e2b6537d44e04b24a5f131bcc6570b4640ea55d6c823c105b
+DIST kernel-i686-fedora.config.6.7.0-gentoo 244374 BLAKE2B 257a580a674bbd4f16f47311f1f09d3068a8448d2dcb62a3007dd888037f0f33eaf4f8bea25d3ae117f9913c8053eb43611a03a4cd17d73525ae5de46d042fe5 SHA512 516d7d586f731edafb6749f51cfb42f0ec2d497a5971685cfc82d5bf4bab923f6027458fbf2b9cdfaf5f8f22f4df564cf402452cfe8760737c39248eac456bfc
 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.6.12-gentoo 232147 BLAKE2B d67c2ab2d089ecdde3879129d2b1f85a592adae811ed053d00d4ff120e6bb44546bb41d74817be558adb1d669d06f3dd50e6ea542c8a9c2f13672f77f4e4eed5 SHA512 b130b4c57959c0f7be983334b08354640d5e2946bfdd956d6c5b895f816f6177d5fa4bb1c4382cca5c4dd4723aac42e9e89a002b71d86f4eb30f755008f8f9af
 DIST kernel-ppc64le-fedora.config.6.6.4-gentoo 232893 BLAKE2B e23331376e6c6d4262164479ad1ac24d28d7bf54b247a42e97019f25ec3f600c00a9f02bf0157f49c4ceab7ac0aac06dd25202f1c74ddcedc47dc290b4ea34cb SHA512 42e2805b30c5ead99b5838d74ff211a8fd819e221e869c9eb8b2c97700fa35bf20656229fe667dcfa649c10971143f77bb0f5c11dc962904db4e9730ca98d6d1
+DIST kernel-ppc64le-fedora.config.6.7.0-gentoo 233294 BLAKE2B d14dd35ccd3c481b4c79edca44fc645fa85d5f0f5888fa3b888b7b94e55b6d0881b250c3fa125b0d3c4aa0f56ddf5e903b75fe072e832d475100709f261c3825 SHA512 a132f7aa6e221160b43d24fef230f4aca390142c992ab44162cb39f02e18dd3991055bcefe27908cf88e10de2f71eacae27750b089528d1c05f1f91a4ec06909
 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.6.12-gentoo 243607 BLAKE2B 7e670d37c6471e50aa0ba395570cd0173af0210afe63faa48d7a147327110652e3aab5c339cf10ed22a6a20e81e505aee84311beb21fda3eb577e06ea55ecac8 SHA512 c484403a60670dd006ecbe65240cb00d97e8b3fe22d1169c5b6ccb92bcdbddb3ecd474d2b57880b30baf6a38bcef11fc8d56b8b0b02fcddd859833c3640cdc9c
 DIST kernel-x86_64-fedora.config.6.6.4-gentoo 244310 BLAKE2B af982d23c80d1b19f84622298fef525cb0b51680d0f064c8cc940be33b55aeba6e8ee913d13bf33287167a48891e6e26ae8ce4f5a1644714132801f4a8b7c319 SHA512 913a9f9aec6898dc3a86611539835861b8d1f1380f699fdcadf52457619d5e6fdde4b9866a6216c50dc5a337cc09fef7b3a00a989cc6f9ab512dcedb15dba8ff
+DIST kernel-x86_64-fedora.config.6.7.0-gentoo 245518 BLAKE2B 95e474477509bae45c63e8fc2ace4fbdf13248bbd5b47728882f25b52923c95f1b26f096769c4c4d717de8af1e6ebc3c7ff6ce8a84f4a3301153d6f9c47a1086 SHA512 b7a23d49904cf9230beeff69456762be24b145cfe2b3cdfc414826b2c7ba6454c60d00ff3269b81fe0eb0c6e40dbe2cd301bdeba1bb43f82fcf2724c77fd3b5f
 DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1 SHA512 95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e
 DIST linux-5.15.tar.xz 121913744 BLAKE2B 3921274b23f7938abdf3ed9334534b4581e13d7484303d3a5280eddb038999aaa8b836666a487472d9c4a219af0f06b9fecccaf348fb5510ab8762f4ef4b7e83 SHA512 d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e43b6f021709dc685eb0efa18d2aec327e4f88a79f405705a
 DIST linux-6.1.tar.xz 134728520 BLAKE2B ae60257860b2bd1bd708d183f0443afc60ebbd2b3d535c45e44c2e541bd0928530a3b62de6385dd4e4726ebbedcc0a871d4f3ffb4105b9f1f6d8ed7467f5688e SHA512 6ed2a73c2699d0810e54753715635736fc370288ad5ce95c594f2379959b0e418665cd71bc512a0273fe226fe90074d8b10d14c209080a6466498417a4fdda68
 DIST linux-6.6.tar.xz 140064536 BLAKE2B 5f02fd8696d42f7ec8c5fbadec8e7270bdcfcb1f9844a6c4db3e1fd461c93ce1ccda650ca72dceb4890ebcbbf768ba8fba0bce91efc49fbd2c307b04e95665f2 SHA512 458b2c34d46206f9b4ccbac54cc57aeca1eaecaf831bc441e59701bac6eadffc17f6ce24af6eadd0454964e843186539ac0d63295ad2cc32d112b60360c39a35
+DIST linux-6.7.tar.xz 141406528 BLAKE2B cecdbd19905e43e485ab73b352ced18b37f2a138c97a6956cadcda5d3d271001117dc1cf896b166ff019fc7f405f9539e2ed0d6112b0890efb04d182adf4fd0e SHA512 de06de556191614bd9daf077ae239360352a402bab407748e67f1e5108c92fd933e451707840ab22fe0f9976db3d1e1b60ca9d41cf894f015ca09b3f652b74ad
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.208.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.208.ebuild
index a9cb5d5f0f12..2157cb670cf5 100644
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.208.ebuild
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.208.ebuild
@@ -43,7 +43,7 @@ SRC_URI+="
 S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~hppa ~ppc ppc64 x86"
 IUSE="debug hardened"
 REQUIRED_USE="arm? ( savedconfig )"
 
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.147.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.147.ebuild
index 11ca570f5262..3a2b8a445e69 100644
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.147.ebuild
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.147.ebuild
@@ -42,7 +42,7 @@ SRC_URI+="
 S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~hppa ~ppc ppc64 ~sparc x86"
 IUSE="debug hardened"
 REQUIRED_USE="
 	arm? ( savedconfig )
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.74.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.74.ebuild
index 1e3dc608d732..f9419d709551 100644
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.74.ebuild
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.74.ebuild
@@ -43,7 +43,7 @@ SRC_URI+="
 S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~hppa ~ppc ppc64 ~riscv ~sparc ~x86"
 IUSE="debug hardened"
 REQUIRED_USE="
 	arm? ( savedconfig )
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.6.13.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.6.13.ebuild
index ecc11e667b22..cf2f6b354ee8 100644
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-6.6.13.ebuild
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.6.13.ebuild
@@ -45,7 +45,7 @@ SRC_URI+="
 "
 S=${WORKDIR}/${MY_P}
 
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86"
 IUSE="debug hardened"
 REQUIRED_USE="
 	arm? ( savedconfig )
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.7.1.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.7.1.ebuild
new file mode 100644
index 000000000000..ec15b4a5a7f7
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.7.1.ebuild
@@ -0,0 +1,153 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KERNEL_IUSE_GENERIC_UKI=1
+KERNEL_IUSE_MODULES_SIGN=1
+
+inherit kernel-build toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 2 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo
+CONFIG_VER=6.7.0-gentoo
+GENTOO_CONFIG_VER=g11
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="
+	https://wiki.gentoo.org/wiki/Project:Distribution_Kernel
+	https://www.kernel.org/
+"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	amd64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="
+	arm? ( savedconfig )
+	hppa? ( savedconfig )
+	riscv? ( savedconfig )
+	sparc? ( savedconfig )
+"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel-bin:${SLOT}
+"
+BDEPEND="
+	debug? ( dev-util/pahole )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+QA_FLAGS_IGNORED="
+	usr/src/linux-.*/scripts/gcc-plugins/.*.so
+	usr/src/linux-.*/vmlinux
+	usr/src/linux-.*/arch/powerpc/kernel/vdso.*/vdso.*.so.dbg
+"
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	default
+
+	local biendian=false
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		hppa)
+			return
+			;;
+		loong)
+			return
+			;;
+		ppc)
+			# assume powermac/powerbook defconfig
+			# we still package.use.force savedconfig
+			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		riscv)
+			return
+			;;
+		sparc)
+			return
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-gentoo-dist"
+	use hardened && myversion+="-hardened"
+	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+	local merge_configs=(
+		"${T}"/version.config
+		"${dist_conf_path}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${dist_conf_path}"/no-debug.config
+	)
+	if use hardened; then
+		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+		fi
+	fi
+
+	# this covers ppc64 and aarch64_be only for now
+	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
+		merge_configs+=( "${dist_conf_path}/big-endian.config" )
+	fi
+
+	use secureboot && merge_configs+=( "${dist_conf_path}/secureboot.config" )
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index 09f770d301a9..3e0e58d04780 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -58,6 +58,9 @@ DIST genpatches-6.7-1.extras.tar.xz 3704 BLAKE2B a030f820814c70c9e5605de15964550
 DIST genpatches-6.7-2.base.tar.xz 19060 BLAKE2B acebbec12f191cf356754f9166f0f0f3539a1a1b246df7b9e37026caf93cba76d0a0c240e7c2450076c61877c28b53f33ad20f6bfae125ad8e0d21d5a50fcd01 SHA512 8a3125e999236035f5339e25e91344eb3ced5611af4eb435cde2edef7d9f739562a926fdbb1bd61da8cbf015e0c0df8b0dfd8dba1b73e12c3e3b5b6308663395
 DIST genpatches-6.7-2.experimental.tar.xz 78864 BLAKE2B b095c9b88da0537d0a00129284af405fe964b6b1d587331ad8c46b956e2f22c47361747dbe17fdd41b65b5cb460a007f9f8d5078d01d6552bf681e2b10b29ce3 SHA512 4bcf115aecd393976526403144f7ef8472d68c19f725ef6d2777573591769d489693226ceded5c7deee34b7687cddbc8dee02a25f5c371c000fbc8ef9a3b1b58
 DIST genpatches-6.7-2.extras.tar.xz 3704 BLAKE2B 7b4123f15bbe78dbd041a6088af8f91ba25e52f9957ca3ceffc8d6cbcc3edb2b0f650b2cabd13b754927ba01a4eeb0b9d8fa18ef8a456b79a705d7ac481110bd SHA512 ffaa432e54c49ba8b1662e71eb5f4c08c6c48d0dec5eac4714081cf47f29d78c7a72c08d0992015e29159ea59b39a94fb401fe13e790dcb90ef259914243bb2a
+DIST genpatches-6.7-3.base.tar.xz 19844 BLAKE2B 69f53a7bf61154f3644919b870ed4434ccd7ceeeb8c57e14c274c7be28a1f6c5b0af7975f4c0ef131ff5b53f3afa0a1a4b7c7db92202e11e3c1647524e8e9444 SHA512 5022aeb1970e8652b5f82d09642c22970bcae0e01deefbc0271cab9c054bd21ae4c3835f4fff0a22d14f5fa7495211a95c50b35535586dcdca3c2b1f45ce05a1
+DIST genpatches-6.7-3.experimental.tar.xz 78896 BLAKE2B 8cebed9ec070ac659454dd846665d3354dd453498d8c343379be44a1f5a6281d807739d4563496d66b4b077835e445d54c5cd85794f1d6600e0238c794e586e1 SHA512 4fbd15d2492935507460c9d4bec7fa36af040cf2c1d3fd93b2118ff1bd64dd5159af1339aff4538ed2aa551deeafa14468feb3f974ac21f4cb14a071c65ed4aa
+DIST genpatches-6.7-3.extras.tar.xz 3700 BLAKE2B ce7bc87494eec57d39330b1de3462b99a088781bca0beefad667674bbd9eaa2f2413c712638d16ef8c335b6a0e353aec83f4eb69e3da53a88d51ca6853d3254c SHA512 43558eb7a699d5e24c8f2bea13689adaacc6c7c58b4975c3d204a4c2278620032add6ca6017c3fc6ae70ade7e3e227a655deb989b85ef05acb05804d33475ec6
 DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1 SHA512 95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e
 DIST linux-5.15.tar.xz 121913744 BLAKE2B 3921274b23f7938abdf3ed9334534b4581e13d7484303d3a5280eddb038999aaa8b836666a487472d9c4a219af0f06b9fecccaf348fb5510ab8762f4ef4b7e83 SHA512 d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e43b6f021709dc685eb0efa18d2aec327e4f88a79f405705a
 DIST linux-6.1.tar.xz 134728520 BLAKE2B ae60257860b2bd1bd708d183f0443afc60ebbd2b3d535c45e44c2e541bd0928530a3b62de6385dd4e4726ebbedcc0a871d4f3ffb4105b9f1f6d8ed7467f5688e SHA512 6ed2a73c2699d0810e54753715635736fc370288ad5ce95c594f2379959b0e418665cd71bc512a0273fe226fe90074d8b10d14c209080a6466498417a4fdda68
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.10.208.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.10.208.ebuild
index b5687d0e93bc..5c9821bd8f03 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.10.208.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.10.208.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
 detect_version
 detect_arch
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
 IUSE="experimental"
 
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.15.147.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.15.147.ebuild
index dc40dfddc8c6..0e1889f189e8 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.15.147.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.15.147.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
 detect_version
 detect_arch
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
 IUSE="experimental"
 
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-6.1.74.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-6.1.74.ebuild
index d38948c564e2..e74c87b0d7b6 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-6.1.74.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-6.1.74.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
 detect_version
 detect_arch
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
 IUSE="experimental"
 
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-6.6.13.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-6.6.13.ebuild
index ee842753e2a0..044f04972bfa 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-6.6.13.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-6.6.13.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
 detect_version
 detect_arch
 
-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"
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
 IUSE="experimental"
 
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-6.7.1-r1.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-6.7.1-r1.ebuild
new file mode 100644
index 000000000000..d7dd2e439072
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-6.7.1-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="3"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/git-sources/Manifest b/sys-kernel/git-sources/Manifest
index aa8883575e98..1d0259ee15ab 100644
--- a/sys-kernel/git-sources/Manifest
+++ b/sys-kernel/git-sources/Manifest
@@ -1,9 +1,2 @@
-DIST linux-6.6.tar.xz 140064536 BLAKE2B 5f02fd8696d42f7ec8c5fbadec8e7270bdcfcb1f9844a6c4db3e1fd461c93ce1ccda650ca72dceb4890ebcbbf768ba8fba0bce91efc49fbd2c307b04e95665f2 SHA512 458b2c34d46206f9b4ccbac54cc57aeca1eaecaf831bc441e59701bac6eadffc17f6ce24af6eadd0454964e843186539ac0d63295ad2cc32d112b60360c39a35
-DIST patch-6.7-rc1.patch 71642632 BLAKE2B ee6626c1474208c5f2874a626bac389bf9581a57787db66e4e92fa0a651d74eee8f1476899e01f5732f4236aead6eda529ac7cebf63510f954cc18dbc0a4c970 SHA512 709c6008267440d1633651733923f625944aef633e4243dc59cf631cf42439dee53811be62ee8b8126d1ba477f13fec799a670cdbdb228e433c29cb31224b942
-DIST patch-6.7-rc2.patch 72006720 BLAKE2B 3c6fa7423f67b81d45edb526205dd53bc23d9ffa5f785711af8350c86421b5989e0468ea54831e2c3065a4f3bfd6e46ce82752a7a562edc4d639468549e21a9d SHA512 16f3ba44a741b33aa160b401df766dc6d928ebf671b178fe854abb6b05912033fddbdbbb9b80e9e8399f523b2905aa96456ee3cd0018b72391e445590a6f4ccd
-DIST patch-6.7-rc3.patch 72363721 BLAKE2B 1afb63acd48364195e876515e11b71b19b5415c80ccea7cfc199265ad16a9b639d0580bcff35170da38b37d3fd2996c25872c0091c1d4c755f936ebced9d5c08 SHA512 e21b1597864babee6cd0a641c1ffb36d7262650937c0c7ad234ce33ad22ca1ad1969cb9ec8652395e109904c0b66898dd36c19e761bef6cabaa80d57b552cf03
-DIST patch-6.7-rc4.patch 72676847 BLAKE2B f81414a35d846b7cca8192d7c0b5df98555f1a7d83c386ce73c0d4a47774c93703e6de01e68e9df8f826b9fcf376924108d119c490efa155a76f3333fee187f5 SHA512 4f6ea1d3f15108ddf3a291079024debccded77d91819e30488a945f23c93955b06aa3647f93ff224e38a98f1b8736dcc05c3f769b1513d6e577783329545a032
-DIST patch-6.7-rc5.patch 73084909 BLAKE2B 094526599ccb63a3b7658178468a6188e179110ac80e0b3cb890047351cdd23b8ac68f18d90ec6c86f01577ad70e00c177ce1a1d5ebd84f4897ae49229f2bec7 SHA512 02c37a6fea68a1fa280a613f9d8dc88655c43004e42bcb2580e8983ff95fb08c57630e0fec55714cb028a234e28616e40c3642a92785e0fa9b437c0dccd06c81
-DIST patch-6.7-rc6.patch 73376662 BLAKE2B 78e4d145caddb81c033fac6388496090fb8d4900f9fde6e95fc8a7cf8c39fcaf3a63f26cf387354b2177fc1b5710e8aa2f721a58bb42807c081f3a3602e89f0b SHA512 3cf301c327adaead8021607cc6e4b72e2f0985319bed6578b272e765cdb859c34754b572e69d322f7397063086e9f6a4333bce47f2e4c9ff73c1a48c17a1743b
-DIST patch-6.7-rc7.patch 73633759 BLAKE2B e5d23ce499d7fdb37dc19766ab2b15251da3c520e22ccdcb1bfa5531a6637d2438d452fabe26e59eb1ec90f67cb9be8756000671ba9da78c70620e1f418ac778 SHA512 d0cb6fc201ba2ccb59b56ca870fb8bbb5d0a15426bc24eccf6025616756d06cc078403fc9eb2cf9cdeb8facccaea34d1ba35dcf49faf96a9f067195f61f0bb04
-DIST patch-6.7-rc8.patch 73683256 BLAKE2B 009c4fa19a9779e49d19eaa5572ae4fe7e1e35aa666e8cb4e5308815f77fd0b8f861e0996faf64a35d875d53111c6b99e1ebc722ac75bd4a7c5421033bd484fe SHA512 5f2e60f146a5168fd17dc3ce1a26c3c46250a2d4d666a13b452395d2565e06250cb7315426040da58e34f651eee4e3dd3ecbf5d521c7d8b386634428f985278d
+DIST linux-6.7.tar.xz 141406528 BLAKE2B cecdbd19905e43e485ab73b352ced18b37f2a138c97a6956cadcda5d3d271001117dc1cf896b166ff019fc7f405f9539e2ed0d6112b0890efb04d182adf4fd0e SHA512 de06de556191614bd9daf077ae239360352a402bab407748e67f1e5108c92fd933e451707840ab22fe0f9976db3d1e1b60ca9d41cf894f015ca09b3f652b74ad
+DIST patch-6.8-rc1.patch 43389839 BLAKE2B 4aeb6c35ea09960930758160df83ad23caef0f1056c1d134ed0b450802b42619ac44fa0e834a8fb64cf8b1e116be2b179b24d2ccd6620206448e0869590b4a40 SHA512 41ec6a69f635197ea87eccab9415c2072389cedf8dec912c491740bba6507bb97dc7597b80944a0dbe51e88a806c5f3020e4916d418314bb4126bde0ae50ad28
diff --git a/sys-kernel/git-sources/git-sources-6.7_rc1.ebuild b/sys-kernel/git-sources/git-sources-6.7_rc1.ebuild
deleted file mode 100644
index 46873aec3fec..000000000000
--- a/sys-kernel/git-sources/git-sources-6.7_rc1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-UNIPATCH_STRICTORDER="yes"
-K_NOUSENAME="yes"
-K_NOSETEXTRAVERSION="yes"
-K_NOUSEPR="yes"
-K_SECURITY_UNSUPPORTED="1"
-K_BASE_VER="6.6"
-K_EXP_GENPATCHES_NOUSE="1"
-K_FROM_GIT="yes"
-K_NODRYRUN="yes"
-ETYPE="sources"
-CKV="${PVR/-r/-git}"
-
-# only use this if it's not an _rc/_pre release
-[ "${PV/_pre}" == "${PV}" ] && [ "${PV/_rc}" == "${PV}" ] && OKV="${PV}"
-inherit kernel-2
-detect_version
-
-DESCRIPTION="The very latest -git version of the Linux kernel"
-HOMEPAGE="https://www.kernel.org"
-SRC_URI="${KERNEL_URI}"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE=""
-
-K_EXTRAEINFO="This kernel is not supported by Gentoo due to its unstable and
-experimental nature. If you have any issues, try a matching vanilla-sources
-ebuild -- if the problem is not there, please contact the upstream kernel
-developers at https://bugzilla.kernel.org and on the linux-kernel mailing list to
-report the problem so it can be fixed in time for the next kernel release."
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=sys-devel/patch-2.7.6-r4"
-
-pkg_postinst() {
-	postinst_sources
-}
diff --git a/sys-kernel/git-sources/git-sources-6.7_rc2.ebuild b/sys-kernel/git-sources/git-sources-6.7_rc2.ebuild
deleted file mode 100644
index 46873aec3fec..000000000000
--- a/sys-kernel/git-sources/git-sources-6.7_rc2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-UNIPATCH_STRICTORDER="yes"
-K_NOUSENAME="yes"
-K_NOSETEXTRAVERSION="yes"
-K_NOUSEPR="yes"
-K_SECURITY_UNSUPPORTED="1"
-K_BASE_VER="6.6"
-K_EXP_GENPATCHES_NOUSE="1"
-K_FROM_GIT="yes"
-K_NODRYRUN="yes"
-ETYPE="sources"
-CKV="${PVR/-r/-git}"
-
-# only use this if it's not an _rc/_pre release
-[ "${PV/_pre}" == "${PV}" ] && [ "${PV/_rc}" == "${PV}" ] && OKV="${PV}"
-inherit kernel-2
-detect_version
-
-DESCRIPTION="The very latest -git version of the Linux kernel"
-HOMEPAGE="https://www.kernel.org"
-SRC_URI="${KERNEL_URI}"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE=""
-
-K_EXTRAEINFO="This kernel is not supported by Gentoo due to its unstable and
-experimental nature. If you have any issues, try a matching vanilla-sources
-ebuild -- if the problem is not there, please contact the upstream kernel
-developers at https://bugzilla.kernel.org and on the linux-kernel mailing list to
-report the problem so it can be fixed in time for the next kernel release."
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=sys-devel/patch-2.7.6-r4"
-
-pkg_postinst() {
-	postinst_sources
-}
diff --git a/sys-kernel/git-sources/git-sources-6.7_rc3.ebuild b/sys-kernel/git-sources/git-sources-6.7_rc3.ebuild
deleted file mode 100644
index 46873aec3fec..000000000000
--- a/sys-kernel/git-sources/git-sources-6.7_rc3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-UNIPATCH_STRICTORDER="yes"
-K_NOUSENAME="yes"
-K_NOSETEXTRAVERSION="yes"
-K_NOUSEPR="yes"
-K_SECURITY_UNSUPPORTED="1"
-K_BASE_VER="6.6"
-K_EXP_GENPATCHES_NOUSE="1"
-K_FROM_GIT="yes"
-K_NODRYRUN="yes"
-ETYPE="sources"
-CKV="${PVR/-r/-git}"
-
-# only use this if it's not an _rc/_pre release
-[ "${PV/_pre}" == "${PV}" ] && [ "${PV/_rc}" == "${PV}" ] && OKV="${PV}"
-inherit kernel-2
-detect_version
-
-DESCRIPTION="The very latest -git version of the Linux kernel"
-HOMEPAGE="https://www.kernel.org"
-SRC_URI="${KERNEL_URI}"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE=""
-
-K_EXTRAEINFO="This kernel is not supported by Gentoo due to its unstable and
-experimental nature. If you have any issues, try a matching vanilla-sources
-ebuild -- if the problem is not there, please contact the upstream kernel
-developers at https://bugzilla.kernel.org and on the linux-kernel mailing list to
-report the problem so it can be fixed in time for the next kernel release."
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=sys-devel/patch-2.7.6-r4"
-
-pkg_postinst() {
-	postinst_sources
-}
diff --git a/sys-kernel/git-sources/git-sources-6.7_rc4.ebuild b/sys-kernel/git-sources/git-sources-6.7_rc4.ebuild
deleted file mode 100644
index 46873aec3fec..000000000000
--- a/sys-kernel/git-sources/git-sources-6.7_rc4.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-UNIPATCH_STRICTORDER="yes"
-K_NOUSENAME="yes"
-K_NOSETEXTRAVERSION="yes"
-K_NOUSEPR="yes"
-K_SECURITY_UNSUPPORTED="1"
-K_BASE_VER="6.6"
-K_EXP_GENPATCHES_NOUSE="1"
-K_FROM_GIT="yes"
-K_NODRYRUN="yes"
-ETYPE="sources"
-CKV="${PVR/-r/-git}"
-
-# only use this if it's not an _rc/_pre release
-[ "${PV/_pre}" == "${PV}" ] && [ "${PV/_rc}" == "${PV}" ] && OKV="${PV}"
-inherit kernel-2
-detect_version
-
-DESCRIPTION="The very latest -git version of the Linux kernel"
-HOMEPAGE="https://www.kernel.org"
-SRC_URI="${KERNEL_URI}"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE=""
-
-K_EXTRAEINFO="This kernel is not supported by Gentoo due to its unstable and
-experimental nature. If you have any issues, try a matching vanilla-sources
-ebuild -- if the problem is not there, please contact the upstream kernel
-developers at https://bugzilla.kernel.org and on the linux-kernel mailing list to
-report the problem so it can be fixed in time for the next kernel release."
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=sys-devel/patch-2.7.6-r4"
-
-pkg_postinst() {
-	postinst_sources
-}
diff --git a/sys-kernel/git-sources/git-sources-6.7_rc5.ebuild b/sys-kernel/git-sources/git-sources-6.7_rc5.ebuild
deleted file mode 100644
index 46873aec3fec..000000000000
--- a/sys-kernel/git-sources/git-sources-6.7_rc5.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-UNIPATCH_STRICTORDER="yes"
-K_NOUSENAME="yes"
-K_NOSETEXTRAVERSION="yes"
-K_NOUSEPR="yes"
-K_SECURITY_UNSUPPORTED="1"
-K_BASE_VER="6.6"
-K_EXP_GENPATCHES_NOUSE="1"
-K_FROM_GIT="yes"
-K_NODRYRUN="yes"
-ETYPE="sources"
-CKV="${PVR/-r/-git}"
-
-# only use this if it's not an _rc/_pre release
-[ "${PV/_pre}" == "${PV}" ] && [ "${PV/_rc}" == "${PV}" ] && OKV="${PV}"
-inherit kernel-2
-detect_version
-
-DESCRIPTION="The very latest -git version of the Linux kernel"
-HOMEPAGE="https://www.kernel.org"
-SRC_URI="${KERNEL_URI}"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE=""
-
-K_EXTRAEINFO="This kernel is not supported by Gentoo due to its unstable and
-experimental nature. If you have any issues, try a matching vanilla-sources
-ebuild -- if the problem is not there, please contact the upstream kernel
-developers at https://bugzilla.kernel.org and on the linux-kernel mailing list to
-report the problem so it can be fixed in time for the next kernel release."
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=sys-devel/patch-2.7.6-r4"
-
-pkg_postinst() {
-	postinst_sources
-}
diff --git a/sys-kernel/git-sources/git-sources-6.7_rc7.ebuild b/sys-kernel/git-sources/git-sources-6.7_rc7.ebuild
deleted file mode 100644
index 0da7167ce080..000000000000
--- a/sys-kernel/git-sources/git-sources-6.7_rc7.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-UNIPATCH_STRICTORDER="yes"
-K_NOUSENAME="yes"
-K_NOSETEXTRAVERSION="yes"
-K_NOUSEPR="yes"
-K_SECURITY_UNSUPPORTED="1"
-K_BASE_VER="6.6"
-K_EXP_GENPATCHES_NOUSE="1"
-K_FROM_GIT="yes"
-K_NODRYRUN="yes"
-ETYPE="sources"
-CKV="${PVR/-r/-git}"
-
-# only use this if it's not an _rc/_pre release
-[ "${PV/_pre}" == "${PV}" ] && [ "${PV/_rc}" == "${PV}" ] && OKV="${PV}"
-inherit kernel-2
-detect_version
-
-DESCRIPTION="The very latest -git version of the Linux kernel"
-HOMEPAGE="https://www.kernel.org"
-SRC_URI="${KERNEL_URI}"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~s390 ~sparc ~x86"
-
-K_EXTRAEINFO="This kernel is not supported by Gentoo due to its unstable and
-experimental nature. If you have any issues, try a matching vanilla-sources
-ebuild -- if the problem is not there, please contact the upstream kernel
-developers at https://bugzilla.kernel.org and on the linux-kernel mailing list to
-report the problem so it can be fixed in time for the next kernel release."
-
-DEPEND="${RDEPEND}
-	>=sys-devel/patch-2.7.6-r4"
-
-pkg_postinst() {
-	postinst_sources
-}
diff --git a/sys-kernel/git-sources/git-sources-6.7_rc8.ebuild b/sys-kernel/git-sources/git-sources-6.7_rc8.ebuild
deleted file mode 100644
index 0da7167ce080..000000000000
--- a/sys-kernel/git-sources/git-sources-6.7_rc8.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-UNIPATCH_STRICTORDER="yes"
-K_NOUSENAME="yes"
-K_NOSETEXTRAVERSION="yes"
-K_NOUSEPR="yes"
-K_SECURITY_UNSUPPORTED="1"
-K_BASE_VER="6.6"
-K_EXP_GENPATCHES_NOUSE="1"
-K_FROM_GIT="yes"
-K_NODRYRUN="yes"
-ETYPE="sources"
-CKV="${PVR/-r/-git}"
-
-# only use this if it's not an _rc/_pre release
-[ "${PV/_pre}" == "${PV}" ] && [ "${PV/_rc}" == "${PV}" ] && OKV="${PV}"
-inherit kernel-2
-detect_version
-
-DESCRIPTION="The very latest -git version of the Linux kernel"
-HOMEPAGE="https://www.kernel.org"
-SRC_URI="${KERNEL_URI}"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~s390 ~sparc ~x86"
-
-K_EXTRAEINFO="This kernel is not supported by Gentoo due to its unstable and
-experimental nature. If you have any issues, try a matching vanilla-sources
-ebuild -- if the problem is not there, please contact the upstream kernel
-developers at https://bugzilla.kernel.org and on the linux-kernel mailing list to
-report the problem so it can be fixed in time for the next kernel release."
-
-DEPEND="${RDEPEND}
-	>=sys-devel/patch-2.7.6-r4"
-
-pkg_postinst() {
-	postinst_sources
-}
diff --git a/sys-kernel/git-sources/git-sources-6.7_rc6.ebuild b/sys-kernel/git-sources/git-sources-6.8_rc1.ebuild
index 0da7167ce080..ca760a458b08 100644
--- a/sys-kernel/git-sources/git-sources-6.7_rc6.ebuild
+++ b/sys-kernel/git-sources/git-sources-6.8_rc1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
@@ -7,7 +7,7 @@ K_NOUSENAME="yes"
 K_NOSETEXTRAVERSION="yes"
 K_NOUSEPR="yes"
 K_SECURITY_UNSUPPORTED="1"
-K_BASE_VER="6.6"
+K_BASE_VER="6.7"
 K_EXP_GENPATCHES_NOUSE="1"
 K_FROM_GIT="yes"
 K_NODRYRUN="yes"
diff --git a/sys-kernel/linux-headers/linux-headers-6.6.ebuild b/sys-kernel/linux-headers/linux-headers-6.6.ebuild
index 862dae5d9e5f..a63a13b14d1e 100644
--- a/sys-kernel/linux-headers/linux-headers-6.6.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-6.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -17,7 +17,7 @@ SRC_URI="
 "
 S="${WORKDIR}/linux-${PV}"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="
 	app-arch/xz-utils
diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index eef3e95f2907..76d0c9442efe 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -5,21 +5,25 @@ DIST kernel-aarch64-fedora.config.5.15.19 242615 BLAKE2B 94e59440681535e38137b71
 DIST kernel-aarch64-fedora.config.6.1.7-gentoo 252811 BLAKE2B f6bad0d23132bf0dfbaa25db928a95f39763b6500fd1df9b4aeca4351e3e75f185891c0df96b111ad840e4bac431d74a9b11e7344e766ab49715663c89e4dbfc SHA512 41ebf195d8b656801d49c6bb693ebe1404b6725d70d88d93a75bc4af230030d65ef0701ea931846b022a3c598dcca068fbc38ecf6d064262b3f5b88e57060437
 DIST kernel-aarch64-fedora.config.6.6.12-gentoo 271041 BLAKE2B 5af7c2f57cd6cd9230d9ab1a539a4b12b02cfdd777f5921b2d69329b171060a8085909a60eed9916aea504e8d9c9d1e907a61f0c6681ac75d5c64864052f821e SHA512 f744444f2840020dce2dc8473e3e562fa53ac1c34a641a9f322c2c7efd8fc4d9b3677479d3a31e705fa60beff0b1beca79ab78ad7dd4b6633d4499bebbfc76bd
 DIST kernel-aarch64-fedora.config.6.6.4-gentoo 271020 BLAKE2B 63caa50c84cf2a5f0f5ae51d9924e6d62bee4cfdd7479e19fdcd24860f072ae447ff30252f1b43da4f5b6b448bec245e830cd475de86a83d20192fa625531f79 SHA512 e47590731cd9918f8d7f64731746b63fe66c68b6009c6b79acbff116f5d008b2e159b2647f4f2330f05b9638111ea366f5c2ce47b88665201828a1a8aedc278a
+DIST kernel-aarch64-fedora.config.6.7.0-gentoo 276120 BLAKE2B 9288ac16c532e2122e9d870d7c7c266c4f408e383326c98db509a44ea0b587cc499cbc482e96fbf961cc021ffbb3f9b16efac81c7b289e2d7d514117781a8ab7 SHA512 cf47d4467beba74a3e9f0d99a009242e14b3e09bbbd0f5bf28af86379caa59366de68dc3eaab921d610c7e726056141eb03c0d8db6dab6388ba3136676cc937d
 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.6.12-gentoo 242515 BLAKE2B dbb4df93a5c8ee34d687262cced152a07f412a89ef2e8122429477633424fdac80809ed57a5a6de72de05313ec91f266d37c3494426099621d047c0561ccb57e SHA512 a65fe3299b6d8f89373937d2a782aa1469ebf18954b00bbf2798cee952b9946d7fead795388c079cb508f6d431e49b2812fb6d845c8a0e3861a4a3bd11e81968
 DIST kernel-i686-fedora.config.6.6.4-gentoo 243218 BLAKE2B 745df259d518ef86c6a8462bc9e764a26c6ec41cb7ce4c56a0d4f973d04938d289258a506424cdfe363687d1998d04b2b259a7e1ac55c062a389f1d3ce6e0b4a SHA512 fd683d6d40c7ecb6eb18e0a4457ae6bbf6641e0b2e185b83304128c6996b73f98a95330d39413b7e2b6537d44e04b24a5f131bcc6570b4640ea55d6c823c105b
+DIST kernel-i686-fedora.config.6.7.0-gentoo 244374 BLAKE2B 257a580a674bbd4f16f47311f1f09d3068a8448d2dcb62a3007dd888037f0f33eaf4f8bea25d3ae117f9913c8053eb43611a03a4cd17d73525ae5de46d042fe5 SHA512 516d7d586f731edafb6749f51cfb42f0ec2d497a5971685cfc82d5bf4bab923f6027458fbf2b9cdfaf5f8f22f4df564cf402452cfe8760737c39248eac456bfc
 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.6.12-gentoo 232147 BLAKE2B d67c2ab2d089ecdde3879129d2b1f85a592adae811ed053d00d4ff120e6bb44546bb41d74817be558adb1d669d06f3dd50e6ea542c8a9c2f13672f77f4e4eed5 SHA512 b130b4c57959c0f7be983334b08354640d5e2946bfdd956d6c5b895f816f6177d5fa4bb1c4382cca5c4dd4723aac42e9e89a002b71d86f4eb30f755008f8f9af
 DIST kernel-ppc64le-fedora.config.6.6.4-gentoo 232893 BLAKE2B e23331376e6c6d4262164479ad1ac24d28d7bf54b247a42e97019f25ec3f600c00a9f02bf0157f49c4ceab7ac0aac06dd25202f1c74ddcedc47dc290b4ea34cb SHA512 42e2805b30c5ead99b5838d74ff211a8fd819e221e869c9eb8b2c97700fa35bf20656229fe667dcfa649c10971143f77bb0f5c11dc962904db4e9730ca98d6d1
+DIST kernel-ppc64le-fedora.config.6.7.0-gentoo 233294 BLAKE2B d14dd35ccd3c481b4c79edca44fc645fa85d5f0f5888fa3b888b7b94e55b6d0881b250c3fa125b0d3c4aa0f56ddf5e903b75fe072e832d475100709f261c3825 SHA512 a132f7aa6e221160b43d24fef230f4aca390142c992ab44162cb39f02e18dd3991055bcefe27908cf88e10de2f71eacae27750b089528d1c05f1f91a4ec06909
 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.6.12-gentoo 243607 BLAKE2B 7e670d37c6471e50aa0ba395570cd0173af0210afe63faa48d7a147327110652e3aab5c339cf10ed22a6a20e81e505aee84311beb21fda3eb577e06ea55ecac8 SHA512 c484403a60670dd006ecbe65240cb00d97e8b3fe22d1169c5b6ccb92bcdbddb3ecd474d2b57880b30baf6a38bcef11fc8d56b8b0b02fcddd859833c3640cdc9c
 DIST kernel-x86_64-fedora.config.6.6.4-gentoo 244310 BLAKE2B af982d23c80d1b19f84622298fef525cb0b51680d0f064c8cc940be33b55aeba6e8ee913d13bf33287167a48891e6e26ae8ce4f5a1644714132801f4a8b7c319 SHA512 913a9f9aec6898dc3a86611539835861b8d1f1380f699fdcadf52457619d5e6fdde4b9866a6216c50dc5a337cc09fef7b3a00a989cc6f9ab512dcedb15dba8ff
+DIST kernel-x86_64-fedora.config.6.7.0-gentoo 245518 BLAKE2B 95e474477509bae45c63e8fc2ace4fbdf13248bbd5b47728882f25b52923c95f1b26f096769c4c4d717de8af1e6ebc3c7ff6ce8a84f4a3301153d6f9c47a1086 SHA512 b7a23d49904cf9230beeff69456762be24b145cfe2b3cdfc414826b2c7ba6454c60d00ff3269b81fe0eb0c6e40dbe2cd301bdeba1bb43f82fcf2724c77fd3b5f
 DIST linux-5.10.205.tar.sign 993 BLAKE2B 834896e7c7dc3bb8ee0cb66303956c6955a42a203826d4b4c0a2acfa0388fbbf5780b7c363d6f22e84712a3b63a231c2b69538d463f797343b51816702ace966 SHA512 d71a88170e1ad38956d7f528a8a3d842e4f40c9543c9006da7ab21f6ce5b2a98e12dd2ed18b6c4f6a52812261a601dab18f410bef407a3613670aa9eac4bf7e8
 DIST linux-5.10.205.tar.xz 120632532 BLAKE2B 12f94ecd38282581345a1cd497f1f67b90f68b12bd9a5eb5c920e97114536d8c138154fe4a27634194a75c27539bc04af3674bfe590c8a43cbe211d39148b2c8 SHA512 681aca65c239a3d6020861b399b1a5548bbe832016c40862529e08dc7078c5f709e11811e6d6bcffbbf0a86c7eea2bb911870f899729312e04653f0c235a3b09
 DIST linux-5.10.206.tar.sign 993 BLAKE2B 5d3874901b5194646fd5f9c73b6fe723b346cdc3f6e80d51c681623c1b15998c369437c3a16cf5b08408ebd8889a487967f5a5cb5322d15d7378e60d4bbd1483 SHA512 e6682e38094aa233fb78bec96846e6644d4b40a7a8c45d0115c0f830ec734c0347df89e263e8853d3e942a8182d31ce0fb3ae716e1e07abc361996ff1f056eba
@@ -56,3 +60,5 @@ DIST linux-6.6.13.tar.sign 989 BLAKE2B dfb90ac9bdb9f4eaff9eb507dab9a0b111f5e036d
 DIST linux-6.6.13.tar.xz 140067168 BLAKE2B 1d644e48fa4fd3740712130b0d5756b75d70471cda2a7206083434ec89d288bd7487e633c8954ec038e3784d56d7a787e6cab1c93e5fbfcfc0b44a7b55b0debd SHA512 c1598bb1116528525004a677e571117d2b5156cf8f60c84f73e11d9010032b1fd5aaf8e5d286679019db55abb699c2f55de2dbb332c0a96f6337eebd56220863
 DIST linux-6.6.9.tar.sign 987 BLAKE2B 947a3f09c87d9d02a8f8b5330d25cddc6f71ab501d2f52804ca0fa5394cdd5df27e413a17c1af5eba09afd0494328c122e76fec6a7792ba6c889c6d8ba7ab27a SHA512 e25e0b8cae76be052711c3113a7acfc0ecfd7e735fb0a3c7716ac8fdac689ff3f0ac51c6ea0677f3e585561f9c777dfb12b397ce25a323df7728b3352596f74c
 DIST linux-6.6.9.tar.xz 140052968 BLAKE2B c7deb1221716144b636018ee2936abe6397e15204c9bdb4cb5806f6bd303cd5d3f953a7da5865c4f211b866e4dfec4cd347c0a1a0a675f18b1a4ad197b099cec SHA512 a6a9608b158408bb55737505058ee8d64a901af38230bf31d2eee007c3530503154067e5d37c1f86c36b60ba5dc24771047c6e91de24ed6a256c2f9ecbb9c2dc
+DIST linux-6.7.1.tar.sign 987 BLAKE2B b031b0ce27e336830785ce2e404a2766ee31489c95dd494e1308be47c500ecf99dcb4923d73629008ac8eb47840448a074512fa0b6a8b657d653952ef2ae0807 SHA512 54202d384166d3669417a978fdd27c8428ec8d23ecdc31f029e86f812a601977771e0a202b8e83fb2ab725a1a0cbea917fb042dce93465ca17da83cfd74a5c6e
+DIST linux-6.7.1.tar.xz 141405060 BLAKE2B 080f19034a9f5519e3212c723492849f3a2e019c310615b40e636cad39c89369fd91fd1129750266a1cf9683c0762a3ff52942045066d62f927642c443b94c76 SHA512 59374585fe35f1dc0906052ad7c74acfd6beabd334665b79432c39bda8fa28c3290df54d69eb63281a2d07aca1ea8cc3aa0acf0911dc9d763c20f89cce7afdb5
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.7.1.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.7.1.ebuild
new file mode 100644
index 000000000000..4abc23dc680d
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.7.1.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.7.0-gentoo
+GENTOO_CONFIG_VER=g11
+
+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[@]}"
+}
diff --git a/sys-kernel/vanilla-sources/Manifest b/sys-kernel/vanilla-sources/Manifest
index 7e0af4e2e1d2..ae47aefaeb2a 100644
--- a/sys-kernel/vanilla-sources/Manifest
+++ b/sys-kernel/vanilla-sources/Manifest
@@ -1,4 +1,3 @@
-DIST linux-4.14.tar.xz 100770500 BLAKE2B 85dc4aa953fe65e273a24473d8de98e4f204f97c43be9fc87cf5be01f796f94cfde5c8f9c84619751f1cac51f83ce0b4681fb19c5f2965a72d4a94fe5577846a SHA512 77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8
 DIST linux-4.19.tar.xz 103117552 BLAKE2B 1dbf16cf410867412d17568fe42bc1e90c034183b654d270b650621ff7664a321950943d0639205bc1ee7ef6210be170c1f2c785a042ed8a4ec5e3a486d890e0 SHA512 ab67cc746b375a8b135e8b23e35e1d6787930d19b3c26b2679787d62951cbdbc3bb66f8ededeb9b890e5008b2459397f9018f1a6772fdef67780b06a4cb9f6f4
 DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1 SHA512 95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e
 DIST linux-5.15.tar.xz 121913744 BLAKE2B 3921274b23f7938abdf3ed9334534b4581e13d7484303d3a5280eddb038999aaa8b836666a487472d9c4a219af0f06b9fecccaf348fb5510ab8762f4ef4b7e83 SHA512 d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e43b6f021709dc685eb0efa18d2aec327e4f88a79f405705a
@@ -6,7 +5,6 @@ DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6
 DIST linux-6.1.tar.xz 134728520 BLAKE2B ae60257860b2bd1bd708d183f0443afc60ebbd2b3d535c45e44c2e541bd0928530a3b62de6385dd4e4726ebbedcc0a871d4f3ffb4105b9f1f6d8ed7467f5688e SHA512 6ed2a73c2699d0810e54753715635736fc370288ad5ce95c594f2379959b0e418665cd71bc512a0273fe226fe90074d8b10d14c209080a6466498417a4fdda68
 DIST linux-6.6.tar.xz 140064536 BLAKE2B 5f02fd8696d42f7ec8c5fbadec8e7270bdcfcb1f9844a6c4db3e1fd461c93ce1ccda650ca72dceb4890ebcbbf768ba8fba0bce91efc49fbd2c307b04e95665f2 SHA512 458b2c34d46206f9b4ccbac54cc57aeca1eaecaf831bc441e59701bac6eadffc17f6ce24af6eadd0454964e843186539ac0d63295ad2cc32d112b60360c39a35
 DIST linux-6.7.tar.xz 141406528 BLAKE2B cecdbd19905e43e485ab73b352ced18b37f2a138c97a6956cadcda5d3d271001117dc1cf896b166ff019fc7f405f9539e2ed0d6112b0890efb04d182adf4fd0e SHA512 de06de556191614bd9daf077ae239360352a402bab407748e67f1e5108c92fd933e451707840ab22fe0f9976db3d1e1b60ca9d41cf894f015ca09b3f652b74ad
-DIST patch-4.14.336.xz 5348976 BLAKE2B 8b9f3a6e00d8c36894fd12dc17592292df6b326d99171a535c6e373d7ab200e62d150f816efb86fc3cd4b630aec865e17b33160de66b17ee7567e65d3668cef1 SHA512 74f730f6b0862d9fa0ed0e807f5e34b32023726692e6057bba7d8384f105e419d5864e9459b659131aa7f29ffdac09fc0f240bc12336456505a6bf3c4f427b8c
 DIST patch-4.19.305.xz 5829316 BLAKE2B 1403b0b779c71255587abe9dcce5382b1697e38597bc1f25e1117bd7d5030592d86ba962f3bfaae8e5c816da911d69cc0027d2e64342003046ad1ee6fbd5923d SHA512 5b7edde60b3ea3e34a249a16a26b11b156bbd698433971808f53030925b6c18820428cdd3d26c439631f7bb4fdfcea7c1639205c5fec3a7d720a5799323d488f
 DIST patch-5.10.208.xz 5449180 BLAKE2B fa8757b40952ce7d06c0f2980e7aa6ceabe2d9383d922faa754b009560788604476880c7208c8a84577068df4eb4ab94c5f055f6e5a9a9bf62cb73f5fcf55d8f SHA512 50b90bc49bc9076b7d4e80baaa1a6a4ce3a6ed1ec72649a9cccc74747934e109d5dcf4b53581378c0b498748f65645fd2029a9bf75720e93ba63b9f44356d2c9
 DIST patch-5.15.147.xz 5183192 BLAKE2B b07070c8b3154a961ed9ddd40eddec50926acf38b3131c89d1938dfec6f98bac6c03ee5e060fefb4cf34b4a11432054d7be1220953f655bdacda32225b8999bf SHA512 183f1ef69568ea10dcd5e6a03dde18281cd1df53dd6b8a27a21589700f756fa180d51648322822ee03e340ef2e7385877daf66d3f8b7e09286868c7725d3e35e
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.14.336.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.14.336.ebuild
deleted file mode 100644
index 9286d988287a..000000000000
--- a/sys-kernel/vanilla-sources/vanilla-sources-4.14.336.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-K_NOUSENAME="yes"
-K_NOSETEXTRAVERSION="yes"
-K_SECURITY_UNSUPPORTED="1"
-ETYPE="sources"
-inherit kernel-2
-detect_version
-
-DESCRIPTION="Full sources for the Linux kernel"
-HOMEPAGE="https://www.kernel.org"
-SRC_URI="${KERNEL_URI}"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"