Version bump #416189 by teidakankan.

Package-Manager: portage-2.2.0_alpha102/cvs/Linux x86_64

6 files changed, 280 insertions, 3 deletions

diff --git a/net-fs/nfs-utils/ChangeLog b/net-fs/nfs-utils/ChangeLog
index 26ca457c293b..da034388d4e2 100644
--- a/net-fs/nfs-utils/ChangeLog
+++ b/net-fs/nfs-utils/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-fs/nfs-utils
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.197 2012/05/03 04:06:33 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.198 2012/05/17 05:42:16 vapier Exp $
+
+*nfs-utils-1.2.6 (17 May 2012)
+
+  17 May 2012; Mike Frysinger <vapier@gentoo.org>
+  +files/nfs-utils-1.2.6-cross-build.patch,
+  +files/nfs-utils-1.2.6-osd-install.patch, +nfs-utils-1.2.6.ebuild,
+  metadata.xml:
+  Version bump #416189 by teidakankan.
 
   03 May 2012; Jeff Horelick <jdhore@gentoo.org> nfs-utils-1.2.4.ebuild,
   nfs-utils-1.2.5.ebuild:
diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest
index 929ab50b956c..f8460720013a 100644
--- a/net-fs/nfs-utils/Manifest
+++ b/net-fs/nfs-utils/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX exports 66 RMD160 0a61ad40dc321be39fb54d5b9fe717caa714e878 SHA1 52ed6b74643e084cfc17ff4638c2e06c86602034 SHA256 5d6356df546682e2f1a87131d1bb67de9b1f9a34d3a5742343dc64e890cf71d5
 AUX nfs-utils-1.1.4-ascii-man.patch 571 RMD160 614759d4a361db8ab6ee8c8ee87fc8a93a5e6052 SHA1 745322de9b26acec667d7acf8764f12388e3a046 SHA256 5f1cd9789b4963df22df914f61a33412d61d3c8fdde9b71b8c9dd4c2506852f7
 AUX nfs-utils-1.1.4-mtab-sym.patch 1020 RMD160 72c6ebb9d02ec544b5b2d7ad3ad0c8035d248eb1 SHA1 50db1976ac25607faf8f003573f9d8529e5b4de6 SHA256 0232799d085151649a1eb1f31644105de7e5cfba888794354005499a0db277c3
@@ -12,6 +15,8 @@ AUX nfs-utils-1.2.4-exportfs-skip-dir.patch 1079 RMD160 062c6897c9d939df8b4b6bb1
 AUX nfs-utils-1.2.4-exportfs-xlog.patch 1757 RMD160 0da3208e243bcd794faa9e189fbd983dd949fa3f SHA1 9081b7b193d3e54ef246c5dc96b6d650699a536d SHA256 b9a7bcb4c4f619dee1b4a7faabbeb07875ff0e8ba04a97a77cd4cd2dbaac51ce
 AUX nfs-utils-1.2.4-nfsidmap.patch 1925 RMD160 f11d80ee9ce99beb250301573630b2a6710d6892 SHA1 7b7ff10bcc2b053e3cd6fc9897a5238eb9cf726a SHA256 ae15774002b877a75376c176bb313ca950100ba95be2d1641b1dacb8aaa0c33c
 AUX nfs-utils-1.2.4-no-nfsctl.patch 1043 RMD160 d9762cf7441c91df4ac64cb57023845ebe7fe124 SHA1 cbb5c5b35b3fae789f0b47e64825b42993e499ce SHA256 cb2f92895762337e377989835a360f423f6f0e3e2b4a82bde600496da16631b5
