gentoo auto-resync : 20:01:2025 - 06:42:03

9 files changed, 146 insertions, 179 deletions

diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index b3d3e4a6804f..c76fa35be5e1 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/bees/Manifest b/sys-fs/bees/Manifest
index 89986374540c..2cc96ec5f37c 100644
--- a/sys-fs/bees/Manifest
+++ b/sys-fs/bees/Manifest
@@ -2,7 +2,9 @@ AUX 0001-HACK-crucible-Work-around-kernel-memory-fragmentatio.patch 1183 BLAKE2B
 AUX 0001-context-demote-abandoned-toxic-match-to-debug-log-le.patch 1500 BLAKE2B c6f6895b92caae4ac8de83931574f87274d7798889c0589859204d73cd41072ee6967ae908c8509e7f5c929f3a4f04c73932b72a27ab3d244cef254ebc15030e SHA512 82e3e8872e4b9943afff883c3ee420a8850b337914fc0b388171f1331c4cd900778c2263b98ff1705f50f7cd3ffe5868d7f88ec48ab68217471a21573a559479
 AUX 0002-HACK-crucible-Work-around-kernel-memory-fragmentatio_v2.patch 1445 BLAKE2B e1ebe9c50deeaf7eed82c738d172ab332c5048ab192150cc967843ea16f387631ee44c201c43f49c3c0a032a735219f3a08881e5f92fbbf5b85d050eebb1c7f8 SHA512 75655e40084a0f8660773293693d0a214d34c6bb2f861c2e502a4cc5a1576d5c8084b8af87f790155f419affa56886c23eed09532f82c29b2623f553a5c82999
 DIST bees-0.10.tar.gz 177509 BLAKE2B 269cf65d5250a07297dfaee6c0fd6bc25199d63fe423d63ce39df8bcdb64d6f8110a0e03d0dc7dc1b105a8886f2a9364da8878481546eaa8dbf3dc46abc569ed SHA512 77a4ae3d66430c2d9dc0351c16c60bad95f21e238fc00f5f5787f55929ba75ee25212ac4bb4a3e4a9419cec27bbcfd2987aa925a54bc2872609b38a698dbedc3
+DIST bees-0.11-rc3.tar.gz 193475 BLAKE2B bb3d867843266ea5766bc079d6731c79bdc80b9df5cf08a3fa3361ecbe439002a396610b32d3875085c672cf891b55c61ccce7260d22a537d705c2a89b040e4c SHA512 66f42ff60ccdbd56a022d94370aa856453d016d69469c503a2182535b630e5b6d0d0fecf12574f1b23750942b48a9473414424cb9ad1954ef11a3b7a8e6ea1a6
 EBUILD bees-0.10-r1.ebuild 4151 BLAKE2B d0b2ddea9523905f3a5620aa6e0da3c595a405afd34a9ab5488a20e7b1f5c77130d9b56b3856a236004982d6069f213ddacf28a9234f3498cc805b4f9a980f56 SHA512 35d51de04f606c5fe35bd0dd071c58e435398dc304f0520e307974a2436bc358856580f35f1611a8e45b6e1d16b4b67d050308ac61dfb8ea8c60872c616f47cd
 EBUILD bees-0.10.ebuild 4076 BLAKE2B dad615a8ad7fada7c1cd31a5cffa6fad2cdcbc1cf241cc6e602d927cd9c182289d944663365cbeaa27a2f14f89cd8150e7c7196c19b5bbd4cb2580dae80bc19c SHA512 53a60088a2e078e1dec4899d77961c51976f941ca3952de32ddacdb6c03b4e6350d977f159b7a845ec45901bb4cb77b19ca9aebeec2ef1cc7867740df74adbbb
