From 8ba9e5b982ef7fd97b46b4b0f20c93ea71f6c103 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Micha=C5=82=20G=C3=B3rny?= Date: Fri, 7 Feb 2020 19:01:42 +0100 Subject: [PATCH] sci-chemistry/vmd: Switch to PYTHON_MULTI_USEDEP API MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Górny --- sci-chemistry/vmd/vmd-1.9.2.ebuild | 10 ++++++---- sci-chemistry/vmd/vmd-1.9.3-r1.ebuild | 10 ++++++---- .../vmd/{vmd-1.9.3-r3.ebuild => vmd-1.9.3-r4.ebuild} | 10 ++++++---- sci-chemistry/vmd/vmd-1.9.3.ebuild | 10 ++++++---- 4 files changed, 24 insertions(+), 16 deletions(-) rename sci-chemistry/vmd/{vmd-1.9.3-r3.ebuild => vmd-1.9.3-r4.ebuild} (98%) diff --git a/sci-chemistry/vmd/vmd-1.9.2.ebuild b/sci-chemistry/vmd/vmd-1.9.2.ebuild index 2cee984cdd47..92daf0304775 100644 --- 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 abf5d03202fc..f42cb4d104fe 100644 --- 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 8d8897a57f8a..39e7a9751cee 100644 --- 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 01098a723def..88394af1970d 100644 --- 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 -- 2.26.2