gentoo auto-resync : 31:05:2023 - 09:23:01

21 files changed, 51 insertions, 911 deletions

diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 14774bb46fb2..b700bbefca3b 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/btrfs-progs/Manifest b/sys-fs/btrfs-progs/Manifest
index b380c6484e61..7c73b9f256a2 100644
--- a/sys-fs/btrfs-progs/Manifest
+++ b/sys-fs/btrfs-progs/Manifest
@@ -1,13 +1,9 @@
 AUX btrfs-progs-6.2.1-blake2-simd.patch 1056 BLAKE2B 3a5d967cb5a362cdd5abe993b3f1006b68898b14f0915c567bceb0de6ebf37d76f9fd323461ba9bbf4e61158b8bc1d176b2cf204c31958d420b9e94812b50936 SHA512 257035a4282138a5b32d99f07b50017983052a77c661ef5519b833652362c4c015aff8043062f09f87ebc71f09b616c851b66b905a3aa8c490e1dd5080bf496c
-DIST btrfs-progs-v6.1.3.tar.xz 2333984 BLAKE2B 71543f5be282a289fbc92f78b89b25e4162c3cbd2d3cf2e8564791f86c6f933f61c03ba93aeca029689be6284988ff35a47f25a6523f15be47f3e7ce9b5c0c4b SHA512 7c40d8bc3fcef0b2a7bf4be7d52923015b5b11c3f14bfc550ffa95a47d673f640b7deb840fee22fb7cc2743b6098fb12b5caea586fbf0972a1bc9a7606f3f375
 DIST btrfs-progs-v6.2.1.tar.xz 2415064 BLAKE2B 8ea7d9815e34c569dd82e53dc1f982c820265521708c7c41dc587646362b300edf938e940b52508e301874269ea5ebb96605f4a1046d096678257463ced53b03 SHA512 2a485d8c8b3091af27e91751cabe61306388526de3c1c51543708888ddee1bb26ebfe70c3b4cd6686b173d313c98c30168fee18723dadc7b4c00e10c502da169
 DIST btrfs-progs-v6.2.2.tar.xz 2437300 BLAKE2B b3d0de668baf771ff08c59d20407525be841b06747b771efc013b0c2d1d24ed03caf472b7c9b03499f60140f6f84e2edbcb690cba503a7eb8037af038de79d52 SHA512 967e1c1a6b956a4e11a794aad090d1cf370fd98e4186525ccfbbbc9ae3f2bb66ace1d684730f93c558403b7ac1c991aec3d04d07548b19ee1516352a069431db
 DIST btrfs-progs-v6.3.1.tar.xz 3155540 BLAKE2B 5f8ec51f11d705bb4ada2e000143933484bae2f3a5dedb5c1abac37950de44fa0fa762cc09012ca6702b96591264027b28c17392303db414a5651657cb086c7c SHA512 a567a02f565a44dd06f54b3fd03187d259235eedf8033457368add217c87b2304e8c80ca5e2a35bdffc14e43b6889361183c6dcd5e2f4ad6fe7bfc5eb4127e65
-DIST btrfs-progs-v6.3.tar.xz 2463228 BLAKE2B ba4fad5d912e71a4ceab4cef2846b340d56a3c9bd0d90c1e81c1d8bc6ed3ce6016d4e97a194c4501c3ba535c9ef1b77fa351b9716998278c47cf6fb3973a1f01 SHA512 826d9788f8e186146570c08eb9e032b4195afed16b1913385b7f06d7ef738ba1ae7c4d089ad77594fc9a34bd3385581f03b7c18be6eae4ced605c43e425f5406
-EBUILD btrfs-progs-6.1.3.ebuild 3522 BLAKE2B d25e101e6401ecd165ce200a58c84b8aed6071253a8af07856b657d48d05f63e3b5014d7e3ab75605679dacc2d88b60c8bc8fddcfda544ed86dde959dae25aaa SHA512 b6088fc730d875b53ea1e594bd7ed9931569ab71a1465856833455a1fdbf63073acb7eadcbb3952ed0a5329c8cf7ad5259988d6e674bc83d45a667caa9295cac
 EBUILD btrfs-progs-6.2.1.ebuild 3580 BLAKE2B e66421da8398d9b6856958d4c13ac3fd8271e9773987e13540dfbe1bc69a99780b2654d0b95842770bf1195792592afc19c949ab07786d4748d9ef06fb5e9d86 SHA512 174ab73eabf5af68987a3fd2f13a09d913d947150407cce8a4c6f9af4e2437bb5fe287acaf074cb19e7ecc8477aafa229b13195ba8a9d6674f1a7858b7d759fb
-EBUILD btrfs-progs-6.2.2.ebuild 3553 BLAKE2B a9a3dbcf35d320f5a4bff03a0956d056b1ab997b903bd544023c630e242d801896bd9d6c561693c44f57176a123a9191286ef29aafeb1eda4ae7d7e8f074c51f SHA512 b562bc54b02440f127558948ff3fdc46f0e705482729a76539904c72628e556bb818b25f991a8c7c38005878408b6c1a95a55d99c3c7c513be1862181db07050
+EBUILD btrfs-progs-6.2.2.ebuild 3549 BLAKE2B 07b592644c66be6951d2e4a4ca5ae9dd28c50475b1b57875d7da076abc5fd5d1820ee166fa5ef387c32e006e0dac8a3904ad8073dc1b7a5cc94116523eaefa86 SHA512 83917eae1cc4feff5a26ed5f9b0c0407069eeb65474ef1001dff189fc11533d82cbe675e4cc7e9d6c9b2583e6bd32a1e3142d0687c10abc82f399216937ad38e
 EBUILD btrfs-progs-6.3.1.ebuild 3553 BLAKE2B a9a3dbcf35d320f5a4bff03a0956d056b1ab997b903bd544023c630e242d801896bd9d6c561693c44f57176a123a9191286ef29aafeb1eda4ae7d7e8f074c51f SHA512 b562bc54b02440f127558948ff3fdc46f0e705482729a76539904c72628e556bb818b25f991a8c7c38005878408b6c1a95a55d99c3c7c513be1862181db07050
-EBUILD btrfs-progs-6.3.ebuild 3553 BLAKE2B a9a3dbcf35d320f5a4bff03a0956d056b1ab997b903bd544023c630e242d801896bd9d6c561693c44f57176a123a9191286ef29aafeb1eda4ae7d7e8f074c51f SHA512 b562bc54b02440f127558948ff3fdc46f0e705482729a76539904c72628e556bb818b25f991a8c7c38005878408b6c1a95a55d99c3c7c513be1862181db07050
 EBUILD btrfs-progs-9999.ebuild 3553 BLAKE2B a9a3dbcf35d320f5a4bff03a0956d056b1ab997b903bd544023c630e242d801896bd9d6c561693c44f57176a123a9191286ef29aafeb1eda4ae7d7e8f074c51f SHA512 b562bc54b02440f127558948ff3fdc46f0e705482729a76539904c72628e556bb818b25f991a8c7c38005878408b6c1a95a55d99c3c7c513be1862181db07050
 MISC metadata.xml 610 BLAKE2B 70361c4d5434a98f73a3d38ed47d7be830783529db6217396f2235cdedd58744fc6e52e4de1994d28184fe9d8aa5d2982c433d47eda1868cfdb79edf0769a620 SHA512 8958c02574adb1395a9d21d9e9ad5db38570b82a1c7211752eb007eecbd0e541e880a060649641f40be877f167e14f278f14d5ef8775766ef9a6fa5d3843dc53
