gentoo auto-resync : 23:01:2024 - 16:46:30

8 files changed, 19 insertions, 393 deletions

diff --git a/net-fs/Manifest.gz b/net-fs/Manifest.gz
index 764e04e9c874..e1b85e48a160 100644
--- a/net-fs/Manifest.gz
+++ b/net-fs/Manifest.gz
diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest
index 4cc9e08ca298..ca152dd4963b 100644
--- a/net-fs/nfs-utils/Manifest
+++ b/net-fs/nfs-utils/Manifest
@@ -1,8 +1,5 @@
 AUX exports 66 BLAKE2B 8ddc8e1b7888570cf7ce21ecebf0fb390ab394d25e60f1d914406396b23cb3cbf243a15a199f30608ac7e3c0abde73f48e0ccea605a3dadad654dfd8d6572dcd SHA512 fd8052dc8e17eccb0bb1443f341c97ec7c9dac5824294cadf486d91475bc728d4bb69300034b528a690707520590f6675ee371f92e9838afc8ed88092ee0f220
 AUX nfs-utils-2.5.2-no-werror.patch 1907 BLAKE2B 8d9ac90d445dd029d8db80ff39559d3f4f25f7560c17ce72a62b489998e1d4d4875d574b27fe057388bcd7f0062703b812ce043b23dfe46fdabc9ba53591edcb SHA512 9cabbfa67d193c2c944c257089d67bc33230fb804d3a350ee2bcd5595594ff35ba6485c1ab240b956f5c08c40a41a0adc87c9ad9f967d2b7eb1d2dd51c9a6e9e
-AUX nfs-utils-2.6.2-clang-Wlogical-not-parentheses.patch 1040 BLAKE2B 29e3ebc44cb4a24765134ff11ccb258270e9bd8c26a02ec15b0e6e6600e530a70833609ca8508d691929ebf2cdf02e2230917f39e1e1d6aa05be169906f41906 SHA512 580aa6837760adb0ecda935a547ea204655850dac4b9c613679c77c4a4a98bff7d61cbfd3616fab8d2cb03b806c0b131ccd911bf933ab5cd9c2a242e6b921454
-AUX nfs-utils-2.6.2-clang-fix-function-prototypes.patch 2118 BLAKE2B 182659cd4a0efc40b4574d3aaa534fcd2367db230c9ac1df9e3cb3a7f06436061e497dbeb9c77a61e7df4dd34e83b1a213acfb5b94e4a5794af9bd81d087eb27 SHA512 a9d762f91782bbe6c1329e90b558ab30aa7be60cb844046783243de493b9a798daf460078310f12c6c174d26b63607d294466bd02fb684b457e3e219dd4cadd0
-AUX nfs-utils-2.6.2-clang-more-function-prototypes.patch 1222 BLAKE2B 1f1557ced63aaa8ab92a8e74126501ebcc77469c72e3cc4ad685ec046d78120f189b1195ba1766a525b7a52c11d0a795ed9bbd74b3e16f30b79295988decaad0 SHA512 f3340ddd67ebd6d28b6fc78b08ef8d87df9d0681143590548c1fb5d152287a5a235a92356e4a4d813d55095956dbf9fbec990481e775be2ffaf1e34a885145ab
 AUX nfs-utils-2.6.4-includes.patch 1254 BLAKE2B b741302756690872ed218a830695abea740704e6e0850dacd17c471519337f22b268b6902849cfb83165f0dec9bd42badf2b67642564ba18c7d149d636fee55d SHA512 ec59556ac8c0626fbd37eb27e152d8994503ffc890eb95844bc705ea2241fe57a8ace109ffae4d1b2d4c36ad78994fd39f3b3bd5d7336a6cd02fddb1f3bf76e9
 AUX nfs-utils-udev-sysctl.patch 1388 BLAKE2B 843cc5f0f00e665cbd731588784193b08b45a3e16aa79d303751f8b019083404db74e78f6bc35ca8f894ff0a60ee2f374c1108f21b13be66d7049b6e46609add SHA512 2d9b6189c2e6db96a487fbae2af80623c7157ee52a51cb63afba547f05f81ab8a291c7b7001b5faf8e58cef290fd23cc2d1892f97387fc842f230d23218d06a2
 AUX nfs.confd 930 BLAKE2B 4ef1662b31cffd78b0e96396ad74dc8b8135a9a18956fa1267639d2069893d4f218ded5809497b56d19a192e7e18408e1d1b56bd1535abed8db236bc1a1649cb SHA512 bc11b073735ee86c96b9c249ee187f4d16329c279a4e26760875059d2b5fa1d510ef3e4df5ee9dfb2a3133d755e1eb5c323d2fadc432a0cf630191ec353ac535
