sci-chemistry/vmd: Permit numpy-python2

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

diff --git a/sci-chemistry/vmd/vmd-1.9.2.ebuild b/sci-chemistry/vmd/vmd-1.9.2.ebuild
index 4bc9360f009b15213391acc2b963bcc33a8a201f..2cee984cdd4797ccd9b9940a89a04b0780d68f1a 100644 (file)
--- 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 3f24f85d6273d81aa72cd5dbfddf6624dfcc8097..abf5d03202fc9df3eeff1da1de6228d9ff95f9eb 100644 (file)
--- 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 02ad806afbeb421e15dd21acc322b3950a0ec713..8d8897a57f8ae11229a867d6a434fa1f5a5f18a4 100644 (file)
--- 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 c1480738aa469b1b01370fc1b9740e2078fa9f63..01098a723def98fafdb5bad675037ae49aff1f09 100644 (file)
--- 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