Index: bootstrap.sh
===================================================================
RCS file: /var/cvsroot/gentoo-x86/scripts/bootstrap.sh,v
--- bootstrap.sh	2 Dec 2005 15:43:57 -0000	1.78
+++ bootstrap.sh	25 Jan 2006 16:58:09 -0000
@@ -196,7 +196,7 @@ 
 	case "${opt}" in
 		nls)
 			USE_NLS=1
-			STAGE1_USE="${STAGE1_USE} nls"
+			ALLOWED_USE="${ALLOWED_USE} nls"
 			;;
 		nptl)
 			if [[ -z $(portageq best_visible / '>=sys-kernel/linux-headers-2.6.0') ]] ; then
@@ -213,10 +213,10 @@ 
 			USE_NPTLONLY=1
 			;;
 		multilib)
-			STAGE1_USE="${STAGE1_USE} multilib"
+			ALLOWED_USE="${ALLOWED_USE} multilib"
 			;;
 		userlocales)
-			STAGE1_USE="${STAGE1_USE} userlocales"
+			ALLOWED_USE="${ALLOWED_USE} userlocales"
 			;;
 	esac
 done
@@ -249,9 +249,9 @@ 
 if [[ ${USE_NPTL} = "1" ]] ; then
 	myOS_HEADERS="$(portageq best_visible / '>=sys-kernel/linux-headers-2.6.0')"
 	[[ -n ${myOS_HEADERS} ]] && myOS_HEADERS=">=${myOS_HEADERS}"
-	STAGE1_USE="${STAGE1_USE} nptl"
+	ALLOWED_USE="${ALLOWED_USE} nptl"
 	# Should we build with nptl only?
-	[[ ${USE_NPTLONLY} = "1" ]] && STAGE1_USE="${STAGE1_USE} nptlonly"
+	[[ ${USE_NPTLONLY} = "1" ]] && ALLOWED_USE="${ALLOWED_USE} nptlonly"
 fi
 [[ -z ${myOS_HEADERS} ]] && myOS_HEADERS="virtual/os-headers"
 
@@ -295,11 +295,11 @@ 
 
 if [ ${BOOTSTRAP_STAGE} -le 1 ] ; then
 	show_status 2 Updating portage
-	${V_ECHO} USE="-* build bootstrap ${STAGE1_USE}" emerge ${STRAP_EMERGE_OPTS} ${myPORTAGE} || cleanup 1
+	${V_ECHO} USE="-* build bootstrap ${ALLOWED_USE} ${STAGE1_USE}" emerge ${STRAP_EMERGE_OPTS} ${myPORTAGE} || cleanup 1
 	echo -------------------------------------------------------------------------------
 	set_bootstrap_stage 2
 fi
-export USE="-* bootstrap ${STAGE1_USE}"
+export USE="-* bootstrap ${ALLOWED_USE} ${STAGE1_USE}"
 
 # We can't unmerge headers which may or may not exist yet. If your
 # trying to use nptl, it may be needed to flush out any old headers