| 1 |
blueness 12/03/31 18:31:54 |
| 2 |
|
| 3 |
Modified: ChangeLog curl-7.24.0.ebuild |
| 4 |
Log: |
| 5 |
Reverting backport REQUIRED_USE as ssl should refer to any ssl provider |
| 6 |
|
| 7 |
(Portage version: 2.1.10.49/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.211 net-misc/curl/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/curl/ChangeLog?rev=1.211&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/curl/ChangeLog?rev=1.211&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/curl/ChangeLog?r1=1.210&r2=1.211 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v |
| 19 |
retrieving revision 1.210 |
| 20 |
retrieving revision 1.211 |
| 21 |
diff -u -r1.210 -r1.211 |
| 22 |
--- ChangeLog 31 Mar 2012 16:59:20 -0000 1.210 |
| 23 |
+++ ChangeLog 31 Mar 2012 18:31:54 -0000 1.211 |
| 24 |
@@ -1,6 +1,10 @@ |
| 25 |
# ChangeLog for net-misc/curl |
| 26 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.210 2012/03/31 16:59:20 blueness Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.211 2012/03/31 18:31:54 blueness Exp $ |
| 29 |
+ |
| 30 |
+ 31 Mar 2012; Anthony G. Basile <blueness@g.o> curl-7.24.0.ebuild: |
| 31 |
+ Reverting backport REQUIRED_USE as ssl should refer to any ssl provider, |
| 32 |
+ not just openssl. Waiting for a better fix. |
| 33 |
|
| 34 |
31 Mar 2012; Anthony G. Basile <blueness@g.o> curl-7.24.0.ebuild: |
| 35 |
Backport of REQUIRED_USE zero or one of gnutls/ssl/nss, bug #410305 |
| 36 |
|
| 37 |
|
| 38 |
|
| 39 |
1.9 net-misc/curl/curl-7.24.0.ebuild |
| 40 |
|
| 41 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/curl/curl-7.24.0.ebuild?rev=1.9&view=markup |
| 42 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/curl/curl-7.24.0.ebuild?rev=1.9&content-type=text/plain |
| 43 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/curl/curl-7.24.0.ebuild?r1=1.8&r2=1.9 |
| 44 |
|
| 45 |
Index: curl-7.24.0.ebuild |
| 46 |
=================================================================== |
| 47 |
RCS file: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.24.0.ebuild,v |
| 48 |
retrieving revision 1.8 |
| 49 |
retrieving revision 1.9 |
| 50 |
diff -u -r1.8 -r1.9 |
| 51 |
--- curl-7.24.0.ebuild 31 Mar 2012 16:59:20 -0000 1.8 |
| 52 |
+++ curl-7.24.0.ebuild 31 Mar 2012 18:31:54 -0000 1.9 |
| 53 |
@@ -1,6 +1,6 @@ |
| 54 |
# Copyright 1999-2012 Gentoo Foundation |
| 55 |
# Distributed under the terms of the GNU General Public License v2 |
| 56 |
-# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.24.0.ebuild,v 1.8 2012/03/31 16:59:20 blueness Exp $ |
| 57 |
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.24.0.ebuild,v 1.9 2012/03/31 18:31:54 blueness Exp $ |
| 58 |
|
| 59 |
EAPI="4" |
| 60 |
|
| 61 |
@@ -17,8 +17,8 @@ |
| 62 |
|
| 63 |
RDEPEND="ldap? ( net-nds/openldap ) |
| 64 |
gnutls? ( net-libs/gnutls dev-libs/libgcrypt app-misc/ca-certificates ) |
| 65 |
- ssl? ( dev-libs/openssl ) |
| 66 |
- nss? ( dev-libs/nss app-misc/ca-certificates ) |
| 67 |
+ ssl? ( !gnutls? ( dev-libs/openssl ) ) |
| 68 |
+ nss? ( !gnutls? ( !ssl? ( dev-libs/nss app-misc/ca-certificates ) ) ) |
| 69 |
idn? ( net-dns/libidn ) |
| 70 |
ares? ( >=net-dns/c-ares-1.6 ) |
| 71 |
kerberos? ( virtual/krb5 ) |
| 72 |
@@ -37,12 +37,10 @@ |
| 73 |
)" |
| 74 |
# used - but can do without in self test: net-misc/stunnel |
| 75 |
|
| 76 |
-# ares must be disabled for threads |
| 77 |
-# only zero or one of gnutls, ssl, nss, bug #410305 |
| 78 |
+# ares must be disabled for threads and both can be disabled |
| 79 |
+# one can use wether gnutls or nss if ssl is enabled |
| 80 |
REQUIRED_USE="threads? ( !ares ) |
| 81 |
- gnutls? ( !ssl !nss ) |
| 82 |
- ssl? ( !nss !gnutls ) |
| 83 |
- nss? ( !gnutls !ssl )" |
| 84 |
+ nss? ( !gnutls )" |
| 85 |
|
| 86 |
src_prepare() { |
| 87 |
epatch \ |
Archives