sci-physics/espresso: Switch to PYTHON_MULTI_USEDEP API

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

diff --git a/sci-physics/espresso/espresso-4.0.0-r1.ebuild b/sci-physics/espresso/espresso-4.0.0-r2.ebuild
similarity index 95%
rename from sci-physics/espresso/espresso-4.0.0-r1.ebuild
rename to sci-physics/espresso/espresso-4.0.0-r2.ebuild
index 00b53caa2efcac53785dafc52eaaf05588040908..0afbf393e9a98cc70bb48f9fdc1c215d1102bc6f 100644 (file)
--- a/sci-physics/espresso/espresso-4.0.0-r1.ebuild
+++ b/sci-physics/espresso/espresso-4.0.0-r2.ebuild
@@ -31,8 +31,10 @@ REQUIRED_USE="
 
 RDEPEND="
        ${PYTHON_DEPS}
-       >=dev-python/cython-0.26.1[${PYTHON_USEDEP}]
-       dev-python/numpy[${PYTHON_USEDEP}]
+       $(python_gen_cond_dep '
+               >=dev-python/cython-0.26.1[${PYTHON_MULTI_USEDEP}]
+               dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+       ')
        cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 )
        fftw? ( sci-libs/fftw:3.0 )
        dev-libs/boost:=[mpi]

diff --git a/sci-physics/espresso/espresso-4.0_pre20170228.ebuild b/sci-physics/espresso/espresso-4.0_pre20170228.ebuild
index 5755eba6cdf1c5c1f6c54a07fe172b2782848c78..e7c540b16298cd6f43c54752eca44a73548eefe7 100644 (file)
--- a/sci-physics/espresso/espresso-4.0_pre20170228.ebuild
+++ b/sci-physics/espresso/espresso-4.0_pre20170228.ebuild
@@ -33,8 +33,10 @@ REQUIRED_USE="
 
 RDEPEND="
        ${PYTHON_DEPS}
-       >dev-python/cython-0.22[${PYTHON_USEDEP}]
-       dev-python/numpy[${PYTHON_USEDEP}]
+       $(python_gen_cond_dep '
+               >dev-python/cython-0.22[${PYTHON_MULTI_USEDEP}]
+               dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+       ')
        cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 )
        fftw? ( sci-libs/fftw:3.0 )
        dev-libs/boost:=[mpi]

diff --git a/sci-physics/espresso/espresso-9999.ebuild b/sci-physics/espresso/espresso-9999.ebuild
index b9d14d3937e59a5e1c0746c5e91bf27eecdcba15..fcc6fbc9926e61802190246dc4cfe233955ff429 100644 (file)
--- a/sci-physics/espresso/espresso-9999.ebuild
+++ b/sci-physics/espresso/espresso-9999.ebuild
@@ -31,8 +31,10 @@ REQUIRED_USE="
 
 RDEPEND="
        ${PYTHON_DEPS}
-       >=dev-python/cython-0.26.1[${PYTHON_USEDEP}]
-       dev-python/numpy[${PYTHON_USEDEP}]
+       $(python_gen_cond_dep '
+               >=dev-python/cython-0.26.1[${PYTHON_MULTI_USEDEP}]
+               dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+       ')
        cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 )
        fftw? ( sci-libs/fftw:3.0 )
        dev-libs/boost:=[mpi]