Version bump. Fix linking tracetop against sys-libs/ncurses[tinfo]. Fix parallel make issue building wandiocat.

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key A792A613)

7 files changed, 71 insertions, 62 deletions

diff --git a/net-libs/libtrace/ChangeLog b/net-libs/libtrace/ChangeLog
index c0cd26837949..3e679ed4ff3f 100644
--- a/net-libs/libtrace/ChangeLog
+++ b/net-libs/libtrace/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-libs/libtrace
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libtrace/ChangeLog,v 1.11 2014/03/08 23:33:03 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libtrace/ChangeLog,v 1.12 2014/07/09 13:32:44 jer Exp $
+
+*libtrace-3.0.20 (09 Jul 2014)
+
+  09 Jul 2014; Jeroen Roovers <jer@gentoo.org> -libtrace-3.0.17.ebuild,
+  -libtrace-3.0.18.ebuild, +libtrace-3.0.20.ebuild,
+  +files/libtrace-3.0.20-autoconf-1.13.patch,
+  +files/libtrace-3.0.20-libwandio-linking.patch,
+  +files/libtrace-3.0.20-no-examples.patch, +files/libtrace-3.0.20-tinfo.patch:
+  Version bump. Fix linking tracetop against sys-libs/ncurses[tinfo]. Fix
+  parallel make issue building wandiocat.
 
 *libtrace-3.0.19 (08 Mar 2014)
 
diff --git a/net-libs/libtrace/files/libtrace-3.0.20-autoconf-1.13.patch b/net-libs/libtrace/files/libtrace-3.0.20-autoconf-1.13.patch
new file mode 100644
index 000000000000..ed51ecb82868
--- /dev/null
+++ b/net-libs/libtrace/files/libtrace-3.0.20-autoconf-1.13.patch
@@ -0,0 +1,11 @@
+--- a/configure.in
++++ b/configure.in
+@@ -61,7 +61,7 @@
+ ])
+ 
+ # Put all our automake definitions in config.h
+-AM_CONFIG_HEADER([config.h])
++AC_CONFIG_HEADERS([config.h])
+ 
+ # Checks for C and C++ compilers
+ AC_PROG_CC
diff --git a/net-libs/libtrace/files/libtrace-3.0.20-libwandio-linking.patch b/net-libs/libtrace/files/libtrace-3.0.20-libwandio-linking.patch
new file mode 100644
index 000000000000..bed8ad945487
--- /dev/null
+++ b/net-libs/libtrace/files/libtrace-3.0.20-libwandio-linking.patch
@@ -0,0 +1,8 @@
+--- a/libwandio/Makefile.am
++++ b/libwandio/Makefile.am
+@@ -43,3 +43,5 @@
+ wandiocat_CFLAGS = -I"$(top_srcdir)/libwandio"
+ wandiocat_CXXFLAGS = -I"$(top_srcdir)/libwandio"
+ wandiocat_LDFLAGS = -L"$(top_srcdir)/libwandio" -lwandio
++
++wandiocat: libwandio.la
diff --git a/net-libs/libtrace/files/libtrace-3.0.20-no-examples.patch b/net-libs/libtrace/files/libtrace-3.0.20-no-examples.patch
new file mode 100644
index 000000000000..57983d036114
--- /dev/null
+++ b/net-libs/libtrace/files/libtrace-3.0.20-no-examples.patch
@@ -0,0 +1,11 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,7 +1,7 @@
+ LIBPACKETDUMP_DIR = libpacketdump
+ TOOLS_DIR = tools
+ WANDIO_DIR=libwandio
+-SUBDIRS = $(WANDIO_DIR) lib $(LIBPACKETDUMP_DIR) $(TOOLS_DIR) docs examples
++SUBDIRS = $(WANDIO_DIR) lib $(LIBPACKETDUMP_DIR) $(TOOLS_DIR) docs 
+ 
+ ACLOCAL_AMFLAGS = -I m4
+ AUTOMAKE_OPTIONS = 1.9 foreign
diff --git a/net-libs/libtrace/files/libtrace-3.0.20-tinfo.patch b/net-libs/libtrace/files/libtrace-3.0.20-tinfo.patch
new file mode 100644
index 000000000000..9bda8a43b6b2
--- /dev/null
+++ b/net-libs/libtrace/files/libtrace-3.0.20-tinfo.patch
@@ -0,0 +1,21 @@
+--- a/tools/tracetop/Makefile.am
++++ b/tools/tracetop/Makefile.am
+@@ -6,6 +6,6 @@
+ include ../Makefile.tools
+ 
+ tracetop_SOURCES = tracetop.cc
+-tracetop_LDADD = -lncurses 
++tracetop_LDADD = @ncurses_LIBS@ 
+ tracetop_CPPFLAGS = -fno-strict-aliasing $(AM_CFLAGS)
+ endif
+--- a/configure.in
++++ b/configure.in
+@@ -492,6 +492,8 @@
+ 	fi
+ fi
+ 
++PKG_CHECK_MODULES(ncurses,ncurses)
++
+ AC_ARG_WITH([ncurses],
+ 	AC_HELP_STRING([--with-ncurses], [build tracetop (requires ncurses)]))
+ 
diff --git a/net-libs/libtrace/libtrace-3.0.18.ebuild b/net-libs/libtrace/libtrace-3.0.18.ebuild
deleted file mode 100644
index df51a32ffbb0..000000000000
--- a/net-libs/libtrace/libtrace-3.0.18.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libtrace/libtrace-3.0.18.ebuild,v 1.1 2013/07/07 20:37:00 radhermit Exp $
-
-EAPI=5
-
-inherit eutils autotools
-
-DESCRIPTION="A library and tools for trace processing"
-HOMEPAGE="http://research.wand.net.nz/software/libtrace.php"
-SRC_URI="http://research.wand.net.nz/software/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="bzip2 doc lzo ncurses static-libs zlib"
-
-RDEPEND=">=net-libs/libpcap-0.8
-	ncurses? ( sys-libs/ncurses )
-	bzip2? ( app-arch/bzip2 )
-	zlib? ( sys-libs/zlib )
-	lzo? ( dev-libs/lzo )"
-DEPEND="${RDEPEND}
-	app-doc/doxygen
-	sys-devel/flex
-	virtual/yacc"
-
-src_prepare() {
-	# don't build examples
-	sed -i "/^SUBDIRS/s/examples//" Makefile.am || die
-
-	# fix autoreconf with automake-1.13
-	sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.in || die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--with-man \
-		$(use_enable static-libs static) \
-		$(use_with ncurses) \
-		$(use_with bzip2) \
-		$(use_with zlib) \
-		$(use_with lzo)
-}
-
-src_install() {
-	default
-	use doc && dohtml docs/doxygen/html/*
-	prune_libtool_files --modules
-}
diff --git a/net-libs/libtrace/libtrace-3.0.17.ebuild b/net-libs/libtrace/libtrace-3.0.20.ebuild
index 2238c5636e59..db473f6209d5 100644
--- a/net-libs/libtrace/libtrace-3.0.17.ebuild
+++ b/net-libs/libtrace/libtrace-3.0.20.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libtrace/libtrace-3.0.17.ebuild,v 1.1 2013/05/03 08:09:48 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libtrace/libtrace-3.0.20.ebuild,v 1.1 2014/07/09 13:32:44 jer Exp $
 
 EAPI=5
 
-inherit eutils autotools
+inherit autotools eutils
 
 DESCRIPTION="A library and tools for trace processing"
 HOMEPAGE="http://research.wand.net.nz/software/libtrace.php"
@@ -23,14 +23,14 @@ RDEPEND=">=net-libs/libpcap-0.8
 DEPEND="${RDEPEND}
 	app-doc/doxygen
 	sys-devel/flex
-	virtual/yacc"
+	virtual/yacc
+	virtual/pkgconfig"
 
 src_prepare() {
-	# don't build examples
-	sed -i "/^SUBDIRS/s/examples//" Makefile.am || die
-
-	# fix autoreconf with automake-1.13
-	sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.in || die
+	epatch "${FILESDIR}"/${P}-autoconf-1.13.patch
+	epatch "${FILESDIR}"/${P}-libwandio-linking.patch
+	epatch "${FILESDIR}"/${P}-no-examples.patch
+	epatch "${FILESDIR}"/${P}-tinfo.patch
 
 	eautoreconf
 }