12 files changed, 205 insertions, 8 deletions
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 1eb4ebb90159..0d3015146768 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/bcachefs-tools/Manifest b/sys-fs/bcachefs-tools/Manifest
index 644cabb4c111..880d87481f75 100644
--- a/sys-fs/bcachefs-tools/Manifest
+++ b/sys-fs/bcachefs-tools/Manifest
@@ -18,7 +18,7 @@ DIST bcachefs-tools-1.4.0.tar.gz 1060158 BLAKE2B c972de13e305b07910ab4acdfea05df
 DIST bcachefs-tools-1.4.1.tar.gz 1069244 BLAKE2B 7be0a343758a221a39dad5eca1c11c74d049e208712d30ffdfd919c97ef87e561983b85b2fbefa932cb69ef50418dce761a9c01afe0114f67b8ddd55b5d62a2c SHA512 65d0f182982d942d1263d60cf435a1142393b9dcf1e7dbea53a873925a82954b47422ade04bbc5b69c955de80ef820e9eeefcfed47aaab3bcc27d3916a94ff4a
 DIST bcachefs-tools-1.6.4.tar.gz 1083811 BLAKE2B 656b1545ccf41dd35e3e6f656a9b5280fe0b5fa43a0ea86243c6693033d986b091fdd3d79ab2ff5c1c9402bce6f4ee33f49e070f6aebd5bba355df7a82d8fc21 SHA512 3e73ee15673eac771393859132146f1c23f4250f68bf8753b5214e88e854959c56efabdaeff4a8ad883287bd289abe08c5c37f6ef7220b984fa679a90c578e57
 DIST bcachefs-tools-1.7.0.tar.gz 1103425 BLAKE2B 952310999035465a4e8621e8e3ef65e5a3ba50d40a0ca76a3ca8b7265bab2f33c40981d2ca83ef3ecc70a5da9cff0d002d2f9676aa6355d1717a0dad968828af SHA512 5f7934997c0cd6b893c67a87e9cb5060cdd37857d6761356bdb1c96572b67ea3a2c03c43fcbd8beb01b0cf9c30da3297d082ef40bb312f5ca40c85faa46cdd3a
-DIST bcachefs-tools-1.9.0.tar.gz 1125074 BLAKE2B 32615469974df1507314790a08d4ee2c2763ee4975906372f82e8de47a3742d80450e99921d25f2b5325f7eab6b33502752af3f8b663b4a107117ce6e00c4f1e SHA512 2a2588fa1a8c9eb7bd13d545ad61c5a6cffca85713455878928b7dc26c6ca83c3539dab7ef036d6af4f799a45ca88a7f471c5a1de116ac1e6184ccc1fb195528
+DIST bcachefs-tools-1.9.1.tar.gz 1125178 BLAKE2B b54b86d681f0694fc39a13c6229a2d79dd8e1fe7dc269f3a8e6ba38b5d972b05aa7ba199114a3935ff95f3b51711e515f124ca247aa1a390f6e2bd771d55e5ee SHA512 93bc85bb7b15d08eadc60a2af1b9c8b0b561400bcd4567c088af8f426d11ccc4321482455e89a10cd544b421da3a953cca9008eb936128124f9bd2e6818c484e
 DIST bindgen-0.69.4.crate 221092 BLAKE2B 69ed55a5827bfe850f589e39bc6e2f4445e20363002c765c5475007b75e4d81cac3d9df358505c63bd6a48300ae4988507abf78dd734bb98b33525bf9212237b SHA512 99530060708690f2ce0b87b97c9ce2998ee968df193137f3c9bf4fa66836814e2ae74c7e0b3057dcff1da7d2c4ea38157e21143c5117be35e94b878c0a427a34
 DIST bitfield-0.14.0.crate 16776 BLAKE2B abca546581d912133e7344f049d93b8d793de323eba7780fab162c53a244b845582ec2bd14b529b9491c363c2da6228b7de58407afc554cc718a9df8370f5535 SHA512 703d534f0684b19af68a18048ecff37367ccbe5a52a3e8d987f2420b980e4a20da9640019ca610b1a73841cbe45dbf4d6a1cfb10cf0e7d09f53199b1fcd141fe
 DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62
