[gentoo-commits] proj/catalyst:pending commit in: targets/support/, catalyst/base/

[Brian Dolbec]

commit:     cec4889344a5c5de7fa02ade0253808dc73f3008
Author:     Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Wed Sep  2 21:22:38 2015 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Wed Sep  2 21:22:38 2015 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=cec48893

Revert "fix minor typo"

This reverts commit da114f314109977bca344179ed7c3aa648837afd.

bad commit

 catalyst/base/stagebase.py          | 2 +-
 targets/support/chroot-functions.sh | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index 23491aa..c0bafc2 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -1097,7 +1097,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
                                myusevars.extend(self.settings["use"])
 
                        if myusevars:
-                               myf.write("# These are the USE and USE_EXPAND 
flags that were used for\n# building in addition to what is provided by the 
profile.\n")
+                               myf.write("# These are the USE and USE_EXPAND 
flags that were used for\n# buidling in addition to what is provided by the 
profile.\n")
                                myusevars = sorted(set(myusevars))
                                myf.write('USE="'+string.join(myusevars)+'"\n')
                                if '-*' in myusevars:

diff --git a/targets/support/chroot-functions.sh 
b/targets/support/chroot-functions.sh
index 5dd542e..5e046cb 100755
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -166,9 +166,6 @@ setup_gcc(){
 }
 
 setup_pkgmgr(){
-       # Set bindist USE flag if clst_BINDIST is set
-       [ -e "${clst_make_conf}" ] && [ -n "${clst_BINDIST}" ] && echo 
"USE=\"\${USE} bindist\"" >> "${clst_make_conf}"
-
        # We need to merge our package manager with USE="build" set in case it 
is
        # portage to avoid frying our /etc/portage/make.conf file.  Otherwise, 
we could
        # just let emerge @system could merge it.
@@ -271,6 +268,9 @@ run_merge() {
        export EPAUSE_IGNORE=0
        export CONFIG_PROTECT="-*"
 
+       # Set bindist USE flag if clst_BINDIST is set
+       [ -e "${clst_make_conf}" ] && [ -n "${clst_BINDIST}" ] && echo 
"USE=\"\${USE} bindist\"" >> "${clst_make_conf}"
+
        if [ -n "${clst_VERBOSE}" ]
        then
                echo "ROOT=${ROOT} emerge ${clst_myemergeopts} -pt $@" || exit 1
@@ -287,6 +287,9 @@ run_merge() {
        echo "emerge ${clst_myemergeopts} $@" || exit 1
 
        emerge ${clst_myemergeopts} $@ || exit 1
+
+       # Clean-up USE again
+       sed -i "/USE=\"\${USE} bindist\"/d" "${clst_make_conf}"
 }
 
 show_debug() {