@@ -15,11 +12,9 @@ AUX rpc.idmapd.initd 482 BLAKE2B db643d164787a730ed8f1da73cbc045237bb641fcdf2970
 AUX rpc.pipefs.initd 760 BLAKE2B 4c05275e59d7d19d80779964a3631096258704cec2097f12d87232deecba5d74181f1713e18ebb01f5da9c3833037ba47566414f0b415608ad13e3fa97c8f1e6 SHA512 3d3fa6e7ae01e27d27d88aba1e307c5293dd1cbc9d555737e03c4f1e17988518f4f1e7f7a38a7337f8e8961e8378cc4611769b04db7368460589a3b218ac6d6b
 AUX rpc.statd.initd 706 BLAKE2B 6c175729706d298307deea1d190703e67edb671a6b2c86216658fc89dafff1ae9f85a25b5386e4c89b86ca1b7b1fce7bb3045f944b7a1aee5b6544594d753cf8 SHA512 7f6baea852fff91b88e15e432ba19f9da0a3e3510b6f550b553912cf3887ce176280367b62bcce2a044730a075e4c1f6d7df1a669556d42725dea6e6e8e967ac
 AUX rpc.svcgssd.initd 470 BLAKE2B c610a7abc44b86ca242d59f833ffa6e42f48d1c3bf93420988c6c6dfcd5cc4d8e02eaf2f3a86bb8bca7c8952e05017f887e6c4f4290085c41cc095a580e04235 SHA512 819cce4ae0a0f26bc74ce546e149b98420584240a594c9bb4a0a49413750320bde050866f3753c499425ea8d8df094211fb1f7e020ce281791e1933e1bc6a47f
-DIST nfs-utils-2.6.2.tar.bz2 969689 BLAKE2B 8e0a3b309223779824276acd3ede13cfc161b955dc9376cc9426ffe9c604b111f7405088fe8e5a88a2d2ac1413d2742fbdf166a5b04c975e51a9e384e071fa60 SHA512 6e5dcc5147ad551b2ecbf0304e1b0e0713d1eff32c5a511562a6d03660589e027364e38fc9f6de1b06d32d8907d502f63c564a6e56171f58823b0ea68dd3a6b8
 DIST nfs-utils-2.6.3.tar.bz2 978167 BLAKE2B 776b4ce6edc728e1dd2291898f429fbc76327b949008f2a477af887231feb2e27505a94978f819e4e4ed7b2b8574e6c5b8d02a9ca6e94683ec620ce99a909a06 SHA512 870dee2a95f411de6694aa8dddeef2302ef9235389a9bdca381ef719303fdd1a463a815ca67e0336a5121fa68d5b448b1952d539679e38b36f1e6b69c1e2f853
 DIST nfs-utils-2.6.4.tar.bz2 979652 BLAKE2B 45f6e9c98e8148e82684526c2ab0f8976b2a46fd869d91f03cf9afffbaad64b77dc1729a50b74d30c5d65bfe213a1da2f54e3d3e19539b61994f7b65671a26ab SHA512 e5fde25c54f594d00e69c9aeff8abc22663b994ecd37d8516751be98b51b12c61ffec47ee128794e170ec773f0649cb594df1ca104ec4dba561823db423f8533
-EBUILD nfs-utils-2.6.2-r1.ebuild 6273 BLAKE2B 13c6ac04c9d4b5c7d117537f6a89c82c9978780f29f5ea1d8949585cc7823e0aae8dec0478d6f2aa07c34d3ec0e98c4ae16015ebbb05fd970ffcfa9300f1661a SHA512 b7d271c5b949d4e248f310016b85d4e3a29e873a7baff6b83bff5512f8f09313cadb6572133bea220970b4c29bdad171a1f8db8cd6031cbdf1287c384103cc5d
 EBUILD nfs-utils-2.6.3-r2.ebuild 6343 BLAKE2B 115b74d78136c8570796db5beda82359bc6abb5778be465acc9aa319e0ac13e3d49c74b28d47dc819765b162051a227f1b77e427bdc40bb8930e671c121d21e4 SHA512 721b754a0e5ca8344cee80d6ea8efb197e73daf5cd2b5824fef0ebba8442b6c2bbf7082ff37866ebd8a61772ca39ae48952d758a1106eef6cf8bb9dfb9a800e0
 EBUILD nfs-utils-2.6.4-r1.ebuild 6381 BLAKE2B dfddee04637316f0702afb9cb0b755c34f3a5eb7c6584c65eb1b13e44517bbefe417e0fa11eb522a15ad35ab7705b15d6dd20f6bc5732379e5d99287b1359905 SHA512 c2e0a5d46311af0bf90a9ef2301a1e848a720f096a7f54d052671fe75f142f41e1a8229de3de3b5d2e483e37d706eb33d8aeaa7aab5b25a85da6ca9949b0450f
