gentoo resync : 25.09.2019

5 files changed, 16 insertions, 19 deletions

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index aecfe5b7f404..b07eb3b8a28f 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -4,13 +4,13 @@ AUX wireshark-2.9.0-tfshark-libm.patch 134 BLAKE2B 364acc14eaf74d134b9905c240a3a
 AUX wireshark-99999999-androiddump-wsutil.patch 343 BLAKE2B 665e3329615524fa145b0b6f996aa950f0337ef4fd6a53d26887453744f8f3dcbcd499654f679edd07d2e07224e542247583233a8c0be1d130bc9196dc56ee01 SHA512 9f013bb9fd7d0dad834c2079210a1b15adbd5650a7fc320e7dfab7c9c6d0fa9f0b4e3fd3b1972f91ec47484933244c6b91dfbf4eb62409391562bc7ee4ee7f5e
 AUX wireshark-99999999-qtsvg.patch 160 BLAKE2B f282867fc9cf3d770fb6abb5e6e9b471e3a117e216d3b0e1ba370e1bda3346fc041bedb8d14813dd17fea72441c5cd49a192ecd5fa864dedde88154e729d73fb SHA512 d5e78204767db49b5da6295418cdbb242f91181348fea8042e6ed7fd4b82b19ddef91f0ac10e1f3b7a0f9316a0a8dc7ba0a9b5fb3550dcd7c8814c92989d902e
 AUX wireshark-99999999-ui-needs-wiretap.patch 211 BLAKE2B f27c7ecdc3ee769020ad5d361fb335e6d70bcedb6ff0d19b48df2c1739b636f5585d329d50a9da0c741caed7c42cdc758668312b851d4eec440d782e2e9b1d24 SHA512 5ad342a062c560f729a7ec2b667aa88e2b9b3c6d547d9ecb96e3dc30224a4d766d1bc8806b08f608c5514309cc8bdf6903f39e232afe21003afe9f1e88082ea3
-DIST wireshark-3.0.1.tar.xz 30903792 BLAKE2B 583052691cc20e97511f2407a64fbdffae91c09275429c9c9a60dbafcfc91ce79270f09710e8fba7db053565f1afc9786caf22ef21e700dd0f97c2f38b139e31 SHA512 59c3f36e4e7a1a7ea8f926dbf8ca495f83346396e1df5edf6a1bb34823c84308f52a1b6d46be9675d3af9ce8718da4a574f63a4fb210d8fc52131f4534d8670d
 DIST wireshark-3.0.3.tar.xz 30923980 BLAKE2B 05f29f55061d0bed9be284e145d260fca5e0051893c044b1389e1389f2c9865c7ec4c548ea040c6bd853d4fe1c482c5c86fdb23aa79d588ad34b91ed1901bcf0 SHA512 78d4aa68e47a72b641cb2a694028de743c195a41c42fb58f510402581a213c1239f63cad1f9163b13d64608fcedf64c7367a4888021b80613cb7e9a6ddbf8750
 DIST wireshark-3.0.4.tar.xz 30938336 BLAKE2B ab97cbfd9999a4e326787639debb67f0d0b8509572fb85297385a461dbaf081691d59fc2cb16b4a69baee8ca0ef873503f85f0238bf0fbedfcb3e0755749d3df SHA512 eb9ddc8ba3d78bc6c1f2e1d277e81c00939638793ed21b98999310231d13a0fc8a6149dc5e78f58026778b8137e954ad7f67069f8cb80465078ca2d9795b25d1
+DIST wireshark-3.0.5.tar.xz 30929864 BLAKE2B 0e3d8eb37e6d1d1976e8084176fc9c75dab43a74f65f8247c9b18b85cdd82d207791b839743a59c4ad299d63f5f41a94f931901e9245dbfb3d4a239046c874c4 SHA512 237ee66cfe0a7073f0e3623f327f7eb7204d1cd274e006dcc6890972d4135c2baa6c9d2426ea03ee64b7fc6dc45cb4cfe823e5cfc6f90e252d35b3ad7750884e
 DIST wireshark-3.1.0.tar.xz 31052040 BLAKE2B 96ede4dcbb3f5c4ecf1d935737bb26dcaecabe24e0767b34914febd31a1402d2428580e8b26c145bc98a71ef01fddcfca6e4f5709d9a8d90634ea6ed4789bb20 SHA512 df7ca131d0e0f00ec00ef0934cf070c7f6d06e55830777e5ab62f4b1c5588b57bfb45e69009f8ab0c3f405f9dd730bf35671d09f46a9a846a09154ec47caffc9
-EBUILD wireshark-3.0.1.ebuild 6603 BLAKE2B e6a553eaadb1eb0098088bc18f2603359f6b3c5c3a411d4abdc879c21e2b927362d383cdab19072f333beba35da851368263ea9fb059eb9726ea5bf6f5a969ef SHA512 33362ce11dd19ce6c93c47325907dbbea2f504724ad94464217d98744b19dad1f3461319ba709edb21ad442d22fce6db4d8fae596d1e0714520b34598bdbfcb2
-EBUILD wireshark-3.0.3.ebuild 6587 BLAKE2B 945be054888849eb430d9e1242d48a146890ea226d4af32dfe22904bf748880f2baa3537460f23c8d89b89f101e61a4833b1ebdd946f32e9b1b38c8d004ba742 SHA512 5b31f242fd6c315629eb0cd308dc374aefa8a41f3966ae2f81a2385a366270597f235a0733a27fa93230fb82318725d41502522256ec2b5e8bd97a4bcafb7e88
-EBUILD wireshark-3.0.4.ebuild 6594 BLAKE2B 2e5e7153270cf771d6543aa2b9fa78d4d48819e367b470ee976afb00cc730640ebdfaa3d21e146fae5dcd53fabe39ed5f68b708d6c0970f95f3e73c935aec7aa SHA512 4de4e53891684a93e699cef35d2ff7d9415b0725d57c530371a11a24a6adb4a161c1812e10bbb664577c6ee249c8d2e26704c1e7d5d46246c942445c8f6befbe
+EBUILD wireshark-3.0.3.ebuild 6587 BLAKE2B b73890fced1e5959f8955bcd61b81f298c247c6075f03510870369882c8039107c396bc74f0577a23d5480461de3a991b9366146700fa646f2ee5bb8d1800fcc SHA512 95b42f065c4d678755a28dca5382f27df91a9ecaaa679b7c531a2006ab6aaab11838ce39a19370c5bb9cb7955a6d54feb6458d347999dd1cfd7f9ecf5ed7795c
+EBUILD wireshark-3.0.4.ebuild 6591 BLAKE2B 79d06a7c557799398bec0d257529a2d759ac9fd96d548f265ea3040e85a9de549e0bf504af65de0cf9ae8aa02e1422332285247c630e0d46af571f93370359ca SHA512 d2576cfb2dbb5cae17a9c83fcd4ce4575857c8fd250050c6561a8e969e5e6789bd4875c4a1195f4718323d0bf61c319c40e9d15b0c671ffa79be728a2e20d3e2
+EBUILD wireshark-3.0.5.ebuild 6594 BLAKE2B 9edf7d4f6b3cf5614adadb036f2319f8667fba725019c47b45c16c33fd9be41f6f0525e919b19a487c4b7173a235876096089f40a95bda90d516f82bc0071fcb SHA512 eae7ecc3f8a3599026c94b0f207cb7960175ebdaa9ab91d30414d7d10b0395632d5ca56cc699b07305e8aed65bbf067939081ec462fa1ce0a06100d37ea1da54
 EBUILD wireshark-3.1.0.ebuild 6796 BLAKE2B b8c8bf8ae8b08591ac11bfeefaddd953844ddb2b3c30c0bd5be3a3dea179ad6bb9896aa2dffe67e31f612e6b7cff6c7349981d8641b395041bc9b1999b59b3ff SHA512 5967b885881c10d5a6ae516eb5319ddffdb73a31856545e9bbb7676d0bf9b3b02c868bda2821f4c5e655cd0b0967fe7cd1e2f7d6d77607a492714c54cc7c07e5
 EBUILD wireshark-99999999.ebuild 6801 BLAKE2B d6fce252397acd89269ac1ba4e96377f8f9072045e378c97b4bdfb1452a14fd80e5b6014bf74616ce41639b1596c1de13dd10092a0f98e8bcdb7dd7201ed2c10 SHA512 bcb538192ffb47eb9c465ac7fcfce7b86c34a7657b6172750fa4965693d4a60a398664984ee4969fc4f884e79c4959ed544fd9d6d2e873deb5cd39366f20af11
-MISC metadata.xml 5146 BLAKE2B f126bc073b880c4c0fac986cef21b7cd6951826df28032ec546b21f5b4472192c91cb6442f765d8e408c1ac7d725518ae316e63a931996c01724154404f879e4 SHA512 895920a9ee9a7f4587d063581b36d00c08b85d554087ddbfb6acbbbd6c066795d8b484826c50740fb4c2db5cf0058ed4d85c0082ab42f7d5e96bd96413701b69
+MISC metadata.xml 4965 BLAKE2B d50849435714c6a4c1e8b2d43e27a4d2fb97dd5711b5c80ffba97b3218c4b76459f79a06590ae188d024be6bff5e80731c73a8cfc72d1682c24f0719803a7d3c SHA512 dc4cdf407f86f85f4542f605497cff1cf97510ef065ede61f1cb1c1ec774393ac71689c36e5e5d06e34f272f42a48ce8000bcd8b51e4757e5d85db8703a06779
diff --git a/net-analyzer/wireshark/metadata.xml b/net-analyzer/wireshark/metadata.xml
index 17945000941a..3e0355cd9ccc 100644
--- a/net-analyzer/wireshark/metadata.xml
+++ b/net-analyzer/wireshark/metadata.xml
@@ -39,7 +39,6 @@ be exported to XML, PostScript®, CSV, or plain text.
 <flag name="dumpcap">Install dumpcap, to dump network traffic from inside wireshark</flag>
 <flag name="editcap">Install editcap, to edit and/or translate the format of capture files</flag>
 <flag name="libxml2">Use <pkg>dev-libs/libxml2</pkg> for handling XML configuration in dissectors</flag>
-<flag name="lz4">Use <pkg>app-arch/lz4</pkg> for compression/decompression</flag>
 <flag name="maxminddb">Use <pkg>dev-libs/libmaxminddb</pkg> for IP address geolocation</flag>
 <flag name="mergecap">Install mergecap, to merge two or more capture files into one</flag>
 <flag name="minizip">Build with zip file compression support</flag>
@@ -55,7 +54,6 @@ be exported to XML, PostScript®, CSV, or plain text.
 <flag name="sdjournal">Install sdjournal, an extcap that captures systemd journal entries</flag>
 <flag name="sharkd">Install sharkd, the daemon variant of wireshark</flag>
 <flag name="smi">Use <pkg>net-libs/libsmi</pkg> to resolve numeric OIDs into human readable format</flag>
-<flag name="snappy">Use <pkg>app-arch/snappy</pkg> for snappy compression and decompression</flag>
 <flag name="spandsp">Use <pkg>media-libs/spandsp</pkg> for for G.722 and G.726 codec support in the RTP Player</flag>
 <flag name="sshdump">Install sshdump, an extcap interface to capture from a remote host through SSH</flag>
 <flag name="text2pcap">Install text2pcap, to generate a capture file from an ASCII hexdump of packets</flag>
diff --git a/net-analyzer/wireshark/wireshark-3.0.3.ebuild b/net-analyzer/wireshark/wireshark-3.0.3.ebuild
index 602150453439..25bf89b8cfe8 100644
--- a/net-analyzer/wireshark/wireshark-3.0.3.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.0.3.ebuild
@@ -53,12 +53,12 @@ CDEPEND="
 	sshdump? ( >=net-libs/libssh-0.6 )
 	ssl? ( net-libs/gnutls:= )
 	zlib? ( sys-libs/zlib )
+	${PYTHON_DEPS}
 "
 # We need perl for `pod2html`. The rest of the perl stuff is to block older
 # and broken installs. #455122
 DEPEND="
 	${CDEPEND}
