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, 29 Sep 2019 11:08:39
Message-Id: 1569755311.08dc74318b59387663a3ea097691ce8fff710283.jer@gentoo
1 commit: 08dc74318b59387663a3ea097691ce8fff710283
2 Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
3 AuthorDate: Sun Sep 29 11:06:27 2019 +0000
4 Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
5 CommitDate: Sun Sep 29 11:08:31 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08dc7431
7
8 net-analyzer/wireshark: USE=plugin_ifdemo => USE=plugin-ifdemo
9
10 Package-Manager: Portage-2.3.76, Repoman-2.3.17
11 Fixes: https://bugs.gentoo.org/695070
12 Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>
13
14 net-analyzer/wireshark/metadata.xml | 2 +-
15 net-analyzer/wireshark/wireshark-3.1.0.ebuild | 6 +++---
16 net-analyzer/wireshark/wireshark-99999999.ebuild | 6 +++---
17 3 files changed, 7 insertions(+), 7 deletions(-)
18
19 diff --git a/net-analyzer/wireshark/metadata.xml b/net-analyzer/wireshark/metadata.xml
20 index 3e0355cd9cc..1dfc66edc73 100644
21 --- a/net-analyzer/wireshark/metadata.xml
22 +++ b/net-analyzer/wireshark/metadata.xml
23 @@ -45,7 +45,7 @@ be exported to XML, PostScript®, CSV, or plain text.
24 <flag name="netlink">Use <pkg>dev-libs/libnl</pkg></flag>
25 <flag name="nghttp2">Use <pkg>net-libs/nghttp2</pkg> for HTTP/2 support</flag>
26 <flag name="pcap">Use <pkg>net-libs/libpcap</pkg> for network packet capturing (build dumpcap, rawshark)</flag>
27 -<flag name="plugin_ifdemo">Install plugin interface demo</flag>
28 +<flag name="plugin-ifdemo">Install plugin interface demo</flag>
29 <flag name="plugins">Install plugins</flag>
30 <flag name="randpkt">Install randpkt, a utility for creating pcap trace files full of random packets</flag>
31 <flag name="randpktdump">Install randpktdump, an extcap interface to provide access to the random packet generator (randpkt)</flag>
32
33 diff --git a/net-analyzer/wireshark/wireshark-3.1.0.ebuild b/net-analyzer/wireshark/wireshark-3.1.0.ebuild
34 index e489d3494c1..e19be1f83c4 100644
35 --- a/net-analyzer/wireshark/wireshark-3.1.0.ebuild
36 +++ b/net-analyzer/wireshark/wireshark-3.1.0.ebuild
37 @@ -15,7 +15,7 @@ KEYWORDS=""
38 IUSE="
39 adns androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc
40 dpauxmon +dumpcap +editcap kerberos libxml2 lua lz4 maxminddb +mergecap
41 - +minizip +netlink nghttp2 +plugins plugin_ifdemo +pcap +qt5 +randpkt
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 @@ -82,7 +82,7 @@ RDEPEND="
47 selinux? ( sec-policy/selinux-wireshark )
48 "
49 REQUIRED_USE="
50 - plugin_ifdemo? ( plugins )
51 + plugin-ifdemo? ( plugins )
52 "
53 PATCHES=(
54 "${FILESDIR}"/${PN}-2.4-androiddump.patch
55 @@ -163,7 +163,7 @@ src_configure() {
56 -DENABLE_NGHTTP2=$(usex nghttp2)
57 -DENABLE_PCAP=$(usex pcap)
58 -DENABLE_PLUGINS=$(usex plugins)
59 - -DENABLE_PLUGIN_IFDEMO=$(usex plugin_ifdemo)
60 + -DENABLE_PLUGIN_IFDEMO=$(usex plugin-ifdemo)
61 -DENABLE_SBC=$(usex sbc)
62 -DENABLE_SMI=$(usex smi)
63 -DENABLE_SNAPPY=$(usex snappy)
64
65 diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-99999999.ebuild
66 index 97001a17890..5fb0f378528 100644
67 --- a/net-analyzer/wireshark/wireshark-99999999.ebuild
68 +++ b/net-analyzer/wireshark/wireshark-99999999.ebuild
69 @@ -15,7 +15,7 @@ KEYWORDS=""
70 IUSE="
71 adns androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc
72 dpauxmon +dumpcap +editcap kerberos libxml2 lua lz4 maxminddb +mergecap
73 - +minizip +netlink nghttp2 +plugins plugin_ifdemo +pcap +qt5 +randpkt
74 + +minizip +netlink nghttp2 +plugins plugin-ifdemo +pcap +qt5 +randpkt
75 +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl
76 sdjournal +text2pcap tfshark +tshark +udpdump zlib
77 "
78 @@ -82,7 +82,7 @@ RDEPEND="
79 selinux? ( sec-policy/selinux-wireshark )
80 "
81 REQUIRED_USE="
82 - plugin_ifdemo? ( plugins )
83 + plugin-ifdemo? ( plugins )
84 "
85 PATCHES=(
86 "${FILESDIR}"/${PN}-2.4-androiddump.patch
87 @@ -163,7 +163,7 @@ src_configure() {
88 -DENABLE_NGHTTP2=$(usex nghttp2)
89 -DENABLE_PCAP=$(usex pcap)
90 -DENABLE_PLUGINS=$(usex plugins)
91 - -DENABLE_PLUGIN_IFDEMO=$(usex plugin_ifdemo)
92 + -DENABLE_PLUGIN_IFDEMO=$(usex plugin-ifdemo)
93 -DENABLE_SBC=$(usex sbc)
94 -DENABLE_SMI=$(usex smi)
95 -DENABLE_SNAPPY=$(usex snappy)