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 CDD17138353 for ; Mon, 27 Jan 2020 20:54:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0FF26E08C0; 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 D6F0BE089E for ; Mon, 27 Jan 2020 20:54:53 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 C364434E434 for ; Mon, 27 Jan 2020 20:54:52 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 68E9AE5 for ; Mon, 27 Jan 2020 20:54:51 +0000 (UTC) From: "Michał Górny" 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" Message-ID: <1580158483.be70e7ea0c9382d2c68d7bb48444e4265940317c.mgorny@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: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: be70e7ea0c9382d2c68d7bb48444e4265940317c X-VCS-Branch: master Date: Mon, 27 Jan 2020 20:54:51 +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: 0c2cb2c5-dd93-4d80-afde-046c04d98d6c X-Archives-Hash: 2d52444ec453a5e1317967dc0096ef65 commit: be70e7ea0c9382d2c68d7bb48444e4265940317c Author: Michał Górny gentoo org> AuthorDate: Mon Jan 27 20:42:49 2020 +0000 Commit: Michał Górny gentoo org> CommitDate: Mon Jan 27 20:54:43 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be70e7ea sci-libs/scipy: Revert "fixing numpy deps" Change done in explicit violation of maintainer's request. Signed-off-by: Michał Górny gentoo.org> sci-libs/scipy/{scipy-1.1.0-r2.ebuild => scipy-1.1.0.ebuild} | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sci-libs/scipy/scipy-1.1.0-r2.ebuild b/sci-libs/scipy/scipy-1.1.0.ebuild similarity index 94% rename from sci-libs/scipy/scipy-1.1.0-r2.ebuild rename to sci-libs/scipy/scipy-1.1.0.ebuild index 68223502d2c..a676281fbac 100644 --- a/sci-libs/scipy/scipy-1.1.0-r2.ebuild +++ b/sci-libs/scipy/scipy-1.1.0.ebuild @@ -26,8 +26,7 @@ RESTRICT="!test? ( test )" KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" CDEPEND=" - $(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.10[lapack,${PYTHON_USEDEP}] sci-libs/arpack:0= virtual/cblas virtual/lapack