8 files changed, 211 insertions, 2 deletions
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index dbeafebdc795..a9505cb2f290 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 c092de921755..a43a6e2aa668 100644
--- a/sys-fs/btrfs-progs/Manifest
+++ b/sys-fs/btrfs-progs/Manifest
@@ -1,9 +1,11 @@
 AUX btrfs-progs-5.18.1-glibc-2.36.patch 984 BLAKE2B d7aefe6434a4719d1b98ce1842e340f8eb322b95adb4037cac10a7824fa94ad7c8a86e01967d99e1e9ede9cda4f6e55b53c440e9d37b94018e31388b7214c5d4 SHA512 cad4314966c634f44252173ff23f09822d2448ac9346d1e9d5c0a193ada1606ed6c7515a3283b2560d68ffb7a004c4c25549f1cd5c87330a1aa49e1a3d722719
 DIST btrfs-progs-v5.15.1.tar.xz 2280796 BLAKE2B b460254a6261d3d04a2d265a3b4e05a89385888f7ea4f2b16ec5b73922646c7f47a546fc78ba7c009e65914125435cf38157eabffc74f5d00df2c21c844922e3 SHA512 68ed89e337ae857fdaf077eaa889e259e9f162ea2222bdaa03f4187783a8682c24d45c91b0559b901d81429ba2cd3f84087d032d354092d5512fb226bdf91549
 DIST btrfs-progs-v6.0.2.tar.xz 2321220 BLAKE2B 391bd9dcc7ae2d40c339eb9b7fb466624c3f122149af640bc0ca73abfc85ca7bd076976d47ce2d4eab64fb3b9b1309e3446acdd78ba77e5cb583b939710f8b6c SHA512 8e01fa6e3373d95a8e8577003ceb94722e4dfdf24110bfea79191a9862daf5e6580d72e898fdea134b5e86beeda32948eed572072f7906226189c6f1ac8615e3
+DIST btrfs-progs-v6.1.1.tar.xz 2329864 BLAKE2B f3f15829af88f83cdabca30b61dd0e53fc0913615028eac9501204adec5a5beb8654b037617a73bac96c901835a83e8c08d478b8b496518512fea3714e604cfc SHA512 996045bebc441eba269eb5159d6d13c7b1471ba88039389ef221f57d03c535647a5716e23e7a17a20efb4012003f58b4b768f66af633abbdc1fe481192ca1ace
 DIST btrfs-progs-v6.1.tar.xz 2331140 BLAKE2B ca5ba5c1b18bb7db0023e95b3540c6e4863a8bd606e0416d6e1548d4356690d08e09118539ac34e8134329f9b95f7c8f54ea37d3396c9fd8438fb0ba4efcf5f2 SHA512 e20f70ea00f593d90b95b6f0f6b105fc72551b3be0b493c07e92fb31a8db3884edac6344ff1c7ffdc3688948f7bce7c226eea1372ee9f31d5b0194dda6d65389
 EBUILD btrfs-progs-5.15.1.ebuild 3167 BLAKE2B 56951fda134b6eef1a5a044eedd6212203a5214b4f9eb062bd31da41d475216499ffe521b75dcf88b67cb06a6b8c279042e1d46d8eb17d52a68c9e5fa74d8650 SHA512 e77895f4e6d0211168c60e256e56cac5d681593674d85971e49210ccf496fa8344055360130e5ae635dd197ee0e27fa6ed6c50647dc121a7e7392ef2bad7e276
 EBUILD btrfs-progs-6.0.2.ebuild 3316 BLAKE2B fb25f51fadbef9d557618ba091b55aadce8d32e1d9ebbdaa11da594ae29e2a568a734a284d6047f4d89c32e35a12d2062edb64be94962fc02c090c0e04473515 SHA512 83b6393f49f62fd949bb39d8775f48d06c4188e944e7c04f998f1377f3da7f4086d6d7e4563bb504c35168a8ae2614a71feb9facc1cad8235bacb64df378d330
