gentoo auto-resync : 23:05:2024 - 00:06:39

9 files changed, 418 insertions, 156 deletions

diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index b7c6271b62b3..f793ebefe886 100644
--- a/sys-kernel/Manifest.gz
+++ b/sys-kernel/Manifest.gz
diff --git a/sys-kernel/asahi-sources/Manifest b/sys-kernel/asahi-sources/Manifest
index 292b2a903ddf..0adc553f93f7 100644
--- a/sys-kernel/asahi-sources/Manifest
+++ b/sys-kernel/asahi-sources/Manifest
@@ -5,12 +5,10 @@ AUX asahi-sources-6.6.0_p16-enable-speakers-stage2.patch 1609 BLAKE2B eb51b5aeca
 DIST genpatches-6.8-12.base.tar.xz 687664 BLAKE2B 3c27ee511c258f3659d7f8cd5b6d470ffa10a2fc95bd536b272e0bb20c368dfc8c512f23fdc025e85ad90d6f628a58c80d8d15ec0ef8898caf7461162cf2dec2 SHA512 cd845b49341366190834b9782c9ffa270608a35e616ff483b40094913f6d01809421b80a7830117b606e57e6bb0ed9b0ed6dc14220826364fc9d2ee6a5916ad6
 DIST genpatches-6.8-12.extras.tar.xz 3736 BLAKE2B 15a15ca3097dc42ac5855e59fe61c961854c1afa8adc719c761ac58bb7c869d3240c228b0963a91927a9bc0af6998b4c40e4d286faf7d2defc2f21029d11c114 SHA512 4f1c8c07e81c0d1ed110bd4512d2a16c3e202c47d8ab6bedf5213cf6c2f8675e9b543e52dbce50fbbf550d88252e2c1c19c2465ddd7907f11a2979fa92466a7c
 DIST linux-6.8.tar.xz 142502100 BLAKE2B c6f17f816cea16e629f63e9379b98888713f57b2c5173306926471f139a9d612a0c74e119341f8075390e55e203d787d9edeb4ad5a064b18870f6f0f7ffaafb2 SHA512 5c4eb4aa1d3f7d1ea01c0f7ddeadacdece6e144fd4bdfc16b2b925d3e10dc04de3a6db69320b79a96c3560052616f001d2c09e7a1bb4f7b731e2380a7ecce068
-DIST linux-asahi-6.8.8-2.tar.gz 235265018 BLAKE2B cf543955971865d65c048b7021a8bf4d9711294afd49e4ce31bf3e4761dea8724950a52a7b6b852645760e0abb1ca2abe1ac6c3feafbcb933a53e56dcc4044e4 SHA512 101566de3777517d151effcdd2e38b6a5d5961754734cdabfae7c359bbf0f35e2c7a4ecb912d4c300adb3f09ecaa31eafaf076d849171e0e5244ec29a0bf30a4
 DIST linux-asahi-6.8.9-3.tar.gz 235275610 BLAKE2B 8ee3ff2572a02851d66239c65187312a0f67aa492d9c3b3a734e291b250acbf9450960c745687ff98a339e4cc14a2eab7675c08d39f88de0c0aa7c320d20bdc8 SHA512 ebd854b357a1d0a7663129f48956da559bc23a4347836dd0c3a3eb8cd47013ed86d83711dc2b7a221c28f51bd0c42c0b1ea2302ef45ee4a2ddfbfacf33e6efc2
-DIST linux-asahi-6.8.9-5.tar.gz 235264452 BLAKE2B 5a08d3df1d0e1fc274a68f29ab592c790421d58dafa5533b7f526f13c5046d668e0c864b9a71f2c5b736a1890a65ba0877694b11bbde9acf5ff873f7a8a5a167 SHA512 e592959bfd546588df26bcec6b6de86dc3450d6ae89b073b272dd41b9927a7c2b09b9f8ff77b3cc80393b65821062eddabe351f177bfc1f732f11d685594412f
+DIST linux-asahi-6.8.9-6..asahi-6.8.9-7.patch 6483 BLAKE2B 7a50c83ce70f50f7ac27ca55406edae8941d271d89270eeb3c97fe446f14fb8fd07ef4f9aa3288af24ab8958aff0d250a6762edd87b7453592147216cb65e2f9 SHA512 7d26833d6ca717c48caec655fd78107367c67112b04181be781fb5746d8a00d7927198d67cdd22a4e57b131b0738125087972cd0ba7b0e7e16f04bb3d3301378
 DIST linux-asahi-6.8.9-6.patch 5163031 BLAKE2B de6411c7f6bb95fec4162648c89d6bf6be5e863d4647877c4cbbb9e4c8540b12b1dacd42c26a1d3561a36fe6c79650caf5e0481338764a10101cec53921043c7 SHA512 0cc24bf50c16cb6fc59bf9bd025babcdca081bc789da5791d0fd914c65d31342cc632998fe4a667296ee3ed067b311dc105e994e2a77d569bac3a8ed48fb5ecc
-EBUILD asahi-sources-6.8.8_p2.ebuild 2006 BLAKE2B d2d171d67b32a49b2d7f5ece2d401b2db5313234f4627d9a48472966beddc5e68864ab3a3dfe432248e0fcc3246c0ccd755ced7a9c417e989d95fce52973e842 SHA512 2953fa7747bc02df18301ebd5f159b4e49da25a7d2efa70029d3b4c00ed062ba8fd4632c29b976e482823c9b4f91d9c2320231330a5eba8adc04d5cc043da1b6
 EBUILD asahi-sources-6.8.9_p3.ebuild 2006 BLAKE2B d2d171d67b32a49b2d7f5ece2d401b2db5313234f4627d9a48472966beddc5e68864ab3a3dfe432248e0fcc3246c0ccd755ced7a9c417e989d95fce52973e842 SHA512 2953fa7747bc02df18301ebd5f159b4e49da25a7d2efa70029d3b4c00ed062ba8fd4632c29b976e482823c9b4f91d9c2320231330a5eba8adc04d5cc043da1b6
