gentoo resync : 16.09.2021

4 files changed, 81 insertions, 5 deletions

diff --git a/net-libs/libtrace/Manifest b/net-libs/libtrace/Manifest
index 6a9ba5f74c0e..3d4b2e218fc0 100644
--- a/net-libs/libtrace/Manifest
+++ b/net-libs/libtrace/Manifest
@@ -3,6 +3,8 @@ AUX libtrace-4.0.0-no-examples.patch 282 BLAKE2B 0a3f3a4a33490a0a7956a1884bfab64
 AUX libtrace-4.0.0-with-numa.patch 655 BLAKE2B ac290763914fb35b0638050183a0bd1e8c99a6b7679715eeaffebb584616baffef7b76a4917f8bfd7b02c3da1720fd0fe77427d84d6a43cd2e67ff2b6b20c493 SHA512 f6d0dbd63b2ca7055d001612c73af3c8f0fc6eaae0c565607d241abfbc9457f3fd739aad5f7933a8b281ebf36f601534a648067a62b0582eb6741fcfdc68d5fe
 AUX libtrace-4.0.9_p1-tinfo.patch 699 BLAKE2B de67795fc21e680a84998b0777dbb9bb8254ec4634cc94ab7903a29b238b1f6b6bd6447d0b63bb48c6404acc2216d06a2fb4ea371cc4179ad323954f6647c033 SHA512 82c86d79c549788665ecd50e4f1a1fb8ceea928585a07ec42b007df57875c57b3fc924395318ee0e7f9cf93faa849f9e86d8eb9ac715e9f113d5a02acebcff7a
 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
 EBUILD libtrace-4.0.15_p1.ebuild 1496 BLAKE2B 88e72d28f4b35dda288f0149ca2c889fc3c3608f2d35b033e1594ca0a46911ab1397a4634548f3e8ed2cdc89ead8e592f648a6e33c3876a19e45e3cbaf67e441 SHA512 7458355a9c04d27d4f048a20be606e7c480de502aa71c006b15ceb2790a618b642212ea488471d710b30e4daea530322256921afc573f2eb4b7ee028742dff75
-EBUILD libtrace-9999.ebuild 1421 BLAKE2B 5b1c43c2134531f0da96b1c3c190d5fb5bf9edf89d7b93ad3899b6d50d40623e785198a084c211752aa8252231b3ee5440b1cfd0a3fd54be754ba9eb3a3666f0 SHA512 6a72d1a716c1df9c62581a587bd1881f2c90e221439b195687dc6f0e103f632be365e74582db50e3aef2ac044b23f6e05d895e3c0e6fe46c6d01542f97766148
-MISC metadata.xml 524 BLAKE2B c858b58b91d8a9eaf6a9f421fc5f0cae0b449dc1a6faf817fc497348338ac2f1987660d754fbdb7d16d527ae292a3b42860e6b23f0b08f239f37d2e12ba13968 SHA512 b96b4e9453825d981235e571827231a80e3d969cd8497ef054bc0f9170f1c5b8554ca3340b454c2fe61cdafde325769870cfc7b2211149fee76ddc57e6e5e285
+EBUILD libtrace-4.0.17_p1.ebuild 1475 BLAKE2B 7f565abbfde064b57c025ab153b061bdd6773cd228c092a8040f7058b9615a70c8f7dc19f39f340c4bda5611af5114e65c96e737181513dd31f4992f1aa2256c SHA512 f35d8f786d59410a56c64069adf044027aef6b065b29f6bd1d3992a39a2c702a2f62175b78b276e39531d345d308c1dfbce1ab8607f54147691d356d8cc9fb63
+EBUILD libtrace-9999.ebuild 1400 BLAKE2B 026e83c497d2fa1cd2d5ef6a41aac994dbfe4a10dc6bd7f28b391bf5f4538e9c194e723ed10076425951cfb7fd31ee26ec4be489c90673d4c343b06cb659c476 SHA512 c381dcd69c2a0398c27ffdf4bd4850bd0384153f2514c8edb4bc78461f60ed0bbfaaacf925523d320205ee969acff2691b90d2215ce26f56e6812fe819db4bf4
+MISC metadata.xml 525 BLAKE2B 02976e0d1f606614b5902644f5ee4d6580f6b0db53fb5a348a44a0e653052007a1e9f31bbf8185f0b2fc5cd890ffac517aae512c78625e8f30cdda4223f7a5f3 SHA512 fb048667eb5579363b3a62b1c6b7ac2d1f3e2a25b980f9f485b418dcf9d794f27608de847f7eb444765ef69dfcbcbd710af87f051d492fdb2b21f05a1ff231a8
diff --git a/net-libs/libtrace/libtrace-4.0.17_p1.ebuild b/net-libs/libtrace/libtrace-4.0.17_p1.ebuild
new file mode 100644
index 000000000000..fedc23bfe00e
--- /dev/null
+++ b/net-libs/libtrace/libtrace-4.0.17_p1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2021 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"
+IUSE="doc ncurses numa"
+
+BDEPEND="
+	app-doc/doxygen[dot]
+	sys-devel/flex
+	virtual/os-headers
+	virtual/pkgconfig
+	virtual/yacc
+"
+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}"
+
+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
+)
+
+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
+}
diff --git a/net-libs/libtrace/libtrace-9999.ebuild b/net-libs/libtrace/libtrace-9999.ebuild
index 08a6c74711ba..f8ed9c02d13b 100644
--- a/net-libs/libtrace/libtrace-9999.ebuild
+++ b/net-libs/libtrace/libtrace-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit autotools git-r3
 
@@ -57,7 +57,6 @@ src_configure() {
 	econf \
 		$(use_with ncurses) \
 		$(use_with numa) \
-		--disable-static \
 		--with-man
 }
 
diff --git a/net-libs/libtrace/metadata.xml b/net-libs/libtrace/metadata.xml
index b71b13bfc8d5..1d207d9f057f 100644
--- a/net-libs/libtrace/metadata.xml
+++ b/net-libs/libtrace/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>netmon@gentoo.org</email>