[gentoo-commits] proj/catalyst:pending commit in: targets/stage1/

[Brian Dolbec]

commit:     2d574bfa8e5f385f495b3b3e7f4df882bb6751c4
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo 
<DOT> org>
AuthorDate: Sat Mar 11 00:39:12 2017 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Wed Nov 22 01:16:21 2017 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=2d574bfa

Improve the order of USE definition, make sure to remove USE after building 
portage, add the contents of BOOTSTRAP_USE to USE and clean USE and 
CATALYST_USE after building pacakges.

Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> 
gentoo.org>

 targets/stage1/stage1-chroot.sh | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/targets/stage1/stage1-chroot.sh b/targets/stage1/stage1-chroot.sh
index f2438660..1b0aa08b 100755
--- a/targets/stage1/stage1-chroot.sh
+++ b/targets/stage1/stage1-chroot.sh
@@ -25,7 +25,7 @@ clst_root_path=/ setup_pkgmgr "build"
 
 # We need to ensure the base stage3 has USE="bindist"
 # if BINDIST is set to avoid issues with openssl / openssh
-[ -e ${clst_make_conf} ] && echo "USE=\"${USE} ${BINDIST}\"" >> 
${clst_make_conf}
+[ -e ${clst_make_conf} ] && echo "USE=\"${BINDIST} ${USE}\"" >> 
${clst_make_conf}
 
 # Update stage3
 if [ -n "${clst_update_seed}" ]; then
@@ -48,7 +48,7 @@ else
 fi
 
 # Clear USE
-[ -e ${clst_make_conf} ] && sed -i -e "USE=\"s/${BINDIST}//" ${clst_make_conf}
+[ -e ${clst_make_conf} ] && sed -i -e "/^USE=\"${BINDIST} ${USE}\"/d" 
${clst_make_conf}
 
 make_destpath /tmp/stage1root
 
@@ -61,7 +61,8 @@ sed -i "/USE=\"${USE} -build\"/d" ${clst_make_conf}
 # Now, we install our packages
 if [ -e ${clst_make_conf} ]; then
        echo "CATALYST_USE=\"-* build ${BINDIST} ${clst_CATALYST_USE}\"" >> 
${clst_make_conf}
-       echo "USE=\"\${CATALYST_USE} ${USE} \${BOOTSTRAP_USE} 
${clst_HOSTUSE}\"" >> ${clst_make_conf}
+       echo "USE=\"\${CATALYST_USE} ${USE} ${BOOTSTRAP_USE} ${clst_HOSTUSE}\"" 
>> ${clst_make_conf}
+
        for useexpand in ${clst_HOSTUSEEXPAND}; do
                x="clst_${useexpand}"
                echo "${useexpand}=\"${!x}\"" \
@@ -77,3 +78,7 @@ for useexpand in ${clst_HOSTUSEEXPAND}; do
        sed -i "/${useexpand}=\"${!x}\"/d" \
        ${clst_make_conf}
 done
+
+# Clear USE
+[ -e ${clst_make_conf} ] && sed -i -e "/^CATALYST_USE/d" ${clst_make_conf}
+[ -e ${clst_make_conf} ] && sed -i -e "/^USE=\"/s/\${CATALYST_USE} ${USE} 
${BOOTSTRAP_USE}//" ${clst_make_conf}