[gentoo-commits] repo/gentoo:master commit in: app-admin/salt/, app-admin/salt/files/

[Patrick McLean]

commit:     d0eb0550a8a7fe8eff82c8f8c87b02590437d9ec
Author:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 31 16:07:13 2022 +0000
Commit:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Thu Mar 31 16:07:13 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0eb0550

app-admin/salt: Revbump to 3004.1-r1, fix pyzmq dep (bug #836462)

Closes: https://bugs.gentoo.org/836462
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>

 app-admin/salt/files/salt-3004.1-relax-pyzmq-dep.patch       | 12 ++++++++++++
 app-admin/salt/{salt-3004.1.ebuild => salt-3004.1-r1.ebuild} |  3 ++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/app-admin/salt/files/salt-3004.1-relax-pyzmq-dep.patch b/app-admin/salt/files/salt-3004.1-relax-pyzmq-dep.patch
new file mode 100644
index 000000000000..99d432158215
--- /dev/null
+++ b/app-admin/salt/files/salt-3004.1-relax-pyzmq-dep.patch
@@ -0,0 +1,12 @@
+diff --git a/requirements/zeromq.txt b/requirements/zeromq.txt
+index 62cb775d87..ffa1589043 100644
+--- a/requirements/zeromq.txt
++++ b/requirements/zeromq.txt
+@@ -1,6 +1,4 @@
+ -r base.txt
+ -r crypto.txt
+ 
+-pyzmq<=20.0.0 ; python_version < "3.6"
+-pyzmq>=17.0.0,<22.0.0 ; python_version < "3.9"
+-pyzmq>19.0.2,<22.0.0 ; python_version >= "3.9"
++pyzmq

diff --git a/app-admin/salt/salt-3004.1.ebuild b/app-admin/salt/salt-3004.1-r1.ebuild
similarity index 98%
rename from app-admin/salt/salt-3004.1.ebuild
rename to app-admin/salt/salt-3004.1-r1.ebuild
index 6f097cc01663..91e2f2df0e5f 100644
--- a/app-admin/salt/salt-3004.1.ebuild
+++ b/app-admin/salt/salt-3004.1-r1.ebuild
@@ -71,7 +71,7 @@ RDEPEND="
 	gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )
 	profile? ( dev-python/yappi[${PYTHON_USEDEP}] )
 	vim-syntax? ( app-vim/salt-vim )
-	zeromq? ( >=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}] )
+	zeromq? ( >=dev-python/pyzmq-19.0.0[${PYTHON_USEDEP}] )
 "
 BDEPEND="
 	test? (
@@ -109,6 +109,7 @@ PATCHES=(
 	"${FILESDIR}/salt-3003.1-tests.patch"
 	"${FILESDIR}/salt-3004.1-jinja-3.patch"
 	"${FILESDIR}/salt-3004.1-tests.patch"
+	"${FILESDIR}/salt-3004.1-relax-pyzmq-dep.patch"
 )
 
 python_prepare_all() {