Fixed dependency on c-ares and configuration.

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.26-gentoo i686

3 files changed, 9 insertions, 8 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/Manifest b/net-analyzer/wireshark/Manifest
index d0cb1578b9c7..83a87ac74ae5 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -5,6 +5,6 @@ AUX wireshark-except-double-free.diff 664 RMD160 2b61f03f5148975f6438351c11de18a
 DIST wireshark-1.0.3.tar.bz2 13104737 RMD160 02714cf78ddc8aefb3506509ceb31d35b4402686 SHA1 4094c2ce9f49730e640b677ebb57dc33427e4517 SHA256 77896f306b56979243df95966d57d2a361f251f2cabf872bfaf9f897015eb3f2
 DIST wireshark-1.1.0.tar.gz 17750269 RMD160 c1dded7e37ae41b0283fcefc8243d13a9365afe3 SHA1 3a9301be54df22b5f6dc9262dd7d11046cd91c9d SHA256 3175f9b1f34c62c84c079f71170c6d86b603cc093452e5768bc5887f93430f38
 EBUILD wireshark-1.0.3.ebuild 4981 RMD160 3011fd330a111acf197b1f535d855dc796a738ff SHA1 20f351fbeb0d2aea981155cfcd129adefbd3b386 SHA256 4849cdd99f2d1212667ec7d6004711821e15e24ea06f9305ae9c527fe7777a44
-EBUILD wireshark-1.1.0.ebuild 5251 RMD160 8a0f8ca9377748c72ca8d6501c5d06a94027609a SHA1 4da4e8adc2935852b265e03b2f5e1903cd1b21de SHA256 91256ba0defe60e0d2ac9f89955fc26b5bac40c118ccc0bb91b7d4a718ac2a42
-MISC ChangeLog 18817 RMD160 6cb891e430363ae6619c6b8f69f02a05b7e41052 SHA1 bc4e80dc55908a9b37c161f473ea22436b414210 SHA256 419531e04fd823b2627a22667cf7a95149ed5e5ae04d37d0a6845d5b848965eb
+EBUILD wireshark-1.1.0.ebuild 5165 RMD160 bcafefe73b82bfe70c6cd80f40aa04f433638510 SHA1 9cccf7c72aa7dbb7e74f3b2ac069e1cd2996ce51 SHA256 5a6fde52d0c3418626bb3049f26c0e77ee292efb6b99143f17130ae9e9278763
+MISC ChangeLog 18935 RMD160 038c1495092606a1163bf3ea181be6c0536d0361 SHA1 cce6d490d50af47ccfc2afa8a6fd29cab87fab6a SHA256 b27f1872110116302e9ec2f299c3e5944f0745e32d8f27d2e14111ab7952d8b9
 MISC metadata.xml 2156 RMD160 dee58252b20aa510c61b26c8dabbf0aab9c37510 SHA1 d1ecf86f364eac7823eb0b5e3783e76e3ec6090a SHA256 4dc0c16325d04c176466d003154f487b9ab4df24865f887ce418cbc66237212d
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.