gentoo resync : 07.07.2018

10 files changed, 71 insertions, 271 deletions

diff --git a/net-fs/libnfs/Manifest b/net-fs/libnfs/Manifest
index a7115eb33cb8..28c33a5dfea1 100644
--- a/net-fs/libnfs/Manifest
+++ b/net-fs/libnfs/Manifest
@@ -1,16 +1,9 @@
-AUX libnfs-1.9.5-headers.patch 2132 BLAKE2B e0762f49d6fdb96f76f7baf3db2d1eb19752fcadea089e4f8cfc39919055719444c580faeb2ee564293d4642f33ac6bd7c8c0fe855a8a2a511430bb959d35b8e SHA512 5f0d54aa4a4491add09e90dfa54a5f19cfe2057c559e7e7dffe013fecb9865d9b42b70825008204268a78df4c52a17a0009d65da91ddb6a6327138ec2384a140
-AUX libnfs-1.9.5-implicit-internal.patch 655 BLAKE2B 640da0dbe97721eb7701605047be6b0e41eee5940dde3baa606cc719425b0aa87539d551732216159d41cbe6da9b0cb3219a6a63d5debfd1117f02c9cff5e910 SHA512 cfd52e78a2bffd7c263da084f92ee6b0acdb6d5808f0613e37a56654ab73964f00c4af4e4c74f114c7cb454f377c678732ae1d479bbd92a9218d6a995544b21b
-DIST libnfs-1.10.0.tar.gz 149108 BLAKE2B 9df18e65e6f7e25ed57f5257a9b6e756ff76cd8d0e768051866d1f636a3fbefb4e8125a4ef742beb703c2bbc655b09ff7cda233ea48c04925278eb703292ab26 SHA512 9d1bdd2e193f189841dd915d5a4d0965cfd0c597372fa82b12377c4da1f6b5ec022bd0cddfe46dda1a4ac3de3f31eed73cb7dcf832469a4d292e05401b8fb247
-DIST libnfs-1.11.0.tar.gz 152239 BLAKE2B 91df1eeb93a636eea0db2101921f30ce09509f9f292b828d0ac75a559b39e469e85dfe27649d86d6afa972ba66dc50e0b4b1157a9a265d3efb42d7878ca4fa4a SHA512 e1ef6e341fd56955c3adedf6ba90841a57be9c6a962d61ff18425593bfc2787c34c776fdc8ec711f8bb2da1ec08271fc8778a0499aef01c3a7694c384a4c037b
-DIST libnfs-1.9.5.tar.gz 141162 BLAKE2B c19ca0bc2dc1b8edaf407f8a25909286b39952284717e3b728436bff8075e25f29db9e1b2e3f73f447bd82bc418f638ba81477dfe3965d16e906c92d15031e23 SHA512 fee676503b3655f3710342f5f6944f598b1e404f0a00891387d36d41f55f25f27254cbe061b8d8b00ee445a1bfd51df9c2cbccd72f3cdb0f7e8925691fcb2a4b
+AUX libnfs-3.0.0-utils.patch 499 BLAKE2B 0000a2140ea34201b41237b9fde5d7c0adb77e9bee38b9bf5d1126c1b52aa5ebd60af8c098f185fc4f57253d149dd3e4950724d5f1bd457faa7bada3b3b0e9c3 SHA512 19298e53e7d69ecdf23ed17c0a1ed9937e525f02a4b208287fd5892ea0cc1f5dea36f2d9564d38fc9a545f4c06238623bdc33a2335ab4819aa4f52f2bb2467da
 DIST libnfs-1.9.7.tar.gz 145925 BLAKE2B 0b1d7a2d67b5dc870e20642438eddcd667c6fa57fe6128d22c358232a0c5b9d70e3414e4ebb7d684318cf3f9cda93ca6b427bf6ea38b2cce470630653cf1215a SHA512 0dec9a6eee61bcab5a406b6f8bd50d15ffa257bc0fae7079e25a3e0ecb1177845514c232d699c67c59a3f1a269099a46225959d413301bf4550aa37504e2f492
