prune old

10 files changed, 13 insertions, 579 deletions

diff --git a/net-fs/nfs-utils/files/digest-nfs-utils-1.0.5-r1 b/net-fs/nfs-utils/files/digest-nfs-utils-1.0.5-r1
deleted file mode 100644
index 4f630b2a2adb..000000000000
--- a/net-fs/nfs-utils/files/digest-nfs-utils-1.0.5-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ce48f1e17f1c49ca14dbd2b0e033d1b9 nfs-utils-1.0.5.tar.gz 265760
diff --git a/net-fs/nfs-utils/files/digest-nfs-utils-1.0.6 b/net-fs/nfs-utils/files/digest-nfs-utils-1.0.6
deleted file mode 100644
index 319c3d94379e..000000000000
--- a/net-fs/nfs-utils/files/digest-nfs-utils-1.0.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f17e9983457e1cf61c37f0be4493fce6 nfs-utils-1.0.6.tar.gz 265964
diff --git a/net-fs/nfs-utils/files/digest-nfs-utils-1.0.6-r1 b/net-fs/nfs-utils/files/digest-nfs-utils-1.0.6-r1
deleted file mode 100644
index 319c3d94379e..000000000000
--- a/net-fs/nfs-utils/files/digest-nfs-utils-1.0.6-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f17e9983457e1cf61c37f0be4493fce6 nfs-utils-1.0.6.tar.gz 265964
diff --git a/net-fs/nfs-utils/files/nfs-5 b/net-fs/nfs-utils/files/nfs
index 83224464890a..2639cb6f9368 100644..100755
--- a/net-fs/nfs-utils/files/nfs-5
+++ b/net-fs/nfs-utils/files/nfs
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/nfs-5,v 1.5 2004/10/25 14:10:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/nfs,v 1.8 2004/11/14 02:34:05 vapier Exp $
 
 #---------------------------------------------------------------------------
 # This script starts/stops the following
