gentoo auto-resync : 26:03:2024 - 01:01:01

6 files changed, 99 insertions, 73 deletions

diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 6f3c539b8b3b..1b4d9e8de0ed 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/opencascade/Manifest b/sci-libs/opencascade/Manifest
index 113205e2a3e2..40f859640d2c 100644
--- a/sci-libs/opencascade/Manifest
+++ b/sci-libs/opencascade/Manifest
@@ -9,6 +9,7 @@ AUX opencascade-7.7.0-build-against-vtk-9.2.patch 1360 BLAKE2B 39bcae904286687ff
 AUX opencascade-7.7.0-fix-installation-of-cmake-config-files.patch 1823 BLAKE2B e84bb8627ba5cee166c483631511d150ef9af2c1aa966d7154926600da0674214b3fce8363dcff7d94204c36a92f236ede0f7849039a3bd4509d04d91444204f SHA512 242604d59b3596644b1efa95ce9d7b3d30dbb1bd49f79e28a4ea66ac9b6d4728a32cf31ceb9078875a39bb7b8775ba3ce685560045684b803037a61e2f37d2a4
 AUX opencascade-7.7.0-jemalloc-lib-type.patch 783 BLAKE2B baa529cd277dac5e97fc77b30a8a5b2349364a60948abbb56d754dcb1a1bfd4fc76745798b4163d1b5d76752e3ff61b121323cf4a15195b4bab0e4ad5dd56fd1 SHA512 1ac1a56cec067184ced6cf632d4b18c50bbbc7380f397f55dd4be5003938aaa4899d857f6a1c14f342550c1fdd43e23829a9a174042cbf8d76e2844d740aa20c
 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-tests.patch 539 BLAKE2B 519e97a2881da6d437c4b54beaeb5e77883669ff8d16b491bc6859db6c02e807dc4ceffa1052ece9a8ec56ba9024c5abb61caca1a1efa7847efbe3bce7d5ef95 SHA512 4ba8fcf8277b4dda3ceb84010299b925ccb561e9bb3d1097dc41c437be6be9499160ac1c3f36d63ca6f4fa9f9f9d012f787125c0bd693b44028c50b9c858bd8a
 AUX opencascade.env.in 4571 BLAKE2B 81780f83a476ba5a2691c003c7fde48fec14be4e355480080749800602307d64b88f779cde09aa94a7bb815849d669b054d5ca00908199d1a9857b07518b4f0d SHA512 98e6861469725f6880e38a2d7389f7bc748bcbdf54930aa3fe05ab6a5e1fab5249c4ffed4f45b6ef982325acece0d5acb7ffd8d92adac9be2db9a41ee5356019
@@ -21,8 +22,8 @@ DIST opencascade-dataset-7.7.0.tar.gz 128392200 BLAKE2B ebfbe6f24520144ca4a82e4d
 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 4838 BLAKE2B d0fba653700a337109b5c41c80b68560c2703b56592fc57d5f588e507f68637ff4db7938f91436e5e520799585044c97fc7c9fcc914b48114411a1a83d75c549 SHA512 c4d9522d65bd199a0fd4f5dddad91224c4fe7b2e383324f3a2fdf36c752c22ce7afc934cda38f9a558f6ce4a528688163b446e99ddc2c5a9e2ac4950b2f7d2fd
