Update dependencies for >=net-libs/gnutls-3, bug #412427

Package-Manager: portage-2.1.10.49/cvs/Linux x86_64

3 files changed, 18 insertions, 13 deletions

diff --git a/net-misc/curl/ChangeLog b/net-misc/curl/ChangeLog
index 153eaac5974b..430da9211175 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.215 2012/04/26 15:20:52 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.216 2012/05/01 13:43:16 blueness Exp $
+
+  01 May 2012; Anthony G. Basile <blueness@gentoo.org> curl-7.25.0-r1.ebuild:
+  Update dependencies for >=net-libs/gnutls-3, bug #412427
 
   26 Apr 2012; Alexis Ballier <aballier@gentoo.org> curl-7.25.0-r1.ebuild:
   keyword ~amd64-fbsd
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index 97543e655591..e53fb035f3c1 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX config.h.ed 501 RMD160 54a470cde54020ac4820d1189b90d9e742a6c309 SHA1 ea728418a3b06317a8cfa22c70cb7fda3fa5414a SHA256 ab7941abb65756bc18dac7310e413ede974b1556fafdb5f8ba6990542b7d5558
 AUX curl-7.18.2-prefix.patch 662 RMD160 a5cf90f3b93acd610adf116d00383ec8f792105e SHA1 5424f70aaf0ed9843bb84bc5e3e9e3654aca66a9 SHA256 ba5530d4ce9175eb54944716768ce33278e5de236cbeeb2a80caefff709ff0f8
@@ -25,14 +25,14 @@ EBUILD curl-7.21.7.ebuild 3552 RMD160 9c6603e702433d9a0d1b7175690c3e601545e694 S
 EBUILD curl-7.22.0.ebuild 3623 RMD160 f8c1b529548f6ca91d02fb433ee09018a55905c3 SHA1 5a0976b5674f5eb06553dcd8be7d7e879eb959a5 SHA256 1a8ec1b6d7ac6de349cc8fcbc7314752a1fbbb5ba6eff5ca75ca53936683aaa2
 EBUILD curl-7.23.1.ebuild 3704 RMD160 ba889eed9125b675446bc3bc4bd92813f14e5bae SHA1 01849e67262e0370d334ef665351d1ea3c00c564 SHA256 597b4979e67cef1e945fdf711e16270092805045ae13184072c02057f48bf0d6
 EBUILD curl-7.24.0.ebuild 3728 RMD160 1677627aaa29501774c875f8021d383b276f4a91 SHA1 6e2a2c202f604c6ba46237b7df52294defd474a3 SHA256 37b2df9d5f3f66bd2a3a3a0cd5aff880ed332f98e3739987cd76b63697174858
-EBUILD curl-7.25.0-r1.ebuild 5961 RMD160 76f5cb3b8aed3e7ffc4fdbd561576bb13e69b81b SHA1 c3847d7f46a9bc62ec2925abb2e2cf9d1d61efef SHA256 69ddda26bd4585d1defb1b72cc9643e7ec5d9d96486840a22c99f3767bbf16ef
+EBUILD curl-7.25.0-r1.ebuild 6028 RMD160 91a9af694f412599882bd0fe8e7667ba26e41591 SHA1 77823eccd4d51c662fe9c943b78dfab50bfb92aa SHA256 0932ceb7ec3ac053f69cca3e4a1ffb562b3727ce600ad83f67a83358e5ea5ee6
 EBUILD curl-7.25.0.ebuild 4727 RMD160 1de349cced70a5fc2be8162339c9185622feaacb SHA1 7e8dcef927d771237da7c9d1cf762eed9e372294 SHA256 d4cfcab6b162388239186856c915f574f8016a3be56f240248a40b768ebea3f7
-MISC ChangeLog 35450 RMD160 26da42ea28ecb5c4d394f641654d7175bfc12104 SHA1 ebd2bf4741494c8c67a6081bb56e792b065bac6f SHA256 9b98653d7eb34e2554d3d37e1df30385f2639f38f202f554dbd703c88e914ed8
+MISC ChangeLog 35588 RMD160 aaf564e641326237af233306463bfa28faa38004 SHA1 b8c846d4a0b088f9135a9240404c6c0089911788 SHA256 16b6c81473e9bea0408fec51a44d0f8d76d38b27b39a54458254bcbabe56ec13
 MISC metadata.xml 741 RMD160 6461e1dadf405f3d3bb619386bc2a3760ef777c2 SHA1 c3232f9c75c8a2999bb35ada343b8c69ba2d61ba SHA256 fac785fc33b177d6a7ce27f38f3bfd10b6d2a98b7f8856269ef033bc19fd592d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk+ZZ9kACgkQvFcC4BYPU0o89QCeIiDmBC4trdkzU8WdbygzeljN
-M44AoMauIltAWxWb66YFNrDJxH32oYdc
-=C6+d
+iEYEAREIAAYFAk+f6H4ACgkQl5yvQNBFVTVHwwCgohS06IH4YtYnxQLp9EazLYJD
+mq4An0y02npYcGYhJvmyQaFMtxZC0x8u
+=w5bm
 -----END PGP SIGNATURE-----
diff --git a/net-misc/curl/curl-7.25.0-r1.ebuild b/net-misc/curl/curl-7.25.0-r1.ebuild
index 1634ddea8444..95776dcf065c 100644
--- a/net-misc/curl/curl-7.25.0-r1.ebuild
+++ b/net-misc/curl/curl-7.25.0-r1.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.25.0-r1.ebuild,v 1.2 2012/04/26 15:20:52 aballier Exp $
+# $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 $
 
 EAPI="4"
 
@@ -21,10 +21,12 @@ RDEPEND="ldap? ( net-nds/openldap )
 		curl_ssl_axtls? ( net-libs/axTLS app-misc/ca-certificates )
 		curl_ssl_gnutls? (
 			|| (
-				( <=net-libs/gnutls-2.10.5 dev-libs/libgcrypt[static-libs?] app-misc/ca-certificates )
-				( net-libs/gnutls[-nettle,static-libs?] dev-libs/libgcrypt[static-libs?] app-misc/ca-certificates )
-				( net-libs/gnutls[nettle,static-libs?] dev-libs/nettle app-misc/ca-certificates )
+				( >=net-libs/gnutls-3[static-libs?] dev-libs/nettle )
+				( =net-libs/gnutls-2.12*[nettle,static-libs?] dev-libs/nettle )
+				( =net-libs/gnutls-2.12*[-nettle,static-libs?] dev-libs/libgcrypt[static-libs?] )
+				( <net-libs/gnutls-2.12 dev-libs/libgcrypt[static-libs?] )
 			)
+			app-misc/ca-certificates
 		)
 		curl_ssl_openssl? ( dev-libs/openssl[static-libs?] )
 		curl_ssl_nss? ( dev-libs/nss app-misc/ca-certificates )
@@ -103,7 +105,7 @@ src_configure() {
 		fi
 		if use curl_ssl_gnutls; then
 			einfo "SSL provided by gnutls"
-			if has_version net-libs/gnutls[nettle] ; then
+			if has_version ">=net-libs/gnutls-3" || has_version "=net-libs/gnutls-2.12*[nettle]"; then
 				einfo "gnutls compiled with dev-libs/nettle"
 				myconf+=( --with-gnutls --with-nettle )
 			else