8 files changed, 187 insertions, 8 deletions
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index e5fdef1c0163..099910d5cc84 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/ncdu/Manifest b/sys-fs/ncdu/Manifest
index 5d23054a4115..6adfcfdd9269 100644
--- a/sys-fs/ncdu/Manifest
+++ b/sys-fs/ncdu/Manifest
@@ -4,7 +4,10 @@ DIST ncdu-1.20.tar.gz 150835 BLAKE2B 0bb6576ecbb3df281c67a48409db2118521760f378d
 DIST ncdu-1.20.tar.gz.asc 833 BLAKE2B 487e3b4b1e83a2211e91307ff1ca1778059cc3f923e04b57bc5d4780d0108589a062861a25bafa58c357ad4495edce814a58eeb24087e06b958d8e23a02bbf22 SHA512 168bcc4255bbb7a576af39422797804726f84134dc342f59abfc825f93c5ee4e9fcaa9e0c18626ee87b96b2d19a7c57beaa8e1b3dc57eff2bd659add18027140
 DIST ncdu-2.3.tar.gz 56608 BLAKE2B 9fd73fba83c57195f8ffbad5b954140a776d1cd1d7b3e458f832255ee9c07eb8af9888a23ed3c671f508d6ba3795e2361f79e64b4b24630d744470efc5bfaded SHA512 283f78761b225883e090c4d0d1325bffc70049477087df3e8d1afcebc3136930c2636b2bba4aa6e43d53626668519c26a1528ba5c75489d3b5924e8974184e47
 DIST ncdu-2.3.tar.gz.asc 833 BLAKE2B fd5b6b4b6e14b8bf66f5053c637598c3a0a9ad16d29c20805d62418fb69a22fa1155c8591dac35514d088c57853043c7d6c8b94abdff793a3f7b0a53cb41fd65 SHA512 698d8f1c0a7e0267fdfcfc7823803012ab7faae6eee75af406ecc9a73244463521de851c3f2b116ae7f6d7e567ea17a7ef6aae75e135a8efbb02333525455b20
+DIST ncdu-2.4.tar.gz 51648 BLAKE2B cbe2db51b86a6ac624d3a0300bb41337ff0c8ce63165dc0f471872c0fa646406bf190d4f0605130d55d981c0a694a6bbbb9092c8857c45f362dd4bf0016b0617 SHA512 0bbc4400d05831528415c7e22d1e4b5c43cb8682c2bc35439e150763bcbc159664fee887d0fce89d28fb4199378972ffeb54c694e27b5f58d2ddaef890b055a7
+DIST ncdu-2.4.tar.gz.asc 833 BLAKE2B a0a0f3c8652242c1b3a7bab2e8eb03901bd0d8a0ecb2079ee914a08aeacda7e7c706eccef70f43a90d7190f32a3bc0eea2e3d46a9b3c29621a9e952328271cb7 SHA512 8eb6be85e7e33b2fcda3ce4c34bc4ff4a0c438b70a8d40ed91fababc728b77f0a83e0e07d70a7528821c774262a6d30cbbf73c56624d61ce3f4e93f27f1d5c31
 EBUILD ncdu-1.19.ebuild 673 BLAKE2B 0d8a2758bb4e30d68b24c20bb6053c177b15dd191378091b618299aeec19f9dcc8a155a3374fd3a7ec90f389ef461d44c06c5f16621fa780da916c8767303a5a SHA512 319a81be8ef82e2c553a74328fa4c619e5ca3c6974f0d73f7772eaaa7a22b5162fcf3a14283856be49a32ca038b99bc7862812a69b4c087b7b5258d50bc3ad0a
 EBUILD ncdu-1.20.ebuild 664 BLAKE2B cdf9a7bfa92bda9793df816192e56fdb17ecfbf66d745f24e6e06828858d13e5df2e61667b61e7e2fa9b38502d65a374f05bb761c4ed09ade11c3f4c77cec1d0 SHA512 922f69ccb8701600af59dad8abd063b25e40104cd40b918df1aa84ad406da4c86c1a1e7d51804be5682d66871d252de7ad68f27e7e4cff7ccefe1064bdbb308b
 EBUILD ncdu-2.3.ebuild 2995 BLAKE2B b86cc7995305064cc5673f45b075b1c90033a5cf9bde3edf297f3412f89728088103b7d61876121ffd741eefb5e5e497244153598a37583ba52e4b0f64b5ab63 SHA512 28c36e5307d4483896cd3c3e067a8d050e7e5aa35b8e47fb43d02743f7268b35225d7d8a692be4956153600dd72a11ea074e1f7a611aff168eb951a5ce0c0e21
+EBUILD ncdu-2.4.ebuild 2995 BLAKE2B 80698c91f20c43a5ffce2024f3a3b6430effad2788028f2daff737b881df93416926b7c848a9d86ec8f8bb51e6032a8d5fad9dc63ac4ba6bbb3b96fd9186f694 SHA512 51e3fdf31831eedc1cc1354a89d468e3fb892e039fb4157097b5f9269177528749c763c7b18e4419ff0b4e93b1722575c1f2fb99d1744ce19d38da788f0dba4a
 MISC metadata.xml 862 BLAKE2B aecbc2cfec9351b2be9087d297016826f9bea5f81ea690e480cbe0dce5c627f554875fb9db5b19f21373391ef4fb28c7cea3129d911e80b7be007a9a0a79ac0a SHA512 2c722040961b930791780f704edddd4cdf010df05e462a0d333f2fbf4966c0ecac08eef3b1e05baf34013c95a91cc79dc38ef5616e07ffcb4e386b8760f89683
diff --git a/sys-fs/ncdu/ncdu-2.4.ebuild b/sys-fs/ncdu/ncdu-2.4.ebuild
new file mode 100644
index 000000000000..2ee5dced948e
--- /dev/null
+++ b/sys-fs/ncdu/ncdu-2.4.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit verify-sig edo
+
+DESCRIPTION="NCurses Disk Usage"
+HOMEPAGE="https://dev.yorhel.nl/ncdu"
+SRC_URI="
+	https://dev.yorhel.nl/download/${P}.tar.gz
+	verify-sig? ( https://dev.yorhel.nl/download/${P}.tar.gz.asc )
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+EZIG_MIN="0.12"
+EZIG_MAX_EXCLUSIVE="0.13"
+
+DEPEND="sys-libs/ncurses:=[unicode(+)]"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	|| ( dev-lang/zig:${EZIG_MIN} dev-lang/zig-bin:${EZIG_MIN} )
+	virtual/pkgconfig
+	dev-lang/perl
+	verify-sig? ( sec-keys/openpgp-keys-yorhel )
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/yoranheling.asc
+
+# see https://github.com/ziglang/zig/issues/3382
+# For now, Zig doesn't support CFLAGS/LDFLAGS/etc.
+QA_FLAGS_IGNORED="usr/bin/ncdu"
+
+# Many thanks to Florian Schmaus (Flowdalic)!
+# Adapted from https://github.com/gentoo/gentoo/pull/28986
+# Set the EZIG environment variable.
+zig-set_EZIG() {
+	[[ -n ${EZIG} ]] && return
+
+	if [[ -n ${EZIG_OVERWRITE} ]]; then
+		export EZIG="${EZIG_OVERWRITE}"
+		return
+	fi
+
+	local candidate selected selected_ver ver
+
+	for candidate in "${BROOT}"/usr/bin/zig-*; do
+		if [[ ! -L ${candidate} || ${candidate} != */zig?(-bin)-+([0-9.]) ]]; then
+			continue
+		fi
+
+		ver=${candidate##*-}
+
+		if [[ -n ${EZIG_EXACT_VER} ]]; then
+			ver_test "${ver}" -ne "${EZIG_EXACT_VER}" && continue
+
+			selected="${candidate}"
+			selected_ver="${ver}"
+			break
+		fi
+
+		if [[ -n ${EZIG_MIN} ]] \
+			   && ver_test "${ver}" -lt "${EZIG_MIN}"; then
+			# Candidate does not satisfy EZIG_MIN condition.
+			continue
+		fi
+
+		if [[ -n ${EZIG_MAX_EXCLUSIVE} ]] \
+			   && ver_test "${ver}" -ge "${EZIG_MAX_EXCLUSIVE}"; then
+			# Candidate does not satisfy EZIG_MAX_EXCLUSIVE condition.
+			continue
+		fi
+
+		if [[ -n ${selected_ver} ]] \
+			   && ver_test "${selected_ver}" -gt "${ver}"; then
+			# Candidate is older than the currently selected candidate.
+			continue
+		fi
+
+		selected="${candidate}"
+		selected_ver="${ver}"
+	done
+
+	if [[ -z ${selected} ]]; then
+		die "Could not find (suitable) zig installation in ${BROOT}/usr/bin"
+	fi
+
+	export EZIG="${selected}"
+	export EZIG_VER="${selected_ver}"
+}
+
+# Invoke zig with the optionally provided arguments.
+ezig() {
+	zig-set_EZIG
+
+	# Unfortunately, we cannot add more args here, since syntax is different
+	# for every subcommands. Yes, even target/cpu :( f.i. :
+	# -target/-mcpu for zig build-exe vs -Dtarget/-Dcpu for zig build-
+	# -OReleaseSafe for zig build-exe vs -DReleaseSafe for zig build
+	# (or even none, if hardcoded by upstream so choice is -Drelease=true/false)
+	# Ofc we can patch this, but still...
+
+	edo "${EZIG}" "${@}"
+}
+
+src_unpack() {
+	if use verify-sig; then
+		verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.asc}
+	fi
+	default
+}
+
+src_configure() {
+	zig-set_EZIG
+	export ZIG=${EZIG}
+}
+
+src_test() {
+	ezig build test -Doptimize=ReleaseFast
+}
+
+src_install() {
+	emake PREFIX="${ED}"/usr install
+
+	dodoc README.md ChangeLog
+}
diff --git a/sys-fs/ubi_reader/Manifest b/sys-fs/ubi_reader/Manifest
index b190419e259d..c628e347b4a1 100644
--- a/sys-fs/ubi_reader/Manifest
+++ b/sys-fs/ubi_reader/Manifest
@@ -1,3 +1,3 @@
 DIST ubi_reader-0.8.5.tar.gz 43237 BLAKE2B c55bc689af0a32a0e65aa6f860617131654d11ad5e6f7f1e37b4e048718c061f352965f9793595dc16162df0c08ce32d4db2d6bfaee9366110028f7fe61a5c98 SHA512 14e02c8b8c5fe0fe6316f0dabea21dbb6ef6a865ef2b176fc6e26f36bd54a981cb89fccee2ac476b042909cdd5946b1325f792ac159d7e6bd2c5a6f7f4b14062
-EBUILD ubi_reader-0.8.5-r1.ebuild 590 BLAKE2B 456601ac88a37cd3295de368bf839f4271064648904ef58fd36d2436b0950e0e1279386d90c173ed54a10332b45cab25c3ed85919d7cbd6652d10b04f2352208 SHA512 093e24056c8d9bfd26b9e1158775b85dfb2ec7d187c13d989e74828b3b9513fbede353501b3dfd3686179a5a14339ed07426367140db04745120cdac5ba53148
-MISC metadata.xml 418 BLAKE2B 42a180fe245386ada906cab96f96962dc2f26517eee70a3f6bd0cfa5fba8cd382dd12c3624ae5bd7a949d030a935467d37a164db4d69dffbff87a4aa2b3521cf SHA512 cf62a833bb427fb8435ca5a02d41f9766d8a482da4a9338cd171a302d5181f452ed23d37039364a4d61c0c57c9f1c9c62df09c519094807efa14ac8b10eb6d03
+EBUILD ubi_reader-0.8.5-r1.ebuild 591 BLAKE2B bc7c450cc7750031ddbef6cdfb4ded92c5f2a8f687bfbcb4cef32bec6c76b33ceb1616d15482b615d1dad962a1d2c00494561b20169439bbe9a49951ef39372f SHA512 6004d4b0977ef62f15951ef7a48efcf87ccc6771abdf63ab31f51e610a8bbe31a3e48192fbe3782d778c74f744a4a141556ded821fe481b3060e77ae87b40822
+MISC metadata.xml 333 BLAKE2B a4adf1ba56af470a304ddd6721e7c3468f789cf231930dc19f961d028f048530c63b82046c34f295c820f6a0f34abb77f0d21a7c0608a15b409b3cfc12a1ef72 SHA512 ca998b9ec98ec5d05ad4fa7fd3ad1041073b0e00f1da0e88c6d3c5d9de09f678a8dd4eefda5d90ed7df8af639d41ec7c2bb5040e4296296a307b9cca081c3a10
diff --git a/sys-fs/ubi_reader/metadata.xml b/sys-fs/ubi_reader/metadata.xml
index 8c2cd705bbe0..aa8464b07989 100644
--- a/sys-fs/ubi_reader/metadata.xml
+++ b/sys-fs/ubi_reader/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>jsmolic@gentoo.org</email>
-    <name>Jakov Smolić</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <stabilize-allarches/>
   <upstream>
     <remote-id type="github">jrspruitt/ubi_reader</remote-id>
diff --git a/sys-fs/ubi_reader/ubi_reader-0.8.5-r1.ebuild b/sys-fs/ubi_reader/ubi_reader-0.8.5-r1.ebuild
index ea7eb78871bb..f1dda6d4ddcf 100644
--- a/sys-fs/ubi_reader/ubi_reader-0.8.5-r1.ebuild
+++ b/sys-fs/ubi_reader/ubi_reader-0.8.5-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 2021-2023 Gentoo Authors
+# Copyright 2021-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 inherit distutils-r1
 
 MY_PN="${PN/_/-}"
diff --git a/sys-fs/unionfs-fuse/Manifest b/sys-fs/unionfs-fuse/Manifest
index bfdbc1f0299e..94592914575d 100644
--- a/sys-fs/unionfs-fuse/Manifest
+++ b/sys-fs/unionfs-fuse/Manifest
@@ -1,4 +1,6 @@
 DIST unionfs-fuse-3.4.tar.gz 54122 BLAKE2B 8d578a1bd88814acf5e2d437b06a5f400f38e61ea7c998fe38bb7ca536c9092f07872c4b4ccffc9db834eb8430f3e98c543a66920afab2b2371451c17c247d2c SHA512 fb719c8548ab1fa43f236d5c3207d7e8e7a7dc45efed453e447e29452a7c4d03483c84b00fd615bac115781b333c8171d811b87a0227172010a2ab34224150f7
+DIST unionfs-fuse-3.5.tar.gz 54906 BLAKE2B e9fb236fda184766affec0640127d5d2ba4c9f964e8882570f069f83fb8f35b551f3198dd4f252242287bb92a5ddea396f62975d1ecf5b9b002fe0a7fe9c85a8 SHA512 4f9d08a9ac7f374f15aa31bf2d8cc5e37b35f9a63bcbba50c6d805fb66ea019737b4aa2236b425317e638b6275659c4260ff8e1fecdee038079dc64797ab6013
 EBUILD unionfs-fuse-3.4-r1.ebuild 1025 BLAKE2B 3494e617dea6d62aa927db8c6adf0d8a0cf1714a200e66feb8a0505a23d75e7491c9872cd997247001471ca0f5a6f2642ba494acbf59f70cca7cfba2825376e2 SHA512 8e659c99da89ed545fb05b69cfd4ddd3f9565078ec2356bf4a6a3d5632edd02dc0d8b2253b6ca99cc11d908ef9183a56dd217dd44da614debab28c0344c371a5
+EBUILD unionfs-fuse-3.5.ebuild 1025 BLAKE2B 4f8f3a7c2c8263e9f95abe22387cc75d4ffc07a5de3d07871f1abff06321d2e89e5fe2dd834033ec51183211f237486ce86add0f7c836238411770616cd3a5a6 SHA512 80c94677072203aee3783f4800353ece2a6a235eea2f10c755c64c1ceba2fbc9fddd890fa1eaf0ff3b62c7506cae13ee80b535ab283e06e6629fe597a141c61f
 EBUILD unionfs-fuse-9999.ebuild 978 BLAKE2B 1cf37386909950bdabffbabd242cbd3a13ce22ef3d6957e181578d143f226a496152cc4d62ed8cf2cd9b8100eb44f8a56cdd962827731c0b9e7e612ddc2b742c SHA512 93e70f656eacf2e6b3bae5ac15b434dd1845fd1415d3a05863b7fe7aea6b1ee75f57c6ae4924144ccc59e41e012e9e67fbeb7299f7c95fb952a62c1b9fc98886
 MISC metadata.xml 337 BLAKE2B 709342431554e98878806adef0d73e755defdf429a6541b42897f35ffab2764fa895365fed84a5c2a8437ddd5c386b4a51809550e1175eae8afae24d225b59cd SHA512 841cf1eae96b3ccafd75a5fbff6d7fba5e32bf9ab11db352f19b37adcfae30ddcaaa094d9bd4f5d10427f2f2d9c62e2c1454c3999141b64fa3df596c726396c7
diff --git a/sys-fs/unionfs-fuse/unionfs-fuse-3.5.ebuild b/sys-fs/unionfs-fuse/unionfs-fuse-3.5.ebuild
new file mode 100644
index 000000000000..70e1efca79a6
--- /dev/null
+++ b/sys-fs/unionfs-fuse/unionfs-fuse-3.5.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+PYTHON_COMPAT=( python3_{9..12} )
+inherit python-any-r1 toolchain-funcs
+
+DESCRIPTION="Self-syncing tree-merging file system based on FUSE"
+HOMEPAGE="https://github.com/rpodgorny/unionfs-fuse"
+SRC_URI="https://github.com/rpodgorny/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="sys-fs/fuse:3"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	test? (
+		$(python_gen_any_dep 'dev-python/pytest[${PYTHON_USEDEP}]')
+	)
+"
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+python_check_deps() {
+	use test || return 0
+	python_has_version "dev-python/pytest[${PYTHON_USEDEP}]"
+}
+
+src_compile() {
+	emake AR="$(tc-getAR)" CC="$(tc-getCC)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
+}
+
+src_test() {
+	[[ -e /dev/fuse ]] || return 0
+	addwrite /dev/fuse
+	pytest -vv || die "Tests fail with ${EPYTHON}"
+}