diff options
Diffstat (limited to 'net-analyzer')
-rw-r--r-- | net-analyzer/wireshark/ChangeLog | 6 | ||||
-rw-r--r-- | net-analyzer/wireshark/metadata.xml | 2 | ||||
-rw-r--r-- | net-analyzer/wireshark/wireshark-1.1.0.ebuild | 17 |
3 files changed, 15 insertions, 10 deletions
diff --git a/net-analyzer/wireshark/ChangeLog b/net-analyzer/wireshark/ChangeLog index b811a45c3f94..be88994b81c2 100644 --- a/net-analyzer/wireshark/ChangeLog +++ b/net-analyzer/wireshark/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-analyzer/wireshark # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.122 2008/09/18 07:52:56 pva Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.123 2008/10/04 11:51:15 pva Exp $ + + 04 Oct 2008; Peter Volkov <pva@gentoo.org> metadata.xml, + wireshark-1.1.0.ebuild: + Change c-ares USE flag to ares, as other packages already USE ares. 18 Sep 2008; Peter Volkov <pva@gentoo.org> wireshark-1.1.0.ebuild: Fixed dependency on c-ares and configuration. diff --git a/net-analyzer/wireshark/metadata.xml b/net-analyzer/wireshark/metadata.xml index dd7231c7866d..059e62c80618 100644 --- a/net-analyzer/wireshark/metadata.xml +++ b/net-analyzer/wireshark/metadata.xml @@ -30,7 +30,7 @@ </longdescription> <use> <flag name='gcrypt'>Use GNU crypto library (<pkg>dev-libs/libgcrypt</pkg>) to decrypt SSL traffic</flag> -<flag name='c-ares'>Use GNU <pkg>net-dns/c-ares</pkg> library to resolve DNS names</flag> +<flag name='ares'>Use GNU <pkg>net-dns/c-ares</pkg> library to resolve DNS names</flag> <flag name='pcap'>Use <pkg>net-libs/libpcap</pkg> for network packet capturing (build dumpcap, rawshark)</flag> <flag name='smi'>Use <pkg>net-libs/libsmi</pkg> to resolve numeric OIDs into human readable format</flag> </use> diff --git a/net-analyzer/wireshark/wireshark-1.1.0.ebuild b/net-analyzer/wireshark/wireshark-1.1.0.ebuild index 847c512e728d..f6db31337fea 100644 --- a/net-analyzer/wireshark/wireshark-1.1.0.ebuild +++ b/net-analyzer/wireshark/wireshark-1.1.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.1.0.ebuild,v 1.2 2008/09/18 07:52:56 pva Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.1.0.ebuild,v 1.3 2008/10/04 11:51:15 pva Exp $ EAPI=1 WANT_AUTOMAKE="1.9" @@ -18,7 +18,7 @@ SRC_URI="http://www.wireshark.org/download/src/all-versions/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" -IUSE="adns gtk ipv6 lua portaudio gnutls c-ares gcrypt zlib kerberos threads profile smi +pcap pcre +caps selinux" +IUSE="adns gtk ipv6 lua portaudio gnutls ares gcrypt zlib kerberos threads profile smi +pcap pcre +caps selinux" RDEPEND="zlib? ( sys-libs/zlib ) smi? ( net-libs/libsmi ) @@ -32,8 +32,8 @@ RDEPEND="zlib? ( sys-libs/zlib ) pcap? ( net-libs/libpcap ) pcre? ( dev-libs/libpcre ) caps? ( sys-libs/libcap ) - c-ares? ( >=net-dns/c-ares-1.5 ) - !c-ares? ( adns? ( net-libs/adns ) ) + ares? ( >=net-dns/c-ares-1.5 ) + !ares? ( adns? ( net-libs/adns ) ) kerberos? ( virtual/krb5 ) portaudio? ( media-libs/portaudio ) lua? ( >=dev-lang/lua-5.1 ) @@ -52,11 +52,12 @@ pkg_setup() { ewarn "only command line utils are available" fi - if use c-ares && use adns; then - einfo "c-ares supersedes adns resolver. Using c-ares." - myconf="$(use_with c-ares) --without-adns" + if use ares && use adns; then + einfo "You asked for both, ares and adns, but we can use only one of them." + einfo "c-ares supersedes adns resolver thus using c-ares (ares USE flag)." + myconf="$(use_with ares c-ares) --without-adns" else - myconf="$(use_with adns) $(use_with c-ares)" + myconf="$(use_with adns) $(use_with ares c-ares)" fi # Add group for users allowed to sniff. |