10 files changed, 98 insertions, 84 deletions
diff --git a/sys-fs/compsize/files/compsize-1.5-btrfs-progs.patch b/sys-fs/compsize/files/compsize-1.5-btrfs-progs.patch
index 3d2d75e370c0..fcec5e1662d0 100644
--- a/sys-fs/compsize/files/compsize-1.5-btrfs-progs.patch
+++ b/sys-fs/compsize/files/compsize-1.5-btrfs-progs.patch
@@ -1,5 +1,4 @@
-diff --git a/compsize.c b/compsize.c
-index 42ec304..0f533e5 100644
+See upstream PR: https://github.com/kilobyte/compsize/pull/54
 --- a/compsize.c
 +++ b/compsize.c
 @@ -5,12 +5,14 @@
diff --git a/sys-fs/exfatprogs/Manifest b/sys-fs/exfatprogs/Manifest
index 594cbacfb391..7dc96999839c 100644
--- a/sys-fs/exfatprogs/Manifest
+++ b/sys-fs/exfatprogs/Manifest
@@ -1,4 +1,2 @@
-DIST exfatprogs-1.2.2.tar.xz 274552 BLAKE2B 457c2036f07d81193bfb8f23a47410f70ddf125b91f88ddb303874341d5304293cc254e337d820b15ac135c4a96d59a35e6e741f049052065a5f866720516c13 SHA512 51ff77860704a7a4a2986e0090514d46614d6d6ce5ad07ea622e4dd806f06f034959a0c35d7e67689a7eb6836a1de967e302d5ec1c9ca6d33fa80d68d574741e
-DIST exfatprogs-1.2.3.tar.xz 275976 BLAKE2B 68d6a6d389748f9a0b815bc325696c1c2104a72a6e681888ef98e02e0244c7335e6f4abde40ebbdb28a3a5ac098e894a788e17d378993e59f0d7906f65ab394b SHA512 7ed568fba5bb4d12fcf6d5cf4b8afc1f0d95a28c67dcbe722284d3cab689b668b78a6c87e56a427d93542d6df45bd288794a4f2e60f94e831eab00eae7f097f4
-DIST exfatprogs-1.2.4.tar.xz 275696 BLAKE2B 70b60f339affb4236b050bec089395f732965a5e0959eb271f4dd2664536336288cef3103cb123fc33fe32c9c4c51ab17430db5fd169bb61f4afc2c003c51752 SHA512 9073e7643c68f43c948cc7b8a0a75c89375351801ae9e3e015858760663b223f3da32bac64f814a57cbf748e6ce7943ebcac7d8fe885ebca31a2184061d10daa
 DIST exfatprogs-1.2.5.tar.xz 364904 BLAKE2B 11909a494d0e6ae3ba938ae6c8511d587037f32c0a07a7775c3da5e1019cd2ca989f42e616da4a44e32551d936db97a935b0074322389cc39b4c336043535bea SHA512 812c070e8b0b87e481081ff7a4d26d99fe0e6aadf3b4cc81c211bd269ebd3e42c419baaaa95335f3967868f8c9f39f6e5a6e951c92b86fa881b9c88b435ed7e3
+DIST exfatprogs-1.2.6.tar.xz 365832 BLAKE2B 2f92976638cb7ec626692a60ac7097003ab441d1cca6cc502b776c2954da0e527fa28053e4c2c601aecadd267684910bcdf0f00797322ec9635fe64263fe2d1d SHA512 e0fc88bd7cbac023ac58965d3c1d6b0722277c39efa3e098b0e395e0d245ce445c3f202af9c313e93fcd5d891e14044af479415915ed52a94c55d71945d14762
diff --git a/sys-fs/exfatprogs/exfatprogs-1.2.2.ebuild b/sys-fs/exfatprogs/exfatprogs-1.2.2.ebuild
deleted file mode 100644
index 64cf3654a575..000000000000
--- a/sys-fs/exfatprogs/exfatprogs-1.2.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Userspace utilities for new exfat filesystem (kernel 5.7+)"
-HOMEPAGE="https://github.com/exfatprogs/exfatprogs"
-
-if [[ ${PV} == *9999 ]] ; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://github.com/exfatprogs/exfatprogs.git"
-else
-	SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm64 ~loong ppc ppc64 ~riscv x86"
-fi
-LICENSE="GPL-2"
-SLOT="0"
-
-RDEPEND="!sys-fs/exfat-utils"
-
-src_prepare() {
-	default
-
-	[[ ${PV} == *9999 ]] && eautoreconf
-}
diff --git a/sys-fs/exfatprogs/exfatprogs-1.2.3.ebuild b/sys-fs/exfatprogs/exfatprogs-1.2.3.ebuild
deleted file mode 100644
index 64cf3654a575..000000000000
--- a/sys-fs/exfatprogs/exfatprogs-1.2.3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Userspace utilities for new exfat filesystem (kernel 5.7+)"
-HOMEPAGE="https://github.com/exfatprogs/exfatprogs"
-
-if [[ ${PV} == *9999 ]] ; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://github.com/exfatprogs/exfatprogs.git"
-else
-	SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm64 ~loong ppc ppc64 ~riscv x86"
-fi
-LICENSE="GPL-2"
-SLOT="0"
-
-RDEPEND="!sys-fs/exfat-utils"
-
-src_prepare() {
-	default
-
-	[[ ${PV} == *9999 ]] && eautoreconf
-}
diff --git a/sys-fs/exfatprogs/exfatprogs-1.2.4.ebuild b/sys-fs/exfatprogs/exfatprogs-1.2.6.ebuild
index 502d109228b8..24a35a00a404 100644
--- a/sys-fs/exfatprogs/exfatprogs-1.2.4.ebuild
+++ b/sys-fs/exfatprogs/exfatprogs-1.2.6.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/exfatprogs/exfatprogs.git"
 else
 	SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm64 ~loong ppc ppc64 ~riscv x86"
