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

author: V3n3RiX <venerix@koprulu.sector> 2024-11-26 02:00:48 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2024-11-26 02:00:48 +0000
commit: 403335d7014372971e9e9267493a808d08bab48e (patch)
tree: ffd28ddc69e6fe6543b018a00c9fad058bdda027 /media-gfx
parent: 7f0b7329b3aa78ea82792fdf68ab48415fe4cc35 (diff)
23 files changed, 275 insertions, 638 deletions
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index fab6217bdc9a..5289e45b2794 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
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() {
diff --git a/media-gfx/igal/Manifest b/media-gfx/igal/Manifest
index 363382cfea49..e2fa7c711047 100644
--- a/media-gfx/igal/Manifest
+++ b/media-gfx/igal/Manifest
@@ -1,5 +1,5 @@
 DIST igal-3.1.tar.gz 29372 BLAKE2B bb83a13b082d4d94b0ff186ef34e9c670b5a49ba74ccd40675db6820931132697b886e58db9da7e620322fdb29a59437acd817d6ef69ea4cebdaa408d1fbe567 SHA512 28f036a5450d05c2d795355f52e0e3f5720d94e5e9d82d4b6bd53ff8ce5ea08352e3ec85ddbcca754e986a06fd205b1667b102981484c783add4496c50c102fe
 DIST igal-3.2.tar.gz 29420 BLAKE2B bc0b3836d1a69f19d3f1896e80ed7b45f5737c21ff1f1a1728e9194fff44750adc2410de16bb50aab00ad52bbca4908f2361d1e9976216aa05b204208f588f99 SHA512 ba9cb6197f83f6af6724258ca9ba706b92c8593fd838e2bcc32c3b7498c8d8f5488abacd8198e07bac2d191f4a4a5ccd3110efb5070d56a3361b07d2a0f99621
 EBUILD igal-3.1.ebuild 943 BLAKE2B 3c54eb77a65145f013af10a26a94664aa9561763fa1d47e0df97cf7b8e28003c9a4b1d29e6c676d5fb8df1e09bfae9ebf6cb507e2be4b94a5e5049829da306e7 SHA512 9fa947d7e95c8814576642e3d74c145cf2356a64caa6e73aa1a39a59a35781bd0213251bab207b8a1fe0af54f1a68c13147fe23448d7a8bfc0db0df42e848e48
-EBUILD igal-3.2.ebuild 1064 BLAKE2B 26a3e5e9e57449c3efeed0bbabd4ec850a117b17d8593d8cf5b5089bb913b67573a71fbf7f8b95dfbe2d2ab40500bb9b2baf4dcd265a65f95853dc329e86200f SHA512 d565e918bf4900b3631811507f05978bb3b428af44e12ed78726e25fe51d5eac81df88d6be5da07bf4429ea4365d3e9753347d48996e062a2dac4c002dd25e59
+EBUILD igal-3.2.ebuild 1063 BLAKE2B b4f5e7533fbd6d333d0450bdc4bdfb0acb8be2fae8258120f1c760d1cad56b9a7e7c39e74d7765c9a696be6c87bd852b2439e858b26befc644ec0fa475b98b73 SHA512 6b680394af42258805dd37ce80dab2acc816ce743de7db69af086853d93159b5926a6d043f6f2d7c55e827e509df23fa4858a3fa82d0299152793887c14fcfdf
 MISC metadata.xml 500 BLAKE2B 50fa9ff754f053fa91db809979df2795378981c629800d1251c6dbb87df4fc8349bed04528a22e8002a611beb12133950901fdc7cd90dc3c7e784695e57aec6b SHA512 2960a7bf9f00a0da16ad7ee6ba5b049c7386c7c6abd44dc902944ca41d2e55e2022cdb95a694dd9015f67fc7315224f4b2ce14c75b4c802d99870933515ac2ff
diff --git a/media-gfx/igal/igal-3.2.ebuild b/media-gfx/igal/igal-3.2.ebuild
index a8bcda0f25db..51a66ce9c503 100644
--- a/media-gfx/igal/igal-3.2.ebuild
+++ b/media-gfx/igal/igal-3.2.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/${PN}2-${PV}"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 RDEPEND="
 	dev-lang/perl
diff --git a/media-gfx/jp2a/Manifest b/media-gfx/jp2a/Manifest
index d16d00f575dd..333e8030a5d0 100644
--- a/media-gfx/jp2a/Manifest
+++ b/media-gfx/jp2a/Manifest
@@ -1,5 +1,5 @@
 DIST jp2a-1.1.1.tar.bz2 525678 BLAKE2B 82e4717acb27596ca789681d288767cd602207b56e4f4afbffe5a1a107d67e0bc2b61dadd3769963eff34d3d8a1546741a069cfa7dfe40c9d3486cac6ccb29d6 SHA512 92234100e43c542f468ce586fb1c3f975c2492b80062ea5871f0eb02351b26b7f56bd5567d4d2e3bcec1ea66ebae22623d7d973c3bc794dd99c819efcae983cd
 DIST jp2a-1.2.0.tar.bz2 444270 BLAKE2B 819101f7df242b869de0e91b6b6fd6c7d6f7d4bfb1f69a5b0477c9d34a08a46d9f05ad79926b66c2b0fe2ad785a340250bf1493ea8832bf7e40a621cb6b6afa2 SHA512 3f523e0c369b77323d512ff14944c70011280bf75b99e9b1abc0dcfefa706bf56bf0b6bed46c78194bd22c2b98dded65c551777dc75f5f217ebb6513d0a56d60
 EBUILD jp2a-1.1.1.ebuild 642 BLAKE2B ddab1461fbe631e7d8eaf7057c9a959745195c8ce77fdc1bd5699ae93669bc1cc6c40085572551eed69462c8079ad382f323d8c953f6d46efa129f825ed234f2 SHA512 cd1a1530a1a5af1132cef1c8c8bbc4faefecc399382a035df540a03e56fade520e1e7d93445dd296d4c64463d1928bc30bd6944f93cc34f3d97f03fb6a096299
-EBUILD jp2a-1.2.0.ebuild 657 BLAKE2B 3c2a8bc9e1ca4c7d8d092a62e5cc2d391156c399935d3e733437ff6c35f6cf168615d09fd520f86b2705dba729a9f60ff7fa00415f8fec4b8e47cfb346d04d6d SHA512 48533caf89b798beac12444b50abbbf45a72e12a80ac8fb9b518968cc1b20dab6a60661c4fcd3d0107b50d50a35f099e7ea02cbbfd5b70d17068a8f135d34200
+EBUILD jp2a-1.2.0.ebuild 656 BLAKE2B 682484301b9aa2d15536b316f716ccb45e1d62596e01084b709ed5f33a308626898c91d059f6d65e4d32533f192b3e969fae4ee5cf50f5318d0b30fef48665e4 SHA512 cc6d625a608f50eb9d645cf4f591c8519850df17d643b39db8668f6923373e7e94dc99e0d2aaab24567bf0baf4b90ae3b298c219c5d1bf6c28dbe16930255041
 MISC metadata.xml 249 BLAKE2B 2572acca810424ee1967a908498b907de468a9fb1765d7bc11a5d1c6aa81294d962a224d7777fecc997fb3220613350618fb7edc9e65b66e9e8dc4a8d31e6313 SHA512 b13e4520e6f7e18c5b925bff00c9711a98d8e773aba54fbe527d95ba97ccd0bd6b58f91f6b01ad92f106bb56f671261de55aacf796db0086e700d9fd40a0d842
diff --git a/media-gfx/jp2a/jp2a-1.2.0.ebuild b/media-gfx/jp2a/jp2a-1.2.0.ebuild
index 32c18a376dfd..d2ba1d187923 100644
--- a/media-gfx/jp2a/jp2a-1.2.0.ebuild
+++ b/media-gfx/jp2a/jp2a-1.2.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/Talinx/jp2a/releases/download/v${PV}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 ppc ppc64 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="curl"
 
 # TODO: restore ncurses support?
diff --git a/media-gfx/jpegoptim/Manifest b/media-gfx/jpegoptim/Manifest
index f01f079756ba..ab9e69577a64 100644
--- a/media-gfx/jpegoptim/Manifest
+++ b/media-gfx/jpegoptim/Manifest
@@ -1,4 +1,4 @@
 AUX jpegoptim-1.5.3-system-libjpeg-libm.patch 390 BLAKE2B f23acc7cf017fc8dc5402b7e940b26fef5870cc4ca03ad3a1d2776820126420acd9c03d5a4eeb2c76c7979af223fa00a4ad5eba8c76347c01d2935677348a7f2 SHA512 c76e4a44455374f15f1021876860014dc1bc256e4c474abbc01a35692a569b679194d341b0ceb8751a91c62d54125f21fa7090de7ce3feb4dd1125810b60acca
 DIST jpegoptim-1.5.5.tar.gz 124361 BLAKE2B eb4cd150435c07df5116fbed653b378512ada96f4ebae65f08a4ccd9418ba71bcd6e369abb5713427c1ea8983432d4f94763252b580e657960154327f9f14d8f SHA512 81009e7079713aaa65fb8ef6d92b59eb6db16a460e8394cb3ce883228157f51ec0df0798d1a62d2e16c64678fd2a51a7156a9aa20b93e51343e3187657aefb4f
-EBUILD jpegoptim-1.5.5.ebuild 865 BLAKE2B bad7e05f66f96ab28dbab5b5caef0221bf734f0a398ea14256a6a84bfbdeaa68d8f2bf6c6e8d3520837a8efd053dd3d97b44939bd100106aff0bc952e9237627 SHA512 675a2cebca06fcda61401c5ddc3b3e01ca45f535c668eabb08fbd49b0335608741ca40a761f1e06185bcb882bf7dee167b93d71535af7eaa359cba72d0d99f1c
+EBUILD jpegoptim-1.5.5.ebuild 940 BLAKE2B 31ec6e3c8c18864312c5f4ccde9d2b14d7bb36fc45f1636779a0dd1568e45eb912cfeaee3114e631fe8c179a0c8633017346dfef1d371294ce4aa75fe6d945f5 SHA512 96aafad2ad4ad4efb9df396ba3a08945b45b7c605b7d9f43297b71d31d9c158327833e1b6306d4039b7ad3eb9f3148091bde994ab0965add01380f51188d7816
 MISC metadata.xml 325 BLAKE2B f70f1cdb1d6d60bf87058a388fec1b87e26e6277a04c0b8334f1d05d64de12706b7402260f6fa425bbb6835ab06351cc2289f7060f6fd33f637a0e26c71fea3e SHA512 e85426100408710a2441322b71113131e63127cea6f42d47d583656b93e851e3611b0305de731c3548144289eb475bce2dfc58df1fa61839e682d97498e678a3
diff --git a/media-gfx/jpegoptim/jpegoptim-1.5.5.ebuild b/media-gfx/jpegoptim/jpegoptim-1.5.5.ebuild
index 46f1697664d6..76927fefe6ac 100644
--- a/media-gfx/jpegoptim/jpegoptim-1.5.5.ebuild
+++ b/media-gfx/jpegoptim/jpegoptim-1.5.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit cmake
+inherit cmake flag-o-matic
 
 DESCRIPTION="Utility to optimize JPEG files"
 HOMEPAGE="https://www.kokkonen.net/tjko/projects.html"
@@ -23,6 +23,8 @@ PATCHES=(
 )
 
 src_configure() {
+	use elibc_musl && append-cppflags -D__GNU_LIBRARY__ #944902
+
 	local mycmakeargs=(
 		-DUSE_MOZJPEG=no
 	)
diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 6caf26c1e61a..870111805576 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,17 +1,10 @@
-AUX krita-4.3.1-tests-optional.patch 2583 BLAKE2B 0b5e577bc17ef6b6487ce82ff4b4bc34064c659a3cf48d12a539c3029dd70f17b0b48a7398b68de6a937adff3af0c2d4a47d0f84fdc7746ec612fb05272d963f SHA512 f16885a72cd5f8f250b03903062c70190367ed409c2582d579bfb1e6ab09514df7f96214ce236e33bb8eec2f3872d887f9c3152f4e524b1719250a9064bf719c
-AUX krita-5.1.5-libjxl-0.9.patch 4162 BLAKE2B 410bf2fe6ce56771a0d2ae9fcbdeae2eb34252628a2989d225c91d43b33e01ad8a77b3caa733d5e9c0ea10dc6def83407b397cfceccc431ad8b38d6f36993525 SHA512 851110f6a91dbea530105aea477d7629491ed527f5bb198032b4741b026643a34bf22681dd35944d299dff5242dc917e2f0a096914628b7337a1821795b02323
-AUX krita-5.1.5-lto.patch 1759 BLAKE2B 45fb3eb096bf61e767b2db682dad325261d17d894ec9e2e3cb0cef14c99a6c1fa4148bde7884e1e4fd5f30b036175a0da15291c961ace846e12a1e91947844b0 SHA512 81519ad76faeee65bc6f2c07585574bdbf66479adc7983f0968a09c5516e4e9da884c875c8175663c5de2cead104c2477ff3c90b9de20b0da4d80bb8fd86b090
-AUX krita-5.1.5-ocio-2.3.0.patch 1669 BLAKE2B 17ee793479946ca07788afb109ca338c3cd9ace486b2c7443ce850cc229766eb09d7b6608337c4d8ae7a7e24d633e233d36551253c3012042062a9d5c3b0fe4f SHA512 dc88f9e1b9836d8c8bc08731ac1878c3a35d4ebbd4cc361a1a4e7b59c5217709b4e207001b18a617ef4f8881a2608b548e14d383aa9db798f13acd2be02df925
 AUX krita-5.1.5-sip-6.8.patch 770 BLAKE2B b63fb65ffc4ea733e8698b255b5531ff55299ec8f7cd6c153f50faaf938795618c675a7c6fbf33c1f7225c8dddaec806a9fbd6f88b621ebcff52eb13aacc0479 SHA512 5f21376508c603ca33447119ad9fa492e83992f74314cd59053f270d2020a540b4c6708b67028a7567b9db460a6fbc0aa842020b4fe5b7d4be4265d2dc78ceff
 AUX krita-5.2.2-fftw.patch 689 BLAKE2B a0b62a65d8de4c661a571f0f671387d0571982bbc0acdf4dc879c21711093e7a3d6ef17e6a24f04d066ecd1f861b98f8a37e626075d3fdd445f408e77484eb3f SHA512 6db10de30c0f47ea3d65490d82176685144af580a6581d0ff2fc0363e6b65166c154ad3dd05a0dadf967afc39417936275d71911e89fcf79ecfa84b1bb6b94fa
 AUX krita-5.2.3-tests-optional.patch 2807 BLAKE2B 7d0c0d26ce0cb1bf86f7933e8510bb5ea1e98986b811641874b4db6f622e5a31bf9b9c3b7e12267bf54f2d57d56459211df3e004dbc261e0d519f69d190e2149 SHA512 021d6d8fa1b976091088b317f54cf0be66f73b0dd9031497abc3101e4e43b69a0d4b5302e004b3ec81193bfecc0066cc4563a50b15e2c30109d3a57bafe23ca5
 AUX krita-5.2.3-znver4-xsimd.patch 1650 BLAKE2B a534c96c1fdbaf3aeb59499c88079d70574e0ac4eda170637d187fd66338b80c53e3d85fe003f75c59512eb484522403e785b0a9bdb6dca0e6a7bce8d7a0a936 SHA512 2aeb300d6230fa29c97f086aad98df16ed71d1199716739467b7c25014ba7e3a84b368cc9945042e2ce8fca0e42c03579b1e26048304498c194cff01d7d7d7cf
 AUX krita-5.2.6-py3.13.patch 4520 BLAKE2B cd190b438952853207f6d5f35fadb28d0044273dc4e6d6bb8aac4c623aadd7111a6c852de302da9c72c4444ef422c64c9b2a46ee74328af8b37d77d56a645fbc SHA512 65b2cff6ddcf2e6b3be9e993be61fbcb60ea89c58ba2aa2119582d5eb80b8c230b6323072dd6fc9b56a60899459cbfe433ec4deea3a3fbdaf796111383dbf206
-DIST krita-5.1.5-exiv2-0.28.patch.xz 4664 BLAKE2B e364325be3d8e40e293a7d268136be3737ce5d2b9b5607f140b30ba3e687dc8d86545f4463348587711150f1652b521f87efc859a1bf2bc3b5ed704cf3236781 SHA512 130ba9cce7d6c0138f7ef6dab1445816c2e29752aa16643c32a7d9c00d7a156ac88f01afdb782ab03fc1e0822660a070f74c02e7cde4dfbcec30baaf3c3dba7f
-DIST krita-5.1.5.tar.xz 184981952 BLAKE2B 3d8d26849d8508dc040fb3ac5ab4d0ce724f670bf7d5782b37702b55afe5063543e6aa564a1c9326c90fb16f7905941e3f1ffd4296efd6f8a1c7cb34c0b41716 SHA512 b745eb9f51bb08df0948d6b97b85aee6a74b496df3e8423fb9107d79551daadb21960b4bb5c438348f662c67d0ec5b2fa6da18cfa5feb418659881cddd24d8f1
 DIST krita-5.2.3.tar.xz 186685456 BLAKE2B 42943e7ebffdb46b9da085b2069701895e37ad9c457273b9217a095f1dfdf15c715cde0b88d440abb2d73dee656730da38844f11f27022885f87bb9cc9adab26 SHA512 69a0477e3119765dd53e0502fe5a64fcdc921dfcba3ddc5dec5c1bc4342a77b172b38276f134cc56f79741e6c47b51ef51786aadf0d178ce3955e24a9fd27b74
 DIST krita-5.2.6.tar.xz 186560016 BLAKE2B 788385983b371626214898391b08b1276a74b2ee3c9f01c1b1ae19d8791bfcf1ea1f59f6304643aeb6b16a2559fd2e45464596c721eb5d53546672d0efe17903 SHA512 8502ebef11ae066b298e999aba06df7858605cca14b889cec167b7ee3953b8ed86459b44ed90508d59bd7a9968cc9957309cefaa140a8d20293344f4dcb7fea7
-EBUILD krita-5.1.5.ebuild 3782 BLAKE2B 4436e0e86332a7234f0c60f46e52b60a3a7367ef147ca6ec8067d93c548a0a5270a741af041bf6fad55db3e0ae939cf347d9721d0321ba536e80a6d8705b6943 SHA512 9a2448cca44401d7a82a7ed60daf11a57c7757d61b0034194b9b3639a79dfe6df33d969e6a3cd2ad5285cef771b0ec76d3d10046f246db81b4c2078d3f669fae
 EBUILD krita-5.2.3.ebuild 3789 BLAKE2B 41a5c3d4a5b0ecc3b15783993d8a0a39601e5b873e3f5bbf521607b8c85caa39ff94bb7ac91ac17ef844581892dfbe50d1c95dd1a7cff206e702210986de7748 SHA512 15efb4f7e6ed150a91565255a06fd3fd5e24a705607be5d04c23b42d03b9e0221edf87eb95a7db6449152dc293dd6144027a789480fee68abb5e5a401458e885
-EBUILD krita-5.2.6.ebuild 3811 BLAKE2B 7d40749aa140e4e7cd52f845318d0977bde984c3688541e084f53716e3da6459d401ab38271ae2130a5447aa17316d3e8a8768526c0153c2bea8378b88f46694 SHA512 ab474d0aae0e475a13d57fda5c2d0795b1cf480dfc8f63bd41c1461b292752867dba5e2efde5d73c91d43d181e26432b58efa8349d8064229079b412a336dd55
-MISC metadata.xml 832 BLAKE2B 53e632c3407b42c5d0f165bdcf67dfdd3a30bf1ec3c19ea79b90323ccbe5415e7cd34fbc79ebbb0e513359f28f381e3dac5d2534daf9ae7696f83ea77acb8130 SHA512 6cb02292d63602c80451759f6b935f65c9dfc2f01b32ac540d8cd4422ab2a70e04261fabc67b570c60e116f03e34d0165c8db6dcf9595db6cfa10849d8066336
+EBUILD krita-5.2.6.ebuild 3818 BLAKE2B a17dc30ba414794e9184a57acfc2b4eb8938a791b36ecb329c64d9a39b7b8849fafb77697a056550ba5031a30f35b2f2e58addf60eb499e956c8af01963712d2 SHA512 299919c2e51ed3db36cc631b1750e4e7ae6158725c8244028706f9a64423689d4eac35277c6c5fdf2dedac245984e4181e10028af399a4b5f1bdb4abada42697
+MISC metadata.xml 731 BLAKE2B 0acb0a6a6b5fe482c0fdc0a8d2eef10d41ea5f2d270b9880d87cc8159ccfe27b3d9e9ff75babdd4219ea9af8b76248cc591f621d94cac54bc0312e37493ac746 SHA512 c8627e7739acb6e8b030812fc25907cedc29a62e3a66bc7cd3087c3d7684e089a73f673235af9f5cd77ded4b4a8f438206b156fbd4ddb73fc4a1ce1640e26f70
diff --git a/media-gfx/krita/files/krita-4.3.1-tests-optional.patch b/media-gfx/krita/files/krita-4.3.1-tests-optional.patch
deleted file mode 100644
index 37f2ac50ffda..000000000000
--- a/media-gfx/krita/files/krita-4.3.1-tests-optional.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From 2e9369281d44a2701ac7364568d381cca0d92ec5 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Sun, 12 Jul 2020 18:55:31 +0200
-Subject: [PATCH] KritaAddBrokenUnitTest.cmake, MacroKritaAddBenchmark.cmake:
- Skip ecm_add_test early if Qt5::Test is not available
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- cmake/modules/KritaAddBrokenUnitTest.cmake | 4 ++++
- cmake/modules/MacroKritaAddBenchmark.cmake | 4 ++++
- 2 files changed, 8 insertions(+)
-
-diff --git a/cmake/modules/KritaAddBrokenUnitTest.cmake b/cmake/modules/KritaAddBrokenUnitTest.cmake
-index b7d0e8d852..901a0a1f99 100644
---- a/cmake/modules/KritaAddBrokenUnitTest.cmake
-+++ b/cmake/modules/KritaAddBrokenUnitTest.cmake
-@@ -23,6 +23,10 @@ function(KRITA_ADD_BROKEN_UNIT_TEST)
-     message(FATAL_ERROR "ecm_add_test() called with multiple source files but without setting \"TEST_NAME\"")
-   endif()
- 
-+  if(NOT TARGET Qt5::Test)
-+    return()
-+  endif()
-+
-   set(_testname ${ARG_NAME_PREFIX}${_targetname})
- 
-   # add test to the global list of disabled tests
-diff --git a/cmake/modules/MacroKritaAddBenchmark.cmake b/cmake/modules/MacroKritaAddBenchmark.cmake
-index c748d8e319..f804d9b8f4 100644
---- a/cmake/modules/MacroKritaAddBenchmark.cmake
-+++ b/cmake/modules/MacroKritaAddBenchmark.cmake
-@@ -23,6 +23,10 @@ macro (KRITA_ADD_BENCHMARK _test_NAME)
-         set(_nogui "NOGUI")
-     endif()
- 
-+    if(NOT TARGET Qt5::Test)
-+        return()
-+    endif()
-+
-     add_executable( ${_test_NAME} ${_srcList} )
-     ecm_mark_as_test(${_test_NAME})
- 
--- 
-2.27.0
-
-From 3c9fe10e25e94bdb1eb5e7b07ac2696635fdc5a3 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Wed, 17 Jun 2020 20:18:28 +0200
-Subject: [PATCH] Don't build tests when testing not requested
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
-
-diff --git a/libs/flake/CMakeLists.txt b/libs/flake/CMakeLists.txt
-index cbdac265d2..1a50c1620a 100644
---- a/libs/flake/CMakeLists.txt
-+++ b/libs/flake/CMakeLists.txt
-@@ -9,8 +9,10 @@ include_directories(
- )
- 
- add_subdirectory(styles)
--add_subdirectory(tests)
--add_subdirectory(resources/tests)
-+if(BUILD_TESTING)
-+    add_subdirectory(tests)
-+    add_subdirectory(resources/tests)
-+endif()
- 
- set(kritaflake_SRCS
-     KoGradientHelper.cpp
-diff --git a/libs/image/tiles3/CMakeLists.txt b/libs/image/tiles3/CMakeLists.txt
-index 88c0516360..01f2383ddb 100644
---- a/libs/image/tiles3/CMakeLists.txt
-+++ b/libs/image/tiles3/CMakeLists.txt
-@@ -1 +1,3 @@
--add_subdirectory(tests)
-+if(BUILD_TESTING)
-+    add_subdirectory(tests)
-+endif()
--- 
-2.27.0
diff --git a/media-gfx/krita/files/krita-5.1.5-libjxl-0.9.patch b/media-gfx/krita/files/krita-5.1.5-libjxl-0.9.patch
deleted file mode 100644
index a578f22c67f9..000000000000
--- a/media-gfx/krita/files/krita-5.1.5-libjxl-0.9.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From ace7edcca6ad322581ab39620f21ccf3ffbd3b5a Mon Sep 17 00:00:00 2001
-From: Timo Gurr <timo.gurr@gmail.com>
-Date: Fri, 5 Jan 2024 14:04:50 +0000
-Subject: [PATCH] Fix build with libjxl 0.9.0
-
-Fix build with libjxl 0.9.0
-
-BUG:478987
-
-Test Plan
----------
-
-* Upgrade to libjxl 0.9.0
-* Apply patch from MR and build krita (5.2.2)
-* Open/Display a sample image e.g. https://jpegxl.info/test-page/red-room.jxl
-
-Formalities Checklist
----------------------
-
-- [x] I confirmed this builds.
-- [x] I confirmed Krita ran and the relevant functions work (Could successfully open/display a sample image https://jpegxl.info/test-page/red-room.jxl).
-- [ ] I tested the relevant unit tests and can confirm they are not broken. (If not possible, don't hesitate to ask for help!)
-- [x] I made sure my commits build individually and have good descriptions as per [KDE guidelines](https://community.kde.org/Policies/Commit_Policy).
-- [x] I made sure my code conforms to the standards set in the HACKING file.
-- [x] I can confirm the code is licensed and attributed appropriately, and that unattributed code is mine, as per [KDE Licensing Policy](https://community.kde.org/Policies/Licensing_Policy).
-
-_**Reminder: the reviewer is responsible for merging the patch, this is to ensure at the least two people can build the patch. In case a patch breaks the build, both the author and the reviewer should be contacted to fix the build.**_
-_**If this is not possible, the commits shall be reverted, and a notification with the reasoning and any relevant logs shall be sent to the mailing list, kimageshop@kde.org.**_
----
- plugins/impex/jxl/JPEGXLImport.cpp | 15 ++++++++++++++-
- 1 file changed, 14 insertions(+), 1 deletion(-)
-
-diff --git a/plugins/impex/jxl/JPEGXLImport.cpp b/plugins/impex/jxl/JPEGXLImport.cpp
-index 573bae41247..f5b989b3b70 100644
---- a/plugins/impex/jxl/JPEGXLImport.cpp
-+++ b/plugins/impex/jxl/JPEGXLImport.cpp
-@@ -511,7 +511,9 @@ JPEGXLImport::convert(KisDocument *document, QIODevice *io, KisPropertiesConfigu
-             JxlColorEncoding colorEncoding{};
-             if (JXL_DEC_SUCCESS
-                 == JxlDecoderGetColorAsEncodedProfile(dec.get(),
-+#if JPEGXL_NUMERIC_VERSION < JPEGXL_COMPUTE_NUMERIC_VERSION(0, 9, 0)
-                                                       nullptr,
-+#endif
-                                                       JXL_COLOR_PROFILE_TARGET_DATA,
-                                                       &colorEncoding)) {
-                 const TransferCharacteristics transferFunction = [&]() {
-@@ -635,7 +637,12 @@ JPEGXLImport::convert(KisDocument *document, QIODevice *io, KisPropertiesConfigu
-                 size_t iccSize = 0;
-                 QByteArray iccProfile;
-                 if (JXL_DEC_SUCCESS
--                    != JxlDecoderGetICCProfileSize(dec.get(), nullptr, JXL_COLOR_PROFILE_TARGET_DATA, &iccSize)) {
-+                    != JxlDecoderGetICCProfileSize(dec.get(),
-+#if JPEGXL_NUMERIC_VERSION < JPEGXL_COMPUTE_NUMERIC_VERSION(0,9,0)
-+                                                   nullptr,
-+#endif
-+                                                   JXL_COLOR_PROFILE_TARGET_DATA,
-+                                                   &iccSize)) {
-                     errFile << "ICC profile size retrieval failed";
-                     document->setErrorMessage(i18nc("JPEG-XL errors", "Unable to read the image profile."));
-                     return ImportExportCodes::ErrorWhileReading;
-@@ -643,7 +650,9 @@ JPEGXLImport::convert(KisDocument *document, QIODevice *io, KisPropertiesConfigu
-                 iccProfile.resize(static_cast<int>(iccSize));
-                 if (JXL_DEC_SUCCESS
-                     != JxlDecoderGetColorAsICCProfile(dec.get(),
-+#if JPEGXL_NUMERIC_VERSION < JPEGXL_COMPUTE_NUMERIC_VERSION(0,9,0)
-                                                       nullptr,
-+#endif
-                                                       JXL_COLOR_PROFILE_TARGET_DATA,
-                                                       reinterpret_cast<uint8_t *>(iccProfile.data()),
-                                                       static_cast<size_t>(iccProfile.size()))) {
--- 
-GitLab
-
diff --git a/media-gfx/krita/files/krita-5.1.5-lto.patch b/media-gfx/krita/files/krita-5.1.5-lto.patch
deleted file mode 100644
index 0cccee5be00e..000000000000
--- a/media-gfx/krita/files/krita-5.1.5-lto.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 2c4dd042df1518d67c117ced08c5a2f3729c3193 Mon Sep 17 00:00:00 2001
-From: Dmitry Kazakov <dimula73@gmail.com>
-Date: Tue, 30 Jan 2024 15:30:53 +0100
-Subject: [PATCH] Possibly fix ODR violation in the transform tool strategies
-
-BUG:480520
-
-
-(cherry picked from commit e33c7d7d533d5289c3a37007f8cf574af5bc7102)
----
- plugins/tools/tool_transform2/kis_free_transform_strategy.cpp  | 2 ++
- .../tool_transform2/kis_perspective_transform_strategy.cpp     | 3 ++-
- 2 files changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/plugins/tools/tool_transform2/kis_free_transform_strategy.cpp b/plugins/tools/tool_transform2/kis_free_transform_strategy.cpp
-index 49486b6bd7c..8a63bce74e3 100644
---- a/plugins/tools/tool_transform2/kis_free_transform_strategy.cpp
-+++ b/plugins/tools/tool_transform2/kis_free_transform_strategy.cpp
-@@ -23,6 +23,7 @@
- #include "kis_algebra_2d.h"
- 
- 
-+namespace {
- enum StrokeFunction {
-     ROTATE = 0,
-     MOVE,
-@@ -41,6 +42,7 @@ enum StrokeFunction {
-     MOVECENTER,
-     PERSPECTIVE
- };
-+}
- 
- struct KisFreeTransformStrategy::Private
- {
-diff --git a/plugins/tools/tool_transform2/kis_perspective_transform_strategy.cpp b/plugins/tools/tool_transform2/kis_perspective_transform_strategy.cpp
-index ad1d9ffe4d3..bca5b51e13f 100644
---- a/plugins/tools/tool_transform2/kis_perspective_transform_strategy.cpp
-+++ b/plugins/tools/tool_transform2/kis_perspective_transform_strategy.cpp
-@@ -23,7 +23,7 @@
- #include "kis_transform_utils.h"
- #include "kis_free_transform_strategy_gsl_helpers.h"
- 
--
-+namespace {
- enum StrokeFunction {
-     DRAG_HANDLE = 0,
-     DRAG_X_VANISHING_POINT,
-@@ -43,6 +43,7 @@ enum HandleIndexes {
-     HANDLE_MIDDLE_RIGHT,
-     HANDLE_COUNT,
- };
-+}
- 
- struct KisPerspectiveTransformStrategy::Private
- {
--- 
-GitLab
-
diff --git a/media-gfx/krita/files/krita-5.1.5-ocio-2.3.0.patch b/media-gfx/krita/files/krita-5.1.5-ocio-2.3.0.patch
deleted file mode 100644
index 534e24469e8a..000000000000
--- a/media-gfx/krita/files/krita-5.1.5-ocio-2.3.0.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 48edd05f32241c537cedf2831efc5eb91a112291 Mon Sep 17 00:00:00 2001
-From: killy |0veufOrever <80536642@qq.com>
-Date: Tue, 19 Sep 2023 02:18:54 +0000
-Subject: [PATCH] Update OCIO to version 2.3.0
-
----
- 3rdparty/ext_ocio/CMakeLists.txt                    | 4 ++--
- plugins/dockers/lut/ocio_display_filter_vfx2021.cpp | 3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-From 21d384fe9fafde2f45f7339a2234f4022c53152f Mon Sep 17 00:00:00 2001
-From: killy |0veufOrever <80536642@qq.com>
-Date: Tue, 19 Sep 2023 03:17:17 +0000
-Subject: [PATCH] Dimensions are not required when the OCIO version is less
- than 2.3.0
-
----
- plugins/dockers/lut/ocio_display_filter_vfx2021.cpp | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
- 
-diff --git a/plugins/dockers/lut/ocio_display_filter_vfx2021.cpp b/plugins/dockers/lut/ocio_display_filter_vfx2021.cpp
---- a/plugins/dockers/lut/ocio_display_filter_vfx2021.cpp
-+++ b/plugins/dockers/lut/ocio_display_filter_vfx2021.cpp
-@@ -507,7 +507,13 @@
-         unsigned height = 0;
-         OCIO::GpuShaderDesc::TextureType channel = OCIO::GpuShaderDesc::TEXTURE_RGB_CHANNEL;
-         OCIO::Interpolation interpolation = OCIO::INTERP_LINEAR;
-+
-+#if OCIO_VERSION_HEX >= 0x2030000
-+        OCIO::GpuShaderCreator::TextureDimensions dimensions;
-+        shaderDesc->getTexture(idx, textureName, samplerName, width, height, channel, dimensions, interpolation);
-+#else
-         shaderDesc->getTexture(idx, textureName, samplerName, width, height, channel, interpolation);
-+#endif
- 
-         if (!textureName || !*textureName || !samplerName || !*samplerName || width == 0) {
-             errOpenGL << "The texture data is corrupted";
diff --git a/media-gfx/krita/krita-5.1.5.ebuild b/media-gfx/krita/krita-5.1.5.ebuild
deleted file mode 100644
index 9c80758f6367..000000000000
--- a/media-gfx/krita/krita-5.1.5.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_TEST="forceoptional"
-PYTHON_COMPAT=( python3_{10..12} )
-KFMIN=5.82.0
-QTMIN=5.15.5
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org python-single-r1
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz
-	https://dev.gentoo.org/~asturm/distfiles/${P}-exiv2-0.28.patch.xz"
-	KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
-fi
-
-DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!"
-HOMEPAGE="https://apps.kde.org/krita/ https://krita.org/en/"
-
-LICENSE="GPL-3"
-SLOT="5"
-IUSE="color-management fftw gif +gsl heif jpegxl +mypaint-brush-engine openexr pdf qtmedia +raw webp"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# bug 630508
-RESTRICT="test"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-libs/boost:=
-	dev-libs/quazip:0=[qt5(+)]
-	$(python_gen_cond_dep '
-		dev-python/pyqt5[declarative,gui,widgets,${PYTHON_USEDEP}]
-		dev-python/sip:=[${PYTHON_USEDEP}]
-	')
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5=[-gles2-only]
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	media-gfx/exiv2:=
-	media-libs/lcms
-	media-libs/libjpeg-turbo:=
-	media-libs/libpng:=
-	media-libs/tiff:=
-	sys-libs/zlib
-	virtual/opengl
-	x11-libs/libX11
-	x11-libs/libXi
-	color-management? ( >=media-libs/opencolorio-2.0.0 )
-	fftw? ( sci-libs/fftw:3.0= )
-	gif? ( media-libs/giflib )
-	gsl? ( sci-libs/gsl:= )
-	jpegxl? ( >=media-libs/libjxl-0.7.0_pre20220825:= )
-	heif? ( >=media-libs/libheif-1.11:=[x265] )
-	mypaint-brush-engine? ( media-libs/libmypaint:= )
-	openexr? ( media-libs/openexr:= )
-	pdf? ( app-text/poppler[qt5] )
-	qtmedia? ( >=dev-qt/qtmultimedia-${QTMIN}:5 )
-	raw? ( media-libs/libraw:= )
-	webp? ( >=media-libs/libwebp-1.2.0:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-cpp/eigen:3
-	dev-lang/perl
-	sys-devel/gettext
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.3.1-tests-optional.patch"
-	"${WORKDIR}/${P}-exiv2-0.28.patch" # bug 906472
-	"${FILESDIR}/${P}-ocio-2.3.0.patch" # bug 915107
-	"${FILESDIR}/${P}-sip-6.8.patch" # bug 919139
-	"${FILESDIR}/${P}-libjxl-0.9.patch" # bug 922524
-	"${FILESDIR}/${P}-lto.patch" # bug 922520
-)
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	ecm_pkg_setup
-}
-
-src_configure() {
-	# Prevent sandbox violation from FindPyQt5.py module
-	# See Gentoo-bug 655918
-	addpredict /dev/dri
-
-	local mycmakeargs=(
-		-DENABLE_UPDATERS=OFF
-		-DKRITA_ENABLE_PCH=OFF # big mess.
-		-DCMAKE_DISABLE_FIND_PACKAGE_KSeExpr=ON # not packaged
-		-DCMAKE_DISABLE_FIND_PACKAGE_xsimd=ON # not packaged
-		$(cmake_use_find_package color-management OpenColorIO)
-		$(cmake_use_find_package fftw FFTW3)
-		$(cmake_use_find_package gif GIF)
-		$(cmake_use_find_package gsl GSL)
-		$(cmake_use_find_package heif HEIF)
-		$(cmake_use_find_package jpegxl JPEGXL)
-		$(cmake_use_find_package mypaint-brush-engine LibMyPaint)
-		$(cmake_use_find_package openexr OpenEXR)
-		$(cmake_use_find_package pdf Poppler)
-		$(cmake_use_find_package qtmedia Qt5Multimedia)
-		$(cmake_use_find_package raw LibRaw)
-		$(cmake_use_find_package webp WebP)
-	)
-
-	ecm_src_configure
-}
diff --git a/media-gfx/krita/krita-5.2.6.ebuild b/media-gfx/krita/krita-5.2.6.ebuild
index 4cd6d39a876a..526f9814a518 100644
--- a/media-gfx/krita/krita-5.2.6.ebuild
+++ b/media-gfx/krita/krita-5.2.6.ebuild
@@ -11,7 +11,7 @@ inherit ecm kde.org python-single-r1
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 fi
 
 DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!"
diff --git a/media-gfx/krita/metadata.xml b/media-gfx/krita/metadata.xml
index c586507e3736..82ce837b7102 100644
--- a/media-gfx/krita/metadata.xml
+++ b/media-gfx/krita/metadata.xml
@@ -12,7 +12,6 @@
 		<flag name="color-management">Enable color management via <pkg>media-libs/opencolorio</pkg></flag>
 		<flag name="media">Enable sound support for animations via <pkg>media-libs/mlt</pkg></flag>
 		<flag name="mypaint-brush-engine">Enable MyPaint brush engine support <pkg>media-libs/libmypaint</pkg></flag>
-		<flag name="qtmedia">Enable sound support for animations via <pkg>dev-qt/qtmultimedia</pkg></flag>
 		<flag name="xsimd">Enable usage of SIMD instructions via <pkg>dev-cpp/xsimd</pkg></flag>
 	</use>
 </pkgmetadata>
diff --git a/media-gfx/netgen/Manifest b/media-gfx/netgen/Manifest
index 118589c4a8c2..0b2eb706d7fc 100644
--- a/media-gfx/netgen/Manifest
+++ b/media-gfx/netgen/Manifest
@@ -6,6 +6,7 @@ AUX netgen-6.2.2204-use-system-catch.patch 1521 BLAKE2B 34ee6fedced5381a1e2152fd
 AUX netgen-6.2.2204-use-system-spdlog.patch 1390 BLAKE2B 541725d179a0b3f9f9430f1268478adfdf378940b4503e962dd59071e8ac0dba60c5445d036d73103f6ec25017a1335f6eb7bfc38debb0ccff810229d5466890 SHA512 1519ce3628f2c5f17afea34bd4ebf102f2688c9440504f6828c611b749b0ae5b7d80b2b688c13769f6bd911faeb3d9d4f83e1ba663d8d5bdb2ef5bc2076f873c
 AUX netgen-6.2.2301-find-libjpeg-turbo-library.patch 1280 BLAKE2B 47cbb27914badd316078acbf57d0ec13da80ade19c6f20602dec1bb42d9b6929cd017ee9120c651dfffcfb2e9c925798a327bd07561823f50702536487343a06 SHA512 c0c774d47bc405357c09454c528391062cec9d2f4a39757409894407bca28a8bf2332bfa60bdba3f99948d5d8871833cc56123ba212e97862f6cc7d09dedb3a8
 AUX netgen-6.2.2301-fix-nullptr-deref-in-archive.patch 1012 BLAKE2B 2de4195438ce6dec88d1bc0d05f841bb959690b271cb1a40464ae81cc056e4520246c49533a2dc90ee88a29f450b9bf89a285342f9e8a08f0b9a44cee1933ec2 SHA512 3f28bce676c3db1d0dd05ff21716745dfc01b8d9f5cc6c278baed76f10514d283e78012f04fca956f71337f4a34287f949b06881a12cb84ae812a61bd1ff79ea
+AUX netgen-6.2.2302-opencascade-7.8.0.patch 3859 BLAKE2B 6a76eb5839aaa8e420dc4160fdaca2b2e6df7f7d7467026e5d86315403a875bbde2af2df87f0be34029c515659035e3ad434bbba68182bf9b994892e65873c8f SHA512 79edea3c079db0ae295d2692ebc07c6b5a9431697c424fbd57089a999f8882e76e06448ecc63a32c97f9c7317df16b86ad5830c0394ddb748f70c311b3f6824b
 DIST netgen-6.2.2302.tar.gz 3398683 BLAKE2B 7cf4626ee8163898864af0346cf2c4fa73dcca3ac2068d67f80b05ee926024b36552b33013c2ef8f74026ab942ae08c0628af0ce0c0dac2d004ba26e18bf4619 SHA512 da6e8e43d73af6b7bfae2e3c771d46e34601ff481c251924673f7330bae032a743fb9d5ff2792855e91ed5addb4d22fd4bf9cd7a9dcfb53f476e22a30f1eedb3
-EBUILD netgen-6.2.2302.ebuild 4089 BLAKE2B 1d663d3a6d22a2b2c6196719b26a61d300735a917bb7493a76779dcd183526650f3ed2739405439988642b2c41af9eadee169e1104c7cbb0efe0747a57895d4c SHA512 3a8f4dd92088288330d4f63390d04bc867724766d12798ee35e7caa7e8691d74619c5cabead75cf24ae07c8cfc0f26bc4ad30e2683420f7f36ba4833e9b4a68f
+EBUILD netgen-6.2.2302.ebuild 4143 BLAKE2B bf8b8af09769ba0b120d9ddf264ddc1994a84a02bbe8d19107e8eaf17a6c46b6d7070a38863d352f101bc6c2a9dabc6bb75b72bf925c9bc89017aea00e144642 SHA512 16197a671d6bec6da0cd144c270f3c0fceece515ce63bfa393faf6d11b9101f7752d5d09af36ba3b08bde41557b4a85fd7df8f53af9ad0a597fa3537d0e621e8
 MISC metadata.xml 649 BLAKE2B 01bb3d452a1f0002e2e5b8589c2ff83668b2135705599a3223fe37bc89287423f2bef8af15bd949e08c40e7e7ef304362fa8900b048f85b3ad95bcbbc1a7caed SHA512 072b3dc1049e26655316756255a96d34d2e2964296088d0768a8a6953703840d936aace4625b2a46bb36cc147c2814dfe537e01662294c3d5b02f397e5255d0b
diff --git a/media-gfx/netgen/files/netgen-6.2.2302-opencascade-7.8.0.patch b/media-gfx/netgen/files/netgen-6.2.2302-opencascade-7.8.0.patch
new file mode 100644
index 000000000000..0c5664edd6bb
--- /dev/null
+++ b/media-gfx/netgen/files/netgen-6.2.2302-opencascade-7.8.0.patch
@@ -0,0 +1,147 @@
+https://bugs.gentoo.org/930171
+https://github.com/NGSolve/netgen/issues/170
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -372,25 +372,20 @@ if (USE_OCC)
+       TKGeomAlgo
+       TKGeomBase
+       TKHLR
+-      TKIGES
+       TKLCAF
+       TKMath
+       TKMesh
+       TKOffset
+       TKPrim
+-      TKSTEP
+-      TKSTEP209
+-      TKSTEPAttr
+-      TKSTEPBase
+-      TKSTL
++      TKDESTL
+       TKService
+       TKShHealing
+       TKTopAlgo
+       TKV3d
+       TKVCAF
+       TKXCAF
+-      TKXDEIGES
+-      TKXDESTEP
++      TKDEIGES
++      TKDESTEP
+       TKXSBase
+       TKernel
+     )
+--- a/libsrc/occ/Partition_Loop3d.hxx
++++ b/libsrc/occ/Partition_Loop3d.hxx
+@@ -10,27 +10,16 @@
+ #ifndef _Partition_Loop3d_HeaderFile
+ #define _Partition_Loop3d_HeaderFile
+ 
+-#ifndef _TopTools_ListOfShape_HeaderFile
+-#include <TopTools_ListOfShape.hxx>
+-#endif
+-#ifndef _TopTools_IndexedDataMapOfShapeListOfShape_HeaderFile
+-#include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
+-#endif
+-#ifndef _Standard_Boolean_HeaderFile
++#include <Standard_Version.hxx>
+ #include <Standard_Boolean.hxx>
+-#endif
+-#ifndef _Standard_Real_HeaderFile
+ #include <Standard_Real.hxx>
+-#endif
+-#ifndef _Standard_Version_HeaderFile
+-#include <Standard_Version.hxx>
+-#endif
++#include <TopTools_ListOfShape.hxx>
++#include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
+ 
+-#if OCC_VERSION_HEX < 0x070000
++#if OCC_VERSION_HEX < 0x070000 || OCC_VERSION_HEX > 0x070799
+ #else
+    #include <TopTools_ShapeMapHasher.hxx>
+    #include <TopTools_OrientedShapeMapHasher.hxx>
+-   #include <TopTools_MapOfOrientedShape.hxx>
+ #endif
+ 
+ class TopoDS_Shape;
+@@ -38,6 +27,8 @@ class TopoDS_Shape;
+ #if OCC_VERSION_HEX < 0x070000
+    class TopTools_ListOfShape;
+    class TopTools_MapOfOrientedShape;
++#else
++#include <TopTools_MapOfOrientedShape.hxx>
+ #endif
+ 
+ class TopoDS_Edge;
+--- a/libsrc/occ/occ_edge.cpp
++++ b/libsrc/occ/occ_edge.cpp
+@@ -55,7 +55,11 @@ namespace netgen
+ 
+     size_t OCCEdge::GetHash() const
+     {
++#if OCC_VERSION_HEX < 0x070800
+       return edge.HashCode(std::numeric_limits<Standard_Integer>::max());
++#else
++      return std::hash<TopoDS_Shape>{}(edge); 
++#endif
+     }
+ 
+     void OCCEdge::ProjectPoint(Point<3>& p, EdgePointGeomInfo* gi) const
+--- a/libsrc/occ/occ_face.cpp
++++ b/libsrc/occ/occ_face.cpp
+@@ -32,7 +32,11 @@ namespace netgen
+ 
+     size_t OCCFace::GetHash() const
+     {
++#if OCC_VERSION_HEX < 0x070800
+       return face.HashCode(std::numeric_limits<Standard_Integer>::max());
++#else
++      return std::hash<TopoDS_Shape>{}(face); 
++#endif
+     }
+ 
+     Point<3> OCCFace::GetCenter() const
+--- a/libsrc/occ/occ_solid.hpp
++++ b/libsrc/occ/occ_solid.hpp
+@@ -16,8 +16,11 @@ namespace netgen
+         OCCSolid(TopoDS_Shape dshape)
+             : solid(TopoDS::Solid(dshape))
+         { }
+-
++#if OCC_VERSION_HEX < 0x070800
+         size_t GetHash() const override { return solid.HashCode(std::numeric_limits<Standard_Integer>::max()); }
++#else
++        size_t GetHash() const override { return std::hash<TopoDS_Solid>{}(solid); }
++#endif
+     };
+ }
+ 
+--- a/libsrc/occ/occ_vertex.cpp
++++ b/libsrc/occ/occ_vertex.cpp
+@@ -19,6 +19,10 @@ namespace netgen
+ 
+     size_t OCCVertex::GetHash() const
+     {
++#if OCC_VERSION_HEX < 0x070800
+       return vertex.HashCode(std::numeric_limits<Standard_Integer>::max());
++#else
++      return std::hash<TopoDS_Shape>{}(vertex); 
++#endif
+     }
+ }
+--- a/libsrc/occ/occgeom.cpp
++++ b/libsrc/occ/occgeom.cpp
+@@ -1625,8 +1625,12 @@
+ 
+     // enumerate shapes and archive only integers
+     auto my_hash = [](const TopoDS_Shape & key) {
++#if OCC_VERSION_HEX < 0x070800
+         auto occ_hash = key.HashCode(1<<31UL);
+         return std::hash<decltype(occ_hash)>()(occ_hash);
++#else
++        return std::hash<TopoDS_Shape>{}(key);
++#endif
+     };
+     TopTools_IndexedMapOfShape shape_map;
+     Array<TopoDS_Shape> shape_list;
diff --git a/media-gfx/netgen/netgen-6.2.2302.ebuild b/media-gfx/netgen/netgen-6.2.2302.ebuild
index 5a86024f6f64..5b3aa9d3d837 100644
--- a/media-gfx/netgen/netgen-6.2.2302.ebuild
+++ b/media-gfx/netgen/netgen-6.2.2302.ebuild
@@ -74,6 +74,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-6.2.2204-disable-python-tests.patch"
 	"${FILESDIR}/${PN}-6.2.2301-find-libjpeg-turbo-library.patch"
 	"${FILESDIR}/${PN}-6.2.2301-fix-nullptr-deref-in-archive.patch"
+	"${FILESDIR}/${PN}-6.2.2302-opencascade-7.8.0.patch"
 )
 
 pkg_setup() {
diff --git a/media-gfx/xloadimage/Manifest b/media-gfx/xloadimage/Manifest
index 68203a515b77..adcecd419643 100644
--- a/media-gfx/xloadimage/Manifest
+++ b/media-gfx/xloadimage/Manifest
@@ -13,5 +13,5 @@ DIST xloadimage-4.1-gentoo-r1.diff.bz2 41535 BLAKE2B 77cdbb2e6d5dda6084aae2831bc
 DIST xloadimage.4.1.tar.gz 596021 BLAKE2B 3c22facf05167d1836c21243799d8f66c211e44d659b4397668ed604cdd82b3bd8f11ab7b3be5e87c59a9b3aa8569d0d3d2e474b572c3bca07b6437b293014bf SHA512 2c91699c8ef07c101ff9b458708ace01cab2979a5e88cf8a4e47ec971f7b4cb5571108afa3e53271ade4e8ccfdcf72ef9e2e09edfc0be6b8afaba50847aa0586
 EBUILD xloadimage-4.1-r15.ebuild 2482 BLAKE2B da71736b8f2ba9eb0e539e0d0ecf72f23b1b6636d0ceadcae6711f2586e6f480214f565caabc348d32eb35eeaaa5f659746208549fdcf54de90032a0ee4f2c14 SHA512 be5ef8f4ca1934bded0a8f21fac46db5c3f00fb3c779ddd99f6fc0e6914602b8dd29ec37afa9283280ecfec2a23661c305944af4ccd0b6a4b29d98db156994dd
 EBUILD xloadimage-4.1-r16.ebuild 2545 BLAKE2B 32e8f96d2df57893d49c053355f5dd3999495de59807236ea8349cf569a9b2c7ec6d3b695431fbc4a14c2b7d3c862854a049400cda85dcda583df0c5fecfc4d6 SHA512 aa2ecb526c49f3f58c6d8b822668eeceb6846782ca7a9a927b49d3940f0e18d86c6d719139fb3ecff86ff2228df571b6e6c83faff9669a2f41ecf71cf0b676a5
-EBUILD xloadimage-4.1-r17.ebuild 2623 BLAKE2B 80deceacca02b1eebe2b0370fdc543ad29c0b1995c201643ed97b00646935e4aa6ecbd574957cf70fff4c84bb9a5e9fd897b657983ce196106a466bd888329a0 SHA512 6166fa2819dee9730a3a166d5afca29aaa51dcbbcd043df9991ed3a8ae786532301f6d09cc681d9c4d12f76e0272129e7593ce33e7e5df1102c92b8af31b8e6e
+EBUILD xloadimage-4.1-r17.ebuild 2622 BLAKE2B 23b6201ed616b1da79877ae805e08862eada4662466e16fa2c193a8dd726a5c677c0a41c3c65452996c178dc786371a6341e8bf485c505cdc2fbcf3dbae31a6d SHA512 cd9f8cd3a47353f368cf2636b77304aa6049e2477f87ba9d3c1f2c623a1b4a9aa6ae9f8681a5f3f72fb16831de214b5b8887f00765ee912545e1527f7ecc9448
 MISC metadata.xml 169 BLAKE2B 25149b73446be31f3ea3dd3a6394230987e7d4c601d1605fd3827b37bd99b3301c2e0edb95d0f59a4577ed27919f43c2cc02b1edf62c4012b935a82e709e0c05 SHA512 55c53f74b001bae56ba8c54581a4168335b6b3a28dac23a2102b76795d5fd41de33b8b3e1ec03f9acc6e7a3a77e93b1a6ff3e3967c3156dcbf22b5b5a6245ef5
diff --git a/media-gfx/xloadimage/xloadimage-4.1-r17.ebuild b/media-gfx/xloadimage/xloadimage-4.1-r17.ebuild
index b05245c5a4ff..2fb51b27538d 100644
--- a/media-gfx/xloadimage/xloadimage-4.1-r17.ebuild
+++ b/media-gfx/xloadimage/xloadimage-4.1-r17.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}"/${P/-/.}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="tiff jpeg png"
 
 RDEPEND="x11-libs/libX11
author	V3n3RiX <venerix@koprulu.sector>	2024-11-26 02:00:48 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2024-11-26 02:00:48 +0000
commit	403335d7014372971e9e9267493a808d08bab48e (patch)
tree	ffd28ddc69e6fe6543b018a00c9fad058bdda027 /media-gfx
parent	7f0b7329b3aa78ea82792fdf68ab48415fe4cc35 (diff)