gentoo resync : 20.03.2022

5 files changed, 178 insertions, 5 deletions

diff --git a/sci-libs/opencascade/Manifest b/sci-libs/opencascade/Manifest
index 6154aae3a8ed..5b8d613f848b 100644
--- a/sci-libs/opencascade/Manifest
+++ b/sci-libs/opencascade/Manifest
@@ -9,7 +9,9 @@ AUX opencascade.env.in 4571 BLAKE2B 81780f83a476ba5a2691c003c7fde48fec14be4e3554
 DIST opencascade-7.5.2.tar.gz 47812603 BLAKE2B 86995ea60e24329f91a2cbede26112a70794fb091b34d33614bef412b05b8cc9f1e770aecf78272b54a241c2524422c86f8ff722b3f27b54bf10fa5eda626288 SHA512 f951a941043a56f381cfd25e4d78bb9ae08e5cc29a894e6c0c35daf30aeabf1e44ee09af65bb6b7d62d9325be67741ddcf52266b7186b4c336c70ed8bcfa1676
 DIST opencascade-7.5.3.tar.gz 47817862 BLAKE2B be438a08997c18c3cb2c08c520fff2f439cc8a406cc3f471be3b24f874ac3bd892c4afe6fa37f742ffb5da21b5a29f9c8f737e3160dcbda35a217286218eb5e1 SHA512 2d7cf284a1b3ce8d05151085b41579cc2f4e29489b7920769cd04f86a6d76e49f533b570226d3cf041c75582894ed8a6aff889312c7c507fffae47d3e57c5c47
 DIST opencascade-7.6.0.tar.gz 48193117 BLAKE2B c16cd096f20e90267a00b6be21b17b22b491cf5d9aa1a311d64d7707042dc88380c60ececceb6728dbcdd4ff56a67558144292950e11518b21cbc49ace4e88cd SHA512 6839eb6641b9e0752474fce11cf1756223067febe0f5bcd5db249e3eccef29517a6952c124aae818220b6360070a792dacd1b0b4ce970b8351ce38598f31b4be
