Added emul-linux-x86 use flag. Cleaned up some arch-specific cascading things.

53 files changed, 137 insertions, 140 deletions

diff --git a/profiles/cobalt-mips-1.4/use.mask b/profiles/cobalt-mips-1.4/use.mask
index 97e8a154ad38..23dfbf88583e 100644
--- a/profiles/cobalt-mips-1.4/use.mask
+++ b/profiles/cobalt-mips-1.4/use.mask
@@ -1,4 +1,4 @@
-# $Header: /var/cvsroot/gentoo-x86/profiles/cobalt-mips-1.4/use.mask,v 1.10 2004/11/25 03:12:54 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/cobalt-mips-1.4/use.mask,v 1.11 2005/01/08 20:47:34 eradicator Exp $
 
 
 # Chris PeBenito <pebenito@gentoo.org>
@@ -87,3 +87,5 @@ sybase
 sybase-ct
 # aqua USE flag is only valid on Mac OS X
 aqua
+
+emul-linux-x86
diff --git a/profiles/cobalt-mips-2004.1/use.mask b/profiles/cobalt-mips-2004.1/use.mask
index 220415532bfd..ca9b36fd3e68 100644
--- a/profiles/cobalt-mips-2004.1/use.mask
+++ b/profiles/cobalt-mips-2004.1/use.mask
@@ -1,4 +1,4 @@
-# $Header: /var/cvsroot/gentoo-x86/profiles/cobalt-mips-2004.1/use.mask,v 1.9 2004/11/25 03:12:54 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/cobalt-mips-2004.1/use.mask,v 1.10 2005/01/08 20:47:34 eradicator Exp $
 
 
 # Chris PeBenito <pebenito@gentoo.org>
@@ -87,3 +87,5 @@ sybase
 sybase-ct
 # aqua USE flag is only valid on Mac OS X
 aqua
+
+emul-linux-x86
diff --git a/profiles/default-alpha-1.4/use.mask b/profiles/default-alpha-1.4/use.mask
index 665a14b7da8e..0f33780051ac 100644
--- a/profiles/default-alpha-1.4/use.mask
+++ b/profiles/default-alpha-1.4/use.mask
@@ -86,3 +86,5 @@ gnustep
 
 # dev-lisp/mzscheme won't build
 mzscheme
+
+emul-linux-x86
diff --git a/profiles/default-alpha-2004.0/use.mask b/profiles/default-alpha-2004.0/use.mask
index 96ac515dab4a..5e6ee33c4281 100644
--- a/profiles/default-alpha-2004.0/use.mask
+++ b/profiles/default-alpha-2004.0/use.mask
@@ -83,3 +83,5 @@ gnustep
 
 # dev-lisp/mzscheme won't build
 mzscheme
+
+emul-linux-x86
diff --git a/profiles/default-arm-2004.0/use.mask b/profiles/default-arm-2004.0/use.mask
index 61eef1728a8a..1825414e640b 100644
--- a/profiles/default-arm-2004.0/use.mask
+++ b/profiles/default-arm-2004.0/use.mask
@@ -51,3 +51,5 @@ aqua
 # rizzo@gentoo.org
 # masking per Bug 73135 per vapier's recommendation.
 mozilla
+
+emul-linux-x86
diff --git a/profiles/default-darwin/use.mask b/profiles/default-darwin/use.mask
index 34d7fac5f074..e08d3ed655ce 100644
--- a/profiles/default-darwin/use.mask
+++ b/profiles/default-darwin/use.mask
@@ -76,3 +76,5 @@ solid
 nas
 odbc
 postgres
+
+emul-linux-x86
diff --git a/profiles/default-hppa-2004.0/use.mask b/profiles/default-hppa-2004.0/use.mask
index bd924234edc4..903d2cd14360 100644
--- a/profiles/default-hppa-2004.0/use.mask
+++ b/profiles/default-hppa-2004.0/use.mask
@@ -110,3 +110,5 @@ bmp
 
 # aqua USE flag is only valid on Mac OS X
 aqua
+
+emul-linux-x86
diff --git a/profiles/default-ia64-1.4/use.mask b/profiles/default-ia64-1.4/use.mask
index 4831cedadbe8..dd9380d961f0 100644
--- a/profiles/default-ia64-1.4/use.mask
+++ b/profiles/default-ia64-1.4/use.mask
@@ -73,3 +73,5 @@ bmp
 
 # aqua USE flag is only valid on Mac OS X
 aqua
