gentoo resync : 10.11.2019

6 files changed, 7 insertions, 89 deletions

diff --git a/net-libs/libtrace/Manifest b/net-libs/libtrace/Manifest
index c98a8059a3c0..d0ca77110c1a 100644
--- a/net-libs/libtrace/Manifest
+++ b/net-libs/libtrace/Manifest
@@ -1,13 +1,11 @@
 AUX libtrace-3.0.20-autoconf-1.13.patch 219 BLAKE2B 5b342005bc1004c0d85a59e4e815a33f6d5cd21fc3bebe1e31a26ac3b17be27c4e3a5bd7b379bcc42705438b657576e28b597eaae786aa2319972f587b07e790 SHA512 6335e63cdf537700a60f8eeae940d963d582e9373e1ea6a14b7960a52e1c61464785134ec14bbe49ededf7554f0715fdb4d59565d1c9870f8a0bc5524538286e
-AUX libtrace-3.0.20-tinfo.patch 474 BLAKE2B bfbe8126fae0ef132671c24ae4a0a44fa5204e95e7aad330c9b3afcb033e65a95c135b09b054a7741f902b2aefe31fa5b953d62a95bb41ff227b3281956e55c6 SHA512 eb0369b9b8a273e47189b63ac90e9bcfe3a10532343efce8b5ab1d79c84a427dbd6655683c9e7b135978e703567603eec12d1314dd6bb44c91c716d166c9b824
 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.8.tar.gz 1000829 BLAKE2B 943c3f800045c93880657e96173de0eff6ecbaab5ba22e8f29ad35363a3bdbb88a81d5c8c98e2750caff2cbe1b4590dd18bf924cc0520b041e54c1e17b8eb290 SHA512 10179a19c03d13451b088cd0678718bec3e3be2355c561d289a88457c7819a790c28094f7c3d95143bd3f16260f91fb6df465429375c7625d2ca0c696204de3b
+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.8.ebuild 1147 BLAKE2B 6671032674a7a22903830ecc9f2ed9ae8092db6d930a00ac5dc9b57f0f44a42e488997909a5d05ad9b2ecf7f001ec913a6f193e384455707e68b7c2863801349 SHA512 7e7c141d9b4529568401dbc8789ca489ff94390dbc31ec19e9cf3eb633d3ad279400e62279626468141f0c98a1295a265f204622fd7cb1aea363fa0da3237a33
-EBUILD libtrace-4.0.9_p1-r1.ebuild 1231 BLAKE2B b546dddbdeb5fa16e9e463f1bc17742269a66e481871d675ada0e780cf325dff48e09cc3888a29dfd323fc29af4ce755c7043bd8e69300a372bf88fc5a0330da SHA512 3cb7d81477146295aeb8ad0ad9902163eb13151318c1879e18cf7138d3573af93376034c560674c1751a1f2e0068b92c0c9ef1c535a15ad376055a34005bd92f
-EBUILD libtrace-4.0.9_p1.ebuild 1183 BLAKE2B 335894903da0d4c3f7e1d7e22a9f35219aef687f831fa17d5ba752334b0fd73308f92198280a3e86e0802e68ad3c7a20ca32f3c20feaab648ad0595164d8a5c0 SHA512 e42d78f87636f6686e50933698870b508b3d54d5bc4704932b1e0e60de5ab6915965622878c7712b2ac0092daa04a0a57bf637ce0ef939d3586fe2fc7008d89a
-EBUILD libtrace-99999.ebuild 1132 BLAKE2B 8bf7a1a7a87b930c3e5f5da6fe426ed6662a2ec702f7479946cc769901d989e7ecfe4553472b2b96da356ff8c6c9aa5425056629c26a599e17d57be6dd793ff2 SHA512 3dffc3729ecf8222019684d3e3a599e411944bb3597eabea4fa9067d43d98eee0fee681d676e4d6e0b6ae48ffef99d04cda32fda87df3ec6b2ebd2654f279cc6
+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 1137 BLAKE2B 5cac4a82cfce786feb793d812c6b2fea914059dc4b71e040d311a2179519997b92aa923cd59ffaaa7aa1e2b2fbb1ecd687a52a89c448da8811e08612a83d4300 SHA512 efc7190c30c9eecdea3efa4dbafcfcf0082a79d37aeae13f7e0b937c4ea8a48df821961c78dc871955712a129239c23149eae56acb9b7380a0cdf832eb87b9c8
 MISC metadata.xml 349 BLAKE2B 848cf78c8b1c684331f7d0e4ffc027c3b2db879910b09b6573dfc5c19669e783a98a19e70a56d205dd2a256c7dfe3ab7e3cf411642674da0462f9f46510f4466 SHA512 4cb73fcfe0a021f618da0281bf492f407459d637e7f58ccb5a698f3612f9c8c19ca90d1449f17c9c6c47694b6a19ac8c5c80a285b1662208c6c18de51afb0ac4
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 9bda8a43b6b2..000000000000
--- 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.9_p1.ebuild b/net-libs/libtrace/libtrace-4.0.10_p1.ebuild
index 4b4153bf1f2e..3aa5b658572d 100644
--- a/net-libs/libtrace/libtrace-4.0.9_p1.ebuild
+++ b/net-libs/libtrace/libtrace-4.0.10_p1.ebuild
@@ -23,7 +23,7 @@ RDEPEND="
 "
 DEPEND="
 	${RDEPEND}
-	app-doc/doxygen
+	app-doc/doxygen[dot]
 	sys-devel/flex
 	virtual/os-headers
 	virtual/pkgconfig
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 907621355b7f..000000000000
--- 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-r1.ebuild b/net-libs/libtrace/libtrace-4.0.9_p1-r1.ebuild
index 84bdf221362d..0055faaec1ad 100644
--- a/net-libs/libtrace/libtrace-4.0.9_p1-r1.ebuild
+++ b/net-libs/libtrace/libtrace-4.0.9_p1-r1.ebuild
@@ -23,7 +23,7 @@ RDEPEND="
 "
 DEPEND="
 	${RDEPEND}
-	app-doc/doxygen
+	app-doc/doxygen[dot]
 	sys-devel/flex
 	virtual/os-headers
 	virtual/pkgconfig
diff --git a/net-libs/libtrace/libtrace-99999.ebuild b/net-libs/libtrace/libtrace-99999.ebuild
index ab6f21285b87..f9a910c5b3a0 100644
--- a/net-libs/libtrace/libtrace-99999.ebuild
+++ b/net-libs/libtrace/libtrace-99999.ebuild
@@ -22,7 +22,7 @@ RDEPEND="
 "
 DEPEND="
 	${RDEPEND}
-	app-doc/doxygen
+	app-doc/doxygen[dot]
 	sys-devel/flex
 	virtual/os-headers
 	virtual/pkgconfig