diff --git a/sys-fs/btrfs-progs/btrfs-progs-6.1.3.ebuild b/sys-fs/btrfs-progs/btrfs-progs-6.1.3.ebuild
deleted file mode 100644
index fbe90fb73476..000000000000
--- a/sys-fs/btrfs-progs/btrfs-progs-6.1.3.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 2008-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit bash-completion-r1 python-single-r1 udev
-
-libbtrfs_soname=0
-
-if [[ ${PV} != 9999 ]]; then
-	MY_PV="v${PV/_/-}"
-	SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz"
-
-	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
-	fi
-
-	S="${WORKDIR}"/${PN}-${MY_PV}
-else
-	EGIT_REPO_URI="https://github.com/kdave/btrfs-progs.git"
-	EGIT_BRANCH="devel"
-	WANT_LIBTOOL="none"
-	inherit autotools git-r3
-fi
-
-DESCRIPTION="Btrfs filesystem utilities"
-HOMEPAGE="https://btrfs.wiki.kernel.org https://btrfs.readthedocs.io/en/latest/"
-
-LICENSE="GPL-2"
-SLOT="0/${libbtrfs_soname}"
-IUSE="+convert python +man reiserfs static static-libs udev +zstd"
-# Could support it with just !systemd => eudev, see mdadm, but let's
-# see if someone asks for it first.
-REQUIRED_USE="static? ( !udev )"
-
-# Tries to mount repaired filesystems
-RESTRICT="test"
-
-RDEPEND="
-	dev-libs/lzo:2=
-	sys-apps/util-linux:=[static-libs(+)?]
-	sys-libs/zlib:=
-	convert? (
-		sys-fs/e2fsprogs:=
-		reiserfs? (
-			>=sys-fs/reiserfsprogs-3.6.27
-		)
-	)
-	python? ( ${PYTHON_DEPS} )
-	udev? ( virtual/libudev:= )
-	zstd? ( app-arch/zstd:= )
-"
-DEPEND="${RDEPEND}
-	>=sys-kernel/linux-headers-5.10
-	convert? ( sys-apps/acl )
-	python? (
-		$(python_gen_cond_dep '
-			dev-python/setuptools[${PYTHON_USEDEP}]
-		')
-	)
-	static? (
-		dev-libs/lzo:2[static-libs(+)]
-		sys-apps/util-linux:0[static-libs(+)]
-		sys-libs/zlib:0[static-libs(+)]
-		convert? (
-			sys-fs/e2fsprogs[static-libs(+)]
-			reiserfs? (
-				>=sys-fs/reiserfsprogs-3.6.27[static-libs(+)]
-			)
-		)
-		zstd? ( app-arch/zstd[static-libs(+)] )
-	)
-"
-BDEPEND="virtual/pkgconfig
-	man? ( dev-python/sphinx )"
-
-if [[ ${PV} == 9999 ]]; then
-	BDEPEND+=" sys-devel/gnuconfig"
-fi
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	if [[ ${PV} == 9999 ]]; then
-		AT_M4DIR="m4" eautoreconf
-
-		mkdir config || die
-		local automakedir="$(autotools_run_tool --at-output automake --print-libdir)"
-		[[ -e ${automakedir} ]] || die "Could not locate automake directory"
-
-		ln -s "${automakedir}"/install-sh config/install-sh || die
-		ln -s "${BROOT}"/usr/share/gnuconfig/config.guess config/config.guess || die
-		ln -s "${BROOT}"/usr/share/gnuconfig/config.sub config/config.sub || die
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		--bindir="${EPREFIX}"/sbin
-
-		--enable-lzo
-		--disable-experimental
-		$(use_enable convert)
-		$(use_enable man documentation)
-		$(use_enable elibc_glibc backtrace)
-		$(use_enable python)
-		$(use_enable static-libs static)
-		$(use_enable udev libudev)
-		$(use_enable zstd)
-
-		# Could support libgcrypt, libsodium, libkcapi
-		--with-crypto=builtin
-		--with-convert=ext2$(usex reiserfs ',reiserfs' '')
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	emake V=1 all $(usev static)
-}
-
-src_test() {
-	default
-
-	if use python ; then
-		cd libbtrfsutil/python || die
-
-		local -x LD_LIBRARY_PATH="${S}:libbtrfsutil/python:${LD_LIBRARY_PATH}"
-		${EPYTHON} -m unittest tests/test_*.py || die
-	fi
-}
-
-src_install() {
-	local makeargs=(
-		$(usex python install_python '')
-		$(usex static install-static '')
-	)
-
-	emake V=1 DESTDIR="${D}" install "${makeargs[@]}"
-
-	newbashcomp btrfs-completion btrfs
-
-	use python && python_optimize
-}
-
-pkg_postinst() {
-	udev_reload
-}
-
-pkg_postrm() {
-	udev_reload
-}
diff --git a/sys-fs/btrfs-progs/btrfs-progs-6.2.2.ebuild b/sys-fs/btrfs-progs/btrfs-progs-6.2.2.ebuild
index c1f11dd5dd51..47e980208714 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-6.2.2.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-6.2.2.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} != 9999 ]]; then
 	SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz"
 
 	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+		KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ~mips ppc ~ppc64 ~riscv ~sparc x86"
 	fi
 
 	S="${WORKDIR}"/${PN}-${MY_PV}
diff --git a/sys-fs/btrfs-progs/btrfs-progs-6.3.ebuild b/sys-fs/btrfs-progs/btrfs-progs-6.3.ebuild
deleted file mode 100644
index c1f11dd5dd51..000000000000
--- a/sys-fs/btrfs-progs/btrfs-progs-6.3.ebuild
+++ /dev/null
@@ -1,164 +0,0 @@
-# Copyright 2008-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit bash-completion-r1 python-single-r1 udev
-
-libbtrfs_soname=0
-
-if [[ ${PV} != 9999 ]]; then
-	MY_PV="v${PV/_/-}"
-	SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz"
-
-	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
-	fi
-
-	S="${WORKDIR}"/${PN}-${MY_PV}
-else
-	EGIT_REPO_URI="https://github.com/kdave/btrfs-progs.git"
-	EGIT_BRANCH="devel"
-	WANT_LIBTOOL="none"
-	inherit autotools git-r3
-fi
-
-DESCRIPTION="Btrfs filesystem utilities"
-HOMEPAGE="https://btrfs.wiki.kernel.org https://btrfs.readthedocs.io/en/latest/"
-
-LICENSE="GPL-2"
-SLOT="0/${libbtrfs_soname}"
-IUSE="+convert python +man reiserfs static static-libs udev +zstd"
-# Could support it with just !systemd => eudev, see mdadm, but let's
-# see if someone asks for it first.
-REQUIRED_USE="static? ( !udev )"
-
-# Tries to mount repaired filesystems
-RESTRICT="test"
-
-RDEPEND="
-	dev-libs/lzo:2=
-	sys-apps/util-linux:=[static-libs(+)?]
-	sys-libs/zlib:=
-	convert? (
-		sys-fs/e2fsprogs:=
-		reiserfs? (
-			>=sys-fs/reiserfsprogs-3.6.27
-		)
-	)
-	python? ( ${PYTHON_DEPS} )
-	udev? ( virtual/libudev:= )
-	zstd? ( app-arch/zstd:= )
-"
-DEPEND="
-	${RDEPEND}
-	>=sys-kernel/linux-headers-5.10
-	convert? ( sys-apps/acl )
-	python? (
-		$(python_gen_cond_dep '
-			dev-python/setuptools[${PYTHON_USEDEP}]
-		')
-	)
-	static? (
-		dev-libs/lzo:2[static-libs(+)]
-		sys-apps/util-linux:0[static-libs(+)]
-		sys-libs/zlib:0[static-libs(+)]
-		convert? (
-			sys-fs/e2fsprogs[static-libs(+)]
-			reiserfs? (
-				>=sys-fs/reiserfsprogs-3.6.27[static-libs(+)]
-			)
-		)
-		zstd? ( app-arch/zstd[static-libs(+)] )
-	)
-"
-BDEPEND="
-	virtual/pkgconfig
-	man? ( dev-python/sphinx )
-"
-
-if [[ ${PV} == 9999 ]]; then
-	BDEPEND+=" sys-devel/gnuconfig"
-fi
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	if [[ ${PV} == 9999 ]]; then
-		AT_M4DIR="m4" eautoreconf
-
-		mkdir config || die
-		local automakedir="$(autotools_run_tool --at-output automake --print-libdir)"
-		[[ -e ${automakedir} ]] || die "Could not locate automake directory"
-
-		ln -s "${automakedir}"/install-sh config/install-sh || die
-		ln -s "${BROOT}"/usr/share/gnuconfig/config.guess config/config.guess || die
-		ln -s "${BROOT}"/usr/share/gnuconfig/config.sub config/config.sub || die
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		--bindir="${EPREFIX}"/sbin
-
-		--enable-lzo
-		--disable-experimental
-		$(use_enable convert)
-		$(use_enable man documentation)
-		$(use_enable elibc_glibc backtrace)
-		$(use_enable python)
-		$(use_enable static-libs static)
-		$(use_enable udev libudev)
-		$(use_enable zstd)
-
-		# Could support libgcrypt, libsodium, libkcapi
-		--with-crypto=builtin
-		--with-convert=ext2$(usex reiserfs ',reiserfs' '')
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	emake V=1 all $(usev static)
-}
-
-src_test() {
-	emake -j1 -C tests V=1 test
-
-	if use python ; then
-		cd libbtrfsutil/python || die
-
-		local -x LD_LIBRARY_PATH="${S}:libbtrfsutil/python:${LD_LIBRARY_PATH}"
-		${EPYTHON} -m unittest tests/test_*.py || die
-	fi
-}
-
-src_install() {
-	local makeargs=(
-		$(usex python install_python '')
-		$(usex static install-static '')
-	)
-
-	emake V=1 DESTDIR="${D}" install "${makeargs[@]}"
-
-	newbashcomp btrfs-completion btrfs
-
-	use python && python_optimize
-}
-
-pkg_postinst() {
-	udev_reload
-}
-
-pkg_postrm() {
-	udev_reload
-}
diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest
index e62fdd87e794..1a7a62af6637 100644
--- a/sys-fs/e2fsprogs/Manifest
+++ b/sys-fs/e2fsprogs/Manifest
@@ -6,9 +6,7 @@ AUX e2fsprogs-1.47.0-parallel-make.patch 3491 BLAKE2B b3848202f038cc86a07e784bfe
 DIST e2fsprogs-1.46.5.tar.xz 7040672 BLAKE2B 8d8c02e891c464782a7cff518c41d793fc73366b57e17d80ffc5afd96e6144e354290e667e9710509a9dde4e5dab7e7185c5bf084c5bfd26219f05e5e92e0830 SHA512 53282e1c524f62a95012b1aceef296d494f5238c82c9b08b29fbe6a803dbf7ccfdcd9124eb2f11fe2ff9de26387c78751a92c3217ca414f6db6242098a72d3fa
 DIST e2fsprogs-1.46.6.tar.xz 7051160 BLAKE2B 683274bf9468a3aaf41e542f22266482e75522b1fd2a255c6d852a28b08f027918d4f09239259d443a243c41eae49b3c27454f7d140da2c361c36a71ff77dcf6 SHA512 aca5ef77e36885ce9ce2995d9fae5d278c33e276e74f2a73977380f3e1cf1b3bd115fe6199e44a2f79a2827ba985b5554b8d898e88b7d04387fbba659a08e771
 DIST e2fsprogs-1.47.0.tar.xz 7059372 BLAKE2B 84f58b05a9f0e14e1a66c6e5171ff23b022f51c4e9a02d4d6d1d26c91909f3c7ec9c9f0462663a4457b4479043774502b8891f691e58a61f4ef6bf9ba33f33aa SHA512 0e6d64c565b455becb84166b6a5c7090724bac5cfe69098657a31bf0481b4e2cace3de1363121b7d84820fbae85b7c83ac5f2a2b02bb36280f0e3ae83a934cec
