From: "Michał Górny" <mgorny@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/basemap/
Date: Tue, 28 Jan 2020 20:40:35 +0000 (UTC) [thread overview]
Message-ID: <1580244021.4bcb51d4290e22e8470cfd4bbc3a733229b81f61.mgorny@gentoo> (raw)
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}
next reply other threads:[~2020-01-28 20:40 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-28 20:40 Michał Górny [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-03-26 13:49 [gentoo-commits] repo/gentoo:master commit in: dev-python/basemap/ Michał Górny
2020-02-09 15:54 Michał Górny
2020-01-30 22:50 Andreas Sturmlechner
2020-01-28 21:30 Michał Górny
2018-03-13 19:52 Michał Górny
2018-02-17 13:07 Michał Górny
2017-01-21 16:14 Andreas Sturmlechner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1580244021.4bcb51d4290e22e8470cfd4bbc3a733229b81f61.mgorny@gentoo \
--to=mgorny@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox