[gentoo-commits] repo/gentoo:master commit in: net-fs/nfs-utils/, net-fs/nfs-utils/files/

[Thomas Deutschmann]

commit:     751915e76d292d90356274caa7803d614d3eac7a
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 28 14:45:09 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Sep 28 14:52:50 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=751915e7

net-fs/nfs-utils: drop old

Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 net-fs/nfs-utils/Manifest                          |   2 -
 .../nfs-utils/files/nfs-utils-2.3.1-limits.patch   | 105 -----------
 .../files/nfs-utils-2.3.2-junction_libs.patch      |  45 -----
 .../files/nfs-utils-2.3.2-no-werror.patch          |  53 ------
 ...-2.3.4_rc2-improved_res_querydomain_check.patch |  41 ----
 net-fs/nfs-utils/nfs-utils-2.3.3.ebuild            | 195 -------------------
 net-fs/nfs-utils/nfs-utils-2.3.4.ebuild            | 192 -------------------
 net-fs/nfs-utils/nfs-utils-2.4.1-r1.ebuild         | 206 ---------------------
 8 files changed, 839 deletions(-)

diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest
index ec46a4b5e43..33eadfc1820 100644
--- a/net-fs/nfs-utils/Manifest
+++ b/net-fs/nfs-utils/Manifest
@@ -1,3 +1 @@
-DIST nfs-utils-2.3.3.tar.bz2 888947 BLAKE2B 7c913f0c5061807d4af162fb392c8f466abb97c88960853b52298f61056bcad08f67a16e577036dec9afa737d88268d5a766b67c4b30a014b666dfbf3db81031 SHA512 266b86ef5041a7ecd144c6f2570e8a6eb00ebb4e547fa4b8c8c3e60a4af117c2690ff9effb0d4113a7b7ef57164583c8a6ada9cb1bb8f7b748524c826eaf1cba
-DIST nfs-utils-2.3.4.tar.bz2 906900 BLAKE2B 968fac7b37c7311bc8d29667c88db925aac0c062ed7ef8c13f9e5c11c3c88960ffaea56c1b6cfb5594a01238f9190e55ab7b837a79a7a804bc55dcca75908eea SHA512 25203b38be6683f25ad6583ac8534873c907124092a768955c1454899e2f467b9dd427b167556eb4f28992b5720da13078eb1eb086da991438454f268e1559a5
 DIST nfs-utils-2.4.1.tar.bz2 910791 BLAKE2B 4419eff7fca21747e0bc4969ebb8a8b863aa951984af8f23f197e7dfc4faad3770173808862b84178714ca75f021be1af96f9e4408fecd7ef97999d261f2f21b SHA512 655a115955f35177b761f821e29c752693d614f4c6c2a90d392e0ab83b615247a397cf18e8ad453a93c6dc528d1fa90cfdf8b04de6626e0f4083b10e2e54f540

diff --git a/net-fs/nfs-utils/files/nfs-utils-2.3.1-limits.patch b/net-fs/nfs-utils/files/nfs-utils-2.3.1-limits.patch
deleted file mode 100644
index b322b6fb17c..00000000000
--- a/net-fs/nfs-utils/files/nfs-utils-2.3.1-limits.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-Required for successful build on musl
-https://bugs.gentoo.org/651080#c5
-
-Thanks-to: Robert Bridge <robert@××××××××.com>
-
---- nfs-utils-2.3.1/support/export/export.c
-+++ nfs-utils-2.3.1/support/export/export.c
-@@ -17,6 +17,7 @@
- #include <stdlib.h>
- #include <dirent.h>
- #include <errno.h>
-+#include <limits.h>
- #include "xmalloc.h"
- #include "nfslib.h"
- #include "exportfs.h"
---- nfs-utils-2.3.1/support/export/xtab.c
-+++ nfs-utils-2.3.1/support/export/xtab.c
-@@ -18,6 +18,7 @@
- #include <sys/stat.h>
- #include <errno.h>
- #include <libgen.h>
-+#include <limits.h>
- 
- #include "nfslib.h"
- #include "exportfs.h"
---- nfs-utils-2.3.1/support/misc/file.c
-+++ nfs-utils-2.3.1/support/misc/file.c
-@@ -27,6 +27,7 @@
- #include <dirent.h>
- #include <stdlib.h>
- #include <stdbool.h>
-+#include <limits.h>
- 
- #include "xlog.h"
- #include "misc.h"
---- nfs-utils-2.3.1/support/nfs/xcommon.c
-+++ nfs-utils-2.3.1/support/nfs/xcommon.c
-@@ -16,6 +16,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <limits.h>
- 
- #include "xcommon.h"
- #include "nls.h"	/* _() */
---- nfs-utils-2.3.1/support/nsm/file.c
-+++ nfs-utils-2.3.1/support/nsm/file.c
-@@ -85,6 +85,7 @@
- #include <fcntl.h>
- #include <dirent.h>
- #include <grp.h>
-+#include <limits.h>
- 
- #include "xlog.h"
- #include "nsm.h"
---- nfs-utils-2.3.1/utils/blkmapd/device-discovery.c
-+++ nfs-utils-2.3.1/utils/blkmapd/device-discovery.c
-@@ -49,6 +49,7 @@
- #include <unistd.h>
- #include <libgen.h>
- #include <errno.h>
-+#include <limits.h>
- #include <libdevmapper.h>
- 
- #ifdef HAVE_CONFIG_H
---- nfs-utils-2.3.1/utils/gssd/krb5_util.c
-+++ nfs-utils-2.3.1/utils/gssd/krb5_util.c
-@@ -120,6 +120,7 @@
- #endif
- #include <krb5.h>
- #include <rpc/auth_gss.h>
-+#include <limits.h>
- 
- #include "gssd.h"
- #include "err_util.h"
---- nfs-utils-2.3.1/utils/mountd/cache.c
-+++ nfs-utils-2.3.1/utils/mountd/cache.c
-@@ -26,6 +26,7 @@
- #include <pwd.h>
- #include <grp.h>
- #include <mntent.h>
-+#include <limits.h>
- #include "misc.h"
- #include "nfslib.h"
- #include "exportfs.h"
---- nfs-utils-2.3.1/utils/mountd/mountd.c
-+++ nfs-utils-2.3.1/utils/mountd/mountd.c
-@@ -22,6 +22,7 @@
- #include <fcntl.h>
- #include <sys/resource.h>
- #include <sys/wait.h>
-+#include <limits.h>
- 
- #include "conffile.h"
- #include "xmalloc.h"
---- nfs-utils-2.3.1/utils/mountd/rmtab.c
-+++ nfs-utils-2.3.1/utils/mountd/rmtab.c
-@@ -16,6 +16,7 @@
- #include <netinet/in.h>
- #include <arpa/inet.h>
- #include <netdb.h>
-+#include <limits.h>
- 
- #include "misc.h"
- #include "exportfs.h"

diff --git a/net-fs/nfs-utils/files/nfs-utils-2.3.2-junction_libs.patch b/net-fs/nfs-utils/files/nfs-utils-2.3.2-junction_libs.patch
deleted file mode 100644
index f13f07a4c81..00000000000
--- a/net-fs/nfs-utils/files/nfs-utils-2.3.2-junction_libs.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 8f3e4f4d6df9f813572051e12e974b35c26a1743 Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@g.o>
-Date: Mon, 28 May 2018 12:13:10 +0200
-Subject: [PATCH] Fix undefined references and bad include when build with
- junction support
-
----
- support/junction/Makefile.am | 2 +-
- utils/nfsref/Makefile.am     | 6 +++---
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/support/junction/Makefile.am b/support/junction/Makefile.am
-index 97e7426..89cb532 100644
---- a/support/junction/Makefile.am
-+++ b/support/junction/Makefile.am
-@@ -31,4 +31,4 @@ libjunction_la_SOURCES	= display.c export-cache.c junction.c \
- 
- MAINTAINERCLEANFILES	= Makefile.in
- 
--AM_CPPFLAGS		= -I. -I../include -I/usr/include/libxml2
-+AM_CPPFLAGS		= -I. -I../include -I/usr/include/libxml2 @TIRPC_CFLAGS@
-diff --git a/utils/nfsref/Makefile.am b/utils/nfsref/Makefile.am
-index 2b2bb53..a652b03 100644
---- a/utils/nfsref/Makefile.am
-+++ b/utils/nfsref/Makefile.am
-@@ -27,13 +27,13 @@ noinst_HEADERS		= nfsref.h
- 
- sbin_PROGRAMS		= nfsref
- nfsref_SOURCES		= add.c lookup.c nfsref.c remove.c
--LDADD			= $(LIBXML2) $(LIBCAP) \
--			  ../../support/nfs/libnfs.la \
-+LIBS			+= $(LIBXML2) $(LIBCAP)
-+LDADD			=  ../../support/nfs/libnfs.la \
- 			  ../../support/junction/libjunction.la
- 
- man8_MANS		= nfsref.man
- 
- MAINTAINERCLEANFILES	= Makefile.in
- 
--AM_CPPFLAGS		= -I. -I../../support/include
-+AM_CPPFLAGS		= -I. -I../../support/include @TIRPC_CFLAGS@
- ##AM_LDFLAGS		= -Wl,--as-needed
--- 
-2.17.0
-