-EBUILD e2fsprogs-1.46.5-r3.ebuild 4401 BLAKE2B 925f540d8b21482abea0b9db6e4c9c0697df29a33b7cabe85159b8cd4354d7453be25b8056957e65ab9bda1f576cd786ff969843f4e23a3611f0101591507f08 SHA512 9f34a974b65c59722afac7328307b32e6bb8aea0cf605c4b0b8c1a78993e7e158211ed0f35d1cfa0b9f71937315243d935e6a930b12a5798e3876cd96023e0bf
 EBUILD e2fsprogs-1.46.5-r4.ebuild 4371 BLAKE2B 80744fbe4c68bef79dc3d2819469c05de76e45d304cee44305f46978f51a5d5c7c665ace9963301c300b207383753251b5ace19f3e1e217b957ff9ef382db366 SHA512 2aec21d9853f28a2d61fcea50105bea642531496c151bf4f25ecd83f4af2acc4f9ca0467ed949f435ef418030a5bbc385d1c8c4406eb9e81309b3382f15a93f6
 EBUILD e2fsprogs-1.46.6.ebuild 4385 BLAKE2B e47d2e171f330aa12c4317d58492d9c0840140d7763a4df87cbc43c2e23faf9472f40110c6d45d9536331591e6c4969f410c50d2932f7b065abadb76a2a76973 SHA512 0c50777260571930ae96350620d87babca84e16435742512edb97e6de0889cb9a3a0feab53fac149067d93d46e116ddc6df0c2b759bc54cc5389b79e2a1b7067
 EBUILD e2fsprogs-1.47.0-r1.ebuild 4646 BLAKE2B a5ce73412111b665fa2e89218976acb393a2c789158db6a19265187c9880486beb4ee622ca282668d9c5bc2e6e99d1473ca086863a39010d0f7b68f0cc42fa34 SHA512 701fdab69ec9bf460317cb33a20ed4ddc47048af8b6603122bd349615cc40e6deba437ec3da7807f9dc7126ffa75603f48f9bc7d961b0de8efc31f3c6e1e81a9
