Adding metadata

7 files changed, 53 insertions, 450 deletions

diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index 449a5777fcda..0515ce7ff658 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -18,20 +18,18 @@ DIST linux-6.6.tar.xz 140064536 BLAKE2B 5f02fd8696d42f7ec8c5fbadec8e7270bdcfcb1f
 DIST linux-6.x-sha256sums-20260523-r1.asc 227108 BLAKE2B 71874499eea95879b1c461fcd73ee51b3688cda656cd301bab033cc1f5f69019424a153b2dfe74ca4e5d32a1885d16eb4aca87c1e1a2c01bb66116738994a8f4 SHA512 edde21f9346a3976200c1e1ffa61d0e3220cd6c30eec3fed25b3e09ef1a3b2ef2114c3b6f2721ecb6d53e7882a1bb34cb154feaafda671067174cd58d8825a3b
 DIST linux-6.x-sha256sums-20260523.asc 226767 BLAKE2B fc463ae0b71ecd0078c7f046a101c3a13b02e9c248135e860c257ca1e50a912c2ebcc9e206b5bc766d2e33cb9183ddf482328494a0cdf6006b54a1d58dc25179 SHA512 07323675c6e35e8bf9eabca6e2f3f6f9928dfd9e16f098a053dd060058e86a06058ecedbd767ed001f07e030edb8f3ad11dee4231bc9b22faf4b3fff70fa11f3
 DIST linux-6.x-sha256sums-20260601.asc 228472 BLAKE2B dbb61b77596a4bc658124e3ac313f094d78b16dc7d4131e54db292a9d42298594a42b0f91172424238ab7da3d5fa727a9d909df3fe70280861008b0f73322a9d SHA512 00161536ba0b7bb31ca78614da1e8d461bf1182eb3a8147f0caf89b89bec6b1ea2273f7cd2dc77fa83aaebc7dcb03b20f37536f567af934c1b4907b0df6da2e3
+DIST linux-6.x-sha256sums-20260609.asc 229154 BLAKE2B 5c7a4051e1f6696c55278af6d304749e2eb0bacca578cb6a4c99a17c6eb2e1dc9fcd21a888a19ed74a08f8b52a0999a942748c54fabcbf58a2907b53c0326a32 SHA512 654d6b90519fbb89ab9e34b6110ef2736a39cb3dbeeea8127e5bc7f96b7e17cd028f6950b9a055d5fa4c2f08e2b655e176e795b87a3c812bbc7ef68a0de618f4
 DIST linux-7.0.tar.xz 157143652 BLAKE2B 3d9795083c8938f80f480de0d10bfd9c525640e59d5c7f22983de3f12ee42c84c31be902cafb05579ddb1c32bac5ed06b0d4953f9705450be185bd2d9ab08f89 SHA512 8c85b708342f8f09ca25b2234b22e93b62b144a9ef919fbb21827f52fa47498e778c79db1559524dd7fb360f95b2ce174171443c1859656c281be41d2b6c5a0b
-DIST linux-7.x-sha256sums-20260523.asc 4541 BLAKE2B 17062ee8e93d4c81aa8adf1952650462d097229a76991873b42867a122bab9e5b33502a98a5df8c6ab52031601f3bcef6c82f50a86e0dcf1e1b680fff3ad2280 SHA512 3fd12772887ccf7b568ad641467fc9bfc29ea590e826e59f4c426cd11280fa7871e4b61f091d6bc3780d13e095c6b4b450fb5356606d32d70d4e985ee9832a64
-DIST linux-7.x-sha256sums-20260601.asc 4878 BLAKE2B 1a08d3eecaa37ab2f2aa10801025c214fa919c0842ba24d9bc9a555d10c64ac87bc8afb99c37c94ae65a1e73b408257d8483cef590ce55f80e438ef374ffe4cf SHA512 6c650dbc9d58cb42aef6b2bcd418dd20fb608a4f449f4300c78d8427d35a732227f5c6bc79a4d4c4e6975698b0cbd1c64488a89d59cdd0f8da8912dcee6a9e6e
+DIST linux-7.x-sha256sums-20260609.asc 5215 BLAKE2B 3eb3d30758962246f065f84f359f14f9b40d9d369883327f946ad2473533ef6252bce58242cb7703914bfaea9693fdc725c562cb5c0ed7f981b29afe3a7bb82f SHA512 50cf6027a1a05c691f8192f71fb6d42d1902d8332ca0a592c8186950295d52e2bb0afe16896861a641ff1817ee681391496b9dbe2d1032c435e480dd72d88b36
+DIST linux-bbe2e99bce4a7dffe34cf06303aec2fac49fbf56.tar.bz2 1401123 BLAKE2B e4e85486c5b0d3f53bd36e310c5667efa6123e4a6fdeb4e0b4883d994a7ce81b617ebfb1e0cdbd6258f483b1480198fddc20fbf7a231f28bbc4c983b526c4f51 SHA512 fa0eaec6d80520a0a983bb172687fe104b8a045b3e1a97f7c07c37e717e229b3a4a975d7370dd397de5f065f6e878eba9733bf7f9e831e9adccc08d7e7ea8c5a
 DIST patch-5.10.257.xz 7256300 BLAKE2B 5f9f76f69018e440b645ed7fe70cc955964181602dac632cbf6f106c9acb0c1bd051632a9e6570c0a005e8d2cbddf906a46c7b4cf29e11a6e09137f6b9071914 SHA512 154f4293daee3b5740d1816a677b0ba929d6cdb9eda746521ba668a21c0902c689940896b2e6436e65aa12596233542e4a5d5b49c10dc1d7c1cd45e1ca8bc537
 DIST patch-5.10.258.xz 7341784 BLAKE2B 2c678b0915665b599c544cfcd9c9fb98e7d1e3503f038203a19e4294b430f2ce9bfc9003f1467182ca046e1bd7408cc5c846843f96627f8ba64298645ffece98 SHA512 fb7774d5e9e3178042ae53d177a2212f23c996358fc99d040f393916f65ddd89f08733ccdd3002c733db06ae866cb52f1cb1acbadd9cdb7677b673857abdc502
 DIST patch-5.15.208.xz 7682444 BLAKE2B cdb8d906b43d6da18a24b845bef7da5d654934551eeff867be5d8c4afc73030ece1589fbb0ddb379d1e4966ea6d38e31b2d3bffe760edfdade27cc1a1e6b6b84 SHA512 434becb2a1d1ae0f45667bd595aa8766e49b575670d6b192bef07cabc61726913a8edf18044cd82d208c389558d832d95a4cfbb3a94d4f0b766078b5c1df07ad
 DIST patch-5.15.209.xz 7798764 BLAKE2B 21bb560464456b9d9f5a59da46b5ecaf49c0baf22db4d07c9e32e4f3ffe4b677e10a7a69c2ea2a9cd3f853d8d8beb5f8e985d9b8ffa44bd774d814bd34615682 SHA512 df8210ba7819605c0e2927ccf3a341049cdfe751b6e315816c7a810eb744d786422fcfd840309762a283e2f6ba388773471ea9e1af044a1bd76c79e3737e1ce0
 DIST patch-6.1.174.xz 7324984 BLAKE2B 1b127bd530d636de99ed331c4285ff7b610d3bd32db05d5497d484350aa0351b828227f4e20972670ddb954f2558a0cf806bc74f1b4c56f5f0cd974376ee40a7 SHA512 f50ca7d6a257c6e14f4c26477b3bb31963420397e7cdf069e535074e0c4c2f3c1f45c9708393ef85a1afcb28d7fa9509e8b668d26b8cdb36d9a0e5c5cae94fb5
 DIST patch-6.1.175.xz 7484964 BLAKE2B bfd1ffdb00514ef33cd0f9f8a001bb9560749375d0e3a8bcd021ab5555b2b74db8727468accf3f2e7c9ab4d71cf5299a2837b9d702040f7588526f00a3255d1f SHA512 cb59a190328e81a2827a3f8d5cc92e46c9251df49046899e369e63fbd01a424209254596a26dc0bb172d7df5bd1ac4660c256866108e54fbe301f6784fc09ed7
-DIST patch-6.12.91.xz 4651460 BLAKE2B 0e7a11c1ab28e44321833177d59eb3ed7d76b809d91d0b6061113d738ffeb90bc15e214c65fc0d10e77e472c6d76cb94efdc839c3a1de0a6a0a8e1dc6f9b1743 SHA512 3da0673a28ffb1040d565f96d28eca43f4d23ca28842a3df7b764e35c2c4f1d39d24e08e3e7adcf0e5e20e4b11f13aabfd99e8e979eb2c32d32db88352c61956
-DIST patch-6.12.92.xz 4689024 BLAKE2B 5697f552a2d70f30a4db6b54e513fb11bfc73fecd2254518110d8489253f2e458c26920e8b69ab9f4641118039aebb6af38670d91fc6cdfa8091c0d96c3046b6 SHA512 61838ffa430c40ccbee4e29d795e73ccb777a168b285d38ca72364261c3e3f3c3e4426dbcf7b19d9ff5fb830ee8b1ed0fb02120eeb2bf6472dbba3fa4515829b
-DIST patch-6.18.33.xz 1974288 BLAKE2B 4569664a77d67508743839549e3c6f2a29fcc48b4c038f31af498b75e44ba597bd36ef9be28c1933cd8bc8c45b022cf189d74db8ee5c6fbf7528eed837c6df8b SHA512 da1543907531fbf33f8450f2f6ce82e2fb6c04bda0e8f43e8e929ee36673d70e1cec3e1ff68290daec761f273544efa93eb45e2d479ce2272029874109161b90
-DIST patch-6.18.34.xz 2069872 BLAKE2B 68f7f3983cb64862991c4233cce6e36cdef0508e169ca3787849e95033804db7f0ef5ef71aa8671ab1ac3b50b746332ae274f3533b95782ab134cb5b7fff4dcf SHA512 caeb17dc4f7654ef6d415ed081396d0ed06fd46bd713a659367903092da1e9d12f4a237d1d93776c8d73561bf76fc696d69a82289bd61982f785f97bfdae530f
+DIST patch-6.12.93.xz 4766528 BLAKE2B f4e1b308a6985dbfbd1f9752a40282b9e5a546784a5c664cd8aa4bebdedd5846e927318acb76106c4bb405567d651ca432fb2d44cada44496ab66b2095bcfce2 SHA512 e4acfcd4b42184b6d1448744c27e098c6cac50c66d22c2ee153c3b0d72a0449ad15c04dda87e83d56876d16cff777bf2082e51b13842849f22cbc2499e45ad11
+DIST patch-6.18.35.xz 2147008 BLAKE2B d64c8a4af08545896599f61a526b85ee7d14c7f8397f6fbc61a16cf36b349e4d8e7e34be712b8ac64f0e4b57e1ca8783089759b8f2660ba0a88c1777cd0bf2c0 SHA512 e6ee5f39ac4205da637f1bce67eb96b59726a15ef3579ae3850ef73ecfbf6d24d4f622b3e74b04fd119f87cd8864152eba74a14fc753f716fec91f5e91015e96
 DIST patch-6.6.141.xz 6129028 BLAKE2B 6168b8ea17e747a840e12b7074550997e1f82a4dffb807639627ad204af2fa266fab60430cb0dd5cb4b614ee60cd9cfd6421cfc656367103c1e2aa9ebc1544d3 SHA512 69d481d206714fb1054cb8ab76b72bc07af72f0785b11530fb7f42bcf321bb2fcb699ac1cf2d0e55415689331acd4f0a68608547efec714f5079bf4e7a4cf161
 DIST patch-6.6.142.xz 6159816 BLAKE2B e2b9f7653dc558b6b71ca2f7d1c0a1c925e75944cf9bf3e1e3464c7fdf2e11163541a7f25c84d11c54b8646418e11d38bddacf2c3220dec0c5d9b224cf8fb4a9 SHA512 1f9efe7067e25e7492b8e8e56c9c7563c9abb951813a6c969c6673e549f661bd2b03db1eca8b2d6dff0cf67a04836dba303deb771ae10a3acd7d8584693c1855