@@ -156,6 +156,6 @@ EBUILD bcachefs-tools-1.4.0.ebuild 5642 BLAKE2B e36cd889bee4e0dbc8cb2cb42e07636a
 EBUILD bcachefs-tools-1.4.1.ebuild 5563 BLAKE2B 4011b46e0e0f4d2fb7b5b3125c3ad258cf59c8768950a2415ed78bef96dedcbfec202df3ff0bdd9f4426f9f471bf3e7564adc0d225b3befd099321bb457a19a6 SHA512 f00a0571e93e8da12637e9f98b506f02b47f41ef2c223525e08058ee6758534362228f1ce68c2fda891ac7170e322049c07160abae1cdcc4e93e3b7e93711752
 EBUILD bcachefs-tools-1.6.4-r1.ebuild 5241 BLAKE2B 1fb30d4d2ae8deabbe02c5d1db7d20adf2787da35bbcea37cbcde629b0c58610beb056986afb493948f35fab436e1e1e590413d860c7f7334a6aee4e978f6813 SHA512 3df29ecaba769f0f15f904c18b0630eb90f3e9de9813158f5753723eee54eeeb0b7978d89016ff508f4b0bf7b741da21b3224f9cffafded3c3fc2c1eb18760e9
 EBUILD bcachefs-tools-1.7.0.ebuild 5276 BLAKE2B 898d087a1a1503dab6cc088117a55514d7bb77ba0874156d930f112f07298714071d2143614777308a10c8a9901c0ba1aa353ab00b6bc291c979e297ba42a9bb SHA512 0df8db9e271820259c546442b785e06ddb7c674a406fbe9006d4ed7ef3310e8123cecf4c6dd8f6dfb01c09c430b2e9d58ed21263fae25cd55fc9c295165589ac
-EBUILD bcachefs-tools-1.9.0.ebuild 5369 BLAKE2B 114680633fea6e5ae39c2ba62d501031543f84bb16a237fc9f01b39ca1f4e869c3601da819c0ccb1d3bffb6c65ec93c839b68bc2f3e6201adf81a6a7a38298fb SHA512 9317783803644ecef58968d1e223b66a10407655915e68acf77a5c5abf77c1c3d3a028d6f4e8cc52e3f93c4cd242eb0a13b63ff0b7cc6efc87e78735c2e80110
+EBUILD bcachefs-tools-1.9.1.ebuild 5348 BLAKE2B cdf335f63f60112cec40cc498fbc5cae96cc8afbbd2f8774565b0357fb355af556035646c147b66489ac5d186cae2118decb53f59ec00f8831d2ea3942c2929e SHA512 60a864050856d1d32c6eb9e533de74d91d5bbd93cdb246c1f8542edc0d10438dc37e95c467c19295beb59a4598e0e35c3ecc7bd974857d7aa7669c525569797a
 EBUILD bcachefs-tools-9999.ebuild 5242 BLAKE2B fd962577af482a9c6c1c83480eab65e9bd949c21e2560fb5c03c350ff63e0e81b3fc31f48725d38faf2ec28a250e753949e058d4c3e75bf4dd57e3d4938b8c98 SHA512 8a634605a38375893a9aa65c8ce9ab79aaa4a6b77f298bd4aa67175f94b254921acccdd4f9401e61bd9ef61bc9162d86c44216f9defaeb154e46f45fb744b22b
 MISC metadata.xml 751 BLAKE2B 58fb2ebb3092cb1056b36a5389d486faf4fb3fc6c107f5aeb65d1002722f7f238f776df5698bfceb4e2bf6b0ee4f1aa04d3015784c95141d300f6f82654525bd SHA512 5a6a46cfb145160a0871bf7a591238470d08744552870b54b9c7c78afac860a256fbd6765972a77ca81b78239695850b26c04acc1b24d1a4b35f52d6ef9e2501
diff --git a/sys-fs/bcachefs-tools/bcachefs-tools-1.9.0.ebuild b/sys-fs/bcachefs-tools/bcachefs-tools-1.9.1.ebuild
index a7623d2c1294..23f03911c2e6 100644
--- a/sys-fs/bcachefs-tools/bcachefs-tools-1.9.0.ebuild
+++ b/sys-fs/bcachefs-tools/bcachefs-tools-1.9.1.ebuild
@@ -173,7 +173,6 @@ src_unpack() {
 		git-r3_src_unpack
 		S="${S}/rust-src" cargo_live_src_unpack
 	else
-		unpack ${P}.tar.gz
 		cargo_src_unpack
 	fi
 }
