gentoo resync : 13.10.2019

7 files changed, 32 insertions, 32 deletions

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index b07eb3b8a28f..c0ea0a5bca36 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -8,9 +8,9 @@ DIST wireshark-3.0.3.tar.xz 30923980 BLAKE2B 05f29f55061d0bed9be284e145d260fca5e
 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.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 4965 BLAKE2B d50849435714c6a4c1e8b2d43e27a4d2fb97dd5711b5c80ffba97b3218c4b76459f79a06590ae188d024be6bff5e80731c73a8cfc72d1682c24f0719803a7d3c SHA512 dc4cdf407f86f85f4542f605497cff1cf97510ef065ede61f1cb1c1ec774393ac71689c36e5e5d06e34f272f42a48ce8000bcd8b51e4757e5d85db8703a06779
+EBUILD wireshark-3.0.3.ebuild 6581 BLAKE2B b9caaad314347dc3a02cd2994344f3113c604487b36c6b785018c0683a11dcf5e1714871431e1305ca9e1ba2eb3b542d91044f5b2c5afd0419a13b53c3f256c2 SHA512 154f303dc3c9c84088db981d00218cdf9dc7bb6dd5719d25201b9460b9dd9998093d179475c97cdc54aaf27da659acc5609ad333f0cccea3ba23f13cd837bf91
+EBUILD wireshark-3.0.4.ebuild 6585 BLAKE2B 06d39f7d056b73ea4d7180cd7373975831dbb1f1d5a4b28faa5d9ab37452d70f78247a4727cfd7acb15879917a7be703733fa42dc77ac4b61b26c5b46b383e06 SHA512 b627ce7283791654aeec6f7400b5d12e309ba98548f382256cb5732e171811637462af036c676b936217f00f24a3f0ad566a1ed9a95ca4eb8f9504a48a2d74dd
+EBUILD wireshark-3.0.5.ebuild 6588 BLAKE2B f76ebf3af16e8f11f97af85b599b7555b3c85db8cb7c37698252be645622623cc8549aa591bf627909ebd04b9008c1581f607376a6fdf849783e31cb57294d74 SHA512 348cf90f7c319ab19a4befc74ca261c286eb9b778a6c21d65a4b462d422e7d382741102260d2155d5e415b2348499d1dbd3ea7bedc91e4f81596331d337c5263
+EBUILD wireshark-3.1.0.ebuild 6790 BLAKE2B 7acc05ba1e54b2a9b68d775c639c60d19ad98e7f0d35caa70cf42400618cef1306de4514d21bc249e19ffda36ee6e96a8425a57bfb72de44ea439565eca2b98d SHA512 e1bcccdf1ca7fa2e97fb55591c6d067e3bb2d4a03188254b8decd6e277b8ff584f2c8590c578109fc3045b908d46a76892d952c1c264665c36cd02fa4b36ebfd
+EBUILD wireshark-99999999.ebuild 6795 BLAKE2B 615b65c6838e00c5b0c54a05508d0758f761387dd0a9488ad39608054c4940fc3d5b557a370bc1e14b9b70734ea9c0ac4df4cd8a06a84b1854c41cab12b96182 SHA512 0d5b143ad8f104f4ddb66195a000bc94fe26997ef5c9269f967e20c9832deafe31443ac53558046aa7f300bf036194c23fb6a9a5611237bf31d039ebfc567978
+MISC metadata.xml 4963 BLAKE2B b3c0a51c2ffc96313fe46be2f4b970c0a22d7b479a3701a717531f7b9c46ff5b00b1d3a29a54295abb90989226afb679f2d4842c2ade5f4f1c2d7923121591b8 SHA512 03cdfa1a78a23ae572eb0eacf787b1edba135541ab94d899dad77c6f0d482d9303fa0168033a3a60a8e12dd54506999ea5bd323dc0a90c58d87d8640bda139d2
diff --git a/net-analyzer/wireshark/metadata.xml b/net-analyzer/wireshark/metadata.xml
index 3e0355cd9ccc..651879bc6f82 100644
--- a/net-analyzer/wireshark/metadata.xml
+++ b/net-analyzer/wireshark/metadata.xml
@@ -38,14 +38,14 @@ be exported to XML, PostScript®, CSV, or plain text.
 <flag name="dpauxmon">Install dpauxmon, an external capture interface (extcap) that captures DisplayPort AUX channel data from linux kernel drivers</flag>
 <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="http2">Use <pkg>net-libs/nghttp2</pkg> for HTTP/2 support</flag>
 <flag name="libxml2">Use <pkg>dev-libs/libxml2</pkg> for handling XML configuration in dissectors</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>
 <flag name="netlink">Use <pkg>dev-libs/libnl</pkg></flag>
-<flag name="nghttp2">Use <pkg>net-libs/nghttp2</pkg> for HTTP/2 support</flag>
 <flag name="pcap">Use <pkg>net-libs/libpcap</pkg> for network packet capturing (build dumpcap, rawshark)</flag>
-<flag name="plugin_ifdemo">Install plugin interface demo</flag>
+<flag name="plugin-ifdemo">Install plugin interface demo</flag>
 <flag name="plugins">Install plugins</flag>
 <flag name="randpkt">Install randpkt, a utility for creating pcap trace files full of random packets</flag>
 <flag name="randpktdump">Install randpktdump, an extcap interface to provide access to the random packet generator (randpkt)</flag>
diff --git a/net-analyzer/wireshark/wireshark-3.0.3.ebuild b/net-analyzer/wireshark/wireshark-3.0.3.ebuild
index 25bf89b8cfe8..0fcd75a867a0 100644
--- a/net-analyzer/wireshark/wireshark-3.0.3.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.0.3.ebuild
@@ -14,8 +14,8 @@ SLOT="0/${PV}"
 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
-	nghttp2 +pcap +qt5 +randpkt +randpktdump +reordercap sbc selinux +sharkd
+	+dumpcap +editcap http2 kerberos libxml2 lua lz4 maxminddb +mergecap
+	+netlink +pcap +qt5 +randpkt +randpktdump +reordercap sbc selinux +sharkd
 	smi snappy spandsp sshdump ssl sdjournal +text2pcap tfshark +tshark
 	+udpdump zlib
 "
@@ -29,13 +29,13 @@ CDEPEND="
 	bcg729? ( media-libs/bcg729 )
 	ciscodump? ( >=net-libs/libssh-0.6 )
 	filecaps? ( sys-libs/libcap )
+	http2? ( net-libs/nghttp2 )
 	kerberos? ( virtual/krb5 )
 	libxml2? ( dev-libs/libxml2 )
 	lua? ( >=dev-lang/lua-5.1:* )
 	lz4? ( app-arch/lz4 )
 	maxminddb? ( dev-libs/libmaxminddb )
 	netlink? ( dev-libs/libnl:3 )
