From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A4D09138334 for ; Tue, 3 Jul 2018 21:18:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2A5D5E098E; Tue, 3 Jul 2018 21:18:44 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id F01A8E098E for ; Tue, 3 Jul 2018 21:18:43 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id F358B335C97 for ; Tue, 3 Jul 2018 21:18:41 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5C51B360 for ; Tue, 3 Jul 2018 21:18:38 +0000 (UTC) From: "Patrick McLean" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Patrick McLean" Message-ID: <1530652699.183c032c68b812084c785fb31e12708a865a11ab.chutzpah@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/salt/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-admin/salt/salt-2016.11.9-r1.ebuild app-admin/salt/salt-2016.11.9-r2.ebuild X-VCS-Directories: app-admin/salt/ X-VCS-Committer: chutzpah X-VCS-Committer-Name: Patrick McLean X-VCS-Revision: 183c032c68b812084c785fb31e12708a865a11ab X-VCS-Branch: master Date: Tue, 3 Jul 2018 21:18:38 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 2ee8e2d0-2f8c-4248-a4a0-5968ae4a5a61 X-Archives-Hash: 01bab1ae4fe4ad2be4fc3912d1122166 commit: 183c032c68b812084c785fb31e12708a865a11ab Author: Patrick McLean gentoo org> AuthorDate: Tue Jul 3 21:17:40 2018 +0000 Commit: Patrick McLean gentoo org> CommitDate: Tue Jul 3 21:18:19 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=183c032c 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 .../salt/{salt-2016.11.9-r1.ebuild => salt-2016.11.9-r2.ebuild} | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 9376c048826..7647ba04538 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