| 1 |
blueness 12/05/01 13:43:16 |
| 2 |
|
| 3 |
Modified: ChangeLog curl-7.25.0-r1.ebuild |
| 4 |
Log: |
| 5 |
Update dependencies for >=net-libs/gnutls-3, bug #412427 |
| 6 |
|
| 7 |
(Portage version: 2.1.10.49/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.216 net-misc/curl/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/curl/ChangeLog?rev=1.216&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/curl/ChangeLog?rev=1.216&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/curl/ChangeLog?r1=1.215&r2=1.216 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v |
| 19 |
retrieving revision 1.215 |
| 20 |
retrieving revision 1.216 |
| 21 |
diff -u -r1.215 -r1.216 |
| 22 |
--- ChangeLog 26 Apr 2012 15:20:52 -0000 1.215 |
| 23 |
+++ ChangeLog 1 May 2012 13:43:16 -0000 1.216 |
| 24 |
@@ -1,6 +1,9 @@ |
| 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.215 2012/04/26 15:20:52 aballier Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.216 2012/05/01 13:43:16 blueness Exp $ |
| 29 |
+ |
| 30 |
+ 01 May 2012; Anthony G. Basile <blueness@g.o> curl-7.25.0-r1.ebuild: |
| 31 |
+ Update dependencies for >=net-libs/gnutls-3, bug #412427 |
| 32 |
|
| 33 |
26 Apr 2012; Alexis Ballier <aballier@g.o> curl-7.25.0-r1.ebuild: |
| 34 |
keyword ~amd64-fbsd |
| 35 |
|
| 36 |
|
| 37 |
|
| 38 |
1.3 net-misc/curl/curl-7.25.0-r1.ebuild |
| 39 |
|
| 40 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/curl/curl-7.25.0-r1.ebuild?rev=1.3&view=markup |
| 41 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/curl/curl-7.25.0-r1.ebuild?rev=1.3&content-type=text/plain |
| 42 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/curl/curl-7.25.0-r1.ebuild?r1=1.2&r2=1.3 |
| 43 |
|
| 44 |
Index: curl-7.25.0-r1.ebuild |
| 45 |
=================================================================== |
| 46 |
RCS file: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.25.0-r1.ebuild,v |
| 47 |
retrieving revision 1.2 |
| 48 |
retrieving revision 1.3 |
| 49 |
diff -u -r1.2 -r1.3 |
| 50 |
--- curl-7.25.0-r1.ebuild 26 Apr 2012 15:20:52 -0000 1.2 |
| 51 |
+++ curl-7.25.0-r1.ebuild 1 May 2012 13:43:16 -0000 1.3 |
| 52 |
@@ -1,6 +1,6 @@ |
| 53 |
# Copyright 1999-2012 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.25.0-r1.ebuild,v 1.2 2012/04/26 15:20:52 aballier Exp $ |
| 56 |
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.25.0-r1.ebuild,v 1.3 2012/05/01 13:43:16 blueness Exp $ |
| 57 |
|
| 58 |
EAPI="4" |
| 59 |
|
| 60 |
@@ -21,10 +21,12 @@ |
| 61 |
curl_ssl_axtls? ( net-libs/axTLS app-misc/ca-certificates ) |
| 62 |
curl_ssl_gnutls? ( |
| 63 |
|| ( |
| 64 |
- ( <=net-libs/gnutls-2.10.5 dev-libs/libgcrypt[static-libs?] app-misc/ca-certificates ) |
| 65 |
- ( net-libs/gnutls[-nettle,static-libs?] dev-libs/libgcrypt[static-libs?] app-misc/ca-certificates ) |
| 66 |
- ( net-libs/gnutls[nettle,static-libs?] dev-libs/nettle app-misc/ca-certificates ) |
| 67 |
+ ( >=net-libs/gnutls-3[static-libs?] dev-libs/nettle ) |
| 68 |
+ ( =net-libs/gnutls-2.12*[nettle,static-libs?] dev-libs/nettle ) |
| 69 |
+ ( =net-libs/gnutls-2.12*[-nettle,static-libs?] dev-libs/libgcrypt[static-libs?] ) |
| 70 |
+ ( <net-libs/gnutls-2.12 dev-libs/libgcrypt[static-libs?] ) |
| 71 |
) |
| 72 |
+ app-misc/ca-certificates |
| 73 |
) |
| 74 |
curl_ssl_openssl? ( dev-libs/openssl[static-libs?] ) |
| 75 |
curl_ssl_nss? ( dev-libs/nss app-misc/ca-certificates ) |
| 76 |
@@ -103,7 +105,7 @@ |
| 77 |
fi |
| 78 |
if use curl_ssl_gnutls; then |
| 79 |
einfo "SSL provided by gnutls" |
| 80 |
- if has_version net-libs/gnutls[nettle] ; then |
| 81 |
+ if has_version ">=net-libs/gnutls-3" || has_version "=net-libs/gnutls-2.12*[nettle]"; then |
| 82 |
einfo "gnutls compiled with dev-libs/nettle" |
| 83 |
myconf+=( --with-gnutls --with-nettle ) |
| 84 |
else |
Archives