public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Michał Górny" <mgorny@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-chemistry/relax/
Date: Thu, 16 Jan 2020 06:39:16 +0000 (UTC)	[thread overview]
Message-ID: <1579156686.71c0b83f8d859141d2a39179fc9989386b0089f2.mgorny@gentoo> (raw)

commit:     71c0b83f8d859141d2a39179fc9989386b0089f2
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 16 06:27:57 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Jan 16 06:38:06 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71c0b83f

sci-chemistry/relax: Permit numpy-python2

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 sci-chemistry/relax/relax-4.0.0-r1.ebuild | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/sci-chemistry/relax/relax-4.0.0-r1.ebuild b/sci-chemistry/relax/relax-4.0.0-r1.ebuild
index 5a99d4554ba..da182eead0a 100644
--- a/sci-chemistry/relax/relax-4.0.0-r1.ebuild
+++ b/sci-chemistry/relax/relax-4.0.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -25,7 +25,10 @@ RDEPEND="
 	${PYTHON_DEPS}
 	dev-python/Numdifftools[${PYTHON_USEDEP}]
 	dev-python/matplotlib[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
+	|| (
+		dev-python/numpy-python2[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+	)
 	dev-python/wxpython:${WX_GTK_VER}[${PYTHON_USEDEP}]
 	sci-chemistry/molmol
 	sci-chemistry/pymol[${PYTHON_USEDEP}]


             reply	other threads:[~2020-01-16  6:39 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-01-16  6:39 Michał Górny [this message]
  -- strict thread matches above, loose matches on Subject: below --
2020-02-09 16:36 [gentoo-commits] repo/gentoo:master commit in: sci-chemistry/relax/ Michał Górny
2020-01-28 21:30 Michał Górny
2020-01-28 20:40 Michał Górny
2020-01-22 21:50 Michał Górny
2020-01-16  6:39 Michał Górny
2017-02-23 23:14 Mart Raudsepp
2015-10-25 16:36 Pacho Ramos
2015-10-16  9:21 Justin Lecher
2015-10-12 11:40 Justin Lecher
2015-10-12  9:35 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=1579156686.71c0b83f8d859141d2a39179fc9989386b0089f2.mgorny@gentoo \
    --to=mgorny@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