[gentoo-commits] repo/gentoo:master commit in: sys-fs/mergerfs/

2023-10-09 Thread Sam James
commit: ed0a8890fbbaadd5a115a14a200be10caf7ed85c
Author: Sam James  gentoo  org>
AuthorDate: Mon Oct  9 20:01:18 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Oct  9 20:01:34 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed0a8890

sys-fs/mergerfs: Stabilize 2.36.0 amd64, #915424

Signed-off-by: Sam James  gentoo.org>

 sys-fs/mergerfs/mergerfs-2.36.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/mergerfs/mergerfs-2.36.0.ebuild 
b/sys-fs/mergerfs/mergerfs-2.36.0.ebuild
index 8afd58b74224..a534d6068490 100644
--- a/sys-fs/mergerfs/mergerfs-2.36.0.ebuild
+++ b/sys-fs/mergerfs/mergerfs-2.36.0.ebuild
@@ -9,7 +9,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 ~riscv x86"
+KEYWORDS="amd64 ~riscv x86"
 
 # Vendorized libfuse that's bundled is under LGPL-2.1.
 LICENSE="ISC LGPL-2.1"



[gentoo-commits] repo/gentoo:master commit in: sys-fs/mergerfs/

2023-10-09 Thread Arthur Zamarin
commit: 45e4a57979d1fc9948c440445acac46863f4d3f2
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Mon Oct  9 16:19:49 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Mon Oct  9 16:19:49 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45e4a579

sys-fs/mergerfs: Stabilize 2.36.0 x86, #915424

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-fs/mergerfs/mergerfs-2.36.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/mergerfs/mergerfs-2.36.0.ebuild 
b/sys-fs/mergerfs/mergerfs-2.36.0.ebuild
index ad9d06e1fdee..8afd58b74224 100644
--- a/sys-fs/mergerfs/mergerfs-2.36.0.ebuild
+++ b/sys-fs/mergerfs/mergerfs-2.36.0.ebuild
@@ -9,7 +9,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 ~riscv ~x86"
+KEYWORDS="~amd64 ~riscv x86"
 
 # Vendorized libfuse that's bundled is under LGPL-2.1.
 LICENSE="ISC LGPL-2.1"



[gentoo-commits] repo/gentoo:master commit in: sys-fs/mergerfs-tools/

2023-08-09 Thread Piotr Karbowski
commit: de9069f5f55c689537ec7a5d4321a6832a4a1d13
Author: Piotr Karbowski  gentoo  org>
AuthorDate: Wed Aug  9 18:12:58 2023 +
Commit: Piotr Karbowski  gentoo  org>
CommitDate: Wed Aug  9 18:14:23 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de9069f5

sys-fs/mergerfs-tools: drop myself as maintainer; m-n.

Signed-off-by: Piotr Karbowski  gentoo.org>

 sys-fs/mergerfs-tools/metadata.xml | 5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/sys-fs/mergerfs-tools/metadata.xml 
b/sys-fs/mergerfs-tools/metadata.xml
index 5dd94d2f63a6..c0d1a84a3646 100644
--- a/sys-fs/mergerfs-tools/metadata.xml
+++ b/sys-fs/mergerfs-tools/metadata.xml
@@ -1,10 +1,7 @@
 
 https://www.gentoo.org/dtd/metadata.dtd;>
 
-   
-   slashbe...@gentoo.org
-   Piotr Karbowski
-   
+   

trapexit/mergerfs-tools




[gentoo-commits] repo/gentoo:master commit in: sys-fs/mergerfs/

2023-08-09 Thread Piotr Karbowski
commit: 0131861520d26ace8d26e9ba7a9f72192242ad8b
Author: Piotr Karbowski  gentoo  org>
AuthorDate: Wed Aug  9 18:10:27 2023 +
Commit: Piotr Karbowski  gentoo  org>
CommitDate: Wed Aug  9 18:14:23 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01318615

sys-fs/mergerfs: drop myself as maintainer; m-n.

Signed-off-by: Piotr Karbowski  gentoo.org>

 sys-fs/mergerfs/metadata.xml | 5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/sys-fs/mergerfs/metadata.xml b/sys-fs/mergerfs/metadata.xml
index d63ca378bfc1..30388cdafb75 100644
--- a/sys-fs/mergerfs/metadata.xml
+++ b/sys-fs/mergerfs/metadata.xml
@@ -1,10 +1,7 @@
 
 https://www.gentoo.org/dtd/metadata.dtd;>
 
-   
-   slashbe...@gentoo.org
-   Piotr Karbowski
-   
+   

trapexit/mergerfs




[gentoo-commits] repo/gentoo:master commit in: sys-fs/mergerfs/

2023-07-23 Thread Piotr Karbowski
commit: 0c5e7898fdd00b3df1397f82397eb25543085c7c
Author: Piotr Karbowski  gentoo  org>
AuthorDate: Sun Jul 23 16:30:54 2023 +
Commit: Piotr Karbowski  gentoo  org>
CommitDate: Sun Jul 23 16:40:46 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c5e7898

sys-fs/mergerfs: drop old.

Signed-off-by: Piotr Karbowski  gentoo.org>

 sys-fs/mergerfs/Manifest   |  2 --
 sys-fs/mergerfs/mergerfs-2.34.1.ebuild | 52 --
 sys-fs/mergerfs/mergerfs-2.35.0.ebuild | 52 --
 3 files changed, 106 deletions(-)

diff --git a/sys-fs/mergerfs/Manifest b/sys-fs/mergerfs/Manifest
index d30f98153aea..d85bbc488609 100644
--- a/sys-fs/mergerfs/Manifest
+++ b/sys-fs/mergerfs/Manifest
@@ -1,3 +1 @@
-DIST mergerfs-2.34.1.tar.gz 343252 BLAKE2B 
07fd53707cca0dcd7859b811a836eeeaea2a008eec808807cd02051b566bb0633a670858eb6b1e55bf4c7cf656146dfc7949e7feb8832b8ba8d6997b85de39ac
 SHA512 
a76433cfd2e654c71e9f6dcae88b6739f59d07024c2ab32573586401fb8508cae4774bd65046646bc19737f7b5d52d1a8c89f3f4b33e08360c80540b94980c93
-DIST mergerfs-2.35.0.tar.gz 668826 BLAKE2B 
21da9e90984082546886371877c31706c6a9f1297e55c5f5e35b7f7eb0e190a216c9cdc092917cc48530287268a11bf220d622d2e53bb89b04c044971f12c249
 SHA512 
c63ec871041a374350c62ba23016549984579b5dfef44a4415d78e6a2c6681d445bff26aad4b3b3bae7ef74ca9770743c90b0c61e979c993f5f65bae0c0c33c7
 DIST mergerfs-2.35.1.tar.gz 669100 BLAKE2B 
25b442f0451b525509bd908ac1cd2e70ab33db599aab58e2baeca47eeb3a0d0b93f7fddb880e8fdbf1b6928d40c650e0df23c116741cad279cdf169cea000768
 SHA512 
09de354ae7a7c69f6e873145a754c3ed8a840d59ccc455c8913f2562babbe8787c7eb929c0ea2571b5292928e3cee7b547b0a52cdd833b03e679e11191b4a5b5

diff --git a/sys-fs/mergerfs/mergerfs-2.34.1.ebuild 
b/sys-fs/mergerfs/mergerfs-2.34.1.ebuild
deleted file mode 100644
index a534d6068490..
--- a/sys-fs/mergerfs/mergerfs-2.34.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2023 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 ~riscv 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/mergerfs/mergerfs-2.35.0.ebuild 
b/sys-fs/mergerfs/mergerfs-2.35.0.ebuild
deleted file mode 100644
index a534d6068490..
--- a/sys-fs/mergerfs/mergerfs-2.35.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2023 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 ~riscv 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
-}



[gentoo-commits] repo/gentoo:master commit in: sys-fs/mergerfs/

2023-07-23 Thread Piotr Karbowski
commit: d038ced749dc93f5fd5ecbc425f2e69196d95217
Author: Piotr Karbowski  gentoo  org>
AuthorDate: Sun Jul 23 16:34:37 2023 +
Commit: Piotr Karbowski  gentoo  org>
CommitDate: Sun Jul 23 16:40:46 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d038ced7

sys-fs/mergerfs: 2.36.0 version bump.

Signed-off-by: Piotr Karbowski  gentoo.org>

 sys-fs/mergerfs/Manifest   |  1 +
 sys-fs/mergerfs/mergerfs-2.36.0.ebuild | 52 ++
 2 files changed, 53 insertions(+)

diff --git a/sys-fs/mergerfs/Manifest b/sys-fs/mergerfs/Manifest
index d85bbc488609..fd6aec328be2 100644
--- a/sys-fs/mergerfs/Manifest
+++ b/sys-fs/mergerfs/Manifest
@@ -1 +1,2 @@
 DIST mergerfs-2.35.1.tar.gz 669100 BLAKE2B 
25b442f0451b525509bd908ac1cd2e70ab33db599aab58e2baeca47eeb3a0d0b93f7fddb880e8fdbf1b6928d40c650e0df23c116741cad279cdf169cea000768
 SHA512 
09de354ae7a7c69f6e873145a754c3ed8a840d59ccc455c8913f2562babbe8787c7eb929c0ea2571b5292928e3cee7b547b0a52cdd833b03e679e11191b4a5b5
+DIST mergerfs-2.36.0.tar.gz 680473 BLAKE2B 
c0380834c7610724f058bd13b073622082ad8bdf4fe32815cf8a5450d1f962478a6ba3d0033d0ade446861786db6c8d3ae3dbacd6a61a526a79d849b6c7b40e7
 SHA512 
f20879aa5fb9ab56b1e7bba0e08aacda7e26af7e1fdcf3d57b77a2dce70fda8aa15c20e947dde6ffab3dfae8698005c9d8383c9ab2402cc4ce5de0810ce1298d

diff --git a/sys-fs/mergerfs/mergerfs-2.36.0.ebuild 
b/sys-fs/mergerfs/mergerfs-2.36.0.ebuild
new file mode 100644
index ..ad9d06e1fdee
--- /dev/null
+++ b/sys-fs/mergerfs/mergerfs-2.36.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2023 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 ~riscv ~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
+}



[gentoo-commits] repo/gentoo:master commit in: sys-fs/mergerfs/

2023-05-21 Thread Arthur Zamarin
commit: 89d043907d32fd2e6000114ff213fc04b5ba0cc6
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun May 21 13:49:37 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun May 21 13:49:37 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89d04390

sys-fs/mergerfs: Stabilize 2.35.1 x86, #906852

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-fs/mergerfs/mergerfs-2.35.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/mergerfs/mergerfs-2.35.1.ebuild 
b/sys-fs/mergerfs/mergerfs-2.35.1.ebuild
index 8a02ec5860ea..a534d6068490 100644
--- a/sys-fs/mergerfs/mergerfs-2.35.1.ebuild
+++ b/sys-fs/mergerfs/mergerfs-2.35.1.ebuild
@@ -9,7 +9,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 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 
 # Vendorized libfuse that's bundled is under LGPL-2.1.
 LICENSE="ISC LGPL-2.1"



[gentoo-commits] repo/gentoo:master commit in: sys-fs/mergerfs/

2023-05-20 Thread Sam James
commit: 680358e40299d1ff62961bae61dbdbd916ae6ff6
Author: Sam James  gentoo  org>
AuthorDate: Sun May 21 00:50:07 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun May 21 00:50:07 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=680358e4

sys-fs/mergerfs: Stabilize 2.35.1 amd64, #906852

Signed-off-by: Sam James  gentoo.org>

 sys-fs/mergerfs/mergerfs-2.35.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/mergerfs/mergerfs-2.35.1.ebuild 
b/sys-fs/mergerfs/mergerfs-2.35.1.ebuild
index ad9d06e1fdee..8a02ec5860ea 100644
--- a/sys-fs/mergerfs/mergerfs-2.35.1.ebuild
+++ b/sys-fs/mergerfs/mergerfs-2.35.1.ebuild
@@ -9,7 +9,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 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv ~x86"
 
 # Vendorized libfuse that's bundled is under LGPL-2.1.
 LICENSE="ISC LGPL-2.1"



[gentoo-commits] repo/gentoo:master commit in: sys-fs/mergerfs/

2023-05-02 Thread Arthur Zamarin
commit: 7d22c99dd3aab75ffa7c81bea6d3f0fa4990452b
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Tue May  2 15:20:28 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Tue May  2 15:20:28 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d22c99d

sys-fs/mergerfs: Stabilize 2.35.0 amd64, #905457

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-fs/mergerfs/mergerfs-2.35.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/mergerfs/mergerfs-2.35.0.ebuild 
b/sys-fs/mergerfs/mergerfs-2.35.0.ebuild
index ad9d06e1fdee..8a02ec5860ea 100644
--- a/sys-fs/mergerfs/mergerfs-2.35.0.ebuild
+++ b/sys-fs/mergerfs/mergerfs-2.35.0.ebuild
@@ -9,7 +9,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 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv ~x86"
 
 # Vendorized libfuse that's bundled is under LGPL-2.1.
 LICENSE="ISC LGPL-2.1"



[gentoo-commits] repo/gentoo:master commit in: sys-fs/mergerfs/

2023-05-02 Thread Arthur Zamarin
commit: ceec4a2a83764d050df71307f35ddd873a18a707
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Tue May  2 15:20:29 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Tue May  2 15:20:29 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ceec4a2a

sys-fs/mergerfs: Stabilize 2.35.0 x86, #905457

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-fs/mergerfs/mergerfs-2.35.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/mergerfs/mergerfs-2.35.0.ebuild 
b/sys-fs/mergerfs/mergerfs-2.35.0.ebuild
index 8a02ec5860ea..a534d6068490 100644
--- a/sys-fs/mergerfs/mergerfs-2.35.0.ebuild
+++ b/sys-fs/mergerfs/mergerfs-2.35.0.ebuild
@@ -9,7 +9,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 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 
 # Vendorized libfuse that's bundled is under LGPL-2.1.
 LICENSE="ISC LGPL-2.1"



[gentoo-commits] repo/gentoo:master commit in: sys-fs/mergerfs/