+AUX nfs-utils-1.2.6-cross-build.patch 1909 RMD160 d0e7ffc502491461745997249bea29ce3425b2ea SHA1 9644a4f4b672f11a87c665105690fd38f7c1167f SHA256 847f22436f8f389c390beb9bc99195cad182910eff68769317a5dd9902f8c0ab
+AUX nfs-utils-1.2.6-osd-install.patch 1726 RMD160 f1b422631f27dd7183ec2fb0f4e0075ca3872e44 SHA1 262b59666989caf11af1abfceb4e361b7bfed8ac SHA256 04ee2915fcba7c9d459b0f1b701314ad997e61e6898dda03fe670f63113cf155
 AUX nfs.confd 948 RMD160 eee237aeb641e823d3b505371faf8c4a33582a51 SHA1 bf296a1ea20478d729307496b2d34299a493168c SHA256 22bba4ee5d58bae422650875c7c8a797a52fc121ddd02d48297c075b8a35401e
 AUX nfs.initd 4337 RMD160 3ab7f3d0558078a247b68d6018f6b8ac208eb4d8 SHA1 d3e5da7320ff67673b23570a9e14c28c76169acd SHA256 1a29bd99e30b02b3f0af7438856c83cde23f261f940895841f6154d4f9b244b0
 AUX nfsmount.initd 1130 RMD160 7ac01f228fcd9539e11cf200a0ba2ed82987a91b SHA1 1f4bfd0155489b6ce2e044f34d057c222202b1bb SHA256 4d6965abb56b72bdcd18cbf900b6e1614d12da6b92b1a5b18727c36eaa131d37
@@ -29,6 +34,7 @@ DIST nfs-utils-1.2.2.tar.bz2 721051 RMD160 fe855f89c5f93888b6c50682d353a9b475e0d
 DIST nfs-utils-1.2.3.tar.bz2 672759 RMD160 dad6fe83fa60c4854849e36d2128208c4e3234ab SHA1 da70a29191b07056d71b6e427a87d5cfd8628523 SHA256 5575ece941097cbfa67fbe0d220dfa11b73f5e6d991e7939c9339bd72259ff19
 DIST nfs-utils-1.2.4.tar.bz2 664358 RMD160 5da35351dd39f91ea96b22a9d26678bc10d06921 SHA1 dcd6d2f55976df574005c40dded43078544e5664 SHA256 6ff1c702b1d61dc6e8c69cd977f79ab7d662dc870337ef89ca6d1b41bad026c0
 DIST nfs-utils-1.2.5.tar.bz2 698148 RMD160 cc8722d244c0c22b05fd2d8a1daa505784e572e1 SHA1 fc522fad2e0fb4a4541ba829417d8c757cb384ce SHA256 3595ed4f6ee5c13514540861ad5e89907aa4fd6897bfa99577515233e4745a9b
+DIST nfs-utils-1.2.6.tar.bz2 755305 RMD160 ca3b9556dcc792375351e20ae43c09c502602528 SHA1 144634a4b5b3ad12c836f5dbcb49c62017035b96 SHA256 70267288500408495085b7c54a667c4e8cfde5882f3193da095fc7dad2da0b83
 EBUILD nfs-utils-1.1.4-r1.ebuild 3167 RMD160 8378aed25dfc49f16c7f67b4f1f044259533d7b3 SHA1 57dced084df3b73fc613c8efefe93324e9088160 SHA256 c0f3eedc4f31424c7788e55f504980bb530464d1bed49ed0cc0e431eef633403
 EBUILD nfs-utils-1.1.5.ebuild 3098 RMD160 1a1db2ab16f016511e799f5843d3b2b404173edc SHA1 a72f47b8d67fb539842ba3113f8365f4c3ae31ca SHA256 35a23dde75f23c921c1731f4bce5bfd6a9ab4aa66416e73864b7c8909e89a964
 EBUILD nfs-utils-1.1.6-r1.ebuild 3212 RMD160 128bea36284b28408aa6e10dfcc1b33061573b96 SHA1 56df20069859675ae6d37ecd88c136b2b78a7550 SHA256 02ecf4976fd1e54ff1440a8e7b6eb2333b7e4ff2392f082c34b5b41c493f809c
