media-gfx/freecad: bump to 0.21.2

- /usr/bin/freecad is no longer a symlink, instead it is a wrapper
that ensure freecad is executed in xwayland. It still crashes in
native wayland mode.

- dropped opencascade dependency restriction

- adjusted configure phase for qt6 compatibility. The qt6 flag is still
masked for now as there is still some problem when building for qt6

- added python3.12: this requires qt6 since there will likely be no
further python compatibility updates for shiboken2/pyside2

- only depend on qtdesigner if USE=designer

Bug: https://bugs.gentoo.org/869686
Closes: https://bugs.gentoo.org/916386
Closes: https://bugs.gentoo.org/917262
Co-authored-by: Jörg Habenicht <j.habenicht@gmx.de>
Signed-off-by: Andrew Ammerlaan <andrewammerlaan@gentoo.org>

4 files changed, 451 insertions, 29 deletions

diff --git a/media-gfx/freecad/Manifest b/media-gfx/freecad/Manifest
index 0973d9d48798..fa2b9363a973 100644
--- a/media-gfx/freecad/Manifest
+++ b/media-gfx/freecad/Manifest
@@ -1 +1,2 @@
 DIST freecad-0.20.2.tar.gz 75555561 BLAKE2B 278b05a3fe3bdccb46da62926aee46f066cb073f034b273dc4d8b27975724b754a6822b7eb0b673500db4592237690decb830cc7a30e8da689c6b067c256d4f8 SHA512 c3acd77dd2bb9a2a23ac354da3b6102effb89c95d675e91421d65486414dfe8cc0188a7212245e0deb63f17b9c5df76133017be09e4cd14b833be8cbec52a08d
+DIST freecad-0.21.2.tar.gz 66124278 BLAKE2B 84a4f8008192cd1a2ee1737b537b2668a8c028aa8c8645e6e412ab9ef79bf3bdd2cb73d96fcfd2dbcff613cdcc59cbab95821406acdc9cd7d4eb4636c081be78 SHA512 bd7e9029b24d49ac0955797bcdbea1fd0826bdf9ab246135366dfc35b427004f103acccfc66d008e3ab3928f99e04200e335908a03166545554e2d3e969ae0f5
diff --git a/media-gfx/freecad/files/freecad-0.21.1-Gentoo-specific-don-t-check-vcs.patch b/media-gfx/freecad/files/freecad-0.21.1-Gentoo-specific-don-t-check-vcs.patch
new file mode 100644
index 000000000000..3d851c341e2e
--- /dev/null
+++ b/media-gfx/freecad/files/freecad-0.21.1-Gentoo-specific-don-t-check-vcs.patch
@@ -0,0 +1,16 @@
+Signed-off-by: Jörg Habenicht <j.habenicht@gmx.de>
+--- a/src/Tools/SubWCRev.py
++++ b/src/Tools/SubWCRev.py
+@@ -509,12 +509,6 @@
+             bindir = a
+ 
+     vcs = [
+-        GitControl(),
+-        DebianGitHub(),
+-        BazaarControl(),
+-        Subversion(),
+-        MercurialControl(),
+-        DebianChangelog(),
+         UnknownControl(),
+     ]
+     for i in vcs:
diff --git a/media-gfx/freecad/freecad-0.21.2.ebuild b/media-gfx/freecad/freecad-0.21.2.ebuild
new file mode 100644
index 000000000000..c99cbce11039
--- /dev/null
+++ b/media-gfx/freecad/freecad-0.21.2.ebuild
@@ -0,0 +1,364 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit check-reqs cmake optfeature python-single-r1 xdg
+
+DESCRIPTION="QT based Computer Aided Design application"
+HOMEPAGE="https://www.freecad.org/ https://github.com/FreeCAD/FreeCAD"
+
+MY_PN=FreeCAD
+
+if [[ ${PV} = *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/${MY_PN}/${MY_PN}.git"
+	S="${WORKDIR}/freecad-${PV}"
+else
+	SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/refs/tags/${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 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 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
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	dev-libs/OpenNI2[opengl(+)]
+	dev-libs/boost:=
+	dev-libs/libfmt:=
+	dev-libs/libspnav[X]
+	dev-libs/xerces-c[icu]
+	!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]
+	)
+	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:=
+	sys-libs/zlib
+	virtual/libusb:1
+	cloud? (
+		dev-libs/openssl:=
+		net-misc/curl
+	)
+	fem? (
+		!qt6? ( sci-libs/vtk:=[qt5,rendering] )
+		qt6? ( sci-libs/vtk:=[qt6,rendering] )
+	)
+	gui? (
+		>=media-libs/coin-4.0.0
+		virtual/glu
+		virtual/opengl
+		!qt6? (
+			designer? ( dev-qt/designer:5 )
+			dev-qt/qtgui: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
+			$(python_gen_cond_dep '
+				dev-python/matplotlib[${PYTHON_USEDEP}]
+				>=dev-python/pivy-0.6.5[${PYTHON_USEDEP}]
+				dev-python/pyside2[gui,svg,webchannel,webengine,${PYTHON_USEDEP}]
+				dev-python/shiboken2[${PYTHON_USEDEP}]
+			' python3_{10..11} )
+		)
+		qt6? (
+			designer? ( dev-qt/qttools:6[designer] )
+			dev-qt/qtbase:6[gui,opengl,widgets]
+			dev-qt/qtsvg:6
+			dev-qt/qtwebengine:6[widgets]
+			$(python_gen_cond_dep '
+				dev-python/matplotlib[${PYTHON_USEDEP}]
+				>=dev-python/pivy-0.6.5[${PYTHON_USEDEP}]
+				dev-python/pyside6[gui,svg,webchannel,webengine,${PYTHON_USEDEP}]
+				dev-python/shiboken6[${PYTHON_USEDEP}]
+			' )
+		)
+	)
+	netgen? ( media-gfx/netgen[opencascade] )
+	openscad? ( media-gfx/openscad )
+	pcl? ( sci-libs/pcl:=[opengl,openni2,qt5,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
+	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 )
+	)
+"
+
+# 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}-0.21.0-0001-Gentoo-specific-disable-ccache-usage.patch
+	"${FILESDIR}"/${PN}-0.21.1-Gentoo-specific-don-t-check-vcs.patch
+)
+
+DOCS=( CODE_OF_CONDUCT.md README.md )
+
+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.freecadweb.FreeCAD.desktop || die
+
+	find "${S}" -type f -exec dos2unix -q {} \; || die "failed to convert to unix line endings"
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_ADDONMGR=$(usex addonmgr)
+		-DBUILD_ARCH=ON
+		-DBUILD_ASSEMBLY=OFF					# deprecated
+		-DBUILD_CLOUD=$(usex cloud)
+		-DBUILD_COMPLETE=OFF					# deprecated
+		-DBUILD_DRAFT=ON
+		-DBUILD_DESIGNER_PLUGIN=$(usex designer)
+		-DBUILD_DRAWING=ON
+		-DBUILD_ENABLE_CXX_STD:STRING="C++17"	# needed for >=boost-1.77.0
+		-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_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_OPENSCAD=$(usex openscad)
+		-DBUILD_PART=ON
+		-DBUILD_PART_DESIGN=$(usex part-design)
+		-DBUILD_PATH=$(usex path)
+		-DBUILD_POINTS=$(usex points)
+		-DBUILD_RAYTRACING=$(usex raytracing)
+		-DBUILD_REVERSEENGINEERING=OFF			# currently only an empty sandbox
+		-DBUILD_ROBOT=$(usex robot)
+		-DBUILD_SHOW=$(usex show)
+		-DBUILD_SKETCHER=ON						# needed by draft workspace
+		-DBUILD_SMESH=ON
+		-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_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_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=ON
+		-DFREECAD_USE_QT_FILEDIALOG=ON
+		-DFREECAD_USE_QTWEBMODULE:STRING="Qt WebEngine"
+
+		# install python modules to site-packages' dir. True only for the main package,
+		# sub-packages will still be installed inside /usr/lib64/freecad
+		-DINSTALL_TO_SITEPACKAGES=ON
+
+		# Use the version of shiboken2 that matches the selected python version
+		-DPYTHON_CONFIG_SUFFIX="-${EPYTHON}"
+		-DPython3_EXECUTABLE=${PYTHON}
+	)
+
+	if use debug; then
+		# BUILD_SANDBOX currently broken, see
+		# https://forum.freecadweb.org/viewtopic.php?f=4&t=36071&start=30#p504595
+		mycmakeargs+=(
+			-DBUILD_SANDBOX=OFF
+			-DBUILD_TEMPLATE=ON
+		)
+	else
+		mycmakeargs+=(
+			-DBUILD_SANDBOX=OFF
+			-DBUILD_TEMPLATE=OFF
+		)
+	fi
+
+	if use qt6; then
+		mycmakeargs+=(
+			-DFREECAD_QT_VERSION=6
+			-DQT_DEFAULT_MAJOR_VERSION=6
+			-DBUILD_QT5=OFF
+		)
+	else
+		mycmakeargs+=(
+			-DFREECAD_QT_VERSION=5
+			-DQT_DEFAULT_MAJOR_VERSION=5
+			-DBUILD_QT5=ON
+		)
+	fi
+
+	cmake_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
+# 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
+}
+
+src_install() {
+	cmake_src_install
+
+	dobin src/Tools/freecad-thumbnailer
+
+	if use gui; then
+		newbin - freecad <<- _EOF_
+		#!/bin/sh
+		# https://github.com/coin3d/coin/issues/451
+		: \${QT_QPA_PLATFORM:=xcb}
+		export QT_QPA_PLATFORM
+		exec /usr/$(get_libdir)/${PN}/bin/FreeCAD
+		_EOF_
+		mv "${ED}"/usr/$(get_libdir)/${PN}/share/* "${ED}"/usr/share || die "failed to move shared resources"
+	fi
+	dosym -r /usr/$(get_libdir)/${PN}/bin/FreeCADCmd /usr/bin/freecadcmd
+
+	rm -r "${ED}"/usr/$(get_libdir)/${PN}/include/E57Format || die "failed to drop unneeded include directory E57Format"
+	use test && (rm -r "${ED}"/usr/include/${PN}/{gmock,gtest} || die)
+
+	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
+}
+
+pkg_postinst() {
+	xdg_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
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+}
diff --git a/media-gfx/freecad/freecad-9999.ebuild b/media-gfx/freecad/freecad-9999.ebuild
index 73fd4eaff9a1..d174541cdb9c 100644
--- a/media-gfx/freecad/freecad-9999.ebuild
+++ b/media-gfx/freecad/freecad-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit check-reqs cmake optfeature python-single-r1 xdg
 
@@ -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 test"
+IUSE="debug designer +gui qt6 test"
 
 FREECAD_EXPERIMENTAL_MODULES="cloud netgen pcl"
 FREECAD_STABLE_MODULES="addonmgr fem idf image inspection material
@@ -50,11 +50,16 @@ RDEPEND="
 	dev-libs/libfmt:=
 	dev-libs/libspnav[X]
 	dev-libs/xerces-c[icu]
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtxml:5
-	dev-qt/qtxmlpatterns:5
+	!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]
+	)
 	media-libs/freetype
 	media-libs/qhull:=
 	sci-libs/hdf5:=[fortran,zlib]
@@ -67,25 +72,42 @@ RDEPEND="
 		dev-libs/openssl:=
 		net-misc/curl
 	)
-	fem? ( sci-libs/vtk:=[qt5,rendering] )
+	fem? (
+		!qt6? ( sci-libs/vtk:=[qt5,rendering] )
+		qt6? ( sci-libs/vtk:=[qt6,rendering] )
+	)
 	gui? (
-		dev-qt/designer:5
-		dev-qt/qtgui: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
 		>=media-libs/coin-4.0.0
 		virtual/glu
 		virtual/opengl
-		$(python_gen_cond_dep '
-			dev-python/matplotlib[${PYTHON_USEDEP}]
-			>=dev-python/pivy-0.6.5[${PYTHON_USEDEP}]
-			dev-python/pyside2[gui,svg,webchannel,webengine,${PYTHON_USEDEP}]
-			dev-python/shiboken2[${PYTHON_USEDEP}]
-		')
+		!qt6? (
+			designer? ( dev-qt/designer:5 )
+			dev-qt/qtgui: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
+			$(python_gen_cond_dep '
+				dev-python/matplotlib[${PYTHON_USEDEP}]
+				>=dev-python/pivy-0.6.5[${PYTHON_USEDEP}]
+				dev-python/pyside2[gui,svg,webchannel,webengine,${PYTHON_USEDEP}]
+				dev-python/shiboken2[${PYTHON_USEDEP}]
+			' python3_{10..11} )
+		)
+		qt6? (
+			designer? ( dev-qt/qttools:6[designer] )
+			dev-qt/qtbase:6[gui,opengl,widgets]
+			dev-qt/qtsvg:6
+			dev-qt/qtwebengine:6[widgets]
+			$(python_gen_cond_dep '
+				dev-python/matplotlib[${PYTHON_USEDEP}]
+				>=dev-python/pivy-0.6.5[${PYTHON_USEDEP}]
+				dev-python/pyside6[gui,svg,webchannel,webengine,${PYTHON_USEDEP}]
+				dev-python/shiboken6[${PYTHON_USEDEP}]
+			' )
+		)
 	)
 	netgen? ( media-gfx/netgen[opencascade] )
 	openscad? ( media-gfx/openscad )
@@ -102,7 +124,7 @@ DEPEND="
 	>=dev-cpp/eigen-3.3.1:3
 	test? (
 		$(python_gen_cond_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
-		dev-qt/qttest:5
+		!qt6? ( dev-qt/qttest:5 )
 	)
 "
 BDEPEND="
@@ -110,7 +132,7 @@ BDEPEND="
 	dev-lang/swig
 	test? (
 		$(python_gen_cond_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
-		dev-qt/qttest:5
+		!qt6? ( dev-qt/qttest:5 )
 	)
 "
 
@@ -132,7 +154,9 @@ 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
@@ -152,7 +176,7 @@ pkg_setup() {
 
 src_prepare() {
 	# Fix desktop file
-	sed -e 's/Exec=FreeCAD/Exec=freecad/' -i src/XDGData/org.freecad.FreeCAD.desktop || die
+	sed -e 's/Exec=FreeCAD/Exec=freecad/' -i src/XDGData/org.freecadweb.FreeCAD.desktop || die
 
 	find "${S}" -type f -exec dos2unix -q {} \; || die "failed to convert to unix line endings"
 
@@ -189,7 +213,6 @@ src_configure() {
 		-DBUILD_PART_DESIGN=$(usex part-design)
 		-DBUILD_PATH=$(usex path)
 		-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)
@@ -213,8 +236,6 @@ src_configure() {
 
 		-DFREECAD_BUILD_DEBIAN=OFF
 
-		-DFREECAD_QT_VERSION="5"
-
 		-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
@@ -248,6 +269,20 @@ src_configure() {
 		)
 	fi
 
+	if use qt6; then
+		mycmakeargs+=(
+			-DFREECAD_QT_VERSION=6
+			-DQT_DEFAULT_MAJOR_VERSION=6
+			-DBUILD_QT5=OFF
+		)
+	else
+		mycmakeargs+=(
+			-DFREECAD_QT_VERSION=5
+			-DQT_DEFAULT_MAJOR_VERSION=5
+			-DBUILD_QT5=ON
+		)
+	fi
+
 	cmake_src_configure
 }
 
@@ -274,7 +309,13 @@ src_install() {
 	dobin src/Tools/freecad-thumbnailer
 
 	if use gui; then
-		dosym -r /usr/$(get_libdir)/${PN}/bin/FreeCAD /usr/bin/freecad
+		newbin - freecad <<- _EOF_
+		#!/bin/sh
+		# https://github.com/coin3d/coin/issues/451
+		: \${QT_QPA_PLATFORM:=xcb}
+		export QT_QPA_PLATFORM
+		exec /usr/$(get_libdir)/${PN}/bin/FreeCAD
+		_EOF_
 		mv "${ED}"/usr/$(get_libdir)/${PN}/share/* "${ED}"/usr/share || die "failed to move shared resources"
 	fi
 	dosym -r /usr/$(get_libdir)/${PN}/bin/FreeCADCmd /usr/bin/freecadcmd