gentoo resync : 12.07.2021

6 files changed, 5 insertions, 336 deletions

diff --git a/media-gfx/freecad/Manifest b/media-gfx/freecad/Manifest
index 99a7f866022f..ab54a3f1693a 100644
--- a/media-gfx/freecad/Manifest
+++ b/media-gfx/freecad/Manifest
@@ -5,12 +5,9 @@ AUX freecad-0.19.2-0002-fix-femtest-failure-with-yaml-load.patch 907 BLAKE2B 154
 AUX freecad-0.19.2-0003-fix-test-when-built-without-GUI.patch 842 BLAKE2B d1eef077e3290bb469786a62c36d66f46f5016b2ed34065c0c3aa20a82cb451bb8a7242c3504113d924de2564b03fb1c581684d4b9da1325228ad2d82704a116 SHA512 2df1ad94c735c5f38eec0bcc24bf11a1d1814e991539082259983601352603273ae502856e41c0c737d65f9a488a676894d2f4d4d93cf8e2cbb1c3752f99aa7b
 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-0001-FindCoin3DDoc.cmake-fix-patch-for-coin-docs.patch 861 BLAKE2B 305d1e7110e72c0b7e1f4398283816ca8ca01e1fe8460fee9fc002401c5937414d11ee46f0875d0859e57c94b03a67ccb7b4bed1b4935b1032e6db41b9e64a85 SHA512 0eaa8b23a92237648e128304bcb84a227cfb081826266efad9b3afd8a63444a61930dfba465b2d1e205cb43fc616e0a63c1f8bbb1618a462d8a0cff04e764ea0
 AUX freecad-0.19_pre20201231-0003-Gentoo-specific-don-t-check-vcs.patch 881 BLAKE2B 8d8327a283fc46b9f195b4dfe68ac6594ed020154f5f65eab5fe86bde2d32bb3d1081fdf9c5d50e30c24ffdc0504a61c047088e24ab4c377aca6e8f5a14e9760 SHA512 17bdf85c6c25d38a46d643666cbf594f5d16952504344af34b1f4960b53a2a534ccac1594d6ae9b5f827fe3403e08a26edb0c40346a9837316307bd484f35088
-DIST freecad-0.19.1.tar.gz 296983463 BLAKE2B de6592474c34c5643ba7f63d6223bf7b2fcee87ebf226727e242ff3f56f363562dd0bae8cb6b3203d978d998b70985777ca93b938c0fc01822e8927cd79f6118 SHA512 5134fba99448c509f0761d62b07f1bbd3183108761f41178b38f24d5ba26558608d7d7b00009d03ba097a50cc6fe047bbd57872b32a1d55b3526d18c19ae6393
 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.1-r1.ebuild 9245 BLAKE2B 882d13a380200fa0e366203f6c3278e2117044461bd4023f1c7effba670476b50507bd153f108e9d0e586960a4a4324bac580674e7fbf001d565dc0013224b62 SHA512 e034af0baf4885d3e9ddc013851f7d2f0debd93b74fca3ec04482364317e24034e853cc727eb0d47b4e83ebcd804ccf468413399c61b2c444719de22330676a1
-EBUILD freecad-0.19.2-r2.ebuild 12372 BLAKE2B 5211016e7d0db01e6bf3e8946697e525dc7d9e4c5ef07ba47d1879a27a4d4ffae1e4bc31edb5d8c95c037206cc8fd00ad8364c752f471056cdf182f21c808f8e SHA512 b2cb906c8554c7c72fda09091767dfe8d09c4643d1c80e115d2f59ccfaac460b1b2e641801086e548366256b3918fc1562cb628abebcdbea8c6cb9d534270b5e
-EBUILD freecad-9999.ebuild 12126 BLAKE2B 3a8a24f55304f1351e4edd3bfa169918d598a18b02bdba9aa2fafcf407504fd946f3e46bc7f9f11238696fe12dba8542226fb8071780da51c7b0cd41b6825bcd SHA512 e419c9b902ce9964a6c72d7241a354f35de29df95634c1950e5a24d61ea9aa36d0e450d17b3c61edf86de7e8c510af1917dbebf3acb0a1cf52ec41a1c08d0d15
-MISC metadata.xml 3728 BLAKE2B dfe01a38234955bbea4ebc4d561fa15d06548f80338ace10091b8c8e5ab485532e462ad8ea35d52552fb87d18be05bc10953d100389cd4302e07adbb2cbc8a9a SHA512 c1c6693f824aaf9ace443bd5001a581187a4dbbb134a18454ef96d5dbd674b98284136d021f04316de0e0d8400bdb3e7f0dab5722e1ed0d45b33f0263c8ae6d3
+EBUILD freecad-0.19.2-r3.ebuild 12374 BLAKE2B 927540e365fb77eb8a547adaef29f2b3cf804cf5c2187e8cd1f5f2c214e30e175f8bd4c45c9235e897888b29113074003eb0e49a7ca660bc00f711c25dd43293 SHA512 8dd47065bba4f10c8b3185c3d26c1064aab30c8c7433d7fa4a7d2347b11ecab1f317360e75a5a6c8604a579cbd3ff5e1ad531a15011ca4f2a6b177c3319f383b
+EBUILD freecad-9999.ebuild 12128 BLAKE2B 6a6e494ee9ea040a606976c3c60795d22a4462eb38de8c264c2f704815e6ee4873962fac94d8f662936e7cc31b107df90386f9676c90646c2869ea9d1804d287 SHA512 2383306704b548cb855c7de1bee5a99e216bab2f1fdf6141356fb2ade5ae7a246c5cf80f9b1d1e8fc04d9901f7a1fa930c4f82a9942dc603c66975bf42b11096
+MISC metadata.xml 3267 BLAKE2B a9ac18b801fbe7f379298f8e0f820e83441536bfc28a09963990006d2251deb88211d80e086d13646a8ff18380e8aa4c0ac399765c557194c8311475f34744f7 SHA512 1b8674896d56605d8018fd0cc1a56ca6e121171c9630d76c5b1933a78dd31b619f27e986163b01051f0ff8e32b390498a8f0b534103d67a6fd32a91cea97a300
diff --git a/media-gfx/freecad/files/freecad-0.19_pre20201231-0001-FindCoin3DDoc.cmake-fix-patch-for-coin-docs.patch b/media-gfx/freecad/files/freecad-0.19_pre20201231-0001-FindCoin3DDoc.cmake-fix-patch-for-coin-docs.patch
deleted file mode 100644
index 9f4131f15a3d..000000000000
--- a/media-gfx/freecad/files/freecad-0.19_pre20201231-0001-FindCoin3DDoc.cmake-fix-patch-for-coin-docs.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From e08aec1344e753cd338a61c3584230741e00b23f Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl@gmail.com>
-Date: Thu, 31 Dec 2020 13:26:44 +0100
-Subject: [PATCH 1/2] FindCoin3DDoc.cmake: fix patch for coin docs
-
-Signed-off-by: Bernd Waibel <waebbl@gmail.com>
----
- cMake/FindCoin3DDoc.cmake | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/cMake/FindCoin3DDoc.cmake b/cMake/FindCoin3DDoc.cmake
-index c6c92f2..1af53c2 100644
---- a/cMake/FindCoin3DDoc.cmake
-+++ b/cMake/FindCoin3DDoc.cmake
-@@ -22,7 +22,7 @@ IF (COIN3D_FOUND)
-       # Unix systems

-       find_path(COIN3D_DOC_PATH index.html 

-                 /usr/share/doc/libcoin80-doc/html

--                /usr/share/doc/coin/html

-+                /usr/share/doc/coin-4.0.0/html

-                 /usr/share/doc/Coin/html

-       )

-       IF( EXISTS ${COIN3D_DOC_PATH})