-EBUILD bees-9999.ebuild 4782 BLAKE2B d191d127ce13f1caff8ec7f36b22dab6a95bab5a1ef368b6f6c4645cd1316110f04abe669a15521ab10b59dc969f86e11550bb34f1f8555c405886f86eb1de47 SHA512 e3503e6cd9cd492c37a8f380201d0bf0cd494b3369a7b67811db98f6929833d17d00753426e64e4ef727ced60797a73c825c1987d9210981034b0a73bac54ede
+EBUILD bees-0.11_rc3.ebuild 4809 BLAKE2B 3735114fb0938c72db642ac7f50e672db50657d7d7fe292fbaec8abed4cb74b62b2dae19c92afe13e6c57c409037de34a6eaa9991f93c12cdaddc25f7fcd0430 SHA512 45aa785c348097bc9bb4379995781d628e83713f2700d24dfdac9b191ba002874e56a6000ae69a06cb29ce44a605c3f5146cd8362c65da1fa8e3e8610c23ff51
+EBUILD bees-9999.ebuild 4822 BLAKE2B ff033fca18453e76d49490318246bb34bc2067aba6c6af1660621fcaef37faf45f15cfe52dbbc53d7493e2b8ff8a5c4e19771db271e78e5f42f7d37c7f598c28 SHA512 4ff9f174be78b93805d3471c884494920cd0196669103580de10ba31bf9b7aaa17ff45d2f9ad62090828e8668c8ba1a7a687389b72d61a028922eeb9eaa10db0
 MISC metadata.xml 529 BLAKE2B 69ea069e33d1af7c2c38aa7f8fc61516f23c586ad162d9581859829b084c8da3ef76278173e1ac3afa1ef432355ab14f2ecc01d07f039f8447c20cc27b22d633 SHA512 cb9ba7a32c6a8269f7303ebd41bf0e21f4325560b40bba10aff08a05d07170f9f0e35e687e688f6793c0abf994c9b23f90a47b9d32544636f2d6b5ab51140bd3
