gentoo resync : 06.04.2022

4 files changed, 110 insertions, 9 deletions

diff --git a/net-fs/libnfs/Manifest b/net-fs/libnfs/Manifest
index 65632f3b1e17..313e711daac6 100644
--- a/net-fs/libnfs/Manifest
+++ b/net-fs/libnfs/Manifest
@@ -1,4 +1,7 @@
+AUX libnfs-5.0.1-pthread-configure.patch 1220 BLAKE2B c8a21a2bd75aa60d890336bd398171687eab914b588060c2ded2fe2102bad1eb4c29370694889941b2c1d13a46d27e804efb37974e667036f461ee39104d0bc4 SHA512 c07cc4dd5923ecd5ee79e5353c20378d1752d47f34d57939d4db0dcfe0ac57e3e93ceb5834b8581533c7bcf0989cf0cab4ca62da6b2d59e0e9aa7b039e5db713
 DIST libnfs-4.0.0.tar.gz 251662 BLAKE2B b6c33c42eb1715b8a996a432b0cc28af1a98cca3389a779378df0931e4d37418937e3ea4938efb4d075b39aac33facca86df3a02bd62d2c7b262859e8d04ecc1 SHA512 3d93d83d1909f24de304c0d47fa6240da7ecf43ce2488a242a58ddabe51d774caf813f5a90ae720a8edd251a765b30e88c0e5b6a13ecb254dfecdc98e30737fa
+DIST libnfs-5.0.1.tar.gz 279550 BLAKE2B d27e97f3dce1385cabd8076b673d2bbfe339ff5a34295ca13bfea2f9c2048f4c6dd07a0b54b7cc7e44aecda58dd21520732dc6ee82260f0694a01fec59875a6a SHA512 71f2dcfa8945c1cb6402f5fca10b1f7a4720f7589807d6130eb55361f05ef4684f9cc9a177ece4e13d3847ac6606924115fac7b27749cecc2f5aca6fa9c63ebf
 EBUILD libnfs-4.0.0.ebuild 1223 BLAKE2B 85ef61529fb309a6c8bbb3da4ad17326d0191f99aaf44c617f6725c02a3d28110c185d81e4e15f2468cc4a9799789fc005c55f5c20f30f892745e15c953b0e40 SHA512 751cd29ef229f14c52336bfddcce70aceed788a6088b9ed8b6c1d6341b91a0edfacca4d81863c97b601e53f06aa14c899c8148863412eec1e0e7d682db7305dd
-EBUILD libnfs-9999.ebuild 1222 BLAKE2B 1a8a4db99c7c177f6cd8ceb7caf12afcc4ce0eb179afdf82b62ac1e050267fc8bf5c60874c0248a0cb2abceb33cf43a5d7673e91d41d5c572d475b5c9b298a10 SHA512 021322393f1fa33d3518369d70aba635a4f5601b4846a767fceef8ca59e7d8a0f618dcdf5bb74c4b656fd111a12c1f7be62c827bfe96cf06c7f63c6dcbbd4800
+EBUILD libnfs-5.0.1.ebuild 1354 BLAKE2B cd06de29ae67e7bbb2fcb41465e0f6056c70e209fddd603215ab1ac5d2002fd8a5e9e8a4f63868df18a621e4d3b8e21bf8b94dc2c7810c51a8dc841c74efb932 SHA512 7e0efa2b85c0bb027943bf8f6bd6588bf78886bcbb05492e3b323bd9b9a1f38603ea5f6114882a5ce13eb930f5d26505193088231cb4b86466717dde07498882
+EBUILD libnfs-9999.ebuild 1289 BLAKE2B f82d438f3fb46371e0b76ab9ae6ef6d4e8ddba32bfd578cb9b44076d081e98ec525a17b39a174e4cbf3729e41cb6dee664dd6e8040b11cc0cf54f6493e576647 SHA512 5640c14b70b8d26faab56169c99ffd3c861d0f63303d8f47a41230227757c613fbe2c66c5d7d5dc937cdf82b3e12683c5cb7eb17a7ba3953dab4715315ea95ff
 MISC metadata.xml 417 BLAKE2B f9c2243fdec47c029b7e581f7e731889342332b5740973d261dd2e353db0cca2728c9b61bcf610204254ebee62bb1eb7cf51b37236d2959536807f6460343fd5 SHA512 f64ea69505b03c25f70e632645efbfcab90ae974ed3909dc90c9cb5df7aefa519a0a54b457df0b3a19b033b9d6c56155163db5b58244cae1f4e8eaa76beeecc7
