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/pymol/
Date: Thu, 16 Jan 2020 06:39:16 +0000 (UTC)	[thread overview]
Message-ID: <1579156684.d1a502c6076dba392a82e7a3a476f65f4ac8cf55.mgorny@gentoo> (raw)

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

sci-chemistry/pymol: Permit numpy-python2

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

 sci-chemistry/pymol/pymol-1.8.4.0-r1.ebuild | 5 ++++-
 sci-chemistry/pymol/pymol-2.3.0-r1.ebuild   | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/sci-chemistry/pymol/pymol-1.8.4.0-r1.ebuild b/sci-chemistry/pymol/pymol-1.8.4.0-r1.ebuild
index 0bcafb2e322..d6864f00a97 100644
--- a/sci-chemistry/pymol/pymol-1.8.4.0-r1.ebuild
+++ b/sci-chemistry/pymol/pymol-1.8.4.0-r1.ebuild
@@ -22,7 +22,10 @@ KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="web"
 
 DEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]
+	|| (
+		dev-python/numpy-python2[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+	)
 	dev-python/pmw:py2[${PYTHON_USEDEP}]
 	dev-python/pyopengl[${PYTHON_USEDEP}]
 	media-libs/freeglut

diff --git a/sci-chemistry/pymol/pymol-2.3.0-r1.ebuild b/sci-chemistry/pymol/pymol-2.3.0-r1.ebuild
index b84c2769806..7591fe38393 100644
--- a/sci-chemistry/pymol/pymol-2.3.0-r1.ebuild
+++ b/sci-chemistry/pymol/pymol-2.3.0-r1.ebuild
@@ -22,7 +22,10 @@ IUSE="web"
 DEPEND="
 	dev-libs/msgpack[cxx]
 	dev-libs/mmtf-cpp
-	dev-python/numpy[${PYTHON_USEDEP}]
+	|| (
+		dev-python/numpy-python2[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+	)
 	dev-python/pmw:py2[${PYTHON_USEDEP}]
 	dev-python/pyopengl[${PYTHON_USEDEP}]
 	dev-python/PyQt5[opengl,${PYTHON_USEDEP}]


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

Thread overview: 55+ 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 --
2024-09-05  4:08 [gentoo-commits] repo/gentoo:master commit in: sci-chemistry/pymol/ Eli Schwartz
2024-09-05  4:08 Eli Schwartz
2024-05-17 19:21 Alexey Shvetsov
2024-05-13 16:11 Ulrich Müller
2023-07-20 11:31 Pacho Ramos
2023-07-19  8:28 Pacho Ramos
2023-07-19  8:28 Pacho Ramos
2023-06-24 17:44 Pacho Ramos
2023-05-02 18:42 Pacho Ramos
2023-02-07  9:42 Marek Szuba
2023-02-05 21:01 Marek Szuba
2022-07-31  8:27 Sam James
2022-05-22 11:18 Pacho Ramos
2022-04-08  9:54 Alexey Shvetsov
2021-05-20 15:07 Pacho Ramos
2021-05-16 20:41 Alexey Shvetsov
2021-05-02 19:22 Pacho Ramos
2021-01-18 10:14 David Seifert
2021-01-14 23:11 Pacho Ramos
2021-01-06 15:10 Fabian Groffen
2020-11-28 19:36 Alexey Shvetsov
2020-11-27 13:39 Alexey Shvetsov
2020-11-27 13:31 Alexey Shvetsov
2020-10-14 10:43 Alexey Shvetsov
2020-09-07  8:55 David Seifert
2020-08-01 23:20 Andreas Sturmlechner
2020-06-03 21:22 Alexey Shvetsov
2020-03-04 18:02 Alexey Shvetsov
2020-02-07 18:41 Pacho Ramos
2020-01-28 18:24 Michał Górny
2020-01-22 21:50 Michał Górny
2020-01-16  6:39 Michał Górny
2019-09-27 17:33 Michał Górny
2019-06-01  8:40 Alexey Shvetsov
2019-02-26 14:15 Alexey Shvetsov
2018-11-13 10:13 Alexey Shvetsov
2018-11-08 10:05 Alexey Shvetsov
2018-03-29 11:43 Alexey Shvetsov
2017-09-12 22:58 Matt Turner
2017-03-27 14:09 Alexey Shvetsov
2017-02-25 20:56 Justin Lecher
2017-02-14 15:39 Agostino Sarubbo
2017-02-13 11:13 Agostino Sarubbo
2017-02-12 19:51 Justin Lecher
2016-10-23 20:25 Justin Lecher
2016-09-24 15:56 Alexey Shvetsov
2015-11-12 16:20 Justin Lecher
2015-11-11 15:01 Agostino Sarubbo
2015-11-11 15:00 Agostino Sarubbo
2015-11-11 11:35 Justin Lecher
2015-11-11 11:35 Justin Lecher
2015-11-11 10:39 Agostino Sarubbo
2015-09-24 10:57 Agostino Sarubbo
2015-08-27 15:01 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=1579156684.d1a502c6076dba392a82e7a3a476f65f4ac8cf55.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