-EBUILD opencascade-7.5.2-r5.ebuild 4730 BLAKE2B d0fa916eed671b5f1069eb52e474a8dd1d81bf56ede75ac60c3a8cab74a173530bca9b568b3ef9c665323ecd32c4f01508dcb5bf544c910fe057a1b1572d8c23 SHA512 489eacdda65c0eaabb18448200578c10dd7aa3876001efa2df81c1a2924de036127f6c6281c8259412e793cff6677b1d2f63d4369b3b027621885c3c5cf7052e
-EBUILD opencascade-7.5.3-r6.ebuild 4730 BLAKE2B f56506fc176a6a2ff8aa238e321bc59ee92367aa40c1138931fee15ab2954290a96bf438338a213cb192a8dec326fca035b350ea7cc280e134a47929932e2b8f SHA512 b09a996e7c4e27f457b0c6a4c1c2bf93d93bef87b20eaa603bc018286e3aab0116e25b94e6c1a4bfd530c8075b67ccd332f574b2ada29d5af6c1b20bbb1f4731
-EBUILD opencascade-7.6.0-r2.ebuild 4423 BLAKE2B 4034cbc3b50261524a61f92fd7d92ad0e380bd58d0ce95c82425b9d634c368530ec4c46d891f979050885b3b11ac95f5d2d51ab2e4b48c41fab6493459011423 SHA512 ea1d6c2233a40dfebad4b610ba9a29719b84ee52479db0a449532d69f07663959bc8c868a15d4f49b610bd071f46d9fdb026f0e73739b59ca628094079c7c396
+DIST opencascade-7.6.1.tar.gz 48201174 BLAKE2B 7d13f0e17dfb9261ae77de9e66cf93053803313ac6848b3412a147f311e935c4ea9c930c7c9948bbce1f0172365ea9d326047f42b967ecdee435d68325093c61 SHA512 1466d95eea7539f5cf52a40ada712b2b0cfb9c1970271f5ea60d0408a1c3f1ae16b885dd36c3c0fcef3cedb05c420a7c637ee5168b5b081b0f55068cda412bb0
+EBUILD opencascade-7.5.2-r5.ebuild 4820 BLAKE2B 15a42ac3171ce97fa5c0d657d154ad64c07aab00056f40cc09ae449b5e5bc63583c524e5adecd74e31ae80256f83b6345f473b1bfecb52c37450b0f26d0221b2 SHA512 6233a105921396b139df7ca05de9aa18d1165306bc4cc68059ae1f0bec902dd14c72b12144f6a9f9a00ad68aa016f2a9081f818efa881666c7edd1329d3534f9
+EBUILD opencascade-7.5.3-r6.ebuild 4820 BLAKE2B c5b1c77e7ef2e36c371bcf4b4e5998618edb3e3f7100df4cd8c91789c0ddc9312fa1edcde5f85881ace777e2340c89ce6aae54baaaf4e56304255db684548103 SHA512 6c4a3f77ed0bc4152bafc269903fe0448f58c1e9094a700518665b9729f1d50da8fa5a710ff49aaa9eb58844385bffe1c20bd5f4b04c106422eea9fd767868a0
+EBUILD opencascade-7.6.0-r3.ebuild 4523 BLAKE2B 2a3c1bb8033c90263e49661cd2888d19a340fe542fcb94f126a8ec6d4d82f304bf65258a3cf1e043b1625dc4103a15e814861ca6c6d478b1d053610bb494b762 SHA512 987649f02e80e4798a10bc5e73a5b25d1a433e45cf000656ac6e9958110567be555d03f628622d07a0ee8d249ddb9b73364e1e9304c0e1798849465643b17261
+EBUILD opencascade-7.6.1.ebuild 4523 BLAKE2B 2a3c1bb8033c90263e49661cd2888d19a340fe542fcb94f126a8ec6d4d82f304bf65258a3cf1e043b1625dc4103a15e814861ca6c6d478b1d053610bb494b762 SHA512 987649f02e80e4798a10bc5e73a5b25d1a433e45cf000656ac6e9958110567be555d03f628622d07a0ee8d249ddb9b73364e1e9304c0e1798849465643b17261
 MISC metadata.xml 1102 BLAKE2B 8569899b7ab437a4115ced11d3421f063d99233ed81bb5360228e580b20af2ee9753b41a8b3cb1291550160fa627058d915fde0e23514dcbed0f9cddc961ae11 SHA512 e9a38c41beec8eb54d6b9232447df3bc05635318f8dc727ddebc5f13be4d58b8d10576ddbb07a9fef41ba2adeb7ba1abcb4e10087b4711c4ff348d873c4916a8
diff --git a/sci-libs/opencascade/opencascade-7.5.2-r5.ebuild b/sci-libs/opencascade/opencascade-7.5.2-r5.ebuild
index 8bf1c6acd11e..5b0cab240b53 100644
--- a/sci-libs/opencascade/opencascade-7.5.2-r5.ebuild
+++ b/sci-libs/opencascade/opencascade-7.5.2-r5.ebuild
@@ -24,6 +24,7 @@ REQUIRED_USE="?? ( optimize tbb )"
 # properly set up.
 RESTRICT="test"
 
+# ffmpeg: https://dev.opencascade.org/content/build-error-when-compiling-against-ffmpeg-5
 RDEPEND="
 	!app-eselect/eselect-opencascade
 	dev-lang/tcl:=
diff --git a/sci-libs/opencascade/opencascade-7.5.3-r6.ebuild b/sci-libs/opencascade/opencascade-7.5.3-r6.ebuild
index 1bec9312ad8d..19b5d7637932 100644
--- a/sci-libs/opencascade/opencascade-7.5.3-r6.ebuild
+++ b/sci-libs/opencascade/opencascade-7.5.3-r6.ebuild
@@ -24,6 +24,7 @@ REQUIRED_USE="?? ( optimize tbb )"
 # properly set up.
 RESTRICT="test"
 
+# ffmpeg: https://dev.opencascade.org/content/build-error-when-compiling-against-ffmpeg-5
 RDEPEND="
 	!app-eselect/eselect-opencascade
 	dev-lang/tcl:=