+
+emul-linux-x86
diff --git a/profiles/default-linux/alpha/use.mask b/profiles/default-linux/alpha/use.mask
index 5c1badca70cf..cf42315b3949 100644
--- a/profiles/default-linux/alpha/use.mask
+++ b/profiles/default-linux/alpha/use.mask
@@ -1,6 +1,6 @@
 # Copyright 2004 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/alpha/use.mask,v 1.13 2004/11/30 02:03:09 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/alpha/use.mask,v 1.14 2005/01/08 20:47:34 eradicator Exp $
 
 # This file masks out USE flags that are simply NOT allowed in the default
 # profile for any architecture.  This works, for example, if a non-default
@@ -8,14 +8,9 @@
 # them.
 
 # These will probably never be supported, for obvious reasons (wrong arch)
-3dnow
-altivec
 icc
 icc-pgo
-mmx
-sse
 svga
-uclibc
 
 # These are debatable, since technically an alpha could support this hardware
 pcmcia
@@ -31,10 +26,6 @@ pda
 # Can't get USB working to test
 gphoto2
 
-# Chris PeBenito <pebenito@gentoo.org>
-# must use a SELinux profile
-selinux
-
 # No apm support on alpha
 apm
 
diff --git a/profiles/default-linux/amd64/use.mask b/profiles/default-linux/amd64/use.mask
index 563da6c22234..63849fc605dc 100644
--- a/profiles/default-linux/amd64/use.mask
+++ b/profiles/default-linux/amd64/use.mask
@@ -1,6 +1,6 @@
 # Copyright 2004 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/use.mask,v 1.12 2005/01/08 20:00:46 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/use.mask,v 1.13 2005/01/08 20:47:34 eradicator Exp $
 
 #unknowns
 afs
@@ -46,35 +46,6 @@ ifc
 
 # NOT NECESSARY - SECTION
 
-# 2004/11/24 - Jeremy Huddleston <eradicator@gentoo.org>
-ultra1
-
-# 2004/06/22 - Taken from 2004.0 profile
-# Too many packages assume that mmx/sse/sse2/3dnow are 86-32 only things to
-# make them useful on amd64. Anyway, all amd64 cpus have them, so they should
-# not be many flag dependant in this case
-mmx
-mmx2
-sse
-sse2
-3dnow
-3dnowex
-
-# 2004/06/22 - Taken from 2004.0 profile
-# Chris PeBenito <pebenito@gentoo.org>
-# must use a SELinux profile
-selinux
-
-# 2004/06/25 - Danny van Dyk <kugelfang@gentoo.org>
-uclibc
-
-# altivec is a ppc instruction set.
-altivec
-
-# n32 and n64 are mips ABIs
-n32
-n64
-
 # see email to gentoo-dev with subject "use.mask and PHP5's crazy IUSE"
 # Dated Sat, 31 Jul 2004 14:49:28 -0700, from robbat2@gentoo.org
 # all of these are binary-only, and not presently available on this
@@ -101,3 +72,6 @@ tcc
 
 # gcc doesn't build if we have a multitarget binutils
 multitarget
+
+# Unmask emul-linux-x86
+-emul-linux-x86
diff --git a/profiles/default-linux/arm/use.mask b/profiles/default-linux/arm/use.mask
index 96c308ad5b76..e0826ac1caef 100644
--- a/profiles/default-linux/arm/use.mask
+++ b/profiles/default-linux/arm/use.mask
@@ -1,6 +1,3 @@
-# Chris PeBenito <pebenito@gentoo.org>
-# must use a SELinux profile
-selinux
 hardened
 
 # Paul de Vrieze <pauldv@gentoo.org>
@@ -8,12 +5,9 @@ hardened
 # this repoman will fail on apps like sys-libs/db
 java
 
-3dnow
 icc
 icc-pgo
-mmx
 svga
-sse
 uclibc
 
 # see email to gentoo-dev with subject "use.mask and PHP5's crazy IUSE"
diff --git a/profiles/default-linux/hppa/use.mask b/profiles/default-linux/hppa/use.mask
index 221c7ae6325d..62d528c8e3a1 100644
--- a/profiles/default-linux/hppa/use.mask
+++ b/profiles/default-linux/hppa/use.mask
@@ -58,24 +58,20 @@ acl
 
 # 14 Mar 2003 Guy Martin <gmsoft@gentoo.org>
 # USE flags not related to hppa
-3dnow
 acpi
 apm
 afs
 ev6
 icc
 icc-pgo