diff --git a/net-fs/libnfs/files/libnfs-5.0.1-pthread-configure.patch b/net-fs/libnfs/files/libnfs-5.0.1-pthread-configure.patch
new file mode 100644
index 000000000000..91c3781389b4
--- /dev/null
+++ b/net-fs/libnfs/files/libnfs-5.0.1-pthread-configure.patch
@@ -0,0 +1,34 @@
+https://github.com/sahlberg/libnfs/pull/380
+
+From af37ac6d766755185dc023b940cfe78a176170a0 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sun, 3 Apr 2022 04:22:04 +0100
+Subject: [PATCH] autotools: fix syntax error in configure when pthreads
+ disabled
+
+Avoids this warning/syntax error in configure when pthreads aren't
+enabled (default):
+```
+checking for special C compiler options needed for large files... no
+checking for _FILE_OFFSET_BITS value needed for large files... no
+./configure: 14227: test: =: unexpected operator
+checking whether SO_BINDTODEVICE is available... yes
+checking whether getpwnam() is available... yes
+```
+
+The LHS of the test will be blank, so use an 'x' to give a dummy
+value, like we do elsewhere.
+
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/configure.ac
++++ b/configure.ac
+@@ -88,7 +88,7 @@ if test x"$libnfs_cv_HAVE_PTHREAD" = x"yes"; then
+     AC_DEFINE(HAVE_MULTITHREADING,1,[Whether we have multithreading support])
+ fi
+ fi
+-AM_CONDITIONAL([HAVE_PTHREAD], [test $libnfs_cv_HAVE_PTHREAD = yes])
++AM_CONDITIONAL([HAVE_PTHREAD], [test x$libnfs_cv_HAVE_PTHREAD = xyes])
+ 
+ AC_MSG_CHECKING(whether SO_BINDTODEVICE is available)
+ AC_TRY_COMPILE([#include <net/if.h>], [
+
diff --git a/net-fs/libnfs/libnfs-5.0.1.ebuild b/net-fs/libnfs/libnfs-5.0.1.ebuild
new file mode 100644
index 000000000000..697b530e9448
--- /dev/null
+++ b/net-fs/libnfs/libnfs-5.0.1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+if [[ ${PV} == 9999 ]] ; then
+	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 ~riscv ~s390 ~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/14" # sub-slot matches SONAME major
+IUSE="examples static-libs utils"
+
+# net-libs/rpcsvc-proto for rpcgen called in build system
+BDEPEND="net-libs/rpcsvc-proto
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/libnfs-5.0.1-pthread-configure.patch
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-werror
+		$(use_enable static-libs static)
+		$(use_enable utils)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	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
+
+	find "${ED}" -name "*.la" -delete || die
+}
diff --git a/net-fs/libnfs/libnfs-9999.ebuild b/net-fs/libnfs/libnfs-9999.ebuild
index 2736936d4bfc..c586e1123012 100644
--- a/net-fs/libnfs/libnfs-9999.ebuild
+++ b/net-fs/libnfs/libnfs-9999.ebuild
@@ -1,31 +1,32 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit autotools
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == 9999 ]] ; then
 	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 ~x86"
-	S="${WORKDIR}/${PN}-${P}"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~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/13"  # sub-slot matches SONAME major
+SLOT="0/14" # sub-slot matches SONAME major
 IUSE="examples static-libs utils"
 
-RDEPEND=""
-DEPEND="${RDEPEND}
+# net-libs/rpcsvc-proto for rpcgen called in build system
+BDEPEND="net-libs/rpcsvc-proto
 	virtual/pkgconfig"
 
 src_prepare() {
 	default
+
 	eautoreconf
 }
 
@@ -35,11 +36,13 @@ src_configure() {
 		$(use_enable static-libs static)
 		$(use_enable utils)
 	)
+
 	econf "${myeconfargs[@]}"
 }
 
 src_install() {
 	default
+
 	if use examples; then
 		# --enable-examples configure switch just compiles them
 		# better install sources instead
@@ -48,5 +51,6 @@ src_install() {
 			doexe examples/${program}.c
 		done
 	fi
+
 	find "${ED}" -name "*.la" -delete || die
 }