-	nghttp2? ( net-libs/nghttp2 )
 	pcap? ( net-libs/libpcap )
 	qt5? (
 		dev-qt/qtcore:5
@@ -157,7 +157,7 @@ src_configure() {
 		-DENABLE_LUA=$(usex lua)
 		-DENABLE_LZ4=$(usex lz4)
 		-DENABLE_NETLINK=$(usex netlink)
-		-DENABLE_NGHTTP2=$(usex nghttp2)
+		-DENABLE_NGHTTP2=$(usex http2)
 		-DENABLE_PCAP=$(usex pcap)
 		-DENABLE_SBC=$(usex sbc)
 		-DENABLE_SMI=$(usex smi)
diff --git a/net-analyzer/wireshark/wireshark-3.0.4.ebuild b/net-analyzer/wireshark/wireshark-3.0.4.ebuild
index a2a6a43079c7..61e8bd7a288c 100644
--- a/net-analyzer/wireshark/wireshark-3.0.4.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.0.4.ebuild
@@ -14,8 +14,8 @@ SLOT="0/${PV}"
 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
-	nghttp2 +pcap +qt5 +randpkt +randpktdump +reordercap sbc selinux +sharkd
+	+dumpcap +editcap http2 kerberos libxml2 lua lz4 maxminddb +mergecap
+	+netlink +pcap +qt5 +randpkt +randpktdump +reordercap sbc selinux +sharkd
 	smi snappy spandsp sshdump ssl sdjournal +text2pcap tfshark +tshark
 	+udpdump zlib
 "
@@ -29,13 +29,13 @@ CDEPEND="
 	bcg729? ( media-libs/bcg729 )
 	ciscodump? ( >=net-libs/libssh-0.6 )
 	filecaps? ( sys-libs/libcap )
+	http2? ( net-libs/nghttp2 )
 	kerberos? ( virtual/krb5 )
 	libxml2? ( dev-libs/libxml2 )
 	lua? ( >=dev-lang/lua-5.1:* )
 	lz4? ( app-arch/lz4 )
 	maxminddb? ( dev-libs/libmaxminddb )
 	netlink? ( dev-libs/libnl:3 )
-	nghttp2? ( net-libs/nghttp2 )
 	pcap? ( net-libs/libpcap )
 	qt5? (
 		dev-qt/qtcore:5
@@ -157,7 +157,7 @@ src_configure() {
 		-DENABLE_LUA=$(usex lua)
 		-DENABLE_LZ4=$(usex lz4)
 		-DENABLE_NETLINK=$(usex netlink)
-		-DENABLE_NGHTTP2=$(usex nghttp2)
+		-DENABLE_NGHTTP2=$(usex http2)
 		-DENABLE_PCAP=$(usex pcap)
 		-DENABLE_SBC=$(usex sbc)
 		-DENABLE_SMI=$(usex smi)
diff --git a/net-analyzer/wireshark/wireshark-3.0.5.ebuild b/net-analyzer/wireshark/wireshark-3.0.5.ebuild
index e33cf0877e63..f4fbb9dc3bcd 100644
--- a/net-analyzer/wireshark/wireshark-3.0.5.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.0.5.ebuild
@@ -14,8 +14,8 @@ SLOT="0/${PV}"
 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
-	nghttp2 +pcap +qt5 +randpkt +randpktdump +reordercap sbc selinux +sharkd
+	+dumpcap +editcap http2 kerberos libxml2 lua lz4 maxminddb +mergecap
+	+netlink +pcap +qt5 +randpkt +randpktdump +reordercap sbc selinux +sharkd
 	smi snappy spandsp sshdump ssl sdjournal +text2pcap tfshark +tshark
 	+udpdump zlib
 "
@@ -29,13 +29,13 @@ CDEPEND="
 	bcg729? ( media-libs/bcg729 )
 	ciscodump? ( >=net-libs/libssh-0.6 )
 	filecaps? ( sys-libs/libcap )
+	http2? ( net-libs/nghttp2 )
 	kerberos? ( virtual/krb5 )
 	libxml2? ( dev-libs/libxml2 )
 	lua? ( >=dev-lang/lua-5.1:* )
 	lz4? ( app-arch/lz4 )
 	maxminddb? ( dev-libs/libmaxminddb )
 	netlink? ( dev-libs/libnl:3 )
-	nghttp2? ( net-libs/nghttp2 )
 	pcap? ( net-libs/libpcap )
 	qt5? (
 		dev-qt/qtcore:5
@@ -157,7 +157,7 @@ src_configure() {
 		-DENABLE_LUA=$(usex lua)
 		-DENABLE_LZ4=$(usex lz4)
 		-DENABLE_NETLINK=$(usex netlink)
-		-DENABLE_NGHTTP2=$(usex nghttp2)
+		-DENABLE_NGHTTP2=$(usex http2)
 		-DENABLE_PCAP=$(usex pcap)
 		-DENABLE_SBC=$(usex sbc)
 		-DENABLE_SMI=$(usex smi)
diff --git a/net-analyzer/wireshark/wireshark-3.1.0.ebuild b/net-analyzer/wireshark/wireshark-3.1.0.ebuild
index e489d3494c1a..4d9324a7a9b8 100644
--- a/net-analyzer/wireshark/wireshark-3.1.0.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.1.0.ebuild
@@ -14,8 +14,8 @@ SLOT="0/${PV}"
 KEYWORDS=""
 IUSE="
 	adns androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc
-	dpauxmon +dumpcap +editcap kerberos libxml2 lua lz4 maxminddb +mergecap
-	+minizip +netlink nghttp2 +plugins plugin_ifdemo +pcap +qt5 +randpkt
+	dpauxmon +dumpcap +editcap http2 kerberos libxml2 lua lz4 maxminddb
+	+mergecap +minizip +netlink +plugins plugin-ifdemo +pcap +qt5 +randpkt
 	+randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl
 	sdjournal +text2pcap tfshark +tshark +udpdump zlib
 "
@@ -29,6 +29,7 @@ CDEPEND="
 	brotli? ( app-arch/brotli )
 	ciscodump? ( >=net-libs/libssh-0.6 )
 	filecaps? ( sys-libs/libcap )
+	http2? ( net-libs/nghttp2 )
 	kerberos? ( virtual/krb5 )
 	libxml2? ( dev-libs/libxml2 )
 	lua? ( >=dev-lang/lua-5.1:* )
@@ -36,7 +37,6 @@ CDEPEND="
 	maxminddb? ( dev-libs/libmaxminddb )
 	minizip? ( sys-libs/zlib[minizip] )
 	netlink? ( dev-libs/libnl:3 )
-	nghttp2? ( net-libs/nghttp2 )
 	pcap? ( net-libs/libpcap )
 	qt5? (
 		dev-qt/qtcore:5
@@ -82,7 +82,7 @@ RDEPEND="
 	selinux? ( sec-policy/selinux-wireshark )
 "
 REQUIRED_USE="
-	plugin_ifdemo? ( plugins )
+	plugin-ifdemo? ( plugins )
 "
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.4-androiddump.patch
@@ -160,10 +160,10 @@ src_configure() {
 		-DENABLE_LZ4=$(usex lz4)
 		-DENABLE_MINIZIP=$(usex minizip)
 		-DENABLE_NETLINK=$(usex netlink)
-		-DENABLE_NGHTTP2=$(usex nghttp2)
+		-DENABLE_NGHTTP2=$(usex http2)
 		-DENABLE_PCAP=$(usex pcap)
 		-DENABLE_PLUGINS=$(usex plugins)
-		-DENABLE_PLUGIN_IFDEMO=$(usex plugin_ifdemo)
+		-DENABLE_PLUGIN_IFDEMO=$(usex plugin-ifdemo)
 		-DENABLE_SBC=$(usex sbc)
 		-DENABLE_SMI=$(usex smi)
 		-DENABLE_SNAPPY=$(usex snappy)
diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-99999999.ebuild
index 97001a178907..7ecaa00c8eec 100644
--- a/net-analyzer/wireshark/wireshark-99999999.ebuild
+++ b/net-analyzer/wireshark/wireshark-99999999.ebuild
@@ -14,8 +14,8 @@ SLOT="0/${PV}"
 KEYWORDS=""
 IUSE="
 	adns androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc
-	dpauxmon +dumpcap +editcap kerberos libxml2 lua lz4 maxminddb +mergecap
-	+minizip +netlink nghttp2 +plugins plugin_ifdemo +pcap +qt5 +randpkt
+	dpauxmon +dumpcap +editcap http2 kerberos libxml2 lua lz4 maxminddb
+	+mergecap +minizip +netlink +plugins plugin-ifdemo +pcap +qt5 +randpkt
 	+randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl
 	sdjournal +text2pcap tfshark +tshark +udpdump zlib
 "
@@ -29,6 +29,7 @@ CDEPEND="
 	brotli? ( app-arch/brotli )
 	ciscodump? ( >=net-libs/libssh-0.6 )
 	filecaps? ( sys-libs/libcap )
+	http2? ( net-libs/nghttp2 )
 	kerberos? ( virtual/krb5 )
 	libxml2? ( dev-libs/libxml2 )
 	lua? ( >=dev-lang/lua-5.1:* )
@@ -36,7 +37,6 @@ CDEPEND="
 	maxminddb? ( dev-libs/libmaxminddb )
 	minizip? ( sys-libs/zlib[minizip] )
 	netlink? ( dev-libs/libnl:3 )
-	nghttp2? ( net-libs/nghttp2 )
 	pcap? ( net-libs/libpcap )
 	qt5? (
 		dev-qt/qtcore:5
@@ -82,7 +82,7 @@ RDEPEND="
 	selinux? ( sec-policy/selinux-wireshark )
 "
 REQUIRED_USE="
-	plugin_ifdemo? ( plugins )
+	plugin-ifdemo? ( plugins )
 "
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.4-androiddump.patch
@@ -160,10 +160,10 @@ src_configure() {
 		-DENABLE_LZ4=$(usex lz4)
 		-DENABLE_MINIZIP=$(usex minizip)
 		-DENABLE_NETLINK=$(usex netlink)
-		-DENABLE_NGHTTP2=$(usex nghttp2)
+		-DENABLE_NGHTTP2=$(usex http2)
 		-DENABLE_PCAP=$(usex pcap)
 		-DENABLE_PLUGINS=$(usex plugins)
-		-DENABLE_PLUGIN_IFDEMO=$(usex plugin_ifdemo)
+		-DENABLE_PLUGIN_IFDEMO=$(usex plugin-ifdemo)
 		-DENABLE_SBC=$(usex sbc)
 		-DENABLE_SMI=$(usex smi)
 		-DENABLE_SNAPPY=$(usex snappy)