Prefer USE=ares.

Package-Manager: portage-2.2.0_alpha123/cvs/Linux x86_64

3 files changed, 11 insertions, 8 deletions

diff --git a/net-analyzer/wireshark/ChangeLog b/net-analyzer/wireshark/ChangeLog
index d4cc31b3ca2c..cbc51fb3c6f1 100644
--- a/net-analyzer/wireshark/ChangeLog
+++ b/net-analyzer/wireshark/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-analyzer/wireshark
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.382 2012/08/31 15:26:42 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.383 2012/08/31 15:41:57 jer Exp $
+
+  31 Aug 2012; Jeroen Roovers <jer@gentoo.org> wireshark-1.6.10-r1.ebuild:
+  Prefer USE=ares.
 
 *wireshark-1.8.2-r1 (31 Aug 2012)
 *wireshark-1.6.10-r1 (31 Aug 2012)
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 3e3431caf5b5..74e221a0d09f 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -8,7 +8,7 @@ DIST wireshark-1.6.8.tar.bz2 21967111 SHA256 d4fbaffa4fd32543ed1d03b3097bf89a7d4
 DIST wireshark-1.6.9.tar.bz2 22012780 SHA256 38d4dd9848ec2de5a16bf6706291f93b073e7521afacd669803f497d8d23991a SHA512 9f856f3ab3c95dda9750be8b4fe8c5a714db7f72794321b755fb61f97c409af957aafc84c2b45bd6cd0ea5b31142ab14a37ab4591e2d4becf16d328ff3604cea WHIRLPOOL 664d83872736cad73fef788fa2dd0e480531e3c8a0772495db232a8e6ba7addf648d135fabde50612a97e9b188bdbee92f27fa1f8c0ae355d8c6876dce66a5e5
 DIST wireshark-1.8.1.tar.bz2 24125571 SHA256 5966a3e23d34972eb35433ae8198fccf1945617f71b89c1af26dada9f342feb7 SHA512 fec2212ca6c0b50b84f0642160b4685c5aa9e06677b68fa1103dbbd7dd684bfdc00330b2444a8805169e9fc88866707cf2b0dee45207e7f91ac40f7bcefb6faa WHIRLPOOL 1343b68fd95cb55f6445e09f38cd1b8f9b93d5a05146ea8937609f9d97be4b1fb4a45ff68aaa1885fd753d889b81f31422b5a96517eb72fd72d29e24f90745b6
 DIST wireshark-1.8.2.tar.bz2 24121798 SHA256 3f0e688d889345033e0a7e4f36aea78248e5c7b32d0dfc19eac044188aac11cc SHA512 219ec8249072773719162851515eb9c29a01693c9ba4d57976afad1e58d30cac9aefb482d3c6113386c39cfab775919ad68a888e94de8d62af0e8b8da7c3991b WHIRLPOOL 08bbe59e096de90a99766aa49c6d419351b1e178f5eb2e9160e00900c695dd46515448571ebbf19172679db0637f82359757c302cd87ea176936eb32c3625ba1