@@ -39,5 +45,23 @@ EBUILD nfs-utils-1.2.3-r1.ebuild 3243 RMD160 fd7ff6d183dab514a48bb361d52d6e7aaf8
 EBUILD nfs-utils-1.2.3.ebuild 3150 RMD160 03ce5a05c2bc11e3d0fa87c86faf590329307531 SHA1 2293dc44577dd9d4c91f0e234e22301989810d12 SHA256 b1c484e0cc4b032cd44ff66d9e73866e0dfcea87c22917994f2aa6312db1bcba
 EBUILD nfs-utils-1.2.4.ebuild 3737 RMD160 dad31c550469e1ce4653c0e22ca0ca650a4fdd08 SHA1 ca7c676a5eecda86bf6313c6c6d53edcffaaa3b3 SHA256 13042431e301d9181e6d8d54fa207a2581f675c3a2cb766c47b7fb6037ca088e
 EBUILD nfs-utils-1.2.5.ebuild 3515 RMD160 1814d44ef8322d6a834d2efe9b2421e960313fb8 SHA1 205f3495707c6f521bd7007f9becff6f4f41344d SHA256 f666cf561ecbfe6e4a5c1eed271957ba296c5b90a1bfefbfc741f033661d952c
-MISC ChangeLog 31277 RMD160 fad1e5650b9e0003410ac740c4cae38d230a66cf SHA1 c7f37c357158a52ba86d6fbcaa05ae2ab54458de SHA256 6057f731b965635171489bef966c89f3de7fa9d1deae604cc1eebc127a9e8f83
-MISC metadata.xml 530 RMD160 a57266554db20273338db07f0f895de97ee9b6d6 SHA1 3fd1043140c05d3f9d81a671acaf46d566e06af5 SHA256 97600ac996d2c56119c2ee41073ac83f8c732fff5931ecdbe5b66090e31d13af
+EBUILD nfs-utils-1.2.6.ebuild 3571 RMD160 729f39310ad351119cff52a98c0583c3261c4fef SHA1 02aa9987f62958a9770424b7751ddc941e341c56 SHA256 75b52154b1cb06f2077367e6af4aef05bd0e0a97d0b8d0214967da1830b46f99
+MISC ChangeLog 31528 RMD160 8ac68a30bd9adec306d2c32aeabc4165de8019e1 SHA1 8d296edf5ee7aac4ff62ea1409d9a491aae1bbc2 SHA256 df9ba8f08b02d783981903a2f46f72ea16849b8ae9a756e6fa6d06f93b55e3e1
+MISC metadata.xml 606 RMD160 35d8f40b76caf984c77b72703bcbbdeb98d8941d SHA1 908e08f85c5fd6943d7eb766d774563ad346ec8a SHA256 46f51dc8c661de9ec04d0ad748f8dd69f7c38a3379071f422c203f340dbdc3ea
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBAgAGBQJPtI/YAAoJELEHsLL7fEFWkEsP/jWU+muAIv7A6BC7AjlJmQ3x
+uWmjd9fx/Pz1I7rr+JrY9VvylTWsqsY666upwzS/8WAvazzi9b3Nh3e7vgkduU/M
+Zixk7EBmF/ZPa5gBtZLdSoklwI0uSbs84AbS+Tf2rjZt87vFM62kYIEbvI7ygh+z
+B3EA0Ajig60cpO2zUuShB6O2EHJPT90/tUedlN6ZufunUOF1MEmJmNPLFRZ/om0K
+e92jKgr7hvmx3oO+lmhN9ee3b1A6H5qUYUDtqxjfhDscyhvoGD6U+td7wZgIdmcY
+ebPLslrcaZTeHu2L/Ju/LyJ9E3NBsyGDLdhuVELpg+e32xL9hG1V29dAPAECKP20
+YrQvTgH/I2eVJj/cl7Vxxr2cONA6pIiV7Oivpe90qvVo4aretMybPcDh49/DXnUo
+Uj7vDtejm6blaaq4uQImJFVUbKBxUpt/bdAuTNJC2HFgtyHxCf2ZJHjMJLYDQlxH
+qphVCTmuhrsNfevudLCAN82BriYVMbfdyG64hXjDDDeKt5XUAL/SbkZjKDkqqr4c
+Kx/Y2y+ouNzC4ly5K2Xb/yihG0jq3c+Xcf7K+kEGOzleka/Pfj2RP6PRBE205ksS
+dsoH0ZsAhkOA5OSxBVbiE4gj2s+mCdmPjnyOrKII5Ii11LSN9ZfGFQ4AC/Xzuaw7
+YyU90XGIlZ4s+6ZIZcPg
+=nePj
+-----END PGP SIGNATURE-----
diff --git a/net-fs/nfs-utils/files/nfs-utils-1.2.6-cross-build.patch b/net-fs/nfs-utils/files/nfs-utils-1.2.6-cross-build.patch
new file mode 100644
index 000000000000..2becf943a336
--- /dev/null
+++ b/net-fs/nfs-utils/files/nfs-utils-1.2.6-cross-build.patch
@@ -0,0 +1,69 @@
+this is kind of hacky, but automake doesn't make this easy
+for us atm, so hack away :(
+
+(recent autotools will always add $(CFLAGS)/etc... to the compile)
+
+--- a/tools/locktest/Makefile.am
++++ b/tools/locktest/Makefile.am
+@@ -1,12 +1,11 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+ CC=$(CC_FOR_BUILD)
+-LIBTOOL = @LIBTOOL@ --tag=CC
++CFLAGS=$(CFLAGS_FOR_BUILD)
++CPPFLAGS=$(CPPFLAGS_FOR_BUILD)
++LDFLAGS=$(LDFLAGS_FOR_BUILD)
+ 
+ noinst_PROGRAMS = testlk
+ testlk_SOURCES = testlk.c
+-testlk_CFLAGS=$(CFLAGS_FOR_BUILD)
+-testlk_CPPFLAGS=$(CPPFLAGS_FOR_BUILD)
+-testlk_LDFLAGS=$(LDFLAGS_FOR_BUILD)
+ 
+ MAINTAINERCLEANFILES = Makefile.in
+--- a/tools/rpcdebug/Makefile.am
++++ b/tools/rpcdebug/Makefile.am
+@@ -1,15 +1,14 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+ CC=$(CC_FOR_BUILD)
+-LIBTOOL = @LIBTOOL@ --tag=CC
++CFLAGS=$(CFLAGS_FOR_BUILD)
++CPPFLAGS=$(CPPFLAGS_FOR_BUILD)
++LDFLAGS=$(LDFLAGS_FOR_BUILD)
+ 
+ man8_MANS = rpcdebug.man
+ EXTRA_DIST = $(man8_MANS)
+ 
+ sbin_PROGRAMS = rpcdebug
+ rpcdebug_SOURCES = rpcdebug.c
+-rpcdebug_CFLAGS=$(CFLAGS_FOR_BUILD)
+-rpcdebug_CPPFLAGS=$(CPPFLAGS_FOR_BUILD) -I$(top_srcdir)/support/include
+-rpcdebug_LDFLAGS=$(LDFLAGS_FOR_BUILD)
+ 
+ MAINTAINERCLEANFILES = Makefile.in
+--- a/tools/rpcgen/Makefile.am
++++ b/tools/rpcgen/Makefile.am
+@@ -1,7 +1,9 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+ CC=$(CC_FOR_BUILD)
+-LIBTOOL = @LIBTOOL@ --tag=CC
++CFLAGS=$(CFLAGS_FOR_BUILD)
++CPPFLAGS=$(CPPFLAGS_FOR_BUILD)
++LDFLAGS=$(LDFLAGS_FOR_BUILD)
+ 
+ noinst_PROGRAMS = rpcgen
+ rpcgen_SOURCES = rpc_clntout.c rpc_cout.c rpc_hout.c rpc_main.c \
+@@ -9,10 +11,6 @@
+ 		 rpc_util.c rpc_sample.c rpc_output.h rpc_parse.h \
+ 		 rpc_scan.h rpc_util.h
+ 
+-rpcgen_CFLAGS=$(CFLAGS_FOR_BUILD)
+-rpcgen_CPPLAGS=$(CPPFLAGS_FOR_BUILD)
+-rpcgen_LDFLAGS=$(LDFLAGS_FOR_BUILD)
+-rpcgen_LDADD=$(LIBTIRPC)
+ 
+ MAINTAINERCLEANFILES = Makefile.in
+ 
+ EXTRA_DIST = rpcgen.new.1
diff --git a/net-fs/nfs-utils/files/nfs-utils-1.2.6-osd-install.patch b/net-fs/nfs-utils/files/nfs-utils-1.2.6-osd-install.patch
new file mode 100644
index 000000000000..2b637d1b7c7e
--- /dev/null
+++ b/net-fs/nfs-utils/files/nfs-utils-1.2.6-osd-install.patch
@@ -0,0 +1,49 @@
+From 6cecc20831eacec397a8c88b76757aeb662621e2 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Thu, 17 May 2012 01:18:57 -0400
+Subject: [PATCH] osd_login: fix DESTDIR install
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+If the destination dir doesn't exist, the current install fails:
+make  install-data-hook
+make[4]: Entering directory `/var/tmp/portage/net-fs/nfs-utils-1.2.6/work/nfs-utils-1.2.6/utils/osd_login'
+/usr/bin/install -c --mode 755 osd_login /var/tmp/portage/net-fs/nfs-utils-1.2.6/image//sbin/osd_login
+/usr/bin/install: cannot create regular file ‘/var/tmp/portage/net-fs/nfs-utils-1.2.6/image//sbin/osd_login’: No such file or directory
+make[4]: *** [install-data-hook] Error 1
+
+Rewrite the code to use automake's existing script support rather
+than trying to install the file by hand.
+
+Reported-by: Branko BAdrljica <brankob@avtomatika.com>
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ utils/osd_login/Makefile.am |   11 +++++------
+ 1 files changed, 5 insertions(+), 6 deletions(-)
+
+diff --git a/utils/osd_login/Makefile.am b/utils/osd_login/Makefile.am
+index adc493a..c85584c 100644
+--- a/utils/osd_login/Makefile.am
++++ b/utils/osd_login/Makefile.am
+@@ -1,12 +1,11 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+-OSD_LOGIN_FILES= osd_login
+-
+-EXTRA_DIST= $(OSD_LOGIN_FILES)
++# These scripts go in /sbin (not /usr/sbin), and that cannot be
++# overriden at config time.
++sbindir = /sbin
+ 
+-all-local: $(OSD_LOGIN_FILES)
++OSD_LOGIN_FILES= osd_login
+ 
+-install-data-hook:
+-	$(INSTALL) --mode 755 osd_login $(DESTDIR)/sbin/osd_login
++sbin_SCRIPTS= osd_login
+ 
+ MAINTAINERCLEANFILES = Makefile.in
+-- 
+1.7.8.6
+
diff --git a/net-fs/nfs-utils/metadata.xml b/net-fs/nfs-utils/metadata.xml
index 0e2727af9267..2a60c7ff79a7 100644
--- a/net-fs/nfs-utils/metadata.xml
+++ b/net-fs/nfs-utils/metadata.xml
@@ -4,6 +4,7 @@
 <herd>net-fs</herd>
 	<longdescription>NFS client and server daemons</longdescription>
 	<use>
+		<flag name='nfsdcld'>Enable nfsdcld NFSv4 clientid tracking daemon</flag>
 		<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>
diff --git a/net-fs/nfs-utils/nfs-utils-1.2.6.ebuild b/net-fs/nfs-utils/nfs-utils-1.2.6.ebuild
new file mode 100644
index 000000000000..0bb2fbea3dce
--- /dev/null
+++ b/net-fs/nfs-utils/nfs-utils-1.2.6.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2012 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.6.ebuild,v 1.1 2012/05/17 05:42:16 vapier Exp $
+
+EAPI="4"
+
+inherit eutils flag-o-matic multilib autotools
+
+DESCRIPTION="NFS client and server daemons"
+HOMEPAGE="http://linux-nfs.org/"
+SRC_URI="mirror://sourceforge/nfs/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="caps ipv6 kerberos nfsdcld nfsidmap +nfsv4 nfsv41 selinux tcpd"
+RESTRICT="test" #315573
+
+# 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.
+# (04 Feb 2005 agriffis)
+DEPEND_COMMON="tcpd? ( sys-apps/tcp-wrappers )
+	caps? ( sys-libs/libcap )
+	sys-libs/e2fsprogs-libs
+	net-nds/rpcbind
+	net-libs/libtirpc
+	nfsv4? (
+		>=dev-libs/libevent-1.0b
+		>=net-libs/libnfsidmap-0.21-r1
+		kerberos? (
+			net-libs/librpcsecgss
+			>=net-libs/libgssglue-0.3
+			net-libs/libtirpc[kerberos]
+			app-crypt/mit-krb5
+		)
+		nfsidmap? (
+			>=net-libs/libnfsidmap-0.24
+			sys-apps/keyutils
+		)
+	)
+	nfsv41? (
+		sys-fs/lvm2
+	)
+	selinux? (
+		sec-policy/selinux-rpc
+		sec-policy/selinux-rpcbind
+	)"
+RDEPEND="${DEPEND_COMMON} !net-nds/portmap"
+# util-linux dep is to prevent man-page collision
+DEPEND="${DEPEND_COMMON}
+	virtual/pkgconfig
+	!<sys-apps/util-linux-2.12r-r7"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.1.4-mtab-sym.patch
+	epatch "${FILESDIR}"/${PN}-1.2.6-cross-build.patch
+	epatch "${FILESDIR}"/${PN}-1.2.6-osd-install.patch
+	eautoreconf
+}
+
+src_configure() {
+	export ac_cv_header_keyutils_h=$(usex nfsidmap)
+	econf \
+		--with-statedir=/var/lib/nfs \
+		--enable-tirpc \
+		$(use_with tcpd tcp-wrappers) \
+		$(use_enable nfsdcld) \
+		$(use_enable nfsv4) \
+		$(use_enable nfsv41) \
+		$(use_enable ipv6) \
+		$(use_enable caps) \
+		$(use nfsv4 && use_enable kerberos gss || echo "--disable-gss")
+}
+
+src_install() {
+	default
+	rm linux-nfs/Makefile* || die
+	dodoc -r linux-nfs ChangeLog README
+
+	# Don't overwrite existing xtab/etab, install the original
+	# versions somewhere safe...  more info in pkg_postinst
+	keepdir /var/lib/nfs/{,sm,sm.bak}
+	mv "${ED}"/var/lib "${ED}"/usr/$(get_libdir) || die
+
+	# Install some client-side binaries in /sbin
+	dodir /sbin
+	mv "${ED}"/usr/sbin/rpc.statd "${ED}"/sbin/ || die
+
+	if use nfsidmap ; then
+		# Install a config file for idmappers in newer kernels. #415625
+		insinto /etc/request-key.d
+		echo 'create id_resolver * * /usr/sbin/nfsidmap %k %d 600' > 50_id_resolver.conf
+		doins 50_id_resolver.conf
+	fi
+
+	insinto /etc
+	doins "${FILESDIR}"/exports
+
+	local f list="" opt_need=""
+	if use nfsv4 ; then
+		opt_need="rpc.idmapd"
+		list="${list} rpc.idmapd rpc.pipefs"
+		use kerberos && list="${list} rpc.gssd rpc.svcgssd"
+	fi
+	for f in nfs nfsmount rpc.statd ${list} ; do
+		newinitd "${FILESDIR}"/${f}.initd ${f}
+	done
+	newconfd "${FILESDIR}"/nfs.confd nfs
+	sed -i \
+		-e "/^NFS_NEEDED_SERVICES=/s:=.*:=\"${opt_need}\":" \
+		"${ED}"/etc/conf.d/nfs || die #234132
+}
+
+pkg_postinst() {
+	# Install default xtab and friends if there's none existing.  In
+	# src_install we put them in /usr/lib/nfs for safe-keeping, but
+	# the daemons actually use the files in /var/lib/nfs.  #30486
+	local f
+	mkdir -p "${ROOT}"/var/lib/nfs #368505
+	for f in "${ROOT}"/usr/$(get_libdir)/nfs/*; do
+		[[ -e ${ROOT}/var/lib/nfs/${f##*/} ]] && continue
+		einfo "Copying default ${f##*/} from /usr/$(get_libdir)/nfs to /var/lib/nfs"
+		cp -pPR "${f}" "${ROOT}"/var/lib/nfs/
+	done
+}