gentoo resync : 25.08.2020

3 files changed, 142 insertions, 0 deletions

diff --git a/sys-fs/mergerfs/Manifest b/sys-fs/mergerfs/Manifest
index 4fb3b8c2ee04..d1b6e4737382 100644
--- a/sys-fs/mergerfs/Manifest
+++ b/sys-fs/mergerfs/Manifest
@@ -1,5 +1,8 @@
+AUX mergerfs-makefiles-fixes-ar-cflags-cxxflags-ldflags.patch 1874 BLAKE2B f1ed2498105ae152f06048c2723d02d0a797d3f129e4401a4069046f231219d363506c40e054c5770de2a874e6d44da3dbc8c29f959ce7ff6b85e3414d087644 SHA512 8294242cb6e25198296e7d7bf4a2808cec10fd33ce95aed1669459577c26c9de6868abcdb6244cf50bba0819e2bfab31cbb38b138af0acbc257fe906cbc92c32
 DIST mergerfs-2.28.3.tar.gz 294065 BLAKE2B 2e59e00726aec53438d5a5df143ca204069794d68c663a130139102a19e118a54fede1c8eca99199a3e634ffa92cb21c25c30718ea0842826de8a64e876b2819 SHA512 5469b3515464680aa72fc393c218fb038bed31194a933e6736eec478d87a110979323308b642d7f100a5c506534ca75badf4a87a050007cdc77cd2a641217929
 DIST mergerfs-2.29.0.tar.gz 302391 BLAKE2B a7d051c63b12a95af2868d8b3be9b32aa1be3d9c4cc4e359914b07e18ed30dadece80861ad559d5cdd85b375f565b9e70dac9ad3e34b98c054dd54822897c1a6 SHA512 2c21dedffc2f261c6c8427af59cffcacacc9b67bce7bb9989bd5946aa645c68bac0f56250ec19710e586a00892f7198853390bea3ff5981035d5a492ae4569a2
+DIST mergerfs-2.30.0.tar.gz 316560 BLAKE2B 7e6be39cfa5f085aabbc928e1da9c0bf1f6442be1de4ccef1868832c852d138901071129cf7feff19b13dd5939c5fff56520c5292473b92c71a85430818ab25c SHA512 6914c5efa783d66293ebcce0a6a493267eedfa45ac058cd24b2024aea15a866b997f4474363e4ababa4af59d302466c5f8c6b9f07ee42f7661b335d4701315b4
 EBUILD mergerfs-2.28.3-r1.ebuild 1050 BLAKE2B 8b5ea7c3cdb6751b706c1a1f7917f3f6cd1d5bfd08848a711f99b32e1fb5ef594ed22488562a33f6c22bf42144b881fa97389b6f28420e9ed35337f4d1327b3e SHA512 79ce0ba08e48defd5d704be474c2be7fbe2588bdc343f921a71ce9f0b2c94483b141b6ec4f9322c4400bb3d03397166094e2d293f28741e930234bae250edb1b
 EBUILD mergerfs-2.29.0.ebuild 963 BLAKE2B 2df7a15e80299d35e0931db932b3af8d74d452e70eae97382fa28a75ac13cec48b62ef1bcfdacfb82fc04d4d3ef7bc3b148da806a6af1120c5ce73e60ab46a54 SHA512 226502ebd8e52f109039c7a3e6ccfd283f5212c1aa29f9b074eeeb4e81a001a004edc355bb7eb3d42e923990fcd260cc5ca9c7b992a2ffebf799f556d8dc0891
+EBUILD mergerfs-2.30.0.ebuild 1151 BLAKE2B 5232e20f48f6b79f9e5547d97af84930ece5608d808a0dbfe87eab956f6730643ddc59fd05e2e95f016f5ba1905f5fccc33a49c4176312636daa431a2ce42d98 SHA512 adf4b53a9189ceb371903304ed63bd3eca6938da757897159450b6e3f7fa4252ef5ecd2b420f195bc401bd8f62795db05c509235b19840db6f83ea79f6c207a6
 MISC metadata.xml 334 BLAKE2B e0f154866ccf08a8534567e5848aa41a0413a31cbd0fc92af2b873e77da2b007c222ab7431a81513e12f3cacd5e8bf8deb8a426e4cee2a64c8d02d0d9b56e4c2 SHA512 8b30ddda63065e140e02f4d3e79d933f46fd9460d2acc5b70e453f82eb6b5c204c810aa0019d183b256fcbde18239efbf01fccc40c5a1ddb632183418a596496
diff --git a/sys-fs/mergerfs/files/mergerfs-makefiles-fixes-ar-cflags-cxxflags-ldflags.patch b/sys-fs/mergerfs/files/mergerfs-makefiles-fixes-ar-cflags-cxxflags-ldflags.patch
new file mode 100644
index 000000000000..05166bacd874
--- /dev/null
+++ b/sys-fs/mergerfs/files/mergerfs-makefiles-fixes-ar-cflags-cxxflags-ldflags.patch
@@ -0,0 +1,83 @@
+diff --git a/Makefile b/Makefile
+index 6c38066..d98021c 100644
+--- a/Makefile
++++ b/Makefile
+@@ -61,13 +61,14 @@ SRC	    = $(wildcard src/*.cpp)
+ OBJS        = $(SRC:src/%.cpp=build/%.o)
+ DEPS        = $(SRC:src/%.cpp=build/%.d)
+ MANPAGE     = mergerfs.1
+-CXXFLAGS    = \
++CXXFLAGS    ?= ${OPT_FLAGS}
++CXXFLAGS    := \
++              ${CXXFLAGS} \
+               -std=c++0x \
+-              $(OPT_FLAGS) \
+               $(STATIC_FLAGS) \
+               $(LTO_FLAGS) \
+               -Wall \
+-	      -Wno-unused-result \
++              -Wno-unused-result \
+               -MMD
+ FUSE_FLAGS = \
+               -Ilibfuse/include \
+@@ -76,9 +77,11 @@ FUSE_FLAGS = \
+ MFS_FLAGS  = \
+ 	      -DUSE_XATTR=$(USE_XATTR) \
+ 	      -DUGID_USE_RWLOCK=$(UGID_USE_RWLOCK)
+-LDFLAGS    = \
+-	      -pthread \
+-              -lrt
++
++LDFLAGS := \
++    ${LDFLAGS} \
++    -pthread \
++    -lrt
+ 
+ DESTDIR       =
+ PREFIX        = /usr/local
+diff --git a/libfuse/Makefile b/libfuse/Makefile
+index e3001aa..2bbc45a 100644
+--- a/libfuse/Makefile
++++ b/libfuse/Makefile
+@@ -29,6 +29,8 @@ INSTALLBINDIR  = $(DESTDIR)$(BINDIR)
+ INSTALLSBINDIR = $(DESTDIR)$(SBINDIR)
+ INSTALLMAN1DIR = $(DESTDIR)$(MAN1DIR)
+ 
++AR ?= ar
++
+ SRC   = \
+ 	lib/buffer.c \
+ 	lib/cuse_lowlevel.c \
+@@ -46,9 +48,10 @@ SRC   = \
+ 	lib/mount.c
+ OBJS = $(SRC:lib/%.c=build/%.o)
+ DEPS = $(SRC:lib/%.c=build/%.d)
+-
+-CFLAGS = \
+-	$(OPT_FLAGS) \
++CFLAGS ?= \
++	$(OPT_FLAGS)
++CFLAGS := \
++    ${CFLAGS} \
+ 	-Wall \
+ 	-pipe \
+ 	-MMD
+@@ -61,7 +64,8 @@ FUSE_FLAGS = \
+ 	-DFUSE_USE_VERSION=29 \
+ 	-DPACKAGE_VERSION=\"$(VERSION)\" \
+ 	-DFUSERMOUNT_DIR=\"$(FUSERMOUNT_DIR)\"
+-LDFLAGS = \
++LDFLAGS := \
++	${LDFLAGS} \
+ 	-lrt \
+ 	-pthread
+ 
+@@ -78,7 +82,7 @@ objects: build/config.h
+ 	$(MAKE) $(OBJS)
+ 
+ build/libfuse.a: objects
+-	ar rcs build/libfuse.a $(OBJS)
++	${AR} rcs build/libfuse.a $(OBJS)
+ 
+ utils: mergerfs-fusermount mount.mergerfs
+ 
diff --git a/sys-fs/mergerfs/mergerfs-2.30.0.ebuild b/sys-fs/mergerfs/mergerfs-2.30.0.ebuild
new file mode 100644
index 000000000000..e18bed548895
--- /dev/null
+++ b/sys-fs/mergerfs/mergerfs-2.30.0.ebuild
@@ -0,0 +1,56 @@
+# 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"
+
+PATCHES=(
+	"${FILESDIR}"/mergerfs-makefiles-fixes-ar-cflags-cxxflags-ldflags.patch
+)
+
+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
+
+	default
+}
+
+src_install() {
+	dobin build/mergerfs
+	dosym mergerfs /usr/bin/mount.mergerfs
+	dodoc README.md
+	doman man/mergerfs.1
+}