[gentoo-commits] repo/proj/guru:master commit in: sci-physics/SU2/

[Ronny Gutbrod]

commit:     01d691c3d7f455d6c3a2e52856446c599c754cf7
Author:     Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru>
AuthorDate: Fri Dec  9 16:50:53 2022 +0000
Commit:     Ronny Gutbrod <gentoo <AT> tastytea <DOT> de>
CommitDate: Fri Dec  9 16:50:53 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=01d691c3

sci-physics/SU2: update src_test and src_install

Signed-off-by: Sergey Torokhov <torokhov-s-a <AT> yandex.ru>

 sci-physics/SU2/SU2-7.2.0-r100.ebuild | 17 ++++++++---------
 sci-physics/SU2/SU2-7.2.0-r2.ebuild   | 12 ++++++++++--
 2 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/sci-physics/SU2/SU2-7.2.0-r100.ebuild 
b/sci-physics/SU2/SU2-7.2.0-r100.ebuild
index 97dceb66e..482a29200 100644
--- a/sci-physics/SU2/SU2-7.2.0-r100.ebuild
+++ b/sci-physics/SU2/SU2-7.2.0-r100.ebuild
@@ -165,6 +165,7 @@ src_test() {
        if use autodiff ; then
                ln -s ../../${P}-build/SU2_CFD/src/SU2_CFD_AD SU2_PY/SU2_CFD_AD 
|| die
                ln -s ../../${P}-build/SU2_DOT/src/SU2_DOT_AD SU2_PY/SU2_DOT_AD 
|| die
+               ln -s ../../${P}-build/SU2_PY/pySU2/pysu2ad.py 
SU2_PY/pysu2ad.py || die
                ln -s ../../${P}-build/SU2_PY/pySU2/_pysu2ad.so 
SU2_PY/_pysu2ad.so || die
                if use directdiff ; then
                        ln -s ../../${P}-build/SU2_CFD/src/SU2_CFD_DIRECTDIFF 
SU2_PY/SU2_CFD_DIRECTDIFF || die
@@ -187,15 +188,13 @@ src_test() {
                fi
                if use autodiff ; then
                        ${EPYTHON} parallel_regression_AD.py || die
-               else
-                       ${EPYTHON} parallel_regression.py || die
                fi
+               ${EPYTHON} parallel_regression.py || die
        else
                if use autodiff ; then
                        ${EPYTHON} serial_regression_AD.py || die
-               else
-                       ${EPYTHON} serial_regression.py || die
                fi
+               ${EPYTHON} serial_regression.py || die
        fi
        popd || die
 }
@@ -205,7 +204,7 @@ src_install() {
 
        mkdir -p "${D}$(python_get_sitedir)/SU2_PY" || die
        if use python; then
-               mv "${ED}"/usr/bin/{pysu2.py,_pysu2.so} -t 
"${D}$(python_get_sitedir)/SU2_PY" || die
+               mv "${ED}"/usr/bin/*.so -t "${D}$(python_get_sitedir)/SU2_PY" 
|| die
        fi
        mv "${ED}"/usr/bin/{FSI_tools,SU2,SU2_Nastran} -t 
"${D}$(python_get_sitedir)" || die
        mv "${ED}"/usr/bin/*.py -t "${D}$(python_get_sitedir)/SU2_PY" || die
@@ -217,9 +216,9 @@ src_install() {
        fi
 
        local SU2_RUN="$(python_get_sitedir)/SU2_PY"
-       echo SU2_RUN="${SU2_RUN}" > 99_SU2
-       echo PATH="${SU2_RUN}" >> 99_SU2
-       echo PYTHONPATH="${SU2_RUN}" >> 99_SU2
+       echo SU2_RUN="${SU2_RUN}" > 99SU2
+       echo PATH="${SU2_RUN}" >> 99SU2
+       echo PYTHONPATH="${SU2_RUN}" >> 99SU2
 
-       doenvd 99_SU2
+       doenvd 99SU2
 }

diff --git a/sci-physics/SU2/SU2-7.2.0-r2.ebuild 
b/sci-physics/SU2/SU2-7.2.0-r2.ebuild
index 1bc85bf7e..adc8adfd5 100644
--- a/sci-physics/SU2/SU2-7.2.0-r2.ebuild
+++ b/sci-physics/SU2/SU2-7.2.0-r2.ebuild
@@ -156,12 +156,20 @@ src_test() {
 src_install() {
        DESTDIR="${D}" meson_src_install
 
-       mkdir -p "${D}$(python_get_sitedir)" || die
-       mv "${ED}"/usr/bin/{FSI_tools,SU2,SU2_Nastran,*.py} -t 
"${D}$(python_get_sitedir)" || die
+       mkdir -p "${D}$(python_get_sitedir)/SU2_PY" || die
+       mv "${ED}"/usr/bin/{FSI_tools,SU2,SU2_Nastran} -t 
"${D}$(python_get_sitedir)" || die
+       mv "${ED}"/usr/bin/*.py -t "${D}$(python_get_sitedir)/SU2_PY" || die
        python_optimize "${D}/$(python_get_sitedir)"
 
        if use tutorials ; then
                insinto "/usr/share/${PN}"
                doins -r Tutorials
        fi
+
+       local SU2_RUN="$(python_get_sitedir)/SU2_PY"
+       echo SU2_RUN="${SU2_RUN}" > 99SU2
+       echo PATH="${SU2_RUN}" >> 99SU2
+       echo PYTHONPATH="${SU2_RUN}" >> 99SU2
+
+       doenvd 99SU2
 }