Remove cyassl use flag, bug #495848

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0xF52D4BBA)

4 files changed, 17 insertions, 34 deletions

diff --git a/net-misc/curl/ChangeLog b/net-misc/curl/ChangeLog
index 4341fcb8ac54..f894bcc8f962 100644
--- a/net-misc/curl/ChangeLog
+++ b/net-misc/curl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/curl
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.369 2014/07/15 09:40:13 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.370 2014/07/15 13:33:30 blueness Exp $
+
+  15 Jul 2014; Anthony G. Basile <blueness@gentoo.org> curl-7.36.0-r1.ebuild,
+  curl-7.36.0.ebuild, curl-7.37.0.ebuild:
+  Remove cyassl use flag, bug #495848
 
   04 Jul 2014; Ian Stakenvicius (_AxS_) <axs@gentoo.org> curl-7.37.0-r1.ebuild:
   adjusted exclusion dep on emul-linux-x86-baselibs as it was way too old
diff --git a/net-misc/curl/curl-7.36.0-r1.ebuild b/net-misc/curl/curl-7.36.0-r1.ebuild
index f1326d185cc1..8e831b891b28 100644
--- a/net-misc/curl/curl-7.36.0-r1.ebuild
+++ b/net-misc/curl/curl-7.36.0-r1.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/net-misc/curl/curl-7.36.0-r1.ebuild,v 1.3 2014/07/15 09:40:13 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.36.0-r1.ebuild,v 1.4 2014/07/15 13:33:30 blueness Exp $
 
 EAPI="5"
 
@@ -14,7 +14,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="adns idn ipv6 kerberos ldap metalink rtmp 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 curl_ssl_winssl"
+IUSE="${IUSE} curl_ssl_axtls curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl curl_ssl_polarssl curl_ssl_winssl"
 IUSE="${IUSE} elibc_Winnt"
 
 #lead to lots of false negatives, bug #285669
@@ -23,7 +23,6 @@ RESTRICT="test"
 RDEPEND="ldap? ( net-nds/openldap )
 	ssl? (
 		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 )
