gentoo resync : 16.02.1018

3 files changed, 27 insertions, 16 deletions

diff --git a/net-fs/libnfs/Manifest b/net-fs/libnfs/Manifest
index 500565b92735..78849aeb44f1 100644
--- a/net-fs/libnfs/Manifest
+++ b/net-fs/libnfs/Manifest
@@ -1,9 +1,9 @@
 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-2.0.0.tar.gz 200932 BLAKE2B df5ae4487bd7e19428551f047a1d61df712ecc73b3db33995121abfba2df8f9283ef69f4a0d897266d7d476010bfcfa5fdea109b265f82fe4df8904cd6d05c6c SHA512 701dd5317b0395523be89123d473f4da5c3ff53c2e30004a922f649f0dbbd97546ee39ab34fce06278a8148c13200ca383726a0822d09846fad6e308f29e42c7
 DIST libnfs-3.0.0.tar.gz 249035 BLAKE2B 321bbc6eb2d926c41afae95a873cd9103446d2bda0015f159341a7bca2245d708abaa283f9a8f505a320a0b446166b36106cd9f54e885a02cb486168c87a2a7f SHA512 9af31f8824431e9d28267c468dafc7cfc4062b1a280ca141036bc28a2ba544c4470a67955b5e5fbcc6c175435812381013b4c5d3d3d1a175d5efc7b802ae9b3b
-EBUILD libnfs-1.9.7.ebuild 1041 BLAKE2B c10d98df553a00f89ae4ae30219067ff16ec308f69d25d91b34a58b9be5d13155d58c309af6f66b7b1854cbc59075b07a79349105f7dddd3b9e756f059dc8e1b SHA512 bcec2c0c325e1ebad33b62caa1891176fed02c40f962ea047d4366d0427c0920e242c90d54502d8a216774c3c083ab4e0a80aab92c4aabc1e83a3a7ec8e698af
+DIST libnfs-4.0.0.tar.gz 251662 BLAKE2B b6c33c42eb1715b8a996a432b0cc28af1a98cca3389a779378df0931e4d37418937e3ea4938efb4d075b39aac33facca86df3a02bd62d2c7b262859e8d04ecc1 SHA512 3d93d83d1909f24de304c0d47fa6240da7ecf43ce2488a242a58ddabe51d774caf813f5a90ae720a8edd251a765b30e88c0e5b6a13ecb254dfecdc98e30737fa
 EBUILD libnfs-2.0.0.ebuild 1107 BLAKE2B c429ddaf504458c32bb2f6fe90917039db4da09812edd411a08229bba084322d5743fbcabd549c887b87a9184e5d49440fbe3c7a86c5363312c116073089cea3 SHA512 fe8efc097123d8b6f4b82c202dd4171daeb59c851e11b0a0d506cf9f50c51a46e11aa600882bacc1eae1c60d0b9dd22ae7eb25f4c6b13480f377e836d5013e97
 EBUILD libnfs-3.0.0.ebuild 1262 BLAKE2B 2863f0367604bb8a3eedd696a68e111283610ee5e1ff8e19be2db933d1f6ec5e29e21cab67900ca9d867933d45eab9be1529d3ae63c7ba1708b931616d7edac1 SHA512 8b2e891f5cd834953000b13d273b4270a748db10ea32ac55453fe32a8c66a05239feda67f547d54d3c443248d71f028a41c1c17ee2530b250292dfb4a698d1c0
-EBUILD libnfs-9999.ebuild 1210 BLAKE2B 24f63a66d483c1ce06aa120a33e7b19e93c3600861a771b3e050d6802637dc5912cd8ac18a15a85fdd1dbb05baec6927da3ca5ccaa405b6ed72b0e7ac40f5ec6 SHA512 07ce95ae4b64c0dc86b51d6e22d991fe82cf7fc6fc676a29fb682ce88652f7ec522ece3c963849b44baa8933f1fce27160a36c42e2bef368a2fdc25b0e2c5a41
+EBUILD libnfs-4.0.0.ebuild 1207 BLAKE2B db3e910667acf800ee60455ef76b04853edec5d9f640310f6a3cd14779172e2fb7eb35f3e4fef04c43f50b0bbec048f58b20ec466ae37b55e84552d93cf8bf46 SHA512 590f9ee5fe83d639202442415e1622f8c101c51f120e306d2a1557d60fe83f7bd9df438717cda1caba5bacda8c7397d7893f254805a081c79be19df6bb297318
+EBUILD libnfs-9999.ebuild 1207 BLAKE2B db3e910667acf800ee60455ef76b04853edec5d9f640310f6a3cd14779172e2fb7eb35f3e4fef04c43f50b0bbec048f58b20ec466ae37b55e84552d93cf8bf46 SHA512 590f9ee5fe83d639202442415e1622f8c101c51f120e306d2a1557d60fe83f7bd9df438717cda1caba5bacda8c7397d7893f254805a081c79be19df6bb297318
 MISC metadata.xml 416 BLAKE2B dd298d1b48b996a31ccef799be0e581239d99bed3f79f05aba02693821e869cbb73425af4ba1d581d641ca52a7b636dba591e68cbcb7c647cfd6840745c16721 SHA512 69475dd9d86a2335ee1780e6a330ff6096ccf99d14fea094b8bab5a59aa1deb2841b7c0e1bf5c00fcec38756c219af9b7ff255f1986a54756c28128b9e447ce5
diff --git a/net-fs/libnfs/libnfs-1.9.7.ebuild b/net-fs/libnfs/libnfs-4.0.0.ebuild
index bfc9f50d1c60..66c1685f1207 100644
--- a/net-fs/libnfs/libnfs-1.9.7.ebuild
+++ b/net-fs/libnfs/libnfs-4.0.0.ebuild
@@ -1,34 +1,44 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # 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"
+	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/13"  # sub-slot matches SONAME major
+IUSE="examples static-libs utils"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
-S="${WORKDIR}/${PN}-${P}"
+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 +47,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 d8c9dd244267..66c1685f1207 100644
--- a/net-fs/libnfs/libnfs-9999.ebuild
+++ b/net-fs/libnfs/libnfs-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,7 @@ DESCRIPTION="Client library for accessing NFS shares over a network"
 HOMEPAGE="https://github.com/sahlberg/libnfs"
 
 LICENSE="LGPL-2.1 GPL-3"
-SLOT="0/12"  # sub-slot matches SONAME major
+SLOT="0/13"  # sub-slot matches SONAME major
 IUSE="examples static-libs utils"
 
 RDEPEND=""