From 4bcb51d4290e22e8470cfd4bbc3a733229b81f61 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Micha=C5=82=20G=C3=B3rny?= Date: Tue, 28 Jan 2020 21:15:46 +0100 Subject: [PATCH] dev-python/basemap: Permit matplotlib-python2 MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Górny --- 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 71e1f0548063..9a801ce28281 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 6c21c113bf73..83b25e1d1999 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} -- 2.26.2