From: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto@gentoo.org>
Date: Fri, 18 Nov 2011 15:59:18 +0000 (-0100)
Subject: Update catalyst targets to reflect the change from STAGE1_USE to BOOTSTRAP_USE and... 
X-Git-Tag: CATALYST-2.0.7~2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f576b58ded510637c463423da3ba4c2648293666;p=catalyst.git

Update catalyst targets to reflect the change from STAGE1_USE to BOOTSTRAP_USE and drop cxx from stage1 target as it was added to BOOTSTRAP_USE.
---

diff --git a/targets/stage1/stage1-chroot.sh b/targets/stage1/stage1-chroot.sh
index 550eef79..dadd0f57 100644
--- a/targets/stage1/stage1-chroot.sh
+++ b/targets/stage1/stage1-chroot.sh
@@ -6,7 +6,7 @@ export clst_buildpkgs="$(/tmp/build.py)"
 source /tmp/chroot-functions.sh
 
 # Setup our environment
-STAGE1_USE="$(portageq envvar STAGE1_USE)"
+BOOTSTRAP0_USE="$(portageq envvar BOOTSTRAP_USE)"
 FEATURES="${clst_myfeatures} nodoc noman noinfo -news"
 
 ## Sanity check profile
@@ -31,8 +31,8 @@ make_destpath /tmp/stage1root
 
 # Now, we install our packages
 [ -e /etc/make.conf ] && \
-	echo "USE=\"-* bindist build cxx ${STAGE1_USE} ${clst_HOSTUSE}\"" \
+	echo "USE=\"-* bindist build ${BOOTSTRAP_USE} ${clst_HOSTUSE}\"" \
 	>> /etc/make.conf
 run_merge "--oneshot ${clst_buildpkgs}"
-sed -i "/USE=\"-* bindist build cxx ${STAGE1_USE} ${clst_HOSTUSE}\"/d" \
+sed -i "/USE=\"-* bindist build ${BOOTSTRAP_USE} ${clst_HOSTUSE}\"/d" \
 	/etc/make.conf
diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
index 1a44c92f..277fdc21 100644
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -291,7 +291,7 @@ show_debug() {
 		# `set > /tmp/env_dump.${EBUILD_PHASE}` inside /etc/portage/bashrc
 		# XXX: Also, portageq does *not* source profile.bashrc at any time.
 		echo
-		echo "STAGE1_USE:            $(portageq envvar STAGE1_USE)"
+		echo "BOOTSTRAP_USE:            $(portageq envvar BOOTSTRAP_USE)"
 		echo
 		echo "USE (profile):         $(portageq envvar USE)"
 		echo "FEATURES (profile):    $(portageq envvar FEATURES)"