| 1 |
commit: 2761842aa02a4b9f086aa967463d1112f50c2a26 |
| 2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat May 14 21:30:19 2022 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat May 14 21:30:19 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2761842a |
| 7 |
|
| 8 |
sci-chemistry/gromacs: [QA] tc-has-openmp → tc-check-openmp |
| 9 |
|
| 10 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
| 11 |
|
| 12 |
sci-chemistry/gromacs/gromacs-2018.8-r1.ebuild | 8 +++++--- |
| 13 |
sci-chemistry/gromacs/gromacs-2019.6-r1.ebuild | 8 +++++--- |
| 14 |
sci-chemistry/gromacs/gromacs-2019.6-r2.ebuild | 8 +++++--- |
| 15 |
sci-chemistry/gromacs/gromacs-2020.4-r1.ebuild | 5 ++--- |
| 16 |
sci-chemistry/gromacs/gromacs-2020.7.ebuild | 5 ++--- |
| 17 |
sci-chemistry/gromacs/gromacs-2021.3-r1.ebuild | 5 ++--- |
| 18 |
sci-chemistry/gromacs/gromacs-2021.5.ebuild | 5 ++--- |
| 19 |
sci-chemistry/gromacs/gromacs-2021.9999.ebuild | 5 ++--- |
| 20 |
sci-chemistry/gromacs/gromacs-2022.1.ebuild | 5 ++--- |
| 21 |
sci-chemistry/gromacs/gromacs-2022.9999.ebuild | 5 ++--- |
| 22 |
sci-chemistry/gromacs/gromacs-2022.ebuild | 5 ++--- |
| 23 |
sci-chemistry/gromacs/gromacs-9999.ebuild | 5 ++--- |
| 24 |
12 files changed, 33 insertions(+), 36 deletions(-) |
| 25 |
|
| 26 |
diff --git a/sci-chemistry/gromacs/gromacs-2018.8-r1.ebuild b/sci-chemistry/gromacs/gromacs-2018.8-r1.ebuild |
| 27 |
index 4423a8eed2ad..fb79ed729b5a 100644 |
| 28 |
--- a/sci-chemistry/gromacs/gromacs-2018.8-r1.ebuild |
| 29 |
+++ b/sci-chemistry/gromacs/gromacs-2018.8-r1.ebuild |
| 30 |
@@ -58,9 +58,11 @@ RESTRICT="!test? ( test )" |
| 31 |
S="${WORKDIR}/${PN}-${PV/_/-}" |
| 32 |
|
| 33 |
pkg_pretend() { |
| 34 |
- [[ $(gcc-version) == "4.1" ]] && die "gcc 4.1 is not supported by gromacs" |
| 35 |
- use openmp && ! tc-has-openmp && \ |
| 36 |
- die "Please switch to an openmp compatible compiler" |
| 37 |
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp |
| 38 |
+} |
| 39 |
+ |
| 40 |
+pkg_setup() { |
| 41 |
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp |
| 42 |
} |
| 43 |
|
| 44 |
src_prepare() { |
| 45 |
|
| 46 |
diff --git a/sci-chemistry/gromacs/gromacs-2019.6-r1.ebuild b/sci-chemistry/gromacs/gromacs-2019.6-r1.ebuild |
| 47 |
index cacbc3eef174..b04308aaa907 100644 |
| 48 |
--- a/sci-chemistry/gromacs/gromacs-2019.6-r1.ebuild |
| 49 |
+++ b/sci-chemistry/gromacs/gromacs-2019.6-r1.ebuild |
| 50 |
@@ -61,9 +61,11 @@ RESTRICT="!test? ( test )" |
| 51 |
S="${WORKDIR}/${PN}-${PV/_/-}" |
| 52 |
|
| 53 |
pkg_pretend() { |
| 54 |
- [[ $(gcc-version) == "4.1" ]] && die "gcc 4.1 is not supported by gromacs" |
| 55 |
- use openmp && ! tc-has-openmp && \ |
| 56 |
- die "Please switch to an openmp compatible compiler" |
| 57 |
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp |
| 58 |
+} |
| 59 |
+ |
| 60 |
+pkg_setup() { |
| 61 |
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp |
| 62 |
} |
| 63 |
|
| 64 |
src_prepare() { |
| 65 |
|
| 66 |
diff --git a/sci-chemistry/gromacs/gromacs-2019.6-r2.ebuild b/sci-chemistry/gromacs/gromacs-2019.6-r2.ebuild |
| 67 |
index b01b57f54196..71a5399a8a70 100644 |
| 68 |
--- a/sci-chemistry/gromacs/gromacs-2019.6-r2.ebuild |
| 69 |
+++ b/sci-chemistry/gromacs/gromacs-2019.6-r2.ebuild |
| 70 |
@@ -63,9 +63,11 @@ S="${WORKDIR}/${PN}-${PV/_/-}" |
| 71 |
PATCHES=( "${FILESDIR}/${P}-missing-include.patch" ) |
| 72 |
|
| 73 |
pkg_pretend() { |
| 74 |
- [[ $(gcc-version) == "4.1" ]] && die "gcc 4.1 is not supported by gromacs" |
| 75 |
- use openmp && ! tc-has-openmp && \ |
| 76 |
- die "Please switch to an openmp compatible compiler" |
| 77 |
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp |
| 78 |
+} |
| 79 |
+ |
| 80 |
+pkg_setup() { |
| 81 |
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp |
| 82 |
} |
| 83 |
|
| 84 |
src_prepare() { |
| 85 |
|
| 86 |
diff --git a/sci-chemistry/gromacs/gromacs-2020.4-r1.ebuild b/sci-chemistry/gromacs/gromacs-2020.4-r1.ebuild |
| 87 |
index cd8f59f82ed7..3d38fc4523bb 100644 |
| 88 |
--- a/sci-chemistry/gromacs/gromacs-2020.4-r1.ebuild |
| 89 |
+++ b/sci-chemistry/gromacs/gromacs-2020.4-r1.ebuild |
| 90 |
@@ -90,12 +90,11 @@ fi |
| 91 |
PATCHES=( "${FILESDIR}/${PN}-2020-pytest.patch" ) |
| 92 |
|
| 93 |
pkg_pretend() { |
| 94 |
- [[ $(gcc-version) == "4.1" ]] && die "gcc 4.1 is not supported by gromacs" |
| 95 |
- use openmp && ! tc-has-openmp && \ |
| 96 |
- die "Please switch to an openmp compatible compiler" |
| 97 |
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp |
| 98 |
} |
| 99 |
|
| 100 |
pkg_setup() { |
| 101 |
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp |
| 102 |
python-single-r1_pkg_setup |
| 103 |
} |
| 104 |
|
| 105 |
|
| 106 |
diff --git a/sci-chemistry/gromacs/gromacs-2020.7.ebuild b/sci-chemistry/gromacs/gromacs-2020.7.ebuild |
| 107 |
index b5211f6374ac..2e38306eb66f 100644 |
| 108 |
--- a/sci-chemistry/gromacs/gromacs-2020.7.ebuild |
| 109 |
+++ b/sci-chemistry/gromacs/gromacs-2020.7.ebuild |
| 110 |
@@ -90,12 +90,11 @@ fi |
| 111 |
PATCHES=( "${FILESDIR}/${PN}-2020-pytest.patch" ) |
| 112 |
|
| 113 |
pkg_pretend() { |
| 114 |
- [[ $(gcc-version) == "4.1" ]] && die "gcc 4.1 is not supported by gromacs" |
| 115 |
- use openmp && ! tc-has-openmp && \ |
| 116 |
- die "Please switch to an openmp compatible compiler" |
| 117 |
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp |
| 118 |
} |
| 119 |
|
| 120 |
pkg_setup() { |
| 121 |
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp |
| 122 |
python-single-r1_pkg_setup |
| 123 |
} |
| 124 |
|
| 125 |
|
| 126 |
diff --git a/sci-chemistry/gromacs/gromacs-2021.3-r1.ebuild b/sci-chemistry/gromacs/gromacs-2021.3-r1.ebuild |
| 127 |
index 9ebdeb01146c..1ea7d0f255b7 100644 |
| 128 |
--- a/sci-chemistry/gromacs/gromacs-2021.3-r1.ebuild |
| 129 |
+++ b/sci-chemistry/gromacs/gromacs-2021.3-r1.ebuild |
| 130 |
@@ -90,12 +90,11 @@ if [[ ${PV} != *9999 ]]; then |
| 131 |
fi |
| 132 |
|
| 133 |
pkg_pretend() { |
| 134 |
- [[ $(gcc-version) == "4.1" ]] && die "gcc 4.1 is not supported by gromacs" |
| 135 |
- use openmp && ! tc-has-openmp && \ |
| 136 |
- die "Please switch to an openmp compatible compiler" |
| 137 |
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp |
| 138 |
} |
| 139 |
|
| 140 |
pkg_setup() { |
| 141 |
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp |
| 142 |
python-single-r1_pkg_setup |
| 143 |
} |
| 144 |
|
| 145 |
|
| 146 |
diff --git a/sci-chemistry/gromacs/gromacs-2021.5.ebuild b/sci-chemistry/gromacs/gromacs-2021.5.ebuild |
| 147 |
index abf5ed8ec5ef..b797cea596be 100644 |
| 148 |
--- a/sci-chemistry/gromacs/gromacs-2021.5.ebuild |
| 149 |
+++ b/sci-chemistry/gromacs/gromacs-2021.5.ebuild |
| 150 |
@@ -90,12 +90,11 @@ if [[ ${PV} != *9999 ]]; then |
| 151 |
fi |
| 152 |
|
| 153 |
pkg_pretend() { |
| 154 |
- [[ $(gcc-version) == "4.1" ]] && die "gcc 4.1 is not supported by gromacs" |
| 155 |
- use openmp && ! tc-has-openmp && \ |
| 156 |
- die "Please switch to an openmp compatible compiler" |
| 157 |
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp |
| 158 |
} |
| 159 |
|
| 160 |
pkg_setup() { |
| 161 |
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp |
| 162 |
python-single-r1_pkg_setup |
| 163 |
} |
| 164 |
|
| 165 |
|
| 166 |
diff --git a/sci-chemistry/gromacs/gromacs-2021.9999.ebuild b/sci-chemistry/gromacs/gromacs-2021.9999.ebuild |
| 167 |
index d9c7e8a5269e..8e32fc1644e1 100644 |
| 168 |
--- a/sci-chemistry/gromacs/gromacs-2021.9999.ebuild |
| 169 |
+++ b/sci-chemistry/gromacs/gromacs-2021.9999.ebuild |
| 170 |
@@ -88,12 +88,11 @@ if [[ ${PV} != *9999 ]]; then |
| 171 |
fi |
| 172 |
|
| 173 |
pkg_pretend() { |
| 174 |
- [[ $(gcc-version) == "4.1" ]] && die "gcc 4.1 is not supported by gromacs" |
| 175 |
- use openmp && ! tc-has-openmp && \ |
| 176 |
- die "Please switch to an openmp compatible compiler" |
| 177 |
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp |
| 178 |
} |
| 179 |
|
| 180 |
pkg_setup() { |
| 181 |
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp |
| 182 |
python-single-r1_pkg_setup |
| 183 |
} |
| 184 |
|
| 185 |
|
| 186 |
diff --git a/sci-chemistry/gromacs/gromacs-2022.1.ebuild b/sci-chemistry/gromacs/gromacs-2022.1.ebuild |
| 187 |
index 338c03cc2a11..80afa36142da 100644 |
| 188 |
--- a/sci-chemistry/gromacs/gromacs-2022.1.ebuild |
| 189 |
+++ b/sci-chemistry/gromacs/gromacs-2022.1.ebuild |
| 190 |
@@ -87,12 +87,11 @@ if [[ ${PV} != *9999 ]]; then |
| 191 |
fi |
| 192 |
|
| 193 |
pkg_pretend() { |
| 194 |
- [[ $(gcc-version) == "4.1" ]] && die "gcc 4.1 is not supported by gromacs" |
| 195 |
- use openmp && ! tc-has-openmp && \ |
| 196 |
- die "Please switch to an openmp compatible compiler" |
| 197 |
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp |
| 198 |
} |
| 199 |
|
| 200 |
pkg_setup() { |
| 201 |
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp |
| 202 |
python-single-r1_pkg_setup |
| 203 |
} |
| 204 |
|
| 205 |
|
| 206 |
diff --git a/sci-chemistry/gromacs/gromacs-2022.9999.ebuild b/sci-chemistry/gromacs/gromacs-2022.9999.ebuild |
| 207 |
index 655c647a73dd..101a76d94cf9 100644 |
| 208 |
--- a/sci-chemistry/gromacs/gromacs-2022.9999.ebuild |
| 209 |
+++ b/sci-chemistry/gromacs/gromacs-2022.9999.ebuild |
| 210 |
@@ -85,12 +85,11 @@ if [[ ${PV} != *9999 ]]; then |
| 211 |
fi |
| 212 |
|
| 213 |
pkg_pretend() { |
| 214 |
- [[ $(gcc-version) == "4.1" ]] && die "gcc 4.1 is not supported by gromacs" |
| 215 |
- use openmp && ! tc-has-openmp && \ |
| 216 |
- die "Please switch to an openmp compatible compiler" |
| 217 |
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp |
| 218 |
} |
| 219 |
|
| 220 |
pkg_setup() { |
| 221 |
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp |
| 222 |
python-single-r1_pkg_setup |
| 223 |
} |
| 224 |
|
| 225 |
|
| 226 |
diff --git a/sci-chemistry/gromacs/gromacs-2022.ebuild b/sci-chemistry/gromacs/gromacs-2022.ebuild |
| 227 |
index 338c03cc2a11..80afa36142da 100644 |
| 228 |
--- a/sci-chemistry/gromacs/gromacs-2022.ebuild |
| 229 |
+++ b/sci-chemistry/gromacs/gromacs-2022.ebuild |
| 230 |
@@ -87,12 +87,11 @@ if [[ ${PV} != *9999 ]]; then |
| 231 |
fi |
| 232 |
|
| 233 |
pkg_pretend() { |
| 234 |
- [[ $(gcc-version) == "4.1" ]] && die "gcc 4.1 is not supported by gromacs" |
| 235 |
- use openmp && ! tc-has-openmp && \ |
| 236 |
- die "Please switch to an openmp compatible compiler" |
| 237 |
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp |
| 238 |
} |
| 239 |
|
| 240 |
pkg_setup() { |
| 241 |
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp |
| 242 |
python-single-r1_pkg_setup |
| 243 |
} |
| 244 |
|
| 245 |
|
| 246 |
diff --git a/sci-chemistry/gromacs/gromacs-9999.ebuild b/sci-chemistry/gromacs/gromacs-9999.ebuild |
| 247 |
index 655c647a73dd..101a76d94cf9 100644 |
| 248 |
--- a/sci-chemistry/gromacs/gromacs-9999.ebuild |
| 249 |
+++ b/sci-chemistry/gromacs/gromacs-9999.ebuild |
| 250 |
@@ -85,12 +85,11 @@ if [[ ${PV} != *9999 ]]; then |
| 251 |
fi |
| 252 |
|
| 253 |
pkg_pretend() { |
| 254 |
- [[ $(gcc-version) == "4.1" ]] && die "gcc 4.1 is not supported by gromacs" |
| 255 |
- use openmp && ! tc-has-openmp && \ |
| 256 |
- die "Please switch to an openmp compatible compiler" |
| 257 |
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp |
| 258 |
} |
| 259 |
|
| 260 |
pkg_setup() { |
| 261 |
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp |
| 262 |
python-single-r1_pkg_setup |
| 263 |
} |
Archives