Version bump.

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

3 files changed, 122 insertions, 5 deletions

diff --git a/net-fs/nfs-utils/ChangeLog b/net-fs/nfs-utils/ChangeLog
index 9aeba17da75b..9b79c0b62dfc 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-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.158 2009/05/30 22:01:42 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.159 2009/06/02 19:03:30 vapier Exp $
+
+*nfs-utils-1.2.0 (02 Jun 2009)
+
+  02 Jun 2009; Mike Frysinger <vapier@gentoo.org> +nfs-utils-1.2.0.ebuild:
+  Version bump.
 
   30 May 2009; Mike Frysinger <vapier@gentoo.org> nfs-utils-1.1.6-r1.ebuild,
   files/nfs.confd, files/nfs.initd:
diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest
index 5b05555bdbe6..3d675f5d5339 100644
--- a/net-fs/nfs-utils/Manifest
+++ b/net-fs/nfs-utils/Manifest
@@ -17,16 +17,18 @@ AUX rpc.svcgssd.initd 584 RMD160 9488050225453f6b083be78ed3de1b042d02cfb8 SHA1 3
 DIST nfs-utils-1.1.4.tar.bz2 588368 RMD160 72d6f9cbadfc30feca9c5fcb8ff8e73145d20e89 SHA1 560a063c681239b022f05e2c815402425ede01a6 SHA256 27704e3637b5e0ae141b56d5395272b685c4ca844ea0a20c777626bbfc52a94f
 DIST nfs-utils-1.1.5.tar.bz2 605790 RMD160 9e50867b29184ebe6b6c4fb8fe35b026630d5d73 SHA1 b9d2bfe9045157af78d498ed2292eff976a78127 SHA256 9a5da7cd85dc9087222ab348ce82577c38547177d5d4dc7fccc9e939c97d47dc
 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
 EBUILD nfs-utils-1.1.4-r1.ebuild 3156 RMD160 330c1fe7c37bef31fe1c6b9a22318f52bbf345c2 SHA1 5991452fb4cec1a3e7916ea83b417a78c188dcae SHA256 7887a1a2cab72d7831aa8833ef174f08abe2946cb38ca8b7999c3ffe672caa96
 EBUILD nfs-utils-1.1.5.ebuild 3087 RMD160 5467abd9880234bb3910477824bc37c9c192ad86 SHA1 89bbab2a638de77faa61fd858db8212a8b4bc1cc SHA256 e1d88e780252335b92b07887f79064399dbc306ae2bea29fc7e981293c89abdf
 EBUILD nfs-utils-1.1.6-r1.ebuild 3201 RMD160 3aefdfb52668a59ddf4f60a318e9fd1b5ebd4e5b SHA1 c75abd47908fe4c594dabaeb8fe1b2fc4f1bf005 SHA256 8d659904a988ab152d4e22f10d5cf9177ba18b3ff94f6c37277e310635c4f7b8
 EBUILD nfs-utils-1.1.6.ebuild 3087 RMD160 de1cd2012bb0ed960bd9f750026ecf68130ce36b SHA1 44c2f8eb0996b4cafae86310c62c86ef32cb0605 SHA256 e6c4be88d00595818a2a1c3b03e3b8d696cb64c0be267e4e7de584f9ee854599
-MISC ChangeLog 24719 RMD160 a1865d71025838197513fc0eacac04c60ca5b4bf SHA1 0085f1433413fc2d35c074b197537ed2c6b25b16 SHA256 bacd0642e5f1e1e63893f357b24c32050761a9d365a4ede8bdbefadba20bfa5c
+EBUILD nfs-utils-1.2.0.ebuild 3145 RMD160 549e7244f3a9f784a0dd20f59863043f2c505a37 SHA1 2db6b92796894171db517a63153932617713f682 SHA256 a88a28fe6a572b93dbae258ce154a962b8ba5eaa23226a2c3eabc2d4ce4476d1
+MISC ChangeLog 24843 RMD160 ca104f815ca4e1fe25922ba846a26d27b38b95df SHA1 a502da08c4b4d1f0a4e15ffcb31412da2b7156bb SHA256 5dee425a05f46aaf8caabc2f4aa3086c3d3071c0ed8a541c186f74df9fab9b1d
 MISC metadata.xml 402 RMD160 10e39caa098663bde1b609727598aefc319eb5c2 SHA1 9180287973e77c950e172f055e19e5f94f446621 SHA256 cf9b23e458d8e57e6b3ec4639d2c486032b3313952da2c92166bc5f40409e3f6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkohrHIACgkQn/5bYzqsSmFPZwCgyWHyM/ml+RS81xLUyygbFiti
-ZBwAn0GghxNRo9dUM18DdffRAIZEq++F
-=PtSM
+iEYEARECAAYFAkold4gACgkQn/5bYzqsSmE8iACfXDLygcBrCjJeUSa6zynKwIhT
+UzQAoKMP4lUuuyz0DALboFEqL0sTrzej
+=Pb5U
 -----END PGP SIGNATURE-----
diff --git a/net-fs/nfs-utils/nfs-utils-1.2.0.ebuild b/net-fs/nfs-utils/nfs-utils-1.2.0.ebuild
new file mode 100644
index 000000000000..0acb4c5f0e79
--- /dev/null
+++ b/net-fs/nfs-utils/nfs-utils-1.2.0.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2009 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.0.ebuild,v 1.1 2009/06/02 19:03:30 vapier Exp $
+
+EAPI="1"
+
+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"
+
+# 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)
+RDEPEND="tcpd? ( sys-apps/tcp-wrappers )
+	sys-libs/e2fsprogs-libs
+	!net-nds/portmap
+	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
+			app-crypt/mit-krb5
+		)
+	)"
+# util-linux dep is to prevent man-page collision
+DEPEND="${RDEPEND}
+	>=sys-apps/util-linux-2.12r-r7"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-1.1.4-ascii-man.patch
+	epatch "${FILESDIR}"/${PN}-1.1.4-mtab-sym.patch
+	epatch "${FILESDIR}"/${PN}-1.1.4-no-exec.patch
+}
+
+src_compile() {
+	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")
+	emake || die "Failed to compile"
+}
+
+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
+}