-EBUILD e2fsprogs-1.47.0.ebuild 4388 BLAKE2B 9bb01f1a115c379e156d8f092458125b98af5eba0d2ac4f0c1d179173c828b0ccc4c549508051907bf8b5fe1340b7941ef16acaf718efddb6aa3bba81bc971f8 SHA512 bd258e054cb11a4cea457e68715ca4f283c162f55f8d8a6ebce6ab86de679b2e2bdae14f09b055fca4285b123f134fe3436758ad8b4375b5dd041fd161773b7b
-MISC metadata.xml 781 BLAKE2B 966522db6501509fbe12c1f896e6f59ffcb2a9dc0980b6086213383894df169dfdadce5cc6c37de5016bb5e96db6565f937183c5e78fad1bb6c15d6c964aec92 SHA512 5d2a09fb1027344f3ed7c24afa49af06a26c5c813f49e8b5614ce629360d1b0252ad93a360d9bd189fa3aa6027b7afceea8ce9fb0fe67f57546d54c348fed74f
+MISC metadata.xml 715 BLAKE2B 7a5d2ea0cd9b404d7ac0916648edd979852fc477513f55ed887b2198ec14f78cc42e13c52f7851605e16a0ac1a717484f2cd7ac6f953dd5ceec18a9738eba2c1 SHA512 286aedab5c877c6b3de25bc4764bb92e1f95d41a996003f86cd5050a122eb59d1bd6f06a6a5e27ff42d404c14baa1e71cf450e7a3aaeecb17f6db067eebf1c3f
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.46.5-r3.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.46.5-r3.ebuild
deleted file mode 100644
index 09e9ee84888f..000000000000
--- a/sys-fs/e2fsprogs/e2fsprogs-1.46.5-r3.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic systemd toolchain-funcs udev usr-ldscript multilib-minimal
-
-DESCRIPTION="Standard EXT2/EXT3/EXT4 filesystem utilities"
-HOMEPAGE="http://e2fsprogs.sourceforge.net/"
-SRC_URI="https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2 BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="cron fuse lto nls static-libs test +threads +tools"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	!sys-libs/${PN}-libs
-	cron? ( sys-fs/lvm2[lvm] )
-	fuse? ( sys-fs/fuse:0 )
-	nls? ( virtual/libintl )
-	tools? ( sys-apps/util-linux )"
-# For testing lib/ext2fs, lib/support/libsupport.a is required, which
-# unconditionally includes '<blkid/blkid.h>' from sys-apps/util-linux.
-DEPEND="
-	${RDEPEND}
-	test? ( sys-apps/util-linux[${MULTILIB_USEDEP}] )"
-BDEPEND="
-	virtual/pkgconfig
-	sys-apps/texinfo
-	nls? ( sys-devel/gettext )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.42.13-fix-build-cflags.patch #516854
-
-	# Upstream patches (can usually removed with next version bump)
-	"${FILESDIR}"/${P}-parallel-make.patch
-)
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/ext2fs/ext2_types.h
-)
-
-src_prepare() {
-	default
-
-	cp doc/RelNotes/v${PV}.txt ChangeLog || die "Failed to copy Release Notes"
-
-	# Get rid of doc -- we don't use them. This also prevents a sandbox
-	# violation due to mktexfmt invocation
-	rm -r doc || die "Failed to remove doc dir"
-
-	# prevent included intl cruft from building #81096
-	sed -i -r \
-		-e 's:@LIBINTL@:@LTLIBINTL@:' \
-		MCONFIG.in || die 'intl cruft'
-}
-
-multilib_src_configure() {
-	# Keep the package from doing silly things #261411
-	export VARTEXFONTS="${T}/fonts"
-
-	# needs open64() prototypes and friends
-	append-cppflags -D_GNU_SOURCE
-
-	local myeconfargs=(
-		--with-root-prefix="${EPREFIX}"
-		$(use_with cron crond-dir "${EPREFIX}/etc/cron.d")
-		--with-systemd-unit-dir="$(systemd_get_systemunitdir)"
-		--with-udev-rules-dir="${EPREFIX}$(get_udevdir)/rules.d"
-		--enable-symlink-install
-		--enable-elf-shlibs
-		$(tc-has-tls || echo --disable-tls)
-		$(multilib_native_use_enable fuse fuse2fs)
-		$(use_enable nls)
-		$(multilib_native_use_enable tools e2initrd-helper)
-		--disable-fsck
-		--disable-uuidd
-		$(use_enable lto)
-		$(use_with threads pthread)
-	)
-
-	# we use blkid/uuid from util-linux now
-	if use kernel_linux ; then
-		export ac_cv_lib_{uuid_uuid_generate,blkid_blkid_get_cache}=yes
-		myeconfargs+=( --disable-lib{blkid,uuid} )
-	fi
-
-	ac_cv_path_LDCONFIG=: \
-		ECONF_SOURCE="${S}" \
-		CC="$(tc-getCC)" \
-		BUILD_CC="$(tc-getBUILD_CC)" \
-		BUILD_LD="$(tc-getBUILD_LD)" \
-		econf "${myeconfargs[@]}"
-
-	if grep -qs 'USE_INCLUDED_LIBINTL.*yes' config.{log,status} ; then
-		eerror "INTL sanity check failed, aborting build."
-		eerror "Please post your ${S}/config.log file as an"
-		eerror "attachment to https://bugs.gentoo.org/show_bug.cgi?id=81096"
-		die "Preventing included intl cruft from building"
-	fi
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi && use tools ; then
-		emake V=1
-	else
-		emake -C lib/et V=1
-		emake -C lib/ss V=1
-		emake -C lib/ext2fs V=1
-		emake -C lib/e2p V=1
-	fi
-}
-
-multilib_src_test() {
-	if multilib_is_native_abi && use tools ; then
-		emake V=1 check
-	else
-		# required by lib/ext2fs's check target
-		emake -C lib/support V=1
-
-		# For non-native, there's no binaries to test. Just libraries.
-		emake -C lib/et V=1 check
-		emake -C lib/ss V=1 check
-		emake -C lib/ext2fs V=1 check
-		emake -C lib/e2p V=1 check
-	fi
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi && use tools ; then
-		emake STRIP=':' V=1 DESTDIR="${D}" install
-	else
-		emake -C lib/et V=1 DESTDIR="${D}" install
-		emake -C lib/ss V=1 DESTDIR="${D}" install
-		emake -C lib/ext2fs V=1 DESTDIR="${D}" install
-		emake -C lib/e2p V=1 DESTDIR="${D}" install
-	fi
-
-	# Move shared libraries to /lib/, install static libraries to
-	# /usr/lib/, and install linker scripts to /usr/lib/.
-	gen_usr_ldscript -a com_err ss ext2fs e2p
-
-	# configure doesn't have an option to disable static libs :/
-	if ! use static-libs ; then
-		find "${ED}" -name '*.a' -delete || die
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	if use tools ; then
-		insinto /etc
-		doins "${FILESDIR}"/e2fsck.conf
-	fi
-}
-
-pkg_postinst() {
-	udev_reload
-}
-
-pkg_postrm() {
-	udev_reload
-}
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.47.0.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.47.0.ebuild
deleted file mode 100644
index 07ab6fecf136..000000000000
--- a/sys-fs/e2fsprogs/e2fsprogs-1.47.0.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic multilib-minimal systemd toolchain-funcs udev usr-ldscript
-
-DESCRIPTION="Standard EXT2/EXT3/EXT4 filesystem utilities"
-HOMEPAGE="http://e2fsprogs.sourceforge.net/"
-SRC_URI="https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2 BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="cron fuse nls static-libs test +tools"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	!sys-libs/${PN}-libs
-	cron? ( sys-fs/lvm2[lvm] )
-	fuse? ( sys-fs/fuse:0 )
-	nls? ( virtual/libintl )
-	tools? ( sys-apps/util-linux )
-"
-# For testing lib/ext2fs, lib/support/libsupport.a is required, which
-# unconditionally includes '<blkid/blkid.h>' from sys-apps/util-linux.
-DEPEND="
-	${RDEPEND}
-	test? ( sys-apps/util-linux[${MULTILIB_USEDEP}] )
-"
-BDEPEND="
-	sys-apps/texinfo
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/ext2fs/ext2_types.h
-)
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.42.13-fix-build-cflags.patch # bug #516854
-
-	# Upstream patches (can usually removed with next version bump)
-)
-
-src_prepare() {
-	default
-
-	cp doc/RelNotes/v${PV}.txt ChangeLog || die "Failed to copy Release Notes"
-
-	# Get rid of doc -- we don't use them. This also prevents a sandbox
-	# violation due to mktexfmt invocation
-	rm -r doc || die "Failed to remove doc dir"
-
-	# Prevent included intl cruft from building, bug #81096
-	sed -i -r \
-		-e 's:@LIBINTL@:@LTLIBINTL@:' \
-		MCONFIG.in || die 'intl cruft'
-}
-
-multilib_src_configure() {
-	# Keep the package from doing silly things, bug #261411
-	export VARTEXFONTS="${T}/fonts"
-
-	# Needs open64() prototypes and friends
-	append-cppflags -D_GNU_SOURCE
-
-	local myeconfargs=(
-		--with-root-prefix="${EPREFIX}"
-		$(use_with cron crond-dir "${EPREFIX}/etc/cron.d")
-		--with-systemd-unit-dir="$(systemd_get_systemunitdir)"
-		--with-udev-rules-dir="${EPREFIX}$(get_udevdir)/rules.d"
-		--enable-symlink-install
-		--enable-elf-shlibs
-		$(tc-has-tls || echo --disable-tls)
-		$(multilib_native_use_enable fuse fuse2fs)
-		$(use_enable nls)
-		$(multilib_native_use_enable tools e2initrd-helper)
-		--disable-fsck
-		--disable-uuidd
-		--disable-lto
-		--disable-largefile # need to check effect on ABI
-		--with-pthread
-	)
-
-	# We use blkid/uuid from util-linux now
-	if use kernel_linux ; then
-		export ac_cv_lib_{uuid_uuid_generate,blkid_blkid_get_cache}=yes
-		myeconfargs+=( --disable-lib{blkid,uuid} )
-	fi
-
-	ac_cv_path_LDCONFIG=: \
-		ECONF_SOURCE="${S}" \
-		CC="$(tc-getCC)" \
-		BUILD_CC="$(tc-getBUILD_CC)" \
-		BUILD_LD="$(tc-getBUILD_LD)" \
-		econf "${myeconfargs[@]}"
-
-	if grep -qs 'USE_INCLUDED_LIBINTL.*yes' config.{log,status} ; then
-		eerror "INTL sanity check failed, aborting build."
-		eerror "Please post your ${S}/config.log file as an"
-		eerror "attachment to https://bugs.gentoo.org/81096"
-		die "Preventing included intl cruft from building"
-	fi
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi && use tools ; then
-		emake V=1
-	else
-		emake -C lib/et V=1
-		emake -C lib/ss V=1
-		emake -C lib/ext2fs V=1
-		emake -C lib/e2p V=1
-	fi
-}
-
-multilib_src_test() {
-	if multilib_is_native_abi && use tools ; then
-		emake V=1 check
-	else
-		# Required by lib/ext2fs's check target
-		emake -C lib/support V=1
-
-		# For non-native, there's no binaries to test. Just libraries.
-		emake -C lib/et V=1 check
-		emake -C lib/ss V=1 check
-		emake -C lib/ext2fs V=1 check
-		emake -C lib/e2p V=1 check
-	fi
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi && use tools ; then
-		emake STRIP=':' V=1 DESTDIR="${D}" install
-	else
-		emake -C lib/et V=1 DESTDIR="${D}" install
-		emake -C lib/ss V=1 DESTDIR="${D}" install
-		emake -C lib/ext2fs V=1 DESTDIR="${D}" install
-		emake -C lib/e2p V=1 DESTDIR="${D}" install
-	fi
-
-	# Move shared libraries to /lib/, install static libraries to
-	# /usr/lib/, and install linker scripts to /usr/lib/.
-	gen_usr_ldscript -a com_err ss ext2fs e2p
-
-	# configure doesn't have an option to disable static libs
-	if ! use static-libs ; then
-		find "${ED}" -name '*.a' -delete || die
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	if use tools ; then
-		insinto /etc
-		doins "${FILESDIR}"/e2fsck.conf
-	fi
-}
-
-pkg_postinst() {
-	udev_reload
-}
-
-pkg_postrm() {
-	udev_reload
-}
diff --git a/sys-fs/e2fsprogs/metadata.xml b/sys-fs/e2fsprogs/metadata.xml
index a7ce0f49f403..3030299059ee 100644
--- a/sys-fs/e2fsprogs/metadata.xml
+++ b/sys-fs/e2fsprogs/metadata.xml
@@ -8,7 +8,6 @@
 	<use>
 		<flag name="cron">Install e2scrub_all cron script</flag>
 		<flag name="fuse">Build fuse2fs, a FUSE file system client for ext2/ext3/ext4 file systems</flag>
-		<flag name="lto">Build with link time optimization (LTO)</flag>
 		<flag name="tools">Build extfs tools (mke2fs, e2fsck, tune2fs, etc.)</flag>
 	</use>
 	<upstream>
diff --git a/sys-fs/mtd-utils/Manifest b/sys-fs/mtd-utils/Manifest
index 56cc79e638f9..2c5bccdb122e 100644
--- a/sys-fs/mtd-utils/Manifest
+++ b/sys-fs/mtd-utils/Manifest
@@ -1,3 +1,3 @@
 DIST mtd-utils-2.1.5.tar.bz2 640309 BLAKE2B 94dfd37c10d2759c2fe0b2a7565e2a2aeafdfcaaba2ab9eddc5de2d77658f2702f25004609698585c170839f4e4b685e99004918f1e20cf1ced6925680215427 SHA512 625ee12baf38401c60f6c22d53ed649710417f8d03c6c2217cee890478954e22261428fbf11c713493fb6b7d452ed5af44b0dc9c58133f7b4f52e369353a62c3
-EBUILD mtd-utils-2.1.5.ebuild 953 BLAKE2B db78555cd51ba15ecb12d5800ef2e0be12f251f3db5ae765069bb7effabde1b8961bbbd5ee0387bee8b678132b9c7a8d24f8f2930ccb816f65b15188b84e413a SHA512 99d985403883d53d85f4f65fb755235427b048334e04028a256f916432ddcc6b7a2ad060b64fea02d3c68937182a51f0ae25285c4882af320e031afa17ea3335
+EBUILD mtd-utils-2.1.5.ebuild 1132 BLAKE2B 14535a937eca1ecb763221a78fc74f9e90a6ee319f4acf7be8f2991666ebbb5f3207e5502b5b4d932084fed91b7bbc29c8f626b56393603d645caf827890355f SHA512 d007d9efd365dff6228baa03f506e713ebf7e1466d08881fc72e0224dafe870a804ef5769818cba1f329e27c1acaf67296dc9f2c1d2978f2bc4bad5f7e216e5a
 MISC metadata.xml 589 BLAKE2B 4991d24ee29697e60dd1672008647d8b7ef2f6cf60a64ccf3b1174eecdaf842b81783ecd9995a7b050f98b744546550074b6c2ea509e45f3f42106badbc3deeb SHA512 a3a46acfa94eb80e4220d2e143a929f4a02e1d6708378a4e429b7de4e82bfe1d04aee5868c889c98354b566b58f0512d50f36357f16fa6997afffd0c2177b696
