gentoo auto-resync : 25:11:2024 - 03:02:44

15 files changed, 432 insertions, 13 deletions

diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 934a866068aa..fab6217bdc9a 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/freecad/Manifest b/media-gfx/freecad/Manifest
index 258089f48017..6e332537e505 100644
--- a/media-gfx/freecad/Manifest
+++ b/media-gfx/freecad/Manifest
@@ -1,8 +1,10 @@
 AUX freecad-0.21.0-0001-Gentoo-specific-disable-ccache-usage.patch 381 BLAKE2B 2fe05252a4e7846006c5f4e679eae5416ede589b9a6ad5fc30425933bedf933bf586b711c2c7d6a59c3881d454ea76ca39e0556a5a31c3769032694f0858e264 SHA512 731befc86267de4e5fa2caf619a8ae9692580d7025ebc26a80f6744a3104263622c38d87d0d8a263a1a15ef1c1d78c9ff3351aa463a9943941bd7d96d946e516
 AUX freecad-1.0.0-Gentoo-specific-don-t-check-vcs.patch 350 BLAKE2B e1b612ac81f73546a3a7ae93e447aba6e3f28dea1292f5d308f567307c8c6146b8dfdcc1cef946c64991d41c41fa9c8949f56e2e8573833bad2a3826bab960ba SHA512 f96678dbfe13668a9f65131996ddc5eb2cbe80296b7eb2cc7d248e3ee1d991bea95568b0241da8387106812aac5762c330afb1d8c38b2281c3ee2600db120627
+AUX freecad-1.0.0-r1-Gentoo-specific-don-t-check-vcs.patch 347 BLAKE2B 1c8119aec9408d77db8e09c34b86ba6a8da268509959ba5839b1ad0bb6c5b4023326055170836bf164d0d1e0a13a91ac601bde7eb6b184e4f9b1425e93ce9d38 SHA512 63bb73d0de1e12d3a34a2d055e3ddc2bdbdae5c1c67cd7c9a26047abfeda48943d793f30d190ae28f6f8e9ee7072f671badd4b8f3df29824b401bed0dbf90ed5
 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.ebuild 12031 BLAKE2B 7aab12b69ed67210a4d5815860c47ec832f9538d5ff2bedd30e837399cde1608798cf6b87ea7d079bb29d058f3f7d048f698dbb8717c21e3dd2f97f97d8ff0d3 SHA512 cdaa165c05a3cb2b680397f8a5518ff0bf47baf6ce731e56f8579b2494ed5b59d7852d59e2a251c178629e30513d1c39c8472cc3b7a2845ae8b15c3c16e2bc24
 EBUILD freecad-9999.ebuild 12031 BLAKE2B bd2de483e54d9272f1f87b87cd2cebdd5f242fd3ad9ecd25c8866784b790e69837d25d8d48d42d9d4b816756ec732381ab37f3afcfc89598489bbd382bd331da SHA512 b091460d1846451ec9642bda5d63f10f34341d1d89d491949f382db04091dd36c6e41e402c487e7ee5766ba35c2bbedcd43c6bd45035496b314c5ba97bec2501
-MISC metadata.xml 3255 BLAKE2B d9504bdcdbf11f8475f764ef03927314f2d57d69d1229cb5aab93872d28686d13ad6c8e5a680b49af9e63c7352d0fd2b93f798761d67b30bee2450e0fec052f9 SHA512 f030e226befb1a66723275cbff560d528915d0a749fe70a04ab73ba9016bcdc0127f4e3c9543a0f72bf0d59f624eda88d93a3968af112b20338b9d2c03903b34
+MISC metadata.xml 3656 BLAKE2B 81367f486e966237e6424cca386644bbef79fb7014de4d24234ee090b9d3e4947f95541f823330137aec57916c757f07996e568eded062eadeb44a3c47417761 SHA512 0e162aec1f90c333961670e5090e8bcb8cdbeaddbae49f7d91fb3cd811857939d53035b54b5f9554e80fd29bc653b4fe5df726187204c9f0e0c5c89b671008d8
diff --git a/media-gfx/freecad/files/freecad-1.0.0-r1-Gentoo-specific-don-t-check-vcs.patch b/media-gfx/freecad/files/freecad-1.0.0-r1-Gentoo-specific-don-t-check-vcs.patch
new file mode 100644
index 000000000000..d901e47e2ca0
--- /dev/null
+++ b/media-gfx/freecad/files/freecad-1.0.0-r1-Gentoo-specific-don-t-check-vcs.patch
@@ -0,0 +1,15 @@
+--- a/src/Tools/SubWCRev.py
++++ b/src/Tools/SubWCRev.py
+@@ -510,12 +510,6 @@ def main():
+             bindir = a

