sep nfs4 and kerberos logic ... you dont need kerberos for nfs4

Package-Manager: portage-2.0.51.19

3 files changed, 26 insertions, 30 deletions

diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest
index 8c6895e565c5..9c95d6c87927 100644
--- a/net-fs/nfs-utils/Manifest
+++ b/net-fs/nfs-utils/Manifest
@@ -1,8 +1,8 @@
 MD5 0bf4e0b17c916406a441b8d5e2ca8308 ChangeLog 9781
 MD5 9cee4adcef8a47ea4ee35090f7f89b0a metadata.xml 225
 MD5 7f85ee70d102141816130bdc7cea5fa0 nfs-utils-1.0.6-r6.ebuild 3021
-MD5 ffecda0b82d72d11811f2282b355c709 nfs-utils-1.0.7.ebuild 2884
-MD5 28aff43d6059a5645973388f8e4b9d5f files/nfs 5297
+MD5 d35b63443f735e275ff9937e4f463dd7 nfs-utils-1.0.7.ebuild 2905
+MD5 d8ecaecabf0d9c9bfb7d6c437e59bf5f files/nfs 5278
 MD5 46e91b0dea9cbbfedcdccc9386b6326d files/digest-nfs-utils-1.0.7 67
 MD5 a02eed87e5d581e56feb0f6dfd18e6df files/exports 66
 MD5 a23ae1dac684526aeaa679372648f9bf files/nfs.confd 616
diff --git a/net-fs/nfs-utils/files/nfs b/net-fs/nfs-utils/files/nfs
index 2639cb6f9368..566fcea761b9 100755
--- a/net-fs/nfs-utils/files/nfs
+++ b/net-fs/nfs-utils/files/nfs
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/nfs,v 1.8 2004/11/14 02:34:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/nfs,v 1.9 2005/03/15 05:23:38 vapier Exp $
 
 #---------------------------------------------------------------------------
 # This script starts/stops the following
@@ -13,7 +13,7 @@
 
 # NB: Config is in /etc/conf.d/nfs
 
-opts="start stop restart reload"
+opts="reload"
 
 # This variable is used for controlling whether or not to run exportfs -ua;
 # see stop() for more information
diff --git a/net-fs/nfs-utils/nfs-utils-1.0.7.ebuild b/net-fs/nfs-utils/nfs-utils-1.0.7.ebuild
index e13a358c18dc..41de5e22f237 100644
--- a/net-fs/nfs-utils/nfs-utils-1.0.7.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-1.0.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.0.7.ebuild,v 1.2 2005/03/15 04:44:54 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.0.7.ebuild,v 1.3 2005/03/15 05:23:38 vapier Exp $
 
 inherit gnuconfig eutils flag-o-matic
 
@@ -11,18 +11,18 @@ SRC_URI="mirror://sourceforge/nfs/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="nfsv4 tcpd"
+IUSE="nonfsv4 tcpd"
 
 RDEPEND="tcpd? ( sys-apps/tcp-wrappers )
 	>=net-nds/portmap-5b-r6
 	>=sys-apps/util-linux-2.11f"
 DEPEND="${RDEPEND}
 	>=sys-apps/portage-2.0.51
-	nfsv4? (
+	!nonfsv4? (
 		>=dev-libs/libevent-1.0b
 		>=net-libs/nfsidmap-0.9
-		app-crypt/mit-krb5
-	)"
+	)
+	kerberos? ( app-crypt/mit-krb5 )"
 	# kth-krb doesn't provide the right include
 	# files, and nfs-utils doesn't build against heimdal either, 
 	# so don't depend on virtual/krb.
@@ -30,30 +30,30 @@ DEPEND="${RDEPEND}
 
 src_unpack() {
 	unpack ${A}
+	cd "${S}"
 
 	# getrpcbynumber_r is not in the SuSv3 spec. disable it for uClibc
-	cd ${S}
-	epatch ${FILESDIR}/nfs-utils-1.0.6-uclibc.patch
+	epatch "${FILESDIR}"/nfs-utils-1.0.6-uclibc.patch
 
 	# since the usn36 patch is now integrated (at least the parts we care about)
 	# into 1.0.7, we need to re-apply the rquoted patch (04 Feb 2005 agriffis)
-	epatch ${FILESDIR}/nfs-utils-0.3.3-rquotad-overflow.patch
+	epatch "${FILESDIR}"/nfs-utils-0.3.3-rquotad-overflow.patch
+
+	sed -i 's:@mandir@:$(install_prefix)@mandir@:' config.mk.in
 }
 
 src_compile() {
-	append-flags -I/usr/include/heimdal
-
 	econf \
 		--mandir=/usr/share/man \
 		--with-statedir=/var/lib/nfs \
 		--disable-rquotad \
 		--enable-nfsv3 \
 		--enable-secure-statd \
-		$(use_enable nfsv4) \
-		$(use_enable nfsv4 gss) \
+		$(use_enable !nonfsv4 nfsv4) \
+		$(use_enable kerberos gss) \
 		|| die "Configure failed"
 
-	if ! use tcpd; then
+	if ! use tcpd ; then
 		sed -i "s:\(-lwrap\|-DHAVE_TCP_WRAPPER\)::" config.mk
 	fi
 
@@ -63,31 +63,27 @@ src_compile() {
 }
 
 src_install() {
-	make \
-		install_prefix=${D} \
-		MANDIR=${D}/usr/share/man \
-		install \
-		|| die "Failed to install"
+	make install_prefix="${D}" install || die
 
 	# Don't overwrite existing xtab/etab, install the original
 	# versions somewhere safe...  more info in pkg_postinst
 	dodir /usr/lib/nfs
 	keepdir /var/lib/nfs/{sm,sm.bak}
-	mv ${D}/var/lib/nfs/* ${D}/usr/lib/nfs
+	mv "${D}"/var/lib/nfs/* "${D}"/usr/lib/nfs
 	keepdir /var/lib/nfs
 	keepdir /var/lib/nfs/v4root
 
 	# Install some client-side binaries in /sbin
 	dodir /sbin
-	mv ${D}/usr/sbin/rpc.{lockd,statd} ${D}/sbin/
+	mv "${D}"/usr/sbin/rpc.{lockd,statd} "${D}"/sbin/
 
 	dodoc ChangeLog README
 	docinto linux-nfs ; dodoc linux-nfs/*
 
-	insinto /etc ; doins ${FILESDIR}/exports
+	insinto /etc ; doins "${FILESDIR}"/exports
 
-	doinitd ${FILESDIR}/nfs ${FILESDIR}/nfsmount
-	newconfd ${FILESDIR}/nfs.confd nfs
+	doinitd "${FILESDIR}"/nfs "${FILESDIR}"/nfsmount
+	newconfd "${FILESDIR}"/nfs.confd nfs
 }
 
 pkg_postinst() {
@@ -96,9 +92,9 @@ pkg_postinst() {
 	# the daemons actually use the files in /var/lib/nfs.  This fixes
 	# bug 30486
 	local f
-	for f in ${ROOT}/usr/lib/nfs/*; do
+	for f in "${ROOT}"/usr/lib/nfs/*; do
 		[[ -f ${ROOT}/var/lib/nfs/${f##*/} ]] && continue
 		einfo "Copying default ${f##*/} from /usr/lib/nfs to /var/lib/nfs"
-		cp -a ${f} ${ROOT}/var/lib/nfs/
+		cp -a ${f} "${ROOT}"/var/lib/nfs/
 	done
 }