Merge updates from master

2026-07-17 19:13:13 -04:00 · 2022-12-09 18:01:56 +00:00
parent 64a158b549 c8837b57d2
commit 346a0e81ce
10 changed files with 85 additions and 33 deletions
--- a/dev-python/markdown-include/markdown-include-0.7.0.ebuild
+++ b/dev-python/markdown-include/markdown-include-0.7.0.ebuild
@@ -3,6 +3,7 @@

 EAPI=8

+DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{8..10} )

 inherit distutils-r1
@@ -16,3 +17,8 @@ KEYWORDS="~amd64 ~x86"
 SLOT="0"

 RDEPEND=">=dev-python/markdown-3.4[${PYTHON_USEDEP}]"
+
+src_prepare() {
+	sed -i "s/description-file/description_file/" setup.cfg || die
+	distutils-r1_src_prepare
+}
--- a/dev-python/markdown-include/markdown-include-0.8.0.ebuild
+++ b/dev-python/markdown-include/markdown-include-0.8.0.ebuild
@@ -3,7 +3,7 @@

 EAPI=8

-#DISTUTILS_USE_PEP517=setuptools
+DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{8..11} )

 inherit distutils-r1
@@ -15,5 +15,13 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="GPL-3"
 KEYWORDS="~amd64 ~x86"
 SLOT="0"
+RESTRICT="!test? ( test )"

 RDEPEND=">=dev-python/markdown-3.4[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i "s/description-file/description_file/" setup.cfg || die
+	distutils-r1_src_prepare
+}
--- a/dev-util/eclipse-parallel-bin/Manifest
+++ b/dev-util/eclipse-parallel-bin/Manifest
@@ -2,3 +2,5 @@ DIST eclipse-parallel-2022-03-R-linux-gtk-aarch64.tar.gz 445580573 BLAKE2B 30eb4
 DIST eclipse-parallel-2022-03-R-linux-gtk-x86_64.tar.gz 446729867 BLAKE2B 9ea786dc649333a5995224baae1229229718376c51d459f271457d6994666303638ab51d842c58fc9fa3dae56661a0634d029b01ee1a4f32694c000bf22631a5 SHA512 c6a656cf2322db721f60a8253deb70233c05f8c730681b50ebc772addfb414be97c67896b8bab7840dc805e64fca6d126aa67a8b8e9074bb82cbb096c3a62ceb
 DIST eclipse-parallel-2022-09-R-linux-gtk-aarch64.tar.gz 458827728 BLAKE2B 3cbf6157b54e415cb4da1d27c9b5145c5a7ea3108d9b54defab86c6c42acdc2a642fb848f485bb58508f4924a66ec1d763f866d2b1adabf3f017370a8c4bde1b SHA512 afdad4f8c81110f0cd5eae75c8dcb218bfa58b094ac0b180b91e6d7eef2def58f4a857367f8b9e96a6e1d0b223a0350c2be1ca9d9edf1d434a0a24f7383caf48
 DIST eclipse-parallel-2022-09-R-linux-gtk-x86_64.tar.gz 459079255 BLAKE2B 478dfd07b0e14800e600960d530e32d3589fa67dfa2939a57e2d132f8ad5d9d6b900c9fc12c511073585c5a2b610b89350535ed2a2e22f9f55efe513b0cec927 SHA512 fc25b8bb7a4ff8968e81a293f5047cebf888f2c85ed7f5ede872c20078819d53171d6b3c59e700d9d4045692582b9b2333476ff08bc50c1da911f6e77ac9bb33
+DIST eclipse-parallel-2022-12-R-linux-gtk-aarch64.tar.gz 456213881 BLAKE2B 0e8183c88a203608b80974f937db93a226a69c30f8cd8b6751b62f01c1308d13842bde4a89cdef1da6a313a3c74e62d5b4d2b91d4c7c342f94b14d261c1be271 SHA512 705ca4595811bf34912a4ed4dba1e2494a63bdede41327c2cc15809d86d6e282329067717fdfc2dc59166b595761513f6be938df2f20ca0344bf770894c92015
+DIST eclipse-parallel-2022-12-R-linux-gtk-x86_64.tar.gz 456460848 BLAKE2B b9e5637120b7a2b037373beee0c46a1a3dfd3da477ababef83f3212a4f1fdd78bc240627e8b8a3e5e6cb5c0d0d92b1b823ad4cb1fbe7aa93a0dd3de61d066e88 SHA512 ea13ee9787b343e5ee061155ea3b63b5a369862e102520becfd5efc98bd728440fbf2d22b81a42ad17a646ddef003a6ac7ddeac5f10ac44b6b20712470e0c261
--- a/dev-util/eclipse-parallel-bin/eclipse-parallel-bin-4.23.ebuild
+++ b/dev-util/eclipse-parallel-bin/eclipse-parallel-bin-4.23.ebuild
@@ -32,10 +32,7 @@ RDEPEND="
 	x11-libs/gtk+:3
 "