+ 

+     vcs = [

+-        GitControl(),

+-        DebianGitHub(),

+-        BazaarControl(),

+-        Subversion(),

+-        MercurialControl(),

+-        DebianChangelog(),

+         UnknownControl(),

+     ]

+     for i in vcs:

diff --git a/media-gfx/freecad/freecad-1.0.0-r1.ebuild b/media-gfx/freecad/freecad-1.0.0-r1.ebuild
new file mode 100644
index 000000000000..f063528215d1
--- /dev/null
+++ b/media-gfx/freecad/freecad-1.0.0-r1.ebuild
@@ -0,0 +1,346 @@
+# 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 qt5 +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 )
+	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 )"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	dev-cpp/gtest
+	dev-cpp/yaml-cpp
+	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]
+	)
+	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
+		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] )
+	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
+	test? ( qt5? ( dev-qt/qttest:5 ) )
+"
+BDEPEND="
+	dev-lang/swig
+	test? (
+		qt5? ( dev-qt/qttest:5 )
+		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 qt5; 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
+		)
+	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
+}
+
+# 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/metadata.xml b/media-gfx/freecad/metadata.xml
index 0787a07fc30c..5d5e1aeb6daa 100644
--- a/media-gfx/freecad/metadata.xml
+++ b/media-gfx/freecad/metadata.xml
@@ -14,6 +14,12 @@
 			Build the addon manager module for automatic handling of 3rd 
 			party addons
 		</flag>
+		<flag name="bim">
+			Build the BIM module and workbench
+		</flag>
+		<flag name="cam">
+			Build the CAM module and workbench
+		</flag>
 		<flag name="cloud">
 			Build the Cloud workbench, to access cloud providers (mostly
 			Amazon S3).
@@ -48,6 +54,9 @@
 		<flag name="material">
 			Build the material module and workbench to work with materials
 		</flag>
+		<flag name="mesh">
+			Build the mesh module and workbench
+		</flag>
 		<flag name="netgen">
 			Build support for the netgen mesher through <pkg>media-gfx/netgen</pkg>.
 		</flag>
@@ -72,6 +81,9 @@
 		<flag name="raytracing">
 			Build the raytracing module and workbench for raytracing and rendering
 		</flag>
+		<flag name="reverse">
+			Build the reverse engineering module and workbench
+		</flag>
 		<flag name="robot">
 			Build the robot module and workbench for studying robot movements
 		</flag>
@@ -79,7 +91,11 @@
 			Build the show module, a helper module for visibility automation
 		</flag>
 		<flag name="smesh">
-			Build the Salome SMESH module
+			Build Salome SMESH
+		</flag>
+		<flag name="spacenav">
+			Add support for space navigator devices through
+			<pkg>dev-libs/libspnav</pkg>
 		</flag>
 		<flag name="surface">
 			Build the surface module and workbench
diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest
index 0fcf106fb303..02aa72c96d2f 100644
--- a/media-gfx/hugin/Manifest
+++ b/media-gfx/hugin/Manifest
@@ -1,7 +1,7 @@
 AUX boost-1.85-932315.patch 1078 BLAKE2B 3a721b7350c843d3ff3757dd0f9e3d2e384ba11f053a7e6f4238b4db50046241781921593886b809240d38f3d5e0e913d39601b6ffaa53f29a56422c9ff3e3b9 SHA512 d8f2b17318f5223929e19f40e1a834a8ccb6b5e7f792b5762c81d2084ea62f06ef1b1bf2d38dbf5b5ad613db5ef195229a3b8401ea8e66773925070c1cd6b085
 DIST hugin-2023.0.0.tar.bz2 10336322 BLAKE2B 5c35f67160d76f961e812a309a0c50bb012beac74dc888ce716e8d0e3da35dbb053ab4e5d5d043b3d3fee9885f2fc1afa962a73e794cd4df920527456d477e89 SHA512 f950afec9020972baa20931d5001cd479a9169a4eec0d459d830612f40177eea6a25e059047054b8e9679017687e4c2db9fb27f755a3d0b749e5055e2ff0adc8
-DIST hugin-2024.0.0.tar.bz2 10351323 BLAKE2B 33a0dea04f42e5a1c67d71cfd04f5bc0437bbfddc2bf662e55d7921737cd90d2efce3511d7690cc80fc8bf484866590449f80861ac7db647ff851a7f1f965a50 SHA512 e5f85bb4c96fa9ab45a6b8e0c5800f06a54976b73037f6967838737fcd664bbfa90c1a9809adcbbac46a3149f26bcffe413fff747f24b9f6c42238d840b8203e
+DIST hugin-2024.0.1.tar.bz2 10352250 BLAKE2B 07b6ec632ad8525f58750a1894223102f354879e95c33cb4251d7aa237328a5180ffe6c7de0f3e23fc07dd8dd4f254cda7a9f452dc02b786bc867f15ca20b8f4 SHA512 4109f3be0b03d8b4205a79e0d76e18186278601d3e56f46271df1804db6f11f2e93fe1e1b68f2d7966c6d50ce58d4bf47e555e9cf8c34674315b2e89da36a722
 EBUILD hugin-2023.0.0-r1.ebuild 2193 BLAKE2B acc220e65485eba96191ed6459acda962b66eadb8010d543664fb151a0f56ada5fb8aab96584ab517405f8105b307813c60e0d82f7344a5b3d43b5de7acae201 SHA512 fd18cbc43f50dca29b9574ffa7d4d8dd5c513327269602810acafac34c4b1c48630d308c28538e6cfe73bbaff019c056cd2fc7ece1030e51a8f70ad1b46d9eaf
-EBUILD hugin-2024.0.0.ebuild 2134 BLAKE2B 33b332b0f868224ad410c5fee4c8197031772e56078e80c1764099c6fc9decdfaacf437fa41144a4b9bf8b229bd9b379caf8ccd6e678bce3e820f9bd34b82387 SHA512 62b0840aae7ea49d29314f47a90a37a774b01769ccc125c4764edd29bc75350fc17dc423fb94ed7717b85469381d171793ef7e4e4c42565e3d47669106b4cdcb
+EBUILD hugin-2024.0.1.ebuild 2097 BLAKE2B 390d84a418f5ee26aff8ca98f92a4548ec0f1de30877df5910b902e03df065f2076b05bf0053e0d8428a4d1472175432bd51a339de0417eeafe7a3e77502c6e8 SHA512 bbabcb13f70ef5d62317a87e699722baee36cb950312f8e25eb713c1c6abab87265dc218e57caa2a6c5cc91fae800921597e3ea4bcd8078c7de031a6b5e2b233
 EBUILD hugin-9999.ebuild 2041 BLAKE2B 68e51179017623a59c1c6dbbace836c6558c8f33fce09488b999965b2d02df3703767089a5c2fd2e7979135173982fb7af30e8570f8814219832a5e848d177c4 SHA512 40e3c43bafb40fcee31092197569a51ce5fa87b48e40a2ab676acc347ffdfec9bd818d3743fc7ee1c9bf2ee481018753f56659dce7c84527b9c71d86831b9a9d
 MISC metadata.xml 547 BLAKE2B ea55ca44dac1ccf74d4af96d42af1d4efac2f9823304b529b96aea364ec4a6f8430fd130f54c064766f0c34f9060ca076aa43de664e37177b41cc2deed0207bc SHA512 5012cb4a58bdc374f89d1a2e81e8321ff25f2de2f5682a2f8859137aa3339ce059e7823e26642f58b939e6c1d7f428356a4df5311fca1105320ebcb417129cba