+	KEYWORDS="~amd64 ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/sys-fs/genfstab/Manifest b/sys-fs/genfstab/Manifest
index 2c0a26c64bed..0e37b43b7ddb 100644
--- a/sys-fs/genfstab/Manifest
+++ b/sys-fs/genfstab/Manifest
@@ -1,2 +1,2 @@
 DIST arch-install-scripts-v28.tar.gz 19730 BLAKE2B 0ff5ba79b200ad642e049ec19217cc5c0794d627a28f42e03c0df2444fef4d8488a6ee011d26fb8fe958c1a1a2fa0a13920567e394b2389c772f516b1fe8f388 SHA512 09a027b04b70e01ccd1fd82e3a443c876bdf978b94a922de9dea4dbc187360460ea35720816724b72fc31b02338b11bf39b47ec9156518a8a3ade000530bf1df
-DIST genfstab-24.gh.tar.gz 17916 BLAKE2B 07246efbde341dce7dc624c467e3f0bd849bccec46cd27f90f132960526674f44554b1ae7ac89e2d1f603567db4058f8dd465f54297071e89f65845ba07c6499 SHA512 0391bf93fc7c6ef0acefc3a0ce314d8c52542d519e4f88198734d90db9fc9ef23310c0c414c0940703fb6c0f74f6d8f23d1795bb3eed2b2a8ff5a594f00b63e4
+DIST arch-install-scripts-v29.tar.bz2 19418 BLAKE2B 733d326fd5b2948fc30d4c8e4752e855b8babe73698019825bf828334d07e0c3527534d5f58248f701b6aeda41425c2c6869da77506be891a493c3871f3c5e1f SHA512 39239dcdcdf8cf9ef72b7a16f2c42133baa8791c9d2753a35818236d92a0327d0aacd399013a06548739000556481ce6608106280f185006140fea9468157066
diff --git a/sys-fs/genfstab/genfstab-24.ebuild b/sys-fs/genfstab/genfstab-24.ebuild
deleted file mode 100644
index 702066b4d0b9..000000000000
--- a/sys-fs/genfstab/genfstab-24.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1
-
-DESCRIPTION="Genfstab - generate output suitable for addition to an fstab file"
-HOMEPAGE="https://github.com/archlinux/arch-install-scripts https://man.archlinux.org/man/genfstab.8"
-SRC_URI="https://github.com/archlinux/arch-install-scripts/archive/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-S="${WORKDIR}/arch-install-scripts-tags-v${PV}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-
-BDEPEND="app-text/asciidoc"
-
-src_compile() {
-	emake MANS="doc/genfstab.8" BINPROGS="genfstab"
-}
-
-src_install() {
-	dobin genfstab
-	doman doc/genfstab.8
-	newbashcomp completion/genfstab.bash genfstab
-}
diff --git a/sys-fs/genfstab/genfstab-29.ebuild b/sys-fs/genfstab/genfstab-29.ebuild
new file mode 100644
index 000000000000..0c5a2ce911a1
--- /dev/null
+++ b/sys-fs/genfstab/genfstab-29.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit shell-completion
+
+DESCRIPTION="Genfstab - generate output suitable for addition to an fstab file"
+HOMEPAGE="https://gitlab.archlinux.org/archlinux/arch-install-scripts https://man.archlinux.org/man/genfstab.8"
+SRC_URI="https://gitlab.archlinux.org/archlinux/arch-install-scripts/-/archive/v${PV}/arch-install-scripts-v${PV}.tar.bz2"
+
+S="${WORKDIR}/arch-install-scripts-v${PV}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	app-alternatives/awk
+	app-text/asciidoc
+	sys-devel/m4
+"
+
+src_test() {
+	emake MANS="doc/genfstab.8" BINPROGS="genfstab" check
+}
+
+src_compile() {
+	emake MANS="doc/genfstab.8" BINPROGS="genfstab"
+}
+
+src_install() {
+	dobin genfstab
+	doman doc/genfstab.8
+	newbashcomp completion/bash/genfstab genfstab
+	newzshcomp completion/zsh/_genfstab _genfstab
+}
diff --git a/sys-fs/mtools/Manifest b/sys-fs/mtools/Manifest
index 5623d72c5317..327d9221fb6b 100644
--- a/sys-fs/mtools/Manifest
+++ b/sys-fs/mtools/Manifest
@@ -2,3 +2,4 @@ DIST mtools-4.0.42.tar.bz2 441506 BLAKE2B 07afec0aea49427ec71ae8ddde9c1dceb33b25
 DIST mtools-4.0.43.tar.bz2 443673 BLAKE2B d000839bbb6bc647eb5a32b08b40b1350cd0a85fd564f0705ecbfe20f8f4ef21bf2d59cd0ccd7a159c829c019c6c2f3cbdef82ff3f4a9e8828cc13d44ddabd1d SHA512 b70e483688124a653dd333ab127494dab12d413809680a4846dc4ae5c166a0b9938a2ab290e518c1f1a5b18ed96d2c2a29d92d61b16b772a4ab5e495379fe410
 DIST mtools-4.0.44.tar.lz 389267 BLAKE2B 1a6a9d257fc07cf27280a535feac873d27690fb02114b293e31d7c8441de6bbdbd57a13f4ba62ce5a5093cd45683776dd8e61ac822b1d3d44eb98cd21f7b9088 SHA512 8977f43b1cd25a0d1052f9f8f140d73d432bd49a7a4737d0b743a9f8ccec5aff6bbbdc07455011ecc49038b1b1dfd6908dda8c46d06389b1511875f9bc654f84
 DIST mtools-4.0.45.tar.lz 389733 BLAKE2B bb23b310fea5d10e5f0c0ed543e0f8cbac9ba4177128419b6e05fb4a06896a64ddccb27c932eb41c339a0167706e729c2f209837874fe4ac4d165a534802031c SHA512 dd5869fee6f376deab2beb3d5168045a6abc7bbfdea35a274369420c99771ee89477629364a8c677dfba56e0df5c7d2760b6cbfba2d425a89a7b8c21f2b6e538
