[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/vmd/

[Michał Górny]

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