-EBUILD wireshark-1.6.10-r1.ebuild 6335 SHA256 7a5ee7558d4d9bf46fa4c062ff72bdadee3de0a9e7edb2b712a4d79db0f5d07a SHA512 efe68f685389904edfb3c2e6cf93f9722485a834bfcb714ec123d53d67f6d8fb85b3af1282bf6182b9b9bf48d85c6aa58f44d1335d961080799048768e2d50f1 WHIRLPOOL 5eed747a7bdcdef07b18af074c6876e1b557b34dde12236b018af5670c397350814c2b75ce67d8ca49a8427d1f16433200c471ed66ea0f7530ff3f734574795d
+EBUILD wireshark-1.6.10-r1.ebuild 6336 SHA256 0f2849fb78628442ac89ff0130fa856d1752947e2ba1599d58f6c83be7d125c7 SHA512 d865e770d1c79703c57efddee7b7f208d5ac35565da140f8a2acee992d1521626a8606192eb421dfce02d2a440f8682a8e325466dfdcb0d49e66edf8e1d88cc1 WHIRLPOOL 635f6e6c750613ce2dda7e28c0a047c4da70832f631512fd58939fe5a05eb96b1158e39feb71e82f675b4f0a64e98b58fd7c00d601478d8b6de6ade595628c59
 EBUILD wireshark-1.6.10.ebuild 6555 SHA256 d403012e43b2f40cc2c5fb1a7cea94fdfb852a5723e25d2c903d698ce31d3980 SHA512 f7963b030ed853db666d44e72d5a74a0a0b458c9276e759513e29521a3fd96408d4c08f704d518068925a4eba1c91095f302161e3a68860c48b43accbbd41709 WHIRLPOOL 9a59004c31d610f4691eba3f0f743577fc9ad5de51f7c03ff70ca15ff714256f9db7bc4fe4ccefa7e416d6c69be29856c9ae08896639b135afa89dc7c1917d28
 EBUILD wireshark-1.6.8.ebuild 6453 SHA256 45983c22afd371ca12b7cfaaa7b8657bb2c661ecc78c7d639cd8f7067e73670d SHA512 ab98125603ada0828444414b8807760e4f5bf009547fe58110ba6cf3ff981df18bd34e7d17605ac11fdbd592a8ef9e0b5a1985775dbea11ea750b3aaedb9b6fe WHIRLPOOL 500f699b5f8d84c85cb2422745a95e2a47cdf7915cb030ea5d688a1cd2a772c9060b8058ee577eecfde2a9bfb4e2dcbe1c380fd113621cd9240e1db82d964110
 EBUILD wireshark-1.6.9-r1.ebuild 6515 SHA256 e44ee1e12c9625ff3da815de86270d5597ef4ebefb4144a65270e295615c3d64 SHA512 24f392bd68a6806374962a82229874f5cdb036513c7cd5f8f33f688e5c6467d641bf0a19ce1bff3c43538f77515f2e06f118adb12f788ff81ce26ee78a597e28 WHIRLPOOL 0199f45adfd49b39675168787b2279d57ddbe47fd2a573ef7919c9db254007f73ced740b3a4e47437214ff74fc8b299931947f6b4ce2b4ba9fd9d1b8787e9546
@@ -17,12 +17,12 @@ EBUILD wireshark-1.8.1-r1.ebuild 6366 SHA256 ae4899a2fa57a86014be3e18ae42802c489
 EBUILD wireshark-1.8.1.ebuild 6307 SHA256 a162d0dfcea9595d7a92671a02751b3805210492ad536ea53327361bb79a7d0f SHA512 1431ddfd83182ff231f1f52e58eedb19ca087b64891cd559b2258041e02264c774f39a5a8e974f2a79c80ab2ed74b4a9c07a9721f1ec8ebf2a85c9b171e881b5 WHIRLPOOL 1a1a26fbd474282115a10c7f0bab09c0635e6ddb8d699681fd263115c0a2475e535ade5475931e6a4d9fe395f84b0f840cfc9f293f79916b244f891f4320ede4
 EBUILD wireshark-1.8.2-r1.ebuild 6275 SHA256 c1d3071f62b26495be2d49bee0d1083d41e67e8af029d6c51a5745cd28a2dda6 SHA512 ecacd5371bc092bdf833491fc3fd62c80c5e2484b04ad633e91d427b1abb4df954928a0dc6f9184e719e20c2b63d89ef8bfa961ab656bc94c70d0b58863f380f WHIRLPOOL 7298825b1c3cacef5d289a12a9bab6ccfed6391798e2a2e3703c1fdeab765326ae45ab0882d0e893ab732dbc42484645917175d64ddb74cb1cb680034f140a87
 EBUILD wireshark-1.8.2.ebuild 6412 SHA256 a401ed515922508b6f4b09bcbb25f2473c2b3dc612a629c994b77769e9f580c8 SHA512 7c5fc50ae831f99ebf827e4ca440f1fceb52cf0f414306615e01ddc11cc7996c693e8af1ec843764e0ffeaa200031c803463e8b5a96c609b1e8033e3374394c6 WHIRLPOOL 3968d7a5d3ce316a2c4d7610df50c3df4b2e12cb170a76577f584dd892772dd62d5fc4562ffeef00d07cdee8c0878a3c784c15c25efa206a45c1de1641627c0b
