[gentoo-commits] repo/gentoo:master commit in: sys-cluster/glusterfs/

[Joonas Niilola]

commit:     f6144add034568402a00880970315b3b0977503e
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 26 14:32:07 2021 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Jan 26 14:33:31 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6144add

sys-cluster/glusterfs: fix sed calls and REQUIRED_USE

Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 sys-cluster/glusterfs/glusterfs-7.9.ebuild | 4 ++--
 sys-cluster/glusterfs/glusterfs-8.3.ebuild | 6 +++---
 sys-cluster/glusterfs/glusterfs-9.0.ebuild | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/sys-cluster/glusterfs/glusterfs-7.9.ebuild 
b/sys-cluster/glusterfs/glusterfs-7.9.ebuild
index 94f95dbff0d..3b847b2aa4a 100644
--- a/sys-cluster/glusterfs/glusterfs-7.9.ebuild
+++ b/sys-cluster/glusterfs/glusterfs-7.9.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
@@ -89,7 +89,7 @@ src_prepare() {
 
        # build rpc-transport and xlators only once as shared libs
        find rpc/rpc-transport xlators -name Makefile.am -exec \
-               sed -i 's|.*$(top_srcdir).*\.sym|\0 -shared|' || die
+               sed -i 's|.*$(top_srcdir).*\.sym|\0 -shared|' {} + || die
 
        # fix execution permissions
        chmod +x libglusterfs/src/gen-defaults.py || die

diff --git a/sys-cluster/glusterfs/glusterfs-8.3.ebuild 
b/sys-cluster/glusterfs/glusterfs-8.3.ebuild
index c5d8012fd77..f8603e0e9ea 100644
--- a/sys-cluster/glusterfs/glusterfs-8.3.ebuild
+++ b/sys-cluster/glusterfs/glusterfs-8.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
@@ -22,7 +22,7 @@ LICENSE="|| ( GPL-2 LGPL-3+ )"
 SLOT="0/${PV%%.*}"
 IUSE="debug emacs +fuse +georeplication ipv6 libressl +libtirpc rsyslog 
static-libs +syslog test +xml"
 
-REQUIRED_USE="georeplication? ( ${PYTHON_REQUIRED_USE} )
+REQUIRED_USE="georeplication? ( ${PYTHON_REQUIRED_USE} xml )
        ipv6? ( libtirpc )"
 
 # the tests must be run as root
@@ -84,7 +84,7 @@ src_prepare() {
 
        # build rpc-transport and xlators only once as shared libs
        find rpc/rpc-transport xlators -name Makefile.am -exec \
-               sed -i 's|.*$(top_srcdir).*\.sym|\0 -shared|' || die
+               sed -i 's|.*$(top_srcdir).*\.sym|\0 -shared|' {} + || die
 
        # fix execution permissions
        chmod +x libglusterfs/src/gen-defaults.py || die

diff --git a/sys-cluster/glusterfs/glusterfs-9.0.ebuild 
b/sys-cluster/glusterfs/glusterfs-9.0.ebuild
index c5d8012fd77..f8603e0e9ea 100644
--- a/sys-cluster/glusterfs/glusterfs-9.0.ebuild
+++ b/sys-cluster/glusterfs/glusterfs-9.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
@@ -22,7 +22,7 @@ LICENSE="|| ( GPL-2 LGPL-3+ )"
 SLOT="0/${PV%%.*}"
 IUSE="debug emacs +fuse +georeplication ipv6 libressl +libtirpc rsyslog 
static-libs +syslog test +xml"
 
-REQUIRED_USE="georeplication? ( ${PYTHON_REQUIRED_USE} )
+REQUIRED_USE="georeplication? ( ${PYTHON_REQUIRED_USE} xml )
        ipv6? ( libtirpc )"
 
 # the tests must be run as root
@@ -84,7 +84,7 @@ src_prepare() {
 
        # build rpc-transport and xlators only once as shared libs
        find rpc/rpc-transport xlators -name Makefile.am -exec \
-               sed -i 's|.*$(top_srcdir).*\.sym|\0 -shared|' || die
+               sed -i 's|.*$(top_srcdir).*\.sym|\0 -shared|' {} + || die
 
        # fix execution permissions
        chmod +x libglusterfs/src/gen-defaults.py || die