diff --git a/media-gfx/hugin/hugin-2024.0.0.ebuild b/media-gfx/hugin/hugin-2024.0.1.ebuild
index d61fccfde529..54769a57eedb 100644
--- a/media-gfx/hugin/hugin-2024.0.0.ebuild
+++ b/media-gfx/hugin/hugin-2024.0.1.ebuild
@@ -12,8 +12,6 @@ DESCRIPTION="GUI for the creation & processing of panoramic images"
 HOMEPAGE="http://hugin.sf.net"
 SRC_URI="https://downloads.sourceforge.net/${PN}/${P/_/}.tar.bz2"
 
-S=${WORKDIR}/${PN}-$(ver_cut 1-2).0
-
 LICENSE="GPL-2+ BSD BSD-2 MIT wxWinLL-3 ZLIB FDL-1.2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~x86"
diff --git a/media-gfx/img2pdf/Manifest b/media-gfx/img2pdf/Manifest
index 3490f1d850b4..505dd4100d93 100644
--- a/media-gfx/img2pdf/Manifest
+++ b/media-gfx/img2pdf/Manifest
@@ -2,5 +2,5 @@ AUX img2pdf-0.4.4-Support-imagemagick-7.1.0-48.patch 4995 BLAKE2B 401e3b144f14e6
 DIST img2pdf-0.4.4.tar.gz 97796 BLAKE2B d04eae8c02490e4e73339dade92b2521ad410ed741ccc2987961543790589b14a5c8939cb9bbadcc795f5edcbb59a1a43bd522c75948f42dde1acffafb6266e0 SHA512 56943cd965b3e6b0680b7696ca4b5a2ba779474f945dd0d2648fb6f18ab18aab6d74640f9bd8e9c8683e3e641b0657cb84c691054910d84f0c9e8ad733f179e9
 DIST img2pdf-0.5.1.tar.gz 104241 BLAKE2B 1ea89107654c91cea8b5f074c05c7376452dd2ebd40dafaadedb39ac3ee383c3c02c1375b130da73339e1f87eb1a6ffbe0553cdedf6ec997bc0731d1d100327f SHA512 e17a920929f6ab08f501b205c38f9cf2fd5a6bd8d41ac4819a5d7463a3cfbeb5376cd5bbee36ab303248610f1d5c8a71a38ff85b14be564e2f39c6eb537ffcaf
 EBUILD img2pdf-0.4.4-r1.ebuild 1366 BLAKE2B 55a6766982ecd0465ced305811b7c81f90a2907ea97eaaaa5840f2c7fc364c381c87a8de3dd95ea31a0821c7936f34801f66841ac014fc29655ba2341a27cf6a SHA512 fb52707981b5bac760b08e170d6a0188a447f6a790281d6f0885cf1bd2b5fe366275167d85b05f704d0971b3c54e4d4bc9b3919ac0e84ca1fdbd359d803b1d7d
-EBUILD img2pdf-0.5.1.ebuild 1589 BLAKE2B f8d33bdce4413fec1d68978a95a2d536760b35dc55ed6de70c34e07e4bcecc4d8069b6458659eebc8fc5b3abbb9de8632b83c58a0a58f0d0133d6aea396468f0 SHA512 5579fb13cf2b1e8a5f9999cbad37fae70bab0dab543e6bec82029814c093303501ae08b97aa96b71ebfc316050432ca234df1372e311eada702aa98580c93b15
+EBUILD img2pdf-0.5.1.ebuild 1587 BLAKE2B e3e6f45df3de96d6d647cd2a0ccc6ca58730fda7ec29616d9d2bddd6f92a00596ae191fdabb1faf3c09d2bd6aa3d6eeecc68f3e79b2cc5c2487db6e3863e0450 SHA512 2504a4c7ce9bcb14d352ec172044c8d1676ec0635730f7222b7021eafb3828b28c90223dfa62a56df80f5a49cf02a4a2d477495347d78523209b503cabb33cff
 MISC metadata.xml 923 BLAKE2B fe0074db9549519b522f9d749388c5626b702dadba5a722444f652b203a60aea8e8ea5739c3c634076b42dddf24d17b4f449220de617224e59e5491893339901 SHA512 98fc799711e027afa40d2b9bf4558c38873d385920713f58d62782a986e72d1c9b04eb5591d4ec384bbf32376e2b03bf822bf5573015d003ff53ae0d4c7e6421
