| 1 |
commit: 2efa53effda5472007dcfb99247d31a279b067c6 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Feb 8 10:31:21 2020 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Feb 9 16:46:57 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2efa53ef |
| 7 |
|
| 8 |
sci-physics/root: Switch to PYTHON_MULTI_USEDEP API |
| 9 |
|
| 10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 11 |
|
| 12 |
sci-physics/root/root-6.12.06-r11.ebuild | 6 +++++- |
| 13 |
sci-physics/root/root-6.14.08-r4.ebuild | 6 +++++- |
| 14 |
sci-physics/root/root-6.16.00-r4.ebuild | 6 +++++- |
| 15 |
sci-physics/root/{root-6.18.04.ebuild => root-6.18.04-r1.ebuild} | 6 +++++- |
| 16 |
sci-physics/root/root-9999.ebuild | 6 +++++- |
| 17 |
5 files changed, 25 insertions(+), 5 deletions(-) |
| 18 |
|
| 19 |
diff --git a/sci-physics/root/root-6.12.06-r11.ebuild b/sci-physics/root/root-6.12.06-r11.ebuild |
| 20 |
index cf9543852dd..d49c467555c 100644 |
| 21 |
--- a/sci-physics/root/root-6.12.06-r11.ebuild |
| 22 |
+++ b/sci-physics/root/root-6.12.06-r11.ebuild |
| 23 |
@@ -90,7 +90,11 @@ CDEPEND=" |
| 24 |
sqlite? ( dev-db/sqlite:3 ) |
| 25 |
ssl? ( dev-libs/openssl:0= ) |
| 26 |
tbb? ( dev-cpp/tbb ) |
| 27 |
- tmva? ( dev-python/numpy[${PYTHON_USEDEP}] ) |
| 28 |
+ tmva? ( |
| 29 |
+ $(python_gen_cond_dep ' |
| 30 |
+ dev-python/numpy[${PYTHON_MULTI_USEDEP}] |
| 31 |
+ ') |
| 32 |
+ ) |
| 33 |
vc? ( dev-libs/vc ) |
| 34 |
xml? ( dev-libs/libxml2:2= ) |
| 35 |
xrootd? ( net-libs/xrootd:0= ) |
| 36 |
|
| 37 |
diff --git a/sci-physics/root/root-6.14.08-r4.ebuild b/sci-physics/root/root-6.14.08-r4.ebuild |
| 38 |
index 0e7b47c3c07..86b2044fd24 100644 |
| 39 |
--- a/sci-physics/root/root-6.14.08-r4.ebuild |
| 40 |
+++ b/sci-physics/root/root-6.14.08-r4.ebuild |
| 41 |
@@ -95,7 +95,11 @@ CDEPEND=" |
| 42 |
sqlite? ( dev-db/sqlite:3 ) |
| 43 |
ssl? ( dev-libs/openssl:0= ) |
| 44 |
tbb? ( >=dev-cpp/tbb-2018 ) |
| 45 |
- tmva? ( dev-python/numpy[${PYTHON_USEDEP}] ) |
| 46 |
+ tmva? ( |
| 47 |
+ $(python_gen_cond_dep ' |
| 48 |
+ dev-python/numpy[${PYTHON_MULTI_USEDEP}] |
| 49 |
+ ') |
| 50 |
+ ) |
| 51 |
vc? ( dev-libs/vc:= ) |
| 52 |
xml? ( dev-libs/libxml2:2= ) |
| 53 |
xrootd? ( net-libs/xrootd:0= ) |
| 54 |
|
| 55 |
diff --git a/sci-physics/root/root-6.16.00-r4.ebuild b/sci-physics/root/root-6.16.00-r4.ebuild |
| 56 |
index 801efd279db..aa5745011f8 100644 |
| 57 |
--- a/sci-physics/root/root-6.16.00-r4.ebuild |
| 58 |
+++ b/sci-physics/root/root-6.16.00-r4.ebuild |
| 59 |
@@ -95,7 +95,11 @@ CDEPEND=" |
| 60 |
sqlite? ( dev-db/sqlite:3 ) |
| 61 |
ssl? ( dev-libs/openssl:0= ) |
| 62 |
tbb? ( >=dev-cpp/tbb-2018 ) |
| 63 |
- tmva? ( dev-python/numpy[${PYTHON_USEDEP}] ) |
| 64 |
+ tmva? ( |
| 65 |
+ $(python_gen_cond_dep ' |
| 66 |
+ dev-python/numpy[${PYTHON_MULTI_USEDEP}] |
| 67 |
+ ') |
| 68 |
+ ) |
| 69 |
vc? ( dev-libs/vc:= ) |
| 70 |
xml? ( dev-libs/libxml2:2= ) |
| 71 |
xrootd? ( net-libs/xrootd:0= ) |
| 72 |
|
| 73 |
diff --git a/sci-physics/root/root-6.18.04.ebuild b/sci-physics/root/root-6.18.04-r1.ebuild |
| 74 |
similarity index 98% |
| 75 |
rename from sci-physics/root/root-6.18.04.ebuild |
| 76 |
rename to sci-physics/root/root-6.18.04-r1.ebuild |
| 77 |
index 0438e31b9af..89beda36d2b 100644 |
| 78 |
--- a/sci-physics/root/root-6.18.04.ebuild |
| 79 |
+++ b/sci-physics/root/root-6.18.04-r1.ebuild |
| 80 |
@@ -91,7 +91,11 @@ CDEPEND=" |
| 81 |
sqlite? ( dev-db/sqlite:3 ) |
| 82 |
ssl? ( dev-libs/openssl:0= ) |
| 83 |
tbb? ( >=dev-cpp/tbb-2018 ) |
| 84 |
- tmva? ( dev-python/numpy[${PYTHON_USEDEP}] ) |
| 85 |
+ tmva? ( |
| 86 |
+ $(python_gen_cond_dep ' |
| 87 |
+ dev-python/numpy[${PYTHON_MULTI_USEDEP}] |
| 88 |
+ ') |
| 89 |
+ ) |
| 90 |
vc? ( dev-libs/vc:= ) |
| 91 |
xml? ( dev-libs/libxml2:2= ) |
| 92 |
xrootd? ( net-libs/xrootd:0= ) |
| 93 |
|
| 94 |
diff --git a/sci-physics/root/root-9999.ebuild b/sci-physics/root/root-9999.ebuild |
| 95 |
index a6dee45e804..53b2390393a 100644 |
| 96 |
--- a/sci-physics/root/root-9999.ebuild |
| 97 |
+++ b/sci-physics/root/root-9999.ebuild |
| 98 |
@@ -103,7 +103,11 @@ CDEPEND=" |
| 99 |
sqlite? ( dev-db/sqlite:3 ) |
| 100 |
ssl? ( dev-libs/openssl:0= ) |
| 101 |
tbb? ( >=dev-cpp/tbb-2018 ) |
| 102 |
- tmva? ( dev-python/numpy[${PYTHON_USEDEP}] ) |
| 103 |
+ tmva? ( |
| 104 |
+ $(python_gen_cond_dep ' |
| 105 |
+ dev-python/numpy[${PYTHON_MULTI_USEDEP}] |
| 106 |
+ ') |
| 107 |
+ ) |
| 108 |
vc? ( dev-libs/vc:= ) |
| 109 |
xml? ( dev-libs/libxml2:2= ) |
| 110 |
xrootd? ( net-libs/xrootd:0= ) |
Archives