2023-04-18 Thread Piotr Karbowski
commit: 21182057e9c9d5472f5dada5f32f6bc5e1efe5f2
Author: Piotr Karbowski  gentoo  org>
AuthorDate: Tue Apr 18 21:17:40 2023 +
Commit: Piotr Karbowski  gentoo  org>
CommitDate: Tue Apr 18 21:24:22 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21182057

sys-fs/mergerfs: 2.35.1 version bump

Signed-off-by: Piotr Karbowski  gentoo.org>

 sys-fs/mergerfs/Manifest   |  1 +
 sys-fs/mergerfs/mergerfs-2.35.1.ebuild | 52 ++
 2 files changed, 53 insertions(+)

diff --git a/sys-fs/mergerfs/Manifest b/sys-fs/mergerfs/Manifest
index 19f3872ced80..d30f98153aea 100644
--- a/sys-fs/mergerfs/Manifest
+++ b/sys-fs/mergerfs/Manifest
@@ -1,2 +1,3 @@
 DIST mergerfs-2.34.1.tar.gz 343252 BLAKE2B 
07fd53707cca0dcd7859b811a836eeeaea2a008eec808807cd02051b566bb0633a670858eb6b1e55bf4c7cf656146dfc7949e7feb8832b8ba8d6997b85de39ac
 SHA512 
a76433cfd2e654c71e9f6dcae88b6739f59d07024c2ab32573586401fb8508cae4774bd65046646bc19737f7b5d52d1a8c89f3f4b33e08360c80540b94980c93
 DIST mergerfs-2.35.0.tar.gz 668826 BLAKE2B 
21da9e90984082546886371877c31706c6a9f1297e55c5f5e35b7f7eb0e190a216c9cdc092917cc48530287268a11bf220d622d2e53bb89b04c044971f12c249
 SHA512 
c63ec871041a374350c62ba23016549984579b5dfef44a4415d78e6a2c6681d445bff26aad4b3b3bae7ef74ca9770743c90b0c61e979c993f5f65bae0c0c33c7
+DIST mergerfs-2.35.1.tar.gz 669100 BLAKE2B 
25b442f0451b525509bd908ac1cd2e70ab33db599aab58e2baeca47eeb3a0d0b93f7fddb880e8fdbf1b6928d40c650e0df23c116741cad279cdf169cea000768
 SHA512 
09de354ae7a7c69f6e873145a754c3ed8a840d59ccc455c8913f2562babbe8787c7eb929c0ea2571b5292928e3cee7b547b0a52cdd833b03e679e11191b4a5b5

diff --git a/sys-fs/mergerfs/mergerfs-2.35.1.ebuild 
b/sys-fs/mergerfs/mergerfs-2.35.1.ebuild
new file mode 100644
index ..ad9d06e1fdee
--- /dev/null
+++ b/sys-fs/mergerfs/mergerfs-2.35.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2023 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 ~riscv ~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
+}



[gentoo-commits] repo/gentoo:master commit in: sys-fs/mergerfs/

2023-03-29 Thread Piotr Karbowski
commit: 02a51d114256b8ae5353967c88058046882595e8
Author: Piotr Karbowski  gentoo  org>
AuthorDate: Wed Mar 29 20:50:06 2023 +
Commit: Piotr Karbowski  gentoo  org>
CommitDate: Wed Mar 29 20:50:58 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02a51d11

sys-fs/mergerfs: 2.35.0 version bump; drop old.

Signed-off-by: Piotr Karbowski  gentoo.org>

 sys-fs/mergerfs/Manifest   | 2 +-
 sys-fs/mergerfs/{mergerfs-2.33.5.ebuild => mergerfs-2.35.0.ebuild} | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sys-fs/mergerfs/Manifest b/sys-fs/mergerfs/Manifest
index 769d2f87bc96..19f3872ced80 100644
--- a/sys-fs/mergerfs/Manifest
+++ b/sys-fs/mergerfs/Manifest
@@ -1,2 +1,2 @@
-DIST mergerfs-2.33.5.tar.gz 382895 BLAKE2B 
e45d6d5890046cce495f788924323052effe63ea570061ed1d031595f166c0e680fdbbcf01dd992263550d6c33a04d91a6fabd5c9f97381c5c3e6858c3e1c122
 SHA512 
9032142285d85e22d2a880a42ae379209d44d12d71adec6388afd43a9fb77675149ec8558bdb1f01de1b511b3d0bf910dd2ccb6f47c918df377d4d5e41368408
 DIST mergerfs-2.34.1.tar.gz 343252 BLAKE2B 
07fd53707cca0dcd7859b811a836eeeaea2a008eec808807cd02051b566bb0633a670858eb6b1e55bf4c7cf656146dfc7949e7feb8832b8ba8d6997b85de39ac
 SHA512 
a76433cfd2e654c71e9f6dcae88b6739f59d07024c2ab32573586401fb8508cae4774bd65046646bc19737f7b5d52d1a8c89f3f4b33e08360c80540b94980c93
+DIST mergerfs-2.35.0.tar.gz 668826 BLAKE2B 
21da9e90984082546886371877c31706c6a9f1297e55c5f5e35b7f7eb0e190a216c9cdc092917cc48530287268a11bf220d622d2e53bb89b04c044971f12c249
 SHA512 
c63ec871041a374350c62ba23016549984579b5dfef44a4415d78e6a2c6681d445bff26aad4b3b3bae7ef74ca9770743c90b0c61e979c993f5f65bae0c0c33c7

diff --git a/sys-fs/mergerfs/mergerfs-2.33.5.ebuild 
b/sys-fs/mergerfs/mergerfs-2.35.0.ebuild
similarity index 93%
rename from sys-fs/mergerfs/mergerfs-2.33.5.ebuild
rename to sys-fs/mergerfs/mergerfs-2.35.0.ebuild
index 13a77be7c20a..ad9d06e1fdee 100644
--- a/sys-fs/mergerfs/mergerfs-2.33.5.ebuild
+++ b/sys-fs/mergerfs/mergerfs-2.35.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,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 ~riscv x86"
+KEYWORDS="~amd64 ~riscv ~x86"
 
 # Vendorized libfuse that's bundled is under LGPL-2.1.
 LICENSE="ISC LGPL-2.1"



[gentoo-commits] repo/gentoo:master commit in: sys-fs/mergerfs/

2023-03-06 Thread Arthur Zamarin
commit: 78b3622a6e5c429ae3a44b257e1989cc02304aa5
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Mon Mar  6 13:03:39 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Mon Mar  6 13:03:39 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78b3622a

sys-fs/mergerfs: Stabilize 2.34.1 x86, #899678

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-fs/mergerfs/mergerfs-2.34.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/mergerfs/mergerfs-2.34.1.ebuild 
b/sys-fs/mergerfs/mergerfs-2.34.1.ebuild
index 8a02ec5860ea..a534d6068490 100644
--- a/sys-fs/mergerfs/mergerfs-2.34.1.ebuild
+++ b/sys-fs/mergerfs/mergerfs-2.34.1.ebuild
@@ -9,7 +9,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 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 
 # Vendorized libfuse that's bundled is under LGPL-2.1.
 LICENSE="ISC LGPL-2.1"



[gentoo-commits] repo/gentoo:master commit in: sys-fs/mergerfs/

2023-03-06 Thread Arthur Zamarin
commit: 73d303e5dc44c193ef73324cd04f70e259f6afcc
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Mon Mar  6 12:51:03 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Mon Mar  6 12:51:03 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73d303e5

sys-fs/mergerfs: Stabilize 2.34.1 amd64, #899678

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-fs/mergerfs/mergerfs-2.34.1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-fs/mergerfs/mergerfs-2.34.1.ebuild 
b/sys-fs/mergerfs/mergerfs-2.34.1.ebuild
index 768881f29bc8..8a02ec5860ea 100644
--- a/sys-fs/mergerfs/mergerfs-2.34.1.ebuild
+++ b/sys-fs/mergerfs/mergerfs-2.34.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,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 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv ~x86"
 
 # Vendorized libfuse that's bundled is under LGPL-2.1.
 LICENSE="ISC LGPL-2.1"



[gentoo-commits] repo/gentoo:master commit in: sys-fs/mergerfs-tools/

2023-02-26 Thread Piotr Karbowski
commit: 6a45c87a05a1ed8ed5c78af593565c0d60f24ab8
Author: Piotr Karbowski  gentoo  org>
AuthorDate: Sun Feb 26 21:29:07 2023 +
Commit: Piotr Karbowski  gentoo  org>
CommitDate: Sun Feb 26 21:30:03 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a45c87a

sys-fs/mergerfs-tools: py3.11 support; github tarballs.

Closes: https://bugs.gentoo.org/897306
Signed-off-by: Piotr Karbowski  gentoo.org>

 sys-fs/mergerfs-tools/Manifest | 2 +-
 ...-0_p20210502-r3.ebuild => mergerfs-tools-0_p20210502-r4.ebuild} | 7 +--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/sys-fs/mergerfs-tools/Manifest b/sys-fs/mergerfs-tools/Manifest
index b96ee5a6e6f2..55f1350cb41b 100644
--- a/sys-fs/mergerfs-tools/Manifest
+++ b/sys-fs/mergerfs-tools/Manifest
@@ -1 +1 @@
-DIST mergerfs-tools-0_p20210502.tar.xz 12876 BLAKE2B 
760ae2ebb9017e3bb5508d008bc5726cca4ba1930a7f8ebf752e34ed94d92502c146fe2ab25d88c41d27e3ef94b75497b21e0c62c9e86b0e3872916116c4d67d
 SHA512 
8a3c3e92ecdd1c57b8331a0bebfee11908f1d2361fb35cd906173d2d3fd0ce4195eabfb63aa1edac3c36be254504c25edf87caa0608900f6970551991f7a4a50
+DIST mergerfs-tools-0_p20210502.gh.tar.gz 15575 BLAKE2B 
0b111c8a37c7679cb5a331d942f11ad8315eb58d0e686a53ddf6ce9262fb04cde69654d6d8c597d94fba48914b5b7fc4fc35d0b6413bd817e587e1d8e70ad1b6
 SHA512 
8f0fefe65b277d01aa893bd8af3dad5618b403126817982740a59c7997af33480ee858158b430775d63f0aa5ade854a71d88ab99ee0d7eac8cc4cb95933204f2

diff --git a/sys-fs/mergerfs-tools/mergerfs-tools-0_p20210502-r3.ebuild 
b/sys-fs/mergerfs-tools/mergerfs-tools-0_p20210502-r4.ebuild
similarity index 70%
rename from sys-fs/mergerfs-tools/mergerfs-tools-0_p20210502-r3.ebuild
rename to sys-fs/mergerfs-tools/mergerfs-tools-0_p20210502-r4.ebuild
index 958ac8f0f7e8..023b7d11f5f5 100644
--- a/sys-fs/mergerfs-tools/mergerfs-tools-0_p20210502-r3.ebuild
+++ b/sys-fs/mergerfs-tools/mergerfs-tools-0_p20210502-r4.ebuild
@@ -3,13 +3,14 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
+MY_COMMIT="ff4ef0355f699eb11f0d75471d3df44c303830a3"
 
 inherit python-single-r1
 
 DESCRIPTION="Optional tools to help manage data in a mergerfs pool"
 HOMEPAGE="https://github.com/trapexit/mergerfs-tools;
-SRC_URI="https://dev.gentoo.org/~slashbeast/distfiles/${PN}/${P}.tar.xz;
+SRC_URI="https://github.com/trapexit/${PN}/archive/${MY_COMMIT}.tar.gz -> 
${P}.gh.tar.gz"
 
 LICENSE="ISC"
 SLOT="0"
@@ -20,6 +21,8 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 DEPEND="${PYTHON_DEPS}"
 RDEPEND="${DEPEND}"
 
+S="${WORKDIR}/${PN}-${MY_COMMIT}"
+
 src_compile() {
# no build system.
true



[gentoo-commits] repo/gentoo:master commit in: sys-fs/mergerfs/

2023-01-30 Thread Piotr Karbowski
commit: e3924bede6db0a09beee7876d3aa243c5ca29498
Author: Piotr Karbowski  gentoo  org>
AuthorDate: Mon Jan 30 21:35:59 2023 +
Commit: Piotr Karbowski  gentoo  org>
CommitDate: Mon Jan 30 21:53:02 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3924bed

sys-fs/mergerfs: drop old.

Signed-off-by: Piotr Karbowski  gentoo.org>

 sys-fs/mergerfs/Manifest   |  4 ---
 sys-fs/mergerfs/mergerfs-2.32.3.ebuild | 52 --
 sys-fs/mergerfs/mergerfs-2.33.1.ebuild | 52 --
 sys-fs/mergerfs/mergerfs-2.33.3.ebuild | 52 --
 sys-fs/mergerfs/mergerfs-2.33.4.ebuild | 52 --
 5 files changed, 212 deletions(-)

diff --git a/sys-fs/mergerfs/Manifest b/sys-fs/mergerfs/Manifest
index d481dba680f5..769d2f87bc96 100644
--- a/sys-fs/mergerfs/Manifest
+++ b/sys-fs/mergerfs/Manifest
@@ -1,6 +1,2 @@
-DIST mergerfs-2.32.3.tar.gz 314280 BLAKE2B 
f7c5ab92f1241627bd91255b35bdd81782f153f9144242a52241f9e812e4096c23d73401251a8ace43781f39a4644814dc724a8a31066f77cfd78ad6c27d54dd
 SHA512 
f3f8f320f98ef2a345a0229eca661c6c8c75fdd23613ae0d45f13062b18f6f052474a009c77a6602df77762100f45b3eb76692812e81d12555763ead5c83b87d
-DIST mergerfs-2.33.1.tar.gz 382421 BLAKE2B 
0985a0ad53a12fe5283fd0e953cd74a835efd3e83f65ba4e96bc42814ce151d03f95c032eeebcc9821c7c15ae59d14b9e40055438b4482a337c5b7bc9503d27e
 SHA512 
1178fbd4ad99c6c693e2c21551c7522107701b0d5c608a7c18be29825cf97f2a2b2d6a50094e800a749a3902c374f8b57e84a76c0640aa8e387aa095d300
-DIST mergerfs-2.33.3.tar.gz 382386 BLAKE2B 
49a2b75a2a39fbec178460f94696a918a0f872a7c904355c84180f8be07d9abdf68e342e7acca5093a621b85110d0a0fdb5650de68e04aa176250199eaa5bdb7
 SHA512 
aca5884a9d5dc03d7095e73461dee843d69463db72dfc033f76611d5417dab63ff29eb2b473f39f0390299c3aa882e6197a7038e82b58ab85799d39cc44b84d0
-DIST mergerfs-2.33.4.tar.gz 382872 BLAKE2B 
fe369f377f731a6323566cf4d5076e9ba7dca302aae1125635433ab93927d3aad5ca57a95e0791742cdf80c7fa69cacdd16a6519593bad9e933e529974bd5d2a
 SHA512 
e8bd0a502c045d6f93d34bce833108deaf1071a3e5c56eb61a59416067230d6e8f19f9b0f8c8aa9fe84060a886afae7509231c97fc6d9537d3ad3390ce342239
 DIST mergerfs-2.33.5.tar.gz 382895 BLAKE2B 
e45d6d5890046cce495f788924323052effe63ea570061ed1d031595f166c0e680fdbbcf01dd992263550d6c33a04d91a6fabd5c9f97381c5c3e6858c3e1c122
 SHA512 
9032142285d85e22d2a880a42ae379209d44d12d71adec6388afd43a9fb77675149ec8558bdb1f01de1b511b3d0bf910dd2ccb6f47c918df377d4d5e41368408
 DIST mergerfs-2.34.1.tar.gz 343252 BLAKE2B 
07fd53707cca0dcd7859b811a836eeeaea2a008eec808807cd02051b566bb0633a670858eb6b1e55bf4c7cf656146dfc7949e7feb8832b8ba8d6997b85de39ac
 SHA512 
a76433cfd2e654c71e9f6dcae88b6739f59d07024c2ab32573586401fb8508cae4774bd65046646bc19737f7b5d52d1a8c89f3f4b33e08360c80540b94980c93

diff --git a/sys-fs/mergerfs/mergerfs-2.32.3.ebuild 
b/sys-fs/mergerfs/mergerfs-2.32.3.ebuild
deleted file mode 100644
index 1a8305d70486..
--- a/sys-fs/mergerfs/mergerfs-2.32.3.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# 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
-
-   default
-}
-
-src_install() {
-   dobin build/mergerfs
-   dosym mergerfs /usr/bin/mount.mergerfs
-   dodoc README.md
-   doman man/mergerfs.1
-}

diff --git a/sys-fs/mergerfs/mergerfs-2.33.1.ebuild 
b/sys-fs/mergerfs/mergerfs-2.33.1.ebuild
deleted file mode 100644
index a21ae969d856..
--- a/sys-fs/mergerfs/mergerfs-2.33.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2022 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? ( 

[gentoo-commits] repo/gentoo:master commit in: sys-fs/mergerfs/

2023-01-30 Thread Piotr Karbowski
commit: ee4e67f8c363a01831c6500396c4542aeda14f59
Author: Piotr Karbowski  gentoo  org>
AuthorDate: Mon Jan 30 21:31:16 2023 +
Commit: Piotr Karbowski  gentoo  org>
CommitDate: Mon Jan 30 21:53:02 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee4e67f8

sys-fs/mergerfs: 2.34.1 version bump

Signed-off-by: Piotr Karbowski  gentoo.org>

 sys-fs/mergerfs/Manifest   |  1 +
 sys-fs/mergerfs/mergerfs-2.34.1.ebuild | 52 ++
 2 files changed, 53 insertions(+)

diff --git a/sys-fs/mergerfs/Manifest b/sys-fs/mergerfs/Manifest
index 77cab80d7477..d481dba680f5 100644
--- a/sys-fs/mergerfs/Manifest
+++ b/sys-fs/mergerfs/Manifest
@@ -3,3 +3,4 @@ DIST mergerfs-2.33.1.tar.gz 382421 BLAKE2B 
0985a0ad53a12fe5283fd0e953cd74a835efd
 DIST mergerfs-2.33.3.tar.gz 382386 BLAKE2B 
49a2b75a2a39fbec178460f94696a918a0f872a7c904355c84180f8be07d9abdf68e342e7acca5093a621b85110d0a0fdb5650de68e04aa176250199eaa5bdb7
 SHA512 
aca5884a9d5dc03d7095e73461dee843d69463db72dfc033f76611d5417dab63ff29eb2b473f39f0390299c3aa882e6197a7038e82b58ab85799d39cc44b84d0
 DIST mergerfs-2.33.4.tar.gz 382872 BLAKE2B 
fe369f377f731a6323566cf4d5076e9ba7dca302aae1125635433ab93927d3aad5ca57a95e0791742cdf80c7fa69cacdd16a6519593bad9e933e529974bd5d2a
 SHA512 
e8bd0a502c045d6f93d34bce833108deaf1071a3e5c56eb61a59416067230d6e8f19f9b0f8c8aa9fe84060a886afae7509231c97fc6d9537d3ad3390ce342239
 DIST mergerfs-2.33.5.tar.gz 382895 BLAKE2B 
e45d6d5890046cce495f788924323052effe63ea570061ed1d031595f166c0e680fdbbcf01dd992263550d6c33a04d91a6fabd5c9f97381c5c3e6858c3e1c122
 SHA512 
9032142285d85e22d2a880a42ae379209d44d12d71adec6388afd43a9fb77675149ec8558bdb1f01de1b511b3d0bf910dd2ccb6f47c918df377d4d5e41368408
+DIST mergerfs-2.34.1.tar.gz 343252 BLAKE2B 
07fd53707cca0dcd7859b811a836eeeaea2a008eec808807cd02051b566bb0633a670858eb6b1e55bf4c7cf656146dfc7949e7feb8832b8ba8d6997b85de39ac
 SHA512 
a76433cfd2e654c71e9f6dcae88b6739f59d07024c2ab32573586401fb8508cae4774bd65046646bc19737f7b5d52d1a8c89f3f4b33e08360c80540b94980c93

diff --git a/sys-fs/mergerfs/mergerfs-2.34.1.ebuild 
b/sys-fs/mergerfs/mergerfs-2.34.1.ebuild
new file mode 100644
index ..768881f29bc8
--- /dev/null
+++ b/sys-fs/mergerfs/mergerfs-2.34.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2022 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 ~riscv ~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
+}



[gentoo-commits] repo/gentoo:master commit in: sys-fs/mergerfs/

2022-12-09 Thread Sam James
commit: 43c5a84126802c835cf4ad62988ba2e5ccefc60d
Author: Sam James  gentoo  org>
AuthorDate: Fri Dec  9 22:31:55 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Dec  9 22:31:55 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43c5a841

sys-fs/mergerfs: Stabilize 2.33.5 amd64, #885085

Signed-off-by: Sam James  gentoo.org>

 sys-fs/mergerfs/mergerfs-2.33.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/mergerfs/mergerfs-2.33.5.ebuild 
b/sys-fs/mergerfs/mergerfs-2.33.5.ebuild
index 67a73086460e..13a77be7c20a 100644
--- a/sys-fs/mergerfs/mergerfs-2.33.5.ebuild
+++ b/sys-fs/mergerfs/mergerfs-2.33.5.ebuild
@@ -9,7 +9,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 ~riscv x86"
+KEYWORDS="amd64 ~riscv x86"
 
 # Vendorized libfuse that's bundled is under LGPL-2.1.
 LICENSE="ISC LGPL-2.1"



[gentoo-commits] repo/gentoo:master commit in: sys-fs/mergerfs/

2022-12-09 Thread Arthur Zamarin
commit: d2c032f2cea19442d0894c583ff0aacf9869b646
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Dec  9 21:55:35 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Dec  9 21:55:35 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2c032f2

sys-fs/mergerfs: Stabilize 2.33.5 x86, #885085

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-fs/mergerfs/mergerfs-2.33.5.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-fs/mergerfs/mergerfs-2.33.5.ebuild 
b/sys-fs/mergerfs/mergerfs-2.33.5.ebuild
index a28d183c7a39..67a73086460e 100644
--- a/sys-fs/mergerfs/mergerfs-2.33.5.ebuild
+++ b/sys-fs/mergerfs/mergerfs-2.33.5.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
@@ -9,7 +9,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 ~riscv ~x86"
+KEYWORDS="~amd64 ~riscv x86"
 
 # Vendorized libfuse that's bundled is under LGPL-2.1.
 LICENSE="ISC LGPL-2.1"



[gentoo-commits] repo/gentoo:master commit in: sys-fs/mergerfs/

2022-10-13 Thread Piotr Karbowski
commit: 5d703326112ec136beb018a74533d3c16bb65051
Author: Xin Yang  icloud  com>
AuthorDate: Thu Oct 13 14:51:30 2022 +
Commit: Piotr Karbowski  gentoo  org>
CommitDate: Thu Oct 13 21:45:13 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d703326

sys-fs/mergerfs: keyword mergerfs-2.33.5 riscv, #876995

Signed-off-by: Xin Yang  icloud.com>
Signed-off-by: Piotr Karbowski  gentoo.org>

 sys-fs/mergerfs/mergerfs-2.33.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/mergerfs/mergerfs-2.33.5.ebuild 
b/sys-fs/mergerfs/mergerfs-2.33.5.ebuild
index fb2d3b62a41b..a28d183c7a39 100644
--- a/sys-fs/mergerfs/mergerfs-2.33.5.ebuild
+++ b/sys-fs/mergerfs/mergerfs-2.33.5.ebuild
@@ -9,7 +9,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 ~riscv ~x86"
 
 # Vendorized libfuse that's bundled is under LGPL-2.1.
 LICENSE="ISC LGPL-2.1"



[gentoo-commits] repo/gentoo:master commit in: sys-fs/mergerfs-tools/

2022-10-13 Thread Piotr Karbowski
commit: 8fe0db8d9249a87d2ec6a91e2aa215c58edbec05
Author: Xin Yang  icloud  com>
AuthorDate: Thu Oct 13 14:52:54 2022 +
Commit: Piotr Karbowski  gentoo  org>
CommitDate: Thu Oct 13 21:45:13 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8fe0db8d

sys-fs/mergerfs-tools: keyword mergerfs-tools-0_p20210502-r3 riscv, #876995

Signed-off-by: Xin Yang  icloud.com>
Closes: https://github.com/gentoo/gentoo/pull/27770
Signed-off-by: Piotr Karbowski  gentoo.org>

 sys-fs/mergerfs-tools/mergerfs-tools-0_p20210502-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/mergerfs-tools/mergerfs-tools-0_p20210502-r3.ebuild 
b/sys-fs/mergerfs-tools/mergerfs-tools-0_p20210502-r3.ebuild
index 2827a367ac7d..d8b0f64dc16f 100644
--- a/sys-fs/mergerfs-tools/mergerfs-tools-0_p20210502-r3.ebuild
+++ b/sys-fs/mergerfs-tools/mergerfs-tools-0_p20210502-r3.ebuild
@@ -14,7 +14,7 @@ 
SRC_URI="https://dev.gentoo.org/~slashbeast/distfiles/${PN}/${P}.tar.xz;
 LICENSE="ISC"
 SLOT="0"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~riscv ~x86"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 DEPEND="${PYTHON_DEPS}"



[gentoo-commits] repo/gentoo:master commit in: sys-fs/mergerfs/

2022-06-24 Thread Agostino Sarubbo
commit: e65a3df82e066481973a2cffdf78efa5bc5cf728
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Jun 24 07:11:15 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Jun 24 07:11:15 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e65a3df8

sys-fs/mergerfs: x86 stable wrt bug #853943

Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 sys-fs/mergerfs/mergerfs-2.33.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/mergerfs/mergerfs-2.33.4.ebuild 
b/sys-fs/mergerfs/mergerfs-2.33.4.ebuild
index 8e892d61d0bc..a21ae969d856 100644
--- a/sys-fs/mergerfs/mergerfs-2.33.4.ebuild
+++ b/sys-fs/mergerfs/mergerfs-2.33.4.ebuild
@@ -9,7 +9,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"



[gentoo-commits] repo/gentoo:master commit in: sys-fs/mergerfs/

2022-06-24 Thread Agostino Sarubbo
commit: 5ae13ec896d134074213b263b1e9ffe6f939f624
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Jun 24 07:07:02 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Jun 24 07:07:02 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ae13ec8

sys-fs/mergerfs: amd64 stable wrt bug #853943

Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 sys-fs/mergerfs/mergerfs-2.33.4.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-fs/mergerfs/mergerfs-2.33.4.ebuild 
b/sys-fs/mergerfs/mergerfs-2.33.4.ebuild
index fb2d3b62a41b..8e892d61d0bc 100644
--- a/sys-fs/mergerfs/mergerfs-2.33.4.ebuild
+++ b/sys-fs/mergerfs/mergerfs-2.33.4.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
@@ -9,7 +9,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"



[gentoo-commits] repo/gentoo:master commit in: sys-fs/mergerfs/

2022-06-23 Thread Piotr Karbowski
commit: d26cfa60a7e1ac552013d890db9d2799339501f0
Author: Piotr Karbowski  gentoo  org>
AuthorDate: Thu Jun 23 20:50:38 2022 +
Commit: Piotr Karbowski  gentoo  org>
CommitDate: Thu Jun 23 20:50:38 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d26cfa60

sys-fs/mergerfs: 2.33.5 version bump

Signed-off-by: Piotr Karbowski  gentoo.org>

 sys-fs/mergerfs/Manifest   |  1 +
 sys-fs/mergerfs/mergerfs-2.33.5.ebuild | 52 ++
 2 files changed, 53 insertions(+)

diff --git a/sys-fs/mergerfs/Manifest b/sys-fs/mergerfs/Manifest
index cdff0268f586..77cab80d7477 100644
--- a/sys-fs/mergerfs/Manifest
+++ b/sys-fs/mergerfs/Manifest
@@ -2,3 +2,4 @@ DIST mergerfs-2.32.3.tar.gz 314280 BLAKE2B 
f7c5ab92f1241627bd91255b35bdd81782f15
 DIST mergerfs-2.33.1.tar.gz 382421 BLAKE2B 
0985a0ad53a12fe5283fd0e953cd74a835efd3e83f65ba4e96bc42814ce151d03f95c032eeebcc9821c7c15ae59d14b9e40055438b4482a337c5b7bc9503d27e
 SHA512 
1178fbd4ad99c6c693e2c21551c7522107701b0d5c608a7c18be29825cf97f2a2b2d6a50094e800a749a3902c374f8b57e84a76c0640aa8e387aa095d300
 DIST mergerfs-2.33.3.tar.gz 382386 BLAKE2B 
49a2b75a2a39fbec178460f94696a918a0f872a7c904355c84180f8be07d9abdf68e342e7acca5093a621b85110d0a0fdb5650de68e04aa176250199eaa5bdb7
 SHA512 
aca5884a9d5dc03d7095e73461dee843d69463db72dfc033f76611d5417dab63ff29eb2b473f39f0390299c3aa882e6197a7038e82b58ab85799d39cc44b84d0
 DIST mergerfs-2.33.4.tar.gz 382872 BLAKE2B 
fe369f377f731a6323566cf4d5076e9ba7dca302aae1125635433ab93927d3aad5ca57a95e0791742cdf80c7fa69cacdd16a6519593bad9e933e529974bd5d2a
 SHA512 
e8bd0a502c045d6f93d34bce833108deaf1071a3e5c56eb61a59416067230d6e8f19f9b0f8c8aa9fe84060a886afae7509231c97fc6d9537d3ad3390ce342239
+DIST mergerfs-2.33.5.tar.gz 382895 BLAKE2B 
e45d6d5890046cce495f788924323052effe63ea570061ed1d031595f166c0e680fdbbcf01dd992263550d6c33a04d91a6fabd5c9f97381c5c3e6858c3e1c122
 SHA512 
9032142285d85e22d2a880a42ae379209d44d12d71adec6388afd43a9fb77675149ec8558bdb1f01de1b511b3d0bf910dd2ccb6f47c918df377d4d5e41368408

diff --git a/sys-fs/mergerfs/mergerfs-2.33.5.ebuild 
b/sys-fs/mergerfs/mergerfs-2.33.5.ebuild
new file mode 100644
index ..fb2d3b62a41b
--- /dev/null
+++ b/sys-fs/mergerfs/mergerfs-2.33.5.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
+}



[gentoo-commits] repo/gentoo:master commit in: sys-fs/mergerfs-tools/

2022-06-01 Thread Sam James
commit: 49016cdf404ed95d3f5c9ddecc3667b9a178408b
Author: Sam James  gentoo  org>
AuthorDate: Thu Jun  2 01:59:38 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun  2 01:59:38 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49016cdf

sys-fs/mergerfs-tools: fix PythonMissingRequiredUse

Closes: https://bugs.gentoo.org/836021
Signed-off-by: Sam James  gentoo.org>

 sys-fs/mergerfs-tools/mergerfs-tools-0_p20210502-r3.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sys-fs/mergerfs-tools/mergerfs-tools-0_p20210502-r3.ebuild 
b/sys-fs/mergerfs-tools/mergerfs-tools-0_p20210502-r3.ebuild
index b7a3da26a2f9..2827a367ac7d 100644
--- a/sys-fs/mergerfs-tools/mergerfs-tools-0_p20210502-r3.ebuild
+++ b/sys-fs/mergerfs-tools/mergerfs-tools-0_p20210502-r3.ebuild
@@ -16,6 +16,7 @@ SLOT="0"
 
 KEYWORDS="~amd64 ~x86"
 
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 DEPEND="${PYTHON_DEPS}"
 RDEPEND="${DEPEND}"
 



[gentoo-commits] repo/gentoo:master commit in: sys-fs/mergerfs/

2022-03-27 Thread Piotr Karbowski
commit: 782805df8a47012a233c84f00140e3f342741c53
Author: Piotr Karbowski  gentoo  org>
AuthorDate: Sun Mar 27 23:18:10 2022 +
Commit: Piotr Karbowski  gentoo  org>
CommitDate: Sun Mar 27 23:18:10 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=782805df

sys-fs/mergerfs: 2.33.4 version bump.

Signed-off-by: Piotr Karbowski  gentoo.org>

 sys-fs/mergerfs/Manifest   |  1 +
 sys-fs/mergerfs/mergerfs-2.33.4.ebuild | 52 ++
 2 files changed, 53 insertions(+)

diff --git a/sys-fs/mergerfs/Manifest b/sys-fs/mergerfs/Manifest
index 7ffaefe742b6..cdff0268f586 100644
--- a/sys-fs/mergerfs/Manifest
+++ b/sys-fs/mergerfs/Manifest
@@ -1,3 +1,4 @@
 DIST mergerfs-2.32.3.tar.gz 314280 BLAKE2B 
f7c5ab92f1241627bd91255b35bdd81782f153f9144242a52241f9e812e4096c23d73401251a8ace43781f39a4644814dc724a8a31066f77cfd78ad6c27d54dd
 SHA512 
f3f8f320f98ef2a345a0229eca661c6c8c75fdd23613ae0d45f13062b18f6f052474a009c77a6602df77762100f45b3eb76692812e81d12555763ead5c83b87d
 DIST mergerfs-2.33.1.tar.gz 382421 BLAKE2B 
0985a0ad53a12fe5283fd0e953cd74a835efd3e83f65ba4e96bc42814ce151d03f95c032eeebcc9821c7c15ae59d14b9e40055438b4482a337c5b7bc9503d27e
 SHA512 
1178fbd4ad99c6c693e2c21551c7522107701b0d5c608a7c18be29825cf97f2a2b2d6a50094e800a749a3902c374f8b57e84a76c0640aa8e387aa095d300
 DIST mergerfs-2.33.3.tar.gz 382386 BLAKE2B 
49a2b75a2a39fbec178460f94696a918a0f872a7c904355c84180f8be07d9abdf68e342e7acca5093a621b85110d0a0fdb5650de68e04aa176250199eaa5bdb7
 SHA512 
aca5884a9d5dc03d7095e73461dee843d69463db72dfc033f76611d5417dab63ff29eb2b473f39f0390299c3aa882e6197a7038e82b58ab85799d39cc44b84d0
+DIST mergerfs-2.33.4.tar.gz 382872 BLAKE2B 
fe369f377f731a6323566cf4d5076e9ba7dca302aae1125635433ab93927d3aad5ca57a95e0791742cdf80c7fa69cacdd16a6519593bad9e933e529974bd5d2a
 SHA512 
e8bd0a502c045d6f93d34bce833108deaf1071a3e5c56eb61a59416067230d6e8f19f9b0f8c8aa9fe84060a886afae7509231c97fc6d9537d3ad3390ce342239

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 ..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
+}



[gentoo-commits] repo/gentoo:master commit in: sys-fs/mergerfs-tools/

2022-03-05 Thread Piotr Karbowski
commit: 8fc7343f625d5ef375ce7fe8f2a874994297f676
Author: Piotr Karbowski  gentoo  org>
AuthorDate: Sat Mar  5 16:37:54 2022 +
Commit: Piotr Karbowski  gentoo  org>
CommitDate: Sat Mar  5 16:37:54 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8fc7343f

sys-fs/mergerfs-tools: switch to python-single-r1.

Closes: https://bugs.gentoo.org/830387
Signed-off-by: Piotr Karbowski  gentoo.org>

 ...tools-0_p20210502-r2.ebuild => mergerfs-tools-0_p20210502-r3.ebuild} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/mergerfs-tools/mergerfs-tools-0_p20210502-r2.ebuild 
b/sys-fs/mergerfs-tools/mergerfs-tools-0_p20210502-r3.ebuild
similarity index 95%
rename from sys-fs/mergerfs-tools/mergerfs-tools-0_p20210502-r2.ebuild
rename to sys-fs/mergerfs-tools/mergerfs-tools-0_p20210502-r3.ebuild
index 6b237738979a..b7a3da26a2f9 100644
--- a/sys-fs/mergerfs-tools/mergerfs-tools-0_p20210502-r2.ebuild
+++ b/sys-fs/mergerfs-tools/mergerfs-tools-0_p20210502-r3.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
 
-inherit python-any-r1
+inherit python-single-r1
 
 DESCRIPTION="Optional tools to help manage data in a mergerfs pool"
 HOMEPAGE="https://github.com/trapexit/mergerfs-tools;



[gentoo-commits] repo/gentoo:master commit in: sys-fs/mergerfs/

2022-01-21 Thread Jakov Smolić
commit: ed06a52e6388d73daec523753254d02fb9d7aec3
Author: Jakov Smolić  gentoo  org>
AuthorDate: Fri Jan 21 10:03:40 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Fri Jan 21 10:03:40 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed06a52e

sys-fs/mergerfs: Stabilize 2.33.1 x86, #831649

Signed-off-by: Jakov Smolić  gentoo.org>

 sys-fs/mergerfs/mergerfs-2.33.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/mergerfs/mergerfs-2.33.1.ebuild 
b/sys-fs/mergerfs/mergerfs-2.33.1.ebuild
index 8e892d61d0bc..a21ae969d856 100644
--- a/sys-fs/mergerfs/mergerfs-2.33.1.ebuild
+++ b/sys-fs/mergerfs/mergerfs-2.33.1.ebuild
@@ -9,7 +9,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"



[gentoo-commits] repo/gentoo:master commit in: sys-fs/mergerfs/

2022-01-21 Thread Jakov Smolić
commit: 35c0c37d94637671cda744d5942141aa08513752
Author: Jakov Smolić  gentoo  org>
AuthorDate: Fri Jan 21 10:03:19 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Fri Jan 21 10:03:19 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35c0c37d

sys-fs/mergerfs: Stabilize 2.33.1 amd64, #831649

Signed-off-by: Jakov Smolić  gentoo.org>

 sys-fs/mergerfs/mergerfs-2.33.1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-fs/mergerfs/mergerfs-2.33.1.ebuild 
b/sys-fs/mergerfs/mergerfs-2.33.1.ebuild
index 2600359a9c80..8e892d61d0bc 100644
--- a/sys-fs/mergerfs/mergerfs-2.33.1.ebuild
+++ b/sys-fs/mergerfs/mergerfs-2.33.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,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"



[gentoo-commits] repo/gentoo:master commit in: sys-fs/mergerfs-tools/

2022-01-01 Thread Sam James
commit: 4192705813588e8da675f2a556632463f27f11f4
Author: Sam James  gentoo  org>
AuthorDate: Sat Jan  1 10:00:51 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jan  1 10:00:58 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41927058

sys-fs/mergerfs-tools: use conventional variable style

Signed-off-by: Sam James  gentoo.org>

 sys-fs/mergerfs-tools/mergerfs-tools-0_p20210502-r2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-fs/mergerfs-tools/mergerfs-tools-0_p20210502-r2.ebuild 
b/sys-fs/mergerfs-tools/mergerfs-tools-0_p20210502-r2.ebuild
index 5a0890ce8bf1..6b237738979a 100644
--- a/sys-fs/mergerfs-tools/mergerfs-tools-0_p20210502-r2.ebuild
+++ b/sys-fs/mergerfs-tools/mergerfs-tools-0_p20210502-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -9,7 +9,7 @@ inherit python-any-r1
 
 DESCRIPTION="Optional tools to help manage data in a mergerfs pool"
 HOMEPAGE="https://github.com/trapexit/mergerfs-tools;
-SRC_URI="https://dev.gentoo.org/~slashbeast/distfiles/$PN/$P.tar.xz;
+SRC_URI="https://dev.gentoo.org/~slashbeast/distfiles/${PN}/${P}.tar.xz;
 
 LICENSE="ISC"
 SLOT="0"



[gentoo-commits] repo/gentoo:master commit in: sys-fs/mergerfs-tools/

2021-12-31 Thread Piotr Karbowski
commit: fbbaf9f4f0ea47ada8461ebc9d06162c357c5c6c
Author: Piotr Karbowski  gentoo  org>
AuthorDate: Fri Dec 31 14:16:59 2021 +
Commit: Piotr Karbowski  gentoo  org>
CommitDate: Fri Dec 31 14:16:59 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fbbaf9f4

sys-fs/mergerfs-tools: DEPEND="${PYTHON_DEPS}" fix.

Unfortunately, `repoman full` has not catch it.

Signed-off-by: Piotr Karbowski  gentoo.org>

 ...ols-0_p20210502-r1.ebuild => mergerfs-tools-0_p20210502-r2.ebuild} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-fs/mergerfs-tools/mergerfs-tools-0_p20210502-r1.ebuild 
b/sys-fs/mergerfs-tools/mergerfs-tools-0_p20210502-r2.ebuild
similarity index 92%
rename from sys-fs/mergerfs-tools/mergerfs-tools-0_p20210502-r1.ebuild
rename to sys-fs/mergerfs-tools/mergerfs-tools-0_p20210502-r2.ebuild
index d4df0ca5ee3f..5a0890ce8bf1 100644
--- a/sys-fs/mergerfs-tools/mergerfs-tools-0_p20210502-r1.ebuild
+++ b/sys-fs/mergerfs-tools/mergerfs-tools-0_p20210502-r2.ebuild
@@ -16,8 +16,8 @@ SLOT="0"
 
 KEYWORDS="~amd64 ~x86"
 
-RDEPEND=""
-DEPEND=""
+DEPEND="${PYTHON_DEPS}"
+RDEPEND="${DEPEND}"
 
 src_compile() {
# no build system.



[gentoo-commits] repo/gentoo:master commit in: sys-fs/mergerfs-tools/

2021-12-31 Thread Piotr Karbowski
commit: bc1d8cef7f77a6f4fcd0ec59012adf03fc5cb853
Author: Piotr Karbowski  gentoo  org>
AuthorDate: Fri Dec 31 13:44:30 2021 +
Commit: Piotr Karbowski  gentoo  org>
CommitDate: Fri Dec 31 13:44:30 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc1d8cef

sys-fs/mergerfs-tools: use python-any-r1 over DISTUTILS_SINGLE_IMPL.

Signed-off-by: Piotr Karbowski  gentoo.org>

 ...-tools-0_p20210502.ebuild => mergerfs-tools-0_p20210502-r1.ebuild} | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/sys-fs/mergerfs-tools/mergerfs-tools-0_p20210502.ebuild 
b/sys-fs/mergerfs-tools/mergerfs-tools-0_p20210502-r1.ebuild
similarity index 87%
rename from sys-fs/mergerfs-tools/mergerfs-tools-0_p20210502.ebuild
rename to sys-fs/mergerfs-tools/mergerfs-tools-0_p20210502-r1.ebuild
index 39057e219a0a..d4df0ca5ee3f 100644
--- a/sys-fs/mergerfs-tools/mergerfs-tools-0_p20210502.ebuild
+++ b/sys-fs/mergerfs-tools/mergerfs-tools-0_p20210502-r1.ebuild
@@ -4,10 +4,8 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_SETUPTOOLS=no
 
-inherit distutils-r1
+inherit python-any-r1
 
 DESCRIPTION="Optional tools to help manage data in a mergerfs pool"
 HOMEPAGE="https://github.com/trapexit/mergerfs-tools;



[gentoo-commits] repo/gentoo:master commit in: sys-fs/mergerfs-tools/

2021-12-31 Thread Piotr Karbowski
commit: c1712b92a3593cb96c74818adfc30c589b19ede9
Author: Piotr Karbowski  gentoo  org>
AuthorDate: Fri Dec 31 13:34:57 2021 +
Commit: Piotr Karbowski  gentoo  org>
CommitDate: Fri Dec 31 13:35:37 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1712b92

sys-fs/mergerfs-tools: new package

Signed-off-by: Piotr Karbowski  gentoo.org>

 sys-fs/mergerfs-tools/Manifest |  1 +
 .../mergerfs-tools-0_p20210502.ebuild  | 31 ++
 sys-fs/mergerfs-tools/metadata.xml | 11 
 3 files changed, 43 insertions(+)

diff --git a/sys-fs/mergerfs-tools/Manifest b/sys-fs/mergerfs-tools/Manifest
new file mode 100644
index ..b96ee5a6e6f2
--- /dev/null
+++ b/sys-fs/mergerfs-tools/Manifest
@@ -0,0 +1 @@
+DIST mergerfs-tools-0_p20210502.tar.xz 12876 BLAKE2B 
760ae2ebb9017e3bb5508d008bc5726cca4ba1930a7f8ebf752e34ed94d92502c146fe2ab25d88c41d27e3ef94b75497b21e0c62c9e86b0e3872916116c4d67d
 SHA512 
8a3c3e92ecdd1c57b8331a0bebfee11908f1d2361fb35cd906173d2d3fd0ce4195eabfb63aa1edac3c36be254504c25edf87caa0608900f6970551991f7a4a50

diff --git a/sys-fs/mergerfs-tools/mergerfs-tools-0_p20210502.ebuild 
b/sys-fs/mergerfs-tools/mergerfs-tools-0_p20210502.ebuild
new file mode 100644
index ..39057e219a0a
--- /dev/null
+++ b/sys-fs/mergerfs-tools/mergerfs-tools-0_p20210502.ebuild
@@ -0,0 +1,31 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_SETUPTOOLS=no
+
+inherit distutils-r1
+
+DESCRIPTION="Optional tools to help manage data in a mergerfs pool"
+HOMEPAGE="https://github.com/trapexit/mergerfs-tools;
+SRC_URI="https://dev.gentoo.org/~slashbeast/distfiles/$PN/$P.tar.xz;
+
+LICENSE="ISC"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=""
+DEPEND=""
+
+src_compile() {
+   # no build system.
+   true
+}
+
+src_install() {
+   emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install
+}

diff --git a/sys-fs/mergerfs-tools/metadata.xml 
b/sys-fs/mergerfs-tools/metadata.xml
new file mode 100644
index ..5dd94d2f63a6
--- /dev/null
+++ b/sys-fs/mergerfs-tools/metadata.xml
@@ -0,0 +1,11 @@
+
+https://www.gentoo.org/dtd/metadata.dtd;>
+
+   
+   slashbe...@gentoo.org
+   Piotr Karbowski
+   
+   
+   trapexit/mergerfs-tools
+   
+



[gentoo-commits] repo/gentoo:master commit in: sys-fs/mergerfs/

2021-12-30 Thread Piotr Karbowski
commit: a76544c2de94a8ca3d073a65c836113eb93de3d2
Author: Piotr Karbowski  gentoo  org>
AuthorDate: Thu Dec 30 22:44:31 2021 +
Commit: Piotr Karbowski  gentoo  org>
CommitDate: Thu Dec 30 22:44:31 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a76544c2

sys-fs/mergerfs: 2.33.3 version bump

Signed-off-by: Piotr Karbowski  gentoo.org>

 sys-fs/mergerfs/Manifest   |  1 +
 sys-fs/mergerfs/mergerfs-2.33.3.ebuild | 52 ++
 2 files changed, 53 insertions(+)

diff --git a/sys-fs/mergerfs/Manifest b/sys-fs/mergerfs/Manifest
index 92f80693ea66..7ffaefe742b6 100644
--- a/sys-fs/mergerfs/Manifest
+++ b/sys-fs/mergerfs/Manifest
@@ -1,2 +1,3 @@
 DIST mergerfs-2.32.3.tar.gz 314280 BLAKE2B 
f7c5ab92f1241627bd91255b35bdd81782f153f9144242a52241f9e812e4096c23d73401251a8ace43781f39a4644814dc724a8a31066f77cfd78ad6c27d54dd
 SHA512 
f3f8f320f98ef2a345a0229eca661c6c8c75fdd23613ae0d45f13062b18f6f052474a009c77a6602df77762100f45b3eb76692812e81d12555763ead5c83b87d
 DIST mergerfs-2.33.1.tar.gz 382421 BLAKE2B 
0985a0ad53a12fe5283fd0e953cd74a835efd3e83f65ba4e96bc42814ce151d03f95c032eeebcc9821c7c15ae59d14b9e40055438b4482a337c5b7bc9503d27e
 SHA512 
1178fbd4ad99c6c693e2c21551c7522107701b0d5c608a7c18be29825cf97f2a2b2d6a50094e800a749a3902c374f8b57e84a76c0640aa8e387aa095d300
+DIST mergerfs-2.33.3.tar.gz 382386 BLAKE2B 
49a2b75a2a39fbec178460f94696a918a0f872a7c904355c84180f8be07d9abdf68e342e7acca5093a621b85110d0a0fdb5650de68e04aa176250199eaa5bdb7
 SHA512 
aca5884a9d5dc03d7095e73461dee843d69463db72dfc033f76611d5417dab63ff29eb2b473f39f0390299c3aa882e6197a7038e82b58ab85799d39cc44b84d0

diff --git a/sys-fs/mergerfs/mergerfs-2.33.3.ebuild 
b/sys-fs/mergerfs/mergerfs-2.33.3.ebuild
new file mode 100644
index ..fb2d3b62a41b
--- /dev/null
+++ b/sys-fs/mergerfs/mergerfs-2.33.3.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
+}



[gentoo-commits] repo/gentoo:master commit in: sys-fs/mergerfs/

2021-12-30 Thread Piotr Karbowski
commit: 0e9155b15a80e7e7c571d67a567513c8b55d5101
Author: Piotr Karbowski  gentoo  org>
AuthorDate: Thu Dec 30 22:41:17 2021 +
Commit: Piotr Karbowski  gentoo  org>
CommitDate: Thu Dec 30 22:41:17 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e9155b1

sys-fs/mergerfs: drop old versions.

Signed-off-by: Piotr Karbowski  gentoo.org>

 sys-fs/mergerfs/Manifest   |  4 ---
 sys-fs/mergerfs/mergerfs-2.32.1.ebuild | 52 --
 sys-fs/mergerfs/mergerfs-2.32.2.ebuild | 52 --
 sys-fs/mergerfs/mergerfs-2.32.4.ebuild | 52 --
 sys-fs/mergerfs/mergerfs-2.32.6.ebuild | 52 --
 5 files changed, 212 deletions(-)

diff --git a/sys-fs/mergerfs/Manifest b/sys-fs/mergerfs/Manifest
index 659066365e5a..92f80693ea66 100644
--- a/sys-fs/mergerfs/Manifest
+++ b/sys-fs/mergerfs/Manifest
@@ -1,6 +1,2 @@
-DIST mergerfs-2.32.1.tar.gz 314392 BLAKE2B 
8024dd835af3380fc53ed7255e720c2475da229b2cb3cea68c7bb64edf2b56de903f82c22f65459ea40f08ff724a60fa474a20fbd1e964686a9b1f0df5c5a05d
 SHA512 
2e09ae48d9b06c5a6b7cc577b458a9ec402fcd8243c023f9c03d0b37a35c28722586c738e76f7291559deae84aa69f52bcc76a9042947f984b24b85d84276807
-DIST mergerfs-2.32.2.tar.gz 314267 BLAKE2B 
768241671202019262e16ff9e2247014904fdf503057472b8b68805980215c6585a77047b66aa105fc99a83642b104d002808e532445021500ef3da4cdd3a6ae
 SHA512 
f138f53ce9a9fbda6194847e74e3b3b161f49d84bc659f85c56cd61113fb7e5a89a9950eb54537c4a486a57ade5c8644a9809f97bbfff981cff32a6043329a73
 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 
1178fbd4ad99c6c693e2c21551c7522107701b0d5c608a7c18be29825cf97f2a2b2d6a50094e800a749a3902c374f8b57e84a76c0640aa8e387aa095d300

diff --git a/sys-fs/mergerfs/mergerfs-2.32.1.ebuild 
b/sys-fs/mergerfs/mergerfs-2.32.1.ebuild
deleted file mode 100644
index 1a8305d70486..
--- a/sys-fs/mergerfs/mergerfs-2.32.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# 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
-
-   default
-}
-
-src_install() {
-   dobin build/mergerfs
-   dosym mergerfs /usr/bin/mount.mergerfs
-   dodoc README.md
-   doman man/mergerfs.1
-}

diff --git a/sys-fs/mergerfs/mergerfs-2.32.2.ebuild 
b/sys-fs/mergerfs/mergerfs-2.32.2.ebuild
deleted file mode 100644
index 5d1e3ec0e4cf..
--- a/sys-fs/mergerfs/mergerfs-2.32.2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# 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="
-   

[gentoo-commits] repo/gentoo:master commit in: sys-fs/mergerfs/

2021-12-05 Thread Piotr Karbowski
commit: 714fa168c0c422f70a960e20efe1d8de359679ef
Author: Piotr Karbowski  gentoo  org>
AuthorDate: Sun Dec  5 19:44:12 2021 +
Commit: Piotr Karbowski  gentoo  org>
CommitDate: Sun Dec  5 19:44:12 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=714fa168

sys-fs/mergerfs: 2.33.1 version bump

Signed-off-by: Piotr Karbowski  gentoo.org>

 sys-fs/mergerfs/Manifest   |  1 +
 sys-fs/mergerfs/mergerfs-2.33.1.ebuild | 52 ++
 2 files changed, 53 insertions(+)

diff --git a/sys-fs/mergerfs/Manifest b/sys-fs/mergerfs/Manifest
index 6ae7c67542d4..659066365e5a 100644
--- a/sys-fs/mergerfs/Manifest
+++ b/sys-fs/mergerfs/Manifest
@@ -3,3 +3,4 @@ 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 
1178fbd4ad99c6c693e2c21551c7522107701b0d5c608a7c18be29825cf97f2a2b2d6a50094e800a749a3902c374f8b57e84a76c0640aa8e387aa095d300

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 ..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
+}



[gentoo-commits] repo/gentoo:master commit in: sys-fs/mergerfs/

2021-08-19 Thread Piotr Karbowski
commit: 79b2b5cba5b54757b7ce05b5fae507d85375ea8d
Author: Piotr Karbowski  gentoo  org>
AuthorDate: Thu Aug 19 21:02:11 2021 +
Commit: Piotr Karbowski  gentoo  org>
CommitDate: Thu Aug 19 21:10:44 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79b2b5cb

sys-fs/mergerfs: 2.32.6 version bump.

Signed-off-by: Piotr Karbowski  gentoo.org>

 sys-fs/mergerfs/Manifest   |  1 +
 sys-fs/mergerfs/mergerfs-2.32.6.ebuild | 52 ++
 2 files changed, 53 insertions(+)

diff --git a/sys-fs/mergerfs/Manifest b/sys-fs/mergerfs/Manifest
index d9605fbc714..6ae7c67542d 100644
--- a/sys-fs/mergerfs/Manifest
+++ b/sys-fs/mergerfs/Manifest
@@ -2,3 +2,4 @@ DIST mergerfs-2.32.1.tar.gz 314392 BLAKE2B 
8024dd835af3380fc53ed7255e720c2475da2
 DIST mergerfs-2.32.2.tar.gz 314267 BLAKE2B 
768241671202019262e16ff9e2247014904fdf503057472b8b68805980215c6585a77047b66aa105fc99a83642b104d002808e532445021500ef3da4cdd3a6ae
 SHA512 
f138f53ce9a9fbda6194847e74e3b3b161f49d84bc659f85c56cd61113fb7e5a89a9950eb54537c4a486a57ade5c8644a9809f97bbfff981cff32a6043329a73
 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

diff --git a/sys-fs/mergerfs/mergerfs-2.32.6.ebuild 
b/sys-fs/mergerfs/mergerfs-2.32.6.ebuild
new file mode 100644
index 000..2600359a9c8
--- /dev/null
+++ b/sys-fs/mergerfs/mergerfs-2.32.6.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
+}



[gentoo-commits] repo/gentoo:master commit in: sys-fs/mergerfs/

2021-03-13 Thread Sam James
commit: aca3ef75d189608cd98db6e3014d89b4b46cb6c9
Author: Sam James  gentoo  org>
AuthorDate: Sat Mar 13 11:36:30 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Mar 13 11:37:15 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aca3ef75

sys-fs/mergerfs: Stabilize 2.32.3 x86, #775527

Signed-off-by: Sam James  gentoo.org>

 sys-fs/mergerfs/mergerfs-2.32.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/mergerfs/mergerfs-2.32.3.ebuild 
b/sys-fs/mergerfs/mergerfs-2.32.3.ebuild
index ec7e7850d89..1a8305d7048 100644
--- a/sys-fs/mergerfs/mergerfs-2.32.3.ebuild
+++ b/sys-fs/mergerfs/mergerfs-2.32.3.ebuild
@@ -9,7 +9,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"



[gentoo-commits] repo/gentoo:master commit in: sys-fs/mergerfs/

2021-03-13 Thread Sam James
commit: e261b4624d4e0f8127b155ecf8e8b7e8b27a6608
Author: Sam James  gentoo  org>
AuthorDate: Sat Mar 13 11:35:07 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Mar 13 11:35:07 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e261b462

sys-fs/mergerfs: Stabilize 2.32.3 amd64, #775527

Signed-off-by: Sam James  gentoo.org>

 sys-fs/mergerfs/mergerfs-2.32.3.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-fs/mergerfs/mergerfs-2.32.3.ebuild 
b/sys-fs/mergerfs/mergerfs-2.32.3.ebuild
index 5d1e3ec0e4c..ec7e7850d89 100644
--- a/sys-fs/mergerfs/mergerfs-2.32.3.ebuild
+++ b/sys-fs/mergerfs/mergerfs-2.32.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,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"



[gentoo-commits] repo/gentoo:master commit in: sys-fs/mergerfs/

2021-03-11 Thread Piotr Karbowski
commit: d546ba34db7f9e364d1dc7ae96b264ca6c1f3887
Author: Piotr Karbowski  gentoo  org>
AuthorDate: Thu Mar 11 20:12:11 2021 +
Commit: Piotr Karbowski  gentoo  org>
CommitDate: Thu Mar 11 20:34:23 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d546ba34

sys-fs/mergerfs: 2.32.4 version bump.

Closes: https://bugs.gentoo.org/769515
Signed-off-by: Piotr Karbowski  gentoo.org>

 sys-fs/mergerfs/Manifest   |  1 +
 sys-fs/mergerfs/mergerfs-2.32.4.ebuild | 52 ++
 2 files changed, 53 insertions(+)

diff --git a/sys-fs/mergerfs/Manifest b/sys-fs/mergerfs/Manifest
index 4f13816959f..d9605fbc714 100644
--- a/sys-fs/mergerfs/Manifest
+++ b/sys-fs/mergerfs/Manifest
@@ -1,3 +1,4 @@
 DIST mergerfs-2.32.1.tar.gz 314392 BLAKE2B 
8024dd835af3380fc53ed7255e720c2475da229b2cb3cea68c7bb64edf2b56de903f82c22f65459ea40f08ff724a60fa474a20fbd1e964686a9b1f0df5c5a05d
 SHA512 
2e09ae48d9b06c5a6b7cc577b458a9ec402fcd8243c023f9c03d0b37a35c28722586c738e76f7291559deae84aa69f52bcc76a9042947f984b24b85d84276807
 DIST mergerfs-2.32.2.tar.gz 314267 BLAKE2B 
768241671202019262e16ff9e2247014904fdf503057472b8b68805980215c6585a77047b66aa105fc99a83642b104d002808e532445021500ef3da4cdd3a6ae
 SHA512 
f138f53ce9a9fbda6194847e74e3b3b161f49d84bc659f85c56cd61113fb7e5a89a9950eb54537c4a486a57ade5c8644a9809f97bbfff981cff32a6043329a73
 DIST mergerfs-2.32.3.tar.gz 314280 BLAKE2B 
f7c5ab92f1241627bd91255b35bdd81782f153f9144242a52241f9e812e4096c23d73401251a8ace43781f39a4644814dc724a8a31066f77cfd78ad6c27d54dd
 SHA512 
f3f8f320f98ef2a345a0229eca661c6c8c75fdd23613ae0d45f13062b18f6f052474a009c77a6602df77762100f45b3eb76692812e81d12555763ead5c83b87d
+DIST mergerfs-2.32.4.tar.gz 314302 BLAKE2B 
9435e1e9a7539c5fd732313e269551b12d5e23303e4ac77d783817f42c8004f2873f9e82bd69586c69ebce1e628da707534b04094ea0d7a1f626af6f3b8a444a
 SHA512 
248b5e16c49f0775a5173b10940e45fa401ff81a44e2f081135f118a4deb9f79104d77e1c7424926da703123753a75e8f0590396e44c9ecd3bfdd1f27d7ced17

diff --git a/sys-fs/mergerfs/mergerfs-2.32.4.ebuild 
b/sys-fs/mergerfs/mergerfs-2.32.4.ebuild
new file mode 100644
index 000..2600359a9c8
--- /dev/null
+++ b/sys-fs/mergerfs/mergerfs-2.32.4.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
+}



[gentoo-commits] repo/gentoo:master commit in: sys-fs/mergerfs/files/

2021-02-12 Thread Conrad Kostecki
commit: ce3a2a7b998284e578df9e515450c2962ceacf68
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Fri Feb 12 11:02:20 2021 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Fri Feb 12 22:35:45 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce3a2a7b

sys-fs/mergerfs: remove unused patch(es)

Closes: https://github.com/gentoo/gentoo/pull/19424
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Signed-off-by: Conrad Kostecki  gentoo.org>

 ...akefiles-fixes-ar-cflags-cxxflags-ldflags.patch | 83 --
 1 file changed, 83 deletions(-)

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
deleted file mode 100644
index 05166bacd87..000
--- 
a/sys-fs/mergerfs/files/mergerfs-makefiles-fixes-ar-cflags-cxxflags-ldflags.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-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
- 



[gentoo-commits] repo/gentoo:master commit in: sys-fs/mergerfs/

2021-02-09 Thread Piotr Karbowski
commit: 81fb614503b6ecd4b25280ceaf1c1357c6e5c0c9
Author: Piotr Karbowski  gentoo  org>
AuthorDate: Tue Feb  9 23:33:18 2021 +
Commit: Piotr Karbowski  gentoo  org>
CommitDate: Tue Feb  9 23:34:49 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81fb6145

sys-fs/mergerfs: 2.32.3 bump

Closes: https://bugs.gentoo.org/769356
Closes: https://github.com/trapexit/mergerfs/issues/877
Signed-off-by: Piotr Karbowski  gentoo.org>

 sys-fs/mergerfs/Manifest   |  1 +
 sys-fs/mergerfs/mergerfs-2.32.3.ebuild | 52 ++
 2 files changed, 53 insertions(+)

diff --git a/sys-fs/mergerfs/Manifest b/sys-fs/mergerfs/Manifest
index 737727e6153..4f13816959f 100644
--- a/sys-fs/mergerfs/Manifest
+++ b/sys-fs/mergerfs/Manifest
@@ -1,2 +1,3 @@
 DIST mergerfs-2.32.1.tar.gz 314392 BLAKE2B 
8024dd835af3380fc53ed7255e720c2475da229b2cb3cea68c7bb64edf2b56de903f82c22f65459ea40f08ff724a60fa474a20fbd1e964686a9b1f0df5c5a05d
 SHA512 
2e09ae48d9b06c5a6b7cc577b458a9ec402fcd8243c023f9c03d0b37a35c28722586c738e76f7291559deae84aa69f52bcc76a9042947f984b24b85d84276807
 DIST mergerfs-2.32.2.tar.gz 314267 BLAKE2B 
768241671202019262e16ff9e2247014904fdf503057472b8b68805980215c6585a77047b66aa105fc99a83642b104d002808e532445021500ef3da4cdd3a6ae
 SHA512 
f138f53ce9a9fbda6194847e74e3b3b161f49d84bc659f85c56cd61113fb7e5a89a9950eb54537c4a486a57ade5c8644a9809f97bbfff981cff32a6043329a73
+DIST mergerfs-2.32.3.tar.gz 314280 BLAKE2B 
f7c5ab92f1241627bd91255b35bdd81782f153f9144242a52241f9e812e4096c23d73401251a8ace43781f39a4644814dc724a8a31066f77cfd78ad6c27d54dd
 SHA512 
f3f8f320f98ef2a345a0229eca661c6c8c75fdd23613ae0d45f13062b18f6f052474a009c77a6602df77762100f45b3eb76692812e81d12555763ead5c83b87d

diff --git a/sys-fs/mergerfs/mergerfs-2.32.3.ebuild 
b/sys-fs/mergerfs/mergerfs-2.32.3.ebuild
new file mode 100644
index 000..5d1e3ec0e4c
--- /dev/null
+++ b/sys-fs/mergerfs/mergerfs-2.32.3.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
+
+   default
+}
+
+src_install() {
+   dobin build/mergerfs
+   dosym mergerfs /usr/bin/mount.mergerfs
+   dodoc README.md
+   doman man/mergerfs.1
+}



[gentoo-commits] repo/gentoo:master commit in: sys-fs/mergerfs/

2021-02-09 Thread Piotr Karbowski
commit: ab8d7b5c4a6db71ee43a29ddb1b05a3f88572ffa
Author: Piotr Karbowski  gentoo  org>
AuthorDate: Tue Feb  9 23:32:40 2021 +
Commit: Piotr Karbowski  gentoo  org>
CommitDate: Tue Feb  9 23:34:49 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab8d7b5c

sys-fs/mergerfs: drop old.

Signed-off-by: Piotr Karbowski  gentoo.org>

 sys-fs/mergerfs/Manifest  |  5 ---
 sys-fs/mergerfs/mergerfs-2.28.3-r1.ebuild | 46 -
 sys-fs/mergerfs/mergerfs-2.29.0.ebuild| 43 
 sys-fs/mergerfs/mergerfs-2.30.0.ebuild| 56 ---
 sys-fs/mergerfs/mergerfs-2.31.0.ebuild| 52 
 sys-fs/mergerfs/mergerfs-2.32.0.ebuild| 52 
 6 files changed, 254 deletions(-)

diff --git a/sys-fs/mergerfs/Manifest b/sys-fs/mergerfs/Manifest
index 96f2342ce53..737727e6153 100644
--- a/sys-fs/mergerfs/Manifest
+++ b/sys-fs/mergerfs/Manifest
@@ -1,7 +1,2 @@
-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
-DIST mergerfs-2.31.0.tar.gz 314286 BLAKE2B 
595dd05e7bd4e6b2fbc2b1901a0d752710c6efea9957c400b394594e5586607a88899bf9966a9406ca0a57e0059af214ce30b06d87db5871aa42b5443a872cdb
 SHA512 
c4504a8f585ffc7f58b11df441755db821611d9754a630ec211aaf611657df82c72120737ba2a2480e1ebebcb0af05adef2e4b8c463b97f4fd98ab5630890253
-DIST mergerfs-2.32.0.tar.gz 314388 BLAKE2B 
8f009d8328702c48ec134e2dc80e65c88aa684dac541b9c09d0adaf81f3a013848d826e809fca9fed9d0b68917300f3dd65c5ba687f349006e950c7935b6adab
 SHA512 
a25d075afcd0afb589ebf0306fb25bf8d170ab293047e1501128dcda1941abdce84b5513d9725c06aea3cb003f8abb4573826e81d11cfe90e4a2825ef75887ca
 DIST mergerfs-2.32.1.tar.gz 314392 BLAKE2B 
8024dd835af3380fc53ed7255e720c2475da229b2cb3cea68c7bb64edf2b56de903f82c22f65459ea40f08ff724a60fa474a20fbd1e964686a9b1f0df5c5a05d
 SHA512 
2e09ae48d9b06c5a6b7cc577b458a9ec402fcd8243c023f9c03d0b37a35c28722586c738e76f7291559deae84aa69f52bcc76a9042947f984b24b85d84276807
 DIST mergerfs-2.32.2.tar.gz 314267 BLAKE2B 
768241671202019262e16ff9e2247014904fdf503057472b8b68805980215c6585a77047b66aa105fc99a83642b104d002808e532445021500ef3da4cdd3a6ae
 SHA512 
f138f53ce9a9fbda6194847e74e3b3b161f49d84bc659f85c56cd61113fb7e5a89a9950eb54537c4a486a57ade5c8644a9809f97bbfff981cff32a6043329a73

diff --git a/sys-fs/mergerfs/mergerfs-2.28.3-r1.ebuild 
b/sys-fs/mergerfs/mergerfs-2.28.3-r1.ebuild
deleted file mode 100644
index 101fdf4ffc7..000
--- a/sys-fs/mergerfs/mergerfs-2.28.3-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 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
-
-   # drop -O2 from those handmade Makefiles.
-   sed -r '/^OPTS[ \t]*=/d' -i Makefile || die
-
-   # 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
-}

diff --git a/sys-fs/mergerfs/mergerfs-2.29.0.ebuild 
b/sys-fs/mergerfs/mergerfs-2.29.0.ebuild
deleted file mode 100644
index 97325c3ba21..000
--- a/sys-fs/mergerfs/mergerfs-2.29.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A 

[gentoo-commits] repo/gentoo:master commit in: sys-fs/mergerfs/

2021-02-04 Thread Agostino Sarubbo
commit: 3d3cd328c7c3f4dd650f00ae4c9dd75ba77bef57
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu Feb  4 14:41:43 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu Feb  4 14:41:43 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d3cd328

sys-fs/mergerfs: x86 stable wrt bug #768591

Package-Manager: Portage-3.0.13, Repoman-3.0.2
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 sys-fs/mergerfs/mergerfs-2.32.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/mergerfs/mergerfs-2.32.1.ebuild 
b/sys-fs/mergerfs/mergerfs-2.32.1.ebuild
index ec7e7850d89..1a8305d7048 100644
--- a/sys-fs/mergerfs/mergerfs-2.32.1.ebuild
+++ b/sys-fs/mergerfs/mergerfs-2.32.1.ebuild
@@ -9,7 +9,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"



[gentoo-commits] repo/gentoo:master commit in: sys-fs/mergerfs/

2021-02-04 Thread Sam James
commit: 93829cc5f4155bf6b8414878f546e88e7b6f9fe2
Author: Sam James  gentoo  org>
AuthorDate: Thu Feb  4 14:09:09 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Feb  4 14:09:09 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93829cc5

sys-fs/mergerfs: Stabilize 2.32.1 amd64, #768591

Signed-off-by: Sam James  gentoo.org>

 sys-fs/mergerfs/mergerfs-2.32.1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-fs/mergerfs/mergerfs-2.32.1.ebuild 
b/sys-fs/mergerfs/mergerfs-2.32.1.ebuild
index 5d1e3ec0e4c..ec7e7850d89 100644
--- a/sys-fs/mergerfs/mergerfs-2.32.1.ebuild
+++ b/sys-fs/mergerfs/mergerfs-2.32.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,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"



