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

[Mike Frysinger (vapier)]

vapier      11/09/02 19:27:13

  Modified:             metadata.xml ChangeLog nfs-utils-1.2.4.ebuild
  Log:
  Add USE="nfsidmap nfsv41" to control new deps and features #381459 by Krzysztof Pawlik.
  
  (Portage version: 2.2.0_alpha51/cvs/Linux x86_64)

Revision  Changes    Path
1.4                  net-fs/nfs-utils/metadata.xml

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/nfs-utils/metadata.xml?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/nfs-utils/metadata.xml?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/nfs-utils/metadata.xml?r1=1.3&r2=1.4

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/metadata.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- metadata.xml	30 May 2009 21:47:12 -0000	1.3
+++ metadata.xml	2 Sep 2011 19:27:13 -0000	1.4
@@ -4,8 +4,10 @@
 <herd>net-fs</herd>
 	<longdescription>NFS client and server daemons</longdescription>
 	<use>
+		<flag name='nfsidmap'>Enable support for newer nfsidmap helper</flag>
 		<flag name='nfsv3'>Enable support for NFSv3</flag>
 		<flag name='nfsv4'>Enable support for NFSv4</flag>
+		<flag name='nfsv41'>Enable support for NFSv4.1</flag>
 		<flag name='nonfsv4'>Disable support for NFSv4</flag>
 	</use>
 </pkgmetadata>



1.187                net-fs/nfs-utils/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/nfs-utils/ChangeLog?rev=1.187&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/nfs-utils/ChangeLog?rev=1.187&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/nfs-utils/ChangeLog?r1=1.186&r2=1.187

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -r1.186 -r1.187
--- ChangeLog	1 Sep 2011 23:10:15 -0000	1.186
+++ ChangeLog	2 Sep 2011 19:27:13 -0000	1.187
@@ -1,6 +1,11 @@
 # ChangeLog for net-fs/nfs-utils
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.186 2011/09/01 23:10:15 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.187 2011/09/02 19:27:13 vapier Exp $
+
+  02 Sep 2011; Mike Frysinger <vapier@g.o> nfs-utils-1.2.4.ebuild,
+  +files/nfs-utils-1.2.4-nfsidmap.patch, metadata.xml:
+  Add USE="nfsidmap nfsv41" to control new deps and features #381459 by
+  Krzysztof Pawlik.
 
   01 Sep 2011; Diego E. Pettenò <flameeyes@g.o> nfs-utils-1.2.4.ebuild,
   +files/nfs-utils-1.2.4-conditional.patch:



1.3                  net-fs/nfs-utils/nfs-utils-1.2.4.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.2.4.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.2.4.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.2.4.ebuild?r1=1.2&r2=1.3

Index: nfs-utils-1.2.4.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.2.4.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nfs-utils-1.2.4.ebuild	1 Sep 2011 23:10:15 -0000	1.2
+++ nfs-utils-1.2.4.ebuild	2 Sep 2011 19:27:13 -0000	1.3
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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.2.4.ebuild,v 1.2 2011/09/01 23:10:15 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.2.4.ebuild,v 1.3 2011/09/02 19:27:13 vapier Exp $
 
 EAPI="2"
 
@@ -13,7 +13,7 @@
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="caps ipv6 kerberos +nfsv3 +nfsv4 tcpd elibc_glibc"
+IUSE="caps ipv6 kerberos nfsidmap +nfsv3 +nfsv4 nfsv41 tcpd elibc_glibc"
 RESTRICT="test" #315573
 
 # kth-krb doesn't provide the right include
@@ -34,6 +34,10 @@
 			net-libs/libtirpc[kerberos]
 			app-crypt/mit-krb5
 		)
+		nfsidmap? (
+			>=net-libs/libnfsidmap-0.24
+			sys-apps/keyutils
+		)
 	)"
 RDEPEND="${DEPEND_COMMON} !net-nds/portmap"
 # util-linux dep is to prevent man-page collision
@@ -42,19 +46,22 @@
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-1.1.4-mtab-sym.patch
-	epatch "${FILESDIR}"/${PN}-1.2.4-exportfs-xlog.patch
-	epatch "${FILESDIR}"/${PN}-1.2.4-exportfs-skip-dir.patch
-	epatch "${FILESDIR}"/${PN}-1.2.4-conditional.patch
+	epatch "${FILESDIR}"/${P}-exportfs-xlog.patch
+	epatch "${FILESDIR}"/${P}-exportfs-skip-dir.patch
+	epatch "${FILESDIR}"/${P}-conditional.patch
+	epatch "${FILESDIR}"/${PN}-1.2.4-nfsidmap.patch
 	eautoreconf
 }
 
 src_configure() {
+	export ac_cv_header_keyutils_h=$(use nfsidmap && echo yes || echo no)
 	econf \
 		--with-statedir=/var/lib/nfs \
 		--enable-tirpc \
 		$(use_with tcpd tcp-wrappers) \
 		$(use_enable nfsv3) \
 		$(use_enable nfsv4) \
+		$(use_enable nfsv41) \
 		$(use_enable ipv6) \
 		$(use_enable caps) \
 		$(use nfsv4 && use_enable kerberos gss || echo "--disable-gss")