commit: 6e5aa8837eccf4dd49c16640a27766ce2ea48655
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 11 14:29:50 2019 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sun Aug 11 14:30:08 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e5aa883
net-analyzer/wireshark: Add IUSE=minizip
Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>
net-analyzer/wireshark/metadata.xml | 1 +
net-analyzer/wireshark/wireshark-3.1.0.ebuild | 8 +++++---
net-analyzer/wireshark/wireshark-99999999.ebuild | 8 +++++---
3 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/net-analyzer/wireshark/metadata.xml
b/net-analyzer/wireshark/metadata.xml
index 4a20e26519d..17945000941 100644
--- a/net-analyzer/wireshark/metadata.xml
+++ b/net-analyzer/wireshark/metadata.xml
@@ -42,6 +42,7 @@ be exported to XML, PostScript®, CSV, or plain text.
<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>
<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>
diff --git a/net-analyzer/wireshark/wireshark-3.1.0.ebuild
b/net-analyzer/wireshark/wireshark-3.1.0.ebuild
index bd412c65b24..ac253458192 100644
--- a/net-analyzer/wireshark/wireshark-3.1.0.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.1.0.ebuild
@@ -15,9 +15,9 @@ KEYWORDS=""
IUSE="
adns androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc
dpauxmon +dumpcap +editcap kerberos libxml2 lua lz4 maxminddb +mergecap
- +netlink nghttp2 +plugins plugin_ifdemo +pcap +qt5 +randpkt +randpktdump
- +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl sdjournal
- +text2pcap tfshark +tshark +udpdump zlib
+ +minizip +netlink nghttp2 +plugins plugin_ifdemo +pcap +qt5 +randpkt
+ +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump
ssl
+ sdjournal +text2pcap tfshark +tshark +udpdump zlib
"
S=${WORKDIR}/${P/_/}
@@ -34,6 +34,7 @@ CDEPEND="
lua? ( >=dev-lang/lua-5.1:* )
lz4? ( app-arch/lz4 )
maxminddb? ( dev-libs/libmaxminddb )
+ minizip? ( sys-libs/zlib[minizip] )
netlink? ( dev-libs/libnl:3 )
nghttp2? ( net-libs/nghttp2 )
pcap? ( net-libs/libpcap )
@@ -158,6 +159,7 @@ src_configure() {
-DENABLE_LIBXML2=$(usex libxml2)
-DENABLE_LUA=$(usex lua)
-DENABLE_LZ4=$(usex lz4)
+ -DENABLE_MINIZIP=$(usex minizip)
-DENABLE_NETLINK=$(usex netlink)
-DENABLE_NGHTTP2=$(usex nghttp2)
-DENABLE_PCAP=$(usex pcap)
diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild
b/net-analyzer/wireshark/wireshark-99999999.ebuild
index c964508b1b0..d85aa0a5e07 100644
--- a/net-analyzer/wireshark/wireshark-99999999.ebuild
+++ b/net-analyzer/wireshark/wireshark-99999999.ebuild
@@ -15,9 +15,9 @@ KEYWORDS=""
IUSE="
adns androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc
dpauxmon +dumpcap +editcap kerberos libxml2 lua lz4 maxminddb +mergecap
- +netlink nghttp2 +plugins plugin_ifdemo +pcap +qt5 +randpkt +randpktdump
- +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl sdjournal
- +text2pcap tfshark +tshark +udpdump zlib
+ +minizip +netlink nghttp2 +plugins plugin_ifdemo +pcap +qt5 +randpkt
+ +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump
ssl
+ sdjournal +text2pcap tfshark +tshark +udpdump zlib
"
S=${WORKDIR}/${P/_/}
@@ -34,6 +34,7 @@ CDEPEND="
lua? ( >=dev-lang/lua-5.1:* )
lz4? ( app-arch/lz4 )
maxminddb? ( dev-libs/libmaxminddb )
+ minizip? ( sys-libs/zlib[minizip] )
netlink? ( dev-libs/libnl:3 )
nghttp2? ( net-libs/nghttp2 )
pcap? ( net-libs/libpcap )
@@ -158,6 +159,7 @@ src_configure() {
-DENABLE_LIBXML2=$(usex libxml2)
-DENABLE_LUA=$(usex lua)
-DENABLE_LZ4=$(usex lz4)
+ -DENABLE_MINIZIP=$(usex minizip)
-DENABLE_NETLINK=$(usex netlink)
-DENABLE_NGHTTP2=$(usex nghttp2)
-DENABLE_PCAP=$(usex pcap)