gentoo auto-resync : 26:11:2024 - 02:00:48

3 files changed, 111 insertions, 241 deletions

diff --git a/media-gfx/freecad/Manifest b/media-gfx/freecad/Manifest
index 6e332537e505..92cfcec7ee47 100644
--- a/media-gfx/freecad/Manifest
+++ b/media-gfx/freecad/Manifest
@@ -4,7 +4,7 @@ AUX freecad-1.0.0-r1-Gentoo-specific-don-t-check-vcs.patch 347 BLAKE2B 1c8119aec
 AUX freecad-9999-Gentoo-specific-don-t-check-vcs.patch 325 BLAKE2B 589407b26ac670ee9d5ed65d5b46d2c2d24609ac0fab09057194036075671c3b1fa140b6a7441916c1cfa1826fb8c925733a3bc4aef50017b0b01850e3564225 SHA512 7f9017cc5aadf1c35b50038ac76d6031c6482a978817792ac0a25c1c36641ddcfdff9c072119665be13fc0a7c185e19aef2f1200812608a26e7bbea3a5b761b2
 AUX freecad-9999-tests-src-Qt-only-build-test-for-BUILD_GUI-ON.patch 469 BLAKE2B 23e56fbc49b3c3d5ede85e6ec15d26c88c93590fce105e0b75e8b0bd3fee125c500cd59d8db0144c610edb371df318396e056333ec7a411f7647b38d18006efc SHA512 82737af95603ff1f667bf49ee43b85b411eeeb5fd9b577ad7fca6e02bcbfda5c3bbb6c70386e5f69d2181d6226574f82cb68b7e66dfe8f4bb14d946f594582cf
 DIST freecad-1.0.0.tar.gz 91599325 BLAKE2B 65540eb42e7d508456c9edbf2122e0f288708c33e6d00d3c8c45550e7a614f658f91ba25978a66819bc094b7138aab72a89c0172d0841be1ff798ade5a8bdc64 SHA512 afc1079ea04fd5bb8135f8ad1012d9e4e05c8839dd0a4e00253eada58fe018f445c1200d1ca7ac9f268644c946cbf55b7b313dc3d6bd010f9da3a3334103b7db
-EBUILD freecad-1.0.0-r1.ebuild 9817 BLAKE2B 5b4af1a6639f4f4998018b2d4d0cdc3b0875828f069a01aaa7b8bd502a9dfa66b58fc9bd1a2806b44483d5bbff5e746381ce71716afd4152ee169cbf28dc2181 SHA512 2c7664e7f1324be955fd25f920a493f165f27b574c3b66740d85349693b3478c74b16ad3f42436ad193f303559d997a72793acc6650a10285b479b57b8540916
+EBUILD freecad-1.0.0-r1.ebuild 8777 BLAKE2B 8dfb0994510ea0a7ba3ef5b943ce5f61ba659a8776d3da90099dc2b15aa767434b1954872fbe3534570d1860786f2daefefa7ac75d9668f1e7141422b146bcfc SHA512 f467f0d82480f5210d9a25e49160903cafd6b6a68792e6be51abb03e4fbabc9cab35b682209e415458e604bfee673cb4f816ce7d29538eb2335b0707ee32e012
 EBUILD freecad-1.0.0.ebuild 12031 BLAKE2B 7aab12b69ed67210a4d5815860c47ec832f9538d5ff2bedd30e837399cde1608798cf6b87ea7d079bb29d058f3f7d048f698dbb8717c21e3dd2f97f97d8ff0d3 SHA512 cdaa165c05a3cb2b680397f8a5518ff0bf47baf6ce731e56f8579b2494ed5b59d7852d59e2a251c178629e30513d1c39c8472cc3b7a2845ae8b15c3c16e2bc24
