gentoo resync : 05.12.2021

4 files changed, 35 insertions, 122 deletions

diff --git a/media-gfx/freecad/Manifest b/media-gfx/freecad/Manifest
index 7fd77f42c8b1..42954a75d0e4 100644
--- a/media-gfx/freecad/Manifest
+++ b/media-gfx/freecad/Manifest
@@ -6,9 +6,9 @@ AUX freecad-0.19.2-0003-fix-test-when-built-without-GUI.patch 842 BLAKE2B d1eef0
 AUX freecad-0.19.2-0006-add-boost-serialization-to-find_package.patch 1959 BLAKE2B 3863f4f311a4fba648d4503c6b3daecb87d233caea4ce7f22dff47f69435995ff422cd2ee97e8a491ddf85527b325d63543e041ccc91e5c844fede750c6764ef SHA512 b9af575349498393ee78e1c75247e736412d331fb872475c180c4828a6007f9a34ccd379eed8fe2551e53b88eee0b400202c63a1365df8b6069ce3b0727b2056
 AUX freecad-0.19.2-0007-fix-build-failure-with-opencascade-7.5.2.patch 1054 BLAKE2B d6a67b22390b64ed566c49af6117de2f34e0f57094a069ccae6cd15da5fa3a53a4cd71d94bd65a201c60042893da713a2d397890c7b072b197e101697cd388fd SHA512 beecd51a4b59890cd162eb76b726bd1e82a32da387ed67d886293930175deaf014445afd4db93e262daa06ced5b6c267218e4d777bd32c940fbc8b057b077fa1
 AUX freecad-0.19_pre20201231-0003-Gentoo-specific-don-t-check-vcs.patch 881 BLAKE2B 8d8327a283fc46b9f195b4dfe68ac6594ed020154f5f65eab5fe86bde2d32bb3d1081fdf9c5d50e30c24ffdc0504a61c047088e24ab4c377aca6e8f5a14e9760 SHA512 17bdf85c6c25d38a46d643666cbf594f5d16952504344af34b1f4960b53a2a534ccac1594d6ae9b5f827fe3403e08a26edb0c40346a9837316307bd484f35088
-AUX freecad-9999-Add-memory-header-for-std-shared_ptr.patch 687 BLAKE2B e1b1273b5c98f52539d2788469f49e1b5c57ea06ef1b136e82ddd4655f0a585dd5eee0104dfa1539aeaf1c82b673d681337482b4c9b7ae4d4d9a951637f1f16e SHA512 a15b0b2c49057de39a8efe45ee3460681611b6acf0b53e77ed278af58a0c97f296ca6e5ac1e2efdab39d77d06461c71bde9cf146784b094f2941caf1b0a76914
 DIST freecad-0.19.2-0005-Make-smesh-compile-with-vtk9.patch.xz 5368 BLAKE2B 69bafefd049effe3c31719bb2c23d32e8ba7ad58235c58ac8279ba6c036feaf1b97d5751cf2d68896e7489803103b2d0f92f76e61b3ccc97ef05a95b337ca5c2 SHA512 66585cc13fb3b0b026cf9dbd761c8ba1c1fe4d4f7db2e144ddd97706e02ccd78f4a43ac7cd93ddcae6e73933bf41d4cbd4d94bcdff8804b81378a6d946c7b070
 DIST freecad-0.19.2.tar.gz 296987961 BLAKE2B 3c21359c71f7ac5a49cc4b4be437dfce02f2af73dfc526a3955547718ee41c461fc787d029a9a77374d58516d7c56fec6982fe6d38ab17fbc30c0a94929136bf SHA512 420f00e696725cbd31c936c47b6ac226d866a17c7b7683ad381b8dd5edaffc7dfb1a3c4238c08e8b4fd34ef0c08d7c244cb7797012e596df1ce0a4f6e3be6b72