+DIST mtools-4.0.46.tar.lz 391300 BLAKE2B 997e766b215aebefb23d57f357ea0b95db62a7e3b40712597c38aa11c0f9c47dc43b0b6a34bfa2b976ec8298ed221c5d7d81e9f16dbeb0a4812e3a6cbff16a16 SHA512 1af737cc4793a2e6afe14b5595f085f8aa29e58bf4d8ba89454c7b9a10041a0ebe06fd50b525332c38805c7a9b014fc4379ae1cc259da7626974c6b6a061e727
diff --git a/sys-fs/mtools/mtools-4.0.46.ebuild b/sys-fs/mtools/mtools-4.0.46.ebuild
new file mode 100644
index 000000000000..95a421fafd18
--- /dev/null
+++ b/sys-fs/mtools/mtools-4.0.46.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic unpacker
+
+DESCRIPTION="Utilities to access MS-DOS disks from Unix without mounting them"
+HOMEPAGE="https://www.gnu.org/software/mtools/ https://savannah.gnu.org/projects/mtools"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.lz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos ~x64-solaris"
+IUSE="gui"
+
+RDEPEND="
+	virtual/libiconv
+	gui? (
+		x11-libs/libICE
+		x11-libs/libXau
+		x11-libs/libSM
+		x11-libs/libX11
+		x11-libs/libXt
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="$(unpacker_src_uri_depends)"
+
+src_configure() {
+	if ! use elibc_glibc && ! use elibc_musl ; then
+		# bug #447688
+		append-libs "-liconv"
+	fi
+
+	local myeconfargs=(
+		--sysconfdir="${EPREFIX}"/etc/mtools
+		$(use_with gui x)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	local -a DOCS=( README* Release.notes )
+
+	default
+
+	insinto /etc/mtools
+	doins mtools.conf
+
+	# Default is fine
+	sed -i -e '/^SAMPLE FILE$/s:^:#:' "${ED}"/etc/mtools/mtools.conf || die
+}