Moved clvm and tcc USE flags masking to the highest possible parent and unmasking at highest possible point, rather than in leaf profiles. This is for bug #159832.

38 files changed, 80 insertions, 72 deletions

diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 6533b34a1ca5..15de9c9dd012 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,6 +1,31 @@
 # ChangeLog for profile directory
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.483 2007/06/22 15:17:53 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.484 2007/06/22 18:53:02 wolf31o2 Exp $
+
+  22 Jun 2007; Chris Gianelloni <wolf31o2@gentoo.org> base/use.mask,
+  default-linux/alpha/use.mask, default-linux/amd64/use.mask,
+  default-linux/ia64/use.mask, default-linux/mips/use.mask,
+  default-linux/ppc/1.0/use.mask, default-linux/ppc/1.0_rc/use.mask,
+  default-linux/ppc/1.2/use.mask, default-linux/ppc/1.4/use.mask,
+  default-linux/ppc/2004.0/use.mask, default-linux/ppc/2004.1/use.mask,
+  default-linux/ppc/2004.2/use.mask, default-linux/ppc/2004.3/use.mask,
+  default-linux/ppc/2005.0/use.mask, default-linux/ppc/2005.1/ppc/use.mask,
+  default-linux/ppc/dev/ppc32/use.mask,
+  default-linux/ppc/dev/ppc64/2007.0/32bit-userland/use.mask,
+  default-linux/ppc/ppc32/use.mask,
+  default-linux/ppc/ppc64/2006.0/32bit-userland/use.mask,
+  default-linux/ppc/ppc64/2006.1/32bit-userland/use.mask,
+  default-linux/ppc/ppc64/2007.0/32bit-userland/use.mask,
+  default-linux/sparc/use.mask, default-linux/use.mask,
+  default-linux/x86/use.mask, hardened/amd64/use.mask,
+  hardened/ppc/use.mask, hardened/ppc64/use.mask, hardened/use.mask,
+  hardened/x86/use.mask, selinux/2005.1/alpha/use.mask,
+  selinux/alpha/use.mask, selinux/amd64/use.mask, selinux/mips/use.mask,
+  selinux/ppc/ppc32/use.mask, selinux/sparc/use.mask, selinux/use.mask,
+  selinux/x86/use.mask:
+  Moved clvm and tcc USE flags masking to the highest possible parent and
+  unmasking at highest possible point, rather than in leaf profiles. This is
+  for bug #159832.
 
   22 Jun 2007; Steve Dibb <beandog@gentoo.org> use.local.desc:
   Add amrnb, amrwb local use flags for mplayer
diff --git a/profiles/base/use.mask b/profiles/base/use.mask
index ad4526cbc067..77359298f522 100644
--- a/profiles/base/use.mask
+++ b/profiles/base/use.mask
@@ -174,3 +174,11 @@ mplayer-bin
 # George Shapovalov <george@gentoo.org> (8 Apr 2007)
 # Ada is supported only on x86, amd64 and ppc at present
 ada
+
+# lvm2 clustered use flags (moved from default-linux)
+clvm
+gulm
+cman
+
+# tcc is x86 only
+tcc
diff --git a/profiles/default-linux/alpha/use.mask b/profiles/default-linux/alpha/use.mask
index bb2a94721ef8..d065d5a43484 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.67 2007/06/21 18:37:21 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/alpha/use.mask,v 1.68 2007/06/22 18:53:02 wolf31o2 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
@@ -56,9 +56,6 @@ java
 java-internal
 java-external
 
-# tcc is x86-only
-tcc
-
 hardened
 hal
 howl
diff --git a/profiles/default-linux/amd64/use.mask b/profiles/default-linux/amd64/use.mask
index ac979b2d0abc..510b22d5b34d 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.57 2007/06/03 01:50:47 rbu Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/use.mask,v 1.58 2007/06/22 18:53:02 wolf31o2 Exp $
 
 # SECTION: Unmask
 
@@ -75,7 +75,6 @@ doomsday
 asm
 drac
 multitarget
