summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Volkov <pva@gentoo.org>2008-09-18 07:52:56 +0000
committerPeter Volkov <pva@gentoo.org>2008-09-18 07:52:56 +0000
commitcac7fec284223a9e7bdd2e806a399593b96ccab2 (patch)
tree81093c92df5148ccafef6bb98847bf5b66d321cf /net-analyzer
parentopenvas-plugins bump (diff)
downloadgentoo-2-cac7fec284223a9e7bdd2e806a399593b96ccab2.tar.gz
gentoo-2-cac7fec284223a9e7bdd2e806a399593b96ccab2.tar.bz2
gentoo-2-cac7fec284223a9e7bdd2e806a399593b96ccab2.zip
Fixed dependency on c-ares and configuration.
(Portage version: 2.2_rc8/cvs/Linux 2.6.26-gentoo i686)
Diffstat (limited to 'net-analyzer')
-rw-r--r--net-analyzer/wireshark/ChangeLog5
-rw-r--r--net-analyzer/wireshark/wireshark-1.1.0.ebuild8
2 files changed, 7 insertions, 6 deletions
diff --git a/net-analyzer/wireshark/ChangeLog b/net-analyzer/wireshark/ChangeLog
index e74a13cb923a..b811a45c3f94 100644
--- a/net-analyzer/wireshark/ChangeLog
+++ b/net-analyzer/wireshark/ChangeLog
@@ -1,6 +1,9 @@
# 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.121 2008/09/17 14:27:38 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.122 2008/09/18 07:52:56 pva Exp $
+
+ 18 Sep 2008; Peter Volkov <pva@gentoo.org> wireshark-1.1.0.ebuild:
+ Fixed dependency on c-ares and configuration.
*wireshark-1.1.0 (17 Sep 2008)
diff --git a/net-analyzer/wireshark/wireshark-1.1.0.ebuild b/net-analyzer/wireshark/wireshark-1.1.0.ebuild
index 6114a92ea6df..847c512e728d 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.1 2008/09/17 14:27:39 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.1.0.ebuild,v 1.2 2008/09/18 07:52:56 pva Exp $
EAPI=1
WANT_AUTOMAKE="1.9"
@@ -32,7 +32,7 @@ RDEPEND="zlib? ( sys-libs/zlib )
pcap? ( net-libs/libpcap )
pcre? ( dev-libs/libpcre )
caps? ( sys-libs/libcap )
- c-ares? ( net-dns/c-ares )
+ c-ares? ( >=net-dns/c-ares-1.5 )
!c-ares? ( adns? ( net-libs/adns ) )
kerberos? ( virtual/krb5 )
portaudio? ( media-libs/portaudio )
@@ -55,10 +55,8 @@ pkg_setup() {
if use c-ares && use adns; then
einfo "c-ares supersedes adns resolver. Using c-ares."
myconf="$(use_with c-ares) --without-adns"
- elif use adns; then
- myconf="$(use_with adns) --without-c-ares"
else
- myconf="--without-adns --without-c-ares" # disable automatic detection
+ myconf="$(use_with adns) $(use_with c-ares)"
fi
# Add group for users allowed to sniff.