Adding metadata

3 files changed, 26 insertions, 43 deletions

diff --git a/sys-kernel/gentoo-kernel-modprep/Manifest b/sys-kernel/gentoo-kernel-modprep/Manifest
index db529ad02f9f..8d95ba3ad3c6 100644
--- a/sys-kernel/gentoo-kernel-modprep/Manifest
+++ b/sys-kernel/gentoo-kernel-modprep/Manifest
@@ -1,15 +1,9 @@
-DIST gentoo-kernel-7.0.10_p1-1.amd64.gpkg.tar 355665920 BLAKE2B f0372e77beff551e04a1dc61000f2c3255e61cd654ea60013c72224391cda2df5802f7c20cfbfe3626fdf88c3f7bec504ddf0a95f997a56e8fafe50da97bf1bf SHA512 80501116b4e8e758ea2e9f87be3c18e2974185f78648438b71d9203ee9392a530c10f9408ba0369d80146ee613ab1dc365d1cb048d12c952a8231a1f4ee292c1
-DIST gentoo-kernel-7.0.10_p1-1.arm64.gpkg.tar 326768640 BLAKE2B 09bf961c3d14cd01c930bbc9b0efb76b763fb9c46df796600387a735cc8c341724678d56404ac28f85400ef4f6089f2346b20809e5ec50933ae8e86477ef487e SHA512 b8008c87e2819c190976891d685d1440d90a24659d93a97568bda98742ceedf0f27ad0c7fe4579f958013854c04f0dbbc1d7eca958bd4d955500213e279be6da
-DIST gentoo-kernel-7.0.10_p1-1.ppc64le.gpkg.tar 78673920 BLAKE2B 95a9d26f3dbdc0376fd6081e3014fec3e492fdc4e84ae0446d9f3d90791a14bb464eebcf7f3bf3e3cb704e89f611f433abaa40fca2d69b8389d968f4f08aff5a SHA512 56f48ffe7bf518d9045948717f77f04c3ba21a18afb794ee815be9dc15b44c9975ab621702caf8fac00e6b4440ccd1221f1a3eccb229739b94c4a7794b115a01
-DIST gentoo-kernel-7.0.10_p1-1.x86.gpkg.tar 85565440 BLAKE2B b2b27fae618f045b72cccfcb7ba0643a80fe00a47ab0ea21718b7e0b3368c7a0d545c2a9b9817f0f809e92d60c2796eb2a39491b67770064fbf5770a08d2a4cc SHA512 675e75aecf65326e3e82e1273018671ba9458928aa13953912a8b17d6648a1dc55b0a76e05d61ac29193352fb8283b790a611e1598522634e1213ca68b9cca20
-DIST gentoo-kernel-7.0.11-1.amd64.gpkg.tar 355624960 BLAKE2B e984cf56da0440e1f10dd659c32e41a6b42a10ef6f8f29cc55658b0dd3588af9572ae26a3054ca113fd053a905d6437f00cedcbca6a3d99d7c26b6f3df57a5ab SHA512 9cb87e8c654dd2575098fd4767297382d627b71725e87454cbe39e1cf9055d74a4d424c359d6823d275b9c0a73d3982458302de8c92127e74c2fb3aa4c73d781
-DIST gentoo-kernel-7.0.11-1.arm64.gpkg.tar 326860800 BLAKE2B 2fadb3ae0cc5f02ca923dd04288b11626244dafb9387471a0ec3c12158a8fc241939ef841259a40b2c06f928fd5e0ade5d868daff39a0f5d3b9515e72cc70127 SHA512 8cebae44f721b29b3c46f2e075e245846313ab24d97ed2d931f75f41bfaecd87a1192f7507dffd62de69fc5011e46fca77e87f61de92c375ec6ea666dd9b986d
-DIST gentoo-kernel-7.0.11-1.ppc64le.gpkg.tar 78673920 BLAKE2B 68838bf6725305ad402c668aed383686cbf1e98af4246aba970c37b4c03dec3fd53c3211d4fdf35d81f888aa945af144c57f63cb33d18ad1f7da9536cdb65ce3 SHA512 cb595fc627ccb41c624594a703e600ba8d93305a9098af1237d4974a717160e78e81820e4b1e0968eb58e912e8a7185103ff5b9dd18a3e29ef03cd86ab88410b
-DIST gentoo-kernel-7.0.11-1.x86.gpkg.tar 85534720 BLAKE2B 038efa202e2544a7b3b39c27fa2d1efc68be564214ec352908112fbb3a364dd722ef6d1cb89c69ff07d34afa011fc87bcf3e79e0b4ecea5dd28e75097ace540d SHA512 12b082e4170cf7a39de58da9968100e981acac68d9d2e319ad039b8310a9d2a027ee7b5ccba1f4ccd31636fe1b7e3b9f1e1625a3c89fd169933dfa30fc852d99
+DIST gentoo-kernel-7.0.12-1.amd64.gpkg.tar 355604480 BLAKE2B 9352700a48792dc64ff11f81e9c9fb27901cf54878957716cfd0d98e7a9c3978ae9e7b3bea9b5ca42af34a214b895102a4922385c0880696fbefc64d1e5b9621 SHA512 49077f18271233cbd57e1f3318a64eea1aebf003fd9afc1825af796c0d68be33dbf463277af4bbd853877920c34fc31be1351ea14b5df163a6cae576d8029e78
+DIST gentoo-kernel-7.0.12-1.arm64.gpkg.tar 326850560 BLAKE2B 169cd5df5af911d1da1dda53b7f2d1d9c8862cb40f9c655a385202d0dbd3359499364468e7ae087e917eb1a95868d05e91b8c7444a315ad88c31d304cab94c2d SHA512 215ea31a3ff452947fa8e396d929983df8a67f3e8f3f23a2c03cb27a345446485c0dcc7686ea5e43d6acc37f238bfd0887de26f61793c73ace0e402d4ef3bb90
+DIST gentoo-kernel-7.0.12-1.ppc64le.gpkg.tar 78663680 BLAKE2B 5ba2b7fbcff4ecf717534bdbf83a4c6db5d698dee69bd79d2436127a23d4c91f61498be94b3369a5b74694ed7f125216e823fcd5edfca7aa73e04722f708bec8 SHA512 8afaf3401cfb4f694e7eed06c873ddc51313f4789107bb8a28c027082ee4f7e8df37c8931549ac2607486f8f3d66fb59d84483534b837bf0a9f73921167fe743
+DIST gentoo-kernel-7.0.12-1.x86.gpkg.tar 85555200 BLAKE2B ad9fd7d11b9966e5a4470ef585b4e7cf3ed636a11953ccac538d5adc285b5e6dafa21ad2d0325b251cd0fdcb555ebf517251df757120f6d656d9a39bfd17bc3d SHA512 15ceb2aff05cba13492929189fcd03dd17cd411bedfc65e80fb4ba2b6d66517b294242ed50a9a196b6b806ecc2032e0c9a0fae2190944540d936575dafd57f82
+DIST gentoo-kernel-modprep-7.0.12.tar.xz 10081604 BLAKE2B 99202299290b1f4bd66282d4ef9b0ed2202b5aaf028065992987d973b8c3349365c104b81225ebeaf310d0997739c1defbcf38e58991d1f13ab520f94a2a3c1e SHA512 fe579542d3b7055195632f5798943222a1e3e2d0351491f526c4fe842cbfabe3473da95d9d95f4273d75724f60ecd6f6acc3a8ee5549a876cb81625803ae3164
 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-gentoo-patches-7.0.10_p1.tar.xz 13496 BLAKE2B a7e15fce5c789f0f5c4d849c08558e307687a5b89a8ac98849be5adb2c9dc6bafe0d70a4e61d49bce1c6e138d4b28d2ff00943f3b317a3797298f3b7d6ab19f6 SHA512 bb3c7731cca8e0cb7736b93e6931b130a2049366f230fd5463ef7d7cdf6a180312e35c72a834c280263107b43629c40eaf016fee9c0215cde73a7cbe0b32fd57
-DIST linux-gentoo-patches-7.0.11.tar.xz 10608 BLAKE2B 143c3283884af0bec211e42fad24ce61a682250bc63c03582f021bce9da93d81007aaab52864a37239ad7b7ce0f96951f71294b00f8bfe9878f230ac4796ab8d SHA512 0ca27aead4bbbff37fcc84d7a7dac4db8a641485514fb74a6b257fcab1d1bdd1240fdaeec2ac8f924786f9d1ceaf868e38daf16d4bdcc0939877e239d0953750
-DIST patch-7.0.10.xz 599488 BLAKE2B 8f3450b8a1c62d5e400bb9c724299ee024a3cb0d2c8006d8d0be36955b64d995d29048a4d7f31e94c6dcf4226ac3a0e007848acb0154c270be906bbb41efd645 SHA512 076c369ec654ff69b701a5f7123d4d4309c48781407a23012e629b7fe7c1dd16d7cf6cc0f069534902eef2e27d394516ed36cb103716bf0bdeca5a4345e4b805
-DIST patch-7.0.11.xz 743496 BLAKE2B 0223bdf2f67a717370226ce0143dedf106d182b834f40db931d377c61614cf4fed0ae49dd4cd54df52d82b8180efe2b12f0bdd4737441633949f2ef7c31b8b1f SHA512 6e20f47171270b47774b1f62f96b81a498544894ccc3c027785c0aec6751ad7b55dc96bc0fcdc52ea7cad57a1501fc651d024a2ac51383e3d753b0dcaeafb76d
+DIST linux-7.x-sha256sums-20260609.asc 5215 BLAKE2B 3eb3d30758962246f065f84f359f14f9b40d9d369883327f946ad2473533ef6252bce58242cb7703914bfaea9693fdc725c562cb5c0ed7f981b29afe3a7bb82f SHA512 50cf6027a1a05c691f8192f71fb6d42d1902d8332ca0a592c8186950295d52e2bb0afe16896861a641ff1817ee681391496b9dbe2d1032c435e480dd72d88b36
+DIST linux-gentoo-patches-7.0.12.tar.xz 12192 BLAKE2B 497a58611eae18e004358de9619a41d3d5905cc601d4a12d669b3ea894db142df45df370e1dcb20c46c9ac4e7379aff6bb3884463856b7868636f0fdfafcd556 SHA512 09dec958f7af9b0b59d396e8668e3d51087c8526ac8fc81598006266b1eb32866c1890abaebcd13e8b6eb434dffc9eb2bf0073609f250247b2bf3c58b246f152
+DIST patch-7.0.12.xz 829224 BLAKE2B bb4155073f79dd05fc000d65321e3add753b8503207b1e2f38f6f10525b0e50b733e74a562ae0a1da2a3687db2af0bd5a296be33494e48b1373def59f13fe61f SHA512 73b7b77f955000b3c4ccc05d311ac16052454fe6e4eff6bd4bba9ad1978eea24901b8247c0344017d370053f8fa0f9e7bd1d9a387452283a60febeda54b3d0f4
diff --git a/sys-kernel/gentoo-kernel-modprep/gentoo-kernel-modprep-7.0.11.ebuild b/sys-kernel/gentoo-kernel-modprep/gentoo-kernel-modprep-7.0.12-r1.ebuild
index cc045b12cc89..c3e564edc324 100644
--- a/sys-kernel/gentoo-kernel-modprep/gentoo-kernel-modprep-7.0.11.ebuild
+++ b/sys-kernel/gentoo-kernel-modprep/gentoo-kernel-modprep-7.0.12-r1.ebuild
@@ -3,13 +3,12 @@
 
 EAPI=8
 
-inherit dist-kernel-utils toolchain-funcs unpacker verify-sig
+inherit dist-kernel-utils toolchain-funcs verify-sig
 
 BASE_P=linux-${PV%.*}
 PATCH_PV=${PV%_p*}
 PATCHSET=linux-gentoo-patches-${PV}
-BINPKG=gentoo-kernel-${PV}-1
-SHA256SUM_DATE=20260601
+SHA256SUM_DATE=20260609
 
 DESCRIPTION="Minimal subset of gentoo-kernel-bin for building modules, for containers"
 HOMEPAGE="
@@ -20,22 +19,11 @@ 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-${PATCH_PV}.xz
 	https://distfiles.gentoo.org/pub/proj/dist-kernel/patchsets/$(ver_cut 1-2)/${PATCHSET}.tar.xz
+	https://distfiles.gentoo.org/pub/proj/dist-kernel/binpkg/modprep/$(ver_cut 1-2)/${P}.tar.xz
 	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
 	)
-	amd64? (
-		https://distfiles.gentoo.org/pub/proj/dist-kernel/binpkg/amd64/$(ver_cut 1-2)/${BINPKG}.amd64.gpkg.tar
-	)
-	arm64? (
-		https://distfiles.gentoo.org/pub/proj/dist-kernel/binpkg/arm64/$(ver_cut 1-2)/${BINPKG}.arm64.gpkg.tar
-	)
-	ppc64? (
-		https://distfiles.gentoo.org/pub/proj/dist-kernel/binpkg/ppc64le/$(ver_cut 1-2)/${BINPKG}.ppc64le.gpkg.tar
-	)
-	x86? (
-		https://distfiles.gentoo.org/pub/proj/dist-kernel/binpkg/x86/$(ver_cut 1-2)/${BINPKG}.x86.gpkg.tar
-	)
 "
 S=${WORKDIR}
 
@@ -45,7 +33,6 @@ KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 
 RDEPEND="
 	virtual/libelf
-	!sys-kernel/gentoo-kernel:${SLOT}
 	!sys-kernel/gentoo-kernel-bin:${SLOT}
 "
 BDEPEND="
@@ -58,7 +45,7 @@ BDEPEND="
 	verify-sig? ( >=sec-keys/openpgp-keys-kernel-20250702 )
 "
 
-KV_LOCALVERSION='-gentoo-dist'
+KV_LOCALVERSION='-gentoo-dist-bin'
 KV_FULL=${PV/_p/-p}${KV_LOCALVERSION}
 
 VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/kernel.org.asc
@@ -72,7 +59,10 @@ src_unpack() {
 		cd "${WORKDIR}" || die
 	fi
 
-	unpacker
+	unpack "${BASE_P}.tar.xz" "patch-${PATCH_PV}.xz" "${PATCHSET}.tar.xz"
+	local pkg_arch=${ARCH}
+	[[ ${ARCH} == ppc64 ]] && pkg_arch=ppc64le
+	tar -x -f "${DISTDIR}/${P}.tar.xz" "${P}/${pkg_arch}" || die
 }
 
 src_prepare() {
@@ -127,7 +117,7 @@ src_configure() {
 		O="${WORKDIR}"/modprep
 	)
 
-	local kernel_dir="${BINPKG}/image/usr/src/linux-${KV_FULL}"
+	local kernel_dir=( "${P}"/*/usr/src/"linux-${KV_FULL}" )
 
 	mkdir modprep || die
 	cp "${kernel_dir}/.config" modprep/ || die
@@ -136,15 +126,12 @@ src_configure() {
 
 src_install() {
 	local rel_kernel_dir=/usr/src/linux-${KV_FULL}
-	local kernel_dir="${BINPKG}/image${rel_kernel_dir}"
+	local pkg_dir=( "${P}"/* )
+	local kernel_dir="${pkg_dir}/usr/src/linux-${KV_FULL}"
 	local image="${kernel_dir}/$(dist-kernel_get_image_path)"
 	local uki="${image%/*}/uki.efi"
 
-	# Remove unnecessary files and move lib
-	find "${BINPKG}"/image/lib -name '*.ko' -delete || die
-	mv "${BINPKG}"/image/lib "${ED}"/ || die
-
-	# TODO: repack these
+	mv "${pkg_dir}"/lib "${ED}"/ || die
 	cd "${kernel_dir}" || die
 	insinto "${rel_kernel_dir}"
 	doins System.map Module.symvers
@@ -157,8 +144,11 @@ src_install() {
 	# Add the identifier
 	echo "${CATEGORY}/${PF}:${SLOT}" > "${ED}${rel_kernel_dir}/dist-kernel" || die
 
-	# remove everything but Makefile* and Kconfig*
 	cd "${WORKDIR}/${BASE_P}" || die
+	insinto "${rel_kernel_dir}"
+	doins -r include
+
+	# remove everything but Makefile* and Kconfig*
 	find -type f '!' '(' -name 'Makefile*' -o -name 'Kconfig*' ')' \
 		-delete || die
 	find -type l -delete || die
diff --git a/sys-kernel/gentoo-kernel-modprep/gentoo-kernel-modprep-7.0.10_p1.ebuild b/sys-kernel/gentoo-kernel-modprep/gentoo-kernel-modprep-7.0.12.ebuild
index c790665436ee..3d8640f2089a 100644
--- a/sys-kernel/gentoo-kernel-modprep/gentoo-kernel-modprep-7.0.10_p1.ebuild
+++ b/sys-kernel/gentoo-kernel-modprep/gentoo-kernel-modprep-7.0.12.ebuild
@@ -9,7 +9,7 @@ BASE_P=linux-${PV%.*}
 PATCH_PV=${PV%_p*}
 PATCHSET=linux-gentoo-patches-${PV}
 BINPKG=gentoo-kernel-${PV}-1
-SHA256SUM_DATE=20260523
+SHA256SUM_DATE=20260609
 
 DESCRIPTION="Minimal subset of gentoo-kernel-bin for building modules, for containers"
 HOMEPAGE="
@@ -45,7 +45,6 @@ KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 
 RDEPEND="
 	virtual/libelf
-	!sys-kernel/gentoo-kernel:${SLOT}
 	!sys-kernel/gentoo-kernel-bin:${SLOT}
 "
 BDEPEND="
@@ -58,7 +57,7 @@ BDEPEND="
 	verify-sig? ( >=sec-keys/openpgp-keys-kernel-20250702 )
 "
 
-KV_LOCALVERSION='-gentoo-dist'
+KV_LOCALVERSION='-gentoo-dist-bin'
 KV_FULL=${PV/_p/-p}${KV_LOCALVERSION}
 
 VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/kernel.org.asc