public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: net-fs/libnfs/files/, net-fs/libnfs/
@ 2018-07-06 13:26 Lars Wendler
  0 siblings, 0 replies; 5+ messages in thread
From: Lars Wendler @ 2018-07-06 13:26 UTC (permalink / raw
  To: gentoo-commits

commit:     0ed152fff699a2d0d8b17b3ad533cd6d8fe5d4c8
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Fri Jul  6 13:23:32 2018 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri Jul  6 13:26:41 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ed152ff

net-fs/libnfs: live ebuild improvements.

- EAPI-6 bump
- Add "utils" USE flag
- Bump sub-slot to 12 to reflect .so version change

Package-Manager: Portage-2.3.41, Repoman-2.3.9

 net-fs/libnfs/files/libnfs-3.0.0-utils.patch | 20 ++++++++++++++++++
 net-fs/libnfs/libnfs-9999.ebuild             | 31 +++++++++++++++++-----------
 net-fs/libnfs/metadata.xml                   |  3 +++
 3 files changed, 42 insertions(+), 12 deletions(-)

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 00000000000..b26716158b5
--- /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-9999.ebuild b/net-fs/libnfs/libnfs-9999.ebuild
index 958c36a1dd2..96606a99d49 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 0a94e5f6ef1..bdbf712883c 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>


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-fs/libnfs/files/, net-fs/libnfs/
@ 2018-07-06 13:26 Lars Wendler
  0 siblings, 0 replies; 5+ messages in thread
From: Lars Wendler @ 2018-07-06 13:26 UTC (permalink / raw
  To: gentoo-commits

commit:     e07fc3d905a545db565ae73f3d41146b8c861957
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Fri Jul  6 13:26:01 2018 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri Jul  6 13:26:46 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e07fc3d9

net-fs/libnfs: Removed old.

Package-Manager: Portage-2.3.41, Repoman-2.3.9

 net-fs/libnfs/Manifest                             |  4 -
 net-fs/libnfs/files/libnfs-1.9.5-headers.patch     | 86 ----------------------
 .../files/libnfs-1.9.5-implicit-internal.patch     | 27 -------
 net-fs/libnfs/libnfs-1.10.0.ebuild                 | 40 ----------
 net-fs/libnfs/libnfs-1.11.0.ebuild                 | 40 ----------
 net-fs/libnfs/libnfs-1.9.5.ebuild                  | 45 -----------
 net-fs/libnfs/libnfs-1.9.8.ebuild                  | 40 ----------
 7 files changed, 282 deletions(-)

diff --git a/net-fs/libnfs/Manifest b/net-fs/libnfs/Manifest
index 02ebe669c16..948e38aff51 100644
--- a/net-fs/libnfs/Manifest
+++ b/net-fs/libnfs/Manifest
@@ -1,7 +1,3 @@
-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
 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
 DIST libnfs-3.0.0.tar.gz 249035 BLAKE2B 321bbc6eb2d926c41afae95a873cd9103446d2bda0015f159341a7bca2245d708abaa283f9a8f505a320a0b446166b36106cd9f54e885a02cb486168c87a2a7f SHA512 9af31f8824431e9d28267c468dafc7cfc4062b1a280ca141036bc28a2ba544c4470a67955b5e5fbcc6c175435812381013b4c5d3d3d1a175d5efc7b802ae9b3b

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 96719ffd54c..00000000000
--- 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 e702c81f5cb..00000000000
--- 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/libnfs-1.10.0.ebuild b/net-fs/libnfs/libnfs-1.10.0.ebuild
deleted file mode 100644
index edc14e1cdcd..00000000000
--- 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 edc14e1cdcd..00000000000
--- 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 1ddf8520379..00000000000
--- 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-1.9.8.ebuild
deleted file mode 100644
index edc14e1cdcd..00000000000
--- a/net-fs/libnfs/libnfs-1.9.8.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
-}


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-fs/libnfs/files/, net-fs/libnfs/
@ 2020-09-18 10:30 Lars Wendler
  0 siblings, 0 replies; 5+ messages in thread
From: Lars Wendler @ 2020-09-18 10:30 UTC (permalink / raw
  To: gentoo-commits

commit:     57e4c01a240742b060026e73e92a21ac3e27b4c0
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 18 10:14:47 2020 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri Sep 18 10:30:05 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57e4c01a

net-fs/libnfs: Removed old

Package-Manager: Portage-3.0.7, Repoman-3.0.1
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 net-fs/libnfs/Manifest                       |  2 -
 net-fs/libnfs/files/libnfs-3.0.0-utils.patch | 20 ----------
 net-fs/libnfs/libnfs-2.0.0.ebuild            | 48 ------------------------
 net-fs/libnfs/libnfs-3.0.0.ebuild            | 55 ----------------------------
 4 files changed, 125 deletions(-)

diff --git a/net-fs/libnfs/Manifest b/net-fs/libnfs/Manifest
index 7b2a8831f6f..9081fa425b0 100644
--- a/net-fs/libnfs/Manifest
+++ b/net-fs/libnfs/Manifest
@@ -1,3 +1 @@
-DIST libnfs-2.0.0.tar.gz 200932 BLAKE2B df5ae4487bd7e19428551f047a1d61df712ecc73b3db33995121abfba2df8f9283ef69f4a0d897266d7d476010bfcfa5fdea109b265f82fe4df8904cd6d05c6c SHA512 701dd5317b0395523be89123d473f4da5c3ff53c2e30004a922f649f0dbbd97546ee39ab34fce06278a8148c13200ca383726a0822d09846fad6e308f29e42c7
-DIST libnfs-3.0.0.tar.gz 249035 BLAKE2B 321bbc6eb2d926c41afae95a873cd9103446d2bda0015f159341a7bca2245d708abaa283f9a8f505a320a0b446166b36106cd9f54e885a02cb486168c87a2a7f SHA512 9af31f8824431e9d28267c468dafc7cfc4062b1a280ca141036bc28a2ba544c4470a67955b5e5fbcc6c175435812381013b4c5d3d3d1a175d5efc7b802ae9b3b
 DIST libnfs-4.0.0.tar.gz 251662 BLAKE2B b6c33c42eb1715b8a996a432b0cc28af1a98cca3389a779378df0931e4d37418937e3ea4938efb4d075b39aac33facca86df3a02bd62d2c7b262859e8d04ecc1 SHA512 3d93d83d1909f24de304c0d47fa6240da7ecf43ce2488a242a58ddabe51d774caf813f5a90ae720a8edd251a765b30e88c0e5b6a13ecb254dfecdc98e30737fa

diff --git a/net-fs/libnfs/files/libnfs-3.0.0-utils.patch b/net-fs/libnfs/files/libnfs-3.0.0-utils.patch
deleted file mode 100644
index b26716158b5..00000000000
--- a/net-fs/libnfs/files/libnfs-3.0.0-utils.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-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-2.0.0.ebuild b/net-fs/libnfs/libnfs-2.0.0.ebuild
deleted file mode 100644
index d238b549811..00000000000
--- a/net-fs/libnfs/libnfs-2.0.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-AUTOTOOLS_AUTORECONF="1"
-
-inherit autotools 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 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/11"  # sub-slot matches SONAME major
-IUSE="examples static-libs"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${PN}-${P}"
-
-src_prepare() {
-	default
-
-	epatch_user
-
-	eautoreconf
-}
-
-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-3.0.0.ebuild b/net-fs/libnfs/libnfs-3.0.0.ebuild
deleted file mode 100644
index e5153c2d254..00000000000
--- a/net-fs/libnfs/libnfs-3.0.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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 ~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/12"  # sub-slot matches SONAME major
-IUSE="examples static-libs utils"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-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() {
-	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
-}


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-fs/libnfs/files/, net-fs/libnfs/
@ 2022-04-03  3:41 Sam James
  0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2022-04-03  3:41 UTC (permalink / raw
  To: gentoo-commits

commit:     10f85b88567788188f22b3da118cbb38b4aa83f1
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Apr  3 03:00:51 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Apr  3 03:41:08 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10f85b88

net-fs/libnfs: add 5.0.1

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-fs/libnfs/Manifest                             |  1 +
 .../files/libnfs-5.0.1-pthread-configure.patch     | 34 ++++++++++++++++++++++
 .../{libnfs-9999.ebuild => libnfs-5.0.1.ebuild}    | 24 ++++++++++-----
 net-fs/libnfs/libnfs-9999.ebuild                   | 20 ++++++++-----
 4 files changed, 63 insertions(+), 16 deletions(-)

diff --git a/net-fs/libnfs/Manifest b/net-fs/libnfs/Manifest
index 9081fa425b0d..dfece8a6f904 100644
--- a/net-fs/libnfs/Manifest
+++ b/net-fs/libnfs/Manifest
@@ -1 +1,2 @@
 DIST libnfs-4.0.0.tar.gz 251662 BLAKE2B b6c33c42eb1715b8a996a432b0cc28af1a98cca3389a779378df0931e4d37418937e3ea4938efb4d075b39aac33facca86df3a02bd62d2c7b262859e8d04ecc1 SHA512 3d93d83d1909f24de304c0d47fa6240da7ecf43ce2488a242a58ddabe51d774caf813f5a90ae720a8edd251a765b30e88c0e5b6a13ecb254dfecdc98e30737fa
+DIST libnfs-5.0.1.tar.gz 279550 BLAKE2B d27e97f3dce1385cabd8076b673d2bbfe339ff5a34295ca13bfea2f9c2048f4c6dd07a0b54b7cc7e44aecda58dd21520732dc6ee82260f0694a01fec59875a6a SHA512 71f2dcfa8945c1cb6402f5fca10b1f7a4720f7589807d6130eb55361f05ef4684f9cc9a177ece4e13d3847ac6606924115fac7b27749cecc2f5aca6fa9c63ebf

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-9999.ebuild b/net-fs/libnfs/libnfs-5.0.1.ebuild
similarity index 75%
copy from net-fs/libnfs/libnfs-9999.ebuild
copy to net-fs/libnfs/libnfs-5.0.1.ebuild
index 2736936d4bfc..697b530e9448 100644
--- a/net-fs/libnfs/libnfs-9999.ebuild
+++ b/net-fs/libnfs/libnfs-5.0.1.ebuild
@@ -1,31 +1,36 @@
-# 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"
 
+PATCHES=(
+	"${FILESDIR}"/libnfs-5.0.1-pthread-configure.patch
+)
+
 src_prepare() {
 	default
+
 	eautoreconf
 }
 
@@ -35,11 +40,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 +55,6 @@ 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 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
 }


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-fs/libnfs/files/, net-fs/libnfs/
@ 2022-10-28 20:09 Sam James
  0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2022-10-28 20:09 UTC (permalink / raw
  To: gentoo-commits

commit:     946bede45a68e5c82f1665fdccf16dc13bc01f47
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 28 20:04:14 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Oct 28 20:09:26 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=946bede4

net-fs/libnfs: drop 5.0.1

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-fs/libnfs/Manifest                             |  1 -
 .../files/libnfs-5.0.1-pthread-configure.patch     | 34 ------------
 net-fs/libnfs/libnfs-5.0.1.ebuild                  | 60 ----------------------
 3 files changed, 95 deletions(-)

diff --git a/net-fs/libnfs/Manifest b/net-fs/libnfs/Manifest
index b4273017697e..a49346135177 100644
--- a/net-fs/libnfs/Manifest
+++ b/net-fs/libnfs/Manifest
@@ -1,2 +1 @@
-DIST libnfs-5.0.1.tar.gz 279550 BLAKE2B d27e97f3dce1385cabd8076b673d2bbfe339ff5a34295ca13bfea2f9c2048f4c6dd07a0b54b7cc7e44aecda58dd21520732dc6ee82260f0694a01fec59875a6a SHA512 71f2dcfa8945c1cb6402f5fca10b1f7a4720f7589807d6130eb55361f05ef4684f9cc9a177ece4e13d3847ac6606924115fac7b27749cecc2f5aca6fa9c63ebf
 DIST libnfs-5.0.2.tar.gz 281154 BLAKE2B 9de3d02e5ae4d41eacda152678e6552708b33d4e88cc6fc5f7b16c887f911fc5a5e834952505438220c961f71a8b70540be3254d5889a4336200d5633dce313e SHA512 6dcf4ea8a01b35beb53694625d20fbebd858a88725c2742671878ad6fe7877999f93d262fb58a435b00c283c3e6fb6fa7222d04bb4540bf674b7ce196e9424f5

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
deleted file mode 100644
index 91c3781389b4..000000000000
--- a/net-fs/libnfs/files/libnfs-5.0.1-pthread-configure.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-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
deleted file mode 100644
index 04425c5f0208..000000000000
--- a/net-fs/libnfs/libnfs-5.0.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# 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
-}


^ permalink raw reply related	[flat|nested] 5+ messages in thread
end of thread, other threads:[~2022-10-28 20:09 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-10-28 20:09 [gentoo-commits] repo/gentoo:master commit in: net-fs/libnfs/files/, net-fs/libnfs/ Sam James
  -- strict thread matches above, loose matches on Subject: below --
2022-04-03  3:41 Sam James
2020-09-18 10:30 Lars Wendler
2018-07-06 13:26 Lars Wendler
2018-07-06 13:26 Lars Wendler

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox