diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2008-04-20 00:39:26 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2008-04-20 00:39:26 +0000 |
| commit | e6bf091e422896dad0269b0e2d741a36a04910b0 (patch) | |
| tree | f75e06eca047bdff90b8085083f25bde40041a6c /net-fs | |
| parent | Version bump (diff) | |
| download | gentoo-2-e6bf091e422896dad0269b0e2d741a36a04910b0.tar.gz gentoo-2-e6bf091e422896dad0269b0e2d741a36a04910b0.tar.bz2 gentoo-2-e6bf091e422896dad0269b0e2d741a36a04910b0.zip | |
Only leverage kerberos when USE="-nonfsv4" #212160.
(Portage version: 2.2_pre5)
Diffstat (limited to 'net-fs')
| -rw-r--r-- | net-fs/nfs-utils/ChangeLog | 5 | ||||
| -rw-r--r-- | net-fs/nfs-utils/nfs-utils-1.1.1.ebuild | 23 |
2 files changed, 16 insertions, 12 deletions
diff --git a/net-fs/nfs-utils/ChangeLog b/net-fs/nfs-utils/ChangeLog index 1f78d6f6fd76..fed52276c298 100644 --- a/net-fs/nfs-utils/ChangeLog +++ b/net-fs/nfs-utils/ChangeLog @@ -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@gentoo.org> nfs-utils-1.1.1.ebuild: + Only leverage kerberos when USE="-nonfsv4" #212160. 20 Apr 2008; Mike Frysinger <vapier@gentoo.org> files/nfsmount.initd: Fix nfs4/idmapd detection #213384 by Marek Szuba. diff --git a/net-fs/nfs-utils/nfs-utils-1.1.1.ebuild b/net-fs/nfs-utils/nfs-utils-1.1.1.ebuild index 85ce10a82958..a87170e0211c 100644 --- a/net-fs/nfs-utils/nfs-utils-1.1.1.ebuild +++ b/net-fs/nfs-utils/nfs-utils-1.1.1.ebuild @@ -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 @@ RDEPEND="tcpd? ( sys-apps/tcp-wrappers ) !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 @@ src_compile() { --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 @@ src_install() { 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 |