Mask ultra1 useflag on base rather than default-linux and selinux, so that it also...

diff --git a/profiles/base/use.mask b/profiles/base/use.mask
index 26e6840b9e2ce9c12f1297a375640431ff9a868b..16aab600fe74fd7f933d562fe5edaee30ff74444 100644 (file)
--- a/profiles/base/use.mask
+++ b/profiles/base/use.mask
@@ -1,6 +1,3 @@
-win32codecs
-real
-
 # profile specific USE flags
 selinux
 uclibc
@@ -16,6 +13,8 @@ mmxext
 sse
 sse2
 svga
+win32codecs
+real
 
 # ppc arch specific USE flags
 altivec
@@ -31,6 +30,7 @@ ibm
 
 # sparc arch specific USE flags
 vis
+ultra1
 
 # nVidia XvMC requires nvidia-drivers/nvidia-legacy-drivers
 nvidia

diff --git a/profiles/default-linux/use.mask b/profiles/default-linux/use.mask
index b356b21b3aea36139f0c9b846d356937ceff7efe..a8c449ab6ad9b24e794509d46b68031fdf627704 100644 (file)
--- 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.26 2006/12/29 23:28:13 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/use.mask,v 1.27 2007/01/04 21:55:31 flameeyes 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
@@ -10,11 +10,7 @@
 # amd64 only:
 emul-linux-x86
 
-# sparc only:
-ultra1
-
 # x86 only
-win32codecs
 kqemu
 
 # Only used by mips and old amd64 profiles

diff --git a/profiles/selinux/use.mask b/profiles/selinux/use.mask
index 2c37df1b8d4e9373741e09bd85921e6a347cfe45..83985a7dd16154919a4cca7705ab2bd27eb9b446 100644 (file)
--- 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.4 2006/12/29 23:28:13 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/use.mask,v 1.5 2007/01/04 21:55:31 flameeyes 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,11 +15,7 @@ acl
 # amd64 only:
 emul-linux-x86
 
-# sparc only:
-ultra1
-
 # x86 only
-win32codecs
 kqemu
 
 # Only used by mips and old amd64 profiles