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.

8 files changed, 14 insertions, 19 deletions

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