Gentoo Archives: gentoo-commits

From: "Jeroen Roovers (jer)" <jer@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-analyzer/wireshark: metadata.xml ChangeLog wireshark-1.8.2-r1.ebuild wireshark-1.6.10-r1.ebuild
Date: Fri, 31 Aug 2012 15:56:10
Message-Id: 20120831155555.C4BFE20DB1@flycatcher.gentoo.org
1 jer 12/08/31 15:55:55
2
3 Modified: metadata.xml ChangeLog wireshark-1.8.2-r1.ebuild
4 wireshark-1.6.10-r1.ebuild
5 Log:
6 Simplify aDNS support choices by zerochaos.
7
8 (Portage version: 2.2.0_alpha123/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.10 net-analyzer/wireshark/metadata.xml
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/metadata.xml?rev=1.10&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/metadata.xml?rev=1.10&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/metadata.xml?r1=1.9&r2=1.10
16
17 Index: metadata.xml
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/metadata.xml,v
20 retrieving revision 1.9
21 retrieving revision 1.10
22 diff -u -r1.9 -r1.10
23 --- metadata.xml 31 Aug 2012 15:26:42 -0000 1.9
24 +++ metadata.xml 31 Aug 2012 15:55:55 -0000 1.10
25 @@ -35,9 +35,10 @@
26 </longdescription>
27 <use>
28 <flag name='ares'>Use the GNU <pkg>net-dns/c-ares</pkg> library to resolve DNS names</flag>
29 +<flag name='adns'>Add support for asynchronous DNS</flag>
30 <flag name='doc-pdf'>Build documentation in pdf format (US and a4 paper sizes)</flag>
31 <flag name='gcrypt'>Use GNU crypto library (<pkg>dev-libs/libgcrypt</pkg>) to decrypt ipsec traffic</flag>
32 -<flag name='libadns'>Use the <pkg>net-lib/adns</pkg> library to resolve DNS names</flag>
33 +<flag name='libadns'>Use <pkg>net-lib/adns</pkg> instead of <pkg>net-dns/c-ares</pkg> to resolve DNS names</flag>
34 <flag name='pcap'>Use <pkg>net-libs/libpcap</pkg> for network packet capturing (build dumpcap, rawshark)</flag>
35 <flag name='smi'>Use <pkg>net-libs/libsmi</pkg> to resolve numeric OIDs into human readable format</flag>
36 </use>
37
38
39
40 1.384 net-analyzer/wireshark/ChangeLog
41
42 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/ChangeLog?rev=1.384&view=markup
43 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/ChangeLog?rev=1.384&content-type=text/plain
44 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/ChangeLog?r1=1.383&r2=1.384
45
46 Index: ChangeLog
47 ===================================================================
48 RCS file: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v
49 retrieving revision 1.383
50 retrieving revision 1.384
51 diff -u -r1.383 -r1.384
52 --- ChangeLog 31 Aug 2012 15:41:57 -0000 1.383
53 +++ ChangeLog 31 Aug 2012 15:55:55 -0000 1.384
54 @@ -1,6 +1,10 @@
55 # ChangeLog for net-analyzer/wireshark
56 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
57 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.383 2012/08/31 15:41:57 jer Exp $
58 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.384 2012/08/31 15:55:55 jer Exp $
59 +
60 + 31 Aug 2012; Jeroen Roovers <jer@g.o> wireshark-1.6.10-r1.ebuild,
61 + wireshark-1.8.2-r1.ebuild, metadata.xml:
62 + Simplify aDNS support choices by zerochaos.
63
64 31 Aug 2012; Jeroen Roovers <jer@g.o> wireshark-1.6.10-r1.ebuild:
65 Prefer USE=ares.
66
67
68
69 1.2 net-analyzer/wireshark/wireshark-1.8.2-r1.ebuild
70
71 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/wireshark-1.8.2-r1.ebuild?rev=1.2&view=markup
72 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/wireshark-1.8.2-r1.ebuild?rev=1.2&content-type=text/plain
73 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/wireshark-1.8.2-r1.ebuild?r1=1.1&r2=1.2
74
75 Index: wireshark-1.8.2-r1.ebuild
76 ===================================================================
77 RCS file: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.8.2-r1.ebuild,v
78 retrieving revision 1.1
79 retrieving revision 1.2
80 diff -u -r1.1 -r1.2
81 --- wireshark-1.8.2-r1.ebuild 31 Aug 2012 15:26:42 -0000 1.1
82 +++ wireshark-1.8.2-r1.ebuild 31 Aug 2012 15:55:55 -0000 1.2
83 @@ -1,6 +1,6 @@
84 # Copyright 1999-2012 Gentoo Foundation
85 # Distributed under the terms of the GNU General Public License v2
86 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.8.2-r1.ebuild,v 1.1 2012/08/31 15:26:42 jer Exp $
87 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.8.2-r1.ebuild,v 1.2 2012/08/31 15:55:55 jer Exp $
88
89 EAPI="4"
90 PYTHON_DEPEND="python? 2"
91 @@ -15,13 +15,9 @@
92 SLOT="0"
93 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
94 IUSE="
95 - adns +ares doc doc-pdf gtk ipv6 libadns lua gcrypt geoip kerberos profile
96 + adns doc doc-pdf gtk ipv6 libadns lua gcrypt geoip kerberos profile
97 +pcap portaudio python +caps selinux smi ssl zlib
98 "
99 -REQUIRED_USE="
100 - adns? ( ^^ ( ares libadns ) )
101 - adns? ( || ( ares libadns ) )
102 -"
103
104 RDEPEND=">=dev-libs/glib-2.14:2
105 zlib? ( sys-libs/zlib
106 @@ -38,7 +34,7 @@
107 kerberos? ( virtual/krb5 )
108 portaudio? ( media-libs/portaudio )
109 adns? (
110 - ares? ( >=net-dns/c-ares-1.5 )
111 + !libadns? ( >=net-dns/c-ares-1.5 )
112 libadns? ( net-libs/adns )
113 )
114 geoip? ( dev-libs/geoip )
115 @@ -132,6 +128,13 @@
116 append-flags $(test-flags-CC -nopie)
117 fi
118
119 + if use adns; then
120 + if use libadns; then
121 + myconf+="--with-adns --without-c-ares"
122 + else
123 + myconf+="--without-adns --with-c-ares"
124 + fi
125 + fi
126 # Workaround bug #213705. If krb5-config --libs has -lcrypto then pass
127 # --with-ssl to ./configure. (Mimics code from acinclude.m4).
128 if use kerberos; then
129 @@ -156,12 +159,10 @@
130 $(use_enable gtk wireshark) \
131 $(use_enable ipv6) \
132 $(use_enable profile profile-build) \
133 - $(use_with ares c-ares) \
134 $(use_with caps libcap) \
135 $(use_with gcrypt) \
136 $(use_with geoip) \
137 $(use_with kerberos krb5) \
138 - $(use_with libadns adns) \
139 $(use_with lua) \
140 $(use_with pcap dumpcap-group wireshark) \
141 $(use_with pcap) \
142
143
144
145 1.3 net-analyzer/wireshark/wireshark-1.6.10-r1.ebuild
146
147 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/wireshark-1.6.10-r1.ebuild?rev=1.3&view=markup
148 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/wireshark-1.6.10-r1.ebuild?rev=1.3&content-type=text/plain
149 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/wireshark-1.6.10-r1.ebuild?r1=1.2&r2=1.3
150
151 Index: wireshark-1.6.10-r1.ebuild
152 ===================================================================
153 RCS file: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.6.10-r1.ebuild,v
154 retrieving revision 1.2
155 retrieving revision 1.3
156 diff -u -r1.2 -r1.3
157 --- wireshark-1.6.10-r1.ebuild 31 Aug 2012 15:41:57 -0000 1.2
158 +++ wireshark-1.6.10-r1.ebuild 31 Aug 2012 15:55:55 -0000 1.3
159 @@ -1,6 +1,6 @@
160 # Copyright 1999-2012 Gentoo Foundation
161 # Distributed under the terms of the GNU General Public License v2
162 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.6.10-r1.ebuild,v 1.2 2012/08/31 15:41:57 jer Exp $
163 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.6.10-r1.ebuild,v 1.3 2012/08/31 15:55:55 jer Exp $
164
165 EAPI=4
166 PYTHON_DEPEND="python? 2"
167 @@ -15,13 +15,9 @@
168 SLOT="0"
169 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
170 IUSE="
171 - adns +ares doc doc-pdf gtk ipv6 libadns lua gcrypt geoip kerberos profile
172 + adns doc doc-pdf gtk ipv6 libadns lua gcrypt geoip kerberos profile
173 +pcap portaudio python +caps selinux smi ssl threads zlib
174 "
175 -REQUIRED_USE="
176 - adns? ( ^^ ( ares libadns ) )
177 - adns? ( || ( ares libadns ) )
178 -"
179
180 RDEPEND=">=dev-libs/glib-2.14:2
181 zlib? ( sys-libs/zlib
182 @@ -38,7 +34,7 @@
183 kerberos? ( virtual/krb5 )
184 portaudio? ( media-libs/portaudio )
185 adns? (
186 - ares? ( >=net-dns/c-ares-1.5 )
187 + !libadns? ( >=net-dns/c-ares-1.5 )
188 libadns? ( net-libs/adns )
189 )
190 geoip? ( dev-libs/geoip )
191 @@ -134,6 +130,14 @@
192 append-flags $(test-flags-CC -nopie)
193 fi
194
195 + if use adns; then
196 + if use libadns; then
197 + myconf+="--with-adns --without-c-ares"
198 + else
199 + myconf+="--without-adns --with-c-ares"
200 + fi
201 + fi
202 +
203 # Workaround bug #213705. If krb5-config --libs has -lcrypto then pass
204 # --with-ssl to ./configure. (Mimics code from acinclude.m4).
205 if use kerberos; then
206 @@ -159,12 +163,10 @@
207 $(use_enable ipv6) \
208 $(use_enable profile profile-build) \
209 $(use_enable threads) \
210 - $(use_with ares c-ares) \
211 $(use_with caps libcap) \
212 $(use_with gcrypt) \
213 $(use_with geoip) \
214 $(use_with kerberos krb5) \
215 - $(use_with libadns adns) \
216 $(use_with lua) \
217 $(use_with pcap dumpcap-group wireshark) \
218 $(use_with pcap) \