Remove old.

(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 4F064CA3)

39 files changed, 29 insertions, 3441 deletions

diff --git a/net-fs/nfs-utils/ChangeLog b/net-fs/nfs-utils/ChangeLog
index 60f0a90197ba..86590e15d818 100644
--- a/net-fs/nfs-utils/ChangeLog
+++ b/net-fs/nfs-utils/ChangeLog
@@ -1,6 +1,34 @@
 # ChangeLog for net-fs/nfs-utils
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.256 2014/11/02 08:54:13 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.257 2014/11/18 14:54:08 radhermit Exp $
+
+  18 Nov 2014; Tim Harder <radhermit@gentoo.org> -nfs-utils-1.1.4-r1.ebuild,
+  -nfs-utils-1.1.5.ebuild, -nfs-utils-1.2.1.ebuild, -nfs-utils-1.2.2-r2.ebuild,
+  -nfs-utils-1.2.3.ebuild, -nfs-utils-1.2.3-r1.ebuild, -nfs-utils-1.2.4.ebuild,
+  -nfs-utils-1.2.5.ebuild, -nfs-utils-1.2.6.ebuild, -nfs-utils-1.2.7-r1.ebuild,
+  -nfs-utils-1.2.8-r1.ebuild, -nfs-utils-1.2.8-r2.ebuild,
+  -nfs-utils-1.2.9.ebuild, -nfs-utils-1.2.9-r1.ebuild,
+  -nfs-utils-1.2.9-r2.ebuild,
+  -files/0001-mountd-Fix-is_subdirectory-again.patch,
+  -files/0001-statd-exit-if-a-statd-is-already-running.patch,
+  -files/nfs-utils-1.1.4-ascii-man.patch, -files/nfs-utils-1.1.4-no-exec.patch,
+  -files/nfs-utils-1.1.4-rpcgen-ioctl.patch,
+  -files/nfs-utils-1.2.2-nfsv4.patch,
+  -files/nfs-utils-1.2.2-optional-libcap.patch,
+  -files/nfs-utils-1.2.3-ti-rpc-static-ports.patch,
+  -files/nfs-utils-1.2.4-conditional.patch,
+  -files/nfs-utils-1.2.4-cross-build.patch,
+  -files/nfs-utils-1.2.4-exportfs-skip-dir.patch,
+  -files/nfs-utils-1.2.4-exportfs-xlog.patch,
+  -files/nfs-utils-1.2.4-nfsidmap.patch,
+  -files/nfs-utils-1.2.4-no-nfsctl.patch,
+  -files/nfs-utils-1.2.6-conditionals.patch,
+  -files/nfs-utils-1.2.6-cross-build.patch,
+  -files/nfs-utils-1.2.6-osd-install.patch, -files/nfs-utils-1.2.7-libio.patch,
+  -files/nfs-utils-1.2.7-nfsiostat-python3.patch, -files/nfsd.service,
+  -files/rpc-mountd.service, -files/rpc-statd.service,
+  -files/rpc-statd.service-r1:
+  Remove old.
 
   02 Nov 2014; Sven Vermeulen <swift@gentoo.org> nfs-utils-1.2.9-r3.ebuild,
   nfs-utils-1.3.0-r1.ebuild:
diff --git a/net-fs/nfs-utils/files/0001-mountd-Fix-is_subdirectory-again.patch b/net-fs/nfs-utils/files/0001-mountd-Fix-is_subdirectory-again.patch
deleted file mode 100644
index e6f372b75850..000000000000
--- a/net-fs/nfs-utils/files/0001-mountd-Fix-is_subdirectory-again.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From 23d3980b6cfea4e9056d9b7b81e48b4fefc645e0 Mon Sep 17 00:00:00 2001
-From: NeilBrown <neilb@suse.de>
-Date: Tue, 7 May 2013 11:46:18 -0400
-Subject: [PATCH] mountd: Fix is_subdirectory again
-
-The problem was that is_subdirectory() would also succeed if the two
-directories were the same.  This is needed for path_matches() which
-needs to see if the child is same-or-descendant.
-
-So this patch rearranges path_matches() to do the "are they the same"
-test itself and only bother with is_subdirectory() if it they are not
-the same.
-
-So now is_subdirectory() can be strict, and so can be usable for
-subexport(), which needs a strong 'in subdirectory - not the same' test.
-
-Acked-by: J. Bruce Fields <bfields@redhat.com>
-Signed-off-by: NeilBrown <neilb@suse.de>
-Signed-off-by: Steve Dickson <steved@redhat.com>
----
- utils/mountd/cache.c | 24 ++++++++++++++----------
- 1 file changed, 14 insertions(+), 10 deletions(-)
-
-diff --git a/utils/mountd/cache.c b/utils/mountd/cache.c
-index 737927c..517aa62 100644
---- a/utils/mountd/cache.c
-+++ b/utils/mountd/cache.c
-@@ -347,20 +347,26 @@ static char *next_mnt(void **v, char *p)
- 
- static int is_subdirectory(char *child, char *parent)
- {
-+	/* Check is child is strictly a subdirectory of
-+	 * parent or a more distant descendant.
-+	 */
- 	size_t l = strlen(parent);
- 
--	if (strcmp(parent, "/") == 0)
-+	if (strcmp(parent, "/") == 0 && child[1] != 0)
- 		return 1;
- 
--	return strcmp(child, parent) == 0
--		|| (strncmp(child, parent, l) == 0 && child[l] == '/');
-+	return (strncmp(child, parent, l) == 0 && child[l] == '/');
- }
- 
- static int path_matches(nfs_export *exp, char *path)
- {
--	if (exp->m_export.e_flags & NFSEXP_CROSSMOUNT)
--		return is_subdirectory(path, exp->m_export.e_path);
--	return strcmp(path, exp->m_export.e_path) == 0;
-+	/* Does the path match the export?  I.e. is it an
-+	 * exact match, or does the export have CROSSMOUNT, and path
-+	 * is a descendant?
-+	 */
-+	return strcmp(path, exp->m_export.e_path) == 0
-+		|| ((exp->m_export.e_flags & NFSEXP_CROSSMOUNT)
-+		    && is_subdirectory(path, exp->m_export.e_path));
- }
- 
- static int
-@@ -369,15 +375,13 @@ export_matches(nfs_export *exp, char *dom, char *path, struct addrinfo *ai)
- 	return path_matches(exp, path) && client_matches(exp, dom, ai);
- }
- 
--/* True iff e1 is a child of e2 and e2 has crossmnt set: */
-+/* True iff e1 is a child of e2 (or descendant) and e2 has crossmnt set: */
- static bool subexport(struct exportent *e1, struct exportent *e2)
- {
- 	char *p1 = e1->e_path, *p2 = e2->e_path;
--	size_t l2 = strlen(p2);
- 
- 	return e2->e_flags & NFSEXP_CROSSMOUNT
--		&& strncmp(p1, p2, l2) == 0
--		&& p1[l2] == '/';
-+		&& is_subdirectory(p1, p2);
- }
- 
- struct parsed_fsid {
--- 
-1.8.3.2
-
diff --git a/net-fs/nfs-utils/files/0001-statd-exit-if-a-statd-is-already-running.patch b/net-fs/nfs-utils/files/0001-statd-exit-if-a-statd-is-already-running.patch
deleted file mode 100644
index 4e8be2fd43eb..000000000000
--- a/net-fs/nfs-utils/files/0001-statd-exit-if-a-statd-is-already-running.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-From 342446a4a624d4ee8254af859bb7f1de6d268679 Mon Sep 17 00:00:00 2001
-From: Weston Andros Adamson <dros@netapp.com>
-Date: Tue, 7 May 2013 11:25:29 -0400
-Subject: [PATCH] statd: exit if a statd is already running
-
-Moves nfs_probe_statd from mount to nfs support lib to share with statd.
-
-Acked-by: Chuck Lever <chuck.lever@oracle.com>
-Signed-off-by: Weston Andros Adamson <dros@netapp.com>
-Signed-off-by: Steve Dickson <steved@redhat.com>
----
- support/include/nfsrpc.h |  5 +++++
- support/nfs/getport.c    | 22 ++++++++++++++++++++++
- utils/mount/network.c    | 17 -----------------
- utils/statd/statd.c      |  7 +++++++
- 4 files changed, 34 insertions(+), 17 deletions(-)
-
-diff --git a/support/include/nfsrpc.h b/support/include/nfsrpc.h
-index a0b80e1..1bfae7a 100644
---- a/support/include/nfsrpc.h
-+++ b/support/include/nfsrpc.h
-@@ -156,6 +156,11 @@ extern unsigned long	nfs_pmap_getport(const struct sockaddr_in *,
- 				const struct timeval *);
- 
- /*
-+ * Use nfs_pmap_getport to see if statd is running locally
-+ */
-+extern int nfs_probe_statd(void);
-+
-+/*
-  * Contact a remote RPC service to discover whether it is responding
-  * to requests.
-  */
-diff --git a/support/nfs/getport.c b/support/nfs/getport.c
-index 3331ad4..081594c 100644
---- a/support/nfs/getport.c
-+++ b/support/nfs/getport.c
-@@ -1102,3 +1102,25 @@ unsigned long nfs_pmap_getport(const struct sockaddr_in *sin,
- 
- 	return port;
- }
-+
-+static const char *nfs_ns_pgmtbl[] = {
-+        "status",
-+        NULL,
-+};
-+
-+/*
-+ * nfs_probe_statd - use nfs_pmap_getport to see if statd is running locally
-+ *
-+ * Returns non-zero if statd is running locally.
-+ */
-+int nfs_probe_statd(void)
-+{
-+        struct sockaddr_in addr = {
-+                .sin_family             = AF_INET,
-+                .sin_addr.s_addr        = htonl(INADDR_LOOPBACK),
-+        };
-+        rpcprog_t program = nfs_getrpcbyname(NSMPROG, nfs_ns_pgmtbl);
-+
-+        return nfs_getport_ping((struct sockaddr *)(char *)&addr, sizeof(addr),
-+                                program, (rpcvers_t)1, IPPROTO_UDP);
-+}
-diff --git a/utils/mount/network.c b/utils/mount/network.c
-index 4be48cd..e2cdcaf 100644
---- a/utils/mount/network.c
-+++ b/utils/mount/network.c
-@@ -65,11 +65,6 @@ extern int nfs_mount_data_version;
- extern char *progname;
- extern int verbose;
- 
--static const char *nfs_ns_pgmtbl[] = {
--	"status",
--	NULL,
--};
--
- static const char *nfs_mnt_pgmtbl[] = {
- 	"mount",
- 	"mountd",
-@@ -761,18 +756,6 @@ int probe_bothports(clnt_addr_t *mnt_server, clnt_addr_t *nfs_server)
- 					&nfs_server->pmap);
- }
- 
--static int nfs_probe_statd(void)
--{
--	struct sockaddr_in addr = {
--		.sin_family		= AF_INET,
--		.sin_addr.s_addr	= htonl(INADDR_LOOPBACK),
--	};
--	rpcprog_t program = nfs_getrpcbyname(NSMPROG, nfs_ns_pgmtbl);
--
--	return nfs_getport_ping(SAFE_SOCKADDR(&addr), sizeof(addr),
--				program, (rpcvers_t)1, IPPROTO_UDP);
--}
--
- /**
-  * start_statd - attempt to start rpc.statd
-  *
-diff --git a/utils/statd/statd.c b/utils/statd/statd.c
-index 652546c..8c51bcc 100644
---- a/utils/statd/statd.c
-+++ b/utils/statd/statd.c
-@@ -28,6 +28,7 @@
- 
- #include "statd.h"
- #include "nfslib.h"
-+#include "nfsrpc.h"
- #include "nsm.h"
- 
- /* Socket operations */
-@@ -237,6 +238,12 @@ int main (int argc, char **argv)
- 	/* Set hostname */
- 	MY_NAME = NULL;
- 
-+	/* Refuse to start if another statd is running */
-+	if (nfs_probe_statd()) {
-+		fprintf(stderr, "Statd service already running!\n");
-+		exit(1);
-+	}
-+
- 	/* Process command line switches */
- 	while ((arg = getopt_long(argc, argv, "h?vVFNH:dn:p:o:P:L", longopts, NULL)) != EOF) {
- 		switch (arg) {
--- 
-1.8.3.2
-
diff --git a/net-fs/nfs-utils/files/nfs-utils-1.1.4-ascii-man.patch b/net-fs/nfs-utils/files/nfs-utils-1.1.4-ascii-man.patch
deleted file mode 100644
index 83ed4aa42661..000000000000
--- a/net-fs/nfs-utils/files/nfs-utils-1.1.4-ascii-man.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-ripped from Debian
-
-http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=493659
-patch by nbreen@ofb.net (Nicholas Breen)
-
---- nfs-utils-1.1.3/utils/mount/nfs.man
-+++ nfs-utils-1.1.3/utils/mount/nfs.man
-@@ -799,7 +799,7 @@
- and server load.
- .P
- However, UDP can be quite effective in specialized settings where  
--the network’s MTU is large relative to NFS’s data transfer size (such  
-+the network's MTU is large relative to NFS's data transfer size (such  
- as network environments that enable jumbo Ethernet frames).  In such  
- environments, trimming the 
- .B rsize 
diff --git a/net-fs/nfs-utils/files/nfs-utils-1.1.4-no-exec.patch b/net-fs/nfs-utils/files/nfs-utils-1.1.4-no-exec.patch
deleted file mode 100644
index ea50a21d85dc..000000000000
--- a/net-fs/nfs-utils/files/nfs-utils-1.1.4-no-exec.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-ripped from Debian
-
---- nfs-utils-1.1.2/utils/mount/mount.c
-+++ nfs-utils-1.1.2/utils/mount/mount.c
-@@ -381,10 +381,6 @@
- 		mount_error(NULL, mount_point, ENOTDIR);
- 		return 1;
- 	}
--	if (access(mount_point, X_OK) < 0) {
--		mount_error(NULL, mount_point, errno);
--		return 1;
--	}
- 
- 	return 0;
- }
diff --git a/net-fs/nfs-utils/files/nfs-utils-1.1.4-rpcgen-ioctl.patch b/net-fs/nfs-utils/files/nfs-utils-1.1.4-rpcgen-ioctl.patch
deleted file mode 100644
index 176541845ed9..000000000000
--- a/net-fs/nfs-utils/files/nfs-utils-1.1.4-rpcgen-ioctl.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-http://bugs.gentoo.org/174393
-
---- tools/rpcgen/rpc_main.c
-+++ tools/rpcgen/rpc_main.c
-@@ -548,7 +548,7 @@
- 	  f_print(fout, "#include <sys/ttycom.h>/* TIOCNOTTY */\n");
- #else
- 	if( !tirpcflag )
--	  f_print(fout, "#include <sys/ttycom.h>/* TIOCNOTTY */\n");
-+	  f_print(fout, "#include <sys/ioctl.h>/* TIOCNOTTY */\n");
- #endif
- 	if( Cflag && (inetdflag || pmflag ) ) {
- 	  f_print(fout, "#ifdef __cplusplus\n");
diff --git a/net-fs/nfs-utils/files/nfs-utils-1.2.2-nfsv4.patch b/net-fs/nfs-utils/files/nfs-utils-1.2.2-nfsv4.patch
deleted file mode 100644
index cef774fe4b47..000000000000
--- a/net-fs/nfs-utils/files/nfs-utils-1.2.2-nfsv4.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: nfs-utils-1.2.2/configure.ac
-===================================================================
---- nfs-utils-1.2.2.orig/configure.ac
-+++ nfs-utils-1.2.2/configure.ac
-@@ -81,7 +81,7 @@ AC_ARG_ENABLE(nfsv41,
- 	if test "$enable_nfsv41" = yes; then
- 		AC_DEFINE(NFS41_SUPPORTED, 1, [Define this if you want NFSv41 support compiled in])
- 	else
--		enable_nfsv4=
-+		enable_nfsv41=
- 	fi
- 	AC_SUBST(enable_nfsv41)
- 	AM_CONDITIONAL(CONFIG_NFSV41, [test "$enable_nfsv41" = "yes"])
diff --git a/net-fs/nfs-utils/files/nfs-utils-1.2.2-optional-libcap.patch b/net-fs/nfs-utils/files/nfs-utils-1.2.2-optional-libcap.patch
deleted file mode 100644
index eb8ce44d595c..000000000000
--- a/net-fs/nfs-utils/files/nfs-utils-1.2.2-optional-libcap.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From 655f6933b5db66c560098d039e3c91812399beca Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Tue, 20 Apr 2010 04:45:35 -0400
-Subject: [PATCH] make capabilities support optional
-
-The new code using libcap is quite minor, so rather than always reqiure
-libcap support, make it a normal --enable type flag.  Current default
-behavior is retained -- if libcap is found, it is enabled, else it is
-disabled like every nfs-utils version in the past.
-
-URL: https://bugs.gentoo.org/314777
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- aclocal/libcap.m4  |   18 +++++++++++++-----
- support/nsm/file.c |    4 ++++
- 2 files changed, 17 insertions(+), 5 deletions(-)
-
-diff --git a/aclocal/libcap.m4 b/aclocal/libcap.m4
-index eabe507..68a624c 100644
---- a/aclocal/libcap.m4
-+++ b/aclocal/libcap.m4
-@@ -5,11 +5,19 @@ AC_DEFUN([AC_LIBCAP], [
-   dnl look for prctl
-   AC_CHECK_FUNC([prctl], , )
- 
--  dnl look for the library; do not add to LIBS if found
--  AC_CHECK_LIB([cap], [cap_get_proc], [LIBCAP=-lcap], ,)
--  AC_SUBST(LIBCAP)
-+  AC_ARG_ENABLE([caps],
-+    [AS_HELP_STRING([--disable-caps], [Disable capabilities support])])
-+
-+  LIBCAP=
-+
-+  if test "x$enable_caps" != "xno" ; then
-+    dnl look for the library; do not add to LIBS if found
-+    AC_CHECK_LIB([cap], [cap_get_proc], [LIBCAP=-lcap], ,)
- 
--  AC_CHECK_HEADERS([sys/capability.h], ,
--                   [AC_MSG_ERROR([libcap headers not found.])])
-+    AC_CHECK_HEADERS([sys/capability.h], ,
-+      [test "x$enable_caps" = "xyes" && AC_MSG_ERROR([libcap headers not found.])])
-+  fi
-+
-+  AC_SUBST(LIBCAP)
- 
- ])dnl
-diff --git a/support/nsm/file.c b/support/nsm/file.c
-index d469219..f4baeb9 100644
---- a/support/nsm/file.c
-+++ b/support/nsm/file.c
-@@ -67,7 +67,9 @@
- #endif
- 
- #include <sys/types.h>
-+#ifdef HAVE_SYS_CAPABILITY_H
- #include <sys/capability.h>
-+#endif
- #include <sys/prctl.h>
- #include <sys/stat.h>
- 
-@@ -347,6 +349,7 @@ nsm_is_default_parentdir(void)
- static _Bool
- nsm_clear_capabilities(void)
- {
-+#ifdef HAVE_SYS_CAPABILITY_H
- 	cap_t caps;
- 
- 	caps = cap_from_text("cap_net_bind_service=ep");
-@@ -362,6 +365,7 @@ nsm_clear_capabilities(void)
- 	}
- 
- 	(void)cap_free(caps);
-+#endif
- 	return true;
- }
- 
--- 
-1.7.0.2
-
diff --git a/net-fs/nfs-utils/files/nfs-utils-1.2.3-ti-rpc-static-ports.patch b/net-fs/nfs-utils/files/nfs-utils-1.2.3-ti-rpc-static-ports.patch
deleted file mode 100644
index b66e981b44a3..000000000000
--- a/net-fs/nfs-utils/files/nfs-utils-1.2.3-ti-rpc-static-ports.patch
+++ /dev/null
@@ -1,352 +0,0 @@
-http://bugs.gentoo.org/340797
-
-From 656028f9925f5817c5a37565d27159973db84ec3 Mon Sep 17 00:00:00 2001
-From: Chuck Lever <chuck.lever@oracle.com>
-Date: Wed, 13 Oct 2010 11:22:07 -0400
-Subject: [PATCH] libnfs.a: Allow multiple RPC listeners to share	listener port number
-
-Normally, when "-p" is not specified on the mountd command line, the
-TI-RPC library chooses random port numbers for each listener.  If a
-port number _is_ specified on the command line, all the listeners
-will get the same port number, so SO_REUSEADDR needs to be set on
-each socket.
-
-Thus we can't let TI-RPC create the listener sockets for us in this
-case; we must create them ourselves and then set SO_REUSEADDR (and
-other socket options) by hand.
-
-Different versions of the same RPC program have to share the same
-listener and SVCXPRT, so we have to cache xprts we create, and re-use
-them when additional requests for registration come from the
-application.
-
-Though it doesn't look like it, this fix was "copied" from the legacy
-rpc_init() function.  It's more complicated for TI-RPC, of course,
-since a TI-RPC application can set up listeners with a nearly
-arbitrary number of address families and socket types, not just the
-two listeners that legacy RPC applications can set up (one for AF_INET
-UDP and one for AF_INET TCP).
-
-See:
-  https://bugzilla.linux-nfs.org/show_bug.cgi?id=190
-
-Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
-Signed-off-by: Steve Dickson <steved@redhat.com>
----
- support/nfs/svc_create.c |  252 ++++++++++++++++++++++++++++++++++++++++++++-
- 1 files changed, 246 insertions(+), 6 deletions(-)
-
-diff --git a/support/nfs/svc_create.c b/support/nfs/svc_create.c
-index 59ba505..b3f75ed 100644
---- a/support/nfs/svc_create.c
-+++ b/support/nfs/svc_create.c
-@@ -27,6 +27,7 @@
- #include <memory.h>
- #include <signal.h>
- #include <unistd.h>
-+#include <errno.h>
- #include <netdb.h>
- 
- #include <netinet/in.h>
-@@ -41,11 +42,68 @@
- #include "tcpwrapper.h"
- #endif
- 
-+#include "sockaddr.h"
- #include "rpcmisc.h"
- #include "xlog.h"
- 
- #ifdef HAVE_LIBTIRPC
- 
-+#define SVC_CREATE_XPRT_CACHE_SIZE	(8)
-+static SVCXPRT *svc_create_xprt_cache[SVC_CREATE_XPRT_CACHE_SIZE] = { NULL, };
-+
-+/*
-+ * Cache an SVC xprt, in case there are more programs or versions to
-+ * register against it.
-+ */
-+static void
-+svc_create_cache_xprt(SVCXPRT *xprt)
-+{
-+	unsigned int i;
-+
-+	/* Check if we've already got this one... */
-+	for (i = 0; i < SVC_CREATE_XPRT_CACHE_SIZE; i++)
-+		if (svc_create_xprt_cache[i] == xprt)
-+			return;
-+
-+	/* No, we don't.  Cache it. */
-+	for (i = 0; i < SVC_CREATE_XPRT_CACHE_SIZE; i++)
-+		if (svc_create_xprt_cache[i] == NULL) {
-+			svc_create_xprt_cache[i] = xprt;
-+			return;
-+		}
-+
-+	xlog(L_ERROR, "%s: Failed to cache an xprt", __func__);
-+}
-+
-+/*
-+ * Find a previously cached SVC xprt structure with the given bind address
-+ * and transport semantics.
-+ *
-+ * Returns pointer to a cached SVC xprt.
-+ *
-+ * If no matching SVC XPRT can be found, NULL is returned.
-+ */
-+static SVCXPRT *
-+svc_create_find_xprt(const struct sockaddr *bindaddr, const struct netconfig *nconf)
-+{
-+	unsigned int i;
-+
-+	for (i = 0; i < SVC_CREATE_XPRT_CACHE_SIZE; i++) {
-+		SVCXPRT *xprt = svc_create_xprt_cache[i];
-+		struct sockaddr *sap;
-+
-+		if (xprt == NULL)
-+			continue;
-+		if (strcmp(nconf->nc_netid, xprt->xp_netid) != 0)
-+			continue;
-+		sap = (struct sockaddr *)xprt->xp_ltaddr.buf;
-+		if (!nfs_compare_sockaddr(bindaddr, sap))
-+			continue;
-+		return xprt;
-+	}
-+	return NULL;
-+}
-+
- /*
-  * Set up an appropriate bind address, given @port and @nconf.
-  *
-@@ -98,17 +156,113 @@ svc_create_bindaddr(struct netconfig *nconf, const uint16_t port)
- 	return ai;
- }
- 
-+/*
-+ * Create a listener socket on a specific bindaddr, and set
-+ * special socket options to allow it to share the same port
-+ * as other listeners.
-+ *
-+ * Returns an open, bound, and possibly listening network
-+ * socket on success.
-+ *
-+ * Otherwise returns -1 if some error occurs.
-+ */
-+static int
-+svc_create_sock(const struct sockaddr *sap, socklen_t salen,
-+		struct netconfig *nconf)
-+{
-+	int fd, type, protocol;
-+	int one = 1;
-+
-+	switch(nconf->nc_semantics) {
-+	case NC_TPI_CLTS:
-+		type = SOCK_DGRAM;
-+		break;
-+	case NC_TPI_COTS_ORD:
-+		type = SOCK_STREAM;
-+		break;
-+	default:
-+		xlog(D_GENERAL, "%s: Unrecognized bind address semantics: %u",
-+			__func__, nconf->nc_semantics);
-+		return -1;
-+	}
-+
-+	if (strcmp(nconf->nc_proto, NC_UDP) == 0)
-+		protocol = (int)IPPROTO_UDP;
-+	else if (strcmp(nconf->nc_proto, NC_TCP) == 0)
-+		protocol = (int)IPPROTO_TCP;
-+	else {
-+		xlog(D_GENERAL, "%s: Unrecognized bind address protocol: %s",
-+			__func__, nconf->nc_proto);
-+		return -1;
-+	}
-+
-+	fd = socket((int)sap->sa_family, type, protocol);
-+	if (fd == -1) {
-+		xlog(L_ERROR, "Could not make a socket: (%d) %m",
-+			errno);
-+		return -1;
-+	}
-+
-+#ifdef IPV6_SUPPORTED
-+	if (sap->sa_family == AF_INET6) {
-+		if (setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY,
-+				&one, sizeof(one)) == -1) {
-+			xlog(L_ERROR, "Failed to set IPV6_V6ONLY: (%d) %m",
-+				errno);
-+			(void)close(fd);
-+			return -1;
-+		}
-+	}
-+#endif	/* IPV6_SUPPORTED */
-+
-+	if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR,
-+		       &one, sizeof(one)) == -1) {
-+		xlog(L_ERROR, "Failed to set SO_REUSEADDR: (%d) %m",
-+			errno);
-+		(void)close(fd);
-+		return -1;
-+	}
-+
-+	if (bind(fd, sap, salen) == -1) {
-+		xlog(L_ERROR, "Could not bind socket: (%d) %m",
-+			errno);
-+		(void)close(fd);
-+		return -1;
-+	}
-+
-+	if (nconf->nc_semantics == NC_TPI_COTS_ORD)
-+		if (listen(fd, SOMAXCONN) == -1) {
-+			xlog(L_ERROR, "Could not listen on socket: (%d) %m",
-+				errno);
-+			(void)close(fd);
-+			return -1;
-+		}
-+
-+	return fd;
-+}
-+
-+/*
-+ * The simple case is allowing the TI-RPC library to create a
-+ * transport itself, given just the bind address and transport
-+ * semantics.
-+ *
-+ * Our local xprt cache is ignored in this path, since the
-+ * caller is not interested in sharing listeners or ports, and
-+ * the library automatically avoids ports already in use.
-+ *
-+ * Returns the count of started listeners (one or zero).
-+ */
- static unsigned int
--svc_create_nconf(const char *name, const rpcprog_t program,
-+svc_create_nconf_rand_port(const char *name, const rpcprog_t program,
- 		const rpcvers_t version,
- 		void (*dispatch)(struct svc_req *, SVCXPRT *),
--		const uint16_t port, struct netconfig *nconf)
-+		struct netconfig *nconf)
- {
- 	struct t_bind bindaddr;
- 	struct addrinfo *ai;
- 	SVCXPRT	*xprt;
- 
--	ai = svc_create_bindaddr(nconf, port);
-+	ai = svc_create_bindaddr(nconf, 0);
- 	if (ai == NULL)
- 		return 0;
- 
-@@ -119,7 +273,7 @@ svc_create_nconf(const char *name, const rpcprog_t program,
- 	freeaddrinfo(ai);
- 	if (xprt == NULL) {
- 		xlog(D_GENERAL, "Failed to create listener xprt "
--				"(%s, %u, %s)", name, version, nconf->nc_netid);
-+			"(%s, %u, %s)", name, version, nconf->nc_netid);
- 		return 0;
- 	}
- 
-@@ -133,6 +287,93 @@ svc_create_nconf(const char *name, const rpcprog_t program,
- 	return 1;
- }
- 
-+/*
-+ * If a port is specified on the command line, that port value will be
-+ * the same for all listeners created here.  Create each listener
-+ * socket in advance and set SO_REUSEADDR, rather than allowing the
-+ * RPC library to create the listeners for us on a randomly chosen
-+ * port via svc_tli_create(RPC_ANYFD).
-+ *
-+ * Some callers want to listen for more than one RPC version using the
-+ * same port number.  For example, mountd could want to listen for MNT
-+ * version 1, 2, and 3 requests.  This means mountd must use the same
-+ * set of listener sockets for multiple RPC versions, since, on one
-+ * system, you can't have two listener sockets with the exact same
-+ * bind address (and port) and transport protocol.
-+ *
-+ * To accomplish this, this function caches xprts as they are created.
-+ * This cache is checked to see if a previously created xprt can be
-+ * used, before creating a new xprt for this [program, version].  If
-+ * there is a cached xprt with the same bindaddr and transport
-+ * semantics, we simply register the new version with that xprt,
-+ * rather than creating a fresh xprt for it.
-+ *
-+ * The xprt cache implemented here is local to a process.  Two
-+ * separate RPC daemons can not share a set of listeners.
-+ *
-+ * Returns the count of started listeners (one or zero).
-+ */
-+static unsigned int
-+svc_create_nconf_fixed_port(const char *name, const rpcprog_t program,
-+		const rpcvers_t version,
-+		void (*dispatch)(struct svc_req *, SVCXPRT *),
-+		const uint16_t port, struct netconfig *nconf)
-+{
-+	struct addrinfo *ai;
-+	SVCXPRT	*xprt;
-+
-+	ai = svc_create_bindaddr(nconf, port);
-+	if (ai == NULL)
-+		return 0;
-+
-+	xprt = svc_create_find_xprt(ai->ai_addr, nconf);
-+	if (xprt == NULL) {
-+		int fd;
-+
-+		fd = svc_create_sock(ai->ai_addr, ai->ai_addrlen, nconf);
-+		if (fd == -1)
-+			goto out_free;
-+
-+		xprt = svc_tli_create(fd, nconf, NULL, 0, 0);
-+		if (xprt == NULL) {
-+			xlog(D_GENERAL, "Failed to create listener xprt "
-+				"(%s, %u, %s)", name, version, nconf->nc_netid);
-+			(void)close(fd);
-+			goto out_free;
-+		}
-+	}
-+
-+	if (!svc_reg(xprt, program, version, dispatch, nconf)) {
-+		/* svc_reg(3) destroys @xprt in this case */
-+		xlog(D_GENERAL, "Failed to register (%s, %u, %s)",
-+				name, version, nconf->nc_netid);
-+		goto out_free;
-+	}
-+
-+	svc_create_cache_xprt(xprt);
-+
-+	freeaddrinfo(ai);
-+	return 1;
-+
-+out_free:
-+	freeaddrinfo(ai);
-+	return 0;
-+}
-+
-+static unsigned int
-+svc_create_nconf(const char *name, const rpcprog_t program,
-+		const rpcvers_t version,
-+		void (*dispatch)(struct svc_req *, SVCXPRT *),
-+		const uint16_t port, struct netconfig *nconf)
-+{
-+	if (port != 0)
-+		return svc_create_nconf_fixed_port(name, program,
-+			version, dispatch, port, nconf);
-+
-+	return svc_create_nconf_rand_port(name, program,
-+			version, dispatch, nconf);
-+}
-+
- /**
-  * nfs_svc_create - start up RPC svc listeners
-  * @name: C string containing name of new service
-@@ -145,8 +386,7 @@ svc_create_nconf(const char *name, const rpcprog_t program,
-  * the RPC dispatcher.  Returns the number of started network transports.
-  */
- unsigned int
--nfs_svc_create(__attribute__((unused)) char *name,
--		const rpcprog_t program, const rpcvers_t version,
-+nfs_svc_create(char *name, const rpcprog_t program, const rpcvers_t version,
- 		void (*dispatch)(struct svc_req *, SVCXPRT *),
- 		const uint16_t port)
- {
--- 
-1.7.3.1
-
diff --git a/net-fs/nfs-utils/files/nfs-utils-1.2.4-conditional.patch b/net-fs/nfs-utils/files/nfs-utils-1.2.4-conditional.patch
deleted file mode 100644
index 248de34c5073..000000000000
--- a/net-fs/nfs-utils/files/nfs-utils-1.2.4-conditional.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-taken from upstream git
-
-diff --git a/configure.ac b/configure.ac
-index ca12f9e..593808c 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -256,9 +256,6 @@ if test "$enable_nfsv4" = yes; then
-   dnl check for nfsidmap libraries and headers
-   AC_LIBNFSIDMAP
- 
--  dnl enable nfsidmap when its support by libnfsidmap
--  AM_CONDITIONAL(CONFIG_NFSIDMAP, [test "$enable_nfsidmap" = "yes"])
--
-   dnl check for the keyutils libraries and headers
-   AC_KEYUTILS
- 
-@@ -268,6 +265,9 @@ if test "$enable_nfsv4" = yes; then
-     AC_RPCSEC_VERSION
-   fi
- fi
-+dnl enable nfsidmap when its support by libnfsidmap
-+AM_CONDITIONAL(CONFIG_NFSIDMAP, [test "$enable_nfsidmap" = "yes"])
-+
- 
- if test "$knfsd_cv_glibc2" = no; then
-     AC_CHECK_LIB(bsd, daemon, [LIBBSD="-lbsd"])
diff --git a/net-fs/nfs-utils/files/nfs-utils-1.2.4-cross-build.patch b/net-fs/nfs-utils/files/nfs-utils-1.2.4-cross-build.patch
deleted file mode 100644
index c8f5fb9ee8fe..000000000000
--- a/net-fs/nfs-utils/files/nfs-utils-1.2.4-cross-build.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-this is kind of hacky, but automake doesn't make this easy
-for us atm, so hack away :(
-
-(recent autotools will always add $(CFLAGS)/etc... to the compile)
-
---- a/tools/locktest/Makefile.am
-+++ b/tools/locktest/Makefile.am
-@@ -1,12 +1,11 @@
- ## Process this file with automake to produce Makefile.in
- 
- CC=$(CC_FOR_BUILD)
--LIBTOOL = @LIBTOOL@ --tag=CC
-+CFLAGS=$(CFLAGS_FOR_BUILD)
-+CPPFLAGS=$(CPPFLAGS_FOR_BUILD)
-+LDFLAGS=$(LDFLAGS_FOR_BUILD)
- 
- noinst_PROGRAMS = testlk
- testlk_SOURCES = testlk.c
--testlk_CFLAGS=$(CFLAGS_FOR_BUILD)
--testlk_CPPFLAGS=$(CPPFLAGS_FOR_BUILD)
--testlk_LDFLAGS=$(LDFLAGS_FOR_BUILD)
- 
- MAINTAINERCLEANFILES = Makefile.in
---- a/tools/rpcdebug/Makefile.am
-+++ b/tools/rpcdebug/Makefile.am
-@@ -1,15 +1,14 @@
- ## Process this file with automake to produce Makefile.in
- 
- CC=$(CC_FOR_BUILD)
--LIBTOOL = @LIBTOOL@ --tag=CC
-+CFLAGS=$(CFLAGS_FOR_BUILD)
-+CPPFLAGS=$(CPPFLAGS_FOR_BUILD)
-+LDFLAGS=$(LDFLAGS_FOR_BUILD)
- 
- man8_MANS = rpcdebug.man
- EXTRA_DIST = $(man8_MANS)
- 
- sbin_PROGRAMS = rpcdebug
- rpcdebug_SOURCES = rpcdebug.c
--rpcdebug_CFLAGS=$(CFLAGS_FOR_BUILD)
--rpcdebug_CPPFLAGS=$(CPPFLAGS_FOR_BUILD) -I$(top_srcdir)/support/include
--rpcdebug_LDFLAGS=$(LDFLAGS_FOR_BUILD)
- 
- MAINTAINERCLEANFILES = Makefile.in
---- a/tools/rpcgen/Makefile.am
-+++ b/tools/rpcgen/Makefile.am
-@@ -1,7 +1,9 @@
- ## Process this file with automake to produce Makefile.in
- 
- CC=$(CC_FOR_BUILD)
--LIBTOOL = @LIBTOOL@ --tag=CC
-+CFLAGS=$(CFLAGS_FOR_BUILD)
-+CPPFLAGS=$(CPPFLAGS_FOR_BUILD)
-+LDFLAGS=$(LDFLAGS_FOR_BUILD)
- 
- noinst_PROGRAMS = rpcgen
- rpcgen_SOURCES = rpc_clntout.c rpc_cout.c rpc_hout.c rpc_main.c \
-@@ -9,10 +11,6 @@
- 		 rpc_util.c rpc_sample.c rpc_output.h rpc_parse.h \
- 		 rpc_scan.h rpc_util.h
- 
--rpcgen_CFLAGS=$(CFLAGS_FOR_BUILD)
--rpcgen_CPPLAGS=$(CPPFLAGS_FOR_BUILD)
--rpcgen_LDFLAGS=$(LDFLAGS_FOR_BUILD)
--
- MAINTAINERCLEANFILES = Makefile.in
- 
- EXTRA_DIST = rpcgen.new.1
diff --git a/net-fs/nfs-utils/files/nfs-utils-1.2.4-exportfs-skip-dir.patch b/net-fs/nfs-utils/files/nfs-utils-1.2.4-exportfs-skip-dir.patch
deleted file mode 100644
index af14ab66aafb..000000000000
--- a/net-fs/nfs-utils/files/nfs-utils-1.2.4-exportfs-skip-dir.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 5dc4c89b6935fcfe327b77681362319e6fd407e0 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Thu, 1 Sep 2011 11:08:04 -0400
-Subject: [PATCH] exportfs: do not warn if /etc/exports.d/ does not exist
-
-It isn't uncommon for /etc/exports.d/ to not exist, and imo, it's not
-that big of a deal as often times, a simple /etc/exports is sufficient.
-So silently skip the case where the dir is missing.
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- utils/exportfs/exportfs.c |    7 +++++--
- 1 files changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/utils/exportfs/exportfs.c b/utils/exportfs/exportfs.c
-index 986a272..7432a65 100644
---- a/utils/exportfs/exportfs.c
-+++ b/utils/exportfs/exportfs.c
-@@ -529,9 +529,12 @@ export_d_read(const char *dname)
- 
- 
- 	n = scandir(dname, &namelist, NULL, versionsort);
--	if (n < 0)
-+	if (n < 0) {
-+		if (errno == ENOENT)
-+			/* Silently return */
-+			return;
- 		xlog(L_NOTICE, "scandir %s: %s", dname, strerror(errno));
--	else if (n == 0)
-+	} else if (n == 0)
- 		return;
- 
- 	for (i = 0; i < n; i++) {
--- 
-1.7.6
-
diff --git a/net-fs/nfs-utils/files/nfs-utils-1.2.4-exportfs-xlog.patch b/net-fs/nfs-utils/files/nfs-utils-1.2.4-exportfs-xlog.patch
deleted file mode 100644
index 0e17e9538b08..000000000000
--- a/net-fs/nfs-utils/files/nfs-utils-1.2.4-exportfs-xlog.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From aacec6914549f5bf4f5fb2aed0925a8a7e57b50c Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Thu, 1 Sep 2011 11:00:39 -0400
-Subject: [PATCH] exportfs: drop extra newline in xlog
-
-Since xlog() itself appends a newline, we don't want to add our own
-otherwise we get extra in the output.
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- utils/exportfs/exportfs.c |    8 ++++----
- 1 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/utils/exportfs/exportfs.c b/utils/exportfs/exportfs.c
-index 12e8bf1..986a272 100644
---- a/utils/exportfs/exportfs.c
-+++ b/utils/exportfs/exportfs.c
-@@ -401,7 +401,7 @@ validate_export(nfs_export *exp)
- 	int fs_has_fsid = 0;
- 
- 	if (stat(path, &stb) < 0) {
--		xlog(L_ERROR, "Failed to stat %s: %m \n", path);
-+		xlog(L_ERROR, "Failed to stat %s: %m", path);
- 		return;
- 	}
- 	if (!S_ISDIR(stb.st_mode) && !S_ISREG(stb.st_mode)) {
-@@ -530,7 +530,7 @@ export_d_read(const char *dname)
- 
- 	n = scandir(dname, &namelist, NULL, versionsort);
- 	if (n < 0)
--		xlog(L_NOTICE, "scandir %s: %s\n", dname, strerror(errno));
-+		xlog(L_NOTICE, "scandir %s: %s", dname, strerror(errno));
- 	else if (n == 0)
- 		return;
- 
-@@ -558,7 +558,7 @@ export_d_read(const char *dname)
- 
- 		fname_len = snprintf(fname, PATH_MAX +1, "%s/%s", dname, d->d_name);
- 		if (fname_len > PATH_MAX) {
--			xlog(L_WARNING, "Too long file name: %s in %s\n", d->d_name, dname);
-+			xlog(L_WARNING, "Too long file name: %s in %s", d->d_name, dname);
- 			continue;
- 		}
- 
-@@ -672,7 +672,7 @@ dump(int verbose)
- static void
- error(nfs_export *exp, int err)
- {
--	xlog(L_ERROR, "%s:%s: %s\n", exp->m_client->m_hostname,
-+	xlog(L_ERROR, "%s:%s: %s", exp->m_client->m_hostname,
- 		exp->m_export.e_path, strerror(err));
- }
- 
--- 
-1.7.6
-
diff --git a/net-fs/nfs-utils/files/nfs-utils-1.2.4-nfsidmap.patch b/net-fs/nfs-utils/files/nfs-utils-1.2.4-nfsidmap.patch
deleted file mode 100644
index 13807b159be5..000000000000
--- a/net-fs/nfs-utils/files/nfs-utils-1.2.4-nfsidmap.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 5606a69f9981948e1d6a36df763b2f16c43f080b Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Fri, 2 Sep 2011 14:56:59 -0400
-Subject: [PATCH] nfsidmap: auto disable when keyutils is not found
-
-Since we already auto-disable based on libnfsidmap capabilities, don't
-make keyutils a hard failure.
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- aclocal/keyutils.m4    |    4 ++--
- aclocal/libnfsidmap.m4 |    3 +--
- configure.ac           |    2 +-
- 3 files changed, 4 insertions(+), 5 deletions(-)
-
-diff --git a/aclocal/keyutils.m4 b/aclocal/keyutils.m4
-index 84bc112..a392c0e 100644
---- a/aclocal/keyutils.m4
-+++ b/aclocal/keyutils.m4
-@@ -6,6 +6,6 @@ AC_DEFUN([AC_KEYUTILS], [
-   AC_CHECK_LIB([keyutils], [keyctl_instantiate], [LIBKEYUTILS=-lkeyutils], ,)
-   AC_SUBST(LIBKEYUTILS)
- 
--  AC_CHECK_HEADERS([keyutils.h], ,
--  		   [AC_MSG_ERROR([keyutils.h header not found.])])
-+  AC_CHECK_HEADERS([keyutils.h])
-+
- ])dnl
-diff --git a/aclocal/libnfsidmap.m4 b/aclocal/libnfsidmap.m4
-index 4faa923..484b1ec 100644
---- a/aclocal/libnfsidmap.m4
-+++ b/aclocal/libnfsidmap.m4
-@@ -15,7 +15,6 @@ AC_DEFUN([AC_LIBNFSIDMAP], [
-                           [Define to 1 if you have the `nfs4_set_debug' function.])])
- 
-   dnl only enable nfsidmap when libnfsidmap supports it
--  AC_CHECK_LIB([nfsidmap], [nfs4_owner_to_uid], [enable_nfsidmap=yes],
--               [enable_nfsidmap=no])
-+  AC_CHECK_LIB([nfsidmap], [nfs4_owner_to_uid])
- 
- ])dnl
-diff --git a/configure.ac b/configure.ac
-index c9fb27b..1a28f8a 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -266,7 +266,7 @@ if test "$enable_nfsv4" = yes; then
-   fi
- fi
- dnl enable nfsidmap when its support by libnfsidmap
--AM_CONDITIONAL(CONFIG_NFSIDMAP, [test "$enable_nfsidmap" = "yes"])
-+AM_CONDITIONAL(CONFIG_NFSIDMAP, [test "$ac_cv_header_keyutils_h$ac_cv_lib_nfsidmap_nfs4_owner_to_uid" = "yesyes"])
- 
- 
- if test "$knfsd_cv_glibc2" = no; then
--- 
-1.7.6
-
diff --git a/net-fs/nfs-utils/files/nfs-utils-1.2.4-no-nfsctl.patch b/net-fs/nfs-utils/files/nfs-utils-1.2.4-no-nfsctl.patch
deleted file mode 100644
index e36ac25547f3..000000000000
--- a/net-fs/nfs-utils/files/nfs-utils-1.2.4-no-nfsctl.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From b02133aaa4feec085627172b5466d8c64a11a5a6 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Thu, 8 Dec 2011 00:10:27 -0500
-Subject: [PATCH] nfsctl: fix building with newer arches
-
-Newer arches omitting both nfsctl and nfsservctl which breaks nfsctl.
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- support/nfs/nfsctl.c |    8 +++++++-
- 1 files changed, 7 insertions(+), 1 deletions(-)
-
-diff --git a/support/nfs/nfsctl.c b/support/nfs/nfsctl.c
-index 89fa1a4..fec775f 100644
---- a/support/nfs/nfsctl.c
-+++ b/support/nfs/nfsctl.c
-@@ -11,16 +11,22 @@
- #endif
- 
- #include <unistd.h>
-+#include <errno.h>
- #include <asm/unistd.h>
- #include "nfslib.h"
- 
- /* compatibility hack... */
--#ifndef __NR_nfsctl
-+#if !defined(__NR_nfsctl) && defined(__NR_nfsservctl)
- #define __NR_nfsctl	__NR_nfsservctl
- #endif
- 
- int
- nfsctl (int cmd, struct nfsctl_arg * argp, union nfsctl_res * resp)
- {
-+#ifdef __NR_nfsctl
-   return syscall (__NR_nfsctl, cmd, argp, resp);
-+#else
-+  errno = ENOSYS;
-+  return -1;
-+#endif
- }
--- 
-1.7.6.1
-
diff --git a/net-fs/nfs-utils/files/nfs-utils-1.2.6-conditionals.patch b/net-fs/nfs-utils/files/nfs-utils-1.2.6-conditionals.patch
deleted file mode 100644
index a2342b36b969..000000000000
--- a/net-fs/nfs-utils/files/nfs-utils-1.2.6-conditionals.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 869d37a16d1e409cedd95b03cea29a6db65f9276 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Diego=20Elio=20Petten=C3=B2?= <flameeyes@flameeyes.eu>
-Date: Thu, 17 May 2012 16:26:44 -0700
-Subject: [nfs-utils PATCH] build: avoid AM_CONDITIONAL in conditional
- execution.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Automake does not support conditional AM_CONDITIONAL calls; what that
-means is that you always have to execute AM_CONDITIONAL one way or the
-other. Both the libsqlite3.m4 file and the nfsdcld conditionals are
-executed only when NFSv4 is enabled, which breaks building with
---disable-nfsv4.
-
-Remove the SQLite3 conditional altogether as it's never used, and move
-the nfsdcld conditional outside of the conditional code.
-
-Signed-off-by: Diego Elio Pettenò <flameeyes@flameeyes.eu>
----
- aclocal/libsqlite3.m4 |    1 -
- configure.ac          |    3 +--
- 2 files changed, 1 insertions(+), 3 deletions(-)
-
-diff --git a/aclocal/libsqlite3.m4 b/aclocal/libsqlite3.m4
-index 73d1e46..8c38993 100644
---- a/aclocal/libsqlite3.m4
-+++ b/aclocal/libsqlite3.m4
-@@ -29,5 +29,4 @@ AC_DEFUN([AC_SQLITE3_VERS], [
-     LIBS="$saved_LIBS"])
- 
-   AC_MSG_RESULT($libsqlite3_cv_is_recent)
--  AM_CONDITIONAL(CONFIG_SQLITE3, [test "$libsqlite3_cv_is_recent" = "yes"])
- ])dnl
-diff --git a/configure.ac b/configure.ac
-index 9ba53e2..b408f1b 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -278,8 +278,6 @@ if test "$enable_nfsv4" = yes; then
- 	fi
-   fi
- 
--  AM_CONDITIONAL(CONFIG_NFSDCLD, [test "$enable_nfsdcld" = "yes" ])
--
-   dnl librpcsecgss already has a dependency on libgssapi,
-   dnl but we need to make sure we get the right version
-   if test "$enable_gss" = yes; then
-@@ -293,6 +291,7 @@ if test "$enable_nfsv41" = yes; then
- fi
- 
- dnl enable nfsidmap when its support by libnfsidmap
-+AM_CONDITIONAL(CONFIG_NFSDCLD, [test "$enable_nfsdcld" = "yes" ])
- AM_CONDITIONAL(CONFIG_NFSIDMAP, [test "$ac_cv_header_keyutils_h$ac_cv_lib_nfsidmap_nfs4_owner_to_uid" = "yesyes"])
- 
- 
--- 
-1.7.8.6
-
diff --git a/net-fs/nfs-utils/files/nfs-utils-1.2.6-cross-build.patch b/net-fs/nfs-utils/files/nfs-utils-1.2.6-cross-build.patch
deleted file mode 100644
index 2becf943a336..000000000000
--- a/net-fs/nfs-utils/files/nfs-utils-1.2.6-cross-build.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-this is kind of hacky, but automake doesn't make this easy
-for us atm, so hack away :(
-
-(recent autotools will always add $(CFLAGS)/etc... to the compile)
-
---- a/tools/locktest/Makefile.am
-+++ b/tools/locktest/Makefile.am
-@@ -1,12 +1,11 @@
- ## Process this file with automake to produce Makefile.in
- 
- CC=$(CC_FOR_BUILD)
--LIBTOOL = @LIBTOOL@ --tag=CC
-+CFLAGS=$(CFLAGS_FOR_BUILD)
-+CPPFLAGS=$(CPPFLAGS_FOR_BUILD)
-+LDFLAGS=$(LDFLAGS_FOR_BUILD)
- 
- noinst_PROGRAMS = testlk
- testlk_SOURCES = testlk.c
--testlk_CFLAGS=$(CFLAGS_FOR_BUILD)
--testlk_CPPFLAGS=$(CPPFLAGS_FOR_BUILD)
--testlk_LDFLAGS=$(LDFLAGS_FOR_BUILD)
- 
- MAINTAINERCLEANFILES = Makefile.in
---- a/tools/rpcdebug/Makefile.am
-+++ b/tools/rpcdebug/Makefile.am
-@@ -1,15 +1,14 @@
- ## Process this file with automake to produce Makefile.in
- 
- CC=$(CC_FOR_BUILD)
--LIBTOOL = @LIBTOOL@ --tag=CC
-+CFLAGS=$(CFLAGS_FOR_BUILD)
-+CPPFLAGS=$(CPPFLAGS_FOR_BUILD)
-+LDFLAGS=$(LDFLAGS_FOR_BUILD)
- 
- man8_MANS = rpcdebug.man
- EXTRA_DIST = $(man8_MANS)
- 
- sbin_PROGRAMS = rpcdebug
- rpcdebug_SOURCES = rpcdebug.c
--rpcdebug_CFLAGS=$(CFLAGS_FOR_BUILD)
--rpcdebug_CPPFLAGS=$(CPPFLAGS_FOR_BUILD) -I$(top_srcdir)/support/include
--rpcdebug_LDFLAGS=$(LDFLAGS_FOR_BUILD)
- 
- MAINTAINERCLEANFILES = Makefile.in
---- a/tools/rpcgen/Makefile.am
-+++ b/tools/rpcgen/Makefile.am
-@@ -1,7 +1,9 @@
- ## Process this file with automake to produce Makefile.in
- 
- CC=$(CC_FOR_BUILD)
--LIBTOOL = @LIBTOOL@ --tag=CC
-+CFLAGS=$(CFLAGS_FOR_BUILD)
-+CPPFLAGS=$(CPPFLAGS_FOR_BUILD)
-+LDFLAGS=$(LDFLAGS_FOR_BUILD)
- 
- noinst_PROGRAMS = rpcgen
- rpcgen_SOURCES = rpc_clntout.c rpc_cout.c rpc_hout.c rpc_main.c \
-@@ -9,10 +11,6 @@
- 		 rpc_util.c rpc_sample.c rpc_output.h rpc_parse.h \
- 		 rpc_scan.h rpc_util.h
- 
--rpcgen_CFLAGS=$(CFLAGS_FOR_BUILD)
--rpcgen_CPPLAGS=$(CPPFLAGS_FOR_BUILD)
--rpcgen_LDFLAGS=$(LDFLAGS_FOR_BUILD)
--rpcgen_LDADD=$(LIBTIRPC)
- 
- MAINTAINERCLEANFILES = Makefile.in
- 
- EXTRA_DIST = rpcgen.new.1
diff --git a/net-fs/nfs-utils/files/nfs-utils-1.2.6-osd-install.patch b/net-fs/nfs-utils/files/nfs-utils-1.2.6-osd-install.patch
deleted file mode 100644
index 2b637d1b7c7e..000000000000
--- a/net-fs/nfs-utils/files/nfs-utils-1.2.6-osd-install.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 6cecc20831eacec397a8c88b76757aeb662621e2 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Thu, 17 May 2012 01:18:57 -0400
-Subject: [PATCH] osd_login: fix DESTDIR install
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-If the destination dir doesn't exist, the current install fails:
-make  install-data-hook
-make[4]: Entering directory `/var/tmp/portage/net-fs/nfs-utils-1.2.6/work/nfs-utils-1.2.6/utils/osd_login'
-/usr/bin/install -c --mode 755 osd_login /var/tmp/portage/net-fs/nfs-utils-1.2.6/image//sbin/osd_login
-/usr/bin/install: cannot create regular file ‘/var/tmp/portage/net-fs/nfs-utils-1.2.6/image//sbin/osd_login’: No such file or directory
-make[4]: *** [install-data-hook] Error 1
-
-Rewrite the code to use automake's existing script support rather
-than trying to install the file by hand.
-
-Reported-by: Branko BAdrljica <brankob@avtomatika.com>
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- utils/osd_login/Makefile.am |   11 +++++------
- 1 files changed, 5 insertions(+), 6 deletions(-)
-
-diff --git a/utils/osd_login/Makefile.am b/utils/osd_login/Makefile.am
-index adc493a..c85584c 100644
---- a/utils/osd_login/Makefile.am
-+++ b/utils/osd_login/Makefile.am
-@@ -1,12 +1,11 @@
- ## Process this file with automake to produce Makefile.in
- 
--OSD_LOGIN_FILES= osd_login
--
--EXTRA_DIST= $(OSD_LOGIN_FILES)
-+# These scripts go in /sbin (not /usr/sbin), and that cannot be
-+# overriden at config time.
-+sbindir = /sbin
- 
--all-local: $(OSD_LOGIN_FILES)
-+OSD_LOGIN_FILES= osd_login
- 
--install-data-hook:
--	$(INSTALL) --mode 755 osd_login $(DESTDIR)/sbin/osd_login
-+sbin_SCRIPTS= osd_login
- 
- MAINTAINERCLEANFILES = Makefile.in
--- 
-1.7.8.6
-
diff --git a/net-fs/nfs-utils/files/nfs-utils-1.2.7-libio.patch b/net-fs/nfs-utils/files/nfs-utils-1.2.7-libio.patch
deleted file mode 100644
index 056ae7db97b0..000000000000
--- a/net-fs/nfs-utils/files/nfs-utils-1.2.7-libio.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-https://bugs.gentoo.org/459200
-
-From 2d9fb08c588970b842ce2a609088079181e6aafb Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Sun, 24 Mar 2013 17:41:19 -0400
-Subject: [PATCH [nfs-utils]] check for libio.h availability
-
-On some systems (like uClibc), there isn't a libio.h header.  But it
-isn't also needed on them.  So check for the header first.
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- configure.ac               | 2 +-
- support/include/sockaddr.h | 6 ++++++
- 2 files changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index f461219..cc7f3b4 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -358,7 +358,7 @@ AC_CHECK_HEADERS([arpa/inet.h fcntl.h libintl.h limits.h \
-                  stdlib.h string.h sys/file.h sys/ioctl.h sys/mount.h \
-                  sys/param.h sys/socket.h sys/time.h sys/vfs.h \
-                  syslog.h unistd.h com_err.h et/com_err.h \
--                 ifaddrs.h nfs-plugin.h])
-+                 ifaddrs.h nfs-plugin.h libio.h])
- 
- dnl *************************************************************
- dnl Checks for typedefs, structures, and compiler characteristics
-diff --git a/support/include/sockaddr.h b/support/include/sockaddr.h
-index 72766db..a1c30f9 100644
---- a/support/include/sockaddr.h
-+++ b/support/include/sockaddr.h
-@@ -20,7 +20,13 @@
- #ifndef NFS_UTILS_SOCKADDR_H
- #define NFS_UTILS_SOCKADDR_H
- 
-+#ifdef HAVE_CONFIG_H
-+#include <config.h>
-+#endif
-+
-+#ifdef HAVE_LIBIO_H
- #include <libio.h>
-+#endif
- #include <stdbool.h>
- #include <sys/socket.h>
- #include <netinet/in.h>
--- 
-1.8.1.2
-
diff --git a/net-fs/nfs-utils/files/nfs-utils-1.2.7-nfsiostat-python3.patch b/net-fs/nfs-utils/files/nfs-utils-1.2.7-nfsiostat-python3.patch
deleted file mode 100644
index 994fc726001b..000000000000
--- a/net-fs/nfs-utils/files/nfs-utils-1.2.7-nfsiostat-python3.patch
+++ /dev/null
@@ -1,287 +0,0 @@
-From b0e3dc0c1332884a82f509f98434abd78358c7ed Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Sun, 24 Mar 2013 15:59:12 -0400
-Subject: [PATCH] nfsiostat: make it work w/python3
-
-Simple fixes here to work with python 2 & 3:
- - use print() everywhere
- - dict.iteritems() -> dict.items()
- - file() -> open()
- - sys.maxint -> sys.maxsize
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- tools/nfs-iostat/nfs-iostat.py | 130 +++++++++++++++++++++--------------------
- 1 file changed, 66 insertions(+), 64 deletions(-)
-
-diff --git a/tools/nfs-iostat/nfs-iostat.py b/tools/nfs-iostat/nfs-iostat.py
-index d909632..dfbef87 100644
---- a/tools/nfs-iostat/nfs-iostat.py
-+++ b/tools/nfs-iostat/nfs-iostat.py
-@@ -3,6 +3,8 @@
- """Emulate iostat for NFS mount points using /proc/self/mountstats
- """
- 
-+from __future__ import print_function
-+
- __copyright__ = """
- Copyright (C) 2005, Chuck Lever <cel@netapp.com>
- 
-@@ -201,9 +203,9 @@ class DeviceData:
-         result = DeviceData()
- 
-         # copy self into result
--        for key, value in self.__nfs_data.iteritems():
-+        for key, value in self.__nfs_data.items():
-             result.__nfs_data[key] = value
--        for key, value in self.__rpc_data.iteritems():
-+        for key, value in self.__rpc_data.items():
-             result.__rpc_data[key] = value
- 
-         # compute the difference of each item in the list
-@@ -233,9 +235,9 @@ class DeviceData:
-             client_bytes_read = float(nfs_stats['serverreadbytes'] - nfs_stats['directreadbytes'])
-             ratio = ((app_bytes_read - client_bytes_read) * 100) / app_bytes_read
- 
--            print
--            print 'app bytes: %f  client bytes %f' % (app_bytes_read, client_bytes_read)
--            print 'Data cache hit ratio: %4.2f%%' % ratio
-+            print()
-+            print('app bytes: %f  client bytes %f' % (app_bytes_read, client_bytes_read))
-+            print('Data cache hit ratio: %4.2f%%' % ratio)
- 
-     def __print_attr_cache_stats(self, sample_time):
-         """Print attribute cache efficiency stats
-@@ -255,13 +257,13 @@ class DeviceData:
-             data_invalidates = float(nfs_stats['datainvalidates'])
-             attr_invalidates = float(nfs_stats['attrinvalidates'])
- 
--            print
--            print '%d inode revalidations, hitting in cache %4.2f%% of the time' % \
--                (revalidates, ratio)
--            print '%d open operations (mandatory GETATTR requests)' % opens
-+            print()
-+            print('%d inode revalidations, hitting in cache %4.2f%% of the time' % \
-+                (revalidates, ratio))
-+            print('%d open operations (mandatory GETATTR requests)' % opens)
-             if getattr_ops != 0:
--                print '%4.2f%% of GETATTRs resulted in data cache invalidations' % \
--                   ((data_invalidates * 100) / getattr_ops)
-+                print('%4.2f%% of GETATTRs resulted in data cache invalidations' % \
-+                   ((data_invalidates * 100) / getattr_ops))
- 
-     def __print_dir_cache_stats(self, sample_time):
-         """Print directory stats
-@@ -277,13 +279,13 @@ class DeviceData:
-         lookups = nfs_stats['vfslookup']
-         getdents = nfs_stats['vfsreaddir']
- 
--        print
--        print '%d open operations (pathname lookups)' % opens
--        print '%d dentry revalidates and %d vfs lookup requests' % \
--            (dentry_revals, lookups),
--        print 'resulted in %d LOOKUPs on the wire' % lookup_ops
--        print '%d vfs getdents calls resulted in %d READDIRs on the wire' % \
--            (getdents, readdir_ops)
-+        print()
-+        print('%d open operations (pathname lookups)' % opens)
-+        print('%d dentry revalidates and %d vfs lookup requests' % \
-+            (dentry_revals, lookups))
-+        print('resulted in %d LOOKUPs on the wire' % lookup_ops)
-+        print('%d vfs getdents calls resulted in %d READDIRs on the wire' % \
-+            (getdents, readdir_ops))
- 
-     def __print_page_stats(self, sample_time):
-         """Print page cache stats
-@@ -297,33 +299,33 @@ class DeviceData:
-         vfswritepages = nfs_stats['vfswritepages']
-         pages_written = nfs_stats['writepages']
- 
--        print
--        print '%d nfs_readpage() calls read %d pages' % \
--            (vfsreadpage, vfsreadpage)
--        print '%d nfs_readpages() calls read %d pages' % \
--            (vfsreadpages, pages_read - vfsreadpage),
-+        print()
-+        print('%d nfs_readpage() calls read %d pages' % \
-+            (vfsreadpage, vfsreadpage))
-+        print('%d nfs_readpages() calls read %d pages' % \
-+            (vfsreadpages, pages_read - vfsreadpage))
-         if vfsreadpages != 0:
--            print '(%.1f pages per call)' % \
--                (float(pages_read - vfsreadpage) / vfsreadpages)
-+            print('(%.1f pages per call)' % \
-+                (float(pages_read - vfsreadpage) / vfsreadpages))
-         else:
--            print
--
--        print
--        print '%d nfs_updatepage() calls' % nfs_stats['vfsupdatepage']
--        print '%d nfs_writepage() calls wrote %d pages' % \
--            (vfswritepage, vfswritepage)
--        print '%d nfs_writepages() calls wrote %d pages' % \
--            (vfswritepages, pages_written - vfswritepage),
-+            print()
-+
-+        print()
-+        print('%d nfs_updatepage() calls' % nfs_stats['vfsupdatepage'])
-+        print('%d nfs_writepage() calls wrote %d pages' % \
-+            (vfswritepage, vfswritepage))
-+        print('%d nfs_writepages() calls wrote %d pages' % \
-+            (vfswritepages, pages_written - vfswritepage))
-         if (vfswritepages) != 0:
--            print '(%.1f pages per call)' % \
--                (float(pages_written - vfswritepage) / vfswritepages)
-+            print('(%.1f pages per call)' % \
-+                (float(pages_written - vfswritepage) / vfswritepages))
-         else:
--            print
-+            print()
- 
-         congestionwaits = nfs_stats['congestionwait']
-         if congestionwaits != 0:
--            print
--            print '%d congestion waits' % congestionwaits
-+            print()
-+            print('%d congestion waits' % congestionwaits)
- 
-     def __print_rpc_op_stats(self, op, sample_time):
-         """Print generic stats for one RPC op
-@@ -351,15 +353,15 @@ class DeviceData:
-             exe_per_op = 0.0
- 
-         op += ':'
--        print '%s' % op.lower().ljust(15),
--        print '  ops/s\t\t   kB/s\t\t  kB/op\t\tretrans\t\tavg RTT (ms)\tavg exe (ms)'
-+        print('%s' % op.lower().ljust(15))
-+        print('  ops/s\t\t   kB/s\t\t  kB/op\t\tretrans\t\tavg RTT (ms)\tavg exe (ms)')
- 
--        print '\t\t%7.3f' % (ops / sample_time),
--        print '\t%7.3f' % (kilobytes / sample_time),
--        print '\t%7.3f' % kb_per_op,
--        print ' %7d (%3.1f%%)' % (retrans, retrans_percent),
--        print '\t%7.3f' % rtt_per_op,
--        print '\t%7.3f' % exe_per_op
-+        print('\t\t%7.3f' % (ops / sample_time))
-+        print('\t%7.3f' % (kilobytes / sample_time))
-+        print('\t%7.3f' % kb_per_op)
-+        print(' %7d (%3.1f%%)' % (retrans, retrans_percent))
-+        print('\t%7.3f' % rtt_per_op)
-+        print('\t%7.3f' % exe_per_op)
- 
-     def ops(self, sample_time):
-         sends = float(self.__rpc_data['rpcsends'])
-@@ -384,14 +386,14 @@ class DeviceData:
-         else:
-             backlog = 0.0
- 
--        print
--        print '%s mounted on %s:' % \
--            (self.__nfs_data['export'], self.__nfs_data['mountpoint'])
--        print
-+        print()
-+        print('%s mounted on %s:' % \
-+            (self.__nfs_data['export'], self.__nfs_data['mountpoint']))
-+        print()
- 
--        print '   op/s\t\trpc bklog'
--        print '%7.2f' % (sends / sample_time), 
--        print '\t%7.2f' % backlog
-+        print('   op/s\t\trpc bklog')
-+        print('%7.2f' % (sends / sample_time))
-+        print('\t%7.2f' % backlog)
- 
-         if which == 0:
-             self.__print_rpc_op_stats('READ', sample_time)
-@@ -424,7 +426,7 @@ def parse_stats_file(filename):
-     ms_dict = dict()
-     key = ''
- 
--    f = file(filename)
-+    f = open(filename)
-     for line in f.readlines():
-         words = line.split()
-         if len(words) == 0:
-@@ -494,7 +496,7 @@ def list_nfs_mounts(givenlist, mountstats):
-             if stats.is_nfs_mountpoint():
-                 list += [device]
-     else:
--        for device, descr in mountstats.iteritems():
-+        for device, descr in mountstats.items():
-             stats = DeviceData()
-             stats.parse_stats(descr)
-             if stats.is_nfs_mountpoint():
-@@ -527,7 +529,7 @@ client are listed.
-         usage="usage: %prog [ <interval> [ <count> ] ] [ <options> ] [ <mount point> ]",
-         description=mydescription,
-         version='version %s' % Iostats_version)
--    parser.set_defaults(which=0, sort=False, list=sys.maxint)
-+    parser.set_defaults(which=0, sort=False, list=sys.maxsize)
- 
-     statgroup = OptionGroup(parser, "Statistics Options",
-                             'File I/O is displayed unless one of the following is specified:')
-@@ -572,29 +574,29 @@ client are listed.
-             try:
-                 interval = int(arg)
-             except:
--                print 'Illegal <interval> value %s' % arg
-+                print('Illegal <interval> value %s' % arg)
-                 return
-             if interval > 0:
-                 interval_seen = True
-             else:
--                print 'Illegal <interval> value %s' % arg
-+                print('Illegal <interval> value %s' % arg)
-                 return
-         elif not count_seen:
-             try:
-                 count = int(arg)
-             except:
--                print 'Ilegal <count> value %s' % arg
-+                print('Ilegal <count> value %s' % arg)
-                 return
-             if count > 0:
-                 count_seen = True
-             else:
--                print 'Illegal <count> value %s' % arg
-+                print('Illegal <count> value %s' % arg)
-                 return
- 
-     # make certain devices contains only NFS mount points
-     devices = list_nfs_mounts(origdevices, mountstats)
-     if len(devices) == 0:
--        print 'No NFS mount points were found'
-+        print('No NFS mount points were found')
-         return
- 
- 
-@@ -616,7 +618,7 @@ client are listed.
-             # we need to recheck the devices list when reparsing
-             devices = list_nfs_mounts(origdevices,mountstats)
-             if len(devices) == 0:
--                print 'No NFS mount points were found'
-+                print('No NFS mount points were found')
-                 return
-             count -= 1
-     else: 
-@@ -630,7 +632,7 @@ client are listed.
-             # we need to recheck the devices list when reparsing
-             devices = list_nfs_mounts(origdevices,mountstats)
-             if len(devices) == 0:
--                print 'No NFS mount points were found'
-+                print('No NFS mount points were found')
-                 return
- 
- #
-@@ -641,7 +643,7 @@ prog = os.path.basename(sys.argv[0])
- try:
-     iostat_command(prog)
- except KeyboardInterrupt:
--    print 'Caught ^C... exiting'
-+    print('Caught ^C... exiting')
-     sys.exit(1)
- 
- sys.exit(0)
--- 
-1.8.1.2
-
diff --git a/net-fs/nfs-utils/files/nfsd.service b/net-fs/nfs-utils/files/nfsd.service
deleted file mode 100644
index 80bfacbb6833..000000000000
--- a/net-fs/nfs-utils/files/nfsd.service
+++ /dev/null
@@ -1,16 +0,0 @@
-[Unit]
-Description=NFS server
-After=rpcbind.service
-Requires=rpcbind.service
-
-[Service]
-Type=oneshot
-EnvironmentFile=/etc/conf.d/nfs
-ExecStart=/usr/sbin/rpc.nfsd $OPTS_RPC_NFSD
-ExecStartPost=/usr/sbin/exportfs -a
-ExecStop=/usr/sbin/rpc.nfsd 0
-ExecStopPost=/usr/sbin/exportfs -a -u
-RemainAfterExit=yes
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-fs/nfs-utils/files/rpc-mountd.service b/net-fs/nfs-utils/files/rpc-mountd.service
deleted file mode 100644
index 0511dde8f3e9..000000000000
--- a/net-fs/nfs-utils/files/rpc-mountd.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=NFS Mount Daemon
-After=rpcbind.service nfsd.service
-Requires=rpcbind.service nfsd.service
-
-[Service]
-Type=forking
-EnvironmentFile=/etc/conf.d/nfs
-ExecStart=/usr/sbin/rpc.mountd $OPTS_RPC_MOUNTD
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-fs/nfs-utils/files/rpc-statd.service b/net-fs/nfs-utils/files/rpc-statd.service
deleted file mode 100644
index 103b6fee06b9..000000000000
--- a/net-fs/nfs-utils/files/rpc-statd.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=NFSv2/3 Network Status Monitor Daemon
-After=rpcbind.service
-Requires=rpcbind.service
-Before=remote-fs-pre.target
-
-[Service]
-Type=forking
-EnvironmentFile=/etc/conf.d/nfs
-ExecStart=/sbin/rpc.statd $OPTS_RPC_STATD
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-fs/nfs-utils/files/rpc-statd.service-r1 b/net-fs/nfs-utils/files/rpc-statd.service-r1
deleted file mode 100644
index b19eb17f59f3..000000000000
--- a/net-fs/nfs-utils/files/rpc-statd.service-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=NFSv2/3 Network Status Monitor Daemon
-After=rpcbind.service
-Requires=rpcbind.service
-Before=remote-fs-pre.target
-Wants=remote-fs-pre.target
-
-[Service]
-Type=forking
-EnvironmentFile=/etc/conf.d/nfs
-ExecStart=/sbin/rpc.statd $OPTS_RPC_STATD
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-fs/nfs-utils/nfs-utils-1.1.4-r1.ebuild b/net-fs/nfs-utils/nfs-utils-1.1.4-r1.ebuild
deleted file mode 100644
index bfc36fd2243e..000000000000
--- a/net-fs/nfs-utils/nfs-utils-1.1.4-r1.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# 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.1.4-r1.ebuild,v 1.10 2010/03/31 18:06:59 solar Exp $
-
-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="nonfsv4 tcpd kerberos 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)
-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.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-rpcgen-ioctl.patch
-	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() {
-	local myconf
-	if use nonfsv4 ; then
-		myconf="--disable-gss"
-	else
-		myconf="$(use_enable kerberos gss)"
-	fi
-
-	econf \
-		--mandir=/usr/share/man \
-		--with-statedir=/var/lib/nfs \
-		--disable-rquotad \
-		--enable-nfsv3 \
-		--enable-secure-statd \
-		$(use_with tcpd tcp-wrappers) \
-		$(use_enable !nonfsv4 nfsv4) \
-		${myconf} \
-		|| die "Configure failed"
-	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=""
-	if use !nonfsv4 ; then
-		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
-
-	# 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
-}
diff --git a/net-fs/nfs-utils/nfs-utils-1.1.5.ebuild b/net-fs/nfs-utils/nfs-utils-1.1.5.ebuild
deleted file mode 100644
index 102781989778..000000000000
--- a/net-fs/nfs-utils/nfs-utils-1.1.5.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# 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.1.5.ebuild,v 1.4 2010/03/31 18:06:59 solar Exp $
-
-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="nonfsv4 tcpd kerberos 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)
-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.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-rpcgen-ioctl.patch
-	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() {
-	local myconf
-	if use nonfsv4 ; then
-		myconf="--disable-gss"
-	else
-		myconf="$(use_enable kerberos gss)"
-	fi
-
-	econf \
-		--with-statedir=/var/lib/nfs \
-		--enable-nfsv3 \
-		$(use_with tcpd tcp-wrappers) \
-		$(use_enable !nonfsv4 nfsv4) \
-		${myconf} \
-		|| die "Configure failed"
-	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=""
-	if use !nonfsv4 ; then
-		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
-
-	# 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
-}
diff --git a/net-fs/nfs-utils/nfs-utils-1.2.1.ebuild b/net-fs/nfs-utils/nfs-utils-1.2.1.ebuild
deleted file mode 100644
index 76b703b7b657..000000000000
--- a/net-fs/nfs-utils/nfs-utils-1.2.1.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# 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.1.ebuild,v 1.3 2010/03/31 18:06:59 solar 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
-}
-
-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
-}
diff --git a/net-fs/nfs-utils/nfs-utils-1.2.2-r2.ebuild b/net-fs/nfs-utils/nfs-utils-1.2.2-r2.ebuild
deleted file mode 100644
index 83272ff43265..000000000000
--- a/net-fs/nfs-utils/nfs-utils-1.2.2-r2.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# 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-r2.ebuild,v 1.2 2010/09/19 22:39:27 vapier Exp $
-
-EAPI="2"
-
-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 +nfsv3 +nfsv4 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
-		)
-	)"
-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
-	epatch "${FILESDIR}"/${PN}-1.2.2-optional-libcap.patch #314777
-	epatch "${FILESDIR}"/${PN}-1.2.2-nfsv4.patch # fix typo
-	chmod a+x tests/t0001-statd-basic-mon-unmon.sh || die
-	eautoreconf
-}
-
-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_enable caps) \
-		$(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/$(get_libdir)/nfs
-	mv "${D}"/var/lib/nfs "${D}"/usr/$(get_libdir)/ || die
-	keepdir /var/lib/nfs/{,sm,sm.bak}
-
-	# 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.  #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
-}
diff --git a/net-fs/nfs-utils/nfs-utils-1.2.3-r1.ebuild b/net-fs/nfs-utils/nfs-utils-1.2.3-r1.ebuild
deleted file mode 100644
index d98d6b0490e5..000000000000
--- a/net-fs/nfs-utils/nfs-utils-1.2.3-r1.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2011 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.3-r1.ebuild,v 1.7 2011/05/29 00:34:58 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="caps ipv6 kerberos +nfsv3 +nfsv4 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
-		)
-	)"
-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
-	epatch "${FILESDIR}"/${P}-ti-rpc-static-ports.patch #340797
-}
-
-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_enable caps) \
-		$(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
-	keepdir /var/lib/nfs/{,sm,sm.bak}
-	mv "${D}"/var/lib "${D}"/usr/$(get_libdir) || die
-
-	# 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.  #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
-}
diff --git a/net-fs/nfs-utils/nfs-utils-1.2.3.ebuild b/net-fs/nfs-utils/nfs-utils-1.2.3.ebuild
deleted file mode 100644
index 99278da429db..000000000000
--- a/net-fs/nfs-utils/nfs-utils-1.2.3.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# 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.3.ebuild,v 1.1 2010/10/08 19:48:08 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="caps ipv6 kerberos +nfsv3 +nfsv4 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
-		)
-	)"
-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
-}
-
-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_enable caps) \
-		$(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
-	keepdir /var/lib/nfs/{,sm,sm.bak}
-	mv "${D}"/var/lib "${D}"/usr/$(get_libdir) || die
-
-	# 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.  #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
-}
diff --git a/net-fs/nfs-utils/nfs-utils-1.2.4.ebuild b/net-fs/nfs-utils/nfs-utils-1.2.4.ebuild
deleted file mode 100644
index 9768e7e9faf8..000000000000
--- a/net-fs/nfs-utils/nfs-utils-1.2.4.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# 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.4.ebuild,v 1.8 2012/05/03 04:06:33 jdhore Exp $
-
-EAPI="2"
-
-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 +nfsv3 +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}
-	virtual/pkgconfig
-	!<sys-apps/util-linux-2.12r-r7"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.1.4-mtab-sym.patch
-	epatch "${FILESDIR}"/${P}-exportfs-xlog.patch
-	epatch "${FILESDIR}"/${P}-exportfs-skip-dir.patch
-	epatch "${FILESDIR}"/${P}-conditional.patch
-	epatch "${FILESDIR}"/${PN}-1.2.4-nfsidmap.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=$(use nfsidmap && echo yes || echo no)
-	econf \
-		--with-statedir=/var/lib/nfs \
-		--enable-tirpc \
-		$(use_with tcpd tcp-wrappers) \
-		$(use_enable nfsv3) \
-		$(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="${D}" install || die
-
-	# 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 "${D}"/var/lib "${D}"/usr/$(get_libdir) || die
-
-	# 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.  #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
-}
diff --git a/net-fs/nfs-utils/nfs-utils-1.2.5.ebuild b/net-fs/nfs-utils/nfs-utils-1.2.5.ebuild
deleted file mode 100644
index a1f28f53e397..000000000000
--- a/net-fs/nfs-utils/nfs-utils-1.2.5.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# 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.5 2012/05/03 04:06:33 jdhore 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-0.3
-			net-libs/libtirpc[kerberos]
-			app-crypt/mit-krb5
-		)
-		nfsidmap? (
-			>=net-libs/libnfsidmap-0.24
-			sys-apps/keyutils
-		)
-	)
-	nfsv41? (
-		sys-fs/lvm2
-	)
-	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}
-	virtual/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="${D}" install
-	rm linux-nfs/Makefile* || die
-	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
-}
diff --git a/net-fs/nfs-utils/nfs-utils-1.2.6.ebuild b/net-fs/nfs-utils/nfs-utils-1.2.6.ebuild
deleted file mode 100644
index 1defede6a260..000000000000
--- a/net-fs/nfs-utils/nfs-utils-1.2.6.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2013 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.6.ebuild,v 1.16 2013/04/13 20:02:02 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 nfsdcld nfsidmap +nfsv4 nfsv41 selinux tcpd"
-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
-	nfsdcld? ( >=dev-db/sqlite-3.3 )
-	nfsv4? (
-		>=dev-libs/libevent-1.0b
-		>=net-libs/libnfsidmap-0.21-r1
-		kerberos? (
-			net-libs/librpcsecgss
-			>=net-libs/libgssglue-0.3
-			net-libs/libtirpc[kerberos]
-			app-crypt/mit-krb5
-		)
-		nfsidmap? (
-			>=net-libs/libnfsidmap-0.24
-			sys-apps/keyutils
-		)
-	)
-	nfsv41? (
-		sys-fs/lvm2
-	)
-	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}
-	virtual/pkgconfig
-	!<sys-apps/util-linux-2.12r-r7"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.1.4-mtab-sym.patch
-	epatch "${FILESDIR}"/${PN}-1.2.6-cross-build.patch
-	epatch "${FILESDIR}"/${PN}-1.2.6-osd-install.patch
-	epatch "${FILESDIR}"/${PN}-1.2.6-conditionals.patch
-	epatch "${FILESDIR}"/${PN}-1.2.7-nfsiostat-python3.patch #458934
-	epatch "${FILESDIR}"/${PN}-1.2.7-libio.patch #459200
-	eautoreconf
-}
-
-src_configure() {
-	export libsqlite3_cv_is_recent=yes # Our DEPEND forces this.
-	export ac_cv_header_keyutils_h=$(usex nfsidmap)
-	econf \
-		--with-statedir=/var/lib/nfs \
-		--enable-tirpc \
-		$(use_with tcpd tcp-wrappers) \
-		$(use_enable nfsdcld) \
-		$(use_enable nfsv4) \
-		$(use_enable nfsv41) \
-		$(use_enable ipv6) \
-		$(use_enable caps) \
-		$(use nfsv4 && use_enable kerberos gss || echo "--disable-gss")
-}
-
-src_install() {
-	default
-	rm linux-nfs/Makefile* || die
-	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
-
-	if use nfsidmap ; then
-		# Install a config file for idmappers in newer kernels. #415625
-		insinto /etc/request-key.d
-		echo 'create id_resolver * * /usr/sbin/nfsidmap -t 600 %k %d' > id_resolver.conf
-		doins id_resolver.conf
-	fi
-
-	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
-	for f in nfs nfsmount ; do
-		newconfd "${FILESDIR}"/${f}.confd ${f}
-	done
-	sed -i \
-		-e "/^NFS_NEEDED_SERVICES=/s:=.*:=\"${opt_need}\":" \
-		"${ED}"/etc/conf.d/nfs || die #234132
-}
-
-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
-}
diff --git a/net-fs/nfs-utils/nfs-utils-1.2.7-r1.ebuild b/net-fs/nfs-utils/nfs-utils-1.2.7-r1.ebuild
deleted file mode 100644
index ab7b6f946e89..000000000000
--- a/net-fs/nfs-utils/nfs-utils-1.2.7-r1.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2013 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.7-r1.ebuild,v 1.10 2013/11/09 15:40:00 pacho Exp $
-
-EAPI="4"
-
-inherit eutils flag-o-matic multilib autotools systemd
-
-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 nfsdcld +nfsidmap +nfsv4 nfsv41 selinux tcpd +uuid"
-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-0.2.0-r1
-	net-libs/libtirpc
-	nfsdcld? ( >=dev-db/sqlite-3.3 )
-	nfsv4? (
-		>=dev-libs/libevent-1.0b
-		>=net-libs/libnfsidmap-0.21-r1
-		kerberos? (
-			net-libs/librpcsecgss
-			>=net-libs/libgssglue-0.3
-			net-libs/libtirpc[kerberos]
-			app-crypt/mit-krb5
-		)
-		nfsidmap? (
-			>=net-libs/libnfsidmap-0.24
-			sys-apps/keyutils
-		)
-	)
-	nfsv41? (
-		sys-fs/lvm2
-	)
-	selinux? (
-		sec-policy/selinux-rpc
-		sec-policy/selinux-rpcbind
-	)
-	uuid? ( sys-apps/util-linux )"
-RDEPEND="${DEPEND_COMMON} !net-nds/portmap"
-DEPEND="${DEPEND_COMMON}
-	virtual/pkgconfig"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.1.4-mtab-sym.patch
-	epatch "${FILESDIR}"/${PN}-1.2.6-cross-build.patch
-	epatch "${FILESDIR}"/${PN}-1.2.7-nfsiostat-python3.patch #458934
-	epatch "${FILESDIR}"/${PN}-1.2.7-libio.patch #459200
-	eautoreconf
-}
-
-src_configure() {
-	export libsqlite3_cv_is_recent=yes # Our DEPEND forces this.
-	export ac_cv_header_keyutils_h=$(usex nfsidmap)
-	econf \
-		--with-statedir=/var/lib/nfs \
-		--enable-tirpc \
-		$(use_with tcpd tcp-wrappers) \
-		$(use_enable nfsdcld nfsdcltrack) \
-		$(use_enable nfsv4) \
-		$(use_enable nfsv41) \
-		$(use_enable ipv6) \
-		$(use_enable caps) \
-		$(use_enable uuid) \
-		$(usex nfsv4 "$(use_enable kerberos gss)" "--disable-gss")
-}
-
-src_compile(){
-	# remove compiled files bundled in the tarball
-	emake clean
-	default
-}
-
-src_install() {
-	default
-	rm linux-nfs/Makefile* || die
-	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
-
-	if use nfsv4 && use nfsidmap ; then
-		# Install a config file for idmappers in newer kernels. #415625
-		insinto /etc/request-key.d
-		echo 'create id_resolver * * /usr/sbin/nfsidmap -t 600 %k %d' > id_resolver.conf
-		doins id_resolver.conf
-	fi
-
-	insinto /etc
-	doins "${FILESDIR}"/exports
-
-	local f list=() opt_need=""
-	if use nfsv4 ; then
-		opt_need="rpc.idmapd"
-		list+=( rpc.idmapd rpc.pipefs )
-		use kerberos && list+=( rpc.gssd rpc.svcgssd )
-	fi
-	for f in nfs nfsmount rpc.statd "${list[@]}" ; do
-		newinitd "${FILESDIR}"/${f}.initd ${f}
-	done
-	for f in nfs nfsmount ; do
-		newconfd "${FILESDIR}"/${f}.confd ${f}
-	done
-	sed -i \
-		-e "/^NFS_NEEDED_SERVICES=/s:=.*:=\"${opt_need}\":" \
-		"${ED}"/etc/conf.d/nfs || die #234132
-	systemd_dounit "${FILESDIR}"/nfsd.service
-	systemd_dounit "${FILESDIR}"/rpc-statd.service
-	systemd_dounit "${FILESDIR}"/rpc-mountd.service
-}
-
-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
-}
diff --git a/net-fs/nfs-utils/nfs-utils-1.2.8-r1.ebuild b/net-fs/nfs-utils/nfs-utils-1.2.8-r1.ebuild
deleted file mode 100644
index 6bdb18c9ca7b..000000000000
--- a/net-fs/nfs-utils/nfs-utils-1.2.8-r1.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2013 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.8-r1.ebuild,v 1.2 2013/08/07 13:54:00 xarthisius Exp $
-
-EAPI="4"
-
-inherit eutils flag-o-matic multilib autotools systemd
-
-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 nfsdcld +nfsidmap +nfsv4 nfsv41 selinux tcpd +uuid"
-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-0.2.0-r1
-	net-libs/libtirpc
-	nfsdcld? ( >=dev-db/sqlite-3.3 )
-	nfsv4? (
-		>=dev-libs/libevent-1.0b
-		>=net-libs/libnfsidmap-0.21-r1
-		kerberos? (
-			net-libs/librpcsecgss
-			>=net-libs/libgssglue-0.3
-			net-libs/libtirpc[kerberos]
-			app-crypt/mit-krb5
-		)
-		nfsidmap? (
-			>=net-libs/libnfsidmap-0.24
-			sys-apps/keyutils
-		)
-	)
-	nfsv41? (
-		sys-fs/lvm2
-	)
-	selinux? (
-		sec-policy/selinux-rpc
-		sec-policy/selinux-rpcbind
-	)
-	uuid? ( sys-apps/util-linux )"
-RDEPEND="${DEPEND_COMMON} !net-nds/portmap"
-DEPEND="${DEPEND_COMMON}
-	virtual/pkgconfig"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.1.4-mtab-sym.patch
-	epatch "${FILESDIR}"/${PN}-1.2.8-cross-build.patch
-	epatch "${FILESDIR}"/0001-statd-exit-if-a-statd-is-already-running.patch
-	epatch "${FILESDIR}"/0001-mountd-Fix-is_subdirectory-again.patch
-	eautoreconf
-}
-
-src_configure() {
-	export libsqlite3_cv_is_recent=yes # Our DEPEND forces this.
-	export ac_cv_header_keyutils_h=$(usex nfsidmap)
-	econf \
-		--with-statedir=/var/lib/nfs \
-		--enable-tirpc \
-		$(use_with tcpd tcp-wrappers) \
-		$(use_enable nfsdcld nfsdcltrack) \
-		$(use_enable nfsv4) \
-		$(use_enable nfsv41) \
-		$(use_enable ipv6) \
-		$(use_enable caps) \
-		$(use_enable uuid) \
-		$(usex nfsv4 "$(use_enable kerberos gss)" "--disable-gss")
-}
-
-src_compile(){
-	# remove compiled files bundled in the tarball
-	emake clean
-	default
-}
-
-src_install() {
-	default
-	rm linux-nfs/Makefile* || die
-	dodoc -r linux-nfs 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
-
-	if use nfsv4 && use nfsidmap ; then
-		# Install a config file for idmappers in newer kernels. #415625
-		insinto /etc/request-key.d
-		echo 'create id_resolver * * /usr/sbin/nfsidmap -t 600 %k %d' > id_resolver.conf
-		doins id_resolver.conf
-	fi
-
-	insinto /etc
-	doins "${FILESDIR}"/exports
-
-	local f list=() opt_need=""
-	if use nfsv4 ; then
-		opt_need="rpc.idmapd"
-		list+=( rpc.idmapd rpc.pipefs )
-		use kerberos && list+=( rpc.gssd rpc.svcgssd )
-	fi
-	for f in nfs nfsmount rpc.statd "${list[@]}" ; do
-		newinitd "${FILESDIR}"/${f}.initd ${f}
-	done
-	for f in nfs nfsmount ; do
-		newconfd "${FILESDIR}"/${f}.confd ${f}
-	done
-	sed -i \
-		-e "/^NFS_NEEDED_SERVICES=/s:=.*:=\"${opt_need}\":" \
-		"${ED}"/etc/conf.d/nfs || die #234132
-	systemd_dounit "${FILESDIR}"/nfsd.service
-	systemd_dounit "${FILESDIR}"/rpc-statd.service
-	systemd_dounit "${FILESDIR}"/rpc-mountd.service
-}
-
-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
-}
diff --git a/net-fs/nfs-utils/nfs-utils-1.2.8-r2.ebuild b/net-fs/nfs-utils/nfs-utils-1.2.8-r2.ebuild
deleted file mode 100644
index caabeafa3a16..000000000000
--- a/net-fs/nfs-utils/nfs-utils-1.2.8-r2.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2013 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.8-r2.ebuild,v 1.1 2013/08/27 07:00:20 radhermit Exp $
-
-EAPI="4"
-
-inherit eutils flag-o-matic multilib autotools systemd
-
-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 nfsdcld +nfsidmap +nfsv4 nfsv41 selinux tcpd +uuid"
-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-0.2.0-r1
-	net-libs/libtirpc
-	nfsdcld? ( >=dev-db/sqlite-3.3 )
-	nfsv4? (
-		>=dev-libs/libevent-1.0b
-		>=net-libs/libnfsidmap-0.21-r1
-		kerberos? (
-			net-libs/librpcsecgss
-			>=net-libs/libgssglue-0.3
-			net-libs/libtirpc[kerberos]
-			app-crypt/mit-krb5
-		)
-		nfsidmap? (
-			>=net-libs/libnfsidmap-0.24
-			sys-apps/keyutils
-		)
-	)
-	nfsv41? (
-		sys-fs/lvm2
-	)
-	selinux? (
-		sec-policy/selinux-rpc
-		sec-policy/selinux-rpcbind
-	)
-	uuid? ( sys-apps/util-linux )"
-RDEPEND="${DEPEND_COMMON} !net-nds/portmap"
-DEPEND="${DEPEND_COMMON}
-	virtual/pkgconfig"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.1.4-mtab-sym.patch
-	epatch "${FILESDIR}"/${PN}-1.2.8-cross-build.patch
-	epatch "${FILESDIR}"/0001-statd-exit-if-a-statd-is-already-running.patch
-	epatch "${FILESDIR}"/0001-mountd-Fix-is_subdirectory-again.patch
-	eautoreconf
-}
-
-src_configure() {
-	export libsqlite3_cv_is_recent=yes # Our DEPEND forces this.
-	export ac_cv_header_keyutils_h=$(usex nfsidmap)
-	econf \
-		--with-statedir=/var/lib/nfs \
-		--enable-tirpc \
-		$(use_with tcpd tcp-wrappers) \
-		$(use_enable nfsdcld nfsdcltrack) \
-		$(use_enable nfsv4) \
-		$(use_enable nfsv41) \
-		$(use_enable ipv6) \
-		$(use_enable caps) \
-		$(use_enable uuid) \
-		$(usex nfsv4 "$(use_enable kerberos gss)" "--disable-gss") \
-		$(usex nfsv4 "$(use_with kerberos gssglue)" "--without-gssglue")
-}
-
-src_compile(){
-	# remove compiled files bundled in the tarball
-	emake clean
-	default
-}
-
-src_install() {
-	default
-	rm linux-nfs/Makefile* || die
-	dodoc -r linux-nfs 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
-
-	if use nfsv4 && use nfsidmap ; then
-		# Install a config file for idmappers in newer kernels. #415625
-		insinto /etc/request-key.d
-		echo 'create id_resolver * * /usr/sbin/nfsidmap -t 600 %k %d' > id_resolver.conf
-		doins id_resolver.conf
-	fi
-
-	insinto /etc
-	doins "${FILESDIR}"/exports
-
-	local f list=() opt_need=""
-	if use nfsv4 ; then
-		opt_need="rpc.idmapd"
-		list+=( rpc.idmapd rpc.pipefs )
-		use kerberos && list+=( rpc.gssd rpc.svcgssd )
-	fi
-	for f in nfs nfsmount rpc.statd "${list[@]}" ; do
-		newinitd "${FILESDIR}"/${f}.initd ${f}
-	done
-	for f in nfs nfsmount ; do
-		newconfd "${FILESDIR}"/${f}.confd ${f}
-	done
-	sed -i \
-		-e "/^NFS_NEEDED_SERVICES=/s:=.*:=\"${opt_need}\":" \
-		"${ED}"/etc/conf.d/nfs || die #234132
-	systemd_dounit "${FILESDIR}"/nfsd.service
-	systemd_dounit "${FILESDIR}"/rpc-statd.service
-	systemd_dounit "${FILESDIR}"/rpc-mountd.service
-}
-
-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
-}
diff --git a/net-fs/nfs-utils/nfs-utils-1.2.9-r1.ebuild b/net-fs/nfs-utils/nfs-utils-1.2.9-r1.ebuild
deleted file mode 100644
index 0bcc1b810a08..000000000000
--- a/net-fs/nfs-utils/nfs-utils-1.2.9-r1.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2014 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.9-r1.ebuild,v 1.2 2014/01/18 05:56:45 vapier Exp $
-
-EAPI="4"
-
-inherit eutils flag-o-matic multilib autotools systemd
-
-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 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="caps ipv6 kerberos +libmount nfsdcld +nfsidmap +nfsv4 nfsv41 selinux tcpd +uuid"
-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-0.2.0-r1
-	net-libs/libtirpc
-	libmount? ( sys-apps/util-linux )
-	nfsdcld? ( >=dev-db/sqlite-3.3 )
-	nfsv4? (
-		>=dev-libs/libevent-1.0b
-		>=net-libs/libnfsidmap-0.21-r1
-		kerberos? (
-			net-libs/librpcsecgss
-			>=net-libs/libgssglue-0.3
-			net-libs/libtirpc[kerberos]
-			app-crypt/mit-krb5
-		)
-		nfsidmap? (
-			>=net-libs/libnfsidmap-0.24
-			sys-apps/keyutils
-		)
-	)
-	nfsv41? (
-		sys-fs/lvm2
-	)
-	selinux? (
-		sec-policy/selinux-rpc
-		sec-policy/selinux-rpcbind
-	)
-	uuid? ( sys-apps/util-linux )"
-RDEPEND="${DEPEND_COMMON} !net-nds/portmap"
-DEPEND="${DEPEND_COMMON}
-	virtual/pkgconfig"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.1.4-mtab-sym.patch
-	epatch "${FILESDIR}"/${PN}-1.2.8-cross-build.patch
-	eautoreconf
-}
-
-src_configure() {
-	export libsqlite3_cv_is_recent=yes # Our DEPEND forces this.
-	export ac_cv_header_keyutils_h=$(usex nfsidmap)
-	econf \
-		--with-statedir=/var/lib/nfs \
-		--enable-tirpc \
-		$(use_enable libmount libmount-mount) \
-		$(use_with tcpd tcp-wrappers) \
-		$(use_enable nfsdcld nfsdcltrack) \
-		$(use_enable nfsv4) \
-		$(use_enable nfsv41) \
-		$(use_enable ipv6) \
-		$(use_enable caps) \
-		$(use_enable uuid) \
-		$(usex nfsv4 "$(use_enable kerberos gss)" "--disable-gss") \
-		$(usex nfsv4 "$(use_with kerberos gssglue)" "--without-gssglue")
-}
-
-src_compile(){
-	# remove compiled files bundled in the tarball
-	emake clean
-	default
-}
-
-src_install() {
-	default
-	rm linux-nfs/Makefile* || die
-	dodoc -r linux-nfs 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
-
-	if use nfsv4 && use nfsidmap ; then
-		# Install a config file for idmappers in newer kernels. #415625
-		insinto /etc/request-key.d
-		echo 'create id_resolver * * /usr/sbin/nfsidmap -t 600 %k %d' > id_resolver.conf
-		doins id_resolver.conf
-	fi
-
-	insinto /etc
-	doins "${FILESDIR}"/exports
-
-	local f list=() opt_need=""
-	if use nfsv4 ; then
-		opt_need="rpc.idmapd"
-		list+=( rpc.idmapd rpc.pipefs )
-		use kerberos && list+=( rpc.gssd rpc.svcgssd )
-	fi
-	for f in nfs nfsmount rpc.statd "${list[@]}" ; do
-		newinitd "${FILESDIR}"/${f}.initd ${f}
-	done
-	for f in nfs nfsmount ; do
-		newconfd "${FILESDIR}"/${f}.confd ${f}
-	done
-	sed -i \
-		-e "/^NFS_NEEDED_SERVICES=/s:=.*:=\"${opt_need}\":" \
-		"${ED}"/etc/conf.d/nfs || die #234132
-	systemd_dounit "${FILESDIR}"/nfsd.service
-	systemd_newunit "${FILESDIR}"/rpc-statd.service-r1 rpc-statd.service
-	systemd_dounit "${FILESDIR}"/rpc-mountd.service
-}
-
-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
-}
diff --git a/net-fs/nfs-utils/nfs-utils-1.2.9-r2.ebuild b/net-fs/nfs-utils/nfs-utils-1.2.9-r2.ebuild
deleted file mode 100644
index e8fc6f4b2bf9..000000000000
--- a/net-fs/nfs-utils/nfs-utils-1.2.9-r2.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2014 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.9-r2.ebuild,v 1.1 2014/02/01 19:01:37 pacho Exp $
-
-EAPI="4"
-
-inherit eutils flag-o-matic multilib autotools systemd
-
-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 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="caps ipv6 kerberos +libmount nfsdcld +nfsidmap +nfsv4 nfsv41 selinux tcpd +uuid"
-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-0.2.0-r1
-	net-libs/libtirpc
-	libmount? ( sys-apps/util-linux )
-	nfsdcld? ( >=dev-db/sqlite-3.3 )
-	nfsv4? (
-		>=dev-libs/libevent-1.0b
-		>=net-libs/libnfsidmap-0.21-r1
-		kerberos? (
-			net-libs/librpcsecgss
-			>=net-libs/libgssglue-0.3
-			net-libs/libtirpc[kerberos]
-			app-crypt/mit-krb5
-		)
-		nfsidmap? (
-			>=net-libs/libnfsidmap-0.24
-			sys-apps/keyutils
-		)
-	)
-	nfsv41? (
-		sys-fs/lvm2
-	)
-	selinux? (
-		sec-policy/selinux-rpc
-		sec-policy/selinux-rpcbind
-	)
-	uuid? ( sys-apps/util-linux )"
-RDEPEND="${DEPEND_COMMON} !net-nds/portmap"
-DEPEND="${DEPEND_COMMON}
-	virtual/pkgconfig"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.1.4-mtab-sym.patch
-	epatch "${FILESDIR}"/${PN}-1.2.8-cross-build.patch
-	eautoreconf
-}
-
-src_configure() {
-	export libsqlite3_cv_is_recent=yes # Our DEPEND forces this.
-	export ac_cv_header_keyutils_h=$(usex nfsidmap)
-	econf \
-		--with-statedir=/var/lib/nfs \
-		--enable-tirpc \
-		$(use_enable libmount libmount-mount) \
-		$(use_with tcpd tcp-wrappers) \
-		$(use_enable nfsdcld nfsdcltrack) \
-		$(use_enable nfsv4) \
-		$(use_enable nfsv41) \
-		$(use_enable ipv6) \
-		$(use_enable caps) \
-		$(use_enable uuid) \
-		$(usex nfsv4 "$(use_enable kerberos gss)" "--disable-gss") \
-		$(usex nfsv4 "$(use_with kerberos gssglue)" "--without-gssglue")
-}
-
-src_compile(){
-	# remove compiled files bundled in the tarball
-	emake clean
-	default
-}
-
-src_install() {
-	default
-	rm linux-nfs/Makefile* || die
-	dodoc -r linux-nfs 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
-
-	if use nfsv4 && use nfsidmap ; then
-		# Install a config file for idmappers in newer kernels. #415625
-		insinto /etc/request-key.d
-		echo 'create id_resolver * * /usr/sbin/nfsidmap -t 600 %k %d' > id_resolver.conf
-		doins id_resolver.conf
-	fi
-
-	insinto /etc
-	doins "${FILESDIR}"/exports
-
-	local f list=() opt_need=""
-	if use nfsv4 ; then
-		opt_need="rpc.idmapd"
-		list+=( rpc.idmapd rpc.pipefs )
-		use kerberos && list+=( rpc.gssd rpc.svcgssd )
-	fi
-	for f in nfs nfsmount rpc.statd "${list[@]}" ; do
-		newinitd "${FILESDIR}"/${f}.initd ${f}
-	done
-	for f in nfs nfsmount ; do
-		newconfd "${FILESDIR}"/${f}.confd ${f}
-	done
-	sed -i \
-		-e "/^NFS_NEEDED_SERVICES=/s:=.*:=\"${opt_need}\":" \
-		"${ED}"/etc/conf.d/nfs || die #234132
-
-	systemd_dotmpfilesd "${FILESDIR}"/nfs-utils.conf
-	systemd_newunit "${FILESDIR}"/nfsd.service-r1 nfsd.service
-	systemd_newunit "${FILESDIR}"/rpc-statd.service-r2 rpc-statd.service
-	systemd_newunit "${FILESDIR}"/rpc-mountd.service-r1 rpc-mountd.service
-	systemd_dounit "${FILESDIR}"/rpc-idmapd.service
-	systemd_dounit "${FILESDIR}"/{proc-fs-nfsd,var-lib-nfs-rpc_pipefs}.mount
-	use nfsv4 && use kerberos && systemd_dounit "${FILESDIR}"/rpc-{gssd,svcgssd}.service
-}
-
-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
-}
diff --git a/net-fs/nfs-utils/nfs-utils-1.2.9.ebuild b/net-fs/nfs-utils/nfs-utils-1.2.9.ebuild
deleted file mode 100644
index e45679d7e9ca..000000000000
--- a/net-fs/nfs-utils/nfs-utils-1.2.9.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2014 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.9.ebuild,v 1.11 2014/01/18 20:02:58 ago Exp $
-
-EAPI="4"
-
-inherit eutils flag-o-matic multilib autotools systemd
-
-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 arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="caps ipv6 kerberos +libmount nfsdcld +nfsidmap +nfsv4 nfsv41 selinux tcpd +uuid"
-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-0.2.0-r1
-	net-libs/libtirpc
-	libmount? ( sys-apps/util-linux )
-	nfsdcld? ( >=dev-db/sqlite-3.3 )
-	nfsv4? (
-		>=dev-libs/libevent-1.0b
-		>=net-libs/libnfsidmap-0.21-r1
-		kerberos? (
-			net-libs/librpcsecgss
-			>=net-libs/libgssglue-0.3
-			net-libs/libtirpc[kerberos]
-			app-crypt/mit-krb5
-		)
-		nfsidmap? (
-			>=net-libs/libnfsidmap-0.24
-			sys-apps/keyutils
-		)
-	)
-	nfsv41? (
-		sys-fs/lvm2
-	)
-	selinux? (
-		sec-policy/selinux-rpc
-		sec-policy/selinux-rpcbind
-	)
-	uuid? ( sys-apps/util-linux )"
-RDEPEND="${DEPEND_COMMON} !net-nds/portmap"
-DEPEND="${DEPEND_COMMON}
-	virtual/pkgconfig"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.1.4-mtab-sym.patch
-	epatch "${FILESDIR}"/${PN}-1.2.8-cross-build.patch
-	eautoreconf
-}
-
-src_configure() {
-	export libsqlite3_cv_is_recent=yes # Our DEPEND forces this.
-	export ac_cv_header_keyutils_h=$(usex nfsidmap)
-	econf \
-		--with-statedir=/var/lib/nfs \
-		--enable-tirpc \
-		$(use_enable libmount libmount-mount) \
-		$(use_with tcpd tcp-wrappers) \
-		$(use_enable nfsdcld nfsdcltrack) \
-		$(use_enable nfsv4) \
-		$(use_enable nfsv41) \
-		$(use_enable ipv6) \
-		$(use_enable caps) \
-		$(use_enable uuid) \
-		$(usex nfsv4 "$(use_enable kerberos gss)" "--disable-gss") \
-		$(usex nfsv4 "$(use_with kerberos gssglue)" "--without-gssglue")
-}
-
-src_compile(){
-	# remove compiled files bundled in the tarball
-	emake clean
-	default
-}
-
-src_install() {
-	default
-	rm linux-nfs/Makefile* || die
-	dodoc -r linux-nfs 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
-
-	if use nfsv4 && use nfsidmap ; then
-		# Install a config file for idmappers in newer kernels. #415625
-		insinto /etc/request-key.d
-		echo 'create id_resolver * * /usr/sbin/nfsidmap -t 600 %k %d' > id_resolver.conf
-		doins id_resolver.conf
-	fi
-
-	insinto /etc
-	doins "${FILESDIR}"/exports
-
-	local f list=() opt_need=""
-	if use nfsv4 ; then
-		opt_need="rpc.idmapd"
-		list+=( rpc.idmapd rpc.pipefs )
-		use kerberos && list+=( rpc.gssd rpc.svcgssd )
-	fi
-	for f in nfs nfsmount rpc.statd "${list[@]}" ; do
-		newinitd "${FILESDIR}"/${f}.initd ${f}
-	done
-	for f in nfs nfsmount ; do
-		newconfd "${FILESDIR}"/${f}.confd ${f}
-	done
-	sed -i \
-		-e "/^NFS_NEEDED_SERVICES=/s:=.*:=\"${opt_need}\":" \
-		"${ED}"/etc/conf.d/nfs || die #234132
-	systemd_dounit "${FILESDIR}"/nfsd.service
-	systemd_dounit "${FILESDIR}"/rpc-statd.service
-	systemd_dounit "${FILESDIR}"/rpc-mountd.service
-}
-
-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
-}