-QA_FLAGS_IGNORED="
-	/opt/eclipse-parallel-bin/eclipse
-	/opt/eclipse-parallel-bin/plugins/org.eclipse.equinox.launcher.gtk.linux[.].*/eclipse_.*[.]so
-"
+QA_FLAGS_IGNORED=".*"

 src_install() {
 	insinto "/opt/${PN}"
--- a/dev-util/eclipse-parallel-bin/eclipse-parallel-bin-4.25.ebuild
+++ b/dev-util/eclipse-parallel-bin/eclipse-parallel-bin-4.25.ebuild
@@ -32,11 +32,7 @@ RDEPEND="
 	x11-libs/gtk+:3
 "

-QA_FLAGS_IGNORED="
-	/opt/eclipse-parallel-bin/eclipse
-	/opt/eclipse-parallel-bin/plugins/org.eclipse.equinox.launcher.gtk.linux[.].*/eclipse_.*[.]so
-	/opt/eclipse-parallel-bin/plugins/*
-"
+QA_FLAGS_IGNORED=".*"

 src_install() {
 	insinto "/opt/${PN}"
--- a/dev-util/eclipse-parallel-bin/eclipse-parallel-bin-4.26.ebuild
+++ b/dev-util/eclipse-parallel-bin/eclipse-parallel-bin-4.26.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop wrapper xdg
+
+MY_PN="eclipse"
+MY_PV="2022-12"
+SRC_BASE="https://www.eclipse.org/downloads/download.php?r=1&file=/technology/epp/downloads/release/${MY_PV}/R/eclipse-parallel-${MY_PV}-R-linux-gtk"
+
+DESCRIPTION="Eclipse IDE for Scientific Computing (C, C++, Fortran)"
+HOMEPAGE="https://www.eclipse.org/"
+SRC_URI="
+	amd64? ( ${SRC_BASE}-x86_64.tar.gz )
+	arm64? ( ${SRC_BASE}-aarch64.tar.gz )
+"
+
+S="${WORKDIR}/${MY_PN}"
+
+LICENSE="EPL-2.0"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~arm64"
+RESTRICT="mirror"
+
+RDEPEND="
+	|| (
+		dev-java/openjdk:11 dev-java/openjdk:17
+		dev-java/openjdk-bin:11 dev-java/openjdk-bin:17
+		dev-java/openjdk-jre-bin:11
+	)
+	x11-libs/gtk+:3
+"
+
+QA_FLAGS_IGNORED=".*"
+
+src_install() {
+	insinto "/opt/${PN}"
+	doins -r "${S}/."
+
+	exeinto "/opt/${PN}"
+	doexe "${S}/${MY_PN}"
+	make_wrapper ${PN%-*} "/opt/${PN}/${MY_PN} -vm /opt/openjdk*/bin/java" "" "/opt/${PN}" "/opt/bin"
+
+	doicon -s 48 plugins/org.eclipse.platform_4.26.0.v20221123-1800/eclipse48.png
+	make_desktop_entry eclipse-parallel "Eclipse IDE Parallel ${MY_PV}" eclipse48 "Development;" || die "Failed making desktop entry!"
+}
--- a/games-util/xivlauncher/xivlauncher-1.0.2.ebuild
+++ b/games-util/xivlauncher/xivlauncher-1.0.2.ebuild
@@ -192,7 +192,7 @@ vortice.mathematics-1.3.24

 DOTNET_SLOT="6.0"

-inherit dotnet-utils desktop
+inherit dotnet-utils desktop xdg

 DESCRIPTION="Custom Launcher for Final Fantasy XIV Online (Crossplatform rewrite)"

@@ -261,13 +261,3 @@ src_install() {
 	fperms +x /opt/xivlauncher/XIVLauncher.Core
 	dosym ../../opt/xivlauncher/XIVLauncher.Core usr/bin/${PN}
 }
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
--- a/sci-physics/SU2/Manifest
+++ b/sci-physics/SU2/Manifest
@@ -1,4 +1,3 @@
 DIST SU2-7.2.0-TestCases.tar.gz 464156192 BLAKE2B 405a5ccdd13bc5109feca1462b6ac434a4d817adbaca964465678683d5593fa940579e364e33414da5f059a89b2919fbc0baed82967246356da49c87ac9ce63f SHA512 d75894c285ac7cb4c72eece10a02f014fb2d85b585c08d1a9bbf12ab51f6004be99c368bde98734891dc45446d0656b21317b50d7d14af95b6ce4bfe72871f11
 DIST SU2-7.2.0-Tutorials.tar.gz 72845754 BLAKE2B ef670a77d0189e9fd8ad48d96bd4617de558311d0df0d81a10dd3cbf8b97b7fbcb0e6725746d8451ce12a923f6895a392582fa980f4054b3b1306609431900ff SHA512 c91cfbdfb26169fc36575f60ec3133ea4a6f39c8433e276840a0f96c7508f3ee898020179ac01d606da9c5e10ee2ad263a642ff6f6b7400d75f4eb03ee7e1cf8
 DIST SU2-7.2.0.tar.gz 15356101 BLAKE2B e52f09d0451c200f6fd6874d55bedf7733f934cb2cee378ca286107960bd82332adc932cae57e9052654b34972717a4f8969db216acdcef8a6816b648119df94 SHA512 5600ebb97ef5939333907f75cda58a02810642439309fc8626ed974dfbfaffdf0cd7d9cc81de310cb12e6f92f98b64c58d607ad93095bd86cc583768947ccf6b
-DIST mutationpp-1.0.1.tar.gz 4021945 BLAKE2B caae3ca155541a36822a950047efb867aab098bc9db311d675acca272d7f317ff35524086a0ea5eda524bbe125e4874f41dc1dbad92bfee4387e3a0c649bbd0a SHA512 ba8beeb7cdaf1b526571e27f745d8d53c1e20a96bd194a5949acb8b6d5f75553867158a63bfc7198502177a9e8a91bf82a67d450a3ba72b21f8490539f45ef01
--- 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
 }
--- 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
 }