Added USERLAND, KERNEL, LIBC variables and updated USE_EXPAND

34 files changed, 150 insertions, 57 deletions

diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
index 4b6517390492..d6d6afaaf370 100644
--- a/profiles/base/make.defaults
+++ b/profiles/base/make.defaults
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/base/make.defaults,v 1.10 2005/04/24 10:05:03 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/make.defaults,v 1.11 2005/05/01 01:54:48 spb Exp $
 #
 # System-wide defaults for the Portage system
 # See portage(5) manpage
@@ -11,8 +11,11 @@ FEATURES="autoconfig strict"
 # Env vars to expand into USE vars. Modifying this requires prior
 # discussion on gentoo-dev@gentoo.org. Flat profiles also need to
 # be updated appropriately.
-USE_EXPAND="FRITZCAPI_CARDS FCDSL_CARDS VIDEO_CARDS INPUT_DEVICES LINGUAS"
+USE_EXPAND="FRITZCAPI_CARDS FCDSL_CARDS VIDEO_CARDS INPUT_DEVICES LINGUAS USERLAND KERNEL LIBC"
 
 CONFIG_PROTECT="/etc /var/qmail/control /usr/share/config /usr/kde/2/share/config /usr/kde/3/share/config"
 CONFIG_PROTECT_MASK="/etc/gconf"
 
+LIBC="glibc"
+KERNEL="linux"
+USERLAND="GNU"
diff --git a/profiles/cobalt-mips-1.4/make.defaults b/profiles/cobalt-mips-1.4/make.defaults
index 3b22cca80343..bec40fd20321 100644
--- a/profiles/cobalt-mips-1.4/make.defaults
+++ b/profiles/cobalt-mips-1.4/make.defaults
@@ -31,8 +31,11 @@ ACCEPT_KEYWORDS="mips"
 # Env vars to expand into USE vars. Modifying this requires prior
 # discussion on gentoo-dev@gentoo.org. Flat profiles also need to
 # be updated appropriately.
-USE_EXPAND="FRITZCAPI_CARDS FCDSL_CARDS VIDEO_CARDS INPUT_DEVICES LINGUAS"
+USE_EXPAND="FRITZCAPI_CARDS FCDSL_CARDS VIDEO_CARDS INPUT_DEVICES LINGUAS USERLAND KERNEL LIBC"
 
 CONFIG_PROTECT="/etc /var/qmail/control /usr/share/config /usr/kde/2/share/config /usr/kde/3/share/config"
 CONFIG_PROTECT_MASK="/etc/gconf"
 
+USERLAND=GNU
+KERNEL=linux
+LIBC=glibc
diff --git a/profiles/cobalt-mips-2004.1/make.defaults b/profiles/cobalt-mips-2004.1/make.defaults
index 3b22cca80343..bec40fd20321 100644
--- a/profiles/cobalt-mips-2004.1/make.defaults
+++ b/profiles/cobalt-mips-2004.1/make.defaults
@@ -31,8 +31,11 @@ ACCEPT_KEYWORDS="mips"
 # Env vars to expand into USE vars. Modifying this requires prior
 # discussion on gentoo-dev@gentoo.org. Flat profiles also need to
 # be updated appropriately.
-USE_EXPAND="FRITZCAPI_CARDS FCDSL_CARDS VIDEO_CARDS INPUT_DEVICES LINGUAS"
+USE_EXPAND="FRITZCAPI_CARDS FCDSL_CARDS VIDEO_CARDS INPUT_DEVICES LINGUAS USERLAND KERNEL LIBC"
 
 CONFIG_PROTECT="/etc /var/qmail/control /usr/share/config /usr/kde/2/share/config /usr/kde/3/share/config"
 CONFIG_PROTECT_MASK="/etc/gconf"
 
+USERLAND=GNU
+KERNEL=linux
+LIBC=glibc
diff --git a/profiles/default-alpha-1.4/make.defaults b/profiles/default-alpha-1.4/make.defaults
index 7f231ed0f82e..2b02de11b5a3 100644
--- a/profiles/default-alpha-1.4/make.defaults
+++ b/profiles/default-alpha-1.4/make.defaults
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-alpha-1.4/make.defaults,v 1.21 2005/04/24 10:05:03 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-alpha-1.4/make.defaults,v 1.22 2005/05/01 01:54:48 spb Exp $
 
 USE="
 alpha
@@ -58,8 +58,11 @@ ACCEPT_KEYWORDS="alpha"
 # Env vars to expand into USE vars. Modifying this requires prior
 # discussion on gentoo-dev@gentoo.org. Flat profiles also need to
 # be updated appropriately.
-USE_EXPAND="FRITZCAPI_CARDS FCDSL_CARDS VIDEO_CARDS INPUT_DEVICES LINGUAS"
+USE_EXPAND="FRITZCAPI_CARDS FCDSL_CARDS VIDEO_CARDS INPUT_DEVICES LINGUAS USERLAND KERNEL LIBC"
 
 CONFIG_PROTECT="/etc /var/qmail/control /usr/share/config /usr/kde/2/share/config /usr/kde/3/share/config"
 CONFIG_PROTECT_MASK="/etc/gconf"
 
+USERLAND=GNU
+KERNEL=linux
+LIBC=glibc
diff --git a/profiles/default-alpha-2004.0/make.defaults b/profiles/default-alpha-2004.0/make.defaults
index dc28c4298f50..3fadf32a0f7f 100644
--- a/profiles/default-alpha-2004.0/make.defaults
+++ b/profiles/default-alpha-2004.0/make.defaults
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-alpha-2004.0/make.defaults,v 1.15 2005/04/24 10:05:03 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-alpha-2004.0/make.defaults,v 1.16 2005/05/01 01:54:48 spb Exp $
 # System-wide defaults for the Portage system on alpha
 
 #Experimental: trying to use these USE variables to build up from stage 2->3 
