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 3140A138350 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 52D89E089C; Mon, 27 Jan 2020 18:18:17 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 3B1FDE089C 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 4BD7034E48F 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 DFC7FE5 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.1a97fa93304f40cd96c86cdcfeebcf32b1d18646.zerochaos@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/scipy/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-libs/scipy/scipy-1.1.0-r2.ebuild sci-libs/scipy/scipy-1.1.0.ebuild X-VCS-Directories: sci-libs/scipy/ X-VCS-Committer: zerochaos X-VCS-Committer-Name: Rick Farina X-VCS-Revision: 1a97fa93304f40cd96c86cdcfeebcf32b1d18646 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: be8f4fe1-8869-4fcd-8cb9-71182514aedd X-Archives-Hash: 9c079e77a23b5a07328479a7bd9112f7 commit: 1a97fa93304f40cd96c86cdcfeebcf32b1d18646 Author: Rick Farina gentoo org> AuthorDate: Mon Jan 27 18:16:54 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=1a97fa93 sci-libs/scipy: fixing numpy deps Package-Manager: Portage-2.3.85, Repoman-2.3.20 Signed-off-by: Rick Farina gentoo.org> sci-libs/scipy/{scipy-1.1.0.ebuild => scipy-1.1.0-r2.ebuild} | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sci-libs/scipy/scipy-1.1.0.ebuild b/sci-libs/scipy/scipy-1.1.0-r2.ebuild similarity index 94% rename from sci-libs/scipy/scipy-1.1.0.ebuild rename to sci-libs/scipy/scipy-1.1.0-r2.ebuild index a676281fbac..68223502d2c 100644 --- a/sci-libs/scipy/scipy-1.1.0.ebuild +++ b/sci-libs/scipy/scipy-1.1.0-r2.ebuild @@ -26,7 +26,8 @@ RESTRICT="!test? ( test )" KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" CDEPEND=" - >=dev-python/numpy-1.10[lapack,${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*') sci-libs/arpack:0= virtual/cblas virtual/lapack