From 6dbdbcbe348ac7d31626cf54618a7672b95d70b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ivo=20J=C3=A1nsk=C3=BD?= <ivo.jansky@gmail.com>
Date: Sat, 12 Dec 2020 14:48:49 +0100
Subject: [PATCH] Gentoo - install Salt 2019 (GIT) with msgpack <1.0.

---
 .github/workflows/main-branch-only.yml  | 40 ++++++++++++-------------
 .github/workflows/templates/generate.py |  4 +--
 bootstrap-salt.sh                       |  2 +-
 3 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/main-branch-only.yml b/.github/workflows/main-branch-only.yml
index b1e9564..fa471b6 100644
--- a/.github/workflows/main-branch-only.yml
+++ b/.github/workflows/main-branch-only.yml
@@ -11,7 +11,7 @@ jobs:
   py3-stable-2019-2-gentoo:
     name: Gentoo v2019.2 Py3 Stable
     runs-on: ubuntu-latest
-    timeout-minutes: 70
+    timeout-minutes: 90
 
 
 
@@ -57,7 +57,7 @@ jobs:
   py3-git-2019-2-gentoo:
     name: Gentoo v2019.2 Py3 Git
     runs-on: ubuntu-latest
-    timeout-minutes: 70
+    timeout-minutes: 90
 
 
 
@@ -103,7 +103,7 @@ jobs:
   py3-stable-3000-gentoo:
     name: Gentoo v3000 Py3 Stable
     runs-on: ubuntu-latest
-    timeout-minutes: 70
+    timeout-minutes: 90
 
 
 
@@ -149,7 +149,7 @@ jobs:
   py3-git-3000-gentoo:
     name: Gentoo v3000 Py3 Git
     runs-on: ubuntu-latest
-    timeout-minutes: 70
+    timeout-minutes: 90
 
 
 
@@ -195,7 +195,7 @@ jobs:
   py3-stable-3001-gentoo:
     name: Gentoo v3001 Py3 Stable
     runs-on: ubuntu-latest
-    timeout-minutes: 70
+    timeout-minutes: 90
 
 
 
@@ -241,7 +241,7 @@ jobs:
   py3-git-3001-gentoo:
     name: Gentoo v3001 Py3 Git
     runs-on: ubuntu-latest
-    timeout-minutes: 70
+    timeout-minutes: 90
 
 
 
@@ -287,7 +287,7 @@ jobs:
   py3-stable-3002-gentoo:
     name: Gentoo v3002 Py3 Stable
     runs-on: ubuntu-latest
-    timeout-minutes: 70
+    timeout-minutes: 90
 
 
 
@@ -333,7 +333,7 @@ jobs:
   py3-git-3002-gentoo:
     name: Gentoo v3002 Py3 Git
     runs-on: ubuntu-latest
-    timeout-minutes: 70
+    timeout-minutes: 90
 
 
 
@@ -379,7 +379,7 @@ jobs:
   py3-git-master-gentoo:
     name: Gentoo Master Py3 Git
     runs-on: ubuntu-latest
-    timeout-minutes: 70
+    timeout-minutes: 90
 
 
 
@@ -425,7 +425,7 @@ jobs:
   latest-gentoo:
     name: Gentoo Latest packaged release
     runs-on: ubuntu-latest
-    timeout-minutes: 70
+    timeout-minutes: 90
 
 
 
@@ -471,7 +471,7 @@ jobs:
   py3-stable-2019-2-gentoo-systemd:
     name: Gentoo (systemd) v2019.2 Py3 Stable
     runs-on: ubuntu-latest
-    timeout-minutes: 70
+    timeout-minutes: 90
 
 
 
@@ -517,7 +517,7 @@ jobs:
   py3-git-2019-2-gentoo-systemd:
     name: Gentoo (systemd) v2019.2 Py3 Git
     runs-on: ubuntu-latest
-    timeout-minutes: 70
+    timeout-minutes: 90
 
 
 
@@ -563,7 +563,7 @@ jobs:
   py3-stable-3000-gentoo-systemd:
     name: Gentoo (systemd) v3000 Py3 Stable
     runs-on: ubuntu-latest
-    timeout-minutes: 70
+    timeout-minutes: 90
 
 
 
@@ -609,7 +609,7 @@ jobs:
   py3-git-3000-gentoo-systemd:
     name: Gentoo (systemd) v3000 Py3 Git
     runs-on: ubuntu-latest
-    timeout-minutes: 70
+    timeout-minutes: 90
 
 
 
@@ -655,7 +655,7 @@ jobs:
   py3-stable-3001-gentoo-systemd:
     name: Gentoo (systemd) v3001 Py3 Stable
     runs-on: ubuntu-latest
-    timeout-minutes: 70
+    timeout-minutes: 90
 
 
 
@@ -701,7 +701,7 @@ jobs:
   py3-git-3001-gentoo-systemd:
     name: Gentoo (systemd) v3001 Py3 Git
     runs-on: ubuntu-latest
-    timeout-minutes: 70
+    timeout-minutes: 90
 
 
 
@@ -747,7 +747,7 @@ jobs:
   py3-stable-3002-gentoo-systemd:
     name: Gentoo (systemd) v3002 Py3 Stable
     runs-on: ubuntu-latest
-    timeout-minutes: 70
+    timeout-minutes: 90
 
 
 
@@ -793,7 +793,7 @@ jobs:
   py3-git-3002-gentoo-systemd:
     name: Gentoo (systemd) v3002 Py3 Git
     runs-on: ubuntu-latest
-    timeout-minutes: 70
+    timeout-minutes: 90
 
 
 
@@ -839,7 +839,7 @@ jobs:
   py3-git-master-gentoo-systemd:
     name: Gentoo (systemd) Master Py3 Git
     runs-on: ubuntu-latest
-    timeout-minutes: 70
+    timeout-minutes: 90
 
 
 
@@ -885,7 +885,7 @@ jobs:
   latest-gentoo-systemd:
     name: Gentoo (systemd) Latest packaged release
     runs-on: ubuntu-latest
-    timeout-minutes: 70
+    timeout-minutes: 90
 
 
 
diff --git a/.github/workflows/templates/generate.py b/.github/workflows/templates/generate.py
index f3bb1b4..0010c23 100755
--- a/.github/workflows/templates/generate.py
+++ b/.github/workflows/templates/generate.py
@@ -135,8 +135,8 @@ DISTRO_DISPLAY_NAMES = {
 
 TIMEOUT_DEFAULT = 20
 TIMEOUT_OVERRIDES = {
-    "gentoo": 70,
-    "gentoo-systemd": 70,
+    "gentoo": 90,
+    "gentoo-systemd": 90,
 }
 BRANCH_ONLY_OVERRIDES = [
     "gentoo",
diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index 3f88bb4..67b0cfc 100644
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -7147,7 +7147,7 @@ install_gentoo_git_deps() {
             dev-python/pycryptodome
             dev-python/py
             dev-python/requests
-            dev-python/msgpack
+            <dev-python/msgpack-1.0
             dev-python/jinja
             dev-python/pyasn1
             dev-python/markupsafe