| 1 |
commit: ba9f8d1092b915ae446bf382e6ff7dfda4015990 |
| 2 |
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jan 1 20:57:04 2018 +0000 |
| 4 |
Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jan 1 20:57:04 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba9f8d10 |
| 7 |
|
| 8 |
app-crypt/acme: disallowing the install of dev-python/josepy |
| 9 |
|
| 10 |
acme has a built in version of dev-python/josepy |
| 11 |
|
| 12 |
Fixes: Bug-642954 |
| 13 |
Package-Manager: Portage-2.3.14, Repoman-2.3.6 |
| 14 |
|
| 15 |
app-crypt/acme/acme-0.18.2.ebuild | 5 +++-- |
| 16 |
app-crypt/acme/acme-0.19.0.ebuild | 5 +++-- |
| 17 |
app-crypt/acme/acme-0.20.0.ebuild | 3 ++- |
| 18 |
3 files changed, 8 insertions(+), 5 deletions(-) |
| 19 |
|
| 20 |
diff --git a/app-crypt/acme/acme-0.18.2.ebuild b/app-crypt/acme/acme-0.18.2.ebuild |
| 21 |
index 135b289d3d8..88225e3b4f4 100644 |
| 22 |
--- a/app-crypt/acme/acme-0.18.2.ebuild |
| 23 |
+++ b/app-crypt/acme/acme-0.18.2.ebuild |
| 24 |
@@ -1,4 +1,4 @@ |
| 25 |
-# Copyright 1999-2017 Gentoo Foundation |
| 26 |
+# Copyright 1999-2018 Gentoo Foundation |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
|
| 29 |
EAPI=6 |
| 30 |
@@ -29,7 +29,8 @@ RDEPEND=">=dev-python/cryptography-0.8[${PYTHON_USEDEP}] |
| 31 |
dev-python/pyrfc3339[${PYTHON_USEDEP}] |
| 32 |
dev-python/pytz[${PYTHON_USEDEP}] |
| 33 |
>=dev-python/requests-2.10[${PYTHON_USEDEP}] |
| 34 |
- dev-python/six[${PYTHON_USEDEP}]" |
| 35 |
+ dev-python/six[${PYTHON_USEDEP}] |
| 36 |
+ !dev-python/josepy[${PYTHON_USEDEP}]" |
| 37 |
DEPEND="test? ( ${RDEPEND} dev-python/nose[${PYTHON_USEDEP}] ) |
| 38 |
>=dev-python/setuptools-1.0[${PYTHON_USEDEP}]" |
| 39 |
|
| 40 |
|
| 41 |
diff --git a/app-crypt/acme/acme-0.19.0.ebuild b/app-crypt/acme/acme-0.19.0.ebuild |
| 42 |
index 13f5e31382c..39d761d8800 100644 |
| 43 |
--- a/app-crypt/acme/acme-0.19.0.ebuild |
| 44 |
+++ b/app-crypt/acme/acme-0.19.0.ebuild |
| 45 |
@@ -1,4 +1,4 @@ |
| 46 |
-# Copyright 1999-2017 Gentoo Foundation |
| 47 |
+# Copyright 1999-2018 Gentoo Foundation |
| 48 |
# Distributed under the terms of the GNU General Public License v2 |
| 49 |
|
| 50 |
EAPI=6 |
| 51 |
@@ -29,7 +29,8 @@ RDEPEND=">=dev-python/cryptography-0.8[${PYTHON_USEDEP}] |
| 52 |
dev-python/pyrfc3339[${PYTHON_USEDEP}] |
| 53 |
dev-python/pytz[${PYTHON_USEDEP}] |
| 54 |
>=dev-python/requests-2.10[${PYTHON_USEDEP}] |
| 55 |
- >=dev-python/six-1.9.0[${PYTHON_USEDEP}]" |
| 56 |
+ >=dev-python/six-1.9.0[${PYTHON_USEDEP}] |
| 57 |
+ !dev-python/josepy[${PYTHON_USEDEP}]" |
| 58 |
DEPEND="test? ( ${RDEPEND} dev-python/nose[${PYTHON_USEDEP}] ) |
| 59 |
>=dev-python/setuptools-1.0[${PYTHON_USEDEP}]" |
| 60 |
|
| 61 |
|
| 62 |
diff --git a/app-crypt/acme/acme-0.20.0.ebuild b/app-crypt/acme/acme-0.20.0.ebuild |
| 63 |
index b02dbde82a9..81cab6d823e 100644 |
| 64 |
--- a/app-crypt/acme/acme-0.20.0.ebuild |
| 65 |
+++ b/app-crypt/acme/acme-0.20.0.ebuild |
| 66 |
@@ -1,4 +1,4 @@ |
| 67 |
-# Copyright 1999-2017 Gentoo Foundation |
| 68 |
+# Copyright 1999-2018 Gentoo Foundation |
| 69 |
# Distributed under the terms of the GNU General Public License v2 |
| 70 |
|
| 71 |
EAPI=6 |
| 72 |
@@ -31,6 +31,7 @@ RDEPEND=" |
| 73 |
dev-python/pytz[${PYTHON_USEDEP}] |
| 74 |
>=dev-python/requests-2.10[${PYTHON_USEDEP}] |
| 75 |
>=dev-python/six-1.9.0[${PYTHON_USEDEP}] |
| 76 |
+ !dev-python/josepy[${PYTHON_USEDEP}] |
| 77 |
" |
| 78 |
DEPEND=" |
| 79 |
test? ( |
Archives