Update package.use.* entries for CPU_FLAGS_X86. Keep duplicate with old flags until conversion is complete.

5 files changed, 40 insertions, 12 deletions

diff --git a/profiles/arch/amd64/ChangeLog b/profiles/arch/amd64/ChangeLog
index 295807cf5a3b..9d48b6df5cb4 100644
--- a/profiles/arch/amd64/ChangeLog
+++ b/profiles/arch/amd64/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for Gentoo/AMD64 profile directory
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/ChangeLog,v 1.301 2015/01/28 20:56:51 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/ChangeLog,v 1.302 2015/01/28 21:29:48 mgorny Exp $
+
+  28 Jan 2015; Michał Górny <mgorny@gentoo.org> package.use.force,
+  package.use.mask:
+  Update package.use.* entries for CPU_FLAGS_X86. Keep duplicate with old flags
+  until conversion is complete.
 
   28 Jan 2015; Mike Gilbert <floppym@gentoo.org> make.defaults:
   Set CPU_FLAGS_X86 to a reasonable default.
diff --git a/profiles/arch/amd64/package.use.force b/profiles/arch/amd64/package.use.force
index 108887babe37..9bce96e52b27 100644
--- a/profiles/arch/amd64/package.use.force
+++ b/profiles/arch/amd64/package.use.force
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/package.use.force,v 1.8 2013/10/02 18:14:17 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/package.use.force,v 1.9 2015/01/28 21:29:48 mgorny Exp $
 
 # Michał Górny <mgorny@gentoo.org> (02 Sep 2013)
 # Packages with optional 64-bit variant.
@@ -14,7 +14,7 @@ media-gfx/iscan-plugin-gt-f500 minimal
 
 # <blubb@gentoo.org> (23 Oct 2006)
 # upstream forces sse2 on regardless of what the use flag is
-dev-libs/openssl sse2
+dev-libs/openssl cpu_flags_x86_sse2
 
 # Santiago M. Mola <coldwind@gentoo.org> (17 Sep 2008)
 # x86emu is the only backend available for amd64 (bug #224987)
diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask
index f3ee944120e6..80bc90999483 100644
--- a/profiles/arch/amd64/package.use.mask
+++ b/profiles/arch/amd64/package.use.mask
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 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.192 2014/11/06 15:07:05 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/package.use.mask,v 1.193 2015/01/28 21:29:48 mgorny 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
@@ -38,6 +38,7 @@ media-libs/mesa -openmax
 # Still considered experimental by upstream:
 # http://sourceforge.net/p/mikmod/bugs/16/#17ea
 media-libs/libmikmod sse2
+media-libs/libmikmod cpu_flags_x86_sse2
 
 # Andreas K. Huettel <dilfridge@gentoo.org> (4 Jan 2014)
 # While globally masked, the needed amd64 keywords are already present
@@ -69,10 +70,10 @@ sys-apps/hwloc -cuda -gl -opencl
 
 # Michał Górny <mgorny@gentoo.org> (22 Jul 2013)
 # Meaningless on amd64 (it controls the 32-bit x86 JIT).
-dev-python/pypy sse2
-dev-python/pypy-bin sse2
-dev-python/pypy3 sse2
-dev-python/pypy3-bin sse2
+dev-python/pypy cpu_flags_x86_sse2
+dev-python/pypy-bin cpu_flags_x86_sse2
+dev-python/pypy3 cpu_flags_x86_sse2
+dev-python/pypy3-bin cpu_flags_x86_sse2
 
 # Michael Weber <xmw@gentoo.org> (18 Jun 2013)
 # unsatisfied multilib dep on curl[abi_x86_32]
@@ -223,6 +224,7 @@ app-backup/backup-manager s3
 # USE=mmx on imlib2 causes issues with other apps. See bug 218382 (comments
 # 11-12)
 media-libs/imlib2 mmx
+media-libs/imlib2 cpu_flags_x86_mmx
 
 # Serkan Kaba <serkan@gentoo.org> (5 Feb 2009)
 # finally a 64bit java plugin
@@ -253,10 +255,12 @@ app-text/enchant -zemberek
 # Oct 23th 2006; blubb@gentoo.org
 # the asm is 64bit save, but it doesn't compile anyway
 games-emulation/visualboyadvance mmx