-mmx
 nocardbus
 pcmcia
 pda
-sse
 svga
 trusted
 wavelan
 x86
 firebird
-uclibc
 
 # see email to gentoo-dev with subject "use.mask and PHP5's crazy IUSE"
 # Dated Sat, 31 Jul 2004 14:49:28 -0700, from robbat2@gentoo.org
diff --git a/profiles/default-linux/ia64/use.mask b/profiles/default-linux/ia64/use.mask
index 6e36373510b2..43e737354cb5 100644
--- a/profiles/default-linux/ia64/use.mask
+++ b/profiles/default-linux/ia64/use.mask
@@ -4,10 +4,7 @@
 svga
 icc
 icc-pgo
-mmx
-sse
 x86
-3dnow
 
 # These are debatable, since technically an ia64 could support this hardware
 pcmcia
@@ -17,10 +14,6 @@ pcmcia
 # No hardware to test
 pda
 
-# Chris PeBenito <pebenito@gentoo.org>
-# must use a SELinux profile
-selinux
-
 # No apm support on ia64
 apm
 
@@ -35,7 +28,6 @@ tcc
 # I don't think that openafs really works on other architectures,
 # despite some internal Gentoo efforts (mine) to port it
 afs
-uclibc
 
 # see email to gentoo-dev with subject "use.mask and PHP5's crazy IUSE"
 # Dated Sat, 31 Jul 2004 14:49:28 -0700, from robbat2@gentoo.org
diff --git a/profiles/default-linux/m68k/use.mask b/profiles/default-linux/m68k/use.mask
index 824b408df51c..1430dc4d2978 100644
--- a/profiles/default-linux/m68k/use.mask
+++ b/profiles/default-linux/m68k/use.mask
@@ -1,7 +1,3 @@
-
-# Chris PeBenito <pebenito@gentoo.org>
-# must use a SELinux profile
-selinux
 hardened
 
 # Paul de Vrieze <pauldv@gentoo.org>
@@ -9,13 +5,9 @@ hardened
 # this repoman will fail on apps like sys-libs/db
 java
 
-3dnow
 icc
 icc-pgo
-mmx
 svga
-sse
-uclibc
 
 # see email to gentoo-dev with subject "use.mask and PHP5's crazy IUSE"
 # Dated Sat, 31 Jul 2004 14:49:28 -0700, from robbat2@gentoo.org
diff --git a/profiles/default-linux/mips/use.mask b/profiles/default-linux/mips/use.mask
index 2a071d48f9fd..a2a3570fe2e2 100644
--- a/profiles/default-linux/mips/use.mask
+++ b/profiles/default-linux/mips/use.mask
@@ -1,4 +1,4 @@
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/use.mask,v 1.16 2004/11/24 17:17:36 geoman Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/use.mask,v 1.17 2005/01/08 20:47:34 eradicator Exp $
 
 # Stephen P. Becker <geoman@gentoo.org>
 # masked because it hoses xchat on 64-bit machines
@@ -36,10 +36,6 @@ hal
 # no nptl on mips yet
 nptl
 
-# Chris PeBenito <pebenito@gentoo.org>
-# must use a SELinux profile
-selinux
-
 # Paul de Vrieze <pauldv@gentoo.org>
 # There is no java in this profile (if there is it must be available). Without
 # this repoman will fail on apps like sys-libs/db
@@ -57,7 +53,6 @@ acl
 
 # Flags which aren't applicable to mips (Mostly copied from sparc)
 3dfx
-3dnow
 acpi
 afs
 altivec
@@ -71,9 +66,7 @@ informix
 firebird
 ggi
 lirc
-mmx
 oci8
-sse
 svga
 tcc
 trusted
@@ -123,3 +116,8 @@ solid
 sybase
 sybase-ct
 djbfft
+
+# Unmask our instruction sets
+-n32
+-n64
+-cobalt
diff --git a/profiles/default-linux/ppc/use.mask b/profiles/default-linux/ppc/use.mask
index 163df5a8e0a6..d58d572230eb 100644
--- a/profiles/default-linux/ppc/use.mask
+++ b/profiles/default-linux/ppc/use.mask
@@ -1,8 +1,6 @@
 # This is a list of USE flags that should not be used on PPC
 
 3dfx
-3dnow
-3dnowex
 acpi
 adabas
 afs
@@ -14,15 +12,12 @@ hdf
 icc
 icc-pgo
 ifc
-mmx
-mmx2
 real
-selinux
-sse 
-sse2
 svga
 tcc
 x86 
-uclibc
 fmod
 firebird
+
+# Unmask our instruction sets
+-altivec
diff --git a/profiles/default-linux/ppc64/use.mask b/profiles/default-linux/ppc64/use.mask
index 3140a9b0df08..ba6917220050 100644
--- a/profiles/default-linux/ppc64/use.mask
+++ b/profiles/default-linux/ppc64/use.mask
@@ -4,22 +4,17 @@
 afs
 acpi
 3dfx
-3dnow
-3dnowex
 directfb
 avi
 icc
 icc-pgo
 ifc
 krb4
-mmx
-mmx2
 mplayer
 pda
 prelude
 ruby
 svga
-sse
 scanner
 firebird
 mzscheme
@@ -27,16 +22,11 @@ chasen
 fdftk
 mono
 
-# Chris PeBenito <pebenito@gentoo.org>
-# must use a SELinux profile
-selinux
-
 # should be ok
 jikes
 junit
 
 guile
-uclibc
 caps
 
 # for now from xorg ... but likely not for long as this is desirable!
@@ -69,5 +59,6 @@ sybase-ct
 # dietlibc
 diet
 
-# aqua USE flag is only valid on Mac OS X
-aqua
+# Unmask our instruction sets
+-altivec
+
diff --git a/profiles/default-linux/s390/use.mask b/profiles/default-linux/s390/use.mask
index 43c5d4d41073..073bc41170d7 100644
--- a/profiles/default-linux/s390/use.mask
+++ b/profiles/default-linux/s390/use.mask
@@ -3,7 +3,6 @@ cdr
 qt
 gpm
 3dfx
-3dnow
 acpi
 afs
 alsa
@@ -15,7 +14,6 @@ icc-pgo
 informix
 firebird
 lirc
-mmx
 oci8
 sse
 svga
@@ -29,11 +27,6 @@ hardened
 # don't quite know about this one, I'll need to revisit
 socks5
 
-# Chris PeBenito <pebenito@gentoo.org>
-# must use a SELinux profile
-selinux
-uclibc
-
 # see email to gentoo-dev with subject "use.mask and PHP5's crazy IUSE"
 # Dated Sat, 31 Jul 2004 14:49:28 -0700, from robbat2@gentoo.org
 # all of these are binary-only, and not presently available on this
diff --git a/profiles/default-linux/sh/use.mask b/profiles/default-linux/sh/use.mask
index c2f3ffb50500..6b7c13b69491 100644
--- a/profiles/default-linux/sh/use.mask
+++ b/profiles/default-linux/sh/use.mask
@@ -1,7 +1,3 @@
-
-# Chris PeBenito <pebenito@gentoo.org>
-# must use a SELinux profile
-selinux
 hardened
 
 # Paul de Vrieze <pauldv@gentoo.org>
@@ -9,13 +5,9 @@ hardened
 # this repoman will fail on apps like sys-libs/db
 java
 
-3dnow
 icc
 icc-pgo
-mmx
 svga
-sse
-uclibc
 
 # see email to gentoo-dev with subject "use.mask and PHP5's crazy IUSE"
 # Dated Sat, 31 Jul 2004 14:49:28 -0700, from robbat2@gentoo.org
diff --git a/profiles/default-linux/sparc/use.mask b/profiles/default-linux/sparc/use.mask
index 11f59760474f..f52fdb66868a 100644
--- a/profiles/default-linux/sparc/use.mask
+++ b/profiles/default-linux/sparc/use.mask
@@ -1,15 +1,12 @@
 # Copyright 2004 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/use.mask,v 1.16 2004/12/09 03:57:40 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/use.mask,v 1.17 2005/01/08 20:47:34 eradicator Exp $
 
 # This file contains a list of useflags that cannot be used on sparc.
 
 3dfx
-3dnow
-3dnowex
 acpi
 afs
-altivec
 apm
 directfb
 divx4linux
@@ -26,12 +23,8 @@ informix
 firebird
 lirc
 lm_sensors
-mmx
-mmx2
 oci8
 pic
-sse
-sse2
 svga
 tcc
 trusted
@@ -57,21 +50,11 @@ x86
 x86-obsd
 x86-fbsd
 
-# non-sparc arch things
-n32
-n64
-cobalt
-
 # Asterisk use flag masking
 resperl
 softfax
 zaptel
 