diff --git a/sci-libs/opencascade/opencascade-7.6.0-r2.ebuild b/sci-libs/opencascade/opencascade-7.6.0-r3.ebuild
index 595c605bc985..ab4bbc4c974b 100644
--- a/sci-libs/opencascade/opencascade-7.6.0-r2.ebuild
+++ b/sci-libs/opencascade/opencascade-7.6.0-r3.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/occt-V${MY_PV}"
 
 LICENSE="|| ( Open-CASCADE-LGPL-2.1-Exception-1.0 LGPL-2.1 )"
 SLOT="0/${MY_SLOT}"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE="doc eigen examples ffmpeg freeimage gles2 json optimize tbb vtk"
 
 REQUIRED_USE="?? ( optimize tbb )"
@@ -24,6 +24,7 @@ REQUIRED_USE="?? ( optimize tbb )"
 # properly set up.
 RESTRICT="test"
 
+# ffmpeg: https://dev.opencascade.org/content/build-error-when-compiling-against-ffmpeg-5
 RDEPEND="
 	!app-eselect/eselect-opencascade
 	dev-lang/tcl:=
@@ -44,7 +45,7 @@ RDEPEND="
 		dev-qt/qtwidgets:5
 		dev-qt/qtxml:5
 	)
-	ffmpeg? ( media-video/ffmpeg:= )
+	ffmpeg? ( <media-video/ffmpeg-5:= )
 	freeimage? ( media-libs/freeimage )
 	tbb? ( <dev-cpp/tbb-2021.4 )
 	vtk? ( sci-libs/vtk:=[rendering] )
diff --git a/sci-libs/opencascade/opencascade-7.6.1.ebuild b/sci-libs/opencascade/opencascade-7.6.1.ebuild
new file mode 100644
index 000000000000..ab4bbc4c974b
--- /dev/null
+++ b/sci-libs/opencascade/opencascade-7.6.1.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+MY_PV="$(ver_rs 1- '_')"
+MY_SLOT="$(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="0/${MY_SLOT}"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+IUSE="doc eigen 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"
+
+# ffmpeg: https://dev.opencascade.org/content/build-error-when-compiling-against-ffmpeg-5
+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-5:= )
+	freeimage? ( media-libs/freeimage )
+	tbb? ( <dev-cpp/tbb-2021.4 )
+	vtk? ( sci-libs/vtk:=[rendering] )
+"
+DEPEND="
+	${RDEPEND}
+	eigen? ( dev-cpp/eigen )
+	json? ( dev-libs/rapidjson )
+"
+BDEPEND="
+	doc? ( app-doc/doxygen[dot] )
+	examples? ( dev-qt/linguist-tools:5 )
+"
+
+PATCHES=(
+	"${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
+)
+
+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() {
+	local mycmakeargs=(
+		-DBUILD_DOC_Overview=$(usex doc)
+		-DBUILD_Inspector=$(usex examples)
+
+		-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_WITH_VERSION=OFF
+		-DINSTALL_SAMPLES=$(usex examples)
+		-DINSTALL_TEST_CASES=NO
+
+		-DUSE_D3D=NO
+		# no package yet in tree
+		-DUSE_DRACO=OFF
+		-DUSE_EIGEN=$(usex eigen)
+		-DUSE_FFMPEG=$(usex ffmpeg)
+		-DUSE_FREEIMAGE=$(usex freeimage)
+		-DUSE_FREETYPE=ON
+		-DUSE_GLES2=$(usex gles2)
+		# no package in tree
+		-DUSE_OPENVR=OFF
+		-DUSE_RAPIDJSON=$(usex json)
+		-DUSE_TBB=$(usex tbb)
+		-DUSE_VTK=$(usex vtk)
+		-DUSE_XLIB=ON
+	)
+
+	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.1.0"; then
+			mycmakeargs+=(
+				-D3RDPARTY_VTK_DIR="${ESYSROOT}"/usr
+				-D3RDPARTY_VTK_INCLUDE_DIR="${ESYSROOT}"/usr/include/vtk-9.1
+				-D3RDPARTY_VTK_LIBRARY_DIR="${ESYSROOT}"/usr/$(get_libdir)
+			)
+		elif 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
+
+	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_install() {
+	cmake_src_install
+
+	doenvd "${T}/99${PN}"
+
+	docompress -x /usr/share/doc/${PF}/overview/html
+}