gentoo auto-resync : 21:12:2024 - 06:30:51

21 files changed, 325 insertions, 24 deletions

diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 41090aa77cca..a2371a5dca45 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/eog-plugins/Manifest b/media-gfx/eog-plugins/Manifest
index 61d2f6cdb77b..23ce9fd048f4 100644
--- a/media-gfx/eog-plugins/Manifest
+++ b/media-gfx/eog-plugins/Manifest
@@ -1,5 +1,5 @@
 DIST eog-plugins-44.0.tar.xz 134544 BLAKE2B db384d949f2a63cb0fcdf1bdfb8ed4c5c97af88d21079af5de7560b3c3bab231a6361ae459727a9b9f31b49e63f7cd227f465a1a7b8e2bc55e8d7a08f0335ed9 SHA512 2955830aa60a3518869ec1af7a9f0c455277b0a571cb14a5e5926b52b80ed0443e91f28e270feffcf26066e1e9b6080c9a457b55175051c20838c8b80e2da195
 DIST eog-plugins-44.1.tar.xz 136392 BLAKE2B b46a8f283798f83b43a82c53c29b98182e7069cf4f5771ba1b5e888c285ddc10dd98fd81eeb8e4350ddf4b8fb0a0c4158673bcf920810e72dc8895ee61835014 SHA512 63fee6b9f1809a7c435ff27649805746d98b3e25c5a8fe2dd0146f7748d33b140c7f5b64598ff0bea427a55bb39d990c5ca19e975cf6bb8ec234f46937b50f29
 EBUILD eog-plugins-44.0-r2.ebuild 1732 BLAKE2B f4f53e38b582786e1b34f0d7c7d8aa4c2e75faa7ac119787533ca083b318b6930e66a28134b6ddc97c3bc0ac1ad7a287768133e5e459e0f80720c4126315dcc3 SHA512 8b42bab9a43fb050b9e086800caa29676478fe39c00e9b2f9c81806937d7c886ea82ab94ff8b9ed341359579f34bc6bd437817c75307f8771ad31ac33bf710b0
-EBUILD eog-plugins-44.1.ebuild 1687 BLAKE2B e6145c71bb1ebef03303204487b672c5352cdd71a1c8af412b2ebb624a271524b2197b96084b9f748f210bcfc5cc242e90d90e20c8b42788a1bb5cf99f4427b8 SHA512 1e68dbb7fe49c72241bf6408d32030ca588f908abc841853f74774879d8b73a0e29ab9521609e913cb3cadf48af22a1b59606fee3d3282f42440d9fe438322b5
+EBUILD eog-plugins-44.1.ebuild 1685 BLAKE2B a8cc16c0f2bae6900fcd387780c0c7bf24c778441c4702564bf815f367e7c97b4c335a1101d6c642b8d026ebbf087134b497eea9fddbf5560731a3c533d1c2da SHA512 d90a4adb3fa778ac26322a4f26a0b30bda903eda407ec845054ac5322a650fb3424e68c747c2618707211f64f4e33f1f06eae4079b9b20ed0148da6552c8bf2f
 MISC metadata.xml 463 BLAKE2B 5ac26843df7d902ad1f64f5e9815b9d31437ed02c1a97ef9c33b6abaaa653b833977bd191d7e12d0fd6aaa1a0a95a01d39402417c241a5e7ccc8a8fbe159430b SHA512 bd40d362b9017a8546cff63bb144707a8b275337f72ea45977381aa9db81361e2eb114a66ca02b8b0dbbb82f1bd1ee2e7eafd25cd309e1c79b575e0bee500694
diff --git a/media-gfx/eog-plugins/eog-plugins-44.1.ebuild b/media-gfx/eog-plugins/eog-plugins-44.1.ebuild
index ac59330849d4..534a54e42420 100644
--- a/media-gfx/eog-plugins/eog-plugins-44.1.ebuild
+++ b/media-gfx/eog-plugins/eog-plugins-44.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/eog-plugins"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE="+exif map +python test"
 RESTRICT="!test? ( test )"
diff --git a/media-gfx/eog/Manifest b/media-gfx/eog/Manifest
index 70f04dcd8bc6..b9202d1aca8c 100644
--- a/media-gfx/eog/Manifest
+++ b/media-gfx/eog/Manifest
@@ -1,5 +1,5 @@
 DIST eog-45.3.tar.xz 4656744 BLAKE2B ceebd9890da926ec7caea916ce2e4483fb398f1b5270f0a210bfc97fb844669ca8416a10cc020f145f8e0b1d2e5e2fd85dcaa4d948312e42b40c0850d657f988 SHA512 21693d659a5eb25bdec968266d7e6a1a6988bcec0bf5c3d914b098001ed4a8e64d7ff628181072fb1aabec1b89b56ed5e7c85e3b06ec79be1c9d7cf1c57d3145
 DIST eog-45.4.tar.xz 4657420 BLAKE2B 422e9d9cfffe81fdd3af4948f371c11fcd6a2fba50df78469267747314cdcc840763a7057566c5e43c6eee9a0175e9dfaa1916736cfbef6d879076b9f2c11fcc SHA512 eb49d9c78b6e3d66eb20a714c2ebf5aad5c5547c2ca86e5c51e4b7f3c4c3bae5c4c356cec4c5815cc11d91c38ace58c00ea25c406de8cd9bf39a0ec65188baf8
 EBUILD eog-45.3.ebuild 1746 BLAKE2B 6e7aa0579e4a1b5af66cad95f4ba62cdf26e7934339b8f7f68605246a174dd0f1fbe178f240ca55f22028c4dfa33ab1a23eebc227a25b10a18566e4c36a8e60e SHA512 cf7c3e6c6c368738c3d31f4930301fd761af7b8af360fbac1a4addd7970245b74aa73e08e56791482ee6af7f5c223f4d4c2a636866f1e6e989d2d56b94e43dca
-EBUILD eog-45.4.ebuild 1710 BLAKE2B fa5ecfef1a9e3bde23541de405423b56061331a4a0af1090a8f6cc2e8ba50578d6e7773a3658242af9965397b9116c3f248ed4e613c5df987f2d391db7666ebc SHA512 26e3da4650886f76e3d989f0d03efefed55720d629eeb4f2889381a8709e9c7473c90d073528324ae758800ee47e8d03e7cf10d8297f5def705ae6999914cf98
+EBUILD eog-45.4.ebuild 1707 BLAKE2B aa11762ae3696df2b0008d7057e356a4cea715e21626493a6e26b374a0a364790ab92a3021bb1d3379cc66798f597c25834e8e77e2305925f983f067619440d5 SHA512 7ab0ecbf40b1931d015d7b60e13a887c24316c5ad3bdc204789782364923d5704d44e1e0201961fe3c6007b33f5e97c46ea0316187107c737ac175531966e999
 MISC metadata.xml 580 BLAKE2B 7d6bf08b37ed06abb82e92621725ab2cbc9d0b28e5c50cd9dd25e449e98212da4911da450d5e80f6d2efd3cb65981b2726e69f48ae54fc7a0dd4363c896b9086 SHA512 3ae60a59ef2e07fd78b836eb828c0b9e37e49ea6115c52215b86dafff9cb6990567659a31cfb1e06e58890cf598c98065df1e473dc7994fef0ae950081c27a54
diff --git a/media-gfx/eog/eog-45.4.ebuild b/media-gfx/eog/eog-45.4.ebuild
index 827642bb01f7..37c9ad56a731 100644
--- a/media-gfx/eog/eog-45.4.ebuild
+++ b/media-gfx/eog/eog-45.4.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/eog"
 LICENSE="GPL-2+"
 SLOT="1"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
 
 IUSE="+exif gtk-doc +introspection +jpeg lcms +svg xmp tiff"
 REQUIRED_USE="
diff --git a/media-gfx/freecad/Manifest b/media-gfx/freecad/Manifest
index fa862159cc28..4cacccee8f44 100644
--- a/media-gfx/freecad/Manifest
+++ b/media-gfx/freecad/Manifest
@@ -4,6 +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 322 BLAKE2B 431b69d749c5639d2407207632ab48f1af36319290c1016985ed2431fe7a5314a5df8373a0a5235fcd08de5762dd090dd89b73846703348d5e2e0fac7c9c7048 SHA512 f67b3bfa013a497d0372649d9339665dd5c48b2dd00814e55ee6fcad6580a8219139f6c1931f2da5e210d181205af55e19b91a4d08b4d0dc7d45fcef358eb0ed
 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 8776 BLAKE2B 6af3f807f99da332f50cf70c3854a5ae7c0f24a87d1e241670a9026521973ab662582dd37fe9586954fa7cc58e47e2cdadf5748eeeaa9e0b1925b8a8ce8d7267 SHA512 ddffd3f5ae196f69f4f437873ac5b0be44f442939390b954bf209b7545410da9833ea3f3e47d92d61c3adbaee18efb7a5802891828b1c1dc53f0425d3fea48ad
