From 85b9c618ff57e9fe9f79eb03510a7aff86f4d4c2 Mon Sep 17 00:00:00 2001 From: Michał Górny Date: Sun, 15 Jun 2014 15:22:12 +0000 Subject: Add defaults on CURL_SSL flags to support net-misc/curl with cyassl removed. (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!) --- dev-python/pycurl/ChangeLog | 6 +++++- dev-python/pycurl/pycurl-7.19.0-r1.ebuild | 6 +++--- dev-python/pycurl/pycurl-7.19.0-r2.ebuild | 6 +++--- dev-python/pycurl/pycurl-7.19.0-r3.ebuild | 4 ++-- dev-python/pycurl/pycurl-7.19.3.1.ebuild | 4 ++-- 5 files changed, 15 insertions(+), 11 deletions(-) (limited to 'dev-python/pycurl') diff --git a/dev-python/pycurl/ChangeLog b/dev-python/pycurl/ChangeLog index 6b89b1df8ed1..dd13f6d02df6 100644 --- a/dev-python/pycurl/ChangeLog +++ b/dev-python/pycurl/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-python/pycurl # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/pycurl/ChangeLog,v 1.94 2014/05/28 15:20:44 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/pycurl/ChangeLog,v 1.95 2014/06/15 15:22:12 mgorny Exp $ + + 15 Jun 2014; Michał Górny pycurl-7.19.0-r1.ebuild, + pycurl-7.19.0-r2.ebuild, pycurl-7.19.0-r3.ebuild, pycurl-7.19.3.1.ebuild: + Add defaults on CURL_SSL flags to support net-misc/curl with cyassl removed. 28 May 2014; Mike Gilbert pycurl-7.19.0-r3.ebuild, pycurl-7.19.3.1.ebuild: diff --git a/dev-python/pycurl/pycurl-7.19.0-r1.ebuild b/dev-python/pycurl/pycurl-7.19.0-r1.ebuild index 888400d70961..84d5559ff62f 100644 --- a/dev-python/pycurl/pycurl-7.19.0-r1.ebuild +++ b/dev-python/pycurl/pycurl-7.19.0-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/pycurl/pycurl-7.19.0-r1.ebuild,v 1.9 2012/09/29 18:44:44 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/pycurl/pycurl-7.19.0-r1.ebuild,v 1.10 2014/06/15 15:22:12 mgorny Exp $ EAPI="4" PYTHON_DEPEND="2" @@ -27,7 +27,7 @@ IUSE="curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl examples ssl" # explicitly link to libgcrypt. DEPEND=">=net-misc/curl-7.25.0-r1[ssl=] ssl? ( - net-misc/curl[curl_ssl_gnutls=,curl_ssl_nss=,curl_ssl_openssl=,-curl_ssl_axtls,-curl_ssl_cyassl,-curl_ssl_polarssl] + net-misc/curl[curl_ssl_gnutls(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-),-curl_ssl_polarssl(-)] curl_ssl_gnutls? ( >=net-libs/gnutls-2.11.0 ) )" RDEPEND="${DEPEND}" diff --git a/dev-python/pycurl/pycurl-7.19.0-r2.ebuild b/dev-python/pycurl/pycurl-7.19.0-r2.ebuild index eb62b1790ab7..c227b5d238b2 100644 --- a/dev-python/pycurl/pycurl-7.19.0-r2.ebuild +++ b/dev-python/pycurl/pycurl-7.19.0-r2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/pycurl/pycurl-7.19.0-r2.ebuild,v 1.2 2013/09/05 18:46:48 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/pycurl/pycurl-7.19.0-r2.ebuild,v 1.3 2014/06/15 15:22:12 mgorny Exp $ EAPI=5 @@ -26,7 +26,7 @@ IUSE="curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl examples ssl" # explicitly link to libgcrypt. DEPEND=">=net-misc/curl-7.25.0-r1[ssl=] ssl? ( - net-misc/curl[curl_ssl_gnutls=,curl_ssl_nss=,curl_ssl_openssl=,-curl_ssl_axtls,-curl_ssl_cyassl,-curl_ssl_polarssl] + net-misc/curl[curl_ssl_gnutls(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-),-curl_ssl_polarssl(-)] curl_ssl_gnutls? ( >=net-libs/gnutls-2.11.0 ) )" RDEPEND="${DEPEND}" diff --git a/dev-python/pycurl/pycurl-7.19.0-r3.ebuild b/dev-python/pycurl/pycurl-7.19.0-r3.ebuild index 3fa44060b78c..5d33374fe71b 100644 --- a/dev-python/pycurl/pycurl-7.19.0-r3.ebuild +++ b/dev-python/pycurl/pycurl-7.19.0-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/pycurl/pycurl-7.19.0-r3.ebuild,v 1.13 2014/05/28 15:20:44 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/pycurl/pycurl-7.19.0-r3.ebuild,v 1.14 2014/06/15 15:22:12 mgorny Exp $ EAPI=5 @@ -26,7 +26,7 @@ IUSE="curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl examples ssl" # explicitly link to libgcrypt. DEPEND=">=net-misc/curl-7.25.0-r1[ssl=] ssl? ( - net-misc/curl[curl_ssl_gnutls=,curl_ssl_nss=,curl_ssl_openssl=,-curl_ssl_axtls,-curl_ssl_cyassl,-curl_ssl_polarssl] + net-misc/curl[curl_ssl_gnutls(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-),-curl_ssl_polarssl(-)] curl_ssl_gnutls? ( >=net-libs/gnutls-2.11.0 ) )" RDEPEND="${DEPEND}" diff --git a/dev-python/pycurl/pycurl-7.19.3.1.ebuild b/dev-python/pycurl/pycurl-7.19.3.1.ebuild index 4dc0ceed7355..7e7f3f87fc1f 100644 --- a/dev-python/pycurl/pycurl-7.19.3.1.ebuild +++ b/dev-python/pycurl/pycurl-7.19.3.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/pycurl/pycurl-7.19.3.1.ebuild,v 1.3 2014/05/28 15:20:44 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/pycurl/pycurl-7.19.3.1.ebuild,v 1.4 2014/06/15 15:22:12 mgorny Exp $ EAPI=5 @@ -26,7 +26,7 @@ IUSE="curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl examples ssl" # explicitly link to libgcrypt. DEPEND=">=net-misc/curl-7.25.0-r1[ssl=] ssl? ( - net-misc/curl[curl_ssl_gnutls=,curl_ssl_nss=,curl_ssl_openssl=,-curl_ssl_axtls,-curl_ssl_cyassl,-curl_ssl_polarssl] + net-misc/curl[curl_ssl_gnutls(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-),-curl_ssl_polarssl(-)] curl_ssl_gnutls? ( >=net-libs/gnutls-2.11.0 ) )" RDEPEND="${DEPEND}" -- cgit v1.2.3-65-gdbad