diff options
| author |   Anthony G. Basile <blueness@gentoo.org> | 2012-03-31 16:59:20 +0000 |
|---|---|---|
| committer | Anthony G. Basile <blueness@gentoo.org> | 2012-03-31 16:59:20 +0000 |
| commit | ab1b52858d02e990800aef8934aa87a09930f069 (patch) | |
| tree | f003f0eb076f68634a457fa540e43d2929d195c7 /net-misc | |
| parent | add ~arm, bug #402989 (diff) | |
| download | gentoo-2-ab1b52858d02e990800aef8934aa87a09930f069.tar.gz gentoo-2-ab1b52858d02e990800aef8934aa87a09930f069.tar.bz2 gentoo-2-ab1b52858d02e990800aef8934aa87a09930f069.zip | |
Backport of REQUIRED_USE zero or one of gnutls/ssl/nss, bug #410305
(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.24.0.ebuild | 14 |
2 files changed, 12 insertions, 7 deletions
diff --git a/net-misc/curl/ChangeLog b/net-misc/curl/ChangeLog index 94ecd80f5a07..634124f936c9 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.209 2012/03/31 14:11:13 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.210 2012/03/31 16:59:20 blueness Exp $ + + 31 Mar 2012; Anthony G. Basile <blueness@gentoo.org> curl-7.24.0.ebuild: + Backport of REQUIRED_USE zero or one of gnutls/ssl/nss, bug #410305 31 Mar 2012; Anthony G. Basile <blueness@gentoo.org> curl-7.25.0.ebuild: Use REQUIRED_USE for gnutls/ssl/nss, bug #410305 diff --git a/net-misc/curl/curl-7.24.0.ebuild b/net-misc/curl/curl-7.24.0.ebuild index 3e63936341f8..f4e53eeafe04 100644 --- a/net-misc/curl/curl-7.24.0.ebuild +++ b/net-misc/curl/curl-7.24.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.24.0.ebuild,v 1.7 2012/03/03 15:30:40 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.24.0.ebuild,v 1.8 2012/03/31 16:59:20 blueness Exp $ EAPI="4" @@ -17,8 +17,8 @@ IUSE="ares gnutls idn ipv6 kerberos ldap nss ssh ssl static-libs test threads" RDEPEND="ldap? ( net-nds/openldap ) gnutls? ( net-libs/gnutls dev-libs/libgcrypt app-misc/ca-certificates ) - ssl? ( !gnutls? ( dev-libs/openssl ) ) - nss? ( !gnutls? ( !ssl? ( dev-libs/nss app-misc/ca-certificates ) ) ) + ssl? ( dev-libs/openssl ) + nss? ( dev-libs/nss app-misc/ca-certificates ) idn? ( net-dns/libidn ) ares? ( >=net-dns/c-ares-1.6 ) kerberos? ( virtual/krb5 ) @@ -37,10 +37,12 @@ DEPEND="${RDEPEND} )" # used - but can do without in self test: net-misc/stunnel -# ares must be disabled for threads and both can be disabled -# one can use wether gnutls or nss if ssl is enabled +# ares must be disabled for threads +# only zero or one of gnutls, ssl, nss, bug #410305 REQUIRED_USE="threads? ( !ares ) - nss? ( !gnutls )" + gnutls? ( !ssl !nss ) + ssl? ( !nss !gnutls ) + nss? ( !gnutls !ssl )" src_prepare() { epatch \ |