From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 5E4AA138351 for ; Mon, 27 Jan 2020 18:18:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6976BE089A; Mon, 27 Jan 2020 18:18:17 +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 2C7CEE089A for ; Mon, 27 Jan 2020 18:18:17 +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 2D79034E48E for ; Mon, 27 Jan 2020 18:18:16 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CC1FB35 for ; Mon, 27 Jan 2020 18:18:13 +0000 (UTC) From: "Rick Farina" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Rick Farina" Message-ID: <1580149096.541cd07ad84f501ccb2aacd972ad3bdfdecdaeab.zerochaos@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: zerochaos X-VCS-Committer-Name: Rick Farina X-VCS-Revision: 541cd07ad84f501ccb2aacd972ad3bdfdecdaeab X-VCS-Branch: master Date: Mon, 27 Jan 2020 18:18:13 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 62d4ce8c-b551-45e8-b607-13d75d1d2e2a X-Archives-Hash: 259560df36bfa9c42db49fe787515220 commit: 541cd07ad84f501ccb2aacd972ad3bdfdecdaeab Author: Rick Farina gentoo org> AuthorDate: Mon Jan 27 18:14:00 2020 +0000 Commit: Rick Farina gentoo org> CommitDate: Mon Jan 27 18:18:16 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=541cd07a dev-python/matplotlib: fixing numpy deps Package-Manager: Portage-2.3.85, Repoman-2.3.20 Signed-off-by: Rick Farina gentoo.org> .../{matplotlib-2.2.2-r1.ebuild => matplotlib-2.2.2-r2.ebuild} | 3 ++- .../matplotlib/{matplotlib-2.2.4.ebuild => matplotlib-2.2.4-r1.ebuild} | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dev-python/matplotlib/matplotlib-2.2.2-r1.ebuild b/dev-python/matplotlib/matplotlib-2.2.2-r2.ebuild similarity index 96% rename from dev-python/matplotlib/matplotlib-2.2.2-r1.ebuild rename to dev-python/matplotlib/matplotlib-2.2.2-r2.ebuild index a4c0390e0f3..f8532500675 100644 --- a/dev-python/matplotlib/matplotlib-2.2.2-r1.ebuild +++ b/dev-python/matplotlib/matplotlib-2.2.2-r2.ebuild @@ -41,7 +41,8 @@ PY2_DEPEND=" $(python_gen_cond_dep 'dev-python/backports-functools-lru-cache[${PYTHON_USEDEP}]' python2_7)" COMMON_DEPEND=" dev-python/cycler[${PYTHON_USEDEP}] - >=dev-python/numpy-1.7.1[${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/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.ebuild b/dev-python/matplotlib/matplotlib-2.2.4-r1.ebuild similarity index 96% rename from dev-python/matplotlib/matplotlib-2.2.4.ebuild rename to dev-python/matplotlib/matplotlib-2.2.4-r1.ebuild index 738f51416fb..d9582ac4e24 100644 --- a/dev-python/matplotlib/matplotlib-2.2.4.ebuild +++ b/dev-python/matplotlib/matplotlib-2.2.4-r1.ebuild @@ -39,7 +39,8 @@ PY2_DEPEND=" $(python_gen_cond_dep 'dev-python/backports-functools-lru-cache[${PYTHON_USEDEP}]' python2_7)" COMMON_DEPEND=" dev-python/cycler[${PYTHON_USEDEP}] - >=dev-python/numpy-1.7.1[${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/python-dateutil:0[${PYTHON_USEDEP}] dev-python/pytz[${PYTHON_USEDEP}] >=dev-python/six-1.10[${PYTHON_USEDEP}]