Gentoo Archives: gentoo-commits

From: Jeroen Roovers <jer@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
Date: Sun, 11 Aug 2019 14:30:23
Message-Id: 1565533808.6e5aa8837eccf4dd49c16640a27766ce2ea48655.jer@gentoo
1 commit: 6e5aa8837eccf4dd49c16640a27766ce2ea48655
2 Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
3 AuthorDate: Sun Aug 11 14:29:50 2019 +0000
4 Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
5 CommitDate: Sun Aug 11 14:30:08 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e5aa883
7
8 net-analyzer/wireshark: Add IUSE=minizip
9
10 Package-Manager: Portage-2.3.71, Repoman-2.3.17
11 Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>
12
13 net-analyzer/wireshark/metadata.xml | 1 +
14 net-analyzer/wireshark/wireshark-3.1.0.ebuild | 8 +++++---
15 net-analyzer/wireshark/wireshark-99999999.ebuild | 8 +++++---
16 3 files changed, 11 insertions(+), 6 deletions(-)
17
18 diff --git a/net-analyzer/wireshark/metadata.xml b/net-analyzer/wireshark/metadata.xml
19 index 4a20e26519d..17945000941 100644
20 --- a/net-analyzer/wireshark/metadata.xml
21 +++ b/net-analyzer/wireshark/metadata.xml
22 @@ -42,6 +42,7 @@ be exported to XML, PostScript®, CSV, or plain text.
23 <flag name="lz4">Use <pkg>app-arch/lz4</pkg> for compression/decompression</flag>
24 <flag name="maxminddb">Use <pkg>dev-libs/libmaxminddb</pkg> for IP address geolocation</flag>
25 <flag name="mergecap">Install mergecap, to merge two or more capture files into one</flag>
26 +<flag name="minizip">Build with zip file compression support</flag>
27 <flag name="netlink">Use <pkg>dev-libs/libnl</pkg></flag>
28 <flag name="nghttp2">Use <pkg>net-libs/nghttp2</pkg> for HTTP/2 support</flag>
29 <flag name="pcap">Use <pkg>net-libs/libpcap</pkg> for network packet capturing (build dumpcap, rawshark)</flag>
30
31 diff --git a/net-analyzer/wireshark/wireshark-3.1.0.ebuild b/net-analyzer/wireshark/wireshark-3.1.0.ebuild
32 index bd412c65b24..ac253458192 100644
33 --- a/net-analyzer/wireshark/wireshark-3.1.0.ebuild
34 +++ b/net-analyzer/wireshark/wireshark-3.1.0.ebuild
35 @@ -15,9 +15,9 @@ KEYWORDS=""
36 IUSE="
37 adns androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc
38 dpauxmon +dumpcap +editcap kerberos libxml2 lua lz4 maxminddb +mergecap
39 - +netlink nghttp2 +plugins plugin_ifdemo +pcap +qt5 +randpkt +randpktdump
40 - +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl sdjournal
41 - +text2pcap tfshark +tshark +udpdump zlib
42 + +minizip +netlink nghttp2 +plugins plugin_ifdemo +pcap +qt5 +randpkt
43 + +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl
44 + sdjournal +text2pcap tfshark +tshark +udpdump zlib
45 "
46 S=${WORKDIR}/${P/_/}
47
48 @@ -34,6 +34,7 @@ CDEPEND="
49 lua? ( >=dev-lang/lua-5.1:* )
50 lz4? ( app-arch/lz4 )
51 maxminddb? ( dev-libs/libmaxminddb )
52 + minizip? ( sys-libs/zlib[minizip] )
53 netlink? ( dev-libs/libnl:3 )
54 nghttp2? ( net-libs/nghttp2 )
55 pcap? ( net-libs/libpcap )
56 @@ -158,6 +159,7 @@ src_configure() {
57 -DENABLE_LIBXML2=$(usex libxml2)
58 -DENABLE_LUA=$(usex lua)
59 -DENABLE_LZ4=$(usex lz4)
60 + -DENABLE_MINIZIP=$(usex minizip)
61 -DENABLE_NETLINK=$(usex netlink)
62 -DENABLE_NGHTTP2=$(usex nghttp2)
63 -DENABLE_PCAP=$(usex pcap)
64
65 diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-99999999.ebuild
66 index c964508b1b0..d85aa0a5e07 100644
67 --- a/net-analyzer/wireshark/wireshark-99999999.ebuild
68 +++ b/net-analyzer/wireshark/wireshark-99999999.ebuild
69 @@ -15,9 +15,9 @@ KEYWORDS=""
70 IUSE="
71 adns androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc
72 dpauxmon +dumpcap +editcap kerberos libxml2 lua lz4 maxminddb +mergecap
73 - +netlink nghttp2 +plugins plugin_ifdemo +pcap +qt5 +randpkt +randpktdump
74 - +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl sdjournal
75 - +text2pcap tfshark +tshark +udpdump zlib
76 + +minizip +netlink nghttp2 +plugins plugin_ifdemo +pcap +qt5 +randpkt
77 + +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl
78 + sdjournal +text2pcap tfshark +tshark +udpdump zlib
79 "
80 S=${WORKDIR}/${P/_/}
81
82 @@ -34,6 +34,7 @@ CDEPEND="
83 lua? ( >=dev-lang/lua-5.1:* )
84 lz4? ( app-arch/lz4 )
85 maxminddb? ( dev-libs/libmaxminddb )
86 + minizip? ( sys-libs/zlib[minizip] )
87 netlink? ( dev-libs/libnl:3 )
88 nghttp2? ( net-libs/nghttp2 )
89 pcap? ( net-libs/libpcap )
90 @@ -158,6 +159,7 @@ src_configure() {
91 -DENABLE_LIBXML2=$(usex libxml2)
92 -DENABLE_LUA=$(usex lua)
93 -DENABLE_LZ4=$(usex lz4)
94 + -DENABLE_MINIZIP=$(usex minizip)
95 -DENABLE_NETLINK=$(usex netlink)
96 -DENABLE_NGHTTP2=$(usex nghttp2)
97 -DENABLE_PCAP=$(usex pcap)