-DIST patch-7.0.10.xz 599488 BLAKE2B 8f3450b8a1c62d5e400bb9c724299ee024a3cb0d2c8006d8d0be36955b64d995d29048a4d7f31e94c6dcf4226ac3a0e007848acb0154c270be906bbb41efd645 SHA512 076c369ec654ff69b701a5f7123d4d4309c48781407a23012e629b7fe7c1dd16d7cf6cc0f069534902eef2e27d394516ed36cb103716bf0bdeca5a4345e4b805
-DIST patch-7.0.11.xz 743496 BLAKE2B 0223bdf2f67a717370226ce0143dedf106d182b834f40db931d377c61614cf4fed0ae49dd4cd54df52d82b8180efe2b12f0bdd4737441633949f2ef7c31b8b1f SHA512 6e20f47171270b47774b1f62f96b81a498544894ccc3c027785c0aec6751ad7b55dc96bc0fcdc52ea7cad57a1501fc651d024a2ac51383e3d753b0dcaeafb76d
+DIST patch-7.0.12.xz 829224 BLAKE2B bb4155073f79dd05fc000d65321e3add753b8503207b1e2f38f6f10525b0e50b733e74a562ae0a1da2a3687db2af0bd5a296be33494e48b1373def59f13fe61f SHA512 73b7b77f955000b3c4ccc05d311ac16052454fe6e4eff6bd4bba9ad1978eea24901b8247c0344017d370053f8fa0f9e7bd1d9a387452283a60febeda54b3d0f4
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.12.92.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.12.92.ebuild
deleted file mode 100644
index 245306e421cd..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-6.12.92.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 2020-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KERNEL_IUSE_GENERIC_UKI=1
-
-inherit kernel-build toolchain-funcs verify-sig
-
-BASE_P=linux-${PV%.*}
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-# forked to git.gentoo.org:fork/fedora/kernel
-CONFIG_VER=6.12.41-gentoo
-GENTOO_CONFIG_P=gentoo-kernel-config-g19
-SHA256SUM_DATE=20260601
-
-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/${BASE_P}.tar.xz
-	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/patch-${PV}.xz
-	https://gitweb.gentoo.org/proj/dist-kernel/gentoo-kernel-config.git/snapshot/${GENTOO_CONFIG_P}.tar.bz2
-	https://gitweb.gentoo.org/fork/fedora/kernel.git/snapshot/kernel-${CONFIG_VER}.tar.bz2
-	verify-sig? (
-		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/sha256sums.asc
-			-> linux-$(ver_cut 1).x-sha256sums-${SHA256SUM_DATE}.asc
-	)
-"
-S=${WORKDIR}/${BASE_P}
-
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE="debug hardened"
-REQUIRED_USE="
-	arm? ( savedconfig )
-	hppa? ( savedconfig )
-	sparc? ( savedconfig )
-"
-
-BDEPEND="
-	debug? ( dev-util/pahole )
-	verify-sig? ( >=sec-keys/openpgp-keys-kernel-20250702 )
-"
-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
-"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/kernel.org.asc
-
-src_unpack() {
-	if use verify-sig; then
-		cd "${DISTDIR}" || die
-		verify-sig_verify_signed_checksums \
-			"linux-$(ver_cut 1).x-sha256sums-${SHA256SUM_DATE}.asc" \
-			sha256 "${BASE_P}.tar.xz patch-${PV}.xz"
-		cd "${WORKDIR}" || die
-	fi
-
-	default
-}
-
-src_prepare() {
-	eapply "${WORKDIR}/patch-${PV}"
-	default
-
-	local biendian=false
-
-	# prepare the default config
-	case ${ARCH} in
-		arm | hppa | loong | sparc)
-			> .config || die
-		;;
-		amd64)
-			cp "${WORKDIR}/kernel-${CONFIG_VER}/kernel-x86_64-fedora.config" .config || die
-			;;
-		arm64)
-			cp "${WORKDIR}/kernel-${CONFIG_VER}/kernel-aarch64-fedora.config" .config || die
-			biendian=true
-			;;
-		ppc)
-			# assume powermac/powerbook defconfig
-			# we still package.use.force savedconfig
-			cp "arch/powerpc/configs/pmac32_defconfig" .config || die
-			;;
-		ppc64)
-			cp "${WORKDIR}/kernel-${CONFIG_VER}/kernel-ppc64le-fedora.config" .config || die
-			biendian=true
-			;;
-		riscv)
-			cp "${WORKDIR}/kernel-${CONFIG_VER}/kernel-riscv64-fedora.config" .config || die
-			;;
-		x86)
-			cp "${WORKDIR}/kernel-${CONFIG_VER}/kernel-i686-fedora.config" .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_CONFIG_P}"
-
-	local merge_configs=(
-		"${T}"/version.config
-		"${dist_conf_path}"/base.config
-		"${dist_conf_path}"/6.12+.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"
-		"${dist_conf_path}/zboot.config"
-	)
-
-	kernel-build_merge_configs "${merge_configs[@]}"
-}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.12.91.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.12.93.ebuild
index 34d90ecc3946..4b1fce67dc06 100644
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-6.12.91.ebuild
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.12.93.ebuild
@@ -12,7 +12,7 @@ BASE_P=linux-${PV%.*}
 # forked to git.gentoo.org:fork/fedora/kernel
 CONFIG_VER=6.12.41-gentoo
 GENTOO_CONFIG_P=gentoo-kernel-config-g19