-EBUILD opencascade-7.7.1.ebuild 9410 BLAKE2B c29aafd2f1e7a7305b25fc2eeaa82ab2b337c78193f73d1838545368735b0b0628f0ff8b737d11363b16a3f55e78ebf48a34d8a0a08a4b4ccbe4cab562b2a232 SHA512 1bee8ef7ba89382d533510356d307d0f87b88af4dbf00be86124c146bfdcd1e82b7e179371c1154688c0069912f707bad5569118c59f4edf90f8f85fee5fc634
-EBUILD opencascade-7.7.2.ebuild 9410 BLAKE2B c29aafd2f1e7a7305b25fc2eeaa82ab2b337c78193f73d1838545368735b0b0628f0ff8b737d11363b16a3f55e78ebf48a34d8a0a08a4b4ccbe4cab562b2a232 SHA512 1bee8ef7ba89382d533510356d307d0f87b88af4dbf00be86124c146bfdcd1e82b7e179371c1154688c0069912f707bad5569118c59f4edf90f8f85fee5fc634
-EBUILD opencascade-7.8.0.ebuild 9373 BLAKE2B f4140665caaaa607bf22af4a3828944f69e7f74483dbaf768865e93e9127655427527e1f21bbaa6ec563a1da1eac94337885d5d4f60005980bdcc525f16f19fe SHA512 1940b0465b5023a6b53530fe25f832d653ecd06b95aacf33984ce76fc1df579eccade33889ffd2ee81bfed8839c82bb3977accef467a7173b2279ccbf7598752
+EBUILD opencascade-7.7.1.ebuild 9043 BLAKE2B bf1a91608775ec43a840e9799009c0720a71b08b6583db69246319af8edc1ed83243d711536d08b374ac99dec63f9d723c0f15c236034636766c2e57bc564f45 SHA512 74b6c59fbe57e96a7905e5c5d743adf68db40b87121bd6bc423f63af60b999fe4d098d9cc179cf088c0003bf3b5f06ca0552ab2b72e5bbdac22df0c7b0483267
+EBUILD opencascade-7.7.2.ebuild 8974 BLAKE2B 39c7f2a69ad35798e95fc35c18d20cb027c368dc26f8f28724fcee4501c3a53ac2401594931be3851c35f849deb62d525311ff372f4018ba291b68b4e6695cb9 SHA512 83286b5e2c204d0a418264e0a73fdd5a37b516f6897c4e8cbb42dc15b384d8591abacbd84e8d78e7f7fa34fa72c7b212884f2c0510f93ebce98d37e24e8b94ef
+EBUILD opencascade-7.8.0.ebuild 9382 BLAKE2B adecd4cc9f0062097e14d7d43942d092ddbd97a55bf1d07ed37364f1a2d2c516965a5364658071a8cdbcf2adaeed852ef2822178b54b9716ad2b575fa587ad58 SHA512 4d42809113f85e4c51034b5daf5decc15ae33e73dbe90a7d711a31b714afcb44f3acc75265f688b015e29eebf6c52c32e79ffa2b8abfce0924eb925f7ed5c570
 EBUILD opencascade-9999.ebuild 9373 BLAKE2B f4140665caaaa607bf22af4a3828944f69e7f74483dbaf768865e93e9127655427527e1f21bbaa6ec563a1da1eac94337885d5d4f60005980bdcc525f16f19fe SHA512 1940b0465b5023a6b53530fe25f832d653ecd06b95aacf33984ce76fc1df579eccade33889ffd2ee81bfed8839c82bb3977accef467a7173b2279ccbf7598752
 MISC metadata.xml 1377 BLAKE2B ca7101643c8e08017ec12840cecf9e852a5fcfa8e40f50589ce70b21e55bb4b61598689d15596ed132bba7f592fb9672fc14e559540deb6900709bcfc2dcfcc3 SHA512 a6c3e37cda18e3838f4277383a0067166cb14449905d6c1dd566f7d78064b9e20ac35acf3dadb75ef82f9a6a59f463f870e08ea7f501dadf6f06834606a3526d
