8 files changed, 82 insertions, 75 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/Manifest b/net-libs/libtrace/Manifest
index e54aff6ff1e9..4ec89709cf87 100644
--- a/net-libs/libtrace/Manifest
+++ b/net-libs/libtrace/Manifest
@@ -1,22 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST libtrace-3.0.17.tar.bz2 581698 SHA256 56d308a6802722f819e40db0ca7597ffbfb80369694297af382e19e9c6dc220b SHA512 24bff39f45b0b2712f1ee0d97fbc43bb455dc9e3533c134c5d20d7a69c8e38f2847bb3ea010fe7f3cb2cb36ec0f6c03509d22114c845ad58353434d519466b86 WHIRLPOOL 692bda82f0e7bd1b014923b3494bc2a94cafaa351348eee3266049547f741de2fa546790039819800a64289984733ef883415c48d9871c401a122cf901b6de79
-DIST libtrace-3.0.18.tar.bz2 581908 SHA256 d729c0cae667f4f79e8c24196f21a989e8cc2763169d516b96ad06c4a0687dd2 SHA512 8d97216036bb646c866955a0d0179645f3f94633c63af85e6fef55357f2071911f1e281540b80a2a0c7d89ed577ba7e7f7bb4641528d4ce6ce043a63a24a287f WHIRLPOOL 175b47d3ad408533b09f89be34bb2cad903fc08274697f8629c80e8557a2f91906312386b930dce2f66bcc0b04259943d760c4a9412ecf789c1a8cb3a6156450
+AUX libtrace-3.0.20-autoconf-1.13.patch 219 SHA256 92d1e30b1ee6a110fe5357152c310b6f913c8acaa4c44255274552bf3aa44653 SHA512 6335e63cdf537700a60f8eeae940d963d582e9373e1ea6a14b7960a52e1c61464785134ec14bbe49ededf7554f0715fdb4d59565d1c9870f8a0bc5524538286e WHIRLPOOL d3e659211a0e500cb5a501259e59ae1b8689475fc6f467c6d41b3ed925a176ed1245f0d9a37cda99b8d27de4e8d0fb968f188845cbd5011497e2b468cf180362
+AUX libtrace-3.0.20-libwandio-linking.patch 257 SHA256 13ae3c56daa02609ad0990dae292310c27f17e44e25f12ef780990b4ab9c8421 SHA512 76b8a71baa62e96e7325e99e3e6e38528a094b4c8fcfb8e92f30a0f61b62aeb15ac55d950b523fc0c22a754b3dffcbe8b54f52bc2065f16d272486dac003a34d WHIRLPOOL d5039c1e395015b0a0cc1d192ac9a73232615d74625c8ab035a7a9d22419c4a61cfe1686f0cc20810119f020605e61f9267c4934105e3a03e67d71fa2e473f94
+AUX libtrace-3.0.20-no-examples.patch 333 SHA256 e10325b10cefeb359bb2c3bb39567a04d7f5f2a4ed75b08377065b3a1dcbef98 SHA512 105bffab152ff700f969305428933df1ed2d5d92966b0d09f08942faad3f7243a9914af0eecf12b33fd519e7f961ab0eee0796a91404cc4cc52a438f572c4385 WHIRLPOOL 18048c592bf575ff13a4b02cacc9d1996c48c06b0fc030f0a75feb585391f83453aed0dc37a5b8decf5bbd5fa8ca33aeb9e78f17b5339e142a22a2cf6d996c51
+AUX libtrace-3.0.20-tinfo.patch 474 SHA256 d93638532ed22ab7acb6bc1e4bd5e15e4dddf6adf26ebcb4fef8627075a34ff6 SHA512 eb0369b9b8a273e47189b63ac90e9bcfe3a10532343efce8b5ab1d79c84a427dbd6655683c9e7b135978e703567603eec12d1314dd6bb44c91c716d166c9b824 WHIRLPOOL e8e4547d48580497561ce5afa68889b2cff25afabc6d9ee0c46d6bdf32c6073154ee40837617b51e5889ffc7da6b4f5ff47a53eac201d16acc564e414d1aa813
 DIST libtrace-3.0.19.tar.bz2 609780 SHA256 e269de6c6bcaaa605938cfac19f0904f8bc7d2594922dc19a99e069e43049742 SHA512 b79e694d9a4adc25fab0d79c9dcfd94c0828953ce749732445a8062563248ec8d8d4e24617871304958631f3def4d7f34e1042d9519fc7d75e6caef01d84688e WHIRLPOOL c184072e3189d6555e6357755b474714e967c46125729c45b5ec99f5935e503816cd45cf48a493e4adb0da71d59d7fcd4a18dce0611859d57fe25eecdead3ed3
