sci-physics/openmodelica: Removed OMEdit icon, visible EGIT VCS version and manualli added linked git repositories as SRC_URI.

Signed-off-by: Ivan Lloro <ivan.lloro.boada@gmail.com>

3 files changed, 41 insertions, 35 deletions

diff --git a/sci-physics/openmodelica/Manifest b/sci-physics/openmodelica/Manifest
new file mode 100644
index 000000000..db4b7b377
--- /dev/null
+++ b/sci-physics/openmodelica/Manifest
@@ -0,0 +1,8 @@
+DIST OMBootstrapping_openmodelica-1.23.1.tar.gz 3329128 BLAKE2B afdda81842a686e092b46bd50d192f5e35ae6c662e8c5517346d86c7c098f2e23a99df27bc5c045b819472d0539837c845c63123ae4822127a14ac42e4ad2e97 SHA512 2202f02edc33ac4fb7264b0ea82ae4b2c965a85f8b96cb872cc4cc59c5e5b76346a023c416f994a9744021428d598c3dbdf688c0845ba4726849d3c9ee0cd4ba
+DIST OMCompiler-3rdParty_openmodelica-1.23.1.tar.gz 50214731 BLAKE2B 56c8d30cc3c15e2f140b331abb718ecb61f4400bc6758bd34e4aea12d475e182d08fee400d5750103e1b968b85c9ff176d0ad80a8c6eb49b276b28409f16caba SHA512 24e75a49027c5c87ec0527d8d49309e6807c7f7ddfd4bd9b933d2f3abece016bd49791af62f6742ad700b089a995fc71d8f94a78458bbf5e9cd08f0c460b75fb
+DIST OMSens_Qt_openmodelica-1.23.1.tar.gz 211293 BLAKE2B 31392d18a7c062829e1d4016c96e09d6a13c695cb9cd7699e7b8ff5de6a4ee8b58d5e28bc8da2e66b2d892ce344382fdfdfa5a1e42ce50d60f510be5bc508480 SHA512 3f313fbcda9069f2fee85fc70f58f6593f37af3eff8f560fdf61def750ec506873ffb77212a0d8a283e2829f3c1efd527047cf7cef660783d1e5e379100f2229
+DIST OMSens_openmodelica-1.23.1.tar.gz 8870273 BLAKE2B fc60c8d39053022015e7dfc8e32d5e07acabc9dfe08826153e52e6bbd1c57de21cf0e7e3609c804f875d9a19058fe52b2458687fa357d2a83eb53f21f714bee9 SHA512 b93de754aa3f5ff7e5d725d0886aa47368d74d7a0d2ded0f8ed55c4ead97ad268ce201e17b1604f539ea283fdc306ac932d89c93d2a726bff85c78cc210c1a1c
+DIST OMSimulator-3rdParty_openmodelica-1.23.1.tar.gz 7638596 BLAKE2B 4162e6845720ac276248daa94b628a83b0aaf96c5c34666f2b36d09cf716a8e18c364e052fae1f23dcf31951cc3f955f09f1e0a997afd7347a29b92dc19cadf9 SHA512 16bd6383249fb1bf4f4edb9c840040d625ca1c48e2524554e06f5b2b6316312be4b674a7a437dcc222b9b73f0847a7169b82b192a0accbb29a1e654fe13ef53b
+DIST OMSimulator_openmodelica-1.23.1.tar.gz 87918683 BLAKE2B b9fd20eb2c8f48b4c93250314b692694ce0225e35dd11fec13236e255913657379c059182392a99a068780531a8376f9de372d0c0b6a39b6886b54f4ec090681 SHA512 c5f3c64c65935d564a490006a2612e1f72dc81bf941fc250d6c4d817cd1e786d8dae40cba8bca3732dd760246f1dcea8c60dfd31332b1fbb7809318ba6cb89f9
+DIST OpenModelica-common_openmodelica-1.23.1.tar.gz 36148 BLAKE2B cbb76666dbe5afa0c2d76f0e6db4d7be1b444bb71f72a5238040dd94d9d46ff3371d596dec3de14805bae5c68ee213221930a4355eeffad97dbefa5eedea9aa7 SHA512 3d877103f54088068bd74eaddecbefbc03d8afca928afdd515e41853846a5933e5d999b4bde3ec99c142be5fd13287d52ea6fb62846479e40d27fe59afbb2c85
+DIST openmodelica-1.23.1.tar.gz 146796677 BLAKE2B c342d16efa96690ce890476daf051e0d632f0f01c672b49aea4b4c034ef5c4573119db99ea0b55402a08f2dabbede6a0e3838bdc10f84ffa8a134d0619511539 SHA512 83a273f3c74dd4400853232688d85a7c0c47a4679c09343249b5a7ec4c54561b1e4230a3f17e1b77173922e2124ac6b546c2f36f471de05a8b99ee2375e96a5e
diff --git a/sci-physics/openmodelica/files/omedit.png b/sci-physics/openmodelica/files/omedit.png
deleted file mode 100644
index 9fd43dcef..000000000
--- a/sci-physics/openmodelica/files/omedit.png
+++ /dev/null
diff --git a/sci-physics/openmodelica/openmodelica-1.23.1.ebuild b/sci-physics/openmodelica/openmodelica-1.23.1.ebuild
index a4fd589e6..9760edb9c 100644
--- a/sci-physics/openmodelica/openmodelica-1.23.1.ebuild
+++ b/sci-physics/openmodelica/openmodelica-1.23.1.ebuild
@@ -2,13 +2,20 @@
 # Distributed under the terms of the GNU General Public License v2
 EAPI=8
 
