public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: net-libs/libtrace/files/, net-libs/libtrace/
@ 2016-05-05  7:55 Jeroen Roovers
  0 siblings, 0 replies; 8+ messages in thread
From: Jeroen Roovers @ 2016-05-05  7:55 UTC (permalink / raw
  To: gentoo-commits

commit:     4f26c03ee3a8fd79b9efbeca7c77caebc1f1eaf2
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Thu May  5 07:55:17 2016 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Thu May  5 07:55:17 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f26c03e

net-libs/libtrace: Old.

Package-Manager: portage-2.2.28

 net-libs/libtrace/Manifest                         |  1 -
 .../files/libtrace-3.0.20-libwandio-linking.patch  |  8 ----
 net-libs/libtrace/libtrace-3.0.21.ebuild           | 52 ----------------------
 3 files changed, 61 deletions(-)

diff --git a/net-libs/libtrace/Manifest b/net-libs/libtrace/Manifest
index 4351fed..aadc21c 100644
--- a/net-libs/libtrace/Manifest
+++ b/net-libs/libtrace/Manifest
@@ -1,2 +1 @@
-DIST libtrace-3.0.21.tar.bz2 618097 SHA256 965d6224213530565926f22f7c2e5bdd41e89f99ece973444e567e94f895c658 SHA512 f463349372a0b11e138a6c131a0d47e9cae32221df9ab19e59da95c94ad3cecfdd671e455351b8ab5435b343332bf7a56e505d0157d5cd10ec922189f91eedf9 WHIRLPOOL 6a25706c40557c2d701f34fa581da75c00a2eb8634afbf3545cb8dac3c0cec08962d3c0e0ae0ac831e61dbb6ef61481c249c11989be5ea18fe43886547ab823d
 DIST libtrace-3.0.22.tar.bz2 642284 SHA256 b8bbaa2054c69cc8f93066143e2601c09c8ed56e75c6e5e4e2c115d07952f8f8 SHA512 6a9055c6c7f7f65f08eacf111abf72418eb4546ff252362977e4f81a4e6d3a36bf7e2ed6ea988cd6baf6b315d6a5fc1691de364fc7d56e561ae230da77810113 WHIRLPOOL 4c1c6c3faef2049466bd8ad07ea9b1c0462ff78c91278b7ed1e9f0938c16d871c6215b24dbed2a85a942e9a63856a15d082c82174dc40d8eec081d92e33dc8d8

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
deleted file mode 100644
index bed8ad9..0000000
--- a/net-libs/libtrace/files/libtrace-3.0.20-libwandio-linking.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- 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/libtrace-3.0.21.ebuild b/net-libs/libtrace/libtrace-3.0.21.ebuild
deleted file mode 100644
index 4915f52..0000000
--- a/net-libs/libtrace/libtrace-3.0.21.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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
-}


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-libs/libtrace/files/, net-libs/libtrace/
@ 2017-02-28  8:13 Jeroen Roovers
  0 siblings, 0 replies; 8+ messages in thread
From: Jeroen Roovers @ 2017-02-28  8:13 UTC (permalink / raw
  To: gentoo-commits

commit:     e0c65f4377832ca0fab3ba02f26b174263df65b6
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 28 08:12:14 2017 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Tue Feb 28 08:13:12 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0c65f43

net-libs/libtrace: Install most headers in subdir (bug #604660).

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 .../libtrace/files/libtrace-4.0.0-headers.patch    | 14 +++++
 net-libs/libtrace/libtrace-4.0.0-r1.ebuild         | 60 ++++++++++++++++++++++
 2 files changed, 74 insertions(+)

diff --git a/net-libs/libtrace/files/libtrace-4.0.0-headers.patch b/net-libs/libtrace/files/libtrace-4.0.0-headers.patch
new file mode 100644
index 0000000000..589bf97cb0
--- /dev/null
+++ b/net-libs/libtrace/files/libtrace-4.0.0-headers.patch
@@ -0,0 +1,14 @@
+diff --git a/lib/Makefile.am b/lib/Makefile.am
+index 5a5ca35..6c0a8f2 100644
+--- 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.0-r1.ebuild
new file mode 100644
index 0000000000..749f44a964
--- /dev/null
+++ b/net-libs/libtrace/libtrace-4.0.0-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2017 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= )
+	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-headers.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] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-libs/libtrace/files/, net-libs/libtrace/
@ 2019-07-16  5:10 Jeroen Roovers
  0 siblings, 0 replies; 8+ messages in thread
From: Jeroen Roovers @ 2019-07-16  5:10 UTC (permalink / raw
  To: gentoo-commits

commit:     d3180931653885af380d2d8ecdec5ac8c4c72331
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 16 04:46:47 2019 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Tue Jul 16 05:10:22 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3180931

net-libs/libtrace: Version 4.0.9_p1

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>

 net-libs/libtrace/Manifest                         |  1 +
 .../libtrace/files/libtrace-4.0.9_p1-tinfo.patch   | 30 +++++++++++
 net-libs/libtrace/libtrace-4.0.9_p1.ebuild         | 60 ++++++++++++++++++++++
 3 files changed, 91 insertions(+)

diff --git a/net-libs/libtrace/Manifest b/net-libs/libtrace/Manifest
index 33319711baf..1a4af61f679 100644
--- a/net-libs/libtrace/Manifest
+++ b/net-libs/libtrace/Manifest
@@ -1,3 +1,4 @@
 DIST libtrace-4.0.6.tar.gz 969315 BLAKE2B 812100d7f0fe3def44404372c7b2287a2a9c9b3831cc2e3dee30cff0946d959089d44f201ba74aba57246242153e634806d899a108e18f195f5b6bfde8c0043c SHA512 8f888f57e4436d1aa7fc030212f7b356c58848151873569aa372c6cbcf62c5dd1ece4ecc5a98f6dbe8dc84a39d19abcbe42ff240282054b45cfce0c8ba048f16
 DIST libtrace-4.0.7.tar.gz 992013 BLAKE2B 24f2f684f58eb197ab7f117a5c2c97c0744b4ddfc210088058440148773066e64414766f7e1296c5520345b2a18f2b420215521ee169c74537f2f3ead92c9503 SHA512 3cfc2a47c7402e9ddd3821a7a435edfbb27b718c656400283fd5fa6f4137ede4acefbbd0390aab68e4140a6eb9f93b8df6726df484a79749798302ed3ae5165d
 DIST libtrace-4.0.8.tar.gz 1000829 BLAKE2B 943c3f800045c93880657e96173de0eff6ecbaab5ba22e8f29ad35363a3bdbb88a81d5c8c98e2750caff2cbe1b4590dd18bf924cc0520b041e54c1e17b8eb290 SHA512 10179a19c03d13451b088cd0678718bec3e3be2355c561d289a88457c7819a790c28094f7c3d95143bd3f16260f91fb6df465429375c7625d2ca0c696204de3b
+DIST libtrace-4.0.9_p1.tar.gz 1853724 BLAKE2B 2c2c8f44c5dea7c5acb3c3035cf8f749f1f33b03dd20675062718176ed26cba16c91f67df39512fb369896798edbe3f48e5624c72229bd00fc845712f8faf3cb SHA512 aa9e15322e507e01d9b51f6945772deba7673816c62546de30539792d7353b31235ae97866637f84969582e7300b634d080ba29a8cb088f5304a438e79357e57

diff --git a/net-libs/libtrace/files/libtrace-4.0.9_p1-tinfo.patch b/net-libs/libtrace/files/libtrace-4.0.9_p1-tinfo.patch
new file mode 100644
index 00000000000..e79f7cf82f9
--- /dev/null
+++ b/net-libs/libtrace/files/libtrace-4.0.9_p1-tinfo.patch
@@ -0,0 +1,30 @@
+--- 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
+@@ -79,6 +79,8 @@
+ AC_CHECK_PROGS(YACC, 'bison -y' byacc yacc) 
+ AM_PROG_LEX
+ 
++PKG_PROG_PKG_CONFIG
++
+ # All our source files for function replacements are in lib/
+ AC_CONFIG_LIBOBJ_DIR(lib)
+ 
+@@ -645,6 +663,8 @@
+ 	fi
+ fi
+ 
++PKG_CHECK_MODULES(ncurses,ncurses,have_ncurses=yes,have_ncurses=no)
++
+ AC_ARG_WITH([ncurses],
+ 	AC_HELP_STRING([--with-ncurses], [build tracetop (requires ncurses)]))
+ 

diff --git a/net-libs/libtrace/libtrace-4.0.9_p1.ebuild b/net-libs/libtrace/libtrace-4.0.9_p1.ebuild
new file mode 100644
index 00000000000..1c1a3c50f73
--- /dev/null
+++ b/net-libs/libtrace/libtrace-4.0.9_p1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools
+
+DESCRIPTION="A library and tools for trace processing"
+HOMEPAGE="https://research.wand.net.nz/software/libtrace.php"
+SRC_URI="https://github.com/${PN^}Team/${PN}/archive//${PV/_p/-}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc ncurses numa static-libs"
+
+RDEPEND="
+	>=net-libs/libpcap-0.8
+	dev-libs/libyaml
+	dev-libs/openssl:0=
+	net-libs/wandio
+	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}-4.0.0-no-examples.patch
+		"${FILESDIR}"/${PN}-4.0.0-with-numa.patch
+		"${FILESDIR}"/${PN}-4.0.9_p1-tinfo.patch
+)
+S=${WORKDIR}/${P/_p/-}
+
+src_prepare() {
+cp -av configure.in{,.orig} || die
+	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
+
+	find "${D}" -name "*.la" -delete || die
+}


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-libs/libtrace/files/, net-libs/libtrace/
@ 2019-08-20  9:02 Jeroen Roovers
  0 siblings, 0 replies; 8+ messages in thread
From: Jeroen Roovers @ 2019-08-20  9:02 UTC (permalink / raw
  To: gentoo-commits

commit:     7f7c94aee5a43251ac2812993d0c7ab51f0d17a2
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 20 09:01:15 2019 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Tue Aug 20 09:02:26 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f7c94ae

net-libs/libtrace: Add include for SIOCGSTAMP definition

Package-Manager: Portage-2.3.72, Repoman-2.3.17
Fixes: https://bugs.gentoo.org/692430
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>

 .../files/libtrace-4.0.9_p1-SIOCGSTAMP.patch       | 12 +++++
 net-libs/libtrace/libtrace-4.0.9_p1-r1.ebuild      | 61 ++++++++++++++++++++++
 2 files changed, 73 insertions(+)

diff --git a/net-libs/libtrace/files/libtrace-4.0.9_p1-SIOCGSTAMP.patch b/net-libs/libtrace/files/libtrace-4.0.9_p1-SIOCGSTAMP.patch
new file mode 100644
index 00000000000..0693601356b
--- /dev/null
+++ b/net-libs/libtrace/files/libtrace-4.0.9_p1-SIOCGSTAMP.patch
@@ -0,0 +1,12 @@
+diff --git a/lib/format_linux_common.h b/lib/format_linux_common.h
+index 244144b1..b6a66d30 100644
+--- a/lib/format_linux_common.h
++++ b/lib/format_linux_common.h
+@@ -44,6 +44,7 @@
+ #include <netpacket/packet.h>
+ #include <net/ethernet.h>
+ #include <net/if_arp.h>
++#include <linux/sockios.h>
+ 
+ #include <net/if.h>
+ #include <sys/ioctl.h>

diff --git a/net-libs/libtrace/libtrace-4.0.9_p1-r1.ebuild b/net-libs/libtrace/libtrace-4.0.9_p1-r1.ebuild
new file mode 100644
index 00000000000..84bdf221362
--- /dev/null
+++ b/net-libs/libtrace/libtrace-4.0.9_p1-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools
+
+DESCRIPTION="A library and tools for trace processing"
+HOMEPAGE="https://research.wand.net.nz/software/libtrace.php"
+SRC_URI="https://github.com/${PN^}Team/${PN}/archive//${PV/_p/-}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc ncurses numa static-libs"
+
+RDEPEND="
+	>=net-libs/libpcap-0.8
+	dev-libs/libyaml
+	dev-libs/openssl:0=
+	net-libs/wandio
+	ncurses? ( sys-libs/ncurses:0= )
+	numa? ( sys-process/numactl )
+"
+DEPEND="
+	${RDEPEND}
+	app-doc/doxygen
+	sys-devel/flex
+	virtual/os-headers
+	virtual/pkgconfig
+	virtual/yacc
+"
+PATCHES=(
+		"${FILESDIR}"/${PN}-3.0.20-autoconf-1.13.patch
+		"${FILESDIR}"/${PN}-4.0.0-no-examples.patch
+		"${FILESDIR}"/${PN}-4.0.0-with-numa.patch
+		"${FILESDIR}"/${PN}-4.0.9_p1-tinfo.patch
+		"${FILESDIR}"/${PN}-4.0.9_p1-SIOCGSTAMP.patch
+)
+S=${WORKDIR}/${P/_p/-}
+
+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
+
+	find "${D}" -name "*.la" -delete || die
+}


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-libs/libtrace/files/, net-libs/libtrace/
@ 2019-11-07  8:28 Jeroen Roovers
  0 siblings, 0 replies; 8+ messages in thread
