From bd2d410e3c5db1a69c633f8cbd1a18b085627086 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ivo=20J=C3=A1nsk=C3=BD?= <ivo.jansky@gmail.com>
Date: Sat, 19 Dec 2020 08:43:42 +0100
Subject: [PATCH] Gentoo - use ksmanis/stage3 image

Use an alternative image until gentoo/stage3 gets pushed to Docker Hub again.
---
 .kitchen.yml      | 10 ++--------
 bootstrap-salt.sh |  4 +++-
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/.kitchen.yml b/.kitchen.yml
index ef18b9a..56a0716 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -82,22 +82,16 @@ platforms:
         - sed -i 's/^PubkeyAcceptedKeyTypes.*$/&,ssh-rsa/' /etc/crypto-policies/back-ends/opensshserver.config
   - name: gentoo
     driver_config:
-      image: gentoo/stage3:latest
+      image: ksmanis/stage3:latest
       run_command: /sbin/init
       provision_command:
         - rc-update add sshd default
-        - emerge --update --deep --with-bdeps=y --newuse --quiet @world
-        - emerge --depclean --quiet
-        - eselect python set python3.8
   - name: gentoo-systemd
     driver_config:
-      image: gentoo/stage3:systemd
+      image: ksmanis/stage3:systemd
       run_command: /lib/systemd/systemd
       provision_command:
         - systemctl enable sshd.service
-        - emerge --update --deep --with-bdeps=y --newuse --quiet @world
-        - emerge --depclean --quiet
-        - eselect python set python3.8
   - name: opensuse-15
     driver_config:
       image: opensuse/leap:15.1
diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index 67b0cfc..12308b3 100644
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -7083,7 +7083,7 @@ __gentoo_pre_dep() {
     if [ -n "${EXTRA_PYTHON_TARGET:-}" ]; then
         if ! emerge --info | sed 's/.*\(PYTHON_TARGETS="[^"]*"\).*/\1/' | grep -q "${EXTRA_PYTHON_TARGET}" ; then
             echo "PYTHON_TARGETS=\"\${PYTHON_TARGETS} ${EXTRA_PYTHON_TARGET}\"" >> /etc/portage/make.conf
-            emerge --update --deep --with-bdeps=y --newuse --quiet @world
+            emerge --deep --with-bdeps=y --newuse --quiet @world
         fi
     fi
 }
@@ -7198,6 +7198,8 @@ install_gentoo_git() {
         elif [ "${_POST_NEON_INSTALL}" -eq $BS_FALSE ]; then
             # Tornado 4.3 ebuild supports only Python 3.6, use Python 3.6 as the default Python 3 interpreter
             _PYEXE=python3.6
+        else
+            _PYEXE=$(emerge --info | grep -oE 'PYTHON_SINGLE_TARGET="[^"]*"' | sed -e 's/"//g' -e 's/_/./g' | cut -d= -f2)
         fi
     fi