sci-libs/opencascade: move 7.8.0 -> 7.8.1

7.8.1 addresses a critical issue regarding backward binary
compatibility with version 7.8.0.

Closes: https://bugs.gentoo.org/927788
Closes: https://bugs.gentoo.org/927890
Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com>
Signed-off-by: Andrew Ammerlaan <andrewammerlaan@gentoo.org>

7 files changed, 91 insertions, 34 deletions

diff --git a/sci-libs/opencascade/Manifest b/sci-libs/opencascade/Manifest
index ac0e7aa5db19..fa54d19c63f2 100644
--- a/sci-libs/opencascade/Manifest
+++ b/sci-libs/opencascade/Manifest
@@ -1,7 +1,6 @@
 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
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..224becfdec1f
--- /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)
++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.2-r1.ebuild b/sci-libs/opencascade/opencascade-7.7.2-r1.ebuild
index ce92fcc889e0..f3c88aa3ab89 100644
--- a/sci-libs/opencascade/opencascade-7.7.2-r1.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,6 +67,13 @@ 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:=
@@ -84,7 +90,7 @@ DEPEND="
 "
 BDEPEND="
 	doc? ( app-text/doxygen[dot] )
-	gui? (
+	inspector? (
 		dev-qt/linguist-tools:5
 	)
 	test? ( dev-tcltk/thread )
@@ -145,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"
@@ -195,7 +201,7 @@ src_configure() {
 		)
 	fi
 
-	if use examples || 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-7.8.0.ebuild b/sci-libs/opencascade/opencascade-7.8.1.ebuild
index fb390401a82b..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,6 +66,13 @@ 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? (
@@ -84,7 +90,7 @@ DEPEND="
 "
 BDEPEND="
 	doc? ( app-text/doxygen[dot] )
-	gui? (
+	inspector? (
 		dev-qt/linguist-tools:5
 	)
 	test? ( dev-tcltk/thread )
@@ -101,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() {
@@ -146,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"
@@ -210,7 +218,7 @@ src_configure() {
 		)
 	fi
 
-	if use examples || 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"