Version bump. Disable libtirpc as upstream has deprecated it #442588 by Torsten Kurbad.

(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key FB7C4156)

4 files changed, 103 insertions, 14 deletions

diff --git a/net-fs/libnfs/ChangeLog b/net-fs/libnfs/ChangeLog
index db029e3a3713..318f20f9ec03 100644
--- a/net-fs/libnfs/ChangeLog
+++ b/net-fs/libnfs/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-fs/libnfs
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/libnfs/ChangeLog,v 1.3 2012/05/03 04:06:32 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/libnfs/ChangeLog,v 1.4 2012/12/04 03:54:39 vapier Exp $
+
+*libnfs-1.5.0 (04 Dec 2012)
+
+  04 Dec 2012; Mike Frysinger <vapier@gentoo.org>
+  +files/libnfs-1.5.0-headers.patch, +libnfs-1.5.0.ebuild, libnfs-9999.ebuild:
+  Version bump.  Disable libtirpc as upstream has deprecated it #442588 by
+  Torsten Kurbad.
 
   03 May 2012; Jeff Horelick <jdhore@gentoo.org> libnfs-1.3.0.ebuild,
   libnfs-9999.ebuild:
@@ -16,4 +23,3 @@
   06 Nov 2011; Mike Frysinger <vapier@gentoo.org> +libnfs-9999.ebuild,
   +metadata.xml:
   Initial ebuild #382751 by hal.
-
diff --git a/net-fs/libnfs/files/libnfs-1.5.0-headers.patch b/net-fs/libnfs/files/libnfs-1.5.0-headers.patch
new file mode 100644
index 000000000000..68ec6d3c71c6
--- /dev/null
+++ b/net-fs/libnfs/files/libnfs-1.5.0-headers.patch
@@ -0,0 +1,42 @@
+From 32bd77c82fe12fbfe0a1d50f64fa1959cf699bea 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 these warnings:
+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  | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/lib/libnfs-sync.c b/lib/libnfs-sync.c
+index fd6f796..1fbeb8f 100644
+--- a/lib/libnfs-sync.c
++++ b/lib/libnfs-sync.c
+@@ -45,6 +45,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 a243d1d..3d5fd30 100644
+--- a/lib/libnfs-zdr.c
++++ b/lib/libnfs-zdr.c
+@@ -29,6 +29,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <time.h>
++#include <unistd.h>
+ #include "libnfs-zdr.h"
+ 
+ struct opaque_auth _null_auth;
+-- 
+1.7.12.4
+
diff --git a/net-fs/libnfs/libnfs-1.5.0.ebuild b/net-fs/libnfs/libnfs-1.5.0.ebuild
new file mode 100644
index 000000000000..cbcb77f8bdcc
--- /dev/null
+++ b/net-fs/libnfs/libnfs-1.5.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-fs/libnfs/libnfs-1.5.0.ebuild,v 1.1 2012/12/04 03:54:39 vapier Exp $
+
+EAPI="4"
+
+inherit eutils
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://github.com/sahlberg/libnfs.git"
+	inherit git-2 autotools
+else
+	SRC_URI="https://github.com/downloads/sahlberg/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~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="static-libs"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_unpack() {
+	default
+	[[ ${PV} == "9999" ]] && git-2_src_unpack
+}
+
+src_prepare() {
+	[[ ${PV} == "9999" ]] && eautoreconf
+	epatch "${FILESDIR}"/${PN}-1.5.0-headers.patch
+}
+
+src_configure() {
+	econf \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	use static-libs || find "${ED}" -name '*.la' -delete
+}
diff --git a/net-fs/libnfs/libnfs-9999.ebuild b/net-fs/libnfs/libnfs-9999.ebuild
index 424df33f9e9b..008aa78d1943 100644
--- a/net-fs/libnfs/libnfs-9999.ebuild
+++ b/net-fs/libnfs/libnfs-9999.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/libnfs/libnfs-9999.ebuild,v 1.2 2012/05/03 04:06:32 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/libnfs/libnfs-9999.ebuild,v 1.3 2012/12/04 03:54:39 vapier Exp $
 
 EAPI="4"
 
-inherit autotools
+inherit eutils
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://github.com/sahlberg/libnfs.git"
-	inherit git-2
+	inherit git-2 autotools
 else
-	SRC_URI="https://github.com/sahlberg/${PN}/tarball/${P} -> ${P}.tgz"
+	SRC_URI="https://github.com/downloads/sahlberg/${PN}/${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 fi
 
@@ -20,26 +20,22 @@ LICENSE="LGPL-2.1 GPL-3"
 SLOT="0"
 IUSE="static-libs"
 
-RDEPEND="net-libs/libtirpc"
+RDEPEND=""
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
 src_unpack() {
 	default
-	if [[ ${PV} == "9999" ]] ; then
-		git-2_src_unpack
-	else
-		mv sahlberg-libnfs-* "${S}" || die
-	fi
+	[[ ${PV} == "9999" ]] && git-2_src_unpack
 }
 
 src_prepare() {
-	eautoreconf
+	[[ ${PV} == "9999" ]] && eautoreconf
+	epatch "${FILESDIR}"/${PN}-1.5.0-headers.patch
 }
 
 src_configure() {
 	econf \
-		--enable-tirpc \
 		$(use_enable static-libs static)
 }