gentoo resync : 15.12.2017

4 files changed, 12 insertions, 5 deletions

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index de91815eae2b..1607bef35e89 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -7,6 +7,6 @@ DIST wireshark-2.4.2.tar.xz 28791712 BLAKE2B 64a965f522478e2e5690a4439554764bd34
 DIST wireshark-2.4.3.tar.xz 28807920 BLAKE2B 831691d084fc9ed6198b23c0347efa487398df37ca0cf5972db64b0724fad04b3104a5faed104b5d4b560254b19a2e41118c8d7b71cce785f38ede077215e80f SHA512 4344b9efeda3afba4b13bb468f7a12c4565da96c6182a8203cc5815baa11e7d84f3f11003b4289c6c11391cfb590b8c0319268196cc646a8f0226c432e9bb433
 EBUILD wireshark-2.2.7.ebuild 6439 BLAKE2B 86d89c85ae317328c1ab3fdead659c4a70ee10ca1ddef1d821752ba0a89c3d8cfcea65ceff744e3deb32dcd9b2a6126992bb0664cd6e56a969baa42e37cdae9a SHA512 19547b52dd4f3571a17c954e2d3158511e0abde89632b4b370b2d5ced306b42bf08d9eeae8747651738bc2ebe38f81c0c7193e7992a8660ac61b0c7e205c830a
 EBUILD wireshark-2.4.2.ebuild 7337 BLAKE2B 64d920110b5c8b15591d3b13f49b9580f737fec9d3e6debd40635b1fe318719a2a26f34f4a52537f12d4e3cf78126909187e66e263364410c84af74f3809037f SHA512 8e77633581947acc961ff073d9f117326497ff6cab113a26fccd3d8931b231ddcd62b6b8a704e175d2546b6af15d0fa831407c99fdf17d96de24afc470c35439
-EBUILD wireshark-2.4.3.ebuild 7255 BLAKE2B 7dae35f0eba0e32a270b3f9872b80b17d0546a2a92e2ec23ddaf71abd7962e1f4746083daea7052e71ad6131f63b64f4fb622e19d48b8c365ca8e25ac14af91e SHA512 1c2e90be967e2d6525d410576c7fe8c950455cab1b4a33643225f17efe1a92a61edc08fd60f4a815260dcd257b5914730e360ae100415e17b5559b2c8c7ff137
-EBUILD wireshark-99999999.ebuild 7112 BLAKE2B 1523fd808c7c82714c3562e430960a3665bcc92f21ff801c8cf50f9240f7f59339007d32244a54e60842849b415d36e19a9cce816bd91c11882eddc44e8e25b6 SHA512 f7fbcbadcd41ef497b2d01af12c5a6299c89d5b6554778571fba05428e0df021c03750fe40ba6aae7cf926b92fbf7cf2fc556eae64e8698b6935a9502caf8dff
-MISC metadata.xml 4696 BLAKE2B 1492ecb0d92c063457da068e82af411ffeb77d6f50f89f16d380062dcbb51a90281c3a82e59830b9e67dc3e5aabbdca8e89febbd852286f9c4bb87711210fe66 SHA512 51ab08d5390ea4d2a4b4e2ce505e9d28932c9dc08d739107e4dada664603fb1a0a89e08f2431af4f84b5f6be303b0b2ad28e2a22fecd7186497809b708be7c51
+EBUILD wireshark-2.4.3.ebuild 7302 BLAKE2B a5d5c0260b17d1a443980170a095c989a583dd37a89cae29184823acee3c8588486245a0d6c364452a99f32437d18d739377d0c13a0a5cf109af70f42498e042 SHA512 c59b60ad2c4b7d1a3978d9117cd82203ee5e81638a1d2bfbfa2e97661958926dacb3b9234fbc6dfbb2c062116e31ef1dd08409270dd035fa1900b0b39fc46156
+EBUILD wireshark-99999999.ebuild 7217 BLAKE2B ad176fcc18764982eacd5442529f646522c94321d3d5940de551dc20ef324f0714028839aa5cff633572bfdc526bbe6f61605e1930266c2c47eb52729e900b42 SHA512 6ce954d8e03a0a76a17bf9560477126d5b61f5eef49c078a3383ff6ab7da375e0e1770ac440458c4a8b6e28fc325ee9d3ab21894ba31cf8b02bdd5a2e22c5396
+MISC metadata.xml 4780 BLAKE2B 57512cc79565297a5357767a663a93a49655de7d7ec8adbe7d0da21e0617c69255ca3a52153f7f2e2a21a3b96f378ab0c691666f5336896af422fc88ee5fada3 SHA512 60941d415e0733be68ab15af456f842e5793eeef6cf4459449cc919ff5255d1ab2b194ece2c4b4d90bdebc5f1601fd98952fe22bafff8918e25613180233dec5
diff --git a/net-analyzer/wireshark/metadata.xml b/net-analyzer/wireshark/metadata.xml
index 2297d39cd5df..1dcbdb4e4770 100644
--- a/net-analyzer/wireshark/metadata.xml
+++ b/net-analyzer/wireshark/metadata.xml
@@ -40,6 +40,7 @@
 		<flag name="editcap">Install editcap, to edit and/or translate the format of capture files</flag>
 		<flag name="libssh">Use <pkg>net-libs/libssh</pkg> (for sshdump)</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="mergecap">Install mergecap, to merge two or more capture files into one</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>
diff --git a/net-analyzer/wireshark/wireshark-2.4.3.ebuild b/net-analyzer/wireshark/wireshark-2.4.3.ebuild
index 1e04b00a0180..5fbf5cfe70b6 100644
--- a/net-analyzer/wireshark/wireshark-2.4.3.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.4.3.ebuild
@@ -14,7 +14,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
 IUSE="
 	adns androiddump +capinfos +caps +captype ciscodump cpu_flags_x86_sse4_2
 	+dftest doc doc-pdf +dumpcap +editcap geoip gtk kerberos libssh libxml2 lua
-	+mergecap +netlink nghttp2 +pcap portaudio +qt5 +randpkt +randpktdump
+	lz4 +mergecap +netlink nghttp2 +pcap portaudio +qt5 +randpkt +randpktdump
 	+reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl +text2pcap
 	tfshark +tshark +udpdump zlib
 "
@@ -42,6 +42,7 @@ CDEPEND="
 	libssh? ( >=net-libs/libssh-0.6 )
 	libxml2? ( dev-libs/libxml2 )
 	lua? ( >=dev-lang/lua-5.1:* )
+	lz4? ( app-arch/lz4 )
 	nghttp2? ( net-libs/nghttp2 )
 	pcap? ( net-libs/libpcap )
 	portaudio? ( media-libs/portaudio )
@@ -170,6 +171,7 @@ src_configure() {
 		$(use_with libssh) \
 		$(use_with libxml2) \
 		$(use_with lua) \
+		$(use_with lz4) \
 		$(use_with nghttp2) \
 		$(use_with pcap) \
 		$(use_with portaudio) \
diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-99999999.ebuild
index f8b854c9dc0b..32ecbd608dd8 100644
--- a/net-analyzer/wireshark/wireshark-99999999.ebuild
+++ b/net-analyzer/wireshark/wireshark-99999999.ebuild
@@ -14,7 +14,7 @@ KEYWORDS=""
 IUSE="
 	adns androiddump +capinfos +caps +captype ciscodump cpu_flags_x86_sse4_2
 	+dftest doc doc-pdf +dumpcap +editcap geoip gtk kerberos libssh libxml2 lua
-	+mergecap +netlink nghttp2 +pcap portaudio +qt5 +randpkt +randpktdump
+	lz4 +mergecap +netlink nghttp2 +pcap portaudio +qt5 +randpkt +randpktdump
 	+reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl +text2pcap
 	tfshark +tshark +udpdump zlib
 "
@@ -42,6 +42,7 @@ CDEPEND="
 	libssh? ( >=net-libs/libssh-0.6 )
 	libxml2? ( dev-libs/libxml2 )
 	lua? ( >=dev-lang/lua-5.1:* )
+	lz4? ( app-arch/lz4 )
 	nghttp2? ( net-libs/nghttp2 )
 	pcap? ( net-libs/libpcap )
 	portaudio? ( media-libs/portaudio )
@@ -174,6 +175,7 @@ src_configure() {
 		$(use_with libssh) \
 		$(use_with libxml2) \
 		$(use_with lua) \
+		$(use_with lz4) \
 		$(use_with nghttp2) \
 		$(use_with pcap) \
 		$(use_with portaudio) \
@@ -265,6 +267,7 @@ src_install() {
 
 pkg_postinst() {
 	gnome2_icon_cache_update
+	xdg_desktop_database_update
 	xdg_mimeinfo_database_update
 
 	# Add group for users allowed to sniff.
@@ -283,5 +286,6 @@ pkg_postinst() {
 
 pkg_postrm() {
 	gnome2_icon_cache_update
+	xdg_desktop_database_update
 	xdg_mimeinfo_database_update
 }