4 files changed, 4 insertions, 181 deletions
diff --git a/sci-libs/opencascade/Manifest b/sci-libs/opencascade/Manifest
index df3c3defe15f..3a5c7e6b0c42 100644
--- a/sci-libs/opencascade/Manifest
+++ b/sci-libs/opencascade/Manifest
@@ -6,10 +6,8 @@ AUX opencascade-7.5.1-0005-fix-write-permissions-on-scripts.patch 2453 BLAKE2B 0
 AUX opencascade-7.5.1-0006-fix-creation-of-custom.sh-script.patch 1245 BLAKE2B 1972c41e264a86761f8b3a3a649e67211776d0a4791b7e0f3adc859833e1d62e3a1d964484b2c53a516f5a33680ab2f32ad2010bf3fd531fca36373435307b68 SHA512 a2ffef88cb87acbc8215a7d1d7fe69ee17210392d39a64535d1538b2c08e43f5918c5b5e4a7540e8d636b1ba0df51670013e9d49f205bfc93a1e0d10a04388a7
 AUX opencascade-7.5.1-fix-AllValues-name-collision-with-vtk-9.0.patch 5749 BLAKE2B 9176a738ec6b39a1cd5da61f2d72d096b09f6019f63a5b7733c5aa00796529f2cc5e3becdf5c24cfa01e4ff5b9da5ae9cd359372e6974eeaae7bcdf87e8c03c8 SHA512 5f7970e1461652966c34b1adb6e2580cfd7e3e230abbf108193027f67afbd5e78fc7451b50bf632fa3889174626384e4a0044d693e4f49ab9ece84a2ec6bd04a
 AUX opencascade-7.5.env.in 4683 BLAKE2B 4c7c3764e56110c34c9acb9ecb860936049cf03f4ed99d708a8f631b5d3dc7cfa95ca7f8fe8b259986fa637243fe80a6888a2db6a2ad6f80b3b2175a9bb8680f SHA512 773b213e8d7752fc028d951d2a5d5aa610c96ee916499c3655e60f0ec485d393c3bf13a85cae104653242829d8abb9fea451f17bf1b902e1c1fa0bf5b329f08b
-DIST opencascade-7.5.1.tar.gz 47807222 BLAKE2B b5ef30ea7c373250db3e0863f3c7fde84256b37957a482f10a462a4c4ed1a21cffbbeb10e9fc140325022d7582efbd292ed6d1016d14cb67ccf5c84d14060d5a SHA512 ebb937254ac165041ef7e1a80df8f9d2ac1d518f01b3d4b0fd6d203fe0d80bd474b85a462cccc1c74a513bd257c0b0ab7002632573f38bf72170363c7e42ed2f
 DIST opencascade-7.5.2.tar.gz 47812603 BLAKE2B 86995ea60e24329f91a2cbede26112a70794fb091b34d33614bef412b05b8cc9f1e770aecf78272b54a241c2524422c86f8ff722b3f27b54bf10fa5eda626288 SHA512 f951a941043a56f381cfd25e4d78bb9ae08e5cc29a894e6c0c35daf30aeabf1e44ee09af65bb6b7d62d9325be67741ddcf52266b7186b4c336c70ed8bcfa1676
 DIST opencascade-7.5.3.tar.gz 47817862 BLAKE2B be438a08997c18c3cb2c08c520fff2f439cc8a406cc3f471be3b24f874ac3bd892c4afe6fa37f742ffb5da21b5a29f9c8f737e3160dcbda35a217286218eb5e1 SHA512 2d7cf284a1b3ce8d05151085b41579cc2f4e29489b7920769cd04f86a6d76e49f533b570226d3cf041c75582894ed8a6aff889312c7c507fffae47d3e57c5c47
-EBUILD opencascade-7.5.1-r2.ebuild 4854 BLAKE2B 940352ef80b231890575c29bfdada659b1f46bf360b5ba55558dbee66a12ba6afe9ffff63108fb1fe53c4204621ae3b7165510dd72f7e03b96866395e7d08012 SHA512 8b91d5180b6ea0a100f58274fa7eca2fcc993f1d95d9181030f79eb351db7af6a9abce358815030045354cc59e3a8134cbad3c518ec70b7288271823fdfaa651
-EBUILD opencascade-7.5.2-r1.ebuild 4632 BLAKE2B 486b02a0e64d50749afeef18765b0b66559375f40a38fc6cf93c50beaba5066ed89e7ccfe81e80d06137d248c8d07eb7cb090524b2cb202cb902f2f489ccf0ec SHA512 a551f79d098c305413507c133f7f0009bf9e94c17569341e33f17409456c692eaaecedb34faabcc9c06d0cdb28861514f1f0a2a64b0d835c1ce8fee26115c030
-EBUILD opencascade-7.5.3-r2.ebuild 4632 BLAKE2B 057fe72bfdb34b9fc03965d5ebb9eabd26c7896e3d3133dcb40f4d44a60fb85a2689d20c00bd20a628160fabe9f9a59ba9c819bcd709ba6c1cc0da8c868485a3 SHA512 13ad94752dc5dab5da155efd3ce8495c3154cb5497af5a010b06609740311ce1a6b9257b6eb4adbf14b8188f03b99ac33930310d9717b645a6f2ade2c04fa2f4
+EBUILD opencascade-7.5.2-r2.ebuild 4640 BLAKE2B e6934f327c65b6add9f1c4f04db820543ca5ae02c636828380966eaa97635d7d2d380c4a966181dbaac54e6647361cf6b1369ce48e9cac57230b95eca92f5479 SHA512 7372ef935034a25f13c78fa88d5605e34d3a927241f2248ff360b341816688c8fe03c04afedd778d0c7ef4645b1b7f0de4c6d363977a02d693be707b521e2185
+EBUILD opencascade-7.5.3-r3.ebuild 4640 BLAKE2B f65b18f0554650c7eb60ad8f8f7684b8ce8ffada6c2e054a5bfffb7ebccc9b5d115eceb372c81f20bac021da0f1169735ff27a2fbf2cafe22361db670ce09d25 SHA512 845d39bbb2871b807b943da578d8fd08f77fea06688ed89bb754b7064f5818b0fdb3711a715e59d3c6ef79a67ef714a58c19a031d329327210578c346a3f1671
 MISC metadata.xml 979 BLAKE2B f5a7d51dd3a85f7409d97671fe8b3ca8675d11f78f3de4c8511d3e7be8d95b7f37bf3993dc21a2e33de0ac8412a57cb4385ec9cd7a37d2dbe3772fbbca298b13 SHA512 eb9673f62eee92feaf2da8ff42887c3cfd7d74558b8a35a5d482809a196211c2a6953c6f23558fdd74f10d6db3f493a4c022a5f8d7b1764e39e473394cf671d6
diff --git a/sci-libs/opencascade/opencascade-7.5.1-r2.ebuild b/sci-libs/opencascade/opencascade-7.5.1-r2.ebuild
deleted file mode 100644
index 375cc0a8d77a..000000000000
--- a/sci-libs/opencascade/opencascade-7.5.1-r2.ebuild
+++ /dev/null
@@ -1,175 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# TODO:
-# check the src files referenced in 51opencascade, i.e. resources and the like
-
-EAPI=7
-
-inherit cmake flag-o-matic
-
-MY_PV="$(ver_rs 1- '_')"
-PV_MAJ="$(ver_cut 1-2)"
-
-DESCRIPTION="Development platform for CAD/CAE, 3D surface/solid modeling and data exchange"
-HOMEPAGE="https://www.opencascade.com"
-SRC_URI="https://git.dev.opencascade.org/gitweb/?p=occt.git;a=snapshot;h=refs/tags/V${MY_PV};sf=tgz -> ${P}.tar.gz"
-S="${WORKDIR}/occt-V${MY_PV}"
-
-LICENSE="|| ( Open-CASCADE-LGPL-2.1-Exception-1.0 LGPL-2.1 )"
-SLOT="${PV_MAJ}"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="debug doc examples ffmpeg freeimage gles2 json optimize tbb vtk"
-
-REQUIRED_USE="?? ( optimize tbb )"
-
-# There's no easy way to test. Testing needs a rather big environment
-# properly set up.
-RESTRICT="test"
-
-RDEPEND="
-	app-eselect/eselect-opencascade
-	dev-cpp/eigen
-	dev-lang/tcl:0=
-	dev-lang/tk:0=
-	dev-libs/rapidjson
-	dev-tcltk/itcl
-	dev-tcltk/itk
-	dev-tcltk/tix
-	media-libs/fontconfig
-	media-libs/freetype:2
-	media-libs/ftgl
-	virtual/glu
-	virtual/opengl
-	x11-libs/libXmu
-	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 )
-	freeimage? ( media-libs/freeimage )
-	json? ( dev-libs/rapidjson )
-	tbb? ( dev-cpp/tbb:= )
-	vtk? ( >=sci-libs/vtk-8.1.0[rendering] )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	doc? ( app-doc/doxygen )
-	examples? ( dev-qt/linguist-tools:5 )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-0001-allow-default-search-path-for-Qt5.patch
-	"${FILESDIR}"/${P}-0002-remove-unnecessary-Qt5-check.patch
-	"${FILESDIR}"/${P}-0003-add-Gentoo-configuration-type.patch
-	"${FILESDIR}"/${P}-0004-fix-installation-of-cmake-config-files.patch
-	"${FILESDIR}"/${P}-0005-fix-write-permissions-on-scripts.patch
-	"${FILESDIR}"/${P}-0006-fix-creation-of-custom.sh-script.patch
-	"${FILESDIR}"/${P}-fix-AllValues-name-collision-with-vtk-9.0.patch
-)
-
-src_prepare() {
-	cmake_src_prepare
-
-	if use debug; then
-		append-cppflags -DDEBUG
-		append-flags -g
-	fi
-
-	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() {
-	local mycmakeargs=(
-		-DBUILD_DOC_Overview=$(usex doc)
-		-DBUILD_Inspector=$(usex examples)
-		-DBUILD_WITH_DEBUG=$(usex debug)
-		-DCMAKE_INSTALL_PREFIX="/usr"
-		-DINSTALL_DIR_BIN="$(get_libdir)/${P}/bin"
-		-DINSTALL_DIR_CMAKE="$(get_libdir)/cmake/${P}"
-		-DINSTALL_DIR_DOC="share/doc/${PF}"
-		-DINSTALL_DIR_LIB="$(get_libdir)/${P}"
-		-DINSTALL_DIR_SCRIPT="$(get_libdir)/${P}/bin"
-		-DINSTALL_DIR_WITH_VERSION=ON
-		-DINSTALL_SAMPLES=$(usex examples)
-		-DINSTALL_TEST_CASES=NO
-		-DUSE_D3D=NO
-		-DUSE_FFMPEG=$(usex ffmpeg)
-		-DUSE_FREEIMAGE=$(usex freeimage)
-		-DUSE_FREETYPE=ON
-		-DUSE_GLES2=$(usex gles2)
-		-DUSE_RAPIDJSON=$(usex json)
-		-DUSE_TBB=$(usex tbb)
-		-DUSE_VTK=$(usex vtk)
-	)
-
-	use doc && mycmakeargs+=( -DINSTALL_DOC_Overview=ON )
-
-	if use examples; then
-		mycmakeargs+=(
-			-D3RDPARTY_QT_DIR="${ESYSROOT}"/usr
-			-DBUILD_SAMPLES_QT=ON
-		)
-	fi
-
-	if use vtk; then
-		if has_version ">=sci-libs/vtk-9.0.0"; then
-			mycmakeargs+=(
-				-D3RDPARTY_VTK_DIR="${ESYSROOT}"/usr
-				-D3RDPARTY_VTK_INCLUDE_DIR="${ESYSROOT}"/usr/include/vtk-9.0
-				-D3RDPARTY_VTK_LIBRARY_DIR="${ESYSROOT}"/usr/$(get_libdir)
-			)
-		fi
-	fi
-
-	cmake_src_configure
-
-	prepare_env_file() {
-		# prepare /etc/env.d file
-		sed -e 's|VAR_CASROOT|'${ESYSROOT}'/usr|g' < "${FILESDIR}/${PN}-${PV_MAJ}.env.in" >> "${T}/${PV_MAJ}" || die
-		sed -e 's|lib/|'$(get_libdir)'/|g' -i "${T}/${PV_MAJ}" || die
-		sed -e 's|VAR_PV|'${PV}'|g' -i "${T}/${PV_MAJ}" || die
-
-		# use TBB for memory allocation optimizations?
-		use tbb && (sed -e 's|^#MMGT_OPT=0$|MMGT_OPT=2|' -i "${T}/${PV_MAJ}" || die)
-
-		if use optimize ; then
-			# use internal optimized memory manager?
-			sed -e 's|^#MMGT_OPT=0$|MMGT_OPT=1|' -i "${T}/${PV_MAJ}" || die
-			# don't clear memory ?
-			sed -e 's|^#MMGT_CLEAR=1$|MMGT_CLEAR=0|' -i "${T}/${PV_MAJ}" || die
-		fi
-	}
-
-	prepare_env_file
-}
-
-src_install() {
-	use doc && docompress -x /usr/share/doc/${PF}/overview/html
-	cmake_src_install
-
-	# respect slotting
-	insinto "/etc/env.d/${PN}"
-	doins "${T}/${PV_MAJ}"
-
-	# remove examples
-	if use !examples; then
-		rm -r "${ED}/usr/share/${P}/samples" || die
-	fi
-}
-
-pkg_postinst() {
-	eselect ${PN} set ${PV_MAJ} || die "failed to switch to updated implementation"
-	einfo "You can switch between available ${PN} implementations using eselect ${PN}"
-}
diff --git a/sci-libs/opencascade/opencascade-7.5.2-r1.ebuild b/sci-libs/opencascade/opencascade-7.5.2-r2.ebuild
index b05376833bca..cf90cc0c8aa1 100644
--- a/sci-libs/opencascade/opencascade-7.5.2-r1.ebuild
+++ b/sci-libs/opencascade/opencascade-7.5.2-r2.ebuild
@@ -46,7 +46,7 @@ RDEPEND="
 	)
 	ffmpeg? ( media-video/ffmpeg:= )
 	freeimage? ( media-libs/freeimage )
-	tbb? ( dev-cpp/tbb:= )
+	tbb? ( <dev-cpp/tbb-2021.4.0 )
 	vtk? ( sci-libs/vtk:=[rendering] )
 "
 DEPEND="
diff --git a/sci-libs/opencascade/opencascade-7.5.3-r2.ebuild b/sci-libs/opencascade/opencascade-7.5.3-r3.ebuild
index 14258f13db45..0296150b6b01 100644
--- a/sci-libs/opencascade/opencascade-7.5.3-r2.ebuild
+++ b/sci-libs/opencascade/opencascade-7.5.3-r3.ebuild
@@ -46,7 +46,7 @@ RDEPEND="
 	)
 	ffmpeg? ( media-video/ffmpeg:= )
 	freeimage? ( media-libs/freeimage )
-	tbb? ( dev-cpp/tbb:= )
+	tbb? ( <dev-cpp/tbb-2021.4.0 )
 	vtk? ( sci-libs/vtk:=[rendering] )
 "
 DEPEND="