@@ -73,8 +73,11 @@ ACCEPT_KEYWORDS="alpha"
 # Env vars to expand into USE vars. Modifying this requires prior
 # discussion on gentoo-dev@gentoo.org. Flat profiles also need to
 # be updated appropriately.
-USE_EXPAND="FRITZCAPI_CARDS FCDSL_CARDS VIDEO_CARDS INPUT_DEVICES LINGUAS"
+USE_EXPAND="FRITZCAPI_CARDS FCDSL_CARDS VIDEO_CARDS INPUT_DEVICES LINGUAS USERLAND KERNEL LIBC"
 
 CONFIG_PROTECT="/etc /var/qmail/control /usr/share/config /usr/kde/2/share/config /usr/kde/3/share/config"
 CONFIG_PROTECT_MASK="/etc/gconf"
 
+USERLAND=GNU
+KERNEL=linux
+LIBC=glibc
diff --git a/profiles/default-amd64-2004.2/make.defaults b/profiles/default-amd64-2004.2/make.defaults
index f45ed639ed76..771bcc2170a6 100644
--- a/profiles/default-amd64-2004.2/make.defaults
+++ b/profiles/default-amd64-2004.2/make.defaults
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-amd64-2004.2/make.defaults,v 1.15 2005/04/24 10:05:03 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-amd64-2004.2/make.defaults,v 1.16 2005/05/01 01:54:48 spb Exp $
 # System-wide defaults for the gcc 3.3 Portage system
 
 #Experimental: trying to use these USE variables to build up from stage 2->3
@@ -25,8 +25,11 @@ FEATURES="-sandbox"
 # Env vars to expand into USE vars. Modifying this requires prior
 # discussion on gentoo-dev@gentoo.org. Flat profiles also need to
 # be updated appropriately.
-USE_EXPAND="FRITZCAPI_CARDS FCDSL_CARDS VIDEO_CARDS INPUT_DEVICES LINGUAS"
+USE_EXPAND="FRITZCAPI_CARDS FCDSL_CARDS VIDEO_CARDS INPUT_DEVICES LINGUAS USERLAND KERNEL LIBC"
 
 CONFIG_PROTECT="/etc /var/qmail/control /usr/share/config /usr/kde/2/share/config /usr/kde/3/share/config"
 CONFIG_PROTECT_MASK="/etc/gconf"
 
+USERLAND=GNU
+KERNEL=linux
+LIBC=glibc
diff --git a/profiles/default-bsd/fbsd/x86/make.defaults b/profiles/default-bsd/fbsd/x86/make.defaults
index 8176912b1a53..f507a0865513 100644
--- a/profiles/default-bsd/fbsd/x86/make.defaults
+++ b/profiles/default-bsd/fbsd/x86/make.defaults
@@ -1,7 +1,7 @@
 # Env vars to expand into USE vars. Modifying this requires prior
 # discussion on gentoo-dev@gentoo.org. Flat profiles also need to
 # be updated appropriately.
-USE_EXPAND="VIDEO_CARDS INPUT_DEVICES LINGUAS"
+USE_EXPAND="VIDEO_CARDS INPUT_DEVICES LINGUAS USERLAND KERNEL LIBC"
 
 CONFIG_PROTECT="/etc /var/qmail/control /usr/share/config /usr/kde/2/share/config /usr/kde/3/share/config"
 CONFIG_PROTECT_MASK="/etc/gconf"
diff --git a/profiles/default-darwin/make.defaults b/profiles/default-darwin/make.defaults
index bc1b61d7cf2e..5ea89927ea29 100644
--- a/profiles/default-darwin/make.defaults
+++ b/profiles/default-darwin/make.defaults
@@ -17,3 +17,7 @@ RESUMECOMMAND="/usr/bin/curl --connect-timeout 15 -# -C - -o \${DISTDIR}/\${FILE
 FEATURES="-sandbox userpriv"
 
 USE="emboss"
+
+USERLAND="BSD"
+KERNEL="Darwin"
+LIBC="Darwin"
diff --git a/profiles/default-macos-10.3/make.defaults b/profiles/default-macos-10.3/make.defaults
index 55a4ee404284..db568f27242b 100644
--- a/profiles/default-macos-10.3/make.defaults
+++ b/profiles/default-macos-10.3/make.defaults
@@ -19,8 +19,12 @@ FETCHCOMMAND="/usr/bin/curl --connect-timeout 15 -# -o \${DISTDIR}/\${FILE} \${U
 # Env vars to expand into USE vars. Modifying this requires prior
 # discussion on gentoo-dev@gentoo.org. Flat profiles also need to
 # be updated appropriately.
-USE_EXPAND="FRITZCAPI_CARDS FCDSL_CARDS VIDEO_CARDS INPUT_DEVICES LINGUAS"
+USE_EXPAND="FRITZCAPI_CARDS FCDSL_CARDS VIDEO_CARDS INPUT_DEVICES LINGUAS USERLAND KERNEL LIBC"
 
 CONFIG_PROTECT="/etc /var/qmail/control /usr/share/config /usr/kde/2/share/config /usr/kde/3/share/config"
 CONFIG_PROTECT_MASK="/etc/gconf"
 
+USERLAND="BSD"
+KERNEL="Darwin"
+LIBC="Darwin"
+
diff --git a/profiles/default-macos-10.4/make.defaults b/profiles/default-macos-10.4/make.defaults
index a6620a98374a..e569d5980a9c 100644
--- a/profiles/default-macos-10.4/make.defaults
+++ b/profiles/default-macos-10.4/make.defaults
@@ -19,8 +19,11 @@ FETCHCOMMAND="/usr/bin/curl --connect-timeout 15 -# -o \${DISTDIR}/\${FILE} \${U
 # Env vars to expand into USE vars. Modifying this requires prior
 # discussion on gentoo-dev@gentoo.org. Flat profiles also need to
 # be updated appropriately.
