summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'net-misc/curl')
-rw-r--r--net-misc/curl/ChangeLog5
-rw-r--r--net-misc/curl/Manifest10
-rw-r--r--net-misc/curl/curl-7.26.0.ebuild7
3 files changed, 13 insertions, 9 deletions
diff --git a/net-misc/curl/ChangeLog b/net-misc/curl/ChangeLog
index 1ab4a28e3de6..154bab7e19f0 100644
--- a/net-misc/curl/ChangeLog
+++ b/net-misc/curl/ChangeLog
@@ -1,6 +1,9 @@
# 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.229 2012/07/19 20:19:49 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.230 2012/07/19 21:08:13 blueness Exp $
+
+ 19 Jul 2012; Anthony G. Basile <blueness@gentoo.org> curl-7.26.0.ebuild:
+ Add proper dependency on cyassl, bug #421759
19 Jul 2012; Anthony G. Basile <blueness@gentoo.org> curl-7.25.0-r1.ebuild:
Drop cyassl from 7.25.0-r1, bug #421759
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index ffd5d761d720..d0235a0f3ac4 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -17,13 +17,13 @@ DIST curl-7.26.0.tar.bz2 2422651 RMD160 90d66cd2f77bf825ba01056f4f384ff74e7b04eb
EBUILD curl-7.21.4.ebuild 3514 SHA256 90020645c61c93a010fc61c020179e42ebcea70ee191fc8d18ac45916d99a328 SHA512 c5b55fdd2ec42e113eb190e3eb5895bc14c6abc97768d3d616360628a7be9a84703b690a860f5037c76dd1bbe858ec04035d69213284756840ef597a1d4f9882 WHIRLPOOL 07bbe20b8deecca17161311b8ccda88c6593b9aa73a29257bdde53ef720733ef9f2c10ae748e3e7c81bced17f372068e5b57e8fd07e027d528f5905825fc2434
EBUILD curl-7.24.0.ebuild 3726 SHA256 ae2afb4021a571cfdbeffa2705b8a202d303b3101176908b6563324ff40969f1 SHA512 d6c2fbc54617a66f6739cfa9a9372358d4bd08002f8e7717444b795f6cbf6b75f4c1f8b64b11d7775e31cc42acc151951acf11cf8605c80feabfa1ea0f1116fa WHIRLPOOL 4cdc34e1ee6826da1de7db2d9e97e1529119ad077a4c6628c9cfed4894a609236c8d726873f361120c34022cdd097f92df23e325926a5120dbf58cd3d634080e
EBUILD curl-7.25.0-r1.ebuild 5837 SHA256 108ec07c4f70d1ed3fbf4aada7c535974b051cbe09ae7c7235843c604f514dda SHA512 93c81a00b52e5c763b869daf5d7bf542b9f65d3ee627e02359450225b9a62a4cac66ffb8e1244ed67a98db9bcdeba079e4deadc593bcec214790daf8ba62c084 WHIRLPOOL 977034a29bd5d07b61509cdfd1c1381a584d711cca763a04ea98fc6e4497fe7e4b19e19b16b95c0538a226c3745465a68da9bef7fdae80e30bf461ad15245934
-EBUILD curl-7.26.0.ebuild 6037 SHA256 57d77c57cb0db7e5a3a6d5320a1bba3bc0934507e87d7250ed9e504595bd4c06 SHA512 992b71980f2811807acfbd3f0e9684ce4d514f91dd2f9391918e788968b5761c84d7318826c9de2318fb9ab5fab81edffba7ea20c58def6fc7e8a11a49c83d08 WHIRLPOOL df2d0ac1499c7e310db75a9610b469358e91e245512db62db5575cd72e69f4931d4ef14fb50dda1f98a8a66b4252f9bba9313552c0f63e6ad33bfc7d2558f114
-MISC ChangeLog 37457 SHA256 1b38652715ad8a88243025f6b1965375f0f5f5d846e9b97604b050289ab6f83e SHA512 f6f44ddf609ada3971aeb112faed7669d3abdb81e54cb1d0c0ff70cdb90771d68ed8b894742cabc177c924aba4a17234148bb49f2936d6b023853a3fa4a63392 WHIRLPOOL f4b97c1112230f8295d64403e63b951b091f1b5a07f5bbb7e0faeb0830b19143efa7f353188b93e4246583bef195bd801ed98c2d1ffbd33753ecc7a1ac445973
+EBUILD curl-7.26.0.ebuild 6090 SHA256 8eadc94f7bb0773ab85fc4e776795caffb17bfe5c213c23e9f560624f388db56 SHA512 c83dbeeaa5be8a660b13b6bdc290e92eb12f9dc1f8fc29698c7357bbb4202606eaffbfb0e1da4e377104d8e6abebfb411286185b2aaeacd3ec34241d48e19443 WHIRLPOOL 6578b1d502441090bc24c57d3b9859118a44519c4f565e373be9d85f1c2edc32d3c162cf8aa2d9a62b0c3e6cc284a574c58a436e3e41a6c46fe53eacbb61eb38
+MISC ChangeLog 37580 SHA256 55f1b35ee749f675f54cbe0b1fe53a4e463b5e90036f85562815ad85705be2ef SHA512 be7eb373b8f7aad6970421a120164ad8823899683c0c4a537530baa3705f890e376b138db9d1ac9a7a9b7202374a92d2cca190b4bced097b579ec1decf5d17ef WHIRLPOOL 51b8e7555ed0b4ffaad7ce0de50a71136926b35fb1ce5ea020ed2cbe2d5bdea4a783f521456ce8c2dab77f7b56e84b9cac97c2f40ae490bb40f318ca20814991
MISC metadata.xml 741 SHA256 fac785fc33b177d6a7ce27f38f3bfd10b6d2a98b7f8856269ef033bc19fd592d SHA512 3475c8590790d10c37c6f34709c563ba48a69fdb146a4004a1ad19bf87eb63620fd022eec6edfcf7ba053223fcca54553f0ae232bf793a5937f5bd8840c92a9f WHIRLPOOL 6e3050a2bb9bfae34fe91df9a5eabdc65a640d9e3bff76b0c590dc0c7ce959329349e37ffdf568e931ff801c34abb4cd024977cdcb94ac75b478778e2e4898ca
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iEYEAREIAAYFAlAIa+8ACgkQl5yvQNBFVTXK9ACaAg5f5mvv/Z1dOJqgVOpgh5Jy
-X4YAmQHAdjFPD84WLEYKaS2zzE6o9uSF
-=QIb/
+iEYEAREIAAYFAlAId0gACgkQl5yvQNBFVTUNIACfexjSAxJLprrZAZi7a0NwROku
+VFcAn3OyJMblj5B57DkGbcKRZEed7pRJ
+=RVRo
-----END PGP SIGNATURE-----
diff --git a/net-misc/curl/curl-7.26.0.ebuild b/net-misc/curl/curl-7.26.0.ebuild
index 143cf7b3f63a..a4b7bf42f07b 100644
--- a/net-misc/curl/curl-7.26.0.ebuild
+++ b/net-misc/curl/curl-7.26.0.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.26.0.ebuild,v 1.3 2012/05/29 07:48:27 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.26.0.ebuild,v 1.4 2012/07/19 21:08:13 blueness Exp $
EAPI="4"
@@ -12,7 +12,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"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~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 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"
@@ -21,7 +21,8 @@ RESTRICT="test"
RDEPEND="ldap? ( net-nds/openldap )
ssl? (
- curl_ssl_axtls? ( net-libs/axtls app-misc/ca-certificates )
+ curl_ssl_axtls? ( net-libs/axtls app-misc/ca-certificates )
+ curl_ssl_cyassl? ( net-libs/cyassl app-misc/ca-certificates )
curl_ssl_gnutls? (
|| (
( >=net-libs/gnutls-3[static-libs?] dev-libs/nettle )