From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1141070-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 13B24138354
for <garchives@archives.gentoo.org>; Mon, 27 Jan 2020 20:54:55 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 3DFD2E089E;
Mon, 27 Jan 2020 20:54:54 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 03D61E089E
for <gentoo-commits@lists.gentoo.org>; Mon, 27 Jan 2020 20:54:54 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id C8AF334E44B
for <gentoo-commits@lists.gentoo.org>; Mon, 27 Jan 2020 20:54:52 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 8AD15106
for <gentoo-commits@lists.gentoo.org>; Mon, 27 Jan 2020 20:54:51 +0000 (UTC)
From: "Michał Górny" <mgorny@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" <mgorny@gentoo.org>
Message-ID: <1580158484.cb4ca60fcacda1aed527d57528e3b97d2b078464.mgorny@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/matplotlib/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-python/matplotlib/matplotlib-2.2.2-r1.ebuild dev-python/matplotlib/matplotlib-2.2.2-r2.ebuild dev-python/matplotlib/matplotlib-2.2.4-r1.ebuild dev-python/matplotlib/matplotlib-2.2.4.ebuild
X-VCS-Directories: dev-python/matplotlib/
X-VCS-Committer: mgorny
X-VCS-Committer-Name: Michał Górny
X-VCS-Revision: cb4ca60fcacda1aed527d57528e3b97d2b078464
X-VCS-Branch: master
Date: Mon, 27 Jan 2020 20:54:51 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 6ffe2bc2-d615-4352-9c76-f0acee1d08e8
X-Archives-Hash: ddd66f94bdc9679c9621309453187523
commit: cb4ca60fcacda1aed527d57528e3b97d2b078464
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 27 20:43:25 2020 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Jan 27 20:54:44 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb4ca60f
dev-python/matplotlib: Revert "fixing numpy deps"
Change done in explicit violation of maintainer's request.
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
.../{matplotlib-2.2.2-r2.ebuild => matplotlib-2.2.2-r1.ebuild} | 3 +--
.../matplotlib/{matplotlib-2.2.4-r1.ebuild => matplotlib-2.2.4.ebuild} | 3 +--
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/dev-python/matplotlib/matplotlib-2.2.2-r2.ebuild b/dev-python/matplotlib/matplotlib-2.2.2-r1.ebuild
similarity index 96%
rename from dev-python/matplotlib/matplotlib-2.2.2-r2.ebuild
rename to dev-python/matplotlib/matplotlib-2.2.2-r1.ebuild
index f8532500675..a4c0390e0f3 100644
--- a/dev-python/matplotlib/matplotlib-2.2.2-r2.ebuild
+++ b/dev-python/matplotlib/matplotlib-2.2.2-r1.ebuild
@@ -41,8 +41,7 @@ PY2_DEPEND="
$(python_gen_cond_dep 'dev-python/backports-functools-lru-cache[${PYTHON_USEDEP}]' python2_7)"
COMMON_DEPEND="
dev-python/cycler[${PYTHON_USEDEP}]
- $(python_gen_cond_dep '|| ( dev-python/numpy-python2[${PYTHON_USEDEP}] >=dev-python/numpy-1.7.1[${PYTHON_USEDEP}] )' 'python2*')
- $(python_gen_cond_dep '>=dev-python/numpy-1.7.1[${PYTHON_USEDEP}]' 'python3*')
+ >=dev-python/numpy-1.7.1[${PYTHON_USEDEP}]
dev-python/python-dateutil:0[${PYTHON_USEDEP}]
dev-python/pytz[${PYTHON_USEDEP}]
>=dev-python/six-1.10[${PYTHON_USEDEP}]
diff --git a/dev-python/matplotlib/matplotlib-2.2.4-r1.ebuild b/dev-python/matplotlib/matplotlib-2.2.4.ebuild
similarity index 96%
rename from dev-python/matplotlib/matplotlib-2.2.4-r1.ebuild
rename to dev-python/matplotlib/matplotlib-2.2.4.ebuild
index d9582ac4e24..738f51416fb 100644
--- a/dev-python/matplotlib/matplotlib-2.2.4-r1.ebuild
+++ b/dev-python/matplotlib/matplotlib-2.2.4.ebuild
@@ -39,8 +39,7 @@ PY2_DEPEND="
$(python_gen_cond_dep 'dev-python/backports-functools-lru-cache[${PYTHON_USEDEP}]' python2_7)"
COMMON_DEPEND="
dev-python/cycler[${PYTHON_USEDEP}]
- $(python_gen_cond_dep '|| ( dev-python/numpy-python2[${PYTHON_USEDEP}] >=dev-python/numpy-1.7.1[${PYTHON_USEDEP}] )' 'python2*')
- $(python_gen_cond_dep '>=dev-python/numpy-1.7.1[${PYTHON_USEDEP}]' 'python3*')
+ >=dev-python/numpy-1.7.1[${PYTHON_USEDEP}]
dev-python/python-dateutil:0[${PYTHON_USEDEP}]
dev-python/pytz[${PYTHON_USEDEP}]
>=dev-python/six-1.10[${PYTHON_USEDEP}]