-EBUILD nfs-utils-2.6.4.ebuild 6346 BLAKE2B 91ae0cda6bd03e0467f3e7ced4034bd0e0bdb6f9ebb9c7db93dfea17e045672f623b87d4998b702e752967b185c1fb730a0a1b7b9e699a08934bedef4c3039b4 SHA512 07ee60141ff50a05de2ef5c554c1165f82cc4eb5797a35adabd2f80b24afb82cf8a82286d681f496e02fd8788ce24a959bed929c0ca6686ccbea7c0f9cd6b0bc
-MISC metadata.xml 931 BLAKE2B 68fe90eceb28d3941cf4a8179320b5e5839b3d84dddab9509f9a1bb7c70f413acbb32ef6fda9cb94349193e258df71edb2a518568780177b4a8cfe155f9b57a9 SHA512 af2f74e21226176eb2873ea5de7f96996f54b73b742800adb444ced7485c8ae3556aba20b47c58c0694655f9a9b56447307483f98fc426b322fe05c56a2ce8a9
+EBUILD nfs-utils-2.6.4-r2.ebuild 6667 BLAKE2B f7d77a076d9fbc35c54f253f7c8ff9be073512e647a6b9de2542a15b3236175988aa22ed7fae4a3cedcd4f05c5a72e6704eaccca6b95413dfdb6b7eaefb72d30 SHA512 87309bb8a6057ce7ba6488694ff129753f653772a99f94cc63f6569be34eea51df30cf80bef9fa143166e5d729a0a568c32e817d08a53f9faf7b651c332d8f1b
+MISC metadata.xml 1006 BLAKE2B ffe7500e64c7943072d07095e29eca3a167bef1385ecef3492e43b2ec08a2c2221ca3454bb0773eefb04dbc89c4f97a394ee2ee1ba92e975da8ed38b6a705963 SHA512 a737c929d1488165d06777af1a14daf2478540d0574337203b1d5a8af2db2040b591ef901db89fd70dd668c8f0c3ec4e5ca1480994549d86c1c5a7ebfae9227f
diff --git a/net-fs/nfs-utils/files/nfs-utils-2.6.2-clang-Wlogical-not-parentheses.patch b/net-fs/nfs-utils/files/nfs-utils-2.6.2-clang-Wlogical-not-parentheses.patch
deleted file mode 100644
index 2ba9a45a024b..000000000000
--- a/net-fs/nfs-utils/files/nfs-utils-2.6.2-clang-Wlogical-not-parentheses.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-https://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commitdiff;h=896946e3c7f8ec1a02d4dc3a039e6cbbd2f611a9
-
-From 896946e3c7f8ec1a02d4dc3a039e6cbbd2f611a9 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Tue, 13 Sep 2022 11:42:03 -0400
-Subject: [PATCH] mountd: Check for return of stat function
-
-simplify the check, stat() return 0 on success -1 on failure
-
-Fixes clang reported errors e.g.
-
-| v4clients.c:29:6: error: logical not is only applied to the left hand side of this comparison [-Werror,-Wlogical-not-parentheses]
-|         if (!stat("/proc/fs/nfsd/clients", &sb) == 0 ||
-|             ^                                   ~~
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-Signed-off-by: Steve Dickson <steved@redhat.com>
---- a/support/export/v4clients.c
-+++ b/support/export/v4clients.c
-@@ -26,7 +26,7 @@ void v4clients_init(void)
- {
- 	struct stat sb;
- 
--	if (!stat("/proc/fs/nfsd/clients", &sb) == 0 ||
-+	if (stat("/proc/fs/nfsd/clients", &sb) != 0 ||
- 	    !S_ISDIR(sb.st_mode))
- 		return;
- 	if (clients_fd >= 0)
diff --git a/net-fs/nfs-utils/files/nfs-utils-2.6.2-clang-fix-function-prototypes.patch b/net-fs/nfs-utils/files/nfs-utils-2.6.2-clang-fix-function-prototypes.patch
deleted file mode 100644
index f223af883ad0..000000000000
--- a/net-fs/nfs-utils/files/nfs-utils-2.6.2-clang-fix-function-prototypes.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-https://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commitdiff;h=167f2336b06e1bcbf26f45f2ddc4a535fed4d393
-https://bugs.gentoo.org/869254
-
-From 167f2336b06e1bcbf26f45f2ddc4a535fed4d393 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Tue, 13 Sep 2022 11:44:05 -0400
-Subject: [PATCH] Fix function prototypes
-
-Clang is now erroring out on functions with out parameter types
-
-Fixes errors like
-error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-Signed-off-by: Steve Dickson <steved@redhat.com>
---- a/support/export/auth.c
-+++ b/support/export/auth.c
-@@ -82,7 +82,7 @@ check_useipaddr(void)
- }
- 
- unsigned int
--auth_reload()
-+auth_reload(void)
- {
- 	struct stat		stb;
- 	static ino_t		last_inode;
---- a/support/export/v4root.c
-+++ b/support/export/v4root.c
-@@ -198,7 +198,7 @@ static int v4root_add_parents(nfs_export *exp)
-  * looking for components of the v4 mount.
-  */
- void
--v4root_set()
-+v4root_set(void)
- {
- 	nfs_export	*exp;
- 	int	i;
---- a/support/export/xtab.c
-+++ b/support/export/xtab.c
-@@ -135,7 +135,7 @@ xtab_write(char *xtab, char *xtabtmp, char *lockfn, int is_export)
- }
- 
- int
--xtab_export_write()
-+xtab_export_write(void)
- {
- 	return xtab_write(etab.statefn, etab.tmpfn, etab.lockfn, 1);
- }
---- a/utils/exportfs/exportfs.c
-+++ b/utils/exportfs/exportfs.c
-@@ -69,14 +69,14 @@ static int _lockfd = -1;
-  * need these additional lockfile() routines.
-  */
- static void
--grab_lockfile()
-+grab_lockfile(void)
- {
- 	_lockfd = open(lockfile, O_CREAT|O_RDWR, 0666);
- 	if (_lockfd != -1)
- 		lockf(_lockfd, F_LOCK, 0);
- }
- static void
--release_lockfile()
-+release_lockfile(void)
- {
- 	if (_lockfd != -1) {
- 		lockf(_lockfd, F_ULOCK, 0);
---- a/utils/mount/network.c
-+++ b/utils/mount/network.c
-@@ -179,7 +179,7 @@ static const unsigned long probe_mnt3_only[] = {
- 
- static const unsigned int *nfs_default_proto(void);
- #ifdef MOUNT_CONFIG
--static const unsigned int *nfs_default_proto()
-+static const unsigned int *nfs_default_proto(void)
- {
- 	extern unsigned long config_default_proto;
- 	/*
diff --git a/net-fs/nfs-utils/files/nfs-utils-2.6.2-clang-more-function-prototypes.patch b/net-fs/nfs-utils/files/nfs-utils-2.6.2-clang-more-function-prototypes.patch
deleted file mode 100644
index 51bfb30f1e64..000000000000
--- a/net-fs/nfs-utils/files/nfs-utils-2.6.2-clang-more-function-prototypes.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-https://patchwork.kernel.org/project/linux-nfs/patch/20220916214300.2820117-1-sam@gentoo.org/
-
-From daf6aa9b659078aebd202fffff59bd9a0ab685ce Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Fri, 16 Sep 2022 22:35:23 +0100
-Subject: [PATCH] Fix more function prototypes
-
-```
-regex.c:545:43: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
-struct trans_func *libnfsidmap_plugin_init()
-                                          ^
-                                           void
-1 error generated.
-```
-
-See: 167f2336b06e1bcbf26f45f2ddc4a535fed4d393
-Signed-off-by: Sam James <sam@gentoo.org>
---- a/support/nfsidmap/regex.c
-+++ b/support/nfsidmap/regex.c
-@@ -542,7 +542,7 @@ struct trans_func regex_trans = {
- 	.gss_princ_to_grouplist	= regex_gss_princ_to_grouplist,
- };
- 
--struct trans_func *libnfsidmap_plugin_init()
-+struct trans_func *libnfsidmap_plugin_init(void)
- {
- 	return (&regex_trans);
- }
---- a/utils/idmapd/idmapd.c
-+++ b/utils/idmapd/idmapd.c
-@@ -867,7 +867,7 @@ nfsdreopen_one(struct idmap_client *ic)
- }
- 
- static void
--nfsdreopen()
-+nfsdreopen(void)
- {
- 	nfsdreopen_one(&nfsd_ic[IC_NAMEID]);
- 	nfsdreopen_one(&nfsd_ic[IC_IDNAME]);
diff --git a/net-fs/nfs-utils/metadata.xml b/net-fs/nfs-utils/metadata.xml
index 0899c08987f5..3eea1d02ad6d 100644
--- a/net-fs/nfs-utils/metadata.xml
+++ b/net-fs/nfs-utils/metadata.xml
@@ -9,8 +9,9 @@
     <flag name="junction">Enable NFS junction support in nfsref</flag>
     <flag name="ldap">Add ldap support</flag>
     <flag name="libmount">Link mount.nfs with libmount</flag>
-    <flag name="nfsdcld">Enable nfsdcld NFSv4 clientid tracking daemon</flag>
+    <flag name="nfsdcld">Enable nfsdcld NFSv4 clientid tracking daemon and tools</flag>
     <flag name="nfsidmap">Enable support for newer nfsidmap helper</flag>
+    <flag name="nfsv3">Enable support for NFSv2 and NFSv3</flag>
     <flag name="nfsv4">Enable support for NFSv4</flag>
     <flag name="nfsv41">Enable support for NFSv4.1</flag>
     <flag name="uuid">Support UUID lookups in rpc.mountd</flag>
diff --git a/net-fs/nfs-utils/nfs-utils-2.6.2-r1.ebuild b/net-fs/nfs-utils/nfs-utils-2.6.2-r1.ebuild
deleted file mode 100644
index 818d562e0db3..000000000000
--- a/net-fs/nfs-utils/nfs-utils-2.6.2-r1.ebuild
+++ /dev/null
@@ -1,231 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools linux-info systemd
-
-DESCRIPTION="NFS client and server daemons"
-HOMEPAGE="http://linux-nfs.org/ https://git.linux-nfs.org/?p=steved/nfs-utils.git"
-
-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 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="caps junction kerberos ldap +libmount nfsdcld +nfsidmap +nfsv4 nfsv41 sasl selinux tcpd +uuid"
-REQUIRED_USE="kerberos? ( nfsv4 )"
-# bug #315573
-RESTRICT="test"
-
-# 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)
-COMMON_DEPEND="
-	dev-libs/libxml2
-	net-libs/libtirpc:=
-	>=net-nds/rpcbind-0.2.4
-	sys-fs/e2fsprogs
-	caps? ( sys-libs/libcap )
-	ldap? (
-		net-nds/openldap:=
-		sasl? (
-			app-crypt/mit-krb5
-			dev-libs/cyrus-sasl:2
-		)
-	)
-	libmount? ( sys-apps/util-linux )
-	nfsv4? (
-		dev-db/sqlite:3
-		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 )"
-DEPEND="${COMMON_DEPEND}
-	elibc_musl? ( sys-libs/queue-standalone )
-"
-RDEPEND="${COMMON_DEPEND}
-	!net-libs/libnfsidmap
-	selinux? (
-		sec-policy/selinux-rpc
-		sec-policy/selinux-rpcbind
-	)
-"
-BDEPEND="
-	net-libs/rpcsvc-proto
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.5.2-no-werror.patch
-	"${FILESDIR}"/${P}-clang-Wlogical-not-parentheses.patch
-	"${FILESDIR}"/${P}-clang-fix-function-prototypes.patch
-	"${FILESDIR}"/${PN}-2.6.2-clang-more-function-prototypes.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() {
-	# Our DEPEND forces this.
-	export libsqlite3_cv_is_recent=yes
-	export ac_cv_header_keyutils_h=$(usex nfsidmap)
-
-	# SASL is consumed in a purely automagic way
-	export ac_cv_header_sasl_h=no
-	export ac_cv_header_sasl_sasl_h=$(usex sasl)
-
-	local myeconfargs=(
-		--disable-static
-		--with-statedir="${EPREFIX}"/var/lib/nfs
-		--enable-tirpc
-		--with-tirpcinclude="${ESYSROOT}"/usr/include/tirpc/
-		--with-pluginpath="${EPREFIX}"/usr/$(get_libdir)/libnfsidmap
-		--with-rpcgen
-		--with-systemd="$(systemd_get_systemunitdir)"
-		--without-gssglue
-		$(use_enable caps)
-		--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. bug #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
-
-	# Nuke after 2015/08/01
-	newinitd "${FILESDIR}"/nfsmount.initd-1.3.1 nfsmount
-	for f in nfs nfsclient ; do
-		newconfd "${FILESDIR}"/${f}.confd ${f}
-	done
-
-	# bug #234132
-	sed -i \
-		-e "/^NFS_NEEDED_SERVICES=/s:=.*:=\"${opt_need}\":" \
-		"${ED}"/etc/conf.d/nfs || die
-
-	local systemd_systemunitdir="$(systemd_get_systemunitdir)"
-	sed -i \
-		-e 's:/usr/sbin/rpc.statd:/sbin/rpc.statd:' \
-		"${ED}${systemd_systemunitdir}"/* || die
-
-	# bug #368505
-	keepdir /var/lib/nfs
-	# bug #603628
-	keepdir /var/lib/nfs/v4recovery
-
-	# No static archives
-	find "${ED}" -name '*.la' -delete || die
-}
-
-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.6.4.ebuild b/net-fs/nfs-utils/nfs-utils-2.6.4-r2.ebuild
index a652b81eda7b..bf04672be1de 100644
--- a/net-fs/nfs-utils/nfs-utils-2.6.4.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.6.4-r2.ebuild
@@ -14,13 +14,13 @@ if [[ ${PV} == *_rc* ]] ; then
 	S="${WORKDIR}/${PN}-${PN}-${MY_PV}"
 else
 	SRC_URI="mirror://sourceforge/nfs/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="caps junction kerberos ldap +libmount nfsdcld +nfsidmap +nfsv4 nfsv41 sasl selinux tcpd +uuid"
-REQUIRED_USE="kerberos? ( nfsv4 )"
+IUSE="caps junction kerberos ldap +libmount nfsdcld +nfsidmap +nfsv3 +nfsv4 sasl selinux tcpd +uuid"
+REQUIRED_USE="|| ( nfsv3 nfsv4 ) kerberos? ( nfsv4 ) nfsdcld? ( nfsv4 )"
 # bug #315573
 RESTRICT="test"
 
@@ -31,7 +31,6 @@ RESTRICT="test"
 COMMON_DEPEND="
 	dev-libs/libxml2
 	net-libs/libtirpc:=
-	>=net-nds/rpcbind-0.2.4
 	sys-fs/e2fsprogs
 	dev-db/sqlite:3
 	dev-libs/libevent:=
@@ -44,16 +43,15 @@ COMMON_DEPEND="
 		)
 	)
 	libmount? ( sys-apps/util-linux )
+	nfsv3? ( >=net-nds/rpcbind-0.2.4 )
 	nfsv4? (
 		>=sys-apps/keyutils-1.5.9:=
+		sys-fs/lvm2
 		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 )"
 DEPEND="${COMMON_DEPEND}
@@ -63,7 +61,7 @@ RDEPEND="${COMMON_DEPEND}
 	!net-libs/libnfsidmap
 	selinux? (
 		sec-policy/selinux-rpc
-		sec-policy/selinux-rpcbind
+		nfsv3? ( sec-policy/selinux-rpcbind )
 	)
 "
 BDEPEND="
@@ -74,6 +72,7 @@ BDEPEND="
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.5.2-no-werror.patch
 	"${FILESDIR}"/${PN}-udev-sysctl.patch
+	"${FILESDIR}"/${P}-includes.patch
 )
 
 pkg_setup() {
@@ -122,9 +121,11 @@ src_configure() {
 		$(use_enable kerberos svcgss)
 		$(use_enable ldap)
 		$(use_enable libmount libmount-mount)
+		$(use_enable nfsdcld)
 		$(use_enable nfsdcld nfsdcltrack)
 		$(use_enable nfsv4)
-		$(use_enable nfsv41)
+		$(use_enable nfsv4 nfsv41)
+		$(use_enable nfsv4 nfsv4server)
 		$(use_enable uuid)
 		$(use_with tcpd tcp-wrappers)
 		# XXX: Remove this hack after 2.6.3
@@ -196,6 +197,11 @@ src_install() {
 		-e 's:/usr/sbin/rpc.statd:/sbin/rpc.statd:' \
 		"${ED}${systemd_systemunitdir}"/* || die
 
+	# Remove legacy service if not requested (as it will be broken without rpcbind)
+	if ! use nfsv3; then
+		rm "${ED}${systemd_systemunitdir}/nfs-server.service" || die
+	fi
+
 	# bug #368505
 	keepdir /var/lib/nfs
 	# bug #603628