scripts/bootstrap.sh: fix emerge --resume args

Since the emerge argument parser change from bug 673400, positional
arguments must come after all optional arguments.

Reviewed-by: Michael Everitt <m.j.everitt@iee.org>
Bug: https://bugs.gentoo.org/673400
Signed-off-by: Zac Medico <zmedico@gentoo.org>

diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh
index 3fd1c5a0409124357cbc4493f6dfcd88de519a8f..d375542f899834dca5bbf0fb18da07bb83a1805d 100755 (executable)
--- a/scripts/bootstrap.sh
+++ b/scripts/bootstrap.sh
@@ -330,14 +330,15 @@ export USE="-* bootstrap ${ALLOWED_USE} ${BOOTSTRAP_USE}"
 if [ ${BOOTSTRAP_STAGE} -le 2 ] ; then
        show_status 3 Emerging packages
        if [[ ${RESUME} -eq 1 ]] ; then
+               STRAP_EMERGE_POSARGS=""
                STRAP_EMERGE_OPTS="${STRAP_EMERGE_OPTS} --resume"
                cp /var/run/bootstrap-mtimedb /var/cache/edb
        else
-               STRAP_EMERGE_OPTS="${STRAP_EMERGE_OPTS} \
+               STRAP_EMERGE_POSARGS="\
                        ${myOS_HEADERS} ${myTEXINFO} ${myGETTEXT} ${myBINUTILS} \
                        ${myGCC} ${myLIBC} ${myBASELAYOUT} ${myZLIB}"
        fi
-       ${V_ECHO} emerge ${STRAP_EMERGE_OPTS} || cleanup 1
+       ${V_ECHO} emerge ${STRAP_EMERGE_OPTS} ${STRAP_EMERGE_POSARGS} || cleanup 1
        echo -------------------------------------------------------------------------------
        set_bootstrap_stage 3
 fi