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 B48C21396DB for ; Tue, 21 Nov 2017 20:44:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5BB0FE0ECC; Tue, 21 Nov 2017 20:44:01 +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 37932E0ECC for ; Tue, 21 Nov 2017 20:44:01 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 E62FF33D3CE for ; Tue, 21 Nov 2017 20:43:59 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7466BA2E0 for ; Tue, 21 Nov 2017 20:43:58 +0000 (UTC) From: "James Le Cuirot" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "James Le Cuirot" Message-ID: <1511297017.e883188ceef6ae30b7c8e93f6f1e3543abca152e.chewi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-cluster/glusterfs/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-cluster/glusterfs/glusterfs-3.12.2.ebuild X-VCS-Directories: sys-cluster/glusterfs/ X-VCS-Committer: chewi X-VCS-Committer-Name: James Le Cuirot X-VCS-Revision: e883188ceef6ae30b7c8e93f6f1e3543abca152e X-VCS-Branch: master Date: Tue, 21 Nov 2017 20:43:58 +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-Archives-Salt: cbd57ad9-a8f5-4bc9-8514-b0b50e0625d4 X-Archives-Hash: 0c088076f9b56dd0d0b3355aadd88afa commit: e883188ceef6ae30b7c8e93f6f1e3543abca152e Author: James Le Cuirot gentoo org> AuthorDate: Sun Nov 19 13:31:17 2017 +0000 Commit: James Le Cuirot gentoo org> CommitDate: Tue Nov 21 20:43:37 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e883188c sys-cluster/glusterfs: Use elibc_glibc flag instead of || ( glibc ) This is probably simpler for Portage. Package-Manager: Portage-2.3.14, Repoman-2.3.6 sys-cluster/glusterfs/glusterfs-3.12.2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-cluster/glusterfs/glusterfs-3.12.2.ebuild b/sys-cluster/glusterfs/glusterfs-3.12.2.ebuild index dc1e9dfbba1..18dba1d6b93 100644 --- a/sys-cluster/glusterfs/glusterfs-3.12.2.ebuild +++ b/sys-cluster/glusterfs/glusterfs-3.12.2.ebuild @@ -24,6 +24,7 @@ RESTRICT="test" # sys-apps/util-linux is required for libuuid RDEPEND="bd-xlator? ( sys-fs/lvm2 ) + !elibc_glibc? ( sys-libs/argp-standalone ) emacs? ( virtual/emacs ) fuse? ( >=sys-fs/fuse-2.7.0:0 ) georeplication? ( ${PYTHON_DEPS} ) @@ -38,7 +39,6 @@ RDEPEND="bd-xlator? ( sys-fs/lvm2 ) dev-libs/libaio dev-libs/openssl:=[-bindist] dev-libs/userspace-rcu:= - || ( sys-libs/glibc sys-libs/argp-standalone ) net-libs/rpcsvc-proto sys-apps/util-linux" DEPEND="${RDEPEND}