From d607dccab18b7568bc9280e93e25ad1a58566240 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Diego=20Elio=20Petten=C3=B2?= Date: Thu, 4 Jan 2007 21:55:31 +0000 Subject: [PATCH] Mask ultra1 useflag on base rather than default-linux and selinux, so that it also get masked properly for hardened profiles; also remove win32codecs double masking as it's masked already. --- profiles/base/use.mask | 6 +++--- profiles/default-linux/use.mask | 6 +----- profiles/selinux/use.mask | 6 +----- 3 files changed, 5 insertions(+), 13 deletions(-) diff --git a/profiles/base/use.mask b/profiles/base/use.mask index 26e6840b9e2c..16aab600fe74 100644 --- 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 b356b21b3aea..a8c449ab6ad9 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.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 2c37df1b8d4e..83985a7dd161 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.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 -- 2.26.2