summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnthony G. Basile <blueness@gentoo.org>2012-09-01 16:57:57 +0000
committerAnthony G. Basile <blueness@gentoo.org>2012-09-01 16:57:57 +0000
commite2ea379afb3aa22b752a1460723a3915b503c3fe (patch)
tree9f7d67ab8f7a6c4c36ff75c35b77ac4438847d30 /net-misc/curl
parentUpdate patch tarball and snapshot for security bug #432400. (diff)
downloadgentoo-2-e2ea379afb3aa22b752a1460723a3915b503c3fe.tar.gz
gentoo-2-e2ea379afb3aa22b752a1460723a3915b503c3fe.tar.bz2
gentoo-2-e2ea379afb3aa22b752a1460723a3915b503c3fe.zip
Rename USE=ares to adns, bug #433549
(Portage version: 2.1.11.9/cvs/Linux x86_64)
Diffstat (limited to 'net-misc/curl')
-rw-r--r--net-misc/curl/ChangeLog8
-rw-r--r--net-misc/curl/curl-7.27.0-r3.ebuild (renamed from net-misc/curl/curl-7.27.0-r2.ebuild)12
2 files changed, 13 insertions, 7 deletions
diff --git a/net-misc/curl/ChangeLog b/net-misc/curl/ChangeLog
index 9aabc8e6f7cb..42b88d98b58f 100644
--- a/net-misc/curl/ChangeLog
+++ b/net-misc/curl/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for net-misc/curl
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.245 2012/08/30 21:04:15 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.246 2012/09/01 16:57:57 blueness Exp $
+
+*curl-7.27.0-r3 (01 Sep 2012)
+
+ 01 Sep 2012; Anthony G. Basile <blueness@gentoo.org> -curl-7.27.0-r2.ebuild,
+ +curl-7.27.0-r3.ebuild:
+ Rename USE=ares to adns, bug #433549
30 Aug 2012; Anthony G. Basile <blueness@gentoo.org> curl-7.26.0.ebuild:
Stable ppc, bug #421479
diff --git a/net-misc/curl/curl-7.27.0-r2.ebuild b/net-misc/curl/curl-7.27.0-r3.ebuild
index 9b5bdee8677e..52750258b364 100644
--- a/net-misc/curl/curl-7.27.0-r2.ebuild
+++ b/net-misc/curl/curl-7.27.0-r3.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-misc/curl/curl-7.27.0-r2.ebuild,v 1.7 2012/08/26 18:17:33 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.27.0-r3.ebuild,v 1.1 2012/09/01 16:57:57 blueness Exp $
EAPI="4"
@@ -13,7 +13,7 @@ SRC_URI="http://curl.haxx.se/download/${P}.tar.bz2"
LICENSE="MIT"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="ares idn ipv6 kerberos ldap metalink rtmp ssh ssl static-libs test threads"
+IUSE="adns idn ipv6 kerberos ldap metalink rtmp ssh ssl static-libs test threads"
IUSE="${IUSE} curl_ssl_axtls curl_ssl_cyassl curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl curl_ssl_polarssl"
#lead to lots of false negatives, bug #285669
@@ -36,7 +36,7 @@ RDEPEND="ldap? ( net-nds/openldap )
curl_ssl_polarssl? ( net-libs/polarssl app-misc/ca-certificates )
)
idn? ( net-dns/libidn[static-libs?] )
- ares? ( net-dns/c-ares )
+ adns? ( net-dns/c-ares )
kerberos? ( virtual/krb5 )
metalink? ( >=media-libs/libmetalink-0.1.0 )
rtmp? ( media-video/rtmpdump )
@@ -64,10 +64,10 @@ DEPEND="${RDEPEND}
dev-lang/perl
)"
-# ares must be disabled for threads
+# c-ares must be disabled for threads
# only one ssl provider can be enabled
REQUIRED_USE="
- threads? ( !ares )
+ threads? ( !adns )
ssl? (
^^ (
curl_ssl_axtls
@@ -170,7 +170,7 @@ src_configure() {
--enable-smtp \
--enable-telnet \
--enable-tftp \
- $(use_enable ares) \
+ $(use_enable adns ares) \
--enable-cookies \
--enable-hidden-symbols \
$(use_enable ipv6) \