Index: arch/mips/make.defaults
===================================================================
RCS file: /var/cvsroot/gentoo-x86/profiles/arch/mips/make.defaults,v
retrieving revision 1.8
diff -u -r1.8 make.defaults
--- arch/mips/make.defaults	21 Feb 2011 17:14:51 -0000	1.8
+++ arch/mips/make.defaults	17 Nov 2011 00:59:38 -0000
@@ -13,8 +13,6 @@
 
 USE="-fortran -openmp"
 
-STAGE1_USE="nptl nptlonly"
-
 CHOST="mips-unknown-linux-gnu"
 
 # 2010/12/06 - Matt Turner <mattst88@gentoo.org>
Index: arch/sh/make.defaults
===================================================================
RCS file: /var/cvsroot/gentoo-x86/profiles/arch/sh/make.defaults,v
retrieving revision 1.1
diff -u -r1.1 make.defaults
--- arch/sh/make.defaults	1 Apr 2008 17:40:02 -0000	1.1
+++ arch/sh/make.defaults	17 Nov 2011 00:59:38 -0000
@@ -11,7 +11,9 @@
 CFLAGS="-O2"
 CXXFLAGS="${CFLAGS}"
 
-# We define our own STAGE1_USE, since we need to disable ssp.
-STAGE1_USE="nptl nptlonly unicode nossp"
+# Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> (16 Nov 2011)
+# Rename STAGE1_USE to BOOTSTRAP_USE and stack it to the parent value
+# We need to disable ssp.
+BOOTSTRAP_USE="${BOOTSTRAP_USE} nossp"
 
 USE="nossp"
Index: base/make.defaults
===================================================================
RCS file: /var/cvsroot/gentoo-x86/profiles/base/make.defaults,v
retrieving revision 1.71
diff -u -r1.71 make.defaults
--- base/make.defaults	22 Aug 2011 21:43:33 -0000	1.71
+++ base/make.defaults	17 Nov 2011 00:59:38 -0000
@@ -100,3 +100,7 @@
 # We usually don't want python to (re)write .py[co] files during phase runs
 # since it could cause sandbox violations
 PYTHONDONTWRITEBYTECODE="1"
+
+# Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> (16 Nov 2011)
+# Add default USE value for bootstrap and rename it from STAGE1_USE to BOOTSTRAP_USE
+BOOTSTRAP_USE="cxx unicode"
Index: features/32bit-native/make.defaults
===================================================================
RCS file: /var/cvsroot/gentoo-x86/profiles/features/32bit-native/make.defaults,v
retrieving revision 1.1
diff -u -r1.1 make.defaults
--- features/32bit-native/make.defaults	1 Apr 2008 17:41:06 -0000	1.1
+++ features/32bit-native/make.defaults	17 Nov 2011 00:59:40 -0000
@@ -5,7 +5,6 @@
 FEATURES="-multilib-strict"
 
 USE="-gcc64"
-STAGE1_USE="nptl nptlonly unicode"
 
 MULTILIB_STRICT_DIRS=""
 MULTILIB_STRICT_DENY=""
Index: features/32bit-userland/make.defaults
===================================================================
RCS file: /var/cvsroot/gentoo-x86/profiles/features/32bit-userland/make.defaults,v
retrieving revision 1.3
diff -u -r1.3 make.defaults
--- features/32bit-userland/make.defaults	21 Mar 2011 04:41:29 -0000	1.3
+++ features/32bit-userland/make.defaults	17 Nov 2011 00:59:40 -0000
@@ -2,6 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/profiles/features/32bit-userland/make.defaults,v 1.3 2011/03/21 04:41:29 vapier Exp $
 
+# Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> (16 Nov 2011)
+# Rename STAGE1_USE to BOOTSTRAP_USE and stack it to the parent value
 # We always need gcc64 for 32bit-userland
-STAGE1_USE="nptl nptlonly unicode gcc64"
+BOOTSTRAP_USE="${BOOTSTRAP_USE} gcc64"
 USE="gcc64"
Index: features/64bit-native/make.defaults
===================================================================
RCS file: /var/cvsroot/gentoo-x86/profiles/features/64bit-native/make.defaults,v
retrieving revision 1.2
diff -u -r1.2 make.defaults
--- features/64bit-native/make.defaults	14 Nov 2008 15:43:49 -0000	1.2
+++ features/64bit-native/make.defaults	17 Nov 2011 00:59:40 -0000
@@ -6,7 +6,6 @@
 SYMLINK_LIB="yes"
 
 USE="-gcc64"
-STAGE1_USE="nptl nptlonly unicode"
 
 # Since we're doing a pure 64-bit, we want LIBDIR to be lib64
 LIBDIR_amd64="lib64"
Index: features/multilib/make.defaults
===================================================================
RCS file: /var/cvsroot/gentoo-x86/profiles/features/multilib/make.defaults,v
retrieving revision 1.6
diff -u -r1.6 make.defaults
--- features/multilib/make.defaults	30 Apr 2011 17:53:11 -0000	1.6
+++ features/multilib/make.defaults	17 Nov 2011 00:59:40 -0000
@@ -2,8 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/profiles/features/multilib/make.defaults,v 1.6 2011/04/30 17:53:11 abcd Exp $
 
+# Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> (16 Nov 2011)
+# Rename STAGE1_USE to BOOTSTRAP_USE and stack it to the parent value
 # This is so we build with multilib from the start
-STAGE1_USE="multilib nptl nptlonly unicode"
+BOOTSTRAP_USE="${BOOTSTRAP_USE} multilib"
 
 # FEATURES="multilib-strict" specific settings.
 MULTILIB_STRICT_DIRS="/lib32 /lib /usr/lib32 /usr/lib /usr/kde/*/lib32 /usr/kde/*/lib /usr/qt/*/lib32 /usr/qt/*/lib /usr/X11R6/lib32 /usr/X11R6/lib"
Index: hardened/make.defaults
===================================================================
RCS file: /var/cvsroot/gentoo-x86/profiles/hardened/make.defaults,v
retrieving revision 1.19
diff -u -r1.19 make.defaults
--- hardened/make.defaults	7 Jul 2009 18:26:48 -0000	1.19
+++ hardened/make.defaults	17 Nov 2011 00:59:40 -0000
@@ -2,7 +2,6 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/profiles/hardened/make.defaults,v 1.19 2009/07/07 18:26:48 gengor Exp $
 
-STAGE1_USE="hardened pic"
 USE="sysfs urandom xorg"
 INPUT_DEVICES="mouse keyboard evdev"
 
@@ -12,3 +11,7 @@
 # direction with how LDFLAGS will be set by default, this entry
 # may move.
 LDFLAGS="-Wl,-O1"
+
+# Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> (16 Nov 2011)
+# Rename STAGE1_USE to BOOTSTRAP_USE and stack it to the parent value
+BOOTSTRAP_USE="${BOOTSTRAP_USE} hardened pic"
Index: hardened/linux/make.defaults
===================================================================
RCS file: /var/cvsroot/gentoo-x86/profiles/hardened/linux/make.defaults,v
retrieving revision 1.12
diff -u -r1.12 make.defaults
--- hardened/linux/make.defaults	31 Aug 2011 22:47:29 -0000	1.12
+++ hardened/linux/make.defaults	17 Nov 2011 00:59:40 -0000
@@ -2,6 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/make.defaults,v 1.12 2011/08/31 22:47:29 zorry Exp $
 
-STAGE1_USE="hardened nptl nptlonly pax_kernel pic -jit"
+# Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> (16 Nov 2011)
+# Rename STAGE1_USE to BOOTSTRAP_USE and stack it to the parent value
+BOOTSTRAP_USE="${BOOTSTRAP_USE} hardened pax_kernel pic -jit"
 
 USE="-fortran hardened -ipv6 -jit pax_kernel pic sysfs -unicode urandom"
Index: hardened/linux/amd64/make.defaults
===================================================================
RCS file: /var/cvsroot/gentoo-x86/profiles/hardened/linux/amd64/make.defaults,v
retrieving revision 1.5
diff -u -r1.5 make.defaults
--- hardened/linux/amd64/make.defaults	6 Mar 2011 00:49:58 -0000	1.5
+++ hardened/linux/amd64/make.defaults	17 Nov 2011 00:59:40 -0000
@@ -6,6 +6,3 @@
 
 CFLAGS="-O2 -pipe"
 CXXFLAGS="${CFLAGS}"
-
-# STAGE1_USE does not stack
-STAGE1_USE="hardened multilib nptl nptlonly"
Index: hardened/linux/amd64/no-multilib/make.defaults
===================================================================
RCS file: /var/cvsroot/gentoo-x86/profiles/hardened/linux/amd64/no-multilib/make.defaults,v
retrieving revision 1.1
diff -u -r1.1 make.defaults
--- hardened/linux/amd64/no-multilib/make.defaults	25 Nov 2010 13:22:12 -0000	1.1
+++ hardened/linux/amd64/no-multilib/make.defaults	17 Nov 2011 00:59:40 -0000
@@ -6,5 +6,3 @@
 ACCEPT_KEYWORDS="${ARCH}"
 
 MULTILIB_ABIS="amd64"
-
-STAGE1_USE="hardened nptl nptlonly pic"
Index: hardened/linux/ia64/make.defaults
===================================================================
RCS file: /var/cvsroot/gentoo-x86/profiles/hardened/linux/ia64/make.defaults,v
retrieving revision 1.2
diff -u -r1.2 make.defaults
--- hardened/linux/ia64/make.defaults	13 Feb 2011 18:09:39 -0000	1.2
+++ hardened/linux/ia64/make.defaults	17 Nov 2011 00:59:40 -0000
@@ -1,6 +1,3 @@
 # Copyright 1999-2011 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/ia64/make.defaults,v 1.2 2011/02/13 18:09:39 arfrever Exp $
-
-# STAGE1_USE does not stack
-STAGE1_USE="hardened nptl nptlonly pic"
Index: hardened/linux/powerpc/ppc32/make.defaults
===================================================================
RCS file: /var/cvsroot/gentoo-x86/profiles/hardened/linux/powerpc/ppc32/make.defaults,v
retrieving revision 1.2
diff -u -r1.2 make.defaults
--- hardened/linux/powerpc/ppc32/make.defaults	13 Feb 2011 18:09:39 -0000	1.2
+++ hardened/linux/powerpc/ppc32/make.defaults	17 Nov 2011 00:59:40 -0000
@@ -1,6 +1,3 @@
 # Copyright 1999-2011 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/powerpc/ppc32/make.defaults,v 1.2 2011/02/13 18:09:39 arfrever Exp $
-
-# STAGE1_USE does not stack
-STAGE1_USE="hardened nptl nptlonly pic"
Index: hardened/linux/powerpc/ppc64/make.defaults
===================================================================
RCS file: /var/cvsroot/gentoo-x86/profiles/hardened/linux/powerpc/ppc64/make.defaults,v
retrieving revision 1.2
diff -u -r1.2 make.defaults
--- hardened/linux/powerpc/ppc64/make.defaults	13 Feb 2011 18:09:39 -0000	1.2
+++ hardened/linux/powerpc/ppc64/make.defaults	17 Nov 2011 00:59:40 -0000
@@ -1,6 +1,3 @@
 # Copyright 1999-2011 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/powerpc/ppc64/make.defaults,v 1.2 2011/02/13 18:09:39 arfrever Exp $
-
-# STAGE1_USE does not stack
-STAGE1_USE="hardened nptl nptlonly pic"
Index: hardened/linux/x86/make.defaults
===================================================================
RCS file: /var/cvsroot/gentoo-x86/profiles/hardened/linux/x86/make.defaults,v
retrieving revision 1.9
diff -u -r1.9 make.defaults
--- hardened/linux/x86/make.defaults	13 Feb 2011 18:09:39 -0000	1.9
+++ hardened/linux/x86/make.defaults	17 Nov 2011 00:59:40 -0000
@@ -9,9 +9,6 @@
 CFLAGS="-march=i686 -O2 -pipe"
 CXXFLAGS="${CFLAGS}"
 
-# STAGE1_USE does not stack
-STAGE1_USE="hardened nptl nptlonly pic"
-
 USE="nptl nptlonly"
 
 # 2006/08/18 - Donnie Berkholz <dberkholz@gentoo.org>
Index: hardened/linux/x86/10.0/make.defaults
===================================================================
RCS file: /var/cvsroot/gentoo-x86/profiles/hardened/linux/x86/10.0/make.defaults,v
retrieving revision 1.2
diff -u -r1.2 make.defaults
--- hardened/linux/x86/10.0/make.defaults	13 Feb 2011 18:09:39 -0000	1.2
+++ hardened/linux/x86/10.0/make.defaults	17 Nov 2011 00:59:40 -0000
@@ -1,6 +1,3 @@
 # Copyright 1999-2011 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/x86/10.0/make.defaults,v 1.2 2011/02/13 18:09:39 arfrever Exp $
-
-# STAGE1_USE does not stack
-STAGE1_USE="hardened nptl nptlonly pic"
Index: uclibc/make.defaults
===================================================================
RCS file: /var/cvsroot/gentoo-x86/profiles/uclibc/make.defaults,v
retrieving revision 1.16
diff -u -r1.16 make.defaults
--- uclibc/make.defaults	12 Dec 2010 19:18:10 -0000	1.16
+++ uclibc/make.defaults	17 Nov 2011 00:59:40 -0000
@@ -1,4 +1,3 @@
-STAGE1_USE="uclibc"
 GRP_STAGE23_USE="ncurses readline zlib uclibc"
 USE="ncurses readline zlib uclibc -fortran -pam -berkdb -ipv6 -pppd"
 CFLAGS="-Os"