-USE_EXPAND="FRITZCAPI_CARDS FCDSL_CARDS VIDEO_CARDS INPUT_DEVICES LINGUAS"
+USE_EXPAND="FRITZCAPI_CARDS FCDSL_CARDS VIDEO_CARDS INPUT_DEVICES LINGUAS USERLAND KERNEL LIBC"
 
 CONFIG_PROTECT="/etc /var/qmail/control /usr/share/config /usr/kde/2/share/config /usr/kde/3/share/config"
 CONFIG_PROTECT_MASK="/etc/gconf"
 
+USERLAND="BSD"
+KERNEL="Darwin"
+LIBC="Darwin"
diff --git a/profiles/default-mips-1.4/make.defaults b/profiles/default-mips-1.4/make.defaults
index 0d7a2ca842d8..5552297713fb 100644
--- a/profiles/default-mips-1.4/make.defaults
+++ b/profiles/default-mips-1.4/make.defaults
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-mips-1.4/make.defaults,v 1.16 2005/04/24 10:05:03 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-mips-1.4/make.defaults,v 1.17 2005/05/01 01:54:48 spb Exp $
 # System-wide defaults for the Portage system
 
 ARCH="mips"
@@ -29,8 +29,11 @@ ACCEPT_KEYWORDS="mips"
 # Env vars to expand into USE vars. Modifying this requires prior
 # discussion on gentoo-dev@gentoo.org. Flat profiles also need to
 # be updated appropriately.
-USE_EXPAND="FRITZCAPI_CARDS FCDSL_CARDS VIDEO_CARDS INPUT_DEVICES LINGUAS"
+USE_EXPAND="FRITZCAPI_CARDS FCDSL_CARDS VIDEO_CARDS INPUT_DEVICES LINGUAS USERLAND KERNEL LIBC"
 
 CONFIG_PROTECT="/etc /var/qmail/control /usr/share/config /usr/kde/2/share/config /usr/kde/3/share/config"
 CONFIG_PROTECT_MASK="/etc/gconf"
 
+USERLAND=GNU
+KERNEL=linux
+LIBC=glibc
diff --git a/profiles/default-mips-2004.1/make.defaults b/profiles/default-mips-2004.1/make.defaults
index 37cdd69c150d..ea8b85cc7f54 100644
--- a/profiles/default-mips-2004.1/make.defaults
+++ b/profiles/default-mips-2004.1/make.defaults
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-mips-2004.1/make.defaults,v 1.14 2005/04/24 10:05:03 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-mips-2004.1/make.defaults,v 1.15 2005/05/01 01:54:48 spb Exp $
 # System-wide defaults for the Portage system
 
 ARCH="mips"
@@ -29,8 +29,11 @@ ACCEPT_KEYWORDS="mips"
 # Env vars to expand into USE vars. Modifying this requires prior
 # discussion on gentoo-dev@gentoo.org. Flat profiles also need to
 # be updated appropriately.
-USE_EXPAND="FRITZCAPI_CARDS FCDSL_CARDS VIDEO_CARDS INPUT_DEVICES LINGUAS"
+USE_EXPAND="FRITZCAPI_CARDS FCDSL_CARDS VIDEO_CARDS INPUT_DEVICES LINGUAS USERLAND KERNEL LIBC"
 
 CONFIG_PROTECT="/etc /var/qmail/control /usr/share/config /usr/kde/2/share/config /usr/kde/3/share/config"
 CONFIG_PROTECT_MASK="/etc/gconf"
 
+USERLAND=GNU
+KERNEL=linux
+LIBC=glibc
diff --git a/profiles/default-mips64-1.4/make.defaults b/profiles/default-mips64-1.4/make.defaults
index 84079dfce3d4..c56651b71993 100644
--- a/profiles/default-mips64-1.4/make.defaults
+++ b/profiles/default-mips64-1.4/make.defaults
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-mips64-1.4/make.defaults,v 1.14 2005/04/24 10:05:03 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-mips64-1.4/make.defaults,v 1.15 2005/05/01 01:54:49 spb Exp $
 # System-wide defaults for the Portage system
 
 ARCH="mips"
@@ -30,7 +30,7 @@ ACCEPT_KEYWORDS="mips"
 # Env vars to expand into USE vars. Modifying this requires prior
 # discussion on gentoo-dev@gentoo.org. Flat profiles also need to
 # be updated appropriately.
-USE_EXPAND="FRITZCAPI_CARDS FCDSL_CARDS VIDEO_CARDS INPUT_DEVICES LINGUAS"
+USE_EXPAND="FRITZCAPI_CARDS FCDSL_CARDS VIDEO_CARDS INPUT_DEVICES LINGUAS USERLAND KERNEL LIBC"
 
 CONFIG_PROTECT="/etc /var/qmail/control /usr/share/config /usr/kde/2/share/config /usr/kde/3/share/config"
 CONFIG_PROTECT_MASK="/etc/gconf"
diff --git a/profiles/default-ppc-1.0/make.defaults b/profiles/default-ppc-1.0/make.defaults
index 67dc93d4e09e..8aae5cbbabeb 100644
--- a/profiles/default-ppc-1.0/make.defaults
+++ b/profiles/default-ppc-1.0/make.defaults
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-ppc-1.0/make.defaults,v 1.20 2005/04/24 10:05:03 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-ppc-1.0/make.defaults,v 1.21 2005/05/01 01:54:49 spb Exp $
 # System-wide defaults for the Portage system
 
 ARCH="ppc"
@@ -33,8 +33,11 @@ ACCEPT_KEYWORDS="ppc"
 # Env vars to expand into USE vars. Modifying this requires prior
 # discussion on gentoo-dev@gentoo.org. Flat profiles also need to
 # be updated appropriately.
