From: Patrick McLean <chutzpah@gentoo.org>
Date: Tue, 3 Jul 2018 21:17:40 +0000 (-0700)
Subject: app-admin/salt: Revbump to 2016.11.9-r2, pycryptodome (bug #611576)
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=183c032c68b812084c785fb31e12708a865a11ab;p=gentoo.git

app-admin/salt: Revbump to 2016.11.9-r2, pycryptodome (bug #611576)

Closes: https://bugs.gentoo.org/611576
Package-Manager: Portage-2.3.41, Repoman-2.3.9
---

diff --git a/app-admin/salt/salt-2016.11.9-r1.ebuild b/app-admin/salt/salt-2016.11.9-r2.ebuild
similarity index 96%
rename from app-admin/salt/salt-2016.11.9-r1.ebuild
rename to app-admin/salt/salt-2016.11.9-r2.ebuild
index 9376c0488269..7647ba045387 100644
--- a/app-admin/salt/salt-2016.11.9-r1.ebuild
+++ b/app-admin/salt/salt-2016.11.9-r2.ebuild
@@ -49,7 +49,10 @@ RDEPEND="sys-apps/pciutils
 	)
 	zeromq? (
 		>=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/pycrypto-2.6.1[${PYTHON_USEDEP}]
+		|| (
+			dev-python/pycryptodome[${PYTHON_USEDEP}]
+			>=dev-python/pycrypto-2.6.1[${PYTHON_USEDEP}]
+		)
 	)
 	cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] )
 	mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
@@ -96,6 +99,7 @@ python_prepare() {
 	# this test fails because it trys to "pip install distribute"
 	rm tests/unit/{modules,states}/zcbuildout_test.py \
 		tests/unit/modules/{rh_ip,win_network,random_org}_test.py || die
+	rm tests/unit/states/pip_test.py || die
 
 	# https://github.com/saltstack/salt/issues/39095
 	rm tests/unit/utils/parsers_test.py