--- 
-2.30.0
-
diff --git a/media-gfx/freecad/freecad-0.19.1-r1.ebuild b/media-gfx/freecad/freecad-0.19.1-r1.ebuild
deleted file mode 100644
index 95e44586e4c4..000000000000
--- a/media-gfx/freecad/freecad-0.19.1-r1.ebuild
+++ /dev/null
@@ -1,286 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# vtk needs updating to use 3.9
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit check-reqs cmake desktop eapi8-dosym optfeature python-single-r1 xdg
-
-DESCRIPTION="QT based Computer Aided Design application"
-HOMEPAGE="https://www.freecadweb.org/ https://github.com/FreeCAD/FreeCAD"
-
-if [[ ${PV} = *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/FreeCAD/FreeCAD.git"
-	S="${WORKDIR}/freecad-${PV}"
-else
-	MY_PV=$(ver_cut 1-2)
-	MY_PV=$(ver_rs 1 '_' ${MY_PV})
-	SRC_URI="https://github.com/FreeCAD/FreeCAD/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-	S="${WORKDIR}/FreeCAD-${PV}"
-fi
-
-# code is licensed LGPL-2
-# examples are licensed CC-BY-SA (without note of specific version)
-LICENSE="LGPL-2 CC-BY-SA-4.0"
-SLOT="0"
-IUSE="debug headless pcl test"
-RESTRICT="!test? ( test )"
-
-FREECAD_EXPERIMENTAL_MODULES="cloud plot ship"
-FREECAD_STABLE_MODULES="addonmgr arch drawing fem idf image
-	inspection material mesh openscad part-design path points
-	raytracing robot show spreadsheet surface techdraw tux"
-
-for module in ${FREECAD_STABLE_MODULES}; do
-	IUSE="${IUSE} +${module}"
-done
-for module in ${FREECAD_EXPERIMENTAL_MODULES}; do
-	IUSE="${IUSE} ${module}"
-done
-unset module
-
-RDEPEND="
-	${PYTHON_DEPS}
-	>=dev-cpp/eigen-3.3.1:3
-	dev-libs/OpenNI2[opengl(+)]
-	dev-libs/libspnav[X]
-	dev-libs/xerces-c
-	dev-qt/designer:5
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtopengl:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwebengine:5[widgets]
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	dev-qt/qtxml:5
-	>=media-libs/coin-4.0.0
-	media-libs/freetype
-	media-libs/qhull:=
-	sci-libs/flann[openmp]
-	>=sci-libs/med-4.0.0-r1[python,${PYTHON_SINGLE_USEDEP}]
-	sci-libs/opencascade:=[vtk(+)]
-	sci-libs/orocos_kdl:=
-	sys-libs/zlib
-	virtual/glu
-	virtual/libusb:1
-	virtual/opengl
-	cloud? (
-		dev-libs/openssl:=
-		net-misc/curl
-	)
-	fem? ( <sci-libs/vtk-9[boost,python,qt5,rendering,${PYTHON_SINGLE_USEDEP}] )
-	mesh? ( sci-libs/hdf5:=[fortran,zlib] )
-	openscad? ( media-gfx/openscad )
-	pcl? ( >=sci-libs/pcl-1.8.1:=[opengl,openni2(+),qt5(+),vtk(+)] )
-	$(python_gen_cond_dep '
-		dev-libs/boost:=[python,threads(+),${PYTHON_MULTI_USEDEP}]
-		dev-python/matplotlib[${PYTHON_MULTI_USEDEP}]
-		dev-python/numpy[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pivy-0.6.5[${PYTHON_MULTI_USEDEP}]
-		dev-python/pyside2[gui,svg,${PYTHON_MULTI_USEDEP}]
-		dev-python/shiboken2[${PYTHON_MULTI_USEDEP}]
-		addonmgr? ( dev-python/GitPython[${PYTHON_MULTI_USEDEP}] )
-		mesh? ( dev-python/pybind11[${PYTHON_MULTI_USEDEP}] )
-	')
-"
-DEPEND="${RDEPEND}"
-BDEPEND="dev-lang/swig"
-
-# To get required dependencies:
-# 'grep REQUIRES_MODS cMake/FreeCAD_Helpers/CheckInterModuleDependencies.cmake'
-# We set the following requirements by default:
-# draft, import, part, qt5, sketcher, start, web.
-#
-# Additionally if mesh is set, we auto-enable mesh_part, flat_mesh and smesh
-# Fem actually needs smesh, but as long as we don't have a smesh package, we enable
-# smesh through the mesh USE flag. Note however, the fem<-smesh dependency isn't
-# reflected by the REQUIRES_MODS macro, but at
-# cMake/FreeCAD_Helpers/InitializeFreeCADBuildOptions.cmake:187.
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	arch? ( mesh )
-	debug? ( mesh )
-	drawing? ( spreadsheet )
-	fem? ( mesh )
-	inspection? ( mesh points )
-	openscad? ( mesh )
-	path? ( mesh robot )
-	ship? ( image plot )
-	techdraw? ( spreadsheet drawing )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.19_pre20201231-0001-FindCoin3DDoc.cmake-fix-patch-for-coin-docs.patch
-	"${FILESDIR}"/${PN}-0.19_pre20201231-0003-Gentoo-specific-don-t-check-vcs.patch
-	"${FILESDIR}"/${P}-0001-Gentoo-specific-Remove-ccache-usage.patch
-)
-
-DOCS=( CODE_OF_CONDUCT.md ChangeLog.txt README.md )
-
-CHECKREQS_DISK_BUILD="3G"
-
-pkg_setup() {
-	check-reqs_pkg_setup
-	python-single-r1_pkg_setup
-	[[ -z ${CASROOT} ]] && die "\${CASROOT} not set, plesae run eselect opencascade"
-}
-
-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
-	sed -e 's|/usr/include/opencascade|${CASROOT}/include/opencascade|' \
-		-e 's|/usr/lib|${CASROOT}/'$(get_libdir)' NO_DEFAULT_PATH|' \
-		-i cMake/FindOpenCasCade.cmake || die
-
-	# Fix desktop file
-	sed -e 's/Exec=FreeCAD/Exec=freecad/' -i src/XDGData/org.freecadweb.FreeCAD.desktop || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_ADDONMGR=$(usex addonmgr)
-		-DBUILD_ARCH=$(usex arch)
-		-DBUILD_ASSEMBLY=OFF
-		-DBUILD_CLOUD=$(usex cloud)
-		-DBUILD_COMPLETE=OFF					# deprecated
-		-DBUILD_DRAFT=ON						# basic workspace, enable it by default
-		-DBUILD_DRAWING=$(usex drawing)
-		-DBUILD_ENABLE_CXX_STD:STRING="C++14"	# needed for >=boost-1.75.0
-		-DBUILD_FEM=$(usex fem)
-		-DBUILD_FEM_NETGEN=OFF
-		-DBUILD_FLAT_MESH=$(usex mesh)
-		-DBUILD_FORCE_DIRECTORY=ON				# force building in a dedicated directory
-		-DBUILD_FREETYPE=ON						# automagic dep
-		-DBUILD_GUI=$(usex !headless)
-		-DBUILD_IDF=$(usex idf)
-		-DBUILD_IMAGE=$(usex image)
-		-DBUILD_IMPORT=ON						# import module for various file formats
-		-DBUILD_INSPECTION=$(usex inspection)
-		-DBUILD_JTREADER=OFF					# code has been removed upstream, but option is still there
-		-DBUILD_MATERIAL=$(usex material)
-		-DBUILD_MESH=$(usex mesh)
-		-DBUILD_MESH_PART=$(usex mesh)
-		-DBUILD_OPENSCAD=$(usex openscad)
-		-DBUILD_PART=ON							# basic workspace, enable it by default
-		-DBUILD_PART_DESIGN=$(usex part-design)
-		-DBUILD_PATH=$(usex path)
-		-DBUILD_PLOT=$(usex plot)				# conflicts with possible external workbench
-		-DBUILD_POINTS=$(usex points)
-		-DBUILD_QT5=ON							# OFF means to use Qt4
-		-DBUILD_RAYTRACING=$(usex raytracing)
-		-DBUILD_REVERSEENGINEERING=OFF			# currently only an empty sandbox
-		-DBUILD_ROBOT=$(usex robot)
-		-DBUILD_SHIP=$(usex ship)				# conflicts with possible external workbench
-		-DBUILD_SHOW=$(usex show)
-		-DBUILD_SKETCHER=ON						# needed by draft workspace
-		-DBUILD_SMESH=$(usex mesh)
-		-DBUILD_SPREADSHEET=$(usex spreadsheet)
-		-DBUILD_START=ON						# basic workspace, enable it by default
-		-DBUILD_SURFACE=$(usex surface)
-		-DBUILD_TECHDRAW=$(usex techdraw)
-		-DBUILD_TUX=$(usex tux)
-		-DBUILD_VR=OFF
-		-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}
-
-		-DFREECAD_BUILD_DEBIAN=OFF
-
-		-DFREECAD_USE_CCACHE=OFF
-		-DFREECAD_USE_EXTERNAL_KDL=ON
-		-DFREECAD_USE_EXTERNAL_SMESH=OFF		# no package in Gentoo
-		-DFREECAD_USE_EXTERNAL_ZIPIOS=OFF		# doesn't work yet, also no package in Gentoo tree
-		-DFREECAD_USE_FREETYPE=ON
-		-DFREECAD_USE_OCC_VARIANT:STRING="Official Version"
-		-DFREECAD_USE_PCL=$(usex pcl)
-		-DFREECAD_USE_PYBIND11=$(usex mesh)
-		-DFREECAD_USE_QT_FILEDIALOG=ON
-		-DFREECAD_USE_QTWEBMODULE:STRING="Qt WebEngine"
-
-		# Use the version of shiboken2 that matches the selected python version
-		-DPYTHON_CONFIG_SUFFIX="-${EPYTHON}"
-
-		-DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade
-		-DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)
-		-DOCCT_CMAKE_FALLBACK=ON				# don't use occt-config which isn't included in opencascade for Gentoo
-	)
-
-	if use debug; then
-		mycmakeargs+=(
-			# sandbox needs mesh support
-			-DBUILD_SANDBOX=$(usex mesh)
-			-DBUILD_TEMPLATE=ON
-			-DBUILD_TEST=ON
-		)
-	else
-		mycmakeargs+=(
-			-DBUILD_SANDBOX=OFF
-			-DBUILD_TEMPLATE=OFF
-			-DBUILD_TEST=OFF
-		)
-	fi
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	if ! use headless; then
-		dosym8 -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
-	dosym8 -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}/
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	if use plot; then
-		einfo "Note: You are enabling the 'plot' USE flag."
-		einfo "This conflicts with the plot workbench that can be loaded"
-		einfo "via the addon manager! You can only install one of those."
-	fi
-
-	if use ship; then
-		einfo "Note: You are enabling the 'ship' USE flag."
-		einfo "This conflicts with the ship workbench that can be loaded"
-		einfo "via the addon manager! You can only install one of those."
-	fi
-
-	einfo "You can load a lot of additional workbenches using the integrated"
-	einfo "AddonManager."
-
-	einfo "There are a lot of additional tools, for which FreeCAD has builtin"
-	einfo "support. Some of them are available in Gentoo. Take a look at"
-	einfo "https://wiki.freecadweb.org/Installing#External_software_supported_by_FreeCAD"
-	optfeature "interact with git repositories" dev-python/GitPython
-	optfeature "work with COLLADA documents" dev-python/pycollada
-	optfeature "dependency graphs" media-gfx/graphviz
-	optfeature "PBR Rendering" media-gfx/povray
-	optfeature "FEM mesh generator" sci-libs/gmsh
-	optfeature "importing and exporting 2D AutoCAD DWG files" media-gfx/libredwg
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-}
diff --git a/media-gfx/freecad/freecad-0.19.2-r2.ebuild b/media-gfx/freecad/freecad-0.19.2-r3.ebuild
index fc330f2ea53d..954e1f8b1fed 100644
--- a/media-gfx/freecad/freecad-0.19.2-r2.ebuild
+++ b/media-gfx/freecad/freecad-0.19.2-r3.ebuild
@@ -79,7 +79,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 '
diff --git a/media-gfx/freecad/freecad-9999.ebuild b/media-gfx/freecad/freecad-9999.ebuild
index 3d41d5d0ca12..cb6c6efe011b 100644
--- a/media-gfx/freecad/freecad-9999.ebuild
+++ b/media-gfx/freecad/freecad-9999.ebuild
@@ -79,7 +79,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-${PV}:=[opengl,openni2(+),qt5(+),vtk(+)] )
 	$(python_gen_cond_dep '
diff --git a/media-gfx/freecad/metadata.xml b/media-gfx/freecad/metadata.xml
index 57211691f591..3c4e9f49f5de 100644
--- a/media-gfx/freecad/metadata.xml
+++ b/media-gfx/freecad/metadata.xml
@@ -14,18 +14,10 @@
 			Build the addon manager module for automatic handling of 3rd 
 			party addons
 		</flag>
-		<flag name="arch">
-			Build the architecture workbench for working with architectural 
-			elements
-		</flag>
 		<flag name="cloud">
 			Build the Cloud workbench, to access cloud providers (mostly
 			Amazon S3).
 		</flag>
-		<flag name="drawing">
-			Build the drawing module and workbench to display 3D work on a 
-			2D sheet
-		</flag>
 		<flag name="fem">
 			Build the FEM module and workbench which provides Finite Element 
 			Analysis (FEA) workflows
@@ -49,10 +41,6 @@
 		<flag name="material">
 			Build the material module and workbench to work with materials
 		</flag>
-		<flag name="mesh">
-			Build the mesh module and workbench to work with triangulated 
-			meshes
-		</flag>
 		<flag name="openscad">
 			Build the OpenSCAD module for interoperability with OpenSCAD 
 			and repairing Constructive Solid Geometry (CSG) history
@@ -89,10 +77,6 @@
 		<flag name="show">
 			Build the show module, a helper module for visibility automation
 		</flag>
-		<flag name="spreadsheet">
-			Build the spreadsheet module and workbench to create and manipulate 
-			spreadsheet data
-		</flag>
 		<flag name="surface">
 			Build the surface module and workbench
 		</flag>