Version bump #314603 by Tim Harder.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

3 files changed, 127 insertions, 2 deletions

diff --git a/net-fs/nfs-utils/ChangeLog b/net-fs/nfs-utils/ChangeLog
index 2a057ffc8d00..e5487b92e54a 100644
--- a/net-fs/nfs-utils/ChangeLog
+++ b/net-fs/nfs-utils/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-fs/nfs-utils
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.164 2010/03/31 18:06:59 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.165 2010/04/11 21:56:39 vapier Exp $
+
+*nfs-utils-1.2.2 (11 Apr 2010)
+
+  11 Apr 2010; Mike Frysinger <vapier@gentoo.org> +nfs-utils-1.2.2.ebuild:
+  Version bump #314603 by Tim Harder.
 
   31 Mar 2010; <solar@gentoo.org> nfs-utils-1.1.4-r1.ebuild,
   nfs-utils-1.1.5.ebuild, nfs-utils-1.1.6.ebuild, nfs-utils-1.1.6-r1.ebuild,
diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest
index 889958264cfc..4440233d5fe3 100644
--- a/net-fs/nfs-utils/Manifest
+++ b/net-fs/nfs-utils/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 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
@@ -16,11 +19,20 @@ DIST nfs-utils-1.1.5.tar.bz2 605790 RMD160 9e50867b29184ebe6b6c4fb8fe35b026630d5
 DIST nfs-utils-1.1.6.tar.bz2 598584 RMD160 bb3535325d4a98a7d3b83eb59c3dc9061a4c1457 SHA1 63c0ed078f231a65e3e29a21da094ad2326a0294 SHA256 9c7b4ba94cad4751604c31b9e428b0233b944fcb8ba89eebbd50e78cff73a5d5
 DIST nfs-utils-1.2.0.tar.bz2 609908 RMD160 0a20d86c218a54dd00cadc7a5eca788fb30680e7 SHA1 44edfc809e383bd72d481f1823d138877ff039aa SHA256 cb39468b3acd0bf3870cde4bbb06fe01a88e7cf0c81cff87fa7794cab871a1d1
 DIST nfs-utils-1.2.1.tar.bz2 685942 RMD160 63442bb0d94c458e061f8124a6a62e42d895c5a0 SHA1 f8227b11657006ff839090acf879ed23111aecc4 SHA256 f4fc8fd71f562564de051d681997be3dd7753fb93f8a3a0eb7c5835f0f04fa6d
+DIST nfs-utils-1.2.2.tar.bz2 721051 RMD160 fe855f89c5f93888b6c50682d353a9b475e0db21 SHA1 bf823cb85844de3ff3bf07601698aaa1cfdd8a28 SHA256 fd47277666968cf1f6bf3fe4df91a0dd45122bcdf0e24403ea84c5a2dbc9d01e
 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
 EBUILD nfs-utils-1.1.6.ebuild 3098 RMD160 dcb65f053cb7c92a63c33e872917427ea717ab40 SHA1 d7c748021e99d05838d0fde58d7eda0e53f9b7e8 SHA256 06a80947bd22ada4949f735f71891ec9e7e0a0a1310ecd059d9a27ad7c1a2bbd
 EBUILD nfs-utils-1.2.0.ebuild 3194 RMD160 bcf7cc92eeb36828a3f62ef597f6f2bf20e3717d SHA1 66c69826465b73de114dc1fe7e1a9fcdafd78805 SHA256 ea1b2347de041280faa7dd8e008a2486d7b28e6b83f0b410f20afb009e906f64
 EBUILD nfs-utils-1.2.1.ebuild 3120 RMD160 c97608ea950bb115875d1c2058112b67e500159c SHA1 06e6b0203540520ce4aed99da5f2dd5575491d40 SHA256 5342652c52e345a17ef3d000a4a78aa0513edf863dad7adaa665975194d9771c