-USE_EXPAND="FRITZCAPI_CARDS FCDSL_CARDS VIDEO_CARDS INPUT_DEVICES LINGUAS"
+USE_EXPAND="FRITZCAPI_CARDS FCDSL_CARDS VIDEO_CARDS INPUT_DEVICES LINGUAS USERLAND KERNEL LIBC"
 
 CONFIG_PROTECT="/etc /var/qmail/control /usr/share/config /usr/kde/2/share/config /usr/kde/3/share/config"
 CONFIG_PROTECT_MASK="/etc/gconf"
 
+USERLAND=GNU
+KERNEL=linux
+LIBC=glibc
diff --git a/profiles/default-ppc-1.4/make.defaults b/profiles/default-ppc-1.4/make.defaults
index 23ae5cb2678f..0eee96c182d6 100644
--- a/profiles/default-ppc-1.4/make.defaults
+++ b/profiles/default-ppc-1.4/make.defaults
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-ppc-1.4/make.defaults,v 1.27 2005/04/24 10:05:03 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-ppc-1.4/make.defaults,v 1.28 2005/05/01 01:54:49 spb Exp $
 # System-wide defaults for the Portage system
 
 GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb acl ncurses"
@@ -35,8 +35,11 @@ ACCEPT_KEYWORDS="ppc"
 # Env vars to expand into USE vars. Modifying this requires prior
 # discussion on gentoo-dev@gentoo.org. Flat profiles also need to
 # be updated appropriately.
-USE_EXPAND="FRITZCAPI_CARDS FCDSL_CARDS VIDEO_CARDS INPUT_DEVICES LINGUAS"
+USE_EXPAND="FRITZCAPI_CARDS FCDSL_CARDS VIDEO_CARDS INPUT_DEVICES LINGUAS USERLAND KERNEL LIBC"
 
 CONFIG_PROTECT="/etc /var/qmail/control /usr/share/config /usr/kde/2/share/config /usr/kde/3/share/config"
 CONFIG_PROTECT_MASK="/etc/gconf"
 
+USERLAND=GNU
+KERNEL=linux
+LIBC=glibc
diff --git a/profiles/default-ppc-2004.0/make.defaults b/profiles/default-ppc-2004.0/make.defaults
index 244b088010a0..ff8ca8086f9c 100644
--- a/profiles/default-ppc-2004.0/make.defaults
+++ b/profiles/default-ppc-2004.0/make.defaults
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-ppc-2004.0/make.defaults,v 1.14 2005/04/24 10:05:03 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-ppc-2004.0/make.defaults,v 1.15 2005/05/01 01:54:49 spb Exp $
 # Gentoo Linux PowerPC system defaults
 
 ACCEPT_KEYWORDS="ppc"
@@ -16,8 +16,11 @@ USE="dvd jpeg nls gif png truetype ppc fortran"
 # Env vars to expand into USE vars. Modifying this requires prior
 # discussion on gentoo-dev@gentoo.org. Flat profiles also need to
 # be updated appropriately.
-USE_EXPAND="FRITZCAPI_CARDS FCDSL_CARDS VIDEO_CARDS INPUT_DEVICES LINGUAS"
+USE_EXPAND="FRITZCAPI_CARDS FCDSL_CARDS VIDEO_CARDS INPUT_DEVICES LINGUAS USERLAND KERNEL LIBC"
 
 CONFIG_PROTECT="/etc /var/qmail/control /usr/share/config /usr/kde/2/share/config /usr/kde/3/share/config"
 CONFIG_PROTECT_MASK="/etc/gconf"
 
+USERLAND=GNU
+KERNEL=linux
+LIBC=glibc
diff --git a/profiles/default-ppc-2004.1/make.defaults b/profiles/default-ppc-2004.1/make.defaults
index 7b95747274ea..b760c92977d2 100644
--- a/profiles/default-ppc-2004.1/make.defaults
+++ b/profiles/default-ppc-2004.1/make.defaults
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-ppc-2004.1/make.defaults,v 1.14 2005/04/24 10:05:03 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-ppc-2004.1/make.defaults,v 1.15 2005/05/01 01:54:49 spb Exp $
 # Gentoo Linux PowerPC system defaults
 
 ACCEPT_KEYWORDS="ppc"
@@ -16,8 +16,11 @@ USE="dvd jpeg nls gif png truetype ppc fortran"
 # Env vars to expand into USE vars. Modifying this requires prior
 # discussion on gentoo-dev@gentoo.org. Flat profiles also need to
 # be updated appropriately.
-USE_EXPAND="FRITZCAPI_CARDS FCDSL_CARDS VIDEO_CARDS INPUT_DEVICES LINGUAS"
+USE_EXPAND="FRITZCAPI_CARDS FCDSL_CARDS VIDEO_CARDS INPUT_DEVICES LINGUAS USERLAND KERNEL LIBC"
 
 CONFIG_PROTECT="/etc /var/qmail/control /usr/share/config /usr/kde/2/share/config /usr/kde/3/share/config"
 CONFIG_PROTECT_MASK="/etc/gconf"
 
+USERLAND=GNU
+KERNEL=linux
+LIBC=glibc
diff --git a/profiles/default-ppc-2004.2/make.defaults b/profiles/default-ppc-2004.2/make.defaults
index b3a667932cdc..407a58b823f2 100644
--- a/profiles/default-ppc-2004.2/make.defaults
+++ b/profiles/default-ppc-2004.2/make.defaults
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-ppc-2004.2/make.defaults,v 1.14 2005/04/24 10:05:03 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-ppc-2004.2/make.defaults,v 1.15 2005/05/01 01:54:49 spb Exp $
 # Gentoo Linux PowerPC system defaults
 
 ACCEPT_KEYWORDS="ppc"
