gentoo auto-resync : 04:06:2024 - 00:07:50

10 files changed, 272 insertions, 31 deletions

diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 7e3a52b4a928..e65797773411 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 68a29750d024..97fad910f2ed 100644
--- a/sys-fs/btrfs-progs/Manifest
+++ b/sys-fs/btrfs-progs/Manifest
@@ -6,6 +6,7 @@ DIST btrfs-progs-v6.8.1.tar.sign 566 BLAKE2B 843eada2b00a2370522edc95d79bcfed88b
 DIST btrfs-progs-v6.8.1.tar.xz 2652968 BLAKE2B 34406dedc6d97bd94a498c3bbb424d34a59b8251b37f9a40a87740f96db77780a4cd76c88055b4d9e4f673b4a3621503a6bedb67ceaf20870fb26c10f49b74e0 SHA512 b5f0694e56eecf1956313b3406610c2e22658ace51a636d79efe996780bb0b03fed95e68a8c9a11dd8649958c0e7dbc7417bb479859365d47b52e478f6830d46
 EBUILD btrfs-progs-6.6.3.ebuild 4581 BLAKE2B c5fd9d72bfe270bf54838e0b0eff08cb9405711792cdd1775f21ff853a6202ba0f7ccff8a043f39da02d8cdcd36a253d03c53812ad293f64b6ce26df9e1c505e SHA512 a8af6e0941002d70cebef2fd96838c1bf630ad95bd4871e83097fd552ec5f01d253f675c05551f56c92871d5a40acae697c1f69e194c1cc9b915bb9acdb1cdc9
 EBUILD btrfs-progs-6.7.1.ebuild 4581 BLAKE2B c5fd9d72bfe270bf54838e0b0eff08cb9405711792cdd1775f21ff853a6202ba0f7ccff8a043f39da02d8cdcd36a253d03c53812ad293f64b6ce26df9e1c505e SHA512 a8af6e0941002d70cebef2fd96838c1bf630ad95bd4871e83097fd552ec5f01d253f675c05551f56c92871d5a40acae697c1f69e194c1cc9b915bb9acdb1cdc9
+EBUILD btrfs-progs-6.8.1-r1.ebuild 4385 BLAKE2B 1a9ef892af338671a84f00beb26080dfc83b0ae5df4896bbdfe8524a4546b58467c7299e2aaf605d193d426278c44e26e6a1bfb7ae188ed9d033f98eb473a33c SHA512 836ac7cefa25d16d89be2afd5da74ae91c665dc231dc1dd3f3d1420f6aad0d8de44936da83cb932ebe467685150842ffb08feb6ac9b3df168cec04b87f5a29a1
 EBUILD btrfs-progs-6.8.1.ebuild 4581 BLAKE2B d396df46d93764918662ebef638bffd6383d959e924dcbd130851d8ea853d4e8999e4144b171080c694e1dd8d531fcaa0dfe7049a8b3479c2b40884d38f019b4 SHA512 7a26a82542bb82e3d429342b9421c8bda1b0ce5cfe516329dfca2ae8545ebdc97fa951a5755c43e981e5298a9a5bbf867e018929d74cc9bfb8b2486f4785e003