diff --git a/net-fs/nfs-utils/files/nfs-utils-2.3.2-no-werror.patch b/net-fs/nfs-utils/files/nfs-utils-2.3.2-no-werror.patch
deleted file mode 100644
index d06fc4ce8b8..00000000000
--- a/net-fs/nfs-utils/files/nfs-utils-2.3.2-no-werror.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-https://bugs.gentoo.org/656984
-
-Don't build with -Werror flags.
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -544,45 +544,11 @@
- AC_SUBST(LDFLAGS_FOR_BUILD)
- 
- my_am_cflags="\
-- -pipe \
-  -Wall \
-  -Wextra \
-- -Werror=strict-prototypes \
-- -Werror=missing-prototypes \
-- -Werror=missing-declarations \
-- -Werror=format=2 \
-- -Werror=undef \
-- -Werror=missing-include-dirs \
-- -Werror=strict-aliasing=2 \
-- -Werror=init-self \
-- -Werror=implicit-function-declaration \
-- -Werror=return-type \
-- -Werror=switch \
-- -Werror=overflow \
-- -Werror=parentheses \
-- -Werror=aggregate-return \
-- -Werror=unused-result \
-  -fno-strict-aliasing \
- "
--
--AC_DEFUN([CHECK_CCSUPPORT], [
--  my_save_cflags="$CFLAGS"
--  CFLAGS=$1
--  AC_MSG_CHECKING([whether CC supports $1])
--  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])],
--    [AC_MSG_RESULT([yes])]
--    [$2+=$1],
--    [AC_MSG_RESULT([no])]
--  )
--  CFLAGS="$my_save_cflags"
--])
--
--CHECK_CCSUPPORT([-Werror=format-overflow=2], [flg1])
--CHECK_CCSUPPORT([-Werror=int-conversion], [flg2])
--CHECK_CCSUPPORT([-Werror=incompatible-pointer-types], [flg3])
--CHECK_CCSUPPORT([-Werror=misleading-indentation], [flg4])
--
--AC_SUBST([AM_CFLAGS], ["$my_am_cflags $flg1 $flg2 $flg3 $flg4"])
-+AC_SUBST([AM_CFLAGS], ["$my_am_cflags"])
- 
- # Make sure that $ACLOCAL_FLAGS are used during a rebuild
- AC_SUBST([ACLOCAL_AMFLAGS], ["-I $ac_macro_dir \$(ACLOCAL_FLAGS)"])

