sci-chemistry/vmd: Switch to PYTHON_MULTI_USEDEP API

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 2cee984cdd4797ccd9b9940a89a04b0780d68f1a..92daf030477557decb6b501102473fe558bda1c1 100644 (file)
--- a/sci-chemistry/vmd/vmd-1.9.2.ebuild
+++ b/sci-chemistry/vmd/vmd-1.9.2.ebuild
@@ -27,10 +27,12 @@ CDEPEND="
        >=dev-lang/tk-8.6.1
        dev-lang/perl
        dev-libs/expat
-       || (
-               dev-python/numpy-python2[${PYTHON_USEDEP}]
-               dev-python/numpy[${PYTHON_USEDEP}]
-       )
+       $(python_gen_cond_dep '
+               || (
+                       dev-python/numpy-python2[${PYTHON_MULTI_USEDEP}]
+                       dev-python/numpy[${PYTHON_MULTI_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 abf5d03202fc9df3eeff1da1de6228d9ff95f9eb..f42cb4d104fe991e7dac2ba6c22c4a8afe56bcd6 100644 (file)
--- a/sci-chemistry/vmd/vmd-1.9.3-r1.ebuild
+++ b/sci-chemistry/vmd/vmd-1.9.3-r1.ebuild
@@ -27,10 +27,12 @@ CDEPEND="
        >=dev-lang/tk-8.6.1:0=
        dev-lang/perl
        dev-libs/expat
-       || (
-               dev-python/numpy-python2[${PYTHON_USEDEP}]
-               dev-python/numpy[${PYTHON_USEDEP}]
-       )
+       $(python_gen_cond_dep '
+               || (
+                       dev-python/numpy-python2[${PYTHON_MULTI_USEDEP}]
+                       dev-python/numpy[${PYTHON_MULTI_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-r3.ebuild b/sci-chemistry/vmd/vmd-1.9.3-r4.ebuild
similarity index 98%
rename from sci-chemistry/vmd/vmd-1.9.3-r3.ebuild
rename to sci-chemistry/vmd/vmd-1.9.3-r4.ebuild
index 8d8897a57f8ae11229a867d6a434fa1f5a5f18a4..39e7a9751cee1105f8c121da19c0353157de65f2 100644 (file)
--- a/sci-chemistry/vmd/vmd-1.9.3-r3.ebuild
+++ b/sci-chemistry/vmd/vmd-1.9.3-r4.ebuild
@@ -27,10 +27,12 @@ CDEPEND="
        >=dev-lang/tk-8.6.1:0=
        dev-lang/perl
        dev-libs/expat
-       || (
-               dev-python/numpy-python2[${PYTHON_USEDEP}]
-               dev-python/numpy[${PYTHON_USEDEP}]
-       )
+       $(python_gen_cond_dep '
+               || (
+                       dev-python/numpy-python2[${PYTHON_MULTI_USEDEP}]
+                       dev-python/numpy[${PYTHON_MULTI_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 01098a723def98fafdb5bad675037ae49aff1f09..88394af1970dfa00c473ce8452d54f5632f5a4f1 100644 (file)
--- a/sci-chemistry/vmd/vmd-1.9.3.ebuild
+++ b/sci-chemistry/vmd/vmd-1.9.3.ebuild
@@ -27,10 +27,12 @@ CDEPEND="
        >=dev-lang/tk-8.6.1
        dev-lang/perl
        dev-libs/expat
-       || (
-               dev-python/numpy-python2[${PYTHON_USEDEP}]
-               dev-python/numpy[${PYTHON_USEDEP}]
-       )
+       $(python_gen_cond_dep '
+               || (
+                       dev-python/numpy-python2[${PYTHON_MULTI_USEDEP}]
+                       dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+               )
+       ')
        sci-libs/netcdf:0=
        virtual/opengl
        >=x11-libs/fltk-1.1.10-r2:1