6 files changed, 130 insertions, 2 deletions
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index cc01efb1ddac..3df31aff32d9 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/libtrace/Manifest b/net-libs/libtrace/Manifest
index 35acf20c0296..e9178fe2b037 100644
--- a/net-libs/libtrace/Manifest
+++ b/net-libs/libtrace/Manifest
@@ -1,6 +1,8 @@
 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
 EBUILD libtrace-4.0.18_p1.ebuild 1447 BLAKE2B fc83d13a6c55acd782ecf7323a3015362587586f27b0ed08e1bba0ec690efecb44625d11575fbbbf71b0ad8909bbce33b88bac192a2d3f78814597725c4da363 SHA512 e04d235323a8eb091ee9ac37af8e899db41cddeab1421ebd738e55561288f8abca4aa221a53248174e9aa679fc743915b52ccaf5ca7011ba9db6977c231a5e80
 EBUILD libtrace-4.0.19_p1.ebuild 1330 BLAKE2B 7f3e772a189d6c4b29bf838255aa2d6471ec302ced31da63b26206dd77476f63620a11dfcc71c00d20cbec2b5be046f29f96f62b7c221afd5039a721cc8276be SHA512 e4490b390d92f78d2e40b7ff34c28e4db5e35e33b9e16d2b153ac07c991a940d3356fb2db58091f3c9f27476a1cd4f3a8fe1f051b888f237c736abb443dc875a
+EBUILD libtrace-4.0.20.ebuild 1357 BLAKE2B 2f742317d43dffe6876d3a0d97a563ac61e9453ec9987ca2fd6e634f81e07e913c5eb43df662eac20caa367a10ed6c469c1a10c2d0709f4cef253ac76ef0f14f SHA512 77e8e51ac0b19937b7174ddb19241abbf6363dee253a7c2b8f1336585ca0c65bd7f99ea3f3c56dc7cd734dcc9943a0ff76f04c619dc194ff3bd64e99dd3abb23
 MISC metadata.xml 525 BLAKE2B 02976e0d1f606614b5902644f5ee4d6580f6b0db53fb5a348a44a0e653052007a1e9f31bbf8185f0b2fc5cd890ffac517aae512c78625e8f30cdda4223f7a5f3 SHA512 fb048667eb5579363b3a62b1c6b7ac2d1f3e2a25b980f9f485b418dcf9d794f27608de847f7eb444765ef69dfcbcbd710af87f051d492fdb2b21f05a1ff231a8
diff --git a/net-libs/libtrace/libtrace-4.0.20.ebuild b/net-libs/libtrace/libtrace-4.0.20.ebuild
new file mode 100644
index 000000000000..fcc866df083d
--- /dev/null
+++ b/net-libs/libtrace/libtrace-4.0.20.ebuild
@@ -0,0 +1,67 @@
+# 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://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-doc/doxygen[dot]
+	sys-devel/flex
+	virtual/os-headers
+	virtual/pkgconfig
+	virtual/yacc
+"
+
+src_prepare() {
+	default
+
+	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
+}
diff --git a/net-libs/wandio/Manifest b/net-libs/wandio/Manifest
index 617a5d1fb085..c58fafb5ca0d 100644
--- a/net-libs/wandio/Manifest
+++ b/net-libs/wandio/Manifest
@@ -1,5 +1,7 @@
 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
 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
-MISC metadata.xml 413 BLAKE2B 928bdd9e84f02a894ce36b6db96f7b842736f79f77b9152f98af110c9b8f2fca60ae45e0860ed7e3fc6c035c469fc0baf1c115a96d776d1d8df5e645626a952c SHA512 27b9579f785dcf1717c606e771b9e492889a6d97b0be2904a505adb83460e8ceb322d9432fa3a72d2bf2232a9eacb528807cb4eec4b20f1ab68c85b0007b1523
+EBUILD wandio-4.2.4.ebuild 1048 BLAKE2B afe570cd54a197cba4bb3346ccfba580a011a163cc7a823568435de341c2bedfcbaf6cd60401bf44c115604d843f8b15a4114210e757a6d231672ec7de407a82 SHA512 c36a05eabbc07b1f892be958b0772b9cd0052d94b38b6fa1a3df9af0317e77bad75d48154f3df5dbac7b3fa29b587fe9dce6aabad77b1697b10faf818bde2d6b
+MISC metadata.xml 418 BLAKE2B 8aaf1b4c57c4388146a1a49a45dbbb4d9ead390919e8d50277d0fbd85d3b2337cb9a8321426bfb28b6e32e9e9a6b7c7613ccbc8641de0702b3ecec617df736ea SHA512 69aed4483f5ef7f5b9dc1c4f455cd7701e60925ae6d17fee91a1e4c2fb9988dba44c0255fc879c926c3fa454f7f7c10ab8dd8c4d94041cad5a8a3c92efcb3b58
diff --git a/net-libs/wandio/metadata.xml b/net-libs/wandio/metadata.xml
index a41dd862c997..f8af6549e574 100644
--- a/net-libs/wandio/metadata.xml
+++ b/net-libs/wandio/metadata.xml
@@ -8,6 +8,6 @@
 		<flag name="http">Build support for reading files over HTTP using <pkg>net-misc/curl</pkg></flag>
 	</use>
 	<upstream>
-		<remote-id type="github">wanduow/wandio</remote-id>
+		<remote-id type="github">LibtraceTeam/wandio</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/net-libs/wandio/wandio-4.2.4.ebuild b/net-libs/wandio/wandio-4.2.4.ebuild
new file mode 100644
index 000000000000..dbad39f516a9
--- /dev/null
+++ b/net-libs/wandio/wandio-4.2.4.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2022 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 test zlib"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="test? ( lzma lzo )"
+
+RDEPEND="
+	!<net-libs/libtrace-4
+	bzip2? ( app-arch/bzip2 )
+	lzma? ( app-arch/xz-utils )
+	lzo? ( dev-libs/lzo )
+	http? ( net-misc/curl )
+	zlib? ( sys-libs/zlib )
+"
+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 zlib)
+}
+
+src_test() {
+	pushd test || die
+
+	"${BROOT}"/bin/bash do-basic-tests.sh || die
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.la' -delete || die
+}