Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Peter Volkov (pva)" <pva@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-analyzer/wireshark: metadata.xml wireshark-1.1.0.ebuild ChangeLog
Date: Sat, 04 Oct 2008 11:51:22
Message-Id: E1Km5fI-0002Ki-Eu@stork.gentoo.org
1 pva 08/10/04 11:51:16
2
3 Modified: metadata.xml wireshark-1.1.0.ebuild ChangeLog
4 Log:
5 Change c-ares USE flag to ares, as other packages already USE ares.
6 (Portage version: 2.2_rc11/cvs/Linux 2.6.26-gentoo-r1 i686)
7
8 Revision Changes Path
9 1.5 net-analyzer/wireshark/metadata.xml
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/wireshark/metadata.xml?rev=1.5&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/wireshark/metadata.xml?rev=1.5&content-type=text/plain
13 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/wireshark/metadata.xml?r1=1.4&r2=1.5
14
15 Index: metadata.xml
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/metadata.xml,v
18 retrieving revision 1.4
19 retrieving revision 1.5
20 diff -u -r1.4 -r1.5
21 --- metadata.xml 17 Sep 2008 14:27:39 -0000 1.4
22 +++ metadata.xml 4 Oct 2008 11:51:15 -0000 1.5
23 @@ -30,7 +30,7 @@
24 </longdescription>
25 <use>
26 <flag name='gcrypt'>Use GNU crypto library (<pkg>dev-libs/libgcrypt</pkg>) to decrypt SSL traffic</flag>
27 -<flag name='c-ares'>Use GNU <pkg>net-dns/c-ares</pkg> library to resolve DNS names</flag>
28 +<flag name='ares'>Use GNU <pkg>net-dns/c-ares</pkg> library to resolve DNS names</flag>
29 <flag name='pcap'>Use <pkg>net-libs/libpcap</pkg> for network packet capturing (build dumpcap, rawshark)</flag>
30 <flag name='smi'>Use <pkg>net-libs/libsmi</pkg> to resolve numeric OIDs into human readable format</flag>
31 </use>
32
33
34
35 1.3 net-analyzer/wireshark/wireshark-1.1.0.ebuild
36
37 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/wireshark/wireshark-1.1.0.ebuild?rev=1.3&view=markup
38 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/wireshark/wireshark-1.1.0.ebuild?rev=1.3&content-type=text/plain
39 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/wireshark/wireshark-1.1.0.ebuild?r1=1.2&r2=1.3
40
41 Index: wireshark-1.1.0.ebuild
42 ===================================================================
43 RCS file: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.1.0.ebuild,v
44 retrieving revision 1.2
45 retrieving revision 1.3
46 diff -u -r1.2 -r1.3
47 --- wireshark-1.1.0.ebuild 18 Sep 2008 07:52:56 -0000 1.2
48 +++ wireshark-1.1.0.ebuild 4 Oct 2008 11:51:15 -0000 1.3
49 @@ -1,6 +1,6 @@
50 # Copyright 1999-2008 Gentoo Foundation
51 # Distributed under the terms of the GNU General Public License v2
52 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.1.0.ebuild,v 1.2 2008/09/18 07:52:56 pva Exp $
53 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.1.0.ebuild,v 1.3 2008/10/04 11:51:15 pva Exp $
54
55 EAPI=1
56 WANT_AUTOMAKE="1.9"
57 @@ -18,7 +18,7 @@
58 LICENSE="GPL-2"
59 SLOT="0"
60 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
61 -IUSE="adns gtk ipv6 lua portaudio gnutls c-ares gcrypt zlib kerberos threads profile smi +pcap pcre +caps selinux"
62 +IUSE="adns gtk ipv6 lua portaudio gnutls ares gcrypt zlib kerberos threads profile smi +pcap pcre +caps selinux"
63
64 RDEPEND="zlib? ( sys-libs/zlib )
65 smi? ( net-libs/libsmi )
66 @@ -32,8 +32,8 @@
67 pcap? ( net-libs/libpcap )
68 pcre? ( dev-libs/libpcre )
69 caps? ( sys-libs/libcap )
70 - c-ares? ( >=net-dns/c-ares-1.5 )
71 - !c-ares? ( adns? ( net-libs/adns ) )
72 + ares? ( >=net-dns/c-ares-1.5 )
73 + !ares? ( adns? ( net-libs/adns ) )
74 kerberos? ( virtual/krb5 )
75 portaudio? ( media-libs/portaudio )
76 lua? ( >=dev-lang/lua-5.1 )
77 @@ -52,11 +52,12 @@
78 ewarn "only command line utils are available"
79 fi
80
81 - if use c-ares && use adns; then
82 - einfo "c-ares supersedes adns resolver. Using c-ares."
83 - myconf="$(use_with c-ares) --without-adns"
84 + if use ares && use adns; then
85 + einfo "You asked for both, ares and adns, but we can use only one of them."
86 + einfo "c-ares supersedes adns resolver thus using c-ares (ares USE flag)."
87 + myconf="$(use_with ares c-ares) --without-adns"
88 else
89 - myconf="$(use_with adns) $(use_with c-ares)"
90 + myconf="$(use_with adns) $(use_with ares c-ares)"
91 fi
92
93 # Add group for users allowed to sniff.
94
95
96
97 1.123 net-analyzer/wireshark/ChangeLog
98
99 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/wireshark/ChangeLog?rev=1.123&view=markup
100 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/wireshark/ChangeLog?rev=1.123&content-type=text/plain
101 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/wireshark/ChangeLog?r1=1.122&r2=1.123
102
103 Index: ChangeLog
104 ===================================================================
105 RCS file: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v
106 retrieving revision 1.122
107 retrieving revision 1.123
108 diff -u -r1.122 -r1.123
109 --- ChangeLog 18 Sep 2008 07:52:56 -0000 1.122
110 +++ ChangeLog 4 Oct 2008 11:51:15 -0000 1.123
111 @@ -1,6 +1,10 @@
112 # ChangeLog for net-analyzer/wireshark
113 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
114 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.122 2008/09/18 07:52:56 pva Exp $
115 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.123 2008/10/04 11:51:15 pva Exp $
116 +
117 + 04 Oct 2008; Peter Volkov <pva@g.o> metadata.xml,
118 + wireshark-1.1.0.ebuild:
119 + Change c-ares USE flag to ares, as other packages already USE ares.
120
121 18 Sep 2008; Peter Volkov <pva@g.o> wireshark-1.1.0.ebuild:
122 Fixed dependency on c-ares and configuration.
Report Message
Find on MARC Find on Google Groups