Remove cyassl use flag, bug #495848

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xF52D4BBA

5 files changed, 34 insertions, 51 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/Manifest b/net-misc/curl/Manifest
index 34cfb4ee67a9..21411c71deb3 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -10,26 +10,26 @@ AUX curl-fix-gnutls-nettle.patch 1186 SHA256 d7a0f1ae6dcd50adddc9d7cd6dfcdb6b5ba
 AUX curl-respect-cflags-3.patch 406 SHA256 b87bf2c491b057bc5af5258fffcf72d7c5e86b03218f497f097eeca845c0bc0d SHA512 3219e4e67d534e35012909243fc8d69d58989462db44dd507c502e7aaa299f1d9a01392e2c83797cc2bdb53d503470c5d6e7bf94572a6ccc6e5eafcc0466bc54 WHIRLPOOL 5d61ec7f36376bd9712e0fc7984006462ab27a7e2003dd92a8d9e78e97a2e620a5cbf6a62855ebff45b2fbf9f0bca821ffdf6ce8ff81cf2a047af9e168fb61bd
 DIST curl-7.36.0.tar.bz2 2809266 SHA256 1fbe82b89bcd6b7ccda8cb0ff076edc60e911595030e27689f4abd5ef7f3cfcd SHA512 ae471d382c9c8f321a987e7a5a302abe7cb2cae4204ea65234b02c73303abef7c995c50ce8219bd90d762fa63006d50293e4350e78aee2c2086b6f7aec09b01a WHIRLPOOL 0b9f5d8a2d41126e0ff735d3f863a943e9182ec5a2abdb8caac890232432df66fe422f4dcdbfcba1fbc925880435f3733c01b747185aaa5cd1cc96571025663f
 DIST curl-7.37.0.tar.bz2 2870197 SHA256 24502492de3168b0556d8e1a06f14f7589e57b204917d602a572e14239b3e09e SHA512 67f0eafec79790753227e31c875f62e760041d5053d368a189d84ea4ef764112b87f17504e33d1e8d5212966d34ef0cc5626139857d9384cfa7b7ed55bfd0639 WHIRLPOOL 25c328e4246779db1d877f7ace0bf7859e8834b0f6f25a2203e249c9227a90f6552eebe2ad5940ab004136bbe96ff768b65658e74216e17b13cfcc2abc9c38a4
-EBUILD curl-7.36.0-r1.ebuild 6661 SHA256 cf683dbdac28387bad08e7a2f481e790a7b8049beb9885e7aafdf1026e66f56b SHA512 29315f935544fb2a8a91fa4a59a943f8d393e75d386259ddd2c9abcf9c71748f5f5ae3d91a0d039310ff4d7e9132e5db849c8f0ed99e412a8ef76f870cbf57ea WHIRLPOOL 69fe693248c066b5721500233e1698662e008566b25d056cf3fefcdbd9346b9c705007ad82b3cb9d6478c9336d3044d30bc8e49fa7efc82874910b62be60f84f
-EBUILD curl-7.36.0.ebuild 6433 SHA256 6cbb93bf9b66562cba034aa10e4ff8101d7add05da933bc2f3208da87765560b SHA512 c487af5e601ad41ee129f03f8b57f08e1dc0c58e7e43e5bd2b4ad51efb86fed0e44d8ec85c53c35b14371b13246a21948bb62997fa06fcdeaeb5986d6c098262 WHIRLPOOL 51d1113cc401dcb03adc54f57335f87a7539a29da1bbe2a60a5e7a3cd837faee9d890dd980ee520f903b9a52bd50bc14dd30cdf1f92aefc626cc8faf36804bbe
+EBUILD curl-7.36.0-r1.ebuild 6352 SHA256 08ced76939fd4bacfc0704467e5900d0f6e591b8273f54a836be6ad09b7b9b44 SHA512 d3a4f02353853ba077febf56af3910b48d8a35be2b32fd9bc7a31dbbf3ceb9d1831ad092ddc0279380e101643c3cc81a2c6d2c4aeb28aca65b177f56f2f5aed9 WHIRLPOOL 66ca90db63b04fce2dccf416fad58f677db62a3e3c4c65581654ecd4e49e1e26b69af5d9ee9b70408b1258c846a89268057e2cbefaeb47516cb631c8be51c585
+EBUILD curl-7.36.0.ebuild 6124 SHA256 c36ec20cc6eb01b38c2f83ff0e6ba61336201cd76486d473cf4594d839dc236c SHA512 cd64a8e0d474ce9eb53a30bb2c2f52855a037ca50ccf79233a1d16c3f92c2abaa55c57a4ee0b66356b4121c7923e688b78c2df331cb2bfccbaee940085f4e52b WHIRLPOOL de73a5f404d6556995385568623580c460c116d15c56ad2cb837ceb239f4593460f266d4a831909bea136a52d204abe19fb9c06451a4a12f048b44affb03211a
 EBUILD curl-7.37.0-r1.ebuild 7428 SHA256 acced6744d6bcd5b210b6e7f650636c52d6b8115fa71291959008f6e3bf6bddc SHA512 092dffef2f5ac91993dbaf1b3a7a567b1c409fc6a42bfa08822f1e892d997eba38ab81d42aec4bc26f721045ebb814c07f13bf03120b193ea1c015d9392e15c7 WHIRLPOOL a7d3428d599217897b5e745af1a1802419b615c699e59abd1702a242039f971800957491e9248ca030197db389bafbbb928694694055be501a12fb8e8fe9499a
