sci-physics/root: Switch to PYTHON_MULTI_USEDEP API

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

diff --git a/sci-physics/root/root-6.12.06-r11.ebuild b/sci-physics/root/root-6.12.06-r11.ebuild
index cf9543852ddfa981a59138fb05130fe4cc4865dc..d49c467555c2bb76bfc4d4435432720c89d513f9 100644 (file)
--- a/sci-physics/root/root-6.12.06-r11.ebuild
+++ b/sci-physics/root/root-6.12.06-r11.ebuild
@@ -90,7 +90,11 @@ CDEPEND="
        sqlite? ( dev-db/sqlite:3 )
        ssl? ( dev-libs/openssl:0= )
        tbb? ( dev-cpp/tbb )
-       tmva? ( dev-python/numpy[${PYTHON_USEDEP}] )
+       tmva? (
+               $(python_gen_cond_dep '
+                       dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+               ')
+       )
        vc? ( dev-libs/vc )
        xml? ( dev-libs/libxml2:2= )
        xrootd? ( net-libs/xrootd:0= )

diff --git a/sci-physics/root/root-6.14.08-r4.ebuild b/sci-physics/root/root-6.14.08-r4.ebuild
index 0e7b47c3c07a4582f7b5ac505097c0513754999f..86b2044fd24fa7ac9e0f89a3a37c6d069f1973a8 100644 (file)
--- a/sci-physics/root/root-6.14.08-r4.ebuild
+++ b/sci-physics/root/root-6.14.08-r4.ebuild
@@ -95,7 +95,11 @@ CDEPEND="
        sqlite? ( dev-db/sqlite:3 )
        ssl? ( dev-libs/openssl:0= )
        tbb? ( >=dev-cpp/tbb-2018 )
-       tmva? ( dev-python/numpy[${PYTHON_USEDEP}] )
+       tmva? (
+               $(python_gen_cond_dep '
+                       dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+               ')
+       )
        vc? ( dev-libs/vc:= )
        xml? ( dev-libs/libxml2:2= )
        xrootd? ( net-libs/xrootd:0= )

diff --git a/sci-physics/root/root-6.16.00-r4.ebuild b/sci-physics/root/root-6.16.00-r4.ebuild
index 801efd279db03ab19273e5294aefdc9104670539..aa5745011f802231b7a55a0d53f1f995330f4b96 100644 (file)
--- a/sci-physics/root/root-6.16.00-r4.ebuild
+++ b/sci-physics/root/root-6.16.00-r4.ebuild
@@ -95,7 +95,11 @@ CDEPEND="
        sqlite? ( dev-db/sqlite:3 )
        ssl? ( dev-libs/openssl:0= )
        tbb? ( >=dev-cpp/tbb-2018 )
-       tmva? ( dev-python/numpy[${PYTHON_USEDEP}] )
+       tmva? (
+               $(python_gen_cond_dep '
+                       dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+               ')
+       )
        vc? ( dev-libs/vc:= )
        xml? ( dev-libs/libxml2:2= )
        xrootd? ( net-libs/xrootd:0= )

diff --git a/sci-physics/root/root-6.18.04.ebuild b/sci-physics/root/root-6.18.04-r1.ebuild
similarity index 98%
rename from sci-physics/root/root-6.18.04.ebuild
rename to sci-physics/root/root-6.18.04-r1.ebuild
index 0438e31b9afbfeb7cbc037debba2d15a34e4b3eb..89beda36d2b826d6c779e5b6c6ee728059061263 100644 (file)
--- a/sci-physics/root/root-6.18.04.ebuild
+++ b/sci-physics/root/root-6.18.04-r1.ebuild
@@ -91,7 +91,11 @@ CDEPEND="
        sqlite? ( dev-db/sqlite:3 )
        ssl? ( dev-libs/openssl:0= )
        tbb? ( >=dev-cpp/tbb-2018 )
-       tmva? ( dev-python/numpy[${PYTHON_USEDEP}] )
+       tmva? (
+               $(python_gen_cond_dep '
+                       dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+               ')
+       )
        vc? ( dev-libs/vc:= )
        xml? ( dev-libs/libxml2:2= )
        xrootd? ( net-libs/xrootd:0= )

diff --git a/sci-physics/root/root-9999.ebuild b/sci-physics/root/root-9999.ebuild
index a6dee45e804783ba1bca3bea52e7a4e955ce5ffd..53b2390393ae3a2d4fdd2cfce9507adec45ab7c5 100644 (file)
--- a/sci-physics/root/root-9999.ebuild
+++ b/sci-physics/root/root-9999.ebuild
@@ -103,7 +103,11 @@ CDEPEND="
        sqlite? ( dev-db/sqlite:3 )
        ssl? ( dev-libs/openssl:0= )
        tbb? ( >=dev-cpp/tbb-2018 )
-       tmva? ( dev-python/numpy[${PYTHON_USEDEP}] )
+       tmva? (
+               $(python_gen_cond_dep '
+                       dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+               ')
+       )
        vc? ( dev-libs/vc:= )
        xml? ( dev-libs/libxml2:2= )
        xrootd? ( net-libs/xrootd:0= )