-EBUILD freecad-9999.ebuild 12031 BLAKE2B bd2de483e54d9272f1f87b87cd2cebdd5f242fd3ad9ecd25c8866784b790e69837d25d8d48d42d9d4b816756ec732381ab37f3afcfc89598489bbd382bd331da SHA512 b091460d1846451ec9642bda5d63f10f34341d1d89d491949f382db04091dd36c6e41e402c487e7ee5766ba35c2bbedcd43c6bd45035496b314c5ba97bec2501
+EBUILD freecad-9999.ebuild 8773 BLAKE2B 9c047cc1c43d53acfd95ea2cfb8c6de2d0b730ad45559fbbc328dd2a5539f1d8106df910cdd343edb4461b65fe79a720f434a4858aac63cb604d6a33e4268402 SHA512 04c60bfdb083f964b1fa98c90c64cef59bb12cfd0db80958ecba1d022226cd9d9404b696b9bc35bf9905cf04650993561455136189630271a372b4ec2953eec0
 MISC metadata.xml 3656 BLAKE2B 81367f486e966237e6424cca386644bbef79fb7014de4d24234ee090b9d3e4947f95541f823330137aec57916c757f07996e568eded062eadeb44a3c47417761 SHA512 0e162aec1f90c333961670e5090e8bcb8cdbeaddbae49f7d91fb3cd811857939d53035b54b5f9554e80fd29bc653b4fe5df726187204c9f0e0c5c89b671008d8
diff --git a/media-gfx/freecad/freecad-1.0.0-r1.ebuild b/media-gfx/freecad/freecad-1.0.0-r1.ebuild
index f063528215d1..4e4522a105d2 100644
--- a/media-gfx/freecad/freecad-1.0.0-r1.ebuild
+++ b/media-gfx/freecad/freecad-1.0.0-r1.ebuild
@@ -7,12 +7,12 @@ PYTHON_COMPAT=( python3_{10..12} )
 
 inherit check-reqs cmake flag-o-matic optfeature python-single-r1 qmake-utils xdg
 
-DESCRIPTION="QT based Computer Aided Design application"
+DESCRIPTION="Qt based Computer Aided Design application"
 HOMEPAGE="https://www.freecad.org/ https://github.com/FreeCAD/FreeCAD"
 
 MY_PN=FreeCAD
 
-if [[ ${PV} = *9999 ]]; then
+if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/${MY_PN}/${MY_PN}.git"
 	S="${WORKDIR}/freecad-${PV}"
@@ -26,7 +26,7 @@ fi
 # examples are licensed CC-BY-SA (without note of specific version)
 LICENSE="LGPL-2 CC-BY-SA-4.0"
 SLOT="0"
-IUSE="debug designer +gui netgen pcl qt5 +smesh spacenav test X"
+IUSE="debug designer +gui netgen pcl +smesh spacenav test X"
 # Modules are found in src/Mod/ and their options defined in:
 # cMake/FreeCAD_Helpers/InitializeFreeCADBuildOptions.cmake
 # To get their dependencies:
@@ -43,12 +43,10 @@ REQUIRED_USE="
 	inspection? ( points )
 	mesh? ( smesh )
 	openscad? ( mesh )
-	python_single_target_python3_12? ( gui? ( !qt5 ) )
 	reverse? ( mesh points )
 	test? ( techdraw )
 "
 # Draft Workbench needs BIM
-# There is no py3.12 support planned for pyside2
 
 RESTRICT="!test? ( test )"
 
@@ -59,16 +57,7 @@ RDEPEND="
 	dev-libs/boost:=
 	dev-libs/libfmt:=
 	dev-libs/xerces-c[icu]
-	qt5? (
-		dev-qt/qtconcurrent:5
-		dev-qt/qtcore:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtxml:5
-		dev-qt/qtxmlpatterns:5
-	)
-	!qt5? (
-		dev-qt/qtbase:6[concurrent,network,xml]
-	)
+	dev-qt/qtbase:6[concurrent,network,xml]
 	media-libs/freetype
 	sci-libs/opencascade:=[json]
 	sys-libs/zlib
