EAPI bump. Do not build test programs and set RESTRICT=test since they fail anyway. Fix missing includes. Add USE=static-libs.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

4 files changed, 64 insertions, 8 deletions

diff --git a/net-libs/libpcapnav/ChangeLog b/net-libs/libpcapnav/ChangeLog
index 464090cc2759..d278271a0614 100644
--- a/net-libs/libpcapnav/ChangeLog
+++ b/net-libs/libpcapnav/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-libs/libpcapnav
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libpcapnav/ChangeLog,v 1.9 2014/03/12 03:53:59 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libpcapnav/ChangeLog,v 1.10 2014/07/18 15:19:46 jer Exp $
+
+  18 Jul 2014; Jeroen Roovers <jer@gentoo.org> libpcapnav-0.8.ebuild,
+  +files/libpcapnav-0.8-includes.patch:
+  EAPI bump. Do not build test programs and set RESTRICT=test since they fail
+  anyway. Fix missing includes. Add USE=static-libs.
 
   12 Mar 2014; Patrick Lauer <patrick@gentoo.org> libpcapnav-0.7.ebuild,
   libpcapnav-0.8.ebuild:
diff --git a/net-libs/libpcapnav/Manifest b/net-libs/libpcapnav/Manifest
index d55f5eb6c5ae..b890290e3be3 100644
--- a/net-libs/libpcapnav/Manifest
+++ b/net-libs/libpcapnav/Manifest
@@ -1,6 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX libpcapnav-0.8-includes.patch 395 SHA256 0cd3f442e2e60ad27b53b81a6321b9d5e564e63eb920ac33f7e2f4a8805c644c SHA512 04570a0f0b5c33565e79922e878171bb98640d2961cc9378c64e17a7144636960fe099bcca4c043d8a4532b98fe7960fdfa24af8145df5c8682af4dcc5d9b99c WHIRLPOOL e633519a8a65ab68a91aabd7bacd6ec33b74f14f02d99f019ea965b7dddf2b821c0b0d496546f41675fb2d086769948fd6d120d62e1e123cb91b7f248ae85c76
 DIST libpcapnav-0.7.tar.gz 390455 SHA256 5860c6ad6ebcd0036a0ed6aadd0c3f2d5232fac3c5da1741a58d51a8e737c8e6
-DIST libpcapnav-0.8.tar.gz 387476 SHA256 11d6a4257cbc5a89aa73ce2aaa5b0fc17430f7279d0abb39ccaf3a411ba7e852
+DIST libpcapnav-0.8.tar.gz 387476 SHA256 11d6a4257cbc5a89aa73ce2aaa5b0fc17430f7279d0abb39ccaf3a411ba7e852 SHA512 bc0357d17228c157de5b480532df37a62459882d5a4fb8d2285fe4e86c1dca301e7cc505f2917bb3421d926bed263d93b2c587311431d9c3a5b02f04c93fdf18 WHIRLPOOL 08552c55bc6d2c80780b333e1ba0c476baa5d783c74309fe6e435cefae551b9d2a27040c66e2f27ee21a8679f48a3fe8f258a9efc64873fbda806656e339a974
 EBUILD libpcapnav-0.7.ebuild 709 SHA256 bf25853233438ec2e3b9cba802c67ad21ebcf0b72efec29c3c7a60eaba562606 SHA512 603a774714b7c5e38a5dae054024416d48a70c83421695b8993e5bb735c7a7c3ddc87354e02d7781f8591ec6c519b99e1ee9299c15fb585cb06210f84ebc8173 WHIRLPOOL 59fced64cfd6a035cc0cc0ba3d695fa094f0d253d9c22781801b4aa1099838ab5fd71a0e1bef4f6fc0fb1cafa40f6973c9fede9f1756bc9d51bdb851b115d2ea
