diff options
| author |   Patrick McLean <chutzpah@gentoo.org> | 2022-03-31 09:07:13 -0700 |
|---|---|---|
| committer | Patrick McLean <chutzpah@gentoo.org> | 2022-03-31 09:07:13 -0700 |
| commit | d0eb0550a8a7fe8eff82c8f8c87b02590437d9ec (patch) | |
| tree | 262ecd301540e6fd34a69c52da30396784329237 | |
| parent | dev-python/irc: Remove old (diff) | |
| download | gentoo-d0eb0550.tar.gz gentoo-d0eb0550.tar.bz2 gentoo-d0eb0550.zip | |
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@gentoo.org>
| -rw-r--r-- | app-admin/salt/files/salt-3004.1-relax-pyzmq-dep.patch | 12 | ||||
| -rw-r--r-- | app-admin/salt/salt-3004.1-r1.ebuild (renamed from app-admin/salt/salt-3004.1.ebuild) | 3 |
2 files changed, 14 insertions, 1 deletions
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 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() { |