@@ -16,8 +16,11 @@ USE="dvd jpeg nls gif png truetype ppc fortran"
 # Env vars to expand into USE vars. Modifying this requires prior
 # discussion on gentoo-dev@gentoo.org. Flat profiles also need to
 # be updated appropriately.
-USE_EXPAND="FRITZCAPI_CARDS FCDSL_CARDS VIDEO_CARDS INPUT_DEVICES LINGUAS"
+USE_EXPAND="FRITZCAPI_CARDS FCDSL_CARDS VIDEO_CARDS INPUT_DEVICES LINGUAS USERLAND KERNEL LIBC"
 
 CONFIG_PROTECT="/etc /var/qmail/control /usr/share/config /usr/kde/2/share/config /usr/kde/3/share/config"
 CONFIG_PROTECT_MASK="/etc/gconf"
 
+USERLAND=GNU
+KERNEL=linux
+LIBC=glibc
diff --git a/profiles/default-ppc-2004.3/make.defaults b/profiles/default-ppc-2004.3/make.defaults
index be05eb04dbf7..65a24e3e07e3 100644
--- a/profiles/default-ppc-2004.3/make.defaults
+++ b/profiles/default-ppc-2004.3/make.defaults
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-ppc-2004.3/make.defaults,v 1.12 2005/04/24 10:05:03 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-ppc-2004.3/make.defaults,v 1.13 2005/05/01 01:54:49 spb Exp $
 # Gentoo Linux PowerPC system defaults
 
 ACCEPT_KEYWORDS="ppc"
@@ -16,8 +16,11 @@ USE="unicode pam dvd jpeg nls gif pam png truetype ppc fortran"
 # Env vars to expand into USE vars. Modifying this requires prior
 # discussion on gentoo-dev@gentoo.org. Flat profiles also need to
 # be updated appropriately.
-USE_EXPAND="FRITZCAPI_CARDS FCDSL_CARDS VIDEO_CARDS INPUT_DEVICES LINGUAS"
+USE_EXPAND="FRITZCAPI_CARDS FCDSL_CARDS VIDEO_CARDS INPUT_DEVICES LINGUAS USERLAND KERNEL LIBC"
 
 CONFIG_PROTECT="/etc /var/qmail/control /usr/share/config /usr/kde/2/share/config /usr/kde/3/share/config"
 CONFIG_PROTECT_MASK="/etc/gconf"
 
+USERLAND=GNU
+KERNEL=linux
+LIBC=glibc
diff --git a/profiles/default-ppc/make.defaults b/profiles/default-ppc/make.defaults
index 1383a4cd6c2c..40cb7afe54f9 100644
--- a/profiles/default-ppc/make.defaults
+++ b/profiles/default-ppc/make.defaults
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-ppc/make.defaults,v 1.15 2005/04/24 10:05:03 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-ppc/make.defaults,v 1.16 2005/05/01 01:54:49 spb Exp $
 # System-wide defaults for the Portage system
 
 ARCH="ppc"
@@ -29,7 +29,7 @@ ACCEPT_KEYWORDS="ppc"
 # Env vars to expand into USE vars. Modifying this requires prior
 # discussion on gentoo-dev@gentoo.org. Flat profiles also need to
 # be updated appropriately.
-USE_EXPAND="FRITZCAPI_CARDS FCDSL_CARDS VIDEO_CARDS INPUT_DEVICES LINGUAS"
+USE_EXPAND="FRITZCAPI_CARDS FCDSL_CARDS VIDEO_CARDS INPUT_DEVICES LINGUAS USERLAND KERNEL LIBC"
 
 CONFIG_PROTECT="/etc /var/qmail/control /usr/share/config /usr/kde/2/share/config /usr/kde/3/share/config"
 CONFIG_PROTECT_MASK="/etc/gconf"
diff --git a/profiles/default-ppc64-2004.2/make.defaults b/profiles/default-ppc64-2004.2/make.defaults
index d311e4f6169e..a5cfea45b364 100644
--- a/profiles/default-ppc64-2004.2/make.defaults
+++ b/profiles/default-ppc64-2004.2/make.defaults
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-ppc64-2004.2/make.defaults,v 1.14 2005/04/24 10:05:03 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-ppc64-2004.2/make.defaults,v 1.15 2005/05/01 01:54:49 spb Exp $
 # System-wide defaults for the Portage system
 
 GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb acl ncurses"
@@ -36,8 +36,11 @@ ACCEPT_KEYWORDS="ppc64"
 # Env vars to expand into USE vars. Modifying this requires prior
 # discussion on gentoo-dev@gentoo.org. Flat profiles also need to
 # be updated appropriately.
-USE_EXPAND="FRITZCAPI_CARDS FCDSL_CARDS VIDEO_CARDS INPUT_DEVICES LINGUAS"
+USE_EXPAND="FRITZCAPI_CARDS FCDSL_CARDS VIDEO_CARDS INPUT_DEVICES LINGUAS USERLAND KERNEL LIBC"
 
 CONFIG_PROTECT="/etc /var/qmail/control /usr/share/config /usr/kde/2/share/config /usr/kde/3/share/config"
 CONFIG_PROTECT_MASK="/etc/gconf"
 
+USERLAND=GNU
+KERNEL=linux
+LIBC=glibc
diff --git a/profiles/default-ppc64-2004.3/make.defaults b/profiles/default-ppc64-2004.3/make.defaults
index 5b80e415bffb..fefe78c24dd2 100644
--- a/profiles/default-ppc64-2004.3/make.defaults
+++ b/profiles/default-ppc64-2004.3/make.defaults
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-ppc64-2004.3/make.defaults,v 1.11 2005/04/24 10:05:04 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-ppc64-2004.3/make.defaults,v 1.12 2005/05/01 01:54:49 spb Exp $
 # System-wide defaults for the Portage system
 
 GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb acl ncurses"
@@ -36,8 +36,11 @@ ACCEPT_KEYWORDS="ppc64"
 # Env vars to expand into USE vars. Modifying this requires prior
 # discussion on gentoo-dev@gentoo.org. Flat profiles also need to
 # be updated appropriately.
-USE_EXPAND="FRITZCAPI_CARDS FCDSL_CARDS VIDEO_CARDS INPUT_DEVICES LINGUAS"
+USE_EXPAND="FRITZCAPI_CARDS FCDSL_CARDS VIDEO_CARDS INPUT_DEVICES LINGUAS USERLAND KERNEL LIBC"
 
 CONFIG_PROTECT="/etc /var/qmail/control /usr/share/config /usr/kde/2/share/config /usr/kde/3/share/config"
 CONFIG_PROTECT_MASK="/etc/gconf"
 
+USERLAND=GNU
+KERNEL=linux
+LIBC=glibc
diff --git a/profiles/default-sparc-1.4/make.defaults b/profiles/default-sparc-1.4/make.defaults
index 70228db412b7..5425bdd00b95 100644
--- a/profiles/default-sparc-1.4/make.defaults
+++ b/profiles/default-sparc-1.4/make.defaults
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-sparc-1.4/make.defaults,v 1.25 2005/04/24 10:05:04 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-sparc-1.4/make.defaults,v 1.26 2005/05/01 01:54:49 spb Exp $
 # System-wide defaults for the Portage system
 
 ARCH="sparc"
@@ -33,8 +33,11 @@ ACCEPT_KEYWORDS="sparc"
 # Env vars to expand into USE vars. Modifying this requires prior
 # discussion on gentoo-dev@gentoo.org. Flat profiles also need to
 # be updated appropriately.
-USE_EXPAND="FRITZCAPI_CARDS FCDSL_CARDS VIDEO_CARDS INPUT_DEVICES LINGUAS"
+USE_EXPAND="FRITZCAPI_CARDS FCDSL_CARDS VIDEO_CARDS INPUT_DEVICES LINGUAS USERLAND KERNEL LIBC"
 
 CONFIG_PROTECT="/etc /var/qmail/control /usr/share/config /usr/kde/2/share/config /usr/kde/3/share/config"
 CONFIG_PROTECT_MASK="/etc/gconf"
 
+USERLAND=GNU
+KERNEL=linux
+LIBC=glibc
diff --git a/profiles/default-sparc-2004.0/make.defaults b/profiles/default-sparc-2004.0/make.defaults
index 7af6ee793bcc..0d7579433fed 100644
--- a/profiles/default-sparc-2004.0/make.defaults
+++ b/profiles/default-sparc-2004.0/make.defaults
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-sparc-2004.0/make.defaults,v 1.14 2005/04/24 10:05:04 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-sparc-2004.0/make.defaults,v 1.15 2005/05/01 01:54:49 spb Exp $
 # System-wide defaults for the Portage system
 
 GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb acl ncurses"
@@ -35,8 +35,11 @@ ACCEPT_KEYWORDS="sparc"
 # Env vars to expand into USE vars. Modifying this requires prior
 # discussion on gentoo-dev@gentoo.org. Flat profiles also need to
 # be updated appropriately.
-USE_EXPAND="FRITZCAPI_CARDS FCDSL_CARDS VIDEO_CARDS INPUT_DEVICES LINGUAS"
+USE_EXPAND="FRITZCAPI_CARDS FCDSL_CARDS VIDEO_CARDS INPUT_DEVICES LINGUAS USERLAND KERNEL LIBC"
 
 CONFIG_PROTECT="/etc /var/qmail/control /usr/share/config /usr/kde/2/share/config /usr/kde/3/share/config"
 CONFIG_PROTECT_MASK="/etc/gconf"
 
+USERLAND=GNU
+KERNEL=linux
+LIBC=glibc
diff --git a/profiles/default-sparc64-1.4/make.defaults b/profiles/default-sparc64-1.4/make.defaults
index 89750bfce72d..3bec445828ff 100644
--- a/profiles/default-sparc64-1.4/make.defaults
+++ b/profiles/default-sparc64-1.4/make.defaults
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-sparc64-1.4/make.defaults,v 1.32 2005/04/24 10:05:04 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-sparc64-1.4/make.defaults,v 1.33 2005/05/01 01:54:49 spb Exp $
 # System-wide defaults for the Portage system
 
 #Experimental: trying to use these USE variables to build up from stage 2->3 
@@ -39,8 +39,11 @@ FEATURES="sandbox ccache"
 # Env vars to expand into USE vars. Modifying this requires prior
 # discussion on gentoo-dev@gentoo.org. Flat profiles also need to
 # be updated appropriately.
-USE_EXPAND="FRITZCAPI_CARDS FCDSL_CARDS VIDEO_CARDS INPUT_DEVICES LINGUAS"
+USE_EXPAND="FRITZCAPI_CARDS FCDSL_CARDS VIDEO_CARDS INPUT_DEVICES LINGUAS USERLAND KERNEL LIBC"
 
 CONFIG_PROTECT="/etc /var/qmail/control /usr/share/config /usr/kde/2/share/config /usr/kde/3/share/config"
 CONFIG_PROTECT_MASK="/etc/gconf"
 
+USERLAND=GNU
+KERNEL=linux
+LIBC=glibc
diff --git a/profiles/default-sparc64-2004.0/make.defaults b/profiles/default-sparc64-2004.0/make.defaults
index 204d2c331019..14c66e94e857 100644
--- a/profiles/default-sparc64-2004.0/make.defaults
+++ b/profiles/default-sparc64-2004.0/make.defaults
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-sparc64-2004.0/make.defaults,v 1.14 2005/04/24 10:05:04 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-sparc64-2004.0/make.defaults,v 1.15 2005/05/01 01:54:49 spb Exp $
 # System-wide defaults for the Portage system
 
 #Experimental: trying to use these USE variables to build up from stage 2->3 
