public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Rick Farina" <zerochaos@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/scipy/
Date: Mon, 27 Jan 2020 18:18:13 +0000 (UTC)	[thread overview]
Message-ID: <1580149096.1a97fa93304f40cd96c86cdcfeebcf32b1d18646.zerochaos@gentoo> (raw)

commit:     1a97fa93304f40cd96c86cdcfeebcf32b1d18646
Author:     Rick Farina <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 27 18:16:54 2020 +0000
Commit:     Rick Farina <zerochaos <AT> gentoo <DOT> 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 <zerochaos <AT> 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


             reply	other threads:[~2020-01-27 18:18 UTC|newest]

Thread overview: 43+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-01-27 18:18 Rick Farina [this message]
  -- strict thread matches above, loose matches on Subject: below --
2020-08-02 12:03 [gentoo-commits] repo/gentoo:master commit in: sci-libs/scipy/ Michał Górny
2020-07-24 14:31 Michał Górny
2020-07-08  8:26 Michał Górny
2020-06-22 15:36 Michał Górny
2020-06-16 22:02 David Seifert
2020-06-10  8:11 Michał Górny
2020-06-10  7:37 Michał Górny
2020-06-07 21:03 Alexey Shvetsov
2020-06-05 13:13 Michał Górny
2020-06-05 10:55 Michał Górny
2020-06-05 10:55 Michał Górny
2020-05-13 10:08 Agostino Sarubbo
2020-05-12 14:47 Agostino Sarubbo
2020-03-07 15:11 Michał Górny
2020-01-27 20:54 Michał Górny
2020-01-27  4:59 Benda XU
2019-12-30 12:59 Michał Górny
2019-12-26  2:42 Jason Zaman
2018-06-27 21:04 Pacho Ramos
2018-06-14 13:11 Alexey Shvetsov
2018-05-17 13:52 Thomas Deutschmann
2018-03-30 17:26 Sergei Trofimovich
2018-03-29  6:17 Sergei Trofimovich
2017-11-30 11:52 Marek Szuba
2017-07-04 17:43 Sebastien Fabbro
2017-06-28  4:02 Sebastien Fabbro
2017-05-20  9:52 Justin Lecher
2017-05-19  8:13 Justin Lecher
2017-03-19 12:45 David Seifert
2017-03-11  1:58 Zac Medico
2016-10-08 12:13 David Seifert
2016-03-16 11:51 Agostino Sarubbo
2016-02-14 10:11 Agostino Sarubbo
2016-01-29  9:09 Justin Lecher
2016-01-26 16:42 Agostino Sarubbo
2016-01-25 19:45 Justin Lecher
2016-01-25 19:45 Justin Lecher
2015-11-11 17:27 Justin Lecher
2015-10-31 10:25 Justin Lecher
2015-10-30 12:03 Justin Lecher
2015-10-29  8:20 Justin Lecher
2015-10-25 18:10 Justin Lecher

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=1580149096.1a97fa93304f40cd96c86cdcfeebcf32b1d18646.zerochaos@gentoo \
    --to=zerochaos@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