1 |
commit: 8576e71bef170d86fa3913764aa26253ec947d4b |
2 |
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Apr 23 11:12:56 2019 +0000 |
4 |
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Apr 23 11:15:49 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8576e71b |
7 |
|
8 |
net-analyzer/wireshark: Update live ebuild |
9 |
|
10 |
* EAPI=7 |
11 |
* Add USE=brotli |
12 |
* Add USE=plugins (enabled by default) |
13 |
* Add USE=plugin_ifdemo (disabled by default) |
14 |
* Run cmake-utils_src_test in src_test |
15 |
|
16 |
Package-Manager: Portage-2.3.64, Repoman-2.3.12 |
17 |
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org> |
18 |
|
19 |
net-analyzer/wireshark/metadata.xml | 3 +++ |
20 |
net-analyzer/wireshark/wireshark-99999999.ebuild | 26 ++++++++++++++---------- |
21 |
2 files changed, 18 insertions(+), 11 deletions(-) |
22 |
|
23 |
diff --git a/net-analyzer/wireshark/metadata.xml b/net-analyzer/wireshark/metadata.xml |
24 |
index 268fb295645..4a20e26519d 100644 |
25 |
--- a/net-analyzer/wireshark/metadata.xml |
26 |
+++ b/net-analyzer/wireshark/metadata.xml |
27 |
@@ -30,6 +30,7 @@ be exported to XML, PostScript®, CSV, or plain text. |
28 |
<flag name="adns">Use <pkg>net-dns/c-ares</pkg> to resolve DNS names</flag> |
29 |
<flag name="androiddump">Install androiddump, an extcap interface to capture from Android devices</flag> |
30 |
<flag name="bcg729">Use <pkg>media-libs/bcg729</pkg> for G.729 codec support in RTP Player</flag> |
31 |
+<flag name="brotli">Use <pkg>app-arch/brotli</pkg> for compression/decompression</flag> |
32 |
<flag name="capinfos">Install capinfos, to print information about capture files</flag> |
33 |
<flag name="captype">Install captype, to print the file types of capture files</flag> |
34 |
<flag name="ciscodump">Install ciscodump, extcap interface to capture from a remote Cisco router</flag> |
35 |
@@ -44,6 +45,8 @@ be exported to XML, PostScript®, CSV, or plain text. |
36 |
<flag name="netlink">Use <pkg>dev-libs/libnl</pkg></flag> |
37 |
<flag name="nghttp2">Use <pkg>net-libs/nghttp2</pkg> for HTTP/2 support</flag> |
38 |
<flag name="pcap">Use <pkg>net-libs/libpcap</pkg> for network packet capturing (build dumpcap, rawshark)</flag> |
39 |
+<flag name="plugin_ifdemo">Install plugin interface demo</flag> |
40 |
+<flag name="plugins">Install plugins</flag> |
41 |
<flag name="randpkt">Install randpkt, a utility for creating pcap trace files full of random packets</flag> |
42 |
<flag name="randpktdump">Install randpktdump, an extcap interface to provide access to the random packet generator (randpkt)</flag> |
43 |
<flag name="reordercap">Install reordercap, to reorder input file by timestamp into output file</flag> |
44 |
|
45 |
diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-99999999.ebuild |
46 |
index 1070cd95b0e..937819a5e03 100644 |
47 |
--- a/net-analyzer/wireshark/wireshark-99999999.ebuild |
48 |
+++ b/net-analyzer/wireshark/wireshark-99999999.ebuild |
49 |
@@ -1,9 +1,9 @@ |
50 |
# Copyright 1999-2019 Gentoo Authors |
51 |
# Distributed under the terms of the GNU General Public License v2 |
52 |
|
53 |
-EAPI=6 |
54 |
+EAPI=7 |
55 |
PYTHON_COMPAT=( python3_{5,6,7} ) |
56 |
-inherit cmake-utils fcaps flag-o-matic git-r3 ltprune multilib python-r1 qmake-utils user xdg-utils |
57 |
+inherit fcaps flag-o-matic git-r3 multilib python-r1 qmake-utils user xdg-utils cmake-utils |
58 |
|
59 |
DESCRIPTION="A network protocol analyzer formerly known as ethereal" |
60 |
HOMEPAGE="https://www.wireshark.org/" |
61 |
@@ -13,11 +13,11 @@ LICENSE="GPL-2" |
62 |
SLOT="0/${PV}" |
63 |
KEYWORDS="" |
64 |
IUSE=" |
65 |
- adns androiddump bcg729 +capinfos +captype ciscodump +dftest doc dpauxmon |
66 |
- +dumpcap +editcap kerberos libxml2 lua lz4 maxminddb +mergecap +netlink |
67 |
- nghttp2 +pcap +qt5 +randpkt +randpktdump +reordercap sbc selinux +sharkd |
68 |
- smi snappy spandsp sshdump ssl sdjournal +text2pcap tfshark +tshark |
69 |
- +udpdump zlib |
70 |
+ adns androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc |
71 |
+ dpauxmon +dumpcap +editcap kerberos libxml2 lua lz4 maxminddb +mergecap |
72 |
+ +netlink nghttp2 +plugins plugin_ifdemo +pcap +qt5 +randpkt +randpktdump |
73 |
+ +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl sdjournal |
74 |
+ +text2pcap tfshark +tshark +udpdump zlib |
75 |
" |
76 |
|
77 |
S=${WORKDIR}/${P/_/} |
78 |
@@ -27,6 +27,7 @@ CDEPEND=" |
79 |
dev-libs/libgcrypt:0 |
80 |
adns? ( >=net-dns/c-ares-1.5 ) |
81 |
bcg729? ( media-libs/bcg729 ) |
82 |
+ brotli? ( app-arch/brotli ) |
83 |
ciscodump? ( >=net-libs/libssh-0.6 ) |
84 |
filecaps? ( sys-libs/libcap ) |
85 |
kerberos? ( virtual/krb5 ) |
86 |
@@ -59,6 +60,8 @@ CDEPEND=" |
87 |
DEPEND=" |
88 |
${CDEPEND} |
89 |
${PYTHON_DEPS} |
90 |
+" |
91 |
+BDEPEND=" |
92 |
!<perl-core/Pod-Simple-3.170 |
93 |
!<virtual/perl-Pod-Simple-3.170 |
94 |
dev-lang/perl |
95 |
@@ -80,6 +83,7 @@ RDEPEND=" |
96 |
" |
97 |
REQUIRED_USE=" |
98 |
${PYTHON_REQUIRED_USE} |
99 |
+ plugin_ifdemo? ( plugins ) |
100 |
" |
101 |
PATCHES=( |
102 |
"${FILESDIR}"/${PN}-2.4-androiddump.patch |
103 |
@@ -147,6 +151,7 @@ src_configure() { |
104 |
-DCMAKE_INSTALL_DOCDIR="/usr/share/doc/${PF}" |
105 |
-DDISABLE_WERROR=yes |
106 |
-DENABLE_BCG729=$(usex bcg729) |
107 |
+ -DENABLE_BROTLI=$(usex brotli) |
108 |
-DENABLE_CAP=$(usex filecaps caps) |
109 |
-DENABLE_CARES=$(usex adns) |
110 |
-DENABLE_GNUTLS=$(usex ssl) |
111 |
@@ -157,6 +162,8 @@ src_configure() { |
112 |
-DENABLE_NETLINK=$(usex netlink) |
113 |
-DENABLE_NGHTTP2=$(usex nghttp2) |
114 |
-DENABLE_PCAP=$(usex pcap) |
115 |
+ -DENABLE_PLUGINS=$(usex plugins) |
116 |
+ -DENABLE_PLUGIN_IFDEMO=$(usex plugin_ifdemo) |
117 |
-DENABLE_SBC=$(usex sbc) |
118 |
-DENABLE_SMI=$(usex smi) |
119 |
-DENABLE_SNAPPY=$(usex snappy) |
120 |
@@ -168,8 +175,7 @@ src_configure() { |
121 |
} |
122 |
|
123 |
src_test() { |
124 |
- emake -C "${BUILD_DIR}" test-programs |
125 |
- emake -C "${BUILD_DIR}" test |
126 |
+ cmake-utils_src_test |
127 |
} |
128 |
|
129 |
src_install() { |
130 |
@@ -215,8 +221,6 @@ src_install() { |
131 |
newins image/WiresharkDoc-${s}.png application-vnd.tcpdump.pcap.png |
132 |
done |
133 |
fi |
134 |
- |
135 |
- prune_libtool_files |
136 |
} |
137 |
|
138 |
pkg_postinst() { |