-# Chris PeBenito <pebenito@gentoo.org>
-# must use a SELinux profile
-selinux
-uclibc
-
 # Mono doesn't work on sparc
 # eradicator@gentoo.org
 mono
@@ -100,3 +83,5 @@ solid
 sybase
 sybase-ct
 
+# Unmask ultra1
+-ultra1
diff --git a/profiles/default-linux/use.mask b/profiles/default-linux/use.mask
index 1ae3549ac04c..25992b3955fc 100644
--- a/profiles/default-linux/use.mask
+++ b/profiles/default-linux/use.mask
@@ -1,6 +1,6 @@
 # Copyright 2004 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/use.mask,v 1.5 2004/11/25 03:12:54 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/use.mask,v 1.6 2005/01/08 20:47:34 eradicator Exp $
 
 # This file masks out USE flags that are simply NOT allowed in the default
 # profile for any architecture.  This works, for example, if a non-default
@@ -9,5 +9,28 @@
 
 selinux
 uclibc
+
 # aqua USE flag is only valid on Mac OS X
 aqua
+
+# amd64 only:
+emul-linux-x86
+
+# sparc only:
+ultra1
+
+# x86/amd64 only:
+mmx
+mmx2
+sse
+sse2
+3dnow
+3dnowex
+
+# ppc only:
+altivec
+
+# mips only:
+n32
+n64
+cobalt
diff --git a/profiles/default-linux/x86/use.mask b/profiles/default-linux/x86/use.mask
index 94fcb4c75770..c63b1fab1704 100644
--- a/profiles/default-linux/x86/use.mask
+++ b/profiles/default-linux/x86/use.mask
@@ -1,11 +1,15 @@
 # Copyright 2004 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/use.mask,v 1.3 2004/09/01 17:01:46 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/use.mask,v 1.4 2005/01/08 20:47:34 eradicator Exp $
 
 # This file masks out USE flags that are simply NOT allowed in the default
 # x86 profile.  This works, for example, if another architecture's
 # profile have a USE flag associated with (such as altivec, mmx, etc).
 
-uclibc
-altivec
-ultra1
+# Unmask x86 instruction sets
+-mmx
+-mmx2
+-sse
+-sse2
+-3dnow
+-3dnowex
diff --git a/profiles/default-macos-10.3/use.mask b/profiles/default-macos-10.3/use.mask
index bf33a092b4ba..726029ed127f 100644
--- a/profiles/default-macos-10.3/use.mask
+++ b/profiles/default-macos-10.3/use.mask
@@ -54,3 +54,5 @@ solid
 svga
 sybase
 sybase-ct
+
+emul-linux-x86
diff --git a/profiles/default-macos-10.4/use.mask b/profiles/default-macos-10.4/use.mask
index bf33a092b4ba..726029ed127f 100644
--- a/profiles/default-macos-10.4/use.mask
+++ b/profiles/default-macos-10.4/use.mask
@@ -54,3 +54,5 @@ solid
 svga
 sybase
 sybase-ct
+
+emul-linux-x86
diff --git a/profiles/default-mips-1.4/use.mask b/profiles/default-mips-1.4/use.mask
index 8b5772fda05e..e2a2e39cefc9 100644
--- a/profiles/default-mips-1.4/use.mask
+++ b/profiles/default-mips-1.4/use.mask
@@ -1,4 +1,4 @@
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-mips-1.4/use.mask,v 1.23 2004/11/25 03:12:54 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-mips-1.4/use.mask,v 1.24 2005/01/08 20:47:34 eradicator Exp $
 
 # Ciaran McCreesh <ciaranm@gentoo.org>
 # not even slightly reliable, bug #65216
@@ -107,3 +107,5 @@ bmp
 
 # aqua USE flag is only valid on Mac OS X
 aqua
+
+emul-linux-x86
diff --git a/profiles/default-mips-2004.1/use.mask b/profiles/default-mips-2004.1/use.mask
index e9555f9a9694..3fcc5f30df79 100644
--- a/profiles/default-mips-2004.1/use.mask
+++ b/profiles/default-mips-2004.1/use.mask
@@ -1,4 +1,4 @@
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-mips-2004.1/use.mask,v 1.18 2004/11/25 03:12:54 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-mips-2004.1/use.mask,v 1.19 2005/01/08 20:47:34 eradicator Exp $
 
 # Ciaran McCreesh <ciaranm@gentoo.org>
 # not even slightly reliable, bug #65216
