gentoo resync : 08.07.2021

3 files changed, 194 insertions, 21 deletions

diff --git a/sci-libs/opencascade/Manifest b/sci-libs/opencascade/Manifest
index 80186a92bc6f..719319730f76 100644
--- a/sci-libs/opencascade/Manifest
+++ b/sci-libs/opencascade/Manifest
@@ -11,9 +11,11 @@ AUX opencascade-7.5.1-0004-fix-installation-of-cmake-config-files.patch 2207 BLA
 AUX opencascade-7.5.1-0005-fix-write-permissions-on-scripts.patch 2453 BLAKE2B 01b0ec99fb9ad032d6a90cceabb50900528abd0528b53e976484bf02f04eac9bc02b063bce5c221ae88782a126103e8077db9e90aa7f64f4f187dad00354d4d2 SHA512 fb3c374fe8aff8d2bac039a0eef754f2e823a97bfd7860bdd7e047c1b357202abfca0e37b46afc32220c7e354b5edb54805fbbbffde015bb4be2d7f4ded4a8da
 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 4643 BLAKE2B f3492a12e0e0fd31bed8c65e8aa7af68f84a9e752922c62ca2307c96f2d1070fdbc10e09c266114060b0f81951109bc9827853e3eba486d4f9c0eba6984c69e4 SHA512 c10151744b5656e7bafbc291729a5c0e4022e44aa5015e4fff616cb2a34409a67c4ae7433eede2563ab265fa4eb6a455d36ed99469a2579979ff374fc6588adf
+AUX opencascade-7.5.env.in 4683 BLAKE2B 4c7c3764e56110c34c9acb9ecb860936049cf03f4ed99d708a8f631b5d3dc7cfa95ca7f8fe8b259986fa637243fe80a6888a2db6a2ad6f80b3b2175a9bb8680f SHA512 773b213e8d7752fc028d951d2a5d5aa610c96ee916499c3655e60f0ec485d393c3bf13a85cae104653242829d8abb9fea451f17bf1b902e1c1fa0bf5b329f08b
 DIST opencascade-7.4.0.tar.gz 49210449 BLAKE2B c92afe7551e9a066ad0940dcf49278b556a726f0534131706b3a11cb0986ba32818e162df3982283f6815eb9d67d7e91f909485d78f2b8d638da1934ffbc2f7f SHA512 eb0d47848d48f42a159ae5d7a4144483ba1f59f634844bd2053e48e04af30a30ba7056112cd38a1730d193a8d736b898f9608dd574cbe6829dbe7257a002772a
 DIST opencascade-7.5.1.tar.gz 47807222 BLAKE2B b5ef30ea7c373250db3e0863f3c7fde84256b37957a482f10a462a4c4ed1a21cffbbeb10e9fc140325022d7582efbd292ed6d1016d14cb67ccf5c84d14060d5a SHA512 ebb937254ac165041ef7e1a80df8f9d2ac1d518f01b3d4b0fd6d203fe0d80bd474b85a462cccc1c74a513bd257c0b0ab7002632573f38bf72170363c7e42ed2f
+DIST opencascade-7.5.2.tar.gz 47812603 BLAKE2B 86995ea60e24329f91a2cbede26112a70794fb091b34d33614bef412b05b8cc9f1e770aecf78272b54a241c2524422c86f8ff722b3f27b54bf10fa5eda626288 SHA512 f951a941043a56f381cfd25e4d78bb9ae08e5cc29a894e6c0c35daf30aeabf1e44ee09af65bb6b7d62d9325be67741ddcf52266b7186b4c336c70ed8bcfa1676
 EBUILD opencascade-7.4.0-r4.ebuild 3957 BLAKE2B 4118554fff8ff80f64ce581dd5f233211d4a77d4366ada96ae646e819ad03adebfa8561ff9c4b9f9fcfed6cc2bad65fe6db0373d434768fcf5cc8a1808fe34e6 SHA512 a7783c641793480726433be75fd5c7260d9f62e32347aa1ee4e68b97adc5e18d829984f05e84e42c120a1c027c0ad15ee73e646c708466e0eeb2a9440b9726ac
 EBUILD opencascade-7.5.1-r1.ebuild 4852 BLAKE2B b5738e865f13b49d8a1916c9cb04bd6a6208956f53134ad9513c7a2bfa8428738bf6645a4b6d0fc0c9a9928735ce51feb740bc3138090acc08fa24bcde283403 SHA512 94b96dbc86489e1647d0e1dad5398eb81151039ea2b0124a5b2947397a3a21dde936d1a8fedb798800f54b38fc47b272922ffc5089c3983939e57db3bff36684
