From b92d5eade4ab2c0b57af0b193eea51aad7d710e7 Mon Sep 17 00:00:00 2001
From: JD Friedrikson <yours@decompo.site>
Date: Thu, 1 Jun 2017 20:12:24 -0400
Subject: [PATCH] Autounmask as separate step

When autounmask-write is set and there is a flag that needs to be
written, emerge will write the change and then exit without building.
This change should avoid cases where nothing will build because of this
behavior.
---
 bootstrap-salt.sh | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index e098732..c0afe3a 100755
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -6143,11 +6143,15 @@ install_suse_check_services() {
 #
 #    Gentoo Install Functions.
 #
+__autounmask() {
+    emerge --autounmask-write --autounmask-only "${@}"; return $?
+}
+
 __emerge() {
     if [ "$_GENTOO_USE_BINHOST" -eq $BS_TRUE ]; then
-        emerge --autounmask-write --getbinpkg "${@}"; return $?
+        emerge --getbinpkg "${@}"; return $?
     fi
-    emerge --autounmask-write "${@}"; return $?
+    emerge "${@}"; return $?
 }
 
 __gentoo_config_protection() {
@@ -6185,15 +6189,20 @@ __gentoo_post_dep() {
     __gentoo_config_protection
 
     if [ "$_INSTALL_CLOUD" -eq $BS_TRUE ]; then
+        __autounmask 'dev-python/libcloud'
         __emerge -v 'dev-python/libcloud'
     fi
 
+    __autounmask 'dev-python/requests'
+    __autounmask 'app-admin/salt'
+
     __emerge -vo 'dev-python/requests'
     __emerge -vo 'app-admin/salt'
 
     if [ "${_EXTRA_PACKAGES}" != "" ]; then
         echoinfo "Installing the following extra packages as requested: ${_EXTRA_PACKAGES}"
         # shellcheck disable=SC2086
+        __autounmask ${_EXTRA_PACKAGES} || return 1
         __emerge -v ${_EXTRA_PACKAGES} || return 1
     fi
 }