gentoo Easter resync : 12.04.2020

3 files changed, 48 insertions, 3 deletions

diff --git a/sys-fs/mergerfs/Manifest b/sys-fs/mergerfs/Manifest
index a96fc0f20ff0..4fb3b8c2ee04 100644
--- a/sys-fs/mergerfs/Manifest
+++ b/sys-fs/mergerfs/Manifest
@@ -1,3 +1,5 @@
 DIST mergerfs-2.28.3.tar.gz 294065 BLAKE2B 2e59e00726aec53438d5a5df143ca204069794d68c663a130139102a19e118a54fede1c8eca99199a3e634ffa92cb21c25c30718ea0842826de8a64e876b2819 SHA512 5469b3515464680aa72fc393c218fb038bed31194a933e6736eec478d87a110979323308b642d7f100a5c506534ca75badf4a87a050007cdc77cd2a641217929
-EBUILD mergerfs-2.28.3-r1.ebuild 1052 BLAKE2B e465ed82a76b54500683b111e57e2d4072541e12e7a4e2ccfcaea8d816f93cf5a3f0abb7db5b44ad74e5834c96ea58cd65daab22ac8c96ec3ab418fb0df1ea26 SHA512 fbdeb503a490665295a0b5202a5caaf1e802abb3139eec4ed925432161ed69ca973a38e47a970e13bea751bc88ba947e4b610b9c07a1cc7fc5a338e752931a14
+DIST mergerfs-2.29.0.tar.gz 302391 BLAKE2B a7d051c63b12a95af2868d8b3be9b32aa1be3d9c4cc4e359914b07e18ed30dadece80861ad559d5cdd85b375f565b9e70dac9ad3e34b98c054dd54822897c1a6 SHA512 2c21dedffc2f261c6c8427af59cffcacacc9b67bce7bb9989bd5946aa645c68bac0f56250ec19710e586a00892f7198853390bea3ff5981035d5a492ae4569a2
+EBUILD mergerfs-2.28.3-r1.ebuild 1050 BLAKE2B 8b5ea7c3cdb6751b706c1a1f7917f3f6cd1d5bfd08848a711f99b32e1fb5ef594ed22488562a33f6c22bf42144b881fa97389b6f28420e9ed35337f4d1327b3e SHA512 79ce0ba08e48defd5d704be474c2be7fbe2588bdc343f921a71ce9f0b2c94483b141b6ec4f9322c4400bb3d03397166094e2d293f28741e930234bae250edb1b
+EBUILD mergerfs-2.29.0.ebuild 963 BLAKE2B 2df7a15e80299d35e0931db932b3af8d74d452e70eae97382fa28a75ac13cec48b62ef1bcfdacfb82fc04d4d3ef7bc3b148da806a6af1120c5ce73e60ab46a54 SHA512 226502ebd8e52f109039c7a3e6ccfd283f5212c1aa29f9b074eeeb4e81a001a004edc355bb7eb3d42e923990fcd260cc5ca9c7b992a2ffebf799f556d8dc0891
 MISC metadata.xml 334 BLAKE2B e0f154866ccf08a8534567e5848aa41a0413a31cbd0fc92af2b873e77da2b007c222ab7431a81513e12f3cacd5e8bf8deb8a426e4cee2a64c8d02d0d9b56e4c2 SHA512 8b30ddda63065e140e02f4d3e79d933f46fd9460d2acc5b70e453f82eb6b5c204c810aa0019d183b256fcbde18239efbf01fccc40c5a1ddb632183418a596496
diff --git a/sys-fs/mergerfs/mergerfs-2.28.3-r1.ebuild b/sys-fs/mergerfs/mergerfs-2.28.3-r1.ebuild
index 00bac72e756f..101fdf4ffc72 100644
--- a/sys-fs/mergerfs/mergerfs-2.28.3-r1.ebuild
+++ b/sys-fs/mergerfs/mergerfs-2.28.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,7 +7,7 @@ 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"
+KEYWORDS="amd64 x86"
 
 # Vendorized libfuse that's bundled is under LGPL-2.1.
 LICENSE="ISC LGPL-2.1"
diff --git a/sys-fs/mergerfs/mergerfs-2.29.0.ebuild b/sys-fs/mergerfs/mergerfs-2.29.0.ebuild
new file mode 100644
index 000000000000..97325c3ba210
--- /dev/null
+++ b/sys-fs/mergerfs/mergerfs-2.29.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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_install() {
+	dobin build/mergerfs
+	dosym mergerfs /usr/bin/mount.mergerfs
+	dodoc README.md
+	doman man/mergerfs.1
+}