+EBUILD btrfs-progs-6.1.1.ebuild 3322 BLAKE2B ac22e46b7f573e6cd281945b0df4942a73b8a7ee5ee5cdd7b3ab927d2170e941437375e237f67f06e83c054db2dbe5626b4735ecdf8812dfd5f193f962608d95 SHA512 dd709040834ed4826df628b12be8c5660a5792996af673aa2942319c8d176f5c2ac5ae94983b6bc42f15c14953ed75b6bf1d317db2cbcccffdca037d5f9d659b
 EBUILD btrfs-progs-6.1.ebuild 3322 BLAKE2B 6463cd65703acb98f9b0ea498b391fb8cc4d44366481e944b71e2a68c64815aef3ac192a11b1ef3331af6a820cf7e48710ecb3ffd5f0e894464b730dd14a915e SHA512 c132b68c5fdc7eb26c05ac47c16c35aa803ffc21e9aebd7eb75735df51eaa00021673aedc04125326f5f44030a579585c1f8f0eb04aee977ac128280ffd3d018
 EBUILD btrfs-progs-9999.ebuild 3322 BLAKE2B 6463cd65703acb98f9b0ea498b391fb8cc4d44366481e944b71e2a68c64815aef3ac192a11b1ef3331af6a820cf7e48710ecb3ffd5f0e894464b730dd14a915e SHA512 c132b68c5fdc7eb26c05ac47c16c35aa803ffc21e9aebd7eb75735df51eaa00021673aedc04125326f5f44030a579585c1f8f0eb04aee977ac128280ffd3d018
 MISC metadata.xml 524 BLAKE2B 4e27833128aeb064271af7a4f3c05699b4603b1d993b32bef3d9d973182d3d0c88ac799c95f0f35495e9a99e645627afd96049273c08c3e1334d8fe1ccf0debe SHA512 471014a98bc3feb75e7930485e89daf6cb3390c37a330b8373d5c3b0b764b9180cbff133839ce4742a3c76f63e6f18895060d5906e6a113d2cd43af0df3b0d5a
diff --git a/sys-fs/btrfs-progs/btrfs-progs-6.1.1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-6.1.1.ebuild
new file mode 100644
index 000000000000..2fcbaa6200a9
--- /dev/null
+++ b/sys-fs/btrfs-progs/btrfs-progs-6.1.1.ebuild
@@ -0,0 +1,150 @@
+# Copyright 2008-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+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_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/duf/Manifest b/sys-fs/duf/Manifest
new file mode 100644
index 000000000000..ce7b6ecec7c7
--- /dev/null
+++ b/sys-fs/duf/Manifest
@@ -0,0 +1,4 @@
+DIST duf-0.8.1-deps.tar.xz 6372212 BLAKE2B 01baf089f6142759ef8e376b352e31ecd482f0a94106a4e2606c2f6146cdd7ec33b431621dd680876650896f9d590a21d242b871777164af588e35804a11477e SHA512 51b966b5a8701c8e39ea2d022ca6ee1e0c64fd189b3531d8d0e253d46ee2b5d7270963c3a4930e964312085914edac45c78ed8fa440b459df13977c83ab3c964
+DIST duf-0.8.1.tar.gz 138214 BLAKE2B 388b7494ae15bdc026303ec81f529c08c66e34a8fb82d13c9b7fa730b1684edee5711497d866cbd16376573a386ef9311288e7e9d6143a577d2381425f8218bc SHA512 598318cd90e8a27bdc448cb84682f3846baa02bab0f527a26de42b8b3efd3ba258a76b6f7a74a41405e20b23ccff92db1b6ef7d3412fc8261942a8ccde4241dc
+EBUILD duf-0.8.1.ebuild 613 BLAKE2B 83cf70dd011bccd2e467e984155614594e7b47c62b7f3bff7f7420a9b06b05a6cb83d4fb2a8ceeacd92fe6ccd86c96f3bd6f5743705bb55a0a40c709047b5018 SHA512 a174b7dc51eb40d2478c265717408e07c0803d388e0f1673f1f254d525f2164207723e90753e6edb985c668aca12a508942513ad252a877b24acec0c9607b3fb
+MISC metadata.xml 767 BLAKE2B e6612eda8c95561b5bdc9f75ce9059cd557c0e56ade957968235fbb3917bf5a1d0cb1f1daf2e20b0a41e0490555f0f33ef25333ccfb87ed41b77d6bc3963c963 SHA512 bb56a029fb0f82f0cbecb4181bfd3cd67b51188795441b3e702906644b7da10e929018a77740825a5c68e781e0711446a06480ecb3ffb745edb885cb2e277eac
diff --git a/sys-fs/duf/duf-0.8.1.ebuild b/sys-fs/duf/duf-0.8.1.ebuild
new file mode 100644
index 000000000000..d948b7dff84d
--- /dev/null
+++ b/sys-fs/duf/duf-0.8.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module
+
+DESCRIPTION="Disk Usage/Free Utility - a better 'df' alternative"
+HOMEPAGE="https://github.com/muesli/duf"
+SRC_URI="https://github.com/muesli/duf/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://github.com/mrmagic223325/duf/releases/download/${PV}/${P}-deps.tar.xz"
+
+LICENSE="MIT BSD Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="pie"
+
+src_compile() {
+	use pie && GOFLAGS+=" -buildmode=pie"
+	ego build
+}
+
+src_install() {
+	dobin duf
+	dodoc README.md
+	doman duf.1
+}
diff --git a/sys-fs/duf/metadata.xml b/sys-fs/duf/metadata.xml
new file mode 100644
index 000000000000..a154ef85f53a
--- /dev/null
+++ b/sys-fs/duf/metadata.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person" proxied="yes">
+		<email>mrmagic223325@fedora.email</email>
+		<name>Mathis Winterer</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>sam@gentoo.org</email>
+		<name>Sam James</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<maintainer status="active">
+			<name>Christian Muehlhaeuser</name>
+		</maintainer>
+		<bugs-to>https://github.com/muesli/duf/issues</bugs-to>
+		<doc>https://github.com/muesli/duf</doc>
+		<remote-id type="github">muesli/duf</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/sys-fs/multipath-tools/Manifest b/sys-fs/multipath-tools/Manifest
index ebb9c5e08cd7..46818f931e07 100644
--- a/sys-fs/multipath-tools/Manifest
+++ b/sys-fs/multipath-tools/Manifest
@@ -1,5 +1,5 @@
 AUX multipath.rc 565 BLAKE2B efb26199eddb75c5e87d1ab40aa8cb4fbaf9f7a2bfd7a20add6d55997d25de9a3dbf0d032c977593c2ee8d447539a34be0294ee3a80a80fb004dc2c51c8c64b5 SHA512 f08833fc3c928900f8c29438208b9715581bae426b1f45c246e8c418b210f7f9d35517ef9ad44db3d88944183b34e3411ece909b56892a9f3b7250fed49e43fe
 AUX multipathd-r1.rc 264 BLAKE2B f08733746c702da27e002b2cb07bbc1a1925002b1592c2f566aa8d66c71da5fd39fd6389636fc49b602f9051190ee5f7f85ad9ff35b924f51a2698e1a6654f0e SHA512 8cf764b59ed4bb13c3c2143cd83ee39bc87eca85c40acb3ed1dcd7cf4c39ecbdea7974b9705231d48377266c034a8623157648b9a99b6cef73617e4b37ad377e
 DIST multipath-tools-0.9.3.tar.gz 552442 BLAKE2B e2065119cdd68bd8c2b4420bd0de9ce370601597972dba32c076bfc4df6d0a1a65356454a2f96f95f27cf681387685edcbac2eb41258d4a7049a1ef62cdf0949 SHA512 4faa2ee5a96a9d5d752219931ebc885cb70ed6b022d45ede985ad7919c043a3aee166e6f126d32dffd187c5c32d5cbce91747d87d0b55557e2f7f68b279583da
