1 |
commit: 0d24ba7f664d5329904a8e7b1cd8358298fee1ae |
2 |
Author: Patrick McLean <chutzpah <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Mar 31 16:18:18 2022 +0000 |
4 |
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Mar 31 16:18:18 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d24ba7f |
7 |
|
8 |
app-admin/salt: revbump to 3003.4 for pyzmq dep |
9 |
|
10 |
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org> |
11 |
|
12 |
app-admin/salt/files/salt-3003.4-relax-pyzmq-dep.patch | 12 ++++++++++++ |
13 |
app-admin/salt/{salt-3003.4.ebuild => salt-3003.4-r1.ebuild} | 3 ++- |
14 |
2 files changed, 14 insertions(+), 1 deletion(-) |
15 |
|
16 |
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 |
17 |
new file mode 100644 |
18 |
index 000000000000..7585af58ab11 |
19 |
--- /dev/null |
20 |
+++ b/app-admin/salt/files/salt-3003.4-relax-pyzmq-dep.patch |
21 |
@@ -0,0 +1,12 @@ |
22 |
+diff --git a/requirements/zeromq.txt b/requirements/zeromq.txt |
23 |
+index 35d9014713..ffa1589043 100644 |
24 |
+--- a/requirements/zeromq.txt |
25 |
++++ b/requirements/zeromq.txt |
26 |
+@@ -1,6 +1,4 @@ |
27 |
+ -r base.txt |
28 |
+ -r crypto.txt |
29 |
+ |
30 |
+-pyzmq<=20.0.0 ; python_version < "3.6" |
31 |
+-pyzmq>=17.0.0 ; python_version < "3.9" |
32 |
+-pyzmq>=19.0.2 ; python_version >= "3.9" |
33 |
++pyzmq |
34 |
|
35 |
diff --git a/app-admin/salt/salt-3003.4.ebuild b/app-admin/salt/salt-3003.4-r1.ebuild |
36 |
similarity index 98% |
37 |
rename from app-admin/salt/salt-3003.4.ebuild |
38 |
rename to app-admin/salt/salt-3003.4-r1.ebuild |
39 |
index a94b0761731f..50ee0911545b 100644 |
40 |
--- a/app-admin/salt/salt-3003.4.ebuild |
41 |
+++ b/app-admin/salt/salt-3003.4-r1.ebuild |
42 |
@@ -71,7 +71,7 @@ RDEPEND=" |
43 |
gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] ) |
44 |
profile? ( dev-python/yappi[${PYTHON_USEDEP}] ) |
45 |
vim-syntax? ( app-vim/salt-vim ) |
46 |
- zeromq? ( >=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}] ) |
47 |
+ zeromq? ( >=dev-python/pyzmq-19.1.0[${PYTHON_USEDEP}] ) |
48 |
" |
49 |
BDEPEND=" |
50 |
test? ( |
51 |
@@ -110,6 +110,7 @@ PATCHES=( |
52 |
"${FILESDIR}/salt-3003.1-tests.patch" |
53 |
"${FILESDIR}/salt-3004.1-jinja-3.patch" |
54 |
"${FILESDIR}/salt-3003.4-tests.patch" |
55 |
+ "${FILESDIR}/salt-3003.4-relax-pyzmq-dep.patch" |
56 |
) |
57 |
|
58 |
python_prepare_all() { |