diff --git a/sci-libs/opencascade/files/opencascade-7.7.0-tbb-detection.patch b/sci-libs/opencascade/files/opencascade-7.7.0-tbb-detection.patch
new file mode 100644
index 000000000000..c93b009a9da6
--- /dev/null
+++ b/sci-libs/opencascade/files/opencascade-7.7.0-tbb-detection.patch
@@ -0,0 +1,53 @@
+From: Fabio Rossi <rossi.f@inwind.it>
+See-Also: https://tracker.dev.opencascade.org/view.php?id=33612
+Fix tbb detection
+
+--- ./adm/cmake/tbb.cmake	2022-11-11 23:19:44.000000000 +0100
++++ ./adm/cmake/tbb.cmake.new	2024-02-24 18:59:32.267165878 +0100
+@@ -56,13 +56,17 @@
+       list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_TBB_INCLUDE_DIR)
+     endif()
+ 
++    # Get installed configuration of tbb
++    get_target_property (TARGET_TBB_IMPORT_CONFS TBB::tbb IMPORTED_CONFIGURATIONS)
++    list (GET TARGET_TBB_IMPORT_CONFS 0 CHOSEN_IMPORT_CONF)
++
+     separate_arguments (CSF_TBB)
+     foreach (LIB IN LISTS CSF_TBB)
+       string(TOLOWER "${LIB}" LIB_LOWER)
+       string(TOUPPER "${LIB}" LIB_UPPER)
+ 
+       # Achive *.lib files and directory containing it.
+-      get_target_property (TBB_LIB_FILE "TBB::${LIB_LOWER}" IMPORTED_IMPLIB_RELEASE)
++      get_target_property (TBB_LIB_FILE "TBB::${LIB_LOWER}" IMPORTED_IMPLIB_${CHOSEN_IMPORT_CONF})
+       # Reserve cache variable for *.lib.
+       if (NOT DEFINED 3RDPARTY_${LIB_UPPER}_LIBRARY)
+         set (3RDPARTY_${LIB_UPPER}_LIBRARY "" CACHE FILEPATH "${LIB_UPPER} library (*.lib)")
+@@ -89,7 +93,7 @@
+       endif()
+ 
+       # Achive *.dll files and directory containing it.
+-      get_target_property (TBB_DLL_FILE "TBB::${LIB_LOWER}" IMPORTED_LOCATION_RELEASE)
++      get_target_property (TBB_DLL_FILE "TBB::${LIB_LOWER}" IMPORTED_LOCATION_${CHOSEN_IMPORT_CONF})
+       # Reserve cache variable for *.dll.
+       if (NOT DEFINED 3RDPARTY_${LIB_UPPER}_DLL)
+         set (3RDPARTY_${LIB_UPPER}_DLL "" CACHE FILEPATH "${LIB_UPPER} library (*.dll)")
+@@ -185,13 +189,17 @@
+     list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_TBB_INCLUDE_DIR)
+   endif()
+ 
++  # Get installed configuration of tbb
++  get_target_property (TARGET_TBB_IMPORT_CONFS TBB::tbb IMPORTED_CONFIGURATIONS)
++  list (GET TARGET_TBB_IMPORT_CONFS 0 CHOSEN_IMPORT_CONF)
++
+   separate_arguments (CSF_TBB)
+   foreach (LIB IN LISTS CSF_TBB)
+     string(TOLOWER "${LIB}" LIB_LOWER)
+     string(TOUPPER "${LIB}" LIB_UPPER)
+ 
+     # Achive *.so files and directory containing it.
+-    get_target_property (TBB_SO_FILE "TBB::${LIB_LOWER}" IMPORTED_LOCATION_RELEASE)
++    get_target_property (TBB_SO_FILE "TBB::${LIB_LOWER}" IMPORTED_LOCATION_${CHOSEN_IMPORT_CONF})
+     # Reserve cache variable for *.so.
+     if (NOT DEFINED 3RDPARTY_${LIB_UPPER}_LIBRARY)
+       set (3RDPARTY_${LIB_UPPER}_LIBRARY "" CACHE FILEPATH "${LIB_UPPER} library (*.so)")
diff --git a/sci-libs/opencascade/opencascade-7.7.1.ebuild b/sci-libs/opencascade/opencascade-7.7.1.ebuild
index 384a99eaaf44..d9ef51dd1f11 100644
--- a/sci-libs/opencascade/opencascade-7.7.1.ebuild
+++ b/sci-libs/opencascade/opencascade-7.7.1.ebuild
@@ -32,11 +32,12 @@ 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 gui json +opengl optimize tbb test testprograms tk vtk"
 
 REQUIRED_USE="
 	?? ( optimize tbb )
 	?? ( opengl gles2-only )
+	examples? ( gui )
 	test? ( freeimage json opengl )
 "
 
@@ -59,17 +60,14 @@ RDEPEND="
 		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
-		)
+		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 )
-	jemalloc? ( dev-libs/jemalloc )
 	tbb? ( dev-cpp/tbb:= )
 	vtk? (
 		sci-libs/vtk:=[rendering]
@@ -86,7 +84,7 @@ DEPEND="
 BDEPEND="
 	doc? ( app-text/doxygen[dot] )
 	gui? (
-		examples? ( dev-qt/linguist-tools:5 )
+		dev-qt/linguist-tools:5
 	)
 	test? ( dev-tcltk/thread )
 "
@@ -98,7 +96,7 @@ 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-jemalloc-lib-type.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"
 )
@@ -178,23 +176,13 @@ 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)"
 		-DUSE_XLIB="$(usex X)"
 	)
 