diff --git a/media-gfx/img2pdf/img2pdf-0.5.1.ebuild b/media-gfx/img2pdf/img2pdf-0.5.1.ebuild
index a6489af9714d..881c283cd7f9 100644
--- a/media-gfx/img2pdf/img2pdf-0.5.1.ebuild
+++ b/media-gfx/img2pdf/img2pdf-0.5.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 x86"
 IUSE="gui"
 
 BDEPEND="
diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest
index 1498a4e98858..fd2b93c00f02 100644
--- a/media-gfx/inkscape/Manifest
+++ b/media-gfx/inkscape/Manifest
@@ -9,6 +9,6 @@ AUX inkscape-1.4-poppler-24.11.0.patch 2860 BLAKE2B e22bdc2ba2b394e3a3b5dcaa4729
 DIST inkscape-1.3.2.tar.xz 44720944 BLAKE2B 24120f8c671e1fb54bb6626cab95e7086e3c60fbc117bbe8017d081c799bc26812b1286e670771e7ffe88720ba25f237146c452afaf65c1ee2ee554fb07f79a2 SHA512 a6da4b676ba3e7f954f95e3916ce78ce358b49c8052795a52d478064ef02eeae0337b0a94e89b9752ea6824a5758d28072c2bbf83f1e9ee28daebd3b0ef87343
 DIST inkscape-1.4.tar.xz 46321868 BLAKE2B 3f21402019995122f043f5ebd8f07e1c9548c507f27c494e4214e090c46acae016c21f950609c95cef2e1b0011693e6629326d733b257402391e2d919bcd0303 SHA512 3b81306b81416597073e7eda2a103112cee63493bcf96fa737bb1edfbd682ebb329e415bbbbfda877aef2a78dc376460040ebc5c0cc2c90c0fe60db5d7d12368
 EBUILD inkscape-1.3.2-r2.ebuild 5874 BLAKE2B a95355ae1c5bd7806e05314ae07f9a3b278897c03e217dffa0433ee51e7fb0e0a47f06ead4c2f1ba47ee2e8bce49f4b378d31e3de6e9b64cac96cd0c1304a0eb SHA512 229a75fd98d6be7c25443a87bdb14b792a89cf30df55158945db2f2d7c7e247e5ce39e351c41e11324fbd6d9a31f0d669985455367c870adb951b358a3c7b4a1
-EBUILD inkscape-1.4-r1.ebuild 5846 BLAKE2B 91e70fc748fe8be446144cb477d83265c3f607746bfd839b0c7c76fddfb85cbb8e6cc56e39498bf00a9d2b5bdcb0a378a9b48c39a60944572089c2811646e3be SHA512 9324e981e03ed9d95ba641a6e57136f0ae33e1464ace005b4b7c2c8cb497b3857df93e29c2debe5183871653b24d3f1816ae39434530167657e40ed439dab2ef
+EBUILD inkscape-1.4-r1.ebuild 5845 BLAKE2B 7227389452eebc26a00a51dbfdd64db5546231ff3968d3947fc42eb8ca61786898af0075d8f3b6f66acf9c8c92945e9bc6b1a4417b855d1ac8ee795dfe1f768d SHA512 4e5aa3332bad796f41b1d587844d17a01d59a36b0f7ae1c2dd24899a1b83e7c297565200fa00cee8d674176c7506b593acee1e1a384f849e9e017fdade9bf9b0
 EBUILD inkscape-9999.ebuild 5683 BLAKE2B 9cb6edc014ae7b2f98a7c919ffd5a71a79168e406f4b6a2eb399e59200f9d0aa13990696c7f63b4910546bb02fd2cbd9a317337dfc184151ad6c625a6b105a47 SHA512 9ed2fcf53d8403a81903ecc62c1be47d36d3f8e62a08e7f1956f50fba72c3f241d542f5bcff0d8f3bf323ed668268643331d89dd7b2d9dc8fc1b09ae57818e09
 MISC metadata.xml 982 BLAKE2B f44f534865614c8dd7bf71e92ce69cff708fc08e3eb701765bf93144b433ec52df52a506b69cc98969909c695015881b60592cccdf27613c6fe82812fc50727b SHA512 2963a9b473f139d06cefd1c3231ef148045c005adb4688850522c183f39ba15a36331b7eae7752e9bf15a26e6370f2af14ec02e59735f1753246c45821c0cdbc
