| 1 |
commit: 4bcb51d4290e22e8470cfd4bbc3a733229b81f61 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jan 28 20:15:46 2020 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jan 28 20:40:21 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4bcb51d4 |
| 7 |
|
| 8 |
dev-python/basemap: Permit matplotlib-python2 |
| 9 |
|
| 10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 11 |
|
| 12 |
dev-python/basemap/basemap-1.0.7-r1.ebuild | 7 +++++-- |
| 13 |
dev-python/basemap/basemap-1.0.7-r2.ebuild | 7 +++++-- |
| 14 |
2 files changed, 10 insertions(+), 4 deletions(-) |
| 15 |
|
| 16 |
diff --git a/dev-python/basemap/basemap-1.0.7-r1.ebuild b/dev-python/basemap/basemap-1.0.7-r1.ebuild |
| 17 |
index 71e1f054806..9a801ce2828 100644 |
| 18 |
--- a/dev-python/basemap/basemap-1.0.7-r1.ebuild |
| 19 |
+++ b/dev-python/basemap/basemap-1.0.7-r1.ebuild |
| 20 |
@@ -1,4 +1,4 @@ |
| 21 |
-# Copyright 1999-2018 Gentoo Foundation |
| 22 |
+# Copyright 1999-2020 Gentoo Authors |
| 23 |
# Distributed under the terms of the GNU General Public License v2 |
| 24 |
|
| 25 |
EAPI=5 |
| 26 |
@@ -17,7 +17,10 @@ KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" |
| 27 |
LICENSE="MIT GPL-2" |
| 28 |
|
| 29 |
CDEPEND="sci-libs/shapelib |
| 30 |
- >=dev-python/matplotlib-0.98[${PYTHON_USEDEP}] |
| 31 |
+ || ( |
| 32 |
+ >=dev-python/matplotlib-python2-0.98[${PYTHON_USEDEP}] |
| 33 |
+ >=dev-python/matplotlib-0.98[${PYTHON_USEDEP}] |
| 34 |
+ ) |
| 35 |
>=sci-libs/geos-3.3.1[python,${PYTHON_USEDEP}]" |
| 36 |
|
| 37 |
DEPEND="${CDEPEND} |
| 38 |
|
| 39 |
diff --git a/dev-python/basemap/basemap-1.0.7-r2.ebuild b/dev-python/basemap/basemap-1.0.7-r2.ebuild |
| 40 |
index 6c21c113bf7..83b25e1d199 100644 |
| 41 |
--- a/dev-python/basemap/basemap-1.0.7-r2.ebuild |
| 42 |
+++ b/dev-python/basemap/basemap-1.0.7-r2.ebuild |
| 43 |
@@ -1,4 +1,4 @@ |
| 44 |
-# Copyright 1999-2018 Gentoo Foundation |
| 45 |
+# Copyright 1999-2020 Gentoo Authors |
| 46 |
# Distributed under the terms of the GNU General Public License v2 |
| 47 |
|
| 48 |
EAPI=5 |
| 49 |
@@ -17,7 +17,10 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
| 50 |
LICENSE="MIT GPL-2" |
| 51 |
|
| 52 |
CDEPEND="sci-libs/shapelib |
| 53 |
- >=dev-python/matplotlib-0.98[${PYTHON_USEDEP}] |
| 54 |
+ || ( |
| 55 |
+ >=dev-python/matplotlib-python2-0.98[${PYTHON_USEDEP}] |
| 56 |
+ >=dev-python/matplotlib-0.98[${PYTHON_USEDEP}] |
| 57 |
+ ) |
| 58 |
>=sci-libs/geos-3.3.1[python,${PYTHON_USEDEP}]" |
| 59 |
|
| 60 |
DEPEND="${CDEPEND} |
Archives