-EBUILD freecad-0.19.2-r4.ebuild 12191 BLAKE2B 5b38525d8621a2b95b7f1ab150d2cc21eb26e30aa3c467a869a8cf027ac47c96008e94b3287786c8e3a529d78fad627700135ee82aff948e8dcc68b038e0c66a SHA512 8afe20234ccc6f6b7dc55aa7f0044fbd6ccda1fee6d031c9ff8ca750d87ad93ec038953265775bd305a1cf5c36af4dc3043c66ba3f6765e588d113091322b9d1
-EBUILD freecad-9999.ebuild 11967 BLAKE2B 43ca123f606f45df6026725b4a220aab723631feb95e485902963b4044704d76589f11e4e374a9bd9d8e31fdff58f3f70cb6ecaeb0329940bb2ee200e19af6c9 SHA512 24bde5e135ff1966171964f5ffc9ea8a31a978ad79dece2a33f3099a2899fb52fc741fc9938471f4f155532eb08a29681f4d842ec1b75b14d69ff487b796d91b
+DIST freecad-9999-Gentoo-specific-fix-install-locations-of-Ext-and-Mod.patch.xz 4136 BLAKE2B 207003dacd7f02bd4782ebb0d5f9a7093d8fd3ef8011301454dab03d7a79bab7b2fd623c7d8e11d1f6557803b40f1d206dc75c41b1520e1dd2467dda72d91868 SHA512 d7d6096c1cfb06e6218673a927c5791ec820dc13a23c89df6233109e288d98f86920141e01a8cb680e7cbb8c83c4c655a7a66d5578d284a144dc3f44c028ceb5
+EBUILD freecad-0.19.2-r5.ebuild 10910 BLAKE2B 837cee24737a432cbe6a1d0415025680e73c09898e859edfe1f8a0a8d36fc7fb454e40c9998f589500a9a5ad366215558a494b4869e18c47de2c3c6d69229c07 SHA512 40686ce7313bd28c0fe5f381e392db650a2adbe1737b63eb1ccbd44cfc90ea6c92ad07a52bb566cb5401e87f8499fb12909db02fd779335ef955b2b338f33845
+EBUILD freecad-9999.ebuild 10822 BLAKE2B 89e8e85ab4e3d80ee7d3d346de53fda3adb07a5ea057324409ca52f91f5542569b7476b602999aca056088b66f6c51f75822ff4668aeff89ba53965ec280d716 SHA512 a92798699ab2349b3b1bd694a787935a4a01df88ca0ba669a45d96b5b9bb395db412ded3ed399607a7479886b9389ce42b27550e186fe2e40ff166d2c4e1383a
 MISC metadata.xml 3268 BLAKE2B 4e99f8237c96f96500ec15a0e175684f445c9a68e1080f6f61538ae4e99cb2afccc14d50c626c44764ea4362ed82cc2ccf74f8ae53d713d70b21860eeb39650d SHA512 fbc87f4a401c33de8033b54213026631a9f956918cc256eb9a10cec88b316f71fd98959c79f58acc3d4a75d28117097ea0cc4ee33f333923d4387e9d3af43bb5
diff --git a/media-gfx/freecad/files/freecad-9999-Add-memory-header-for-std-shared_ptr.patch b/media-gfx/freecad/files/freecad-9999-Add-memory-header-for-std-shared_ptr.patch
deleted file mode 100644
index 81a8f22d8937..000000000000
--- a/media-gfx/freecad/files/freecad-9999-Add-memory-header-for-std-shared_ptr.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From: Bernd Waibel <waebbl-gentoo@posteo.net>
-Date: Sat, 16 Oct 2021 17:02:19 +0200
-Subject: [PATCH] Add memory header for std::shared_ptr
-
-Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
----
- src/App/Metadata.h | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/App/Metadata.h b/src/App/Metadata.h
-index de8be3ea8e..2c5fd8f417 100644
---- a/src/App/Metadata.h
-+++ b/src/App/Metadata.h
-@@ -30,6 +30,7 @@
- #include <string>
- #include <vector>
- #include <map>
-+#include <memory>
- 
- #include <xercesc/dom/DOM.hpp>
- #include <xercesc/parsers/XercesDOMParser.hpp>
-@@ -296,4 +297,4 @@ namespace App {
- 
- }
- 
--#endif
-\ No newline at end of file
-+#endif
--- 
-2.33.1
-
diff --git a/media-gfx/freecad/freecad-0.19.2-r4.ebuild b/media-gfx/freecad/freecad-0.19.2-r5.ebuild
index 24dc6a703399..c9287ed91fa5 100644
--- a/media-gfx/freecad/freecad-0.19.2-r4.ebuild
+++ b/media-gfx/freecad/freecad-0.19.2-r5.ebuild
@@ -47,7 +47,6 @@ unset module
 
 RDEPEND="
 	${PYTHON_DEPS}
