Mask and force ELIBC, KERNEL, and USERLAND flags that apply to specific profiles.

diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 4141b6a3d4152a75d6fa62e2245972cd2ac09cc0..048f09a687ccbf745401d14a7c44f32e4f63669d 100644 (file)
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for profile directory
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.132 2007/02/24 11:27:33 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.133 2007/02/24 15:15:51 zmedico Exp $
+
+  24 Feb 2007; Zac Medico <zmedico@gentoo.org>
+  base/use.force, base/use.mask, default-bsd/use.mask,
+  default-bsd/fbsd/use.force, default-darwin/use.force,
+  default-darwin/use.mask, uclibc/use.force, uclibc/use.mask:
+  Mask and force ELIBC, KERNEL, and USERLAND flags that apply to specific
+  profiles.
 
   24 Feb 2007; Christian Faulhammer <opfer@gentoo.org> use.local.desc:
   added kpoll and smp USE flags for dev-lang/erlang

diff --git a/profiles/base/use.force b/profiles/base/use.force
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..01486e67e713b78b6658ecbc31e752ee1c096a73 100644 (file)
--- a/profiles/base/use.force
+++ b/profiles/base/use.force
@@ -0,0 +1,5 @@
+# Force the GNU/Linux ELIBC, KERNEL, and USERLAND
+# flags that apply to the majority of profiles.
+elibc_glibc
+kernel_linux
+userland_GNU

diff --git a/profiles/base/use.mask b/profiles/base/use.mask
index e7c6b9a90ae407448704b8dd48cc12c25e4c5a7f..07cb502a892bc6057e81b0b007f8daefff9d648c 100644 (file)
--- a/profiles/base/use.mask
+++ b/profiles/base/use.mask
@@ -81,13 +81,17 @@ infopipe
 # psyco only works on x86
 psyco
 
-# Mask the various *BSD libcs a part from the various subprofiles
+# Mask ELIBC, KERNEL, and USERLAND flags that apply to specific profiles.
 elibc_FreeBSD
 elibc_NetBSD
 elibc_OpenBSD
 elibc_Darwin
 elibc_DragonFly
+elibc_uclibc
+kernel_Darwin
 kernel_FreeBSD
+userland_BSD
+userland_Darwin
 
 # Diego Pettenò <flameeyes@gentoo.org> (6 Dec 2006)
 # Mask specific Apple drivers

diff --git a/profiles/default-bsd/fbsd/use.force b/profiles/default-bsd/fbsd/use.force
index 42189fac1ed1f51665e8a0e3ce3b47bf28978657..d221d0ea5cd12826a9e1a6cedf2879c3db030e7c 100644 (file)
--- a/profiles/default-bsd/fbsd/use.force
+++ b/profiles/default-bsd/fbsd/use.force
@@ -1 +1,5 @@
 java5
+
+# Force freebsd-specific variables
+elibc_FreeBSD
+kernel_FreeBSD

diff --git a/profiles/default-bsd/use.mask b/profiles/default-bsd/use.mask
index 797d25117fe1de61cf2dab3bc270a11dddf1630b..ad40bba1c47de2905496560dc417288296ae6333 100644 (file)
--- 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.29 2007/01/04 21:49:28 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-bsd/use.mask,v 1.30 2007/02/24 15:15:51 zmedico Exp $
 
 # Linux-dependant flags
 selinux
@@ -59,11 +59,10 @@ ifp
 ipod
 
 # Mask extraneous elibc/kernel combinations
+-userland_BSD
 elibc_glibc
-elibc_uclibc
 kernel_linux
 userland_GNU
-userland_Darwin
 
 # Mask Xorg-modular drivers that are Linux-specific
 input_devices_aiptek

diff --git a/profiles/default-darwin/use.force b/profiles/default-darwin/use.force
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..7a82a7facee57ac7e6805734ebe32d676eaffda2 100644 (file)
--- a/profiles/default-darwin/use.force
+++ b/profiles/default-darwin/use.force
@@ -0,0 +1,3 @@
+elibc_Darwin
+kernel_Darwin
+userland_Darwin

diff --git a/profiles/default-darwin/use.mask b/profiles/default-darwin/use.mask
index 358b2f7732aecb1b2f87d98e79cf6f3b0f87fc3e..9b57892d79e2f6a3fecdbb98681106528c1eecc3 100644 (file)
--- a/profiles/default-darwin/use.mask
+++ b/profiles/default-darwin/use.mask
@@ -58,11 +58,10 @@ fastcgi
 
 # Re-add Darwin libc
 -elibc_Darwin
+-kernel_Darwin
+-userland_Darwin
 
 # Mask extraneous elibc/kernel combinations
 elibc_glibc
-elibc_uclibc
 kernel_linux
-kernel_FreeBSD
 userland_GNU
-userland_BSD

diff --git a/profiles/uclibc/use.force b/profiles/uclibc/use.force
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..3904f12fc0b211f6d11e33991a621587e1f1219a 100644 (file)
--- a/profiles/uclibc/use.force
+++ b/profiles/uclibc/use.force
@@ -0,0 +1 @@
+elibc_uclibc

diff --git a/profiles/uclibc/use.mask b/profiles/uclibc/use.mask
index 57f8c2a6f52b6caf1691783824a52ff71080be8c..f93b78e984d76217e3e8534c4a4e70e49d0720f2 100644 (file)
--- a/profiles/uclibc/use.mask
+++ b/profiles/uclibc/use.mask
@@ -5,3 +5,6 @@ nis
 
 emul-linux-x86
 -uclibc
+
+-elibc_uclibc
+elibc_glibc