-DIST libnfs-1.9.8.tar.gz 148757 BLAKE2B fd4e6989ce8c2508de5776d71e522d4191f6ebf4f526aad16d69c9a17ef32ec37c68a817ddf7e709d01ba4a60e14ed43aaa45d27c310468cb73473fa0ecd974b SHA512 2a0e11dde5a2c4d25fcf1040d04ad984fe3b2e2ce5f544d602becb55aebdabbfe29a3b961d3db7d034c918862b540d3a03735bbbad0606ff3a128c50c2dad666
 DIST libnfs-2.0.0.tar.gz 200932 BLAKE2B df5ae4487bd7e19428551f047a1d61df712ecc73b3db33995121abfba2df8f9283ef69f4a0d897266d7d476010bfcfa5fdea109b265f82fe4df8904cd6d05c6c SHA512 701dd5317b0395523be89123d473f4da5c3ff53c2e30004a922f649f0dbbd97546ee39ab34fce06278a8148c13200ca383726a0822d09846fad6e308f29e42c7
-EBUILD libnfs-1.10.0.ebuild 1052 BLAKE2B da8eca951aa39bd50fac9d48e053dba897ee279efa49cbb411436ee416873536c4f49eeb5290b5dec0e6aebae35c0b434a44e9e17410fed08907a02e50ee3d8b SHA512 a7f2532df004e6fc9d08744accb24c687879127e8762b8469ca1f07e87d1195aec9d85f0d4ecd9eca789d3f39a61fdcb379ebcd97d850358c5ec671c490f660d
-EBUILD libnfs-1.11.0.ebuild 1052 BLAKE2B da8eca951aa39bd50fac9d48e053dba897ee279efa49cbb411436ee416873536c4f49eeb5290b5dec0e6aebae35c0b434a44e9e17410fed08907a02e50ee3d8b SHA512 a7f2532df004e6fc9d08744accb24c687879127e8762b8469ca1f07e87d1195aec9d85f0d4ecd9eca789d3f39a61fdcb379ebcd97d850358c5ec671c490f660d
-EBUILD libnfs-1.9.5.ebuild 1080 BLAKE2B 979dc8ea7561b25e73b96f65b54e43df96732adb9bd1a5950342652e2dbd07e525169e1f9edbdba53a7d3f8cd5e7dfe4f8463c1d92956d512e86247fba14c3f7 SHA512 5df2f8f18480e6501fea9fa5299d3738e06191b248e24a687a9083fce1e236583e570f70ffa2c66f54465993ffcb25643f0f983e111ec1a086cc6b2916cd86e3
+DIST libnfs-3.0.0.tar.gz 249035 BLAKE2B 321bbc6eb2d926c41afae95a873cd9103446d2bda0015f159341a7bca2245d708abaa283f9a8f505a320a0b446166b36106cd9f54e885a02cb486168c87a2a7f SHA512 9af31f8824431e9d28267c468dafc7cfc4062b1a280ca141036bc28a2ba544c4470a67955b5e5fbcc6c175435812381013b4c5d3d3d1a175d5efc7b802ae9b3b
 EBUILD libnfs-1.9.7.ebuild 1041 BLAKE2B c10d98df553a00f89ae4ae30219067ff16ec308f69d25d91b34a58b9be5d13155d58c309af6f66b7b1854cbc59075b07a79349105f7dddd3b9e756f059dc8e1b SHA512 bcec2c0c325e1ebad33b62caa1891176fed02c40f962ea047d4366d0427c0920e242c90d54502d8a216774c3c083ab4e0a80aab92c4aabc1e83a3a7ec8e698af
-EBUILD libnfs-1.9.8.ebuild 1052 BLAKE2B da8eca951aa39bd50fac9d48e053dba897ee279efa49cbb411436ee416873536c4f49eeb5290b5dec0e6aebae35c0b434a44e9e17410fed08907a02e50ee3d8b SHA512 a7f2532df004e6fc9d08744accb24c687879127e8762b8469ca1f07e87d1195aec9d85f0d4ecd9eca789d3f39a61fdcb379ebcd97d850358c5ec671c490f660d
 EBUILD libnfs-2.0.0.ebuild 1110 BLAKE2B fb8098132e10496fd160092eb5b0eaa207b9fce499a97d19ed9f2c0562ec138d6237f49f5061c0eaec3d0b5c2224462f91c2858b5269cd402fcd48aded422d85 SHA512 31fe7ef50c243c033501d310e0d7bf995ff4c84895403caf94251a9793ec9e1404b1e1ca4d19dbfdb3dc48ff86fc49b0013e81242b541e81aac6a3a600454425
-EBUILD libnfs-9999.ebuild 1119 BLAKE2B 9fe63f7ce7f0655b0dc3cfbacb25a4452a48bcd896ac9bda398633571ce1cc3f4148d63837df3a2fe8ac492ab72dd468f8a842900c7c38471511ae5f2802bfac SHA512 428d18f519a27d687d9c6b80b2769e66459cb6d5e4a9de5a491e62afb40ff02939d5c42c8adf22005046b673cced347089fc58ed0e2595514fec253310d946bc
-MISC metadata.xml 337 BLAKE2B 0e7e5918d79634937e9d1ad6289fab93b11ff6330b554c52e76148120974b58cf586669ccfa579daef54d8b8b23a51b623582c50839ca8f6182619c1987ac368 SHA512 aabcd286aba9ba93d7e64759ef0fb49b4d5ac99182453b2bf68727d0f41638640d312355465b8862b4f070f5bd47b1debbca635a07d7e44dde841da99405206d
+EBUILD libnfs-3.0.0.ebuild 1262 BLAKE2B 2863f0367604bb8a3eedd696a68e111283610ee5e1ff8e19be2db933d1f6ec5e29e21cab67900ca9d867933d45eab9be1529d3ae63c7ba1708b931616d7edac1 SHA512 8b2e891f5cd834953000b13d273b4270a748db10ea32ac55453fe32a8c66a05239feda67f547d54d3c443248d71f028a41c1c17ee2530b250292dfb4a698d1c0
+EBUILD libnfs-9999.ebuild 1262 BLAKE2B 2863f0367604bb8a3eedd696a68e111283610ee5e1ff8e19be2db933d1f6ec5e29e21cab67900ca9d867933d45eab9be1529d3ae63c7ba1708b931616d7edac1 SHA512 8b2e891f5cd834953000b13d273b4270a748db10ea32ac55453fe32a8c66a05239feda67f547d54d3c443248d71f028a41c1c17ee2530b250292dfb4a698d1c0
+MISC metadata.xml 416 BLAKE2B dd298d1b48b996a31ccef799be0e581239d99bed3f79f05aba02693821e869cbb73425af4ba1d581d641ca52a7b636dba591e68cbcb7c647cfd6840745c16721 SHA512 69475dd9d86a2335ee1780e6a330ff6096ccf99d14fea094b8bab5a59aa1deb2841b7c0e1bf5c00fcec38756c219af9b7ff255f1986a54756c28128b9e447ce5
diff --git a/net-fs/libnfs/files/libnfs-1.9.5-headers.patch b/net-fs/libnfs/files/libnfs-1.9.5-headers.patch
deleted file mode 100644
index 96719ffd54c2..000000000000
--- a/net-fs/libnfs/files/libnfs-1.9.5-headers.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-From 0bfc3e09b7d7ca2b75d42c17874b89333b96f371 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Mon, 3 Dec 2012 22:30:04 -0500
-Subject: [PATCH] fix implicit decl warnings
-
-Include the proper headers to fix warnings like:
-libnfs-sync.c:1529:3: warning: implicit declaration of function 'gettimeofday' [-Wimplicit-function-declaration]
-libnfs-zdr.c:506:2: warning: implicit declaration of function 'getuid' [-Wimplicit-function-declaration]
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- lib/libnfs-sync.c | 1 +
- lib/libnfs-zdr.c  | 9 +++++++++
- lib/libnfs.c      | 1 +
- lib/socket.c      | 1 +
- 4 files changed, 12 insertions(+)
-
-diff --git a/lib/libnfs-sync.c b/lib/libnfs-sync.c
-index 0fc1094..c140258 100644
---- a/lib/libnfs-sync.c
-+++ b/lib/libnfs-sync.c
-@@ -77,6 +77,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include <assert.h>
-+#include <sys/time.h>
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <fcntl.h>
-diff --git a/lib/libnfs-zdr.c b/lib/libnfs-zdr.c
-index c32f661..b6b3ed9 100644
---- a/lib/libnfs-zdr.c
-+++ b/lib/libnfs-zdr.c
-@@ -20,6 +20,10 @@
-  * i.e. zdrmem_create() buffers.
-  * It aims to be compatible with normal rpcgen generated functions.
-  */
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #ifdef WIN32
- #include "win32_compat.h"
- #endif
-@@ -28,9 +32,14 @@
- #include "aros_compat.h"
- #endif
- 
-+#ifdef HAVE_ARPA_INET_H
-+#include <arpa/inet.h>
-+#endif
-+
- #include <stdlib.h>
- #include <string.h>
- #include <time.h>
-+#include <unistd.h>
- #include "libnfs-zdr.h"
- 
- struct opaque_auth _null_auth;
-diff --git a/lib/libnfs.c b/lib/libnfs.c
-index 5692dc3..0a7d139 100644
---- a/lib/libnfs.c
-+++ b/lib/libnfs.c
-@@ -73,6 +73,7 @@
- #include <string.h>
- #include <assert.h>
- #include <errno.h>
-+#include <time.h>
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <fcntl.h>
-diff --git a/lib/socket.c b/lib/socket.c
-index 3f7f89f..f8db957 100644
---- a/lib/socket.c
-+++ b/lib/socket.c
-@@ -68,6 +68,7 @@
- #include <fcntl.h>
- #include <string.h>
- #include <errno.h>
-+#include <time.h>
- #include <sys/types.h>
- #include "libnfs-zdr.h"
- #include "libnfs.h"
--- 
-2.0.0
-
diff --git a/net-fs/libnfs/files/libnfs-1.9.5-implicit-internal.patch b/net-fs/libnfs/files/libnfs-1.9.5-implicit-internal.patch
deleted file mode 100644
index e702c81f5cb4..000000000000
--- a/net-fs/libnfs/files/libnfs-1.9.5-implicit-internal.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 2be32c3c41207c029f54ebd0f4aa08e216bd3c21 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Fri, 8 Aug 2014 05:45:32 -0400
-Subject: [PATCH 3/3] fix implicit decls of rpc_{g,s}et_error
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- lib/libnfs-zdr.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/lib/libnfs-zdr.c b/lib/libnfs-zdr.c
-index b6b3ed9..90abe26 100644
---- a/lib/libnfs-zdr.c
-+++ b/lib/libnfs-zdr.c
-@@ -41,6 +41,9 @@
- #include <time.h>
- #include <unistd.h>
- #include "libnfs-zdr.h"
-+#include "libnfs.h"
-+#include "libnfs-raw.h"
-+#include "libnfs-private.h"
- 
- struct opaque_auth _null_auth;
- 
--- 
-2.0.0
-
diff --git a/net-fs/libnfs/files/libnfs-3.0.0-utils.patch b/net-fs/libnfs/files/libnfs-3.0.0-utils.patch
new file mode 100644
index 000000000000..b26716158b59
--- /dev/null
+++ b/net-fs/libnfs/files/libnfs-3.0.0-utils.patch
@@ -0,0 +1,20 @@
+diff --git a/configure.ac b/configure.ac
+index a1f51d0..f96879a 100755
+--- a/configure.ac
++++ b/configure.ac
+@@ -25,11 +25,13 @@ fi
+ AC_SYS_LARGEFILE
+ 
+ #option: utils
++MAYBE_UTILS="utils"
+ AC_ARG_ENABLE([utils],
+               [AC_HELP_STRING([--enable-utils],
+                               [Build util programs])],
+-	      [MAYBE_UTILS=""],
+-	      [MAYBE_UTILS="utils"])
++	      [if test $enableval = no ; then
++	    	    MAYBE_UTILS=""
++	       fi])
+ AC_SUBST(MAYBE_UTILS)
+ 
+ #option: examples
diff --git a/net-fs/libnfs/libnfs-1.10.0.ebuild b/net-fs/libnfs/libnfs-1.10.0.ebuild
deleted file mode 100644
index edc14e1cdcd6..000000000000
--- a/net-fs/libnfs/libnfs-1.10.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-AUTOTOOLS_AUTORECONF="1"
-
-inherit autotools-utils eutils
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/sahlberg/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/sahlberg/${PN}/archive/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~x86"
-fi
-
-DESCRIPTION="Client library for accessing NFS shares over a network"
-HOMEPAGE="https://github.com/sahlberg/libnfs"
-
-LICENSE="LGPL-2.1 GPL-3"
-SLOT="0/8"  # sub-slot matches SONAME major
-IUSE="examples static-libs"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${PN}-${P}"
-
-src_install() {
-	autotools-utils_src_install
-	if use examples; then
-		# --enable-examples configure switch just compiles them
-		# better install sources instead
-		exeinto /usr/share/doc/${PF}/examples/
-		for program in $(grep PROGRAMS examples/Makefile.am | cut -d= -f2); do
-			doexe examples/${program}.c
-		done
-	fi
-}
diff --git a/net-fs/libnfs/libnfs-1.11.0.ebuild b/net-fs/libnfs/libnfs-1.11.0.ebuild
deleted file mode 100644
index edc14e1cdcd6..000000000000
--- a/net-fs/libnfs/libnfs-1.11.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-AUTOTOOLS_AUTORECONF="1"
-
-inherit autotools-utils eutils
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/sahlberg/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/sahlberg/${PN}/archive/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~x86"
-fi
-
-DESCRIPTION="Client library for accessing NFS shares over a network"
-HOMEPAGE="https://github.com/sahlberg/libnfs"
-
-LICENSE="LGPL-2.1 GPL-3"
-SLOT="0/8"  # sub-slot matches SONAME major
-IUSE="examples static-libs"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${PN}-${P}"
-
-src_install() {
-	autotools-utils_src_install
-	if use examples; then
-		# --enable-examples configure switch just compiles them
-		# better install sources instead
-		exeinto /usr/share/doc/${PF}/examples/
-		for program in $(grep PROGRAMS examples/Makefile.am | cut -d= -f2); do
-			doexe examples/${program}.c
-		done
-	fi
-}
diff --git a/net-fs/libnfs/libnfs-1.9.5.ebuild b/net-fs/libnfs/libnfs-1.9.5.ebuild
deleted file mode 100644
index 1ddf85203797..000000000000
--- a/net-fs/libnfs/libnfs-1.9.5.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-AUTOTOOLS_AUTORECONF="1"
-
-inherit autotools-utils eutils
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/sahlberg/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/sahlberg/${PN}/archive/${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm hppa ppc ppc64 x86"
-fi
-
-DESCRIPTION="Client library for accessing NFS shares over a network"
-HOMEPAGE="https://github.com/sahlberg/libnfs"
-
-LICENSE="LGPL-2.1 GPL-3"
-SLOT="0"
-IUSE="examples static-libs"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${PN}-${P}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.9.5-headers.patch
-	"${FILESDIR}"/${PN}-1.9.5-implicit-internal.patch
-)
-
-src_install() {
-	autotools-utils_src_install
-	if use examples; then
-		# --enable-examples configure switch just compiles them
-		# better install sources instead
-		exeinto /usr/share/doc/${PF}/examples/
-		for program in $(grep PROGRAMS examples/Makefile.am | cut -d= -f2); do
-			doexe examples/${program}.c
-		done
-	fi
-}
diff --git a/net-fs/libnfs/libnfs-1.9.8.ebuild b/net-fs/libnfs/libnfs-3.0.0.ebuild
index edc14e1cdcd6..96606a99d49c 100644
--- a/net-fs/libnfs/libnfs-1.9.8.ebuild
+++ b/net-fs/libnfs/libnfs-3.0.0.ebuild
@@ -1,34 +1,48 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=6
 