diff --git a/sys-fs/bees/bees-0.11_rc3.ebuild b/sys-fs/bees/bees-0.11_rc3.ebuild
new file mode 100644
index 000000000000..c2a394c8ae3a
--- /dev/null
+++ b/sys-fs/bees/bees-0.11_rc3.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit linux-info systemd toolchain-funcs
+
+DESCRIPTION="Best-Effort Extent-Same, a btrfs dedup agent"
+HOMEPAGE="https://github.com/Zygo/bees"
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Zygo/bees.git"
+else
+	MY_PV=${PV/_/-}
+	MY_P=${P/_/-}
+	S=${WORKDIR}/${MY_P}
+
+	SRC_URI="https://github.com/Zygo/bees/archive/v${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
+	KEYWORDS=""
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+
+DEPEND="
+	>=sys-apps/util-linux-2.30.2
+	>=sys-fs/btrfs-progs-4.20.2
+"
+RDEPEND="${DEPEND}"
+
+CONFIG_CHECK="~BTRFS_FS"
+ERROR_BTRFS_FS="CONFIG_BTRFS_FS: bees does currently only work with btrfs"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != buildonly ]]; then
+		if kernel_is -lt 4 11; then
+			ewarn "With kernel versions below 4.11, bees may severely degrade system performance"
+			ewarn "and responsiveness. Especially, the kernel may deadlock while bees is"
+			ewarn "running, it's recommended to run at least kernel 4.11."
+			ewarn
+		elif kernel_is -lt 4 14 29; then
+			ewarn "With kernel versions below 4.14.29, bees may generate a lot of bogus WARN_ON()"
+			ewarn "messages in the kernel log. These messages can be ignored and this is fixed"
+			ewarn "with more recent kernels:"
+			ewarn "# WARNING: CPU: 3 PID: 18172 at fs/btrfs/backref.c:1391 find_parent_nodes+0xc41/0x14e0"
+			ewarn
+		elif kernel_is -lt 5 7 0; then
+			ewarn "With kernel versions below 5.4.96 and 5.7, the kernel may hold file system"
+			ewarn "locks for a long time while at the same time CPU usage increases when bees is"
+			ewarn "operating. bees tries to avoid this behavior by excluding very common extents"
+			ewarn "from deduplication. This has only a minimal impact on dedupe effectiveness."
+			ewarn
+		fi
+		if kernel_is -lt 5 1 0; then
+			ewarn "IMPORTANT: With kernel versions below 5.1.0, you may experience data corruption"
+			ewarn "due to bees using compression in btrfs. You are adviced to use a chronologically"
+			ewarn "later kernel, that includes older LTS versions released after 5.0.4:"
+			ewarn "Fixed in: 5.1+, 5.0.4+, 4.19.31+, 4.14.108+, 4.9.165+, 4.4.177+, 3.18.137+"
+			ewarn "# commit 8e92821 btrfs: fix corruption reading shared and compressed extents after hole punching"
+			ewarn
+		fi
+		if kernel_is -lt 5 4 19; then
+			ewarn "With kernel versions below 5.4.19, bees may trigger a btrfs bug when running"
+			ewarn "btrfs-balance in parallel. This may lead to meta-data corruption in the worst"
+			ewarn "case. Especially, kernels 5.1.21 and 5.2.21 should be avoided. Kernels 5.0.x"
+			ewarn "after 5.0.21 should be safe. In the best case, affected kernels may force"
+			ewarn "the device RO without writing corrupted meta-data. More details:"
+			ewarn "https://github.com/Zygo/bees/blob/master/docs/btrfs-kernel.md"
+			ewarn
+		fi
+		if kernel_is -gt 5 15 106; then
+			if kernel_is -lt 6 3 10; then
+				ewarn "With kernel versions 5.15.107 or later, there is a memory fragmentation"
+				ewarn "issue with LOGICAL_INO which can lead to cache thrashing and cause IO"
+				ewarn "latency spikes. This version ships with a work-around at the cost of not"
+				ewarn "handling highly duplicated filesystems that well. More details:"
+				ewarn "https://github.com/Zygo/bees/issues/260"
+				ewarn
+			fi
+		fi
+		if kernel_is -lt 5.7; then
+			ewarn "WARNING: Kernel versions lower than 5.7 are no longer really supported by"
+			ewarn "bees. While there should be no unexpected data loss, you may experience"
+			ewarn "severe slowdowns or even system lockups."
+			ewarn
+		fi
+	fi
+}
+
+pkg_postinst() {
+	if [[ ${MERGE_TYPE} != buildonly ]]; then
+		elog "Bees recommends running the latest current kernel for performance and"
+		elog "reliability reasons, see README.md."
+		elog
+		elog "NEWS: bees now defaults to a much improved extent-based scanner. It is compatible"
+		elog "with your existing state database in \`\$BEESHOME\` but it may start over from the"
+		elog "beginning. However, it will keep the state of the old scanner, so you can switch"
+		elog "back and forth. To actually use the new scanner, use scan mode 4 or remove the"
+		elog "scan mode parameter from your init script. Requires kernel 4.14 or higher!"
+	fi
+}
+
+src_prepare() {
+	default
+	sed -i 's/ -Werror//' makeflags || die
+}
+
+src_configure() {
+	tc-export CC CXX AR
+	cat >localconf <<-EOF || die
+		ETC_PREFIX="${EPREFIX}/etc"
+		LIBEXEC_PREFIX="${EPREFIX}/usr/libexec"
+		PREFIX="${EPREFIX}/usr"
+		SYSTEMD_SYSTEM_UNIT_DIR="$(systemd_get_systemunitdir)"
+		DEFAULT_MAKE_TARGET=all
+	EOF
+	if [[ ${PV} != "9999" ]] ; then
+		echo BEES_VERSION=v${MY_PV} >>localconf || die
+	fi
+}
+
+src_compile() {
+	default
+	# localconf quotes leak in the systemd unit but are still needed for spaces
+	sed -i 's/"//g' scripts/beesd@.service || die
+}
diff --git a/sys-fs/bees/bees-9999.ebuild b/sys-fs/bees/bees-9999.ebuild
index 193a07fc4468..965748b64f91 100644
--- a/sys-fs/bees/bees-9999.ebuild
+++ b/sys-fs/bees/bees-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,11 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/Zygo/bees.git"
 else
-	SRC_URI="https://github.com/Zygo/bees/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	MY_PV=${PV/_/-}
+	MY_P=${P/_/-}
+	S=${WORKDIR}/${MY_P}
+
+	SRC_URI="https://github.com/Zygo/bees/archive/v${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
 	KEYWORDS="~amd64 ~arm64"
 fi
 
@@ -28,10 +32,6 @@ RDEPEND="${DEPEND}"
 CONFIG_CHECK="~BTRFS_FS"
 ERROR_BTRFS_FS="CONFIG_BTRFS_FS: bees does currently only work with btrfs"
 
-PATCHES=(
-	"${FILESDIR}/0001-context-demote-abandoned-toxic-match-to-debug-log-le.patch"
-)
-
 pkg_pretend() {
 	if [[ ${MERGE_TYPE} != buildonly ]]; then
 		if kernel_is -lt 4 11; then
@@ -85,12 +85,16 @@ pkg_pretend() {
 			ewarn "severe slowdowns or even system lockups."
 			ewarn
 		fi
+	fi
+}
 
+pkg_postinst() {
+	if [[ ${MERGE_TYPE} != buildonly ]]; then
 		elog "Bees recommends running the latest current kernel for performance and"
 		elog "reliability reasons, see README.md."
 		elog
 		elog "NEWS: bees now defaults to a much improved extent-based scanner. It is compatible"
-		elog "with your existing state database in `\$BEESHOME` but it may start over from the"
+		elog "with your existing state database in \`\$BEESHOME\` but it may start over from the"
 		elog "beginning. However, it will keep the state of the old scanner, so you can switch"
 		elog "back and forth. To actually use the new scanner, use scan mode 4 or remove the"
 		elog "scan mode parameter from your init script. Requires kernel 4.14 or higher!"
@@ -112,7 +116,7 @@ src_configure() {
 		DEFAULT_MAKE_TARGET=all
 	EOF
 	if [[ ${PV} != "9999" ]] ; then
-		echo BEES_VERSION=v${PV} >>localconf || die
+		echo BEES_VERSION=v${MY_PV} >>localconf || die
 	fi
 }
 
diff --git a/sys-fs/mtools/Manifest b/sys-fs/mtools/Manifest
index 755c544c8b2f..8d461d51018f 100644
--- a/sys-fs/mtools/Manifest
+++ b/sys-fs/mtools/Manifest
@@ -1,11 +1,5 @@
-DIST mtools-4.0.42.tar.bz2 441506 BLAKE2B 07afec0aea49427ec71ae8ddde9c1dceb33b2533e9acbde3564b0715efce784b5ea8c2122ff588f84e42435abb73ac9912520fd654a078bf0336e62f35f3ce2a SHA512 fd8d56d2dea9ce5e2b311b29ebdd4d89ec7baaf5f2fbfdc85019d480eff4d198ebf0e591c0f28ee1e39d8b81d49d7d4e9ed94b0e94e5b02ce9bbc03632124811
-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
-EBUILD mtools-4.0.42.ebuild 1060 BLAKE2B d92adedc56a0e1546c388ec7131c11e2c9a14b5fee3fd9d30be1da012d04479b440f56ed410ad598e020b85562ef18aba787e876ba380a05127fe9ae0cc1feef SHA512 a54c3be439cccb4393e965be0f50b23608f338ae611d2f6d3a4b411032638318f178b05198623c8bab2d537ccda40bfac4ac70d4d48353b3ed0409b61384047e
-EBUILD mtools-4.0.43.ebuild 1060 BLAKE2B f26d54fc0f2584f27560d2160efc8d527a70ecd317727adfb051e04bd20bd53ef32568ad96e3a8420256f1416d6c2b52203a5830d25c09bb267cbe58968b3c8c SHA512 852d8572c2f89299ee51e8608ef1d0f500bdc4308fd6d637f3ba4201034158b5c1266b5eab7e64d4e9a9b01845bea1b68327606333d265f86012e7618f8b2304
-EBUILD mtools-4.0.44.ebuild 1106 BLAKE2B 19e50766eebc08fe10b45f1ebabce0cc3b5b9e1e640ab12462c0b41acb3a7f95467447c07bcff1a414700c22ae69ee9d8258e68944e6f5a89e88a4501b359fe7 SHA512 ee30772edcbc8df7a5595b9408bfcb9b48f67adc8f74f20061427d4df6e23a2ddadc54e1b46d61b758ad33708421ef8092aacebe5f31124133a43939282a2af3
-EBUILD mtools-4.0.45.ebuild 1106 BLAKE2B 19e50766eebc08fe10b45f1ebabce0cc3b5b9e1e640ab12462c0b41acb3a7f95467447c07bcff1a414700c22ae69ee9d8258e68944e6f5a89e88a4501b359fe7 SHA512 ee30772edcbc8df7a5595b9408bfcb9b48f67adc8f74f20061427d4df6e23a2ddadc54e1b46d61b758ad33708421ef8092aacebe5f31124133a43939282a2af3
+DIST mtools-4.0.47.tar.lz 391656 BLAKE2B 52fdfdaaea09cf3809b0432237b1491be9c2869fe839e951f11178970ebbc82d9dc4bc6446015e50f44098171493c4d4d191d23c03a0b83819b1dd66934493f1 SHA512 7d3db137a121f5fa54b1b2565048a3be5ac197f25240da037c8200232a0282b1541eb220359e6759e96e77836d2babc0b5a9894c91c5ba7b87b9acc5d1458c81
 EBUILD mtools-4.0.46.ebuild 1106 BLAKE2B d49ab2afe53dd8f3927f5fe5b2baf6075f49cacccd04b6743d20d3bf2f4620f9edac654f4c9e9cbb9d09ef6955ad189ab52adc70d045cd13042d11758c6b8d97 SHA512 44cc66a4e79c19ffd8d39775f7629aa3f3327b6f34f90a807e36ce08eb56d2d5e75b3bc8749154d7eb0accbf6b0c481b9fe2e4532a1aa81c173933d00b24ec62
+EBUILD mtools-4.0.47.ebuild 1113 BLAKE2B 75a5f90687c4ec45906f3878dabcb2c15e122f683c9997acaf43aa27cb5b201952f711e0a5f7a2a129a0b6774db02a3935723a3d040a1faa6f331abe25d291aa SHA512 9037f38a81fa8624473a0ef615ba4097dea5d180cd5e8b68e6a01c5d799933bcdd90f01826041f2c692913322a08c091df833aa7142f769183709d0effec5a66
 MISC metadata.xml 375 BLAKE2B 7b9f85cb5e60ac6716012455042af65e14007d0b913842352098db7a79256b07096b51645ad294dad1d3be6f7acd3aa05bf52985a0cafce9faa78bde4de0a073 SHA512 827ce3643138e41a4ab9b652e16035bfa9e9a0714e69e979841feca48231d4bdbd37252e1d3aa2b5c4753e38215eadc58f8e43c00914ec9888d66078ea5f91c4
diff --git a/sys-fs/mtools/mtools-4.0.42.ebuild b/sys-fs/mtools/mtools-4.0.42.ebuild
deleted file mode 100644
index 7ced3a0a5905..000000000000
--- a/sys-fs/mtools/mtools-4.0.42.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic
-
-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.bz2"
-
-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}"
-
-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
-}
diff --git a/sys-fs/mtools/mtools-4.0.43.ebuild b/sys-fs/mtools/mtools-4.0.43.ebuild
deleted file mode 100644
index 525c9a7b8aa5..000000000000
--- a/sys-fs/mtools/mtools-4.0.43.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic
-
-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.bz2"
-
-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}"
-
-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
-}
diff --git a/sys-fs/mtools/mtools-4.0.45.ebuild b/sys-fs/mtools/mtools-4.0.45.ebuild
deleted file mode 100644
index ada3bde4563a..000000000000
--- a/sys-fs/mtools/mtools-4.0.45.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# 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
-}
diff --git a/sys-fs/mtools/mtools-4.0.44.ebuild b/sys-fs/mtools/mtools-4.0.47.ebuild
index ada3bde4563a..00ad3bb1d910 100644
--- a/sys-fs/mtools/mtools-4.0.44.ebuild
+++ b/sys-fs/mtools/mtools-4.0.47.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos ~x64-solaris"
 IUSE="gui"
 
 RDEPEND="