From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 44888159C9B for ; Tue, 13 Aug 2024 15:39:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0AE59E2B8B; Tue, 13 Aug 2024 15:39:37 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E3136E2B8B for ; Tue, 13 Aug 2024 15:39:36 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id F12C5343060 for ; Tue, 13 Aug 2024 15:39:35 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5F73C1ECF for ; Tue, 13 Aug 2024 15:39:34 +0000 (UTC) From: "Lucio Sauer" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lucio Sauer" Message-ID: <1723482192.9abd34372ea6ad498f1d5f138349df00a7d6c228.watermanpaint@gentoo> Subject: [gentoo-commits] repo/proj/guru:master commit in: sci-physics/openmodelica/ X-VCS-Repository: repo/proj/guru X-VCS-Files: sci-physics/openmodelica/openmodelica-1.23.1-r1.ebuild X-VCS-Directories: sci-physics/openmodelica/ X-VCS-Committer: watermanpaint X-VCS-Committer-Name: Lucio Sauer X-VCS-Revision: 9abd34372ea6ad498f1d5f138349df00a7d6c228 X-VCS-Branch: master Date: Tue, 13 Aug 2024 15:39:34 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: f2635ab2-58a9-48bb-82c6-cb3d5636bcd4 X-Archives-Hash: 614e8248ea2e75630ef7aa95dc3604fe commit: 9abd34372ea6ad498f1d5f138349df00a7d6c228 Author: Ivan Lloro gmail com> AuthorDate: Mon Aug 12 17:01:38 2024 +0000 Commit: Lucio Sauer posteo net> CommitDate: Mon Aug 12 17:03:12 2024 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=9abd3437 Cleanup: ${WORKDIR}/${P} -> ${S} Signed-off-by: Ivan Lloro gmail.com> .../openmodelica/openmodelica-1.23.1-r1.ebuild | 50 +++++++++++----------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/sci-physics/openmodelica/openmodelica-1.23.1-r1.ebuild b/sci-physics/openmodelica/openmodelica-1.23.1-r1.ebuild index 57a1a6ea7..435fd11ac 100644 --- a/sci-physics/openmodelica/openmodelica-1.23.1-r1.ebuild +++ b/sci-physics/openmodelica/openmodelica-1.23.1-r1.ebuild @@ -85,25 +85,25 @@ PATCHES=( src_unpack() { default - mv "${WORKDIR}/OpenModelica-332e81aa6442c4cc4761251407332f86f80e834b" "${WORKDIR}/${P}" || die - rmdir "${WORKDIR}/${P}/OMCompiler/3rdParty" || die - mv "${WORKDIR}/OMCompiler-3rdParty-b826af1c1c15acf48627ad32cc0545ffc7e58bca" "${WORKDIR}/${P}/OMCompiler/3rdParty" || die - rmdir "${WORKDIR}/${P}/OMSens" || die - mv "${WORKDIR}/OMSens-0d804d597bc385686856d453cc830fad4923fa3e" "${WORKDIR}/${P}/OMSens" || die - rmdir "${WORKDIR}/${P}/OMSens_Qt" || die - mv "${WORKDIR}/OMSens_Qt-68b1b8697ac9f8e37ebe4de13c0c1d4e6e2e56fb" "${WORKDIR}/${P}/OMSens_Qt" || die - rmdir "${WORKDIR}/${P}/OMSens_Qt/common" || die - mv "${WORKDIR}/OpenModelica-common-08a01802db5ba5edb540383c46718b89ff229ef2" "${WORKDIR}/${P}/OMSens_Qt/common" || die - rmdir "${WORKDIR}/${P}/OMSimulator" || die - mv "${WORKDIR}/OMSimulator-1eb92ef35793b73e75d0cfed0c7b0311497d6278" "${WORKDIR}/${P}/OMSimulator" || die - rmdir "${WORKDIR}/${P}/OMSimulator/3rdParty" || die - mv "${WORKDIR}/OMSimulator-3rdParty-ca418d7768c036ac15e9894d7f00d2118b3399a6" "${WORKDIR}/${P}/OMSimulator/3rdParty" || die - mv "OMBootstrapping-c289e97c41d00939a4a69fe504961b47283a6d8e" "${WORKDIR}/${P}/OMCompiler/Compiler/boot/bomc" || die - touch "${WORKDIR}/${P}/OMCompiler/Compiler/boot/bomc/sources.tar.gz" || die + mv "${WORKDIR}/OpenModelica-332e81aa6442c4cc4761251407332f86f80e834b" "${S}" || die + rmdir "${S}/OMCompiler/3rdParty" || die + mv "${WORKDIR}/OMCompiler-3rdParty-b826af1c1c15acf48627ad32cc0545ffc7e58bca" "${S}/OMCompiler/3rdParty" || die + rmdir "${S}/OMSens" || die + mv "${WORKDIR}/OMSens-0d804d597bc385686856d453cc830fad4923fa3e" "${S}/OMSens" || die + rmdir "${S}/OMSens_Qt" || die + mv "${WORKDIR}/OMSens_Qt-68b1b8697ac9f8e37ebe4de13c0c1d4e6e2e56fb" "${S}/OMSens_Qt" || die + rmdir "${S}/OMSens_Qt/common" || die + mv "${WORKDIR}/OpenModelica-common-08a01802db5ba5edb540383c46718b89ff229ef2" "${S}/OMSens_Qt/common" || die + rmdir "${S}/OMSimulator" || die + mv "${WORKDIR}/OMSimulator-1eb92ef35793b73e75d0cfed0c7b0311497d6278" "${S}/OMSimulator" || die + rmdir "${S}/OMSimulator/3rdParty" || die + mv "${WORKDIR}/OMSimulator-3rdParty-ca418d7768c036ac15e9894d7f00d2118b3399a6" "${S}/OMSimulator/3rdParty" || die + mv "OMBootstrapping-c289e97c41d00939a4a69fe504961b47283a6d8e" "${S}/OMCompiler/Compiler/boot/bomc" || die + touch "${S}/OMCompiler/Compiler/boot/bomc/sources.tar.gz" || die # Solve https://bugs.gentoo.org/937038 - rm -fr "${WORKDIR}/${P}/OMCompiler/3rdParty/FMIL/ThirdParty/Minizip/minizip" || die - cp -a "${WORKDIR}/${P}/OMSimulator/3rdParty/fmi4c/3rdparty/minizip" "${WORKDIR}/${P}/OMCompiler/3rdParty/FMIL/ThirdParty/Minizip/minizip" || die + rm -fr "${S}/OMCompiler/3rdParty/FMIL/ThirdParty/Minizip/minizip" || die + cp -a "${S}/OMSimulator/3rdParty/fmi4c/3rdparty/minizip" "${S}/OMCompiler/3rdParty/FMIL/ThirdParty/Minizip/minizip" || die } src_configure() { @@ -128,14 +128,14 @@ src_configure() { src_compile() { # [2024-07-15] - # OMSens is disabled in "${WORKDIR}/${P}/CMakeLists.txt" (## omc_add_subdirectory(OMSens)) due to lack of a - # working "${WORKDIR}/${P}/OMSens/CMakeLists.txt". So, we compile it manually. + # OMSens is disabled in "${S}/CMakeLists.txt" (## omc_add_subdirectory(OMSens)) due to lack of a + # working "${S}/OMSens/CMakeLists.txt". So, we compile it manually. pushd OMSens/fortran_interface > /dev/null || die ${FC} -fPIC -c Rutf.for Rut.for Curvif.for || die # BUG: Undefined symbol curvif_ in - # ${WORKDIR}/${P}/OMSens/fortran_interface/curvif_simplified.cpython-312-x86_64-linux-gnu.so + # ${S}/OMSens/fortran_interface/curvif_simplified.cpython-312-x86_64-linux-gnu.so # See with nm -D or objdump -tT - # ${WORKDIR}/${P}/OMSens/fortran_interface/curvif_simplified.cpython-312-x86_64-linux-gnu.so + # ${S}/OMSens/fortran_interface/curvif_simplified.cpython-312-x86_64-linux-gnu.so # This bug causes "Vectorial Parameter Based Sensitivity Analysis" in OMSens to fail. f2py --verbose -c -I. Curvif.o Rutf.o Rut.o -m curvif_simplified curvif_simplified.pyf Curvif_simplified.f90 || die popd > /dev/null || die @@ -147,8 +147,8 @@ src_install() { cmake_src_install # [2024-07-15] - # OMSens is disabled in "${WORKDIR}/${P}/CMakeLists.txt" (## omc_add_subdirectory(OMSens)) due to lack of a - # working "${WORKDIR}/${P}/OMSens/CMakeLists.txt". So, we install it manually. + # OMSens is disabled in "${S}/CMakeLists.txt" (## omc_add_subdirectory(OMSens)) due to lack of a + # working "${S}/OMSens/CMakeLists.txt". So, we install it manually. cp -a "${WORKDIR}"/"${P}"/OMSens "${ED}"/usr/share/ || die rm -fr "${ED}"/usr/share/OMSens/{old,.git,.gitignore,CMakeLists.txt,.jenkins,Jenkinsfile,Makefile.omdev.mingw,Makefile.unix,README.md,setup.py,testing} || die @@ -171,7 +171,7 @@ src_install() { # Documentation housekeeping & QA mv "${ED}"/usr/share/doc/omc "${ED}"/usr/share/doc/"${PF}" || die - rm -fr "${ED}"/usr/doc "${ED}"/usr/share/zmq "${ED}"/usr/share/cmake || die + rm -fr "${ED}"/usr/doc "${ED}"/usr/share/{zmq,cmake} || die - ewarn "Upstream has deprecated OMTLMSimuulator and, therefore, it has not been installed. Use OMSimulator/SSP instead." + ewarn "Upstream has deprecated OMTLMSimulator and, therefore, it has not been installed. Use OMSimulator/SSP instead." }