diff --git a/media-gfx/inkscape/inkscape-1.4-r1.ebuild b/media-gfx/inkscape/inkscape-1.4-r1.ebuild
index 127905e9a0a9..b3ecdedf0a6f 100644
--- a/media-gfx/inkscape/inkscape-1.4-r1.ebuild
+++ b/media-gfx/inkscape/inkscape-1.4-r1.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} = 9999* ]]; then
 	EGIT_REPO_URI="https://gitlab.com/inkscape/inkscape.git"
 else
 	SRC_URI="https://media.inkscape.org/dl/resources/file/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
 fi
 
 S="${WORKDIR}/${MY_P}"
diff --git a/media-gfx/ueberzug/Manifest b/media-gfx/ueberzug/Manifest
index 5081ac56987d..2d404205de90 100644
--- a/media-gfx/ueberzug/Manifest
+++ b/media-gfx/ueberzug/Manifest
@@ -1,5 +1,7 @@
 DIST ueberzug-18.2.3.tar.gz 57640 BLAKE2B c174f39cb20a24c07f12088e595492960319a9fd5079e0a23e9632353fa7c93762621224a3fde4b2462931647239e3614ed9a1dffc635fea7a51c58d2b846b68 SHA512 6f8f342b4a593e857f70c053fc5b9e75bc2c3a063221ca64850acb8c325323bee50c9d471fe55de6bbb484d8c958d5bf3037e836b52734d617f1cea4be509a08
 DIST ueberzug-18.3.0.tar.gz 58280 BLAKE2B 2e91f55c39b6e9028ce95274c7e71c054fa623f2b61710a22bebec0b5a56ef719161f924b7af6741abc5c1f40d093daf24dfc562cacc4c2d639d9d0d53ed958c SHA512 ba039a46754a7120d65353c28e540e1f741a2930a7edf2d6f91b2df2d486f54fa44d141f788c17db5c83f876b7ecd1fca6aef56751e0c606fb9348b8c2580b8c
+DIST ueberzug-18.3.1.tar.gz 58290 BLAKE2B 879f4dd7898a569cf70200fb683d6220bd410b7738963527030e504c59ef9095a28c4380c695ae8034ac2cd1d841df044ad4cad34f72c3ad24b8ef32c9473f7e SHA512 194f94c69d61163edde4a09b9575efa18d82119636f1b89b062fde207b18c7d0aca3ed144b08194a81417f6fe5ae9069de58b824b31ad1f34ecb80c67b4d1fc1
 EBUILD ueberzug-18.2.3.ebuild 946 BLAKE2B 5395c59b7d17d3a590d280dc833b4ab92ff11d20cc9e54e1e9e849f09c6de85fecb7e1515b791074a90c1d165e69c58db57e416b68612d0c64064b901fe73a9e SHA512 392566cd4ff83d2baada2d7582196d2b5917ad8dd9e94d9068e01185ec8b86b13ed46fad7e9f1b2bc2215018d5294538695de6af1f4a71906ea1d7c3bd24d01a
 EBUILD ueberzug-18.3.0.ebuild 827 BLAKE2B f3bcec0532f1826ac42424ffa07257624b09b90b99e4cd9768dff83e9b5d1816a04b0e5f5232a2822261a9a2bd4a82fc3b7dbd391422bddd9ea009cb158678cf SHA512 4ab713154c8976150297cb445d3726febc989bd19e053b3baf01a76e772dea4999d99137f15f22f0e00d48efd2b44799f746ce69555db95b0d4ff276fd2791e7
