commit: 0d24ba7f664d5329904a8e7b1cd8358298fee1ae
Author: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 31 16:18:18 2022 +0000
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Thu Mar 31 16:18:18 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d24ba7f
app-admin/salt: revbump to 3003.4 for pyzmq dep
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>
app-admin/salt/files/salt-3003.4-relax-pyzmq-dep.patch | 12 ++++++++++++
app-admin/salt/{salt-3003.4.ebuild => salt-3003.4-r1.ebuild} | 3 ++-
2 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/app-admin/salt/files/salt-3003.4-relax-pyzmq-dep.patch
b/app-admin/salt/files/salt-3003.4-relax-pyzmq-dep.patch
new file mode 100644
index 000000000000..7585af58ab11
--- /dev/null
+++ b/app-admin/salt/files/salt-3003.4-relax-pyzmq-dep.patch
@@ -0,0 +1,12 @@
+diff --git a/requirements/zeromq.txt b/requirements/zeromq.txt
+index 35d9014713..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 ; python_version < "3.9"
+-pyzmq>=19.0.2 ; python_version >= "3.9"
++pyzmq
diff --git a/app-admin/salt/salt-3003.4.ebuild
b/app-admin/salt/salt-3003.4-r1.ebuild
similarity index 98%
rename from app-admin/salt/salt-3003.4.ebuild
rename to app-admin/salt/salt-3003.4-r1.ebuild
index a94b0761731f..50ee0911545b 100644
--- a/app-admin/salt/salt-3003.4.ebuild
+++ b/app-admin/salt/salt-3003.4-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.1.0[${PYTHON_USEDEP}] )
"
BDEPEND="
test? (
@@ -110,6 +110,7 @@ PATCHES=(
"${FILESDIR}/salt-3003.1-tests.patch"
"${FILESDIR}/salt-3004.1-jinja-3.patch"
"${FILESDIR}/salt-3003.4-tests.patch"
+ "${FILESDIR}/salt-3003.4-relax-pyzmq-dep.patch"
)
python_prepare_all() {