-EBUILD freecad-9999.ebuild 8689 BLAKE2B e796cbc17a48eccf792ccd336f1ac650dbb46d43dfb5f2bd431db87802120cbdb3752c99d89b01d4bf289e13d37c5392ed942e3c3bad46626eae9322a9a47e88 SHA512 41514c4c7e4cb4601f1eccb52658db6bc2ac7f24601c97f677c7f1ca8ba18901fe195d32a0864d8f276b90f6e20589ca09b85951110fe0ccee8cb4a867310f0f
+EBUILD freecad-1.0.0-r1.ebuild 8790 BLAKE2B c54aefe3eab6b32bb372b0ef40a821e7bb37534fd8b97654d91d2939ea87c5c47242333ffd06532208dea981438ec9795a96c7b63a27162d2601a18a56c0cbf1 SHA512 e7b8918fe4c37a875761da72c49b5235b44ab1e04468a9b929ae1e6cafc3876793d6bf222c80f7e89b750b470ca6e56367293108e5da532be6f22cce77be0a7a
+EBUILD freecad-1.0.0-r2.ebuild 8779 BLAKE2B 5c45f071879b51f5d750737b3882f7ee0744236f2c3c78b8975de0be53ef4a8f990d0f7e80c3c10db0c1ad45d6c9a07b873e92ddc9374a61d345b25c493dc507 SHA512 0d66b4121cd7d9bbc815c88d491646b04ce91e0023a36b90ad3a88ddab09256870dad6bb7a09777610a20d6d85ce4268ff4e9d5bd6bd54be1a958a880a041c16
+EBUILD freecad-9999.ebuild 8691 BLAKE2B a29795687e54446fa908ee5273b8723c5a4848ae29edda76d4466a1fc9a2b50503c95beaac6a15a14ee43fd1b28be8e1ba9e0aa5b76532667e3d318e59a1c45f SHA512 fb0232a5992141eac4ef96507af2bb31ff30db2f1ef877ffd11e44598de85ebcd0ca8af629c592d3224d75cc6be5caa4b4cc89281527be4a8f381dcf46b46213
 MISC metadata.xml 2907 BLAKE2B caf71b22b1a242778cd62fef19796e442500ec16850d38e07c1773f773b4d8ca3a063ccb13aa044ae6c4efc3e3c9ee8ba5b03465ccc4b9758c8f08e75675f8e4 SHA512 9d336ec1b1f307ca510b470ba362144ad8ca579de2968483661b7d8868a0dd0f6cd18090dbdf1d0f7c98a746e39f43f2e25422c1dfec4d995c572ac6083272ea
diff --git a/media-gfx/freecad/freecad-1.0.0-r1.ebuild b/media-gfx/freecad/freecad-1.0.0-r1.ebuild
index 7c3e04d2865c..5e1a1fb2945b 100644
--- a/media-gfx/freecad/freecad-1.0.0-r1.ebuild
+++ b/media-gfx/freecad/freecad-1.0.0-r1.ebuild
@@ -82,8 +82,8 @@ RDEPEND="
 		$(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}]
+			<dev-python/pyside6-6.8.0:=[designer,gui,svg,${PYTHON_USEDEP}]
+			<dev-python/shiboken6-6.8.0:=[${PYTHON_USEDEP}]
 		' )
 		virtual/glu
 		virtual/opengl