-	${PYTHON_DEPS}
 "
 BDEPEND="
 	!<perl-core/Pod-Simple-3.170
diff --git a/net-analyzer/wireshark/wireshark-3.0.4.ebuild b/net-analyzer/wireshark/wireshark-3.0.4.ebuild
index 924c16aa9485..a2a6a43079c7 100644
--- a/net-analyzer/wireshark/wireshark-3.0.4.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.0.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="${HOMEPAGE}download/src/all-versions/${P/_/}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~ppc64 x86"
 IUSE="
 	adns androiddump bcg729 +capinfos +captype ciscodump +dftest doc dpauxmon
 	+dumpcap +editcap kerberos libxml2 lua lz4 maxminddb +mergecap +netlink
@@ -53,12 +53,12 @@ CDEPEND="
 	sshdump? ( >=net-libs/libssh-0.6 )
 	ssl? ( net-libs/gnutls:= )
 	zlib? ( sys-libs/zlib )
+	${PYTHON_DEPS}
 "
 # We need perl for `pod2html`. The rest of the perl stuff is to block older
 # and broken installs. #455122
 DEPEND="
 	${CDEPEND}
-	${PYTHON_DEPS}
 "
 BDEPEND="
 	!<perl-core/Pod-Simple-3.170
diff --git a/net-analyzer/wireshark/wireshark-3.0.1.ebuild b/net-analyzer/wireshark/wireshark-3.0.5.ebuild
index 32c6c317528f..e33cf0877e63 100644
--- a/net-analyzer/wireshark/wireshark-3.0.1.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.0.5.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 PYTHON_COMPAT=( python3_{5,6,7} )
-inherit cmake-utils fcaps flag-o-matic ltprune multilib python-r1 qmake-utils user xdg-utils
+inherit fcaps flag-o-matic multilib python-r1 qmake-utils user xdg-utils cmake-utils
 
 DESCRIPTION="A network protocol analyzer formerly known as ethereal"
 HOMEPAGE="https://www.wireshark.org/"
@@ -11,7 +11,7 @@ SRC_URI="${HOMEPAGE}download/src/all-versions/${P/_/}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="arm"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86"
 IUSE="
 	adns androiddump bcg729 +capinfos +captype ciscodump +dftest doc dpauxmon
 	+dumpcap +editcap kerberos libxml2 lua lz4 maxminddb +mergecap +netlink
@@ -53,12 +53,14 @@ CDEPEND="
 	sshdump? ( >=net-libs/libssh-0.6 )
 	ssl? ( net-libs/gnutls:= )
 	zlib? ( sys-libs/zlib )
+	${PYTHON_DEPS}
 "
 # We need perl for `pod2html`. The rest of the perl stuff is to block older
 # and broken installs. #455122
 DEPEND="
 	${CDEPEND}
-	${PYTHON_DEPS}
+"
+BDEPEND="
 	!<perl-core/Pod-Simple-3.170
 	!<virtual/perl-Pod-Simple-3.170
 	dev-lang/perl
@@ -144,7 +146,7 @@ src_configure() {
 		-DBUILD_tshark=$(usex tshark)
 		-DBUILD_udpdump=$(usex udpdump)
 		-DBUILD_wireshark=$(usex qt5)
-		-DCMAKE_INSTALL_DOCDIR="/usr/share/doc/${PF}"
+		-DCMAKE_INSTALL_DOCDIR="${EROOT%/}/usr/share/doc/${PF}"
 		-DDISABLE_WERROR=yes
 		-DENABLE_BCG729=$(usex bcg729)
 		-DENABLE_CAP=$(usex filecaps caps)
@@ -168,8 +170,7 @@ src_configure() {
 }
 
 src_test() {
-	emake -C "${BUILD_DIR}" test-programs
-	emake -C "${BUILD_DIR}" test
+	cmake-utils_src_test
 }
 
 src_install() {
@@ -215,8 +216,6 @@ src_install() {
 			newins image/WiresharkDoc-${s}.png application-vnd.tcpdump.pcap.png
 		done
 	fi
-
-	prune_libtool_files
 }
 
 pkg_postinst() {