From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9C3B213835A for ; Tue, 26 Jan 2021 14:33:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D3F5FE0CE3; Tue, 26 Jan 2021 14:33:45 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B9A9DE0CE3 for ; Tue, 26 Jan 2021 14:33:45 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8ED93341088 for ; Tue, 26 Jan 2021 14:33:44 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B31814AC for ; Tue, 26 Jan 2021 14:33:41 +0000 (UTC) From: "Joonas Niilola" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Joonas Niilola" Message-ID: <1611671611.f6144add034568402a00880970315b3b0977503e.juippis@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-cluster/glusterfs/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-cluster/glusterfs/glusterfs-7.9.ebuild sys-cluster/glusterfs/glusterfs-8.3.ebuild sys-cluster/glusterfs/glusterfs-9.0.ebuild X-VCS-Directories: sys-cluster/glusterfs/ X-VCS-Committer: juippis X-VCS-Committer-Name: Joonas Niilola X-VCS-Revision: f6144add034568402a00880970315b3b0977503e X-VCS-Branch: master Date: Tue, 26 Jan 2021 14:33:41 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: a7aee69c-d111-4a72-95f7-4dccc58f2b17 X-Archives-Hash: 0ab7fcfd70cd25c8502d8e4cfea8caf2 commit: f6144add034568402a00880970315b3b0977503e Author: Joonas Niilola gentoo org> AuthorDate: Tue Jan 26 14:32:07 2021 +0000 Commit: Joonas Niilola gentoo 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 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