Rework SIMD USE flag maskings on hardened/amd64 profiles.

2 files changed, 66 insertions, 14 deletions

diff --git a/profiles/hardened/amd64/package.use.mask b/profiles/hardened/amd64/package.use.mask
index bda5e3ef54e2..59b24a201264 100644
--- a/profiles/hardened/amd64/package.use.mask
+++ b/profiles/hardened/amd64/package.use.mask
@@ -4,10 +4,6 @@
 # Depends on packages not yet keyworded for amd64, cf bug #22042
 app-backup/backup-manager s3
 
-# 26 Mar 2009: Gordon Malm <gengor@gentoo.org>
-# This version fails if <gcc-4.2, subsequent versions do not
-=x11-libs/pixman-0.12.0 sse2
-
 # Thomas Sachau <tommy@gentoo.org> (09 Mar 2009)
 # copy mask from arch/amd64
 # Mask dbus, hal, nas and scanner USE flags;
@@ -37,11 +33,64 @@ dev-java/jamvm libffi
 # which is only available on x86
 media-tv/zapping vdr
 
-# 12 Sep 2008; Gordon Malm <gengor@gentoo.org>
-# x86-specific SIMD/asm, bugs #193022 and #207685
-media-sound/mpg123 mmx 3dnow 3dnowext sse
-
 # Dawid Węgliński <cla@gentoo.org>
 # Mask amarok2 useflag for net-im/kadu
 # See bug #238487 for references
 net-im/kadu amarok2
+
+
+# Following is x86-32-only SIMD, etc. (some taken from arch/amd64/package.use.mask)
+
+# Oct 23th 2006; blubb@gentoo.org
+# upstream forces sse2 for amd64; mmx flag does nothing
+app-crypt/johntheripper mmx
+
+# Oct 23th 2006; blubb@gentoo.org
+# the asm is 64bit save, but it doesn't compile anyway
+games-emulation/visualboyadvance mmx
+
+# Jeremy Olexa <darkside@gentoo.org> (07 Feb 2009)
+# USE=mmx on imlib2 causes issues with other apps. See bug 218382 (comments 11-12)
+media-libs/imlib2 mmx
+
+# Apr 25th 2007: Alexis Ballier <aballier@gentoo.org>
+# Mask mmx for media-libs/mlt
+# assembler is not 64bits compliant (yet)
+media-libs/mlt mmx
+
+# 8 Aug 2008: Alexis Ballier <aballier@gentoo.org>
+# x86 asm only, it won't be built on amd64 if mmx useflag is enabled but that
+# saves people from needlessly installing nasm
+# Refs bug #93279
+media-sound/lame mmx
+
+# 12 Sep 2008; Gordon Malm <gengor@gentoo.org>
+# x86-specific SIMD/asm, bugs #193022 and #207685
+media-sound/mpg123 mmx 3dnow 3dnowext sse
+
+# 26 Mar 2009: Gordon Malm <gengor@gentoo.org>
+# This version fails if <gcc-4.2, subsequent versions do not
+=x11-libs/pixman-0.12.0 sse2
+
+# Oct 24th 2006; blubb@gentoo.org
+# bug 152646
+x11-themes/polymer mmx sse2
+
+# Oct 23th 2006; blubb@gentoo.org
+# x86 asm only:
+games-emulation/xmame mmx
+games-emulation/xmess mmx
+media-gfx/inkscape mmx
+media-libs/allegro mmx sse
+media-libs/libfame mmx
+media-libs/libmovtar mmx
+media-libs/sdl-gfx mmx
+media-libs/smpeg mmx
+media-video/mjpegtools mmx
+media-video/mpeg4ip mmx
+net-irc/xchat mmx
+net-irc/xchat-gnome mmx
+net-misc/asterisk mmx
+x11-terms/eterm mmx
+media-tv/xawtv mmx
+
diff --git a/profiles/hardened/amd64/use.mask b/profiles/hardened/amd64/use.mask
index d0f39d843862..560402b4a5b5 100644
--- a/profiles/hardened/amd64/use.mask
+++ b/profiles/hardened/amd64/use.mask
@@ -1,9 +1,17 @@
 # Copyright 2006 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/amd64/use.mask,v 1.30 2008/03/03 20:22:22 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/amd64/use.mask,v 1.31 2009/04/23 18:20:42 gengor Exp $
 
 multilib
 
+# SIMD
+-mmx
+-mmxext
+-3dnow
+-3dnowext
+-sse
+-sse2
+
 # UNKNOWN - SECTION
 afs
 drac
@@ -92,11 +100,6 @@ pvm
 # Vidix support doesn't work on amd64 for now.
 vidix
 
--3dnow
--3dnowext
--sse
--sse2
-
 # Diego Pettenò <flameeyes@gentoo.org> (4 Jan 2007)
 # Unmask the flags for PHP that are available only on x86/amd64
 -oci8