diff --git a/net-fs/nfs-utils/files/nfs-2 b/net-fs/nfs-utils/files/nfs-2
deleted file mode 100644
index 56aeae9dced9..000000000000
--- a/net-fs/nfs-utils/files/nfs-2
+++ /dev/null
@@ -1,157 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/nfs-2,v 1.4 2004/07/14 23:36:38 agriffis Exp $
-
-#---------------------------------------------------------------------------
-# This script starts/stops the following
-#	rpc.statd if necessary (also checked by init.d/nfsmount)
-#	rpc.rquotad if exists (from quota package)
-#	rpc.nfsd
-#	rpc.mountd
-#---------------------------------------------------------------------------
-
-# NB: Config is in /etc/conf.d/nfs
-
-
-opts="start stop restart reload"
-
-# This variable is used for controlling whether or not to run exportfs -ua;
-# see stop() for more information
-restarting=no
-
-# The binary locations
-exportfs=/usr/sbin/exportfs
-statd=/sbin/rpc.statd
-rquotad=/usr/sbin/rpc.rquotad
-nfsd=/usr/sbin/rpc.nfsd
-mountd=/usr/sbin/rpc.mountd
-
-depend() {
-	need net portmap
-	after quota
-}
-
-start_statd() {
-	# Don't start rpc.statd if already started by init.d/nfsmount
-	killall -0 rpc.statd &>/dev/null && return 0
-	ebegin "Starting NFS statd"
-	start-stop-daemon --start --quiet --exec \
-		$statd -- $RPCSTATDOPTS 1>&2
-	eend $? "Error starting NFS statd"
-}
-
-stop_statd() {
-	# Don't stop rpc.statd if it's in use by init.d/nfsmount.
-	mount -t nfs | grep -q . && return 0
-	# Make sure it's actually running
-	killall -0 rpc.statd &>/dev/null || return 0
-	# Okay, all tests passed, stop rpc.statd
-	ebegin "Stopping NFS statd"
-	start-stop-daemon --stop --quiet --exec $statd 1>&2
-	eend $? "Error stopping NFS statd"
-}
-
-start() {
-	start_statd
-
-	# Exportfs likes to hang if networking isn't working.
-	# If that's the case, then try to kill it so the
-	# bootup process can continue.
-	if grep -q '^/' /etc/exports &>/dev/null; then
-		ebegin "Exporting NFS directories"
-		$exportfs -r 1>&2 &
-		pid=$!
-		( sleep 30; kill -9 $pid &>/dev/null ) &
-		wait $pid
-		eend $? "Error exporting NFS directories"
-	fi
-
-	if [ -x $rquotad ]; then
-		ebegin "Starting NFS rquotad"
-		start-stop-daemon --start --quiet --exec \
-			$rquotad -- $RPCRQUOTADOPTS 1>&2
-		eend $? "Error starting NFS rquotad"
-	fi
-
-	ebegin "Starting NFS daemon"
-	start-stop-daemon --start --quiet --exec \
-		$nfsd -- $RPCNFSDCOUNT 1>&2
-	eend $? "Error starting NFS daemon"
-
-	# Check if we support NFSv3
-	ebegin "Starting NFS mountd"
-	rpcinfo -u localhost nfs 3 &>/dev/null || \
-		RPCMOUNTDOPTS="$RPCMOUNTDOPTS --no-nfs-version 3"
-	start-stop-daemon --start --quiet --exec \
-		$mountd -- $RPCMOUNTDOPTS 1>&2
-	eend $? "Error starting NFS mountd"
-}
-
-stop() { 
-	# Don't check NFSSERVER variable since it might have changed,
-	# instead use --oknodo to smooth things over
-	ebegin "Stopping NFS mountd"
-	start-stop-daemon --stop --quiet --oknodo \
-		--exec $mountd 1>&2
-	eend $? "Error stopping NFS mountd"
-
-	# nfsd sets its process name to [nfsd] so don't look for $nfsd
-	ebegin "Stopping NFS daemon"
-	start-stop-daemon --stop --quiet --oknodo \
-		--name nfsd --user root --signal 2 1>&2
-	eend $? "Error stopping NFS daemon"
-
-	if [ -x $rquotad ]; then
-		ebegin "Stopping NFS rquotad"
-		start-stop-daemon --stop --quiet --oknodo \
-			--exec $rquotad 1>&2
-		eend $? "Error stopping NFS rquotad"
-	fi
-
-	# When restarting the NFS server, running "exportfs -ua" probably
-	# isn't what the user wants.  Running it causes all entries listed
-	# in xtab to be removed from the kernel export tables, and the
-	# xtab file is cleared. This effectively shuts down all NFS
-	# activity, leaving all clients holding stale NFS filehandles,
-	# *even* when the NFS server has restarted.
-	#
-	# That's what you would want if you were shutting down the NFS
-	# server for good, or for a long period of time, but not when the
-	# NFS server will be running again in short order.  In this case,
-	# then "exportfs -r" will reread the xtab, and all the current
-	# clients will be able to resume NFS activity, *without* needing
-	# to umount/(re)mount the filesystem.
-	if [ "$restarting" = no ]; then
-		ebegin "Unexporting NFS directories"
-		# Exportfs likes to hang if networking isn't working.
-		# If that's the case, then try to kill it so the
-		# shutdown process can continue.
-		$exportfs -ua 1>&2 &
-		pid=$!
-		( sleep 30; kill -9 $pid &>/dev/null ) &
-		wait $pid
-		eend $? "Error unexporting NFS directories"
-	fi
-
-	stop_statd
-}
-
-reload() {
-	# Exportfs likes to hang if networking isn't working.
-	# If that's the case, then try to kill it so the
-	# bootup process can continue.
-	ebegin "Reloading /etc/exports"
-	$exportfs -r 1>&2 &
-	pid=$!
-	( sleep 30; kill -9 $pid &>/dev/null ) &
-	wait $pid
-	eend $? "Error exporting NFS directories"
-}
-
-restart() {
-	# See long comment in stop() regarding "restarting" and exportfs -ua
-	restarting=yes
-	svc_stop
-	svc_start
-}
diff --git a/net-fs/nfs-utils/files/nfs-3 b/net-fs/nfs-utils/files/nfs-3
deleted file mode 100644
index 17d0392d146f..000000000000
--- a/net-fs/nfs-utils/files/nfs-3
+++ /dev/null
@@ -1,166 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/nfs-3,v 1.3 2004/07/14 23:36:38 agriffis Exp $
-
-#---------------------------------------------------------------------------
-# This script starts/stops the following
-#	rpc.statd if necessary (also checked by init.d/nfsmount)
-#	rpc.rquotad if exists (from quota package)
-#	rpc.nfsd
-#	rpc.mountd
-#---------------------------------------------------------------------------
-
-# NB: Config is in /etc/conf.d/nfs
-
-opts="start stop restart reload"
-
-# This variable is used for controlling whether or not to run exportfs -ua;
-# see stop() for more information
-restarting=yes
-
-# The binary locations
-exportfs=/usr/sbin/exportfs
-statd=/sbin/rpc.statd
-rquotad=/usr/sbin/rpc.rquotad
-nfsd=/usr/sbin/rpc.nfsd
-mountd=/usr/sbin/rpc.mountd
-
-depend() {
-	need net portmap
-	after quota
-}
-
-start_statd() {
-	# Don't start rpc.statd if already started by init.d/nfsmount
-	killall -0 rpc.statd &>/dev/null && return 0
-	ebegin "Starting NFS statd"
-	start-stop-daemon --start --quiet --exec \
-		$statd -- $RPCSTATDOPTS 1>&2
-	eend $? "Error starting NFS statd"
-}
-
-stop_statd() {
-	# Don't stop rpc.statd if it's in use by init.d/nfsmount.
-	mount -t nfs | grep -q . && return 0
-	# Make sure it's actually running
-	killall -0 rpc.statd &>/dev/null || return 0
-	# Okay, all tests passed, stop rpc.statd
-	ebegin "Stopping NFS statd"
-	start-stop-daemon --stop --quiet --exec $statd 1>&2
-	eend $? "Error stopping NFS statd"
-}
-
-start() {
-	#This is the new "kernel 2.6 way" to handle the exports file
-	if grep -q nfsd /proc/filesystems &>/dev/null; then
-		if ! grep -q "nfsd /proc/fs/nfs" /proc/mounts &>/dev/null; then
-			ebegin "Mounting nfsd filesystem in /proc"
-			mount -t nfsd nfsd /proc/fs/nfs
-			eend $? "Error mounting nfsd filesystem in /proc"
-		fi
-	fi
-	#now that nfsd is mounted inside /proc, we can safely start mountd later
-
-	start_statd
-
-	# Exportfs likes to hang if networking isn't working.
-	# If that's the case, then try to kill it so the
-	# bootup process can continue.
-	if grep -q '^/' /etc/exports &>/dev/null; then
-		ebegin "Exporting NFS directories"
-		$exportfs -r 1>&2 &
-		pid=$!
-		( sleep 30; kill -9 $pid &>/dev/null ) &
-		wait $pid
-		eend $? "Error exporting NFS directories"
-	fi
-
-	if [ -x $rquotad ]; then
-		ebegin "Starting NFS rquotad"
-		start-stop-daemon --start --quiet --exec \
-			$rquotad -- $RPCRQUOTADOPTS 1>&2
-		eend $? "Error starting NFS rquotad"
-	fi
-
-	ebegin "Starting NFS daemon"
-	start-stop-daemon --start --quiet --exec \
-		$nfsd -- $RPCNFSDCOUNT 1>&2
-	eend $? "Error starting NFS daemon"
-
-	# Check if we support NFSv3
-	ebegin "Starting NFS mountd"
-	rpcinfo -u localhost nfs 3 &>/dev/null || \
-		RPCMOUNTDOPTS="$RPCMOUNTDOPTS --no-nfs-version 3"
-	start-stop-daemon --start --quiet --exec \
-		$mountd -- $RPCMOUNTDOPTS 1>&2
-	eend $? "Error starting NFS mountd"
-}
-
-stop() { 
-	# Don't check NFSSERVER variable since it might have changed,
-	# instead use --oknodo to smooth things over
-	ebegin "Stopping NFS mountd"
-	start-stop-daemon --stop --quiet --oknodo \
-		--exec $mountd 1>&2
-	eend $? "Error stopping NFS mountd"
-
-	# nfsd sets its process name to [nfsd] so don't look for $nfsd
-	ebegin "Stopping NFS daemon"
-	start-stop-daemon --stop --quiet --oknodo \
-		--name nfsd --user root --signal 2 1>&2
-	eend $? "Error stopping NFS daemon"
-
-	if [ -x $rquotad ]; then
-		ebegin "Stopping NFS rquotad"
-		start-stop-daemon --stop --quiet --oknodo \
-			--exec $rquotad 1>&2
-		eend $? "Error stopping NFS rquotad"
-	fi
-
-	# When restarting the NFS server, running "exportfs -ua" probably
-	# isn't what the user wants.  Running it causes all entries listed
-	# in xtab to be removed from the kernel export tables, and the
-	# xtab file is cleared. This effectively shuts down all NFS
-	# activity, leaving all clients holding stale NFS filehandles,
-	# *even* when the NFS server has restarted.
-	#
-	# That's what you would want if you were shutting down the NFS
-	# server for good, or for a long period of time, but not when the
-	# NFS server will be running again in short order.  In this case,
-	# then "exportfs -r" will reread the xtab, and all the current
-	# clients will be able to resume NFS activity, *without* needing
-	# to umount/(re)mount the filesystem.
-	if [ "$restarting" = no ]; then
-		ebegin "Unexporting NFS directories"
-		# Exportfs likes to hang if networking isn't working.
-		# If that's the case, then try to kill it so the
-		# shutdown process can continue.
-		$exportfs -ua 1>&2 &
-		pid=$!
-		( sleep 30; kill -9 $pid &>/dev/null ) &
-		wait $pid
-		eend $? "Error unexporting NFS directories"
-	fi
-
-	stop_statd
-}
-
-reload() {
-	# Exportfs likes to hang if networking isn't working.
-	# If that's the case, then try to kill it so the
-	# bootup process can continue.
-	ebegin "Reloading /etc/exports"
-	$exportfs -r 1>&2 &
-	pid=$!
-	( sleep 30; kill -9 $pid &>/dev/null ) &
-	wait $pid
-	eend $? "Error exporting NFS directories"
-}
-
-restart() {
-	# See long comment in stop() regarding "restarting" and exportfs -ua
-	restarting=yes
-	svc_stop
-	svc_start
-}
diff --git a/net-fs/nfs-utils/nfs-utils-1.0.5-r1.ebuild b/net-fs/nfs-utils/nfs-utils-1.0.5-r1.ebuild
deleted file mode 100644
index 46afd16f485a..000000000000
--- a/net-fs/nfs-utils/nfs-utils-1.0.5-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2004 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.0.5-r1.ebuild,v 1.7 2004/06/25 03:09:51 agriffis Exp $
-
-IUSE="tcpd"
-
-DESCRIPTION="NFS client and server daemons"
-SRC_URI="mirror://sourceforge/nfs/${P}.tar.gz"
-HOMEPAGE="http://nfs.sourceforge.net/"
-RESTRICT="nomirror"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc alpha sparc hppa amd64"
-
-DEPEND="tcpd? ( sys-apps/tcp-wrappers )"
-RDEPEND="${DEPEND} >=net-nds/portmap-5b-r6"
-
-src_compile() {
-	./configure \
-		--mandir=/usr/share/man \
-		--with-statedir=/var/lib/nfs \
-		--disable-rquotad --enable-nfsv3 || die "Configure failed"
-
-	if ! use tcpd; then
-		sed -e "s:\(-lwrap\|-DHAVE_TCP_WRAPPER\)::" < config.mk > config.mk.new
-		mv --force config.mk.new config.mk
-	fi
-
-	# parallel make still fails
-	make || die "Failed to compile"
-}
-
-src_install() {
-	make install install_prefix=${D} MANDIR=${D}/usr/share/man \
-		|| die "Failed to install"
-
-	# Install some client-side binaries in /sbin
-	mkdir ${D}/sbin
-	mv ${D}/usr/sbin/rpc.{lockd,statd} ${D}/sbin
-
-	dodoc ChangeLog COPYING README
-	docinto linux-nfs ; dodoc linux-nfs/*
-
-	insinto /etc ; doins ${FILESDIR}/exports
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/nfs-2 nfs
-	newexe ${FILESDIR}/nfsmount nfsmount
-
-	insinto /etc/conf.d
-	newins ${FILESDIR}/nfs.confd nfs
-}
-
-pkg_postinst() {
-	einfo "NFS V2 and V3 servers now default to \"sync\" IO if ${P}"
-	einfo "(or later) is installed."
-	einfo "More info at ${HOMEPAGE} (see questions 5, 12, 13, and 14)."
-	echo
-	ewarn "PLEASE note: Since the latest NFS utils has changed the server"
-	ewarn "default to \"sync\" IO, then if no behavior is specified in the"
-	ewarn "export list, thus assuming the default behavior, a warning will"
-	ewarn "be generated at export time."
-	echo
-	# Running depscan since we introduced /etc/init.d/{portmap,nfs}
-	/etc/init.d/depscan.sh
-}
diff --git a/net-fs/nfs-utils/nfs-utils-1.0.6-r1.ebuild b/net-fs/nfs-utils/nfs-utils-1.0.6-r1.ebuild
deleted file mode 100644
index 9dfa5f9739bb..000000000000
--- a/net-fs/nfs-utils/nfs-utils-1.0.6-r1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2004 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.0.6-r1.ebuild,v 1.9 2004/07/14 23:53:46 agriffis Exp $
-
-inherit gnuconfig
-
-DESCRIPTION="NFS client and server daemons"
-HOMEPAGE="http://nfs.sourceforge.net/"
-SRC_URI="mirror://sourceforge/nfs/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc mips arm hppa ~amd64 ppc64 s390"
-IUSE="tcpd"
-
-DEPEND="tcpd? ( sys-apps/tcp-wrappers )"
-RDEPEND="${DEPEND}
-	>=net-nds/portmap-5b-r6
-	>=sys-apps/util-linux-2.11f"
-
-src_compile() {
-	gnuconfig_update
-	./configure \
-		--mandir=/usr/share/man \
-		--with-statedir=/var/lib/nfs \
-		--disable-rquotad \
-		--enable-nfsv3 \
-		|| die "Configure failed"
-
-	if ! use tcpd; then
-		sed -i "s:\(-lwrap\|-DHAVE_TCP_WRAPPER\)::" config.mk
-	fi
-
-	# parallel make still fails
-	make || die "Failed to compile"
-}
-
-src_install() {
-	make install install_prefix=${D} MANDIR=${D}/usr/share/man \
-		|| die "Failed to install"
-
-	# Don't overwrite existing xtab/etab, install the original
-	# versions somewhere safe...  more info in pkg_postinst
-	mkdir -p ${D}/usr/lib/nfs
-	mv ${D}/var/lib/nfs/* ${D}/usr/lib/nfs
-	keepdir /var/lib/nfs
-
-	# Install some client-side binaries in /sbin
-	mkdir ${D}/sbin
-	mv ${D}/usr/sbin/rpc.{lockd,statd} ${D}/sbin
-
-	dodoc ChangeLog COPYING README
-	docinto linux-nfs ; dodoc linux-nfs/*
-
-	insinto /etc ; doins ${FILESDIR}/exports
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/nfs-3 nfs
-	newexe ${FILESDIR}/nfsmount nfsmount
-
-	insinto /etc/conf.d
-	newins ${FILESDIR}/nfs.confd nfs
-}
-
-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/lib/nfs/*; do
-		[[ -f ${ROOT}/var/lib/nfs/${f##*/} ]] && continue
-		einfo "Copying default ${f##*/} from /usr/lib/nfs to /var/lib/nfs"
-		cp -a ${f} ${ROOT}/var/lib/nfs/
-	done
-
-	echo
-	einfo "NFS V2 and V3 servers now default to \"sync\" IO if ${P}"
-	einfo "(or later) is installed."
-	einfo "More info at ${HOMEPAGE} (see questions 5, 12, 13, and 14)."
-	echo
-	ewarn "PLEASE note: Since the latest NFS utils has changed the server"
-	ewarn "default to \"sync\" IO, then if no behavior is specified in the"
-	ewarn "export list, thus assuming the default behavior, a warning will"
-	ewarn "be generated at export time."
-	echo
-}
diff --git a/net-fs/nfs-utils/nfs-utils-1.0.6-r4.ebuild b/net-fs/nfs-utils/nfs-utils-1.0.6-r4.ebuild
index 3872a6202f2d..f1586be91c04 100644
--- a/net-fs/nfs-utils/nfs-utils-1.0.6-r4.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-1.0.6-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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.0.6-r4.ebuild,v 1.8 2004/11/09 19:53:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.0.6-r4.ebuild,v 1.9 2004/11/14 02:34:05 vapier Exp $
 
 inherit gnuconfig
 
