gentoo auto-resync : 15:04:2024 - 12:04:02

18 files changed, 229 insertions, 411 deletions

diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 4f2837e71dc3..5dd9ee406247 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/opencascade/Manifest b/sci-libs/opencascade/Manifest
index e56ab32b26a5..e6e794ca6e42 100644
--- a/sci-libs/opencascade/Manifest
+++ b/sci-libs/opencascade/Manifest
@@ -11,19 +11,19 @@ AUX opencascade-7.7.0-jemalloc-lib-type.patch 783 BLAKE2B baa529cd277dac5e97fc77
 AUX opencascade-7.7.0-musl.patch 3095 BLAKE2B ad17417a93f42b4871c469cd7a50c48ed987f9333c626ca103fedabd49b84b7061de8eefbe834ead65325d606f2ea7f89210156364b55de75336d6493ff483c1 SHA512 6fb94bd075448d4ede48df918d070eda4607956d7a66b01f8b8b3621c0dc57348daa120661c5f1fe6ba7b818fec5737936b2620d62bfd0a7a224d03cbdd3ffc6
 AUX opencascade-7.7.0-tbb-detection.patch 2449 BLAKE2B c12e976a0fb69ca0d23c87a4cabc61fbb913acc10ce6d133586c58d88dd7a4d3fc456b047b311f89d11aad236ef4f7eb734206f484d085dd5cc3f6997b60798e SHA512 faae91cd2d522ae0ea12ed1707c3165496403f01b4e9ae8236ff03558f935f5fd1274a23d7659390ff1949920ec0fc2a6f7c65e08dacde149f73ca46cfab3d99
 AUX opencascade-7.8.0-cmake-min-version.patch 388 BLAKE2B ebeda19b2bb855a1b01bafb0a69e4bac51b95a84ca1d2fdfb58bfb4af007ba11efb4452812bd51060be5d45233258aabac305bb4048364fb0663c42cabe60d1f SHA512 025611176fdb894e53e413a5de32aabf7822743393dd847e01d650f3fdf00f56fc73b22c1faae97b94b2120d016055f0fd23a2d47c6211e49d2097fe6d510e99
+AUX opencascade-7.8.0-jemalloc-noexcept.patch 529 BLAKE2B 7882379259c483625e8b83d9736cd42385b795552038ae0170e1fb98ffffac537a8eda11b6b1afa50b6bd4da31b7ac9474f75c0406dd1f014a021256e9345908 SHA512 d615f26e28a388e8cb79150321f3a6899990460a601742e5deddaeededd44bb70f59e44e2dc078968186924d888e141d322a5e69bb29efb66b04226e762df157
 AUX opencascade-7.8.0-tests.patch 539 BLAKE2B 519e97a2881da6d437c4b54beaeb5e77883669ff8d16b491bc6859db6c02e807dc4ceffa1052ece9a8ec56ba9024c5abb61caca1a1efa7847efbe3bce7d5ef95 SHA512 4ba8fcf8277b4dda3ceb84010299b925ccb561e9bb3d1097dc41c437be6be9499160ac1c3f36d63ca6f4fa9f9f9d012f787125c0bd693b44028c50b9c858bd8a
+AUX opencascade-7.8.1-vtk_components.patch 603 BLAKE2B cfe4b19b53a63df593fb64e86ba2a4b31d9346a06fa7666cf29ca6b17aa18bbacf806828a3402395032cdece8ea36a672b27fdc9433fd56b3282173a0fa92310 SHA512 5f63bf223c29a8f2492484364b1ab097bb7c9f5a1ab064c0cff9a593836b2f4fff20de1d677cf81d51f0e68ddfc8b1466a5c1dcffdcd10bea58e6c2501f2b776
 AUX opencascade.env.in 4571 BLAKE2B 81780f83a476ba5a2691c003c7fde48fec14be4e355480080749800602307d64b88f779cde09aa94a7bb815849d669b054d5ca00908199d1a9857b07518b4f0d SHA512 98e6861469725f6880e38a2d7389f7bc748bcbdf54930aa3fe05ab6a5e1fab5249c4ffed4f45b6ef982325acece0d5acb7ffd8d92adac9be2db9a41ee5356019
 DIST opencascade-7.6.3.tar.gz 48216090 BLAKE2B ff0b63250e77b0240bd99bba38cd0e6b0a8c88bf39e495f5d51d7913f097e2cad83a5ad121e9d56de11c74008249c99a41f4615269a085b7cf97c3d7f0477d6d SHA512 c708f76edb707ba18bdfe7442ed8fa500894ee6c1cd8d0313eb906b3aa7dfa40a575f04dbccd70e84395d670f2b93fb8529f3d59726449234e627b9f35b9dded
 DIST opencascade-7.7.0.tar.gz 48393806 BLAKE2B b41da7bdd07aa6ef52f7833bef3e8a9fc2ca16cbf754773cb7adcc059c11c2a7937d279a2b6cf3096e7af6fbb42c6fdc2a5c98340d6b084d2ba100ba2c538f2a SHA512 6c90e2761f752241417ae6f18d819f51e66b32f3a50a97384f29ed73fa07f4cded84c71a6f6ba302d5e35c57e2fc13001619521eaf45757e4e5ff670d94bbf5c
-DIST opencascade-7.7.1.tar.gz 48408076 BLAKE2B 46e14a47a0ce555ac17a3fca520c1f21d7ca05c67b54259e3d2d8560618db096313d5be3d5e4a24acad1912534c17293ad203f48dd7464690aec86e287d9f230 SHA512 f095848d212afbe7e71614d46f57222e347246aec7c92aafae59e6f07798f5371c7a125042c149393ee7d361f28eb89b5196de17a7cc37233f1586ba919c0839
 DIST opencascade-7.7.2.tar.gz 48404428 BLAKE2B 28d637e75eca570e38401a0a59127ffdbcb06838a91cc3899fe905834bb47e0e9a92d16cde52027d94e78b0fbddc2043340a35dcb0f4a472c4f2bdac2713216c SHA512 d9e882d44bb65616f8cfce68ebdcd5765669b84e3d82cfb2d1bc22b71b0e878442c079bacc37e9d54f28ce98a7c23bf81f2a3e3e7bbeeec38927ca739f423dee
-DIST opencascade-7.8.0.tar.gz 48428565 BLAKE2B 91253101072af27c94b82b82beed5c1f1d7460f4154600fba805c5b2d27976a4841b9a9dfab9e67706d02463b2c630c5b63d1f056e84c69c9c8eeaca7e7caebf SHA512 af176cbd105c49949282c16bb6e30f69167bc6c00a50e0ae69aea555815d47ac3c4540c233e596c5add7cb846c2b33d7be267d8e02472286e758b662b4a652ab
+DIST opencascade-7.8.1.tar.gz 48432051 BLAKE2B de7a40b8e6612642a1567d2cf3e6b471c9edeadbc7f686bc8648502165c8d824b3574259874ecb1775c856703fd8df7481c9bc07a66a3a321a83e699e6802052 SHA512 807c1f8732926cfdabcfbdf8d6a0e76b8dba1a1e614afe084a467ffb4cfd80623f5e3afa7e9905b1ac96667c93e01b5f98ceaa8948a576a1093d98df98cc8f81
 DIST opencascade-dataset-7.7.0.tar.gz 128392200 BLAKE2B ebfbe6f24520144ca4a82e4ddd0486890552c2de1b62bf5c0d4990d777d4a1458dea54f8a6f08d8a0999582fb4325eda0002fc8a0137b9e66d024a47145d1279 SHA512 71d7e807b1d629fe7371b9d1d503024d00b7c1ae1775e62803eeffd127bd1c768e5240fdd1f949a237737089d528b5d4e43d26db025bbe14a4e0e4616ebdc5d8
 DIST opencascade-dataset-7.8.0.tar.xz 97049756 BLAKE2B aae5f076d9fc8a0d8a05028b0d9ffb527978e7acfdf5ecbc7e71c5ee3d6060cd7db9e56dba5b94a445bf5cf208126711cda70306607bdc5cd5e8b68df8fc150c SHA512 9b4c91d7b4743c47f2cf8d9a3b6ded73409a13133013424150ee9bdb61fd771c0b8799c7f31b459a7d2ba140399b9c0c972e2d0476188006361b4fb04042d990
 EBUILD opencascade-7.6.3-r2.ebuild 4690 BLAKE2B 8447a1b6c95c13c14a21bc58fbe82bb113e4d042e1034f66723f19eeddb558f8a243e77514c27ed53b0f220cb077d5bc91a8856f41a74d5fa396c16c3548e658 SHA512 d5821c186e2715fa7cea2b21f043b9c08c99de015789837b5e27a537c4a4017af0366752840d817b92506bea2d9bd2450fa6fca914c2e266001cde0cd483ebf4
 EBUILD opencascade-7.7.0-r2.ebuild 4970 BLAKE2B 5d92de56b2b667ad7817c512f0051b007b7089b864b63d438c35d306cdb2073743c5565946ab64f3d4a06ddfcfcd8051574bd41de299c75c9067cff639950d66 SHA512 52394427ab0e3de8599d79a18aaa9135c8d683451a0f0cd58a49de5e43fa734554010be73f19b4bbe33c84940fe805bb76ebd89d988449f86230683b55ced243