-tcc
 vidix
 
 # 2006/06/07 - Danny van Dyk <kugelfang@gentoo.org>
@@ -124,4 +123,9 @@ gcc64
 # games-emulation/caps is 32bit only, while app-emulation/e-uae is 64bit; bug 158416
 capslib
 
+# lvm2 cluster
+-clvm
+-gulm
+-cman
+
 # NOT NECESSARY - SECTION
diff --git a/profiles/default-linux/ia64/use.mask b/profiles/default-linux/ia64/use.mask
index cfce804be73b..c7d7b58b47be 100644
--- a/profiles/default-linux/ia64/use.mask
+++ b/profiles/default-linux/ia64/use.mask
@@ -32,9 +32,6 @@ sms
 # No apm support on ia64
 apm
 
-# tcc is x86-only
-tcc
-
 # I don't think that openafs really works on other architectures,
 # despite some internal Gentoo efforts (mine) to port it
 afs
diff --git a/profiles/default-linux/mips/use.mask b/profiles/default-linux/mips/use.mask
index 833db3fc329d..1fe90d135e5a 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.91 2007/06/10 17:11:07 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/use.mask,v 1.92 2007/06/22 18:53:02 wolf31o2 Exp $
 
 # 22 May 2007; Christian Heim <phreak@gentoo.org>
 # unmask ip28 and ip32r10k only on mips
@@ -255,7 +255,6 @@ dvdr
 ibm
 ggi
 lirc
-tcc
 trusted
 voodoo3
 smartcard
diff --git a/profiles/default-linux/ppc/1.0/use.mask b/profiles/default-linux/ppc/1.0/use.mask
index 142ad0c1075b..2f226d689d27 100644
--- a/profiles/default-linux/ppc/1.0/use.mask
+++ b/profiles/default-linux/ppc/1.0/use.mask
@@ -8,7 +8,6 @@ cmucl
 hdf
 lm_sensors
 real
-tcc
 fmod
 #keep and eye on firebird and interbase as pair
 interbase
diff --git a/profiles/default-linux/ppc/1.0_rc/use.mask b/profiles/default-linux/ppc/1.0_rc/use.mask
index 142ad0c1075b..2f226d689d27 100644
--- a/profiles/default-linux/ppc/1.0_rc/use.mask
+++ b/profiles/default-linux/ppc/1.0_rc/use.mask
@@ -8,7 +8,6 @@ cmucl
 hdf
 lm_sensors
 real
-tcc
 fmod
 #keep and eye on firebird and interbase as pair
 interbase
diff --git a/profiles/default-linux/ppc/1.2/use.mask b/profiles/default-linux/ppc/1.2/use.mask
index 142ad0c1075b..2f226d689d27 100644
--- a/profiles/default-linux/ppc/1.2/use.mask
+++ b/profiles/default-linux/ppc/1.2/use.mask
@@ -8,7 +8,6 @@ cmucl
 hdf
 lm_sensors
 real
-tcc
 fmod
 #keep and eye on firebird and interbase as pair
 interbase
diff --git a/profiles/default-linux/ppc/1.4/use.mask b/profiles/default-linux/ppc/1.4/use.mask
index 142ad0c1075b..2f226d689d27 100644
--- a/profiles/default-linux/ppc/1.4/use.mask
+++ b/profiles/default-linux/ppc/1.4/use.mask
@@ -8,7 +8,6 @@ cmucl
 hdf
 lm_sensors
 real
-tcc
 fmod
 #keep and eye on firebird and interbase as pair
 interbase
diff --git a/profiles/default-linux/ppc/2004.0/use.mask b/profiles/default-linux/ppc/2004.0/use.mask
index 9c8d6f5c6b20..4bb5da6f2828 100644
--- a/profiles/default-linux/ppc/2004.0/use.mask
+++ b/profiles/default-linux/ppc/2004.0/use.mask
@@ -8,7 +8,6 @@ cmucl
 hdf
 lm_sensors
 real
-tcc
 fmod
 #keep and eye on firebird and interbase as pair
 interbase