@@ -13,13 +13,13 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sparc x86"
 IUSE="tcpd"
 
-DEPEND="tcpd? ( sys-apps/tcp-wrappers )"
-RDEPEND="${DEPEND}
+RDEPEND="tcpd? ( sys-apps/tcp-wrappers )
 	>=net-nds/portmap-5b-r6
 	>=sys-apps/util-linux-2.11f"
+DEPEND="${RDEPEND}
+	>=sys-apps/portage-2.0.51"
 
 src_compile() {
-	gnuconfig_update
 	econf \
 		--mandir=/usr/share/man \
 		--with-statedir=/var/lib/nfs \
@@ -33,12 +33,15 @@ src_compile() {
 	fi
 
 	# parallel make fails for depend target
-	make depend || die "failed to make depend"
+	emake -j1 depend || die "failed to make depend"
 	emake || die "Failed to compile"
 }
 
 src_install() {
-	make install install_prefix=${D} MANDIR=${D}/usr/share/man \
+	make \
+		install_prefix=${D} \
+		MANDIR=${D}/usr/share/man \
+		install \
 		|| die "Failed to install"
 
 	# Don't overwrite existing xtab/etab, install the original
@@ -51,19 +54,15 @@ src_install() {
 
 	# Install some client-side binaries in /sbin
 	dodir /sbin
-	mv ${D}/usr/sbin/rpc.{lockd,statd} ${D}/sbin
+	mv ${D}/usr/sbin/rpc.{lockd,statd} ${D}/sbin/
 
 	dodoc ChangeLog README
 	docinto linux-nfs ; dodoc linux-nfs/*
 
 	insinto /etc ; doins ${FILESDIR}/exports
 
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/nfs-5 nfs
-	newexe ${FILESDIR}/nfsmount nfsmount
-
-	insinto /etc/conf.d
-	newins ${FILESDIR}/nfs.confd nfs
+	doinitd ${FILESDIR}/nfs ${FILESDIR}/nfsmount
+	newconfd ${FILESDIR}/nfs.confd nfs
 }
 
 pkg_postinst() {
diff --git a/net-fs/nfs-utils/nfs-utils-1.0.6.ebuild b/net-fs/nfs-utils/nfs-utils-1.0.6.ebuild
deleted file mode 100644
index e7e1d0f40b93..000000000000
--- a/net-fs/nfs-utils/nfs-utils-1.0.6.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2004 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.0.6.ebuild,v 1.13 2004/06/25 20:24:15 kugelfang Exp $
-
-IUSE="tcpd"
-
-DESCRIPTION="NFS client and server daemons"
-SRC_URI="mirror://sourceforge/nfs/${P}.tar.gz"
-HOMEPAGE="http://nfs.sourceforge.net/"
-RESTRICT="nomirror"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="ia64 x86 ppc ~alpha sparc hppa amd64"
-
-DEPEND="tcpd? ( sys-apps/tcp-wrappers )"
-RDEPEND="${DEPEND} >=net-nds/portmap-5b-r6 >=sys-apps/util-linux-2.11f"
-
-src_compile() {
-	./configure \
-		--mandir=/usr/share/man \
-		--with-statedir=/var/lib/nfs \
-		--disable-rquotad --enable-nfsv3 || die "Configure failed"
-
-	if ! use tcpd; then
-		sed -i "s:\(-lwrap\|-DHAVE_TCP_WRAPPER\)::" config.mk
-	fi
-
-	# parallel make still fails
-	make || die "Failed to compile"
-}
-
-src_install() {
-	make install install_prefix=${D} MANDIR=${D}/usr/share/man \
-		|| die "Failed to install"
-
-	# Don't overwrite existing xtab/etab, install the original
-	# versions somewhere safe...  more info in pkg_postinst
-	mkdir -p ${D}/usr/lib/nfs
-	mv ${D}/var/lib/nfs/* ${D}/usr/lib/nfs
-	keepdir /var/lib/nfs
-
-	# Install some client-side binaries in /sbin
-	mkdir ${D}/sbin
-	mv ${D}/usr/sbin/rpc.{lockd,statd} ${D}/sbin
-
-	dodoc ChangeLog COPYING README
-	docinto linux-nfs ; dodoc linux-nfs/*
-
-	insinto /etc ; doins ${FILESDIR}/exports
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/nfs-2 nfs
-	newexe ${FILESDIR}/nfsmount nfsmount
-
-	insinto /etc/conf.d
-	newins ${FILESDIR}/nfs.confd nfs
-}
-
-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/lib/nfs/*; do
-		[[ -f ${ROOT}/var/lib/nfs/${f##*/} ]] && continue
-		einfo "Copying default ${f##*/} from /usr/lib/nfs to /var/lib/nfs"
-		cp -a ${f} ${ROOT}/var/lib/nfs/
-	done
-
-	echo
-	einfo "NFS V2 and V3 servers now default to \"sync\" IO if ${P}"
-	einfo "(or later) is installed."
-	einfo "More info at ${HOMEPAGE} (see questions 5, 12, 13, and 14)."
-	echo
-	ewarn "PLEASE note: Since the latest NFS utils has changed the server"
-	ewarn "default to \"sync\" IO, then if no behavior is specified in the"
-	ewarn "export list, thus assuming the default behavior, a warning will"
-	ewarn "be generated at export time."
-	echo
-
-	# Running depscan since we introduced /etc/init.d/{portmap,nfs}
-	/etc/init.d/depscan.sh
-}