commit:     b9f7df9e9c531dd6d7f29b315cd1af6a5a48d854
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 11 17:27:51 2020 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> 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 <floppym <AT> 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[@]}"
 }
 

Reply via email to