[gentoo-commits] repo/gentoo:master commit in: sys-fs/mergerfs/

2021-02-03 Thread Piotr Karbowski
commit: 53a23c8f2fd9a6d8a2702d4d0f70dc8d2d34134c
Author: Piotr Karbowski  gentoo  org>
AuthorDate: Wed Feb  3 22:06:16 2021 +
Commit: Piotr Karbowski  gentoo  org>
CommitDate: Wed Feb  3 22:06:16 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53a23c8f

sys-fs/mergerfs: 2.32.2 bump

Signed-off-by: Piotr Karbowski  gentoo.org>

 sys-fs/mergerfs/Manifest   |  1 +
 sys-fs/mergerfs/mergerfs-2.32.2.ebuild | 52 ++
 2 files changed, 53 insertions(+)

diff --git a/sys-fs/mergerfs/Manifest b/sys-fs/mergerfs/Manifest
index c31cdc59b53..96f2342ce53 100644
--- a/sys-fs/mergerfs/Manifest
+++ b/sys-fs/mergerfs/Manifest
@@ -4,3 +4,4 @@ DIST mergerfs-2.30.0.tar.gz 316560 BLAKE2B 
7e6be39cfa5f085aabbc928e1da9c0bf1f644
 DIST mergerfs-2.31.0.tar.gz 314286 BLAKE2B 
595dd05e7bd4e6b2fbc2b1901a0d752710c6efea9957c400b394594e5586607a88899bf9966a9406ca0a57e0059af214ce30b06d87db5871aa42b5443a872cdb
 SHA512 
c4504a8f585ffc7f58b11df441755db821611d9754a630ec211aaf611657df82c72120737ba2a2480e1ebebcb0af05adef2e4b8c463b97f4fd98ab5630890253
 DIST mergerfs-2.32.0.tar.gz 314388 BLAKE2B 
8f009d8328702c48ec134e2dc80e65c88aa684dac541b9c09d0adaf81f3a013848d826e809fca9fed9d0b68917300f3dd65c5ba687f349006e950c7935b6adab
 SHA512 
a25d075afcd0afb589ebf0306fb25bf8d170ab293047e1501128dcda1941abdce84b5513d9725c06aea3cb003f8abb4573826e81d11cfe90e4a2825ef75887ca
 DIST mergerfs-2.32.1.tar.gz 314392 BLAKE2B 
8024dd835af3380fc53ed7255e720c2475da229b2cb3cea68c7bb64edf2b56de903f82c22f65459ea40f08ff724a60fa474a20fbd1e964686a9b1f0df5c5a05d
 SHA512 
2e09ae48d9b06c5a6b7cc577b458a9ec402fcd8243c023f9c03d0b37a35c28722586c738e76f7291559deae84aa69f52bcc76a9042947f984b24b85d84276807
+DIST mergerfs-2.32.2.tar.gz 314267 BLAKE2B 
768241671202019262e16ff9e2247014904fdf503057472b8b68805980215c6585a77047b66aa105fc99a83642b104d002808e532445021500ef3da4cdd3a6ae
 SHA512 
f138f53ce9a9fbda6194847e74e3b3b161f49d84bc659f85c56cd61113fb7e5a89a9950eb54537c4a486a57ade5c8644a9809f97bbfff981cff32a6043329a73

diff --git a/sys-fs/mergerfs/mergerfs-2.32.2.ebuild 
b/sys-fs/mergerfs/mergerfs-2.32.2.ebuild
new file mode 100644
index 000..5d1e3ec0e4c
--- /dev/null
+++ b/sys-fs/mergerfs/mergerfs-2.32.2.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
+
+   default
+}
+
+src_install() {
+   dobin build/mergerfs
+   dosym mergerfs /usr/bin/mount.mergerfs
+   dodoc README.md
+   doman man/mergerfs.1
+}



[gentoo-commits] repo/gentoo:master commit in: sys-fs/mergerfs/

2021-01-05 Thread Sam James
commit: d1dc94f00d98269efdf94b8b29c65dda07086013
Author: Sam James  gentoo  org>
AuthorDate: Tue Jan  5 20:48:16 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jan  5 20:48:16 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1dc94f0

sys-fs/mergerfs: Stabilize 2.32.0 x86, #762014

Signed-off-by: Sam James  gentoo.org>

 sys-fs/mergerfs/mergerfs-2.32.0.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-fs/mergerfs/mergerfs-2.32.0.ebuild 
b/sys-fs/mergerfs/mergerfs-2.32.0.ebuild
index 27aeefa5ab5..1a8305d7048 100644
--- a/sys-fs/mergerfs/mergerfs-2.32.0.ebuild
+++ b/sys-fs/mergerfs/mergerfs-2.32.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,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"



[gentoo-commits] repo/gentoo:master commit in: sys-fs/mergerfs/

2020-12-27 Thread Sam James
commit: 7f0a001ac7440fcab77814cb0dc86f4b7cfe5166
Author: Sam James  gentoo  org>
AuthorDate: Sun Dec 27 23:06:44 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Dec 27 23:06:44 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f0a001a

sys-fs/mergerfs: Stabilize 2.32.0 amd64, #762014

Signed-off-by: Sam James  gentoo.org>

 sys-fs/mergerfs/mergerfs-2.32.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/mergerfs/mergerfs-2.32.0.ebuild 
b/sys-fs/mergerfs/mergerfs-2.32.0.ebuild
index 5d1e3ec0e4c..27aeefa5ab5 100644
--- a/sys-fs/mergerfs/mergerfs-2.32.0.ebuild
+++ b/sys-fs/mergerfs/mergerfs-2.32.0.ebuild
@@ -9,7 +9,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"



[gentoo-commits] repo/gentoo:master commit in: sys-fs/mergerfs/

2020-12-27 Thread Piotr Karbowski
commit: 3ec8521b7c6936a0d88a1dec7f6fe7ceb5c5f428
Author: Piotr Karbowski  gentoo  org>
AuthorDate: Sun Dec 27 22:47:06 2020 +
Commit: Piotr Karbowski  gentoo  org>
CommitDate: Sun Dec 27 22:49:08 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ec8521b

sys-fs/mergerfs: 2.32.1 version bump

Signed-off-by: Piotr Karbowski  gentoo.org>

 sys-fs/mergerfs/Manifest   |  1 +
 sys-fs/mergerfs/mergerfs-2.32.1.ebuild | 52 ++
 2 files changed, 53 insertions(+)

diff --git a/sys-fs/mergerfs/Manifest b/sys-fs/mergerfs/Manifest
index f32ab21fce2..c31cdc59b53 100644
--- a/sys-fs/mergerfs/Manifest
+++ b/sys-fs/mergerfs/Manifest
@@ -3,3 +3,4 @@ DIST mergerfs-2.29.0.tar.gz 302391 BLAKE2B 
a7d051c63b12a95af2868d8b3be9b32aa1be3
 DIST mergerfs-2.30.0.tar.gz 316560 BLAKE2B 
7e6be39cfa5f085aabbc928e1da9c0bf1f6442be1de4ccef1868832c852d138901071129cf7feff19b13dd5939c5fff56520c5292473b92c71a85430818ab25c
 SHA512 
6914c5efa783d66293ebcce0a6a493267eedfa45ac058cd24b2024aea15a866b997f4474363e4ababa4af59d302466c5f8c6b9f07ee42f7661b335d4701315b4
 DIST mergerfs-2.31.0.tar.gz 314286 BLAKE2B 
595dd05e7bd4e6b2fbc2b1901a0d752710c6efea9957c400b394594e5586607a88899bf9966a9406ca0a57e0059af214ce30b06d87db5871aa42b5443a872cdb
 SHA512 
c4504a8f585ffc7f58b11df441755db821611d9754a630ec211aaf611657df82c72120737ba2a2480e1ebebcb0af05adef2e4b8c463b97f4fd98ab5630890253
 DIST mergerfs-2.32.0.tar.gz 314388 BLAKE2B 
8f009d8328702c48ec134e2dc80e65c88aa684dac541b9c09d0adaf81f3a013848d826e809fca9fed9d0b68917300f3dd65c5ba687f349006e950c7935b6adab
 SHA512 
a25d075afcd0afb589ebf0306fb25bf8d170ab293047e1501128dcda1941abdce84b5513d9725c06aea3cb003f8abb4573826e81d11cfe90e4a2825ef75887ca
+DIST mergerfs-2.32.1.tar.gz 314392 BLAKE2B 
8024dd835af3380fc53ed7255e720c2475da229b2cb3cea68c7bb64edf2b56de903f82c22f65459ea40f08ff724a60fa474a20fbd1e964686a9b1f0df5c5a05d
 SHA512 
2e09ae48d9b06c5a6b7cc577b458a9ec402fcd8243c023f9c03d0b37a35c28722586c738e76f7291559deae84aa69f52bcc76a9042947f984b24b85d84276807

diff --git a/sys-fs/mergerfs/mergerfs-2.32.1.ebuild 
b/sys-fs/mergerfs/mergerfs-2.32.1.ebuild
new file mode 100644
index 000..5d1e3ec0e4c
--- /dev/null
+++ b/sys-fs/mergerfs/mergerfs-2.32.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
+
+   default
+}
+
+src_install() {
+   dobin build/mergerfs
+   dosym mergerfs /usr/bin/mount.mergerfs
+   dodoc README.md
+   doman man/mergerfs.1
+}



[gentoo-commits] repo/gentoo:master commit in: sys-fs/mergerfs/

2020-12-10 Thread Piotr Karbowski
commit: 973f417bbc0b8d64a402c3742029fa245fd82d61
Author: Piotr Karbowski  gentoo  org>
AuthorDate: Thu Dec 10 22:15:17 2020 +
Commit: Piotr Karbowski  gentoo  org>
CommitDate: Thu Dec 10 22:23:15 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=973f417b

sys-fs/mergerfs: 2.32.0 version bump

Signed-off-by: Piotr Karbowski  gentoo.org>

 sys-fs/mergerfs/Manifest   |  1 +
 sys-fs/mergerfs/mergerfs-2.32.0.ebuild | 52 ++
 2 files changed, 53 insertions(+)

diff --git a/sys-fs/mergerfs/Manifest b/sys-fs/mergerfs/Manifest
index 3ea05b48e92..f32ab21fce2 100644
--- a/sys-fs/mergerfs/Manifest
+++ b/sys-fs/mergerfs/Manifest
@@ -2,3 +2,4 @@ DIST mergerfs-2.28.3.tar.gz 294065 BLAKE2B 
2e59e00726aec53438d5a5df143ca20406979
 DIST mergerfs-2.29.0.tar.gz 302391 BLAKE2B 
a7d051c63b12a95af2868d8b3be9b32aa1be3d9c4cc4e359914b07e18ed30dadece80861ad559d5cdd85b375f565b9e70dac9ad3e34b98c054dd54822897c1a6
 SHA512 
2c21dedffc2f261c6c8427af59cffcacacc9b67bce7bb9989bd5946aa645c68bac0f56250ec19710e586a00892f7198853390bea3ff5981035d5a492ae4569a2
 DIST mergerfs-2.30.0.tar.gz 316560 BLAKE2B 
7e6be39cfa5f085aabbc928e1da9c0bf1f6442be1de4ccef1868832c852d138901071129cf7feff19b13dd5939c5fff56520c5292473b92c71a85430818ab25c
 SHA512 
6914c5efa783d66293ebcce0a6a493267eedfa45ac058cd24b2024aea15a866b997f4474363e4ababa4af59d302466c5f8c6b9f07ee42f7661b335d4701315b4
 DIST mergerfs-2.31.0.tar.gz 314286 BLAKE2B 
595dd05e7bd4e6b2fbc2b1901a0d752710c6efea9957c400b394594e5586607a88899bf9966a9406ca0a57e0059af214ce30b06d87db5871aa42b5443a872cdb
 SHA512 
c4504a8f585ffc7f58b11df441755db821611d9754a630ec211aaf611657df82c72120737ba2a2480e1ebebcb0af05adef2e4b8c463b97f4fd98ab5630890253
+DIST mergerfs-2.32.0.tar.gz 314388 BLAKE2B 
8f009d8328702c48ec134e2dc80e65c88aa684dac541b9c09d0adaf81f3a013848d826e809fca9fed9d0b68917300f3dd65c5ba687f349006e950c7935b6adab
 SHA512 
a25d075afcd0afb589ebf0306fb25bf8d170ab293047e1501128dcda1941abdce84b5513d9725c06aea3cb003f8abb4573826e81d11cfe90e4a2825ef75887ca

diff --git a/sys-fs/mergerfs/mergerfs-2.32.0.ebuild 
b/sys-fs/mergerfs/mergerfs-2.32.0.ebuild
new file mode 100644
index 000..5d1e3ec0e4c
--- /dev/null
+++ b/sys-fs/mergerfs/mergerfs-2.32.0.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
+
+   default
+}
+
+src_install() {
+   dobin build/mergerfs
+   dosym mergerfs /usr/bin/mount.mergerfs
+   dodoc README.md
+   doman man/mergerfs.1
+}



[gentoo-commits] repo/gentoo:master commit in: sys-fs/mergerfs/

2020-10-07 Thread Agostino Sarubbo
commit: 3f87f6be703651a93e8ee48d802b3fa5d3a16e36
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Oct  7 07:06:48 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Oct  7 07:09:16 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f87f6be

sys-fs/mergerfs: x86 stable wrt bug #746569

Package-Manager: Portage-2.3.103, Repoman-2.3.23
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 sys-fs/mergerfs/mergerfs-2.30.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/mergerfs/mergerfs-2.30.0.ebuild 
b/sys-fs/mergerfs/mergerfs-2.30.0.ebuild
index 19c94d91943..09f2db8f49b 100644
--- a/sys-fs/mergerfs/mergerfs-2.30.0.ebuild
+++ b/sys-fs/mergerfs/mergerfs-2.30.0.ebuild
@@ -9,7 +9,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"



[gentoo-commits] repo/gentoo:master commit in: sys-fs/mergerfs/

2020-10-04 Thread Piotr Karbowski
commit: bbae37d1deed6b7c13be08029c625feee980cdb6
Author: Piotr Karbowski  gentoo  org>
AuthorDate: Sun Oct  4 17:25:07 2020 +
Commit: Piotr Karbowski  gentoo  org>
CommitDate: Sun Oct  4 17:28:43 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbae37d1