@@ -105,3 +105,5 @@ bmp
 
 # aqua USE flag is only valid on Mac OS X
 aqua
+
+emul-linux-x86
diff --git a/profiles/default-mips64-1.4/use.mask b/profiles/default-mips64-1.4/use.mask
index b8e7acf95be9..f77690464c50 100644
--- a/profiles/default-mips64-1.4/use.mask
+++ b/profiles/default-mips64-1.4/use.mask
@@ -1,4 +1,4 @@
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-mips64-1.4/use.mask,v 1.12 2004/11/25 03:12:54 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-mips64-1.4/use.mask,v 1.13 2005/01/08 20:47:34 eradicator Exp $
 
 # Ciaran McCreesh <ciaranm@gentoo.org>
 # not even slightly reliable, bug #65216
@@ -95,3 +95,5 @@ bmp
 
 # aqua USE flag is only valid on Mac OS X
 aqua
+
+emul-linux-x86
diff --git a/profiles/default-ppc-1.4/use.mask b/profiles/default-ppc-1.4/use.mask
index 47cd298481d1..9a2377a60735 100644
--- a/profiles/default-ppc-1.4/use.mask
+++ b/profiles/default-ppc-1.4/use.mask
@@ -56,3 +56,5 @@ sybase
 sybase-ct
 # aqua USE flag is only valid on Mac OS X
 aqua
+
+emul-linux-x86
diff --git a/profiles/default-ppc-2004.0/use.mask b/profiles/default-ppc-2004.0/use.mask
index 252dd988882c..9f003915b031 100644
--- a/profiles/default-ppc-2004.0/use.mask
+++ b/profiles/default-ppc-2004.0/use.mask
@@ -35,3 +35,5 @@ uclibc
 uml
 # aqua USE flag is only valid on Mac OS X
 aqua
+
+emul-linux-x86
diff --git a/profiles/default-ppc-2004.1/use.mask b/profiles/default-ppc-2004.1/use.mask
index 252dd988882c..9f003915b031 100644
--- a/profiles/default-ppc-2004.1/use.mask
+++ b/profiles/default-ppc-2004.1/use.mask
@@ -35,3 +35,5 @@ uclibc
 uml
 # aqua USE flag is only valid on Mac OS X
 aqua
+
+emul-linux-x86
diff --git a/profiles/default-ppc-2004.2/use.mask b/profiles/default-ppc-2004.2/use.mask
index 5964ddb00ea7..9f60d3fe5556 100644
--- a/profiles/default-ppc-2004.2/use.mask
+++ b/profiles/default-ppc-2004.2/use.mask
@@ -36,3 +36,5 @@ uml
 djbfft
 # aqua USE flag is only valid on Mac OS X
 aqua
+
+emul-linux-x86
diff --git a/profiles/default-ppc-2004.3/use.mask b/profiles/default-ppc-2004.3/use.mask
index 252dd988882c..9f003915b031 100644
--- a/profiles/default-ppc-2004.3/use.mask
+++ b/profiles/default-ppc-2004.3/use.mask
@@ -35,3 +35,5 @@ uclibc
 uml
 # aqua USE flag is only valid on Mac OS X
 aqua
+
+emul-linux-x86
diff --git a/profiles/default-ppc64-2004.2/use.mask b/profiles/default-ppc64-2004.2/use.mask
index 63d55b3e389e..c4c7c8b1864c 100644
--- a/profiles/default-ppc64-2004.2/use.mask
+++ b/profiles/default-ppc64-2004.2/use.mask
@@ -74,3 +74,5 @@ diet
 
 # aqua USE flag is only valid on Mac OS X
 aqua
+
+emul-linux-x86
diff --git a/profiles/default-ppc64-2004.3/use.mask b/profiles/default-ppc64-2004.3/use.mask
index 61b860132253..18a5bf7da3c4 100644
--- a/profiles/default-ppc64-2004.3/use.mask
+++ b/profiles/default-ppc64-2004.3/use.mask
@@ -71,3 +71,5 @@ diet
 
 # aqua USE flag is only valid on Mac OS X
 aqua
+
+emul-linux-x86
diff --git a/profiles/default-s390-2004.0/use.mask b/profiles/default-s390-2004.0/use.mask
index 0b896868378d..33e6b7587178 100644
--- a/profiles/default-s390-2004.0/use.mask
+++ b/profiles/default-s390-2004.0/use.mask
@@ -66,3 +66,5 @@ sybase-ct
 hardened
 # aqua USE flag is only valid on Mac OS X
 aqua
