diff options
| author |   Anthony G. Basile <blueness@gentoo.org> | 2012-05-01 13:43:16 +0000 |
|---|---|---|
| committer | Anthony G. Basile <blueness@gentoo.org> | 2012-05-01 13:43:16 +0000 |
| commit | e4dee25dc6d23ffa00ef289f4264785daf2ce532 (patch) | |
| tree | bf845a9f8001477bd69f480f7b17a4a6bf8bd58e /net-misc | |
| parent | Version bump. (diff) | |
| download | gentoo-2-e4dee25dc6d23ffa00ef289f4264785daf2ce532.tar.gz gentoo-2-e4dee25dc6d23ffa00ef289f4264785daf2ce532.tar.bz2 gentoo-2-e4dee25dc6d23ffa00ef289f4264785daf2ce532.zip | |
Update dependencies for >=net-libs/gnutls-3, bug #412427
(Portage version: 2.1.10.49/cvs/Linux x86_64)
Diffstat (limited to 'net-misc')
| -rw-r--r-- | net-misc/curl/ChangeLog | 5 | ||||
| -rw-r--r-- | net-misc/curl/curl-7.25.0-r1.ebuild | 12 |
2 files changed, 11 insertions, 6 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/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 |