sys-fs/mergerfs: 2.31.0 version bump

Signed-off-by: Piotr Karbowski  gentoo.org>

 sys-fs/mergerfs/Manifest   |  1 +
 sys-fs/mergerfs/mergerfs-2.31.0.ebuild | 52 ++
 2 files changed, 53 insertions(+)

diff --git a/sys-fs/mergerfs/Manifest b/sys-fs/mergerfs/Manifest
index c11a9c9ff41..3ea05b48e92 100644
--- a/sys-fs/mergerfs/Manifest
+++ b/sys-fs/mergerfs/Manifest
@@ -1,3 +1,4 @@
 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
+DIST mergerfs-2.31.0.tar.gz 314286 BLAKE2B 
595dd05e7bd4e6b2fbc2b1901a0d752710c6efea9957c400b394594e5586607a88899bf9966a9406ca0a57e0059af214ce30b06d87db5871aa42b5443a872cdb
 SHA512 
c4504a8f585ffc7f58b11df441755db821611d9754a630ec211aaf611657df82c72120737ba2a2480e1ebebcb0af05adef2e4b8c463b97f4fd98ab5630890253

diff --git a/sys-fs/mergerfs/mergerfs-2.31.0.ebuild 
b/sys-fs/mergerfs/mergerfs-2.31.0.ebuild
new file mode 100644
index 000..5d1e3ec0e4c
--- /dev/null
+++ b/sys-fs/mergerfs/mergerfs-2.31.0.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
+
+   default
+}
+
+src_install() {
+   dobin build/mergerfs
+   dosym mergerfs /usr/bin/mount.mergerfs
+   dodoc README.md
+   doman man/mergerfs.1
+}



[gentoo-commits] repo/gentoo:master commit in: sys-fs/mergerfs/, sys-fs/mergerfs/files/

2020-08-08 Thread Piotr Karbowski
commit: 4862dc8bd86bb9810de3088b4ffacc42015736f0
Author: Piotr Karbowski  gentoo  org>
AuthorDate: Sat Aug  8 19:59:01 2020 +
Commit: Piotr Karbowski  gentoo  org>
CommitDate: Sat Aug  8 20:00:27 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4862dc8b

sys-fs/mergerfs: 2.30.0 bump

Version bump; Now uses environmental provided AR, CFLAGS, CXXFLAGS and LDFLAGS.

Closes: https://bugs.gentoo.org/725978
Closes: https://bugs.gentoo.org/728158
Signed-off-by: Piotr Karbowski  gentoo.org>

 sys-fs/mergerfs/Manifest   |  1 +
 ...akefiles-fixes-ar-cflags-cxxflags-ldflags.patch | 83 ++
 sys-fs/mergerfs/mergerfs-2.30.0.ebuild | 56 +++
 3 files changed, 140 insertions(+)

diff --git a/sys-fs/mergerfs/Manifest b/sys-fs/mergerfs/Manifest
index 88f463eb87b..c11a9c9ff41 100644
--- a/sys-fs/mergerfs/Manifest
+++ b/sys-fs/mergerfs/Manifest
@@ -1,2 +1,3 @@
 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

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 000..05166bacd87
--- /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 000..e18bed54889
--- /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"
+

[gentoo-commits] repo/gentoo:master commit in: sys-fs/mergerfs/

2020-03-08 Thread Agostino Sarubbo
commit: 4f1afc43e5bbb472efe8c2cc9f0e70d0277b8239
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sun Mar  8 10:37:11 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sun Mar  8 10:37:11 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f1afc43

sys-fs/mergerfs: x86 stable wrt bug #711814

Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 sys-fs/mergerfs/mergerfs-2.28.3-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-fs/mergerfs/mergerfs-2.28.3-r1.ebuild 
b/sys-fs/mergerfs/mergerfs-2.28.3-r1.ebuild
index dbd6346bb90..101fdf4ffc7 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"



[gentoo-commits] repo/gentoo:master commit in: sys-fs/mergerfs/

2020-03-07 Thread Piotr Karbowski
commit: a48a2da4360b4496c368b5b16aeacfce97efa616
Author: Piotr Karbowski  gentoo  org>
AuthorDate: Sat Mar  7 20:58:08 2020 +
Commit: Piotr Karbowski  gentoo  org>
CommitDate: Sat Mar  7 20:59:01 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a48a2da4

sys-fs/mergerfs-2.29: bump

Signed-off-by: Piotr Karbowski  gentoo.org>

 sys-fs/mergerfs/Manifest   |  1 +
 sys-fs/mergerfs/mergerfs-2.29.0.ebuild | 43 ++
 2 files changed, 44 insertions(+)

diff --git a/sys-fs/mergerfs/Manifest b/sys-fs/mergerfs/Manifest
index 49068f2d933..88f463eb87b 100644
--- a/sys-fs/mergerfs/Manifest
+++ b/sys-fs/mergerfs/Manifest
@@ -1 +1,2 @@
 DIST mergerfs-2.28.3.tar.gz 294065 BLAKE2B 
2e59e00726aec53438d5a5df143ca204069794d68c663a130139102a19e118a54fede1c8eca99199a3e634ffa92cb21c25c30718ea0842826de8a64e876b2819
 SHA512 
5469b3515464680aa72fc393c218fb038bed31194a933e6736eec478d87a110979323308b642d7f100a5c506534ca75badf4a87a050007cdc77cd2a641217929
+DIST mergerfs-2.29.0.tar.gz 302391 BLAKE2B 
a7d051c63b12a95af2868d8b3be9b32aa1be3d9c4cc4e359914b07e18ed30dadece80861ad559d5cdd85b375f565b9e70dac9ad3e34b98c054dd54822897c1a6
 SHA512 
2c21dedffc2f261c6c8427af59cffcacacc9b67bce7bb9989bd5946aa645c68bac0f56250ec19710e586a00892f7198853390bea3ff5981035d5a492ae4569a2

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 000..97325c3ba21
--- /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
+}



[gentoo-commits] repo/gentoo:master commit in: sys-fs/mergerfs/

2020-03-07 Thread Piotr Karbowski
commit: 6158c8419d865a4ca24db06ebb459f563d43d603
Author: Piotr Karbowski  gentoo  org>
AuthorDate: Sat Mar  7 19:54:20 2020 +
Commit: Piotr Karbowski  gentoo  org>
CommitDate: Sat Mar  7 19:55:02 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6158c841

sys-fs/mergerfs-2.28.3-r1: amd64 stable (bug 711814)

Signed-off-by: Piotr Karbowski  gentoo.org>

 sys-fs/mergerfs/mergerfs-2.28.3-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/mergerfs/mergerfs-2.28.3-r1.ebuild 
b/sys-fs/mergerfs/mergerfs-2.28.3-r1.ebuild
index 00bac72e756..dbd6346bb90 100644
--- a/sys-fs/mergerfs/mergerfs-2.28.3-r1.ebuild
+++ b/sys-fs/mergerfs/mergerfs-2.28.3-r1.ebuild
@@ -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"



[gentoo-commits] repo/gentoo:master commit in: sys-fs/mergerfs/

2019-12-10 Thread Piotr Karbowski
commit: 545a598fa6398afa16ca88b539b7e3c4fc3a8882
Author: Piotr Karbowski  gentoo  org>
AuthorDate: Tue Dec 10 09:53:40 2019 +
Commit: Piotr Karbowski  gentoo  org>
CommitDate: Tue Dec 10 09:54:16 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=545a598f

sys-fs/mergerfs-2.28.3-r1: tidy

Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: Piotr Karbowski  gentoo.org>

 sys-fs/mergerfs/mergerfs-2.28.3-r1.ebuild | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/sys-fs/mergerfs/mergerfs-2.28.3-r1.ebuild 
b/sys-fs/mergerfs/mergerfs-2.28.3-r1.ebuild
index 56299cde8e1..00bac72e756 100644
--- a/sys-fs/mergerfs/mergerfs-2.28.3-r1.ebuild
+++ b/sys-fs/mergerfs/mergerfs-2.28.3-r1.ebuild
@@ -26,15 +26,15 @@ src_prepare() {
default
 
# drop -O2 from those handmade Makefiles.
-   sed -r '/^OPTS[ \t]*=/d' -i Makefile
+   sed -r '/^OPTS[ \t]*=/d' -i Makefile || die
 
# Hand made build system at it's finest.
-   echo -e "#!/bin/sh\ntrue" >tools/update-version
-   echo "#pragma once" >src/version.hpp
-   echo "static const char MERGERFS_VERSION[] = \"${PV}\";" 
>>src/version.hpp
+   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
+   sed 's%USE_XATTR = 1%USE_XATTR = 0%g' -i Makefile || die
fi
 }
 



[gentoo-commits] repo/gentoo:master commit in: sys-fs/mergerfs/

2019-12-10 Thread Piotr Karbowski
commit: 3ad7355ec93b413d50553d69faaa861c19874a27
Author: Piotr Karbowski  gentoo  org>
AuthorDate: Tue Dec 10 09:17:10 2019 +
Commit: Piotr Karbowski  gentoo  org>
CommitDate: Tue Dec 10 09:20:40 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ad7355e

sys-fs/mergerfs-2.28.3-r1: make xattr opt-out.

Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: Piotr Karbowski  gentoo.org>

 ...{mergerfs-2.28.3.ebuild => mergerfs-2.28.3-r1.ebuild} | 16 ++--
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/sys-fs/mergerfs/mergerfs-2.28.3.ebuild 
b/sys-fs/mergerfs/mergerfs-2.28.3-r1.ebuild
similarity index 82%
rename from sys-fs/mergerfs/mergerfs-2.28.3.ebuild
rename to sys-fs/mergerfs/mergerfs-2.28.3-r1.ebuild
index dbf35a85d89..56299cde8e1 100644
--- a/sys-fs/mergerfs/mergerfs-2.28.3.ebuild
+++ b/sys-fs/mergerfs/mergerfs-2.28.3-r1.ebuild
@@ -12,15 +12,15 @@ KEYWORDS="~amd64 ~x86"
 # Vendorized libfuse that's bundled is under LGPL-2.1.
 LICENSE="ISC LGPL-2.1"
 SLOT="0"
-IUSE=""
+IUSE="+xattr"
 
-RDEPEND="
-   sys-apps/attr
-   sys-apps/util-linux
-   sys-devel/gettext
+DEPEND="
+   xattr? ( sys-apps/attr )
 "
 
-DEPEND="${RDEPEND}"
+RDEPEND="${DEPEND}"
+
+BDEPEND="sys-devel/gettext"
 
 src_prepare() {
default
@@ -32,6 +32,10 @@ src_prepare() {
echo -e "#!/bin/sh\ntrue" >tools/update-version
echo "#pragma once" >src/version.hpp
echo "static const char MERGERFS_VERSION[] = \"${PV}\";" 
>>src/version.hpp
+
+   if ! use xattr; then
+   sed 's%USE_XATTR = 1%USE_XATTR = 0%g' -i Makefile
+   fi
 }
 
 src_install() {



[gentoo-commits] repo/gentoo:master commit in: sys-fs/mergerfs/

2019-12-09 Thread Piotr Karbowski
commit: 78440e9f92e34f0c4735e0e6f9b711eed915255a
Author: Piotr Karbowski  gentoo  org>
AuthorDate: Mon Dec  9 20:00:27 2019 +
Commit: Piotr Karbowski  gentoo  org>
CommitDate: Mon Dec  9 20:00:27 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78440e9f

sys-fs/mergerfs-2.28.3: added.

Package-Manager: Portage-2.3.80, Repoman-2.3.19
Signed-off-by: Piotr Karbowski  gentoo.org>

 sys-fs/mergerfs/Manifest   |  1 +
 sys-fs/mergerfs/mergerfs-2.28.3.ebuild | 42 ++
 sys-fs/mergerfs/metadata.xml   | 11 +
 3 files changed, 54 insertions(+)

diff --git a/sys-fs/mergerfs/Manifest b/sys-fs/mergerfs/Manifest
new file mode 100644
index 000..49068f2d933
--- /dev/null
+++ b/sys-fs/mergerfs/Manifest
@@ -0,0 +1 @@
+DIST mergerfs-2.28.3.tar.gz 294065 BLAKE2B 
2e59e00726aec53438d5a5df143ca204069794d68c663a130139102a19e118a54fede1c8eca99199a3e634ffa92cb21c25c30718ea0842826de8a64e876b2819
 SHA512 
5469b3515464680aa72fc393c218fb038bed31194a933e6736eec478d87a110979323308b642d7f100a5c506534ca75badf4a87a050007cdc77cd2a641217929

diff --git a/sys-fs/mergerfs/mergerfs-2.28.3.ebuild 
b/sys-fs/mergerfs/mergerfs-2.28.3.ebuild
new file mode 100644
index 000..dbf35a85d89
--- /dev/null
+++ b/sys-fs/mergerfs/mergerfs-2.28.3.ebuild
@@ -0,0 +1,42 @@
+# 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=""
+
+RDEPEND="
+   sys-apps/attr
+   sys-apps/util-linux
+   sys-devel/gettext
+"
+
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+   default
+
+   # drop -O2 from those handmade Makefiles.
+   sed -r '/^OPTS[ \t]*=/d' -i Makefile
+
+   # Hand made build system at it's finest.
+   echo -e "#!/bin/sh\ntrue" >tools/update-version
+   echo "#pragma once" >src/version.hpp
+   echo "static const char MERGERFS_VERSION[] = \"${PV}\";" 
>>src/version.hpp
+}
+
+src_install() {
+   dobin build/mergerfs
+   dosym mergerfs /usr/bin/mount.mergerfs
+   dodoc README.md
+   doman man/mergerfs.1
+}

diff --git a/sys-fs/mergerfs/metadata.xml b/sys-fs/mergerfs/metadata.xml
new file mode 100644
index 000..964e6eaa339
--- /dev/null
+++ b/sys-fs/mergerfs/metadata.xml
@@ -0,0 +1,11 @@
+
+http://www.gentoo.org/dtd/metadata.dtd;>
+
+   
+   slashbe...@gentoo.org
+   Piotr Karbowski
+   
+   
+   trapexit/mergerfs
+   
+