From: Jeroen Roovers @ 2019-11-07  8:28 UTC (permalink / raw
  To: gentoo-commits

commit:     72f53ba422210dcba14be63f92eb6f9752e99010
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Thu Nov  7 08:14:42 2019 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Thu Nov  7 08:28:28 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72f53ba4

net-libs/libtrace: Old

Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>

 net-libs/libtrace/Manifest                         |  1 -
 .../libtrace/files/libtrace-3.0.20-tinfo.patch     | 21 --------
 net-libs/libtrace/libtrace-4.0.8.ebuild            | 59 ---------------------
 net-libs/libtrace/libtrace-4.0.9_p1.ebuild         | 60 ----------------------
 4 files changed, 141 deletions(-)

diff --git a/net-libs/libtrace/Manifest b/net-libs/libtrace/Manifest
index 7d9dbe7a1a2..07ec945f28e 100644
--- a/net-libs/libtrace/Manifest
+++ b/net-libs/libtrace/Manifest
@@ -1,3 +1,2 @@
 DIST libtrace-4.0.10_p1.tar.gz 1855110 BLAKE2B c2b59b52e65ed2227bf87517c1c439498f15823f5df745ef4e16800a3676afa3328c42809c3cb891d5e534990620ae1766b7863b3e1c010227182d9caa727ce3 SHA512 a76c8566c9b06b38ea7c7cfcea896beb23808686af9485dc80b8858c20c7a425f0869f18899fa7ad3e685c25c6c0d2bc7a934724d500211966d01b37964018a0
-DIST libtrace-4.0.8.tar.gz 1000829 BLAKE2B 943c3f800045c93880657e96173de0eff6ecbaab5ba22e8f29ad35363a3bdbb88a81d5c8c98e2750caff2cbe1b4590dd18bf924cc0520b041e54c1e17b8eb290 SHA512 10179a19c03d13451b088cd0678718bec3e3be2355c561d289a88457c7819a790c28094f7c3d95143bd3f16260f91fb6df465429375c7625d2ca0c696204de3b
 DIST libtrace-4.0.9_p1.tar.gz 1853724 BLAKE2B 2c2c8f44c5dea7c5acb3c3035cf8f749f1f33b03dd20675062718176ed26cba16c91f67df39512fb369896798edbe3f48e5624c72229bd00fc845712f8faf3cb SHA512 aa9e15322e507e01d9b51f6945772deba7673816c62546de30539792d7353b31235ae97866637f84969582e7300b634d080ba29a8cb088f5304a438e79357e57

diff --git a/net-libs/libtrace/files/libtrace-3.0.20-tinfo.patch b/net-libs/libtrace/files/libtrace-3.0.20-tinfo.patch
deleted file mode 100644
index 9bda8a43b6b..00000000000
--- a/net-libs/libtrace/files/libtrace-3.0.20-tinfo.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- 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-4.0.8.ebuild b/net-libs/libtrace/libtrace-4.0.8.ebuild
deleted file mode 100644
index 907621355b7..00000000000
--- a/net-libs/libtrace/libtrace-4.0.8.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools
-
-DESCRIPTION="A library and tools for trace processing"
-HOMEPAGE="https://research.wand.net.nz/software/libtrace.php"
-SRC_URI="https://research.wand.net.nz/software/${PN}/${P/_/-}.tar.gz"
-
-LICENSE="LGPL-3"
-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/os-headers
-	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
-
-	find "${D}" -name "*.la" -delete || die
-}

diff --git a/net-libs/libtrace/libtrace-4.0.9_p1.ebuild b/net-libs/libtrace/libtrace-4.0.9_p1.ebuild
deleted file mode 100644
index 4b4153bf1f2..00000000000
--- a/net-libs/libtrace/libtrace-4.0.9_p1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools
-
-DESCRIPTION="A library and tools for trace processing"
-HOMEPAGE="https://research.wand.net.nz/software/libtrace.php"
-SRC_URI="https://github.com/${PN^}Team/${PN}/archive//${PV/_p/-}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc ncurses numa static-libs"
-
-RDEPEND="
-	>=net-libs/libpcap-0.8
-	dev-libs/libyaml
-	dev-libs/openssl:0=
-	net-libs/wandio
-	ncurses? ( sys-libs/ncurses:0= )
-	numa? ( sys-process/numactl )
-"
-DEPEND="
-	${RDEPEND}
-	app-doc/doxygen
-	sys-devel/flex
-	virtual/os-headers
-	virtual/pkgconfig
-	virtual/yacc
-"
-PATCHES=(
-		"${FILESDIR}"/${PN}-3.0.20-autoconf-1.13.patch
-		"${FILESDIR}"/${PN}-4.0.0-no-examples.patch
-		"${FILESDIR}"/${PN}-4.0.0-with-numa.patch
-		"${FILESDIR}"/${PN}-4.0.9_p1-tinfo.patch
-)
-S=${WORKDIR}/${P/_p/-}
-
-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
-
-	find "${D}" -name "*.la" -delete || die
-}


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-libs/libtrace/files/, net-libs/libtrace/
@ 2020-02-15 11:05 Jeroen Roovers
  0 siblings, 0 replies; 8+ messages in thread
From: Jeroen Roovers @ 2020-02-15 11:05 UTC (permalink / raw
  To: gentoo-commits

commit:     c3daff4b4b6046e9f99eaa62fc3b96e48479258e
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 15 11:04:26 2020 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sat Feb 15 11:04:55 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3daff4b

net-libs/libtrace: Old

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>

 net-libs/libtrace/Manifest                         |  1 -
 .../files/libtrace-4.0.9_p1-SIOCGSTAMP.patch       | 12 -----
 net-libs/libtrace/libtrace-4.0.9_p1-r1.ebuild      | 61 ----------------------
 3 files changed, 74 deletions(-)

diff --git a/net-libs/libtrace/Manifest b/net-libs/libtrace/Manifest
index 6987cc9b38a..6e8a6dca44d 100644
--- a/net-libs/libtrace/Manifest
+++ b/net-libs/libtrace/Manifest
@@ -1,3 +1,2 @@
 DIST libtrace-4.0.10_p1.tar.gz 1855110 BLAKE2B c2b59b52e65ed2227bf87517c1c439498f15823f5df745ef4e16800a3676afa3328c42809c3cb891d5e534990620ae1766b7863b3e1c010227182d9caa727ce3 SHA512 a76c8566c9b06b38ea7c7cfcea896beb23808686af9485dc80b8858c20c7a425f0869f18899fa7ad3e685c25c6c0d2bc7a934724d500211966d01b37964018a0
 DIST libtrace-4.0.11_p1.tar.gz 1855693 BLAKE2B 9135b03258005587ef2e2b51c6e8c87bb2fb4963489b1ce5933c46100d708fa32978fc5b449ffde11fc6c27706afd36a82428cc55f0555a864ffad636f9c991d SHA512 b3cab7d24efe4503358f2265957170b0857f52c4ea2bac0d5424fe3b9565ead51795596ce28410e15741d89e3ba1db3c22046557a3e5b21af8c1b6f8ed9cd585
-DIST libtrace-4.0.9_p1.tar.gz 1853724 BLAKE2B 2c2c8f44c5dea7c5acb3c3035cf8f749f1f33b03dd20675062718176ed26cba16c91f67df39512fb369896798edbe3f48e5624c72229bd00fc845712f8faf3cb SHA512 aa9e15322e507e01d9b51f6945772deba7673816c62546de30539792d7353b31235ae97866637f84969582e7300b634d080ba29a8cb088f5304a438e79357e57

diff --git a/net-libs/libtrace/files/libtrace-4.0.9_p1-SIOCGSTAMP.patch b/net-libs/libtrace/files/libtrace-4.0.9_p1-SIOCGSTAMP.patch
deleted file mode 100644
index 0693601356b..00000000000
--- a/net-libs/libtrace/files/libtrace-4.0.9_p1-SIOCGSTAMP.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/lib/format_linux_common.h b/lib/format_linux_common.h
-index 244144b1..b6a66d30 100644
---- a/lib/format_linux_common.h
-+++ b/lib/format_linux_common.h
-@@ -44,6 +44,7 @@
- #include <netpacket/packet.h>
- #include <net/ethernet.h>
- #include <net/if_arp.h>
-+#include <linux/sockios.h>
- 
- #include <net/if.h>
- #include <sys/ioctl.h>

diff --git a/net-libs/libtrace/libtrace-4.0.9_p1-r1.ebuild b/net-libs/libtrace/libtrace-4.0.9_p1-r1.ebuild
deleted file mode 100644
index 0055faaec1a..00000000000
--- a/net-libs/libtrace/libtrace-4.0.9_p1-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools
-
-DESCRIPTION="A library and tools for trace processing"
-HOMEPAGE="https://research.wand.net.nz/software/libtrace.php"
-SRC_URI="https://github.com/${PN^}Team/${PN}/archive//${PV/_p/-}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc ncurses numa static-libs"
-
-RDEPEND="
-	>=net-libs/libpcap-0.8
-	dev-libs/libyaml
-	dev-libs/openssl:0=
-	net-libs/wandio
-	ncurses? ( sys-libs/ncurses:0= )
-	numa? ( sys-process/numactl )
-"
-DEPEND="
-	${RDEPEND}
-	app-doc/doxygen[dot]
-	sys-devel/flex
-	virtual/os-headers
-	virtual/pkgconfig
-	virtual/yacc
-"
-PATCHES=(
-		"${FILESDIR}"/${PN}-3.0.20-autoconf-1.13.patch
-		"${FILESDIR}"/${PN}-4.0.0-no-examples.patch
-		"${FILESDIR}"/${PN}-4.0.0-with-numa.patch
-		"${FILESDIR}"/${PN}-4.0.9_p1-tinfo.patch
-		"${FILESDIR}"/${PN}-4.0.9_p1-SIOCGSTAMP.patch
-)
-S=${WORKDIR}/${P/_p/-}
-
-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
-
-	find "${D}" -name "*.la" -delete || die
-}


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-libs/libtrace/files/, net-libs/libtrace/
@ 2022-02-08  5:43 Sam James
  0 siblings, 0 replies; 8+ messages in thread