@@ -6,3 +5,7 @@
 PORTAGE_LIBC="uClibc"
 ELIBC=uclibc
 FEATURES="sandbox sfperms strict nodoc noinfo noman"
+
+# Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> (16 Nov 2011)
+# Rename STAGE1_USE to BOOTSTRAP_USE and stack it to the parent value
+BOOTSTRAP_USE="${BOOTSTRAP_USE} uclibc"
Index: uclibc/mips/hardened/make.defaults
===================================================================
RCS file: /var/cvsroot/gentoo-x86/profiles/uclibc/mips/hardened/make.defaults,v
retrieving revision 1.5
diff -u -r1.5 make.defaults
--- uclibc/mips/hardened/make.defaults	20 Jun 2005 15:11:27 -0000	1.5
+++ uclibc/mips/hardened/make.defaults	17 Nov 2011 00:59:40 -0000
@@ -1,3 +1,6 @@
-STAGE1_USE="uclibc hardened pic"
 GRP_STAGE23_USE="ncurses readline zlib uclibc hardened pic"
 USE="ncurses readline zlib uclibc hardened pic"
+
+# Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> (16 Nov 2011)
+# Rename STAGE1_USE to BOOTSTRAP_USE and stack it to the parent value
+BOOTSTRAP_USE="${BOOTSTRAP_USE} hardened pic"
Index: uclibc/mips/mipsel/hardened/make.defaults
===================================================================
RCS file: /var/cvsroot/gentoo-x86/profiles/uclibc/mips/mipsel/hardened/make.defaults,v
retrieving revision 1.3
diff -u -r1.3 make.defaults
--- uclibc/mips/mipsel/hardened/make.defaults	20 Jun 2005 15:11:27 -0000	1.3
+++ uclibc/mips/mipsel/hardened/make.defaults	17 Nov 2011 00:59:40 -0000
@@ -1,3 +1,6 @@
-STAGE1_USE="uclibc hardened pic"
 GRP_STAGE23_USE="ncurses readline zlib uclibc hardened pic"
 USE="ncurses readline zlib uclibc hardened pic"
+
+# Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> (16 Nov 2011)
+# Rename STAGE1_USE to BOOTSTRAP_USE and stack it to the parent value
+BOOTSTRAP_USE="${BOOTSTRAP_USE} hardened pic"
Index: uclibc/ppc/hardened/make.defaults
===================================================================
RCS file: /var/cvsroot/gentoo-x86/profiles/uclibc/ppc/hardened/make.defaults,v
retrieving revision 1.5
diff -u -r1.5 make.defaults
--- uclibc/ppc/hardened/make.defaults	20 Jun 2005 15:11:27 -0000	1.5
+++ uclibc/ppc/hardened/make.defaults	17 Nov 2011 00:59:40 -0000
@@ -1,3 +1,6 @@
-STAGE1_USE="uclibc hardened pic"
 GRP_STAGE23_USE="ncurses readline zlib uclibc hardened pic"
 USE="ncurses readline zlib uclibc hardened pic"
+
+# Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> (16 Nov 2011)
+# Rename STAGE1_USE to BOOTSTRAP_USE and stack it to the parent value
+BOOTSTRAP_USE="${BOOTSTRAP_USE} hardened pic"
Index: uclibc/x86/hardened/make.defaults
===================================================================
RCS file: /var/cvsroot/gentoo-x86/profiles/uclibc/x86/hardened/make.defaults,v
retrieving revision 1.4
diff -u -r1.4 make.defaults
--- uclibc/x86/hardened/make.defaults	20 Jun 2005 15:11:27 -0000	1.4
+++ uclibc/x86/hardened/make.defaults	17 Nov 2011 00:59:40 -0000
@@ -1,3 +1,6 @@
-STAGE1_USE="uclibc hardened pic"
 GRP_STAGE23_USE="ncurses readline zlib uclibc hardened pic"
 USE="ncurses readline zlib uclibc hardened pic"
+
+# Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> (16 Nov 2011)
+# Rename STAGE1_USE to BOOTSTRAP_USE and stack it to the parent value
+BOOTSTRAP_USE="${BOOTSTRAP_USE} hardened pic"