diff --git a/sys-fs/mtd-utils/mtd-utils-2.1.5.ebuild b/sys-fs/mtd-utils/mtd-utils-2.1.5.ebuild
index b0f0145367f0..871721ed7e9b 100644
--- a/sys-fs/mtd-utils/mtd-utils-2.1.5.ebuild
+++ b/sys-fs/mtd-utils/mtd-utils-2.1.5.ebuild
@@ -10,7 +10,8 @@ SRC_URI="https://infraroot.at/pub/mtd/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
-IUSE="+lzo xattr +zstd"
+IUSE="+lzo test xattr +zstd"
+RESTRICT="!test? ( test )"
 
 DEPEND="
 	sys-apps/util-linux:=
@@ -20,6 +21,7 @@ DEPEND="
 	zstd? ( app-arch/zstd:= )
 "
 RDEPEND="${DEPEND}"
+BDEPEND="test? ( dev-util/cmocka )"
 
 DOCS=( jffsX-utils/device_table.txt ubifs-utils/mkfs.ubifs/README )
 
@@ -33,7 +35,10 @@ src_prepare() {
 }
 
 src_configure() {
+	# --enable-tests is for test programs that are installed
 	econf \
+		--enable-tests \
+		$(use_enable test unit-tests) \
 		$(use_with lzo) \
 		$(use_with xattr) \
 		$(use_with zstd)
diff --git a/sys-fs/xfsprogs/Manifest b/sys-fs/xfsprogs/Manifest
index 47231d92e033..282ff4231a83 100644
--- a/sys-fs/xfsprogs/Manifest
+++ b/sys-fs/xfsprogs/Manifest
@@ -1,13 +1,8 @@
 AUX xfsprogs-5.18.0-docdir.patch 278 BLAKE2B 5277fff17f26b4da946535a430878bfe1e91f92f41c44f2eaaac80703d58176f8d15e14f0586fcf23f29ce207f193303dc662ae5cca6877d6eca9f5ae698620f SHA512 0a94f24b292bece9786bceb99100c25b6d697b9ecf1566bb52b8266683e3adaee415bf7d79c81eed7f2adf846f982f3d91122c9a6dcbb7e16231983037fe9cae
-AUX xfsprogs-5.18.0-include.patch 570 BLAKE2B c53be8940cfae61eed0cf75d3ac90c398534f101182154aeda566b15ec4d2f4dfd4a24f92b0f11add95acb23033a4312a19622f9d1d3a935da41522ea923ed1a SHA512 ee488843300ea00112e3533c7bc0c1cf12e7da25e65814db7b9d1d36bcd867c348212cd5d3524e8ee03e6cb61277fe16787dd329a61dbd3aed9d2c179ce8bc29
 AUX xfsprogs-5.3.0-libdir.patch 1137 BLAKE2B 7e455b8b82c553a819155fb4c1fee3d5c31bef0fa4c7ab0bf4ad4558a9a5b0b2f408138558c3601deb3ba85d465ab2dae5248bc20a4ba83f08cf733b27a796a1 SHA512 eaec31b6dab500c2e9c4fe7d5d82e60a40f3073cff99af0ae2aa817f6e4541f6a3de0a48f9151a274c6dd97e99ca26192b95b920aea1c5227d75232b808c98fa
-DIST xfsprogs-5.18.0.tar.xz 1310008 BLAKE2B a2a2835d53ee6ac55279636f3f3cdcecab8757911ce5c1ea5f350a4da9ff4c1ca64b2aba1c0e5424c0c0a01fd0504396d5fecca12e4689c372ed5bb76b9ac24e SHA512 47d035a33367edae7357e34c70bdb0fe9219231153fb4c4f418ed1462d137dd77338c12a199eb71cd70e88903e5fc11e1e4fb595c622183786e87346e2f65739
-DIST xfsprogs-6.0.0.tar.xz 1320744 BLAKE2B ae1d175e3dc5f0f6819397f8166a419847da07616d472f81928e3086b9fac420c09e9406d752a34a957d6d9c82a45defb17d6773e87e3b5f4ff509952ef3e76e SHA512 a3ddccdea1129038420d933f1e9ae8f9e75b3ad59fd0fe4c61b7a4dc6145f47b4262f68aefc3216d37cc33ee5643cd6f260ec83cd39d6b61a1cd046c03674ad8
 DIST xfsprogs-6.1.1.tar.xz 1322528 BLAKE2B f6551356ccc68ee6d0bdc50edcf9717bfc94053e97b408f0fa6b316d51391bd347baa8c6ce09e269d09177eec14befc4235738e92d5e4408bda1113c79b2b18b SHA512 ec11cb9be34502a006f18ebea0a62aa227580753fce57cb7b6394d079fa41aee778382c06116a2fa45b67989a1501bbba2013829d2348b51e1136e668966c5e6
 DIST xfsprogs-6.2.0.tar.xz 1324216 BLAKE2B 847ad267b3667604c9c6a30857605e9cef0f184b7c375d0771b29a0c9596f621a819cc4e88af939a3f9a3ce14a2984fece5e70346bc673a5982af6eebe3909cc SHA512 71c04f744af9f4f3197a9c6eb468574d984c1532753f83f0bcd583cf737b89fab034442c072794975c813ea168572b39ae43f28d9a0428204be2fb7f1e141fc5
 DIST xfsprogs-6.3.0.tar.xz 1328452 BLAKE2B 47a4ec45c88f26b32debd52283602d8244f996c071853b6bf7cf905f917436b1324bc9b58338346c8255201629d69e771d6c3bfd81f33f4f3c3907251d0a6c8c SHA512 dbb3e77d0d9cf184a0e647b8231350401a7549a23a0bfd9121cf2a1b48e85f71d98329dff440fc6e984bcecfdcc2a72f0f27c4989560f3c55359f21f3fb434bb
-EBUILD xfsprogs-5.18.0-r1.ebuild 2383 BLAKE2B 9129206aaa5cb2c0613ef51a202baee6d2267802b0258f75aaaeddfa82d976fea4d60c5b720f1ab5c96d14daa93b853c3b7a704a103b5e6e2bf92c91316a3f50 SHA512 3f277c05de3737732925c27799e8c12064bee8ce701373f8833731e7cca7b77f865b526c8ff0636192e59e7f84546471da68e822db705e60859b52170f0f4ff4
-EBUILD xfsprogs-6.0.0.ebuild 2383 BLAKE2B 9129206aaa5cb2c0613ef51a202baee6d2267802b0258f75aaaeddfa82d976fea4d60c5b720f1ab5c96d14daa93b853c3b7a704a103b5e6e2bf92c91316a3f50 SHA512 3f277c05de3737732925c27799e8c12064bee8ce701373f8833731e7cca7b77f865b526c8ff0636192e59e7f84546471da68e822db705e60859b52170f0f4ff4
 EBUILD xfsprogs-6.1.1.ebuild 2341 BLAKE2B 12fe7c625284cc2368b928f9badb2fdb762b14ba6355afb160b7b43ed2763941b7ffdbae2ac84b01df622e4bb902bfbc77529c591eff6622a15a4294e102e4c6 SHA512 2517098e1bf9f51c9baf7ee5fe4bd8428872d415365f67e46d9a6930f1c7d82119e3463af6ee21dba0d368500d1e3232eb4af69eb498fae96af7131e5c525213
 EBUILD xfsprogs-6.2.0.ebuild 2367 BLAKE2B f4fb5ae8beae365feb7d0b16ba034a089d43b440450fb9f2814cd7f44d868c0770d7415ac0bcdc421db9270131674d05d827603ac6877f449baf6fafd58999a3 SHA512 53c579ac829b01058b9dfa26d7547ea68f89ac3569e2a000988fdb9072b5bf7560eefefc040b555bdb03cab3a94cd2e9bc85651c785d1deef694a2b0ec6b1274
 EBUILD xfsprogs-6.3.0.ebuild 2367 BLAKE2B f4fb5ae8beae365feb7d0b16ba034a089d43b440450fb9f2814cd7f44d868c0770d7415ac0bcdc421db9270131674d05d827603ac6877f449baf6fafd58999a3 SHA512 53c579ac829b01058b9dfa26d7547ea68f89ac3569e2a000988fdb9072b5bf7560eefefc040b555bdb03cab3a94cd2e9bc85651c785d1deef694a2b0ec6b1274
diff --git a/sys-fs/xfsprogs/files/xfsprogs-5.18.0-include.patch b/sys-fs/xfsprogs/files/xfsprogs-5.18.0-include.patch
deleted file mode 100644
index 361aeb0b7d35..000000000000
--- a/sys-fs/xfsprogs/files/xfsprogs-5.18.0-include.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-
-Bug: https://bugs.gentoo.org/875050
-Upstream: https://lore.kernel.org/linux-xfs/865733c7-8314-cd13-f363-5ba2c6842372@applied-asynchrony.com/
-Signed-off-by: Holger Hoffstätte <holger@applied-asynchrony.com> 
-
---- xfsprogs-5.18.0/scrub/unicrash.c	2021-12-13 21:02:19.000000000 +0100
-+++ xfsprogs-5.18.0-nowarn/scrub/unicrash.c	2022-10-04 19:46:28.869402900 +0200
-@@ -10,6 +10,7 @@
- #include <sys/types.h>
- #include <sys/statvfs.h>
- #include <strings.h>
-+#include <unicode/uclean.h>
- #include <unicode/ustring.h>
- #include <unicode/unorm2.h>
- #include <unicode/uspoof.h>
diff --git a/sys-fs/xfsprogs/xfsprogs-5.18.0-r1.ebuild b/sys-fs/xfsprogs/xfsprogs-5.18.0-r1.ebuild
deleted file mode 100644
index 27df30019de0..000000000000
--- a/sys-fs/xfsprogs/xfsprogs-5.18.0-r1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic systemd usr-ldscript
-
-DESCRIPTION="XFS filesystem utilities"
-HOMEPAGE="https://xfs.wiki.kernel.org/ https://git.kernel.org/pub/scm/fs/xfs/xfsprogs-dev.git/"
-SRC_URI="https://www.kernel.org/pub/linux/utils/fs/xfs/${PN}/${P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="icu libedit nls selinux"
-
-RDEPEND="dev-libs/inih
-	dev-libs/userspace-rcu:=
-	>=sys-apps/util-linux-2.17.2
-	icu? ( dev-libs/icu:= )
-	libedit? ( dev-libs/libedit )"
-DEPEND="${RDEPEND}"
-BDEPEND="nls? ( sys-devel/gettext )"
-RDEPEND+=" selinux? ( sec-policy/selinux-xfs )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.3.0-libdir.patch
-	"${FILESDIR}"/${PN}-5.18.0-docdir.patch
-	"${FILESDIR}"/${PN}-5.18.0-include.patch
-)
-
-src_prepare() {
-	default
-
-	# Fix doc dir
-	sed -i \
-		-e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \
-		include/builddefs.in || die
-
-	# Don't install compressed docs
-	sed 's@\(CHANGES\)\.gz[[:space:]]@\1 @' -i doc/Makefile || die
-}
-
-src_configure() {
-	# include/builddefs.in will add FCFLAGS to CFLAGS which will
-	# unnecessarily clutter CFLAGS (and fortran isn't used)
-	unset FCFLAGS
-
-	# If set in user env, this breaks configure
-	unset PLATFORM
-
-	export DEBUG=-DNDEBUG
-
-	# Package is honoring CFLAGS; No need to use OPTIMIZER anymore.
-	# However, we have to provide an empty value to avoid default
-	# flags.
-	export OPTIMIZER=" "
-
-	# Avoid automagic on libdevmapper (bug #709694)
-	export ac_cv_search_dm_task_create=no
-
-	# Build fails with -O3 (bug #712698)
-	replace-flags -O3 -O2
-
-	# Upstream does NOT support --disable-static anymore,
-	# https://www.spinics.net/lists/linux-xfs/msg30185.html
-	# https://www.spinics.net/lists/linux-xfs/msg30272.html
-	local myconf=(
-		--enable-blkid
-		--with-crond-dir="${EPREFIX}/etc/cron.d"
-		--with-systemd-unit-dir="$(systemd_get_systemunitdir)"
-		$(use_enable icu libicu)
-		$(use_enable nls gettext)
-		$(use_enable libedit editline)
-	)
-
-	if is-flagq -flto ; then
-		myconf+=( --enable-lto )
-	else
-		myconf+=( --disable-lto )
-	fi
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	emake V=1
-}
-
-src_install() {
-	emake DIST_ROOT="${ED}" HAVE_ZIPPED_MANPAGES=false install
-	emake DIST_ROOT="${ED}" HAVE_ZIPPED_MANPAGES=false install-dev
-
-	gen_usr_ldscript -a handle
-}
diff --git a/sys-fs/xfsprogs/xfsprogs-6.0.0.ebuild b/sys-fs/xfsprogs/xfsprogs-6.0.0.ebuild
deleted file mode 100644
index 27df30019de0..000000000000
--- a/sys-fs/xfsprogs/xfsprogs-6.0.0.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic systemd usr-ldscript
-
-DESCRIPTION="XFS filesystem utilities"
-HOMEPAGE="https://xfs.wiki.kernel.org/ https://git.kernel.org/pub/scm/fs/xfs/xfsprogs-dev.git/"
-SRC_URI="https://www.kernel.org/pub/linux/utils/fs/xfs/${PN}/${P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="icu libedit nls selinux"
-
-RDEPEND="dev-libs/inih
-	dev-libs/userspace-rcu:=
-	>=sys-apps/util-linux-2.17.2
-	icu? ( dev-libs/icu:= )
-	libedit? ( dev-libs/libedit )"
-DEPEND="${RDEPEND}"
-BDEPEND="nls? ( sys-devel/gettext )"
-RDEPEND+=" selinux? ( sec-policy/selinux-xfs )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.3.0-libdir.patch
-	"${FILESDIR}"/${PN}-5.18.0-docdir.patch
-	"${FILESDIR}"/${PN}-5.18.0-include.patch
-)
-
-src_prepare() {
-	default
-
-	# Fix doc dir
-	sed -i \
-		-e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \
-		include/builddefs.in || die
-
-	# Don't install compressed docs
-	sed 's@\(CHANGES\)\.gz[[:space:]]@\1 @' -i doc/Makefile || die
-}
-
-src_configure() {
-	# include/builddefs.in will add FCFLAGS to CFLAGS which will
-	# unnecessarily clutter CFLAGS (and fortran isn't used)
-	unset FCFLAGS
-
-	# If set in user env, this breaks configure
-	unset PLATFORM
-
-	export DEBUG=-DNDEBUG
-
-	# Package is honoring CFLAGS; No need to use OPTIMIZER anymore.
-	# However, we have to provide an empty value to avoid default
-	# flags.
-	export OPTIMIZER=" "
-
-	# Avoid automagic on libdevmapper (bug #709694)
-	export ac_cv_search_dm_task_create=no
-
-	# Build fails with -O3 (bug #712698)
-	replace-flags -O3 -O2
-
-	# Upstream does NOT support --disable-static anymore,
-	# https://www.spinics.net/lists/linux-xfs/msg30185.html
-	# https://www.spinics.net/lists/linux-xfs/msg30272.html
-	local myconf=(
-		--enable-blkid
-		--with-crond-dir="${EPREFIX}/etc/cron.d"
-		--with-systemd-unit-dir="$(systemd_get_systemunitdir)"
-		$(use_enable icu libicu)
-		$(use_enable nls gettext)
-		$(use_enable libedit editline)
-	)
-
-	if is-flagq -flto ; then
-		myconf+=( --enable-lto )
-	else
-		myconf+=( --disable-lto )
-	fi
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	emake V=1
-}
-
-src_install() {
-	emake DIST_ROOT="${ED}" HAVE_ZIPPED_MANPAGES=false install
-	emake DIST_ROOT="${ED}" HAVE_ZIPPED_MANPAGES=false install-dev
-
-	gen_usr_ldscript -a handle
-}
diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest
index 6b0d069b4f7e..80dff2c4a46e 100644
--- a/sys-fs/zfs-kmod/Manifest
+++ b/sys-fs/zfs-kmod/Manifest
@@ -11,9 +11,9 @@ DIST zfs-2.1.7.tar.gz.asc 836 BLAKE2B 648fb818860a1cecc2ec42f23102e0466c038bfe48
 DIST zfs-2.1.9.tar.gz 35106538 BLAKE2B d7553cc162687531b254089e29e2e15e2eb6b362cecd8e70c24bbb5dbffbde82036ad2d416f4caeceaa324bee8a2e59d9e3cd8a3bf55a2e3c0718c7af9562812 SHA512 a3c410abe911be7d3d66af8ad7023a810eb4ae3284001e544c3a34275eb17a4916a7c094936a2628a590007c007eea84673efa9f3201fd9f24c499fd5ed3ed75
 DIST zfs-2.1.9.tar.gz.asc 836 BLAKE2B 1e76525eab338398dd6ff7539ea4e7d18847d0f40e9093d813ec93fce5fa4c16e09f91c0805ba01a29190f673d131f85442c13035166d6f2d007a7e42dc15486 SHA512 35e1213fcac0458e1243355beba021dfefef455df2b341fbc4b10047f9ed4747df84e319d10ffe4bbcd572fbf014019e0dec200eb4e7d3c116fb805369182cb0
 EBUILD zfs-kmod-2.1.10-r1.ebuild 5576 BLAKE2B 815dd6a12488b0a17e67edc6b77709dc67c8c4eaa12b636fc878df712ce39c3abf5b80960d56cfa314ed9257a3b810b5c067305febd6af451dd6346246ce2f13 SHA512 d77feb3c9ac5698c8d1db64ff22dcd96bff54144e674ad1ef254fa5d1c047c5e0f29b165c037ece23dee9abe89f4ce0e93d1e71267841c69d209ab9dc1a7e65e