+EBUILD opencascade-7.5.2.ebuild 4630 BLAKE2B 81587b947cf6bbeb94b1dd0f76dfea82c1df8b385d5b04787c4868b202a6727e53ce3a473d78c71fc623f92d3a61d1f3709f42cd9ba614e16810e3db08600eb8 SHA512 4c1d11556bf65df8e2e2b1dada54547ff60a010e82268c05c31c58388ddd7b1a861b310029f49537a906ecbdebe70e674d4bc127699573a1bb2f63d9bebe24b1
 MISC metadata.xml 1074 BLAKE2B 88bba4427a254f02a0ca70936c0931ceb72a5d752c6664502cd20dbd6cc294080222d9ef143334c147b77667a342f7912384b8af92a1b90868d243294f72215f SHA512 b42f338af31848be031702bbee6cfe105db4c6ffa5970e7229b5a63841097af1b60eb886f4513ec86f0b27fd0c7ad090b635061c737714ae43b7b45db02172f9
diff --git a/sci-libs/opencascade/files/opencascade-7.5.env.in b/sci-libs/opencascade/files/opencascade-7.5.env.in
index 50766cbb6bb1..d7148c241f11 100644
--- a/sci-libs/opencascade/files/opencascade-7.5.env.in
+++ b/sci-libs/opencascade/files/opencascade-7.5.env.in
@@ -9,9 +9,9 @@
 # were enabled. Those values are marked as such.
 
 # define the root directory of Open CASCADE Technology (needed)
-CASROOT=VAR_CASROOT
-PATH=VAR_CASROOT/lib/opencascade-VAR_PV/bin
-LDPATH=VAR_CASROOT/lib/opencascade-VAR_PV
+CASROOT="VAR_CASROOT"
+PATH="VAR_CASROOT/lib/opencascade-VAR_PV/bin"
+LDPATH="VAR_CASROOT/lib/opencascade-VAR_PV"
 
 #############################################################################
 # The MMGT_* variables are used to determine how memory management will work
@@ -70,7 +70,7 @@ LDPATH=VAR_CASROOT/lib/opencascade-VAR_PV
 #
 # NOTE: Only enable for debugging purposes. If set, this variable has a
 # large impact on the performance of boolean operations.
-#CSF_DEBUG_BOP=/var/tmp
+#CSF_DEBUG_BOP="/var/tmp"
 
 # CSF_EXCEPTION_PROMPT (default: 1) optional
 #   not documented upstream (maybe a flag indicating whether the user shall
@@ -79,24 +79,24 @@ LDPATH=VAR_CASROOT/lib/opencascade-VAR_PV
 
 # The following CSF_* variables define various directories and files where
 # OCCT is looking for resources.
-CSF_GraphicShr=VAR_CASROOT/lib/opencascade-VAR_PV/libTKOpenGl.so
-CSF_MIGRATION_TYPES=VAR_CASROOT/share/opencascade-VAR_PV/resources/StdResource/MigrationSheet.txt
-CSF_MDTVTexturesDirectory=VAR_CASROOT/share/opencascade-VAR_PV/resources/Textures
-CSF_PluginDefaults=VAR_CASROOT/share/opencascade-VAR_PV/resources/StdResource
-CSF_StandardDefaults=VAR_CASROOT/share/opencascade-VAR_PV/resources/StdResource
-CSF_StandardLiteDefaults=VAR_CASROOT/share/opencascade-VAR_PV/resources/StdResource
-CSF_XCAFDefaults=VAR_CASROOT/share/opencascade-VAR_PV/resources/StdResource
-CSF_XmlOcafResource=VAR_CASROOT/share/opencascade-VAR_PV/resources/XmlOcafResource
+CSF_GraphicShr="VAR_CASROOT/lib/opencascade-VAR_PV/libTKOpenGl.so"
+CSF_MIGRATION_TYPES="VAR_CASROOT/share/opencascade-VAR_PV/resources/StdResource/MigrationSheet.txt"
+CSF_MDTVTexturesDirectory="VAR_CASROOT/share/opencascade-VAR_PV/resources/Textures"
+CSF_PluginDefaults="VAR_CASROOT/share/opencascade-VAR_PV/resources/StdResource"
+CSF_StandardDefaults="VAR_CASROOT/share/opencascade-VAR_PV/resources/StdResource"
+CSF_StandardLiteDefaults="VAR_CASROOT/share/opencascade-VAR_PV/resources/StdResource"
+CSF_XCAFDefaults="VAR_CASROOT/share/opencascade-VAR_PV/resources/StdResource"
+CSF_XmlOcafResource="VAR_CASROOT/share/opencascade-VAR_PV/resources/XmlOcafResource"
 # The below values might be optional.
-CSF_IGESDefaults=VAR_CASROOT/share/opencascade-VAR_PV/resources/XSTEPResource
-CSF_ShadersDirectory=VAR_CASROOT/share/opencascade-VAR_PV/resources/Shaders
-CSF_SHMessage=VAR_CASROOT/share/opencascade-VAR_PV/resources/SHMessage
-CSF_STEPDefaults=VAR_CASROOT/share/opencascade-VAR_PV/resources/XSTEPResource
-CSF_UnitsDefinition=VAR_CASROOT/share/opencascade-VAR_PV/resources/UnitsAPI/Units.dat
-CSF_XSMessage=VAR_CASROOT/share/opencascade-VAR_PV/resources/XSMessage
+CSF_IGESDefaults="VAR_CASROOT/share/opencascade-VAR_PV/resources/XSTEPResource"
+CSF_ShadersDirectory="VAR_CASROOT/share/opencascade-VAR_PV/resources/Shaders"
+CSF_SHMessage="VAR_CASROOT/share/opencascade-VAR_PV/resources/SHMessage"
+CSF_STEPDefaults="VAR_CASROOT/share/opencascade-VAR_PV/resources/XSTEPResource"
+CSF_UnitsDefinition="VAR_CASROOT/share/opencascade-VAR_PV/resources/UnitsAPI/Units.dat"
+CSF_XSMessage="VAR_CASROOT/share/opencascade-VAR_PV/resources/XSMessage"
 
 # TODO: check those
 # they were defined in the original ebuild but the directories and files
 # are not present in the current installation.
-#CSF_MDTVFontDirectory=VAR_CASROOT/src/FontMFT
-#CSF_UnitsLexicon=VAR_CASROOT/src/UnitsAPI/Lexi_Expr.dat
+#CSF_MDTVFontDirectory="VAR_CASROOT/src/FontMFT"
+#CSF_UnitsLexicon="VAR_CASROOT/src/UnitsAPI/Lexi_Expr.dat"
diff --git a/sci-libs/opencascade/opencascade-7.5.2.ebuild b/sci-libs/opencascade/opencascade-7.5.2.ebuild
new file mode 100644
index 000000000000..59a4a6c42c77
--- /dev/null
+++ b/sci-libs/opencascade/opencascade-7.5.2.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+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-lang/tcl:=
+	dev-lang/tk:=
+	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 )
+	tbb? ( dev-cpp/tbb )
+	vtk? ( sci-libs/vtk:=[rendering] )
+"
+DEPEND="
+	${RDEPEND}
+	dev-cpp/eigen
+	dev-libs/rapidjson
+"
+BDEPEND="
+	app-eselect/eselect-opencascade
+	doc? ( app-doc/doxygen )
+	examples? ( dev-qt/linguist-tools:5 )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-7.5.1-0001-allow-default-search-path-for-Qt5.patch
+	"${FILESDIR}"/${PN}-7.5.1-0002-remove-unnecessary-Qt5-check.patch
+	"${FILESDIR}"/${PN}-7.5.1-0003-add-Gentoo-configuration-type.patch
+	"${FILESDIR}"/${PN}-7.5.1-0004-fix-installation-of-cmake-config-files.patch
+	"${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.5.1-fix-AllValues-name-collision-with-vtk-9.0.patch
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	use debug && append-cppflags -DDEBUG
+
+	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)
+		-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 /etc/env.d file
+	sed -e "s|lib/|$(get_libdir)/|" \
+		-e "s|VAR_PV|${PV}|" \
+		-e "s|VAR_CASROOT|${ESYSROOT}/usr|" \
+		< "${FILESDIR}"/${PN}-${PV_MAJ}.env.in > "${T}"/${PV_MAJ} || die
+
+	# use TBB for memory allocation optimizations
+	if use tbb; then
+		sed -e 's|^#MMGT_OPT=0$|MMGT_OPT=2|' -i "${T}"/${PV_MAJ} || 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}"/${PV_MAJ} || die
+	fi
+}
+
+src_install() {
+	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
+
+	docompress -x /usr/share/doc/${PF}/overview/html
+}
+
+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}"
+}