diff --git a/profiles/default-linux/ppc/2004.1/use.mask b/profiles/default-linux/ppc/2004.1/use.mask
index 848d8e8e9158..efa265720fe8 100644
--- a/profiles/default-linux/ppc/2004.1/use.mask
+++ b/profiles/default-linux/ppc/2004.1/use.mask
@@ -8,7 +8,6 @@ cmucl
 hdf
 lm_sensors
 real
-tcc
 fmod
 #keep and eye on firebird and interbase as pair
 interbase
diff --git a/profiles/default-linux/ppc/2004.2/use.mask b/profiles/default-linux/ppc/2004.2/use.mask
index 848d8e8e9158..efa265720fe8 100644
--- a/profiles/default-linux/ppc/2004.2/use.mask
+++ b/profiles/default-linux/ppc/2004.2/use.mask
@@ -8,7 +8,6 @@ cmucl
 hdf
 lm_sensors
 real
-tcc
 fmod
 #keep and eye on firebird and interbase as pair
 interbase
diff --git a/profiles/default-linux/ppc/2004.3/use.mask b/profiles/default-linux/ppc/2004.3/use.mask
index 9c8d6f5c6b20..4bb5da6f2828 100644
--- a/profiles/default-linux/ppc/2004.3/use.mask
+++ b/profiles/default-linux/ppc/2004.3/use.mask
@@ -8,7 +8,6 @@ cmucl
 hdf
 lm_sensors
 real
-tcc
 fmod
 #keep and eye on firebird and interbase as pair
 interbase
diff --git a/profiles/default-linux/ppc/2005.0/use.mask b/profiles/default-linux/ppc/2005.0/use.mask
index 9c8d6f5c6b20..4bb5da6f2828 100644
--- a/profiles/default-linux/ppc/2005.0/use.mask
+++ b/profiles/default-linux/ppc/2005.0/use.mask
@@ -8,7 +8,6 @@ cmucl
 hdf
 lm_sensors
 real
-tcc
 fmod
 #keep and eye on firebird and interbase as pair
 interbase
diff --git a/profiles/default-linux/ppc/2005.1/ppc/use.mask b/profiles/default-linux/ppc/2005.1/ppc/use.mask
index 300c48318706..55a022bcd592 100644
--- a/profiles/default-linux/ppc/2005.1/ppc/use.mask
+++ b/profiles/default-linux/ppc/2005.1/ppc/use.mask
@@ -9,7 +9,6 @@ hdf
 ip28
 lm_sensors
 real
-tcc
 fmod
 #keep and eye on firebird and interbase as pair
 interbase
diff --git a/profiles/default-linux/ppc/dev/ppc32/use.mask b/profiles/default-linux/ppc/dev/ppc32/use.mask
index 6283667fdf33..c080ec71de08 100644
--- a/profiles/default-linux/ppc/dev/ppc32/use.mask
+++ b/profiles/default-linux/ppc/dev/ppc32/use.mask
@@ -4,7 +4,6 @@ cmucl
 hdf
 ip28
 real
-tcc
 fmod
 i8x0
 xvmc
diff --git a/profiles/default-linux/ppc/dev/ppc64/2007.0/32bit-userland/use.mask b/profiles/default-linux/ppc/dev/ppc64/2007.0/32bit-userland/use.mask
index 2623c4885c5d..b058a3e73979 100644
--- a/profiles/default-linux/ppc/dev/ppc64/2007.0/32bit-userland/use.mask
+++ b/profiles/default-linux/ppc/dev/ppc64/2007.0/32bit-userland/use.mask
@@ -4,7 +4,6 @@ cmucl
 hdf
 ip28
 real
-tcc
 fmod
 i8x0
 xvmc
diff --git a/profiles/default-linux/ppc/ppc32/use.mask b/profiles/default-linux/ppc/ppc32/use.mask
index 6283667fdf33..c080ec71de08 100644
--- a/profiles/default-linux/ppc/ppc32/use.mask
+++ b/profiles/default-linux/ppc/ppc32/use.mask
@@ -4,7 +4,6 @@ cmucl
 hdf
 ip28
 real
