Remove cyassl package and use flag, bug #495848

12 files changed, 25 insertions, 47 deletions

diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index a6a7258fd8a5..c4f84e9b2a8b 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,20 @@
 # ChangeLog for profile directory
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.9207 2014/07/14 19:56:48 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.9208 2014/07/15 10:20:30 blueness Exp $
 #
 # This ChangeLog should include records for all changes in profiles directory.
 # Only typo fixes which don't affect portage/repoman behaviour could be avoided
 # here. If in doubt put a record here!
 
+  15 Jul 2014; Anthony G. Basile <blueness@gentoo.org>
+  arch/amd64-fbsd/todo/package.use.mask, arch/amd64/package.use.mask,
+  arch/x86/package.use.mask, base/package.use.mask,
+  default/bsd/fbsd/amd64/9.1/clang/package.use.mask,
+  default/bsd/fbsd/amd64/9.2/clang/package.use.mask,
+  default/linux/alpha/13.0/use.mask, default/linux/ia64/13.0/use.mask,
+  default/linux/sparc/13.0/use.mask, desc/curl_ssl.desc, package.mask:
+  Remove cyassl package and use flag, bug #495848
+
   14 Jul 2014; Maxim Koltsov <maksbotan@gentoo.org> package.mask:
   Update mpv mask to 0.4.1
 
diff --git a/profiles/arch/amd64-fbsd/todo/package.use.mask b/profiles/arch/amd64-fbsd/todo/package.use.mask
index 95c41a95e410..6f2b18e03527 100644
--- a/profiles/arch/amd64-fbsd/todo/package.use.mask
+++ b/profiles/arch/amd64-fbsd/todo/package.use.mask
@@ -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/profiles/arch/amd64-fbsd/todo/package.use.mask,v 1.336 2013/11/17 14:13:57 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64-fbsd/todo/package.use.mask,v 1.337 2014/07/15 10:20:31 blueness Exp $
 
 # Mask useflags that require deps with missing keywords.
 # Anyone is allowed and _very welcome_ to add masks there.
@@ -39,9 +39,6 @@ net-misc/curl curl_ssl_axtls
 # provided by glibc)
 net-misc/curl metalink
 
-# net-libs/cyassl (fails to build)
-net-misc/curl curl_ssl_cyassl
-
 # sys-process/numactl
 sys-apps/hwloc numa
 
diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask
index 9e045df42880..7046b4705e7b 100644
--- a/profiles/arch/amd64/package.use.mask
+++ b/profiles/arch/amd64/package.use.mask
@@ -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/profiles/arch/amd64/package.use.mask,v 1.182 2014/06/29 18:35:33 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/package.use.mask,v 1.183 2014/07/15 10:20:31 blueness Exp $
 
 # When you add an entry to the top of this file, add your name, the date, and
 # an explanation of why something is getting masked. Please be extremely
@@ -67,10 +67,6 @@ sys-apps/hwloc -cuda -gl -opencl
 # Meaningless on amd64 (it controls the 32-bit x86 JIT).
 dev-python/pypy sse2
 
-# Anthony G. Basile <blueness@gentoo.org> (18 Jun 2013)
-# Works on amd64
-net-libs/cyassl -aes-ni
-
 # Michael Weber <xmw@gentoo.org> (18 Jun 2013)
 # unsatisfied multilib dep on curl[abi_x86_32]
 www-client/netsurf abi_x86_32
diff --git a/profiles/arch/x86/package.use.mask b/profiles/arch/x86/package.use.mask
index 93e0b41d76c1..2e35233e1e1a 100644
--- a/profiles/arch/x86/package.use.mask
+++ b/profiles/arch/x86/package.use.mask
@@ -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/profiles/arch/x86/package.use.mask,v 1.135 2014/05/21 07:39:33 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/x86/package.use.mask,v 1.136 2014/07/15 10:20:31 blueness Exp $
 
 # This file requires >=portage-2.1.1
 
@@ -52,10 +52,6 @@ sys-apps/hwloc -cuda -gl -opencl
 # Keywords missing, bug #478104
 >=app-editors/gedit-plugins-3.8.3 git
 
