Change c-ares USE flag to ares, as other packages already USE ares.

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

4 files changed, 18 insertions, 13 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/Manifest b/net-analyzer/wireshark/Manifest
index 83a87ac74ae5..4622e44333b5 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 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
+EBUILD wireshark-1.1.0.ebuild 5265 RMD160 7b229bbe0c3fef09f896dcfbe6b7b71023e0c6fe SHA1 e5a81597ff271182c1224f90b9f1329f8436f585 SHA256 4784720d4b32220493696e53eed5cde703c73dc7b678c7cad5205eb6f673f31b
+MISC ChangeLog 19091 RMD160 533a0b0a5b699e3fcf7f49085d63263f0bde5204 SHA1 582e362325725ecfcb7d72c03724a54070652f17 SHA256 81378f7c518559aed2b8399455092183b752fe3436340c8d850e0bd6d2f92be8
+MISC metadata.xml 2154 RMD160 01af8905d25e6c387902d30766daedcd37d94e0e SHA1 d68e79d413654ce72c553d508d7aa96f27fe85b5 SHA256 48c540fcec9cf1e5eebe132d7f90e8330b413f4eb6469761a88720eaa6a2233a
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.