-tcc
 fmod
 i8x0
 xvmc
diff --git a/profiles/default-linux/ppc/ppc64/2006.0/32bit-userland/use.mask b/profiles/default-linux/ppc/ppc64/2006.0/32bit-userland/use.mask
index 564c64835d5e..a8f74eed48d5 100644
--- a/profiles/default-linux/ppc/ppc64/2006.0/32bit-userland/use.mask
+++ b/profiles/default-linux/ppc/ppc64/2006.0/32bit-userland/use.mask
@@ -4,7 +4,6 @@ cmucl
 hdf
 ip28
 real
-tcc
 fmod
 i8x0
 xvmc
diff --git a/profiles/default-linux/ppc/ppc64/2006.1/32bit-userland/use.mask b/profiles/default-linux/ppc/ppc64/2006.1/32bit-userland/use.mask
index 2623c4885c5d..b058a3e73979 100644
--- a/profiles/default-linux/ppc/ppc64/2006.1/32bit-userland/use.mask
+++ b/profiles/default-linux/ppc/ppc64/2006.1/32bit-userland/use.mask
@@ -4,7 +4,6 @@ cmucl
 hdf
 ip28
 real
-tcc
 fmod
 i8x0
 xvmc
diff --git a/profiles/default-linux/ppc/ppc64/2007.0/32bit-userland/use.mask b/profiles/default-linux/ppc/ppc64/2007.0/32bit-userland/use.mask
index 8d9f29755054..01126bbd30ec 100644
--- a/profiles/default-linux/ppc/ppc64/2007.0/32bit-userland/use.mask
+++ b/profiles/default-linux/ppc/ppc64/2007.0/32bit-userland/use.mask
@@ -4,7 +4,6 @@ cmucl
 hdf
 ip28
 real
-tcc
 fmod
 i8x0
 xvmc
diff --git a/profiles/default-linux/sparc/use.mask b/profiles/default-linux/sparc/use.mask
index 4096f20b8ff5..bf387129b87a 100644
--- a/profiles/default-linux/sparc/use.mask
+++ b/profiles/default-linux/sparc/use.mask
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.115 2007/06/03 01:07:26 rbu Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/use.mask,v 1.116 2007/06/22 18:53:03 wolf31o2 Exp $
 
 # This file contains a list of useflags that cannot be used on sparc.
 
@@ -37,7 +37,6 @@ rar
 real
 reiser4
 reiserfs
-tcc
 tordns
 trusted
 uml
diff --git a/profiles/default-linux/use.mask b/profiles/default-linux/use.mask
index 631a88eea0e9..2d65678a1028 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.28 2007/01/04 23:50:58 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/use.mask,v 1.29 2007/06/22 18:53:02 wolf31o2 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
@@ -15,8 +15,3 @@ multilib
 
 # ppc and x86/amd64
 x264
-
-# lvm2 clustered use flags
-clvm
-gulm
-cman
diff --git a/profiles/default-linux/x86/use.mask b/profiles/default-linux/x86/use.mask
index 9523b1f0e4e7..97c6afbbf1ce 100644
--- a/profiles/default-linux/x86/use.mask
+++ b/profiles/default-linux/x86/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/x86/use.mask,v 1.31 2007/06/03 01:50:47 rbu Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/use.mask,v 1.32 2007/06/22 18:53:03 wolf31o2 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
@@ -91,3 +91,6 @@ video_cards_newport
 # George Shapovalov <george@gentoo.org> (8 Apr 2007)
 # supported on x86
 -ada
+
+# tcc is x86 only
+-tcc
diff --git a/profiles/hardened/amd64/use.mask b/profiles/hardened/amd64/use.mask
index b88a39fd5735..e086323d9a83 100644
--- a/profiles/hardened/amd64/use.mask
+++ b/profiles/hardened/amd64/use.mask
@@ -1,10 +1,6 @@
 # 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.25 2007/04/07 01:26:35 betelgeuse Exp $
