[gentoo-commits] gentoo-x86 commit in net-fs/nfs-utils: ChangeLog nfs-utils-1.1.1.ebuild

[Mike Frysinger (vapier)]

vapier      08/04/20 00:39:26

  Modified:             ChangeLog nfs-utils-1.1.1.ebuild
  Log:
  Only leverage kerberos when USE="-nonfsv4" #212160.
  (Portage version: 2.2_pre5)

Revision  Changes    Path
1.120                net-fs/nfs-utils/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/nfs-utils/ChangeLog?rev=1.120&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/nfs-utils/ChangeLog?rev=1.120&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/nfs-utils/ChangeLog?r1=1.119&r2=1.120

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- ChangeLog	20 Apr 2008 00:06:28 -0000	1.119
+++ ChangeLog	20 Apr 2008 00:39:26 -0000	1.120
@@ -1,6 +1,9 @@
 # ChangeLog for net-fs/nfs-utils
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.119 2008/04/20 00:06:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.120 2008/04/20 00:39:26 vapier Exp $
+
+  20 Apr 2008; Mike Frysinger <vapier@g.o> nfs-utils-1.1.1.ebuild:
+  Only leverage kerberos when USE="-nonfsv4" #212160.
 
   20 Apr 2008; Mike Frysinger <vapier@g.o> files/nfsmount.initd:
   Fix nfs4/idmapd detection #213384 by Marek Szuba.



1.2                  net-fs/nfs-utils/nfs-utils-1.1.1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.1.1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.1.1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.1.1.ebuild?r1=1.1&r2=1.2

Index: nfs-utils-1.1.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.1.1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nfs-utils-1.1.1.ebuild	29 Dec 2007 09:33:27 -0000	1.1
+++ nfs-utils-1.1.1.ebuild	20 Apr 2008 00:39:26 -0000	1.2
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.1.1.ebuild,v 1.1 2007/12/29 09:33:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.1.1.ebuild,v 1.2 2008/04/20 00:39:26 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -24,11 +24,11 @@
 	!nonfsv4? (
 		>=dev-libs/libevent-1.0b
 		>=net-libs/libnfsidmap-0.16
-	)
-	kerberos? (
-		net-libs/librpcsecgss
-		net-libs/libgssglue
-		app-crypt/mit-krb5
+		kerberos? (
+			net-libs/librpcsecgss
+			net-libs/libgssglue
+			app-crypt/mit-krb5
+		)
 	)"
 # util-linux dep is to prevent man-page collision
 DEPEND="${RDEPEND}
@@ -53,9 +53,8 @@
 		--enable-secure-statd \
 		$(use_with tcpd tcp-wrappers) \
 		$(use_enable !nonfsv4 nfsv4) \
-		$(use_enable kerberos gss) \
+		$(use !nonfsv4 && use_enable kerberos gss) \
 		|| die "Configure failed"
-
 	emake || die "Failed to compile"
 }
 
@@ -80,8 +79,10 @@
 	doins "${FILESDIR}"/exports
 
 	local f list=""
-	use !nonfsv4 && list="${list} rpc.idmapd"
-	use kerberos && list="${list} rpc.gssd"
+	if use !nonfsv4 ; then
+		list="${list} rpc.idmapd"
+		use kerberos && list="${list} rpc.gssd"
+	fi
 	for f in nfs nfsmount rpc.statd ${list} ; do
 		newinitd "${FILESDIR}"/${f}.initd ${f} || die "doinitd ${f}"
 	done



-- 
gentoo-commits@l.g.o mailing list