| 1 |
spatz 10/07/02 13:33:38 |
| 2 |
|
| 3 |
Modified: ChangeLog curl-7.21.0.ebuild |
| 4 |
Log: |
| 5 |
Don't die on USE="ares threads", silently disable ares instead, bug 326611. |
| 6 |
(Portage version: 2.2_rc67/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.163 net-misc/curl/ChangeLog |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/curl/ChangeLog?rev=1.163&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/curl/ChangeLog?rev=1.163&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/curl/ChangeLog?r1=1.162&r2=1.163 |
| 14 |
|
| 15 |
Index: ChangeLog |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v |
| 18 |
retrieving revision 1.162 |
| 19 |
retrieving revision 1.163 |
| 20 |
diff -u -r1.162 -r1.163 |
| 21 |
--- ChangeLog 1 Jul 2010 20:46:53 -0000 1.162 |
| 22 |
+++ ChangeLog 2 Jul 2010 13:33:38 -0000 1.163 |
| 23 |
@@ -1,6 +1,10 @@ |
| 24 |
# ChangeLog for net-misc/curl |
| 25 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.162 2010/07/01 20:46:53 darkside Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.163 2010/07/02 13:33:38 spatz Exp $ |
| 28 |
+ |
| 29 |
+ 02 Jul 2010; Dror Levin <spatz@g.o> curl-7.21.0.ebuild: |
| 30 |
+ Don't die on USE="ares threads", silently disable ares instead, bug |
| 31 |
+ 326611. |
| 32 |
|
| 33 |
01 Jul 2010; Jeremy Olexa <darkside@g.o> |
| 34 |
+files/curl-7.18.2-prefix.patch, curl-7.21.0.ebuild: |
| 35 |
|
| 36 |
|
| 37 |
|
| 38 |
1.3 net-misc/curl/curl-7.21.0.ebuild |
| 39 |
|
| 40 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/curl/curl-7.21.0.ebuild?rev=1.3&view=markup |
| 41 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/curl/curl-7.21.0.ebuild?rev=1.3&content-type=text/plain |
| 42 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/curl/curl-7.21.0.ebuild?r1=1.2&r2=1.3 |
| 43 |
|
| 44 |
Index: curl-7.21.0.ebuild |
| 45 |
=================================================================== |
| 46 |
RCS file: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.21.0.ebuild,v |
| 47 |
retrieving revision 1.2 |
| 48 |
retrieving revision 1.3 |
| 49 |
diff -u -r1.2 -r1.3 |
| 50 |
--- curl-7.21.0.ebuild 1 Jul 2010 20:46:53 -0000 1.2 |
| 51 |
+++ curl-7.21.0.ebuild 2 Jul 2010 13:33:38 -0000 1.3 |
| 52 |
@@ -1,6 +1,6 @@ |
| 53 |
# Copyright 1999-2010 Gentoo Foundation |
| 54 |
# Distributed under the terms of the GNU General Public License v2 |
| 55 |
-# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.21.0.ebuild,v 1.2 2010/07/01 20:46:53 darkside Exp $ |
| 56 |
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.21.0.ebuild,v 1.3 2010/07/02 13:33:38 spatz Exp $ |
| 57 |
|
| 58 |
# NOTE: If you bump this ebuild, make sure you bump dev-python/pycurl! |
| 59 |
|
| 60 |
@@ -47,10 +47,8 @@ |
| 61 |
ewarn "Please review the local USE flags for this package." |
| 62 |
fi |
| 63 |
if use ares && use threads; then |
| 64 |
- eerror "USE flags 'ares' and 'threads' are mutually exclusive," |
| 65 |
- eerror "please disable one of them." |
| 66 |
- eerror |
| 67 |
- die "USE flags 'ares' and 'threads' both enabled" |
| 68 |
+ ewarn "USE flags 'ares' and 'threads' are mutually exclusive," |
| 69 |
+ ewarn "disabling 'ares', please review and re-emerge if needed." |
| 70 |
fi |
| 71 |
} |
| 72 |
|
| 73 |
@@ -71,8 +69,8 @@ |
| 74 |
$(use_with kerberos gssapi "${EPREFIX}"/usr) |
| 75 |
$(use_with libssh2) |
| 76 |
$(use_enable ipv6) |
| 77 |
- $(use_enable ares) |
| 78 |
$(use_enable threads threaded-resolver) |
| 79 |
+ $(use threads && echo --disable-ares || use_enable ares) |
| 80 |
--enable-http |
| 81 |
--enable-ftp |
| 82 |
--enable-gopher |
Archives