clean up use.mask

14 files changed, 28 insertions, 87 deletions

diff --git a/profiles/selinux/2004.1/amd64/use.mask b/profiles/selinux/2004.1/amd64/use.mask
index eb5b42704bd2..ec7811c3aacf 100644
--- a/profiles/selinux/2004.1/amd64/use.mask
+++ b/profiles/selinux/2004.1/amd64/use.mask
@@ -1,9 +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.4 2005/01/08 20:47:35 eradicator Exp $
-
-# disallow posix acl since this is SELinux
-acl
+# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/2004.1/amd64/use.mask,v 1.5 2005/05/08 23:37:08 pebenito Exp $
 
 #unknowns
 afs
@@ -24,10 +21,6 @@ firebird
 # x86 binary only, used by php
 fdftk
 
-# 2004/06/22 - Danny van Dyk <kugelfang@gentoo.org>
-# version in portage does not work on amd64 yet
-uclibc
-
 # 2004/06/22 - Taken from 2004.0 profile
 # versions that are in portage do not support amd64,
 # will be removed when Intel issues an update and it gets into portage
@@ -56,12 +49,6 @@ sse
 sse2
 3dnow
 
-# 2004/06/25 - Danny van Dyk <kugelfang@gentoo.org>
-# Known BUGs (#54760) + lack of brain/man power to maintain "hardened" in the
-# default profile. Use the hardened profile instead.
-hardened
-uclibc
-
 # altivec is a ppc instruction set.
 altivec
 
diff --git a/profiles/selinux/2004.1/ppc/use.mask b/profiles/selinux/2004.1/ppc/use.mask
index b06bfd6625a7..55299b145c25 100644
--- a/profiles/selinux/2004.1/ppc/use.mask
+++ b/profiles/selinux/2004.1/ppc/use.mask
@@ -1,9 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/2004.1/ppc/use.mask,v 1.5 2004/11/06 17:55:03 pebenito Exp $
-
-# disallow posix acl since this is SELinux
-acl
+# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/2004.1/ppc/use.mask,v 1.6 2005/05/08 23:37:08 pebenito Exp $
 
 # this is a list of USE flags
 # that should not be used on PPC
@@ -18,4 +15,3 @@ mmx
 svga
 sse
 scanner 
-uclibc
diff --git a/profiles/selinux/2004.1/sparc64/use.mask b/profiles/selinux/2004.1/sparc64/use.mask
index 677f79fcf10a..9040d48b07fe 100644
--- a/profiles/selinux/2004.1/sparc64/use.mask
+++ b/profiles/selinux/2004.1/sparc64/use.mask
@@ -1,9 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/2004.1/sparc64/use.mask,v 1.5 2004/11/06 17:53:09 pebenito Exp $
-
-# disallow posix acl since this is SELinux
-acl
+# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/2004.1/sparc64/use.mask,v 1.6 2005/05/08 23:37:08 pebenito Exp $
 
 # This file contains a list of USE
 # flags that cannot be used on SPARC.
@@ -18,4 +15,3 @@ pic
 sse
 svga
 voodoo3
-uclibc
diff --git a/profiles/selinux/2004.1/use.mask b/profiles/selinux/2004.1/use.mask
deleted file mode 100644
index 8638177ab6ec..000000000000
--- a/profiles/selinux/2004.1/use.mask
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/2004.1/use.mask,v 1.3 2005/02/01 00:29:24 pebenito Exp $
-
-# aqua USE flag is only valid on Mac OS X
-aqua
diff --git a/profiles/selinux/2004.1/x86-uclibc/use.mask b/profiles/selinux/2004.1/x86-uclibc/use.mask
index 00e519411ce3..8bccf3e18297 100644
--- a/profiles/selinux/2004.1/x86-uclibc/use.mask
+++ b/profiles/selinux/2004.1/x86-uclibc/use.mask
@@ -1,9 +1,9 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/2004.1/x86-uclibc/use.mask,v 1.2 2005/03/26 15:09:16 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/2004.1/x86-uclibc/use.mask,v 1.3 2005/05/08 23:37:08 pebenito Exp $
 
-# disallow posix acl since this is SELinux
-acl
+# unmask uclibc
+-uclibc
 
 # PPC instructions
 altivec
diff --git a/profiles/selinux/2004.1/x86/use.mask b/profiles/selinux/2004.1/x86/use.mask
index 1b58a7b8d644..34e6ded7664a 100644
--- a/profiles/selinux/2004.1/x86/use.mask
+++ b/profiles/selinux/2004.1/x86/use.mask
@@ -1,12 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/2004.1/x86/use.mask,v 1.3 2005/02/01 00:29:24 pebenito Exp $
-
-# disallow posix acl since this is SELinux
-acl
-
-# use the x86-uclibc profile
-uclibc
+# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/2004.1/x86/use.mask,v 1.4 2005/05/08 23:37:08 pebenito Exp $
 
 # PPC instructions
 altivec
diff --git a/profiles/selinux/2005.1/amd64/use.mask b/profiles/selinux/2005.1/amd64/use.mask
index 66dad916abfe..70e6a93a07b8 100644
--- a/profiles/selinux/2005.1/amd64/use.mask
+++ b/profiles/selinux/2005.1/amd64/use.mask
@@ -1,14 +1,11 @@
 # Copyright 2004 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/2005.1/amd64/use.mask,v 1.1 2005/04/02 15:48:25 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/2005.1/amd64/use.mask,v 1.2 2005/05/08 23:37:08 pebenito Exp $
 
 # Jeremy Huddleston <eradicator@gentoo.org>
 # multilib is forced on when we have ${MULTILIB_ABIS} defined
 multilib
 
-# disallow posix acl since this is SELinux
-acl
-
 #unknowns
 afs
 drac
@@ -28,10 +25,6 @@ firebird
 # x86 binary only, used by php
 fdftk
 
-# 2004/06/22 - Danny van Dyk <kugelfang@gentoo.org>
-# version in portage does not work on amd64 yet
-uclibc
-
 # 2004/06/22 - Taken from 2004.0 profile
 # versions that are in portage do not support amd64,
 # will be removed when Intel issues an update and it gets into portage
@@ -60,12 +53,6 @@ sse
 sse2
 3dnow
 
-# 2004/06/25 - Danny van Dyk <kugelfang@gentoo.org>
-# Known BUGs (#54760) + lack of brain/man power to maintain "hardened" in the
-# default profile. Use the hardened profile instead.
-hardened
-uclibc
-
 # altivec is a ppc instruction set.
 altivec
 
diff --git a/profiles/selinux/2005.1/mips/use.mask b/profiles/selinux/2005.1/mips/use.mask
index 16c7a967cac5..2bbaf5441233 100644
--- a/profiles/selinux/2005.1/mips/use.mask
+++ b/profiles/selinux/2005.1/mips/use.mask
@@ -1,12 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/2005.1/mips/use.mask,v 1.1 2005/05/01 21:51:21 spb Exp $
-
-# disallow posix acl since this is SELinux
-acl
-
-# use a uclibc profile
-uclibc
+# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/2005.1/mips/use.mask,v 1.2 2005/05/08 23:37:08 pebenito Exp $
 
 # PPC instructions
 altivec
diff --git a/profiles/selinux/2005.1/ppc/use.mask b/profiles/selinux/2005.1/ppc/use.mask
index dbc0db77d519..308aa8ee56dd 100644
--- a/profiles/selinux/2005.1/ppc/use.mask
+++ b/profiles/selinux/2005.1/ppc/use.mask
@@ -1,9 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/2005.1/ppc/use.mask,v 1.1 2005/04/02 15:48:25 pebenito Exp $
-
-# disallow posix acl since this is SELinux
-acl
+# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/2005.1/ppc/use.mask,v 1.2 2005/05/08 23:37:08 pebenito Exp $
 
 # this is a list of USE flags
 # that should not be used on PPC
@@ -18,4 +15,3 @@ mmx
 svga
 sse
 scanner 
-uclibc
diff --git a/profiles/selinux/2005.1/sparc64/use.mask b/profiles/selinux/2005.1/sparc64/use.mask
index 3e5d50d951b2..3da4c9493b54 100644
--- a/profiles/selinux/2005.1/sparc64/use.mask
+++ b/profiles/selinux/2005.1/sparc64/use.mask
@@ -1,9 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/2005.1/sparc64/use.mask,v 1.1 2005/04/02 15:48:25 pebenito Exp $
-
-# disallow posix acl since this is SELinux
-acl
+# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/2005.1/sparc64/use.mask,v 1.2 2005/05/08 23:37:08 pebenito Exp $
 
 # This file contains a list of USE
 # flags that cannot be used on SPARC.
@@ -18,4 +15,3 @@ pic
 sse
 svga
 voodoo3
-uclibc
diff --git a/profiles/selinux/2005.1/use.mask b/profiles/selinux/2005.1/use.mask
deleted file mode 100644
index e58aa6ff524b..000000000000
--- a/profiles/selinux/2005.1/use.mask
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/2005.1/use.mask,v 1.1 2005/04/02 15:48:25 pebenito Exp $
-
-# aqua USE flag is only valid on Mac OS X
-aqua
diff --git a/profiles/selinux/2005.1/x86-uclibc/use.mask b/profiles/selinux/2005.1/x86-uclibc/use.mask
index 0604c1b84ae5..956af6f9d4d0 100644
--- a/profiles/selinux/2005.1/x86-uclibc/use.mask
+++ b/profiles/selinux/2005.1/x86-uclibc/use.mask
@@ -1,9 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/2005.1/x86-uclibc/use.mask,v 1.1 2005/04/02 15:48:25 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/2005.1/x86-uclibc/use.mask,v 1.2 2005/05/08 23:37:08 pebenito Exp $
 
-# disallow posix acl since this is SELinux
-acl
+-uclibc
 
 # PPC instructions
 altivec
diff --git a/profiles/selinux/2005.1/x86/use.mask b/profiles/selinux/2005.1/x86/use.mask
index a904089e39fb..9c96a0b1bc8a 100644
--- a/profiles/selinux/2005.1/x86/use.mask
+++ b/profiles/selinux/2005.1/x86/use.mask
@@ -1,12 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/2005.1/x86/use.mask,v 1.1 2005/04/02 15:48:25 pebenito Exp $
-
-# disallow posix acl since this is SELinux
-acl
-
-# use the x86-uclibc profile
-uclibc
+# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/2005.1/x86/use.mask,v 1.2 2005/05/08 23:37:08 pebenito Exp $
 
 # PPC instructions
 altivec
diff --git a/profiles/selinux/use.mask b/profiles/selinux/use.mask
new file mode 100644
index 000000000000..0dc17270cc03
--- /dev/null
+++ b/profiles/selinux/use.mask
@@ -0,0 +1,14 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/use.mask,v 1.1 2005/05/08 23:37:08 pebenito Exp $
+
+-selinux
+
+# disallow posix acl since this is SELinux
+acl
+
+# aqua USE flag is only valid on Mac OS X
+aqua
+
+# must use a specific SELinux profile that unmasks this
+uclibc