-MISC ChangeLog 25966 RMD160 663f72c02a261a7d7c1b3eb9c00cc9c4d50e2a72 SHA1 e2ee845367f1e9d0c11618fdd288f53d5c731cee SHA256 36ca66f753a3a96da28e165a420dcd9b456d8a99dc833a0d2e62d45787e0ece0
+EBUILD nfs-utils-1.2.2.ebuild 3176 RMD160 5781fcdd1dcaae8e625d3b472755cd945d27c396 SHA1 5f872dccf48236e68eeb0f321ec631aa2ce71e87 SHA256 d7d3b2247648b5bf9eb462baec98eedd109d9a8e162db1adc800c145cb3c029e
+MISC ChangeLog 26113 RMD160 181a8eb09b6a113a21c6503c48d162da239714e8 SHA1 c95e4e32fe97d13829169a5eb05ccfc8d750afdb SHA256 e1eded4f487926915dee77e0294bcadd3037257fdbcffbdbf69d8e447bcb8dec
 MISC metadata.xml 402 RMD160 10e39caa098663bde1b609727598aefc319eb5c2 SHA1 9180287973e77c950e172f055e19e5f94f446621 SHA256 cf9b23e458d8e57e6b3ec4639d2c486032b3313952da2c92166bc5f40409e3f6
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iF4EAREIAAYFAkvCRX0ACgkQTwhj9JtAlp73JAD9FwPDuTA9ZHJWj9Ky496i4eAp
+IleywvYzd/ymqTjchVMA/iRP4kIH7PwiaypW+iQBL3kJdmpiFWdlXjMRgUtK6fMz
+=JWi6
+-----END PGP SIGNATURE-----
diff --git a/net-fs/nfs-utils/nfs-utils-1.2.2.ebuild b/net-fs/nfs-utils/nfs-utils-1.2.2.ebuild
new file mode 100644
index 000000000000..2979f9837dcf
--- /dev/null
+++ b/net-fs/nfs-utils/nfs-utils-1.2.2.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2010 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.2.ebuild,v 1.1 2010/04/11 21:56:39 vapier Exp $
+
+EAPI="2"
+
+inherit eutils flag-o-matic multilib
+
+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="ipv6 kerberos +nfsv3 +nfsv4 tcpd elibc_glibc"
+
+# 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 )
+	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
+			net-libs/libtirpc[kerberos]
+			app-crypt/mit-krb5
+		)
+	)"
+RDEPEND="${DEPEND_COMMON} !net-nds/portmap"
+# util-linux dep is to prevent man-page collision
+DEPEND="${DEPEND_COMMON}
+	>=sys-apps/util-linux-2.12r-r7"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.1.4-mtab-sym.patch
+	epatch "${FILESDIR}"/${PN}-1.1.4-no-exec.patch
+	chmod a+x tests/t0001-statd-basic-mon-unmon.sh || die
+}
+
+src_configure() {
+	econf \
+		--with-statedir=/var/lib/nfs \
+		--enable-tirpc \
+		$(use_with tcpd tcp-wrappers) \
+		$(use_enable nfsv3) \
+		$(use_enable nfsv4) \
+		$(use_enable ipv6) \
+		$(use nfsv4 && use_enable kerberos gss || echo "--disable-gss")
+}
+
+src_install() {
+	emake DESTDIR="${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
+	keepdir /var/lib/nfs
+
+	# Install some client-side binaries in /sbin
+	dodir /sbin
+	mv "${D}"/usr/sbin/rpc.statd "${D}"/sbin/ || die
+
+	dodoc ChangeLog README
+	docinto linux-nfs ; dodoc linux-nfs/*
+
+	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} || die "doinitd ${f}"
+	done
+	newconfd "${FILESDIR}"/nfs.confd nfs
+	dosed "/^NFS_NEEDED_SERVICES=/s:=.*:=\"${opt_need}\":" /etc/conf.d/nfs #234132
+
+	# uClibc doesn't provide rpcgen like glibc, so lets steal it from nfs-utils
+	if ! use elibc_glibc ; then
+		dobin tools/rpcgen/rpcgen || die "rpcgen"
+		newdoc tools/rpcgen/README README.rpcgen
+	fi
+}
+
+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.  This fixes
+	# bug 30486
+	local f
+	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
+}