-AUTOTOOLS_AUTORECONF="1"
-
-inherit autotools-utils eutils
+inherit autotools
 if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/sahlberg/${PN}.git"
 	inherit git-r3
+	EGIT_REPO_URI="https://github.com/sahlberg/${PN}.git"
 else
 	SRC_URI="https://github.com/sahlberg/${PN}/archive/${P}.tar.gz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~x86"
+	S="${WORKDIR}/${PN}-${P}"
 fi
 
 DESCRIPTION="Client library for accessing NFS shares over a network"
 HOMEPAGE="https://github.com/sahlberg/libnfs"
 
 LICENSE="LGPL-2.1 GPL-3"
-SLOT="0/8"  # sub-slot matches SONAME major
-IUSE="examples static-libs"
+SLOT="0/12"  # sub-slot matches SONAME major
+IUSE="examples static-libs utils"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
-S="${WORKDIR}/${PN}-${P}"
+PATCHES=(
+	"${FILESDIR}/${PN}-3.0.0-utils.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable static-libs static)
+		$(use_enable utils)
+	)
+	econf "${myeconfargs[@]}"
+}
 
 src_install() {
-	autotools-utils_src_install
+	default
 	if use examples; then
 		# --enable-examples configure switch just compiles them
 		# better install sources instead
@@ -37,4 +51,5 @@ src_install() {
 			doexe examples/${program}.c
 		done
 	fi
+	find "${ED}" -name "*.la" -delete || die
 }
diff --git a/net-fs/libnfs/libnfs-9999.ebuild b/net-fs/libnfs/libnfs-9999.ebuild
index 958c36a1dd24..96606a99d49c 100644
--- a/net-fs/libnfs/libnfs-9999.ebuild
+++ b/net-fs/libnfs/libnfs-9999.ebuild
@@ -1,42 +1,48 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=6
 
-AUTOTOOLS_AUTORECONF="1"
-
-inherit autotools autotools-utils eutils
+inherit autotools
 if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/sahlberg/${PN}.git"
 	inherit git-r3
+	EGIT_REPO_URI="https://github.com/sahlberg/${PN}.git"
 else
 	SRC_URI="https://github.com/sahlberg/${PN}/archive/${P}.tar.gz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~x86"
+	S="${WORKDIR}/${PN}-${P}"
 fi
 
 DESCRIPTION="Client library for accessing NFS shares over a network"
 HOMEPAGE="https://github.com/sahlberg/libnfs"
 
 LICENSE="LGPL-2.1 GPL-3"
-SLOT="0/11"  # sub-slot matches SONAME major
-IUSE="examples static-libs"
+SLOT="0/12"  # sub-slot matches SONAME major
+IUSE="examples static-libs utils"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
-S="${WORKDIR}/${PN}-${P}"
+PATCHES=(
+	"${FILESDIR}/${PN}-3.0.0-utils.patch"
+)
 
 src_prepare() {
 	default
-
-	epatch_user
-
 	eautoreconf
 }
 
+src_configure() {
+	local myeconfargs=(
+		$(use_enable static-libs static)
+		$(use_enable utils)
+	)
+	econf "${myeconfargs[@]}"
+}
+
 src_install() {
-	autotools-utils_src_install
+	default
 	if use examples; then
 		# --enable-examples configure switch just compiles them
 		# better install sources instead
@@ -45,4 +51,5 @@ src_install() {
 			doexe examples/${program}.c
 		done
 	fi
+	find "${ED}" -name "*.la" -delete || die
 }
diff --git a/net-fs/libnfs/metadata.xml b/net-fs/libnfs/metadata.xml
index 0a94e5f6ef13..bdbf712883c6 100644
--- a/net-fs/libnfs/metadata.xml
+++ b/net-fs/libnfs/metadata.xml
@@ -5,6 +5,9 @@
 		<email>base-system@gentoo.org</email>
 		<name>Gentoo Base System</name>
 	</maintainer>
+	<use>
+		<flag name="utils">Build/install nfs-{cat,ls,cp} utils</flag>
+	</use>
 	<upstream>
 		<remote-id type="github">sahlberg/libnfs</remote-id>
 	</upstream>