-EBUILD multipath-tools-0.9.3.ebuild 2328 BLAKE2B ff73af2f67386d163fd94f3f88ae4b299b447b95ee7449a860ea9e791305f92c7d41fa64d42d1633464c4322bc0491f5cff9024ca13a1bb7f62e990471c70d5c SHA512 a8d5572055b6d4883bd142b0288f034c4e6b3beb4c8c47b8c55d00c8e1d7d11dcf4802e5c8a63eef46d4d158ae49fb73ee35353d1207d029481a6da539615e68
+EBUILD multipath-tools-0.9.3-r2.ebuild 2430 BLAKE2B 4e00be11956c5b7afc44dcad8e608b312a44aade65971951e48faa7fb1d492e84fa285548ad9740018e7ec4b49ecae29638989f03f3d6cbdb47d9d6ded201072 SHA512 9b99079b9090b73b2c8154cd389579919c1bdfd9275f01af679c244436a07bf969c12264655658a19e145cc496d7954a780ade5e6b2d53ca2bf80b0606a0da1a
 MISC metadata.xml 346 BLAKE2B 8c5d2e150c70bdff56b05009f11d40663d9d969b07ecc88ff310fd4e756339d2f9a4a6b351b14c6cebc69ed36f17eb0500a0ba2b34f7c6b75c3864d1e090a46f SHA512 ffb0aab5f2d8bbdf83e0df3cc84cd239649e94e1189ba4702221091469309d3d49783c6943aae27eb34e3373f3e07a571930a361058d9a3b67f725781c47b87e
diff --git a/sys-fs/multipath-tools/multipath-tools-0.9.3.ebuild b/sys-fs/multipath-tools/multipath-tools-0.9.3-r2.ebuild
index 6fa03671b730..65869a69983e 100644
--- a/sys-fs/multipath-tools/multipath-tools-0.9.3.ebuild
+++ b/sys-fs/multipath-tools/multipath-tools-0.9.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -43,6 +43,7 @@ src_compile() {
 	# so force the test to go the way we want #411337.
 	emake \
 		prefix="${EPREFIX}/usr" \
+		plugindir="${EPREFIX}/$(get_libdir)/multipath" \
 		LIB="$(get_libdir)" \
 		LIBDM_API_FLUSH=1 \
 		PKGCONFIG="$(tc-getPKG_CONFIG)" \
@@ -61,6 +62,7 @@ src_install() {
 		prefix="${EPREFIX}" \
 		LIB="$(get_libdir)" \
 		RUN=run \
+		plugindir="${EPREFIX}/$(get_libdir)/multipath" \
 		unitdir="$(systemd_get_systemunitdir)" \
 		libudevdir="${EPREFIX}/$(get_udevdir)" \
 		pkgconfdir="${EPREFIX}/usr/$(get_libdir)/pkgconfig" \