diff options
| author |   Dror Levin <spatz@gentoo.org> | 2010-07-02 13:33:38 +0000 |
|---|---|---|
| committer | Dror Levin <spatz@gentoo.org> | 2010-07-02 13:33:38 +0000 |
| commit | 413604b6f4d1e65ef427139d8a200e145b27113d (patch) | |
| tree | 913c55ddfb81d97125704a618fc440bf7b6d7ace /net-misc/curl | |
| parent | Link /usr/bin/tintwizard to /usr/bin/tintwizard.py, bug 326357. (diff) | |
| download | gentoo-2-413604b6f4d1e65ef427139d8a200e145b27113d.tar.gz gentoo-2-413604b6f4d1e65ef427139d8a200e145b27113d.tar.bz2 gentoo-2-413604b6f4d1e65ef427139d8a200e145b27113d.zip | |
Don't die on USE="ares threads", silently disable ares instead, bug 326611.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'net-misc/curl')
| -rw-r--r-- | net-misc/curl/ChangeLog | 6 | ||||
| -rw-r--r-- | net-misc/curl/curl-7.21.0.ebuild | 10 |
2 files changed, 9 insertions, 7 deletions
diff --git a/net-misc/curl/ChangeLog b/net-misc/curl/ChangeLog index b9aa555db255..3f8c185d3c47 100644 --- a/net-misc/curl/ChangeLog +++ b/net-misc/curl/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-misc/curl # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.162 2010/07/01 20:46:53 darkside Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.163 2010/07/02 13:33:38 spatz Exp $ + + 02 Jul 2010; Dror Levin <spatz@gentoo.org> curl-7.21.0.ebuild: + Don't die on USE="ares threads", silently disable ares instead, bug + 326611. 01 Jul 2010; Jeremy Olexa <darkside@gentoo.org> +files/curl-7.18.2-prefix.patch, curl-7.21.0.ebuild: diff --git a/net-misc/curl/curl-7.21.0.ebuild b/net-misc/curl/curl-7.21.0.ebuild index f7baa69ebe1c..bc9c240b3c9f 100644 --- a/net-misc/curl/curl-7.21.0.ebuild +++ b/net-misc/curl/curl-7.21.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.21.0.ebuild,v 1.2 2010/07/01 20:46:53 darkside Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.21.0.ebuild,v 1.3 2010/07/02 13:33:38 spatz Exp $ # NOTE: If you bump this ebuild, make sure you bump dev-python/pycurl! @@ -47,10 +47,8 @@ pkg_setup() { ewarn "Please review the local USE flags for this package." fi if use ares && use threads; then - eerror "USE flags 'ares' and 'threads' are mutually exclusive," - eerror "please disable one of them." - eerror - die "USE flags 'ares' and 'threads' both enabled" + ewarn "USE flags 'ares' and 'threads' are mutually exclusive," + ewarn "disabling 'ares', please review and re-emerge if needed." fi } @@ -71,8 +69,8 @@ src_configure() { $(use_with kerberos gssapi "${EPREFIX}"/usr) $(use_with libssh2) $(use_enable ipv6) - $(use_enable ares) $(use_enable threads threaded-resolver) + $(use threads && echo --disable-ares || use_enable ares) --enable-http --enable-ftp --enable-gopher |