-EBUILD curl-7.37.0.ebuild 6661 SHA256 f7aa64bdb64f6c08f56d7d399ee4bc669387076c355e7fa8b0c4d237e36daff2 SHA512 fd7e66ed3bed04d29407168213914b49a29e7f43d396283aa4801811960c4a31b812ced671771e140ce4ee64cb8b08bf5dffa59d0f1c18aff5481b4c52c5ab32 WHIRLPOOL 009ce5a15c09d861f3c15732906a28960b9b5be8b3c1b2d3b7b06c8a1f93ef9277bce4c615be1e0b70e78fba037f1e4f26d3a9a333d3b8062ffe705d664ae021
-MISC ChangeLog 55105 SHA256 e765d99abe70f9d57e663ac98f7ee2f16fe284a1453e69f75547223e3849ce17 SHA512 c06215d81475ca7e40882b0197872bdc1cda7855f5332dfdef887432b57be096ac8dc0550adc88933604a3cc7d76d0be1798b518d08d35e7de6898c589f2fed3 WHIRLPOOL c934a16002ac4f3718b02839bf7b27f1257efcbff5055ef777872c6bed08b063b9f4e043c7da19f7736f326fb06addd3fee26cb95566b6fcd712aec6b916d72f
+EBUILD curl-7.37.0.ebuild 6352 SHA256 c00d915f886124d6ac51acffee3c24ade4723ee1a92f26e2f4d838d95f8964b3 SHA512 13032d54af487886ba52ff12081ef95c204c412b1a0331223591897e510d7d46fdcb16f800b2514f9cb6f95e9fc548eb122c61125eac08e9af38caed70246e55 WHIRLPOOL e37ef1ca577ee1e9a32ab51dfe6e058d7a5c88d9cfe3120b03a6cbe29e94756f17ff44ead5e7ffbdbfc6b31d62265608c83cb149cc97240f985d4ccdfeb8baaf
+MISC ChangeLog 55264 SHA256 997c528a52b30226aa9ca9d2f4de3d5873d19e2cb2af807323c3af4ad0c30369 SHA512 fc798426101af5abe20abea111a8112e4c88b1b0056bfc188e27df8adce481657a9a1e64fade394663c3266dff7a76ce447f76a54d435b528236906d9f415c3e WHIRLPOOL f8bd5d8e1391bccc3b90bf7fcc6f52fb1896cc483185b391c87d512621cfc0f5f6e520a9fb1fa95e80b049a3435bc89fd0cc5fb8615ea58648bb94e5a1938467
 MISC metadata.xml 868 SHA256 df66fe73acfdaff0fda0595656e112e6cfd4aebde2c52237c868c8031306e12e SHA512 a948ea9d372475d680c6f6fe4617ea5151d4378b1d5ea09e0566a88e403c9ed0a562c5426340bb1b03cf58a99c1f22411973bf215aa37ce8d30662a0e0101e4b WHIRLPOOL 0e058b6bb29d6c997a36a2563402b969b6dfa06912c3f8b854f8d89eb4113aa7fb376594ac0c756f1b59b3080aa508dab09426a9dfa982de56733f097baf9f37
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJTxPdXAAoJEJOE+m71LUu6SFAP/13T53l5XnXOLrZV/FVCSiiz
-tWfdr6Ok2z9cmhPLW0L/gza7X7u1VChWba0ica4ZV575wFJeQEF9jAVF+Bdplq7C
-/7Gr7pABWKD6v4H2q2AXIBLzvvRzbjZmjE4gf12jxHBPFr90xvp0aE1SrUtebj3G
-odaNvrbftrldS68lxdTge6u1OPgp4eZk441N1nQSHj59Bs/NKn7qyPR84fQ27YiO
-J/1C1lO/hyo3FWK7wnxSIg7+02K9jrgzJP0xqpRNTUQTOQzaQ9RowRFlzx56B84M
-pUSIB5wQMcdNy8FvCkVQUt/BeGFfmYTA3223ZY07jdJ9yHhKDbC9x8C4vzFnGyqO
-yFr+oVGqCdpbWlqDHQA3AkFP0R0x4b+eNcAnwPPnaPbgmdeJeiq7JwVo/JCa/KhO
-QVBXotc1o6tPLB6nGHyP/MVbbWvsPEkSBQ66YsG6p8btwov0vHReJiGvQIXuIFka
-SAdMx8i2dGOUGZBmC7ffYVnG/WMSwk2Q1EyhMNmjTQ1xIhtNivsnvzZpfKf4cljr
-fEwNg9gB26fChQfXNYE480ySWmOfsgw58u3qO/U853NgVg+4M7Q8OH6GSQdsK5kP
-8iHhANWvXFT2YM2tZEGabO4le4nzmto+GbAqWaxrp6lF2305ollhDrIThdBuEUOt
-2vUybs9urWFjVw3jF0dg
-=ZlAu
+iQIcBAEBCAAGBQJTxS39AAoJEJOE+m71LUu6yvUP/i8n8SkQ1cWyNmYh/lHdSIeU
+2LjDbPnpmJID57FILdXuwVnerIMVWfJmEAyZcd0hix5ETThQ7K9KSlsaOB7iU31C
+qilJO/WQW15/hK6GJ1DQo0QPfz9/NFYyou0EmbuCDM0pTUu97k6aRf6K0wbp+UUF
+0jc3PAUnNmWzfoECfIIbvcU/oBr4ISkFVcKN7tEeHW3oC3Fkrdayqb6383hiQGxA
+xY9XiYbiWH7aA4SjgGm5PjUGFI9znqsGBgzsJ2+Il28EtFOCo03zCxh3qFKEQW6d
+W0WbYCHhpKVxDDEdhYkma5A4jR+53t7dL8kmi3S/RfE1/OMXALt/0YQVW2RJCxQ/
+xoE7ZVX6WclIY1ajilTEmPqUigkTa1qNg1M0n1x+abzD2xso6MOc9cGXR4OZ++BL
+cZAkrs/w2K0zSbyKKB4/OlnIvmvB3vUQgaU8GsZQxmL/sVweHKMg0GMwfUEiFB7j
+BcWPB5Tx06iYavN1UOLsebXf12BeeDw7KMACwlCaQR/3gIhlWsKodztBzdlvfkY6
+eZG0cjJ459ZJSjtD1cC3cMrzjOK4cerXKmncKqF86mJ35xFOa0dDl2uWwwTXnS3l
+SBRAzbodrguti8QKO8z+g5riNmT9rtro0yn/FdebJ/J/6/nrUeOqJ+pRDduwT/6t
+Z4UhXBj+u33XN8sa2NdW
+=g7ki
 -----END PGP SIGNATURE-----
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) \