Fix use masking for net-libs/cyassl[aes-ni], bug #470220

7 files changed, 25 insertions, 19 deletions

diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index d5c5cb136775..039e8f065d1b 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,17 @@
 # ChangeLog for profile directory
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.7952 2013/06/18 16:19:02 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.7953 2013/06/18 20:39:11 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!
 
+  18 Jun 2013; Anthony G. Basile <blueness@gentoo.org>
+  arch/amd64/package.use.mask, arch/arm/package.use.mask,
+  arch/mips/package.use.mask, arch/powerpc/package.use.mask,
+  arch/x86/package.use.mask, base/package.use.mask:
+  Fix use masking for net-libs/cyassl[aes-ni], bug #470220
+
   18 Jun 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
   package.mask:
   Suggest some alternatives to net-im/qutecom.
diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask
index e5804e37e04f..408fc3e7a4b6 100644
--- a/profiles/arch/amd64/package.use.mask
+++ b/profiles/arch/amd64/package.use.mask
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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.165 2013/06/18 06:20:19 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/package.use.mask,v 1.166 2013/06/18 20:39:11 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
@@ -18,6 +18,10 @@
 
 #--- END OF EXAMPLES ---
 
+# 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/arm/package.use.mask b/profiles/arch/arm/package.use.mask
index ae0e0d768087..db57aec242a1 100644
--- a/profiles/arch/arm/package.use.mask
+++ b/profiles/arch/arm/package.use.mask
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/arm/package.use.mask,v 1.150 2013/06/17 06:00:35 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/arm/package.use.mask,v 1.151 2013/06/18 20:39:11 blueness Exp $
 
 # Patrick Lauer <patrick@gentoo.org> (17 June 2013)
 # Fix per-arch mask of phonon[zeitgeist] #460140
@@ -174,10 +174,6 @@ net-analyzer/wireshark doc-pdf
 # no stable media-video/vlc yet, bug #401313
 media-libs/phonon vlc
 
-# Anthony G. Basile <blueness@gentoo.org> (17 Jul 2012)
-# Only work on amd64/x86
-net-libs/cyassl aes-ni
-
 # Chí-Thanh Christopher Nguyen <chithanh@gentoo.org> (02 Jun 2012)
 # Mask udis86 flag for llvm, which is of limited use outside x86/amd64.
 sys-devel/llvm udis86
diff --git a/profiles/arch/mips/package.use.mask b/profiles/arch/mips/package.use.mask
index e4e28f255ff7..a548a3e39903 100644
--- a/profiles/arch/mips/package.use.mask
+++ b/profiles/arch/mips/package.use.mask
@@ -1,15 +1,11 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/mips/package.use.mask,v 1.53 2013/05/28 13:53:41 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/mips/package.use.mask,v 1.54 2013/06/18 20:39:12 blueness Exp $
 
 # Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (28 May 2013)
 # depends on sys-devel/llvm[video_cards_radeon]
 media-libs/mesa r600-llvm-compiler
 
-# Anthony G. Basile <blueness@gentoo.org> (16 Jul 2012)
-# Only work on amd64/x86
-net-libs/cyassl aes-ni
-
 # Kacper Kowalik <xarthisius@gentoo.org> (20 May 2011)
 # depends on dev-libs/dmalloc which is not keyworded
 net-nds/ypbind debug
diff --git a/profiles/arch/powerpc/package.use.mask b/profiles/arch/powerpc/package.use.mask
index 69120076643e..58e0dca409de 100644
--- a/profiles/arch/powerpc/package.use.mask
+++ b/profiles/arch/powerpc/package.use.mask
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/powerpc/package.use.mask,v 1.167 2013/06/17 06:00:51 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/powerpc/package.use.mask,v 1.168 2013/06/18 20:39:12 blueness Exp $
 
 # Patrick Lauer <patrick@gentoo.org> (17 June 2013)
 # Fix per-arch mask of phonon[zeitgeist] #460140
@@ -55,10 +55,6 @@ x11-themes/gtk-engines-qtcurve mozilla
 # Does not work on ppc/ppc64
 net-misc/tor tor-hardening
 
-# Anthony G. Basile <blueness@gentoo.org> (16 Jul 2012)
-# Only work on amd64/x86
-net-libs/cyassl aes-ni cyassl-hardening
-
 # Johannes Huber <johu@gentoo.org> (9 Jul 2012)
 # dev-qt/qtopenvg not keyworded correctly.
 # ppc/ppc64 team please validate.
diff --git a/profiles/arch/x86/package.use.mask b/profiles/arch/x86/package.use.mask
index 506e8a60ea15..786701ec2f64 100644
--- a/profiles/arch/x86/package.use.mask
+++ b/profiles/arch/x86/package.use.mask
@@ -1,9 +1,13 @@
 # Copyright 1999-2013 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.118 2013/06/09 11:43:32 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/x86/package.use.mask,v 1.119 2013/06/18 20:39:12 blueness Exp $
 
 # This file requires >=portage-2.1.1
 
+# 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
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 8b584fe87422..8a13e47cf330 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -1,11 +1,15 @@
 # Copyright 1999-2013 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.478 2013/06/17 06:01:53 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/package.use.mask,v 1.479 2013/06/18 20:39:12 blueness Exp $
 
 # This file requires >=portage-2.1.1
 # New entries go on top.
 #
 
+# 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