commit: 0605ff536a512c2f1652172beaa050544d069d23 Author: Ivan Lloro <ivan.lloro.boada <AT> gmail <DOT> com> AuthorDate: Thu Nov 13 20:32:24 2025 +0000 Commit: David Roman <davidroman96 <AT> gmail <DOT> com> CommitDate: Thu Nov 13 20:32:24 2025 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=0605ff53
sci-physics/openmodelica: add 1.25.5, drop 1.24.0-r1 Signed-off-by: Ivan Lloro <ivan.lloro.boada <AT> gmail.com> sci-physics/openmodelica/Manifest | 18 +-- ...1.24.0-r1.ebuild => openmodelica-1.25.5.ebuild} | 129 ++++++++++----------- 2 files changed, 71 insertions(+), 76 deletions(-) diff --git a/sci-physics/openmodelica/Manifest b/sci-physics/openmodelica/Manifest index 4b75bd3b51..f64401269b 100644 --- a/sci-physics/openmodelica/Manifest +++ b/sci-physics/openmodelica/Manifest @@ -1,9 +1,9 @@ -DIST OMBootstrapping_openmodelica-1.24.0.tar.gz 3329128 BLAKE2B afdda81842a686e092b46bd50d192f5e35ae6c662e8c5517346d86c7c098f2e23a99df27bc5c045b819472d0539837c845c63123ae4822127a14ac42e4ad2e97 SHA512 2202f02edc33ac4fb7264b0ea82ae4b2c965a85f8b96cb872cc4cc59c5e5b76346a023c416f994a9744021428d598c3dbdf688c0845ba4726849d3c9ee0cd4ba -DIST OMCompiler-3rdParty_openmodelica-1.24.0.tar.gz 50215508 BLAKE2B 9a253052d2b45c8058c2708f1f0b9b5cb5bc37956bffa1ee1c8db3d2a7d47af78b47a00efceeea52012c720665722f846147fd5390a2f82adc8719e12317fefd SHA512 6a77aac7820af83e2168478a592ce771d04a30bc276e98f8a40434515ca43bdb879d0b4087366cf1175b4f40bbfb9fb3f6a3058551a148ea13d1cc7dc5ce99ef -DIST OMOptim_openmodelica-1.24.0.tar.gz 4022842 BLAKE2B 13acd91f4570fde97fa668e826bea5f8c04ce71360ee675ae02f05f6e391b8d62260e74cc420d56f2c1bcbedf037745370ebc1819f347cf32a5ad0a4205670c5 SHA512 901c036312623f6ef5af198e0b2dbdd97cef7f88ac1dfa9682dad920ffc1c49f992eefba2d67d65901f375bc12f7095b2123586c1b37d96586e25e50c49b4168 -DIST OMSens_Qt_openmodelica-1.24.0.tar.gz 211297 BLAKE2B 9cf722ed800c41c3fd453df485b0ab45a7ccb63258d9a74ff2df96754e84f10ea4f1ccbb46a90468279f202180dcd5fb8a71c88402a9681b93efa8cb780d7d66 SHA512 2d5df4fc07a1cc4f7c3a04a086bfc2f5eb9f088b133f0242e56491b496e9f302d83f6b246d4c4079849a067162f9dfec67377444ecfa7d3a9263eda9b6d6fad1 -DIST OMSens_openmodelica-1.24.0.tar.gz 8870273 BLAKE2B fc60c8d39053022015e7dfc8e32d5e07acabc9dfe08826153e52e6bbd1c57de21cf0e7e3609c804f875d9a19058fe52b2458687fa357d2a83eb53f21f714bee9 SHA512 b93de754aa3f5ff7e5d725d0886aa47368d74d7a0d2ded0f8ed55c4ead97ad268ce201e17b1604f539ea283fdc306ac932d89c93d2a726bff85c78cc210c1a1c -DIST OMSimulator-3rdParty_openmodelica-1.24.0.tar.gz 7637943 BLAKE2B 0788d9294fc8238fb71e5571163e6f838505fc5a4b8c98f736dba8d5b63b7c4123301e626968bc6a9429fdef89f3348e178286576a84dcbff28a50e83a953fe1 SHA512 f0fabb884738d8e74b05baf81ebb05be4a51458299c7daed61df3100c1347fe324add93c39eb07f6d02832ad027b241f80227c72029a2a701b68c91d9c1fc9c7 -DIST OMSimulator_openmodelica-1.24.0.tar.gz 87921273 BLAKE2B 8f91945fdbdda6bb2ccaef43204f0d46945ba0e18db21e24c9ccf1e16f0f5048e8d4dcc027bc8842f3abf7b424e53cba11cf229fbc22153ba125bf544458c95c SHA512 8478213bb7d040da65810cb87ae5d19bfac1f8369a3e9963c2e3c508ad18c1480eeac25ef0399cde726dc810467c40044129f88ff5c7723b76b70124e1a15ea9 -DIST OpenModelica-common_openmodelica-1.24.0.tar.gz 36148 BLAKE2B cbb76666dbe5afa0c2d76f0e6db4d7be1b444bb71f72a5238040dd94d9d46ff3371d596dec3de14805bae5c68ee213221930a4355eeffad97dbefa5eedea9aa7 SHA512 3d877103f54088068bd74eaddecbefbc03d8afca928afdd515e41853846a5933e5d999b4bde3ec99c142be5fd13287d52ea6fb62846479e40d27fe59afbb2c85 -DIST openmodelica-1.24.0.tar.gz 146961441 BLAKE2B adae7bcb1f3c12d0d507d26390c446eb914abba687c457a5f9df61913723e2940a7052bd6b29ef48aba514202e7570d1c45bf7b55747df51b52af10b6389dd04 SHA512 e2e85aa5bf108d3501b34f5644817bc6a68380952b3f2b5983265df03b414a7c808098d95821cf7085a6ee17d5f0920c1ef58d2a46cc18b9997d693a24c9499e +DIST OMBootstrapping_openmodelica-1.25.5.tar.gz 3346859 BLAKE2B 77adf8b217c670828fcdb0b26c9135de5add5955437caaa40b0f47ebc2cd393d83c87f26f71baebe7f01ad8025f74953d436a97aa5c7698c78e761b6330d1677 SHA512 27bbfd4a05beb15c1cc835defa9cbb95194c83f71ca9acd347f44ca48a6d8db2d5c8b357d652fd31e6617777313d9512799c1523652402a06380469a73a858e1 +DIST OMCompiler-3rdParty_openmodelica-1.25.5.tar.gz 50291363 BLAKE2B 67a692f4d9a456aa729b84014c32c2487679ea55c681819fbb1c0affd946c12653358ab4fed43ba1ca32f5c49de3bbe61cbe00d80210ec4efb9302b6d89b4e10 SHA512 1b55ed5087b45697242035a215858c39bd325d31d45e51d3cb8ca0c264c39c36c52b93fb42d4197345bb7e38ad025170881cd2fe42284a5484d019452a5ea9d3 +DIST OMOptim_openmodelica-1.25.5.tar.gz 4022842 BLAKE2B 13acd91f4570fde97fa668e826bea5f8c04ce71360ee675ae02f05f6e391b8d62260e74cc420d56f2c1bcbedf037745370ebc1819f347cf32a5ad0a4205670c5 SHA512 901c036312623f6ef5af198e0b2dbdd97cef7f88ac1dfa9682dad920ffc1c49f992eefba2d67d65901f375bc12f7095b2123586c1b37d96586e25e50c49b4168 +DIST OMSens_Qt_openmodelica-1.25.5.tar.gz 211321 BLAKE2B 3966cc6b020f14ee2ecef8905fe580d929b685c5138a8cbaabb1d64c90f53bc55ebee364980ad925937a0b57bf6e85c1d808f32decf9cb45a9e13879c53849ca SHA512 ee258fe3dfc3a3c2015f6d6b9067514ea901c17dd84158c89bef34ede0488bfeb92826d558aa699537c89df81cccfb34aaed440cdaf39974a04357c32d78dcae +DIST OMSens_openmodelica-1.25.5.tar.gz 8870338 BLAKE2B 8c62f6527915a1a09d8dfb3cbf880fb3cd0d89aa51128c98ef19fc41ef5eab7bd72061a457f68296d2fcbfc49bf906538dbb27742369393355db4d637bff2d35 SHA512 db48d41a471c504fc104d4ff69e56e7974ff0913fbde7110da3dddf7f5074cb0446256fe8f3dde845fca8946a95050fff48ec0b60174c505d524c3a203f58e79 +DIST OMSimulator-3rdParty_openmodelica-1.25.5.tar.gz 6423970 BLAKE2B 1e7463a59d83b4e4866f38cdfb920c89c1bf838ee9fe2c0333a03112b86d18a81fd669f4a9c12303accc25e6f8e76bcdb223ace99bd5cbf333a65b1b92898c44 SHA512 c59d6364d9bf7e152b881c67dca754550bdda384bbc590902fc1c7778cd9fc6594251e36b5608dcb22d8a19513739c81e1ca3564ca0b31c7d412bbc8311ff535 +DIST OMSimulator_openmodelica-1.25.5.tar.gz 95027227 BLAKE2B 18f063d63fe59e49d17c872fc0e1b25a6d0f9c6471d7f427fc67cae065fb562188f590fe5be145f1d9370d45ba692a62188c30f55d0b5ce336864ff88e6c4872 SHA512 ba4243f85529d4d61abef809d559c5628d6983c5ce7a404fa2b94d3d9918b7c0c258b2e0503eae4e756747a6932f869b5a14028ad28433719bab4c65310ccb92 +DIST OpenModelica-common_openmodelica-1.25.5.tar.gz 36221 BLAKE2B 5cf5ae4cc88fba4794d81667bdb18a6cb2f563f9a1c849abb2c4f69b634e7a0d58201a00b3b06c545a92151de2a9655473cd66a2f9ca2ac075aa5a29e773ee22 SHA512 860afedf9a1ef9eb453d0d34151e59828b138902b5e815b92fdcd710a920aa206aee4cd89b9cb8e504242b9ce4c64413b01f78d04a8150940da11d5139f64f1b +DIST openmodelica-1.25.5.tar.gz 148304171 BLAKE2B 8b30c4c149c73973fbfc3985a9d92783006fd5dc6efbb05f7e235aa745fba9e7cccad02a39f17b22d21e78707eb79ed890a3e7c07103a77152310f2fd6772df3 SHA512 c06230f1c9049b5b574ee9e4f54301763f1c63253bc82ceea45ac116dade00641cb7eaf51db5cfbe1d9c08c4d85135243e9c15743f375bdc692c8d02e0493355 diff --git a/sci-physics/openmodelica/openmodelica-1.24.0-r1.ebuild b/sci-physics/openmodelica/openmodelica-1.25.5.ebuild similarity index 57% rename from sci-physics/openmodelica/openmodelica-1.24.0-r1.ebuild rename to sci-physics/openmodelica/openmodelica-1.25.5.ebuild index 38f206e9bd..119b0b5e45 100644 --- a/sci-physics/openmodelica/openmodelica-1.24.0-r1.ebuild +++ b/sci-physics/openmodelica/openmodelica-1.25.5.ebuild @@ -6,24 +6,37 @@ inherit cmake desktop xdg fortran-2 DESCRIPTION="Open-source Modelica-based modeling and simulation environment" HOMEPAGE="https://openmodelica.org/"; + +declare -A commit +commit[OpenModelica]="38bef66da59e57597a6a5f482695e6c37ca09940" +commit[OMCompiler-3rdParty]="05b2332389883ff2a6021ecdf2e13d5a00ebf286" +# See line 10 in OMCompiler/Compiler/boot/CMakeLists.txt +commit[OMBootstrapping]="04d16f7461e5401321f0f72613daf466ae2f76be" +commit[OMSens]="093ad1134cf572ea73a9c7f834614e53ba5ea878" +commit[OMSens_Qt]="bab329ae897ce28621dc45a34cc9cc7dad1aa002" +commit[OMSimulator]="86e9635bda23ffc87a33c90bfbbc6ee7192cbb7a" +commit[OMSimulator-3rdParty]="4ee9733a8fa6de86ce6fc18d775de4efbd7aae9f" +commit[OMOptim]="f1036f43db18c5015da259771004cfb80e08a110" +commit[OpenModelica-common]="6e6d4fd78c74da79ef079ee412d5325eb3b60166" + SRC_URI=" - https://github.com/OpenModelica/OpenModelica/archive/904c4c783a5fa6eb9e99e4a98bdb0cca1d619303.tar.gz + https://github.com/OpenModelica/OpenModelica/archive/${commit[OpenModelica]}.tar.gz -> ${P}.tar.gz - https://github.com/OpenModelica/OMCompiler-3rdParty/archive/82e892ece107787e9ff17780bf5ac8c3f6bc39ba.tar.gz + https://github.com/OpenModelica/OMCompiler-3rdParty/archive/${commit[OMCompiler-3rdParty]}.tar.gz -> OMCompiler-3rdParty_${P}.tar.gz - https://github.com/OpenModelica/OMBootstrapping/archive/c289e97c41d00939a4a69fe504961b47283a6d8e.tar.gz + https://github.com/OpenModelica/OMBootstrapping/archive/${commit[OMBootstrapping]}.tar.gz -> OMBootstrapping_${P}.tar.gz - https://github.com/OpenModelica/OMSens/archive/0d804d597bc385686856d453cc830fad4923fa3e.tar.gz + https://github.com/OpenModelica/OMSens/archive/${commit[OMSens]}.tar.gz -> OMSens_${P}.tar.gz - https://github.com/OpenModelica/OMSens_Qt/archive/92090770426271b4193e78b04f13e6a3abcd6f1a.tar.gz + https://github.com/OpenModelica/OMSens_Qt/archive/${commit[OMSens_Qt]}.tar.gz -> OMSens_Qt_${P}.tar.gz - https://github.com/OpenModelica/OMSimulator/archive/ce342b60b3675185b7daf8197f4b7fd3227f694f.tar.gz + https://github.com/OpenModelica/OMSimulator/archive/${commit[OMSimulator]}.tar.gz -> OMSimulator_${P}.tar.gz - https://github.com/OpenModelica/OMSimulator-3rdParty/archive/5c10de1648d1134a577d9284b58580a72383d89f.tar.gz + https://github.com/OpenModelica/OMSimulator-3rdParty/archive/${commit[OMSimulator-3rdParty]}.tar.gz -> OMSimulator-3rdParty_${P}.tar.gz - https://github.com/OpenModelica/OMOptim/archive/f1036f43db18c5015da259771004cfb80e08a110.tar.gz + https://github.com/OpenModelica/OMOptim/archive/${commit[OMOptim]}.tar.gz -> OMOptim_${P}.tar.gz - https://github.com/OpenModelica/OpenModelica-common/archive/08a01802db5ba5edb540383c46718b89ff229ef2.tar.gz + https://github.com/OpenModelica/OpenModelica-common/archive/${commit[OpenModelica-common]}.tar.gz -> OpenModelica-common_${P}.tar.gz " @@ -33,52 +46,43 @@ SLOT="0" KEYWORDS="~amd64" RDEPEND=" - >=app-text/asciidoc-10.2.0 - >=app-text/doxygen-1.9.8 - >=dev-libs/boost-1.85.0 - >=dev-games/openscenegraph-3.6.5-r114 + >=app-text/asciidoc-10.2.1 + >=app-text/doxygen-1.13.2 + >=dev-libs/boost-1.88.0-r1 + >=dev-games/openscenegraph-3.6.5-r118 dev-lang/python:3.12 - >=dev-libs/expat-2.5.0 - >=dev-libs/icu-74.1 - >=dev-libs/libxml2-2.12.7 - >=dev-python/kiwisolver-1.3.2 - >=dev-python/matplotlib-3.3 - >=dev-python/numpy-1.26.4 - >=dev-python/pandas-1.1.3 - >=dev-python/pillow-9.0.1 - >=dev-python/pytest-8.2.2 - >=dev-python/six-1.16.0-r1 - >=dev-python/sphinx-7.3.7-r2 - dev-qt/qtconcurrent:5 - dev-qt/qtcore:5 - dev-qt/qtdeclarative:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtopengl:5 - dev-qt/qtpositioning:5[qml] - dev-qt/qtprintsupport:5 - dev-qt/qtquickcontrols:5 - dev-qt/qtquickcontrols2:5 - dev-qt/qtsvg:5 - dev-qt/qtwebengine:5[widgets] - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - dev-qt/qtxmlpatterns:5 - dev-qt/qtwebchannel:5[qml] - >=net-misc/curl-8.7.1-r4 + >=dev-libs/expat-2.7.3 + >=dev-libs/icu-77.1 + >=dev-libs/libxml2-2.14.6 + >=dev-python/kiwisolver-1.4.9 + >=dev-python/matplotlib-3.10.3 + >=dev-python/numpy-2.3.1 + >=dev-python/pandas-2.3.0 + >=dev-python/pillow-11.3.0 + >=dev-python/pytest-8.4.2 + >=dev-python/six-1.17.0 + >=dev-python/sphinx-8.2.3-r2 + dev-qt/qt5compat:6 + dev-qt/qtbase:6 + dev-qt/qtdeclarative:6 + dev-qt/qtpositioning:6 + dev-qt/qtsvg:6 + dev-qt/qtwebchannel:6 + dev-qt/qtwebengine:6 + >=net-misc/curl-8.16.0-r1 >=net-misc/omniORB-4.3.0 - >=sci-libs/hdf5-1.14.3-r1 - >=sys-apps/hwloc-2.9.2 + >=sci-libs/hdf5-1.14.6-r2 + >=sys-apps/hwloc-2.11.2-r1 >=sys-devel/flex-2.6.4-r6 >=sys-libs/ncurses-6.4_p20240414 - >=sys-libs/readline-8.2_p10 + >=sys-libs/readline-8.3_p1 >=virtual/blas-3.8 >=virtual/jdk-17 >=virtual/lapack-3.10 >=virtual/libiconv-0-r2 >=virtual/libintl-0-r2 - >=virtual/opencl-3-r3 - >=virtual/opengl-7.0-r2 + >=virtual/opencl-3-r5 + >=virtual/opengl-8 >=virtual/pkgconfig-3 " @@ -89,45 +93,36 @@ BDEPEND=" DEPEND="${RDEPEND}" -PATCHES=( - "${FILESDIR}"/"${P}"-raw_strings.patch -) - src_unpack() { default - mv "${WORKDIR}/OpenModelica-904c4c783a5fa6eb9e99e4a98bdb0cca1d619303" "${S}" || die + mv "${WORKDIR}/OpenModelica-${commit[OpenModelica]}" "${S}" || die rmdir "${S}/OMCompiler/3rdParty" || die - mv "${WORKDIR}/OMCompiler-3rdParty-82e892ece107787e9ff17780bf5ac8c3f6bc39ba" "${S}/OMCompiler/3rdParty" || die + mv "${WORKDIR}/OMCompiler-3rdParty-${commit[OMCompiler-3rdParty]}" "${S}/OMCompiler/3rdParty" || die rmdir "${S}/OMSens" || die # OMOptim depends on a working CORBA interface (which fails to compile) supplied by OmniORB. # For compilation trials remember setting -DOM_OMC_USE_CORBA=ON. #rmdir "${S}/OMOptim" || die - #mv "${WORKDIR}/OMOptim-f1036f43db18c5015da259771004cfb80e08a110" "${S}/OMOptim" || die + #mv "${WORKDIR}/OMOptim-${commit[OMOptim]}" "${S}/OMOptim" || die #rmdir "${S}/OMOptim/common" || die - #cp -a "${WORKDIR}/OpenModelica-common-08a01802db5ba5edb540383c46718b89ff229ef2" "${S}/OMOptim/common" || die + #cp -a "${WORKDIR}/OpenModelica-common-${commit[OpenModelica-common]}" "${S}/OMOptim/common" || die - mv "${WORKDIR}/OMSens-0d804d597bc385686856d453cc830fad4923fa3e" "${S}/OMSens" || die + mv "${WORKDIR}/OMSens-${commit[OMSens]}" "${S}/OMSens" || die rmdir "${S}/OMSens_Qt" || die - mv "${WORKDIR}/OMSens_Qt-92090770426271b4193e78b04f13e6a3abcd6f1a" "${S}/OMSens_Qt" || die + mv "${WORKDIR}/OMSens_Qt-${commit[OMSens_Qt]}" "${S}/OMSens_Qt" || die rmdir "${S}/OMSens_Qt/common" || die - mv "${WORKDIR}/OpenModelica-common-08a01802db5ba5edb540383c46718b89ff229ef2" "${S}/OMSens_Qt/common" || die + mv "${WORKDIR}/OpenModelica-common-${commit[OpenModelica-common]}" "${S}/OMSens_Qt/common" || die rmdir "${S}/OMSimulator" || die - mv "${WORKDIR}/OMSimulator-ce342b60b3675185b7daf8197f4b7fd3227f694f" "${S}/OMSimulator" || die + mv "${WORKDIR}/OMSimulator-${commit[OMSimulator]}" "${S}/OMSimulator" || die rmdir "${S}/OMSimulator/3rdParty" || die - mv "${WORKDIR}/OMSimulator-3rdParty-5c10de1648d1134a577d9284b58580a72383d89f" "${S}/OMSimulator/3rdParty" || die - mv "OMBootstrapping-c289e97c41d00939a4a69fe504961b47283a6d8e" "${S}/OMCompiler/Compiler/boot/bomc" || die + mv "${WORKDIR}/OMSimulator-3rdParty-${commit[OMSimulator-3rdParty]}" "${S}/OMSimulator/3rdParty" || die + mv "OMBootstrapping-${commit[OMBootstrapping]}" "${S}/OMCompiler/Compiler/boot/bomc" || die touch "${S}/OMCompiler/Compiler/boot/bomc/sources.tar.gz" || die - # Solve https://bugs.gentoo.org/937038 - 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() { - # [2024-10-24] Only OMEdit adapted to Qt6 (not, for example, optimization plugins) local mycmakeargs=( -DOM_OMEDIT_ENABLE_QTWEBENGINE=ON -DBUILD_SHARED_LIBS=OFF @@ -143,7 +138,7 @@ src_configure() { -DOM_OMEDIT_ENABLE_TESTS=OFF -DOM_OMEDIT_ENABLE_QTWEBENGINE=ON -DOM_OMEDIT_ENABLE_LIBXML2=ON - -DOM_QT_MAJOR_VERSION=5 + -DOM_QT_MAJOR_VERSION=6 ) cmake_src_configure } @@ -195,7 +190,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,cmake} || die + rm -fr "${ED}"/usr/doc "${ED}"/usr/share/{zmq,cmake,cminpack} || die ewarn "Upstream has deprecated OMTLMSimulator and, therefore, it has not been installed. Use OMSimulator/SSP instead." }