@@ -39,8 +39,11 @@ FEATURES="sandbox ccache"
 # Env vars to expand into USE vars. Modifying this requires prior
 # discussion on gentoo-dev@gentoo.org. Flat profiles also need to
 # be updated appropriately.
-USE_EXPAND="FRITZCAPI_CARDS FCDSL_CARDS VIDEO_CARDS INPUT_DEVICES LINGUAS"
+USE_EXPAND="FRITZCAPI_CARDS FCDSL_CARDS VIDEO_CARDS INPUT_DEVICES LINGUAS USERLAND KERNEL LIBC"
 
 CONFIG_PROTECT="/etc /var/qmail/control /usr/share/config /usr/kde/2/share/config /usr/kde/3/share/config"
 CONFIG_PROTECT_MASK="/etc/gconf"
 
+USERLAND=GNU
+KERNEL=linux
+LIBC=glibc
diff --git a/profiles/default-x86-2004.2/make.defaults b/profiles/default-x86-2004.2/make.defaults
index ab45f009b2e6..3a2e64b91434 100644
--- a/profiles/default-x86-2004.2/make.defaults
+++ b/profiles/default-x86-2004.2/make.defaults
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-x86-2004.2/make.defaults,v 1.14 2005/04/24 10:05:04 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-x86-2004.2/make.defaults,v 1.15 2005/05/01 01:54:49 spb Exp $
 # System-wide defaults for the >=gcc 3.2 Portage system
 
 #Experimental: trying to use these USE variables to build up from stage 2->3
@@ -21,8 +21,11 @@ ACCEPT_KEYWORDS="x86"
 # Env vars to expand into USE vars. Modifying this requires prior
 # discussion on gentoo-dev@gentoo.org. Flat profiles also need to
 # be updated appropriately.
-USE_EXPAND="FRITZCAPI_CARDS FCDSL_CARDS VIDEO_CARDS INPUT_DEVICES LINGUAS"
+USE_EXPAND="FRITZCAPI_CARDS FCDSL_CARDS VIDEO_CARDS INPUT_DEVICES LINGUAS USERLAND KERNEL LIBC"
 
 CONFIG_PROTECT="/etc /var/qmail/control /usr/share/config /usr/kde/2/share/config /usr/kde/3/share/config"
 CONFIG_PROTECT_MASK="/etc/gconf"
 
+USERLAND=GNU
+KERNEL=linux
+LIBC=glibc
diff --git a/profiles/default-x86-obsd-2004/make.defaults b/profiles/default-x86-obsd-2004/make.defaults
index 5f2e6ad7c6ed..fc14e78af285 100644
--- a/profiles/default-x86-obsd-2004/make.defaults
+++ b/profiles/default-x86-obsd-2004/make.defaults
@@ -24,11 +24,13 @@ ACCEPT_KEYWORDS="x86-obsd"
 CC="gcc"
 CXX="g++"
 USERLAND="BSD"
+KERNEL="OpenBSD"
+LIBC="OpenBSD"
 
 # Env vars to expand into USE vars. Modifying this requires prior
 # discussion on gentoo-dev@gentoo.org. Flat profiles also need to
 # be updated appropriately.
-USE_EXPAND="FRITZCAPI_CARDS FCDSL_CARDS VIDEO_CARDS INPUT_DEVICES LINGUAS"
+USE_EXPAND="FRITZCAPI_CARDS FCDSL_CARDS VIDEO_CARDS INPUT_DEVICES LINGUAS USERLAND KERNEL LIBC"
 
 CONFIG_PROTECT="/etc /var/qmail/control /usr/share/config /usr/kde/2/share/config /usr/kde/3/share/config"
 CONFIG_PROTECT_MASK="/etc/gconf"
diff --git a/profiles/gcc33-sparc64-1.4/make.defaults b/profiles/gcc33-sparc64-1.4/make.defaults
index f645ae4cc1af..9c68e13cf685 100644
--- a/profiles/gcc33-sparc64-1.4/make.defaults
+++ b/profiles/gcc33-sparc64-1.4/make.defaults
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/gcc33-sparc64-1.4/make.defaults,v 1.14 2005/04/24 10:05:04 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/gcc33-sparc64-1.4/make.defaults,v 1.15 2005/05/01 01:54:49 spb Exp $
 # System-wide defaults for the Portage system
 
 ARCH="sparc"
@@ -34,8 +34,11 @@ FEATURES="sandbox ccache"
 # Env vars to expand into USE vars. Modifying this requires prior
 # discussion on gentoo-dev@gentoo.org. Flat profiles also need to
 # be updated appropriately.
-USE_EXPAND="FRITZCAPI_CARDS FCDSL_CARDS VIDEO_CARDS INPUT_DEVICES LINGUAS"
+USE_EXPAND="FRITZCAPI_CARDS FCDSL_CARDS VIDEO_CARDS INPUT_DEVICES LINGUAS USERLAND KERNEL LIBC"
 
 CONFIG_PROTECT="/etc /var/qmail/control /usr/share/config /usr/kde/2/share/config /usr/kde/3/share/config"
 CONFIG_PROTECT_MASK="/etc/gconf"
 
+USERLAND=GNU
+KERNEL=linux
+LIBC=glibc
diff --git a/profiles/gcc34-amd64-2004.1/make.defaults b/profiles/gcc34-amd64-2004.1/make.defaults
index 4ae528c5db4d..7b0eb0a55ea4 100644
--- a/profiles/gcc34-amd64-2004.1/make.defaults
+++ b/profiles/gcc34-amd64-2004.1/make.defaults
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/gcc34-amd64-2004.1/make.defaults,v 1.16 2005/04/24 10:05:04 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/gcc34-amd64-2004.1/make.defaults,v 1.17 2005/05/01 01:54:49 spb Exp $
 # System-wide defaults for the gcc 3.3 Portage system
 
 #Experimental: trying to use these USE variables to build up from stage 2->3
