1 |
commit: 1ab9f82575f6a4997534944704bada56c5a38bb2 |
2 |
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Jul 5 08:31:47 2016 +0000 |
4 |
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Jul 5 08:32:17 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ab9f825 |
7 |
|
8 |
net-analyzer/wireshark: Clean up USE flags / configure options (bug #587922). |
9 |
|
10 |
Package-Manager: portage-2.3.0 |
11 |
|
12 |
net-analyzer/wireshark/wireshark-2.1.0.ebuild | 32 ++++++++----------- |
13 |
net-analyzer/wireshark/wireshark-99999999.ebuild | 40 +++++++++++++----------- |
14 |
2 files changed, 34 insertions(+), 38 deletions(-) |
15 |
|
16 |
diff --git a/net-analyzer/wireshark/wireshark-2.1.0.ebuild b/net-analyzer/wireshark/wireshark-2.1.0.ebuild |
17 |
index f3c3d54..66e32b8 100644 |
18 |
--- a/net-analyzer/wireshark/wireshark-2.1.0.ebuild |
19 |
+++ b/net-analyzer/wireshark/wireshark-2.1.0.ebuild |
20 |
@@ -13,9 +13,9 @@ LICENSE="GPL-2" |
21 |
SLOT="0/${PV}" |
22 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" |
23 |
IUSE=" |
24 |
- adns androiddump +caps crypt doc doc-pdf geoip +gtk3 ipv6 kerberos lua |
25 |
- +netlink +pcap portaudio +qt4 qt5 selinux sbc smi tfshark |
26 |
- cpu_flags_x86_sse4_2 ssl zlib |
27 |
+ adns androiddump +caps cpu_flags_x86_sse4_2 crypt doc doc-pdf geoip +gtk |
28 |
+ kerberos lua +netlink +pcap portaudio +qt4 qt5 sbc selinux smi ssl tfshark |
29 |
+ zlib |
30 |
" |
31 |
REQUIRED_USE=" |
32 |
ssl? ( crypt ) |
33 |
@@ -24,11 +24,6 @@ REQUIRED_USE=" |
34 |
|
35 |
S=${WORKDIR}/${P/_/} |
36 |
|
37 |
-GTK_COMMON_DEPEND=" |
38 |
- x11-libs/gdk-pixbuf |
39 |
- x11-libs/pango |
40 |
- x11-misc/xdg-utils |
41 |
-" |
42 |
CDEPEND=" |
43 |
>=dev-libs/glib-2.14:2 |
44 |
netlink? ( dev-libs/libnl:3 ) |
45 |
@@ -36,9 +31,11 @@ CDEPEND=" |
46 |
crypt? ( dev-libs/libgcrypt:0 ) |
47 |
caps? ( sys-libs/libcap ) |
48 |
geoip? ( dev-libs/geoip ) |
49 |
- gtk3? ( |
50 |
- ${GTK_COMMON_DEPEND} |
51 |
+ gtk? ( |
52 |
+ x11-libs/gdk-pixbuf |
53 |
x11-libs/gtk+:3 |
54 |
+ x11-libs/pango |
55 |
+ x11-misc/xdg-utils |
56 |
) |
57 |
kerberos? ( virtual/krb5 ) |
58 |
lua? ( >=dev-lang/lua-5.1:* ) |
59 |
@@ -83,7 +80,7 @@ DEPEND=" |
60 |
" |
61 |
RDEPEND=" |
62 |
${CDEPEND} |
63 |
- gtk3? ( virtual/freedesktop-icon-theme ) |
64 |
+ gtk? ( virtual/freedesktop-icon-theme ) |
65 |
qt4? ( virtual/freedesktop-icon-theme ) |
66 |
qt5? ( virtual/freedesktop-icon-theme ) |
67 |
selinux? ( sec-policy/selinux-wireshark ) |
68 |
@@ -121,7 +118,7 @@ src_configure() { |
69 |
fi |
70 |
|
71 |
# Enable wireshark binary with any supported GUI toolkit (bug #473188) |
72 |
- if use gtk3 || use qt4 || use qt5; then |
73 |
+ if use gtk || use qt4 || use qt5; then |
74 |
myconf+=( "--enable-wireshark" ) |
75 |
else |
76 |
myconf+=( "--disable-wireshark" ) |
77 |
@@ -149,23 +146,22 @@ src_configure() { |
78 |
econf \ |
79 |
$(use androiddump && use pcap && echo --enable-androiddump-use-libpcap=yes) \ |
80 |
$(use_enable androiddump) \ |
81 |
- $(use_enable ipv6) \ |
82 |
$(use_enable tfshark) \ |
83 |
$(use_with adns c-ares) \ |
84 |
$(use_with caps libcap) \ |
85 |
$(use_with crypt gcrypt) \ |
86 |
$(use_with geoip) \ |
87 |
- $(use_with gtk3) \ |
88 |
+ $(use_with gtk gtk 3) \ |
89 |
$(use_with kerberos krb5) \ |
90 |
$(use_with lua) \ |
91 |
$(use_with pcap dumpcap-group wireshark) \ |
92 |
$(use_with pcap) \ |
93 |
$(use_with portaudio) \ |
94 |
$(usex qt4 --with-qt=4 '') \ |
95 |
- $(usex qt5 --with-qt=5 '') \ |
96 |
$(usex qt4 MOC=$(qt4_get_bindir)/moc '') \ |
97 |
$(usex qt4 RCC=$(qt4_get_bindir)/rcc '') \ |
98 |
$(usex qt4 UIC=$(qt4_get_bindir)/uic '') \ |
99 |
+ $(usex qt5 --with-qt=5 '') \ |
100 |
$(usex qt5 MOC=$(qt5_get_bindir)/moc '') \ |
101 |
$(usex qt5 RCC=$(qt5_get_bindir)/rcc '') \ |
102 |
$(usex qt5 UIC=$(qt5_get_bindir)/uic '') \ |
103 |
@@ -176,15 +172,14 @@ src_configure() { |
104 |
$(usex netlink --with-libnl=3 --without-libnl) \ |
105 |
$(usex cpu_flags_x86_sse4_2 --enable-sse4_2 '') \ |
106 |
--disable-profile-build \ |
107 |
- --disable-usr-local \ |
108 |
--disable-warnings-as-errors \ |
109 |
--sysconfdir="${EPREFIX}"/etc/wireshark \ |
110 |
- --without-adns \ |
111 |
${myconf[@]} |
112 |
} |
113 |
|
114 |
src_compile() { |
115 |
default |
116 |
+ |
117 |
if use doc; then |
118 |
emake -j1 -C docbook |
119 |
if use doc-pdf; then |
120 |
@@ -192,7 +187,6 @@ src_compile() { |
121 |
emake -C docbook all-pdf |
122 |
fi |
123 |
fi |
124 |
- |
125 |
} |
126 |
|
127 |
src_install() { |
128 |
@@ -233,7 +227,7 @@ src_install() { |
129 |
insinto /usr/include/wiretap |
130 |
doins wiretap/wtap.h |
131 |
|
132 |
- if use gtk3 || use qt4 || use qt5; then |
133 |
+ if use gtk || use qt4 || use qt5; then |
134 |
local c d |
135 |
for c in hi lo; do |
136 |
for d in 16 32 48; do |
137 |
|
138 |
diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-99999999.ebuild |
139 |
index 7284d2f..fd9b8c9 100644 |
140 |
--- a/net-analyzer/wireshark/wireshark-99999999.ebuild |
141 |
+++ b/net-analyzer/wireshark/wireshark-99999999.ebuild |
142 |
@@ -1,4 +1,4 @@ |
143 |
-# Copyright 1999-2015 Gentoo Foundation |
144 |
+# Copyright 1999-2016 Gentoo Foundation |
145 |
# Distributed under the terms of the GNU General Public License v2 |
146 |
# $Id$ |
147 |
|
148 |
@@ -13,20 +13,15 @@ LICENSE="GPL-2" |
149 |
SLOT="0/${PV}" |
150 |
KEYWORDS="" |
151 |
IUSE=" |
152 |
- adns androiddump +caps cpu_flags_x86_sse4_2 crypt doc doc-pdf geoip +gtk3 |
153 |
- ipv6 kerberos lua +netlink +pcap portaudio +qt4 qt5 sbc selinux smi ssl |
154 |
- tfshark zlib |
155 |
+ adns androiddump +caps cpu_flags_x86_sse4_2 crypt doc doc-pdf geoip +gtk |
156 |
+ kerberos lua +netlink +pcap portaudio +qt4 qt5 sbc selinux smi ssl tfshark |
157 |
+ zlib |
158 |
" |
159 |
REQUIRED_USE=" |
160 |
ssl? ( crypt ) |
161 |
?? ( qt4 qt5 ) |
162 |
" |
163 |
|
164 |
-GTK_COMMON_DEPEND=" |
165 |
- x11-libs/gdk-pixbuf |
166 |
- x11-libs/pango |
167 |
- x11-misc/xdg-utils |
168 |
-" |
169 |
CDEPEND=" |
170 |
>=dev-libs/glib-2.14:2 |
171 |
netlink? ( dev-libs/libnl:3 ) |
172 |
@@ -34,9 +29,11 @@ CDEPEND=" |
173 |
crypt? ( dev-libs/libgcrypt:0 ) |
174 |
caps? ( sys-libs/libcap ) |
175 |
geoip? ( dev-libs/geoip ) |
176 |
- gtk3? ( |
177 |
- ${GTK_COMMON_DEPEND} |
178 |
+ gtk? ( |
179 |
+ x11-libs/gdk-pixbuf |
180 |
x11-libs/gtk+:3 |
181 |
+ x11-libs/pango |
182 |
+ x11-misc/xdg-utils |
183 |
) |
184 |
kerberos? ( virtual/krb5 ) |
185 |
lua? ( >=dev-lang/lua-5.1:* ) |
186 |
@@ -57,7 +54,7 @@ CDEPEND=" |
187 |
) |
188 |
sbc? ( media-libs/sbc ) |
189 |
smi? ( net-libs/libsmi ) |
190 |
- ssl? ( net-libs/gnutls ) |
191 |
+ ssl? ( net-libs/gnutls:= ) |
192 |
zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 ) |
193 |
" |
194 |
# We need perl for `pod2html`. The rest of the perl stuff is to block older |
195 |
@@ -81,7 +78,7 @@ DEPEND=" |
196 |
" |
197 |
RDEPEND=" |
198 |
${CDEPEND} |
199 |
- gtk3? ( virtual/freedesktop-icon-theme ) |
200 |
+ gtk? ( virtual/freedesktop-icon-theme ) |
201 |
qt4? ( virtual/freedesktop-icon-theme ) |
202 |
qt5? ( virtual/freedesktop-icon-theme ) |
203 |
selinux? ( sec-policy/selinux-wireshark ) |
204 |
@@ -123,7 +120,7 @@ src_configure() { |
205 |
fi |
206 |
|
207 |
# Enable wireshark binary with any supported GUI toolkit (bug #473188) |
208 |
- if use gtk3 || use qt4 || use qt5; then |
209 |
+ if use gtk || use qt4 || use qt5; then |
210 |
myconf+=( "--enable-wireshark" ) |
211 |
else |
212 |
myconf+=( "--disable-wireshark" ) |
213 |
@@ -158,15 +155,17 @@ src_configure() { |
214 |
$(use_with caps libcap) \ |
215 |
$(use_with crypt gcrypt) \ |
216 |
$(use_with geoip) \ |
217 |
- $(use_with gtk3) \ |
218 |
+ $(use_with gtk gtk 3) \ |
219 |
$(use_with kerberos krb5) \ |
220 |
$(use_with lua) \ |
221 |
$(use_with pcap dumpcap-group wireshark) \ |
222 |
$(use_with pcap) \ |
223 |
$(use_with portaudio) \ |
224 |
+ $(usex qt4 --with-qt=4 '') \ |
225 |
$(usex qt4 MOC=$(qt4_get_bindir)/moc '') \ |
226 |
$(usex qt4 RCC=$(qt4_get_bindir)/rcc '') \ |
227 |
$(usex qt4 UIC=$(qt4_get_bindir)/uic '') \ |
228 |
+ $(usex qt5 --with-qt=5 '') \ |
229 |
$(usex qt5 MOC=$(qt5_get_bindir)/moc '') \ |
230 |
$(usex qt5 RCC=$(qt5_get_bindir)/rcc '') \ |
231 |
$(usex qt5 UIC=$(qt5_get_bindir)/uic '') \ |
232 |
@@ -177,23 +176,26 @@ src_configure() { |
233 |
$(usex netlink --with-libnl=3 --without-libnl) \ |
234 |
$(usex cpu_flags_x86_sse4_2 --enable-sse4_2 '') \ |
235 |
--disable-profile-build \ |
236 |
- --disable-usr-local \ |
237 |
--disable-warnings-as-errors \ |
238 |
--sysconfdir="${EPREFIX}"/etc/wireshark \ |
239 |
- --without-adns \ |
240 |
${myconf[@]} |
241 |
} |
242 |
|
243 |
src_compile() { |
244 |
default |
245 |
+ |
246 |
if use doc; then |
247 |
- use doc-pdf && addpredict "/root/.java" |
248 |
emake -j1 -C docbook |
249 |
+ if use doc-pdf; then |
250 |
+ addpredict "/root/.java" |
251 |
+ emake -C docbook all-pdf |
252 |
+ fi |
253 |
fi |
254 |
} |
255 |
|
256 |
src_install() { |
257 |
default |
258 |
+ |
259 |
if use doc; then |
260 |
dohtml -r docbook/{release-notes.html,ws{d,u}g_html{,_chunked}} |
261 |
if use doc-pdf; then |
262 |
@@ -229,7 +231,7 @@ src_install() { |
263 |
insinto /usr/include/wiretap |
264 |
doins wiretap/wtap.h |
265 |
|
266 |
- if use gtk3 || use qt4 || use qt5; then |
267 |
+ if use gtk || use qt4 || use qt5; then |
268 |
local c d |
269 |
for c in hi lo; do |
270 |
for d in 16 32 48; do |