-EBUILD asahi-sources-6.8.9_p5.ebuild 2007 BLAKE2B bb3d2444c0f91b947e5b291de414e043c210cf74a40abaa7f303a7f711b6522b2819bfbd4be7f344a205ef5df06568bddd642dbfeae2d2f448ea0da351b41ed2 SHA512 3acac73ff517637cd471bac15da0e1c0f60792f69ae9550179de54854ce1899594ddf5ad036cc4b7bee3e4410472d64185e203c51d4dfa2d962ad9021c6d58f1
 EBUILD asahi-sources-6.8.9_p6.ebuild 1857 BLAKE2B b82b3d2159cc22bcf8758d690166b0059d6b3ceaec5fdf55c3f0b6a3111b00ca24e07452645585bc01e844e28baa81adea1b44b7223136346c6d0166ef7ca0f3 SHA512 af2256bd0b6e8dd24e8ac18de6f1f0d9c8240f1499caa80968f4a3fe45cb68ed3b82dc0b2996a5cf5f165c9e76d4cafa4e7b358d3c9679b3a9f8a218f45ce0c5
+EBUILD asahi-sources-6.8.9_p7.ebuild 2096 BLAKE2B dae5f47b023ec53259b1f93ca1b38f3f936177128b9a02655b8f5c1c994c3a14cab699477207a8286e74f784204649d2f5f2a555e2d682fa7c4466096173002a SHA512 92209bc607792dc4b72328f133a7d623229f6fd2c5fd72dc4165f7fbbe1f3328818860cf2a4f07dddc806bd02c8971c7f04033b43383fc2b49fd70aad8310bc2
 MISC metadata.xml 606 BLAKE2B 81abc1eb15c66fbc4b2039b161e0bc06e8c6ce5e58727fca8ef80778db4dd04bc48486479d795c91e6181cd4e3f974b3ff7e3f6479e98e8271ccf4bdfd22b02e SHA512 c5e3349ebbbd7d04a0ac261c93df705b34882a3ed2472f28d90ef902377f5a89d3b5454e94b7f40c39c5d1745aedbd1267a607c189ff09917e77f0ed78009395