-EBUILD libpcapnav-0.8.ebuild 709 SHA256 88132cba39e3b16af478ef54c75daf0ee1f0093df18abbf3a1e3ab4a7491fdc7 SHA512 5d74f219c10fdb0dedd8f90c6ee626eb2adfabf63b69ec3569d72100cec871628ace959b9c6e9d9d69dec7fc673e3b2b7ed7c075aa7056ea58469342639b180d WHIRLPOOL ceba1d70d7be1d01be4d4b73738befa504445c2ba62d255509b6eb504f8379b4d0a6ea62e476a90abb3e738d1c73afa69ab65697d442a10761748952f9ff22af
-MISC ChangeLog 1424 SHA256 27db278bb92350e1b5bd9766c78bfbb2befdb5fbb23c31b43b0fc881dcde0b18 SHA512 458a07f3e5d98aaed9ef213044c5c4fb1c262ce118c91fbf9035de31a62968e055864bdd569cbf432e0dbb3b9ce6d26afbefff72e2c34a2dad1a33633840820b WHIRLPOOL f1ea2d47de5f4b667fc27ba019141af1d9659f564eaf10743c34dffdd16ac343ae8c63cc06eb9c2852a047bfb0cfb55d08380a99d29f38a8e95843bd0812fe70
+EBUILD libpcapnav-0.8.ebuild 919 SHA256 63609fc6b42815bcd81125e9c41a5364f75ffb0d2648271fe72af953286babe9 SHA512 4bbf4c155b4f3b11d2899426730f35554ee753efe088667aca60322380a5b7f53fbc7e34e6da6d17853bea677e85132e6dbfea8aaaca45b50fd18e2ca2f67416 WHIRLPOOL ad3a3a3ebba35dc6cf32a4a33e35f06383d576797c52078bae2456f2f789b7a23a658896c4902f35b7f635705c637101f6a2289bbe90d69432260612d1ca8619
+MISC ChangeLog 1663 SHA256 e33d2c70ff484982e5dc1b48fdb01cfbb32260b58d1a4fc451cbd3ee68e022b8 SHA512 8b1210ec22641c854094c653f16c4c48c39a14f1e850d432eb2155b95384f8c4a9448f71f01a6f82e33e6fadead474e6490aa36f0a34796931cc5c6fe578988f WHIRLPOOL 3b3c2012af290a013b5b915dd9b9eed258750b7084792d9fbc3e0d6f3b3f16261a0aa8bf07cbeee349ae38bf382a33aa18a0f932979c8dbed9d846c4a5f11bca
 MISC metadata.xml 160 SHA256 39e232fc7ec88ca0b077cb3950cb39d15cd990842b88d5bfe14f02f34d72f37b SHA512 3ac3a74a7cdf45b14884d967b10e4752f9cb06c579f6d7baf921f9be5450cbe7536c2e5a480ac3c95156eb6abb32e68f74cecc86b9ac0dcc4e0e1b4b255c3e20 WHIRLPOOL f7504ce9e3e8a58d19bba5448305f806c2ae01d0a8d2cf09d6bc6a089a6e1c28a1b12a80bb6020584b5ed21df94e4936b1695a54548704cb8679660b6b807955
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iEYEAREIAAYFAlPJOxQACgkQVWmRsqeSphO/fgCeMRUGMg4Cwx+L8oESQt7mH78T
+70gAnA26dajn2CHjIcSj4CRhp4i8gMr9
+=elOB
+-----END PGP SIGNATURE-----
diff --git a/net-libs/libpcapnav/files/libpcapnav-0.8-includes.patch b/net-libs/libpcapnav/files/libpcapnav-0.8-includes.patch
new file mode 100644
index 000000000000..cb41bedf4a32
--- /dev/null
+++ b/net-libs/libpcapnav/files/libpcapnav-0.8-includes.patch
@@ -0,0 +1,20 @@
+--- a/test/pcapnav-test1.c
++++ b/test/pcapnav-test1.c
+@@ -1,6 +1,7 @@
+ #include <config.h>
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <time.h> /* ctime() */
+ 
+ #include <pcapnav.h>
+ 
+--- a/test/pcapnav-jump.c
++++ b/test/pcapnav-jump.c
+@@ -1,6 +1,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <pcapnav.h>
++#include <string.h> /* strcmp() */
+ 
+ int 
+ main(int argc, char** argv)
diff --git a/net-libs/libpcapnav/libpcapnav-0.8.ebuild b/net-libs/libpcapnav/libpcapnav-0.8.ebuild
index 8e84f898a756..ea0cf7b219ab 100644
--- a/net-libs/libpcapnav/libpcapnav-0.8.ebuild
+++ b/net-libs/libpcapnav/libpcapnav-0.8.ebuild
@@ -1,6 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libpcapnav/libpcapnav-0.8.ebuild,v 1.3 2014/03/12 03:53:59 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libpcapnav/libpcapnav-0.8.ebuild,v 1.4 2014/07/18 15:19:46 jer Exp $
+
+EAPI=5
+inherit eutils
 
 DESCRIPTION="Libpcap wrapper library to navigate to arbitrary packets in a tcpdump trace file"
 HOMEPAGE="http://netdude.sourceforge.net/"
@@ -9,13 +12,30 @@ SRC_URI="mirror://sourceforge/netdude/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 ~sparc ~x86"
-IUSE="doc"
+IUSE="doc static-libs"
 
 DEPEND="net-libs/libpcap"
+RDEPEND="${DEPEND}"
+
+RESTRICT="test"
+
+DOCS=( AUTHORS ChangeLog README )
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-includes.patch
+}
+
+src_configure() {
+	econf $(use_enable static-libs static)
+}
+
+src_compile() {
+	emake SUBDIRS="src docs"
+}
 
 src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
+	default
 	rm -fr "${D}"/usr/share/gtk-doc
-	dodoc AUTHORS ChangeLog README
 	use doc && dohtml -r docs/*.css docs/html/*.html docs/images
+	prune_libtool_files
 }