diff --git a/sys-fs/btrfs-progs/Manifest b/sys-fs/btrfs-progs/Manifest
index 85c94a4566c5..d7d006d01e4b 100644
--- a/sys-fs/btrfs-progs/Manifest
+++ b/sys-fs/btrfs-progs/Manifest
@@ -4,12 +4,15 @@ DIST btrfs-progs-v6.7.1.tar.sign 566 BLAKE2B e5aba64e199f26cef84a8cbbb034c0a5c24
 DIST btrfs-progs-v6.7.1.tar.xz 2565576 BLAKE2B 4e05e9dd80e5531425490970318389aef280f61cc636a80aa2bbc630399afd4f1f3ce649d194822ff93ff4b1774d65a504e3bed6f1426ff60830e4c0d0ac87b0 SHA512 8a2e735f036a0778a2482d42c813012269903174232bc2924af41b72bbcfb49783d5f3b7d0af085285a68754748bd76b6534a498a47cdcea94020f4262281ffc
 DIST btrfs-progs-v6.8.1.tar.sign 566 BLAKE2B 843eada2b00a2370522edc95d79bcfed88bd24233e647946d4807322550593e4d5f5bb5efa6652c754dd0965dc3e389bc97698a0bd8fc5d0e850bea94de98e72 SHA512 84ebaa6ec27aa5bc87a323f5c6cc82a860fada7311ab8319127de3592294c1076d25959e412f8387d54bad3b8ff838ce39c4db4b04a658b2de2eaa7c976e2b09
 DIST btrfs-progs-v6.8.1.tar.xz 2652968 BLAKE2B 34406dedc6d97bd94a498c3bbb424d34a59b8251b37f9a40a87740f96db77780a4cd76c88055b4d9e4f673b4a3621503a6bedb67ceaf20870fb26c10f49b74e0 SHA512 b5f0694e56eecf1956313b3406610c2e22658ace51a636d79efe996780bb0b03fed95e68a8c9a11dd8649958c0e7dbc7417bb479859365d47b52e478f6830d46
+DIST btrfs-progs-v6.9.1.tar.sign 566 BLAKE2B 4735411485669e37558adda62e168f22a09c11d085dd4adc5db4cfe932745c746b373763cb70b31219908886de52544854a3e9dee0b61bbf32d5d7bf4325d2c9 SHA512 c484845ad47b1ebee666f76e5f0421f640391e205158c14e83ef960506df6b0b6d34244bdcd254e2ac47b3d758e515ffec523a773b7f6081d8b47b856bbbe09b
+DIST btrfs-progs-v6.9.1.tar.xz 2662768 BLAKE2B ed26da2c3c07082df7f1a3d2dc43981ac5375e23de44d0068d91075c8f75e03e75eef4ec5175a0c72d57511b4b9474ff3383f07f14db22e97b2b175578f1cd40 SHA512 5a6b6bbcf2d2624ba12f877485c8137d1601ed9b17bd7f05993cccbc46ff0546f8a0aaf4e221e6cb3aaaa0cec53222edc723f787b317aa551b7f4469456d9a3a
 DIST btrfs-progs-v6.9.tar.sign 566 BLAKE2B a2e26047775bcc407b8f5aa8b08b0708a01c84a8cd649e50a935e15d04e2ee917010fc98df0dfb80320ee25a8dbfbbbabbb1f155489f32391544100956ba9636 SHA512 1e8304b3df013a841e82a8656361946914d35f680b5bc547c1599fdd98a75b66e2b1f869c8b043d7532182318c2183e699a9d6101ab4b1544618d2c8a25362e1
 DIST btrfs-progs-v6.9.tar.xz 2663052 BLAKE2B 9fad691327b6290b3ba0e1a638576b65e4e4d6c8f32549ea0f10188fdb40028315abf5e330976ff7a5efb6a258d0008e7602ae81ba0339888f474dc056791798 SHA512 e97907b377040371f4742a45345ec720e0cb8e0cf9ee5fdc60618ce2bc76f572725ec32e1a178fd57534f73affd3eeb5e6cfebf23734f04583bbbef858d913b2
 EBUILD btrfs-progs-6.6.3.ebuild 4599 BLAKE2B 79fd7e385b4ebffb59d0b919cfba46039846d009c3db3bb0c62981c20adfc296d6103cbfe69f62df556effca65f5f8c1120ece2161f158f839693f0858420aea SHA512 d73a464ccac5b57582aa2ada28961cf0285c0285b587059051d0af67ca57bb569d66750deb14cac48bafc82215168ad8c4ca61d9393ded4e19363db788e02efd
 EBUILD btrfs-progs-6.7.1.ebuild 4599 BLAKE2B 79fd7e385b4ebffb59d0b919cfba46039846d009c3db3bb0c62981c20adfc296d6103cbfe69f62df556effca65f5f8c1120ece2161f158f839693f0858420aea SHA512 d73a464ccac5b57582aa2ada28961cf0285c0285b587059051d0af67ca57bb569d66750deb14cac48bafc82215168ad8c4ca61d9393ded4e19363db788e02efd
 EBUILD btrfs-progs-6.8.1-r1.ebuild 4403 BLAKE2B dc5b353b713a59e467da06ddb7b0c1e7a67d95d3b4b0f3438e148570d63e82aa87416da77a11264ab8602b9e5278ed4e3e355d0dc8cbde947f3511f5e1a0ce1f SHA512 b68e3aee56f709ef9e529c2b0ac1ec31d11cbed51ce16b9c4cd8470d358acf2f36995a3047fef697e920dbf601335635d4016720289417a70e10f3958b757472
 EBUILD btrfs-progs-6.8.1.ebuild 4599 BLAKE2B 2fdbb02df514a9c78b34e6b7df55d266b222b60515ba463e8cdaa4b2dcb5d06c68752218691ff2182b6468edcecd735c3ec39433633de1fd52bc80ac8610bd22 SHA512 8705968998ae1f454051d1dabe7c392311d61d81fb93217e3cc2f39913bbe56cbcbd7de75d452aadde14e905c371f3d543cb9673de34544776fe685dfa9a65ac
