| 1 |
commit: a20cfd13e6d1730e14576ea02e412e38d34135ee |
| 2 |
Author: Guilherme Amadio <amadio <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Feb 28 10:44:13 2023 +0000 |
| 4 |
Commit: Guilherme Amadio <amadio <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Feb 28 10:47:43 2023 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a20cfd13 |
| 7 |
|
| 8 |
sci-physics/root: rely on MYCMAKEARGS from cmake.eclass |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/897900 |
| 11 |
Signed-off-by: Guilherme Amadio <amadio <AT> gentoo.org> |
| 12 |
|
| 13 |
sci-physics/root/root-6.26.08.ebuild | 5 ++--- |
| 14 |
sci-physics/root/root-6.26.9999.ebuild | 5 ++--- |
| 15 |
sci-physics/root/root-6.28.00.ebuild | 5 ++--- |
| 16 |
sci-physics/root/root-6.28.9999.ebuild | 5 ++--- |
| 17 |
sci-physics/root/root-9999.ebuild | 5 ++--- |
| 18 |
5 files changed, 10 insertions(+), 15 deletions(-) |
| 19 |
|
| 20 |
diff --git a/sci-physics/root/root-6.26.08.ebuild b/sci-physics/root/root-6.26.08.ebuild |
| 21 |
index ec8f9983775c..c83e19af3636 100644 |
| 22 |
--- a/sci-physics/root/root-6.26.08.ebuild |
| 23 |
+++ b/sci-physics/root/root-6.26.08.ebuild |
| 24 |
@@ -139,9 +139,9 @@ pkg_setup() { |
| 25 |
use python && python-single-r1_pkg_setup |
| 26 |
|
| 27 |
elog "There are extra options on packages not available in Gentoo." |
| 28 |
- elog "You can use the environment variable EXTRA_ECONF to enable" |
| 29 |
+ elog "You can use the environment variable MYCMAKEARGS to enable" |
| 30 |
elog "these packages. For example, for Vdt you would set:" |
| 31 |
- elog "EXTRA_ECONF=\"-Dbuiltin_vdt=ON -Dvdt=ON\"" |
| 32 |
+ elog "MYCMAKEARGS=\"-Dbuiltin_vdt=ON -Dvdt=ON\"" |
| 33 |
} |
| 34 |
|
| 35 |
src_prepare() { |
| 36 |
@@ -290,7 +290,6 @@ src_configure() { |
| 37 |
-Dx11=$(usex X) |
| 38 |
-Dxml=$(usex xml) |
| 39 |
-Dxrootd=$(usex xrootd) |
| 40 |
- "${EXTRA_ECONF}" |
| 41 |
) |
| 42 |
|
| 43 |
cmake_src_configure |
| 44 |
|
| 45 |
diff --git a/sci-physics/root/root-6.26.9999.ebuild b/sci-physics/root/root-6.26.9999.ebuild |
| 46 |
index ec8f9983775c..c83e19af3636 100644 |
| 47 |
--- a/sci-physics/root/root-6.26.9999.ebuild |
| 48 |
+++ b/sci-physics/root/root-6.26.9999.ebuild |
| 49 |
@@ -139,9 +139,9 @@ pkg_setup() { |
| 50 |
use python && python-single-r1_pkg_setup |
| 51 |
|
| 52 |
elog "There are extra options on packages not available in Gentoo." |
| 53 |
- elog "You can use the environment variable EXTRA_ECONF to enable" |
| 54 |
+ elog "You can use the environment variable MYCMAKEARGS to enable" |
| 55 |
elog "these packages. For example, for Vdt you would set:" |
| 56 |
- elog "EXTRA_ECONF=\"-Dbuiltin_vdt=ON -Dvdt=ON\"" |
| 57 |
+ elog "MYCMAKEARGS=\"-Dbuiltin_vdt=ON -Dvdt=ON\"" |
| 58 |
} |
| 59 |
|
| 60 |
src_prepare() { |
| 61 |
@@ -290,7 +290,6 @@ src_configure() { |
| 62 |
-Dx11=$(usex X) |
| 63 |
-Dxml=$(usex xml) |
| 64 |
-Dxrootd=$(usex xrootd) |
| 65 |
- "${EXTRA_ECONF}" |
| 66 |
) |
| 67 |
|
| 68 |
cmake_src_configure |
| 69 |
|
| 70 |
diff --git a/sci-physics/root/root-6.28.00.ebuild b/sci-physics/root/root-6.28.00.ebuild |
| 71 |
index e25434a11de7..473a60acd759 100644 |
| 72 |
--- a/sci-physics/root/root-6.28.00.ebuild |
| 73 |
+++ b/sci-physics/root/root-6.28.00.ebuild |
| 74 |
@@ -143,9 +143,9 @@ pkg_setup() { |
| 75 |
use python && python-single-r1_pkg_setup |
| 76 |
|
| 77 |
elog "There are extra options on packages not available in Gentoo." |
| 78 |
- elog "You can use the environment variable EXTRA_ECONF to enable" |
| 79 |
+ elog "You can use the environment variable MYCMAKEARGS to enable" |
| 80 |
elog "these packages. For example, for Vdt you would set:" |
| 81 |
- elog "EXTRA_ECONF=\"-Dbuiltin_vdt=ON -Dvdt=ON\"" |
| 82 |
+ elog "MYCMAKEARGS=\"-Dbuiltin_vdt=ON -Dvdt=ON\"" |
| 83 |
} |
| 84 |
|
| 85 |
src_prepare() { |
| 86 |
@@ -307,7 +307,6 @@ src_configure() { |
| 87 |
-Dx11=$(usex X) |
| 88 |
-Dxml=$(usex xml) |
| 89 |
-Dxrootd=$(usex xrootd) |
| 90 |
- "${EXTRA_ECONF}" |
| 91 |
) |
| 92 |
|
| 93 |
# Needs to be here, otherwise gets overriden by cmake.eclass |
| 94 |
|
| 95 |
diff --git a/sci-physics/root/root-6.28.9999.ebuild b/sci-physics/root/root-6.28.9999.ebuild |
| 96 |
index e25434a11de7..473a60acd759 100644 |
| 97 |
--- a/sci-physics/root/root-6.28.9999.ebuild |
| 98 |
+++ b/sci-physics/root/root-6.28.9999.ebuild |
| 99 |
@@ -143,9 +143,9 @@ pkg_setup() { |
| 100 |
use python && python-single-r1_pkg_setup |
| 101 |
|
| 102 |
elog "There are extra options on packages not available in Gentoo." |
| 103 |
- elog "You can use the environment variable EXTRA_ECONF to enable" |
| 104 |
+ elog "You can use the environment variable MYCMAKEARGS to enable" |
| 105 |
elog "these packages. For example, for Vdt you would set:" |
| 106 |
- elog "EXTRA_ECONF=\"-Dbuiltin_vdt=ON -Dvdt=ON\"" |
| 107 |
+ elog "MYCMAKEARGS=\"-Dbuiltin_vdt=ON -Dvdt=ON\"" |
| 108 |
} |
| 109 |
|
| 110 |
src_prepare() { |
| 111 |
@@ -307,7 +307,6 @@ src_configure() { |
| 112 |
-Dx11=$(usex X) |
| 113 |
-Dxml=$(usex xml) |
| 114 |
-Dxrootd=$(usex xrootd) |
| 115 |
- "${EXTRA_ECONF}" |
| 116 |
) |
| 117 |
|
| 118 |
# Needs to be here, otherwise gets overriden by cmake.eclass |
| 119 |
|
| 120 |
diff --git a/sci-physics/root/root-9999.ebuild b/sci-physics/root/root-9999.ebuild |
| 121 |
index e25434a11de7..473a60acd759 100644 |
| 122 |
--- a/sci-physics/root/root-9999.ebuild |
| 123 |
+++ b/sci-physics/root/root-9999.ebuild |
| 124 |
@@ -143,9 +143,9 @@ pkg_setup() { |
| 125 |
use python && python-single-r1_pkg_setup |
| 126 |
|
| 127 |
elog "There are extra options on packages not available in Gentoo." |
| 128 |
- elog "You can use the environment variable EXTRA_ECONF to enable" |
| 129 |
+ elog "You can use the environment variable MYCMAKEARGS to enable" |
| 130 |
elog "these packages. For example, for Vdt you would set:" |
| 131 |
- elog "EXTRA_ECONF=\"-Dbuiltin_vdt=ON -Dvdt=ON\"" |
| 132 |
+ elog "MYCMAKEARGS=\"-Dbuiltin_vdt=ON -Dvdt=ON\"" |
| 133 |
} |
| 134 |
|
| 135 |
src_prepare() { |
| 136 |
@@ -307,7 +307,6 @@ src_configure() { |
| 137 |
-Dx11=$(usex X) |
| 138 |
-Dxml=$(usex xml) |
| 139 |
-Dxrootd=$(usex xrootd) |
| 140 |
- "${EXTRA_ECONF}" |
| 141 |
) |
| 142 |
|
| 143 |
# Needs to be here, otherwise gets overriden by cmake.eclass |
Archives