-# Anthony G. Basile <blueness@gentoo.org> (18 Jun 2013)
-# Works on x86
-net-libs/cyassl -aes-ni
-
 # Justin Lecher <jlec@gentoo.org> (21 Feb 2013)
 # cuda only works on x86 and amd64
 sci-libs/cholmod -cuda
@@ -85,10 +81,6 @@ media-libs/phonon zeitgeist
 # dependency keyworded here, masked in base
 media-libs/freetype -infinality
 
-# Anthony G. Basile <blueness@gentoo.org> (12 Jul 2012)
-# sha512 support in cyassl is broken on x86
-net-libs/cyassl sha512
-
 # Rick Farina <zerochaos@gentoo.org> (05 July 2012)
 # masked in base, unmask x86/amd64 only
 app-crypt/johntheripper -cuda
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index ee4eb1f79799..78784ff037dd 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -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/profiles/base/package.use.mask,v 1.584 2014/07/11 19:36:18 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/package.use.mask,v 1.585 2014/07/15 10:20:32 blueness Exp $
 
 # This file requires >=portage-2.1.1
 # New entries go on top.
@@ -22,10 +22,6 @@ net-misc/stargazer module_store_firebird
 # net-libs/adns is going away (bug #513982)
 net-analyzer/wireshark libadns
 
-# Anthony G. Basile <blueness@gentoo.org> (14 Jun 2014)
-# net-libs/cyassl is being tree cleaned, bug #495848
-net-misc/curl curl_ssl_cyassl
-
 # Zac Medico <zmedico@gentoo.org> (06 Jun 2014)
 # Needs hardmasked lua-5.2
 www-servers/mongoose lua
@@ -281,10 +277,6 @@ sys-libs/libcxxrt libunwind
 # Not fit for production
 =www-client/netsurf-3.0* fbcon pdf-writer gstreamer
 
-# Anthony G. Basile <blueness@gentoo.org> (18 Jun 2013)
-# Only work on amd64/x86
-net-libs/cyassl aes-ni
-
 # Sergey Popov <pinkbyte@gentoo.org> (08 Jun 2013)
 # mask because requires unstable depends not ready for the stabilization
 app-leechcraft/leechcraft-meta unstable
diff --git a/profiles/default/bsd/fbsd/amd64/9.1/clang/package.use.mask b/profiles/default/bsd/fbsd/amd64/9.1/clang/package.use.mask
index 171daabda2da..2cdb077b199b 100644
--- a/profiles/default/bsd/fbsd/amd64/9.1/clang/package.use.mask
+++ b/profiles/default/bsd/fbsd/amd64/9.1/clang/package.use.mask
@@ -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/profiles/default/bsd/fbsd/amd64/9.1/clang/package.use.mask,v 1.4 2013/06/19 13:00:27 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default/bsd/fbsd/amd64/9.1/clang/package.use.mask,v 1.5 2014/07/15 10:20:32 blueness Exp $
 
 # Build libcxxrt over libgcc_s since that is what clang defaults to.
 sys-libs/libcxxrt libunwind
@@ -13,4 +13,4 @@ sys-devel/binutils cxx
 
 # Force openssl on curl since cmakes needs it and is in @system because of
 # libcxx on this profile. Mask the other ssl providers.
-net-misc/curl curl_ssl_axtls curl_ssl_cyassl curl_ssl_gnutls curl_ssl_nss curl_ssl_polarssl
+net-misc/curl curl_ssl_axtls curl_ssl_gnutls curl_ssl_nss curl_ssl_polarssl
diff --git a/profiles/default/bsd/fbsd/amd64/9.2/clang/package.use.mask b/profiles/default/bsd/fbsd/amd64/9.2/clang/package.use.mask
index b8d04ba8ad6f..f7204c7ac93d 100644
--- a/profiles/default/bsd/fbsd/amd64/9.2/clang/package.use.mask
+++ b/profiles/default/bsd/fbsd/amd64/9.2/clang/package.use.mask
@@ -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/profiles/default/bsd/fbsd/amd64/9.2/clang/package.use.mask,v 1.1 2013/08/09 14:11:22 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default/bsd/fbsd/amd64/9.2/clang/package.use.mask,v 1.2 2014/07/15 10:20:32 blueness Exp $
 
 # Build libcxxrt over libgcc_s since that is what clang defaults to.
 sys-libs/libcxxrt libunwind
