| 1 |
commit: 183c032c68b812084c785fb31e12708a865a11ab |
| 2 |
Author: Patrick McLean <chutzpah <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jul 3 21:17:40 2018 +0000 |
| 4 |
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jul 3 21:18:19 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=183c032c |
| 7 |
|
| 8 |
app-admin/salt: Revbump to 2016.11.9-r2, pycryptodome (bug #611576) |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/611576 |
| 11 |
Package-Manager: Portage-2.3.41, Repoman-2.3.9 |
| 12 |
|
| 13 |
.../salt/{salt-2016.11.9-r1.ebuild => salt-2016.11.9-r2.ebuild} | 6 +++++- |
| 14 |
1 file changed, 5 insertions(+), 1 deletion(-) |
| 15 |
|
| 16 |
diff --git a/app-admin/salt/salt-2016.11.9-r1.ebuild b/app-admin/salt/salt-2016.11.9-r2.ebuild |
| 17 |
similarity index 96% |
| 18 |
rename from app-admin/salt/salt-2016.11.9-r1.ebuild |
| 19 |
rename to app-admin/salt/salt-2016.11.9-r2.ebuild |
| 20 |
index 9376c048826..7647ba04538 100644 |
| 21 |
--- a/app-admin/salt/salt-2016.11.9-r1.ebuild |
| 22 |
+++ b/app-admin/salt/salt-2016.11.9-r2.ebuild |
| 23 |
@@ -49,7 +49,10 @@ RDEPEND="sys-apps/pciutils |
| 24 |
) |
| 25 |
zeromq? ( |
| 26 |
>=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}] |
| 27 |
- >=dev-python/pycrypto-2.6.1[${PYTHON_USEDEP}] |
| 28 |
+ || ( |
| 29 |
+ dev-python/pycryptodome[${PYTHON_USEDEP}] |
| 30 |
+ >=dev-python/pycrypto-2.6.1[${PYTHON_USEDEP}] |
| 31 |
+ ) |
| 32 |
) |
| 33 |
cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] ) |
| 34 |
mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] ) |
| 35 |
@@ -96,6 +99,7 @@ python_prepare() { |
| 36 |
# this test fails because it trys to "pip install distribute" |
| 37 |
rm tests/unit/{modules,states}/zcbuildout_test.py \ |
| 38 |
tests/unit/modules/{rh_ip,win_network,random_org}_test.py || die |
| 39 |
+ rm tests/unit/states/pip_test.py || die |
| 40 |
|
| 41 |
# https://github.com/saltstack/salt/issues/39095 |
| 42 |
rm tests/unit/utils/parsers_test.py |
Archives