-inherit cmake git-r3 desktop xdg
+inherit cmake desktop xdg
 
 DESCRIPTION="Open-source Modelica-based modeling and simulation environment"
 HOMEPAGE="https://openmodelica.org/"
-
-EGIT_REPO_URI="https://github.com/OpenModelica/OpenModelica.git"
-EGIT_COMMIT="v1.23.1"
+SRC_URI="
+   https://github.com/OpenModelica/OpenModelica/archive/332e81aa6442c4cc4761251407332f86f80e834b.tar.gz -> ${P}.tar.gz
+   https://github.com/OpenModelica/OMCompiler-3rdParty/archive/b826af1c1c15acf48627ad32cc0545ffc7e58bca.tar.gz -> OMCompiler-3rdParty_${P}.tar.gz
+   https://github.com/OpenModelica/OMBootstrapping/archive/c289e97c41d00939a4a69fe504961b47283a6d8e.tar.gz -> OMBootstrapping_${P}.tar.gz
+   https://github.com/OpenModelica/OMSens/archive/0d804d597bc385686856d453cc830fad4923fa3e.tar.gz -> OMSens_${P}.tar.gz
+   https://github.com/OpenModelica/OMSens_Qt/archive/68b1b8697ac9f8e37ebe4de13c0c1d4e6e2e56fb.tar.gz -> OMSens_Qt_${P}.tar.gz
+   https://github.com/OpenModelica/OpenModelica-common/archive/08a01802db5ba5edb540383c46718b89ff229ef2.tar.gz -> OpenModelica-common_${P}.tar.gz
+   https://github.com/OpenModelica/OMSimulator/archive/1eb92ef35793b73e75d0cfed0c7b0311497d6278.tar.gz -> OMSimulator_${P}.tar.gz
+   https://github.com/OpenModelica/OMSimulator-3rdParty/archive/ca418d7768c036ac15e9894d7f00d2118b3399a6.tar.gz -> OMSimulator-3rdParty_${P}.tar.gz
+"
 
 LICENSE="OSMC-PL GPL-3 AGPL-3 BSD EPL-1.0 public-domain BSD-with-attribution LGPL-2.1+ LGPL-2 Apache-2.0 Boost-1.0 Modelica-1.1 Modelica-2 MIT WTFPL-2"
 SLOT="0"
@@ -71,7 +78,6 @@ RDEPEND+="
 
 BDEPEND="
 	dev-util/ccache
-	net-misc/wget
 	app-arch/tar
 	virtual/fortran
 "
@@ -82,33 +88,24 @@ PATCHES=(
 	"${FILESDIR}"/"${P}"-raw_strings.patch
 )
 
