11 files changed, 145 insertions, 3 deletions
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index cd61fdec269e..95358cddb9d7 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/extundelete/Manifest b/sys-fs/extundelete/Manifest
index 5fe75deee07c..cadb91e99fbf 100644
--- a/sys-fs/extundelete/Manifest
+++ b/sys-fs/extundelete/Manifest
@@ -1,4 +1,6 @@
+AUX extundelete-0.2.4-clang.patch 551 BLAKE2B b578c182df4c6540b5ebdfff8f1a88cce021778f35da171b6d04f8d3946f5107c331ec6cb0514a56a37773ba30c5dc5c3bd947c5c514a3365cddbd58665503a9 SHA512 c4083ec916332648a8b89cdc36cda8b87dd6181517e3b2a6ad56139965fd8bcbf1f353f8ff4c10d156f29b4ba42c814a09b29428a47605740d4e6262b6d386ec
 AUX extundelete-0.2.4-e2fsprogs.patch 582 BLAKE2B 12176abdccb06b9ad2a55dac5dabfbef402a95ac00ca28ba951e4fcba024d5f99e0355b1f6f0bf38f6b2878cd190cde6774136c1b0b1bbba27b73fc3d0a7adee SHA512 c0df34bfdef07e931503cc8f3270cd070328b54053da1d8dbfefb8a49a81c4234cbdb4205d30cf654b5d5ca42dd27ad104f08f6ab7839d5f3d0cebc6ec6ef499
 DIST extundelete-0.2.4.tar.bz2 108472 BLAKE2B 3627c092672957e25f2bd351a6d92f6d32a0e322a0555766edc35545cccab7ee47fb0c471ebea31692779bdf44433bb98a07cab0bc26141f1f09b33601da57ea SHA512 5c896055b6fa3c38f283a043cca744513fdc1a60e212eac0c78fa868064a8eeb11f540c4cc5ca89ac68da0c1705a40fe45731c203b6748808f85e9870a207bcd
-EBUILD extundelete-0.2.4-r1.ebuild 437 BLAKE2B a654f1261e641d93d1baa5316dd2c67c775f764a630ed133e30e41455b8f909f7ae03ad7b88a6ecb4c1c0ec46dede4df5edc4784a656c5ad1ce2c83bf14c4e76 SHA512 d9a06991190a1b80d53381c6d1f68a4be90f2bbc18d399c45c005d7a4dea0108d5f7e96a1b9931e66d37cd76dea14a6069fb227f187ff589debe45a2a2f6b2a4
+EBUILD extundelete-0.2.4-r1.ebuild 437 BLAKE2B 21b794bb0785d1f2259a79868cfda968751d546c781e4da8e10e0495d0153f1b4cd140bc3922895a08eeae3ea1cddea9afee3db3daa76c7e3e5c7f1ff6926835 SHA512 de31308ab3d5c73aab3ce55e5f102d76f5a8f0c0fb0d5bf87436f975fa4b18d3cca665f486640a07b9cae5bab1c58f1051d9caebc43afce9e34c2321a9b97802
+EBUILD extundelete-0.2.4-r2.ebuild 474 BLAKE2B b150b8c23742618278c1573e4da44a4082223ed00edc40788ec96198f2b47ecad070bd79c7b1b0b5bded0dafe577f8b2472a0721e773a66af43c80aecc6bad8c SHA512 8a42831e9e876c22a4d78888747905824f048ed26bfed20e02dc8f685e348c4c3129b266055e3cd1b96ac67b87c8c5fb57395cbbd8e44d37ab946134fa314f9c
 MISC metadata.xml 407 BLAKE2B 30d6168e6fdac8b0528262d69e04bcba524dec5620d79d66a8b3cee7a04430026d92dedda1c96a321fad7fa4684c142d7dfea1a802fadef8032d4316eb4e6612 SHA512 207a713127eda7bb582f66d841a2aaf8825a8d0c0b4e9e8e7b0a4d8ec9eedd9fccf22be14fff09c98e57c339257a1cdba526036f54cb1170aaf8ab65032c06a2
diff --git a/sys-fs/extundelete/extundelete-0.2.4-r1.ebuild b/sys-fs/extundelete/extundelete-0.2.4-r1.ebuild
index 03b275ad95d1..88a235cf4f4b 100644
--- a/sys-fs/extundelete/extundelete-0.2.4-r1.ebuild
+++ b/sys-fs/extundelete/extundelete-0.2.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/sys-fs/extundelete/extundelete-0.2.4-r2.ebuild b/sys-fs/extundelete/extundelete-0.2.4-r2.ebuild
new file mode 100644
index 000000000000..f1ca8f9e938d
--- /dev/null
+++ b/sys-fs/extundelete/extundelete-0.2.4-r2.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A utility to undelete files from an ext3 or ext4 partition"
+HOMEPAGE="https://extundelete.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~sparc ~x86"
+
+RDEPEND="sys-fs/e2fsprogs"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-e2fsprogs.patch"
+	"${FILESDIR}/${P}-clang.patch"
+)
diff --git a/sys-fs/extundelete/files/extundelete-0.2.4-clang.patch b/sys-fs/extundelete/files/extundelete-0.2.4-clang.patch
new file mode 100644
index 000000000000..711a8db8ad3d
--- /dev/null
+++ b/sys-fs/extundelete/files/extundelete-0.2.4-clang.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/732284
+--- a/src/extundelete.cc
++++ b/src/extundelete.cc
+@@ -1268,7 +1268,7 @@ static ext2_ino_t find_inode(ext2_filsys fs, ext2_filsys jfs, struct ext2_inode
+ 	*new_ino = 0;
+ 	priv->ret_ino = new_ino;
+ 	priv->curr_name = curr_part;
+-	struct dir_context ctx = {search_flags, DIRENT_FLAG_INCLUDE_REMOVED,
++	struct dir_context ctx = {(ext2_ino_t)search_flags, DIRENT_FLAG_INCLUDE_REMOVED,
+ 			buf, match_name2, priv, 0};
+ 	errcode_t code = extundelete_block_iterate3(fs, *inode, BLOCK_FLAG_DATA_ONLY,
+ 			NULL, match_ino, &ctx);
diff --git a/sys-fs/mergerfs/Manifest b/sys-fs/mergerfs/Manifest
index 0d77dca35606..1fe1c5cd9ac8 100644
--- a/sys-fs/mergerfs/Manifest
+++ b/sys-fs/mergerfs/Manifest
@@ -1,7 +1,9 @@
 DIST mergerfs-2.32.3.tar.gz 314280 BLAKE2B f7c5ab92f1241627bd91255b35bdd81782f153f9144242a52241f9e812e4096c23d73401251a8ace43781f39a4644814dc724a8a31066f77cfd78ad6c27d54dd SHA512 f3f8f320f98ef2a345a0229eca661c6c8c75fdd23613ae0d45f13062b18f6f052474a009c77a6602df77762100f45b3eb76692812e81d12555763ead5c83b87d
 DIST mergerfs-2.33.1.tar.gz 382421 BLAKE2B 0985a0ad53a12fe5283fd0e953cd74a835efd3e83f65ba4e96bc42814ce151d03f95c032eeebcc9821c7c15ae59d14b9e40055438b4482a337c5b7bc9503d27e SHA512 1178fbd4ad99c6c693e2c21551c7522107701b0d5c608a7c18be29825cf97f2a2b2d6a50094e800a74dddd9a3902c374f8b57e84a76c0640aa8e387aa095d300
 DIST mergerfs-2.33.3.tar.gz 382386 BLAKE2B 49a2b75a2a39fbec178460f94696a918a0f872a7c904355c84180f8be07d9abdf68e342e7acca5093a621b85110d0a0fdb5650de68e04aa176250199eaa5bdb7 SHA512 aca5884a9d5dc03d7095e73461dee843d69463db72dfc033f76611d5417dab63ff29eb2b473f39f0390299c3aa882e6197a7038e82b58ab85799d39cc44b84d0
+DIST mergerfs-2.33.4.tar.gz 382872 BLAKE2B fe369f377f731a6323566cf4d5076e9ba7dca302aae1125635433ab93927d3aad5ca57a95e0791742cdf80c7fa69cacdd16a6519593bad9e933e529974bd5d2a SHA512 e8bd0a502c045d6f93d34bce833108deaf1071a3e5c56eb61a59416067230d6e8f19f9b0f8c8aa9fe84060a886afae7509231c97fc6d9537d3ad3390ce342239
 EBUILD mergerfs-2.32.3.ebuild 1063 BLAKE2B 4ed082d6f17bd69240a60a37e185dbe3c2ffff5dde3abec1c04f6603045c611585fdf8a13d5ffb37c6538bc8a1096c1a6a604528e201653dfadde006f0a59f62 SHA512 68c529bc33c1929e897b0a04e8b6b354abafca9f0d43deb42c443c70938c442b38efab4017969b55918370da71cd35bc75b043e63211e889454a4c44b18936fd
 EBUILD mergerfs-2.33.1.ebuild 1070 BLAKE2B 37bff1091558136fb4cf57cb044ce091563e084d9aed9e7d996bf2854fb088afcba556f52264c7fb96f6cd917085063361636aee4c02277fe77a9d9940afc3ce SHA512 182888f30b44591fe17e9fa8ad57d9f41b508d901ca571b59482a878be2b5a568af6a69fe41f770137e1ec91bd3acb6ac2a7b658f0eeecd181895891b5c85815
 EBUILD mergerfs-2.33.3.ebuild 1072 BLAKE2B af27c19cfa533b94446585119a7611316c8b06af7dddd9fa8764bd47c4fd0c194a5947dfa68ffb381a99c576408d9c8db40058fe594c2291714329cf904c7923 SHA512 f6de50936deb415446d71f465c1b206f9df246d236c2f45b5fffb8c32dfc7955b2586468cf4848990fe04290668285d266131806dad09615a3eff2658764cf4c
+EBUILD mergerfs-2.33.4.ebuild 1072 BLAKE2B af27c19cfa533b94446585119a7611316c8b06af7dddd9fa8764bd47c4fd0c194a5947dfa68ffb381a99c576408d9c8db40058fe594c2291714329cf904c7923 SHA512 f6de50936deb415446d71f465c1b206f9df246d236c2f45b5fffb8c32dfc7955b2586468cf4848990fe04290668285d266131806dad09615a3eff2658764cf4c
 MISC metadata.xml 335 BLAKE2B 6650c40b968c0df32e03159d92248d1f54884556cc69175898b149bd2e1dcd7cca5e1d35a3d3478f73fec99ad8d8ea3f5e6873bba6577eb7b78ba1db40e5a295 SHA512 5503d278fe75d307768f01cab25f18452b04c80a954045d8ffc398ff29ff37135009b64401a24f4496da3a098a9e9d46dc430f756f2c020dbe0319fb7ce2b47e
diff --git a/sys-fs/mergerfs/mergerfs-2.33.4.ebuild b/sys-fs/mergerfs/mergerfs-2.33.4.ebuild
new file mode 100644
index 000000000000..fb2d3b62a41b
--- /dev/null
+++ b/sys-fs/mergerfs/mergerfs-2.33.4.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="A featureful union filesystem"
+HOMEPAGE="https://github.com/trapexit/mergerfs"
+
+SRC_URI="https://github.com/trapexit/mergerfs/archive/${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64 ~x86"
+
+# Vendorized libfuse that's bundled is under LGPL-2.1.
+LICENSE="ISC LGPL-2.1"
+SLOT="0"
+IUSE="+xattr"
+
+DEPEND="
+	xattr? ( sys-apps/attr )
+"
+
+RDEPEND="${DEPEND}"
+
+BDEPEND="sys-devel/gettext"
+
+src_prepare() {
+	default
+
+	# Hand made build system at it's finest.
+	echo -e "#!/bin/sh\ntrue" >tools/update-version || die
+	echo "#pragma once" >src/version.hpp || die
+	echo "static const char MERGERFS_VERSION[] = \"${PV}\";" >>src/version.hpp || die
+
+	if ! use xattr; then
+		sed 's%USE_XATTR = 1%USE_XATTR = 0%g' -i Makefile || die
+	fi
+}
+
+src_compile() {
+	# https://bugs.gentoo.org/725978
+	tc-export AR CC CXX
+
+	default
+}
+
+src_install() {
+	dobin build/mergerfs
+	dosym mergerfs /usr/bin/mount.mergerfs
+	dodoc README.md
+	doman man/mergerfs.1
+}
diff --git a/sys-fs/nilfs-utils/Manifest b/sys-fs/nilfs-utils/Manifest
index 2a7950971026..3b47f9b819ed 100644
--- a/sys-fs/nilfs-utils/Manifest
+++ b/sys-fs/nilfs-utils/Manifest
@@ -2,4 +2,4 @@ DIST nilfs-utils-2.2.2.tar.bz2 424097 BLAKE2B d38b40e9b70a17bc957a89f5d1551bcc0e
 DIST nilfs-utils-2.2.8.tar.bz2 440550 BLAKE2B 05cce6b639856df6d5748bc4045500d801260c46cedff31aa571c743eb7e2c8f3d6101faf9bc90b231425fbae349671f6603d902a3240f1f06ef7fd7fedbe2c6 SHA512 3232390581f63de5ebe7b461b178a40dfbdaa4bc6aa96b218ea8182c5bf81b162a1e632a1c21d9f1e89fdba9393b4e268e001c335a99ce22f645a62ae3154783
 EBUILD nilfs-utils-2.2.2-r1.ebuild 739 BLAKE2B 9877d1958e6e4d6ce7e11c8f3390852e831eca135d816b24cf236768f86af85c00064d4421d93cd21536b6ffa02532ef389fa06b58fc2fa0a12bce68df195ee1 SHA512 dcac252a7cc4662de83a1083ea29a4a684758d06eaa086c64e90410d368f8401cc013ac23753ccef9a4da87bf2e3b5aad316d23d132999d22dba468424da79ff
 EBUILD nilfs-utils-2.2.8.ebuild 1065 BLAKE2B c452503d3dcdd0484a69647ac40423521d39e6f3ccc01225082b15086fec111f6ce91dcfc85e11421f241a06b809144159b92d585acee844727bf1cbdde07b50 SHA512 c1b9c633b525ea1d2bbc784b45b4a7e207ab86c169697e47f89dbd3d6f4716936a0b3c295503a87b4f358fe1522ea916b7526bf105b10d2c68e80e5831ee279d
-MISC metadata.xml 1180 BLAKE2B 949e69e4b635c9124d4f0ab9c46959ff212e72c11ad64af13924c072e033ecf56cef427a29d31680d0acf4a8de5d6e51e584b11e17922267205da11268dcbf49 SHA512 eeed1a4d4a05f652849b4d5683ddab0eccaab9a05b2236f079e76a2c9c5937ebc7defdbe2328430b3ff60019bd44f2008ed41b26db64eb8ca78bc8b39375b199
+MISC metadata.xml 1208 BLAKE2B 5164f144bb71bd558a24bb0b7030bc109a4ed6ea2e5ee8ade9b10ed28ea85db5426d9a7b07559f63756274459f3f82c48f011d1887d40c6749c48d29ae0e7eb9 SHA512 e1e742daa9b7fa4c082c6e5b7ce3a42dbf260a11e7ef9103c1f083a9788a0dc2f9667edb0ae758f46cf8100a0bdc06a0111e011a92fc567b39de3a70e3022893
diff --git a/sys-fs/nilfs-utils/metadata.xml b/sys-fs/nilfs-utils/metadata.xml
index f7bb79f1defb..ef33436c0029 100644
--- a/sys-fs/nilfs-utils/metadata.xml
+++ b/sys-fs/nilfs-utils/metadata.xml
@@ -3,6 +3,7 @@
 <pkgmetadata>
 	<maintainer type="person">
 		<email>naota@gentoo.org</email>
+		<name>Naohiro Aota</name>
 	</maintainer>
 	<longdescription lang="en">
 NILFS is a new implementation of a log-structured file system for the
diff --git a/sys-fs/squashfs-tools-ng/Manifest b/sys-fs/squashfs-tools-ng/Manifest
index 2b2f565a4a2f..130ad392c34a 100644
--- a/sys-fs/squashfs-tools-ng/Manifest
+++ b/sys-fs/squashfs-tools-ng/Manifest
@@ -1,4 +1,6 @@
 DIST squashfs-tools-ng-1.1.3.tar.xz 1181268 BLAKE2B 0d72cc82d937f7403fb67030d799cce37062496bb5dddf68f2151243b99934104e4e576e45bc6bcb2229b1f9eca134482de3180f0035229d829e785fdf0d5d03 SHA512 7a42a540622c324f500e21d64bc57bc203069c6e1deb2624597a767d8267b719bd8f76fbfa0166b7e2d4a6f9acd3d2a46514a45fcb4760052d45c7e1861da94e
+DIST squashfs-tools-ng-1.1.4.tar.xz 1311684 BLAKE2B b976ac223d57919958e0ad04c989e0a9cf2837e1c7ef1e1962069b4796b492fe2fc99c59d1e38b11e380226dc2fc4b2e25e29244635a32d03d0667f2b3ef1d7f SHA512 10e0bebd70de686862f1473588cdbf922ad766c86b64ebd4d6338fd863f862fe0c9374950fa54a197c0f02021c63943cf1ba57ebb7f93a4188e68e2b25b4a800
 EBUILD squashfs-tools-ng-1.1.3.ebuild 1129 BLAKE2B aa3e69a031b60b665d6c74b16a0bfc61a327a092a6b9dfa64035fa2fdf2ecc7c3805cd1753b9f2703af02659e7187b9b939011d9a2e0741493f5cedcde56ea30 SHA512 2ccbfe6a31cf89e5a35ca4bd7bc299758464760be4a6de352ee19b5cebec9f564a39f485d64bc1cc2d7435c527e0758fa675d9615d1bd58761a6872c86a90d66
+EBUILD squashfs-tools-ng-1.1.4.ebuild 1129 BLAKE2B ee1639e8ac2ca8bf772da82f6f2763111fc59f2eb3791a865cddd409bf4305a917e99e212fe07ceac587a489d21a15d125ab041619e1c8ce84c58bc549d33132 SHA512 8896b93f2e5e80fbdf32ee320aa3f42eec8859891f474bbe3fc6885c4f1527bcc3abd59331abeff2f7dd61ddca041d421faacab287756a35908122fd6d0ccd33
 EBUILD squashfs-tools-ng-9999.ebuild 1129 BLAKE2B aa3e69a031b60b665d6c74b16a0bfc61a327a092a6b9dfa64035fa2fdf2ecc7c3805cd1753b9f2703af02659e7187b9b939011d9a2e0741493f5cedcde56ea30 SHA512 2ccbfe6a31cf89e5a35ca4bd7bc299758464760be4a6de352ee19b5cebec9f564a39f485d64bc1cc2d7435c527e0758fa675d9615d1bd58761a6872c86a90d66
 MISC metadata.xml 453 BLAKE2B 4bfc83a611fe2b8da5ce57e56c438c671489d0944cbb4b3f82113bac6bee89028091551c1c96953f166959b087d7e776b28ecb6b9290489f007ea5ca33090ebf SHA512 013b8d87af8c6298eaba48b4aa4282a8781321b0a15d1a8745361e389bb6c5ae6957b24af4bb6b88125cff5f9824b0e878051bd395fdeb98c2ae0ef7f2b370a7
diff --git a/sys-fs/squashfs-tools-ng/squashfs-tools-ng-1.1.4.ebuild b/sys-fs/squashfs-tools-ng/squashfs-tools-ng-1.1.4.ebuild
new file mode 100644
index 000000000000..46990a47a6dc
--- /dev/null
+++ b/sys-fs/squashfs-tools-ng/squashfs-tools-ng-1.1.4.ebuild
@@ -0,0 +1,51 @@
+# Copyright 2019-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A new set of tools for working with SquashFS images"
+HOMEPAGE="https://github.com/AgentD/squashfs-tools-ng"
+if [[ ${PV} = 9999* ]]; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://github.com/AgentD/${PN}.git"
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	SRC_URI="https://infraroot.at/pub/squashfs/${P}.tar.xz"
+fi
+
+LICENSE="LGPL-3+ tools? ( GPL-3+ )"
+SLOT="0"
+IUSE="lz4 +lzma lzo selinux +tools zstd"
+
+DEPEND="
+	sys-libs/zlib:=
+	lz4?     ( app-arch/lz4:= )
+	lzma?    ( app-arch/xz-utils:= )
+	lzo?     ( dev-libs/lzo:= )
+	selinux? ( sys-libs/libselinux:= )
+	zstd?    ( app-arch/zstd:= )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+	[[ ${PV} == "9999" ]] && eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		--disable-static
+		$(use_with lz4)
+		$(use_with lzo)
+		$(use_with selinux)
+		$(use_with tools)
+		$(use_with lzma xz)
+		$(use_with zstd)
+	)
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	find "${D}" -name "*.la" -delete || die
+}