[gentoo-commits] repo/gentoo:master commit in: dev-python/basemap/

[Michał Górny]

commit:     4bcb51d4290e22e8470cfd4bbc3a733229b81f61
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 28 20:15:46 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Jan 28 20:40:21 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4bcb51d4

dev-python/basemap: Permit matplotlib-python2

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-python/basemap/basemap-1.0.7-r1.ebuild | 7 +++++--
 dev-python/basemap/basemap-1.0.7-r2.ebuild | 7 +++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/dev-python/basemap/basemap-1.0.7-r1.ebuild 
b/dev-python/basemap/basemap-1.0.7-r1.ebuild
index 71e1f054806..9a801ce2828 100644
--- a/dev-python/basemap/basemap-1.0.7-r1.ebuild
+++ b/dev-python/basemap/basemap-1.0.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -17,7 +17,10 @@ KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 LICENSE="MIT GPL-2"
 
 CDEPEND="sci-libs/shapelib
-       >=dev-python/matplotlib-0.98[${PYTHON_USEDEP}]
+       || (
+               >=dev-python/matplotlib-python2-0.98[${PYTHON_USEDEP}]
+               >=dev-python/matplotlib-0.98[${PYTHON_USEDEP}]
+       )
        >=sci-libs/geos-3.3.1[python,${PYTHON_USEDEP}]"
 
 DEPEND="${CDEPEND}

diff --git a/dev-python/basemap/basemap-1.0.7-r2.ebuild 
b/dev-python/basemap/basemap-1.0.7-r2.ebuild
index 6c21c113bf7..83b25e1d199 100644
--- a/dev-python/basemap/basemap-1.0.7-r2.ebuild
+++ b/dev-python/basemap/basemap-1.0.7-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -17,7 +17,10 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 LICENSE="MIT GPL-2"
 
 CDEPEND="sci-libs/shapelib
-       >=dev-python/matplotlib-0.98[${PYTHON_USEDEP}]
+       || (
+               >=dev-python/matplotlib-python2-0.98[${PYTHON_USEDEP}]
+               >=dev-python/matplotlib-0.98[${PYTHON_USEDEP}]
+       )
        >=sci-libs/geos-3.3.1[python,${PYTHON_USEDEP}]"
 
 DEPEND="${CDEPEND}