net-libs/libtrace: Version bump.

Package-Manager: portage-2.3.0

5 files changed, 99 insertions, 0 deletions

diff --git a/net-libs/libtrace/Manifest b/net-libs/libtrace/Manifest
index aadc21caa6f2..ce89ee5017f9 100644
--- a/net-libs/libtrace/Manifest
+++ b/net-libs/libtrace/Manifest
@@ -1 +1,2 @@
 DIST libtrace-3.0.22.tar.bz2 642284 SHA256 b8bbaa2054c69cc8f93066143e2601c09c8ed56e75c6e5e4e2c115d07952f8f8 SHA512 6a9055c6c7f7f65f08eacf111abf72418eb4546ff252362977e4f81a4e6d3a36bf7e2ed6ea988cd6baf6b315d6a5fc1691de364fc7d56e561ae230da77810113 WHIRLPOOL 4c1c6c3faef2049466bd8ad07ea9b1c0462ff78c91278b7ed1e9f0938c16d871c6215b24dbed2a85a942e9a63856a15d082c82174dc40d8eec081d92e33dc8d8
+DIST libtrace-4.0.0-beta.tar.gz 901978 SHA256 d4b75ff078342a065690f9d90fc57d9445143dd4c2e70b1c32d1345101211c50 SHA512 d5a52dd940d14198da0a257e8786be6b00831f30e9528543eb3ac6ab021451c5fd0d47081aaabaeefe23494e0c144fc60c0c9c2a15a14ce3770999afce0a4629 WHIRLPOOL 5e8b7d72a4d709c8973ab83341d229387e2d1e9974e598b86f0f69bc35f249033ca901f4017ebe5f54753d7ffa2348b5f26ded908df14e08dae5bfd88d1a6ed6
diff --git a/net-libs/libtrace/files/libtrace-4.0.0-no-examples.patch b/net-libs/libtrace/files/libtrace-4.0.0-no-examples.patch
new file mode 100644
index 000000000000..8467ffda24b0
--- /dev/null
+++ b/net-libs/libtrace/files/libtrace-4.0.0-no-examples.patch
@@ -0,0 +1,10 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,6 +1,6 @@
+ LIBPACKETDUMP_DIR = libpacketdump
+ TOOLS_DIR = tools
+-SUBDIRS = lib $(LIBPACKETDUMP_DIR) $(TOOLS_DIR) docs examples
++SUBDIRS = lib $(LIBPACKETDUMP_DIR) $(TOOLS_DIR) docs
+ 
+ ACLOCAL_AMFLAGS = -I m4
+ AUTOMAKE_OPTIONS = 1.9 foreign
diff --git a/net-libs/libtrace/files/libtrace-4.0.0-with-numa.patch b/net-libs/libtrace/files/libtrace-4.0.0-with-numa.patch
new file mode 100644
index 000000000000..54e9f54f8dc1
--- /dev/null
+++ b/net-libs/libtrace/files/libtrace-4.0.0-with-numa.patch
@@ -0,0 +1,27 @@
+--- a/configure.in
++++ b/configure.in
+@@ -431,7 +431,23 @@
+         [[#include <linux/if_packet.h>]])
+ 
+ # If we use DPDK we might be able to use libnuma
+-AC_CHECK_LIB(numa, numa_node_to_cpus, have_numa=1, have_numa=0)
++AC_ARG_WITH(numa,
++	AS_HELP_STRING(--with-numa,include NUMA support),
++[
++	if test "$withval" = no
++	then
++		want_numa=no
++	else
++		want_numa=yes
++	fi
++],[
++	# Default to building without NUMA
++	want_numa=yes
++])
++
++if test "$want_numa" != no; then
++	AC_CHECK_LIB(numa, numa_node_to_cpus, have_numa=1, have_numa=0)
++fi
+ 
+ # Checks for various "optional" libraries
+ AC_CHECK_LIB(pthread, pthread_create, have_pthread=1, have_pthread=0)
diff --git a/net-libs/libtrace/libtrace-4.0.0_beta.ebuild b/net-libs/libtrace/libtrace-4.0.0_beta.ebuild
new file mode 100644
index 000000000000..514c42600cfa
--- /dev/null
+++ b/net-libs/libtrace/libtrace-4.0.0_beta.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit autotools eutils
+
+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.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc ncurses numa static-libs"
+
+RDEPEND="
+	>=net-libs/libpcap-0.8
+	dev-libs/openssl:0=
+	ncurses? ( sys-libs/ncurses:0= )
+	numa? ( sys-process/numactl )
+"
+DEPEND="
+	${RDEPEND}
+	app-doc/doxygen
+	sys-devel/flex
+	virtual/pkgconfig
+	virtual/yacc
+"
+PATCHES=(
+		"${FILESDIR}"/${PN}-3.0.20-autoconf-1.13.patch
+		"${FILESDIR}"/${PN}-3.0.20-tinfo.patch
+		"${FILESDIR}"/${PN}-4.0.0-no-examples.patch
+		"${FILESDIR}"/${PN}-4.0.0-with-numa.patch
+)
+S=${WORKDIR}/${P/_beta/}
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable static-libs static) \
+		$(use_with ncurses) \
+		$(use_with numa) \
+		--with-man
+}
+
+src_install() {
+	default
+
+	use doc && dodoc -r docs/doxygen/html
+
+	prune_libtool_files --modules
+}
diff --git a/net-libs/libtrace/metadata.xml b/net-libs/libtrace/metadata.xml
index 74c2baebb4ec..77a8e80f47df 100644
--- a/net-libs/libtrace/metadata.xml
+++ b/net-libs/libtrace/metadata.xml
@@ -5,4 +5,7 @@
 	<email>netmon@gentoo.org</email>
 	<name>Gentoo network monitoring and analysis project</name>
 </maintainer>
+<use>
+<flag name='numa'>Use <pkg>sys-process/numactl</pkg></flag>
+</use>
 </pkgmetadata>