diff --git a/sys-kernel/asahi-sources/asahi-sources-6.8.8_p2.ebuild b/sys-kernel/asahi-sources/asahi-sources-6.8.8_p2.ebuild
deleted file mode 100644
index ac1ab4ff4d6f..000000000000
--- a/sys-kernel/asahi-sources/asahi-sources-6.8.8_p2.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-K_SECURITY_UNSUPPORTED="1"
-ETYPE="sources"
-#K_WANT_GENPATCHES="base extras experimental"
-#K_GENPATCHES_VER="5"
-K_NODRYRUN="1"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-if [[ ${PV} != ${PV/_rc} ]] ; then
-	# $PV is expected to be of following form: 6.0_rc5_p1
-	MY_TAG="$(ver_cut 6)"
-	MY_P="asahi-$(ver_rs 2 - $(ver_cut 1-4))-${MY_TAG}"
-else
-	# $PV is expected to be of following form: 5.19.0_p1
-	MY_TAG="$(ver_cut 5)"
-	if [[ "$(ver_cut 3)" == "0" ]] ; then
-		MY_P="asahi-$(ver_cut 1-2)-${MY_TAG}"
-	else
-		MY_P="asahi-$(ver_cut 1-3)-${MY_TAG}"
-	fi
-fi
-
-DESCRIPTION="Asahi Linux kernel sources"
-HOMEPAGE="https://asahilinux.org"
-KERNEL_URI="https://github.com/AsahiLinux/linux/archive/refs/tags/${MY_P}.tar.gz -> linux-${MY_P}.tar.gz"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}
-"
-
-KEYWORDS="arm64"
-IUSE="rust"
-
-DEPEND="
-	${DEPEND}
-	rust? (
-		|| (
-			>=dev-lang/rust-bin-1.76[rust-src,rustfmt]
-			>=dev-lang/rust-1.76[rust-src,rustfmt]
-		)
-		dev-util/bindgen
-	)
-"
-
-PATCHES=(
-		"${FILESDIR}/asahi-sources-6.6.0_p16-enable-speakers-stage1.patch"
-		"${FILESDIR}/asahi-sources-6.6.0_p16-enable-speakers-stage2.patch"
-)
-
-src_unpack() {
-	unpack linux-${MY_P}.tar.gz
-	mv linux-${MY_P} linux-${KV_FULL} || die "Could not move source tree"
-}
-
-src_prepare() {
-	default
-	cd "${WORKDIR}/linux-${KV-FULL}" || die
-	# XXX: Genpatches do not yet work with Rust kernels
-	#handle_genpatches --set-unipatch-list
-	#[[ -n ${UNIPATCH_LIST} || -n ${UNIPATCH_LIST_GENPATCHES} || -n ${UNIPATCH_LIST_DEFAULT} ]] && \
-	#	unipatch "${UNIPATCH_LIST_DEFAULT} ${UNIPATCH_LIST_GENPATCHES} ${UNIPATCH_LIST}"
-	#unpack_fix_install_path
-	#env_setup_xmakeopts
-	echo "-${MY_TAG}" > localversion.10-pkgrel || die
-	cd "${S}" || die
-}
-
-pkg_postinst() {
-	einfo "For more information about Asahi Linux please visit ${HOMEPAGE},"
-	einfo "or consult the Wiki at https://github.com/AsahiLinux/docs/wiki."
-	kernel-2_pkg_postinst
-}
diff --git a/sys-kernel/asahi-sources/asahi-sources-6.8.9_p5.ebuild b/sys-kernel/asahi-sources/asahi-sources-6.8.9_p5.ebuild
deleted file mode 100644
index f975144c1b51..000000000000
--- a/sys-kernel/asahi-sources/asahi-sources-6.8.9_p5.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-K_SECURITY_UNSUPPORTED="1"
-ETYPE="sources"
-#K_WANT_GENPATCHES="base extras experimental"
-#K_GENPATCHES_VER="5"
-K_NODRYRUN="1"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-if [[ ${PV} != ${PV/_rc} ]] ; then
-	# $PV is expected to be of following form: 6.0_rc5_p1
-	MY_TAG="$(ver_cut 6)"
-	MY_P="asahi-$(ver_rs 2 - $(ver_cut 1-4))-${MY_TAG}"
-else
-	# $PV is expected to be of following form: 5.19.0_p1
-	MY_TAG="$(ver_cut 5)"
-	if [[ "$(ver_cut 3)" == "0" ]] ; then
-		MY_P="asahi-$(ver_cut 1-2)-${MY_TAG}"
-	else
-		MY_P="asahi-$(ver_cut 1-3)-${MY_TAG}"
-	fi
-fi
-
-DESCRIPTION="Asahi Linux kernel sources"
-HOMEPAGE="https://asahilinux.org"
-KERNEL_URI="https://github.com/AsahiLinux/linux/archive/refs/tags/${MY_P}.tar.gz -> linux-${MY_P}.tar.gz"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}
-"
-
-KEYWORDS="~arm64"
-IUSE="rust"
-
-DEPEND="
-	${DEPEND}
-	rust? (
-		|| (
-			>=dev-lang/rust-bin-1.76[rust-src,rustfmt]
-			>=dev-lang/rust-1.76[rust-src,rustfmt]
-		)
-		dev-util/bindgen
-	)
-"
-
-PATCHES=(
-		"${FILESDIR}/asahi-sources-6.6.0_p16-enable-speakers-stage1.patch"
-		"${FILESDIR}/asahi-sources-6.6.0_p16-enable-speakers-stage2.patch"
-)
-
-src_unpack() {
-	unpack linux-${MY_P}.tar.gz
-	mv linux-${MY_P} linux-${KV_FULL} || die "Could not move source tree"
-}
-
-src_prepare() {
-	default
-	cd "${WORKDIR}/linux-${KV-FULL}" || die
-	# XXX: Genpatches do not yet work with Rust kernels
-	#handle_genpatches --set-unipatch-list
-	#[[ -n ${UNIPATCH_LIST} || -n ${UNIPATCH_LIST_GENPATCHES} || -n ${UNIPATCH_LIST_DEFAULT} ]] && \
-	#	unipatch "${UNIPATCH_LIST_DEFAULT} ${UNIPATCH_LIST_GENPATCHES} ${UNIPATCH_LIST}"
-	#unpack_fix_install_path
-	#env_setup_xmakeopts
-	echo "-${MY_TAG}" > localversion.10-pkgrel || die
-	cd "${S}" || die
-}
-
-pkg_postinst() {
-	einfo "For more information about Asahi Linux please visit ${HOMEPAGE},"
-	einfo "or consult the Wiki at https://github.com/AsahiLinux/docs/wiki."
-	kernel-2_pkg_postinst
-}
diff --git a/sys-kernel/asahi-sources/asahi-sources-6.8.9_p7.ebuild b/sys-kernel/asahi-sources/asahi-sources-6.8.9_p7.ebuild
new file mode 100644
index 000000000000..2303feb47dc1
--- /dev/null
+++ b/sys-kernel/asahi-sources/asahi-sources-6.8.9_p7.ebuild
@@ -0,0 +1,82 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+ETYPE="sources"
+
+CKV="$(ver_cut 1-3)"
+K_SECURITY_UNSUPPORTED="1"
+K_WANT_GENPATCHES="base extras"
+K_GENPATCHES_VER="12"
+K_NODRYRUN="1"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+if [[ ${PV} != ${PV/_rc} ]] ; then
+	# $PV is expected to be of following form: 6.0_rc5_p1
+	MY_TAG="$(ver_cut 6)"
+	MY_BASE="$(ver_rs 2 - $(ver_cut 1-4))"
+else
+	# $PV is expected to be of following form: 5.19.0_p1
+	MY_TAG="$(ver_cut 5)"
+	if [[ "$(ver_cut 3)" == "0" ]] ; then
+		MY_BASE="$(ver_cut 1-2)"
+	else
+		MY_BASE="$(ver_cut 1-3)"
+	fi
+fi
+
+EXTRAVERSION="-asahi-${MY_TAG}"
+
+PREV_ASAHI_TAG="asahi-${MY_BASE}-6"
+ASAHI_TAG="asahi-${MY_BASE}-${MY_TAG}"
+
+DESCRIPTION="Asahi Linux kernel sources"
+HOMEPAGE="https://asahilinux.org"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}
+	https://github.com/AsahiLinux/linux/compare/v${MY_BASE}...${PREV_ASAHI_TAG}.patch
+		-> linux-${PREV_ASAHI_TAG}.patch
+	https://github.com/AsahiLinux/linux/compare/${PREV_ASAHI_TAG}...${ASAHI_TAG}.patch
+		-> linux-${PREV_ASAHI_TAG}..${ASAHI_TAG}.patch
+"
+KV_FULL="${PVR/_p/-asahi-}"
+S="${WORKDIR}/linux-${KV_FULL}"
+
+KEYWORDS="~arm64"
+IUSE="rust"
+
+DEPEND="
+	${DEPEND}
+	rust? (
+		|| (
+			>=dev-lang/rust-bin-1.76[rust-src,rustfmt]
+			>=dev-lang/rust-1.76[rust-src,rustfmt]
+		)
+		dev-util/bindgen
+	)
+"
+
+UNIPATCH_STRICTORDER="yes"
+UNIPATCH_LIST="
+	${FILESDIR}/asahi-6.8-config-gentoo-Drop-RANDSTRUCT-from-GENTOO_KERNEL_SEL.patch
+	${FILESDIR}/asahi-6.8.2_revert_spi_stable_asahi.patch
+	${DISTDIR}/linux-${PREV_ASAHI_TAG}.patch
+	${DISTDIR}/linux-${PREV_ASAHI_TAG}..${ASAHI_TAG}.patch
+	${FILESDIR}/asahi-sources-6.6.0_p16-enable-speakers-stage1.patch
+	${FILESDIR}/asahi-sources-6.6.0_p16-enable-speakers-stage2.patch
+"
+
+src_prepare() {
+	default
+
+	# remove asahi upstream set localversion, use EXTRAVERSION instead
+	rm localversion.05-asahi
+}
+
+pkg_postinst() {
+	einfo "For more information about Asahi Linux please visit ${HOMEPAGE},"
+	einfo "or consult the Wiki at https://github.com/AsahiLinux/docs/wiki."
+	kernel-2_pkg_postinst
+}
diff --git a/sys-kernel/genkernel/Manifest b/sys-kernel/genkernel/Manifest
index 1d7064b26845..195a188a8542 100644
--- a/sys-kernel/genkernel/Manifest
+++ b/sys-kernel/genkernel/Manifest
@@ -1,4 +1,6 @@
 AUX genkernel-4.3.12-mdadm-musl-fix.patch 292 BLAKE2B 2cf37842560efccef4fbffa92a91bc1ffd23efb80f81906b7cae0a3157a92029aed3ee888b5ceb8b87717a350928334769bc706ae2e6bbef4b355f1ce147f3f6 SHA512 8153419421104ad574860c75a95dcbb27cf0779a99ae5a8c86dbf86d5a37227f9dd66a5da920eca55d586d5919bc0384119fcd47334b1f92d48f1331a1db74a7
+AUX genkernel-4.3.15-fix-srcdir-for-new-bcache-tools.patch 1151 BLAKE2B f1a1d58049aed1fb6803675d1d0eebfa6fcf57751ef44079b2d56d6533e8eaa553ddd2431bc86db7e22aa909ffb73977a222d23729b206c7458b87c947f00152 SHA512 96c681e3f8ec4ea0a7460a6d190454fe668edf1112ae2e0bcfed02448e6fa59a3edc8db7b70ef5f0a8b51184c37eb0e085812d0e06fe760dc95108e9d9955290
+AUX genkernel-4.3.15-mdadm-musl-fix.patch 561 BLAKE2B 8555b3620d3f552292b291f9a216cc8ac449e799c2028d1bb86a17204c30e52d3493e8e78efa62c026e341615346f128e9ff4552b45791b7ae762789eee9869a SHA512 02d129c0bb037d9d335270046dd2b1dd05c2a59cdd3673f6231a147454d1410ff98f2fa18e398b81a5d4394ae2b9243c488889a692d7f5aa410fcac83df80873
 AUX genkernel-4.bash 2479 BLAKE2B e5504698ab49bb62623fcdfdd4a54b19ee6d88f96a682f08dc282e46ec26bd22d9c54bcdc9b2bdcc6a96295de1ab96351d35b304eb176f5d177c221cd8d82180 SHA512 6a5709a410c5c07b7a343ecc141aa72de73d3b4acd0a69c05c61c801835a59dd17d9a528f6b68f12ac00ff4b6e5954b03237472501383aa390eb1365dd69c281
 AUX initramfs.mounts 816 BLAKE2B 4f36e51fef78435369d43647db853c7bfde217cc93002fc010900692f67171512366e6599f08c5f2093490713aa7715e903b7e06528e3f2c6d8468f506938ed5 SHA512 97e5f92d135cff3911a68c7f1afd0f781ec1c1b794cdc824d74f8c119104ecb40bd7180be8414dc72f3a5a811143d6b4bf443ac1d3ff7a71b1e88cbf7c179665
 DIST LVM2.2.02.188.tgz 2421550 BLAKE2B bed90c8454cd4b20fdeec6dcbf5a9f97c9310671aea3b2252f8069cfa439fcb050f5ad95f928a7125a1734a4dc5ac985da99a4a570538e377a7205191a505476 SHA512 8c9db17c49dc8ebcab6c7f246ab85870a80658be811cf7f4d8f36abbebafa355b030bfc1e3bcbad73ccccb7fcd06d4a95ac547ca15d18d33715126da92703dca
@@ -23,6 +25,7 @@ DIST genkernel-4.3.10.tar.xz 484664 BLAKE2B ec1c44e633927c2c2fa12e22f428f6667ff5
 DIST genkernel-4.3.11.tar.xz 462644 BLAKE2B beb36fc021ecbc44ae206fdcbac2f10c3ecbd1531a327656f62a944b1519da760527408c4f49ae9eb798444c9bb38da50c93d55198e3d8b573fe3d4c6770b388 SHA512 1ca3ed6414ae92e993c06a0a97ecb372e129c9aed691a1b13240c7a0d05e6ea81637fbb6ac248b8d7cf6ff9bde84213f2eef0f3d50ff0648d5e31b5a41327a87
 DIST genkernel-4.3.12.tar.xz 463308 BLAKE2B 81bcc841110db63940f6bdbaf15016a877ee3099398dd983a8562e602eb0adbb03eebc8d6da7dd25da3549ff28d9cbbed00d569a00c63452ceaa9cdaf914ec5e SHA512 6b77aeede76c2e51f34d2ec0407215b27b32e268d8dac26ab4889be1891d1787d48cf804c1fe8c3cef5407442754078fec0af18ef7850c02d9306656715fca82
 DIST genkernel-4.3.14.tar.xz 469672 BLAKE2B 8ccc7b4b1ccda0771b4e701610e7be32980b6ee8348013ebc670a596a566463b848c4089b596ba1d0e7412abc0f854e05178b9a71227d947ad5a4baf2d3a65d6 SHA512 80cd67e62dc135baa6d3a947cdacef9261ce83003c94946708d924a5b0ee31f3bb5ccd54af48b7a8f4ca1cb525c5753e4aca56bc23844fb46a0a80d66a03acee