@@ -13,4 +13,4 @@ sys-devel/binutils cxx
 
 # Force openssl on curl since cmakes needs it and is in @system because of
 # libcxx on this profile. Mask the other ssl providers.
-net-misc/curl curl_ssl_axtls curl_ssl_cyassl curl_ssl_gnutls curl_ssl_nss curl_ssl_polarssl
+net-misc/curl curl_ssl_axtls curl_ssl_gnutls curl_ssl_nss curl_ssl_polarssl
diff --git a/profiles/default/linux/alpha/13.0/use.mask b/profiles/default/linux/alpha/13.0/use.mask
index 795d4aaf0b31..de1b80c26103 100644
--- a/profiles/default/linux/alpha/13.0/use.mask
+++ b/profiles/default/linux/alpha/13.0/use.mask
@@ -2,5 +2,4 @@
 # Pulls in net-libs/axtls or net-libs/polarssl which are
 # not keyworded for arch
 curl_ssl_axtls
-curl_ssl_cyassl
 curl_ssl_polarssl
diff --git a/profiles/default/linux/ia64/13.0/use.mask b/profiles/default/linux/ia64/13.0/use.mask
index 795d4aaf0b31..de1b80c26103 100644
--- a/profiles/default/linux/ia64/13.0/use.mask
+++ b/profiles/default/linux/ia64/13.0/use.mask
@@ -2,5 +2,4 @@
 # Pulls in net-libs/axtls or net-libs/polarssl which are
 # not keyworded for arch
 curl_ssl_axtls
-curl_ssl_cyassl
 curl_ssl_polarssl
diff --git a/profiles/default/linux/sparc/13.0/use.mask b/profiles/default/linux/sparc/13.0/use.mask
index bf9d5e60a1ab..eab5da4ff4e0 100644
--- a/profiles/default/linux/sparc/13.0/use.mask
+++ b/profiles/default/linux/sparc/13.0/use.mask
@@ -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/profiles/default/linux/sparc/13.0/use.mask,v 1.1 2013/01/18 19:48:22 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default/linux/sparc/13.0/use.mask,v 1.2 2014/07/15 10:20:33 blueness Exp $
 
 # this is not a multilib profile
 multilib
@@ -8,4 +8,3 @@ multilib
 # Anthony G. Basile <blueness@gentoo.org> (15 Apr 2012)
 # Pulls in net-libs/axtls which is not keyworded for arch
 curl_ssl_axtls
-curl_ssl_cyassl
diff --git a/profiles/desc/curl_ssl.desc b/profiles/desc/curl_ssl.desc
index e77018322c20..8bd7dde62cff 100644
--- a/profiles/desc/curl_ssl.desc
+++ b/profiles/desc/curl_ssl.desc
@@ -1,12 +1,11 @@
 # Copyright 1999-2014 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/desc/curl_ssl.desc,v 1.3 2014/04/29 13:25:39 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/desc/curl_ssl.desc,v 1.4 2014/07/15 10:20:33 blueness Exp $
 
 # This file contains descriptions of CURL_SSL USE_EXPAND flags for net-misc/curl
 #spnego - Use SPNEGO fbopenssl - to be added
 
 axtls - Use axTLS
-cyassl - Use CyaSSL
 gnutls - Use GnuTLS
 nss - Use Mozilla's Network Security Services 
 openssl - Use OpenSSL
diff --git a/profiles/package.mask b/profiles/package.mask
index 9e2319422f10..ea51c9652fcd 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
 ####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.15895 2014/07/14 19:56:48 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.15896 2014/07/15 10:20:30 blueness Exp $
 #
 # When you add an entry to the top of this file, add your name, the date, and
 # an explanation of why something is getting masked. Please be extremely
@@ -144,10 +144,6 @@ x11-misc/keytouch-editor
 app-emulation/openstack-guest-agents-unix
 app-emulation/xe-guest-utilities
 
-# Anthony G. Basile <blueness@gentoo.org> (14 Jun 2014)
-# Masked for removal in 30 days, bug #495848
-net-libs/cyassl
-
 # Mike Gilbert <floppym@gentoo.org> (13 Jun 2014)
 # Masked due to security bug 499870.
 # Please migrate to net-misc/libreswan.