-
-# 2006/06/13 - Danny van Dyk <kugelfang@gentoo.org>
-# Mask clvm on amd64, as it isn't keyworded at all.
-clvm
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/amd64/use.mask,v 1.26 2007/06/22 18:53:03 wolf31o2 Exp $
 
 multilib
 
@@ -95,9 +91,6 @@ pvm
 
 # NOT NECESSARY - SECTION
 
-# dev-lang/tcc won't build
-tcc
-
 # gcc doesn't build if we have a multitarget binutils
 multitarget
 
diff --git a/profiles/hardened/ppc/use.mask b/profiles/hardened/ppc/use.mask
index 9f3ebd2b4e7c..fce729250884 100644
--- a/profiles/hardened/ppc/use.mask
+++ b/profiles/hardened/ppc/use.mask
@@ -7,7 +7,6 @@ acpi
 afs
 avi
 cg
-clvm
 cmucl
 dmi
 fmod
@@ -21,7 +20,6 @@ mbrola
 nvtv
 rar
 real
-tcc
 uml
 video_cards_apm
 video_cards_ark
diff --git a/profiles/hardened/ppc64/use.mask b/profiles/hardened/ppc64/use.mask
index 28357217238a..817806746db9 100644
--- a/profiles/hardened/ppc64/use.mask
+++ b/profiles/hardened/ppc64/use.mask
@@ -1,7 +1,3 @@
-# depends for clvm aren't keyworded
-# Danny van Dyk <kugelfang@gentoo.org>
-clvm
-
 # this is a list of USE flags
 # that should not be used on PPC64
 # Tom Gall <tgall@gentoo.org> manages this list
diff --git a/profiles/hardened/use.mask b/profiles/hardened/use.mask
index 3543a2c56ae5..ba1e48a0bacc 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.17 2007/01/04 23:50:58 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/use.mask,v 1.18 2007/06/22 18:53:03 wolf31o2 Exp $
 
 emul-linux-x86
 
@@ -8,3 +8,11 @@ emul-linux-x86
 video_cards_nvidia
 
 x264
+
+# lvm2 clustered use flags (moved from default-linux)
+clvm
+gulm
+cman
+
+# tcc is x86-only
+tcc
diff --git a/profiles/hardened/x86/use.mask b/profiles/hardened/x86/use.mask
index 19d74a03b0af..2da5e0db7d26 100644
--- a/profiles/hardened/x86/use.mask
+++ b/profiles/hardened/x86/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/x86/use.mask,v 1.26 2007/01/04 21:49:29 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/x86/use.mask,v 1.27 2007/06/22 18:53:03 wolf31o2 Exp $
 
 -3dnow
 -3dnowext
@@ -34,6 +34,9 @@ uml
 cman
 gulm
 
+# lvm2 cluster
+-clvm
+
 # 2006/06/22 Chris Gianelloni <wolf31o2@gentoo.org>
 # # Masking for bug #136866
 pmount
@@ -67,3 +70,7 @@ ibm
 -oracle7
 -firebird
 -db2
+
+# dev-lang/tcc won't build
+-tcc
+
diff --git a/profiles/selinux/2005.1/alpha/use.mask b/profiles/selinux/2005.1/alpha/use.mask
index e42ff910a6a0..021dba75a516 100644
--- a/profiles/selinux/2005.1/alpha/use.mask
+++ b/profiles/selinux/2005.1/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/selinux/2005.1/alpha/use.mask,v 1.6 2007/01/04 21:49:29 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/2005.1/alpha/use.mask,v 1.7 2007/06/22 18:53:03 wolf31o2 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
@@ -29,11 +29,6 @@ java
 java-internal
 java-external
 
-# firebird appears to be x86-only (the db, not the browser)
-
-# tcc is x86-only
-tcc
-
 # I don't think that openafs really works on other architectures,
 # despite some internal Gentoo efforts (mine) to port it
 afs
diff --git a/profiles/selinux/alpha/use.mask b/profiles/selinux/alpha/use.mask
index 75679109c225..42d4e067d18a 100644
--- a/profiles/selinux/alpha/use.mask
+++ b/profiles/selinux/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/selinux/alpha/use.mask,v 1.9 2007/04/07 13:37:10 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/alpha/use.mask,v 1.10 2007/06/22 18:53:03 wolf31o2 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
@@ -36,9 +36,7 @@ java-internal
 java-external
 
 # firebird appears to be x86-only (the db, not the browser)
-
-# tcc is x86-only
-tcc
+firebird
 
 # I don't think that openafs really works on other architectures,
 # despite some internal Gentoo efforts (mine) to port it
diff --git a/profiles/selinux/amd64/use.mask b/profiles/selinux/amd64/use.mask
index 70ceedfed52f..d4f1cbadf586 100644
--- a/profiles/selinux/amd64/use.mask
+++ b/profiles/selinux/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/amd64/use.mask,v 1.9 2007/04/07 01:26:35 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/amd64/use.mask,v 1.10 2007/06/22 18:53:03 wolf31o2 Exp $
 
 # SECTION: Unmask
 
@@ -53,7 +53,6 @@ afs
 asm
 drac
 multitarget
-tcc
 vidix
 
 # 2006/06/07 - Danny van Dyk <kugelfang@gentoo.org>
diff --git a/profiles/selinux/mips/use.mask b/profiles/selinux/mips/use.mask
index 4981077bdb19..41ba9567d77b 100644
--- a/profiles/selinux/mips/use.mask
+++ b/profiles/selinux/mips/use.mask
@@ -1,4 +1,4 @@
-# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/mips/use.mask,v 1.15 2007/03/10 09:55:14 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/mips/use.mask,v 1.16 2007/06/22 18:53:03 wolf31o2 Exp $
 
 # Samuli Suominen <drac@gentoo.org>
 # no battery support on mips. bug 157881
@@ -250,7 +250,6 @@ dvdr
 ibm
 ggi
 lirc
-tcc
 trusted
 voodoo3
 smartcard
diff --git a/profiles/selinux/ppc/ppc32/use.mask b/profiles/selinux/ppc/ppc32/use.mask
index 6283667fdf33..c080ec71de08 100644
--- a/profiles/selinux/ppc/ppc32/use.mask
+++ b/profiles/selinux/ppc/ppc32/use.mask
@@ -4,7 +4,6 @@ cmucl
 hdf
 ip28
 real
-tcc
 fmod
 i8x0
 xvmc
diff --git a/profiles/selinux/sparc/use.mask b/profiles/selinux/sparc/use.mask
index b3888f4b8866..a09370483f29 100644
--- a/profiles/selinux/sparc/use.mask
+++ b/profiles/selinux/sparc/use.mask
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/sparc/use.mask,v 1.17 2007/06/03 01:07:26 rbu Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/sparc/use.mask,v 1.18 2007/06/22 18:53:03 wolf31o2 Exp $
 
 # This file contains a list of useflags that cannot be used on sparc.
 
@@ -35,7 +35,6 @@ pcmcia
 pmount
 rar
 real
-tcc
 trusted
 uml
 voodoo3
diff --git a/profiles/selinux/use.mask b/profiles/selinux/use.mask
index b9fa413cfb86..9cb212fc5ac9 100644
--- a/profiles/selinux/use.mask
+++ b/profiles/selinux/use.mask
@@ -1,6 +1,6 @@
 # Copyright 2004-2006 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/use.mask,v 1.6 2007/01/04 23:50:58 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/use.mask,v 1.7 2007/06/22 18:53:03 wolf31o2 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
@@ -25,3 +25,6 @@ x264
 clvm
 gulm
 cman
+
+# tcc is x86-only
+tcc
diff --git a/profiles/selinux/x86/use.mask b/profiles/selinux/x86/use.mask
index eaf03aabb729..a0371a36b9c6 100644
--- a/profiles/selinux/x86/use.mask
+++ b/profiles/selinux/x86/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/x86/use.mask,v 1.3 2007/01/04 21:49:29 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/x86/use.mask,v 1.4 2007/06/22 18:53:03 wolf31o2 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
@@ -77,3 +77,6 @@ ibm
 -oracle7
 -firebird
 -db2
+
+# tcc is x86 only
+tcc