+
+emul-linux-x86
diff --git a/profiles/default-s390-2004.1/use.mask b/profiles/default-s390-2004.1/use.mask
index c578fe8bf3a2..0b09a60a480c 100644
--- a/profiles/default-s390-2004.1/use.mask
+++ b/profiles/default-s390-2004.1/use.mask
@@ -72,3 +72,5 @@ gtk2
 diet
 # aqua USE flag is only valid on Mac OS X
 aqua
+
+emul-linux-x86
diff --git a/profiles/default-sparc-1.4/use.mask b/profiles/default-sparc-1.4/use.mask
index 251761323749..fa2f91dd2a62 100644
--- a/profiles/default-sparc-1.4/use.mask
+++ b/profiles/default-sparc-1.4/use.mask
@@ -78,3 +78,5 @@ mono
 aqua
 
 multilib
+
+emul-linux-x86
diff --git a/profiles/default-sparc-2004.0/use.mask b/profiles/default-sparc-2004.0/use.mask
index 51d5d284b292..d235ac4354ab 100644
--- a/profiles/default-sparc-2004.0/use.mask
+++ b/profiles/default-sparc-2004.0/use.mask
@@ -83,3 +83,5 @@ aqua
 nptl
 
 multilib
+
+emul-linux-x86
diff --git a/profiles/default-sparc64-1.4/use.mask b/profiles/default-sparc64-1.4/use.mask
index 5845d3a07764..09dea07ed4c6 100644
--- a/profiles/default-sparc64-1.4/use.mask
+++ b/profiles/default-sparc64-1.4/use.mask
@@ -73,3 +73,5 @@ sybase-ct
 aqua
 
 multilib
+
+emul-linux-x86
diff --git a/profiles/default-sparc64-2004.0/use.mask b/profiles/default-sparc64-2004.0/use.mask
index 30c7f6322220..85228f7958fd 100644
--- a/profiles/default-sparc64-2004.0/use.mask
+++ b/profiles/default-sparc64-2004.0/use.mask
@@ -79,3 +79,5 @@ sybase-ct
 aqua
 
 multilib
+
+emul-linux-x86
diff --git a/profiles/default-x86-1.4/use.mask b/profiles/default-x86-1.4/use.mask
index 01b751c7103a..4d8be4f4aca3 100644
--- a/profiles/default-x86-1.4/use.mask
+++ b/profiles/default-x86-1.4/use.mask
@@ -9,3 +9,5 @@ altivec
 uclibc
 # aqua USE flag is only valid on Mac OS X
 aqua
+
+emul-linux-x86
diff --git a/profiles/default-x86-2004.0/use.mask b/profiles/default-x86-2004.0/use.mask
index 49745fbdf938..88048db8d53e 100644
--- a/profiles/default-x86-2004.0/use.mask
+++ b/profiles/default-x86-2004.0/use.mask
@@ -12,3 +12,5 @@ altivec
 
 # aqua USE flag is only valid on Mac OS X
 aqua
+
+emul-linux-x86
diff --git a/profiles/default-x86-2004.2/use.mask b/profiles/default-x86-2004.2/use.mask
index d2c4d7efc031..b1efb6cd40c4 100644
--- a/profiles/default-x86-2004.2/use.mask
+++ b/profiles/default-x86-2004.2/use.mask
@@ -10,3 +10,5 @@ altivec
 uclibc
 # aqua USE flag is only valid on Mac OS X
 aqua
+
+emul-linux-x86
diff --git a/profiles/default-x86-obsd-2004/use.mask b/profiles/default-x86-obsd-2004/use.mask
index f4e0802eaebe..72e390048377 100644
--- a/profiles/default-x86-obsd-2004/use.mask
+++ b/profiles/default-x86-obsd-2004/use.mask
@@ -29,3 +29,5 @@ sybase
 sybase-ct
 # aqua USE flag is only valid on Mac OS X
 aqua
+
+emul-linux-x86
diff --git a/profiles/embedded/use.mask b/profiles/embedded/use.mask
index 76b3b158b68e..3e291a1f2202 100644
--- a/profiles/embedded/use.mask
+++ b/profiles/embedded/use.mask
@@ -3,3 +3,5 @@
 selinux
 # aqua USE flag is only valid on Mac OS X
 aqua
+
+emul-linux-x86
diff --git a/profiles/gcc33-sparc64-1.4/use.mask b/profiles/gcc33-sparc64-1.4/use.mask
index 12e1fb15681f..dafd22b8f840 100644
--- a/profiles/gcc33-sparc64-1.4/use.mask
+++ b/profiles/gcc33-sparc64-1.4/use.mask
@@ -52,3 +52,5 @@ sybase
 sybase-ct
 # aqua USE flag is only valid on Mac OS X
 aqua
+
+emul-linux-x86
diff --git a/profiles/gcc34-x86-2004.2/use.mask b/profiles/gcc34-x86-2004.2/use.mask
index d2c4d7efc031..b1efb6cd40c4 100644
--- a/profiles/gcc34-x86-2004.2/use.mask
+++ b/profiles/gcc34-x86-2004.2/use.mask
@@ -10,3 +10,5 @@ altivec
 uclibc
 # aqua USE flag is only valid on Mac OS X
 aqua
+
+emul-linux-x86
diff --git a/profiles/hardened-x86-2004.0/use.mask b/profiles/hardened-x86-2004.0/use.mask
index 9e717420bab2..b0b1ff4dfa0d 100644
--- a/profiles/hardened-x86-2004.0/use.mask
+++ b/profiles/hardened-x86-2004.0/use.mask
@@ -4,3 +4,5 @@ selinux
 uclibc
 # aqua USE flag is only valid on Mac OS X
 aqua
+
+emul-linux-x86
diff --git a/profiles/hardened/use.mask b/profiles/hardened/use.mask
index 8ef744eb5b20..bccd0369dcc4 100644
--- a/profiles/hardened/use.mask
+++ b/profiles/hardened/use.mask
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/use.mask,v 1.4 2004/12/11 16:17:19 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/use.mask,v 1.5 2005/01/08 20:47:35 eradicator Exp $
 
 # Chris PeBenito <pebenito@gentoo.org>
 # must use a SELinux profile
@@ -14,3 +14,5 @@ aqua
 
 # We don't have any ppc sub profiles yet. bug #74103
 altivec
+
+emul-linux-x86
diff --git a/profiles/n32-mips-2004.1/use.mask b/profiles/n32-mips-2004.1/use.mask
index 51c1e9a1e547..d2b17c687230 100644
--- a/profiles/n32-mips-2004.1/use.mask
+++ b/profiles/n32-mips-2004.1/use.mask
@@ -1,4 +1,4 @@
-# $Header: /var/cvsroot/gentoo-x86/profiles/n32-mips-2004.1/use.mask,v 1.8 2004/11/25 03:12:55 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/n32-mips-2004.1/use.mask,v 1.9 2005/01/08 20:47:35 eradicator Exp $
 
 # Stephen P. Becker <geoman@gentoo.org>
 # hal needs linux26-headers
@@ -92,3 +92,5 @@ sybase
 sybase-ct
 # aqua USE flag is only valid on Mac OS X
 aqua
+
+emul-linux-x86
diff --git a/profiles/selinux/2004.1/amd64/use.mask b/profiles/selinux/2004.1/amd64/use.mask
index 6ee81500628b..eb5b42704bd2 100644
--- a/profiles/selinux/2004.1/amd64/use.mask
+++ b/profiles/selinux/2004.1/amd64/use.mask
@@ -1,6 +1,6 @@
 # Copyright 2004 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/2004.1/amd64/use.mask,v 1.3 2004/11/05 02:59:25 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/2004.1/amd64/use.mask,v 1.4 2005/01/08 20:47:35 eradicator Exp $
 
 # disallow posix acl since this is SELinux
 acl
@@ -86,3 +86,4 @@ solid
 sybase
 sybase-ct
 
+-emul-linux-x86
diff --git a/profiles/uclibc/use.mask b/profiles/uclibc/use.mask
index 7818dfefe0c1..44875515d82d 100644
--- a/profiles/uclibc/use.mask
+++ b/profiles/uclibc/use.mask
@@ -8,3 +8,5 @@ aqua
 
 # this seems to pull in pre compiled glibc libs.
 divx4linux
+
+emul-linux-x86
diff --git a/profiles/xbox-x86-2004.0/use.mask b/profiles/xbox-x86-2004.0/use.mask
index ff12c768c14f..c8241906ca58 100644
--- a/profiles/xbox-x86-2004.0/use.mask
+++ b/profiles/xbox-x86-2004.0/use.mask
@@ -5,3 +5,5 @@ selinux
 uclibc
 # aqua USE flag is only valid on Mac OS X
 aqua
+
+emul-linux-x86