gentoo resync : 22.12.2021

2 files changed, 54 insertions, 0 deletions

diff --git a/sys-fs/mergerfs/Manifest b/sys-fs/mergerfs/Manifest
index 357d84b51535..6ba37b62d528 100644
--- a/sys-fs/mergerfs/Manifest
+++ b/sys-fs/mergerfs/Manifest
@@ -3,9 +3,11 @@ DIST mergerfs-2.32.2.tar.gz 314267 BLAKE2B 768241671202019262e16ff9e2247014904fd
 DIST mergerfs-2.32.3.tar.gz 314280 BLAKE2B f7c5ab92f1241627bd91255b35bdd81782f153f9144242a52241f9e812e4096c23d73401251a8ace43781f39a4644814dc724a8a31066f77cfd78ad6c27d54dd SHA512 f3f8f320f98ef2a345a0229eca661c6c8c75fdd23613ae0d45f13062b18f6f052474a009c77a6602df77762100f45b3eb76692812e81d12555763ead5c83b87d
 DIST mergerfs-2.32.4.tar.gz 314302 BLAKE2B 9435e1e9a7539c5fd732313e269551b12d5e23303e4ac77d783817f42c8004f2873f9e82bd69586c69ebce1e628da707534b04094ea0d7a1f626af6f3b8a444a SHA512 248b5e16c49f0775a5173b10940e45fa401ff81a44e2f081135f118a4deb9f79104d77e1c7424926da703123753a75e8f0590396e44c9ecd3bfdd1f27d7ced17
 DIST mergerfs-2.32.6.tar.gz 314321 BLAKE2B 98d5aba7464a82ca21fd2e5d99bbda9b420462afb0743c132199a5e964143dd2b810fdd556a59b949dcdb8542b83654092e354c3c458bca07e40967c1c484386 SHA512 036c597b33d5ebd5a85444c24ad903f210ee62474ddf226e389bc7366b95972b0f75269540907dc9986c4fa449d0bfc67e6bf225ea1a8023d48872bbd4f5a325
+DIST mergerfs-2.33.1.tar.gz 382421 BLAKE2B 0985a0ad53a12fe5283fd0e953cd74a835efd3e83f65ba4e96bc42814ce151d03f95c032eeebcc9821c7c15ae59d14b9e40055438b4482a337c5b7bc9503d27e SHA512 1178fbd4ad99c6c693e2c21551c7522107701b0d5c608a7c18be29825cf97f2a2b2d6a50094e800a74dddd9a3902c374f8b57e84a76c0640aa8e387aa095d300
 EBUILD mergerfs-2.32.1.ebuild 1063 BLAKE2B 4ed082d6f17bd69240a60a37e185dbe3c2ffff5dde3abec1c04f6603045c611585fdf8a13d5ffb37c6538bc8a1096c1a6a604528e201653dfadde006f0a59f62 SHA512 68c529bc33c1929e897b0a04e8b6b354abafca9f0d43deb42c443c70938c442b38efab4017969b55918370da71cd35bc75b043e63211e889454a4c44b18936fd
 EBUILD mergerfs-2.32.2.ebuild 1065 BLAKE2B 67bed9a9fd98e4c0a92461a2300c6f7a723f8499e259f83a842ac8f06958e12a4166e19cb6cc6ea88d51d6bececd6e7a7333a444b0fbba3f029afe6b79e5b595 SHA512 a025cd4e920208b5aea87fa2b37d1d710769ad325162654f07797308a1c6d1c7d425bf9e72615c9d10042905cf320919bae0b94abd905b0bb7ed4273d44ed15c
 EBUILD mergerfs-2.32.3.ebuild 1063 BLAKE2B 4ed082d6f17bd69240a60a37e185dbe3c2ffff5dde3abec1c04f6603045c611585fdf8a13d5ffb37c6538bc8a1096c1a6a604528e201653dfadde006f0a59f62 SHA512 68c529bc33c1929e897b0a04e8b6b354abafca9f0d43deb42c443c70938c442b38efab4017969b55918370da71cd35bc75b043e63211e889454a4c44b18936fd
 EBUILD mergerfs-2.32.4.ebuild 1072 BLAKE2B 583217f0c3d07e4b2b8ee7b00b81c0bec30e64e73474b6ee8cfa93e6bafc13eb0e0364fc5812c075edc09c31e69861e9251b0fd36c261f352454be026197a634 SHA512 a19d0cbce9402e928aa4193f85232d90572a8e6c05e90a713bdc93641ef0e95c1d36ba9dad8b4181b7fef537c9b9056c5bcee27204d7a911f01abdbfba17bd8f
 EBUILD mergerfs-2.32.6.ebuild 1072 BLAKE2B 583217f0c3d07e4b2b8ee7b00b81c0bec30e64e73474b6ee8cfa93e6bafc13eb0e0364fc5812c075edc09c31e69861e9251b0fd36c261f352454be026197a634 SHA512 a19d0cbce9402e928aa4193f85232d90572a8e6c05e90a713bdc93641ef0e95c1d36ba9dad8b4181b7fef537c9b9056c5bcee27204d7a911f01abdbfba17bd8f
+EBUILD mergerfs-2.33.1.ebuild 1072 BLAKE2B 583217f0c3d07e4b2b8ee7b00b81c0bec30e64e73474b6ee8cfa93e6bafc13eb0e0364fc5812c075edc09c31e69861e9251b0fd36c261f352454be026197a634 SHA512 a19d0cbce9402e928aa4193f85232d90572a8e6c05e90a713bdc93641ef0e95c1d36ba9dad8b4181b7fef537c9b9056c5bcee27204d7a911f01abdbfba17bd8f
 MISC metadata.xml 335 BLAKE2B 6650c40b968c0df32e03159d92248d1f54884556cc69175898b149bd2e1dcd7cca5e1d35a3d3478f73fec99ad8d8ea3f5e6873bba6577eb7b78ba1db40e5a295 SHA512 5503d278fe75d307768f01cab25f18452b04c80a954045d8ffc398ff29ff37135009b64401a24f4496da3a098a9e9d46dc430f756f2c020dbe0319fb7ce2b47e
diff --git a/sys-fs/mergerfs/mergerfs-2.33.1.ebuild b/sys-fs/mergerfs/mergerfs-2.33.1.ebuild
new file mode 100644
index 000000000000..2600359a9c80
--- /dev/null
+++ b/sys-fs/mergerfs/mergerfs-2.33.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2020 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
+}