+games-emulation/visualboyadvance cpu_flags_x86_mmx
 
 # Oct 23th 2006; blubb@gentoo.org
 # upstream forces sse2 for amd64; mmx flag does nothing
 app-crypt/johntheripper mmx
+app-crypt/johntheripper cpu_flags_x86_mmx
 
 # Oct 23th 2006; blubb@gentoo.org
 # x86 asm only:
@@ -271,9 +275,21 @@ net-irc/xchat-gnome mmx
 net-misc/asterisk mmx
 x11-terms/eterm mmx
 media-tv/xawtv mmx
+games-emulation/xmess cpu_flags_x86_mmx
+media-gfx/inkscape cpu_flags_x86_mmx
+media-libs/allegro cpu_flags_x86_mmx cpu_flags_x86_sse
+media-libs/libfame cpu_flags_x86_mmx
+media-libs/sdl-gfx cpu_flags_x86_mmx
+media-libs/smpeg cpu_flags_x86_mmx
+net-irc/xchat cpu_flags_x86_mmx
+net-irc/xchat-gnome cpu_flags_x86_mmx
+net-misc/asterisk cpu_flags_x86_mmx
+x11-terms/eterm cpu_flags_x86_mmx
+media-tv/xawtv cpu_flags_x86_mmx
 
 # x86_64 opts are enabled with USE sse. so masking the rest
 media-sound/mpg123 mmx 3dnow 3dnowext
+media-sound/mpg123 cpu_flags_x86_mmx cpu_flags_x86_3dnow cpu_flags_x86_3dnowext
 
 # 8 May 2007: Alistair Bush <ali_bush@gentoo.org>
 # Mask doc flag for fop as nearly impossible to
@@ -285,6 +301,7 @@ media-sound/mpg123 mmx 3dnow 3dnowext
 # saves people from needlessly installing nasm
 # Refs bug #93279
 media-sound/lame mmx
+media-sound/lame cpu_flags_x86_mmx
 
 # Robert Buchholz <rbu@gentoo.org> (16 Aug 2008)
 # masked in base, unmask for x86/amd64
diff --git a/profiles/arch/x86/ChangeLog b/profiles/arch/x86/ChangeLog
index cbc7ac2f5eb4..8809eeb282c1 100644
--- a/profiles/arch/x86/ChangeLog
+++ b/profiles/arch/x86/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for Gentoo/x86 profile directory
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/x86/ChangeLog,v 1.187 2015/01/28 21:06:18 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/x86/ChangeLog,v 1.188 2015/01/28 21:33:02 mgorny Exp $
+
+  28 Jan 2015; Michał Górny <mgorny@gentoo.org> package.use.mask:
+  Update package.use.* entries for CPU_FLAGS_X86. Keep duplicate with old flags
+  until conversion is complete.
 
   28 Jan 2015; Mike Gilbert <floppym@gentoo.org> xbox/make.defaults:
   Set CPU_FLAGS_X86 to a reasonable default.
diff --git a/profiles/arch/x86/package.use.mask b/profiles/arch/x86/package.use.mask
index 932c3580125a..b2eab0ff5a8c 100644
--- a/profiles/arch/x86/package.use.mask
+++ b/profiles/arch/x86/package.use.mask
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 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.145 2015/01/18 10:07:27 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/x86/package.use.mask,v 1.146 2015/01/28 21:33:02 mgorny Exp $
 
 # This file requires >=portage-2.1.1
 
@@ -38,6 +38,7 @@ media-libs/mesa -openmax
 # Still considered experimental by upstream:
 # http://sourceforge.net/p/mikmod/bugs/16/#17ea
 media-libs/libmikmod sse2
+media-libs/libmikmod cpu_flags_x86_sse2
 
 # Sergey Popov <pinkbyte@gentoo.org> (27 Dec 2013)
 # Boost.Context can be built on x86
@@ -222,6 +223,7 @@ dev-python/kaa-base -tls
 app-text/enchant -zemberek
 
 x11-terms/eterm sse2
+x11-terms/eterm cpu_flags_x86_sse2
 
 # Christian Faulhammer <opfer@gentoo.org> (14 Jan 2008)
 # only works on x86