-MISC ChangeLog 55526 SHA256 60d5e20b81c0b3c392791274e299ee68212bc0c0645399c130276a2f52116f09 SHA512 45e1a8ee862959fadfe37b448b3824a6f8ae8d18ed026c6d0983e8330d5959f3abcb3af163a85eebd809e6b7e8c7311da158434f87118a5327fd316cf9520b4d WHIRLPOOL b172fce7973adb227a5d5b4d89be9b62bb3895395aae70ac45f51b1d5abfa0a6431e51e5cbc6cecb42c79ea3939710168a593a72a24c6e90e12c6fa82c8f1564
+MISC ChangeLog 55621 SHA256 ff500dba0a811ca654e0c1ae39a7424f727696e8ee72de987edf506434a4e67c SHA512 2cb10d8933511cb2cd0a415546f8d3e43dcf08df3d2aaa8cf5d5ac4897284af70c74e6258ead4ca95ab6b890e2b1fc2abb499e062ee6aea8b04e1ecf958e86c9 WHIRLPOOL 5650658d2cf0a4b172da760566af21e0f9798ed1d809cd8416dc65a18c2e9ad0ccc93001e6cc608a3f0a9cb33eafd3b5aa01be498e8a8685d0af16c4a2a9c84c
 MISC metadata.xml 2493 SHA256 edbf1d64745d0888a6702700e7feb35d7caf31932bf54a7d0b95d239a0f111d0 SHA512 482a6edba3870e8e76459cde9805408ac94b3f4e725c48a2934633cbdbe899c84de0ddaaeb45acba5cc3d72ec1bd0ccff2e9a1a22f81c9c32fb9e127b7e16a7b WHIRLPOOL dac8ad7b30e94703d1d5e0e24abdc02a612f18611b6cc621e523bd637ad4ca6ed54bf11000b284754c94443b5a1c5e2a2aa646e0ff5d9a56d8ae9b95d7550147
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlBA17gACgkQVWmRsqeSphPImwCeJBWY9M0QAXKZvQkSaQcm5Huq
-jigAn3fQ/TAFNj3UgnoaATbxxhBfbEzc
-=9cap
+iEYEAREIAAYFAlBA20sACgkQVWmRsqeSphMKBgCfTnsW6VvCS/JPnooqM2lMkXfP
+OgoAn1NrsdOhlzW36qAMJ70URcHkyLjr
+=hkSd
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/wireshark/wireshark-1.6.10-r1.ebuild b/net-analyzer/wireshark/wireshark-1.6.10-r1.ebuild
index abb6a4f996dd..63e9ac6df1f1 100644
--- a/net-analyzer/wireshark/wireshark-1.6.10-r1.ebuild
+++ b/net-analyzer/wireshark/wireshark-1.6.10-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.6.10-r1.ebuild,v 1.1 2012/08/31 15:26:42 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.6.10-r1.ebuild,v 1.2 2012/08/31 15:41:57 jer Exp $
 
 EAPI=4
 PYTHON_DEPEND="python? 2"
@@ -15,7 +15,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="
-	adns ares doc doc-pdf gtk ipv6 libadns lua gcrypt geoip kerberos profile
+	adns +ares doc doc-pdf gtk ipv6 libadns lua gcrypt geoip kerberos profile
 	+pcap portaudio python +caps selinux smi ssl threads zlib
 "
 REQUIRED_USE="