fixums for 1.0

3 files changed, 32 insertions, 19 deletions

diff --git a/profiles/default-1.0/packages b/profiles/default-1.0/packages
index 419a724489c4..868c82a3adac 100644
--- a/profiles/default-1.0/packages
+++ b/profiles/default-1.0/packages
@@ -38,6 +38,7 @@
 *~sys-libs/glibc-2.2.5
 ~sys-kernel/linux-headers-2.4.17
 >=sys-apps/sysklogd-1.4.1
+*>=dev-lang/python-2.2-r5
 
 >=x11-base/xfree-4.1.0-r2
 
@@ -109,7 +110,6 @@
 *sys-devel/make
 *sys-devel/patch
 *sys-libs/cracklib  
-*>=dev-lang/python-2.2-r5
 *sys-libs/db
 *sys-libs/gdbm  
 *sys-libs/ncurses     
diff --git a/profiles/default-1.0/packages.build b/profiles/default-1.0/packages.build
index bdd3ff1313f8..180a3eb71613 100644
--- a/profiles/default-1.0/packages.build
+++ b/profiles/default-1.0/packages.build
@@ -21,7 +21,7 @@ sys-devel/flex
 sys-devel/gcc
 sys-devel/make
 sys-devel/patch
-sys-devel/spython
+dev-lang/python
 net-misc/wget
 net-misc/rsync
 app-editors/nano
diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh
index 75a60aaae0f0..8cfd3fcb0f75 100755
--- a/scripts/bootstrap.sh
+++ b/scripts/bootstrap.sh
@@ -1,13 +1,26 @@
 #!/bin/sh
-MYPROFILE=default-1.0_rc6
-
+MYPROFILEDIR=`readlink -f /etc/make.profile`
+if [ ! -d $MYPROFILEDIR ]
+then
+	echo '!!! Error: '"$MYPROFILEDIR does not exist. Exiting."
+	exit 1
+fi
+ 
+if [ -e /usr/bin/spython ]
+then
+	#1.0_rc6 and earlier
+	PYTHON=/usr/bin/spython
+else
+	#1.0 and later
+	PYTHON=/usr/bin/python
+fi
 #We really need to upgrade baselayout now that it's possible:
-myBASELAYOUT=`cat /usr/portage/profiles/${MYPROFILE}/packages | grep -v '^#' | grep sys-apps/baselayout | sed 's:^\*::'`
-myPORTAGE=`cat /usr/portage/profiles/${MYPROFILE}/packages | grep -v '^#' | grep sys-apps/portage | sed 's:^\*::'`
-myGETTEXT=`cat /usr/portage/profiles/${MYPROFILE}/packages | grep -v '^#' | grep sys-devel/gettext | sed 's:^\*::'`
-myBINUTILS=`cat /usr/portage/profiles/${MYPROFILE}/packages | grep -v '^#' | grep sys-devel/binutils | sed 's:^\*::'`
-myGCC=`cat /usr/portage/profiles/${MYPROFILE}/packages | grep -v '^#' | grep sys-devel/gcc | sed 's:^\*::'`
-myGLIBC=`cat /usr/portage/profiles/${MYPROFILE}/packages | grep -v '^#' | grep sys-libs/glibc | sed 's:^\*::'`
+myBASELAYOUT=`cat ${MYPROFILEDIR}/packages | grep -v '^#' | grep sys-apps/baselayout | sed 's:^\*::'`
+myPORTAGE=`cat ${MYPROFILEDIR}/packages | grep -v '^#' | grep sys-apps/portage | sed 's:^\*::'`
+myGETTEXT=`cat ${MYPROFILEDIR}/packages | grep -v '^#' | grep sys-devel/gettext | sed 's:^\*::'`
+myBINUTILS=`cat ${MYPROFILEDIR}/packages | grep -v '^#' | grep sys-devel/binutils | sed 's:^\*::'`
+myGCC=`cat ${MYPROFILEDIR}/packages | grep -v '^#' | grep sys-devel/gcc | sed 's:^\*::'`
+myGLIBC=`cat ${MYPROFILEDIR}/packages | grep -v '^#' | grep sys-libs/glibc | sed 's:^\*::'`
 
 echo "Using $myBASELAYOUT"
 echo "Using $myPORTAGE"
@@ -22,29 +35,29 @@ cleanup() {
 }
 
 #USE may be set from the environment so we back it up for later.
-export ORIGUSE="`spython -c 'import portage; print portage.settings["USE"];'`"
-export GENTOO_MIRRORS="`spython -c 'import portage; print portage.settings["GENTOO_MIRRORS"];'`"
+export ORIGUSE="`$PYTHON -c 'import portage; print portage.settings["USE"];'`"
+export GENTOO_MIRRORS="`$PYTHON -c 'import portage; print portage.settings["GENTOO_MIRRORS"];'`"
 export USE="build"
 #get correct CFLAGS, CHOST, CXXFLAGS, MAKEOPTS since make.conf will be
 #overwritten
 cp /etc/make.conf /etc/make.conf.build
-export CFLAGS="`spython -c 'import portage; print portage.settings["CFLAGS"];'`"
-export CHOST="`spython -c 'import portage; print portage.settings["CHOST"];'`"
-export CXXFLAGS="`spython -c 'import portage; print portage.settings["CXXFLAGS"];'`"
-export MAKEOPTS="`spython -c 'import portage; print portage.settings["MAKEOPTS"];'`"
-PROXY="`spython -c 'import portage; print portage.settings["PROXY"];'`"
+export CFLAGS="`$PYTHON -c 'import portage; print portage.settings["CFLAGS"];'`"
+export CHOST="`$PYTHON -c 'import portage; print portage.settings["CHOST"];'`"
+export CXXFLAGS="`$PYTHON -c 'import portage; print portage.settings["CXXFLAGS"];'`"
+export MAKEOPTS="`$PYTHON -c 'import portage; print portage.settings["MAKEOPTS"];'`"
+PROXY="`$PYTHON -c 'import portage; print portage.settings["PROXY"];'`"
 if [ -n "${PROXY}" ] 
 then
 	echo "exporting PROXY=${PROXY}"
 	export PROXY
 fi
-HTTP_PROXY="`spython -c 'import portage; print portage.settings["HTTP_PROXY"];'`"
+HTTP_PROXY="`$PYTHON -c 'import portage; print portage.settings["HTTP_PROXY"];'`"
 if [ -n "${HTTP_PROXY}" ] 
 then
 	echo "exporting HTTP_PROXY=${HTTP_PROXY}"
 	export HTTP_PROXY
 fi
-FTP_PROXY="`spython -c 'import portage; print portage.settings["FTP_PROXY"];'`"
+FTP_PROXY="`$PYTHON -c 'import portage; print portage.settings["FTP_PROXY"];'`"
 if [ -n "${FTP_PROXY}" ] 
 then
 	echo "exporting FTP_PROXY=${FTP_PROXY}"