* [gentoo-commits] repo/gentoo:master commit in: net-libs/libtrace/, net-libs/libtrace/files/
@ 2016-08-31 4:54 Jeroen Roovers
0 siblings, 0 replies; 3+ messages in thread
From: Jeroen Roovers @ 2016-08-31 4:54 UTC (permalink / raw
To: gentoo-commits
commit: f40658bc7798d20eb5fb9b698a249ccbe92a4614
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 31 04:53:37 2016 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Wed Aug 31 04:54:20 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f40658bc
net-libs/libtrace: Version bump.
Package-Manager: portage-2.3.0
net-libs/libtrace/Manifest | 1 +
.../files/libtrace-4.0.0-no-examples.patch | 10 ++++
.../libtrace/files/libtrace-4.0.0-with-numa.patch | 27 ++++++++++
net-libs/libtrace/libtrace-4.0.0_beta.ebuild | 58 ++++++++++++++++++++++
net-libs/libtrace/metadata.xml | 3 ++
5 files changed, 99 insertions(+)
diff --git a/net-libs/libtrace/Manifest b/net-libs/libtrace/Manifest
index aadc21c..ce89ee5 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 00000000..8467ffd
--- /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 00000000..54e9f54
--- /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 00000000..514c426
--- /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 74c2bae..77a8e80 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>
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-libs/libtrace/, net-libs/libtrace/files/
@ 2017-03-07 8:48 Jeroen Roovers
0 siblings, 0 replies; 3+ messages in thread
From: Jeroen Roovers @ 2017-03-07 8:48 UTC (permalink / raw
To: gentoo-commits
commit: b30cbff24cfe2d5cb0e6e965a64d327f813d258f
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 7 08:44:34 2017 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Tue Mar 7 08:47:58 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b30cbff2
net-libs/libtrace: Version bump.
Package-Manager: Portage-2.3.4, Repoman-2.3.1
net-libs/libtrace/Manifest | 1 +
| 14 --------------
.../{libtrace-4.0.0-r1.ebuild => libtrace-4.0.1.ebuild} | 1 -
3 files changed, 1 insertion(+), 15 deletions(-)
diff --git a/net-libs/libtrace/Manifest b/net-libs/libtrace/Manifest
index 791f673c2db..0fc945a9ee2 100644
--- a/net-libs/libtrace/Manifest
+++ b/net-libs/libtrace/Manifest
@@ -1,2 +1,3 @@
DIST libtrace-3.0.22.tar.bz2 642284 SHA256 b8bbaa2054c69cc8f93066143e2601c09c8ed56e75c6e5e4e2c115d07952f8f8 SHA512 6a9055c6c7f7f65f08eacf111abf72418eb4546ff252362977e4f81a4e6d3a36bf7e2ed6ea988cd6baf6b315d6a5fc1691de364fc7d56e561ae230da77810113 WHIRLPOOL 4c1c6c3faef2049466bd8ad07ea9b1c0462ff78c91278b7ed1e9f0938c16d871c6215b24dbed2a85a942e9a63856a15d082c82174dc40d8eec081d92e33dc8d8
DIST libtrace-4.0.0.tar.gz 912224 SHA256 50c072f12ae809107b0a11c930c1766067756b2c419a31f571898198ab6ddc63 SHA512 a75ab22162e2b68ce0aa70f04d3f1e51a80ef4bfd3b84ce10fb7d921a40459cc29693122b6f7eca6bcb680693ea3ff7c3b289d91ae7ed0b353cd779cabaa5093 WHIRLPOOL 1aaad61c9880846dc6e423e58505888db82257ec05bf574b7be273ea5aa5258999539bb639ca9bc45e9fcf4ff0220665f9084d152dd414d23f9ea121219484d4
+DIST libtrace-4.0.1.tar.gz 914773 SHA256 27a123480324658e719b6c8ecb27e5d4c2bb11513965a2015854d56567f97dcb SHA512 ef8c0fc5b07f2af2960d7be32bca9b8025357366e09977df8472abd957324a66f932f010acae01f1657bfe9dd917a880daef6c12ecb9a9b2cf7b74bd0d52be14 WHIRLPOOL 237a16a7dca30dc53e9eb7019c630878135d3f107c85c359b6ba355b5a3317ec68e2c3cfd21afafdf12cae44bf81f51dbcb3c6e6ebad79088a89e96e772a7bdf
diff --git a/net-libs/libtrace/files/libtrace-4.0.0-headers.patch b/net-libs/libtrace/files/libtrace-4.0.0-headers.patch
deleted file mode 100644
index 1834f690533..00000000000
--- a/net-libs/libtrace/files/libtrace-4.0.0-headers.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-https://github.com/wanduow/libtrace/commit/cff18196808f8369d7825aa1d60de86236bce0df
-
---- a/lib/Makefile.am
-+++ b/lib/Makefile.am
-@@ -1,6 +1,7 @@
- lib_LTLIBRARIES = libtrace.la
--include_HEADERS = libtrace.h dagformat.h lt_inttypes.h daglegacy.h \
-- rt_protocol.h erftypes.h libtrace_parallel.h \
-+include_HEADERS = libtrace.h libtrace_parallel.h
-+pkginclude_HEADERS = dagformat.h lt_inttypes.h daglegacy.h \
-+ rt_protocol.h erftypes.h \
- data-struct/ring_buffer.h data-struct/object_cache.h \
- data-struct/vector.h data-struct/message_queue.h \
- data-struct/deque.h data-struct/linked_list.h \
diff --git a/net-libs/libtrace/libtrace-4.0.0-r1.ebuild b/net-libs/libtrace/libtrace-4.0.1.ebuild
similarity index 96%
rename from net-libs/libtrace/libtrace-4.0.0-r1.ebuild
rename to net-libs/libtrace/libtrace-4.0.1.ebuild
index 5725879b0b2..bb592018d47 100644
--- a/net-libs/libtrace/libtrace-4.0.0-r1.ebuild
+++ b/net-libs/libtrace/libtrace-4.0.1.ebuild
@@ -30,7 +30,6 @@ DEPEND="
PATCHES=(
"${FILESDIR}"/${PN}-3.0.20-autoconf-1.13.patch
"${FILESDIR}"/${PN}-3.0.20-tinfo.patch
- "${FILESDIR}"/${PN}-4.0.0-headers.patch
"${FILESDIR}"/${PN}-4.0.0-no-examples.patch
"${FILESDIR}"/${PN}-4.0.0-with-numa.patch
)
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-libs/libtrace/, net-libs/libtrace/files/
@ 2017-11-18 10:43 Jeroen Roovers
0 siblings, 0 replies; 3+ messages in thread
From: Jeroen Roovers @ 2017-11-18 10:43 UTC (permalink / raw
To: gentoo-commits
commit: 592ad0a9c75abf672f29b28cbd1a4c931c65de3e
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 18 10:42:25 2017 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sat Nov 18 10:43:28 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=592ad0a9
net-libs/libtrace: Old.
Package-Manager: Portage-2.3.14, Repoman-2.3.6
net-libs/libtrace/Manifest | 2 -
.../files/libtrace-3.0.20-no-examples.patch | 11 ----
net-libs/libtrace/libtrace-3.0.22.ebuild | 51 -------------------
net-libs/libtrace/libtrace-4.0.0.ebuild | 58 ----------------------
4 files changed, 122 deletions(-)
diff --git a/net-libs/libtrace/Manifest b/net-libs/libtrace/Manifest
index 9b2cf71e7cc..bbff0116212 100644
--- a/net-libs/libtrace/Manifest
+++ b/net-libs/libtrace/Manifest
@@ -1,4 +1,2 @@
-DIST libtrace-3.0.22.tar.bz2 642284 SHA256 b8bbaa2054c69cc8f93066143e2601c09c8ed56e75c6e5e4e2c115d07952f8f8 SHA512 6a9055c6c7f7f65f08eacf111abf72418eb4546ff252362977e4f81a4e6d3a36bf7e2ed6ea988cd6baf6b315d6a5fc1691de364fc7d56e561ae230da77810113 WHIRLPOOL 4c1c6c3faef2049466bd8ad07ea9b1c0462ff78c91278b7ed1e9f0938c16d871c6215b24dbed2a85a942e9a63856a15d082c82174dc40d8eec081d92e33dc8d8
-DIST libtrace-4.0.0.tar.gz 912224 SHA256 50c072f12ae809107b0a11c930c1766067756b2c419a31f571898198ab6ddc63 SHA512 a75ab22162e2b68ce0aa70f04d3f1e51a80ef4bfd3b84ce10fb7d921a40459cc29693122b6f7eca6bcb680693ea3ff7c3b289d91ae7ed0b353cd779cabaa5093 WHIRLPOOL 1aaad61c9880846dc6e423e58505888db82257ec05bf574b7be273ea5aa5258999539bb639ca9bc45e9fcf4ff0220665f9084d152dd414d23f9ea121219484d4
DIST libtrace-4.0.1.tar.gz 914773 SHA256 27a123480324658e719b6c8ecb27e5d4c2bb11513965a2015854d56567f97dcb SHA512 ef8c0fc5b07f2af2960d7be32bca9b8025357366e09977df8472abd957324a66f932f010acae01f1657bfe9dd917a880daef6c12ecb9a9b2cf7b74bd0d52be14 WHIRLPOOL 237a16a7dca30dc53e9eb7019c630878135d3f107c85c359b6ba355b5a3317ec68e2c3cfd21afafdf12cae44bf81f51dbcb3c6e6ebad79088a89e96e772a7bdf
DIST libtrace-4.0.2.tar.gz 934255 SHA256 2f7c461d6353cdf97f0678fe044949622d88fe636b7df596d6757e0f55fac32f SHA512 246fb1812b9c46b7ef543c16159849bb420db633b0778a375f616286cc26988d42542dcecd47256c03d637ceaa97d60168f0ce34b9892d957a3bcae89d984514 WHIRLPOOL 63efc25e0355b61e5ca3155871e17aed95a526f38964b78ae4b255f89d835824e4a22eb369d7047ff72091ba4416d99c760e97bdce607ba0d2235301aba63c08
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
deleted file mode 100644
index 57983d03611..00000000000
--- a/net-libs/libtrace/files/libtrace-3.0.20-no-examples.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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/libtrace-3.0.22.ebuild b/net-libs/libtrace/libtrace-3.0.22.ebuild
deleted file mode 100644
index 068127a118a..00000000000
--- a/net-libs/libtrace/libtrace-3.0.22.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-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.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
- virtual/pkgconfig"
-
-src_prepare() {
- epatch \
- "${FILESDIR}"/${PN}-3.0.20-autoconf-1.13.patch \
- "${FILESDIR}"/${PN}-3.0.20-no-examples.patch \
- "${FILESDIR}"/${PN}-3.0.20-tinfo.patch
-
- 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-4.0.0.ebuild b/net-libs/libtrace/libtrace-4.0.0.ebuild
deleted file mode 100644
index bb592018d47..00000000000
--- a/net-libs/libtrace/libtrace-4.0.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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= )
- net-libs/wandio
- 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
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-11-18 10:43 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-03-07 8:48 [gentoo-commits] repo/gentoo:master commit in: net-libs/libtrace/, net-libs/libtrace/files/ Jeroen Roovers
-- strict thread matches above, loose matches on Subject: below --
2017-11-18 10:43 Jeroen Roovers
2016-08-31 4:54 Jeroen Roovers
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox