8 files changed, 66 insertions, 271 deletions
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index adc6fb6b8f13..e7f39073ecaf 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/libtrace/Manifest b/net-libs/libtrace/Manifest
index 30eb16e9b652..c848971a43aa 100644
--- a/net-libs/libtrace/Manifest
+++ b/net-libs/libtrace/Manifest
@@ -1,12 +1,7 @@
-AUX libtrace-4.0.18_p1-build-system.patch 4161 BLAKE2B e2811873721fa703e5f2202258e2e943320a601020d6d1172b215917ddb3c0e04b22a2c73c948d64ca7e65716a4f4b7147f49150b607bd6364f4da244db76311 SHA512 cec579934f535ca5f0ae1f32860e13bfc9a5e7f1467d66100be3edb6c10585b2190987d93ab558feb5dd464c85c153faece29fe37f6e2dd8037f240c96ed0040
-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
-EBUILD libtrace-4.0.18_p1.ebuild 1464 BLAKE2B 1fef8a354180d1a9ef7f3f6c9b1db7c9dae0fea452f9594faf1ae6aa3fb494d9b1caeb638741bacb985f723f81c7cd7bd46771e77e0f0f8e7498ecb929359338 SHA512 984f9ce9819e0b3cf67d10212292a2dd8570f8c713d8a21ab528bc101500543e92d64aafeaf212038a4228f4c8bb4689027da7c7cefad0db29e89f729c200356
-EBUILD libtrace-4.0.19_p1.ebuild 1347 BLAKE2B e29cef7b5993fef83ebe2e303accff892b7eb9a2d2eccb0f53277db99e9c0bc0339fdbd469c55acbe310128050a9614289c07f8510655fd1b5a7cde9c6522875 SHA512 1212f042e2169cf09f42da5b8de048a2e2184ce203698ebeb9dfe930658962121a6813764c6a4472f676c402b5890edb60b46e50006e49548d57222b9a176fa8
-EBUILD libtrace-4.0.20.ebuild 1386 BLAKE2B 2196b24de3d5bd44a331e1f685851cc8ce58fc371a81f82ae3e728f8cbc21d6b84426bafc1185b34b515db5afcb271abb41957d27ae6d2b8e8d1cb5b2c94e77d SHA512 16c4bb2fde988ffbf1641f1450a08efc55e576675b450a198549f4c401f7f5cb915b5f5bb0bb32f76e06288bc3590b09df00f8dc83adbc4a45a707a8c68abc53
+DIST libtrace-4.0.26.tar.gz 3737830 BLAKE2B 7d5c76da9176542b8a710a23d2773b47eaa74987de1692ccbb012c1c11b8bc84ef69633342d11e0491896f3d30ba0d28243d6d280303cb01cb7ad484590022ca SHA512 5b3e0f5fec43fb576fc2fe9c418ba4b0b0f5506d76c203b69c33a60975541828c61e38e33edf8422ab656421379ec8d8de868b1e71a04714d7ab42f4938b402c
 EBUILD libtrace-4.0.21.ebuild 1394 BLAKE2B 11497f0bb46e510618010a65e53fa51274ec403aa145b37e200e22b4f60ffc0c2628804338d788ab784d8ed746c30ec604a1ab7878e2c5b4e90d2571b139eda7 SHA512 83f7a2fb91a491a6671417053698b899125f3c63679d40a20d4e30e97cfb9431880098c7ccaff409b66ef9f1bd3928e1abbdaa5c55efc13306b9d166dc19269a
 EBUILD libtrace-4.0.22.ebuild 1394 BLAKE2B 11497f0bb46e510618010a65e53fa51274ec403aa145b37e200e22b4f60ffc0c2628804338d788ab784d8ed746c30ec604a1ab7878e2c5b4e90d2571b139eda7 SHA512 83f7a2fb91a491a6671417053698b899125f3c63679d40a20d4e30e97cfb9431880098c7ccaff409b66ef9f1bd3928e1abbdaa5c55efc13306b9d166dc19269a
+EBUILD libtrace-4.0.26.ebuild 1394 BLAKE2B 11497f0bb46e510618010a65e53fa51274ec403aa145b37e200e22b4f60ffc0c2628804338d788ab784d8ed746c30ec604a1ab7878e2c5b4e90d2571b139eda7 SHA512 83f7a2fb91a491a6671417053698b899125f3c63679d40a20d4e30e97cfb9431880098c7ccaff409b66ef9f1bd3928e1abbdaa5c55efc13306b9d166dc19269a
 MISC metadata.xml 525 BLAKE2B 02976e0d1f606614b5902644f5ee4d6580f6b0db53fb5a348a44a0e653052007a1e9f31bbf8185f0b2fc5cd890ffac517aae512c78625e8f30cdda4223f7a5f3 SHA512 fb048667eb5579363b3a62b1c6b7ac2d1f3e2a25b980f9f485b418dcf9d794f27608de847f7eb444765ef69dfcbcbd710af87f051d492fdb2b21f05a1ff231a8
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.26.ebuild
index 0c4bf1d66107..8e5ea4214918 100644
--- a/net-libs/libtrace/libtrace-4.0.20.ebuild
+++ b/net-libs/libtrace/libtrace-4.0.26.ebuild
@@ -21,7 +21,7 @@ RDEPEND="
 	dev-libs/libyaml
 	dev-libs/openssl:=
 	>=net-libs/libpcap-0.8
-	net-libs/wandio
+	>=net-libs/wandio-4.0.0
 	ncurses? ( sys-libs/ncurses:= )
 	numa? ( sys-process/numactl )"
 DEPEND="${RDEPEND}"
diff --git a/net-libs/wandio/Manifest b/net-libs/wandio/Manifest
index c58fafb5ca0d..5e380c053826 100644
--- a/net-libs/wandio/Manifest
+++ b/net-libs/wandio/Manifest
@@ -1,7 +1,9 @@
 AUX wandio-4.2.3_p1-fix-lz4-check.patch 418 BLAKE2B a728dc17df93a161d2bca3fe964f18a7aad073028794ce06a6dd316d60eec529e392e5c2d7e5e66ab3b6100d4f962b66cb21acb782bde49c3b35707b3909b2ef SHA512 ef8b4c659975a4562e720dfd6b2ad1ddb51086778b0f9100516e442df24cc4d45bfe413727d88619453f4972e8e60ce83fd126cb9f8eb5c5ab21364e51686606
 DIST wandio-4.2.3_p1.tar.gz 15418423 BLAKE2B 1274f10b87964e2dc87ed25a465991b1e4e9211b75fb5ac5a13a0aa535ff30ddfa69059b3d41de7dc758220bda8dd9d02ca7ed31b7c0ca2997641968cc729e48 SHA512 b4bfff9d33010c04826318c560592ee7f7aba9fccd0eba0f29c6294a636971bf4ac5105ffb9addfc22946e7b7234396dafa6c7e0a0d8de3ee1b7e586c069b438
 DIST wandio-4.2.4.tar.gz 15417703 BLAKE2B a4b6f066ac513975c669bd8f57b8791b87a240e6b5a6ad55340a829adfe89b614ab3541cab224e7cc4fb5daf0656108d02de231bce5cb2f1660871d1b3f9c13e SHA512 ac267d8762b38c073a67e7c6b3e7efbd551b668b5b56879c15aefa4ea353b5d86cea0f30acde76be187243843bdb08cae101dea0f346244b07a43a2796a6ca62
+DIST wandio-4.2.6.tar.gz 17183116 BLAKE2B 0097510e5b7a3f8567d687db79185b190c963754b1a856809d37b2665087867f017a3f1d2c03ed404a5471c4680d8e5030458200d908878bcad9d3fd1d902804 SHA512 931bdfe91c8923de52217873d5a12568bcac97b2ab7e4e50f48cd9999d7b3887175885c3f56250b0cd822584bbf4a9262b017ab57ed599ddd288abda1fad9885
 EBUILD wandio-4.2.3_p1-r1.ebuild 1075 BLAKE2B c2b0086b33f6e43826cfba1520bbae67b5b67dc34fb46c2e2d9c08d883d5365d74eea3e113a528bed9285885a97c366f13a624699a45c1c3fdf45fa5e2fa8cd5 SHA512 b3d777a31fab7bf88b76e8823fdaa3771cfd2387119421752ce0d12d0d6f9e6fb0fe99e45628372efde653f2bde962479e2b4f89d33657d547ee264b63a8d651
 EBUILD wandio-4.2.3_p1-r2.ebuild 1216 BLAKE2B 59373a72385eaba7bbc432cea4ed23243e85080fc8b50a3adbe590f01ed50158bbce6545c06b0aa69175f9c57b2b8b546a9366d4268fbcdf52f69ccc972f344b SHA512 cc87484f8b3e523a1b24f72e36ff77d0f23ad26bc5ce3f67ceb18b1a33b4cf2a5458004a74fe51f299429a9c940954878005dc1fcf34f1108feee75044a29a54
 EBUILD wandio-4.2.4.ebuild 1048 BLAKE2B afe570cd54a197cba4bb3346ccfba580a011a163cc7a823568435de341c2bedfcbaf6cd60401bf44c115604d843f8b15a4114210e757a6d231672ec7de407a82 SHA512 c36a05eabbc07b1f892be958b0772b9cd0052d94b38b6fa1a3df9af0317e77bad75d48154f3df5dbac7b3fa29b587fe9dce6aabad77b1697b10faf818bde2d6b
+EBUILD wandio-4.2.6.ebuild 1172 BLAKE2B 412e792b58f99475f3a5a7428c0c434e2a8bd8c4158a8a99136bcebd2e48adb9f365582c534f3905ff8464cf6d186837a7e1b4296ac0b868bf0a5360bbbdc29b SHA512 1b526db3a2be0464ccda2005dce95b7f657f72f06ec20b6daff0a4dd78fcbbbb7e6fc1403b6d7f07be2da23a483a3f1dbca2fa6aaa7a4a09cf1f96a84862b710
 MISC metadata.xml 418 BLAKE2B 8aaf1b4c57c4388146a1a49a45dbbb4d9ead390919e8d50277d0fbd85d3b2337cb9a8321426bfb28b6e32e9e9a6b7c7613ccbc8641de0702b3ecec617df736ea SHA512 69aed4483f5ef7f5b9dc1c4f455cd7701e60925ae6d17fee91a1e4c2fb9988dba44c0255fc879c926c3fa454f7f7c10ab8dd8c4d94041cad5a8a3c92efcb3b58
diff --git a/net-libs/wandio/wandio-4.2.6.ebuild b/net-libs/wandio/wandio-4.2.6.ebuild
new file mode 100644
index 000000000000..dd14502b7512
--- /dev/null
+++ b/net-libs/wandio/wandio-4.2.6.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="C library for simple and efficient file IO"
+HOMEPAGE="https://github.com/LibtraceTeam/wandio"
+SRC_URI="https://github.com/LibtraceTeam/wandio/archive/refs/tags/${PV}-1.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${P}-1
+
+LICENSE="LGPL-3"
+SLOT="0/6"
+KEYWORDS="~amd64 ~x86"
+IUSE="bzip2 http lzma lzo lz4 test zlib zstd"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="test? ( bzip2 lzma lzo lz4 zlib zstd )"
+
+RDEPEND="
+	!<net-libs/libtrace-4
+	bzip2? ( app-arch/bzip2 )
+	lzma? ( app-arch/xz-utils )
+	lzo? ( dev-libs/lzo:2 )
+	lz4? ( app-arch/lz4:= )
+	http? ( net-misc/curl )
+	zlib? ( sys-libs/zlib )
+	zstd? ( app-arch/zstd:= )
+"
+DEPEND="
+	${RDEPEND}
+	test? ( app-arch/lzop )
+"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_with bzip2) \
+		$(use_with http) \
+		$(use_with lzma) \
+		$(use_with lzo) \
+		$(use_with lz4) \
+		$(use_with zlib) \
+		$(use_with zstd)
+}
+
+src_test() {
+	pushd test || die
+
+	"${BROOT}"/bin/bash do-basic-tests.sh || die
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.la' -delete || die
+}