-SHA256SUM_DATE=20260523
+SHA256SUM_DATE=20260609
 
 DESCRIPTION="Linux kernel built from vanilla upstream sources"
 HOMEPAGE="
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.18.34.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.18.34.ebuild
deleted file mode 100644
index 139112ac7cc8..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-6.18.34.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 2020-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KERNEL_IUSE_GENERIC_UKI=1
-
-inherit kernel-build toolchain-funcs verify-sig
-
-BASE_P=linux-${PV%.*}
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-# forked to git.gentoo.org:fork/fedora/kernel
-CONFIG_VER=6.18.12-gentoo
-GENTOO_CONFIG_P=gentoo-kernel-config-g19
-SHA256SUM_DATE=20260601
-
-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/${BASE_P}.tar.xz
-	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/patch-${PV}.xz
-	https://gitweb.gentoo.org/proj/dist-kernel/gentoo-kernel-config.git/snapshot/${GENTOO_CONFIG_P}.tar.bz2
-	https://gitweb.gentoo.org/fork/fedora/kernel.git/snapshot/kernel-${CONFIG_VER}.tar.bz2
-	verify-sig? (
-		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/sha256sums.asc
-			-> linux-$(ver_cut 1).x-sha256sums-${SHA256SUM_DATE}.asc
-	)
-"
-S=${WORKDIR}/${BASE_P}
-
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="debug hardened"
-REQUIRED_USE="
-	arm? ( savedconfig )
-	hppa? ( savedconfig )
-	sparc? ( savedconfig )
-"
-
-BDEPEND="
-	debug? ( dev-util/pahole )
-	verify-sig? ( >=sec-keys/openpgp-keys-kernel-20250702 )
-"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}
-"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/kernel.org.asc
-
-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_unpack() {
-	if use verify-sig; then
-		cd "${DISTDIR}" || die
-		verify-sig_verify_signed_checksums \
-			"linux-$(ver_cut 1).x-sha256sums-${SHA256SUM_DATE}.asc" \
-			sha256 "${BASE_P}.tar.xz patch-${PV}.xz"
-		cd "${WORKDIR}" || die
-	fi
-
-	default
-}
-
-src_prepare() {
-	eapply "${WORKDIR}/patch-${PV}"
-	default
-
-	local biendian=false
-
-	# prepare the default config
-	case ${ARCH} in
-		arm | hppa | loong | sparc)
-			> .config || die
-		;;
-		amd64)
-			cp "${WORKDIR}/kernel-${CONFIG_VER}/kernel-x86_64-fedora.config" .config || die
-			;;
-		arm64)
-			cp "${WORKDIR}/kernel-${CONFIG_VER}/kernel-aarch64-fedora.config" .config || die
-			biendian=true
-			;;
-		ppc)
-			# assume powermac/powerbook defconfig
-			# we still package.use.force savedconfig
-			cp "arch/powerpc/configs/pmac32_defconfig" .config || die
-			;;
-		ppc64)
-			cp "${WORKDIR}/kernel-${CONFIG_VER}/kernel-ppc64le-fedora.config" .config || die
-			biendian=true
-			;;
-		riscv)
-			cp "${WORKDIR}/kernel-${CONFIG_VER}/kernel-riscv64-fedora.config" .config || die
-			;;
-		s390)
-			cp "${WORKDIR}/kernel-${CONFIG_VER}/kernel-s390x-fedora.config" .config || die
-			;;
-		x86)
-			cp "${WORKDIR}/kernel-${CONFIG_VER}/kernel-i686-fedora.config" .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_CONFIG_P}"
-
-	local merge_configs=(
-		"${T}"/version.config
-		"${dist_conf_path}"/base.config
-		"${dist_conf_path}"/6.12+.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"
-		"${dist_conf_path}/zboot.config"
-	)
-
-	kernel-build_merge_configs "${merge_configs[@]}"
-}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.18.33.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.18.35.ebuild
index 327c95c70684..311020b37c66 100644
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-6.18.33.ebuild
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.18.35.ebuild
@@ -12,7 +12,7 @@ BASE_P=linux-${PV%.*}
 # forked to git.gentoo.org:fork/fedora/kernel
 CONFIG_VER=6.18.12-gentoo
 GENTOO_CONFIG_P=gentoo-kernel-config-g19
-SHA256SUM_DATE=20260523
+SHA256SUM_DATE=20260609
 
 DESCRIPTION="Linux kernel built from vanilla upstream sources"
 HOMEPAGE="
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-7.0.11.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-7.0.11.ebuild
deleted file mode 100644
index 64f531b993a7..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-7.0.11.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 2020-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KERNEL_IUSE_GENERIC_UKI=1
-
-inherit kernel-build toolchain-funcs verify-sig
-
-BASE_P=linux-${PV%.*}
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-# forked to git.gentoo.org:fork/fedora/kernel
-CONFIG_VER=7.0.8-gentoo
-GENTOO_CONFIG_P=gentoo-kernel-config-g19
-SHA256SUM_DATE=20260601
-
-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/${BASE_P}.tar.xz
-	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/patch-${PV}.xz
-	https://gitweb.gentoo.org/proj/dist-kernel/gentoo-kernel-config.git/snapshot/${GENTOO_CONFIG_P}.tar.bz2
-	https://gitweb.gentoo.org/fork/fedora/kernel.git/snapshot/kernel-${CONFIG_VER}.tar.bz2
-	verify-sig? (
-		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/sha256sums.asc
-			-> linux-$(ver_cut 1).x-sha256sums-${SHA256SUM_DATE}.asc
-	)
-"
-S=${WORKDIR}/${BASE_P}
-
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="debug hardened"
-REQUIRED_USE="
-	arm? ( savedconfig )
-	hppa? ( savedconfig )
-	sparc? ( savedconfig )
-"
-
-BDEPEND="
-	debug? ( dev-util/pahole )
-	verify-sig? ( >=sec-keys/openpgp-keys-kernel-20250702 )
-"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}
-"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/kernel.org.asc
-
-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_unpack() {
-	if use verify-sig; then
-		cd "${DISTDIR}" || die
-		verify-sig_verify_signed_checksums \
-			"linux-$(ver_cut 1).x-sha256sums-${SHA256SUM_DATE}.asc" \
-			sha256 "${BASE_P}.tar.xz patch-${PV}.xz"
-		cd "${WORKDIR}" || die
-	fi
-
-	default
-}
-
-src_prepare() {
-	eapply "${WORKDIR}/patch-${PV}"
-	default
-
-	local biendian=false
-
-	# prepare the default config
-	case ${ARCH} in
-		arm | hppa | loong | sparc)
-			> .config || die
-		;;
-		amd64)
-			cp "${WORKDIR}/kernel-${CONFIG_VER}/kernel-x86_64-fedora.config" .config || die
-			;;
-		arm64)
-			cp "${WORKDIR}/kernel-${CONFIG_VER}/kernel-aarch64-fedora.config" .config || die
-			biendian=true
-			;;
-		ppc)
-			# assume powermac/powerbook defconfig
-			# we still package.use.force savedconfig
-			cp "arch/powerpc/configs/pmac32_defconfig" .config || die
-			;;
-		ppc64)
-			cp "${WORKDIR}/kernel-${CONFIG_VER}/kernel-ppc64le-fedora.config" .config || die
-			biendian=true
-			;;
-		riscv)
-			cp "${WORKDIR}/kernel-${CONFIG_VER}/kernel-riscv64-fedora.config" .config || die
-			;;
-		s390)
-			cp "${WORKDIR}/kernel-${CONFIG_VER}/kernel-s390x-fedora.config" .config || die
-			;;
-		x86)
-			cp "${WORKDIR}/kernel-${CONFIG_VER}/kernel-i686-fedora.config" .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_CONFIG_P}"
-
-	local merge_configs=(
-		"${T}"/version.config
-		"${dist_conf_path}"/base.config
-		"${dist_conf_path}"/6.12+.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"
-		"${dist_conf_path}/zboot.config"
-	)
-
-	kernel-build_merge_configs "${merge_configs[@]}"
-}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-7.0.10.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-7.0.12.ebuild
index 7988ebd4f3c7..7fa28e0dd3fc 100644
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-7.0.10.ebuild
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-7.0.12.ebuild
@@ -12,7 +12,10 @@ BASE_P=linux-${PV%.*}
 # forked to git.gentoo.org:fork/fedora/kernel
 CONFIG_VER=7.0.8-gentoo
 GENTOO_CONFIG_P=gentoo-kernel-config-g19
-SHA256SUM_DATE=20260523
+SHA256SUM_DATE=20260609
+# Debian kconfig commit from:
+# https://salsa.debian.org/kernel-team/linux/-/tree/debian/latest/debian/
+DEBIAN_COMMIT=bbe2e99bce4a7dffe34cf06303aec2fac49fbf56
 
 DESCRIPTION="Linux kernel built from vanilla upstream sources"
 HOMEPAGE="
@@ -24,6 +27,7 @@ SRC_URI+="
 	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/patch-${PV}.xz
 	https://gitweb.gentoo.org/proj/dist-kernel/gentoo-kernel-config.git/snapshot/${GENTOO_CONFIG_P}.tar.bz2
 	https://gitweb.gentoo.org/fork/fedora/kernel.git/snapshot/kernel-${CONFIG_VER}.tar.bz2
+	https://salsa.debian.org/kernel-team/linux/-/archive/${DEBIAN_COMMIT}/linux-${DEBIAN_COMMIT}.tar.bz2
 	verify-sig? (
 		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/sha256sums.asc
 			-> linux-$(ver_cut 1).x-sha256sums-${SHA256SUM_DATE}.asc
@@ -31,12 +35,11 @@ SRC_URI+="
 "
 S=${WORKDIR}/${BASE_P}
 
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="debug hardened"
 REQUIRED_USE="
-	arm? ( savedconfig )
 	hppa? ( savedconfig )
-	sparc? ( savedconfig )
+	mips? ( savedconfig )
 "
 
 BDEPEND="
@@ -75,9 +78,23 @@ src_prepare() {
 
 	# prepare the default config
 	case ${ARCH} in
-		arm | hppa | loong | sparc)
+		hppa | mips )
 			> .config || die
 		;;
+		alpha)
+			cp "${WORKDIR}/linux-${DEBIAN_COMMIT}/debian/config/config" .config || die
+			merge_configs+=(
+				"${WORKDIR}/linux-${DEBIAN_COMMIT}/debian/config/alpha/config" \
+				"${WORKDIR}/linux-${DEBIAN_COMMIT}/debian/config/alpha/config.alpha-smp"
+			)
+			;;
+		arm)
+			cp "${WORKDIR}/linux-${DEBIAN_COMMIT}/debian/config/config" .config || die
+			merge_configs+=(
+				"${WORKDIR}/linux-${DEBIAN_COMMIT}/debian/config/armhf/config" \
+				"${WORKDIR}/linux-${DEBIAN_COMMIT}/debian/config/armhf/config.armmp-lpae"
+			)
+			;;
 		amd64)
 			cp "${WORKDIR}/kernel-${CONFIG_VER}/kernel-x86_64-fedora.config" .config || die
 			;;
@@ -85,10 +102,23 @@ src_prepare() {
 			cp "${WORKDIR}/kernel-${CONFIG_VER}/kernel-aarch64-fedora.config" .config || die
 			biendian=true
 			;;
+		loong)
+			cp "${WORKDIR}/linux-${DEBIAN_COMMIT}/debian/config/config" .config || die
+			merge_configs+=(
+				"${WORKDIR}/linux-${DEBIAN_COMMIT}/debian/config/loong64/config"
+			)
+			;;
+		m68k)
+			cp "${WORKDIR}/linux-${DEBIAN_COMMIT}/debian/config/config" .config || die
+			merge_configs+=(
+				"${WORKDIR}/linux-${DEBIAN_COMMIT}/debian/config/m68k/config"
+			)
+			;;
 		ppc)
-			# assume powermac/powerbook defconfig
-			# we still package.use.force savedconfig
-			cp "arch/powerpc/configs/pmac32_defconfig" .config || die
+			cp "${WORKDIR}/linux-${DEBIAN_COMMIT}/debian/config/config" .config || die
+			merge_configs+=(
+				"${WORKDIR}/linux-${DEBIAN_COMMIT}/debian/config/powerpc/config.powerpc"
+			)
 			;;
 		ppc64)
 			cp "${WORKDIR}/kernel-${CONFIG_VER}/kernel-ppc64le-fedora.config" .config || die
@@ -100,6 +130,13 @@ src_prepare() {
 		s390)
 			cp "${WORKDIR}/kernel-${CONFIG_VER}/kernel-s390x-fedora.config" .config || die
 			;;
+		sparc)
+			cp "${WORKDIR}/linux-${DEBIAN_COMMIT}/debian/config/config" .config || die
+			merge_configs+=(
+				"${WORKDIR}/linux-${DEBIAN_COMMIT}/debian/config/sparc64/config.sparc64" \
+				"${WORKDIR}/linux-${DEBIAN_COMMIT}/debian/config/sparc64/config.sparc64-smp"
+			)
+			;;
 		x86)
 			cp "${WORKDIR}/kernel-${CONFIG_VER}/kernel-i686-fedora.config" .config || die
 			;;