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 8F768138350 for ; Sat, 11 Jan 2020 17:36:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4AA52E095D; Sat, 11 Jan 2020 17:36:44 +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 E326CE095D for ; Sat, 11 Jan 2020 17:36:43 +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 2643F34DE05 for ; Sat, 11 Jan 2020 17:36:42 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8D7B12B for ; Sat, 11 Jan 2020 17:36:39 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1578764168.b9f7df9e9c531dd6d7f29b315cd1af6a5a48d854.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-nds/rpcbind/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-nds/rpcbind/rpcbind-1.2.5-r1.ebuild net-nds/rpcbind/rpcbind-9999.ebuild X-VCS-Directories: net-nds/rpcbind/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: b9f7df9e9c531dd6d7f29b315cd1af6a5a48d854 X-VCS-Branch: master Date: Sat, 11 Jan 2020 17:36:39 +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: 03179996-7881-4796-81f8-61313488e607 X-Archives-Hash: 8c06d308fa184881913079b2ccf99ac0 commit: b9f7df9e9c531dd6d7f29b315cd1af6a5a48d854 Author: Mike Gilbert gentoo org> AuthorDate: Sat Jan 11 17:27:51 2020 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Sat Jan 11 17:36:08 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9f7df9e net-nds/rpcbind: fix detection of rpcsvc/mount.h Dropped ~riscv keyword due to sys-fs/quota. Closes: https://bugs.gentoo.org/665222 Package-Manager: Portage-2.3.84_p2, Repoman-2.3.20_p24 Signed-off-by: Mike Gilbert gentoo.org> .../rpcbind/{rpcbind-9999.ebuild => rpcbind-1.2.5-r1.ebuild} | 10 ++++++++-- net-nds/rpcbind/rpcbind-9999.ebuild | 10 ++++++++-- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/net-nds/rpcbind/rpcbind-9999.ebuild b/net-nds/rpcbind/rpcbind-1.2.5-r1.ebuild similarity index 84% copy from net-nds/rpcbind/rpcbind-9999.ebuild copy to net-nds/rpcbind/rpcbind-1.2.5-r1.ebuild index 7e3bbeae8e8..59bcc41863e 100644 --- a/net-nds/rpcbind/rpcbind-9999.ebuild +++ b/net-nds/rpcbind/rpcbind-1.2.5-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit systemd +inherit flag-o-matic systemd if [[ ${PV} == "9999" ]] ; then EGIT_REPO_URI="git://linux-nfs.org/~steved/rpcbind.git" @@ -25,6 +25,7 @@ CDEPEND=">=net-libs/libtirpc-0.2.3:= systemd? ( sys-apps/systemd:= ) tcpd? ( sys-apps/tcp-wrappers )" DEPEND="${CDEPEND} + sys-fs/quota[rpc] virtual/pkgconfig" RDEPEND="${CDEPEND} selinux? ( sec-policy/selinux-rpcbind )" @@ -45,6 +46,11 @@ src_configure() { $(use_enable warmstarts) $(use_enable tcpd libwrap) ) + + # Allow configure to find /usr/include/rpc/rpc.h in rpcsvc/mount.h + # https://bugs.gentoo.org/665222 + append-cppflags "$($(tc-getPKG_CONFIG) --cflags libtirpc)" + econf "${myeconfargs[@]}" } diff --git a/net-nds/rpcbind/rpcbind-9999.ebuild b/net-nds/rpcbind/rpcbind-9999.ebuild index 7e3bbeae8e8..59bcc41863e 100644 --- a/net-nds/rpcbind/rpcbind-9999.ebuild +++ b/net-nds/rpcbind/rpcbind-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit systemd +inherit flag-o-matic systemd if [[ ${PV} == "9999" ]] ; then EGIT_REPO_URI="git://linux-nfs.org/~steved/rpcbind.git" @@ -25,6 +25,7 @@ CDEPEND=">=net-libs/libtirpc-0.2.3:= systemd? ( sys-apps/systemd:= ) tcpd? ( sys-apps/tcp-wrappers )" DEPEND="${CDEPEND} + sys-fs/quota[rpc] virtual/pkgconfig" RDEPEND="${CDEPEND} selinux? ( sec-policy/selinux-rpcbind )" @@ -45,6 +46,11 @@ src_configure() { $(use_enable warmstarts) $(use_enable tcpd libwrap) ) + + # Allow configure to find /usr/include/rpc/rpc.h in rpcsvc/mount.h + # https://bugs.gentoo.org/665222 + append-cppflags "$($(tc-getPKG_CONFIG) --cflags libtirpc)" + econf "${myeconfargs[@]}" }