-EBUILD zfs-kmod-2.1.11-r1.ebuild 4037 BLAKE2B 7627f4d740f94b6f3682603553c07a9d48a362111a4ca99f02bf51e792c4e3683b17418288bf031ab941e81062289cb6256f0e559e238a60fe942a4a4045e3d2 SHA512 4ac66f8c38397ab60b1ffc1bf15beab0116fe68b25959ddd5eb52d08b2238287f89bcda024b76da62beef00f9f0543055df78b12bf9f1d9dc9c776a03aed1290
+EBUILD zfs-kmod-2.1.11-r1.ebuild 4614 BLAKE2B d2a8f17417fd8e15890b8f1e46bed0414614ddd76732e02a60ea3ee79e29b5cd07a595f0de93d5c13e76636a305588f65f37fa96c88f6084b4f7d1d7b4d167b2 SHA512 fc95430527ea7a30e046441ebe21aac1ce78303f08ec313f8839e95571ff2fcaead3d01b454cc82179e5c2e265bd09d756133c1c5d721cdafee7a31f3223c83e
 EBUILD zfs-kmod-2.1.11.ebuild 5434 BLAKE2B f417c108ad15c32d0a9a7c0a3ce13c094cdb68b5042a2a9c90a237db8c4cffe4658844989efa0b6ec2dafa68d0d5bd12fd1fc6c22a89b78fb175cd6b40761730 SHA512 565937235122e96ed251bb2b555ba6c756c3fc860cb61ba8139fd2d763d8a29f87410bb00e804318f224fb7f28e5bade1bef4c4cb741ca435f9e1a3f72b11b2a
 EBUILD zfs-kmod-2.1.7.ebuild 5580 BLAKE2B 5e4ef24ec54cf5dda899cf9151de0df0a2ef981a9f6a465ab381392dfe8a9214aecc29da61e83c8b317eb568abaa1abff6231660e1c608f709c88d6610da5264 SHA512 253c5cda1e71b51bd2938151ae62872e780a3e2ff3129ef14d39176697f23693c4692da167a3cfa9b386d8521bed63e5345ea8adb60b480d3bac44b198f7a477
 EBUILD zfs-kmod-2.1.9.ebuild 5432 BLAKE2B 1f3473798cb522c80b1d9d244aad191c0118ebaafc8d2041cfad82513b16d68221467473efed4a7b084a44cd0a19331089510ddc402fa064cb15bf21914766ff SHA512 ed69ee9fcfb0ab1db51c1e3ee2a0a155a3eccdd1d297f83dffc3376ef20558e0421e441db0b00302cc2dd499e1693e4b63bbb95102da800e42635f00be2e7f54