+EBUILD btrfs-progs-6.9.1.ebuild 4171 BLAKE2B c74e04d0dbf096e372c2a2b634a16f517f2f035c4301e7c88fac0258a295084774b786638ee3f7a90f24deac91dd1cf789fb245ffc115c1d9fa5469cdf722612 SHA512 7c758a53937991f46988263f182017fe462cdb3ca9e77679dc0fed499bb48c53e5a06292c0c397cb1c779772974e88e04cfc10e022de8770e313b2ec3c37c770
 EBUILD btrfs-progs-6.9.ebuild 4171 BLAKE2B c74e04d0dbf096e372c2a2b634a16f517f2f035c4301e7c88fac0258a295084774b786638ee3f7a90f24deac91dd1cf789fb245ffc115c1d9fa5469cdf722612 SHA512 7c758a53937991f46988263f182017fe462cdb3ca9e77679dc0fed499bb48c53e5a06292c0c397cb1c779772974e88e04cfc10e022de8770e313b2ec3c37c770
 EBUILD btrfs-progs-9999.ebuild 4171 BLAKE2B c74e04d0dbf096e372c2a2b634a16f517f2f035c4301e7c88fac0258a295084774b786638ee3f7a90f24deac91dd1cf789fb245ffc115c1d9fa5469cdf722612 SHA512 7c758a53937991f46988263f182017fe462cdb3ca9e77679dc0fed499bb48c53e5a06292c0c397cb1c779772974e88e04cfc10e022de8770e313b2ec3c37c770
 MISC metadata.xml 610 BLAKE2B 70361c4d5434a98f73a3d38ed47d7be830783529db6217396f2235cdedd58744fc6e52e4de1994d28184fe9d8aa5d2982c433d47eda1868cfdb79edf0769a620 SHA512 8958c02574adb1395a9d21d9e9ad5db38570b82a1c7211752eb007eecbd0e541e880a060649641f40be877f167e14f278f14d5ef8775766ef9a6fa5d3843dc53
diff --git a/sys-fs/btrfs-progs/btrfs-progs-6.9.1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-6.9.1.ebuild
new file mode 100644
index 000000000000..b4d9a3171bef
--- /dev/null
+++ b/sys-fs/btrfs-progs/btrfs-progs-6.9.1.ebuild
@@ -0,0 +1,181 @@
+# Copyright 2008-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+inherit bash-completion-r1 python-any-r1 udev
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/kdave/btrfs-progs.git"
+	EGIT_BRANCH="devel"
+	WANT_LIBTOOL="none"
+	inherit autotools git-r3
+else
+	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/dsterba.asc
+	inherit verify-sig
+
+	MY_PV="v${PV/_/-}"
+	MY_P="${PN}-${MY_PV}"
+	SRC_URI="
+		https://mirrors.edge.kernel.org/pub/linux/kernel/people/kdave/${PN}/${MY_P}.tar.xz
+		verify-sig? ( https://mirrors.edge.kernel.org/pub/linux/kernel/people/kdave/${PN}/${MY_P}.tar.sign )
+	"
+	S="${WORKDIR}"/${PN}-${MY_PV}
+
+	if [[ ${PV} != *_rc* ]] ; then
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	fi
+fi
+
+DESCRIPTION="Btrfs filesystem utilities"
+HOMEPAGE="https://btrfs.readthedocs.io/en/latest/"
+
+LICENSE="GPL-2"
+SLOT="0/0" # libbtrfs soname
+IUSE="+convert +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
+		)
+	)
+	udev? ( virtual/libudev:= )
+	zstd? ( app-arch/zstd:= )
+"
+DEPEND="
+	${RDEPEND}
+	>=sys-kernel/linux-headers-5.10
+	convert? ( sys-apps/acl )
+	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? (
+		$(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]
+			dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]')
+	)
+"
+
+python_check_deps() {
+	python_has_version "dev-python/sphinx[${PYTHON_USEDEP}]" &&
+	python_has_version "dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]"
+}
+
+if [[ ${PV} == 9999 ]]; then
+	BDEPEND+=" sys-devel/gnuconfig"
+else
+	BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-dsterba )"
+fi
+
+pkg_setup() {
+	: # Prevent python-any-r1_python_setup
+}
+
+if [[ ${PV} != 9999 ]]; then
+	src_unpack() {
+		# Upstream sign the decompressed .tar
+		if use verify-sig; then
+			einfo "Unpacking ${MY_P}.tar.xz ..."
+			verify-sig_verify_detached - "${DISTDIR}"/${MY_P}.tar.sign \
+				< <(xz -cd "${DISTDIR}"/${MY_P}.tar.xz | tee >(tar -x))
+			assert "Unpack failed"
+		else
+			default
+		fi
+	}
+fi
+
+src_prepare() {
+	default
+
+	if [[ ${PV} == 9999 ]]; then
+		local AT_M4DIR=config
+		eautoreconf
+
+		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
+		--disable-python
+		$(use_enable convert)
+		$(use_enable man documentation)
+		$(use_enable elibc_glibc backtrace)
+		$(use_enable static-libs static)
+		$(use_enable udev libudev)
+		$(use_enable zstd)
+
+		# Could support libgcrypt, libsodium, libkcapi, openssl, botan
+		--with-crypto=builtin
+		--with-convert=ext2$(usev reiserfs ',reiserfs')
+	)
+
+	export EXTRA_PYTHON_CFLAGS="${CFLAGS}"
+	export EXTRA_PYTHON_LDFLAGS="${LDFLAGS}"
+
+	if use man; then
+		python_setup
+	fi
+
+	# bash as a temporary workaround for https://github.com/kdave/btrfs-progs/pull/721
+	CONFIG_SHELL="${BROOT}"/bin/bash econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	emake V=1 all $(usev static)
+}
+
+src_test() {
+	emake V=1 -j1 -C tests test
+}
+
+src_install() {
+	local makeargs=(
+		$(usev static install-static)
+	)
+
+	emake V=1 DESTDIR="${D}" install "${makeargs[@]}"
+
+	newbashcomp btrfs-completion btrfs
+}
+
+pkg_postinst() {
+	udev_reload
+}
+
+pkg_postrm() {
+	udev_reload
+}
diff --git a/sys-fs/btrfsmaintenance/Manifest b/sys-fs/btrfsmaintenance/Manifest
index 7fb71fa66124..af1530ed1a8c 100644
--- a/sys-fs/btrfsmaintenance/Manifest
+++ b/sys-fs/btrfsmaintenance/Manifest
@@ -1,5 +1,6 @@
+AUX btrfsmaintenance-0.5.1-script-fix.patch 422 BLAKE2B ae70f1af682c3dc1782a7e9a465467ea467c28b472bd2e3ae2987b926bb27114a0bfd241b39b3c4b02268a7b98b71197ed5c638831826c65f61107ab92be4740 SHA512 e685ddda9c44c46fa241b5cf3ebc740844c4663e2fb3ecdffed7d476d4afa08f68c93825e5ff0d49108983031c5851fecc54e2bf3efb5920d34dde0a526b8249
 DIST btrfsmaintenance-0.5.1.tar.gz 26835 BLAKE2B 22cbde3208c7652bc341014785e61d5904b0696cb864edb9ff1563fc277cde14cfa990895a85a98071bdb9b7e4562d0ea9b981a23d1a6511dfda7390ac110f22 SHA512 9ac40c166ff2692373d28107bc4956e78d76090fefb21b8305feb3f936d98a7f94f1bc62b36529a882dbf93083402c48ac94c30a05eab7bd1f9eda13d410ef41
 DIST btrfsmaintenance-0.5.tar.gz 24602 BLAKE2B 313c904aa53fc237472256ae74c9eafaf2305b437e280b6bb9c79c2bbaffb6b273304e57d096a911e658fa41fe80308f2a7ad76ded62d79a7f72439163b36444 SHA512 fadab1cf33992c42d476649fd017ac4ae26d6bf6a814dc49d0b7b38e04861474c4e54e6ebe429a83e662b8e5c7be7f460b551c65788d960e2f8f0c7512deef41