@@ -87,34 +76,17 @@ RDEPEND="
 	)
 	gui? (
 		>=media-libs/coin-4.0.0
+		dev-qt/qtbase:6[gui,opengl,widgets]
+		dev-qt/qtsvg:6
+		dev-qt/qttools:6[designer?,widgets]
+		$(python_gen_cond_dep '
+			dev-python/matplotlib[${PYTHON_USEDEP}]
+			>=dev-python/pivy-0.6.5[${PYTHON_USEDEP}]
+			dev-python/pyside6:=[designer,gui,svg,${PYTHON_USEDEP}]
+			dev-python/shiboken6:=[${PYTHON_USEDEP}]
+		' )
 		virtual/glu
 		virtual/opengl
-		qt5? (
-			dev-qt/designer:5
-			dev-qt/qtgui:5
-			dev-qt/qtopengl:5
-			dev-qt/qtprintsupport:5
-			dev-qt/qtsvg:5
-			dev-qt/qtwidgets:5
-			dev-qt/qtx11extras:5
-			$(python_gen_cond_dep '
-				dev-python/matplotlib[${PYTHON_USEDEP}]
-				>=dev-python/pivy-0.6.5[${PYTHON_USEDEP}]
-				dev-python/pyside2:=[gui,svg,${PYTHON_USEDEP}]
-				dev-python/shiboken2:=[${PYTHON_USEDEP}]
-			' python3_{10..11} )
-		)
-		!qt5? (
-			dev-qt/qtbase:6[gui,opengl,widgets]
-			dev-qt/qtsvg:6
-			dev-qt/qttools:6[designer?,widgets]
-			$(python_gen_cond_dep '
-				dev-python/matplotlib[${PYTHON_USEDEP}]
-				>=dev-python/pivy-0.6.5[${PYTHON_USEDEP}]
-				dev-python/pyside6:=[designer,gui,svg,${PYTHON_USEDEP}]
-				dev-python/shiboken6:=[${PYTHON_USEDEP}]
-			' )
-		)
 		spacenav? ( dev-libs/libspnav[X?] )
 	)
 	netgen? ( media-gfx/netgen[opencascade] )
@@ -129,14 +101,10 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	>=dev-cpp/eigen-3.3.1:3
 	dev-cpp/ms-gsl
-	test? ( qt5? ( dev-qt/qttest:5 ) )
 "
 BDEPEND="
 	dev-lang/swig
-	test? (
-		qt5? ( dev-qt/qttest:5 )
-		dev-cpp/gtest
-	)
+	test? ( dev-cpp/gtest )
 "
 
 PATCHES=(
@@ -254,7 +222,7 @@ src_configure() {
 		)
 	fi
 
-	if ! use qt5; then
+	if use gui; then
 		mycmakeargs+=(
 			-DFREECAD_QT_MAJOR_VERSION=6
 			-DFREECAD_QT_VERSION=6
@@ -265,17 +233,6 @@ src_configure() {
 			# Drawing module unmaintained and not ported to qt6
 			-DBUILD_DRAWING=OFF
 		)
-	else
-		mycmakeargs+=(
-			-DFREECAD_QT_MAJOR_VERSION=5
-			-DFREECAD_QT_VERSION=5
-			-DQT_DEFAULT_MAJOR_VERSION=5
-			-DQt5Core_MOC_EXECUTABLE="$(qt5_get_bindir)/moc"
-			-DQt5Core_RCC_EXECUTABLE="$(qt5_get_bindir)/rcc"
-			-DBUILD_QT5=ON
-			# Drawing module unmaintained and not ported to qt6
-			-DBUILD_DRAWING=ON
-		)
 	fi
 
 	cmake_src_configure
diff --git a/media-gfx/freecad/freecad-9999.ebuild b/media-gfx/freecad/freecad-9999.ebuild
index 037e0bf473f5..247dc135f22e 100644
--- a/media-gfx/freecad/freecad-9999.ebuild
+++ b/media-gfx/freecad/freecad-9999.ebuild
@@ -7,12 +7,12 @@ PYTHON_COMPAT=( python3_{10..12} )
 
 inherit check-reqs cmake flag-o-matic optfeature python-single-r1 qmake-utils xdg
 
-DESCRIPTION="QT based Computer Aided Design application"
+DESCRIPTION="Qt based Computer Aided Design application"
 HOMEPAGE="https://www.freecad.org/ https://github.com/FreeCAD/FreeCAD"
 
 MY_PN=FreeCAD
 
-if [[ ${PV} = *9999 ]]; then
+if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/${MY_PN}/${MY_PN}.git"
 	S="${WORKDIR}/freecad-${PV}"
@@ -26,20 +26,27 @@ fi
 # examples are licensed CC-BY-SA (without note of specific version)
 LICENSE="LGPL-2 CC-BY-SA-4.0"
 SLOT="0"
-IUSE="debug designer +gui +qt6 test"
-
-FREECAD_EXPERIMENTAL_MODULES="cloud netgen pcl"
-FREECAD_STABLE_MODULES="addonmgr fem idf image inspection material
-	openscad part-design path points raytracing robot show smesh
-	surface techdraw tux"
+IUSE="debug designer +gui netgen pcl +smesh spacenav test X"
+# Modules are found in src/Mod/ and their options defined in:
+# cMake/FreeCAD_Helpers/InitializeFreeCADBuildOptions.cmake
+# To get their dependencies:
+# 'grep REQUIRES_MODS cMake/FreeCAD_Helpers/CheckInterModuleDependencies.cmake'
+IUSE+=" addonmgr +bim cam cloud fem idf inspection +mesh openscad points reverse robot surface +techdraw"
 
-for module in ${FREECAD_STABLE_MODULES}; do
-	IUSE="${IUSE} +${module}"
-done
-for module in ${FREECAD_EXPERIMENTAL_MODULES}; do
-	IUSE="${IUSE} ${module}"
-done
-unset module
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	bim? ( mesh )
+	cam? ( mesh )
+	gui? ( bim )
+	designer? ( gui )
+	fem? ( smesh )
+	inspection? ( points )
+	mesh? ( smesh )
+	openscad? ( mesh )
+	reverse? ( mesh points )
+	test? ( techdraw )
+"
+# Draft Workbench needs BIM
 
 RESTRICT="!test? ( test )"
 
@@ -47,127 +54,59 @@ RDEPEND="
 	${PYTHON_DEPS}
 	dev-cpp/gtest
 	dev-cpp/yaml-cpp
-	dev-libs/OpenNI2[opengl(+)]
 	dev-libs/boost:=
 	dev-libs/libfmt:=
-	dev-libs/libspnav[X]
 	dev-libs/xerces-c[icu]
-	dev-ruby/asciidoctor
-	!qt6? (
-		dev-qt/qtconcurrent:5
-		dev-qt/qtcore:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtxml:5
-		dev-qt/qtxmlpatterns:5
-	)
-	qt6? (
-		dev-qt/qtbase:6[concurrent,network,xml]
-	)
+	dev-qt/qtbase:6[concurrent,network,xml]
 	media-libs/freetype
-	media-libs/qhull:=
-	sci-libs/hdf5:=[fortran,zlib]
-	>=sci-libs/med-4.0.0-r1
-	sci-libs/opencascade:=[json,vtk]
-	sci-libs/orocos_kdl:=
+	sci-libs/opencascade:=[json]
 	sys-libs/zlib
-	virtual/libusb:1
+	$(python_gen_cond_dep '
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pybind11[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+	')
 	cloud? (
 		dev-libs/openssl:=
 		net-misc/curl
 	)
 	fem? (
-		!qt6? ( sci-libs/vtk:=[qt5,rendering] )
-		qt6? ( sci-libs/vtk:=[-qt5,qt6,rendering] )
+		sci-libs/vtk:=
+		$(python_gen_cond_dep 'dev-python/ply[${PYTHON_USEDEP}]')
 	)
 	gui? (
 		>=media-libs/coin-4.0.0
+		dev-qt/qtbase:6[gui,opengl,widgets]
+		dev-qt/qtsvg:6
+		dev-qt/qttools:6[designer?,widgets]
+		$(python_gen_cond_dep '
+			dev-python/matplotlib[${PYTHON_USEDEP}]
+			>=dev-python/pivy-0.6.5[${PYTHON_USEDEP}]
+			dev-python/pyside6:=[designer,gui,svg,${PYTHON_USEDEP}]
+			dev-python/shiboken6:=[${PYTHON_USEDEP}]
+		' )
 		virtual/glu
 		virtual/opengl
-		!qt6? (
-			dev-qt/designer:5
-			dev-qt/qtgui:5
-			dev-qt/qtopengl:5
-			dev-qt/qtprintsupport:5
-			dev-qt/qtsvg:5
-			dev-qt/qtwidgets:5
-			dev-qt/qtx11extras:5
-			pcl? ( sci-libs/pcl[qt5] )
-			$(python_gen_cond_dep '
-				dev-python/matplotlib[${PYTHON_USEDEP}]
-				>=dev-python/pivy-0.6.5[${PYTHON_USEDEP}]
-				dev-python/pyside2:=[gui,svg,webchannel,${PYTHON_USEDEP}]
-				dev-python/shiboken2:=[${PYTHON_USEDEP}]
-			' python3_{10..11} )
-		)
-		qt6? (
-			designer? ( dev-qt/qttools:6[designer] )
-			dev-qt/qt5compat:6
-			dev-qt/qttools:6[widgets]
-			dev-qt/qtbase:6[gui,opengl,widgets]
-			dev-qt/qtsvg:6
-			pcl? ( sci-libs/pcl[-qt5,qt6(-)] )
-			$(python_gen_cond_dep '
-				dev-python/matplotlib[${PYTHON_USEDEP}]
-				>=dev-python/pivy-0.6.5[${PYTHON_USEDEP}]
-				dev-python/pyside6:=[gui,svg,webchannel,${PYTHON_USEDEP}]
-				dev-python/shiboken6:=[${PYTHON_USEDEP}]
-			' )
-		)
+		spacenav? ( dev-libs/libspnav[X?] )
 	)
 	netgen? ( media-gfx/netgen[opencascade] )
-	openscad? ( media-gfx/openscad )
-	pcl? ( sci-libs/pcl:=[opengl,openni2,vtk] )
+	openscad? ( $(python_gen_cond_dep 'dev-python/ply[${PYTHON_USEDEP}]') )
+	pcl? ( sci-libs/pcl:= )
 	smesh? (
-		!qt6? ( sci-libs/vtk:=[qt5] )
-		qt6? ( sci-libs/vtk:=[-qt5,qt6] )
+		sci-libs/hdf5:=[zlib]
+		>=sci-libs/med-4.0.0-r1
+		sci-libs/vtk:=
 	)
-	$(python_gen_cond_dep '
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pybind11[${PYTHON_USEDEP}]
-		addonmgr? ( dev-python/gitpython[${PYTHON_USEDEP}] )
-		fem? ( dev-python/ply[${PYTHON_USEDEP}] )
-	')
 "
 DEPEND="${RDEPEND}
 	>=dev-cpp/eigen-3.3.1:3
 	dev-cpp/ms-gsl
-	test? (
-		$(python_gen_cond_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
-		!qt6? ( dev-qt/qttest:5 )
-	)
 "
 BDEPEND="
-	app-text/dos2unix
 	dev-lang/swig
-	test? (
-		$(python_gen_cond_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
-		!qt6? ( dev-qt/qttest:5 )
-		dev-cpp/gtest
-	)
+	test? ( dev-cpp/gtest )
 "
 
-# To get required dependencies:
-# 'grep REQUIRES_MODS cMake/FreeCAD_Helpers/CheckInterModuleDependencies.cmake'
-# We set the following requirements by default:
-# arch, draft, drawing, import, mesh, part, qt5, sketcher, spreadsheet, start, web.
-#
-# Additionally, 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.
-#
-# The increase in auto-enabled workbenches is due to their need in parts of the
-# test suite when compiled with a minimal set of USE flags.
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	designer? ( gui )
-	inspection? ( points )
-	path? ( robot )
-	python_single_target_python3_12? ( gui? ( qt6 ) )
-"
-# There is no py3.12 support planned for pyside2
-
 PATCHES=(
 	"${FILESDIR}"/${PN}-9999-Gentoo-specific-don-t-check-vcs.patch
 	"${FILESDIR}"/${PN}-0.21.0-0001-Gentoo-specific-disable-ccache-usage.patch
@@ -181,15 +120,12 @@ CHECKREQS_DISK_BUILD="2G"
 pkg_setup() {
 	check-reqs_pkg_setup
 	python-single-r1_pkg_setup
-	[[ -z ${CASROOT} ]] && die "\${CASROOT} not set, please run eselect opencascade"
 }
 
 src_prepare() {
 	# Fix desktop file
 	sed -e 's/Exec=FreeCAD/Exec=freecad/' -i src/XDGData/org.freecad.FreeCAD.desktop || die
 
-	find "${S}" -type f -exec dos2unix -q {} \; || die "failed to convert to unix line endings"
-
 	cmake_src_prepare
 }
 
@@ -203,48 +139,50 @@ src_configure() {
 	append-ldflags -Wl,--copy-dt-needed-entries
 
 	local mycmakeargs=(
+		-DBUILD_DESIGNER_PLUGIN=$(usex designer)
+		-DBUILD_FORCE_DIRECTORY=ON				# force building in a dedicated directory
+		-DBUILD_GUI=$(usex gui)
+		-DBUILD_SMESH=$(usex smesh)
+		-DBUILD_VR=OFF
+		-DBUILD_WITH_CONDA=OFF
+
+		# Modules
 		-DBUILD_ADDONMGR=$(usex addonmgr)
-		-DBUILD_ARCH=ON
-		-DBUILD_ASSEMBLY=OFF                    # Requires OndselSolver
+		-DBUILD_ASSEMBLY=OFF					# Requires OndselSolver
+		-DBUILD_BIM=$(usex bim)
+		-DBUILD_CAM=$(usex cam)
 		-DBUILD_CLOUD=$(usex cloud)
-		-DBUILD_COMPLETE=OFF					# deprecated
 		-DBUILD_DRAFT=ON
-		-DBUILD_DESIGNER_PLUGIN=$(usex designer)
-		-DBUILD_ENABLE_CXX_STD:STRING="C++17"	# needed for current git master
+		# see below for DRAWING
 		-DBUILD_FEM=$(usex fem)
-		-DBUILD_FEM_NETGEN=$(usex netgen)
-		-DBUILD_FLAT_MESH=ON
-		-DBUILD_FORCE_DIRECTORY=ON				# force building in a dedicated directory
-		-DBUILD_FREETYPE=ON						# automagic dep
-		-DBUILD_GUI=$(usex gui)
+		-DBUILD_FEM_NETGEN=$(usex fem $(usex netgen))
+		-DBUILD_FLAT_MESH=$(usex mesh)			# a submodule of MeshPart
+		-DBUILD_HELP=ON
 		-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=ON
-		-DBUILD_MESH_PART=ON
+		-DBUILD_JTREADER=OFF					# uses an old proprietary library
+		-DBUILD_MATERIAL=ON
+		-DBUILD_MEASURE=ON
+		-DBUILD_MESH=$(usex mesh)
+		-DBUILD_MESH_PART=$(usex mesh)
 		-DBUILD_OPENSCAD=$(usex openscad)
 		-DBUILD_PART=ON
-		-DBUILD_PART_DESIGN=$(usex part-design)
-		-DBUILD_PATH=$(usex path)
+		-DBUILD_PART_DESIGN=ON
+		-DBUILD_PLOT=ON
 		-DBUILD_POINTS=$(usex points)
-		-DBUILD_RAYTRACING=$(usex raytracing)
-		-DBUILD_REVERSEENGINEERING=OFF			# currently only an empty sandbox
+		-DBUILD_REVERSEENGINEERING=$(usex reverse)
 		-DBUILD_ROBOT=$(usex robot)
-		-DBUILD_SHOW=$(usex show)
+		-DBUILD_SANDBOX=OFF
+		-DBUILD_SHOW=$(usex gui)
 		-DBUILD_SKETCHER=ON						# needed by draft workspace
-		-DBUILD_SMESH=$(usex smesh)
 		-DBUILD_SPREADSHEET=ON
 		-DBUILD_START=ON
 		-DBUILD_SURFACE=$(usex surface)
 		-DBUILD_TECHDRAW=$(usex techdraw)
 		-DBUILD_TEST=ON							# always build test workbench for run-time testing
-		-DBUILD_TUX=$(usex tux)
-		-DBUILD_VR=OFF
+		-DBUILD_TUX=$(usex gui)
 		-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}
@@ -253,7 +191,6 @@ src_configure() {
 
 		-DFREECAD_BUILD_DEBIAN=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
@@ -285,7 +222,7 @@ src_configure() {
 		)
 	fi
 
-	if use qt6; then
+	if use gui; then
 		mycmakeargs+=(
 			-DFREECAD_QT_MAJOR_VERSION=6
 			-DFREECAD_QT_VERSION=6
@@ -296,17 +233,6 @@ src_configure() {
 			# Drawing module unmaintained and not ported to qt6
 			-DBUILD_DRAWING=OFF
 		)
-	else
-		mycmakeargs+=(
-			-DFREECAD_QT_MAJOR_VERSION=5
-			-DFREECAD_QT_VERSION=5
-			-DQT_DEFAULT_MAJOR_VERSION=5
-			-DQt5Core_MOC_EXECUTABLE="$(qt5_get_bindir)/moc"
-			-DQt5Core_RCC_EXECUTABLE="$(qt5_get_bindir)/rcc"
-			-DBUILD_QT5=ON
-			# Drawing module unmaintained and not ported to qt6
-			-DBUILD_DRAWING=ON
-		)
 	fi
 
 	cmake_src_configure
@@ -315,18 +241,18 @@ src_configure() {
 # We use the FreeCADCmd binary instead of the FreeCAD binary here
 # for two reasons:
 # 1. It works out of the box with USE=-gui as well, not needing a guard
-# 2. We don't need virtualx.eclass and it's dependencies
-# The exported environment variables are needed, so freecad does know
-# where to save it's temporary files, and where to look and write it's
-# configuration. Without those, there are sandbox violation, when it
+# 2. We don't need virtualx.eclass and its dependencies
+# The environment variables are needed, so that FreeCAD knows
+# where to save its temporary files, and where to look and write its
+# configuration. Without those, there is a sandbox violation, when it
 # tries to create /var/lib/portage/home/.FreeCAD directory.
 src_test() {
-	pushd "${BUILD_DIR}" > /dev/null || die
-	export FREECAD_USER_HOME="${HOME}"
-	export FREECAD_USER_DATA="${T}"
-	export FREECAD_USER_TEMP="${T}"
-	nonfatal ./bin/FreeCADCmd --run-test 0
-	popd > /dev/null || die
+	cd "${BUILD_DIR}" || die
+
+	local -x FREECAD_USER_HOME="${HOME}"
+	local -x FREECAD_USER_DATA="${T}"
+	local -x FREECAD_USER_TEMP="${T}"
+	./bin/FreeCADCmd --run-test 0 --set-config AppHomePath="${BUILD_DIR}/" || die
 }
 
 src_install() {
@@ -338,7 +264,7 @@ src_install() {
 		newbin - freecad <<- _EOF_
 		#!/bin/sh
 		# https://github.com/coin3d/coin/issues/451
-		: \${QT_QPA_PLATFORM:=xcb}
+		: "\${QT_QPA_PLATFORM:=xcb}"
 		export QT_QPA_PLATFORM
 		exec /usr/$(get_libdir)/${PN}/bin/FreeCAD "\${@}"
 		_EOF_
@@ -359,30 +285,17 @@ pkg_postinst() {
 	einfo "You can load a lot of additional workbenches using the integrated"
 	einfo "AddonManager."
 
-	# ToDo: check opencv, pysolar (::science), elmerfem (::science)
-	#		ifc++, ifcopenshell, z88 (no pkgs), calculix-ccx (::waebbl)
 	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_header "Computational utilities"
-	optfeature "BLAS library" sci-libs/openblas
-	optfeature "Statistical computation with Python" dev-python/pandas
-	optfeature "Use scientific computation with Python" dev-python/scipy
-	optfeature "Use symbolic math with Python" dev-python/sympy
-	optfeature_header "Imaging, Plotting and Rendering utilities"
-	optfeature "Dependency graphs" media-gfx/graphviz
-	optfeature "PBR Rendering" media-gfx/povray
-	optfeature_header "Import / Export"
-	optfeature "Interact with git repositories" dev-python/gitpython
-	optfeature "Work with COLLADA documents" dev-python/pycollada
-	optfeature "YAML importer and emitter" dev-python/pyyaml
-	optfeature "Importing and exporting 2D AutoCAD DWG files" media-gfx/libredwg
-	optfeature "Importing and exporting geospatial data formats" sci-libs/gdal
-	optfeature "Working with projection data" sci-libs/proj
-	optfeature_header "Meshing and FEM"
-	optfeature "FEM mesh generator" sci-libs/gmsh
-	optfeature "Triangulating meshes" sci-libs/gts
-	optfeature "Visualization" sci-visualization/paraview
+	einfo "https://wiki.freecad.org/Installing_additional_components"
+	optfeature_header "External programs used by FreeCAD"
+	optfeature "dependency graphs" media-gfx/graphviz
+	optfeature "importing and exporting 2D AutoCAD DWG files" media-gfx/libredwg
+	optfeature "importing OpenSCAD files, Mesh booleans" media-gfx/openscad
+	use bim && optfeature "working with COLLADA documents" dev-python/pycollada
+	if use fem || use mesh; then
+		optfeature "mesh generation" sci-libs/gmsh
+	fi
 }
 
 pkg_postrm() {