gentoo resync : 17.02.2020

5 files changed, 27 insertions, 20 deletions

diff --git a/net-libs/libtrace/Manifest b/net-libs/libtrace/Manifest
index 632402a03957..509a07ee4ee2 100644
--- a/net-libs/libtrace/Manifest
+++ b/net-libs/libtrace/Manifest
@@ -1,11 +1,10 @@
 AUX libtrace-3.0.20-autoconf-1.13.patch 219 BLAKE2B 5b342005bc1004c0d85a59e4e815a33f6d5cd21fc3bebe1e31a26ac3b17be27c4e3a5bd7b379bcc42705438b657576e28b597eaae786aa2319972f587b07e790 SHA512 6335e63cdf537700a60f8eeae940d963d582e9373e1ea6a14b7960a52e1c61464785134ec14bbe49ededf7554f0715fdb4d59565d1c9870f8a0bc5524538286e
 AUX libtrace-4.0.0-no-examples.patch 282 BLAKE2B 0a3f3a4a33490a0a7956a1884bfab647f9498c655b394c68505bb6a9677da98b3dd62b5b499e13c6be4d975cef68b95ba2874aa08edd9f121bf1f637829581d7 SHA512 f000efc2de1e46db5fa486e3640eaea95389f09e22c46b903de2e88d8f13e2421951a9f46f9cf90f5989cbd7f55cc0e16e8e038c872241d624219b8e85b86f2d
 AUX libtrace-4.0.0-with-numa.patch 655 BLAKE2B ac290763914fb35b0638050183a0bd1e8c99a6b7679715eeaffebb584616baffef7b76a4917f8bfd7b02c3da1720fd0fe77427d84d6a43cd2e67ff2b6b20c493 SHA512 f6d0dbd63b2ca7055d001612c73af3c8f0fc6eaae0c565607d241abfbc9457f3fd739aad5f7933a8b281ebf36f601534a648067a62b0582eb6741fcfdc68d5fe
-AUX libtrace-4.0.9_p1-SIOCGSTAMP.patch 339 BLAKE2B 6faa812fa2c70eb6144e0750d937196c1e252ae5d3f04751fef3f5198d662b89920823af554007c88600ade0b735bf8caaafa636ca810cacaae51e9d7a7da010 SHA512 208a64062828757737f43cff85e8468df6816fb747aadfcc3d6747efe43a9846b737a0a416ce70d91e74e9ecdec7217f094740803942a809206ccf1c29d0484d
 AUX libtrace-4.0.9_p1-tinfo.patch 699 BLAKE2B de67795fc21e680a84998b0777dbb9bb8254ec4634cc94ab7903a29b238b1f6b6bd6447d0b63bb48c6404acc2216d06a2fb4ea371cc4179ad323954f6647c033 SHA512 82c86d79c549788665ecd50e4f1a1fb8ceea928585a07ec42b007df57875c57b3fc924395318ee0e7f9cf93faa849f9e86d8eb9ac715e9f113d5a02acebcff7a
 DIST libtrace-4.0.10_p1.tar.gz 1855110 BLAKE2B c2b59b52e65ed2227bf87517c1c439498f15823f5df745ef4e16800a3676afa3328c42809c3cb891d5e534990620ae1766b7863b3e1c010227182d9caa727ce3 SHA512 a76c8566c9b06b38ea7c7cfcea896beb23808686af9485dc80b8858c20c7a425f0869f18899fa7ad3e685c25c6c0d2bc7a934724d500211966d01b37964018a0
-DIST libtrace-4.0.9_p1.tar.gz 1853724 BLAKE2B 2c2c8f44c5dea7c5acb3c3035cf8f749f1f33b03dd20675062718176ed26cba16c91f67df39512fb369896798edbe3f48e5624c72229bd00fc845712f8faf3cb SHA512 aa9e15322e507e01d9b51f6945772deba7673816c62546de30539792d7353b31235ae97866637f84969582e7300b634d080ba29a8cb088f5304a438e79357e57
-EBUILD libtrace-4.0.10_p1.ebuild 1188 BLAKE2B 86e71cf293e917c642cd7cab5dc84d313d59523e4c39d4cf0dc631379425567d5a1a3473b5141e580c79fe9d2142d986d50f70b2d1f4a415cf5c2fe2f54363d4 SHA512 2306fcaf9c073c5fc1efd2ba65f53a9a1cff8422219ebdd4e7cac417f1f054a34012227a36c6276677855ef326435ced8010f681b10981f134b8b493a6bd62be
-EBUILD libtrace-4.0.9_p1-r1.ebuild 1236 BLAKE2B 9c3de6e6ed4995e5c6416a45aa736de57d1f59718e8f2a7b0a11b31ab78d603ab4724e8b20571bab824127dcf251a26aa3f1cce12e1cb8ae5bba601d51b26bf1 SHA512 dfa06db00e1f91edef9a85e7676c037909fe6284048960e6eb00b13a4b1e30e78044d3fe62c330b5dcd6ea9f26ac2dd6656a55f64a901289f0baa6904875fef4
-EBUILD libtrace-99999.ebuild 1182 BLAKE2B 7cd21d10ca7bca0a6b8127cd1f65aa9ff3707960f85c5ce458e58d0ee60000809a431bff1a20543e1ff63e3410e3ebd0d5e640e41bf1171c1781a39541f18a6c SHA512 142000611b9971a25fe6154e10eb68a03d226c0c0452f7d23855dbad93a92df59ac6cc58d188b6e73adaec25d3601833d81063733b8c4259e013accec044ccd7
+DIST libtrace-4.0.11_p1.tar.gz 1855693 BLAKE2B 9135b03258005587ef2e2b51c6e8c87bb2fb4963489b1ce5933c46100d708fa32978fc5b449ffde11fc6c27706afd36a82428cc55f0555a864ffad636f9c991d SHA512 b3cab7d24efe4503358f2265957170b0857f52c4ea2bac0d5424fe3b9565ead51795596ce28410e15741d89e3ba1db3c22046557a3e5b21af8c1b6f8ed9cd585
+EBUILD libtrace-4.0.10_p1.ebuild 1436 BLAKE2B 48b5edfc059a42aec53086ec8f82a120713821ee866d06e21ab933e623d95b6909fbb6d759fafe01f23136ef04d9f4909e30305dcff315e06b302e7eb67f9095 SHA512 8ca52d6c350def6509ddc100bceb788b6b3c4552b80ea243422c3d55cdd231be8d7fb785324e284dd9050b48213b9530c1ff6756dee76b90c738eb10e404d8ac
+EBUILD libtrace-4.0.11_p1.ebuild 1436 BLAKE2B 48b5edfc059a42aec53086ec8f82a120713821ee866d06e21ab933e623d95b6909fbb6d759fafe01f23136ef04d9f4909e30305dcff315e06b302e7eb67f9095 SHA512 8ca52d6c350def6509ddc100bceb788b6b3c4552b80ea243422c3d55cdd231be8d7fb785324e284dd9050b48213b9530c1ff6756dee76b90c738eb10e404d8ac
+EBUILD libtrace-99999.ebuild 1422 BLAKE2B bf1e1d0ff2bd0c9cd8932ba643152f47b1f3a402f528ea0cd822a02b8e7bde6d500296b569fc4a9b16590c21b277b0a2f30323471f6ab0e7f6ea40ee9f5026b3 SHA512 7a61a58ea0a678f56a1e79da53673b257a1f2bea232ddc3b359756996b888f1b1a48763ed9e312ab6c62176c1976e0ce72918a34428e40e1ec398e9d17be54cc
 MISC metadata.xml 349 BLAKE2B 848cf78c8b1c684331f7d0e4ffc027c3b2db879910b09b6573dfc5c19669e783a98a19e70a56d205dd2a256c7dfe3ab7e3cf411642674da0462f9f46510f4466 SHA512 4cb73fcfe0a021f618da0281bf492f407459d637e7f58ccb5a698f3612f9c8c19ca90d1449f17c9c6c47694b6a19ac8c5c80a285b1662208c6c18de51afb0ac4
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 0693601356b2..000000000000
--- 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.10_p1.ebuild b/net-libs/libtrace/libtrace-4.0.10_p1.ebuild
index 3aa5b658572d..68a537141188 100644
--- a/net-libs/libtrace/libtrace-4.0.10_p1.ebuild
+++ b/net-libs/libtrace/libtrace-4.0.10_p1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -41,6 +41,13 @@ 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() {
diff --git a/net-libs/libtrace/libtrace-4.0.9_p1-r1.ebuild b/net-libs/libtrace/libtrace-4.0.11_p1.ebuild
index 0055faaec1ad..68a537141188 100644
--- a/net-libs/libtrace/libtrace-4.0.9_p1-r1.ebuild
+++ b/net-libs/libtrace/libtrace-4.0.11_p1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -34,7 +34,6 @@ PATCHES=(
 		"${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/-}
 
@@ -42,6 +41,13 @@ 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() {
diff --git a/net-libs/libtrace/libtrace-99999.ebuild b/net-libs/libtrace/libtrace-99999.ebuild
index 6f692e15713c..68144574adea 100644
--- a/net-libs/libtrace/libtrace-99999.ebuild
+++ b/net-libs/libtrace/libtrace-99999.ebuild
@@ -7,6 +7,7 @@ inherit autotools git-r3
 DESCRIPTION="A library and tools for trace processing"
 HOMEPAGE="https://research.wand.net.nz/software/libtrace.php"
 EGIT_REPO_URI="https://github.com/LibtraceTeam/libtrace"
+EGIT_SUBMODULES=()
 
 LICENSE="LGPL-3"
 SLOT="0"
@@ -15,6 +16,7 @@ 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= )
@@ -41,6 +43,11 @@ src_prepare() {
 
 	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
 }