-EBUILD opencascade-7.7.1.ebuild 9175 BLAKE2B a89d336ac6f22050943e6ebefb5c4e1ad1e2f91b5944c3f925463f49feb2a6d204e189231cffbb4c59ee90f22710a796af05caf7863837e5e658a1ff468db876 SHA512 8f16ad8efb776bfdac8d0bc6f5d6872cc5cfcc0de7fcdd6eebe9ce6b478814141e39788eb5f6db1433c295d287c0eb2e0a80fae605d3d805e6372e66d92fe21d
-EBUILD opencascade-7.7.2.ebuild 9106 BLAKE2B 270c24f2360b79315274fd27d349728c399c4279864124567922a349b3f8f232c741ae7fb0cae5a2c0e112173d6b1c40ee56f3a01fa4654f666d05e71793d34d SHA512 48589ad134e12550b7579a7b3afb6f98ff4ce7156e8ca9e180303c6641de28261767c66330a7ab8cec1c38edec9b73e105dbe75714fc2a02f2e2f0462dbf7804
-EBUILD opencascade-7.8.0.ebuild 9514 BLAKE2B 058b2ff9f339c65c35e1118764d7f2ed74dde0fb95aab0ba4c138148aeef4f0515ab806cf216930ce53fbb9482f69a1efc06bed4eb5a589abcb5c35f6ba3a500 SHA512 fc132fb696a0d5d35c8c699ca0aa482f2f1017b4c2402c9a5f6ee1fff7201786686f7a25ea7f8597c44f73f41f4872cf19cba87b2a733c84746758482f3ae4c2
-EBUILD opencascade-9999.ebuild 9505 BLAKE2B ed00750680b7ee321f7fac0ced124429ddc050154846213b3c2dbd319293f7011ea71b38cc7c19eec824e5923665520dae4ae568955f277a050013cfc2bee3e1 SHA512 f7cd75938f702c55343bfba63726481cc23fdc5b8f8fbcbf3bec7612a83869e0f6f7ab1d37e5b6a333b48c56ddd31e4b1244364112c32bef0d6d28336b3d69f7
-MISC metadata.xml 1377 BLAKE2B ca7101643c8e08017ec12840cecf9e852a5fcfa8e40f50589ce70b21e55bb4b61598689d15596ed132bba7f592fb9672fc14e559540deb6900709bcfc2dcfcc3 SHA512 a6c3e37cda18e3838f4277383a0067166cb14449905d6c1dd566f7d78064b9e20ac35acf3dadb75ef82f9a6a59f463f870e08ea7f501dadf6f06834606a3526d
+EBUILD opencascade-7.7.2-r1.ebuild 9241 BLAKE2B de7db8352b0f5d2beca44252e03961820cf93cd6bfad32c0ba65f80f7b5a30aa7e9a975b56a565764c56452f61c613c4b9499b609d03c9e36e09ff0c41f508c7 SHA512 041f238960be08f8b7611443a6efbdbaefd3a39a2a7bf4d7b5eef5f510499f548c9acec665b56aaaf4b87ec35e2026bb6a34415690908e43e5c38e2a1b4d8d17
+EBUILD opencascade-7.8.1.ebuild 9748 BLAKE2B 2322e0356ed98ad0b0aa16d8367ee212da62b3695e929f45e3fb28131cbe83c3b1d028d28090f1db66d6e1e487bfb1d3fb6b294440b6fce1ea272f85cc37a6b7 SHA512 357f8d63375c86382c423fb62b6ce494d17e82c27225eda461254f33f587c76167a1e27e786d5a54ee5a953000800b2aa1881c1d41b55d41205c42c9520fbff8
+EBUILD opencascade-9999.ebuild 9748 BLAKE2B 2322e0356ed98ad0b0aa16d8367ee212da62b3695e929f45e3fb28131cbe83c3b1d028d28090f1db66d6e1e487bfb1d3fb6b294440b6fce1ea272f85cc37a6b7 SHA512 357f8d63375c86382c423fb62b6ce494d17e82c27225eda461254f33f587c76167a1e27e786d5a54ee5a953000800b2aa1881c1d41b55d41205c42c9520fbff8
+MISC metadata.xml 1429 BLAKE2B 5760fac929a12cad37147d72161a4ef190b10911c1fc4e3abdb4d095d93877ec7ec718d58e909b7b6047621e14e0c7de4954ded7cfc6115069eef522b289a214 SHA512 a61af11b06737af90f201247f599173056becc5aa5afd90b4c2c05e94e980992f548f68b08c5d194769b4308c2b61f39a6b120f0739af49b0a0f6e15b07ef209
diff --git a/sci-libs/opencascade/files/opencascade-7.8.0-jemalloc-noexcept.patch b/sci-libs/opencascade/files/opencascade-7.8.0-jemalloc-noexcept.patch
new file mode 100644
index 000000000000..2c4a98f5a1fd
--- /dev/null
+++ b/sci-libs/opencascade/files/opencascade-7.8.0-jemalloc-noexcept.patch
@@ -0,0 +1,13 @@
+diff --git a/src/Standard/Standard.cxx b/src/Standard/Standard.cxx
+index bb06de7..f73164f 100644
+--- a/src/Standard/Standard.cxx
++++ b/src/Standard/Standard.cxx
+@@ -28,7 +28,7 @@
+ #elif (defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 1)) && (defined(__i386) || defined(__x86_64)))
+ #include <mm_malloc.h>
+ #else
+-extern "C" int posix_memalign(void** thePtr, size_t theAlign, size_t theSize);
++extern "C" int posix_memalign(void** thePtr, size_t theAlign, size_t theSize) throw ();
+ #endif
+ 
+ namespace
diff --git a/sci-libs/opencascade/files/opencascade-7.8.1-vtk_components.patch b/sci-libs/opencascade/files/opencascade-7.8.1-vtk_components.patch
new file mode 100644
index 000000000000..03a6277c6fa8
--- /dev/null
+++ b/sci-libs/opencascade/files/opencascade-7.8.1-vtk_components.patch
@@ -0,0 +1,24 @@
+diff --git a/adm/cmake/vtk.cmake b/adm/cmake/vtk.cmake
+index 7d25a37..79257d1 100644
+--- a/adm/cmake/vtk.cmake
++++ b/adm/cmake/vtk.cmake
+@@ -60,7 +60,18 @@ if (3RDPARTY_VTK_DIR AND EXISTS "${3RDPARTY_VTK_DIR}")
+   set (ENV{VTK_DIR} "${3RDPARTY_VTK_DIR}")
+ endif()
+ 
+-find_package(VTK QUIET)
++find_package(VTK
++  COMPONENTS
++    CommonCore
++    FiltersGeneral
++    IOImage
++    ImagingCore
++    InteractionStyle
++    RenderingCore
++    RenderingFreeType
++    RenderingGL2PSOpenGL2
++    RenderingOpenGL2
++)
+ 
+ if (3RDPARTY_VTK_DIR AND EXISTS "${3RDPARTY_VTK_DIR}")
+   set (ENV{VTK_DIR} ${CACHED_VTK_DIR})
diff --git a/sci-libs/opencascade/metadata.xml b/sci-libs/opencascade/metadata.xml
index f3b6e96ad889..cf700b6db37e 100644
--- a/sci-libs/opencascade/metadata.xml
+++ b/sci-libs/opencascade/metadata.xml
@@ -13,6 +13,7 @@
 	<flag name="eigen">Enable support for eigenvalues through the header-only <pkg>dev-cpp/eigen</pkg> package.</flag>
 	<flag name="freeimage">Enable support for image i/o via <pkg>media-libs/freeimage</pkg></flag>
 	<flag name="freetype">Enable <pkg>media-libs/freetype</pkg> support</flag>