-EBUILD libtrace-3.0.17.ebuild 1224 SHA256 c5a3c2352585cdfa1907cd97c7a6ae8b6b4cfa7d340699f22ed740b1fa0ec186 SHA512 1ce0a3d36b78995703b69a4c3ab64d47b8ffb92d7c4dc6376661022c38ea9228b3687de8bfa6a77cf475d1a56c1627a9fa2c715b90483e94da56dfdf4db5a8d0 WHIRLPOOL e8b88da1d580d5188fc1717e0484edff997c4f1b917989f1143b668053073fb492eefeb818bbcc0a32077f5eee1fc52fbe8a9bf67cd878fbb55d2b446c0bb33c
-EBUILD libtrace-3.0.18.ebuild 1224 SHA256 828c94e226f3d4227d907d1928a2a2db491c3d541eb6269b542391b90884352f SHA512 0742796239c57b86f88c8abc9e991fc430f40c8089cd00de805ff14f7adb243b092c4bf172d042f4337b3aa7b8743eb148043ee23f8cf48b041bf4e8de1b82f4 WHIRLPOOL cdbafa15f7855e5f9df2fb290c19ac008dc7557d7ac29c84fa8fb345d6e8761bdaac81fbf842e125a3c0345fbc21308bf1f000e1c7e347852cb2adf7ad0f2986
+DIST libtrace-3.0.20.tar.bz2 613460 SHA256 92a85bc6732f1034587e29c6105bae61dd4279fe0164f86b2b2a8d8473a7d983 SHA512 da7e02df375f01af9a6888b4a1943167cee7bf5be5ffaaae616f062e6b8168efa685f31fd422e87daf743fd2e1c6d9d1bd7e04bf6bb545bb598b7959a9a92af6 WHIRLPOOL 8d1e91504c91e8fa47451c6d8144061c4547316dcb2316e0d1c855935a8aad74c25500e6efb31422c752446551110dfd8c6966c20bada4fd5cc90952ae83317b
 EBUILD libtrace-3.0.19.ebuild 1224 SHA256 f01a2a9a495b5019014841928844419b055f6b28af3ec159426300bcbf80cd70 SHA512 ac93a798b2b6d3757bcbcd156b00ec35bcb00721a0e46d72d6168905c307323a3a4641f11c7a889ddedbf9fc9777a73ef05e093e7ee5cb303161c6cf55cf2761 WHIRLPOOL b93bf2656114ffbdc53f2c657e604a089f07a11c85e1672fb5922f1a4e4e538a24a6d38560f1b06bb11186fca9c518cd72e558ecdb6a547690f587b9c23f414d
-MISC ChangeLog 1770 SHA256 9060df6e7357b4e0b393b23241fded10376e5b18ec53f233a8a551d8437588ad SHA512 5c627c865835af0df357c635c5e80e942b5d80275d6e28ccaec1b23905082ee7e15415b8f5d7caeb2b41a194eebeb3103809a245a28105332f62c33c22498a4d WHIRLPOOL afd498ff0268537ef8f3fa344e1d30af98f6e22d8b092c441c8114daca080cb56a5de72d6dbdd44b493cf89ba7a574cfc6660f020a46497e4dae8b1c416743a7
+EBUILD libtrace-3.0.20.ebuild 1237 SHA256 a53800340b07e89238c5365355aa20adac6acc3c50e8bbe6df9852dd34feaa7d SHA512 412277181fedeab0f60c32691a6d06961da82dc307a8c45c151bc5ec81411aec9ae3e9e0f0252825be53bf1cd1bc237841955ae8b3ae43d2a3b246e516a8b240 WHIRLPOOL 92a498ff57436b77e0eec20f296b7eca885265060bec673b0ce81b7b612f8813e3d4c8beb81993517ec08572483c897a018ddf3464242d0d657780a7e68caf05
+MISC ChangeLog 2213 SHA256 3992a4ac7f70fd1e43a27f6f00954e9cc62705cec74ca06e14fad4a50f279bd7 SHA512 da712d29f3b9d7ac31a5fbc1a10d20dd2d5818b9c8a95d3e1e522ca35a866b9f2d29233f32b519632225517c70232fe50596e80d88d2e1b1181efda8fbfe5b6e WHIRLPOOL e4200a6e2a4df2aa3104e09df133c19e44f6c4838a220ed4802c886a5d5bb6a83a6695b59bd1da17733e8da70907d08cd705f95574b73f4f99e2b80b581decaa
 MISC metadata.xml 253 SHA256 79bb6d11490801e4aa3b1330f7ec9fee4bdeb3a22f6d88e4cdb4862b91a2ad64 SHA512 9758369ca94fb411c63fefb39e6d5cf0fcbce352e76295ad12d2d84b108cbdfe14bf92767cdd4bdc13ac305a28ec6226137e96c7d992e8cfe93c9b059d04122f WHIRLPOOL 85ff93ff0a84d42b4f48277adab67e4528fad3fde9c828ca4aa9de7222e889bc125084357e27471ddcfd26ab82850c73d4e8a88e23ef262f12d9590efda850af
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQEcBAEBCAAGBQJTG6iwAAoJEEqz6FtPBkyjGQ8IAIO2BmgFb+xeguqdKU3mgFIT
-olG5X76BSLSywTjT5Vmd5XsomP+UM/wrVYGIqpmDiczSIWVKsPQ4EXckQKU1/57U
-577oHHv4e83Ypk3S2E90ym08cPDlkBLFB/xFFrIvjb0WTbG7e+hhIFlPbBUlKbOU
-1M5naaI9/ZrP8pzoD79Db2/097CzPvDOS8as1BopfnMdjkI6CKvlfuKo81Vglnac
-+whfcpztMDdb97yFHRP2EaRxx9GIa2xdsG1w0ktbv7pEzT3+FIdzI4X/qP2ig974
-bxzc6sRBee1mKGMUiK5TDifpx4wf5o6y2rE5g+qk6Dw3VD7LNVPupzwT3tNKl9w=
-=QGq8
+iEYEAREIAAYFAlO9RH4ACgkQVWmRsqeSphNZfACeNIXuqpS22UXLCmvMqGFolCZx
+ncgAn2mDvEza2DPtcQhuq97kFDHINt8J
+=kEGM
 -----END PGP SIGNATURE-----
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
 }