diff options
| author |   Patrick McLean <chutzpah@gentoo.org> | 2022-03-31 09:18:18 -0700 |
|---|---|---|
| committer | Patrick McLean <chutzpah@gentoo.org> | 2022-03-31 09:18:18 -0700 |
| commit | 0d24ba7f664d5329904a8e7b1cd8358298fee1ae (patch) | |
| tree | 33d9604ed1edd5a1b56306531d9ef4a1b6d0eb13 /app-admin/salt | |
| parent | app-admin/salt: Revbump to 3004.1-r1, fix pyzmq dep (bug #836462) (diff) | |
| download | gentoo-0d24ba7f664d5329904a8e7b1cd8358298fee1ae.tar.gz gentoo-0d24ba7f664d5329904a8e7b1cd8358298fee1ae.tar.bz2 gentoo-0d24ba7f664d5329904a8e7b1cd8358298fee1ae.zip | |
app-admin/salt: revbump to 3003.4 for pyzmq dep
Signed-off-by: Patrick McLean <chutzpah@gentoo.org>
Diffstat (limited to 'app-admin/salt')
| -rw-r--r-- | app-admin/salt/files/salt-3003.4-relax-pyzmq-dep.patch | 12 | ||||
| -rw-r--r-- | app-admin/salt/salt-3003.4-r1.ebuild (renamed from app-admin/salt/salt-3003.4.ebuild) | 3 |
2 files changed, 14 insertions, 1 deletions
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 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() { |