[gentoo-commits] repo/gentoo:master commit in: net-fs/nfs-utils/

[Lars Wendler]

commit:     dfe4516e30d2ebed52b8be9bd4dfeaf69db8dab2
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Nov  7 10:00:35 2017 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Nov  7 10:00:50 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dfe4516e

net-fs/nfs-utils: Block net-libs/libnfsidmap.

Bug: https://bugs.gentoo.org/636768
Package-Manager: Portage-2.3.13, Repoman-2.3.4

 net-fs/nfs-utils/nfs-utils-2.2.2_rc1.ebuild | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/net-fs/nfs-utils/nfs-utils-2.2.2_rc1.ebuild b/net-fs/nfs-utils/nfs-utils-2.2.2_rc1.ebuild
index 133e06869f0..303afc7ed96 100644
--- a/net-fs/nfs-utils/nfs-utils-2.2.2_rc1.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.2.2_rc1.ebuild
@@ -28,30 +28,30 @@ RESTRICT="test" #315573
 # files, and nfs-utils doesn't build against heimdal either,
 # so don't depend on virtual/krb.
 # (04 Feb 2005 agriffis)
-DEPEND_COMMON="tcpd? ( sys-apps/tcp-wrappers )
-	caps? ( sys-libs/libcap )
-	sys-libs/e2fsprogs-libs
-	>=net-nds/rpcbind-0.2.4
+DEPEND_COMMON="
 	net-libs/libtirpc:=
+	>=net-nds/rpcbind-0.2.4
+	sys-libs/e2fsprogs-libs
+	caps? ( sys-libs/libcap )
 	libmount? ( sys-apps/util-linux )
 	nfsdcld? ( >=dev-db/sqlite-3.3 )
 	nfsv4? (
 		dev-libs/libevent:=
-		>=net-libs/libnfsidmap-0.21-r1
 		kerberos? (
 			>=net-libs/libtirpc-0.2.4-r1[kerberos]
 			app-crypt/mit-krb5
 		)
 		nfsidmap? (
-			>=net-libs/libnfsidmap-0.24
 			>=sys-apps/keyutils-1.5.9
 		)
 	)
 	nfsv41? (
 		sys-fs/lvm2
 	)
+	tcpd? ( sys-apps/tcp-wrappers )
 	uuid? ( sys-apps/util-linux )"
 RDEPEND="${DEPEND_COMMON}
+	!net-libs/libnfsidmap
 	!net-nds/portmap
 	!<sys-apps/openrc-0.13.9
 	selinux? (