-EBUILD btrfsmaintenance-0.5.1.ebuild 2183 BLAKE2B d67ed6ba12000334909ce05281e94051715c316d913184abc2143debd30f25536c169e03839b0e779cf20c6c50ba877205b845a3e07572a737dd529937acc5f6 SHA512 bcb095d8406b3872b28cea83011e984fbc6141ade09caee52b4b52b0afb7c1d3fbef72b1361172da26ff3dbf8d66eaddafeaf98838e8e09feea3f2de06e19258
+EBUILD btrfsmaintenance-0.5.1-r1.ebuild 2231 BLAKE2B 7e74754d492cf414eb45e842f2f72e4f0c809c215f8a1d1d5b7a6239f916f97e79343694a67122c81a0c7df56c12ebe64696023bbf5cc1dfd59ead56931d5f37 SHA512 1354669d117e55e75297aac4cddf555032b7c56abfc91afe8d76a070290a45e374ecab858e907e4a3451beac71978644b6b1f877f0867eda6e33225c2919ecfc
 EBUILD btrfsmaintenance-0.5.ebuild 2180 BLAKE2B dea3d0da1d630ada178c3d0a82bf268dae3bf8abe681b3ef4819e7e41ee3061dcb0121ccf40a5ca3f9f1c8819e38d5d940af70c902575019476a38db2d341b73 SHA512 3bb517b257ee7e83a61850a2fca6cf8276f7826235b325c6bb8700e79f6ed404a3148c6a29205a23f150314ac64ac489907f6ab531fd338aa189ff140e1f4d73
 MISC metadata.xml 595 BLAKE2B e37fd5ba56f1d30747d847927e50b29314b84851c35cc911e0648af421b0130166300fbdf71ee316b32fdc91927a1f5c411eb18ff0cc2d3da67364d71da12af0 SHA512 92834a34c01a8b8a0feddf89d75f2eecfb45027157070e49de765ab61acfee6900a4fe7a12ed42b1204142a12a7309e5134ddfc69dfc8c108bc02a83e443d861
diff --git a/sys-fs/btrfsmaintenance/btrfsmaintenance-0.5.1.ebuild b/sys-fs/btrfsmaintenance/btrfsmaintenance-0.5.1-r1.ebuild
index 82b7ba58cf41..e26232645159 100644
--- a/sys-fs/btrfsmaintenance/btrfsmaintenance-0.5.1.ebuild
+++ b/sys-fs/btrfsmaintenance/btrfsmaintenance-0.5.1-r1.ebuild
@@ -21,6 +21,7 @@ RDEPEND="
 	systemd? ( sys-apps/systemd )
 	!systemd? ( virtual/cron )
 "