-	>=dev-cpp/eigen-3.3.1:3
 	dev-libs/OpenNI2[opengl(+)]
 	dev-libs/libspnav[X]
 	dev-libs/xerces-c[icu]
@@ -79,7 +78,7 @@ RDEPEND="
 		dev-libs/openssl:=
 		net-misc/curl
 	)
-	fem? ( sci-libs/vtk:=[boost,python,qt5,rendering,${PYTHON_SINGLE_USEDEP}] )
+	fem? ( sci-libs/vtk:=[boost(+),python,qt5,rendering,${PYTHON_SINGLE_USEDEP}] )
 	openscad? ( media-gfx/openscad )
 	pcl? ( >=sci-libs/pcl-1.8.1:=[opengl,openni2(+),qt5(+),vtk(+)] )
 	$(python_gen_cond_dep '
@@ -94,7 +93,10 @@ RDEPEND="
 		fem? ( dev-python/ply[${PYTHON_USEDEP}] )
 	')
 "
-DEPEND="${RDEPEND}"
+DEPEND="
+	${RDEPEND}
+	>=dev-cpp/eigen-3.3.1:3
+"
 BDEPEND="dev-lang/swig"
 
 # To get required dependencies:
@@ -143,22 +145,6 @@ src_prepare() {
 	# but cmake ships a working one, so we use this.
 	rm "${S}/cMake/FindCoin3D.cmake" || die
 
-	# Fix OpenCASCADE lookup
-	local OCC_P=$(best_version sci-libs/opencascade[vtk])
-	OCC_P=${OCC_P#sci-libs/}
-	local OCC_PV=${OCC_P#opencascade-}
-	OCC_PV=$(ver_cut 1-2 ${OCC_PV})
-	# check for CASROOT needed to ensure occ-7.5 is eselected and profile resourced
-	if [[ ${OCC_PV} = 7.5 && ${CASROOT} = "/usr" ]]; then
-		sed -e 's|/usr/include/opencascade|'${CASROOT}'/include/'${OCC_P}'|' \
-			-e 's|/usr/lib|'${CASROOT}'/'$(get_libdir)'/'${OCC_P}' NO_DEFAULT_PATH|' \
-			-i cMake/FindOpenCasCade.cmake || die
-	else
-		sed -e 's|/usr/include/opencascade|${CASROOT}/include/opencascade|' \
-			-e 's|/usr/lib|${CASROOT}/'$(get_libdir)' NO_DEFAULT_PATH|' \
-			-i cMake/FindOpenCasCade.cmake || die
-	fi
-
 	# Fix desktop file
 	sed -e 's/Exec=FreeCAD/Exec=freecad/' -i src/XDGData/org.freecadweb.FreeCAD.desktop || die
 
@@ -237,27 +223,8 @@ src_configure() {
 		# Use the version of shiboken2 that matches the selected python version
 		-DPYTHON_CONFIG_SUFFIX="-${EPYTHON}"
 		-DPython3_EXECUTABLE=${PYTHON}
-
-		-DOCCT_CMAKE_FALLBACK=ON				# don't use occt-config which isn't included in opencascade for Gentoo
 	)
 
-	if has_version ">=sci-libs/opencascade-7.5"; then
-		# bug https://bugs.gentoo.org/788274
-		local OCC_P=$(best_version sci-libs/opencascade[vtk])
-		OCC_P=${OCC_P#sci-libs/}
-		OCC_P=${OCC_P%-r*}
-		mycmakeargs+=(
-			-DOCC_INCLUDE_DIR="${CASROOT}"/include/${OCC_P}
-			-DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)/${OCC_P}
-		)
-	else
-		# <occ-7.5 uses different layout
-		mycmakeargs+=(
-			-DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade
-			-DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)
-		)
-	fi
-
 	if use debug; then
 		mycmakeargs+=(
 			-DBUILD_SANDBOX=ON
diff --git a/media-gfx/freecad/freecad-9999.ebuild b/media-gfx/freecad/freecad-9999.ebuild
index cef63f28477e..2852f295c8e1 100644
--- a/media-gfx/freecad/freecad-9999.ebuild
+++ b/media-gfx/freecad/freecad-9999.ebuild
@@ -11,10 +11,12 @@ DESCRIPTION="QT based Computer Aided Design application"
 HOMEPAGE="https://www.freecadweb.org/ https://github.com/FreeCAD/FreeCAD"
 
 MY_PN=FreeCAD
+MY_PATCH="${P}-Gentoo-specific-fix-install-locations-of-Ext-and-Mod"
 
 if [[ ${PV} = *9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/${MY_PN}/${MY_PN}.git"
+	SRC_URI="https://raw.githubusercontent.com/waebbl/waebbl-gentoo/master/patches/${MY_PATCH}.patch.xz"
 	S="${WORKDIR}/freecad-${PV}"
 else
 	MY_PV=$(ver_cut 1-2)
@@ -47,7 +49,6 @@ unset module
 
 RDEPEND="
 	${PYTHON_DEPS}
-	>=dev-cpp/eigen-3.3.1:3
 	dev-libs/OpenNI2[opengl(+)]
 	dev-libs/libspnav[X]
 	dev-libs/xerces-c[icu]
@@ -79,7 +80,7 @@ RDEPEND="
 		dev-libs/openssl:=
 		net-misc/curl
 	)
-	fem? ( sci-libs/vtk:=[boost,python,qt5,rendering,${PYTHON_SINGLE_USEDEP}] )
+	fem? ( sci-libs/vtk:=[boost(+),python,qt5,rendering,${PYTHON_SINGLE_USEDEP}] )
 	openscad? ( media-gfx/openscad )
 	pcl? ( sci-libs/pcl:=[opengl,openni2(+),qt5(+),vtk(+)] )
 	$(python_gen_cond_dep '
@@ -94,8 +95,14 @@ RDEPEND="
 		fem? ( dev-python/ply[${PYTHON_USEDEP}] )
 	')
 "
-DEPEND="${RDEPEND}"
-BDEPEND="dev-lang/swig"
+DEPEND="
+	${RDEPEND}
+	>=dev-cpp/eigen-3.3.1:3
+"
+BDEPEND="
+	app-text/dos2unix
+	dev-lang/swig
+"
 
 # To get required dependencies:
 # 'grep REQUIRES_MODS cMake/FreeCAD_Helpers/CheckInterModuleDependencies.cmake'
@@ -120,7 +127,6 @@ REQUIRED_USE="
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.19_pre20201231-0003-Gentoo-specific-don-t-check-vcs.patch
 	"${FILESDIR}"/${PN}-0.19.1-0001-Gentoo-specific-Remove-ccache-usage.patch
-	"${FILESDIR}"/${P}-Add-memory-header-for-std-shared_ptr.patch
 )
 
 DOCS=( CODE_OF_CONDUCT.md ChangeLog.txt README.md )
@@ -133,31 +139,27 @@ pkg_setup() {
 	[[ -z ${CASROOT} ]] && die "\${CASROOT} not set, plesae run eselect opencascade"
 }
 
+src_unpack() {
+	git-r3_src_unpack
+	unpack ${MY_PATCH}.patch.xz
+}
+
 src_prepare() {
 	# the upstream provided file doesn't find the coin doc tag file,
 	# but cmake ships a working one, so we use this.
 	rm "${S}/cMake/FindCoin3D.cmake" || die
 
-	# Fix OpenCASCADE lookup
-	local OCC_P=$(best_version sci-libs/opencascade[vtk])
-	OCC_P=${OCC_P#sci-libs/}
-	local OCC_PV=${OCC_P#opencascade-}
-	OCC_PV=$(ver_cut 1-2 ${OCC_PV})
-	# check for CASROOT needed to ensure occ-7.5 is eselected and profile resourced
-	if [[ ${OCC_PV} = 7.5 && ${CASROOT} = "/usr" ]]; then
-		sed -e 's|/usr/include/opencascade|'${CASROOT}'/include/'${OCC_P}'|' \
-			-e 's|/usr/lib|'${CASROOT}'/'$(get_libdir)'/'${OCC_P}' NO_DEFAULT_PATH|' \
-			-i cMake/FindOpenCasCade.cmake || die
-	else
-		sed -e 's|/usr/include/opencascade|${CASROOT}/include/opencascade|' \
-			-e 's|/usr/lib|${CASROOT}/'$(get_libdir)' NO_DEFAULT_PATH|' \
-			-i cMake/FindOpenCasCade.cmake || die
-	fi
-
 	# Fix desktop file
 	sed -e 's/Exec=FreeCAD/Exec=freecad/' -i src/XDGData/org.freecadweb.FreeCAD.desktop || die
 
 	cmake_src_prepare
+
+	# Fix line endings on a few files for patching
+	for f in src/Mod/{Cloud,Inspection,Start/StartPage}/CMakeLists.txt; do
+		dos2unix -q ${f}
+	done
+
+	eapply "${WORKDIR}"/${P}-Gentoo-specific-fix-install-locations-of-Ext-and-Mod.patch
 }
 
 src_configure() {
@@ -208,10 +210,10 @@ src_configure() {
 		-DBUILD_WEB=ON							# needed by start workspace
 		-DBUILD_WITH_CONDA=OFF
 
-		-DCMAKE_INSTALL_DATADIR=/usr/share/${PN}/data
-		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
-		-DCMAKE_INSTALL_INCLUDEDIR=/usr/include/${PN}
-		-DCMAKE_INSTALL_PREFIX=/usr/$(get_libdir)/${PN}
+		-DCMAKE_INSTALL_DATADIR=share/${PN}/data
+		-DCMAKE_INSTALL_DOCDIR=share/doc/${PF}
+		-DCMAKE_INSTALL_INCLUDEDIR=include/${PN}
+		-DCMAKE_INSTALL_LIBDIR=$(get_libdir)/${PN}
 
 		-DFREECAD_BUILD_DEBIAN=OFF
 
@@ -232,27 +234,8 @@ src_configure() {
 		# Use the version of shiboken2 that matches the selected python version
 		-DPYTHON_CONFIG_SUFFIX="-${EPYTHON}"
 		-DPython3_EXECUTABLE=${PYTHON}
-
-		-DOCCT_CMAKE_FALLBACK=ON				# don't use occt-config which isn't included in opencascade for Gentoo
 	)
 
-	if has_version ">=sci-libs/opencascade-7.5"; then
-		# bug https://bugs.gentoo.org/788274
-		local OCC_P=$(best_version sci-libs/opencascade[vtk])
-		OCC_P=${OCC_P#sci-libs/}
-		OCC_P=${OCC_P%-r*}
-		mycmakeargs+=(
-			-DOCC_INCLUDE_DIR="${CASROOT}"/include/${OCC_P}
-			-DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)/${OCC_P}
-		)
-	else
-		# <occ-7.5 uses different layout
-		mycmakeargs+=(
-			-DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade
-			-DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)
-		)
-	fi
-
 	if use debug; then
 		# BUILD_SANDBOX currently broken, see
 		# https://forum.freecadweb.org/viewtopic.php?f=4&t=36071&start=30#p504595
@@ -292,12 +275,6 @@ src_install() {
 
 	dobin src/Tools/freecad-thumbnailer
 
-	if ! use headless; then
-		dosym -r /usr/$(get_libdir)/${PN}/bin/FreeCAD /usr/bin/freecad
-		mv "${ED}"/usr/$(get_libdir)/freecad/share/* "${ED}"/usr/share || die "failed to move shared ressources"
-	fi
-	dosym -r /usr/$(get_libdir)/${PN}/bin/FreeCADCmd /usr/bin/freecadcmd
-
 	python_optimize "${ED}"/usr/share/${PN}/data/Mod/Start/StartPage "${ED}"/usr/$(get_libdir)/${PN}{/Ext,/Mod}/
 	# compile main package in python site-packages as well
 	python_optimize