-	# Select using memory manager tool.
-	if ! use jemalloc && ! use tbb; then
-		mycmakeargs+=( -DUSE_MMGR_TYPE=NATIVE )
-	elif use jemalloc && ! use tbb; then
-		mycmakeargs+=( -DUSE_MMGR_TYPE=JEMALLOC )
-	elif ! use jemalloc && use tbb; then
-		mycmakeargs+=( -DUSE_MMGR_TYPE=TBB )
-	elif use jemalloc && use tbb; then
-		mycmakeargs+=( -DUSE_MMGR_TYPE=FLEXIBLE )
-	fi
-
 	if use doc; then
 		mycmakeargs+=(
 			-DINSTALL_DOC_Overview="yes"
@@ -207,11 +195,9 @@ src_configure() {
 			-D3RDPARTY_QT_DIR="${ESYSROOT}/usr"
 			-DBUILD_SAMPLES_QT="$(usex examples)"
 		)
-	fi
-
-	if use jemalloc; then
+	else
 		mycmakeargs+=(
-			-D3RDPARTY_JEMALLOC_INCLUDE_DIR="${ESYSROOT}/usr/include/jemalloc"
+			-DCMAKE_DISABLE_FIND_PACKAGE_Qt5="yes"
 		)
 	fi
 
@@ -297,6 +283,9 @@ src_test() {
 			'opengl drivers opengles'
 			'opengles3'
 
+			'offset wire_closed_inside_0_005 D1'
+			'offset wire_unclosed_outside_0_025 A1'
+
 			'demo draw bug30430'
 		)
 
diff --git a/sci-libs/opencascade/opencascade-7.7.2.ebuild b/sci-libs/opencascade/opencascade-7.7.2.ebuild
index 384a99eaaf44..606592c2b231 100644
--- a/sci-libs/opencascade/opencascade-7.7.2.ebuild
+++ b/sci-libs/opencascade/opencascade-7.7.2.ebuild
@@ -32,11 +32,12 @@ 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 gui json +opengl optimize tbb test testprograms tk vtk"
 
 REQUIRED_USE="
 	?? ( optimize tbb )
 	?? ( opengl gles2-only )
+	examples? ( gui )
 	test? ( freeimage json opengl )
 "
 
@@ -59,17 +60,14 @@ RDEPEND="
 		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
-		)
+		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 )
-	jemalloc? ( dev-libs/jemalloc )
 	tbb? ( dev-cpp/tbb:= )
 	vtk? (
 		sci-libs/vtk:=[rendering]
@@ -86,7 +84,7 @@ DEPEND="
 BDEPEND="
 	doc? ( app-text/doxygen[dot] )
 	gui? (
-		examples? ( dev-qt/linguist-tools:5 )
+		dev-qt/linguist-tools:5
 	)
 	test? ( dev-tcltk/thread )
 "
@@ -98,7 +96,7 @@ 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-jemalloc-lib-type.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"
 )
@@ -178,23 +176,13 @@ 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)"
 		-DUSE_XLIB="$(usex X)"
 	)
 
-	# Select using memory manager tool.
-	if ! use jemalloc && ! use tbb; then
-		mycmakeargs+=( -DUSE_MMGR_TYPE=NATIVE )
-	elif use jemalloc && ! use tbb; then
-		mycmakeargs+=( -DUSE_MMGR_TYPE=JEMALLOC )
-	elif ! use jemalloc && use tbb; then
-		mycmakeargs+=( -DUSE_MMGR_TYPE=TBB )
-	elif use jemalloc && use tbb; then
-		mycmakeargs+=( -DUSE_MMGR_TYPE=FLEXIBLE )
-	fi
-
 	if use doc; then
 		mycmakeargs+=(
 			-DINSTALL_DOC_Overview="yes"
@@ -209,12 +197,6 @@ src_configure() {
 		)
 	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"
@@ -297,6 +279,9 @@ src_test() {
 			'opengl drivers opengles'
 			'opengles3'
 
+			'offset wire_closed_inside_0_005 D1'
+			'offset wire_unclosed_outside_0_025 A1'
+
 			'demo draw bug30430'
 		)
 
diff --git a/sci-libs/opencascade/opencascade-7.8.0.ebuild b/sci-libs/opencascade/opencascade-7.8.0.ebuild
index 2f819b1746e8..33ab0630c4c9 100644
--- a/sci-libs/opencascade/opencascade-7.8.0.ebuild
+++ b/sci-libs/opencascade/opencascade-7.8.0.ebuild
@@ -31,11 +31,12 @@ 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 gui jemalloc json +opengl optimize tbb test testprograms tk vtk"
 
 REQUIRED_USE="
 	?? ( optimize tbb )
 	?? ( opengl gles2-only )
+	examples? ( gui )
 	test? ( freeimage json opengl )
 "
 
@@ -58,13 +59,11 @@ RDEPEND="
 		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
-		)
+		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 )
@@ -85,7 +84,7 @@ DEPEND="
 BDEPEND="
 	doc? ( app-text/doxygen[dot] )
 	gui? (
-		examples? ( dev-qt/linguist-tools:5 )
+		dev-qt/linguist-tools:5
 	)
 	test? ( dev-tcltk/thread )
 "
@@ -97,6 +96,7 @@ 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"
@@ -177,6 +177,7 @@ 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)"
@@ -187,7 +188,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
@@ -208,12 +212,6 @@ src_configure() {
 		)
 	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"