-EBUILD zfs-kmod-9999.ebuild 5367 BLAKE2B 9b1c77345362ca3f60bbcd2897288778794beb86f5ca3ff3fdd58fb78aee59a510d47c8045941d3c6e2602bf909cc7bb51418692db76ba33166069037ebbaea1 SHA512 156d64dd90d22a63bdefcbadcc0639fa27c896f6ca7cf56e96246afe35a72d6ffd1023d0ec982de2c4f7fd62aebf7381ba78442c4b97480f363959a2ba4a24c2
+EBUILD zfs-kmod-9999.ebuild 5944 BLAKE2B 1ddae5564d8c8b8f27f943d1e4cf7691faec69f6b41297e33b2b2545ed8883638f0fed4ae8b8f162a3d4130c438eff76a8941adba67ef8f2fcb0e8aa53ada5d2 SHA512 8ff8d45a322645eed4afdc5168ee3246e129ad0c85bc2c2de6cc2be7b01a5f32a727602585ef3d4195fc199ade96c4039d36c565f8aa663001f44d6d61320a91
 MISC metadata.xml 776 BLAKE2B 4c48182f7ceee679b4d947a70cb232980969b59bdc425463a929b6ae8be5f79450a3869bf3cc4d00069b65cda8a06f42eba29a7974c5e1b34a2998992901bcbe SHA512 f3f0af7dcdd26a01fc1b00af46ff64e7e6d7bb83a2225ea4cbff5c1a56651ddfdf3e7f59af914833f52828b9d059c6a8cb7f32037319abed129c40987349745f
diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.1.11-r1.ebuild b/sys-fs/zfs-kmod/zfs-kmod-2.1.11-r1.ebuild
index cd38e7bd2037..7bf3ebaec2e0 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-2.1.11-r1.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.1.11-r1.ebuild
@@ -12,18 +12,22 @@ MODULES_KERNEL_MAX=6.2
 MODULES_KERNEL_MIN=3.10
 
 if [[ ${PV} == 9999 ]] ; then
-	inherit git-r3
 	EGIT_REPO_URI="https://github.com/openzfs/zfs.git"
+	inherit git-r3
 	unset MODULES_KERNEL_MAX
 else
+	VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/openzfs.asc
 	inherit verify-sig
 
 	MY_PV=${PV/_rc/-rc}
-
 	SRC_URI="https://github.com/openzfs/zfs/releases/download/zfs-${MY_PV}/zfs-${MY_PV}.tar.gz"
 	SRC_URI+=" verify-sig? ( https://github.com/openzfs/zfs/releases/download/zfs-${MY_PV}/zfs-${MY_PV}.tar.gz.asc )"
 	S="${WORKDIR}/zfs-${PV%_rc?}"
-	VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/openzfs.asc
+
+	ZFS_KERNEL_COMPAT="${MODULES_KERNEL_MAX}"
+	# Increments minor eg 5.14 -> 5.15, and still supports override.
+	ZFS_KERNEL_DEP="${ZFS_KERNEL_COMPAT_OVERRIDE:-${ZFS_KERNEL_COMPAT}}"
+	ZFS_KERNEL_DEP="${ZFS_KERNEL_DEP%%.*}.$(( ${ZFS_KERNEL_DEP##*.} + 1))"
 
 	if [[ ${PV} != *_rc* ]] ; then
 		KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~sparc"
