--- /usr/local/portage/net-fs/nfs-utils/nfs-utils-1.1.2-r1.ebuild	2008-05-24 22:25:13.000000000 +0000
+++ /usr/local/portage/net-fs/nfs-utils/nfs-utils-1.1.4.ebuild	2008-11-22 14:24:39.000000000 +0000
@@ -1,12 +1,12 @@
 # Copyright 1999-2008 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.1.2.ebuild,v 1.3 2008/04/20 16:57:59 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.1.4.ebuild,v 1.3 2008/10/26 09:02:47 vapier Exp $
 
 inherit eutils flag-o-matic multilib autotools
 
 DESCRIPTION="NFS client and server daemons"
 HOMEPAGE="http://nfs.sourceforge.net/"
-SRC_URI="mirror://sourceforge/nfs/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/nfs/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -18,10 +18,11 @@
 # so don't depend on virtual/krb.
 # (04 Feb 2005 agriffis)
 RDEPEND="tcpd? ( sys-apps/tcp-wrappers )
+	sys-libs/e2fsprogs-libs
 	>=net-nds/portmap-5b-r6
 	!nonfsv4? (
 		>=dev-libs/libevent-1.0b
-		>=net-libs/libnfsidmap-0.16
+		>=net-libs/libnfsidmap-0.21-r1
 		kerberos? (
 			net-libs/librpcsecgss
 			|| (
@@ -29,7 +30,7 @@
 					net-libs/libgssglue
 					app-crypt/mit-krb5
 				)
-				>=app-crypt/heimdal-1.0
+				>=app-crypt/heimdal-1.2
 			)
 		)
 	)"
@@ -40,16 +41,17 @@
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}"/${P}-rpcgen-ioctl.patch
-	epatch "${FILESDIR}"/${P}-pkgconfig_ac.patch
-	epatch "${FILESDIR}"/${P}-no_libgssapi.patch
-	epatch "${FILESDIR}"/${P}-mount-eacces.patch #219729
+	epatch "${FILESDIR}"/${PN}-1.1.2-rpcgen-ioctl.patch
+	epatch "${FILESDIR}"/${PN}-1.1.2-kerberos-ac.patch
+	epatch "${FILESDIR}"/${PN}-1.1.2-pkgconfig_ac.patch
+	epatch "${FILESDIR}"/${PN}-1.1.2-no_libgssapi.patch
+	epatch "${FILESDIR}"/${PN}-1.1.4-heimdal_functions.patch
 	eautoreconf
 }
 
 src_compile() {
 	local myconf
-	if use nonfsv4; then
+	if use nonfsv4 ; then
 		myconf="--disable-gss"
 	else
 		myconf="$(use_enable kerberos gss)"
@@ -90,14 +92,13 @@
 
 	local f list=""
 	if use !nonfsv4 ; then
-		list="${list} 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
-	use !nonfsv4 && doins utils/idmapd/idmapd.conf
 
 	# uClibc doesn't provide rpcgen like glibc, so lets steal it from nfs-utils
 	if ! use elibc_glibc ; then
@@ -106,10 +107,6 @@
 	fi
 }
 
-pkg_preinst() {
-	[[ -s ${ROOT}/etc/exports ]] && rm -f "${D}"/etc/exports
-}
-
 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