-EBUILD btrfs-progs-9999.ebuild 4587 BLAKE2B eeb427390e6c7cc2834214201d7eac292bdc83c305923110d9d512e103deb43b4206425b6efcd5843ec27dda8371755554a5e9d9ab3a6a5f1aa419351fc695ff SHA512 ff6baffe50f9c881ba5969403dd12c5d1f525677dc37acabb4344cf355ddd56328ad392e81708940582a3f93cdcbc130fa88a4935a9218258689d3d276caf5c6
+EBUILD btrfs-progs-9999.ebuild 4385 BLAKE2B 1a9ef892af338671a84f00beb26080dfc83b0ae5df4896bbdfe8524a4546b58467c7299e2aaf605d193d426278c44e26e6a1bfb7ae188ed9d033f98eb473a33c SHA512 836ac7cefa25d16d89be2afd5da74ae91c665dc231dc1dd3f3d1420f6aad0d8de44936da83cb932ebe467685150842ffb08feb6ac9b3df168cec04b87f5a29a1
 MISC metadata.xml 610 BLAKE2B 70361c4d5434a98f73a3d38ed47d7be830783529db6217396f2235cdedd58744fc6e52e4de1994d28184fe9d8aa5d2982c433d47eda1868cfdb79edf0769a620 SHA512 8958c02574adb1395a9d21d9e9ad5db38570b82a1c7211752eb007eecbd0e541e880a060649641f40be877f167e14f278f14d5ef8775766ef9a6fa5d3843dc53
diff --git a/sys-fs/btrfs-progs/btrfs-progs-6.8.1-r1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-6.8.1-r1.ebuild
new file mode 100644
index 000000000000..59e32bcafd5d
--- /dev/null
+++ b/sys-fs/btrfs-progs/btrfs-progs-6.8.1-r1.ebuild
@@ -0,0 +1,191 @@
+# 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://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${MY_P}.tar.xz
+		verify-sig? ( https://www.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
+}
+
+src_unpack() {
+	if [[ ${PV} == 9999 ]] ; then
+		git-r3_src_unpack
+		return
+	fi
+
+	if in_iuse verify-sig && use verify-sig ; then
+		mkdir "${T}"/verify-sig || die
+		pushd "${T}"/verify-sig &>/dev/null || die
+
+		# Upstream sign the decompressed .tar
+		# Let's do it separately in ${T} then cleanup to avoid external
+		# effects on normal unpack.
+		cp "${DISTDIR}"/${MY_P}.tar.xz . || die
+		xz -d ${MY_P}.tar.xz || die
+		verify-sig_verify_detached ${MY_P}.tar "${DISTDIR}"/${MY_P}.tar.sign
+
+		popd &>/dev/null || die
+		rm -r "${T}"/verify-sig || die
+	fi
+
+	default
+}
+
+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/btrfs-progs/btrfs-progs-9999.ebuild b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
index e83177d9b9ef..59e32bcafd5d 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..12} )
-inherit bash-completion-r1 python-single-r1 udev
+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"
@@ -33,10 +33,10 @@ HOMEPAGE="https://btrfs.readthedocs.io/en/latest/"
 
 LICENSE="GPL-2"
 SLOT="0/0" # libbtrfs soname
-IUSE="+convert python +man reiserfs static static-libs udev +zstd"
+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 ) python? ( ${PYTHON_REQUIRED_USE} )"
+REQUIRED_USE="static? ( !udev )"
 
 # Tries to mount repaired filesystems
 RESTRICT="test"
@@ -51,7 +51,6 @@ RDEPEND="
 			>=sys-fs/reiserfsprogs-3.6.27
 		)
 	)
-	python? ( ${PYTHON_DEPS} )
 	udev? ( virtual/libudev:= )
 	zstd? ( app-arch/zstd:= )
 "