@@ -46,7 +50,7 @@ if [[ ${PV} != 9999 ]] ; then
 	IUSE+=" +dist-kernel-cap"
 	RDEPEND="
 		dist-kernel-cap? ( dist-kernel? (
-			<virtual/dist-kernel-${MODULES_KERNEL_MAX%%.*}.$(( ${MODULES_KERNEL_MAX##*.} + 1))
+			<virtual/dist-kernel-${ZFS_KERNEL_DEP}
 		) )
 	"
 fi
@@ -89,6 +93,16 @@ pkg_setup() {
 
 	kernel_is -lt 5 && CONFIG_CHECK+=" IOSCHED_NOOP"
 
+	if [[ ${PV} != 9999 ]] ; then
+		local kv_major_max kv_minor_max zcompat
+		zcompat="${ZFS_KERNEL_COMPAT_OVERRIDE:-${ZFS_KERNEL_COMPAT}}"
+		kv_major_max="${zcompat%%.*}"
+		zcompat="${zcompat#*.}"
+		kv_minor_max="${zcompat%%.*}"
+		kernel_is -le "${kv_major_max}" "${kv_minor_max}" || die \
+			"Linux ${kv_major_max}.${kv_minor_max} is the latest supported version"
+	fi
+
 	linux-mod-r1_pkg_setup
 }
 
diff --git a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
index 82ac6d7c464a..5727676398f5 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
@@ -12,18 +12,22 @@ MODULES_KERNEL_MAX=6.2
 MODULES_KERNEL_MIN=3.10
 
 if [[ ${PV} == 9999 ]] ; then
-	inherit git-r3
 	EGIT_REPO_URI="https://github.com/openzfs/zfs.git"
+	inherit git-r3
 	unset MODULES_KERNEL_MAX
 else
+	VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/openzfs.asc
 	inherit verify-sig
 
 	MY_PV=${PV/_rc/-rc}
-
 	SRC_URI="https://github.com/openzfs/zfs/releases/download/zfs-${MY_PV}/zfs-${MY_PV}.tar.gz"
 	SRC_URI+=" verify-sig? ( https://github.com/openzfs/zfs/releases/download/zfs-${MY_PV}/zfs-${MY_PV}.tar.gz.asc )"
 	S="${WORKDIR}/zfs-${PV%_rc?}"
-	VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/openzfs.asc
+
+	ZFS_KERNEL_COMPAT="${MODULES_KERNEL_MAX}"
+	# Increments minor eg 5.14 -> 5.15, and still supports override.
+	ZFS_KERNEL_DEP="${ZFS_KERNEL_COMPAT_OVERRIDE:-${ZFS_KERNEL_COMPAT}}"
+	ZFS_KERNEL_DEP="${ZFS_KERNEL_DEP%%.*}.$(( ${ZFS_KERNEL_DEP##*.} + 1))"
 
 	if [[ ${PV} != *_rc* ]] ; then
 		KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~sparc"
@@ -46,7 +50,7 @@ if [[ ${PV} != 9999 ]] ; then
 	IUSE+=" +dist-kernel-cap"
 	RDEPEND="
 		dist-kernel-cap? ( dist-kernel? (
-			<virtual/dist-kernel-${MODULES_KERNEL_MAX%%.*}.$(( ${MODULES_KERNEL_MAX##*.} + 1))
+			<virtual/dist-kernel-${ZFS_KERNEL_DEP}
 		) )
 	"
 fi
@@ -89,6 +93,16 @@ pkg_setup() {
 
 	kernel_is -lt 5 && CONFIG_CHECK+=" IOSCHED_NOOP"
 
+	if [[ ${PV} != 9999 ]] ; then
+		local kv_major_max kv_minor_max zcompat
+		zcompat="${ZFS_KERNEL_COMPAT_OVERRIDE:-${ZFS_KERNEL_COMPAT}}"
+		kv_major_max="${zcompat%%.*}"
+		zcompat="${zcompat#*.}"
+		kv_minor_max="${zcompat%%.*}"
+		kernel_is -le "${kv_major_max}" "${kv_minor_max}" || die \
+			"Linux ${kv_major_max}.${kv_minor_max} is the latest supported version"
+	fi
+
 	linux-mod-r1_pkg_setup
 }
 
diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest
index 36f08eac0f38..455e136a0260 100644
--- a/sys-fs/zfs/Manifest
+++ b/sys-fs/zfs/Manifest
@@ -14,8 +14,8 @@ DIST zfs-2.1.7.tar.gz.asc 836 BLAKE2B 648fb818860a1cecc2ec42f23102e0466c038bfe48
 DIST zfs-2.1.9.tar.gz 35106538 BLAKE2B d7553cc162687531b254089e29e2e15e2eb6b362cecd8e70c24bbb5dbffbde82036ad2d416f4caeceaa324bee8a2e59d9e3cd8a3bf55a2e3c0718c7af9562812 SHA512 a3c410abe911be7d3d66af8ad7023a810eb4ae3284001e544c3a34275eb17a4916a7c094936a2628a590007c007eea84673efa9f3201fd9f24c499fd5ed3ed75
 DIST zfs-2.1.9.tar.gz.asc 836 BLAKE2B 1e76525eab338398dd6ff7539ea4e7d18847d0f40e9093d813ec93fce5fa4c16e09f91c0805ba01a29190f673d131f85442c13035166d6f2d007a7e42dc15486 SHA512 35e1213fcac0458e1243355beba021dfefef455df2b341fbc4b10047f9ed4747df84e319d10ffe4bbcd572fbf014019e0dec200eb4e7d3c116fb805369182cb0
 EBUILD zfs-2.1.10.ebuild 9181 BLAKE2B ea7370b58ed42c3be9f05c6363512bbe6a57930fe9ae158e8cc5012139fb14216fa32a5ea1e739b5df40973d0c10e6aa48ef9df05a1f6a3d47c1c1492432b26e SHA512 6baacc42e25e5addd9e1eaf0c27b604560e75ae503eacb36ea4e176663aec832cf404084c5621bcfb7095363f57e7771b984df10fe607059dc1fa470d4e093ad
-EBUILD zfs-2.1.11.ebuild 9180 BLAKE2B 4545f1fb5f933f7a8ef565cbe8002211c7120397969953c4e0fdade31c4368eeafd05bf015fa483edf1aa0b23124d90e9b9ddbe4b1d216788468f573fb099d42 SHA512 ae0561889143f16cb48178b39520f41e69871a2a6bc8ea032af5bb842408d60bb94301939ff3bda01f4f868c222b00a15ffa9dc9690250f5227540f1e0946c52
+EBUILD zfs-2.1.11.ebuild 8965 BLAKE2B 4daf53f62838d5f2e3241b2c3284d75bf9da11bde29be5261dd3dca76c1fb9d50a6432e84dd8679740501d8d54309bc82862b12ed3d5731c38304f705ce7a566 SHA512 64c567956ff249d55f2cb7a2e8b9e59c66c8296bb6b03b3b1cbf737067958fa13b87ce585ec607df32ced28c772cc761ba6dded15dfde159611ed000ccd8ff02
 EBUILD zfs-2.1.7-r1.ebuild 9496 BLAKE2B d5336d09ddd165f7306def6fdbfd97cc172a069ef185a3e30ea75421e4e138f96276fa2df4e185568e89dc49c36e64a258fa5b979a6433afbcd41ea7b207c8fa SHA512 a29d0796e982735483d579b174205e6af58a5d3ab098d1855b502bf66f96f12435d303ec2900ecc34cfc0e6f18e7261fcb76ad59660095544d905dda19801d91
 EBUILD zfs-2.1.9.ebuild 9178 BLAKE2B 18bd9ef88b73450f9a6b811d2e36ff511a78e098848bb997e90fc39d324b63766493b6e736d26132dd5cff9c44a2915c5f401b732bb0aee648ec821046b26b85 SHA512 10a5ad86a869b4978ce995fb561ddfb92d3739a0e7f4825b28132fc47320fb293e6519cf23f12da84c090ffb3a8b0188edaeee155ab34d8794a32c6c32a1ae22
-EBUILD zfs-9999.ebuild 9103 BLAKE2B f09254fe3a100d9e9c1cf2596a3c829bb192e97846ffed560ffeb76d5bd47fb920fbd0be4881f691301973cc63f3e1e9b2e31451bcc2226178e9c80608b91875 SHA512 33bb3dd7bf322776d0aa4dcded628257d3d57aef566bbb090f8f4b24ab0b435925cfe0008b2e245e70f55c7f5d56642a6d4c1e15e08cd48b66346e79285a6f20
+EBUILD zfs-9999.ebuild 8819 BLAKE2B e0f8d8e884870a11c473f4c62e936280b4c54f7aac35d3a3b3b918f306cde405d12fe6ecc619e41ae4030def19c557bf61952c131c7e7d18db20f4c04f4900ce SHA512 a6f043df74318f39f6917413a9b4eca6c57cb2b09ce7f0086a99aa027bc48ac66f5dc05357965069a23b558e45bc99ab2aff933f732e86fba38d189b778be8b6
 MISC metadata.xml 2205 BLAKE2B 82e20a6f5906b8cbbc6eb6e9520cf4e4213ce9cba2b056df5d5db0d4deaa4a20822a88e26286446d105326a8f61c807047a0e1e64494faac48d8ed5708807c02 SHA512 222981f945e98ddef646c593cbc8889f3526af4901c28ab5775ba760ca7d3aff3129b2699e8b7337b59fd33cbba388915cb5b2dc09674432c606f41ff27dbd9b
diff --git a/sys-fs/zfs/zfs-2.1.11.ebuild b/sys-fs/zfs/zfs-2.1.11.ebuild
index 9f683b3d7c1c..bdc64e42deac 100644
--- a/sys-fs/zfs/zfs-2.1.11.ebuild
+++ b/sys-fs/zfs/zfs-2.1.11.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Userland utilities for ZFS Linux kernel module"
 HOMEPAGE="https://github.com/openzfs/zfs"
 
 if [[ ${PV} == "9999" ]]; then
-	inherit git-r3 linux-mod
+	inherit git-r3
 	EGIT_REPO_URI="https://github.com/openzfs/zfs.git"
 else
 	VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/openzfs.asc
@@ -294,12 +294,6 @@ pkg_postinst() {
 		fi
 	fi
 
-	if ! use kernel-builtin && [[ ${PV} == "9999" ]]; then
-		einfo "Adding ${P} to the module database to ensure that the"
-		einfo "kernel modules and userland utilities stay in sync."
-		update_moduledb
-	fi
-
 	if systemd_is_booted || has_version sys-apps/systemd; then
 		einfo "Please refer to ${EROOT}/$(systemd_get_systempresetdir)/50-zfs.preset"
 		einfo "for default zfs systemd service configuration"
diff --git a/sys-fs/zfs/zfs-9999.ebuild b/sys-fs/zfs/zfs-9999.ebuild
index 89a9dd904796..6777887fc25c 100644
--- a/sys-fs/zfs/zfs-9999.ebuild
+++ b/sys-fs/zfs/zfs-9999.ebuild
@@ -286,12 +286,6 @@ pkg_postinst() {
 		fi
 	fi
 
-	if ! use kernel-builtin && [[ ${PV} == "9999" ]]; then
-		einfo "Adding ${P} to the module database to ensure that the"
-		einfo "kernel modules and userland utilities stay in sync."
-		update_moduledb
-	fi
-
 	if systemd_is_booted || has_version sys-apps/systemd; then
 		einfo "Please refer to ${EROOT}/$(systemd_get_systempresetdir)/50-zfs.preset"
 		einfo "for default zfs systemd service configuration"
@@ -311,8 +305,4 @@ pkg_postinst() {
 
 pkg_postrm() {
 	udev_reload
-
-	if ! use kernel-builtin && [[ ${PV} == "9999" ]]; then
-		remove_moduledb
-	fi
 }