-BOMCCOMMIT="c289e97c41d00939a4a69fe504961b47283a6d8e"
-TMPBOMCARCHIVE="${T}/sources-${BOMCCOMMIT}.tar.gz"
-
-pkg_setup() {
-	# OMCompiler/Compiler/boot/CMakeLists.txt downloads a file during src_prepare phase which is blocked by ebuild
-	# network sandbox. Upstream downloads the (changing) master archive by default. Instead, the specific commit
-	# available at this OpenModelica version release date is taken.
-	local URI="https://github.com/OpenModelica/OMBootstrapping/archive/${BOMCCOMMIT}.tar.gz"
-
-	[[ -f "${DISTFILE}" ]] || wget "${URI}" -O "${TMPBOMCARCHIVE}"
-
-	local SHA12SUM=$(sha512sum "${TMPBOMCARCHIVE}")
-	einfo "${SHA12SUM}"
-	[[ "${SHA12SUM}" == "2202f02edc33ac4fb7264b0ea82ae4b2c965a85f8b96cb872cc4cc59c5e5b76346a023c416f994a9744021428d598c3dbdf688c0845ba4726849d3c9ee0cd4ba  ${TMPBOMCARCHIVE}" ]] || die "Wrong checksum."
-	local B2SUM=$(b2sum "${TMPBOMCARCHIVE}")
-	einfo "${B2SUM}"
-	[[ "${B2SUM}" == "afdda81842a686e092b46bd50d192f5e35ae6c662e8c5517346d86c7c098f2e23a99df27bc5c045b819472d0539837c845c63123ae4822127a14ac42e4ad2e97  ${TMPBOMCARCHIVE}" ]] || die "Wrong checksum."
-}
-
-src_prepare() {
-	# Setup Bootstrapping OMC
-	local BOMCDIR="${WORKDIR}"/"${P}"/OMCompiler/Compiler/boot/bomc
-	mkdir -p "${BOMCDIR}"
-	mv "${TMPBOMCARCHIVE}" "${BOMCDIR}"/sources.tar.gz
-	tar xzf "${BOMCDIR}"/sources.tar.gz --strip-components=1 -C "${BOMCDIR}"
-
-	cmake_src_prepare
+src_unpack() {
+	default
+
+	mv "${WORKDIR}/OpenModelica-332e81aa6442c4cc4761251407332f86f80e834b" "${WORKDIR}/${P}"
+	rmdir "${WORKDIR}/${P}/OMCompiler/3rdParty"
+	mv "${WORKDIR}/OMCompiler-3rdParty-b826af1c1c15acf48627ad32cc0545ffc7e58bca" "${WORKDIR}/${P}/OMCompiler/3rdParty"
+	rmdir "${WORKDIR}/${P}/OMSens"
+	mv "${WORKDIR}/OMSens-0d804d597bc385686856d453cc830fad4923fa3e" "${WORKDIR}/${P}/OMSens"
+	rmdir "${WORKDIR}/${P}/OMSens_Qt"
+	mv "${WORKDIR}/OMSens_Qt-68b1b8697ac9f8e37ebe4de13c0c1d4e6e2e56fb" "${WORKDIR}/${P}/OMSens_Qt"
+	rmdir "${WORKDIR}/${P}/OMSens_Qt/common"
+	mv "${WORKDIR}/OpenModelica-common-08a01802db5ba5edb540383c46718b89ff229ef2" "${WORKDIR}/${P}/OMSens_Qt/common"
+	rmdir "${WORKDIR}/${P}/OMSimulator"
+	mv "${WORKDIR}/OMSimulator-1eb92ef35793b73e75d0cfed0c7b0311497d6278" "${WORKDIR}/${P}/OMSimulator"
+	rmdir "${WORKDIR}/${P}/OMSimulator/3rdParty"
+	mv "${WORKDIR}/OMSimulator-3rdParty-ca418d7768c036ac15e9894d7f00d2118b3399a6" "${WORKDIR}/${P}/OMSimulator/3rdParty"
+	mv "OMBootstrapping-c289e97c41d00939a4a69fe504961b47283a6d8e" "${WORKDIR}/${P}/OMCompiler/Compiler/boot/bomc"
+	touch "${WORKDIR}/${P}/OMCompiler/Compiler/boot/bomc/sources.tar.gz"
 }
 
 src_configure() {
@@ -140,6 +137,8 @@ src_compile() {
 	gfortran -fPIC -c Rutf.for Rut.for Curvif.for
 	# BUG: Undefined symbol curvif_ in
 	# ${WORKDIR}/${P}/OMSens/fortran_interface/curvif_simplified.cpython-312-x86_64-linux-gnu.so
+	# See with nm or objdump -tT
+	# ${WORKDIR}/${P}/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
 	cd "${PWD}"
@@ -158,9 +157,8 @@ src_install() {
 
 	newicon -s scalable OMShell/OMShell/OMShellGUI/Resources/omshell-large.svg omshell.svg
 	newicon -s scalable OMNotebook/OMNotebook/OMNotebookGUI/Resources/OMNotebook_icon.svg OMNotebook.svg
-	# No proper icon for Linux available from upstream
-	doicon -s 256 "${FILESDIR}"/omedit.png
-	make_desktop_entry "OMEdit %F" OMedit omedit "Physics;" "MimeType=text/x-modelica;"
+	# No proper icon for Linux available from upstream for OMEdit
+	make_desktop_entry "OMEdit %F" OMedit "" "Physics;" "MimeType=text/x-modelica;"
 	make_desktop_entry OMShell OMShell omshell "Physics;"
 	make_desktop_entry "OMNotebook %f" OMNotebook OMNotebook "Physics;"