@@ -59,11 +58,6 @@ 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(+)]
@@ -80,11 +74,16 @@ DEPEND="
 BDEPEND="
 	virtual/pkgconfig
 	man? (
-		dev-python/sphinx
-		dev-python/sphinx-rtd-theme
+		$(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
@@ -92,7 +91,7 @@ else
 fi
 
 pkg_setup() {
-	use python && python-single-r1_pkg_setup
+	: # Prevent python-any-r1_python_setup
 }
 
 src_unpack() {
@@ -123,9 +122,9 @@ src_prepare() {
 	default
 
 	if [[ ${PV} == 9999 ]]; then
-		AT_M4DIR="m4" eautoreconf
+		local AT_M4DIR=config
+		eautoreconf
 
-		mkdir config || die
 		local automakedir="$(autotools_run_tool --at-output automake --print-libdir)"
 		[[ -e ${automakedir} ]] || die "Could not locate automake directory"
 
@@ -141,10 +140,10 @@ src_configure() {
 
 		--enable-lzo
 		--disable-experimental
+		--disable-python
 		$(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)
@@ -157,6 +156,10 @@ src_configure() {
 	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[@]}"
 }
@@ -167,26 +170,16 @@ src_compile() {
 
 src_test() {
 	emake V=1 -j1 -C tests 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 "Tests failed with ${EPYTHON}"
-	fi
 }
 
 src_install() {
 	local makeargs=(
-		$(usev python install_python)
 		$(usev static install-static)
 	)
 
 	emake V=1 DESTDIR="${D}" install "${makeargs[@]}"
 
 	newbashcomp btrfs-completion btrfs
-
-	use python && python_optimize
 }
 
 pkg_postinst() {
diff --git a/sys-fs/cryfs/Manifest b/sys-fs/cryfs/Manifest
index 2ffbdc3d23b9..1efda3aff675 100644
--- a/sys-fs/cryfs/Manifest
+++ b/sys-fs/cryfs/Manifest
@@ -4,5 +4,5 @@ AUX cryfs-0.10.3-fix-build-with-boost-1-77.patch 639 BLAKE2B c03de4feed91e4182bc
 AUX cryfs-0.10.3-gcc11.patch 14590 BLAKE2B c6541d1e211c9ae503ee83be18dd2283f2ac5785f5a975fcd155b02759f6180eb96b8673d98c71e20c101ac4afa4ceaab4c6ece14c6605e32f5c020f260568bc SHA512 4fa2817c9f10df4e371deb7fb4acc423dd8260277216cf959ace47d64bebe394db71c79cd72098c6b11ac27b88d98eab8b5cde5af5095a63d57dc88d7dea7085
 AUX cryfs-0.10.3-gcc13.patch 258 BLAKE2B ca97032f8545c83ba717efc12a3563a8efa8353c478fe600cb94480fc0d358bad0482432283f9192824ba3c444bafba7f9b94109ec20007a687c6fb52303ecf2 SHA512 aaf0dd6698c833598b212c07e6c954d245f20da23a3edc967b0615504d83ea18994e446cf29cd3b5c08590f25bf8c9d4115e164f8ea0472a17ab897793fa2dc1
 DIST cryfs-0.10.3.tar.xz 7908228 BLAKE2B e1c816bd2ceb125573f5385c6ddb316a600275f0b907d89d3ab32f2050f1a0874ebbfd3db7b452b41d20dcbdd01bf59210a0a96c5bfee079ce222307d4c55596 SHA512 a1325c79cb253219bb092fd68399d6ec68aaf3d78bc95608582ab0c239dfaa0361416531cd1051661e4699b1e79867547710ea55d23e5697ebd4421c937d5b87
-EBUILD cryfs-0.10.3-r1.ebuild 2764 BLAKE2B 727aa45a06a9f3a89018c9d20574872fbf89a9ca26eec83cd9c27e020301895436ce27248a9bbea429195f763c5d8f087a63bfea530c671caf009fa6486c7d52 SHA512 9278576bcfb6c98a18fdaca566cacb78cce39724d7e5e70acb0d3146485126cc964de1bec9be225502894b4418af3a2e855a838855e3ee3ce2c1ab45a12bd69c
+EBUILD cryfs-0.10.3-r1.ebuild 2764 BLAKE2B 926491581856295cc3577ee2e02ae24e7c55fdd4e38ec6c1bd87abab1da07a48a83f9d89a3d97fafbc9c21afccc5160d87fa4bb213bec73ad92c7df773b3dd66 SHA512 b40529a01188897d9b5d977cd3ae8f6dd4db1d9de5aab2c8387169c4af1b31e669e4a1a64eb7e14cd352329f9d4fadae0e00bc4f9d6b7219496e1e4bb343f46e
 MISC metadata.xml 496 BLAKE2B 409cff030d8c45472ea6baa2abdcf736fda7d1229b7fc69e7a9280d05fe4b0ca29cb7be9836b862d940af3035cb9f02791407bcd1e176b1ea69dc2038542bc13 SHA512 9308ee717a85ac37a7264269d364ec60eac713bbfbc771019364d6b9ada5691d03d05e34981670e839f4d9a9b5b65268970e18645ab3ccce5cf4f501fe2d147a
diff --git a/sys-fs/cryfs/cryfs-0.10.3-r1.ebuild b/sys-fs/cryfs/cryfs-0.10.3-r1.ebuild
index 066345cf8c48..80309d474e3f 100644
--- a/sys-fs/cryfs/cryfs-0.10.3-r1.ebuild
+++ b/sys-fs/cryfs/cryfs-0.10.3-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 inherit cmake flag-o-matic linux-info python-any-r1
 
 if [[ ${PV} == 9999 ]] ; then
diff --git a/sys-fs/mtools/Manifest b/sys-fs/mtools/Manifest
index 3e4c56c55f2f..364c128e0398 100644
--- a/sys-fs/mtools/Manifest
+++ b/sys-fs/mtools/Manifest
@@ -1,5 +1,7 @@
 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
 EBUILD mtools-4.0.42.ebuild 1066 BLAKE2B e9962aac85a2cb4f17c35ae286c2191c447c98a83cfbbe681d1683e30f0e4ab83d28030f1912571918120742189ddd10900da13fc0ec9f5631845987e26c3cd7 SHA512 a0eedcc4ee8c2a9e37ca146efc3627dd6984917710269d0066930180490253f27c6e306f853a94949a263eefcd44e6c4a7e723d0dda3df3e6f7462830f4d228b
 EBUILD mtools-4.0.43.ebuild 1066 BLAKE2B d3ae92c757d6ce0ade4ec430f48c97a7b34933022efc5b8aed1634cb0811b7ac2b361ab2027a5aa1144562b6eeb501347fac0c28d7848ad45d110f4c6417dc2c SHA512 58b05d3155ae5df02468f1b2452122e9fb2269f6e3100485d6b5660d52a5670db488d6ad065f68e78301b3b7c6eba6e1c2a2f821898ebc0bb54edf1d1ecc30cd
+EBUILD mtools-4.0.44.ebuild 1119 BLAKE2B bff0deb44dd33209817ec44630eef6623b26b021a79a75cfeca5b507b6d334d7cc0c32c7ac70bba8dd95bf20244fa38e7862bbdf9c52db8b69893d48a93af7e8 SHA512 345744557d78d0885b1a01e465ac5bb455d7cfe2863435a6a6ff2cbb0c647e3cb08420edcb3342bb909c168108c88649fe89bfd820f2cc592180de201ebbe807
 MISC metadata.xml 375 BLAKE2B 7b9f85cb5e60ac6716012455042af65e14007d0b913842352098db7a79256b07096b51645ad294dad1d3be6f7acd3aa05bf52985a0cafce9faa78bde4de0a073 SHA512 827ce3643138e41a4ab9b652e16035bfa9e9a0714e69e979841feca48231d4bdbd37252e1d3aa2b5c4753e38215eadc58f8e43c00914ec9888d66078ea5f91c4
diff --git a/sys-fs/mtools/mtools-4.0.44.ebuild b/sys-fs/mtools/mtools-4.0.44.ebuild
new file mode 100644
index 000000000000..1d70d80df856
--- /dev/null
+++ b/sys-fs/mtools/mtools-4.0.44.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 ~ia64 ~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/udiskie/Manifest b/sys-fs/udiskie/Manifest
index 0ea7cee82ff0..4725d44ee1c0 100644
--- a/sys-fs/udiskie/Manifest
+++ b/sys-fs/udiskie/Manifest
@@ -7,5 +7,5 @@ EBUILD udiskie-2.4.2-r2.ebuild 1111 BLAKE2B 2cef3f18c3eb97ad3f14dd4ece9ea21577a3
 EBUILD udiskie-2.5.0-r1.ebuild 1113 BLAKE2B 43431f40c443ec2e0e69bf627dcf17443f30ec8835a6be9814e591aa718a21be9dc4e2f47958d0b8025f734421357076b011d62359f1cf39d09c747f1e8f1fb2 SHA512 588223f262e4bf2ac95f74a07cf8bf75a9af6484e759d9e4e698c6aa55d8f3b69fbfa67b2374cc89ce8a0461fb4bbd1ddcf25c2c3702d161ed2e79a22a1a3b1e
 EBUILD udiskie-2.5.1.ebuild 1113 BLAKE2B 43431f40c443ec2e0e69bf627dcf17443f30ec8835a6be9814e591aa718a21be9dc4e2f47958d0b8025f734421357076b011d62359f1cf39d09c747f1e8f1fb2 SHA512 588223f262e4bf2ac95f74a07cf8bf75a9af6484e759d9e4e698c6aa55d8f3b69fbfa67b2374cc89ce8a0461fb4bbd1ddcf25c2c3702d161ed2e79a22a1a3b1e
 EBUILD udiskie-2.5.2.ebuild 1149 BLAKE2B 4d4a0aed3214eb7ca7c679b3e13aef080edbbfff7456f0231e49d2026a09cbbbf31b78753f368d7a86f3a0fdd52180fa20e530ea8c22bab3b6992794f624372b SHA512 dd57ace8094cbacd0de8a5155979c0e569e6a358edfe2c5b7b8ccafdd7dfb41fe071c9fd38acef9a8bd3efa48ecaaadc7d25609067b1eb8f9e434a127de44473
-EBUILD udiskie-2.5.3.ebuild 1151 BLAKE2B 42b181191fe6859d6a744860e0af9fe3e1b02e6333cb637159dd1d8531ac2e730e9031e4f1cd090660ff3524f16494fae9904c4cbfe70eb416ffda639b373772 SHA512 6c983653dd7ee3d8bd4c2671af98f35a7be04b13a9ba622c1c466a8264473ba6e6fb92b4e77f84fc7f6b8a09f1d295fd15f617f548a5bbc69e5756131a484236
+EBUILD udiskie-2.5.3.ebuild 1151 BLAKE2B c58d6bac6926adf1cc1c5b9f7bac91e931357e84e115de25193bb65109511456d00fcf8511de6e6a15ddad72c2318e71e4f8d825e21b908a334879f235454b1c SHA512 cd3c4f4e3660571232e87f3dc3df99d30daa881392152fbcb48f369523d3b0039555542c0a967c6345de3c865119b07b953c8e53597c8fe431c4520df1fc47d4
 MISC metadata.xml 370 BLAKE2B d5b749c5ab2cf4ddd7c4df39045f109acaba44b50e8babeae6e3ad31e730a52e52bdce7922780a1f358e1a9e1f11d32882eef0f2ceb20ef04011301b7fd3ff83 SHA512 9fd25405737377b4fe0a38672bb3ec871d6d099dcd8b7cfb0bac631a7407133f5974b4d43751dcc186e48dc27997388da30350608139166351a390bc8d02de39
diff --git a/sys-fs/udiskie/udiskie-2.5.3.ebuild b/sys-fs/udiskie/udiskie-2.5.3.ebuild
index 685b5edb92a8..64df129d091a 100644
--- a/sys-fs/udiskie/udiskie-2.5.3.ebuild
+++ b/sys-fs/udiskie/udiskie-2.5.3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{9..12} )
 DISTUTILS_USE_PEP517=setuptools
 inherit distutils-r1 pypi xdg-utils