Update live ebuild now that upstream has merged out-of-source patch

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xF8DBDADE

3 files changed, 36 insertions, 32 deletions

diff --git a/net-fs/libnfs/ChangeLog b/net-fs/libnfs/ChangeLog
index de218bd88ebf..eb01f1be72c6 100644
--- a/net-fs/libnfs/ChangeLog
+++ b/net-fs/libnfs/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-fs/libnfs
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/libnfs/ChangeLog,v 1.7 2014/01/07 17:48:04 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/libnfs/ChangeLog,v 1.8 2014/01/08 15:00:42 maksbotan Exp $
+
+  08 Jan 2014; Maxim Koltsov <maksbotan@gentoo.org> libnfs-9999.ebuild:
+  Update live ebuild now that upstream has merged out-of-source patch
 
 *libnfs-1.8.0 (07 Jan 2014)
 
diff --git a/net-fs/libnfs/Manifest b/net-fs/libnfs/Manifest
index d45590de46ba..36bdf799fc5e 100644
--- a/net-fs/libnfs/Manifest
+++ b/net-fs/libnfs/Manifest
@@ -9,17 +9,17 @@ DIST libnfs-1.8.0.tar.gz 107529 SHA256 e4d766efba85e79b04c18038070506d0a9df5b7e0
 EBUILD libnfs-1.3.0.ebuild 1009 SHA256 f10ac34d57a75c1801a95377944d896308be6210465bcdc2296b0621539f9c36 SHA512 9109fd5f6dbcae951846abccb7aac7c63c9a8241132790b965d788ad8c2804fbdf8e3e0ba835ccc620bc4e6b87868dd922455378c38088b156a7f69c090ac5fd WHIRLPOOL a72dfec43bf58da360d4c0d1c86b503851b63bc3112f4b458a7d283218edab63c510ec416af53a053e41ecaec653442ca1a2158487fdcfec4914e3da8413e780
 EBUILD libnfs-1.5.0.ebuild 982 SHA256 c34b4ba8c724ce6bf231caef9289b5b8643b7de2d4f14f85d84419a46054b60c SHA512 42df4c82d674a99ebf0ebea67a8eaa1b8d793d7580063e5b974283ee611163f7be9fe87319eb3c36fff1a7c4c2d37c1d737bf16d193b788e4992832206472361 WHIRLPOOL 7100baa12a6f079966e0a229eee8a8c2c3ff4ba21d7e8e76375f7be70b13a2252eadd05bd9c46d8696418341bd481b82d0d54b8a1da9a3628e9869a39027587a
 EBUILD libnfs-1.8.0.ebuild 1182 SHA256 7aff59ed397c279cf73c047166bceb383d68591e35effe8c58c7c4ea5c3b32ae SHA512 a67fb5a602b35781ff15b6c1b8a36a0968680073852405748a51a833e528f1b5434d3ac665275cf279b2c4ba43645a9dd2e3fac6ccccc1569f8c69f7e281e6f1 WHIRLPOOL 780e19ca6ee99742c498c28165798a83ffc93e40a390bc24e056de83f12fff3b00724442c3245f7f7e1de860f6e38f5663e07eed0952f55fdff22f4160bd102a
-EBUILD libnfs-9999.ebuild 993 SHA256 6d783dcdd826c4e299e3929d85f7fba2ff3ad743ccef717d683f669d0cfba384 SHA512 9e5f942864b8591a4786331e77235ff47697cedbdc6a4aea8f9bb4f78661b9ffb411f2b4f744c0217dc3c56d231cd707afa161f70c81c8ca8153d81fca0bca0f WHIRLPOOL ee45a24a83704cf328009b8df4b51b9d92e143106b500a3e9eec9b39afaa5690519b53eb03cf29e916477484687a386f9c76bf41f296eda6c63eaafab2de4a16
-MISC ChangeLog 1374 SHA256 2b18c8b6d5149b83136c46d7ea6a8999e124c077c5ba033d9231fbf9da58699c SHA512 8cd5224db23ff26a16060ec6dce3490b633190d83bb63fbaa644de1dabc757d161cdb48d2723c25327589954a18014090ff7ebd97a33da68abb5534b16650114 WHIRLPOOL 09cc7b3c48dfa496cf86d539251a5bb0d8ef11cc111ed6a61e4f6521f4084a6baf5f6d96e3de53a9c25e545472cd68c748071d63fa1a39e74cfcd0a810cfcb2d
+EBUILD libnfs-9999.ebuild 1139 SHA256 978c7954925f272da714c0d18ac6771c1074b665052f03626ea7efc1df51569e SHA512 a21b51b1dee27df4107127a899ffc1569682e266a2b2ef714bce9a6e613747f994e12a1991e3d8a9de6f990aaf7f11a8abf32b6a4fb75e5169cdd97d552af266 WHIRLPOOL 409345b5a91cbcaa6e4ccd64153eaba82f6a6e7e09ec4380cceb7a01816ac25faa8c152ed6b201906460b6f0ed63a4dd7942472803e03721d5d272e30b1a6c81
+MISC ChangeLog 1517 SHA256 a9dcb28aca464c3d5886d6c60edcad5894c97dc3eba5d1aa32462f6fc97cd035 SHA512 9897552fc393aae9ada625ab8ed07110fe32b0883fa44e1166a6c68487ba5c632ccdd94cfc88eafc75f9bb1b6f888aa839aaaf30e24b2efbc4a930dfdc41310b WHIRLPOOL 17be6e4de6e019c0f2a75f152a3f0dbf626d78f3f3264d6d514fb3fbbbd6e30841bc8b00dbb9a17f9362db31d5c5227c55e1dfee6808df6a6594e2eeea7e0737
 MISC metadata.xml 159 SHA256 562c59615c028ffa088de789b3a792fd4cbbbfe71628ddd6a55d3b176becbc6b SHA512 9645bd7d570c2eefd7f14adf726c056a6295d45263f143e365a3fd2e8e6128392eb5fa1103b3a3bb60a622b4595ac7fe3ec19430184210ff63e86d5f03635704 WHIRLPOOL 1d62390192bf65ac30d67f3c0a872536dd8e6a5a0d8d978e5e8f83f09e44907abf16825066c9976e8be482398385737a024837da3c544eaf912ec2710318e289
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSzD3OAAoJEAmJmMX429reUvAIAISd5tp3XAz7SRmE1fY23TkS
-/HFbEPY0cjxIWuFezbcuVs3BVRTAcJdpvejNYaCXWTm1xCPOQ+3devav9mgUlUvF
-Caa21t5zLaGMo6ZBOTaW1gnDVXMYhQfcs7zEW4uPH/fX5gaOAdKS9mDXTWd150+C
-NEleTLUYiqIWji3f6gXWJ8l4gps1wukSzsThXf7j9Fm9Es4Jpc7nBibEIqSu+AUH
-ESaSvZxLB3hbPvWCxvJUmr+hbRLkzAbekSOc2kb0jNE1NCiSm3CWeVXiWT4afZOm
-kZmPClpl+VKanPcyfFYkh/FYTAtZG4dHmILLJdcgoZyxQn82V8fIOwphLSqvHEY=
-=Y6ou
+iQEcBAEBCAAGBQJSzWgNAAoJEAmJmMX429reM5QH/2ITc+/1FatiH4hkOb6DvHC0
+AlfKtqonRzLi7wIjPxc2G+di3Y76g/Uwluge+XxnarqFSXqFKvYrieCyXIrqfHMr
+BLv002aA7ekhWi3SRRjlfxbOuI5jg3FnLH1uI3ZyMa60Wr3EeMsluN6SLaQxLZ7h
+WzgGBuaAI2gfnYHjHlQW5qOEFy8JRTfKGtwBYK6F0ybyHBkliTzi7eEpunqHM9pu
+fakF3ja1K4Is7x6AX/+gaZneOhDSG7tdsUorA25SboO+69LZq/kjmI15XqCj1K/H
+Hk/AJIM3Xc7mhm9UeeyMFc19eSNfF294gNpHt7kL8zoO7oFyvuAKZdvg6VsHDLA=
+=5pwS
 -----END PGP SIGNATURE-----
diff --git a/net-fs/libnfs/libnfs-9999.ebuild b/net-fs/libnfs/libnfs-9999.ebuild
index 008aa78d1943..bc3a04124d99 100644
--- a/net-fs/libnfs/libnfs-9999.ebuild
+++ b/net-fs/libnfs/libnfs-9999.ebuild
@@ -1,45 +1,46 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 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.3 2012/12/04 03:54:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/libnfs/libnfs-9999.ebuild,v 1.4 2014/01/08 15:00:42 maksbotan Exp $
 
-EAPI="4"
+EAPI="5"
+
+AUTOTOOLS_AUTORECONF="1"
 
 inherit eutils
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://github.com/sahlberg/libnfs.git"
-	inherit git-2 autotools
+	inherit git-2 autotools-utils
 else
-	SRC_URI="https://github.com/downloads/sahlberg/${PN}/${P}.tar.gz"
+	SRC_URI="https://github.com/sahlberg/${PN}/archive/${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
+	inherit autotools-utils
 fi
 
-DESCRIPTION="client library for accessing NFS shares over a network"
+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"
+IUSE="examples static-libs"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
-src_unpack() {
-	default
-	[[ ${PV} == "9999" ]] && git-2_src_unpack
-}
+S="${WORKDIR}/${PN}-${P}"
 
-src_prepare() {
-	[[ ${PV} == "9999" ]] && eautoreconf
-	epatch "${FILESDIR}"/${PN}-1.5.0-headers.patch
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static)
-}
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.5.0-headers.patch
+)
 
 src_install() {
-	default
-	use static-libs || find "${ED}" -name '*.la' -delete
+	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
 }