diff --git a/net-fs/nfs-utils/files/nfs-utils-2.3.4_rc2-improved_res_querydomain_check.patch b/net-fs/nfs-utils/files/nfs-utils-2.3.4_rc2-improved_res_querydomain_check.patch
deleted file mode 100644
index 787a96fe89d..00000000000
--- a/net-fs/nfs-utils/files/nfs-utils-2.3.4_rc2-improved_res_querydomain_check.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 4f91877bb313a35ade44d9dde1fd219035ba1fd9 Mon Sep 17 00:00:00 2001
-From: Patrick Steinhardt <ps@×××.im>
-Date: Wed, 27 Feb 2019 11:58:47 -0500
-Subject: [PATCH] configure.ac: more carefully detect availability of
- res_querydomain(3)
-
-Since glibc 2.2, the function res_querydomain(3) is implemented as a
-define to `__res_querydomain`. Due to this implementation detail, using
-`AC_CHECK_LIB` with a symbol name of "res_querydomain" will cause a
-linking failure and thus fail to detect its availability. This is why
-right now, we try to detect availability of `__res_querydomain` instead.
-
-Unfortunately, this may break on other platforms where there is no
-`__res_querydomain` but only the function without leading underscores.
-To fix this, we can perform another `AC_CHECK_LIB([resolv],
-[res_querydomain], ...)` call in case where the other one was not found
-and only raise an error if both symbols weren't found.
-
-Signed-off-by: Patrick Steinhardt <ps@×××.im>
-Signed-off-by: Steve Dickson <steved@××××××.com>
----
- configure.ac | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 4bf5aea..cb9d921 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -411,7 +411,8 @@ if test "$enable_gss" = yes; then
- fi
- 
- dnl libdnsidmap specific checks
--AC_CHECK_LIB([resolv], [__res_querydomain], , AC_MSG_ERROR(res_querydomain needed))
-+AC_CHECK_LIB([resolv], [__res_querydomain], ,
-+	AC_CHECK_LIB([resolv], [res_querydomain], , AC_MSG_ERROR(res_querydomain needed)))
- 
- AC_ARG_ENABLE([ldap],
- 	[AS_HELP_STRING([--disable-ldap],[Disable support for LDAP @<:default=detect@:>@])])
--- 
-1.8.3.1
-