@@ -25,8 +25,11 @@ FEATURES="-sandbox"
 # Env vars to expand into USE vars. Modifying this requires prior
 # discussion on gentoo-dev@gentoo.org. Flat profiles also need to
 # be updated appropriately.
-USE_EXPAND="FRITZCAPI_CARDS FCDSL_CARDS VIDEO_CARDS INPUT_DEVICES LINGUAS"
+USE_EXPAND="FRITZCAPI_CARDS FCDSL_CARDS VIDEO_CARDS INPUT_DEVICES LINGUAS USERLAND KERNEL LIBC"
 
 CONFIG_PROTECT="/etc /var/qmail/control /usr/share/config /usr/kde/2/share/config /usr/kde/3/share/config"
 CONFIG_PROTECT_MASK="/etc/gconf"
 
+USERLAND=GNU
+KERNEL=linux
+LIBC=glibc
diff --git a/profiles/gcc34-x86-2004.2/make.defaults b/profiles/gcc34-x86-2004.2/make.defaults
index bca3b9552910..a2673dc3af4b 100644
--- a/profiles/gcc34-x86-2004.2/make.defaults
+++ b/profiles/gcc34-x86-2004.2/make.defaults
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/gcc34-x86-2004.2/make.defaults,v 1.17 2005/04/24 10:05:04 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/gcc34-x86-2004.2/make.defaults,v 1.18 2005/05/01 01:54:49 spb Exp $
 # System-wide defaults for the >=gcc 3.2 Portage system
 
 #Experimental: trying to use these USE variables to build up from stage 2->3
@@ -23,8 +23,11 @@ CXXFLAGS="${CFLAGS}"
 # Env vars to expand into USE vars. Modifying this requires prior
 # discussion on gentoo-dev@gentoo.org. Flat profiles also need to
 # be updated appropriately.
-USE_EXPAND="FRITZCAPI_CARDS FCDSL_CARDS VIDEO_CARDS INPUT_DEVICES LINGUAS"
+USE_EXPAND="FRITZCAPI_CARDS FCDSL_CARDS VIDEO_CARDS INPUT_DEVICES LINGUAS USERLAND KERNEL LIBC"
 
 CONFIG_PROTECT="/etc /var/qmail/control /usr/share/config /usr/kde/2/share/config /usr/kde/3/share/config"
 CONFIG_PROTECT_MASK="/etc/gconf"
 
+USERLAND=GNU
+KERNEL=linux
+LIBC=glibc
diff --git a/profiles/hardened-x86-2004.0/make.defaults b/profiles/hardened-x86-2004.0/make.defaults
index 2bf3d6fd9187..b00dc3e95508 100644
--- a/profiles/hardened-x86-2004.0/make.defaults
+++ b/profiles/hardened-x86-2004.0/make.defaults
@@ -1,6 +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-x86-2004.0/make.defaults,v 1.14 2005/04/24 10:05:04 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened-x86-2004.0/make.defaults,v 1.15 2005/05/01 01:54:49 spb Exp $
 
 GRP_STAGE23_USE="x86 berkdb crypt readline nls ssl tcpd zlib pam pic pie hardened"
 
@@ -36,8 +36,11 @@ FEATURES="sandbox sfperms strict"
 # Env vars to expand into USE vars. Modifying this requires prior
 # discussion on gentoo-dev@gentoo.org. Flat profiles also need to
 # be updated appropriately.
-USE_EXPAND="FRITZCAPI_CARDS FCDSL_CARDS VIDEO_CARDS INPUT_DEVICES LINGUAS"
+USE_EXPAND="FRITZCAPI_CARDS FCDSL_CARDS VIDEO_CARDS INPUT_DEVICES LINGUAS USERLAND KERNEL LIBC"
 
 CONFIG_PROTECT="/etc /var/qmail/control /usr/share/config /usr/kde/2/share/config /usr/kde/3/share/config"
 CONFIG_PROTECT_MASK="/etc/gconf"
 
+USERLAND=GNU
+KERNEL=linux
+LIBC=glibc
diff --git a/profiles/n32-mips-2004.1/make.defaults b/profiles/n32-mips-2004.1/make.defaults
index ae836c97aee4..5ccf76e37f3f 100644
--- a/profiles/n32-mips-2004.1/make.defaults
+++ b/profiles/n32-mips-2004.1/make.defaults
@@ -34,8 +34,11 @@ ACCEPT_KEYWORDS="mips ~mips"
 # Env vars to expand into USE vars. Modifying this requires prior
 # discussion on gentoo-dev@gentoo.org. Flat profiles also need to
 # be updated appropriately.
-USE_EXPAND="FRITZCAPI_CARDS FCDSL_CARDS VIDEO_CARDS INPUT_DEVICES LINGUAS"
+USE_EXPAND="FRITZCAPI_CARDS FCDSL_CARDS VIDEO_CARDS INPUT_DEVICES LINGUAS USERLAND KERNEL LIBC"
 
 CONFIG_PROTECT="/etc /var/qmail/control /usr/share/config /usr/kde/2/share/config /usr/kde/3/share/config"
 CONFIG_PROTECT_MASK="/etc/gconf"
 
+USERLAND=GNU
+KERNEL=linux
+LIBC=glibc
diff --git a/profiles/uclibc/make.defaults b/profiles/uclibc/make.defaults
index 1b0aada23992..ce265871e810 100644
--- a/profiles/uclibc/make.defaults
+++ b/profiles/uclibc/make.defaults
@@ -7,6 +7,8 @@ CXXFLAGS="${CFLAGS}"
 
 PORTAGE_LIBC="uClibc"
 
+LIBC=uclibc
+
 # 
 # FEATURES are settings that affect the functionality of portage. Most of
 #     these settings are for developer use, but some are available to non-