diff --git a/media-gfx/freecad/freecad-1.0.0-r2.ebuild b/media-gfx/freecad/freecad-1.0.0-r2.ebuild
new file mode 100644
index 000000000000..99df349496ff
--- /dev/null
+++ b/media-gfx/freecad/freecad-1.0.0-r2.ebuild
@@ -0,0 +1,303 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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"
+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 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"
+
+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 )"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	dev-cpp/gtest
+	dev-cpp/yaml-cpp
+	dev-libs/boost:=
+	dev-libs/libfmt:=
+	dev-libs/xerces-c[icu]
+	dev-qt/qtbase:6[concurrent,network,xml]
+	media-libs/freetype
+	sci-libs/opencascade:=[json]
+	sys-libs/zlib
+	$(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? (
+		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:=[uitools(-),gui,svg,${PYTHON_USEDEP}]
+			dev-python/shiboken6:=[${PYTHON_USEDEP}]
+		' )
+		virtual/glu
+		virtual/opengl
+		spacenav? ( dev-libs/libspnav[X?] )
+	)
+	netgen? ( media-gfx/netgen[opencascade] )
+	openscad? ( $(python_gen_cond_dep 'dev-python/ply[${PYTHON_USEDEP}]') )
+	pcl? ( sci-libs/pcl:= )
+	smesh? (
+		sci-libs/hdf5:=[zlib]
+		>=sci-libs/med-4.0.0-r1
+		sci-libs/vtk:=
+	)
+"
+DEPEND="${RDEPEND}
+	>=dev-cpp/eigen-3.3.1:3
+	dev-cpp/ms-gsl
+"
+BDEPEND="
+	dev-lang/swig
+	test? ( dev-cpp/gtest )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.0.0-r1-Gentoo-specific-don-t-check-vcs.patch
+	"${FILESDIR}"/${PN}-0.21.0-0001-Gentoo-specific-disable-ccache-usage.patch
+	"${FILESDIR}"/${PN}-9999-tests-src-Qt-only-build-test-for-BUILD_GUI-ON.patch
+)
+
+DOCS=( CODE_OF_CONDUCT.md README.md )
+
+CHECKREQS_DISK_BUILD="2G"
+
+pkg_setup() {
+	check-reqs_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# Fix desktop file
+	sed -e 's/Exec=FreeCAD/Exec=freecad/' -i src/XDGData/org.freecad.FreeCAD.desktop || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	# -Werror=odr, -Werror=lto-type-mismatch
+	# https://bugs.gentoo.org/875221
+	# https://github.com/FreeCAD/FreeCAD/issues/13173
+	filter-lto
+
+	# Fix building tests
+	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_ASSEMBLY=OFF					# Requires OndselSolver
+		-DBUILD_BIM=$(usex bim)
+		-DBUILD_CAM=$(usex cam)
+		-DBUILD_CLOUD=$(usex cloud)
+		-DBUILD_DRAFT=ON
+		# see below for DRAWING
+		-DBUILD_FEM=$(usex fem)
+		-DBUILD_FEM_NETGEN=$(usex fem $(usex netgen))
+		-DBUILD_FLAT_MESH=$(usex mesh)			# a submodule of MeshPart
+		-DBUILD_HELP=ON
+		-DBUILD_IDF=$(usex idf)
+		-DBUILD_IMPORT=ON						# import module for various file formats
+		-DBUILD_INSPECTION=$(usex inspection)
+		-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=ON
+		-DBUILD_PLOT=ON
+		-DBUILD_POINTS=$(usex points)
+		-DBUILD_REVERSEENGINEERING=$(usex reverse)
+		-DBUILD_ROBOT=$(usex robot)
+		-DBUILD_SANDBOX=OFF
+		-DBUILD_SHOW=$(usex gui)
+		-DBUILD_SKETCHER=ON						# needed by draft workspace
+		-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 gui)
+		-DBUILD_WEB=ON							# needed by start workspace
+
+		-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_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
+
+		# 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 gui; then
+		mycmakeargs+=(
+			-DFREECAD_QT_MAJOR_VERSION=6
+			-DFREECAD_QT_VERSION=6
+			-DQT_DEFAULT_MAJOR_VERSION=6
+			-DQt6Core_MOC_EXECUTABLE="$(qt6_get_bindir)/moc"
+			-DQt6Core_RCC_EXECUTABLE="$(qt6_get_bindir)/rcc"
+			-DBUILD_QT5=OFF
+			# Drawing module unmaintained and not ported to qt6
+			-DBUILD_DRAWING=OFF
+		)
+	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 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() {
+	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() {
+	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"
+
+	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."
+
+	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.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() {
+	xdg_pkg_postrm
+}
diff --git a/media-gfx/freecad/freecad-9999.ebuild b/media-gfx/freecad/freecad-9999.ebuild
index 8bb35b34546c..62ffcbe957a1 100644
--- a/media-gfx/freecad/freecad-9999.ebuild
+++ b/media-gfx/freecad/freecad-9999.ebuild
@@ -80,7 +80,7 @@ RDEPEND="
 		$(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/pyside6:=[uitools(-),gui,svg,${PYTHON_USEDEP}]
 			dev-python/shiboken6:=[${PYTHON_USEDEP}]
 		' )
 		virtual/glu
diff --git a/media-gfx/gnome-font-viewer/Manifest b/media-gfx/gnome-font-viewer/Manifest
index 5e91c8a0eee2..84f2a105d4c3 100644
--- a/media-gfx/gnome-font-viewer/Manifest
+++ b/media-gfx/gnome-font-viewer/Manifest
@@ -2,5 +2,5 @@ AUX 45.0-window-Fix-function-callback-definition.patch 1912 BLAKE2B 634b4d0c2653
 DIST gnome-font-viewer-45.0.tar.xz 300420 BLAKE2B 3cc71c056a1254447a9b0c5e838a8950e0414293b9788373b1de90657e364b55784fcef7749abd4e75e29cc6246b081baab66135276744020695ef1e8952a03f SHA512 94289be78831dbc9be8d73348fd423379ebe691b08cf2547acd2648e0e7b1dafcd6c63ffa2c9ec033786b7b65912187c782bb279cc0fb6227d6ee74c1541701e
 DIST gnome-font-viewer-46.0.tar.xz 304092 BLAKE2B 4128c343d5f139ebae6f342b47ef98c39846ce25561411b0b7821be1f9e985aaea4e9a2fd354328b41972df2771db5383cdc68b21cd6a6987aac24596b2b1d1a SHA512 c97e109c16d59b22afa1b8c9736b99cf687284783691e624e331218d39a5ac509e53555416672bf8967ed8611ac25e7817766f8d5c66ca73cd2309b2405c2ebe
 EBUILD gnome-font-viewer-45.0.ebuild 793 BLAKE2B e2fd932de540e4c6a8770ee851a456a272840c090e7eed145fd48251d7c231bbc39183b6f810d5a65920bd5f288583e5e1791d56e7810f1780bbeb9dfa244177 SHA512 4ed4fd7f6855798a0c99d5ad558165ed723b072887913f9ad81635f86be38a7e57ecc4a15af0e6706a4f6e085e89239d1bda4ce242cd61ed49d4177f305a9dd9
-EBUILD gnome-font-viewer-46.0.ebuild 795 BLAKE2B 0f510f4c241a67801108eeb931a3fa3d00709e5ea0798b3ea6ead9a159a1f1ef732a57426909548a641d8a88f53ff5d7213200aa5bc9c862d86dd3fa07fc3cf2 SHA512 094d1b92efb4c75a14388c5b14dc176f5788d2e4f4949cb508db2dbfc17330ade32c1a53f1ce1ace0a520563df8d5c77ef6afb90ff8f6dccefdd6dd8ee2bafae
+EBUILD gnome-font-viewer-46.0.ebuild 792 BLAKE2B aa6a5bcf12e91eb35c8483130b3b001d63451ec5084d5ba42b1d75a1f2bea20e466c02836d4d496ff31f82512cd72ce57bf13f66241096ca5a1e6fc4101ca22b SHA512 70260e86b29ad943913c6167fa98f3f00c4985869b0db8b43d02247c8e01ee32755af3e43fbb62298faca0170bd55988af23b292a2345c007d1fb01c9d8ba66e
 MISC metadata.xml 358 BLAKE2B 68c01b7096e0cddca8924d5f631ff0f3b94871244392aece19d0ca59f9bfda7c66199325fd31646c425af984118f728e54fa1ad3fcdc05149e146a5bb7de0667 SHA512 8870277e5cfae6a6c10e66359d45ef4ebde8027cf90f356096e7f78452a525fcb1e3d06f76769a1b8c875498faa79c75432e766edd495398f08d858c4d18bccf
diff --git a/media-gfx/gnome-font-viewer/gnome-font-viewer-46.0.ebuild b/media-gfx/gnome-font-viewer/gnome-font-viewer-46.0.ebuild
index 163cee416bb5..a92653f375f4 100644
--- a/media-gfx/gnome-font-viewer/gnome-font-viewer-46.0.ebuild
+++ b/media-gfx/gnome-font-viewer/gnome-font-viewer-46.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-font-viewer"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 
 DEPEND="
 	>=dev-libs/glib-2.56.0:2
diff --git a/media-gfx/gnome-photos/Manifest b/media-gfx/gnome-photos/Manifest
index 4bf1fdf33a8c..cb2a77850430 100644
--- a/media-gfx/gnome-photos/Manifest
+++ b/media-gfx/gnome-photos/Manifest
@@ -1,3 +1,3 @@
 DIST gnome-photos-44.0.tar.xz 2862604 BLAKE2B 0f6e2837c0beb4f4cef1ac79363c0b67b1ea1bb69e9d6fd81fb6a726067bf4c0106d16b3bfdee5b50ce786a1805bef74b2126b41046ec104a52cc476735633b8 SHA512 00ad3d431ffaaf245c3d5790b86fb3ec9d1c6ed8bc50bf4de872899a409d779bd964f6b63017182f797dd879655b2717f4b034cac029e0a3bc50c8df8fe3193b
-EBUILD gnome-photos-44.0.ebuild 2161 BLAKE2B 6cc076ba50fb8605483235cca78748c73a73155fe367c8ec5148aa801287871b035c4c1489fa246359860ae183a0a055e6bb056627a445cc79c2476d5812ef26 SHA512 11839481c8f7c9d939775e98fed103879fada471708479aae102fe7a8a5a651ed983a41d86dea7c5456d53e3267be4ea2c3aca5d1501f3bdd053e9b3908f0293
+EBUILD gnome-photos-44.0.ebuild 2160 BLAKE2B 0418a6415a1150830d932c85e6f44911ed2ed120760b07fa691cc9e284e8ec41c33359c69e012db77e970fa82ef2887d4c78c37e9045125c379b86b71daa9100 SHA512 172c7515b9dedc34244c3c0dd4dc990831fe4d062e945069f898f906ab6410c5ed6795e1a8aecc496e4799e35a75f0cb1e90cff56ca66adaa63a411aaa43638f
 MISC metadata.xml 1068 BLAKE2B 611c61f3ba39a6f4bd41e221a574d67fdec2f340a9f5fbd544f3a96b82e0966f2646cc9d6c5dab7fbd1d5e044cda46d639f3bf38f7d9c9cb84d981e28e2d9414 SHA512 d3eee2527fa2a21dbe63a7f13f2a5bcfbd1005aec972f6ff71f74ad08b25c80a75d1195ffea28d67b0dc48147c9b8c692ed4a8baabdb9219705fe2a78b6aeefd
diff --git a/media-gfx/gnome-photos/gnome-photos-44.0.ebuild b/media-gfx/gnome-photos/gnome-photos-44.0.ebuild
index 189d865b1d57..11827b30925a 100644
--- a/media-gfx/gnome-photos/gnome-photos-44.0.ebuild
+++ b/media-gfx/gnome-photos/gnome-photos-44.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Photos"
 
 LICENSE="GPL-3+ LGPL-2+ CC0-1.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="test upnp-av"
 RESTRICT="!test? ( test )"
 
diff --git a/media-gfx/gphoto2/Manifest b/media-gfx/gphoto2/Manifest
index 5bfb79fb321c..4f67c3b02d52 100644
--- a/media-gfx/gphoto2/Manifest
+++ b/media-gfx/gphoto2/Manifest
@@ -1,4 +1,4 @@
 AUX gphoto2-2.5.28-clang-16.patch 2438 BLAKE2B 6bb4bee0c5d0b0aa60ecb3ab5f33aef115173eae61a7933fb7c98ee77bf474ebf63b87e4e5c843b8737f26dc065c126a0ade25a3718960db8b6c37181ed189b7 SHA512 2c4c3fb4861b745e8fc106a2e98ba8737caacfab2ffd999e6ba8c22bebedc795cce47ed8069de9c109267daef9096b7904d5f1d9966fe3844664a3f9f34d4065
 DIST gphoto2-2.5.28.tar.xz 575816 BLAKE2B 4f919349d435cdb8e2cc4602ef57cee5e9ba5c7117e9d9e0dc0cec48f8820e8fb56204e7b4eb96105015c603fe83eaccd1ce8a240780a258fe7e56eef06f0665 SHA512 f5e23fd559b3a272441556323b9eadbce11e73bdcfe94ee027d58e51d5396ee6e2c12f0b7675d5017c140db329354de775ad619fcd6f19e3252659e0cbc4baa8
-EBUILD gphoto2-2.5.28-r1.ebuild 1114 BLAKE2B 2905ef27cd927d84a2ccdb98f6bafe4bf9dab90a302d501b9ee54100f9f5819dd2249a3497b753544bfe44833302062580000bc2ea4c781ad67f616f6a33bd69 SHA512 8a42a0f8bb3d5ab4ad7baefe3636770184872bae521f7b032a63d547ca8a7cedc4ae227227c87966083334cd6dfab00d38ade9f97f5be1de830f6543fbee3e49
+EBUILD gphoto2-2.5.28-r2.ebuild 1129 BLAKE2B 53d63196357727fcf48b838d5dbe432a27bcc6f747df042e87fff1b97056c8dc276d47b7ccb1e6277aa96610879b72b5a5ff469981b6f17cd9641ba4a9c818a9 SHA512 0b635b0bae5f5b6ffb6baabf877a1202d12e80eff9aa6ea4e78a513954e4c5c4c7b3b8fce447288dfb51783dbf1fbf8542228fefd75b5711f6ba5b05107ba012
 MISC metadata.xml 384 BLAKE2B 1577d799609489e1e29078aaa779e019b01622aed8322d23aea0b3203f620d123c3bb0b2e5a3696ba89422c52695882253524c2104b47456e2b2a66f782ea9c4 SHA512 96f5267ca8b7ca6a0b22a82c3b386a1094db45056ade223cc3c24e52ef6a37117e283c0bcf6eb89e6a2a47347916ffdcfd5bdffd9049fda1717f2fd044fff9b5
diff --git a/media-gfx/gphoto2/gphoto2-2.5.28-r1.ebuild b/media-gfx/gphoto2/gphoto2-2.5.28-r2.ebuild
index 634fbfe666c8..aa47c54d4afb 100644
--- a/media-gfx/gphoto2/gphoto2-2.5.28-r1.ebuild
+++ b/media-gfx/gphoto2/gphoto2-2.5.28-r2.ebuild
@@ -23,7 +23,7 @@ RDEPEND="
 		media-libs/aalib
 		media-libs/libjpeg-turbo
 	)
-	ncurses? ( dev-libs/cdk:= )
+	ncurses? ( >=dev-libs/cdk-5.0.20240331:= )
 	readline? ( sys-libs/readline:= )
 "
 DEPEND="${RDEPEND}"
diff --git a/media-gfx/hydrus/Manifest b/media-gfx/hydrus/Manifest
index 840fa94b7482..6a9a0a3d7677 100644
--- a/media-gfx/hydrus/Manifest
+++ b/media-gfx/hydrus/Manifest
@@ -5,7 +5,7 @@ DIST hydrus-3500-mpeg-error.patch 1632 BLAKE2B 9cc969a3a2d476ea606f3f280ecd6e4cc
 DIST hydrus-565.tar.gz 46360280 BLAKE2B 7a9492db917b7f7d10fd92c668dff2206111b5734a707ea86e8d3f5c95359126da31e3bd6fdcea64c621527f5a30e608fdf8cd36b7b7b70185a37c3cc7483180 SHA512 442dde4c9e557c162b8a5cc23f22472d8c48d7717513a192875b413a59000897c05b2b050c16ad480cdbb18548485f51b5e8651e44cb2057fc8e6eb1b99e8f26
 DIST hydrus-571.tar.gz 46371027 BLAKE2B b0ca6a4d7fddb79808340c03d6ba6291021af752be95144b8475a12450394f21e76c5fd80a2f6094f21d6f4af25db22f5f8d2eb79fd3494be609d6bdcdb455cb SHA512 3d6b6dec777332128858fcd62f52026fd7a4ab831f7cc0b3a3af76d52b6c6d1ff7b9687554aa5569988386e1eb0b33111172029e25f0acb9f36bb1cd70fcccbc
 DIST hydrus-test-fixes.patch 820 BLAKE2B 9d912868142cd3e7763241652e81172236094de6d0cf4df888d7203d34ed37b469c4829401a6e3bda945e3683db9f8e577ef21040cb5d57b0e6c01c2c619655b SHA512 a6a322a77638122fdd1f74ca57c23360aa8d58d97877e9517db9d185c11a8187e807b9478533a97a4654d58342b0541cc7eb89b83075bc4c38ceda0effe06ce0
-EBUILD hydrus-565-r1.ebuild 5015 BLAKE2B 99dfedb2b10ae3080546d81d648edd9fe316c4b0486212595b4b68bea675d554d0fbec95047142a12948872cf5f5e2622427fd4174c0570c06722af8f3a32ccc SHA512 5b73adce6aad768cd2e91549edef489c5dacb5f93b904ad63075ec8b5a1141bea2911d543df76967e0aefc456144a91b3e287abf10bab111fa4c44e3087be477
-EBUILD hydrus-571.ebuild 5015 BLAKE2B 99dfedb2b10ae3080546d81d648edd9fe316c4b0486212595b4b68bea675d554d0fbec95047142a12948872cf5f5e2622427fd4174c0570c06722af8f3a32ccc SHA512 5b73adce6aad768cd2e91549edef489c5dacb5f93b904ad63075ec8b5a1141bea2911d543df76967e0aefc456144a91b3e287abf10bab111fa4c44e3087be477
-EBUILD hydrus-9999.ebuild 4695 BLAKE2B d747e76a1deced97473aad3b003e836fcc24db306c2f828be42e8ae0acf56e2d4a4225ad6e96af4967c2b39ea2a086d79f8299f170f1c1bf518e28a0d6d1814d SHA512 ccce2d2b6a6795a4ed89c6b68f5f71019086ab79a882e0b470327591bad89bb991667f0d88357c9a7606e37ac5a28053ce922e9c4b0a38a52b85616fc25b668d
+EBUILD hydrus-565-r1.ebuild 4958 BLAKE2B 02b36710399350a2e99c2d3dc8cfbd0906dbdf12862e255197416432fa280b260e0967cf13d81e6e97a62650dddb9ade84c1755cf9627ed73504e2878ec3d475 SHA512 79dbc7a8bfbfb6e35994e60b2720bdff0a3602f064dd7166278b2b7c3e21c8d9f34ed8f1d2733b31f88bb2333db4e671d3f0823a7664b8ec1168fcd18c9a771e
+EBUILD hydrus-571.ebuild 4958 BLAKE2B 02b36710399350a2e99c2d3dc8cfbd0906dbdf12862e255197416432fa280b260e0967cf13d81e6e97a62650dddb9ade84c1755cf9627ed73504e2878ec3d475 SHA512 79dbc7a8bfbfb6e35994e60b2720bdff0a3602f064dd7166278b2b7c3e21c8d9f34ed8f1d2733b31f88bb2333db4e671d3f0823a7664b8ec1168fcd18c9a771e
+EBUILD hydrus-9999.ebuild 4636 BLAKE2B cec5ebee19c31573a101ac38a10162723f9465f891fdda5488d24464eedd7d5510f16a7d2a0d3befeb8b4f7fb3d692b0d2d8a88ac2fcd7e8512025e9d8a50bfb SHA512 32a71e29f73c66cf75fd7bb576c431e8c0aa18c463fa72537257180957798949c7aeec1ce3a23227ce8fb30f2cb997d68f2a68d5774f4a0d8b365ed08dd76dbb
 MISC metadata.xml 836 BLAKE2B 049faa70763ba176b6e4930abcdb5f4b4b87bd243759aba42dec32b9f2a199b3f2c33f0415ffdd1a392af3b461d939e633ec1f9333b0ff538f74d24306790fbe SHA512 0404c79e85e51eaba13fef930e695f168074e69734d3d8a604515f77196706bae9d36a2df9b3db0530c9f17b32881602509c7e22e7383c957a67e13c2a46e7bb
diff --git a/media-gfx/hydrus/hydrus-565-r1.ebuild b/media-gfx/hydrus/hydrus-565-r1.ebuild
index 75824275560f..350292414dcf 100644
--- a/media-gfx/hydrus/hydrus-565-r1.ebuild
+++ b/media-gfx/hydrus/hydrus-565-r1.ebuild
@@ -62,7 +62,6 @@ RDEPEND="
 		dev-python/twisted[${PYTHON_USEDEP}]
 
 		dev-python/qtpy[widgets,gui,svg,multimedia,${PYTHON_USEDEP}]
-		|| ( dev-python/qtpy[pyside2] dev-python/qtpy[pyqt6] )
 
 		media-libs/opencv[python,png,jpeg,${PYTHON_USEDEP}]
 		media-video/ffmpeg
diff --git a/media-gfx/hydrus/hydrus-571.ebuild b/media-gfx/hydrus/hydrus-571.ebuild
index 75824275560f..350292414dcf 100644
--- a/media-gfx/hydrus/hydrus-571.ebuild
+++ b/media-gfx/hydrus/hydrus-571.ebuild
@@ -62,7 +62,6 @@ RDEPEND="
 		dev-python/twisted[${PYTHON_USEDEP}]
 
 		dev-python/qtpy[widgets,gui,svg,multimedia,${PYTHON_USEDEP}]
-		|| ( dev-python/qtpy[pyside2] dev-python/qtpy[pyqt6] )
 
 		media-libs/opencv[python,png,jpeg,${PYTHON_USEDEP}]
 		media-video/ffmpeg
diff --git a/media-gfx/hydrus/hydrus-9999.ebuild b/media-gfx/hydrus/hydrus-9999.ebuild
index f63b7c6b7f36..2a870e24c78f 100644
--- a/media-gfx/hydrus/hydrus-9999.ebuild
+++ b/media-gfx/hydrus/hydrus-9999.ebuild
@@ -58,7 +58,6 @@ RDEPEND="
 		dev-python/twisted[${PYTHON_USEDEP}]
 
 		dev-python/qtpy[widgets,gui,svg,multimedia,${PYTHON_USEDEP}]
-		|| ( dev-python/qtpy[pyside2] dev-python/qtpy[pyside6] )
 
 		media-libs/opencv[python,png,jpeg,${PYTHON_USEDEP}]
 		media-video/ffmpeg
diff --git a/media-gfx/shotwell/Manifest b/media-gfx/shotwell/Manifest
index c82695054b4a..b21dd12dce45 100644
--- a/media-gfx/shotwell/Manifest
+++ b/media-gfx/shotwell/Manifest
@@ -1,7 +1,7 @@
 DIST shotwell-0.32.10.tar.xz 35339616 BLAKE2B b68c755605df75ce5edd82d042690fc09236996e030973331a2fc8ecbf078e6c2ffd48d46bfd0a74783cd7fc7ced035a7ba685c2fdf488394ead850b717a2ff5 SHA512 adb670417a698d53f5fd865b70cd394be2779d9ada4a1bbcc3c1af67cd7e39ca79a303beec447156bd902dc415ceaa14205544505489abc0027464ab01029304
 DIST shotwell-0.32.4.tar.xz 35335296 BLAKE2B 32be135643f165f32f315c332a4f0b34cd724285e7239eadbb250253b27ce97fb15d314f68a5392d88224a0b97f7f6ef8789c1f6c40051c26a25b9012e860b90 SHA512 516ab26d6620429175097886a1874d2eaf0513f6ef732bef5ee07ef8cd200028b34d98f4eb09b47a621f5313de42a5f415185d76853de478e0b5e0c4e89eea69
 DIST shotwell-0.32.9.tar.xz 35341312 BLAKE2B 81229b088c18b73e7039d8c1e644d0280988d888af798a8f8560a83ef24138772561609cbf9d502b07dfc1bb7f0acafe1b829af7a6213bbca623dd67f0893229 SHA512 9fc4027271c0d31660aa0579a3369ad25d87454efa5fb95a17a85e962232e0e35f28ab9e2fa63aef5aa9b89d895c7a97d3edffdd862bbaa5af29d1325a19a2d0
-EBUILD shotwell-0.32.10.ebuild 2210 BLAKE2B eac31a001b30ea632664b2c2ca4e772e44b772606bf482f9369e0debc7113a0d0ecfa4656338848aec6cb7be85884d849430f3fe96a5e492b7cac10128e029d2 SHA512 be63f94f8f3473812af5d47a5726737e850f2025ff7137f6539c36d5136717f9305debe0c926c1e2d5b36d761ed6d512fe442e671ceeeca7b6d309a7692f4ed1
+EBUILD shotwell-0.32.10.ebuild 2207 BLAKE2B 6d6b7d6b0eb01c4d16c38add90a1106d8c7ce916d25271f339f35d380f14189f333461c0856542d6322895618adff123941e91fb4f04b2e54ce2b15613912ace SHA512 7de4dd0c4bf22fac299cf34406bc266eebcea04d73dc77dbec7c187afda96cdca6f64030421cedf08c0d29c2e7e614bf8a20a57fe907b3ae6345328f52925708
 EBUILD shotwell-0.32.4.ebuild 2199 BLAKE2B 50ac5f6cd764cb515945ceb700230845bb200be64a7e7bb94f88847ae351238b1b0352b64b0886e92140471636987add46d3aeb81363ff541a0502884b7a2547 SHA512 86cff4865ca7f7305b58799049e085ea7a03ff93f0738fe33c98680d863c15e48df2425e550717905908659ec6a8e9d604d97c51bc58414def714dd9726a3fc2
 EBUILD shotwell-0.32.9.ebuild 2210 BLAKE2B eac31a001b30ea632664b2c2ca4e772e44b772606bf482f9369e0debc7113a0d0ecfa4656338848aec6cb7be85884d849430f3fe96a5e492b7cac10128e029d2 SHA512 be63f94f8f3473812af5d47a5726737e850f2025ff7137f6539c36d5136717f9305debe0c926c1e2d5b36d761ed6d512fe442e671ceeeca7b6d309a7692f4ed1
 MISC metadata.xml 794 BLAKE2B c1eb4a08828db11ba473fe21036201d3b57c2fa36a2bd39b18e7671cf5e4c42b2b9e82956456a0376a60bfc982d9af106577075d936dba3c0cb73947da46f427 SHA512 2c65cdf3c6d5a953b52ad81e0a85d1c1465f5c38c3475e5c1408baea0b14a053255e97c0efc560059c77c51dbe98b72a90c6164fe575e68cba3eb04d4774f490
diff --git a/media-gfx/shotwell/shotwell-0.32.10.ebuild b/media-gfx/shotwell/shotwell-0.32.10.ebuild
index 1cbc27d4c8ad..15bd03bcd4cb 100644
--- a/media-gfx/shotwell/shotwell-0.32.10.ebuild
+++ b/media-gfx/shotwell/shotwell-0.32.10.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/shotwell"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~sparc x86"
 IUSE="opencv udev"
 
 DEPEND="