diff --git a/net-fs/nfs-utils/nfs-utils-2.3.3.ebuild b/net-fs/nfs-utils/nfs-utils-2.3.3.ebuild
deleted file mode 100644
index 77465d97e58..00000000000
--- a/net-fs/nfs-utils/nfs-utils-2.3.3.ebuild
+++ /dev/null
@@ -1,195 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic multilib systemd
-
-DESCRIPTION="NFS client and server daemons"
-HOMEPAGE="http://linux-nfs.org/"
-
-if [[ "${PV}" = *_rc* ]] ; then
-	inherit versionator
-	MY_PV="$(replace_all_version_separators -)"
-	SRC_URI="http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=snapshot;h=refs/tags/${PN}-${MY_PV};sf=tgz -> ${P}.tar.gz"
-	S="${WORKDIR}/${PN}-${PN}-${MY_PV}"
-else
-	SRC_URI="mirror://sourceforge/nfs/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="caps ipv6 junction kerberos ldap +libmount nfsdcld +nfsidmap +nfsv4 nfsv41 selinux tcpd +uuid"
-REQUIRED_USE="kerberos? ( nfsv4 )"
-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="
-	dev-libs/libxml2
-	net-libs/libtirpc:=
-	>=net-nds/rpcbind-0.2.4
-	sys-libs/e2fsprogs-libs
-	caps? ( sys-libs/libcap )
-	ldap? ( net-nds/openldap )
-	libmount? ( sys-apps/util-linux )
-	nfsdcld? ( >=dev-db/sqlite-3.3 )
-	nfsv4? (
-		dev-libs/libevent:=
-		>=sys-apps/keyutils-1.5.9
-		kerberos? (
-			>=net-libs/libtirpc-0.2.4-r1[kerberos]
-			app-crypt/mit-krb5
-		)
-	)
-	nfsv41? (
-		sys-fs/lvm2
-	)
-	tcpd? ( sys-apps/tcp-wrappers )
-	uuid? ( sys-apps/util-linux )"
-RDEPEND="${DEPEND_COMMON}
-	!net-libs/libnfsidmap
-	!net-nds/portmap
-	!<sys-apps/openrc-0.13.9
-	selinux? (
-		sec-policy/selinux-rpc
-		sec-policy/selinux-rpcbind
-	)
-"
-DEPEND="${DEPEND_COMMON}
-	net-libs/rpcsvc-proto
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.1.4-mtab-sym.patch
-	"${FILESDIR}"/${PN}-1.2.8-cross-build.patch
-	"${FILESDIR}"/${PN}-2.3.2-junction_libs.patch
-	"${FILESDIR}"/${PN}-2.3.2-no-werror.patch
-	"${FILESDIR}"/${PN}-2.3.1-limits.patch #651080
-	"${FILESDIR}"/${PN}-2.3.4_rc2-improved_res_querydomain_check.patch #651080
-)
-
-src_prepare() {
-	default
-
-	sed \
-		-e "/^sbindir/s:= := \"${EPREFIX}\":g" \
-		-i utils/*/Makefile.am || die
-
-	eautoreconf
-}
-
-src_configure() {
-	export libsqlite3_cv_is_recent=yes # Our DEPEND forces this.
-	export ac_cv_header_keyutils_h=$(usex nfsidmap)
-	local myeconfargs=(
-		--with-statedir="${EPREFIX%/}"/var/lib/nfs
-		--enable-tirpc
-		--with-tirpcinclude="${EPREFIX%/}"/usr/include/tirpc/
-		--with-pluginpath="${EPREFIX%/}"/usr/$(get_libdir)/libnfsidmap
-		--with-rpcgen
-		--with-systemd="$(systemd_get_systemunitdir)"
-		--without-gssglue
-		$(use_enable caps)
-		$(use_enable ipv6)
-		$(use_enable junction)
-		$(use_enable kerberos gss)
-		$(use_enable kerberos svcgss)
-		$(use_enable ldap)
-		$(use_enable libmount libmount-mount)
-		$(use_enable nfsdcld nfsdcltrack)
-		$(use_enable nfsv4)
-		$(use_enable nfsv41)
-		$(use_enable uuid)
-		$(use_with tcpd tcp-wrappers)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-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/nfs "${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
-	keepdir /etc/exports.d
-
-	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 nfsclient rpc.statd "${list[@]}" ; do
-		newinitd "${FILESDIR}"/${f}.initd ${f}
-	done
-	newinitd "${FILESDIR}"/nfsmount.initd-1.3.1 nfsmount # Nuke after 2015/08/01
-	for f in nfs nfsclient ; do
-		newconfd "${FILESDIR}"/${f}.confd ${f}
-	done
-	sed -i \
-		-e "/^NFS_NEEDED_SERVICES=/s:=.*:=\"${opt_need}\":" \
-		"${ED%/}"/etc/conf.d/nfs || die #234132
-
-	local systemd_systemunitdir="$(systemd_get_systemunitdir)"
-	sed -i \
-		-e 's:/usr/sbin/rpc.statd:/sbin/rpc.statd:' \
-		"${ED%/}${systemd_systemunitdir}"/* || die
-
-	keepdir /var/lib/nfs #368505
-	keepdir /var/lib/nfs/v4recovery #603628
-
-}
-
-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 "${EROOT%/}"/usr/$(get_libdir)/nfs/*; do
-		[[ -e ${EROOT%/}/var/lib/nfs/${f##*/} ]] && continue
-		einfo "Copying default ${f##*/} from ${EPREFIX}/usr/$(get_libdir)/nfs to ${EPREFIX}/var/lib/nfs"
-		cp -pPR "${f}" "${EROOT%/}"/var/lib/nfs/
-	done
-
-	if systemd_is_booted; then
-		for v in ${REPLACING_VERSIONS}; do
-			if ver_test "${v}" -lt 1.3.0; then
-				ewarn "We have switched to upstream systemd unit files. Since"
-				ewarn "they got renamed, you should probably enable the new ones."
-				ewarn "You can run 'equery files nfs-utils | grep systemd'"
-				ewarn "to know what services you need to enable now."
-			fi
-		done
-	else
-		ewarn "If you use OpenRC, the nfsmount service has been replaced with nfsclient."
-		ewarn "If you were using nfsmount, please add nfsclient and netmount to the"
-		ewarn "same runlevel as nfsmount."
-	fi
-}

diff --git a/net-fs/nfs-utils/nfs-utils-2.3.4.ebuild b/net-fs/nfs-utils/nfs-utils-2.3.4.ebuild
deleted file mode 100644
index 975b78c549b..00000000000
--- a/net-fs/nfs-utils/nfs-utils-2.3.4.ebuild
+++ /dev/null
@@ -1,192 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic multilib systemd
-
-DESCRIPTION="NFS client and server daemons"
-HOMEPAGE="http://linux-nfs.org/"
-
-if [[ "${PV}" = *_rc* ]] ; then
-	MY_PV="$(ver_rs 1- -)"
-	SRC_URI="http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=snapshot;h=refs/tags/${PN}-${MY_PV};sf=tgz -> ${P}.tar.gz"
-	S="${WORKDIR}/${PN}-${PN}-${MY_PV}"
-else
-	SRC_URI="mirror://sourceforge/nfs/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="caps ipv6 junction kerberos ldap +libmount nfsdcld +nfsidmap +nfsv4 nfsv41 selinux tcpd +uuid"
-REQUIRED_USE="kerberos? ( nfsv4 )"
-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="
-	>=dev-db/sqlite-3.3
-	dev-libs/libxml2
-	net-libs/libtirpc:=
-	>=net-nds/rpcbind-0.2.4
-	sys-libs/e2fsprogs-libs
-	caps? ( sys-libs/libcap )
-	ldap? ( net-nds/openldap )
-	libmount? ( sys-apps/util-linux )
-	nfsv4? (
-		dev-libs/libevent:=
-		>=sys-apps/keyutils-1.5.9
-		kerberos? (
-			>=net-libs/libtirpc-0.2.4-r1[kerberos]
-			app-crypt/mit-krb5
-		)
-	)
-	nfsv41? (
-		sys-fs/lvm2
-	)
-	tcpd? ( sys-apps/tcp-wrappers )
-	uuid? ( sys-apps/util-linux )"
-RDEPEND="${DEPEND}
-	!net-libs/libnfsidmap
-	!net-nds/portmap
-	!<sys-apps/openrc-0.13.9
-	selinux? (
-		sec-policy/selinux-rpc
-		sec-policy/selinux-rpcbind
-	)
-"
-BDEPEND="
-	net-libs/rpcsvc-proto
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.1.4-mtab-sym.patch
-	"${FILESDIR}"/${PN}-1.2.8-cross-build.patch
-	"${FILESDIR}"/${PN}-2.3.4-no-werror.patch
-)
-
-src_prepare() {
-	default
-
-	sed \
-		-e "/^sbindir/s:= := \"${EPREFIX}\":g" \
-		-i utils/*/Makefile.am || die
-
-	eautoreconf
-}
-
-src_configure() {
-	export libsqlite3_cv_is_recent=yes # Our DEPEND forces this.
-	export ac_cv_header_keyutils_h=$(usex nfsidmap)
-	local myeconfargs=(
-		--with-statedir="${EPREFIX%/}"/var/lib/nfs
-		--enable-tirpc
-		--with-tirpcinclude="${EPREFIX%/}"/usr/include/tirpc/
-		--with-pluginpath="${EPREFIX%/}"/usr/$(get_libdir)/libnfsidmap
-		--with-rpcgen
-		--with-systemd="$(systemd_get_systemunitdir)"
-		--without-gssglue
-		$(use_enable caps)
-		$(use_enable ipv6)
-		$(use_enable junction)
-		$(use_enable kerberos gss)
-		$(use_enable kerberos svcgss)
-		$(use_enable ldap)
-		$(use_enable libmount libmount-mount)
-		$(use_enable nfsdcld nfsdcltrack)
-		$(use_enable nfsv4)
-		$(use_enable nfsv41)
-		$(use_enable uuid)
-		$(use_with tcpd tcp-wrappers)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-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/nfs "${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
-	keepdir /etc/exports.d
-
-	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 nfsclient rpc.statd "${list[@]}" ; do
-		newinitd "${FILESDIR}"/${f}.initd ${f}
-	done
-	newinitd "${FILESDIR}"/nfsmount.initd-1.3.1 nfsmount # Nuke after 2015/08/01
-	for f in nfs nfsclient ; do
-		newconfd "${FILESDIR}"/${f}.confd ${f}
-	done
-	sed -i \
-		-e "/^NFS_NEEDED_SERVICES=/s:=.*:=\"${opt_need}\":" \
-		"${ED}"/etc/conf.d/nfs || die #234132
-
-	local systemd_systemunitdir="$(systemd_get_systemunitdir)"
-	sed -i \
-		-e 's:/usr/sbin/rpc.statd:/sbin/rpc.statd:' \
-		"${ED}${systemd_systemunitdir}"/* || die
-
-	keepdir /var/lib/nfs #368505
-	keepdir /var/lib/nfs/v4recovery #603628
-
-}
-
-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 "${EROOT}"/usr/$(get_libdir)/nfs/*; do
-		[[ -e ${EROOT}/var/lib/nfs/${f##*/} ]] && continue
-		einfo "Copying default ${f##*/} from ${EPREFIX}/usr/$(get_libdir)/nfs to ${EPREFIX}/var/lib/nfs"
-		cp -pPR "${f}" "${EROOT}"/var/lib/nfs/
-	done
-
-	if systemd_is_booted; then
-		for v in ${REPLACING_VERSIONS}; do
-			if ver_test "${v}" -lt 1.3.0; then
-				ewarn "We have switched to upstream systemd unit files. Since"
-				ewarn "they got renamed, you should probably enable the new ones."
-				ewarn "You can run 'equery files nfs-utils | grep systemd'"
-				ewarn "to know what services you need to enable now."
-			fi
-		done
-	else
-		ewarn "If you use OpenRC, the nfsmount service has been replaced with nfsclient."
-		ewarn "If you were using nfsmount, please add nfsclient and netmount to the"
-		ewarn "same runlevel as nfsmount."
-	fi
-}