@@ -71,7 +70,6 @@ REQUIRED_USE="
 	ssl? (
 		^^ (
 			curl_ssl_axtls
-			curl_ssl_cyassl
 			curl_ssl_gnutls
 			curl_ssl_openssl
 			curl_ssl_nss
@@ -103,7 +101,7 @@ src_configure() {
 	# We make use of the fact that later flags override earlier ones
 	# So start with all ssl providers off until proven otherwise
 	local myconf=()
-	myconf+=( --without-axtls --without-cyassl --without-gnutls --without-nss --without-polarssl --without-ssl --without-winssl )
+	myconf+=( --without-axtls --without-gnutls --without-nss --without-polarssl --without-ssl --without-winssl )
 	myconf+=( --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt )
 	if use ssl ; then
 		if use curl_ssl_axtls; then
@@ -112,12 +110,6 @@ src_configure() {
 			einfo "may not be the best choice as an ssl provider"
 			myconf+=( --with-axtls )
 		fi
-		if use curl_ssl_cyassl; then
-			einfo "SSL provided by cyassl"
-			einfo "NOTE: cyassl is meant for embedded systems and"
-			einfo "may not be the best choice as an ssl provider"
-			myconf+=( --with-cyassl )
-		fi
 		if use curl_ssl_gnutls; then
 			einfo "SSL provided by gnutls"
 			if has_version ">=net-libs/gnutls-3" || has_version "=net-libs/gnutls-2.12*[nettle]"; then
@@ -187,6 +179,7 @@ src_configure() {
 		$(use_enable static-libs static) \
 		$(use_enable threads threaded-resolver) \
 		--disable-versioned-symbols \
+		--without-cyassl \
 		--without-darwinssl \
 		$(use_with idn libidn) \
 		$(use_with kerberos gssapi "${EPREFIX}"/usr) \
diff --git a/net-misc/curl/curl-7.36.0.ebuild b/net-misc/curl/curl-7.36.0.ebuild
index e3eeb16db595..4760ef1914af 100644
--- a/net-misc/curl/curl-7.36.0.ebuild
+++ b/net-misc/curl/curl-7.36.0.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/net-misc/curl/curl-7.36.0.ebuild,v 1.17 2014/07/15 09:40:13 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.36.0.ebuild,v 1.18 2014/07/15 13:33:30 blueness Exp $
 
 EAPI="5"
 
@@ -14,7 +14,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="adns idn ipv6 kerberos ldap metalink rtmp 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"
+IUSE="${IUSE} curl_ssl_axtls curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl curl_ssl_polarssl"
 
 #lead to lots of false negatives, bug #285669
 RESTRICT="test"
@@ -22,7 +22,6 @@ RESTRICT="test"
 RDEPEND="ldap? ( net-nds/openldap )
 	ssl? (
 		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 )
@@ -69,7 +68,6 @@ REQUIRED_USE="
 	ssl? (
 		^^ (
 			curl_ssl_axtls
-			curl_ssl_cyassl
 			curl_ssl_gnutls
 			curl_ssl_openssl
 			curl_ssl_nss
@@ -100,7 +98,7 @@ src_configure() {
 	# We make use of the fact that later flags override earlier ones
 	# So start with all ssl providers off until proven otherwise
 	local myconf=()
-	myconf+=( --without-axtls --without-cyassl --without-gnutls --without-nss --without-polarssl --without-ssl )
+	myconf+=( --without-axtls --without-gnutls --without-nss --without-polarssl --without-ssl )
 	myconf+=( --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt )
 	if use ssl ; then
 		if use curl_ssl_axtls; then
@@ -109,12 +107,6 @@ src_configure() {
 			einfo "may not be the best choice as an ssl provider"
 			myconf+=( --with-axtls )
 		fi
-		if use curl_ssl_cyassl; then
-			einfo "SSL provided by cyassl"
-			einfo "NOTE: cyassl is meant for embedded systems and"
-			einfo "may not be the best choice as an ssl provider"
-			myconf+=( --with-cyassl )
-		fi
 		if use curl_ssl_gnutls; then
 			einfo "SSL provided by gnutls"
 			if has_version ">=net-libs/gnutls-3" || has_version "=net-libs/gnutls-2.12*[nettle]"; then
@@ -180,6 +172,7 @@ src_configure() {
 		$(use_enable static-libs static) \
 		$(use_enable threads threaded-resolver) \
 		--disable-versioned-symbols \
+		--without-cyassl \
 		--without-darwinssl \
 		$(use_with idn libidn) \
 		$(use_with kerberos gssapi "${EPREFIX}"/usr) \
diff --git a/net-misc/curl/curl-7.37.0.ebuild b/net-misc/curl/curl-7.37.0.ebuild
index 50ec1ba4e739..22e07be37523 100644
--- a/net-misc/curl/curl-7.37.0.ebuild
+++ b/net-misc/curl/curl-7.37.0.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/net-misc/curl/curl-7.37.0.ebuild,v 1.4 2014/07/15 09:40:13 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.37.0.ebuild,v 1.5 2014/07/15 13:33:30 blueness Exp $
 
 EAPI="5"
 
@@ -14,7 +14,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="adns idn ipv6 kerberos ldap metalink rtmp 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 curl_ssl_winssl"
+IUSE="${IUSE} curl_ssl_axtls curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl curl_ssl_polarssl curl_ssl_winssl"
 IUSE="${IUSE} elibc_Winnt"
 
 #lead to lots of false negatives, bug #285669
@@ -23,7 +23,6 @@ RESTRICT="test"
 RDEPEND="ldap? ( net-nds/openldap )
 	ssl? (
 		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 )
@@ -72,7 +71,6 @@ REQUIRED_USE="
 	ssl? (
 		^^ (
 			curl_ssl_axtls
-			curl_ssl_cyassl
 			curl_ssl_gnutls
 			curl_ssl_openssl
 			curl_ssl_nss
@@ -103,7 +101,7 @@ src_configure() {
 	# We make use of the fact that later flags override earlier ones
 	# So start with all ssl providers off until proven otherwise
 	local myconf=()
-	myconf+=( --without-axtls --without-cyassl --without-gnutls --without-nss --without-polarssl --without-ssl --without-winssl )
+	myconf+=( --without-axtls --without-gnutls --without-nss --without-polarssl --without-ssl --without-winssl )
 	myconf+=( --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt )
 	if use ssl ; then
 		if use curl_ssl_axtls; then
@@ -112,12 +110,6 @@ src_configure() {
 			einfo "may not be the best choice as an ssl provider"
 			myconf+=( --with-axtls )
 		fi
-		if use curl_ssl_cyassl; then
-			einfo "SSL provided by cyassl"
-			einfo "NOTE: cyassl is meant for embedded systems and"
-			einfo "may not be the best choice as an ssl provider"
-			myconf+=( --with-cyassl )
-		fi
 		if use curl_ssl_gnutls; then
 			einfo "SSL provided by gnutls"
 			if has_version ">=net-libs/gnutls-3" || has_version "=net-libs/gnutls-2.12*[nettle]"; then
@@ -187,6 +179,7 @@ src_configure() {
 		$(use_enable static-libs static) \
 		$(use_enable threads threaded-resolver) \
 		--disable-versioned-symbols \
+		--without-cyassl \
 		--without-darwinssl \
 		$(use_with idn libidn) \
 		$(use_with kerberos gssapi "${EPREFIX}"/usr) \