--- bootstrap.sh.orig	2006-01-15 13:57:21.000000000 -0600
+++ bootstrap.sh	2006-01-15 14:03:38.000000000 -0600
@@ -27,7 +27,7 @@
 show_status() {
 	local num=$1
 	shift
-	echo "  [[ ($num/3) $* ]]"
+	echo "  [[ ($num/5) $* ]]"
 }
 
 # Track progress of the bootstrap process to allow for
@@ -92,7 +92,7 @@
 
 RESUME=0
 if [[ -n ${STRAP_RUN} ]]  ; then
-	if [ ${BOOTSTRAP_STAGE} -ge 3 ] ; then
+	if [ ${BOOTSTRAP_STAGE} -ge 5 ] ; then
 		echo
 		einfo "System has been bootstrapped already!"
 		einfo "If you re-bootstrap the system, you must complete the entire bootstrap process"
@@ -273,7 +273,7 @@
 
 export ENV_EXPORTS="GENTOO_MIRRORS PORTDIR DISTDIR PKGDIR PORTAGE_TMPDIR
 	CFLAGS CHOST CXXFLAGS MAKEOPTS ACCEPT_KEYWORDS PROXY HTTP_PROXY
-	FTP_PROXY FEATURES STAGE1_USE"
+	FTP_PROXY FEATURES"
 
 eval $(python -c'import portage,os,string;print "\n".join(["export %s=\"%s\";[[ -z \"%s\" ]] || einfo %s=\"%s\";" % (k, portage.settings[k], portage.settings[k], k, portage.settings[k]) for k in os.getenv("ENV_EXPORTS").split()])')
 unset ENV_EXPORTS
@@ -304,8 +304,8 @@
 # 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
 # before fully bootstrapping. 
-if [ ${BOOTSTRAP_STAGE} -le 2 ] ; then
-	show_status 3 Emerging packages
+if [ ${BOOTSTRAP_STAGE} -le 3 ] ; then
+	show_status 3 Emerging packages pass 1
 	if [[ ${RESUME} -eq 1 ]] ; then
 		STRAP_EMERGE_OPTS="${STRAP_EMERGE_OPTS} --resume"
 		cp /var/run/bootstrap-mtimedb /var/cache/edb
@@ -316,9 +316,24 @@
 		:
 	fi
 	${V_ECHO} emerge ${STRAP_EMERGE_OPTS} ${myOS_HEADERS} ${myTEXINFO} ${myGETTEXT} ${myBINUTILS} \
-		${myGCC} ${myLIBC} ${myBASELAYOUT} ${myZLIB} || cleanup 1
+		${myGCC} || cleanup 1
 	echo -------------------------------------------------------------------------------
-	set_bootstrap_stage 3
+	set_bootstrap_stage 4
+	if [[ -n ${STRAP_RUN} ]]; then
+		einfo
+		einfo "Run gcc-config and select your desired version of gcc before continuing."
+		einfo "After setting the gcc version, re-run bootstrap.sh to finish the bootstrap."
+		einfo
+		exit 0
+	fi
+fi
+
+if [ ${BOOTSTRAP_STAGE} -le 4 ] ; then
+	show_status 4 Emerging remaining packages
+	${V_ECHO} emerge ${STRAP_EMERGE_OPTS} \
+		${myLIBC} ${myBASELAYOUT} ${myZLIB} || cleanup 1
+	echo -------------------------------------------------------------------------------
+	set_bootstrap_stage 5
 fi
 
 # Basic support for gcc multi version/arch scheme ...