+EBUILD ueberzug-18.3.1.ebuild 827 BLAKE2B f3bcec0532f1826ac42424ffa07257624b09b90b99e4cd9768dff83e9b5d1816a04b0e5f5232a2822261a9a2bd4a82fc3b7dbd391422bddd9ea009cb158678cf SHA512 4ab713154c8976150297cb445d3726febc989bd19e053b3baf01a76e772dea4999d99137f15f22f0e00d48efd2b44799f746ce69555db95b0d4ff276fd2791e7
 MISC metadata.xml 331 BLAKE2B 44d4e01eb445cdd5ecc879970295dccd3ba4c6d171d7e9cb41042200f5dc1ca01fc12b0c44c940d3e7045f5e44ad1ad4392125a62030bfd16edc3509a6689912 SHA512 b6ccd68127b77599f1008e595258583978523ebc200266eb234ec8732f914cc16d056fd84bec6feba5e455fade8ae7f963928e830c4a645c9b9a7c8b702eb4ac
diff --git a/media-gfx/ueberzug/ueberzug-18.3.1.ebuild b/media-gfx/ueberzug/ueberzug-18.3.1.ebuild
new file mode 100644
index 000000000000..6aba22f549c7
--- /dev/null
+++ b/media-gfx/ueberzug/ueberzug-18.3.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=meson-python
+PYTHON_COMPAT=( python3_{10..13} )
+inherit distutils-r1
+
+DESCRIPTION="Command line util to draw images on terminals by using child windows"
+HOMEPAGE="https://github.com/ueber-devel/ueberzug/"
+SRC_URI="
+	https://github.com/ueber-devel/ueberzug/archive/refs/tags/${PV}.tar.gz
+		-> ${P}.tar.gz
+"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+COMMON_DEPEND="
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXres
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	dev-python/attrs[${PYTHON_USEDEP}]
+	dev-python/docopt[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	!media-gfx/ueberzugpp
+"
+DEPEND="
+	${COMMON_DEPEND}
+	x11-base/xorg-proto
+"
+
+distutils_enable_tests import-check
diff --git a/media-gfx/xloadimage/Manifest b/media-gfx/xloadimage/Manifest
index 931582ec0a23..68203a515b77 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 2604 BLAKE2B cee0eea029eede7910ba2bff94208defb601474a44feeaed0718ce356bf2f5c847ca0e50b76e3f202f23f85f80b33096600916d63c8487a170dc6b6eaebe57a0 SHA512 b5828a9e96d94b9c982631852cb8edc8c7838e77438f9a0ba50fc7fd44394966ee146c3169587ff3217228817edbd4663361bee842466fcbe71e57f45adaba99
+EBUILD xloadimage-4.1-r17.ebuild 2623 BLAKE2B 80deceacca02b1eebe2b0370fdc543ad29c0b1995c201643ed97b00646935e4aa6ecbd574957cf70fff4c84bb9a5e9fd897b657983ce196106a466bd888329a0 SHA512 6166fa2819dee9730a3a166d5afca29aaa51dcbbcd043df9991ed3a8ae786532301f6d09cc681d9c4d12f76e0272129e7593ce33e7e5df1102c92b8af31b8e6e
 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 f730d9a7139b..b05245c5a4ff 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
@@ -24,7 +24,8 @@ RDEPEND="x11-libs/libX11
 	png? ( media-libs/libpng:= )
 	jpeg? ( media-libs/libjpeg-turbo:= )
 	!media-gfx/xli"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
 
 PATCHES=(
 	"${WORKDIR}"/${P}-gentoo-r1.diff