Index: bootstrap-cascade.sh
===================================================================
RCS file: /var/cvsroot/gentoo-x86/scripts/bootstrap-cascade.sh,v
retrieving revision 1.7
diff -u -b -B -w -p -r1.7 bootstrap-cascade.sh
--- bootstrap-cascade.sh	19 Jul 2004 05:02:32 -0000	1.7
+++ bootstrap-cascade.sh	23 Jul 2004 13:12:27 -0000
@@ -148,7 +148,7 @@ sed 's/[][,]//g; s/ /\n/g; s/\*//g' | wh
 n=${n%%-[0-9]*}; echo "my$(tr a-z- A-Z_ <<<$n)=$p; "; done)
 
 # this stuff should never fail but will if not enough is installed.
-[ "${myBASELAYOUT}" = "" ] && myBASELAYOUT="$(portageq best_version / virtual/baselayout)"
+#[ "${myBASELAYOUT}" = "" ] && myBASELAYOUT="$(portageq best_version / virtual/baselayout)"
 [ "${myBASELAYOUT}" = "" ] && myBASELAYOUT="baselayout"
 [ "${myPORTAGE}" = "" ] && myPORTAGE="portage"
 [ "${myBINUTILS}" = "" ] && myBINUTILS="binutils"
@@ -161,7 +161,10 @@ n=${n%%-[0-9]*}; echo "my$(tr a-z- A-Z_ 
 [ "${myNCURSES}" = "" ] && myNCURSES="ncurses"
 
 # Do we really have no 2.4.x nptl kernels in portage?
-[ "${USE_NPTL}" = 1 ] && myOS_HEADERS="$(portageq best_visible / '>=sys-kernel/linux26-headers-2.6.0')"
+if [ "${USE_NPTL}" = 1 ]; then
+	myOS_HEADERS="$(portageq best_visible / '>=sys-kernel/linux26-headers-2.6.0')"
+	[ ${myOS_HEADERS}" != "" ] && myOS_HEADERS=">=${myOS_HEADERS}"
+fi
 [ "${myOS_HEADERS}" = "" ] && myOS_HEADERS="virtual/os-headers"
 
 einfo "Using baselayout : ${myBASELAYOUT}"
@@ -208,6 +211,10 @@ export FEATURES="${FEATURES} -collision-
 USE="-* build bootstrap" emerge ${STRAP_EMERGE_OPTS} ${myPORTAGE} || cleanup 1
 echo -------------------------------------------------------------------------------
 export USE="${ORIGUSE} bootstrap"
+
+# 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. 
 #emerge ${STRAP_EMERGE_OPTS} -C virtual/os-headers || cleanup 1
 emerge ${STRAP_EMERGE_OPTS} ${myOS_HEADERS} ${myTEXINFO} ${myGETTEXT} ${myBINUTILS} || cleanup 1
 echo -------------------------------------------------------------------------------