From: Matthew Thode <prometheanfire@gentoo.org>
Date: Mon, 1 Jan 2018 20:57:04 +0000 (-0600)
Subject: app-crypt/acme: disallowing the install of dev-python/josepy
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ba9f8d1092b915ae446bf382e6ff7dfda4015990;p=gentoo.git

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
---

diff --git a/app-crypt/acme/acme-0.18.2.ebuild b/app-crypt/acme/acme-0.18.2.ebuild
index 135b289d3d81..88225e3b4f47 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 13f5e31382c3..39d761d8800c 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 b02dbde82a94..81cab6d823e4 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? (