+	<flag name="inspector">Build Inspector tool</flag>
 	<flag name="jemalloc">Enable jemalloc allocator support via <pkg>dev-libs/jemalloc</pkg></flag>
 	<flag name="json">Enable JSON support through <pkg>dev-libs/rapidjson</pkg></flag>
 	<flag name="optimize">Don't clear allocated memory. Use optimized memory manager unlesstbb USE flag is set.</flag>
diff --git a/sci-libs/opencascade/opencascade-7.7.1.ebuild b/sci-libs/opencascade/opencascade-7.7.2-r1.ebuild
index 58050d6c5717..f3c88aa3ab89 100644
--- a/sci-libs/opencascade/opencascade-7.7.1.ebuild
+++ b/sci-libs/opencascade/opencascade-7.7.2-r1.ebuild
@@ -32,12 +32,11 @@ fi
 
 LICENSE="|| ( Open-CASCADE-LGPL-2.1-Exception-1.0 LGPL-2.1 )"
 SLOT="0/$(ver_cut 1-2)"
-IUSE="X debug doc examples ffmpeg freeimage freetype gles2-only gui json +opengl optimize tbb test testprograms tk vtk"
+IUSE="X debug doc examples ffmpeg freeimage freetype gles2-only inspector json +opengl optimize tbb test testprograms tk vtk"
 
 REQUIRED_USE="
 	?? ( optimize tbb )
 	?? ( opengl gles2-only )
-	examples? ( gui )
 	test? ( freeimage json opengl )
 "
 
@@ -59,7 +58,7 @@ RDEPEND="
 	X? (
 		x11-libs/libX11
 	)
-	gui? (
+	examples? (
 		dev-qt/qtcore:5
 		dev-qt/qtgui:5
 		dev-qt/qtquickcontrols2:5
@@ -68,8 +67,16 @@ RDEPEND="
 	)
 	ffmpeg? ( <media-video/ffmpeg-5:= )
 	freeimage? ( media-libs/freeimage )
+	inspector? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtquickcontrols2:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtxml:5
+	)
 	tbb? ( dev-cpp/tbb:= )
 	vtk? (
+		dev-lang/tk:=
 		sci-libs/vtk:=[rendering]
 		tbb? (
 			sci-libs/vtk:=[tbb,-cuda]
@@ -83,7 +90,7 @@ DEPEND="
 "
 BDEPEND="
 	doc? ( app-text/doxygen[dot] )
-	gui? (
+	inspector? (
 		dev-qt/linguist-tools:5
 	)
 	test? ( dev-tcltk/thread )
@@ -144,7 +151,7 @@ src_configure() {
 		-DBUILD_SOVERSION_NUMBERS=2
 
 		-DBUILD_DOC_Overview="$(usex doc)"
-		-DBUILD_Inspector="$(usex gui)"
+		-DBUILD_Inspector="$(usex inspector)"
 
 		-DBUILD_ENABLE_FPE_SIGNAL_HANDLER="$(usex debug)"
 		-DBUILD_USE_PCH="no"
@@ -181,7 +188,6 @@ src_configure() {
 		# no package in tree
 		-DUSE_OPENVR="no"
 		-DUSE_RAPIDJSON="$(usex json)"
-		-DUSE_QT="$(usex gui)"
 		-DUSE_TBB="$(usex tbb)"
 		-DUSE_TK="$(usex tk)"
 		-DUSE_VTK="$(usex vtk)"
@@ -195,15 +201,11 @@ src_configure() {
 		)
 	fi
 
-	if use gui; then
+	if use examples || use inspector; then
 		mycmakeargs+=(
 			-D3RDPARTY_QT_DIR="${ESYSROOT}/usr"
 			-DBUILD_SAMPLES_QT="$(usex examples)"
 		)
-	else
-		mycmakeargs+=(
-			-DCMAKE_DISABLE_FIND_PACKAGE_Qt5="yes"
-		)
 	fi
 
 	if use tbb; then
diff --git a/sci-libs/opencascade/opencascade-7.7.2.ebuild b/sci-libs/opencascade/opencascade-7.7.2.ebuild
deleted file mode 100644
index a83c28ed566c..000000000000
--- a/sci-libs/opencascade/opencascade-7.7.2.ebuild
+++ /dev/null
@@ -1,356 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake flag-o-matic virtualx
-
-DESCRIPTION="Development platform for CAD/CAE, 3D surface/solid modeling and data exchange"
-HOMEPAGE="https://www.opencascade.com"
-
-MY_PN="OCCT"
-
-MY_TEST_PV="7.7.0"
-MY_TEST_PV2="${MY_TEST_PV//./_}"
-
-SRC_URI="
-	test? ( https://github.com/Open-Cascade-SAS/${MY_PN}/releases/download/V${MY_TEST_PV2}/${PN}-dataset-${MY_TEST_PV}.tgz
-		-> ${PN}-dataset-${MY_TEST_PV}.tar.gz )
-"
-
-if [[ ${PV} = *9999* ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/Open-Cascade-SAS/${MY_PN}.git"
-else
-	MY_PV="${PV//./_}"
-	SRC_URI+="
-		https://github.com/Open-Cascade-SAS/${MY_PN}/archive/refs/tags/V${MY_PV}.tar.gz -> ${P}.tar.gz
-	"
-	S="${WORKDIR}/${MY_PN}-${MY_PV}"
-	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
-fi
-
-LICENSE="|| ( Open-CASCADE-LGPL-2.1-Exception-1.0 LGPL-2.1 )"
-SLOT="0/$(ver_cut 1-2)"
-IUSE="X debug doc examples ffmpeg freeimage freetype gles2-only gui json +opengl optimize tbb test testprograms tk vtk"
-
-REQUIRED_USE="
-	?? ( optimize tbb )
-	?? ( opengl gles2-only )
-	examples? ( gui )
-	test? ( freeimage json opengl )
-"
-
-# There's no easy way to test. Testing needs a rather big environment properly set up.
-RESTRICT="!test? ( test )"
-
-# ffmpeg: https://tracker.dev.opencascade.org/view.php?id=32871
-RDEPEND="
-	dev-lang/tcl:=
-	tk? ( dev-lang/tk:= )
-	dev-libs/double-conversion
-	freetype? (
-		media-libs/fontconfig
-		media-libs/freetype:2
-	)
-	opengl? (
-		media-libs/libglvnd
-	)
-	X? (
-		x11-libs/libX11
-	)
-	gui? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtquickcontrols2:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtxml:5
-	)
-	ffmpeg? ( <media-video/ffmpeg-5:= )
-	freeimage? ( media-libs/freeimage )
-	tbb? ( dev-cpp/tbb:= )
-	vtk? (
-		sci-libs/vtk:=[rendering]
-		tbb? (
-			sci-libs/vtk:=[tbb,-cuda]
-		)
-	)
-"
-DEPEND="
-	${RDEPEND}
-	X? ( x11-base/xorg-proto )
-	json? ( dev-libs/rapidjson )
-"
-BDEPEND="
-	doc? ( app-text/doxygen[dot] )
-	gui? (
-		dev-qt/linguist-tools:5
-	)
-	test? ( dev-tcltk/thread )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-7.5.1-0005-fix-write-permissions-on-scripts.patch"
-	"${FILESDIR}/${PN}-7.5.1-0006-fix-creation-of-custom.sh-script.patch"
-	"${FILESDIR}/${PN}-7.7.0-fix-installation-of-cmake-config-files.patch"
-	"${FILESDIR}/${PN}-7.7.0-avoid-pre-stripping-binaries.patch"
-	"${FILESDIR}/${PN}-7.7.0-build-against-vtk-9.2.patch"
-	"${FILESDIR}/${PN}-7.7.0-musl.patch"
-	"${FILESDIR}/${PN}-7.7.0-tbb-detection.patch"
-	"${FILESDIR}/${PN}-7.8.0-cmake-min-version.patch"
-	"${FILESDIR}/${PN}-7.8.0-tests.patch"
-)
-
-src_unpack() {
-	if [[ ${PV} = *9999* ]] ; then
-		git-r3_src_unpack
-	else
-		unpack "${P}.tar.gz"
-	fi
-
-	if use test; then
-		mkdir "${WORKDIR}/data"
-		pushd "${WORKDIR}/data" > /dev/null || die
-		# should be in paths indicated by CSF_TestDataPath environment variable,
-		# or in subfolder data in the script directory
-		unpack "${PN}-dataset-${MY_TEST_PV}.tar.gz"
-		popd > /dev/null || die
-	fi
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	sed -e 's|/lib\$|/'"$(get_libdir)"'\$|' \
-		-i adm/templates/OpenCASCADEConfig.cmake.in || die
-
-	# There is an OCCT_UPDATE_TARGET_FILE cmake macro that fails due to some
-	# assumptions it makes about installation paths. Rather than fixing it, just
-	# get rid of the mechanism altogether - its purpose is to allow a
-	# side-by-side installation of release and debug libraries.
-	sed -e 's|\\${OCCT_INSTALL_BIN_LETTER}||' \
-		-i adm/cmake/occt_toolkit.cmake || die
-}
-
-src_configure() {
-	# -Werror=odr
-	# https://bugs.gentoo.org/862912
-	# https://tracker.dev.opencascade.org/view.php?id=33091
-	filter-lto
-
-	local mycmakeargs=(
-		-D3RDPARTY_DIR="${ESYSROOT}/usr"
-		-DBUILD_CPP_STANDARD="C++17"
-		-DBUILD_SOVERSION_NUMBERS=2
-
-		-DBUILD_DOC_Overview="$(usex doc)"
-		-DBUILD_Inspector="$(usex gui)"
-
-		-DBUILD_ENABLE_FPE_SIGNAL_HANDLER="$(usex debug)"
-		-DBUILD_USE_PCH="no"
-		# -DBUILD_OPT_PROFILE="Default" # Production
-		# -DBUILD_RESOURCES="yes"
-		# -DBUILD_YACCLEX="yes"
-
-		-DBUILD_RELEASE_DISABLE_EXCEPTIONS="no" # bug #847916
-		-DINSTALL_DIR="${EPREFIX}/usr"
-		-DINSTALL_DIR_BIN="$(get_libdir)/${PN}/bin"
-		-DINSTALL_DIR_CMAKE="$(get_libdir)/cmake/${PN}"
-		-DINSTALL_DIR_DATA="share/${PN}/data"
-		-DINSTALL_DIR_DOC="share/doc/${PF}"
-		-DINSTALL_DIR_INCLUDE="include/${PN}"
-		-DINSTALL_DIR_LIB="$(get_libdir)/${PN}"
-		-DINSTALL_DIR_RESOURCE="share/${PN}/resources"
-		-DINSTALL_DIR_SAMPLES="share/${PN}/samples"
-		-DINSTALL_DIR_SCRIPT="$(get_libdir)/${PN}/bin"
-		-DINSTALL_DIR_TESTS="share/${PN}/tests"
-		-DINSTALL_DIR_WITH_VERSION="no"
-		-DINSTALL_SAMPLES="$(usex examples)"
-
-		-DINSTALL_TEST_CASES="$(usex testprograms)"
-
-		# no package yet in tree
-		-DUSE_DRACO="no"
-		-DUSE_FFMPEG="$(usex ffmpeg)"
-		-DUSE_FREEIMAGE="$(usex freeimage)"
-		-DUSE_FREETYPE="$(usex freetype)"
-		# Indicates whether OpenGL ES 2.0 should be used in OCCT visualization module
-		-DUSE_GLES2="$(usex gles2-only)"
-		# Indicates whether OpenGL desktop should be used in OCCT visualization module
-		-DUSE_OPENGL="$(usex opengl)"
-		# no package in tree
-		-DUSE_OPENVR="no"
-		-DUSE_RAPIDJSON="$(usex json)"
-		-DUSE_QT="$(usex gui)"
-		-DUSE_TBB="$(usex tbb)"
-		-DUSE_TK="$(usex tk)"
-		-DUSE_VTK="$(usex vtk)"
-		-DUSE_XLIB="$(usex X)"
-	)
-
-	if use doc; then
-		mycmakeargs+=(
-			-DINSTALL_DOC_Overview="yes"
-			-D3RDPARTY_SKIP_DOT_EXECUTABLE="no"
-		)
-	fi
-
-	if use gui; then
-		mycmakeargs+=(
-			-D3RDPARTY_QT_DIR="${ESYSROOT}/usr"
-			-DBUILD_SAMPLES_QT="$(usex examples)"
-		)
-	fi
-
-	if use tbb; then
-		mycmakeargs+=(
-			-D3RDPARTY_TBB_DIR="${ESYSROOT}/usr"
-		)
-	fi
-
-	if use vtk; then
-		local vtk_ver
-		vtk_ver="$(best_version "sci-libs/vtk")"
-		vtk_ver=$(ver_cut 1-2 "${vtk_ver#sci-libs/vtk-}")
-		mycmakeargs+=(
-			-D3RDPARTY_VTK_INCLUDE_DIR="${ESYSROOT}/usr/include/vtk-${vtk_ver}"
-			-D3RDPARTY_VTK_LIBRARY_DIR="${ESYSROOT}/usr/$(get_libdir)"
-		)
-	fi
-
-	cmake_src_configure
-
-	sed -e "s|lib/|$(get_libdir)/|" \
-		-e "s|VAR_CASROOT|${EPREFIX}/usr|" \
-		< "${FILESDIR}/${PN}.env.in" > "${T}/99${PN}" || die
-
-	# use TBB for memory allocation optimizations
-	if use tbb; then
-		sed -e 's|^#MMGT_OPT=0$|MMGT_OPT=2|' -i "${T}/99${PN}" || die
-	fi
-
-	# use internal optimized memory manager and don't clear memory with this
-	# memory manager.
-	if use optimize ; then
-		sed -e 's|^#MMGT_OPT=0$|MMGT_OPT=1|' \
-			-e 's|^#MMGT_CLEAR=1$|MMGT_CLEAR=0|' \
-			-i "${T}/99${PN}" || die
-	fi
-}
-
-src_test() {
-	echo "export CSF_OCCTDataPath=${WORKDIR}/data" >> "${BUILD_DIR}/custom.sh" || die
-
-	if has_version media-fonts/dejavu; then
-		cp "${ESYSROOT}/usr/share/fonts/dejavu/DejaVuSans.ttf" "${WORKDIR}/data/" # no die here as this isn't fatal
-	fi
-
-	local test_file=${T}/testscript.tcl
-
-	local draw_opts=(
-		i # see ${BUILD_DIR}/custom*.sh
-		# -b # batch mode (no GUI, no viewers)
-		-v # no GUI, use virtual (off-screen) windows for viewers
-	)
-
-	local test_names=(
-		"demo draw bug30430" # prone to dying due to cpu limit
-	)
-	local test_opts=( # run single tests
-		-overwrite
-	)
-	for test_name in "${test_names[@]}"; do
-		cat >> "${test_file}" <<- _EOF_ || die
-			test ${test_name} -outfile "${BUILD_DIR}/test_results/${test_name// /\/}.html" ${test_opts[@]}
-		_EOF_
-	done
-
-	local testgrid_opts=()
-
-	local SKIP_TESTS=()
-
-	if [[ "${OCCT_OPTIONAL_TESTS}" != "true" ]]; then
-		SKIP_TESTS+=(
-			'blend complex F4'
-			'bugs'
-			'geometry circ2d3Tan '{CircleCircleLin_11,CircleLinPoint_11}
-			'heal checkshape bug32448_1'
-			'hlr exact_hlr bug25813_2'
-
-			'hlr poly_hlr '{bug25813_2,bug25813_3,bug25813_4,Plate}
-			'lowalgos intss bug'{565,567_1,25950,27431,29807_i1003,29807_i2006,29807_i3003,29807_i5002,30703}
-			'lowalgos proximity '{A4,A5}
-			'opengl background bug27836'
-			'opengl drivers opengles'
-			'opengles3'
-
-			'offset wire_closed_inside_0_005 D1'
-			'offset wire_unclosed_outside_0_025 A1'
-
-			'demo draw bug30430'
-		)
-
-		local DEL_TESTS=(
-			'opengl/data/background/bug27836'
-			'perf/mesh/bug26965'
-			'v3d/trsf/bug26029'
-		)
-
-		for test in "${DEL_TESTS[@]}"; do
-			rm "${CMAKE_USE_DIR}/tests/${test}" || die
-		done
-	fi
-
-	if ! use vtk; then
-		SKIP_TESTS+=(
-			'vtk'
-		)
-		echo "IGNORE /Could not open: libTKIVtkDraw/skip VTK" >> "${CMAKE_USE_DIR}/tests/opengl/parse.rules"
-	fi
-
-	if [[ -n "${SKIP_TESTS[*]}" ]]; then
-		testgrid_opts+=( -exclude "$(IFS=',' ; echo "${SKIP_TESTS[*]}")" )
-	fi
-
-	testgrid_opts+=(
-		# -refresh 5
-		-overwrite
-	)
-	cat >> "${test_file}" <<- _EOF_ || die
-		testgrid -outdir "${BUILD_DIR}/test_results" ${testgrid_opts[@]}
-	_EOF_
-
-	# # regenerate summary in case we have to
-	# cat >> "${test_file}" <<- _EOF_ || die
-	# 	testsummarize "${BUILD_DIR}/test_results"
-	# _EOF_
-
-	# Work around zink warnings
-	export LIBGL_ALWAYS_SOFTWARE="true"
-
-	export CASROOT="${BUILD_DIR}"
-
-	virtx \
-	"${BUILD_DIR}/draw.sh" \
-		"${draw_opts[@]}" \
-		-f "${test_file}"
-
-	if [[ ! -f "${BUILD_DIR}/test_results/tests.log" ]]; then
-		eerror "tests never ran!"
-		die
-	fi
-	failed_tests="$(grep ": FAILED" "${BUILD_DIR}/test_results/tests.log")"
-	if [[ -n ${failed_tests} ]]; then
-		eerror "Failed tests:"
-		eerror "${failed_tests}"
-		die
-	fi
-}
-
-src_install() {
-	cmake_src_install
-
-	doenvd "${T}/99${PN}"
-
-	docompress -x "/usr/share/doc/${PF}/overview/html"
-}
diff --git a/sci-libs/opencascade/opencascade-7.8.0.ebuild b/sci-libs/opencascade/opencascade-7.8.1.ebuild
index ffa9e2065e14..94a2d018ce23 100644
--- a/sci-libs/opencascade/opencascade-7.8.0.ebuild
+++ b/sci-libs/opencascade/opencascade-7.8.1.ebuild
@@ -31,12 +31,11 @@ fi
 
 LICENSE="|| ( Open-CASCADE-LGPL-2.1-Exception-1.0 LGPL-2.1 )"
 SLOT="0/$(ver_cut 1-2)"
-IUSE="X debug doc examples ffmpeg freeimage freetype gles2-only gui jemalloc json +opengl optimize tbb test testprograms tk vtk"
+IUSE="X debug doc examples ffmpeg freeimage freetype gles2-only inspector jemalloc json +opengl optimize tbb test testprograms tk vtk"
 
 REQUIRED_USE="
 	?? ( optimize tbb )
 	?? ( opengl gles2-only )
-	examples? ( gui )
 	test? ( freeimage json opengl )
 "
 
@@ -58,7 +57,7 @@ RDEPEND="
 	X? (
 		x11-libs/libX11
 	)
-	gui? (
+	examples? (
 		dev-qt/qtcore:5
 		dev-qt/qtgui:5
 		dev-qt/qtquickcontrols2:5
@@ -67,9 +66,17 @@ RDEPEND="
 	)
 	ffmpeg? ( <media-video/ffmpeg-5:= )
 	freeimage? ( media-libs/freeimage )
+	inspector? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtquickcontrols2:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtxml:5
+	)
 	jemalloc? ( dev-libs/jemalloc )
 	tbb? ( dev-cpp/tbb:= )
 	vtk? (
+		dev-lang/tk:=
 		sci-libs/vtk:=[rendering]
 		tbb? (
 			sci-libs/vtk:=[tbb,-cuda]
@@ -83,7 +90,7 @@ DEPEND="
 "
 BDEPEND="
 	doc? ( app-text/doxygen[dot] )
-	gui? (
+	inspector? (
 		dev-qt/linguist-tools:5
 	)
 	test? ( dev-tcltk/thread )
@@ -100,6 +107,8 @@ PATCHES=(
 	"${FILESDIR}/${PN}-7.7.0-jemalloc-lib-type.patch"
 	"${FILESDIR}/${PN}-7.8.0-cmake-min-version.patch"
 	"${FILESDIR}/${PN}-7.8.0-tests.patch"
+	"${FILESDIR}/${PN}-7.8.0-jemalloc-noexcept.patch"
+	"${FILESDIR}/${PN}-7.8.1-vtk_components.patch"
 )
 
 src_unpack() {
@@ -145,7 +154,7 @@ src_configure() {
 		-DBUILD_SOVERSION_NUMBERS=2
 
 		-DBUILD_DOC_Overview="$(usex doc)"
-		-DBUILD_Inspector="$(usex gui)"
+		-DBUILD_Inspector="$(usex inspector)"
 
 		-DBUILD_ENABLE_FPE_SIGNAL_HANDLER="$(usex debug)"
 		-DBUILD_USE_PCH="no"
@@ -182,7 +191,6 @@ src_configure() {
 		# no package in tree
 		-DUSE_OPENVR="no"
 		-DUSE_RAPIDJSON="$(usex json)"
-		-DUSE_QT="$(usex gui)"
 		-DUSE_TBB="$(usex tbb)"
 		-DUSE_TK="$(usex tk)"
 		-DUSE_VTK="$(usex vtk)"
@@ -210,7 +218,7 @@ src_configure() {
 		)
 	fi
 
-	if use gui; then
+	if use examples || use inspector; then
 		mycmakeargs+=(
 			-D3RDPARTY_QT_DIR="${ESYSROOT}/usr"
 			-DBUILD_SAMPLES_QT="$(usex examples)"
diff --git a/sci-libs/opencascade/opencascade-9999.ebuild b/sci-libs/opencascade/opencascade-9999.ebuild
index e3da366e699f..94a2d018ce23 100644
--- a/sci-libs/opencascade/opencascade-9999.ebuild
+++ b/sci-libs/opencascade/opencascade-9999.ebuild
@@ -31,7 +31,7 @@ fi
 
 LICENSE="|| ( Open-CASCADE-LGPL-2.1-Exception-1.0 LGPL-2.1 )"
 SLOT="0/$(ver_cut 1-2)"
-IUSE="X debug doc examples ffmpeg freeimage freetype gles2-only +gui jemalloc json +opengl optimize tbb test testprograms tk vtk"
+IUSE="X debug doc examples ffmpeg freeimage freetype gles2-only inspector jemalloc json +opengl optimize tbb test testprograms tk vtk"
 
 REQUIRED_USE="
 	?? ( optimize tbb )
@@ -57,20 +57,26 @@ RDEPEND="
 	X? (
 		x11-libs/libX11
 	)
-	gui? (
-		examples? (
-			dev-qt/qtcore:5
-			dev-qt/qtgui:5
-			dev-qt/qtquickcontrols2:5
-			dev-qt/qtwidgets:5
-			dev-qt/qtxml:5
-		)
+	examples? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtquickcontrols2:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtxml:5
 	)
 	ffmpeg? ( <media-video/ffmpeg-5:= )
 	freeimage? ( media-libs/freeimage )
+	inspector? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtquickcontrols2:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtxml:5
+	)
 	jemalloc? ( dev-libs/jemalloc )
 	tbb? ( dev-cpp/tbb:= )
 	vtk? (
+		dev-lang/tk:=
 		sci-libs/vtk:=[rendering]
 		tbb? (
 			sci-libs/vtk:=[tbb,-cuda]
@@ -84,8 +90,8 @@ DEPEND="
 "
 BDEPEND="
 	doc? ( app-text/doxygen[dot] )
-	gui? (
-		examples? ( dev-qt/linguist-tools:5 )
+	inspector? (
+		dev-qt/linguist-tools:5
 	)
 	test? ( dev-tcltk/thread )
 "
@@ -97,9 +103,12 @@ PATCHES=(
 	"${FILESDIR}/${PN}-7.7.0-avoid-pre-stripping-binaries.patch"
 	"${FILESDIR}/${PN}-7.7.0-build-against-vtk-9.2.patch"
 	"${FILESDIR}/${PN}-7.7.0-musl.patch"
+	"${FILESDIR}/${PN}-7.7.0-tbb-detection.patch"
 	"${FILESDIR}/${PN}-7.7.0-jemalloc-lib-type.patch"
 	"${FILESDIR}/${PN}-7.8.0-cmake-min-version.patch"
 	"${FILESDIR}/${PN}-7.8.0-tests.patch"
+	"${FILESDIR}/${PN}-7.8.0-jemalloc-noexcept.patch"
+	"${FILESDIR}/${PN}-7.8.1-vtk_components.patch"
 )
 
 src_unpack() {
@@ -145,7 +154,7 @@ src_configure() {
 		-DBUILD_SOVERSION_NUMBERS=2
 
 		-DBUILD_DOC_Overview="$(usex doc)"
-		-DBUILD_Inspector="$(usex gui)"
+		-DBUILD_Inspector="$(usex inspector)"
 
 		-DBUILD_ENABLE_FPE_SIGNAL_HANDLER="$(usex debug)"
 		-DBUILD_USE_PCH="no"
@@ -192,7 +201,10 @@ src_configure() {
 	if ! use jemalloc && ! use tbb; then
 		mycmakeargs+=( -DUSE_MMGR_TYPE=NATIVE )
 	elif use jemalloc && ! use tbb; then
-		mycmakeargs+=( -DUSE_MMGR_TYPE=JEMALLOC )
+		mycmakeargs+=(
+			-DUSE_MMGR_TYPE=JEMALLOC
+			-D3RDPARTY_JEMALLOC_INCLUDE_DIR="${ESYSROOT}/usr/include/jemalloc"
+		)
 	elif ! use jemalloc && use tbb; then
 		mycmakeargs+=( -DUSE_MMGR_TYPE=TBB )
 	elif use jemalloc && use tbb; then
@@ -206,19 +218,13 @@ src_configure() {
 		)
 	fi
 
-	if use gui; then
+	if use examples || use inspector; then
 		mycmakeargs+=(
 			-D3RDPARTY_QT_DIR="${ESYSROOT}/usr"
 			-DBUILD_SAMPLES_QT="$(usex examples)"
 		)
 	fi
 
-	if use jemalloc; then
-		mycmakeargs+=(
-			-D3RDPARTY_JEMALLOC_INCLUDE_DIR="${ESYSROOT}/usr/include/jemalloc"
-		)
-	fi
-
 	if use tbb; then
 		mycmakeargs+=(
 			-D3RDPARTY_TBB_DIR="${ESYSROOT}/usr"
diff --git a/sci-libs/pyshp/Manifest b/sci-libs/pyshp/Manifest
index 2a5ac3c83e34..339bc9656a49 100644
--- a/sci-libs/pyshp/Manifest
+++ b/sci-libs/pyshp/Manifest
@@ -1,3 +1,4 @@
 DIST pyshp-2.3.1..gh.tar.gz 2213685 BLAKE2B ca5b87dec442508bc4a0612982984ba0fb91aa8acffddb6a448c43ccf42285305600a5e28e1fb781a3d94e8ce0624d027642fddcc5f2176dca3df095e59df170 SHA512 08844492b8d1d824c639844f7f314909d946bd4d3703a4f8d4cb64d400729671b42ff5b0f80aa68d9469f3939a3c7619ba13c9efdcba3b244ec01d7be3a371c5
 EBUILD pyshp-2.3.1-r1.ebuild 777 BLAKE2B 59870ff54c0a4a3b8ace5ca05ff0225fdbfb6d9cb1cacee8d3b7759a92099fb4dfd1fdc2a62bd7d53e47bfb481ba4f9df996ed99298ecbcecca0fd3292f91e6f SHA512 5f47eb6e8138c64c6b4ccac8288d01216c7180fdefd486a8c4be2e30327b21af8f56806f01baec58bc23668a3c13056c7d5549d8a9f3473224133a4f28b470cd
+EBUILD pyshp-2.3.1-r2.ebuild 766 BLAKE2B c14fa6ee82cb0649abb28ffacc950263e10e16e42a0ee32096938eb3169fd1ebe55383fc6a3b8304d26a14d4d3602d6b1b494a7c6cd3648b2f1b1dea822f723f SHA512 1eae298a56f3c3c1f01e30e3dfc6860b1b461a73a33af8c2b5e2696576a4cbcbfed271e406cab0608777bb834af0814fd0af6ac1bbe63ab61536d53f09df1db5
 MISC metadata.xml 392 BLAKE2B d0502636f7a083b4eca21dd9c9cb2604d96ec91616c88566f42687e53be965090683984d3289ae332c94309e89b25f39a12b601467abec718365d53f423fe21d SHA512 b3914985e7b8857a7f0841d4e987746f64a571a83ed3a237621c048e073c1f5a77512c40011ee1808c3ffadff08c03adc53ffe767e8a5f35c628882df779b771
diff --git a/sci-libs/pyshp/pyshp-2.3.1-r2.ebuild b/sci-libs/pyshp/pyshp-2.3.1-r2.ebuild
new file mode 100644
index 000000000000..18fbf87fe491
--- /dev/null
+++ b/sci-libs/pyshp/pyshp-2.3.1-r2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+PYTHON_COMPAT=( python3_{9..12} )
+
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1
+
+DESCRIPTION="Pure Python read/write support for ESRI Shapefile format"
+HOMEPAGE="https://pypi.org/project/pyshp/"
+# pypi tarballs are missing test data
+#SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/GeospatialPython/${PN}/archive/${PV}.tar.gz -> ${P}..gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+python_test() {
+	epytest test_shapefile.py -m "not network" || die
+}
diff --git a/sci-libs/spr/Manifest b/sci-libs/spr/Manifest
index f8449a8828cb..bfdebc19d5e8 100644
--- a/sci-libs/spr/Manifest
+++ b/sci-libs/spr/Manifest
@@ -2,5 +2,5 @@ AUX spr-3.3.2-autotools.patch 6970 BLAKE2B 477b3d80135a8627c0eab4927acee4bce4fc6
 AUX spr-3.3.2-fix-c++14.patch 2348 BLAKE2B 9594b221db526fe3d7fb6b6f6df57b4bfa00d28d7e8bd72cb902e7f9c6d23c64960ef159b674dce3ff348bcd8d60c38a030ee0e26a883972a166734dfbdb6b3e SHA512 201548823f74904c46e065246762e8bccf29830ec7f83542b567f27b328047faff59d5737b287d40b771afa8989a61a9f5b8f671f1e05f35fa336fa7fda5e25e
 AUX spr-3.3.2-gcc46.patch 1391 BLAKE2B 77c1c8ebc4b1a794cab20d0f7184a8e8d4d3f67358013b6ea12ee44b0e2eb726b0df71e480b8dda0863fd64c525ee757d3b0ef394cc476014e861eb79838bc38 SHA512 b4a6d8026ee1ac0a3c6dd90f28c82fd044fe52fb896ca0f1ff967d04d71f913bacc30bc3b641ffafbea53994d764d6b38db0a5957f34dd61aedf8da23868b3c7
 DIST SPR-3.3.2.tar.gz 2512059 BLAKE2B bb789e2f854f98901e72f9172be5198d4ac25754158314de59a7ed57ed957a0bd97b05afd473d6b9834a9f3d38831a18f7bc4ca1b0a7a68f7275e8cca74e59cd SHA512 5fc5cd90de87385ac2bc6c4b7f54be2fe5e1548c2c5b9fbd4fd9958f443bd25233b59b773186dc3c38efdfb90b622420f1a0ab585937df75e7ed049500a59a9d
-EBUILD spr-3.3.2.ebuild 768 BLAKE2B a457953501fa23c39c97d1e558b82ba9075d6e3d282d1d1bdc3053f3cc6aad2243fc8aa44636573fd09d397b7d175c42ac93ee853d2b898279453218f73ca265 SHA512 6da39bbac9f1fa18c057b4d24bd1f578975244b51b588d74e02995bfaa42d94df6e162ebd8cd277c3f1bdfba797bc45d84d0b19ecf0008fb2ea7032c8f4c3799
+EBUILD spr-3.3.2-r2.ebuild 873 BLAKE2B bb1b65c6f6b0cc000d3ae45dee19e2acebed5d839e4d44c25c8c204573305113982330c317e85496598cf990bb12045b7caa6b44ab4397cf93cba9286a6e6d37 SHA512 bd6d537ededfacfe13007f01d51453b5cd0318c761e50f43c937590dbd9b6c4facceaf8be04dec4e5a380058a50b7fbf41a5757bbd140481aee083432034be3c
 MISC metadata.xml 757 BLAKE2B 89a7cdf917493caf8c55e670244d01ad94fe3f87f0c57d6100416ec20d8e369dc77b1c64a38ba53534257d7d2f910352ce81fea34359bba94311e0e7616b5b17 SHA512 233ab35422d40c688f4fbb9f3be8fc3688295519ddf79365d2c14e5b2aa919b2d9b400118c1afb1e91c2348c87eb5985af5a6eaaaa9e875cb7a22e0bf6f16a67
diff --git a/sci-libs/spr/spr-3.3.2.ebuild b/sci-libs/spr/spr-3.3.2-r2.ebuild
index 3b639a0e109b..230353e35cc6 100644
--- a/sci-libs/spr/spr-3.3.2.ebuild
+++ b/sci-libs/spr/spr-3.3.2-r2.ebuild
@@ -1,13 +1,14 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit autotools
 
 DESCRIPTION="Statistical analysis and machine learning library"
 HOMEPAGE="https://statpatrec.sourceforge.net/"
 SRC_URI="mirror://sourceforge/statpatrec/${P^^}.tar.gz"
+S="${WORKDIR}/${P^^}"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -18,7 +19,6 @@ IUSE="root static-libs"
 DEPEND="root? ( sci-physics/root )"
 RDEPEND="${DEPEND}"
 
-S=${WORKDIR}/${P^^}
 PATCHES=(
 	"${FILESDIR}"/${P}-autotools.patch
 	"${FILESDIR}"/${P}-gcc46.patch
@@ -37,3 +37,10 @@ src_configure() {
 		$(use_enable static-libs static) \
 		$(use_with root)
 }
+
+src_install() {
+	default
+	if ! use static-libs; then
+		find "${ED}" -name '*.la' -delete || die
+	fi
+}
diff --git a/sci-libs/tokenizers/Manifest b/sci-libs/tokenizers/Manifest
index 9db96f16d850..80a037ac892f 100644
--- a/sci-libs/tokenizers/Manifest
+++ b/sci-libs/tokenizers/Manifest
@@ -1,3 +1,4 @@
+AUX tokenizers-0.15.2-test.patch 1783 BLAKE2B eb91905fb1773a57b7553d9d95ce326da6ed12729d1f4111504b58d8e825d8cfbe3303e0663703f8620e72c91e70573fd7b6fdf021a165c44a04d0a84e87622f SHA512 763276325c87a4fcca24e482726f50a7db9640b436314ac3a7f47fb868502360ab0c65eecafe53ee12f4a94c3a2c56b69942ceaf636479eb005e756d8cf8c1b1
 DIST adler-1.0.2.crate 12778 BLAKE2B a1dc17786adae945ac09d3525e609ed944e6465690787bbb831a1b9d53793cba1989793d0a5606d5d23ee20d36457923d451b1b3530c9ec7072a487aa3e55bbd SHA512 7ab190d31890fc05b0b55d8e2c6527a505e06793d5496be0b3831e0513412f9ba97f8148f6f68ed0770fa9cd980a5092d885e058becf1d5506b7c74b82674aa1
 DIST aho-corasick-1.1.1.crate 182812 BLAKE2B df74c2cfa0ae392a8d466e370ba761c4cd37c65773affba9a3cdcf7f5797b34b4a25e1646be3de5081644b34db2dce273609edb4f18a1ce7fdbf31ac28a10b88 SHA512 a894e1cefbb63a3b7b78a3676874d0b7a507c27970f48cdfbda1e5deefbf6b20ed4271b660a12eea77b318cd2fa0f80850a0b1ddfe0d0731ffa326c0fc295692
 DIST aho-corasick-1.1.2.crate 183136 BLAKE2B 2d4306d8968061b9f7e50190be6a92b3f668169ba1b9f9691de08a57c96185f7a4288d20c64cb8488a260eb18d3ed4b0e8358b0cca47aa44759b2e448049cbaa SHA512 61ef5092673ab5a60bec4e92df28a91fe6171ba59d5829ffe41fc55aff3bfb755533a4ad53dc7bf827a0b789fcce593b17e69d1fcfb3694f06ed3b1bd535d40c
@@ -419,5 +420,5 @@ DIST windows_x86_64_msvc-0.52.0.crate 821600 BLAKE2B cc448b65f98fc0fc4949ae622b7
 DIST windows_x86_64_msvc-0.52.4.crate 828019 BLAKE2B 08163b63d934114457cd64b1c372f8a0cfc1ebf48a2efb41d79031c58ea64e023acd32d2f5075b8b78536998188138562e584ece95f2021b4bc71087ac45f026 SHA512 0671fa3c0463c6d65b525ece8bc91eab2f75cb534de86ba2b1e854d4136fcb439717441881206dba7cfb602493bc24d2aefa96abf8977f5a0fe38d41eadc90f1
 DIST zeroize-1.7.0.crate 19039 BLAKE2B 2f94a5025f409bd2b96a456d2f78a34c6b05b5554abe7ef3fad2a55a8fcff8a6a1b971be660aa4c2954ab7d6e89bebc431036e349edef74711292f9f64b1dbae SHA512 9d31e3e76e8c861309a3579c21f6da5fd6b056c7d7a350427445a1a832e8827204804783f7f9b808acaa2148efef883d9078bf84943b1db55526bba5bf5a2756
 EBUILD tokenizers-0.14.1-r1.ebuild 6416 BLAKE2B a05371056932d5edc2b62b29de712c9d388391071a239114a5543ef583d52ca4e99e89e7411c872328c42de19e098dd02c4bf29992cfa97cb6683dc5b442ad0d SHA512 aafc4c2bdf01f6224d8393ba5d31bb3416b9917651931d06593ba395620de99f2fe553502c1b8e5653e81164dcdc863f13b0c4924f5465f6fd72ca239a96a4f3
-EBUILD tokenizers-0.15.2.ebuild 6487 BLAKE2B b5d5fcb2c491ad0e16b2052605118597e83646151f6f8f785915ee3a0a2e6780e645ab8d8ae3bc122de25938d3a442e26d708e9150ac15cf2fc8560ba08f293c SHA512 4f1f8345adc0ba1e93a7d7ac025b56ad4248b2deece840eae2ebec9cb8d17a28c811ceed4a53ec5990857e78ccffb300eb41b903094a5aba973a766376ebb7f9
+EBUILD tokenizers-0.15.2-r1.ebuild 6597 BLAKE2B f4e30a0b23e8dcb051b9e0c8de5547435277d5bdb882f436b1a38b00864b75f6dc84f7fb827aae20a1af4da8e36cf76ef4726365984b8240b419f3404c12e0f5 SHA512 3817ab6a8052723bf71483f14a1da578d233cd97a2088ffa01821fade6d7f313f185edd2cb1345f58b6a00fc6682bf2de6176892c03d2131e114c9a6a43308ce
 MISC metadata.xml 335 BLAKE2B 55e4d7b301e4315210bf24a4056741cc923c6a72ae323158c5715fade20db86de8a03464bf8f12fe7116689b41aa0519a0070eebff5f63801e23a9c4a9698a92 SHA512 77f537f495b90ad031842f704c5a629cc995fcd848f11defeb597cc16d2d7bab07d262f05a50b07788d2f58fb60eacbefdfa8328215b89b0c661a05b18c4555d
diff --git a/sci-libs/tokenizers/files/tokenizers-0.15.2-test.patch b/sci-libs/tokenizers/files/tokenizers-0.15.2-test.patch
new file mode 100644
index 000000000000..01a872cb846a
--- /dev/null
+++ b/sci-libs/tokenizers/files/tokenizers-0.15.2-test.patch
@@ -0,0 +1,39 @@
+--- a/tests/bindings/test_trainers.py	2024-04-07 18:21:19.443506351 +0200
++++ b/tests/bindings/test_trainers.py	2024-04-07 18:21:54.893466083 +0200
+@@ -295,8 +295,8 @@
+         tokenizer.pre_tokenizer = pre_tokenizers.Sequence(
+             [pre_tokenizers.Whitespace(), pre_tokenizers.Digits(individual_digits=True)]
+         )
+-        tokenizer.train(files=["data/big.txt"], trainer=trainer)
++        tokenizer.train(files=["tests/data/big.txt"], trainer=trainer)
+ 
+-        tokenizer.save("data/tokenizer.json")
++        tokenizer.save("tests/data/tokenizer.json")
+ 
+-        tokenizer.from_file("data/tokenizer.json")
++        tokenizer.from_file("tests/data/tokenizer.json")
+--- a/tests/documentation/test_tutorial_train_from_iterators.py	2024-04-07 18:19:08.653593406 +0200
++++ b/tests/documentation/test_tutorial_train_from_iterators.py	2024-04-07 18:19:39.206906910 +0200
+@@ -40,7 +40,7 @@
+     def setup_gzip_files(self, train_files):
+         with open(train_files["small"], "rt") as small:
+             for n in range(3):
+-                path = f"data/my-file.{n}.gz"
++                path = f"tests/data/my-file.{n}.gz"
+                 with gzip.open(path, "wt") as f:
+                     f.write(small.read())
+ 
+@@ -87,11 +87,11 @@
+         # START single_gzip
+         import gzip
+ 
+-        with gzip.open("data/my-file.0.gz", "rt") as f:
++        with gzip.open("tests/data/my-file.0.gz", "rt") as f:
+             tokenizer.train_from_iterator(f, trainer=trainer)
+         # END single_gzip
+         # START multi_gzip
+-        files = ["data/my-file.0.gz", "data/my-file.1.gz", "data/my-file.2.gz"]
++        files = ["tests/data/my-file.0.gz", "tests/data/my-file.1.gz", "tests/data/my-file.2.gz"]
+ 
+         def gzip_iterator():
+             for path in files:
diff --git a/sci-libs/tokenizers/tokenizers-0.15.2.ebuild b/sci-libs/tokenizers/tokenizers-0.15.2-r1.ebuild
index d2da8b88ac9b..ed6b224ac702 100644
--- a/sci-libs/tokenizers/tokenizers-0.15.2.ebuild
+++ b/sci-libs/tokenizers/tokenizers-0.15.2-r1.ebuild
@@ -6,8 +6,9 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=maturin
-PYTHON_COMPAT=( python3_{9..12} )
+PYTHON_COMPAT=( python3_{10..12} )
 DISTUTILS_EXT=1
+DISTUTILS_SINGLE_IMPL=1
 
 CRATES="
 	adler@1.0.2
@@ -290,9 +291,13 @@ LICENSE+="
 "
 SLOT="0"
 KEYWORDS="~amd64"
-RESTRICT="test"
 
-BDEPEND="dev-python/setuptools-rust[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? ( sci-libs/datasets[${PYTHON_SINGLE_USEDEP}] )
+	$(python_gen_cond_dep '
+		dev-python/setuptools-rust[${PYTHON_USEDEP}]
+	')
+"
 
 distutils_enable_tests pytest
 
@@ -305,6 +310,7 @@ src_unpack() {
 src_prepare() {
 	default
 	cd bindings/python
+	eapply "${FILESDIR}"/${P}-test.patch
 	distutils-r1_src_prepare
 }
 
@@ -327,8 +333,7 @@ src_test() {
 	# Tests do not work
 	#cargo_src_test
 	cd ../bindings/python
-	# Need dataset module
-	#distutils-r1_src_test
+	distutils-r1_src_test
 }
 
 src_install() {
diff --git a/sci-libs/transformers/Manifest b/sci-libs/transformers/Manifest
index 4201a57d85dd..98f83819c246 100644
--- a/sci-libs/transformers/Manifest
+++ b/sci-libs/transformers/Manifest
@@ -1,3 +1,5 @@
 DIST transformers-4.34.1.gh.tar.gz 14985064 BLAKE2B 7bccc5c924d26c69a6d185265bdbb70fddd57f325d6cf586dd0fcf0f84890dabd653eb1e528668d5605c22349e5314344b6f0052b9a3fc35018d4ca9ca89f6cf SHA512 ed1703e63597f94a0782c1e74287735b306d0722437fb860f8badc7ae88c25f7bcdaacb381435643aba776ba5886fe1a676cc33f5d07d647711298bb797067dd
+DIST transformers-4.35.2.gh.tar.gz 15700171 BLAKE2B 4a22810aa0fc4b0fc032bc1392669eb254c93a23a9b71d997be16cb3da3ef35c66117e58d30f28882b484c5cddf33e41910196d443aba04003146ea00703cee2 SHA512 1ba232f48cfb572a9576b32cfc47c1941137aed08c18759c86f60e58424b6733484e85e73ad214bde2d020ddaa269ed0496dddd945d68f2bfa520017d8f94447
 EBUILD transformers-4.34.1-r1.ebuild 989 BLAKE2B b8b257c2c17f0e29f95f142e452fc0c21301d9fbd59a7ac511cf4dca1889fc1bc031c747449a3f1c377421063c0ac841e890cf243451a04843f72d96bb186339 SHA512 18e8269466c5e4977b0dd49ad1502f779c74fedb991ba8a1fa181fe3ed67f26a2c80a1f06e77227dec22009360eeaa9b525222c96038f932d4c223d28ac0b93f
+EBUILD transformers-4.35.2.ebuild 990 BLAKE2B 55aadd1156c493a99312d89ac94493c4f1f6b33fb6bef37d3bfea30c68b4ea2a8cb2676d31398616f3e04ff3bc6d1eceae8d3ad333688b2e47a2a8a74235d830 SHA512 a562740c3cc5e5f9030d97caee388969f88b562358e40f10c9c0ecfeafaf9028b88fe5a7f31e11d519c96f710ad2aab214e32c25ab9e3e0bfd475895352c3c02
 MISC metadata.xml 387 BLAKE2B 3f22d78a1aa32d40204f0c028a564cae5950a3294a7f0ed13c171683a63d2e62892a3740834735a5165745bb477538ac75826fd0c495883bacb32fe22d124621 SHA512 f800c33c27db9b23289e0086f82a80c593b7eeca00cec7bd9c3619e4f074878302c9110117d1a4ddaf789c53a58c4b274d46f4bcea9b8eec477b4fcf8e317a29
diff --git a/sci-libs/transformers/transformers-4.35.2.ebuild b/sci-libs/transformers/transformers-4.35.2.ebuild
new file mode 100644
index 000000000000..d115e34a5797
--- /dev/null
+++ b/sci-libs/transformers/transformers-4.35.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+inherit distutils-r1
+
+DESCRIPTION="State-of-the-art Machine Learning for JAX, PyTorch and TensorFlow"
+HOMEPAGE="
+	https://pypi.org/project/transformers/
+	https://huggingface.co/
+"
+SRC_URI="https://github.com/huggingface/${PN}/archive/refs/tags/v${PV}.tar.gz
+	-> ${P}.gh.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+RESTRICT="test" # Need some modules, not yet packaged
+
+RDEPEND="
+	dev-python/filelock[${PYTHON_USEDEP}]
+	sci-libs/huggingface_hub[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/regex[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	sci-libs/safetensors[${PYTHON_USEDEP}]
+	sci-libs/tokenizers[${PYTHON_USEDEP}]
+	dev-python/tqdm[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest