From: "Michał Górny" <mgorny@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-chemistry/vmd/
Date: Thu, 16 Jan 2020 06:39:17 +0000 (UTC) [thread overview]
Message-ID: <1579156687.2ea12cd580ee77a8b6571ecb80b6ac2481904a2d.mgorny@gentoo> (raw)
commit: 2ea12cd580ee77a8b6571ecb80b6ac2481904a2d
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 16 06:28:38 2020 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Jan 16 06:38:07 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ea12cd5
sci-chemistry/vmd: Permit numpy-python2
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sci-chemistry/vmd/vmd-1.9.2.ebuild | 7 +++++--
sci-chemistry/vmd/vmd-1.9.3-r1.ebuild | 7 +++++--
sci-chemistry/vmd/vmd-1.9.3-r2.ebuild | 7 +++++--
sci-chemistry/vmd/vmd-1.9.3.ebuild | 7 +++++--
4 files changed, 20 insertions(+), 8 deletions(-)
diff --git a/sci-chemistry/vmd/vmd-1.9.2.ebuild b/sci-chemistry/vmd/vmd-1.9.2.ebuild
index 4bc9360f009..2cee984cdd4 100644
--- a/sci-chemistry/vmd/vmd-1.9.2.ebuild
+++ b/sci-chemistry/vmd/vmd-1.9.2.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
@@ -27,7 +27,10 @@ CDEPEND="
>=dev-lang/tk-8.6.1
dev-lang/perl
dev-libs/expat
- dev-python/numpy[${PYTHON_USEDEP}]
+ || (
+ dev-python/numpy-python2[${PYTHON_USEDEP}]
+ dev-python/numpy[${PYTHON_USEDEP}]
+ )
sci-libs/netcdf:0=
virtual/opengl
>=x11-libs/fltk-1.1.10-r2:1
diff --git a/sci-chemistry/vmd/vmd-1.9.3-r1.ebuild b/sci-chemistry/vmd/vmd-1.9.3-r1.ebuild
index 3f24f85d627..abf5d03202f 100644
--- a/sci-chemistry/vmd/vmd-1.9.3-r1.ebuild
+++ b/sci-chemistry/vmd/vmd-1.9.3-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=7
@@ -27,7 +27,10 @@ CDEPEND="
>=dev-lang/tk-8.6.1:0=
dev-lang/perl
dev-libs/expat
- dev-python/numpy[${PYTHON_USEDEP}]
+ || (
+ dev-python/numpy-python2[${PYTHON_USEDEP}]
+ dev-python/numpy[${PYTHON_USEDEP}]
+ )
sci-libs/netcdf:0=
virtual/opengl
>=x11-libs/fltk-1.1.10-r2:1
diff --git a/sci-chemistry/vmd/vmd-1.9.3-r2.ebuild b/sci-chemistry/vmd/vmd-1.9.3-r2.ebuild
index 02ad806afbe..8d8897a57f8 100644
--- a/sci-chemistry/vmd/vmd-1.9.3-r2.ebuild
+++ b/sci-chemistry/vmd/vmd-1.9.3-r2.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=7
@@ -27,7 +27,10 @@ CDEPEND="
>=dev-lang/tk-8.6.1:0=
dev-lang/perl
dev-libs/expat
- dev-python/numpy[${PYTHON_USEDEP}]
+ || (
+ dev-python/numpy-python2[${PYTHON_USEDEP}]
+ dev-python/numpy[${PYTHON_USEDEP}]
+ )
sci-libs/netcdf:0=
virtual/opengl
>=x11-libs/fltk-1.1.10-r2:1
diff --git a/sci-chemistry/vmd/vmd-1.9.3.ebuild b/sci-chemistry/vmd/vmd-1.9.3.ebuild
index c1480738aa4..01098a723de 100644
--- a/sci-chemistry/vmd/vmd-1.9.3.ebuild
+++ b/sci-chemistry/vmd/vmd-1.9.3.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
@@ -27,7 +27,10 @@ CDEPEND="
>=dev-lang/tk-8.6.1
dev-lang/perl
dev-libs/expat
- dev-python/numpy[${PYTHON_USEDEP}]
+ || (
+ dev-python/numpy-python2[${PYTHON_USEDEP}]
+ dev-python/numpy[${PYTHON_USEDEP}]
+ )
sci-libs/netcdf:0=
virtual/opengl
>=x11-libs/fltk-1.1.10-r2:1
next reply other threads:[~2020-01-16 6:39 UTC|newest]
Thread overview: 23+ 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-12-26 17:50 [gentoo-commits] repo/gentoo:master commit in: sci-chemistry/vmd/ Ionen Wolkens
2024-07-11 11:42 Pacho Ramos
2024-06-05 17:27 Alexey Shvetsov
2023-05-02 18:42 Pacho Ramos
2023-05-02 18:42 Pacho Ramos
2022-10-15 23:26 Sam James
2022-05-20 19:30 Pacho Ramos
2022-05-20 19:30 Pacho Ramos
2021-11-11 11:03 Pacho Ramos
2021-02-12 12:31 Pacho Ramos
2020-12-06 17:19 Pacho Ramos
2020-09-17 20:58 Pacho Ramos
2020-09-12 22:32 Pacho Ramos
2020-02-09 16:36 Michał Górny
2020-01-22 21:50 Michał Górny
2019-05-30 11:15 Pacho Ramos
2019-02-04 21:56 Ben Kohler
2018-12-24 22:39 Zac Medico
2018-11-10 11:06 Pacho Ramos
2018-06-20 15:31 Alexey Shvetsov
2017-12-08 14:37 Alexey Shvetsov
2016-12-28 11:58 Pacho Ramos
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=1579156687.2ea12cd580ee77a8b6571ecb80b6ac2481904a2d.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