[gentoo-commits] repo/gentoo:master commit in: app-crypt/acme/

[Matt Thode]

commit:     ba9f8d1092b915ae446bf382e6ff7dfda4015990
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  1 20:57:04 2018 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Mon Jan  1 20:57:04 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba9f8d10

app-crypt/acme: disallowing the install of dev-python/josepy

acme has a built in version of dev-python/josepy

Fixes: Bug-642954
Package-Manager: Portage-2.3.14, Repoman-2.3.6

 app-crypt/acme/acme-0.18.2.ebuild | 5 +++--
 app-crypt/acme/acme-0.19.0.ebuild | 5 +++--
 app-crypt/acme/acme-0.20.0.ebuild | 3 ++-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/app-crypt/acme/acme-0.18.2.ebuild 
b/app-crypt/acme/acme-0.18.2.ebuild
index 135b289d3d8..88225e3b4f4 100644
--- a/app-crypt/acme/acme-0.18.2.ebuild
+++ b/app-crypt/acme/acme-0.18.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -29,7 +29,8 @@ RDEPEND=">=dev-python/cryptography-0.8[${PYTHON_USEDEP}]
        dev-python/pyrfc3339[${PYTHON_USEDEP}]
        dev-python/pytz[${PYTHON_USEDEP}]
        >=dev-python/requests-2.10[${PYTHON_USEDEP}]
-       dev-python/six[${PYTHON_USEDEP}]"
+       dev-python/six[${PYTHON_USEDEP}]
+       !dev-python/josepy[${PYTHON_USEDEP}]"
 DEPEND="test? ( ${RDEPEND} dev-python/nose[${PYTHON_USEDEP}] )
        >=dev-python/setuptools-1.0[${PYTHON_USEDEP}]"
 

diff --git a/app-crypt/acme/acme-0.19.0.ebuild 
b/app-crypt/acme/acme-0.19.0.ebuild
index 13f5e31382c..39d761d8800 100644
--- a/app-crypt/acme/acme-0.19.0.ebuild
+++ b/app-crypt/acme/acme-0.19.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -29,7 +29,8 @@ RDEPEND=">=dev-python/cryptography-0.8[${PYTHON_USEDEP}]
        dev-python/pyrfc3339[${PYTHON_USEDEP}]
        dev-python/pytz[${PYTHON_USEDEP}]
        >=dev-python/requests-2.10[${PYTHON_USEDEP}]
-       >=dev-python/six-1.9.0[${PYTHON_USEDEP}]"
+       >=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+       !dev-python/josepy[${PYTHON_USEDEP}]"
 DEPEND="test? ( ${RDEPEND} dev-python/nose[${PYTHON_USEDEP}] )
        >=dev-python/setuptools-1.0[${PYTHON_USEDEP}]"
 

diff --git a/app-crypt/acme/acme-0.20.0.ebuild 
b/app-crypt/acme/acme-0.20.0.ebuild
index b02dbde82a9..81cab6d823e 100644
--- a/app-crypt/acme/acme-0.20.0.ebuild
+++ b/app-crypt/acme/acme-0.20.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -31,6 +31,7 @@ RDEPEND="
        dev-python/pytz[${PYTHON_USEDEP}]
        >=dev-python/requests-2.10[${PYTHON_USEDEP}]
        >=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+       !dev-python/josepy[${PYTHON_USEDEP}]
 "
 DEPEND="
        test? (