+PATCHES=( "${FILESDIR}/${P}-script-fix.patch" )
 
 src_prepare() {
 	# Fix config path into watching service
diff --git a/sys-fs/btrfsmaintenance/files/btrfsmaintenance-0.5.1-script-fix.patch b/sys-fs/btrfsmaintenance/files/btrfsmaintenance-0.5.1-script-fix.patch
new file mode 100644
index 000000000000..f546a417feb3
--- /dev/null
+++ b/sys-fs/btrfsmaintenance/files/btrfsmaintenance-0.5.1-script-fix.patch
@@ -0,0 +1,12 @@
+https://github.com/kdave/btrfsmaintenance/pull/119
+--- a/btrfsmaintenance-functions
++++ b/btrfsmaintenance-functions
+@@ -101,7 +101,7 @@
+ 	else
+ 		# Flock older than 2.27 does not support --verbose option, check
+ 		# if it's available as we'd like to log the information
+-		if /usr/bin/flock --help 2>&1 | grep -q -- --verbose;
++		if /usr/bin/flock --help 2>&1 | grep -q -- --verbose; then
+ 			verbose="--verbose"
+ 		fi
+ 
diff --git a/sys-fs/progsreiserfs/Manifest b/sys-fs/progsreiserfs/Manifest
index eb674c8237be..5faf8f79447a 100644
--- a/sys-fs/progsreiserfs/Manifest
+++ b/sys-fs/progsreiserfs/Manifest
@@ -2,6 +2,6 @@ AUX progsreiserfs-0.3.1_rc8-autotools.patch 275 BLAKE2B 74893b9f8bb59af8cc6dc385
 AUX progsreiserfs-0.3.1_rc8-c99-configure.patch 2049 BLAKE2B c20970703063cc8ccf7e047501662d989d3c3fbe1929c51613e7f7e83161081c28359ef35828d3a2ad4be241c75516a3d6c59495e030949f83deacc708f710b3 SHA512 6c555cc75515ecd5cb12eaea4aa3caef29538fd023a8f72119a25cc08190c2bf1d51c8e73a9eac2927eee00ca794bb7f1cf2295204a31048c67efd9e2c8f614a
 AUX progsreiserfs-0.3.1_rc8-musl-getopt_internal-fix.patch 1064 BLAKE2B efacb997fa18236b20a589e7e210048d1051dabfc90f400c437c72998d91cbe474739340c16b94018082a8fb0bcfcbbd99343903156b62b0156da17b103612ac SHA512 3769a855b765e97ef48a8e22bee6c9f78e7c9cd679b0c794229712e337e6793c154a36b044011fbb15a39a5ca895841430615f7348dfda11d9329a57f1fe04b7
 DIST progsreiserfs-0.3.1-rc8.tar.gz 399279 BLAKE2B 536d18ce186c9a3b796c01cdad5f622befdffcc975a82ad24d0f2dbbc3b3bac8530231bd51d460033f9ab0bf1577d533faf17f4ea5548b175a708ddc924c50f0 SHA512 65266ab5a598b2073e6893da6554bdfe43796be3bd608eb7c4f687c3ef6ed395ce67def49b62d2b3705dfdeb38bd5f5d1c91fec6ad7323788d490058b015c26d
-EBUILD progsreiserfs-0.3.1_rc8-r1.ebuild 1446 BLAKE2B 849a92925319b5a0a4e8560e31d046c703d3e0c6f9be57d8f35cbd4c64a6f6488e19e0c3afabaca7d3c18292c65a4bbdca8ba09255bfb93230bd766aec8dce6a SHA512 cbe687441135f4ea8ce950aa1f14d2d5f5f1134e6862229b0d708757bc8646349f1c66cb06fbd3336c7c66b4c7c2c9dda77b817a03d65a525924ed14a863d263
+EBUILD progsreiserfs-0.3.1_rc8-r1.ebuild 1443 BLAKE2B db5315557e094e7f6e92fa3aea144018fc9be9c9b6897cd3958bebf746f1c6c296a6ff1b4929d847b32baa43681c8322fb222780d3c16bab10e86abf33e7dda0 SHA512 9b8b5bae0da77ff706219b2fb0c524a9ab57a2ee002f0b695932ca5117f97ce5f3f1ada04ca3ab3e14685869377006ff267546a4b72078148413575d138fa303
 EBUILD progsreiserfs-0.3.1_rc8.ebuild 1330 BLAKE2B 29d2401fe6d0a48bcf3b4cc0a1695c09f5665e4238b9d96660ee3ed458ddf414e1efe001088268b459bd17d7445bb0180fa23e9ea99e12b62fafde52d3b2f8bd SHA512 b907c2b50bff8632dc4894dd5c22de9808f7c5fac6cde45f2b92ab5079e064937cd156a47a5744e36c072eac1e5942ba8fcde9e3669f19295a5bdd1e66d8f06f
 MISC metadata.xml 426 BLAKE2B e8542ac08694bf7893d92fb0fc133b3f1bfa231990dcbce1159140a3d49180440fb90ee5779da91f86f9db16a5748c7013ea70908e80ec5a67e0b350bdabaa2f SHA512 3dddd37daef3dcfc975dec6f52b971a8d4d7346888263d5e6908e98740481f80ce042921771d1889cd1b49f5c6621928da760124d42b1a351beb43fd7c4c4b07
diff --git a/sys-fs/progsreiserfs/progsreiserfs-0.3.1_rc8-r1.ebuild b/sys-fs/progsreiserfs/progsreiserfs-0.3.1_rc8-r1.ebuild
index 7032c07d8a37..4a708ff932ae 100644
--- a/sys-fs/progsreiserfs/progsreiserfs-0.3.1_rc8-r1.ebuild
+++ b/sys-fs/progsreiserfs/progsreiserfs-0.3.1_rc8-r1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~sparc x86"
 IUSE="debug examples nls static-libs"
 
 DEPEND="
diff --git a/sys-fs/quotatool/Manifest b/sys-fs/quotatool/Manifest
index b4a3654dc92c..a273154a1092 100644
--- a/sys-fs/quotatool/Manifest
+++ b/sys-fs/quotatool/Manifest
@@ -7,5 +7,5 @@ DIST quotatool-1.6.3.gh.tar.gz 105408 BLAKE2B aad673bab49071122c3ddb64a6f9e3006b
 DIST quotatool-1.6.4.gh.tar.gz 108459 BLAKE2B 78b547e70e94aebcd7355fb88c2d8ddbde539a9f6b8737d27947e88990808b59b8dad0f81eb4de5888a4d10127f9a87bf60dddd9fbeaf9c9acdd864b124434e3 SHA512 ba753085235909a6eb11332eb704cd8b1816f74e9552b77b1b34833432b95ff5f92881ea60c36be3dbe09e6b39446c575993cfe51263ea3b664852e3d023b70a
 EBUILD quotatool-1.6.2-r1.ebuild 774 BLAKE2B 492129dc61626e384a3c6ddfe8a8a9575c19b301c1cd176636b14dad461654b873b082ae7a4b5962d691a9f741899742b10a58ebd0428f0b90419b5778d48154 SHA512 45d4046fce9151538fff8eaf6323584061b710f026391342daf0e8ef208a9063667c43fcdbb66749fd02dfb99523b4f60b0dd5bbfea0d588ff2c53408a84b830
 EBUILD quotatool-1.6.3.ebuild 519 BLAKE2B ae99f8f09573b265baf26893c79e8756ff0a51f22905d27a0484dc033b8dbbeda3d738b3ca6f7fdc88bcac5ad4dde21218dba9fc5959c90d40e2de4cbd02d086 SHA512 22d25a8300992002ea36c743ff81322f43c819ca95a9fbcda6030a9d10527a2066c6eee3affc6dc8f63fab245997eeb7141520d9b20af03b051a9bfccfbddb08
-EBUILD quotatool-1.6.4.ebuild 522 BLAKE2B 4de23dfdb41918603ad3092f434e02deb00de66caa55579a5dc12f0361f47ddc29ab42e448964dcbc2af493d876a6c949d5147b17bc260f641ff158093e5d113 SHA512 1681a74fa117c03d380e9acad5ffac18d825ae12b53f327847f3c1b3c26de54ae9aa18b334da07cb89d5efb8bdddd9d2145feb00f578cc6f45419b493ea7d643
+EBUILD quotatool-1.6.4.ebuild 519 BLAKE2B 1e14dbc0a01dcfcce8f9336ccfa7de80850a52e2d58620c8109ed25d906467d3680381e783f6807dded9e5ace1b38e2d424e5470bb9bd085b81cc193d5aced29 SHA512 49e074bec482802ae1f7ba3836fd62a60b44fcbaf525d7bd55a1310058d4e5b1b624495233f57f0d0b78d1202150980985b3f49958a42e52b4a500c158931eae
 MISC metadata.xml 341 BLAKE2B 1bf0dc2eaf87efd6d1d578e0c9d3a0743b8fd9b3610238386a1bdc1bf7cc040dc9f08261cb2bc3d1e006773b9c3d314406b66559aa33590c3ca416fa49572348 SHA512 77c0761e2ca47085ef0bd734d126e44b30a7fca25c636d5b3dbf7de8b4bcf686078f076cf86d1c868c2e557f372b87afbd97f4f47719b15710175fd55d7ae921
diff --git a/sys-fs/quotatool/quotatool-1.6.4.ebuild b/sys-fs/quotatool/quotatool-1.6.4.ebuild
index aef0f3146b06..77e6eb008c1f 100644
--- a/sys-fs/quotatool/quotatool-1.6.4.ebuild
+++ b/sys-fs/quotatool/quotatool-1.6.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/ekenberg/quotatool/archive/refs/tags/v${PV}.tar.gz -
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc x86"
 
 RDEPEND="sys-fs/quota"