1 |
commit: 5ab4e541e928cbd52d090ae680857ff72ee4dd2f |
2 |
Author: Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru> |
3 |
AuthorDate: Sat Oct 10 00:27:53 2020 +0000 |
4 |
Commit: Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru> |
5 |
CommitDate: Sat Oct 10 00:27:53 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=5ab4e541 |
7 |
|
8 |
sci-physics/SU2: drop old |
9 |
|
10 |
Signed-off-by: Sergey Torokhov <torokhov-s-a <AT> yandex.ru> |
11 |
|
12 |
sci-physics/SU2/Manifest | 6 -- |
13 |
sci-physics/SU2/SU2-7.0.4.ebuild | 112 ------------------------- |
14 |
sci-physics/SU2/SU2-7.0.5.ebuild | 115 -------------------------- |
15 |
sci-physics/SU2/files/SU2-7.0.4-fix-env.patch | 24 ------ |
16 |
sci-physics/SU2/files/SU2-7.0.5-fix-env.patch | 12 --- |
17 |
5 files changed, 269 deletions(-) |
18 |
|
19 |
diff --git a/sci-physics/SU2/Manifest b/sci-physics/SU2/Manifest |
20 |
index a4481036..b68e4c98 100644 |
21 |
--- a/sci-physics/SU2/Manifest |
22 |
+++ b/sci-physics/SU2/Manifest |
23 |
@@ -1,9 +1,3 @@ |
24 |
-DIST SU2-7.0.4-TestCases.tar.gz 437960103 BLAKE2B 2469edc23f62589fa18be5fff6e036965f6b5f6e2be207642d318aac4d2044c07f0891568f86c1a3ab065e79afce50cc73ad0857b82093d79ac28a4d0451a4ad SHA512 f21d963815e024582e99647a21ebae0b17fc69f75bc34bb72cc3a86cc9ff8502342b31755b5da73e7088b4d0ce430bdd6b4efefc03583cbfcf5156c1849328e1 |
25 |
-DIST SU2-7.0.4-Tutorials.tar.gz 64282233 BLAKE2B b0d13a0988d5617868fad6098fe8110e3600415f05784ff04416cb23162fadc8c1d06d50c5200b14f65afb3e97ee766b21dfdcd4ec8ded9026baf510ca829e48 SHA512 604a05e15a8eae1c7255016261a6576a97fc364f66004ecaccaae932e3a97624c2599d354dd874562824caa8f8ea3dac2f03e0105b1c27d66ec0bf59e3a27105 |
26 |
-DIST SU2-7.0.4.tar.gz 20516147 BLAKE2B 21f45e4918bbc6a72bf47ad61d3301abed50a7cf569e9e8d4040201ff653e583d50a547853365302671922f023d0cc6f3735c1afcd0f3b6bf3c3fc92dc807787 SHA512 8e69f0e1d335adef0bd98666c98e29bc15ee0d7a0fcbbbc91a1ba02275ca52fda7f8f47434547f7982ce0e73a6ff78bd2ed57ca328d1e87b8afdd3b0a698d262 |
27 |
-DIST SU2-7.0.5-TestCases.tar.gz 444209661 BLAKE2B a7b14a3ee679a28a3a4530ddca45f39fdc2c0bc5f29fe20e6c9f04d03dee6ca08f98648989b0160ee8742621b539e2f4af9e8bdfb802c3e460a9f3b7e1be3dda SHA512 f21acbaccce66685323566a3f856ceb5fbd36764a8dea875af839520b46be8f7e26491ccb855243f93e4ae948534574080e986faafc2a84c86754fe39f74e240 |
28 |
-DIST SU2-7.0.5-Tutorials.tar.gz 64282246 BLAKE2B 9c8823df5bbda1be80f03dfa6d9de4b4263904acbee15f6928d3758a9b25c84ace59bf02847798838cbf3236961f51589e851e342f288961b2f2a62e28de216c SHA512 2b7c98cc4d060c850572e45418d4ddf38843ced3349a3fb807c1d32f0e5aabf578f8944918e3fc63a32161385eaf69b4742d24ef41d21b43006d5b881a89953b |
29 |
-DIST SU2-7.0.5.tar.gz 20526328 BLAKE2B 0c3b16269f9d8356eaecde991853fe184188b98df62186c56780ee34b26995763adbac0acca53db1625ac9b0dfadc3348eac792e700e66be00a174ff056e017d SHA512 283da35aa4f6bac4d7451506c6b84d98a18dfe7630adfc17764511fba8171b15c36ee80807bbfc1c55e39e196f8ed304fff3eb1182dfac15aa6a86a9613e51ad |
30 |
DIST SU2-7.0.6-TestCases.tar.gz 447944839 BLAKE2B 5212ef7bf69bb40120ca2af99a02f2a89ae6cc0a1e048e57409ee1d2911f930452f4a5ef668126d6b7144c3f81d50bdadd0bcc810f0472740ccbbb6605e5a07d SHA512 c976450e7e17df58b47cbf14d18c4435f977a70dc086d5b74ea584ae14b3204632ef87b2dce6a456396179f1b72ef8eba83065a42d978b8d6966d5446decbd3c |
31 |
DIST SU2-7.0.6-Tutorials.tar.gz 64282244 BLAKE2B 3b0ce136c9fa5c3e0ffc585e28b1a60470eeaf2518cbef539fccc185f79cd41a889e3c3c8a0ada3f488cfe1d2d0115e2768267c6ef4502b882b07f909f6f382c SHA512 4aaf39b98cbbe4c9e12d78027b0ee2b3d30fd614d1e48092d8bfd25c312a06a1621b2192653a7d8ac767762b06ae339ab6fb77e81f833efdb419ce09f92dec2f |
32 |
DIST SU2-7.0.6.tar.gz 20531872 BLAKE2B 30e59bc6876223d87429b79f101a5705f989096a1b81725aa20012567d15b08b6a8a24140cc76b35c6c3657a1d6afa85d56da699ab38dac85714e296d7ad8531 SHA512 a4619dd969c6d9cb20de1d373c8e0af9d56654f9f96d919662897db4c3c8bf52b45fb1239065d480ba1b4f05ba7a17c9540ff3fe47fb0d96864736200cda8bcc |
33 |
|
34 |
diff --git a/sci-physics/SU2/SU2-7.0.4.ebuild b/sci-physics/SU2/SU2-7.0.4.ebuild |
35 |
deleted file mode 100644 |
36 |
index c76208dc..00000000 |
37 |
--- a/sci-physics/SU2/SU2-7.0.4.ebuild |
38 |
+++ /dev/null |
39 |
@@ -1,112 +0,0 @@ |
40 |
-# Copyright 1999-2020 Gentoo Authors |
41 |
-# Distributed under the terms of the GNU General Public License v2 |
42 |
- |
43 |
-EAPI=7 |
44 |
- |
45 |
-PYTHON_COMPAT=( python3_{7,8} ) |
46 |
- |
47 |
-inherit meson python-single-r1 |
48 |
- |
49 |
-DESCRIPTION="SU2: An Open-Source Suite for Multiphysics Simulation and Design" |
50 |
-HOMEPAGE="https://su2code.github.io/" |
51 |
-SRC_URI=" |
52 |
- https://github.com/su2code/SU2/archive/v${PV}.tar.gz -> ${P}.tar.gz |
53 |
- test? ( https://github.com/su2code/TestCases/archive/v${PV}.tar.gz -> ${P}-TestCases.tar.gz ) |
54 |
- tutorials? ( https://github.com/su2code/Tutorials/archive/v${PV}.tar.gz -> ${P}-Tutorials.tar.gz ) |
55 |
-" |
56 |
- |
57 |
-LICENSE="LGPL-2.1" |
58 |
-SLOT="0" |
59 |
-KEYWORDS="~amd64" |
60 |
- |
61 |
-IUSE="cgns -mkl +mpi openblas tecio test tutorials" |
62 |
-RESTRICT="!test? ( test )" |
63 |
-REQUIRED_USE=" |
64 |
- ${PYTHON_REQUIRED_USE} |
65 |
- mkl? ( !openblas ) |
66 |
-" |
67 |
- |
68 |
-RDEPEND=" |
69 |
- ${PYTHON_DEPS} |
70 |
- mpi? ( virtual/mpi[cxx] ) |
71 |
- mkl? ( sci-libs/mkl ) |
72 |
- openblas? ( sci-libs/openblas ) |
73 |
-" |
74 |
-DEPEND=" |
75 |
- ${RDEPEND} |
76 |
- tecio? ( dev-libs/boost:= ) |
77 |
-" |
78 |
-BDEPEND="virtual/pkgconfig" |
79 |
- |
80 |
-PATCHES=( |
81 |
- "${FILESDIR}/${P}-fix-env.patch" |
82 |
- "${FILESDIR}/${P}-unbundle_boost.patch" |
83 |
- "${FILESDIR}/${P}-fix-python-optimize.patch" |
84 |
-) |
85 |
- |
86 |
-DOCS=( "LICENSE.md" "README.md" "SU2_PY/documentation.txt" ) |
87 |
- |
88 |
-src_unpack() { |
89 |
- unpack "${P}.tar.gz" |
90 |
- if use test ; then |
91 |
- einfo "Unpacking ${P}-TestCases.tar.gz to /var/tmp/portage/sci-physics/${P}/work/${P}/TestCases" |
92 |
- tar -C "${P}"/TestCases --strip-components=1 -xzf "${DISTDIR}/${P}-TestCases.tar.gz" || die |
93 |
- fi |
94 |
- if use tutorials ; then |
95 |
- einfo "Unpacking ${P}-Tutorials.tar.gz to /var/tmp/portage/sci-physics/${P}/work/${P}" |
96 |
- mkdir "${P}"/Tutorials |
97 |
- tar -C "${P}"/Tutorials --strip-components=1 -xzf "${DISTDIR}/${P}-Tutorials.tar.gz" || die |
98 |
- fi |
99 |
-} |
100 |
- |
101 |
-src_configure() { |
102 |
- local emesonargs=( |
103 |
- -Denable-autodiff=false |
104 |
- -Denable-directdiff=false |
105 |
- -Denable-pastix=false |
106 |
- -Denable-pywrapper=false |
107 |
- -Dwith-omp=false |
108 |
- $(meson_feature mpi with-mpi) |
109 |
- $(meson_use cgns enable-cgns) |
110 |
- $(meson_use mkl enable-mkl) |
111 |
- $(meson_use openblas enable-openblas) |
112 |
- $(meson_use tecio enable-tecio) |
113 |
- $(meson_use test enable-tests) |
114 |
- ) |
115 |
- meson_src_configure |
116 |
-} |
117 |
- |
118 |
-src_test() { |
119 |
- ln -s ../../${P}-build/SU2_CFD/src/SU2_CFD SU2_PY/SU2_CFD |
120 |
- ln -s ../../${P}-build/SU2_DEF/src/SU2_DEF SU2_PY/SU2_DEF |
121 |
- ln -s ../../${P}-build/SU2_DOT/src/SU2_DOT SU2_PY/SU2_DOT |
122 |
- ln -s ../../${P}-build/SU2_GEO/src/SU2_GEO SU2_PY/SU2_GEO |
123 |
- ln -s ../../${P}-build/SU2_MSH/src/SU2_MSH SU2_PY/SU2_MSH |
124 |
- ln -s ../../${P}-build/SU2_SOL/src/SU2_SOL SU2_PY/SU2_SOL |
125 |
- |
126 |
- export SU2_RUN="${S}/SU2_PY" |
127 |
- export SU2_HOME="${S}" |
128 |
- export PATH=$PATH:$SU2_RUN |
129 |
- export PYTHONPATH=$PYTHONPATH:$SU2_RUN |
130 |
- |
131 |
- einfo "Running UnitTests ..." |
132 |
- ../${P}-build/UnitTests/test_driver |
133 |
- |
134 |
- pushd TestCases/ |
135 |
- use mpi && python parallel_regression.py |
136 |
- use mpi || python serial_regression.py |
137 |
- use tutorials && use mpi && python tutorials.py |
138 |
- popd |
139 |
-} |
140 |
- |
141 |
-src_install() { |
142 |
- meson_src_install |
143 |
- mkdir -p "${ED}$(python_get_sitedir)" |
144 |
- mv "${ED}"/usr/bin/{FSI,SU2,*.py} -t "${ED}$(python_get_sitedir)" |
145 |
- python_optimize "${D}/$(python_get_sitedir)" |
146 |
- |
147 |
- if use tutorials ; then |
148 |
- insinto "/usr/share/${P}" |
149 |
- doins -r Tutorials |
150 |
- fi |
151 |
-} |
152 |
|
153 |
diff --git a/sci-physics/SU2/SU2-7.0.5.ebuild b/sci-physics/SU2/SU2-7.0.5.ebuild |
154 |
deleted file mode 100644 |
155 |
index bc5b90fe..00000000 |
156 |
--- a/sci-physics/SU2/SU2-7.0.5.ebuild |
157 |
+++ /dev/null |
158 |
@@ -1,115 +0,0 @@ |
159 |
-# Copyright 1999-2020 Gentoo Authors |
160 |
-# Distributed under the terms of the GNU General Public License v2 |
161 |
- |
162 |
-EAPI=7 |
163 |
- |
164 |
-PYTHON_COMPAT=( python3_{7,8} ) |
165 |
- |
166 |
-inherit meson python-single-r1 |
167 |
- |
168 |
-DESCRIPTION="SU2: An Open-Source Suite for Multiphysics Simulation and Design" |
169 |
-HOMEPAGE="https://su2code.github.io/" |
170 |
-SRC_URI=" |
171 |
- https://github.com/su2code/SU2/archive/v${PV}.tar.gz -> ${P}.tar.gz |
172 |
- test? ( https://github.com/su2code/TestCases/archive/v${PV}.tar.gz -> ${P}-TestCases.tar.gz ) |
173 |
- tutorials? ( https://github.com/su2code/Tutorials/archive/v${PV}.tar.gz -> ${P}-Tutorials.tar.gz ) |
174 |
-" |
175 |
- |
176 |
-LICENSE="LGPL-2.1" |
177 |
-SLOT="0" |
178 |
-KEYWORDS="~amd64" |
179 |
- |
180 |
-# cgns, metis, parmetis are bundled; |
181 |
-# omp is disable as it's experimental; |
182 |
-# pastix is disabled as it's try to find bundled libs; |
183 |
-IUSE="cgns -mkl +mpi openblas tecio test tutorials" |
184 |
-RESTRICT="!test? ( test )" |
185 |
-REQUIRED_USE=" |
186 |
- ${PYTHON_REQUIRED_USE} |
187 |
- mkl? ( !openblas ) |
188 |
-" |
189 |
- |
190 |
-RDEPEND=" |
191 |
- ${PYTHON_DEPS} |
192 |
- mpi? ( virtual/mpi[cxx] ) |
193 |
- mkl? ( sci-libs/mkl ) |
194 |
- openblas? ( sci-libs/openblas ) |
195 |
-" |
196 |
-DEPEND=" |
197 |
- ${RDEPEND} |
198 |
- tecio? ( dev-libs/boost:= ) |
199 |
-" |
200 |
-BDEPEND="virtual/pkgconfig" |
201 |
- |
202 |
-PATCHES=( |
203 |
- "${FILESDIR}/${P}-fix-env.patch" |
204 |
- "${FILESDIR}/${PN}-7.0.4-unbundle_boost.patch" |
205 |
- "${FILESDIR}/${PN}-7.0.4-fix-python-optimize.patch" |
206 |
-) |
207 |
- |
208 |
-DOCS=( "LICENSE.md" "README.md" "SU2_PY/documentation.txt" ) |
209 |
- |
210 |
-src_unpack() { |
211 |
- unpack "${P}.tar.gz" |
212 |
- if use test ; then |
213 |
- einfo "Unpacking ${P}-TestCases.tar.gz to /var/tmp/portage/sci-physics/${P}/work/${P}/TestCases" |
214 |
- tar -C "${P}"/TestCases --strip-components=1 -xzf "${DISTDIR}/${P}-TestCases.tar.gz" || die |
215 |
- fi |
216 |
- if use tutorials ; then |
217 |
- einfo "Unpacking ${P}-Tutorials.tar.gz to /var/tmp/portage/sci-physics/${P}/work/${P}" |
218 |
- mkdir "${P}"/Tutorials |
219 |
- tar -C "${P}"/Tutorials --strip-components=1 -xzf "${DISTDIR}/${P}-Tutorials.tar.gz" || die |
220 |
- fi |
221 |
-} |
222 |
- |
223 |
-src_configure() { |
224 |
- local emesonargs=( |
225 |
- -Denable-autodiff=false |
226 |
- -Denable-directdiff=false |
227 |
- -Denable-pastix=false |
228 |
- -Denable-pywrapper=false |
229 |
- -Dwith-omp=false |
230 |
- $(meson_feature mpi with-mpi) |
231 |
- $(meson_use cgns enable-cgns) |
232 |
- $(meson_use mkl enable-mkl) |
233 |
- $(meson_use openblas enable-openblas) |
234 |
- $(meson_use tecio enable-tecio) |
235 |
- $(meson_use test enable-tests) |
236 |
- ) |
237 |
- meson_src_configure |
238 |
-} |
239 |
- |
240 |
-src_test() { |
241 |
- ln -s ../../${P}-build/SU2_CFD/src/SU2_CFD SU2_PY/SU2_CFD |
242 |
- ln -s ../../${P}-build/SU2_DEF/src/SU2_DEF SU2_PY/SU2_DEF |
243 |
- ln -s ../../${P}-build/SU2_DOT/src/SU2_DOT SU2_PY/SU2_DOT |
244 |
- ln -s ../../${P}-build/SU2_GEO/src/SU2_GEO SU2_PY/SU2_GEO |
245 |
- ln -s ../../${P}-build/SU2_MSH/src/SU2_MSH SU2_PY/SU2_MSH |
246 |
- ln -s ../../${P}-build/SU2_SOL/src/SU2_SOL SU2_PY/SU2_SOL |
247 |
- |
248 |
- export SU2_RUN="${S}/SU2_PY" |
249 |
- export SU2_HOME="${S}" |
250 |
- export PATH=$PATH:$SU2_RUN |
251 |
- export PYTHONPATH=$PYTHONPATH:$SU2_RUN |
252 |
- |
253 |
- einfo "Running UnitTests ..." |
254 |
- ../${P}-build/UnitTests/test_driver |
255 |
- |
256 |
- pushd TestCases/ |
257 |
- use mpi && python parallel_regression.py |
258 |
- use mpi || python serial_regression.py |
259 |
- use tutorials && use mpi && python tutorials.py |
260 |
- popd |
261 |
-} |
262 |
- |
263 |
-src_install() { |
264 |
- meson_src_install |
265 |
- mkdir -p "${ED}$(python_get_sitedir)" |
266 |
- mv "${ED}"/usr/bin/{FSI,SU2,*.py} -t "${ED}$(python_get_sitedir)" |
267 |
- python_optimize "${D}/$(python_get_sitedir)" |
268 |
- |
269 |
- if use tutorials ; then |
270 |
- insinto "/usr/share/${P}" |
271 |
- doins -r Tutorials |
272 |
- fi |
273 |
-} |
274 |
|
275 |
diff --git a/sci-physics/SU2/files/SU2-7.0.4-fix-env.patch b/sci-physics/SU2/files/SU2-7.0.4-fix-env.patch |
276 |
deleted file mode 100644 |
277 |
index 3f65764c..00000000 |
278 |
--- a/sci-physics/SU2/files/SU2-7.0.4-fix-env.patch |
279 |
+++ /dev/null |
280 |
@@ -1,24 +0,0 @@ |
281 |
-diff -Naur old_env/SU2_CFD/include/output/tools/CWindowingTools.hpp new_env/SU2_CFD/include/output/tools/CWindowingTools.hpp |
282 |
---- old_env/SU2_CFD/include/output/tools/CWindowingTools.hpp 2020-03-31 12:26:03.000000000 +0300 |
283 |
-+++ new_env/SU2_CFD/include/output/tools/CWindowingTools.hpp 2020-05-10 17:04:24.000000000 +0300 |
284 |
-@@ -28,7 +28,7 @@ |
285 |
- #pragma once |
286 |
- |
287 |
- #include <vector> |
288 |
--#include "../../../Common/include/option_structure.hpp" |
289 |
-+#include "../../../../Common/include/option_structure.hpp" |
290 |
- |
291 |
- class CWindowingTools{ |
292 |
- public: |
293 |
-diff -Naur old_env/UnitTests/meson.build new_env/UnitTests/meson.build |
294 |
---- old_env/UnitTests/meson.build 2020-05-10 17:03:43.000000000 +0300 |
295 |
-+++ new_env/UnitTests/meson.build 2020-05-10 17:04:35.000000000 +0300 |
296 |
-@@ -24,7 +24,7 @@ |
297 |
- test_driver = executable( |
298 |
- 'test_driver', |
299 |
- unit_test_files, |
300 |
-- install : true, |
301 |
-+ install : false, |
302 |
- dependencies : [su2_cfd_dep, common_dep, su2_deps, catch2_dep], |
303 |
- cpp_args: ['-fPIC', default_warning_flags, su2_cpp_args] |
304 |
- ) |
305 |
|
306 |
diff --git a/sci-physics/SU2/files/SU2-7.0.5-fix-env.patch b/sci-physics/SU2/files/SU2-7.0.5-fix-env.patch |
307 |
deleted file mode 100644 |
308 |
index b52f171b..00000000 |
309 |
--- a/sci-physics/SU2/files/SU2-7.0.5-fix-env.patch |
310 |
+++ /dev/null |
311 |
@@ -1,12 +0,0 @@ |
312 |
-diff -Naur old_env/UnitTests/meson.build new_env/UnitTests/meson.build |
313 |
---- old_env/UnitTests/meson.build 2020-06-15 17:03:43.000000000 +0300 |
314 |
-+++ new_env/UnitTests/meson.build 2020-06-15 17:04:35.000000000 +0300 |
315 |
-@@ -24,7 +24,7 @@ |
316 |
- test_driver = executable( |
317 |
- 'test_driver', |
318 |
- unit_test_files, |
319 |
-- install : true, |
320 |
-+ install : false, |
321 |
- dependencies : [su2_cfd_dep, common_dep, su2_deps, catch2_dep], |
322 |
- cpp_args: ['-fPIC', default_warning_flags, su2_cpp_args] |
323 |
- ) |