diff --git a/net-fs/nfs-utils/nfs-utils-2.4.1-r1.ebuild b/net-fs/nfs-utils/nfs-utils-2.4.1-r1.ebuild
deleted file mode 100644
index 26604696ea8..00000000000
--- a/net-fs/nfs-utils/nfs-utils-2.4.1-r1.ebuild
+++ /dev/null
@@ -1,206 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic linux-info multilib systemd
-
-DESCRIPTION="NFS client and server daemons"
-HOMEPAGE="http://linux-nfs.org/"
-
-if [[ "${PV}" = *_rc* ]] ; then
-	MY_PV="$(ver_rs 1- -)"
-	SRC_URI="http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=snapshot;h=refs/tags/${PN}-${MY_PV};sf=tgz -> ${P}.tar.gz"
-	S="${WORKDIR}/${PN}-${PN}-${MY_PV}"
-else
-	SRC_URI="mirror://sourceforge/nfs/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv s390 ~sh sparc x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="caps ipv6 junction kerberos ldap +libmount nfsdcld +nfsidmap +nfsv4 nfsv41 selinux tcpd +uuid"
-REQUIRED_USE="kerberos? ( nfsv4 )"
-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="
-	>=dev-db/sqlite-3.3
-	dev-libs/libxml2
-	net-libs/libtirpc:=
-	>=net-nds/rpcbind-0.2.4
-	sys-libs/e2fsprogs-libs
-	caps? ( sys-libs/libcap )
-	ldap? ( net-nds/openldap )
-	libmount? ( sys-apps/util-linux )
-	nfsv4? (
-		dev-libs/libevent:=
-		>=sys-apps/keyutils-1.5.9:=
-		kerberos? (
-			>=net-libs/libtirpc-0.2.4-r1[kerberos]
-			app-crypt/mit-krb5
-		)
-	)
-	nfsv41? (
-		sys-fs/lvm2
-	)
-	tcpd? ( sys-apps/tcp-wrappers )
-	uuid? ( sys-apps/util-linux )"
-RDEPEND="${DEPEND}
-	!net-libs/libnfsidmap
-	!net-nds/portmap
-	!<sys-apps/openrc-0.13.9
-	selinux? (
-		sec-policy/selinux-rpc
-		sec-policy/selinux-rpcbind
-	)
-"
-BDEPEND="
-	net-libs/rpcsvc-proto
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.1.4-mtab-sym.patch
-	"${FILESDIR}"/${PN}-1.2.8-cross-build.patch
-	"${FILESDIR}"/${PN}-2.3.4-no-werror.patch
-	"${FILESDIR}"/${P}-gssd-Look-in-lib32-for-gss-libs-aswell.patch
-)
-
-pkg_setup() {
-	linux-info_pkg_setup
-	if use nfsv4 && ! use nfsdcld && linux_config_exists && ! linux_chkconfig_present CRYPTO_MD5 ; then
-		ewarn "Your NFS server will be unable to track clients across server restarts!"
-		ewarn "Please enable the \"${HILITE}nfsdcld${NORMAL}\" USE flag to install the nfsdcltrack usermode"
-		ewarn "helper upcall program, or enable ${HILITE}CONFIG_CRYPTO_MD5${NORMAL} in your kernel to"
-		ewarn "support the legacy, in-kernel client tracker."
-	fi
-}
-
-src_prepare() {
-	default
-
-	sed \
-		-e "/^sbindir/s:= := \"${EPREFIX}\":g" \
-		-i utils/*/Makefile.am || die
-
-	eautoreconf
-}
-
-src_configure() {
-	export libsqlite3_cv_is_recent=yes # Our DEPEND forces this.
-	export ac_cv_header_keyutils_h=$(usex nfsidmap)
-	local myeconfargs=(
-		--with-statedir="${EPREFIX%/}"/var/lib/nfs
-		--enable-tirpc
-		--with-tirpcinclude="${EPREFIX%/}"/usr/include/tirpc/
-		--with-pluginpath="${EPREFIX%/}"/usr/$(get_libdir)/libnfsidmap
-		--with-rpcgen
-		--with-systemd="$(systemd_get_systemunitdir)"
-		--without-gssglue
-		$(use_enable caps)
-		$(use_enable ipv6)
-		$(use_enable junction)
-		$(use_enable kerberos gss)
-		$(use_enable kerberos svcgss)
-		$(use_enable ldap)
-		$(use_enable libmount libmount-mount)
-		$(use_enable nfsdcld nfsdcltrack)
-		$(use_enable nfsv4)
-		$(use_enable nfsv41)
-		$(use_enable uuid)
-		$(use_with tcpd tcp-wrappers)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-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/nfs "${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
-		insinto /etc
-		doins support/nfsidmap/idmapd.conf
-
-		# 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
-	keepdir /etc/exports.d
-
-	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 nfsclient rpc.statd "${list[@]}" ; do
-		newinitd "${FILESDIR}"/${f}.initd ${f}
-	done
-	newinitd "${FILESDIR}"/nfsmount.initd-1.3.1 nfsmount # Nuke after 2015/08/01
-	for f in nfs nfsclient ; do
-		newconfd "${FILESDIR}"/${f}.confd ${f}
-	done
-	sed -i \
-		-e "/^NFS_NEEDED_SERVICES=/s:=.*:=\"${opt_need}\":" \
-		"${ED}"/etc/conf.d/nfs || die #234132
-
-	local systemd_systemunitdir="$(systemd_get_systemunitdir)"
-	sed -i \
-		-e 's:/usr/sbin/rpc.statd:/sbin/rpc.statd:' \
-		"${ED}${systemd_systemunitdir}"/* || die
-
-	keepdir /var/lib/nfs #368505
-	keepdir /var/lib/nfs/v4recovery #603628
-
-}
-
-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 "${EROOT}"/usr/$(get_libdir)/nfs/*; do
-		[[ -e ${EROOT}/var/lib/nfs/${f##*/} ]] && continue
-		einfo "Copying default ${f##*/} from ${EPREFIX}/usr/$(get_libdir)/nfs to ${EPREFIX}/var/lib/nfs"
-		cp -pPR "${f}" "${EROOT}"/var/lib/nfs/
-	done
-
-	if systemd_is_booted; then
-		for v in ${REPLACING_VERSIONS}; do
-			if ver_test "${v}" -lt 1.3.0; then
-				ewarn "We have switched to upstream systemd unit files. Since"
-				ewarn "they got renamed, you should probably enable the new ones."
-				ewarn "You can run 'equery files nfs-utils | grep systemd'"
-				ewarn "to know what services you need to enable now."
-			fi
-		done
-	else
-		ewarn "If you use OpenRC, the nfsmount service has been replaced with nfsclient."
-		ewarn "If you were using nfsmount, please add nfsclient and netmount to the"
-		ewarn "same runlevel as nfsmount."
-	fi
-}