Version bump #384465 by teidakankan with updates by Justin Lecher.

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

3 files changed, 150 insertions, 3 deletions

diff --git a/net-fs/nfs-utils/ChangeLog b/net-fs/nfs-utils/ChangeLog
index 066c801d0dd1..1f7dfb5ce764 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-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.192 2011/12/28 15:41:21 swift Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.193 2012/01/14 10:45:04 vapier Exp $
+
+*nfs-utils-1.2.5 (14 Jan 2012)
+
+  14 Jan 2012; Mike Frysinger <vapier@gentoo.org> +nfs-utils-1.2.5.ebuild:
+  Version bump #384465 by teidakankan with updates by Justin Lecher.
 
   28 Dec 2011; <swift@gentoo.org> nfs-utils-1.2.4.ebuild:
   Add selinux triggered dependencies on selinux-rpc and selinux-rpcbind
diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest
index 5e19faeb48e6..1edae57e15a6 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
@@ -28,6 +31,7 @@ DIST nfs-utils-1.2.1.tar.bz2 685942 RMD160 63442bb0d94c458e061f8124a6a62e42d895c
 DIST nfs-utils-1.2.2.tar.bz2 721051 RMD160 fe855f89c5f93888b6c50682d353a9b475e0db21 SHA1 bf823cb85844de3ff3bf07601698aaa1cfdd8a28 SHA256 fd47277666968cf1f6bf3fe4df91a0dd45122bcdf0e24403ea84c5a2dbc9d01e
 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
 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
@@ -37,5 +41,23 @@ EBUILD nfs-utils-1.2.2-r2.ebuild 3387 RMD160 957cda2a26635d233322f2ca62a4466bbe2
 EBUILD nfs-utils-1.2.3-r1.ebuild 3243 RMD160 fd7ff6d183dab514a48bb361d52d6e7aaf88f66a SHA1 0622a8f2007e56295f5090e02f75550ce59f59f4 SHA256 5660e204ebd82df18a3ea663115dd821bc73828192e9e54862b5bb01121c81b0
 EBUILD nfs-utils-1.2.3.ebuild 3150 RMD160 03ce5a05c2bc11e3d0fa87c86faf590329307531 SHA1 2293dc44577dd9d4c91f0e234e22301989810d12 SHA256 b1c484e0cc4b032cd44ff66d9e73866e0dfcea87c22917994f2aa6312db1bcba
 EBUILD nfs-utils-1.2.4.ebuild 3737 RMD160 410fb91e9a9822c2531429e018fdf4a871baef6d SHA1 55b5447dc53e662bf883a67c43ec001b2c5d548f SHA256 daa01f4c06d28b23accdba38ab568b1d856430a2694127ed05a14ddd8872a431
-MISC ChangeLog 30485 RMD160 b0668a0dccbb5fa5cc25b40c559f7a6e624a6811 SHA1 84f6be80d28929a1926149366debac7a0a8eee7a SHA256 6b47fb2c3378c72682345eaba16274692225e0c092f07aad85e81ba9ed81b2bb
+EBUILD nfs-utils-1.2.5.ebuild 3452 RMD160 1285668c7e47842b6a7864cd780995687c4be7d0 SHA1 72df0dd3b767b64e08c4e049c62de7d77d75e14a SHA256 530adbd64a760d7b59805b4199af63fff2cae827edf8781e939108a5b2d1640c
+MISC ChangeLog 30663 RMD160 8e554f3003e82acd386c790bb9fd2921bd4e35f7 SHA1 61c10da0fc582e06f278611b940a843de1204291 SHA256 bde79318d246b3f2f7deeaa8f115827285727139613d3c9fa3f6f411d6cd351d
 MISC metadata.xml 530 RMD160 a57266554db20273338db07f0f895de97ee9b6d6 SHA1 3fd1043140c05d3f9d81a671acaf46d566e06af5 SHA256 97600ac996d2c56119c2ee41073ac83f8c732fff5931ecdbe5b66090e31d13af
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iQIcBAEBAgAGBQJPEVy8AAoJELEHsLL7fEFWIDEQAJgN9Jp33lezSt2MPgwwz7pj
+3Dbd+3e1smITSBFnHzqx2tIWYQpabB1gX4TuhrHrfnsMXlJ6yOLtoRp8kDrVXxHt
+PAXZw4Q95FTCqpmyT8Zo8oQXQNtXndPSIej3/2bNIGFijSYwFJHgamWVMVLQApbM
+L2kc8nZNKtVVVZhwFODpNkbxzVfehdP/3J0waOgOJ8wT6uKBp2wus3nCvzQNxtNu
+V+pH/kUwraAbzx/B0w0g22mUrg2y3+/eOy7b9DbQ8Y9zLaJgHXTZrFmQoanOlSop
+c/RGNg3W164XkH4gsis1yIcpCsSPwpW+sPdAE9AzKrldJ62tt8atF1pmGKn20dWY
+swLX0Rp/or2Y0rZ5cUGgr+42aw3WZ+lVaWhCwvbsdx7wOcd2Cixvrx+LpZjz1YPY
+5zz8T/XrxPPaNgdBeCcfLL4axdOqQOPxJtvD3vVBuOyCZDLj45iNnFsB3eprCxSO
+RDn0/7d9ZEhOCsxLNj+F9zyXtBKgySXHoar22sq2j3JhD3abSNHjEGMzqmRHozpA
+V2cs17BYe3dQQKyJku4jlDaVYn1wlZ2xD3d+qGX/ovJSRopuH41hZzcDvh3WH3ne
+WznCkymTh1OyWReL3ZBHkN5Z8fQmx+vBxqKf5PJerwt2xAuSaWlwHbO6fiawQfsU
+15hmHxBHHyWjyUySFzOg
+=xiDj
+-----END PGP SIGNATURE-----
diff --git a/net-fs/nfs-utils/nfs-utils-1.2.5.ebuild b/net-fs/nfs-utils/nfs-utils-1.2.5.ebuild
new file mode 100644
index 000000000000..aa3d87dfaf0b
--- /dev/null
+++ b/net-fs/nfs-utils/nfs-utils-1.2.5.ebuild
@@ -0,0 +1,120 @@
+# 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.5.ebuild,v 1.1 2012/01/14 10:45:04 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 nfsidmap +nfsv4 nfsv41 selinux tcpd elibc_glibc"
+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
+			net-libs/libtirpc[kerberos]
+			app-crypt/mit-krb5
+		)
+		nfsidmap? (
+			>=net-libs/libnfsidmap-0.24
+			sys-apps/keyutils
+		)
+	)
+	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}
+	dev-util/pkgconfig
+	!<sys-apps/util-linux-2.12r-r7"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.1.4-mtab-sym.patch
+	epatch "${FILESDIR}"/${PN}-1.2.4-cross-build.patch
+	epatch "${FILESDIR}"/${PN}-1.2.4-no-nfsctl.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 nfsv4) \
+		$(use_enable nfsv41) \
+		$(use_enable ipv6) \
+		$(use_enable caps) \
+		$(use nfsv4 && use_enable kerberos gss || echo "--disable-gss")
+}
+
+src_install() {
+	emake DESTDIR="${ED}" install
+	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
+
+	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
+
+	# uClibc doesn't provide rpcgen like glibc, so lets steal it from nfs-utils
+	if ! use elibc_glibc ; then
+		dobin tools/rpcgen/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.  #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
+}