From: Sam James @ 2022-02-08  5:43 UTC (permalink / raw
  To: gentoo-commits

commit:     2ded35bffa1a01d8bc96328701814aa8566d9507
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Feb  8 05:30:07 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Feb  8 05:42:19 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ded35bf

net-libs/libtrace: add 4.0.18_p1

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-libs/libtrace/Manifest                         |   1 +
 .../files/libtrace-4.0.18_p1-build-system.patch    | 133 +++++++++++++++++++++
 net-libs/libtrace/libtrace-4.0.18_p1.ebuild        |  70 +++++++++++
 3 files changed, 204 insertions(+)

diff --git a/net-libs/libtrace/Manifest b/net-libs/libtrace/Manifest
index 53a961ba3b97..b1de7ff5ca58 100644
--- a/net-libs/libtrace/Manifest
+++ b/net-libs/libtrace/Manifest
@@ -1,2 +1,3 @@
 DIST libtrace-4.0.15_p1.tar.gz 1891845 BLAKE2B 08faf395f5fdda21829b89a9276649b297d2266ef10d2162b588b39d4d8d2da1306c74bb180d63b92f4422bb157fb451d34cd8167f0bff42322776e3b1ee0e7c SHA512 82f18b03e824f3ac89330854c3659244106ab5323f5e7a43ec7d2280f6ad3d427a906708688469b3f5aa479d11fef99a4bbecea585b81c916029132375582a4e
 DIST libtrace-4.0.17_p1.tar.gz 1961123 BLAKE2B be961bc58496414415b9affb0a6b77e5f234b92196fb719f3a2e8058ae80ade90977c44d57c75d37cbf26ff2e0c8816a4b376b77b6e44d13833960c6095b7e2c SHA512 85280edd515acf52361c34ebe5324fd95f4fafc72aa22c2c8bd43a6bca9a6b5fc9a046480fc760bb39d8b577532ed416caf10a630cea9465d305f2ed4dcb318e
+DIST libtrace-4.0.18_p1.tar.gz 1963425 BLAKE2B fdacd4a44f899dc49fe9571d8e695cd726ea07d1c0595bd7c1f59d53721bd5610126924323c9c7098caf65276219e61265e5e05f23b4a92ae6377268c618202f SHA512 fc2979fa56b0eee25149a3571d0a06e2a46ab6d6fa419b2fc37635ebcf4a8814250005c4dfc5dddb5fb6aa9c74161ab4f475a037e021388054bb62f414b9c5d2

diff --git a/net-libs/libtrace/files/libtrace-4.0.18_p1-build-system.patch b/net-libs/libtrace/files/libtrace-4.0.18_p1-build-system.patch
new file mode 100644
index 000000000000..b536302c30b9
--- /dev/null
+++ b/net-libs/libtrace/files/libtrace-4.0.18_p1-build-system.patch
@@ -0,0 +1,133 @@
+https://github.com/LibtraceTeam/libtrace/pull/201
+
+From dde6c39e5808f06f1450b03e7c682edb0f1290cf Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Tue, 8 Feb 2022 05:30:32 +0000
+Subject: [PATCH 1/3] build: fix bashism in configure
+
+configures have a shebang of #!/bin/sh so need to work with a POSIX-compliant
+shell; let's use = instead of == which will have the same effect on both Bash
+and said shells (like dash).
+
+Signed-off-by: Sam James <sam@gentoo.org>
+---
+ configure.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.in b/configure.in
+index 95d63fdc..dbbaabb7 100644
+--- a/configure.in
++++ b/configure.in
+@@ -305,7 +305,7 @@ AC_ARG_WITH(xdp, AS_HELP_STRING(--with-xdp, include XDP capture support),
+ 
+ if test "$want_xdp" != no; then
+     AC_CHECK_LIB(elf, elf_begin, elffound=1, elffound=0)
+-    if test "$elffound" == 1; then
++    if test "$elffound" = 1; then
+         # check for libbpf
+         AC_CHECK_LIB(bpf, xsk_socket__create, bpffound=1, bpffound=0, -lelf)
+ 
+
+From 1525a42b386da02bda3982cf6e8b472f57f8ac34 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Tue, 8 Feb 2022 05:32:59 +0000
+Subject: [PATCH 2/3] build: make NUMA support optional
+
+This avoids an 'automagic dependency' [0] on NUMA. This is helpful for
+downstreams to ensure we don't miss dependencies or when we may not
+want to enable support for a feature even though a dependency is enabled.
+
+Gentoo has shipped this patch for quite some time.
+
+[0] https://wiki.gentoo.org/wiki/Project:Quality_Assurance/Automagic_dependencies
+
+Signed-off-by: Sam James <sam@gentoo.org>
+---
+ configure.in | 18 +++++++++++++++++-
+ 1 file changed, 17 insertions(+), 1 deletion(-)
+
+diff --git a/configure.in b/configure.in
+index dbbaabb7..6fbff150 100644
+--- a/configure.in
++++ b/configure.in
+@@ -518,7 +518,23 @@ AC_CHECK_DECL([PACKET_FANOUT],
+         [[#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
+ 
+ # Need libwandder for ETSI live decoding
+ AC_CHECK_LIB(wandder, init_wandder_decoder, have_wandder=1, have_wandder=0)
+
+From 153254413ae3cd6a62ee7d8b5eae189e84ebc066 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Tue, 8 Feb 2022 05:34:05 +0000
+Subject: [PATCH 3/3] build: use pkg-config to find ncurses
+
+ncurses can be built in a variety of configurations, but the motivating case
+for Gentoo was "split tinfo" where libtinfo is no longer included within
+libncurses.
+
+Use pkg-config to find where ncurses is installed and the required libraries
+needed to link against it (which will include -ltinfo if required).
+
+We've been shipping this patch in Gentoo for quite some time.
+
+Signed-off-by: Sam James <sam@gentoo.org>
+---
+ configure.in               | 4 ++++
+ tools/tracetop/Makefile.am | 2 +-
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/configure.in b/configure.in
+index 6fbff150..cbb94d55 100644
+--- a/configure.in
++++ b/configure.in
+@@ -79,6 +79,8 @@ AC_PROG_INSTALL
+ AC_CHECK_PROGS(YACC, 'bison -y' byacc yacc) 
+ AM_PROG_LEX
+ 
++PKG_PROG_PKG_CONFIG
++
+ # All our source files for function replacements are in lib/
+ AC_CONFIG_LIBOBJ_DIR(lib)
+ 
+@@ -916,6 +918,8 @@ if (test "$use_llvm" != "no"); then
+ 	fi
+ fi
+ 
++PKG_CHECK_MODULES(ncurses,ncurses,have_ncurses=yes,have_ncurses=no)
++
+ AC_ARG_WITH([ncurses],
+ 	AC_HELP_STRING([--with-ncurses], [build tracetop (requires ncurses)]))
+ 
+diff --git a/tools/tracetop/Makefile.am b/tools/tracetop/Makefile.am
+index 2ebbc3a7..a2eb2797 100644
+--- a/tools/tracetop/Makefile.am
++++ b/tools/tracetop/Makefile.am
+@@ -6,6 +6,6 @@ bin_PROGRAMS = tracetop
+ include ../Makefile.tools
+ 
+ tracetop_SOURCES = tracetop.cc
+-tracetop_LDADD = -lncurses 
++tracetop_LDADD = @ncurses_LIBS@
+ tracetop_CPPFLAGS = -fno-strict-aliasing $(AM_CFLAGS)
+ endif
+

diff --git a/net-libs/libtrace/libtrace-4.0.18_p1.ebuild b/net-libs/libtrace/libtrace-4.0.18_p1.ebuild
new file mode 100644
index 000000000000..b43bb405d524
--- /dev/null
+++ b/net-libs/libtrace/libtrace-4.0.18_p1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="A library and tools for trace processing"
+HOMEPAGE="https://research.wand.net.nz/software/libtrace.php"
+SRC_URI="https://github.com/${PN^}Team/${PN}/archive//${PV/_p/-}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${P/_p/-}"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+# doxygen is always needed for man pages, but USE=doc controls installing docs themselves
+# (not man pages)
+IUSE="doc ncurses numa"
+
+RDEPEND=">=net-libs/libpcap-0.8
+	dev-libs/libyaml
+	dev-libs/openssl:=
+	net-libs/wandio
+	ncurses? ( sys-libs/ncurses:= )
+	numa? ( sys-process/numactl )"
+DEPEND="${RDEPEND}"
+BDEPEND="app-doc/doxygen[dot]
+	sys-devel/flex
+	virtual/os-headers
+	virtual/pkgconfig
+	virtual/yacc"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.0.18_p1-build-system.patch
+)
+
+src_prepare() {
+	default
+
+	mv configure.{in,ac} || die
+
+	eautoreconf
+
+	# Comment out FILE_PATTERNS definition (bug #706230)
+	if has_version ~app-doc/doxygen-1.8.16; then
+		sed -i -e '/^FILE_PATTERNS/s|^|#|g' docs/${PN}.doxygen.in || die
+	fi
+
+	# Update doxygen configuration
+	doxygen -u docs/libtrace.doxygen.in || die
+}
+
+src_configure() {
+	econf \
+		$(use_with ncurses) \
+		$(use_with numa) \
+		--with-man \
+		--without-dpdk
+}
+
+src_install() {
+	default
+
+	if use doc ; then
+		docinto html
+		dodoc -r docs/doxygen/html
+	fi
+
+	find "${ED}" -name "*.la" -delete || die
+}


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-libs/libtrace/files/, net-libs/libtrace/
@ 2024-06-23  0:27 Sam James
  0 siblings, 0 replies; 8+ messages in thread
From: Sam James @ 2024-06-23  0:27 UTC (permalink / raw
  To: gentoo-commits

commit:     1fd0c8d87cc68a9e4a8089a28882a93a59d76f58
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 22 23:35:37 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jun 23 00:27:05 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1fd0c8d8

net-libs/libtrace: drop 4.0.18_p1, 4.0.19_p1, 4.0.20

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-libs/libtrace/Manifest                         |   3 -
 .../files/libtrace-4.0.18_p1-build-system.patch    | 133 ---------------------
 net-libs/libtrace/libtrace-4.0.18_p1.ebuild        |  70 -----------
 net-libs/libtrace/libtrace-4.0.19_p1.ebuild        |  60 ----------
 net-libs/libtrace/libtrace-4.0.20.ebuild           |  69 -----------
 5 files changed, 335 deletions(-)

diff --git a/net-libs/libtrace/Manifest b/net-libs/libtrace/Manifest
index 8c71405cbb5c..ff01c907b5a6 100644
--- a/net-libs/libtrace/Manifest
+++ b/net-libs/libtrace/Manifest
@@ -1,5 +1,2 @@
-DIST libtrace-4.0.18_p1.tar.gz 1963425 BLAKE2B fdacd4a44f899dc49fe9571d8e695cd726ea07d1c0595bd7c1f59d53721bd5610126924323c9c7098caf65276219e61265e5e05f23b4a92ae6377268c618202f SHA512 fc2979fa56b0eee25149a3571d0a06e2a46ab6d6fa419b2fc37635ebcf4a8814250005c4dfc5dddb5fb6aa9c74161ab4f475a037e021388054bb62f414b9c5d2
-DIST libtrace-4.0.19.tar.bz2 844871 BLAKE2B ff55935b46fb2193ae2e4ab10971d0983da18be20a52a18664f0e72cb829ab444a22e00aeedbd2df85aebbcd6b8352636c559e55d05466a599cc332f018f14ad SHA512 f2744337b4dcff8fc782cd90e44ea6f21cfe120840f626dfac365d3ffaecb82bfdd04a35458b67f663addc1f7ae792c5b0ec7538ed90a2deb386586bc55e1c54
-DIST libtrace-4.0.20.tar.gz 3722006 BLAKE2B f68ededebef71673d6e3a655cb116a5a6d4cdee05ba5150edd85abd45863460208715ebb5eab3ee29254864f0130a594649db0baed99f7ced5d1d968472a595b SHA512 b4d00f0d6f8286eff9bac5408bd10244922f4ab262e3dec5dd6f0984ec9f538ab5ac6e554686e33f92168d687275629ec1725d4ebb7c491fe4bdaffd57058fc0
 DIST libtrace-4.0.21.tar.gz 3741856 BLAKE2B c7178cdf9721dbbce423d38236ee1fe470f32b86af393c10600a326dfbd2e84f28df27584d4ed99590c00cb8042d4472782712024c4398b95e954565d50c33fc SHA512 0215488a36c6bcb5619d01f6f73f42c14d63b291233c3cf2668434f78e0d60c1faac6bb1f7927cdd6448771e5c0de8e1012dcc954c8815763079f5ebd0abe601
 DIST libtrace-4.0.22.tar.gz 3742482 BLAKE2B bdba49d04b354ea075fbd21933b8ad5ecb187836cb13cf95ac8a4c89abbf0c90741696b41dc91924f52a6443e5dee34075b3200cbaf99acacfd43834887df655 SHA512 ecb2a275419e659d05149c64cad2e27caba5b3920188a3eef2df6323785eeaa11677c206ce7d9bcea593d970be95ad9e2019b37642c08d7fec9e0daac9d8681f

diff --git a/net-libs/libtrace/files/libtrace-4.0.18_p1-build-system.patch b/net-libs/libtrace/files/libtrace-4.0.18_p1-build-system.patch
deleted file mode 100644
index b536302c30b9..000000000000
--- a/net-libs/libtrace/files/libtrace-4.0.18_p1-build-system.patch
+++ /dev/null
@@ -1,133 +0,0 @@
-https://github.com/LibtraceTeam/libtrace/pull/201
-
-From dde6c39e5808f06f1450b03e7c682edb0f1290cf Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Tue, 8 Feb 2022 05:30:32 +0000
-Subject: [PATCH 1/3] build: fix bashism in configure
-
-configures have a shebang of #!/bin/sh so need to work with a POSIX-compliant
-shell; let's use = instead of == which will have the same effect on both Bash
-and said shells (like dash).
-
-Signed-off-by: Sam James <sam@gentoo.org>
----
- configure.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.in b/configure.in
-index 95d63fdc..dbbaabb7 100644
---- a/configure.in
-+++ b/configure.in
-@@ -305,7 +305,7 @@ AC_ARG_WITH(xdp, AS_HELP_STRING(--with-xdp, include XDP capture support),
- 
- if test "$want_xdp" != no; then
-     AC_CHECK_LIB(elf, elf_begin, elffound=1, elffound=0)
--    if test "$elffound" == 1; then
-+    if test "$elffound" = 1; then
-         # check for libbpf
-         AC_CHECK_LIB(bpf, xsk_socket__create, bpffound=1, bpffound=0, -lelf)
- 
-
-From 1525a42b386da02bda3982cf6e8b472f57f8ac34 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Tue, 8 Feb 2022 05:32:59 +0000
-Subject: [PATCH 2/3] build: make NUMA support optional
-
-This avoids an 'automagic dependency' [0] on NUMA. This is helpful for
-downstreams to ensure we don't miss dependencies or when we may not
-want to enable support for a feature even though a dependency is enabled.
-
-Gentoo has shipped this patch for quite some time.
-
-[0] https://wiki.gentoo.org/wiki/Project:Quality_Assurance/Automagic_dependencies
-
-Signed-off-by: Sam James <sam@gentoo.org>
----
- configure.in | 18 +++++++++++++++++-
- 1 file changed, 17 insertions(+), 1 deletion(-)
-
-diff --git a/configure.in b/configure.in
-index dbbaabb7..6fbff150 100644
---- a/configure.in
-+++ b/configure.in
-@@ -518,7 +518,23 @@ AC_CHECK_DECL([PACKET_FANOUT],
-         [[#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
- 
- # Need libwandder for ETSI live decoding
- AC_CHECK_LIB(wandder, init_wandder_decoder, have_wandder=1, have_wandder=0)
-
-From 153254413ae3cd6a62ee7d8b5eae189e84ebc066 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Tue, 8 Feb 2022 05:34:05 +0000
-Subject: [PATCH 3/3] build: use pkg-config to find ncurses
-
-ncurses can be built in a variety of configurations, but the motivating case
-for Gentoo was "split tinfo" where libtinfo is no longer included within
-libncurses.
-
-Use pkg-config to find where ncurses is installed and the required libraries
-needed to link against it (which will include -ltinfo if required).
-
-We've been shipping this patch in Gentoo for quite some time.
-
-Signed-off-by: Sam James <sam@gentoo.org>
----
- configure.in               | 4 ++++
- tools/tracetop/Makefile.am | 2 +-
- 2 files changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/configure.in b/configure.in
-index 6fbff150..cbb94d55 100644
---- a/configure.in
-+++ b/configure.in
-@@ -79,6 +79,8 @@ AC_PROG_INSTALL
- AC_CHECK_PROGS(YACC, 'bison -y' byacc yacc) 
- AM_PROG_LEX
- 
-+PKG_PROG_PKG_CONFIG
-+
- # All our source files for function replacements are in lib/
- AC_CONFIG_LIBOBJ_DIR(lib)
- 
-@@ -916,6 +918,8 @@ if (test "$use_llvm" != "no"); then
- 	fi
- fi
- 
-+PKG_CHECK_MODULES(ncurses,ncurses,have_ncurses=yes,have_ncurses=no)
-+
- AC_ARG_WITH([ncurses],
- 	AC_HELP_STRING([--with-ncurses], [build tracetop (requires ncurses)]))
- 
-diff --git a/tools/tracetop/Makefile.am b/tools/tracetop/Makefile.am
-index 2ebbc3a7..a2eb2797 100644
---- a/tools/tracetop/Makefile.am
-+++ b/tools/tracetop/Makefile.am
-@@ -6,6 +6,6 @@ bin_PROGRAMS = tracetop
- include ../Makefile.tools
- 
- tracetop_SOURCES = tracetop.cc
--tracetop_LDADD = -lncurses 
-+tracetop_LDADD = @ncurses_LIBS@
- tracetop_CPPFLAGS = -fno-strict-aliasing $(AM_CFLAGS)
- endif
-

diff --git a/net-libs/libtrace/libtrace-4.0.18_p1.ebuild b/net-libs/libtrace/libtrace-4.0.18_p1.ebuild
deleted file mode 100644
index 404ec0be0516..000000000000
--- a/net-libs/libtrace/libtrace-4.0.18_p1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-DESCRIPTION="A library and tools for trace processing"
-HOMEPAGE="https://research.wand.net.nz/software/libtrace.php"
-SRC_URI="https://github.com/${PN^}Team/${PN}/archive//${PV/_p/-}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${P/_p/-}"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-# doxygen is always needed for man pages, but USE=doc controls installing docs themselves
-# (not man pages)
-IUSE="doc ncurses numa"
-
-RDEPEND=">=net-libs/libpcap-0.8
-	dev-libs/libyaml
-	dev-libs/openssl:=
-	net-libs/wandio
-	ncurses? ( sys-libs/ncurses:= )
-	numa? ( sys-process/numactl )"
-DEPEND="${RDEPEND}"
-BDEPEND="app-text/doxygen[dot]
-	app-alternatives/lex
-	virtual/os-headers
-	virtual/pkgconfig
-	app-alternatives/yacc"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.0.18_p1-build-system.patch
-)
-
-src_prepare() {
-	default
-
-	mv configure.{in,ac} || die
-
-	eautoreconf
-
-	# Comment out FILE_PATTERNS definition (bug #706230)
-	if has_version ~app-text/doxygen-1.8.16; then
-		sed -i -e '/^FILE_PATTERNS/s|^|#|g' docs/${PN}.doxygen.in || die
-	fi
-
-	# Update doxygen configuration
-	doxygen -u docs/libtrace.doxygen.in || die
-}
-
-src_configure() {
-	econf \
-		$(use_with ncurses) \
-		$(use_with numa) \
-		--with-man \
-		--without-dpdk
-}
-
-src_install() {
-	default
-
-	if use doc ; then
-		docinto html
-		dodoc -r docs/doxygen/html
-	fi
-
-	find "${ED}" -name "*.la" -delete || die
-}

diff --git a/net-libs/libtrace/libtrace-4.0.19_p1.ebuild b/net-libs/libtrace/libtrace-4.0.19_p1.ebuild
deleted file mode 100644
index da401f1ea38b..000000000000
--- a/net-libs/libtrace/libtrace-4.0.19_p1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="A library and tools for trace processing"
-HOMEPAGE="https://research.wand.net.nz/software/libtrace.php"
-SRC_URI="https://research.wand.net.nz/software/libtrace/${PN}-$(ver_cut 1-3).tar.bz2"
-S="${WORKDIR}"/${PN}-$(ver_cut 1-3)
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-# doxygen is always needed for man pages, but USE=doc controls installing docs themselves
-# (not man pages)
-IUSE="doc ncurses numa"
-
-RDEPEND=">=net-libs/libpcap-0.8
-	dev-libs/libyaml
-	dev-libs/openssl:=
-	net-libs/wandio
-	ncurses? ( sys-libs/ncurses:= )
-	numa? ( sys-process/numactl )"
-DEPEND="${RDEPEND}"
-BDEPEND="app-text/doxygen[dot]
-	app-alternatives/lex
-	virtual/os-headers
-	virtual/pkgconfig
-	app-alternatives/yacc"
-
-src_prepare() {
-	default
-
-	# Comment out FILE_PATTERNS definition (bug #706230)
-	if has_version ~app-text/doxygen-1.8.16; then
-		sed -i -e '/^FILE_PATTERNS/s|^|#|g' docs/${PN}.doxygen.in || die
-	fi
-
-	# Update doxygen configuration
-	doxygen -u docs/libtrace.doxygen.in || die
-}
-
-src_configure() {
-	econf \
-		$(use_with ncurses) \
-		$(use_with numa) \
-		--with-man \
-		--without-dpdk
-}
-
-src_install() {
-	default
-
-	if use doc ; then
-		docinto html
-		dodoc -r docs/doxygen/html
-	fi
-
-	find "${ED}" -name "*.la" -delete || die
-}

diff --git a/net-libs/libtrace/libtrace-4.0.20.ebuild b/net-libs/libtrace/libtrace-4.0.20.ebuild
deleted file mode 100644
index 0c4bf1d66107..000000000000
--- a/net-libs/libtrace/libtrace-4.0.20.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-DESCRIPTION="A library and tools for trace processing"
-HOMEPAGE="https://github.com/LibtraceTeam/libtrace"
-SRC_URI="https://github.com/LibtraceTeam/libtrace/archive/refs/tags/${PV}-1.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}"/${P}-1
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-# doxygen is always needed for man pages, but USE=doc controls installing docs themselves
-# (not man pages)
-IUSE="doc ncurses numa"
-
-RDEPEND="
-	dev-libs/libyaml
-	dev-libs/openssl:=
-	>=net-libs/libpcap-0.8
-	net-libs/wandio
-	ncurses? ( sys-libs/ncurses:= )
-	numa? ( sys-process/numactl )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	app-text/doxygen[dot]
-	sys-devel/flex
-	virtual/os-headers
-	virtual/pkgconfig
-	app-alternatives/yacc
-"
-
-src_prepare() {
-	default
-
-	eautoreconf
-
-	# Comment out FILE_PATTERNS definition (bug #706230)
-	if has_version ~app-text/doxygen-1.8.16; then
-		sed -i -e '/^FILE_PATTERNS/s|^|#|g' docs/${PN}.doxygen.in || die
-	fi
-
-	# Update doxygen configuration
-	doxygen -u docs/libtrace.doxygen.in || die
-}
-
-src_configure() {
-	export LEX=flex
-
-	econf \
-		$(use_with ncurses) \
-		$(use_with numa) \
-		--with-man \
-		--without-dpdk
-}
-
-src_install() {
-	default
-
-	if use doc ; then
-		docinto html
-		dodoc -r docs/doxygen/html
-	fi
-
-	find "${ED}" -name "*.la" -delete || die
-}


^ permalink raw reply related	[flat|nested] 8+ messages in thread
end of thread, other threads:[~2024-06-23  0:27 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-08-20  9:02 [gentoo-commits] repo/gentoo:master commit in: net-libs/libtrace/files/, net-libs/libtrace/ Jeroen Roovers
  -- strict thread matches above, loose matches on Subject: below --
2024-06-23  0:27 Sam James
2022-02-08  5:43 Sam James
2020-02-15 11:05 Jeroen Roovers
2019-11-07  8:28 Jeroen Roovers
2019-07-16  5:10 Jeroen Roovers
2017-02-28  8:13 Jeroen Roovers
2016-05-05  7:55 Jeroen Roovers

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox