gentoo resync : 18.08.2019

6 files changed, 7 insertions, 125 deletions

diff --git a/net-libs/libtrace/Manifest b/net-libs/libtrace/Manifest
index 6fbae20c07d8..3cb572119bd4 100644
--- a/net-libs/libtrace/Manifest
+++ b/net-libs/libtrace/Manifest
@@ -3,13 +3,9 @@ AUX libtrace-3.0.20-tinfo.patch 474 BLAKE2B bfbe8126fae0ef132671c24ae4a0a44fa520
 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-tinfo.patch 699 BLAKE2B de67795fc21e680a84998b0777dbb9bb8254ec4634cc94ab7903a29b238b1f6b6bd6447d0b63bb48c6404acc2216d06a2fb4ea371cc4179ad323954f6647c033 SHA512 82c86d79c549788665ecd50e4f1a1fb8ceea928585a07ec42b007df57875c57b3fc924395318ee0e7f9cf93faa849f9e86d8eb9ac715e9f113d5a02acebcff7a
-DIST libtrace-4.0.6.tar.gz 969315 BLAKE2B 812100d7f0fe3def44404372c7b2287a2a9c9b3831cc2e3dee30cff0946d959089d44f201ba74aba57246242153e634806d899a108e18f195f5b6bfde8c0043c SHA512 8f888f57e4436d1aa7fc030212f7b356c58848151873569aa372c6cbcf62c5dd1ece4ecc5a98f6dbe8dc84a39d19abcbe42ff240282054b45cfce0c8ba048f16
-DIST libtrace-4.0.7.tar.gz 992013 BLAKE2B 24f2f684f58eb197ab7f117a5c2c97c0744b4ddfc210088058440148773066e64414766f7e1296c5520345b2a18f2b420215521ee169c74537f2f3ead92c9503 SHA512 3cfc2a47c7402e9ddd3821a7a435edfbb27b718c656400283fd5fa6f4137ede4acefbbd0390aab68e4140a6eb9f93b8df6726df484a79749798302ed3ae5165d
 DIST libtrace-4.0.8.tar.gz 1000829 BLAKE2B 943c3f800045c93880657e96173de0eff6ecbaab5ba22e8f29ad35363a3bdbb88a81d5c8c98e2750caff2cbe1b4590dd18bf924cc0520b041e54c1e17b8eb290 SHA512 10179a19c03d13451b088cd0678718bec3e3be2355c561d289a88457c7819a790c28094f7c3d95143bd3f16260f91fb6df465429375c7625d2ca0c696204de3b
 DIST libtrace-4.0.9_p1.tar.gz 1853724 BLAKE2B 2c2c8f44c5dea7c5acb3c3035cf8f749f1f33b03dd20675062718176ed26cba16c91f67df39512fb369896798edbe3f48e5624c72229bd00fc845712f8faf3cb SHA512 aa9e15322e507e01d9b51f6945772deba7673816c62546de30539792d7353b31235ae97866637f84969582e7300b634d080ba29a8cb088f5304a438e79357e57
-EBUILD libtrace-4.0.6.ebuild 1134 BLAKE2B 65826d3c4d60e567d3d6ca954f9699f3c067f7430d35c9d98316ab159b1e0a1022aae36ad9272b15cb4970d05f61269f81ae98eda13107896187414ff7ec7bc4 SHA512 2ba226191a5cc7675a1c516df80a4e2a4848db5ed8f0f9557e31d361127abd51b426c52a6ade15851663a3dc28882420ecef03203c13a116f2c5d09c590badc5
-EBUILD libtrace-4.0.7.ebuild 1127 BLAKE2B 8f734cad9cacdebeb00ceeeeb52db158d3a5d7e44d4d819291dee0a9be32cb885d476d8a968794d1d02260bb7b65f9264a4abef6225eff6c80ce2ff4d75d4806 SHA512 0cb30eca2aad22f76c37237cbbd49b7460728a55c33262d2643d921d9fec06f537984b08ae6241313ab62c4ce18db20deed7a30e303a6762312c0735691a401d
-EBUILD libtrace-4.0.8.ebuild 1127 BLAKE2B 8f734cad9cacdebeb00ceeeeb52db158d3a5d7e44d4d819291dee0a9be32cb885d476d8a968794d1d02260bb7b65f9264a4abef6225eff6c80ce2ff4d75d4806 SHA512 0cb30eca2aad22f76c37237cbbd49b7460728a55c33262d2643d921d9fec06f537984b08ae6241313ab62c4ce18db20deed7a30e303a6762312c0735691a401d
-EBUILD libtrace-4.0.9_p1.ebuild 1198 BLAKE2B f0c0c4152521feb52bd8d36b8c513dd4b89952d3961b8536955ed51241af9582a7d62471bcbd430da6a8d8fb613201f0745c88e4fcf3a1fe6c865ad8215bf375 SHA512 efb17f56fde7bffa9dc5a8392db438223f4923fe725a0a8b691f63b51fd7fa302d512738732926ed67e492676c50d218aef20ca5a6293b3baf2e9f13f01585be
-EBUILD libtrace-99999.ebuild 1110 BLAKE2B 8de7818aa67bf32f231add5448240e41db4153983aca831afeddf714a6958aad8fc9ba9c507af436572e0c6ef4f92fa3cb0cc5c7b59d2b2750b717a7af8e346c SHA512 b7a560233c8231f40ca0469f35676b1670514e9985ceaea82a62cdd0dfb7b13906daa64a6f8de4888eecf9373581c4308ec20e2dae2fb662baf5106765a62c3e
+EBUILD libtrace-4.0.8.ebuild 1147 BLAKE2B 6671032674a7a22903830ecc9f2ed9ae8092db6d930a00ac5dc9b57f0f44a42e488997909a5d05ad9b2ecf7f001ec913a6f193e384455707e68b7c2863801349 SHA512 7e7c141d9b4529568401dbc8789ca489ff94390dbc31ec19e9cf3eb633d3ad279400e62279626468141f0c98a1295a265f204622fd7cb1aea363fa0da3237a33
+EBUILD libtrace-4.0.9_p1.ebuild 1183 BLAKE2B 335894903da0d4c3f7e1d7e22a9f35219aef687f831fa17d5ba752334b0fd73308f92198280a3e86e0802e68ad3c7a20ca32f3c20feaab648ad0595164d8a5c0 SHA512 e42d78f87636f6686e50933698870b508b3d54d5bc4704932b1e0e60de5ab6915965622878c7712b2ac0092daa04a0a57bf637ce0ef939d3586fe2fc7008d89a
+EBUILD libtrace-99999.ebuild 1132 BLAKE2B 8bf7a1a7a87b930c3e5f5da6fe426ed6662a2ec702f7479946cc769901d989e7ecfe4553472b2b96da356ff8c6c9aa5425056629c26a599e17d57be6dd793ff2 SHA512 3dffc3729ecf8222019684d3e3a599e411944bb3597eabea4fa9067d43d98eee0fee681d676e4d6e0b6ae48ffef99d04cda32fda87df3ec6b2ebd2654f279cc6
 MISC metadata.xml 349 BLAKE2B 848cf78c8b1c684331f7d0e4ffc027c3b2db879910b09b6573dfc5c19669e783a98a19e70a56d205dd2a256c7dfe3ab7e3cf411642674da0462f9f46510f4466 SHA512 4cb73fcfe0a021f618da0281bf492f407459d637e7f58ccb5a698f3612f9c8c19ca90d1449f17c9c6c47694b6a19ac8c5c80a285b1662208c6c18de51afb0ac4
diff --git a/net-libs/libtrace/libtrace-4.0.6.ebuild b/net-libs/libtrace/libtrace-4.0.6.ebuild
deleted file mode 100644
index c8291b01d7ff..000000000000
--- a/net-libs/libtrace/libtrace-4.0.6.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools eutils
-
-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/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.7.ebuild b/net-libs/libtrace/libtrace-4.0.7.ebuild
deleted file mode 100644
index d5c5a09369da..000000000000
--- a/net-libs/libtrace/libtrace-4.0.7.ebuild
+++ /dev/null
@@ -1,58 +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/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.8.ebuild b/net-libs/libtrace/libtrace-4.0.8.ebuild
index d5c5a09369da..907621355b7f 100644
--- a/net-libs/libtrace/libtrace-4.0.8.ebuild
+++ b/net-libs/libtrace/libtrace-4.0.8.ebuild
@@ -24,6 +24,7 @@ DEPEND="
 	${RDEPEND}
 	app-doc/doxygen
 	sys-devel/flex
+	virtual/os-headers
 	virtual/pkgconfig
 	virtual/yacc
 "
diff --git a/net-libs/libtrace/libtrace-4.0.9_p1.ebuild b/net-libs/libtrace/libtrace-4.0.9_p1.ebuild
index 1c1a3c50f73e..4b4153bf1f2e 100644
--- a/net-libs/libtrace/libtrace-4.0.9_p1.ebuild
+++ b/net-libs/libtrace/libtrace-4.0.9_p1.ebuild
@@ -25,6 +25,7 @@ DEPEND="
 	${RDEPEND}
 	app-doc/doxygen
 	sys-devel/flex
+	virtual/os-headers
 	virtual/pkgconfig
 	virtual/yacc
 "
@@ -37,7 +38,6 @@ PATCHES=(
 S=${WORKDIR}/${P/_p/-}
 
 src_prepare() {
-cp -av configure.in{,.orig} || die
 	default
 
 	eautoreconf
diff --git a/net-libs/libtrace/libtrace-99999.ebuild b/net-libs/libtrace/libtrace-99999.ebuild
index c4061e17a7b9..ab6f21285b87 100644
--- a/net-libs/libtrace/libtrace-99999.ebuild
+++ b/net-libs/libtrace/libtrace-99999.ebuild
@@ -24,14 +24,15 @@ 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
+		"${FILESDIR}"/${PN}-4.0.9_p1-tinfo.patch
 )
 S=${WORKDIR}/${P/_beta/}