+DIST genkernel-4.3.15.tar.xz 470256 BLAKE2B 12ab3308e8ae8a4cf55d27c0b346ced820320a544e64ba4cb5ba49bb03f6a16dc0c3c0323aa0cc13cc1f296132be55059cb66e30df3d72d31eb22ee35d9d05f3 SHA512 ae7a9cb2e0b54f9878f6079f217754c395f2a15e2d19f74c4e53207bc60b1f3328ae563beaa7d67a6274f394f84802eb598b069a6833bd1f4f790a5bb646f30b
 DIST gnupg-1.4.23.tar.bz2 3749353 BLAKE2B ec5e6bef0c7bb2a65813d7852cebeaa24c4855f9d9d9e802070da50b89fff56b747682933aa766dd130f849efcfe28f7aa74f3153405429bcf3845ef29c6dd6e SHA512 78dc52a2010202a4afc8814b29fda657a6c9fe230d5e7db11ae040edd2b0ca819e1baa4dbd6c0d04d36cd353df484e83f52d17759d2891c2cf7025c0b5d36612
 DIST hwids-20210613.tar.gz 3867741 BLAKE2B 64c4b0a83058a2052f7b132241008a3cc75452e93a9a57a9159c357c23fd09ee256abc2b94e700b5d8e8bd4e231ae12932d2c2f32fb03853207739cb3387047d SHA512 4568f6b8c0ca80ec772bd2785d4dc169d1d13a721472a15399158d9a7f31abbe414c5c8cfdf1a3b81cce4e33742a4b6e005e97e3e907643d0afdc8e953624fea
 DIST json-c-0.13.1.tar.gz 639425 BLAKE2B 1da310309f9ce03306a9fd4a161670e460cf0b2222348df7c006902390f74a4cf100aab1ce6ac8a361a278dd917c114a278de5b3445817f3a40ae287478add46 SHA512 e984db2a42b9c95b52c798b2e8dd1b79951a8dcba27370af30c43b9549fbb00008dbcf052a535c528209aaee38e6d1f760168b706905ae72f3e704ed20f8a1a1
@@ -60,5 +63,6 @@ EBUILD genkernel-4.3.11.ebuild 9923 BLAKE2B 348edd038b7039f64fa779f9ef0451999686
 EBUILD genkernel-4.3.12-r1.ebuild 10002 BLAKE2B 8aeb3b114fe4b878aaac430d78bf000517e8c48a1910fa3380da4e301f0ecf9006ca6e062fd6709e836bf770ca9c5e67aaaa9933e212969953743a247ccad965 SHA512 ccd922ae16ce2cfefb1c0a10592b853e74f057095bfd900bdbe7b922d8b4e8ced1d9729f614d182f8f604bfa693f018641f30f7847d223cbab42311636bddbc3
 EBUILD genkernel-4.3.12.ebuild 9923 BLAKE2B 348edd038b7039f64fa779f9ef04519996866325ab44b376d6ec8a9e1cda1d9db16fa1a121079dcb5bfc9fb28d651fd56edcedcf3ce07f038c2cc43e1207f960 SHA512 194ba1252b41d3df9f7964407a566962e35c55ac525d445f388eb64ed96b1f9ca04fab8b0c99fa1aa5542d9b1da99977bf56fe233be07d2f50c2938251da5664
 EBUILD genkernel-4.3.14.ebuild 10002 BLAKE2B 8aeb3b114fe4b878aaac430d78bf000517e8c48a1910fa3380da4e301f0ecf9006ca6e062fd6709e836bf770ca9c5e67aaaa9933e212969953743a247ccad965 SHA512 ccd922ae16ce2cfefb1c0a10592b853e74f057095bfd900bdbe7b922d8b4e8ced1d9729f614d182f8f604bfa693f018641f30f7847d223cbab42311636bddbc3
+EBUILD genkernel-4.3.15.ebuild 10305 BLAKE2B 717361521d907f545831f4b10b98a593474afc070d6d179090b8cf57a086f28bd30fca4be8ef15cbbf58a97a22c8951db70202e7c1727e0fda23abbaff11090d SHA512 cfd46958f7254c9e9be989dee934245dd60781620a9e45ece67c00f1038c0823310e9c49e80d8b7d3a1a8d52ad0a9133eb94ebecd33881d161fe26fadf666631
 EBUILD genkernel-9999.ebuild 10169 BLAKE2B 987f4cc0db3026c13f3d166f2b93d561744f7eb111ebfd64233653b0955f7296788cddc06ecc8fb3748b5ab1b4d219ae528d5120b64276f6965a07083b13b587 SHA512 0e37384a8d710132998999dee3ac7383369b42b2bc76e66038d0a31b962db0ec9d8b9a87ca40147fd55a761310094d8b177eed7b19c1bb1a1fbc1429244710eb
 MISC metadata.xml 480 BLAKE2B 8b1b1655cb13d866985a92755b0696bef00841a7626cb6cd10f39d7a7ad196c1ec2f5895f86e23fc3ee1345c48d7c659346d2bc7bb2a2bdaa9c997511f002fd8 SHA512 5030d4505b077faec4e2eb9cb2dcc47195a1864057bcb5f110314bab97b90b1bdcd3f293f76116a23dd0e694c7c8ee66ed46d39c9b7b0c506b22fe23e86febc4
diff --git a/sys-kernel/genkernel/files/genkernel-4.3.15-fix-srcdir-for-new-bcache-tools.patch b/sys-kernel/genkernel/files/genkernel-4.3.15-fix-srcdir-for-new-bcache-tools.patch
new file mode 100644
index 000000000000..ba6eee2387dd
--- /dev/null
+++ b/sys-kernel/genkernel/files/genkernel-4.3.15-fix-srcdir-for-new-bcache-tools.patch
@@ -0,0 +1,26 @@
+From f973903cea8d161893b29b4fb4114561a6aa5674 Mon Sep 17 00:00:00 2001
+From: Ben Kohler <bkohler@gentoo.org>
+Date: Wed, 22 May 2024 10:14:32 -0500
+Subject: [PATCH] defaults/software.sh: fix srcdir for new bcache-tools
+
+Signed-off-by: Ben Kohler <bkohler@gentoo.org>
+---
+ defaults/software.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/defaults/software.sh b/defaults/software.sh
+index 01c504b..42004f3 100644
+--- a/defaults/software.sh
++++ b/defaults/software.sh
+@@ -13,7 +13,7 @@ GKPKG_BCACHE_TOOLS_PN="bcache-tools"
+ GKPKG_BCACHE_TOOLS_PV="${GKPKG_BCACHE_TOOLS_PV:-${VERSION_BCACHE_TOOLS}}"
+ GKPKG_BCACHE_TOOLS_DEPS="util-linux eudev"
+ GKPKG_BCACHE_TOOLS_SRCTAR="${GKPKG_BCACHE_TOOLS_SRCTAR:-${DISTDIR}/bcache-tools-${GKPKG_BCACHE_TOOLS_PV}.tar.gz}"
+-GKPKG_BCACHE_TOOLS_SRCDIR="${GKPKG_BCACHE_TOOLS_SRCDIR:-bcache-tools-399021549984ad27bf4a13ae85e458833fe003d7}"
++GKPKG_BCACHE_TOOLS_SRCDIR="${GKPKG_BCACHE_TOOLS_SRCDIR:-a5e3753516bd39c431def86c8dfec8a9cea1ddd4}"
+ GKPKG_BCACHE_TOOLS_BINPKG="${GKPKG_BCACHE_TOOLS_BINPKG:-%%CACHE%%/bcache-tools-${GKPKG_BCACHE_TOOLS_PV}-%%ARCH%%.tar.xz}"
+ 
+ GKPKG_BOOST_PN="boost"
+-- 
+2.45.1
+
diff --git a/sys-kernel/genkernel/files/genkernel-4.3.15-mdadm-musl-fix.patch b/sys-kernel/genkernel/files/genkernel-4.3.15-mdadm-musl-fix.patch
new file mode 100644
index 000000000000..74c1db168a5c
--- /dev/null
+++ b/sys-kernel/genkernel/files/genkernel-4.3.15-mdadm-musl-fix.patch
@@ -0,0 +1,22 @@
+commit fb29d87cc5dcfd6e3222f3bee63fc9e6a764fa3c
+Author: Ben Kohler <bkohler@gentoo.org>
+Date:   Wed May 22 09:47:29 2024 -0500
+
+    gkbuilds/mdadm-4.2: add missing musl fix
+    
+    Signed-off-by: Ben Kohler <bkohler@gentoo.org>
+
+diff --git a/gkbuilds/mdadm-4.2.gkbuild b/gkbuilds/mdadm-4.2.gkbuild
+index d996346..99bfb84 100644
+--- a/gkbuilds/mdadm-4.2.gkbuild
++++ b/gkbuilds/mdadm-4.2.gkbuild
+@@ -16,6 +16,9 @@ src_prepare() {
+ }
+ 
+ src_compile() {
++	# bug 907082
++	append-cppflags -D_LARGEFILE64_SOURCE
++
+ 	CXFLAGS="-DNO_LIBUDEV" gkmake V=1 mdadm mdmon
+ }
+ 
diff --git a/sys-kernel/genkernel/genkernel-4.3.15.ebuild b/sys-kernel/genkernel/genkernel-4.3.15.ebuild
new file mode 100644
index 000000000000..7492c67ec423
--- /dev/null
+++ b/sys-kernel/genkernel/genkernel-4.3.15.ebuild
@@ -0,0 +1,282 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# genkernel-9999        -> latest Git branch "master"
+# genkernel-VERSION     -> normal genkernel release
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit bash-completion-r1 python-single-r1
+
+# Whenever you bump a GKPKG, check if you have to move
+# or add new patches!
+VERSION_BCACHE_TOOLS="1.1_p20230217"
+# boost-1.84.0 needs dev-build/b2 packaged
+VERSION_BOOST="1.79.0"
+VERSION_BTRFS_PROGS="6.7.1"
+VERSION_BUSYBOX="1.36.1"
+VERSION_COREUTILS="9.4"
+VERSION_CRYPTSETUP="2.6.1"
+VERSION_DMRAID="1.0.0.rc16-3"
+VERSION_DROPBEAR="2022.83"
+VERSION_EUDEV="3.2.10"
+VERSION_EXPAT="2.5.0"
+VERSION_E2FSPROGS="1.47.0"
+VERSION_FUSE="2.9.9"
+# gnupg-2.x needs several new deps packaged
+VERSION_GPG="1.4.23"
+VERSION_HWIDS="20210613"
+# open-iscsi-2.1.9 static build not working yet
+VERSION_ISCSI="2.1.8"
+# json-c-0.17 needs gkbuild ported to meson
+VERSION_JSON_C="0.13.1"
+VERSION_KMOD="31"
+VERSION_LIBAIO="0.3.113"
+VERSION_LIBGCRYPT="1.10.3"
+VERSION_LIBGPGERROR="1.47"
+VERSION_LIBXCRYPT="4.4.36"
+VERSION_LVM="2.03.22"
+VERSION_LZO="2.10"
+VERSION_MDADM="4.2"
+VERSION_POPT="1.19"
+VERSION_STRACE="6.7"
+VERSION_THIN_PROVISIONING_TOOLS="0.9.0"
+# unionfs-fuse-3.4 needs fuse:3
+VERSION_UNIONFS_FUSE="2.0"
+VERSION_USERSPACE_RCU="0.14.0"
+VERSION_UTIL_LINUX="2.39.3"
+VERSION_XFSPROGS="6.4.0"
+VERSION_XZ="5.4.2"
+VERSION_ZLIB="1.3.1"
+VERSION_ZSTD="1.5.5"
+VERSION_KEYUTILS="1.6.3"
+
+COMMON_URI="
+	https://git.kernel.org/pub/scm/linux/kernel/git/colyli/bcache-tools.git/snapshot/a5e3753516bd39c431def86c8dfec8a9cea1ddd4.tar.gz -> bcache-tools-${VERSION_BCACHE_TOOLS}.tar.gz
+	https://boostorg.jfrog.io/artifactory/main/release/${VERSION_BOOST}/source/boost_${VERSION_BOOST//./_}.tar.bz2
+	https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${VERSION_BTRFS_PROGS}.tar.xz
+	https://www.busybox.net/downloads/busybox-${VERSION_BUSYBOX}.tar.bz2
+	mirror://gnu/coreutils/coreutils-${VERSION_COREUTILS}.tar.xz
+	https://www.kernel.org/pub/linux/utils/cryptsetup/v$(ver_cut 1-2 ${VERSION_CRYPTSETUP})/cryptsetup-${VERSION_CRYPTSETUP}.tar.xz
+	https://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-${VERSION_DMRAID}.tar.bz2
+	https://matt.ucc.asn.au/dropbear/releases/dropbear-${VERSION_DROPBEAR}.tar.bz2
+	https://dev.gentoo.org/~blueness/eudev/eudev-${VERSION_EUDEV}.tar.gz
+	https://github.com/libexpat/libexpat/releases/download/R_${VERSION_EXPAT//\./_}/expat-${VERSION_EXPAT}.tar.xz
+	https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v${VERSION_E2FSPROGS}/e2fsprogs-${VERSION_E2FSPROGS}.tar.xz
+	https://github.com/libfuse/libfuse/releases/download/fuse-${VERSION_FUSE}/fuse-${VERSION_FUSE}.tar.gz
+	mirror://gnupg/gnupg/gnupg-${VERSION_GPG}.tar.bz2
+	https://github.com/gentoo/hwids/archive/hwids-${VERSION_HWIDS}.tar.gz
+	https://github.com/open-iscsi/open-iscsi/archive/${VERSION_ISCSI}.tar.gz -> open-iscsi-${VERSION_ISCSI}.tar.gz
+	https://s3.amazonaws.com/json-c_releases/releases/json-c-${VERSION_JSON_C}.tar.gz
+	https://www.kernel.org/pub/linux/utils/kernel/kmod/kmod-${VERSION_KMOD}.tar.xz
+	https://releases.pagure.org/libaio/libaio-${VERSION_LIBAIO}.tar.gz
+	mirror://gnupg/libgcrypt/libgcrypt-${VERSION_LIBGCRYPT}.tar.bz2
+	mirror://gnupg/libgpg-error/libgpg-error-${VERSION_LIBGPGERROR}.tar.bz2
+	https://github.com/besser82/libxcrypt/releases/download/v${VERSION_LIBXCRYPT}/libxcrypt-${VERSION_LIBXCRYPT}.tar.xz
+	https://mirrors.kernel.org/sourceware/lvm2/LVM2.${VERSION_LVM}.tgz
+	https://www.oberhumer.com/opensource/lzo/download/lzo-${VERSION_LZO}.tar.gz
+	https://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-${VERSION_MDADM}.tar.xz
+	http://ftp.rpm.org/popt/releases/popt-1.x/popt-${VERSION_POPT}.tar.gz
+	https://github.com/strace/strace/releases/download/v${VERSION_STRACE}/strace-${VERSION_STRACE}.tar.xz
+	https://github.com/jthornber/thin-provisioning-tools/archive/v${VERSION_THIN_PROVISIONING_TOOLS}.tar.gz -> thin-provisioning-tools-${VERSION_THIN_PROVISIONING_TOOLS}.tar.gz
+	https://github.com/rpodgorny/unionfs-fuse/archive/v${VERSION_UNIONFS_FUSE}.tar.gz -> unionfs-fuse-${VERSION_UNIONFS_FUSE}.tar.gz
+	https://lttng.org/files/urcu/userspace-rcu-${VERSION_USERSPACE_RCU}.tar.bz2
+	https://www.kernel.org/pub/linux/utils/util-linux/v${VERSION_UTIL_LINUX:0:4}/util-linux-${VERSION_UTIL_LINUX}.tar.xz
+	https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/xfsprogs-${VERSION_XFSPROGS}.tar.xz
+	https://tukaani.org/xz/xz-${VERSION_XZ}.tar.gz
+	https://zlib.net/zlib-${VERSION_ZLIB}.tar.gz
+	https://github.com/facebook/zstd/archive/v${VERSION_ZSTD}.tar.gz -> zstd-${VERSION_ZSTD}.tar.gz
+	https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git/snapshot/keyutils-${VERSION_KEYUTILS}.tar.gz
+"
+
+if [[ ${PV} == 9999* ]] ; then
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${PN}.git"
+	inherit git-r3
+	S="${WORKDIR}/${P}"
+	SRC_URI="${COMMON_URI}"
+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"
+fi
+
+DESCRIPTION="Gentoo automatic kernel building scripts"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Genkernel https://gitweb.gentoo.org/proj/genkernel.git/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="ibm +firmware"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# Note:
+# We need sys-devel/* deps like autoconf or automake at _runtime_
+# because genkernel will usually build things like LVM2, cryptsetup,
+# mdadm... during initramfs generation which will require these
+# things.
+DEPEND="
+	app-text/asciidoc
+"
+RDEPEND="${PYTHON_DEPS}
+	app-alternatives/cpio
+	>=app-misc/pax-utils-1.2.2
+	app-portage/elt-patches
+	app-portage/portage-utils
+	dev-util/gperf
+	sys-apps/sandbox
+	dev-build/autoconf
+	dev-build/autoconf-archive
+	dev-build/automake
+	app-alternatives/bc
+	app-alternatives/yacc
+	app-alternatives/lex
+	dev-build/libtool
+	virtual/pkgconfig
+	elibc_glibc? ( sys-libs/glibc[static-libs(+)] )
+	firmware? ( sys-kernel/linux-firmware )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-srcdir-for-new-bcache-tools.patch
+)
+
+src_unpack() {
+	if [[ ${PV} == 9999* ]]; then
+		git-r3_src_unpack
+	else
+		local gk_src_file
+		for gk_src_file in ${A} ; do
+			if [[ ${gk_src_file} == genkernel-* ]] ; then
+				unpack "${gk_src_file}"
+			fi
+		done
+	fi
+}
+
+src_prepare() {
+	default
+
+	if [[ ${PV} == 9999* ]] ; then
+		einfo "Updating version tag"
+		GK_V="$(git describe --tags | sed 's:^v::')-git"
+		sed "/^GK_V/s,=.*,='${GK_V}',g" -i "${S}"/genkernel
+		einfo "Producing ChangeLog from Git history..."
+		pushd "${S}/.git" >/dev/null || die
+		git log > "${S}"/ChangeLog || die
+		popd >/dev/null || die
+	fi
+
+	# Export all the versions that may be used by genkernel build.
+	for v in $(set |awk -F= '/^VERSION_/{print $1}') ; do
+	export ${v}
+	done
+
+	if use ibm ; then
+		cp "${S}"/arch/ppc64/kernel-2.6{-pSeries,} || die
+	else
+		cp "${S}"/arch/ppc64/kernel-2.6{.g5,} || die
+	fi
+
+	use elibc_musl && eapply "${FILESDIR}"/genkernel-4.3.15-mdadm-musl-fix.patch
+}
+
+src_compile() {
+	emake PREFIX=/usr
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX=/usr install
+	dodoc AUTHORS ChangeLog README TODO
+
+	python_fix_shebang "${ED}"/usr/share/genkernel/path_expander.py
+
+	newbashcomp "${FILESDIR}"/genkernel-4.bash "${PN}"
+	insinto /etc
+	doins "${FILESDIR}"/initramfs.mounts
+
+	pushd "${DISTDIR}" &>/dev/null || die
+	insinto /usr/share/genkernel/distfiles
+	doins ${A/${P}.tar.xz/}
+	popd &>/dev/null || die
+}
+
+pkg_postinst() {
+	# Wiki is out of date
+	#echo
+	#elog 'Documentation is available in the genkernel manual page'
+	#elog 'as well as the following URL:'
+	#echo
+	#elog 'https://wiki.gentoo.org/wiki/Genkernel'
+	#echo
+
+	local replacing_version
+	for replacing_version in ${REPLACING_VERSIONS} ; do
+		if ver_test "${replacing_version}" -lt 4 ; then
+			# This is an upgrade which requires user review
+
+			ewarn ""
+			ewarn "Genkernel v4.x is a new major release which touches"
+			ewarn "nearly everything. Be careful, read updated manpage"
+			ewarn "and pay special attention to program output regarding"
+			ewarn "changed kernel command-line parameters!"
+
+			# Show this elog only once
+			break
+		fi
+	done
+
+	if [[ $(find /boot -name 'kernel-genkernel-*' 2>/dev/null | wc -l) -gt 0 ]] ; then
+		ewarn ''
+		ewarn 'Default kernel filename was changed from "kernel-genkernel-<ARCH>-<KV>"'
+		ewarn 'to "vmlinuz-<KV>". Please be aware that due to lexical ordering the'
+		ewarn '*default* boot entry in your boot manager could still point to last kernel'
+		ewarn 'built with genkernel before that name change, resulting in booting old'
+		ewarn 'kernel when not paying attention on boot.'
+	fi
+
+	# Show special warning for users depending on remote unlock capabilities
+	local gk_config="${EROOT}/etc/genkernel.conf"
+	if [[ -f "${gk_config}" ]] ; then
+		if grep -q -E "^SSH=[\"\']?yes" "${gk_config}" 2>/dev/null ; then
+			if ! grep -q dosshd /proc/cmdline 2>/dev/null ; then
+				ewarn ""
+				ewarn "IMPORTANT: SSH is currently enabled in your genkernel config"
+				ewarn "file (${gk_config}). However, 'dosshd' is missing from current"
+				ewarn "kernel command-line. You MUST add 'dosshd' to keep sshd enabled"
+				ewarn "in genkernel v4+ initramfs!"
+			fi
+		fi
+
+		if grep -q -E "^CMD_CALLBACK=.*emerge.*@module-rebuild" "${gk_config}" 2>/dev/null ; then
+			elog ""
+			elog "Please remove 'emerge @module-rebuild' from genkernel config"
+			elog "file (${gk_config}) and make use of new MODULEREBUILD option"
+			elog "instead."
+		fi
+	fi
+
+	local n_root_args=$(grep -o -- '\<root=' /proc/cmdline 2>/dev/null | wc -l)
+	if [[ ${n_root_args} -gt 1 ]] ; then
+		ewarn "WARNING: Multiple root arguments (root=) on kernel command-line detected!"
+		ewarn "If you are appending non-persistent device names to kernel command-line,"
+		ewarn "next reboot could fail in case running system and initramfs do not agree"
+		ewarn "on detected root device name!"
+	fi
+
+	if [[ -d /run ]] ; then
+		local permission_run_expected="drwxr-xr-x"
+		local permission_run=$(stat -c "%A" /run)
+		if [[ "${permission_run}" != "${permission_run_expected}" ]] ; then
+			ewarn "Found the following problematic permissions:"
+			ewarn ""
+			ewarn "    ${permission_run} /run"
+			ewarn ""
+			ewarn "Expected:"
+			ewarn ""
+			ewarn "    ${permission_run_expected} /run"
+			ewarn ""
+			ewarn "This is known to be causing problems for any UDEV-enabled service."
+		fi
+	fi
+}