From a1b11eb3c0116efd0fe480ba2d4ed07bc1a1632c Mon Sep 17 00:00:00 2001
From: =?utf8?q?Diego=20Elio=20Petten=C3=B2?= <flameeyes@gentoo.org>
Date: Fri, 29 Dec 2006 23:28:13 +0000
Subject: [PATCH] Mask aqua and coreaudio useflags in base profile and unmask
 only in darwin/macos profile.

---
 profiles/base/use.mask                 | 5 +++++
 profiles/default-bsd/use.mask          | 6 +-----
 profiles/default-darwin/macos/use.mask | 5 +++++
 profiles/default-linux/use.mask        | 6 +-----
 profiles/embedded/use.mask             | 2 --
 profiles/hardened/use.mask             | 6 +-----
 profiles/selinux/use.mask              | 6 +-----
 7 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/profiles/base/use.mask b/profiles/base/use.mask
index 8b58d0e3791b..46de393ce687 100644
--- a/profiles/base/use.mask
+++ b/profiles/base/use.mask
@@ -116,3 +116,8 @@ alsa_cards_au1x00
 # Diego Pettenò <flameeyes@gentoo.org> (29 Dec 2006)
 # Adobe FDF toolkit is x86 only.
 fdftk
+
+# Diego Pettenò <flameeyes@gentoo.org> (30 Dec 2006)
+# These are specific of Mac OS X
+aqua
+coreaudio
diff --git a/profiles/default-bsd/use.mask b/profiles/default-bsd/use.mask
index a81d233b0982..af90bab25bb0 100644
--- a/profiles/default-bsd/use.mask
+++ b/profiles/default-bsd/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-bsd/use.mask,v 1.27 2006/12/29 21:13:17 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-bsd/use.mask,v 1.28 2006/12/29 23:28:13 flameeyes Exp $
 
 # Linux-dependant flags
 selinux
@@ -96,7 +96,3 @@ video_cards_nvidia
 
 # Apache's MPM-itk requires sys-libs/libcap
 mpm-itk
-
-# USE flags only valid on Mac OS X
-aqua
-coreaudio
diff --git a/profiles/default-darwin/macos/use.mask b/profiles/default-darwin/macos/use.mask
index f9ce7de2e8f7..a2d08a7d17d4 100644
--- a/profiles/default-darwin/macos/use.mask
+++ b/profiles/default-darwin/macos/use.mask
@@ -23,3 +23,8 @@ sasl
 # useful, same for framebuffered version
 gpm
 fbcon
+
+# Diego Pettenò <flameeyes@gentoo.org> (30 Dec 2006)
+# These are specific of Mac OS X
+-aqua
+-coreaudio
diff --git a/profiles/default-linux/use.mask b/profiles/default-linux/use.mask
index 6f4a2fc4079c..b356b21b3aea 100644
--- a/profiles/default-linux/use.mask
+++ b/profiles/default-linux/use.mask
@@ -1,16 +1,12 @@
 # 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.25 2006/07/25 14:33:17 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/use.mask,v 1.26 2006/12/29 23:28:13 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
 # profile (such as the selinux profiles) have a USE flag associated with
 # them.
 
-# USE flags only valid on Mac OS X
-aqua
-coreaudio
-
 # amd64 only:
 emul-linux-x86
 
diff --git a/profiles/embedded/use.mask b/profiles/embedded/use.mask
index 3e291a1f2202..2d7628d4bd15 100644
--- a/profiles/embedded/use.mask
+++ b/profiles/embedded/use.mask
@@ -1,7 +1,5 @@
 # Chris PeBenito <pebenito@gentoo.org>
 # must use a SELinux profile
 selinux
-# aqua USE flag is only valid on Mac OS X
-aqua
 
 emul-linux-x86
diff --git a/profiles/hardened/use.mask b/profiles/hardened/use.mask
index e8d51268417f..523f8fcfcd1d 100644
--- a/profiles/hardened/use.mask
+++ b/profiles/hardened/use.mask
@@ -1,10 +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.15 2006/10/06 21:50:05 wolf31o2 Exp $
-
-# USE flags only valid on Mac OS X
-aqua
-coreaudio
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/use.mask,v 1.16 2006/12/29 23:28:13 flameeyes Exp $
 
 emul-linux-x86
 
diff --git a/profiles/selinux/use.mask b/profiles/selinux/use.mask
index 462e56bc4757..2c37df1b8d4e 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.3 2006/10/08 18:37:25 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/use.mask,v 1.4 2006/12/29 23:28:13 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
@@ -12,10 +12,6 @@
 # disallow posix acl since this is SELinux
 acl
 
-# USE flags only valid on Mac OS X
-aqua
-coreaudio
-
 # amd64 only:
 emul-linux-x86
 
-- 
2.26.2