476 files changed, 11531 insertions, 5976 deletions
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 82476601ee8d..b0e8ee8b78af 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/aaphoto/Manifest b/media-gfx/aaphoto/Manifest
index c2db38c31cae..2b34cff7305a 100644
--- a/media-gfx/aaphoto/Manifest
+++ b/media-gfx/aaphoto/Manifest
@@ -1,5 +1,5 @@
 DIST aaphoto-0.45_p20160710.tar.gz 134042 BLAKE2B f8723cce5412a61424f12ac9e4b543db7e5042532c1575c2e846e1d76951d752fd01e8f3e0f4f3a4f7887da75c1a9e8bc8755ad53a80c77bef92ac0a09f1bff8 SHA512 21b8c96a86e7eeaf63da883d14498249aa22741690d649155ebd50873b9d9c4cb1604ded2a3d4d2ab65fcf3b0377d622e0b3be73ba2537c69b5ae728a5948bb6
 DIST aaphoto_sources_0.45.tar.gz 134057 BLAKE2B 95a55a1f612a9e30967083ad5d59c6be0f815e2dfc55531660ae20eef9bfe7411aa2c852d0b016e04506ba4956b65674efe3797a66831c39a473ea49c8e8ecbe SHA512 203343a51a64a0422f4af2f80523bb7cb90aa04c10b64bd3aa3091460cf5de1bb86d677c564809813703a2c65f15736bc8d4e3c9273b3f3a72ca7c89f3311599
 EBUILD aaphoto-0.45-r1.ebuild 604 BLAKE2B 505c6e030d867ca37514d5cd1ec654e2cd46978980f0a4072d3aabe8a71d1770f9866ceea5059ce2948ee1178f564efc1714729321d5fa0ecc027dc13850d8e1 SHA512 8e2c63527b7ed050d60fdb2b78660b120352a1204c2c15869c7ac6f75d55a31b7f153e795f396cd252b53650119ceddcf26eee5a68622300b2a774f311ff780b
-EBUILD aaphoto-0.45_p20160710.ebuild 696 BLAKE2B 850a18489ad6980759825df36d41a06b00bef045fde78dff9c817a227867f2b4623443a9343ae71896ea461ae93adde9eb87512f1874cf949e41668a5baa8c33 SHA512 bb4a88ec7cd36b52eb71b0dc0509daf050e6c652e210f2b6cd25346a63a12783547ca4379e06cc5b012ce25ca888492f663c7cf816053c2106ad2f10c91a26c1
+EBUILD aaphoto-0.45_p20160710.ebuild 694 BLAKE2B c8a8a7329944dba68c429f1337a4dd572014798a8e9c939aed6c895544a91790383eb52506509370c09fe370d030500b71cb682ac6bfa5b15b37ffeebd3deb8b SHA512 2bd3462f10dffc2160efd930476f825e5d17ee9ec1464cdcc2b83d84f73cf6ed538fa8cbe5d6bc5621a7d10888066a34c05d2f0cdd3cf32b3f1f5bed39c0847b
 MISC metadata.xml 473 BLAKE2B d231a2ba08b16fb7575d72feba1e1cb54f2c19a2c202c8a3a2cde26df7522d6673e82da827cd74343b538313f0cf8eaeb8c44e211563e87c26b571b312a340cc SHA512 325a676ccad10f29bee60cf0c48eff8f64d9ecab5b048e91fd8c71bd5d4526334edd561e07d26001fb902447c37cccee44bf91536c01b0dede20130413e3be13
diff --git a/media-gfx/aaphoto/aaphoto-0.45_p20160710.ebuild b/media-gfx/aaphoto/aaphoto-0.45_p20160710.ebuild
index bd64d259240f..2ae4f8988e67 100644
--- a/media-gfx/aaphoto/aaphoto-0.45_p20160710.ebuild
+++ b/media-gfx/aaphoto/aaphoto-0.45_p20160710.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
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-${GIT_COMMIT}"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="
 	media-libs/libjpeg-turbo:=
diff --git a/media-gfx/aewan/Manifest b/media-gfx/aewan/Manifest
index 1265da783271..96eb59865287 100644
--- a/media-gfx/aewan/Manifest
+++ b/media-gfx/aewan/Manifest
@@ -3,6 +3,5 @@ AUX aewan-1.0.01-fix-incompatible-function-pointer-types.patch 1236 BLAKE2B 6222
 AUX aewan-1.0.01-fix-warnings.patch 1131 BLAKE2B a944dbfe8d1a2115ec51d00fa5570fcc4f7b639b7d22e26c1cfcd383e277b1b347a5c78cec8d26914c42c7df818332c4f32a83b08f59daad6cc59dd2af3f9990 SHA512 49cdc45e6d91f8d03b7039240de7ab908ec170acccb36972a50393c3906827a004e7ab5af60013a2aade7658912eb1661885a848711498deb9b1601016bc1b69
 AUX aewan-1.0.01-tinfo.patch 546 BLAKE2B 5b2ff040df207cc9b9810ea0e733d4e4113acba1473a68a4c01eb0dca15fe7125dc8bfafb36af56c20260d41060d4450127df9c27415babe94f1ff3cc29988e0 SHA512 226780e4176490798f82e8f8184c0d8a44df8958c793925bbd7ccc87a4640e8ea1a09f47a7bdb90f7b94ef6abdda55d8ec4ad2623da26c4ac6cab11838e93277
 DIST aewan-1.0.01.tar.gz 122880 BLAKE2B 396b7d6111e889ac30140b5bf7097c8d83b05c956a86fdf50651800371356862ab580e7afb1b68cc9f119339b68c786e81666cdd04f8cfc0bf02866dcaef9560 SHA512 8c7e81ed3e2c4d0848e36ed60922c920471c7bc46a7127f529be3f5a9c3c66a6e0dff06bca7b5cb21eb0a93d03ba31fd4ef07fc48e2e39f2224956801fe322f3
-EBUILD aewan-1.0.01-r1.ebuild 570 BLAKE2B 525e3753b1cfcf86a299c58003542aae4d11c7d8f8cd47ca4b59a52eae2b7e25e8a6d08bd856632b537b3e826a298830b2151c454f8e024a99b55009a0a9e950 SHA512 1d677e483ea3f8da690208c1ad2828d4a811c438109da2fd376c6c3c355364b5947db9510d6ddcb5811d1c1b50836aa55d93985cc5829b5d771c54ee3af06480
 EBUILD aewan-1.0.01-r2.ebuild 697 BLAKE2B f48fce89fc34417f936a99c525631066c3f7a83b25df033f667ba9c88b4f6151f51e596eb2f8669b094426d306e501640bbb820e18ebfd158f5812c519dff814 SHA512 075d88b983efb1f4abf9d60aa03de4c76605389a2a9187475b1491fd5e68d79e1f158a467e79535d85e36d0efeefa397e860a84a803a1555c30eed1f41ea9c60
 MISC metadata.xml 472 BLAKE2B 84df69cd7f2a501828a66fa5a66e8626ba1b6f7d3262b53fbda4ab8e392ec108aa3a7170f630571b28acbf3a6089c5f7e733923f13a1493340b81a2adac7ea59 SHA512 1ca859452592ed3f5d936ea418a99668eb7bdc84a8eeeebd4c644197368ecb36e0e9aa4fe0e2dbfa0c705b721213531bd89deb00e6a28b16b6e64f1f5be3c714
diff --git a/media-gfx/aewan/aewan-1.0.01-r1.ebuild b/media-gfx/aewan/aewan-1.0.01-r1.ebuild
deleted file mode 100644
index f0234388da34..000000000000
--- a/media-gfx/aewan/aewan-1.0.01-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="A curses-based editor for ASCII art"
-HOMEPAGE="https://aewan.sourceforge.net/"
-SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DOCS=( CHANGELOG README TODO )
-
-DEPEND="sys-libs/zlib
-	>=sys-libs/ncurses-5.0:0="
-
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	eapply \
-		"${FILESDIR}/${P}-debug_aewl-warnings.patch" \
-		"${FILESDIR}/${P}-tinfo.patch"
-	eautoreconf
-}
diff --git a/media-gfx/alembic/Manifest b/media-gfx/alembic/Manifest
index 4e4242cceb7d..42ed1dc3ddef 100644
--- a/media-gfx/alembic/Manifest
+++ b/media-gfx/alembic/Manifest
@@ -1,9 +1,6 @@
-AUX alembic-1.8.0-0001-set-correct-libdir.patch 1879 BLAKE2B 2cbcdfee02094745544ebc67e467e452d225a8a9445481f984eaadf399544bfac24a410d8a7f4137f4b73d038e7f5eaf08ea492aa7bb95f15fede87fef081eb6 SHA512 d1ec399048a6baebdbd4eadb5be55281693455d0280dd3ff86d8747d2aaf52eede4c6848d71362e17de2d23d063357ff983bb3a8ecad28e81303f72a76f48a02
 AUX alembic-1.8.5-set-correct-libdir.patch 1593 BLAKE2B 4dec05376ed35261049886e38c851ded8f033040e5fe822337ec7655132f0b24b007e6b48caf9fb01cfc3a874a4a60b0f54649e3505f70464c1847423c684176 SHA512 befd7956ab3effb70d76648c15795cf8ea40d51687dab3988968a519267bdf1df945d475f1cd7a32747d6a5fd6cf1cf63c8f0bbbc058e9da704ba26b6bac443a
-DIST alembic-1.8.4.tar.gz 867788 BLAKE2B b7bc5ebcaebc5905a9a2e45be21170a72923fd6af6d9f97b81bdc7e8b80bb037ed3f667ea15a5b96194b33687010fda455e4df8355f92fc29aa000beae32cae8 SHA512 2473f4b9afe3fddbd2d0477bdc85d93697e413410253a7f7f0f030fba919dfb63dabd2d2d13829f59f3f901643ab842d230a9f08fb667e2c16cef0e751a8a687
-DIST alembic-1.8.5.tar.gz 867976 BLAKE2B 715ff6212ab78b2b4d3f5ea3b448468ade488008a8362193b4976671a69ad89337f926082c7736e64a0b07bf71e04d774df5e22abe409f8cfab1a15ccb3c86bb SHA512 89a480970eb09893112bf650011ede852205d1fa3718680a3983392bbcf3eb3f22f4ec01f42d12bfcaf655ce43d7d6f583b764ec03f4c5a84023359502b3636e
+AUX alembic-1.8.6-py312.patch 3861 BLAKE2B 307786b786aeb8868103e7d1564305fa7fa7d082acc43e2886bfda17413c993b506ba77ed54f254b87ca5123945596d0be445f558279ec1ff9b7f6cc23ea835c SHA512 70078658fc4b70618e9e2c1c694b50726eec510e30e1625f01cd1dcfae2f649162b7b94c791b12068f064c68e1deea7ccabb00a31de7fd32cc052299035662b8
 DIST alembic-1.8.6.tar.gz 868945 BLAKE2B 1ac30ffa75a4b8bbb3f32820e6f67cebcd894465f16cd12ee0396c88611af821b13973f46228fd59726c6bc0cc8885afd4de81a0cebaa0f94cb30fd9daba9885 SHA512 6371b830242be90d4ea833248df5fd42d9e713e305d15eb1383d04410319acdae5743d48d65e8f75f1cedce777d2af7d969cde095f678b17322c19f1c69f477b
-EBUILD alembic-1.8.4.ebuild 1546 BLAKE2B a659e953e8e583f47fe7666bb07402711529a6bb73882b7adc774a23ebe0dcab37e2acebd91e6045edbdad20019eecb5a2d4cc45c5ef4f471a62df1e0c496313 SHA512 1d02598f85e6b27877c559bbf9f617857e49cf1775118226033f064c9ed2613e3403d776e26a5ef82858b4397f1f16cc2a5b1072c881e4d0793a3c05168f3c12
-EBUILD alembic-1.8.5.ebuild 1781 BLAKE2B f040c637568b14b05d2df3f083f6c304fd0cd3af042dbf71c3051dca8081885fe5638ac3e72666e0c24dd28d90f4059d24a43ad0dbd26c2b064dc8133d32b9b2 SHA512 825e3c1d7565870472d5bc093829c924d568bc3dd91ccc92d3717dbec3b834ab52d6aa0eb73eff1428ccf529a6035577d7ff637836f5152cb78e6dcd6fd8683b
+EBUILD alembic-1.8.6-r1.ebuild 1627 BLAKE2B ac7b599e3598e0110575705b009d4636fad6bf4fa8f2e1affe923b30db638a2d179d29dca37155d6f4527ffcc4d1d7c8aab49e2e1238541870953e4db8c73035 SHA512 3ea261fb8f288be876edad40e3aad6e001b7caaa75401065fd2071988250369f71c4cf482f1211fbd3a54d092dc812aaf58e5b483617fde4b8588afe10330d9a
 EBUILD alembic-1.8.6.ebuild 1782 BLAKE2B afe666d245ea9301a735e4b1d830f9b5b3ab4d2c92d538b21cbc7e9c2935546205f587757f88a4c7a09e60151a9d55422c76873e170edfcd1514cb095d420209 SHA512 8233be7302f3645ba88e876048f46fcb46704b164f3aa30bd0b2a6431dc7c304c8c87fe6321397f7494a5ede99088dbf73e3916df4314fea7cf881ca1a0e4c1f
 MISC metadata.xml 825 BLAKE2B 6dca2b2671780fecd86e7be3b4c5840d3db5298f8ba809b0137e138dcfc253a7e2b31bd85ccfa1d66bac9d7e066eb14506e7e726ab3998578a5e53ad3477218d SHA512 0dc6c13d0a95ac7a961fbb3d0023c66f9f058ed943e5a28331d2d8cfad756ec1bbf90b39450f48e461eba8a075a000d0e038342a3598b9be8efdc3f3bbe56651
diff --git a/media-gfx/alembic/alembic-1.8.5.ebuild b/media-gfx/alembic/alembic-1.8.5.ebuild
deleted file mode 100644
index 2e12359bdff6..000000000000
--- a/media-gfx/alembic/alembic-1.8.5.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit cmake python-single-r1
-
-DESCRIPTION="Open framework for storing and sharing scene data"
-HOMEPAGE="https://www.alembic.io/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="examples hdf5 python test"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	examples? ( python )
-"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	dev-libs/imath:=
-	python? ( dev-libs/imath:=[python,${PYTHON_SINGLE_USEDEP}] )
-	hdf5? (
-		>=sci-libs/hdf5-1.10.2:=[zlib(+)]
-		>=sys-libs/zlib-1.2.11-r1
-	)
-	python? ( $(python_gen_cond_dep 'dev-libs/boost[python,${PYTHON_USEDEP}]') )
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.8.5-set-correct-libdir.patch )
-
-DOCS=( ACKNOWLEDGEMENTS.txt FEEDBACK.txt NEWS.txt README.txt )
-
-src_prepare() {
-	cmake_src_prepare
-	# Tests are broken with python 3.11.  See also: https://github.com/alembic/alembic/issues/411
-	cmake_run_in "${S}/python/PyAlembic" cmake_comment_add_subdirectory Tests
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DALEMBIC_BUILD_LIBS=ON
-		-DALEMBIC_DEBUG_WARNINGS_AS_ERRORS=OFF
-		-DALEMBIC_SHARED_LIBS=ON
-		# currently does nothing but require doxygen
-		-DDOCS_PATH=OFF
-		-DUSE_ARNOLD=OFF
-		-DUSE_BINARIES=ON
-		-DUSE_EXAMPLES=$(usex examples)
-		-DUSE_HDF5=$(usex hdf5)
-		-DUSE_MAYA=OFF
-		-DUSE_PRMAN=OFF
-		-DUSE_PYALEMBIC=$(usex python)
-		-DUSE_TESTS=$(usex test)
-	)
-
-	use python && mycmakeargs+=( -DPython3_EXECUTABLE=${PYTHON} )
-
-	cmake_src_configure
-}
-
-# some tests may fail if run in parallel mode
-# see https://github.com/alembic/alembic/issues/401
-src_test() {
-	cmake_src_test -j1
-}
diff --git a/media-gfx/alembic/alembic-1.8.4.ebuild b/media-gfx/alembic/alembic-1.8.6-r1.ebuild
index f3bfe4a9376b..1c389cb6e29c 100644
--- a/media-gfx/alembic/alembic-1.8.4.ebuild
+++ b/media-gfx/alembic/alembic-1.8.6-r1.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
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit cmake python-single-r1
 
@@ -13,14 +13,17 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="examples hdf5 python test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	examples? ( python )
+"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
 	${PYTHON_DEPS}
-	dev-libs/imath:=
+	>=dev-libs/imath-3.1.11-r1:=
 	python? ( dev-libs/imath:=[python,${PYTHON_SINGLE_USEDEP}] )
 	hdf5? (
 		>=sci-libs/hdf5-1.10.2:=[zlib(+)]
@@ -30,7 +33,11 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
-PATCHES=( "${FILESDIR}"/${PN}-1.8.0-0001-set-correct-libdir.patch )
+PATCHES=(
+	"${FILESDIR}/${PN}-1.8.5-set-correct-libdir.patch"
+	"${FILESDIR}/${PN}-1.8.6-py312.patch"
+
+)
 
 DOCS=( ACKNOWLEDGEMENTS.txt FEEDBACK.txt NEWS.txt README.txt )
 
diff --git a/media-gfx/alembic/files/alembic-1.8.0-0001-set-correct-libdir.patch b/media-gfx/alembic/files/alembic-1.8.0-0001-set-correct-libdir.patch
deleted file mode 100644
index 3216e38d2381..000000000000
--- a/media-gfx/alembic/files/alembic-1.8.0-0001-set-correct-libdir.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 9e877b10c05e9482ef00bda99033508cc64211fd Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl-gentoo@posteo.net>
-Date: Fri, 23 Apr 2021 15:20:15 +0200
-Subject: [PATCH] set correct libdir
-
-Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
----
- CMakeLists.txt             | 8 ++++----
- lib/Alembic/CMakeLists.txt | 4 ++--
- 2 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 69fff1e..97d1e2d 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -73,12 +73,12 @@ option(DOCS_PATH
- 
- # Set static/dynamic build options
- SET(LIB_TYPE STATIC)
--SET(RUNTIME_INSTALL_DIR lib)
--SET(LIBRARY_INSTALL_DIR lib)
--SET(ARCHIVE_INSTALL_DIR lib)
-+SET(RUNTIME_INSTALL_DIR lib${LIB_SUFFIX})
-+SET(LIBRARY_INSTALL_DIR lib${LIB_SUFFIX})
-+SET(ARCHIVE_INSTALL_DIR lib${LIB_SUFFIX})
- IF (ALEMBIC_SHARED_LIBS)
-     SET(LIB_TYPE SHARED)
--    SET(ARCHIVE_INSTALL_DIR lib)
-+    SET(ARCHIVE_INSTALL_DIR lib${LIB_SUFFIX})
-     IF (WIN32)
-         ADD_DEFINITIONS(-DALEMBIC_DLL)
-     ENDIF()
-diff --git a/lib/Alembic/CMakeLists.txt b/lib/Alembic/CMakeLists.txt
-index 20acfed..9859bbe 100644
---- a/lib/Alembic/CMakeLists.txt
-+++ b/lib/Alembic/CMakeLists.txt
-@@ -78,7 +78,7 @@ TARGET_LINK_LIBRARIES(Alembic
-     ${ZLIB_LIBRARY}
-   )
- 
--SET( ALEMBIC_LIB_INSTALL_DIR lib CACHE PATH "Where to install the Alembic libs")
-+SET( ALEMBIC_LIB_INSTALL_DIR lib${LIB_SUFFIX} CACHE PATH "Where to install the Alembic libs")
- INSTALL(TARGETS Alembic
-         EXPORT AlembicTargets
-         LIBRARY DESTINATION ${ALEMBIC_LIB_INSTALL_DIR}
-@@ -91,7 +91,7 @@ INSTALL(TARGETS Alembic
- 
- set(alembic_targets_file "${PROJECT_NAME}Targets.cmake")
- 
--SET(ConfigPackageLocation lib/cmake/Alembic CACHE PATH
-+SET(ConfigPackageLocation lib${LIB_SUFFIX}/cmake/Alembic CACHE PATH
-         "Where to install the Alembic's cmake files")
- 
- INCLUDE(CMakePackageConfigHelpers)
--- 
-2.31.1
-
diff --git a/media-gfx/alembic/files/alembic-1.8.6-py312.patch b/media-gfx/alembic/files/alembic-1.8.6-py312.patch
new file mode 100644
index 000000000000..499645280d9a
--- /dev/null
+++ b/media-gfx/alembic/files/alembic-1.8.6-py312.patch
@@ -0,0 +1,91 @@
+From 3b6c04d8c02520a973c95b51ca1fa4bd5e7e8e73 Mon Sep 17 00:00:00 2001
+From: Paul Zander <negril.nx+gentoo@gmail.com>
+Date: Tue, 4 Jun 2024 14:15:11 +0200
+Subject: [PATCH] python/PyAlembic/Tests: update do python3.12
+
+tests: use assertEqual instead of assertEquals
+tests: use assertRaises instead of failUnlessRaises
+
+Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com>
+---
+ maya/Tests/AbcExport_dupRoots_test.py     | 2 +-
+ python/PyAlembic/Tests/testCollections.py | 4 ++--
+ python/PyAlembic/Tests/testCurves.py      | 2 +-
+ python/PyAlembic/Tests/testPropExcept.py  | 2 +-
+ python/PyAlembic/Tests/testTypes.py       | 2 +-
+ 5 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/maya/Tests/AbcExport_dupRoots_test.py b/maya/Tests/AbcExport_dupRoots_test.py
+index d532c10..f864281 100644
+--- a/maya/Tests/AbcExport_dupRoots_test.py
++++ b/maya/Tests/AbcExport_dupRoots_test.py
+@@ -48,7 +48,7 @@ class AbcExport_dupRootsTest(unittest.TestCase):
+         MayaCmds.group(n='group1')
+         MayaCmds.duplicate()
+ 
+-        self.failUnlessRaises(RuntimeError, MayaCmds.AbcExport,
++        self.assertRaises(RuntimeError, MayaCmds.AbcExport,
+             j='-root group1|cube -root group2|cube -f dupRoots.abc')
+ 
+         # the abc file shouldn't exist
+diff --git a/python/PyAlembic/Tests/testCollections.py b/python/PyAlembic/Tests/testCollections.py
+index ab48a54..1745582 100644
+--- a/python/PyAlembic/Tests/testCollections.py
++++ b/python/PyAlembic/Tests/testCollections.py
+@@ -67,14 +67,14 @@ class CollectionTest(unittest.TestCase):
+         prop = group.getSchema().createCollection("prop")
+         prop.setValue(strVec)
+ 
+-        self.assertEquals(group.getSchema().getNumCollections(), 1)
++        self.assertEqual(group.getSchema().getNumCollections(), 1)
+ 
+         # TODO passing in time sampling here causes a segfault, most likely because
+         # of how createCollection currently takes an Argument &, see #274
+         cool = group.getSchema().createCollection("cool", md)
+         cool.setTimeSampling(ts)
+ 
+-        self.assertEquals(
++        self.assertEqual(
+             group.getSchema().getCollection(1).getMetaData().get("coupe"),
+             "de ville" )
+ 
+diff --git a/python/PyAlembic/Tests/testCurves.py b/python/PyAlembic/Tests/testCurves.py
+index dba9e1c..956625a 100644
+--- a/python/PyAlembic/Tests/testCurves.py
++++ b/python/PyAlembic/Tests/testCurves.py
+@@ -59,7 +59,7 @@ class CurvesTest(unittest.TestCase):
+                                            widthSamp, uvSamp )
+ 
+         knots = curvesSamp.getKnots()
+-        self.assertEquals(len(knots), 0)
++        self.assertEqual(len(knots), 0)
+ 
+         newKnots = FloatArray(4)
+         for ii in range(4):
+diff --git a/python/PyAlembic/Tests/testPropExcept.py b/python/PyAlembic/Tests/testPropExcept.py
+index e1a1dff..2ddf40d 100644
+--- a/python/PyAlembic/Tests/testPropExcept.py
++++ b/python/PyAlembic/Tests/testPropExcept.py
+@@ -70,5 +70,5 @@ class PropExceptTest(unittest.TestCase):
+         p = props.getProperty("myprop")
+         self.assertEqual(p.getName(), "myprop")
+ 
+-        self.failUnlessRaises(KeyError, props.getProperty, "notfound")
++        self.assertRaises(KeyError, props.getProperty, "notfound")
+         self.assertRaises(IndexError, props.getProperty, 99)
+diff --git a/python/PyAlembic/Tests/testTypes.py b/python/PyAlembic/Tests/testTypes.py
+index bad9577..f0e8d26 100644
+--- a/python/PyAlembic/Tests/testTypes.py
++++ b/python/PyAlembic/Tests/testTypes.py
+@@ -60,7 +60,7 @@ class TypesTest(unittest.TestCase):
+         self.assertIsNotNone(POD.kUnknownPOD)
+ 
+         # If a new POD type is added, this will throw an exception
+-        self.assertEquals(POD.kNumPlainOldDataTypes, 14)
++        self.assertEqual(POD.kNumPlainOldDataTypes, 14)
+ 
+     def testDataTypeWrapper(self):
+         # Default Constructor
+-- 
+2.45.1
+
diff --git a/media-gfx/argyllcms/Manifest b/media-gfx/argyllcms/Manifest
index 262f4f1c16a8..bf9b4554ea2d 100644
--- a/media-gfx/argyllcms/Manifest
+++ b/media-gfx/argyllcms/Manifest
@@ -6,5 +6,5 @@ DIST Argyll_V3.2.0_src.zip 14690714 BLAKE2B a2bd45883c213c0906ce94be525f6d7fa6e7
 EBUILD argyllcms-2.1.2-r3.ebuild 2120 BLAKE2B 0f7b414ceb466e2b710f4da0bb50942891f0c9c92ce55598bd4922758192bf220d4fc557bff3a4c39f1efd7df03a95c80f6b6b3f89b7dd87ac16115a789c2826 SHA512 0d85fb8555dd82d6e8995efc995796d99005dc3363ed9e0d7202f9f3b0772a4a790f3f8446a04f9c0e257976f4741c581469b786651ff5f72a300fc758e9ce7b
 EBUILD argyllcms-2.3.1-r1.ebuild 2226 BLAKE2B 7847ca2064b2504be0322c146d21f390b971bd5ee235abe94ebfca29808afa44985ea11ae4b5d5fbb639987fbd2acd687fb518f6a065366d872661313a9bfdb4 SHA512 305ad5bb1feacfdd4166bf8bae5992171fe258a2f42ac0de456af5739b6f278bf81bebe44ac94f5321c0110b6f816e3ead2d3ecde3842ea8d1d28e71dd16e833
 EBUILD argyllcms-3.1.0.ebuild 2113 BLAKE2B f797decc319584451498e0b9a012c3205987ebf8c28804aa86dd43981be7f77dd0b981d1e710d19f52b86bc4efa1d7a12955cc16205b789c8784e7174b94dc02 SHA512 f850af284f8860179dc298e621775f42a726875109659005da025e357f719f90ae46328245959831971d05c729eaa4b8ae98f24f54fec0785ab818a9e184584b
-EBUILD argyllcms-3.2.0.ebuild 2112 BLAKE2B eebf1e90d90c36126f1ae7b312005af8916101de80599b35eb211cbb42437084c9e192475f49cecd197aede42b2275b22773a2a75d179886aa01bd6fa3c45541 SHA512 71c3e73313fbc6ea16bba83950436f8b4e3fd63f833767cd4b13a18f61125d316fff8921de2e51b83925845f21e70a80d994ecf4163dfaffb963f0d8ef078e22
+EBUILD argyllcms-3.2.0.ebuild 2110 BLAKE2B d87cda7627462b0885bf2512e89145817a5cdc4b4654485d9cf3b6d4c7e0b446e2c92a6fb1f29b271ff7263c15ac94d23d5d023c9dc62edf20a4e029db48a080 SHA512 d97b835df915a36c773630f0a8d37cb504311183f9855ee07c0293be1e8b119a3655359f8892776f3ab8873c5e3874ba166a2a562f8c3074d1fd84e0baa43683
 MISC metadata.xml 253 BLAKE2B 8557c513beef73e834b0a000c523a3241da961c6307b6e98ac857dad0888c4bbd028c98f8499f01086c24e8f2f57c64bc75db20154dab232adefc2510fccac03 SHA512 67dd372ef7b684101d9198c6199a6403f8750132d80aab4f4daa4b31ebaea3d82eb9a18e904734e2ac10c77b237d67210055949ff1c6d5aad4f75951a096884a
diff --git a/media-gfx/argyllcms/argyllcms-3.2.0.ebuild b/media-gfx/argyllcms/argyllcms-3.2.0.ebuild
index daa1311058c2..56d6912b0f61 100644
--- a/media-gfx/argyllcms/argyllcms-3.2.0.ebuild
+++ b/media-gfx/argyllcms/argyllcms-3.2.0.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~loong ~mips ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~hppa ~loong ~mips ~riscv x86"
 IUSE="doc"
 
 RDEPEND="
diff --git a/media-gfx/asymptote/Manifest b/media-gfx/asymptote/Manifest
index 4d7b8fabeea7..177dc6e4cf19 100644
--- a/media-gfx/asymptote/Manifest
+++ b/media-gfx/asymptote/Manifest
@@ -1,9 +1,8 @@
 AUX 64asymptote-gentoo.el 337 BLAKE2B 56b028184573dd8db6babd90ae45838b9788671134d625df5960744b71b377db3cacf1dd4fc78d9800ffdf4e83a2413b7e87680ab0fcf45c31ecad9dc538388a SHA512 c8c74d5464f500e9bc3ca2fd89065e4f68a834c1b82a444820efd70abf9d2bd7c52ecbecd7ea5fad916259512acf4aedf8aed803a707733121211e59ef300c86
 AUX asymptote-2.70-info.patch 436 BLAKE2B 70eac7625341e21f9cf03cf1ea08e4864fe102627349f2411680b9c18f4df508f5cd6972f9e6dc719795f0323c51b6a5d096e9e3cae81cc1ee497f3f9325fafd SHA512 5b7494351bef5240bd4dba531a3eb68d3a6025990f32fe4064df31e351df9cfb27be29c69b16309929a63ec8d164eb4f2b14315406e546c7dba9dc416ae6b8d4
 AUX asymptote-2.85-xdg-utils.patch 762 BLAKE2B 4b5ea874e89723e0a26b3a16a55660703a78316bc0df1b8cc2a23963aac51d4d0b2107598c67316cfcee132a1b88b90b3c600bc279b098f2e709c65911f37a51 SHA512 8c6f85518968fbf10ac66b7bc1819bcc90562076475c5405d4f21da0de64406de4c26de2ba9481e15dc21d9f086cd2920b263c7bb483c90a5ed40900dfaf937c
-AUX asymptote-2.86-without-lsp.patch 1045 BLAKE2B 9e212ea9f00f5c49171679cca577b8a37e165d73514f6ecf20c06ce2b3f2fa7f2696f8ba66f9775b7b71ebacadee39e9c398bc9a6c7a001e904f41be7a1f6e55 SHA512 3a4ceb7c356b4abe7eaceb1b0b9a805d0325a8a7d6b9d2eff8c4462abcad215783842412c4cb4f89e737d9bb0e07fc8eeaea0075f0894aa1c8c8e4e5c0312179
-DIST asymptote-2.86.src.tgz 15118426 BLAKE2B 305edae6653094a5daa9f136951cfcc3f8ece1dc8e616593710e0bace350a95f61729f8d7a9522a14704300a6cfd15decb1bb634e58dba1626f09c053b6b368b SHA512 9e11dbfca10379f07b50dcce0d63c12b793f47741651b1804cf0825e87604c40b5b94acf343ce7f5ca7da83b5ebb0e213090ada80e0b6ebe4f6cec9db67209d6
 DIST asymptote-2.89.src.tgz 15133552 BLAKE2B bde5acd3e76543b3c936e785ccf081c38687d535f336ee0e3da62f5fe078bb040dc162b64f02e94f392129c120bdf497b86e3862059abdb1b4544bab3cce3218 SHA512 a9874f0dc6eb05b95ef551611d85f39222af2a0628d7904160b08bdaf797c2b9ec6d12af7ae26dee69dbc056a5bffad4e450d4846a517d80990d89759e0c47a0
-EBUILD asymptote-2.86.ebuild 5592 BLAKE2B 87f6be832470d9ecc15727cec0af4ab6d43092b7898a38ee37bb86913410dd169b123d9e76d1fb888443f13bb47624d1523717c6f8cd6a1489bacf431306d736 SHA512 0e276807b7054ceb807a35e9e5158612a9c6f293aaac97bc4165a9e7dd3165c688f9df86fb80743b02a2f15ca8e6df5b6c006ade732e84488980fce568626c80
-EBUILD asymptote-2.89.ebuild 5549 BLAKE2B 243717d534c43198a016f434bb5456f6c75baca9e90a16ada3bb4eb0521946a1b62a54f3f09f9d2d96733731b57f0cd8366e3c168816a31ae462b394216aca98 SHA512 a8b40bae9beaaf9505026158e50cc6436c7e839c82f14e7c66b7beb03d032f55eab7bd788426ebd21ca77c6b05d16c7e1c024c6c727e5e256f49bfdb2d4dfa16
+DIST asymptote-2.90.src.tgz 15154576 BLAKE2B 57e3c4287f2e8a6b6f3d660cdd04bb753b435294d4769bbcf84d6c7bf80c813609528767af7d19853d9f72f4f1ce9e6a8dcc6a75731a2f3d16098d5da5b81b6c SHA512 2d050f7a2cfc34d2d6b5382a48e7bf09031d98a77e61b654b4af84b5e8e11553a9a713a6dea8d09291761427d7134742a3d266e57ac57ffda3587ec0487ecfca
+EBUILD asymptote-2.89.ebuild 5547 BLAKE2B 1ebd17a78dd79edb0eac18b054f7fe786227ccee3eefc1f397b759d698cf400e8a19ab2cebee15cd21edd299c26027ca39f6fb707db3e54ee0e650bc11ed6794 SHA512 8f9aeb3295c7c8252f1ea974769e1cf82357ac088b576bf2ee277c7bcd1967b236e563000cdeb61e459922dfabb17776eae68c380ebdd4eb8c2002ff6949e73b
+EBUILD asymptote-2.90.ebuild 5549 BLAKE2B 243717d534c43198a016f434bb5456f6c75baca9e90a16ada3bb4eb0521946a1b62a54f3f09f9d2d96733731b57f0cd8366e3c168816a31ae462b394216aca98 SHA512 a8b40bae9beaaf9505026158e50cc6436c7e839c82f14e7c66b7beb03d032f55eab7bd788426ebd21ca77c6b05d16c7e1c024c6c727e5e256f49bfdb2d4dfa16
 MISC metadata.xml 1423 BLAKE2B 64dd5d6c928a11d4a47297362223164cb19d91f6a08a0582b66831e2e8e2d7594389c2244fa1527dfe945da0e67985f5c639e3dae2482f57b510bf828a4605ed SHA512 1561e416e56bca130a72f90886981f63224c21e2a077a7b93e6fdd877f38dd12dfa9e0b747840e7f459e2df16c5b08e0177d26c526eb21bebe00fa8c91326bc9
diff --git a/media-gfx/asymptote/asymptote-2.89.ebuild b/media-gfx/asymptote/asymptote-2.89.ebuild
index 41e78e722943..8d3f1ada6331 100644
--- a/media-gfx/asymptote/asymptote-2.89.ebuild
+++ b/media-gfx/asymptote/asymptote-2.89.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://downloads.sourceforge.net/asymptote/${P}.src.tgz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~ppc ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="+boehm-gc context curl doc emacs examples fftw gsl +imagemagick latex lsp offscreen +opengl python sigsegv svg test vim-syntax X"
 RESTRICT="!test? ( test )"
 
diff --git a/media-gfx/asymptote/asymptote-2.86.ebuild b/media-gfx/asymptote/asymptote-2.90.ebuild
index 521d51dbce85..41e78e722943 100644
--- a/media-gfx/asymptote/asymptote-2.86.ebuild
+++ b/media-gfx/asymptote/asymptote-2.90.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit autotools elisp-common latex-package python-r1
 
@@ -13,7 +13,7 @@ SRC_URI="https://downloads.sourceforge.net/asymptote/${P}.src.tgz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~amd64 ~ppc ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="+boehm-gc context curl doc emacs examples fftw gsl +imagemagick latex lsp offscreen +opengl python sigsegv svg test vim-syntax X"
 RESTRICT="!test? ( test )"
 
@@ -73,8 +73,6 @@ PATCHES=(
 
 	# Bug #322473
 	"${FILESDIR}/${PN}-2.70-info.patch"
-
-	"${FILESDIR}/${PN}-2.86-without-lsp.patch"
 )
 
 src_prepare() {
diff --git a/media-gfx/asymptote/files/asymptote-2.86-without-lsp.patch b/media-gfx/asymptote/files/asymptote-2.86-without-lsp.patch
deleted file mode 100644
index 2f70cd0d9725..000000000000
--- a/media-gfx/asymptote/files/asymptote-2.86-without-lsp.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 29caaed5ead5a62787475286afd22e40585b8bb8 Mon Sep 17 00:00:00 2001
-From: John Bowman <bowman@ualberta.ca>
-Date: Wed, 14 Jun 2023 22:36:35 -0600
-Subject: [PATCH] Fix --without-lsp (issue #379).
-
----
- common.h | 17 ++++++++---------
- 1 file changed, 8 insertions(+), 9 deletions(-)
-
-diff --git a/common.h b/common.h
-index 13f8be106..6ee3d971f 100644
---- a/common.h
-+++ b/common.h
-@@ -17,28 +17,27 @@
- #include "config.h"
- #endif
- 
--#ifdef HAVE_LSP
- #if __cplusplus < 201703L
-+
-+#ifdef HAVE_LSP
- #include <boost/optional.hpp>
- #include <boost/none.hpp>
- using boost::optional;
- #define nullopt boost::none
- using boost::make_optional;
- #else
--#include <optional>
--using std::optional;
--using std::nullopt;
--using std::make_optional;
--#endif
--
--#else
--#if __cplusplus < 201703L
- #include "optional.hpp"
- #define boost nonstd
- using nonstd::optional;
- using nonstd::nullopt;
- using nonstd::make_optional;
- #endif
-+
-+#else
-+#include <optional>
-+using std::optional;
-+using std::nullopt;
-+using std::make_optional;
- #endif
- 
- using std::make_pair;
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index 30eec579c5e7..5f155b022dd0 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -8,15 +8,24 @@ AUX blender-4.0.1-openvdb-11.patch 3236 BLAKE2B e749db26f88b1e5329741a09c306ddd1
 AUX blender-4.0.2-CUDA_NVCC_FLAGS.patch 627 BLAKE2B 45c9f327ee6d2fbd45446ba0787f6de9dd77364a9a0b8b1b7683acfc5f359c5745df5747e4359ba0609cbc7dfbcb569e5f6ebace433f1ab9b87305435c9fd680 SHA512 13784a75a7fc303fa548c1d8c79e4435c40c32beb1f00c05dbe2731d1d3cd19ae202ff0b4ef9eff10e9bbd6c6f52024220a843d237dd91c27077bd91552dd6a2
 AUX blender-4.0.2-FindClang.patch 451 BLAKE2B 4b57395d440b590f9b2e097b74fbcf46dbe12fd13536cb335b914246995ede928f1208872c5044e1d0ecb1a702d0c46b656eb4b3abc3b0ed149abaf0d74bd433 SHA512 21aa3e158585184dfc1ccd931b53142cf436507a9126f4cee465214e7183553d02451babc5a636d3eb4ae0fd3ed0f0effb7b8962889f6dbec3e9476a61d0bbb2
 AUX blender-4.0.2-r1-osl-1.13.patch 14364 BLAKE2B fdee46fa3c5b1dc9a48499573e6bda242e2aa5d57f17e8b1e1a262673c5c2912c75cc8c531a30bcc0fd5019c4ff50ae089d0987e15ff1d57137e00f903356738 SHA512 2020b4f34c50ab1bb911a3b37b95a3da2a7f754e0b0ead7f651664131aa19debc00f8a8d32871b467bfdce9d83c43ca4597309351512635fdaf35f98c82266ff
+AUX blender-4.1.1-FindLLVM.patch 1388 BLAKE2B 721ba19ba6bdfde1672889d530bbd252665c12568363920561b7cfb7491e98a130cf0accc197f46a760c1bc57357183ce89903f2555125097d23361f1fe39ea7 SHA512 b13e8efaaf711bfba2a015b65153988c7ca9042e58785a483987634110c2bbdaec311744c633b7402dfaaca321984a5dc3fc549689c21fe0bfd6c27d890289da
+AUX blender-4.1.1-numpy.patch 1060 BLAKE2B 76b4c83e852f25be042c2a8267ad2b55fcbf8c3d4c3c2d1e8640e349174029de13a791d53e66215126dc76cdefca40b1e9f253e317f02f6d40a04652e9519bd5 SHA512 d3047c0eba1ce6d4cb68df65bd1563b7eb7c14253ff82edfcdae0a19d8270027a45273442258e0afef19bf1e805b99b91ae76a95fb4a0ada0454ee75f36c43b1
 DIST blender-3.3.15.tar.xz 41928632 BLAKE2B d93d7d47183fcd7afa547b8d3f0bd7240ea204dcce885f42d79d29352ebacac43a2f92e380f576c2688d2d90d910caff069484e22669847b0eea71079a8bdc7e SHA512 d55223b7b9ae9f9c6fdbf5ed2988e997693fcb8262196acb08bbe58bae86f9f34474ed1cf5a213ee0247225601726265ded3cb4ad4d89910fc247f9cf5fec1ff
+DIST blender-3.3.21.tar.xz 41940868 BLAKE2B 74874226a0f690d2b81c0f96c441f519bd37ff0fec5c2dcae0f4f673d55863e2b2edbd60d2ed05890c440c5287e4cab943646cf4029d7c8287a636ac405e9bce SHA512 715a9808b25fe4c90ee3097edf21bdb3facfec51df0f6b6c6404a95bafe417d1e4998994f532ae9bac1e95de84cc8fd8fce8f8e672f9117646ad840074344d0e
 DIST blender-3.3.8.tar.xz 41915180 BLAKE2B 7fb24afe2151bba53d8c25160bd697145aced74a8cd9a7ac92b2f66bc0ab59e995009f20f9e9bb622b05d614919137153805a2e233de5b0bb0a41a2ac3405a76 SHA512 63aef1e543a9c8bbc5f8838292ad2e8d0d9a8ee6fd2d71a419c1edc1a0ee1f59f7e9eab59bc20bf32ca56ba440bab1534c6c94c6ca2c5ab964e80bd452b7e519
+DIST blender-3.6.15.tar.xz 67906200 BLAKE2B 8709b20347e78f3f71d22fee9799b1c0e20a39521b35cff83d6cd3462d4b172e31c1656812d7ce51eef25341a0cff2e9efdcdab0bc9a361ec843a666fc8c3185 SHA512 dfd1d80850fe6ab0616fd99ab039345da621418890b1a006e5320a4b739d1cf6f4ca313e8f8aed6e27c976400c75e8d6085847623d933de71932aefe82f3fd32
 DIST blender-3.6.8.tar.xz 70453744 BLAKE2B 5361977951fa1720899fad26092b967cc78b7ba82c8823f92fe1e6a14419edae1f3914f639e88dd8b5fb3ec7c124783e1ece56199a80b9b51a0f320764e1eba7 SHA512 a5e15dc9de7024cebb955fc531ae592a4c58336196a07fd63ed5bb4eb14d66751a3697ea8b120283ca5078c92d8c87966e882862011ebb4368f132e2de004a45
 DIST blender-4.0.2.tar.xz 73281252 BLAKE2B 6ec72baa360049681c8ba18ae668041e87745bad51113cf50bca93d18f52ef5db84c58f9a2dc5b341ef1f0439e76288a1b1eda892a19033fb494e79cd3b2f983 SHA512 c37b85d06f5cf8b48cb8c657a9fb6b0ab1325271706fa34039f2993420f7606cd1e2c052173cdea94e9bec2924e7aa4df373e3a0fc1f9c4be336e62211b6bc4b
 DIST blender-4.1.1.tar.xz 82146268 BLAKE2B 1ab4a6c1046851ef619394c62fc73794430dc091e2cab26d3d1d542e9d4519889e9b9731606385e9dc8657448ca3827875526f4a57dd1b5c326a73d8a6f9be8d SHA512 13ad0cdd09879b5c28554faca5a54172f43dc3dcb749d2d1723d3e89e741e6255179af3bd88309b735e058b9b350191e44f3158e882e55f1cedea70b8b21540e
-EBUILD blender-3.3.15.ebuild 13709 BLAKE2B c560bc5268c459c98d9bae37e3b916666eb3abb05854587d9a39baafd99ea5248a0e3d032f6f406d00007d005615889b144586054eab69705a6b3cd73212efd6 SHA512 d901250972fa21d48ecb223b9ff58de167dea4516af3c0bc104f7425c4a2ceddcda3d67485df09984ec8810d05d5232b1643b331534e09a23385e151a9be9fd9
-EBUILD blender-3.3.8.ebuild 13708 BLAKE2B 3822fcde22d31852e8b9539c6689fe93b56716e788839a0afa26b944e3a1599a995270ac4c600be792ba0c5f2a88616009bcc6f5c4ed6e7f1812df77488989d2 SHA512 16ad4f61a12b7c238fd6c2c8013b2db38d7dd6e1ab53e01425fb4e917910892bdbbb09febe185416eb4abc34136d214fc5acccec4f234914f44b5deb2a7ae8b4
-EBUILD blender-3.6.8.ebuild 14113 BLAKE2B a431187e9349f2bb9597fe7a2e315ad6cee581b01840a97b711ed0a9cc746532c75594e96ccc3e09c0409afb680a116589990af69e2b5cbfc1e37b1e5c522609 SHA512 cc8491e28fae32313ef14816025c909d35381d870e4c7b8c4379bd5ca8578f1690b34ee9f6074bc644aff2b065b77ca0be45adefc5a95cd1e2329470a05cee61
-EBUILD blender-4.0.2-r1.ebuild 17304 BLAKE2B 53711bb59d854ea714cbc3c9ae7571813312748ed32bde98dac27ae36166b508f3934414924c2a8f419c46fa0210debb517109c7c78eae0c85f6d01ecb1f9fb1 SHA512 07cccc5cabc1743aa1aa2d133adc623c0eef3869791de1e3e4296275350fe679239b0d5e84f098c42a2f19e7ce06019645bd55dae9ff4d436ea492a17e3bbe11
-EBUILD blender-4.1.1.ebuild 17156 BLAKE2B 878b641cf10d01d00e475c767fc39dce3007fb2163ca9bda89b0ac085a0f61d971c4fb6bba098a9ad745da4d3bfdbee42717ec19cb8c9e943ccac195fe306ae2 SHA512 7afebce103ca50c72e69772db3bf186c645e17562f3a69e2b8b1bbfc0154cf923dd418d02c84375f75fac4d795fb82bf16eb31ee25cc18dae6e37a782a784768
-EBUILD blender-9999.ebuild 17156 BLAKE2B 878b641cf10d01d00e475c767fc39dce3007fb2163ca9bda89b0ac085a0f61d971c4fb6bba098a9ad745da4d3bfdbee42717ec19cb8c9e943ccac195fe306ae2 SHA512 7afebce103ca50c72e69772db3bf186c645e17562f3a69e2b8b1bbfc0154cf923dd418d02c84375f75fac4d795fb82bf16eb31ee25cc18dae6e37a782a784768
+DIST blender-4.2.1.tar.xz 72789532 BLAKE2B 74494e851e9e2e9fdcf4a77fa4e1c177d6b9f01ab1cde9daec40468e5399d84b04225ff3a6919191e685624e9094ea4cb2257a62344d3b0e87072f339253aa82 SHA512 20162bd1185e34c481a0520f4999f8c76018471b485fa72afa446f590638c564a370d036cc4a941bf204fce821d8305d4244b3ba9ec7f09f1839b8a276dfde39
+EBUILD blender-3.3.15.ebuild 13723 BLAKE2B b22a4fa62e27aa0f25f2e769de636d87a80ad959c4271005dccb01bc19596a19d81b8cba19034d20e433ebd9eeb7f51d235ad10f6e145c912a343db31ad7364e SHA512 de3eb7c4453a48297b50dbd2ce10a25151673fafb29ff6c1241cd8c1be9865727c128f6265e66a39ac48f095b9e5ec5b5f70510ad2ec5f861a2f5129bb81db5a
+EBUILD blender-3.3.21.ebuild 13726 BLAKE2B 8641e7d81d4d5ae7647a58bf5dce2f031c043714608501d4b4c1febae164741330467dc1253ea521fc4534b9323f2ee5ad043321674d13cd53ba2548193ab2b3 SHA512 ec16526c86f685824629a9a5f97e4a1f44439101781a07179f28f30b4502537d14c469dd83f474fe544cf8e1ae363b3f7d9810f346d94b32d83fb67f2642d0ea
+EBUILD blender-3.3.8.ebuild 13722 BLAKE2B 12465f59bb137aaa869216b623df34fb8758a742bc517cd467865ecfbff6856429c7fda725b6a3e14d1581964b22adb27956e0b74838c1da5e9a573560269fdf SHA512 8d985d8efd20233d111b7efe2aaa0b8fe486d3de36d676575347d66b24a7fd14904c04d9edfcfc1e03c34956419dc3ec06c4e20175749254f120ae52e79a1396
+EBUILD blender-3.6.15.ebuild 14133 BLAKE2B 97030e2d089b2bd7cc7e8a3e0c4b8b302c168f3b12be5e18366493776095fd4b95b2107691f467f67fb95e006b3d5ad5442dddff8e39fa53044dbaf263f79216 SHA512 3d90056f798ce49c5028ff860296e1c18201d44fea9056c59150b6b6815d3ac98e03e9b1ba2aa985e883996e7755dec6ef27a9799e889c21bd6d539940fe858c
+EBUILD blender-3.6.8.ebuild 14127 BLAKE2B 1de13a7ef689f16a899698c7262bf0a59a9d6ca1a9ed27c446e11b1cfc4b39b94231f08d96b17323f2049b1ec05a28319718402c083061a2b805838ca90931ad SHA512 0647e31bef93c125c407611a690437de86c710beb5b7771801e27e2e561c3d7bfbc350e67fe0275bcbe4a5f049e87c3e600b95bcef9013f156677624b1ce445c
+EBUILD blender-4.0.2-r1.ebuild 17323 BLAKE2B da8dd2e98235314e7acf564867c688ce8ca258ef154b6fecfee4b247360bfd1eda7d2d0a42b37356cf79b061bf3f2d3c862f19db77f29b74701a29c3e36e4eed SHA512 f6ec16f31c2ecb1578b1d0222fb02041753cf225347cefdd0b75ab28386ecf9840d54be5366e9e7231b05aca1a84f3d52a10c801a2431a289182e1a1a0ac0aa8
+EBUILD blender-4.1.1-r2.ebuild 17612 BLAKE2B 6c730678d9ee6f98127a3df5df269ee06a3bbb69e6bd2d4d06195ae8efa424484a83b3a77cd58c0e1a8e2d516f67e0d38737cd199f4ee66c59f1bfc045dfd308 SHA512 4afc54c172de9eb3fe0d71a23f59b32f232ce66847272bbe8b03e770bb228a0e22c0556bbc7338294d9488ad221e4c117e557e85f1f32c44ebecc1cf6bbb72bc
+EBUILD blender-4.1.1.ebuild 17169 BLAKE2B 96ac5b0d84b5c45008ca67d07f55617833801220064e77e37d1f6f0b47a141f29ddc063667ebf09f482899640b02830c31b1cd8b148f3f5fbe61421f931ffd53 SHA512 ed20d53f7bcb93b0f0541145dabf903a10fe3811288c3cebf80396885a4d7aa4552687e86608d5510f8fe87adea9432956e6c21dec47f1e08adc0cc6e399b1c4
+EBUILD blender-4.2.1.ebuild 17468 BLAKE2B 6c4dc64995717956cc7dbbcca9e1420920d4ed0cfa4c484ab4eb38a27ba7d03b25b4987c067f88c214506baacbab24c8cee6c2a9a89969ec0a8df7a265781389 SHA512 e1c1ce5f0178b47c894610773e08991ea5affab1abb72b6b0a9085ae90c1cd577b272cb6b9dae794c0cd5544b954dad4eb8e69c659309acc8fd5593c9593f510
+EBUILD blender-9999.ebuild 17468 BLAKE2B 6c4dc64995717956cc7dbbcca9e1420920d4ed0cfa4c484ab4eb38a27ba7d03b25b4987c067f88c214506baacbab24c8cee6c2a9a89969ec0a8df7a265781389 SHA512 e1c1ce5f0178b47c894610773e08991ea5affab1abb72b6b0a9085ae90c1cd577b272cb6b9dae794c0cd5544b954dad4eb8e69c659309acc8fd5593c9593f510
 MISC metadata.xml 3679 BLAKE2B cca8c2f8568be6c83244cf5a90b2db0df11faffa4f55820692990e02ce0bfd84cf3e6c2fdb146af9e6c8e09d1c72fe297c73f126e04ad918e709dc9064908aca SHA512 ac8bdbc0e00442f56d9d077d7d8c97deba90121e7dd34aac9d51b7ae6348bbaa875d2fcd01fe20ff7e9b1c3bf332a5cde63fd0b406a1e29c3f4de323225a17a9
diff --git a/media-gfx/blender/blender-3.3.15.ebuild b/media-gfx/blender/blender-3.3.15.ebuild
index 1582fb82925a..aa58233b6a81 100644
--- a/media-gfx/blender/blender-3.3.15.ebuild
+++ b/media-gfx/blender/blender-3.3.15.ebuild
@@ -22,7 +22,7 @@ else
 	KEYWORDS="~amd64 ~arm ~arm64"
 fi
 
-LICENSE="|| ( GPL-3 BL )"
+LICENSE="GPL-3+ cycles? ( Apache-2.0 )"
 SLOT="${PV%.*}"
 IUSE="+bullet +dds +fluid +openexr +tbb \
 	alembic collada +color-management cuda +cycles \
diff --git a/media-gfx/blender/blender-3.3.21.ebuild b/media-gfx/blender/blender-3.3.21.ebuild
new file mode 100644
index 000000000000..66c872c02cea
--- /dev/null
+++ b/media-gfx/blender/blender-3.3.21.ebuild
@@ -0,0 +1,432 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_10 python3_11 )
+
+inherit check-reqs cmake flag-o-matic pax-utils python-single-r1 toolchain-funcs xdg-utils
+
+DESCRIPTION="3D Creation/Animation/Publishing System"
+HOMEPAGE="https://www.blender.org"
+
+if [[ ${PV} = *9999* ]] ; then
+	# Subversion is needed for downloading unit test files
+	inherit git-r3 subversion
+	EGIT_REPO_URI="https://git.blender.org/blender.git"
+else
+	SRC_URI="https://download.blender.org/source/${P}.tar.xz"
+	# Update these between major releases.
+	TEST_TARBALL_VERSION="$(ver_cut 1-2).0"
+	#SRC_URI+=" test? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${TEST_TARBALL_VERSION}-tests.tar.xz )"
+	KEYWORDS="~amd64 ~arm ~arm64"
+fi
+
+LICENSE="GPL-3+ cycles? ( Apache-2.0 )"
+SLOT="${PV%.*}"
+IUSE="+bullet +dds +fluid +openexr +tbb \
+	alembic collada +color-management cuda +cycles \
+	debug doc +embree +ffmpeg +fftw +gmp headless jack jemalloc jpeg2k \
+	man +nanovdb ndof nls openal +oidn +openimageio +openmp +opensubdiv \
+	+openvdb optix osl +pdf +potrace +pugixml pulseaudio sdl +sndfile \
+	test +tiff valgrind"
+RESTRICT="!test? ( test ) test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	alembic? ( openexr )
+	cuda? ( cycles )
+	cycles? ( openexr tiff openimageio )
+	fluid? ( tbb )
+	openvdb? ( tbb )
+	optix? ( cuda )
+	osl? ( cycles )
+	test? ( color-management )"
+
+# Library versions for official builds can be found in the blender source directory in:
+# build_files/build_environment/install_deps.sh
+#
+# <opencolorio-2.3.0 for https://projects.blender.org/blender/blender/issues/112917.
+RDEPEND="${PYTHON_DEPS}
+	dev-libs/boost:=[nls?]
+	dev-libs/lzo:2=
+	$(python_gen_cond_dep '
+		dev-python/cython[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/zstandard[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+	')
+	media-libs/freetype:=[brotli]
+	media-libs/glew:*
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:=
+	media-libs/libsamplerate
+	sys-libs/zlib:=
+	virtual/glu
+	virtual/libintl
+	virtual/opengl
+	alembic? ( >=media-gfx/alembic-1.8.3-r2[boost(+),hdf(+)] )
+	collada? ( >=media-libs/opencollada-1.6.68 )
+	color-management? ( <media-libs/opencolorio-2.3.0:= )
+	cuda? ( dev-util/nvidia-cuda-toolkit:= )
+	embree? ( <media-libs/embree-4.0.0:=[raymask] )
+	ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?,vpx,vorbis,opus,xvid] )
+	fftw? ( sci-libs/fftw:3.0= )
+	gmp? ( dev-libs/gmp[cxx] )
+	!headless? (
+		x11-libs/libX11
+		x11-libs/libXi
+		x11-libs/libXxf86vm
+	)
+	jack? ( virtual/jack )
+	jemalloc? ( dev-libs/jemalloc:= )
+	jpeg2k? ( media-libs/openjpeg:2= )
+	ndof? (
+		app-misc/spacenavd
+		dev-libs/libspnav
+	)
+	nls? ( virtual/libiconv )
+	openal? ( media-libs/openal )
+	oidn? ( >=media-libs/oidn-1.4.1 )
+	openimageio? ( >=media-libs/openimageio-2.3.12.0-r3:= )
+	openexr? (
+		>=dev-libs/imath-3.1.4-r2:=
+		>=media-libs/openexr-3:0=
+	)
+	opensubdiv? ( >=media-libs/opensubdiv-3.4.0 )
+	openvdb? (
+		<media-gfx/openvdb-11.0.0:=[nanovdb?]
+		dev-libs/c-blosc:=
+	)
+	optix? ( <dev-libs/optix-7.5.0 )
+	osl? ( <media-libs/osl-1.13:= )
+	pdf? ( media-libs/libharu )
+	potrace? ( media-gfx/potrace )
+	pugixml? ( dev-libs/pugixml )
+	pulseaudio? ( media-libs/libpulse )
+	sdl? ( media-libs/libsdl2[sound,joystick] )
+	sndfile? ( media-libs/libsndfile )
+	tbb? ( dev-cpp/tbb:= )
+	tiff? ( media-libs/tiff:= )
+	valgrind? ( dev-debug/valgrind )
+"
+
+DEPEND="${RDEPEND}
+	dev-cpp/eigen:=
+"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? (
+		app-text/doxygen[dot]
+		dev-python/sphinx[latex]
+		dev-texlive/texlive-bibtexextra
+		dev-texlive/texlive-fontsextra
+		dev-texlive/texlive-fontutils
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexextra
+	)
+	nls? ( sys-devel/gettext )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.2.2-support-building-with-musl-libc.patch"
+	"${FILESDIR}/${PN}-3.2.2-Cycles-add-option-to-specify-OptiX-runtime-root-dire.patch"
+	"${FILESDIR}/${PN}-3.2.2-Fix-T100845-wrong-Cycles-OptiX-runtime-compilation-i.patch"
+	"${FILESDIR}/${PN}-3.3.0-fix-build-with-boost-1.81.patch"
+	"${FILESDIR}/${PN}-3.3.6-cycles-gcc13.patch"
+)
+
+blender_check_requirements() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+
+	if use doc; then
+		CHECKREQS_DISK_BUILD="4G" check-reqs_pkg_pretend
+	fi
+}
+
+blender_get_version() {
+	# Get blender version from blender itself.
+	BV=$(grep "BLENDER_VERSION " source/blender/blenkernel/BKE_blender_version.h | cut -d " " -f 3; assert)
+	if ((${BV:0:1} < 3)) ; then
+		# Add period (290 -> 2.90).
+		BV=${BV:0:1}.${BV:1}
+	else
+		# Add period and skip the middle number (301 -> 3.1)
+		BV=${BV:0:1}.${BV:2}
+	fi
+}
+
+pkg_pretend() {
+	blender_check_requirements
+}
+
+pkg_setup() {
+	blender_check_requirements
+	python-single-r1_pkg_setup
+}
+
+src_unpack() {
+	if [[ ${PV} = *9999* ]] ; then
+		git-r3_src_unpack
+		if use test; then
+			TESTS_SVN_URL=https://svn.blender.org/svnroot/bf-blender/trunk/lib/tests
+			subversion_fetch ${TESTS_SVN_URL} ../lib/tests
+		fi
+	else
+		default
+		if use test; then
+			#The tests are downloaded from: https://svn.blender.org/svnroot/bf-blender/tags/blender-${SLOT}-release/lib/tests
+			mkdir -p lib || die
+			mv "${WORKDIR}/blender-${TEST_TARBALL_VERSION}-tests/tests" lib || die
+		fi
+	fi
+
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	blender_get_version
+
+	# Disable MS Windows help generation. The variable doesn't do what it
+	# it sounds like.
+	sed -e "s|GENERATE_HTMLHELP      = YES|GENERATE_HTMLHELP      = NO|" \
+		-i doc/doxygen/Doxyfile || die
+
+	# Prepare icons and .desktop files for slotting.
+	sed -e "s|blender.svg|blender-${BV}.svg|" -i source/creator/CMakeLists.txt || die
+	sed -e "s|blender-symbolic.svg|blender-${BV}-symbolic.svg|" -i source/creator/CMakeLists.txt || die
+	sed -e "s|blender.desktop|blender-${BV}.desktop|" -i source/creator/CMakeLists.txt || die
+
+	sed -e "s|Name=Blender|Name=Blender ${PV}|" -i release/freedesktop/blender.desktop || die
+	sed -e "s|Exec=blender|Exec=blender-${BV}|" -i release/freedesktop/blender.desktop || die
+	sed -e "s|Icon=blender|Icon=blender-${BV}|" -i release/freedesktop/blender.desktop || die
+
+	mv release/freedesktop/icons/scalable/apps/blender.svg "release/freedesktop/icons/scalable/apps/blender-${BV}.svg" || die
+	mv release/freedesktop/icons/symbolic/apps/blender-symbolic.svg "release/freedesktop/icons/symbolic/apps/blender-${BV}-symbolic.svg" || die
+	mv release/freedesktop/blender.desktop "release/freedesktop/blender-${BV}.desktop" || die
+
+	if use test; then
+		# Without this the tests will try to use /usr/bin/blender and /usr/share/blender/ to run the tests.
+		sed -e "s|string(REPLACE.*|set(TEST_INSTALL_DIR ${T}/usr)|g" -i tests/CMakeLists.txt || die
+		sed -e "s|string(REPLACE.*|set(TEST_INSTALL_DIR ${T}/usr)|g" -i build_files/cmake/Modules/GTestTesting.cmake || die
+	fi
+}
+
+src_configure() {
+	# -Werror=odr, -Werror=lto-type-mismatch
+	# https://bugs.gentoo.org/859607
+	# https://projects.blender.org/blender/blender/issues/120444
+	filter-lto
+
+	# Workaround for bug #922600
+	append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
+
+	append-lfs-flags
+
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=OFF
+		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
+		-DPYTHON_LIBRARY="$(python_get_library_path)"
+		-DPYTHON_VERSION="${EPYTHON/python/}"
+		-DWITH_ALEMBIC=$(usex alembic)
+		-DWITH_ASSERT_ABORT=$(usex debug)
+		-DWITH_BOOST=ON
+		-DWITH_BULLET=$(usex bullet)
+		-DWITH_CODEC_FFMPEG=$(usex ffmpeg)
+		-DWITH_CODEC_SNDFILE=$(usex sndfile)
+		-DWITH_CXX_GUARDEDALLOC=$(usex debug)
+		-DWITH_CYCLES=$(usex cycles)
+		-DWITH_CYCLES_DEVICE_CUDA=$(usex cuda TRUE FALSE)
+		-DWITH_CYCLES_DEVICE_OPTIX=$(usex optix)
+		-DWITH_CYCLES_EMBREE=$(usex embree)
+		-DWITH_CYCLES_OSL=$(usex osl)
+		-DWITH_CYCLES_STANDALONE=OFF
+		-DWITH_CYCLES_STANDALONE_GUI=OFF
+		-DWITH_DOC_MANPAGE=$(usex man)
+		-DWITH_FFTW3=$(usex fftw)
+		-DWITH_GMP=$(usex gmp)
+		-DWITH_GTESTS=$(usex test)
+		-DWITH_HARU=$(usex pdf)
+		-DWITH_HEADLESS=$(usex headless)
+		-DWITH_INSTALL_PORTABLE=OFF
+		-DWITH_IMAGE_DDS=$(usex dds)
+		-DWITH_IMAGE_OPENEXR=$(usex openexr)
+		-DWITH_IMAGE_OPENJPEG=$(usex jpeg2k)
+		-DWITH_IMAGE_TIFF=$(usex tiff)
+		-DWITH_INPUT_NDOF=$(usex ndof)
+		-DWITH_INTERNATIONAL=$(usex nls)
+		-DWITH_JACK=$(usex jack)
+		-DWITH_MEM_JEMALLOC=$(usex jemalloc)
+		-DWITH_MEM_VALGRIND=$(usex valgrind)
+		-DWITH_MOD_FLUID=$(usex fluid)
+		-DWITH_MOD_OCEANSIM=$(usex fftw)
+		-DWITH_NANOVDB=$(usex nanovdb)
+		-DWITH_OPENAL=$(usex openal)
+		-DWITH_OPENCOLLADA=$(usex collada)
+		-DWITH_OPENCOLORIO=$(usex color-management)
+		-DWITH_OPENIMAGEDENOISE=$(usex oidn)
+		-DWITH_OPENIMAGEIO=$(usex openimageio)
+		-DWITH_OPENMP=$(usex openmp)
+		-DWITH_OPENSUBDIV=$(usex opensubdiv)
+		-DWITH_OPENVDB=$(usex openvdb)
+		-DWITH_OPENVDB_BLOSC=$(usex openvdb)
+		-DWITH_POTRACE=$(usex potrace)
+		-DWITH_PUGIXML=$(usex pugixml)
+		-DWITH_PULSEAUDIO=$(usex pulseaudio)
+		-DWITH_PYTHON_INSTALL=OFF
+		-DWITH_SDL=$(usex sdl)
+		-DWITH_STATIC_LIBS=OFF
+		-DWITH_SYSTEM_EIGEN3=ON
+		-DWITH_SYSTEM_FREETYPE=ON
+		-DWITH_SYSTEM_GLEW=ON
+		-DWITH_SYSTEM_LZO=ON
+		-DWITH_TBB=$(usex tbb)
+		-DWITH_USD=OFF
+		-DWITH_XR_OPENXR=OFF
+	)
+
+	if use optix; then
+		mycmakeargs+=(
+			-DCYCLES_RUNTIME_OPTIX_ROOT_DIR="${EPREFIX}"/opt/optix
+			-DOPTIX_ROOT_DIR="${EPREFIX}"/opt/optix
+		)
+	fi
+
+	# This is currently needed on arm64 to get the NEON SIMD wrapper to compile the code successfully
+	use arm64 && append-flags -flax-vector-conversions
+
+	append-flags $(usex debug '-DDEBUG' '-DNDEBUG')
+
+	if tc-is-gcc ; then
+		# These options only exist when GCC is detected.
+		# We disable these to respect the user's choice of linker.
+		mycmakeargs+=(
+			-DWITH_LINKER_GOLD=OFF
+			-DWITH_LINKER_LLD=OFF
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_test() {
+	# A lot of tests needs to have access to the installed data files.
+	# So install them into the image directory now.
+	DESTDIR="${T}" cmake_build install
+
+	blender_get_version
+	# Define custom blender data/script file paths not be able to find them otherwise during testing.
+	# (Because the data is in the image directory and it will default to look in /usr/share)
+	export BLENDER_SYSTEM_SCRIPTS="${T}/usr/share/blender/${BV}/scripts"
+	export BLENDER_SYSTEM_DATAFILES="${T}/usr/share/blender/${BV}/datafiles"
+
+	# Sanity check that the script and datafile path is valid.
+	# If they are not vaild, blender will fallback to the default path which is not what we want.
+	[ -d "$BLENDER_SYSTEM_SCRIPTS" ] || die "The custom script path is invalid, fix the ebuild!"
+	[ -d "$BLENDER_SYSTEM_DATAFILES" ] || die "The custom datafiles path is invalid, fix the ebuild!"
+
+	cmake_src_test
+
+	# Clean up the image directory for src_install
+	rm -fr "${T}"/usr || die
+}
+
+src_install() {
+	blender_get_version
+
+	# Pax mark blender for hardened support.
+	pax-mark m "${BUILD_DIR}"/bin/blender
+
+	cmake_src_install
+
+	if use man; then
+		# Slot the man page
+		mv "${ED}/usr/share/man/man1/blender.1" "${ED}/usr/share/man/man1/blender-${BV}.1" || die
+	fi
+
+	if use doc; then
+		# Define custom blender data/script file paths. Otherwise Blender will not be able to find them during doc building.
+		# (Because the data is in the image directory and it will default to look in /usr/share)
+		export BLENDER_SYSTEM_SCRIPTS=${ED}/usr/share/blender/${BV}/scripts
+		export BLENDER_SYSTEM_DATAFILES=${ED}/usr/share/blender/${BV}/datafiles
+
+		# Workaround for binary drivers.
+		addpredict /dev/ati
+		addpredict /dev/dri
+		addpredict /dev/nvidiactl
+
+		einfo "Generating Blender C/C++ API docs ..."
+		cd "${CMAKE_USE_DIR}"/doc/doxygen || die
+		doxygen -u Doxyfile || die
+		doxygen || die "doxygen failed to build API docs."
+
+		cd "${CMAKE_USE_DIR}" || die
+		einfo "Generating (BPY) Blender Python API docs ..."
+		"${BUILD_DIR}"/bin/blender --background --python doc/python_api/sphinx_doc_gen.py -noaudio || die "sphinx failed."
+
+		cd "${CMAKE_USE_DIR}"/doc/python_api || die
+		sphinx-build sphinx-in BPY_API || die "sphinx failed."
+
+		docinto "html/API/python"
+		dodoc -r "${CMAKE_USE_DIR}"/doc/python_api/BPY_API/.
+
+		docinto "html/API/blender"
+		dodoc -r "${CMAKE_USE_DIR}"/doc/doxygen/html/.
+	fi
+
+	# Fix doc installdir
+	docinto html
+	dodoc "${CMAKE_USE_DIR}"/release/text/readme.html
+	rm -r "${ED}"/usr/share/doc/blender || die
+
+	python_optimize "${ED}/usr/share/blender/${BV}/scripts"
+
+	mv "${ED}/usr/bin/blender-thumbnailer" "${ED}/usr/bin/blender-${BV}-thumbnailer" || die
+	mv "${ED}/usr/bin/blender" "${ED}/usr/bin/blender-${BV}" || die
+}
+
+pkg_postinst() {
+	elog
+	elog "Blender uses python integration. As such, may have some"
+	elog "inherent risks with running unknown python scripts."
+	elog
+	elog "It is recommended to change your blender temp directory"
+	elog "from /tmp to /home/user/tmp or another tmp file under your"
+	elog "home directory. This can be done by starting blender, then"
+	elog "changing the 'Temporary Files' directory in Blender preferences."
+	elog
+
+	if use osl; then
+		ewarn ""
+		ewarn "OSL is know to cause runtime segfaults if Mesa has been linked to"
+		ewarn "an other LLVM version than what OSL is linked to."
+		ewarn "See https://bugs.gentoo.org/880671 for more details"
+		ewarn ""
+	fi
+
+	if ! use python_single_target_python3_10; then
+		elog "You are building Blender with a newer python version than"
+		elog "supported by this version upstream."
+		elog "If you experience breakages with e.g. plugins, please switch to"
+		elog "python_single_target_python3_10 instead."
+		elog "Bug: https://bugs.gentoo.org/737388"
+		elog
+	fi
+
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+
+	ewarn ""
+	ewarn "You may want to remove the following directory."
+	ewarn "~/.config/${PN}/${SLOT}/cache/"
+	ewarn "It may contain extra render kernels not tracked by portage"
+	ewarn ""
+}
diff --git a/media-gfx/blender/blender-3.3.8.ebuild b/media-gfx/blender/blender-3.3.8.ebuild
index 89b057d5fd30..69f830424c87 100644
--- a/media-gfx/blender/blender-3.3.8.ebuild
+++ b/media-gfx/blender/blender-3.3.8.ebuild
@@ -22,7 +22,7 @@ else
 	KEYWORDS="amd64 ~arm ~arm64"
 fi
 
-LICENSE="|| ( GPL-3 BL )"
+LICENSE="GPL-3+ cycles? ( Apache-2.0 )"
 SLOT="${PV%.*}"
 IUSE="+bullet +dds +fluid +openexr +tbb \
 	alembic collada +color-management cuda +cycles \
diff --git a/media-gfx/blender/blender-3.6.15.ebuild b/media-gfx/blender/blender-3.6.15.ebuild
new file mode 100644
index 000000000000..698ccf250f72
--- /dev/null
+++ b/media-gfx/blender/blender-3.6.15.ebuild
@@ -0,0 +1,447 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_10 python3_11 )
+
+inherit check-reqs cmake flag-o-matic pax-utils python-single-r1 toolchain-funcs xdg-utils
+
+DESCRIPTION="3D Creation/Animation/Publishing System"
+HOMEPAGE="https://www.blender.org"
+
+if [[ ${PV} = *9999* ]] ; then
+	# Subversion is needed for downloading unit test files
+	inherit git-r3 subversion
+	EGIT_REPO_URI="https://projects.blender.org/blender/blender.git"
+	ADDONS_EGIT_REPO_URI="https://projects.blender.org/blender/blender-addons.git"
+else
+	SRC_URI="https://download.blender.org/source/${P}.tar.xz"
+	# Update these between major releases.
+	TEST_TARBALL_VERSION="$(ver_cut 1-2).0"
+	# SRC_URI+=" test? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${TEST_TARBALL_VERSION}-tests.tar.xz )"
+	KEYWORDS="~amd64 ~arm ~arm64"
+fi
+
+LICENSE="GPL-3+ cycles? ( Apache-2.0 )"
+SLOT="${PV%.*}"
+IUSE="+bullet +dds +fluid +openexr +tbb
+	alembic collada +color-management cuda +cycles cycles-bin-kernels
+	debug doc +embree +ffmpeg +fftw +gmp jack jemalloc jpeg2k
+	man +nanovdb ndof nls openal +oidn +openmp +openpgl +opensubdiv
+	+openvdb optix osl +pdf +potrace +pugixml pulseaudio sdl
+	+sndfile test +tiff valgrind wayland X"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	alembic? ( openexr )
+	cuda? ( cycles )
+	cycles? ( openexr tiff )
+	fluid? ( tbb )
+	openvdb? ( tbb )
+	optix? ( cuda )
+	osl? ( cycles )
+	test? ( color-management )"
+
+# Library versions for official builds can be found in the blender source directory in:
+# build_files/build_environment/install_deps.sh
+RDEPEND="${PYTHON_DEPS}
+	dev-libs/boost:=[nls?]
+	dev-libs/lzo:2=
+	$(python_gen_cond_dep '
+		dev-python/cython[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/zstandard[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+	')
+	media-libs/freetype:=[brotli]
+	media-libs/libepoxy:=
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:=
+	media-libs/libsamplerate
+	>=media-libs/openimageio-2.4.6.0:=
+	sys-libs/zlib:=
+	virtual/glu
+	virtual/libintl
+	virtual/opengl
+	alembic? ( >=media-gfx/alembic-1.8.3-r2[boost(+),hdf(+)] )
+	collada? ( >=media-libs/opencollada-1.6.68 )
+	color-management? ( media-libs/opencolorio:= )
+	cuda? ( dev-util/nvidia-cuda-toolkit:= )
+	embree? ( >=media-libs/embree-3.10.0:=[raymask] )
+	ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?,vpx,vorbis,opus,xvid] )
+	fftw? ( sci-libs/fftw:3.0= )
+	gmp? ( dev-libs/gmp[cxx] )
+	jack? ( virtual/jack )
+	jemalloc? ( dev-libs/jemalloc:= )
+	jpeg2k? ( media-libs/openjpeg:2= )
+	ndof? (
+		app-misc/spacenavd
+		dev-libs/libspnav
+	)
+	nls? ( virtual/libiconv )
+	openal? ( media-libs/openal )
+	oidn? ( >=media-libs/oidn-1.4.1 )
+	openexr? (
+		>=dev-libs/imath-3.1.4-r2:=
+		>=media-libs/openexr-3:0=
+	)
+	openpgl? ( media-libs/openpgl:0/0.5 )
+	opensubdiv? ( >=media-libs/opensubdiv-3.4.0 )
+	openvdb? (
+		<media-gfx/openvdb-11.0.0:=[nanovdb?]
+		dev-libs/c-blosc:=
+	)
+	optix? ( <dev-libs/optix-7.5.0 )
+	osl? ( <media-libs/osl-1.13:= )
+	pdf? ( media-libs/libharu )
+	potrace? ( media-gfx/potrace )
+	pugixml? ( dev-libs/pugixml )
+	pulseaudio? ( media-libs/libpulse )
+	sdl? ( media-libs/libsdl2[sound,joystick] )
+	sndfile? ( media-libs/libsndfile )
+	tbb? ( dev-cpp/tbb:= )
+	tiff? ( media-libs/tiff:= )
+	valgrind? ( dev-debug/valgrind )
+	wayland? (
+		>=dev-libs/wayland-1.12
+		>=dev-libs/wayland-protocols-1.15
+		>=x11-libs/libxkbcommon-0.2.0
+		media-libs/mesa[wayland]
+		sys-apps/dbus
+	)
+	X? (
+		x11-libs/libX11
+		x11-libs/libXi
+		x11-libs/libXxf86vm
+	)
+"
+
+DEPEND="${RDEPEND}
+	dev-cpp/eigen:=
+"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? (
+		app-text/doxygen[dot]
+		dev-python/sphinx[latex]
+		dev-texlive/texlive-bibtexextra
+		dev-texlive/texlive-fontsextra
+		dev-texlive/texlive-fontutils
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexextra
+	)
+	nls? ( sys-devel/gettext )
+	wayland? (
+		dev-util/wayland-scanner
+	)
+"
+
+blender_check_requirements() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+
+	if use doc; then
+		CHECKREQS_DISK_BUILD="4G" check-reqs_pkg_pretend
+	fi
+}
+
+blender_get_version() {
+	# Get blender version from blender itself.
+	BV=$(grep "BLENDER_VERSION " source/blender/blenkernel/BKE_blender_version.h | cut -d " " -f 3; assert)
+	if ((${BV:0:1} < 3)) ; then
+		# Add period (290 -> 2.90).
+		BV=${BV:0:1}.${BV:1}
+	else
+		# Add period and skip the middle number (301 -> 3.1)
+		BV=${BV:0:1}.${BV:2}
+	fi
+}
+
+pkg_pretend() {
+	blender_check_requirements
+}
+
+pkg_setup() {
+	blender_check_requirements
+	python-single-r1_pkg_setup
+}
+
+src_unpack() {
+	if [[ ${PV} = *9999* ]] ; then
+		git-r3_src_unpack
+
+		git-r3_fetch "${ADDONS_EGIT_REPO_URI}"
+		git-r3_checkout "${ADDONS_EGIT_REPO_URI}" "${S}/scripts/addons"
+
+		if use test; then
+			TESTS_SVN_URL=https://svn.blender.org/svnroot/bf-blender/trunk/lib/tests
+			subversion_fetch ${TESTS_SVN_URL} ../lib/tests
+		fi
+		ASSETS_SVN_URL=https://svn.blender.org/svnroot/bf-blender/trunk/lib/assets
+		subversion_fetch ${ASSETS_SVN_URL} ../lib/assets
+	else
+		default
+		if use test; then
+			#The tests are downloaded from: https://svn.blender.org/svnroot/bf-blender/tags/blender-${SLOT}-release/lib/tests
+			mkdir -p lib || die
+			mv "${WORKDIR}/blender-${TEST_TARBALL_VERSION}-tests/tests" lib || die
+		fi
+	fi
+
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	blender_get_version
+
+	# Disable MS Windows help generation. The variable doesn't do what it
+	# it sounds like.
+	sed -e "s|GENERATE_HTMLHELP      = YES|GENERATE_HTMLHELP      = NO|" \
+		-i doc/doxygen/Doxyfile || die
+
+	# Prepare icons and .desktop files for slotting.
+	sed -e "s|blender.svg|blender-${BV}.svg|" -i source/creator/CMakeLists.txt || die
+	sed -e "s|blender-symbolic.svg|blender-${BV}-symbolic.svg|" -i source/creator/CMakeLists.txt || die
+	sed -e "s|blender.desktop|blender-${BV}.desktop|" -i source/creator/CMakeLists.txt || die
+
+	sed -e "s|Name=Blender|Name=Blender ${PV}|" -i release/freedesktop/blender.desktop || die
+	sed -e "s|Exec=blender|Exec=blender-${BV}|" -i release/freedesktop/blender.desktop || die
+	sed -e "s|Icon=blender|Icon=blender-${BV}|" -i release/freedesktop/blender.desktop || die
+
+	mv release/freedesktop/icons/scalable/apps/blender.svg "release/freedesktop/icons/scalable/apps/blender-${BV}.svg" || die
+	mv release/freedesktop/icons/symbolic/apps/blender-symbolic.svg "release/freedesktop/icons/symbolic/apps/blender-${BV}-symbolic.svg" || die
+	mv release/freedesktop/blender.desktop "release/freedesktop/blender-${BV}.desktop" || die
+
+	if use test; then
+		# Without this the tests will try to use /usr/bin/blender and /usr/share/blender/ to run the tests.
+		sed -e "s|set(TEST_INSTALL_DIR.*|set(TEST_INSTALL_DIR ${T}/usr)|g" -i tests/CMakeLists.txt || die
+		sed -e "s|string(REPLACE.*|set(TEST_INSTALL_DIR ${T}/usr)|g" -i build_files/cmake/Modules/GTestTesting.cmake || die
+	fi
+}
+
+src_configure() {
+	# -Werror=odr, -Werror=lto-type-mismatch
+	# https://bugs.gentoo.org/859607
+	# https://projects.blender.org/blender/blender/issues/120444
+	filter-lto
+
+	# Workaround for bug #922600
+	append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
+
+	append-lfs-flags
+	blender_get_version
+
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=OFF
+		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
+		-DPYTHON_LIBRARY="$(python_get_library_path)"
+		-DPYTHON_VERSION="${EPYTHON/python/}"
+		-DWITH_ALEMBIC=$(usex alembic)
+		-DWITH_ASSERT_ABORT=$(usex debug)
+		-DWITH_BOOST=ON
+		-DWITH_BULLET=$(usex bullet)
+		-DWITH_CODEC_FFMPEG=$(usex ffmpeg)
+		-DWITH_CODEC_SNDFILE=$(usex sndfile)
+		-DWITH_CXX_GUARDEDALLOC=$(usex debug)
+		-DWITH_CYCLES=$(usex cycles)
+		-DWITH_CYCLES_CUDA_BINARIES=$(usex cycles-bin-kernels)
+		-DWITH_CYCLES_DEVICE_CUDA=$(usex cuda TRUE FALSE)
+		-DWITH_CYCLES_DEVICE_OPTIX=$(usex optix)
+		-DWITH_CYCLES_EMBREE=$(usex embree)
+		-DWITH_CYCLES_OSL=$(usex osl)
+		-DWITH_CYCLES_PATH_GUIDING=$(usex openpgl)
+		-DWITH_CYCLES_STANDALONE=OFF
+		-DWITH_CYCLES_STANDALONE_GUI=OFF
+		-DWITH_DOC_MANPAGE=$(usex man)
+		-DWITH_FFTW3=$(usex fftw)
+		-DWITH_GHOST_WAYLAND=$(usex wayland)
+		-DWITH_GHOST_WAYLAND_APP_ID="blender-${BV}"
+		-DWITH_GHOST_WAYLAND_DBUS=$(usex wayland)
+		-DWITH_GHOST_WAYLAND_DYNLOAD=OFF
+		-DWITH_GHOST_WAYLAND_LIBDECOR=OFF
+		-DWITH_GHOST_X11=$(usex X)
+		-DWITH_GMP=$(usex gmp)
+		-DWITH_GTESTS=$(usex test)
+		-DWITH_HARU=$(usex pdf)
+		-DWITH_HEADLESS=$($(use X || use wayland) && echo OFF || echo ON)
+		-DWITH_INSTALL_PORTABLE=OFF
+		-DWITH_IMAGE_DDS=$(usex dds)
+		-DWITH_IMAGE_OPENEXR=$(usex openexr)
+		-DWITH_IMAGE_OPENJPEG=$(usex jpeg2k)
+		-DWITH_IMAGE_TIFF=$(usex tiff)
+		-DWITH_INPUT_NDOF=$(usex ndof)
+		-DWITH_INTERNATIONAL=$(usex nls)
+		-DWITH_JACK=$(usex jack)
+		-DWITH_MEM_JEMALLOC=$(usex jemalloc)
+		-DWITH_MEM_VALGRIND=$(usex valgrind)
+		-DWITH_MOD_FLUID=$(usex fluid)
+		-DWITH_MOD_OCEANSIM=$(usex fftw)
+		-DWITH_NANOVDB=$(usex nanovdb)
+		-DWITH_OPENAL=$(usex openal)
+		-DWITH_OPENCOLLADA=$(usex collada)
+		-DWITH_OPENCOLORIO=$(usex color-management)
+		-DWITH_OPENIMAGEDENOISE=$(usex oidn)
+		-DWITH_OPENMP=$(usex openmp)
+		-DWITH_OPENSUBDIV=$(usex opensubdiv)
+		-DWITH_OPENVDB=$(usex openvdb)
+		-DWITH_OPENVDB_BLOSC=$(usex openvdb)
+		-DWITH_POTRACE=$(usex potrace)
+		-DWITH_PUGIXML=$(usex pugixml)
+		-DWITH_PULSEAUDIO=$(usex pulseaudio)
+		-DWITH_PYTHON_INSTALL=OFF
+		-DWITH_SDL=$(usex sdl)
+		-DWITH_STATIC_LIBS=OFF
+		-DWITH_SYSTEM_EIGEN3=ON
+		-DWITH_SYSTEM_FREETYPE=ON
+		-DWITH_SYSTEM_LZO=ON
+		-DWITH_TBB=$(usex tbb)
+		-DWITH_USD=OFF
+		-DWITH_XR_OPENXR=OFF
+	)
+
+	if use optix; then
+		mycmakeargs+=(
+			-DCYCLES_RUNTIME_OPTIX_ROOT_DIR="${EPREFIX}"/opt/optix
+			-DOPTIX_ROOT_DIR="${EPREFIX}"/opt/optix
+		)
+	fi
+
+	# This is currently needed on arm64 to get the NEON SIMD wrapper to compile the code successfully
+	use arm64 && append-flags -flax-vector-conversions
+
+	append-flags $(usex debug '-DDEBUG' '-DNDEBUG')
+
+	if tc-is-gcc ; then
+		# These options only exist when GCC is detected.
+		# We disable these to respect the user's choice of linker.
+		mycmakeargs+=(
+			-DWITH_LINKER_GOLD=OFF
+			-DWITH_LINKER_LLD=OFF
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_test() {
+	# A lot of tests needs to have access to the installed data files.
+	# So install them into the image directory now.
+	DESTDIR="${T}" cmake_build install
+
+	blender_get_version
+	# Define custom blender data/script file paths not be able to find them otherwise during testing.
+	# (Because the data is in the image directory and it will default to look in /usr/share)
+	export BLENDER_SYSTEM_SCRIPTS="${T}/usr/share/blender/${BV}/scripts"
+	export BLENDER_SYSTEM_DATAFILES="${T}/usr/share/blender/${BV}/datafiles"
+
+	# Sanity check that the script and datafile path is valid.
+	# If they are not vaild, blender will fallback to the default path which is not what we want.
+	[ -d "$BLENDER_SYSTEM_SCRIPTS" ] || die "The custom script path is invalid, fix the ebuild!"
+	[ -d "$BLENDER_SYSTEM_DATAFILES" ] || die "The custom datafiles path is invalid, fix the ebuild!"
+
+	cmake_src_test
+
+	# Clean up the image directory for src_install
+	rm -fr "${T}"/usr || die
+}
+
+src_install() {
+	blender_get_version
+
+	# Pax mark blender for hardened support.
+	pax-mark m "${BUILD_DIR}"/bin/blender
+
+	cmake_src_install
+
+	if use man; then
+		# Slot the man page
+		mv "${ED}/usr/share/man/man1/blender.1" "${ED}/usr/share/man/man1/blender-${BV}.1" || die
+	fi
+
+	if use doc; then
+		# Define custom blender data/script file paths. Otherwise Blender will not be able to find them during doc building.
+		# (Because the data is in the image directory and it will default to look in /usr/share)
+		export BLENDER_SYSTEM_SCRIPTS=${ED}/usr/share/blender/${BV}/scripts
+		export BLENDER_SYSTEM_DATAFILES=${ED}/usr/share/blender/${BV}/datafiles
+
+		# Workaround for binary drivers.
+		addpredict /dev/ati
+		addpredict /dev/dri
+		addpredict /dev/nvidiactl
+
+		einfo "Generating Blender C/C++ API docs ..."
+		cd "${CMAKE_USE_DIR}"/doc/doxygen || die
+		doxygen -u Doxyfile || die
+		doxygen || die "doxygen failed to build API docs."
+
+		cd "${CMAKE_USE_DIR}" || die
+		einfo "Generating (BPY) Blender Python API docs ..."
+		"${BUILD_DIR}"/bin/blender --background --python doc/python_api/sphinx_doc_gen.py -noaudio || die "sphinx failed."
+
+		cd "${CMAKE_USE_DIR}"/doc/python_api || die
+		sphinx-build sphinx-in BPY_API || die "sphinx failed."
+
+		docinto "html/API/python"
+		dodoc -r "${CMAKE_USE_DIR}"/doc/python_api/BPY_API/.
+
+		docinto "html/API/blender"
+		dodoc -r "${CMAKE_USE_DIR}"/doc/doxygen/html/.
+	fi
+
+	# Fix doc installdir
+	docinto html
+	dodoc "${CMAKE_USE_DIR}"/release/text/readme.html
+	rm -r "${ED}"/usr/share/doc/blender || die
+
+	python_optimize "${ED}/usr/share/blender/${BV}/scripts"
+
+	mv "${ED}/usr/bin/blender-thumbnailer" "${ED}/usr/bin/blender-${BV}-thumbnailer" || die
+	mv "${ED}/usr/bin/blender" "${ED}/usr/bin/blender-${BV}" || die
+}
+
+pkg_postinst() {
+	elog
+	elog "Blender uses python integration. As such, may have some"
+	elog "inherent risks with running unknown python scripts."
+	elog
+	elog "It is recommended to change your blender temp directory"
+	elog "from /tmp to /home/user/tmp or another tmp file under your"
+	elog "home directory. This can be done by starting blender, then"
+	elog "changing the 'Temporary Files' directory in Blender preferences."
+	elog
+
+	if use osl; then
+		ewarn ""
+		ewarn "OSL is know to cause runtime segfaults if Mesa has been linked to"
+		ewarn "an other LLVM version than what OSL is linked to."
+		ewarn "See https://bugs.gentoo.org/880671 for more details"
+		ewarn ""
+	fi
+
+	if ! use python_single_target_python3_10; then
+		elog "You are building Blender with a newer python version than"
+		elog "supported by this version upstream."
+		elog "If you experience breakages with e.g. plugins, please switch to"
+		elog "python_single_target_python3_10 instead."
+		elog "Bug: https://bugs.gentoo.org/737388"
+		elog
+	fi
+
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+
+	ewarn ""
+	ewarn "You may want to remove the following directory."
+	ewarn "~/.config/${PN}/${SLOT}/cache/"
+	ewarn "It may contain extra render kernels not tracked by portage"
+	ewarn ""
+}
diff --git a/media-gfx/blender/blender-3.6.8.ebuild b/media-gfx/blender/blender-3.6.8.ebuild
index 12092454eb33..f127201b747a 100644
--- a/media-gfx/blender/blender-3.6.8.ebuild
+++ b/media-gfx/blender/blender-3.6.8.ebuild
@@ -23,7 +23,7 @@ else
 	KEYWORDS="amd64 ~arm ~arm64"
 fi
 
-LICENSE="|| ( GPL-3 BL )"
+LICENSE="GPL-3+ cycles? ( Apache-2.0 )"
 SLOT="${PV%.*}"
 IUSE="+bullet +dds +fluid +openexr +tbb
 	alembic collada +color-management cuda +cycles cycles-bin-kernels
diff --git a/media-gfx/blender/blender-4.0.2-r1.ebuild b/media-gfx/blender/blender-4.0.2-r1.ebuild
index 29465c4df628..ae693845b6b7 100644
--- a/media-gfx/blender/blender-4.0.2-r1.ebuild
+++ b/media-gfx/blender/blender-4.0.2-r1.ebuild
@@ -31,7 +31,7 @@ else
 	RESTRICT="test" # the test archive returns LFS references.
 fi
 
-LICENSE="|| ( GPL-3 BL )"
+LICENSE="GPL-3+ cycles? ( Apache-2.0 )"
 SLOT="${PV%.*}"
 IUSE="
 	alembic +bullet collada +color-management cuda +cycles +cycles-bin-kernels
@@ -83,7 +83,7 @@ RDEPEND="${PYTHON_DEPS}
 	embree? ( media-libs/embree:=[raymask] )
 	ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?,vpx,vorbis,opus,xvid] )
 	fftw? ( sci-libs/fftw:3.0= )
-	gmp? ( dev-libs/gmp )
+	gmp? ( dev-libs/gmp[cxx] )
 	gnome? ( gui-libs/libdecor )
 	hip? ( >=dev-util/hip-5.7:= )
 	jack? ( virtual/jack )
diff --git a/media-gfx/blender/blender-4.1.1-r2.ebuild b/media-gfx/blender/blender-4.1.1-r2.ebuild
new file mode 100644
index 000000000000..b39222330cbf
--- /dev/null
+++ b/media-gfx/blender/blender-4.1.1-r2.ebuild
@@ -0,0 +1,609 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{11..12} )
+# NOTE must match media-libs/osl
+LLVM_COMPAT=( {15..18} )
+LLVM_OPTIONAL=1
+
+inherit check-reqs cmake cuda flag-o-matic llvm-r1 pax-utils python-single-r1 toolchain-funcs xdg-utils
+
+DESCRIPTION="3D Creation/Animation/Publishing System"
+HOMEPAGE="https://www.blender.org"
+
+if [[ ${PV} = *9999* ]] ; then
+	EGIT_LFS="yes"
+	inherit git-r3
+	EGIT_REPO_URI="https://projects.blender.org/blender/blender.git"
+	EGIT_SUBMODULES=( '*' '-lib/*' )
+	ADDONS_EGIT_REPO_URI="https://projects.blender.org/blender/blender-addons.git"
+	RESTRICT="!test? ( test )"
+else
+	SRC_URI="
+		https://download.blender.org/source/${P}.tar.xz
+	"
+	# 	test? (
+	# 		https://projects.blender.org/blender/blender-test-data/archive/blender-v$(ver_cut 1-2)-release.tar.gz
+	# 	)
+	# "
+	KEYWORDS="amd64 ~arm ~arm64"
+	RESTRICT="test" # the test archive returns LFS references.
+fi
+
+LICENSE="GPL-3+ cycles? ( Apache-2.0 )"
+SLOT="${PV%.*}"
+IUSE="
+	alembic +bullet collada +color-management cuda +cycles +cycles-bin-kernels
+	debug doc +embree experimental +ffmpeg +fftw +fluid +gmp gnome hip jack
+	jemalloc jpeg2k man +nanovdb ndof nls +oidn oneapi openal +openexr +openmp openpgl
+	+opensubdiv +openvdb optix osl +otf +pdf +potrace +pugixml pulseaudio
+	renderdoc sdl +sndfile +tbb test +tiff valgrind vulkan wayland +webp X
+"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	alembic? ( openexr )
+	cuda? ( cycles )
+	cycles? ( openexr tiff tbb )
+	fluid? ( tbb )
+	gnome? ( wayland )
+	hip? ( cycles )
+	nanovdb? ( openvdb )
+	openvdb? ( tbb openexr )
+	optix? ( cuda )
+	osl? ( cycles pugixml )
+	test? ( color-management )"
+
+# Library versions for official builds can be found in the blender source directory in:
+# build_files/build_environment/cmake/versions.cmake
+RDEPEND="${PYTHON_DEPS}
+	app-arch/zstd
+	dev-libs/boost:=[nls?]
+	dev-libs/lzo:2=
+	$(python_gen_cond_dep '
+		dev-python/cython[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/zstandard[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+	')
+	media-libs/freetype:=[brotli]
+	media-libs/libepoxy:=
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:=
+	media-libs/libsamplerate
+	>=media-libs/openimageio-2.5.6.0:=
+	sys-libs/zlib:=
+	virtual/glu
+	virtual/libintl
+	virtual/opengl
+	alembic? ( >=media-gfx/alembic-1.8.3-r2[boost(+),hdf(+)] )
+	collada? ( >=media-libs/opencollada-1.6.68 )
+	color-management? ( media-libs/opencolorio:= )
+	cuda? ( dev-util/nvidia-cuda-toolkit:= )
+	embree? ( media-libs/embree:=[raymask] )
+	ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?,vpx,vorbis,opus,xvid] )
+	fftw? ( sci-libs/fftw:3.0= )
+	gmp? ( dev-libs/gmp[cxx] )
+	gnome? ( gui-libs/libdecor )
+	hip? (
+		llvm_slot_17? (
+			dev-util/hip:0/5.7
+		)
+		llvm_slot_18? (
+			>=dev-util/hip-6.1:=[llvm_slot_18(-)]
+		)
+	)
+	jack? ( virtual/jack )
+	jemalloc? ( dev-libs/jemalloc:= )
+	jpeg2k? ( media-libs/openjpeg:2= )
+	ndof? (
+		app-misc/spacenavd
+		dev-libs/libspnav
+	)
+	nls? ( virtual/libiconv )
+	openal? ( media-libs/openal )
+	oidn? ( >=media-libs/oidn-2.1.0[${LLVM_USEDEP}] )
+	oneapi? ( dev-libs/intel-compute-runtime[l0] )
+	openexr? (
+		>=dev-libs/imath-3.1.7:=
+		>=media-libs/openexr-3.2.1:0=
+	)
+	openpgl? ( media-libs/openpgl:= )
+	opensubdiv? ( >=media-libs/opensubdiv-3.5.0 )
+	openvdb? (
+		>=media-gfx/openvdb-11.0.0:=[nanovdb?]
+		dev-libs/c-blosc:=
+	)
+	optix? ( dev-libs/optix )
+	osl? (
+		>=media-libs/osl-1.13:=[${LLVM_USEDEP}]
+		media-libs/mesa[${LLVM_USEDEP}]
+	)
+	pdf? ( media-libs/libharu )
+	potrace? ( media-gfx/potrace )
+	pugixml? ( dev-libs/pugixml )
+	pulseaudio? ( media-libs/libpulse )
+	sdl? ( media-libs/libsdl2[sound,joystick] )
+	sndfile? ( media-libs/libsndfile )
+	tbb? ( dev-cpp/tbb:= )
+	tiff? ( media-libs/tiff:= )
+	valgrind? ( dev-debug/valgrind )
+	wayland? (
+		>=dev-libs/wayland-1.12
+		>=dev-libs/wayland-protocols-1.15
+		>=x11-libs/libxkbcommon-0.2.0
+		dev-util/wayland-scanner
+		media-libs/mesa[wayland]
+		sys-apps/dbus
+	)
+	vulkan? (
+		media-libs/shaderc
+		dev-util/spirv-tools
+		dev-util/glslang
+		media-libs/vulkan-loader
+	)
+	otf? (
+		media-libs/harfbuzz
+	)
+	renderdoc? (
+		media-gfx/renderdoc
+	)
+	X? (
+		x11-libs/libX11
+		x11-libs/libXi
+		x11-libs/libXxf86vm
+	)
+"
+
+DEPEND="${RDEPEND}
+	dev-cpp/eigen:=
+	vulkan? (
+		dev-util/spirv-headers
+		dev-util/vulkan-headers
+	)
+"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? (
+		app-text/doxygen[dot]
+		dev-python/sphinx[latex]
+		dev-texlive/texlive-bibtexextra
+		dev-texlive/texlive-fontsextra
+		dev-texlive/texlive-fontutils
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexextra
+	)
+	nls? ( sys-devel/gettext )
+	wayland? (
+		dev-util/wayland-scanner
+	)
+	X? (
+		x11-base/xorg-proto
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.0.2-FindClang.patch"
+	"${FILESDIR}/${PN}-4.0.2-CUDA_NVCC_FLAGS.patch"
+	"${FILESDIR}/${PN}-4.1.1-FindLLVM.patch"
+	"${FILESDIR}/${PN}-4.1.1-numpy.patch"
+)
+
+blender_check_requirements() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+
+	if use doc; then
+		CHECKREQS_DISK_BUILD="4G" check-reqs_pkg_pretend
+	fi
+}
+
+blender_get_version() {
+	# Get blender version from blender itself.
+	BV=$(grep "BLENDER_VERSION " source/blender/blenkernel/BKE_blender_version.h | cut -d " " -f 3; assert)
+	if ((${BV:0:1} < 3)) ; then
+		# Add period (290 -> 2.90).
+		BV=${BV:0:1}.${BV:1}
+	else
+		# Add period and skip the middle number (301 -> 3.1)
+		BV=${BV:0:1}.${BV:2}
+	fi
+}
+
+pkg_pretend() {
+	blender_check_requirements
+
+	if use oneapi; then
+		einfo "The Intel oneAPI support is rudimentary."
+		einfo ""
+		einfo "Please report any bugs you find to https://bugs.gentoo.org/"
+	fi
+}
+
+pkg_setup() {
+	if use osl; then
+		llvm-r1_pkg_setup
+	fi
+
+	blender_check_requirements
+	python-single-r1_pkg_setup
+}
+
+src_unpack() {
+	if [[ ${PV} = *9999* ]] ; then
+		if ! use test; then
+			EGIT_SUBMODULES+=( '-tests/*' )
+		fi
+		git-r3_src_unpack
+
+		git-r3_fetch "${ADDONS_EGIT_REPO_URI}"
+		git-r3_checkout "${ADDONS_EGIT_REPO_URI}" "${S}/scripts/addons"
+	else
+		default
+
+		if use test; then
+			mkdir -p "${S}/tests/data/" || die
+			mv blender-test-data/* "${S}/tests/data/" || die
+		fi
+	fi
+}
+
+src_prepare() {
+	use cuda && cuda_src_prepare
+
+	cmake_src_prepare
+
+	blender_get_version
+
+	# Disable MS Windows help generation. The variable doesn't do what it
+	# it sounds like.
+	sed -e "s|GENERATE_HTMLHELP      = YES|GENERATE_HTMLHELP      = NO|" \
+		-i doc/doxygen/Doxyfile || die
+
+	# Prepare icons and .desktop files for slotting.
+	sed \
+		-e "s|blender.svg|blender-${BV}.svg|" \
+		-e "s|blender-symbolic.svg|blender-${BV}-symbolic.svg|" \
+		-e "s|blender.desktop|blender-${BV}.desktop|" \
+		-e "s|org.blender.Blender.metainfo.xml|blender-${BV}.metainfo.xml|" \
+		-i source/creator/CMakeLists.txt || die
+
+	sed \
+		-e "s|Name=Blender|Name=Blender ${BV}|" \
+		-e "s|Exec=blender|Exec=blender-${BV}|" \
+		-e "s|Icon=blender|Icon=blender-${BV}|" \
+		-i release/freedesktop/blender.desktop || die
+
+	sed -e "s|\${CMAKE_INSTALL_PREFIX}/\${BLENDER_BIN}|${T}/usr/\${BLENDER_BIN}|g" -i source/creator/CMakeLists.txt || die
+
+	mv \
+		release/freedesktop/icons/scalable/apps/blender.svg \
+		"release/freedesktop/icons/scalable/apps/blender-${BV}.svg" || die
+	mv \
+		release/freedesktop/icons/symbolic/apps/blender-symbolic.svg \
+		"release/freedesktop/icons/symbolic/apps/blender-${BV}-symbolic.svg" || die
+	mv release/freedesktop/blender.desktop "release/freedesktop/blender-${BV}.desktop" || die
+	mv release/freedesktop/org.blender.Blender.metainfo.xml "release/freedesktop/blender-${BV}.metainfo.xml"
+	mv release/freedesktop/org.blender.Blender.appdata.xml "release/freedesktop/blender-${BV}.appdata.xml"
+
+	if use test; then
+		# Without this the tests will try to use /usr/bin/blender and /usr/share/blender/ to run the tests.
+		sed -e "s|set(TEST_INSTALL_DIR.*|set(TEST_INSTALL_DIR ${T}/usr)|g" -i tests/CMakeLists.txt || die
+		sed -e "s|string(REPLACE.*|set(TEST_INSTALL_DIR ${T}/usr)|g" -i build_files/cmake/testing.cmake || die
+	fi
+
+	if use vulkan; then
+		sed -e "s/extern_vulkan_memory_allocator/extern_vulkan_memory_allocator\nSPIRV-Tools-opt\nSPIRV-Tools\nSPIRV-Tools-link\nglslang\nSPIRV\nSPVRemapper/" -i source/blender/gpu/CMakeLists.txt || die
+	fi
+}
+
+src_configure() {
+	# -Werror=odr, -Werror=lto-type-mismatch
+	# https://bugs.gentoo.org/859607
+	# https://projects.blender.org/blender/blender/issues/120444
+	filter-lto
+
+	# Workaround for bug #922600
+	append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
+
+	append-lfs-flags
+	blender_get_version
+
+	local mycmakeargs=(
+		-DWITH_LIBS_PRECOMPILED=no
+		-DBUILD_SHARED_LIBS=no
+		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
+		-DPYTHON_LIBRARY="$(python_get_library_path)"
+		-DPYTHON_VERSION="${EPYTHON/python/}"
+		-DWITH_ALEMBIC=$(usex alembic)
+		-DWITH_BOOST=yes
+		-DWITH_BULLET=$(usex bullet)
+		-DWITH_CODEC_FFMPEG=$(usex ffmpeg)
+		-DWITH_CODEC_SNDFILE=$(usex sndfile)
+
+		-DWITH_CYCLES=$(usex cycles)
+
+		-DWITH_CYCLES_DEVICE_CUDA=$(usex cuda)
+		-DWITH_CYCLES_CUDA_BINARIES="$(usex cuda $(usex cycles-bin-kernels))"
+		-DWITH_CYCLES_DEVICE_OPTIX=$(usex optix)
+
+		-DWITH_CYCLES_DEVICE_HIP="$(usex hip)"
+		-DWITH_CYCLES_HIP_BINARIES=$(usex hip $(usex cycles-bin-kernels))
+
+		-DWITH_CYCLES_DEVICE_ONEAPI="$(usex oneapi)"
+		-DWITH_CYCLES_ONEAPI_BINARIES="$(usex oneapi $(usex cycles-bin-kernels))"
+
+		-DWITH_CYCLES_HYDRA_RENDER_DELEGATE="no" # TODO: package Hydra
+		-DWITH_CYCLES_EMBREE="$(usex embree)"
+		-DWITH_CYCLES_OSL=$(usex osl)
+		-DWITH_CYCLES_PATH_GUIDING=$(usex openpgl)
+		-DWITH_CYCLES_STANDALONE=no
+		-DWITH_CYCLES_STANDALONE_GUI=no
+
+		-DWITH_DOC_MANPAGE=$(usex man)
+		-DWITH_DRACO="no" # TODO: Package Draco
+		-DWITH_EXPERIMENTAL_FEATURES="$(usex experimental)"
+		-DWITH_FFTW3=$(usex fftw)
+		-DWITH_GHOST_WAYLAND=$(usex wayland)
+		-DWITH_GHOST_WAYLAND_DYNLOAD="no"
+		-DWITH_GHOST_X11=$(usex X)
+		-DWITH_GMP=$(usex gmp)
+		-DWITH_GTESTS=$(usex test)
+		-DWITH_HARFBUZZ="$(usex otf)"
+		-DWITH_HARU=$(usex pdf)
+		-DWITH_HEADLESS=$($(use X || use wayland) && echo OFF || echo ON)
+		-DWITH_HYDRA="no" # TODO: Package Hydra
+		-DWITH_IMAGE_OPENEXR=$(usex openexr)
+		-DWITH_IMAGE_OPENJPEG=$(usex jpeg2k)
+		-DWITH_IMAGE_WEBP=$(usex webp)
+		-DWITH_INPUT_NDOF=$(usex ndof)
+		-DWITH_INSTALL_PORTABLE="no"
+		-DWITH_INTERNATIONAL=$(usex nls)
+		-DWITH_JACK=$(usex jack)
+		-DWITH_MATERIALX="no" # TODO: Package MaterialX
+		-DWITH_MEM_JEMALLOC=$(usex jemalloc)
+		-DWITH_MEM_VALGRIND=$(usex valgrind)
+		-DWITH_MOD_FLUID=$(usex fluid)
+		-DWITH_MOD_OCEANSIM=$(usex fftw)
+		-DWITH_NANOVDB=$(usex nanovdb)
+		-DWITH_OPENAL=$(usex openal)
+		-DWITH_OPENCOLLADA=$(usex collada)
+		-DWITH_OPENCOLORIO=$(usex color-management)
+		-DWITH_OPENIMAGEDENOISE=$(usex oidn)
+		-DWITH_OPENMP=$(usex openmp)
+		-DWITH_OPENSUBDIV=$(usex opensubdiv)
+		-DWITH_OPENVDB=$(usex openvdb)
+		-DWITH_OPENVDB_BLOSC=$(usex openvdb)
+		-DWITH_POTRACE=$(usex potrace)
+		-DWITH_PUGIXML=$(usex pugixml)
+		-DWITH_PULSEAUDIO=$(usex pulseaudio)
+		-DWITH_PYTHON_INSTALL=no
+		-DWITH_PYTHON_INSTALL_NUMPY=no
+		-DWITH_PYTHON_INSTALL_ZSTANDARD=no
+		-DWITH_RENDERDOC="$(usex renderdoc)"
+		-DWITH_SDL=$(usex sdl)
+		-DWITH_STATIC_LIBS=no
+		-DWITH_STRICT_BUILD_OPTIONS=yes
+		-DWITH_SYSTEM_EIGEN3=yes
+		-DWITH_SYSTEM_FREETYPE=yes
+		-DWITH_SYSTEM_LZO=yes
+		-DWITH_TBB=$(usex tbb)
+		-DWITH_USD="no" # TODO: Package USD
+		-DWITH_VULKAN_BACKEND="$(usex vulkan)"
+		-DWITH_XR_OPENXR=no
+	)
+
+	if has_version ">=dev-python/numpy-2"; then
+		mycmakeargs+=(
+			-DPYTHON_NUMPY_INCLUDE_DIRS="$(python_get_sitedir)/numpy/_core/include"
+			-DPYTHON_NUMPY_PATH="$(python_get_sitedir)/numpy/_core/include"
+		)
+	fi
+
+	# requires dev-vcs/git
+	if [[ ${PV} = *9999* ]] ; then
+		mycmakeargs+=( -DWITH_BUILDINFO="yes" )
+	else
+		mycmakeargs+=( -DWITH_BUILDINFO="no" )
+	fi
+
+	if use cuda; then
+		mycmakeargs+=(
+			-DCUDA_NVCC_FLAGS="--compiler-bindir;$(cuda_gccdir)"
+		)
+	fi
+
+	if use hip; then
+		mycmakeargs+=(
+			-DROCM_PATH="$(hipconfig -R)"
+			-DHIP_HIPCC_FLAGS="-fcf-protection=none"
+		)
+	fi
+
+	if use optix; then
+		mycmakeargs+=(
+			-DCYCLES_RUNTIME_OPTIX_ROOT_DIR="${EPREFIX}"/opt/optix
+			-DOPTIX_ROOT_DIR="${EPREFIX}"/opt/optix
+		)
+	fi
+
+	if use wayland; then
+		mycmakeargs+=(
+			-DWITH_GHOST_WAYLAND_APP_ID="blender-${BV}"
+			-DWITH_GHOST_WAYLAND_LIBDECOR="$(usex gnome)"
+		)
+	fi
+
+	# This is currently needed on arm64 to get the NEON SIMD wrapper to compile the code successfully
+	use arm64 && append-flags -flax-vector-conversions
+
+	append-cflags "$(usex debug '-DDEBUG' '-DNDEBUG')"
+	append-cppflags "$(usex debug '-DDEBUG' '-DNDEBUG')"
+
+	if tc-is-gcc ; then
+		# These options only exist when GCC is detected.
+		# We disable these to respect the user's choice of linker.
+		mycmakeargs+=(
+			-DWITH_LINKER_GOLD=no
+			-DWITH_LINKER_LLD=no
+		)
+		# Ease compiling with required gcc similar to cuda_sanitize but for cmake
+		use cuda && use cycles-bin-kernels && mycmakeargs+=( -DCUDA_HOST_COMPILER="$(cuda_gccdir)" )
+	fi
+
+	if tc-is-clang || use osl; then
+		mycmakeargs+=(
+			-DWITH_CLANG=yes
+			-DWITH_LLVM=yes
+		)
+	fi
+
+	if use test ; then
+		local CYCLES_TEST_DEVICES=( "CPU" )
+		if use cycles-bin-kernels; then
+			use cuda && CYCLES_TEST_DEVICES+=( "CUDA" )
+			use optix && CYCLES_TEST_DEVICES+=( "OPTIX" )
+			use hip && CYCLES_TEST_DEVICES+=( "HIP" )
+		fi
+		mycmakeargs+=(
+			-DCYCLES_TEST_DEVICES:STRING="$(local IFS=";"; echo "${CYCLES_TEST_DEVICES[*]}")"
+			-DWITH_COMPOSITOR_REALTIME_TESTS=yes
+			-DWITH_GPU_DRAW_TESTS=yes
+			-DWITH_GPU_RENDER_TESTS=yes
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_test() {
+	# A lot of tests needs to have access to the installed data files.
+	# So install them into the image directory now.
+	DESTDIR="${T}" cmake_build install
+
+	blender_get_version
+	# Define custom blender data/script file paths not be able to find them otherwise during testing.
+	# (Because the data is in the image directory and it will default to look in /usr/share)
+	export BLENDER_SYSTEM_SCRIPTS="${T}/usr/share/blender/${BV}/scripts"
+	export BLENDER_SYSTEM_DATAFILES="${T}/usr/share/blender/${BV}/datafiles"
+
+	# Sanity check that the script and datafile path is valid.
+	# If they are not vaild, blender will fallback to the default path which is not what we want.
+	[ -d "$BLENDER_SYSTEM_SCRIPTS" ] || die "The custom script path is invalid, fix the ebuild!"
+	[ -d "$BLENDER_SYSTEM_DATAFILES" ] || die "The custom datafiles path is invalid, fix the ebuild!"
+
+	if use cuda; then
+		cuda_add_sandbox -w
+		addwrite "/dev/dri/renderD128"
+		addwrite "/dev/char/"
+	fi
+
+	if use X; then
+		xdg_environment_reset
+	fi
+
+	cmake_src_test
+
+	# Clean up the image directory for src_install
+	rm -fr "${T}/usr" || die
+}
+
+src_install() {
+	blender_get_version
+
+	# Pax mark blender for hardened support.
+	pax-mark m "${BUILD_DIR}"/bin/blender
+
+	cmake_src_install
+
+	if use man; then
+		# Slot the man page
+		mv "${ED}/usr/share/man/man1/blender.1" "${ED}/usr/share/man/man1/blender-${BV}.1" || die
+	fi
+
+	if use doc; then
+		# Define custom blender data/script file paths. Otherwise Blender will not be able to find them during doc building.
+		# (Because the data is in the image directory and it will default to look in /usr/share)
+		export BLENDER_SYSTEM_SCRIPTS=${ED}/usr/share/blender/${BV}/scripts
+		export BLENDER_SYSTEM_DATAFILES=${ED}/usr/share/blender/${BV}/datafiles
+
+		# Workaround for binary drivers.
+		addpredict /dev/ati
+		addpredict /dev/dri
+		addpredict /dev/nvidiactl
+
+		einfo "Generating Blender C/C++ API docs ..."
+		cd "${CMAKE_USE_DIR}"/doc/doxygen || die
+		doxygen -u Doxyfile || die
+		doxygen || die "doxygen failed to build API docs."
+
+		cd "${CMAKE_USE_DIR}" || die
+		einfo "Generating (BPY) Blender Python API docs ..."
+		"${BUILD_DIR}"/bin/blender --background --python doc/python_api/sphinx_doc_gen.py -noaudio || die "sphinx failed."
+
+		cd "${CMAKE_USE_DIR}"/doc/python_api || die
+		sphinx-build sphinx-in BPY_API || die "sphinx failed."
+
+		docinto "html/API/python"
+		dodoc -r "${CMAKE_USE_DIR}"/doc/python_api/BPY_API/.
+
+		docinto "html/API/blender"
+		dodoc -r "${CMAKE_USE_DIR}"/doc/doxygen/html/.
+	fi
+
+	# Fix doc installdir
+	docinto html
+	dodoc "${CMAKE_USE_DIR}"/release/text/readme.html
+	rm -r "${ED}"/usr/share/doc/blender || die
+
+	python_optimize "${ED}/usr/share/blender/${BV}/scripts"
+
+	mv "${ED}/usr/bin/blender-thumbnailer" "${ED}/usr/bin/blender-${BV}-thumbnailer" || die
+	mv "${ED}/usr/bin/blender" "${ED}/usr/bin/blender-${BV}" || die
+}
+
+pkg_postinst() {
+	elog
+	elog "Blender uses python integration. As such, may have some"
+	elog "inherent risks with running unknown python scripts."
+	elog
+	elog "It is recommended to change your blender temp directory"
+	elog "from /tmp to /home/user/tmp or another tmp file under your"
+	elog "home directory. This can be done by starting blender, then"
+	elog "changing the 'Temporary Files' directory in Blender preferences."
+	elog
+
+	if use osl; then
+		ewarn ""
+		ewarn "OSL is know to cause runtime segfaults if Mesa has been linked to"
+		ewarn "an other LLVM version than what OSL is linked to."
+		ewarn "See https://bugs.gentoo.org/880671 for more details"
+		ewarn ""
+	fi
+
+	if ! use python_single_target_python3_11; then
+		elog "You are building Blender with a newer python version than"
+		elog "supported by this version upstream."
+		elog "If you experience breakages with e.g. plugins, please switch to"
+		elog "python_single_target_python3_11 instead."
+		elog "Bug: https://bugs.gentoo.org/737388"
+		elog
+	fi
+
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+
+	ewarn ""
+	ewarn "You may want to remove the following directory."
+	ewarn "~/.config/${PN}/${BV}/cache/"
+	ewarn "It may contain extra render kernels not tracked by portage"
+	ewarn ""
+}
diff --git a/media-gfx/blender/blender-4.1.1.ebuild b/media-gfx/blender/blender-4.1.1.ebuild
index 94e2599fa018..66f6aa0684a0 100644
--- a/media-gfx/blender/blender-4.1.1.ebuild
+++ b/media-gfx/blender/blender-4.1.1.ebuild
@@ -27,11 +27,11 @@ else
 	# 		https://projects.blender.org/blender/blender-test-data/archive/blender-v$(ver_cut 1-2)-release.tar.gz
 	# 	)
 	# "
-	KEYWORDS="~amd64 ~arm ~arm64"
+	KEYWORDS="amd64 ~arm ~arm64"
 	RESTRICT="test" # the test archive returns LFS references.
 fi
 
-LICENSE="|| ( GPL-3 BL )"
+LICENSE="GPL-3+ cycles? ( Apache-2.0 )"
 SLOT="${PV%.*}"
 IUSE="
 	alembic +bullet collada +color-management cuda +cycles +cycles-bin-kernels
diff --git a/media-gfx/blender/blender-4.2.1.ebuild b/media-gfx/blender/blender-4.2.1.ebuild
new file mode 100644
index 000000000000..88bb85849015
--- /dev/null
+++ b/media-gfx/blender/blender-4.2.1.ebuild
@@ -0,0 +1,608 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{11..12} )
+# NOTE must match media-libs/osl
+LLVM_COMPAT=( {15..18} )
+LLVM_OPTIONAL=1
+
+inherit check-reqs cmake cuda flag-o-matic llvm-r1 pax-utils python-single-r1 toolchain-funcs xdg-utils
+
+DESCRIPTION="3D Creation/Animation/Publishing System"
+HOMEPAGE="https://www.blender.org"
+
+if [[ ${PV} = *9999* ]] ; then
+	EGIT_LFS="yes"
+	inherit git-r3
+	EGIT_REPO_URI="https://projects.blender.org/blender/blender.git"
+	EGIT_SUBMODULES=( '*' '-lib/*' )
+	RESTRICT="!test? ( test )"
+else
+	SRC_URI="
+		https://download.blender.org/source/${P}.tar.xz
+	"
+	# 	test? (
+	# 		https://projects.blender.org/blender/blender-test-data/archive/blender-v$(ver_cut 1-2)-release.tar.gz
+	# 	)
+	# "
+	KEYWORDS="~amd64 ~arm ~arm64"
+	RESTRICT="test" # the test archive returns LFS references.
+fi
+
+LICENSE="GPL-3+ cycles? ( Apache-2.0 )"
+SLOT="${PV%.*}"
+IUSE="
+	alembic +bullet collada +color-management cuda +cycles +cycles-bin-kernels
+	debug doc +embree experimental +ffmpeg +fftw +fluid +gmp gnome hip jack
+	jemalloc jpeg2k man +nanovdb ndof nls +oidn oneapi openal +openexr +openmp +openpgl
+	+opensubdiv +openvdb optix osl +otf +pdf +potrace +pugixml pulseaudio
+	renderdoc sdl +sndfile +tbb test +tiff valgrind vulkan wayland +webp X
+"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	alembic? ( openexr )
+	cuda? ( cycles )
+	cycles? ( openexr tiff tbb )
+	fluid? ( tbb )
+	gnome? ( wayland )
+	hip? ( cycles )
+	nanovdb? ( openvdb )
+	openvdb? ( tbb openexr )
+	optix? ( cuda )
+	osl? ( cycles pugixml )
+	test? ( color-management )"
+
+# Library versions for official builds can be found in the blender source directory in:
+# build_files/build_environment/cmake/versions.cmake
+RDEPEND="${PYTHON_DEPS}
+	app-arch/zstd
+	dev-libs/boost:=[nls?]
+	dev-libs/lzo:2=
+	$(python_gen_cond_dep '
+		dev-python/cython[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/zstandard[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+	')
+	media-libs/freetype:=[brotli]
+	media-libs/libepoxy:=
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:=
+	media-libs/libsamplerate
+	>=media-libs/openimageio-2.5.6.0:=
+	sys-libs/zlib:=
+	virtual/glu
+	virtual/libintl
+	virtual/opengl
+	alembic? ( >=media-gfx/alembic-1.8.3-r2[boost(+),hdf(+)] )
+	collada? ( >=media-libs/opencollada-1.6.68 )
+	color-management? ( media-libs/opencolorio:= )
+	cuda? ( dev-util/nvidia-cuda-toolkit:= )
+	embree? ( media-libs/embree:=[raymask] )
+	ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?,vpx,vorbis,opus,xvid] )
+	fftw? ( sci-libs/fftw:3.0= )
+	gmp? ( dev-libs/gmp[cxx] )
+	gnome? ( gui-libs/libdecor )
+	hip? (
+		llvm_slot_17? (
+			dev-util/hip:0/5.7
+		)
+		llvm_slot_18? (
+			>=dev-util/hip-6.1:=[llvm_slot_18(-)]
+		)
+	)
+	jack? ( virtual/jack )
+	jemalloc? ( dev-libs/jemalloc:= )
+	jpeg2k? ( media-libs/openjpeg:2= )
+	ndof? (
+		app-misc/spacenavd
+		dev-libs/libspnav
+	)
+	nls? ( virtual/libiconv )
+	openal? ( media-libs/openal )
+	oidn? ( >=media-libs/oidn-2.1.0[${LLVM_USEDEP}] )
+	oneapi? ( dev-libs/intel-compute-runtime[l0] )
+	openexr? (
+		>=dev-libs/imath-3.1.7:=
+		>=media-libs/openexr-3.2.1:0=
+	)
+	openpgl? ( media-libs/openpgl:= )
+	opensubdiv? ( >=media-libs/opensubdiv-3.5.0 )
+	openvdb? (
+		>=media-gfx/openvdb-11.0.0:=[nanovdb?]
+		dev-libs/c-blosc:=
+	)
+	optix? ( dev-libs/optix )
+	osl? (
+		>=media-libs/osl-1.13:=[${LLVM_USEDEP}]
+		media-libs/mesa[${LLVM_USEDEP}]
+	)
+	pdf? ( media-libs/libharu )
+	potrace? ( media-gfx/potrace )
+	pugixml? ( dev-libs/pugixml )
+	pulseaudio? ( media-libs/libpulse )
+	sdl? ( media-libs/libsdl2[sound,joystick] )
+	sndfile? ( media-libs/libsndfile )
+	tbb? ( dev-cpp/tbb:= )
+	tiff? ( media-libs/tiff:= )
+	valgrind? ( dev-debug/valgrind )
+	wayland? (
+		>=dev-libs/wayland-1.12
+		>=dev-libs/wayland-protocols-1.15
+		>=x11-libs/libxkbcommon-0.2.0
+		dev-util/wayland-scanner
+		media-libs/mesa[wayland]
+		sys-apps/dbus
+	)
+	vulkan? (
+		media-libs/shaderc
+		dev-util/spirv-tools
+		dev-util/glslang
+		media-libs/vulkan-loader
+	)
+	otf? (
+		media-libs/harfbuzz
+	)
+	renderdoc? (
+		media-gfx/renderdoc
+	)
+	X? (
+		x11-libs/libX11
+		x11-libs/libXi
+		x11-libs/libXxf86vm
+	)
+"
+
+DEPEND="${RDEPEND}
+	dev-cpp/eigen:=
+	vulkan? (
+		dev-util/spirv-headers
+		dev-util/vulkan-headers
+	)
+"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? (
+		app-text/doxygen[dot]
+		dev-python/sphinx[latex]
+		dev-texlive/texlive-bibtexextra
+		dev-texlive/texlive-fontsextra
+		dev-texlive/texlive-fontutils
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexextra
+	)
+	nls? ( sys-devel/gettext )
+	wayland? (
+		dev-util/wayland-scanner
+	)
+	X? (
+		x11-base/xorg-proto
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.0.2-FindClang.patch"
+	"${FILESDIR}/${PN}-4.0.2-CUDA_NVCC_FLAGS.patch"
+	"${FILESDIR}/${PN}-4.1.1-FindLLVM.patch"
+	"${FILESDIR}/${PN}-4.1.1-numpy.patch"
+)
+
+blender_check_requirements() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+
+	if use doc; then
+		CHECKREQS_DISK_BUILD="4G" check-reqs_pkg_pretend
+	fi
+}
+
+blender_get_version() {
+	# Get blender version from blender itself.
+	BV=$(grep "BLENDER_VERSION " source/blender/blenkernel/BKE_blender_version.h | cut -d " " -f 3; assert)
+	if ((${BV:0:1} < 3)) ; then
+		# Add period (290 -> 2.90).
+		BV=${BV:0:1}.${BV:1}
+	else
+		# Add period and skip the middle number (301 -> 3.1)
+		BV=${BV:0:1}.${BV:2}
+	fi
+}
+
+pkg_pretend() {
+	blender_check_requirements
+
+	if use oneapi; then
+		einfo "The Intel oneAPI support is rudimentary."
+		einfo ""
+		einfo "Please report any bugs you find to https://bugs.gentoo.org/"
+	fi
+}
+
+pkg_setup() {
+	if use osl; then
+		llvm-r1_pkg_setup
+	fi
+
+	blender_check_requirements
+	python-single-r1_pkg_setup
+}
+
+src_unpack() {
+	if [[ ${PV} = *9999* ]] ; then
+		if ! use test; then
+			EGIT_SUBMODULES+=( '-tests/*' )
+		fi
+		git-r3_src_unpack
+	else
+		default
+
+		if use test; then
+			mkdir -p "${S}/tests/data/" || die
+			mv blender-test-data/* "${S}/tests/data/" || die
+		fi
+	fi
+}
+
+src_prepare() {
+	use cuda && cuda_src_prepare
+
+	cmake_src_prepare
+
+	blender_get_version
+
+	# Disable MS Windows help generation. The variable doesn't do what it
+	# it sounds like.
+	sed -e "s|GENERATE_HTMLHELP      = YES|GENERATE_HTMLHELP      = NO|" \
+		-i doc/doxygen/Doxyfile || die
+
+	# Prepare icons and .desktop files for slotting.
+	sed \
+		-e "s|blender.svg|blender-${BV}.svg|" \
+		-e "s|blender-symbolic.svg|blender-${BV}-symbolic.svg|" \
+		-e "s|blender.desktop|blender-${BV}.desktop|" \
+		-e "s|org.blender.Blender.metainfo.xml|blender-${BV}.metainfo.xml|" \
+		-i source/creator/CMakeLists.txt || die
+
+	sed \
+		-e "s|Name=Blender|Name=Blender ${BV}|" \
+		-e "s|Exec=blender|Exec=blender-${BV}|" \
+		-e "s|Icon=blender|Icon=blender-${BV}|" \
+		-i release/freedesktop/blender.desktop || die
+
+	sed -e "s|\${CMAKE_INSTALL_PREFIX}/\${BLENDER_BIN}|${T}/usr/\${BLENDER_BIN}|g" -i source/creator/CMakeLists.txt || die
+
+	mv \
+		release/freedesktop/icons/scalable/apps/blender.svg \
+		"release/freedesktop/icons/scalable/apps/blender-${BV}.svg" || die
+	mv \
+		release/freedesktop/icons/symbolic/apps/blender-symbolic.svg \
+		"release/freedesktop/icons/symbolic/apps/blender-${BV}-symbolic.svg" || die
+	mv release/freedesktop/blender.desktop "release/freedesktop/blender-${BV}.desktop" || die
+	mv release/freedesktop/org.blender.Blender.metainfo.xml "release/freedesktop/blender-${BV}.metainfo.xml"
+	mv release/freedesktop/org.blender.Blender.appdata.xml "release/freedesktop/blender-${BV}.appdata.xml"
+
+	if use test; then
+		# Without this the tests will try to use /usr/bin/blender and /usr/share/blender/ to run the tests.
+		sed -e "s|set(TEST_INSTALL_DIR.*|set(TEST_INSTALL_DIR ${T}/usr)|g" -i tests/CMakeLists.txt || die
+		sed -e "s|string(REPLACE.*|set(TEST_INSTALL_DIR ${T}/usr)|g" -i build_files/cmake/testing.cmake || die
+	fi
+
+	if use vulkan; then
+		sed -e "s/extern_vulkan_memory_allocator/extern_vulkan_memory_allocator\nSPIRV-Tools-opt\nSPIRV-Tools\nSPIRV-Tools-link\nglslang\nSPIRV\nSPVRemapper/" -i source/blender/gpu/CMakeLists.txt || die
+	fi
+}
+
+src_configure() {
+	# -Werror=odr, -Werror=lto-type-mismatch
+	# https://bugs.gentoo.org/859607
+	# https://projects.blender.org/blender/blender/issues/120444
+	filter-lto
+
+	# Workaround for bug #922600
+	append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
+
+	append-lfs-flags
+	blender_get_version
+
+	local mycmakeargs=(
+		-DWITH_LIBS_PRECOMPILED=no
+		-DBUILD_SHARED_LIBS=no
+		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
+		-DPYTHON_LIBRARY="$(python_get_library_path)"
+		-DPYTHON_VERSION="${EPYTHON/python/}"
+		-DWITH_ALEMBIC=$(usex alembic)
+		-DWITH_BOOST=yes
+		-DWITH_BULLET=$(usex bullet)
+		-DWITH_CODEC_FFMPEG=$(usex ffmpeg)
+		-DWITH_CODEC_SNDFILE=$(usex sndfile)
+		-DWITH_CPU_CHECK=no
+
+		-DWITH_CYCLES=$(usex cycles)
+
+		-DWITH_CYCLES_DEVICE_CUDA=$(usex cuda)
+		-DWITH_CYCLES_CUDA_BINARIES="$(usex cuda $(usex cycles-bin-kernels))"
+		-DWITH_CYCLES_DEVICE_OPTIX=$(usex optix)
+
+		-DWITH_CYCLES_DEVICE_HIP="$(usex hip)"
+		-DWITH_CYCLES_HIP_BINARIES=$(usex hip $(usex cycles-bin-kernels))
+
+		-DWITH_CYCLES_DEVICE_ONEAPI="$(usex oneapi)"
+		-DWITH_CYCLES_ONEAPI_BINARIES="$(usex oneapi $(usex cycles-bin-kernels))"
+
+		-DWITH_CYCLES_HYDRA_RENDER_DELEGATE="no" # TODO: package Hydra
+		-DWITH_CYCLES_EMBREE="$(usex embree)"
+		-DWITH_CYCLES_OSL=$(usex osl)
+		-DWITH_CYCLES_PATH_GUIDING=$(usex openpgl)
+		-DWITH_CYCLES_STANDALONE=no
+		-DWITH_CYCLES_STANDALONE_GUI=no
+
+		-DWITH_DOC_MANPAGE=$(usex man)
+		-DWITH_DRACO="no" # TODO: Package Draco
+		-DWITH_EXPERIMENTAL_FEATURES="$(usex experimental)"
+		-DWITH_FFTW3=$(usex fftw)
+		-DWITH_GHOST_WAYLAND=$(usex wayland)
+		-DWITH_GHOST_WAYLAND_DYNLOAD="no"
+		-DWITH_GHOST_X11=$(usex X)
+		-DWITH_GMP=$(usex gmp)
+		-DWITH_GTESTS=$(usex test)
+		-DWITH_HARFBUZZ="$(usex otf)"
+		-DWITH_HARU=$(usex pdf)
+		-DWITH_HEADLESS=$($(use X || use wayland) && echo OFF || echo ON)
+		-DWITH_HYDRA="no" # TODO: Package Hydra
+		-DWITH_IMAGE_OPENEXR=$(usex openexr)
+		-DWITH_IMAGE_OPENJPEG=$(usex jpeg2k)
+		-DWITH_IMAGE_WEBP=$(usex webp)
+		-DWITH_INPUT_NDOF=$(usex ndof)
+		-DWITH_INSTALL_PORTABLE="no"
+		-DWITH_INTERNATIONAL=$(usex nls)
+		-DWITH_JACK=$(usex jack)
+		-DWITH_MATERIALX="no" # TODO: Package MaterialX
+		-DWITH_MEM_JEMALLOC=$(usex jemalloc)
+		-DWITH_MEM_VALGRIND=$(usex valgrind)
+		-DWITH_MOD_FLUID=$(usex fluid)
+		-DWITH_MOD_OCEANSIM=$(usex fftw)
+		-DWITH_NANOVDB=$(usex nanovdb)
+		-DWITH_OPENAL=$(usex openal)
+		-DWITH_OPENCOLLADA=$(usex collada)
+		-DWITH_OPENCOLORIO=$(usex color-management)
+		-DWITH_OPENIMAGEDENOISE=$(usex oidn)
+		-DWITH_OPENMP=$(usex openmp)
+		-DWITH_OPENSUBDIV=$(usex opensubdiv)
+		-DWITH_OPENVDB=$(usex openvdb)
+		-DWITH_OPENVDB_BLOSC=$(usex openvdb)
+		-DWITH_POTRACE=$(usex potrace)
+		-DWITH_PUGIXML=$(usex pugixml)
+		-DWITH_PULSEAUDIO=$(usex pulseaudio)
+		-DWITH_PYTHON_INSTALL=no
+		-DWITH_PYTHON_INSTALL_NUMPY=no
+		-DWITH_PYTHON_INSTALL_ZSTANDARD=no
+		-DWITH_RENDERDOC="$(usex renderdoc)"
+		-DWITH_SDL=$(usex sdl)
+		-DWITH_STATIC_LIBS=no
+		-DWITH_STRICT_BUILD_OPTIONS=yes
+		-DWITH_SYSTEM_EIGEN3=yes
+		-DWITH_SYSTEM_FREETYPE=yes
+		-DWITH_SYSTEM_LZO=yes
+		-DWITH_TBB=$(usex tbb)
+		-DWITH_USD="no" # TODO: Package USD
+		-DWITH_VULKAN_BACKEND="$(usex vulkan)"
+		-DWITH_XR_OPENXR=no
+	)
+
+	if has_version ">=dev-python/numpy-2"; then
+		mycmakeargs+=(
+			-DPYTHON_NUMPY_INCLUDE_DIRS="$(python_get_sitedir)/numpy/_core/include"
+			-DPYTHON_NUMPY_PATH="$(python_get_sitedir)/numpy/_core/include"
+		)
+	fi
+
+	# requires dev-vcs/git
+	if [[ ${PV} = *9999* ]] ; then
+		mycmakeargs+=( -DWITH_BUILDINFO="yes" )
+	else
+		mycmakeargs+=( -DWITH_BUILDINFO="no" )
+	fi
+
+	if use cuda; then
+		mycmakeargs+=(
+			-DCUDA_NVCC_FLAGS="--compiler-bindir;$(cuda_gccdir)"
+		)
+	fi
+
+	if use hip; then
+		mycmakeargs+=(
+			-DROCM_PATH="$(hipconfig -R)"
+			-DHIP_HIPCC_FLAGS="-fcf-protection=none"
+		)
+	fi
+
+	if use optix; then
+		mycmakeargs+=(
+			-DCYCLES_RUNTIME_OPTIX_ROOT_DIR="${EPREFIX}"/opt/optix
+			-DOPTIX_ROOT_DIR="${EPREFIX}"/opt/optix
+		)
+	fi
+
+	if use wayland; then
+		mycmakeargs+=(
+			-DWITH_GHOST_WAYLAND_APP_ID="blender-${BV}"
+			-DWITH_GHOST_WAYLAND_LIBDECOR="$(usex gnome)"
+		)
+	fi
+
+	# This is currently needed on arm64 to get the NEON SIMD wrapper to compile the code successfully
+	use arm64 && append-flags -flax-vector-conversions
+
+	append-cflags "$(usex debug '-DDEBUG' '-DNDEBUG')"
+	append-cppflags "$(usex debug '-DDEBUG' '-DNDEBUG')"
+
+	if tc-is-gcc ; then
+		# These options only exist when GCC is detected.
+		# We disable these to respect the user's choice of linker.
+		mycmakeargs+=(
+			-DWITH_LINKER_GOLD=no
+			-DWITH_LINKER_LLD=no
+		)
+		# Ease compiling with required gcc similar to cuda_sanitize but for cmake
+		use cuda && use cycles-bin-kernels && mycmakeargs+=( -DCUDA_HOST_COMPILER="$(cuda_gccdir)" )
+	fi
+
+	if tc-is-clang || use osl; then
+		mycmakeargs+=(
+			-DWITH_CLANG=yes
+			-DWITH_LLVM=yes
+		)
+	fi
+
+	if use test ; then
+		local CYCLES_TEST_DEVICES=( "CPU" )
+		if use cycles-bin-kernels; then
+			use cuda && CYCLES_TEST_DEVICES+=( "CUDA" )
+			use optix && CYCLES_TEST_DEVICES+=( "OPTIX" )
+			use hip && CYCLES_TEST_DEVICES+=( "HIP" )
+		fi
+		mycmakeargs+=(
+			-DCYCLES_TEST_DEVICES:STRING="$(local IFS=";"; echo "${CYCLES_TEST_DEVICES[*]}")"
+			-DWITH_COMPOSITOR_REALTIME_TESTS=yes
+			-DWITH_GPU_DRAW_TESTS=yes
+			-DWITH_GPU_RENDER_TESTS=yes
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_test() {
+	# A lot of tests needs to have access to the installed data files.
+	# So install them into the image directory now.
+	DESTDIR="${T}" cmake_build install
+
+	blender_get_version
+	# Define custom blender data/script file paths not be able to find them otherwise during testing.
+	# (Because the data is in the image directory and it will default to look in /usr/share)
+	export BLENDER_SYSTEM_SCRIPTS="${T}/usr/share/blender/${BV}/scripts"
+	export BLENDER_SYSTEM_DATAFILES="${T}/usr/share/blender/${BV}/datafiles"
+
+	# Sanity check that the script and datafile path is valid.
+	# If they are not vaild, blender will fallback to the default path which is not what we want.
+	[ -d "$BLENDER_SYSTEM_SCRIPTS" ] || die "The custom script path is invalid, fix the ebuild!"
+	[ -d "$BLENDER_SYSTEM_DATAFILES" ] || die "The custom datafiles path is invalid, fix the ebuild!"
+
+	if use cuda; then
+		cuda_add_sandbox -w
+		addwrite "/dev/dri/renderD128"
+		addwrite "/dev/char/"
+	fi
+
+	if use X; then
+		xdg_environment_reset
+	fi
+
+	addwrite /dev/dri
+
+	cmake_src_test
+
+	# Clean up the image directory for src_install
+	rm -fr "${T}/usr" || die
+}
+
+src_install() {
+	blender_get_version
+
+	# Pax mark blender for hardened support.
+	pax-mark m "${BUILD_DIR}"/bin/blender
+
+	cmake_src_install
+
+	if use man; then
+		# Slot the man page
+		mv "${ED}/usr/share/man/man1/blender.1" "${ED}/usr/share/man/man1/blender-${BV}.1" || die
+	fi
+
+	if use doc; then
+		# Define custom blender data/script file paths. Otherwise Blender will not be able to find them during doc building.
+		# (Because the data is in the image directory and it will default to look in /usr/share)
+		export BLENDER_SYSTEM_SCRIPTS=${ED}/usr/share/blender/${BV}/scripts
+		export BLENDER_SYSTEM_DATAFILES=${ED}/usr/share/blender/${BV}/datafiles
+
+		# Workaround for binary drivers.
+		addpredict /dev/ati
+		addpredict /dev/dri
+		addpredict /dev/nvidiactl
+
+		einfo "Generating Blender C/C++ API docs ..."
+		cd "${CMAKE_USE_DIR}"/doc/doxygen || die
+		doxygen -u Doxyfile || die
+		doxygen || die "doxygen failed to build API docs."
+
+		cd "${CMAKE_USE_DIR}" || die
+		einfo "Generating (BPY) Blender Python API docs ..."
+		"${BUILD_DIR}"/bin/blender --background --python doc/python_api/sphinx_doc_gen.py -noaudio || die "sphinx failed."
+
+		cd "${CMAKE_USE_DIR}"/doc/python_api || die
+		sphinx-build sphinx-in BPY_API || die "sphinx failed."
+
+		docinto "html/API/python"
+		dodoc -r "${CMAKE_USE_DIR}"/doc/python_api/BPY_API/.
+
+		docinto "html/API/blender"
+		dodoc -r "${CMAKE_USE_DIR}"/doc/doxygen/html/.
+	fi
+
+	# Fix doc installdir
+	docinto html
+	dodoc "${CMAKE_USE_DIR}"/release/text/readme.html
+	rm -r "${ED}"/usr/share/doc/blender || die
+
+	python_optimize "${ED}/usr/share/blender/${BV}/scripts"
+
+	mv "${ED}/usr/bin/blender-thumbnailer" "${ED}/usr/bin/blender-${BV}-thumbnailer" || die
+	mv "${ED}/usr/bin/blender" "${ED}/usr/bin/blender-${BV}" || die
+}
+
+pkg_postinst() {
+	elog
+	elog "Blender uses python integration. As such, may have some"
+	elog "inherent risks with running unknown python scripts."
+	elog
+	elog "It is recommended to change your blender temp directory"
+	elog "from /tmp to /home/user/tmp or another tmp file under your"
+	elog "home directory. This can be done by starting blender, then"
+	elog "changing the 'Temporary Files' directory in Blender preferences."
+	elog
+
+	if use osl; then
+		ewarn ""
+		ewarn "OSL is know to cause runtime segfaults if Mesa has been linked to"
+		ewarn "an other LLVM version than what OSL is linked to."
+		ewarn "See https://bugs.gentoo.org/880671 for more details"
+		ewarn ""
+	fi
+
+	if ! use python_single_target_python3_11; then
+		elog "You are building Blender with a newer python version than"
+		elog "supported by this version upstream."
+		elog "If you experience breakages with e.g. plugins, please switch to"
+		elog "python_single_target_python3_11 instead."
+		elog "Bug: https://bugs.gentoo.org/737388"
+		elog
+	fi
+
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+
+	ewarn ""
+	ewarn "You may want to remove the following directory."
+	ewarn "~/.config/${PN}/${BV}/cache/"
+	ewarn "It may contain extra render kernels not tracked by portage"
+	ewarn ""
+}
diff --git a/media-gfx/blender/blender-9999.ebuild b/media-gfx/blender/blender-9999.ebuild
index 94e2599fa018..88bb85849015 100644
--- a/media-gfx/blender/blender-9999.ebuild
+++ b/media-gfx/blender/blender-9999.ebuild
@@ -4,8 +4,9 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{11..12} )
-# matches media-libs/osl
-LLVM_COMPAT=( {15..17} )
+# NOTE must match media-libs/osl
+LLVM_COMPAT=( {15..18} )
+LLVM_OPTIONAL=1
 
 inherit check-reqs cmake cuda flag-o-matic llvm-r1 pax-utils python-single-r1 toolchain-funcs xdg-utils
 
@@ -17,7 +18,6 @@ if [[ ${PV} = *9999* ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://projects.blender.org/blender/blender.git"
 	EGIT_SUBMODULES=( '*' '-lib/*' )
-	ADDONS_EGIT_REPO_URI="https://projects.blender.org/blender/blender-addons.git"
 	RESTRICT="!test? ( test )"
 else
 	SRC_URI="
@@ -31,12 +31,12 @@ else
 	RESTRICT="test" # the test archive returns LFS references.
 fi
 
-LICENSE="|| ( GPL-3 BL )"
+LICENSE="GPL-3+ cycles? ( Apache-2.0 )"
 SLOT="${PV%.*}"
 IUSE="
 	alembic +bullet collada +color-management cuda +cycles +cycles-bin-kernels
 	debug doc +embree experimental +ffmpeg +fftw +fluid +gmp gnome hip jack
-	jemalloc jpeg2k man +nanovdb ndof nls +oidn oneapi openal +openexr +openmp openpgl
+	jemalloc jpeg2k man +nanovdb ndof nls +oidn oneapi openal +openexr +openmp +openpgl
 	+opensubdiv +openvdb optix osl +otf +pdf +potrace +pugixml pulseaudio
 	renderdoc sdl +sndfile +tbb test +tiff valgrind vulkan wayland +webp X
 "
@@ -83,9 +83,16 @@ RDEPEND="${PYTHON_DEPS}
 	embree? ( media-libs/embree:=[raymask] )
 	ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?,vpx,vorbis,opus,xvid] )
 	fftw? ( sci-libs/fftw:3.0= )
-	gmp? ( dev-libs/gmp )
+	gmp? ( dev-libs/gmp[cxx] )
 	gnome? ( gui-libs/libdecor )
-	hip? ( >=dev-util/hip-5.7:= )
+	hip? (
+		llvm_slot_17? (
+			dev-util/hip:0/5.7
+		)
+		llvm_slot_18? (
+			>=dev-util/hip-6.1:=[llvm_slot_18(-)]
+		)
+	)
 	jack? ( virtual/jack )
 	jemalloc? ( dev-libs/jemalloc:= )
 	jpeg2k? ( media-libs/openjpeg:2= )
@@ -95,7 +102,7 @@ RDEPEND="${PYTHON_DEPS}
 	)
 	nls? ( virtual/libiconv )
 	openal? ( media-libs/openal )
-	oidn? ( >=media-libs/oidn-2.1.0 )
+	oidn? ( >=media-libs/oidn-2.1.0[${LLVM_USEDEP}] )
 	oneapi? ( dev-libs/intel-compute-runtime[l0] )
 	openexr? (
 		>=dev-libs/imath-3.1.7:=
@@ -109,11 +116,8 @@ RDEPEND="${PYTHON_DEPS}
 	)
 	optix? ( dev-libs/optix )
 	osl? (
-		>=media-libs/osl-1.13:=
-		$(llvm_gen_dep '
-			>=media-libs/osl-1.13[llvm_slot_${LLVM_SLOT}]
-			media-libs/mesa[llvm_slot_${LLVM_SLOT}]
-		')
+		>=media-libs/osl-1.13:=[${LLVM_USEDEP}]
+		media-libs/mesa[${LLVM_USEDEP}]
 	)
 	pdf? ( media-libs/libharu )
 	potrace? ( media-gfx/potrace )
@@ -182,6 +186,8 @@ BDEPEND="
 PATCHES=(
 	"${FILESDIR}/${PN}-4.0.2-FindClang.patch"
 	"${FILESDIR}/${PN}-4.0.2-CUDA_NVCC_FLAGS.patch"
+	"${FILESDIR}/${PN}-4.1.1-FindLLVM.patch"
+	"${FILESDIR}/${PN}-4.1.1-numpy.patch"
 )
 
 blender_check_requirements() {
@@ -207,7 +213,11 @@ blender_get_version() {
 pkg_pretend() {
 	blender_check_requirements
 
-	use oneapi && einfo "The Intel oneAPI support is rudimentary. Please report any bugs you find to https://bugs.gentoo.org/"
+	if use oneapi; then
+		einfo "The Intel oneAPI support is rudimentary."
+		einfo ""
+		einfo "Please report any bugs you find to https://bugs.gentoo.org/"
+	fi
 }
 
 pkg_setup() {
@@ -225,9 +235,6 @@ src_unpack() {
 			EGIT_SUBMODULES+=( '-tests/*' )
 		fi
 		git-r3_src_unpack
-
-		git-r3_fetch "${ADDONS_EGIT_REPO_URI}"
-		git-r3_checkout "${ADDONS_EGIT_REPO_URI}" "${S}/scripts/addons"
 	else
 		default
 
@@ -310,6 +317,7 @@ src_configure() {
 		-DWITH_BULLET=$(usex bullet)
 		-DWITH_CODEC_FFMPEG=$(usex ffmpeg)
 		-DWITH_CODEC_SNDFILE=$(usex sndfile)
+		-DWITH_CPU_CHECK=no
 
 		-DWITH_CYCLES=$(usex cycles)
 
@@ -335,9 +343,7 @@ src_configure() {
 		-DWITH_EXPERIMENTAL_FEATURES="$(usex experimental)"
 		-DWITH_FFTW3=$(usex fftw)
 		-DWITH_GHOST_WAYLAND=$(usex wayland)
-		-DWITH_GHOST_WAYLAND_APP_ID="blender-${BV}"
 		-DWITH_GHOST_WAYLAND_DYNLOAD="no"
-		-DWITH_GHOST_WAYLAND_LIBDECOR="$(usex gnome)"
 		-DWITH_GHOST_X11=$(usex X)
 		-DWITH_GMP=$(usex gmp)
 		-DWITH_GTESTS=$(usex test)
@@ -385,6 +391,13 @@ src_configure() {
 		-DWITH_XR_OPENXR=no
 	)
 
+	if has_version ">=dev-python/numpy-2"; then
+		mycmakeargs+=(
+			-DPYTHON_NUMPY_INCLUDE_DIRS="$(python_get_sitedir)/numpy/_core/include"
+			-DPYTHON_NUMPY_PATH="$(python_get_sitedir)/numpy/_core/include"
+		)
+	fi
+
 	# requires dev-vcs/git
 	if [[ ${PV} = *9999* ]] ; then
 		mycmakeargs+=( -DWITH_BUILDINFO="yes" )
@@ -412,6 +425,13 @@ src_configure() {
 		)
 	fi
 
+	if use wayland; then
+		mycmakeargs+=(
+			-DWITH_GHOST_WAYLAND_APP_ID="blender-${BV}"
+			-DWITH_GHOST_WAYLAND_LIBDECOR="$(usex gnome)"
+		)
+	fi
+
 	# This is currently needed on arm64 to get the NEON SIMD wrapper to compile the code successfully
 	use arm64 && append-flags -flax-vector-conversions
 
@@ -480,6 +500,8 @@ src_test() {
 		xdg_environment_reset
 	fi
 
+	addwrite /dev/dri
+
 	cmake_src_test
 
 	# Clean up the image directory for src_install
diff --git a/media-gfx/blender/files/blender-4.1.1-FindLLVM.patch b/media-gfx/blender/files/blender-4.1.1-FindLLVM.patch
new file mode 100644
index 000000000000..e8e1c349b956
--- /dev/null
+++ b/media-gfx/blender/files/blender-4.1.1-FindLLVM.patch
@@ -0,0 +1,38 @@
+From: =?UTF-8?q?Jannik=20Gl=C3=BCckert?= <jannik.glueckert@gmail.com>
+Date: Fri, 23 Aug 2024 13:17:34 +0200
+Subject: [PATCH] fix FindLLVM lookup
+
+find out our installed libnames and use that in the lookup
+
+Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com>
+
+diff --git build_files/cmake/Modules/FindLLVM.cmake build_files/cmake/Modules/FindLLVM.cmake
+index 4c7cc5f..21c760e 100644
+--- a/build_files/cmake/Modules/FindLLVM.cmake
++++ b/build_files/cmake/Modules/FindLLVM.cmake
+@@ -54,16 +54,21 @@ if(NOT LLVM_LIBPATH)
+   set(LLVM_LIBPATH ${LLVM_LIBPATH} CACHE PATH "Path to the LLVM library path")
+   mark_as_advanced(LLVM_LIBPATH)
+ endif()
++if(NOT LLVM_LIBNAMES)
++  execute_process(COMMAND ${LLVM_CONFIG} --libnames
++	  OUTPUT_VARIABLE LLVM_LIBNAMES
++          OUTPUT_STRIP_TRAILING_WHITESPACE)
++  set(LLVM_LIBNAMES ${LLVM_LIBNAMES} CACHE PATH "Name of the LLVM libraries")
++  mark_as_advanced(LLVM_LIBNAMES)
++endif()
+ 
+ if(LLVM_STATIC)
+   find_library(LLVM_LIBRARY
+-               NAMES LLVMAnalysis # first of a whole bunch of libs to get
++               NAMES ${LLVM_LIBNAMES}
+                PATHS ${LLVM_LIBPATH})
+ else()
+   find_library(LLVM_LIBRARY
+-               NAMES
+-                 LLVM-${LLVM_VERSION}
+-                 LLVMAnalysis  # check for the static library as a fall-back
++               NAMES ${LLVM_LIBNAMES}
+                PATHS ${LLVM_LIBPATH})
+ endif()
+ 
diff --git a/media-gfx/blender/files/blender-4.1.1-numpy.patch b/media-gfx/blender/files/blender-4.1.1-numpy.patch
new file mode 100644
index 000000000000..bd76da8b5959
--- /dev/null
+++ b/media-gfx/blender/files/blender-4.1.1-numpy.patch
@@ -0,0 +1,26 @@
+From: Paul Zander <negril.nx+gentoo@gmail.com>
+Date: Fri, 23 Aug 2024 13:19:21 +0200
+Subject: [PATCH] fix numpy lookup
+
+use cmake config for find_package()
+
+Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com>
+
+--- a/build_files/cmake/platform/platform_unix.cmake
++++ b/build_files/cmake/platform/platform_unix.cmake
+@@ -463,13 +463,13 @@ if(WITH_BOOST)
+     endif()
+     list(APPEND __boost_packages system)
+     set(Boost_NO_WARN_NEW_VERSIONS ON)
+-    find_package(Boost 1.48 COMPONENTS ${__boost_packages})
++    find_package(Boost 1.48 CONFIG COMPONENTS ${__boost_packages})
+     if(NOT Boost_FOUND)
+       # try to find non-multithreaded if -mt not found, this flag
+       # doesn't matter for us, it has nothing to do with thread
+       # safety, but keep it to not disturb build setups
+       set(Boost_USE_MULTITHREADED OFF)
+-      find_package(Boost 1.48 COMPONENTS ${__boost_packages})
++      find_package(Boost 1.48 CONFIG COMPONENTS ${__boost_packages})
+     endif()
+     unset(__boost_packages)
+     if(Boost_USE_STATIC_LIBS AND WITH_BOOST_ICU)
diff --git a/media-gfx/cairosvg/Manifest b/media-gfx/cairosvg/Manifest
index 8ffdfe4dfb54..ba76ab5947d3 100644
--- a/media-gfx/cairosvg/Manifest
+++ b/media-gfx/cairosvg/Manifest
@@ -1,3 +1,3 @@
 DIST CairoSVG-2.7.1.tar.gz 8399085 BLAKE2B 8d729355e95576ef2bc1f2d046f1d8f997bfe509477db0f2bd1eec0c89ae581081f4629aa66c53604f685e3ad424b08fc8adef5f630a35bdcf64c37d21d463f9 SHA512 fd2cdf38b6ee7860ded728694de8cb413d9442939e60501f7657e2dc43a16b6c6c863faa88a15ea001b7ee7949b2d441bcf609b1d64a49f3091573e14e8b1d92
-EBUILD cairosvg-2.7.1.ebuild 907 BLAKE2B 594a84ae268684b190853e45491aa29e5a467ad3b4b49a429dfb32de4ba9db9410ac5b9ac1f46f16b41928bfc7329a13efb3971647ea5f502f4dbf89dc958ef4 SHA512 711873f4f5d22c2f7fce39c85098512062804e29ba82ef94f375bf323c0dbc1f5d4d65edf2ee15d173d285005a6085a80e978c99aa0a926c877451f2608e46c8
+EBUILD cairosvg-2.7.1.ebuild 907 BLAKE2B 5dd14fb58eef2f423ea302be3cb94b101488f23a5778e9ffc9a195c55565ee1daba9d9d9be44fe130e7a2737c72bc240cee3e29f7cc221b4736c00585ff8d039 SHA512 95be2e160b8a1961b6ca1f58c1d36333d68b42bda5dec11716242f3b8e399f30d6081441d6ebd5bad4eb73c94b72d313071109115a0d7e994cd34724028acaa6
 MISC metadata.xml 410 BLAKE2B f7c96b4115d2f5493a3820b25cf493eed52a45df1c36c45bd84684424678555e141f7438903b3e1fd87ad29006533e280d085e7f8b4d314a8a1e535c719e67ed SHA512 3aadc33cf29d2605234752d0dae2110d3ea496258be5b90b6e2ca867caef5d6b93b5239c9afca2ccb8f68a59869369ffdae0c364380a0473eff0b5de53ba4ac0
diff --git a/media-gfx/cairosvg/cairosvg-2.7.1.ebuild b/media-gfx/cairosvg/cairosvg-2.7.1.ebuild
index d159435bd6da..b9a4d974a3ba 100644
--- a/media-gfx/cairosvg/cairosvg-2.7.1.ebuild
+++ b/media-gfx/cairosvg/cairosvg-2.7.1.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
@@ -6,7 +6,7 @@ EAPI=8
 DISTUTILS_USE_PEP517=setuptools
 PYPI_NO_NORMALIZE=1
 PYPI_PN="CairoSVG"
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 
 inherit distutils-r1 pypi
 
diff --git a/media-gfx/chafa/Manifest b/media-gfx/chafa/Manifest
index 351580c22861..56b538fe9558 100644
--- a/media-gfx/chafa/Manifest
+++ b/media-gfx/chafa/Manifest
@@ -1,3 +1,5 @@
 DIST chafa-1.12.5.tar.xz 939792 BLAKE2B 82fbcd7b071dba8534fdd391b6ce22f6de63b1e3eb30228ba1ce6e751c442efbc4a5141d30fa767cc0789b01518da016a4245f9c560837530daa4d92534a9eca SHA512 d0b719294bdc8880f2c65c1bd777ac0eb98d47d48147bc6f883f1917d4f9a6b246c4e9365bc0128b1332d4a268611ac7e479f346f13c49d2e56ff4f446f22d94
+DIST chafa-1.14.1.tar.xz 991656 BLAKE2B 1a7ba4c7d3958396c89b7b2f2873b4c1dfcf5209ae0d53fd0b2e014c3012a316a2d197a2f593c230e02bed01ed3119d6d0659d21b5f5d02dacd7eaaa626f2cb8 SHA512 61872acc3370318ab1a363cd21839978825d722d64225f968fd12acae1b7cf4a9be0f011fa2ab69a62cf61e32f095bb47aaf9d8796b97f25844703e7dfdfea35
 EBUILD chafa-1.12.5-r1.ebuild 917 BLAKE2B 3ee34e90b08a4e70d8a54cedb6d786e50ad8a5aecb09b0dd9b55ab995a4cbc009c3089f567c1f18e20b725ebb71ea6462645e48cd5cd03f37c04a30055ae4c50 SHA512 c0962397f20f465e0a8d8c7356809fc9f379217f39de8b9330707f62f75eeefef565fc313f58c96ffacb85968c3010e7f4c223f1a8e00443438316b502218785
-MISC metadata.xml 396 BLAKE2B fc22be32275227f194b224a340dcd08e55a565fa68b102eb9cb55406402ed38d4f593aa6f59f3c40a24480c8d002ea0ce4a9a831055bb6821fdbe1a1dfd103ff SHA512 46617cd84ec16190865a896432df30443d31123b790d871bf634cd446b520ed9b1728951e49217b0619a91d0d46d3013ce7f41e142893298ad7e8c2522d1552d
+EBUILD chafa-1.14.1.ebuild 854 BLAKE2B 2b185dba35bcbcfaa68feb2bec65de6e9d9ba689bf24d1a9d06ac1248713776c4c469a147389d0c5c8b0a4e3042d689f683f8f8fb04065f550e9b415b542f3ba SHA512 6c4e875b1abb9434f2604e546514be227f10c9ada298cbb9e9d683646702e247cc472aabff90a5bf64c259438fc0a8c1d1686516d43f7b886dbef908c8426794
+MISC metadata.xml 316 BLAKE2B 2a0c72d22e04271cea1887a17cd6a61b0aadb0ae6bf53385e2aae5ae4add3b47a32892dabdab8a328a78a89a63aee2d62fd47de97f389ed7eb15cbe0dde1ea24 SHA512 aa9c46f2b48f8b5413492a32e0bc7397cbd3acc23d040e6f77a05428bc964e1412345e7516be5406261f00665e16e89f1bd00b93f0f2757466514a82762fd01b
diff --git a/media-gfx/chafa/chafa-1.14.1.ebuild b/media-gfx/chafa/chafa-1.14.1.ebuild
new file mode 100644
index 000000000000..06484a9f1cb7
--- /dev/null
+++ b/media-gfx/chafa/chafa-1.14.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic
+
+DESCRIPTION="versatile and fast Unicode/ASCII/ANSI graphics renderer"
+HOMEPAGE="https://hpjansson.org/chafa/ https://github.com/hpjansson/chafa"
+SRC_URI="https://hpjansson.org/chafa/releases/${P}.tar.xz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="+tools webp"
+
+RDEPEND="
+	dev-libs/glib:2
+	tools? ( >=media-libs/freetype-2.0.0 )
+	webp? ( media-libs/libwebp:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_configure() {
+	# bug 909429
+	use webp && append-ldflags -lwebp
+
+	econf \
+		--disable-man \
+		$(use_with tools) \
+		$(use_with webp)
+}
+
+src_install() {
+	default
+
+	use tools && doman docs/chafa.1
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-gfx/chafa/metadata.xml b/media-gfx/chafa/metadata.xml
index 1e12935358fc..6cc6698618e1 100644
--- a/media-gfx/chafa/metadata.xml
+++ b/media-gfx/chafa/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>jsmolic@gentoo.org</email>
-		<name>Jakov Smolić</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="tools">Build command-line tools</flag>
 	</use>
diff --git a/media-gfx/cropgui/Manifest b/media-gfx/cropgui/Manifest
index 4b532cc5f869..e2e1d7ccca60 100644
--- a/media-gfx/cropgui/Manifest
+++ b/media-gfx/cropgui/Manifest
@@ -1,3 +1,5 @@
 DIST cropgui-0.7.tar.gz 855705 BLAKE2B d2693034b3e3a4355f58c4d17d355721189da8442b5d49ba4c11dc0033371c74301a99c001613c427375bdb9cd733f56a870186a6a59b631feaae93dbd69b232 SHA512 ea06527bdd80382bf4986ea1eea8d3c0e11ea60c472bebb489fdc3bd8206f087d0377d769e8fe86ec4573f6d510266443fd25134894b91206e1c5c9d6f7cf563
+DIST cropgui-0.8.tar.gz 857102 BLAKE2B 0fb1dd24c282e6c5595de97dc2c52d20e7c1200d7092edb8e3173276873c49512088f1fc8deed0c1e3d6b606009fe06f3c38cf98c7dac15dd74ccbdab2d71539 SHA512 911bea2b989ce53afeaf067fe5d718440b0a15c26b9488259569f1a287c8128cb7244bcb0721b15ec3564644a0ba8e9ed2991d275420bf3e3659cb0be2e8622d
 EBUILD cropgui-0.7.ebuild 1148 BLAKE2B 49ad93c2abdab01eb9a198916f550a77e8a8d9368cc88f9e65902c1ce1ca57fa1fa9b420732b56c51ba2f1f772a652b19b70f70e3395ac3f50c0a7086eb6000a SHA512 cfe0ca8e18ba085dd2f0ffbb8555a75e1fbd1c3b81a6a63a742e03dbb0ce2cfb55f8596df1776415ae1513eef9c1ef8e624e2e77cde3812c9a5df21b6439e12e
+EBUILD cropgui-0.8.ebuild 1148 BLAKE2B c6d8c21c7868f9278a74c9c57c83a03eddb8ccf1a5f709e4355f664865054ed2513730f330e6a540d1cba6f3764ae1e4d0621b70eb6d182c22b8438df1383428 SHA512 0788661bfe89640b70f22969fa80ba15dcb1b35772c592d05941881fdd6b4f0c51eeed54fcba782b9191afce3750b87797ac896c94a8605bb91856a6275423d5
 MISC metadata.xml 323 BLAKE2B 4f4655c7441d04e7d3840d96e9230c3f479955d01b44344b2b424af910b48e60fdf33a21c5ba6cc5490255a38bcb7f6359516e41ac5569446c7e000e23dda693 SHA512 b40805e072a6f3588784f689fcf6c90525f1b9c23c20570ecc5e647e6d151ab3fd81b953a0263a3c0429947cfca5ef23f2a48a242ee9aa789e2c543ca29eaf86
diff --git a/media-gfx/cropgui/cropgui-0.8.ebuild b/media-gfx/cropgui/cropgui-0.8.ebuild
new file mode 100644
index 000000000000..b089224257bf
--- /dev/null
+++ b/media-gfx/cropgui/cropgui-0.8.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9,10,11,12} )
+inherit python-r1 desktop wrapper xdg-utils
+
+DESCRIPTION="GUI for lossless cropping of jpeg images"
+HOMEPAGE="https://emergent.unpythonic.net/01248401946"
+SRC_URI="https://github.com/jepler/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}"
+RDEPEND="${PYTHON_DEPS}
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	media-libs/exiftool
+	media-gfx/imagemagick"
+
+install_cropgui_wrapper() {
+	python_domodule cropgtk.py cropgui_common.py filechooser.py cropgui.glade
+	make_wrapper "${PN}.tmp" "${PYTHON} $(python_get_sitedir)/${PN}/cropgtk.py"
+	python_newexe "${ED}/usr/bin/${PN}.tmp" "${PN}"
+	rm "${ED}/usr/bin/${PN}.tmp" || die
+}
+
+src_install() {
+	python_moduleinto "${PN}"
+	python_foreach_impl install_cropgui_wrapper
+
+	domenu "${PN}.desktop"
+	doicon "${PN}.png"
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/media-gfx/crwinfo/Manifest b/media-gfx/crwinfo/Manifest
index d1293fac02ae..3505f454ef42 100644
--- a/media-gfx/crwinfo/Manifest
+++ b/media-gfx/crwinfo/Manifest
@@ -1,4 +1,4 @@
 AUX crwinfo-0.2.patch 1009 BLAKE2B 0d4ac95f748b9a0c82d9819a951cefa97c6a1bef06f7495623bc2e3b245ef32e63e8fa9d387d4408c136f58e9606a1b591d802bf3cb76c27ea7079df59d7a711 SHA512 b02efcaf211603b5901b316d286ba0baf7e74776a2f92d6f321b154c8713a7fe653b5652137de8ae25d7a9f9eca6f217a4bab1c6839e7bb144ac5fdd804c001b
 DIST CRWInfo-0.2.tar.gz 10717 BLAKE2B fce230c1913cd924b554697bb1a26661671ec2ec274fbb5f8918f2f5bdb8923897dd1f9b3a4a844f8d0f380f39f50ee08418c6d3cfac39fe7a3e50255aa0632d SHA512 54e386266570460dd43f5a6d4b0eea7d6c37d9327dca8ffc1fa10462f97e23fc080404159723ce6558c3dc6c77eccba6ede628097d95f699a47f57a114e1eb0a
-EBUILD crwinfo-0.2.ebuild 596 BLAKE2B 2e948a0873510fc6e296a0480a2b58ecc93453aeeedb9f54b3e30df68821aa08ee20c51b4baa6d27a89ceb66ebd705380a132c93ec8c42db11cb3ede612ea345 SHA512 efbd17d4e327fdbc6b1ffa43a396d39fdf57fb79fb332370fd5135675f9c094e4ba37e2bc11bd70bb03177abd3739b2e662be6980920a5e970e0fe331c9101b1
+EBUILD crwinfo-0.2.ebuild 590 BLAKE2B 817a9fcba56c32b5bccff306e629bf3103e127e7dd2cbf42e679ca109fd44ec3c72cff3c4d545ef173e2ac89b7132d2b0698cf4931feca374a8e4a136461effc SHA512 14659ee47527a82ee0f699d68ddebd277a5b6fe11cf2082e26bb8630384c96f8e62352973deae7a0b55cc47f31373888b4e17a7460af7fd919c0aeb98f8593a8
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/media-gfx/crwinfo/crwinfo-0.2.ebuild b/media-gfx/crwinfo/crwinfo-0.2.ebuild
index 399e3208c0fb..7e9513ab11d6 100644
--- a/media-gfx/crwinfo/crwinfo-0.2.ebuild
+++ b/media-gfx/crwinfo/crwinfo-0.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://neuemuenze.heim1.tu-clausthal.de/~sven/crwinfo/CRWInfo-${PV}.tar
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ppc ppc64 sparc x86"
 
 S="${WORKDIR}/CRWInfo-${PV}"
 
diff --git a/media-gfx/curtail/Manifest b/media-gfx/curtail/Manifest
index 3f54e16ac0ed..2060b36de2e2 100644
--- a/media-gfx/curtail/Manifest
+++ b/media-gfx/curtail/Manifest
@@ -1,5 +1,5 @@
-DIST curtail-1.8.0.tar.gz 228988 BLAKE2B c04ad5aaebe8ceab1215937bb3d76ad6b2ca8cb9331011af2c6d3c8d33ee0a898fe3de0e24c0a6303b54ad0a7dd0d811f9b32321b50bbfea6b8063244be464a3 SHA512 6a8a081c0fe1b780b50c55a90f70c4d4514c49941eb9fd5924897e3961aa718af71010e8d210030e1b6028c2e33d0d19dcca5cbdcf51463b5a24d6d2e86c196c
+DIST curtail-1.10.0.tar.gz 205428 BLAKE2B 7a9d1c56542648cd1c4c6fe1355276896bea96a8f054d03c2e4a174e392867db05c3a6548897d31f078b2416eac8b3695cafd3977236f0b66fd10f3020e35d3a SHA512 6bd76b4cefd693199e25db112e90acaa990d2a8dbc2016bd9d55e8d1857bd9c6e94f9164691855231afeff65ae3b070c646a8dc8b446591a08509683dd4a9fb7
 DIST curtail-1.9.1.tar.gz 199785 BLAKE2B 689aa8f61f3c48ed51a85c35bbc6bee136a20064cd2d03c48f630fd80c8c85b64421e77327a71a41f266bd8f9d6f0dcdc197c15657159ae74056e1b52cc8ef12 SHA512 7ff0ff10068c5ff2694f6674376edf84957759b6274740d47d11a584943b026183b13a59b777c27569b6997c3cb358694fa93c55a1136b9d1fab08e768d1a1a4
-EBUILD curtail-1.8.0-r1.ebuild 1307 BLAKE2B 54bd24a1f9ba26b0405bfa8257eabab3e196f86c30a3a3fb3ec3d665461b117ab3ac0c824ca630e4405e9d58145a88cdd047d2970d479b8a8ea5e1740a52e5c8 SHA512 3a70c2b738aead5a2c879fe8ef01481425378177c9483c08ad32301d91861237d7c48f4550731431d78bbe90cbf7259860fa9d53dcfb1ca9916ceeeb2f42565c
-EBUILD curtail-1.9.1.ebuild 1309 BLAKE2B c2677116ab6a40d0e9d6a4a09631ac54293bb54f0a6239900396bc5158cdfc8edc4cb95798d8b4c6d8cb4176e932f2188f4a38709f4b84698969d2b492fbff22 SHA512 f317cb1daafba30f68627ed8fd5b24d767b0988e320945f8e1d752f85b91889ed5b7b32315841aff8683b6f1b8e49927117d6eb4238a5a47173b33994fbbfef9
+EBUILD curtail-1.10.0.ebuild 1318 BLAKE2B 273f62277284e309bdc4faab09b34ff2a9caa2ee39dfbf8c2283bdb9aa255527421878ef87a506757aac118e15b882aac740366ca0b9ae18d19f22d3e1576b36 SHA512 20418b1be77b65f02639e21c4dc773d9da885688bc77593a0082276e60e575d72c772a69afa803890077a21b427dcda4b62ac7f76bb166ae081c51ecba4f29fa
+EBUILD curtail-1.9.1.ebuild 1308 BLAKE2B 32b03b1e5cfd3fecbb26da094e2e2014494aaf443cde54a960d73a315d5977c79431b77b2d4883bea9d39936ba3dafb12c94c85b4143b269372855463ee58685 SHA512 786684d07b13960900f45419595ab8d217411d32d652521ef7a1b36e11c2666da887b266bfb6ca1f2de57de7dba92565dd1b68439f5d4f2ed9f4a68ebb7bc254
 MISC metadata.xml 817 BLAKE2B ea01ae4c58024699aae770d6e7f21a03adfc8da5f5f658a0b1708824bfda730a2fce4557de4fbccbc079c66a11ab08d6faef020bf897d47870f6581b5e0d68e6 SHA512 3d573feda8c750a08903203c1d2f2e1385e17242356c6f319e29944e530b2199a27e4e432a806dfe1f2c8c783dd67c4fe347d5160d4df99911f67623a3168eee
diff --git a/media-gfx/curtail/curtail-1.8.0-r1.ebuild b/media-gfx/curtail/curtail-1.10.0.ebuild
index 34d23e02e28d..c698273b9338 100644
--- a/media-gfx/curtail/curtail-1.8.0-r1.ebuild
+++ b/media-gfx/curtail/curtail-1.10.0.ebuild
@@ -3,32 +3,36 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{11..13} )
 
 inherit gnome2-utils meson python-single-r1 xdg
 
 DESCRIPTION="Image compressor, supporting PNG, JPEG and WebP"
 HOMEPAGE="https://github.com/Huluti/Curtail/"
 
-if [[ ${PV} == *9999* ]] ; then
+if [[ "${PV}" == *9999* ]] ; then
 	inherit git-r3
+
 	EGIT_REPO_URI="https://github.com/Huluti/${PN^}.git"
 else
 	SRC_URI="https://github.com/Huluti/${PN^}/archive/${PV}.tar.gz
 		-> ${P}.tar.gz"
-	S="${WORKDIR}"/${P^}
+	S="${WORKDIR}/${P^}"
+
 	KEYWORDS="amd64 ~x86"
 fi
 
 LICENSE="GPL-3+"
 SLOT="0"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="test"  # Just desktop / schema / appstream file validation (fails).
+RESTRICT="test"    # Just desktop / schema / appstream file validation (fails).
 
 RDEPEND="
 	${PYTHON_DEPS}
 	gui-libs/gtk:4[introspection]
-	$(python_gen_cond_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]')
+	$(python_gen_cond_dep '
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+	')
 "
 BDEPEND="
 	${RDEPEND}
@@ -46,7 +50,7 @@ RDEPEND+="
 DOCS=( CHANGELOG.md README.md )
 
 src_prepare() {
-	sed -i "s|@PYTHON@|${PYTHON}|" "${S}"/src/${PN}.in || die
+	sed -i "s|@PYTHON@|${PYTHON}|" "${S}/src/${PN}.in" || die
 
 	default
 }
diff --git a/media-gfx/curtail/curtail-1.9.1.ebuild b/media-gfx/curtail/curtail-1.9.1.ebuild
index 222e4969754c..036a248fd7e7 100644
--- a/media-gfx/curtail/curtail-1.9.1.ebuild
+++ b/media-gfx/curtail/curtail-1.9.1.ebuild
@@ -18,7 +18,7 @@ else
 		-> ${P}.tar.gz"
 	S="${WORKDIR}/${P^}"
 
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 fi
 
 LICENSE="GPL-3+"
diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest
index 3098b0c3d9e3..941095c1ae3b 100644
--- a/media-gfx/darktable/Manifest
+++ b/media-gfx/darktable/Manifest
@@ -2,12 +2,15 @@ AUX darktable-3.4.0_jsonschema-automagic.patch 891 BLAKE2B b0abdd7ea80a446e2556d
 AUX darktable-3.4.1_libxcf-cmake.patch 788 BLAKE2B b6ecb84de804b0bf16f907f825d93d00a62c1d996077514b3e55f370347f47e561707cb8da6a270aa42c3320142437691cc8b132718c485b5b7df40068d41ee5 SHA512 d94247c4f2c3b4894bd6455cd036a62ef5edb90a77bf8f930efc3e540d00712000fe8eeb7d4c937fa826aef1dd129448223c8696ff094e823894b17ef2669a4e
 AUX darktable-4.2.1_cmake-musl.patch 796 BLAKE2B 2e26cc969f01dc948f4f92f42c768a28bb879b3592d98dc1de0c3b5b7335a2985fbb5659c58b421fbca896b1f2585a5cb993b5cdf3ee6f87d9834afe3fd1a23a SHA512 82c7a4f6d6112fa024503a99e05d3050922b120821c93922ae846f9da6b02cd6f2e27315448c20ed1032c5526b85cb6d01dd6eec5109db1af3f8e92e4818ea06
 AUX darktable-4.4.2_fix-has-attribute-musl.patch 779 BLAKE2B d22e3cc6a28f9b0df574f1e512926868c7dd921b57dacb0934fdbfe934fb14ccb5cb16cbef49646a00c9be183af4f426e8d656389e2a87bb1c8247a8d64fd4f8 SHA512 70e0bf5fd3fee861490c651b2d2e94f3c187852bbd4e71972873d4ad4d426156e0785d1ed96ee65d641333357aa9048852b056985d6678f1efe98026a3e1474b
+AUX darktable-4.8.0_fix-has-attribute-musl.patch 1233 BLAKE2B 1ac838bdf7d3345b30d71065bde9d915a36876febd34f58e1005fc4f87cfbc9b757ce4145e5cb173d9d965f7e6c161d1ecf45a6845b0a82cc8ca2fe1bc275e50 SHA512 fda9f858fc1594e208501c3c277c90c3d9c914bbe9420c8151120fafd3ad54e6fc36614ebcf95a0033537e308c5a9fa6d23a619e57eff663cf996c254e434397
 DIST darktable-4.6.0.tar.xz 6129572 BLAKE2B 170d874f6a35c4fe5a5555f308bc541885968b8b5535402f8087ad4d47ee93f3d22a78c633f9b3e14584d1925a7dd682a5f3e2bd187ef2f58d0dc2a407b9bb27 SHA512 825a63c9b8bd7420f5c4b53a9281587be92088e1cd617faaf1de2b455503092cc7476872803a1d82c7bf57fcc57f85a40fc4af8ca04367e48719030f08726df7
 DIST darktable-4.6.1.tar.xz 6240188 BLAKE2B cf0055a4dd5f0a246b8de8ca5a29488fd77162cf2e0d7b681235499da39e4dad69dc5e5f7083f67364171d89aa76e940e8338eadee959f6529fb27658f43b75b SHA512 a5bcbdded7cacbc22d82cc982ad1387dc316cf4c0369f6f215abf9f60906024f2236a988dc025c0553bc2d8d7ca9d7bee9eb28b164fa1d9312eef1a084156fb6
+DIST darktable-4.8.0.tar.xz 6256036 BLAKE2B 386276776a68887c7b439bf71ecc2ba9cd4cf54c247073908eae0cafd1d1db390c39937dfd4a2fcbe5164317b6090e29f2d2caa66fb7da47a702ba8988833ed5 SHA512 cb0535274a2862dfb2c8d36149cfced828662e423e04347970c0e2546e4d70ed7ab52cb80b6d21785165a294dee74fc23ba749086aab0a78386936341eb8216a
 DIST darktable-usermanual-4.4.en.pdf 34311705 BLAKE2B 98094ed8288be092ec9c0398bf1719992ce80723aa803e3924e9d28c1c5f2717b120ed618cbec6eebb958be59d15fe107428099efd87926622b5d08110e36b67 SHA512 90e8b8912776b674a436a7e2377d16b0ef374d879ba16501a1c8a0c8407776ef362b747121859884e0aac1d9fc94f3bf0a58bbccdc6fce27cbcaf4cf169d6ef3
 DIST darktable-usermanual-4.4.uk.pdf 33796107 BLAKE2B 060218ec9b7fbcec947506ea9fdf355411d0b1242d41b9ffb7abd8dd991ece29e75c06231251d2ec2701e319e1b1e8134c08603649fe7e933d21b4aef597f7c3 SHA512 f2a6837a05114d4254fade358382be5fabcbd980a3c4fad702b1102176c7e261fd8646aeef1c0328001da8f7cb25d50b06c9f1163a54987985f556c616728bf5
 DIST darktable-usermanual-4.6.en.pdf 26844087 BLAKE2B 5bdb5e012cd8ba7bace733006136b1f9e510214179e84a9cba0664a3c2e4b19828e2cc54addaf5999579b910b592bf0e9cd9796cf89f3a4e6ae369e8187fbfce SHA512 a1d610c42ae3d1ae4d0bf3e827ed9ccae6faeea20cbc03e7c12d74c3c41175bf3f61d9eba43406b9ba86750edf976c1539357ddf774733f566a076418c34f558
 DIST darktable-usermanual-4.6.uk.pdf 27013345 BLAKE2B 4c0da0038576e8ea97da88a4481e1afdf4e5b5df6b8a52475d18b488ac10066db4ef679681a38a194dd84771e340f58beea0450ec60726abd19d600e73fc40f1 SHA512 6e2f036e3f845791aa8b6eb565230136bfb6ae7f9b1ee56a9201cd25bb09391fd2ec45ba7fa1ddd11b4c193ab6b097fae32107af6c11b6cd6eeada60b002d4b3
-EBUILD darktable-4.6.0.ebuild 5757 BLAKE2B d095734af35fb8118b7d38d4293a8e4c71924a9a2123f3f2c35f216d02e11d7ab04aca077fa44f1fe53e4ab518f3bb84fe530efae676845d7f3f4d5c94776dd4 SHA512 823b793b78c31f9a2fdacd1dbdb638fd5cd7ac04a4a3123b0e769fda2976dc35509fad6693c1b6be4e50c06284c8e7fb3a98b17de45f2612f9d8f961cbc1950d
-EBUILD darktable-4.6.1.ebuild 5872 BLAKE2B c4d9a2afecde2316d2a2e637d1586417c2970969e0ccdbeb996efbb6e8e7f1b3fbd7edebe0ff93c6373af53eb383b2d31f793d848b816a0f6306c5cc83462c25 SHA512 406ddefbd93fc5a7f62774051499242cc298bf08a90846f507c17c7ea45f555994fe61d6195285806770162689012e5d1a25b39c3cba434de762f060662e92b6
-MISC metadata.xml 1017 BLAKE2B dabb4372a61aa5755d7adc3429fdde5a9749f25dccd43121e71a4e72a8f86c36ceb857e586df1ff35da0fe944ca59eea52006065073a6362ee40843530c40318 SHA512 ccc5df2360eab59eb00e236a33e71e4283b107b1615e9cd885e5ff1f8ef53fb134bfa30be29a6c5f6d66699c2bfb1eb4768e28c49d134681bd4fa2de6eb3f7be
+EBUILD darktable-4.6.0.ebuild 5785 BLAKE2B 564d6a22f7ea68d29164d9b64b026183557469c1c0c2d387522f1c32c905cb44698506df084eb8e24d7730d4a6cb4d9e8b85924001a09f5a439d866af0689349 SHA512 1814f05967b57c9511cc9d07a7e1896ff1bf894029b1c5e063a3576eaeb0a4370a9e0d4b9b8f1e2f1050587664da822f307418042d89a93b333c54fc3926a3a8
+EBUILD darktable-4.6.1.ebuild 5900 BLAKE2B f2e7c0dfc905193fb4caac74365a32954e5ef27037b05823fc229f308d8538e3957aa2be23f20be1e4b3e7aea4b2869d26b7ef2815e8645e2312ae921e16c7d9 SHA512 90c7866efa1204b966f8186ff9ff16cd9d4f8705a019ad5324991b0c1be174f969da12b9b794db1ea71eaf8ae2f47424a705db94704a319615801e06915e0018
+EBUILD darktable-4.8.0.ebuild 5894 BLAKE2B a51122ab23f81573affe8b99e0ee4dd185bf04bccf90af79eea86d0873834fb2f7c48bd0a9e6bfe1578960d8ad525f07f7247d16a00460808f39dd95b36fcba5 SHA512 cf0bbdbff7d844fd7a8916453d31da3ed28628ec06fc6b50f2766202fda0cbfae72e460c35cc7341fcf8db4bd807ee16efcedb2c0a54bddeb2a91ddacbfcba44
+MISC metadata.xml 911 BLAKE2B ae7f5d92e5a9bfd96ff14f531d7a54db3db85c6c310a97e9fde57e74dcb6940192d35f98c7ff17d44f627b53252106b5f917dd2123fa80b1d668b6e0f6865081 SHA512 a7bcb43a1859d366eb557c468b23eb60ed4ef250cc0179fa9c823b3d27347ef3692134ef336836b01ebfc9b53165c60ac88f28d6452b9bcfa6a94b32b5b6177d
diff --git a/media-gfx/darktable/darktable-4.6.0.ebuild b/media-gfx/darktable/darktable-4.6.0.ebuild
index 437afc9b907f..860bbe9e07a7 100644
--- a/media-gfx/darktable/darktable-4.6.0.ebuild
+++ b/media-gfx/darktable/darktable-4.6.0.ebuild
@@ -92,7 +92,7 @@ DEPEND="dev-db/sqlite:3
 	openexr? ( media-libs/openexr:= )
 	webp? ( media-libs/libwebp:= )"
 RDEPEND="${DEPEND}
-	kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1 )"
+	kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1:* )"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.4.0_jsonschema-automagic.patch
@@ -148,6 +148,7 @@ src_configure() {
 		-DUSE_COLORD=$(usex colord)
 		-DUSE_GMIC=OFF
 		-DUSE_GRAPHICSMAGICK=$(usex graphicsmagick)
+		-DUSE_HEIF=$(usex heif)
 		-DUSE_JXL=$(usex jpegxl)
 		-DUSE_KWALLET=$(usex kwallet)
 		-DUSE_LIBSECRET=$(usex keyring)
diff --git a/media-gfx/darktable/darktable-4.6.1.ebuild b/media-gfx/darktable/darktable-4.6.1.ebuild
index 4d008c42995f..43f3c82865fb 100644
--- a/media-gfx/darktable/darktable-4.6.1.ebuild
+++ b/media-gfx/darktable/darktable-4.6.1.ebuild
@@ -92,7 +92,7 @@ DEPEND="dev-db/sqlite:3
 	openexr? ( media-libs/openexr:= )
 	webp? ( media-libs/libwebp:= )"
 RDEPEND="${DEPEND}
-	kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1 )"
+	kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1:* )"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.4.0_jsonschema-automagic.patch
@@ -149,6 +149,7 @@ src_configure() {
 		-DUSE_COLORD=$(usex colord)
 		-DUSE_GMIC=OFF
 		-DUSE_GRAPHICSMAGICK=$(usex graphicsmagick)
+		-DUSE_HEIF=$(usex heif)
 		-DUSE_JXL=$(usex jpegxl)
 		-DUSE_KWALLET=$(usex kwallet)
 		-DUSE_LIBSECRET=$(usex keyring)
diff --git a/media-gfx/darktable/darktable-4.8.0.ebuild b/media-gfx/darktable/darktable-4.8.0.ebuild
new file mode 100644
index 000000000000..b3eeef397175
--- /dev/null
+++ b/media-gfx/darktable/darktable-4.8.0.ebuild
@@ -0,0 +1,196 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-4 )
+
+inherit cmake flag-o-matic lua-single toolchain-funcs xdg
+
+DESCRIPTION="A virtual lighttable and darkroom for photographers"
+HOMEPAGE="https://www.darktable.org/"
+S="${WORKDIR}/${P/_/~}"
+LICENSE="GPL-3 CC-BY-3.0"
+SLOT="0"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/darktable-org/${PN}.git"
+
+	LANGS=" af ca cs da de el es fi fr gl he hu it ja nb nl pl pt-BR pt-PT ro ru sk sl sq sv th uk zh-CN zh-TW"
+else
+	#DOC_PV=$(ver_cut 1-2)
+	DOC_PV="4.6"
+	MY_PV="${PV/_/}"
+	MY_P="${P/_/.}"
+
+	SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_PV}/${MY_P}.tar.xz
+		doc? (
+			https://docs.darktable.org/usermanual/${DOC_PV}/en/${PN}_user_manual.pdf -> ${PN}-usermanual-${DOC_PV}.en.pdf
+			l10n_uk? (
+				https://docs.darktable.org/usermanual/${DOC_PV}/uk/${PN}_user_manual.pdf
+					-> ${PN}-usermanual-${DOC_PV}.uk.pdf
+			)
+		)"
+
+	KEYWORDS="amd64 ~arm64 -x86"
+	LANGS=" cs de es fi fr hu it ja nl pl pt-BR ru sl sq uk zh-CN zh-TW"
+fi
+
+IUSE="avif colord cpu_flags_x86_avx cpu_flags_x86_sse3 cups doc gamepad geolocation keyring gphoto2 graphicsmagick heif jpeg2k jpegxl kwallet lto lua midi nls opencl openmp openexr test tools webp
+	${LANGS// / l10n_}"
+
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
+
+# It is sometimes requested, by both users and certain devs, to have sys-devel/gcc[graphite]
+# in BDEPEND. This has not been done *on purpose*, for the following reason:
+#  - darktable can also be built with sys-devel/clang so we'd have to have that, as an alternative,
+#    in BDEPEND too
+#  - there are at least two darktable dependencies (media-libs/mesa and virtual/rust) which
+#    by default pull in sys-devel/clang
+#  - as a result of the above, for most gcc users adding the above to BDEPEND is a no-op
+#    (and curiously enough, empirical observations suggest current versions of Portage are
+#    more likely to pull in Clang to build darktable with than to request enabling USE=graphite
+#    on GCC; that might be a bug though)
+BDEPEND="dev-util/intltool
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	test? ( >=dev-python/jsonschema-3.2.0 )"
+DEPEND="dev-db/sqlite:3
+	dev-libs/icu:=
+	dev-libs/json-glib
+	dev-libs/libxml2:2
+	>=dev-libs/pugixml-1.8:=
+	gnome-base/librsvg:2
+	>=media-gfx/exiv2-0.25-r2:=[xmp]
+	media-libs/lcms:2
+	>=media-libs/lensfun-0.2.3:=
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:=
+	media-libs/tiff:=
+	net-libs/libsoup:2.4
+	net-misc/curl
+	sys-libs/zlib:=
+	x11-libs/cairo
+	>=x11-libs/gtk+-3.22:3
+	x11-libs/pango
+	avif? ( >=media-libs/libavif-0.8.2:= )
+	colord? ( x11-libs/colord-gtk:= )
+	cups? ( net-print/cups )
+	gamepad? ( media-libs/libsdl2 )
+	geolocation? ( >=sci-geosciences/osm-gps-map-1.1.0 )
+	keyring? ( >=app-crypt/libsecret-0.18 )
+	gphoto2? ( media-libs/libgphoto2:= )
+	graphicsmagick? ( media-gfx/graphicsmagick )
+	heif? ( media-libs/libheif:= )
+	jpeg2k? ( media-libs/openjpeg:2= )
+	jpegxl? ( media-libs/libjxl:= )
+	lua? ( ${LUA_DEPS} )
+	midi? ( media-libs/portmidi )
+	opencl? ( virtual/opencl )
+	openexr? ( media-libs/openexr:= )
+	webp? ( media-libs/libwebp:= )"
+RDEPEND="${DEPEND}
+	kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1:* )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.4.0_jsonschema-automagic.patch
+	"${FILESDIR}"/${PN}-3.4.1_libxcf-cmake.patch
+	"${FILESDIR}"/${PN}-4.2.1_cmake-musl.patch
+	"${FILESDIR}"/${PN}-4.8.0_fix-has-attribute-musl.patch
+)
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		# Bug #695658
+		if tc-is-gcc; then
+			if ! test-flags-CC -floop-block &> /dev/null; then
+				eerror "Building ${PN} with GCC requires Graphite support."
+				eerror "Please switch to a version of sys-devel/gcc built with USE=graphite, or use a different compiler."
+				die "Selected compiler is sys-devel/gcc[-graphite]"
+			fi
+		fi
+
+		use openmp && tc-check-openmp
+	fi
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+	use lua && lua-single_pkg_setup
+}
+
+src_prepare() {
+	use cpu_flags_x86_avx && append-flags -mavx
+	use cpu_flags_x86_sse3 && append-flags -msse3
+
+	sed -i -e 's:/appdata:/metainfo:g' data/CMakeLists.txt || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	CMAKE_BUILD_TYPE="Release"
+	local mycmakeargs=(
+		-DBUILD_CURVE_TOOLS=$(usex tools)
+		-DBUILD_NOISE_TOOLS=$(usex tools)
+		-DBUILD_PRINT=$(usex cups)
+		-DCUSTOM_CFLAGS=ON
+		-DDONT_USE_INTERNAL_LUA=ON
+		-DRAWSPEED_ENABLE_LTO=$(usex lto)
+		-DRAWSPEED_ENABLE_WERROR=OFF
+		-DRAWSPEED_MUSL_SYSTEM=$(usex elibc_musl)
+		-DTESTBUILD_OPENCL_PROGRAMS=OFF
+		-DUSE_AVIF=$(usex avif)
+		-DUSE_CAMERA_SUPPORT=$(usex gphoto2)
+		-DUSE_COLORD=$(usex colord)
+		-DUSE_GMIC=OFF
+		-DUSE_GRAPHICSMAGICK=$(usex graphicsmagick)
+		-DUSE_HEIF=$(usex heif)
+		-DUSE_JXL=$(usex jpegxl)
+		-DUSE_KWALLET=$(usex kwallet)
+		-DUSE_LIBSECRET=$(usex keyring)
+		-DUSE_LUA=$(usex lua)
+		-DUSE_MAP=$(usex geolocation)
+		-DUSE_NLS=$(usex nls)
+		-DUSE_OPENCL=$(usex opencl)
+		-DUSE_OPENEXR=$(usex openexr)
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_OPENMP=$(usex openmp)
+		-DUSE_PORTMIDI=$(usex midi)
+		-DUSE_SDL2=$(usex gamepad)
+		-DUSE_WEBP=$(usex webp)
+		-DWANT_JSON_VALIDATION=$(usex test)
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	# This USE flag is masked for -9999
+	if use doc; then
+		dodoc "${DISTDIR}"/${PN}-usermanual-${DOC_PV}.en.pdf
+		use l10n_uk && dodoc "${DISTDIR}"/${PN}-usermanual-${DOC_PV}.uk.pdf
+	fi
+
+	if use nls; then
+		for lang in ${LANGS} ; do
+			if ! use l10n_${lang}; then
+				rm -r "${ED}"/usr/share/locale/${lang/-/_} || die
+			fi
+		done
+	fi
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	elog
+	elog "When updating a major version,"
+	elog "please bear in mind that your edits will be preserved during this process,"
+	elog "but it will not be possible to downgrade any more."
+	elog
+	ewarn "It will not be possible to downgrade!"
+	ewarn
+}
diff --git a/media-gfx/darktable/files/darktable-4.8.0_fix-has-attribute-musl.patch b/media-gfx/darktable/files/darktable-4.8.0_fix-has-attribute-musl.patch
new file mode 100644
index 000000000000..f6a474acfd24
--- /dev/null
+++ b/media-gfx/darktable/files/darktable-4.8.0_fix-has-attribute-musl.patch
@@ -0,0 +1,26 @@
+From 7601d97268bf5f63f7e53d9c114fe439dcc46b0d Mon Sep 17 00:00:00 2001
+From: Markus Meier <maekke@gentoo.org>
+Date: Fri, 21 Jun 2024 20:35:33 +0200
+Subject: [PATCH] fix musl build
+
+See https://bugs.gentoo.org/915596
+---
+ src/common/darktable.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/common/darktable.h b/src/common/darktable.h
+index a62fd402fe..4d0d571b2b 100644
+--- a/src/common/darktable.h
++++ b/src/common/darktable.h
+@@ -150,7 +150,7 @@ extern "C" {
+ /* Create cloned functions for various CPU SSE generations */
+ /* See for instructions https://hannes.hauswedell.net/post/2017/12/09/fmv/ */
+ /* TL;DR : use only on SIMD functions containing low-level paralellized/vectorized loops */
+-#if __has_attribute(target_clones) && !defined(_WIN32) && !defined(NATIVE_ARCH) && !defined(__APPLE__)
++#if __has_attribute(target_clones) && !defined(_WIN32) && !defined(NATIVE_ARCH) && !defined(__APPLE__) && defined(__GLIBC__)
+ # if defined(__amd64__) || defined(__amd64) || defined(__x86_64__) || defined(__x86_64)
+ #define __DT_CLONE_TARGETS__ __attribute__((target_clones("default", "sse2", "sse3", "sse4.1", "sse4.2", "popcnt", "avx", "avx2", "avx512f", "fma4")))
+ # elif defined(__PPC64__)
+-- 
+2.44.2
+
diff --git a/media-gfx/darktable/metadata.xml b/media-gfx/darktable/metadata.xml
index be183534803a..3abfd9aceb0e 100644
--- a/media-gfx/darktable/metadata.xml
+++ b/media-gfx/darktable/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<maintainer type="person">
 		<email>maekke@gentoo.org</email>
 		<name>Markus Meier</name>
 	</maintainer>
diff --git a/media-gfx/dawn/Manifest b/media-gfx/dawn/Manifest
deleted file mode 100644
index 150035b0f1cf..000000000000
--- a/media-gfx/dawn/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX dawn-3.90b-gcc7.patch 513 BLAKE2B cf0e95894bbe85db5bfc45c1ef731dafd593c4531711bce931013b921a82b5306ca31e68dfd4f5a5b9fcf70b1bfc51f4b4c1a015725acaea6d7ac6703fb2cd8d SHA512 784659c383e1c240f5ea9def2bc39429fe726960356ca57ad07fc4e0415053f6bf9125a09ce54a1a1591b2ad9887dbc01619fa7f566d249d86767ed798f2345a
-AUX dawn-3.90b-no-interactive.patch 5467 BLAKE2B 2d7bfe6cc17143dcd2c33492eb45a77ecc44bcad9685f147c4a69ad0ec6aecced69c9e9de6d27b66c2a6db57971019ce2fa7014e1e9d0a1a5e338bc79027254e SHA512 fa9be36122f1c97226c7096657c7b3fd43f23c30c2e7d3ecb0673aa09fc1327f86afe92abf26a078165ee959ee5edcfe77b628c614f92e56cc8ca91e6b612265
-DIST dawn_3_90b.tgz 1334732 BLAKE2B 97f4e747b8f9d2eb60d9c8f0e7358fe549052e36a02127f02363c328775f33ae9fd36afd850ef06b365aaaa9723a541d89d7f2fccb37d1dd30f626054d7939b3 SHA512 5ff0b3572442ad1f435d5f894a0f1637efbc8eb3dae4f67dd456ff220a497cc59fe3bdf773cd38a0690d3689e9cda48f49c408ddab56f31efb9c87447d439fea
-EBUILD dawn-3.90b-r1.ebuild 1070 BLAKE2B fc32a8bbc1bb9c53514345b110a814ea33826edc100dbbcead03cc9079cd241d80e271b29445c1c9c164e4fdec88d3355688fdd82f074d7484046090b64be645 SHA512 eb42b1e670bfaf121802b51aca6f268dd6e93f97e78dc95e2c05a8802347b625542bdef620f7febc6cd8b893ec3968a5271dbb6de3887eeec2157beccfcbb96d
-MISC metadata.xml 1191 BLAKE2B 3bf529631aad5e62d4c1a362ea1ca027c618ffa0a14c6ba29df5a3f78c9d1a61a63836578aca19dee9ef2e81ac6b9212f661e5d4e96559cc5fe5e054c43d90b6 SHA512 0d2077af8d94398b135ccbf703981cabc95f27806e4880e665e08b415c7d180f687698141befa6a2acfd20ab98447a66eea8fa178654286fd68a23cae41b775a
diff --git a/media-gfx/dawn/dawn-3.90b-r1.ebuild b/media-gfx/dawn/dawn-3.90b-r1.ebuild
deleted file mode 100644
index 8a48d386661e..000000000000
--- a/media-gfx/dawn/dawn-3.90b-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eapi7-ver toolchain-funcs
-
-MY_P=${PN}_$(ver_rs 1 _)
-
-DESCRIPTION="3D geometrical postscript renderer"
-HOMEPAGE="http://geant4.kek.jp/~tanaka/DAWN/About_DAWN.html"
-SRC_URI="http://geant4.kek.jp/~tanaka/src/${MY_P}.tgz"
-
-LICENSE="public-domain"
-SLOT="0"
-
-KEYWORDS="amd64 ~hppa ppc x86"
-IUSE="doc opengl X"
-
-RDEPEND="dev-lang/tk:*
-	opengl? ( virtual/opengl )
-	X? ( x11-libs/libX11 )"
-DEPEND="${RDEPEND}
-	app-shells/tcsh
-	doc? ( virtual/latex-base )"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-no-interactive.patch
-	"${FILESDIR}"/${P}-gcc7.patch
-)
-
-DOCS=( README.txt )
-
-src_prepare() {
-	default
-
-	sed -i -e "s/\$(LIB_DIR)/\$(LDFLAGS) &/" \
-		-e '/strip/d' Makefile*in || die
-
-	if use X; then
-		mv -f configure_xwin configure || die
-	fi
-
-	tc-export CXX
-}
-
-src_install() {
-	dodir /usr/bin
-
-	if use doc; then
-		pdflatex DOC/G4PRIM_FORMAT_24.tex || die "pdf generation failed"
-		DOCS+=( DOC/*.pdf )
-		HTML_DOCS=( DOC/*.html )
-	fi
-
-	default
-}
diff --git a/media-gfx/dawn/files/dawn-3.90b-gcc7.patch b/media-gfx/dawn/files/dawn-3.90b-gcc7.patch
deleted file mode 100644
index e144a38df8f0..000000000000
--- a/media-gfx/dawn/files/dawn-3.90b-gcc7.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Bug: https://bugs.gentoo.org/638616
-
---- a/FRString.h
-+++ b/FRString.h
-@@ -137,13 +137,13 @@
- 	char*  p = m_string ;
- 	
- 	// skip first blank if any
--	while(  isspace(*p) && p != '\0' ) {p++;} 
-+	while(  isspace(*p) && *p != '\0' ) {p++;}
- 
- 	// skip one word
--	while( !isspace(*p) && p != '\0' ) {p++;} 
-+	while( !isspace(*p) && *p != '\0' ) {p++;}
- 
- 	// skip second blank if any
--	while(  isspace(*p) && p != '\0' ) {p++;} 
-+	while(  isspace(*p) && *p != '\0' ) {p++;}
- 
- 	// reset string
- 	strcpy( tmp, p  );
diff --git a/media-gfx/dawn/files/dawn-3.90b-no-interactive.patch b/media-gfx/dawn/files/dawn-3.90b-no-interactive.patch
deleted file mode 100644
index ea8ac7e6a90e..000000000000
--- a/media-gfx/dawn/files/dawn-3.90b-no-interactive.patch
+++ /dev/null
@@ -1,158 +0,0 @@
---- a/configure_xwin
-+++ b/configure_xwin
-@@ -16,17 +16,17 @@
- #----- C++ compiler name
- echo "Input C++ compiler name (e.g. g++, no default)."
- echo -n " :"
--set cpp_compiler=$<
-+set cpp_compiler=
- 
- #----- Optimization option of the C++ compiler
- echo     "Input optimization option (e.g. -O2, no default)"
- echo -n  " :"
--set optimize=$<
-+set optimize=
- 
- #----- Input Tcl/Tk window shell name
- echo    "Input Tcl/Tk window shell name"
- echo -n "  (e.g. wish, no default): "
--set wish=$<
-+set wish=wish
- 
- 
- #----- 
-@@ -34,7 +34,7 @@
- echo    "  (e.g. -I/usr/X11R6/include) "
- echo    "   Hit return key if path is already set properly.            )"
- echo -n " : "
--set xlib_inc=$<
-+set xlib_inc=
- echo ""
- 
- 
-@@ -43,17 +43,17 @@
- echo    "  (e.g. -L/usr/X11R6/lib) "
- echo    "   Hit return key if path is already set properly.)"
- echo -n " : "
--set xlib_lib=$<
-+set xlib_lib=
- echo ""
- 
- #----- Input directory name to install dawn and DAWN_GUI
- echo    "Input directory to install executable files"
- echo -n "  (e.g. /usr/local/bin, no default ): "
--set install_dir=$<
-+set install_dir=
- 
- #----- Input system name
- echo -n  "Select a system (0: Defalut, 1: AIX, 2: IRIX, 3: Solaris, 4: RedHat/FedoraCore): "
--set sysid=$<
-+set sysid=0
- switch ($sysid)
-    case "0":
-     set sysname = "Default"
-@@ -80,7 +80,7 @@
- echo     "Do you use remote-visualization function? (y/n, no default)"
- echo     " (Select n if your compilation fails for FRClientServer.cc)"
- echo  -n " : "
--set ynflag_socket=$<
-+set ynflag_socket=n
- switch ($ynflag_socket)
-    case "y":
-     set macro_socket = '#define USE_SOCKET'
-@@ -123,14 +123,14 @@
- 
- echo "### C++ compiler"                                >> Makefile
- #echo "ifndef CXX"                                      >> Makefile
--echo "CC = $cpp_compiler"                              >> Makefile
-+#echo "CC = $cpp_compiler"                              >> Makefile
- #echo "else"                                            >> Makefile
--#echo 'CC = $(CXX)'                                     >> Makefile
-+echo 'CC = $(CXX)'                                     >> Makefile
- #echo "endif"                                           >> Makefile
- echo ""                                                >> Makefile
- 
- echo "### Optimization"                                >> Makefile
--echo "OPTIMIZE = $optimize"                            >> Makefile
-+echo 'OPTIMIZE = $(CXXFLAGS)'                            >> Makefile
- echo ""                                                >> Makefile
- 
- echo "### Waring level"                                >> Makefile
-@@ -152,7 +152,7 @@
- echo ""                                                >> Makefile
- 
- echo "### Directory where to install executable files" >> Makefile
--echo "INSTALL_DIR = $install_dir"                      >> Makefile
-+echo 'INSTALL_DIR = $(DESTDIR)/usr/bin'                      >> Makefile
- echo ""                                                >> Makefile
- 
- echo "### Socket libraries to be linked "              >> Makefile
---- a/FRSocketMacro.h
-+++ b/FRSocketMacro.h
-@@ -14,8 +14,8 @@
- #elif defined SOCKET_REDHAT61
- 	#define         CLIENT_ADDR_LENGTH    socklen_t
- #else 
--	#define         CLIENT_ADDR_LENGTH    int
--//	#define         CLIENT_ADDR_LENGTH    size_t
-+//	#define         CLIENT_ADDR_LENGTH    int
-+	#define         CLIENT_ADDR_LENGTH    size_t
- #endif
- 
- 	//----- gethostname
---- a/configure
-+++ b/configure
-@@ -13,22 +13,22 @@
- #----- C++ compiler name
- echo "Input C++ compiler name (e.g. g++, no default)."
- echo -n " :"
--set cpp_compiler=$<
-+set cpp_compiler=
- 
- #----- Optimization option of the C++ compiler
- echo     "Input optimization option (e.g. -O2, no default)"
- echo -n  " :"
--set optimize=$<
-+set optimize=
- 
- #----- Input Tcl/Tk window shell name
- echo    "Input Tcl/Tk window shell name"
- echo -n "  (e.g. wish, no default): "
--set wish=$<
-+set wish=wish
- 
- #----- Input directory name to install dawn and DAWN_GUI
- echo    "Input directory to install executable files"
- echo -n "  (e.g. /usr/local/bin, no default ): "
--set install_dir=$<
-+set install_dir=
- 
- 
- ##### DELETE #####
-@@ -57,14 +57,14 @@
- 
- echo "### C++ compiler"                                >> Makefile
- #echo "ifndef CXX"                                     >> Makefile
--echo "CC = $cpp_compiler"                              >> Makefile
-+#echo "CC = $cpp_compiler"                              >> Makefile
- #echo "else"                                           >> Makefile
--#echo 'CC = $(CXX)'                                    >> Makefile
-+echo 'CC = $(CXX)'                                    >> Makefile
- #echo "endif"                                          >> Makefile
- echo ""                                                >> Makefile
- 
- echo "### Optimization"                                >> Makefile
--echo "OPTIMIZE = $optimize"                            >> Makefile
-+echo 'OPTIMIZE = $(CXXFLAGS)'                          >> Makefile
- echo ""                                                >> Makefile
- 
- echo "### Waring level"                                >> Makefile
-@@ -78,7 +78,7 @@
- 
- 
- echo "### Directory where to install executable files" >> Makefile
--echo "INSTALL_DIR = $install_dir"                      >> Makefile
-+echo 'INSTALL_DIR = $(DESTDIR)/usr/bin'                >> Makefile
- echo ""                                                >> Makefile
- 
- echo ""                                                >> Makefile
diff --git a/media-gfx/dawn/metadata.xml b/media-gfx/dawn/metadata.xml
deleted file mode 100644
index 93696a17c1da..000000000000
--- a/media-gfx/dawn/metadata.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>sci-physics@gentoo.org</email>
-		<name>Gentoo Physics Project</name>
-	</maintainer>
-	<longdescription lang="en">
-		Fukui Renderer DAWN (Drawer for Academic WritiNgs)
-		is a renderer, which reads 3D geometrical data and visualize them.
-		It is a vectorized 3D PostScript processor with analytical
-		hidden line/surface removal.
-		It aims at precise technical drawing of complicated objects.
-		It performs geometrical hidden line/surface removal and calculates
-		out all visible parts of the 3D data before drawing.  This drawing
-		algorithm realizes device-independent technical high quality of
-		vectorized graphics.
-
-		3D Data files should be generated by a modeler or by hands
-		separately.  If you use DAWN as a visualizer of,
-		say, a simulator of physical experiments,
-		the simulator application itself is recognized as a modeler.
-
-		An important feature of DAWN is that it has been developed to
-		visualize 3D data generated by a high-energy experimental detector
-		simulator "GEANT4".
-	</longdescription>
-</pkgmetadata>
diff --git a/media-gfx/dcraw/Manifest b/media-gfx/dcraw/Manifest
index 68c12172c81f..96f7e75d9845 100644
--- a/media-gfx/dcraw/Manifest
+++ b/media-gfx/dcraw/Manifest
@@ -1,13 +1,10 @@
 AUX conversion-examples.txt 545 BLAKE2B 4bda8339c0ae2f427ae0432b09da54aa5c194318b5cc0d3131c2e96f2b26ed0f91f6f419f0830fc773ab9be543019143755e039866146c6ce0eb361f9172ae4c SHA512 47213effb868ac4754075e43a6194ccbbe3e1431ef47280a670ad7e843cf727ad63ebf76849210672a72a79b1f702ca112aeece12284191f11c859a54fc090a9
 AUX dcraw-9.28.0-fix-LC_CTYPE-undeclared.patch 377 BLAKE2B 91587f7f388b490cd4a9df193ce7602bf8dd6e60068c93f8e372cacd4c234ec905a02036a3942057dcca3f91efb7cb3c095449b34a4e48997874fff7d86fcfd3 SHA512 278fd2fc0d526dfe6f7b23f367dd398cf44c990266722f2878b3f86af7ef175b078df8217574b5bc718d381fff83550cab66d9d9684e19da5692e4ff5742057b
-AUX dcraw-9.28.0-fix-memmem-wrong-return-type.patch 373 BLAKE2B 767ebce05bff02c33a23ae4fc3ead18bf6be03c144a52688d31974cfd915a77833842f0d6e9c88a33ba51c60bb4d6acd0ded008bddd81dd79311ec69b0193728 SHA512 76c0ffbb94596d12afdb9400c52919d002464882389d49bff72266a19fefc030304b0a6eb377e93742b346e47a2f263a0badca61f0315ca74e168f65a5fe4f21
 AUX dcraw-9.28.0-gimp-2.10.patch 1182 BLAKE2B 25a71d36fe20ea97b17f13a65e09fbbe786bffb4c57ea398adc83933bb8cdae27a5db8f0b12cc1e51671aa70e2da14755e5aefa2f035060d08da99c7d51e23bf SHA512 e237cf9e917f451bb141dc86dd80c4a78eeb7b42ccda28eabb94b2516dff4ef7148b97a34b61ab27fb9743b3a40f81ab2e416ff0950ffdffdae3a98925896c0c
 AUX dcraw-9.28.0-glibc-2.38.patch 800 BLAKE2B 5b6836b85060c786e1d83acc9584959c5df0384f100b7dba2c20262284b4bb7254fcf1ff12cbaa950cd6146bdc67e6fb808c90e7fb63ccbcea8277215f800028 SHA512 eb3815ec13e8fa9b8aba282f12ef70d1c412f6829e29460fe8858bc719efe7c55b04073604926e218b33aa1b4d80a3fb6991f9749ebad352d1132be8569e29f8
 AUX dcwrap 437 BLAKE2B ec88784e059ab07990acf3a47517f243502a140b451040c77f9320bd7b7767d45b88d7c139bb038816448c50a682c6645095f79be9d2836c6f896e27a8ffc20c SHA512 ba872972125a5394e8d29bf6e5b612959b228265885218061eeff6a17f87dd1891e33876c49fd4071a76517843b6709d16f1fa976994c49c9357d7dc7211af9e
 DIST dcraw-9.28.0.tar.gz 194193 BLAKE2B d39a2d76dbbe74a2aed21c6b132ac25c9dd17312813e7f640a4a6d4abd4e8f1868ad596296ca9bfe61427b8b4764821e32679128747ff5a9452988814b77c638 SHA512 04609c4ddd5d1c9fa0ee1617d2ef25efdc22451e1fa6cf669d93abb1fa630a18198b30a289400f1814c8dca285547da8b081a1b00b085c00bb9318ad25c48a30
 DIST parse-1.73.tar.bz2 8186 BLAKE2B 4d7d69bbaad3fd69caeae24e4dfc77fa580d969f903c925f76cf0a7bdb13ff34c96ab6dc9917609ce886365f6971290b3af63aec9fed43b1876aa44dd951521d SHA512 06ffaf72695dc86bfc2bdd10d4f732bc428b72d427f4c10e93fc58536513477cf297adb56fb9cfc5ba5fd5b6b4cd197c33d8dac957a0a1bbe65b23393b64278c
 DIST rawphoto-1.32.tar.bz2 3841 BLAKE2B db7a80af4b06fc3709a9ae69d9f166c3323097821bb561af4e0ac9a1ef677cab6cfd5cd7896d1e1fce85e6fab545ced7d00ce809f97332bec594b94a27f77e23 SHA512 6ee5b6c4e4266c8e04221c894c4e737f8a6d2c6f0cc9c82db73064afd68488bd60de19b86b2d7b82780283bbb9f8156ef3149c1c730f09a00dce632744b44d56
-EBUILD dcraw-9.28.0-r2.ebuild 2962 BLAKE2B 90a57136615f9b9b6345174a51f0beed8105afca5e1ce4bbcc321fb6e4b7ff87432e59401f3b75f49ce7e6614aec77530ea77bbe24a8477ffa570502c9b8651e SHA512 c7b51592fb736d9e3e76ee0a420ea99db898fca7c1c1efc06bd67bfa7709c0c60df9c84bfa85f47ae15d39ee2bd50b9efe8dbe21d87cf1fad18337edb595678f
-EBUILD dcraw-9.28.0-r3.ebuild 3515 BLAKE2B 19940b4dcccf16588dc487bfd97314c052b543c579c505f2da139b77326323d19b68f090ebc39774a57a834b4304363dc52211e5f22cda1040146034e44287fa SHA512 cc33a1af42dca687c86daae3269c8ac9d57c9808ec901733d4a6b429cf264fa31d0e64c885850facf65ee355f8ae7a334690918fde5d1badc498635e6ce961fd
-EBUILD dcraw-9.28.0-r4.ebuild 3472 BLAKE2B 61ac9a4e0643907c439cb97b6e1f3010aa8944521623ac63b23d4aeb7a4853b28a578417f14921bc229df6cf32c39738fbb7c8b9855f88f07ddb5ffa46aaf34f SHA512 bbdb1fdeb89b9dcefa0366fa1afadd4326ef1e85992fbf655ffaf742e76f9976e1bd605920304e40704797c851a499f8ee6b0290d7a6e0c467e8174c9b31b94e
+EBUILD dcraw-9.28.0-r4.ebuild 3466 BLAKE2B b5974e4bb56ec5a135037ab70cbddd6444588f69098efe8e306be37d8869a569548ea732cb998e15c08619ea724cd0a678c1ac1eb29af68e99d47e9a1f4ffc31 SHA512 f532ac811cb48636f0b277f05edc9448612f3774f1655faf4a991e4b5e9d03f93f9c055ae6c1b95475d86fb933ac3a1e0f8eb485d94b6bf86186b7f85d20e07e
 MISC metadata.xml 610 BLAKE2B 1546712a5da3c3f29a1f1e632a8f3c7d600ce72d90fc05bfd54e5921d6047e60561cde7be1b110f0151c05220b3b1b8f2287e8330c0a65f523c5ce8d8fd00036 SHA512 a175c151e37ff8eaf827e0ecdf41a35761c44ed816f17b37f40bc0b3fefc9bbaf41bab44da907c4eecf512b55cf86792f8610bbfe2a54130c44c2d85c8b0c090
diff --git a/media-gfx/dcraw/dcraw-9.28.0-r2.ebuild b/media-gfx/dcraw/dcraw-9.28.0-r2.ebuild
deleted file mode 100644
index 607282673bfd..000000000000
--- a/media-gfx/dcraw/dcraw-9.28.0-r2.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit readme.gentoo-r1 toolchain-funcs
-
-DESCRIPTION="Command-line decoder for raw digital photos"
-HOMEPAGE="https://www.cybercom.net/~dcoffin/dcraw/"
-SRC_URI="https://www.cybercom.net/~dcoffin/dcraw/archive/${P}.tar.gz
-	mirror://gentoo/parse-1.73.tar.bz2
-	gimp? ( mirror://gentoo/rawphoto-1.32.tar.bz2 )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-LANGS=" ca cs de da eo es fr hu it nl pl pt ru sv zh_CN zh_TW"
-IUSE="nls gimp jpeg lcms"
-
-COMMON_DEPEND="
-	jpeg? ( virtual/jpeg:0 )
-	lcms? ( media-libs/lcms:2 )
-	gimp? ( media-gfx/gimp:0/2 )
-"
-DEPEND="${COMMON_DEPEND}"
-BDEPEND="
-	nls? ( sys-devel/gettext )
-	gimp? ( virtual/pkgconfig )
-"
-RDEPEND="${COMMON_DEPEND}
-	media-libs/netpbm
-"
-
-S="${WORKDIR}/dcraw"
-
-DOC_CONTENTS="
-	See conversion-examples.txt.gz on how to convert
-	the PPM files produced by dcraw to other image formats.\n
-
-	\nThe functionality of the external program 'fujiturn' was
-	incorporated into dcraw and is automatically used now.\n
-
-	\nThere's an example wrapper script included called 'dcwrap'.
-	This package also includes 'dcparse', which extracts
-	thumbnail images (preferably JPEGs) from any raw digital
-	camera formats that have them, and shows table contents.
-"
-
-run_build() {
-	einfo "${@}"
-	${@} || die
-}
-
-src_prepare() {
-	default
-
-	# Support gimp-2.10, bug #655390
-	use gimp && eapply "${FILESDIR}"/${PN}-9.28.0-gimp-2.10.patch
-
-	rename dcraw_ dcraw. dcraw_*.1 || die "Failed to rename"
-}
-
-src_compile() {
-	local ECFLAGS="-O2 -DNO_JASPER=yes" # Without optimisation build fails
-	local ELIBS="-lm"
-
-	use lcms && ELIBS="-llcms2 ${ELIBS}" || ECFLAGS+=" -DNO_LCMS=yes"
-	use jpeg && ELIBS="-ljpeg ${ELIBS}" || ECFLAGS+=" -DNO_JPEG=yes"
-	use nls && ECFLAGS+=" -DLOCALEDIR=\"/usr/share/locale/\""
-
-	run_build $(tc-getCC) ${ECFLAGS} ${CFLAGS} ${LDFLAGS} -o dcraw dcraw.c ${ELIBS}
-
-	run_build $(tc-getCC) -O2 ${CFLAGS} ${LDFLAGS} -o dcparse parse.c
-
-	# rawphoto gimp plugin
-	if use gimp; then
-		run_build $(tc-getCC) ${CFLAGS} ${LDFLAGS} \
-			$($(tc-getPKG_CONFIG) --cflags gimpui-2.0) rawphoto.c -o rawphoto \
-			$($(tc-getPKG_CONFIG) --libs gimpui-2.0)
-	fi
-
-	if use nls; then
-		for lang in ${LANGS}; do
-			has ${lang} ${LINGUAS-${lang}} \
-				&& run_build msgfmt -c -o dcraw_${lang}.mo dcraw_${lang}.po
-		done
-	fi
-}
-
-src_install() {
-	dobin dcraw dcparse
-	dodoc "${FILESDIR}"/{conversion-examples.txt,dcwrap}
-
-	# rawphoto gimp plugin
-	if use gimp; then
-		insinto "$($(tc-getPKG_CONFIG) --variable=gimplibdir gimp-2.0)/plug-ins"
-		insopts -m0755
-		doins rawphoto
-	fi
-
-	doman dcraw.1
-
-	if use nls; then
-		for lang in ${LANGS}; do
-			if has ${lang} ${LINGUAS-${lang}}; then
-				[[ -f dcraw.${lang}.1 ]] && doman dcraw.${lang}.1
-				insinto /usr/share/locale/${lang}/LC_MESSAGES
-				newins dcraw_${lang}.mo dcraw.mo
-			fi
-		done
-	fi
-
-	readme.gentoo_create_doc
-}
diff --git a/media-gfx/dcraw/dcraw-9.28.0-r3.ebuild b/media-gfx/dcraw/dcraw-9.28.0-r3.ebuild
deleted file mode 100644
index a56277206cec..000000000000
--- a/media-gfx/dcraw/dcraw-9.28.0-r3.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit readme.gentoo-r1 toolchain-funcs
-
-DESCRIPTION="Command-line decoder for raw digital photos"
-HOMEPAGE="https://www.dechifro.org/dcraw/"
-SRC_URI="https://www.cybercom.net/~dcoffin/dcraw/archive/${P}.tar.gz
-	mirror://gentoo/parse-1.73.tar.bz2
-	gimp? ( mirror://gentoo/rawphoto-1.32.tar.bz2 )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-LANGS=" ca cs de da eo es fr hu it nl pl pt ru sv zh_CN zh_TW"
-IUSE="nls gimp jpeg lcms"
-
-COMMON_DEPEND="
-	jpeg? ( media-libs/libjpeg-turbo:0 )
-	lcms? ( media-libs/lcms:2 )
-	gimp? (
-		  dev-libs/atk
-		  media-gfx/gimp:0/2
-		  media-libs/harfbuzz
-		  x11-libs/cairo
-		  x11-libs/gdk-pixbuf:2
-		  x11-libs/gtk+:2
-		  x11-libs/pango
-)
-"
-DEPEND="${COMMON_DEPEND}"
-BDEPEND="
-	nls? ( sys-devel/gettext )
-	gimp? ( virtual/pkgconfig )
-"
-RDEPEND="${COMMON_DEPEND}
-	media-libs/netpbm
-"
-
-S="${WORKDIR}/dcraw"
-
-DOC_CONTENTS="
-	See conversion-examples.txt.gz on how to convert
-	the PPM files produced by dcraw to other image formats.\n
-
-	\nThe functionality of the external program 'fujiturn' was
-	incorporated into dcraw and is automatically used now.\n
-
-	\nThere's an example wrapper script included called 'dcwrap'.
-	This package also includes 'dcparse', which extracts
-	thumbnail images (preferably JPEGs) from any raw digital
-	camera formats that have them, and shows table contents.
-"
-
-PATCHES=( "${FILESDIR}/${P}-fix-memmem-wrong-return-type.patch"
-		  "${FILESDIR}/${P}-fix-LC_CTYPE-undeclared.patch"
-)
-
-run_build() {
-	einfo "${@}"
-	${@} || die
-}
-
-src_prepare() {
-	default
-
-	# Support gimp-2.10, bug #655390
-	use gimp && eapply "${FILESDIR}"/${PN}-9.28.0-gimp-2.10.patch
-
-	rename dcraw_ dcraw. dcraw_*.1 || die "Failed to rename"
-}
-
-src_compile() {
-	local ECFLAGS="-O2 -DNO_JASPER=yes " # Without optimisation build fails
-	local ELIBS="-lm"
-	local RP_ECFLAGS="-I/usr/include/gtk-2.0/ -I/usr/include/glib-2.0/ \
-	  -I/usr/$(get_libdir)/glib-2.0/include -I/usr/include/cairo \
-	  -I/usr/include/pango-1.0 -I/usr/include/harfbuzz \
-	  -I/usr/lib64/gtk-2.0/include -I/usr/include/gdk-pixbuf-2.0 \
-	  -I/usr/include/atk-1.0"
-
-	use lcms && ELIBS="-llcms2 ${ELIBS}" || ECFLAGS+=" -DNO_LCMS=yes"
-	use jpeg && ELIBS="-ljpeg ${ELIBS}" || ECFLAGS+=" -DNO_JPEG=yes"
-	use nls && ECFLAGS+=" -DLOCALEDIR=\"/usr/share/locale/\""
-
-	run_build $(tc-getCC) ${ECFLAGS} ${CFLAGS} ${LDFLAGS} -o dcraw dcraw.c ${ELIBS}
-
-	run_build $(tc-getCC) -O2 ${CFLAGS} ${LDFLAGS} -o dcparse parse.c
-
-	# rawphoto gimp plugin
-	if use gimp; then
-		run_build $(tc-getCC) ${RP_ECFLAGS} ${CFLAGS} ${LDFLAGS} \
-			$($(tc-getPKG_CONFIG) --cflags gimpui-2.0) rawphoto.c -o rawphoto \
-			$($(tc-getPKG_CONFIG) --libs gimpui-2.0)
-	fi
-
-	if use nls; then
-		for lang in ${LANGS}; do
-			has ${lang} ${LINGUAS-${lang}} \
-				&& run_build msgfmt -c -o dcraw_${lang}.mo dcraw_${lang}.po
-		done
-	fi
-}
-
-src_install() {
-	dobin dcraw dcparse
-	dodoc "${FILESDIR}"/{conversion-examples.txt,dcwrap}
-
-	# rawphoto gimp plugin
-	if use gimp; then
-		insinto "$($(tc-getPKG_CONFIG) --variable=gimplibdir gimp-2.0)/plug-ins"
-		insopts -m0755
-		doins rawphoto
-	fi
-
-	doman dcraw.1
-
-	if use nls; then
-		for lang in ${LANGS}; do
-			if has ${lang} ${LINGUAS-${lang}}; then
-				[[ -f dcraw.${lang}.1 ]] && doman dcraw.${lang}.1
-				insinto /usr/share/locale/${lang}/LC_MESSAGES
-				newins dcraw_${lang}.mo dcraw.mo
-			fi
-		done
-	fi
-
-	readme.gentoo_create_doc
-}
diff --git a/media-gfx/dcraw/dcraw-9.28.0-r4.ebuild b/media-gfx/dcraw/dcraw-9.28.0-r4.ebuild
index 4271ab7d0680..bcb1dbb29da1 100644
--- a/media-gfx/dcraw/dcraw-9.28.0-r4.ebuild
+++ b/media-gfx/dcraw/dcraw-9.28.0-r4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.cybercom.net/~dcoffin/dcraw/archive/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 LANGS=" ca cs de da eo es fr hu it nl pl pt ru sv zh_CN zh_TW"
 IUSE="nls gimp jpeg lcms"
 
diff --git a/media-gfx/dcraw/files/dcraw-9.28.0-fix-memmem-wrong-return-type.patch b/media-gfx/dcraw/files/dcraw-9.28.0-fix-memmem-wrong-return-type.patch
deleted file mode 100644
index 93f299e4d2aa..000000000000
--- a/media-gfx/dcraw/files/dcraw-9.28.0-fix-memmem-wrong-return-type.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Memmem returns void*
-
-#  Pascal Jäger <pascal.jaeger@leimstift.de> (2023-09-22)
-
-Bug: https://bugs.gentoo.org/911753
-
---- a/parse.c
-+++ b/parse.c
-@@ -965,7 +965,7 @@ void parse_phase_one (int base)
-   }
- }
- 
--char *memmem (char *haystack, size_t haystacklen,
-+void *memmem (char *haystack, size_t haystacklen,
-               char *needle, size_t needlelen)
- {
-   char *c;
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index b71778691624..4f932b77b3ab 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1,5 +1,6 @@
 AUX digikam-8.3.0-cmake-addressbook.patch 1245 BLAKE2B 22365de2072c5ce5e2eac3bc1d7138e820166b977e5894f29addcdb00ae3329c47965b2b7930a4725b01789add63b4416083e6e358ca6ffb4a0d60f3e80ad52c SHA512 a872aed53811642407c98e20f423cf5381a117e96d4e95d309da6f116a13aa2584671ef20af3e1059c3ed7e09fec178fdb77e7afecde21077252bb2c8f116158
-AUX digikam-8.3.0-cmake.patch 6775 BLAKE2B 1c93e204bd3b5f3d73ecf812ee851e0a3a9bb3e414e41afbc0a072bf05e6b615a147e545f6a16e8e218e1f910e9f1667e012bc35e06eab7d192f4c8c8d814746 SHA512 42707d0bff593114de412697a037cfaccfbfc568ba3a90b3b68a3cbdba32d79e5e61d2e8cd6f185c2543cac4c6de66f36e5f549908781243064b17aececba72b
-DIST digiKam-8.3.0-1.tar.xz 55664168 BLAKE2B 46b0f26bb781d370c1046fd6de6afb0a0878175f9722a2fc9ed23aad89eb0671f8b219bb7c169ccd22d440ce493d958304a5a527a733862fe4e2c5cd07da8a21 SHA512 c2fdcecafa68641f08b31286d1b9c44828164a0a0bea607fb64a71c73ff53417cdfefa110245adab164fae8ea0980ea86cd69d693dcd43a96bb188197dc78fcd
-EBUILD digikam-8.3.0.ebuild 4193 BLAKE2B bdaf2e8e960067f18bc85513a2ed3ca17f235d86de490b8f53cc969ea25f115804a0f659dc19d6756ea1085692e917e1caf26d1e8e569295be4cb2941949d2ea SHA512 7dac2a6e459ca160c1b7cad2955b725123714cf7cc1f5a9a88666c378d7b8c5fd083e8712262de5c20ac599677b425d4ffa4810a7c5abe891eb52f51917f25d6
-MISC metadata.xml 987 BLAKE2B c06da5014c71156e7cbffc5e57d530287b881c793dffa8c6c7f563518cb7572c6de245066c7700767e27f36c4d4745277c1f6d01188f02a0e4da0ff125e8abde SHA512 9c3a8d4c11de1a12b386ef1ceeeb3dcf67c29a19a4eea20d8d442ba9997f267ef1c96a9cb38e11bf49c44dea427879683dae38f656e9654a50cfcdd849983c20
+AUX digikam-8.4.0-cmake.patch 7429 BLAKE2B 20d79867086e390c2a571bae76f2023e4ec5f26bdc137f28be6ec8eff54ba2c5e84ec15191ceed83eb8e9415a522165f5931cf6d972e1537806cbb6d7e22bbf0 SHA512 fd38773ce49a31d3fcd0d477c5e180b42d1a2ea586b41534b7dd3d08653fea4020af30bce3b20ba14c4a2710cde3fecbd13fbe8fcfd33bdca6b82989cf431214
+DIST digiKam-8.4.0.tar.xz 58025616 BLAKE2B 33441e023cd9d6edba2e7c01e482a6eea7a6b1972b6bad0fc804fb3e94f97cc62e2663690137b2445fb7043789b7e942d830b71209385de77ccffe57d22d09ff SHA512 4342d18a7c04ab239821de3cf908f8e7d676598778f0174164aa336e8cfdc0a76327d31c64e6c4e47dcf0d6fbef46b01918312e4622ce3359888a9a94948a22b
+DIST digikam-8.4.0-patchset.tar.xz 11904 BLAKE2B 6ab167cae66710505eb81bb538fde2a81458b6580bf8c70d0c28500ca81a3c9c9b9e0a12ca288a4dc6f39ae1a175f7b2bd09e4d94624337348084c228eafcc38 SHA512 df1199d3aaecc0afc032090424af69c031e95afba1fed70b00cf61c5ef52fa2a7c3d97918592c167f9ea918dd2823e4cc52f12a470a9eede815b3ff43314001b
+EBUILD digikam-8.4.0-r11.ebuild 4032 BLAKE2B bd5b43030acb8f92ee1dd9c09af52b38f6752daadfeeaba92e54f2242d87063d7baa726ffea7429008a20fc341afc38e5d15a24bcd5e8c756deafa77f8739f4d SHA512 96bd118cd133c5f34c6a2988ddcadc2952a1bcea7626717ee6028b3688b46928fa09caab442eb5e9dabe0f093b7549863b4ba14bdff71ad1790c038fb31a3f22
+MISC metadata.xml 981 BLAKE2B 1c1494b9c7fd7207550ea214baafcab17aa12ecb93f08885dd7c873a15114d826341027b8a37e36138cf89d1ba1451c8fff247d9fde18c235bee062f3cda1ab9 SHA512 7f4602eafde8e22b18b7abc1a071eb27369d2ab7df01554253f142614577209828698b39614666fd6d4688ff44b3c1dc3d4820ec3398a6f8228710343ef65f85
diff --git a/media-gfx/digikam/digikam-8.3.0.ebuild b/media-gfx/digikam/digikam-8.3.0.ebuild
deleted file mode 100644
index fd35ed4e3572..000000000000
--- a/media-gfx/digikam/digikam-8.3.0.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KFMIN=5.115.0
-QTMIN=5.15.12
-inherit ecm kde.org toolchain-funcs
-
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
-	TARNAME="digiKam-${PV/_/-}-1"
-	if [[ ${PV} =~ beta[0-9]$ ]]; then
-		SRC_URI="mirror://kde/unstable/${PN}/${TARNAME}.tar.xz"
-	else
-		SRC_URI="mirror://kde/stable/${PN}/${PV}/${TARNAME}.tar.xz"
-	fi
-	KEYWORDS="amd64 ~arm64 ~x86"
-fi
-
-DESCRIPTION="Digital photo management application"
-HOMEPAGE="https://www.digikam.org/"
-
-LICENSE="GPL-2"
-SLOT="5"
-IUSE="addressbook calendar geolocation gphoto2 heif +imagemagick +lensfun mysql opengl openmp +panorama scanner semantic-desktop spell"
-
-# bug 366505
-RESTRICT="test"
-
-COMMON_DEPEND="
-	dev-libs/expat
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5[-gles2-only]
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtnetworkauth-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5[mysql?]
-	>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=dev-qt/qtxmlpatterns-${QTMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-	>=media-gfx/exiv2-0.27.1:=[xmp]
-	media-libs/lcms:2
-	media-libs/libjpeg-turbo:=
-	media-libs/liblqr
-	media-libs/libpng:=
-	>=media-libs/opencv-3.3.0:=[contrib,contribdnn,features2d]
-	media-libs/tiff:=
-	x11-libs/libX11
-	addressbook? (
-		>=kde-apps/akonadi-contacts-23.08.3:5
-		>=kde-frameworks/kcontacts-${KFMIN}:5
-	)
-	calendar? ( >=kde-frameworks/kcalendarcore-${KFMIN}:5 )
-	gphoto2? ( media-libs/libgphoto2:= )
-	heif? (
-		media-libs/libheif:=
-		media-libs/x265:=
-	)
-	imagemagick? ( media-gfx/imagemagick:= )
-	lensfun? ( media-libs/lensfun )
-	opengl? (
-		>=dev-qt/qtopengl-${QTMIN}:5
-		virtual/opengl
-	)
-	panorama? ( >=kde-frameworks/threadweaver-${KFMIN}:5 )
-	scanner? ( >=kde-apps/libksane-23.08.3:5 )
-	semantic-desktop? ( >=kde-frameworks/kfilemetadata-${KFMIN}:5 )
-	spell? ( >=kde-frameworks/sonnet-${KFMIN}:5 )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-cpp/eigen:3
-	dev-libs/boost
-	addressbook? ( >=kde-apps/akonadi-23.08.3:5 )
-"
-RDEPEND="${COMMON_DEPEND}
-	media-libs/exiftool
-	mysql? ( virtual/mysql[server(+)] )
-	panorama? ( media-gfx/hugin )
-"
-BDEPEND="
-	sys-devel/gettext
-	panorama? (
-		app-alternatives/lex
-		app-alternatives/yacc
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-cmake.patch"
-	"${FILESDIR}/${P}-cmake-addressbook.patch"
-)
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-	ecm_pkg_pretend
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-	ecm_pkg_setup
-}
-
-# FIXME: Unbundle libraw (libs/rawengine/libraw)
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_WITH_QT6=OFF # KF6 not stable upstream yet
-		-DBUILD_TESTING=OFF # bug 698192
-		-DENABLE_APPSTYLES=ON
-		-DCMAKE_DISABLE_FIND_PACKAGE_Jasper=ON
-		-DENABLE_MEDIAPLAYER=OFF # bug 758641; bundled as of 8.0, KDE-bug 448681
-		-DENABLE_SHOWFOTO=ON # built unconditionally so far, new option since 8.0
-		-DENABLE_QWEBENGINE=ON
-		-DENABLE_AKONADICONTACTSUPPORT=$(usex addressbook)
-		$(cmake_use_find_package calendar KF5CalendarCore)
-		-DENABLE_GEOLOCATION=$(usex geolocation)
-		$(cmake_use_find_package gphoto2 Gphoto2)
-		$(cmake_use_find_package heif Libheif)
-		$(cmake_use_find_package imagemagick ImageMagick)
-		$(cmake_use_find_package lensfun LensFun)
-		-DENABLE_MYSQLSUPPORT=$(usex mysql)
-		-DENABLE_INTERNALMYSQL=$(usex mysql)
-		$(cmake_use_find_package opengl OpenGL)
-		$(cmake_use_find_package panorama KF5ThreadWeaver)
-		$(cmake_use_find_package scanner KF5Sane)
-		$(cmake_use_find_package spell KF5Sonnet)
-		-DENABLE_KFILEMETADATASUPPORT=$(usex semantic-desktop)
-	)
-
-	ecm_src_configure
-}
diff --git a/media-gfx/digikam/digikam-8.4.0-r11.ebuild b/media-gfx/digikam/digikam-8.4.0-r11.ebuild
new file mode 100644
index 000000000000..ab9884b9b338
--- /dev/null
+++ b/media-gfx/digikam/digikam-8.4.0-r11.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KFMIN=6.3.0
+QTMIN=6.6.2
+inherit ecm kde.org toolchain-funcs
+
+DESCRIPTION="Digital photo management application"
+HOMEPAGE="https://www.digikam.org/"
+SRC_URI="mirror://kde/stable/${PN}/${PV}/digiKam-${PV/_/-}.tar.xz
+	https://dev.gentoo.org/~asturm/distfiles/${P}-patchset.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm64"
+IUSE="addressbook calendar geolocation gphoto2 heif +imagemagick jpegxl +lensfun mysql openmp +panorama scanner semantic-desktop spell video"
+
+# bug 366505
+RESTRICT="test"
+
+COMMON_DEPEND="
+	dev-libs/expat
+	>=dev-qt/qtbase-${QTMIN}:6[concurrent,dbus,-gles2-only,gui,mysql?,network,opengl,sql,widgets,xml]
+	>=dev-qt/qtnetworkauth-${QTMIN}:6
+	>=dev-qt/qtscxml-${QTMIN}:6
+	>=dev-qt/qtsvg-${QTMIN}:6
+	>=dev-qt/qtwebengine-${QTMIN}:6[widgets]
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kiconthemes-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/knotifications-${KFMIN}:6
+	>=kde-frameworks/knotifyconfig-${KFMIN}:6
+	>=kde-frameworks/kservice-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kwindowsystem-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	>=kde-frameworks/solid-${KFMIN}:6
+	>=media-gfx/exiv2-0.27.1:=[xmp]
+	media-libs/lcms:2
+	media-libs/libjpeg-turbo:=
+	media-libs/liblqr
+	media-libs/libpng:=
+	>=media-libs/opencv-3.3.0:=[contrib,contribdnn,features2d]
+	media-libs/tiff:=
+	virtual/opengl
+	x11-libs/libX11
+	addressbook? (
+		>=kde-apps/akonadi-contacts-24.05.2:6
+		>=kde-frameworks/kcontacts-${KFMIN}:6
+	)
+	calendar? ( >=kde-frameworks/kcalendarcore-${KFMIN}:6 )
+	gphoto2? ( media-libs/libgphoto2:= )
+	heif? (
+		media-libs/libheif:=
+		media-libs/x265:=
+	)
+	imagemagick? ( media-gfx/imagemagick:= )
+	jpegxl? ( media-libs/libjxl:= )
+	lensfun? ( media-libs/lensfun )
+	panorama? ( >=kde-frameworks/threadweaver-${KFMIN}:6 )
+	scanner? ( >=kde-apps/libksane-24.05.2:6 )
+	semantic-desktop? ( >=kde-frameworks/kfilemetadata-${KFMIN}:6 )
+	spell? ( >=kde-frameworks/sonnet-${KFMIN}:6 )
+	video? ( >=dev-qt/qtmultimedia-${QTMIN}:6 )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-cpp/eigen:3
+	dev-libs/boost
+	addressbook? ( >=kde-apps/akonadi-24.05.2:6 )
+"
+RDEPEND="${COMMON_DEPEND}
+	!${CATEGORY}/${PN}:5
+	media-libs/exiftool
+	mysql? ( virtual/mysql[server(+)] )
+	panorama? ( media-gfx/hugin )
+"
+BDEPEND="
+	sys-devel/gettext
+	panorama? (
+		app-alternatives/lex
+		app-alternatives/yacc
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-8.4.0-cmake.patch"
+	"${FILESDIR}/${PN}-8.3.0-cmake-addressbook.patch"
+	# bug 936507; KDE-bugs 488662, 490611, 491007, 490484, 490821,
+	# 490859, 490828, 490690, 490552, 490385, 489751, 490128
+	"${WORKDIR}/${P}-patchset"
+)
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+	ecm_pkg_pretend
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+	ecm_pkg_setup
+}
+
+# FIXME: Unbundle libraw (libs/rawengine/libraw)
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_WITH_QT6=ON
+		-DBUILD_TESTING=OFF # bug 698192
+		-DENABLE_APPSTYLES=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_Jasper=ON
+		-DENABLE_SHOWFOTO=ON # built unconditionally so far, new option since 8.0
+		-DENABLE_AKONADICONTACTSUPPORT=$(usex addressbook)
+		$(cmake_use_find_package calendar KF6CalendarCore)
+		-DENABLE_GEOLOCATION=$(usex geolocation)
+		$(cmake_use_find_package gphoto2 Gphoto2)
+		$(cmake_use_find_package heif Libheif)
+		$(cmake_use_find_package imagemagick ImageMagick)
+		$(cmake_use_find_package jpegxl Libjxl)
+		$(cmake_use_find_package lensfun LensFun)
+		-DENABLE_MYSQLSUPPORT=$(usex mysql)
+		-DENABLE_INTERNALMYSQL=$(usex mysql)
+		$(cmake_use_find_package panorama KF6ThreadWeaver)
+		$(cmake_use_find_package scanner KSaneWidgets6)
+		-DENABLE_KFILEMETADATASUPPORT=$(usex semantic-desktop)
+		$(cmake_use_find_package spell KF6Sonnet)
+		-DENABLE_MEDIAPLAYER=$(usex video)
+	)
+
+	ecm_src_configure
+}
diff --git a/media-gfx/digikam/files/digikam-8.3.0-cmake.patch b/media-gfx/digikam/files/digikam-8.4.0-cmake.patch
index 03438e3f2245..4584d23182d1 100644
--- a/media-gfx/digikam/files/digikam-8.3.0-cmake.patch
+++ b/media-gfx/digikam/files/digikam-8.4.0-cmake.patch
@@ -1,20 +1,20 @@
-From c6ae81abf56851c818285d555e192c660635247b Mon Sep 17 00:00:00 2001
+From c498aad87e42405ca25cb6f2f1b4068ed1862c27 Mon Sep 17 00:00:00 2001
 From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
 Date: Sun, 17 Feb 2019 23:51:03 +0100
 Subject: [PATCH] Un-break optional Qt/KF detection
 
 And if we enable an option, make the necessary libraries REQUIRED.
 ---
- core/cmake/rules/RulesKDEFramework.cmake | 43 +++--------------
- core/cmake/rules/RulesQtFramework.cmake  | 61 +++++-------------------
+ core/cmake/rules/RulesKDEFramework.cmake | 60 ++++--------------------
+ core/cmake/rules/RulesQtFramework.cmake  | 51 +++++---------------
  core/cmake/rules/RulesX11.cmake          |  7 +--
- 3 files changed, 20 insertions(+), 91 deletions(-)
+ 3 files changed, 20 insertions(+), 98 deletions(-)
 
 diff --git a/core/cmake/rules/RulesKDEFramework.cmake b/core/cmake/rules/RulesKDEFramework.cmake
-index e34e5f4a8d..3cde25928f 100644
+index 775ae32fec..ec438f9673 100644
 --- a/core/cmake/rules/RulesKDEFramework.cmake
 +++ b/core/cmake/rules/RulesKDEFramework.cmake
-@@ -26,26 +26,15 @@ find_package(KF${QT_VERSION_MAJOR} ${KF${QT_VERSION_MAJOR}_MIN_VERSION} QUIET
+@@ -26,43 +26,18 @@ find_package(KF${QT_VERSION_MAJOR} ${KF${QT_VERSION_MAJOR}_MIN_VERSION} QUIET
  )
  
  if(ENABLE_KFILEMETADATASUPPORT)
@@ -28,25 +28,43 @@ index e34e5f4a8d..3cde25928f 100644
 +    find_package(KF${QT_VERSION_MAJOR}FileMetaData ${KF${QT_VERSION_MAJOR}_MIN_VERSION} REQUIRED)
  endif()
  
- 
  if(ENABLE_AKONADICONTACTSUPPORT)
 -
--    find_package(KF${QT_VERSION_MAJOR} ${AKONADI_MIN_VERSION} QUIET
--                                            OPTIONAL_COMPONENTS
--                                            Akonadi
--                                            AkonadiContact      # For KDE Mail Contacts support.
--                                            Contacts            # API for contacts/address book data.
--    )
--    find_package(KPim${QT_VERSION_MAJOR}Akonadi ${AKONADI_MIN_VERSION} QUIET)
--    find_package(KPim${QT_VERSION_MAJOR}AkonadiContact ${AKONADI_MIN_VERSION} QUIET)
--
 +    find_package(KF${QT_VERSION_MAJOR}Contacts ${KF${QT_VERSION_MAJOR}_MIN_VERSION} REQUIRED) # API for contacts/address book data.
 +    find_package(KPim${QT_VERSION_MAJOR}Akonadi ${AKONADI_MIN_VERSION} REQUIRED)
-+    find_package(KPim${QT_VERSION_MAJOR}AkonadiContact ${AKONADI_MIN_VERSION} REQUIRED) # For KDE Mail Contacts support.
+     if(Qt6_FOUND)
+-
+-        find_package(KPim${QT_VERSION_MAJOR} ${AKONADI_MIN_VERSION} QUIET
+-                                                OPTIONAL_COMPONENTS
+-                                                Akonadi
+-                                                AkonadiContactCore  # For KDE Mail Contacts support.
+-        )
+-        find_package(KF${QT_VERSION_MAJOR} ${AKONADI_MIN_VERSION} QUIET
+-                                                OPTIONAL_COMPONENTS
+-                                                Contacts            # API for contacts/address book data.
+-        )
+-        find_package(KPim${QT_VERSION_MAJOR}Akonadi ${AKONADI_MIN_VERSION} QUIET)
+-        find_package(KPim${QT_VERSION_MAJOR}AkonadiContactCore ${AKONADI_MIN_VERSION} QUIET)
+-
++        find_package(KPim${QT_VERSION_MAJOR}AkonadiContactCore ${AKONADI_MIN_VERSION} REQUIRED)
+     else()
+-
+-        find_package(KF${QT_VERSION_MAJOR} ${AKONADI_MIN_VERSION} QUIET
+-                                                OPTIONAL_COMPONENTS
+-                                                Akonadi
+-                                                AkonadiContact      # For KDE Mail Contacts support.
+-                                                Contacts            # API for contacts/address book data.
+-        )
+-        find_package(KPim${QT_VERSION_MAJOR}Akonadi ${AKONADI_MIN_VERSION} QUIET)
+-        find_package(KPim${QT_VERSION_MAJOR}AkonadiContact ${AKONADI_MIN_VERSION} QUIET)
+-
++        find_package(KPim${QT_VERSION_MAJOR}AkonadiContact ${AKONADI_MIN_VERSION} REQUIRED) # For KDE Mail Contacts support.
+     endif()
+-
  endif()
  
  if(Qt6_FOUND)
-@@ -54,17 +43,11 @@ if(Qt6_FOUND)
+@@ -71,17 +46,11 @@ if(Qt6_FOUND)
  
  else()
  
@@ -66,11 +84,12 @@ index e34e5f4a8d..3cde25928f 100644
  
  if ("${KF${QT_VERSION_MAJOR}CalendarCore_VERSION}" VERSION_GREATER 5.6.40)
  
-@@ -72,18 +55,6 @@ if ("${KF${QT_VERSION_MAJOR}CalendarCore_VERSION}" VERSION_GREATER 5.6.40)
+@@ -89,19 +58,6 @@ if ("${KF${QT_VERSION_MAJOR}CalendarCore_VERSION}" VERSION_GREATER 5.6.40)
  
  endif()
  
--if(ENABLE_AKONADICONTACTSUPPORT AND (NOT KPim${QT_VERSION_MAJOR}AkonadiContact_FOUND OR NOT KPim${QT_VERSION_MAJOR}Contacts_FOUND))
+-if(ENABLE_AKONADICONTACTSUPPORT AND
+-   (NOT (KPim${QT_VERSION_MAJOR}AkonadiContact_FOUND OR KPim${QT_VERSION_MAJOR}AkonadiContactCore_FOUND) OR NOT KF${QT_VERSION_MAJOR}Contacts_FOUND))
 -
 -    set(ENABLE_AKONADICONTACTSUPPORT OFF)
 -
@@ -86,31 +105,19 @@ index e34e5f4a8d..3cde25928f 100644
  
  if(ENABLE_KIO)
 diff --git a/core/cmake/rules/RulesQtFramework.cmake b/core/cmake/rules/RulesQtFramework.cmake
-index 6f233ccfbc..7e29a09a40 100644
+index 9fa839c414..9267c6651e 100644
 --- a/core/cmake/rules/RulesQtFramework.cmake
 +++ b/core/cmake/rules/RulesQtFramework.cmake
-@@ -19,49 +19,20 @@ find_package(Qt${QT_VERSION_MAJOR} REQUIRED
+@@ -18,38 +18,17 @@ find_package(Qt${QT_VERSION_MAJOR} REQUIRED
+              Svg
  )
  
- if(ENABLE_QWEBENGINE)
--
--    find_package(Qt${QT_VERSION_MAJOR} REQUIRED
--                                       NO_MODULE
--                                       COMPONENTS
--                                       WebEngineWidgets
--    )
--
-+    find_package(Qt${QT_VERSION_MAJOR}WebEngineWidgets REQUIRED NO_MODULE)
- else()
--
--    find_package(Qt${QT_VERSION_MAJOR} REQUIRED
--                                       NO_MODULE
--                                       COMPONENTS
--                                       WebKitWidgets
--    )
--
-+    find_package(Qt${QT_VERSION_MAJOR}WebKitWidgets REQUIRED NO_MODULE)
- endif()
+-find_package(Qt${QT_VERSION_MAJOR} REQUIRED
+-                                   NO_MODULE
+-                                   COMPONENTS
+-                                   WebEngineWidgets
+-)
++find_package(Qt${QT_VERSION_MAJOR}WebEngineWidgets REQUIRED NO_MODULE)
  
 -find_package(Qt${QT_VERSION_MAJOR}
 -             OPTIONAL_COMPONENTS
@@ -147,7 +154,7 @@ index 6f233ccfbc..7e29a09a40 100644
  endif()
  
  if(ENABLE_DBUS)
-@@ -77,17 +48,9 @@ endif()
+@@ -65,17 +44,9 @@ endif()
  # Qt Dependencies For unit tests and CLI test tools
  
  if(BUILD_TESTING)
@@ -188,5 +195,5 @@ index d7830f3923..4401a57c87 100644
  
      set(HAVE_X11 TRUE)
 -- 
-2.44.0
+2.45.2
 
diff --git a/media-gfx/digikam/metadata.xml b/media-gfx/digikam/metadata.xml
index 13d34044a893..9cc51d33573b 100644
--- a/media-gfx/digikam/metadata.xml
+++ b/media-gfx/digikam/metadata.xml
@@ -15,9 +15,9 @@
 	<use>
 		<flag name="addressbook">Enable akonadi contact integration</flag>
 		<flag name="imagemagick">Enable support for additional image formats such as XCF, FITS, HEIC etc.</flag>
-		<flag name="mediaplayer">Enable integrated video player</flag>
 		<flag name="lensfun">Enable support for <pkg>media-libs/lensfun</pkg></flag>
 		<flag name="panorama">Build the panorama plugin which requires <pkg>media-gfx/hugin</pkg></flag>
 		<flag name="semantic-desktop">Enable <pkg>kde-frameworks/kfilemetadata</pkg> support</flag>
+		<flag name="video">Enable integrated video player</flag>
 	</use>
 </pkgmetadata>
diff --git a/media-gfx/displaycal-py3/Manifest b/media-gfx/displaycal-py3/Manifest
index dd167020a29f..89fcdaaa4a10 100644
--- a/media-gfx/displaycal-py3/Manifest
+++ b/media-gfx/displaycal-py3/Manifest
@@ -1,5 +1,4 @@
 AUX displaycal-py3-3.9.10-python-3.11.patch 3134 BLAKE2B 3110f39ecab47eff46a97389c2164bfbb2b44f80fd30bb848856dae050738cd6590905b2b9ce603eb9d919f2811674b378b1562396b1437bea8247798868313f SHA512 98bb7ea8a0b29ffbb455f8666183489d1571bdcd1829398ce4535c7581f797582ed7c1a5035b2bdf9a0d19397ef14e5f8068ec2baf5078f64b614c901be48f33
 DIST DisplayCAL-3.9.10.tar.gz 10676033 BLAKE2B 94bfa3ac95bfc16788421fa5b9a31920c40da66d2875e4037b3b20b6792a1005ee9fea11b5325a94ffae845f56583647e42de9d4d7d96d149264a86e6d1158a6 SHA512 fc1b981925c6f4660557d8f0935a62d0112b39664b0c74cdb1a907e0e7b7e3f61ec76986fa2072f8ada1d105ebfa61bb116df75dc10f902ff545db3368634fc5
 EBUILD displaycal-py3-3.9.10-r3.ebuild 1635 BLAKE2B 21a1b93ab0c78fc50824f49e1e6a2e4704e9e4fcc6db91eef854c9d119528e5ddfbebafa597e614540aa8143d732925c311211a5d25b24f77d60f69d2c397fd7 SHA512 e85c78550a5eb370d14532aaaa33f2055f657856754b3067c83a51ea48ae5665405f067e0b979956aa5e56d689de819764858b26a76d60699189a1333791f752
-EBUILD displaycal-py3-3.9.10.ebuild 1494 BLAKE2B 9696773d870850429eea8df9d7c62624277f2c0ba2475271c367e5b642124a70c2c5dea38d5916eb0cad8ec028089c76a31c8fb21aa68f2042e76d203b03217f SHA512 c82759379322f0d177365081a7fcc61eb7d258e3e60e149345290c33cd6a054f6586911a1fdbf302b282a1a4eeeb447fcc660a299e71d8a83a2c313832d62af5
 MISC metadata.xml 790 BLAKE2B aa3f32f061f4840bbc0e29c36e6154cc37b85a9fa76a92e7f69a32ccadef16fa5a9680266c35b51c3351c4f4d65e2e1659515550e2366c9c9516e8c26c049694 SHA512 d4fad45e53ac19ede7f26709878ff36b55906a4c642b1ce7ce2e49ef56a1285582700d07170f702263a3a99ea0bfa2c2cfbc842978f565291d3322fb9a6a5c0d
diff --git a/media-gfx/displaycal-py3/displaycal-py3-3.9.10.ebuild b/media-gfx/displaycal-py3/displaycal-py3-3.9.10.ebuild
deleted file mode 100644
index 0aef7b5146ef..000000000000
--- a/media-gfx/displaycal-py3/displaycal-py3-3.9.10.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{9..10} )
-DISTUTILS_USE_PEP517=setuptools
-
-inherit distutils-r1 xdg
-
-MY_PN="DisplayCAL"
-MY_P="${MY_PN}-${PV}"
-
-SRC_URI="https://github.com/eoyilmaz/displaycal-py3/releases/download/${PV}/${MY_P}.tar.gz"
-KEYWORDS="~amd64"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Modernize the DisplayCAL code including Python 3 support"
-HOMEPAGE="https://github.com/eoyilmaz/displaycal-py3"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE=""
-
-RESTRICT="test"
-
-DEPEND="
-	dev-python/build[${PYTHON_USEDEP}]
-	dev-python/certifi:0[${PYTHON_USEDEP}]
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/distro[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/pychromecast[${PYTHON_USEDEP}]
-	dev-python/send2trash[${PYTHON_USEDEP}]
-	dev-python/zeroconf[${PYTHON_USEDEP}]
-	>=dev-python/wxpython-4.2.0[${PYTHON_USEDEP}]
-	media-gfx/argyllcms
-	x11-libs/libXxf86vm"
-
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	# Fix QA warning
-	sed -e 's/license_file/license_files/g' -i setup.cfg || die
-
-	# Remove x-world MIME
-	sed -i 's|x-world/x-vrml;||g' \
-		misc/displaycal-vrml-to-x3d-converter.desktop || die
-
-	distutils-r1_src_prepare
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	# Use Gentoo package name for doc folder
-	mv "${ED}/usr/share/doc/${MY_P}" "${ED}/usr/share/doc/${P}" || die
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-}
diff --git a/media-gfx/dmtx-utils/Manifest b/media-gfx/dmtx-utils/Manifest
index 064582ce766f..36108699d044 100644
--- a/media-gfx/dmtx-utils/Manifest
+++ b/media-gfx/dmtx-utils/Manifest
@@ -1,5 +1,3 @@
-DIST dmtx-utils-0.7.5.tar.gz 54754 BLAKE2B 0eaaa75dd8f650492f790aa960a6df93509e2bf5b1d0dd4b335a418f1524ee633d8d5f087cfef8b8950fc736dbb8ff702561e48506fa1b85d5846cf87601a197 SHA512 915104150d1cc5877d3012cb3934163b4a8e93f8132082835e8d12a8844d29e4afa06d020f5bd79e4bcacb8c153baadf183885619b7c4eb235d8c8c7041d325a
 DIST dmtx-utils-0.7.6.tar.gz 54888 BLAKE2B 721d67f85e73d245595d189acf1f974b518b079d02b7c57fa786b15ed075bd08219a2720b5152341449d517eb93e238274b440388557a64056de6cf6db9fc392 SHA512 201f8f5bbe5a1edd23104883d03e09842252ad7d07dd416b67c11740275ebe32c26b7fde904fad8bf2b18f1b3f574dedde1cc85f0e987f93d293d030e4f8a79e
-EBUILD dmtx-utils-0.7.5.ebuild 546 BLAKE2B 8a699e4dd6ccbe4e208736e9f2b7c74858fc8f852b7a1b80865017d9c23828bbcd532e5510aeea65134e5a47a8a12b6c0af72c77ee64b0d4af1ef866e701957b SHA512 2c3ceb32ae801fc1d07f349078b6feb4c8dfd5bfd9b3ea81d6c429af54269b3da7203834bcf90982cb4b6add9b19ed32a4c13266e6377a68d65ba4156df79820
 EBUILD dmtx-utils-0.7.6.ebuild 588 BLAKE2B 0c2de7fe60aacd6af505a21a55e0fb7aa6766c04a0cc8d89af73a440d2478b93ee3b7919a442dbd29be5f0e0e2d32f85ebf01813f729b11143c0489b7e4a0630 SHA512 1a98592502070d1f3e4f808f47a2abcaab8fa1b1f235c2451f7b11f224d65ebb7169628067755963d734c0f30fcbe34ee819383f9ad7a05c411a579ad12141ae
 MISC metadata.xml 811 BLAKE2B 33ce2988fadfe3be6220f1fb40129084606fddb64ffa052c6531887096e58cc76861b0778fa852899ca30e5b5fce9e2ddd405823f65f7a4c574fba3e1b2f7c2a SHA512 d4327542c870377485013bbbecce607e56e34ee5e067605e17d6058d3bdd807d7ba614600373936d5136b589f41ad78f15dcd1846ca875067beea29d4fdd11be
diff --git a/media-gfx/dmtx-utils/dmtx-utils-0.7.5.ebuild b/media-gfx/dmtx-utils/dmtx-utils-0.7.5.ebuild
deleted file mode 100644
index 35aad35ab7b6..000000000000
--- a/media-gfx/dmtx-utils/dmtx-utils-0.7.5.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Tools for reading and writing Data Matrix barcodes"
-HOMEPAGE="https://github.com/dmtx/dmtx-utils"
-SRC_URI="https://github.com/dmtx/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="
-	>=media-gfx/imagemagick-6.2.4:=
-	>=media-libs/libdmtx-0.7.0
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
diff --git a/media-gfx/ebdftopcf/Manifest b/media-gfx/ebdftopcf/Manifest
index 65ec747b319b..2281d086fef9 100644
--- a/media-gfx/ebdftopcf/Manifest
+++ b/media-gfx/ebdftopcf/Manifest
@@ -1,3 +1,3 @@
 DIST ebdftopcf-2.tar.bz2 7774 BLAKE2B 4dc1bde62b796f441332511e1b9206f9eadd216ab66dc1a6858dc467f9dfbbaaeb4a7de494eaae4584d8a57d59a0eb96f69047d1a57bd007cbb8e2f7aaccd1c6 SHA512 4631f1591290e0ddc778d5c557aff1e698d8dd7e5ac7e659fda7752642034fbabb091c840dcfad5695e9fc19909203a7fdc0b7a69d57a162ce6bb8fe710ef0f4
-EBUILD ebdftopcf-2-r1.ebuild 613 BLAKE2B 7552a2f6d7ee130176369d7361a9999a4b6dc28acc7ededa46111487cc1883d742b25864b1ce6e7b6965b784f17b5366f34792f1e41c0d29f8cd2ef6260daff5 SHA512 6cdd08f865457773228c4f5d89cad07b480a75bf4e534e02468dcc3b373dff68fd6e9333fd8700283c25e6f7ad9d308843e807d78136c1aeb755508b823304b0
+EBUILD ebdftopcf-2-r1.ebuild 607 BLAKE2B 9ce5971ce6196764b3fcb0b0fea7d2bc40aeaad5784285376a5ddc3084946a60ab211bfb9c10e4d74b18dac4dc63235a393b8898504456180fbaa5890247c7ac SHA512 432ea88511ddb22fe2d435113c60ebe869716cdaf9069d06338e44ffb610c453994920eb9385b001bdda97295632bc8b54439dff57fff7e69cf53761f9e216da
 MISC metadata.xml 318 BLAKE2B 2387c47086bae1b1a5cb1122d7dd7f94fd93d872699be57d10daddc963c1118a09f3b2bfdd9491e2db795be3211b1247ee5dc210d508b8ac14bced1ba5485722 SHA512 e0585b332a03dce7407bcc19144a40e2648c137dedab1334ce68df011e624f1707c8a47038a1fd643482bf552190cc1e077a65b8f79cebcb282a84efdaedd803
diff --git a/media-gfx/ebdftopcf/ebdftopcf-2-r1.ebuild b/media-gfx/ebdftopcf/ebdftopcf-2-r1.ebuild
index a98815fff2bd..61705816f7a7 100644
--- a/media-gfx/ebdftopcf/ebdftopcf-2-r1.ebuild
+++ b/media-gfx/ebdftopcf/ebdftopcf-2-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 # these apps are used at runtime by ebdftopcf
 RDEPEND="
diff --git a/media-gfx/enblend/Manifest b/media-gfx/enblend/Manifest
index 1020d6405521..0405a67f33ca 100644
--- a/media-gfx/enblend/Manifest
+++ b/media-gfx/enblend/Manifest
@@ -1,10 +1,7 @@
-AUX enblend-4.2-doc-install-dir-fix.patch 2705 BLAKE2B a5bfb43521095bc088aef980f849cfb9cb2e7e9ae2a10b2fcd4b56cd7b27888047567c3b95b40e3a8feefe7ee9209db49688800986cc895731e0949acd3bae1c SHA512 a22730295c44da4f9feb3d541b17f298adf98f0328cf01d6a85206087c782e1aebac6509968d1a5433efb5fc3d72e48301ec3d5a2516f01c1f6d923d5032ab03
 AUX enblend-4.2.0_p20161007-cmake.patch 477 BLAKE2B 9a27d95e78cc611c723824a300dbc3eaeb7c2ffe6bcacb19baeb8a24180450f2912310ae9584f450899ececca11636304d36631f8c57f6d4b7c2450043d6f147 SHA512 5b79944beabd97f71f05657ce17e31d9eab60506dfce27fefc3a8f9a10c92f33b1b4fa1411c6d1a33d23819a4020a50f130b9083fecaf3e1a072fda71e5f9ff0
 AUX enblend-4.2.0_p20161007-doc-scaleable-fonts.patch 650 BLAKE2B 633ae86947cfcb6d4f83c4aaf55a2056fc571ee3973379327f6416a4667b7c5d1d94a5e6b26bfc49a0207608d3b5de0d99cd6678d298de605d6eae5ec731c874 SHA512 b2c3e5367d83bd1b2e0053dd41d92737834045969db32fd9e07f294a8cd5ca120fa913f9fc4fab70abea893d974d8e92fd1ace38845cd1324d21c2455c961ab4
 AUX enblend-4.2.0_p20161007-gcc-10.patch 312 BLAKE2B bbc8521bb1c2b9f3f67dedffdbcab952628fc252d2ed81c37e469f06596f2cb9ab5907c7fc97de1dbfe408e29312c55d08b189b8e6f46215540e64354fbfd60a SHA512 9ed03b22237e1bf297db0daca2b5dd6aa7ad5cd9bf333e507160b7bbf24eb37be173c79314ce1cff7a7df10ba262266ca54f52c8ec6d85a7a411b78bef76d91e
 AUX enblend-4.2.0_p20240424-doc-install-dir-fix.patch 1977 BLAKE2B bb747bd4d98f0d27d7930d0376ddcfef02186c998e869a0f3843e9fa32c2bf39fedb8074abdaa09d4a8425d2fb066ed2483ede75a3fddcba2d86f95042de3b25 SHA512 3c76b3fad97e918ac3849204d067c64c03e03dbbb61d4b4f35e5a7f0f895080f23518797d98050ca12fe101cde6f7476438fa59f89f736f84df23e1b9b5ecd1e
-DIST enblend-4.2.0_p20161007.tar.xz 494060 BLAKE2B 8842dd70a1400a27170794246cb5c89d60b6798373e3a9d63e88738ad569e1174cb4303ccb5a2bc79846651e982e05f8cb9ac3e09b83ee33958b6ccf043ebda9 SHA512 ede037f19a7c3b358f533ecfb235f70824261eaf189d0bdcde6f9cedaa5952be2a6940884e688418b725cb3a67fc1b7d366483a76b7c62326ca857b8efe3a3f3
 DIST enblend-4.2.0_p20240424.tar.xz 505928 BLAKE2B 49a9cfd2cb332573a1d3882ce6d50513008ee71d7235f69bb7920fc9b71f6c0c6e5e7ae88de4c5879d4cb2ee94d437b1752d6c13117c07ad81a6832b45985684 SHA512 1eed2cac0dd6d0ddec41097c4d21ebbad01981e6abbb5fe3db69fc4ef50728ce997faad73dc17255997e8eee9af9d540e38bc2bdf106eb6ca338ef1650680894
-EBUILD enblend-4.2.0_p20161007-r6.ebuild 1896 BLAKE2B 4fefdf5984d6fe55a3dcf0e241b2bd60dbc2d671980b047ec35c236de101587b74be6c26dfb86bb091bf6de5353292cdf2980a5f0b59f8d6239cd50c451fe968 SHA512 6509c2e7d4e97f79be3b65f452c0211fb09dbf3327b943515acab7212476f353f91fc8a2ec48eb48e1591c749e416ad9d4bf8b5e8b82c2ee965da0c67d622b9b
-EBUILD enblend-4.2.0_p20240424.ebuild 1994 BLAKE2B b0265a0000b0f71ea0f3433fcdd54d27a2afd772cd941712f430b20346de82ac5c8a9091fcf0a2e426dae83f92e5a74f7266ad9bbe6c8749967640088330cc45 SHA512 4d4e47af88feaca19ef724abacecb97a1fdc6b2b994328dc0308f755148b2f6c0f040403da5aabf82838a5cb0ee6f6319fb79e1c17902efbdd82cf1b985ef391
+EBUILD enblend-4.2.0_p20240424.ebuild 1991 BLAKE2B 3848672da03b6b0bbda2f8cce23883328e9fba773b78e63043ca751d5be44c6bb980c3fe52525e10430a102f789245da0adccc2b4ce9884e337580682dfe2d82 SHA512 11540f7baa057d8ad2611d15a1ba6fcc0c700d270f8d58f5f27c618f9e24469c73e5dbba43d789db1dda812c7072d03516953808a8f5d17a8f32b5cacddeb6b3
 MISC metadata.xml 438 BLAKE2B 6e1f7ffb0f56a8e668608a97c02e045546c76b90c18777a77c031a94f23ce59abd2df8b6688973b509872e9cca867d16d6b0c201e06f4e8026dcde7c1eb1632f SHA512 86a9f0ca54ad8c9f1409957d4bdbe7aec7b1992e4272ab5e9e3734442e4ca7fc599bafc0e1e55d30ef0220dbaaa3d4f38e7fc8e4dbe4972fb392c4b2a86e6181
diff --git a/media-gfx/enblend/enblend-4.2.0_p20161007-r6.ebuild b/media-gfx/enblend/enblend-4.2.0_p20161007-r6.ebuild
deleted file mode 100644
index 76a89f6ab151..000000000000
--- a/media-gfx/enblend/enblend-4.2.0_p20161007-r6.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Image Blending with Multiresolution Splines"
-HOMEPAGE="http://enblend.sourceforge.net/"
-SRC_URI="https://dev.gentoo.org/~soap/distfiles/${P}.tar.xz"
-
-LICENSE="GPL-2+ FDL-1.2+"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-IUSE="cpu_flags_x86_sse2 debug doc openmp tcmalloc"
-
-REQUIRED_USE="tcmalloc? ( !debug )"
-
-BDEPEND="
-	sys-apps/help2man
-	virtual/pkgconfig
-	doc? (
-		app-text/ghostscript-gpl
-		app-text/texlive
-		dev-lang/perl
-		dev-perl/Readonly
-		dev-tex/hevea
-		gnome-base/librsvg
-		media-gfx/graphviz
-		>=media-gfx/fig2dev-3.2.9-r1
-		sci-visualization/gnuplot[cairo,gd]
-		virtual/imagemagick-tools[tiff]
-	)
-"
-RDEPEND="
-	media-libs/lcms:2
-	media-libs/tiff:=
-	media-libs/vigra[openexr]
-	sci-libs/gsl:=
-	debug? ( dev-libs/dmalloc[threads] )
-	tcmalloc? ( dev-util/google-perftools )
-"
-DEPEND="${RDEPEND}
-	dev-libs/boost
-	media-libs/libpng:0
-	media-libs/libjpeg-turbo:=
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.2-doc-install-dir-fix.patch
-	"${FILESDIR}"/${P}-cmake.patch
-	"${FILESDIR}"/${P}-gcc-10.patch
-	"${FILESDIR}"/${P}-doc-scaleable-fonts.patch
-)
-
-src_prepare() {
-	cmake_src_prepare
-
-	sed -i -e "s:share/doc/enblend:share/doc/${PF}:" doc/CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_SSE2=$(usex cpu_flags_x86_sse2)
-		-DENABLE_DMALLOC=$(usex debug)
-		-DDOC=$(usex doc)
-		-DENABLE_OPENMP=$(usex openmp)
-		-DENABLE_TCMALLOC=$(usex tcmalloc)
-	)
-	if use doc; then
-		mycmakeargs+=(
-			-DINSTALL_HTML_DOC=ON
-			-DINSTALL_PDF_DOC=ON
-		)
-	fi
-
-	cmake_src_configure
-}
-
-src_compile() {
-	# To allow icon resizing with renderers (no way to disable)
-	addpredict /dev/dri
-
-	# To compile fonts in the temp directory
-	export VARTEXFONTS="${T}/fonts"
-
-	# forcing -j1 as every parallel compilation process needs about 1 GB RAM.
-	cmake_src_compile -j1
-}
diff --git a/media-gfx/enblend/enblend-4.2.0_p20240424.ebuild b/media-gfx/enblend/enblend-4.2.0_p20240424.ebuild
index 8dfc5ef79971..109b429e2424 100644
--- a/media-gfx/enblend/enblend-4.2.0_p20240424.ebuild
+++ b/media-gfx/enblend/enblend-4.2.0_p20240424.ebuild
@@ -13,7 +13,7 @@ S=${WORKDIR}/enblend
 
 LICENSE="GPL-2+ FDL-1.2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="cpu_flags_x86_sse2 debug doc openmp tcmalloc"
 
 REQUIRED_USE="tcmalloc? ( !debug )"
diff --git a/media-gfx/enblend/files/enblend-4.2-doc-install-dir-fix.patch b/media-gfx/enblend/files/enblend-4.2-doc-install-dir-fix.patch
deleted file mode 100644
index c952eeb7780a..000000000000
--- a/media-gfx/enblend/files/enblend-4.2-doc-install-dir-fix.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-* Remove the CMAKE_BUILD_TYPE conditional code, in order to build using CMAKE_BUILD_TYPE=Gentoo
-* Install html files in html subdir of doc dir
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -11,9 +11,6 @@
- set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true)
- 
- project(enblend)
--IF(NOT MSVC)
--  SET(CMAKE_BUILD_TYPE Release CACHE STRING "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel" FORCE)
--ENDIF(NOT MSVC)
- # where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/
- # is checked
- # For now, reuse the hugin modules directory
-@@ -130,7 +127,6 @@
- ENDIF()
- 
- IF(CMAKE_COMPILER_IS_GNUCXX)
--  SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -ffast-math -DNDEBUG -Wall")
-   IF(APPLE AND CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION LESS 5)
-     ## Add needed Compiler and Linker flags for OSX
-     SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -flat_namespace -undefined suppress")
-@@ -154,20 +150,6 @@
-       SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /bigobj")
-     ENDIF(CMAKE_CL_64)
- 
--    # compile everything for the static C runtime
--    FOREACH(TYPE C CXX)
--      # makefiles use blank configuration
--      FOREACH(CFG "_DEBUG" "_MINSIZEREL" "_RELEASE" "_RELWITHDEBINFO")
--        #MESSAGE("Replacing CMAKE_${TYPE}_FLAGS${CFG}: ${CMAKE_${TYPE}_FLAGS${CFG}}")
--        SET(NEW_FLAGS "${CMAKE_${TYPE}_FLAGS${CFG}}")
--        # fix up static libc flags
--        STRING(REPLACE "/MD" "/MT" NEW_FLAGS "${NEW_FLAGS}")
--        # *FORCE* to override whats already placed into the cache
--        SET(CMAKE_${TYPE}_FLAGS${CFG} "${NEW_FLAGS}" CACHE STRING
--          "CMAKE_${TYPE}_FLAGS${CFG} (overwritten to ensure static build)" FORCE)
--        #MESSAGE("New       CMAKE_${TYPE}_FLAGS${CFG}: ${CMAKE_${TYPE}_FLAGS${CFG}}")
--      ENDFOREACH(CFG)
--    ENDFOREACH(TYPE)
-     # link only with the static C runtime !! THIS IS A MUST !!
-     SET(NEW_FLAGS "${CMAKE_EXE_LINKER_FLAGS}")
-     # ensure that the flags are not duplicated on subsequent runs
---- a/doc/CMakeLists.txt
-+++ b/doc/CMakeLists.txt
-@@ -406,7 +406,7 @@
-         "${CMAKE_BINARY_DIR}/doc/enfuse.html"
-         ${ENBLEND_PNGFILES}
-         ${ENFUSE_PNGFILES}
--    DESTINATION ${DocumentsDirectory}
-+    DESTINATION ${DocumentsDirectory}/html
- )
- endif()
- 
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -102,7 +102,7 @@
- endif(OpenMP_CXX_FLAGS AND NOT MSVC)
- target_link_libraries(enblend ${common_libs} ${additional_libs})
- target_link_libraries(enfuse ${common_libs} ${additional_libs})
--install(TARGETS enblend enfuse DESTINATION bin CONFIGURATIONS Release RelWithDebInfo MinSizeRel)
-+install(TARGETS enblend enfuse DESTINATION bin)
- 
- if(NOT WIN32)
-     # create enblend.1 and enfuse.1
diff --git a/media-gfx/entangle/Manifest b/media-gfx/entangle/Manifest
index 5be4f001814a..d5bdea41c8df 100644
--- a/media-gfx/entangle/Manifest
+++ b/media-gfx/entangle/Manifest
@@ -1,4 +1,4 @@
 AUX entangle-3.0-fix-meson-0.61-build.patch 810 BLAKE2B 4b4eac6fbddba41e6f6cdd2afa4f0db1b603bc96b1c281fde415cd71826ae15cb839b267a138229dd59e280459f7cc3cd1538e32357b0bab74b1a5a9507a9caa SHA512 fb2196fc1ec125c6b8ba237c74e9495d8e0e22bd584948a385d3ee906fd32ad9887d02093b3c690e5de90fa19e7d7e538aed9e1f8ede433e15bdd6ad80639ff1
 DIST entangle-3.0.tar.xz 518808 BLAKE2B fe2bf4b114bc04fdc56792f984ae7387b70d693fa82f8deaa2023de71a8bba72bc95d4bfc430cdfaf5244e9114b4f7e8bb2e17f3b86de6529037519fa3877899 SHA512 8c6d7e067f88a770c63b76fde2a6ae71894aae95477fcf66b4670697889fdf7939d3f95532626d6f4ca7ae75841d8f247f6bcf78a1ce195b540989f1bfe5ebdd
-EBUILD entangle-3.0-r3.ebuild 1700 BLAKE2B 2e97f166c0de255ae010cf4ffcfe6c3cd8eef26e2b850bdce4bfb9d6215e7bcf5a7ca8a764da111b03b15ebc71e3972851eaf16bc6e87cd8488e47eb3265d105 SHA512 79395c199f0426db64ca909798db5b39049e67430d7da81a7e31a95da61dc9110caaccf3c5864836010e52cfecb4b01bcf9c9dfa6160817c2a2c34bb20d7af58
-MISC metadata.xml 529 BLAKE2B ba406d65b63eb495962182c821cb2ad6498b3b67402f92891b7aa22d89ec76915cad324a2b25d41067f3345e75a5d993529e9be2de74443e3342cd0761f9e40e SHA512 db363ca3c2def3556bfb2e01e873b544cbc9c1ecba9ce15ee2de5decd7bbdf300357a5b722ee643454036d3eaaf6e1f29c0dc0cd379943408ceb1012520c5c16
+EBUILD entangle-3.0-r3.ebuild 1742 BLAKE2B 8920e7fa0880eb38d038bec6de172fa7f4239ee7e4b062445c01755ce6fc270beb94c273bd7117b23acfa1dc1a7559da4cbc3e02d2e387a3d0b094670b8a0033 SHA512 bef5a1942d338b1e09b088834505ca10d24a85d2e13b59a17aaf228042fa1ccb497a2a6382e89ccf4edbce62260d34af3935efb15a2771053a65e4ca314d634b
+MISC metadata.xml 529 BLAKE2B 044afc2ddf07e5d4b99c865e88396aab898773b83c8409e108de4ee11ff096d9ca72ce7165bd4adc8966d73bfbe67db922d4ed4fb3b88aadb5205bb1a2d81482 SHA512 b5556dcb7a0ba3a9c716b29fab18e01e9d56d5a5d43aedd97dbe4315485b8441a6f52d94bded8205b59ae1a1d2baf9e35a1fde5ee944395f4591a55b8646bc61
diff --git a/media-gfx/entangle/entangle-3.0-r3.ebuild b/media-gfx/entangle/entangle-3.0-r3.ebuild
index 575c7d78c119..d604ff90b1f6 100644
--- a/media-gfx/entangle/entangle-3.0-r3.ebuild
+++ b/media-gfx/entangle/entangle-3.0-r3.ebuild
@@ -8,7 +8,10 @@ PYTHON_COMPAT=( python3_{10..12} )
 inherit gnome2-utils meson python-single-r1 xdg-utils
 
 DESCRIPTION="Tethered Camera Control & Capture"
-HOMEPAGE="https://entangle-photo.org/"
+HOMEPAGE="
+	https://entangle-photo.org/
+	https://gitlab.com/entangle/entangle/
+"
 SRC_URI="https://entangle-photo.org/download/sources/${P}.tar.xz"
 
 LICENSE="GPL-3+"
diff --git a/media-gfx/entangle/metadata.xml b/media-gfx/entangle/metadata.xml
index 60c98605ee19..52f8c5722568 100644
--- a/media-gfx/entangle/metadata.xml
+++ b/media-gfx/entangle/metadata.xml
@@ -13,6 +13,6 @@
 		<name>Gentoo Video project</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">entangle/entangle</remote-id>
+		<remote-id type="gitlab">entangle/entangle</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/media-gfx/entice/Manifest b/media-gfx/entice/Manifest
index 4c783fa7f411..dd4a3df08b4d 100644
--- a/media-gfx/entice/Manifest
+++ b/media-gfx/entice/Manifest
@@ -1,3 +1,3 @@
-DIST entice-0_pre20220809.tar.gz 7940222 BLAKE2B 8fb23d904e66894f60db94e64f5d9f0f00b82d6409c3c5e3439ecb8cd7835d2aadd7e52280eed4fc81fd0ac92fc02c9ad58c32d263f3081d93986bf21037c04e SHA512 2f6d549d87ca39be3b2d2fa15b488c6ddf0a31fc5164d90e7b4c37343af2fe44c674330b3764f100b048f94da003c7807e28b95ab059e3c04632026e53e5b96b
-EBUILD entice-0_pre20220809.ebuild 1502 BLAKE2B 76c3c9e7b5b01f735b8e710293ec6db2d258cc4ec7953d57ab572210691238c2298f5557286e839b69e75ed058e4bc3e9e0e8a86de667137d2086c4145030878 SHA512 99aa4a2c65ff69f2c7da8ded57cb4b14fce5792b1fd6f43d09ba376b829cfa5bf3cad1759498e1119e92ff945ccbcd2ca25b7c3ad7dd11f99a6a015dcaa1199e
-MISC metadata.xml 255 BLAKE2B 6fe10a1f843a8b2494606052a69206e32fdd5edf3ca6bdfb661cf6f8e39c0e16fb652acb8697d339770f3559c56a4ba964a0e959b3e0bb456d09ee7570f0d9e9 SHA512 235170971553178916cc484a07e1c665c94cd0a7ec442d2190d3608f7a3441dd2fe08fea666ca23d151077c10c908bc1da0e57355fab43be02711be35531b362
+DIST entice-0.0.1.tar.xz 3994332 BLAKE2B 38f225a0464b0fcc956b32b02afd0ca9b0923bf0cf70688fe87ee29ef67ef6eda5d81eff957c68927e660f09f2d5b9592c6a5659aa5303a3b8ee88a4af523394 SHA512 2e2dbb24ed1ed97c20683bf93bf4d89afae7d18ed891025fe15a3f70f77e18cefbc5e1430c88cb06a89990def2088a414751407d60227ddbf9a2cb9dfa0609aa
+EBUILD entice-0.0.1.ebuild 1433 BLAKE2B a73ab00a056312e66f761774cc07b6f68f9c2dea7493bfd18eb764fa90cfb3a808c27b2e7d119ef05ff7ae3a6fa5207d9c18530e8423b82a5bb5778f0674eb1b SHA512 7c8bd7b0bf8ff2cb889984698c86d5f750427e58a1987f047c76549b71778ed857914dd848fd471fb15818175a7322b64451d18d62c1b31d6672d77ed40c358a
+MISC metadata.xml 337 BLAKE2B 7d08e929f5da51d9237f40c85984eee679ca90cdd00d5df811573ce225424811f51a3644bf9fe1248fb1b68c00779782c17715c65c6550968baecab456efa09b SHA512 cd0687ddf467ef47ab1aae35d043fdb73225f496bc78446f73b2c922ea6381e43f78ebe930265c191547508fa92c5826af5e4dccee601d8953edb28a1c751ee0
diff --git a/media-gfx/entice/entice-0_pre20220809.ebuild b/media-gfx/entice/entice-0.0.1.ebuild
index 92a9440ef6d1..aac12dfd69df 100644
--- a/media-gfx/entice/entice-0_pre20220809.ebuild
+++ b/media-gfx/entice/entice-0.0.1.ebuild
@@ -1,15 +1,13 @@
-# Copyright 2022-2023 Gentoo Authors
+# Copyright 2022-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 inherit meson optfeature xdg
 
-MY_COMMIT="5122896d812a2db0fd2c536f047ac340fd1d12e5"
-
 DESCRIPTION="A simple image viewer based on EFL"
 HOMEPAGE="https://git.enlightenment.org/vtorri/entice https://github.com/vtorri/entice"
-SRC_URI="https://github.com/vtorri/entice/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://git.enlightenment.org/vtorri/entice/releases/download/v${PV}/${P}.tar.xz"
 
 LICENSE="BSD-2"
 SLOT="0"
@@ -19,7 +17,7 @@ DEPEND="|| ( dev-libs/efl[X] dev-libs/efl[wayland] )
 	media-libs/libexif"
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/entice-${MY_COMMIT}"
+S="${WORKDIR}"
 
 pkg_postinst() {
 	xdg_pkg_postinst
diff --git a/media-gfx/entice/metadata.xml b/media-gfx/entice/metadata.xml
index a1fbf3c0c993..c9765eba6379 100644
--- a/media-gfx/entice/metadata.xml
+++ b/media-gfx/entice/metadata.xml
@@ -5,4 +5,7 @@
     <email>juippis@gentoo.org</email>
     <name>Joonas Niilola</name>
   </maintainer>
+  <upstream>
+    <remote-id type="github">vtorri/entice</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/media-gfx/eog-plugins/Manifest b/media-gfx/eog-plugins/Manifest
index 493cc80bbfdd..61d2f6cdb77b 100644
--- a/media-gfx/eog-plugins/Manifest
+++ b/media-gfx/eog-plugins/Manifest
@@ -1,3 +1,5 @@
 DIST eog-plugins-44.0.tar.xz 134544 BLAKE2B db384d949f2a63cb0fcdf1bdfb8ed4c5c97af88d21079af5de7560b3c3bab231a6361ae459727a9b9f31b49e63f7cd227f465a1a7b8e2bc55e8d7a08f0335ed9 SHA512 2955830aa60a3518869ec1af7a9f0c455277b0a571cb14a5e5926b52b80ed0443e91f28e270feffcf26066e1e9b6080c9a457b55175051c20838c8b80e2da195
-EBUILD eog-plugins-44.0-r2.ebuild 1731 BLAKE2B 87e80364626ccee58cd0583c332239394335883d7990e1c070a1558081a31d22a67b0c413d2b3e4ad460b2e268ecb3613e9bfc4deeea8169b08be2061b80e8a2 SHA512 08d19ef1ea25639bd23eba967e5c8218f5ec7564d4efcb6cded28ea33a5c7a2ac8741b4bdd6b0ee0582192821fafe30c461df46801c47f86f119f93b559632dc
+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
 MISC metadata.xml 463 BLAKE2B 5ac26843df7d902ad1f64f5e9815b9d31437ed02c1a97ef9c33b6abaaa653b833977bd191d7e12d0fd6aaa1a0a95a01d39402417c241a5e7ccc8a8fbe159430b SHA512 bd40d362b9017a8546cff63bb144707a8b275337f72ea45977381aa9db81361e2eb114a66ca02b8b0dbbb82f1bd1ee2e7eafd25cd309e1c79b575e0bee500694
diff --git a/media-gfx/eog-plugins/eog-plugins-44.0-r2.ebuild b/media-gfx/eog-plugins/eog-plugins-44.0-r2.ebuild
index a328d90eaa24..c02c12cfafba 100644
--- a/media-gfx/eog-plugins/eog-plugins-44.0-r2.ebuild
+++ b/media-gfx/eog-plugins/eog-plugins-44.0-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit gnome.org meson python-single-r1
 
diff --git a/media-gfx/eog-plugins/eog-plugins-44.1.ebuild b/media-gfx/eog-plugins/eog-plugins-44.1.ebuild
new file mode 100644
index 000000000000..ac59330849d4
--- /dev/null
+++ b/media-gfx/eog-plugins/eog-plugins-44.1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit gnome.org meson python-single-r1
+
+DESCRIPTION="Eye of GNOME plugins"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/eog-plugins"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="+exif map +python test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="
+	map? ( exif )
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+RDEPEND="
+	>=dev-libs/glib-2.53.4:2
+	>=dev-libs/libpeas-1.14.1:0
+	>=media-gfx/eog-41.0:1
+	exif? ( >=media-libs/libexif-0.6.16 )
+	map? (
+		media-libs/libchamplain:0.12[gtk]
+		>=media-libs/clutter-1.9.4:1.0
+		>=media-libs/clutter-gtk-1.1.2:1.0
+	)
+	python? (
+		${PYTHON_DEPS}
+		dev-libs/glib[dbus]
+		dev-libs/libpeas:0[gtk,python,${PYTHON_SINGLE_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/pygobject:3[${PYTHON_USEDEP}]
+		')
+		gnome-base/gsettings-desktop-schemas
+		media-gfx/eog[introspection]
+		x11-libs/gtk+:3[introspection]
+		x11-libs/pango[introspection]
+	)
+"
+DEPEND="${RDEPEND}
+	test? ( dev-libs/appstream-glib )"
+BDEPEND="
+	>=sys-devel/gettext-0.19.7
+	virtual/pkgconfig
+"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use exif plugin_exif-display)
+		$(meson_use python plugin_export-to-folder)
+		-Dplugin_fit-to-width=true
+		$(meson_use python plugin_fullscreenbg)
+		-Dplugin_light-theme=true
+		$(meson_use map plugin_map)
+		$(meson_use python plugin_maximize-windows)
+		-Dplugin_postasa=false
+		-Dplugin_postr=false
+		$(meson_use python plugin_pythonconsole)
+		-Dplugin_send-by-mail=true
+		$(meson_use python plugin_slideshowshuffle)
+	)
+	meson_src_configure
+}
diff --git a/media-gfx/eog/Manifest b/media-gfx/eog/Manifest
index 1a9990b04751..70f04dcd8bc6 100644
--- a/media-gfx/eog/Manifest
+++ b/media-gfx/eog/Manifest
@@ -1,3 +1,5 @@
 DIST eog-45.3.tar.xz 4656744 BLAKE2B ceebd9890da926ec7caea916ce2e4483fb398f1b5270f0a210bfc97fb844669ca8416a10cc020f145f8e0b1d2e5e2fd85dcaa4d948312e42b40c0850d657f988 SHA512 21693d659a5eb25bdec968266d7e6a1a6988bcec0bf5c3d914b098001ed4a8e64d7ff628181072fb1aabec1b89b56ed5e7c85e3b06ec79be1c9d7cf1c57d3145
-EBUILD eog-45.3.ebuild 1752 BLAKE2B d1e2cd597d68c4129627838e9205ebe76c04382084623bc7e923710eab51164e605cea69d2b02a800bd246292b072656fbfff42fe237f5ab574aaf5928f1f7f0 SHA512 9d5bbc1124b06ebabf8756c06c37a68660790e7a77a7ff54353a61ba722f168ccd34c83638901310c6d5ea34d02a1be28686ff7fbbcf1b09ad5309a89d610b7b
+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
 MISC metadata.xml 580 BLAKE2B 7d6bf08b37ed06abb82e92621725ab2cbc9d0b28e5c50cd9dd25e449e98212da4911da450d5e80f6d2efd3cb65981b2726e69f48ae54fc7a0dd4363c896b9086 SHA512 3ae60a59ef2e07fd78b836eb828c0b9e37e49ea6115c52215b86dafff9cb6990567659a31cfb1e06e58890cf598c98065df1e473dc7994fef0ae950081c27a54
diff --git a/media-gfx/eog/eog-45.3.ebuild b/media-gfx/eog/eog-45.3.ebuild
index 486256a73ca9..d200bb7d2e69 100644
--- a/media-gfx/eog/eog-45.3.ebuild
+++ b/media-gfx/eog/eog-45.3.ebuild
@@ -17,7 +17,7 @@ REQUIRED_USE="
 	gtk-doc? ( introspection )
 "
 
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.73.2:2
diff --git a/media-gfx/eog/eog-45.4.ebuild b/media-gfx/eog/eog-45.4.ebuild
new file mode 100644
index 000000000000..827642bb01f7
--- /dev/null
+++ b/media-gfx/eog/eog-45.4.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org gnome2-utils meson xdg
+
+DESCRIPTION="The Eye of GNOME image viewer"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/eog"
+
+LICENSE="GPL-2+"
+SLOT="1"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+IUSE="+exif gtk-doc +introspection +jpeg lcms +svg xmp tiff"
+REQUIRED_USE="
+	exif? ( jpeg )
+	gtk-doc? ( introspection )
+"
+
+RDEPEND="
+	>=dev-libs/glib-2.73.2:2
+	>=dev-libs/libpeas-0.7.4:0[gtk]
+	>=gnome-base/gnome-desktop-2.91.2:3=
+	>=gnome-base/gsettings-desktop-schemas-42_beta
+	>=x11-misc/shared-mime-info-0.20
+	>=x11-libs/gdk-pixbuf-2.36.5:2[jpeg?,tiff?]
+	>=x11-libs/gtk+-3.24.15:3[introspection,X]
+	>=gui-libs/libhandy-1.5.0:1
+	sys-libs/zlib
+
+	exif? ( >=media-libs/libexif-0.6.14 )
+	lcms? ( media-libs/lcms:2 )
+	xmp? ( media-libs/exempi:2= )
+	jpeg? ( media-libs/libjpeg-turbo:= )
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+	svg? ( >=gnome-base/librsvg-2.44.0:2 )
+
+	x11-libs/libX11
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	gtk-doc? (
+		dev-util/gi-docgen
+		app-text/docbook-xml-dtd:4.1.2
+	)
+	dev-util/glib-utils
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use exif libexif)
+		$(meson_use lcms cms)
+		$(meson_use xmp)
+		$(meson_use jpeg libjpeg)
+		$(meson_use svg librsvg)
+		$(meson_use gtk-doc gtk_doc)
+		$(meson_use introspection)
+		-Dinstalled_tests=false
+		-Dlibportal=false # As of 40.3, all libportal usages are flatpak-specific
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/media-gfx/eom/Manifest b/media-gfx/eom/Manifest
index 6aa065dab5a0..5de93df01687 100644
--- a/media-gfx/eom/Manifest
+++ b/media-gfx/eom/Manifest
@@ -1,6 +1,4 @@
-AUX eom-1.26.1-libxml2-2.12.patch 1191 BLAKE2B 232908830b3fec40b694c4a4f24d69a44077346a44c68a87d98e2a1a741efb3f7e9f58a1cc1560e58ccab6306639dab0ac070f9d5e007f58a90a282b789d034b SHA512 3570a3c6ba5760c7fd926221a19794442b2d75aad3ec945d831457a3c68f7b73e7023be254d2c467c1b7b4915a2a9d7a6f4464ee0e94b969b3e0a4fb81da5d2c
-DIST eom-1.26.1.tar.xz 2512024 BLAKE2B 2aa50d144a4c703d61acee8e0078a8a7ce7e41ffc8e79a0064057b78119e81cc85da0481ee55064702981683e0b34a93dd7a9fce2a6c03fa7fa65e6653d9796d SHA512 263eb6a843577f3ba399fa27b6a9087246053dffd963090933f6bb11b762e1049fdc7b0fd52a6987f40fb57be76d68f6964413a0c12437fb00b8766dc17b7648
 DIST eom-1.28.0.tar.xz 2046292 BLAKE2B dec9915ddd63758f6a36eef094e13cdfddc6bb6d333369ff240cb4afa745b814a807fd69d0ed949924fff0337073a6467ec6f5b8037bb9b1e356e029ad2e06f6 SHA512 e500915f9e4b5aa8774645e0bf6735d7592fb9c33d6cca7a94011814ac414816d5ead8dae26a875f054249ca880f306f998c0150c9800df8143dd25a270c239f
-EBUILD eom-1.26.1-r1.ebuild 1706 BLAKE2B 822c5c4ec67660574158bcd3c7bbb74b2ab68e60cb4a76b51dad4b4bf4bbdab5c8cdfc55c4eb6bf4527a52d7d9bfdbb23ea6d5c1d3c37bb6332dd1cd6b469b26 SHA512 32714522e31e4fb7861c9851feaa3b71e50cf99979b4f5b5726882a38949d8285fef480420abe29b4f92e638f20a0153d3ea77333cb62606b74a30aed1e1a0a5
-EBUILD eom-1.28.0.ebuild 1677 BLAKE2B 0cdd5f2e33203e9801e0f5ec172417c00e2ea165694b529af28c79ea1fef25b5e4372962592d26c8fdf79dfa06431031c823d6be20b0acc627dd4daea57f9f2b SHA512 e07f7a7d3395c0a57c31377b94540ee8ae682ce9c183ef884ac782c055b8799b79f352d7a2d3df2d08e0e73c0e7e108a95705b2b5ff25566d161e2dd49af7e46
+EBUILD eom-1.28.0-r2.ebuild 1795 BLAKE2B 4cda887de306e4a0416fbfd93983e4af5a5c107b3af30004c639e28270f0e4dd25e3aaf6282bf8530293bbeadd085553865c02096256e472bed54c00ead9c5ca SHA512 a0c1e7e66ceafc24d631565fa21cba6f181e771a1ca1ec014d7d53679ed70dd04085e3b629a50c32b6cdb9ae442ba71cc3ddc0f3377848f6d3bf5ae499fcd3ce
+EBUILD eom-1.28.0.ebuild 1675 BLAKE2B 3ae045eacd65637c2d0a6386157743202e868f0bbeb7a6ba6d903525c5f4e8e1281a8a6982aece1b96b30502c9d00c715b0dc95e3ca24fb7ed7cbeb870f76683 SHA512 bbcc5b7bb3cd75d6dce98d277c8438489f652f7214e23ef1e62093dd2d58e9bd293cf5f2133018b0a0b626a75dfd7935831b8dc8f513133fcb43f6f0e7293141
 MISC metadata.xml 617 BLAKE2B beb6f065da7476b012d7b972d02ab4a7af91b4d105fa281bd2264c08903d6f84ee735b187fb569c37f0b0223f750e66d3a2b18e0f4e0d100f77048ec318e2aaa SHA512 9f74f1f8062baa57d1ff7253c75fcc9b157e2bbfb82e3da61364334aa258305f0d0ce5e06ba48fad4e3e2243623c97671a3f807b836445300b5cf9c3b51c391d
diff --git a/media-gfx/eom/eom-1.26.1-r1.ebuild b/media-gfx/eom/eom-1.28.0-r2.ebuild
index 20c1013dee46..f808aaf8de76 100644
--- a/media-gfx/eom/eom-1.26.1-r1.ebuild
+++ b/media-gfx/eom/eom-1.28.0-r2.ebuild
@@ -3,10 +3,11 @@
 
 EAPI=8
 
-inherit mate
+inherit gnome2 mate optfeature
 
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~loong ~riscv x86"
+MINOR=$(($(ver_cut 2) % 2))
+if [[ ${MINOR} -eq 0 ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
 fi
 
 DESCRIPTION="The MATE image viewer"
@@ -53,10 +54,6 @@ BDEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig
 "
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.26.1-libxml2-2.12.patch
-)
-
 src_configure() {
 	mate_src_configure \
 		--enable-thumbnailer \
@@ -73,3 +70,8 @@ src_configure() {
 		$(use_with svg librsvg) \
 		$(use_with xmp)
 }
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	optfeature "webp support" gui-libs/gdk-pixbuf-loader-webp
+}
diff --git a/media-gfx/eom/eom-1.28.0.ebuild b/media-gfx/eom/eom-1.28.0.ebuild
index 6985985705ca..931fc3ee8522 100644
--- a/media-gfx/eom/eom-1.28.0.ebuild
+++ b/media-gfx/eom/eom-1.28.0.ebuild
@@ -7,7 +7,7 @@ inherit mate
 
 MINOR=$(($(ver_cut 2) % 2))
 if [[ ${MINOR} -eq 0 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~loong ~riscv x86"
 fi
 
 DESCRIPTION="The MATE image viewer"
diff --git a/media-gfx/eom/files/eom-1.26.1-libxml2-2.12.patch b/media-gfx/eom/files/eom-1.26.1-libxml2-2.12.patch
deleted file mode 100644
index 7bf2c65154ca..000000000000
--- a/media-gfx/eom/files/eom-1.26.1-libxml2-2.12.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-https://bugs.gentoo.org/917514
-https://github.com/mate-desktop/eom/commit/ace46747000807d975b58101353302f34c75ef49
-https://github.com/mate-desktop/eom/commit/d00fc0b68e9419ccdefbf2831ad2537bed8f35f4
-
-From ace46747000807d975b58101353302f34c75ef49 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Tomasz=20K=C5=82oczko?=
- <31284574+kloczek@users.noreply.github.com>
-Date: Sat, 25 Nov 2023 20:25:29 +0000
-Subject: [PATCH] fix building with new libxml 2.12.0
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Added include <libxml/xmlsave.h> to allow build with libxml 2.12.0.
-
-Signed-off-by: Tomasz Kłoczko <kloczek@github.com>
-
-* fix building with libxml 2.12.0
-
-Co-authored-by: Colomban Wendling <hypra@ban.netlib.re>
-
----------
-
-Signed-off-by: Tomasz Kłoczko <kloczek@github.com>
-Co-authored-by: raveit65 <mate@raveit.de>
-Co-authored-by: Colomban Wendling <hypra@ban.netlib.re>
---- a/cut-n-paste/toolbar-editor/egg-toolbars-model.c
-+++ b/cut-n-paste/toolbar-editor/egg-toolbars-model.c
-@@ -27,6 +27,8 @@
- 
- #include <unistd.h>
- #include <string.h>
-+#include <libxml/globals.h>
-+#include <libxml/parser.h>
- #include <libxml/tree.h>
- #include <gdk/gdk.h>
- 
-
diff --git a/media-gfx/evoluspencil/Manifest b/media-gfx/evoluspencil/Manifest
index 2c6a2aafd351..aba344aadae0 100644
--- a/media-gfx/evoluspencil/Manifest
+++ b/media-gfx/evoluspencil/Manifest
@@ -1,6 +1,4 @@
 AUX pencil.desktop 202 BLAKE2B bb588b85ed8e8e9fbed0425f3a6a88dabe77d42a1c6efbe9cfc32017d2373015b8f64899c5ca0f8992278debeeff73ca8c0985038f21342e25198eefa059c251 SHA512 101e4f9a205b71ae3a2ee084b40108a05acf210b78d54dad2d35c6fc215468d8fad10a963aee2a7dffd0406b56a98b61a0e28cf8b9ee563a78f66b9fd20e620c
 DIST Pencil-3.1.1.ga.x86_64.rpm 80453349 BLAKE2B c95d1a9722cde0396833da3e06e984e5d9ddfc9febdb4b65c8defad8aef131a7ea5444f8d05acea6ddbcb13782ab457498406cfba83585685100dc25dfb5a2b1 SHA512 3d438a390e9047230f31540066eafe87ce56dae58db84e2a8dd48dbfd29e5dcb630432f6eb4933bbba4df47460d70273b8e1cf5539cf4c7c6defda18c105582e
-DIST evoluspencil-3.1.0-1.rpm 88059338 BLAKE2B 905f37968815be8daf37f60197f33636094c1007553d917f4098e09de9943bbd027bb21cf216df64145206ac968b48fff7a91fcb3acbb1b5d01a897375e31e99 SHA512 3a9a451563f499d918b36b48482a13107e18de0f7fcb786b20a88ffd8f487cf07cfdc279bcf6d4db3b8bbde89a424352d7e1fa1d8eeaa4972d830ec22883a15f
-EBUILD evoluspencil-3.1.0-r2.ebuild 1639 BLAKE2B cdedff38018f702916ce41fcc9cafe0a2ddc8485b07c0ea3055fdfc4a77d6e7a56d7c22e497371cd826ca3a82e727d77c8890d7b9c8d139ede50e146d948fe3d SHA512 4fb8ce531319008295cc67e18fe204d0fdc7b79e2b262902b01ed5e763192e1c2b9e19ab9810c8fe2b71fb6f717df68671ec78abae04021767d184aa0c128d08
 EBUILD evoluspencil-3.1.1.ebuild 1540 BLAKE2B 9f839c5da3220b3a3d8e3375631399017e367799b5cbef501eb8ba78fa35f6b5f6b073b1381efd56df31f8b172b1a85d54603e0c96382fab8f12b6852b33dd1d SHA512 9347f75261508ab31517fc7a89e879088ff27c4b4933afeb82098dd434bf7dc6e5e8074e8ec5bfa1cba11abad339045a6cbafb989d788cfebf73ae6e11170f99
 MISC metadata.xml 246 BLAKE2B 024897eef5e0c70ec011ae2eb8ad27593e7610d8ae358cb39cda715c44d26c932115f83404c54189bff783b098defeba583ea50ccdffc34b8d10c7afacccb5c4 SHA512 79f1b01a467d2fd97d8703a48c2f72ede7b3b5c4ca538401b32602352d62f7a4e2493df9c3c7c613bf08b6a811a14d62cdaa411bd2d1e2fd3965ae317e9c1f1b
diff --git a/media-gfx/evoluspencil/evoluspencil-3.1.0-r2.ebuild b/media-gfx/evoluspencil/evoluspencil-3.1.0-r2.ebuild
deleted file mode 100644
index 4c1c4625a566..000000000000
--- a/media-gfx/evoluspencil/evoluspencil-3.1.0-r2.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit rpm xdg-utils desktop
-
-MY_PN="${PN/evolus/}"
-MY_PV="${PV}.ga"
-
-DESCRIPTION="A simple GUI prototyping tool to create mockups"
-HOMEPAGE="https://pencil.evolus.vn/"
-SRC_URI="https://pencil.evolus.vn/dl/V${MY_PV}/${MY_PN}-${MY_PV}-1.x86_64.rpm -> ${P}-1.rpm"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	|| (
-		>=app-accessibility/at-spi2-core-2.46.0:2
-		( app-accessibility/at-spi2-atk dev-libs/atk )
-	)
-	dev-libs/expat
-	dev-libs/glib
-	dev-libs/nspr
-	dev-libs/nss
-	media-libs/alsa-lib
-	net-print/cups
-	sys-apps/dbus
-	sys-apps/util-linux
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:2
-	x11-libs/libX11
-	x11-libs/libxcb
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXScrnSaver
-	x11-libs/libXtst
-	x11-libs/pango
-"
-
-S="${WORKDIR}"
-
-# bug 703602
-RESTRICT="splitdebug"
-
-QA_PREBUILT="
-	opt/${MY_PN}/*.so
-	opt/${MY_PN}/chrome-sandbox
-	opt/${MY_PN}/pencil
-"
-
-src_prepare() {
-	default
-	rm opt/${MY_PN}-${MY_PV}/${MY_PN}.desktop || die
-}
-
-src_install() {
-	insinto /opt/${MY_PN}
-	doins -r opt/${MY_PN}-${MY_PV}/*
-
-	fperms 755 /opt/${MY_PN}/${MY_PN}
-	dosym ../../opt/${MY_PN}/${MY_PN} /usr/bin/evoluspencil
-
-	domenu "${FILESDIR}"/${MY_PN}.desktop
-
-	mkdir -p "${D}"/usr/share/icons/hicolor/256x256/apps/ || die
-	mv "${D}"/opt/${MY_PN}/${MY_PN}.png "${D}"/usr/share/icons/hicolor/256x256/apps/ || die
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/media-gfx/exif/Manifest b/media-gfx/exif/Manifest
index db95ccae2491..95a579e0b5dd 100644
--- a/media-gfx/exif/Manifest
+++ b/media-gfx/exif/Manifest
@@ -1,4 +1,4 @@
 AUX exif-0.6.22-empty-string-check.patch 1272 BLAKE2B ea6d3c4f2c3dd75ca1d9c75433a830282b252197c5b9885278823ed70dcd1ab0e319536c9f012d093da32f7af345280f7004b5b78f0e7800ede9ea4e16de46e2 SHA512 bce1a58033f7597219f2be2edbc4b8b821b1fb6f4de591d3b94010806f278d0bad20af24d7e05aff00b02057ed70ecea548f848ac8412748312eca3a6e6d6682
 DIST exif-0.6.22.tar.xz 369152 BLAKE2B 11cfda3d504860c418863449ba986d64553c3ac8354f99bd2af33b3bcb324a237b3bf89110bbd08b8ef5e4f0ac293107afdaac8abc1f4607d3a0544f18686430 SHA512 f1e2c56b9e72a606c90d53733c1f2b310f7be16a3929595bbf9d5d10a128ef3f6582f547554fc106f449e94d626a137a0a5e4c99391c9253d677abd5ae7fc333
-EBUILD exif-0.6.22-r1.ebuild 719 BLAKE2B 2655c050303b8a6249bbfa88200271a3adf6b28cc93340d834e20be9546e4fb8636157a0c4866657b450deb65ad84d24e7d4032ed56e6e4fec907aed1b912404 SHA512 4d6009bf2ed7bc26ea269e22591b869de2618c360e5cd47a7a8cb16db47608b792602f6000674fb40628e567e5d484101984a7de5d0a142b22f91f053063b0c1
+EBUILD exif-0.6.22-r1.ebuild 713 BLAKE2B bc27c0c0478863dc049be2778655a1f1fc9a52b69ba34d7d3962798ad1add0bcf06c2984573760cbc5128c5b1e1eb3e96fb357d0af247a9de75337ad4c268ba1 SHA512 d5fabb10f7b1cddd35bc90abe3731be70ceb2dfbbe22c965e3263757600354018cc093a97306a4f5fb1a336e2ed7d8df894a6cfb9bcb613db76b0e947b82835b
 MISC metadata.xml 304 BLAKE2B 5b55e98ca12d4776b75f3f3c1be0791a297344b7cc27b127f75e645e1fff1df04a85c5de371378b25366a0af1920470aa3d182572b6202d6cd320522664f17ab SHA512 b56b08cbbf054a85288f63e75342d65cc851d628d70f6fa27a8ba30a869464554af50903a4b89fcc901e0c872d65a074a7c9c087a18228d22e1329f56189fd9c
diff --git a/media-gfx/exif/exif-0.6.22-r1.ebuild b/media-gfx/exif/exif-0.6.22-r1.ebuild
index 230ebd275c1a..5d2f5b841801 100644
--- a/media-gfx/exif/exif-0.6.22-r1.ebuild
+++ b/media-gfx/exif/exif-0.6.22-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/lib${PN}/${PN}/releases/download/${PN}-${PV//./_}-re
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="nls"
 
 BDEPEND="
diff --git a/media-gfx/exiv2/Manifest b/media-gfx/exiv2/Manifest
index 0fc0dffe10cf..e867fb37351a 100644
--- a/media-gfx/exiv2/Manifest
+++ b/media-gfx/exiv2/Manifest
@@ -1,4 +1,6 @@
 AUX exiv2-0.28.2-errors-localisation.patch 835 BLAKE2B af7821671a1f852d3169eb1577814f390e5943165fff73ea568906e71253a381c72ebe5b3fc623668a7d37f6bfd988e7eff3b505e04f0fb8f6f95b3a8398cc20 SHA512 d228eed586b257e992566d1ebb655753a7bec6ce6ab56773dc7feeb93fa479b4f98a1db4ac64e95eed2447ed27ee434eed40d9c4a230be6fe6f8788fa9d5ed7f
 DIST exiv2-0.28.2.tar.gz 45224206 BLAKE2B 9d1d05c99804032dfb9b740e543d1e3cceae011b17853c8565ccad87e726ce1d0f410c13bf4fa8839bc8e0fecdf170a3acac568f14aad4628b3b844f6c21dd7e SHA512 197cc607c0271b5731714713283756250031cef81ba7ed5d9c3e222b4c2397966cc2bbdbceaae706598329dde6f8a9729597d0ae4c36ac264c76546942e4e37b
-EBUILD exiv2-0.28.2-r1.ebuild 3325 BLAKE2B 01f01b3ed583f8cfc25103dcb0b2707516c359d7bbbf6f0e6cc2009ea775bf8cc91ff747bbbf640337079389a2b217071fc8415f1683c9a48ac6d1e0e8a450c4 SHA512 96424c74c1e3e594f4d9dc819a21a91ec7d5428d2de52720df4d5a388fe8e4ce86ec066d3dbc9b92d9c71b3273bb2ff9cd54e3f84f1aac8f027169ad5fc8b969
+DIST exiv2-0.28.3.tar.gz 46480702 BLAKE2B 73ebdca376d69514a89261d2f78604c5d7ccbc6e73e5c5d61f8caa596fd6b60dd4d06df19cb9f93e402d9a76f1511955f77cfd74b407310a13952092ecfbf0ef SHA512 c8338a118feefa104d73932890c732247c884ab9ce1d170c43a22ab5884517a0e2a7fd1febde7705b8290fbbbc29e64738610404816e4db2b56a70fc444ca049
+EBUILD exiv2-0.28.2-r1.ebuild 3319 BLAKE2B d0ca974fcf0184a7fda7e719044e48205aaea82ddb52ffc744d8f1ff4ef48bb022b410f6ce5b896eb255dc20acfcf498d0bb5ae8e9a528f61c69a6f36acc3ac8 SHA512 17a1b42135dfdc7527628d938810fb97f8ca7a53dd4aa2ada16bdd74be4fb428ee18ff80da07e458d9688ecbd3e894aca903d491410284a9b71068d05e8c8a0f
+EBUILD exiv2-0.28.3.ebuild 3261 BLAKE2B 6801c92f63122d21fc5c93e5a65f1c260ce458e12967e6362a51ddba454b757a7da1aeea0b229fe9ef3eca3b0a4906ca0be4bea16079e9c288ad21dbf53e12c0 SHA512 642977da6b3cb8963e350bcbb7a48be4e75042b72e333858b89ac932bf682ce0034384c5ec07977ebfc689a446f02717eb1ec5361067a94e773e082d1324ca9a
 MISC metadata.xml 686 BLAKE2B 2d1079660cf4268216f8835d1ae6655ebafc99d5402872bb05dac6342034a28a07dcff587fc616a5eedc8c538ea3e43e013711d39c2541295e89629e39a244ee SHA512 40f9225a42386fa6f03bf9436d675bb01bd6eb859974bfed22d1316536ceaf40752fabffdab20b439e87c57f65d193d8d249e5aa022584de3f869f4162660b4e
diff --git a/media-gfx/exiv2/exiv2-0.28.2-r1.ebuild b/media-gfx/exiv2/exiv2-0.28.2-r1.ebuild
index 2bb992bdcaab..ce29a0cec77b 100644
--- a/media-gfx/exiv2/exiv2-0.28.2-r1.ebuild
+++ b/media-gfx/exiv2/exiv2-0.28.2-r1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/Exiv2/exiv2/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/media-gfx/exiv2/exiv2-0.28.3.ebuild b/media-gfx/exiv2/exiv2-0.28.3.ebuild
new file mode 100644
index 000000000000..644c3b5b5904
--- /dev/null
+++ b/media-gfx/exiv2/exiv2-0.28.3.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+inherit cmake-multilib python-any-r1
+
+DESCRIPTION="EXIF, IPTC and XMP metadata C++ library and command line utility"
+HOMEPAGE="https://exiv2.org/"
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/Exiv2/exiv2.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/Exiv2/exiv2/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+fi
+
+LICENSE="GPL-2"
+# Upstream hope to have stable ABI in 1.0. Until then, go off ${PV}.
+# We may be able to change it to $(ver_cut 1-2) once e.g.
+# https://github.com/Exiv2/exiv2/pull/917 is merged.
+SLOT="0/$(ver_cut 1-2)"
+IUSE="+bmff doc examples jpegxl nls +png test webready +xmp"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/inih[${MULTILIB_USEDEP}]
+	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
+	jpegxl? ( app-arch/brotli:=[${MULTILIB_USEDEP}] )
+	nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )
+	png? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
+	webready? ( net-misc/curl[${MULTILIB_USEDEP}] )
+	xmp? ( dev-libs/expat[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	test? ( dev-cpp/gtest )
+"
+BDEPEND="
+	doc? (
+		${PYTHON_DEPS}
+		app-text/doxygen
+		dev-libs/libxslt
+		media-gfx/graphviz
+		virtual/pkgconfig
+	)
+	test? ( ${PYTHON_DEPS} )
+	nls? ( sys-devel/gettext )
+"
+
+DOCS=( README.md doc/ChangeLog doc/cmd.txt )
+
+pkg_setup() {
+	if use doc || use test ; then
+		python-any-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	# FIXME @upstream:
+	einfo "Converting doc/cmd.txt to UTF-8"
+	iconv -f LATIN1 -t UTF-8 doc/cmd.txt > doc/cmd.txt.tmp || die
+	mv -f doc/cmd.txt.tmp doc/cmd.txt || die
+
+	cmake_src_prepare
+
+	sed -e "/^include.*compilerFlags/s/^/#DONT /" -i CMakeLists.txt || die
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DEXIV2_BUILD_SAMPLES=NO
+		-DEXIV2_ENABLE_BROTLI=$(usex jpegxl)
+		-DEXIV2_ENABLE_NLS=$(usex nls)
+		-DEXIV2_ENABLE_PNG=$(usex png)
+		-DEXIV2_ENABLE_CURL=$(usex webready)
+		-DEXIV2_ENABLE_INIH=ON # must be enabled (bug #921937)
+		-DEXIV2_ENABLE_WEBREADY=$(usex webready)
+		-DEXIV2_ENABLE_XMP=$(usex xmp)
+		-DEXIV2_ENABLE_BMFF=$(usex bmff)
+
+		# We let users control this.
+		-DBUILD_WITH_CCACHE=OFF
+		# Our toolchain sets this by default.
+		-DBUILD_WITH_STACK_PROTECTOR=OFF
+
+		$(multilib_is_native_abi || echo -DEXIV2_BUILD_EXIV2_COMMAND=NO)
+		$(multilib_is_native_abi && echo -DEXIV2_BUILD_DOC=$(usex doc))
+		$(multilib_is_native_abi && echo -DEXIV2_BUILD_UNIT_TESTS=$(usex test))
+		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}"/usr/share/doc/${PF}/html
+	)
+
+	if use doc || use test ; then
+		mycmakeargs+=(
+			-DPython3_EXECUTABLE="${PYTHON}"
+		)
+	fi
+
+	cmake_src_configure
+}
+
+multilib_src_compile() {
+	cmake_src_compile
+
+	if multilib_is_native_abi; then
+		use doc && eninja doc
+	fi
+}
+
+multilib_src_test() {
+	if multilib_is_native_abi; then
+		cd "${BUILD_DIR}"/bin || die
+		./unit_tests || die "Failed to run tests"
+	fi
+}
+
+multilib_src_install_all() {
+	use xmp && DOCS+=( doc/{COPYING-XMPSDK,README-XMP,cmdxmp.txt} )
+
+	einstalldocs
+	find "${D}" -name '*.la' -delete || die
+
+	if use examples; then
+		docinto examples
+		dodoc samples/*.cpp
+	fi
+}
diff --git a/media-gfx/fbgrab/Manifest b/media-gfx/fbgrab/Manifest
index 7379c18e4898..74f46f36f680 100644
--- a/media-gfx/fbgrab/Manifest
+++ b/media-gfx/fbgrab/Manifest
@@ -1,3 +1,3 @@
 DIST fbgrab-1.5.tar.gz 37010 BLAKE2B aff706ef46664216ac1846d0e8fe37646fcb900cce1d451560d024edf3aab4c1817739cb26cae4d9491ae98c5e2d3fda96509f539514b701b7c7ae54ee9a8d02 SHA512 475d377480b9e67f618e19967d4bae5890a78aa00236583914b4ac81f468d8282e1767d85009101f6b03ddc091da8416dcbae451b191a79013e1632d91155c23
-EBUILD fbgrab-1.5.ebuild 690 BLAKE2B 48ba372f5f08ec1d04dc1029f4822b6bd42cb0f87b21ef2b8691ac438c6673a2402d4a3ad9886c3944867fa834e4cb7432ae587ab346c2aaaa6efb20b966ace6 SHA512 52f1ede2b33ab0c93a0dce65991f142165efb1a01a02ef14a008770c494f6dcd8cff3a662923c8bbda8605071e5a8332917414933f126bd6d18db06550126229
-MISC metadata.xml 332 BLAKE2B eee086fa03c81d056e03024567d5366d725700a123679232e9744988de43d204264128ec137c16c8c703e83d8e33274e6d6a734df45cf1c4aac2e96c123f94d7 SHA512 16647590f31884456ecee7d36858de57c848f1706e06877bb484f5eca0669788a1bfceb98f5233827f07bdf2fec832d94e13d94f5fcaf4f9dca07a47ad19150f
+EBUILD fbgrab-1.5.ebuild 684 BLAKE2B 3c994c8b43313aaa0f0d119585b3278fc0a20da763d416849c8d04c27ab6d73572d31b9d3b13fa40875595a12552f73421b4bc5f76524a3fc3b54ef1deaf54b0 SHA512 ab3507d157dc7b8c63d9e4e4531887096e224c73c5cf2b04f3957356c70a556bc60a4dd1c9e44e7f64b6c4f41a956e589275e6454d77c8b9e1c64b1b5933b578
+MISC metadata.xml 252 BLAKE2B 2c016d4f49d7c3ad7898fc7f3af422425bdd657fc26c934a77624a5f960198f11df101381ed34506fc96e53d6f598dcb8eb380c57d13cff9b8b36e4493fae798 SHA512 a0c3bbc14f2863aaaff7f5c9b76a7609bc9f5412f504df01788ffd6f319d30854b298bd15d811fc42db349ca061ee5025777e27b13ef8d9507255a2f925c841c
diff --git a/media-gfx/fbgrab/fbgrab-1.5.ebuild b/media-gfx/fbgrab/fbgrab-1.5.ebuild
index 78374979eb1b..dde459d9e098 100644
--- a/media-gfx/fbgrab/fbgrab-1.5.ebuild
+++ b/media-gfx/fbgrab/fbgrab-1.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/GunnarMonell/fbgrab/archive/${PV}.tar.gz -> ${P}.tar
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ppc ~ppc64 ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ~ppc64 ~s390 ~sparc x86"
 
 RDEPEND="media-libs/libpng:=
 	 sys-libs/zlib"
diff --git a/media-gfx/fbgrab/metadata.xml b/media-gfx/fbgrab/metadata.xml
index 5db01dff17c5..ad9efed26f60 100644
--- a/media-gfx/fbgrab/metadata.xml
+++ b/media-gfx/fbgrab/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>pinkbyte@gentoo.org</email>
-		<name>Sergey Popov</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">GunnarMonell/fbgrab</remote-id>
 	</upstream>
diff --git a/media-gfx/fbida/Manifest b/media-gfx/fbida/Manifest
index 416efd8ad542..3dc5af75fb77 100644
--- a/media-gfx/fbida/Manifest
+++ b/media-gfx/fbida/Manifest
@@ -5,6 +5,6 @@ AUX fbida-2.14-fno-common.patch 1148 BLAKE2B 108c21e732afaebe6183835732341b814b1
 AUX ida-desktop.patch 384 BLAKE2B 627319b163e62af11acc2c0957254cc671145b9df22f27af8988e5f0bcdf383f7cf2ad4fa7b7c97acfbba3181081ee1c025c4b3c82e99bfd7fe4efe69edd59c0 SHA512 0e14a3b848774d1538e309a9c8a8f0445a870db21723d11d0c39d86760ccb9c6f9a5f08ec75016875b2867c2d2075b59aad0fa810621f2c2afcccd14fef26737
 DIST fbida-2.14.tar.gz 296826 BLAKE2B 0015b426c5deaf72737a52bddb065e7d0cb804ea97157dded522061d8fabb5c632d5e66b1ef1b4e75b355537ef4f4e603f3a877e2ef92d1581eaa4791ab5be99 SHA512 8f3596ad8a22497880ac698d3b324e038ac5ccae7481fe4a902fc6e8bf43ba1bb3a96af8c7a3347bea86c1988f35674e2647901ac256bd4e8261d467a6a343ec
 DIST ida.png.bz2 11928 BLAKE2B 8a1c89fc5adfb16c69f9591a299beb62c84d66960b586fbc819e53f904c90beef821ecf3539236563644c28e3ad3c7dbf861b140c820be649305a658b3613433 SHA512 cf3c1bc8d25fe75f10c0a0414b5c082348df2fa94864ec4537c36e0b357cf35b68e2eca205bbf48578a41c27317701aee621c6dd176e0bf3857c52f895d6bfd3
-EBUILD fbida-2.14-r6.ebuild 2531 BLAKE2B 0536af7e7531b37e6523cde15c9897c2a600ceb00e2db4d1a33f409c9eb45ddc0d2881537b0f44b02523aee420ea5a3a4b6a1a650cc07186272232d475524297 SHA512 61b6346aade1fff5c03d5763e87c6730c910a4a1e8085a6531df9ddbee553e94b4cc4ae891606c321b6448d28af510b38e0b85e6ed4af951d121463e61997f51
+EBUILD fbida-2.14-r6.ebuild 2525 BLAKE2B eca890df02f1531ea82beaf11ab51e2eb9aa4465ad3bbbfe5ba9549187684efeab304f6e47db14cf23e8854170aaae45156b268cdb490611df678a6ec21669f7 SHA512 96f9f02b271cf255d48b037150477492f80477992cfe74e3c1ac0791b5c0bedf397cca7164f2cdb154e4d6b4ba4869ed0d58dc29e1ad41888b7f39d81959dfa0
 EBUILD fbida-9999.ebuild 1355 BLAKE2B 8f634fe0c8640b90c8bdd892fe9aa0063b70178a51fcb7958ff599b098ba434ece589a978ab27d4a913b7776c712146bc31c653edd808bc8810c3d45258e0473 SHA512 67b1feb4d1f34777a819a44e6f7884df389102f47e1e1a52b0a470a02476e5a058b5d53c2379a24b856c980ae308b30a7cac504d829f9d6a2fd408953e58d924
 MISC metadata.xml 482 BLAKE2B c4b1c0587475e24e1d70cd93aa6033d8d9f8c32e009905023da27d793bf7847d8d595d3640148e3955314ee1de5ab3d353e113373b19b564fbb377a5c0e6d4f7 SHA512 7ca481f281fd758dfd9ff025bdb8242e15e68cbc7ad05884b14c89371cb91c1a3deaf451ea1665ae4fedd1904d6218f2a4f5f556145ec0e06332f857cc299b39
diff --git a/media-gfx/fbida/fbida-2.14-r6.ebuild b/media-gfx/fbida/fbida-2.14-r6.ebuild
index 3620d12eb513..5023e37831a2 100644
--- a/media-gfx/fbida/fbida-2.14-r6.ebuild
+++ b/media-gfx/fbida/fbida-2.14-r6.ebuild
@@ -12,7 +12,7 @@ SRC_URI="
 "
 LICENSE="GPL-2 IJG"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv sparc x86"
 IUSE="curl fbcon ghostscript +gif lirc +png scanner +tiff X +webp"
 REQUIRED_USE="
 	ghostscript? ( tiff )
diff --git a/media-gfx/feh/Manifest b/media-gfx/feh/Manifest
index 942685a47188..0469bd2693f5 100644
--- a/media-gfx/feh/Manifest
+++ b/media-gfx/feh/Manifest
@@ -1,4 +1,6 @@
 AUX feh-3.2-debug-cflags.patch 193 BLAKE2B 298f65a8f9142167d1cd2cfce0bc61ad9d7d4a5519ab8e78d1259ea60b5566376f8d9ddba660db65ef5e229bdc0ff254d9aab2284d8929ea0ac171da44f8c44d SHA512 336d23b767c5c3da9b94a1e6759129c242caf70a611b2410816a562d90720e3abab6a3444ce06975d62b4ebbe8e54c70942800516c7575cc6d5e13ce69679884
 DIST feh-3.10.2.tar.bz2 2113183 BLAKE2B 0f4662068917628be6046d3f2ebd8177b7cc1699d693de31229d2ebc6188cc7a5170202188a426ec2e3d900f2c8fb34007395aecc151f8f034e5461d287f058f SHA512 698501347224887162631397bb3b6c5da81b88993876f001407dea87fdc4f458290272d75b400aea6c0927d3c53f290483b6a89cd2cb426f56957a4fe6267797
+DIST feh-3.10.3.tar.bz2 2113623 BLAKE2B 052848b222babbcb6a0d9b6c109c7a382052072c03482f47c7784e4b923fba470039d2f75db663b2d70515eb73234141c2871858825489044febea4bf1693b20 SHA512 60f29d463486eca9308037648a1b91b093051878aa2a8671166fd685ac05c217cd46ad2c7df2fde09b5f1d6cd8b3ee2b8f32fbbf6d3b2e4abc4c50b36f237977
 EBUILD feh-3.10.2.ebuild 1541 BLAKE2B 6bd62dbd6bc420ac828c1da5572483f63121a277e0462e54d9c89be01b8ea1d773923b4e947b45983a794bbbc81c6cab1da3efe44d425f3b0dcaec1a3a77c398 SHA512 b6790d6c01feebc5117039c4a077f566eb1b8c59ef51869e2693ab8a8fa0072947e95e83356015d6289fe698aae052a4e8925ab77dad39051679359464745541
+EBUILD feh-3.10.3.ebuild 1541 BLAKE2B 6bd62dbd6bc420ac828c1da5572483f63121a277e0462e54d9c89be01b8ea1d773923b4e947b45983a794bbbc81c6cab1da3efe44d425f3b0dcaec1a3a77c398 SHA512 b6790d6c01feebc5117039c4a077f566eb1b8c59ef51869e2693ab8a8fa0072947e95e83356015d6289fe698aae052a4e8925ab77dad39051679359464745541
 MISC metadata.xml 559 BLAKE2B 074f2a1c4a912ebf99cde3c7791ffccee8c19fe53e98794557d7807647d3c465e31fd95d855d7bfa43759d73c6deba365b24420624211355413bd13fe20bed1e SHA512 b811d6991505e777e858d88c26588d4e766a871895da586203565c7486d360d72d3514944caa483fe37c56211ea4a33a16313e1983a515aaf39b349935c73ddf
diff --git a/media-gfx/feh/feh-3.10.3.ebuild b/media-gfx/feh/feh-3.10.3.ebuild
new file mode 100644
index 000000000000..112ee958f69c
--- /dev/null
+++ b/media-gfx/feh/feh-3.10.3.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit toolchain-funcs xdg-utils
+
+DESCRIPTION="A fast, lightweight imageviewer using imlib2"
+HOMEPAGE="https://feh.finalrewind.org/"
+SRC_URI="https://feh.finalrewind.org/${P}.tar.bz2"
+
+LICENSE="feh"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ~mips ppc ppc64 ~riscv x86"
+IUSE="debug curl exif test xinerama inotify"
+RESTRICT="test" # Tests are broken.
+
+COMMON_DEPEND="
+	media-libs/imlib2[X,text(+)]
+	>=media-libs/libpng-1.2:0=
+	x11-libs/libX11
+	curl? ( net-misc/curl )
+	exif? ( media-libs/libexif )
+	xinerama? ( x11-libs/libXinerama )"
+RDEPEND="${COMMON_DEPEND}
+	media-libs/libjpeg-turbo:0"
+DEPEND="${COMMON_DEPEND}
+	x11-base/xorg-proto
+	x11-libs/libXt
+	test? (
+		>=dev-lang/perl-5.10
+		dev-perl/Test-Command
+		media-libs/imlib2[gif,jpeg,png]
+	)"
+
+PATCHES=( "${FILESDIR}"/${PN}-3.2-debug-cflags.patch )
+
+pkg_setup() {
+	use_feh() { usex $1 1 0; }
+
+	fehopts=(
+		PREFIX="${EPREFIX}"/usr
+		doc_dir='${main_dir}'/share/doc/${PF}
+		example_dir='${main_dir}'/share/doc/${PF}/examples
+		curl=$(use_feh curl)
+		debug=$(use_feh debug)
+		xinerama=$(use_feh xinerama)
+		exif=$(use_feh exif)
+		inotify=$(use_feh inotify)
+	)
+}
+
+src_compile() {
+	tc-export CC
+	emake "${fehopts[@]}"
+}
+
+src_install() {
+	emake "${fehopts[@]}" DESTDIR="${D}" install
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
diff --git a/media-gfx/fig2dev/Manifest b/media-gfx/fig2dev/Manifest
index eae3a13145be..017ba8b2943b 100644
--- a/media-gfx/fig2dev/Manifest
+++ b/media-gfx/fig2dev/Manifest
@@ -1,4 +1,5 @@
 DIST fig2dev-3.2.9.tar.xz 529892 BLAKE2B d6b4f84f89f85b282e2e02a3a4129ab8c9f67b3376b670fb553fc89347bf2552bfc3b3bfc4d4a4a35da7f9e5659f6f6fdf5a1fb4f82fb87d140dc09d079d9ffa SHA512 4a92539d79027c73cd9fa53d7e960db40ae5616d3197023a98346de4727cd70b28cd7d64ba33063dbe3dcacada7e97bb0e0c595547781a4244aea8c75d43f406
 DIST fig2mpdf-1.1.2.tar.bz2 191438 BLAKE2B 411791fecf6e10aac92c004c7da69a10c97a6e12f811452f12d0b51b3a1eeff8fff97d831a5e64c9047855d27e6825a4e65f62be2536651e5876edd00cc822a9 SHA512 36dea40008371386b47a4451e2f311cc2540ab063e3b61e628a535775d62a8840c5cc20c37b80465184bf041c6e583aaf3e5156079e72211d0a87ff3346d2980
-EBUILD fig2dev-3.2.9-r2.ebuild 2299 BLAKE2B e52d451f49bfa3ecb700caf594e6218bc65b1398aff300baef91d49dff581a7819836d9c5c60d3760b99c3b37d050c73e39960248bab685553d09e23be880d74 SHA512 4375637aeb94840774f820512624753845252ccc0dbf93d4ac6dbdde7d05c0b07e5fe286b212bc5612ecf12c80f4cc3a1b69e1f4b041808f81dedcb04d534bbf
-MISC metadata.xml 484 BLAKE2B 8f0c03a4eae95a088a590133f0a911b6ff795d23aba1fddcafeceb40433b5af14c530b288552e6e97d5fd981dd37fc8491a7e4cfe5b79cf872c2fb70015d7cb6 SHA512 4c8313b75726d3fe87f68b7810f9f69a0a9fa4deddd856d5e7276bb5b419400ca583a96d59f3333edba52c71bc53f4687dcfe4e72e37e85e80a9cc95c52a733e
+EBUILD fig2dev-3.2.9-r2.ebuild 2293 BLAKE2B a04ef4523e3381f84ed89030e2b3e8e4d1b9a1e881705737dcb1b202d769350126caa5a8233b07a9bc9136a12b56d4d76d7252693bb53b00a7884761f69b0ece SHA512 395af4038ec057d080e49453e54c80cbc34c720b6f691456c068390f4029be86548fde26cbe6fdbe6fd25de7c2109c52d3947d40885b69c2d381c4b4dc2ec5c0
+EBUILD fig2dev-3.2.9-r5.ebuild 2414 BLAKE2B b782b79dc1f5f1ca6a769b00959a77dbd12d2263d01231326920be167392227c045411697513fc1cfe6df0158fc68761e4841e9d55e6f1d913dd4db3b553566d SHA512 c0d7560409fb556a5ef2c919b009d7d9a4471473c9fdbe8a0284c6707fc0ed9c4d49bbb3eb81df0a83a61342b9989c6a8db38bbcf924b42689475f949f20e561
+MISC metadata.xml 609 BLAKE2B f4f19f0cb2281cf5cddbdf11ac59b3c5c4881b04943e3a4c5d0ff0e5c7f66ffe7d066fc7cd9fb07f7db4f1ef727bcbe7d2033415681d619580a3bed3630474e5 SHA512 0bf3ae4eac46bd373650dfd16ba5b4abaf7f17352a1b59255352e2e9dba56cca03a3192ec99b2b0da6586d86349784de0df25628bf4b35f1e1b37bf38e0ccd6b
diff --git a/media-gfx/fig2dev/fig2dev-3.2.9-r2.ebuild b/media-gfx/fig2dev/fig2dev-3.2.9-r2.ebuild
index d8dda8e975c8..5ba39f14e9c8 100644
--- a/media-gfx/fig2dev/fig2dev-3.2.9-r2.ebuild
+++ b/media-gfx/fig2dev/fig2dev-3.2.9-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://downloads.sourceforge.net/mcj/${P}.tar.xz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	media-libs/libpng
diff --git a/media-gfx/fig2dev/fig2dev-3.2.9-r5.ebuild b/media-gfx/fig2dev/fig2dev-3.2.9-r5.ebuild
new file mode 100644
index 000000000000..8a78d35dbbac
--- /dev/null
+++ b/media-gfx/fig2dev/fig2dev-3.2.9-r5.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+#MY_P="${PN}.${PV}"
+
+DESCRIPTION="Set of tools for creating TeX documents with graphics"
+HOMEPAGE="https://www.xfig.org/"
+SRC_URI="https://downloads.sourceforge.net/mcj/${P}.tar.xz
+	mirror://gentoo/fig2mpdf-1.1.2.tar.bz2"
+#S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="+ghostscript"
+
+RDEPEND="
+	media-libs/libpng
+	media-libs/libjpeg-turbo:=
+	x11-apps/rgb
+	x11-libs/libXpm
+	!media-gfx/transfig
+	ghostscript?
+	(
+		app-text/ghostscript-gpl
+		virtual/imagemagick-tools[jpeg,png,postscript,tiff]
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-text/rman
+	sys-devel/gcc
+"
+
+DOCS=( README CHANGES NOTES )
+HTML_DOCS=( "${WORKDIR}/fig2mpdf/doc/." )
+
+sed_Imakefile() {
+	# see fig2dev/Imakefile for details
+	vars2subs="BINDIR=${EPREFIX}/usr/bin
+			MANDIR=${EPREFIX}/usr/share/man/man\$\(MANSUFFIX\)
+			XFIGLIBDIR=${EPREFIX}/usr/share/xfig
+			PNGINC=-I${EPREFIX}/usr/include/X11
+			XPMINC=-I${EPREFIX}/usr/include/X11
+			USEINLINE=-DUSE_INLINE
+			RGB=${EPREFIX}/usr/share/X11/rgb.txt
+			FIG2DEV_LIBDIR=${EPREFIX}/usr/share/fig2dev"
+
+	for variable in ${vars2subs} ; do
+		varname=${variable%%=*}
+		varval=${variable##*=}
+		sed -i "s:^\(XCOMM\)*[[:space:]]*${varname}[[:space:]]*=.*$:${varname} = ${varval}:" "$@" || die
+	done
+}
+
+src_configure() {
+	# export IMAKECPP=${IMAKECPP:-${CHOST}-gcc -E}
+	# CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" xmkmf || die
+	econf --enable-transfig
+}
+
+src_compile() {
+	# emake CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" Makefiles
+
+	local myemakeargs=(
+		CC="$(tc-getCC)"
+		AR="$(tc-getAR)"
+		RANLIB="$(tc-getRANLIB)"
+		CDEBUGFLAGS="${CFLAGS}"
+		LOCAL_LDFLAGS="${LDFLAGS}"
+		USRLIBDIR="${EPREFIX}/usr/$(get_libdir)"
+	)
+	emake "${myemakeargs[@]}"
+}
+
+src_install() {
+	local myemakeargs=(
+		DESTDIR="${D}"
+		INSTDATFLAGS="-m 644"
+		INSTMANFLAGS="-m 644"
+	)
+	emake "${myemakeargs[@]}" install
+
+	dobin "${WORKDIR}/fig2mpdf/fig2mpdf"
+	doman "${WORKDIR}/fig2mpdf/fig2mpdf.1"
+
+	einstalldocs
+
+	rm "${ED}/usr/share/doc/${PF}/html/"{Makefile,*.lfig,*.pdf,*.tex} || die
+}
+
+pkg_postinst() {
+	elog "Note, that defaults are changed and now if you don't want to ship"
+	elog "personal information into output files, use fig2dev with -a option."
+}
diff --git a/media-gfx/fig2dev/metadata.xml b/media-gfx/fig2dev/metadata.xml
index 78af0f20536c..33ea7d1b9d42 100644
--- a/media-gfx/fig2dev/metadata.xml
+++ b/media-gfx/fig2dev/metadata.xml
@@ -9,6 +9,9 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<use>
+		<flag name="ghostscript">Require <pkg>app-text/ghostscript-gpl</pkg> to export PDF an bitmap formats</flag>
+	</use>
 	<upstream>
 		<remote-id type="sourceforge">mcj</remote-id>
 	</upstream>
diff --git a/media-gfx/fontforge/Manifest b/media-gfx/fontforge/Manifest
index 509d2108be13..0963a74a1678 100644
--- a/media-gfx/fontforge/Manifest
+++ b/media-gfx/fontforge/Manifest
@@ -1,7 +1,8 @@
 AUX fontforge-20230101-fix-splinefont-shell-command-injection.patch 5688 BLAKE2B 9940dd5fd04cc61b87e2498064e9b5e70a9806b9a70a2d93a155d932f888e7bd7e7a11a5f44972feec41c6359e39fa4be982850db7fbceba095a6b35968d4d1a SHA512 1f90a8596c831008fd0a4accbd496455a7951c4ca706aebcfff8091148569680538897e02833bd6d5f92dc885921a92cee6b91f89c70543e0e4856767775ef45
+AUX fontforge-20230101-python3.12-distutils-no-more.patch 988 BLAKE2B ea666805ea0bf1a9fe5fa8cad3e76e8410933a5ce954cc09c7f923efebc78981e3cda61d55621680f1b3278b119050c32c33ea3a53dd118b6e507b60552cbada SHA512 f2656af8ca9280524beaa179e93ca40e230957490aab9dbb307a4bc1b924a2a404e4a03d847865584340801fa3b75d09cdb330ad6b5ac890c521511357e6bdc2
 AUX fontforge-20230101-workaround-broken-translations.patch 5219 BLAKE2B 17ead2e7c178911b48de35c6c86ce60b486a000c05ea5d11e79094851b9e4e68e32335a33ef2b49aeaf0fb161b3823e35f1b281feae426b9b69baabb35c5e02c SHA512 250850a8345511b222faeb7cf6209d412611491a5c9d83f7ad14408b1936059c4fe52cbe834b5d26579281539156b93e692bd8873aea445f23b5d78a0e1684f8
 AUX fontforge-doc-no-warn-error.patch 834 BLAKE2B c8bd1cfcf320b7831cc64d67d8de52b37e2f37bbac91d5df709d23e144ae33ec02907606348185eac7030f5151719e0023c0d9fda5395334a15c56f7174151c4 SHA512 6055f1696f1910e81ab1b84b48d336c1a097b53618a3a960e8ce2aeb57e05ad364848d48082b792cd4d5cc85fc95947cddd2e04e7a98c5ceb6f9ced14bd4e674
 DIST fontforge-20230101.tar.xz 13761728 BLAKE2B 69e79e7c5d8b551a847ba8706157b0f559ae2a85f61711f50e4855eb6a177bbfb25de2650caf9bc8a7dd1d6af074ca5063519b2f3c151d8c784c4750c6ddc1d8 SHA512 7684a2824d5199e230d2e0a654c2119cef422a57b64e6dd75afde6ba623abed6581f596fd5b7509e03f3b3ad3cf69629aafd4c85aeda64fa91a9e1ab88c9b418
-EBUILD fontforge-20230101-r1.ebuild 2960 BLAKE2B 5988bbdb0fa1bdd86808ddda887a707d9501581da7c5fa7e88f8b80bdd51217624194411ca2aa1a9b575a85a5a5ad2db116a283423257274319fc9b5097809f4 SHA512 afc00739a406af802cc5a813ff89fdd937b470f1dd1651bb203a5c5feda2d408d8e1cb3c821d3ab000984bb93a3da08e40c5cf15a7cfb9be731837188515459d
-EBUILD fontforge-20230101.ebuild 2877 BLAKE2B 838d3272eaca260bd5728ecdb6a5f69c3ce5fdbb18432529ff2f536951265d646f7c7ca39bad7c5bb7ec57aaeb312492d7537013d466f263efcd2eedb235bdb3 SHA512 f75fd950ed8e356d09467a6b46980dfba2351239b111a8bf89d17d59167172c5ae3eb0f0254ec86831a4b90dbb9157dd4ef30a154f4b1158bb53e8ed7de2c0c9
+EBUILD fontforge-20230101-r2.ebuild 3011 BLAKE2B 49c30e7483178dc2a6f09d9bbd317884ccb8a97bb445a1c413ba7491d4a53c580618e48533866de8f0ea8537b0ceb12e29bcfd8e8bc3512d393861476dd9614d SHA512 c90c7b91b32182ff4582bd45bf964e3b77ec50192e9b8f7b4cf767b5de9b751ee256daba6c53e29a248b3fae4a35885b9f54da797f62f5167d465c377dc6e494
+EBUILD fontforge-20230101.ebuild 2871 BLAKE2B 73222de5952852ae971d0fc098b13463a8803ee7caad2c8394e797e1d694b9d2641b5b24402482237aea904daffa7e7f1b0fee05a6269dd4435c4fae2838f7b8 SHA512 ee15b4f0ed8449d106caf9d3f04319f354ed0c6de8f1587cfc2f5c929c18e5bebf5d5bdd7cc43231f087bf1613a28834f2cb347c023f958c42acaeaead024686
 MISC metadata.xml 863 BLAKE2B 6a87762712128bf3d57122277839008c4ef057491ae1c1680a166194037ed00e66816f2c0c09be8a17909843ad49b807c06405b95332684dbee3b8d60d30d7ae SHA512 8f33c7d38f031fbf85c82b9743db80c2a3c85ddddeb4deb631fbb911a8e6c2e97b43560b82539ac93df0c577abe74ef743fd4ca1a3e2e2f978b7edfd94cba280
diff --git a/media-gfx/fontforge/files/fontforge-20230101-python3.12-distutils-no-more.patch b/media-gfx/fontforge/files/fontforge-20230101-python3.12-distutils-no-more.patch
new file mode 100644
index 000000000000..c140e7d19955
--- /dev/null
+++ b/media-gfx/fontforge/files/fontforge-20230101-python3.12-distutils-no-more.patch
@@ -0,0 +1,20 @@
+https://bugs.gentoo.org/933392
+https://github.com/fontforge/fontforge/pull/5423
+
+From 24968a8bf713396bc4a5dbb8bf3a03a9479b2568 Mon Sep 17 00:00:00 2001
+From: Maxim Iorsh <iorsh@users.sourceforge.net>
+Date: Fri, 24 May 2024 16:48:47 +0300
+Subject: [PATCH 1/3] Use sysconfig for Python module locations
+
+--- a/pyhook/CMakeLists.txt
++++ b/pyhook/CMakeLists.txt
+@@ -21,7 +21,7 @@ target_link_libraries(psMat_pyhook PRIVATE Python3::Module)
+ # So do it ourselves, getting the prefix-relative path instead
+ if(NOT DEFINED PYHOOK_INSTALL_DIR)
+   execute_process(
+-    COMMAND "${Python3_EXECUTABLE}" -c "import distutils.sysconfig as sc; print(sc.get_python_lib(prefix='', plat_specific=True,standard_lib=False))"
++    COMMAND "${Python3_EXECUTABLE}" -c "import sysconfig as sc; print(sc.get_path('platlib', sc.get_preferred_scheme('user'), vars={'userbase': '.'}))"
+     RESULT_VARIABLE _pyhook_install_dir_result
+     OUTPUT_VARIABLE PYHOOK_INSTALL_DIR
+     OUTPUT_STRIP_TRAILING_WHITESPACE)
+
diff --git a/media-gfx/fontforge/fontforge-20230101-r1.ebuild b/media-gfx/fontforge/fontforge-20230101-r2.ebuild
index 261c8f986c79..4cea5afc1294 100644
--- a/media-gfx/fontforge/fontforge-20230101-r1.ebuild
+++ b/media-gfx/fontforge/fontforge-20230101-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/fontforge/fontforge/releases/download/${PV}/${P}.tar
 
 LICENSE="BSD GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="doc truetype-debugger gif gtk jpeg png +python readline test tiff svg woff2 X"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
@@ -54,6 +54,7 @@ PATCHES=(
 	"${FILESDIR}"/fontforge-doc-no-warn-error.patch
 	"${FILESDIR}"/${PN}-20230101-workaround-broken-translations.patch
 	"${FILESDIR}"/${PN}-20230101-fix-splinefont-shell-command-injection.patch
+	"${FILESDIR}"/${PN}-20230101-python3.12-distutils-no-more.patch
 )
 
 pkg_setup() {
diff --git a/media-gfx/fontforge/fontforge-20230101.ebuild b/media-gfx/fontforge/fontforge-20230101.ebuild
index f9af4d4aad6b..6f28a05358ee 100644
--- a/media-gfx/fontforge/fontforge-20230101.ebuild
+++ b/media-gfx/fontforge/fontforge-20230101.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/fontforge/fontforge/releases/download/${PV}/${P}.tar
 
 LICENSE="BSD GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="doc truetype-debugger gif gtk jpeg png +python readline test tiff svg woff2 X"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/media-gfx/fotema/Manifest b/media-gfx/fotema/Manifest
new file mode 100644
index 000000000000..ed7ba3f789d2
--- /dev/null
+++ b/media-gfx/fotema/Manifest
@@ -0,0 +1,7 @@
+DIST fotema-1.14.2.tar.xz 78468972 BLAKE2B 59974a873381dd40cf80f274bb2fcd3763fbf946f168491e25f76f56c1646754b7cf49dd174a25726133fd774d04a9cee370c81d3c01f9d276e588d42b232f82 SHA512 27d96b0a47e312b2a7674f140646f24785dbfae47ea1bde74630fbb979946f23b1e1f5fab5ba20edb38ef91790003e138dcf4043ff371e3bf458c691dfd2db56
+DIST fotema-1.14.3.tar.xz 78412372 BLAKE2B 821ebb70e14e3e0d1a72ab712ecfe50da2299c2050593af0d6c64a2fc04ae904d56a4448fbcc022e9c7b1604e7a7ed8e55d8cba34aae4f1e6023fdea221a1c6d SHA512 461b84de9b4636cfed2d4e5132e18c831341cbddf8decfc856f85fa18fa7e4ead9d4d210a6795e077f7b7532aca51fc7835cd648cd9d7f7d8f9cc17e18b1f7e6
+DIST fotema-1.14.4.tar.xz 78458268 BLAKE2B 4f8cc8f1ba3df27eca16b41e11ae947fe15b83321bc2da23f01a16012d862999a0cf6572353bc74cf2868a91404b199712b4f4d9df63ed87970469d57bb5be16 SHA512 189638c8d7e4466b1318ec06324cd1bfb3eaa36b9b7116b7e44a654d4cd09fb38961c0a5fa02469180f66844614555773e2306becd590eb7b8ba8fb074e9c3cc
+EBUILD fotema-1.14.2-r1.ebuild 1688 BLAKE2B 765c563f6e95998ef1f2557ae3044f01e12f1cf896cda117ab0c4cdfa9a1eabb8ee0f43c4e94aa4e52dd296922a6e3ca64e11c0fa1bb8062256ec0843eaee83e SHA512 ead13df6fcf02f163f97a8b13797208b048c5461bd9dd7183368da836ebb60c6ccf39f0cfdc334fc4ecfcbbabade7a4b10e512e89912e1047a7ddc05cf0edfbf
+EBUILD fotema-1.14.3.ebuild 1688 BLAKE2B 765c563f6e95998ef1f2557ae3044f01e12f1cf896cda117ab0c4cdfa9a1eabb8ee0f43c4e94aa4e52dd296922a6e3ca64e11c0fa1bb8062256ec0843eaee83e SHA512 ead13df6fcf02f163f97a8b13797208b048c5461bd9dd7183368da836ebb60c6ccf39f0cfdc334fc4ecfcbbabade7a4b10e512e89912e1047a7ddc05cf0edfbf
+EBUILD fotema-1.14.4.ebuild 1688 BLAKE2B 765c563f6e95998ef1f2557ae3044f01e12f1cf896cda117ab0c4cdfa9a1eabb8ee0f43c4e94aa4e52dd296922a6e3ca64e11c0fa1bb8062256ec0843eaee83e SHA512 ead13df6fcf02f163f97a8b13797208b048c5461bd9dd7183368da836ebb60c6ccf39f0cfdc334fc4ecfcbbabade7a4b10e512e89912e1047a7ddc05cf0edfbf
+MISC metadata.xml 326 BLAKE2B 4ae1a2fadba80e1886d73fb01d493fbbaabae2b97dbffaa10d46e0dbec690e3cb6f8e604675aeb9d0167e50d53cb3f1ffcc2d2ec6c6aed14c36acfe8d6bc31bb SHA512 1f8f3199af710dd344962c425a5af0936be2f52cb41123bee1aba249c356c5c0cb74f3ac6ff7f0fdf71a7e6f8552269abb20cda7d6685e3f21fd5e95436bf552
diff --git a/media-gfx/fotema/fotema-1.14.2-r1.ebuild b/media-gfx/fotema/fotema-1.14.2-r1.ebuild
new file mode 100644
index 000000000000..34219ad68ea2
--- /dev/null
+++ b/media-gfx/fotema/fotema-1.14.2-r1.ebuild
@@ -0,0 +1,89 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cargo gnome2-utils meson xdg-utils
+
+DESCRIPTION="Photo gallery for Linux"
+HOMEPAGE="https://github.com/blissd/fotema"
+SRC_URI="
+	https://github.com/blissd/fotema/releases/download/v${PV}/${P}.tar.xz
+"
+
+# see LICENSES/
+LICENSE="
+	CC-BY-2.0 CC-BY-4.0 CC-BY-NC-SA-4.0 CC-BY-SA-4.0 CC0-1.0
+	FDL-1.3+ GPL-3+ MIT
+"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="
+	>=dev-libs/glib-2.66:2
+	>=gui-libs/gtk-4.0.0:4
+"
+# indirect deps via crates
+DEPEND+="
+	dev-libs/openssl:=
+	gui-libs/libadwaita
+	media-libs/fontconfig
+	media-libs/graphene
+	media-libs/lcms:2
+	media-libs/libshumate:=
+	media-libs/opencv:=[contribdnn]
+	media-video/ffmpeg:=
+	sci-libs/onnx
+	sys-libs/libseccomp
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/pango
+"
+RDEPEND="
+	${DEPEND}
+	media-libs/glycin-loaders
+"
+BDEPEND="
+	dev-libs/glib:2
+"
+
+ECARGO_VENDOR=${S}/vendor
+
+QA_FLAGS_IGNORED="/usr/bin/fotema"
+
+src_prepare() {
+	default
+
+	# patch the dependency on flatpak-spawn out (sigh)
+	find "${S}"/{core,src} -name '*.rs' \
+		-exec sed -i -e '/FlatpakSpawn/d' {} + || die
+}
+
+src_configure() {
+	cat >> "${ECARGO_HOME}/config.toml" <<-EOF || die
+
+		[source."git+https://github.com/blissd/rust-faces.git?branch=patch"]
+		git = "https://github.com/blissd/rust-faces.git"
+		branch = "patch"
+		replace-with = "gentoo"
+	EOF
+
+	local emesonargs=(
+		-Dprofile=$(usex debug development default)
+	)
+
+	meson_src_configure
+	ln -s "${CARGO_HOME}" "${BUILD_DIR}/cargo-home" || die
+
+	export ORT_STRATEGY=system
+}
+
+pkg_postinst() {
+	gnome2_schemas_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_schemas_update
+	xdg_icon_cache_update
+}
diff --git a/media-gfx/fotema/fotema-1.14.3.ebuild b/media-gfx/fotema/fotema-1.14.3.ebuild
new file mode 100644
index 000000000000..34219ad68ea2
--- /dev/null
+++ b/media-gfx/fotema/fotema-1.14.3.ebuild
@@ -0,0 +1,89 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cargo gnome2-utils meson xdg-utils
+
+DESCRIPTION="Photo gallery for Linux"
+HOMEPAGE="https://github.com/blissd/fotema"
+SRC_URI="
+	https://github.com/blissd/fotema/releases/download/v${PV}/${P}.tar.xz
+"
+
+# see LICENSES/
+LICENSE="
+	CC-BY-2.0 CC-BY-4.0 CC-BY-NC-SA-4.0 CC-BY-SA-4.0 CC0-1.0
+	FDL-1.3+ GPL-3+ MIT
+"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="
+	>=dev-libs/glib-2.66:2
+	>=gui-libs/gtk-4.0.0:4
+"
+# indirect deps via crates
+DEPEND+="
+	dev-libs/openssl:=
+	gui-libs/libadwaita
+	media-libs/fontconfig
+	media-libs/graphene
+	media-libs/lcms:2
+	media-libs/libshumate:=
+	media-libs/opencv:=[contribdnn]
+	media-video/ffmpeg:=
+	sci-libs/onnx
+	sys-libs/libseccomp
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/pango
+"
+RDEPEND="
+	${DEPEND}
+	media-libs/glycin-loaders
+"
+BDEPEND="
+	dev-libs/glib:2
+"
+
+ECARGO_VENDOR=${S}/vendor
+
+QA_FLAGS_IGNORED="/usr/bin/fotema"
+
+src_prepare() {
+	default
+
+	# patch the dependency on flatpak-spawn out (sigh)
+	find "${S}"/{core,src} -name '*.rs' \
+		-exec sed -i -e '/FlatpakSpawn/d' {} + || die
+}
+
+src_configure() {
+	cat >> "${ECARGO_HOME}/config.toml" <<-EOF || die
+
+		[source."git+https://github.com/blissd/rust-faces.git?branch=patch"]
+		git = "https://github.com/blissd/rust-faces.git"
+		branch = "patch"
+		replace-with = "gentoo"
+	EOF
+
+	local emesonargs=(
+		-Dprofile=$(usex debug development default)
+	)
+
+	meson_src_configure
+	ln -s "${CARGO_HOME}" "${BUILD_DIR}/cargo-home" || die
+
+	export ORT_STRATEGY=system
+}
+
+pkg_postinst() {
+	gnome2_schemas_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_schemas_update
+	xdg_icon_cache_update
+}
diff --git a/media-gfx/fotema/fotema-1.14.4.ebuild b/media-gfx/fotema/fotema-1.14.4.ebuild
new file mode 100644
index 000000000000..34219ad68ea2
--- /dev/null
+++ b/media-gfx/fotema/fotema-1.14.4.ebuild
@@ -0,0 +1,89 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cargo gnome2-utils meson xdg-utils
+
+DESCRIPTION="Photo gallery for Linux"
+HOMEPAGE="https://github.com/blissd/fotema"
+SRC_URI="
+	https://github.com/blissd/fotema/releases/download/v${PV}/${P}.tar.xz
+"
+
+# see LICENSES/
+LICENSE="
+	CC-BY-2.0 CC-BY-4.0 CC-BY-NC-SA-4.0 CC-BY-SA-4.0 CC0-1.0
+	FDL-1.3+ GPL-3+ MIT
+"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="
+	>=dev-libs/glib-2.66:2
+	>=gui-libs/gtk-4.0.0:4
+"
+# indirect deps via crates
+DEPEND+="
+	dev-libs/openssl:=
+	gui-libs/libadwaita
+	media-libs/fontconfig
+	media-libs/graphene
+	media-libs/lcms:2
+	media-libs/libshumate:=
+	media-libs/opencv:=[contribdnn]
+	media-video/ffmpeg:=
+	sci-libs/onnx
+	sys-libs/libseccomp
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/pango
+"
+RDEPEND="
+	${DEPEND}
+	media-libs/glycin-loaders
+"
+BDEPEND="
+	dev-libs/glib:2
+"
+
+ECARGO_VENDOR=${S}/vendor
+
+QA_FLAGS_IGNORED="/usr/bin/fotema"
+
+src_prepare() {
+	default
+
+	# patch the dependency on flatpak-spawn out (sigh)
+	find "${S}"/{core,src} -name '*.rs' \
+		-exec sed -i -e '/FlatpakSpawn/d' {} + || die
+}
+
+src_configure() {
+	cat >> "${ECARGO_HOME}/config.toml" <<-EOF || die
+
+		[source."git+https://github.com/blissd/rust-faces.git?branch=patch"]
+		git = "https://github.com/blissd/rust-faces.git"
+		branch = "patch"
+		replace-with = "gentoo"
+	EOF
+
+	local emesonargs=(
+		-Dprofile=$(usex debug development default)
+	)
+
+	meson_src_configure
+	ln -s "${CARGO_HOME}" "${BUILD_DIR}/cargo-home" || die
+
+	export ORT_STRATEGY=system
+}
+
+pkg_postinst() {
+	gnome2_schemas_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_schemas_update
+	xdg_icon_cache_update
+}
diff --git a/media-gfx/raw-thumbnailer/metadata.xml b/media-gfx/fotema/metadata.xml
index 987c50f39bce..d5e5775afa5a 100644
--- a/media-gfx/raw-thumbnailer/metadata.xml
+++ b/media-gfx/fotema/metadata.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
 	<upstream>
-		<remote-id type="google-code">raw-thumbnailer</remote-id>
-		<remote-id type="github">erlendd/raw-thumbnailer</remote-id>
+		<remote-id type="github">blissd/fotema</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/media-gfx/fotocx/Manifest b/media-gfx/fotocx/Manifest
index 618b212626bc..b2b8c915d0ce 100644
--- a/media-gfx/fotocx/Manifest
+++ b/media-gfx/fotocx/Manifest
@@ -1,6 +1,12 @@
 AUX fotocx-24.20-documentation.patch 1373 BLAKE2B ac442711ae3eea89f1fa7a272004a0eda1857f4b4fd2f4045d794093bcfb81c16702039b578bef9768e9af503a126cabb62ed91bda384f64a4765efa73666f26 SHA512 17090677f4f726d6b0d5f2c14b76963e9090dffcd3773b02f66e6a87a6c7f9afe6f2c7060f2e375fb37a191c1846287b37f482f8efa78a84c2d381a50fcda751
 DIST fotocx-24.21-source.tar.gz 16618357 BLAKE2B 43029d080cc843a03475b474c0807e0f2192bc6c64d20c5d41e90218f0b1f88db48aefb7622e8b521f06792a57a9d685d9c57107a309becc39d710ff5aa720a3 SHA512 2945fbaab800a115a1e0c718019ee1e66816cadf794a01db4f8238e7ba74ea033b6e9f24b4e42fe8105242f6df8861de7b00d32e81aae73577f5aa7f38c07f7f
 DIST fotocx-24.30-source.tar.gz 16103870 BLAKE2B 3261b9f4fb0345b37b146e443216e21d57ab9b11a1b77be9b9d94247cc8ae74442b75219fbf3d12f67ba16cee0cf772d3ba83d9e2b5ae38ddbbfd5bd42ea9c52 SHA512 39a4c8526e8fe7e49f4c85953e843243577b9a5b34b89030c452336f51c0ca6e381c38ba60ee39e6ee58b528d824240a821487e5e95a04dd44dabfe38e43f131
+DIST fotocx-24.40-source.tar.gz 16036394 BLAKE2B 570adb3b8579650caa985417008f8eb840b2a29c5355ae3ecb3b2a8e58432ec6688da72d3d3eed98d7f5c046d1cf1fc56049684db5ccd9de6fb3f2dee789ea4f SHA512 28211fa50d48eaee4f4bcaa80a07a34113e3020e8b0e3ef2fe983b93000c2397b41fabb1824dd1921e964d03acd348ef5479e584268052ade120e23639f138ed
+DIST fotocx-24.50-source.tar.gz 16197289 BLAKE2B 468a3cd7ef2cee5a65d2a06283732e0994f9eeb823ed2fd02e319c68f7cb4686a33fbc61e85eaeb8bdd2c7455d1cebada49d0da6004007ad15333b1c39050768 SHA512 3f30b4efb43313980a1be8b92e66c8260484e10a3e50c5351d5462004fe6e5685ecd39be263fbd85bde495a5f1c539bd262124478516d8ddcd40420fa6de699e
+DIST fotocx-24.60-source.tar.gz 15771741 BLAKE2B 89ab212cdaeb414637ad0b3c9833b0caea6c805422e3fccdd027912f1d32ed141cedaeb5826212e36e5b40591e40c85816ecc5d3cff7915693e11e78b962b890 SHA512 6a04e0d749865000b67497b897f691a5882c0d63dda8c64ffe824215582db051f9cc0ca528490112f26db41a58f1673affe2e2e55c90dbb9e6f24cef77e4d5d6
 EBUILD fotocx-24.21-r1.ebuild 2288 BLAKE2B ab74c6ef40f963dc17b665783e0bfb9b72db4d2d2aa3aedd3d9c11f01cbd6c9bc06edbfdb7e7b060b4a2e9967ef6cf500e568ee0b13f0e77ab4b772d550ec075 SHA512 e4908a812733f629ee52d4116e9784205517992fb18f419e5eb8013614f8ce054ba36f190117c48b0114d658d93c634556ed3b0ab98d28394bc165ee2b23ba0b
 EBUILD fotocx-24.30.ebuild 2290 BLAKE2B ac644a95e6ef44d930373708544b28a9d75b00358c3e77be36bfaac5e8140f86a3815778e39efce0cb0676bda2d0bfb3d0a3edf8d58494c0f4391dee155e251a SHA512 bfa7e82236c754371ff92bdfa4db7804bb685b26bee97852d38c6be8b3f43e95ecb1f925ca30629470bebeaf0aa9e0eafee54975cefab45aadce7371621f998a
+EBUILD fotocx-24.40.ebuild 2288 BLAKE2B ab74c6ef40f963dc17b665783e0bfb9b72db4d2d2aa3aedd3d9c11f01cbd6c9bc06edbfdb7e7b060b4a2e9967ef6cf500e568ee0b13f0e77ab4b772d550ec075 SHA512 e4908a812733f629ee52d4116e9784205517992fb18f419e5eb8013614f8ce054ba36f190117c48b0114d658d93c634556ed3b0ab98d28394bc165ee2b23ba0b
+EBUILD fotocx-24.50.ebuild 2288 BLAKE2B ab74c6ef40f963dc17b665783e0bfb9b72db4d2d2aa3aedd3d9c11f01cbd6c9bc06edbfdb7e7b060b4a2e9967ef6cf500e568ee0b13f0e77ab4b772d550ec075 SHA512 e4908a812733f629ee52d4116e9784205517992fb18f419e5eb8013614f8ce054ba36f190117c48b0114d658d93c634556ed3b0ab98d28394bc165ee2b23ba0b
+EBUILD fotocx-24.60.ebuild 2290 BLAKE2B ac644a95e6ef44d930373708544b28a9d75b00358c3e77be36bfaac5e8140f86a3815778e39efce0cb0676bda2d0bfb3d0a3edf8d58494c0f4391dee155e251a SHA512 bfa7e82236c754371ff92bdfa4db7804bb685b26bee97852d38c6be8b3f43e95ecb1f925ca30629470bebeaf0aa9e0eafee54975cefab45aadce7371621f998a
 MISC metadata.xml 851 BLAKE2B a6c60b79fb5646c3bd7d6959d4a1b974ee714bf6ed64f205d9c00d684b3da94672005658336c1c5fcb903605d11c9a5607616151b2f6262f3173e15b8fc44655 SHA512 2794ae92afa076875c7f725969efdcf9cb84435d0ea033adc28f5860a69438b754f4d22b0db27dc7392683439e51b51ae581a6da450719276e8df51a2a306ad9
diff --git a/media-gfx/fotocx/fotocx-24.40.ebuild b/media-gfx/fotocx/fotocx-24.40.ebuild
new file mode 100644
index 000000000000..ace12ae77268
--- /dev/null
+++ b/media-gfx/fotocx/fotocx-24.40.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit optfeature xdg-utils
+
+DESCRIPTION="Program for improving image files made with a digital camera"
+HOMEPAGE="https://kornelix.net/fotocx/fotocx.html"
+SRC_URI="https://kornelix.net/downloads/downloads/${P}-source.tar.gz"
+S="${WORKDIR}/${PN}"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+
+# For required dependencies read doc/README, for required tools read
+# data/userguide [INSTALLATION]. xdg-open (x11-misc/xdg-utils) is an
+# alternative to firefox and chromium-browser. `grep '"which ' * -R`
+# is helpful to report some required tools run via the shell.
+
+DEPEND="
+	media-libs/clutter
+	media-libs/clutter-gtk
+	media-libs/lcms:2
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:=
+	media-libs/tiff:=
+	media-libs/libchamplain[gtk]
+	x11-libs/gtk+:3"
+RDEPEND="
+	${DEPEND}
+	media-gfx/dcraw
+	media-libs/exiftool
+	x11-misc/xdg-utils
+"
+
+PATCHES=( "${FILESDIR}/${PN}-24.20-documentation.patch" )
+
+DOCS=()
+HTML_DOCS=()
+
+src_prepare() {
+	sed -i -e "/^DOCDIR/ s/${PN}$/${PF}/" Makefile || die
+	sed -i -e "/^Icon/ s/\.png$//" ${PN}.desktop || die
+	default
+}
+
+src_install() {
+	# For the Help menu items to work, *.html must be in /usr/share/doc/${PF},
+	# and README, changelog, copyright, license, etc. must not be compressed.
+	emake DESTDIR="${D}" PREFIX="/usr" install
+	rm -f "${D}"/usr/share/doc/${PF}/*.man || die
+	docompress -x /usr/share/doc
+}
+
+pkg_postinst() {
+	optfeature "HEIC & AVIF file support" media-libs/libheif
+	optfeature "additional RAW file support" media-gfx/rawtherapee
+	optfeature "additional RAW file support" media-gfx/darktable
+	optfeature "video thumbnails & playback" media-video/ffmpeg
+	optfeature "copying images to optical media" app-cdr/dvd+rw-tools
+	optfeature "WEBP file support" media-libs/libwebp
+
+	elog
+	elog "Please read the Help > User Guide for details. The source location is"
+	elog "/usr/share/fotocx/data/userguide and after running fotocx a copy will"
+	elog "be placed at /home/<user>/.fotocx/userguide."
+	elog
+	elog "To play videos, in Tools > Preferences set 'Video File Play Command'."
+	elog
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/media-gfx/fotocx/fotocx-24.50.ebuild b/media-gfx/fotocx/fotocx-24.50.ebuild
new file mode 100644
index 000000000000..ace12ae77268
--- /dev/null
+++ b/media-gfx/fotocx/fotocx-24.50.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit optfeature xdg-utils
+
+DESCRIPTION="Program for improving image files made with a digital camera"
+HOMEPAGE="https://kornelix.net/fotocx/fotocx.html"
+SRC_URI="https://kornelix.net/downloads/downloads/${P}-source.tar.gz"
+S="${WORKDIR}/${PN}"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+
+# For required dependencies read doc/README, for required tools read
+# data/userguide [INSTALLATION]. xdg-open (x11-misc/xdg-utils) is an
+# alternative to firefox and chromium-browser. `grep '"which ' * -R`
+# is helpful to report some required tools run via the shell.
+
+DEPEND="
+	media-libs/clutter
+	media-libs/clutter-gtk
+	media-libs/lcms:2
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:=
+	media-libs/tiff:=
+	media-libs/libchamplain[gtk]
+	x11-libs/gtk+:3"
+RDEPEND="
+	${DEPEND}
+	media-gfx/dcraw
+	media-libs/exiftool
+	x11-misc/xdg-utils
+"
+
+PATCHES=( "${FILESDIR}/${PN}-24.20-documentation.patch" )
+
+DOCS=()
+HTML_DOCS=()
+
+src_prepare() {
+	sed -i -e "/^DOCDIR/ s/${PN}$/${PF}/" Makefile || die
+	sed -i -e "/^Icon/ s/\.png$//" ${PN}.desktop || die
+	default
+}
+
+src_install() {
+	# For the Help menu items to work, *.html must be in /usr/share/doc/${PF},
+	# and README, changelog, copyright, license, etc. must not be compressed.
+	emake DESTDIR="${D}" PREFIX="/usr" install
+	rm -f "${D}"/usr/share/doc/${PF}/*.man || die
+	docompress -x /usr/share/doc
+}
+
+pkg_postinst() {
+	optfeature "HEIC & AVIF file support" media-libs/libheif
+	optfeature "additional RAW file support" media-gfx/rawtherapee
+	optfeature "additional RAW file support" media-gfx/darktable
+	optfeature "video thumbnails & playback" media-video/ffmpeg
+	optfeature "copying images to optical media" app-cdr/dvd+rw-tools
+	optfeature "WEBP file support" media-libs/libwebp
+
+	elog
+	elog "Please read the Help > User Guide for details. The source location is"
+	elog "/usr/share/fotocx/data/userguide and after running fotocx a copy will"
+	elog "be placed at /home/<user>/.fotocx/userguide."
+	elog
+	elog "To play videos, in Tools > Preferences set 'Video File Play Command'."
+	elog
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/media-gfx/fotocx/fotocx-24.60.ebuild b/media-gfx/fotocx/fotocx-24.60.ebuild
new file mode 100644
index 000000000000..8eee122865a7
--- /dev/null
+++ b/media-gfx/fotocx/fotocx-24.60.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit optfeature xdg-utils
+
+DESCRIPTION="Program for improving image files made with a digital camera"
+HOMEPAGE="https://kornelix.net/fotocx/fotocx.html"
+SRC_URI="https://kornelix.net/downloads/downloads/${P}-source.tar.gz"
+S="${WORKDIR}/${PN}"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+# For required dependencies read doc/README, for required tools read
+# data/userguide [INSTALLATION]. xdg-open (x11-misc/xdg-utils) is an
+# alternative to firefox and chromium-browser. `grep '"which ' * -R`
+# is helpful to report some required tools run via the shell.
+
+DEPEND="
+	media-libs/clutter
+	media-libs/clutter-gtk
+	media-libs/lcms:2
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:=
+	media-libs/tiff:=
+	media-libs/libchamplain[gtk]
+	x11-libs/gtk+:3"
+RDEPEND="
+	${DEPEND}
+	media-gfx/dcraw
+	media-libs/exiftool
+	x11-misc/xdg-utils
+"
+
+PATCHES=( "${FILESDIR}/${PN}-24.20-documentation.patch" )
+
+DOCS=()
+HTML_DOCS=()
+
+src_prepare() {
+	sed -i -e "/^DOCDIR/ s/${PN}$/${PF}/" Makefile || die
+	sed -i -e "/^Icon/ s/\.png$//" ${PN}.desktop || die
+	default
+}
+
+src_install() {
+	# For the Help menu items to work, *.html must be in /usr/share/doc/${PF},
+	# and README, changelog, copyright, license, etc. must not be compressed.
+	emake DESTDIR="${D}" PREFIX="/usr" install
+	rm -f "${D}"/usr/share/doc/${PF}/*.man || die
+	docompress -x /usr/share/doc
+}
+
+pkg_postinst() {
+	optfeature "HEIC & AVIF file support" media-libs/libheif
+	optfeature "additional RAW file support" media-gfx/rawtherapee
+	optfeature "additional RAW file support" media-gfx/darktable
+	optfeature "video thumbnails & playback" media-video/ffmpeg
+	optfeature "copying images to optical media" app-cdr/dvd+rw-tools
+	optfeature "WEBP file support" media-libs/libwebp
+
+	elog
+	elog "Please read the Help > User Guide for details. The source location is"
+	elog "/usr/share/fotocx/data/userguide and after running fotocx a copy will"
+	elog "be placed at /home/<user>/.fotocx/userguide."
+	elog
+	elog "To play videos, in Tools > Preferences set 'Video File Play Command'."
+	elog
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/media-gfx/freecad/Manifest b/media-gfx/freecad/Manifest
index 78dd65e4ec8b..668f12c09a73 100644
--- a/media-gfx/freecad/Manifest
+++ b/media-gfx/freecad/Manifest
@@ -1,10 +1,18 @@
 AUX freecad-0.21.0-0001-Gentoo-specific-disable-ccache-usage.patch 381 BLAKE2B 2fe05252a4e7846006c5f4e679eae5416ede589b9a6ad5fc30425933bedf933bf586b711c2c7d6a59c3881d454ea76ca39e0556a5a31c3769032694f0858e264 SHA512 731befc86267de4e5fa2caf619a8ae9692580d7025ebc26a80f6744a3104263622c38d87d0d8a263a1a15ef1c1d78c9ff3351aa463a9943941bd7d96d946e516
 AUX freecad-0.21.1-Gentoo-specific-don-t-check-vcs.patch 375 BLAKE2B 27fd88fe3f19ff49e1172f572e2f3f229b91295445190e2d7fd9f8c144c18195dbe853c7cbe79424897116eeedab638802afc438648d377dfcf6ac7f5d9f04bc SHA512 f0c04d302b53295dfacad5408c5de5c8203f673f9e13274b9a1a5787f5b1b649b44e10485416fe661a2ec11e51178c82dff419ab427f4317bc26ecc3d8469bd7
+AUX freecad-0.21.2-boost-175-1.patch 969 BLAKE2B 94e8efec851f0359a611bc95066b53d84a2489bcb45e7e77b1d5c167d033ce69a87853fe3fe56a3addff3305c53f556abb8f1f48727e6bc6a8bc43932ef475c2 SHA512 d012a219a6767449bd458a808dccb03d6b7332235ea7331c1c3178ef053e1c3e5898daed78e99ffc80504c7472c3fc34cfc275fab571b068f1955c3741f0eb65
+AUX freecad-0.21.2-boost-175-2.patch 973 BLAKE2B b9df6cb8d28c08a80387b9374e0eb663e747e4b07509af651c838c3b773242f3e129be07a307f5ed1fef7c4b633143636e1c40105e11d5c184cddfa08954f4f4 SHA512 2ad2137c328930ac9b786535502b16ec76d00b3af3b4c275a54cb00770d9a7ebad8e1a5c6126b6e6095fbac0e7c84c0b2436845bc16141d6f4c3164615a35a9b
+AUX freecad-0.21.2-boost-175-3.patch 1015 BLAKE2B 547338ced16847270e599a2f3111309f28fe52b57a09e0afaaf353336c0b935c6bb37ea26a2402cffd219e3a06ca412cae90d16bfc8a4c8f25b5f0b752249b0f SHA512 abc03f8ae63ce03ab3bdfa9e64b71c7bebe6bc1fd9b576ad06b9b00513b261df3265ed770cca5b017eb13e3d66504eabc6e24996b804de57ddf0cd7749a6fdbd
+AUX freecad-0.21.2-navcube-qt6.patch 1329 BLAKE2B 96eae9bf5af8c041876cf6afd09f2b0dbc12369469ceb6d5c4607fccee8914dfd9b3eef8291ccdc6aded0369a6bcf0fb159dbfb8172b0f7b95324c22310e21f5 SHA512 cc4559599650df261a60c61138063e60880f0cf02d0b9a320d24fc6801a5fe0bfda8db42b58840aa9d99fa86f324a796b5bc8b690f38d0b3ea9718aa9ad08128
+AUX freecad-0.21.2-py312-qt6.patch 7477 BLAKE2B de4b98c4b488045f9810dce124c271d6f4f629922e026f2d4f1efd6c9060b92309db41f8e0f6ebe5e7a27399911ac908cc8935c2501214326dbb1c4b739d46cc SHA512 a1617514ec41fac9b6694ebc81c025cefdd0e35e05be09b0f860c1b6424007116aff153eac71bc16e4c53d9d510f07dda839addc5a90197933cf82eb986e0e6f
+AUX freecad-0.21.2-qtsvg-qt6.patch 7188 BLAKE2B 02284db1b17dc88d0522eb3a726076b9f1ded740fdab1a185e48534c3606c77e51a12690b02bf5e0d9d1f72d1d8389ba84a54cba274200e69b6b10a431bbfdfe SHA512 a0629eed70e042f572876f77d953cee204a226d9d8431c10ed50fcde236d546d869afc623fc1779e891d44d61663cdcb254260f5a78d99aebfb3ac5874152f6e
 AUX freecad-0.21.2-shiboken-6.7.0.patch 306 BLAKE2B 03ddf2bfe249856aec0624054eb9db68c1239e153bff91cab16d04b9dad4c341714eecd338ce90b2f5b4aedf26515dee6390fad1b104189fd3a8cf15556f04fa SHA512 cb7c4d699149b839a2b841d71a7bf2983635ed4e3f93ad25ab97c8dcd616c6e48b9fd4ce0e368ec516edb79794b7a98ebda645f09aada7e41228fc5bca1d8cc1
 AUX freecad-0.21.2-vtk9.3-fix.patch 1065 BLAKE2B d0fccb7c19dc9a5efedb5691a74c6ba62b76afe12ecd4876292478459a895409e9448ad319b05fdff2952e8f031e5e2d1cd08fd279f6c6d38d6136f6a8c7c2ab SHA512 aaf4729ac1623cd73405da82980603e5e4aaacf4fb34751dabaa8cc64e69f91d325c855bc2f23aeaa1f4052848af696e7edadeb144f06ce12775bc4c2333a137
 AUX freecad-9999-Gentoo-specific-don-t-check-vcs.patch 350 BLAKE2B e1b612ac81f73546a3a7ae93e447aba6e3f28dea1292f5d308f567307c8c6146b8dfdcc1cef946c64991d41c41fa9c8949f56e2e8573833bad2a3826bab960ba SHA512 f96678dbfe13668a9f65131996ddc5eb2cbe80296b7eb2cc7d248e3ee1d991bea95568b0241da8387106812aac5762c330afb1d8c38b2281c3ee2600db120627
 AUX freecad-9999-tests-src-Qt-only-build-test-for-BUILD_GUI-ON.patch 469 BLAKE2B 23e56fbc49b3c3d5ede85e6ec15d26c88c93590fce105e0b75e8b0bd3fee125c500cd59d8db0144c610edb371df318396e056333ec7a411f7647b38d18006efc SHA512 82737af95603ff1f667bf49ee43b85b411eeeb5fd9b577ad7fca6e02bcbfda5c3bbb6c70386e5f69d2181d6226574f82cb68b7e66dfe8f4bb14d946f594582cf
 DIST freecad-0.21.2.tar.gz 66124278 BLAKE2B 84a4f8008192cd1a2ee1737b537b2668a8c028aa8c8645e6e412ab9ef79bf3bdd2cb73d96fcfd2dbcff613cdcc59cbab95821406acdc9cd7d4eb4636c081be78 SHA512 bd7e9029b24d49ac0955797bcdbea1fd0826bdf9ab246135366dfc35b427004f103acccfc66d008e3ab3928f99e04200e335908a03166545554e2d3e969ae0f5
-EBUILD freecad-0.21.2-r2.ebuild 12004 BLAKE2B 7e1aca04cdbcca67a8c97c01dc2ef8d403b290425ebbcc24e370e002d798632c0db4f17a0eea0397c436cdda5e19bd70aa54c4c3d46199feed852a5a850a40ab SHA512 5807cc63ce7c2a4093a56141f09eceafa51148a4064a0e9cc328843b15c9adc6de676c7fd0d34927d532109ea1e1e5ce8a2217cbe17b0b36131fb8be9e2867f7
-EBUILD freecad-9999.ebuild 11959 BLAKE2B 4cdbc244f96230ec1e5a75559d07759f22fe89423ea03201351c26527c02e783e15fcfa9b31ca74e0adaeb2857468df5d17e1545bd49ec5cf98e8dcdc7792882 SHA512 64fd48c2520088aa4d5d60b026d35e23344ab7337f5167c369f952cebe25a3505d93b1c5cea1800fac1addeb8e64ff303f3042f4762118db86f25cf375e2a57e
-MISC metadata.xml 3190 BLAKE2B 5f8776248055147c9b2a308913e1d3476ad27b5a3b7795b4fdf15b4d7f10451d6f5ce16ab1ef691daedd74f02fa12efb6341a7ec10456786c427d7707948fdbc SHA512 2163a91c7f7ec97acf81e7c4a2481667388fb43f60ee48d40a09c9bebfebffa8a807ff275385d8dcbefefe16c51bc9de3c07c84d92344f968985693117007042
+DIST freecad-1.0_rc1.tar.gz 88552055 BLAKE2B 3e2607d87da86edd35c05abba0d7085bed7fc42f9831c7e2451e028b3ce267c7a1e44b82c9a51bdfc736b5c98198030aafb81a7ae5df158ae17bc5afe2df44e0 SHA512 1d0a0d131c35ee03b435a0b901cb56c8e98ce2dd62ff5102856b3777dfc6d3bfba6ff4ea87e8c8949640bd14fdb775db3e9eb9a8b6530dd1f86a903037c95dba
+EBUILD freecad-0.21.2-r3.ebuild 12437 BLAKE2B c9c9a77f7b7b0aadee67b3fb2aa6ac13da06bcc790e4291e6413826b246a92052f535962c974654646c79a481378b99582d2499b134d57b76cbcad4056fc2fc7 SHA512 c68c9f9a7d106ac48ddf280f716cd73398693e058e8c475d912e61d43466e80041d60847efa2cd5d022d1ac59d1057c14c61943c2eb3ce68032d232b29469c08
+EBUILD freecad-1.0_rc1-r1.ebuild 12190 BLAKE2B ebf30aa49c035b2f28c47aa7c3605a385362be05c4b41f0b28263ca4d767ac163fa060d9233807da74a9e0e34f5fee89a2caeb2ff667f7e57886bb70abba162b SHA512 f24586c3a0649e858b3ba207bc4e1e296923dbb395a9f3485ce7d2397452378bf0794a52d5328ea3f085e5488f4bf440d7a738c92c175fe03fd0462a49beba9e
+EBUILD freecad-9999.ebuild 12031 BLAKE2B 78658e5e82277458b1ac79e9f440ee2f916b4c83eb53d63d488716593bb912f6cd5221257f2dac1f5831afe03ffd4a4909a9b53a0c56978dace9da420934b51c SHA512 78f72d0af06c4292ea48e715ac406a01b99f9ebc645840ef76594c584a92e3a5d0489b865689f195e677c8f26cbe6c5a2fcddb3ff11f8c844dc6e629738205b6
+MISC metadata.xml 3255 BLAKE2B d9504bdcdbf11f8475f764ef03927314f2d57d69d1229cb5aab93872d28686d13ad6c8e5a680b49af9e63c7352d0fd2b93f798761d67b30bee2450e0fec052f9 SHA512 f030e226befb1a66723275cbff560d528915d0a749fe70a04ab73ba9016bcdc0127f4e3c9543a0f72bf0d59f624eda88d93a3968af112b20338b9d2c03903b34
diff --git a/media-gfx/freecad/files/freecad-0.21.2-boost-175-1.patch b/media-gfx/freecad/files/freecad-0.21.2-boost-175-1.patch
new file mode 100644
index 000000000000..cbb78d5bdc94
--- /dev/null
+++ b/media-gfx/freecad/files/freecad-0.21.2-boost-175-1.patch
@@ -0,0 +1,22 @@
+From f555a25f9e67e628e8075fc8599d7c11807eaddd Mon Sep 17 00:00:00 2001
+From: wmayer <wmayer@users.sourceforge.net>
+Date: Sun, 21 Apr 2024 08:36:16 +0200
+Subject: [PATCH] Fixes #13549: smesh doesn't compile with boost 1.85
+
+---
+ src/3rdParty/salomesmesh/src/SMESH/DriverGMF.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/3rdParty/salomesmesh/src/SMESH/DriverGMF.cpp b/src/3rdParty/salomesmesh/src/SMESH/DriverGMF.cpp
+index d72ff2363f39..f108cbbcb2cf 100644
+--- a/src/3rdParty/salomesmesh/src/SMESH/DriverGMF.cpp
++++ b/src/3rdParty/salomesmesh/src/SMESH/DriverGMF.cpp
+@@ -55,7 +55,7 @@ namespace DriverGMF
+ 
+   bool isExtensionCorrect( const std::string& fileName )
+   {
+-    std::string ext  = boost::filesystem::extension(fileName);
++    std::string ext = boost::filesystem::path(fileName).extension().string();
+     switch ( ext.size() ) {
+     case 5: return ( ext == ".mesh" || ext == ".solb" );
+     case 6: return ( ext == ".meshb" );
diff --git a/media-gfx/freecad/files/freecad-0.21.2-boost-175-2.patch b/media-gfx/freecad/files/freecad-0.21.2-boost-175-2.patch
new file mode 100644
index 000000000000..5f0807028859
--- /dev/null
+++ b/media-gfx/freecad/files/freecad-0.21.2-boost-175-2.patch
@@ -0,0 +1,22 @@
+From aa54ba73df4d42878130c99688be35acf10725a0 Mon Sep 17 00:00:00 2001
+From: ppphp <kevinniub@gmail.com>
+Date: Sat, 30 Mar 2024 13:52:32 +0800
+Subject: [PATCH] fix: c++20 deprecate copy_option
+
+---
+ src/Gui/PreferencePackManager.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/Gui/PreferencePackManager.cpp b/src/Gui/PreferencePackManager.cpp
+index e0e6184a3147..e1773a436852 100644
+--- a/src/Gui/PreferencePackManager.cpp
++++ b/src/Gui/PreferencePackManager.cpp
+@@ -224,7 +224,7 @@ void Gui::PreferencePackManager::importConfig(const std::string& packName,
+     auto savedPreferencePacksDirectory =
+         fs::path(App::Application::getUserAppDataDir()) / "SavedPreferencePacks";
+     auto cfgFilename = savedPreferencePacksDirectory / packName / (packName + ".cfg");
+-    fs::copy_file(path, cfgFilename, fs::copy_option::overwrite_if_exists);
++    fs::copy_file(path, cfgFilename, fs::copy_options::overwrite_existing);
+     rescan();
+ }
+ 
diff --git a/media-gfx/freecad/files/freecad-0.21.2-boost-175-3.patch b/media-gfx/freecad/files/freecad-0.21.2-boost-175-3.patch
new file mode 100644
index 000000000000..c4c8039dab49
--- /dev/null
+++ b/media-gfx/freecad/files/freecad-0.21.2-boost-175-3.patch
@@ -0,0 +1,25 @@
+From 91457bbdee2422c7f0372688cf72d021cf222073 Mon Sep 17 00:00:00 2001
+From: ppphp <kevinniub@gmail.com>
+Date: Sat, 30 Mar 2024 19:17:56 +0800
+Subject: [PATCH] add version check macro for compatibility
+
+---
+ src/Gui/PreferencePackManager.cpp | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/Gui/PreferencePackManager.cpp b/src/Gui/PreferencePackManager.cpp
+index e1773a436852..dfc54240c00c 100644
+--- a/src/Gui/PreferencePackManager.cpp
++++ b/src/Gui/PreferencePackManager.cpp
+@@ -224,7 +224,11 @@ void Gui::PreferencePackManager::importConfig(const std::string& packName,
+     auto savedPreferencePacksDirectory =
+         fs::path(App::Application::getUserAppDataDir()) / "SavedPreferencePacks";
+     auto cfgFilename = savedPreferencePacksDirectory / packName / (packName + ".cfg");
++#if BOOST_VERSION >= 107400
+     fs::copy_file(path, cfgFilename, fs::copy_options::overwrite_existing);
++#else
++    fs::copy_file(path, cfgFilename, fs::copy_option::overwrite_if_exists);
++#endif
+     rescan();
+ }
+ 
diff --git a/media-gfx/freecad/files/freecad-0.21.2-navcube-qt6.patch b/media-gfx/freecad/files/freecad-0.21.2-navcube-qt6.patch
new file mode 100644
index 000000000000..0ab999771068
--- /dev/null
+++ b/media-gfx/freecad/files/freecad-0.21.2-navcube-qt6.patch
@@ -0,0 +1,29 @@
+From ccaee18917432fd02e4371a7847bdfaf0692edd1 Mon Sep 17 00:00:00 2001
+From: Martin Rodriguez Reboredo <yakoyoku@gmail.com>
+Date: Sun, 19 May 2024 23:23:45 -0300
+Subject: [PATCH] Gui: Fix NaviCube for Qt6
+
+---
+ src/Gui/NaviCube.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/Gui/NaviCube.cpp b/src/Gui/NaviCube.cpp
+index 2d164f196b3c..9e3a62d66c81 100644
+--- a/src/Gui/NaviCube.cpp
++++ b/src/Gui/NaviCube.cpp
+@@ -926,6 +926,7 @@ NaviCubeImplementation::PickId NaviCubeImplementation::pickFace(short x, short y
+     GLubyte pixels[4] = {0};
+     if (m_PickingFramebuffer && std::abs(x) <= m_CubeWidgetSize / 2 &&
+         std::abs(y) <= m_CubeWidgetSize / 2) {
++        static_cast<QtGLWidget*>(m_View3DInventorViewer->viewport())->makeCurrent();
+         m_PickingFramebuffer->bind();
+ 
+         glViewport(0, 0, m_CubeWidgetSize * 2, m_CubeWidgetSize * 2);
+@@ -936,6 +937,7 @@ NaviCubeImplementation::PickId NaviCubeImplementation::pickFace(short x, short y
+         glReadPixels(2 * x + m_CubeWidgetSize, 2 * y + m_CubeWidgetSize, 1, 1,
+                      GL_RGBA, GL_UNSIGNED_BYTE, &pixels);
+         m_PickingFramebuffer->release();
++        static_cast<QtGLWidget*>(m_View3DInventorViewer->viewport())->doneCurrent();
+     }
+     return pixels[3] == 255 ? static_cast<PickId>(pixels[0]) : PickId::None;
+ }
diff --git a/media-gfx/freecad/files/freecad-0.21.2-py312-qt6.patch b/media-gfx/freecad/files/freecad-0.21.2-py312-qt6.patch
new file mode 100644
index 000000000000..c1fe31ab05ad
--- /dev/null
+++ b/media-gfx/freecad/files/freecad-0.21.2-py312-qt6.patch
@@ -0,0 +1,186 @@
+From 6043c90462e85fbf15e30ea4c7da7d9a22d570f2 Mon Sep 17 00:00:00 2001
+From: wmayer <wmayer@users.sourceforge.net>
+Date: Wed, 7 Feb 2024 15:25:13 +0100
+Subject: [PATCH] Py3.12: harmonize with upstream of PyCXX
+
+---
+ src/CXX/IndirectPythonInterface.cxx         | 36 +++++++++++++++------
+ src/CXX/Python3/IndirectPythonInterface.hxx |  6 ++--
+ src/CXX/Python3/cxx_extensions.cxx          |  2 +-
+ src/CXX/Python3/cxxextensions.c             | 10 ++++++
+ src/CXX/Version.hxx                         |  2 +-
+ 5 files changed, 42 insertions(+), 14 deletions(-)
+
+diff --git a/src/CXX/IndirectPythonInterface.cxx b/src/CXX/IndirectPythonInterface.cxx
+index 3d810cea88a5..fc9e45cbd64f 100644
+--- a/src/CXX/IndirectPythonInterface.cxx
++++ b/src/CXX/IndirectPythonInterface.cxx
+@@ -122,17 +122,21 @@ static PyTypeObject *ptr__Bytes_Type = NULL;
+ #  endif
+ 
+ #  if PY_MAJOR_VERSION == 2 || !defined( Py_LIMITED_API )
++#    if PY_MAJOR_VERSION == 2 || (PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION <= 11)
+ static int *ptr_Py_DebugFlag = NULL;
+ static int *ptr_Py_InteractiveFlag = NULL;
+ static int *ptr_Py_OptimizeFlag = NULL;
+ static int *ptr_Py_NoSiteFlag = NULL;
+ static int *ptr_Py_VerboseFlag = NULL;
++#    endif
+ 
+-#   if PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 7
++#    if PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION <= 11
++#      if PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 7
+ static const char **ptr__Py_PackageContext = NULL;
+-#   else
++#      else
+ static char **ptr__Py_PackageContext = NULL;
+-#   endif
++#      endif
++#    endif
+ #  endif
+ 
+ #  ifdef Py_REF_DEBUG
+@@ -242,17 +246,21 @@ bool InitialisePythonIndirectInterface()
+     ptr_Py_RefTotal             = GetInt_as_IntPointer( "_Py_RefTotal" );
+ #  endif
+ #  if PY_MAJOR_VERSION == 2 || !defined( Py_LIMITED_API )
++#    if PY_MAJOR_VERSION == 2 || (PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION <= 11)
+     ptr_Py_DebugFlag            = GetInt_as_IntPointer( "Py_DebugFlag" );
+     ptr_Py_InteractiveFlag      = GetInt_as_IntPointer( "Py_InteractiveFlag" );
+     ptr_Py_OptimizeFlag         = GetInt_as_IntPointer( "Py_OptimizeFlag" );
+     ptr_Py_NoSiteFlag           = GetInt_as_IntPointer( "Py_NoSiteFlag" );
+     ptr_Py_VerboseFlag          = GetInt_as_IntPointer( "Py_VerboseFlag" );
++#    endif
+ 
+-#    if PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 7
++#    if PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION <= 11
++#       if PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 7
+     ptr__Py_PackageContext      = GetConstCharPointer_as_ConstCharPointerPointer( "_Py_PackageContext" );
+-#    else
++#       else
+     ptr__Py_PackageContext      = GetCharPointer_as_CharPointerPointer( "_Py_PackageContext" );
+-#    endif
++#       endif
++#     endif
+ #  endif
+ 
+ #  define PYCXX_STANDARD_EXCEPTION( eclass, bclass )
+@@ -397,17 +405,21 @@ PYCXX_EXPORT PyTypeObject *_Bytes_Type()             { return ptr__Bytes_Type; }
+ //    wrap the Python Flag variables
+ //
+ #  if PY_MAJOR_VERSION == 2 || !defined( Py_LIMITED_API )
++#    if PY_MAJOR_VERSION == 2 || (PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION <= 11)
+ PYCXX_EXPORT int &_Py_DebugFlag()                    { return *ptr_Py_DebugFlag; }
+ PYCXX_EXPORT int &_Py_InteractiveFlag()              { return *ptr_Py_InteractiveFlag; }
+ PYCXX_EXPORT int &_Py_OptimizeFlag()                 { return *ptr_Py_OptimizeFlag; }
+ PYCXX_EXPORT int &_Py_NoSiteFlag()                   { return *ptr_Py_NoSiteFlag; }
+ PYCXX_EXPORT int &_Py_VerboseFlag()                  { return *ptr_Py_VerboseFlag; }
++#    endif
+ #  endif
+ 
+-#  if PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 7
++#  if PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION <= 11
++#    if PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 7
+ PYCXX_EXPORT const char *__Py_PackageContext()       { return *ptr__Py_PackageContext; }
+-#  else
++#    else
+ PYCXX_EXPORT char *__Py_PackageContext()             { return *ptr__Py_PackageContext; }
++#    endif
+ #  endif
+ 
+ #  if 0
+@@ -518,15 +530,19 @@ PYCXX_EXPORT PyTypeObject *_Bytes_Type()             { return &PyBytes_Type; }
+ //    wrap flags
+ //
+ # if PY_MAJOR_VERSION == 2 || !defined( Py_LIMITED_API )
++#    if PY_MAJOR_VERSION == 2 || (PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION <= 11)
+ PYCXX_EXPORT int &_Py_DebugFlag()                    { return Py_DebugFlag; }
+ PYCXX_EXPORT int &_Py_InteractiveFlag()              { return Py_InteractiveFlag; }
+ PYCXX_EXPORT int &_Py_OptimizeFlag()                 { return Py_OptimizeFlag; }
+ PYCXX_EXPORT int &_Py_NoSiteFlag()                   { return Py_NoSiteFlag; }
+ PYCXX_EXPORT int &_Py_VerboseFlag()                  { return Py_VerboseFlag; }
+-#  if PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 7
++#    endif
++#  if PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION <= 11
++#   if PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 7
+ PYCXX_EXPORT const char *__Py_PackageContext()       { return _Py_PackageContext; }
+-#  else
++#   else
+ PYCXX_EXPORT char *__Py_PackageContext()             { return _Py_PackageContext; }
++#   endif
+ #  endif
+ # endif
+ 
+diff --git a/src/CXX/Python3/IndirectPythonInterface.hxx b/src/CXX/Python3/IndirectPythonInterface.hxx
+index bf2c15c53f9a..eb4ae4fe63b9 100644
+--- a/src/CXX/Python3/IndirectPythonInterface.hxx
++++ b/src/CXX/Python3/IndirectPythonInterface.hxx
+@@ -149,10 +149,12 @@ PYCXX_EXPORT int &_Py_NoSiteFlag();
+ PYCXX_EXPORT int &_Py_TabcheckFlag();
+ PYCXX_EXPORT int &_Py_VerboseFlag();
+ 
+-#  if PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 7
++# if PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION <= 11
++#   if PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 7
+ PYCXX_EXPORT const char *__Py_PackageContext();
+-#  else
++#   else
+ PYCXX_EXPORT char *__Py_PackageContext();
++#   endif
+ #  endif
+ # endif
+ 
+diff --git a/src/CXX/Python3/cxx_extensions.cxx b/src/CXX/Python3/cxx_extensions.cxx
+index 7371810be4a9..e6eefdafea17 100644
+--- a/src/CXX/Python3/cxx_extensions.cxx
++++ b/src/CXX/Python3/cxx_extensions.cxx
+@@ -152,7 +152,7 @@ PyMethodDef *MethodTable::table()
+ //================================================================================
+ ExtensionModuleBase::ExtensionModuleBase( const char *name )
+ : m_module_name( name )
+-#if defined( Py_LIMITED_API )
++#if defined( Py_LIMITED_API ) || (PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 12)
+ , m_full_module_name( m_module_name )
+ #else
+ , m_full_module_name( __Py_PackageContext() != NULL ? std::string( __Py_PackageContext() ) : m_module_name )
+diff --git a/src/CXX/Python3/cxxextensions.c b/src/CXX/Python3/cxxextensions.c
+index 3b0f8ef7c588..afb9313ad0a8 100644
+--- a/src/CXX/Python3/cxxextensions.c
++++ b/src/CXX/Python3/cxxextensions.c
+@@ -42,6 +42,14 @@ extern "C"
+ {
+ #endif
+ 
++#if PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 13
++PyObject py_object_initializer =
++    {
++    { 1 },
++    NULL    // type must be init'ed by user
++    };
++
++#else
+ PyObject py_object_initializer =
+     {
+     _PyObject_EXTRA_INIT
+@@ -49,6 +57,8 @@ PyObject py_object_initializer =
+     NULL    // type must be init'ed by user
+     };
+ 
++#endif
++
+ #ifdef __cplusplus
+ }
+ #endif
+diff --git a/src/CXX/Version.hxx b/src/CXX/Version.hxx
+index e6069aad335e..59fe3c203b86 100644
+--- a/src/CXX/Version.hxx
++++ b/src/CXX/Version.hxx
+@@ -40,7 +40,7 @@
+ 
+ #define PYCXX_VERSION_MAJOR 7
+ #define PYCXX_VERSION_MINOR 1
+-#define PYCXX_VERSION_PATCH 7
++#define PYCXX_VERSION_PATCH 9
+ #define PYCXX_MAKEVERSION( major, minor, patch ) ((major<<16)|(minor<<8)|(patch))
+ #define PYCXX_VERSION PYCXX_MAKEVERSION( PYCXX_VERSION_MAJOR, PYCXX_VERSION_MINOR, PYCXX_VERSION_PATCH )
+ #endif
diff --git a/media-gfx/freecad/files/freecad-0.21.2-qtsvg-qt6.patch b/media-gfx/freecad/files/freecad-0.21.2-qtsvg-qt6.patch
new file mode 100644
index 000000000000..505862aa2bf1
--- /dev/null
+++ b/media-gfx/freecad/files/freecad-0.21.2-qtsvg-qt6.patch
@@ -0,0 +1,148 @@
+From ac9a88c2c59a2d2002a7740a1597a05c819220e0 Mon Sep 17 00:00:00 2001
+From: wmayer <wmayer@users.sourceforge.net>
+Date: Sat, 20 Apr 2024 14:02:38 +0200
+Subject: [PATCH] PySide6: Fixes #13533: QSvgWidget is not a child of QtSvg in
+ PySide6
+
+* Create a compatibility module QtSvgWidgets.py to handle PySide2 & PySide6
+* In the Arch and Material modules use the QtSvgWidgets module
+* Since Qt6 the method QFont.setWeight() doesn't accept an int any more but requires an enum. Since the call of QFont.setBold(True) sets
+  a weight of 75 the extra calls of QFont.setWeight(75) can be safely removed
+---
+ cMake/FreeCAD_Helpers/SetupShibokenAndPyside.cmake | 3 +++
+ src/Mod/Arch/ArchPrecast.py                        | 8 ++++----
+ src/Mod/Arch/ArchWindow.py                         | 4 ++--
+ src/Mod/Arch/importIFClegacy.py                    | 1 -
+ src/Mod/Draft/DraftGui.py                          | 1 -
+ src/Mod/Material/MaterialEditor.py                 | 6 +++---
+ 6 files changed, 12 insertions(+), 11 deletions(-)
+
+diff --git a/cMake/FreeCAD_Helpers/SetupShibokenAndPyside.cmake b/cMake/FreeCAD_Helpers/SetupShibokenAndPyside.cmake
+index 0569c1fde9f2..fa872e287b59 100644
+--- a/cMake/FreeCAD_Helpers/SetupShibokenAndPyside.cmake
++++ b/cMake/FreeCAD_Helpers/SetupShibokenAndPyside.cmake
+@@ -91,9 +91,12 @@ macro(SetupShibokenAndPyside)
+         file(WRITE ${CMAKE_BINARY_DIR}/Ext/PySide/QtWidgets.py  "from PySide${PYSIDE_MAJOR_VERSION}.QtWidgets import *\n")
+         if(PYSIDE_MAJOR_VERSION LESS 6)
+             file(WRITE ${CMAKE_BINARY_DIR}/Ext/PySide/QtWebEngineWidgets.py  "from PySide${PYSIDE_MAJOR_VERSION}.QtWebEngineWidgets import *\n")
++            file(WRITE ${CMAKE_BINARY_DIR}/Ext/PySide/QtSvgWidgets.py  "from PySide${PYSIDE_MAJOR_VERSION}.QtSvg import QGraphicsSvgItem\n"
++                                                                       "from PySide${PYSIDE_MAJOR_VERSION}.QtSvg import QSvgWidget\n")
+         else()
+             file(WRITE ${CMAKE_BINARY_DIR}/Ext/PySide/QtWebEngineWidgets.py  "from PySide${PYSIDE_MAJOR_VERSION}.QtWebEngineWidgets import *\n"
+                                                                              "from PySide${PYSIDE_MAJOR_VERSION}.QtWebEngineCore import QWebEnginePage\n")
++            file(WRITE ${CMAKE_BINARY_DIR}/Ext/PySide/QtSvgWidgets.py  "from PySide${PYSIDE_MAJOR_VERSION}.QtSvgWidgets import *\n")
+         endif()
+     endif()
+ 
+diff --git a/src/Mod/Arch/ArchPrecast.py b/src/Mod/Arch/ArchPrecast.py
+index 7bb929b10e34..2f482902c1ce 100644
+--- a/src/Mod/Arch/ArchPrecast.py
++++ b/src/Mod/Arch/ArchPrecast.py
+@@ -777,14 +777,14 @@ class _PrecastTaskPanel:
+     def __init__(self):
+ 
+         import FreeCADGui
+-        from PySide import QtCore,QtGui,QtSvg
++        from PySide import QtCore,QtGui,QtSvgWidgets
+         self.form = QtGui.QWidget()
+         self.grid = QtGui.QGridLayout(self.form)
+         self.PrecastTypes = ["Beam","I-Beam","Pillar","Panel","Slab","Stairs"]
+         self.SlabTypes = ["Champagne","Hat"]
+ 
+         # image display
+-        self.preview = QtSvg.QSvgWidget(":/ui/ParametersBeam.svg")
++        self.preview = QtSvgWidgets.QSvgWidget(":/ui/ParametersBeam.svg")
+         self.preview.setMaximumWidth(200)
+         self.preview.setMinimumHeight(120)
+         self.grid.addWidget(self.preview,0,0,1,2)
+@@ -1263,7 +1263,7 @@ class _DentsTaskPanel:
+     def __init__(self):
+ 
+         import FreeCADGui
+-        from PySide import QtCore,QtGui,QtSvg
++        from PySide import QtCore,QtGui,QtSvgWidgets
+         self.form = QtGui.QWidget()
+         self.grid = QtGui.QGridLayout(self.form)
+         self.Rotations = ["N","S","E","O"]
+@@ -1282,7 +1282,7 @@ def __init__(self):
+         self.grid.addWidget(self.buttonRemove,2,1,1,1)
+ 
+         # image display
+-        self.preview = QtSvg.QSvgWidget(":/ui/ParametersDent.svg")
++        self.preview = QtSvgWidgets.QSvgWidget(":/ui/ParametersDent.svg")
+         self.preview.setMaximumWidth(200)
+         self.preview.setMinimumHeight(120)
+         self.grid.addWidget(self.preview,3,0,1,2)
+diff --git a/src/Mod/Arch/ArchWindow.py b/src/Mod/Arch/ArchWindow.py
+index f3c11c5e9c7a..dc9c84f9a8bf 100644
+--- a/src/Mod/Arch/ArchWindow.py
++++ b/src/Mod/Arch/ArchWindow.py
+@@ -34,7 +34,7 @@
+ 
+ if FreeCAD.GuiUp:
+     import FreeCADGui
+-    from PySide import QtCore, QtGui, QtSvg
++    from PySide import QtCore, QtGui, QtSvgWidgets
+     from draftutils.translate import translate
+     from PySide.QtCore import QT_TRANSLATE_NOOP
+     import draftguitools.gui_trackers as DraftTrackers
+@@ -426,7 +426,7 @@ def taskbox(self):
+         self.pic.hide()
+ 
+         # SVG display
+-        self.im = QtSvg.QSvgWidget(":/ui/ParametersWindowFixed.svg")
++        self.im = QtSvgWidgets.QSvgWidget(":/ui/ParametersWindowFixed.svg")
+         self.im.setMaximumWidth(200)
+         self.im.setMinimumHeight(120)
+         grid.addWidget(self.im,4,0,1,2)
+diff --git a/src/Mod/Arch/importIFClegacy.py b/src/Mod/Arch/importIFClegacy.py
+index 037e889ce5b9..256b29056b33 100644
+--- a/src/Mod/Arch/importIFClegacy.py
++++ b/src/Mod/Arch/importIFClegacy.py
+@@ -1795,7 +1795,6 @@ def explorer(filename,schema="IFC2X3_TC1.exp"):
+     tree.headerItem().setText(1, "")
+     tree.headerItem().setText(2, "Item and Properties")
+     bold = QtGui.QFont()
+-    bold.setWeight(75)
+     bold.setBold(True)
+ 
+     #print(ifc.Entities)
+diff --git a/src/Mod/Draft/DraftGui.py b/src/Mod/Draft/DraftGui.py
+index c6e8584f4a71..2471bb66c61a 100644
+--- a/src/Mod/Draft/DraftGui.py
++++ b/src/Mod/Draft/DraftGui.py
+@@ -312,7 +312,6 @@ def setupToolBar(self,task=False):
+         self.promptlabel = self._label("promptlabel", self.layout, hide=task)
+         self.cmdlabel = self._label("cmdlabel", self.layout, hide=task)
+         boldtxt = QtGui.QFont()
+-        boldtxt.setWeight(75)
+         boldtxt.setBold(True)
+         self.cmdlabel.setFont(boldtxt)
+ 
+diff --git a/src/Mod/Material/MaterialEditor.py b/src/Mod/Material/MaterialEditor.py
+index cbcbde924609..28dbe83bc026 100644
+--- a/src/Mod/Material/MaterialEditor.py
++++ b/src/Mod/Material/MaterialEditor.py
+@@ -27,7 +27,7 @@
+ import os
+ from pathlib import PurePath
+ import sys
+-from PySide import QtCore, QtGui, QtSvg
++from PySide import QtCore, QtGui, QtSvgWidgets
+ 
+ import FreeCAD
+ import FreeCADGui
+@@ -92,11 +92,11 @@ def __init__(self, obj=None, prop=None, material=None, card_path="", category="S
+         treeView = widget.treeView
+ 
+         # create preview svg slots
+-        self.widget.PreviewRender = QtSvg.QSvgWidget(self.iconPath + "preview-rendered.svg")
++        self.widget.PreviewRender = QtSvgWidgets.QSvgWidget(self.iconPath + "preview-rendered.svg")
+         self.widget.PreviewRender.setMaximumWidth(64)
+         self.widget.PreviewRender.setMinimumHeight(64)
+         self.widget.topLayout.addWidget(self.widget.PreviewRender)
+-        self.widget.PreviewVector = QtSvg.QSvgWidget(self.iconPath + "preview-vector.svg")
++        self.widget.PreviewVector = QtSvgWidgets.QSvgWidget(self.iconPath + "preview-vector.svg")
+         self.widget.PreviewVector.setMaximumWidth(64)
+         self.widget.PreviewVector.setMinimumHeight(64)
+         self.widget.topLayout.addWidget(self.widget.PreviewVector)
diff --git a/media-gfx/freecad/freecad-0.21.2-r2.ebuild b/media-gfx/freecad/freecad-0.21.2-r3.ebuild
index b0f1d3fac470..bf1b98990bc0 100644
--- a/media-gfx/freecad/freecad-0.21.2-r2.ebuild
+++ b/media-gfx/freecad/freecad-0.21.2-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit check-reqs cmake flag-o-matic optfeature python-single-r1 qmake-utils xdg
 
@@ -93,8 +93,8 @@ RDEPEND="
 			$(python_gen_cond_dep '
 				dev-python/matplotlib[${PYTHON_USEDEP}]
 				>=dev-python/pivy-0.6.5[${PYTHON_USEDEP}]
-				dev-python/pyside2[gui,svg,webchannel,webengine,${PYTHON_USEDEP}]
-				dev-python/shiboken2[${PYTHON_USEDEP}]
+				dev-python/pyside2:=[gui,svg,webchannel,webengine,${PYTHON_USEDEP}]
+				dev-python/shiboken2:=[${PYTHON_USEDEP}]
 			' python3_{10..11} )
 		)
 		qt6? (
@@ -109,8 +109,8 @@ RDEPEND="
 			$(python_gen_cond_dep '
 				dev-python/matplotlib[${PYTHON_USEDEP}]
 				>=dev-python/pivy-0.6.5[${PYTHON_USEDEP}]
-				dev-python/pyside6[gui,svg,webchannel,webengine,${PYTHON_USEDEP}]
-				dev-python/shiboken6[${PYTHON_USEDEP}]
+				dev-python/pyside6:=[gui,svg,webchannel,webengine,${PYTHON_USEDEP}]
+				dev-python/shiboken6:=[${PYTHON_USEDEP}]
 			' )
 		)
 	)
@@ -159,12 +159,17 @@ REQUIRED_USE="
 	designer? ( gui )
 	inspection? ( points )
 	path? ( robot )
+	python_single_target_python3_12? ( gui? ( qt6 ) )
 "
+# There is no py3.12 support planned for pyside2
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.21.0-0001-Gentoo-specific-disable-ccache-usage.patch
 	"${FILESDIR}"/${PN}-0.21.1-Gentoo-specific-don-t-check-vcs.patch
 	"${FILESDIR}"/${PN}-0.21.2-vtk9.3-fix.patch
+	"${FILESDIR}"/${PN}-0.21.2-boost-175-1.patch
+	"${FILESDIR}"/${PN}-0.21.2-boost-175-2.patch
+	"${FILESDIR}"/${PN}-0.21.2-boost-175-3.patch
 )
 
 DOCS=( CODE_OF_CONDUCT.md README.md )
@@ -188,6 +193,12 @@ src_prepare() {
 		eapply "${FILESDIR}/${PN}-0.21.2-shiboken-6.7.0.patch"
 	fi
 
+	if use qt6; then
+		eapply "${FILESDIR}/${PN}-0.21.2-navcube-qt6.patch"
+		eapply "${FILESDIR}/${PN}-0.21.2-qtsvg-qt6.patch"
+		eapply "${FILESDIR}/${PN}-0.21.2-py312-qt6.patch"
+	fi
+
 	cmake_src_prepare
 }
 
@@ -336,7 +347,7 @@ src_install() {
 		# https://github.com/coin3d/coin/issues/451
 		: \${QT_QPA_PLATFORM:=xcb}
 		export QT_QPA_PLATFORM
-		exec /usr/$(get_libdir)/${PN}/bin/FreeCAD
+		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
diff --git a/media-gfx/freecad/freecad-1.0_rc1-r1.ebuild b/media-gfx/freecad/freecad-1.0_rc1-r1.ebuild
new file mode 100644
index 000000000000..5d2b39ba14a5
--- /dev/null
+++ b/media-gfx/freecad/freecad-1.0_rc1-r1.ebuild
@@ -0,0 +1,394 @@
+# 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
+MY_PV="${PV/_/}"
+
+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/${MY_PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/FreeCAD-${MY_PV}"
+fi
+
+# code is licensed LGPL-2
+# examples are licensed CC-BY-SA (without note of specific version)
+LICENSE="LGPL-2 CC-BY-SA-4.0"
+SLOT="0"
+IUSE="debug designer +gui +qt6 test"
+
+FREECAD_EXPERIMENTAL_MODULES="cloud netgen pcl"
+FREECAD_STABLE_MODULES="addonmgr fem idf image inspection material
+	openscad part-design path points raytracing robot show smesh
+	surface techdraw tux"
+
+for module in ${FREECAD_STABLE_MODULES}; do
+	IUSE="${IUSE} +${module}"
+done
+for module in ${FREECAD_EXPERIMENTAL_MODULES}; do
+	IUSE="${IUSE} ${module}"
+done
+unset module
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	dev-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]
+	)
+	media-libs/freetype
+	media-libs/qhull:=
+	sci-libs/hdf5:=[fortran,zlib]
+	>=sci-libs/med-4.0.0-r1
+	sci-libs/opencascade:=[json,vtk]
+	sci-libs/orocos_kdl:=
+	sys-libs/zlib
+	virtual/libusb:1
+	cloud? (
+		dev-libs/openssl:=
+		net-misc/curl
+	)
+	fem? (
+		!qt6? ( sci-libs/vtk:=[qt5,rendering] )
+		qt6? ( sci-libs/vtk:=[-qt5,qt6,rendering] )
+	)
+	gui? (
+		>=media-libs/coin-4.0.0
+		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/qtwebengine:5[widgets]
+			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,webengine,${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
+			dev-qt/qtwebengine:6[widgets]
+			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,webengine,${PYTHON_USEDEP}]
+				dev-python/shiboken6:=[${PYTHON_USEDEP}]
+			' )
+		)
+	)
+	netgen? ( media-gfx/netgen[opencascade] )
+	openscad? ( media-gfx/openscad )
+	pcl? ( sci-libs/pcl:=[opengl,openni2,vtk] )
+	smesh? (
+		!qt6? ( sci-libs/vtk:=[qt5] )
+		qt6? ( sci-libs/vtk:=[-qt5,qt6] )
+	)
+	$(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
+	)
+"
+
+# 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
+	"${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
+	[[ -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
+}
+
+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_ADDONMGR=$(usex addonmgr)
+		-DBUILD_ARCH=ON
+		-DBUILD_ASSEMBLY=OFF                    # Requires OndselSolver
+		-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
+		-DBUILD_FEM=$(usex fem)
+		-DBUILD_FEM_NETGEN=$(usex netgen)
+		-DBUILD_FLAT_MESH=ON
+		-DBUILD_FORCE_DIRECTORY=ON				# force building in a dedicated directory
+		-DBUILD_FREETYPE=ON						# automagic dep
+		-DBUILD_GUI=$(usex gui)
+		-DBUILD_IDF=$(usex idf)
+		-DBUILD_IMAGE=$(usex image)
+		-DBUILD_IMPORT=ON						# import module for various file formats
+		-DBUILD_INSPECTION=$(usex inspection)
+		-DBUILD_JTREADER=OFF					# code has been removed upstream, but option is still there
+		-DBUILD_MATERIAL=$(usex material)
+		-DBUILD_MESH=ON
+		-DBUILD_MESH_PART=ON
+		-DBUILD_OPENSCAD=$(usex openscad)
+		-DBUILD_PART=ON
+		-DBUILD_PART_DESIGN=$(usex part-design)
+		-DBUILD_PATH=$(usex path)
+		-DBUILD_POINTS=$(usex points)
+		-DBUILD_RAYTRACING=$(usex raytracing)
+		-DBUILD_REVERSEENGINEERING=OFF			# currently only an empty sandbox
+		-DBUILD_ROBOT=$(usex robot)
+		-DBUILD_SHOW=$(usex show)
+		-DBUILD_SKETCHER=ON						# needed by draft workspace
+		-DBUILD_SMESH=$(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_WEB=ON							# needed by start workspace
+		-DBUILD_WITH_CONDA=OFF
+
+		-DCMAKE_INSTALL_DATADIR=/usr/share/${PN}/data
+		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
+		-DCMAKE_INSTALL_INCLUDEDIR=/usr/include/${PN}
+		-DCMAKE_INSTALL_PREFIX=/usr/$(get_libdir)/${PN}
+
+		-DFREECAD_BUILD_DEBIAN=OFF
+
+		-DFREECAD_USE_EXTERNAL_KDL=ON
+		-DFREECAD_USE_EXTERNAL_SMESH=OFF		# no package in Gentoo
+		-DFREECAD_USE_EXTERNAL_ZIPIOS=OFF		# doesn't work yet, also no package in Gentoo tree
+		-DFREECAD_USE_FREETYPE=ON
+		-DFREECAD_USE_OCC_VARIANT:STRING="Official Version"
+		-DFREECAD_USE_PCL=$(usex pcl)
+		-DFREECAD_USE_PYBIND11=ON
+		-DFREECAD_USE_QT_FILEDIALOG=ON
+		-DFREECAD_USE_QTWEBMODULE:STRING="Qt WebEngine"
+
+		# install python modules to site-packages' dir. True only for the main package,
+		# sub-packages will still be installed inside /usr/lib64/freecad
+		-DINSTALL_TO_SITEPACKAGES=ON
+
+		# Use the version of shiboken2 that matches the selected python version
+		-DPYTHON_CONFIG_SUFFIX="-${EPYTHON}"
+		-DPython3_EXECUTABLE=${PYTHON}
+	)
+
+	if use debug; then
+		# BUILD_SANDBOX currently broken, see
+		# https://forum.freecadweb.org/viewtopic.php?f=4&t=36071&start=30#p504595
+		mycmakeargs+=(
+			-DBUILD_SANDBOX=OFF
+			-DBUILD_TEMPLATE=ON
+		)
+	else
+		mycmakeargs+=(
+			-DBUILD_SANDBOX=OFF
+			-DBUILD_TEMPLATE=OFF
+		)
+	fi
+
+	if use qt6; then
+		mycmakeargs+=(
+			-DFREECAD_QT_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 it's dependencies
+# The exported environment variables are needed, so freecad does know
+# where to save it's temporary files, and where to look and write it's
+# configuration. Without those, there are sandbox violation, when it
+# tries to create /var/lib/portage/home/.FreeCAD directory.
+src_test() {
+	pushd "${BUILD_DIR}" > /dev/null || die
+	export FREECAD_USER_HOME="${HOME}"
+	export FREECAD_USER_DATA="${T}"
+	export FREECAD_USER_TEMP="${T}"
+	nonfatal ./bin/FreeCADCmd --run-test 0
+	popd > /dev/null || die
+}
+
+src_install() {
+	cmake_src_install
+
+	dobin src/Tools/freecad-thumbnailer
+
+	if use gui; then
+		newbin - freecad <<- _EOF_
+		#!/bin/sh
+		# https://github.com/coin3d/coin/issues/451
+		: \${QT_QPA_PLATFORM:=xcb}
+		export QT_QPA_PLATFORM
+		exec /usr/$(get_libdir)/${PN}/bin/FreeCAD "\${@}"
+		_EOF_
+		mv "${ED}"/usr/$(get_libdir)/${PN}/share/* "${ED}"/usr/share || die "failed to move shared resources"
+	fi
+	dosym -r /usr/$(get_libdir)/${PN}/bin/FreeCADCmd /usr/bin/freecadcmd
+
+	rm -r "${ED}"/usr/$(get_libdir)/${PN}/include/E57Format || die "failed to drop unneeded include directory E57Format"
+
+	python_optimize "${ED}"/usr/share/${PN}/data/Mod/Start/StartPage "${ED}"/usr/$(get_libdir)/${PN}{/Ext,/Mod}/
+	# compile main package in python site-packages as well
+	python_optimize
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	einfo "You can load a lot of additional workbenches using the integrated"
+	einfo "AddonManager."
+
+	# ToDo: check opencv, pysolar (::science), elmerfem (::science)
+	#		ifc++, ifcopenshell, z88 (no pkgs), calculix-ccx (::waebbl)
+	einfo "There are a lot of additional tools, for which FreeCAD has builtin"
+	einfo "support. Some of them are available in Gentoo. Take a look at"
+	einfo "https://wiki.freecadweb.org/Installing#External_software_supported_by_FreeCAD"
+	optfeature_header "Computational utilities"
+	optfeature "BLAS library" sci-libs/openblas
+	optfeature "Statistical computation with Python" dev-python/pandas
+	optfeature "Use scientific computation with Python" dev-python/scipy
+	optfeature "Use symbolic math with Python" dev-python/sympy
+	optfeature_header "Imaging, Plotting and Rendering utilities"
+	optfeature "Dependency graphs" media-gfx/graphviz
+	optfeature "PBR Rendering" media-gfx/povray
+	optfeature_header "Import / Export"
+	optfeature "Interact with git repositories" dev-python/GitPython
+	optfeature "Work with COLLADA documents" dev-python/pycollada
+	optfeature "YAML importer and emitter" dev-python/pyyaml
+	optfeature "Importing and exporting 2D AutoCAD DWG files" media-gfx/libredwg
+	optfeature "Importing and exporting geospatial data formats" sci-libs/gdal
+	optfeature "Working with projection data" sci-libs/proj
+	optfeature_header "Meshing and FEM"
+	optfeature "FEM mesh generator" sci-libs/gmsh
+	optfeature "Triangulating meshes" sci-libs/gts
+	optfeature "Visualization" sci-visualization/paraview
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+}
diff --git a/media-gfx/freecad/freecad-9999.ebuild b/media-gfx/freecad/freecad-9999.ebuild
index ad9a9580164b..b323eccffe9b 100644
--- a/media-gfx/freecad/freecad-9999.ebuild
+++ b/media-gfx/freecad/freecad-9999.ebuild
@@ -26,12 +26,12 @@ 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"
+IUSE="debug designer +gui +qt6 test"
 
 FREECAD_EXPERIMENTAL_MODULES="cloud netgen pcl"
 FREECAD_STABLE_MODULES="addonmgr fem idf image inspection material
-	openscad part-design path points raytracing robot show surface
-	techdraw tux"
+	openscad part-design path points raytracing robot show smesh
+	surface techdraw tux"
 
 for module in ${FREECAD_STABLE_MODULES}; do
 	IUSE="${IUSE} +${module}"
@@ -45,12 +45,14 @@ RESTRICT="!test? ( test )"
 
 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
@@ -87,15 +89,14 @@ RDEPEND="
 			dev-qt/qtopengl:5
 			dev-qt/qtprintsupport:5
 			dev-qt/qtsvg:5
-			dev-qt/qtwebengine:5[widgets]
 			dev-qt/qtwidgets:5
 			dev-qt/qtx11extras:5
 			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,webengine,${PYTHON_USEDEP}]
-				dev-python/shiboken2[${PYTHON_USEDEP}]
+				dev-python/pyside2:=[gui,svg,webchannel,${PYTHON_USEDEP}]
+				dev-python/shiboken2:=[${PYTHON_USEDEP}]
 			' python3_{10..11} )
 		)
 		qt6? (
@@ -104,19 +105,22 @@ RDEPEND="
 			dev-qt/qttools:6[widgets]
 			dev-qt/qtbase:6[gui,opengl,widgets]
 			dev-qt/qtsvg:6
-			dev-qt/qtwebengine:6[widgets]
 			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,webengine,${PYTHON_USEDEP}]
-				dev-python/shiboken6[${PYTHON_USEDEP}]
+				dev-python/pyside6:=[gui,svg,webchannel,${PYTHON_USEDEP}]
+				dev-python/shiboken6:=[${PYTHON_USEDEP}]
 			' )
 		)
 	)
 	netgen? ( media-gfx/netgen[opencascade] )
 	openscad? ( media-gfx/openscad )
 	pcl? ( sci-libs/pcl:=[opengl,openni2,vtk] )
+	smesh? (
+		!qt6? ( sci-libs/vtk:=[qt5] )
+		qt6? ( sci-libs/vtk:=[-qt5,qt6] )
+	)
 	$(python_gen_cond_dep '
 		dev-python/numpy[${PYTHON_USEDEP}]
 		dev-python/pybind11[${PYTHON_USEDEP}]
@@ -124,9 +128,9 @@ RDEPEND="
 		fem? ( dev-python/ply[${PYTHON_USEDEP}] )
 	')
 "
-DEPEND="
-	${RDEPEND}
+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 )
@@ -138,6 +142,7 @@ BDEPEND="
 	test? (
 		$(python_gen_cond_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
 		!qt6? ( dev-qt/qttest:5 )
+		dev-cpp/gtest
 	)
 "
 
@@ -194,10 +199,13 @@ src_configure() {
 	# https://github.com/FreeCAD/FreeCAD/issues/13173
 	filter-lto
 
+	# Fix building tests
+	append-ldflags -Wl,--copy-dt-needed-entries
+
 	local mycmakeargs=(
 		-DBUILD_ADDONMGR=$(usex addonmgr)
 		-DBUILD_ARCH=ON
-		-DBUILD_ASSEMBLY=OFF					# deprecated
+		-DBUILD_ASSEMBLY=OFF                    # Requires OndselSolver
 		-DBUILD_CLOUD=$(usex cloud)
 		-DBUILD_COMPLETE=OFF					# deprecated
 		-DBUILD_DRAFT=ON
@@ -227,7 +235,7 @@ src_configure() {
 		-DBUILD_ROBOT=$(usex robot)
 		-DBUILD_SHOW=$(usex show)
 		-DBUILD_SKETCHER=ON						# needed by draft workspace
-		-DBUILD_SMESH=ON
+		-DBUILD_SMESH=$(usex smesh)
 		-DBUILD_SPREADSHEET=ON
 		-DBUILD_START=ON
 		-DBUILD_SURFACE=$(usex surface)
@@ -253,7 +261,6 @@ src_configure() {
 		-DFREECAD_USE_PCL=$(usex pcl)
 		-DFREECAD_USE_PYBIND11=ON
 		-DFREECAD_USE_QT_FILEDIALOG=ON
-		-DFREECAD_USE_QTWEBMODULE:STRING="Qt WebEngine"
 
 		# install python modules to site-packages' dir. True only for the main package,
 		# sub-packages will still be installed inside /usr/lib64/freecad
@@ -333,14 +340,13 @@ src_install() {
 		# https://github.com/coin3d/coin/issues/451
 		: \${QT_QPA_PLATFORM:=xcb}
 		export QT_QPA_PLATFORM
-		exec /usr/$(get_libdir)/${PN}/bin/FreeCAD
+		exec /usr/$(get_libdir)/${PN}/bin/FreeCAD "\${@}"
 		_EOF_
 		mv "${ED}"/usr/$(get_libdir)/${PN}/share/* "${ED}"/usr/share || die "failed to move shared resources"
 	fi
 	dosym -r /usr/$(get_libdir)/${PN}/bin/FreeCADCmd /usr/bin/freecadcmd
 
 	rm -r "${ED}"/usr/$(get_libdir)/${PN}/include/E57Format || die "failed to drop unneeded include directory E57Format"
-	use test && (rm -r "${ED}"/usr/include/${PN}/{gmock,gtest} || die)
 
 	python_optimize "${ED}"/usr/share/${PN}/data/Mod/Start/StartPage "${ED}"/usr/$(get_libdir)/${PN}{/Ext,/Mod}/
 	# compile main package in python site-packages as well
diff --git a/media-gfx/freecad/metadata.xml b/media-gfx/freecad/metadata.xml
index b934f4a2b2de..0787a07fc30c 100644
--- a/media-gfx/freecad/metadata.xml
+++ b/media-gfx/freecad/metadata.xml
@@ -78,6 +78,9 @@
 		<flag name="show">
 			Build the show module, a helper module for visibility automation
 		</flag>
+		<flag name="smesh">
+			Build the Salome SMESH module
+		</flag>
 		<flag name="surface">
 			Build the surface module and workbench
 		</flag>
diff --git a/media-gfx/geeqie/Manifest b/media-gfx/geeqie/Manifest
index da98f852c87a..6cf49749027e 100644
--- a/media-gfx/geeqie/Manifest
+++ b/media-gfx/geeqie/Manifest
@@ -1,19 +1,10 @@
-AUX geeqie-2.1-exiv2-0.28.0.patch 5556 BLAKE2B 3af45f27984d789dc1618b348dabfa3cb7264fcce257f1f6dcf69aa7b37a11f48b5ddf9dfdd3f4f630da2583571bf228e95bf98729a13290f133c18c468651c7 SHA512 9e63688935b1f3c3bc33c238201b5cb5508a91df2c58020656a31edb88f22b2e53e6abcd61fa7b1634a772cc7cc1ce7307f57e93fbdc8a7beb2d63c1dc44df6f
-AUX geeqie-2.1-locale.patch 522 BLAKE2B f676a4b2b0acb6184c66657314974f61413172bef3290d05d2764afae48b476fc40892012d1af93f02454de127a5b38cec240057ad20c3a6a63e11e354906b75 SHA512 c9d402fd9bb5d49a1f4219e33e24a16d656a6ba0a3eaddd6864debab09b3742927a89892e2fffe3c6726abe3f6b2bc6baae9af1ecf035f5a02ff3f9b5ad6ce59
-AUX geeqie-2.1-lua_hpp.patch 344 BLAKE2B 8206ef3ec5faf9b94efe57413905dedef5046b0d90056864e33b2adb876ca4bb3867417a24e4f6956d14923b3ee119ee5e8379f314cffe8ade2c1102bcb3c1de SHA512 599f9b63fad24bd292a393ead338894c6330b82fc3e02e71e16f7a85b49fa0ed564677444b5d78d68b4ac91ad04e8a6c237e3119031e1307ab089ae37e6eb838
-AUX geeqie-2.3-locale.patch 336 BLAKE2B 26d6712244e382be5981ad0c940828565e066aca961fd2fb4815bea26fe020c9ca95475b8f661f649e7a0ca54fdeea17aefcef2327e99f076646888b0fc3bf1a SHA512 00900c3740b1200db4eb515f0c5d77ac73d284e879d7c0dd36297953dc12149c65cc383ecc2837f55881dbf62e1ab0cedc0c6f58ff9e5aba1e73bd6a9314b2d8
 AUX geeqie-2.3-test-ancillary.patch 630 BLAKE2B a997e60c3fd6fe78b72019babbf2ad7d9f4fccea275cc95903925ed7ed1e0486da2d82e76e0afd43f82932c123ee03891878bf68d0ef5d714528806f206db45a SHA512 69aa64bf6945f6cd11b6ccd93052c5589f332f55d3e022e5b23b0e5eee0fada4764c54b7dffa75b8e5432f5c7d4c27384992cdd61a18c779feede4827f2be5ff
-DIST geeqie-2.1-docs.tar.xz 333756 BLAKE2B 2e569f4000befdaecebd6df9c94c59b8d9e05743343b1ba2ab647a228cc595b71369173cd0e7b798227a0843d493eb7d59be19b8259015239cfcdf8b5a40d339 SHA512 f1701e1f7550dc58d2d65f35da09284958b1d92f60568a8774831025525c835d2a03a48fd582052d3fca9cd2c15d935e30baf3f6599f624bf3dbccfeb606745d
-DIST geeqie-2.1.tar.xz 1800612 BLAKE2B 60190532eb8830e12acf06e39046dd04ccf28ac5d3679f2063e6f6e102add0d398dfc70a57a758d0c16483d5314ec88cb56b54829103ad938b29ac1500f86fdc SHA512 1812234d349536626433bbb7670cd45ef5ce328bf58f603af8eb4a01f7d3db2557d5a812714b12a9b49559aa1fe1c186ceddf2f632c2b303d64d36ad746a2d2f
-DIST geeqie-2.2-docs.tar.xz 356976 BLAKE2B 3bca2815a6f177a2f38b9a66ff6fa95dba510aa2afb36d5d6c9f6841c0c1b25c4f9aad7d45ef57d911f0caa2a8499a06aba2ccaf7e279382bf4304c88f11ea13 SHA512 0f89995573b02e82c715dcdf4d71a309691885ad785f1297d2fee01aff00f2aed43c9cff6900bddfa1a727598934ba7bb0ced32b0c86c6f1a115271a8a81592a
-DIST geeqie-2.2.tar.xz 2169096 BLAKE2B fe7f21f5842ac7824ec37f0775d31e8dcd05934809f7bdd84d7dcb749d25976055050f42a8cea3cd414fb3c7e60055c9fa32b93cfef2af62de68f4d44af425c8 SHA512 7d03493b463a1949cbc5e377927abc4bc6fa62914e8cdddb30a832cb9c6caad579f5ba5bd2b8b0913b77063300c9c5ac1f7e671ddfb2ce18d8a8d0efcfb51dbe
-DIST geeqie-2.3-docs.tar.xz 362412 BLAKE2B e05adbd6b277cfccae20c2ed7840e447016b32a9bf5c5ad6feb143993b4856fbb623feb6684a21c235ad846923463bed45cf887b1854189f01a46c3961f26a18 SHA512 cab4739adecd1dcb9cde3a58a2e2c2262f4014bc7594ae22af69b8bdbb14f6849b1e2267646301f31ebde76b2b2abc05e75aac3325e35cb88f9dc40703f2d943
-DIST geeqie-2.3.tar.xz 2184604 BLAKE2B dbd2d52d146d373a9694a7371a8ac44571e63895cf6cea7acb549a1135b4cf5869737cdf780ca6afdb14eda1338cb275791eaac1cd7596ed58eb07759cf75778 SHA512 9f45974d12c1f193a4a3624064b967fc06cf9c906c45160a4945a8f6a9d814b929b92c45a35006c7f1b20fa5fe360858f24fd54adbcd8863c3e7d787a3429899
+AUX geeqie-2.5-test-ancillary.patch 1167 BLAKE2B 7cb4efca931ad6ff462c849a2b45148749707334e11f9bf9d5ed16e53b87e89cc9fcf7068518b71fbdfdeda5d7267988b19015f6fb7c393eac0944de9b9421ea SHA512 2624da46d98c6e7fc4bd9b3360dca5c40a67b535952edffb1703c56e20cbc1cbbc6cca2ed1f93b0eb10ee0211b2475269dcd7e56b95fb45f62908aa56a2b9d36
 DIST geeqie-2.4-docs.tar.xz 364536 BLAKE2B 688720808c8e4543455259966aef726bf56a821890a78e4757d9d1fd02ce67217461808d9697b331b2a94841bf3581b25242a7e5c9c9a3f5b02209a566b09c16 SHA512 07bca33c347f448ee853ea60daf22c9cdace458b6ce6b3f4ced9b343a965370c51d7a872d5279852b7a83a1de51c8529a668f7d62a031bcec1fdde8b9bfbf9cb
 DIST geeqie-2.4.tar.xz 2178572 BLAKE2B df24f0b5d443cbd2033c0b382fe0d846c9073e8966aa736f647e34930e44083b9e44252c554578548a13c12c1b1a5a48bb7795f2fda8b8688a63ef402a257334 SHA512 7e0f5dff21e38a41adf0a793bd82652c5d639e84ab49403517f4b1dae042bfc5f4d02e54b54928e04a2397300acb04b130347df0be5637ee48634f5865ad346b
-EBUILD geeqie-2.1-r1.ebuild 3277 BLAKE2B e9a43ed274613dd5a98552d1d83768cffbc0be641d1661d6bd9b5d4b599e210d48dd6fe771c03d90abfc895bd582901e1ac0c4c224edbe96c6139f75e0b40e87 SHA512 f1a090d18fe0f6bb6ab3f7ecb6c42a996fcfbe05457f97ae00cff4d44da057107acd982616ffc307208bc893235ec5b1bcaeee79eefbae177a445a1f465e54da
-EBUILD geeqie-2.2.ebuild 3284 BLAKE2B 3c81435058a54a3da139b128db23b2adc7a378c9fb6a7f81cc9405b427ad66696f94c42bf39fb65583d79a8ac7428c2130a4e780410643fe6511457d4b3bea67 SHA512 db41ac9bfe390f64c6352a33f9c2181d3fe27d0e15c256cabef7ab026d4398342f0de05c4f29466634ec419d07f2c13b6294551e27dcb47df66c221f55aa6641
-EBUILD geeqie-2.3.ebuild 3376 BLAKE2B 515083b0ecb99fa9c2d6f92d9df2ef9c8f1e72436c290bb02311cfe73bcb0a92f0334df33c1453a709cf94277cddb99deaf9ba9276895524ec42126ef44616f5 SHA512 4906e493fe819d29e6c94dcb452b8f2382a0e01f59b60b8fb0afd0ac8c79f27c2befd23ed6366fd4e76a6da6dafc75d24aaab552f93ca0fad7a3b38f5d6c4e7d
-EBUILD geeqie-2.4.ebuild 3342 BLAKE2B ba2e5484201f6d834d3a5ff70cc28a2bab369bdc2286a27285b86ceb33b54325b47e4d03b00a5b98ee00039bcd50c57b917e7faea4570dca1405265590c5ba20 SHA512 b7af3c8f7479996f9228c6c36269e33975356245b018654f140b16ef84a0a327c867677e5ecce9020759fe3fa181918145eaa5e9b1fcfbcbd8ecc79a094baa59
-EBUILD geeqie-9999.ebuild 3055 BLAKE2B 450d32bd793aa6436b3ab676758758e57f1bd34fa38ceafbd14a3df436611cc0f25a1c93f05f51104089e2c76a82f2605f00467e0aedf41032645d5e236f6421 SHA512 c1695fa7e9fe635f5799677c13014f4792ca2463654d1faeb967fd9fa6f89a757892316386797590632f3a233eb19daff8e724cd59d937294e2f48c79246d26c
+DIST geeqie-2.5-docs.tar.xz 395716 BLAKE2B 177130f3a5afbf5791372fc2550f4443456a2bb3aad755774cf337362c38b1b20183eda311e245493a0ad9b8975747721ec5639d46135a9ee3f27318db360126 SHA512 0b8f6b165ec0feb38c2479054b1fa079bd08f053cf439cf19e0419f11b1fa3ba533adbb781022f401f599f9d83aca44e8613d63b82b6848f14fc7076736b9d1a
+DIST geeqie-2.5.tar.xz 2224492 BLAKE2B 911ea2e338c470255c70e83257b693c51b1171ed24f4b737d291cfd5ff20d8b7b39ba69e46f831ede33ce30d41945bb3de754b2a1c245dcff98f16633f31e562 SHA512 c1be6c5d9f7f7609dfab97320d79a4830eb866f000c3c52ea8ab2b69a1ba793b322dbab3f614572e1d6fc815d64bfeaf3ddd39dd633a5c87d7008b6afe35be21
+EBUILD geeqie-2.4.ebuild 3209 BLAKE2B 16b1aae2c54429c4e1af9c2f5be74cfdbb5fcb239fffc1f75117b1e7e4676e6a50ce012d59fa7586802acc56440661f83b7fc8c712d1248a350a9d7b8719478c SHA512 f82daf07a212d749746d9f4c062ed35697a715f07cf3a39b6c885600feaf90bc7202720f5f8460c2e57b22b955b77820a88f3841ab7534b7aeca3b1add7df238
+EBUILD geeqie-2.5.ebuild 3211 BLAKE2B fafc9c9115f8328c78ab1d09e113315cc94c9fe4a864573a2ad3b8c0d6a3f96255fc721b42cc180c2e7adc4117f0dc29a8af40d555e0a59ce01fbeb8c4e351ac SHA512 513706a9b1ffde05f317fadeb785fbc75f124e7df47826c7eeff094b900539624f1f74f85dbe361b3c9bb0f4be71ed70f60b26a0a63022afa04062f85a688037
+EBUILD geeqie-9999.ebuild 2924 BLAKE2B f39a8c772b143a21a168778d5a6b465c8459218019c4724f42b9e2d101452f371b3b5fb8e297a60701c62d3bfbf9ee27bb27622c611ab6542e3b2067dcb80d62 SHA512 5417a817179e1bbc1d3b51ae39056b5d3a8d94149b0a7bdf812202baaac726065e9399f23f5dcc13e087f831482f9eab7c463782bce8ef3c2c403850986f31e9
 MISC metadata.xml 816 BLAKE2B ed50c576f068626d95d99899b17508b7c48567707ff020988dc611be9b482893f008f904ce460565ed0f263c76f2e274640f6e662f827d0879de5a59a93e8c3b SHA512 45458e31201d1baee61f48fe452c3577bcb74fea6569d1afdd8787aff6714d3400f501d1dc6b3de31ea1d5151326d48593f5bb219ec5cfed603cfe8835690dcd
diff --git a/media-gfx/geeqie/files/geeqie-2.1-exiv2-0.28.0.patch b/media-gfx/geeqie/files/geeqie-2.1-exiv2-0.28.0.patch
deleted file mode 100644
index 13b6a171257d..000000000000
--- a/media-gfx/geeqie/files/geeqie-2.1-exiv2-0.28.0.patch
+++ /dev/null
@@ -1,151 +0,0 @@
-From c45cca777aa3477eaf297db99f337e18d9683c61 Mon Sep 17 00:00:00 2001
-From: Kevin Backhouse <kevinbackhouse@github.com>
-Date: Wed, 21 Jun 2023 12:23:33 +0100
-Subject: [PATCH] Add ExifData as extra argument to
- exif_item_get_data_as_text().
-
----
- src/advanced-exif.cc | 2 +-
- src/exif-common.cc   | 2 +-
- src/exif.cc          | 8 ++++----
- src/exif.h           | 2 +-
- src/exiv2.cc         | 4 ++--
- 5 files changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/src/advanced-exif.cc b/src/advanced-exif.cc
-index 79a54b12..e3d3067a 100644
---- a/src/advanced-exif.cc
-+++ b/src/advanced-exif.cc
-@@ -120,7 +120,7 @@ static void advanced_exif_update(ExifWin *ew)
- 		tag = g_strdup_printf("0x%04x", exif_item_get_tag_id(item));
- 		tag_name = exif_item_get_tag_name(item);
- 		format = exif_item_get_format_name(item, TRUE);
--		text = exif_item_get_data_as_text(item);
-+		text = exif_item_get_data_as_text(item, exif);
- 		utf8_text = utf8_validate_or_convert(text);
- 		g_free(text);
- 		elements = g_strdup_printf("%d", exif_item_get_elements(item));
-diff --git a/src/exif-common.cc b/src/exif-common.cc
-index 6a4c9740..b6f07ca6 100644
---- a/src/exif-common.cc
-+++ b/src/exif-common.cc
-@@ -995,7 +995,7 @@ gchar *exif_get_data_as_text(ExifData *exif, const gchar *key)
- 	if (key_valid) return text;
- 
- 	item = exif_get_item(exif, key);
--	if (item) return exif_item_get_data_as_text(item);
-+	if (item) return exif_item_get_data_as_text(item, exif);
- 
- 	return nullptr;
- }
-diff --git a/src/exif.cc b/src/exif.cc
-index 8708ff53..cda2cb1a 100644
---- a/src/exif.cc
-+++ b/src/exif.cc
-@@ -1454,7 +1454,7 @@ gchar *exif_item_get_string(ExifItem *item, gint UNUSED(idx))
- 	return exif_item_get_data_as_text_full(item, METADATA_PLAIN);
- }
- 
--gchar *exif_item_get_data_as_text(ExifItem *item)
-+gchar *exif_item_get_data_as_text(ExifItem *item, ExifData *exif)
- {
- 	return exif_item_get_data_as_text_full(item, METADATA_FORMATTED);
- }
-@@ -1527,11 +1527,11 @@ gchar *exif_get_tag_description_by_key(const gchar *key)
- 	return NULL;
- }
- 
--static void exif_write_item(FILE *f, ExifItem *item)
-+static void exif_write_item(FILE *f, ExifItem *item, ExifData *exif)
- {
- 	gchar *text;
- 
--	text = exif_item_get_data_as_text(item);
-+	text = exif_item_get_data_as_text(item, exif);
- 	if (text)
- 		{
- 		gchar *tag = exif_item_get_tag_name(item);
-@@ -1578,7 +1578,7 @@ void exif_write_data_list(ExifData *exif, FILE *f, gint human_readable_list)
- 			item = (ExifItem*)(work->data);
- 			work = work->next;
- 
--			exif_write_item(f, item);
-+			exif_write_item(f, item, exif);
- 			}
- 		}
- 	g_fprintf(f, "----------------------------------------------------\n");
-diff --git a/src/exif.h b/src/exif.h
-index fcc7d8f5..4b03c201 100644
---- a/src/exif.h
-+++ b/src/exif.h
-@@ -136,7 +136,7 @@ gchar *exif_item_get_data(ExifItem *item, guint *data_len);
- gchar *exif_item_get_description(ExifItem *item);
- guint exif_item_get_format_id(ExifItem *item);
- const gchar *exif_item_get_format_name(ExifItem *item, gboolean brief);
--gchar *exif_item_get_data_as_text(ExifItem *item);
-+gchar *exif_item_get_data_as_text(ExifItem *item, ExifData *exif);
- gint exif_item_get_integer(ExifItem *item, gint *value);
- ExifRational *exif_item_get_rational(ExifItem *item, gint *sign, guint n);
- 
-diff --git a/src/exiv2.cc b/src/exiv2.cc
-index 33b779e7..dc62e8e0 100644
---- a/src/exiv2.cc
-+++ b/src/exiv2.cc
-@@ -778,13 +778,13 @@ const char *exif_item_get_format_name(ExifItem *item, gboolean UNUSED(brief))
- }
- 
- 
--gchar *exif_item_get_data_as_text(ExifItem *item)
-+gchar *exif_item_get_data_as_text(ExifItem *item, ExifData *exif)
- {
- 	try {
- 		if (!item) return nullptr;
- 		auto metadatum = reinterpret_cast<Exiv2::Metadatum *>(item);
- #if EXIV2_TEST_VERSION(0,17,0)
--		return utf8_validate_or_convert(metadatum->print().c_str());
-+		return utf8_validate_or_convert(metadatum->print(&exif->exifData()).c_str());
- #else
- 		std::stringstream str;
- 		Exiv2::Exifdatum *exifdatum;
-From b04f7cd0546976dc4f7ea440648ac0eedd8df3ce Mon Sep 17 00:00:00 2001
-From: Colin Clark <colin.clark@cclark.uk>
-Date: Wed, 21 Jun 2023 14:24:41 +0100
-Subject: [PATCH] Remove exiv2 0.28.0 restriction
-
-https://github.com/BestImageViewer/geeqie/pull/1119
-
-The bug was fixed in the above commit.
----
- meson.build | 12 ++----------
- 1 file changed, 2 insertions(+), 10 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index a4cab49c..412399fe 100644
---- a/meson.build
-+++ b/meson.build
-@@ -280,15 +280,7 @@ else
- endif
- 
- exiv2_dep = []
--# See https://github.com/BestImageViewer/geeqie/issues/1090
--# for the reason for 0.28.0 exclusion
--req_version = ['>=0.11', '!=0.28.0']
--
--req_version_str = ''
--foreach req_version_str_ : req_version
--    req_version_str += req_version_str_
--endforeach
--
-+req_version = '>=0.11'
- option = get_option('exiv2')
- if not option.disabled()
-     exiv2_dep = dependency('exiv2', version : req_version, required : get_option('exiv2'))
-@@ -296,7 +288,7 @@ if not option.disabled()
-         conf_data.set('HAVE_EXIV2', 1)
-         summary({'exiv2' : ['image metadata processed by exiv2:', true]}, section : 'Configuration', bool_yn : true)
-     else
--        summary({'exiv2' : ['exiv2 ' + req_version_str + ' not found - image data not processed by exiv2:', false]}, section : 'Configuration', bool_yn : true)
-+        summary({'exiv2' : ['exiv2 ' + req_version + ' not found - image data not processed by exiv2:', false]}, section : 'Configuration', bool_yn : true)
-     endif
- else
-     summary({'exiv2' : ['disabled - image data processed by exiv2:', false]}, section : 'Configuration', bool_yn : true)
diff --git a/media-gfx/geeqie/files/geeqie-2.1-locale.patch b/media-gfx/geeqie/files/geeqie-2.1-locale.patch
deleted file mode 100644
index 10ae6b0169c5..000000000000
--- a/media-gfx/geeqie/files/geeqie-2.1-locale.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 01d8762d45a2f3871cfd09176edbccdbe73a6767 Mon Sep 17 00:00:00 2001
-From: Thomas Klausner <wiz@gatalith.at>
-Date: Sat, 17 Jun 2023 18:47:28 +0200
-Subject: [PATCH] Add missing header for setlocale().
-
----
- src/misc.cc | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/misc.cc b/src/misc.cc
-index 9942605ce..a2ad3eb69 100644
---- a/src/misc.cc
-+++ b/src/misc.cc
-@@ -18,6 +18,8 @@
-  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-  */
- 
-+#include <locale.h>
-+
- #include "main.h"
- #include "misc.h"
- 
diff --git a/media-gfx/geeqie/files/geeqie-2.1-lua_hpp.patch b/media-gfx/geeqie/files/geeqie-2.1-lua_hpp.patch
deleted file mode 100644
index a0c816b5fb3c..000000000000
--- a/media-gfx/geeqie/files/geeqie-2.1-lua_hpp.patch
+++ /dev/null
@@ -1,19 +0,0 @@
----
- src/lua.cc | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/src/lua.cc b/src/lua.cc
-index 84aa549a..458b658a 100644
---- a/src/lua.cc
-+++ b/src/lua.cc
-@@ -24,9 +24,7 @@
- 
- #define _XOPEN_SOURCE
- 
--#include <lua.h>
--#include <lauxlib.h>
--#include <lualib.h>
-+#include <lua.hpp>
- 
- #include <stdio.h>
- #include <glib.h>
diff --git a/media-gfx/geeqie/files/geeqie-2.3-locale.patch b/media-gfx/geeqie/files/geeqie-2.3-locale.patch
deleted file mode 100644
index 05f8bdcfdaea..000000000000
--- a/media-gfx/geeqie/files/geeqie-2.3-locale.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur geeqie-2.3.orig/src/misc.cc geeqie-2.3/src/misc.cc
---- geeqie-2.3.orig/src/misc.cc	2024-03-06 16:56:22.000000000 +0100
-+++ geeqie-2.3/src/misc.cc	2024-03-25 21:03:18.655779225 +0100
-@@ -23,6 +23,7 @@
- #include <sys/stat.h>
- #include <unistd.h>
- 
-+#include <clocale>
- #include <cstdio>
- #include <cstdlib>
- #include <cstring>
diff --git a/media-gfx/geeqie/files/geeqie-2.5-test-ancillary.patch b/media-gfx/geeqie/files/geeqie-2.5-test-ancillary.patch
new file mode 100644
index 000000000000..ce0802d418ca
--- /dev/null
+++ b/media-gfx/geeqie/files/geeqie-2.5-test-ancillary.patch
@@ -0,0 +1,27 @@
+diff -Naur geeqie-2.5.orig/meson.build geeqie-2.5/meson.build
+--- geeqie-2.5.orig/meson.build	2024-09-21 17:11:19.000000000 +0200
++++ geeqie-2.5/meson.build	2024-09-25 09:30:11.624093709 +0200
+@@ -844,12 +844,6 @@
+     summary({'lua' : ['Test runs:', false]}, section : 'Testing', bool_yn : true)
+ endif
+ 
+-# Ancillary files test
+-test_ancillary_files_sh = find_program('test-ancillary-files.sh', dirs : scriptsdir, required : true)
+-test('Ancillary files', test_ancillary_files_sh, args: [meson.current_source_dir()], timeout: 100, suite : 'analysis')
+-
+-summary({'Ancillary files' : ['Test runs:', true]}, section : 'Testing', bool_yn : true)
+-
+ # Unit tests
+ if conf_data.get('ENABLE_UNIT_TESTS', 0) == 1
+     test('Unit tests', isolate_test_sh, args: [geeqie_exe.full_path(), '--run-unit-tests'], suite : 'unit')
+diff -Naur geeqie-2.5.orig/scripts/untranslated-text.sh geeqie-2.5/scripts/untranslated-text.sh
+--- geeqie-2.5.orig/scripts/untranslated-text.sh	2024-09-21 17:11:19.000000000 +0200
++++ geeqie-2.5/scripts/untranslated-text.sh	2024-09-25 09:30:44.567101060 +0200
+@@ -68,6 +68,7 @@
+ MonoSpace
+ N_(
+ NikonTag
++Néstor
+ Pause
+ PixbufRenderer
+ PluginsMenu
diff --git a/media-gfx/geeqie/geeqie-2.1-r1.ebuild b/media-gfx/geeqie/geeqie-2.1-r1.ebuild
deleted file mode 100644
index 2a7751b70258..000000000000
--- a/media-gfx/geeqie/geeqie-2.1-r1.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-LUA_COMPAT=( lua5-{3,4} )
-
-inherit flag-o-matic lua-single meson optfeature xdg
-
-DESCRIPTION="A lightweight GTK image viewer forked from GQview"
-HOMEPAGE="http://www.geeqie.org"
-SRC_URI="https://github.com/BestImageViewer/${PN}/releases/download/v${PV}/${P}.tar.xz
-	https://dev.gentoo.org/~voyageur/distfiles/${P}-docs.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc x86"
-IUSE="debug djvu exif ffmpegthumbnailer heif jpeg jpeg2k jpegxl lcms lua map pdf raw spell tiff webp xmp zip"
-
-RDEPEND="gnome-extra/zenity
-	virtual/libintl
-	x11-libs/gtk+:3
-	djvu? ( app-text/djvu )
-	exif? ( >=media-gfx/exiv2-0.17:=[xmp?] )
-	ffmpegthumbnailer? ( media-video/ffmpegthumbnailer )
-	heif? ( >=media-libs/libheif-1.3.2 )
-	jpeg2k? ( >=media-libs/openjpeg-2.3.0:2= )
-	jpeg? ( media-libs/libjpeg-turbo:= )
-	jpegxl? ( >=media-libs/libjxl-0.3.7:= )
-	lcms? ( media-libs/lcms:2 )
-	lua? ( ${LUA_DEPS} )
-	map? ( media-libs/clutter-gtk
-		media-libs/libchamplain:0.12[gtk] )
-	pdf? ( >=app-text/poppler-0.62[cairo] )
-	raw? ( >=media-libs/libraw-0.20:= )
-	spell? ( app-text/gspell )
-	tiff? ( media-libs/tiff:= )
-	webp? ( gui-libs/gdk-pixbuf-loader-webp:= )
-	zip? ( >=app-arch/libarchive-3.4.0 )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	|| ( dev-util/xxdi app-editors/vim-core )
-	dev-util/glib-utils
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-locale.patch
-	"${FILESDIR}"/${P}-lua_hpp.patch
-	"${FILESDIR}"/${P}-exiv2-0.28.0.patch
-)
-
-pkg_setup() {
-	# Do not require setting LUA_SINGLE_TARGET if lua is not used
-	use lua && lua-single_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# Disable doc build - not useful most of the time per upstream
-	sed -e "/subdir('doc')/d" -i meson.build || die
-}
-
-src_configure() {
-	# -Werror=odr
-	# https://bugs.gentoo.org/585432
-	# https://github.com/BestImageViewer/geeqie/issues/1270
-	filter-lto
-
-	local emesonargs=(
-		-Dgq_helpdir="share/doc/${PF}"
-		-Dgq_htmldir="share/doc/${PF}/html"
-		$(meson_use debug)
-		$(meson_feature djvu)
-		$(meson_feature exif exiv2)
-		$(meson_feature ffmpegthumbnailer videothumbnailer)
-		$(meson_feature heif)
-		$(meson_feature jpeg)
-		$(meson_feature jpeg2k j2k)
-		$(meson_feature jpegxl)
-		$(meson_feature lcms cms)
-		$(meson_feature lua)
-		$(meson_feature map gps-map)
-		$(meson_feature pdf)
-		$(meson_feature raw libraw)
-		$(meson_feature spell)
-		$(meson_feature tiff)
-		$(meson_feature zip archive)
-	)
-
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	# Manually generated ChangeLog
-	dodoc "${WORKDIR}"/${P}-docs/*
-
-	# The application needs access to some uncompressed doc files.
-	docompress -x /usr/share/doc/${PF}/AUTHORS
-	docompress -x /usr/share/doc/${PF}/ChangeLog
-	docompress -x /usr/share/doc/${PF}/README.md
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	optfeature "Camera import and tethered photography plugins" media-gfx/gphoto2
-	optfeature "Lens ID plugin" media-libs/exiftool
-	optfeature "Image crop plugin" "media-libs/exiftool media-gfx/imagemagick"
-	optfeature "Image rotate plugin (JPEG)" media-gfx/fbida
-	optfeature "Image rotate plugin (TIFF/PNG)" media-gfx/imagemagick
-	optfeature "Print preview functionality" app-text/evince
-}
diff --git a/media-gfx/geeqie/geeqie-2.3.ebuild b/media-gfx/geeqie/geeqie-2.3.ebuild
deleted file mode 100644
index dae22816e4fd..000000000000
--- a/media-gfx/geeqie/geeqie-2.3.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-LUA_COMPAT=( lua5-{3,4} )
-
-inherit flag-o-matic lua-single meson optfeature xdg
-
-DESCRIPTION="A lightweight GTK image viewer forked from GQview"
-HOMEPAGE="http://www.geeqie.org"
-SRC_URI="https://github.com/BestImageViewer/${PN}/releases/download/v${PV}/${P}.tar.xz
-	https://dev.gentoo.org/~voyageur/distfiles/${P}-docs.tar.xz"
-# Doc build:
-# clone git at matching tag
-# mkdir build; ./gen_changelog.sh . build;
-# pandoc README.md -o build/README.html
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~x86"
-IUSE="debug djvu exif ffmpegthumbnailer heif jpeg jpeg2k jpegxl lcms lua map pdf raw spell tiff webp xmp zip"
-
-RDEPEND="gnome-extra/zenity
-	virtual/libintl
-	x11-libs/gtk+:3
-	djvu? ( app-text/djvu )
-	exif? ( >=media-gfx/exiv2-0.17:=[xmp?] )
-	ffmpegthumbnailer? ( media-video/ffmpegthumbnailer )
-	heif? ( >=media-libs/libheif-1.3.2 )
-	jpeg2k? ( >=media-libs/openjpeg-2.3.0:2= )
-	jpeg? ( media-libs/libjpeg-turbo:= )
-	jpegxl? ( >=media-libs/libjxl-0.3.7:= )
-	lcms? ( media-libs/lcms:2 )
-	lua? ( ${LUA_DEPS} )
-	map? ( media-libs/clutter-gtk
-		media-libs/libchamplain:0.12[gtk] )
-	pdf? ( >=app-text/poppler-0.62[cairo] )
-	raw? ( >=media-libs/libraw-0.20:= )
-	spell? ( app-text/gspell )
-	tiff? ( media-libs/tiff:= )
-	webp? ( gui-libs/gdk-pixbuf-loader-webp:= )
-	zip? ( >=app-arch/libarchive-3.4.0 )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	|| ( dev-util/xxdi app-editors/vim-core )
-	dev-util/glib-utils
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
-
-PATCHES=( "${FILESDIR}"/${PN}-2.3-test-ancillary.patch
-	"${FILESDIR}"/${P}-locale.patch
-	)
-
-pkg_setup() {
-	# Do not require setting LUA_SINGLE_TARGET if lua is not used
-	use lua && lua-single_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# Disable doc build - not useful most of the time per upstream
-	sed -e "/subdir('doc')/d" -i meson.build || die
-}
-
-src_configure() {
-	# -Werror=odr
-	# https://bugs.gentoo.org/585432
-	# https://github.com/BestImageViewer/geeqie/issues/1270
-	filter-lto
-
-	local emesonargs=(
-		-Dgq_helpdir="share/doc/${PF}"
-		-Dgq_htmldir="share/doc/${PF}/html"
-		$(meson_use debug)
-		$(meson_feature djvu)
-		$(meson_feature exif exiv2)
-		$(meson_feature ffmpegthumbnailer videothumbnailer)
-		$(meson_feature heif)
-		$(meson_feature jpeg)
-		$(meson_feature jpeg2k j2k)
-		$(meson_feature jpegxl)
-		$(meson_feature lcms cms)
-		$(meson_feature lua)
-		$(meson_feature map gps-map)
-		$(meson_feature pdf)
-		$(meson_feature raw libraw)
-		$(meson_feature spell)
-		$(meson_feature tiff)
-		$(meson_feature zip archive)
-	)
-
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	# Manually generated ChangeLog
-	dodoc "${WORKDIR}"/${P}-docs/*
-
-	# The application needs access to some uncompressed doc files.
-	docompress -x /usr/share/doc/${PF}/AUTHORS
-	docompress -x /usr/share/doc/${PF}/ChangeLog
-	docompress -x /usr/share/doc/${PF}/README.md
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	optfeature "Camera import and tethered photography plugins" media-gfx/gphoto2
-	optfeature "Lens ID plugin" media-libs/exiftool
-	optfeature "Image crop plugin" "media-libs/exiftool media-gfx/imagemagick"
-	optfeature "Image rotate plugin (JPEG)" media-gfx/fbida
-	optfeature "Image rotate plugin (TIFF/PNG)" media-gfx/imagemagick
-	optfeature "Print preview functionality" app-text/evince
-}
diff --git a/media-gfx/geeqie/geeqie-2.4.ebuild b/media-gfx/geeqie/geeqie-2.4.ebuild
index 2b9b96fbe6a9..f388de011d32 100644
--- a/media-gfx/geeqie/geeqie-2.4.ebuild
+++ b/media-gfx/geeqie/geeqie-2.4.ebuild
@@ -4,10 +4,10 @@
 EAPI=8
 LUA_COMPAT=( lua5-{3,4} )
 
-inherit flag-o-matic lua-single meson optfeature xdg
+inherit lua-single meson optfeature xdg
 
 DESCRIPTION="A lightweight GTK image viewer forked from GQview"
-HOMEPAGE="http://www.geeqie.org"
+HOMEPAGE="https://www.geeqie.org"
 SRC_URI="https://github.com/BestImageViewer/${PN}/releases/download/v${PV}/${P}.tar.xz
 	https://dev.gentoo.org/~voyageur/distfiles/${P}-docs.tar.xz"
 # Doc build:
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/BestImageViewer/${PN}/releases/download/v${PV}/${P}.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc x86"
 IUSE="debug djvu exif ffmpegthumbnailer heif jpeg jpeg2k jpegxl lcms lua map pdf raw spell tiff webp xmp zip"
 
 RDEPEND="gnome-extra/zenity
@@ -64,11 +64,6 @@ src_prepare() {
 }
 
 src_configure() {
-	# -Werror=odr
-	# https://bugs.gentoo.org/585432
-	# https://github.com/BestImageViewer/geeqie/issues/1270
-	filter-lto
-
 	local emesonargs=(
 		-Dgq_helpdir="share/doc/${PF}"
 		-Dgq_htmldir="share/doc/${PF}/html"
diff --git a/media-gfx/geeqie/geeqie-2.2.ebuild b/media-gfx/geeqie/geeqie-2.5.ebuild
index db97d02cdbaa..8b572c0532f3 100644
--- a/media-gfx/geeqie/geeqie-2.2.ebuild
+++ b/media-gfx/geeqie/geeqie-2.5.ebuild
@@ -4,10 +4,10 @@
 EAPI=8
 LUA_COMPAT=( lua5-{3,4} )
 
-inherit flag-o-matic lua-single meson optfeature xdg
+inherit lua-single meson optfeature xdg
 
 DESCRIPTION="A lightweight GTK image viewer forked from GQview"
-HOMEPAGE="http://www.geeqie.org"
+HOMEPAGE="https://www.geeqie.org"
 SRC_URI="https://github.com/BestImageViewer/${PN}/releases/download/v${PV}/${P}.tar.xz
 	https://dev.gentoo.org/~voyageur/distfiles/${P}-docs.tar.xz"
 # Doc build:
@@ -49,6 +49,8 @@ BDEPEND="
 
 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
 
+PATCHES=( "${FILESDIR}"/${PN}-2.5-test-ancillary.patch )
+
 pkg_setup() {
 	# Do not require setting LUA_SINGLE_TARGET if lua is not used
 	use lua && lua-single_pkg_setup
@@ -62,11 +64,6 @@ src_prepare() {
 }
 
 src_configure() {
-	# -Werror=odr
-	# https://bugs.gentoo.org/585432
-	# https://github.com/BestImageViewer/geeqie/issues/1270
-	filter-lto
-
 	local emesonargs=(
 		-Dgq_helpdir="share/doc/${PF}"
 		-Dgq_htmldir="share/doc/${PF}/html"
diff --git a/media-gfx/geeqie/geeqie-9999.ebuild b/media-gfx/geeqie/geeqie-9999.ebuild
index 739e6f7323f0..54d5d3c640fa 100644
--- a/media-gfx/geeqie/geeqie-9999.ebuild
+++ b/media-gfx/geeqie/geeqie-9999.ebuild
@@ -4,10 +4,10 @@
 EAPI=8
 LUA_COMPAT=( lua5-{3,4} )
 
-inherit flag-o-matic git-r3 lua-single meson optfeature xdg
+inherit git-r3 lua-single meson optfeature xdg
 
 DESCRIPTION="A lightweight GTK image viewer forked from GQview"
-HOMEPAGE="http://www.geeqie.org"
+HOMEPAGE="https://www.geeqie.org"
 # Using github mirror, as geeqie.org does not have a valid SSL certificate
 EGIT_REPO_URI="https://github.com/BestImageViewer/geeqie.git"
 
@@ -57,11 +57,6 @@ src_prepare() {
 }
 
 src_configure() {
-	# -Werror=odr
-	# https://bugs.gentoo.org/585432
-	# https://github.com/BestImageViewer/geeqie/issues/1270
-	filter-lto
-
 	local emesonargs=(
 		-Dgq_helpdir="share/doc/${PF}"
 		-Dgq_htmldir="share/doc/${PF}/html"
diff --git a/media-gfx/gifsicle/Manifest b/media-gfx/gifsicle/Manifest
index a85cdfe10a3c..9c3701d29531 100644
--- a/media-gfx/gifsicle/Manifest
+++ b/media-gfx/gifsicle/Manifest
@@ -1,6 +1,8 @@
 AUX gifsicle-1.94-CVE-2023-46009.patch 3192 BLAKE2B 01926ce195db5f9ef1a5e7bd3d10ddb9d537306c036ad827363be8bb0104c32d9b41b1350879807493ae361e1d9a9c2b20bbb83d251dd89286ab6334d2fd1ba1 SHA512 0e1372e5d8b77522869f7bd3fd6ea0f1a2bcc424e30980936bfd61aabe5e6bb2b86c4e63f9d09d3fb9bf14f705ab1acc20fcb7e991059c1e6f9b0c1d1b74ac45
 DIST gifsicle-1.93.tar.gz 578194 BLAKE2B c5635fc736e2fd97278ab97377663f9702d2891cab5e19b16fa1aa53412ae48945d82ee42e9690208532cb854c99397ec4c1a11d4521454d8d40efd9adfd9d2a SHA512 1ace2c9597a405d69bb9dfa24764a3d7c7dd9864e1832d25a4a7ad2e32780038206b889711846d6e4dbc7189482d0d03874f18d86966ebffbc4ee10569c390d3
 DIST gifsicle-1.94.tar.gz 579194 BLAKE2B 0d6a734d6340938579633061cbff1f702c33adf7c206d3120488fa4a14eb69ef2f5838ee42b92cb371fa39398b57114c6315308d83fd951c399d9d6c3b3986d0 SHA512 5dc84332d929bc765b642f31fb79ed2998b193985070513cb3e412bca519c7c6065537c14df13e9860ae09dc5c66a06ca5475b1fdee62cd9509d42a5e2d0c9b6
+DIST gifsicle-1.95.tar.gz 579636 BLAKE2B 32af2f786328b059745828ade184eea216e147abbb8023cb681c2d37a40a4abc9d0f32bb60a322b17f1af03a5e2c566b194e4c6a8d685e0697f90497294a9c81 SHA512 888bb3f4501ce3f12e810045bb432c9e56952df1def565e4a8983529856b00be8e79d9df148858fe2a327d1dd751eb71280e17c8e0426e68290b0dfe02247891
 EBUILD gifsicle-1.93.ebuild 639 BLAKE2B 9c8080193dfaf712da47ac9855142d171861e9568849065e30f03fcc6be0318afc62708f3b3795ba49ef0facc375c77f269a6da2915d055d7f85fca2dec683a1 SHA512 cd058a074484f0aab0730acc8b09b79443e8db055d3f0429279fb0f519cbfb1ea4620209fffaf5a2d0d30e2f44c057be7cb36214cf63afd1274c20c616928a2e
 EBUILD gifsicle-1.94.ebuild 692 BLAKE2B 5fb85a58d2314fec8932e3a6a454af6f62fe6c3ebb972dc20e3dd6217c311a79ac2ff3047aebd4c5345d284d7fe53e97207d63c9dad0f8544a1536acd78dc5d2 SHA512 e450adba95543e25644809d1ac2efcc323ce341923e218e35014c060099b39f9c5fd9e138e6fb16f8727832c1ba218642bccd8c965f67db1b50e893ba633d8aa
+EBUILD gifsicle-1.95.ebuild 612 BLAKE2B cd8f49e195c3998b63192ec0651d0b59777d50eb1e9724be146c40fdfba81d3f9474b9e35d4975de3553387919f34e8e1a46f9fc67fc97ab7845069a38fada3d SHA512 bd2f423fb3e868850bf386ca5130680e31afb752bbf2010c60371ed3de66fc685eeb1c65375d21d7256cdbda8c0961938591470f1684905da0aac1aa9ae020c2
 MISC metadata.xml 248 BLAKE2B da21909c8724c7dd7cf27c3ee2fc6a032610f4863f0ff1fc4ff62d317bd8293b4ce63bf4b2f929d8768dcd449aa00aa927033b26e9dca357247aa9361bc3327e SHA512 28c710eb4b97dc08e939fa72c3ee2f834df2743f0146a7a6163a51bdf1166669bbaf05c4716a208d1b393504118150172b9d744bcc41ce23dd85e90599b731e8
diff --git a/media-gfx/gifsicle/gifsicle-1.95.ebuild b/media-gfx/gifsicle/gifsicle-1.95.ebuild
new file mode 100644
index 000000000000..9d95e9385b78
--- /dev/null
+++ b/media-gfx/gifsicle/gifsicle-1.95.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Create, manipulate, and optimize GIF images and animations"
+HOMEPAGE="https://www.lcdf.org/~eddietwo/gifsicle/ https://github.com/kohler/gifsicle"
+SRC_URI="https://www.lcdf.org/~eddietwo/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2 MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="X"
+
+RDEPEND="
+	X? (
+		x11-libs/libX11
+		x11-libs/libXt
+	)
+"
+DEPEND="${RDEPEND}
+	X? ( x11-base/xorg-proto )"
+
+src_configure() {
+	econf $(use_enable X gifview)
+}
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index 1ef14746904a..b7e96fb30cb7 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -6,10 +6,12 @@ AUX gimp-2.10_fix_musl_backtrace_backend_switch.patch 535 BLAKE2B 374433568330a4
 AUX gimp-2.10_fix_test-appdata.patch 902 BLAKE2B 2b1a131d874d65422d8bdd44732b9843d89a570a1ea3c058cdb2a424a7791c686aa0e2ae2a0b472f333f2465f6e1a26750a532e9003933c5dffa1af32343c1dc SHA512 2983e8572f5e8113c9e2f564d31c1a5fe7e11ef273c50d2be739089124c6ec1a457da28222020bbd6015b2cbbcbf403b88d8660b9b35241800deb4fb3ad79067
 DIST gimp-2.10.34.tar.bz2 31405329 BLAKE2B 0b2d3a81abf89684bb90e2101896db3479a25c5da76738543dba8d0378e64608eee9aeb24888e15f5e347f72fa1df3e9b82aa27e503ee61d1c4d45d44fa7bddc SHA512 4802ce3758daba868570f1ac97a3f1cb41e1130fcc6376f9bf4c999441f8fd25937aa71b6f726d82d7c780f4153b11d2595bb76bc2356a42266909fbcc0bd34a
 DIST gimp-2.10.36.tar.bz2 31532334 BLAKE2B d033cd1407df3399b5968b7e3f7838d288143080b516476a5dd46599b6a84ac2efca591521368cef7a1c3d9935b45ed3262fb469e1ae36ccf60a1199f5cfa44d SHA512 dbe6152ea6ff99cca59bbf2c88a64fb4ff6b529d98ace7723eadf5dfb0e10d9cbaf2de1e0d5251e9ecf9abca73da9ae1a501f229997802fd4077fb9594f4ba66
+DIST gimp-2.10.38.tar.bz2 31698453 BLAKE2B 58c29e3e00d873e69a5e5f4e9c3ff4d868ccfb11914570306ef12c54ca7d3ef89a62d8c71fac1f2d1f426ac615dc4caf7a7260351c00301dce2b1aa4193bab6d SHA512 343bf1c3bd14bf8e7c7af79c05920faca213da68549127c1d8af53e2e872e55aeaf39a3cfcf578183a34fdc4f98e1c859be63956b0611067186eefd1fdee2aaa
 DIST gimp-2.99.18.tar.xz 25418968 BLAKE2B ccb76bb5c375925d4d71505f3e1546f05ba0e20533859b1b6250a4d9054efb6bec4927a5e0c525272fa24d5a6bdf4fb7881d60a1d34b1210ee38b90e661ef707 SHA512 151ccd0322601e76ed0198b40832ab0b6c138428f2e75806dd558e29c9b3437d9226a243142bf4a86113fa5ea4f5965b99cf7cd0ab0ecb7bdfc48036de35a9c6
-EBUILD gimp-2.10.34-r2.ebuild 5882 BLAKE2B 67a9b4c0707f3027f34ba6276b8ac6fd2709e09f7416be0b05b9cc56ec58e27bfea86d4bf726588db9d927ede4b5549c2068e8a30c8d95c34ba269aad0f665bf SHA512 f058ba4ddaeebb02a4bb8cef3e8f5ac867df776f8750e2470c8695647538520984f072e9b5f9a0f3bbce6c3695098e0028c2ead31dd188df3b8221fc6be8b51f
-EBUILD gimp-2.10.36-r2.ebuild 6001 BLAKE2B e2b78361ae0d4703479e8b9c1a62e99f7099b80a9267ad6b056a15f30a0bba79da7b697af38d76e736ecc01aca6b0a331b90fc7f20060e6872c1854ac56d9ec1 SHA512 cdc970e8766da37a2103010214313a6dd54ce1acfb9bc390aad47474914801884dbff8900ae62107d1c1780a9ccae3803abea10a72827816dff9b72572aab97d
-EBUILD gimp-2.10.36.ebuild 5854 BLAKE2B 811d0ea7218ec368006864732bf94c6f07c7cdb2eeffc1df5deda811bc8cecd76ffa4f17230dd91313fe59ae803a35dc20c6be7e53e2b2143db24ba7dbf57dc8 SHA512 8ad6430138b98b4d384f3657f45733a5e1bd59db25b9619a4593d51af35bcd7b5cfbbe54587cb4f72b54fa1dfeac32a31d4727d0ddb666154810261806188040
-EBUILD gimp-2.99.18.ebuild 7178 BLAKE2B 513d508da711c4c2b57b1df77865a0cbf93a2090fb2669ad6f58cb550fa941445510ccf3592652b025f1ca246162ba3a2a677b8175561067a5a699cfae0b9705 SHA512 58c3695b76c50ab18ae63c35cff5b8f9f13c660b56c3359d064a247a5ea53252b0067a37e6641643c5996232e3b94071ca13772331fe528daaafe2e509c70fc4
-EBUILD gimp-9999.ebuild 7112 BLAKE2B ed4cd65d3e82d45cd102b032dd65d747284cf3140fbc714a87992bffa4eac698f064cd77c56ac8dc4451481beeead8b04e9977fd2ca5c2f5182af03228502f2b SHA512 e1ad4a4d97b17742a27d36b20368e33e9e3e78445ea464a0451e312db495fc79c0d588206f2d096086c178db310e9a7bcd95d1df353b17a0e9c0e97b52f7ed91
-MISC metadata.xml 579 BLAKE2B 7766f3da8488794ee014731965efd289e9e95d07631cd7f08ce9469fb33ed1ada31b646f337afcbb3a540d4de83fa5764fc2aa18c4b132341520d4717c7b251d SHA512 9bf1c5c4442af756e6ce40a7399f096ed1732c095eafdb4ff580e4122154e2549d9e8c36a7cc0391f0bd49c07422c5c59123278d62645330aeefdc9130aef182
+EBUILD gimp-2.10.34-r2.ebuild 5876 BLAKE2B 3d72df6dac5721ac74fd47c157e13f5c399c3224ddf1fe085f0bc1fc8acd846562741a177c16f3bd43ba5260f6157ff7b3631a6002553a4f85c8943f9f2a1912 SHA512 f192aa55d07a28c496da08f12dec087d03274aa80074d8f9b31c3ee0f0f63ad63741d1a3616f57369946acf03af4cd4c53cb5650ea3fde48e2b0f1b3767a8518
+EBUILD gimp-2.10.36-r2.ebuild 5995 BLAKE2B 1f77030a4f8343470e6d4dd16fb360ca6a0ab1507d997ada0b7b972a35624f1519e61fa858a7b48e01a5b397f938005f56bde7413fe06d6d35ce01daa2c36278 SHA512 c35df760d577fe49f19acaa8de13cc8b895b2f296bf0ef1d29bbb140e1bedab026ce7c9af5770956d77fed019a58b62cad6c92ea9587134e4312db04af9d0a0a
+EBUILD gimp-2.10.36.ebuild 5848 BLAKE2B 7207523c8dc66bc891df7d655292651eb29d4103236a714cf7bc0f53562ba93cfb8fb0ac2d1f3c217f6a3e41317c20adf15750aa88b4a7f4a1ed0c09d3298823 SHA512 4a2945618f52513da641605f07cde9400d50b0b03542140a76642ccdefc9bb1c6c01318f53f611f4f562e70f106b417759f4c0d0d7b50178a0b8c4545e09186c
+EBUILD gimp-2.10.38.ebuild 6107 BLAKE2B f21eca08193517dbf24da83dbd6a36357a6dd4f38c5fe9cd3e75a3cacbbee32fea477ee2bc967b426f0e0f0dd4f01dd65f679b2554a3132943b26b10535aa154 SHA512 f6f81ad5a2bc57465a0dd926da708c0067a309bd1dd600965d73253808ddae0e38a371845757f9251914b9c32c3bbc88d6f8dc28c16957d4b887f8a4de5a5802
+EBUILD gimp-2.99.18-r1.ebuild 7253 BLAKE2B 0c95a252589be3d821a73b7651e866207928cee724d16e934f585bd9080869620d1b20546672ddf229ef59bd21f54d5906da19bf2bafab76d479b05b3adfc403 SHA512 042f9a4d904d2be0bedbb6dde123a7d12f8c43b7502990e2a0c6884c287522db8e0bfeebc0fa621a54992739482db4a8b8f3675ba7f5af33999ea4c390f6bf37
+EBUILD gimp-9999.ebuild 7261 BLAKE2B bc600ce49c014d66c1b0101df3256a75eb223654c5fd912e43d8c4560288d6b2baddf7b8595e60306621c71a3a87813a52b391364274fb9d7b13817ec642cbb7 SHA512 adfea86c9eb9b3bb82ff319289b241a20912a24b7b9e09296d27ac2a71ae78d8ea20a68e28a6e7275551a035d009bf0673c428308465f9b989f5aca7808fe626
+MISC metadata.xml 655 BLAKE2B f6628a2c5edb90b16db0f59af05446a3f31316f5558ece238d30c9350632713cf2db3d315c90b31229596659ec20859c17fde6b051f9ab8f8fe34d64902dad57 SHA512 712a259ae41d9052bde0761087928685b9b66a132db3f3b49121241d87728f51bf31a00541aa385bd03b57a2e2a03a0176356045dd4752485a8dca2bd61c5886
diff --git a/media-gfx/gimp/gimp-2.10.34-r2.ebuild b/media-gfx/gimp/gimp-2.10.34-r2.ebuild
index 1ca3948ad794..697f118424cd 100644
--- a/media-gfx/gimp/gimp-2.10.34-r2.ebuild
+++ b/media-gfx/gimp/gimp-2.10.34-r2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.gimp.org/"
 SRC_URI="mirror://gimp/v$(ver_cut 1-2)/${P}.tar.bz2"
 LICENSE="GPL-3+ LGPL-3+"
 SLOT="0/2"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv x86"
 
 IUSE="aalib alsa aqua debug doc gnome heif jpeg2k jpegxl mng openexr postscript udev unwind vector-icons webp wmf xpm cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse"
 
diff --git a/media-gfx/gimp/gimp-2.10.36-r2.ebuild b/media-gfx/gimp/gimp-2.10.36-r2.ebuild
index 84edf850eedd..3f4740a9243d 100644
--- a/media-gfx/gimp/gimp-2.10.36-r2.ebuild
+++ b/media-gfx/gimp/gimp-2.10.36-r2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.gimp.org/"
 SRC_URI="mirror://gimp/v$(ver_cut 1-2)/${P}.tar.bz2"
 LICENSE="GPL-3+ LGPL-3+"
 SLOT="0/2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86"
 
 IUSE="aalib alsa aqua debug doc gnome heif jpeg2k jpegxl mng openexr postscript udev unwind vector-icons webp wmf xpm cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse"
 
diff --git a/media-gfx/gimp/gimp-2.10.36.ebuild b/media-gfx/gimp/gimp-2.10.36.ebuild
index 21b127bca46b..2407c368ab63 100644
--- a/media-gfx/gimp/gimp-2.10.36.ebuild
+++ b/media-gfx/gimp/gimp-2.10.36.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.gimp.org/"
 SRC_URI="mirror://gimp/v$(ver_cut 1-2)/${P}.tar.bz2"
 LICENSE="GPL-3+ LGPL-3+"
 SLOT="0/2"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv x86"
 
 IUSE="aalib alsa aqua debug doc gnome heif jpeg2k jpegxl mng openexr postscript udev unwind vector-icons webp wmf xpm cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse"
 
diff --git a/media-gfx/gimp/gimp-2.10.38.ebuild b/media-gfx/gimp/gimp-2.10.38.ebuild
new file mode 100644
index 000000000000..013da52ecc68
--- /dev/null
+++ b/media-gfx/gimp/gimp-2.10.38.ebuild
@@ -0,0 +1,226 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GNOME2_EAUTORECONF=yes
+WANT_AUTOMAKE=
+
+inherit autotools gnome2 toolchain-funcs virtualx
+
+DESCRIPTION="GNU Image Manipulation Program"
+HOMEPAGE="https://www.gimp.org/"
+SRC_URI="mirror://gimp/v$(ver_cut 1-2)/${P}.tar.bz2"
+LICENSE="GPL-3+ LGPL-3+"
+SLOT="0/2"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv x86"
+
+IUSE="aalib alsa aqua debug doc gnome heif jpeg2k jpegxl mng openexr postscript udev unwind vector-icons webp wmf xpm cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse"
+
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	>=app-accessibility/at-spi2-core-2.50.1
+	app-arch/bzip2
+	app-arch/xz-utils
+	>=app-text/poppler-0.50[cairo]
+	>=app-text/poppler-data-0.4.7
+	>=dev-libs/glib-2.56.2:2
+	>=dev-libs/json-glib-1.2.6
+	>=gnome-base/librsvg-2.40.6:2
+	>=media-gfx/mypaint-brushes-2.0.2:=
+	>=media-libs/babl-0.1.98
+	>=media-libs/fontconfig-2.12.4
+	>=media-libs/freetype-2.1.7
+	>=media-libs/gegl-0.4.40:0.4[cairo]
+	>=media-libs/gexiv2-0.10.6
+	>=media-libs/harfbuzz-0.9.19:=
+	>=media-libs/lcms-2.8:2
+	media-libs/libjpeg-turbo:=
+	>=media-libs/libmypaint-1.6.1:=
+	>=media-libs/libpng-1.6.25:0=
+	>=media-libs/tiff-3.5.7:=
+	net-libs/glib-networking[ssl]
+	sys-libs/zlib
+	>=x11-libs/cairo-1.12.2
+	>=x11-libs/gdk-pixbuf-2.31:2
+	>=x11-libs/gtk+-2.24.32:2
+	x11-libs/libX11
+	x11-libs/libXcursor
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXmu
+	>=x11-libs/pango-1.29.4
+	aalib? ( media-libs/aalib )
+	alsa? ( >=media-libs/alsa-lib-1.0.0 )
+	aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 )
+	heif? ( >=media-libs/libheif-1.9.1:= )
+	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= )
+	jpegxl? ( >=media-libs/libjxl-0.7.0:= )
+	mng? ( media-libs/libmng:= )
+	openexr? ( >=media-libs/openexr-1.6.1:= )
+	postscript? ( app-text/ghostscript-gpl:= )
+	udev? ( dev-libs/libgudev )
+	unwind? ( >=sys-libs/libunwind-1.1.0:= )
+	webp? ( >=media-libs/libwebp-0.6.0:= )
+	wmf? ( >=media-libs/libwmf-0.2.8 )
+	xpm? ( x11-libs/libXpm )
+"
+
+RDEPEND="
+	${COMMON_DEPEND}
+	x11-themes/hicolor-icon-theme
+	gnome? ( gnome-base/gvfs )
+"
+
+DEPEND="
+	${COMMON_DEPEND}
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+"
+
+BDEPEND="
+	>=dev-build/gtk-doc-am-1
+	>=dev-lang/perl-5.10.0
+	dev-libs/appstream-glib
+	dev-util/gtk-update-icon-cache
+	>=dev-util/intltool-0.40.1
+	>=sys-devel/gettext-0.19.8
+	>=dev-build/libtool-2.2
+	virtual/pkgconfig
+"
+
+DOCS=( "AUTHORS" "ChangeLog" "HACKING" "NEWS" "README" "README.i18n" )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.10_fix_test-appdata.patch" # Bugs 685210 (and duplicate 691070)
+	"${FILESDIR}/${PN}-2.10_fix_musl_backtrace_backend_switch.patch" #900148
+	"${FILESDIR}/${PN}-2.10_fix_configure_GCC13_implicit_function_declarations.patch" #899796
+	"${FILESDIR}/${PN}-2.10.36_c99_tiff.patch" #919282
+	"${FILESDIR}/${PN}-2.10.36_c99_metadata.patch" #919282
+)
+
+src_prepare() {
+	sed -i -e 's/mypaint-brushes-1.0/mypaint-brushes-2.0/' configure.ac || die #737794
+
+	sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864
+	sed 's/-DGIMP_DISABLE_DEPRECATED/-DGIMP_protect_DISABLE_DEPRECATED/g' -i configure.ac || die #615144
+
+	gnome2_src_prepare  # calls eautoreconf
+
+	sed 's/-DGIMP_protect_DISABLE_DEPRECATED/-DGIMP_DISABLE_DEPRECATED/g' -i configure || die #615144
+	grep -F -q GIMP_DISABLE_DEPRECATED configure || die #615144, self-test
+
+	export CC_FOR_BUILD="$(tc-getBUILD_CC)"
+}
+
+_adjust_sandbox() {
+	# Bugs #569738 and #591214
+	local nv
+	for nv in /dev/nvidia-uvm /dev/nvidiactl /dev/nvidia{0..9} ; do
+		# We do not check for existence as they may show up later
+		# https://bugs.gentoo.org/show_bug.cgi?id=569738#c21
+		addwrite "${nv}"
+	done
+
+	addwrite /dev/dri/  # bugs #574038 and #684886
+	addwrite /dev/ati/  # bug #589198
+	addwrite /proc/mtrr  # bug #589198
+}
+
+src_configure() {
+	_adjust_sandbox
+
+	local myconf=(
+		GEGL="${EPREFIX}"/usr/bin/gegl-0.4
+		GDBUS_CODEGEN="${EPREFIX}"/bin/false
+
+		--enable-default-binary
+
+		--disable-check-update
+		--disable-python
+		--enable-mp
+		--with-appdata-test
+		--with-bug-report-url=https://bugs.gentoo.org/
+		--with-xmc
+		--without-libbacktrace
+		--without-webkit
+		--without-xvfb-run
+		$(use_enable cpu_flags_ppc_altivec altivec)
+		$(use_enable cpu_flags_x86_mmx mmx)
+		$(use_enable cpu_flags_x86_sse sse)
+		$(use_enable debug)
+		$(use_enable vector-icons)
+		$(use_with aalib aa)
+		$(use_with alsa)
+		$(use_with !aqua x)
+		$(use_with heif libheif)
+		$(use_with jpeg2k jpeg2000)
+		$(use_with jpegxl)
+		$(use_with mng libmng)
+		$(use_with openexr)
+		$(use_with postscript gs)
+		$(use_with udev gudev)
+		$(use_with unwind libunwind)
+		$(use_with webp)
+		$(use_with wmf)
+		$(use_with xpm libxpm)
+	)
+
+	gnome2_src_configure "${myconf[@]}"
+}
+
+src_compile() {
+	export XDG_DATA_DIRS="${EPREFIX}"/usr/share  # bug 587004
+	gnome2_src_compile
+}
+
+# for https://bugs.gentoo.org/664938
+_rename_plugins() {
+	einfo 'Renaming plug-ins to not collide with pre-2.10.6 file layout (bug #664938)...'
+	local prename=gimp-org-
+	(
+		cd "${ED}"/usr/$(get_libdir)/gimp/2.0/plug-ins || die
+		for plugin_slash in $(ls -d1 */); do
+		    plugin=${plugin_slash%/}
+		    if [[ -f ${plugin}/${plugin} ]]; then
+			# NOTE: Folder and file name need to match for Gimp to load that plug-in
+			#       so "file-svg/file-svg" becomes "${prename}file-svg/${prename}file-svg"
+			mv ${plugin}/{,${prename}}${plugin} || die
+			mv {,${prename}}${plugin} || die
+		    fi
+		done
+	)
+}
+
+src_test() {
+	virtx emake check
+}
+
+src_install() {
+	gnome2_src_install
+
+	# Workaround for bug #321111 to give GIMP the least
+	# precedence on PDF documents by default
+	mv "${ED}"/usr/share/applications/{,zzz-}gimp.desktop || die
+
+	find "${ED}" -name '*.la' -type f -delete || die
+
+	# Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527)
+	local gimp_app_version=$(ver_cut 1-2)
+	mv "${ED}"/usr/share/man/man1/gimp-console{-${gimp_app_version},}.1 || die
+
+	# Remove gimp devel-docs html files if user doesn't need it
+	if ! use doc; then
+		rm -r "${ED}"/usr/share/gtk-doc || die
+	fi
+
+	_rename_plugins || die
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+}
diff --git a/media-gfx/gimp/gimp-2.99.18.ebuild b/media-gfx/gimp/gimp-2.99.18-r1.ebuild
index 48f5c21117db..a206f158550c 100644
--- a/media-gfx/gimp/gimp-2.99.18.ebuild
+++ b/media-gfx/gimp/gimp-2.99.18-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://gimp/v$(ver_cut 1-2)/${P}.tar.xz"
 LICENSE="GPL-3+ LGPL-3+"
 SLOT="0/3"
 
-IUSE="X aalib alsa doc gnome heif javascript jpeg2k jpegxl lua mng openexr openmp postscript python test udev unwind vala vector-icons webp wmf xpm"
+IUSE="X aalib alsa doc fits gnome heif javascript jpeg2k jpegxl lua mng openexr openmp postscript python test udev unwind vala vector-icons webp wmf xpm"
 REQUIRED_USE="
 	lua? ( ${LUA_REQUIRED_USE} )
 	python? ( ${PYTHON_REQUIRED_USE} )
@@ -57,6 +57,7 @@ COMMON_DEPEND="
 	>=x11-libs/libXmu-1.1.4
 	aalib? ( media-libs/aalib )
 	alsa? ( >=media-libs/alsa-lib-1.0.0 )
+	fits? ( sci-libs/cfitsio )
 	heif? ( >=media-libs/libheif-1.13.0:= )
 	javascript? ( dev-libs/gjs )
 	jpeg2k? ( >=media-libs/openjpeg-2.3.1:2= )
@@ -173,11 +174,13 @@ src_configure() {
 		-Denable-multiproc=true
 		-Dappdata-test=disabled
 		-Dbug-report-url=https://bugs.gentoo.org/
+		-Dilbm=disabled
 		-Dlibbacktrace=false
 		-Dwebkit-unmaintained=false
 		$(meson_feature aalib aa)
 		$(meson_feature alsa)
 		$(meson_feature doc gi-docgen)
+		$(meson_feature fits)
 		$(meson_feature heif)
 		$(meson_feature javascript)
 		$(meson_feature jpeg2k jpeg2000)
diff --git a/media-gfx/gimp/gimp-9999.ebuild b/media-gfx/gimp/gimp-9999.ebuild
index 6ed419a59545..477c892d26a4 100644
--- a/media-gfx/gimp/gimp-9999.ebuild
+++ b/media-gfx/gimp/gimp-9999.ebuild
@@ -15,10 +15,10 @@ EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/gimp.git"
 LICENSE="GPL-3+ LGPL-3+"
 SLOT="0/3"
 
-IUSE="X aalib alsa doc gnome heif javascript jpeg2k jpegxl lua mng openexr openmp postscript python test udev unwind vala vector-icons webp wmf xpm"
+IUSE="X aalib alsa doc gnome heif javascript jpeg2k jpegxl lua mng openexr openmp postscript test udev unwind vala vector-icons webp wmf xpm"
 REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
 	lua? ( ${LUA_REQUIRED_USE} )
-	python? ( ${PYTHON_REQUIRED_USE} )
 "
 
 RESTRICT="!test? ( test )"
@@ -26,6 +26,10 @@ RESTRICT="!test? ( test )"
 # media-libs/{babl,gegl} are required to be built with USE="introspection"
 # to fix the compilation checking of /usr/share/gir-1.0/{Babl-0.1gir,Gegl-0.4.gir}
 COMMON_DEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		>=dev-python/pygobject-3.0:3[${PYTHON_USEDEP}]
+	')
 	>=app-accessibility/at-spi2-core-2.46.0
 	>=app-text/poppler-0.90.1[cairo]
 	>=app-text/poppler-data-0.4.9
@@ -36,10 +40,10 @@ COMMON_DEPEND="
 	dev-libs/libxslt
 	>=gnome-base/librsvg-2.40.21:2
 	>=media-gfx/mypaint-brushes-2.0.2:=
-	>=media-libs/babl-0.1.98[introspection,lcms,vala?]
+	>=media-libs/babl-9999[introspection,lcms,vala?]
 	>=media-libs/fontconfig-2.12.6
 	>=media-libs/freetype-2.10.2
-	>=media-libs/gegl-0.4.48:0.4[cairo,introspection,lcms,vala?]
+	>=media-libs/gegl-9999[cairo,introspection,lcms,vala?]
 	>=media-libs/gexiv2-0.14.0
 	>=media-libs/harfbuzz-2.6.5:=
 	>=media-libs/lcms-2.13.1:2
@@ -69,12 +73,6 @@ COMMON_DEPEND="
 	mng? ( media-libs/libmng:= )
 	openexr? ( >=media-libs/openexr-2.3.0:= )
 	postscript? ( app-text/ghostscript-gpl:= )
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			>=dev-python/pygobject-3.0:3[${PYTHON_USEDEP}]
-		')
-	)
 	udev? ( >=dev-libs/libgudev-167:= )
 	unwind? ( >=sys-libs/libunwind-1.1.0:= )
 	webp? ( >=media-libs/libwebp-0.6.0:= )
@@ -116,11 +114,12 @@ pkg_pretend() {
 
 pkg_setup() {
 	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-
+	python-single-r1_pkg_setup
 	use lua && lua-single_pkg_setup
 
-	if use python; then
-		python-single-r1_pkg_setup
+	if has_version ">=media-libs/babl-9999" || has_version ">=media-libs/gegl-9999"; then
+		ewarn "Please make sure to rebuid media-libs/babl-9999 and media-libs/gegl-9999 packages"
+		ewarn "before building media-gfx/gimp-9999 to have their latest master branch versions."
 	fi
 }
 
@@ -182,7 +181,6 @@ src_configure() {
 		$(meson_feature openexr)
 		$(meson_feature openmp)
 		$(meson_feature postscript ghostscript)
-		$(meson_feature python)
 		$(meson_feature test headless-tests)
 		$(meson_feature udev gudev)
 		$(meson_feature vala)
@@ -208,7 +206,7 @@ _rename_plugins() {
 	einfo 'Renaming plug-ins to not collide with pre-2.10.6 file layout (bug #664938)...'
 	local prename=gimp-org-
 	(
-		cd "${ED}"/usr/$(get_libdir)/gimp/2.99/plug-ins || exit 1
+		cd "${ED}"/usr/$(get_libdir)/gimp/3.0/plug-ins || exit 1
 		for plugin_slash in $(ls -d1 */); do
 			plugin=${plugin_slash%/}
 			if [[ -f ${plugin}/${plugin} ]]; then
@@ -229,9 +227,7 @@ src_test() {
 src_install() {
 	meson_src_install
 
-	if use python; then
-		python_optimize
-	fi
+	python_optimize
 
 	# Workaround for bug #321111 to give GIMP the least
 	# precedence on PDF documents by default
diff --git a/media-gfx/gimp/metadata.xml b/media-gfx/gimp/metadata.xml
index 7f947b8fb0b5..23efd9862ca5 100644
--- a/media-gfx/gimp/metadata.xml
+++ b/media-gfx/gimp/metadata.xml
@@ -10,6 +10,7 @@
 		<name>Proxy Maintainers</name>
 	</maintainer>
 	<use>
+		<flag name="fits">Enable support for loading/exporting FITS images</flag>
 		<flag name="vector-icons">Enable support for vector icons (experimental)</flag>
 	</use>
 	<upstream>
diff --git a/media-gfx/gnofract4d/Manifest b/media-gfx/gnofract4d/Manifest
index 0cb19fd2b105..ef6379ec43c2 100644
--- a/media-gfx/gnofract4d/Manifest
+++ b/media-gfx/gnofract4d/Manifest
@@ -4,5 +4,5 @@ DIST gnofract4d-4.3_p20230717.tar.gz 18275492 BLAKE2B 0bc8834c6f3ed3ec48bf4ee49a
 DIST gnofract4d-4.3_p20240324.tar.gz 18274057 BLAKE2B 183bf96e0429fa676f1c6fca4ae6466c489d0fe5ffee09ae161e01d0f22b4e77165f846416702c026f5d73a27833dfebd49f5c3131c621c9b1abd2ee9fc5529d SHA512 a174683b659347e4a7203d78d309ab41971d105131d40ea60490871477e80109624405f7012e455389ccc9325e08f224a1d3ea2d4e0c23fc9c5ca4fb83f9dfaa
 EBUILD gnofract4d-4.3_p20221125-r1.ebuild 1470 BLAKE2B 9316290a45026d2aae523d8e59059fcf08cecf886757c7dd49af0d8532176b6bec30f6e3f01ade36656437be6410502f9486b5f482d7b293df7cbe735d007850 SHA512 030a61800bd923a76e929312a908bc3b45634d891bb48cdd8d605ff23c5ed363293e33e1a9050f74d8e47bc67e787861597e77ee47b6c2171dcc43b056c215ef
 EBUILD gnofract4d-4.3_p20230717.ebuild 1740 BLAKE2B 1fdd4739fa03dc7c5fb50f866c68238e910f5675ab487fd9c343cae1795267ec3b38973aecc371217da762415d829ea25121b29ce3154ebab9aaee41402e2e64 SHA512 71489072990eab391408b93946168cd31dd030cff20d225210d489b703197f180d5442d8222231308230707586d1cff0328b5cbf612d8bfbb652cf640f8e54d2
-EBUILD gnofract4d-4.3_p20240324.ebuild 1809 BLAKE2B b08de09173356ccf05909190bfa307c9a7c6c1cf517e3b7a1bf58ee140fc6e2a802ba0f8c79cead2fe26b61e14107bc98042abeb00c721995f51b9be12ed4d13 SHA512 f4a130057f94342acd0bdb184c96905bfed27c8b48953b405a5c0361b70ef39fe214ff2ae91c3b1e8751917a88b194cd7be99051375aa25fe8d8ee058ab59ad4
+EBUILD gnofract4d-4.3_p20240324.ebuild 1807 BLAKE2B ac4416bd07fdd91545cfa2da18dbec010e0a5a4ef482bb9a414d82ad0a651b8f9a9fa59d5e5433e775e12f356ad926633ba623ba3e81cb6d58746029ae8d3aa2 SHA512 84789c4544eab3b22f281a13ca97c45cbfedf3d391ac6443c2749e5bdefb4e5a580c8bfb46d09d8e815cebb1090ea9c9fd716902f7099631f260308394bc69c7
 MISC metadata.xml 474 BLAKE2B 6dcdd891ae9b2b69a1f7a2e3de6bc867894444743825642abddac1701d75bd2ec1542a5e6d4c86b76b2e209ccdc4db53e680692a0e6c7c99c280ff96fe6a13a2 SHA512 7b815ce8a870b158e39845840082ea3a87738d1f7c63b6aee869758deb3475f7f2c1c1f1831bfdc8af911c1f7825c514cf26c76af5bb32464e9fa2a308ba8a05
diff --git a/media-gfx/gnofract4d/gnofract4d-4.3_p20240324.ebuild b/media-gfx/gnofract4d/gnofract4d-4.3_p20240324.ebuild
index 47a8800ec72a..c9482af02943 100644
--- a/media-gfx/gnofract4d/gnofract4d-4.3_p20240324.ebuild
+++ b/media-gfx/gnofract4d/gnofract4d-4.3_p20240324.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${COMMIT}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DEPEND="${PYTHON_DEPS}
diff --git a/media-gfx/gnome-font-viewer/Manifest b/media-gfx/gnome-font-viewer/Manifest
index 63475af835ef..5e91c8a0eee2 100644
--- a/media-gfx/gnome-font-viewer/Manifest
+++ b/media-gfx/gnome-font-viewer/Manifest
@@ -1,4 +1,6 @@
 AUX 45.0-window-Fix-function-callback-definition.patch 1912 BLAKE2B 634b4d0c2653dcaa1d02a44844de949337021076499a4e8d73977d4c9bbf2a537ce48fe6318b25de08cba1930ea0e06481b20c4719c0d4a3addb8537999e4237 SHA512 cca22823a35aae3f1553dfd48d22949ce7973be881a9e99a5367fe03e9163f31b4972b4dccd3c7a5776579c4888a2b0f8542049a6780b1d35d769836b7de1770
 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
 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
new file mode 100644
index 000000000000..163cee416bb5
--- /dev/null
+++ b/media-gfx/gnome-font-viewer/gnome-font-viewer-46.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit gnome.org meson xdg
+
+DESCRIPTION="Font viewer utility for GNOME"
+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"
+
+DEPEND="
+	>=dev-libs/glib-2.56.0:2
+	>=gui-libs/gtk-4.5.0:4
+	>=gui-libs/libadwaita-1.4_alpha:1
+	>=media-libs/harfbuzz-0.9.9:=
+	media-libs/fontconfig:1.0
+	media-libs/freetype:2
+	gnome-base/gnome-desktop:4=
+	dev-libs/fribidi
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	dev-libs/appstream-glib
+	dev-libs/libxml2:2
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/45.0-window-Fix-function-callback-definition.patch
+)
diff --git a/media-gfx/gnome-screenshot/Manifest b/media-gfx/gnome-screenshot/Manifest
index 77f00587b74e..13b71fc3265c 100644
--- a/media-gfx/gnome-screenshot/Manifest
+++ b/media-gfx/gnome-screenshot/Manifest
@@ -2,5 +2,5 @@ AUX gnome-screenshot-40.0-fix-hidpi.patch 1351 BLAKE2B a94ce580d6f4af9e7945bdb13
 AUX gnome-screenshot-41.0-build-Use-GNOME-module-post_install.patch 2265 BLAKE2B 5c35e79ed0e4172cb8cefc288c84fe168b3ccd107ea09918270d5b3dcc7be67cdd06dc891296fe86ca36d7c2dd3b8ebcc90ce9a80a630e49ff928f9544b3a0ce SHA512 79a9728a33c20a683183050196509e6cfdef72b3ee4cbc8f2c6ac7485006922033d0d8e78e4227382cef0d8a80278963101fcb60e701c7c4a359978facbd6687
 AUX gnome-screenshot-41.0-fix-meson-0.61-build.patch 898 BLAKE2B 9fc2ea6df76ca7db103a747df18e939e53f5ad78431e0c58fadb0826b2ef9686d4f14131fc06a4df3e98cd9b8833659d34a4c4a78c5e2db0f80d7941a40e1b90 SHA512 02020e4588b5bdcc15afce12c92ba261d0dae6d45c01b3b1a6c332f5eada34fa7c82df82aca8e0dd91e7bd66a5615266b581d76ca12bbf09fc8e06bf31132440
 DIST gnome-screenshot-41.0.tar.xz 359500 BLAKE2B d3e44ab565815998327ddcbe80979acff3d690cfb0b7ae8f21910bafd21c9c7d3cd7af11e14b0522bb4d64ad2e27d5b6209c80208ea8fb03c465eb453ef8d47f SHA512 ab6c7e22cbca2739844707e59329ecd67901e04f968bd0b20a07dffff825e9772697ebf20a1ab2a920fa839ea40d0bd872d17db2b4cb7856a6f8ee4ec1426d19
-EBUILD gnome-screenshot-41.0.ebuild 1523 BLAKE2B a465793c34024a2a9a77681b16deb013c287a1af83360a67da12240f5ac3f9004cf02b1c1f87d50d79393dc068150a334ab02c1cc517fe7b02b4e9b76e88f090 SHA512 4cb0543d645e0219bb1b7441307ac036fed92eba2a0fe5098c0dfcc9be14c0b456955cc1a85aa44fb0c715e35c8b039a2b68370f093dcd03411a7a8ed9016b63
+EBUILD gnome-screenshot-41.0.ebuild 1517 BLAKE2B 8a3b5a29867be4e0d9dc75047937124a645ee23284b7a785921b6aa4650d075d6f49bd6270237509cec20a1a6c02483f5d48071ad174943fe79fa1b963cf2df3 SHA512 9233fd076873e129fd107d521424ddcf5347107015eead805fb269cab22b1a948957fc2e1191734c505f11a07cfc8f57a7d752b9a59aa0cecb5c38b51fac7d06
 MISC metadata.xml 357 BLAKE2B 655de20d0e5fd6c41754e9b971523415d0ac9d0c6a3987215ecb9c075d19f719e21856c38ca52577f389f0dd3643b5f0d799a590b01a4199ba730c205aeef40b SHA512 45dadcc226d093ceaa4d8d5ceac0fd0325c48811977c9b3e74afdd7712d4653bd29d50c88edaedd0e8ebd4df530f89bc75559e7fe99e7e9514582d2fd3b66960
diff --git a/media-gfx/gnome-screenshot/gnome-screenshot-41.0.ebuild b/media-gfx/gnome-screenshot/gnome-screenshot-41.0.ebuild
index 068590d540d3..fe48cc3f3ce2 100644
--- a/media-gfx/gnome-screenshot/gnome-screenshot-41.0.ebuild
+++ b/media-gfx/gnome-screenshot/gnome-screenshot-41.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-screenshot"
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE="X"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 
 DEPEND="
 	X? (
diff --git a/media-gfx/gpicview/Manifest b/media-gfx/gpicview/Manifest
index 7983a9932ff9..1f0721434838 100644
--- a/media-gfx/gpicview/Manifest
+++ b/media-gfx/gpicview/Manifest
@@ -2,6 +2,5 @@ AUX Fix-displaying-images-with-GTK3.patch 6119 BLAKE2B 84733027ba1740eb78e4d62e6
 AUX gpicview-fix-animated-gifs.patch 356 BLAKE2B 8c60c06ded2f076e2edb47222f8041a2e8d7ef06f7d8a94bf4163a7ebb060b320fec577544042707e556dd4cbce4c52719056eada4aed360224f3b28e6c1af4e SHA512 d37ccd82d520b31e71bea95a877832b1511d77e36c293dbd71b3bf86c695dc367325f74f46ab5a408bc0f672ce56414820ef2cad1437188beac74e9c22b60276
 AUX gpicview-main_win_open-dummy-return.patch 466 BLAKE2B 37bc66552c2b9f723a51a4d1d44125bd2dcc9121867be71e5c35ab05dc54574a0fb95cbb808f91099e6adf478bb3b108cf0360a8d492badc98a7396fdee4bafc SHA512 8a03de05bd6bf002ff416398a5df77ea67a1487a42021c645f938398d25ca8e6032e118915ba344a55fe7c021a2570047fd256782f3f7f57d03d074251af1cd2
 DIST gpicview-0.2.5.tar.xz 349536 BLAKE2B c215e812693a30d55d3e606b9958d308b5d7f564ba0c3fc60e7606c492ec3ddd9997ae63f0865a6bebdf79c0a18e6a8b26a1e2c8d5dd7e2174d211130dbbe817 SHA512 afc7e67c7ae1252f9c1816ee46fe69e96ea7be9a60e03406a539f17b2e4f0e4b93a028c6f3f1c455f5433d6d7d78a58dcee2cb0ac91ea53093a21935bf454afd
-EBUILD gpicview-0.2.5-r2.ebuild 595 BLAKE2B d47521663c88fec06cb88a55fa766fb6622015c986cba83134088d21c85b8f879a46b55d0d230cdc466c091102b99f4c38968ee496bb693407e742b57f1124c2 SHA512 a88126596432da7e2bbe684d4621cd479c79e13329903d210c5a8cef4486aa665a016b1a400e61c74eeb7fc6507b1da725c64ce1bfd084e57cee71b8fd589ff2
-EBUILD gpicview-0.2.5-r3.ebuild 708 BLAKE2B 3f8863250182bf6cadec13b3cb9abb9868e72f1fa5a9ebcb68cdf88ac07468f6a67c040705e191feaa4ec8667210595ffd5ef03207f5675c316ea31ba044850d SHA512 09795e0e305a95646ed7a2153abdec87946d459859b4628208faf41806ec60aa8a7820a387723cf7a22337aa2edfcb0b0a86af65f97eff39fa20c6890fb84b6e
+EBUILD gpicview-0.2.5-r3.ebuild 710 BLAKE2B b3d6d43467efffba31230508229708b8fc07a76cc1c083571c5a0767615ff577727e3c9a07dfb11e9aba7570b685d2f9caa8cfcb9925e9745abb8e3dd8ecf497 SHA512 bf84c875e2ba05560357799d0f6ccbde92f882d7f24253b23448f548a58397e5fc2884390c0854cc35ef5c12329aee9488c020c605895c99dcb4aa70633133f6
 MISC metadata.xml 242 BLAKE2B e8e2ce150c3abafafbde001036eb01bc36a0bd9c1466c8af433f5d0d938c7accc06d7ab9c241dea760c7e814fd553e5e1b90a15f4bfd9c6f5b6507e19b1a7be8 SHA512 7bd44c3af27abca3e957697d1050d823bf1586d010302899d15fb9b099628922f055d07bf267d2bf3e874fb4e6b19d480dc7ab495ce794e96b6524214c061ee7
diff --git a/media-gfx/gpicview/gpicview-0.2.5-r2.ebuild b/media-gfx/gpicview/gpicview-0.2.5-r2.ebuild
deleted file mode 100644
index baef4b43f9b8..000000000000
--- a/media-gfx/gpicview/gpicview-0.2.5-r2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xdg
-
-DESCRIPTION="A Simple and Fast Image Viewer for X"
-HOMEPAGE="http://lxde.sourceforge.net/gpicview"
-SRC_URI="https://downloads.sourceforge.net/lxde/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ppc ~riscv x86"
-
-RDEPEND="virtual/jpeg:0
-	x11-libs/gtk+:3"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.40
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}/Fix-displaying-images-with-GTK3.patch" )
-
-src_configure() {
-	econf --enable-gtk3
-}
diff --git a/media-gfx/gpicview/gpicview-0.2.5-r3.ebuild b/media-gfx/gpicview/gpicview-0.2.5-r3.ebuild
index 09ecbb0b6501..7cc62978f08a 100644
--- a/media-gfx/gpicview/gpicview-0.2.5-r3.ebuild
+++ b/media-gfx/gpicview/gpicview-0.2.5-r3.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 inherit xdg
 
 DESCRIPTION="A Simple and Fast Image Viewer for X"
-HOMEPAGE="http://lxde.sourceforge.net/gpicview"
+HOMEPAGE="https://lxde.sourceforge.net/gpicview/"
 SRC_URI="https://downloads.sourceforge.net/lxde/${P}.tar.xz"
 
 LICENSE="GPL-2"
diff --git a/media-gfx/graphicsmagick/Manifest b/media-gfx/graphicsmagick/Manifest
index 0b3b320e3890..2b410454cb2f 100644
--- a/media-gfx/graphicsmagick/Manifest
+++ b/media-gfx/graphicsmagick/Manifest
@@ -6,8 +6,11 @@ DIST GraphicsMagick-1.3.42.tar.xz 5553692 BLAKE2B f8f0d7d420375262b7db8ffcc1c9eb
 DIST GraphicsMagick-1.3.42.tar.xz.asc 228 BLAKE2B 723f8d1ca13bd5b32a12d69bb46f4991df6e7963f0d4c12ddaf60167a9ade4c6fa36819cce1df202437143bc55e17dd6f2cff821412dafceeb3ab5e3dbf3dc7b SHA512 de5d90c748376e7e480a066e9354ac1771f15cb2d8c6e5c9249672fd811b7bbe06f97b3348240538fa8d0d7c11150f57fb5148285214712944f7535afb943bd0
 DIST GraphicsMagick-1.3.43.tar.xz 5657460 BLAKE2B caa4fa6546acb4cdaaa421030ccc5cd2b628ae723e07f84700f65e26e1f3e59039cf92fda259ee44ba1e1fa90e9c469844fb5289cc73d50c42bb50fb39358ca2 SHA512 15b4d90119f25fd45f16d50218d51d543841dd3cdaf0c585bce2c18592106bc41573ed1011d7176ff5882fa0cded8f46bfd1e639c26063571109911e22098757
 DIST GraphicsMagick-1.3.43.tar.xz.asc 228 BLAKE2B cb1290af98ea92de948df0421b7de101a713f0b8ce4a07959269d5edd10eb26f088585e1a8272482a9b219ee388ae8f040fc047ca76d5f752f04a7b57987c89c SHA512 3bd62bc64dd1b6f2d7a17f1281d8dc4c67c474860b4d95bfaf5fb4be93d0ee156b54c2a6ef4166687854e5458a6e43e61816a5fd508e4702f693a9d1e43984bf
-EBUILD graphicsmagick-1.3.42.ebuild 3955 BLAKE2B 7fb1f992576d85e80f859d8ae386c0ae6c1a8bce256dc4eac99f7891944d5ece5ff0bf23a1a382fd2ce9d7d8987f78c8ff58bea16fdbef49c2fdc12ff1405b50 SHA512 66784a829ca6496bb386d21507738830839c1c52998fb0520392d833b0eb35f13834bd5c9c936e40b36f9f414e773452e9b9c7ff4ebc2d557954330097d1a619
-EBUILD graphicsmagick-1.3.43-r1.ebuild 3995 BLAKE2B 3a364a3a024e2cd916a5d7c2be15bd89e5b9c94cc1afcfebd47f90992f1875162c2bb6cca948ead3bfe17c5b375240133d2b746f126284d31c202218d428a0bc SHA512 56df172560fcc94566685c9b6753d48698c6b332e0b2415629f9c2279b6e197188759b7471849b5db4463371bfff728fad803abfd7705722d334570e0a44a189
-EBUILD graphicsmagick-1.3.43.ebuild 3948 BLAKE2B bdb1074abfe42fd18e2ba126294b14a08c6651b52bae4463a19464e7076f554cce7d76ac58c5acf2d34aa6ab5a130d5f467af9ab88cbfc4d3227d700557899ee SHA512 055a5ffd475c5c5e8d723b8083f852c8497fb80e36dd380dcd7a1154be952f8f0fc507b5ecf9ff56dc5ba343f64d5d2ed89a346d65fe362cd10a4c947a43fecf
-EBUILD graphicsmagick-9999.ebuild 3953 BLAKE2B 2f28cb9079e7262dfff660325136a75f7682aa6a0d6f2ea23f256dddced870eed14f5ba4f522ee90a617af5a17ec11787cbe3ed2f4188e00d2fcfa1166dd274c SHA512 19d5ce53b7bd3689a368f122958f08c696f44dc734f9f51452d95715d02d0c94e418dbe1af709413fa2d4d8326e21761e4b2c148cf7a6af18d5af6825d2cacb3
-MISC metadata.xml 1301 BLAKE2B 1d98e2027f597d0b9c3ae76923adf2dbcb817a439671931076766ec6bc9cb04d053f92fba520a08cc3e629a6802f75d9c4c40058daed25c1555e21516b678997 SHA512 2b1e3cc87a6f9af93fabbc31e142cf4d7206cce3cf2a0e9d70751f93ead7abb9cad7fd58f91264b26e8ea79345973f93cfff2ecd6c9c2c4b176db58c3247b5ff
+DIST GraphicsMagick-1.3.45.tar.xz 5936968 BLAKE2B 55c87c518267dc3330d09c39474acf4b89f06b2deddf8e5d36d3c235f39bb1ec5bd04d90e2dd6e50563430b58ea3b78ccb526bf8cf79efa32685ae8e04a1aee5 SHA512 2c12a24198a8ee1f86b4c43bf8903d129c891ec2c27ba22287dfc8a5f65c9223b2caa67a37b9a91b10b049ba8425e757738f5d92a9ae70abee76d323af9bd1a0
+DIST GraphicsMagick-1.3.45.tar.xz.asc 228 BLAKE2B 72c7554de7d45499f90fa6534ed819e4d40b5f878f8bf0b14b026e100390ee9cabddd9df0d3945664e559350f1621239fcb9aafa9987a26e346f52b2c2ad8215 SHA512 5f49c8d1cdd20cb5bd7b76660800d22ef8ab3b13c3954dc4feb7522cb1f4d343a8e98faa91094f616ecbb01ff770bc3f4dd252c62b6b70c780318d425730c5c1
+EBUILD graphicsmagick-1.3.42.ebuild 3949 BLAKE2B 2b18247bc9cb7faa686e002dccf283b71828be75c389446fa523b691b3522fe4e95f17d9eceb0e0310b908b9f6a79023c6186bfbb62d95fbd3ab0162b4349dc5 SHA512 1cdefc13da40653d52be2133d94e466e03e1b1d37483cd5c8c8d713a49e0fc58824b19605f8a09868fa3807e129cbb9f4c90d4dd9160366a32376ba832875b92
+EBUILD graphicsmagick-1.3.43-r1.ebuild 3982 BLAKE2B 0112660a9fab648f3c988fcca6651e5e24ea6a94321ce21e0327afa3068065e977c9acce6e098665b2749d6b85b1a15b422eb1267a0d67889cdcb27236a79b4f SHA512 ed13351e5bcfd26ac095219d40dc97c5677dce5b3c9a4798e77e5255cdc74876fc5c66f1535073506066de55d571702a53a328306b25b03b4201b5d96a532ada
+EBUILD graphicsmagick-1.3.43.ebuild 3942 BLAKE2B a0f6ec72235c55e0a22b81a7821df8a7eeaae9e0021f6de6974e72a4690205575771b599b7590e3e2dfa1def487615551655ad5d6b53010e08b64e6791cd1b1a SHA512 449c9787f258620040e9771ff847705e653d738d2d442867f2bdff76a7a07b430266342bc3cea28021a8045163ff584ef621a2c6599c81568270eca3154f3627
+EBUILD graphicsmagick-1.3.45-r1.ebuild 4005 BLAKE2B 84fa9aadd87c8ee5b767e1e51c196249a60db112f2933942ca00f6f1e569460bc477b0280cfaaa9bca604dc05960c59d283a38e01fe9d19892ac8dd98a9459d8 SHA512 2a6951ec2a08d10ceec04c7366ef6edfb303511f4d2e0c78da69bb56e6fcf881f54f96faad47ae28c3afd64cf849891d6b569509e23f0423bc63a01a38e790c5
+EBUILD graphicsmagick-9999.ebuild 4005 BLAKE2B 84fa9aadd87c8ee5b767e1e51c196249a60db112f2933942ca00f6f1e569460bc477b0280cfaaa9bca604dc05960c59d283a38e01fe9d19892ac8dd98a9459d8 SHA512 2a6951ec2a08d10ceec04c7366ef6edfb303511f4d2e0c78da69bb56e6fcf881f54f96faad47ae28c3afd64cf849891d6b569509e23f0423bc63a01a38e790c5
+MISC metadata.xml 1405 BLAKE2B 90d9ab1c58f90a756a89b30569fab4b9fee82116f33ba21d6b5192ab6a1f0160b607477a523334b3af859daca4206b25271fe5852c8ed6772a4dcbcc8ef07551 SHA512 1a3aac139eeb22b6d1aae5c3038220c37d494fb41df591227db462d42b331f6d4ab1bdd94f7697d24e463f417a56ff4da4100c8389c815881d3bf931708ae8ae
diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.42.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.42.ebuild
index 2164e7fb17c6..c799d6fd19dc 100644
--- a/media-gfx/graphicsmagick/graphicsmagick-1.3.42.ebuild
+++ b/media-gfx/graphicsmagick/graphicsmagick-1.3.42.ebuild
@@ -20,7 +20,7 @@ else
 	SRC_URI+=" verify-sig? ( https://downloads.sourceforge.net/${PN}/${MY_P}.tar.xz.asc )"
 	S="${WORKDIR}/${MY_P}"
 
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-bobfriesenhahn )"
 fi
diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.43-r1.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.43-r1.ebuild
index 74cddef1ebc4..073e50eeaf65 100644
--- a/media-gfx/graphicsmagick/graphicsmagick-1.3.43-r1.ebuild
+++ b/media-gfx/graphicsmagick/graphicsmagick-1.3.43-r1.ebuild
@@ -20,7 +20,7 @@ else
 	SRC_URI+=" verify-sig? ( https://downloads.sourceforge.net/project/${PN}/${PN}-history/$(ver_cut 1-2)/${MY_P}.tar.xz.asc )"
 	S="${WORKDIR}/${MY_P}"
 
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha amd64 ~arm arm64 hppa ~loong ~m68k ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-bobfriesenhahn )"
 fi
diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.43.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.43.ebuild
index 0c2ec447af58..42c6dc8039b2 100644
--- a/media-gfx/graphicsmagick/graphicsmagick-1.3.43.ebuild
+++ b/media-gfx/graphicsmagick/graphicsmagick-1.3.43.ebuild
@@ -20,7 +20,7 @@ else
 	SRC_URI+=" verify-sig? ( https://downloads.sourceforge.net/${PN}/${MY_P}.tar.xz.asc )"
 	S="${WORKDIR}/${MY_P}"
 
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-bobfriesenhahn )"
 fi
diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.45-r1.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.45-r1.ebuild
new file mode 100644
index 000000000000..015af99350f1
--- /dev/null
+++ b/media-gfx/graphicsmagick/graphicsmagick-1.3.45-r1.ebuild
@@ -0,0 +1,162 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools toolchain-funcs
+
+MY_P=${P/graphicsm/GraphicsM}
+DESCRIPTION="Collection of tools and libraries for many image formats"
+HOMEPAGE="http://www.graphicsmagick.org/ https://foss.heptapod.net/graphicsmagick/graphicsmagick"
+
+if [[ ${PV} == 9999 ]] ; then
+	EHG_REPO_URI="https://foss.heptapod.net/${PN}/${PN}"
+	inherit mercurial
+else
+	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/bobfriesenhahn.asc
+	inherit verify-sig
+
+	SRC_URI="https://downloads.sourceforge.net/project/${PN}/${PN}-history/$(ver_cut 1-2)/${MY_P}.tar.xz"
+	SRC_URI+=" verify-sig? ( https://downloads.sourceforge.net/project/${PN}/${PN}-history/$(ver_cut 1-2)/${MY_P}.tar.xz.asc )"
+	S="${WORKDIR}/${MY_P}"
+
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+
+	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-bobfriesenhahn )"
+fi
+
+LICENSE="MIT"
+SLOT="0/${PV%.*}"
+IUSE="bzip2 +cxx debug dynamic-loading fpx heif imagemagick jbig jpeg jpeg2k jpegxl lcms lzma"
+IUSE+=" openmp perl postscript png q16 q32 static-libs tcmalloc tiff truetype"
+IUSE+=" webp wmf X zip zlib zstd"
+
+RDEPEND="
+	dev-libs/libltdl
+	bzip2? ( app-arch/bzip2 )
+	fpx? ( media-libs/libfpx )
+	heif? ( media-libs/libheif:= )
+	imagemagick? ( !media-gfx/imagemagick )
+	jbig? ( media-libs/jbigkit )
+	jpeg? ( media-libs/libjpeg-turbo:= )
+	jpeg2k? ( media-libs/jasper:= )
+	jpegxl? ( media-libs/libjxl:= )
+	lcms? ( media-libs/lcms:2 )
+	lzma? ( app-arch/xz-utils )
+	perl? ( dev-lang/perl:= )
+	postscript? ( app-text/ghostscript-gpl:= )
+	png? ( media-libs/libpng:= )
+	tcmalloc? ( dev-util/google-perftools:= )
+	tiff? ( media-libs/tiff:= )
+	truetype? (
+		media-fonts/urw-fonts
+		>=media-libs/freetype-2
+	)
+	webp? ( media-libs/libwebp:= )
+	wmf? ( media-libs/libwmf )
+	X? (
+		x11-libs/libSM
+		x11-libs/libX11
+		x11-libs/libXext
+	)
+	zip? ( dev-libs/libzip:= )
+	zlib? ( sys-libs/zlib )
+	zstd? ( app-arch/zstd:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND+=" virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.3.41-flags.patch
+	"${FILESDIR}"/${PN}-1.3.41-perl.patch
+)
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	local depth=8
+
+	use q16 && depth=16
+	use q32 && depth=32
+
+	local myeconfargs=(
+		--enable-largefile
+		--enable-shared
+		$(use_enable static-libs static)
+		$(use_enable debug prof)
+		$(use_enable debug gcov)
+		$(use_enable imagemagick magick-compat)
+		$(use_enable openmp)
+		--with-threads
+		$(use_with dynamic-loading modules)
+		--with-quantum-depth=${depth}
+		--without-frozenpaths
+		$(use_with cxx magick-plus-plus)
+		$(use_with postscript gs)
+		$(use_with heif)
+		$(use_with jpegxl jxl)
+		$(use_with perl)
+		--with-perl-options=INSTALLDIRS=vendor
+		$(use_with bzip2 bzlib)
+		$(use_with fpx)
+		$(use_with jbig)
+		$(use_with webp)
+		$(use_with jpeg)
+		$(use_with jpeg2k jp2)
+		$(use_with lcms lcms2)
+		$(use_with lzma)
+		$(use_with png)
+		$(use_with tcmalloc)
+		$(use_with tiff)
+		--without-trio
+		$(use_with truetype ttf)
+		$(use_with wmf)
+		--with-fontpath="${EPREFIX}"/usr/share/fonts
+		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
+		--with-windows-font-dir="${EPREFIX}"/usr/share/fonts/corefonts
+		$(use_with zip libzip)
+		$(use_with zlib)
+		$(use_with zstd)
+		$(use_with X x)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	default
+
+	use perl && emake perl-build
+}
+
+src_test() {
+	# Some perl tests fail when DISPLAY is set
+	unset DISPLAY
+
+	default
+}
+
+src_install() {
+	default
+
+	if use perl ; then
+		emake -C PerlMagick DESTDIR="${D}" install
+
+		find "${ED}" -type f -name perllocal.pod -exec rm -f {} + || die
+		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} + || die
+	fi
+
+	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} + || die
+}
diff --git a/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild b/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild
index fd1d7bcb1476..015af99350f1 100644
--- a/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild
+++ b/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild
@@ -20,7 +20,7 @@ else
 	SRC_URI+=" verify-sig? ( https://downloads.sourceforge.net/project/${PN}/${PN}-history/$(ver_cut 1-2)/${MY_P}.tar.xz.asc )"
 	S="${WORKDIR}/${MY_P}"
 
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-bobfriesenhahn )"
 fi
@@ -28,8 +28,8 @@ fi
 LICENSE="MIT"
 SLOT="0/${PV%.*}"
 IUSE="bzip2 +cxx debug dynamic-loading fpx heif imagemagick jbig jpeg jpeg2k jpegxl lcms lzma"
-IUSE+=" openmp perl png postscript q16 q32 static-libs tcmalloc tiff truetype"
-IUSE+=" webp wmf X zlib zstd"
+IUSE+=" openmp perl postscript png q16 q32 static-libs tcmalloc tiff truetype"
+IUSE+=" webp wmf X zip zlib zstd"
 
 RDEPEND="
 	dev-libs/libltdl
@@ -44,8 +44,8 @@ RDEPEND="
 	lcms? ( media-libs/lcms:2 )
 	lzma? ( app-arch/xz-utils )
 	perl? ( dev-lang/perl:= )
+	postscript? ( app-text/ghostscript-gpl:= )
 	png? ( media-libs/libpng:= )
-	postscript? ( app-text/ghostscript-gpl )
 	tcmalloc? ( dev-util/google-perftools:= )
 	tiff? ( media-libs/tiff:= )
 	truetype? (
@@ -59,6 +59,7 @@ RDEPEND="
 		x11-libs/libX11
 		x11-libs/libXext
 	)
+	zip? ( dev-libs/libzip:= )
 	zlib? ( sys-libs/zlib )
 	zstd? ( app-arch/zstd:= )
 "
@@ -103,12 +104,12 @@ src_configure() {
 		--with-quantum-depth=${depth}
 		--without-frozenpaths
 		$(use_with cxx magick-plus-plus)
+		$(use_with postscript gs)
 		$(use_with heif)
 		$(use_with jpegxl jxl)
 		$(use_with perl)
 		--with-perl-options=INSTALLDIRS=vendor
 		$(use_with bzip2 bzlib)
-		$(use_with postscript dps)
 		$(use_with fpx)
 		$(use_with jbig)
 		$(use_with webp)
@@ -125,6 +126,7 @@ src_configure() {
 		--with-fontpath="${EPREFIX}"/usr/share/fonts
 		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
 		--with-windows-font-dir="${EPREFIX}"/usr/share/fonts/corefonts
+		$(use_with zip libzip)
 		$(use_with zlib)
 		$(use_with zstd)
 		$(use_with X x)
diff --git a/media-gfx/graphicsmagick/metadata.xml b/media-gfx/graphicsmagick/metadata.xml
index 99ba429c7cac..81b72dbdce7f 100644
--- a/media-gfx/graphicsmagick/metadata.xml
+++ b/media-gfx/graphicsmagick/metadata.xml
@@ -23,6 +23,7 @@
 		<flag name="dynamic-loading">Compile graphicsmagick with dynamically loadable modules</flag>
 		<flag name="q16">Set storage quantum size to 16 (~2*memory)</flag>
 		<flag name="q32">Set storage quantum size to 32 (~5*memory)</flag>
+		<flag name="zip">Build with <pkg>dev-libs/libzip</pkg> to support the OpenRaster (ORA) format.</flag>
 	</use>
 	<upstream>
 		<remote-id type="sourceforge">graphicsmagick</remote-id>
diff --git a/media-gfx/graphite2/Manifest b/media-gfx/graphite2/Manifest
index d78301e31884..06b47a0dfa98 100644
--- a/media-gfx/graphite2/Manifest
+++ b/media-gfx/graphite2/Manifest
@@ -1,9 +1,10 @@
 AUX graphite2-1.3.14-fix-cmake-files-libdir.patch 637 BLAKE2B 5bf2dfae7cf3af8a99a5095f618d3625d6f0f3b07f714c1101ac77058aa5ab969115cf2ce6a6164666488183fb5482d3f8b6fd8dea4df3ca1ecba9adb02788f2 SHA512 55805cecf9cde48079a81c8ffd93503dd9302f28140b640971ddee29e7a7da38840c826af072b5780372b56c0f0269cbda802e3e233139f086f5194cd8eb33a5
 AUX graphite2-1.3.14-fix-nodefaultlibs-deux.patch 4840 BLAKE2B fc543571ccc0c14c241eb36662c8eea9f3f28b2979c9936a7af60920ff0d951bb8a36ef5075881a25e3ed8e73781b538df5b7da97344ba36229f2defa3d928cd SHA512 3a0215f484ca9341e81194c2f5f73c9eb64f1322de5c3bb0e3d8615e7b7f1e4c9044c2db3855f3a68c04db9f1476d3f0115545925cb3f5f8082e5189ee9c2b6c
 AUX graphite2-1.3.14-fix-nodefaultlibs.patch 1029 BLAKE2B ba35d7c4a6200626035bac940749740cdda89b5c8cf3c37428578214de8ba647331b454ab75d92a4d333d702a39e335c716010299a2ca2dd07a678d8d08eea93 SHA512 5ddcec369ea8bc8e7ea935d3cecc936a148cf275314008b6993574f18c77a3bf7689fd551ac119f82b15ddf365b23ad168726facd5ba78bd611b196b2cf614a2
+AUX graphite2-1.3.14-gcc15.patch 1003 BLAKE2B 222e0fe472dc4df12ef8f0a94d50ca5c5d1a0176febfc878734ab950cf8baa0db1c681b274c8f80acb9dcf123088d82f31947f3e254c58da77266962855e37f5 SHA512 b085ca7109a47a027f93878d359d51ec9f6ac8bef99f4cb1c08e11606a7379c2501560597b66692bd82d36d532758cf76d7149fa71d55e5787366724b23cecd4
 AUX graphite2-1.3.14-no-libtool-file.patch 2336 BLAKE2B a349e721264de1477aee5aa3e62d264b26c4665383fbe564de7b3a0420b77fcf8ce90a65a650fc9e2144969a2f00abe7ff7c9ebe6f53c7b2fdc3271fbd55f6ce SHA512 3553e237808bf981cf35e9fa8de7b77fa1ce87c72733c806df8e523ea624a0e5e2ad87a0b4cfb9330e7cace0fb016c2c729085de2d21e959790955fd370f378e
 AUX graphite2-1.3.5-fix-gcc-linking.patch 580 BLAKE2B 7ab4d1848e0b0fdbd682fc81747a426c9bee7e2d0f72991dc963c955ba910035c6246d88f7eaded9c4a742a10470fd304ab2dd3fb1750795b8b9791ccfc0cfb8 SHA512 1e01c764f72204f30c916dcdc4f5bc7a4757d73275bb2007bf0c1f2e9898f138aa6c0581addc587e125cf6cbf9d5db725cb3d8a69875978a14ab316d2d561467
 AUX graphite2-1.3.5-includes-libs-perl.patch 836 BLAKE2B 0429d214ff7fd9b903e1d3bcaf0af3e6b29a0269581390f64950e42e41280e482fc9cfda9bfe24ef166eb6c24d21377a15fca4264fec69d902d8ba18810bdb01 SHA512 26ab6dda13d758a5e4237c8b5d207d3c5111afbb11b2c3984cd742913c3c7932559b23b5ea9f774f1c6373eb0f761a9400dccc95876740b3cd06c44084a10965
 DIST graphite2-1.3.14_p20210810.tar.gz 6656693 BLAKE2B 63a7d96b58f2779d8a4a353e1a986212b884fdf780fedcb83b22dcef2f7678d44c88c14ece2d09dc745df505a4a3825ce61d7c84bd05fd4e98c23d6e86e9326d SHA512 be54c1386578970cf65c1860336a113268181753c1e2a139e37ceeafcfa76e3162086879c54094d70cd0d36ad5852a95390aaa69572d875921e9481f1ae508ff
-EBUILD graphite2-1.3.14_p20210810-r3.ebuild 3145 BLAKE2B 5f8818885d60d8eb6e0c81ed926cd8b3fa6fab1836a449d46284d881835ff0d1915dd5b898cd201c93bf4ecc1aa467ffdac8501c391d079849cdc474b7b0d205 SHA512 3ce35fc6253ff95bc54c330e862eead51140d3a3d0b89b6eeab03e86034ef139a41da46962facd6b3e265e73ae443d6684488e7bd2c7dcf86e3691e4c4bea634
+EBUILD graphite2-1.3.14_p20210810-r3.ebuild 3179 BLAKE2B ffaebca351aa24c7db4a61f65236320447858d4ee66fa122dda4f3fc05e5a054e6402d68ec7bb19dab5bcdd9298191c1cbacad57fb705a310b52f4b66c7184d8 SHA512 12a8fa5113402a15fa912b7aa4de19bf9e32c91eede7edc53ee517dc1157725b41dc3897f45979cdd22004610f63bfcb867dd41cbbdce3feac184184aee4d4c2
 MISC metadata.xml 393 BLAKE2B 27dcc3bcbc5a0ec32bb751ec3bb8788c2c85d5d7743f0243749a88ace9b5a3faaa10adc84731dbec3e37208efef41e3d4124de57005345927e848a7cbca6b098 SHA512 1086491557aff2d6f3552829550db85332c809d20ec1e3517bfa311fdfb2a5386cc4b624481b4fd7db7e48ab39bb5d76e048461352b74cdecf89d904ef52590b
diff --git a/media-gfx/graphite2/files/graphite2-1.3.14-gcc15.patch b/media-gfx/graphite2/files/graphite2-1.3.14-gcc15.patch
new file mode 100644
index 000000000000..3eaf56808666
--- /dev/null
+++ b/media-gfx/graphite2/files/graphite2-1.3.14-gcc15.patch
@@ -0,0 +1,29 @@
+https://github.com/silnrsi/graphite/pull/91
+
+From fb5e7313802a32783cf0a3f1c28880f11e9588a5 Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyich@gmail.com>
+Date: Fri, 2 Aug 2024 22:31:44 +0100
+Subject: [PATCH] tests/featuremap/featuremaptest.cpp: add missing <stdint.h>
+ include
+
+Without the change `graphite` build fails on upcoming `gcc-15` as:
+
+    tests/featuremap/featuremaptest.cpp:30:15: error: 'uint8_t' was not declared in this scope
+       30 |   std::vector<uint8_t> _ttf;
+          |               ^~~~~~~
+    tests/featuremap/featuremaptest.cpp:16:1: note: 'uint8_t' is defined in header '<cstdint>';
+      this is probably fixable by adding '#include <cstdint>'
+       15 | #include "inc/Face.h"
+      +++ |+#include <cstdint>
+       16 | #include "inc/FeatureMap.h"
+--- a/tests/featuremap/featuremaptest.cpp
++++ b/tests/featuremap/featuremaptest.cpp
+@@ -6,6 +6,7 @@
+ #include <iostream>
+ #include <map>
+ #include <memory>
++#include <stdint.h>
+ #include <string>
+ #include <vector>
+ 
+
diff --git a/media-gfx/graphite2/graphite2-1.3.14_p20210810-r3.ebuild b/media-gfx/graphite2/graphite2-1.3.14_p20210810-r3.ebuild
index 9439faed0363..352646044bcc 100644
--- a/media-gfx/graphite2/graphite2-1.3.14_p20210810-r3.ebuild
+++ b/media-gfx/graphite2/graphite2-1.3.14_p20210810-r3.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 COMMIT=80c52493ef42e6fe605a69dcddd2a691cd8a1380
 GENTOO_DEPEND_ON_PERL="no"
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 inherit flag-o-matic perl-module python-any-r1 cmake-multilib
 
 DESCRIPTION="Library providing rendering capabilities for complex non-Roman writing systems"
@@ -15,7 +15,7 @@ S="${WORKDIR}/graphite-${COMMIT}"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="perl test"
 RESTRICT="!test? ( test )"
 
@@ -44,6 +44,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-1.3.14-fix-nodefaultlibs-deux.patch"
 	"${FILESDIR}/${PN}-1.3.14-fix-nodefaultlibs.patch"
 	"${FILESDIR}/${PN}-1.3.5-fix-gcc-linking.patch"
+	"${FILESDIR}/${PN}-1.3.14-gcc15.patch"
 )
 
 pkg_setup() {
diff --git a/media-gfx/graphviz/Manifest b/media-gfx/graphviz/Manifest
index e3d265973d70..09b337ba8bad 100644
--- a/media-gfx/graphviz/Manifest
+++ b/media-gfx/graphviz/Manifest
@@ -1,7 +1,8 @@
-DIST graphviz-10.0.1.tar.xz 21297808 BLAKE2B f420e6ca01720e6e1ecd9d4330b10659e8a4069e94b0d97fdbcda91d73e9cc679a3d351a5eeb9f86f67eb907eb5d4caf932de79318bb38712a3107ddab14bf08 SHA512 5e6a195357d38aa93fbd231c854b25e4ae4b0efd011de1e37550bc77b2137c98d72fdf7b0df0e8f3e9ba70849461e85cbd591b0064eccfc8788fcf532b7ae2c1
 DIST graphviz-11.0.0.tar.xz 21306368 BLAKE2B c424b2d81180513f2a03210b5a5febfbf80e5c9912ad020d7015be69fdae6579d44108d22f99450ae3384560b610dbaac49a50fe8cac9dbd4e80b8761a8b65a8 SHA512 e95c9ed491c5f09190ca0f085aba2b9a3f6703371d62f6a275f41ddfceef7d79956e1fb0ccfda6c21f2e57afc3a88e37d7091af724911fe3e900ee90a7a811cf
-DIST graphviz-9.0.0.tar.xz 21412796 BLAKE2B a1fd4e0d8d25ade263fdc0d357078cd8bb7847e88746561a0cfe07d129d193c309c7f4cb25f41cebca9549c8486aae2b1e3ebca0eaca57a41cbe2304a418dbd3 SHA512 912f31a4a90e21de9601ffcf8a85d2650d46f07e61aeb0e5124e5a91c67f444d08d40d49f15f2e4078d53d01fb9ca6f54dc9d18c1c08406da91b8ba9ad61416c
-EBUILD graphviz-10.0.1.ebuild 6306 BLAKE2B 73b4f45edd181a08546598a2dceeaa180d2093b9b8ecb999ae31d360fad8b3aa5c097f0c01530085094d581fa92034d69644884c3f3b9f1105d9548bdfcfbeef SHA512 f30c9adf6e7159293eb3ddaef0aed8cce60cfc7c96cd1d8b53f25a5df542814a997149c91dc67cc3cfdb34e0d72d7bb63ec5e97d3b83819a1bbb1b53b443e4f8
-EBUILD graphviz-11.0.0.ebuild 6306 BLAKE2B 73b4f45edd181a08546598a2dceeaa180d2093b9b8ecb999ae31d360fad8b3aa5c097f0c01530085094d581fa92034d69644884c3f3b9f1105d9548bdfcfbeef SHA512 f30c9adf6e7159293eb3ddaef0aed8cce60cfc7c96cd1d8b53f25a5df542814a997149c91dc67cc3cfdb34e0d72d7bb63ec5e97d3b83819a1bbb1b53b443e4f8
-EBUILD graphviz-9.0.0.ebuild 6113 BLAKE2B ce308cea23bbb5cd0cb2a619dded139726af456079f20c99e4a19a33876aafda99ecc10c83936bb0a28b4e5a4fca458e765dfbd0b5aade3ce154d9ed91938ad9 SHA512 adf8ebeea0c5e7871012d211134dad619e0b63706b787e7d2a688897cc150a3900b7091c6d331aa4c26742d1e58c271632804b8dc384f479e2dbb008d8cf1822
+DIST graphviz-12.0.0.tar.xz 21279920 BLAKE2B 67d4444dcc31417fd01268b0fdc81538d86e26f961227d106ae57eb3d6d0e4a2e0ba684413a2d1b66f17340e0ad3a244ce5554c180873683e3ad4775f661739d SHA512 b5d4c8e9b565d4268fff28f169e3bfdb9ebf8b809996f7e35887430e5745aeac92c092fe2a9e15b23c9ba3364aa89fe2eeed85ab3fba61acce21634bc9632813
+DIST graphviz-12.1.2.tar.xz 20939968 BLAKE2B 4c9ad31f9ce6c68e67a48330b6693c9d6dc9ecebd4ef74e0aa250fd6cb86f02a585c8b6fe16b1322aedfa844004327f72ac4cbcca782848d55202b8e4695371d SHA512 2c31c33bcc0a912b08bf837df318152f910452e3efa5e6c19cf76c49017c64d6dad4cde719d4713bb41343c4484381d94706c2e993233aaa45a334390338cde9
+EBUILD graphviz-11.0.0.ebuild 6292 BLAKE2B cd5314ceddbf687cd310eb2e01a1db77e7c970cf27654f768e8c80079c7584ce728a3766e4ccef75eb7ca3e7d2ace353e8991751027a8aeb3c933c79032805e4 SHA512 1602d4934fd21228b046dbe6c14c5b2097d096f17409bf20e0af198e93f5d0c5a84c209af60f8cc8e89d7adde209922bfc58b243aeba7968963cce2d2be806a1
+EBUILD graphviz-12.0.0-r100.ebuild 6497 BLAKE2B 73aac1004d0acebea0a1555260980a227d810bd8f194f2c271dc09f79884c364324e1d79129ecee5ad3a90156f9a41ea32dd3002a429d60e717ca8b52baff898 SHA512 889fc6a842a87092678a8b3c16428754e2bc03a1c8ae995be1e70654295dadb00d2b71d23252146405e44d965c9f4941d294895fc350fdfd2e4857be4b4f0063
+EBUILD graphviz-12.0.0.ebuild 6300 BLAKE2B bb5554a12d879fee666b89c9e353e5925b567d79261811dbb095d5b51a1cb2698d4ced31ced861be5d5ebe459ebc5a5f0ddf6bd7ed73ae4c6207dc6d6fd83cf6 SHA512 7a278007441a88eed176f583eed7ce6fced63f09addb913eefdd069aa3e089f5cfee88c20a1750abbd1029d0756346c17506baf776690d1ab127195b853a91f4
+EBUILD graphviz-12.1.2.ebuild 6497 BLAKE2B 73aac1004d0acebea0a1555260980a227d810bd8f194f2c271dc09f79884c364324e1d79129ecee5ad3a90156f9a41ea32dd3002a429d60e717ca8b52baff898 SHA512 889fc6a842a87092678a8b3c16428754e2bc03a1c8ae995be1e70654295dadb00d2b71d23252146405e44d965c9f4941d294895fc350fdfd2e4857be4b4f0063
 MISC metadata.xml 2309 BLAKE2B 261f100c9c78cf3bb50ffd84260594d34fa5af75f0b3789ce5640e0d633494405e64b3e9f7524e35ef87d11164c501e21fcef2cc483f60ad6ad2e350f500e3b2 SHA512 1a29d11154b72af3deeb0202136926f0871797086ce1a5a4d1fc71822e86d0e76ff789c684fabad85fac1abd5f29913a555be0916f42b90f5ce62fa395e1cbba
diff --git a/media-gfx/graphviz/graphviz-11.0.0.ebuild b/media-gfx/graphviz/graphviz-11.0.0.ebuild
index be0c1a91e64f..cec1338b0d7d 100644
--- a/media-gfx/graphviz/graphviz-11.0.0.ebuild
+++ b/media-gfx/graphviz/graphviz-11.0.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://gitlab.com/api/v4/projects/4207231/packages/generic/graphviz-re
 
 LICENSE="CPL-1.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="+cairo devil doc examples gtk2 gts guile lasi nls pdf perl postscript python qt5 ruby svg tcl webp X"
 
 REQUIRED_USE="
diff --git a/media-gfx/graphviz/graphviz-9.0.0.ebuild b/media-gfx/graphviz/graphviz-12.0.0-r100.ebuild
index 7dc66d7742f7..d66128a9fbcf 100644
--- a/media-gfx/graphviz/graphviz-9.0.0.ebuild
+++ b/media-gfx/graphviz/graphviz-12.0.0-r100.ebuild
@@ -3,8 +3,9 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..12} )
-inherit libtool python-single-r1
+GUILE_COMPAT=( 2-2 3-0 )
+PYTHON_COMPAT=( python3_{10..13} )
+inherit guile-single libtool python-single-r1
 
 DESCRIPTION="Open Source Graph Visualization Software"
 HOMEPAGE="https://www.graphviz.org/ https://gitlab.com/graphviz/graphviz/"
@@ -14,11 +15,12 @@ SRC_URI="https://gitlab.com/api/v4/projects/4207231/packages/generic/graphviz-re
 
 LICENSE="CPL-1.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="+cairo devil doc examples gtk2 gts guile lasi nls pdf perl postscript python qt5 ruby svg tcl webp X"
 
 REQUIRED_USE="
 	!cairo? ( !X !gtk2 !postscript !lasi )
+	guile? ( ${GUILE_REQUIRED_USE} )
 	pdf? ( cairo )
 	python? ( ${PYTHON_REQUIRED_USE} )"
 
@@ -45,7 +47,7 @@ RDEPEND="
 		x11-libs/gtk+:2
 	)
 	gts? ( sci-libs/gts )
-	guile? ( dev-scheme/guile )
+	guile? ( ${GUILE_DEPS} )
 	lasi? ( media-libs/lasi )
 	pdf? ( app-text/poppler )
 	perl? ( dev-lang/perl:= )
@@ -74,7 +76,7 @@ BDEPEND="
 	)
 	guile? (
 		dev-lang/swig
-		dev-scheme/guile
+		${GUILE_DEPS}
 	)
 	nls? ( >=sys-devel/gettext-0.14.5 )
 	perl? ( dev-lang/swig )
@@ -138,11 +140,16 @@ BDEPEND="
 #   with flags enabled at configure time
 
 pkg_setup() {
+	use guile && guile-single_pkg_setup
 	use python && python-single-r1_pkg_setup
 }
 
 src_prepare() {
-	default
+	if use guile; then
+		guile-single_src_prepare
+	else
+		default
+	fi
 	elibtoolize
 }
 
@@ -194,7 +201,10 @@ src_configure() {
 		--disable-ltdl-install
 		QMAKE=$(usev qt5 qmake5)
 	)
-	econf "${myconf[@]}"
+	# XXX: Temporary bash for bug #926600. It's been reverted upstream
+	# on master already:
+	# https://gitlab.com/graphviz/graphviz/-/merge_requests/3636
+	CONFIG_SHELL="${BROOT}"/bin/bash econf "${myconf[@]}"
 }
 
 src_install() {
@@ -202,6 +212,8 @@ src_install() {
 
 	find "${ED}" -name '*.la' -delete || die
 
+	use guile && guile_unstrip_ccache
+
 	use python && python_optimize \
 		"${D}"$(python_get_sitedir) \
 		"${ED}"/usr/$(get_libdir)/graphviz/python3
diff --git a/media-gfx/graphviz/graphviz-10.0.1.ebuild b/media-gfx/graphviz/graphviz-12.0.0.ebuild
index be0c1a91e64f..44dc526e1869 100644
--- a/media-gfx/graphviz/graphviz-10.0.1.ebuild
+++ b/media-gfx/graphviz/graphviz-12.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 inherit libtool python-single-r1
 
 DESCRIPTION="Open Source Graph Visualization Software"
@@ -14,7 +14,7 @@ SRC_URI="https://gitlab.com/api/v4/projects/4207231/packages/generic/graphviz-re
 
 LICENSE="CPL-1.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="+cairo devil doc examples gtk2 gts guile lasi nls pdf perl postscript python qt5 ruby svg tcl webp X"
 
 REQUIRED_USE="
diff --git a/media-gfx/graphviz/graphviz-12.1.2.ebuild b/media-gfx/graphviz/graphviz-12.1.2.ebuild
new file mode 100644
index 000000000000..d66128a9fbcf
--- /dev/null
+++ b/media-gfx/graphviz/graphviz-12.1.2.ebuild
@@ -0,0 +1,230 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+GUILE_COMPAT=( 2-2 3-0 )
+PYTHON_COMPAT=( python3_{10..13} )
+inherit guile-single libtool python-single-r1
+
+DESCRIPTION="Open Source Graph Visualization Software"
+HOMEPAGE="https://www.graphviz.org/ https://gitlab.com/graphviz/graphviz/"
+# Unfortunately upstream uses an "artifact" store for the pre-generated
+# tarball now, which makes predictable URLs impossible.
+SRC_URI="https://gitlab.com/api/v4/projects/4207231/packages/generic/graphviz-releases/${PV}/${P}.tar.xz"
+
+LICENSE="CPL-1.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="+cairo devil doc examples gtk2 gts guile lasi nls pdf perl postscript python qt5 ruby svg tcl webp X"
+
+REQUIRED_USE="
+	!cairo? ( !X !gtk2 !postscript !lasi )
+	guile? ( ${GUILE_REQUIRED_USE} )
+	pdf? ( cairo )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+
+# Requires ksh, tests against installed package, missing files and directory
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-libs/expat-2
+	>=dev-libs/glib-2.11.1:2
+	dev-libs/libltdl
+	>=media-libs/freetype-2.1.10
+	>=media-libs/gd-2.0.34:=[fontconfig,jpeg,png,truetype,zlib]
+	media-libs/libjpeg-turbo:=
+	>=media-libs/libpng-1.2:=
+	sys-libs/zlib
+	virtual/libiconv
+	cairo? (
+		>=x11-libs/cairo-1.1.10[svg(+)]
+		>=x11-libs/pango-1.12
+	)
+	devil? ( media-libs/devil[png,jpeg] )
+	gtk2? (
+		x11-libs/gdk-pixbuf:2
+		x11-libs/gtk+:2
+	)
+	gts? ( sci-libs/gts )
+	guile? ( ${GUILE_DEPS} )
+	lasi? ( media-libs/lasi )
+	pdf? ( app-text/poppler )
+	perl? ( dev-lang/perl:= )
+	postscript? ( app-text/ghostscript-gpl )
+	python? ( ${PYTHON_DEPS} )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtprintsupport:5
+		dev-qt/qtwidgets:5
+	)
+	ruby? ( dev-lang/ruby:* )
+	svg? ( gnome-base/librsvg )
+	tcl? ( >=dev-lang/tcl-8.3:= )
+	webp? ( media-libs/libwebp:= )
+	X? ( x11-libs/libX11 )"
+DEPEND="${RDEPEND}
+	X? ( x11-base/xorg-proto )"
+BDEPEND="
+	app-alternatives/lex
+	dev-build/libtool
+	virtual/pkgconfig
+	doc? (
+		app-text/ghostscript-gpl
+		sys-apps/groff
+	)
+	guile? (
+		dev-lang/swig
+		${GUILE_DEPS}
+	)
+	nls? ( >=sys-devel/gettext-0.14.5 )
+	perl? ( dev-lang/swig )
+	python? ( dev-lang/swig )
+	ruby? ( dev-lang/swig )
+	tcl? ( dev-lang/swig )"
+
+# Dependency description / Maintainer info:
+
+# Rendering is done via the following plugins (/plugins):
+# - core, dot_layout, neato_layout, gd , dot
+#   the ones which are always compiled in, depend on zlib, gd
+# - gtk
+#   Directly depends on gtk-2.
+#   needs 'pangocairo' enabled in graphviz configuration
+#   gtk-2 depends on pango, cairo and libX11 directly.
+# - gdk-pixbuf
+#   Directly depends on gtk-2 and gdk-pixbuf.
+#   needs 'pangocairo' enabled in graphviz configuration
+# - ming
+#   flash plugin via -Tswf requires media-libs/ming-0.4. Disabled as it's
+#   incomplete.
+# - cairo/pango:
+#   Needs pango for text layout, uses cairo methods to draw stuff
+# - xlib:
+#   needs cairo+pango,
+#   can make use of gnomeui and inotify support (??? unsure),
+#   needs libXaw for UI
+#   UI also links directly against libX11, libXmu, and libXt
+#   and uses libXpm if available so we make sure it always is
+
+# There can be swig-generated bindings for the following languages (/tclpkg/gv):
+# - c-sharp (disabled)
+# - scheme (enabled via guile) ... no longer broken on ~x86
+# - go (disabled)
+# - io (disabled)
+# - lua (enabled via lua)
+# - ocaml (enabled via ocaml)
+# - perl (enabled via perl) *1
+# - php (enabled via php) *2
+# - python (enabled via python) *1
+# - ruby (enabled via ruby) *1
+# - tcl (enabled via tcl)
+# *1 = The ${P}-bindings.patch takes care that those bindings are installed to the right location
+# *2 = Those bindings don't build because the paths for the headers/libs aren't
+#      detected correctly and/or the options passed to swig are wrong (-php instead of -php4/5)
+
+# There are several other tools in /tclpkg:
+# gdtclft, tcldot, tclhandle, tclpathplan, tclstubs ; enabled with: --with-tcl
+# tkspline, tkstubs ; enabled with: --with-tk
+
+# And the commands (/cmd):
+# - dot, gvedit, gvpr, smyrna, tools/* :)
+#   sci-libs/gts can be used for some of these
+# - gvedit (via 'qt5'):
+#   based on ./configure it needs qt-core and qt-gui only
+# - smyrna : experimental opengl front-end (via 'smyrna')
+#   currently disabled -- it segfaults a lot
+#   needs x11-libs/gtkglext, gnome-base/libglade, media-libs/freeglut
+#   sci-libs/gts, x11-libs/gtk.  Also needs 'gtk','glade','glut','gts' and 'png'
+#   with flags enabled at configure time
+
+pkg_setup() {
+	use guile && guile-single_pkg_setup
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	if use guile; then
+		guile-single_src_prepare
+	else
+		default
+	fi
+	elibtoolize
+}
+
+src_configure() {
+	local myconf=(
+		# Speeds up the libltdl configure
+		--cache-file="${S}"/config.cache
+		--enable-ltdl
+		$(use_enable doc man-pdfs)
+		$(use_with cairo pangocairo)
+		$(use_with examples demos '$(docdir)/examples')
+		$(use_with devil)
+		$(use_with gtk2 gdk)
+		$(use_with gtk2 gdk-pixbuf)
+		$(use_with gtk2)
+		$(use_with gts)
+		$(use_with qt5 qt)
+		$(use_with lasi)
+		$(use_with pdf poppler)
+		$(use_with postscript ghostscript)
+		$(use_with svg rsvg)
+		$(use_with webp)
+		$(use_with X x)
+		--with-digcola
+		--with-freetype2
+		--with-ipsepcola
+		--with-libgd
+		--with-sfdp
+		--without-ming
+		# New/experimental features, to be tested, disable for now
+		--without-ipsepcola
+		--without-smyrna
+		# Bindings
+		$(use_enable guile)
+		$(use_enable perl)
+		$(use_enable python python3)
+		$(use_enable ruby)
+		$(use_enable tcl)
+		--disable-go
+		--disable-lua
+		--disable-java
+		--disable-ocaml
+		--disable-php
+		--disable-python
+		--disable-r
+		--disable-sharp
+		# libtool file collision, bug #276609
+		--without-included-ltdl
+		--disable-ltdl-install
+		QMAKE=$(usev qt5 qmake5)
+	)
+	# XXX: Temporary bash for bug #926600. It's been reverted upstream
+	# on master already:
+	# https://gitlab.com/graphviz/graphviz/-/merge_requests/3636
+	CONFIG_SHELL="${BROOT}"/bin/bash econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.la' -delete || die
+
+	use guile && guile_unstrip_ccache
+
+	use python && python_optimize \
+		"${D}"$(python_get_sitedir) \
+		"${ED}"/usr/$(get_libdir)/graphviz/python3
+}
+
+pkg_postinst() {
+	# We need to register all plugins before they become usable
+	dot -c || die
+}
+
+pkg_postrm() {
+	# Remove cruft, bug #547344
+	rm -rf "${EROOT}"/usr/$(get_libdir)/graphviz/config{,6} || die
+}
diff --git a/media-gfx/gscan2pdf/Manifest b/media-gfx/gscan2pdf/Manifest
index 42cf1e9a0a32..291e084c6e81 100644
--- a/media-gfx/gscan2pdf/Manifest
+++ b/media-gfx/gscan2pdf/Manifest
@@ -2,7 +2,9 @@ AUX gscan2pdf-2.13.2-min_max.patch 919 BLAKE2B f74350243325ec05dc290afd45e45d591
 AUX gscan2pdf-2.13.2-t1161.patch 512 BLAKE2B b74f51a2cc70c19ef9b242b02540fff63098a783f9a0102622844a49fd5cf60c3701255af5317450c92bec3b3a7dc784fd9a5f37e136cd4db9f16de800323602 SHA512 cc8a8c65e9cf9b1425f69ae15687cdf0983fefd1415e30510e6f6bf0d4ffe71375839e2a4355c9d2f69b7b690d1a39d8520181dadbb055576cf2cde156b72c6e
 AUX gscan2pdf-2.13.2-t131.patch 473 BLAKE2B 23ec073509f9b252494e677a7f90f1eb41077a7e63641b1f6a6cb06d9a1329a3b5c96189c92a78b11b515c091b8df16173a40ced65d8f563e87b7d83410c31dd SHA512 ceffdfd0e478047d5da7044e160b8feadda9a0fa09ac99c609a118b84ac45ed10cd386f04c499c832566d8626e5abee4ce5d819a9e51733eb7dc822fa162f32d
 AUX gscan2pdf-2.13.2-tiff2ps.patch 1490 BLAKE2B c8b85f7a21e3e03cc1621d0f65af9f6ab03e89e72ef3839dc6f585cd8d0e6cc2d10c49ff119b671bc9f6fc99cf03c6a0117402acc38e624d46fd89cd02a75058 SHA512 b6357c1ea6d6dc958b7044be062bdb9445667da3d2ff9017bbdd3b041daafa89e742d8c1c9c919d3b8b5c4ab35840db1d24ec27a573a1e75b544c0dfce40bd9b
+AUX gscan2pdf-2.13.4-t3722.patch 385 BLAKE2B 7bb1b2f703e23972170be497829cb2b52d02cb3754a64e7922acb4cb50b9e7c797bfbb82b04aaa881ab8601e88a60bd34e0796abec83413dce789e17a910856a SHA512 d5770a48f70ce2337ea4332bf9eca8d21da732192cbdf449488646d968ad0a99bd871fd1eab8670b269b33c1e8f35c61dc6b5d61a3486bcdf09bd94aaa16d210
 DIST gscan2pdf-2.13.2.tar.xz 507244 BLAKE2B 66ac15ddcf74ed2b04f231e24a663afa7494bd5df04ecb190b68b9822382e01953d97949174f3d6280fabc9d0a2ea1cc270c0aa333cf9992cfa2f58f645df156 SHA512 882b707b11df26310136ed72428eab6ec8e2c6cf34686675eee3b14181622f85d21be0e05cab411961f2a2441ad948e7b56c7fe24eecb558eae7a7ac6b4db9d1
-EBUILD gscan2pdf-2.13.2-r1.ebuild 3534 BLAKE2B 1701f2dc7dd1564fd0c9791c56e14f2f6fd2a4d9db2074e81930ed63543c9b39332352d82d9c24090a73de52d3a9a2ae018b60d98f1c7d25a2495f42e5693acb SHA512 91076ffc00738240a6a7b59e1a9ba5a63b657c53d9d759ed0465e14ec990d32fc125cc0d1f58f46a3831ae95da45bb2e925ea8ee88a46aa50cbda95dbd3f0d06
-EBUILD gscan2pdf-2.13.2.ebuild 3024 BLAKE2B ea848a2d53e265954eecd3df6e878c2669e65a8cbda53cd0526f84885c46bd1dcbb37fc0a99585293e6ebb75a4bfe6b37c62883131560ef2a5d446c390548fc8 SHA512 82d9fef80776516ac278b4636d16af52629f6904999370defe3dea7e23e8383ef04740218d0b4505d41e1e977caf9bf55741cb4320c9732e13ee927c7f38a59f
+DIST gscan2pdf-2.13.4.tar.xz 510300 BLAKE2B 1a6721df5bc037abeed877a55ba5e4e1d3a6c559786a79f1196842819fa48ecf06715e29a7662db9a19e40b22d62fc69c5786213ae46b456e3252920dc2549af SHA512 19bd71b08c3be0a239e4018a50e1327b74b07cc64b03546e573ccbcbf89f3de3443ca9735740b070162c6c9f0adc7655fc81319fc082bd15a47f5e90baee6537
+EBUILD gscan2pdf-2.13.2-r1.ebuild 3537 BLAKE2B 83a366fcdd9c4a8b4e40476f1fcd86df21e6e81f98f7af7a27eb49d0035e5454c404cc3207a75fce3a00f982e8c6451db9b9692deb7a8a5179dd1a5b446d2360 SHA512 455e2f6b8b2b7836571ae16a34b42e95d4df0da3345dc74f04afb0ee0d1664a0bade1d06a4001769ebbb3be24792cdff5cdd4213ae67f474a898b0596ba330c5
+EBUILD gscan2pdf-2.13.4.ebuild 3123 BLAKE2B 1525e2c4131a2184a68ffe217ee4d55dda3ae171d35ba05a592c032449018c1dbd6e4d642c4d0904b2e77962aa4c0a32fc5f79d7a0fa426846cbcacb0a940b83 SHA512 8bab1e3b8e6f53bc0fa4da84f0cb6c7b021affdbd0c9a52cc0e4cda4d58abe9fe2406a54d60eb01f7e32b59622af31f390e05a3dfc251cbe649dcb3a76dd8725
 MISC metadata.xml 470 BLAKE2B d9a9ad2f443b0bca02e6b8e91c96f22430543ee82fe8a1174739d4ad59225f73b975d31316fecd4dde6f26002ef6ba9fd39bf5d4adfd2bc82540d14e90d623a6 SHA512 ecd2fe9215c3a65760b8c101989772a73a7e9975dc38a1b11b0334cf6e1d001ccebfca1bc6d7631eb3b3e3e03d1736205563b0c836a2aea026fdfe552d72cbe0
diff --git a/media-gfx/gscan2pdf/files/gscan2pdf-2.13.4-t3722.patch b/media-gfx/gscan2pdf/files/gscan2pdf-2.13.4-t3722.patch
new file mode 100644
index 000000000000..715dbdedf213
--- /dev/null
+++ b/media-gfx/gscan2pdf/files/gscan2pdf-2.13.4-t3722.patch
@@ -0,0 +1,11 @@
+--- a/t/3722_user_defined.t
++++ b/t/3722_user_defined.t
+@@ -38,7 +38,7 @@ $slist->import_files(
+             },
+             error_callback => sub {
+                 my ( $uuid, $process, $msg ) = @_;
+-                is( $msg, 'error',
++                is( substr($msg, 0, 5), 'error',
+                     'user_defined caught error injected in queue' );
+             },
+         );
diff --git a/media-gfx/gscan2pdf/gscan2pdf-2.13.2-r1.ebuild b/media-gfx/gscan2pdf/gscan2pdf-2.13.2-r1.ebuild
index 656fdc789c77..c62432895cb6 100644
--- a/media-gfx/gscan2pdf/gscan2pdf-2.13.2-r1.ebuild
+++ b/media-gfx/gscan2pdf/gscan2pdf-2.13.2-r1.ebuild
@@ -58,7 +58,7 @@ BDEPEND="
 
 		app-text/djvu[jpeg,tiff]
 		app-text/poppler[utils]
-		app-text/tesseract[-opencl,osd(+),png,tiff]
+		app-text/tesseract[-opencl(-),osd(+),png,tiff]
 		app-text/unpaper
 		media-gfx/imagemagick[djvu,jpeg,png,tiff,perl,postscript,truetype]
 		media-gfx/sane-backends[sane_backends_test]
diff --git a/media-gfx/gscan2pdf/gscan2pdf-2.13.2.ebuild b/media-gfx/gscan2pdf/gscan2pdf-2.13.4.ebuild
index 8b113cf10656..70b55f49a590 100644
--- a/media-gfx/gscan2pdf/gscan2pdf-2.13.2.ebuild
+++ b/media-gfx/gscan2pdf/gscan2pdf-2.13.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
@@ -47,7 +47,7 @@ RDEPEND="
 	virtual/perl-threads-shared
 	media-gfx/imagemagick[png,tiff,perl]
 	media-gfx/sane-backends
-	media-libs/tiff"
+	>=media-libs/tiff-4.7.0"
 
 BDEPEND="
 	test? (
@@ -58,13 +58,18 @@ BDEPEND="
 
 		app-text/djvu[jpeg,tiff]
 		app-text/poppler[utils]
-		app-text/tesseract[-opencl,osd(+),png,tiff]
+		app-text/tesseract[-opencl(-),png,tiff]
 		app-text/unpaper
 		media-gfx/imagemagick[djvu,jpeg,png,tiff,perl,postscript,truetype]
 		media-gfx/sane-backends[sane_backends_test]
 		media-gfx/sane-frontends
 	)"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-2.13.2-t1161.patch"
+	"${FILESDIR}/${PN}-2.13.4-t3722.patch"
+)
+
 PERL_RM_FILES=( t/{90_MANIFEST,91_critic,99_pod,169_import_scan}.t )
 
 mydoc="History"
diff --git a/media-gfx/gtkimageview/Manifest b/media-gfx/gtkimageview/Manifest
index 2924049dc4eb..2ddb3b5d4b35 100644
--- a/media-gfx/gtkimageview/Manifest
+++ b/media-gfx/gtkimageview/Manifest
@@ -1,4 +1,4 @@
 AUX gtkimageview-1.6.4-slibtool-undefined-references.patch 1038 BLAKE2B 6026cf188eb0d230f139667eadd8926eedc14bddacdcc338798ccf59422e06b48727c0a5faf172acefe03a710965a56dbf515a9ec4ffb48ceff99d9dcce33059 SHA512 0d4b3baa96c4cf7ac79623a963c2d95226858a5e06ba5eab6658f7737d9e3501fe9dd44f2716691b2a67176907010de5faf5363a6aa1d9e0981eca83412c03f4
 DIST gtkimageview-1.6.4.tar.gz 1158138 BLAKE2B b59abcbac71d4bd039bf9f3fc2f25f6590f91c4cc320cea90243a4889e020f1a54a3ca5d8a843f7482551ce8da6fafe6e3ce4fbc5a5e32fd6ceb4367b5abb9db SHA512 6378c640006e73aa1ffbf92eb9d4e42570707bc159f0a657b11f027d328088f5e89fc334de170de5ab1a39bed588b0b76f4633688a894cb7def16f1dea9f8e39
-EBUILD gtkimageview-1.6.4.ebuild 1303 BLAKE2B 6019b98b10fbc5ecfe3276adb9385776facc90bd09681eef0b47742a7383563d1cf051cc67c1c3c5474f0ba1080df7c287324d4ff5d41272b86dfd7c672f8ea0 SHA512 20f8719d3fccbda73e0fcb31e120e2866d5125bf9af2de002c473621f14a0cd447fb1d0e4d3c841c39f9dd08f7586d567f8c872fabc15f29c21c18ec0877f5f1
+EBUILD gtkimageview-1.6.4.ebuild 1297 BLAKE2B 6c3dc65021b9e105a6112e1a6d9d75a74f1d54c7cb36dbc0f9ec10b3f181e4c3e57b7a4d6d7391dc6f3ea3b9e47f0cca78475cc556a78567710bb62f3937f241 SHA512 187c94193157481721e8cf2934a2a5bd0f2f3ee3f09192cc2f5bafbb054c2599f7da9efac87a8bc0d466e5164bba0b1a740c7e8a680db879f70fdad8fbf932dd
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/media-gfx/gtkimageview/gtkimageview-1.6.4.ebuild b/media-gfx/gtkimageview/gtkimageview-1.6.4.ebuild
index 1499634d4318..920a0c51adbc 100644
--- a/media-gfx/gtkimageview/gtkimageview-1.6.4.ebuild
+++ b/media-gfx/gtkimageview/gtkimageview-1.6.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
 IUSE="examples static-libs"
 
 # tests are severely broken, bug #483952
diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest
index 24e4596d6c03..5d2d0ade2c2e 100644
--- a/media-gfx/hugin/Manifest
+++ b/media-gfx/hugin/Manifest
@@ -1,4 +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
-EBUILD hugin-2023.0.0-r1.ebuild 2115 BLAKE2B fc20ea33349976ef525f6f292d6980c7663db986a3a1b580bb44533e2dc41b5bf4c3fc5b8ea5921891495b54dc1be6981e5dcaa28cab73799a5930dc6fe42c06 SHA512 b94c7b35a787bceac7b68540162a3ee8fd8e8a6383e9f0ca7ccca74b836073663283183934cc019e2130ef87721da88d982391082e4ec410c03921ef76f91dd9
-EBUILD hugin-9999.ebuild 2210 BLAKE2B 9961fb69cdbb3e4fd63e567ad6cc96dc8a81e608b3742733ad3cc0c19be059e591ae41f2f64751dfbb4482863b97546696ac7088f5b3d74c88ec434ee50bdc7e SHA512 900b2d13e4e756b57830af1c0c6f39b7cf9dd26afeaf5d8f3ceb06be567843f8ba30ae15af032a3a7486eb6be03b6838d96d2a90f0c70e2dfe4e52044dbfbb4f
+DIST hugin-2024.0beta1.tar.bz2 10351004 BLAKE2B 53bd8d1622ee9cc407d25cc3edcb16063689d6f949f38d4e4bf0c9afd6fa7f065bdab030dd6a2f2a2c82bb6953e8f16655d5a1f305d0b494a4a4ab8ce6dddecd SHA512 3395e00d1e895db4ce063b6e2e936f2af8aed0740d10ea15763c94549e64953da4e9c214bd6058d879435527e945c4ddfaa75d7d8efb98e7220102872c4f8305
+EBUILD hugin-2023.0.0-r1.ebuild 2193 BLAKE2B acc220e65485eba96191ed6459acda962b66eadb8010d543664fb151a0f56ada5fb8aab96584ab517405f8105b307813c60e0d82f7344a5b3d43b5de7acae201 SHA512 fd18cbc43f50dca29b9574ffa7d4d8dd5c513327269602810acafac34c4b1c48630d308c28538e6cfe73bbaff019c056cd2fc7ece1030e51a8f70ad1b46d9eaf
+EBUILD hugin-2024.0_beta1.ebuild 2117 BLAKE2B 1bf1c8e04ad68397e95d87e5a8ae9d7a5432af2ec8139dba6fd198a29edfbcd97b4052ac5f38f45e22a0be1c2664dbb0ee640bfa2ab089e17986b2760cd9c811 SHA512 6f2da09f4f2700f9becd4c1e9da9f957ba197a5b7636faf1e1f7324d1e3a95fe75b02cf9b474dbe26fa69b586af65c9c28e90c2559b11295ac4711f0758f47d7
+EBUILD hugin-9999.ebuild 2041 BLAKE2B 68e51179017623a59c1c6dbbace836c6558c8f33fce09488b999965b2d02df3703767089a5c2fd2e7979135173982fb7af30e8570f8814219832a5e848d177c4 SHA512 40e3c43bafb40fcee31092197569a51ce5fa87b48e40a2ab676acc347ffdfec9bd818d3743fc7ee1c9bf2ee481018753f56659dce7c84527b9c71d86831b9a9d
 MISC metadata.xml 547 BLAKE2B ea55ca44dac1ccf74d4af96d42af1d4efac2f9823304b529b96aea364ec4a6f8430fd130f54c064766f0c34f9060ca076aa43de664e37177b41cc2deed0207bc SHA512 5012cb4a58bdc374f89d1a2e81e8321ff25f2de2f5682a2f8859137aa3339ce059e7823e26642f58b939e6c1d7f428356a4df5311fca1105320ebcb417129cba
diff --git a/media-gfx/hugin/files/boost-1.85-932315.patch b/media-gfx/hugin/files/boost-1.85-932315.patch
new file mode 100644
index 000000000000..e8fc5c2daa1f
--- /dev/null
+++ b/media-gfx/hugin/files/boost-1.85-932315.patch
@@ -0,0 +1,25 @@
+# HG changeset patch
+# User tmodes
+# Date 1710260877 -3600
+#      Tue Mar 12 17:27:57 2024 +0100
+# Node ID 4d081490b48aaff820cee7601b8624b37b652c06
+# Parent  4b55f17c4e72d6c2f8b4930e3367ff52e1741b45
+Fixed deprecated boost::filesystem::copy_option enum
+
+diff -r 4b55f17c4e72 -r 4d081490b48a src/hugin_base/hugin_utils/filesystem.h
+--- a/src/hugin_base/hugin_utils/filesystem.h	Tue Mar 12 17:27:29 2024 +0100
++++ b/src/hugin_base/hugin_utils/filesystem.h	Tue Mar 12 17:27:57 2024 +0100
+@@ -64,6 +64,12 @@
+     #endif
+     #include <boost/filesystem.hpp>
+     namespace fs = boost::filesystem;
+-    #define OVERWRITE_EXISTING boost::filesystem::copy_option::overwrite_if_exists
++    #if BOOST_VERSION>=107400
++      // in Boost 1.74 and later filesystem::copy_option is deprecated
++      // use filesystem::copy_options instead
++      #define OVERWRITE_EXISTING boost::filesystem::copy_options::overwrite_existing
++    #else
++      #define OVERWRITE_EXISTING boost::filesystem::copy_option::overwrite_if_exists
++    #endif
+ #endif
+ #endif // _HUGIN_UTILS_FILESYSTEM_H
diff --git a/media-gfx/hugin/hugin-2023.0.0-r1.ebuild b/media-gfx/hugin/hugin-2023.0.0-r1.ebuild
index 4587f91ae7d5..40c4d46a93f6 100644
--- a/media-gfx/hugin/hugin-2023.0.0-r1.ebuild
+++ b/media-gfx/hugin/hugin-2023.0.0-r1.ebuild
@@ -62,6 +62,9 @@ pkg_setup() {
 }
 
 src_prepare() {
+	# Fix build with boost >=1.85
+	eapply "${FILESDIR}/boost-1.85-932315.patch"
+
 	sed -i \
 		-e "/COMMAND.*GZIP/d" \
 		-e "s/\.gz//g" \
diff --git a/media-gfx/hugin/hugin-2024.0_beta1.ebuild b/media-gfx/hugin/hugin-2024.0_beta1.ebuild
new file mode 100644
index 000000000000..ab8ecc11df67
--- /dev/null
+++ b/media-gfx/hugin/hugin-2024.0_beta1.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+WX_GTK_VER="3.2-gtk3"
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit python-single-r1 wxwidgets cmake xdg
+
+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"
+
+LANGS=" ca ca-valencia cs da de en-GB es eu fi fr hu it ja nl pl pt-BR ro ru sk sv zh-CN zh-TW"
+IUSE="debug lapack python raw sift $(echo ${LANGS//\ /\ l10n_})"
+
+CDEPEND="
+	dev-db/sqlite:3
+	dev-libs/boost:=
+	>=media-gfx/enblend-4.0
+	media-gfx/exiv2:=
+	media-libs/freeglut
+	media-libs/glew:=
+	media-libs/libjpeg-turbo:=
+	>=media-libs/libpano13-2.9.19_beta1:=
+	media-libs/libpng:=
+	media-libs/openexr:=
+	media-libs/tiff:=
+	>=media-libs/vigra-1.11.1-r5[openexr]
+	sci-libs/fftw:3.0=
+	sci-libs/flann
+	sys-libs/zlib
+	virtual/glu
+	virtual/opengl
+	x11-libs/wxGTK:${WX_GTK_VER}=[X,opengl]
+	lapack? ( virtual/blas virtual/lapack )
+	python? ( ${PYTHON_DEPS} )
+	sift? ( media-gfx/autopano-sift-C )"
+RDEPEND="${CDEPEND}
+	media-libs/exiftool
+	raw? ( media-gfx/dcraw )"
+DEPEND="${CDEPEND}
+	dev-cpp/tclap
+	sys-devel/gettext
+	virtual/pkgconfig
+	python? ( >=dev-lang/swig-2.0.4 )"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+DOCS=( authors.txt README TODO )
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+	setup-wxwidgets
+}
+
+src_prepare() {
+	sed -i \
+		-e "/COMMAND.*GZIP/d" \
+		-e "s/\.gz//g" \
+		"${S}"/doc/CMakeLists.txt || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_HSI=$(usex python)
+		-DENABLE_LAPACK=$(usex lapack)
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	use python && python_optimize
+
+	local lang
+	for lang in ${LANGS} ; do
+		case ${lang} in
+			ca) dir=ca_ES;;
+			ca-valencia) dir=ca_ES@valencia;;
+			cs) dir=cs_CZ;;
+			*) dir=${lang/-/_};;
+		esac
+		if ! use l10n_${lang} ; then
+			rm -r "${ED}"/usr/share/locale/${dir} || die
+		fi
+	done
+}
diff --git a/media-gfx/hugin/hugin-9999.ebuild b/media-gfx/hugin/hugin-9999.ebuild
index aec868af9672..db8dffa1c308 100644
--- a/media-gfx/hugin/hugin-9999.ebuild
+++ b/media-gfx/hugin/hugin-9999.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 WX_GTK_VER="3.2-gtk3"
-PYTHON_COMPAT=( python3_{9..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 
 inherit mercurial python-single-r1 wxwidgets cmake xdg
 
@@ -14,6 +14,8 @@ SRC_URI=""
 EHG_REPO_URI="http://hg.code.sf.net/p/hugin/hugin"
 EHG_PROJECT="${PN}-${PN}"
 
+S=${WORKDIR}/${PN}-$(ver_cut 1-2).0
+
 LICENSE="GPL-2+ BSD BSD-2 MIT wxWinLL-3 ZLIB FDL-1.2"
 SLOT="0"
 KEYWORDS=""
@@ -56,8 +58,6 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 DOCS=( authors.txt README TODO )
 
-S=${WORKDIR}/${PN}-$(ver_cut 1-2).0
-
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
 	setup-wxwidgets
@@ -71,10 +71,6 @@ src_configure() {
 	local mycmakeargs=(
 		-DBUILD_HSI=$(usex python)
 		-DENABLE_LAPACK=$(usex lapack)
-		# Temporary workaround for bug #833443. Can be dropped when
-		# we switch to wxgtk-3.2, but complications for that remain
-		# w/ egl+wayland.
-		-DUSE_GDKBACKEND_X11=on
 	)
 	cmake_src_configure
 }
diff --git a/media-gfx/hydrus/Manifest b/media-gfx/hydrus/Manifest
index cfc7a27cb653..202605d76f32 100644
--- a/media-gfx/hydrus/Manifest
+++ b/media-gfx/hydrus/Manifest
@@ -3,7 +3,9 @@ AUX hydrus-server 69 BLAKE2B 245851a0bfd7ed4e947d229cae980daaaf213e2ff4238b5bc6c
 AUX userpath-in-local-share.patch 492 BLAKE2B b6de719f01072ccbb055fb9fb10980bf2f36972c2b998b23c90001e33d2b103d3d55f288a08db8bbb9b2e743bafab4c9ed304f94d1abd6869fbc39dd226f8673 SHA512 0811d610c29ecae4cdecf6d8f01950738f02cdebee84223c884ba708347c91692b13bff00eaa835790df6bf9d0db79c3a78c1abee9adf6a4e57903cc18cc2587
 DIST hydrus-3500-mpeg-error.patch 1632 BLAKE2B 9cc969a3a2d476ea606f3f280ecd6e4cc7f628420586e651377945d370a6c50464b118da1c96a577bc55b13bbac946801b9cff251922299f91e4a76dabf7edf9 SHA512 8769d63c7b2a345e1a7bfa0dae200bca03b991ef6a217150e3f50c95f3d1235305242348aa8fabf1183fc3d787498bbead8a96145e4cdd2251f67032469f095c
 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.ebuild 5016 BLAKE2B d5291a005bad4893070b983c56b4fdc5de7e49224da928caf769ba01dc7fe4159641c14c1e29e8ce6fc74562ccfa92bd8215c4d912bd30d67c7213c3486d93ac SHA512 7ea6495c21d3e98733db00a6174b2f2ef51c0da8ba37cf01ccb4b2076761c582f9e3925e1ffd3cb76d925522b7e39430585224e979bfaf1ca9105ae50c328bd6
+EBUILD hydrus-565-r1.ebuild 5014 BLAKE2B a11c28e40bc5d50d81c3540b5b9837b734d3b9c51a7b267b49c89ca8f6933f0dc0949478cdad4446748d06c37d9401d35b88b8815ef4149c9a1f76bbf9e5eb63 SHA512 ef1d178be78e508ec0ed7b8fabdf7d11d21973711b5335fa790f65e39a04c3242c59bf6f9b31fe4909583967171f3bd89e76d8a72b8926323f2c7ff52926e1bc
+EBUILD hydrus-571.ebuild 5014 BLAKE2B a11c28e40bc5d50d81c3540b5b9837b734d3b9c51a7b267b49c89ca8f6933f0dc0949478cdad4446748d06c37d9401d35b88b8815ef4149c9a1f76bbf9e5eb63 SHA512 ef1d178be78e508ec0ed7b8fabdf7d11d21973711b5335fa790f65e39a04c3242c59bf6f9b31fe4909583967171f3bd89e76d8a72b8926323f2c7ff52926e1bc
 EBUILD hydrus-9999.ebuild 4694 BLAKE2B 991178a1b0492857c85fecc15e840887a63c33f1b9ed6cd8f5b7c3bdf27dbf1b6a5b8e09af0a4f9541dda9ee9dadb26d5f1b8ec4e7d77d0b8a2a5c3c24354e0a SHA512 37d888d5423c395fb77652275e44a952bd22f6b36e44aea612a2ed7d373eb925e0a3d8a9376ba2978e0468def104b6c8465cdbcc2f8ba6acf758b40e449bfaae
 MISC metadata.xml 836 BLAKE2B 049faa70763ba176b6e4930abcdb5f4b4b87bd243759aba42dec32b9f2a199b3f2c33f0415ffdd1a392af3b461d939e633ec1f9333b0ff538f74d24306790fbe SHA512 0404c79e85e51eaba13fef930e695f168074e69734d3d8a604515f77196706bae9d36a2df9b3db0530c9f17b32881602509c7e22e7383c957a67e13c2a46e7bb
diff --git a/media-gfx/hydrus/hydrus-565.ebuild b/media-gfx/hydrus/hydrus-565-r1.ebuild
index 1fd94b6ee116..07124a7dd9f9 100644
--- a/media-gfx/hydrus/hydrus-565.ebuild
+++ b/media-gfx/hydrus/hydrus-565-r1.ebuild
@@ -62,7 +62,7 @@ RDEPEND="
 		dev-python/twisted[${PYTHON_USEDEP}]
 
 		dev-python/QtPy[widgets,gui,svg,multimedia,${PYTHON_USEDEP}]
-		|| ( dev-python/QtPy[pyside2] dev-python/QtPy[pyside6] )
+		|| ( 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
new file mode 100644
index 000000000000..07124a7dd9f9
--- /dev/null
+++ b/media-gfx/hydrus/hydrus-571.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_REQ_USE="sqlite"
+
+DOCS_BUILDER=mkdocs
+DOCS_DEPEND="dev-python/mkdocs-material dev-python/regex"
+
+inherit python-single-r1 desktop docs optfeature
+
+DESCRIPTION="A booru-like media organizer for the desktop"
+HOMEPAGE="https://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus"
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/hydrusnetwork/hydrus.git"
+else
+	SRC_URI="
+		https://github.com/hydrusnetwork/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+		https://github.com/vaartis/hydrus/commit/5d2505a1eb4721f7750861f7622c46adec31db8b.diff -> hydrus-3500-mpeg-error.patch
+		https://github.com/vaartis/hydrus/commit/dc20196f47ac29568a40cd04a45cf4fc5f237603.diff -> hydrus-test-fixes.patch
+"
+
+	KEYWORDS="~amd64"
+fi
+
+# hydrus itself is WTFPL
+# icons included are CC-BY-2.5
+LICENSE="WTFPL-2 CC-BY-2.5"
+SLOT="0"
+IUSE="test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="!test? ( test )"
+
+# RDEPEND is sorted as such:
+# Python libraries with no specific requirements
+# Python libraries with specific version, slot, or use requirements
+# Non-python dependencies
+RDEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+		dev-python/cbor2[${PYTHON_USEDEP}]
+		dev-python/chardet[${PYTHON_USEDEP}]
+		dev-python/cloudscraper[${PYTHON_USEDEP}]
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP},lcms]
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		dev-python/python-mpv[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/send2trash[${PYTHON_USEDEP}]
+		dev-python/service-identity[${PYTHON_USEDEP}]
+		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
+	')
+"
+BDEPEND="
+	${RDEPEND}
+	$(python_gen_cond_dep '
+		test? (
+			dev-python/httmock[${PYTHON_USEDEP}]
+			dev-python/mock[${PYTHON_USEDEP}]
+		)
+	')
+"
+
+PATCHES=(
+	"${FILESDIR}/userpath-in-local-share.patch"
+	"${DISTDIR}/hydrus-3500-mpeg-error.patch"
+	"${DISTDIR}/hydrus-test-fixes.patch"
+)
+
+src_prepare() {
+	default
+
+	# Contains pre-built binaries for other systems and a broken swf renderer for linux
+	rm -r bin/ || die
+	# Python requirements file, not needed
+	rm requirements.txt || die
+	# Remove unneeded additional scripts
+	rm *.command *.sh *.bat || die
+}
+
+src_compile() {
+	python_optimize "${S}"
+	docs_compile
+}
+
+src_test() {
+	# The tests use unittest, but are run with a custom runner script.
+	# QT_QPA_PLATFORM is required to make them run without X
+	local -x QT_QPA_PLATFORM=offscreen
+	"${EPYTHON}" "${S}/hydrus_test.py" || die "Tests failed"
+}
+
+src_install() {
+	local doc="${EPREFIX}/usr/share/doc/${PF}"
+	elog "Hydrus includes an excellent manual, that can either be viewed at"
+	elog "${doc}/html/help/index.html"
+	elog "or accessed through the hydrus help menu."
+
+	mv "help my client will not boot.txt" "help_my_client_will_not_boot.txt" || die
+
+	local DOCS=(COPYING README.md help_my_client_will_not_boot.txt db/)
+	einstalldocs
+
+	# Files only needed for testing
+	rm hydrus_test.py hydrus/hydrus_test_boot.py || die
+	rm -r hydrus/test/ static/testing/ || die
+	# Build files used for CI and development, not actually needed. Has to be deleted after src_compile.
+	# because it contains documentation
+	rm -r static/build_files static/requirements || die
+
+	# ${DOCS[@]} files are copied into doc
+	# ${S}/docs/ is the markdown source code for documentation
+	# .gitignore/.github files aren't needed for the program to work, same with mkdocs files
+	rm -r "${DOCS[@]}" "${S}/docs/" .gitignore .github/ mkdocs.yml mkdocs-gh-pages.yml || die
+	if use doc; then
+		# ${S}/_build = ${DOCS_OUTDIR}/.. , these have already been copied, remove before installation
+		rm -r "${S}/_build" || die
+		# The program expects to find documentation here, so add a symlink to doc
+		dosym "${doc}/html" /opt/hydrus/help
+	fi
+
+	insinto /opt/hydrus
+	doins -r "${S}"/.
+
+	exeinto /usr/bin
+	python_newexe - hydrus-server < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-server" || die)
+	python_newexe - hydrus-client < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-client" || die)
+
+	make_desktop_entry "hydrus-client" "Hydrus Client" "/opt/hydrus/static/hydrus_non-transparent.png" \
+					   "AudioVideo;FileTools;Graphics;Network;"
+}
+
+pkg_postinst() {
+	optfeature "automatic port forwarding support" "net-libs/miniupnpc"
+	optfeature "memory compression in the client" "dev-python/lz4"
+	optfeature "SOCKS proxy support" "dev-python/requests[socks5]" "dev-python/PySocks"
+	optfeature "bandwidth charts support" "dev-python/pyside2[charts]" "dev-python/pyside6[charts]"
+}
diff --git a/media-gfx/icon-slicer/Manifest b/media-gfx/icon-slicer/Manifest
index 7100c95e063d..b4fe89a5946f 100644
--- a/media-gfx/icon-slicer/Manifest
+++ b/media-gfx/icon-slicer/Manifest
@@ -1,3 +1,3 @@
 DIST icon-slicer-0.3.tar.gz 112429 BLAKE2B 4900e7d702bb45a209c165476aab5604f1623ea48081f742ce36115bde0a6a153aa5540c952013841a4853b827d1b718892006827105dd06c04e7fa892e9ee58 SHA512 09e46dca933a7c647b232d2ae8f589526e5f1cb43e07fe7056f0449cfbe812becc3a171c4f7c716bc65c0f95dc4de989a99b4f1b3566ac52e7ad67965f5be4ab
-EBUILD icon-slicer-0.3-r1.ebuild 517 BLAKE2B 4045deaea03f00d32f36b0ef206e140a6a94b15abf1db8e4043d31f37675678a071d70f9eb4c5449ed2571b57ab1703036c48211b247ca6844c2fa634f8f6ea7 SHA512 fcb46942e409beb7b3f0ce2dc38a219db56223d4ba5c17fbf6b5ab3d286c5ed4424e839f5ffd938014505836fd1add691fee18ce5faa95a31db6705279e0dac2
+EBUILD icon-slicer-0.3-r1.ebuild 511 BLAKE2B 5ab6c06a441af77f22f028a5507d99f45b44d88b5b6d547a66d45edf78bcb50cb53610e5ec344acc3e629ba6f89105bf09683c417301c370e7087d1e6c3e2258 SHA512 cd2f637a1d9d5d1fdc8b5a07f7f973ec5d1c18a0c4c32a5c7eeca7a9c91f1c3849048beb385cc70a9642d30857155693533be1081d496392ab9d4c2b0973a52f
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/media-gfx/icon-slicer/icon-slicer-0.3-r1.ebuild b/media-gfx/icon-slicer/icon-slicer-0.3-r1.ebuild
index 6d6308d93987..39d7ee7f434a 100644
--- a/media-gfx/icon-slicer/icon-slicer-0.3-r1.ebuild
+++ b/media-gfx/icon-slicer/icon-slicer-0.3-r1.ebuild
@@ -7,7 +7,7 @@ DESCRIPTION="Utility for generating icon themes and libXcursor cursor themes"
 HOMEPAGE="https://www.freedesktop.org/software/icon-slicer/"
 SRC_URI="https://www.freedesktop.org/software/icon-slicer/releases/${P}.tar.gz"
 
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ppc sparc x86"
 LICENSE="MIT"
 SLOT="0"
 
diff --git a/media-gfx/igal/Manifest b/media-gfx/igal/Manifest
index 14862e58d9e4..47fa0df433ed 100644
--- a/media-gfx/igal/Manifest
+++ b/media-gfx/igal/Manifest
@@ -1,3 +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 1068 BLAKE2B c0d5955dcb9489a590badcd864a3f7040c667fc493a2b4f8e7117b60d4f841c722cd1ba8c3d8863c5267a02088e6fa4a0c26cd3c3e7bf50de0b5f8528e0ea740 SHA512 0afb03fb89c2f857337a462a554501c239d87b95c8d50c8afe8be3c8fd0e1a6454e4d3788460adb658daceea761d21b720c9102a5f812abeee3882ab334b07d4
 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
new file mode 100644
index 000000000000..f5a14a2df2cf
--- /dev/null
+++ b/media-gfx/igal/igal-3.2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Static HTML image gallery generator"
+HOMEPAGE="https://igal.trexler.at/"
+SRC_URI="https://github.com/solbu/${PN}2/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}2-${PV}"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+RDEPEND="
+	dev-lang/perl
+	virtual/imagemagick-tools
+	media-libs/libjpeg-turbo"
+
+src_prepare() {
+	default
+	sed -i -e "s|/usr/local/lib/igal2|${EPREFIX}/usr/share/igal2|g" \
+		igal2 igal2.1 || die
+	sed -i -e "s|/usr/local/bin/igal2|exec ${EPREFIX}/usr/bin/igal2|" \
+		-e "1s|^#.*|#!${EPREFIX}/bin/bash|" \
+		utilities/igal2.sh || die
+
+	# set IGALDIR
+	sed -i -e "s|/usr/local/share/igal2|${EPREFIX}/usr/share/igal2|g" \
+		igal2 igal2.1 || die
+}
+
+src_compile() { :; }
+
+src_install() {
+	dobin igal2 utilities/igal2.sh
+	dosym igal2 /usr/bin/igal
+	doman igal2.1
+	dodoc ChangeLog README
+	insinto /usr/share/igal2
+	doins *.html tile.png igal2.css
+}
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index 8959f4660cba..829e83005417 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -1,8 +1,15 @@
+AUX imagemagick-7.1.1.38-perl-1.patch 899 BLAKE2B 0e82df3896ebfa493de365e8d97d6f9cc57e265954c072ea4cd91597f6a550241bcd9737d0664777af337f5e46b08d996970f5f5ad6226d2f1c4eab06a78520e SHA512 5cb4f64dcfd0b6805c2b1cb72ae29706480aa8ec1025b90ac7b9b65920c325ddb1635fcba608f0fea93311bf53ed2ac3a6e3a9ce2dc84dd7e1a9e67b02253378
+AUX imagemagick-7.1.1.38-perl-2.patch 930 BLAKE2B 0b8a601dbe82b47c077881721ebc69f80f156e3f1af9777b42493971ad6ff17c1036450ca11d451818446e94d1bd1f47ef04aa5828dca974d8fe02a95965c6c5 SHA512 0941425902e9f6d34e86b98835db14c9e86ea357172e77f751ceded15f74859f96c16f474d7e03a97e31f74b709ec39da3b53f6ac0e5355ba573d3447d61ff19
 AUX imagemagick-9999-nocputuning.patch 327 BLAKE2B 5b9b732a434733fa5ab1b554bf7e5516260e8a8f243ab8bc61f95f6833185c3a997f5b046dc24690aeebfad925e0e180d98791aae1ad910e9aa069f0108dbd89 SHA512 647c367470deaaaa1ee14a02f80c8ed63de294ea7211a9010fad029bc9b254e27bc41c461561c28c2e24166fc17d0023238755160f8f22af641b0858e4bdceea
 AUX policy.test.xml 746 BLAKE2B 6bfa073606469b81cf517d9b069e48794cbda9272d12c3abb8ae3456aaf30cd1923510baddb7d813aa8ccde84e161de0b29314cef7b1a37730c7ad5236d1f5dc SHA512 22f66004324e3777393446a3df738ecd2aa405df088d39137008514cd86b436765b48ccd4355d670a42061ce4e5a7b2fd8e4be5852cd914f62ff0250a4a7ae57
+DIST ImageMagick-6.9.13-16.tar.xz 9613864 BLAKE2B ba6aa3cfd283e234c91e4e79a5410ba4b920cac59f1e1b23da7e899bd7b05a520bfcebd60cf3032c50da2c65bd70592a10de6a41382f9dc65eb37b1fac0f6b39 SHA512 11f3cd6a278d2af21a2bfdd5e88fe1302278b8d8a49c2b42affc5f1138f62db334fb53afc93883309904f1e6198fa4b577a5b28361e84a0c8f278873251b4e30
 DIST ImageMagick-6.9.13-3.tar.xz 9616088 BLAKE2B 9682bc15c42199c266cc8d9152099a96a4e66154b9c74cd7c72993c3d9edd8aa6123d64ae6852d520c9a346a27ee27120a4d2b4f7973c279006d7570666c4080 SHA512 3e061c8a7bec0c49db9e990858257ff092500430d382bcad0c76aaa8d531bd2c13b727a52f060fc6051a0217f41f254570d23a4301c15a7af547e13f148a4ca9
 DIST ImageMagick-7.1.1-25.tar.xz 10557080 BLAKE2B 833c450c87e4a1650b6d71e2d8abeea74ad6f0afa7ec6f0cba9c5bb39044cf17c6b94959d65f121a18faa8ae6ad8b8921b48700f5b6269df9d9b0e7049b22e04 SHA512 0c4a34f6ada5310af248c2e569900604c50295ecdcbc1dd7e5c4375cc68277ec9cac6786db8fa42d3783c2c68468cf88e0413fa60e4ac40d06818bfd34dcf09e
-EBUILD imagemagick-6.9.13.3.ebuild 6782 BLAKE2B f2d6d70bd15dacf3607bf76d3525027641242918bd9f6881bb966aa43eab8f1ecd2cf504779da27a6130575c657000559c56c94bed570214ae7dbe85f2f59147 SHA512 0f2ae92200b8f81f118c7be15aa8d5c15e01b826d898bf5f45807f79c6bb871ae8b912d571a1836356fdcda1d8e27c8af487f52f040b587d64de7a0eb3d72b92
-EBUILD imagemagick-7.1.1.25.ebuild 7145 BLAKE2B c81405460970d982c4ce5e983ee806daf8a80813d8a32b57f7f5ad0474a1b0af35a2f4140c827a112ed024703cc910deedcf416e1dab1f5e5e69f9016b8f0e9e SHA512 07c6fea19d3e5eb6fa2195dc7cc570a7106c0be8600f3deb27546f8b0b2c112f8a6cda3cf7d96682a4719a8cf65a589c7d23b4be6216cb24e1d026818196af95
-EBUILD imagemagick-9999.ebuild 7153 BLAKE2B 33dcb5df561f77ce774e26547c2ec308cd69c497fb3f65316a0fdd7394f0b0188da2de883b6e5a2f5d7346aa20d4aa8ccfd904fc5c015102e2e96a82ae614e23 SHA512 2ea6c09e935b5a6840cff5c29e86d034e46b19f6c1ebb7055db6314f7366bace3768155e36ef6f675c4b301d425ff9c66c6c7ab9cc4009c4dd943ee110c5b3fc
+DIST ImageMagick-7.1.1-38.tar.xz 10778140 BLAKE2B f8abf53fefbebb9f6d6a28396aae1898ca52be22f56e60273ca68c1f40d5bbd1ac026542422f37ba489a9e46734fe36c5dd11fc0d819ed518b2371328f1bcf0b SHA512 636e2061c11c012e2607a53a893eb227569f3a4e04e331499722f2c84dc0db3eedae63525bd530972a639e3a262ab4f61383a21ca8603f8f81e5629a29f54b89
+EBUILD imagemagick-6.9.13.16.ebuild 6784 BLAKE2B 097f4ba4a5f7055b0cde7c4416b8d1bf6204352e11896f8251e2a311f15dd64af6b3937b427ca3d0ba64dd1ce556ea4e45ca283a314ec883accf81290c0502bb SHA512 50b4d6aae6ab1085c6416cc3f1db6631f646f9158ffbb0e2cfebf9743a276535f5dac1a89556db79d8256baa15282653b9d38c8233bdaba0b42a9b191a830da8
+EBUILD imagemagick-6.9.13.3.ebuild 6776 BLAKE2B 3f8ffed2af1e4a33a248471ee104511c192bca40d89e85b1113c647d449bc20639584db8fc7a836bc373bfe84d5cf3c14347ca96dffdcc02581ccef1e5a31012 SHA512 1ac8fc1a0c4f659f17cff7fd1501a1cd957869cdcce7af3540bb269daf100ae4ebb6c77b80914faf847a7c986a3e450e7763567419e267464cf344bb7ba7842a
+EBUILD imagemagick-7.1.1.25.ebuild 7139 BLAKE2B 38c76c0491f9cdd943b5af27519a176dd7b451afe0d9e05803d91c2b0a8718ed5cc8d4cd18b9f7eff4ff40cc376e2bc729a24dc79c478c5410df74eb23d7c9dc SHA512 2f6a3504be491ac673c397554c8a8fefc85843e4490d23ab8cc13c2b3fe996ea8e728dd438ccfbd03f20e01060ef79ba045ac5ff81bee6a77dce9a196042d208
+EBUILD imagemagick-7.1.1.38-r1.ebuild 7164 BLAKE2B 107ff4b04b65a0e6034ea31e956c28a8a8ac18607a11fa369a289b56cd5251dfa93ccc43b0c73f8f4bb9e78bbe26fd38f47d7a866347623bceb62ccd51518cff SHA512 79f7ac36ad575aeecd54231c4912e7892152148ef0040ce5f8ed363b2bfab99acd4ad3a1a602f2c539ea0500b6f828ed3588535cb8aae9d4b23c52701f6caf54
+EBUILD imagemagick-7.1.1.38.ebuild 7078 BLAKE2B 934cbe73a98836aa71a98180ba11928bcded4dee3c3fbc0a1b78dd02afb2f6b3846f59cb8caa31dceb187af645610f6d39f6e1d5423ab490f6c81a1eb67f77d5 SHA512 2183118281b8960fa8464285a1203b280b7801987dae62282324cc63be53f901e11a723ea4fe22fafe83569ad4c0383e2845622fd390eac5cf24d14c59aa512b
+EBUILD imagemagick-9999.ebuild 7078 BLAKE2B 934cbe73a98836aa71a98180ba11928bcded4dee3c3fbc0a1b78dd02afb2f6b3846f59cb8caa31dceb187af645610f6d39f6e1d5423ab490f6c81a1eb67f77d5 SHA512 2183118281b8960fa8464285a1203b280b7801987dae62282324cc63be53f901e11a723ea4fe22fafe83569ad4c0383e2845622fd390eac5cf24d14c59aa512b
 MISC metadata.xml 1140 BLAKE2B c1eee3f7686c72c0603f94e19953e81f3467bdc6192d06c61c9c7da67a39e64d81603efa0dce5fe647a47a9c8bd1568609944b7fa1c6c2547ca3badcdde7a0d4 SHA512 d89de96e346c6d46921b5b39a785ce7e584a043f7e8bc73dd8a727c5cc102b717b4226cef04a0cd8c41a97bdbe43d0eda3cacbf5e0db65b741b0c6dd577eb235
diff --git a/media-gfx/imagemagick/files/imagemagick-7.1.1.38-perl-1.patch b/media-gfx/imagemagick/files/imagemagick-7.1.1.38-perl-1.patch
new file mode 100644
index 000000000000..afd45b3417eb
--- /dev/null
+++ b/media-gfx/imagemagick/files/imagemagick-7.1.1.38-perl-1.patch
@@ -0,0 +1,28 @@
+From 3862ebc02771f33c309e9ee91b696aff0fbdc20e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= <dilfridge@gentoo.org>
+Date: Sun, 8 Sep 2024 21:10:01 +0200
+Subject: [PATCH 1/2] Revert "install perl module into user-specified prefix
+ (#7192)"
+
+This reverts commit c09d35f22090585a0357ecfbd58786022a37aae7.
+---
+ PerlMagick/Makefile.PL.in | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/PerlMagick/Makefile.PL.in b/PerlMagick/Makefile.PL.in
+index 902f01dc2..622a502ea 100644
+--- a/PerlMagick/Makefile.PL.in
++++ b/PerlMagick/Makefile.PL.in
+@@ -223,9 +223,6 @@ WriteMakefile
+    # Linker flags for building a dynamically loadable module
+    'LDDLFLAGS' => $LDDLFLAGS_magick,
+ 
+-   # Install PerlMagick into ImageMagick prefix
+-   'INSTALL_BASE' => '@PREFIX_DIR@',
+-
+    # Install PerlMagick binary into ImageMagick bin directory
+    'INSTALLBIN'	=> '@BIN_DIR@',
+ 
+-- 
+2.44.2
+
diff --git a/media-gfx/imagemagick/files/imagemagick-7.1.1.38-perl-2.patch b/media-gfx/imagemagick/files/imagemagick-7.1.1.38-perl-2.patch
new file mode 100644
index 000000000000..10418d8555e6
--- /dev/null
+++ b/media-gfx/imagemagick/files/imagemagick-7.1.1.38-perl-2.patch
@@ -0,0 +1,27 @@
+From 5e08a2474436574d7ed6de006573dd9bc036cd5c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= <dilfridge@gentoo.org>
+Date: Sun, 8 Sep 2024 21:10:13 +0200
+Subject: [PATCH 2/2] Revert "set perl install base to that of ImageMagick's"
+
+This reverts commit 2d5edb26e22dd34ac1e43936b5c461bf0dbdb03a.
+---
+ PerlMagick/quantum/Makefile.PL.in | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/PerlMagick/quantum/Makefile.PL.in b/PerlMagick/quantum/Makefile.PL.in
+index fabebd300..fa0bf3384 100644
+--- a/PerlMagick/quantum/Makefile.PL.in
++++ b/PerlMagick/quantum/Makefile.PL.in
+@@ -220,9 +220,6 @@ WriteMakefile
+    # Linker flags for building a dynamically loadable module
+    'LDDLFLAGS' => $LDDLFLAGS_magick,
+ 
+-   # Install PerlMagick into ImageMagick prefix
+-   'INSTALL_BASE' => '@PREFIX_DIR@',
+-
+    # Install PerlMagick binary into ImageMagick bin directory
+    'INSTALLBIN'	=> '@BIN_DIR@',
+ 
+-- 
+2.44.2
+
diff --git a/media-gfx/imagemagick/imagemagick-6.9.13.16.ebuild b/media-gfx/imagemagick/imagemagick-6.9.13.16.ebuild
new file mode 100644
index 000000000000..43d4c8ad58a3
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-6.9.13.16.ebuild
@@ -0,0 +1,242 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+QA_PKGCONFIG_VERSION=$(ver_cut 1-3)
+inherit flag-o-matic libtool perl-functions toolchain-funcs
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick6.git"
+	inherit git-r3
+	MY_P="imagemagick-9999"
+else
+	MY_PV="$(ver_rs 3 '-')"
+	MY_P="ImageMagick-${MY_PV}"
+	SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+fi
+
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="A collection of tools and libraries for many image formats"
+HOMEPAGE="https://www.imagemagick.org/"
+
+LICENSE="imagemagick"
+# Please check this on bumps, SONAME is often not updated! Use abidiff on old/new.
+# If ABI is broken, change the bit after the '-'.
+SLOT="0/$(ver_cut 1-3)-0"
+IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hardened hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
+
+REQUIRED_USE="
+	corefonts? ( truetype )
+	svg? ( xml )
+	test? ( corefonts )
+"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	!media-gfx/graphicsmagick[imagemagick]
+	dev-libs/libltdl
+	bzip2? ( app-arch/bzip2 )
+	corefonts? ( media-fonts/corefonts )
+	djvu? ( app-text/djvu )
+	fftw? ( sci-libs/fftw:3.0 )
+	fontconfig? ( media-libs/fontconfig )
+	fpx? ( >=media-libs/libfpx-1.3.0-r1 )
+	graphviz? ( media-gfx/graphviz )
+	heif? ( media-libs/libheif:=[x265] )
+	jbig? ( >=media-libs/jbigkit-2:= )
+	jpeg? ( media-libs/libjpeg-turbo:= )
+	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
+	lcms? ( media-libs/lcms:2= )
+	lqr? ( media-libs/liblqr )
+	opencl? ( virtual/opencl )
+	openexr? ( media-libs/openexr:0= )
+	pango? ( x11-libs/pango )
+	perl? ( >=dev-lang/perl-5.8.8:= )
+	png? ( media-libs/libpng:= )
+	postscript? ( app-text/ghostscript-gpl:= )
+	raw? ( media-libs/libraw:= )
+	svg? (
+		gnome-base/librsvg
+		media-gfx/potrace
+	)
+	tiff? ( media-libs/tiff:= )
+	truetype? (
+		media-fonts/urw-fonts
+		>=media-libs/freetype-2
+	)
+	webp? ( media-libs/libwebp:= )
+	wmf? ( media-libs/libwmf )
+	X? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libXext
+		x11-libs/libXt
+	)
+	xml? ( dev-libs/libxml2 )
+	lzma? ( app-arch/xz-utils )
+	zlib? ( sys-libs/zlib:= )
+"
+DEPEND="
+	${RDEPEND}
+	X? ( x11-base/xorg-proto )
+"
+BDEPEND="virtual/pkgconfig"
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_prepare() {
+	default
+
+	# for Darwin modules
+	elibtoolize
+
+	# For testsuite, see bug #500580#c3
+	local ati_cards mesa_cards nvidia_cards render_cards
+	shopt -s nullglob
+	ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
+	if test -n "${ati_cards}"; then
+		addpredict "${ati_cards}"
+	fi
+	mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
+	if test -n "${mesa_cards}"; then
+		addpredict "${mesa_cards}"
+	fi
+	nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
+	if test -n "${nvidia_cards}"; then
+		addpredict "${nvidia_cards}"
+	fi
+	render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
+	if test -n "${render_cards}"; then
+		addpredict "${render_cards}"
+	fi
+	shopt -u nullglob
+	addpredict /dev/nvidiactl
+}
+
+src_configure() {
+	local depth=16
+	use q8 && depth=8
+	use q32 && depth=32
+
+	use perl && perl_check_env
+
+	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
+
+	local myeconfargs=(
+		$(use_enable static-libs static)
+		$(use_enable hdri)
+		$(use_enable opencl)
+		$(use_enable openmp)
+		--with-threads
+		--with-modules
+		--with-quantum-depth=${depth}
+		$(use_with cxx magick-plus-plus)
+		$(use_with perl)
+		--with-perl-options='INSTALLDIRS=vendor'
+		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
+		$(use_with bzip2 bzlib)
+		$(use_with X x)
+		$(use_with zlib)
+		--without-autotrace
+		$(use_with postscript dps)
+		$(use_with djvu)
+		--with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
+		$(use_with fftw)
+		$(use_with fpx)
+		$(use_with fontconfig)
+		$(use_with truetype freetype)
+		$(use_with postscript gslib)
+		$(use_with graphviz gvc)
+		$(use_with heif heic)
+		$(use_with jbig)
+		$(use_with jpeg)
+		$(use_with jpeg2k openjp2)
+		$(use_with lcms)
+		$(use_with lqr)
+		$(use_with lzma)
+		$(use_with openexr)
+		$(use_with pango)
+		$(use_with png)
+		$(use_with raw)
+		$(use_with svg rsvg)
+		$(use_with tiff)
+		$(use_with webp)
+		$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
+		$(use_with wmf)
+		$(use_with xml)
+		--with-gcc-arch=no-automagic
+
+		# Default upstream (as of 6.9.12.96/7.1.1.18 anyway) is open
+		# For now, let's make USE=hardened do 'limited', and have USE=-hardened
+		# reflect the upstream default of 'open'.
+		#
+		# We might change it to 'secure' and 'limited' at some point.
+		# See also bug #716674.
+		--with-security-policy=$(usex hardened limited open)
+	)
+
+	CONFIG_SHELL="${BROOT}"/bin/bash econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	# Install default (unrestricted) policy in ${HOME} for test suite, bug #664238
+	local _im_local_config_home="${HOME}/.config/ImageMagick"
+	mkdir -p "${_im_local_config_home}" || \
+		die "Failed to create IM config dir in '${_im_local_config_home}'"
+	cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \
+		die "Failed to install default blank policy.xml in '${_im_local_config_home}'"
+
+	local im_command= IM_COMMANDS=()
+	IM_COMMANDS+=( "identify -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built
+	IM_COMMANDS+=( "identify -list policy" ) # Verify that policy.xml is used
+	IM_COMMANDS+=( "emake check" ) # Run tests
+
+	for im_command in "${IM_COMMANDS[@]}"; do
+		eval "${S}"/magick.sh \
+			${im_command} || \
+			die "Failed to run \"${im_command}\""
+	done
+}
+
+src_install() {
+	# Ensure documentation installation files and paths with each release!
+	emake \
+		DESTDIR="${D}" \
+		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
+		install
+
+	rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
+	dodoc {AUTHORS,README}.txt
+
+	if use perl; then
+		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
+		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
+	fi
+
+	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
+	# .la files in parent are not needed, keep plugin .la files
+	find "${ED}"/usr/$(get_libdir)/ -maxdepth 1 -name "*.la" -delete || die
+
+	if use opencl; then
+		cat <<-EOF > "${T}"/99${PN}
+		SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/card0:/dev/dri/renderD128"
+		EOF
+
+		insinto /etc/sandbox.d
+		# bug #472766
+		doins "${T}"/99${PN}
+	fi
+
+	insinto /usr/share/${PN}
+	doins config/*icm
+}
diff --git a/media-gfx/imagemagick/imagemagick-6.9.13.3.ebuild b/media-gfx/imagemagick/imagemagick-6.9.13.3.ebuild
index 3ee01ea4f7df..cd15c47edb36 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.13.3.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.13.3.ebuild
@@ -14,7 +14,7 @@ else
 	MY_PV="$(ver_rs 3 '-')"
 	MY_P="ImageMagick-${MY_PV}"
 	SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 
 S="${WORKDIR}/${MY_P}"
diff --git a/media-gfx/imagemagick/imagemagick-7.1.1.25.ebuild b/media-gfx/imagemagick/imagemagick-7.1.1.25.ebuild
index 328808618479..58f526bfb5c5 100644
--- a/media-gfx/imagemagick/imagemagick-7.1.1.25.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.1.1.25.ebuild
@@ -14,7 +14,7 @@ else
 	MY_PV="$(ver_rs 3 '-')"
 	MY_P="ImageMagick-${MY_PV}"
 	SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 
 S="${WORKDIR}/${MY_P}"
diff --git a/media-gfx/imagemagick/imagemagick-7.1.1.38-r1.ebuild b/media-gfx/imagemagick/imagemagick-7.1.1.38-r1.ebuild
new file mode 100644
index 000000000000..224f22accf35
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-7.1.1.38-r1.ebuild
@@ -0,0 +1,254 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+QA_PKGCONFIG_VERSION=$(ver_cut 1-3)
+inherit autotools flag-o-matic perl-functions toolchain-funcs
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick.git"
+	inherit git-r3
+	MY_P="imagemagick-9999"
+else
+	MY_PV="$(ver_rs 3 '-')"
+	MY_P="ImageMagick-${MY_PV}"
+	SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+fi
+
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="A collection of tools and libraries for many image formats"
+HOMEPAGE="https://www.imagemagick.org/"
+
+LICENSE="imagemagick"
+# Please check this on bumps, SONAME is often not updated! Use abidiff on old/new.
+# If ABI is broken, change the bit after the '-'.
+SLOT="0/$(ver_cut 1-3)-18"
+IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hardened hdri heif jbig jpeg jpeg2k jpegxl lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zip zlib"
+
+REQUIRED_USE="
+	corefonts? ( truetype )
+	svg? ( xml )
+	test? ( corefonts )
+"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	!media-gfx/graphicsmagick[imagemagick]
+	dev-libs/libltdl
+	bzip2? ( app-arch/bzip2 )
+	corefonts? ( media-fonts/corefonts )
+	djvu? ( app-text/djvu )
+	fftw? ( sci-libs/fftw:3.0 )
+	fontconfig? ( media-libs/fontconfig )
+	fpx? ( >=media-libs/libfpx-1.3.0-r1 )
+	graphviz? ( media-gfx/graphviz )
+	heif? ( media-libs/libheif:=[x265] )
+	jbig? ( >=media-libs/jbigkit-2:= )
+	jpeg? ( media-libs/libjpeg-turbo:= )
+	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
+	jpegxl? ( >=media-libs/libjxl-0.6:= )
+	lcms? ( media-libs/lcms:2= )
+	lqr? ( media-libs/liblqr )
+	opencl? ( virtual/opencl )
+	openexr? ( media-libs/openexr:0= )
+	pango? ( x11-libs/pango )
+	perl? ( >=dev-lang/perl-5.8.8:= )
+	png? ( media-libs/libpng:= )
+	postscript? ( app-text/ghostscript-gpl:= )
+	raw? ( media-libs/libraw:= )
+	svg? (
+		gnome-base/librsvg
+		media-gfx/potrace
+	)
+	tiff? ( media-libs/tiff:= )
+	truetype? (
+		media-fonts/urw-fonts
+		>=media-libs/freetype-2
+	)
+	webp? ( media-libs/libwebp:= )
+	wmf? ( media-libs/libwmf )
+	X? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libXext
+		x11-libs/libXt
+	)
+	xml? ( dev-libs/libxml2 )
+	lzma? ( app-arch/xz-utils )
+	zip? ( dev-libs/libzip:= )
+	zlib? ( sys-libs/zlib:= )
+"
+DEPEND="
+	${RDEPEND}
+	X? ( x11-base/xorg-proto )
+"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-7.1.1.38-perl-1.patch"
+	"${FILESDIR}/${PN}-7.1.1.38-perl-2.patch"
+	"${FILESDIR}/${PN}-9999-nocputuning.patch"
+)
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_prepare() {
+	default
+
+	#elibtoolize # for Darwin modules
+	eautoreconf
+
+	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
+	local ati_cards mesa_cards nvidia_cards render_cards
+	shopt -s nullglob
+	ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
+	if test -n "${ati_cards}"; then
+		addpredict "${ati_cards}"
+	fi
+	mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
+	if test -n "${mesa_cards}"; then
+		addpredict "${mesa_cards}"
+	fi
+	nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
+	if test -n "${nvidia_cards}"; then
+		addpredict "${nvidia_cards}"
+	fi
+	render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
+	if test -n "${render_cards}"; then
+		addpredict "${render_cards}"
+	fi
+	shopt -u nullglob
+	addpredict /dev/nvidiactl
+}
+
+src_configure() {
+	local depth=16
+	use q8 && depth=8
+	use q32 && depth=32
+
+	use perl && perl_check_env
+
+	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
+
+	local myeconfargs=(
+		$(use_enable static-libs static)
+		$(use_enable hdri)
+		$(use_enable opencl)
+		$(use_enable openmp)
+		--with-threads
+		--with-modules
+		--with-quantum-depth=${depth}
+		$(use_with cxx magick-plus-plus)
+		$(use_with perl)
+		--with-perl-options='INSTALLDIRS=vendor'
+		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
+		$(use_with bzip2 bzlib)
+		$(use_with X x)
+		$(use_with zip)
+		$(use_with zlib)
+		--without-autotrace
+		--with-uhdr
+		$(use_with postscript dps)
+		$(use_with djvu)
+		--with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
+		$(use_with fftw)
+		$(use_with fpx)
+		$(use_with fontconfig)
+		$(use_with truetype freetype)
+		$(use_with postscript gslib)
+		$(use_with graphviz gvc)
+		$(use_with heif heic)
+		$(use_with jbig)
+		$(use_with jpeg)
+		$(use_with jpeg2k openjp2)
+		$(use_with jpegxl jxl)
+		$(use_with lcms)
+		$(use_with lqr)
+		$(use_with lzma)
+		$(use_with openexr)
+		$(use_with pango)
+		$(use_with png)
+		$(use_with raw)
+		$(use_with svg rsvg)
+		$(use_with tiff)
+		$(use_with webp)
+		$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
+		$(use_with wmf)
+		$(use_with xml)
+
+		# Default upstream (as of 6.9.12.96/7.1.1.18 anyway) is open
+		# For now, let's make USE=hardened do 'limited', and have USE=-hardened
+		# reflect the upstream default of 'open'.
+		#
+		# We might change it to 'secure' and 'limited' at some point.
+		# See also bug #716674.
+		--with-security-policy=$(usex hardened limited open)
+	)
+
+	CONFIG_SHELL="${BROOT}"/bin/bash econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	# Install default (unrestricted) policy in $HOME for test suite, bug #664238
+	local _im_local_config_home="${HOME}/.config/ImageMagick"
+	mkdir -p "${_im_local_config_home}" || \
+		die "Failed to create IM config dir in '${_im_local_config_home}'"
+	cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \
+		die "Failed to install default blank policy.xml in '${_im_local_config_home}'"
+
+	local im_command= IM_COMMANDS=()
+	if [[ ${PV} == 9999 ]] ; then
+		IM_COMMANDS+=( "magick -version" ) # Show version we are using -- cannot verify because of live ebuild
+	else
+		IM_COMMANDS+=( "magick -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built
+	fi
+	IM_COMMANDS+=( "magick -list policy" ) # Verify that policy.xml is used
+	IM_COMMANDS+=( "emake check" ) # Run tests
+
+	for im_command in "${IM_COMMANDS[@]}"; do
+		eval "${S}"/magick.sh \
+			${im_command} || \
+			die "Failed to run \"${im_command}\""
+	done
+}
+
+src_install() {
+	# Ensure documentation installation files and paths with each release!
+	emake \
+		DESTDIR="${D}" \
+		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
+		install
+
+	einstalldocs
+
+	if use perl; then
+		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
+		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
+	fi
+
+	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
+	# .la files in parent are not needed, keep plugin .la files
+	find "${ED}"/usr/$(get_libdir)/ -maxdepth 1 -name "*.la" -delete || die
+
+	if use opencl; then
+		cat <<-EOF > "${T}"/99${PN}
+		SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/card0:/dev/dri/renderD128"
+		EOF
+
+		insinto /etc/sandbox.d
+		doins "${T}"/99${PN} #472766
+	fi
+
+	insinto /usr/share/${PN}
+	doins config/*icm
+}
diff --git a/media-gfx/imagemagick/imagemagick-7.1.1.38.ebuild b/media-gfx/imagemagick/imagemagick-7.1.1.38.ebuild
new file mode 100644
index 000000000000..8e08176c4db2
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-7.1.1.38.ebuild
@@ -0,0 +1,252 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+QA_PKGCONFIG_VERSION=$(ver_cut 1-3)
+inherit autotools flag-o-matic perl-functions toolchain-funcs
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick.git"
+	inherit git-r3
+	MY_P="imagemagick-9999"
+else
+	MY_PV="$(ver_rs 3 '-')"
+	MY_P="ImageMagick-${MY_PV}"
+	SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+fi
+
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="A collection of tools and libraries for many image formats"
+HOMEPAGE="https://www.imagemagick.org/"
+
+LICENSE="imagemagick"
+# Please check this on bumps, SONAME is often not updated! Use abidiff on old/new.
+# If ABI is broken, change the bit after the '-'.
+SLOT="0/$(ver_cut 1-3)-18"
+IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hardened hdri heif jbig jpeg jpeg2k jpegxl lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zip zlib"
+
+REQUIRED_USE="
+	corefonts? ( truetype )
+	svg? ( xml )
+	test? ( corefonts )
+"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	!media-gfx/graphicsmagick[imagemagick]
+	dev-libs/libltdl
+	bzip2? ( app-arch/bzip2 )
+	corefonts? ( media-fonts/corefonts )
+	djvu? ( app-text/djvu )
+	fftw? ( sci-libs/fftw:3.0 )
+	fontconfig? ( media-libs/fontconfig )
+	fpx? ( >=media-libs/libfpx-1.3.0-r1 )
+	graphviz? ( media-gfx/graphviz )
+	heif? ( media-libs/libheif:=[x265] )
+	jbig? ( >=media-libs/jbigkit-2:= )
+	jpeg? ( media-libs/libjpeg-turbo:= )
+	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
+	jpegxl? ( >=media-libs/libjxl-0.6:= )
+	lcms? ( media-libs/lcms:2= )
+	lqr? ( media-libs/liblqr )
+	opencl? ( virtual/opencl )
+	openexr? ( media-libs/openexr:0= )
+	pango? ( x11-libs/pango )
+	perl? ( >=dev-lang/perl-5.8.8:= )
+	png? ( media-libs/libpng:= )
+	postscript? ( app-text/ghostscript-gpl:= )
+	raw? ( media-libs/libraw:= )
+	svg? (
+		gnome-base/librsvg
+		media-gfx/potrace
+	)
+	tiff? ( media-libs/tiff:= )
+	truetype? (
+		media-fonts/urw-fonts
+		>=media-libs/freetype-2
+	)
+	webp? ( media-libs/libwebp:= )
+	wmf? ( media-libs/libwmf )
+	X? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libXext
+		x11-libs/libXt
+	)
+	xml? ( dev-libs/libxml2 )
+	lzma? ( app-arch/xz-utils )
+	zip? ( dev-libs/libzip:= )
+	zlib? ( sys-libs/zlib:= )
+"
+DEPEND="
+	${RDEPEND}
+	X? ( x11-base/xorg-proto )
+"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-9999-nocputuning.patch"
+)
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_prepare() {
+	default
+
+	#elibtoolize # for Darwin modules
+	eautoreconf
+
+	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
+	local ati_cards mesa_cards nvidia_cards render_cards
+	shopt -s nullglob
+	ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
+	if test -n "${ati_cards}"; then
+		addpredict "${ati_cards}"
+	fi
+	mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
+	if test -n "${mesa_cards}"; then
+		addpredict "${mesa_cards}"
+	fi
+	nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
+	if test -n "${nvidia_cards}"; then
+		addpredict "${nvidia_cards}"
+	fi
+	render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
+	if test -n "${render_cards}"; then
+		addpredict "${render_cards}"
+	fi
+	shopt -u nullglob
+	addpredict /dev/nvidiactl
+}
+
+src_configure() {
+	local depth=16
+	use q8 && depth=8
+	use q32 && depth=32
+
+	use perl && perl_check_env
+
+	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
+
+	local myeconfargs=(
+		$(use_enable static-libs static)
+		$(use_enable hdri)
+		$(use_enable opencl)
+		$(use_enable openmp)
+		--with-threads
+		--with-modules
+		--with-quantum-depth=${depth}
+		$(use_with cxx magick-plus-plus)
+		$(use_with perl)
+		--with-perl-options='INSTALLDIRS=vendor'
+		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
+		$(use_with bzip2 bzlib)
+		$(use_with X x)
+		$(use_with zip)
+		$(use_with zlib)
+		--without-autotrace
+		--with-uhdr
+		$(use_with postscript dps)
+		$(use_with djvu)
+		--with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
+		$(use_with fftw)
+		$(use_with fpx)
+		$(use_with fontconfig)
+		$(use_with truetype freetype)
+		$(use_with postscript gslib)
+		$(use_with graphviz gvc)
+		$(use_with heif heic)
+		$(use_with jbig)
+		$(use_with jpeg)
+		$(use_with jpeg2k openjp2)
+		$(use_with jpegxl jxl)
+		$(use_with lcms)
+		$(use_with lqr)
+		$(use_with lzma)
+		$(use_with openexr)
+		$(use_with pango)
+		$(use_with png)
+		$(use_with raw)
+		$(use_with svg rsvg)
+		$(use_with tiff)
+		$(use_with webp)
+		$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
+		$(use_with wmf)
+		$(use_with xml)
+
+		# Default upstream (as of 6.9.12.96/7.1.1.18 anyway) is open
+		# For now, let's make USE=hardened do 'limited', and have USE=-hardened
+		# reflect the upstream default of 'open'.
+		#
+		# We might change it to 'secure' and 'limited' at some point.
+		# See also bug #716674.
+		--with-security-policy=$(usex hardened limited open)
+	)
+
+	CONFIG_SHELL="${BROOT}"/bin/bash econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	# Install default (unrestricted) policy in $HOME for test suite, bug #664238
+	local _im_local_config_home="${HOME}/.config/ImageMagick"
+	mkdir -p "${_im_local_config_home}" || \
+		die "Failed to create IM config dir in '${_im_local_config_home}'"
+	cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \
+		die "Failed to install default blank policy.xml in '${_im_local_config_home}'"
+
+	local im_command= IM_COMMANDS=()
+	if [[ ${PV} == 9999 ]] ; then
+		IM_COMMANDS+=( "magick -version" ) # Show version we are using -- cannot verify because of live ebuild
+	else
+		IM_COMMANDS+=( "magick -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built
+	fi
+	IM_COMMANDS+=( "magick -list policy" ) # Verify that policy.xml is used
+	IM_COMMANDS+=( "emake check" ) # Run tests
+
+	for im_command in "${IM_COMMANDS[@]}"; do
+		eval "${S}"/magick.sh \
+			${im_command} || \
+			die "Failed to run \"${im_command}\""
+	done
+}
+
+src_install() {
+	# Ensure documentation installation files and paths with each release!
+	emake \
+		DESTDIR="${D}" \
+		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
+		install
+
+	einstalldocs
+
+	if use perl; then
+		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
+		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
+	fi
+
+	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
+	# .la files in parent are not needed, keep plugin .la files
+	find "${ED}"/usr/$(get_libdir)/ -maxdepth 1 -name "*.la" -delete || die
+
+	if use opencl; then
+		cat <<-EOF > "${T}"/99${PN}
+		SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/card0:/dev/dri/renderD128"
+		EOF
+
+		insinto /etc/sandbox.d
+		doins "${T}"/99${PN} #472766
+	fi
+
+	insinto /usr/share/${PN}
+	doins config/*icm
+}
diff --git a/media-gfx/imagemagick/imagemagick-9999.ebuild b/media-gfx/imagemagick/imagemagick-9999.ebuild
index 904cbdbc135e..8e08176c4db2 100644
--- a/media-gfx/imagemagick/imagemagick-9999.ebuild
+++ b/media-gfx/imagemagick/imagemagick-9999.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
@@ -14,7 +14,7 @@ else
 	MY_PV="$(ver_rs 3 '-')"
 	MY_P="ImageMagick-${MY_PV}"
 	SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 
 S="${WORKDIR}/${MY_P}"
@@ -155,6 +155,7 @@ src_configure() {
 		$(use_with zip)
 		$(use_with zlib)
 		--without-autotrace
+		--with-uhdr
 		$(use_with postscript dps)
 		$(use_with djvu)
 		--with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
@@ -226,8 +227,7 @@ src_install() {
 		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
 		install
 
-	rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
-	dodoc {AUTHORS,README}.txt
+	einstalldocs
 
 	if use perl; then
 		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
diff --git a/media-gfx/img2pdf/Manifest b/media-gfx/img2pdf/Manifest
index 14fad7705bd0..3490f1d850b4 100644
--- a/media-gfx/img2pdf/Manifest
+++ b/media-gfx/img2pdf/Manifest
@@ -1,4 +1,6 @@
 AUX img2pdf-0.4.4-Support-imagemagick-7.1.0-48.patch 4995 BLAKE2B 401e3b144f14e6468546dae30dfa0ea08014d994b3b30aec192365a6f1d06206f2981f3bb93bf02b157f477fdae12a5603ace58f3bf6f00c8abceb39b7194094 SHA512 c8459bf91c753d48289c33e80da1141d5f0861e15eaf0bff118ea00d015a0c1835f6cd0ed50df264f255a68b0c2ea7defc10b829c26d3e7947728a8b4f0d709f
 DIST img2pdf-0.4.4.tar.gz 97796 BLAKE2B d04eae8c02490e4e73339dade92b2521ad410ed741ccc2987961543790589b14a5c8939cb9bbadcc795f5edcbb59a1a43bd522c75948f42dde1acffafb6266e0 SHA512 56943cd965b3e6b0680b7696ca4b5a2ba779474f945dd0d2648fb6f18ab18aab6d74640f9bd8e9c8683e3e641b0657cb84c691054910d84f0c9e8ad733f179e9
-EBUILD img2pdf-0.4.4-r1.ebuild 1366 BLAKE2B c7b315a4580a22b20784a8ba7524c16806b68c939ad792365b29bc6ef5b86182d45c626f28f58a2db23ce25be115e17c8716d4188048ede6b982077b7cb713ad SHA512 acb878b409f7dd7dabeec7a6a87f55743edcbf99cf85425d1f18eecd484f432aa82ece22e79c12e5803b5590974b1256c9d3103ae79ad5d1e4b7677c28a7940c
+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
 MISC metadata.xml 923 BLAKE2B fe0074db9549519b522f9d749388c5626b702dadba5a722444f652b203a60aea8e8ea5739c3c634076b42dddf24d17b4f449220de617224e59e5491893339901 SHA512 98fc799711e027afa40d2b9bf4558c38873d385920713f58d62782a986e72d1c9b04eb5591d4ec384bbf32376e2b03bf822bf5573015d003ff53ae0d4c7e6421
diff --git a/media-gfx/img2pdf/img2pdf-0.4.4-r1.ebuild b/media-gfx/img2pdf/img2pdf-0.4.4-r1.ebuild
index eb4877c3bc07..4238d9092f26 100644
--- a/media-gfx/img2pdf/img2pdf-0.4.4-r1.ebuild
+++ b/media-gfx/img2pdf/img2pdf-0.4.4-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{9..12} )
 
 inherit distutils-r1 pypi
 
diff --git a/media-gfx/img2pdf/img2pdf-0.5.1.ebuild b/media-gfx/img2pdf/img2pdf-0.5.1.ebuild
new file mode 100644
index 000000000000..a6489af9714d
--- /dev/null
+++ b/media-gfx/img2pdf/img2pdf-0.5.1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Losslessly convert raster images to PDF"
+HOMEPAGE="
+	https://gitlab.mister-muffin.de/josch/img2pdf/
+	https://pypi.org/project/img2pdf/
+"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="gui"
+
+BDEPEND="
+	test? (
+		app-text/ghostscript-gpl
+		app-text/mupdf
+		app-text/poppler[cairo,png,tiff]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pdfrw[${PYTHON_USEDEP}]
+		dev-python/pillow[tiff,${PYTHON_USEDEP}]
+		dev-python/scipy[${PYTHON_USEDEP}]
+		media-gfx/imagemagick[jpeg,jpeg2k,lcms,png,-q8,-q32,tiff]
+		media-libs/exiftool
+		media-libs/netpbm[jpeg]
+		sys-libs/libfaketime
+	)
+"
+RDEPEND="
+	dev-python/pikepdf[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	media-libs/icc-profiles-openicc
+	gui? ( $(python_gen_impl_dep tk) )
+"
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+src_prepare() {
+	distutils-r1_python_prepare_all
+
+	# Remove gui executable if there's no demand/support for it.
+	if ! use gui; then
+		sed -i -e '/gui_scripts/d' setup.py || die
+	fi
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# https://gitlab.mister-muffin.de/josch/img2pdf/issues/187
+		src/img2pdf_test.py::test_miff_cmyk8
+	)
+
+	if has_version 'media-gfx/imagemagick[hdri]'; then
+		# https://gitlab.mister-muffin.de/josch/img2pdf/issues/178
+		EPYTEST_DESELECT+=(
+			src/img2pdf_test.py::test_miff_cmyk16
+		)
+	fi
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest
+}
diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest
index 21eb0f196c55..367fe5e9e151 100644
--- a/media-gfx/inkscape/Manifest
+++ b/media-gfx/inkscape/Manifest
@@ -1,6 +1,11 @@
+AUX inkscape-1.3.2-cxx20-2.patch 541 BLAKE2B f235b801beef5b869ec3720986336c4e0aaafda87556b12a0aa57e011839298562358dedd05e91e0347b79915af6edbb21e4dc41ed9e2a6f4aa562f91cc3967a SHA512 c3c3443669ac0b78c97ae144206c312bbab970d3e9c781dfeddacbe41a6181919b262316a6d2be7fe42b7f9205da4bdd0a5f2640958be06a63063d6feee0b194
+AUX inkscape-1.3.2-cxx20.patch 3811 BLAKE2B 308f70c1fa07894af3b223f800dd514c2affa1db38827f5d8da51a803bde473a51c9e813ea94e4cabb2c98b9209071e57898c3fe61a1342458c54bbb49b7526a SHA512 825f483844b907d6d022fd07d60865e940b23bbcdffc662c61133814a2927597878309471c27096c1608b9a56364442535b2ec68db398371f372fc04b7f497d8
 AUX inkscape-1.3.2-libxml2-2.12.patch 916 BLAKE2B 06ff8b562f6eb703ae2b88a8f0c4ce68257066a8482c1e9b05144bf2fa188512fd6521bfaed700f5fae90dd7b9d927e3382220ebc2a67fdf01614fc9db08b30c SHA512 afdd6c92b16ecc7078cc15b13c40cb19ca2b326367729341003894004ba1fd36c6df8d04f954c65fbbe213201cee14bd5dc38766d87801a4b78934a9927957a4
 AUX inkscape-1.3.2-poppler-24.03.patch 2982 BLAKE2B b8ed08ef09afbab15196ae6d0f198acc01a4000bc2688d0209d53108dac0c801f9d3d1d3be78893e6268f0e82ca7f61b6975252d29aa657487fe792d42c79532 SHA512 9bd8062599fe183de837804106aa2501cb77710f76214663dfd504d9a7cb4a4bc838311c87ed2bbacca4bbcab29a2f81e0831cbd4f8c2017816a0e6fbbfe306b
+AUX inkscape-1.3.2-poppler-24.05.patch 2620 BLAKE2B 0fc615690c365cf1630b680f1b6c43d28667263e26c2dad7697e9f7ae56a91b05bf6457f99578ec2a8b771155349b5dbe125f00fcc28f148ba7d58c2887230a5 SHA512 8da5c3db83968a42e1e43b1dc7148724fe2b18299b8c6cf58ab8315566daaa8d2d5cc9030cdb9bc31b55cbd868410a314b7b097ae0f4bd5ccba99c073839e0dc
 DIST inkscape-1.3.2.tar.xz 44720944 BLAKE2B 24120f8c671e1fb54bb6626cab95e7086e3c60fbc117bbe8017d081c799bc26812b1286e670771e7ffe88720ba25f237146c452afaf65c1ee2ee554fb07f79a2 SHA512 a6da4b676ba3e7f954f95e3916ce78ce358b49c8052795a52d478064ef02eeae0337b0a94e89b9752ea6824a5758d28072c2bbf83f1e9ee28daebd3b0ef87343
-EBUILD inkscape-1.3.2-r2.ebuild 5735 BLAKE2B bbac4bc9fe98168bb73154d36f646b68a626a8b6f7dd4a37d0d2f81834464117da8f12ad05d0703b6a4709287ebaecee539c06df139127f5a40c53c66f81eb17 SHA512 e4301a59140a279b9f4e886d348b42ed036051d8debcae223ce4fb820f48728d8ff5d8bc6bdf5661905ba38dfd1f8d8e9f3e93f676984554f0d127cb5ca4a549
-EBUILD inkscape-9999.ebuild 5619 BLAKE2B 1df847047fbf31f8957455a4783dbf50662c838832c36a979057dd6fe1fbc7a27663562b98acb972784255df578b30be9acfe4452c4c8d0337db7f8f72555b90 SHA512 37bc139d98e7c727210dff9845e61fd085c34facbc204e87d12eb6f19f978d9675469309cf93da4813bdb7ea88ea0c355b389b63348447375ec93524ed6ffaaa
+DIST inkscape-1.4beta3.tar.xz 46065140 BLAKE2B e24849462170014ee6ffd609e5f6db38694e387a5988929bc52cf3b9594d0021c63d8bdfe997dc22f6c544e1c65b9ccd78f314cb943242a860471122d32efcd8 SHA512 3c8d757eacef54742c4c8b9ce923719fee4ae1fb6d39031fecdf4d9641cfaa2e689adcfa16a7450a43aefe5795a2319f0ef5cd7304e78b2a9bff0da02106faba
+EBUILD inkscape-1.3.2-r2.ebuild 5874 BLAKE2B a95355ae1c5bd7806e05314ae07f9a3b278897c03e217dffa0433ee51e7fb0e0a47f06ead4c2f1ba47ee2e8bce49f4b378d31e3de6e9b64cac96cd0c1304a0eb SHA512 229a75fd98d6be7c25443a87bdb14b792a89cf30df55158945db2f2d7c7e247e5ce39e351c41e11324fbd6d9a31f0d669985455367c870adb951b358a3c7b4a1
+EBUILD inkscape-1.4_beta3.ebuild 5454 BLAKE2B 9c0d873f35ae8af58329690852a05644a6a3696f1a3245ca3922c52dae0033ea9f02b8b54f0df091ad37a7f6ab77ab04d04d38a23d3cd8caad68b06b02814b17 SHA512 f93bf9f1f1b8bdc39d9a988aaf0d1cd1a583df14f909e927feb5781f531981b4eedb504d2f95491fe8120f63760ce9dafc45a46c705a2af675cb0824739efdb4
+EBUILD inkscape-9999.ebuild 5451 BLAKE2B 919916686a19432e549c8175debcd66b3d279410d00f0358e48eb6c62aa26c27e55cbf548c098c3c474b94acbc972e3bfdb779d8556ad7ad60fa9edec3876722 SHA512 b6b01c660d14e2caac88d1ebe5e5a2b2854060aeb5fab6cdcf1f5d3cad838d6745f8acd785e5bd9b65511a3b68a272f43fdaf4f21ce6011b6444bf40021972d1
 MISC metadata.xml 982 BLAKE2B f44f534865614c8dd7bf71e92ce69cff708fc08e3eb701765bf93144b433ec52df52a506b69cc98969909c695015881b60592cccdf27613c6fe82812fc50727b SHA512 2963a9b473f139d06cefd1c3231ef148045c005adb4688850522c183f39ba15a36331b7eae7752e9bf15a26e6370f2af14ec02e59735f1753246c45821c0cdbc
diff --git a/media-gfx/inkscape/files/inkscape-1.3.2-cxx20-2.patch b/media-gfx/inkscape/files/inkscape-1.3.2-cxx20-2.patch
new file mode 100644
index 000000000000..6364c3f88a9e
--- /dev/null
+++ b/media-gfx/inkscape/files/inkscape-1.3.2-cxx20-2.patch
@@ -0,0 +1,11 @@
+--- a/src/ui/dialog/filter-effects-dialog.cpp
++++ b/src/ui/dialog/filter-effects-dialog.cpp
+@@ -202,7 +202,7 @@
+ template< typename T> class ComboWithTooltip : public Gtk::EventBox
+ {
+ public:
+-    ComboWithTooltip<T>(T default_value, const Util::EnumDataConverter<T>& c, const SPAttr a = SPAttr::INVALID, char* tip_text = nullptr)
++    ComboWithTooltip(T default_value, const Util::EnumDataConverter<T>& c, const SPAttr a = SPAttr::INVALID, char* tip_text = nullptr)
+     {
+         if (tip_text) {
+             set_tooltip_text(tip_text);
diff --git a/media-gfx/inkscape/files/inkscape-1.3.2-cxx20.patch b/media-gfx/inkscape/files/inkscape-1.3.2-cxx20.patch
new file mode 100644
index 000000000000..3c61b1919278
--- /dev/null
+++ b/media-gfx/inkscape/files/inkscape-1.3.2-cxx20.patch
@@ -0,0 +1,91 @@
+From 1798e9c13b786f3d077ba0132592c4d5c1d1fb9b Mon Sep 17 00:00:00 2001
+From: Tavmjong Bah <tavmjong@free.fr>
+Date: Tue, 26 Sep 2023 19:23:27 +0000
+Subject: [PATCH] Up C++ version to C++20.
+
+---
+ CMakeLists.txt                     | 4 ++--
+ _clang-format                      | 2 +-
+ src/ui/knot/knot-holder-entity.cpp | 2 +-
+ src/ui/tools/pencil-tool.cpp       | 9 ++++++---
+ 4 files changed, 10 insertions(+), 7 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index fe6b10cda24..de2680bd651 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -18,9 +18,9 @@ message("Binary Dir: ${CMAKE_CURRENT_BINARY_DIR}")
+ # -----------------------------------------------------------------------------
+ # CMake Configuration
+ # -----------------------------------------------------------------------------
+-set(CMAKE_CXX_STANDARD 17)
++set(CMAKE_CXX_STANDARD 20)
+ set(CMAKE_CXX_STANDARD_REQUIRED ON)
+-# set(CMAKE_CXX_EXTENSIONS OFF) # enforces -std=c++17 instead of -std=gnu++17
++# set(CMAKE_CXX_EXTENSIONS OFF) # enforces -std=c++20 instead of -std=gnu++20
+                                 # TODO: build currently fails with it as we actually depend on GNU compiler extensions...
+                                 #       mostly use of the non-Standard M_PI et al. TODO: C++20: Use the <numbers> header.
+ 
+diff --git a/_clang-format b/_clang-format
+index 39396fad65a..48de4d2bd88 100644
+--- a/_clang-format
++++ b/_clang-format
+@@ -103,7 +103,7 @@ SpacesInContainerLiterals: false
+ SpacesInCStyleCastParentheses: false
+ SpacesInParentheses: false
+ SpacesInSquareBrackets: false
+-Standard:        c++17
++Standard:        c++20
+ StatementMacros: []
+ TypenameMacros: []
+ TabWidth: 4
+diff --git a/src/ui/knot/knot-holder-entity.cpp b/src/ui/knot/knot-holder-entity.cpp
+index 8703f5975f7..add66d2fa29 100644
+--- a/src/ui/knot/knot-holder-entity.cpp
++++ b/src/ui/knot/knot-holder-entity.cpp
+@@ -315,7 +315,7 @@ void PatternKnotHolderEntityScale::knot_set(Geom::Point const &p, Geom::Point co
+     double scale_x = std::clamp(new_extent[X] / _cached_diagonal[X], _cached_min_scale, 1e9);
+     double scale_y = std::clamp(new_extent[Y] / _cached_diagonal[Y], _cached_min_scale, 1e9);
+ 
+-    Affine new_transform = (state & GDK_CONTROL_MASK) ? Scale(lerp(0.5, scale_x, scale_y))
++    Affine new_transform = (state & GDK_CONTROL_MASK) ? Scale((scale_x + scale_y) * 0.5)
+                                                       : Scale(scale_x, scale_y);
+ 
+     // 2. Calculate offset to keep pattern origin aligned
+diff --git a/src/ui/tools/pencil-tool.cpp b/src/ui/tools/pencil-tool.cpp
+index fd2d08cad0c..7324f7c8515 100644
+--- a/src/ui/tools/pencil-tool.cpp
++++ b/src/ui/tools/pencil-tool.cpp
+@@ -17,7 +17,11 @@
+  * Released under GNU GPL v2+, read the file 'COPYING' for more information.
+  */
+ 
+-#include <numeric> // For std::accumulate
++#include "pencil-tool.h"
++
++#include <cmath>   // std::lerp
++#include <numeric> // std::accumulate
++
+ #include <gdk/gdkkeysyms.h>
+ #include <glibmm/i18n.h>
+ 
+@@ -26,7 +30,6 @@
+ #include <2geom/sbasis-to-bezier.h>
+ #include <2geom/svg-path-parser.h>
+ 
+-#include "pencil-tool.h"
+ 
+ #include "context-fns.h"
+ #include "desktop.h"
+@@ -806,7 +809,7 @@ void PencilTool::_addFreehandPoint(Geom::Point const &p, guint /*state*/, bool l
+             min = max;
+         }
+         double dezoomify_factor = 0.05 * 1000 / _desktop->current_zoom();
+-        double const pressure_shrunk = pressure * (max - min) + min; // C++20 -> use std::lerp()
++        double const pressure_shrunk = std::lerp(min, max, pressure);
+         double pressure_computed = std::abs(pressure_shrunk * dezoomify_factor);
+         double pressure_computed_scaled = std::abs(pressure_computed * _desktop->getDocument()->getDocumentScale().inverse()[Geom::X]);
+         if (p != p_array[_npoints - 1]) {
+-- 
+GitLab
+
diff --git a/media-gfx/inkscape/files/inkscape-1.3.2-poppler-24.05.patch b/media-gfx/inkscape/files/inkscape-1.3.2-poppler-24.05.patch
new file mode 100644
index 000000000000..bb2764032c44
--- /dev/null
+++ b/media-gfx/inkscape/files/inkscape-1.3.2-poppler-24.05.patch
@@ -0,0 +1,64 @@
+From 96ca7a6c215aa14336b52753f56244dc8796ec43 Mon Sep 17 00:00:00 2001
+From: Heiko Becker <mail@heiko-becker.de>
+Date: Fri, 3 May 2024 14:52:00 +0200
+Subject: [PATCH] Fix build with poppler >= 24.05.0
+
+GooString::hasUnicodeMarkerLE and GooString::hasUnicodeMarker were
+rename and moved to UTF.h [1][2]
+
+[1] https://gitlab.freedesktop.org/poppler/poppler/-/commit/98fabb298b0e8eaef9193bbce68c99c85473a314
+[2] https://gitlab.freedesktop.org/poppler/poppler/-/commit/1f06dca08c32ed18c3030530d98a0e30d41dd7a2
+---
+ src/extension/internal/pdfinput/poppler-transition-api.h | 9 +++++++++
+ src/extension/internal/pdfinput/poppler-utils.cpp        | 6 ++++--
+ 2 files changed, 13 insertions(+), 2 deletions(-)
+
+diff --git a/src/extension/internal/pdfinput/poppler-transition-api.h b/src/extension/internal/pdfinput/poppler-transition-api.h
+index 58aa1ec921d..481aefadf46 100644
+--- a/src/extension/internal/pdfinput/poppler-transition-api.h
++++ b/src/extension/internal/pdfinput/poppler-transition-api.h
+@@ -13,6 +13,15 @@
+ #define SEEN_POPPLER_TRANSITION_API_H
+ 
+ #include <glib/poppler-features.h>
++#include <poppler/UTF.h>
++
++#if POPPLER_CHECK_VERSION(24, 5, 0)
++#define _POPPLER_HAS_UNICODE_BOM(value) (hasUnicodeByteOrderMark(value->toStr()))
++#define _POPPLER_HAS_UNICODE_BOMLE(value) (hasUnicodeByteOrderMarkLE(value->toStr()))
++#else
++#define _POPPLER_HAS_UNICODE_BOM(value) (value->hasUnicodeMarker())
++#define _POPPLER_HAS_UNICODE_BOMLE(value) (value->hasUnicodeMarkerLE())
++#endif
+ 
+ #if POPPLER_CHECK_VERSION(24, 3, 0)
+ #define _POPPLER_FUNCTION_TYPE_SAMPLED Function::Type::Sampled
+diff --git a/src/extension/internal/pdfinput/poppler-utils.cpp b/src/extension/internal/pdfinput/poppler-utils.cpp
+index 78d90c66c9d..c02815f64b9 100644
+--- a/src/extension/internal/pdfinput/poppler-utils.cpp
++++ b/src/extension/internal/pdfinput/poppler-utils.cpp
+@@ -12,6 +12,8 @@
+ 
+ #include "poppler-utils.h"
+ 
++#include <poppler/UTF.h>
++
+ #include "2geom/affine.h"
+ #include "GfxFont.h"
+ #include "GfxState.h"
+@@ -563,10 +565,10 @@ std::string getDictString(Dict *dict, const char *key)
+  */
+ std::string getString(const GooString *value)
+ {
+-    if (value->hasUnicodeMarker()) {
++    if (_POPPLER_HAS_UNICODE_BOM(value)) {
+         return g_convert(value->getCString () + 2, value->getLength () - 2,
+                          "UTF-8", "UTF-16BE", NULL, NULL, NULL);
+-    } else if (value->hasUnicodeMarkerLE()) {
++    } else if (_POPPLER_HAS_UNICODE_BOMLE(value)) {
+         return g_convert(value->getCString () + 2, value->getLength () - 2,
+                          "UTF-8", "UTF-16LE", NULL, NULL, NULL);
+     }
+-- 
+GitLab
+
diff --git a/media-gfx/inkscape/inkscape-1.3.2-r2.ebuild b/media-gfx/inkscape/inkscape-1.3.2-r2.ebuild
index f746f1a32d60..d9b60c0ac627 100644
--- a/media-gfx/inkscape/inkscape-1.3.2-r2.ebuild
+++ b/media-gfx/inkscape/inkscape-1.3.2-r2.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} = 9999* ]]; then
 	EGIT_REPO_URI="https://gitlab.com/inkscape/inkscape.git"
 else
 	SRC_URI="https://media.inkscape.org/dl/resources/file/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 fi
 
 S="${WORKDIR}/${MY_P}"
@@ -112,6 +112,9 @@ DEPEND="${COMMON_DEPEND}
 PATCHES=(
 	"${FILESDIR}"/${P}-libxml2-2.12.patch
 	"${FILESDIR}"/${P}-poppler-24.03.patch
+	"${FILESDIR}"/${P}-poppler-24.05.patch # bug 931917
+	"${FILESDIR}"/${P}-cxx20.patch # bug 931917
+	"${FILESDIR}"/${P}-cxx20-2.patch # bug 933216
 )
 
 pkg_pretend() {
diff --git a/media-gfx/inkscape/inkscape-1.4_beta3.ebuild b/media-gfx/inkscape/inkscape-1.4_beta3.ebuild
new file mode 100644
index 000000000000..eab33b71e0fe
--- /dev/null
+++ b/media-gfx/inkscape/inkscape-1.4_beta3.ebuild
@@ -0,0 +1,200 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit cmake flag-o-matic xdg toolchain-funcs python-single-r1
+
+MY_P="${P/_/}"
+DESCRIPTION="SVG based generic vector-drawing program"
+HOMEPAGE="https://inkscape.org/ https://gitlab.com/inkscape/inkscape/"
+
+if [[ ${PV} = 9999* ]]; then
+	inherit git-r3
+	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"
+fi
+
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+IUSE="cdr dia exif graphicsmagick imagemagick inkjar jpeg openmp postscript readline sourceview spell svg2 test visio wpg X"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+# Lots of test failures which need investigating, bug #871621
+RESTRICT="!test? ( test ) test"
+
+BDEPEND="
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+	test? ( virtual/imagemagick-tools )
+"
+COMMON_DEPEND="${PYTHON_DEPS}
+	>=app-text/poppler-0.57.0:=[cairo]
+	>=dev-cpp/cairomm-1.12:0
+	>=dev-cpp/glibmm-2.58:2
+	dev-cpp/gtkmm:3.0
+	>=dev-cpp/pangomm-2.40:1.4
+	>=dev-libs/boehm-gc-7.1:=
+	dev-libs/boost:=[stacktrace(-)]
+	dev-libs/double-conversion:=
+	>=dev-libs/glib-2.41
+	>=dev-libs/libsigc++-2.8:2
+	>=dev-libs/libxml2-2.7.4
+	>=dev-libs/libxslt-1.1.25
+	dev-libs/popt
+	media-gfx/potrace
+	media-libs/libepoxy
+	media-libs/fontconfig
+	media-libs/freetype:2
+	media-libs/lcms:2
+	media-libs/libpng:0=
+	sci-libs/gsl:=
+	>=x11-libs/pango-1.44
+	x11-libs/gtk+:3[X?]
+	X? ( x11-libs/libX11 )
+	$(python_gen_cond_dep '
+		dev-python/appdirs[${PYTHON_USEDEP}]
+		dev-python/cachecontrol[${PYTHON_USEDEP}]
+		dev-python/cssselect[${PYTHON_USEDEP}]
+		dev-python/filelock[${PYTHON_USEDEP}]
+		dev-python/lockfile[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/pillow[jpeg?,tiff,webp,${PYTHON_USEDEP}]
+		media-gfx/scour[${PYTHON_USEDEP}]
+	')
+	cdr? (
+		app-text/libwpg:0.3
+		dev-libs/librevenge
+		media-libs/libcdr
+	)
+	exif? ( media-libs/libexif )
+	imagemagick? (
+		!graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
+		graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
+	)
+	jpeg? ( media-libs/libjpeg-turbo:= )
+	readline? ( sys-libs/readline:= )
+	sourceview? ( x11-libs/gtksourceview:4 )
+	spell? ( app-text/gspell )
+	visio? (
+		app-text/libwpg:0.3
+		dev-libs/librevenge
+		media-libs/libvisio
+	)
+	wpg? (
+		app-text/libwpg:0.3
+		dev-libs/librevenge
+	)
+"
+# These only use executables provided by these packages
+# See share/extensions for more details. inkscape can tell you to
+# install these so we could of course just not depend on those and rely
+# on that.
+RDEPEND="${COMMON_DEPEND}
+	$(python_gen_cond_dep '
+		dev-python/numpy[${PYTHON_USEDEP}]
+	')
+	dia? ( app-office/dia )
+	postscript? ( app-text/ghostscript-gpl )
+"
+DEPEND="${COMMON_DEPEND}
+	test? ( dev-cpp/gtest )
+"
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+	python-single-r1_pkg_setup
+}
+
+src_unpack() {
+	if [[ ${PV} = 9999* ]]; then
+		git-r3_src_unpack
+	else
+		default
+	fi
+	[[ -d "${S}" ]] || mv -v "${WORKDIR}/${P/_/-}_202"?-??-* "${S}" || die
+}
+
+src_prepare() {
+	cmake_src_prepare
+	sed -i "/install.*COPYING/d" CMakeScripts/ConfigCPack.cmake || die
+}
+
+src_configure() {
+	# ODR violation (https://gitlab.com/inkscape/lib2geom/-/issues/71, bug #859628)
+	filter-lto
+	# Aliasing unsafe (bug #310393)
+	append-flags -fno-strict-aliasing
+
+	local mycmakeargs=(
+		# -DWITH_LPETOOL   # Compile with LPE Tool and experimental LPEs enabled
+		-DWITH_NLS=ON
+		-DENABLE_POPPLER=ON
+		-DENABLE_POPPLER_CAIRO=ON
+		-DWITH_PROFILING=OFF
+		-DWITH_INTERNAL_2GEOM=ON
+		-DBUILD_TESTING=$(usex test)
+		-DWITH_LIBCDR=$(usex cdr)
+		-DWITH_IMAGE_MAGICK=$(usex imagemagick $(usex !graphicsmagick)) # requires ImageMagick 6, only IM must be enabled
+		-DWITH_GRAPHICS_MAGICK=$(usex graphicsmagick $(usex imagemagick)) # both must be enabled to use GraphicsMagick
+		-DWITH_GNU_READLINE=$(usex readline)
+		-DWITH_GSPELL=$(usex spell)
+		-DWITH_JEMALLOC=OFF
+		-DENABLE_LCMS=ON
+		-DWITH_OPENMP=$(usex openmp)
+		-DBUILD_SHARED_LIBS=ON
+		-DWITH_GSOURCEVIEW=$(usex sourceview)
+		-DWITH_SVG2=$(usex svg2)
+		-DWITH_LIBVISIO=$(usex visio)
+		-DWITH_LIBWPG=$(usex wpg)
+		-DWITH_X11=$(usex X)
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	CMAKE_SKIP_TESTS=(
+		# render_text*: needs patched Cairo / maybe upstream changes
+		# not yet in a release.
+		# test_lpe/test_lpe64: precision differences b/c of new GCC?
+		# cli_export-png-color-mode-gray-8_png_check_output: ditto?
+		render_test-use
+		render_test-glyph-y-pos
+		render_text-glyphs-combining
+		render_text-glyphs-vertical
+		render_test-rtl-vertical
+		test_lpe
+		test_lpe64
+		cli_export-png-color-mode-gray-8_png_check_output
+	)
+
+	# bug #871621
+	cmake_src_compile tests
+	cmake_src_test -j1
+}
+
+src_install() {
+	cmake_src_install
+
+	find "${ED}" -type f -name "*.la" -delete || die
+	find "${ED}"/usr/share/man -type f -maxdepth 3 -name '*.bz2' -exec bzip2 -d {} \; || die
+	find "${ED}"/usr/share/man -type f -maxdepth 3 -name '*.gz' -exec gzip -d {} \; || die
+
+	local extdir="${ED}"/usr/share/${PN}/extensions
+	if [[ -e "${extdir}" ]] && [[ -n $(find "${extdir}" -mindepth 1) ]]; then
+		python_fix_shebang "${ED}"/usr/share/${PN}/extensions
+		python_optimize "${ED}"/usr/share/${PN}/extensions
+	fi
+}
diff --git a/media-gfx/inkscape/inkscape-9999.ebuild b/media-gfx/inkscape/inkscape-9999.ebuild
index b91ba44ceda8..7871706cb2a5 100644
--- a/media-gfx/inkscape/inkscape-9999.ebuild
+++ b/media-gfx/inkscape/inkscape-9999.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} = 9999* ]]; then
 	EGIT_REPO_URI="https://gitlab.com/inkscape/inkscape.git"
 else
 	SRC_URI="https://media.inkscape.org/dl/resources/file/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 S="${WORKDIR}/${MY_P}"
@@ -38,7 +38,7 @@ BDEPEND="
 COMMON_DEPEND="${PYTHON_DEPS}
 	>=app-text/poppler-0.57.0:=[cairo]
 	>=dev-cpp/cairomm-1.12:0
-	>=dev-cpp/glibmm-2.54.1:2
+	>=dev-cpp/glibmm-2.58:2
 	dev-cpp/gtkmm:3.0
 	>=dev-cpp/pangomm-2.40:1.4
 	>=dev-libs/boehm-gc-7.1:=
@@ -55,7 +55,6 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	media-libs/freetype:2
 	media-libs/lcms:2
 	media-libs/libpng:0=
-	net-libs/libsoup:2.4
 	sci-libs/gsl:=
 	>=x11-libs/pango-1.44
 	x11-libs/gtk+:3[X?]
@@ -124,7 +123,7 @@ src_unpack() {
 	else
 		default
 	fi
-	[[ -d "${S}" ]] || mv -v "${WORKDIR}/${P}_202"?-??-* "${S}" || die
+	[[ -d "${S}" ]] || mv -v "${WORKDIR}/${P/_/-}_202"?-??-* "${S}" || die
 }
 
 src_prepare() {
@@ -198,7 +197,4 @@ src_install() {
 		python_fix_shebang "${ED}"/usr/share/${PN}/extensions
 		python_optimize "${ED}"/usr/share/${PN}/extensions
 	fi
-
-	# Empty directory causes sandbox issues, see bug #761915
-	rm -r "${ED}/usr/share/inkscape/fonts" || die "Failed to remove fonts directory."
 }
diff --git a/media-gfx/jhead/Manifest b/media-gfx/jhead/Manifest
index dd9966b1bf65..ff970124a488 100644
--- a/media-gfx/jhead/Manifest
+++ b/media-gfx/jhead/Manifest
@@ -1,4 +1,4 @@
 AUX jhead-3.08-fix-makefile.patch 1249 BLAKE2B ef1cab0d7141d71e374b7d1481431f8bd29fa115a45eae31556cf096b26739c1929e694532f61f0f7f739ec53744781c25af24d453eb8bc9b41c79c4bc71f1c7 SHA512 c4a04aaf34d14e758f96283dea2d347cd61d443fd99b2702e3ae80150e512ee944198e3432d2dc8c2674aee16f32cd71f7c2781f8de66442793640e256b2f8f6
 DIST jhead-3.08.tgz 1146535 BLAKE2B 8e53fed1988c12be40b804fd3c8aa51d71ddaa11d97ed11479ec100f26585cc4a19b3b29249642e1cdb5afbf612b6b4281c4f0ec3ad10ad1a6e6fdffc6729740 SHA512 eb50e487eaacf2b489ce5e76f09730c8bb0c50a0e2d7c854ebe8bd204ead8f6256e052c49c72af179dc46dd5372c1eff32ff549b947637b242dc7bbe8c7b20d5
-EBUILD jhead-3.08-r1.ebuild 930 BLAKE2B 72ad80fd632f6d043be3a8a581769192b884ca26fae58112689d3343e0c8f4b43ac8d3e2a575f0b849c4103cfe8686dd79cb38269b5600cdd826868202431e24 SHA512 a4c6c4742909c094e94dee38efd330551caa212615c5949da8668f78227736f5c3157e3e76eaeec43ea18733dec489e15a4f756be78da60b5b066f79ec894a07
+EBUILD jhead-3.08-r1.ebuild 924 BLAKE2B 4870c2840eef6f60bf93fcaaef122f6db278761d56f5df551fc6872194944de1132f5d0af0c8ed5ac056a702725a7ebfe30a9c68c956e0c949d1ccb29d5a9ddc SHA512 1a8cad9e138627b8da780085732551b36689889c14f541c47cd91f31e8f324ec0c8575681fe291a547f5479493a443885308455df6457288b836135ec3272670
 MISC metadata.xml 351 BLAKE2B 2fa507a18a19bd866b01af6618c21a3f3b37bd250fb9cbf3a253ae9e94cb6dae961a5f337c083511d7e939380175c613864e087cb22c75b6e5662900168ebabe SHA512 9e77e681d0453ec4ee2ffb3888b3867f0445fb4617a68e36902e1ee37ac56e0d04576c3a20447ee1a8fece62896c119b24ab5073f37c8e62f1c2ec00cf82a8da
diff --git a/media-gfx/jhead/jhead-3.08-r1.ebuild b/media-gfx/jhead/jhead-3.08-r1.ebuild
index 3522816be291..0d1ac8c04aa9 100644
--- a/media-gfx/jhead/jhead-3.08-r1.ebuild
+++ b/media-gfx/jhead/jhead-3.08-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Matthias-Wandel/jhead/archive/refs/tags/${PV}.tar.gz
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.08-fix-makefile.patch
diff --git a/media-gfx/jp2a/Manifest b/media-gfx/jp2a/Manifest
index 7b976f7e191c..9c38bbcb27eb 100644
--- a/media-gfx/jp2a/Manifest
+++ b/media-gfx/jp2a/Manifest
@@ -1,3 +1,5 @@
 DIST jp2a-1.1.1.tar.bz2 525678 BLAKE2B 82e4717acb27596ca789681d288767cd602207b56e4f4afbffe5a1a107d67e0bc2b61dadd3769963eff34d3d8a1546741a069cfa7dfe40c9d3486cac6ccb29d6 SHA512 92234100e43c542f468ce586fb1c3f975c2492b80062ea5871f0eb02351b26b7f56bd5567d4d2e3bcec1ea66ebae22623d7d973c3bc794dd99c819efcae983cd
-EBUILD jp2a-1.1.1.ebuild 648 BLAKE2B f2b77407b991500d07da2bc64e8eb02a4e4964a22f1f89c935eb5a9977bf83cffd8c78356987e8f83d68feb3613a4725126530fd9d2361e51669c4ea94fa957a SHA512 c4c106af1ca5088d87f94008fec68d2923d6189e0a383384caa60d9fc926c96c5da148047d399498dcfc0522367204dc8577e3676c2b5d52d4b7b330ed0d97f6
+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 660 BLAKE2B a6f408483e0e3f2c5810370b808364d413911450ecb95d9a98300ef07d625a65c4bded2ed671d435557254ffe87e5df926bd59abd2115f238852f6050de5f45b SHA512 d34d979c8f9f4a968b2c39a405b8c02d4176de312ec726b9a839bd34c785ee055d533eba4386a02b45cf2fc9d790cddc3ff59f9e97d9808b22af55936c9b97e9
 MISC metadata.xml 249 BLAKE2B 2572acca810424ee1967a908498b907de468a9fb1765d7bc11a5d1c6aa81294d962a224d7777fecc997fb3220613350618fb7edc9e65b66e9e8dc4a8d31e6313 SHA512 b13e4520e6f7e18c5b925bff00c9711a98d8e773aba54fbe527d95ba97ccd0bd6b58f91f6b01ad92f106bb56f671261de55aacf796db0086e700d9fd40a0d842
diff --git a/media-gfx/jp2a/jp2a-1.1.1.ebuild b/media-gfx/jp2a/jp2a-1.1.1.ebuild
index 2696e5ec3b0f..88d5f83c05a6 100644
--- a/media-gfx/jp2a/jp2a-1.1.1.ebuild
+++ b/media-gfx/jp2a/jp2a-1.1.1.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 ~ia64 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/jp2a/jp2a-1.2.0.ebuild b/media-gfx/jp2a/jp2a-1.2.0.ebuild
new file mode 100644
index 000000000000..5644f999ab76
--- /dev/null
+++ b/media-gfx/jp2a/jp2a-1.2.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="JPEG/PNG image to ASCII art converter"
+HOMEPAGE="https://github.com/Talinx/jp2a/"
+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"
+IUSE="curl"
+
+# TODO: restore ncurses support?
+# See https://github.com/gentoo/gentoo/pull/24218#issuecomment-1043795319
+RDEPEND="media-libs/libjpeg-turbo:=
+	media-libs/libpng
+	curl? ( net-misc/curl )"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	econf $(use_enable curl)
+}
diff --git a/media-gfx/jpeginfo/Manifest b/media-gfx/jpeginfo/Manifest
index a77d437f7d5a..7f16c72bd12b 100644
--- a/media-gfx/jpeginfo/Manifest
+++ b/media-gfx/jpeginfo/Manifest
@@ -1,4 +1,6 @@
 AUX jpeginfo-1.6.0-parallel_install.patch 334 BLAKE2B 01d3e16d44789c5c1d1346f6c3067496daad051e60c9a39c69641fcec1766bb69e872f5259b4edd2d7b5fe5c793bc25e47c7329aa49b625ac80954a444562f92 SHA512 5dd86f4172caacb8d43952274b3a0a86df5d346839d29eb7e80e6f7ae8be4b73a70dbaccc1732703d45cc966b8fd762a0a4c5e02a3701718ebcc6ff646f1e676
 DIST jpeginfo-1.6.1.tar.gz 64856 BLAKE2B 5d9748a4af26087e45f2ae3fa709bb2099547f22aaeaf1fde529d92d633b1bc665dfde301a9ecaf4a8e4fa190ef637126d6f4ee43118bb31f5782a402d4a08d1 SHA512 9cc9367b8b3e38ba46bff9477b8f61e63b55bd41a67ea2895cca9c097abba2a7a3ae068c235ecfea72c99af52bba91cbb1eb92feb019ba4eb08e826a7083c68b
+DIST jpeginfo-1.7.1.tar.gz 448213 BLAKE2B 4fa8a875a14b85b6b04bb8cd436dd5b6f68867ad10324ca56da24d247c46b6051fa566ac5f13c469cf90ffcdbc3f16bf6296cdda3f3c794e0986468971b5f31b SHA512 16c670b4f7eb2355fa2e1a665225d45bc135021565b4a950f8193bd0dbc1f55eed7af4e37ca71ea7df325aeb0c13ee52b0cc71e71b06ed39b013cc3377eca63b
 EBUILD jpeginfo-1.6.1-r1.ebuild 720 BLAKE2B 21b6dae8ec61dda419e92c21646b97eb3fdbf1b86e82ec6afe35507dbc85bd706605fd48f91f50e98678045ebe4ddd8beb8a810b1f24c710e360ec9be640434d SHA512 f44fb0bf829bdccf72034fa4d60ec615c9f4251327d22c979643c714a18216bf835de2cfd164c6b22159078c4ecb767952e7627beb4f5fd8da6f09cc0b22cf88
+EBUILD jpeginfo-1.7.1.ebuild 664 BLAKE2B ab2837119ffab647fb86a2d20bd0d89394b2c95e3e494002818c11c5d44a9a93d1acae2809a051dbe582604fe95db415fe8d1dde8a1b975d51d9a8b84bb7906a SHA512 d9aee6a0b94d5f383d2ce5dc907b24359689f81acd5ee5da4114290440641333098eea9d1aa67860d8012cf87c781338994441ef0bf70e1878cdf70996c6f8fc
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/media-gfx/jpeginfo/jpeginfo-1.7.1.ebuild b/media-gfx/jpeginfo/jpeginfo-1.7.1.ebuild
new file mode 100644
index 000000000000..8ff1d8261abe
--- /dev/null
+++ b/media-gfx/jpeginfo/jpeginfo-1.7.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="Prints information and tests integrity of JPEG/JFIF files"
+HOMEPAGE="https://www.kokkonen.net/tjko/projects.html"
+SRC_URI="https://www.kokkonen.net/tjko/src/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+RDEPEND="media-libs/libjpeg-turbo:="
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+
+	# Clang 16
+	eautoreconf
+}
+
+src_configure() {
+	tc-export CC
+	econf
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+	dodoc README
+}
diff --git a/media-gfx/kcoloredit/Manifest b/media-gfx/kcoloredit/Manifest
deleted file mode 100644
index 7408d1f0d94d..000000000000
--- a/media-gfx/kcoloredit/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST kcoloredit-2.0.0_p20171121-50ac0509.tar.gz 67173 BLAKE2B 2114da34e47768113bf643380efd29e59980f5bcfd544b183db7201b6d4707b81bbdc908476c6c5d36acf8b04e68c6ba1f85aab6f2e7594124f9ce4cbc496e54 SHA512 82dd71e45121357a7da45247862f4f9679fbd132e09e8fb85c0cbef6b73069443f84fe51ec642d30b0ff9b5db10aebf34978000636375afff6c91b49089a9554
-EBUILD kcoloredit-2.0.0_p20171121-r1.ebuild 1056 BLAKE2B ee2c28eec35cb0719b2284827adb1c3fc043fbd90677d88265fd7c4beadfcb8140e00b76d12415dba16413ff3b0b1a9bc1b485870c0c9f051d4ebc62279cbbd5 SHA512 d85ddbba17a18daec1d755acc80aa429fe105db8ccfd8f494c3b0613498b9dc59c3ea0d84cec597707b409c390719ba5f88ef236915f76e7438d04ff643acb3e
-MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/media-gfx/kcoloredit/kcoloredit-2.0.0_p20171121-r1.ebuild b/media-gfx/kcoloredit/kcoloredit-2.0.0_p20171121-r1.ebuild
deleted file mode 100644
index fc192cac2c2a..000000000000
--- a/media-gfx/kcoloredit/kcoloredit-2.0.0_p20171121-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KDE_ORG_CATEGORY=unmaintained
-KDE_ORG_COMMIT=50ac0509891343bc01a0aeffda5a44a1e65d9d04
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Tool for editing color palettes"
-HOMEPAGE="https://userbase.kde.org/KColorEdit"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdelibs4support-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-plasma/plasma-activities-${KFMIN}:5
-"
-RDEPEND="${DEPEND}
-	!media-gfx/kcoloredit:4
-"
diff --git a/media-gfx/kgraphviewer/Manifest b/media-gfx/kgraphviewer/Manifest
index db5e7b3e06e3..548e8b8f5ca9 100644
--- a/media-gfx/kgraphviewer/Manifest
+++ b/media-gfx/kgraphviewer/Manifest
@@ -1,8 +1,5 @@
-AUX kgraphviewer-2.4.3-highdpi.patch 577 BLAKE2B bfe4613b9e67cc01bde9ec7f9c9a827fc823f8cb016af2f27e12e75e5865ed847d745ac022deb799946ed1b13d01eeed5c9f9ba2c57f161c2d3ef2940c95469e SHA512 886f044b18a38fd5c73b17be8837af815ebaf82b277068502d16f5e3c64b0fb19b378c9773c408c8c62df52b7d1703c33bf2a662973f5e2fc4f3666a4d7f752d
-AUX kgraphviewer-2.4.3-obsolete-dep.patch 4965 BLAKE2B da1924881e582840e533eed3069274b23ea1a335975d1bbe01627970f64ed46b37f1610b0cefb2d7916b500caf1799eb5b52ee6f954c3acd8dc306affc554d2e SHA512 a43b19dbc068f03011b126b1950cd84b58b784c17464ed2b96042a40ccd36c55e7a4806a7ea5092f392db3fdb4e06777eef2dd046a191db75b3a1a207043ebcd
-AUX kgraphviewer-2.4.3-set-startupwmclass.patch 1045 BLAKE2B 8e48bc5a67cf8857a5eb5a57873fbe19a5a3cc52ef70d5c01ca3674d889acfa28dc46456caccd3a6078572b876e9f73b15e483f46fe35f82bd6fcdbed5d2312c SHA512 b4005bf61e448be43f7bcc3886ec092c9f2930e475067f4c1a382db4039dfdb580ce7e2a4765480438f80dc2e905013c43c8b65711f87fb14e62de73c60bedcd
-DIST kgraphviewer-2.4.3.tar.xz 1491328 BLAKE2B b51cf825ad4763538139f917a7d16d15a7244c19b3cab9c79bbd938ee3dd80e4e35e37012199e1256bcc9a9404d756cdb0f5ffb975484d527577c208ecf1d3fa SHA512 d18146ba380efe73e1ec716dd1cc310fe1eac23eccb10e2a699b107451637b9332cc25d62a4de762df4706cea182c9474ba1e885801c9832e1bb9bff1648e72d
-DIST kgraphviewer-2.5.0.tar.xz 1571364 BLAKE2B 77a749f6b2c7707e26993685445fac679067b1188a5e2bf974d99ddc89844eeea19de9fbdf86b9c0738a95515c3a5155743df4232167e24350c8d356ea96f6e3 SHA512 80056703cd42b709925b771fe4bafe17771954705a607d6c352a0818c726bc7b48d299fffd7f3d2f75ac498059f79923d4de468db20f8538554c4d6b8baffedb
-EBUILD kgraphviewer-2.4.3-r2.ebuild 1097 BLAKE2B 312301205617180031aafc740d5749cdb436f601047e2433992d5f376c1b3e82e56dc8137a106faea8131da322dfcd6f2d6b392ad39009dcde368256d3212da7 SHA512 47208d70b25113a5d53168923bdcf16b03230758ace49fcca01fe071102f3f95b382f293c17e422c4ea6a8f6a764ea80c86e60ec5c6e107af0d106a41f00e38e
-EBUILD kgraphviewer-2.5.0.ebuild 1004 BLAKE2B 774f872e1e32d72a65b562fc7ac93332cce74acbe06a48253066af27c92773dce26061647e1723c551db121a68ebb7d636010f7d1ae000e43e1f2b6f5771e318 SHA512 6a3e3be9cd4fc399f882eea816622b972cc10e032c388f8442aa20c51855052172e49a527065f13ac5c00ee82997640dc0d31740e75f3844c7758b47d757bc03
+DIST kgraphviewer-24.08.0.tar.xz 1582636 BLAKE2B 0043a4a77cf202d96c9e7e0f708e8d93bb71642ba220aa32655f671a8ec92b522d2c8914bdde65187bb270117e2d60f1f7b806895d337c443d7a91860a01f9c3 SHA512 c2ba1a82240fdbbd285b4815d6cc43804e7b26f856185b2d9b3a789e30c6a32c98bd8c92676db3007a58426cbc5961d0bcbf3f4d9c9aa4aed1c58ab12f68f51e
+DIST kgraphviewer-24.08.1.tar.xz 1583016 BLAKE2B b253ab2aa4688a5a2063ae2d62d395c16a243655ad859e6f66c92bbf79120b8c773d7b34a3ca890bf06bbfa935eb9ac5ff4386847d86439d5afde024e0a10d97 SHA512 80647c0db32997c277524b5d5520ba5a285c31441582a081f8f6c6265c7b8f2977043a81f75b62446540a91236744075543811ba274dd1a5cdd8d1b368bb2f0b
+EBUILD kgraphviewer-24.08.0.ebuild 849 BLAKE2B f0c2391b502f1ebde86f9515942bed34686eb57c15057a4c115eb48371da601cb2ef60d2208a180b30371fa3a87bd7d02a1a6a92e26851b658a7b0075a761078 SHA512 59827fef87d9cbc218e84f3fe2cc93b2601ab5e108dc7e6a7fc812d60ea6264454f77ae148e667e380aedafec37b6a4ed89cee8d189107fa029de9cf07096015
+EBUILD kgraphviewer-24.08.1.ebuild 850 BLAKE2B 6c024d4249c0e147320708bab5c49fe6ebc067ccae2dd9717939d8622658ecb015c619115c0dfd9c490d0048d2fcfa70fc94c4ef9afc198fd7aa2def571bb50f SHA512 6b9706611412d5389ab7f11fd7bb5d897cb26d6d113e788020e479eb8c11a5a6d94921d5a7ad8ca5de79f5484ca42612d6cac65935bae3b3b224e830526789ea
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/media-gfx/kgraphviewer/files/kgraphviewer-2.4.3-highdpi.patch b/media-gfx/kgraphviewer/files/kgraphviewer-2.4.3-highdpi.patch
deleted file mode 100644
index 8b31d40fb157..000000000000
--- a/media-gfx/kgraphviewer/files/kgraphviewer-2.4.3-highdpi.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 9961c92736abfc6d0aedea9c4e7c679e1fd564d2 Mon Sep 17 00:00:00 2001
-From: Nicolas Fella <nicolas.fella@gmx.de>
-Date: Mon, 7 Mar 2022 19:49:21 +0100
-Subject: [PATCH] Enable highdpi pixmaps
-
----
- src/main.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/main.cpp b/src/main.cpp
-index 32ad115..271e61f 100644
---- a/src/main.cpp
-+++ b/src/main.cpp
-@@ -38,6 +38,7 @@
- 
- int main(int argc, char **argv)
- {
-+  QApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
-   QApplication app(argc, argv);
- 
-   KLocalizedString::setApplicationDomain("kgraphviewer");
--- 
-GitLab
-
diff --git a/media-gfx/kgraphviewer/files/kgraphviewer-2.4.3-obsolete-dep.patch b/media-gfx/kgraphviewer/files/kgraphviewer-2.4.3-obsolete-dep.patch
deleted file mode 100644
index 76fa878bc364..000000000000
--- a/media-gfx/kgraphviewer/files/kgraphviewer-2.4.3-obsolete-dep.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-From a6f0587d8cbbb246c33423d19f2aabf6ea9d7417 Mon Sep 17 00:00:00 2001
-From: Nicolas Fella <nicolas.fella@gmx.de>
-Date: Sun, 8 May 2022 16:59:25 +0200
-Subject: [PATCH] Remove pointless/broken icons
-
-The distribute-horizontal-page icon doesn't serve any apparent purpose
-
-The portrait/landscape icons don't exist in any theme
-
-(cherry picked from commit 7b214252ec5f486912944d987581f207c7b03681)
----
- CMakeLists.txt                          |  1 -
- src/part/CMakeLists.txt                 |  2 +-
- src/part/KgvPageLayoutSize.cpp          | 10 ----------
- src/part/simpleprintingpagesetup.cpp    |  4 ----
- src/part/simpleprintingpagesetupbase.ui | 10 ----------
- 5 files changed, 1 insertion(+), 26 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index fd715d2..238a9dd 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -27,7 +27,6 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
-     DocTools
-     Parts
-     WidgetsAddons
--    IconThemes
- )
- 
- find_package(Boost 1.36 REQUIRED)
-diff --git a/src/part/CMakeLists.txt b/src/part/CMakeLists.txt
-index 0e70be8..922e5c5 100644
---- a/src/part/CMakeLists.txt
-+++ b/src/part/CMakeLists.txt
-@@ -64,7 +64,7 @@ ki18n_wrap_ui(kgraphviewerlib_LIB_SRCS ${kgraphviewerprinting_UI} )
- 
- add_library(kgraphviewerlib ${kgraphviewerlib_LIB_SRCS})
- 
--target_link_libraries(kgraphviewerlib Qt5::Core Qt5::Svg Qt5::PrintSupport Qt5::Svg KF5::WidgetsAddons KF5::IconThemes KF5::XmlGui KF5::I18n KF5::Parts ${graphviz_LIBRARIES})
-+target_link_libraries(kgraphviewerlib Qt5::Core Qt5::Svg Qt5::PrintSupport Qt5::Svg KF5::WidgetsAddons KF5::XmlGui KF5::I18n KF5::Parts ${graphviz_LIBRARIES})
- 
- set_target_properties(kgraphviewerlib PROPERTIES VERSION ${PROJECT_VERSION} SOVERSION ${KGRAPHVIEWER_SOVERSION} OUTPUT_NAME kgraphviewer )
- 
-diff --git a/src/part/KgvPageLayoutSize.cpp b/src/part/KgvPageLayoutSize.cpp
-index bb8b3d1..4053a20 100644
---- a/src/part/KgvPageLayoutSize.cpp
-+++ b/src/part/KgvPageLayoutSize.cpp
-@@ -42,7 +42,6 @@
- #include <QHBoxLayout>
- #include <QGridLayout>
- #include <QPixmap>
--#include <KIconTheme>
- #include "klocalizedstring.h"
- 
- KgvPageLayoutSize::KgvPageLayoutSize(
-@@ -148,19 +147,10 @@ KgvPageLayoutSize::KgvPageLayoutSize(
- //     m_orientGroup->setInsideSpacing( KDialog::spacingHint() );
-     grid1->addWidget( m_orientGroup, 2, 0 );
- 
--    const int iconSize = KIconTheme(KIconTheme::current()).defaultSize(KIconLoader::Small);
--    QLabel* lbPortrait = new QLabel( m_orientGroup );
--    lbPortrait->setPixmap( QPixmap( QIcon::fromTheme( "koPortrait" ).pixmap(iconSize, iconSize) ) );
--    lbPortrait->setMaximumWidth( lbPortrait->pixmap()->width() );
--    lay3->addWidget(lbPortrait);
-     QRadioButton* rbPortrait = new QRadioButton( i18n("&Portrait"), m_orientGroup );
-     lay3->addWidget(rbPortrait);
-     m_orientButtons.addButton(rbPortrait);
-   
--    QLabel* lbLandscape = new QLabel( m_orientGroup );
--    lbLandscape->setPixmap( QPixmap( QIcon::fromTheme( "koLandscape" ).pixmap(iconSize, iconSize) ) );
--    lbLandscape->setMaximumWidth( lbLandscape->pixmap()->width() );
--    lay3->addWidget(lbLandscape);
-     QRadioButton* rbLandscape = new QRadioButton( i18n("La&ndscape"), m_orientGroup );
-     lay3->addWidget(rbLandscape);
-     m_orientGroup->setLayout(lay3);
-diff --git a/src/part/simpleprintingpagesetup.cpp b/src/part/simpleprintingpagesetup.cpp
-index 9882fbf..cd707b9 100644
---- a/src/part/simpleprintingpagesetup.cpp
-+++ b/src/part/simpleprintingpagesetup.cpp
-@@ -57,7 +57,6 @@
- #include <QPixmap>
- #include <QVBoxLayout>
- #include <klocalizedstring.h>
--#include <KIconTheme>
- #include <iostream>
- 
- namespace KGraphViewer
-@@ -109,9 +108,6 @@ KGVSimplePrintingPageSetup::KGVSimplePrintingPageSetup(
- 	connect(m_contents->printPreviewButton, &QPushButton::clicked,
-                 this, &KGVSimplePrintingPageSetup::slotPrintPreview);
- 
--	m_contents->iconLabel->setFixedWidth(32+6);
--    const int iconSize = KIconTheme(KIconTheme::current()).defaultSize(KIconLoader::Small);
--  m_contents->iconLabel->setPixmap(QIcon::fromTheme("distribute-horizontal-page").pixmap(iconSize, iconSize));
- 	m_contents->headerTitleFontButton->setText(i18n("Font..."));
- 	m_contents->headerTitleFontButton->setWhatsThis(i18n("Changes font for title text."));
- 	connect(m_contents->headerTitleFontButton, &QPushButton::clicked,
-diff --git a/src/part/simpleprintingpagesetupbase.ui b/src/part/simpleprintingpagesetupbase.ui
-index ddc6ee0..719a7d6 100644
---- a/src/part/simpleprintingpagesetupbase.ui
-+++ b/src/part/simpleprintingpagesetupbase.ui
-@@ -157,16 +157,6 @@
-        </item>
-       </layout>
-      </item>
--     <item>
--      <widget class="QLabel" name="iconLabel">
--       <property name="text">
--        <string/>
--       </property>
--       <property name="alignment">
--        <set>Qt::AlignVCenter</set>
--       </property>
--      </widget>
--     </item>
-      <item>
-       <widget class="QGroupBox" name="groupBox4">
-        <property name="title">
--- 
-2.37.3
-
diff --git a/media-gfx/kgraphviewer/files/kgraphviewer-2.4.3-set-startupwmclass.patch b/media-gfx/kgraphviewer/files/kgraphviewer-2.4.3-set-startupwmclass.patch
deleted file mode 100644
index 970bf57f2cfb..000000000000
--- a/media-gfx/kgraphviewer/files/kgraphviewer-2.4.3-set-startupwmclass.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 50fea8d6413e06fcfaf0d0ca03cc6c266a1cda14 Mon Sep 17 00:00:00 2001
-From: "Friedrich W. H. Kossebau" <kossebau@kde.org>
-Date: Tue, 5 Feb 2019 04:49:16 +0100
-Subject: Set StartupWMClass in desktop file
-
-Used by non-Plasma unixoid X-based shells to map windows to desktop files
-e.g. in launcher UIs, which do not know about _KDE_NET_WM_DESKTOP_FILE and
-instead expect (one of) the WM_CLASS entries to match the basename of the
-desktop file by default. StartupWMClass overwrites that default.
----
- src/org.kde.kgraphviewer.desktop | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/org.kde.kgraphviewer.desktop b/src/org.kde.kgraphviewer.desktop
-index bfff1bf..6b3affb 100644
---- a/src/org.kde.kgraphviewer.desktop
-+++ b/src/org.kde.kgraphviewer.desktop
-@@ -41,6 +41,7 @@ MimeType=text/vnd.graphviz
- Exec=kgraphviewer -qwindowtitle %c %u
- Icon=kgraphviewer
- Type=Application
-+StartupWMClass=kgraphviewer
- Categories=Qt;KDE;Graphics;Viewer;2DGraphics;DataVisualization;
- X-DocPath=kgraphviewer/index.html
- InitialPreference=10
--- 
-cgit v1.1
diff --git a/media-gfx/kgraphviewer/kgraphviewer-2.4.3-r2.ebuild b/media-gfx/kgraphviewer/kgraphviewer-2.4.3-r2.ebuild
deleted file mode 100644
index 4716b8e8e2e9..000000000000
--- a/media-gfx/kgraphviewer/kgraphviewer-2.4.3-r2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Graphviz dot graph file viewer"
-HOMEPAGE="https://apps.kde.org/kgraphviewer"
-[[ ${PV} != *9999* ]] && SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2 GPL-2+ LGPL-2+ LGPL-2.1+ handbook? ( FDL-1.2 )"
-SLOT="5"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=media-gfx/graphviz-2.30
-"
-DEPEND="${RDEPEND}
-	dev-libs/boost
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-set-startupwmclass.patch"
-	"${FILESDIR}/${P}-highdpi.patch"
-	"${FILESDIR}/${P}-obsolete-dep.patch"
-)
diff --git a/media-gfx/kgraphviewer/kgraphviewer-2.5.0.ebuild b/media-gfx/kgraphviewer/kgraphviewer-24.08.0.ebuild
index d8fd97400f04..4e65fec3c592 100644
--- a/media-gfx/kgraphviewer/kgraphviewer-2.5.0.ebuild
+++ b/media-gfx/kgraphviewer/kgraphviewer-24.08.0.ebuild
@@ -4,23 +4,19 @@
 EAPI=8
 
 ECM_HANDBOOK="optional"
-KFMIN=6.1.0
-QTMIN=6.6.2
-inherit ecm kde.org
+KFMIN=6.5.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
 
 DESCRIPTION="Graphviz dot graph file viewer"
 HOMEPAGE="https://apps.kde.org/kgraphviewer/"
 
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
-fi
-
 LICENSE="GPL-2 GPL-2+ LGPL-2+ LGPL-2.1+ handbook? ( FDL-1.2 )"
 SLOT="0"
+KEYWORDS="amd64 arm64 ~riscv ~x86"
 IUSE=""
 
-COMMON_DEPEND="
+RDEPEND="
 	>=dev-qt/qt5compat-${QTMIN}:6
 	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
 	>=dev-qt/qtsvg-${QTMIN}:6
@@ -33,9 +29,6 @@ COMMON_DEPEND="
 	>=kde-frameworks/kxmlgui-${KFMIN}:6
 	>=media-gfx/graphviz-2.30
 "
-DEPEND="${COMMON_DEPEND}
+DEPEND="${RDEPEND}
 	dev-libs/boost
 "
-RDEPEND="${COMMON_DEPEND}
-	!${CATEGORY}/${PN}:5
-"
diff --git a/media-gfx/kgraphviewer/kgraphviewer-24.08.1.ebuild b/media-gfx/kgraphviewer/kgraphviewer-24.08.1.ebuild
new file mode 100644
index 000000000000..93e003b07367
--- /dev/null
+++ b/media-gfx/kgraphviewer/kgraphviewer-24.08.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+KFMIN=6.5.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Graphviz dot graph file viewer"
+HOMEPAGE="https://apps.kde.org/kgraphviewer/"
+
+LICENSE="GPL-2 GPL-2+ LGPL-2+ LGPL-2.1+ handbook? ( FDL-1.2 )"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 ~riscv ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-qt/qt5compat-${QTMIN}:6
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
+	>=dev-qt/qtsvg-${QTMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kparts-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	>=media-gfx/graphviz-2.30
+"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+"
diff --git a/media-gfx/kio-blender-thumbnailer/Manifest b/media-gfx/kio-blender-thumbnailer/Manifest
new file mode 100644
index 000000000000..2dd37e98187a
--- /dev/null
+++ b/media-gfx/kio-blender-thumbnailer/Manifest
@@ -0,0 +1,7 @@
+DIST kdegraphics-thumbnailers-23.08.5.tar.xz 49436 BLAKE2B 943ad7bd93ca5e4d80854869d4d97f7121d259a82062afb7781d1845e94cbc6ea1732aff3d3476eb6db5ffe54f8f97b352ef8977ebdccc2b173594dd3cbccd6f SHA512 77c328e9532fbd12548d4d219d6da2ad369ee14825d3cf5d142ec11afb842640e1fd01e7e1f911147c93e7e93893b9ae10be66b3d568866ed8985b5e5b38663f
+DIST kdegraphics-thumbnailers-24.05.2.tar.xz 48756 BLAKE2B f5c2932c89fe38933c764171c31edfc0c11b7d6a34170e283a5f7ebc221866a2005897e580f1076b4a8bd9438d2fc39ff4b5da99abe90ce41c7465f35b7f6479 SHA512 eafc1eaf48fe7fef2556b1ba39beec0032b3fbc3ad01856517c86e6d56a2d24c488db9ca6cd9669a5b70c16ce44b6006c0a9e48216af08d03fbd805973158503
+DIST kdegraphics-thumbnailers-24.08.1.tar.xz 49016 BLAKE2B 1c29734d1371f970271e9bf0dd0750d80f5c19b78c7cdb90bc0665ee748cf4aa0414047796d96b21c207b3f6071e0e3a5fb83126d0f4f919793070f335180457 SHA512 d1b15005e080581ce31d96271bf8827a969ef95b3703ec80858b2d26fc5dd615d408471065647e0d7b7fef39b9e9af18fcf1af56594be13df5f3119fa81c2134
+EBUILD kio-blender-thumbnailer-23.08.5.ebuild 805 BLAKE2B 6c62037055739d24ed0754228a568269fc7f18da60316caf62744a9bd0e6fa565b134ea985646c771dfaf22ddedaf5f885caeb041f20406255bf9db85a400576 SHA512 175befa64a43a078a05f3c083030b9983a4543e7f6b39ea6d9413030aa924b497e8146415514b0aa8bd2ae1ed793bc6f81c450912a644263fac535b709dcf575
+EBUILD kio-blender-thumbnailer-24.05.2.ebuild 803 BLAKE2B d08020ec80cd8a2fcbf04e2000a82018c2d8d443b09c949fee98d3f07778a5a6ce94607fed80fb3ff5fe8f85310099dd57dce475a4a7c1b9802294edaf78f9c4 SHA512 fc6b6490aeb605d9aef809ebd68f795620469ee262638852eb124baeaaa271783dd6f0e4ba8b5e693d073dda6cb3bc591e9eb4f0f9e343375fe9c17dcbc34abf
+EBUILD kio-blender-thumbnailer-24.08.1.ebuild 805 BLAKE2B 292d33b7c285bd150248dbf6edf3d2dd008d2c4342762698d292bead779f5577a9f7af847bbb9d885b7841860b170afb0738b1549b51b3593c33f15ebe791e62 SHA512 d95417a4f56559755373742130874c1a2d18c799cad411001176d2a05e5d1cc190e94c658a9d956050e3710fe60536ed3605b59a3112c005c9bb6adfd3ecce13
+MISC metadata.xml 395 BLAKE2B e3794bfe43e720ba54df37c3174ab9754e3c09ff986b80ce66511bf6fb739344eb49d4cf1e6daae63eb13d11deb82407945f48e4dd186905477155a624dd0787 SHA512 50a4cbb59e7411ccbdf6a135877b3103bee5dd58511b9030556df9a076c806032302e02ee067d917ba6b1d7e6a8233d93b3335ac21a14c59c00240150013d6b5
diff --git a/media-gfx/kio-blender-thumbnailer/kio-blender-thumbnailer-23.08.5.ebuild b/media-gfx/kio-blender-thumbnailer/kio-blender-thumbnailer-23.08.5.ebuild
new file mode 100644
index 000000000000..5c0f56be9ad1
--- /dev/null
+++ b/media-gfx/kio-blender-thumbnailer/kio-blender-thumbnailer-23.08.5.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_NAME="kdegraphics-thumbnailers"
+KFMIN=5.106.0
+QTMIN=5.15.9
+inherit ecm gear.kde.org
+
+DESCRIPTION="KIO thumbnail generator for Blender files"
+HOMEPAGE="https://apps.kde.org/kdegraphics_thumbnailers/"
+
+LICENSE="GPL-2+"
+SLOT="5"
+KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv x86"
+
+DEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+"
+RDEPEND="${DEPEND}
+	!<kde-apps/thumbnailers-23.08.5-r1:5
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_ps=OFF
+		-DDISABLE_MOBIPOCKET=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_QMobipocket=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_KF5KExiv2=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_KF5KDcraw=ON
+	)
+	ecm_src_configure
+}
diff --git a/media-gfx/kio-blender-thumbnailer/kio-blender-thumbnailer-24.05.2.ebuild b/media-gfx/kio-blender-thumbnailer/kio-blender-thumbnailer-24.05.2.ebuild
new file mode 100644
index 000000000000..6ca172850f8b
--- /dev/null
+++ b/media-gfx/kio-blender-thumbnailer/kio-blender-thumbnailer-24.05.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_NAME="kdegraphics-thumbnailers"
+KFMIN=6.3.0
+QTMIN=6.6.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="KIO thumbnail generator for Blender files"
+HOMEPAGE="https://apps.kde.org/kdegraphics_thumbnailers/"
+
+LICENSE="GPL-2+"
+SLOT="6"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui]
+	>=kde-frameworks/karchive-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+"
+RDEPEND="${DEPEND}
+	!<kde-apps/thumbnailers-24.05.2-r1:6
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_ps=OFF
+		-DDISABLE_MOBIPOCKET=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_QMobipocket6=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_KExiv2Qt6=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_KDcrawQt6=ON
+	)
+	ecm_src_configure
+}
diff --git a/media-gfx/kio-blender-thumbnailer/kio-blender-thumbnailer-24.08.1.ebuild b/media-gfx/kio-blender-thumbnailer/kio-blender-thumbnailer-24.08.1.ebuild
new file mode 100644
index 000000000000..5ef7e9c0e3d1
--- /dev/null
+++ b/media-gfx/kio-blender-thumbnailer/kio-blender-thumbnailer-24.08.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_NAME="kdegraphics-thumbnailers"
+KFMIN=6.5.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="KIO thumbnail generator for Blender files"
+HOMEPAGE="https://apps.kde.org/kdegraphics_thumbnailers/"
+
+LICENSE="GPL-2+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui]
+	>=kde-frameworks/karchive-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+"
+RDEPEND="${DEPEND}
+	!<kde-apps/thumbnailers-24.05.2-r1:6
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_ps=OFF
+		-DDISABLE_MOBIPOCKET=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_QMobipocket6=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_KExiv2Qt6=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_KDcrawQt6=ON
+	)
+	ecm_src_configure
+}
diff --git a/media-gfx/kcoloredit/metadata.xml b/media-gfx/kio-blender-thumbnailer/metadata.xml
index d925f2439758..9d38b76b7d3d 100644
--- a/media-gfx/kcoloredit/metadata.xml
+++ b/media-gfx/kio-blender-thumbnailer/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<bugs-to>https://bugs.kde.org/</bugs-to>
+		<remote-id type="kde-invent">graphics/kdegraphics-thumbnailers</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/media-gfx/kio-mobi-thumbnailer/Manifest b/media-gfx/kio-mobi-thumbnailer/Manifest
new file mode 100644
index 000000000000..6d9c04b5a90c
--- /dev/null
+++ b/media-gfx/kio-mobi-thumbnailer/Manifest
@@ -0,0 +1,7 @@
+DIST kdegraphics-thumbnailers-23.08.5.tar.xz 49436 BLAKE2B 943ad7bd93ca5e4d80854869d4d97f7121d259a82062afb7781d1845e94cbc6ea1732aff3d3476eb6db5ffe54f8f97b352ef8977ebdccc2b173594dd3cbccd6f SHA512 77c328e9532fbd12548d4d219d6da2ad369ee14825d3cf5d142ec11afb842640e1fd01e7e1f911147c93e7e93893b9ae10be66b3d568866ed8985b5e5b38663f
+DIST kdegraphics-thumbnailers-24.05.2.tar.xz 48756 BLAKE2B f5c2932c89fe38933c764171c31edfc0c11b7d6a34170e283a5f7ebc221866a2005897e580f1076b4a8bd9438d2fc39ff4b5da99abe90ce41c7465f35b7f6479 SHA512 eafc1eaf48fe7fef2556b1ba39beec0032b3fbc3ad01856517c86e6d56a2d24c488db9ca6cd9669a5b70c16ce44b6006c0a9e48216af08d03fbd805973158503
+DIST kdegraphics-thumbnailers-24.08.1.tar.xz 49016 BLAKE2B 1c29734d1371f970271e9bf0dd0750d80f5c19b78c7cdb90bc0665ee748cf4aa0414047796d96b21c207b3f6071e0e3a5fb83126d0f4f919793070f335180457 SHA512 d1b15005e080581ce31d96271bf8827a969ef95b3703ec80858b2d26fc5dd615d408471065647e0d7b7fef39b9e9af18fcf1af56594be13df5f3119fa81c2134
+EBUILD kio-mobi-thumbnailer-23.08.5.ebuild 850 BLAKE2B 8c1f1669e225adcec3a770a6de72e10f83290f30f85146bb7ea14152f42359ffedaea07c3f994836ddb3ce054bb30ba9f9b39425c87ec8830c42e7bc3584c826 SHA512 365764d72aa52f97e54f7effceda8833444e2a422e45d2cb8e552ffbbda6c27061f95d456694a937612827d8df91a20535710270f6bbb12afbe6e7fc82039cad
+EBUILD kio-mobi-thumbnailer-24.05.2.ebuild 847 BLAKE2B 0d202715989e42197cc075d5edc57d373aced60e6d8b70aee493d7ed1df9123c3a07a1211a6d75d7fbcb3c4994efaaa32c576fd5bd8b198bc869e85f2d40e42a SHA512 110179643192c3906a307a0651d5fb12fae42f0a4aecba2fa56e4edfa774b7b40a769934a35e6c620e4d281b9268201b7efb06ab729cce2d4c54648bd88809ff
+EBUILD kio-mobi-thumbnailer-24.08.1.ebuild 849 BLAKE2B fd575c9e28a0d947c6b29d7bb6ab4c5171740356e1b344251b14431e1147a90a0447e2202367ba058d50f5306a4be9c150a78448fc7b18979df7c667bf345750 SHA512 669682a91742a8939e0e9a0a114aa8e19e332de072da4c6b7367840003f461f17807aae73dbbcbd8157a0d818531fdbbacc70dfe1229886a4a1ecc7e6d1e2b2c
+MISC metadata.xml 395 BLAKE2B e3794bfe43e720ba54df37c3174ab9754e3c09ff986b80ce66511bf6fb739344eb49d4cf1e6daae63eb13d11deb82407945f48e4dd186905477155a624dd0787 SHA512 50a4cbb59e7411ccbdf6a135877b3103bee5dd58511b9030556df9a076c806032302e02ee067d917ba6b1d7e6a8233d93b3335ac21a14c59c00240150013d6b5
diff --git a/media-gfx/kio-mobi-thumbnailer/kio-mobi-thumbnailer-23.08.5.ebuild b/media-gfx/kio-mobi-thumbnailer/kio-mobi-thumbnailer-23.08.5.ebuild
new file mode 100644
index 000000000000..2c151ad528c0
--- /dev/null
+++ b/media-gfx/kio-mobi-thumbnailer/kio-mobi-thumbnailer-23.08.5.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_NAME="kdegraphics-thumbnailers"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.106.0
+QTMIN=5.15.9
+inherit ecm gear.kde.org
+
+DESCRIPTION="KIO thumbnail generator for Mobipocket files"
+HOMEPAGE="https://apps.kde.org/kdegraphics_thumbnailers/"
+
+LICENSE="GPL-2+"
+SLOT="5"
+KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv x86"
+
+DEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=kde-apps/kdegraphics-mobipocket-${PVCUT}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+"
+RDEPEND="${DEPEND}
+	!<kde-apps/thumbnailers-23.08.5-r1:5
+"
+
+src_prepare() {
+	ecm_src_prepare
+	ecm_punt_kf_module Archive
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_ps=OFF
+		-DBUILD_blend=OFF
+		-DCMAKE_DISABLE_FIND_PACKAGE_KF5KExiv2=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_KF5KDcraw=ON
+	)
+
+	ecm_src_configure
+}
diff --git a/media-gfx/kio-mobi-thumbnailer/kio-mobi-thumbnailer-24.05.2.ebuild b/media-gfx/kio-mobi-thumbnailer/kio-mobi-thumbnailer-24.05.2.ebuild
new file mode 100644
index 000000000000..ff9f71ee7a35
--- /dev/null
+++ b/media-gfx/kio-mobi-thumbnailer/kio-mobi-thumbnailer-24.05.2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_NAME="kdegraphics-thumbnailers"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.3.0
+QTMIN=6.6.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="KIO thumbnail generator for Mobipocket files"
+HOMEPAGE="https://apps.kde.org/kdegraphics_thumbnailers/"
+
+LICENSE="GPL-2+"
+SLOT="6"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui]
+	>=kde-apps/kdegraphics-mobipocket-${PVCUT}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+"
+RDEPEND="${DEPEND}
+	!<kde-apps/thumbnailers-24.05.2-r1:6
+"
+
+src_prepare() {
+	ecm_src_prepare
+	ecm_punt_kf_module Archive
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_ps=OFF
+		-DBUILD_blend=OFF
+		-DCMAKE_DISABLE_FIND_PACKAGE_KExiv2Qt6=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_KDcrawQt6=ON
+	)
+
+	ecm_src_configure
+}
diff --git a/media-gfx/kio-mobi-thumbnailer/kio-mobi-thumbnailer-24.08.1.ebuild b/media-gfx/kio-mobi-thumbnailer/kio-mobi-thumbnailer-24.08.1.ebuild
new file mode 100644
index 000000000000..5333f1b82349
--- /dev/null
+++ b/media-gfx/kio-mobi-thumbnailer/kio-mobi-thumbnailer-24.08.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_NAME="kdegraphics-thumbnailers"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.5.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="KIO thumbnail generator for Mobipocket files"
+HOMEPAGE="https://apps.kde.org/kdegraphics_thumbnailers/"
+
+LICENSE="GPL-2+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui]
+	>=kde-apps/kdegraphics-mobipocket-${PVCUT}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+"
+RDEPEND="${DEPEND}
+	!<kde-apps/thumbnailers-24.05.2-r1:6
+"
+
+src_prepare() {
+	ecm_src_prepare
+	ecm_punt_kf_module Archive
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_ps=OFF
+		-DBUILD_blend=OFF
+		-DCMAKE_DISABLE_FIND_PACKAGE_KExiv2Qt6=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_KDcrawQt6=ON
+	)
+
+	ecm_src_configure
+}
diff --git a/media-gfx/kio-mobi-thumbnailer/metadata.xml b/media-gfx/kio-mobi-thumbnailer/metadata.xml
new file mode 100644
index 000000000000..9d38b76b7d3d
--- /dev/null
+++ b/media-gfx/kio-mobi-thumbnailer/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+	<upstream>
+		<bugs-to>https://bugs.kde.org/</bugs-to>
+		<remote-id type="kde-invent">graphics/kdegraphics-thumbnailers</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-gfx/kio-ps-thumbnailer/Manifest b/media-gfx/kio-ps-thumbnailer/Manifest
new file mode 100644
index 000000000000..ef0543510638
--- /dev/null
+++ b/media-gfx/kio-ps-thumbnailer/Manifest
@@ -0,0 +1,7 @@
+DIST kdegraphics-thumbnailers-23.08.5.tar.xz 49436 BLAKE2B 943ad7bd93ca5e4d80854869d4d97f7121d259a82062afb7781d1845e94cbc6ea1732aff3d3476eb6db5ffe54f8f97b352ef8977ebdccc2b173594dd3cbccd6f SHA512 77c328e9532fbd12548d4d219d6da2ad369ee14825d3cf5d142ec11afb842640e1fd01e7e1f911147c93e7e93893b9ae10be66b3d568866ed8985b5e5b38663f
+DIST kdegraphics-thumbnailers-24.05.2.tar.xz 48756 BLAKE2B f5c2932c89fe38933c764171c31edfc0c11b7d6a34170e283a5f7ebc221866a2005897e580f1076b4a8bd9438d2fc39ff4b5da99abe90ce41c7465f35b7f6479 SHA512 eafc1eaf48fe7fef2556b1ba39beec0032b3fbc3ad01856517c86e6d56a2d24c488db9ca6cd9669a5b70c16ce44b6006c0a9e48216af08d03fbd805973158503
+DIST kdegraphics-thumbnailers-24.08.1.tar.xz 49016 BLAKE2B 1c29734d1371f970271e9bf0dd0750d80f5c19b78c7cdb90bc0665ee748cf4aa0414047796d96b21c207b3f6071e0e3a5fb83126d0f4f919793070f335180457 SHA512 d1b15005e080581ce31d96271bf8827a969ef95b3703ec80858b2d26fc5dd615d408471065647e0d7b7fef39b9e9af18fcf1af56594be13df5f3119fa81c2134
+EBUILD kio-ps-thumbnailer-23.08.5.ebuild 891 BLAKE2B 3c02646c14ee63032e2324bba9466680881a3ae03f41b8b9b0f1341227a800e3fc8313b2168526984afe6f9dbb1925cc7e4290bbf4bff3f0f6e95e4bcc8ee3c0 SHA512 000aab394868e1a260f6c7065810f727eb6da1bea3a76a56230c1194dc9dfe340982abe56e54a957290754dcaf76032e2c7dac33548cc6893cb972acc8cbe3f3
+EBUILD kio-ps-thumbnailer-24.05.2.ebuild 889 BLAKE2B 0d9aaa5c53de1d25f08d8d43ae277269970926e943debc314a4fb724ddad9719497c73ff36bc66ec932da03adbac975b32fddc65f9071a3ed1483db1603d8a65 SHA512 a56a11b3cceff9d2e8fa2774ff31a6c773d875ceed883e4989bd549a33a6c02e7878f70536c0829bfb4ef504832c074044e35f14450db6c644adc15c62180e1e
+EBUILD kio-ps-thumbnailer-24.08.1.ebuild 891 BLAKE2B 4c5ac8b57474148cf88b291a6242aa71c84a309340b5e249ec0eab583424357e0e0a46d970aa08809a3759e7a26be65fa985f99469a9f9f5651b7a805861ca2b SHA512 7aab6771f812694bb9414c8fb19dfef890f00cac29419b852ae9c70ef0f3dd74d6146f16221762aa8dc4ef191e0262a70b8a5623acad125fc9246d9beaf23403
+MISC metadata.xml 395 BLAKE2B e3794bfe43e720ba54df37c3174ab9754e3c09ff986b80ce66511bf6fb739344eb49d4cf1e6daae63eb13d11deb82407945f48e4dd186905477155a624dd0787 SHA512 50a4cbb59e7411ccbdf6a135877b3103bee5dd58511b9030556df9a076c806032302e02ee067d917ba6b1d7e6a8233d93b3335ac21a14c59c00240150013d6b5
diff --git a/media-gfx/kio-ps-thumbnailer/kio-ps-thumbnailer-23.08.5.ebuild b/media-gfx/kio-ps-thumbnailer/kio-ps-thumbnailer-23.08.5.ebuild
new file mode 100644
index 000000000000..c6e1caecc1b5
--- /dev/null
+++ b/media-gfx/kio-ps-thumbnailer/kio-ps-thumbnailer-23.08.5.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_NAME="kdegraphics-thumbnailers"
+KFMIN=5.106.0
+QTMIN=5.15.9
+inherit ecm gear.kde.org
+
+DESCRIPTION="KIO thumbnail generator for DVI, EPS, PDF and PS files"
+HOMEPAGE="https://apps.kde.org/kdegraphics_thumbnailers/"
+
+LICENSE="GPL-2+"
+SLOT="5"
+KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv x86"
+
+DEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+"
+RDEPEND="${DEPEND}
+	!<kde-apps/thumbnailers-23.08.5-r1:5
+	app-text/dvipsk
+	app-text/ghostscript-gpl
+"
+
+src_prepare() {
+	ecm_src_prepare
+	ecm_punt_kf_module Archive
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_blend=OFF
+		-DDISABLE_MOBIPOCKET=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_QMobipocket=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_KF5KExiv2=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_KF5KDcraw=ON
+	)
+
+	ecm_src_configure
+}
diff --git a/media-gfx/kio-ps-thumbnailer/kio-ps-thumbnailer-24.05.2.ebuild b/media-gfx/kio-ps-thumbnailer/kio-ps-thumbnailer-24.05.2.ebuild
new file mode 100644
index 000000000000..3042e12f1b3b
--- /dev/null
+++ b/media-gfx/kio-ps-thumbnailer/kio-ps-thumbnailer-24.05.2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_NAME="kdegraphics-thumbnailers"
+KFMIN=6.3.0
+QTMIN=6.6.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="KIO thumbnail generator for DVI, EPS, PDF and PS files"
+HOMEPAGE="https://apps.kde.org/kdegraphics_thumbnailers/"
+
+LICENSE="GPL-2+"
+SLOT="6"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui]
+	>=kde-frameworks/kio-${KFMIN}:6
+"
+RDEPEND="${DEPEND}
+	!<kde-apps/thumbnailers-24.05.2-r1:6
+	app-text/dvipsk
+	app-text/ghostscript-gpl
+"
+
+src_prepare() {
+	ecm_src_prepare
+	ecm_punt_kf_module Archive
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_blend=OFF
+		-DDISABLE_MOBIPOCKET=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_QMobipocket6=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_KExiv2Qt6=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_KDcrawQt6=ON
+	)
+
+	ecm_src_configure
+}
diff --git a/media-gfx/kio-ps-thumbnailer/kio-ps-thumbnailer-24.08.1.ebuild b/media-gfx/kio-ps-thumbnailer/kio-ps-thumbnailer-24.08.1.ebuild
new file mode 100644
index 000000000000..e0ab87727184
--- /dev/null
+++ b/media-gfx/kio-ps-thumbnailer/kio-ps-thumbnailer-24.08.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_NAME="kdegraphics-thumbnailers"
+KFMIN=6.5.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="KIO thumbnail generator for DVI, EPS, PDF and PS files"
+HOMEPAGE="https://apps.kde.org/kdegraphics_thumbnailers/"
+
+LICENSE="GPL-2+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui]
+	>=kde-frameworks/kio-${KFMIN}:6
+"
+RDEPEND="${DEPEND}
+	!<kde-apps/thumbnailers-24.05.2-r1:6
+	app-text/dvipsk
+	app-text/ghostscript-gpl
+"
+
+src_prepare() {
+	ecm_src_prepare
+	ecm_punt_kf_module Archive
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_blend=OFF
+		-DDISABLE_MOBIPOCKET=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_QMobipocket6=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_KExiv2Qt6=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_KDcrawQt6=ON
+	)
+
+	ecm_src_configure
+}
diff --git a/media-gfx/kio-ps-thumbnailer/metadata.xml b/media-gfx/kio-ps-thumbnailer/metadata.xml
new file mode 100644
index 000000000000..9d38b76b7d3d
--- /dev/null
+++ b/media-gfx/kio-ps-thumbnailer/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+	<upstream>
+		<bugs-to>https://bugs.kde.org/</bugs-to>
+		<remote-id type="kde-invent">graphics/kdegraphics-thumbnailers</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-gfx/kio-raw-thumbnailer/Manifest b/media-gfx/kio-raw-thumbnailer/Manifest
new file mode 100644
index 000000000000..7d7cc2471d87
--- /dev/null
+++ b/media-gfx/kio-raw-thumbnailer/Manifest
@@ -0,0 +1,7 @@
+DIST kdegraphics-thumbnailers-23.08.5.tar.xz 49436 BLAKE2B 943ad7bd93ca5e4d80854869d4d97f7121d259a82062afb7781d1845e94cbc6ea1732aff3d3476eb6db5ffe54f8f97b352ef8977ebdccc2b173594dd3cbccd6f SHA512 77c328e9532fbd12548d4d219d6da2ad369ee14825d3cf5d142ec11afb842640e1fd01e7e1f911147c93e7e93893b9ae10be66b3d568866ed8985b5e5b38663f
+DIST kdegraphics-thumbnailers-24.05.2.tar.xz 48756 BLAKE2B f5c2932c89fe38933c764171c31edfc0c11b7d6a34170e283a5f7ebc221866a2005897e580f1076b4a8bd9438d2fc39ff4b5da99abe90ce41c7465f35b7f6479 SHA512 eafc1eaf48fe7fef2556b1ba39beec0032b3fbc3ad01856517c86e6d56a2d24c488db9ca6cd9669a5b70c16ce44b6006c0a9e48216af08d03fbd805973158503
+DIST kdegraphics-thumbnailers-24.08.1.tar.xz 49016 BLAKE2B 1c29734d1371f970271e9bf0dd0750d80f5c19b78c7cdb90bc0665ee748cf4aa0414047796d96b21c207b3f6071e0e3a5fb83126d0f4f919793070f335180457 SHA512 d1b15005e080581ce31d96271bf8827a969ef95b3703ec80858b2d26fc5dd615d408471065647e0d7b7fef39b9e9af18fcf1af56594be13df5f3119fa81c2134
+EBUILD kio-raw-thumbnailer-23.08.5.ebuild 847 BLAKE2B ad607b3ce62e690781508dd78bdbcaaaf7bba07613088d1fc45dc49d2b6ad425cc84647a69ae899ca5d9d479acca0165fdf701a4dce00c8033a747f5bc101476 SHA512 933b3ac994eccf59b1951b54443df89de5b61386ff71a101c4aff16ec022f86df45d542db95f2abda5f4d35327a2ac88afd9996598d3f83b3dd6190688ac029e
+EBUILD kio-raw-thumbnailer-24.05.2.ebuild 845 BLAKE2B 8d7700de811ba4594389ebcbc90135ec50e4bada109da59d6e7ac398c2bca27d3841096500cec1ddbfc72d3403691d87537a71b75f735f56289019ca4ea0b579 SHA512 f923c11d089679f66b1be9975fd4fb3e747aeb89f65e42f8795a2fc79c67c6c00a7e30f83a21ebd810457ecddeda5d26ab6748a749c5156a38464359ab123298
+EBUILD kio-raw-thumbnailer-24.08.1.ebuild 847 BLAKE2B f17933d56e401580dd8073ad355cf4e2abf315d3d595272769c69fcab4566ff5d4a4902098660ed74adb4b911f624c9be56d3ca32b626d6fdb9b4015bc245bfe SHA512 79315aecb999965da39cd092759bfa659f06985130e2dd100ac6a4afb5e2bb2cf4dad6f2054783386b732d22e0c6176cca6c6b5aa84a711c8a9c01a2cc29db41
+MISC metadata.xml 395 BLAKE2B e3794bfe43e720ba54df37c3174ab9754e3c09ff986b80ce66511bf6fb739344eb49d4cf1e6daae63eb13d11deb82407945f48e4dd186905477155a624dd0787 SHA512 50a4cbb59e7411ccbdf6a135877b3103bee5dd58511b9030556df9a076c806032302e02ee067d917ba6b1d7e6a8233d93b3335ac21a14c59c00240150013d6b5
diff --git a/media-gfx/kio-raw-thumbnailer/kio-raw-thumbnailer-23.08.5.ebuild b/media-gfx/kio-raw-thumbnailer/kio-raw-thumbnailer-23.08.5.ebuild
new file mode 100644
index 000000000000..632c1da4fcfb
--- /dev/null
+++ b/media-gfx/kio-raw-thumbnailer/kio-raw-thumbnailer-23.08.5.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_NAME="kdegraphics-thumbnailers"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.106.0
+QTMIN=5.15.9
+inherit ecm gear.kde.org
+
+DESCRIPTION="KIO thumbnail generator for RAW files"
+HOMEPAGE="https://apps.kde.org/kdegraphics_thumbnailers/"
+
+LICENSE="GPL-2+"
+SLOT="5"
+KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv x86"
+
+DEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=kde-apps/libkdcraw-${PVCUT}:5
+	>=kde-apps/libkexiv2-${PVCUT}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+"
+RDEPEND="${DEPEND}
+	!<kde-apps/thumbnailers-23.08.5-r1:5
+"
+
+src_prepare() {
+	ecm_src_prepare
+	ecm_punt_kf_module Archive
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_blend=OFF
+		-DBUILD_ps=OFF
+		-DDISABLE_MOBIPOCKET=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_QMobipocket=ON
+	)
+
+	ecm_src_configure
+}
diff --git a/media-gfx/kio-raw-thumbnailer/kio-raw-thumbnailer-24.05.2.ebuild b/media-gfx/kio-raw-thumbnailer/kio-raw-thumbnailer-24.05.2.ebuild
new file mode 100644
index 000000000000..335ba17313cc
--- /dev/null
+++ b/media-gfx/kio-raw-thumbnailer/kio-raw-thumbnailer-24.05.2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_NAME="kdegraphics-thumbnailers"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.3.0
+QTMIN=6.6.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="KIO thumbnail generator for RAW files"
+HOMEPAGE="https://apps.kde.org/kdegraphics_thumbnailers/"
+
+LICENSE="GPL-2+"
+SLOT="6"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui]
+	>=kde-apps/libkdcraw-${PVCUT}:6
+	>=kde-apps/libkexiv2-${PVCUT}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+"
+RDEPEND="${DEPEND}
+	!<kde-apps/thumbnailers-24.05.2-r1:6
+"
+
+src_prepare() {
+	ecm_src_prepare
+	ecm_punt_kf_module Archive
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_blend=OFF
+		-DBUILD_ps=OFF
+		-DDISABLE_MOBIPOCKET=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_QMobipocket6=ON
+	)
+
+	ecm_src_configure
+}
diff --git a/media-gfx/kio-raw-thumbnailer/kio-raw-thumbnailer-24.08.1.ebuild b/media-gfx/kio-raw-thumbnailer/kio-raw-thumbnailer-24.08.1.ebuild
new file mode 100644
index 000000000000..369f5f44090d
--- /dev/null
+++ b/media-gfx/kio-raw-thumbnailer/kio-raw-thumbnailer-24.08.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_NAME="kdegraphics-thumbnailers"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.5.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="KIO thumbnail generator for RAW files"
+HOMEPAGE="https://apps.kde.org/kdegraphics_thumbnailers/"
+
+LICENSE="GPL-2+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui]
+	>=kde-apps/libkdcraw-${PVCUT}:6
+	>=kde-apps/libkexiv2-${PVCUT}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+"
+RDEPEND="${DEPEND}
+	!<kde-apps/thumbnailers-24.05.2-r1:6
+"
+
+src_prepare() {
+	ecm_src_prepare
+	ecm_punt_kf_module Archive
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_blend=OFF
+		-DBUILD_ps=OFF
+		-DDISABLE_MOBIPOCKET=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_QMobipocket6=ON
+	)
+
+	ecm_src_configure
+}
diff --git a/media-gfx/kio-raw-thumbnailer/metadata.xml b/media-gfx/kio-raw-thumbnailer/metadata.xml
new file mode 100644
index 000000000000..9d38b76b7d3d
--- /dev/null
+++ b/media-gfx/kio-raw-thumbnailer/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+	<upstream>
+		<bugs-to>https://bugs.kde.org/</bugs-to>
+		<remote-id type="kde-invent">graphics/kdegraphics-thumbnailers</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index c4158c97a6f4..697fca9c36db 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -3,7 +3,14 @@ AUX krita-5.1.5-libjxl-0.9.patch 4162 BLAKE2B 410bf2fe6ce56771a0d2ae9fcbdeae2eb3
 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
 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 3781 BLAKE2B ca13633df6861d9159cae079b667123280d3b4ed73e707e648b710782219999f67e8f7f806471f8eddb8c95c2e3f0a797434157a4fcc5db3cfb2a5430698ba05 SHA512 b12e60d70eb03c76c6a5dbb3df451d6666f37d07060fe90601b8c569d130ac1bb7d71ef95a6d87faa58a627b5a3823dd468eee8d0be7b370960e81957aec3316
-MISC metadata.xml 647 BLAKE2B 38b83c96bc3e88c491faccb089e507ca5a9455a91dc9615994152d1e95ae00a0f82b8b6f3f959e20ff7af3907326996be6849abe0bcd8cfe666912b9e68d3584 SHA512 477562e4be9a68b7eb45520da3d709f39fbe7bff9ca936e61bd0aa80b157672566875d604ed926b646a7f60c7695e4915f63a526e762be79070f30728af4db40
+EBUILD krita-5.2.3.ebuild 3789 BLAKE2B 6b55cc22a1dfd1766561b37c9b812907e36354021099e1613bc5a0182f19d4653c3db574311fd65cd7d7fbab689d3a80f02b638ee188383b7fb56d381c32c78d SHA512 5e03c9129ddde0c1c595beb8af2772f1056c52f9a55c3e66257b2d94f5c88fa00e8e62f85651426a96a7adce4c3e8931c3a81b6dceda66e3c3c18fd607810af9
+EBUILD krita-5.2.6.ebuild 3738 BLAKE2B e09b053369e25ca24d7814917e5b88b37b56796559435c8a9750bfbc4da6a91745f9e9fe22385679456986f4c13929abfab4c6436c816e5ba359e282ccf1a44e SHA512 404b398e3d6436163d73e39538150aba4c201b9271a92b01ee887d03f865768d6616d67aadfe209acbf492222d8d1b45f378945104d3da89dec9cd8347cf800d
+MISC metadata.xml 832 BLAKE2B 53e632c3407b42c5d0f165bdcf67dfdd3a30bf1ec3c19ea79b90323ccbe5415e7cd34fbc79ebbb0e513359f28f381e3dac5d2534daf9ae7696f83ea77acb8130 SHA512 6cb02292d63602c80451759f6b935f65c9dfc2f01b32ac540d8cd4422ab2a70e04261fabc67b570c60e116f03e34d0165c8db6dcf9595db6cfa10849d8066336
diff --git a/media-gfx/krita/files/krita-5.2.2-fftw.patch b/media-gfx/krita/files/krita-5.2.2-fftw.patch
new file mode 100644
index 000000000000..b805be6a21c6
--- /dev/null
+++ b/media-gfx/krita/files/krita-5.2.2-fftw.patch
@@ -0,0 +1,18 @@
+Disable the cmake find_package method. It will instead fallback to use pkgconfig.
+Without this, it will fail to find fftw3 and error out.
+
+--- a/cmake/modules/FindFFTW3.cmake	2023-11-24 19:59:45.904059240 +0100
++++ b/cmake/modules/FindFFTW3.cmake	2023-11-24 20:00:17.029563107 +0100
+@@ -74,9 +74,9 @@
+ endforeach()
+ mark_as_advanced(PKG_FFTW_CONFIG_DIR)
+ 
+-find_package(FFTW3 QUIET NO_MODULE
+-    HINTS ${PKG_FFTW_CONFIG_DIR} /usr/lib/cmake/fftw3 /usr/local/lib/cmake/fftw3
+-)
++#find_package(FFTW3 QUIET NO_MODULE
++#    HINTS ${PKG_FFTW_CONFIG_DIR} /usr/lib/cmake/fftw3 /usr/local/lib/cmake/fftw3
++#)
+ mark_as_advanced(FFTW3_DIR)
+ 
+ # if we found the FFTW3 CMake package then we can start
diff --git a/media-gfx/krita/files/krita-5.2.3-tests-optional.patch b/media-gfx/krita/files/krita-5.2.3-tests-optional.patch
new file mode 100644
index 000000000000..48d9e314a295
--- /dev/null
+++ b/media-gfx/krita/files/krita-5.2.3-tests-optional.patch
@@ -0,0 +1,90 @@
+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()
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1246,7 +1246,9 @@
+                            ${CMAKE_CURRENT_BINARY_DIR}
+ )
+ 
++if(BUILD_TESTING)
+ add_subdirectory(sdk/tests)
++endif()
+ 
+ add_subdirectory(libs)
+ add_subdirectory(plugins)
diff --git a/media-gfx/krita/files/krita-5.2.3-znver4-xsimd.patch b/media-gfx/krita/files/krita-5.2.3-znver4-xsimd.patch
new file mode 100644
index 000000000000..df5fffb41d47
--- /dev/null
+++ b/media-gfx/krita/files/krita-5.2.3-znver4-xsimd.patch
@@ -0,0 +1,38 @@
+https://bugs.gentoo.org/936296
+https://invent.kde.org/graphics/krita/-/commit/cf2c74220b7edfae53a0715346cb4e2c7dfc38ae
+
+From cf2c74220b7edfae53a0715346cb4e2c7dfc38ae Mon Sep 17 00:00:00 2001
+From: Dmitry Kazakov <dimula73@gmail.com>
+Date: Mon, 26 Aug 2024 14:38:03 +0200
+Subject: [PATCH] Don't use xsimd::default_arch in the pixel scaler code
+
+Gentoo seems to build Krita with a global -march=znver4 flag,
+which causes "scalar" version of the code to be compiled with
+AVX512. Even though it is not how the system is supposed to work
+(and this avx512-optimization will never be used in real runtime),
+we shouldn't fail compilation.
+
+https://bugs.gentoo.org/936296
+https://github.com/xtensor-stack/xsimd/issues/1044
+--- a/libs/pigment/KoOptimizedPixelDataScalerU8ToU16.h
++++ b/libs/pigment/KoOptimizedPixelDataScalerU8ToU16.h
+@@ -28,7 +28,7 @@ public:
+         const int numColorChannels = m_channelsPerPixel * numColumns;
+ 
+ #if defined(HAVE_XSIMD) && XSIMD_WITH_AVX2
+-        using uint16_avx_v = xsimd::batch<uint16_t, xsimd::default_arch>;
++        using uint16_avx_v = xsimd::batch<uint16_t, xsimd::avx2>;
+         using uint16_v = xsimd::batch<uint16_t, xsimd::sse4_1>;
+         using uint8_v = xsimd::batch<uint8_t, xsimd::sse4_1>;
+ 
+@@ -129,7 +129,7 @@ public:
+         const int numColorChannels = m_channelsPerPixel * numColumns;
+ 
+ #if defined(HAVE_XSIMD) && XSIMD_WITH_AVX2
+-        using uint16_avx_v = xsimd::batch<uint16_t, xsimd::default_arch>;
++        using uint16_avx_v = xsimd::batch<uint16_t, xsimd::avx2>;
+         using uint16_v = xsimd::batch<uint16_t, xsimd::sse4_1>;
+ 
+         const int channelsPerAvx2Block = 32;
+-- 
+GitLab
diff --git a/media-gfx/krita/krita-5.2.3.ebuild b/media-gfx/krita/krita-5.2.3.ebuild
new file mode 100644
index 000000000000..6b6678994687
--- /dev/null
+++ b/media-gfx/krita/krita-5.2.3.ebuild
@@ -0,0 +1,135 @@
+# 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.115.0
+QTMIN=5.15.12
+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"
+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 jpeg2k jpegxl +mypaint-brush-engine openexr pdf media +raw +xsimd webp"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# bug 630508
+RESTRICT="test"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-libs/boost:=
+	dev-libs/libunibreak:=
+	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:= )
+	jpeg2k? ( media-libs/openjpeg:= )
+	jpegxl? ( >=media-libs/libjxl-0.7.0_pre20220825:= )
+	heif? ( >=media-libs/libheif-1.11:=[x265] )
+	media? ( media-libs/mlt:= )
+	mypaint-brush-engine? ( media-libs/libmypaint:= )
+	openexr? ( media-libs/openexr:= )
+	pdf? ( app-text/poppler[qt5] )
+	raw? ( kde-apps/libkdcraw:5 )
+	webp? ( >=media-libs/libwebp-1.2.0:= )
+	xsimd? ( >=dev-cpp/xsimd-13.0.0 )
+
+"
+DEPEND="${RDEPEND}
+	dev-libs/immer
+	dev-libs/lager
+	dev-libs/zug
+"
+BDEPEND="
+	dev-cpp/eigen:3
+	dev-lang/perl
+	sys-devel/gettext
+"
+
+PATCHES=(
+	# downstream
+	"${FILESDIR}"/${P}-tests-optional.patch
+	"${FILESDIR}"/${PN}-5.2.2-fftw.patch # bug 913518
+	# git master
+	"${FILESDIR}"/${PN}-5.1.5-sip-6.8.patch # bug 919139
+	"${FILESDIR}"/${PN}-5.2.3-znver4-xsimd.patch # bug 936296
+)
+
+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
+		$(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 jpeg2k OpenJPEG)
+		$(cmake_use_find_package jpegxl JPEGXL)
+		$(cmake_use_find_package media Mlt7)
+		$(cmake_use_find_package mypaint-brush-engine LibMyPaint)
+		$(cmake_use_find_package openexr OpenEXR)
+		$(cmake_use_find_package pdf Poppler)
+		$(cmake_use_find_package raw KF5KDcraw)
+		$(cmake_use_find_package webp WebP)
+		$(cmake_use_find_package xsimd xsimd)
+	)
+
+	ecm_src_configure
+}
diff --git a/media-gfx/krita/krita-5.2.6.ebuild b/media-gfx/krita/krita-5.2.6.ebuild
new file mode 100644
index 000000000000..0a1c86338154
--- /dev/null
+++ b/media-gfx/krita/krita-5.2.6.ebuild
@@ -0,0 +1,134 @@
+# 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.115.0
+QTMIN=5.15.12
+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"
+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 jpeg2k jpegxl +mypaint-brush-engine openexr pdf media +raw +xsimd webp"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# bug 630508
+RESTRICT="test"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-libs/boost:=
+	dev-libs/libunibreak:=
+	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:= )
+	jpeg2k? ( media-libs/openjpeg:= )
+	jpegxl? ( >=media-libs/libjxl-0.7.0_pre20220825:= )
+	heif? ( >=media-libs/libheif-1.11:=[x265] )
+	media? ( media-libs/mlt:= )
+	mypaint-brush-engine? ( media-libs/libmypaint:= )
+	openexr? ( media-libs/openexr:= )
+	pdf? ( app-text/poppler[qt5] )
+	raw? ( kde-apps/libkdcraw:5 )
+	webp? ( >=media-libs/libwebp-1.2.0:= )
+	xsimd? ( >=dev-cpp/xsimd-13.0.0 )
+
+"
+DEPEND="${RDEPEND}
+	dev-libs/immer
+	dev-libs/lager
+	dev-libs/zug
+"
+BDEPEND="
+	dev-cpp/eigen:3
+	dev-lang/perl
+	sys-devel/gettext
+"
+
+PATCHES=(
+	# downstream
+	"${FILESDIR}"/${PN}-5.2.3-tests-optional.patch
+	"${FILESDIR}"/${PN}-5.2.2-fftw.patch # bug 913518
+	# git master
+	"${FILESDIR}"/${PN}-5.1.5-sip-6.8.patch # bug 919139
+)
+
+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
+		$(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 jpeg2k OpenJPEG)
+		$(cmake_use_find_package jpegxl JPEGXL)
+		$(cmake_use_find_package media Mlt7)
+		$(cmake_use_find_package mypaint-brush-engine LibMyPaint)
+		$(cmake_use_find_package openexr OpenEXR)
+		$(cmake_use_find_package pdf Poppler)
+		$(cmake_use_find_package raw KF5KDcraw)
+		$(cmake_use_find_package webp WebP)
+		$(cmake_use_find_package xsimd xsimd)
+	)
+
+	ecm_src_configure
+}
diff --git a/media-gfx/krita/metadata.xml b/media-gfx/krita/metadata.xml
index ff6c095b3acd..c586507e3736 100644
--- a/media-gfx/krita/metadata.xml
+++ b/media-gfx/krita/metadata.xml
@@ -10,7 +10,9 @@
 	</upstream>
 	<use>
 		<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/libbgcode/Manifest b/media-gfx/libbgcode/Manifest
index 213df9933b69..cfad3e9ac0cf 100644
--- a/media-gfx/libbgcode/Manifest
+++ b/media-gfx/libbgcode/Manifest
@@ -1,3 +1,5 @@
-DIST libbgcode-0.0.20240328.tar.gz 456463 BLAKE2B 7b9995e94d8f5081723ef435ef9bfe5ca75fbd09d2a8f5e6ff786fb5c4c9d6079a7f5a0b0d537b3b8a044c7126258e31ac411ef6a5aff287bf490672257506ee SHA512 13d5fe20b1faee5068a3c385041a680de5cdcec7fc34bc3f28c52bdab4d6b9e6170ad5ce5bb78399e956fc7f3fb5409e8e4adf0ff4850be686b3caf4d76ee3aa
-EBUILD libbgcode-0.0.20240328.ebuild 769 BLAKE2B 0e7a698bbfac9e3a287f95b641d914145f27d1b84493ff06221d2b3046f806b6386d4ebf9e4bd9b801feb8739415540de2aed3faef782e8a0b9a7f0344a8b271 SHA512 73f09470c2a97f46f98c7b79aecc0de7429ca6de8233a7d55843eaec03ca8faa66b111fbaab356617971153f9f25eb140d01b18bdaf1c5258e6e93c0250fd69f
+DIST libbgcode-0.0.20240730.tar.gz 456671 BLAKE2B a15e903e42090eff3945f446f7d805ceabad533a2edcc9e4c82d99bac7aa42e9f10470f5ee41ed449799d9bc318c9097439a6534607a00d0bfeb2e2dea252b79 SHA512 b448d9ace946d85a4decc4a2cc05e1a41c64ba49968db1f818ba5974120f458159d5b639d5501a98daf4544a483366cd0e299c052f21577bb5ad763f7220d7e3
+DIST libbgcode-0.0.20240903.tar.gz 456751 BLAKE2B 93cd8eb83083581ba1ba735c6820dc0ead18d13ca0613387559d610f39c8011881bcc92ffec65fbcb40113b2b877050c15c7816d6db063698ce7ba5df7b35eda SHA512 86e9d85f0e52ebde853979e79639dc4424e26686fe55c45d78ca683cf32d8ec059976d43ffda9339a41892d30ebb267f8c360851889ad0a48ced874c27546f04
+EBUILD libbgcode-0.0.20240730.ebuild 769 BLAKE2B 59f6ad1854677761895653c2810d91560b0e82bd0ac423ec0f259c3dedea26d70ffb9163aa4a6bf107156716df813a4424397e49c99e5e464a430fcdfc9359de SHA512 d4e8eb634555dbd094da4b3992e10b3047e8c3d57026deb57933a9e85b2a31d43ded717d845f9a402a64c4d7b6f79efae9ebe16e70cbfce2b06a0747b3fda0ca
+EBUILD libbgcode-0.0.20240903.ebuild 770 BLAKE2B 22c01f20d4350d8328ac9dc60a47c8167386ef6fe27e887124672b38b955e949f0cba1a225242dca2e8e9adea1dc96d7b2f84d7bc12ec9139d4b8c31682fa116 SHA512 aeef6a4f591f5a5490e65347ec5f8a570fc4476efced843f864f29e2127205980e2376169d1a14326f11d0d6335e213de9fd4f7510f60b4b143ea540b9fbdb90
 MISC metadata.xml 517 BLAKE2B f13be19479e8ade30b867081f8014821be2c5650b407890268e6cab65330bd4b8e3ab37e6cba531f029ebb0499d0cb7269ccb17b309b15105f6bb6aa94b5c42e SHA512 0d09893294fc40e9b52bbdf7f8f31e075c1e8839fd90c2b9656b70d30ab52f088527ab2d1ffec797ecb1e309ea7d40bb48d571eafd19eb3a2592aef4e7c918c0
diff --git a/media-gfx/libbgcode/libbgcode-0.0.20240328.ebuild b/media-gfx/libbgcode/libbgcode-0.0.20240730.ebuild
index 93a7ed159461..c53e99967c5c 100644
--- a/media-gfx/libbgcode/libbgcode-0.0.20240328.ebuild
+++ b/media-gfx/libbgcode/libbgcode-0.0.20240730.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 inherit cmake
 
-LIBBGCODE_COMMIT=8ae75bd0eea622f0e34cae311b3bd065b55eae9b
+LIBBGCODE_COMMIT=5347c3399ec933f590d1f96903a406647f287d8f
 
 DESCRIPTION="Prusa Block & Binary G-code reader / writer / converter"
 HOMEPAGE="https://github.com/prusa3d/libbgcode"
diff --git a/media-gfx/libbgcode/libbgcode-0.0.20240903.ebuild b/media-gfx/libbgcode/libbgcode-0.0.20240903.ebuild
new file mode 100644
index 000000000000..938eb7efa59a
--- /dev/null
+++ b/media-gfx/libbgcode/libbgcode-0.0.20240903.ebuild
@@ -0,0 +1,35 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+LIBBGCODE_COMMIT=3db61e45713932b4a9cdd469aa567d65e0095d00
+
+DESCRIPTION="Prusa Block & Binary G-code reader / writer / converter"
+HOMEPAGE="https://github.com/prusa3d/libbgcode"
+SRC_URI="https://github.com/prusa3d/libbgcode/archive/${LIBBGCODE_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+S="${WORKDIR}/${PN}-${LIBBGCODE_COMMIT}"
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/heatshrink-0.4.1
+	>=sys-libs/zlib-1.0
+"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+	test? ( =dev-cpp/catch-2*:0 )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DLibBGCode_BUILD_TESTS=$(usex test)
+	)
+	cmake_src_configure
+}
diff --git a/media-gfx/libimagequant/Manifest b/media-gfx/libimagequant/Manifest
index 061002b635a7..cd0172817da8 100644
--- a/media-gfx/libimagequant/Manifest
+++ b/media-gfx/libimagequant/Manifest
@@ -38,8 +38,8 @@ DIST unicode-ident-1.0.12.crate 42168 BLAKE2B 4cede03c08758ccd6bf53a0d0057d7542d
 DIST version_check-0.9.4.crate 14895 BLAKE2B fa1fa4008af165bfc1fdbe560488afd9d232cfafee94104fbcc4cbc52f234849bff9ddfa88109a1ac682f6d9c1d86b0459893d223f64e65adc08966aaf93dc89 SHA512 b172dc9a3759a4a683ffc39b9a40b03b9974b626a088217de87090466cef695226557c226cf3e469b2b25ee7297b7eb0d7719878cab42457f80146a81943c0c8
 DIST zerocopy-0.7.20.crate 121557 BLAKE2B 24e63690b03c5becade47aa7ed16ef7a3d482c4cc8d0dfcf470f01f7592e3a704e4c52f0ab361b6fca4af18f977e33ff2bb4feb64d13daa1fcb62af9f9731be5 SHA512 fc3f883e4cfa38d01443841242a64575e69fb2ce0cfcdd71a28dd4ccb95e383ea1839a199fb13a58f9faf7608720a38cb0537612d7d832c3582946ee638886a0
 DIST zerocopy-derive-0.7.20.crate 528379 BLAKE2B 247ab986cb720903df383429a6785c7dec230f6888246a9a7539a1bc8061601b27cea8baf4db2fab491fb32842901466ac32cc80504b3eaf35c25cd1a27ec9e8 SHA512 3c76100c3c9c1a5aae39750448f8ed37069be8e65cc74d67cc983c7e69988581f98248183955294e7c8d044c7a968b6e6534b8f84d9969693cbe4c5f679d5818
-EBUILD libimagequant-2.17.0.ebuild 1385 BLAKE2B f286c1e73acec4ec45c45da09fa4a45b70ff76f5090e490180a757c933acc998ef92064aa01cea1e8630e5cf2e216c2ec9e7577888912eaf4188fe78caff8e4e SHA512 beb4f2736ea3faa92c4f8f36eb752e31391f27e794ea1e0b92b3cefe7858bd60600df5d5d644f0bb6bbcee150c3ddaca703fb38aad65379fe70bad555f0aaf30
-EBUILD libimagequant-2.18.0.ebuild 1385 BLAKE2B cf827fc28482b2da325dd14c7b3246caa669bc362afa2f034bc8a437df692002ac8f5bb9a302167bee66144300ebe2fc7172f040bae90a3172a2cb4e553027ac SHA512 52222bbb7c4ff91d6675188544786b2c7693843ee553a0ef3566b135f0f48a376da61b8dd92f8b48edaaf3a9cbff7144a12d1fa9d013b0c87bc3c035de31ac40
+EBUILD libimagequant-2.17.0.ebuild 1379 BLAKE2B 6ca72ee6ec84edd8e950ed5b512561ea3eda0f527686866313c9fd8e60fda898857b69f1bc307ba53256e403c4e94f63b6686286ae30c52285c6e9bacee89d01 SHA512 991ccda370e134a476dba916b36817e11a87a14857985d2973222b872fc6e45928aff7e5fb8dbc90b41f8e5a64942d4eb2d59cd8f3466c4aa9f58f2637b1367b
+EBUILD libimagequant-2.18.0.ebuild 1379 BLAKE2B 3e3d07bb4e879ee47f7aa92aab771200779a67b9f49bac88004f50038517418d832a4bf5ed7fbc1147207d74a5bdfaa6da0dd04aa84b46abf9118ee72b106d81 SHA512 24ca1bf46a5168a7a2bc45c4cc37fd3580576211e366c6bab3be6eb885e31d3c524dac4f10ac54d099505b8065de8088e3b49cf23227856470616d5437df111d
 EBUILD libimagequant-4.2.2.ebuild 1728 BLAKE2B b7178b42b78cbee9ac584671191165fba6c7fc36ab23ff675b0f7ef86fd53c10ee63fece727eaec33a013b06bed6b0ee77da170b9648e637faf0308c2157ed16 SHA512 2e4ce84bced1c3e731d7a369421d286a16f6c9f20efcc58e15c285a701ac3dcf835b0a1eb25739a5c843044302ebcc445054a8349d7a202294c6aca99fe6b393
-EBUILD libimagequant-4.3.0.ebuild 1203 BLAKE2B 11f74e18f0f25b86d3d98eebd262a4343ed29fef47147e8dbc8cccee71db498465a0253708c57c3d42ed98f265fa3a0b64b22b1b57fbb8a295563526ab36a703 SHA512 9d02d36954ae760873ad5a0c336848cfbf1c0a96dbb9db96deccbaf0312900d37b5b7774c962a0b65b4216ed287cd16f27ea5a474188714bc3d4177cd4072bf2
+EBUILD libimagequant-4.3.0.ebuild 1199 BLAKE2B 902a98544f4a03d9409771e42e9458113720c5d87be1ed7b89864b5745606e3967e0dba40d1d6179ff376c1282ecd8a93d911e3c3eded6d930edd06d190b95b9 SHA512 aa804f297b315ef054ad000600e5bfed8686868a961998087fcc23a6691805c744453e82ec1277f830b1b875fc0acbb88ff119e6b719db8d1188a2b67cf88734
 MISC metadata.xml 431 BLAKE2B 19ce5c802fc25f17f74073dba0473b11ea6a5820ec0726d405701c1e6b8f0a64d7019f4fe56ff0e6e43aba6cb52c34a5ac821d4bfcb8d9d6a10d0945bafc8a90 SHA512 4e22cda189c98a07cab44be95311def7b6955025d320869b55006e0e09f98c7370de40f552b556c466013b0c68b04013f36559f4970ebfd79655faf446c1e166
diff --git a/media-gfx/libimagequant/libimagequant-2.17.0.ebuild b/media-gfx/libimagequant/libimagequant-2.17.0.ebuild
index 6d059018082b..58d2884303ca 100644
--- a/media-gfx/libimagequant/libimagequant-2.17.0.ebuild
+++ b/media-gfx/libimagequant/libimagequant-2.17.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ImageOptim/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-3"
 SLOT="0/0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 IUSE="cpu_flags_x86_sse2 openmp"
 
 PATCHES=(
diff --git a/media-gfx/libimagequant/libimagequant-2.18.0.ebuild b/media-gfx/libimagequant/libimagequant-2.18.0.ebuild
index ab7503e70f89..b029927b09fa 100644
--- a/media-gfx/libimagequant/libimagequant-2.18.0.ebuild
+++ b/media-gfx/libimagequant/libimagequant-2.18.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ImageOptim/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-3"
 SLOT="0/0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 IUSE="cpu_flags_x86_sse2 openmp"
 
 PATCHES=(
diff --git a/media-gfx/libimagequant/libimagequant-4.3.0.ebuild b/media-gfx/libimagequant/libimagequant-4.3.0.ebuild
index 3834a58ebed1..55609484950f 100644
--- a/media-gfx/libimagequant/libimagequant-4.3.0.ebuild
+++ b/media-gfx/libimagequant/libimagequant-4.3.0.ebuild
@@ -19,7 +19,7 @@ LICENSE="GPL-3+"
 # Dependent crate licenses
 LICENSE+=" MIT Unicode-DFS-2016 ZLIB"
 SLOT="0/0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~s390 ~sparc"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ppc ppc64 ~s390 sparc"
 
 BDEPEND="
 	>=dev-util/cargo-c-0.9.14
diff --git a/media-gfx/librecad/Manifest b/media-gfx/librecad/Manifest
index ff414f9046dc..caf14078cec8 100644
--- a/media-gfx/librecad/Manifest
+++ b/media-gfx/librecad/Manifest
@@ -2,10 +2,13 @@ AUX librecad-2.1.3-boost-1.76.patch 1032 BLAKE2B 9c8893627fd43cb831d48e9f86472c0
 AUX librecad-2.1.3-gcc-9.patch 8494 BLAKE2B 85f7cfd7822d27c4b76b6cc9b71f9667b912ef80229e2a70110155d4b52f0e203b186ffb6a0be160d6d2aadcaf241994d7f78d81a096d7540c46b946ed7cb892 SHA512 5adb8086244ec18e78f503b7522ea79213b629d297bb07fad0c21ae1e205731fd544aff7e979f1cc5709542a23311c771d61f13f4ba09f34baff9a24deae5eed
 AUX librecad-2.1.3-qt-5.11.patch 1396 BLAKE2B 80e637b724df81dce60c17354bed56a2329dd4c3f445b40ea18a4a49614f2ee34114e1b6cc008b29e2dbd7b65c53340aaa447173f6f4d23d80e1a8809131aae7 SHA512 5e4ae43ac89fc8acf779fec9e062cac3896f0e41b0bf7fdab91ef128ab1a20a4ecda71ef332d9af7403f11a813323cc509e0682e5ffdf97786599271a2711f25
 AUX librecad-2.1.3-qt-5.15.patch 1270 BLAKE2B 0947b13ff328e4f1c3ac04d846e7ed372d76d4858cecff5fe4ff8fc8c3c1558cd0e9ac53354e1f0b5b1d137db09c8205f034df9356b9b9e3206a611608fb8166 SHA512 b1a5afe1d22b7725c7d10a10bed5e52495cda7699ff20bd0f75bbfe28f7131a3d9cd5ec0a1ae7fd329196d2f88bb4b8336301fdb6efa073d773f31340a062ba0
+AUX librecad-2.2.0-fix-missing-header.patch 872 BLAKE2B cfa4d3908b6a1edd46ed9d624b5b6e4ee84c7935d5b047d10e85e319ace6748a27b6b9b93ccfd2f8c9e27ce72449a00ac27ffeb88e478422d1fac82fd20ff8d1 SHA512 3487425bc33eb706a68998369194c8005c7a50f244806d68555c706268e6d10bcab99abab90b5c86fb3615e344aa1f690eb4d1f40d44564e67555025c3bdf26e
 DIST librecad-2.1.3.tar.gz 22415288 BLAKE2B fb920113a7e4b2e9e7e3425f77364c36f6be676a3cd109798786b06d31698fd11437bc7f50cb843ca02d761730e83db7fde475d1bce6a65336a845b5b0114918 SHA512 246cffcc1ea3389997b4a738ab5e3d78e8c1096817ecb1ca28f38d601bc5d1a95f60798ac82308914a34da7b5dbc302b8363cf8b58a97221fdc8ee63010adc6c
+DIST librecad-2.2.0.2.tar.gz 13645528 BLAKE2B 43a9ada4d6fe8c0cb96dc1003a9e7aa3b4d21619ce9776de1e6d273dd884f2313f9e90abed9cadcd44aaac2131bb62ffb0105bc0d8a097513ac42b9886107021 SHA512 054c6e6cf35a30099e71dd022574864c42d99db8bfa73b544113573723f8e6db2c92f9b7a827b947528f8ad9c743bca73a77a81bc50a9dc66f290480bb38db05
 DIST librecad-2.2.0.tar.gz 13837301 BLAKE2B ede9181b6805455d10773b70a8262ffb5a1c48f353dbfd1b80f705ba3194be700e9a486cdf528c4e8015b327a75a29c81b832186024d48229a6cc5fd9ca2dc12 SHA512 df33eac311b5232d6fc0480be1b1c9d257a33ba22f9b7897af4c1761978c87c07a962ae3ea37e8728661a788152157fc621aae65d60d44ae37b2028919cc96a2
 DIST librecad-gentoo-CVE-patches-2.1.3.tar.gz 11687 BLAKE2B 4676fa60033e6d0ace35bbebfae569366a50ec46c2dc5b90bace9564e1f6c2020f733f63981788b6f5288fb0c57760215e7b35f294656c21787ebdefa8447fa0 SHA512 b485b41ab1d6eb61750c11a9b327fc70d28cd0cf689b3cd815b4982d3d800737f402522d9c3d416f1e43422166e7de4f97055de238cc2fe80cc45f11fa3377e6
 EBUILD librecad-2.1.3-r7.ebuild 2879 BLAKE2B 4b9da167e4db48da0c8a41bf43c3d5fcadabea9f57a82270fec85b18da2dd6823d60be0eea3bd4bad7f4324599c47fd4b020276f3a4a28f7be5a2d13004a5f8a SHA512 3ed191982b167c0cabdd28e5ab7702784e0da508f358a066507bde711cb5917c885de435985ea0636e96d1f94586f76c007607a7ec1e1f90cb14646724988546
-EBUILD librecad-2.2.0.ebuild 2355 BLAKE2B 4ab2a2186e504a9427aa85c9461c1bdccf48328009656a0068bd73f29509ceceaf979d820efa8051d5198c9b8c84717edda742bd60defcf0dc2e1e7214094378 SHA512 60dc6c491886bba2b5a9e58d971ecf79b4a06015eccefeceb4c4fdce64229b967da6166744ba4a2213a7272257509e2744b4fbb07c95dd8084374ea2c251982e
+EBUILD librecad-2.2.0.2.ebuild 2355 BLAKE2B 16afc5c397a9d304a21542c1e642097c591997db0bd44816ac6a20c62ab9c9e59db6496d9c985d68279e1507ca8f53fe787a27d5b166c09de2881c6fe49529b9 SHA512 22bdefe9263b512008c74df3e272173a5b9dadaf782da131ffbdcf04984ab671e1250d1c1f274f2e8a7d11624a8d9a17a60a701b9a1b08a2b5de9cbee8ac839f
+EBUILD librecad-2.2.0.ebuild 2413 BLAKE2B 96ede5e05dda79f883dd89b2cd759e56400b2474b3609e135e0faa34904121694e396f34cd121a9b4df84afe57d818a1bb7ca253f6a894d96aff41a093dd89b2 SHA512 84d0f89d8f9f35ddb21a18537bcbc02cad1f665009e5f0c251fd78bc73baeb1f0273244e4e7b353bd97f4484a21542953e45042d8c53ab210677e6a49396990b
 EBUILD librecad-9999.ebuild 2357 BLAKE2B f1b84cd8486d81b2a11216448be1e7c36d8d4347bfe09297a472b31278fa9e7aeeb4d9f325ed234ac05a0ae6065280efd159b7847195bd868d0991f6101f6c04 SHA512 ca46b07e00004e93ff1fcc2be9ea55049fa92154ce26eca11d033476d66b401653106dfe0fd835e07421d67d651a9af27a9cc505a440f85b43d3ba0c76d17d40
 MISC metadata.xml 333 BLAKE2B 2790ea3fb043f1d8393fd715b4669edab3229e1de59e27cc70f3fd3cc13f83964ad1dc6a5534af981111b4ba1a2c7d29501015459e300905574fbc59fce88ee2 SHA512 bf932b64f53780d10e7e64845f4d50f1726f9d57e4625cb94ed2dcc761a0d7f409731b9e9cd1475880b283b43d7b0b979493b984cb243f09954a38f39baac5b9
diff --git a/media-gfx/librecad/files/librecad-2.2.0-fix-missing-header.patch b/media-gfx/librecad/files/librecad-2.2.0-fix-missing-header.patch
new file mode 100644
index 000000000000..3caec03b011a
--- /dev/null
+++ b/media-gfx/librecad/files/librecad-2.2.0-fix-missing-header.patch
@@ -0,0 +1,29 @@
+The patch is borrowed from upstream https://github.com/LibreCAD/LibreCAD
+
+https://github.com/LibreCAD/LibreCAD/commit/6e0f1556bbd554e528295f92597a80a109344607
+
+https://bugs.gentoo.org/919822
+
+commit 6e0f1556bbd554e528295f92597a80a109344607
+Author: Denis Pronin <dannftk@yandex.ru>
+Date:   Sun Jun 2 22:23:11 2024 +0300
+
+    fix compilation with clang and llvm's libcxx
+    
+    librecad/src/lib/debug/rs_debug.h requires cstdio to be included because of FILE
+     type being used
+    
+    Signed-off-by: Denis Pronin <dannftk@yandex.ru>
+
+diff --git a/librecad/src/lib/debug/rs_debug.h b/librecad/src/lib/debug/rs_debug.h
+index 23918574..8950efcc 100644
+--- a/librecad/src/lib/debug/rs_debug.h
++++ b/librecad/src/lib/debug/rs_debug.h
+@@ -28,6 +28,7 @@
+ #ifndef RS_DEBUG_H
+ #define RS_DEBUG_H
+ 
++#include <cstdio>
+ #include <iosfwd>
+ #ifdef __hpux
+ #include <sys/_size_t.h>
diff --git a/media-gfx/librecad/librecad-2.2.0.2.ebuild b/media-gfx/librecad/librecad-2.2.0.2.ebuild
new file mode 100644
index 000000000000..ff44cb2fa0b0
--- /dev/null
+++ b/media-gfx/librecad/librecad-2.2.0.2.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PLOCALES="ar ca cs da de el en en_au es es_ar es_bo es_cl es_co es_cr es_do es_ec es_gt es_hn es_mx es_ni es_pa es_pe es_pr es_py es_sv es_us es_uy es_ve et eu fi fr gl hi hu id_ID it ja ko lv mk nl no pa pl pt_br pt_pt ro_ro ru sk sl sq_al sv ta tr uk zh_cn zh_tw"
+
+inherit desktop edo plocale qmake-utils
+
+DESCRIPTION="Generic 2D CAD program"
+HOMEPAGE="https://www.librecad.org/"
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/LibreCAD/LibreCAD.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/LibreCAD/LibreCAD/archive/${PV/_/}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/LibreCAD-${PV}"
+	KEYWORDS="amd64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug doc tools"
+
+RDEPEND="
+	dev-cpp/muParser
+	dev-libs/boost:=
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	media-libs/freetype:2
+"
+DEPEND="${RDEPEND}
+	dev-qt/qthelp:5
+	dev-qt/qtxml:5
+"
+BDEPEND="
+	dev-qt/linguist-tools:5
+"
+
+src_prepare() {
+	default
+
+	# Stock script doesn't work correctly on gentoo (see bug #847394)
+	# and also it compiles all translations regardles of selected locales.
+	# To avoid this just comment out locale building and do it manually
+	sed -i -e '/LRELEASE/s!^!# !' scripts/postprocess-unix.sh || die
+
+	plocale_find_changes 'librecad/ts' 'librecad_' '.ts'
+}
+
+src_configure() {
+	eqmake5 -r
+}
+
+src_compile() {
+	default
+
+	build_locale() {
+		local lrelease="$(qt5_get_bindir)/lrelease"
+		edo "${lrelease}" "librecad/ts/librecad_${1}.ts" \
+			-qm "unix/resources/qm/librecad_${1}.qm"
+		edo "${lrelease}" "plugins/ts/plugins_${1}.ts" \
+			-qm "unix/resources/qm/plugins_${1}.qm"
+	}
+
+	plocale_for_each_locale build_locale
+	# We want the en locale to be always present. Otherwise it could
+	# be impossible to select the English command set which is quite crucial.
+	has en $(plocale_get_locales) || build_locale en
+}
+
+src_install() {
+	dobin unix/librecad
+	use tools && dobin unix/ttf2lff
+	insinto /usr/share/${PN}
+	doins -r unix/resources/*
+	use doc && docinto html && dodoc -r librecad/support/doc/*
+	insinto /usr/share/metainfo
+	doins unix/appdata/org.librecad.librecad.appdata.xml
+	doicon librecad/res/main/${PN}.png
+	make_desktop_entry ${PN} LibreCAD ${PN} Graphics
+}
diff --git a/media-gfx/librecad/librecad-2.2.0.ebuild b/media-gfx/librecad/librecad-2.2.0.ebuild
index 092799ec110b..f86b8253e177 100644
--- a/media-gfx/librecad/librecad-2.2.0.ebuild
+++ b/media-gfx/librecad/librecad-2.2.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
@@ -40,6 +40,10 @@ BDEPEND="
 	dev-qt/linguist-tools:5
 "
 
+PATCHES=(
+	"${FILESDIR}/${P}-fix-missing-header.patch"
+)
+
 src_prepare() {
 	default
 
diff --git a/media-gfx/luminance-hdr/Manifest b/media-gfx/luminance-hdr/Manifest
index 61069ad69216..dc8bd4cc900e 100644
--- a/media-gfx/luminance-hdr/Manifest
+++ b/media-gfx/luminance-hdr/Manifest
@@ -2,9 +2,10 @@ AUX luminance-hdr-2.5.1-openmp-automagic.patch 1574 BLAKE2B e8c289b8a66e258dd0ea
 AUX luminance-hdr-2.6.0-cmake.patch 855 BLAKE2B 2656ec16d554199a8cb0dca0df77ab710b6c2b16f5ae006ab07c06d8898fe2c0048222b80714d0343f105a623acbd535119853831e2d207a50e6407e1de33aff SHA512 694106851d29a97485e7e438db206c5d08d37dc5d7a2c9a3f207f31c2b673d42b4c539429a658390d31f5f985bd8f330d9387f3eb19964aa4e5683f2031b0a33
 AUX luminance-hdr-2.6.0-docs.patch 948 BLAKE2B 5ac822b10ffc61c552292806adc3f5470a7f03a9b2df7ba385435904963e52af583a892762867abb6a76a5351ffbbf0ffbd67107310e84bab9b649cc33666e09 SHA512 2b242a558c3b734a653943f3128c4cbc2440f940407faa096505ac7abe945c729bd0b4c5e9d06f53141bdb1271b097d7de15e87cd31db75ef1e30839a64f32b0
 AUX luminance-hdr-2.6.0-no-git.patch 377 BLAKE2B 454a9973831aa3ba312926190a84622c8c3bd9481c67ece8ccf8916517f6b314931a09adf8a4168d8a1c7cd8a7694db27291009b9fae8a9cacc8356d32c7f5c3 SHA512 fba84a0415c8e514fb85b229adb29fbda238e8146d2dfff296d92fde33aeb22562e5ac98fed2422326354be9c0096cc2bd1b8947edfa9e7ca160d207ba0db476
+AUX luminance-hdr-2.6.1.1-boost-1.85.patch 384 BLAKE2B 86b7ece7968f3501ab61fd7485a3b0ef08523c0416ae2653df719e8239b79d71efedf76fc3ebcf3402d17e6c73d755d6e55b351032e617d991656f7718bd2b7c SHA512 cb7f024220a9187ca8ff6b6b213ad50b125e65692de2b7331a912301e02b37e8273875005619eda03fb9481ab77a8f354195102567d12a0cd919786507952a06
 AUX luminance-hdr-2.6.1.1-exiv2-0.28.patch 4846 BLAKE2B 74367df72c62743f2c43cafc313b84b96f746fede437c64fa59b558c0b011a1959b90f1925637c6856f55852b2ec58bf9b8466e69ebea5d236f8d191ae9b200e SHA512 711e64209cba59b218b09715451ddcca3084b020da9bd1baa7decc71e5d3ad7375cba5703bc042e2371e9465c01436a67d0162731718dbef158e207de5266615
 AUX luminance-hdr-2.6.1.1-fixheaders.patch 320 BLAKE2B 1037c958cb0eb08c186343c57bf530a2f8ed0b2cc9ef5b67f1363d9b595d267bd5f63a7fbca3d1b51ba4c3cbe3b92d6e56d6af28ee39333376d2411aae18c4d1 SHA512 6e5a51ba17648c619599b895ce9d2fd42b757652331e87799958372ad9c61f711619b0d5efac1d32fb8517732b3b3013fee1c86f0f4032531e390c1bfd229c06
 AUX luminance-hdr-2.6.1.1-openexr3.patch 1028 BLAKE2B fb0502bad89beafdd9cc6cd842e542d2cd9f7d4fc7fe6a29c9c1b67e3a0fc902c451650895c63e8405de82bb5e9e02fca3d1013227fc1a97220ebae245466889 SHA512 a040ee694fff2df06f0521db8c0bb98d4d80def4c342ea5997da535ea1b5e1634a4a9b26e7300476a061b7d7f2a90fc3d2b1cc4fca1c1df260b8847fef781060
 DIST luminance-hdr-2.6.1.1.tar.bz2 11569153 BLAKE2B bbeb991c05f1058fe9fde59014d4c6326283bad34d84dc0454a0b4df1b600b02835e6c3013199d2b2811d59409b892129c580e4a2a5cb00c8014e1267c16ab84 SHA512 9006339037aa3a0b7332cf71e1cf143d9e700eaae1102dfb8eccea8a9d97a5bcb6331202684adf76542116927dd9a69169882518af6ebb25c85d08057fdc552e
-EBUILD luminance-hdr-2.6.1.1-r1.ebuild 2304 BLAKE2B 0e1f052b2bb32f97a98db9acb7982e1a28de3ae6016d21f146b4f14e9edc8e5e6d494e131798045c0a20a356ae465d93790d2c36b5d1acee42e7a4ff7645c053 SHA512 0fcca4b2d8299300a47fd9220b4b16d79d018c7e4f9f27daffdafd13238d08bc4e439a90c641de430a2899ca8027d8c224f63fefcf3486eadce67aed5f20f6ee
+EBUILD luminance-hdr-2.6.1.1-r1.ebuild 2350 BLAKE2B ea877fcf3d62fc025f8166953fe591c1c39fee79b935812e827f3ddea58019831be66acbbf533cfdd4ca59f646dc17e6016dac3d149601c6563d4d96f28aa7c3 SHA512 97414bb40510f16ea9e42a5699e2cf401318c9596f7af980ffffe0c55d8691b53e3c7e239047319b457bea28559f231ded02f14b38ff2eaeba63847b7d5293ae
 MISC metadata.xml 1272 BLAKE2B 08d1f2e217eaffcb4419532ed41ba963a971b343e2d0ff7f3718c9df23ac9ffd5299264d5a87b66451acd231965f135bdeebf3b91244e3d9e51763c818b317f9 SHA512 98f1fa351c3e0bc7e47b30263093408cbbebacf8e0eb23d780cd704f5ddfff3d6939aee4d18c06cd083d90dc8a68ea51995352ab1f15ce75b0585230a3f9cbc8
diff --git a/media-gfx/luminance-hdr/files/luminance-hdr-2.6.1.1-boost-1.85.patch b/media-gfx/luminance-hdr/files/luminance-hdr-2.6.1.1-boost-1.85.patch
new file mode 100644
index 000000000000..7a49dc80b66b
--- /dev/null
+++ b/media-gfx/luminance-hdr/files/luminance-hdr-2.6.1.1-boost-1.85.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/932335
+https://github.com/LuminanceHDR/LuminanceHDR/issues/283#issuecomment-2132239165
+--- a/src/Libpfs/manip/resize.hxx
++++ b/src/Libpfs/manip/resize.hxx
+@@ -23,6 +23,7 @@
+ #define PFS_RESIZE_HXX
+ 
+ #include <boost/math/constants/constants.hpp>
++#include <boost/numeric/conversion/bounds.hpp>
+ #include "copy.h"
+ #include "resize.h"
+ #include "../../sleef.c"
diff --git a/media-gfx/luminance-hdr/luminance-hdr-2.6.1.1-r1.ebuild b/media-gfx/luminance-hdr/luminance-hdr-2.6.1.1-r1.ebuild
index c3db9e692f75..654ceee61524 100644
--- a/media-gfx/luminance-hdr/luminance-hdr-2.6.1.1-r1.ebuild
+++ b/media-gfx/luminance-hdr/luminance-hdr-2.6.1.1-r1.ebuild
@@ -52,6 +52,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.6.0-no-git.patch
 	"${FILESDIR}"/${PN}-2.6.0-docs.patch
 	"${FILESDIR}"/${PN}-2.5.1-openmp-automagic.patch
+	"${FILESDIR}"/${PN}-2.6.1.1-boost-1.85.patch
 	# patch by ArchLinux
 	"${FILESDIR}"/${P}-exiv2-0.28.patch
 )
diff --git a/media-gfx/lximage-qt/Manifest b/media-gfx/lximage-qt/Manifest
index d1dad58634a2..8557488f6ff4 100644
--- a/media-gfx/lximage-qt/Manifest
+++ b/media-gfx/lximage-qt/Manifest
@@ -1,5 +1,5 @@
-DIST lximage-qt-1.3.0.tar.xz 838632 BLAKE2B eceee2fcdd6eae2360c8c7d27417d4e165520155050dae6c0fadfa22184634372582ac52c6233924b54b9d94e814967eb0abdd8ee3e7c719cdfde85840b51400 SHA512 c3fc8e24f78a9cd65736ba1af07b7fd5ba241eab233a595f7b05982d64a0a7a88d81c60eafea632779faa44f76cdb3bb501d2dc3b3758e3f6256fe2da10c37ac
 DIST lximage-qt-1.4.0.tar.xz 841028 BLAKE2B d5f76bfe9763807e8e836de43ff433a1553cea0858b61e76411017ee239fbec6dfd9d3776322b60da6ad8b6b9b1b30c6a02a8c494b62eef440f4d8c5ab9e7143 SHA512 c0dea9418890745de685c7df228ceb849fa21781764c2089481bea89526842e5e8f0972e032ba9c52b07c32202ed284d977f47ace598c44880dff661d76cd125
-EBUILD lximage-qt-1.3.0.ebuild 1087 BLAKE2B 5d859b3314f3a2bafeaedf3df98ccd2a8e1881b7fd1f0a6b91bc2c2de52ca1dc2bcfbad37aba6649edb8d8d453c7b3eac71b063fb0bf84c58ec18e86ce3159ee SHA512 39cce57b8effce86a55452a4b6e133316c901dfa21e5c1fcb6dacbb4abb03976bbfb631955ab4da6af18ffee1cec4e929282aaa70bf54fd9b20073cebd5b18b5
+DIST lximage-qt-2.0.1.tar.xz 848348 BLAKE2B d2484baffaae220436ae157dccda86e126b416101f047133f494cb44d9c3bba007ce797c1aa88d21ba4b242abdf8cacf73706831570943e4d7a36eb02591fc7b SHA512 594e86a4bedf3f9689107d79d852ba1ef4db83f06572b8c077ed5850dc10cc05a33fe79a0c05632f7e7541a6f895919b72c264635306f7a468eac6ecde531ba4
 EBUILD lximage-qt-1.4.0.ebuild 1087 BLAKE2B 95edea7c02f664c8d60b1ea00749da95899459b9dca4ca94f8137ef9e91a0579888212c90f3a057f0aff81435261b8c872a1b38e5d764017c024715d0bd9648d SHA512 ff4e17eed33bf1be3188b38e0d26a107b55fd547a609a8465d79fc5ba91eee6e4c0587102b8448f5da04819a97705e43f15bc9bbd8335206845dc45a3f769ef1
+EBUILD lximage-qt-2.0.1.ebuild 931 BLAKE2B 787bdfeee7b6b399c3987ed2f7d43152c33c369489d674c62df6ff96cd592a498dd72679197ce120c89d0b52c8b768acc6cf3003de4be2a3d1332b77f6b3e3db SHA512 b8e5ce2bb6b7bec20ce554e118d30c25cb524d525d6b6208647372bbdc6ed715800ea05877b71626bae93e8c42629894896735024724e81431c114e69cc451d4
 MISC metadata.xml 317 BLAKE2B f63e3e91e5dc9fcc6113bf1ae9c9bb5680d2b7cf40359eaa058dcbc247f3b2f43f540ffa6525935220d52c3e8b94ee3629ce237c788c8e4f0946dddbf610680e SHA512 74c882b00f38c28d8546d31c59636252b2627053143a1bea3551c4bc507a63361c88bc555ea15760395f995c6d20dd6fe6adf65f11d42cc90ffd8378aae03f1f
diff --git a/media-gfx/lximage-qt/lximage-qt-1.3.0.ebuild b/media-gfx/lximage-qt/lximage-qt-2.0.1.ebuild
index 38f748262166..fd3becd868c6 100644
--- a/media-gfx/lximage-qt/lximage-qt-1.3.0.ebuild
+++ b/media-gfx/lximage-qt/lximage-qt-2.0.1.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
@@ -10,32 +10,26 @@ inherit cmake xdg-utils
 DESCRIPTION="Qt Image Viewer"
 HOMEPAGE="https://lxqt-project.org/"
 
-if [[ ${PV} = *9999* ]]; then
+if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
+	KEYWORDS="amd64 arm64 ~riscv ~x86"
 fi
 
 LICENSE="GPL-2 GPL-2+"
 SLOT="0"
 
 BDEPEND="
-	>=dev-qt/linguist-tools-5.15:5
-	>=dev-util/lxqt-build-tools-0.13.0
+	>=dev-qt/qttools-6.6:6[linguist]
+	>=dev-util/lxqt-build-tools-2.0.0
 	virtual/pkgconfig
 "
 DEPEND="
 	dev-libs/glib:2
-	>=dev-qt/qtcore-5.15:5
-	>=dev-qt/qtdbus-5.15:5
-	>=dev-qt/qtgui-5.15:5
-	>=dev-qt/qtnetwork-5.15:5
-	>=dev-qt/qtprintsupport-5.15:5
-	>=dev-qt/qtsvg-5.15:5
-	>=dev-qt/qtwidgets-5.15:5
-	>=dev-qt/qtx11extras-5.15:5
+	>=dev-qt/qtbase-6.6:6[dbus,gui,network,widgets]
+	>=dev-qt/qtsvg-6.6:6
 	media-libs/libexif
 	=x11-libs/libfm-qt-${MY_PV}*:=
 	x11-libs/libX11
diff --git a/media-gfx/maim/Manifest b/media-gfx/maim/Manifest
index db37075c1d93..a0ff6dff816d 100644
--- a/media-gfx/maim/Manifest
+++ b/media-gfx/maim/Manifest
@@ -1,5 +1,3 @@
-DIST maim-5.7.4.tar.gz 41663 BLAKE2B beb6cb327ae0cf022a90c095bf56b307870d3d7bd281f0e060d9cf7d49ba604cf4cbdfd9270b0e185295f0e3d2a151fbb8ba69398034145a08fc2721cc93740e SHA512 f91ba00e436514d2d0eecc664c02dd45c53750045b5bc4abbc2cfbf64159085e83736e820c54fa819b4d82b0905a3cfe76a5227db49dd54238f655fd4899cd6c
 DIST maim-5.8.0.tar.gz 42224 BLAKE2B 572743db1d59d802ed7eb7e259a5cb4a4d2147d95169bbb40adf6d36b849562e8f1756b082bc076bc46d2449827ac3b02f0b539ce86760c755920b4e35b6762d SHA512 418725b1950f9374c2ff7508e1c52f6986b253ea1c155ef28604e514f1cf0753185eea43cde76a65b9de80bb8dd65ced48b49ce5dfccaf20f5caa49f41743f5b
-EBUILD maim-5.7.4.ebuild 878 BLAKE2B 6496877d7530ef44469c0a050ced6de1273e59575bddbf293bd97cc4aeb25477ae6f75bcf87e1873151e32f250800e1eba0cf4058ece34fe18d12baefd3524a6 SHA512 d9b44699aba128bd9a4e08abd6fbae12e8f8bec73da4d954a02e597a73bd5151ad0edd264fd28a9c29ebd7d85122452007ae1b65c871cde63ce91aceb9eef60b
 EBUILD maim-5.8.0.ebuild 879 BLAKE2B a30e4174853fea50c71fbf404de573d462ca64e353d8f7d43f463fb90c233c6f317b366bab6eccfff06866855697efcba5f9f8aaab92c4e3359fd3a0f8f9e88a SHA512 388cb05f998e0f36e9d72ef8020278a62b3f1090956611135b9fe991ccbef991b9381aea94e3d3afc57790504c4b4952154285668376d3cf00da7f6dec4e821d
 MISC metadata.xml 246 BLAKE2B 597e29a0bf49f0fb4b12fc59067fa16c5125a6b669b8b825f668db93f6fce4c77dbea6573939c2e86fea964467093a231bcdddbe73637fe579ea8c294a9fba4e SHA512 f54b081e4d9ee221734a058059778e962ef2f62de49da9e4c7084372fb853479200954c7478481be7a2a259f20afccaa52c7ddd669599dda3bae62bc9adb9d15
diff --git a/media-gfx/maim/maim-5.7.4.ebuild b/media-gfx/maim/maim-5.7.4.ebuild
deleted file mode 100644
index b20fa8d524f9..000000000000
--- a/media-gfx/maim/maim-5.7.4.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Commandline tool to take screenshots of the desktop"
-HOMEPAGE="https://github.com/naelstrof/maim"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/naelstrof/maim.git"
-else
-	SRC_URI="https://github.com/naelstrof/maim/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~x86"
-fi
-
-LICENSE="GPL-3+ MIT"
-SLOT="0"
-IUSE="icu"
-
-DEPEND="
-	media-libs/libjpeg-turbo:=
-	media-libs/libpng:0=
-	media-libs/libwebp:=
-	virtual/opengl
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	>=x11-misc/slop-7.5:=
-	icu? ( dev-libs/icu:= )"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DMAIM_UNICODE=$(usex icu)
-	)
-	cmake_src_configure
-}
diff --git a/media-gfx/mandelbulber/Manifest b/media-gfx/mandelbulber/Manifest
index 5ce2d5caa8d4..ce933ca66467 100644
--- a/media-gfx/mandelbulber/Manifest
+++ b/media-gfx/mandelbulber/Manifest
@@ -1,3 +1,5 @@
 DIST mandelbulber2-2.28.tar.gz 122800825 BLAKE2B a1bc8b3b743687003aeccaea7763b8100736b03dcd5044e43193f07bb519a7e78075c63cd0466373e8240a317fc2bbb6481bc07b51b137241cbb477e679093c3 SHA512 9bb2ecdcc2a2976efb6af930d49f067462713c6fd48f54631477102f3153479df6336b43b160c98c4e01f00d48188b314ccc86a84055a05cac5eb009db4e52e2
+DIST mandelbulber2-2.31.tar.gz 133379945 BLAKE2B c7b4cfa151f3bf0161b5871d0b22cd05567edc5a7145d64f38c4059b1f4b6f19f1ac3285d7a60cfb2979cd98f10041b7c7dd9100dab9ec93258e567034a03d63 SHA512 cf70c73f80c89731da6711af6ad6e1be33d43d7b014e16a6516eabf22d39b49469ee3e7b4ecc5e5adad3a1b26c8c1892c1a82d5891fe2b71fe524cdd1c3460c7
 EBUILD mandelbulber-2.28-r1.ebuild 1839 BLAKE2B 5798e1c9fe1aa064c43b2100113c880cea5825e420e18148e55649855c3a452377f6cd25b9ae0cf67d36f6595802e24e92ef475deb12e22f55a364299a0e08a5 SHA512 9eedabd79d50453d5e434caa343f04cca54aca03974cc4034afe6f2492a5905f3a60b363b3cbb0192069ca5ca9afb070a08de6343159758af5ea8fdee1ea81d5
+EBUILD mandelbulber-2.31.ebuild 1868 BLAKE2B 941e1c9659c9790cbba07264d52c887a90e1ec9ee3f5bf02ed52d1398a0b9e9508ea8a3daf6aa65a9ca59a805eb18b814ca285118a609624086a5229141a5151 SHA512 c0d651bacb929937bab45e7700f8d697d97e8f4bc8370ab0bb800a8360d3bced36cc040cf582312efab36284cbcca4ac16659b8ebab47e6da581857a2ceda713
 MISC metadata.xml 672 BLAKE2B 8b7d423df1cd3f405b43bbeea9f6de9438951cf55b2020016b3174376e5498f2bc903295afde6626bf342b77050210eec78db8672cf2555f344f12248f1e58be SHA512 4005cd3324e642b6ea382e992949c1a3f459cef6f6094eb896e58fbc5651cd1d88c6575ef76896673bd0589e46285d3df9858a110f9b4b4c867c797a329dee77
diff --git a/media-gfx/mandelbulber/mandelbulber-2.31.ebuild b/media-gfx/mandelbulber/mandelbulber-2.31.ebuild
new file mode 100644
index 000000000000..97b894bb80c0
--- /dev/null
+++ b/media-gfx/mandelbulber/mandelbulber-2.31.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_P="${PN}2-${PV}"
+inherit desktop qmake-utils toolchain-funcs xdg
+
+DESCRIPTION="Tool to render 3D fractals"
+HOMEPAGE="https://www.mandelbulber.com"
+SRC_URI="https://github.com/buddhi1980/${PN}2/releases/download/${PV}/${MY_P}.tar.gz https://downloads.sourceforge.net/${PN}/${MY_P}.tar.gz"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="CC-BY-4.0 GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="joystick opencl openexr sndfile tiff"
+
+RDEPEND="
+	dev-libs/lzo
+	dev-qt/qtcore:5
+	dev-qt/qtconcurrent:5
+	dev-qt/qtgui:5
+	dev-qt/qtmultimedia:5[qml]
+	dev-qt/qtnetwork:5
+	dev-qt/qttest:5
+	dev-qt/qtwidgets:5
+	media-libs/libpng:=
+	sci-libs/gsl:=
+	joystick? ( dev-qt/qtgamepad:5 )
+	opencl? (
+		dev-cpp/clhpp
+		virtual/opencl
+	)
+	openexr? (
+		dev-libs/imath:=
+		media-libs/openexr:=
+	)
+	sndfile? ( media-libs/libsndfile )
+	tiff? ( media-libs/tiff:= )
+"
+DEPEND="${RDEPEND}
+	dev-qt/designer:5
+"
+BDEPEND="virtual/pkgconfig"
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && tc-check-openmp
+}
+
+src_prepare() {
+	default
+
+	use joystick || sed -i -e "s/qtHaveModule(gamepad)/false/" makefiles/common.pri || die
+	use openexr || sed -i -e "s/packagesExist(OpenEXR)/false/" makefiles/common.pri || die
+	use sndfile || sed -i -e "s/packagesExist(sndfile)/false/" makefiles/common.pri || die
+	use tiff || sed -i -e "s/packagesExist(libtiff-4)/false/" makefiles/common.pri || die
+}
+
+src_configure() {
+	if use opencl; then
+		eqmake5 makefiles/${PN}-opencl.pro
+	else
+		eqmake5 makefiles/${PN}.pro
+	fi
+}
+
+src_install() {
+	dobin ${PN}2
+
+	dodoc README NEWS usr/share/doc/${PN}2/Mandelbulber_Manual.pdf
+
+	insinto /usr/share/${PN}2
+	doins -r usr/share/${PN}2/*
+
+	domenu ${PN}2.desktop
+
+	newicon -s 256 qt/icons/${PN}.png ${PN}2.png
+}
diff --git a/media-gfx/mkbold-mkitalic/Manifest b/media-gfx/mkbold-mkitalic/Manifest
index b83b289971a2..d60d03348bc7 100644
--- a/media-gfx/mkbold-mkitalic/Manifest
+++ b/media-gfx/mkbold-mkitalic/Manifest
@@ -1,3 +1,3 @@
 DIST mkbold-mkitalic-0.11.tar.bz2 21922 BLAKE2B 90473ee9ce751f491a36b18b4adcfc15a64535ca11b7394a2d46b48a144394ae549133635f898b8b16d87eb3271439fc425cee3cb05e4559818ab00a7d054e3d SHA512 fe40693bc5d73aaf45daf1bbd22f8107fb61604cd4ff0ec09e8bd63029be811a2b1bb46a3ce214954841c5d074e9ec23c150006d9a2c8ffe633e93801c2d7345
-EBUILD mkbold-mkitalic-0.11.ebuild 761 BLAKE2B 8a9f9ccba3506f35a2dcdd7d4510035f19c03dd7b5ecbffb0d7504d959995b9c6c45f637d19de370a40a83a9db022d97f9495f297571fbad4cf906935c64cf33 SHA512 34cb049179b645960017a4c23f4627fd74c1f1f38916baccc0f274f9378dfbea3ece26dc744babfff2a237b4b2075b28bdf58301c9369eb2c134bfcee2180247
+EBUILD mkbold-mkitalic-0.11.ebuild 755 BLAKE2B 3d7d80412cd09532f2d3b6a4783a2ce35639d86ce83bc1778ef0f3496cd55c326f25bcdd04f051943551dcb574711c489a39aac2de37fdc9f1b0f01e9dc5962d SHA512 d5b3feb28b7b0fcdc63e8674db212d02bfd738e4ed8df3b9d855161bb0932c72ea4121cc4a571dbc103d5a0be2812742ce8fd922e145ab73cbe59a5ba3e91a9c
 MISC metadata.xml 249 BLAKE2B a37da98d387308dab889eab2665b67e4176707f3c115a7a69cb7f4b19f9864b96bc2fe70efa105e627c4b57a7d626f6b23dc2709a225a9debada3356f3cf32a0 SHA512 a5095fb01e05f24583a962e36131b2f02cf2d1dd7a97051200e465ad97db014721de7c1857f5eb736cb0290682e8de833cb4c735f7de8d98cdfae1aed6d3d549
diff --git a/media-gfx/mkbold-mkitalic/mkbold-mkitalic-0.11.ebuild b/media-gfx/mkbold-mkitalic/mkbold-mkitalic-0.11.ebuild
index 5aa8c4ee1a47..79c05eab2b46 100644
--- a/media-gfx/mkbold-mkitalic/mkbold-mkitalic-0.11.ebuild
+++ b/media-gfx/mkbold-mkitalic/mkbold-mkitalic-0.11.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://hp.vector.co.jp/authors/VA013651/lib/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ia64 ~loong ppc ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~loong ppc ~riscv ~s390 sparc x86"
 
 DEPEND=""
 RDEPEND=""
diff --git a/media-gfx/monica/Manifest b/media-gfx/monica/Manifest
index 0eed7736e523..267158b06f53 100644
--- a/media-gfx/monica/Manifest
+++ b/media-gfx/monica/Manifest
@@ -1,5 +1,7 @@
-AUX monica-3.6-makefile-cleanup.patch 907 BLAKE2B 13cf4d1a4950074f8909045fc0acd337482e343b51a800dbb87a585311ff776d4f87f8d0250b059e99b328a470e99bae23412646a5d8d89d09a4380e50bbd372 SHA512 cc151e238e89db9d3873133e1a637d5e2959c2460251fe7fe8feb62ef22c64963cec5b2533607996b2cf7d33abdfd1f42a59f5a769cad0bf2194e8d751da3bf6
+AUX monica-3.7-exit.patch 2534 BLAKE2B 99f544c0b9712d4a0cdf054fc6b39a34b143ecf93204c30e16bbfa9287ac8d89dcf25270f8c2a976f2045a0662cb673ba544c2e6ef31dcdf5253dfcac66d0b65 SHA512 a814424f3db144c5b1d8fc1dc4b507667cde97dcf13c6da3a8bd8e1aa5f95be8e119f9f8512b05096084cb3933719d85fa9548b8f2ec6af58b513abd9db612d2
+AUX monica-3.7-fprintf.patch 1835 BLAKE2B 06dedaded7424ced057b8b2298584e0d71c771124880255a012a10b351bddbbe336793da7d70104e9fa06a874a2171504424cdd55235d75b49feffa02c69bb55 SHA512 d80f79620c8df23765ae9e644e70428bf5a6443de53a3dc11ac7aa6fe091f2b911ee1f0efbc353c61851a3b571953a553898b8e1d6fb94b1ed6e7b942dbcb0fa
 AUX monica-3.7-gcc44.patch 341 BLAKE2B c534884cca357cbc37a0092bb42faa9a3f29165e0e5622d811d08f4238a2d716f91a8ce731438a33323dd350e3b9da79e743b7d3f46fc5ba9eb084b14f359bd4 SHA512 837f3fc2c77d415067460f1aae80807daa9882b814494f2305be711db920a750ae183ec7b456527956b60ca3cf022729524990cd0febafeaab41bd1dbb080bfb
+AUX monica-3.7-makefile-cleanup.patch 921 BLAKE2B af1492ec9cd83971c34fe571b17ebfdde6223c14ffdef51148cdac2dd58ef78f283ff5160d88fce0c6eb022bcd46c65af5e4069ff590ad8954f65d6e416fbe72 SHA512 9e8a1d12bc9c97b86e6f613d8ea3a06d8ab318e4bb93c7c335a8a8b80a2a6a7aa8a1edc3b8e3a451167a1d0d18736cce46859104faea810701783ff1bd0ccfff
 DIST monica-3.7.tar.bz2 18330 BLAKE2B 26c5539d00867fd6ee80255a41fa363ee8cd3a720637b1b83546bfe9bf877f5b521ea47da456d965b65f57d7a351bc7c5dfe310ab9608b67a8db7b2b4d9cd1af SHA512 87565f33f3c3492b196905e5b8e17bd45a7eb8eb0a0281f02e23337eec888af82571ac6f2d229256ee97012d402b7f1b217cd56a8b87ff9c9296931bf63cb153
-EBUILD monica-3.7.ebuild 718 BLAKE2B 50a1d50df2df9ff18ff9735b542b85cd5e5748f3e4dad8dcb66e03f4f76684d74e7899e130820eabd46cb31a29707ecc3822c930700370a704336d5868d6466f SHA512 56aaedd0adea9b91c69162ef8837caa4a1ddb472cf6b1e5aba251f30f11e8f9926b18902f8c1cd9ed7ce8393dea363162f6837cb10a906e0daef0d42fd891d96
+EBUILD monica-3.7-r1.ebuild 906 BLAKE2B 6a4a01632dbeb621e3e07feae8521f49f66724094b78651ccdf37057fc1d91dd2f6c641e3be2b5a446559e6d5bb2ffe7ac8ac50b4c004c7349be8dee834c71df SHA512 204de6470f2ff3da14aac40fbf11d865911a59c876d4915178fe93a6a0bbfe85066c9dcd01a785a9f2cd70088156b34a43a75827076b80bc0e184c2e174d4956
 MISC metadata.xml 557 BLAKE2B f6319ce0a15222c7ae4adf7bbf7c326db5ebd05ad36732c56c9540a30ea35bb7fbffb136433eed4ba10b899c6ddde893be83aa6920e4b8a4f5dbd51e940b6a1d SHA512 ecd6b679940f992d4bbb27ab3b63316ce089c8857a1288cf89f05fd7aa3da24e81206f660ac1d5fbe86e71c4796bffcf3bdca5e4c546678b22dd9ab584e8b6a2
diff --git a/media-gfx/monica/files/monica-3.7-exit.patch b/media-gfx/monica/files/monica-3.7-exit.patch
new file mode 100644
index 000000000000..afd347c28257
--- /dev/null
+++ b/media-gfx/monica/files/monica-3.7-exit.patch
@@ -0,0 +1,61 @@
+--- monica-3.7.orig/monica.cpp	2024-06-15 10:17:52.270992952 -0700
++++ monica-3.7/monica.cpp	2024-06-15 10:53:54.255394576 -0700
+@@ -1276,7 +1276,7 @@
+ 	int bcheck = system("echo $SHELL | grep bash");
+ 	if (bcheck) {
+ 		fl_alert("Monica senses that BASH is not\nyour login shell...\n\nSince Monica uses bash init scripts to \nimplement gamma corrections on system login, \nyou will have to paste the call to monicarc \ninto your startup scripts by hand.\n\nAlternatively, you can make a direct call \nto xgamma in your X config file.");
+-		__builtin_exit (0);
++		exit (0);
+ 	} 
+   
+     fn_r = get_shell_rc_path();
+@@ -1563,13 +1563,13 @@
+ }
+ //---------------------------------------------------------------------
+ void exit_cb(Fl_Widget *, void *) {
+-  __builtin_exit(0);
++  exit(0);
+ }
+ //---------------------------------------------------------------------
+ void exit_save_cb(Fl_Widget *, void *s) {
+   int res = write_monicarc((Sliders*)s); 
+   if (res) res = add_monicarc_to_startup();
+-  __builtin_exit(0);
++  exit(0);
+ }
+ //---------------------------------------------------------------------
+ 
+@@ -1704,7 +1704,7 @@
+ //	if (no_ati_gamma && no_x_gamma) {
+     if (no_x_gamma) {
+ 		fl_alert("Monica cannot detect the presence\n of xgamma on your machine...\n\nIt is distributed with all versions of XFree86 \nand Xorg to date, so if you have X installed, \nit should be around or something might be \nwrong with your installation.\n\nXgamma is needed for Monica to function.");
+-		__builtin_exit (0);
++		exit (0);
+ 	}
+ //-- set global value of "xgamma" command string, accomodating ATI's fglrx_xgamma ---
+ //	if ( ! no_ati_gamma ) {
+@@ -1739,13 +1739,13 @@
+ 	printf("Copyright (C) 2005 Paul Sherman\n\n");
+ 	printf("Copyright (C) 2002 Tilo Riemer\n\n");
+ 	printf("Monica is published under a BSD like licence.\nSee Monica -l\n\n");
+-	__builtin_exit(0);
++	exit(0);
+       }
+       if ( (strcmp(argv[i], "-l") == 0) 
+           || (strcmp(argv[i], "--licence") == 0) 
+           || (strcmp(argv[i], "--license") == 0) ) {
+         printf("\n%s\n\n", LICENCE);
+-	__builtin_exit(0);
++	exit(0);
+       }
+       if ( (strcmp(argv[i], "-h") == 0) || (strcmp(argv[i], "--help") == 0) ) {
+ 	printf("\nUsage: Monica [options]\nwhere options are:\n");
+@@ -1766,7 +1766,7 @@
+ 	printf("\t-s[cheme]         scheme\n");
+ 	printf("\t-t[itle]          windowtitle\n\n");
+ 
+-	__builtin_exit(0);
++	exit(0);
+       } 
+       if ( (strcmp(argv[i], "-o") == 0) || (strcmp(argv[i], "--onthefly") == 0) ) {
+ 	g_toggle_apply_on_the_fly_checkbox = 1;
diff --git a/media-gfx/monica/files/monica-3.7-fprintf.patch b/media-gfx/monica/files/monica-3.7-fprintf.patch
new file mode 100644
index 000000000000..55959e246f43
--- /dev/null
+++ b/media-gfx/monica/files/monica-3.7-fprintf.patch
@@ -0,0 +1,46 @@
+--- monica-3.7.orig/monica.cpp	2024-06-15 10:16:59.594465873 -0700
++++ monica-3.7/monica.cpp	2024-06-15 10:17:18.277749251 -0700
+@@ -1301,9 +1301,9 @@
+           while (fgets (buffer, BUF_SIZE, f_r)) {
+ 	        if (strstr(buffer, ". .monicarc")) {//skip old entries
+ 	           continue;  
+-	        } else fprintf(f_w, buffer);
++	        } else fprintf(f_w, "%s", buffer);
+           }
+-		  fprintf(f_w, ". .monicarc   #monitor calibration");
++		  fprintf(f_w, "%s", ". .monicarc   #monitor calibration");
+           fclose(f_w);
+           // script edited, so back up the original and put the ".tmp" in its place
+           rename(fn_r.c_str(), fn_old.c_str());
+@@ -1348,18 +1348,18 @@
+          while (fgets (buffer, BUF_SIZE, f_r)) {
+            if (buffer[0] != '#') {
+ 	         if (!wrote_monicarc) {//add line for calling .monicarc
+-	           fprintf(f_w, "$HOME/.monicarc   #monitor calibration\n");
++	           fprintf(f_w, "%s", "$HOME/.monicarc   #monitor calibration\n");
+ 	           wrote_monicarc = 1;
+ 	         }
+ 	         if (strstr(buffer, "xgamma")) {
+ 	           strcpy(mod_buffer, "#");
+ 	           strncat(mod_buffer, buffer, BUF_SIZE);
+ 	           mod_buffer[BUF_SIZE + 1] = '\0';
+-	           fprintf(f_w, mod_buffer);
++	           fprintf(f_w, "%s", mod_buffer);
+ 	         } else if (strstr(buffer, "$HOME/.monicarc")) {//skip old entries of .monicarc
+ 	            continue;  
+-	         } else fprintf(f_w, buffer);
+-           } else fprintf(f_w, buffer);
++	         } else fprintf(f_w, "%s", buffer);
++           } else fprintf(f_w, "%s", buffer);
+          }
+ 
+          fclose(f_w);
+@@ -1395,7 +1395,7 @@
+ 				if (strstr(buffer, str_to_remove.c_str())) {
+ 					continue;  
+ 			  } else {
+-			    fprintf(f_w, buffer);
++			    fprintf(f_w, "%s", buffer);
+ 					line_count += 1;
+ 			  }
+ 			}
diff --git a/media-gfx/monica/files/monica-3.6-makefile-cleanup.patch b/media-gfx/monica/files/monica-3.7-makefile-cleanup.patch
index 21881db24971..4d7501254ada 100644
--- a/media-gfx/monica/files/monica-3.6-makefile-cleanup.patch
+++ b/media-gfx/monica/files/monica-3.7-makefile-cleanup.patch
@@ -8,9 +8,9 @@ diff -Nuar monica-3.6.orig/Makefile monica-3.6/Makefile
 -CXXFLAGS = `fltk-config --cxxflags` -Wall -O2
 -LDFLAGS  = `fltk-config --ldflags`
 +CXXFLAGS = -Wall -O2
-+FLTK_CXXFLAGS = `fltk-config --cxxflags`
++FLTK_CXXFLAGS = $(shell fltk-config --cxxflags)
 +LDFLAGS  = 
-+FLTK_LDFLAGS  = `fltk-config --ldflags`
++FLTK_LDFLAGS  = $(shell fltk-config --ldflags)
  TARGET   = monica
 -DESTINATION = /usr/bin
 +DESTINATION = $(DESTDIR)/usr/bin
diff --git a/media-gfx/monica/monica-3.7.ebuild b/media-gfx/monica/monica-3.7-r1.ebuild
index 08697029c232..b6be41461371 100644
--- a/media-gfx/monica/monica-3.7.ebuild
+++ b/media-gfx/monica/monica-3.7-r1.ebuild
@@ -1,18 +1,17 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit toolchain-funcs
 
 DESCRIPTION="Monica is a Monitor Calibration Tool"
-HOMEPAGE="http://freshmeat.sourceforge.net/projects/monica"
+HOMEPAGE="https://web.archive.org/web/20201111203551/http://freshmeat.sourceforge.net/projects/monica https://web.archive.org/web/20051016203856/http://www.pcbypaul.com:80/linux/monica.html"
 SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
-IUSE=""
 
 DEPEND=">=x11-libs/fltk-1.1:1"
 RDEPEND="${DEPEND}
@@ -20,8 +19,10 @@ RDEPEND="${DEPEND}
 
 DOCS=( authors ChangeLog news readme )
 PATCHES=(
-	"${FILESDIR}"/${PN}-3.6-makefile-cleanup.patch
+	"${FILESDIR}"/${PN}-3.7-makefile-cleanup.patch
 	"${FILESDIR}"/${P}-gcc44.patch
+	"${FILESDIR}"/${P}-fprintf.patch
+	"${FILESDIR}"/${P}-exit.patch
 )
 
 src_compile() {
diff --git a/media-gfx/mscgen/Manifest b/media-gfx/mscgen/Manifest
index 305a3059f0a2..89d658c6e18a 100644
--- a/media-gfx/mscgen/Manifest
+++ b/media-gfx/mscgen/Manifest
@@ -1,3 +1,3 @@
 DIST mscgen-src-0.20.tar.gz 204818 BLAKE2B c4ae701ead1ec5845ea80e1fd19b88ff77e3cf2f462c843a2561cf06a5a3faacd8fcd891031256f9014b069ccae02c82221b3b6bb173a68aa747fe7051bc2225 SHA512 12fdea38633a42d6d235520550b16bea0cd3fb67d198b1f956845f4057239d7f80fa961e37f6f8bad9fb03f29ff8c6ffab4f4ae7402eea3083dfddeaf39687e3
-EBUILD mscgen-0.20.ebuild 935 BLAKE2B 474af1e8196430a0c7f6c0144db0276b1a0098bd0a47420d16a5b6c7f5e4437b4522b4d32478fa7cbce6d328991ad3db2de18e2acb574f0567ab1f630c1e5f89 SHA512 c5cd1b66839625f352ae552f3fdccddc17ae72ed1638be3109a163f1106e673df52d82f2d956fbdf115d1a164747e346108d1a66d38065c452c4ede0d6e05afb
+EBUILD mscgen-0.20.ebuild 942 BLAKE2B 0e4f0395418820e8e6d14c6dc8918b7d1136a24f08ed7a72456b07ee069aa05befa854c61bd831118c44087b28274afd154a1b67f624d3949b8f544fbd239b45 SHA512 3c09ca19b8a91b73208c690b78480e70561372e613a954632278acee105fa52c8f39f93f35512cd48883f80c94e04b85ff5f9c4efbbbd700874191a66b56a8ca
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/media-gfx/mscgen/mscgen-0.20.ebuild b/media-gfx/mscgen/mscgen-0.20.ebuild
index abd147c84d29..f39af35db010 100644
--- a/media-gfx/mscgen/mscgen-0.20.ebuild
+++ b/media-gfx/mscgen/mscgen-0.20.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Message sequence chart generator"
 HOMEPAGE="https://www.mcternan.me.uk/mscgen/"
 SRC_URI="https://www.mcternan.me.uk/${PN}/software/${PN}-src-${PV}.tar.gz"
 
-KEYWORDS="amd64 arm ~arm64 ppc ppc64 x86 ~x64-solaris"
+KEYWORDS="amd64 arm ~arm64 ppc ppc64 ~riscv x86 ~x64-solaris"
 
 LICENSE="GPL-2+"
 SLOT="0"
diff --git a/media-gfx/mypaint-brushes/Manifest b/media-gfx/mypaint-brushes/Manifest
index 8dd24e10a201..b933e8a94970 100644
--- a/media-gfx/mypaint-brushes/Manifest
+++ b/media-gfx/mypaint-brushes/Manifest
@@ -1,3 +1,3 @@
 DIST mypaint-brushes-2.0.2.tar.xz 1522216 BLAKE2B ba274d9abcac51bba3b8e7d4489893eef62e2b35ee8d0607d476d022150d92944693cae6d1ddb9f4f9b01f229f050f4ccf7416a0ef0fe27e9e0f5e84a4e2c56f SHA512 bae870e930381b818165e5e39d38b25782d5744c9a507a71dab37ae7ca2d4502896057f919a16eb9305d803a01db3a948a735d5c5b850893997a9afd6403144b
-EBUILD mypaint-brushes-2.0.2-r1.ebuild 507 BLAKE2B 5d4fa4645221b2adeea62343cb90d4480197b60ef0599b843285f6ecfd8b30ad9d36df9909ae5d865aaa8c8db74517eabbf1801daabcdad7c3dbeccc74a3d4d1 SHA512 a0d672a106eda28524aef40e4a4278d0ab8c201415091d07c1bfe5c3738c678112dbec3e3c8d711995a543d4f7e6a7f74ce841c272e807d37be14120603f98bf
+EBUILD mypaint-brushes-2.0.2-r1.ebuild 501 BLAKE2B 9e6afb113994418cff1456bb906fba4bc9740a9217151f2c2771d39f8128f6a651d44bb82cfda1f8e90ce6155e6fb7bb311cc91b7edfd8529a2a9e29daa2370d SHA512 a60f90b95c01f142d466675428f341590c0b2cd8ba04ecd785053fc78e47d3503d2e544357d925ab9164f3b8dba2bc5610595ef1a6c1fb3b045ecae61588ca2e
 MISC metadata.xml 352 BLAKE2B 2ab3826fec46744aceb8210d0892c4d928cb818db4bd2704c156ca74c4c85bc8778e8212ae07010a0f87876b9448bae139f988465b9b5f2e50f62061c860d31d SHA512 bf153d124d449c2b4e870b2aad73ab45708f622c09d37a42975dfa5e1c42005009bf6c0d361bc03cab7fee76ba0a811877a7518cc6b84cfe1fc941e9a41c2921
diff --git a/media-gfx/mypaint-brushes/mypaint-brushes-2.0.2-r1.ebuild b/media-gfx/mypaint-brushes/mypaint-brushes-2.0.2-r1.ebuild
index 0b8ac9f4982c..5463c117e59b 100644
--- a/media-gfx/mypaint-brushes/mypaint-brushes-2.0.2-r1.ebuild
+++ b/media-gfx/mypaint-brushes/mypaint-brushes-2.0.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/mypaint/mypaint-brushes/releases/download/v${PV}/${P
 
 LICENSE="CC0-1.0"
 SLOT="2.0" # due to pkgconfig name "mypaint-brushes-2.0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv x86"
 
 src_prepare() {
 	default
diff --git a/media-gfx/mypaint/Manifest b/media-gfx/mypaint/Manifest
index 99580fd41bd2..f5dfdcc70665 100644
--- a/media-gfx/mypaint/Manifest
+++ b/media-gfx/mypaint/Manifest
@@ -3,5 +3,5 @@ AUX mypaint-2.0.1-python3.11.patch 3968 BLAKE2B 02318c3543bc66fc1ffd89af02f00c0e
 AUX mypaint-2.0.1-r1-build-system.patch 638 BLAKE2B 8e0209eb8fdba535cb8c0075e183681b0d8f8a11613cf7c3d2ddb5e20954d6c95da3ef3824063ac55bb11feda38cdf00eb8190cf76ca7753d2432d870926194b SHA512 8c088a089408542f57ef0fb608a63ae6fa0cce5392cb309376198813d35f5c3e54466945419984973af77e11f5bc4908961b5e81982a32fbef04c081df1b0349
 AUX mypaint-2.0.1-setuptools.patch 2647 BLAKE2B e9212c40830e51ed8abe217204ce3bcad65fac99c7ad00f38ae6275eb404c3464598672431a6c857f7de42950830a63f25bcfcb5f19685a443f963251ed1a9be SHA512 4d834558ab0e5419aae98a2a8f30c285d330392d3627e21d25def869b16e2ef4100d45d6a78b3f1714bd72e1e7b8cb7de24f89893c6c98d87bcefe74aff5965a
 DIST mypaint-2.0.1.tar.xz 7295048 BLAKE2B 813a939f95ea6887c57d8c0868e33e9bc8b1b95746d5ecd793d4fd13a32198ee5a445cfdd2691a15e944bfb0099d6ac624dff320ae29465db5b1e0d197bedb30 SHA512 449beddcc6da5d720c9efbeac94a466ed0057bd1962d42ebb419190e8b7fd8ffd341327408467fc5da47920f9d0da1fd6d78233a0dda88de5f5d52d53d9ab562
-EBUILD mypaint-2.0.1-r3.ebuild 1904 BLAKE2B bd6e32a57a00297629e2e361c51bb2a3ce9c818bed7721dd9cdd4fb95d4293abdd920b126b9c48a7dd71f2fa94d1570f53dd1a9297982c52b3cf745dd7bab91b SHA512 5813e65c1c4b020cc6c8afbb696024c05f0d90951dbc1bd0a60fbbcddee3d9d0db1b63a3fdd8e9521a9ebd00ff4be146e7b730b2bf4ee62473e1b181587d55d0
+EBUILD mypaint-2.0.1-r3.ebuild 1904 BLAKE2B a28d89927f8fff5bc64a6090f227b999d427b7a2947e3bede049d98f61142513b76b314f80edbb14c960b130e801da23c2a1af4f4f33edb63f9f311411121126 SHA512 c6968dc9f7812da07bc78138e5b4b53f764fc432127bc1d6ded38add7f60908f9ecace973ea02effe60d7e1cb51122bf07ec0b7bcce236b88b995be743187e76
 MISC metadata.xml 320 BLAKE2B 17a66707a8182c8eb1a0206b8ec86cdc307ce2d965beb66aa08e3e2b31700eebc05213b7e27e98aef40e566fd028561476d6f614aeb2a0450f560801f187b060 SHA512 cb54ae739d86722c2959d8ff63d8f20394b0611ef3f3a6587e517f3de6625748201659d782e6ec8ca65e55c285a6ff52408b3586088ce2546ba42872dfd07133
diff --git a/media-gfx/mypaint/mypaint-2.0.1-r3.ebuild b/media-gfx/mypaint/mypaint-2.0.1-r3.ebuild
index 3ddd273019c8..8f03d4e44e6c 100644
--- a/media-gfx/mypaint/mypaint-2.0.1-r3.ebuild
+++ b/media-gfx/mypaint/mypaint-2.0.1-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 DISTUTILS_SINGLE_IMPL=1
 
 inherit desktop distutils-r1 xdg
diff --git a/media-gfx/netgen/Manifest b/media-gfx/netgen/Manifest
index 841d88a58e5a..b7f5bbb3f667 100644
--- a/media-gfx/netgen/Manifest
+++ b/media-gfx/netgen/Manifest
@@ -6,8 +6,6 @@ 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
-DIST netgen-6.2.2301.tar.gz 3394480 BLAKE2B 358b0cf7ff4d372a9ede8ab9b7df24435a75bcad880cc83607443707ae096f2bafa35d8cd581533917d1aae85a18ac0ca902876a1c68f11664a0a3ef1ae00593 SHA512 7aebbc5cc3e3227b455ac9c5538e1f0110d5621e6ca7315f6811733bd93e88ccca467296b7915894a45202ed375b45d9387a1d113a720d4199eff782afb43070
 DIST netgen-6.2.2302.tar.gz 3398683 BLAKE2B 7cf4626ee8163898864af0346cf2c4fa73dcca3ac2068d67f80b05ee926024b36552b33013c2ef8f74026ab942ae08c0628af0ce0c0dac2d004ba26e18bf4619 SHA512 da6e8e43d73af6b7bfae2e3c771d46e34601ff481c251924673f7330bae032a743fb9d5ff2792855e91ed5addb4d22fd4bf9cd7a9dcfb53f476e22a30f1eedb3
-EBUILD netgen-6.2.2301.ebuild 4088 BLAKE2B 68e73af9c8a437a9441f37efae478bf15b245f804604350804ca5fe021cec6ccd3d141b6d07f83ebcaf288e3f5c3cc6fb867c4e7b043abb20b8764fefcf79e28 SHA512 d4750c6ae2575d332b4b7896f10d646c646eaec12879fb764bbc067cf7f4a2fc77b536a488bcb062d4e29d441b5b0256a6dd7cdaf90f9b1100ac0af5689aeb9b
-EBUILD netgen-6.2.2302.ebuild 4088 BLAKE2B cc6607345e707b548f225e5cdffbee9f8fc3a4faa830de84f736952f91853745624c5205b97f6a24205917b36929f10a2d500b9ea3fab6e0b7d47564bd0c7fce SHA512 04c2ee32c5debc39b3a8a7b6287e8ba5c49023a127d602fa3f727c14019df622707de1fca6ec720bbec8b3b6aa55461e65fa293cda7b16a41f5ed142263c8ecd
+EBUILD netgen-6.2.2302.ebuild 4089 BLAKE2B 1d663d3a6d22a2b2c6196719b26a61d300735a917bb7493a76779dcd183526650f3ed2739405439988642b2c41af9eadee169e1104c7cbb0efe0747a57895d4c SHA512 3a8f4dd92088288330d4f63390d04bc867724766d12798ee35e7caa7e8691d74619c5cabead75cf24ae07c8cfc0f26bc4ad30e2683420f7f36ba4833e9b4a68f
 MISC metadata.xml 648 BLAKE2B 8011d98cf84e88a045f2ace8e31e48b06f9c7555d73f1220a1a877f36c579ea4829568837b31077e84ecf2eff932d3290032479b3eabf824c0c7e4f95a42c485 SHA512 f78534e481c213ecd3091ca2b09bfd62a654c1c5a1b6129db108a94e974b9d44090ccb3d89e8750a96b29ef182978bca65939b7c1a4b117e563c7c8503ebdb4b
diff --git a/media-gfx/netgen/netgen-6.2.2301.ebuild b/media-gfx/netgen/netgen-6.2.2301.ebuild
deleted file mode 100644
index 0975a50189e0..000000000000
--- a/media-gfx/netgen/netgen-6.2.2301.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10,11} )
-inherit cmake desktop python-single-r1 xdg
-
-DESCRIPTION="Automatic 3d tetrahedral mesh generator"
-HOMEPAGE="https://ngsolve.org/ https://github.com/NGSolve/netgen"
-SRC_URI="https://github.com/NGSolve/netgen/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="LGPL-2.1"
-KEYWORDS="amd64 ~x86"
-
-IUSE="ffmpeg gui jpeg logging mpi opencascade python test"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	ffmpeg? ( gui )
-	jpeg? ( gui )
-	python? ( gui )
-"
-
-DEPEND="
-	sys-libs/zlib
-	ffmpeg? ( media-video/ffmpeg:= )
-	gui? (
-		dev-lang/tcl:0/8.6
-		dev-lang/tk:0/8.6
-		media-libs/glu
-		virtual/opengl
-		x11-libs/libX11
-		x11-libs/libXmu
-		x11-libs/libxcb:=
-	)
-	jpeg? ( media-libs/libjpeg-turbo:0= )
-	logging? ( dev-libs/spdlog:= )
-	mpi? (
-		sci-libs/metis
-		virtual/mpi
-	)
-	opencascade? ( sci-libs/opencascade:= )
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-python/pybind11[${PYTHON_USEDEP}]
-			'
-		)
-		mpi? (
-			$(python_gen_cond_dep 'dev-python/mpi4py[${PYTHON_USEDEP}]' )
-		)
-	)
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	sys-apps/lsb-release
-	virtual/pkgconfig
-	gui? ( virtual/imagemagick-tools[png] )
-	test? (
-		<dev-cpp/catch-3:0
-		python? ( $(python_gen_cond_dep 'dev-python/pytest[${PYTHON_USEDEP}]') )
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-6.2.2204-find-Tk-include-directories.patch"
-	"${FILESDIR}/${PN}-6.2.2204-link-against-ffmpeg.patch"
-	"${FILESDIR}/${PN}-6.2.2204-use-system-spdlog.patch"
-	"${FILESDIR}/${PN}-6.2.2204-use-system-catch.patch"
-	"${FILESDIR}/${PN}-6.2.2204-disable-failing-tests.patch"
-	"${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"
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# NOTE: need to manually check and update this string on version bumps!
-	# git describe --tags --match "v[0-9]*" --long --dirty
-	cat <<- EOF > "${S}/version.txt" || die
-		v${PV}-0-g26d12898
-	EOF
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		# currently not working in a sandbox, expects netgen to be installed
-		# see https://github.com/NGSolve/netgen/issues/132
-		-DBUILD_STUB_FILES=OFF
-		-DENABLE_UNIT_TESTS=$(usex test)
-		-DINSTALL_PROFILES=OFF
-		-DNG_INSTALL_DIR_CMAKE="$(get_libdir)/cmake/${PN}"
-		-DNG_INSTALL_DIR_INCLUDE="include/${PN}"
-		-DNG_INSTALL_DIR_LIB="$(get_libdir)"
-		-DUSE_CCACHE=OFF
-		# doesn't build with this version
-		-DUSE_CGNS=OFF
-		-DUSE_GUI=$(usex gui)
-		-DUSE_INTERNAL_TCL=OFF
-		-DUSE_JPEG=$(usex jpeg)
-		-DUSE_MPEG=$(usex ffmpeg)
-		# respect users -march= choice
-		-DUSE_NATIVE_ARCH=OFF
-		-DUSE_MPI=$(usex mpi)
-		-DUSE_OCC=$(usex opencascade)
-		-DUSE_PYTHON=$(usex python)
-		-DUSE_SPDLOG=$(usex logging)
-		-DUSE_SUPERBUILD=OFF
-	)
-	# no need to set this, if we only build the library
-	if use gui; then
-		mycmakeargs+=( -DTK_INCLUDE_PATH="/usr/$(get_libdir)/tk8.6/include" )
-	fi
-	if use python; then
-		mycmakeargs+=(
-			-DPREFER_SYSTEM_PYBIND11=ON
-			# needed, so the value gets passed to NetgenConfig.cmake instead of ${T}/pythonX.Y
-			-DPYTHON_EXECUTABLE="${PYTHON}"
-		)
-	fi
-	if use mpi && use python; then
-		mycmakeargs+=( -DUSE_MPI4PY=ON )
-	else
-		mycmakeargs+=( -DUSE_MPI4PY=OFF )
-	fi
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	use python && python_optimize
-
-	local NETGENDIR="/usr/share/${PN}"
-	echo -e "NETGENDIR=${NETGENDIR}" > ./99netgen || die
-	doenvd 99netgen
-
-	if use gui; then
-		mv "${ED}"/usr/bin/{*.tcl,*.ocf} "${ED}${NETGENDIR}" || die
-
-		convert -deconstruct "${S}/windows/${PN}.ico" netgen.png || die
-		newicon -s 32 "${S}"/${PN}-2.png ${PN}.png
-		newicon -s 16 "${S}"/${PN}-3.png ${PN}.png
-		make_desktop_entry ${PN} "Netgen" netgen Graphics
-	fi
-
-	mv "${ED}"/usr/share/${PN}/doc/ng4.pdf "${ED}"/usr/share/doc/${PF} || die
-	dosym -r /usr/share/doc/${PF}/ng4.pdf /usr/share/${PN}/doc/ng4.pdf
-
-	use python || rm -r "${ED}${NETGENDIR}"/py_tutorials || die
-}
diff --git a/media-gfx/netgen/netgen-6.2.2302.ebuild b/media-gfx/netgen/netgen-6.2.2302.ebuild
index b28b9244b838..5a86024f6f64 100644
--- a/media-gfx/netgen/netgen-6.2.2302.ebuild
+++ b/media-gfx/netgen/netgen-6.2.2302.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
 
-PYTHON_COMPAT=( python3_{10,11} )
+PYTHON_COMPAT=( python3_{10..12} )
 inherit cmake desktop python-single-r1 xdg
 
 DESCRIPTION="Automatic 3d tetrahedral mesh generator"
diff --git a/media-gfx/openmesh/Manifest b/media-gfx/openmesh/Manifest
index a62933a7517a..fcd86be89a4c 100644
--- a/media-gfx/openmesh/Manifest
+++ b/media-gfx/openmesh/Manifest
@@ -1,3 +1,3 @@
 DIST OpenMesh-7.1.tar.bz2 22855582 BLAKE2B 778b3a40c2e476cdb2f50b5b4a90f8b6ae7852f166087426ff1db25c829cb4172cd7ed14db1a22229f7b4447e7ebeb0d6116647d929b7dab43d565192a8ac48e SHA512 bca0f937e08fe512efb436f5b96b83a1ff7945640e18fb1bb083956f04609560e29b1c1f7e058840791df77df6859fdd20ff6f49d80b908e8c1c5542b8615e6d
-EBUILD openmesh-7.1-r1.ebuild 1457 BLAKE2B c066180e93acccefecc3dba5599d06fe20e1ff4f623a80a0e442b7be3cbbd8e2e92237c358532cb5fcbcd5c71f1af9f43b8f768ef81f5eb3e2a8a0965b4ac8a0 SHA512 8489f8a1b395b4f4f036f9cefde9370d29e041daff0906a91c106574d1ba7692738859841c1a79ae917dd8982309a3394275de07541563446273b8767642bddc
+EBUILD openmesh-7.1-r1.ebuild 1451 BLAKE2B 95c4b5aec4504cc64718821f565f0ec1a5259e8eeadee9632eca28a17980ff0e10f6c4b35cfbdf704b97dc134a0145bf2344fc965bff6e5c1dc85764a7a40bc1 SHA512 a730b04f593cbed7f61ea2f15fccbe5ad4f5a0e1f27aa5235c8c442d26e87a39dfbd2ee74c383b1660bd4a070963c7be9834668418f94b554317fcb2008453b2
 MISC metadata.xml 649 BLAKE2B 885190b0bcbd5eea997faf14865a5873839ce727d3a98dc36f712063f487271d2882c2d5ea08af9d019edd8e780640f2684905ac01de00163e06e832c9afdf60 SHA512 f1c2f1b486f851d8ebc796c8738d1842e12edfc5968fbeea7c150ce8bbf6be107c64a7de051326d485222210a2972868d71d9cd619aa8a3fa5eca8bdd02da68e
diff --git a/media-gfx/openmesh/openmesh-7.1-r1.ebuild b/media-gfx/openmesh/openmesh-7.1-r1.ebuild
index 4f02e9b682d2..41c0b43f5636 100644
--- a/media-gfx/openmesh/openmesh-7.1-r1.ebuild
+++ b/media-gfx/openmesh/openmesh-7.1-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://openmesh.org/media/Releases/${MY_PV/-RC/RC}/${MY_PN}-${MY_PV}.t
 
 LICENSE="BSD"
 SLOT="4"
-KEYWORDS="~amd64 ~ia64 ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="qt5 static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-gfx/openscad/Manifest b/media-gfx/openscad/Manifest
index cc71f3a6c708..d224914ce133 100644
--- a/media-gfx/openscad/Manifest
+++ b/media-gfx/openscad/Manifest
@@ -7,7 +7,8 @@ AUX openscad-2021.01-CVE-2022-0497-Out-of-bounds-memory-access-in-comment.patch
 AUX openscad-2021.01-Fix-build-failure-with-generic_print_polyhedron-on-C.patch 1390 BLAKE2B 2c5e96675b15f9dc7020f21d5d2b5a9f7edcde154533dcda14762aef5cbe8bec78ac0fb9cc8b0426817027543313a6862c07dd5d17eb46fa101633ed55ed75d6 SHA512 58cfa61093edb3e18022b73cca93d4741ba2fddd259c37864d604ee66bc8f9f1f170677f2151b539ebdf70e3043c6d1650fa7578037c70c277d3eec4ca030a4e
 AUX openscad-2021.01-Fix-build-issue-with-overloaded-join.patch 3336 BLAKE2B c92caab0f33551ee7e66c6527dfa61d5ae70c3820d51188b6b4fc042a66cd58d207d4dbcdc87641b79733784d1c088af34a85078899fa4468522b4653fed7ab7 SHA512 f8860ec827efcdf1e0037c22ec0c1f8364b5f9554d264d2bac5be57c1b86e79f6ab284b65f1763c1548e8e3479c0ca510954937907f18f0db745826338a4f2f8
 AUX openscad-2021.01-Remove-double-quoting-of-the-output-file-parameter-f.patch 775 BLAKE2B eed37277c3e7ea84635c0b8cd02cc4ffde7abea78400ee39e67bcc782800197c57dae07a82084df47705951ced8968be78243a1d0e14a551783b8adcb669d43f SHA512 94306e68e53b01e799a5feb6f16a8f44c965a4b653b60227833013712f23648d20ac8272a7bfe38bde201af42946f91fe17231f120adfbe5b16e42b07d9f8d10
+AUX openscad-2021.01-boost-1.85.patch 621 BLAKE2B f86fa92c1f3c4a059550017e7a16ee808bdd4ff4a4196c19dacf8b86fd97458f72ebbf0ef763b88115d56eb0cb6ec565b63dd789c4558d8011aaf252b9ceea00 SHA512 786bf3739f8296b83047ac6c36432d331f392a1d1cf67fc2135a98f227840ff1b099437f5157bf8472ea47206a7ff2ef0de09e2b8780830e235c94bfe6ccad5b
 DIST openscad-2021.01.tar.gz 15817555 BLAKE2B 417857d704fa3c14312641ebda983eb85a1e3bc0d517a235fa3bd2523fce6f93c1ea526c330179bc35f03e6c73d3cd7c4c57cd71480088c21bfc99bb020ab7cd SHA512 8deaa26bf4c295c12da38f323d2b2e6f827851337f5bc1cc9c79afc083c9f913c19a263086e6e853bf2c8434c1ccc705ea22ddb02dc99d39bb1e5e03fc58d128
-EBUILD openscad-2021.01-r5.ebuild 2776 BLAKE2B 10aa840b5ffde6fc8ce4131b4cb8637511c438f571c60aec041091dadad3bf89ff075c9abc2e6a6e711f59b1a97d744d6ff639f878272ca2c7f61e9ac0b64e88 SHA512 a88fba00d07ddb57324f96f19cac6bef52eca435783f7be254aba84ce156b4393e1b72704f4b2d1085005a981990fe73521e3ef49b8307e43fc08a819814fa15
-EBUILD openscad-9999.ebuild 2731 BLAKE2B c75ab4c545b847f90af1561a8455ba73f8e444e7f2c2c234a6133797855996e23ff7e6714f84d7657d3e72529017ee8945a9883dac0c294e7da7b9c0a1432038 SHA512 891a97384357121f390077f3300e61dbcc4a6e26597c1a548a358a315dfe8dc0f18bc29b601719b7659f0c776473dde167109cf61df626a5fa6a2882a374504a
+EBUILD openscad-2021.01-r5.ebuild 2902 BLAKE2B 02406d442221462d7b31201a6a7e08628f978b332768d5bdc829ca9bd1fc533aeb3ec1e106b0870f026844052fe2c95a2b314ccf8b26459e6c26ec08d7194041 SHA512 4a3461c8c586a12fba89edd04300e4def30dba724edba51aecb0b76b6f1dbba2efb8c98028c6faf7fc627d4b99bedfe3ce86808205b4e1ae3451c3f54ac041bb
+EBUILD openscad-9999.ebuild 2820 BLAKE2B 97b9433782b6e0b486681d14d3c812ba3e09357223a3d86a81243c0932a5530a88ad957b33af3e677f71743994f7f2e31bcd86ba5fef8ef4868fe4bfe1a40d74 SHA512 9d22437d0656e33ccda551f0fc7424fec6127a4e1c9b7de2495da95b64761631cbdb4bfb2b84fa9724a7ba0e2b555d6146e900c7cf7f9fcd8d7f25905a0e9a22
 MISC metadata.xml 1685 BLAKE2B 7d859b263a2ff2e466b581f8b04aa1f5830ce5676ce4996e6537f904453a3b8078094ea12b8e8ec0369592d4cbafa705283ae9a93b04dabf078f00c62d7f3375 SHA512 c31e5f1a7a44ef3f1ea8a50ce43361fc8aba9377e48586b2b98ebd624a1a8bb682aacfa720a9a239ef42f5db0755e7be05fa832165d9b1fa861ff88aea507658
diff --git a/media-gfx/openscad/files/openscad-2021.01-boost-1.85.patch b/media-gfx/openscad/files/openscad-2021.01-boost-1.85.patch
new file mode 100644
index 000000000000..e3370f32fc38
--- /dev/null
+++ b/media-gfx/openscad/files/openscad-2021.01-boost-1.85.patch
@@ -0,0 +1,12 @@
+diff '--color=auto' -ur openscad-2021.01-orig/src/FileModule.cc openscad-2021.01/src/FileModule.cc
+--- openscad-2021.01-orig/src/FileModule.cc	2021-01-31 21:17:41.000000000 +0100
++++ openscad-2021.01/src/FileModule.cc	2024-05-20 07:50:31.746487490 +0200
+@@ -65,7 +65,7 @@
+ 	auto ext = fs::path(path).extension().generic_string();
+ 
+ 	if (boost::iequals(ext, ".otf") || boost::iequals(ext, ".ttf")) {
+-		if (fs::is_regular(path)) {
++		if (fs::is_regular_file(path)) {
+ 			FontCache::instance()->register_font_file(path);
+ 		} else {
+ 			LOG(message_group::Error,Location::NONE,"","Can't read font with path '%1$s'",path);
diff --git a/media-gfx/openscad/openscad-2021.01-r5.ebuild b/media-gfx/openscad/openscad-2021.01-r5.ebuild
index 39b12ee55322..3e4af4844ba7 100644
--- a/media-gfx/openscad/openscad-2021.01-r5.ebuild
+++ b/media-gfx/openscad/openscad-2021.01-r5.ebuild
@@ -3,12 +3,12 @@
 
 EAPI=8
 
-inherit elisp-common qmake-utils xdg
+inherit elisp-common flag-o-matic qmake-utils xdg
 
 SITEFILE="50${PN}-gentoo.el"
 
 DESCRIPTION="The Programmers Solid 3D CAD Modeller"
-HOMEPAGE="https://www.openscad.org/"
+HOMEPAGE="https://openscad.org/"
 SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.src.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
@@ -67,9 +67,14 @@ PATCHES=(
 	"${FILESDIR}"/${P}-CGAL-build-fix-v5.4-renames-projection-traits-header.patch
 	"${FILESDIR}"/${P}-Fix-build-issue-with-overloaded-join.patch
 	"${FILESDIR}"/${P}-Remove-double-quoting-of-the-output-file-parameter-f.patch
+	"${FILESDIR}"/${P}-boost-1.85.patch
 )
 
 src_configure() {
+	# -Werror=odr
+	# https://github.com/openscad/openscad/issues/5239
+	filter-lto
+
 	if has ccache ${FEATURES}; then
 		eqmake5 "PREFIX = ${ESYSROOT}/usr" "CONFIG += ccache" "${PN}.pro"
 	else
diff --git a/media-gfx/openscad/openscad-9999.ebuild b/media-gfx/openscad/openscad-9999.ebuild
index 2322d4b21967..4cfaae64dfac 100644
--- a/media-gfx/openscad/openscad-9999.ebuild
+++ b/media-gfx/openscad/openscad-9999.ebuild
@@ -8,10 +8,10 @@
 
 EAPI=8
 
-inherit cmake git-r3 optfeature xdg
+inherit cmake flag-o-matic git-r3 optfeature xdg
 
 DESCRIPTION="The Programmers Solid 3D CAD Modeller"
-HOMEPAGE="https://www.openscad.org/"
+HOMEPAGE="https://openscad.org/"
 SRC_URI=""
 EGIT_REPO_URI="https://github.com/openscad/openscad.git"
 
@@ -82,6 +82,10 @@ DOCS=(
 )
 
 src_configure() {
+	# -Werror=odr
+	# https://github.com/openscad/openscad/issues/5239
+	filter-lto
+
 	local mycmakeargs=(
 		-DCLANG_TIDY=OFF
 		-DENABLE_CAIRO=$(usex cairo)
diff --git a/media-gfx/openvdb/Manifest b/media-gfx/openvdb/Manifest
index b31d63475543..98fcc243e9c2 100644
--- a/media-gfx/openvdb/Manifest
+++ b/media-gfx/openvdb/Manifest
@@ -8,5 +8,5 @@ AUX openvdb-9.0.0-fix-atomic.patch 1548 BLAKE2B 718d9eb0511ea50733d7f11b6720a90f
 DIST openvdb-10.0.1.tar.gz 3461352 BLAKE2B 506168a4bb29bab2a3a3cb37002858517000dc1682f04d95387fd1e250b61c61d92d2ffdf9b679d83ef1ce270909693ebd46224b732ce264685004d1e47b3027 SHA512 361cef8932b69b19ee94c47fe78f665a1acabfabc3f45ff9f490e830f73ff092c42f56ce698677476a8ccf062c89e3e4dc6d4c550aa6842438cbd4d404ee83bb
 DIST openvdb-11.0.0.tar.gz 4620858 BLAKE2B b970167fffa10f28f89c0a3497c7a6076462702c7ede6aacc098239a81f5f09f408b56c37f84ea68e301cedff24920f02a6d08c1f00a2b9ca48925ef7cdc85c7 SHA512 f2c90ca8435ecbacefda429341000ecb555385c746a3e0233220cd78540cee2a26cc17df7b560fdfe2dc03f2b2e960a2fa226a85980189c3e018164ccc037bd4
 EBUILD openvdb-10.0.1.ebuild 5301 BLAKE2B 23512715e9b40466b8ca6ee4000b794a0bc8806cd2c9822d3ff21744fa496f55be69b53436aa920eb40084cf6c5508df156eadecd7ac28f139e1b137ccc144da SHA512 0da78e71c150b055521883cee4f46aae2b240fcf1e2d7886b171fcbcba6c583eb734dd70035d610d1beeb0c2c4f01c738fb6e6f904055bae4e3ffa779406edfb
-EBUILD openvdb-11.0.0.ebuild 9846 BLAKE2B 25d130ee74f0bdbda418a7a2f6f602bf5c27ad40fea5f2840dd12200ccbd58f29e1198e8d80d4a10af38b5cda1804da28b84c1d7f6894f98522fb00f42fdb75f SHA512 f9f6a9b9e98e038a3ec32e1cb5e5429e8afca15b20f4ca5ef252cbec10c3a9e73db2d333c41e52e235572576fe9aae1c83163d3607ab4112b905eec7dc9ee645
+EBUILD openvdb-11.0.0.ebuild 9845 BLAKE2B 4d99021440fa92b137b5ecafad0482c83b8afce9f36c89d7a08b1afcef258e321c4b53ad3174a52f722dc45386fdb24529940b609412e35f71712b40b8730336 SHA512 5ac047d5dc8ed3f4e62da04231e3c1b3c071276b9e6c976bf25870b6be406acda5cbe17dbb6ae4d6611f1ef1b08d3df1cae5082e85a6aca905f98ed814e6af38
 MISC metadata.xml 1920 BLAKE2B acab685a9a9f5f4bab9179e71cac281a2faf5d5f7e4cfd5ecbcd581bb57d148c85f7effbfdb8d796152605d38b18a42c2321ed80a10adb9ba97d5baf95d5582f SHA512 e2736509047f65a51faf64b112387aa75c31d4c6a7e0996b5d30c2f555ae3d705d71b68359bb4b665a9f73d0147cdf40c95f5ba4a9daa6d873507bc9e55034ca
diff --git a/media-gfx/openvdb/openvdb-11.0.0.ebuild b/media-gfx/openvdb/openvdb-11.0.0.ebuild
index ff01eb449a31..f8b4c535dd04 100644
--- a/media-gfx/openvdb/openvdb-11.0.0.ebuild
+++ b/media-gfx/openvdb/openvdb-11.0.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/AcademySoftwareFoundation/${PN}/archive/v${PV}.tar.g
 LICENSE="MPL-2.0"
 OPENVDB_ABI=$(ver_cut 1)
 SLOT="0/$PV"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="abi$((OPENVDB_ABI + 1))-compat +abi${OPENVDB_ABI}-compat abi$((OPENVDB_ABI - 1))-compat abi$((OPENVDB_ABI - 2))-compat alembic ax +blosc cpu_flags_x86_avx cpu_flags_x86_sse4_2
 	cuda doc examples jpeg +nanovdb numpy openexr png python static-libs test utils zlib"
 RESTRICT="!test? ( test )"
diff --git a/media-gfx/oxipng/Manifest b/media-gfx/oxipng/Manifest
index 3e4a99c16dda..371aabd26194 100644
--- a/media-gfx/oxipng/Manifest
+++ b/media-gfx/oxipng/Manifest
@@ -1,108 +1,156 @@
 DIST adler-1.0.2.crate 12778 BLAKE2B a1dc17786adae945ac09d3525e609ed944e6465690787bbb831a1b9d53793cba1989793d0a5606d5d23ee20d36457923d451b1b3530c9ec7072a487aa3e55bbd SHA512 7ab190d31890fc05b0b55d8e2c6527a505e06793d5496be0b3831e0513412f9ba97f8148f6f68ed0770fa9cd980a5092d885e058becf1d5506b7c74b82674aa1
 DIST adler32-1.2.0.crate 6411 BLAKE2B 51d44ccfd774158687b8244e83377e40ff896364e3d41e9015665131cc2a176d4ca0ab5a84df027dec0869ee735ee36f5687a06c1d2341de666070cdbab89483 SHA512 8ed72612fb78e213fc92963fdae0508ef26988656c939e6c9cddccbe2658d4a956a8ae934d9658262a8b2687dc446b3f1ee7614128b440487c81e606526dfda3
 DIST anstream-0.3.2.crate 19504 BLAKE2B 617b846c244ea4ccd6c7835a382afe85e14c245ea56b678f57ee12e9c7bcc1c0c3db9620eb4d16bf35e17eca38968bf04420b758f482ac5594670e6292c1fbb9 SHA512 b896e5208a2ee6a3c98bf3bb9ac1c52792de114dfa5709dadcac6183ea19ea63230dffd3217e571354a71d69b8eafbb0189e05f8f77f50922020de54e3aeecc8
+DIST anstream-0.6.13.crate 30928 BLAKE2B 0c6d0932dc486ccbe8d7e6f97bd8aae03fb84d4db90d0488070b7109de673e0af845a70a39e546af87f71f4c7f7bb159ab8ed68ac0f03a0297457062d9d69dc0 SHA512 4f9ccfd135de9be22a01230f39d571c8d8ccf7c3eba837fbf0868c9660693b60ee0c1c2f9490a587d5307e892ed45cb946da7a0690a9f972619c94fb050bde09
 DIST anstyle-1.0.1.crate 13977 BLAKE2B 35be03a7de78737592528967e8ad4851436a74c7863cae9cf5cf7366d3cce9bbbd255b1a89401051f82fe8569a0ff029dcfe427c14a2e0677890453c6119d241 SHA512 2bf9b83ad9772c6a3ef28239cbb98bd667dc631fd1ef76ec5029825c128f6cb22756bb1548dd991e482f86eb9fd94fae5c648f91de2c0d71754b6dca4ec2362c
+DIST anstyle-1.0.6.crate 14604 BLAKE2B 0716d0dbb62bf05c63c2bfe1c689896660073a423d26965ce2570f11e1925752a61209d78c2f2fe65ec4eb64ea4ffbb39669e789c0ba5d1b71e75de929153b20 SHA512 dc0e505465be54799b9faad70d0c6f7f0dcf9f5e1aaa43177b826c85dae626b054910244da0499862f066f6723a1560ad12100aec523f28c6198f1ea0d1b78fa
 DIST anstyle-parse-0.2.1.crate 24802 BLAKE2B 6304a56c6a9fbaf1bb4d1d177b2315684345dc9d71c35836f9544145364f8d6eb56e25c03076690c594ab7db5914501acb569f6c136952e59c93179ced527fb2 SHA512 5c8fc7d88ffc3a6e78340ffe0f3c2d72e865512030ade4509de9c673eba955c536bb1873dac11f6ba11cc8367fb30c67451ed65d19f81507c9e917c702bfd176
+DIST anstyle-parse-0.2.3.crate 24699 BLAKE2B 17e8638187ccc1ca0174a8cec7f7daeee7e0d8b8c430f7e74f9b10d8de4b49fd1c6facfdafde305b7a3e55b1ebf2b4e8ec4975a0cce691514ddae9eb5b5e711e SHA512 4a6d0f706d75c9b3c5144f34efdef3ef8fcd075962c594a23a6209ed56112563a34b3c01e05a08a0868d59204272d06211b2585cb9d06ce075ea875bedb2f399
 DIST anstyle-query-1.0.0.crate 8620 BLAKE2B 2d296b5066fd6284a2410923215571e6df650c5ef892d6de7a7088a0996ca30608797feabc84f3c325ff4d07001dac80ac5067d2a9c9d15d9ba59a276b399f53 SHA512 2781be5c82293b7ae338ec5046fbeb130de9eb2dbf2e4dfaa73ca5233032e1e52c133e141b02f33d4bc36d996a0a3f680ac82d42d614a5305005f60547133c7a
+DIST anstyle-query-1.0.2.crate 8739 BLAKE2B c06643e8616f1f4469a32f9c0512941ce53ac5db9ebfa7a5b2f19233040cd4438dd2ee69ab89ecbc1c239e92b674dea9df15ed673408c6f3fe21787cc17d76f3 SHA512 f409b624cbeecf58fd87c47f85be28cae1fe48f65d692195fb80854c514e38c40d0e0ffad3a5b388a3929c47bd2060302ebb635aa98dc57329f3a5ed7be3e2dc
 DIST anstyle-wincon-1.0.1.crate 11718 BLAKE2B 2500845a23edfb47ecd156424a89789c713a7c367c3fef98d26e4e7b2acb3c6433d39a1c2a59813a98266b0993d4b750e9b6b68b7ced7ec5a04a8b13bad174e7 SHA512 00c380fc0198c49776c40aeef419be2fd2d6809bd2e5d86457f1658c6f4b2e83ebe8feee95855c3bbedd4200a917f582bd41b0ee0cf5d7d1d5017228885a58e6
+DIST anstyle-wincon-3.0.2.crate 11272 BLAKE2B 73e124773f618a744b17017d4680ec6ccc84ff94fbe2e565073fbcc0facecd3cb65356cf27746d07f453bc917cbeb2ade3a618c6b8578d64cff4828c99569868 SHA512 4cc194faacffa01c6989354c1cadbf1134f0945250f67b7020ab5b475e30db34c799176bd335a6265386cb9c5e8b5bcbdf35894ec0c809b140ffe1c406751931
 DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
 DIST autocfg-1.1.0.crate 13272 BLAKE2B 7724055c337d562103f191f4e36cab469e578f0c51cc24d33624dea155d108a07578703766341fd6a4cc1ef52acda406e7dba1650d59115f18261281e5b40203 SHA512 df972c09abbdc0b6cb6bb55b1e29c7fed706ece38a62613d9e275bac46a19574a7f96f0152cccb0239efea04ee90083a146b58b15307696c4c81878cd12de28f
+DIST autocfg-1.2.0.crate 14808 BLAKE2B 122327d6ffd32e08dc9fbdb4dcf69128b19d56280f9d934311b946741003b40571cdd1f3ef54b2be02c8dc505aea11c962b244d33a92206bf4ee8f6b2b9da432 SHA512 66cbfd13e33b36284cf4c74c8d654f93adcc45893d127d9aaa4c1d183e47336096e72d74e7c17dd481fb7a98931ab6cfec7e4d4165cfb491861d4e3ffe2416fc
 DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62
+DIST bitflags-2.5.0.crate 43821 BLAKE2B 2d2a78b0a19dcb39580e6f73ed6c468b0626043010b34661084944c83561fe49db24bee1ab57fd692d57617be6506d529e095aea27b753a77e26d0b1ebf7ed78 SHA512 75d7a89e53e5e7582591932bc430e6a1db7ed0f914ded6dbcf957125be52975598df7fee14ef816f66544432ef0505f0a081f3794d17138ec429e283fe14fcf9
 DIST bitvec-1.0.1.crate 224375 BLAKE2B 9f109db6888cf73d69646911cc1c9e90535e54a7afc436d878bbc63ca20a30cc6e5b5b5cd42aa78c38df5a4012454769c126f9072f39d58bdd09e54887ba6d9f SHA512 83d643c5aca020ebbe9094b5aaba6a796e7c3c509228a4348444e57a06bc3a5dd042eed57a2254d91661e73bdab2bc0d1bd02be376906acc6b6d75b5354a8d8e
 DIST bytemuck-1.12.3.crate 39835 BLAKE2B 70bb0459b80fceec7f3c16c70a251f3d0e77069d77468e80c8ab2c3fcb7596dfd072c2214008d78ed1bd1a19332ed312b50a77b9f57c4230f2815768497fabcd SHA512 4bd87ace983d659877792e4f463d7ccf16e5a524f2c9698728bd688bf9d0cc5651cf641f4d6d987c8c26be5e56d11d22537389ac76a8d49b4d6e25b6a2284c1e
 DIST bytemuck-1.13.1.crate 42309 BLAKE2B 055e031a677823c110e44446e1e371632a0a5a8227ef7053e964bd3f9967705bdedf96b14178818021ffc09182ead805a68813a8a2b9cf7a70b6e8daf733eac4 SHA512 eb0a7e423a3f903fb831369e0c6d1e5fbffd7eff1b56bb7d1ffe4e5e18850cdfb9a7f9bdcfd53ce10b1c659dff11c59190b7b85ad89ca60485878548621f01c0
+DIST bytemuck-1.16.1.crate 48321 BLAKE2B ae8525a829a2c981200dfbc17de7f2a4e14fc6df71328c1a62b27dfa7488fdf634b4a6f45e65104bc45b828a91d3d0a70d06e9dd4c61dcba18db09204a22a6f2 SHA512 ba9e5eaae4d4d5ffd654da0359cdb5e85ad2d111b26a3b5147bae69519963ae3118ebe2afd34e92305cad3b3e573cd5aaf175c3bf81e94126f65ca3c9320b9dd
 DIST byteorder-1.4.3.crate 22512 BLAKE2B d39c546ba7346df315297fc53da4bfc77ecb1f38567ddb788549ee31cae2719a8bc0b7d1f1705abb3cff033aa57af004987d90748f5a31765273b3223a011c0d SHA512 8c8000eb8ecf40351c9ce36a3a8acd7a02f81786d1b11aab85adfeffa0f2267ed74df29b2ca5d1d38128484d1d3cad2b673aa0d0441dcd0620dfd3934bb888fa
+DIST byteorder-1.5.0.crate 23288 BLAKE2B 7f85a7948406844070a2c8202e0bd52f73b3dfc7c666a97046128044eb9352195afb80e2bf894c0742ad109e4473339de1365d09591de70dfec6c8c02a8e1453 SHA512 96caf981177f6ded9f27f025922cb94eb0cd9de5303bd91680099912d922092e77b7361efa70011e84f1595e443193e4f1b354443b9980c123f6ae573b236f7f
 DIST cc-1.0.78.crate 61375 BLAKE2B fd4765cf5ae0dc7018bc6b56298cd0fa9bf6fe23545e845670d98ce73baee55354e77c6d87cf047f10b074f3d742deca8b5631a250c69b347b4a1fc653965d43 SHA512 b85bec4c75cb1d1e252419052e9dd22b6892e54ea36195ff483a04f785b5b103e82b30b778459fd45324ffeb2463aa4f5696baeff2779c25ffe9f65eb99ae893
 DIST cc-1.0.79.crate 62624 BLAKE2B b3cbed3bd6fcac1c6ea258ec96cd107f859947a35dc89c3dc8f314741b0f668e61518f896ec32ce10c9a7eb20dd350bc177a71810d53ebea59fda062ed9d27db SHA512 cbf0a25f3a23fc540e9d638fabc23f761f1c240ebb4814e761e90437d71fc559cd155768ab9e78fc192220d8a605c66c3af342ed736b719181656170b98d7bf5
+DIST cc-1.0.92.crate 76130 BLAKE2B 45e7ea0f7f744bc26f81249dd4bf48b2022ce60abb2d7c421fac12e657fd621dde06510bca9331761aceb31f3eb69517aa59a46749ceb92b7fe70de855ac6045 SHA512 66fb052f123cd06f7901fa6db641773a2f016ea3636ec26670c83a25b68d33ab088d3893f4f08920de50f5ec932a7f7a33e00f1774aabfc55d14253d45b4b7b7
 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
 DIST clap-3.2.23.crate 219435 BLAKE2B e99a928ef61a7f9f6d7df2c38acd480fc86bfa3885d8b875007aa5bc855396641ca6772387de2eadc1d545dd201434037ea9e7fd138395831e4755ae5a917a7d SHA512 1f1f2ad07a0f8fbe8672f4252edf260ffb5e024a20d6673fb846d59e245a226a43675539ccd3cb252571766b1f6511c68c5cb0f2351c8086955d49c37f87338a
 DIST clap-4.3.8.crate 54806 BLAKE2B cfed7c182288fb85ed0635061b4b270ecaa2598e8147ac0536d0c7f6afa5022e370efdd100537338c1200d3d9b6dbf0d5aa357904ca8edb7cd42175c8d618258 SHA512 594c4000bf6c6f4ded2a024a5081f024ffa537dbc8d39185ab46f8818be6d4866c141a546beb43fbaebd439cd2a0f09cd9a9cbff956bf9fbce80a88a43709621
+DIST clap-4.5.4.crate 55401 BLAKE2B e9ece2eee6be16c366888f6140080c43a182aa758a971ab2f60fa5c8f5e00460c3e6ae6bface1f36445306265ce13d8145ac24cef833b68b2b2c32c13a7a4a00 SHA512 c1e88968a86598a6541cd8f8144909872fe71fc707dc5327293a71425f6ff9d4957491f93c36326a9f615c1cce1a453cc85740ff18e1ca571e91bf8f7a6ad7c0
 DIST clap_builder-4.3.8.crate 162239 BLAKE2B 216df308f032fcd1e63363144c670545dc6f2ee52e9e428119c26dbdfc9f905584243875f37b50cfa84baa20ab0cdc7867519c24a8b25fbf83e13f5fcd7e1d06 SHA512 a5eaa1c72f863bf5e332857d00d8a0ad51b7b89c3622ca75b6cdd05e461380974158a22dca31db14b9c4588575e3ccad04451de950b50bc247bba7cb2b870674
+DIST clap_builder-4.5.2.crate 163566 BLAKE2B 5eb81df416f3da0bb7e53c59ef4e914f03e2bb0563bb3707fbf70215f249aa523e3f5ef2205d0a8e25c23db6c6d0d344181c1c771566453505c769c55b355374 SHA512 af7eb8326a980cf461442a4dd6d224e61ae31a2fe4a45b34210a2c1f747eed49e00b6254699e82f986f441667f290a5de747b5e9d9d0360ed049504343385864
 DIST clap_lex-0.2.4.crate 9652 BLAKE2B 5120b508dedf52507068c0c369a45ddfbe0369e5c05b65bc5a78c422b2a4bf488f9ef1e0bed4e335450f2c08b80148eb5f7efed678039b5a94b5bd666385939f SHA512 6c05e5fd850befd45be9005af7252385f2304aa28a107413bbe329d97aea835f7acfd0bd169c99f69f466ab93d6e1c35d73a4e48343457a06fe2d6be5bedde0f
 DIST clap_lex-0.5.0.crate 11792 BLAKE2B 0409c9d957ea6a566eb8b50f4212702df038d04c4c38f7440d91cb4c58ec887940f0cf500c4c3949c2191399aac3f5cb1ce44868eac587cde90211d3e467b9a2 SHA512 0149ed7c2438a19b4857f895767550d783711078f07bfa9ac8ca531e06f51c7388110f4d558e30bf503536367cc370cb581e8deb6fe51f9b5460a334963daacd
+DIST clap_lex-0.7.0.crate 11915 BLAKE2B 03287f02067f6cb33bb3889e8032b0848e9a9cc17446eb0e2767768cf6ea8c579a7455d33c8af735fb8d0c16095b19f991a5e2528dee3a7628d68c16f9307fa4 SHA512 638feb2e4571677dbe15ef0423866d2f0df309723e5ad65ddeaff7fd5e2e83adcb973a32d52a5f3924ea88fcff865e956b7d30dcd569df0412ef47848af14036
+DIST clap_mangen-0.2.20.crate 14861 BLAKE2B 68fc1a18d0c2df088b4c11ba2bd4de73b8d272f888f9c1e7da73493012bab26a47cf178769fa657e4b893bd11eeda038135dd7a606a31b86e03bbbe57422deb5 SHA512 f651d0c044cea804c469a59a6f4e3024546cd018d73aa4dedc4f2ddd78c04fe0cf6790d442fc16968146068cd61c685819e5f39fef6320aeaf6dc210f61582c2
 DIST color_quant-1.1.0.crate 6649 BLAKE2B 9a2488dd00b7a33e15e05531ea49ef1961131f0be0922ba41e2d74d2b1a047daed483ac3a9dd87c847a81cce70a347395c557cad8228ab9a8dc5be7cc0f1bcaa SHA512 690c928bda4b7b57425f38ea68ac89cde2473b7a91b7e62c04a8f2c5a0fa3505e26b065d48b7ad0a8bb491f92f600f896fefdad3ce0e86e43cbf4f9a89e94201
 DIST colorchoice-1.0.0.crate 6857 BLAKE2B a0818be1299717461ffc1bcfb6fc53a0b3b645aa8c45fb72e045cf2d876fa207948610e58d6a837aad24838ea9616e80b0558ca3eae03fdf9bc4c03a8e5ba52f SHA512 53363f2889cd8e8a3b3ed10c48356896c0daa72f3c12c9c7804707ab0dbc07c0e34ef52fa4f0fb1647311ce5913168c1bf62c2407ff86a33f765a9e6fccad551
 DIST crc-3.0.0.crate 9956 BLAKE2B dd69f9cb18008a5ad67eb0577c2f6bcf0a39708af144f043b66d3e1c066d6942098c32fca171047a063292daa59303c0e299fcd9587c6e0a1f243192f858f9b9 SHA512 c40a5133ac27ee5fd4930873c64a52cfe8afe2598822a646089d380e250d16420d7baedd56aa1b630afa1e4433b35dc26b7811b919e752ba02b22d9de964e3d1
 DIST crc-catalog-2.1.0.crate 9863 BLAKE2B f11c3b606314cd8f06aaefec2cfe2dfa5c5851beea8ef3f27712f08d3615cdc1df13bd3e25dd38d1002d8a1d9e542da6364e88ef50d8fc64b03914b141aa28db SHA512 3a234d67342afafe3c405d1c88c8eeb5a875f9b4d552d1b11b0bfafed42c2d7dc776c7e6ad1a4d7aca00c8c9a0c6c1ce750898665194e67c7502545ec888a8ed
 DIST crc32fast-1.3.2.crate 38661 BLAKE2B ce3762b03d24d5367d89738991c060f4b3af7840e0a7ac7fc17d01ed438caf964bbaefad0fc4d0c438dafa5a578429ddd353c71197f8b54b1ec441395f2f7ee0 SHA512 a683943e252afdb1b9d626a07533ed11cf7a63af603c19640056c5d2b9c884ad9aff33ac54c0853ffca2f6cf94b0730eae6c05abf3e53e55e709d180c8152357
+DIST crc32fast-1.4.0.crate 38665 BLAKE2B 77398dedfa5e61357fb9abe3415ee53e45d3f1f7aaee959cbc9774f31a10ed324da2a558d20fd7c0674d450c8985b1e9c78b0b65e6ae2d9da6c873fe631c5ce7 SHA512 3e0bf1d2411ad9c651e0242c574cfda09403db24ab4b55560145ee73b31b08be45e5e12ce2db991d165ff056c7f2f67203fb2c048651f1c66ce90ec3276c455e
+DIST crossbeam-channel-0.5.12.crate 90515 BLAKE2B 5a302e58411d99d52630cd154f4f642ec925af3330ced9456a16e417e2e43a37dc2b2288ccc88137a75e682e7b10ab2979f1f90c0bd42ceca8fa84c700b7dd0d SHA512 e17b0e41901b2b41e89913a0a50cd1eaacbf64cd07f454605a85781b8b1373c35bedd16ccf6b24029404a3171e0d670fc2b1474a6448d0feb40ba0e41f99019c
 DIST crossbeam-channel-0.5.6.crate 90292 BLAKE2B 7da87ab15c384754d2493dd1a30e83550cd4b2b749b7f0c24de131f054e3a2e521e1bb4ba10094378c8f4c7bdf19218e35b10562c50b4ad1d2871bf6f821e488 SHA512 de6a42ffede95750a13e3b9af6ab26cbc498125860cd8e4d227c7361bd831e558254a48bdef5cf901585a915003071b0efa321f2011f282218c364780f62f44a
 DIST crossbeam-channel-0.5.8.crate 90455 BLAKE2B 017132056f1b40e55fbc7a09b75509d72b0a6123a0e5ea5d6104fe822f73b3ccce670d711d3b84b5ce743dcab5f10445297a6701b71213b77c0d56e2c3fd7160 SHA512 47677d6fe63050c51393e4a0537a3c65d7055c9eae118ebe60c5d716b4f47f23c2b1947b1e1b66bfb34a57c4db3a44631d323e996dd545565fe4f58c25863ff4
 DIST crossbeam-deque-0.8.2.crate 21237 BLAKE2B f00948fe90806fcbf1585c0404250dc84bca2cf27733bf7f2a0aa957e618f916162f41124333329a5b1e84909cbae3d93fb3b4461ab23e9dd97672c7d520d5b7 SHA512 a50a878d843d6eb1b5b92321ce6bfb87a23d3c16e820b1ff55472f0bd3d29b41d09ea95e1b9ccb2790f6687c043dd9ada1cd5124705e24292ccbd8fae1f243b3
 DIST crossbeam-deque-0.8.3.crate 21746 BLAKE2B c24025c65d7c1c98e442af95491749dd4f777af0509636ed66886dcf656359ec50dc2a5e26327559c6659f6b355d2b0b992dafa691a36571c99637cb47372d0f SHA512 f3201c9afef7d2d119702696f7e5e7997a104b8f7d67c7adebd1cbed84d3a3415636ff674f1ccdfd95d0dc162384e46c6138c8203ede69577b0d5359a4b44672
+DIST crossbeam-deque-0.8.5.crate 21726 BLAKE2B d97b35e8e8858deaa7fa9a836e836d02914aad29e5c34ab121f52ed65e95213cb2574df82273277365889ea771f04eb40bb2439347c259979f1dd6d5e9853bcf SHA512 0f0c9745763ab156136227cf1415de514952a3f8282ffe413cc249f9f4b345b029940e6a6c87b3be8331a7c783655a35b89c7a2547360ea5ae10aa64ba7ae864
 DIST crossbeam-epoch-0.9.13.crate 48313 BLAKE2B 6e548cd39fb400732dc179c5b7185555bdb8a367b5d3a27dcabe9ad36db6e9858604dee210fe487de8f9127fd6d0db1ef1fd04a1cc8cdcf34bedcf980c048555 SHA512 a4578e0e535f301b73f0332778e79b327bafea6afa43284317fccc49b410118360866a2dea8ac22f2977f309d07c663e5d95fbfa852ab795d414c170ee4e06bf
 DIST crossbeam-epoch-0.9.15.crate 48553 BLAKE2B 23aa0532d3126e22efc779859478098e505b4ec895c643530a3f7e8dba0543df3d8ffcb6825b1d3869a4418e17d798d464b3e1bb51522435d50f53ac224e22c8 SHA512 d9292c059ef1d156da52950137b2b3ea5eab66c4cc2f763d02078d0b0106980839ebed2ae2aec53e026ee7b3ddc37c4b51370d925ada1ad13d9981934daa7bde
+DIST crossbeam-epoch-0.9.18.crate 46875 BLAKE2B 200c256cad6011a3a14c4664bea6b150fce72d561c4fffc387fa561b08c0480e8756bf51c14874c5fb19f427424547f72d2cd7dd6f56fb8b6666a85f8d52bfd1 SHA512 0a8a199b9d77f4e28e91fe0a0cbff7e0dec58cac283631fd972477fa912d2f6ddfddaed2c695e4978b01cb5440b702822af6333e7c3dfbcb9a2c2086999516b2
 DIST crossbeam-utils-0.8.14.crate 42127 BLAKE2B 3e31e6371e46aba6697501a34e1b737680dcb692c0d1ba7cc1ce7025ec70ee69f7595e3abd90fb52c11e42cb43fa5fae6103f97add35cf87b0a68ea83213d0d0 SHA512 fa00a57c41c9daa152f8a6c6f4d3c77986de1aa21585984adf577e244c2f121db014ba2beb92241590e1cf78710e77d9a703ce4a4d44d8854bc3e60690151393
 DIST crossbeam-utils-0.8.16.crate 42508 BLAKE2B dfaf9e7cade2cb5a2de90dc622e58a69c5b28fe9f69d3cbb945431683cf48fb409565190e3414a815563afb12631d990476919890fc482ce6b5792fdc25536a7 SHA512 4b8d599a8b93015eea2fd404cdf1526fbb94662fffc7c64d2f0659aeef349e4ad682f61b2b85d075c7f3fbbc4d8106cd7caf6e65dae117ba982f31262df3f831
+DIST crossbeam-utils-0.8.19.crate 42328 BLAKE2B b2846f569555818fe7a3ef4aa29f68c638f933ee0251713c2c92624bee5f8013def5527027022963f572815991abb98d5e68d0fa00f478b2762133f84ffc84c0 SHA512 6e742fbb0d2a6371db87e81f8ac583259530a288237d0e8347394581c60004703a822318ec945936c410bb44001b115d8d986bb264e5b2d8091bb63a8edd93a9
+DIST either-1.10.0.crate 18334 BLAKE2B ac5d81e0822132846e29f8959671b14ac6047330d54020ea7d4ad790ef985ecb4ddcb96ec7e327b1a66b9c89d37b112dae33c9ac35232c136f60ad9baab7d5a2 SHA512 2de38a37b7f3e61effa89648acadbf220eacfda1ca7c82fb77484e45577769b724f7dbaa297e73e3d355d6b1bd5109373c3e96e4c1a13a918176162b33ea2432
 DIST either-1.8.0.crate 15992 BLAKE2B 5b9254d54ced1f23447cc78fca74f12085c37e3c2da441b30521819025ebb808e8cbd9cbcec811f8b3951030914c1736b8bda61744d1323af8c5b8b0a3ef3ee9 SHA512 5089b218af067b51ee39c085568a1a6f542e8f68b362207bd7126cbcd2b76783cd21cc1517a1d088ce4dad1714be03a3660f50e9498a0bb43a8676cd7ec490d2
 DIST either-1.8.1.crate 16027 BLAKE2B 2fad54b5f20bb8540fff5959ca7b2f9021c814ee610895d770f7081b12ebe2c93ce754c462df9d81824d479ca75e07f4a9e398c07a655f4abe2740b9c9de9c62 SHA512 5e4da301a605e0bc1ee3a269fe449aef044df05b5e833940c7f79bed61bbff4fc248e9c82b45dab92b2688d578ada000b271aaf67f2f4f7c82b35f05663cfe7e
+DIST env_filter-0.1.0.crate 11553 BLAKE2B 8e358517c0aeda431239f14610925bcfd6be3bd346c7628e1818cdbaa1796bfdf2454db99cd06bc6ffdca95e7ff47c0a621d1f4c3bb50ecd1641f9d19efe4b4d SHA512 a0ab51c2b905466d23c75fd77b430dff2956556b7687ea434050c78a497cbe63018c5730be950724c0ca6aefe29bbc379ac01c8a7cd2779a69c5a03e92a21bf1
 DIST env_logger-0.10.0.crate 36574 BLAKE2B d2f387682059fe9b4566ab995be449c58c57b8df5e5d8bd5ffd153aec1648721d8a9606d3f9aa034263651f5182043e08b6cc08d2d29d0a10f6cc61df9949a06 SHA512 4dd02f9d333a1f15657167ef4bd403eda5426cad17e0a4a43fa20cc65449345eb4d3fae2d6b10a3480016b9e23497fac13ed7e70b40c9450ef430be9f910d3e4
+DIST env_logger-0.11.3.crate 29704 BLAKE2B fd23d377d258ead87e820dd89e4175c0596b284d629563b7d04be10f80bf859d84a6e71a21d1c333a94779262608554e95bf7b44c35b3336cbedf545184ea6d1 SHA512 50df911455429a83088c87d30137fda6fc73971ffd32eb66f21e0d006bce92580c519d4a3a3fddadb7bdcce5d6dc33df853dff6373fe66f128cfd60ca26f9f02
 DIST equivalent-1.0.0.crate 6621 BLAKE2B 5e2c461898c2b029430c526db25188ca37b5c1f9f562c1950a7cb26b824c8b06d0ce62542c234e909873c329982641abe091f99074b6e40f13898b39fc4a5a86 SHA512 006fd57e6829b1dd9644abaa6f650098f22302e9882fa5b852c695aecdead8e353426626c56b772ab362303dff23777cc7012ec04f9618403d54f0e03e29278e
+DIST equivalent-1.0.1.crate 6615 BLAKE2B 302d78069d9df05e78b53f0488a9e4eb98fa2bc1e21893dc8a0acf2234347ba7c4df4b9d6b380ae77d8ffb1074b9c790460fe2dae47318aa1c4fe4208244540a SHA512 b2bc60e804c1b02c461dcefcfd60fc37145af710d183ebe65f9a4d63f2b2072d23193f98dc550a9213c7fdc6a2a837af23b04a89294ebbb681a4aaf5d5031140
 DIST errno-0.3.1.crate 10348 BLAKE2B 72831d0b69f95884a69918249cc0e814eb5eade3205331bec6d2021f8b01a42c4c9b494f2717033d65a4c5230c8490b6ce250d349c1e8e177b20e7e84a860020 SHA512 00d64157d066f1e7601c522c0f4e777eb662ca5cce64682f616de0734857765c343396f7161ac2908c3db0c474995ae157bfe9d8a9880743724d9bd428dfdf54
+DIST errno-0.3.8.crate 10645 BLAKE2B 4a7af10845f11b3d8f177a75a692be468e8ef0ee53fb84a4d212335f1499456b6739a59af260894b5c3853d3bf21ef3490d1e3a613305561203ca334a636c3b3 SHA512 29753c421c6f929760cd7565f8171696e4f70e677654a7507253f4fc495edbcf214ace27be46bdfe5c1a0d782f4b688f591476e56f4a1096471cb353c643328d
 DIST errno-dragonfly-0.1.2.crate 1810 BLAKE2B 781fc26dce5c33d83b9a1fd9be2b2ce9ac2559aaa858957ba6777e143b1e44cdfee48e1b47e3c91a95075a51921d1a421d0b45eb3d8de827cf4dd0ad744a7d8c SHA512 f853f1e1b8dd0f359a8f9a0399b3384c1103cd090d96e2b2204f91a40d40a9eb99383d4aa6a11e5470c51557afacf452d4be2049600d4235d27f59870fa3b916
 DIST fdeflate-0.3.0.crate 21790 BLAKE2B 3c96f6395fc42f66e436fbf6b747c2f3c2dfd8c38729bd0eb88be872ad55e5d964ba322b703fae122907d51892619687ac9b7a5e7546f8fe6eb7d80a91c1f398 SHA512 1a1862460745780407892c835b4e3431267044285fdd718dc6b316dbce9520d2955bf36e5e28257f2f758ba7bc3051b446e786d11ace83deec492e4c161664bc
+DIST fdeflate-0.3.4.crate 25001 BLAKE2B 69bffdb689dc467bd62738299ea17295bf7dd9d51c78b17e1ef6eee265056308703646791676c44430a686e1d713a8f561c5db972de7ab7c5e7b21050cad70f8 SHA512 a38b493eba656beb97275faf5a2f32c8a2c2cb12c5d5c280d37bbcf1406fe404151fd6312ec496aafdce802ef08745a6927e571890f9b290010ca5ac45ac9bdf
 DIST filetime-0.2.19.crate 15028 BLAKE2B f157d08993d74c7cf2051de416d5904237a4af38040fb362caf3a150511bc31d95245c892ed51da2f7269c3a43bf9cb3a8d6aab8c39a8c517627a085d5088f55 SHA512 9a30f078ceab0f24ff63cb6b80e76f357fd15aab9ec206186ddda950370b9ed738a6817b942cfc01baf518f9eb749e3b9c749718b4581ba74f65424bc226c34d
 DIST filetime-0.2.21.crate 15026 BLAKE2B 069f38a2c3c25c53b288e3af7372cc314f7b5aa7a094f88d231cbd9fcf935f0bd17c72cdf9c038bc2e78a35e6cb768a66f659aa535c72b7fca5452bb28a1fa99 SHA512 5adbeadc9b93811aac7e8a91b2999006e5022689c7772fc2f231d905b8c1210e1b1e14eee327a081eb70e351b3ba7f8973f492d99a138ce83eed45f7b4a8b013
+DIST filetime-0.2.23.crate 14942 BLAKE2B e4d2d9c11745dfa5592903f3c3c6a9871292a02f9862607b610ead7562b5d1fc3b64d37e779cad0630bde8012efda72d86af5e687cd2ef5d3627d8a89bca517c SHA512 8d5ac82482758577d1d0669abbe7b880efc44958687bba745c9ee4a5c16bddb44ec0fbe9c29cf424e7120905f3c3da607f3a7ca1e50287154c0475ddf2148bf3
 DIST flate2-1.0.25.crate 70210 BLAKE2B 992525ffeeb4433a222487cdfb0c3927ad77f914e1db94f612d80e81faef4a2c955c755c2b800251e3416d0b22726d5f7d7e432a81c3582c54b7de95ab7a324e SHA512 d81a463360ee2778f609ff297e04548120d1fda1f9e020fb2f429ea51189b8fe6cae57252fcd924d71fb65ad0f93ff7cdc7235913f8b78fa82925939cf884af7
 DIST flate2-1.0.26.crate 70832 BLAKE2B acbfad138abf2175822153867413dc89bafa9254494b4f13d958dcc6008a26fca6f934e8010b8c090367b8e25272a4ba3b26a31e59cec69c1359f83ca859d186 SHA512 a9f7b9e4adfd0a22fbf66e1cbcfe377cc03ec248c7fb7113097b839922b569cc96bf080089b8c800b35ec6f81b3f602a5860de55963b85f27ee6d75a9df88f3d
+DIST flate2-1.0.28.crate 73690 BLAKE2B c9f141bde0eda6b9c42da0a3ed69322c12c6c29bc522131f51ad56f6e2758646aa5585382407409257a8301f5f07a1825d150838bbb55822f2d49037f6279aa8 SHA512 9db6f3ddc4e1e91960b07c08712beabd911b297d93db8be3ecb97a392a4262e608c75ed8e9e34d87d58c3e67d1b7987734e14ab3d45fd837a2767e8016380284
 DIST funty-2.0.0.crate 13160 BLAKE2B db6315d63fffe9f70698da0b1b0e4aea4b509242c60e6639f00303dad8d2ba60c6c1c04fe9289695b7aa2d7a0c90c31fba72656afa7ad111b77358772b14a9f5 SHA512 691e1c275b648110ef42c4adece8178cf037bad40d469780280eb2ebe07aa4b0406737c5ba02c9f9f63ee57a99fec27e5e51712e2113655f7522c8678f689155
 DIST glob-0.3.0.crate 18724 BLAKE2B 1f1dd380e7d668a0c2cff9134279ebda958b4bccdd4a65ff01f9665b45ec4cce8ffbd47eb46e52cf516c5fd5803561e6bcb60cdee21ddfbb8601a95d45500620 SHA512 87098ffdbc518442995c422120cef71f83069c8f88a1970ecec5105b0f284ddd92bcee929f5c230d5b90ae1ead7e1214c3eea26f4a8b26715a00c1ab8b09bc46
 DIST glob-0.3.1.crate 18880 BLAKE2B dc89b3a664e810264dd7a01ad892e865ce35b504bfe5dba12d7ea8084da7de84feaa94c2208f1a1eefed90297e552636ad61ccebf6fc8cb4d01f27d605ad0a09 SHA512 29368160138bcb7ea5660f9f30c5711cfca8bc8ba836bbade3fbe8c424e7b4118daf27cffa677962e37e36f025fd2bb5a9c2aea865b0ff155cace455dfbb658b
 DIST hashbrown-0.12.3.crate 102968 BLAKE2B 492072f27eaec45abd2c5d7405c614c0c6a8221425e901bb6174bfa1688ee524408a618650126d6c683b7285b9bf0a21dcdbff7347e4d8f97bf7111defa1b7e5 SHA512 b3700fcd659a21a6b9b3777c18b37a83bf25542b4e8f2b963779a122f5d22e1742c064cfc03e649583e7dd5c6e90ca8407f8c51a0e8755f6a108682853022f76
 DIST hashbrown-0.14.0.crate 116103 BLAKE2B 24bab03e8a8cb7623b92282c83bf8acaf0752c696ee1c010249e3ebb3646e7549d8d6d798b02c9d5b621afbebba7320f8a859d9a1af1523dbd46377b857dbb5f SHA512 f0fbdf81517f59a0b67f792a4097f1131d346b2b4cbda93590749cef7f9f1c9029e0e182f58c23b74d3028f7502c30b9593c1eb4da37f95388d74b14582b8959
+DIST hashbrown-0.14.3.crate 141425 BLAKE2B 23c63a99c6c6b7a6b9b9e8bbbc7f1e342e1eb9d7582fc9eb408d3eec50c99f34502d450170bcfef4da7f2b1e743e1d1619875ec879e4753dffcb84f3c10dc3b2 SHA512 4d344e5c89ce58e04668b80ef10e4e110a3a5daf4d610c52d980577795d0e2050c7d0b151d8ba97128117665e27b92ab0300f85b88bd6e1de943c62d49249356
 DIST hermit-abi-0.1.19.crate 9979 BLAKE2B 801e8052b85341cca388ada9db4b06bb1bd7b64474185b2ad06c0256b9e597639bd3dd4ba0053ea010f922e53969a4ab47b90d451fd9b94c8f2324055d151ea1 SHA512 1c877fcd562b15d2de9c151fd6c5f3ea4bf48abcb799e6139a180ffad5d64b632f0000d5707bbd92ff23a0e5f349157b9e0f5be8b50f03680b0fa47315dbb78a
 DIST hermit-abi-0.2.6.crate 13027 BLAKE2B 4df5306639511a5f69594e903f8ce62482cbbfbfe272a91a12f407483dbac4e87c2d7e5668cc06ca5c0fc149ca93a3152fe6ad4bb3b96cacf56a22cb635e5b7f SHA512 bad8442bb822a9c99f6536db16523c80f5139af6a139bcc359c03725c59ff935816e2ecc5c491dc362ac75ab2dff41ab1e9dd29431f5e9a109b60eb9b7a8dc28
 DIST hermit-abi-0.3.1.crate 13793 BLAKE2B ece7865a09f566a95bfba5f1fba380bf12836c3761fc6d5a3d5543d3e50ca0eac81bb567d50b5643849cf1a752aa651a0db4c053c60faa8f1c74fe2f12819d71 SHA512 a55fe9230e4e8fef63284befff74108f206e76067257439d334d33068875368902dc690926a1feea15611f14123073867d7e9cd21397bc484cef849d6e1dfbf9
 DIST image-0.24.5.crate 270381 BLAKE2B 239022ae8f5cb6ae187fa886f531b3eda2134f3ca31501902a13aec104efa86dfc717aeaaad329a22ccfdd2d8ff3eb222d2acd83f01854333199611aa95c77a0 SHA512 710647226e060cc75550e6bf852a5d78f94628b44bfc5a9d20fcf60dbe10efb1b28d192e91d5a9ac8aa57e975ecc88b0f9b19d08e732694f1037d8c235b48fc9
 DIST image-0.24.6.crate 273618 BLAKE2B 3a76d8dbc30540d3b34df2bff54ac8cff024d3edbaf22d0de8acc6e48219b168be98699c823e1173d88316fe7b696d6cb89819d33dc04aafab010fce706ea35d SHA512 559f8396cedcf7141a05e3714f2e8e33e5b5873b0ea81d50f13c8e8ca860c1ec20dc2fe89feb59c8a72eefa1bf74f2b93ab81f28aea0339b2a4c24c5e4a94803
+DIST image-0.25.1.crate 9176733 BLAKE2B f7daa1982ec510de79c925157f2e1a861c89a92f1cc043617469f3c95cc9158f1ffcf274513556993bbc4bd5ee5f86bcccd406cfec06d98b0330bfc10687acac SHA512 4252672cb5b5fde61e9c7fce1712997ea082e3e7d5350970d597c0a1421b21078e1b4c3088474c4b500f396bce604d0749085fe4cdfe1c3b5f3d1ffcd39c1b04
 DIST indexmap-1.9.2.crate 54627 BLAKE2B dbfa551d33305db06b59d07c1b4bf8d4596a67ff1caa03062d07f6d78b4604ac0533d1c1fe3c371702dd7e65a012bfb960d79c76db37e264d0b44be576969285 SHA512 946c54881a347892dfcb55648a2b881d3a4d113424b8c76d8957980a834895318d11336dc438a04601916cca787420708ad7e271f965c38bfeae511ec1dedf85
 DIST indexmap-2.0.0.crate 64038 BLAKE2B e7a1b2bbd790f1446f77262b5b0799c2a816a01295a9a4db66f10e6c0502f8970982fb808581472e840cc34dc70e7938b89408799ed0d91aa50d3dd0b4807995 SHA512 59bc19653436389e1408e21b0933e5ca6f9fe228f0f5fbe9a7e4fb461b9712ba82983cbf22c0581eaf7913298b9ef5842702946152b493c1dc651381d6bce1a3
+DIST indexmap-2.2.6.crate 82420 BLAKE2B fac5cf6339dc3c0a40b100035a5c874cc7b2efeafeb31c51488d25156e392dc9db86a497e76eead351d2126f69d060422faa9c55d73407a0de9f5be18d234123 SHA512 53211c4a9003d751feb6dcdf1a76495764cbf32d24bbfe2be7023946622ef4f2b07a6de57109e5d24ee01892f4b2be0e0692e10cd31fd39c4ffdff4d37abe9ea
 DIST io-lifetimes-1.0.11.crate 37346 BLAKE2B 7f278b7378a8569d3552c9b6d4be06d7908e05d77cdb964267f0b621ec4975a42fb6e48fc030a75ad5865681adf32ff747943ac559ab4ad73331a6611a1b10c6 SHA512 30c6e5ce6f5beabe0d7bee4f4522884d1316cf7d9b8d093ba0f952995997be3d0f10e1e77b9c20b7fe2b65429de0d2ec89bb35e939455795205206a3154ed544
 DIST is-terminal-0.4.7.crate 8356 BLAKE2B f0f42d6f6204c68bc8a9e1290b9b059ec55f5aa2f83f6966711a5f986852befe21ac9281fd611e65cb4fcbf35dfb212748785c7258c44602e7e390c51f09dec5 SHA512 56c00b2942963f8a0b5c40c96a885f85565fb09e247bfd5a3e77ca5c9e0e0e40a17a8d809c0541177e8b496fef87baac4b86c751765491ffffdb631515d8acf5
 DIST iter-read-0.3.1.crate 8856 BLAKE2B 4e661d55795c444c93598a21a9af0ca209cb3a60316ddaf6cb4aae7b94db44d149d9e9ef02841ec21be1536a24747a6dd3c69b9a6604248125a31403b00cc010 SHA512 2adfe5bd73e7b9ba286959e312386fcf60055f57c1d3b7dce96b615c1e342c2b3affff85234dfcf401f89f8c1c4aeb94330d8b810d970e2708830d9db97cf7fb
 DIST itertools-0.10.5.crate 115354 BLAKE2B f24734bdfedf1dba48554e39b43669efcd4a43656eeb2c511096060daeaf049e1ad3eab232e757057750ce94aabad9fc8a0cf29a997edc6c4b167301c3443391 SHA512 d03c3cfba9841776913bbb6daad0c8945830c155f32ae4b48872e0f937c75a443f0ac9a0355f43b359ff75232f38b15f4f6d446b4be30b00b4209cf66ef770c3
 DIST libc-0.2.139.crate 638983 BLAKE2B e92b296cf8c916e10e859722ed75f4790401662ff7aa2fe8ed84ef9b94a00538768be33c272f0881e42da887c8c43e1fd44d061343386216492a76fe5d308598 SHA512 ff5fae517c49c382dee9b1d7479b65b0a818780453e5c00c416847d02f42186e2fcf19a8a8dc5e9cc2611300690c6ad324f9c0f0e8172e913a1b781fb7c0b5b4
 DIST libc-0.2.146.crate 684707 BLAKE2B 53091a46262389e327973185c26bf187beba392c45a92bfa424fc0976333d6c8afdac6527484032574086e32412a712bc2616468f7cb14e6bd0480ca2bef6da6 SHA512 4112c17cfda83041f33a7b616a365a0eb6603ba857fd7bedd64162021a6305c81da6ae8f37395732d7eea40d4fe648bae435ee0bf0b1a1a48400e6546d4d50b6
+DIST libc-0.2.153.crate 740614 BLAKE2B 523a41bc8cff4ebcba0edbbe9e6a2286ec7cb3ba5e90ca5926c972b68e4b34188bc077d20c22376238c3cd91b7455898a95c505ace4ededea88cc496edb4c5a7 SHA512 3f99e3a192974fffdc053ef21e9ad5fb54b7cdbd4755df176704a95dba38047138ccab76763e89c6b565f37f98fd549fe368749f84f6d1638b3209cb07eae9b4
 DIST libdeflate-sys-0.11.0.crate 184829 BLAKE2B b1ef8501181a4c8a107640d48ebfdf23561da74baec131752b88a782d26626dae3db9f14690332d0a7d46e573a2ca895dccc259558e911743c52370f40e88e28 SHA512 22e225734564958c527f88a0dd974de65b6064263a8392a1f188e4bb78cbca1f428dfbbc6886a1e7e9e0328df9306412f9c96888050fd1e75be8186bf1ba321a
 DIST libdeflate-sys-1.19.0.crate 192337 BLAKE2B 7a0ccf67459e99d84d016ab3769a166efe584ada7345a50ec5bcd4c7040cd99b64b5406e981c292662647a4111eaa39000e7ee3d1f5f60d7f6e9becf876b1903 SHA512 6738a663c11cecc2a3528fe11a26b3f2456df5d52ee79ff358a62ee38ab3d114a63d78d6596c0182a1734fd63c755f1eddb520bee1910761a225d42e1a6556b2
+DIST libdeflate-sys-1.20.0.crate 199148 BLAKE2B 77bbc04079dad1aa96fc21804ee201dbb5eb9334dcbd454efb789cd26812e7441de56dc334faf6f4726320ec7b945a0127a908c3fbfdb8bbcf6f270a5ff8a29c SHA512 b56d38ae5eba51627b78260454d4b9b58a000e765f6516ee59159496a2041f543ad973b19bbb3e8db7afc0d41940783fc28ec2efd769aa37cde7ab93715f6403
 DIST libdeflater-0.11.0.crate 23427 BLAKE2B 66c06e89563cd0c8cafa6c0bf3a9a3362660ed14bc59463d23e63d90b2db5712397571a4ae01d35ff6ebf023e0b7093f4f1bf5b26824ef0d21557a0a05e007b2 SHA512 69a4cc637fa6fa80e56ce1e378b6faa78c9596f98ff8e1ad4d03efb8d06e58fe1724beaf45e93262a762232099ee1f96a34200f76224ffd3dab85197fa221650
 DIST libdeflater-1.19.0.crate 24020 BLAKE2B 6fc0cae1fc2e66c59a3a491b5ce6258960b2ceeb8ab092e14410802ae40236c8c35bed1306854b736a6ef453716ec1b2a3b4913076597cdab4dbb602aa4f449d SHA512 d71bd0ad00eecd07d6ac7677e0a5f15fa944d7d2f5cd364034dcf0289ca30fa79f5656601ee3fb6ca2f2b112e28b9c99d86003f6e704193b2a029478d75089f3
+DIST libdeflater-1.20.0.crate 22114 BLAKE2B 2abadd93e2b86e5a9b1e60952fab09c7932c4be48c9bc790691e0a0b9412f7a29d22e82618145815676fc6dc052b1edd67cc6d6b4f316133a2628fdd534bd384 SHA512 763ae07856284a8353a441bd335bcb0ec55200c03a5924aa7d25b083fa05a7d887d747688d6e0e01ca8fd90480fcb3463c55b94a274f257bace11da792cf87af
 DIST linux-raw-sys-0.3.8.crate 1013776 BLAKE2B 375b29d2cc700e95d94ea8dc304cb711562952742f65c9664e33560a3da862aba74f2ad2ee66b1dface8cd5371ea9cbbc452ea953a6b6c656ade7d938b7d2ff2 SHA512 cb0e5c54870dacfa513ad05f7a84e9e90dc1a42f55685fe3e252fd25cffa4b875f1b65eaf4ad132ef0a19e6677c7763b360d71ff0060fe6ce5198f38b9956375
+DIST linux-raw-sys-0.4.13.crate 1493855 BLAKE2B 1298a038276e2424eda9873c642fb43d864b343b03b7962446122d2dbea94d58d9fb2b93e890769e6fe4092378755413ed6afba81ce56fd61e512146e44148a3 SHA512 3918da6b667a08ef8a51aa0b087129e2dc5ab101669cbba7690fc98ae2659a36861bf9410a3b87d18522a7549d43ac169b995ea192d3073f7249305a809cac62
 DIST log-0.4.17.crate 38028 BLAKE2B b46be3719fc0a53e50b1f342762e188587e9f1ceb692c72473ce2663edfb8253742d30024e68c1444780ab7fc0e2d5b0601b8ea7228dc3405a9342a57548e605 SHA512 2477d88db42b1d92c30708d88823212e236f613b3465e85eb425f83f8d16fadfaf0352f06c2999a1852102edd2f6ffb10ecb539d8a3b6c48f552a25622ccffa2
 DIST log-0.4.20.crate 38307 BLAKE2B cb9c9a401b49bd68c18d5e42f2ed94446f1aeb184caa23cefacad4ce54a2a357143af54a5595c45d6f3c3d20b054c451d9e6ccdc09c19cca99ffffdaf8bbfc72 SHA512 8661b0c71d3b7fc0d679aa3d7f06910e6d3da1c53862aa06526000e1bcaa0b0b068415a1a9ab317c318f00d15346dba8a4f5d2a60d8850790bed9cfaaf757b3e
+DIST log-0.4.21.crate 43442 BLAKE2B 8429b3270794d3e2c7f7d5b58bd4fa1abb9d4807ab3a1ac980ac81c11d9544635003d8cf2e608c2c0094865459108a2879f280278e121df68d09bc1561d604ba SHA512 0becc1a06b6e7048cff6c0bb8df49a16ac4772133c00239e9e9459c0811e7715c500f440cf1a9aef8d7ad74f57434559ca9b55917f588b8e476cf36eb6d4e10b
 DIST memoffset-0.7.1.crate 8556 BLAKE2B 1ef270f1c8dba32e66cf47a1835f10c342024762c0e56953f16e82d575250028154054d4c42b1324c60f955a40fad3bbb1c5fced147c11c9a4ad62f6f0e948c3 SHA512 40ca3c4b1fb929bec75bfcde0135037f81a6c5aa80181bc7dd7bbcd9c0946288eea8d23fca95e296567ccb02155ed0f66c7c23644b5cb3e6d3932be9f9742157
 DIST memoffset-0.9.0.crate 9033 BLAKE2B 19090c1af8b8cf54a2cf7593748aff4d3dc685ec7080aa476139c1721ef71555495e1bc513b1efaddc7e7702f83e0e1c2a8f71ff40009d266539484c9297e0ed SHA512 2f04f9b6fed31e94388c18162ad275897a835df7b9ac827f4df0f4b0ecf71064ef247f7ad11dbc27d7a6d448984a0f29d1c000e3c8d5fa6e121fa9571770ec55
 DIST miniz_oxide-0.6.2.crate 54536 BLAKE2B 8127ebec5a2cee1c2101d9533da573e01ef1a0fcb169bb0fb1419973ddd2e6953d8dfe85f9509a5d1226643ad290f0ee1479fc68f1788ade7ddf9633d90bfe1e SHA512 250782e214572acdd11df87c2788cd5f78e8388d9b285d0a850918219678e262e8b9905cc88728f5b70d13920ef9d19c43d243dad8fbcc18f8c8462662ce1419
 DIST miniz_oxide-0.7.1.crate 55194 BLAKE2B 56afbe0c0b3eca98105ae2d507493f365353cce29a6b04910ff26bc75899400fdbd067756cbda7b3d86f047fb8f3d737de00043a4a7348a813cc43e45824e33f SHA512 5eb6ffe34a866403273ff0267ff7838aeb50722ca57a03d5a1d842a5f19a3b4af570b133a3b9d64d78eafe49e4b9732b92dd63fd9c6b0ce59b3295daf10f6a3c
+DIST miniz_oxide-0.7.2.crate 55731 BLAKE2B e3cbf5983025bee879b8a735fa2912db8975cb60f0499498a73ce4375e7d452c9ed62d4b0b6f6a4fa591aab55e5d7ff20033baa007fd6c839b9d74b31142c0b1 SHA512 2f8f09d7afdb9d78bfc80a228ded85a215fea05e577e907921f1808f84aae30ab118048d7b53295f11aeb5de70ab6cbdec892f3a2417bedf6f53a4576d095432
 DIST num-integer-0.1.45.crate 22529 BLAKE2B 4da3e801f71ba8f92c692497e200bfc8d32183c94eaad91260683b09f4697c03175fec7cff5a9ff3782d5db5d514d74f22f7a61a102c0f0d2e67a7a4b4f29222 SHA512 731bdc09c3af7f9d8b171041f2957aa60facef93b06886000d8ba60d410aabbbee358d700bf31b2588b2e077464f290f24a0b712df7bb7f12972675b6c9bd735
 DIST num-rational-0.4.1.crate 27889 BLAKE2B c6db5b2165eb341268cc8b81df44caf25a18242d0ff1cc0959444ed9a51ba9985c1238d6d79433c3927267ceb181da6d491bf282560db6bafd7768b79ec65842 SHA512 a7547ca663543e9da9e18dd079762cde371b85d55874a54d6b343ba775a9373392c85cebad511c53b5af5db298bd5d57ccef6161c1c28587a6c9fa2c5962a0bd
 DIST num-traits-0.2.15.crate 49262 BLAKE2B 942ab170b2acce1cb40e6847f766bf810a79edd293d34f3a27864f464c16fe2b99fb13171ba429cc6d584248de879434beaadf1b231a4001b0e8389ed6c1be04 SHA512 5228498af0f15daeac3c9210f3e6e71cfaaeb30beea81dd37f8eb06b9592c8bf3226a47597cd8592ad4c513964a9a40f1ab2c33102ef3dfe3800d22c8d4528e8
+DIST num-traits-0.2.18.crate 51930 BLAKE2B 6c40e155d7a52267a7183d8030ef34245492d33f103cc24551b10da3eaa18e3db485062ff87057dc23e6b55e381e5c5d2a2633aaf6f4763c06677a0a0c524f02 SHA512 e395ad9f3b21b0dd1d3a94cefe0d68a42d1b1d429ddb2823696f9cd75042568a635d93d133ddb9497ed357e5b3be5caddb8e4a4af87b65882bbdc60b05c74ebc
 DIST num_cpus-1.15.0.crate 15680 BLAKE2B a4d98b29ad534de9bc262f58f615ec06bde5d5a2f5252f09b5a0a6ecb06a9daf9709ad9045eb08f7cb744d8a838854b9095aa73918e06624a84efbc11a9a5c1d SHA512 fd4772868def9460a6ee17ef6fc00b0bc74115eec891bb3fdb07ba5b5fe4057a2ac69eb31ba8beddbd3189c7be4545888e5724879f3a89132fbc9b32aa7bb10f
 DIST once_cell-1.16.0.crate 32120 BLAKE2B 59bfc8a44f1fec72442e3d34bf4be3a5af073f854f07b3618b2857c759dca4a0fa6ba358514ae28c25d745b01bb7b390ffe9ed6e296d163fd3dd67e49092b87a SHA512 bc199570ee43bde9245a2c4637ae738e370ce9988635c8342349ceb6fb158f376247b69f9ec4ea0e6d76b934decdc77a524299ebde96c0a2c2d29d9501b9a568
 DIST os_str_bytes-6.4.1.crate 23101 BLAKE2B 252fc826f646bbb999fa80b47f58ac9a77e409b10a99284c7b669304c0cd701a3d20e690350018f5d7de8c6c7d38521f3413ac81d08067dc26f76b7c0e5b056b SHA512 2199502ad24449e08370686a596f905325f5b145e105e8c7bf90ed7729bbc405e065fce62c98eada40f77f0665ca041db41f16cc8e62473501eca32c24e56f43
 DIST oxipng-8.0.0.tar.gz 51646362 BLAKE2B 3f2223f515d81bf7b229f3cd4cff5f26a49c8db4aef52076a0fbd5ad2bf259b3b56e83f90a9b2c2a6847e653b73910d9316cc85b00d43614c99e047dbbcfb2da SHA512 e8a45082f65c392d7c4caff10911e52958c671e86850681c281aaaadd24f50a153919cf714626326028769f3627b1664c420ba17cfc8fec86d82a8e81a7ab9ca
 DIST oxipng-9.0.0.tar.gz 22303586 BLAKE2B b1e5776a97ec305514393e186dba3ff4b19a6d0020182b1d1933020eb8cb6f550c0474517efbe4b9ee95ac40f867c05f5be66e7a7239eb00c2d5b7897066e980 SHA512 ac12b1e823c748b5a3d58081b86d5be69b970788fb3f2d4acc1db1f790455bd35b8b897203b1157674be83b9172bb4cb3ec1d6401538270f42a5f35f92a62f5a
+DIST oxipng-9.1.2.tar.gz 20940722 BLAKE2B 6067d9a222f917e9b9c7e9628461576e37cd9c51df8a0c6b1167b0c3f866dde1767804aeae48ccba5d3043fd05532754b6869ec32f9d2df919645be7d1134cbf SHA512 5e4ab6f8797bc03373c24886b105ffe79fb617342f9924f8fc416d1649bbc55cfe397889fba0a0211717f20807ef4e96c42cc3985c13009a1200ed755c5dc7eb
+DIST png-0.17.13.crate 103176 BLAKE2B 99bfd1c444f5967b715b81607e3c3266fb3b1d8110897e4c93afb5b6e0e28df262f9c9d842aefed922c38a5ff9d16e75cca065d7cc14ddadb3a7e9ea4776e787 SHA512 064a932f4c48c2243286a9b4cdec0487cc976291bc8ecf4753691afdfe43acda4b17ea8d48ec933f309d158df28f40ee93b5b32b3ab5252e2e7aa1ee1c0e4e84
 DIST png-0.17.7.crate 80979 BLAKE2B 37628fa2282c7195f983a95939eda1c73745f89d772904173775d7e1906b71615e45de8f59489d6842450ed6f7c7b809b28881c84d5a3399da38013fc3062c79 SHA512 f8009925a6948d8b9c82007f31eefd18d2173274816c0329673e48ef725aec52ca3aab2b91e8fc4f776c8f7f17475a3e065835e578a632445e1bd70794b18270
 DIST png-0.17.9.crate 88839 BLAKE2B b218fcaa166f142ced8ae75a47bb587015d0a449210f3cf789ef3f85eb6dec946c3744ff93a40a2e2d08de8a4973e12cc0880f8ef95c36f96c920ee47bc096fc SHA512 95c532136b7f31dc7aa3b04e721307b5a722f95cb815c885ed26a751b5c1eabd52b38aa1a1f504e610a5bc1baa6058ade1406cc833d0d2286fa7523f0c6ad5d1
 DIST radium-0.7.0.crate 10906 BLAKE2B d576e0ea5c5287bcb6740cee3a3838b6ae4dfdef0ef05d34634b96dba5159e48260233db57a767c9e032fa5d9a5798361335cb19f7844f450113ece30ffbc51d SHA512 51e23cf52997b46c0018a94b0259b29d7bf33ddba19f6db406ca57ee5b1417d7e5f27dda3bb487d0099886011a97f238e8b3dd4d6c86e8464c0b471c1a7622a0
+DIST rayon-1.10.0.crate 180155 BLAKE2B 16cb706d2317d8a349394c521ec5ab550290c5ab2a0a0dc24f0282fa7eb01fd1351a7dc8b5af3a55ea321e6526fbe037fec3cf8b32463166a082a6e417a51fca SHA512 3f628c58f3af3cbd1f245ca1be9c8393eff41112891fc4e676a2b9e26b6cba7cb80d7b6ce46e75bbb65e42fc00c5c0bb6b6a4b59092882f03febeb31f9cca5d3
 DIST rayon-1.6.1.crate 166330 BLAKE2B 5bbc439e0c88780b8d80cb36d4b4164e698a1189bd140e8c84d9f6a466023de0cd69a1f24c4217d595ae9af1f61aca6829461648152116c6bebeef0f0e686e50 SHA512 2e03585170e59f4388359817d67a43cd10a2244382615ae39bf84210db03a6dfec3b75d8a23800b8faaa31f45e8df4c44fbc343f02e18dd3dc0572c207791e73
 DIST rayon-1.7.0.crate 169488 BLAKE2B 518f0eda1fcbd1b1b230587ea18cab0023a699e796c819bf35a6492b7edb051137446bfbc49aaab0a68aef8280c970ad14301a9f8f7461d537af119a65b33a38 SHA512 d999c811b701d0aa4e547234bdc20a7df56728e142c4aa882bae081b7b057e8c3a72f4a62fb35535e57501e8c2ba7ff072068b59d6b5374e9ca6bb66cc0984d3
 DIST rayon-core-1.10.1.crate 70008 BLAKE2B aa6dc470af3464ddd20f75faa5793bbc684d1550e44e0148134be7219dbded5dc7c1a1da96487ce9132330f26a587d9861b64be342566d6550cf3806a764d51b SHA512 a9261aa4a648029f50bcca30bd991ef51353c258b9b8c98027efe9ff62e4b7be200e59bc7aa9144d9a3d39873b01bbe104c1d7875d61e02e089bb04e0312798f
 DIST rayon-core-1.11.0.crate 73118 BLAKE2B 313d65bb6e3a010569b317b32ac91c72e38282f4fcddbcb56ffa97de42d88c0d34f35f76b62e1ad60ee96b596aa681caf2071a8d5dfdca085fb1fbafb07c3ee4 SHA512 00ac782f49d688da90e823980e83b5ccd858f93769e2d801061fdef78728cff37d3a9fa4fd47a5cddb058f28f3289de349f8c8fdd94fa2f8c400d73bc4529800
+DIST rayon-core-1.12.1.crate 70701 BLAKE2B a32eb9ae9a71b4f0881f7bfd5375aa7db5681f20f7e0b25e6ecb3161f2aad36b93026c1691d02bf298a48ea07ec9475a237fba457ed0b0b8624aebab2b4988df SHA512 33d0297b682f131c50e1eabc3be583211a5abe790301cbca91bf510e43d6714b7564ca39fab7c4bf6f02aa0df6bb394f386a61320f21ddb6bd7aea1372b5e99e
 DIST redox_syscall-0.2.16.crate 24012 BLAKE2B 9497a52044458b1435ea16e86ee072e379b6b11ee31602ea72d6b6072a4a99426f409c2e58108a4e9c36dc193fa49c83951e71f4fd4e158eafff18c594dc01ad SHA512 63b5d876baaf99f5cf737679bc6ac7a9e3d8a41aa93f5c59416ce7e3841e2513bff678773553cfe62fb452707f82acc384ea63aec932a31bf94679cd1caddd27
+DIST redox_syscall-0.4.1.crate 24858 BLAKE2B c3301137a0b84e03b09d28dfa377ab3bea74d574a08cee21d35713b278d8b5b30ca2a1d73a0981baeb4644cbb88c86c8eb15ab3bb2692e38b93e6b35fab4e0da SHA512 073ed9d96090cf46eab9877742277a013c62d8da86d9caf2310b4fa868af306511936553579e01309f27067d344226cc8dc5e3aef01d9b900da2febd33848f8d
 DIST rgb-0.8.34.crate 16285 BLAKE2B 529d179db7b35948369eae985821cb943498c496a562c04faff62111de64b885fbdd30e299248314667484c6a76e2f62447779ea9531ccc33411a623370fad43 SHA512 2db90ed5e9fe4c28cddb1aba55daaaba01be93885815fd618cdb970df6c5a5c1ebd6af8550594ae57436df1ef631b1d6742e3f2309d665ef486b9c0d07f61da0
 DIST rgb-0.8.36.crate 16576 BLAKE2B d1cfe1d22070883ef9313376145f8810dab360259dc2a23b4507ed3eb02b324e1dde46cfceb608ce745a87cd2520b2ce49c1e8827ed07c7c7b9aeb60d64f981d SHA512 e1e812b04e3c6b0ab93f7a10161eef808fe11888a5c1fc0060cd91fa90129c31491d5c64de0cec989acfcf66ce481bd61d9cdcdcb54e5bf2556da0e5c3bb7612
+DIST rgb-0.8.44.crate 20389 BLAKE2B d72edac305278a82e1ca550b9be4bb6b07f649e90a05e1eac4675beda9caa649dc69433ab746ff3cb760467cc67b24f2f855c8d0ef68f9c69fe3fa2f2a19a30a SHA512 28882f526ce0cdb3028096e894b871d7289e7ebbc0308932e727a5d80639996be578c52ac6083c10b463ca0f020b93f9cd639742faacac75cd4da1344f595b47
+DIST roff-0.2.1.crate 10605 BLAKE2B 34d66bc4f4eb828523c464cd75632171277f6b1901916f2337013f8daf39915e1b7ee9154e18413145c9ae103917e0f34c2b6261ba16b3e969a2cd078a372c61 SHA512 001cbc21c5c8ca4362f91fb237b867966653e6f49fa20be1a6c3d3e8d9f2cca66c474eb0b59ecff1527c771554e8503cef94181295dcb007fbc1a50dab49ce0f
 DIST rustc-hash-1.1.0.crate 9331 BLAKE2B 16ac56622897f47a06b661fb59a196b08d48e782ab87549c8bd5c6fe92f374c9bfd44dcb36588512bd9b6125c2fd79a12d648aaa308fd9694bcca3a7c1b49ac9 SHA512 84e673ea9b046f7b989d47f2c4505557fbd5de991e6fc9f56a03605d40e0b4ba5427cd566954890153cc033ccbec6c984306634571935bfe0d4cdfbe56f39544
 DIST rustc_version-0.4.0.crate 12175 BLAKE2B 6fda2ce03eab45d7193fa0d70175cc7ffb56b7be85fb1314092bdcfd3948ea145420569ace3a47218a4a2a6e44a818862cea6dd8cfb945475496f63b591c29da SHA512 f66da7c6efe431db06cd01180d84ba67fcd38f8cd6ef693762957c00ccc2211f23c08079d7f184776e08f28d2d6ca3bdb5f5016f7de245c6193d4722891ba1db
 DIST rustix-0.37.20.crate 327665 BLAKE2B 6118482fa343a72519014136f6ec57a8822c8db2e0e041eed66c2fa709f708f562958554a39dcf02bfdb46ef1c91480d46284617a1610ce83b888196d001fedc SHA512 064ec448eadd6f9371e9ee64b579b934fdc71da5e1cce7e7bf3ad93010b379885770e8c97cdffbbe4f33dfbd99e0e27223c0b891e3725b52c5197c9ed37bfadd
+DIST rustix-0.38.32.crate 376999 BLAKE2B 681ea50f5405b3a749a26a481995d3a85800378067734bb857e32e5d3764687b0da4b3749d227174440e432b374ae9ada154a8288e4353ca2ff1b851698477f4 SHA512 8f028b4df785aa78fc798f3e053d0a4fb9b3c552a47f66f52f1666f4c1324441be6581ed643c4ef0f56d92e1a078c6d3b45be183fc3df0ed1fc89de0d610cad6
 DIST scopeguard-1.1.0.crate 11470 BLAKE2B f774eb90b7d3ffb2efba47518e9d1dead4017ab4b38a4bd74914daa84a5af4bf9eb63da0496e3924499d79cd0439c37447aeda4a21226f95645bddcd6becfabe SHA512 368fa5726df8f42b599993681579a9ffd0196480ee3cd0f9f671e8493f3bedd1e1779bdf2beb329e77e0005fa09b816e3385f309490c0f2781568db275d4d17d
 DIST semver-1.0.16.crate 29850 BLAKE2B 6a6a680e55b6e98e5d0d466cae2f144531d3019988a7a241e7f0e54ebf2ebfbef27eb7af5ac59a618fdaa5546bb84c65e4616734b775fb2e90d87c1ac0b07317 SHA512 4fac06eb9ea475f8a31dd85e4d28c70a351656914e8e61518ad69274e93f1b6f14cc32a5b0c0e5a7d9ba0c74d4a16d502518dfdf2756e8df5e45869886db8c2d
 DIST semver-1.0.17.crate 29685 BLAKE2B b9beb685eb9f6cffe557d1185997e1a93d0e50ecd8e9719d9855347f12dd430ed1020df81839b7924a984596437ae7fb2951e7ae44c5540692a7f37b591bee2e SHA512 5199923757e675506d68c252182b10f55955e47054880492e5471a0a0f9ad13ef25d552d2ab9bd68fba37121b8026d9989bf15db67e95265b3aa53d06377fda7
+DIST semver-1.0.22.crate 30446 BLAKE2B b77a951d959a3685b0373c80b9991a8567f8926d093b23b7b8fab48595b5d565acf7408fbfc8f4d58331f39e316a8068885d28bcd70c1476d1cda436a2dd88b2 SHA512 7dcf9b6a02650d71d6c9ab3c29e44fdef95af296208f26aa7be6fd6e16773e5e5e66418c303a0589d1165df6dbfd46ad6ebf9eb5b3adab25a51f340947b2d949
 DIST simd-adler32-0.3.7.crate 12086 BLAKE2B 8e0ae18603b344fd8a6573cc3fe1f8594ad542619a6e0d6e8f62e356a3a97409f4de3a215d561b8ed0e063ab431d81b63967a5a0b6561c45537a27ee84eaa362 SHA512 2976bb7fa153854ecd0d68ccdc108bf81d5da374839d53ce9dfb27e80d8db258bb817ea3dac73921e408541d75e2797b6d20fa63c42c1e8a935b6d75dee14bac
 DIST stderrlog-0.5.4.crate 24710 BLAKE2B 6e6e74d3a9c10881adbd92a9a77f65eef962054b24e6771cb30120f7a4facd011009c84f7b8251f02a38b58a0a7446d9d3fddfc37a0657dfdfdbd02b52de5edc SHA512 ff0073f1e039dbbd8671322732cbc55cb72a9012318dd8d20e156880deabdfe5fa67200eee7f878158fca673ef2e93ef43813a5647caaddda36288d23eec76ba
 DIST strsim-0.10.0.crate 11355 BLAKE2B bcb25ad0a7284e24e4f17ebe0ccb621bdc4118e499b50b094d98aa7e8fcc0b96716c9953c3516ce7ea78309d41d424892ded595259696a5bbffdcb07802b5c2f SHA512 78b318532addfcf5c1ccc1e14539e258aab9d3cd893cc45d82342549bde838c177d90f13c560671f8f32929af47d0b467db35e6876bd7697d8b3f9e055aeeac1
+DIST strsim-0.11.1.crate 14266 BLAKE2B 252a9ede4241b165525486aa8855dece37af77f5b28e0e1858c4a5d2047db9fa958328db10989234aad69463ab51b2303785ec056c63ea8c95bf95e111ddabf2 SHA512 0cebe0155a92640e56db9a599ae62078cbb32e1d2da8bfa67ed0e8f410a7558dfcf7b3c2720ff5913282e291ecf076aed9fe9bf84c8d44e814a642b1bed3335c
 DIST tap-1.0.1.crate 11316 BLAKE2B 60786fd5f12c2f06097330c26809fdcfce62716586d2e1985f8c01406d356ed0ab730a04dfe72ee3e1d6208a53c76c66883d45a76130750b41ba5b82aa721b83 SHA512 d69ff11a46e2fbc276212511878f48eb93640c0b147df6578ea057b23625f9366a7fc3926693fc3809688537af5ca919c91605beed364decf83c35a032310995
 DIST termcolor-1.1.3.crate 17242 BLAKE2B 5aef69c0004081bd3cc4d531d13d63627cc02313868c0faab62358d13abfa7b4ba82f142c2801d25a6ae46ecbc8b7bdbeaa21c9105ea3b8950ab6a38cdb88513 SHA512 5838fcbfd70f300cb4b62aab50565db52074c56b152ccc8ac1173e4676c0d5a636271bf5a645a77da6e1d4edbf0091af2cd4dd6d73b85c3d198c760898c06f3a
 DIST terminal_size-0.2.6.crate 10585 BLAKE2B 8696b9046c717eec8bf7246346af84a5d0cb740ac6e1335a4d8c20476628f4c0dd7c6106cde33513681466e9701d4b05d73f22a3bd2dfabc4d22045a69d31345 SHA512 95f38bc00f8c5e1a6913bb2a0a7c46d96e02a4f3234af1623ad3d7be41eae677e77f1b5d5d005d1e9d778fcc6c87196f67a51ab37caab5b4d299da79c85d06ed
+DIST terminal_size-0.3.0.crate 10096 BLAKE2B 097ef50a85945128dcfa36d8ea0fb15f11142c206462a32980dbbba4fe2872abd214823fe3c75e804f3159a97d6e929ec338860e9c89587da509fb9e6da5d339 SHA512 f3bc9144aa8a87556543584a2495df6267ce3bb017f3ed3d00fa43e89b5de783e1285ca62dbad9dd9c3b37e3a476a6f3ab0804eba2411cb594a569bbdb310681
 DIST textwrap-0.16.0.crate 53722 BLAKE2B 44140aa2dfd5076005749449a56e920418e71e34cb92f1d697eb3f3e7f6fe87b0a3861c8a4050a4a62e03187b6cadc4495e4200bee52ee183541431c73e47209 SHA512 97ae8acece5663e1a6b08b827179e96d5ad0ee67d635888cc3d83454b52cf48fce97eb0eba374ba4747834099c74f43d66d9fec868e84be45369a42c1aaec2c3
 DIST thread_local-1.1.4.crate 13106 BLAKE2B 64c19368f8cec46f23b3052759c4c4ef0de50748432790e6ea11b12477239b177d54e60b9046fdcb2f495b8e0b37ad82809d03602edab9fc85cf814e3bd94fe2 SHA512 db7ff3eb88a73d9313dd58d72397614c5aae6be1d64ead7f16535cae2857be3b27d189e7955308591ec64a0d67777fd2a62a2b124ca73facb9a2d8e0458bdbb5
 DIST typed-arena-2.0.1.crate 11439 BLAKE2B b5bd230a22894c5545966279b40a8493940719fdf79bed144ad41c363e7f73bfd40e1492efa8d96fb9b5b32e3a31405ef9dbddd55d10bb900ac082d41a034b03 SHA512 182fdac0ef9b494fc2966005ece2107a3c53b6eafe4eebe9be3d552aebe143e05f3db2b51693c253831744fc265ec2a557d31ee42cf0ba5991b38d075278415d
@@ -115,24 +163,43 @@ DIST winapi-util-0.1.5.crate 10164 BLAKE2B fc800aceae5249a858c806c3e969ef2545766
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 DIST windows-sys-0.42.0.crate 3006791 BLAKE2B 7a0962364ecc416cf0ae7e49cce1298a12d819003e488f6e77aff1a52710f00378638b6a05db5557a031e1b75659587657971ddc63eaab35495133762f99a7b2 SHA512 b07b119688f3e3ad234d36979947f34e8e19988fb62101afbe18ec8afc9c8a4261128939df8bbb849d5c5982422cb4c50dbcba70f2bf401fbb7c605df1b2b354
 DIST windows-sys-0.48.0.crate 2628884 BLAKE2B 551e900de4f67187ef034b60df9fd0e0d8f82a3100ef28e1eabd543ac129d882dc86ffcc1714071aba09e4cb2ae2d2f07ace1a32b99fd989ce525cf05991edab SHA512 bdf534bcf3face31e9ebe11427a911a53f89f4ff5eaea8cccd094e139bfe14b2aec602b1cab1df774794d999477439d9adc6b627a8e33c20334fc348ba2c47ed
+DIST windows-sys-0.52.0.crate 2576877 BLAKE2B 69d6b560ccfc8f679e2678663ba606060d71fa28efa82c8aef8cceaa2c63b06f2052764d60163964f939649a26bbec6361ee4b094555e941fae92070db566980 SHA512 24ee0df246c2b456a4987a9124786a28acd358768cc7d1305bccd81bc5bb8822b81a03fb18d35174a520b911c6d9b685f81a34ab319fee13da3b985273584f03
 DIST windows-targets-0.48.0.crate 7466 BLAKE2B 4ef6d89ad5b1acf26a1a24348122b86d3943bd95935499bc9032fbc7aa01c04999c723df7fecb4989854cb6b7cceffe141537dfb05a9eaf3902c4cb490533116 SHA512 1d2a29602a1e0846c8577ec9167c5f9972091998a5df449d67b13ad918bf37680e7f97247baf5e3010c166d0b3182418c2925470998b92893ee9469939b91e22
+DIST windows-targets-0.48.5.crate 6904 BLAKE2B 7396bb210f37bd51da86f39fca3425c8f6610721d5c4e94f9fafa0a8a8046303b3fcc6979146bcfaa32f4406d242a0455f6cbb220f84c6ff84650e755acf5223 SHA512 e079eeef255a046be7f8e6a31c14f7b230254ebcf05eed2944827bb3d2a0dc30940d87593cf544d5e7ef35f6312b99430efcfb01421d91b02bb9c4bef7d98709
+DIST windows-targets-0.52.5.crate 6376 BLAKE2B 1d39fd86380ab086c536d88e67b60956410b345790ccea62a25e6a700757b2a9cfa6dfeb7b86934cf47b981ea2e5f42dddf49780ad9829a551dc507fcf108641 SHA512 d00d7bc7eec3c10272e803ee5c9ea0d9b07c43311124dae975b4f5aae7408c5f2ccb2fe6e68228ea3d4e70b6b658382cac6992ea177f43a9cba2ef95c4fda0ee
 DIST windows_aarch64_gnullvm-0.42.0.crate 357917 BLAKE2B 58da715a46692ed786fa554338d446eaaa50c63ec1d4090cf0690a9211c0221034479e9066cad1c98234410519833826ae3163bf6724c3b06097d5b84d7b9fcf SHA512 8bd60142e8982ddb14dde4e93b9753f9ac34830c05c2a1dd4568377f9a928651bf9f026a0080e5bc7dfa62a45942376736954e3ac800855d00eef0c72929f338
 DIST windows_aarch64_gnullvm-0.48.0.crate 366543 BLAKE2B 9b10f65089fe6da3ff38a1061783f635644ae84f567f891eaced280af68f7ff3919b34289e8850aa34554bb0346903273ff0a7fa743ca8794c2d23a9f1b0185f SHA512 80c5aa74c5669f7acff3882a8e7575f15e8d7cc58c11a1cb731ff423eb9cc9ba43cc6b80e52803c0d44e6a9001655ba87de6f43a9fe858da6d6e3a5c983a2711
+DIST windows_aarch64_gnullvm-0.48.5.crate 418492 BLAKE2B 5c6f7d73ad05740f0bac304ed1ef9b2ea63b0d6ca8f875552ae299a0b73b1557e8fe996f1c2b69be9f2df350c9288690f49ee62239a2896991364331d6c55462 SHA512 20158d31454488f6053d3ad7b97d7fc6eae6cf37e4ba0e50c28bd29b368505eed64199ae31104d5f97b66846be54e5ed25c0ad31ea850819205c573a31ac0996
+DIST windows_aarch64_gnullvm-0.52.5.crate 433266 BLAKE2B dee1b69cdf1fbd4143136909e4df3adaa7b80d7630a01ca9a42fc5ad0d5a4d9a9e2873b43c6d8e55de59f237d9199fad0768c4e1cda3b1e5354847bd70d4c79e SHA512 b4cf511025458fe30d5b11368af285610e1654a8986ea9f78fa81b8bb87d38a00c4869441c62692534df66d06baf14c8a4d17f8eb06468eb260b99e2fda6439d
 DIST windows_aarch64_msvc-0.42.0.crate 659424 BLAKE2B a8c9a288767756f2086bd0706774cdcce5c8639431ad76ed122d4b6d13c936ca8fb1a463d34835b3a2728f4444e2f4b91ee772f00c54f348094da69c05ce6b93 SHA512 20c0840adec84dde03b143e5b82bb0003fee675310487f0071a81ed7f40ee647c4018ccb9ebdbc4aeada717ec8600a30dfb15510c6b336f07becdb7167668fd0
 DIST windows_aarch64_msvc-0.48.0.crate 671479 BLAKE2B 0c80f210437628e1d878d1d14e884fea532c7539b3030aa76d46f27d02372c715c6e33d7efdbbd770666472b44a66c30711a33d819ede9cdcd51c96355802d45 SHA512 617e47a7202f1db4dbd3ecea509682135ccd85e3a458c0331b9bc7aa1d84e5756b59c881cb098d5c6d4c951248d13c8253a8e8a50938e1997bd19ceba77262df
+DIST windows_aarch64_msvc-0.48.5.crate 798483 BLAKE2B 60c466d6536426425a34b5ca20da97c8127ebeb4fb9b1363911165bada484f8913fcd50e90410b5661e0c27dbfe8f4eeaa62fb17d1f3566bfc82b6255e11619b SHA512 223f016c6f1a44dbc5c8a8428b39438f75380ea06951b7c26ed0877b19d79410c6fde5e4c7f2c839b6e76159131f39a1230e0e3a208dfc425ba9117e3665c4ff
+DIST windows_aarch64_msvc-0.52.5.crate 827944 BLAKE2B 3bcb16d527be1dfdf18a9105ab259a064f00e949937ca423c8dcd1d2b90090d85aa7e42ca6ccc50c9baeee1aa144123d0a04643f9ff1147e62b2fce28b8a697b SHA512 c8974f81e37a43d92c4a8b142705e36b7acc58d9150d80ffa3997433da878044c467a2d9167ba792d37a183a0082d912500fea8c8fed743f395b63ca62a5758d
 DIST windows_i686_gnu-0.42.0.crate 728570 BLAKE2B b72079610b5c4fc798a79fa757b19f8c8baceaf7f4ce824193a65fadaac988ebdff1719a74d676b7dd017e11ceb029402bbac4e55c35206172e15a9bef422f78 SHA512 a24dd1ba5eb7d5231853bebadfde0575ae9071a565868d2f3d1bc6ec0a87380c569a621f0cba2552af7a1e46ac62f09f87cfbce3f674be06be1a7c1d3f421474
 DIST windows_i686_gnu-0.48.0.crate 741490 BLAKE2B 5a4a584f8d8ee5bbd2d4c5b6749a66f2d43fc9e4ef90faab2227709b270f0d46fc26578c029edd96877c71309316ddb32d91c39f46d88f9a484c614f866e3dbe SHA512 15149fdd48b61b6d993acd392dbd353d0280d984ea88745217e4207937174bb90cdd9701f69ff0fe06a842f03607cbb57937d20d79ab577181e605a8a8fadc68
+DIST windows_i686_gnu-0.48.5.crate 844891 BLAKE2B fdc37cd74a4982056bf22fdb7b84e1c55dc838f3cb19ff3648730a77e673ef4ecc0380b3e4277bb8df2fcfa25f57b69014713d9e3ed27c28e19b25b3ea2ab774 SHA512 931ba5c1e4eb8ae73248e00d9611298d1c4b4b0dae719fdeb9243930cd420a103a7bc2738e0a4887c42c8f25728d6c5d64ad141dc092bc3f1d0f35dbe37d303a
+DIST windows_i686_gnu-0.52.5.crate 875699 BLAKE2B 528ea431d080c5326e4c6ed316d9ea3e38b40c2e1322a12a432506a2c11555a94537661a0941e90c20eff4a9ce42c12539876dae6e77a1df18b522529928b309 SHA512 cc3e0362fb62dd5e8a855bda3be0177708ec8629ee9685f1f9aaac3f71a8cb082387388bdf49b09d3f5ee24a636b0b4f933d2c8bb75db434ee0192c8ce0547d2
+DIST windows_i686_gnullvm-0.52.5.crate 473064 BLAKE2B abe41ee330c05ee1366b3a835d15c6db3964ffd7b340ee69d215056b0d4b65c67f2782b0c04a55db64001098de87c93e2d447e25ef2a27f2cfa6685b8cf20c88 SHA512 da45c882248070911bf55698f62c245cb081a23254cdcf578df053905adb9117454235e52dcf1dd97c0d2248f92ff1d2fd3e18844a7be8d93ba08590c1eca22b
 DIST windows_i686_msvc-0.42.0.crate 717477 BLAKE2B a37e068f45590f0c31349acbdb56848106d6de0e1f8030e6bd5e1e174bd9a46737db54fbd61de99054e5e8c5263eaef0508c440f43c39dca82baa77792ff2743 SHA512 740400e2b11c1d177f7f37f844cd2a0f84b97a5adb03a7656661deb026b593a799ace8da1f9013ba9f74446fc43260d01dff7d4be607129ec7d602f341b2b4d1
 DIST windows_i686_msvc-0.48.0.crate 730056 BLAKE2B 4e4ad6ed94948145199c2ed50fc65e4af08455a0fd058bb0f763d481f30b029f99a2b8dbac087b29e762500a19270f6683baf62ba99d141eb002a5b0b5c8ea05 SHA512 11a50800e709712dbea907275bc0faa46d2eb2969118445ed5b932d9c5957a09592a5b26a40e554c1f5fd56c6d074a07637e6f88eedd2224e1001e62df7b469b
+DIST windows_i686_msvc-0.48.5.crate 864300 BLAKE2B 3d3ea8be55e2d6ced0eeda18abe1dffb925a1a78f456d683e4450d9f2fd287ad2e8494d65b2b770c677a12b3a60d10f0435e16c61880e3867c3657fd44892442 SHA512 70e2fb4fdb006a4cbd43ab2c7e940b277a15fb1790dfa2d1fc1f1fd18bead4886f6dc046e44326603e4894d988578917b8932aba5d9a6a4cc8424911cad9dc7e
+DIST windows_i686_msvc-0.52.5.crate 895404 BLAKE2B 02555169f8c5b944231a877de8693fc871ea0d7d33f52f60e164bacb35cec13d463af07c57fec4667948047cc222d8bda7f6a0be01a07e7184b69e4adc2b4577 SHA512 08c96f8e9385ac121549bae8ed228741b32004be20b2955d163a98d4b62af464f1682cb813681fa22823d20646f19335cf0a66203a876b105e119e05a4db0634
 DIST windows_x86_64_gnu-0.42.0.crate 692493 BLAKE2B e00eae443cfed3004809244654268ee1bec17975166ca876dd393dcfe8a2ef0ca65d81b04c8f513f95a0fae9405ba796c085951bc2c597d252a3122f7dbf6425 SHA512 7df7ee0c345f0a2c37d7f9ec3a2824116b4d7a943bf245787509e67809a4f31ebb1862e212efb2d943d82ccef77a716437cdc61004396ca86e95e688368c6dae
 DIST windows_x86_64_gnu-0.48.0.crate 703595 BLAKE2B b227efb78a99c43d0538cceadada3fa1840df29adc665787fdcf845b73e77d782da8a9f9aa602e1da61401b550d0107176feb6c397c922a6240b38cc8f04a180 SHA512 38eff1164fb37dbd2bbe53404b20cba92de84cbbd5e4eb9ad60d51fb43d6fdb8b87a1488e2c88ebd4b3ff3b708f93fdc05df4b14a285d3ff11c33ff0d9828602
+DIST windows_x86_64_gnu-0.48.5.crate 801619 BLAKE2B aa7e7e6a6ff9f9553ada3a0a39a9aa798e9d995a8eef36e0b6fdb2a0db93ddecee5548970575271fe43aec74797a420d0ee231d503b5bad1bd999059261e0e33 SHA512 1d6056fae430b3d042bdff3c6217c76be4b8b9f5dada9bad06beaac2db7d7ab9b0a82e44f498ec88e61afa73e99f56d84d445dc3847732b9ce5d947e08485f74
+DIST windows_x86_64_gnu-0.52.5.crate 831539 BLAKE2B 54f84c19988addeb7cbbbddb940e430e7345944589419592b99addf9b83bf6d801b18f4e80399b85bbb0b0ccf4608e36d9a50b79d8b1d6ce2b93745856e06eba SHA512 d9bf91765d02d2727344e42081f4bcfa73be97991495126f7e633f27e56a261ada3a8b865a559cfe71f9bc9aed5b14504f89138796766937b3521009726dfab8
 DIST windows_x86_64_gnullvm-0.42.0.crate 357906 BLAKE2B 02e08e696f18105f0c131fcf5db046ec945cb21ede76d2da477589e15d062ca6f04906dac80fdd2ef9fcda9244490aad86b401d0156eb6b65ba3599098e8cfe7 SHA512 242e11b4a0d50a0ffe8d0e26e971de30ef4d29260ae6749403d39cb4278297a240c1ec4112bb38151cbb11a6f3c8a743e84cd75b6a76adfeaee8e623649c9ecf
 DIST windows_x86_64_gnullvm-0.48.0.crate 366536 BLAKE2B 295dc3aef18c604d1579978045f4058b1a315083a8ab842bddf5800ec3460b1530ad88c3464acab712a229290aca235810de8a3b6a253859a354d9fa97277e58 SHA512 8d82fad4c8445030844708aa026a62f1ca43362b8e15f14b0d226c7e9cda04ffa0715087b6a025dbb738e8891de24fcc4a2df071a532917cf03c4a46f934f396
+DIST windows_x86_64_gnullvm-0.48.5.crate 418486 BLAKE2B 12a2199d434617c1df1a839e9f435620ad64b40c579f6d0c3677553ad7a48e5765d12c266b04946402e15c92cff2e4ac4979ce2130750ef426e2672119680284 SHA512 c016d5b5e73832b61ff67929d92fa8c16e154656294357266ad29ce1f44db4ca2d2935dba31a6b571187dc838b1d22f1e3b41fefffd1d719a338439adf1646aa
+DIST windows_x86_64_gnullvm-0.52.5.crate 433246 BLAKE2B f34328a6d100e092ecb34a6305daedf4fecd71840432f104e8707f049b60d784584ce4f02fabdd0281fdb8bc7ebed34b38fdacf3be9c8abd60084e9a4ee9fd56 SHA512 22a978c40df9705cd94e4c52f2b706e477e667b564c608d0adb144b38cb486c279c09d1eb1dd2d6c7bd3401b75a2dc5eafe0f7d642ffe6453f394d1f59483a08
 DIST windows_x86_64_msvc-0.42.0.crate 659377 BLAKE2B f01dbfcb86dcb7301790a1a704661864378021cbb92b147fdfcee978b7011bb770441c481b439985c298816c524c6a11f21a7bd81115e65882fa000a28566bcd SHA512 94d6554ae293785d2fc9dc9d53480c98bc08ab2b78bd8684a0606e7e0ec156a454c1a653d214c21de382bc7ab5d898e45000ed73e6110f679da513ffabbf3cb9
 DIST windows_x86_64_msvc-0.48.0.crate 671422 BLAKE2B abb063610dcc38581657133182b7d9efeed5553df67bd2bd6f30f1668a645186e4824f9ef556a5abc84ace10b1b437b6325bbda6df5a64ce880d7dcb743ac786 SHA512 6e598b8e3ac54912a8ebac01b0dd2c58fd282072527d7fedc7f6ebecdfb7dcb09ae46c22293bc0117849437f8b053db5e90406e7a38276f0f0afd06be3966795
+DIST windows_x86_64_msvc-0.48.5.crate 798412 BLAKE2B 8abc0721e2fb337fe17c91d278947d36122d9045b839ba0cf3e690202d242265b676f23cc301da5f9d98c56ca4ecb76f7d6f072ee71bf986a1deca87020b90e5 SHA512 fa1c5cd14ca2ff0082e2504cf59d317dc4dc6f7138d35c12f95d4476a9c13d8b7f5537d0ee251eee7c99411ad31b22263171b7fbd391daa5d3ea3488ceaa61a0
+DIST windows_x86_64_msvc-0.52.5.crate 827905 BLAKE2B fd5dac198bfbf29878cb461a7338c289c9af16ea80b3e5fa567980d2a6a5ea6a1cd83729ce6fd67e4da171873083dbeb1d6e16a287620f0245201f9cb29c29b4 SHA512 81176090dc725d7fe3867e6322fdc4a4065168580847b35e6f8da345f685c4f66a81e35cd1880dbaabdd4cdc82446dde9d6a0e583cf0b7fe47dda8bc8002f1c6
 DIST wyz-0.5.1.crate 18790 BLAKE2B 07ac1435a812d2f50309348ef8378ea4955c001f01edaf2ffab108f7d524ee731f06b22fd42c043349a4a2271ec47ea203e89562076e8c7c1719112b0214c89a SHA512 15d86c167145c90e3fbabcefd11754fb1cb835896e32d1bb7f4b027e5b2092f5fdbdca4062c129bc38e655cb87c6a3f4e181747ee25d89db5e01fb1fcac18fe9
 DIST zopfli-0.7.1.crate 44416 BLAKE2B 14c6e7982f34de921bc3ce0048281e76f1de9715c0a108cce58d216af406eed16a06014de0af023d0090f6ae26fca0a62049179401875f6a3a878c366afed2b5 SHA512 caa7f95ab2d5c1611d84b6d73f33a0722ffb459759614cdfcb4a7fadcca679e2387486848d5ebc4f2a2f5aabaaef2cd466dee536c5d9aa3410cd9dfca9755678
 DIST zopfli-0.8.0.crate 54234 BLAKE2B a5e0434a4b20840f2bd59d72121849ea23c2f21d0e87bcd6e918c8521f2989c71aedcd98853533a85bde576bbc064e56497be864065e373bba3cfe8b9b9cf94e SHA512 3b788f0ca94a106ce690764d081bf277eddb364b07287c33be3855fdc63bd583b5e8aac95b709833b4ec4a8f153e7e1ea822b09da23d5db777137bc1dd49e17c
 EBUILD oxipng-8.0.0.ebuild 2248 BLAKE2B cd63860e6989f30c4a3aa60fc1a482e13737ac37acd71d19e33e3778036dc3d1326c51141c9103efb8a28f639192825a7c9814ff9ccc7f6f315ffc0a5031e3e8 SHA512 fb92eb7d550f430fc944fffcaaea00e04a03a57a3813a7972ac834c4afa6cddaec14d0ba9adbfcff89bb38efd52e4539d7fb185b349330db55d9543c48cf8904
 EBUILD oxipng-9.0.0.ebuild 2279 BLAKE2B ca45c8e5f686ac77bd453a415f696d4224f2e3548cba679e00b57448cc6a030e5f35111614079344932593d51cb33652a31b0d96a65aaf6c061c565cac6443f4 SHA512 cff8457f7b6606a7baa2e49eb43c4d81d155b0b9e21f70f700a37a85d41b64a15884b29622dd0478440ef8f7b68e86af3db8240aef765572dc20a3e9b57a4b4c
+EBUILD oxipng-9.1.2.ebuild 2636 BLAKE2B 7a856e58675b6f5efcc83cc7fcdd29b82bfa3f52fc5f7d2bfec98c3db3ce729075c93490a19d99f8f4999ea354b3ef4d178ebeaa85791f76ad8f58f4f49861c5 SHA512 1cb9db23efb8529fa829448d78317c9a9713c88c24acbe38a635c5388a3cd32366d9a5288a4d6a6e1712f3caa172e905638fda611fea0c0da9e846d3e23d5b16
 MISC metadata.xml 622 BLAKE2B e1d908e3eddcbeae97cbe17f3d599980afa55073f4aec05421d77ac43c6fe73231d3a5371cabb341bbe325918315a16f356612d67ceaec93cbccead92d5b545e SHA512 db5befcc73330783a467043ddf7af90341b13838348108e49826ead55c009d3597652c01b4e378955326ff1db2c244b65418c25af3c10436a3b4fbcc566ef0bc
diff --git a/media-gfx/oxipng/oxipng-9.1.2.ebuild b/media-gfx/oxipng/oxipng-9.1.2.ebuild
new file mode 100644
index 000000000000..05985f225a51
--- /dev/null
+++ b/media-gfx/oxipng/oxipng-9.1.2.ebuild
@@ -0,0 +1,128 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Auto-Generated by cargo-ebuild 0.5.4-r1
+
+EAPI=8
+
+CRATES="
+	adler@1.0.2
+	anstream@0.6.13
+	anstyle@1.0.6
+	anstyle-parse@0.2.3
+	anstyle-query@1.0.2
+	anstyle-wincon@3.0.2
+	autocfg@1.2.0
+	bitflags@1.3.2
+	bitflags@2.5.0
+	bitvec@1.0.1
+	bytemuck@1.16.1
+	byteorder@1.5.0
+	cc@1.0.92
+	cfg-if@1.0.0
+	clap@4.5.4
+	clap_builder@4.5.2
+	clap_lex@0.7.0
+	clap_mangen@0.2.20
+	colorchoice@1.0.0
+	crc32fast@1.4.0
+	crossbeam-channel@0.5.12
+	crossbeam-deque@0.8.5
+	crossbeam-epoch@0.9.18
+	crossbeam-utils@0.8.19
+	either@1.10.0
+	env_filter@0.1.0
+	env_logger@0.11.3
+	equivalent@1.0.1
+	errno@0.3.8
+	fdeflate@0.3.4
+	filetime@0.2.23
+	flate2@1.0.28
+	funty@2.0.0
+	glob@0.3.1
+	hashbrown@0.14.3
+	image@0.25.1
+	indexmap@2.2.6
+	libc@0.2.153
+	libdeflate-sys@1.20.0
+	libdeflater@1.20.0
+	linux-raw-sys@0.4.13
+	log@0.4.21
+	miniz_oxide@0.7.2
+	num-traits@0.2.18
+	png@0.17.13
+	radium@0.7.0
+	rayon@1.10.0
+	rayon-core@1.12.1
+	redox_syscall@0.4.1
+	rgb@0.8.44
+	roff@0.2.1
+	rustc-hash@1.1.0
+	rustc_version@0.4.0
+	rustix@0.38.32
+	semver@1.0.22
+	simd-adler32@0.3.7
+	strsim@0.11.1
+	tap@1.0.1
+	terminal_size@0.3.0
+	typed-arena@2.0.2
+	utf8parse@0.2.1
+	windows-sys@0.48.0
+	windows-sys@0.52.0
+	windows-targets@0.48.5
+	windows-targets@0.52.5
+	windows_aarch64_gnullvm@0.48.5
+	windows_aarch64_gnullvm@0.52.5
+	windows_aarch64_msvc@0.48.5
+	windows_aarch64_msvc@0.52.5
+	windows_i686_gnu@0.48.5
+	windows_i686_gnu@0.52.5
+	windows_i686_gnullvm@0.52.5
+	windows_i686_msvc@0.48.5
+	windows_i686_msvc@0.52.5
+	windows_x86_64_gnu@0.48.5
+	windows_x86_64_gnu@0.52.5
+	windows_x86_64_gnullvm@0.48.5
+	windows_x86_64_gnullvm@0.52.5
+	windows_x86_64_msvc@0.48.5
+	windows_x86_64_msvc@0.52.5
+	wyz@0.5.1
+	zopfli@0.8.0
+"
+
+inherit cargo
+
+DESCRIPTION="Multithreaded lossless PNG compression optimizer written in Rust"
+HOMEPAGE="https://github.com/shssoichiro/oxipng"
+SRC_URI="https://github.com/shssoichiro/oxipng/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" ${CARGO_CRATE_URIS}"
+
+LICENSE="
+	Apache-2.0
+	|| ( Apache-2.0 MIT )
+	|| ( Apache-2.0 MIT ZLIB )
+	MIT
+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+
+BDEPEND=">=virtual/rust-1.74.0"
+
+# rust does not use *FLAGS from make.conf, silence portage warning
+# update with proper path to binaries this crate installs, omit leading /
+QA_FLAGS_IGNORED="usr/bin/${PN}"
+QA_PRESTRIPPED="usr/bin/${PN}"
+
+src_prepare() {
+	# Remove the linker configs (in `.cargo/config.toml`) specific to GitHub CI.
+	# https://bugs.gentoo.org/924946
+	rm -rv "${S}/.cargo/config.toml" || die
+
+	default_src_prepare
+}
+
+src_install() {
+	cargo_src_install
+
+	dodoc CHANGELOG.md README.md
+}
diff --git a/media-gfx/panini/Manifest b/media-gfx/panini/Manifest
index fa82856570b7..cb254fd8d1cd 100644
--- a/media-gfx/panini/Manifest
+++ b/media-gfx/panini/Manifest
@@ -1,8 +1,4 @@
-AUX panini-0.73.0-drop-register.patch 2642 BLAKE2B 4480c4795b75ea0932973182d9be8f0e32898a2f78f9f77e96eb093ef959f3aeefa158b6628193d5b51b11183f220f7e91c34eae43b56229bd221c3d25f7f1de SHA512 b5ec5839115ca9a476b8aea39a6594df12295db4754951f4c3d86caf100f3e7e5a61ef5869a7fe86ce5cbd87cec4abd78ada4e943cd8e83c44d7f6093037a638
 AUX panini.desktop 250 BLAKE2B 2fe866c696c3056ac914242fa14fd378517dc6fce02bdb9b7e2b6716e825ce9b2efe577132e3a1e71808aa7a17de57e9caa1121143e73d4007405b1ed6d7c666 SHA512 6e4cbf1d2a318d4e593e29d78668dd6cdaa37db82dcd7ed0aaee1b6e25a381c524708b404c9bec3902cd101c46c70e0546425eeed33c41c0deb17751df0f0f40
-DIST panini-0.73.0.tar.gz 329164 BLAKE2B 1cd592d7c5cf230398a6496a27f8389375a670b1de1a0f6acdb2027884bc5059798ad86ad4deb7795402654b3eb9edf112c3c177c7c716d55a186e48e1567f1c SHA512 4c12c0af5f94079f0da8f08dd19d99fd06c16c653b21532eba01022ed5b78afdcea2a042902fd50d0ea442483699cfdf9b10fd7f4592e3bae60abd5d2dabf657
 DIST panini-0.74.0.tar.gz 329344 BLAKE2B b94f774004eeb2a1b1531d92ae69141134367c6a87665d3f83944ff38a8761a41813bc023a5ec8e61131a6e193e0bfdc10ccf7100fb0ac518619b9bf94ebeee1 SHA512 e9158040cc985f088902169a2357da1bba5bda5510acec43a8edc95f5cc8033b4f8933f2b5f1b6a651872b467abc4fc3735d1565bae8a8650abd4aa8919f27b7
-EBUILD panini-0.73.0-r1.ebuild 993 BLAKE2B 5276ff4266aea472ffa54f248be19a5d4cd58bbd7c4856ee68acda20f887f68ed86810fe1a1a50f926fa27f4b84763e4a1755c92dd17935aadde2261c4b5a6f0 SHA512 a98995b2ac5fd628eb50df5dee3524b3918ace07924593b83783fda9357da9be3a42cc0681c66d56da6cbeb7d8d8b5f30df33470bee2c3590c5515aa31cc9a61
-EBUILD panini-0.73.0.ebuild 932 BLAKE2B 5fbe549d028d54a41656c96ae48269a86a7da76074398e0ab8451f0c5736754ace52c2baaf2d912cc40fa65b01d1dfb7c160ff4815a38be2042ad8d0dd5d6cdf SHA512 43a9ce7559094d6115d4b133c4a67dc172924a61e8a2a10628dc540b4d0cb5811ddb2bf275efcd5c0b0d0e2f034cdfcb74ef06f10e9089c3d7d5105feac3690d
 EBUILD panini-0.74.0.ebuild 932 BLAKE2B 16ef337a96db5912a0f92cd30934ec3098b879da101d35a4b72fc4a053da8b05454ce5882a187dc37001bcd59b9b298230a6802b00201362f1e8e2feea12f620 SHA512 a75fe88aa09fc36ce899761e9364ea625f853950f357f48c43daded092e92317161ca490a3a28b2f6accd1d95c51249cee6f6f222ca1c4d611f2ca9123d030a8
 MISC metadata.xml 479 BLAKE2B 6fa502982b8a147dc04dbfc3efc53ebcba952b4562c479e5738b7f66631b3624ac0720e4990c28f1b9ac7c756dff999ca582780775648c20963efbffc3343a15 SHA512 257c105a8fb5a185f7614cbf33ec56ce388eda70bd7cbd97c1fcbf573dfe628c36a8b38b5b17cb901e25b7e280c2df0e46732ec264e1bd3b1e4c09c13f7a5872
diff --git a/media-gfx/panini/files/panini-0.73.0-drop-register.patch b/media-gfx/panini/files/panini-0.73.0-drop-register.patch
deleted file mode 100644
index c521c4e6dd5b..000000000000
--- a/media-gfx/panini/files/panini-0.73.0-drop-register.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-https://github.com/lazarus-pkgs/panini/pull/16
-From: Brahmajit Das <brahmajit.xyz@gmail.com>
-Date: Thu, 21 Sep 2023 09:12:45 +0000
-Subject: [PATCH] Fix C++17 does not allow register storage class specifier
-
-C++14 depricated register storage class and it was copletely removed
-from C++17. Hence we get this build error with newer compilers like
-Clang 16 and GCC 14. This patch should fix it.
-
-Bug: https://bugs.gentoo.org/896226
-Signed-off-by: Brahmajit Das <brahmajit.xyz@gmail.com>
---- a/src/GLwindow.cpp
-+++ b/src/GLwindow.cpp
-@@ -901,7 +901,7 @@ void GLwindow::setImgAlpha( QImage * pim, double alpha ){
-     qint32 m = (int( 255 * alpha ) & 255 ) << 24;
- 
-     for( int i = pim->width() * pim->height(); i > 0; i-- ){
--        register qint32 t = *pw & 0x00ffffff;
-+        qint32 t = *pw & 0x00ffffff;
-         *pw++ = t + m;
-     }
- }
-@@ -916,8 +916,8 @@ void GLwindow::diceImgAlpha( QImage * pim, double alpha, int dw ){
-     int r = 0, c = 0, w = pim->width();
- 
-     for( int i = w * pim->height(); i > 0; i-- ){
--        register qint32 t = *pw & 0x00ffffff;
--        register int d = 1;
-+        qint32 t = *pw & 0x00ffffff;
-+        int d = 1;
-         if( dw ){  // dice...
-             d = ((r + c) / dw) ^ ((r + w - c) / dw);
-         }
---- a/src/panocylinder.cpp
-+++ b/src/panocylinder.cpp
-@@ -113,10 +113,10 @@ panocylinder::panocylinder( int divs ){
-     double vs = 0.5 * DEG2RAD( 150 ) / double(r2);
- 
-     for( int r = 0; r < r2; r++){
--        register double t = tan( r * vs );
--        register float * pv = pv0;
--        register float * pu = pv0 + 3 *( cols + r * cols );
--        register float * pl = pv0 - 3 *( cols + r * cols );
-+        double t = tan( r * vs );
-+        float * pv = pv0;
-+        float * pu = pv0 + 3 *( cols + r * cols );
-+        float * pl = pv0 - 3 *( cols + r * cols );
-         for( col = 0; col < cols; col++){
-             *pu++ = *pv;
-             *pl++ = *pv++;
---- a/src/panosphere.cpp
-+++ b/src/panosphere.cpp
-@@ -190,7 +190,7 @@ panosphere::panosphere( int divs ){
-     float * ps = verts;	// -> front face
- 
-     for( int i = 0; i < ppf; i++ ){
--        register float * p = ps;
-+        float * p = ps;
- 
-         p +=  jf;	// ->top
-         p[0] = ps[0];	//  x = x
---- a/src/pvQtView.cpp
-+++ b/src/pvQtView.cpp
-@@ -465,7 +465,7 @@ void pvQtView::clipEyePosition(){
-                 x = c * sin(azi),
-                 y = sin(alt),
-                 z = c * cos(azi);
--        register double s = eyeDistance;
-+        double s = eyeDistance;
-         // the cube texture is only 1 radius wide
-         if( picType == pvQtPic::cub ) s *= 0.5;
-         eyex = x * s;
--- 
-2.42.0
-
diff --git a/media-gfx/panini/panini-0.73.0-r1.ebuild b/media-gfx/panini/panini-0.73.0-r1.ebuild
deleted file mode 100644
index 2edaa0d3c56e..000000000000
--- a/media-gfx/panini/panini-0.73.0-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit desktop qmake-utils xdg-utils
-
-MY_P="${P/p/P}-src"
-DESCRIPTION="OpenGL-based panoramic image viewer"
-HOMEPAGE="https://github.com/lazarus-pkgs/panini"
-SRC_URI="https://github.com/lazarus-pkgs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtopengl:5
-	dev-qt/qtwidgets:5
-	sys-libs/zlib
-	virtual/glu
-"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-"
-
-DOCS=( NEWS {BUILD,README,USAGE}.md )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.73.0-drop-register.patch
-)
-
-src_prepare() {
-	default
-	eqmake5 ${PN}.pro
-}
-
-src_install() {
-	einstalldocs
-	dobin panini
-	domenu "${FILESDIR}"/${PN}.desktop
-	newicon ui/panini-icon-blue.jpg ${PN}.jpg
-}
-
-pkg_postinst() {
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
diff --git a/media-gfx/panini/panini-0.73.0.ebuild b/media-gfx/panini/panini-0.73.0.ebuild
deleted file mode 100644
index 32106c228518..000000000000
--- a/media-gfx/panini/panini-0.73.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop qmake-utils xdg-utils
-
-MY_P="${P/p/P}-src"
-DESCRIPTION="OpenGL-based panoramic image viewer"
-HOMEPAGE="https://github.com/lazarus-pkgs/panini"
-SRC_URI="https://github.com/lazarus-pkgs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtopengl:5
-	dev-qt/qtwidgets:5
-	sys-libs/zlib
-	virtual/glu
-"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-"
-
-DOCS=( NEWS {BUILD,README,USAGE}.md )
-
-src_prepare() {
-	default
-	eqmake5 ${PN}.pro
-}
-
-src_install() {
-	einstalldocs
-	dobin panini
-	domenu "${FILESDIR}"/${PN}.desktop
-	newicon ui/panini-icon-blue.jpg ${PN}.jpg
-}
-
-pkg_postinst() {
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
diff --git a/media-gfx/pinta/Manifest b/media-gfx/pinta/Manifest
index b9255862cce7..08c955794a89 100644
--- a/media-gfx/pinta/Manifest
+++ b/media-gfx/pinta/Manifest
@@ -60,5 +60,5 @@ DIST system.text.encoding.codepages.4.5.0.nupkg 4270497 BLAKE2B 651d99416e88b551
 DIST system.threading.tasks.extensions.4.5.4.nupkg 89582 BLAKE2B 728fc5794745b706a7e3a7d05186f34e2a8c1837cafdc7fc9a1bd8fc6fd42025448cbdfa53415a05d872aa08db1deb31d104054630c9ac7ecd29a2ddd973fd5c SHA512 68052086e77d3c7198737a3da163d67740b7c44f93250c39659b3bf21b6547a9abf64cbf40481f5c78f24361af3aaf47d52d188b371554a0928a7f7665c1fc14
 DIST tmds.dbus.0.11.0.nupkg 100417 BLAKE2B 390b66cf60c78194fb791d9313cba866011058635cdffb6a3ae9cb6918a8b73478d077e6af4f945a05b51a2c1d14b0d2acabb75c949dd7690042975bb159dfd2 SHA512 efa0e5d4e803964da25c23fcd678a6078da9c0ac6a1351a46b507a1209230b97aa90678e1cdae51a122f3d2b8106e0ef34d23d45fc9a680fe21f6e9740665e80
 EBUILD pinta-2.1.1-r1.ebuild 3275 BLAKE2B b3e961f0468eb6c5e7a880e4c7b338672114a963fcb26216841ca07dcc98f4541979c3c289871c1d440b5c2a3034aeb44ecb7d9fc8a438ce2562d33cbe768c02 SHA512 d9149915f4e7633780d6d39a794ce88c0c0812925e92fc6ad157f3afe3308247b102f44505400db1cf075131f73186ecc8c3fc3f3126d3262000ae85d86ccb64
-EBUILD pinta-2.1.2.ebuild 3237 BLAKE2B c6f7051607f4ad18eabe6b08d86753b581100758fc3212e79a16a7cfa01d8e962681e6f20ff50cf9c6737eb07d16dfdcf2d8d6a6d6d739f545a37333fb72c304 SHA512 c110fc88f471539a02b8cc77bd00ba590ca6bd25237281b83e82a04bcdd247e79c2767c2bba1b9bc6d0b34f5eb0c06f2013f56a568051cde16a8ac592af3c586
+EBUILD pinta-2.1.2.ebuild 3236 BLAKE2B 812de0edc3713d89553aafbace0ce675ec534170b40d296823f6ccc17e0847911c742a0b29c21473914371c1d4aa8854e2648ad48aef7522204d1a7d39748ff9 SHA512 136f4fdfaff119585f5b035bc5472fb9b315d51dce365976acc67f99056cffa8b0cd9a7d3488b9b759ce6f95927f8cd9789dd44d5a7bc5d89a7910f2f0108773
 MISC metadata.xml 664 BLAKE2B ce88ef1889c6f6928493e18075b6c17696fca5e2a2df26e1a4f645082b41aa261933aebc66411c66125c07fd1104ca3e1cf9357e2a56185967669221325f1222 SHA512 87208ea2d284ac31559f9672ae16bf20a70c20293b7964927fb27d3261e352f2b63fde6434fac37a8f47aced7249a7bab16fc72080ba9a4cc698839613ce96c7
diff --git a/media-gfx/pinta/pinta-2.1.2.ebuild b/media-gfx/pinta/pinta-2.1.2.ebuild
index 8580cd61204d..06478a5b0e80 100644
--- a/media-gfx/pinta/pinta-2.1.2.ebuild
+++ b/media-gfx/pinta/pinta-2.1.2.ebuild
@@ -81,7 +81,7 @@ else
 		-> ${P}.tar.gz"
 	S="${WORKDIR}/${P^}"
 
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64"
 fi
 
 SRC_URI+=" ${NUGET_URIS} "
diff --git a/media-gfx/plantuml/Manifest b/media-gfx/plantuml/Manifest
index 3b9997be7c5c..5c1c2c0192e4 100644
--- a/media-gfx/plantuml/Manifest
+++ b/media-gfx/plantuml/Manifest
@@ -1,4 +1,5 @@
-DIST plantuml-1.2024.4.tar.gz 12061228 BLAKE2B b6edf25c99fecab5a463ddc3f330b28ecad1b60a595f833e4af4ec5e4db3489456f5df4be997879ef38c4053da75b790ae9b942bf28b77a8f73413fbe9289b9a SHA512 cb51e44691eb0a206de3f23e0bf1ba08f8a9d111d838c8b5f2ef2e7b7bae61294deb935bd0c0f2798fdc51d7a0a3e54d40d201075964e109a7f0781010933e91
-EBUILD plantuml-1.2024.4-r1.ebuild 1158 BLAKE2B 3c0acae8915a378129832443be1253f2a28a06b130a7a4fd148054378fa5ee0187c05896bf2cfb5d292a34b55b9fa8f6b44afe0a445fd1bf8cabf9437d07c2ef SHA512 71f21bc40862028e49cb59eb98ca302e0aa4826f23d8b278b6788345795f24f2545bc8477d13dcfe9a1b2100af7ab63a51b4be839be73447921781318d4f5c4d
-EBUILD plantuml-1.2024.4.ebuild 792 BLAKE2B ea75fbe7d06f65919d074186bce1ddf75778c639cf42844fa1930e5b9832660222fe9459a4a3948a594fb5ff55b089afbb7717ffc671de8d7ed901b24f91d180 SHA512 060cafa71902df5a50487937b7a3c73e04ee7b24191575fe268b9ba4c7c29657a9dc7a0812914933b15f33ab575f40279896dee87bead9e009b84f6e6ba2fdaf
-MISC metadata.xml 879 BLAKE2B b711489e5c713d9b6ee8489e7ca080b9af19965e10ce3795e3dd16e3cabd0b9284bb1a75646baf2c0134cce31189a9e7dea499129750e20f4971f53aee66feaf SHA512 cfde5b9a2e44e38bc2eca2d7e32e6d4a18d0413325e41b0823091fdefcd15b035f32572397c27173887d370b2cca7673638ccf32690447dcab91ff31bc309c76
+DIST plantuml-1.2024.6.tar.gz 12591935 BLAKE2B c9b56908538e3e98d2c8d4e56c064ffa378621d14232f8d769f1b80b610fcf22c50d94974a8c21791e2780231708e594a02466f0cba5e78a60b4b4110d0f89f0 SHA512 86633b93abdbc571ff335e61992f0db8ba20ed0e0d0dc5e9c564a8b312594051f47d453fb8b9787d3d3192ccc35f8ea99e5ddab8cc1d16458203c9309087ddbd
+DIST plantuml-1.2024.7.tar.gz 12645142 BLAKE2B 5716e3085c8e326cb504637779fa4a50ab73fb557345858b6985e8f67412ee24d5447bb41b9037c54a565e6dd45db3dbd76245378add7d168e5bc0e05dfca83c SHA512 4f201b0341efa02deb260b44837fff2e1225715ded1fd196f7cd79d0d75baa0a5a146880d9c46470d9652df593b4c4419554d9bbc4a94d380b689359130d70dd
+EBUILD plantuml-1.2024.6.ebuild 1379 BLAKE2B d9828453b19199934914faa621789747aea212803c63c48500bc283907359c6c04671ff62c00c0ef17e7accd9e2c948bb354c54d796bb77439a5339bef31c0fe SHA512 6ae5acbbb52f987d5d270c90a8940cad08430f7fd02d61d38cf9850ddd3807f664f78a265a8d2ea2bda054fb728ce603e164a4ecf17eaaae53b39b1b649a04b7
+EBUILD plantuml-1.2024.7.ebuild 1380 BLAKE2B cbfc68c40d4cb2f2db79154facbcd198c44ce49920ba9298eab723b951e89aba7d2a947eff781dc2a258a586db833ca534459b9b8723cc194430a3cdac88a9bd SHA512 32c34377f41bd1deedb2e1b81aec248dc2fc1f7aaa779664094f90abc4f258ec708635eadbac2206a4160ae28d6078b71a5f224dd745a4717d61d40b042e9cb0
+MISC metadata.xml 975 BLAKE2B 3a847073b2f3b5f14adb59f8dec5183533eef81f8b10e5633b356743cb45c3927dfc2f8427f26f1e2b3eef01976b0a8e5884b5f9492310e87884c26759dbfed8 SHA512 2cd56c421b1566a679afb739ca82377d5c8b47519fd2cc44307424f5cd88fa0f8b2144842943a7da6abef7ad79254101818292819fdef97631746815a892e7a5
diff --git a/media-gfx/plantuml/metadata.xml b/media-gfx/plantuml/metadata.xml
index e6cce2ef5e7b..0d377a268e92 100644
--- a/media-gfx/plantuml/metadata.xml
+++ b/media-gfx/plantuml/metadata.xml
@@ -19,4 +19,7 @@
 		<remote-id type="sourceforge">plantuml</remote-id>
 		<remote-id type="github">plantuml/plantuml</remote-id>
 	</upstream>
+	<use>
+		<flag name="ant-task">Provides classes used to manage PlantUML Ant task</flag>
+	</use>
 </pkgmetadata>
diff --git a/media-gfx/plantuml/plantuml-1.2024.4.ebuild b/media-gfx/plantuml/plantuml-1.2024.4.ebuild
deleted file mode 100644
index f152e68ad17d..000000000000
--- a/media-gfx/plantuml/plantuml-1.2024.4.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="source"
-inherit java-pkg-2 java-ant-2 desktop xdg
-
-DESCRIPTION="Draw UML diagrams using a simple and human readable text description"
-HOMEPAGE="https://plantuml.com"
-SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-
-DEPEND=">=virtual/jdk-1.8:*"
-
-RDEPEND="
-	>=virtual/jre-1.8:*
-	>=dev-java/ant-1.10.14-r1:0
-	media-gfx/graphviz"
-
-EANT_BUILD_TARGET="dist"
-EANT_GENTOO_CLASSPATH="ant"
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-src_install() {
-	java-pkg_dojar ${PN}.jar
-	java-pkg_dolauncher ${PN} --jar ${PN}.jar
-	use source && java-pkg_dosrc src/*
-
-	make_desktop_entry plantuml PlantUML
-}
diff --git a/media-gfx/plantuml/plantuml-1.2024.6.ebuild b/media-gfx/plantuml/plantuml-1.2024.6.ebuild
new file mode 100644
index 000000000000..5fd769605c36
--- /dev/null
+++ b/media-gfx/plantuml/plantuml-1.2024.6.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+inherit java-pkg-2 java-pkg-simple desktop xdg
+
+DESCRIPTION="Draw UML diagrams using a simple and human readable text description"
+HOMEPAGE="https://plantuml.com"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${P}"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 ~x86"
+IUSE="ant-task"
+
+DEPEND=">=virtual/jdk-1.8:*
+	ant-task? ( >=dev-java/ant-1.10.14-r3:0 )"
+RDEPEND=">=virtual/jre-1.8:*
+	media-gfx/graphviz
+	ant-task? ( >=dev-java/ant-1.10.14-r3:0 )"
+
+JAVA_AUTOMATIC_MODULE_NAME="net.sourceforge.plantuml"
+JAVA_MAIN_CLASS="net.sourceforge.plantuml.Run"
+JAVA_RESOURCE_DIRS="res"
+JAVA_SRC_DIR="src"
+
+src_prepare() {
+	java-pkg-2_src_prepare
+	if use ant-task; then
+		# src/net/sourceforge/plantuml/ant/readme.md
+		JAVA_GENTOO_CLASSPATH+="ant"
+	else
+		rm src/net/sourceforge/plantuml/ant/{CheckZip,PlantUml}Task.java || die
+	fi
+
+	# java-pkg-simple wants resources in a separate directory
+	cp -r src res || die
+	cp -r skin stdlib svg themes res || die
+	find res -type f \( -name '*.java' -o -iname 'readme.md' \
+		-o -name '*.ttf' -o -name '*.html' -o -name 'data.txt' \
+		-o -name '.editorconfig' \) -exec rm -rf {} + || die
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	make_desktop_entry plantuml
+}
diff --git a/media-gfx/plantuml/plantuml-1.2024.4-r1.ebuild b/media-gfx/plantuml/plantuml-1.2024.7.ebuild
index 303ce0fb9f18..eafb36810423 100644
--- a/media-gfx/plantuml/plantuml-1.2024.4-r1.ebuild
+++ b/media-gfx/plantuml/plantuml-1.2024.7.ebuild
@@ -14,20 +14,27 @@ S="${WORKDIR}/${P}"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
+IUSE="ant-task"
 
 DEPEND=">=virtual/jdk-1.8:*
-	>=dev-java/ant-1.10.14-r1:0"
+	ant-task? ( >=dev-java/ant-1.10.14-r3:0 )"
 RDEPEND=">=virtual/jre-1.8:*
-	media-gfx/graphviz"
+	media-gfx/graphviz
+	ant-task? ( >=dev-java/ant-1.10.14-r3:0 )"
 
 JAVA_AUTOMATIC_MODULE_NAME="net.sourceforge.plantuml"
-JAVA_CLASSPATH_EXTRA="ant"
 JAVA_MAIN_CLASS="net.sourceforge.plantuml.Run"
 JAVA_RESOURCE_DIRS="res"
 JAVA_SRC_DIR="src"
 
 src_prepare() {
 	java-pkg-2_src_prepare
+	if use ant-task; then
+		# src/net/sourceforge/plantuml/ant/readme.md
+		JAVA_GENTOO_CLASSPATH+="ant"
+	else
+		rm src/net/sourceforge/plantuml/ant/{CheckZip,PlantUml}Task.java || die
+	fi
 
 	# java-pkg-simple wants resources in a separate directory
 	cp -r src res || die
@@ -39,5 +46,5 @@ src_prepare() {
 
 src_install() {
 	java-pkg-simple_src_install
-	make_desktop_entry plantuml PlantUML
+	make_desktop_entry plantuml
 }
diff --git a/media-gfx/pngcheck/Manifest b/media-gfx/pngcheck/Manifest
index 963b1d96ae96..1a94b842cc3f 100644
--- a/media-gfx/pngcheck/Manifest
+++ b/media-gfx/pngcheck/Manifest
@@ -1,5 +1,3 @@
-DIST pngcheck-3.0.2.tar.gz 63202 BLAKE2B 4cc6040e087aa2f5829e79ea1a5feb45af8bb15fa72325f9cb4822169c7d278306d6d89b936fd4c3c3819a09380e07f1f64ce0c276e776c3146c1533b1ee1363 SHA512 81bba699141c0f506ee589785eccc4b1ea882df5d211bcd91885bbcc4230bf14d23fc1298ffc10a110d6a8459522f6a01bfba1f81739f6085e4d3de964bda3d5
 DIST pngcheck-3.0.3.tar.gz 63766 BLAKE2B 962f90e6a05170a14fba45372d65f8cc94d1b4f6119c30d252a67644b69eb8a925c20b0d020b917673754f491305f73ac7e294df9b2a908a93011cec420c3629 SHA512 cdb2620cb508f9df748bd3e9cb657d2c503a1f62171f497f1ff1e0f220287364829f03164869567c83b5797d8bc478495ad6c35860196812ef8262fce4cbff26
-EBUILD pngcheck-3.0.2.ebuild 703 BLAKE2B 950431772e8c99335eb9cb875dc5f864ac143d44265b52c6b13335cf298aad8f64de2e14aa28aba78121d91b1b3ec5ffe17e01ff6ac10807e3fea936c532c7ec SHA512 a5a2391005d6fc1fa61016aa551f853c5b55cc84006c157380cc0d1bf27b534d308706fd08a8d3eee15f7f5fc39a8ce590b8ba4de5c53bd64a2118bd3b0a8b2e
 EBUILD pngcheck-3.0.3.ebuild 696 BLAKE2B ca6243ef70a236644110b9e4dcce87a793613430465617513c2373ee5d71306ad5e6985e8d5167a3f07d6eff317ec7109d2ae5ac55ec7c3d78a652d9a30cb275 SHA512 8e69784097d1b9df1efcc91175df7836e22624f179cc06c29f7db977ca0860d4c737c38c4609b14375ef797f6f05ddad510ae2caf63286ff738c3ff382fc4733
 MISC metadata.xml 245 BLAKE2B 30ec91c1f9ea95e1a599102f696a4fe4b20d1f4f75cf7e7be32c5b53716ab4944b46f2e03bfb03bc1c45779f12768a6f6c14fe34c074678a02c705aaaceda709 SHA512 ed5a8995a5bbcbc8f921f25f096f6211ba40548527e4acc752fd93a847a133857ee14a91bf9ab3c3f9aee14213a06a72c1c23e9428a1b37815b09324d0344ee8
diff --git a/media-gfx/pngcheck/pngcheck-3.0.2.ebuild b/media-gfx/pngcheck/pngcheck-3.0.2.ebuild
deleted file mode 100644
index ca87c90889f4..000000000000
--- a/media-gfx/pngcheck/pngcheck-3.0.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Verifies the integrity of PNG, JNG and MNG files with internal checksums"
-HOMEPAGE="http://www.libpng.org/pub/png/apps/pngcheck.html"
-SRC_URI="https://downloads.sourceforge.net/png-mng/${P}.tar.gz"
-
-LICENSE="HPND GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="sys-libs/zlib"
-DEPEND="${RDEPEND}"
-
-src_compile() {
-	emake -f Makefile.unx \
-		CC="$(tc-getCC)" \
-		LD="$(tc-getLD)" \
-		CFLAGS="${CFLAGS} ${LDFLAGS} -DUSE_ZLIB" \
-		ZLIB="-lz"
-}
-
-src_install() {
-	dobin png{check,split,-fix-IDAT-windowsize}
-	doman pngcheck.1 gpl/pngsplit.1
-
-	einstalldocs
-}
diff --git a/media-gfx/pngcrush/Manifest b/media-gfx/pngcrush/Manifest
index e11b7e91c1e5..2601b0b0f798 100644
--- a/media-gfx/pngcrush/Manifest
+++ b/media-gfx/pngcrush/Manifest
@@ -1,4 +1,4 @@
 AUX pngcrush-1.8.13-adler32_check.patch 486 BLAKE2B 73bd6fc0a81ca1dddcf3aba4f8d4223aa501fa0cef59c2b1b5dde702705c12f1280884db533578ddbfb0909a5cf9288bbe6b84d49d18e5e1ae65baf44a27221d SHA512 65f5e269e076b740bfa112d232d1f220776975d5f8fe10e7d6ed924f17a5b864a738f2747992dc87f8f20d910616b2ee5afc755ba0a2b2ef82398cd306721835
 DIST pngcrush-1.8.13-nolib.tar.xz 66104 BLAKE2B dad0bce2e8f2a135d085343da98ebecfb78a6b05019d43be1b0b1f940ce23ffa980bcb08e8948b6b8cc3efc04bc6ae92a0b9cf8ea8183e27eebfae4c6c48e31e SHA512 c073d573e9b13b72fa39b178271ce65d1a19fef35943ef0a9e6121a5c66d9db212aaad38ab777c5b44e20a107eb677003acbdb4a354bcb2dc40f535a97d9df0e
-EBUILD pngcrush-1.8.13.ebuild 855 BLAKE2B a826f6b6e5a2365f3751d835a39852a20ef192773d65f3ff15e1ec06b043c09d68deda6ab518a856a29f87ba45574610b6d276958d6a2eb7dccbd25c37adb06e SHA512 7ea8a87d62c8384afb34029d16425642e5dd28266214e10772355ef68f2caa3dcd25687f64df0bbc83fd5113fe0cd269f1f507e3116f853ecedf36b83cb65250
-MISC metadata.xml 566 BLAKE2B 770f03de87659cc1619824d706f235ee61b0ee1dc795958bbee7e13c93e2ff02b5a02e5b69803606961aadfde2adb30f22ab932a4744babb4b3672a78dc9ebc9 SHA512 afa89c58fe877c819c09f861b461ce4e8489fd1842a7934f14f83a7d1266b724f64497782372d56338c0f4ccaeab5272ea95ceaa9deaa658832e665882be7c8e
+EBUILD pngcrush-1.8.13.ebuild 849 BLAKE2B 8449d6f118b06883191b5fccf93f87fe57e1a93e27fb15d437a2af96875465b125d26710af259af9c14416012caf24f8872cb2baaf466d65340abc85501065ea SHA512 c0738a574e5bf9d0055dd24c0d6e878c737759ba379814835ffc1c8360e0e02a96a8c6757095d9eff8fe452834a35b989a6c86fda21302088e9d3d161a5b4f1c
+MISC metadata.xml 488 BLAKE2B 94fc372620c5ac603b963cc47b594486ee1bfb929cbf9b7858adc73c168477d2267261e8becddb00ee44ebf606286d4e14e9430005bb34248286a44410cb7755 SHA512 3e42cc11c4e57853156aa2e5ad991d2dd158c733e6d8bba738f94707fca97d00b465b1b36e648d25a64816574ebb35b736a77ee12d34c87bbf0a20091f38f9ec
diff --git a/media-gfx/pngcrush/metadata.xml b/media-gfx/pngcrush/metadata.xml
index 162e13ab9df4..2de20b6ffac3 100644
--- a/media-gfx/pngcrush/metadata.xml
+++ b/media-gfx/pngcrush/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<maintainer status="active">
 			<email>glennrp@gmail.com</email>
diff --git a/media-gfx/pngcrush/pngcrush-1.8.13.ebuild b/media-gfx/pngcrush/pngcrush-1.8.13.ebuild
index 27787e17634f..71051bbc3824 100644
--- a/media-gfx/pngcrush/pngcrush-1.8.13.ebuild
+++ b/media-gfx/pngcrush/pngcrush-1.8.13.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/pmt/${P}-nolib.tar.xz"
 
 LICENSE="pngcrush"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 RDEPEND="media-libs/libpng:0=
 	sys-libs/zlib:="
diff --git a/media-gfx/pngnq/Manifest b/media-gfx/pngnq/Manifest
index ea576318a90c..a3940e89e2f6 100644
--- a/media-gfx/pngnq/Manifest
+++ b/media-gfx/pngnq/Manifest
@@ -2,6 +2,8 @@ AUX pngnq-1.0-Wimplicit-function-declaration.patch 184 BLAKE2B 61f77336540a5e5c4
 AUX pngnq-1.0-libpng14.patch 382 BLAKE2B e85fbdccf1765efff65b638dccab6d3e5afa83aa6782f8be8188414985e18000bb68273e2250d2063eac56bca4f1e0481dadf747fc05e94f1d340eb21cdfdc59 SHA512 4194becadf43c3e8c1d63a15e3de1118c386dab4e4e7e6e5622dbc896d3c1cab5ffaac6f6f8c7a504fdf303bb6c0fad44351e7d89b304cd3c4d15908e347fe4f
 AUX pngnq-1.0-libpng15.patch 359 BLAKE2B f031f310aed6a30ed48e8e0754f3e392ccbc2fe9a929443885f3e2f040fb081f5122d6e1c9b89e63bdc0594051faebdcf53e5085a01b1520f256e60d1e06e9b6 SHA512 e2542833a6950b8e8ab09a9973a0df237d5667ce9d75b2e909485398d38517bd7d7d0237d8b1c3875c4538a6157219870cf6c7e29a98e6a1dbb93d11476d1059
 AUX pngnq-1.1-autoconf-quoting.patch 299 BLAKE2B 454f2c28a31220307b0e1290030f9b28b8864349d6486039bf796e7f896085d1ce24f0ab1e2d972adb2147bde80f94d7996e899b9e16f19482f0b8311acdd745 SHA512 4fedd87a24e8024489b39ecce94ec7425fea7100c57e258c0bc3dc7440baed3db21bbbe2633e070db1716f9e59875daf3ed4279619513e5c7b69fa1d100821e1
+AUX pngnq-1.1-gcc14-build-fix.patch 1426 BLAKE2B 5a9ff973fbbe26fe7542a016274022fd934fde18b4f582d1de459631c52f4ccccd37088a30546d44665652103d881dd723f7e779c78258bb345013319ee9c7b5 SHA512 b2ca1fdc359a38d9fa73cb7c583f89e9c92e3e6cacf8090d6c523d46fb46513eab74d3cb00663979f86627eac1ff29c3276802440a94b591152748a3a99f16b2
 DIST pngnq-1.1.tar.gz 117372 BLAKE2B 94c670342d514c577c386b8fe207307f057e5c0c3816b35ab2b625258051269410b9c5ad45f89c047715bb1ad927909498a6faef5591eb61039fd68c94fc44a6 SHA512 3bbc4ace1375517a7a73bbc65ff39512ef316e4b67fc3941cd0b7269e584a26f915f30591f8aa1c44eea73fe4ebe9519063a7bc426841e412c648aaa188be234
 EBUILD pngnq-1.1-r1.ebuild 687 BLAKE2B 17bf9d6e665e0b84ecb063c7c2e32093242186f82420411c5de14b9fbf44117b5e9cc60695261a15c3da42a7a834ea25adaf61447c7a6140ae478a044a7fee60 SHA512 b61ea24e468b9a19c0bca38823a18a3b537241984813cc022d1387bc1f11dbaf80c5efa03724c571270a3075787e7f407c43d1ae154c125485c970bfd464f4ff
+EBUILD pngnq-1.1-r2.ebuild 737 BLAKE2B c903c56ce977c118203d0520e12afa07132cd9da739e1ee672aa1ecd8bb8e5f9b9ee11add6e7b627ee5e5ee6a0066bf7b9310a704af3971882960793fbfe0836 SHA512 f172fcdf9f15a984a8ff93b94b60a7a32af4f866ac53c745df10b6afbd7a97fbb77d6fb1d45bdb108ecb92b073a07e14664f87b5ed1c20e6d7bec212dd0105d4
 MISC metadata.xml 243 BLAKE2B bc28a5bf618a465e4fe0f7eb0ce8eca6f60cdfa875d7c9d96aea4071a84f17b5a3f7ce20adace95946e312fd8db0583dc2b83a81ec47184f03d6851f05620b49 SHA512 91ef91f45537a1a41d6df99d077d886c517583c7d23c48558d04308f05d9f8c13ee57709c93c4b0852f15b339e75e2b27ff0ddf12b20dec07c4e944679e555e2
diff --git a/media-gfx/pngnq/files/pngnq-1.1-gcc14-build-fix.patch b/media-gfx/pngnq/files/pngnq-1.1-gcc14-build-fix.patch
new file mode 100644
index 000000000000..aa8c1a624cdd
--- /dev/null
+++ b/media-gfx/pngnq/files/pngnq-1.1-gcc14-build-fix.patch
@@ -0,0 +1,34 @@
+Bug: https://bugs.gentoo.org/919210
+Reported upstream: https://sourceforge.net/p/pngnq/patches/7/
+--- a/src/pngcomp.c
++++ b/src/pngcomp.c
+@@ -503,7 +503,7 @@ void printstats(struct statistics* stats, struct blockstats* bstats){
+   printf("Mean pixel color error: %f \n",stats->mean_error);
+   printf("Maximum pixel color error: %f \n",stats->max_error);
+   printf("Standard Deviation of error: %f\n",stats->stddev_error);
+-  printf("Image Dimensions %ld x %ld \n",image1_info.width,image1_info.height);
++  printf("Image Dimensions %lld x %lld \n", (long long int)image1_info.width, (long long int)image1_info.height);
+   printf("Number of pixels: %ld \n",stats->n_pixels);
+   printf("Number of exact pixels: %ld\n",stats->correct_pixels);
+   printf("Percentage correct pixels: %f\n",(float)stats->correct_pixels/(float)stats->n_pixels*100.0);
+--- a/src/rwpng.h
++++ b/src/rwpng.h
+@@ -29,6 +29,7 @@
+ 
+   ---------------------------------------------------------------------------*/
+ 
++#include "pngconf.h"
+ #ifndef TRUE
+ #  define TRUE 1
+ #  define FALSE 0
+@@ -65,8 +66,8 @@ typedef struct _rwpng_color_struct {
+ 
+ typedef struct _mainprog_info {
+     double gamma;
+-    ulg width;			/* read/write */
+-    ulg height;			/* read/write */
++    png_uint_32 width;	/* read/write */
++    png_uint_32 height;	/* read/write */
+     ulg rowbytes;		/* read */
+     void *png_ptr;		/* read/write */
+     void *info_ptr;		/* read/write */
diff --git a/media-gfx/pngnq/pngnq-1.1-r2.ebuild b/media-gfx/pngnq/pngnq-1.1-r2.ebuild
new file mode 100644
index 000000000000..cdfa4f9281af
--- /dev/null
+++ b/media-gfx/pngnq/pngnq-1.1-r2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Pngnq is a tool for quantizing PNG images in RGBA format"
+HOMEPAGE="https://pngnq.sourceforge.net/"
+SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz"
+
+LICENSE="BSD pngnq rwpng"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="media-libs/libpng:0="
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.0-libpng14.patch
+	"${FILESDIR}"/${PN}-1.0-libpng15.patch
+	"${FILESDIR}"/${PN}-1.0-Wimplicit-function-declaration.patch
+	"${FILESDIR}"/${PN}-1.1-autoconf-quoting.patch
+	"${FILESDIR}"/${PN}-1.1-gcc14-build-fix.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
diff --git a/media-gfx/pngquant/Manifest b/media-gfx/pngquant/Manifest
index 6fbdcb4e8018..d859676967fe 100644
--- a/media-gfx/pngquant/Manifest
+++ b/media-gfx/pngquant/Manifest
@@ -5,5 +5,5 @@ DIST pngquant-2.17.0.tar.gz 71209 BLAKE2B 0f625b6c27bc621fd5e1d9b4c5d3cbb7eda960
 DIST pngquant-2.18.0.tar.gz 71187 BLAKE2B 3b390908de8484748a136d68f1096d58b6e454138afe6b2f76692acff324830a8246cb7001ffc932b2acdd66732c42d72c898a5a355e4e4b9effc90cd6ed924a SHA512 d9531008c6909cbabd98eb17108baf3085903c22f79548012d9a6c5b1b973329f89739f11a45aa52e12041e8352315af6313ed04339b3db78f2be430a3ae2326
 EBUILD pngquant-2.12.6.ebuild 1488 BLAKE2B bdd86897fe7715fba56857380e2c97d9a80dbbbc98461ffd7c9f3021269b2ee6ff814262af7abca121cf288c8bd62ee2cde6bd4b11b91c1a893e88c45a3a02de SHA512 025a85d645fc680236a456286cc1c6e336679f05972d1fec8caf5adb55d2f39b779e6b0f1ad07564d0a19a2f643949ec10b09927fac7555cd99296a874ec7f9c
 EBUILD pngquant-2.17.0.ebuild 1547 BLAKE2B 33b3b503ac7c94bc95ad0c056df106c8b06975b5dae7ab5614a5c8ae9393d1e1d5d89e02ba050ddebf9ed5598eab0f1adab46881a26d86c09c00d3a455fd10b8 SHA512 c7d50b9e5252b92d987294e999cdc3f580d7d5cadbc0fc1054b7d72781648ecc6d980d83a115e5679b093b8632fa23a2e84bd19fdb7dbe25292a7e9e7be13aad
-EBUILD pngquant-2.18.0.ebuild 1547 BLAKE2B 944e433f7498b56421f5ee3cd00bd43d41572f2bd85cf844240cb349908d7d1f6fc487b317b68006fbf5451d0202efd68f46bee27b75a799f742a24cf72c6a28 SHA512 6295c92563256a0be44892891e8512055f0fdb12445bb91d7ad8b782626e4212621e2cc2dcda430184268e2af0bd70cb2ed663757eb43784e46a34548447fc01
+EBUILD pngquant-2.18.0.ebuild 1544 BLAKE2B 1ef7582b6be4f1efdfef80bb42d2beba0f21378c70d4ae18191b8bd0a62bf65c67d44707a09c2ddc64c2400f942d29234e87fd2c26d2cd1e2a70f7f661e1b2a6 SHA512 da0c37a1ae905b1aaa3c41bc14ff5093e47e96a4f821fe9b756c8cc243a3a24e0b82fb545325716b252778a699975be262afb6c4004293355e65bced3f73c863
 MISC metadata.xml 348 BLAKE2B 75c2a5c4166647a20ee98f2ac89b34ff504cb2bfc507ae012a5f932cd5ea711492acae8ea6d9f24af0a6305e51a2fe835dc91eab8be5d0c5d4cf5bc7a901029f SHA512 00be8ad0504e426c0a076f50d6573b0f878563444b2bb2b6c8759e1fdb947a2b479599ac69b2640f537802106d098fbb50de57e1637fcf0f28d9ef375993a486
diff --git a/media-gfx/pngquant/pngquant-2.18.0.ebuild b/media-gfx/pngquant/pngquant-2.18.0.ebuild
index ae8a0c8e0e3b..2766272258e4 100644
--- a/media-gfx/pngquant/pngquant-2.18.0.ebuild
+++ b/media-gfx/pngquant/pngquant-2.18.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 @@ SRC_URI="https://github.com/kornelski/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3 HPND rwpng"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
 
 IUSE="cpu_flags_x86_sse2 debug lcms openmp test"
 REQUIRED_USE="test? ( lcms )"
diff --git a/media-gfx/potrace/Manifest b/media-gfx/potrace/Manifest
index da904b3c98ae..3179d1a1e8e5 100644
--- a/media-gfx/potrace/Manifest
+++ b/media-gfx/potrace/Manifest
@@ -1,5 +1,5 @@
 AUX potrace-1.16-lto.patch 919 BLAKE2B e109311b319197deb0a5b6dc133c9a42f001823cfa3b387beae96289de107f54e34b2b6448bd144cba930bfe00569d4a66e9009ec5521a19c62cb5356664ef9d SHA512 3987506225bbb31badb36aa8b7cff399103e762583eb066709f5083dacfb1a48190115ba12aaec91775c4a3ab401e33ee7bf1285b4ce2d8ffb462f57910988a4
 DIST potrace-1.16.tar.gz 657314 BLAKE2B ee6b04f355d593dd1ebcc4833b244e25eaaa69c91f90987d530a4e5a454668dff6ecfb7a5d8270ebbd9e7c177fd447d1b3fe2a343fc4b9413dd3f507c0c6e417 SHA512 10d85ed3fada80951223c65e923b5e6ee3e76e071575971d5b09b996b477ec5ff2403e0337c44963c6b441cc3ba6c4f7009541124a25c16b7721fdebd1f774b9
-EBUILD potrace-1.16-r1.ebuild 960 BLAKE2B 7ebaaf4ba4f9ca56bc95f6aef36686eac65d996070178f71375d0e80ea817477c1d1075bb8e8299c286913bf925fe8e042224bb89ebd959f4d6d39ece6bb5514 SHA512 7cda6cc87e80c2e739a45ca0eb15fd569700fd7a7f8bf21a89702a309efa682d49068cade04ba8c15e7656aa3c4d0e26e7357225ea95ec71006f6821d501f7ec
-EBUILD potrace-1.16.ebuild 867 BLAKE2B 1698f083578aa2c2a3556241268694f847d0edbf828efacc8871fe429fbbb017285e2d843b47c4e681dc3768f3bdb34e86ea9683a2196d75d5dfcc92cfcb08fa SHA512 2e2b14f7777f40589c178e1240f93cfac6f93868197eb97244ffcf2854fbc1b505175e378facedec3b2d9f55a149a29ac37a422fb48c47e30565c99fb4a98cca
+EBUILD potrace-1.16-r1.ebuild 947 BLAKE2B 6f612da9b133e4e7c37d51472243be9e18d18fb3b1852f2118f054625d22c16091a8f9b6b0a58c547e4f9d7c7507c703ba6dfaf6368d35f7540505dbabc0891f SHA512 e70f356748e8cffc7e41e7b82d83bd85b85d4410b54c7dfe1ef4e4e5a41a846bc02b590e2aba8a2890c559beab89f2c12b7522e4fcee0174cdf56245fae955cb
+EBUILD potrace-1.16.ebuild 861 BLAKE2B 3f601f3c5fa60237df087a1598a33cec3e862993d930edacb77fe08e8eb72696f3912e8912968d65db9f357271e129963bc5d69fa47ab5eb2a9b43509bacb0d2 SHA512 7f20420344f6b96baad210cb28a7325ab8e6a472c21f509562c445320f81144dbcc465ff94ceb8e0b1f328077048d119384d0728e3b904d6e9e84611b4c4fefb
 MISC metadata.xml 410 BLAKE2B 600ab550a0c7fed79d5b6dff4cb1857e410f7e350ca6717cbccc826486dcba7040a9b84b04695af64b7cff426598a58c2935cacdf958b36c78224c23d0ac6ae1 SHA512 fcb52aa25ca9d56d93412db81d6826b71c35102d1643c3576e4938111292106cabfde73143b552c2799e6f337f94e84d3318d1240bfabcdbfbd4dd48e37eb476
diff --git a/media-gfx/potrace/potrace-1.16-r1.ebuild b/media-gfx/potrace/potrace-1.16-r1.ebuild
index ac9fe7c8ddb2..bbfcdc01a25c 100644
--- a/media-gfx/potrace/potrace-1.16-r1.ebuild
+++ b/media-gfx/potrace/potrace-1.16-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://potrace.sourceforge.net/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="metric"
 
 RDEPEND="sys-libs/zlib:="
diff --git a/media-gfx/potrace/potrace-1.16.ebuild b/media-gfx/potrace/potrace-1.16.ebuild
index 662e9bb2b546..796436aa52f3 100644
--- a/media-gfx/potrace/potrace-1.16.ebuild
+++ b/media-gfx/potrace/potrace-1.16.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://potrace.sourceforge.net/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="metric"
 
 RDEPEND="sys-libs/zlib:="
diff --git a/media-gfx/povray/Manifest b/media-gfx/povray/Manifest
index 046574d62c99..6e731c5f6ee3 100644
--- a/media-gfx/povray/Manifest
+++ b/media-gfx/povray/Manifest
@@ -5,5 +5,5 @@ AUX povray-3.7.0.0-user-conf.patch 1491 BLAKE2B ee99672c70a5d7e12048acbfc50a3ef4
 AUX povray-3.7.0_rc6-darwin-defaults.patch 920 BLAKE2B 9cffcda18626cfdbea9a6b00ae99ee300d6b29a79e22229e35d116070b4a1ac1fbb4869242a043155a4fa189f701e6bc318cd3ba8fbc743d497db26c763926c8 SHA512 17ae635430f0d57157c9915ce5b25a88afcb34f6dd9552b27a42b32d638fdfbcb8b4e41ec89b52048db9d054812535b7b41f328ffe4554e719e4a3de21cbfdee
 DIST povray-3.7.0.0.tar.gz 38191521 BLAKE2B 5d936bdcdf9910ede2247cfa5e3881211da00762ac4bc08225dc6b53addc9e09546de9493e642b5d41228d81a50a4bcfbb5e606eb8bd9a224bb1afc5fc82db6e SHA512 82e3dbcd58b7ae921fe3b953815ca4dbbfb22eda434554baee4accabd1455b18cb511061f1cf9cf93128fab0a042df374fe2f68186d78c19853a465bd4bcbe10
 DIST povray-3.7.0.0_p20160914-fix-c++14.patch.bz2 12876 BLAKE2B b1c458764f04a57420a4562e9faacae4ae955c3d9ce4343ffd49176bb575f63830fcd58d0777dea22b975df118aa14e2bdd91509758d33d659daa3fbbaba5880 SHA512 3329da12a822762559445e208a746ff208c39f7b63e27ba84a390074bb52a105c9a2f66180e58c5157795bb16346e11b5b05efaf077ee0d8246179975a692b04
-EBUILD povray-3.7.0.0-r4.ebuild 4737 BLAKE2B c3104d5e8d249015df73ce095270c237d16d82281d3d10d48bfcf2bdbd6dd6555437815307b802f40dc02209620386a5d0a23402e0cb92cebbdd2d4b4d2ca9ba SHA512 80242dce3f3c10a993ebec1b32b7e2eb7f2685a960e94c4ad04a6e2e81cb225e2916b6b6eac1f26e74b88da61f569cc784b876fa825d8aa99291a9bcc850a56d
+EBUILD povray-3.7.0.0-r6.ebuild 4883 BLAKE2B 55f67cb40b62f82d049a7caf4640e77f7e6ec1f5852c53f8fc2fa5443ec490dbf54b75e65776de7626ad8992a362f8ad741dc06107eaab00c5d6d116374d3d7c SHA512 59ec48c2d178c6983d2d99590b07fb1ffa13b1e41e145ecef6e8c092e4f63d3263779954d574e3623a05147f15c16bbf3baba0a46e3338434260957695f0df21
 MISC metadata.xml 410 BLAKE2B e2d166cc7ed5872c7e0bdcf69c7856bd8218b059e9b0444a68930216c423ef7c8922ad963cfc3dc56f0d997c1a6372a04058815eb2b36487d07dbc6752908e2d SHA512 c159e2c730bba95d7c65525d62af05bd5b9d873a519e734010a8e5bc597590147accfe02e23946f0349c0be31a10b3e578d035bc3ff8d11a11274c1957a834be
diff --git a/media-gfx/povray/povray-3.7.0.0-r4.ebuild b/media-gfx/povray/povray-3.7.0.0-r6.ebuild
index 8fbfdb6ab113..cf23b11ffd6b 100644
--- a/media-gfx/povray/povray-3.7.0.0-r4.ebuild
+++ b/media-gfx/povray/povray-3.7.0.0-r6.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
-inherit autotools eapi7-ver flag-o-matic virtualx
+inherit autotools flag-o-matic virtualx
 
 POVRAY_MAJOR_VER=$(ver_cut 1-3)
 POVRAY_MINOR_VER=$(ver_cut 4)
-if [ -n "$POVRAY_MINOR_VER" ]; then
+if [[ -n ${POVRAY_MINOR_VER} ]]; then
 	POVRAY_MINOR_VER=${POVRAY_MINOR_VER/rc/RC}
 	MY_PV="${POVRAY_MAJOR_VER}.${POVRAY_MINOR_VER}"
 else
@@ -18,10 +18,13 @@ DESCRIPTION="The Persistence of Vision Raytracer"
 HOMEPAGE="https://www.povray.org/"
 SRC_URI="https://github.com/POV-Ray/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 	https://dev.gentoo.org/~soap/distfiles/${P}_p20160914-fix-c++14.patch.bz2"
+S=${WORKDIR}/${PN}-${MY_PV}
 
-LICENSE="AGPL-3"
+# Upstream claims to have CC-BY-NC-SA-2.5 documentation, but it doesn't seem
+# to actually be in the sources, so we don't distribute it either.
+LICENSE="AGPL-3+ CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="debug +io-restrictions tiff X"
 
 DEPEND="
@@ -30,12 +33,10 @@ DEPEND="
 	media-libs/libpng:=
 	sys-libs/zlib
 	tiff? ( media-libs/tiff:= )
-	X? ( media-libs/libsdl )"
+	X? ( media-libs/libsdl )
+"
 RDEPEND="${DEPEND}"
-DEPEND="${DEPEND}
-	dev-build/autoconf-archive"
-
-S=${WORKDIR}/${PN}-${MY_PV}
+BDEPEND="dev-build/autoconf-archive"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-user-conf.patch
@@ -107,25 +108,26 @@ src_configure() {
 	# but the code compiles using incorrect [default] paths
 	# (based on /usr/local...), so povray will not find the system
 	# config files without the following fix:
-	append-cppflags -DPOVLIBDIR=\\\""${EROOT}"usr/share/${PN}\\\" -DPOVCONFDIR=\\\""${EROOT}"etc/${PN}\\\"
+	append-cppflags -DPOVLIBDIR=\\\""${EROOT}"/usr/share/${PN}\\\" -DPOVCONFDIR=\\\""${EROOT}"/etc/${PN}\\\"
 
 	# TODO: Restore OpenEXR if upstream start to support OpenEXR 3/imath
-	econf \
-		COMPILED_BY="Portage (Gentoo $(uname)) on $(hostname -f)" \
-		$(use_enable debug) \
-		$(use_enable io-restrictions) \
-		--without-openexr \
-		$(use_with tiff libtiff "${EPREFIX}/usr/$(get_libdir)") \
-		$(use_with X libsdl "${EPREFIX}/usr/$(get_libdir)") \
-		$(use_with X x "${EPREFIX}/usr/$(get_libdir)") \
-		$(usex tiff "" "NON_REDISTRIBUTABLE_BUILD=yes") \
-		--with-boost-libdir="${EPREFIX}/usr/$(get_libdir)" \
-		--without-libmkl \
-		--disable-pipe \
-		--disable-static \
-		--disable-strip \
-		--disable-optimiz \
+	local myeconfargs=(
+		COMPILED_BY="Portage (Gentoo $(uname)) on $(hostname -f)"
+		$(use_enable debug)
+		$(use_enable io-restrictions)
+		--without-openexr
+		$(use_with tiff libtiff "${EPREFIX}/usr/$(get_libdir)")
+		$(use_with X libsdl "${EPREFIX}/usr/$(get_libdir)")
+		$(use_with X x "${EPREFIX}/usr/$(get_libdir)")
+		$(usex tiff "" "NON_REDISTRIBUTABLE_BUILD=yes")
+		--with-boost-libdir="${EPREFIX}/usr/$(get_libdir)"
+		--without-libmkl
+		--disable-pipe
+		--disable-strip
+		--disable-optimiz
 		--disable-optimiz-arch
+	)
+	econf "${myeconfargs[@]}"
 }
 
 src_test() {
@@ -138,11 +140,11 @@ pkg_preinst() {
 	# This way, they can be treated by CONFIG_PROTECT as normal.
 	local conf_file version_dir
 	for conf_file in "${ED}"/etc/"${PN}"/*; do
-		if [ ! -e "${EROOT}etc/${PN}/${conf_file}" ]; then
-			for version_dir in $(echo "${EROOT}"etc/"${PN}"/* | grep "^[0-9]" | sort -rn); do
-				if [ -e "${EROOT}etc/${PN}/${version_dir}/${conf_file}" ]; then
-					mv "${EROOT}etc/${PN}/${version_dir}/${conf_file}" "${EROOT}etc/${PN}" || die
-					elog "Note: ${conf_file} moved from ${EROOT}etc/povray/${version_dir}/ to ${EROOT}etc/povray/"
+		if [[ ! -e "${EROOT}/etc/${PN}/${conf_file}" ]]; then
+			for version_dir in $(echo "${EROOT}"/etc/"${PN}"/* | grep "^[0-9]" | sort -rn); do
+				if [ -e "${EROOT}/etc/${PN}/${version_dir}/${conf_file}" ]; then
+					mv "${EROOT}/etc/${PN}/${version_dir}/${conf_file}" "${EROOT}/etc/${PN}" || die
+					elog "Note: ${conf_file} moved from ${EROOT}/etc/povray/${version_dir}/ to ${EROOT}/etc/povray/"
 					break
 				fi
 			done
diff --git a/media-gfx/prusaslicer/Manifest b/media-gfx/prusaslicer/Manifest
index e2280ae9bf24..411ec04caecf 100644
--- a/media-gfx/prusaslicer/Manifest
+++ b/media-gfx/prusaslicer/Manifest
@@ -1,12 +1,16 @@
-AUX prusaslicer-2.6.0-disable-noisy-asserts.patch 503 BLAKE2B 11624effbd6082bb04d6cad3a5f06c047dd267e8157607da9e29c1010632c17595515bc7958db0828392104f1c98e4571cca836d416277f66b703fd7606e7ede SHA512 9607f8819d886b777a7ff4ad4d3e4bf2c6cda51cc00660ce91c6750e6f74096f286685df92757af097098872624d07a064a9fbfea416df5b13a4f2df733083ef
-AUX prusaslicer-2.6.0-dont-force-link-to-wayland-and-x11.patch 535 BLAKE2B 216255701f709b115089c26c6b2dc00a5b55875d18ca1b84f0f62cf9a95ca5b07825867022558f78afe7497bbd90cca4735bffda1380e0798050c893aad0da52 SHA512 3a0fb2cf23a8de2465b1a457b4069c69b2aa105bd42a20a35dd801d59a9b9654ed331a26df9525a56ba43bca5052fde418ea937ed7416025b68b9ca13f79f877
-AUX prusaslicer-2.6.0-libexpat-double-definition-fix.patch 839 BLAKE2B 699b323d52bf8307e9dec433be337c6688815519a169bb27e3841a94ef364a50fc33cb115def6c715dc4eec5e9e9f44c10f4393c568251e9b4b4b6b28d56d6a8 SHA512 1835cb47b5a85b0af7bd565ae080d81bd844ff5976a960d9f1ee13d16cdc6ebe9eb95658f39ee6a8885474ac9cb140b088eba7e9559293b3b6fcb27ffc8ffdbf
-AUX prusaslicer-2.7.2-opencascade-7.8.0.patch 432 BLAKE2B e7ac72dbe7ab6f79703c7e567269a04a6bf069cd41816bb0d20db53ef2ec97139112d1c04faf248070caeec392f07a875bc5b1ad9b9b2f3451f88d858dff0ebb SHA512 31ba173ed840db500f06968fcb5c4660ee31d270abbd7ad28c53c5475e13620ca34ce42fae2a740757c99d8725c0a2e08edc9a4b7e8ab98baaaf62db34245d58
-DIST prusaslicer-2.6.1.tar.gz 58479800 BLAKE2B d5bfe09a76c5e1e5d3f5fae350db27db61e1f90465db42b5573314c58d77c89d3c04e67b45c449374570b7c1a0ee13bf7984b011f751a71e3b1414759cc921e9 SHA512 2b04eeff4feca2afd560b2fb6a5bbdaae6cabed2180d1416f2e4c7c385a50f859ec334c864a737b7c09eb3fd88f80af68655a0ef25ce9216b16549b16b3020b0
-DIST prusaslicer-2.7.1.tar.gz 64975776 BLAKE2B 7683e2c97458da6b6f2b0e826f538d556f011e4580246277a926df55a71c5a4668089235b8b13379646e1730d301c446cd5d9116e236986cb29bb322390ba94f SHA512 20037164b8a8853e2f30a5ed613e0da1d02d6fa581c21ef67a51e90af3c33a98eb75e0b3a203adfb8ed7bc67f32de7ea598f3f0ab9c68341738db0c1c1974b3d
-DIST prusaslicer-2.7.4.tar.gz 65396083 BLAKE2B 658c9c623e9b25ba2590f3b816987776050b25849dab2b52500ed1673434f016007b6f40944afe412df4a517351785db15de8c8b8e633d7765d656e35014aa69 SHA512 fa876160ec641ecaed20339d66c01971ca1ad73fdfba3b19bae4169e81020175aa5b99a8a7f4f01bf15d112b817cde8226c01bb4bdfb077f387a2d27f92e5d6b
-EBUILD prusaslicer-2.6.1.ebuild 2116 BLAKE2B 7b3a056615bdac9762bc6f8a04abc7d2e259e3fd803742bcae4a1561e67e0769a30bca3a77522cc8e3cec3ff5edea01c812d7ccfb6e796f7340c5efec485322f SHA512 30513133e6c72f0c98a0c40080cafcbcf72a54382d42b5f2ef0d4f5361af85940a510983b9e60085bb17322127d48f7d251a64cc1e29e9fa4ade4d7c6720787c
-EBUILD prusaslicer-2.7.1.ebuild 2082 BLAKE2B 92fe269699a582ec1192ac370e9b0c183d9de0cb82d2e7ff22d2ae1c27685102e74fb7ec902ebfc38daa28c6967a34e9e5326ccd47087b63d66ce845c83c6a07 SHA512 7d45b154c1aff505db45ad1cb28616c6941b9c957b9ce85352f52ceafc1e03e9cdebe2edf04c1bcca1525571622dd6aae1209b8ba9613f09659352f10ccd394c
-EBUILD prusaslicer-2.7.4.ebuild 2200 BLAKE2B d50df8106771d0156ac4e577bbf9c18a5a8e19048d81c17fa83a779e122c10fe667595bb3e99df6e113db56ad02714686428f27752d1c47c239144aa6985093b SHA512 448153e889b76a30d2abb74428c18218a57662f1a9592f0002b407374fe83d494408284eb1d8deb388738233f868ee957f2b149a4bac18b7da5f34dc50f7d351
-EBUILD prusaslicer-9999.ebuild 2318 BLAKE2B 5e34c426e87d2b821bcfbddcb32e189a54ec7f38b5dfbfb1151b9f9c4816a8cb18463bf1c923ffd35618b5b904f23b11d3b79e3a538cccb928c1c444758d3d07 SHA512 33c7ad6035acd4bea7c2e2d73f505d1b2777e694bd9bb28886635af6cbef17165dca893832b70275cbfd2a327c2205e915456630c60878420f471789595377cd
+AUX prusaslicer-2.6.0-dont-force-link-to-wayland-and-x11.patch 448 BLAKE2B 1d4a96762ed6da41e5f4322d6ac6019fb3894321da206ea354d1d9b57e1892155a109c329590bad4393cffd748f9e27542a7cc468803329c8f493789a2b497b1 SHA512 71a3eb2bbe3766be555e94f32219edfb908bdd5f86c74971c1c9b2586306d70724c45b06edbd4ade232017259fe4a99e504447cbbbdd5d5c91f4df03f4d52140
+AUX prusaslicer-2.7.2-opencascade-7.8.0.patch 323 BLAKE2B ee422c91800bf164098396dab448630174b2dd5444d55ff176f10b73e660a446006a0dadfcd2d3cde715b8b58023fe10dd41f6bddb6165fb405382b256eebc52 SHA512 408897cc09ad58e9828b5645553f948a0e0e1b6b07c0bca7bb3ab37789bd988a7076c6d2c79d16ee198f16fdacc59d408ea759e969c83787b2f4bc1161dd94b0
+AUX prusaslicer-2.8.0-cgal-6.0.patch 11085 BLAKE2B 459d6862ab6dceab56beaba58b15d91b398a16b7a8e2a25f0ed2e3f9a699f52d1408027501f4e29903ae50ef52a07555a63de370022de9bd4444e107c6c0df1f SHA512 b2339ab275600126a72a9eb60b805d72dc5101e140cfb31e713413ea2d3d96a5533ac058672d9c10df347ddd001597ec0af375b3eb429ad0f83e18386870497f
+AUX prusaslicer-2.8.0-fixed-linking.patch 751 BLAKE2B d0a5593a2559514f68df6798fb9c4e5c0b9c4021ece74281311c2a19b8233914fcb16227b7aafa5ee222d41ac82c4d5c9c363c32029d13c44c7fe2cb02e60291 SHA512 5f2fdc0da5d979b8520d302549f42103f7e9b0588165430aff734d7d50d56e98c8c208394d9bfaf82f042c9ecac7a3ae72713bfe18341f0ba184cf313cec9206
+AUX prusaslicer-2.8.0-missing-includes.patch 575 BLAKE2B aef794b75d180176f6ba4b1ec05e4ddfe740ced6000225ce51e3a15bd1143209a340af28dc91660d3f07696f19ad525ef86f5e84f3ff4c96ad77c90940059352 SHA512 65c2c8a2046bf39a9d0f5c073998ec93906efbeb8b2d3b7d835f1a65b2edc00c473fb2bed7396e35e45d00b9420f3942f2e16af2e2c6a1405e90341e41b16cf2
+AUX prusaslicer-2.8.0-wxwidgets-3.2.4.patch 1332 BLAKE2B a5e343f64e5f3c2150d170453579b87c3912b5bcb0a7cbd7d1076d2d1f1b10f4e586ed5237ef9faebdbfea23c0e8941a1d0c5f9c71fef2e0269c0120206f2155 SHA512 0fe1af19f8f55bbb11ca8b6685b73858f23b87e3785cb4babe4a8b5ae09694681df4d5f354af896ca1833be2d934da0cf8193285a25e8f28d588b52147ce96a2
+AUX prusaslicer-2.8.1-cgal-6.0.patch 11183 BLAKE2B 3d0b7729fd0a64eb335b1bb8fd4af547c71ddbaec1e589dc4aba2f608073b394c44012d18b127cc17a3b2d5ef8eaad31b21c00623326cc818ec953103ea6dd1c SHA512 a8a3e7c9e7d39519ae93f78b1c6b220f419ef0141a11e9d68c8a3f599a57e164221a572b6989a5b5285b61419cc207ed091834b4de1a442db5806402524e9885
+AUX prusaslicer-2.8.1-fixed-linking.patch 1220 BLAKE2B ef23b03e3fef11d7d1080a140af1085be748b5c0009084acd77f3596c8dffddbad0c612b6a0a2c0da12b130f325cf2798c3e7f41d99b75fd22c093b3e0747912 SHA512 9bdbbb76163549612157976e3770aae7c3b4644b4f9c29c17ca1420a9f7269e30db6556c5c0b06cb7475d6202346b69d21908e0847a7953fa6687ae58d8b0c8b
+AUX prusaslicer-2.8.1-fstream.patch 1682 BLAKE2B 2acebf6900b82e9b9fb94988d0d8c2ce57d470c6db3e282d6232ed3ffc312611317cede5292274dfdaa3d8aa599b074164a2b5d443d5653b35e3db5dca43f8e0 SHA512 385fc73a68a36466becf325cbf8621aa7428f0bfd18b396066382a8f2a91422d3320b7a257f8b251c04be36c13f52af4569e3d154758cf844238657672e22b22
+AUX prusaslicer-2.8.1-opencascade-7.8.0.patch 401 BLAKE2B e2d3a859e418be897d093fb499248d0dda8ab5e3be783cd653591923feb0c4808c7451f4f8e8f0907daa12bd8bd82350a12794c5c8f3136cc73b5ba28e8ba37e SHA512 feecf49443aac23a78c88127e08133f6a6989da93cc187c923aec347286e7cdc8425fc8e4e449f47547a4310a3572bb6391eeb8e7fb16b510db52d4f7f48fc49
+DIST prusaslicer-2.8.0.tar.gz 69806919 BLAKE2B b87c63ae411814dbffc8ae96c243bf06018d600db732ef32f7c766ce6bdf156b0aca6da90868482f39b9c6421c6a386bccc9f69e23218dadc07f1bcdb21b9793 SHA512 d98b43e9e1a6da9cbab46b2564da02fc0f8521d84a4df915d0ffd0878ee1a25afebe7078e38b124ec8565782379c51a7f9564462652ef1a7d9819d29297c1937
+DIST prusaslicer-2.8.1.tar.gz 69409077 BLAKE2B dd3ee810ea00d03f1790386d1fe1fd044c038429700cd33f21299abdf5def12902f7a07c23aa3d2a6cfc5e18d1e2534080889d4a33beefb493a504978a742453 SHA512 0471fa579a494d66e6b49c0bc1a9fa91f3a5f9147d8b7fa8133c6f03391f8daddddb19ed222d1be44f6f22e2de3021f3fb839331e3c3ccdf5643caa8a61d6912
+EBUILD prusaslicer-2.8.0-r1.ebuild 2448 BLAKE2B 500db712e5ea5911c11a50c757ac52cf1ac03675e97b365fd6089fe5ca483becd6ad1c8648ddd50ea1e2c29b6e47f06d7d907968a338f0b090128f5803bf6128 SHA512 95dd1d9d6e5cb6a97af18f1dd9b2bcbd2b23cbd69f402fe1893c2834c4388fb8655b0f711f5fada72b884feb8a85f616b8db151bc2340e3b8ee2818cb6e57520
+EBUILD prusaslicer-2.8.1.ebuild 2710 BLAKE2B 3de57e6ef22c17c4f509c5556250ebeecd30f17e02db91bcf56cb2d26e4b2aeaaa4b3511c840551951eaef792143dd2c4f99b0ee61f0133d48b585269cb65c1b SHA512 f6fed2bc17acdf7c1ad6bd0d9f2da5ebe86e4d9cdc91eb0ae5f7bf02f3b6c2652fc8d3bc763b4f37057501e25901023fa5b3be5cb1527cb26ea9f3f825db7fc4
+EBUILD prusaslicer-9999.ebuild 2710 BLAKE2B 3de57e6ef22c17c4f509c5556250ebeecd30f17e02db91bcf56cb2d26e4b2aeaaa4b3511c840551951eaef792143dd2c4f99b0ee61f0133d48b585269cb65c1b SHA512 f6fed2bc17acdf7c1ad6bd0d9f2da5ebe86e4d9cdc91eb0ae5f7bf02f3b6c2652fc8d3bc763b4f37057501e25901023fa5b3be5cb1527cb26ea9f3f825db7fc4
 MISC metadata.xml 1028 BLAKE2B a267e6b0ee72a85b895046cc7d5f659cca379fd799a9ebb802dc1fafd7edfa1b989784b10eb93ac24f1ea6153153b892e28e20055b0a7d2021f6db7742e065b4 SHA512 5760ea954f5ccf09e5d69e101b6d68839a4517a9375adc3009b1bf846b98091ee0555e9c92bb0cf316670efec699cd24d04b4ebe7db5b65e363f83051d868512
diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.6.0-disable-noisy-asserts.patch b/media-gfx/prusaslicer/files/prusaslicer-2.6.0-disable-noisy-asserts.patch
deleted file mode 100644
index 0e3d1d340572..000000000000
--- a/media-gfx/prusaslicer/files/prusaslicer-2.6.0-disable-noisy-asserts.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp
-index e855b6290..2479bf054 100644
---- a/src/slic3r/GUI/GUI_App.cpp
-+++ b/src/slic3r/GUI/GUI_App.cpp
-@@ -1128,6 +1128,9 @@ bool GUI_App::OnInit()
- 
- bool GUI_App::on_init_inner()
- {
-+    // Disable the wxWidgets asserts breakpoints, end users have no use for them.
-+    wxSizerFlags::DisableConsistencyChecks();
-+
-     // Set initialization of image handlers before any UI actions - See GH issue #7469
-     wxInitAllImageHandlers();
- 
diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.6.0-dont-force-link-to-wayland-and-x11.patch b/media-gfx/prusaslicer/files/prusaslicer-2.6.0-dont-force-link-to-wayland-and-x11.patch
index b949d3b5a897..1d36fcbb7b57 100644
--- a/media-gfx/prusaslicer/files/prusaslicer-2.6.0-dont-force-link-to-wayland-and-x11.patch
+++ b/media-gfx/prusaslicer/files/prusaslicer-2.6.0-dont-force-link-to-wayland-and-x11.patch
@@ -1,5 +1,3 @@
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 50eccfc84..d0f9205b3 100644
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
 @@ -115,9 +115,6 @@ if (SLIC3R_GUI)
diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.6.0-libexpat-double-definition-fix.patch b/media-gfx/prusaslicer/files/prusaslicer-2.6.0-libexpat-double-definition-fix.patch
deleted file mode 100644
index 23006a2ceedf..000000000000
--- a/media-gfx/prusaslicer/files/prusaslicer-2.6.0-libexpat-double-definition-fix.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From fdae4a9817b01aacd70ab033dfac711af2acb61e Mon Sep 17 00:00:00 2001
-From: Malte kleine Piening <mkl.piening@gmail.com>
-Date: Tue, 18 Apr 2023 22:29:04 +0200
-Subject: [PATCH] fixed double definition of target libexpat described in #9581
-
----
- cmake/modules/FindEXPAT.cmake | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/cmake/modules/FindEXPAT.cmake b/cmake/modules/FindEXPAT.cmake
-index de204c60f7e..5863e136ec5 100644
---- a/cmake/modules/FindEXPAT.cmake
-+++ b/cmake/modules/FindEXPAT.cmake
-@@ -25,7 +25,7 @@ if (NOT EXPAT_FOUND)
-     endif ()
- endif()
- 
--if (EXPAT_FOUND AND NOT TARGET EXPAT::EXPAT)
-+if (EXPAT_FOUND AND NOT (TARGET EXPAT::EXPAT OR TARGET expat::expat))
-     add_library(libexpat INTERFACE)
-     add_library(EXPAT::EXPAT ALIAS libexpat)
-     target_link_libraries(libexpat INTERFACE expat::expat)
diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.7.2-opencascade-7.8.0.patch b/media-gfx/prusaslicer/files/prusaslicer-2.7.2-opencascade-7.8.0.patch
index 3c97ead5c6b2..296c0366e34a 100644
--- a/media-gfx/prusaslicer/files/prusaslicer-2.7.2-opencascade-7.8.0.patch
+++ b/media-gfx/prusaslicer/files/prusaslicer-2.7.2-opencascade-7.8.0.patch
@@ -1,5 +1,3 @@
-diff --git a/src/occt_wrapper/CMakeLists.txt b/src/occt_wrapper/CMakeLists.txt
-index d8dd8e1..d27055f 100644
 --- a/src/occt_wrapper/CMakeLists.txt
 +++ b/src/occt_wrapper/CMakeLists.txt
 @@ -22,11 +22,8 @@ generate_export_header(OCCTWrapper)
diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.8.0-cgal-6.0.patch b/media-gfx/prusaslicer/files/prusaslicer-2.8.0-cgal-6.0.patch
new file mode 100644
index 000000000000..52013146b1c3
--- /dev/null
+++ b/media-gfx/prusaslicer/files/prusaslicer-2.8.0-cgal-6.0.patch
@@ -0,0 +1,189 @@
+From a9283c62cec2b802aa2133c92b7ff5bf320c0bb6 Mon Sep 17 00:00:00 2001
+From: Laurent Rineau <laurent.rineau@cgal.org>
+Date: Sat, 13 Jul 2024 01:19:21 +0200
+Subject: [PATCH] compatibility with CGAL-6.0 (and 5.6.x)
+
+--- a/src/libslic3r/CutSurface.cpp
++++ b/src/libslic3r/CutSurface.cpp
+@@ -4,6 +4,14 @@
+ ///|/
+ #include "CutSurface.hpp"
+ 
++template <typename T>
++auto access_pmap(std::optional<T> opt) -> T {
++    return opt.value();
++}
++
++template <typename Pair>
++auto access_pmap(Pair pair) { return pair.first; }
++
+ /// models_input.obj - Check transormation of model to each others
+ /// projection_center.obj - circle representing center of projection with correct distance
+ /// {M} .. model index
+@@ -33,6 +41,7 @@ using namespace Slic3r;
+ #include <CGAL/Exact_integer.h>
+ #include <CGAL/Surface_mesh.h>
+ #include <CGAL/Cartesian_converter.h>
++#include <CGAL/AABB_traits.h>
+ #include <tbb/parallel_for.h>
+ 
+ // libslic3r
+@@ -997,8 +1006,8 @@ priv::CutMesh priv::to_cgal(const ExPolygons  &shapes,
+     if (shapes.empty()) return {};
+         
+     CutMesh result;
+-    EdgeShapeMap edge_shape_map = result.add_property_map<EI, IntersectingElement>(edge_shape_map_name).first;
+-    FaceShapeMap face_shape_map = result.add_property_map<FI, IntersectingElement>(face_shape_map_name).first;
++    EdgeShapeMap edge_shape_map  = access_pmap((result.add_property_map<EI, IntersectingElement>(edge_shape_map_name)));
++    FaceShapeMap face_shape_map  = access_pmap((result.add_property_map<FI, IntersectingElement>(face_shape_map_name)));
+ 
+     std::vector<VI> indices;
+     auto insert_contour = [&projection, &indices, &result, 
+@@ -1408,17 +1417,17 @@ priv::CutAOIs priv::cut_from_model(CutMesh                &cgal_model,
+                                    const ExPolygonsIndices &s2i)
+ {
+     // pointer to edge or face shape_map
+-    VertexShapeMap vert_shape_map = cgal_model.add_property_map<VI, const IntersectingElement*>(vert_shape_map_name, nullptr).first;
++    VertexShapeMap vert_shape_map  = access_pmap((cgal_model.add_property_map<VI, const IntersectingElement*>(vert_shape_map_name, nullptr)));
+     
+     // detect anomalities in visitor.
+     bool is_valid = true;
+     // NOTE: map are created when convert shapes to cgal model
+-    const EdgeShapeMap& edge_shape_map = cgal_shape.property_map<EI, IntersectingElement>(edge_shape_map_name).first;
+-    const FaceShapeMap& face_shape_map = cgal_shape.property_map<FI, IntersectingElement>(face_shape_map_name).first;
++    const EdgeShapeMap& edge_shape_map  = access_pmap((cgal_shape.property_map<EI, IntersectingElement>(edge_shape_map_name)));
++    const FaceShapeMap& face_shape_map  = access_pmap((cgal_shape.property_map<FI, IntersectingElement>(face_shape_map_name)));
+     Visitor visitor{cgal_model, cgal_shape, edge_shape_map, face_shape_map, vert_shape_map, &is_valid};
+ 
+     // a property map containing the constrained-or-not status of each edge
+-    EdgeBoolMap ecm = cgal_model.add_property_map<EI, bool>(is_constrained_edge_name, false).first;
++    EdgeBoolMap ecm  = access_pmap((cgal_model.add_property_map<EI, bool>(is_constrained_edge_name, false)));
+     const auto &p = CGAL::parameters::visitor(visitor)
+                         .edge_is_constrained_map(ecm)
+                         .throw_on_self_intersection(false);
+@@ -1427,7 +1436,7 @@ priv::CutAOIs priv::cut_from_model(CutMesh                &cgal_model,
+ 
+     if (!is_valid) return {};
+ 
+-    FaceTypeMap face_type_map = cgal_model.add_property_map<FI, FaceType>(face_type_map_name, FaceType::not_constrained).first;
++    FaceTypeMap face_type_map  = access_pmap((cgal_model.add_property_map<FI, FaceType>(face_type_map_name, FaceType::not_constrained)));
+ 
+     // Select inside and outside face in model
+     set_face_type(face_type_map, cgal_model, vert_shape_map, ecm, cgal_shape, s2i);
+@@ -1563,8 +1572,8 @@ void priv::collect_surface_data(std::queue<FI>  &process,
+ 
+ void priv::create_reduce_map(ReductionMap &reduction_map, const CutMesh &mesh)
+ {
+-    const VertexShapeMap &vert_shape_map = mesh.property_map<VI, const IntersectingElement*>(vert_shape_map_name).first;
+-    const EdgeBoolMap &ecm = mesh.property_map<EI, bool>(is_constrained_edge_name).first;
++    const VertexShapeMap &vert_shape_map  = access_pmap((mesh.property_map<VI, const IntersectingElement*>(vert_shape_map_name)));
++    const EdgeBoolMap &ecm  = access_pmap((mesh.property_map<EI, bool>(is_constrained_edge_name)));
+ 
+     // check if vertex was made by edge_2 which is diagonal of quad
+     auto is_reducible_vertex = [&vert_shape_map](VI reduction_from) -> bool {
+@@ -1749,10 +1758,10 @@ priv::VDistances priv::calc_distances(const SurfacePatches &patches,
+     for (const SurfacePatch &patch : patches) {
+         // map is created during intersection by corefine visitor
+         const VertexShapeMap &vert_shape_map = 
+-            models[patch.model_id].property_map<VI, const IntersectingElement *>(vert_shape_map_name).first;
++            access_pmap((models[patch.model_id].property_map<VI, const IntersectingElement *>(vert_shape_map_name)));
+         uint32_t patch_index = &patch - &patches.front();
+         // map is created during patch creation / dividing
+-        const CvtVI2VI& cvt = patch.mesh.property_map<VI, VI>(patch_source_name).first;
++        const CvtVI2VI& cvt  = access_pmap((patch.mesh.property_map<VI, VI>(patch_source_name)));
+         // for each point on outline
+         for (const Loop &loop : patch.loops) 
+         for (const VI &vi_patch : loop) {
+@@ -2640,7 +2649,7 @@ priv::SurfacePatch priv::create_surface_patch(const std::vector<FI> &fis,
+                                               /* const */ CutMesh   &mesh,
+                                               const ReductionMap    *rmap)
+ {
+-    auto is_counted = mesh.add_property_map<VI, bool>("v:is_counted").first;
++    auto is_counted  = access_pmap((mesh.add_property_map<VI, bool>("v:is_counted")));
+     uint32_t count_vertices = 0;
+     if (rmap == nullptr) {
+         for (FI fi : fis) 
+@@ -2670,7 +2679,7 @@ priv::SurfacePatch priv::create_surface_patch(const std::vector<FI> &fis,
+     cm.reserve(count_vertices, count_edges, count_faces);
+ 
+     // vertex conversion function from mesh VI to result VI
+-    CvtVI2VI mesh2result = mesh.add_property_map<VI,VI>("v:mesh2result").first;
++    CvtVI2VI mesh2result  = access_pmap((mesh.add_property_map<VI,VI>("v:mesh2result")));
+ 
+     if (rmap == nullptr) {
+         for (FI fi : fis) {
+@@ -2722,7 +2731,7 @@ priv::SurfacePatch priv::create_surface_patch(const std::vector<FI> &fis,
+     assert(count_edges >= cm.edges().size());
+     
+     // convert VI from this patch to source VI, when exist
+-    CvtVI2VI cvt = cm.add_property_map<VI, VI>(patch_source_name).first;
++    CvtVI2VI cvt  = access_pmap((cm.add_property_map<VI, VI>(patch_source_name)));
+     // vi_s .. VertexIndex into mesh (source)
+     // vi_d .. new VertexIndex in cm (destination)
+     for (VI vi_s : mesh.vertices()) { 
+@@ -2913,7 +2922,7 @@ bool priv::is_patch_inside_of_model(const SurfacePatch &patch,
+ uint32_t priv::get_shape_point_index(const CutAOI &cut, const CutMesh &model)
+ {
+     // map is created during intersection by corefine visitor
+-    const VertexShapeMap &vert_shape_map = model.property_map<VI, const IntersectingElement *>(vert_shape_map_name).first;
++    const VertexShapeMap &vert_shape_map  = access_pmap((model.property_map<VI, const IntersectingElement *>(vert_shape_map_name)));
+     // for each half edge of outline
+     for (HI hi : cut.second) {
+         VI vi = model.source(hi);
+@@ -2938,7 +2947,7 @@ priv::SurfacePatch priv::separate_patch(const std::vector<FI>& fis,
+     patch_new.model_id     = patch.model_id;
+     patch_new.shape_id     = patch.shape_id;
+     // fix cvt
+-    CvtVI2VI cvt = patch_new.mesh.property_map<VI, VI>(patch_source_name).first;
++    CvtVI2VI cvt  = access_pmap((patch_new.mesh.property_map<VI, VI>(patch_source_name)));
+     for (VI &vi : cvt) {
+         if (!vi.is_valid()) continue;
+         vi = cvt_from[vi];
+@@ -2956,9 +2965,9 @@ void priv::divide_patch(size_t i, SurfacePatchesEx &patches)
+     CutMesh& cm = patch.mesh;
+     assert(!cm.faces().empty());
+     std::string patch_number_name = "f:patch_number";
+-    CutMesh::Property_map<FI,bool> is_processed = cm.add_property_map<FI, bool>(patch_number_name, false).first;
++    CutMesh::Property_map<FI,bool> is_processed  = access_pmap((cm.add_property_map<FI, bool>(patch_number_name, false)));
+     
+-    const CvtVI2VI& cvt_from = patch.mesh.property_map<VI, VI>(patch_source_name).first;
++    const CvtVI2VI& cvt_from  = access_pmap((patch.mesh.property_map<VI, VI>(patch_source_name)));
+ 
+     std::vector<FI> fis;
+     fis.reserve(cm.faces().size());
+@@ -3059,7 +3068,7 @@ priv::SurfacePatches priv::diff_models(VCutAOIs            &cuts,
+         CutAOIs &model_cuts = cuts[model_index];
+         CutMesh &cut_model_ = cut_models[model_index];
+         const CutMesh &cut_model = cut_model_;
+-        ReductionMap vertex_reduction_map = cut_model_.add_property_map<VI, VI>(vertex_reduction_map_name).first;
++        ReductionMap vertex_reduction_map  = access_pmap((cut_model_.add_property_map<VI, VI>(vertex_reduction_map_name)));
+         create_reduce_map(vertex_reduction_map, cut_model);
+ 
+         for (size_t cut_index = 0; cut_index < model_cuts.size(); ++cut_index, ++index) {
+@@ -3145,7 +3154,7 @@ bool priv::is_over_whole_expoly(const CutAOI    &cutAOI,
+                                 const CutMesh   &mesh)
+ {
+     // NonInterupted contour is without other point and contain all from shape    
+-    const VertexShapeMap &vert_shape_map = mesh.property_map<VI, const IntersectingElement*>(vert_shape_map_name).first;
++    const VertexShapeMap &vert_shape_map  = access_pmap((mesh.property_map<VI, const IntersectingElement*>(vert_shape_map_name)));
+     for (HI hi : cutAOI.second) { 
+         const IntersectingElement *ie_s = vert_shape_map[mesh.source(hi)];
+         const IntersectingElement *ie_t = vert_shape_map[mesh.target(hi)];
+@@ -3682,7 +3691,7 @@ void priv::store(const CutMesh &mesh, const FaceTypeMap &face_type_map, const st
+     }
+ 
+     CutMesh &mesh_ = const_cast<CutMesh &>(mesh);
+-    auto face_colors = mesh_.add_property_map<priv::FI, CGAL::Color>("f:color").first;    
++    auto face_colors  = access_pmap((mesh_.add_property_map<priv::FI, CGAL::Color>("f:color")));    
+     for (FI fi : mesh.faces()) { 
+         auto &color = face_colors[fi];
+         switch (face_type_map[fi]) {
+@@ -3708,7 +3717,7 @@ void priv::store(const CutMesh &mesh, const ReductionMap &reduction_map, const s
+     std::string off_file = dir + "model" + std::to_string(reduction_order++) + ".off";
+ 
+     CutMesh &mesh_ = const_cast<CutMesh &>(mesh);
+-    auto vertex_colors = mesh_.add_property_map<priv::VI, CGAL::Color>("v:color").first;    
++    auto vertex_colors  = access_pmap((mesh_.add_property_map<priv::VI, CGAL::Color>("v:color")));    
+     // initialize to gray color
+     for (VI vi: mesh.vertices())
+         vertex_colors[vi] = CGAL::Color{127, 127, 127};
diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.8.0-fixed-linking.patch b/media-gfx/prusaslicer/files/prusaslicer-2.8.0-fixed-linking.patch
new file mode 100644
index 000000000000..33ab6256d6b0
--- /dev/null
+++ b/media-gfx/prusaslicer/files/prusaslicer-2.8.0-fixed-linking.patch
@@ -0,0 +1,19 @@
+--- a/src/slic3r/CMakeLists.txt
++++ b/src/slic3r/CMakeLists.txt
+@@ -376,6 +376,7 @@ set(SLIC3R_GUI_SOURCES
+ )
+ 
+ find_package(NanoSVG REQUIRED)
++find_package(OpenSSL REQUIRED)
+ 
+ if (APPLE)
+     list(APPEND SLIC3R_GUI_SOURCES
+@@ -404,7 +405,7 @@ endforeach()
+ 
+ encoding_check(libslic3r_gui)
+ 
+-target_link_libraries(libslic3r_gui libslic3r avrdude libcereal imgui libvgcode GLEW::GLEW OpenGL::GL hidapi libcurl ${wxWidgets_LIBRARIES} NanoSVG::nanosvg NanoSVG::nanosvgrast)
++target_link_libraries(libslic3r_gui libslic3r avrdude libcereal imgui libvgcode GLEW::GLEW OpenGL::GL hidapi libcurl ${wxWidgets_LIBRARIES} NanoSVG::nanosvg NanoSVG::nanosvgrast OpenSSL::SSL OpenSSL::Crypto)
+ 
+ if (MSVC)
+     target_link_libraries(libslic3r_gui Setupapi.lib)
diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.8.0-missing-includes.patch b/media-gfx/prusaslicer/files/prusaslicer-2.8.0-missing-includes.patch
new file mode 100644
index 000000000000..9d13876b607b
--- /dev/null
+++ b/media-gfx/prusaslicer/files/prusaslicer-2.8.0-missing-includes.patch
@@ -0,0 +1,20 @@
+--- a/src/slic3r/Config/Version.cpp
++++ b/src/slic3r/Config/Version.cpp
+@@ -7,6 +7,7 @@
+ #include <cctype>
+ 
+ #include <boost/filesystem/operations.hpp>
++#include <boost/filesystem/directory.hpp>
+ #include <boost/nowide/fstream.hpp>
+ 
+ #include "libslic3r/libslic3r.h"
+--- a/src/slic3r/GUI/UserAccountCommunication.cpp
++++ b/src/slic3r/GUI/UserAccountCommunication.cpp
+@@ -13,6 +13,7 @@
+ #include <boost/filesystem.hpp>
+ #include <boost/nowide/cstdio.hpp>
+ #include <boost/nowide/fstream.hpp>
++#include <boost/nowide/convert.hpp>
+ #include <curl/curl.h>
+ #include <string>
+ 
diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.8.0-wxwidgets-3.2.4.patch b/media-gfx/prusaslicer/files/prusaslicer-2.8.0-wxwidgets-3.2.4.patch
new file mode 100644
index 000000000000..d7c700662b72
--- /dev/null
+++ b/media-gfx/prusaslicer/files/prusaslicer-2.8.0-wxwidgets-3.2.4.patch
@@ -0,0 +1,28 @@
+From f67a877d583eba5472003f0ea4df3f7420d70734 Mon Sep 17 00:00:00 2001
+From: Gregor Riepl <onitake@gmail.com>
+Date: Mon, 27 Nov 2023 13:01:55 +0100
+Subject: [PATCH] Make initializers explicit to avoid ambiguous wxArrayString
+ overloads
+
+--- a/src/slic3r/GUI/PhysicalPrinterDialog.cpp
++++ b/src/slic3r/GUI/PhysicalPrinterDialog.cpp
+@@ -606,7 +606,7 @@ void PhysicalPrinterDialog::build_printhost_settings(ConfigOptionsGroup* m_optgr
+     // Always fill in the "printhost_port" combo box from the config and select it.
+     {
+         Choice* choice = dynamic_cast<Choice*>(m_optgroup->get_field("printhost_port"));
+-        choice->set_values({ m_config->opt_string("printhost_port") });
++        choice->set_values(std::vector<std::string>({ m_config->opt_string("printhost_port") }));
+         choice->set_selection();
+     }
+ 
+--- a/src/slic3r/GUI/Plater.cpp
++++ b/src/slic3r/GUI/Plater.cpp
+@@ -4048,7 +4048,7 @@ void Plater::load_project(const wxString& filename)
+ 
+     p->reset();
+ 
+-    if (! load_files({ into_path(filename) }).empty()) {
++    if (! load_files(std::vector<boost::filesystem::path>({ into_path(filename) })).empty()) {
+         // At least one file was loaded.
+         p->set_project_filename(filename);
+         // Save the names of active presets and project specific config into ProjectDirtyStateManager.
diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.8.1-cgal-6.0.patch b/media-gfx/prusaslicer/files/prusaslicer-2.8.1-cgal-6.0.patch
new file mode 100644
index 000000000000..3aac479197bb
--- /dev/null
+++ b/media-gfx/prusaslicer/files/prusaslicer-2.8.1-cgal-6.0.patch
@@ -0,0 +1,191 @@
+From a9283c62cec2b802aa2133c92b7ff5bf320c0bb6 Mon Sep 17 00:00:00 2001
+From: Laurent Rineau <laurent.rineau@cgal.org>
+Date: Sat, 13 Jul 2024 01:19:21 +0200
+Subject: [PATCH] compatibility with CGAL-6.0 (and 5.6.x)
+
+updated for 2.8.1
+
+--- a/src/libslic3r/CutSurface.cpp
++++ b/src/libslic3r/CutSurface.cpp
+@@ -4,6 +4,14 @@
+ ///|/
+ #include "CutSurface.hpp"
+ 
++template <typename T>
++auto access_pmap(std::optional<T> opt) -> T {
++    return opt.value();
++}
++
++template <typename Pair>
++auto access_pmap(Pair pair) { return pair.first; }
++
+ /// models_input.obj - Check transormation of model to each others
+ /// projection_center.obj - circle representing center of projection with correct distance
+ /// {M} .. model index
+@@ -31,6 +39,7 @@ using namespace Slic3r;
+ #include <CGAL/Exact_integer.h>
+ #include <CGAL/Surface_mesh.h>
+ #include <CGAL/Cartesian_converter.h>
++#include <CGAL/AABB_traits.h>
+ #include <oneapi/tbb/blocked_range.h>
+ #include <oneapi/tbb/parallel_for.h>
+ #include <boost/property_map/property_map.hpp>
+@@ -1021,8 +1030,8 @@ priv::CutMesh priv::to_cgal(const ExPolygons  &shapes,
+     if (shapes.empty()) return {};
+         
+     CutMesh result;
+-    EdgeShapeMap edge_shape_map = result.add_property_map<EI, IntersectingElement>(edge_shape_map_name).first;
+-    FaceShapeMap face_shape_map = result.add_property_map<FI, IntersectingElement>(face_shape_map_name).first;
++    EdgeShapeMap edge_shape_map  = access_pmap((result.add_property_map<EI, IntersectingElement>(edge_shape_map_name)));
++    FaceShapeMap face_shape_map  = access_pmap((result.add_property_map<FI, IntersectingElement>(face_shape_map_name)));
+ 
+     std::vector<VI> indices;
+     auto insert_contour = [&projection, &indices, &result, 
+@@ -1432,17 +1441,17 @@ priv::CutAOIs priv::cut_from_model(CutMesh                &cgal_model,
+                                    const ExPolygonsIndices &s2i)
+ {
+     // pointer to edge or face shape_map
+-    VertexShapeMap vert_shape_map = cgal_model.add_property_map<VI, const IntersectingElement*>(vert_shape_map_name, nullptr).first;
++    VertexShapeMap vert_shape_map  = access_pmap((cgal_model.add_property_map<VI, const IntersectingElement*>(vert_shape_map_name, nullptr)));
+     
+     // detect anomalities in visitor.
+     bool is_valid = true;
+     // NOTE: map are created when convert shapes to cgal model
+-    const EdgeShapeMap& edge_shape_map = cgal_shape.property_map<EI, IntersectingElement>(edge_shape_map_name).first;
+-    const FaceShapeMap& face_shape_map = cgal_shape.property_map<FI, IntersectingElement>(face_shape_map_name).first;
++    const EdgeShapeMap& edge_shape_map  = access_pmap((cgal_shape.property_map<EI, IntersectingElement>(edge_shape_map_name)));
++    const FaceShapeMap& face_shape_map  = access_pmap((cgal_shape.property_map<FI, IntersectingElement>(face_shape_map_name)));
+     Visitor visitor{cgal_model, cgal_shape, edge_shape_map, face_shape_map, vert_shape_map, &is_valid};
+ 
+     // a property map containing the constrained-or-not status of each edge
+-    EdgeBoolMap ecm = cgal_model.add_property_map<EI, bool>(is_constrained_edge_name, false).first;
++    EdgeBoolMap ecm  = access_pmap((cgal_model.add_property_map<EI, bool>(is_constrained_edge_name, false)));
+     const auto &p = CGAL::parameters::visitor(visitor)
+                         .edge_is_constrained_map(ecm)
+                         .throw_on_self_intersection(false);
+@@ -1451,7 +1460,7 @@ priv::CutAOIs priv::cut_from_model(CutMesh                &cgal_model,
+ 
+     if (!is_valid) return {};
+ 
+-    FaceTypeMap face_type_map = cgal_model.add_property_map<FI, FaceType>(face_type_map_name, FaceType::not_constrained).first;
++    FaceTypeMap face_type_map  = access_pmap((cgal_model.add_property_map<FI, FaceType>(face_type_map_name, FaceType::not_constrained)));
+ 
+     // Select inside and outside face in model
+     set_face_type(face_type_map, cgal_model, vert_shape_map, ecm, cgal_shape, s2i);
+@@ -1587,8 +1596,8 @@ void priv::collect_surface_data(std::queue<FI>  &process,
+ 
+ void priv::create_reduce_map(ReductionMap &reduction_map, const CutMesh &mesh)
+ {
+-    const VertexShapeMap &vert_shape_map = mesh.property_map<VI, const IntersectingElement*>(vert_shape_map_name).first;
+-    const EdgeBoolMap &ecm = mesh.property_map<EI, bool>(is_constrained_edge_name).first;
++    const VertexShapeMap &vert_shape_map  = access_pmap((mesh.property_map<VI, const IntersectingElement*>(vert_shape_map_name)));
++    const EdgeBoolMap &ecm  = access_pmap((mesh.property_map<EI, bool>(is_constrained_edge_name)));
+ 
+     // check if vertex was made by edge_2 which is diagonal of quad
+     auto is_reducible_vertex = [&vert_shape_map](VI reduction_from) -> bool {
+@@ -1773,10 +1782,10 @@ priv::VDistances priv::calc_distances(const SurfacePatches &patches,
+     for (const SurfacePatch &patch : patches) {
+         // map is created during intersection by corefine visitor
+         const VertexShapeMap &vert_shape_map = 
+-            models[patch.model_id].property_map<VI, const IntersectingElement *>(vert_shape_map_name).first;
++            access_pmap((models[patch.model_id].property_map<VI, const IntersectingElement *>(vert_shape_map_name)));
+         uint32_t patch_index = &patch - &patches.front();
+         // map is created during patch creation / dividing
+-        const CvtVI2VI& cvt = patch.mesh.property_map<VI, VI>(patch_source_name).first;
++        const CvtVI2VI& cvt  = access_pmap((patch.mesh.property_map<VI, VI>(patch_source_name)));
+         // for each point on outline
+         for (const Loop &loop : patch.loops) 
+         for (const VI &vi_patch : loop) {
+@@ -2666,7 +2675,7 @@ priv::SurfacePatch priv::create_surface_patch(const std::vector<FI> &fis,
+                                               /* const */ CutMesh   &mesh,
+                                               const ReductionMap    *rmap)
+ {
+-    auto is_counted = mesh.add_property_map<VI, bool>("v:is_counted").first;
++    auto is_counted  = access_pmap((mesh.add_property_map<VI, bool>("v:is_counted")));
+     uint32_t count_vertices = 0;
+     if (rmap == nullptr) {
+         for (FI fi : fis) 
+@@ -2696,7 +2705,7 @@ priv::SurfacePatch priv::create_surface_patch(const std::vector<FI> &fis,
+     cm.reserve(count_vertices, count_edges, count_faces);
+ 
+     // vertex conversion function from mesh VI to result VI
+-    CvtVI2VI mesh2result = mesh.add_property_map<VI,VI>("v:mesh2result").first;
++    CvtVI2VI mesh2result  = access_pmap((mesh.add_property_map<VI,VI>("v:mesh2result")));
+ 
+     if (rmap == nullptr) {
+         for (FI fi : fis) {
+@@ -2748,7 +2757,7 @@ priv::SurfacePatch priv::create_surface_patch(const std::vector<FI> &fis,
+     assert(count_edges >= cm.edges().size());
+     
+     // convert VI from this patch to source VI, when exist
+-    CvtVI2VI cvt = cm.add_property_map<VI, VI>(patch_source_name).first;
++    CvtVI2VI cvt  = access_pmap((cm.add_property_map<VI, VI>(patch_source_name)));
+     // vi_s .. VertexIndex into mesh (source)
+     // vi_d .. new VertexIndex in cm (destination)
+     for (VI vi_s : mesh.vertices()) { 
+@@ -2939,7 +2948,7 @@ bool priv::is_patch_inside_of_model(const SurfacePatch &patch,
+ uint32_t priv::get_shape_point_index(const CutAOI &cut, const CutMesh &model)
+ {
+     // map is created during intersection by corefine visitor
+-    const VertexShapeMap &vert_shape_map = model.property_map<VI, const IntersectingElement *>(vert_shape_map_name).first;
++    const VertexShapeMap &vert_shape_map  = access_pmap((model.property_map<VI, const IntersectingElement *>(vert_shape_map_name)));
+     // for each half edge of outline
+     for (HI hi : cut.second) {
+         VI vi = model.source(hi);
+@@ -2964,7 +2973,7 @@ priv::SurfacePatch priv::separate_patch(const std::vector<FI>& fis,
+     patch_new.model_id     = patch.model_id;
+     patch_new.shape_id     = patch.shape_id;
+     // fix cvt
+-    CvtVI2VI cvt = patch_new.mesh.property_map<VI, VI>(patch_source_name).first;
++    CvtVI2VI cvt  = access_pmap((patch_new.mesh.property_map<VI, VI>(patch_source_name)));
+     for (VI &vi : cvt) {
+         if (!vi.is_valid()) continue;
+         vi = cvt_from[vi];
+@@ -2982,9 +2991,9 @@ void priv::divide_patch(size_t i, SurfacePatchesEx &patches)
+     CutMesh& cm = patch.mesh;
+     assert(!cm.faces().empty());
+     std::string patch_number_name = "f:patch_number";
+-    CutMesh::Property_map<FI,bool> is_processed = cm.add_property_map<FI, bool>(patch_number_name, false).first;
++    CutMesh::Property_map<FI,bool> is_processed  = access_pmap((cm.add_property_map<FI, bool>(patch_number_name, false)));
+     
+-    const CvtVI2VI& cvt_from = patch.mesh.property_map<VI, VI>(patch_source_name).first;
++    const CvtVI2VI& cvt_from  = access_pmap((patch.mesh.property_map<VI, VI>(patch_source_name)));
+ 
+     std::vector<FI> fis;
+     fis.reserve(cm.faces().size());
+@@ -3085,7 +3094,7 @@ priv::SurfacePatches priv::diff_models(VCutAOIs            &cuts,
+         CutAOIs &model_cuts = cuts[model_index];
+         CutMesh &cut_model_ = cut_models[model_index];
+         const CutMesh &cut_model = cut_model_;
+-        ReductionMap vertex_reduction_map = cut_model_.add_property_map<VI, VI>(vertex_reduction_map_name).first;
++        ReductionMap vertex_reduction_map  = access_pmap((cut_model_.add_property_map<VI, VI>(vertex_reduction_map_name)));
+         create_reduce_map(vertex_reduction_map, cut_model);
+ 
+         for (size_t cut_index = 0; cut_index < model_cuts.size(); ++cut_index, ++index) {
+@@ -3171,7 +3180,7 @@ bool priv::is_over_whole_expoly(const CutAOI    &cutAOI,
+                                 const CutMesh   &mesh)
+ {
+     // NonInterupted contour is without other point and contain all from shape    
+-    const VertexShapeMap &vert_shape_map = mesh.property_map<VI, const IntersectingElement*>(vert_shape_map_name).first;
++    const VertexShapeMap &vert_shape_map  = access_pmap((mesh.property_map<VI, const IntersectingElement*>(vert_shape_map_name)));
+     for (HI hi : cutAOI.second) { 
+         const IntersectingElement *ie_s = vert_shape_map[mesh.source(hi)];
+         const IntersectingElement *ie_t = vert_shape_map[mesh.target(hi)];
+@@ -3708,7 +3717,7 @@ void priv::store(const CutMesh &mesh, const FaceTypeMap &face_type_map, const st
+     }
+ 
+     CutMesh &mesh_ = const_cast<CutMesh &>(mesh);
+-    auto face_colors = mesh_.add_property_map<priv::FI, CGAL::Color>("f:color").first;    
++    auto face_colors  = access_pmap((mesh_.add_property_map<priv::FI, CGAL::Color>("f:color")));    
+     for (FI fi : mesh.faces()) { 
+         auto &color = face_colors[fi];
+         switch (face_type_map[fi]) {
+@@ -3734,7 +3743,7 @@ void priv::store(const CutMesh &mesh, const ReductionMap &reduction_map, const s
+     std::string off_file = dir + "model" + std::to_string(reduction_order++) + ".off";
+ 
+     CutMesh &mesh_ = const_cast<CutMesh &>(mesh);
+-    auto vertex_colors = mesh_.add_property_map<priv::VI, CGAL::Color>("v:color").first;    
++    auto vertex_colors  = access_pmap((mesh_.add_property_map<priv::VI, CGAL::Color>("v:color")));    
+     // initialize to gray color
+     for (VI vi: mesh.vertices())
+         vertex_colors[vi] = CGAL::Color{127, 127, 127};
diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.8.1-fixed-linking.patch b/media-gfx/prusaslicer/files/prusaslicer-2.8.1-fixed-linking.patch
new file mode 100644
index 000000000000..b7fc95554591
--- /dev/null
+++ b/media-gfx/prusaslicer/files/prusaslicer-2.8.1-fixed-linking.patch
@@ -0,0 +1,45 @@
+--- a/bundled_deps/admesh/CMakeLists.txt
++++ b/bundled_deps/admesh/CMakeLists.txt
+@@ -13,4 +13,3 @@ add_library(admesh STATIC
+ 
+ target_include_directories(admesh PUBLIC .)
+ target_link_libraries(admesh PRIVATE boost_headeronly localesutils)
+-target_link_libraries(admesh PUBLIC Eigen3::Eigen)
+--- a/src/clipper/CMakeLists.txt
++++ b/src/clipper/CMakeLists.txt
+@@ -10,5 +10,4 @@ add_library(clipper STATIC
+ )
+ 
+ target_link_libraries(clipper PRIVATE TBB::tbb TBB::tbbmalloc int128)
+-target_link_libraries(clipper PUBLIC Eigen3::Eigen)
+ target_include_directories(clipper PUBLIC .)
+--- a/src/libslic3r/CMakeLists.txt
++++ b/src/libslic3r/CMakeLists.txt
+@@ -629,7 +629,6 @@ target_link_libraries(libslic3r PRIVATE
+     int128
+ )
+ target_link_libraries(libslic3r PUBLIC
+-    Eigen3::Eigen
+     semver
+     admesh
+     localesutils
+--- a/src/slic3r/CMakeLists.txt
++++ b/src/slic3r/CMakeLists.txt
+@@ -383,6 +383,7 @@ set(SLIC3R_GUI_SOURCES
+ )
+ 
+ find_package(NanoSVG REQUIRED)
++find_package(OpenSSL REQUIRED)
+ 
+ if (APPLE)
+     list(APPEND SLIC3R_GUI_SOURCES
+@@ -438,6 +439,9 @@ target_link_libraries(
+     NanoSVG::nanosvgrast
+     stb_dxt
+     fastfloat
++    OpenSSL::SSL
++    OpenSSL::Crypto
++    Boost::log
+ )
+ 
+ if (MSVC)
diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.8.1-fstream.patch b/media-gfx/prusaslicer/files/prusaslicer-2.8.1-fstream.patch
new file mode 100644
index 000000000000..f550c53d3f42
--- /dev/null
+++ b/media-gfx/prusaslicer/files/prusaslicer-2.8.1-fstream.patch
@@ -0,0 +1,42 @@
+--- a/src/slic3r/GUI/Gizmos/GLGizmoSVG.cpp
++++ b/src/slic3r/GUI/Gizmos/GLGizmoSVG.cpp
+@@ -1595,7 +1595,7 @@ void GLGizmoSVG::draw_filename(){
+             if (dlg.ShowModal() == wxID_OK ){
+                 last_used_directory = dlg.GetDirectory();
+                 std::string out_path_str(into_u8(dlg.GetPath()));
+-                boost::nowide::ofstream stream(out_path_str);
++                std::ofstream stream(out_path_str);
+                 if (stream.is_open()){
+                     stream << *svg.file_data;
+ 
+--- a/src/slic3r/GUI/PresetArchiveDatabase.cpp
++++ b/src/slic3r/GUI/PresetArchiveDatabase.cpp
+@@ -515,7 +515,7 @@ void PresetArchiveDatabase::load_app_manifest_json()
+ 	if (!fs::exists(path, ec) || ec) {
+ 		copy_initial_manifest();
+ 	}
+-	boost::nowide::ifstream file(path.string());
++	std::ifstream file(path.string());
+ 	std::string data;
+ 	if (file.is_open()) {
+ 		std::string line;
+@@ -682,7 +682,7 @@ void PresetArchiveDatabase::save_app_manifest_json() const
+ 	data += "]";
+ 
+ 	std::string path = get_stored_manifest_path().string();
+-	boost::nowide::ofstream file(path);
++	std::ofstream file(path);
+ 	if (file.is_open()) {
+ 		file << data;
+ 		file.close();
+--- a/src/slic3r/Utils/Http.cpp
++++ b/src/slic3r/Utils/Http.cpp
+@@ -302,7 +302,7 @@ void Http::priv::form_add_file(const char *name, const fs::path &path, const cha
+ //FIXME may throw! Is the caller aware of it?
+ void Http::priv::set_post_body(const fs::path &path)
+ {
+-	boost::nowide::ifstream file(path.string());
++	std::ifstream file(path.string());
+ 	std::string file_content { std::istreambuf_iterator<char>(file), std::istreambuf_iterator<char>() };
+ 	postfields = std::move(file_content);
+ }
diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.8.1-opencascade-7.8.0.patch b/media-gfx/prusaslicer/files/prusaslicer-2.8.1-opencascade-7.8.0.patch
new file mode 100644
index 000000000000..1e37ce9baa19
--- /dev/null
+++ b/media-gfx/prusaslicer/files/prusaslicer-2.8.1-opencascade-7.8.0.patch
@@ -0,0 +1,20 @@
+--- a/src/occt_wrapper/CMakeLists.txt
++++ b/src/occt_wrapper/CMakeLists.txt
+@@ -19,14 +19,11 @@ include(GenerateExportHeader)
+ 
+ generate_export_header(OCCTWrapper)
+ 
+-find_package(OpenCASCADE 7.6.1 REQUIRED)
++find_package(OpenCASCADE REQUIRED)
+ 
+ set(OCCT_LIBS
+-    TKXDESTEP
+-    TKSTEP
+-    TKSTEP209
+-    TKSTEPAttr
+-    TKSTEPBase
++    TKDESTEP
++    TKDESTL
+     TKXCAF
+     TKXSBase
+     TKVCAF
diff --git a/media-gfx/prusaslicer/prusaslicer-2.6.1.ebuild b/media-gfx/prusaslicer/prusaslicer-2.6.1.ebuild
deleted file mode 100644
index 89862b5ef9ad..000000000000
--- a/media-gfx/prusaslicer/prusaslicer-2.6.1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-WX_GTK_VER="3.2-gtk3"
-MY_PN="PrusaSlicer"
-MY_PV="$(ver_rs 3 -)"
-
-inherit cmake wxwidgets xdg
-
-DESCRIPTION="A mesh slicer to generate G-code for fused-filament-fabrication (3D printers)"
-HOMEPAGE="https://www.prusa3d.com/prusaslicer/"
-SRC_URI="https://github.com/prusa3d/PrusaSlicer/archive/refs/tags/version_${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-S="${WORKDIR}/${MY_PN}-version_${MY_PV}"
-
-LICENSE="AGPL-3 Boost-1.0 GPL-2 LGPL-3 MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
-IUSE="test"
-
-RESTRICT="test"
-
-RDEPEND="
-	dev-cpp/eigen:3
-	dev-cpp/tbb:=
-	dev-libs/boost:=[nls]
-	dev-libs/cereal
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/gmp:=
-	dev-libs/mpfr:=
-	media-gfx/openvdb:=
-	net-misc/curl[adns]
-	media-libs/glew:0=
-	media-libs/libjpeg-turbo:=
-	media-libs/libpng:0=
-	media-libs/qhull:=
-	sci-libs/libigl
-	sci-libs/nlopt
-	sci-libs/opencascade:=
-	sci-mathematics/cgal:=
-	sys-apps/dbus
-	sys-libs/zlib:=
-	virtual/opengl
-	x11-libs/gtk+:3
-	>=x11-libs/wxGTK-3.2.2.1-r3:${WX_GTK_VER}[X,opengl]
-	media-libs/nanosvg:=
-"
-DEPEND="${RDEPEND}
-	media-libs/qhull[static-libs]
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.6.0-libexpat-double-definition-fix.patch"
-	"${FILESDIR}/${PN}-2.6.0-disable-noisy-asserts.patch"
-	"${FILESDIR}/${PN}-2.6.0-dont-force-link-to-wayland-and-x11.patch"
-)
-
-src_prepare() {
-	if has_version ">=sci-libs/opencascade-7.8.0"; then
-		eapply "${FILESDIR}/prusaslicer-2.7.2-opencascade-7.8.0.patch"
-	fi
-
-	sed -i -e 's/PrusaSlicer-${SLIC3R_VERSION}+UNKNOWN/PrusaSlicer-${SLIC3R_VERSION}+Gentoo/g' version.inc || die
-
-	sed -i -e 's/find_package(OpenCASCADE 7.6.2 REQUIRED)/find_package(OpenCASCADE REQUIRED)/g' \
-		src/occt_wrapper/CMakeLists.txt || die
-	cmake_src_prepare
-}
-
-src_configure() {
-	CMAKE_BUILD_TYPE="Release"
-
-	setup-wxwidgets
-
-	local mycmakeargs=(
-		-DOPENVDB_FIND_MODULE_PATH="/usr/$(get_libdir)/cmake/OpenVDB"
-
-		-DSLIC3R_BUILD_TESTS=$(usex test)
-		-DSLIC3R_FHS=ON
-		-DSLIC3R_GTK=3
-		-DSLIC3R_GUI=ON
-		-DSLIC3R_PCH=OFF
-		-DSLIC3R_STATIC=OFF
-		-DSLIC3R_WX_STABLE=ON
-		-Wno-dev
-	)
-
-	cmake_src_configure
-}
diff --git a/media-gfx/prusaslicer/prusaslicer-2.7.4.ebuild b/media-gfx/prusaslicer/prusaslicer-2.8.0-r1.ebuild
index 48092fb26071..92c404bba643 100644
--- a/media-gfx/prusaslicer/prusaslicer-2.7.4.ebuild
+++ b/media-gfx/prusaslicer/prusaslicer-2.8.0-r1.ebuild
@@ -9,15 +9,20 @@ MY_PV="$(ver_rs 3 -)"
 
 inherit cmake wxwidgets xdg
 
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/prusa3d/prusaslicer.git"
+else
+	SRC_URI="https://github.com/prusa3d/PrusaSlicer/archive/refs/tags/version_${MY_PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="amd64 ~arm64 ~x86"
+	S="${WORKDIR}/${MY_PN}-version_${MY_PV}"
+fi
+
 DESCRIPTION="A mesh slicer to generate G-code for fused-filament-fabrication (3D printers)"
 HOMEPAGE="https://www.prusa3d.com/prusaslicer/"
-SRC_URI="https://github.com/prusa3d/PrusaSlicer/archive/refs/tags/version_${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-S="${WORKDIR}/${MY_PN}-version_${MY_PV}"
 
 LICENSE="AGPL-3 Boost-1.0 GPL-2 LGPL-3 MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="test"
 
 RESTRICT="!test? ( test )"
@@ -46,7 +51,7 @@ RDEPEND="
 	sys-libs/zlib:=
 	virtual/opengl
 	x11-libs/gtk+:3
-	>=x11-libs/wxGTK-3.2.2.1-r3:${WX_GTK_VER}[X,opengl]
+	>=x11-libs/wxGTK-3.2.2.1-r3:${WX_GTK_VER}[X,opengl,webkit]
 	media-libs/nanosvg:=
 "
 DEPEND="${RDEPEND}
@@ -55,8 +60,11 @@ DEPEND="${RDEPEND}
 "
 
 PATCHES=(
-	"${FILESDIR}/${PN}-2.6.0-libexpat-double-definition-fix.patch"
 	"${FILESDIR}/${PN}-2.6.0-dont-force-link-to-wayland-and-x11.patch"
+	"${FILESDIR}/${PN}-2.8.0-missing-includes.patch"
+	"${FILESDIR}/${PN}-2.8.0-fixed-linking.patch"
+	"${FILESDIR}/${PN}-2.8.0-wxwidgets-3.2.4.patch"
+	"${FILESDIR}/${PN}-2.8.0-cgal-6.0.patch"
 )
 
 src_prepare() {
diff --git a/media-gfx/prusaslicer/prusaslicer-2.7.1.ebuild b/media-gfx/prusaslicer/prusaslicer-2.8.1.ebuild
index 4784511aea1f..fbf13e9d7d66 100644
--- a/media-gfx/prusaslicer/prusaslicer-2.7.1.ebuild
+++ b/media-gfx/prusaslicer/prusaslicer-2.8.1.ebuild
@@ -9,18 +9,23 @@ MY_PV="$(ver_rs 3 -)"
 
 inherit cmake wxwidgets xdg
 
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/prusa3d/prusaslicer.git"
+else
+	SRC_URI="https://github.com/prusa3d/PrusaSlicer/archive/refs/tags/version_${MY_PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+	S="${WORKDIR}/${MY_PN}-version_${MY_PV}"
+fi
+
 DESCRIPTION="A mesh slicer to generate G-code for fused-filament-fabrication (3D printers)"
 HOMEPAGE="https://www.prusa3d.com/prusaslicer/"
-SRC_URI="https://github.com/prusa3d/PrusaSlicer/archive/refs/tags/version_${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-S="${WORKDIR}/${MY_PN}-version_${MY_PV}"
 
 LICENSE="AGPL-3 Boost-1.0 GPL-2 LGPL-3 MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
 IUSE="test"
 
-RESTRICT="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-cpp/eigen:3
@@ -46,27 +51,36 @@ RDEPEND="
 	sys-libs/zlib:=
 	virtual/opengl
 	x11-libs/gtk+:3
-	>=x11-libs/wxGTK-3.2.2.1-r3:${WX_GTK_VER}[X,opengl]
+	>=x11-libs/wxGTK-3.2.2.1-r3:${WX_GTK_VER}[X,opengl,webkit]
 	media-libs/nanosvg:=
 "
 DEPEND="${RDEPEND}
 	media-libs/qhull[static-libs]
+	test? ( =dev-cpp/catch-2* )
 "
 
 PATCHES=(
-	"${FILESDIR}/${PN}-2.6.0-libexpat-double-definition-fix.patch"
 	"${FILESDIR}/${PN}-2.6.0-dont-force-link-to-wayland-and-x11.patch"
+	"${FILESDIR}/${PN}-2.8.0-missing-includes.patch"
+	"${FILESDIR}/${PN}-2.8.0-wxwidgets-3.2.4.patch"
+	"${FILESDIR}/${PN}-2.8.1-fixed-linking.patch"
+	"${FILESDIR}/${PN}-2.8.1-cgal-6.0.patch"
+	"${FILESDIR}/${PN}-2.8.1-fstream.patch"
 )
 
 src_prepare() {
 	if has_version ">=sci-libs/opencascade-7.8.0"; then
-		eapply "${FILESDIR}/prusaslicer-2.7.2-opencascade-7.8.0.patch"
+		eapply "${FILESDIR}/prusaslicer-2.8.1-opencascade-7.8.0.patch"
 	fi
 
 	sed -i -e 's/PrusaSlicer-${SLIC3R_VERSION}+UNKNOWN/PrusaSlicer-${SLIC3R_VERSION}+Gentoo/g' version.inc || die
 
-	sed -i -e 's/find_package(OpenCASCADE 7.6.2 REQUIRED)/find_package(OpenCASCADE REQUIRED)/g' \
+	sed -i -e 's/find_package(OpenCASCADE 7.6.[0-9] REQUIRED)/find_package(OpenCASCADE REQUIRED)/g' \
 		src/occt_wrapper/CMakeLists.txt || die
+
+	find . -type f \( -name '*.cpp' -o -name '*.h' -o -name '*.hpp' \) -exec \
+		sed -i 's|#include <Eigen/|#include <eigen3/Eigen/|g; s|#include <unsupported/Eigen/|#include <eigen3/unsupported/Eigen/|g' {} + || die
+
 	cmake_src_prepare
 }
 
@@ -90,3 +104,10 @@ src_configure() {
 
 	cmake_src_configure
 }
+
+src_test() {
+	CMAKE_SKIP_TESTS=(
+		"^libslic3r_tests$"
+	)
+	cmake_src_test
+}
diff --git a/media-gfx/prusaslicer/prusaslicer-9999.ebuild b/media-gfx/prusaslicer/prusaslicer-9999.ebuild
index 5f7e18907896..fbf13e9d7d66 100644
--- a/media-gfx/prusaslicer/prusaslicer-9999.ebuild
+++ b/media-gfx/prusaslicer/prusaslicer-9999.ebuild
@@ -51,7 +51,7 @@ RDEPEND="
 	sys-libs/zlib:=
 	virtual/opengl
 	x11-libs/gtk+:3
-	>=x11-libs/wxGTK-3.2.2.1-r3:${WX_GTK_VER}[X,opengl]
+	>=x11-libs/wxGTK-3.2.2.1-r3:${WX_GTK_VER}[X,opengl,webkit]
 	media-libs/nanosvg:=
 "
 DEPEND="${RDEPEND}
@@ -60,19 +60,27 @@ DEPEND="${RDEPEND}
 "
 
 PATCHES=(
-	"${FILESDIR}/${PN}-2.6.0-libexpat-double-definition-fix.patch"
 	"${FILESDIR}/${PN}-2.6.0-dont-force-link-to-wayland-and-x11.patch"
+	"${FILESDIR}/${PN}-2.8.0-missing-includes.patch"
+	"${FILESDIR}/${PN}-2.8.0-wxwidgets-3.2.4.patch"
+	"${FILESDIR}/${PN}-2.8.1-fixed-linking.patch"
+	"${FILESDIR}/${PN}-2.8.1-cgal-6.0.patch"
+	"${FILESDIR}/${PN}-2.8.1-fstream.patch"
 )
 
 src_prepare() {
 	if has_version ">=sci-libs/opencascade-7.8.0"; then
-		eapply "${FILESDIR}/prusaslicer-2.7.2-opencascade-7.8.0.patch"
+		eapply "${FILESDIR}/prusaslicer-2.8.1-opencascade-7.8.0.patch"
 	fi
 
 	sed -i -e 's/PrusaSlicer-${SLIC3R_VERSION}+UNKNOWN/PrusaSlicer-${SLIC3R_VERSION}+Gentoo/g' version.inc || die
 
-	sed -i -e 's/find_package(OpenCASCADE 7.6.2 REQUIRED)/find_package(OpenCASCADE REQUIRED)/g' \
+	sed -i -e 's/find_package(OpenCASCADE 7.6.[0-9] REQUIRED)/find_package(OpenCASCADE REQUIRED)/g' \
 		src/occt_wrapper/CMakeLists.txt || die
+
+	find . -type f \( -name '*.cpp' -o -name '*.h' -o -name '*.hpp' \) -exec \
+		sed -i 's|#include <Eigen/|#include <eigen3/Eigen/|g; s|#include <unsupported/Eigen/|#include <eigen3/unsupported/Eigen/|g' {} + || die
+
 	cmake_src_prepare
 }
 
diff --git a/media-gfx/pstoedit/Manifest b/media-gfx/pstoedit/Manifest
index 2fa2933a3a4a..ff544bf7bc3c 100644
--- a/media-gfx/pstoedit/Manifest
+++ b/media-gfx/pstoedit/Manifest
@@ -1,5 +1,5 @@
 AUX pstoedit-3.75-gcc12.patch 282 BLAKE2B b25ffea80561cc5b3a35c2f48333996195bba681c8c14464f798344b6d09f72c86cbc4546fa185e699e8da729b394027b66162fc50e96dbb7e2ef8061ae300b2 SHA512 b4c1256a8b53746d611bd41d02184fd3d532aa16fda1661dd4bfa4badae94164c66bd47041e87072678bbbf7dfdc8eb0a928fbfb4f8cb6c947e28916871b17b0
 AUX pstoedit-3.75-libdl.patch 432 BLAKE2B 19d6b192c7fa1497f40baff8c039139248be34bbd7f1858e4731da4e631a46dfa8a7e5a9041a5e991a44fb049b0399fad763c65b9a27437d7bcd1d61631fd760 SHA512 010263020e07b57fdde3fa6478cf5865877d71d015a446d8111326d69ce7138467e384bb5f48baa149932a0c4a42d9a60552ff8616125cbc1dabf613cd78df79
 DIST pstoedit-3.75.tar.gz 1290057 BLAKE2B 607a265ea6f058e1ba432d55c4602452cd52a48302441ecee542a113d90b090ce888cc6fa5e3a8e3a2fdbf94dce9b1ab1f7f5ba58ab81f1f509eea9052a3cd82 SHA512 54b8cf7e78e52027d45e7550821476d9a9c4df4f63af83792b6a2909bc62236450ba6b619f95eede9f61a715f4937f1fbaf2ce4ae4b486daa0294c396a882a28
-EBUILD pstoedit-3.75.ebuild 1346 BLAKE2B ed842c462a32bb22bd1b1228a60ddc0e9fa4d56e365125212ceecab6e5ec3d3ead9b9c72a20613316ed8168ce0d016b52984f38fe4db203185d751d6080b5591 SHA512 3484097f04b8d584162cb23c33f133210ba1f7d6ef6c60910594758eb39b3f2dc137ff6765634492de90bc58cca212b4684b4dc8792ce653e156e00b141d249d
+EBUILD pstoedit-3.75.ebuild 1340 BLAKE2B 7bd6eb40c0dc9c2907f18f4f0834321b657fe1fa2978c472d3d9c97f6328c6d33aee47a13f0d162f5217242616c3943a9f94ed69fbf0e4ae0c307b4874668411 SHA512 517bbe98e030fb84d194a27065e1f72524bff38e960473c24f731adf850e71c2cad2a4336dffef8d4fbc71ef6fa78c3ae5f27ee3216b4330902fad1d90139243
 MISC metadata.xml 634 BLAKE2B ea6bd21397a45a3591572e803513b32361761a9872800027ab779c2a9f0e214db9e70dc9fed0acbf6dafe3769cd8525e21d2875e62f4b8711bfc03f38bc47214 SHA512 d8d509f442aee8fbb9036dab15fba870e18b8d6b0b120d3c82bb50e7d86379425f5b91161e4f37137f43710fd50ac2c8481b47b0dd5ab39654729a7280258465
diff --git a/media-gfx/pstoedit/pstoedit-3.75.ebuild b/media-gfx/pstoedit/pstoedit-3.75.ebuild
index 6ec8c7b5d1aa..8e98594fc96d 100644
--- a/media-gfx/pstoedit/pstoedit-3.75.ebuild
+++ b/media-gfx/pstoedit/pstoedit-3.75.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 IUSE="emf imagemagick plotutils pptx"
 
 BDEPEND="
diff --git a/media-gfx/qiv/Manifest b/media-gfx/qiv/Manifest
index 8b8b685e5ea6..18cb4f6884e7 100644
--- a/media-gfx/qiv/Manifest
+++ b/media-gfx/qiv/Manifest
@@ -1,4 +1,3 @@
-AUX qiv-2.3.2-optional-tiff.patch 519 BLAKE2B 1c2f4d4d79f3d746927f4c5af05769992460c30cdd438096d4c4d0c39a9460bcb921ddd854786ec394fc9e229ad239c541cc97f5468cd6934c15a0557275270a SHA512 c492b902bbd7771648deaffc7eafb8fccf86d294c0e2597999f2fff02ed1e02f6fc158ea95fe25c2a9b27d15dffe724c85654c99e7769254abb40e9fdcb8f358
-DIST qiv-2.3.2.tgz 133614 BLAKE2B f06f36524db8cdde1baf3e118e8ceeeb654dd49a674b55d661255734c0bedaa765fcf8bb77b03d3c2bac8d75a9088b3290f1d802d670393b6795fee85dd4f778 SHA512 c4636591f79e8e4c13807433a4101a461e614439e497a5637b958bd9d0937b04515854483d4060d9b1004d6c6060b437d634fdbe491eb0747a660ba65240472d
-EBUILD qiv-2.3.2-r3.ebuild 1209 BLAKE2B d9f0dd4e51d27e0a81df429581bb1114c49b6d9aaff92d90b0725e5407597bfc527f2c6be93ec526e1f3c8aa70ae70c7de203d658c5a01ace96efc033206bda0 SHA512 eb0eba33bf4630d68fa02b339365aae9631c7580b1c0714cde1b0d0b47235f95c1d3e912e111f0e70d648e1865ae79957f1dcf929e0c87531ed61b50d7de4768
-MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
+DIST qiv-2.3.3.tgz 139301 BLAKE2B 0167e074f859ef028e3b343a8e521573f953ba43b7bd78f58e8b337a558b0d48a3c857cccafa2d55384fb48afdc0735949d873de878eff18658f09b98700c61c SHA512 95b5f3759c03648dea1ea1eacaf3d38d808a6eff4d26edf711df0e20a741fc22a0c16bcd84b8740f1455f5d35db9c2b04392dff8b4e030ec3d3c05cd01886759
+EBUILD qiv-2.3.3.ebuild 1157 BLAKE2B ac9b1ee17a105047481605f73baa05cd61fc13111a16c25ab0591adab0add356dd45985eec094300b1e2f20b323f29e10d5bfda14b604013c47c3a970b87f9db SHA512 a95dac67ac2c98301570074dfef14c87bc9b9942fc0588e17d988436aa213a73b6b06f324722b48113d8a32c852850dae0f688a5e5f6e916b1693f124d4729f5
+MISC metadata.xml 248 BLAKE2B 374595d5e26ff95209fa2ffc9ffd10db830ed966d8c14c91fbda1c444d4a96c55a938a2be083a93218ff0e2e59cb876b3311429266efc1c07e39ed913412b669 SHA512 fe38b08d3554e7aa56699814cd72f9b64481ca4e7c7e715e01cc3ed29ac7dddc17f0b8b56bac42ff2c0550c4ddd09537853a272ec7d0ce08506b46b73e1872c9
diff --git a/media-gfx/qiv/files/qiv-2.3.2-optional-tiff.patch b/media-gfx/qiv/files/qiv-2.3.2-optional-tiff.patch
deleted file mode 100644
index e00ad10f93e2..000000000000
--- a/media-gfx/qiv/files/qiv-2.3.2-optional-tiff.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Make tiff header usage conditional on LCMS support as intended.
-
---- ciberandy-qiv-14b562fe2fc3/qiv.h
-+++ ciberandy-qiv-14b562fe2fc3/qiv.h
-@@ -12,6 +12,7 @@
- #ifdef SUPPORT_LCMS
- #include <lcms2.h>
- #include <jpeglib.h>
-+#include <tiffio.h>
- #endif
- 
- /*
---- ciberandy-qiv-14b562fe2fc3/utils.c
-+++ ciberandy-qiv-14b562fe2fc3/utils.c
-@@ -17,7 +17,6 @@
- #include <dirent.h>
- #include <fcntl.h>
- #include <errno.h>
--#include <tiffio.h>
- #include <X11/extensions/dpms.h>
- #ifdef HAVE_EXIF
- #include <libexif/exif-loader.h>
diff --git a/media-gfx/qiv/metadata.xml b/media-gfx/qiv/metadata.xml
index 115e9d64a669..0d624e24b0a5 100644
--- a/media-gfx/qiv/metadata.xml
+++ b/media-gfx/qiv/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="codeberg">ciberandy/qiv</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-gfx/qiv/qiv-2.3.2-r3.ebuild b/media-gfx/qiv/qiv-2.3.3.ebuild
index 7329747aa9a0..4f8d62d74f7e 100644
--- a/media-gfx/qiv/qiv-2.3.2-r3.ebuild
+++ b/media-gfx/qiv/qiv-2.3.3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit desktop toolchain-funcs xdg
 
@@ -27,8 +27,6 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
-PATCHES=( "${FILESDIR}"/${P}-optional-tiff.patch )
-
 src_prepare() {
 	default
 
diff --git a/media-gfx/qrencode/Manifest b/media-gfx/qrencode/Manifest
index 40b01217e06a..197be91bddc6 100644
--- a/media-gfx/qrencode/Manifest
+++ b/media-gfx/qrencode/Manifest
@@ -1,3 +1,3 @@
 DIST qrencode-4.1.1.tar.bz2 461562 BLAKE2B ae3abb4a162518c0204d09c9df7434fb348e24c20e790a261841220b0a7165168137d5acbdbc53e40558724eac2e1e21786f11013f384b545d56a1c9caaff61d SHA512 981b3242c213e1b40ac88711912dd8c27ea11f3437d1a04b6b226499a6e991a8f0b3b10f818bcc104812192a1dac4ce05f16ecd847a50cb03d4859b84bad89b8
-EBUILD qrencode-4.1.1.ebuild 875 BLAKE2B 26e222237d7b18426ad57d67ddfbd8b0b76116f6607a06c6f7a639f34e2d2536994de7e4387b0c8987d208caf9869cbf1c5447be02267bacedf05d86ce9ca6b7 SHA512 05ab5537833fcb2529c56cb35369f1ff6b9dbdf513a48286cb30f07fe2d9d00426d66b1637123ceeb1efefe93698924fad0a77bcd196ea0a169019f7b79cb66d
+EBUILD qrencode-4.1.1-r1.ebuild 1061 BLAKE2B 687df58e46b684591eca57e2257dfe0f7b987312d280ed16b9cafed2046849a7cb373d173abfcfc4e99b333dbf5b3e2d1977ae15b0c9d63c152f54d0e61cac06 SHA512 f0df78920c3462519b31050dffb5cbea0afac45f352e5ad8909cec48ab5ad50176b5cab398b0198d4f312e39132b5bdee003b74cdcdbe97611a5b60ab95eb826
 MISC metadata.xml 440 BLAKE2B 9f73217513f5128180c5e50f29f3e55399b728446d55332b9f80ac5dde854ca052b8f0e882fedc5a3c26f2a013f594023d708ce741fdd2660abc2233ac50c22c SHA512 46951797c3472c850d0572c644a11ba513ae8769f4c5e70f55f7af4c838d13320e16e83dc34d1cd7460f8ae295fe53eba0480d8601d0685a46ae6a19de056c67
diff --git a/media-gfx/qrencode/qrencode-4.1.1-r1.ebuild b/media-gfx/qrencode/qrencode-4.1.1-r1.ebuild
new file mode 100644
index 000000000000..e1ca3a56fe38
--- /dev/null
+++ b/media-gfx/qrencode/qrencode-4.1.1-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multilib-minimal
+
+DESCRIPTION="C library for encoding data in a QR Code symbol"
+HOMEPAGE="https://fukuchi.org/works/qrencode/"
+SRC_URI="https://fukuchi.org/works/${PN}/${P}.tar.bz2"
+
+LICENSE="LGPL-2"
+SLOT="0/4"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
+IUSE="png test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+multilib_src_configure() {
+	local myconf=(
+		$(multilib_native_with tools)
+		$(use_with png)
+		$(use_with test tests)
+		# TODO: figure out how to make SDL check fail as the SDL test
+		# program is not useful
+	)
+
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+}
+
+multilib_src_test() {
+	cp "${S}"/tests/test_basic.sh "${BUILD_DIR}"/tests || die
+	cd tests || die
+	./test_basic.sh || die
+}
+
+multilib_src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-gfx/qrencode/qrencode-4.1.1.ebuild b/media-gfx/qrencode/qrencode-4.1.1.ebuild
deleted file mode 100644
index da06e19dcc0f..000000000000
--- a/media-gfx/qrencode/qrencode-4.1.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="C library for encoding data in a QR Code symbol"
-HOMEPAGE="https://fukuchi.org/works/qrencode/"
-SRC_URI="https://fukuchi.org/works/${PN}/${P}.tar.bz2"
-
-LICENSE="LGPL-2"
-SLOT="0/4"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
-IUSE="png test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	png? ( media-libs/libpng:0= )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_configure() {
-	local myconf=(
-		$(use_with png)
-		$(use_with test tests)
-		# TODO: figure out how to make SDL check fail as the SDL test
-		# program is not useful
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_test() {
-	cd tests || die
-	./test_basic.sh || die
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/media-gfx/quat/Manifest b/media-gfx/quat/Manifest
index 267d5fcf420a..b4b43d087fcc 100644
--- a/media-gfx/quat/Manifest
+++ b/media-gfx/quat/Manifest
@@ -1,5 +1,4 @@
 AUX quat-1.20-fix-build-for-clang16.patch 2955 BLAKE2B f12610d484006de26bc42475af99269911e186bdc490b4c4d1e48d0ae152b97be162aa2ba178b10cef0ae1bb9e4199aaa79ab512ce8bad41a6bb414151d125f1 SHA512 53b2eb52f1c062da4b4f594ea0a62ca11c5b37bba3f7ac5028906412c03a2bdee831e9dbd42cf63798f5f5ff8a8aadac5a808c6596e5d6dff53358a6ca0cf206
 DIST quat-1.20.tar.gz 474448 BLAKE2B 52a06460be261c622f0c30f8991762e91688da53ba2a9854cc5c94a6de7fa9c7d8028fc3f36608bf11f56c7bee8ca192a37c91ac993b3866ad7b630da3bee5ad SHA512 eb77d628ea0e329e8bda11124bfa57e4005f06ad4d54d8bdc31eaab09fc0cf7ebf1873e7dd47624781e8ee75c7644bfc75819ce5aeb5c150644f8b7a7c81e85b
-EBUILD quat-1.20-r2.ebuild 785 BLAKE2B da0d6ab813115a0279ae46dcd0fb1e7d1edde4fdd3ea01c83d5abcd836ee0d4e73f60ecaa0a82f5b4a36d0ffadc0c405548c681499fc0c1fb44b562ad33b4d2e SHA512 32568d76deca41238afbdf13049582467e6b09dc31535c65dcaf49bb4a427c67560ae9c7573f40436c29e69e7f78fd8e5fdad75e2eb7c2b9b582fffe4630d44c
 EBUILD quat-1.20-r3.ebuild 972 BLAKE2B 3dba3013826bf82e854be298e994094f627cfd1ba504f610ea52b53b242f48d2d4232383949701d9423975078e189b2d9b36bd581deeb8bc3a76635d1430ca92 SHA512 dca80aa41fd6cacf7c3a16cb6d6134a65f7a3d29bf9bdc6cb3e7589e29239e4052aed0b04347c49a968277c85b3efd52d43a66f881471fa43de6a043a80f7f50
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/media-gfx/quat/quat-1.20-r2.ebuild b/media-gfx/quat/quat-1.20-r2.ebuild
deleted file mode 100644
index 17e06e1566e8..000000000000
--- a/media-gfx/quat/quat-1.20-r2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A 3D quaternionic fractal generator"
-HOMEPAGE="http://www.physcip.uni-stuttgart.de/phy11733/quat_e.html"
-SRC_URI="http://www.physcip.uni-stuttgart.de/phy11733/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="X debug"
-
-DEPEND="
-	>=sys-libs/zlib-1.1.4
-	X? (
-		=x11-libs/fltk-1*
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXft
-	)
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	export FLUID="/usr/bin/fluid" # needed because configure tries an invalid option
-	econf \
-		$(use_enable X gui) \
-		$(use_enable debug) \
-		$(use_enable debug prof)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS ChangeLog NEWS README
-}
diff --git a/media-gfx/raw-thumbnailer/Manifest b/media-gfx/raw-thumbnailer/Manifest
deleted file mode 100644
index 79e612ba4749..000000000000
--- a/media-gfx/raw-thumbnailer/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX raw-thumbnailer-0.2.1-libopenraw.patch 897 BLAKE2B 26065ada735e744b0bac662110f8f6a8d70f808721452adab0c7b4cf6927152ab255e424b2978147895e36833cf525893d3f601a09871e712a2dcd348d05e1f0 SHA512 c9b582a6f7d8ccd5958da96d4773105e17b9047b1081d5a4e2a48384831f83e79ef32b9fafd3cd2436472ac86554ffa2232b1d039f06d9890425c5b2d6da185d
-DIST raw-thumbnailer-0.2.1.tar.gz 89468 BLAKE2B 8041cfee56f9be900c6f7bfa6dfb9b21b482ee8eb7dacb83ed37603c32edf6e1dee122de3e98b06d158b6725a1900c73c7e1aee1b8e6a53545428ff7aca47b53 SHA512 cc3c107b060add00b4af811bb548b597493ff0d54d863c530d183970ac8bdd4f6b9f4c25cf978e1d2bf80b11424dbbfb20e73c6dd1abeff3a15a08843bcd41e1
-EBUILD raw-thumbnailer-0.2.1-r1.ebuild 664 BLAKE2B 9d0a4ad1cb6deb3f44a18e8440722944dc7b7bbe2c84c7b0f9142223a216ee16d39a39640477a2b932a0b80e81ec9ec934f57e62d00529bd2d2a17709f778753 SHA512 44db2f99c6535e3f8277e15ec7707931d18a5e5b79ee3ea4cf25ba8c7e9241dc79700276a363f2f9be0c78c9c85549fc241e58e80e4437c55b4264a030055843
-MISC metadata.xml 316 BLAKE2B ea15f9a9911c78206365762fcc4e9da2a006ba148ee85f93f056940de22d326780ed791f68001e05427e658903a34687f599f5d1eab5fa853a3f2899af2229ba SHA512 eba616f18b7facb9e9f6ce852957c73b23105e593f1aeef446a14dd4870651e0e6b2cf51f75b91a31c862ca90b320b52b79fbe2b65aafedcf08a9ba937884f78
diff --git a/media-gfx/raw-thumbnailer/files/raw-thumbnailer-0.2.1-libopenraw.patch b/media-gfx/raw-thumbnailer/files/raw-thumbnailer-0.2.1-libopenraw.patch
deleted file mode 100644
index 1106493622a2..000000000000
--- a/media-gfx/raw-thumbnailer/files/raw-thumbnailer-0.2.1-libopenraw.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 8711d72122e2e67641cc9a0166c1c35ce64719b2 Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Sun, 14 Jan 2018 18:50:17 +0100
-Subject: [PATCH] Use pkgconfig name "libopenraw-0.1" to support recent
- libopenraw
-
----
- configure.ac | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 7562e2b..ef14d87 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -12,8 +12,8 @@ AC_PROG_CXX
- AC_PROG_INSTALL
- 
- # Checks for libraries.
--PKG_CHECK_MODULES(OPENRAW, libopenraw-1.0 >= 0.0.4, HAVE_OPENRAW=yes)
--PKG_CHECK_MODULES(OPENRAWGNOME, libopenraw-gnome-1.0, HAVE_OPENRAWGNOME=yes)
-+PKG_CHECK_MODULES(OPENRAW, libopenraw-0.1 >= 0.1.0, HAVE_OPENRAW=yes)
-+PKG_CHECK_MODULES(OPENRAWGNOME, libopenraw-gnome-0.1, HAVE_OPENRAWGNOME=yes)
- PKG_CHECK_MODULES(GDK, gdk-pixbuf-2.0, HAVE_GDK=yes)
- 
- AC_SUBST(OPENRAW_CFLAGS)
--- 
-2.16.0.rc1
-
diff --git a/media-gfx/raw-thumbnailer/raw-thumbnailer-0.2.1-r1.ebuild b/media-gfx/raw-thumbnailer/raw-thumbnailer-0.2.1-r1.ebuild
deleted file mode 100644
index 5cfeb0d302e5..000000000000
--- a/media-gfx/raw-thumbnailer/raw-thumbnailer-0.2.1-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="A lightweight and fast raw image thumbnailer"
-HOMEPAGE="https://github.com/erlendd/raw-thumbnailer"
-SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND=">=media-libs/libopenraw-0.1:=[gtk]
-	x11-libs/gtk+:2
-	!media-gfx/gnome-raw-thumbnailer"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog )
-PATCHES=(
-	"${FILESDIR}"/${P}-libopenraw.patch  # bug 609972
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
diff --git a/media-gfx/rawtherapee/Manifest b/media-gfx/rawtherapee/Manifest
index b3ef32a4bd19..0c91be2f47ad 100644
--- a/media-gfx/rawtherapee/Manifest
+++ b/media-gfx/rawtherapee/Manifest
@@ -1,3 +1,6 @@
+AUX rawtherapee-5.10-fix-linking-with-libjpeg-turbo.patch 1956 BLAKE2B bd8153f64bba374142d1b516a21c15752fc4baf0e293f91904e63d264e5b571e98de1c88f9af8385b9f56a85c35974bf173c075be6068918bbcfc1fba3cb5b56 SHA512 ba8ae49b70efaeeec67cebbe0df82ee6027f240a59b3cdf6be5a03550b702492612a5fe9731153b9d095ab76d1fcc55425dfcb4216bf8f5d9b6360b6b809d16b
 DIST rawtherapee-5.10.tar.xz 16943724 BLAKE2B 2d1250a03f2902ffcff666514f9785036c808e9883957f674bfdb9545b2feac8f2313ab819e0cb64f39196bd3db36e8084b52bda6194de9197215824e695809c SHA512 79d6d54f90fec6006d3dff53aca00ccd385c398ebede2f06a223905d69e1045c6ab772bd5aca4bde01d9086c3c03183be22c0df521166b1af63b60bd7d0e1cfc
-EBUILD rawtherapee-5.10-r1.ebuild 1876 BLAKE2B 7a4b51b541c9e034f9b2557f546d09a3eafc8672a1cc74cd6244316d2d9684d2e8f507b04b6ffbed8692c8b651aa429bf0f577735d8059a1384c839e34c86e93 SHA512 22c7a2817ce31716568386d380c965b87e17d8a913ed8ef12b10b0671a6d34dabe6344254c97a4e9cc5b9c6be60c8fecd134e5a4c43ef2c0a3e72281ecd233b3
-MISC metadata.xml 245 BLAKE2B 4988fa1366a9b8a3769e503545339cdd493a0bdc362ca9237b158b94549de1f061477546b00fd3b21dc9325812423f7207071e22e3234d5c0b88c755197557d2 SHA512 e00be68ab9ad3acfce3d2d48721c47cf50e2c6358c9ceb45a2a23fc5303826ea26b9205ce4f230121c2e40c9c467367f2dc57863680899b21e8005034aa9118c
+DIST rawtherapee-5.11.tar.xz 18005652 BLAKE2B d4b4cb45042faf7eadb1c5bfbd7d1db2a452397d10eb12349d1d0a2ae4b9254beb3ee943cf3ddf40380f31abc653ec2c85fb0d4c8e2b1121402bbd41e74afaf0 SHA512 a37af6d99569a6b427379b76b980be8dca5007bf4ec8fc65663e9e8d13850dd2f547e1633f69ee495df105ca6f0f9ab4daf12beec29c9fff63e2e7e5083813b2
+EBUILD rawtherapee-5.10-r1.ebuild 1956 BLAKE2B e9748bdbd86a8224b6a74211e3ba4286303e14737951f3bc1d28f541c4eacff5f9c3d951d9b13da9b8986e0fc93d7b143e82b77c81b0e3093d14b2a37e6eb440 SHA512 ee979e48524058a437e26420bb317a9b4208bc552aae88a2bfd9e504496965f31fad392fa5afcaa92012c4fc38a2376d24d2a96dd1869d5e931caabec479fbc9
+EBUILD rawtherapee-5.11.ebuild 1898 BLAKE2B 15c4f40e7016b6d249c4129b41e8cfa472dfbb1063ae7fe30c393edf7d67c201fca1a71bbed303c1cba833d1cb7ef167c841b69bdc8d839adbd31c76f75b3647 SHA512 40f872d001a8f5179c5de769a53145bc555a4ad6b5b5884bf056e190fc12741aab1a7b0ad465780bd28046d71100e5ace4b973cdd041ffb5afe3bf55932cd374
+MISC metadata.xml 398 BLAKE2B 4a0ef68f8e8c4e04158552d21df211610a6ccd9195da6365c77f78297ee4957f61d91b5b6eb6af2912d28a70462bdeb012176dc1448cfdf7221eca7225c707ec SHA512 d562b2782f388590aac143ff10c74eb24b4df447d61051875d3a6d9200f013c290ca5c7fe7c2d130484b5ba01b9c725f453b690dbbe04cd0a0f398a9a99352ed
diff --git a/media-gfx/rawtherapee/files/rawtherapee-5.10-fix-linking-with-libjpeg-turbo.patch b/media-gfx/rawtherapee/files/rawtherapee-5.10-fix-linking-with-libjpeg-turbo.patch
new file mode 100644
index 000000000000..f65309fc64e6
--- /dev/null
+++ b/media-gfx/rawtherapee/files/rawtherapee-5.10-fix-linking-with-libjpeg-turbo.patch
@@ -0,0 +1,63 @@
+From efdc5bce3b9794847093baeb040937ab55eba86e Mon Sep 17 00:00:00 2001
+From: Richard E Barber <kd6kxr@gmail.com>
+Date: Sun, 19 May 2024 04:27:10 -0700
+Subject: [PATCH] Fix linking with jpeg-turbo
+
+patch via Termux PR
+https://github.com/termux-user-repository/tur/pull/1027
+---
+ rtengine/jdatasrc.cc | 28 ++--------------------------
+ 1 file changed, 2 insertions(+), 26 deletions(-)
+
+diff --git a/rtengine/jdatasrc.cc b/rtengine/jdatasrc.cc
+index fa13b9dd13..a0d12657f2 100644
+--- a/rtengine/jdatasrc.cc
++++ b/rtengine/jdatasrc.cc
+@@ -247,20 +247,6 @@ my_error_exit (j_common_ptr cinfo)
+ #endif
+ }
+ 
+-
+-#ifdef _WIN32
+-#define JVERSION	"6b  27-Mar-1998"
+-#define JCOPYRIGHT_SHORT	"(C) 1998, Thomas G. Lane"
+-#define JMESSAGE(code,string)	string ,
+-
+-const char * const jpeg_std_message_table[] = {
+-#include "jerror.h"
+-  NULL
+-};
+-#else
+-extern const char * const jpeg_std_message_table[];
+-#endif
+-
+ /*
+  * Actual output of an error or trace message.
+  * Applications may override this method to send JPEG messages somewhere
+@@ -409,24 +395,14 @@ reset_error_mgr (j_common_ptr cinfo)
+ GLOBAL(struct jpeg_error_mgr *)
+ my_jpeg_std_error (struct jpeg_error_mgr * err)
+ {
++    err = jpeg_std_error(err);
+ 
++    /* override these functions */
+     err->error_exit = my_error_exit;
+     err->emit_message = emit_message;
+     err->output_message = output_message;
+     err->format_message = format_message;
+     err->reset_error_mgr = reset_error_mgr;
+ 
+-    err->trace_level = 0;     /* default = no tracing */
+-    err->num_warnings = 0;    /* no warnings emitted yet */
+-    err->msg_code = 0;        /* may be useful as a flag for "no error" */
+-
+-    /* Initialize message table pointers */
+-    err->jpeg_message_table = jpeg_std_message_table;
+-    err->last_jpeg_message = (int) JMSG_LASTMSGCODE - 1;
+-
+-    err->addon_message_table = nullptr;
+-    err->first_addon_message = 0; /* for safety */
+-    err->last_addon_message = 0;
+-
+     return err;
+ }
diff --git a/media-gfx/rawtherapee/metadata.xml b/media-gfx/rawtherapee/metadata.xml
index aa20bff17b1d..aa96f3399ed7 100644
--- a/media-gfx/rawtherapee/metadata.xml
+++ b/media-gfx/rawtherapee/metadata.xml
@@ -5,4 +5,8 @@
 		<email>bkohler@gentoo.org</email>
 		<name>Ben Kohler</name>
 	</maintainer>
+	<upstream>
+		<bugs-to>https://github.com/Beep6581/RawTherapee/issues</bugs-to>
+		<remote-id type="github">Beep6581/RawTherapee</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-gfx/rawtherapee/rawtherapee-5.10-r1.ebuild b/media-gfx/rawtherapee/rawtherapee-5.10-r1.ebuild
index 96a46d2ad16f..bc3e9aa37d1b 100644
--- a/media-gfx/rawtherapee/rawtherapee-5.10-r1.ebuild
+++ b/media-gfx/rawtherapee/rawtherapee-5.10-r1.ebuild
@@ -9,6 +9,7 @@ inherit cmake flag-o-matic toolchain-funcs xdg-utils
 DESCRIPTION="A powerful cross-platform raw image processing program"
 HOMEPAGE="https://www.rawtherapee.com/"
 SRC_URI="https://rawtherapee.com/shared/source/${MY_P}.tar.xz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -40,7 +41,7 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
-S="${WORKDIR}/${MY_P}"
+PATCHES=( "${FILESDIR}"/rawtherapee-5.10-fix-linking-with-libjpeg-turbo.patch )
 
 pkg_pretend() {
 	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
diff --git a/media-gfx/rawtherapee/rawtherapee-5.11.ebuild b/media-gfx/rawtherapee/rawtherapee-5.11.ebuild
new file mode 100644
index 000000000000..ff0c9e242b65
--- /dev/null
+++ b/media-gfx/rawtherapee/rawtherapee-5.11.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_P=${P/_rc/-rc}
+inherit cmake flag-o-matic toolchain-funcs xdg-utils
+
+DESCRIPTION="A powerful cross-platform raw image processing program"
+HOMEPAGE="https://www.rawtherapee.com/"
+SRC_URI="https://github.com/Beep6581/RawTherapee/releases/download/${PV}/${P}.tar.xz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 ~riscv x86"
+IUSE="openmp tcmalloc"
+
+RDEPEND="
+	dev-cpp/atkmm:0
+	dev-cpp/cairomm:0
+	dev-cpp/glibmm:2
+	dev-cpp/gtkmm:3.0
+	dev-cpp/pangomm:1.4
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/libsigc++:2
+	gnome-base/librsvg:2
+	media-gfx/exiv2:=
+	media-libs/lcms:2
+	media-libs/lensfun
+	media-libs/libcanberra[gtk3]
+	media-libs/libiptcdata
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:0=
+	media-libs/tiff:=
+	sci-libs/fftw:3.0=
+	sys-libs/zlib
+	x11-libs/gtk+:3
+	tcmalloc? ( dev-util/google-perftools )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_configure() {
+	# upstream tested that "fast-math" give wrong results, so filter it
+	# https://bugs.gentoo.org/show_bug.cgi?id=606896#c2
+	filter-flags -ffast-math
+	# -Ofast enable "fast-math" both in gcc and clang
+	replace-flags -Ofast -O3
+	# In case we add an ebuild for klt we can (i)use that one,
+	# see http://cecas.clemson.edu/~stb/klt/
+	local mycmakeargs=(
+		-DOPTION_OMP=$(usex openmp)
+		-DDOCDIR=/usr/share/doc/${PF}
+		-DCREDITSDIR=/usr/share/${PN}
+		-DLICENCEDIR=/usr/share/${PN}
+		-DCACHE_NAME_SUFFIX=""
+		-DWITH_SYSTEM_KLT="off"
+		-DENABLE_TCMALLOC=$(usex tcmalloc)
+	)
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/media-gfx/recoverjpeg/Manifest b/media-gfx/recoverjpeg/Manifest
index 94418bcac5b9..ae778e16b59e 100644
--- a/media-gfx/recoverjpeg/Manifest
+++ b/media-gfx/recoverjpeg/Manifest
@@ -1,3 +1,5 @@
 DIST recoverjpeg-2.2.3.tar.gz 91672 BLAKE2B bb324b7810b5aa3103ad0a9a67df9f855ea1a479b9b9651cb4b7d1a4c511a87e8fd891664d76049b450b5077355fb718489904d3d7daaca3865a451b41980f4f SHA512 67f923193c9b012302ad4e374141803992bfa4e4ac4c2384c8d44df29927c06a5224caefc936e30cef3fe1ca6dcf9f3544fc5171e4f76d17a83df974d0253c23
+DIST recoverjpeg-2.6.3.tar.gz 128243 BLAKE2B 5ed55959fc69150ee386e18e3519a21520e6be63a8e9ac90b27ce5bda5c78c6b4d23c218119d7822d295d7c55709d4e2e96125f1b9081ba253b49d8f117ba760 SHA512 2ad016d337b965ddad38117d82ccc3b41b9f38afa20509c4fa1ca503ad10d009ffb8d21287a19d76c5f0eaf11da1986d5a417b762a4813db164f9198b2aae51b
 EBUILD recoverjpeg-2.2.3-r1.ebuild 445 BLAKE2B 76c07ffa180c0a0362cb063650fbb393978e862e35f6b67916cf1635a67f47789d2258328f6e19cf80798c0479f6ed0914465110f0ed7dabec41651e0a523e6a SHA512 c399bfffae0a0b0683b2bcb141f4d2d6f18045e03a4ae470a69f0fc10fa7e1f94ba4f1dd2aa27096169cff50a58012092c2639bd767ef1c962d6e13922cf284d
-MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
+EBUILD recoverjpeg-2.6.3.ebuild 464 BLAKE2B 2b4e26c0c652a8ef74b8b68f725969154c2649110c0a8a1b7fdc5c5cb45f46f34e623de4513c6fa1037dcc3e3995a5ce7c2a018a22561b1b8ff8da7b9c87314f SHA512 9dad73a2c038a787920a35a43896246e49628c329c8b58a30710ba8ea50ab8cafcc5967e9f90fdb00b055bad6218aadbd3780ed8c44ed23faf2f9dbb778d65cd
+MISC metadata.xml 261 BLAKE2B 089f46c0dd2b4d5c48845b7016a56bf40dbc3e40cb1a0197d4a0a7c2d8a9033f91eb7252bfd112ea0320971097eead325c9e0d6d71697bd44adad8dbc1a07ed2 SHA512 6b46115588c5d79c5b4113da7f4b47b132d401fec09f33924da42eb9effb5c343365c186c64780a44322b0f281c0192c0a29a3446d5276e439a31ad4b244e4b7
diff --git a/media-gfx/recoverjpeg/metadata.xml b/media-gfx/recoverjpeg/metadata.xml
index 85e4ed814fa2..8127aa58dc3b 100644
--- a/media-gfx/recoverjpeg/metadata.xml
+++ b/media-gfx/recoverjpeg/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <!-- maintainer-needed -->
+  <upstream>
+    <remote-id type="github">samueltardieu/recoverjpeg</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/media-gfx/recoverjpeg/recoverjpeg-2.6.3.ebuild b/media-gfx/recoverjpeg/recoverjpeg-2.6.3.ebuild
new file mode 100644
index 000000000000..4dc456b28b63
--- /dev/null
+++ b/media-gfx/recoverjpeg/recoverjpeg-2.6.3.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Recover JPEG pictures from a possibly corrupted disk image"
+HOMEPAGE="https://rfc1149.net/devel/recoverjpeg.html
+	https://github.com/samueltardieu/recoverjpeg"
+SRC_URI="https://rfc1149.net/download/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="media-gfx/exif
+	virtual/imagemagick-tools"
+RDEPEND="${DEPEND}"
diff --git a/media-gfx/renderdoc/Manifest b/media-gfx/renderdoc/Manifest
index 94f17c30e803..3f3748d6c593 100644
--- a/media-gfx/renderdoc/Manifest
+++ b/media-gfx/renderdoc/Manifest
@@ -14,4 +14,4 @@ DIST swig-renderdoc-7.tar.gz 4006241 BLAKE2B 619f41239f4aef496264d61f44ae042cf80
 EBUILD renderdoc-1.30-r2.ebuild 5017 BLAKE2B 4c22e5bd875ecbf7627467b86dbaca3a753c0539d432c7a14182c999a5d820e05a0d42321c626d2362a4c550392c5779974b1f39e41acfe34542512cc97d092f SHA512 a77878ca913bcb5c2864060364d2f0d2db2080ffa5e355dfb60a6c0d176ae109ed07103d0212fc9c4c5e364ff74563ee78a663006f0d053b2f90393f9d01eeab
 EBUILD renderdoc-1.31.ebuild 5070 BLAKE2B 9dff8e948cb7b876c782d62631526579a5168fcc5ba94a77c9bb172948385ccd2a2ee10a3b418fda071619a3d7a16b10162105f32a8b6aba9b080b2e253cf2bf SHA512 07a20446e20bc3cfe1425fc2342ffcc1f9835118fce3c08746ee1ffc4a384de6ee1bac989a3e64d54fef7d5e079561e81fc06ad04fc00822fb2ec42dc1eb35a1
 EBUILD renderdoc-1.32.ebuild 5070 BLAKE2B 9dff8e948cb7b876c782d62631526579a5168fcc5ba94a77c9bb172948385ccd2a2ee10a3b418fda071619a3d7a16b10162105f32a8b6aba9b080b2e253cf2bf SHA512 07a20446e20bc3cfe1425fc2342ffcc1f9835118fce3c08746ee1ffc4a384de6ee1bac989a3e64d54fef7d5e079561e81fc06ad04fc00822fb2ec42dc1eb35a1
-MISC metadata.xml 435 BLAKE2B 888315bf64deb77094dc4ee8411d79df42a70c5ab1e0968d1ad30dc68b76f465bd25572f3d2835541c28d2fc8bdc8c63f49c7b27252b84378707b525119e02aa SHA512 aadde747071d106a31f0c12f8024339179fb8f552e099732868135fe026ba4300629f36a2e4cb5eaa98661808e1748c40acc8e77053dd5d1d0008041a18f519d
+MISC metadata.xml 350 BLAKE2B 3f4889e1015daa270d9429d31a152ff03ec814a1c76e7ecf4c11f15aed9e29f50c02b0a4beef722bcb0f1b349e4f5723245f6bd2d26b86095da916de90a4eee0 SHA512 1af993015e1f5e7d030fc03bbe10ec2ee777c7064daa7f1e562834c3024b6700d7207f8202fc8382e785ef3a5c992b559a0804b365d46e967583cac698850e7d
diff --git a/media-gfx/renderdoc/metadata.xml b/media-gfx/renderdoc/metadata.xml
index 67b3bed149ce..4dab889d943d 100644
--- a/media-gfx/renderdoc/metadata.xml
+++ b/media-gfx/renderdoc/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>matthew@gentoo.org</email>
-    <name>Matthew Smith</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <use>
     <flag name="qt5">
        Build and install the qrenderdoc GUI
diff --git a/media-gfx/ristretto/Manifest b/media-gfx/ristretto/Manifest
index 20028b65e18a..c1480418fada 100644
--- a/media-gfx/ristretto/Manifest
+++ b/media-gfx/ristretto/Manifest
@@ -1,5 +1,5 @@
 DIST ristretto-0.13.0.tar.bz2 624244 BLAKE2B ac0d6b391b17538e47a26f7643f083854f6654a7394f210fcc165d36a3d614b11354a81ab3a45a303e447c4221bf43ff92a913c64c425ef242810fdcdad584e1 SHA512 a8e25e0fdd2d31a904c616995438b47cf144557f589ed97a551fc5411cd7a3da9edab0c23c955e86c72ed0d10f1efccd61edf0aaf5a82cf601bf3333ea2b332b
 DIST ristretto-0.13.2.tar.bz2 852320 BLAKE2B 48451479e698672cd74dc85f32e8430e83026845ed09bee138e7da458bf0f0222e9aa756accec2a939f164ed59fbda4f18792a1238cd648d96dbe29b386ab9cd SHA512 ae4eb0159707a793cefe88b681f61e8c2ce41d57a64c7ad33853fc863bb1909b2a48ccf5543d3484f5710e7bf86ecbbd8520fb59eff11368f3a7a7028cd85914
-EBUILD ristretto-0.13.0.ebuild 937 BLAKE2B 03b74f6d3606a21e96b614deaf0a843477df7b24bd64ed2fdf4c17837c0323dcd911f1d79fbc34fc48cbfedf9b832cc7c2e17fccbfafbf79a7f6b1e1538d25d2 SHA512 c01de33522150cccf0625401987bac0e7672bd7d4b16bd6b54528595fdac578ac32ba129b07b406f78aa7f56adc0b7daebadbe4d691368e1a62434d67c90f18d
-EBUILD ristretto-0.13.2.ebuild 970 BLAKE2B 692ec5dea73b7fe47d948bb772ab48765e170ea4bc664b19e63eec89c44d5662b2a3b0a570e3b7de1279fe4edfda330d15c76cd0689e678b9642d517af1e9d65 SHA512 166353c962515e8da82583c60d729939f8d2b93f71d1ee1525c377f229826ae8f692bcabe0bfcd67efaa20e9612973b19183ad827fc3255f5857e85f88c97b57
+EBUILD ristretto-0.13.0.ebuild 931 BLAKE2B 2d000273fd2f8e5db0ce20b0829a5b007169b566eda86f342ef3d8e24608a861ac0fc5787807088dab8ff61deced0de9d9e91dc30bb243a7af2b14921a10b867 SHA512 c84b38f6f243ec0079405ef46a2ee3e391be37aa8affe8baf3b63166c1ccbe466f319e1bb79a3566d57afce88f0029b111bccfbd8e7035d4da93aadf3db60923
+EBUILD ristretto-0.13.2.ebuild 964 BLAKE2B d4ab2cac6ef7630db1f283d1b80104d3bec5d03f745cd17806a94c48f6b4cd8403c3e659bb251d9998b2b00eba5cf07e9d34d89ad6bb59a7a12dbeb4a7beeb8a SHA512 df0e6833fcd108733d1f3332342116336004d10254b02e149dfa6674740bc6e8fde033a3fc3c22da8447de9e38f29a341145d647f3721faaa4b8e3a4db668385
 MISC metadata.xml 248 BLAKE2B 83bf47dc3dbedea8a88932e922075f0ba8fd841433c4ab750e2ab61c22e8cbfaa1acb04a903d89ef5140a75dfc4c4899354623e0160df5b7c178c190f8494515 SHA512 b5200cfe30adef8e869fada87f1b4171210b2427cd3ac12edef70948f305d5e612ca5f24d377f9823a6022c8867db635db50ddd3d6cb362d6b0137c299fe07e5
diff --git a/media-gfx/ristretto/ristretto-0.13.0.ebuild b/media-gfx/ristretto/ristretto-0.13.0.ebuild
index f62b7644ca14..ba9b3440467e 100644
--- a/media-gfx/ristretto/ristretto-0.13.0.ebuild
+++ b/media-gfx/ristretto/ristretto-0.13.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 
 DEPEND="
 	>=dev-libs/glib-2.56:2
diff --git a/media-gfx/ristretto/ristretto-0.13.2.ebuild b/media-gfx/ristretto/ristretto-0.13.2.ebuild
index 8f3e6b1aaad5..19eafffb4eb5 100644
--- a/media-gfx/ristretto/ristretto-0.13.2.ebuild
+++ b/media-gfx/ristretto/ristretto-0.13.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 
 DEPEND="
 	>=dev-libs/glib-2.56.0:2
diff --git a/media-gfx/sam2p/Manifest b/media-gfx/sam2p/Manifest
index cfaa30b939c3..67c941d2e4b6 100644
--- a/media-gfx/sam2p/Manifest
+++ b/media-gfx/sam2p/Manifest
@@ -1,5 +1,5 @@
 AUX sam2p-0.49.4_p20190718-fix-configure-clang.patch 353 BLAKE2B dcb39280fc99bc1d21e9ec9627d976844ed6ec9d14dda61c471766687ae3816c5672dd2b980665252bb22da4a345322e69accec719c86fdd5bfcbbec6d7b8284 SHA512 c351987915fc1b2051f55b9a80478b0ad400aa140e986b3a1dd0d8ae6b55252036f1038236d25456b9fcd604e863169ea5dfa329f5a180eeaccfcf4a58622a0d
 AUX sam2p-build-fixes.patch 1803 BLAKE2B d9c805da6c46f5457cc6006941a1331f0e46ed8fcadf7c73b9a11debfaa7e2f040beeae42aa9cf316a2df71ffe9d136808a1e9ebeea5c146851057a8addb7bf6 SHA512 fa32011db37a74f746542df82f29e7869412cf8ad93d0b4c3c6e100dda06c254f204671199db0d1abd6134975325cb939f65f0a22457a84a78b6b277411ea2f5
 DIST sam2p-0.49.4_p20190718.tar.gz 1816309 BLAKE2B 3d97e00c2bd6b6c292c051d4eb6b73549d1c82a5bd7be3d6b718d8e9d2e96b47657c184af43fa57c0ca4b2b8c26904fb42508d17f7dda715def7d2082affa8b6 SHA512 1c6074fabca6146e51fe0d5a10c912ec679cf122e10aab7bead9e35e3d007e79773aedb1f627572b1b88cacefe0e7edf72efd71d32c47731723b910667220c51
-EBUILD sam2p-0.49.4_p20190718-r1.ebuild 1414 BLAKE2B 0b4e912edfae61de02e6c7371c965a22e6a9e1173ea2ddc597cf5366fb6db04028d752b301f542492f8bf67756fc61272448b23149f481df94158ff68d89f1dd SHA512 80b37c141f1fabb419ec045a5434a249bd6efd6a7c7a5343e508df0b240c53b82787aa8465fc40cc9e97d1e3a8db577b4479764a5b1dc3ee1f9e0240236b012b
+EBUILD sam2p-0.49.4_p20190718-r1.ebuild 1408 BLAKE2B a9062998463cf63a9857ed06f0bed8eac5790e916dfb8e11c65abaf7d69c83a7dc6f961d2b48b7bac6a44cedf500266a9f3e91a0b5f97ceff4363ff6014c8248 SHA512 fed24d109d4ee30fa6be683151e981ddcc8d109e1e981297de5f9bfbdd78a3f19c74e10a8d3f6bc10659f61e45c1f9c59a3746c0d0ff26ced68569ad22666c3f
 MISC metadata.xml 374 BLAKE2B d19b7ae3a43094549eb9f02ddbab8077ebdb9b18fd2a608e038de18e1ade6824857899b1f7a19bb835ea2bfa3ae4e2d10c1cd67b38fe0d6d5927150f5b8644dd SHA512 900c1194a51963456c5f22c9eecf95645eda39e189cf72c89b63767c73027ebc152b5e67007047ada223f5b67671490cf75f3caa2989ec645b48bf4c81fdfcba
diff --git a/media-gfx/sam2p/sam2p-0.49.4_p20190718-r1.ebuild b/media-gfx/sam2p/sam2p-0.49.4_p20190718-r1.ebuild
index fd8877e311de..9475eece6dc7 100644
--- a/media-gfx/sam2p/sam2p-0.49.4_p20190718-r1.ebuild
+++ b/media-gfx/sam2p/sam2p-0.49.4_p20190718-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/pts/sam2p/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE="examples gif"
 RESTRICT="test"
 
diff --git a/media-gfx/sane-airscan/Manifest b/media-gfx/sane-airscan/Manifest
index bbd5065f32e6..84bb76454404 100644
--- a/media-gfx/sane-airscan/Manifest
+++ b/media-gfx/sane-airscan/Manifest
@@ -1,6 +1,8 @@
 AUX sane-airscan-0.99.27-c99-fixes.patch 1834 BLAKE2B d0012e462e0fb04158e0705fd3d43cb645e7061df2e24a557d2f97c38509635248d235ee7eb67d8945c4a8a66da81019c86901fab010b3b2fac8275360d86a74 SHA512 45e2c8797301bc96b1d7736795dc7a4e7ea4fa72bbfd38ba787c7dfa0051dba353d722d801a6bfcc8e9d93141dde87cfcea601234d2286f157a61d8252496481
 AUX sane-airscan-0.99.27-makefile-fixes.patch 1913 BLAKE2B 1fe9fc148e3ac4f9928cb46a9ef35d2b94104dca39ffec09617d6143ce619c8739afad2811d7c5455ce4c0f190a88c68069a800607926009d2121c90aa8bca8b SHA512 8ed38a9debaf0520d7576f1874dd05b634a43825fb258fa3a0df0f3a93ebac6391d5a7e30ba460221d4174b7865f0372e91ff88f430baeca567dd4f633c0099a
 DIST sane-airscan-0.99.27.tar.gz 198418 BLAKE2B bcf2aff08feb90a65c10a4abaca67939874ad7c9376745b572f18ebfdaf7bff3e344d1379b00c73904a6892731a75f4632a90ea7c20f7cb4e30eab43413b829d SHA512 a35a92e26a4e3831f127e59bc520248abde8a7b304eb63ecf1d68092f51a8bc49bbc7503bead47ac84d0333d59ae0045d6d7a9f7b89d95f3ddfa2458f3781256
+DIST sane-airscan-0.99.29.tar.gz 211753 BLAKE2B 35f0df4d5df57d2651e6d0195046e703a5f4a49b8d50345d749b570892b0c865cf7b1ed7313fba27ce9586cededffd5d85ce211ca767b50f59fe752c2f869d4c SHA512 a75a3db66aa1c77508a946dc7647f322d0be9c8defc6b4b6fdf1015f5a81ea02209efb7aa2c5284813e257bc2b8727a430804385368c8c7b97df24d61adda483
 EBUILD sane-airscan-0.99.27-r1.ebuild 867 BLAKE2B 566b78aa7268725f71aed1ac8a6de2186dfd2870273ed1494c547410368060f63fd6c677ec948d8fb37dafa31bb9577d83d8c270afc3fbbdcda09b926d6ede64 SHA512 e722adf97b989f50a2b1034e4d6689a04b240a616d69a602f5bf96f6e42171a19addea91ff00e591593aaa26d50cafa3ad70c6400f362bc0217c1d8bbfe2b834
 EBUILD sane-airscan-0.99.27.ebuild 808 BLAKE2B a079180be74226fe5f3b535943b29f249552931a0a48bec2061ebc750997382988d79d43317095fe4bc2ae0f7c9556cfe08d909d601237be8989049e0abf37d0 SHA512 53cfcc46cbc2d9eef3a5f2161df7e0cd9b8aa5b3c22dd08664df3bf9dc1949eaa9ea6d760f0c298331fd6b84ff01393dbc479c86b2addb7430c19e111cbad721
+EBUILD sane-airscan-0.99.29.ebuild 847 BLAKE2B ecf9040131b72dfcca370c0c3003ee5a51aeed29704ac08f4effb8482432e867e38fb0edd850ccbd42b1207da3b607f67851a291ac8cb81d9af7a7e55031f298 SHA512 cf26e16d3e3b3c42fd8a963f8b76ba5c4bccab4bce95c81739aff06440b14e07be6a5fcdfec1dfb0b941cd68edd0118ce1cf01a667710348fb965dff078acb96
 MISC metadata.xml 340 BLAKE2B c9c2c847ab7adb2109f7fee5346019acfbdbac25394c052ecef5dd263de2991388c272b37c46bd405078f93a0fdaa4a47ddbd976f468d1acb37fc6b8c9014e99 SHA512 92ba711173b57be840567bf539ad1c6a99698a267994dfbedb8067e25edeed38a87bb142e1a34dc16752afb65a134ce6af338cbbc5a69cdd652d5dc96fd234c7
diff --git a/media-gfx/sane-airscan/sane-airscan-0.99.29.ebuild b/media-gfx/sane-airscan/sane-airscan-0.99.29.ebuild
new file mode 100644
index 000000000000..786dff0320a0
--- /dev/null
+++ b/media-gfx/sane-airscan/sane-airscan-0.99.29.ebuild
@@ -0,0 +1,43 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="SANE backend for AirScan (eSCL) and WSD document scanners"
+HOMEPAGE="https://github.com/alexpevzner/sane-airscan"
+SRC_URI="https://github.com/alexpevzner/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	dev-libs/libxml2
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:=
+	media-libs/tiff:=
+	net-dns/avahi
+	net-libs/gnutls:=
+"
+RDEPEND="${DEPEND}
+	media-gfx/sane-backends
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.99.27-makefile-fixes.patch"
+)
+
+src_compile() {
+	emake \
+		CFLAGS="${CFLAGS}" \
+		CPPFLAGS="${CPPFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
+		CC="$(tc-getCC)" \
+		AR="$(tc-getAR)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" COMPRESS= STRIP= install
+}
diff --git a/media-gfx/sane-backends/Manifest b/media-gfx/sane-backends/Manifest
index 5b2bfd9c1d51..feda55443bdc 100644
--- a/media-gfx/sane-backends/Manifest
+++ b/media-gfx/sane-backends/Manifest
@@ -4,18 +4,12 @@ AUX sane-backends-1.0.24-saned_pidfile_location.patch 345 BLAKE2B dcf7cbd5787c7a
 AUX sane-backends-1.0.27-disable-usb-tests.patch 336 BLAKE2B 00fd225a4426405d515f5b6641c86e6d9035a588a776aaec26eaa4e10beebf0a9fd97da991646b7964a867c422da2bc1cf93560d1ba326f0086675036338ff00 SHA512 64cce489e87de31e1a865b86d5829ae4914a30f47e27b07fba68629261cefcd617b8eed272c94b7554545e4802283c5bd5b53f79f54403d875726b38378ae74d
 AUX sane-backends-1.0.30-add_hpaio_epkowa_dll.conf.patch 459 BLAKE2B d127c054b3e4f8aca5de54888e7a37c986515350aac84bb66ca195fca57138cbe3ac3f29b0982e4019b5b599b81984dceacd5523f794a04cfb5d416a051a1e61 SHA512 d9bcce33482db2f15ee094a244359fafdce196984a799509d9b16e24f46feb3aecd419520e65ca9513b40ff4975d793bec05924bfdd69586d9a6f3feb42cccc3
 AUX sane-backends-1.1.1-configure-clang16.patch 1537 BLAKE2B 5908f8a11ab78b37b1def559b3e59f7c84fa0d744d81fa130d1816b45ebf058c77caf7fd56ba6b8c97d864a018bcaedddb31525f6c8cd84bac8bb5d7d9a07da1 SHA512 2a1c2addde06841761051f93432da187241f4840568c39f074dc503c3038ab2d5cf57f4f807e728c15d40049c1e06eb8e7939b41daff33c937afd510fc676601
-AUX sane-backends-1.1.1-gcc12-tests.patch 2293 BLAKE2B bd25816934b11b857d226058578511916c8711af5bbe6cb31d0d5138dd4fca3353cb65c753c63b94be2f4f7562e162c8d384be1c9afaeaeaca450251ab40ff3c SHA512 2ac36d4a6fe0591fe78d245ec0927e5a00a29d1311bf2b9e6d3518d02536e802074f765eb7a35b0908cf1e983edee7041211a77774384a71b34779093b63fa65
-AUX sane-backends-1.1.1-genesys-gl845-crash.patch 553 BLAKE2B 8fafda9bf9904733c02db56975c0e6d7c594140f2c568f7d46524e726b69ebd33b4487fb9b5b7d701a4ddacf079ac75b1315139c4e377caf414211ac02652764 SHA512 a07a82d25e009b30056965974d6d3088772803632aa57030a4261ebf596f7cdf0a468212dd234a5dda7821ee75ff665dbcf66df43b1d3c9c10a649ad5e36483c
-AUX sane-backends-1.1.1-musl.patch 1308 BLAKE2B 1dacf69a26e4955a07848f8cb89c5d7fbae71641de666b8f45a0ca0f57df48d335f0a609b6813114f730296752ef661fa2dd56b889bcf168489c725bd344c9de SHA512 febff2ff17ffe486122e8a5630adc01aed16398bf1d36628faa64b61d3cf423bcc66e683701e601071d2b3320b502c0416cd5b21b463004b516b75286eb64e3b
 AUX saned 150 BLAKE2B 306d57a0c09856b387c3c50eb27aaafdb194972c2fdb5d1cb7de3118f0c71cf234898ce958f0d6bd17a5e1f2b5bde458e014a7bfdec52403a6204ebf51aee039 SHA512 26f3d66c6b1e75d87d7d430518aa878c77d5ab8d76a45847cef3ff15566341938eedf46c50d0fa8cdeef828df9cddefdd6fdd767c5de30d3aa7d64ed1911d910
 AUX saned.confd 76 BLAKE2B cac74b6f117f7f78a71b951433bc6b155f8641e2cf1bd747871165764e97ed368d10551075761c34ff01f51f7cae1b8a9c5692fb9666a300b45134fe255ea3c1 SHA512 8f4a99ef24c19b3a7213b3d25ea16f5bca8623735cf25d21e3a706e9e0135ac8cce5d0b8fb8728845977f41dcefe6bd858076d755515fc91b00e05ee5817d751
 AUX saned.initd 294 BLAKE2B 571bd4032b2330c627a31459a18baf2044852ec1b40f0216bd5b5a546d61133522cdc98c7011669feaadc2d030ffeb49a86130075f22a18edab5f4c925780681 SHA512 655200141339f14bf7fc6f4fff3403cf9504809b7f023aa5425aad691c5baa65772100da0a6311669f83ed1dce73b7d65ca20aa31345b13c48dfdb1b30ce5dbd
 AUX saned.socket 132 BLAKE2B 5e9f0350a1553fc75aea88ce355fb68b881e3b2194ac0e3c6f3cecdae79111fb1db1cfe3b4933eca15af5f985fc6b89e4d9af3844b6e9cfd542828b6b9e57ed9 SHA512 a23ceeeb02bd9e214702003a3165886858ecbdd93df89cd37ad5f00581745454548ccda0ab656f2dc0acbf2896a8781568c786797e64a07014be003d6140a093
 AUX saned_at.service 434 BLAKE2B 6dad3c809e01c17c0064a52c4103486b19294ed3cf8fc71faad18edaf71b920584366ac988d354f45bc07607ea64a97ea480fe152ac9a1cd896df99ff457cbf7 SHA512 891c751261107676f8159f403e0f4d4254099b709b9ba0ac9f2af97a9ed30f677411ad6bc316c2e6e673c616ba988253479d5e30c9617e3ae279beb79f70e965
 AUX saned_at.service-r1 432 BLAKE2B e6dab788c0bf705087974642ed714b5f41b3e676b80b5197a753227934b977ce6d1175872163e831e916b6aa36d6c5dd86effa44801494cff6fc669e6c24acaf SHA512 2c8725f9981216129f94a7c4cd75efab37bb75c891fdf7dbd4297161d8d4cd3b1c5fa0eebcaabe1f038aab8500f8b5579d776935f180fb2553bd2cb77506c29d
-DIST sane-backends-1.1.1.tar.gz 7447569 BLAKE2B 02ac1822beabb12f19ce2d7c053f0f727313d13e0f9380325492a2f0048094f78a118f7659b4c6e39b60c4ea319d862a242f8866a67c84e5649d9ae2691d9473 SHA512 25bd9f90d550cfe6a6d01c48e83716a53f4b0e3a294287e455ecb5e5b80c8fe1699f45c6c87f694475cceb85745c70597e18a7b1094669d5091c5fb183dfe94d
 DIST sane-backends-1.2.1.tar.gz 7308040 BLAKE2B 8448a66e70548f159cfac63501e52417fb1d0599008ce7bf26bf2e7a25a946e688968f01ae64b72c3d5efce67cfbdc0e8e04d8ab3bc92dae0a7e01bc81bf0140 SHA512 3ffce67e409caa5d32684290a56a46a68fef6991a14858d89cbab5aeb364fbbfd6d7c85bcbc4932c9167073a3a6ba682b4730f11fb320f0c4de53a7e7d3edba1
-EBUILD sane-backends-1.1.1-r11.ebuild 8968 BLAKE2B 4326e0b9910316a75fac005f1e19e8603e9e44bc19aea48133dc4f00f79f213ca8ee7cecc2a7947eec593804a2217215f9d32cbca8ed0cc18a893b3898b439a1 SHA512 964068339a56b1cc733b95852b4137e878599b48b42cf9096c78b3f6ffd6457ceb1472711fbeb716f8bb5b3388e7304e29f55ad79becd0433acf373009ea9d4b
-EBUILD sane-backends-1.1.1-r13.ebuild 9130 BLAKE2B da0f9cb62b082ee2ae507a7ca3180ceacf218f882fca0cd350a5ac914369e5e91d51570fa5eeb90fa8c833ac6210098ed709990d90fb7ac8e7174f307e5e56e1 SHA512 47f0696fec3b9eee1eab791edf2cb2c79711d36697cf55956137f4b0d1a56859aacc987a46b07efd8a6b1cb20757cb9c3577c4112ff654ffbf1189345699a7e1
-EBUILD sane-backends-1.2.1.ebuild 8847 BLAKE2B 87d77537fdf266c3589a5ea3605eba1476d0b0ff3322a6655383a1f40eb20e47acd3b11dad3edc079e8e4ec97b482c385df98088cdd8a64fb4e18199b0297f15 SHA512 382ebf2021b85d313955278df15dfe26e1ee54b6a7651048376dd568d1d83bbe03353072eccd6f333d5d06dbf944ffdcb8ee0cd562dd9d68b875447e51aae790
+EBUILD sane-backends-1.2.1.ebuild 8837 BLAKE2B 942f956dd6f7b23c3e43e1b40517120cabd9ba087a42ea90dbb47d9009022b02ee42e3a60c80897363027bf1df3c757d6e2b2f57ad7c37d088510b255ee32a61 SHA512 d5c62ec336711d97c730338546c3fea7123dd27a21ba27504698cd50fe56963a75620e9d22505d0ebbafdf12fd954cb5141f1e41099bff32928772c6c435682c
 MISC metadata.xml 333 BLAKE2B 7d543cb4daa6542f7facef3e1f57c09144baed3198010d7c39df40398ab82791f56271375bce36e829a1364350d05f81c332a2359e7038b047df31407543d331 SHA512 52ac311d50fcfe020b4ec891bcbc1df2834d5d1e3ade7ab6926c6f85a31712dd5886b834739f6155873e1e09967c8f565b913c807acd7ea47a4d3b94160fff37
diff --git a/media-gfx/sane-backends/files/sane-backends-1.1.1-gcc12-tests.patch b/media-gfx/sane-backends/files/sane-backends-1.1.1-gcc12-tests.patch
deleted file mode 100644
index 25a1e4db265e..000000000000
--- a/media-gfx/sane-backends/files/sane-backends-1.1.1-gcc12-tests.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-https://bugs.gentoo.org/840137
-https://gitlab.com/sane-project/backends/-/commit/6b99447f5b12758ff015b5c360a6dcbcf9b0a72d
-https://gitlab.com/sane-project/backends/-/issues/597
-https://gitlab.com/sane-project/backends/-/issues/557
-
-From edfc90450ee06149537fadb3095ba4b215c5c4fa Mon Sep 17 00:00:00 2001
-From: Ralph Little <skelband@gmail.com>
-Date: Sun, 2 Oct 2022 18:14:25 -0700
-Subject: [PATCH] genesys: corrections to include file order.
-
-minigtest.h has items that require the definitions in tests_printers.h.
-Pre-GCC-12, this didn't seem to matter but GCC12 seems to have a
-problem with this and requires the template definitions to have already
-appeared.
---- a/testsuite/backend/genesys/minigtest.cpp
-+++ b/testsuite/backend/genesys/minigtest.cpp
-@@ -18,10 +18,10 @@
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
- 
--#include "minigtest.h"
--
- #define DEBUG_DECLARE_ONLY
- 
-+#include "minigtest.h"
-+
- size_t s_num_successes = 0;
- size_t s_num_failures = 0;
- 
---- a/testsuite/backend/genesys/tests_image.cpp
-+++ b/testsuite/backend/genesys/tests_image.cpp
-@@ -21,8 +21,8 @@
- #define DEBUG_DECLARE_ONLY
- 
- #include "tests.h"
--#include "minigtest.h"
- #include "tests_printers.h"
-+#include "minigtest.h"
- 
- #include "../../../backend/genesys/image.h"
- #include "../../../backend/genesys/image_pipeline.h"
---- a/testsuite/backend/genesys/tests_image_pipeline.cpp
-+++ b/testsuite/backend/genesys/tests_image_pipeline.cpp
-@@ -21,8 +21,8 @@
- #define DEBUG_DECLARE_ONLY
- 
- #include "tests.h"
--#include "minigtest.h"
- #include "tests_printers.h"
-+#include "minigtest.h"
- 
- #include "../../../backend/genesys/image_pipeline.h"
- 
---- a/testsuite/backend/genesys/tests_motor.cpp
-+++ b/testsuite/backend/genesys/tests_motor.cpp
-@@ -21,8 +21,8 @@
- #define DEBUG_DECLARE_ONLY
- 
- #include "tests.h"
--#include "minigtest.h"
- #include "tests_printers.h"
-+#include "minigtest.h"
- 
- #include "../../../backend/genesys/low.h"
- #include "../../../backend/genesys/enums.h"
---- a/testsuite/backend/genesys/tests_utilities.cpp
-+++ b/testsuite/backend/genesys/tests_utilities.cpp
-@@ -21,8 +21,8 @@
- #define DEBUG_DECLARE_ONLY
- 
- #include "tests.h"
--#include "minigtest.h"
- #include "tests_printers.h"
-+#include "minigtest.h"
- 
- #include "../../../backend/genesys/utilities.h"
- 
-GitLab
diff --git a/media-gfx/sane-backends/files/sane-backends-1.1.1-genesys-gl845-crash.patch b/media-gfx/sane-backends/files/sane-backends-1.1.1-genesys-gl845-crash.patch
deleted file mode 100644
index f63a8e2100b9..000000000000
--- a/media-gfx/sane-backends/files/sane-backends-1.1.1-genesys-gl845-crash.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/backend/genesys/genesys.cpp b/backend/genesys/genesys.cpp
-index 9552fa9..c95de7b 100644
---- a/backend/genesys/genesys.cpp
-+++ b/backend/genesys/genesys.cpp
-@@ -367,6 +367,7 @@ void sanei_genesys_create_default_gamma_table(Genesys_Device* dev,
-         }
-         max = size - 1;
-     } else if (dev->model->asic_type == AsicType::GL124 ||
-+               dev->model->asic_type == AsicType::GL845 ||
-                dev->model->asic_type == AsicType::GL846 ||
-                dev->model->asic_type == AsicType::GL847) {
-         size = 257;
diff --git a/media-gfx/sane-backends/files/sane-backends-1.1.1-musl.patch b/media-gfx/sane-backends/files/sane-backends-1.1.1-musl.patch
deleted file mode 100644
index 8aebb50672a1..000000000000
--- a/media-gfx/sane-backends/files/sane-backends-1.1.1-musl.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-https://gitlab.com/sane-project/backends/-/commit/12560890a6e298091bd63b8093a35604416eb92a
-
-From 12560890a6e298091bd63b8093a35604416eb92a Mon Sep 17 00:00:00 2001
-From: David Ward <david.ward@gatech.edu>
-Date: Thu, 21 Apr 2022 23:37:33 -0400
-Subject: [PATCH] Fix header file used for poll()
-
-POSIX specifies the header to include is <poll.h>, not <sys/poll.h>.
-This results in a compiler warning with musl libc (on Alpine Linux).
---- a/configure.ac
-+++ b/configure.ac
-@@ -202,7 +202,7 @@ AC_HEADER_STDC
- AC_CHECK_HEADERS(fcntl.h unistd.h libc.h sys/dsreq.h sys/select.h \
-     sys/time.h sys/shm.h sys/ipc.h sys/scanio.h os2.h \
-     sys/socket.h sys/io.h sys/hw.h sys/types.h linux/ppdev.h \
--    dev/ppbus/ppi.h machine/cpufunc.h sys/sem.h sys/poll.h \
-+    dev/ppbus/ppi.h machine/cpufunc.h sys/sem.h poll.h \
-     windows.h be/kernel/OS.h limits.h sys/ioctl.h asm/types.h\
-     netinet/in.h tiffio.h ifaddrs.h pwd.h getopt.h)
- AC_CHECK_HEADERS([asm/io.h],,,[#include <sys/types.h>])
---- a/frontend/saned.c
-+++ b/frontend/saned.c
-@@ -84,8 +84,8 @@
- 
- #include "lgetopt.h"
- 
--#if defined(HAVE_SYS_POLL_H) && defined(HAVE_POLL)
--# include <sys/poll.h>
-+#if defined(HAVE_POLL_H) && defined(HAVE_POLL)
-+# include <poll.h>
- #else
- /*
-  * This replacement poll() using select() is only designed to cover
-GitLab
diff --git a/media-gfx/sane-backends/sane-backends-1.1.1-r11.ebuild b/media-gfx/sane-backends/sane-backends-1.1.1-r11.ebuild
deleted file mode 100644
index 7cda923f849d..000000000000
--- a/media-gfx/sane-backends/sane-backends-1.1.1-r11.ebuild
+++ /dev/null
@@ -1,360 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_10 )
-
-# python-any-r1 required for a script in
-# backends/pixma/scripts/
-inherit autotools flag-o-matic multilib-minimal optfeature python-any-r1 systemd toolchain-funcs udev
-
-# gphoto and v4l are handled by their usual USE flags.
-# The pint backend was disabled because I could not get it to compile.
-IUSE_SANE_BACKENDS=(
-	abaton
-	agfafocus
-	apple
-	artec
-	artec_eplus48u
-	as6e
-	avision
-	bh
-	canon
-	canon630u
-	canon_dr
-	canon_lide70
-	canon_pp
-	cardscan
-	coolscan
-	coolscan2
-	coolscan3
-	dc210
-	dc240
-	dc25
-	dell1600n_net
-	dmc
-	epjitsu
-	epson
-	epson2
-	escl
-	fujitsu
-	genesys
-	gt68xx
-	hp
-	hp3500
-	hp3900
-	hp4200
-	hp5400
-	hp5590
-	hpljm1005
-	hpsj5s
-	hs2p
-	ibm
-	kodak
-	kodakaio
-	kvs1025
-	kvs20xx
-	kvs40xx
-	leo
-	lexmark
-	ma1509
-	magicolor
-	matsushita
-	microtek
-	microtek2
-	mustek
-	mustek_pp
-	mustek_usb
-	mustek_usb2
-	nec
-	net
-	niash
-	p5
-	pie
-	pieusb
-	pixma
-	plustek
-	plustek_pp
-	pnm
-	qcam
-	ricoh
-	ricoh2
-	rts8891
-	s9036
-	sceptre
-	sharp
-	sm3600
-	sm3840
-	snapscan
-	sp15c
-	st400
-	stv680
-	tamarack
-	teco1
-	teco2
-	teco3
-	test
-	u12
-	umax
-	umax1220u
-	umax_pp
-	xerox_mfp
-)
-
-IUSE="gphoto2 ipv6 snmp systemd threads usb v4l xinetd +zeroconf"
-
-for GBACKEND in ${IUSE_SANE_BACKENDS[@]}; do
-	case ${GBACKEND} in
-	# Disable backends that require parallel ports as no one has those anymore.
-	canon_pp|hpsj5s|mustek_pp|\
-	pnm|mustek_usb2|kvs40xx)
-		IUSE+=" sane_backends_${GBACKEND}"
-		;;
-	*)
-		IUSE+=" +sane_backends_${GBACKEND}"
-	esac
-done
-
-REQUIRED_USE="
-	sane_backends_escl? ( zeroconf )
-	sane_backends_kvs40xx? ( threads )
-	sane_backends_mustek_usb2? ( threads )
-"
-
-DESCRIPTION="Scanner Access Now Easy - Backends"
-HOMEPAGE="http://www.sane-project.org/"
-SRC_URI="https://gitlab.com/sane-project/backends/uploads/7d30fab4e115029d91027b6a58d64b43/${P}.tar.gz"
-
-LICENSE="GPL-2 public-domain"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-# For pixma: see https://gitlab.com/sane-project/backends/-/releases/1.0.28#build
-RDEPEND="
-	acct-user/saned
-	gphoto2? (
-		media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}]
-		>=media-libs/libgphoto2-2.5.3.1:=[${MULTILIB_USEDEP}]
-	)
-	sane_backends_canon_pp? ( >=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] )
-	sane_backends_dc210? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] )
-	sane_backends_dc240? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] )
-	sane_backends_dell1600n_net? (
-		media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}]
-		>=media-libs/tiff-3.9.7-r1:=[${MULTILIB_USEDEP}]
-	)
-	sane_backends_escl? (
-		app-text/poppler[cairo]
-		|| (
-			net-dns/avahi[dbus]
-			net-dns/avahi[gtk]
-		)
-		net-dns/avahi[${MULTILIB_USEDEP}]
-		net-misc/curl[${MULTILIB_USEDEP}]
-	)
-	sane_backends_hpsj5s? ( >=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] )
-	sane_backends_mustek_pp? ( >=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] )
-	sane_backends_pixma? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] )
-	snmp? ( net-analyzer/net-snmp:= )
-	systemd? ( sys-apps/systemd:= )
-	usb? ( >=virtual/libusb-1-r1:1=[${MULTILIB_USEDEP}] )
-	v4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] )
-	xinetd? ( sys-apps/xinetd )
-	zeroconf? ( >=net-dns/avahi-0.6.31-r2[${MULTILIB_USEDEP}] )
-"
-
-DEPEND="${RDEPEND}
-	dev-libs/libxml2
-	v4l? ( sys-kernel/linux-headers )
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-build/autoconf-archive
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.0.24-saned_pidfile_location.patch
-	"${FILESDIR}"/${PN}-1.0.27-disable-usb-tests.patch
-	"${FILESDIR}"/${PN}-1.0.30-add_hpaio_epkowa_dll.conf.patch
-	# https://gitlab.com/sane-project/backends/-/merge_requests/688
-	"${FILESDIR}"/${PN}-1.1.1-genesys-gl845-crash.patch
-)
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/sane-config
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-
-	# don't bleed user LDFLAGS into pkgconfig files
-	sed 's|@LDFLAGS@ ||' -i tools/*.pc.in || die
-
-	# Needed for udev rules generation/installation
-	multilib_copy_sources
-}
-
-src_configure() {
-	# From Fedora
-	append-flags -fno-strict-aliasing
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	# the blank is intended - an empty string would result in building ALL backends.
-	local lbackends=" "
-
-	use gphoto2 && lbackends="gphoto2"
-	use v4l && lbackends+=" v4l"
-	use sane_backends_escl && multilib_is_native_abi && lbackends+=" escl"
-	local backend
-	for backend in ${IUSE_SANE_BACKENDS[@]} ; do
-		if use "sane_backends_${backend}" && [[ "${backend}" != pnm ]] && [[ "${backend}" != escl ]] ; then
-			lbackends+=" ${backend}"
-		fi
-	done
-
-	local myconf=(
-		$(use_with usb)
-		$(multilib_native_use_with snmp)
-
-		$(multilib_native_use_with sane_backends_escl poppler-glib)
-		# you can only enable this backend, not disable it...
-		$(usex sane_backends_pnm --enable-pnm-backend '')
-		$(usex sane_backends_mustek_pp --enable-parport-directio '')
-	)
-
-	if ! { use sane_backends_canon_pp || use sane_backends_hpsj5s || use sane_backends_mustek_pp ; } ; then
-		myconf+=( sane_cv_use_libieee1284=no )
-	fi
-
-	# relative path must be used for tests to work properly
-	# All distributions pass --disable-locking because /var/lock/sane/ would be a world-writable directory
-	# that break in many ways, bug #636202, #668232, #668350
-	# People can refer to the "Programmer's Documentation" at http://www.sane-project.org/docs.html
-	myconf+=(
-		--disable-locking
-		$(use_with gphoto2)
-		$(multilib_native_use_with systemd)
-		$(use_with v4l)
-		$(use_enable ipv6)
-		$(use_enable threads pthread)
-		$(use_with zeroconf avahi)
-	)
-	ECONF_SOURCE="${S}" \
-	SANEI_JPEG="sanei_jpeg.o" SANEI_JPEG_LO="sanei_jpeg.lo" \
-	BACKENDS="${lbackends}" \
-	econf "${myconf[@]}"
-}
-
-multilib_src_compile() {
-	emake VARTEXFONTS="${T}/fonts"
-
-	if tc-is-cross-compiler ; then
-		pushd "${BUILD_DIR}"/tools >/dev/null || die
-
-		# The build system sucks and doesn't handle this properly.
-		# https://alioth.debian.org/tracker/index.php?func=detail&aid=314236&group_id=30186&atid=410366
-		tc-export_build_env BUILD_CC
-		${BUILD_CC} ${BUILD_CPPFLAGS} ${BUILD_CFLAGS} ${BUILD_LDFLAGS} \
-			-I. -I../include -I"${S}"/include \
-			"${S}"/sanei/sanei_config.c "${S}"/sanei/sanei_constrain_value.c \
-			"${S}"/sanei/sanei_init_debug.c "${S}"/tools/sane-desc.c -o sane-desc || die
-		local dirs=( hal hotplug hotplug-ng udev )
-		local targets=(
-			hal/libsane.fdi
-			hotplug/libsane.usermap
-			hotplug-ng/libsane.db
-			udev/libsane.rules
-		)
-		mkdir -p "${dirs[@]}" || die
-		emake "${targets[@]}"
-
-		popd >/dev/null || die
-	fi
-
-	if use usb ; then
-		sed -i -e '/^$/d' \
-			tools/hotplug/libsane.usermap || die
-	fi
-}
-
-multilib_src_install() {
-	emake INSTALL_LOCKPATH="" DESTDIR="${D}" install \
-		docdir="${EPREFIX}"/usr/share/doc/${PF}
-
-	if multilib_is_native_abi ; then
-		if use usb ; then
-			insinto /etc/hotplug/usb
-			doins tools/hotplug/libsane.usermap
-		fi
-
-		insinto "/usr/share/pkgconfig"
-		doins tools/sane-backends.pc
-
-		# From Fedora and Arch, prevent permission conflicts
-		# https://github.com/OpenPrinting/cups/issues/314
-		# https://gitlab.com/sane-project/backends/-/issues/546
-		#
-		# Generate udev udev+hwdb, not needing scanner group
-		install -vdm 755 "${ED}/$(get_udevdir)/rules.d/" || die
-		tools/sane-desc -m udev+hwdb -s doc/descriptions/ > "${ED}/$(get_udevdir)/rules.d/65-${PN}.rules" || die
-		tools/sane-desc -m udev+hwdb -s doc/descriptions-external/ >> "${ED}/$(get_udevdir)/rules.d/65-${PN}.rules" || die
-		# generate udev hwdb
-		install -vdm 755 "${ED}/$(get_udevdir)/hwdb.d/" || die
-		tools/sane-desc -m hwdb -s doc/descriptions/ > "${ED}/$(get_udevdir)/hwdb.d/20-${PN}.hwdb"
-		# NOTE: an empty new line is required between the two .desc collections
-		printf "\n" >> "${ED}/$(get_udevdir)/hwdb.d/20-${PN}.hwdb" || die
-		tools/sane-desc -m hwdb -s doc/descriptions-external/ >> "${ED}/$(get_udevdir)/hwdb.d/20-${PN}.hwdb" || die
-		# udev rule for saned (SANE scanning daemon) to be able to write on usb port
-		udev_dorules "${FILESDIR}/66-saned.rules"
-	fi
-}
-
-multilib_src_install_all() {
-	dodir /etc/env.d
-
-	if use systemd ; then
-		systemd_newunit "${FILESDIR}"/saned_at.service "saned@.service"
-		systemd_newunit "${FILESDIR}"/saned.socket saned.socket
-	fi
-
-	if use usb ; then
-		exeinto /etc/hotplug/usb
-		doexe tools/hotplug/libusbscanner
-		newdoc tools/hotplug/README README.hotplug
-	fi
-
-	dodoc NEWS AUTHORS PROBLEMS README README.linux
-	find "${ED}" -name '*.la' -delete || die
-
-	if use xinetd ; then
-		insinto /etc/xinetd.d
-		doins "${FILESDIR}"/saned
-	fi
-
-	newinitd "${FILESDIR}"/saned.initd saned
-	newconfd "${FILESDIR}"/saned.confd saned
-}
-
-pkg_postinst() {
-	optfeature "Network scanner backend" media-gfx/sane-airscan
-	optfeature "Epson-specific backend" media-gfx/iscan
-	optfeature "HP-specific backend" net-print/hplip
-
-	if use xinetd ; then
-		elog "If you want remote clients to connect, edit"
-		elog "/etc/sane.d/saned.conf and /etc/hosts.allow"
-	fi
-
-	udev_reload
-}
-
-pkg_postrm() {
-	udev_reload
-}
diff --git a/media-gfx/sane-backends/sane-backends-1.1.1-r13.ebuild b/media-gfx/sane-backends/sane-backends-1.1.1-r13.ebuild
deleted file mode 100644
index cc8ec2c60f74..000000000000
--- a/media-gfx/sane-backends/sane-backends-1.1.1-r13.ebuild
+++ /dev/null
@@ -1,366 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_10 )
-
-# python-any-r1 required for a script in
-# backends/pixma/scripts/
-inherit autotools flag-o-matic multilib-minimal optfeature python-any-r1 systemd toolchain-funcs udev
-
-# gphoto and v4l are handled by their usual USE flags.
-# The pint backend was disabled because I could not get it to compile.
-IUSE_SANE_BACKENDS=(
-	abaton
-	agfafocus
-	apple
-	artec
-	artec_eplus48u
-	as6e
-	avision
-	bh
-	canon
-	canon630u
-	canon_dr
-	canon_lide70
-	canon_pp
-	cardscan
-	coolscan
-	coolscan2
-	coolscan3
-	dc210
-	dc240
-	dc25
-	dell1600n_net
-	dmc
-	epjitsu
-	epson
-	epson2
-	epsonds
-	escl
-	fujitsu
-	genesys
-	gt68xx
-	hp
-	hp3500
-	hp3900
-	hp4200
-	hp5400
-	hp5590
-	hpljm1005
-	hpsj5s
-	hs2p
-	ibm
-	kodak
-	kodakaio
-	kvs1025
-	kvs20xx
-	kvs40xx
-	leo
-	lexmark
-	ma1509
-	magicolor
-	matsushita
-	microtek
-	microtek2
-	mustek
-	mustek_pp
-	mustek_usb
-	mustek_usb2
-	nec
-	net
-	niash
-	p5
-	pie
-	pieusb
-	pixma
-	plustek
-	plustek_pp
-	pnm
-	qcam
-	ricoh
-	ricoh2
-	rts8891
-	s9036
-	sceptre
-	sharp
-	sm3600
-	sm3840
-	snapscan
-	sp15c
-	st400
-	stv680
-	tamarack
-	teco1
-	teco2
-	teco3
-	test
-	u12
-	umax
-	umax1220u
-	umax_pp
-	xerox_mfp
-)
-
-IUSE="gphoto2 snmp systemd threads usb v4l xinetd +zeroconf"
-
-for GBACKEND in ${IUSE_SANE_BACKENDS[@]}; do
-	case ${GBACKEND} in
-	# Disable backends that require parallel ports as no one has those anymore.
-	canon_pp|hpsj5s|mustek_pp|\
-	pnm|mustek_usb2|kvs40xx)
-		IUSE+=" sane_backends_${GBACKEND}"
-		;;
-	*)
-		IUSE+=" +sane_backends_${GBACKEND}"
-	esac
-done
-
-REQUIRED_USE="
-	sane_backends_escl? ( zeroconf )
-	sane_backends_kvs40xx? ( threads )
-	sane_backends_mustek_usb2? ( threads )
-"
-
-DESCRIPTION="Scanner Access Now Easy - Backends"
-HOMEPAGE="http://www.sane-project.org/"
-SRC_URI="https://gitlab.com/sane-project/backends/uploads/7d30fab4e115029d91027b6a58d64b43/${P}.tar.gz"
-
-LICENSE="GPL-2 public-domain"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-# For pixma: see https://gitlab.com/sane-project/backends/-/releases/1.0.28#build
-RDEPEND="
-	acct-user/saned
-	acct-group/scanner
-	gphoto2? (
-		>=media-libs/libgphoto2-2.5.3.1:=[${MULTILIB_USEDEP}]
-		media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}]
-	)
-	sane_backends_canon_pp? ( >=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] )
-	sane_backends_dc210? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] )
-	sane_backends_dc240? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] )
-	sane_backends_dell1600n_net? (
-		>=media-libs/tiff-3.9.7-r1:=[${MULTILIB_USEDEP}]
-		media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}]
-	)
-	sane_backends_escl? (
-		app-text/poppler[cairo]
-		|| (
-			net-dns/avahi[dbus]
-			net-dns/avahi[gtk]
-		)
-		net-dns/avahi[${MULTILIB_USEDEP}]
-		net-misc/curl[${MULTILIB_USEDEP}]
-	)
-	sane_backends_hpsj5s? ( >=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] )
-	sane_backends_mustek_pp? ( >=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] )
-	sane_backends_pixma? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] )
-	snmp? ( net-analyzer/net-snmp:= )
-	systemd? ( sys-apps/systemd:= )
-	usb? ( >=virtual/libusb-1-r1:1=[${MULTILIB_USEDEP}] )
-	v4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] )
-	xinetd? ( sys-apps/xinetd )
-	zeroconf? ( >=net-dns/avahi-0.6.31-r2[${MULTILIB_USEDEP}] )
-"
-
-DEPEND="${RDEPEND}
-	dev-libs/libxml2
-	v4l? ( sys-kernel/linux-headers )
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-build/autoconf-archive
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.0.24-saned_pidfile_location.patch
-	"${FILESDIR}"/${PN}-1.0.27-disable-usb-tests.patch
-	"${FILESDIR}"/${PN}-1.0.30-add_hpaio_epkowa_dll.conf.patch
-	# https://gitlab.com/sane-project/backends/-/merge_requests/688
-	"${FILESDIR}"/${PN}-1.1.1-genesys-gl845-crash.patch
-	"${FILESDIR}"/${P}-gcc12-tests.patch
-	"${FILESDIR}"/${PN}-1.1.1-configure-clang16.patch
-	"${FILESDIR}"/${P}-musl.patch
-)
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/sane-config
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-
-	# don't bleed user LDFLAGS into pkgconfig files
-	sed 's|@LDFLAGS@ ||' -i tools/*.pc.in || die
-
-	# Needed for udev rules generation/installation
-	multilib_copy_sources
-}
-
-src_configure() {
-	# From Fedora
-	append-flags -fno-strict-aliasing
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	# the blank is intended - an empty string would result in building ALL backends.
-	local lbackends=" "
-
-	use gphoto2 && lbackends="gphoto2"
-	use v4l && lbackends+=" v4l"
-	use sane_backends_escl && multilib_is_native_abi && lbackends+=" escl"
-	local backend
-	for backend in ${IUSE_SANE_BACKENDS[@]} ; do
-		if use "sane_backends_${backend}" && [[ "${backend}" != pnm ]] && [[ "${backend}" != escl ]] ; then
-			lbackends+=" ${backend}"
-		fi
-	done
-
-	local myconf=(
-		$(use_with usb)
-		$(multilib_native_use_with snmp)
-
-		$(multilib_native_use_with sane_backends_escl poppler-glib)
-		# you can only enable this backend, not disable it...
-		$(usex sane_backends_pnm --enable-pnm-backend '')
-		$(usex sane_backends_mustek_pp --enable-parport-directio '')
-	)
-
-	if ! { use sane_backends_canon_pp || use sane_backends_hpsj5s || use sane_backends_mustek_pp ; } ; then
-		myconf+=( sane_cv_use_libieee1284=no )
-	fi
-
-	# relative path must be used for tests to work properly
-	# All distributions pass --disable-locking because /var/lock/sane/ would be a world-writable directory
-	# that break in many ways, bug #636202, #668232, #668350
-	# People can refer to the "Programmer's Documentation" at http://www.sane-project.org/docs.html
-	myconf+=(
-		--enable-ipv6
-		--disable-locking
-		$(use_with gphoto2)
-		$(multilib_native_use_with systemd)
-		$(use_with v4l)
-		$(use_enable threads pthread)
-		$(use_with zeroconf avahi)
-	)
-
-	ECONF_SOURCE="${S}" \
-	SANEI_JPEG="sanei_jpeg.o" SANEI_JPEG_LO="sanei_jpeg.lo" \
-	BACKENDS="${lbackends}" \
-	econf "${myconf[@]}"
-}
-
-multilib_src_compile() {
-	emake VARTEXFONTS="${T}/fonts"
-
-	if tc-is-cross-compiler ; then
-		pushd "${BUILD_DIR}"/tools >/dev/null || die
-
-		# The build system sucks and doesn't handle this properly.
-		# https://alioth.debian.org/tracker/index.php?func=detail&aid=314236&group_id=30186&atid=410366
-		tc-export_build_env BUILD_CC
-		${BUILD_CC} ${BUILD_CPPFLAGS} ${BUILD_CFLAGS} ${BUILD_LDFLAGS} \
-			-I. -I../include -I"${S}"/include \
-			"${S}"/sanei/sanei_config.c "${S}"/sanei/sanei_constrain_value.c \
-			"${S}"/sanei/sanei_init_debug.c "${S}"/tools/sane-desc.c -o sane-desc || die
-		local dirs=( hal hotplug hotplug-ng udev )
-		local targets=(
-			hal/libsane.fdi
-			hotplug/libsane.usermap
-			hotplug-ng/libsane.db
-			udev/libsane.rules
-		)
-		mkdir -p "${dirs[@]}" || die
-		emake "${targets[@]}"
-
-		popd >/dev/null || die
-	fi
-
-	if use usb ; then
-		sed -i -e '/^$/d' \
-			tools/hotplug/libsane.usermap || die
-	fi
-}
-
-multilib_src_install() {
-	emake INSTALL_LOCKPATH="" DESTDIR="${D}" install \
-		docdir="${EPREFIX}"/usr/share/doc/${PF}
-
-	if multilib_is_native_abi ; then
-		if use usb ; then
-			insinto /etc/hotplug/usb
-			doins tools/hotplug/libsane.usermap
-		fi
-
-		insinto "/usr/share/pkgconfig"
-		doins tools/sane-backends.pc
-
-		# From Fedora and Arch, prevent permission conflicts
-		# https://github.com/OpenPrinting/cups/issues/314
-		# https://gitlab.com/sane-project/backends/-/issues/546
-		#
-		# Generate udev udev+hwdb, not needing scanner group
-		install -vdm 755 "${ED}/$(get_udevdir)/rules.d/" || die
-		tools/sane-desc -m udev+hwdb -s doc/descriptions/ > "${ED}/$(get_udevdir)/rules.d/65-${PN}.rules" || die
-		tools/sane-desc -m udev+hwdb -s doc/descriptions-external/ >> "${ED}/$(get_udevdir)/rules.d/65-${PN}.rules" || die
-		# generate udev hwdb
-		install -vdm 755 "${ED}/$(get_udevdir)/hwdb.d/" || die
-		tools/sane-desc -m hwdb -s doc/descriptions/ > "${ED}/$(get_udevdir)/hwdb.d/20-${PN}.hwdb"
-		# NOTE: an empty new line is required between the two .desc collections
-		printf "\n" >> "${ED}/$(get_udevdir)/hwdb.d/20-${PN}.hwdb" || die
-		tools/sane-desc -m hwdb -s doc/descriptions-external/ >> "${ED}/$(get_udevdir)/hwdb.d/20-${PN}.hwdb" || die
-		# udev rule for saned (SANE scanning daemon) to be able to write on usb port
-		udev_newrules "${FILESDIR}/66-saned.rules-r1" 66-saned.rules
-	fi
-}
-
-multilib_src_install_all() {
-	dodir /etc/env.d
-
-	if use systemd ; then
-		systemd_newunit "${FILESDIR}"/saned_at.service-r1 "saned@.service"
-		systemd_newunit "${FILESDIR}"/saned.socket saned.socket
-	fi
-
-	if use usb ; then
-		exeinto /etc/hotplug/usb
-		doexe tools/hotplug/libusbscanner
-		newdoc tools/hotplug/README README.hotplug
-	fi
-
-	dodoc NEWS AUTHORS PROBLEMS README README.linux
-	find "${ED}" -name '*.la' -delete || die
-
-	if use xinetd ; then
-		insinto /etc/xinetd.d
-		doins "${FILESDIR}"/saned
-	fi
-
-	newinitd "${FILESDIR}"/saned.initd saned
-	newconfd "${FILESDIR}"/saned.confd saned
-}
-
-pkg_postrm() {
-	udev_reload
-}
-
-pkg_postinst() {
-	udev_reload
-
-	optfeature "Network scanner backend" media-gfx/sane-airscan
-	optfeature "Epson-specific backend" media-gfx/iscan
-	optfeature "HP-specific backend" net-print/hplip
-
-	if use xinetd ; then
-		elog "If you want remote clients to connect, edit"
-		elog "/etc/sane.d/saned.conf and /etc/hosts.allow"
-	fi
-}
diff --git a/media-gfx/sane-backends/sane-backends-1.2.1.ebuild b/media-gfx/sane-backends/sane-backends-1.2.1.ebuild
index 2b69e30c7d17..7f364f68bc1e 100644
--- a/media-gfx/sane-backends/sane-backends-1.2.1.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.2.1.ebuild
@@ -3,11 +3,19 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 # python-any-r1 required for a script in backends/pixma/scripts/
 inherit autotools flag-o-matic multilib-minimal optfeature python-any-r1 systemd toolchain-funcs udev
 
+DESCRIPTION="Scanner Access Now Easy - Backends"
+HOMEPAGE="http://www.sane-project.org/"
+SRC_URI="https://gitlab.com/sane-project/backends/uploads/110fc43336d0fb5e514f1fdc7360dd87/${P}.tar.gz"
+
+LICENSE="GPL-2 public-domain"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+
 # gphoto and v4l are handled by their usual USE flags.
 # The pint backend was disabled because I could not get it to compile.
 IUSE_SANE_BACKENDS=(
@@ -122,14 +130,6 @@ REQUIRED_USE="
 	sane_backends_mustek_usb2? ( threads )
 "
 
-DESCRIPTION="Scanner Access Now Easy - Backends"
-HOMEPAGE="http://www.sane-project.org/"
-SRC_URI="https://gitlab.com/sane-project/backends/uploads/110fc43336d0fb5e514f1fdc7360dd87/${P}.tar.gz"
-
-LICENSE="GPL-2 public-domain"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
 # For pixma: see https://gitlab.com/sane-project/backends/-/releases/1.0.28#build
 RDEPEND="
 	acct-user/saned
@@ -164,13 +164,11 @@ RDEPEND="
 	xinetd? ( sys-apps/xinetd )
 	zeroconf? ( >=net-dns/avahi-0.6.31-r2[${MULTILIB_USEDEP}] )
 "
-DEPEND="
-	${RDEPEND}
+DEPEND="${RDEPEND}
 	dev-libs/libxml2
 	v4l? ( sys-kernel/linux-headers )
 "
-BDEPEND="
-	${PYTHON_DEPS}
+BDEPEND="${PYTHON_DEPS}
 	dev-build/autoconf-archive
 	sys-devel/gettext
 	virtual/pkgconfig
diff --git a/media-gfx/scour/Manifest b/media-gfx/scour/Manifest
index e26d636f9639..9d14b9710b15 100644
--- a/media-gfx/scour/Manifest
+++ b/media-gfx/scour/Manifest
@@ -1,3 +1,3 @@
 DIST scour-0.38.2.gh.tar.gz 99910 BLAKE2B 4273287b201ecea64cb2be666bb7de4fbadc3483935515de92ec8dfb39f3b856584e35ac877958efd798bb5840baba4fc4d40a376d2c9f3b0c52a679d7ded6df SHA512 a2c418e25283af399be032322b3af0c336c2392ba361681d4b133b64ebc441ac5beeed2b920f42316cef376c971b230681e306687786a875162d33b659d3fdeb
-EBUILD scour-0.38.2-r1.ebuild 717 BLAKE2B 8bf31a0c39f2a5868540bec1daa56c2a999ae5dc5b3f31c4a8df3edc3dae6d38e1e7a2a466a162a96bdce02496060c428eb750b51b10bb78293ae09031d24d75 SHA512 fb9ac6ba0593358d909b755d29b760978a875bb69cb3264873069c5da9bd822e469b064c8aa0e8acd9ea1c21248dd40f258b30910d33a107fbd177594c9962cc
+EBUILD scour-0.38.2-r1.ebuild 711 BLAKE2B f868828785dd8d6ff61fefc9032a0af631e15923ae2a810978d3b2dcb4d75106fbe97b13370b9ca11a37bc6ac005b677b3d9ad99606409d34ba3ba8d76322c86 SHA512 ddd2765fbcb309a708f7d53ffdceedfdfd4225d508d353aece9badc2a6c12c93a875a81d598f1e8a6c5cda8fcaa1b0b3d0ede90b5270bb72486446aa056bca3d
 MISC metadata.xml 327 BLAKE2B b501c3f768a9e5e1af3cbb060c6ccdf4703d1cd6baacdc255997a563cfd9b6777b64d97d3540a532490e4ccf98724d82cf1e3a0f0366b85c47cf8660c7a7057e SHA512 322aefdbb22f52edbc453223ccc9e828f373b9d28b2a02c87429c7a16d8ced41567898a73a4e9ff50667bd8424fdb6e4a9bab836290de0d82df7969db6eb0cce
diff --git a/media-gfx/scour/scour-0.38.2-r1.ebuild b/media-gfx/scour/scour-0.38.2-r1.ebuild
index 8809aac2f3c1..b43c1988be8d 100644
--- a/media-gfx/scour/scour-0.38.2-r1.ebuild
+++ b/media-gfx/scour/scour-0.38.2-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]
diff --git a/media-gfx/scrot/Manifest b/media-gfx/scrot/Manifest
index 56de8953e997..0c511318e1db 100644
--- a/media-gfx/scrot/Manifest
+++ b/media-gfx/scrot/Manifest
@@ -1,7 +1,7 @@
 AUX scrot-1.7.bash-completion 2622 BLAKE2B febdade3f2b5cb094d9162e66d3b0d0b8ad72659e33ca9b6c55c4888ef3122c8f16430cc5f74d32367ea7a74905e3c8c49e9570d996c1324ffd9b72f42e9f534 SHA512 c0a6ac7347164e007eef219b567a554b5aac91c4afdc585d2ed299f46880a46343e3aef83ad8fe50e090ed8521ca241b7e3661a59511064a43164fbe366e1ebb
 DIST scrot-1.10.tar.bz2 156519 BLAKE2B ca1441823521d14559afe49ed36853bb5448cc5c2ee345ddb617324b63e8f599678cbdc94b862938017a62d2f5ceea3cae03f80e473e86cafc76dd34144d41bb SHA512 7a72b6d7ae350b0ec27b949934ff67cb8800f731f3dfc783bfdf66c4316b318118b8b46d98aca05543144b757c659791f4a9aeae43364277501238a405eda57d
-DIST scrot-1.9.tar.bz2 158710 BLAKE2B d823c0875a260ee9741e1c9038fe743e69d0afa83220448857d109dd3ebad9977f07871b25c6a4a979efdf2abd246a2facec91c5b0af01c47307dc6266c801d3 SHA512 ace3bcb26ecebc5bb139a6e011a562287be8f676f21211b540dd937ab2d4487047d3565d0aec84e099bd2c5c9b037d9044924b031f930dc45a3040df399a3312
+DIST scrot-1.11.1.tar.bz2 158007 BLAKE2B e0c8f166444bfdfbed41a5588036b861973c90d057e302f7bd35cf9630a9f0311735977632ba068c1b3542baed251a3d682da7d8f56c114880a425b3056a0692 SHA512 6a6435c6e0562a367d895f2d1c7a03b050f6588a5843376c5e33a5b8ef1b0b684390530f8c61c340b3f0928caeefb95d9df1f8fe0b145768c336685b1c8d8deb
 EBUILD scrot-1.10.ebuild 1388 BLAKE2B e99af4ac52022803494f6ae62b004b8a3bb0c40c72300905908e759829ec222a3ce4c24213d3707e3e52664736df01ec120b0813363cd93ac7a25bd6db382042 SHA512 bef2cc2eba090e3a3b9549c7bd464784a1dc0c1ca7fd0b1b9b38de2a15407be66e6953859014ee15b292dec8b91ea37ce0e9c21b33c8a14256e5c32c2d23fa7b
-EBUILD scrot-1.9.ebuild 1388 BLAKE2B e99af4ac52022803494f6ae62b004b8a3bb0c40c72300905908e759829ec222a3ce4c24213d3707e3e52664736df01ec120b0813363cd93ac7a25bd6db382042 SHA512 bef2cc2eba090e3a3b9549c7bd464784a1dc0c1ca7fd0b1b9b38de2a15407be66e6953859014ee15b292dec8b91ea37ce0e9c21b33c8a14256e5c32c2d23fa7b
-EBUILD scrot-9999.ebuild 1395 BLAKE2B 7b42b90681e7bdb83ad6a5f649a4ebdd5abbf9a0c2375ca2a3ebca58f17b9c3be315401a0ed97db0b39796b8de15db60b8f82f835f2c42bc604f013588a53677 SHA512 4f14e20b0a6d94a2fcd4d1bdbc7be578e3a8860f5442facf8225abd43f1bc420b23ed600a22a34cc982ef9084ba14b94eb0c27598e2f70c6259df3502b6e8be3
+EBUILD scrot-1.11.1.ebuild 1406 BLAKE2B 0e905c915114d19fb62db734ecd30c0e98c442bd2e11535b7ba7f210d18d439cc6b108666ceb3c895cccd24960ec9ad50d2ac17585ce3596a1af2e8ce6a581ce SHA512 cea86dab25f83a013a209be9bb16bbadcfb0b5d50bd67d9eedd13a22ec40d824ef0462a0738464a35d164d684aba8a8d7a2b72edfa091db25632eaaa94df2381
+EBUILD scrot-9999.ebuild 1406 BLAKE2B 0e905c915114d19fb62db734ecd30c0e98c442bd2e11535b7ba7f210d18d439cc6b108666ceb3c895cccd24960ec9ad50d2ac17585ce3596a1af2e8ce6a581ce SHA512 cea86dab25f83a013a209be9bb16bbadcfb0b5d50bd67d9eedd13a22ec40d824ef0462a0738464a35d164d684aba8a8d7a2b72edfa091db25632eaaa94df2381
 MISC metadata.xml 486 BLAKE2B 49d843df52a3129520dc7f99058e4632bd2bef1239ae14f4ff49e315bb5d11536a2f384845c87ad69e9dcd1ccd363009f4d9b4b5d862aca69d59e5f6490573c9 SHA512 56297474babfd15627050a5d5e4ac885dcd6a9f9d861e708877c280b23251680700e006d58edf384d412df56b97ffaa5dc8d55ab1dedd34a9e4d3af1ed63980f
diff --git a/media-gfx/scrot/scrot-1.9.ebuild b/media-gfx/scrot/scrot-1.11.1.ebuild
index 81c77df2463a..d383d2bfa6bc 100644
--- a/media-gfx/scrot/scrot-1.9.ebuild
+++ b/media-gfx/scrot/scrot-1.11.1.ebuild
@@ -3,16 +3,17 @@
 
 EAPI=8
 
-inherit bash-completion-r1
+inherit shell-completion
 
 DESCRIPTION="Screen capture utility using imlib2 library"
 HOMEPAGE="https://github.com/resurrecting-open-source-projects/scrot"
 if [[ ${PV} == *9999* ]] ; then
 	EGIT_REPO_URI="https://github.com/resurrecting-open-source-projects/${PN}"
 	inherit autotools git-r3
+	LIVE_BDEPEND="dev-build/autoconf-archive"
 else
 	SRC_URI="https://github.com/resurrecting-open-source-projects/${PN}/releases/download/${PV}/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 LICENSE="feh"
@@ -34,15 +35,14 @@ RDEPEND="
 DEPEND="
 	${RDEPEND}
 	x11-base/xorg-proto
-	elibc_musl? ( sys-libs/queue-standalone )
 "
 BDEPEND="
-	dev-build/autoconf-archive
+	${LIVE_BDEPEND}
 	virtual/pkgconfig
 "
 
 DOCS=(
-	AUTHORS ChangeLog README.md
+	AUTHORS ChangeLog README.md FAQ.md
 )
 
 src_prepare() {
@@ -54,5 +54,6 @@ src_prepare() {
 src_install() {
 	default
 
-	newbashcomp "${FILESDIR}"/${PN}-1.7.bash-completion ${PN}
+	dozshcomp  etc/zsh-completion/_scrot
+	dobashcomp etc/bash-completion/scrot
 }
diff --git a/media-gfx/scrot/scrot-9999.ebuild b/media-gfx/scrot/scrot-9999.ebuild
index 092a65896df9..d383d2bfa6bc 100644
--- a/media-gfx/scrot/scrot-9999.ebuild
+++ b/media-gfx/scrot/scrot-9999.ebuild
@@ -3,13 +3,14 @@
 
 EAPI=8
 
-inherit bash-completion-r1
+inherit shell-completion
 
 DESCRIPTION="Screen capture utility using imlib2 library"
 HOMEPAGE="https://github.com/resurrecting-open-source-projects/scrot"
 if [[ ${PV} == *9999* ]] ; then
 	EGIT_REPO_URI="https://github.com/resurrecting-open-source-projects/${PN}"
 	inherit autotools git-r3
+	LIVE_BDEPEND="dev-build/autoconf-archive"
 else
 	SRC_URI="https://github.com/resurrecting-open-source-projects/${PN}/releases/download/${PV}/${P}.tar.bz2"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
@@ -34,15 +35,14 @@ RDEPEND="
 DEPEND="
 	${RDEPEND}
 	x11-base/xorg-proto
-	elibc_musl? ( sys-libs/queue-standalone )
 "
 BDEPEND="
-	dev-build/autoconf-archive
+	${LIVE_BDEPEND}
 	virtual/pkgconfig
 "
 
 DOCS=(
-	AUTHORS ChangeLog README.md
+	AUTHORS ChangeLog README.md FAQ.md
 )
 
 src_prepare() {
@@ -54,5 +54,6 @@ src_prepare() {
 src_install() {
 	default
 
-	newbashcomp "${FILESDIR}"/${PN}-1.7.bash-completion ${PN}
+	dozshcomp  etc/zsh-completion/_scrot
+	dobashcomp etc/bash-completion/scrot
 }
diff --git a/media-gfx/sfftobmp/Manifest b/media-gfx/sfftobmp/Manifest
index 1a047d0003db..07f9da9ff87f 100644
--- a/media-gfx/sfftobmp/Manifest
+++ b/media-gfx/sfftobmp/Manifest
@@ -1,6 +1,7 @@
 AUX sfftobmp-3.1.1-gcc44-and-boost-1_37.patch 749 BLAKE2B 3bd8d52ed467c188f8b0545dfbce8be3d7093c25ba7c9882701751a6eef18c9e43d9b83979669457ef337d857866754be750de44ffe0482880275a7f294751b2 SHA512 ad6c0bf2a2c0c44ab9f7fe0226137061561b943d59167f9de0adc6d1998d1a938166a2120b24c6499466a310736310a5e05be8b7d4575ea1121d99604fc56cdb
 AUX sfftobmp-3.1.2-Wformat.patch 342 BLAKE2B 1e6db3a432fce740f34f2cb2a3f3662f59c0fedd84e6b63a1cc58dbf2f5d9e48858ad0f1e25e0a9b2ef493eec4cdc8587cb24430026ad3c51190ddaf2213e8b3 SHA512 afde9e1a0acabe7d4fa51b6a533f09afe93deb5c8015c1cb322849feb543ccd45bf0639a61928c6c8641a741b348e119528ba1a03d6c201d12b4be98d49eb85e
+AUX sfftobmp-3.1.2-boost-1.85.patch 2355 BLAKE2B cb299609f09b179ce7c2eb942aadcee739ce3ae52a64447a9eca156ae0171f7eeff0ee91a33f7f24e70c6ae1e7da3e27194f72f6182737478ec63e9a6489a088 SHA512 0fa1b2e8804f5387ee9d59bcb0acbf7c50f309ec47ce5e3acf6ddd5e137a2f656f59666e536a2fdcbe86d461168fcd39b19fe2dbb5133edd87ba48d18dd24c9e
 AUX sfftobmp-3.1.2-boost_fs3.patch 542 BLAKE2B 032a3f526407bb7e4c94176b914b8dfc298a250b468322561e6f0fa9b37578cd8872717080469eb147bd7fab2c9239d8a06ce9e2b937b87899355aa231e3a459 SHA512 1829c9cbfef93e9a019c2b92aa60e45c9f32498fba15ceac456ccd0fa6244e92aa8dc2b5ddff3cf56ad01e7e7111f0553807b4faa94c3d1ddeb2ab7328c8c915
 DIST sfftobmp3_1_2_src.zip 121478 BLAKE2B fe5e09d358cfa75a45a05e780fcf8b3409ae9791882c8c4ab3fe99b078cade57a75751343c42a5d7764702ca32565e8c97d417e3c095c10a01b6fcd0f09f03b3 SHA512 3c460dcd60486954f792ecc8e864d109dabbae30b56a6ba4b3228a42dd489fd88793e4d93e2d032e6cd1c552bf5e217bc2afb3eae85a1a4e1db340f7761905b7
-EBUILD sfftobmp-3.1.2-r3.ebuild 852 BLAKE2B ea521dc8f61e934634dab4323a378949d799c8c35563d87fc5de3100f39f146e7de9f9fa571839ead68915e1d3bf884ceaa5a85102ed8c2a505a82cd82377fd5 SHA512 64cd26fb83e49291cc181c6ebea3135116a1e996feee4383cecec8a4067264e8f79ea375eadd6a7047f81dab9a2c0c25a604beb37628b877a2fa17e2703e0320
+EBUILD sfftobmp-3.1.2-r3.ebuild 808 BLAKE2B 7968c675c3396ca1fdfceea8b4cef90663fdc8a5650698e62deee53e6773966887001e3c6423f9d098dbd109efc348c20b03e4a16c99c0388c8602cb2a0575cb SHA512 d033ef1efcc7ae2d69ad2e68779f79114b8d1ee9b66f2b6f996baab95831430805b4d95454c7cdb6ad448d61daa77c9e8d38be3e7a6d25567d435817345771bc
 MISC metadata.xml 246 BLAKE2B 7c25526b9240c42e9e0b41a00848ca2311c8edf487c120d4bdb03b78e15f3e773c8437e037ee3000ad437d5d12b237b2fb09e6c151f0be7e1cbe06f448f07a70 SHA512 f0ff62e58d57dded6e30f61f7734cdc744f9a727a7e2435f225b38990217690713eb50dff49920235efa94547e9a6aab32ba5c3a599fd80689e0c4d841eaa043
diff --git a/media-gfx/sfftobmp/files/sfftobmp-3.1.2-boost-1.85.patch b/media-gfx/sfftobmp/files/sfftobmp-3.1.2-boost-1.85.patch
new file mode 100644
index 000000000000..9fac13880922
--- /dev/null
+++ b/media-gfx/sfftobmp/files/sfftobmp-3.1.2-boost-1.85.patch
@@ -0,0 +1,63 @@
+https://www.boost.org/doc/libs/1_85_0/libs/filesystem/doc/deprecated.html
+--- a/src/cmdline.cpp
++++ b/src/cmdline.cpp
+@@ -41,7 +41,6 @@
+ #include <iostream>
+ 
+ #include <boost/filesystem/operations.hpp>
+-#include <boost/filesystem/convenience.hpp>
+ 
+ #include <tiff.h>
+ 
+--- a/src/main.cpp
++++ b/src/main.cpp
+@@ -41,7 +41,6 @@
+ 
+ #include <boost/filesystem/path.hpp>
+ #include <boost/filesystem/operations.hpp>
+-#include <boost/filesystem/convenience.hpp>
+ 
+ extern "C"
+ {
+@@ -172,10 +171,10 @@ int main( int argc, char *argv[] )
+             if (pathOutFileName.string().length()) {
+               // A fixed name was given, so use it as a base name
+               outPath = pathOutFileName;
+-              std::string orgExt = fs::extension(outPath);
++              std::string orgExt = outPath.extension().string();
+               if (nFileCountOut > 1) {
+                 sprintf(acNumber, "_%03d", nPage+1);
+-                outPath = fs::change_extension(outPath, acNumber);
++                outPath.replace_extension(acNumber);
+                 if (orgExt.length()) {
+                   std::string strTemp = outPath.string();
+                   strTemp += orgExt;
+@@ -184,15 +183,15 @@ int main( int argc, char *argv[] )
+               }
+             } else {
+               // Otherwise construct output filename from input filename
+-              outPath = pathOutDirectory / pathInFileName.leaf();
++              outPath = pathOutDirectory / pathInFileName.filename();
+               if (nFileCountOut > 1) {
+                 sprintf(acNumber, "_%03d", nPage+1);
+-                outPath = fs::change_extension(outPath, acNumber);
++                outPath.replace_extension(acNumber);
+                 std::string strTemp = outPath.string();
+                 strTemp += pOut->GetExtension();
+                 outPath = fs::path(strTemp);
+               } else {
+-                outPath = fs::change_extension(outPath, pOut->GetExtension());
++                outPath.replace_extension(pOut->GetExtension());
+               }
+             }
+             if (!proc.doOverwrite() && !((nPage > 0) && (nFileCountOut == 1)) && fs::exists(outPath)) {
+--- a/src/output.cpp
++++ b/src/output.cpp
+@@ -42,7 +42,6 @@
+ #include <iostream>
+ 
+ #include <boost/filesystem/path.hpp>
+-#include <boost/filesystem/convenience.hpp>
+ 
+ #ifdef WIN32
+ #include <io.h>
diff --git a/media-gfx/sfftobmp/sfftobmp-3.1.2-r3.ebuild b/media-gfx/sfftobmp/sfftobmp-3.1.2-r3.ebuild
index 236b6a7b496a..6b9a92e6cfc2 100644
--- a/media-gfx/sfftobmp/sfftobmp-3.1.2-r3.ebuild
+++ b/media-gfx/sfftobmp/sfftobmp-3.1.2-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit autotools flag-o-matic
+inherit autotools
 
 MY_P=${PN}${PV//./_}
 
@@ -19,7 +19,8 @@ KEYWORDS="amd64 ~hppa ppc x86"
 RDEPEND="
 	dev-libs/boost:=
 	media-libs/libjpeg-turbo:=
-	media-libs/tiff:="
+	media-libs/tiff:=
+"
 DEPEND="${RDEPEND}"
 BDEPEND="app-arch/unzip"
 
@@ -27,6 +28,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-3.1.1-gcc44-and-boost-1_37.patch
 	"${FILESDIR}"/${PN}-3.1.2-boost_fs3.patch
 	"${FILESDIR}"/${PN}-3.1.2-Wformat.patch
+	"${FILESDIR}"/${PN}-3.1.2-boost-1.85.patch
 )
 
 src_prepare() {
@@ -34,11 +36,6 @@ src_prepare() {
 	eautoreconf
 }
 
-src_configure() {
-	append-cppflags -DBOOST_FILESYSTEM_VERSION=3
-	default
-}
-
 src_install() {
 	default
 	dodoc doc/{changes,credits,readme}
diff --git a/media-gfx/shotwell/Manifest b/media-gfx/shotwell/Manifest
index 71ba9c18b91b..34c7499ad4c4 100644
--- a/media-gfx/shotwell/Manifest
+++ b/media-gfx/shotwell/Manifest
@@ -1,3 +1,5 @@
 DIST shotwell-0.32.4.tar.xz 35335296 BLAKE2B 32be135643f165f32f315c332a4f0b34cd724285e7239eadbb250253b27ce97fb15d314f68a5392d88224a0b97f7f6ef8789c1f6c40051c26a25b9012e860b90 SHA512 516ab26d6620429175097886a1874d2eaf0513f6ef732bef5ee07ef8cd200028b34d98f4eb09b47a621f5313de42a5f415185d76853de478e0b5e0c4e89eea69
+DIST shotwell-0.32.7.tar.xz 35339216 BLAKE2B db87ee9c161f57dad638b47c37fb2737c95645e987e2bab81697895d9a28f14ab22b4669f218ea0baadfc0e1115f45fb9b094f546299083d83d2486fa1c15f98 SHA512 3cb9c9f2981ead8410f42680f6b4976d3b2efcfe7ded4d5217d28ebb8e5c968062a004ad3353affa13e94d996208ebf26c01f4beaf03a2ef6a1bc43960488d14
 EBUILD shotwell-0.32.4.ebuild 2199 BLAKE2B 50ac5f6cd764cb515945ceb700230845bb200be64a7e7bb94f88847ae351238b1b0352b64b0886e92140471636987add46d3aeb81363ff541a0502884b7a2547 SHA512 86cff4865ca7f7305b58799049e085ea7a03ff93f0738fe33c98680d863c15e48df2425e550717905908659ec6a8e9d604d97c51bc58414def714dd9726a3fc2
+EBUILD shotwell-0.32.7.ebuild 2205 BLAKE2B b8fccde94ab5fc0b40d3cecf6bb889a505ce2f485864fbc9201a7242270369401b83f51228e9c91fe6750346813d2d16aaab1654a7c07705abae86580cc08c8e SHA512 ba4842cc36e539c84bfcd76c79dd7291cc573318fa579c83c797f55d43c28e954caa0be5840208fbf0dd3235d754a8001393f1f3dcf2434668163ee6b2742790
 MISC metadata.xml 794 BLAKE2B c1eb4a08828db11ba473fe21036201d3b57c2fa36a2bd39b18e7671cf5e4c42b2b9e82956456a0376a60bfc982d9af106577075d936dba3c0cb73947da46f427 SHA512 2c65cdf3c6d5a953b52ad81e0a85d1c1465f5c38c3475e5c1408baea0b14a053255e97c0efc560059c77c51dbe98b72a90c6164fe575e68cba3eb04d4774f490
diff --git a/media-gfx/shotwell/shotwell-0.32.7.ebuild b/media-gfx/shotwell/shotwell-0.32.7.ebuild
new file mode 100644
index 000000000000..3f297331f776
--- /dev/null
+++ b/media-gfx/shotwell/shotwell-0.32.7.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org gnome2-utils meson optfeature vala xdg
+
+DESCRIPTION="Open source photo manager for GNOME"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/shotwell"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~sparc ~x86"
+IUSE="opencv udev"
+
+DEPEND="
+	>=x11-libs/gtk+-3.22.0:3
+	>=dev-libs/glib-2.40.0:2
+	>=dev-libs/libgee-0.8.5:0.8=
+	>=net-libs/webkit-gtk-2.26:4.1
+	net-libs/libsoup:3.0
+	>=dev-libs/json-glib-0.7.6
+	>=dev-libs/libxml2-2.6.32:2
+	x11-libs/gdk-pixbuf:2
+	>=dev-db/sqlite-3.5.9:3
+	>=media-libs/gstreamer-1.20:1.0
+	>=media-libs/gst-plugins-base-1.20:1.0
+	>=media-libs/libgphoto2-2.5:=
+	udev? ( >=dev-libs/libgudev-145:= )
+	>=media-libs/gexiv2-0.12.3
+	>=media-libs/libraw-0.13.2:=
+	>=media-libs/libexif-0.6.16
+	app-crypt/libsecret
+	>=dev-libs/libportal-0.5:=[gtk]
+	media-libs/libwebp:=
+
+	>=app-crypt/gcr-3:0=[gtk]
+	x11-libs/cairo
+	opencv? ( >=media-libs/opencv-4.0.0:= )
+"
+RDEPEND="${DEPEND}
+	media-plugins/gst-plugins-gdkpixbuf:1.0
+	media-plugins/gst-plugins-meta:1.0
+"
+BDEPEND="
+	$(vala_depend)
+	dev-libs/appstream-glib
+	dev-libs/glib
+	dev-util/gdbus-codegen
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	net-libs/libsoup:3.0[vala]
+	media-libs/gexiv2[vala]
+	app-crypt/gcr:0[vala]
+"
+
+src_prepare() {
+	default
+	vala_setup
+	xdg_environment_reset
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dunity_support=false
+		# -Dpublishers # In 0.30.2 all get compiled in anyways, even if restricted list, affects only runtime support
+		#trace
+		#measure
+		-Ddupe_detection=true
+		$(meson_use udev)
+		-Dinstall_apport_hook=false
+		$(meson_use opencv face_detection)
+		-Dfatal_warnings=false
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+
+	optfeature "Enable support for the AVIF format" media-libs/libavif[gdk-pixbuf]
+	optfeature "Enable support for the HEIF format" media-libs/libheif[gdk-pixbuf]
+	optfeature "Enable support for the JPEG format" x11-libs/gdk-pixbuf[jpeg]
+	optfeature "Enable support for the TIFF format" x11-libs/gdk-pixbuf[tiff]
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/media-gfx/simple-scan/Manifest b/media-gfx/simple-scan/Manifest
index 539a65cc8868..50e1a17cce1f 100644
--- a/media-gfx/simple-scan/Manifest
+++ b/media-gfx/simple-scan/Manifest
@@ -1,7 +1,4 @@
-AUX 40.0-add-control-optional-deps.patch 2713 BLAKE2B 594f076b9515697322711033a206eb6aa7ab8940c6d4ef5711af4bdaaa126b82738b2d300d97843a9c889c314d16873ea05ecb07e0c566e8a273289fc799f8aa SHA512 60bdf1653292f5e2b3ef435c35c81a5eb2963142ea14e2095c5c5673d776979053c65ef0e54f80b503489dcc6e93d1a2ab8d29711059c469ecebcb83ece5e42c
 AUX 46.0-add-control-optional-deps.patch 2715 BLAKE2B eb9e97a8bf052b218d414b1378ea075195a5d5222dd93227b445659a5edb2e2283b6934448c0bf13127cfb01b0298d22b259d9159353d95bdcfe80952da2465f SHA512 bad7f4e2722910fa8eec59c61b6fd2302cc6bd0bb31511fed619cb797c559c01a50dbf99a4981be2eda912be027d89d422e4ebc2ed5763cedd8981ebdbb0a257
-DIST simple-scan-44.0.tar.xz 1198824 BLAKE2B 2bc9ea19a99b02d6acdb21036558bd2d42751699a89d41ec4da3336c061ecc7ad249b34ab0b30c6a6fc162fb7f6538859d1c29b2c9a843f2c2a8785dadc8a086 SHA512 8543b687eafec4f2460efa446146b4fe3a0ad469e5dcc5fcd19a02484cbfac5bce80741b488217af44c580720a01577a8e78479a4d2e96307da3de9dcfa467c6
 DIST simple-scan-46.0.tar.xz 1136672 BLAKE2B 0ee2dd5392ed1a888948183e9efbd8943287baad66dd45351cbbb32a9a4c17903415676b3e6e00203d8a3572e90397b51bc23ecec2ad6cfa6597a10ffdd5bcf4 SHA512 f7c4433536f59c71f066cdae51b0de1b0dcf9b8af00f3bedb4c1be281d09f9ce122666ed849bd88de8868042429f14bb7b01409f8a006360ce4285000fd30bdc
-EBUILD simple-scan-44.0.ebuild 1371 BLAKE2B 73e325ad1d13050f6cb8994a651953f621371a11fa326ec90d4df661009819c0f28e61cbe02b3c00a9ba140d374950d78b4bb94b69e462ada1fe56dab236213d SHA512 60b1ecddb04e51f99888e7bd7cc93363054ede33e18a31975545707b1dd800ef77b147e97dfae565e7c39bf982910a025ba3af623f0040b35ff7c361be81855c
-EBUILD simple-scan-46.0.ebuild 1382 BLAKE2B ede05d3eb421012626e78a7e2edbbebe78773630af0e06b47c335a19469a8c3a2208eba9e6ee012582d05656a5913420ac37666ff332d9790919e0a8c8e22c2e SHA512 3dbf173a758e79464b2c9d01c85d81c1759fbdbc36017f4d8f6b3b1b83251d6cae797b8aa4566a09cc9f98ef778e8c19876e94f8b5863ca318d92f1ab09c56e3
+EBUILD simple-scan-46.0.ebuild 1380 BLAKE2B d421fe6684a3b908795357e14e85177a89bc03ab8a492b029e420a87237f0c6a1f76a468ab4cb0abad9564a0ecae578272b0110b53a8e912a19048fc90a00e3a SHA512 e20cca21c88fb21122d30cb96764a74df6c2d136f6bc9760ab01220b83e7db049d2693d10a9c482b4c862bf9bbcfa50511da759c2a27bb90fc6ff1bff1d0d156
 MISC metadata.xml 646 BLAKE2B d894b0b617db9d06a787e5d1c4b8d44dd1bb7c528f1498e9ce6044b7a4e015857eb9e227257abfbdb05e628c18da4e194f3a87750969ebc2735e1715036c596a SHA512 596b4b58bbdc0c82db3f961fb21c65b2af83949195873e37f65f383d8be562e499816a76303f24d82499e4db0f4825e17c0472153f827cfd334167c23cc46df5
diff --git a/media-gfx/simple-scan/files/40.0-add-control-optional-deps.patch b/media-gfx/simple-scan/files/40.0-add-control-optional-deps.patch
deleted file mode 100644
index 5ea8f56323fa..000000000000
--- a/media-gfx/simple-scan/files/40.0-add-control-optional-deps.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From a5f01beb41a81f483d90eb4dd785822a8615f65f Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Wed, 30 May 2018 08:44:18 +0200
-Subject: [PATCH] build: Add control for optional dependencies
-
----
- meson.build       | 18 ++++++++++++++----
- meson_options.txt |  3 +++
- src/meson.build   | 12 ++++++++----
- 3 files changed, 25 insertions(+), 8 deletions(-)
- create mode 100644 meson_options.txt
-
-diff --git a/meson.build b/meson.build
-index 1e1522c..45d7ed7 100644
---- a/meson.build
-+++ b/meson.build
-@@ -34,10 +34,20 @@ zlib_dep = dependency ('zlib')
- cairo_dep = dependency ('cairo')
- gdk_pixbuf_dep = dependency ('gdk-pixbuf-2.0')
- gusb_dep = dependency ('gusb', version: '>= 0.2.7')
--colord_dep = dependency ('colord', required: false)
--packagekit_dep = dependency ('packagekit-glib2', version: '>= 1.1.5', required: false)
--webp_dep = dependency ('libwebp', required: false)
--webpmux_dep = dependency ('libwebpmux', required: false)
-+
-+if get_option('colord')
-+    colord_dep = dependency ('colord')
-+endif
-+
-+if get_option('packagekit')
-+    packagekit_dep = dependency ('packagekit-glib2', version: '>= 1.1.5')
-+endif
-+
-+if get_option('webp')
-+    webp_dep = dependency ('libwebp')
-+    webpmux_dep = dependency ('libwebpmux')
-+endif
-+
- sane_dep = dependency ('sane-backends')
- msgfmt = find_program  ('msgfmt')
- itstool = find_program  ('itstool')
-diff --git a/meson_options.txt b/meson_options.txt
-new file mode 100644
-index 0000000..570ecdd
---- /dev/null
-+++ b/meson_options.txt
-@@ -0,0 +1,3 @@
-+option('colord', type: 'boolean', value: false)
-+option('packagekit', type: 'boolean', value: false)
-+option('webp', type: 'boolean', value: false)
-diff --git a/src/meson.build b/src/meson.build
-index 3f699eb..0c8965e 100644
---- a/src/meson.build
-+++ b/src/meson.build
-@@ -1,16 +1,20 @@
- vala_args = [ '--pkg=posix', '--vapidir=' + meson.current_source_dir () ]
- dependencies = [ glib_dep, gtk_dep, libhandy_dep, zlib_dep, cairo_dep, gdk_pixbuf_dep, gusb_dep, sane_dep ]
--if colord_dep.found ()
-+if get_option('colord')
-     vala_args += [ '-D', 'HAVE_COLORD' ]
-     dependencies += colord_dep
- endif
--if packagekit_dep.found ()
-+if get_option('packagekit')
-     vala_args += [ '-D', 'HAVE_PACKAGEKIT' ]
-     dependencies += packagekit_dep
- endif
--if webp_dep.found () and (not colord_dep.found () or webpmux_dep.found ()) # Webpmux only required if colord
-+if get_option('webp')
-     vala_args += [ '-D', 'HAVE_WEBP' ]
--    dependencies += [ webp_dep, webpmux_dep ]
-+    dependencies += [ webp_dep ]
-+    # Webpmux only required if colord
-+    if get_option('colord')
-+        dependencies += [ webpmux_dep ]
-+    endif
- endif
- 
- simple_scan = executable ('simple-scan',
--- 
-2.26.3
-
diff --git a/media-gfx/simple-scan/simple-scan-44.0.ebuild b/media-gfx/simple-scan/simple-scan-44.0.ebuild
deleted file mode 100644
index 153058476d65..000000000000
--- a/media-gfx/simple-scan/simple-scan-44.0.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{9..11} )
-inherit gnome.org gnome2-utils meson python-any-r1 vala xdg
-
-DESCRIPTION="Simple document scanning utility"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/simple-scan"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 ~riscv x86"
-IUSE="colord webp"
-
-DEPEND="
-	>=dev-libs/glib-2.38:2
-	>=x11-libs/gtk+-3.24:3
-	>=gui-libs/libhandy-1.6.0:1
-	>=sys-libs/zlib-1.2.3.1:=
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	>=dev-libs/libgusb-0.2.7
-	colord? ( >=x11-misc/colord-0.1.24:=[udev(+)] )
-	webp? ( media-libs/libwebp:= )
-	>=media-gfx/sane-backends-1.0.20
-"
-RDEPEND="${DEPEND}
-	x11-misc/xdg-utils
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	$(vala_depend)
-	dev-libs/libxml2:2
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	gui-libs/libhandy:1[vala]
-	dev-libs/libgusb[vala]
-	colord? ( x11-misc/colord[vala] )
-"
-
-PATCHES=(
-	# Add control for optional dependencies
-	"${FILESDIR}"/40.0-add-control-optional-deps.patch
-)
-
-src_prepare() {
-	default
-	vala_setup
-	xdg_environment_reset
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use colord)
-		-Dpackagekit=false
-		$(meson_use webp)
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/media-gfx/simple-scan/simple-scan-46.0.ebuild b/media-gfx/simple-scan/simple-scan-46.0.ebuild
index 765098e7a253..8476bab6e786 100644
--- a/media-gfx/simple-scan/simple-scan-46.0.ebuild
+++ b/media-gfx/simple-scan/simple-scan-46.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/simple-scan"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 ~riscv x86"
 IUSE="colord webp"
 
 DEPEND="
@@ -35,7 +35,7 @@ BDEPEND="
 	dev-util/itstool
 	>=sys-devel/gettext-0.19.8
 	virtual/pkgconfig
-	gui-libs/libhandy:1[vala]
+	gui-libs/libadwaita:1[vala]
 	dev-libs/libgusb[vala]
 	colord? ( x11-misc/colord[vala] )
 "
diff --git a/media-gfx/skanpage/Manifest b/media-gfx/skanpage/Manifest
index 968522ce401b..6e3c1afec9a8 100644
--- a/media-gfx/skanpage/Manifest
+++ b/media-gfx/skanpage/Manifest
@@ -1,5 +1,5 @@
-DIST skanpage-23.08.5.tar.xz 1317292 BLAKE2B 2ee8e7db4e08c9f6ecac93789b20fcb862f56da8d44d5540268dd71f5e1e79c93c7d67455c534f2b0a50f4f2f99bcfdc1989dfd6ecafb7bd3c5a7bc15ab8880d SHA512 d5ddd8a52ad42421d79a6817eb3430996a9d968b2f824ca3c5adaf9bef69c60f6270b72a9d87308834b79f3038b6347b242c8fa635fd8c28953533061e21d158
-DIST skanpage-24.04.90.tar.xz 1331856 BLAKE2B 9774ea6d2688a287247917a5a46e2644d18f44a7cb0b2c9507620a671cf30c7ec15bb6693cd09b02b25ed3dbfc09915760eb3876e0e34413f686c395fdbfa580 SHA512 89f1c28a9a0fba138635d9487237bfcc051c2cbf3ebfdcbd42b3ca8aea65cee03c469badf476ab89b2e5a3fa0ccdbed577ad028f1f23ec66cf591fd5cddaae0e
-EBUILD skanpage-23.08.5.ebuild 1383 BLAKE2B 2b2d5cf4582e9d1e4897b1aeb8c8c3b4fa91b753293eb8886c881bb150186a83df2946e8e278f102baf03005b7ae3c8edf9dd8cd7363545fbad33d3f80e04abc SHA512 c0fab6531ac492693bead97c2b231b2379490bb4de55bb05d4df4650599d15a9602521fe03f0afc1dd64b72ac2bdd362a492838bfb690e6adc57fe2a9321701b
-EBUILD skanpage-24.04.90.ebuild 1233 BLAKE2B 5cfe97b4474dc4399a2aba88361ff7c506278473753607804446db67646f3543ffdeee7f035303eaf7ac65c0aa5b4c2af67472c286c3057f1be51dee62d86eea SHA512 868902d4fa8a5294e0ac005c60905f6e9a4545e1cc8799f2e002b8187810e6a5e1c4c148222fa4afb81dd25120f640479373437233cc2eb138b527f948ac12ed
+DIST skanpage-24.05.2.tar.xz 1332884 BLAKE2B 11d66fec7f13a658d652ca2c70d7f46e50d6c965903573ecfd9ffb4d259c7dd4fc9d2155297c9ffff928ae3c22d67b5642f8c4a31852b1b3f582675bcbb8459b SHA512 aa5dcde24a72332986ca68fbb457097ba08fae04c186654094dbff2ebd0f9b22688370f8a87eed54f0e16265a42adb297d189856a276d8cf56227b90dd7c6ab8
+DIST skanpage-24.08.1.tar.xz 1333944 BLAKE2B f811d82efdc3ed3ee3ef317dd78956bbcb054aea4908e28a49f0f258df59cfe8538425df07e73c86283a4027ae5c88e3b6a15e6fa6fd0a2a9ab4f3e108e46bb7 SHA512 bf97c4a3029b666fcfed40a4747350cc523bd969f938e9b031bb1700f19dd058c9a79131c581645656d50a55e7f42f4119393f37c02a49a6f67133a46cdb8a1d
+EBUILD skanpage-24.05.2.ebuild 1238 BLAKE2B 8606f527b934653bacfe697ce5ac498c587a07a8fa3911c870a88112fb66d75be5f3ac88d21026142b95f6b974756848e4e2584cc1da36dc467c00fc8c02c3ee SHA512 a217155d141343a2a14a52eeae3a11acd96112e98bb19ab3451cf164388f149b6602da32cbc8ae5507a8e24bce478a19995315e066388d73f509661c969f0d44
+EBUILD skanpage-24.08.1.ebuild 1240 BLAKE2B 9f3818d5d7a5fe493fc9846f21a524f876805bb14b4b97286795cd5c7c487acc22dc7a0a51b1b913126c5208fc9420029a929a395ecd95c0c4c216a84133f336 SHA512 52e1a0269cd9b483e1a02015793065d06a1ad5e9259f5d15d8ff770de71e256f8a0dbc90426d72c337c1860c44f3008e90ff0641ee451131b64092d1389e24bd
 MISC metadata.xml 374 BLAKE2B 3666d82bcae95e5b38d777c81491cc25488aff6b55e112f6eebbaf80ef603d40e8287fe33d649e647c2f97b9caca237f2b9785ee49ff9c2f5c81576a2cf33379 SHA512 fcc360165d6fa100c9d92c2528f4f2ba291a0bf6b05a7b252b5bb215514144e9b699915f98d7aecda6869bf50bfbb51b42b3186679e5db2c3901cb4d6151e6e8
diff --git a/media-gfx/skanpage/skanpage-23.08.5.ebuild b/media-gfx/skanpage/skanpage-23.08.5.ebuild
deleted file mode 100644
index e03bdc71cba1..000000000000
--- a/media-gfx/skanpage/skanpage-23.08.5.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KDE_ORG_CATEGORY="utilities"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.106.0
-QTMIN=5.15.9
-inherit ecm gear.kde.org
-
-DESCRIPTION="Multi-page scanning application supporting image and pdf files"
-HOMEPAGE="https://apps.kde.org/skanpage/"
-
-LICENSE="|| ( GPL-2 GPL-3 ) CC0-1.0"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
-IUSE="ocr"
-
-DEPEND="
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/libksane-${PVCUT}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/purpose-${KFMIN}:5
-	media-libs/kquickimageeditor:5
-	>=media-libs/ksanecore-${PVCUT}:5
-	ocr? (
-		app-text/tesseract:=
-		media-libs/leptonica:=
-	)
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package ocr Tesseract)
-		$(cmake_use_find_package ocr Leptonica)
-	)
-	ecm_src_configure
-}
diff --git a/media-gfx/skanpage/skanpage-24.04.90.ebuild b/media-gfx/skanpage/skanpage-24.05.2.ebuild
index 3a2f60a0cff1..d19cdc047d27 100644
--- a/media-gfx/skanpage/skanpage-24.04.90.ebuild
+++ b/media-gfx/skanpage/skanpage-24.05.2.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 KDE_ORG_CATEGORY="utilities"
 PVCUT=$(ver_cut 1-3)
-KFMIN=6.0.0
+KFMIN=6.3.0
 QTMIN=6.6.2
 inherit ecm gear.kde.org
 
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/skanpage/"
 
 LICENSE="|| ( GPL-2 GPL-3 ) CC0-1.0"
 SLOT="6"
-KEYWORDS="~amd64"
+KEYWORDS="amd64 arm64"
 IUSE="ocr"
 
 DEPEND="
diff --git a/media-gfx/skanpage/skanpage-24.08.1.ebuild b/media-gfx/skanpage/skanpage-24.08.1.ebuild
new file mode 100644
index 000000000000..73a1e52e8c7c
--- /dev/null
+++ b/media-gfx/skanpage/skanpage-24.08.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_CATEGORY="utilities"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.5.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Multi-page scanning application supporting image and pdf files"
+HOMEPAGE="https://apps.kde.org/skanpage/"
+
+LICENSE="|| ( GPL-2 GPL-3 ) CC0-1.0"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64"
+IUSE="ocr"
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[concurrent,gui,network,widgets]
+	>=dev-qt/qtdeclarative-${QTMIN}:6
+	>=dev-qt/qtwebengine-${QTMIN}:6[pdfium]
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kirigami-${KFMIN}:6
+	>=kde-frameworks/kjobwidgets-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	>=kde-frameworks/purpose-${KFMIN}:6
+	media-libs/kquickimageeditor:6
+	>=media-libs/ksanecore-${PVCUT}:6
+	ocr? (
+		>=app-text/tesseract-5:=
+		media-libs/leptonica:=
+	)
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package ocr Tesseract)
+		$(cmake_use_find_package ocr Leptonica)
+	)
+	ecm_src_configure
+}
diff --git a/media-gfx/solvespace/Manifest b/media-gfx/solvespace/Manifest
index a69269d86d32..5f162ed9dbba 100644
--- a/media-gfx/solvespace/Manifest
+++ b/media-gfx/solvespace/Manifest
@@ -2,5 +2,5 @@ AUX solvespace-3.1-use-system-mimalloc.patch 1330 BLAKE2B c7e1c4d58f8739a7d15fe5
 DIST libdxfrw-0.6.3-0b7b7b709d9299565db603f878214656ef5e9ddf.tar.gz 691804 BLAKE2B 84c90a591fac71144e9e13aace7c1a00dfc1bd6f27b0bcde6b60541f5b5d3ccc04ae1c759f60cb467445cc884840d04bf4613b5cc553fbbf6951cac33a084d50 SHA512 9ab498aa7f369be79d800e8ca5ec55fa54be79d0778937b81d4c8da776b3419cb8a75400b54b205efc338da32e2e781afd0bed1bd8efed1a0b212dc8682a2615
 DIST mimalloc-2.0.6-f819dbb4e4813fab464aee16770f39f11476bfea.tar.gz 1129745 BLAKE2B 95ea6e64afaa6931e18a22db45ba39d554917e109028adb624120442329bb458d24d7f22a233931c5e15b8b0ce4cc5130b0d4cba0db270a9c84453afd70c33e9 SHA512 b02a76d8a7668a4d3dc8c761473f609060b834761918b58d2143d54dbeb4c342e213010f9402d1c55035b04860936c2f8df73b84e111f5e90b3d58db62c5f85f
 DIST solvespace-3.1.tar.gz 2764243 BLAKE2B 764637f84a187c6a86cf65cd672466f48e1e5abd9d335945fc47f2ea48f7d22a94f6840a6019f2380e8416e903bb55f97d9adb18fa6f2e7a94933c2a5b51ef6c SHA512 76794c4b103036f423471c72209521c273b40edcf9a725d2407e757b8dded033863f58640f1bcdf19d7dd1b296334f8745a632875e06604fa4d5b261dd23ba98
-EBUILD solvespace-3.1-r1.ebuild 2739 BLAKE2B e6cbd0798e4c7ebf2a2b96ee6d9312aaeb2e110364b4f5dc32daa9b3f654c9f77fff28018ea86f1d375831e26f1c2339e73a724a3b61e2da0fa50ededdfc661b SHA512 ddfa091c1723dc00db0abab5fb131ae06171deb2dcc06e176b22a93f94cd457c9e5dca442a2b94f5c9a0f849ac7d6da15555ed5e74d1e67a11c82d160e879e0d
-MISC metadata.xml 1256 BLAKE2B 9d5213ff5f2f484ab96cb7c1fca7c756fce7f7d35a536ccfa28e5d73560b018e22ec22d25d9bf36cf4f463553b3da55a99baf9e1e15cb7f75d11dd2befd5498f SHA512 0fba9cc8899227f1aa955b7380b32580a4fbbdbcca31ea674c2fd31bd6115be41edaf3201c2a043934e19e4df3d44828ec9127ee559768487e9769bb26e953ce
+EBUILD solvespace-3.1-r1.ebuild 2746 BLAKE2B 7eb5e28d8cc0a9cc778ea38bd87cfc769f33de55fa0ab4b78f8a654b3c54b228665adcdb65918d9c50a27987a0b2a6a75148e8d48237e9807d0a35dd12788301 SHA512 a316385d9b04b3940ba2c321942fdd10df473b4139efd6d2bb2c0150c44ab2128ff2478a53a6218ddc5858a172bd8b333c4108334adeb6380f442c5bcc702f55
+MISC metadata.xml 1161 BLAKE2B a31bf29efca503f51e0fb30b38b7249d172b0b0f478b48faa1b6887b354df073b7b88dc6d5840435cdba2a4f1611289ab66f590c7386ea419c8d579cf7e8cd37 SHA512 2aa8e3ef5f579f2e43a11f6a268670f75cb30c4c9f9274c6d0aab53b9105a1795d11977bfeedfefa547ab641fe36bcbca935f6fb9066398dcc900d630d6197bc
diff --git a/media-gfx/solvespace/metadata.xml b/media-gfx/solvespace/metadata.xml
index b332c7ef66f6..2cfadb10cbd2 100644
--- a/media-gfx/solvespace/metadata.xml
+++ b/media-gfx/solvespace/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <maintainer type="person">
-        <email>matthew@gentoo.org</email>
-        <name>Matthew Smith</name>
-    </maintainer>
+    <!-- maintainer-needed -->
     <longdescription lang="en">
     Solvespace is a parametric 2D/3D CAD tool. Applications include:
     - modeling 3d parts — draw with extrudes, revolves, and Boolean (union / difference) operations
diff --git a/media-gfx/solvespace/solvespace-3.1-r1.ebuild b/media-gfx/solvespace/solvespace-3.1-r1.ebuild
index 06cc74938497..c7343757219f 100644
--- a/media-gfx/solvespace/solvespace-3.1-r1.ebuild
+++ b/media-gfx/solvespace/solvespace-3.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -30,7 +30,7 @@ SRC_URI="https://github.com/solvespace/solvespace/archive/v${PV}.tar.gz -> ${P}.
 # + mimalloc (MIT)
 
 IUSE="openmp +system-mimalloc"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 LICENSE="BitstreamVera GPL-2+ GPL-3+ !system-mimalloc? ( MIT )"
 SLOT="0"
 
diff --git a/media-gfx/springgraph/Manifest b/media-gfx/springgraph/Manifest
index 1833d7de48c2..9d9d68cb1317 100644
--- a/media-gfx/springgraph/Manifest
+++ b/media-gfx/springgraph/Manifest
@@ -1,4 +1,4 @@
 DIST springgraph.pl.88 29818 BLAKE2B d203bce543b0d6d8bd8519a24c3592a852971fb18219b0b34dd207724ed1db2859befcd6f69d7b00e2c6492fdabd5a8edf75bee634682f0a56a5361c9e832651 SHA512 51d7a840778478498c23d61af7e0ef0bd795953110850d0a1ec403146ce843c6eb5efa5c0c55d84a9995aecadf7657bc253dbf5a72354207d38a6e269b2f1325
 DIST springgraph_0.82-5.diff.gz 3110 BLAKE2B 8459ffffe80cba463e95677ed264030ff150375bf2a163c081e719274b0f92cba27e5d8e5bc80923e433f332ee58773a7cbd053fc9680676193e7b852b4803bb SHA512 dcfc214c116cc8040b7eedf9a4864e84bc7c0b1f036fafb6322d9433564762135d1e845bb75891a380907059f7ebba7ed72efafb733a83a517f14af327d32e9b
-EBUILD springgraph-88.ebuild 779 BLAKE2B 1814bec470e2038af556776c8b8a57c9e813b683297e79d7de87e2856f476860e792fb44796615f7747a4fa0ed68faccfd682a7bc259738c592daa6922c652fc SHA512 8b9a238b766743d59002e059ef859a80a9270547c9f2b893b5615c2f151a4ea14c25758bd0112b0b17adcd7c52d8a939d671786a20686b0500f8470b4628d6fc
+EBUILD springgraph-88.ebuild 773 BLAKE2B 1c2ecd132b183ff8079b41aa00e53facd5cfa1108f01b9adc3b1c1a467e647c54f94da7104c9c86c26ad01d3da062fb82ba04b281bf7bd9b674ec1611fb94dd0 SHA512 3b9e0dc599d1d1bf0c9af10086ccea9acabdc6bba2247917c9428f0fd9e8bfcae377eaa921394d87f115ad55ec5ecc1221836af8456c9353f7298764f0c6389c
 MISC metadata.xml 710 BLAKE2B fa3b8384f430ae86afa1ca8b33907b5214a530364e49620ee80effc6c9b174db71b3d5617c37246982e8d20ef96f3885a75dfae65b4f8ec7bab8889197460d5e SHA512 1a6b997e402c4b39377fa903f67256770f11ef07c1c8948b08576f0f8774d5b9684cfd9a4f99318f6a1309b4f6d9a39953587f6e222aa78fc10e9b9584a5ebb4
diff --git a/media-gfx/springgraph/springgraph-88.ebuild b/media-gfx/springgraph/springgraph-88.ebuild
index eb82210357fa..0247f2081e93 100644
--- a/media-gfx/springgraph/springgraph-88.ebuild
+++ b/media-gfx/springgraph/springgraph-88.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://www.chaosreigns.com/code/springgraph/dl/${PN}.pl.${PV}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 RDEPEND="dev-perl/GD"
diff --git a/media-gfx/superslicer/Manifest b/media-gfx/superslicer/Manifest
index 510268033bd0..d12265639493 100644
--- a/media-gfx/superslicer/Manifest
+++ b/media-gfx/superslicer/Manifest
@@ -1,11 +1,5 @@
-AUX superslicer-2.5.59.0-boost-1.81-std-wxString-to-std-wstring.patch 2581 BLAKE2B 8c2ec83db05e97949aa9fb43d3980748be1324cb2ac90c8caec45b772fb2bad34f56365381bb371d0094079b42065a65c00595388ec861e127b846e6859a0281 SHA512 6f454745d8f84dbcded092a1a16b2903757b36d76888a4c40e1f019f75ba6bea9b245c980347cc7feb0a9bdd22e8eb4e4b12e639594f1fe6e928eea5298081ec
-AUX superslicer-2.5.59.0-boost.patch 9423 BLAKE2B 8e797ed961fe2c1c8f0b5e67b6aaee8efa17933cecd190b1623e7df4f2724edb4e1c6559a839c4dc1d3b67f8f9db080476640e48187a03ec0541114863cdffc6 SHA512 f72eb91230c0e3aa2254533e5377a6aedcd806529c0cf3795eee883d4b8aaf6c618c7f2e064e80de3f688bf9f2a97d913e72d0b1c227d64caa7585cad1c97a84
-AUX superslicer-2.5.59.0-cereal.patch 1974 BLAKE2B b28be995a1c258c1848ad78a00061c73ccb173da0f790573273123f8f1481131a75ec3fb84fd8cee26dc7cef750650c827b39b685343d9defd44edec48e698a6 SHA512 50510b349f43354da7a5712d662b94a0276081c9af28d04b8d63885ed0053b52522b686ecfffa45d0b197097ee7c08ea1c831f0995a337c44becd453c392a539
-AUX superslicer-2.5.59.0-dont-install-bundled-angelscript.patch 1671 BLAKE2B 211bbd88a3db29312bfd1b0a7fac23ade2fb1e38c99cd1c7125e2c5d5fda46adc2cb232345085783e37404c6fbc10cb831196b546ca3a76f4d59d8095f254f54 SHA512 a206103eac2969e68540d564149e843a24a16445b6157fc3409ff1c577657d35ef05493259e3fc3615d641eaad96832231aa969c53eaac87e11d1b365ffd99b1
-AUX superslicer-2.5.59.0-fix-gcodeviewer-symlink.patch 690 BLAKE2B 410f71260334643bf53c0095d59f1090d8c7619502a32e319a6beb3f23937edd7d1c07eeab0fa9d332b8151b32605c8711492bf66b43c2fd64c85e19e54edaef SHA512 122d52d1f43aaedeee8d0ce56c5daef22f904de03101669fb9a870c18d1ea73615c2ec37da3de65f1f8d2a7455517111f75aeaadd60f66c82edebf288bc4767f
-AUX superslicer-2.5.59.0-missing-includes.patch 1225 BLAKE2B 0d9cfbd9dfaf6e066a4206ff7bfa88cfe92c96e102ac2105a4a4fb5288b15a878969bcd00719d89a917fd3216b42aaba3688b6ad8a6b597eeed58d4c6a26de05 SHA512 cee42f67820a0fb98f1bdbbdf160bafcfaf1d1f87dbf85dc73781e8911b4ee76697996bdc23b9acc2c502701053587ce3d9a71d301ccb2bf9ee27e010a8bd855
-AUX superslicer-2.5.59.0-openexr3.patch 2361 BLAKE2B d351d05190977e55047504d13ab4172c7eaf7fb2077a61a448dd29a8a27084ee4b13284143102b7ea3dff0edc8b20675dff0014e9f26cd5f448e50c04a1d6779 SHA512 840e51b8feb3568ff46d309ece063f7188018fcaa43d19ec50ede408fdf2c237a3b7eaa11ba24409d8c3f7d6f5fb270181508cc56e0b2b0fef68b766130ef1eb
-AUX superslicer-2.5.59.0-wxgtk3-wayland.patch 489 BLAKE2B d801db8b71aff816c3703628beb2e90d06ec4d85b982cd137e005eb4542aae308140c21b3b6fb1c72c07dd3e90e38668d6c2a69df054bdd414c43b9f8fcea57f SHA512 495d8d62c8cdf4ff9a075366dbc2db5c80a1c99bcd23172db9cf64dd649d70acbca44182722a71d790feb84c9a67a81403d75ff33b77444a1251b1f45f7b4b9e
+AUX superslicer-2.5.59.10-boost-1.85.patch 2693 BLAKE2B eb434eedc4b1188c1e8df875d8f57ba9f3c9a6ea88521f5707c47e16b23e7939b9382dc416d023293642a3e5af6317e51058adf691cd2201b92ea8f390b60ca8 SHA512 c94ef6475a3dd81bfbfe80f44b571094476b21725b496fe5b26d81d55aa987953f9c642c0275260f9f149d1a6b85addf5b750ff4a306d555c324304055a4375b
+AUX superslicer-2.5.59.10-boost-headers.patch 1561 BLAKE2B 9e8fd0003bf95786dfffc5a7d9da4fba997ebe8cffe204dd7ebc6b2c4a887f80d909f76c6686b4c0ae73278e17df45db53725dffa6f44cfcff3f7a15029ec722 SHA512 2df7c4f05847b3b5422fff517dfbbfb17f58da4c03c6224d7c23e07ff1939bc75819d3cf03e237f221a1f83322f73779cea03ffd8b25dad2a274be7c32e48508
 AUX superslicer-2.5.59.2-boost.patch 12899 BLAKE2B 53cfab69e12af506c276fcc34851c62deba2c4ef5682176977ed1b07a60c1967264f56752f0c286aeb059fa7924272fa5d837c8c2add768590dd9604444705fe SHA512 798a275a6b310e6fa16e630a841fc3198fc287fa1ac9de0fc70a41effadd30b10887fed969ab59e73993c9ca1830ac1a8e633bbeaf0560a9225d0c5f1b00eab3
 AUX superslicer-2.5.59.2-cereal.patch 1807 BLAKE2B 0ab8eb8e7f283e09e19c55d95bd6fe874797cc3d67f153a7c3920e1ff02e3b974c64f0dfc510b0cf3dde2484eeb00f550eab636e304bb6ba3c76b066bf537caf SHA512 503d3e8483315affb77f9bf9299e529455b73484cb278eda413a7e17f27f687b24158210b2fbf50581a970821930511934c994fa70c2ef8b68702f7614528d38
 AUX superslicer-2.5.59.2-dont-install-angelscript.patch 427 BLAKE2B 8f853d1c8c861bcb18e3272467c5a4ca745b67790d88be9943d4cf92f1f5dfdd3b4e022ba697c90997ead2c8ad77debf7ea96fc262a21caa2087cd7b62901bdb SHA512 c4a718ead714b9d2a22cff7e9a48846954f9606290ad533c0e491429b3455f43dee7a10a93a34f564e03e9e3b2eeef87d8276f6062d770f57afef27a7fbdb868
@@ -17,10 +11,18 @@ AUX superslicer-2.5.59.2-missing-includes-fix.patch 3042 BLAKE2B bc0d9e39abd204f
 AUX superslicer-2.5.59.2-openexr3.patch 2357 BLAKE2B 0d8c889817aaa7ddcdfd9ee434a668ce56b8c6906d61e73f118d8d37ef6a86d1315191956316e7d459629a9e60291ff86f0915bc5a877722ff99f8ce55af0351 SHA512 d3516333ce841b75c4da4f178e6e099b18fe64254484c286ad5b71d284407aa2e9cd4187b4c192b7ff3557170c0cee818d252b1c11e6b09263f9c2dc216e8aeb
 AUX superslicer-2.5.59.2-relax-OpenCASCADE-dep.patch 384 BLAKE2B 25be6671e091d04dca0896448786d90a36e4b6ae5c9b31c8a249aa226788f338f0e40c9a8f849e7a731ce0ba1e5e531dd314138d6c5295d64067cecd9e0be6de SHA512 57a42c6936b369ebadcefb91da32125d265a763f073d7e8d0209a87481c057066848799bac998a83ab4aacdbe4da01fa4d721794d982d52d2f5cda1df59d47b5
 AUX superslicer-2.5.59.2-wxgtk3-wayland-fix.patch 485 BLAKE2B 4bd5634f39ba6132bb4216807fef254a88f07f5eb1162de12589c22b038c2876185a801ed481738d9fbbb04796952d304f17010fd61eb347213b649b13f3064d SHA512 4867192b069829ff0fd3d2bf86e2117979e505f4764223f7d0b874c15fad9cffca58d8e55a518a56cf156fee2187040115866a10e92aa903e87dc6ec909d0339
-DIST superslicer-2.5.59.0-profiles.tar.gz 15322406 BLAKE2B cfa89697e832e0601746cb21250e258617bcc0966dd111c82ae43a9720b3ffb760f57827a1f35c8ad57a23a7ffb4c78e48ec76d6e40b364f321d0f83c4d10939 SHA512 bbdc6bfa8e21a4bdbca903a367f033f9cb5a1966bd0688bcc81314ba9ee45fee37cb892c82be35e865137c4df7c1fabceb8e6de46316338df2af4a590de91c76
-DIST superslicer-2.5.59.0.tar.gz 45360646 BLAKE2B da65610270ed4c7d55b5bc495d9970812af94f424345088782b3a45b97fcf0f4b58bdc0417b89ed49e21d8c250535baa7cb74344f43438fbde8daf1b3acfacdd SHA512 1d2c0316c91bf0d65fb366806e9ea868bc93fae33deb580a324ce065fd3789ff1b600e9ace400db4988b371b1c36ef0c3ea2b52cde0d48984f312dd8d7ef3a1c
+AUX superslicer-2.5.59.8-additional-imports-fixes.patch 3266 BLAKE2B 9016a6baa5c97681b0caadbffb6b2a890f9f69083ccf6201e9945ca1b3ff3aebb04b4eab1b94bc2f69b6e21d212281e0a2d0aeaa26b3fc3ecc0afbaa2db845f1 SHA512 8ae0692cd708cb14e268f10740629c9a69fad5ddce1d2c11bc73cccceb4ec91a5a9dc508deb78743828ea366ef8924e149306ce3674c55074b86800cc25c575a
+AUX superslicer-2.5.59.8-boost-replace-load-string-file.patch 1753 BLAKE2B 009f44faffbe83ea15d029e4f36bfe0182c13df1bd80c4732f3f9460046c5ac38a77bf8a6294c70931aaab55f95ca554838a8f17b8983ccd7bc9e1e6553bff67 SHA512 5b61c2de780b645237e5fa9018667d94e90cde3f1d5a6c6c29db96bede7cfd023f8ca272f0172b859914b6bec0fe5b4e6013512fff1a54b7975f1b2a93a42ef6
+AUX superslicer-2.5.59.8-fix-compilation-error-gnu17.patch 812 BLAKE2B b9348bfc8ba5b9c63e269b453d39f3b56de7b1c62f5dd8ad376a6fb0abe7c520cb13c3befdd18521f4abfe4cb1eccae574f9d80ae355236733b8f0e683db5a95 SHA512 bbb36ed9572f2422c69be356b8f62531f4dabe0d9a731dff0697a0358d6bc4846dbe854c4e044ca06ba0ee6f87c2f80cb137ecf27f59d11cff829791376c9508
+AUX superslicer-2.5.59.8-libnest2d-link-xcb.patch 678 BLAKE2B 7e6328a9058206d325c77a73d7621dffe3a92c187e9d27d8173e2f0f77211fba3a87421f3827124cfe819649afbba4e5767df6636bd0b70c84f12e785e5879a9 SHA512 d6152f9465e752e0f88bd69c4cfe0b39cbd6df05f27df7b98b174bf8100b93f69feb7ba00086f67b4962a3a544bd91dcafa24679286318f9abe5609454c2eb43
+DIST superslicer-2.5.59.10-profiles.tar.gz 17933533 BLAKE2B d11e8660a9c04221ece8352695a78b302d0d934fca4cc26c17b44ba74d99271aa2f0088de4f36f718827f22073f5bdd90d1163c44d0fe0139b73e55929019ec8 SHA512 43dfe882fb52840abdcbc6c3c4441f7a02b2f21bfa986594e2c6399823508433a29d7372cdf28dab442ae831c0b89d1792e349944e797c899aaffeaf6b738ad6
+DIST superslicer-2.5.59.10.tar.gz 46034708 BLAKE2B 7d30b7e365d336725606f298b0b8ecbf56170e822c8d00a323d45bdf93ae399fb0a312e542ebde51642b7404820604338bd3606add60aad5c3e492e73ef5a28f SHA512 44f46a739f8e1769dd1883dd8ff88c6b3f0efbea2abcf9281cca22e48693ca8643a911c24325f0b8df7c66e3d32ad2e51854f09a67a4f2738ce0673c19485f1b
 DIST superslicer-2.5.59.2-profiles.tar.gz 16253775 BLAKE2B 20c99b14ba8ee26ea2a210962e78ea21928a5f32b1e799cbdbe60a3ef587ae1368efce885f5d253468ee9974af6a4419890e56d7df33761732bcefe8dbbc019e SHA512 c20ec66a95d5ec3e1e4fd8b1936bf1a4fc32fbad2c3d78774d5c2480be8a9dcacba5e561c57774a2c761d5189466083e7b6bd9b021a4ca7676e6a5e9676439d7
 DIST superslicer-2.5.59.2.tar.gz 45622782 BLAKE2B ff2fecf233d2710d706b64eb2191bfac39df3f631634de5f9eb1bca6ca712e94b0283beb7c6e9f3b293dc308b50240871ef8651a5355a4d7c5ea6092ac1a836b SHA512 af8878bd8e0c3e0dd5247ce01bdbd2b42b6766d81efbde11b71c6642787a12dfeaea91e653ac928066b9610cd911ea1f4dc77cf4823639030b3c104d955b8cbd
-EBUILD superslicer-2.5.59.0-r3.ebuild 2294 BLAKE2B f7bbe1b0cfeeaf1b95495b8cdbbc128786286a430d6d5908f8abca08c08788443ae274b2d181e63d67b5c65f9cb2e799681f5dd44ef912a63dcdb5420154941a SHA512 b8f7563a780dd62255abc62fb88df9a7fa0547fd0acbbc1c5b603f5236175027e0d6291f15d8d8dcf1a86e21a7bf26e1f54b2b04b57dc5add23c2e4c42cb8724
+DIST superslicer-2.5.59.8-profiles.tar.gz 17931886 BLAKE2B 953a777dd12971c355a5f48148d4c3831b9435cf08f1baecb32ff0ef6245678f81c53bf5078cc4d6d04642e9ee18e1023d5d1578ebdf1384c7c1ce44a1153c50 SHA512 2e4561de7c57308a91c8964c8a957bc10c5e4cedc47c5fc37633bbcf78e3576ed1eaa6d7126485e94eb0aa593940c73a460f3d5ad65f33001d32953caa2fb4e1
+DIST superslicer-2.5.59.8.tar.gz 46021260 BLAKE2B 04abffd1a9cdf417d544539d5cde9b3559f2da7c1cb24cfa0e4a5d11359bca53cb25a90a3a14b26ee10e33e283ba4774d404265e6740b5457f82110be2a44af9 SHA512 57ef6c129c24378d6f4f78d34a60ed15668a8c5c266fa706937edebbd7b52d145657aae1e46a7b1d19dabaf403465bc5af50a94fa70205456bfc87a1458bac6e
+EBUILD superslicer-2.5.59.10-r1.ebuild 2799 BLAKE2B 568bbab777f09dc266e9c6ecf9d40d908d1346c41520d58c5133e315bd1b282875645af2a73172a0cf9e376ae903e7d66597005a486b451a21a9e44a2adb254d SHA512 11e0a7f449fe51e3bae7108c3773e2acf31ae67827934e87126cf2355262ee5fec307d4ef842c640a381311c60449d83bba97b5ecad0752b2d9698d617d2b58b
+EBUILD superslicer-2.5.59.10.ebuild 2748 BLAKE2B b6865b9c9d61b0a5afd49b1632488cc9983c169af5b7ded19bcf3c146bd1870fbc940c699005e9777793d3c759ad517f7e103eded6f4b6350768929d298356ac SHA512 dd31e1a229973bc91fabf18a415a111859c230888477223a3d6df19c79fed1b06fbca9245e0eac549beffbcc6a27123f7e2b0e1831c1a23e737f0aedbc4d9f1e
 EBUILD superslicer-2.5.59.2-r2.ebuild 2490 BLAKE2B 5f1775a715b74a581daec55361e3c0b813d09e6e46fb47c27e680f0f739a822c9669fe7dc0e49b35365f78bde93ae5f112446580c058f56f17297d4e010f1f2b SHA512 febd71376f386a2c6b6cbd2f39b7f58e86f607475d33c9792bf099f195a1c6a0971b24b76dff8615e1bce2713c334ba702b78bff0e810dce5db85fbf5a464704
+EBUILD superslicer-2.5.59.8.ebuild 2743 BLAKE2B 6a7842738221df57aa1ea8e0682c50252e044e74bf90d69dc894d3bc92586c7e9520bc429cac3d1e53907cef3a3f56311f0f454f41fed4c915463a412ad8878f SHA512 d5ef833bd7a87d177df2cf99ec6ad5b5eb31e61e4babc315020d602b8eac5aabfa0c5d70f22de86f186cf1c3efd935629166695533939c8d33861b9faf22463f
 MISC metadata.xml 413 BLAKE2B a43550366844e53b0ebed37197d33bf38efb555eee344f053f90e35e939263e3959301fdd072d5b6925d1e3e0d1fd629e2f459356e2f227006f8784a4364fc11 SHA512 8e1abc223f2e24cca551b08cbc37910f2a43319fce7299e52dd586dd6454c83e98e59b8d14c18613c8894fdca33d04297affa2da1f4aa001a5e200e4b5f2c331
diff --git a/media-gfx/superslicer/files/superslicer-2.5.59.0-boost-1.81-std-wxString-to-std-wstring.patch b/media-gfx/superslicer/files/superslicer-2.5.59.0-boost-1.81-std-wxString-to-std-wstring.patch
deleted file mode 100644
index 1cb0d9f1afff..000000000000
--- a/media-gfx/superslicer/files/superslicer-2.5.59.0-boost-1.81-std-wxString-to-std-wstring.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- a/src/slic3r/GUI/PrintHostDialogs.cpp	2022-12-21 10:21:43.583075853 +1100
-+++ b/src/slic3r/GUI/PrintHostDialogs.cpp	2022-12-21 10:23:03.902694287 +1100
-@@ -79,8 +79,8 @@ PrintHostSendDialog::PrintHostSendDialog
-     if (size_t extension_start = recent_path.find_last_of('.'); extension_start != std::string::npos)
-         m_valid_suffix = recent_path.substr(extension_start);
-     // .gcode suffix control
--    auto validate_path = [this](const wxString &path) -> bool {
--        if (! path.Lower().EndsWith(m_valid_suffix.Lower())) {
-+    auto validate_path = [this](const std::wstring &path) -> bool {
-+        if (! wxString(path).Lower().EndsWith(m_valid_suffix.Lower())) {
-             MessageDialog msg_wingow(this, wxString::Format(_L("Upload filename doesn't end with \"%s\". Do you wish to continue?"), m_valid_suffix), wxString(SLIC3R_APP_NAME), wxYES | wxNO);
-             if (msg_wingow.ShowModal() == wxID_NO)
-                 return false;
-@@ -90,7 +90,7 @@ PrintHostSendDialog::PrintHostSendDialog
- 
-     auto* btn_ok = add_button(wxID_OK, true, _L("Upload"));
-     btn_ok->Bind(wxEVT_BUTTON, [this, validate_path](wxCommandEvent&) {
--        if (validate_path(txt_filename->GetValue())) {
-+        if (validate_path(txt_filename->GetValue().ToStdWstring())) {
-             post_upload_action = PrintHostPostUploadAction::None;
-             EndDialog(wxID_OK);
-         }
-@@ -100,7 +100,7 @@ PrintHostSendDialog::PrintHostSendDialog
-     if (post_actions.has(PrintHostPostUploadAction::StartPrint)) {
-         auto* btn_print = add_button(wxID_YES, false, _L("Upload and Print"));
-         btn_print->Bind(wxEVT_BUTTON, [this, validate_path](wxCommandEvent&) {
--            if (validate_path(txt_filename->GetValue())) {
-+            if (validate_path(txt_filename->GetValue().ToStdWstring())) {
-                 post_upload_action = PrintHostPostUploadAction::StartPrint;
-                 EndDialog(wxID_OK);
-             }
-@@ -111,7 +111,7 @@ PrintHostSendDialog::PrintHostSendDialog
-         // Using wxID_MORE as a button identifier to be different from the other buttons, wxID_MORE has no other meaning here.
-         auto* btn_simulate = add_button(wxID_MORE, false, _L("Upload and Simulate"));
-         btn_simulate->Bind(wxEVT_BUTTON, [this, validate_path](wxCommandEvent&) {
--            if (validate_path(txt_filename->GetValue())) {
-+            if (validate_path(txt_filename->GetValue().ToStdWstring())) {
-                 post_upload_action = PrintHostPostUploadAction::StartSimulation;
-                 EndDialog(wxID_OK);
-             }        
diff --git a/media-gfx/superslicer/files/superslicer-2.5.59.0-boost.patch b/media-gfx/superslicer/files/superslicer-2.5.59.0-boost.patch
deleted file mode 100644
index 4f847aaacb92..000000000000
--- a/media-gfx/superslicer/files/superslicer-2.5.59.0-boost.patch
+++ /dev/null
@@ -1,256 +0,0 @@
-diff --git a/src/hints/HintsToPot.cpp b/src/hints/HintsToPot.cpp
-index 7c8029cde..4791f0612 100644
---- a/src/hints/HintsToPot.cpp
-+++ b/src/hints/HintsToPot.cpp
-@@ -9,7 +9,7 @@
- 
- bool write_to_pot(boost::filesystem::path path, const std::vector<std::pair<std::string, std::string>>& data)
- {
--	boost::filesystem::ofstream file(std::move(path), std::ios_base::app);
-+	boost::nowide::ofstream file(path.string(), std::ios_base::app);
- 	for (const auto& element : data)
- 	{
- 		//Example of .pot element 
-diff --git a/src/libslic3r/AppConfig.cpp b/src/libslic3r/AppConfig.cpp
-index f029b3d72..18dc7396e 100644
---- a/src/libslic3r/AppConfig.cpp
-+++ b/src/libslic3r/AppConfig.cpp
-@@ -1,3 +1,4 @@
-+#include <boost/filesystem.hpp>
- #include "libslic3r/libslic3r.h"
- #include "libslic3r/Utils.hpp"
- #include "AppConfig.hpp"
-diff --git a/src/libslic3r/AppConfig.hpp b/src/libslic3r/AppConfig.hpp
-index d811ddcc2..1a7023061 100644
---- a/src/libslic3r/AppConfig.hpp
-+++ b/src/libslic3r/AppConfig.hpp
-@@ -5,6 +5,7 @@
- #include <map>
- #include <string>
- 
-+#include <boost/filesystem/path.hpp>
- #include <boost/algorithm/string/trim_all.hpp>
- 
- #include "libslic3r/Config.hpp"
-diff --git a/src/libslic3r/LocalesUtils.cpp b/src/libslic3r/LocalesUtils.cpp
-index 5bf520568..7b870520b 100644
---- a/src/libslic3r/LocalesUtils.cpp
-+++ b/src/libslic3r/LocalesUtils.cpp
-@@ -1,3 +1,4 @@
-+#include <boost/lexical_cast.hpp>
- #include "LocalesUtils.hpp"
- 
- #ifdef _WIN32
-diff --git a/src/libslic3r/Preset.cpp b/src/libslic3r/Preset.cpp
-index 9e9fcda4f..d889e2abf 100644
---- a/src/libslic3r/Preset.cpp
-+++ b/src/libslic3r/Preset.cpp
-@@ -84,7 +84,7 @@ ConfigFileType guess_config_file_type(const ptree &tree)
- VendorProfile VendorProfile::from_ini(const boost::filesystem::path &path, bool load_all)
- {
-     ptree tree;
--    boost::filesystem::ifstream ifs(path);
-+    boost::nowide::ifstream ifs(path.string());
-     boost::property_tree::read_ini(ifs, tree);
-     return VendorProfile::from_ini(tree, path, load_all);
- }
-diff --git a/src/libslic3r/Utils.hpp b/src/libslic3r/Utils.hpp
-index f525c9837..839f0f5e9 100644
---- a/src/libslic3r/Utils.hpp
-+++ b/src/libslic3r/Utils.hpp
-@@ -7,6 +7,7 @@
- #include <type_traits>
- #include <system_error>
- 
-+#include <boost/filesystem.hpp>
- #include <boost/system/error_code.hpp>
- 
- #include "libslic3r.h"
-diff --git a/src/slic3r/GUI/CreateMMUTiledCanvas.cpp b/src/slic3r/GUI/CreateMMUTiledCanvas.cpp
-index 89212f27f..be157eafa 100644
---- a/src/slic3r/GUI/CreateMMUTiledCanvas.cpp
-+++ b/src/slic3r/GUI/CreateMMUTiledCanvas.cpp
-@@ -18,6 +18,11 @@
- #include <wx/notebook.h>
- #include "Notebook.hpp"
- 
-+#include <boost/filesystem.hpp>
-+#include <boost/property_tree/ptree.hpp>
-+#include <boost/property_tree/ini_parser.hpp>
-+#include <boost/log/trivial.hpp>
-+
- #include "MainFrame.hpp"
- #include "wxExtensions.hpp"
- 
-diff --git a/src/slic3r/GUI/DesktopIntegrationDialog.cpp b/src/slic3r/GUI/DesktopIntegrationDialog.cpp
-index fcb7472e6..866ebaef5 100644
---- a/src/slic3r/GUI/DesktopIntegrationDialog.cpp
-+++ b/src/slic3r/GUI/DesktopIntegrationDialog.cpp
-@@ -14,6 +14,7 @@
- #include <boost/log/trivial.hpp>
- #include <boost/dll/runtime_symbol_info.hpp>
- #include <boost/algorithm/string/replace.hpp>
-+#include <boost/nowide/fstream.hpp>
- 
- #include <wx/filename.h>
- #include <wx/stattext.h>
-@@ -503,4 +504,4 @@ DesktopIntegrationDialog::~DesktopIntegrationDialog()
- 
- } // namespace GUI
- } // namespace Slic3r
--#endif // __linux__
-\ No newline at end of file
-+#endif // __linux__
-diff --git a/src/slic3r/GUI/FreeCADDialog.cpp b/src/slic3r/GUI/FreeCADDialog.cpp
-index 271e3ef2d..6bbdf3907 100644
---- a/src/slic3r/GUI/FreeCADDialog.cpp
-+++ b/src/slic3r/GUI/FreeCADDialog.cpp
-@@ -38,6 +38,7 @@
- #include <boost/log/trivial.hpp>
- #include <boost/property_tree/ptree.hpp>
- #include <boost/property_tree/json_parser.hpp>
-+#include <boost/nowide/fstream.hpp>
- 
- // hack for process.hpp : it uses pid_t to set it as alias of int, but vc_x64_lib (wx thingy) as a '#define pid_t int'
- // and so boost/process has a line 'typedef int int'instead of 'typedef int pid_t' that makes it crash
-@@ -322,7 +323,7 @@ bool FreeCADDialog::load_text_from_file(const boost::filesystem::path &path) {
-         try {
-             std::locale loc = boost::locale::generator()("en_US.UTF-8");
-             // Open the stream to 'lock' the file.
--            boost::filesystem::ifstream in;
-+            boost::nowide::ifstream in;
-             in.imbue(loc);
-             in.open(path);
-             // Obtain the size of the file.
-@@ -369,7 +370,7 @@ bool FreeCADDialog::write_text_in_file(const wxString &towrite, const boost::fil
-         boost::filesystem::create_directories(file.parent_path());
-         std::locale loc = boost::locale::generator()("en_US.UTF-8");
-         // Open the stream to 'lock' the file.
--        boost::filesystem::ofstream out;
-+        boost::nowide::ofstream out;
-         out.imbue(loc);
-         out.open(file);
-         out << towrite;
-diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp
-index 4cf21a36c..75b2a8e94 100644
---- a/src/slic3r/GUI/GUI_App.cpp
-+++ b/src/slic3r/GUI/GUI_App.cpp
-@@ -19,6 +19,7 @@
- #include <boost/lexical_cast.hpp>
- #include <boost/log/trivial.hpp>
- #include <boost/nowide/convert.hpp>
-+#include <boost/nowide/fstream.hpp>
- 
- #include <wx/stdpaths.h>
- #include <wx/imagpng.h>
-diff --git a/src/slic3r/GUI/HintNotification.cpp b/src/slic3r/GUI/HintNotification.cpp
-index 32916303f..3a984bf38 100644
---- a/src/slic3r/GUI/HintNotification.cpp
-+++ b/src/slic3r/GUI/HintNotification.cpp
-@@ -14,12 +14,14 @@
- #include "libslic3r/Config.hpp"
- #include "libslic3r/PrintConfig.hpp"
- 
-+#include <map>
-+
- #include <boost/algorithm/string/replace.hpp>
- #include <boost/filesystem.hpp>
- #include <boost/nowide/fstream.hpp>
- #include <boost/log/trivial.hpp>
- #include <boost/property_tree/ini_parser.hpp>
--#include <map>
-+
- #include <cereal/archives/binary.hpp>
- #include <cereal/types/string.hpp>
- #include <cereal/types/vector.hpp>
-@@ -65,7 +67,7 @@ inline void push_style_color(ImGuiCol idx, const ImVec4& col, bool fading_out, f
- 
- void write_used_binary(const std::vector<std::string>& ids)
- {
--	boost::filesystem::ofstream file((boost::filesystem::path(data_dir()) / "cache" / "hints.cereal"), std::ios::binary);
-+	boost::nowide::ofstream file((boost::filesystem::path(data_dir()) / "cache" / "hints.cereal").string(), std::ios::binary);
- 	cereal::BinaryOutputArchive archive(file);
- 		HintsCerealData cd { ids };
- 	try
-@@ -84,7 +86,7 @@ void read_used_binary(std::vector<std::string>& ids)
- 		BOOST_LOG_TRIVIAL(warning) << "Failed to load to hints.cereal. File does not exists. " << path.string();
- 		return;
- 	}
--	boost::filesystem::ifstream file(path);
-+	boost::nowide::ifstream file(path.string());
- 	cereal::BinaryInputArchive archive(file);
- 	HintsCerealData cd;
- 	try
-diff --git a/src/slic3r/GUI/Preferences.cpp b/src/slic3r/GUI/Preferences.cpp
-index ffc600b0e..c8080d112 100644
---- a/src/slic3r/GUI/Preferences.cpp
-+++ b/src/slic3r/GUI/Preferences.cpp
-@@ -12,6 +12,7 @@
- #include "OG_CustomCtrl.hpp"
- #include "wxExtensions.hpp"
- 
-+#include <boost/algorithm/string/split.hpp>
- #include <boost/filesystem.hpp>
- #include <boost/filesystem/path.hpp>
- 
-diff --git a/src/slic3r/GUI/ScriptExecutor.cpp b/src/slic3r/GUI/ScriptExecutor.cpp
-index 4565d1aec..6738cada9 100644
---- a/src/slic3r/GUI/ScriptExecutor.cpp
-+++ b/src/slic3r/GUI/ScriptExecutor.cpp
-@@ -4,6 +4,13 @@
- #include "Tab.hpp"
- #include "libslic3r/PresetBundle.hpp"
- #include "libslic3r/Print.hpp"
-+#include <boost/log/trivial.hpp>
-+#include <boost/lexical_cast.hpp>
-+#include <boost/algorithm/string/trim_all.hpp>
-+#include <boost/algorithm/string/erase.hpp>
-+#include <boost/algorithm/string/split.hpp>
-+#include <boost/filesystem.hpp>
-+#include <boost/filesystem/string_file.hpp>
- 
- #include <string>
- 
-diff --git a/src/slic3r/GUI/Tab.cpp b/src/slic3r/GUI/Tab.cpp
-index 173f0f762..a3eb553c8 100644
---- a/src/slic3r/GUI/Tab.cpp
-+++ b/src/slic3r/GUI/Tab.cpp
-@@ -36,6 +36,8 @@
- #include <boost/filesystem.hpp>
- #include <boost/filesystem/path.hpp>
- #include <boost/lexical_cast.hpp>
-+#include <boost/nowide/fstream.hpp>
-+#include <boost/log/trivial.hpp>
- 
- #include "wxExtensions.hpp"
- #include "PresetComboBoxes.hpp"
-@@ -1692,7 +1694,7 @@ std::vector<Slic3r::GUI::PageShp> Tab::create_pages(std::string setting_type_nam
- 
-     //read file
-     //std::ifstream filestream(ui_layout_file.c_str());
--    boost::filesystem::ifstream filestream(ui_layout_file);
-+    boost::nowide::ifstream filestream(ui_layout_file);
-     std::string full_line;
-     while (std::getline(filestream, full_line)) {
-         //remove spaces
-diff --git a/src/slic3r/Utils/Http.cpp b/src/slic3r/Utils/Http.cpp
-index 9bab91860..47568721a 100644
---- a/src/slic3r/Utils/Http.cpp
-+++ b/src/slic3r/Utils/Http.cpp
-@@ -11,6 +11,7 @@
- #include <boost/filesystem.hpp>
- #include <boost/format.hpp>
- #include <boost/log/trivial.hpp>
-+#include <boost/nowide/fstream.hpp>
- 
- #include <curl/curl.h>
- 
-@@ -52,7 +53,7 @@ namespace Slic3r {
- 						% error;
- 			})
- 			.on_complete([&](std::string body, unsigned /* http_status */) {
--				boost::filesystem::fstream file(tmp_path, std::ios::out | std::ios::binary | std::ios::trunc);
-+				boost::nowide::fstream file(tmp_path, std::ios::out | std::ios::binary | std::ios::trunc);
- 				file.write(body.c_str(), body.size());
- 				file.close();
- 				boost::filesystem::rename(tmp_path, target_path);
diff --git a/media-gfx/superslicer/files/superslicer-2.5.59.0-cereal.patch b/media-gfx/superslicer/files/superslicer-2.5.59.0-cereal.patch
deleted file mode 100644
index 6557d6653640..000000000000
--- a/media-gfx/superslicer/files/superslicer-2.5.59.0-cereal.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 549d06f0d..bffb63d9b 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -496,6 +496,9 @@ endif ()
- 
- # Find the Cereal serialization library
- find_package(cereal REQUIRED)
-+if (NOT TARGET cereal::cereal)
-+    add_library(cereal::cereal ALIAS cereal)
-+endif ()
- 
- # l10n
- set(L10N_DIR "${SLIC3R_RESOURCES_DIR}/localization")
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index ec44417fa..9aae6dc11 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -141,7 +141,7 @@ if (NOT WIN32)
-     set_target_properties(Slic3r PROPERTIES OUTPUT_NAME "${SLIC3R_APP_CMD}")
- endif ()
- 
--target_link_libraries(Slic3r libslic3r cereal)
-+target_link_libraries(Slic3r libslic3r cereal::cereal)
- if (APPLE)
- #    add_compile_options(-stdlib=libc++)
- #    add_definitions(-DBOOST_THREAD_DONT_USE_CHRONO -DBOOST_NO_CXX11_RVALUE_REFERENCES -DBOOST_THREAD_USES_MOVE)
-diff --git a/src/libslic3r/CMakeLists.txt b/src/libslic3r/CMakeLists.txt
-index c8f22a482..832149338 100644
---- a/src/libslic3r/CMakeLists.txt
-+++ b/src/libslic3r/CMakeLists.txt
-@@ -399,7 +399,7 @@ target_include_directories(libslic3r PUBLIC ${EXPAT_INCLUDE_DIRS})
- target_link_libraries(libslic3r
-     libnest2d
-     admesh
--    cereal
-+    cereal::cereal
-     libigl
-     miniz
-     boost_libs
-diff --git a/src/slic3r/CMakeLists.txt b/src/slic3r/CMakeLists.txt
-index f71b809b3..c64a2c5a9 100644
---- a/src/slic3r/CMakeLists.txt
-+++ b/src/slic3r/CMakeLists.txt
-@@ -302,7 +302,7 @@ target_compile_definitions(libslic3r_gui PRIVATE $<$<BOOL:${SLIC3R_ALPHA}>:SLIC3
- 
- encoding_check(libslic3r_gui)
- 
--target_link_libraries(libslic3r_gui libslic3r avrdude cereal imgui GLEW::GLEW OpenGL::GL hidapi exif angelscript libcurl ${wxWidgets_LIBRARIES})
-+target_link_libraries(libslic3r_gui libslic3r avrdude cereal::cereal imgui GLEW::GLEW OpenGL::GL hidapi exif angelscript libcurl ${wxWidgets_LIBRARIES})
- 
- if (MSVC)
-     target_link_libraries(libslic3r_gui Setupapi.lib)
diff --git a/media-gfx/superslicer/files/superslicer-2.5.59.0-dont-install-bundled-angelscript.patch b/media-gfx/superslicer/files/superslicer-2.5.59.0-dont-install-bundled-angelscript.patch
deleted file mode 100644
index 603a96ac67a5..000000000000
--- a/media-gfx/superslicer/files/superslicer-2.5.59.0-dont-install-bundled-angelscript.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-diff --git a/src/angelscript/CMakeLists.txt b/src/angelscript/CMakeLists.txt
-index fed80a0ad..a65d9f8d5 100644
---- a/src/angelscript/CMakeLists.txt
-+++ b/src/angelscript/CMakeLists.txt
-@@ -202,48 +202,3 @@ endif()
- 
- # Don't override the default runtime output path to avoid conflicts when building for multiple target platforms
- #set(RUNTIME_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/bin)
--
--#See https://cmake.org/cmake/help/latest/manual/cmake-packages.7.html#creating-packages for a detailed explanation about this part
--install(TARGETS ${ANGELSCRIPT_LIBRARY_NAME} EXPORT AngelscriptTargets
--	RUNTIME DESTINATION bin
--	LIBRARY DESTINATION lib
--	ARCHIVE DESTINATION lib
--	INCLUDES DESTINATION include
--)
--
--install(FILES
--	${CMAKE_CURRENT_SOURCE_DIR}/include/angelscript.h
--	DESTINATION include
--	COMPONENT Devel
--)
--
--include(CMakePackageConfigHelpers)
--write_basic_package_version_file(
--	"${CMAKE_CURRENT_BINARY_DIR}/Angelscript/AngelscriptConfigVersion.cmake"
--	VERSION ${PROJECT_VERSION}
--	COMPATIBILITY AnyNewerVersion
--)
--
--export(EXPORT AngelscriptTargets
--	FILE "${CMAKE_CURRENT_BINARY_DIR}/Angelscript/AngelscriptTargets.cmake"
--	NAMESPACE Angelscript::
--)
--configure_file(cmake/AngelscriptConfig.cmake
--	"${CMAKE_CURRENT_BINARY_DIR}/Angelscript/AngelscriptConfig.cmake"
--	COPYONLY
--)
--
--set(ConfigPackageLocation lib/cmake/Angelscript)
--install(EXPORT AngelscriptTargets
--	FILE AngelscriptTargets.cmake
--	NAMESPACE Angelscript::
--	DESTINATION ${ConfigPackageLocation}
--)
--install(
--	FILES
--		cmake/AngelscriptConfig.cmake
--		"${CMAKE_CURRENT_BINARY_DIR}/Angelscript/AngelscriptConfigVersion.cmake"
--	DESTINATION ${ConfigPackageLocation}
--	COMPONENT Devel
--)
--
diff --git a/media-gfx/superslicer/files/superslicer-2.5.59.0-fix-gcodeviewer-symlink.patch b/media-gfx/superslicer/files/superslicer-2.5.59.0-fix-gcodeviewer-symlink.patch
deleted file mode 100644
index 5a5c9960cc00..000000000000
--- a/media-gfx/superslicer/files/superslicer-2.5.59.0-fix-gcodeviewer-symlink.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 9aae6dc11..75835903e 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -299,5 +299,5 @@ else ()
-     install(TARGETS Slic3r RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")
- 
-     # Install the symlink for gcodeviewer
--    install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink slic3r ${GCODEVIEWER_APP_CMD} WORKING_DIRECTORY \$ENV{DESTDIR}/${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR})")
-+    install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink ${SLIC3R_APP_CMD} ${GCODEVIEWER_APP_CMD} WORKING_DIRECTORY \$ENV{DESTDIR}/${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR})")
- endif ()
diff --git a/media-gfx/superslicer/files/superslicer-2.5.59.0-missing-includes.patch b/media-gfx/superslicer/files/superslicer-2.5.59.0-missing-includes.patch
deleted file mode 100644
index 27f29fa9f6f1..000000000000
--- a/media-gfx/superslicer/files/superslicer-2.5.59.0-missing-includes.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git a/src/libslic3r/AppConfig.cpp b/src/libslic3r/AppConfig.cpp
-index 18dc7396e..95483e844 100644
---- a/src/libslic3r/AppConfig.cpp
-+++ b/src/libslic3r/AppConfig.cpp
-@@ -1,6 +1,7 @@
- #include <boost/filesystem.hpp>
- #include "libslic3r/libslic3r.h"
- #include "libslic3r/Utils.hpp"
-+#include "libslic3r/I18N.hpp"
- #include "AppConfig.hpp"
- #include "Exception.hpp"
- #include "LocalesUtils.hpp"
-diff --git a/src/libslic3r/PerimeterGenerator.hpp b/src/libslic3r/PerimeterGenerator.hpp
-index d7401f3fb..a95b7749d 100644
---- a/src/libslic3r/PerimeterGenerator.hpp
-+++ b/src/libslic3r/PerimeterGenerator.hpp
-@@ -1,6 +1,7 @@
- #ifndef slic3r_PerimeterGenerator_hpp_
- #define slic3r_PerimeterGenerator_hpp_
- 
-+#include "ClipperUtils.hpp"
- #include "libslic3r.h"
- #include <vector>
- #include "ExPolygonCollection.hpp"
-diff --git a/src/slic3r/GUI/CreateMMUTiledCanvas.cpp b/src/slic3r/GUI/CreateMMUTiledCanvas.cpp
-index be157eafa..d63eb110e 100644
---- a/src/slic3r/GUI/CreateMMUTiledCanvas.cpp
-+++ b/src/slic3r/GUI/CreateMMUTiledCanvas.cpp
-@@ -40,6 +40,7 @@
- #include <wx/odcombo.h>
- #include <wx/textctrl.h>
- #include <wx/wrapsizer.h>
-+#include <wx/rawbmp.h>
- #include "wxExtensions.hpp"
- 
- #include <boost/filesystem/path.hpp>
diff --git a/media-gfx/superslicer/files/superslicer-2.5.59.0-openexr3.patch b/media-gfx/superslicer/files/superslicer-2.5.59.0-openexr3.patch
deleted file mode 100644
index 8ae71c13f4d3..000000000000
--- a/media-gfx/superslicer/files/superslicer-2.5.59.0-openexr3.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-diff --git a/cmake/modules/FindOpenVDB.cmake b/cmake/modules/FindOpenVDB.cmake
-index 4fde5fa4a..566e73a5e 100644
---- a/cmake/modules/FindOpenVDB.cmake
-+++ b/cmake/modules/FindOpenVDB.cmake
-@@ -347,28 +347,10 @@ macro(just_fail msg)
-   return()
- endmacro()
- 
--find_package(IlmBase QUIET)
--if(NOT IlmBase_FOUND)
--  pkg_check_modules(IlmBase QUIET IlmBase)
--endif()
--if (IlmBase_FOUND AND NOT TARGET IlmBase::Half)
--  message(STATUS "Falling back to IlmBase found by pkg-config...")
--
--  find_library(IlmHalf_LIBRARY NAMES Half)
--  if(IlmHalf_LIBRARY-NOTFOUND OR NOT IlmBase_INCLUDE_DIRS)
--    just_fail("IlmBase::Half can not be found!")
--  endif()
--  
--  add_library(IlmBase::Half UNKNOWN IMPORTED)
--  set_target_properties(IlmBase::Half PROPERTIES
--    IMPORTED_LOCATION "${IlmHalf_LIBRARY}"
--    INTERFACE_INCLUDE_DIRECTORIES "${IlmBase_INCLUDE_DIRS}")
--elseif(NOT IlmBase_FOUND)
--  just_fail("IlmBase::Half can not be found!")
--endif()
- find_package(TBB ${_quiet} ${_required} COMPONENTS tbb)
- find_package(ZLIB ${_quiet} ${_required})
- find_package(Boost ${_quiet} ${_required} COMPONENTS iostreams system )
-+find_package(Imath CONFIG)
- 
- # Use GetPrerequisites to see which libraries this OpenVDB lib has linked to
- # which we can query for optional deps. This basically runs ldd/otoll/objdump
-@@ -419,7 +401,7 @@ foreach(PREREQUISITE ${_OPENVDB_PREREQUISITE_LIST})
-     set(OpenVDB_USES_LOG4CPLUS ON)
-   endif()
- 
--  string(FIND ${PREREQUISITE} "IlmImf" _HAS_DEP)
-+  string(FIND ${PREREQUISITE} "OpenEXR" _HAS_DEP)
-   if(NOT ${_HAS_DEP} EQUAL -1)
-     set(OpenVDB_USES_ILM ON)
-   endif()
-@@ -450,11 +432,7 @@ if(OpenVDB_USES_LOG4CPLUS)
-   find_package(Log4cplus ${_quiet} ${_required})
- endif()
- 
--if(OpenVDB_USES_ILM)
--  find_package(IlmBase ${_quiet} ${_required})
--endif()
--
--if(OpenVDB_USES_EXR)
-+if(OpenVDB_USES_ILM OR OpenVDB_USES_EXR)
-   find_package(OpenEXR ${_quiet} ${_required})
- endif()
- 
-@@ -471,7 +449,7 @@ endif()
- set(_OPENVDB_VISIBLE_DEPENDENCIES
-   Boost::iostreams
-   Boost::system
--  IlmBase::Half
-+  Imath::Imath
- )
- 
- set(_OPENVDB_DEFINITIONS)
-@@ -481,10 +459,7 @@ endif()
- 
- if(OpenVDB_USES_EXR)
-   list(APPEND _OPENVDB_VISIBLE_DEPENDENCIES
--    IlmBase::IlmThread
--    IlmBase::Iex
--    IlmBase::Imath
--    OpenEXR::IlmImf
-+    OpenEXR::OpenEXR
-   )
-   list(APPEND _OPENVDB_DEFINITIONS "-DOPENVDB_TOOLS_RAYTRACER_USE_EXR")
- endif()
diff --git a/media-gfx/superslicer/files/superslicer-2.5.59.0-wxgtk3-wayland.patch b/media-gfx/superslicer/files/superslicer-2.5.59.0-wxgtk3-wayland.patch
deleted file mode 100644
index abe4d7bf60cc..000000000000
--- a/media-gfx/superslicer/files/superslicer-2.5.59.0-wxgtk3-wayland.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/src/slic3r/GUI/GUI.cpp b/src/slic3r/GUI/GUI.cpp
-index ccd3cc083..be8bbe5cd 100644
---- a/src/slic3r/GUI/GUI.cpp
-+++ b/src/slic3r/GUI/GUI.cpp
-@@ -33,6 +33,16 @@ class AppConfig;
- 
- namespace GUI {
- 
-+// wxgtk3 is broken on wayland: https://trac.wxwidgets.org/ticket/17702
-+#ifdef __WXGTK3__
-+struct ForceX11 {
-+    ForceX11() {
-+        setenv("GDK_BACKEND", "x11", 1);
-+    }
-+};
-+static struct ForceX11 forcex11;
-+#endif
-+
- #if __APPLE__
- IOPMAssertionID assertionID;
- #endif
diff --git a/media-gfx/superslicer/files/superslicer-2.5.59.10-boost-1.85.patch b/media-gfx/superslicer/files/superslicer-2.5.59.10-boost-1.85.patch
new file mode 100644
index 000000000000..8d9f11d3897d
--- /dev/null
+++ b/media-gfx/superslicer/files/superslicer-2.5.59.10-boost-1.85.patch
@@ -0,0 +1,54 @@
+https://bugs.gentoo.org/936144
+https://github.com/supermerill/SuperSlicer/commit/75d4bee84740a8dcc9e4e2113795fd67107d03d1
+
+From 75d4bee84740a8dcc9e4e2113795fd67107d03d1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Hejl?= <hejl.lukas@gmail.com>
+Date: Wed, 3 Jan 2024 23:55:02 +0100
+Subject: [PATCH] Replace some deprecated boost functions.
+
+Actually, all those deprecated functions were internally called those new functions. So there isn't any risk to use them directly.
+---
+ src/libslic3r/PrintBase.cpp              | 2 +-
+ src/libslic3r/utils.cpp                  | 2 +-
+ src/slic3r/GUI/RemovableDriveManager.cpp | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/libslic3r/PrintBase.cpp b/src/libslic3r/PrintBase.cpp
+index 29bdc1301d0..60e40644cb8 100644
+--- a/src/libslic3r/PrintBase.cpp
++++ b/src/libslic3r/PrintBase.cpp
+@@ -123,7 +123,7 @@ std::string PrintBase::output_filename(const std::string &format, const std::str
+             filepath = filename + extension;
+         }
+         if (filepath.extension().empty())
+-            filepath = boost::filesystem::change_extension(filepath, default_ext);
++            filepath.replace_extension(default_ext);
+         return filepath.string();
+     } catch (std::runtime_error &err) {
+         throw Slic3r::PlaceholderParserError(L("Failed processing of the output_filename_format template.") + "\n" + err.what());
+diff --git a/src/libslic3r/utils.cpp b/src/libslic3r/utils.cpp
+index 71089ceea64..6eac962b20e 100644
+--- a/src/libslic3r/utils.cpp
++++ b/src/libslic3r/utils.cpp
+@@ -836,7 +836,7 @@ CopyFileResult copy_file_inner(const boost::filesystem::path& source, const boos
+ 	// That may happen when copying on some exotic file system, for example Linux on Chrome.
+ 	copy_file_linux(source, target, ec);
+ #else // __linux__
+-	boost::filesystem::copy_file(source, target, boost::filesystem::copy_option::overwrite_if_exists, ec);
++	boost::filesystem::copy_file(source, target, boost::filesystem::copy_options::overwrite_existing, ec);
+ #endif // __linux__
+ 	if (ec) {
+ 		error_message = ec.message();
+diff --git a/src/slic3r/GUI/RemovableDriveManager.cpp b/src/slic3r/GUI/RemovableDriveManager.cpp
+index 5fb8b013210..2f8ac96a1a2 100644
+--- a/src/slic3r/GUI/RemovableDriveManager.cpp
++++ b/src/slic3r/GUI/RemovableDriveManager.cpp
+@@ -202,7 +202,7 @@ namespace search_for_drives_internal
+ 				stat(path.c_str(), &buf);
+ 				uid_t uid = buf.st_uid;
+ 				if (getuid() == uid)
+-					out.emplace_back(DriveData{ boost::filesystem::basename(boost::filesystem::path(path)), path });
++                    out.emplace_back(DriveData{ boost::filesystem::path(path).stem().string(), path });
+ 			}
+ 		}
+ 	}
diff --git a/media-gfx/superslicer/files/superslicer-2.5.59.10-boost-headers.patch b/media-gfx/superslicer/files/superslicer-2.5.59.10-boost-headers.patch
new file mode 100644
index 000000000000..b6689d9a298e
--- /dev/null
+++ b/media-gfx/superslicer/files/superslicer-2.5.59.10-boost-headers.patch
@@ -0,0 +1,45 @@
+https://bugs.gentoo.org/936146
+--- a/src/slic3r/GUI/GLTexture.cpp	2024-08-10 11:05:17.663411745 +0100
++++ b/src/slic3r/GUI/GLTexture.cpp	2024-08-10 11:05:34.463543701 +0100
+@@ -10,6 +10,8 @@
+ 
+ #include <boost/filesystem.hpp>
+ #include <boost/algorithm/string/predicate.hpp>
++#include <boost/log/trivial.hpp>
++#include <boost/log/core.hpp>
+ 
+ #include <vector>
+ #include <algorithm>
+--- a/src/slic3r/GUI/RemovableDriveManager.cpp	2024-08-10 11:24:53.572234573 +0100
++++ b/src/slic3r/GUI/RemovableDriveManager.cpp	2024-08-10 11:28:24.393792051 +0100
+@@ -22,7 +22,7 @@
+ #include <pwd.h>
+ #include <boost/filesystem.hpp>
+ #include <boost/system/error_code.hpp>
+-#include <boost/filesystem/convenience.hpp>
++//#include <boost/filesystem/convenience.hpp>
+ #include <boost/process.hpp>
+ #endif
+ 
+--- a/src/slic3r/GUI/ScriptExecutor.cpp	2024-08-10 11:28:32.423851365 +0100
++++ b/src/slic3r/GUI/ScriptExecutor.cpp	2024-08-10 11:28:41.893921315 +0100
+@@ -10,7 +10,7 @@
+ #include <boost/algorithm/string/erase.hpp>
+ #include <boost/algorithm/string/split.hpp>
+ #include <boost/filesystem.hpp>
+-#include <boost/filesystem/string_file.hpp>
++//#include <boost/filesystem/string_file.hpp>
+ 
+ #include <fstream>
+ #include <string>
+--- a/src/slic3r/GUI/BitmapCache.cpp.old	2024-08-10 12:00:52.538869133 +0100
++++ b/src/slic3r/GUI/BitmapCache.cpp	2024-08-10 12:01:15.519040423 +0100
+@@ -6,6 +6,8 @@
+ #include "GUI_Utils.hpp"
+ 
+ #include <boost/filesystem.hpp>
++#include <boost/log/trivial.hpp>
++#include <boost/log/core.hpp>
+ 
+ #ifdef __WXGTK2__
+     // Broken alpha workaround
diff --git a/media-gfx/superslicer/files/superslicer-2.5.59.8-additional-imports-fixes.patch b/media-gfx/superslicer/files/superslicer-2.5.59.8-additional-imports-fixes.patch
new file mode 100644
index 000000000000..1ccef804d0b4
--- /dev/null
+++ b/media-gfx/superslicer/files/superslicer-2.5.59.8-additional-imports-fixes.patch
@@ -0,0 +1,111 @@
+diff --git a/src/libslic3r/Extruder.hpp b/src/libslic3r/Extruder.hpp
+index e4e16d263..629fd6e0b 100644
+--- a/src/libslic3r/Extruder.hpp
++++ b/src/libslic3r/Extruder.hpp
+@@ -3,6 +3,7 @@
+ 
+ #include "libslic3r.h"
+ #include "Point.hpp"
++#include <optional>
+ 
+ namespace Slic3r {
+ 
+diff --git a/src/slic3r/GUI/Field.cpp b/src/slic3r/GUI/Field.cpp
+index 10cae794d..c82969e20 100644
+--- a/src/slic3r/GUI/Field.cpp
++++ b/src/slic3r/GUI/Field.cpp
+@@ -20,6 +20,7 @@
+ #include <wx/tglbtn.h>
+ #endif
+ #include <wx/tokenzr.h>
++#include <boost/algorithm/string.hpp>
+ #include <boost/algorithm/string/predicate.hpp>
+ #include <boost/log/trivial.hpp>
+ #include "OG_CustomCtrl.hpp"
+diff --git a/src/slic3r/GUI/Preferences.cpp b/src/slic3r/GUI/Preferences.cpp
+index ab6039ff0..be01e890a 100644
+--- a/src/slic3r/GUI/Preferences.cpp
++++ b/src/slic3r/GUI/Preferences.cpp
+@@ -8,6 +8,7 @@
+ 
+ #include <wx/notebook.h>
+ #include <wx/scrolwin.h>
++#include <wx/display.h>
+ #include "Notebook.hpp"
+ #include "ButtonsDescription.hpp"
+ #include "OG_CustomCtrl.hpp"
+diff --git a/src/slic3r/GUI/Tab.cpp b/src/slic3r/GUI/Tab.cpp
+index a6c7b580e..1e1566f37 100644
+--- a/src/slic3r/GUI/Tab.cpp
++++ b/src/slic3r/GUI/Tab.cpp
+@@ -29,6 +29,7 @@
+ #include <wx/settings.h>
+ #include <wx/filedlg.h>
+ 
++#include <boost/algorithm/string.hpp>
+ #include <boost/algorithm/string/split.hpp>
+ #include <boost/algorithm/string/predicate.hpp>
+ #include <boost/algorithm/string/replace.hpp>
+diff --git a/src/libslic3r/ObjectID.hpp b/src/libslic3r/ObjectID.hpp
+index 782c58741..08dfba661 100644
+--- a/src/libslic3r/ObjectID.hpp
++++ b/src/libslic3r/ObjectID.hpp
+@@ -2,6 +2,7 @@
+ #define slic3r_ObjectID_hpp_
+ 
+ #include <cereal/access.hpp>
++#include <cereal/types/base_class.hpp>
+ 
+ namespace Slic3r {
+
+diff --git a/src/libslic3r/Format/BBConfig.hpp b/src/libslic3r/Format/BBConfig.hpp
+index a4b27675c..8d821bed5 100644
+--- a/src/libslic3r/Format/BBConfig.hpp
++++ b/src/libslic3r/Format/BBConfig.hpp
+@@ -2,6 +2,13 @@
+ #define slic3r_Format_BBconfig_hpp_
+ 
+ #include "miniz_extension.hpp"
++#include <fstream>
++#include <map>
++#include "libslic3r/Config.hpp"
++#include <boost/algorithm/string/replace.hpp>
++#include <boost/log/trivial.hpp>
++#include <boost/property_tree/ptree.hpp>
++#include <boost/property_tree/ini_parser.hpp>
+ 
+ #ifdef __APPLE__
+     #include <boost/filesystem.hpp>
+diff --git a/src/libslic3r/GCode/FanMover.cpp b/src/libslic3r/GCode/FanMover.cpp
+index 8a39d92c5..68e8c9254 100644
+--- a/src/libslic3r/GCode/FanMover.cpp
++++ b/src/libslic3r/GCode/FanMover.cpp
+@@ -13,9 +13,8 @@
+ #include "../PrintConfig.hpp"
+ #include "../Utils.hpp"
+ #include "Print.hpp"
+-
+-#include <boost/log/trivial.hpp>
+ */
++#include <boost/log/trivial.hpp>
+ 
+ 
+ namespace Slic3r {
+diff --git a/src/libslic3r/Format/bbs_3mf.cpp b/src/libslic3r/Format/bbs_3mf.cpp
+index f1570b7a4..777f1d722 100644
+--- a/src/libslic3r/Format/bbs_3mf.cpp
++++ b/src/libslic3r/Format/bbs_3mf.cpp
+@@ -43,11 +43,13 @@
+ #include <boost/property_tree/ptree.hpp>
+ #include <boost/property_tree/xml_parser.hpp>
+ #include <boost/foreach.hpp>
++#include <boost/thread/mutex.hpp>
+ //#include <openssl/md5.h>
+ 
+ namespace pt = boost::property_tree;
+ 
+ #include <tbb/parallel_reduce.h>
++#include <tbb/parallel_for.h>
+ 
+ #include <expat.h>
+ #include <Eigen/Dense>
diff --git a/media-gfx/superslicer/files/superslicer-2.5.59.8-boost-replace-load-string-file.patch b/media-gfx/superslicer/files/superslicer-2.5.59.8-boost-replace-load-string-file.patch
new file mode 100644
index 000000000000..9b948ed9c0c4
--- /dev/null
+++ b/media-gfx/superslicer/files/superslicer-2.5.59.8-boost-replace-load-string-file.patch
@@ -0,0 +1,43 @@
+diff --git a/src/slic3r/GUI/ScriptExecutor.cpp b/src/slic3r/GUI/ScriptExecutor.cpp
+index f32e44204..272af5ec3 100644
+--- a/src/slic3r/GUI/ScriptExecutor.cpp
++++ b/src/slic3r/GUI/ScriptExecutor.cpp
+@@ -5,8 +5,11 @@
+ #include "libslic3r/PresetBundle.hpp"
+ #include "libslic3r/Print.hpp"
+ 
++#include <fstream>
+ #include <string>
+ 
++#include <boost/filesystem.hpp>
++
+ #include <angelscript/source/as_config.h>
+ #include <angelscript/add_on/autowrapper/aswrappedcall.h>
+ #include <angelscript/add_on/scriptarray/scriptarray.h>
+@@ -616,6 +619,17 @@ bool as_is_enabled(std::string &key)
+     return f->is_enabled();
+ }
+ 
++inline
++void load_string_file(const boost::filesystem::path& p, std::string& str)
++{
++       std::ifstream file;
++       file.exceptions(std::ifstream::failbit | std::ifstream::badbit);
++       file.open(p, std::ios_base::binary);
++       std::size_t sz = static_cast<std::size_t>(boost::filesystem::file_size(p));
++       str.resize(sz, '\0');
++       file.read(&str[0], sz);
++}
++
+ //function to reset a field
+ void as_back_initial_value(std::string& key) {
+     current_script->add_to_reset(key);
+@@ -745,7 +759,7 @@ void ScriptContainer::init(const std::string& tab_key, Tab* tab)
+         //res = builder.AddSectionFromFile(ui_script_file.string().c_str()); //seems to be problematic on cyrillic locale
+         {
+             std::string all_file;
+-            boost::filesystem::load_string_file(ui_script_file, all_file);
++            load_string_file(ui_script_file, all_file);
+             res = builder.AddSectionFromMemory(ui_script_file.string().c_str(), all_file.c_str(), (unsigned int)(all_file.length()), 0);
+         }
+         if (res < 0) throw CompileErrorException("Error, can't build the script for tab " + tab_key);
diff --git a/media-gfx/superslicer/files/superslicer-2.5.59.8-fix-compilation-error-gnu17.patch b/media-gfx/superslicer/files/superslicer-2.5.59.8-fix-compilation-error-gnu17.patch
new file mode 100644
index 000000000000..5574340bce63
--- /dev/null
+++ b/media-gfx/superslicer/files/superslicer-2.5.59.8-fix-compilation-error-gnu17.patch
@@ -0,0 +1,20 @@
+# https://github.com/prusa3d/PrusaSlicer/commit/4aa7366fafb7a3f91cc68d4a808f5195a4aa3dcf
+diff --git a/src/libslic3r/MeshBoolean.cpp b/src/libslic3r/MeshBoolean.cpp
+index d76bf468c7f..22232573953 100644
+--- a/src/libslic3r/MeshBoolean.cpp
++++ b/src/libslic3r/MeshBoolean.cpp
+@@ -152,12 +152,12 @@ indexed_triangle_set cgal_to_indexed_triangle_set(const _Mesh &cgalmesh)
+     const auto &vertices = cgalmesh.vertices();
+     int vsize = int(vertices.size());
+ 
+-    for (auto &vi : vertices) {
++    for (const auto &vi : vertices) {
+         auto &v = cgalmesh.point(vi); // Don't ask...
+         its.vertices.emplace_back(to_vec3f(v));
+     }
+ 
+-    for (auto &face : faces) {
++    for (const auto &face : faces) {
+         auto vtc = cgalmesh.vertices_around_face(cgalmesh.halfedge(face));
+ 
+         int i = 0;
diff --git a/media-gfx/superslicer/files/superslicer-2.5.59.8-libnest2d-link-xcb.patch b/media-gfx/superslicer/files/superslicer-2.5.59.8-libnest2d-link-xcb.patch
new file mode 100644
index 000000000000..441f647b037e
--- /dev/null
+++ b/media-gfx/superslicer/files/superslicer-2.5.59.8-libnest2d-link-xcb.patch
@@ -0,0 +1,12 @@
+diff --git a/src/libnest2d/CMakeLists.txt b/src/libnest2d/CMakeLists.txt
+index c18dc31cb..852d26d5e 100644
+--- a/src/libnest2d/CMakeLists.txt
++++ b/src/libnest2d/CMakeLists.txt
+@@ -24,5 +24,6 @@ set(LIBNEST2D_SRCFILES
+ add_library(libnest2d STATIC ${LIBNEST2D_SRCFILES})
+ 
+ target_include_directories(libnest2d PUBLIC ${CMAKE_CURRENT_LIST_DIR}/include)
+-target_link_libraries(libnest2d PUBLIC NLopt::nlopt TBB::tbb Boost::boost libslic3r)
++target_link_libraries(libnest2d PUBLIC NLopt::nlopt TBB::tbb Boost::boost
++    libslic3r xcb)
+ target_compile_definitions(libnest2d PUBLIC LIBNEST2D_THREADING_tbb LIBNEST2D_STATIC LIBNEST2D_OPTIMIZER_nlopt LIBNEST2D_GEOMETRIES_libslic3r)
diff --git a/media-gfx/superslicer/superslicer-2.5.59.10-r1.ebuild b/media-gfx/superslicer/superslicer-2.5.59.10-r1.ebuild
new file mode 100644
index 000000000000..a19e63212295
--- /dev/null
+++ b/media-gfx/superslicer/superslicer-2.5.59.10-r1.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+WX_GTK_VER="3.2-gtk3"
+MY_PN="SuperSlicer"
+SLICER_PROFILES_COMMIT="ca25c7ec55dcc6073da61e39692c321cdb6497dc"
+
+inherit cmake wxwidgets xdg flag-o-matic
+
+DESCRIPTION="A mesh slicer to generate G-code for fused-filament-fabrication (3D printers)"
+HOMEPAGE="https://github.com/supermerill/SuperSlicer/"
+SRC_URI="
+	https://github.com/supermerill/SuperSlicer/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/slic3r/slic3r-profiles/archive/${SLICER_PROFILES_COMMIT}.tar.gz -> ${P}-profiles.tar.gz
+"
+
+LICENSE="AGPL-3 Boost-1.0 GPL-2 LGPL-3 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="test"
+
+RESTRICT="test"
+
+# No dep on sci-libs/libigl, in-tree version cannot build
+# static library currently. Using bundled one.
+RDEPEND="
+	dev-cpp/eigen:3
+	dev-cpp/tbb:=
+	dev-libs/boost:=[nls]
+	dev-libs/cereal
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/gmp:=
+	dev-libs/mpfr:=
+	dev-libs/imath:=
+	>=media-gfx/openvdb-8.2:=
+	net-misc/curl[adns]
+	media-libs/glew:0=
+	media-libs/libpng:0=
+	media-libs/qhull:=
+	sci-libs/nlopt
+	sci-libs/opencascade:=
+	>=sci-mathematics/cgal-5.0:=
+	sys-apps/dbus
+	sys-libs/zlib:=
+	virtual/glu
+	virtual/opengl
+	x11-libs/gtk+:3
+	x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
+"
+DEPEND="${RDEPEND}
+	media-libs/qhull[static-libs]
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.5.59.2-boost.patch"
+	"${FILESDIR}/${PN}-2.5.59.2-cereal.patch"
+	"${FILESDIR}/${PN}-2.5.59.2-dont-install-angelscript.patch"
+	"${FILESDIR}/${PN}-2.5.59.2-gcodeviewer-symlink-fix.patch"
+	"${FILESDIR}/${PN}-2.5.59.2-missing-includes-fix.patch"
+	"${FILESDIR}/${PN}-2.5.59.2-openexr3.patch"
+	"${FILESDIR}/${PN}-2.5.59.2-wxgtk3-wayland-fix.patch"
+	"${FILESDIR}/${PN}-2.5.59.2-relax-OpenCASCADE-dep.patch"
+	"${FILESDIR}/${PN}-2.5.59.2-link-occtwrapper-statically.patch"
+	"${FILESDIR}/${PN}-2.5.59.8-additional-imports-fixes.patch"
+	"${FILESDIR}/${PN}-2.5.59.8-fix-compilation-error-gnu17.patch"
+	"${FILESDIR}/${PN}-2.5.59.8-libnest2d-link-xcb.patch"
+	"${FILESDIR}/${PN}-2.5.59.8-boost-replace-load-string-file.patch"
+	"${FILESDIR}/${PN}-2.5.59.10-boost-1.85.patch"
+	"${FILESDIR}/${PN}-2.5.59.10-boost-headers.patch"
+)
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_unpack() {
+	default
+
+	mv slic3r-profiles-*/* "${S}"/resources/profiles/ || die
+}
+
+src_configure() {
+	CMAKE_BUILD_TYPE="Release"
+
+	append-flags -fno-strict-aliasing
+
+	setup-wxwidgets
+
+	local mycmakeargs=(
+		-DOPENVDB_FIND_MODULE_PATH="/usr/$(get_libdir)/cmake/OpenVDB"
+
+		-DSLIC3R_BUILD_TESTS=$(usex test)
+		-DSLIC3R_FHS=ON
+		-DSLIC3R_GTK=3
+		-DSLIC3R_GUI=ON
+		-DSLIC3R_PCH=OFF
+		-DSLIC3R_STATIC=OFF
+		-DSLIC3R_WX_STABLE=ON
+		-Wno-dev
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	rm "${ED}/usr/lib/udev/rules.d/90-3dconnexion.rules" || die
+}
diff --git a/media-gfx/superslicer/superslicer-2.5.59.10.ebuild b/media-gfx/superslicer/superslicer-2.5.59.10.ebuild
new file mode 100644
index 000000000000..b1c347c004cc
--- /dev/null
+++ b/media-gfx/superslicer/superslicer-2.5.59.10.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+WX_GTK_VER="3.0-gtk3"
+MY_PN="SuperSlicer"
+SLICER_PROFILES_COMMIT="ca25c7ec55dcc6073da61e39692c321cdb6497dc"
+
+inherit cmake wxwidgets xdg flag-o-matic
+
+DESCRIPTION="A mesh slicer to generate G-code for fused-filament-fabrication (3D printers)"
+HOMEPAGE="https://github.com/supermerill/SuperSlicer/"
+SRC_URI="
+	https://github.com/supermerill/SuperSlicer/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/slic3r/slic3r-profiles/archive/${SLICER_PROFILES_COMMIT}.tar.gz -> ${P}-profiles.tar.gz
+"
+
+LICENSE="AGPL-3 Boost-1.0 GPL-2 LGPL-3 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="test"
+
+RESTRICT="test"
+
+# No dep on sci-libs/libigl, in-tree version cannot build
+# static library currently. Using bundled one.
+RDEPEND="
+	dev-cpp/eigen:3
+	dev-cpp/tbb:=
+	dev-libs/boost:=[nls]
+	dev-libs/cereal
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/gmp:=
+	dev-libs/mpfr:=
+	dev-libs/imath:=
+	>=media-gfx/openvdb-8.2:=
+	net-misc/curl[adns]
+	media-libs/glew:0=
+	media-libs/libpng:0=
+	media-libs/qhull:=
+	sci-libs/nlopt
+	sci-libs/opencascade:=
+	>=sci-mathematics/cgal-5.0:=
+	sys-apps/dbus
+	sys-libs/zlib:=
+	virtual/glu
+	virtual/opengl
+	x11-libs/gtk+:3
+	x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
+"
+DEPEND="${RDEPEND}
+	media-libs/qhull[static-libs]
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.5.59.2-boost.patch"
+	"${FILESDIR}/${PN}-2.5.59.2-cereal.patch"
+	"${FILESDIR}/${PN}-2.5.59.2-dont-install-angelscript.patch"
+	"${FILESDIR}/${PN}-2.5.59.2-gcodeviewer-symlink-fix.patch"
+	"${FILESDIR}/${PN}-2.5.59.2-missing-includes-fix.patch"
+	"${FILESDIR}/${PN}-2.5.59.2-openexr3.patch"
+	"${FILESDIR}/${PN}-2.5.59.2-wxgtk3-wayland-fix.patch"
+	"${FILESDIR}/${PN}-2.5.59.2-relax-OpenCASCADE-dep.patch"
+	"${FILESDIR}/${PN}-2.5.59.2-link-occtwrapper-statically.patch"
+	"${FILESDIR}/${PN}-2.5.59.8-additional-imports-fixes.patch"
+	"${FILESDIR}/${PN}-2.5.59.8-fix-compilation-error-gnu17.patch"
+	"${FILESDIR}/${PN}-2.5.59.8-libnest2d-link-xcb.patch"
+	"${FILESDIR}/${PN}-2.5.59.8-boost-replace-load-string-file.patch"
+	"${FILESDIR}/${PN}-2.5.59.10-boost-1.85.patch"
+)
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_unpack() {
+	default
+
+	mv slic3r-profiles-*/* "${S}"/resources/profiles/ || die
+}
+
+src_configure() {
+	CMAKE_BUILD_TYPE="Release"
+
+	append-flags -fno-strict-aliasing
+
+	setup-wxwidgets
+
+	local mycmakeargs=(
+		-DOPENVDB_FIND_MODULE_PATH="/usr/$(get_libdir)/cmake/OpenVDB"
+
+		-DSLIC3R_BUILD_TESTS=$(usex test)
+		-DSLIC3R_FHS=ON
+		-DSLIC3R_GTK=3
+		-DSLIC3R_GUI=ON
+		-DSLIC3R_PCH=OFF
+		-DSLIC3R_STATIC=OFF
+		-DSLIC3R_WX_STABLE=ON
+		-Wno-dev
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	rm "${ED}/usr/lib/udev/rules.d/90-3dconnexion.rules" || die
+}
diff --git a/media-gfx/superslicer/superslicer-2.5.59.0-r3.ebuild b/media-gfx/superslicer/superslicer-2.5.59.8.ebuild
index 7cdeaa9cc284..b43862a3db67 100644
--- a/media-gfx/superslicer/superslicer-2.5.59.0-r3.ebuild
+++ b/media-gfx/superslicer/superslicer-2.5.59.8.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 WX_GTK_VER="3.0-gtk3"
 MY_PN="SuperSlicer"
-SLICER_PROFILES_COMMIT="748fbdfd2ac077e4e415868e7bc963740b92aa8e"
+SLICER_PROFILES_COMMIT="8f3bb94a9c60be9a3b40d88a36ff05ba5cf2d6a8"
 
 inherit cmake wxwidgets xdg flag-o-matic
 
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="AGPL-3 Boost-1.0 GPL-2 LGPL-3 MIT"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="test"
 
 RESTRICT="test"
@@ -41,6 +41,7 @@ RDEPEND="
 	media-libs/libpng:0=
 	media-libs/qhull:=
 	sci-libs/nlopt
+	sci-libs/opencascade:=
 	>=sci-mathematics/cgal-5.0:=
 	sys-apps/dbus
 	sys-libs/zlib:=
@@ -54,14 +55,20 @@ DEPEND="${RDEPEND}
 "
 
 PATCHES=(
-	"${FILESDIR}/${P}-openexr3.patch"
-	"${FILESDIR}/${P}-wxgtk3-wayland.patch"
-	"${FILESDIR}/${P}-cereal.patch"
-	"${FILESDIR}/${P}-boost.patch"
-	"${FILESDIR}/${P}-boost-1.81-std-wxString-to-std-wstring.patch"
-	"${FILESDIR}/${P}-missing-includes.patch"
-	"${FILESDIR}/${P}-dont-install-bundled-angelscript.patch"
-	"${FILESDIR}/${P}-fix-gcodeviewer-symlink.patch"
+	"${FILESDIR}/${PN}-2.5.59.2-boost.patch"
+	"${FILESDIR}/${PN}-2.5.59.2-cereal.patch"
+	"${FILESDIR}/${PN}-2.5.59.2-dont-install-angelscript.patch"
+	"${FILESDIR}/${PN}-2.5.59.2-gcodeviewer-symlink-fix.patch"
+	"${FILESDIR}/${PN}-2.5.59.2-missing-includes-fix.patch"
+	"${FILESDIR}/${PN}-2.5.59.2-openexr3.patch"
+	"${FILESDIR}/${PN}-2.5.59.2-wxgtk3-wayland-fix.patch"
+	"${FILESDIR}/${PN}-2.5.59.2-relax-OpenCASCADE-dep.patch"
+	"${FILESDIR}/${PN}-2.5.59.2-link-occtwrapper-statically.patch"
+	"${FILESDIR}/${PN}-2.5.59.2-fix-dereferencing-in-std-unique_ptr-to-nullptr.patch"
+	"${FILESDIR}/${P}-additional-imports-fixes.patch"
+	"${FILESDIR}/${P}-fix-compilation-error-gnu17.patch"
+	"${FILESDIR}/${P}-libnest2d-link-xcb.patch"
+	"${FILESDIR}/${P}-boost-replace-load-string-file.patch"
 )
 
 S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/media-gfx/svg2rlg/Manifest b/media-gfx/svg2rlg/Manifest
index fb95bd989f00..6fcaa78e9b10 100644
--- a/media-gfx/svg2rlg/Manifest
+++ b/media-gfx/svg2rlg/Manifest
@@ -1,3 +1,3 @@
-DIST svg2rlg-0.4.0.tar.gz 504861 BLAKE2B bfd147d824d5a49f8621e705f6bdeefdaa571918db94afea8e839d048d2089a8c8ebf8e2763caa9866f55a7142e1bb3522b01f53eaf5b8343164a08ee0983ef3 SHA512 e3813a22784c2199a1df69574c64093347a153fa2b7a40e2f38f52e5d46d7ca8d6e8e3bbe54ab59381f6c7246352c016ff3e19b1278c6f2c8dcfbe8bd7017b12
-EBUILD svg2rlg-0.4.0-r1.ebuild 757 BLAKE2B d6145382ce7d23bc1ede11a848a994119df2f3acc81ebd7d8f0dff2371c986872f28049c6e03870061175f39eef0d3f8b0dfe740f3178bf1fdd0f816f94423ce SHA512 6960d4733bcd72a1a515489fb23c0f87ebc8929718d8ad1e5c64054e6bfd07575591afc740f9794fe2667415ac3a06a7932689c0314848061f289d45684e3b22
+DIST svg2rlg-0.4.0.gh.tar.gz 504861 BLAKE2B bfd147d824d5a49f8621e705f6bdeefdaa571918db94afea8e839d048d2089a8c8ebf8e2763caa9866f55a7142e1bb3522b01f53eaf5b8343164a08ee0983ef3 SHA512 e3813a22784c2199a1df69574c64093347a153fa2b7a40e2f38f52e5d46d7ca8d6e8e3bbe54ab59381f6c7246352c016ff3e19b1278c6f2c8dcfbe8bd7017b12
+EBUILD svg2rlg-0.4.0-r1.ebuild 771 BLAKE2B 0cbf67ce9249b6ac7dc2466edd6c772e23b8cbcff241b0fa8d15f28801441e16343ec048f9506785c8b50db60c45c61bfe46beaff9ef629636c9ae15b089e81f SHA512 569fd1352080ce87208bb46443589ab2c07628ef6f70def4aa270280819d091ecd2d8f57b6f59809beef9f7863447718863219b5d154c3147211492d313bbb7b
 MISC metadata.xml 293 BLAKE2B d66e1fe65900e1b049f3cb1635362e0dc2fb5fd20a4be3c00f6452b9bd21ef74b60582cdef06b8417a727ede8f4360ee4a4584d191b47f77ba243e4bda9a558d SHA512 0be54a59a6088ed5dad4da3cc774ea41ea6b45a3cfa875b9cd0072de4d0b7d9205abb20221c3d45ed84b9e38b4f94377eda3038cf84d386ea4522d747d346709
diff --git a/media-gfx/svg2rlg/svg2rlg-0.4.0-r1.ebuild b/media-gfx/svg2rlg/svg2rlg-0.4.0-r1.ebuild
index 61629741ac37..9b6fffa1c06a 100644
--- a/media-gfx/svg2rlg/svg2rlg-0.4.0-r1.ebuild
+++ b/media-gfx/svg2rlg/svg2rlg-0.4.0-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit distutils-r1
 
@@ -19,7 +19,10 @@ if [[ ${PV} = 9999* ]]; then
 	EGIT_BRANCH="master"
 	inherit git-r3
 else
-	SRC_URI="https://github.com/sarnold/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="
+		https://github.com/sarnold/svg2rlg/archive/${PV}.tar.gz
+			-> ${P}.gh.tar.gz
+	"
 	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
 fi
 
diff --git a/media-gfx/sxiv/Manifest b/media-gfx/sxiv/Manifest
index 16ec81c3af40..36010d28390c 100644
--- a/media-gfx/sxiv/Manifest
+++ b/media-gfx/sxiv/Manifest
@@ -1,5 +1,4 @@
 AUX sxiv-25-makefile.patch 251 BLAKE2B 05b96799c7e94c2a907158becfbd3d0844a3919f75e7c4e6e8f994ec2881f173919c34625d80357882b28157f72ea6d0bbd6331473c6b213857c3e8a5db92bad SHA512 8e7b30bb73b87981b2d2c4e9bff8f62b5e59d341410dee0d4ecb889a0f39cfb38539a8d6ef2a738517ab5034c035e6588a4d2b7220bd408a2dd040f6cb8d7088
 DIST sxiv-26.tar.gz 48569 BLAKE2B a73707e2fd699b53e38ddc48710a73b945d4e102743567283d7351c92c513e4e57a32c409267593a2c5808caf811b7caeb555f8ba2762f1cc76a421aceff0e95 SHA512 c4bd56ea14e520ea9b116e275009f2089e5c434d6894281215b09d07572b2d3190c3c3eca015a2933328d704afb7d443a66e858b4e6904a3d4d45378b35d22cb
 EBUILD sxiv-26.ebuild 1269 BLAKE2B a0b0b8ce87c89880c1178851d35e4b91da60a881260c79e7459776c3caade214258bd03b4fb96d800b3babe8f489e4f0b93e29bae45bf59a5ab9fa32130cd355 SHA512 8545378db759030ec1d768eb1a46be81a64ec662e250386d92a58a1c08fe13fa2cb3300b1d076eb4d7bc6bd4670c0d42322cb011c731c09ec099a02824754688
-EBUILD sxiv-9999.ebuild 1266 BLAKE2B 763b6673b358d2fae495e4509042d670fb406f27acb4557e9c259a929d05c4f482e20a1b0c226e76a8caab2390acedf3b22db1ee2dc05f79d41313d251f61162 SHA512 e36dc294b6a29021881d64fa48fd0dd93fc6adfd1761c358af51371c32281228f3519fdc8cc775dc9e925e762183a39e8075b667d2e4845c325a2670c7f86a0e
 MISC metadata.xml 244 BLAKE2B d7b28da2563099a3ae3aeaf6611e870f638d650a8997223ceb22cd178af94887d38f3082b4c357b463b309641d08d4b64f9db86e167f57ec4f80a6655565d41b SHA512 390c1b4771442a67506cdc8dbd5ff7ca2673af0635539e4cf6f7c252d29dd91b7e667f07992b412fd70649397ee9bc11fa0f3382e04ba74d3a7102a3ef15d194
diff --git a/media-gfx/sxiv/sxiv-9999.ebuild b/media-gfx/sxiv/sxiv-9999.ebuild
deleted file mode 100644
index 79d85908dc89..000000000000
--- a/media-gfx/sxiv/sxiv-9999.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop xdg-utils savedconfig toolchain-funcs
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/xyb3rt/sxiv.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/xyb3rt/sxiv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-fi
-
-DESCRIPTION="Simple (or small or suckless) X Image Viewer"
-HOMEPAGE="https://github.com/xyb3rt/sxiv/"
-
-LICENSE="GPL-2+ public-domain"
-SLOT="0"
-IUSE="exif gif +jpeg +png webp"
-
-RDEPEND="
-	exif? ( media-libs/libexif )
-	gif? ( media-libs/giflib:0= )
-	media-libs/imlib2[X,gif?,jpeg?,png?,webp?]
-	x11-libs/libX11
-	x11-libs/libXft
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}"/${PN}-25-makefile.patch )
-
-src_prepare() {
-	restore_config config.h
-	default
-}
-
-src_compile() {
-	emake V=1 CC="$(tc-getCC)" HAVE_LIBEXIF=$(usex exif 1 0) HAVE_GIFLIB=$(usex gif 1 0)
-}
-
-src_install() {
-	emake DESTDIR="${ED}" PREFIX=/usr install
-	emake -C icon DESTDIR="${ED}" PREFIX=/usr install
-	dodoc README.md
-	domenu sxiv.desktop
-
-	save_config config.h
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/media-gfx/tachyon/Manifest b/media-gfx/tachyon/Manifest
index 6dcb52093b01..6d91c58e03db 100644
--- a/media-gfx/tachyon/Manifest
+++ b/media-gfx/tachyon/Manifest
@@ -1,5 +1,5 @@
 AUX tachyon-0.99_beta6-r2-ldflags.patch 856 BLAKE2B 5d8587eac987a66758f0314afb5bba620fbbb99b32d295e4deb649a929ac19afd52c835f375d72bd2284b3cd4d9185c272090d2a27d06ea0220d1c59b03bb995 SHA512 2807689e3bad156d3d54a0f4dce5e6aaf7555750c6650aa3957bd3ae51922ed3f8489534528de45c22d75db85450340d674a621e608668cde972df12c03a63b0
 AUX tachyon-0.99_beta6-r2-shared.patch 8043 BLAKE2B 6d559c22477de0e3148e374a8db2faa1e8249d0599409f9d8cfc843d06c1960639f74797414328c40a7fa46c9143cefb208ab68f4d47e3c0b8fd0dbde1ea951d SHA512 eb9c2e43c679030b410d5f9077e85969ee9ec3926f7c44eb9047c902f5834dd4734af3f07105f116b4dc23c0d420f87d67193a759d329810ca168ac4a28f95ad
 DIST tachyon-0.99b6.tar.gz 2981568 BLAKE2B 69e96362d5914db7cfeaf36a7c0fc57ebe2bff07c6c2c4b13107edb17146577df73ad7dbf740d402e322f1fb2df9cde79e634170ecd9d49037beb678de42df83 SHA512 4d0d707bf46528b87bfe1a05f490f40bcbee8f21271c5212247d4fd25956a27ad8a40b4621817a3f1c03495f1ba9eeb99b152929fdcd92c7118a35ef116f3f33
-EBUILD tachyon-0.99_beta6-r2.ebuild 2516 BLAKE2B 43687d7eaa3efb9ab3e660dc4b5e8641b13b16cdbbf3bbc78f56353e73b8100d78823266a038a6768e73969cd2d2d462f6bdbc818294361b0e51c35f14f1ec7e SHA512 c615c029a717d1421eefea0eeacecd13814ff7d0d9417cd4cc634e56755d56d8ea81e26f8ca5037d7c034d3cf21476a6e252e1801d052a000141519ba27bcd7f
+EBUILD tachyon-0.99_beta6-r2.ebuild 2523 BLAKE2B cc413b94f470dc2ba097ae4f6a19091eaeaf3523318455ebfe3a0d8de0924af757ff7b3f9a063908593dcc60f902081ac6fe69dfb29de24054bc4e9c08cd157b SHA512 ab8aadf34f7d0c8d6bd31050bdc9e8ddf561e6a114d7a072eaad66a79f89ca346b6514546c44db58952fa894f0fc7d3f6a4b036b66040e0274e52e408bd5ea4e
 MISC metadata.xml 340 BLAKE2B 93f274e908f9ec5837e866d5ca4f7a6711fbf07937663ca71a73d8be1b7691f67fafa0aa69cb588463f692c2f4a5b42a3fa2d6fd90ac3d0200246f03653f4086 SHA512 e369c4b944db3dcd1c793e63fffce8f48fff7a5785058ef8ba8cd981397fa800de31286cfba6f33837a8c16d919bcde260ede1f704af7d2f4531556e37ac11e9
diff --git a/media-gfx/tachyon/tachyon-0.99_beta6-r2.ebuild b/media-gfx/tachyon/tachyon-0.99_beta6-r2.ebuild
index ab7037d8bf25..e6b03c7a30c3 100644
--- a/media-gfx/tachyon/tachyon-0.99_beta6-r2.ebuild
+++ b/media-gfx/tachyon/tachyon-0.99_beta6-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ S="${WORKDIR}/${PN}/unix"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x64-macos"
+KEYWORDS="~amd64 ~ppc ~riscv ~x86 ~x64-macos"
 IUSE="doc examples jpeg mpi +opengl openmp png threads"
 
 DEPEND="
diff --git a/media-gfx/termtosvg/Manifest b/media-gfx/termtosvg/Manifest
index 971faec00585..d35c5ee5a339 100644
--- a/media-gfx/termtosvg/Manifest
+++ b/media-gfx/termtosvg/Manifest
@@ -1,4 +1,3 @@
 DIST termtosvg-1.1.0.tar.gz 385300 BLAKE2B 63750444014ab6451ef32d884f9ccc095b58171438f0b5326d5bcb77ebb87daf6f212cf0c07ef426859b9a50dbcc9e77325ab6901f2a6ff95f43cca26c948010 SHA512 4e5000d885b2ac4fc281d9f45c3be3d6b4c93ed604d2d929471843edc7e0ee78a8cc5ee28f92b51050d3f46d3302a2dcbbba3c9a2a3775eebe87d8171c1c6e8d
-EBUILD termtosvg-1.1.0-r1.ebuild 594 BLAKE2B 1fc42a2c613fdc95478db56c0f1e215b4c34420e8242a9d72de4e8df4961e43cc90e1bd73f6149a42abde428ee459029c4d0f8a25a365d57831a3915e39a5a1d SHA512 0bc24fb3d85141d34dc172a157c7f3cbab9e479441069974bbf7818fa4f1b29807e5a7b1b0d3cbdf74fc648ce829b762fede083caedeefc096a5620e820844c9
-EBUILD termtosvg-1.1.0.ebuild 560 BLAKE2B c11b4b949a3d862395536031b8bc1bfc085886fa31e275ae4f10b328e3deb1ff10ee93161e1fa428c27a984435f6c9198f6ff6d34b902f6e13a096ecbabe6073 SHA512 383646d52ff6e361f5b4890cbd2df268bccc9cddbba158ddd82d09ab2686558890e6b9b6e58b9eeffaa1d7e44a15752b7b40b6df8215f6d4a30f72866dccf9d3
+EBUILD termtosvg-1.1.0-r1.ebuild 594 BLAKE2B 554e9268d144485aa1c49fcdb573c71f7c15b3ae09f7fbadf62724425980b179d6f621111270c8544c3b94da078aff25fba4c2c58e9619483c8177c4bb56940c SHA512 11e4de6d9469383914f047e004315d41ee6cada8d4dbcadd955a7f55529b4e7581bc34e5a5f65e0d144e9bd1d450cbd11c05355ae1e0da55b9f32170f0ff3b3b
 MISC metadata.xml 298 BLAKE2B 7491eadab526b2b39d7432db0d75e4a1abd577c93dc5619cce66a4c82cc9ec6d914af9e35761445ead493f46efed5a00da0b0c8b11e16a9864754e0dfcd2fcce SHA512 2cd1ba813187bd4418c53acf680ba1787546015c533897d241cad7fe479e78c090892b4666d86649096f0a265b5856c2799199cec5751647b2cbdf5534780f05
diff --git a/media-gfx/termtosvg/termtosvg-1.1.0-r1.ebuild b/media-gfx/termtosvg/termtosvg-1.1.0-r1.ebuild
index c9922d7c383a..004809937815 100644
--- a/media-gfx/termtosvg/termtosvg-1.1.0-r1.ebuild
+++ b/media-gfx/termtosvg/termtosvg-1.1.0-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 
 inherit distutils-r1
 
diff --git a/media-gfx/termtosvg/termtosvg-1.1.0.ebuild b/media-gfx/termtosvg/termtosvg-1.1.0.ebuild
deleted file mode 100644
index e45cd5e8c87e..000000000000
--- a/media-gfx/termtosvg/termtosvg-1.1.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-inherit distutils-r1
-
-DESCRIPTION="Record terminal sessions as SVG animations"
-HOMEPAGE="https://github.com/nbedos/termtosvg"
-SRC_URI="https://github.com/nbedos/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/lxml[${PYTHON_USEDEP}]
-	>=dev-python/pyte-0.8.0[${PYTHON_USEDEP}]
-	dev-python/wcwidth[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests unittest
diff --git a/media-gfx/tintii/Manifest b/media-gfx/tintii/Manifest
index e4a05a87c718..f3e1f311d523 100644
--- a/media-gfx/tintii/Manifest
+++ b/media-gfx/tintii/Manifest
@@ -1,5 +1,4 @@
 DIST tintii-2.10.0.tar.gz 620863 BLAKE2B 61127bfe1ce1eca87cea7fcd5cc6ef95c445ad0cdf32fd2d752a27818df8132ee0d7e6eab355c37ff3535be416a79b34652e8a28d8f93e0bd523a15396f6a4cd SHA512 884a9a3393080ee064069288afc13b2f72272571efaabf013ea2029627fc2ed922dcb791b8316c1d2117faf553d6bf333cf35f0486ba82aa2dc0987f9ce5f9a3
 DIST tintii_128.png 22351 BLAKE2B 54f32b1a0037e4acb05fa524ddbea10a942b0441570e4bb73f4659f1b536ac72261ad2ffd03db5a0df6f5819cb58081ce2371cce981ee037023b27054a31db56 SHA512 fb5458a10b6a461dc3b9a7e15d65616c8df318fc2a439118e0d0433e5badebe18da499ff7627ac30fd0374f754ebb90ac9c7ce5b2fb521820ea134a625862052
-EBUILD tintii-2.10.0-r1.ebuild 562 BLAKE2B 9b37fc8d75b15eb4b92f56aec9dc0cf3e7cb9222f0336301794dc86a5adba1298ee768b6af9c529c8d3024053477691f2c5a3ab35da8ea536ba5fc11f32b8aec SHA512 29ef7dde9b6e5a7b741956d10152f2070aac3e65b04107bb0e2a83c4a576ffd240ef659a524976498a7d631302ab42d2c37433929c42ee529ec2773c7e79f58e
 EBUILD tintii-2.10.0-r2.ebuild 773 BLAKE2B 24b7bd86087b371c5d3e2646b48327da64d493f4ab9462919c601537d8a9f5670c21574098dd8588a444ce7cb40f26364eb96cc525c9a9a45fa21c80deb2a7ca SHA512 5aa51a0ea3716833e067b239ba08aec990e5f35e8cd6de88d84f7deae0063fe19830b338678eda29109898916a9f12be9fc223795485b9fac2eff4d3f47abeec
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/media-gfx/tintii/tintii-2.10.0-r1.ebuild b/media-gfx/tintii/tintii-2.10.0-r1.ebuild
deleted file mode 100644
index ccb7a70d89da..000000000000
--- a/media-gfx/tintii/tintii-2.10.0-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-WX_GTK_VER="3.0-gtk3"
-inherit wxwidgets
-
-DESCRIPTION="Photo editor for selective color, saturation, and hue shift adjustments"
-HOMEPAGE="https://www.indii.org/software/tintii/"
-SRC_URI="https://www.indii.org/files/tint/releases/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	x11-libs/wxGTK:${WX_GTK_VER}[X]
-"
-DEPEND="${RDEPEND}
-	dev-libs/boost
-"
-BDEPEND="app-alternatives/bc"
-
-src_prepare() {
-	default
-	setup-wxwidgets
-}
diff --git a/media-gfx/transfig/Manifest b/media-gfx/transfig/Manifest
index c30b2e8b59f3..bdd902b4d9ff 100644
--- a/media-gfx/transfig/Manifest
+++ b/media-gfx/transfig/Manifest
@@ -4,5 +4,5 @@ AUX transfig-3.2.5e-gcc10-fno-common.patch 939 BLAKE2B 70af7830470b5ed524d6b5df5
 DIST fig2mpdf-1.1.2.tar.bz2 191438 BLAKE2B 411791fecf6e10aac92c004c7da69a10c97a6e12f811452f12d0b51b3a1eeff8fff97d831a5e64c9047855d27e6825a4e65f62be2536651e5876edd00cc822a9 SHA512 36dea40008371386b47a4451e2f311cc2540ab063e3b61e628a535775d62a8840c5cc20c37b80465184bf041c6e583aaf3e5156079e72211d0a87ff3346d2980
 DIST transfig-3.2.5e-gentoo-patchset-r1.tar.bz2 21160 BLAKE2B 093020827fc0636f7549c3b325e4f148aa52407d8e288038dd02012875737523e83e0717662d04e463a01e8cfacfabffaaa4362b5bb1276c4f2052f6653fa26f SHA512 dbef1ca464929de45f3c706e76eb9f324ea9e692cc8c924893926e07ef7d4e0dbe597bcf465a9c7fc9fca22abe0acc6784ab09658a18aeff4ba44921b52b02ff
 DIST transfig.3.2.5e.tar.gz 531256 BLAKE2B 830a97cb801b9cb284f7746a7f4a9645263cc34fd35d904288143d730331901302b12223ba135d8fa936f5ca0eeccacd194bbe2e74dfcfbf0cf4aede273ab507 SHA512 ed1379f1112514d90a4b3eecd3222baad311d804b5090e8e66867ec299e4f9a5f8d83ef8939aa6ecaa85a18143b8fb9b97f78e078ac5eeb934a158c55de6bb1e
-EBUILD transfig-3.2.5e-r2.ebuild 3546 BLAKE2B 2ed5fd1a33b9bbcff7dd103e51ee83061f5b5517fdedfa9330f51e48eba4e771667bf27eb57c542ff397a5b2a1f7a4d9692af32306debf3c4b041ac6329ba86b SHA512 55588bc54e4b2af5860a78d3c4c7e04b1fa7a47480333de39063918ef74211c5ce457d046134080f04e9717d77b8df5348291e239af70aa898d3cbd880d70bfe
+EBUILD transfig-3.2.5e-r2.ebuild 3540 BLAKE2B 4b238a7ec2a4fd8b420b8ea95a8e1eabb1e9ad9440ebbd5089376947966fd6c94e479304decabccd7d081104dabdcd401a14c28baf54dbc0aacc706fe477b5e5 SHA512 9b3b8be47db2947b4676e77daabcc8333d5c5f676947767dfdb18b53362715cd4593926e7c2d1e7d2f9b93bdbc1486edb295b30f2192733aca0ea91d4024f023
 MISC metadata.xml 484 BLAKE2B 8f0c03a4eae95a088a590133f0a911b6ff795d23aba1fddcafeceb40433b5af14c530b288552e6e97d5fd981dd37fc8491a7e4cfe5b79cf872c2fb70015d7cb6 SHA512 4c8313b75726d3fe87f68b7810f9f69a0a9fa4deddd856d5e7276bb5b419400ca583a96d59f3333edba52c71bc53f4687dcfe4e72e37e85e80a9cc95c52a733e
diff --git a/media-gfx/transfig/transfig-3.2.5e-r2.ebuild b/media-gfx/transfig/transfig-3.2.5e-r2.ebuild
index 3aa1cb9bbdf4..252609df7e84 100644
--- a/media-gfx/transfig/transfig-3.2.5e-r2.ebuild
+++ b/media-gfx/transfig/transfig-3.2.5e-r2.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	media-libs/libpng
diff --git a/media-gfx/ttfautohint/Manifest b/media-gfx/ttfautohint/Manifest
index 02c6b72070e9..a32a031794e5 100644
--- a/media-gfx/ttfautohint/Manifest
+++ b/media-gfx/ttfautohint/Manifest
@@ -1,3 +1,3 @@
 DIST ttfautohint-1.8.4.tar.gz 3539332 BLAKE2B 314c5196f01828d180d3b3e9b09c66fad9c8a8958f36003c8ae0d54b945391cb53c40f92cf57ff70e57b5a21a6aa46bc14ff9419d4b877421fdc2500ce9004e3 SHA512 983517c360f8e65ccbf17f28f045f1c0a45078707f2e30f465a7b6df4014f0ec212780ea2703bc16be1a3c6ede70f71ea3051c067fbfd06eff40ae3b20840eec
 EBUILD ttfautohint-1.8.4-r3.ebuild 1239 BLAKE2B d4e08dd60da20c388e7cf06a028377e95914482d00d5f9faa317475bf70dbda1c3daead21c94222e729558898d2a48de38da710179a39ae960fae5e7bd01d28e SHA512 cdf00cf87a9d5656017ff0adf1a24af85d97534540be71b2ecd927ea43af934be0af034e2d9e65bdb6102713b63eb41b5ecbbda816831618cf3241991772111f
-MISC metadata.xml 319 BLAKE2B aadffcaca19db31f29f3b7a25fb0d3b795cc15f8920fef3e674d7614fe5b2bd93c13c0afa91299b9b2ccd318f03ee8b45f5eb41d69d1e3253678a081f2f2e4e2 SHA512 582e2fca2456cabafa5ef03ed1aeb96aaebaa54264682e0c641fe3b6ed5e17da6004f579ce3b91c0ea59db8e0ae949554433e129d6c142f4725db695e29bd5e8
+MISC metadata.xml 240 BLAKE2B 7383955337dcafd7da9cfd7fd9597e8543c054a4484e2761c141ed1ac472bee67609505972c5251da2fdfcb085877815add73e5995ae318efdca783c7bd9ca21 SHA512 82a8f1a45f126c30c170d574af01f547d575fa1888574b87556b8ad11910cf4c9e84d1acfeb694413aa1d17badf2bfdf574d6f47a0e8a616bd015e44e0736343
diff --git a/media-gfx/ttfautohint/metadata.xml b/media-gfx/ttfautohint/metadata.xml
index 82f6e7d06a5b..ecf181a5790e 100644
--- a/media-gfx/ttfautohint/metadata.xml
+++ b/media-gfx/ttfautohint/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-  <email>matthew@gentoo.org</email>
-  <name>Matthew Smith</name>
-</maintainer>
+<!-- maintainer-needed -->
 <slots>
   <subslots>reflect soname of libttfautohint</subslots>
 </slots>
diff --git a/media-gfx/tuxpaint/Manifest b/media-gfx/tuxpaint/Manifest
index 92cbfc69f920..6744eea32de2 100644
--- a/media-gfx/tuxpaint/Manifest
+++ b/media-gfx/tuxpaint/Manifest
@@ -1,12 +1,5 @@
-AUX tuxpaint-0.9.28-r2-Makefile.patch 9935 BLAKE2B e8fc056769a2e188aacab9dd8b8d9c88c1a54543b9f8908830e56aa476ba0c3aec880b2d4b10500595e712f895f530723bebae19c9c9bee76d45ada7a1431375 SHA512 e6ec2057ffad2500074c6ead47d8e6abdf29cca8898280bac7573e86a0a45148c594ea8b3655a633a88fbfdcc557ff8af2310e7aa073fb6f74a7d373d498c7a4
-AUX tuxpaint-0.9.29-Makefile-trans.patch 907 BLAKE2B 995a08fe64cd71b8f7bdbbf81df09bf3ff3a8082979b14c390ea52945b55524371a83715e0026cce99a5dc2fb0d44e5ed31c2abff321d3493dfe9183654e99f3 SHA512 8d8199d55167446e1d30e6765f3ca320ef085ec1cbbc92c9e60cdb68238507e828f5b143f4a15069a55a807fa0c948474f6ff2cb78f4460644980153c57711c1
-AUX tuxpaint-0.9.29-Makefile.patch 7299 BLAKE2B 25b93ca9659dca9bffadd78cd8dd49b8f3c1d28fac6ee5ea7f4825144beca70db7eb47b3b1950f7d1acf4f92f9078e471e016555317b831998dff04dee0b47b5 SHA512 f3a7d7df26a1bf45024906ac7f661b0517822175439444d1072701bac7d806c70031e689792eea9d29c6b4ba4c519b58918a6df6ba8f3553eb1f7da2010956e1
 AUX tuxpaint-0.9.31-Makefile.patch 7209 BLAKE2B 373c4ecd0f5bea700a630b61a4f3068477fbe02f146774631fa726dbd72ba2091b1206ede50be246fb4d10ed517c62f56fd029367955cc9ebbcea8dacf71001b SHA512 31d5891fa33f7c6c39c5cb1225d46be9c425cf284c1a31dd8b62d3250d35e93912f7b91803cb32d64fa0d1ec3ea59997ecfc5d6270601acaf2f9e7d4ff804a7f
-DIST tuxpaint-0.9.28.tar.gz 14802638 BLAKE2B 7f7a8f3d61faf052d9872b5af775a6becdefae7cee1207ebcbb5db108fc381b0fa5ba8b7a8facd55ba6dcfca59886125cba7837d2de432fd5c75d2c40b509c41 SHA512 038f92f8d7ee8d85b1c9b18f7781e814ee55067e090fbfa597028e2d13218911157d00f312de2be9db29754a07c5706fc3c3e0e6ea3c71a15f80c37bb2eceb34
-DIST tuxpaint-0.9.29.tar.gz 17144658 BLAKE2B db00b14862ca139b0ee2851b7f57bda0df12d09ae516649dab25eb260bfc65fef35c968ab39593a71c173f196dc24426c5d4be79eee230c7139a7832d5508171 SHA512 9642c7145d32848e663b69428d7ff046e6109b292f3c3104dc40f8fcbf4152ab39815cf7dd3a217b0a6bd26ea50c57e0b14b186a23157fbac091ee10436646b3
 DIST tuxpaint-0.9.31.tar.gz 21733142 BLAKE2B 00041eacd062ac4e535451d4b4a6ac6d92fb7a0b6328dad4c7424b1bf0b95f0d3d2915e5ed7392cbf2f36174e56ceff5fadcf795c3368b3f2a958d794ce0b66a SHA512 7a3df8dce3e354cc22af34d55546de6e033e8ed4f44530b89986c3e1a07961e5e1a132f12f2d3fc5b699c500e7b9e7ab3503d2bafc5041d9fb2dbc8d1479b79f
-EBUILD tuxpaint-0.9.28-r3.ebuild 1447 BLAKE2B 07a3ad22384e9a568e35614b15a7399ed316729d5b10fc369c1b4c2e045998017ecbe57d0d12ebb849ac65b4d0a0cb259961015ff54daf2942e21d561ffecbc2 SHA512 5383c078daeaca92ae225dfb474cc7ca2559af6cc57ed7c7ac0c95d38a1bc4f6f716255ffde28a5bf8dbf3c3b865667b342ae4adb92856eb564d465cc3c81f6e
-EBUILD tuxpaint-0.9.29-r1.ebuild 1468 BLAKE2B f758ade2c416e9947b784861fda77558c73718f332bc78add89eec2b45700ed9b6f2f71514f9e625e3420d158f9d575db1588c1f520e19db2096db69b402ba44 SHA512 943a9b97b3a33fc2c4982411079b490e4fe2f6cf6f478910f96c1f64e18335a8c0279ac0b6e3fccb67289592c361c00c9fccf749b999f613bd65bab05a36b2bb
-EBUILD tuxpaint-0.9.31-r1.ebuild 1428 BLAKE2B 10454a93c008ef68bf9a15e67c92d6f0eaa1958f187e7444ef66ced74b6e23a40303a2821c0accb6349421a7609afc3fc34c003b591167015bb057e77f2e7a11 SHA512 623beac5b2d0abf72704465d74b8fa9480a0402117f6008091f7149d7d5eb212dba0fe990c1173de175235533007c05ceba813577c33aff38796c24f23087d70
+EBUILD tuxpaint-0.9.31-r1.ebuild 1427 BLAKE2B 199c367c67aa6ed22c2b124c57640d0a63423613bd35bed20ecc3d991244e8ea9874a06dc34e6c6283a9cd7a0ba3b482a1db15e084b8e989da5e659d049dfb23 SHA512 12c036742278d2cc2e72ca557068eaf6f6566ed489d758909514169fcd899e7141e62d348ef93101e7aeb7ef01512c13f816390336b32d87547d6be37ba29cf7
 EBUILD tuxpaint-0.9.31.ebuild 1425 BLAKE2B de29f9cd21b6c20c910dd59d5def7f8975957f65f2939643d43d6833b8c9401beb3c8b655acf43d6bc20f1169d19e59e137dbe74a2b070fa21f8c3dcd09731b9 SHA512 c2b509fba2c950ac3fd239242bd01df0e18293fc1a6324b0cfb4f690eb2591a6230cb3fa23f546473995152efbee69c0011c37818f4871c1814d1e68d14b9189
 MISC metadata.xml 846 BLAKE2B 41e02607ee8987a7663ba72e7459a1845b73d9992e4939322db2b4ce654d06efb0d5acc935decb776aa50a20990244d0e422e4c32532fa0f17a76a9a637ac734 SHA512 59465c99f8f91e4def6ffd37f7bcfd22cb208c1f9dcbdd11c764e4f55d1e9db75169254b9ca3ed7642f57d45d4d10e9f97c80d5139cb0b80ccd20dc540185ade
diff --git a/media-gfx/tuxpaint/files/tuxpaint-0.9.28-r2-Makefile.patch b/media-gfx/tuxpaint/files/tuxpaint-0.9.28-r2-Makefile.patch
deleted file mode 100644
index 6ea373620e3e..000000000000
--- a/media-gfx/tuxpaint/files/tuxpaint-0.9.28-r2-Makefile.patch
+++ /dev/null
@@ -1,231 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -73,7 +73,7 @@ endif
- # <HOSTROOT> is the directory containing support files for building for <HOST>:
- #   <HOSTROOT>/include        Header files.
- #   <HOSTROOT>/lib            Library files.
--#   <HOSTROOT>/lib/pkgconfig  *.pc files.
-+#   <HOSTROOT>/pkgconfig  *.pc files.
- #
- ifdef HOST
-   ifdef HOSTROOT
-@@ -104,7 +104,7 @@ ifdef HOST
-     # We set PKG_CONFIG_LIBDIR instead of PKG_CONFIG_PATH because we want to
-     # *change* where pkg-config looks for .pc files instead of adding to the
-     # default path which may have libraries that aren't for HOST.
--    export PKG_CONFIG_LIBDIR:=$(HOSTROOT)/lib/pkgconfig
-+    export PKG_CONFIG_LIBDIR:=$(HOSTROOT)/$(GENTOO_LIBDIR)/pkgconfig
-   endif
- endif
- 
-@@ -170,14 +170,14 @@ windows_ARCH_CFLAGS:=
- macos_ARCH_CFLAGS:=-isysroot $(SDKROOT) -I$(SDKROOT)/usr/include -I$(HOSTROOT)/include -mmacosx-version-min=$(MINVER) -arch $(subst $() $(), -arch ,$(ARCHS)) -w -headerpad_max_install_names -DHAVE_STRCASESTR
- ios_ARCH_CFLAGS:=-isysroot $(SDKROOT) -I$(SDKROOT)/usr/include -I$(HOSTROOT)/include $(MINVEROPT) -arch $(subst $() $(), -arch ,$(ARCHS)) -w -fPIC -DHAVE_STRCASESTR -DUNLINK_ONLY
- beos_ARCH_CFLAGS:=
--linux_ARCH_CFLAGS:=
-+linux_ARCH_CFLAGS:=${CFLAGS}
- ARCH_CFLAGS:=$($(OS)_ARCH_CFLAGS)
- 
- windows_ARCH_LDFLAGS:=
- macos_ARCH_LDFLAGS:=-isysroot $(SDKROOT) -L$(HOSTROOT)/lib -mmacosx-version-min=$(MINVER) -arch $(subst $() $(), -arch ,$(ARCHS))
- ios_ARCH_LDFLAGS:=-isysroot $(SDKROOT) -L$(HOSTROOT)/lib $(MINVEROPT) -arch $(subst $() $(), -arch ,$(ARCHS))
- beos_ARCH_LDFLAGS:=
--linux_ARCH_LDFLAGS:=
-+linux_ARCH_LDFLAGS:=${LDFLAGS}
- ARCH_LDFLAGS:=$($(OS)_ARCH_LDFLAGS)
- LDFLAGS:=$(ARCH_LDFLAGS)
- 
-@@ -206,7 +206,7 @@ ARCH_HEADERS:=$($(OS)_ARCH_HEADERS)
- windows_PREFIX:=/usr/local
- macos_PREFIX:=Resources
- ios_PREFIX:=.
--linux_PREFIX:=/usr/local
-+linux_PREFIX:=/usr
- PREFIX:=$($(OS)_PREFIX)
- 
- # Root directory to place files when creating packages.
-@@ -240,11 +240,11 @@ LIBDIR=$(PREFIX)
- 
- # Magic Tool plug-ins
- INCLUDE_PREFIX:=$(DESTDIR)$(PREFIX)/include
--MAGIC_PREFIX:=$(DESTDIR)$(LIBDIR)/lib$(LIBDIRSUFFIX)/tuxpaint/plugins
-+MAGIC_PREFIX:=$(DESTDIR)$(LIBDIR)/${GENTOO_LIBDIR}/tuxpaint/plugins
- 
- # Docs and man page:
--DOC_PREFIX:=$(DESTDIR)$(PREFIX)/share/doc/tuxpaint-$(VER_VERSION)
--DEVDOC_PREFIX:=$(DESTDIR)$(PREFIX)/share/doc/tuxpaint-$(VER_VERSION)/tuxpaint-dev
-+DOC_PREFIX:=$(DESTDIR)$(PREFIX)/share/doc/${PF}
-+DEVDOC_PREFIX:=$(DESTDIR)$(PREFIX)/share/doc/${PF}/tuxpaint-dev
- MAN_PREFIX:=$(DESTDIR)$(PREFIX)/share/man
- DEVMAN_PREFIX:=$(DESTDIR)$(PREFIX)/share/man
- 
-@@ -359,7 +359,7 @@ MOUSE_CFLAGS:=-Isrc/$(MOUSEDIR) -D$(CURSOR_SHAPES)_CURSOR_SHAPES
- # are 132x80.  On larger screens, they will be bigger (since the New dialog
- # is always 4x4 thumbnails); therefore, generating larger thumbs, which can
- # be still be scaled down fairly quickly (esp. complicated SVG ones).
--CONVERT_OPTS:=-alpha Background -alpha Off +depth -resize !264x160 -background white -interlace none
-+CONVERT_OPTS:=-resize 264x160 -background white -extent 0x0 -interlace none
- 
- .SUFFIXES:
- 
-@@ -447,7 +447,7 @@ INSTALLED_MODIRS:=$(patsubst trans/%.mo,$(LOCALE_PREFIX)/%/LC_MESSAGES,$(MOFILES
- 
- $(INSTALLED_MODIRS): $(LOCALE_PREFIX)/%/LC_MESSAGES: trans/%.mo
- 	install -d -m 755 $@
--$(INSTALLED_MOFILES): $(LOCALE_PREFIX)/%/LC_MESSAGES/tuxpaint.mo: trans/%.mo
-+$(INSTALLED_MOFILES): $(LOCALE_PREFIX)/%/LC_MESSAGES/tuxpaint.mo: trans/%.mo $(INSTALLED_MODIRS)
- 	install -m 644 $< $@
- 
- .PHONY: uninstall-i18n
-@@ -526,7 +526,7 @@ endif
- 
- # Build the translation files for gettext
- 
--$(MOFILES): trans/%.mo: src/po/%.po  
-+$(MOFILES): trans/%.mo: src/po/%.po trans
- 	msgfmt -o $@ $<
- 
- .PHONY: translations
-@@ -551,7 +551,7 @@ trans:
- windows_ARCH_INSTALL:=
- macos_ARCH_INSTALL:=install-macbundle
- ios_ARCH_INSTALL:=install-iosbundle
--linux_ARCH_INSTALL:=install-xdg install-man install-importscript install-bash-completion
-+linux_ARCH_INSTALL:=install-man install-importscript install-bash-completion
- ARCH_INSTALL:=$($(OS)_ARCH_INSTALL)
- 
- # "make install" installs all of the various parts
-@@ -627,7 +627,7 @@ install-magic-plugins:
- 			$(DATA_PREFIX)/sounds/magic/*.ogg
- 
- .PHONY: install-magic-plugins
--install-magic-plugin-dev:	src/tp_magic_api.h
-+install-magic-plugin-dev:	src/tp_magic_api.h install-bin
- 	@echo
- 	@echo "...Installing Magic Tool plug-in development files and docs..."
- 	@cp tp-magic-config $(BIN_PREFIX)
-@@ -719,12 +719,12 @@ uninstall:	uninstall-i18n
- 	-rm $(BIN_PREFIX)/tuxpaint-import
- 	-rm -r $(DATA_PREFIX)
- 	-rm -r $(DOC_PREFIX)
--	-rm $(MAN_PREFIX)/man1/tuxpaint.1.gz
--	-rm $(MAN_PREFIX)/*/man1/tuxpaint.1.gz
--	-rm $(MAN_PREFIX)/man1/tuxpaint-import.1.gz
--	-rm $(MAN_PREFIX)/*/man1/tuxpaint-import.1.gz
--	-rm $(MAN_PREFIX)/man1/tp-magic-config.1.gz
--	-rm $(MAN_PREFIX)/*/man1/tp-magic-config.1.gz
-+	-rm $(MAN_PREFIX)/man1/tuxpaint.1
-+	-rm $(MAN_PREFIX)/*/man1/tuxpaint.1
-+	-rm $(MAN_PREFIX)/man1/tuxpaint-import.1
-+	-rm $(MAN_PREFIX)/*/man1/tuxpaint-import.1
-+	-rm $(MAN_PREFIX)/man1/tp-magic-config.1
-+	-rm $(MAN_PREFIX)/*/man1/tp-magic-config.1
- 	-rm -f -r $(CONFDIR)
- 	-rm $(COMPLETIONDIR)/tuxpaint-completion.bash
- 	-rm -r $(MAGIC_PREFIX)
-@@ -783,7 +783,7 @@ install-example-stamps:
- STARTERS:=$(wildcard starters/*.*)
- INSTALLED_STARTERS:=$(patsubst %,$(DATA_PREFIX)/%,$(STARTERS))
- 
--$(INSTALLED_STARTERS): $(DATA_PREFIX)/%: %
-+$(INSTALLED_STARTERS): $(DATA_PREFIX)/%: % install-example-starters-dirs
- 	install -m 644 $< $@
- 
- install-example-starters-dirs:
-@@ -817,14 +817,14 @@ $(THUMB_STARTERS):
- 	@mkdir -p starters/.thumbs
- 	@if [ "x" != "x"$(STARTER_BACK_NAME) ] ; \
- 	then \
--		composite $(STARTER_NAME) $(STARTER_BACK_NAME) obj/tmp_$(notdir $(STARTER_NAME)).png ; \
--		convert $(CONVERT_OPTS) obj/tmp_$(notdir $(STARTER_NAME)).png $@ 2> /dev/null ; \
-+		gm composite $(STARTER_NAME) $(STARTER_BACK_NAME) obj/tmp_$(notdir $(STARTER_NAME)).png 2> /dev/null ; \
-+		gm convert $(CONVERT_OPTS) obj/tmp_$(notdir $(STARTER_NAME)).png $@ || echo "($@ failed)" ; \
- 		rm obj/tmp_$(notdir $(STARTER_NAME)).png ; \
- 	else \
--		convert $(CONVERT_OPTS) $(STARTER_NAME) $@ 2> /dev/null || ( echo "($@ failed)" ; rm $@ ) ; \
-+		gm convert $(CONVERT_OPTS) $(STARTER_NAME) $@ 2> /dev/null || ( echo "($@ failed)" ; rm $@ ) ; \
- 	fi
- 
--$(INSTALLED_THUMB_STARTERS): $(DATA_PREFIX)/%: %
-+$(INSTALLED_THUMB_STARTERS): $(DATA_PREFIX)/%: % install-example-starters-dirs
- 	@install -D -m 644 $< $@ || ( echo "NO THUMB $<" )
- 
- .PHONY: echo-thumb-starters
-@@ -849,7 +849,7 @@ install-thumb-starters: echo-install-thumb-starters $(INSTALLED_THUMB_STARTERS)
- TEMPLATES:=$(wildcard templates/*.*)
- INSTALLED_TEMPLATES:=$(patsubst %,$(DATA_PREFIX)/%,$(TEMPLATES))
- 
--$(INSTALLED_TEMPLATES): $(DATA_PREFIX)/%: %
-+$(INSTALLED_TEMPLATES): $(DATA_PREFIX)/%: % install-example-template-dirs
- 	install -m 644 $< $@
- 
- install-example-template-dirs:
-@@ -876,7 +876,7 @@ TEMPLATE_NAME=$(or $(wildcard $(subst templates/.thumbs,templates,$(@:-t.png=.sv
- $(THUMB_TEMPLATES):
- 	@printf "."
- 	@mkdir -p templates/.thumbs
--	@convert $(CONVERT_OPTS) $(TEMPLATE_NAME) $@ 2> /dev/null || ( echo "($@ failed)" ; rm $@ ) ; \
-+	@gm convert $(CONVERT_OPTS) $(TEMPLATE_NAME) $@ 2> /dev/null || ( echo "($@ failed)" ; rm $@ ) ; \
- 
- $(INSTALLED_THUMB_TEMPLATES): $(DATA_PREFIX)/%: %
- 	@install -D -m 644 $< $@ || ( echo "NO THUMB $<" )
-@@ -988,9 +988,9 @@ install-dlls:
- 	@cp -R win32/etc/ $(BIN_PREFIX)
- 	@echo
- 	@echo "...Installing Library Modules..."
--	@mkdir -p $(BIN_PREFIX)/lib/gdk-pixbuf-2.0/2.10.0/loaders
--	@cp $(MINGW_DIR)/lib/gdk-pixbuf-2.0/2.10.0/loaders/*.dll $(BIN_PREFIX)/lib/gdk-pixbuf-2.0/2.10.0/loaders
--	@strip -s $(BIN_PREFIX)/lib/gdk-pixbuf-2.0/2.10.0/loaders/*.dll
-+	@mkdir -p $(BIN_PREFIX)/$(GENTOO_LIBDIR)/gdk-pixbuf-2.0/2.10.0/loaders
-+	@cp $(MINGW_DIR)/$(GENTOO_LIBDIR)/gdk-pixbuf-2.0/2.10.0/loaders/*.dll $(BIN_PREFIX)/lib/gdk-pixbuf-2.0/2.10.0/loaders
-+	@strip -s $(BIN_PREFIX)/$(GENTOO_LIBDIR)/gdk-pixbuf-2.0/2.10.0/loaders/*.dll
- 
- # Install symlink:
- .PHONY: install-haiku
-@@ -1001,7 +1001,7 @@ install-haiku:
- 
- # Install the import script:
- .PHONY: install-importscript
--install-importscript:
-+install-importscript: install-bin
- 	@echo
- 	@echo "...Installing 'tuxpaint-import' script..."
- 	@cp src/tuxpaint-import.sh $(BIN_PREFIX)/tuxpaint-import
-@@ -1065,24 +1065,20 @@ install-man:
- 	@install -d $(MAN_PREFIX)/man1
- 	@# tuxpaint.1
- 	@cp man/en/tuxpaint.1 $(MAN_PREFIX)/man1/
--	@gzip -f $(MAN_PREFIX)/man1/tuxpaint.1
--	@chmod a+rx,g-w,o-w $(MAN_PREFIX)/man1/tuxpaint.1.gz
-+	@chmod a+rx,g-w,o-w $(MAN_PREFIX)/man1/tuxpaint.1
- 	@# tuxpaint-import.1
- 	@cp man/en/tuxpaint-import.1 $(MAN_PREFIX)/man1/
--	@gzip -f $(MAN_PREFIX)/man1/tuxpaint-import.1
--	@chmod a+rx,g-w,o-w $(MAN_PREFIX)/man1/tuxpaint-import.1.gz
-+	@chmod a+rx,g-w,o-w $(MAN_PREFIX)/man1/tuxpaint-import.1
- 	@# tp-magic-config.1
- 	@cp man/en/tp-magic-config.1 $(MAN_PREFIX)/man1/
--	@gzip -f $(MAN_PREFIX)/man1/tp-magic-config.1
--	@chmod a+rx,g-w,o-w $(MAN_PREFIX)/man1/tp-magic-config.1.gz
-+	@chmod a+rx,g-w,o-w $(MAN_PREFIX)/man1/tp-magic-config.1
- 	@echo
- 	for l in `ls -d man/*.UTF-8 | cut -d '/' -f 2`; do \
- 		DEST=$(MAN_PREFIX)/$$l/man1 ; \
- 		echo "...Installing $$l man pages into $$DEST..." ; \
- 		install -d $$DEST ; \
- 		cp man/$$l/tuxpaint.1 $$DEST ; \
--		gzip -f $$DEST/tuxpaint.1 ; \
--		chmod a+rx,g-w,o-w $$DEST/tuxpaint.1.gz ; \
-+		chmod a+rx,g-w,o-w $$DEST/tuxpaint.1 ; \
- 	done
- 	@# FIXME: The other man pages aren't localizable yet -bjk 2021.08.14
- 
-@@ -1382,7 +1378,7 @@ SHARED_FLAGS:=-shared -fpic -lm
- MAGIC_C:=$(wildcard magic/src/*.c)
- MAGIC_SO:=$(patsubst magic/src/%.c,magic/%.$(SO_TYPE),$(MAGIC_C))
- 
--$(MAGIC_SO): magic/%.$(SO_TYPE): magic/src/%.c  
-+$(MAGIC_SO): magic/%.$(SO_TYPE): magic/src/%.c src/tp_magic_api.h 
- 	$(CC) $(MAGIC_CFLAGS) $(LDFLAGS) $(SHARED_FLAGS) -o $@ $< $(PLUGIN_LIBS)
- # Probably should separate the various flags like the following:
- #	$(CC) $(PLUG_CPPFLAGS) $(PLUG_CFLAGS) $(PLUG_LDFLAGS) -o $@ $< $(PLUG_LIBS)
diff --git a/media-gfx/tuxpaint/files/tuxpaint-0.9.29-Makefile-trans.patch b/media-gfx/tuxpaint/files/tuxpaint-0.9.29-Makefile-trans.patch
deleted file mode 100644
index 20868602f65b..000000000000
--- a/media-gfx/tuxpaint/files/tuxpaint-0.9.29-Makefile-trans.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-# Sometimes the trans directory isn't created before 
-# accessing it.
-# Upstream commit b452d84d2544a38eca1d2e4e9686a8eaef197d0f
-# fixes this.
---- a/Makefile
-+++ b/Makefile
-@@ -535,6 +535,7 @@ endif
- # Build the translation files for gettext
- 
- $(MOFILES): trans/%.mo: src/po/%.po
-+	@-mkdir -p trans
- 	msgfmt -o $@ $<
- 
- %.desktop: %.desktop.in $(POTFILES)
-@@ -552,14 +553,9 @@ translations: trans
- 	@echo "Install gettext to run Tux Paint in non-U.S. English modes."
- 	@echo "--------------------------------------------------------------"
- else
--translations: trans $(MOFILES) src/tuxpaint.desktop src/tuxpaint-fullscreen.desktop src/org.tuxpaint.Tuxpaint.appdata.xml
-+translations: $(MOFILES) src/tuxpaint.desktop src/tuxpaint-fullscreen.desktop src/org.tuxpaint.Tuxpaint.appdata.xml
- endif
- 
--trans:
--	@echo
--	@echo "...Preparing translation files..."
--	@mkdir trans
--
- ######
- 
- windows_ARCH_INSTALL:=
diff --git a/media-gfx/tuxpaint/files/tuxpaint-0.9.29-Makefile.patch b/media-gfx/tuxpaint/files/tuxpaint-0.9.29-Makefile.patch
deleted file mode 100644
index e0b1c43a03bb..000000000000
--- a/media-gfx/tuxpaint/files/tuxpaint-0.9.29-Makefile.patch
+++ /dev/null
@@ -1,164 +0,0 @@
-diff --git a/Makefile.old b/Makefile
-index 88d0d02..ab71f97 100644
---- a/Makefile.old
-+++ b/Makefile
-@@ -74,7 +74,7 @@ endif
- # <HOSTROOT> is the directory containing support files for building for <HOST>:
- #   <HOSTROOT>/include        Header files.
- #   <HOSTROOT>/lib            Library files.
--#   <HOSTROOT>/lib/pkgconfig  *.pc files.
-+#   <HOSTROOT>/pkgconfig  *.pc files.
- #
- ifdef HOST
-   ifdef HOSTROOT
-@@ -105,7 +105,7 @@ ifdef HOST
-     # We set PKG_CONFIG_LIBDIR instead of PKG_CONFIG_PATH because we want to
-     # *change* where pkg-config looks for .pc files instead of adding to the
-     # default path which may have libraries that aren't for HOST.
--    export PKG_CONFIG_LIBDIR:=$(HOSTROOT)/lib/pkgconfig
-+    export PKG_CONFIG_LIBDIR:=$(HOSTROOT)/$(GENTOO_LIBDIR)/pkgconfig
-   endif
- endif
- 
-@@ -171,14 +171,14 @@ windows_ARCH_CFLAGS:=
- macos_ARCH_CFLAGS:=-isysroot $(SDKROOT) -I$(SDKROOT)/usr/include -I$(HOSTROOT)/include -mmacosx-version-min=$(MINVER) -arch $(subst $() $(), -arch ,$(ARCHS)) -w -headerpad_max_install_names -DHAVE_STRCASESTR
- ios_ARCH_CFLAGS:=-isysroot $(SDKROOT) -I$(SDKROOT)/usr/include -I$(HOSTROOT)/include $(MINVEROPT) -arch $(subst $() $(), -arch ,$(ARCHS)) -w -fPIC -DHAVE_STRCASESTR -DUNLINK_ONLY
- beos_ARCH_CFLAGS:=
--linux_ARCH_CFLAGS:=
-+linux_ARCH_CFLAGS:=${CFLAGS}
- ARCH_CFLAGS:=$($(OS)_ARCH_CFLAGS)
- 
- windows_ARCH_LDFLAGS:=
- macos_ARCH_LDFLAGS:=-isysroot $(SDKROOT) -L$(HOSTROOT)/lib -mmacosx-version-min=$(MINVER) -arch $(subst $() $(), -arch ,$(ARCHS))
- ios_ARCH_LDFLAGS:=-isysroot $(SDKROOT) -L$(HOSTROOT)/lib $(MINVEROPT) -arch $(subst $() $(), -arch ,$(ARCHS))
- beos_ARCH_LDFLAGS:=
--linux_ARCH_LDFLAGS:=
-+linux_ARCH_LDFLAGS:=${LDFLAGS}
- ARCH_LDFLAGS:=$($(OS)_ARCH_LDFLAGS)
- LDFLAGS:=$(ARCH_LDFLAGS)
- 
-@@ -207,7 +207,7 @@ ARCH_HEADERS:=$($(OS)_ARCH_HEADERS)
- windows_PREFIX:=/usr/local
- macos_PREFIX:=Resources
- ios_PREFIX:=.
--linux_PREFIX:=/usr/local
-+linux_PREFIX:=/usr
- PREFIX:=$($(OS)_PREFIX)
- 
- # Root directory to place files when creating packages.
-@@ -241,10 +241,10 @@ LIBDIR=$(PREFIX)
- 
- # Magic Tool plug-ins
- INCLUDE_PREFIX:=$(DESTDIR)$(PREFIX)/include
--MAGIC_PREFIX:=$(DESTDIR)$(LIBDIR)/lib$(LIBDIRSUFFIX)/tuxpaint/plugins
-+MAGIC_PREFIX:=$(DESTDIR)$(LIBDIR)/${GENTOO_LIBDIR}/tuxpaint/plugins
- 
- # Docs and man page:
--DOC_PREFIX:=$(DESTDIR)$(PREFIX)/share/doc/tuxpaint-$(VER_VERSION)
-+DOC_PREFIX:=$(DESTDIR)$(PREFIX)/share/doc/${PF}
- MAN_PREFIX:=$(DESTDIR)$(PREFIX)/share/man
- DEVMAN_PREFIX:=$(DESTDIR)$(PREFIX)/share/man
- 
-@@ -367,7 +367,7 @@ MOUSE_CFLAGS:=-Isrc/$(MOUSEDIR) -D$(CURSOR_SHAPES)_CURSOR_SHAPES
- # are 132x80.  On larger screens, they will be bigger (since the New dialog
- # is always 4x4 thumbnails); therefore, generating larger thumbs, which can
- # be still be scaled down fairly quickly (esp. complicated SVG ones).
--CONVERT_OPTS:=-alpha Background -alpha Off +depth -resize !264x160 -background white -interlace none
-+CONVERT_OPTS:=-resize 264x160 -background white -extent 0x0 -interlace none
- 
- .SUFFIXES:
- 
-@@ -551,7 +551,7 @@ trans:
- windows_ARCH_INSTALL:=
- macos_ARCH_INSTALL:=install-macbundle
- ios_ARCH_INSTALL:=install-iosbundle
--linux_ARCH_INSTALL:=install-xdg install-man install-importscript install-bash-completion
-+linux_ARCH_INSTALL:=install-man install-importscript install-bash-completion
- ARCH_INSTALL:=$($(OS)_ARCH_INSTALL)
- 
- # "make install" installs all of the various parts
-@@ -719,12 +719,12 @@ uninstall:	uninstall-i18n
- 	-rm $(BIN_PREFIX)/tuxpaint-import
- 	-rm -r $(DATA_PREFIX)
- 	-rm -r $(DOC_PREFIX)
--	-rm $(MAN_PREFIX)/man1/tuxpaint.1.gz
--	-rm $(MAN_PREFIX)/*/man1/tuxpaint.1.gz
--	-rm $(MAN_PREFIX)/man1/tuxpaint-import.1.gz
--	-rm $(MAN_PREFIX)/*/man1/tuxpaint-import.1.gz
--	-rm $(MAN_PREFIX)/man1/tp-magic-config.1.gz
--	-rm $(MAN_PREFIX)/*/man1/tp-magic-config.1.gz
-+	-rm $(MAN_PREFIX)/man1/tuxpaint.1
-+	-rm $(MAN_PREFIX)/*/man1/tuxpaint.1
-+	-rm $(MAN_PREFIX)/man1/tuxpaint-import.1
-+	-rm $(MAN_PREFIX)/*/man1/tuxpaint-import.1
-+	-rm $(MAN_PREFIX)/man1/tp-magic-config.1
-+	-rm $(MAN_PREFIX)/*/man1/tp-magic-config.1
- 	-rm -f -r $(CONFDIR)
- 	-rm $(COMPLETIONDIR)/tuxpaint-completion.bash
- 	-rm -r $(MAGIC_PREFIX)
-@@ -855,11 +855,11 @@ $(THUMB_STARTERS):
- 	@mkdir -p starters/.thumbs
- 	@if [ "x" != "x"$(STARTER_BACK_NAME) ] ; \
- 	then \
--		composite $(STARTER_NAME) $(STARTER_BACK_NAME) obj/tmp_$(notdir $(STARTER_NAME)).png ; \
--		convert $(CONVERT_OPTS) obj/tmp_$(notdir $(STARTER_NAME)).png $@ 2> /dev/null ; \
-+		gm composite $(STARTER_NAME) $(STARTER_BACK_NAME) obj/tmp_$(notdir $(STARTER_NAME)).png 2> /dev/null ; \
-+		gm convert $(CONVERT_OPTS) obj/tmp_$(notdir $(STARTER_NAME)).png $@ || echo "($@ failed)" ; \
- 		rm obj/tmp_$(notdir $(STARTER_NAME)).png ; \
- 	else \
--		convert $(CONVERT_OPTS) $(STARTER_NAME) $@ 2> /dev/null || ( echo "($@ failed)" ; rm $@ ) ; \
-+		gm convert $(CONVERT_OPTS) $(STARTER_NAME) $@ 2> /dev/null || ( echo "($@ failed)" ; rm $@ ) ; \
- 	fi
- 
- $(INSTALLED_THUMB_STARTERS): $(DATA_PREFIX)/%: % install-example-starters-dirs
-@@ -876,7 +876,7 @@ TEMPLATE_NAME=$(or $(wildcard $(subst templates/.thumbs,templates,$(@:-t.png=.sv
- $(THUMB_TEMPLATES):
- 	@printf "."
- 	@mkdir -p templates/.thumbs
--	@convert $(CONVERT_OPTS) $(TEMPLATE_NAME) $@ 2> /dev/null || ( echo "($@ failed)" ; rm $@ ) ; \
-+	@gm convert $(CONVERT_OPTS) $(TEMPLATE_NAME) $@ 2> /dev/null || ( echo "($@ failed)" ; rm $@ ) ; \
- 
- $(INSTALLED_THUMB_TEMPLATES): $(DATA_PREFIX)/%: %
- 	@install -D -m 644 $< $@ || ( echo "NO THUMB $<" )
-@@ -988,9 +988,9 @@ install-dlls:
- 	@cp -R win32/etc/ $(BIN_PREFIX)
- 	@echo
- 	@echo "...Installing Library Modules..."
--	@mkdir -p $(BIN_PREFIX)/lib/gdk-pixbuf-2.0/2.10.0/loaders
--	@cp $(MINGW_DIR)/lib/gdk-pixbuf-2.0/2.10.0/loaders/*.dll $(BIN_PREFIX)/lib/gdk-pixbuf-2.0/2.10.0/loaders
--	@strip -s $(BIN_PREFIX)/lib/gdk-pixbuf-2.0/2.10.0/loaders/*.dll
-+	@mkdir -p $(BIN_PREFIX)/$(GENTOO_LIBDIR)/gdk-pixbuf-2.0/2.10.0/loaders
-+	@cp $(MINGW_DIR)/$(GENTOO_LIBDIR)/gdk-pixbuf-2.0/2.10.0/loaders/*.dll $(BIN_PREFIX)/lib/gdk-pixbuf-2.0/2.10.0/loaders
-+	@strip -s $(BIN_PREFIX)/$(GENTOO_LIBDIR)/gdk-pixbuf-2.0/2.10.0/loaders/*.dll
- 
- # Install symlink:
- .PHONY: install-haiku
-@@ -1065,24 +1065,20 @@ install-man:
- 	@install -d $(MAN_PREFIX)/man1
- 	@# tuxpaint.1
- 	@cp man/en/tuxpaint.1 $(MAN_PREFIX)/man1/
--	@gzip -f $(MAN_PREFIX)/man1/tuxpaint.1
--	@chmod a+rx,g-w,o-w $(MAN_PREFIX)/man1/tuxpaint.1.gz
-+	@chmod a+rx,g-w,o-w $(MAN_PREFIX)/man1/tuxpaint.1
- 	@# tuxpaint-import.1
- 	@cp man/en/tuxpaint-import.1 $(MAN_PREFIX)/man1/
--	@gzip -f $(MAN_PREFIX)/man1/tuxpaint-import.1
--	@chmod a+rx,g-w,o-w $(MAN_PREFIX)/man1/tuxpaint-import.1.gz
-+	@chmod a+rx,g-w,o-w $(MAN_PREFIX)/man1/tuxpaint-import.1
- 	@# tp-magic-config.1
- 	@cp man/en/tp-magic-config.1 $(MAN_PREFIX)/man1/
--	@gzip -f $(MAN_PREFIX)/man1/tp-magic-config.1
--	@chmod a+rx,g-w,o-w $(MAN_PREFIX)/man1/tp-magic-config.1.gz
-+	@chmod a+rx,g-w,o-w $(MAN_PREFIX)/man1/tp-magic-config.1
- 	@echo
- 	for l in `ls -d man/*.UTF-8 | cut -d '/' -f 2`; do \
- 		DEST=$(MAN_PREFIX)/$$l/man1 ; \
- 		echo "...Installing $$l man pages into $$DEST..." ; \
- 		install -d $$DEST ; \
- 		cp man/$$l/tuxpaint.1 $$DEST ; \
--		gzip -f $$DEST/tuxpaint.1 ; \
--		chmod a+rx,g-w,o-w $$DEST/tuxpaint.1.gz ; \
-+		chmod a+rx,g-w,o-w $$DEST/tuxpaint.1 ; \
- 	done
- 	@# FIXME: The other man pages aren't localizable yet -bjk 2021.08.14
- 
diff --git a/media-gfx/tuxpaint/tuxpaint-0.9.28-r3.ebuild b/media-gfx/tuxpaint/tuxpaint-0.9.28-r3.ebuild
deleted file mode 100644
index 460469ada58d..000000000000
--- a/media-gfx/tuxpaint/tuxpaint-0.9.28-r3.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit desktop optfeature toolchain-funcs xdg
-
-DESCRIPTION="Drawing program designed for young children"
-HOMEPAGE="https://www.tuxpaint.org/"
-SRC_URI="https://downloads.sourceforge.net/${PN}/${P}-sdl1.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}"/${P}-sdl1
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-
-RDEPEND="
-	app-text/libpaper:=
-	dev-libs/fribidi
-	gnome-base/librsvg:2
-	>=media-libs/libpng-1.2:0=
-	>=media-libs/freetype-2:2
-	media-libs/libsdl[X,joystick]
-	media-libs/sdl-image[png]
-	media-libs/sdl-mixer
-	media-libs/sdl-pango
-	media-libs/sdl-ttf
-	media-libs/sdl-gfx:=
-	media-gfx/libimagequant
-	sys-libs/zlib
-	x11-libs/cairo
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/gperf
-	media-gfx/graphicsmagick[jpeg,png]
-	sys-devel/gettext
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PF}-Makefile.patch
-)
-
-src_compile() {
-	emake CC="$(tc-getCC)" GENTOO_LIBDIR="$(get_libdir)"
-}
-
-src_install() {
-	emake DESTDIR="${D}" GENTOO_LIBDIR="$(get_libdir)" install
-	local file size
-	for file in data/images/icon[0-9]*x[0-9]*.png; do
-		size=${file##*/icon}
-		size=${size%%x*}
-		newicon -s "${size}" "${file}" tux4kids-tuxpaint.png
-	done
-	newmenu src/tuxpaint.desktop tux4kids-tuxpaint.desktop
-	docinto /usr/share/doc/${PF}
-	dodoc docs/*.txt
-	dodoc docs/en/*.txt
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	optfeature "additional graphic stamps" media-gfx/tuxpaint-stamps
-}
diff --git a/media-gfx/tuxpaint/tuxpaint-0.9.29-r1.ebuild b/media-gfx/tuxpaint/tuxpaint-0.9.29-r1.ebuild
deleted file mode 100644
index 3b3a59f7cfb6..000000000000
--- a/media-gfx/tuxpaint/tuxpaint-0.9.29-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit desktop optfeature toolchain-funcs xdg
-
-DESCRIPTION="Drawing program designed for young children"
-HOMEPAGE="https://www.tuxpaint.org/"
-SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz"
-S="${WORKDIR}"/${P}
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-
-RDEPEND="
-	app-text/libpaper:=
-	dev-libs/fribidi
-	gnome-base/librsvg:2
-	media-gfx/libimagequant
-	>=media-libs/freetype-2:2
-	>=media-libs/libpng-1.2:0=
-	media-libs/libsdl2[X,joystick]
-	media-libs/sdl2-gfx
-	media-libs/sdl2-image[png]
-	media-libs/sdl2-mixer
-	media-libs/sdl2-pango
-	media-libs/sdl2-ttf
-	sys-libs/zlib
-	x11-libs/cairo
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/gperf
-	media-gfx/graphicsmagick[jpeg,png]
-	sys-devel/gettext
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PF}-Makefile.patch
-	"${FILESDIR}"/${PF}-Makefile-trans.patch
-)
-
-src_compile() {
-	emake CC="$(tc-getCC)" GENTOO_LIBDIR="$(get_libdir)"
-}
-
-src_install() {
-	emake DESTDIR="${D}" GENTOO_LIBDIR="$(get_libdir)" install
-	local file size
-	for file in data/images/icon[0-9]*x[0-9]*.png; do
-		size=${file##*/icon}
-		size=${size%%x*}
-		newicon -s "${size}" "${file}" tux4kids-tuxpaint.png
-	done
-	newmenu src/tuxpaint.desktop tux4kids-tuxpaint.desktop
-	docinto /usr/share/doc/${PF}
-	dodoc docs/*.txt
-	dodoc docs/en/*.txt
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	optfeature "additional graphic stamps" media-gfx/tuxpaint-stamps
-}
diff --git a/media-gfx/tuxpaint/tuxpaint-0.9.31-r1.ebuild b/media-gfx/tuxpaint/tuxpaint-0.9.31-r1.ebuild
index 33f527fd82ac..1be1e1d0fdb1 100644
--- a/media-gfx/tuxpaint/tuxpaint-0.9.31-r1.ebuild
+++ b/media-gfx/tuxpaint/tuxpaint-0.9.31-r1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}"/${P}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 
 RDEPEND="
 	app-text/libpaper:=
diff --git a/media-gfx/ueberzug/Manifest b/media-gfx/ueberzug/Manifest
index 71650e4191c9..3eada40de1b0 100644
--- a/media-gfx/ueberzug/Manifest
+++ b/media-gfx/ueberzug/Manifest
@@ -1,3 +1,3 @@
-DIST ueberzug-18.2.2.tar.gz 56773 BLAKE2B dd3fdfe3820ac7344c574ab2031f0217b17a4b4ec4cd59f2447968abb6605a57ee77bab45f943f6d2501ad9c6e5ee3bf4c677f990814d676641bfe314e301dd4 SHA512 027d3b92711981d2334ba000cef9b424b01d962516432defaa287e2ca22d496a1f29c663f155838d74d91f26c355ac6af54c6513c33258676f315f9560e7256a
-EBUILD ueberzug-18.2.2.ebuild 1123 BLAKE2B 7eda06637b83323d86ea19e0cc119eebbbd0b3a444ed9300b825b9a882786e3f4d2823d135e3b17c8d6aed068d1b794e903ea335c473f5cc210457e93d63f805 SHA512 41fce20a2084fa2f9fa50a5c6c0f29de01482fee8fa115963370f5272bf2bf802f9f9d2438557dc4e0cf23a79dc15af18616c178eabe424b3402676b0665f924
+DIST ueberzug-18.2.3.tar.gz 57640 BLAKE2B c174f39cb20a24c07f12088e595492960319a9fd5079e0a23e9632353fa7c93762621224a3fde4b2462931647239e3614ed9a1dffc635fea7a51c58d2b846b68 SHA512 6f8f342b4a593e857f70c053fc5b9e75bc2c3a063221ca64850acb8c325323bee50c9d471fe55de6bbb484d8c958d5bf3037e836b52734d617f1cea4be509a08
+EBUILD ueberzug-18.2.3.ebuild 946 BLAKE2B 5395c59b7d17d3a590d280dc833b4ab92ff11d20cc9e54e1e9e849f09c6de85fecb7e1515b791074a90c1d165e69c58db57e416b68612d0c64064b901fe73a9e SHA512 392566cd4ff83d2baada2d7582196d2b5917ad8dd9e94d9068e01185ec8b86b13ed46fad7e9f1b2bc2215018d5294538695de6af1f4a71906ea1d7c3bd24d01a
 MISC metadata.xml 331 BLAKE2B 44d4e01eb445cdd5ecc879970295dccd3ba4c6d171d7e9cb41042200f5dc1ca01fc12b0c44c940d3e7045f5e44ad1ad4392125a62030bfd16edc3509a6689912 SHA512 b6ccd68127b77599f1008e595258583978523ebc200266eb234ec8732f914cc16d056fd84bec6feba5e455fade8ae7f963928e830c4a645c9b9a7c8b702eb4ac
diff --git a/media-gfx/ueberzug/ueberzug-18.2.2.ebuild b/media-gfx/ueberzug/ueberzug-18.2.3.ebuild
index 5a026a9cbace..2f812a2152f9 100644
--- a/media-gfx/ueberzug/ueberzug-18.2.2.ebuild
+++ b/media-gfx/ueberzug/ueberzug-18.2.3.ebuild
@@ -1,16 +1,19 @@
-# Copyright 2021-2023 Gentoo Authors
+# Copyright 2021-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 DISTUTILS_EXT=1
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
+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"
+SRC_URI="
+	https://github.com/ueber-devel/ueberzug/archive/refs/tags/${PV}.tar.gz
+		-> ${P}.tar.gz
+"
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -19,24 +22,19 @@ KEYWORDS="amd64 x86"
 COMMON_DEPEND="
 	x11-libs/libX11
 	x11-libs/libXext
-	x11-libs/libXres"
+	x11-libs/libXres
+"
 RDEPEND="
 	${COMMON_DEPEND}
 	dev-python/attrs[${PYTHON_USEDEP}]
 	dev-python/docopt[${PYTHON_USEDEP}]
 	dev-python/pillow[${PYTHON_USEDEP}]
-	!media-gfx/ueberzugpp"
+	!media-gfx/ueberzugpp
+"
 DEPEND="
 	${COMMON_DEPEND}
-	x11-base/xorg-proto"
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	# fix version
-	[[ ${PV} == 18.2.2 ]] || die "drop version workaround"
-	sed -i "/^__version__/s/18.2.1/${PV}/" ueberzug/__init__.py || die
-}
+	x11-base/xorg-proto
+"
 
 python_install() {
 	distutils-r1_python_install
diff --git a/media-gfx/ueberzugpp/Manifest b/media-gfx/ueberzugpp/Manifest
index adc36ca0c0ed..b713ac2dd002 100644
--- a/media-gfx/ueberzugpp/Manifest
+++ b/media-gfx/ueberzugpp/Manifest
@@ -1,6 +1,3 @@
-AUX ueberzugpp-2.9.4-libcxx18.patch 283 BLAKE2B 0e92cfbea465cacc5781d27a56fa4313661d42b7be25d2e9d489f589c56e068958d2cc8bede4c974d52465e965cbabd2256a987535e29ceeca4f40791c4e882a SHA512 7f175e72bfe31d4a6720a6db1d8d8f1b7d285a3089c1c2829b1b024b8bf3ba0565ce55c94bef8849f99a895196099399c3518a2cd2eb37e2081728b7e3290488
-DIST ueberzugpp-2.9.4.tar.gz 67825 BLAKE2B 185919717cbbe97b98a44c2b91e244cf72bd760033b1a9d82e0d2f06db1d9b6d57557f57f4cedec8408d61e16658e90977569a63eb17a38afb36b134ff21889b SHA512 3d47874ecde4cc9030490c878851a21d94554538200ba41e87dd9f3aa760a6ed511aad573b820798492a82e4c49219cd4cdc79f5c99c6a80c322d09e618f82a6
-DIST ueberzugpp-2.9.5.tar.gz 69268 BLAKE2B 9a31c7d5135ca0c5b85e250f9cbb5fb10e22344a7c6bf5393a04ec928580844470b24b0471aa609a83a0f1cbfed17944aabdec9ee5d6ddffe90720fa46bf80ad SHA512 43576ba504ec66a909c170122db808a8ae55535d54cad09172590af2790c981b1bfba6ba0f749a5ca9881a15cfdcdb0c34fbb2533f72011a786fd1413d1f91c4
-EBUILD ueberzugpp-2.9.4.ebuild 1949 BLAKE2B 70d4a41d661d0deb8b921ca3c61757dc3030652625706c9675dd5f4f70d9859ea3eded8c63cba9ccea764c357c0b64bc6f0b6d8941c366ec2c48ef1766b02688 SHA512 fba2a73c9a9369a02fe20d40a4e27f522cebf54799c5c9433cb2238140be945a94081887a41b5d609f3b09c04cdc25519e2ce611576196fe50e664252b0e17e4
-EBUILD ueberzugpp-2.9.5.ebuild 1941 BLAKE2B 6f49e44bd5fb49730f7dc28d61855c28fd28ed48720fe22052ad92feb5c1123f7e090e709571e87064b508342d547b5719187201c68fd17de43187f10525795e SHA512 82f5055ab6f007c146d9db022c9f17b4a5700cba3f47f38bf30ef2eb8c5cafbd5dc32a20a95ee7492b1ec52d894370dcf6148af6f4d8082558fc946adb6378cf
+DIST ueberzugpp-2.9.6.tar.gz 69379 BLAKE2B 86d29724ff768536bef2385d456d61509db58c8e83fe0c9711684f86b70e1e45d1d1bb7b970a036c408f575e8d31659b336111cfcc0dc39f7867010e56d9e79b SHA512 bb70933cbc887cc3967c6011f0616d056f5723f333f6cfd70e7a3dd785791b83b9855c0b3d0c901efc59d65ba113462946bc0f08d57cf845ec6c59ec861da874
+EBUILD ueberzugpp-2.9.6.ebuild 1851 BLAKE2B 3a3f9ef25c5036882c287876c7b0c5239771127b5f81d5f3b8358a667931e3b3b7d7d3dd92dbd1a76a6a2e8ce47966ebe92a2c9a04b45b246069f2987cf229d4 SHA512 0a22006f6a84ac55c1323452e472742d1fe42b997e0731baa505772fb1e7dc8f38b9cd31259c565af8fe7ad3fb51b2cdfe4e65880f86efab96326edcf755c54e
 MISC metadata.xml 694 BLAKE2B e39b88b981e8c6d55a41714197b03c014a6ffd95522eb0ff92559a178b193419bd587903c75271167fba097593ac15ecacdba3b0f23e7859c3f1fd9569b4f6c2 SHA512 e86e8942c84ec38c198b513b0eaf63d522017665d559a1843c08030ec6bc6a32d7f32651d5b283e3d82784b81ea15b7d81889ab0c68850f88733ae90add17060
diff --git a/media-gfx/ueberzugpp/files/ueberzugpp-2.9.4-libcxx18.patch b/media-gfx/ueberzugpp/files/ueberzugpp-2.9.4-libcxx18.patch
deleted file mode 100644
index ccd808e5b5f1..000000000000
--- a/media-gfx/ueberzugpp/files/ueberzugpp-2.9.4-libcxx18.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-https://bugs.gentoo.org/930977
-https://github.com/jstkdng/ueberzugpp/issues/179
---- a/src/canvas/wayland/config/dummy.hpp
-+++ b/src/canvas/wayland/config/dummy.hpp
-@@ -20,4 +20,6 @@
- #include "../config.hpp"
- 
-+#include <string>
-+
- class DummyWaylandConfig : public WaylandConfig
- {
diff --git a/media-gfx/ueberzugpp/ueberzugpp-2.9.4.ebuild b/media-gfx/ueberzugpp/ueberzugpp-2.9.4.ebuild
deleted file mode 100644
index 44c32b0c573f..000000000000
--- a/media-gfx/ueberzugpp/ueberzugpp-2.9.4.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake flag-o-matic toolchain-funcs
-
-DESCRIPTION="Drop in replacement for ueberzug written in C++"
-HOMEPAGE="https://github.com/jstkdng/ueberzugpp/"
-SRC_URI="
-	https://github.com/jstkdng/ueberzugpp/archive/refs/tags/v${PV}.tar.gz
-		-> ${P}.tar.gz
-"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="X opencv opengl wayland xcb-errors"
-REQUIRED_USE="xcb-errors? ( X )"
-
-RDEPEND="
-	dev-cpp/tbb:=
-	dev-libs/glib:2
-	dev-libs/libfmt:=
-	dev-libs/openssl:=
-	dev-libs/spdlog:=
-	media-gfx/chafa
-	media-libs/libexif
-	media-libs/libsixel
-	media-libs/vips:=
-	X? (
-		x11-libs/libxcb:=
-		x11-libs/xcb-util-image
-		xcb-errors? ( x11-libs/xcb-util-errors )
-	)
-	opencv? ( media-libs/opencv:= )
-	opengl? ( media-libs/libglvnd )
-	wayland? ( dev-libs/wayland )
-	!media-gfx/ueberzug
-"
-DEPEND="
-	${RDEPEND}
-	dev-cpp/cli11
-	dev-cpp/nlohmann_json
-	dev-cpp/range-v3
-	X? ( x11-base/xorg-proto )
-	wayland? ( dev-libs/wayland-protocols )
-"
-BDEPEND="
-	wayland? (
-		dev-util/wayland-scanner
-		kde-frameworks/extra-cmake-modules
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-libcxx18.patch
-)
-
-src_configure() {
-	if use X && tc-is-clang && has_version sys-libs/libcxx; then
-		# X support makes use of C++20's std::jthread which is currently
-		# marked experimental (at least) in <=libcxx-18 (should limit
-		# version in above libcxx check whenever this becomes unnecessary)
-		append-cxxflags $(test-flags-CXX -fexperimental-library)
-	fi
-
-	# TODO?: wayfire plugin is skipped for now (needs wlroots which is
-	# likely to be messier), but could be handled if there is a demand
-
-	local mycmakeargs=(
-		-DENABLE_OPENCV=$(usex opencv)
-		-DENABLE_OPENGL=$(usex opengl)
-		-DENABLE_TURBOBASE64=no # not packaged
-		-DENABLE_WAYLAND=$(usex wayland)
-		-DENABLE_X11=$(usex X)
-		-DENABLE_XCB_ERRORS=$(usex xcb-errors)
-		-DFETCHCONTENT_FULLY_DISCONNECTED=yes
-	)
-
-	cmake_src_configure
-}
diff --git a/media-gfx/ueberzugpp/ueberzugpp-2.9.5.ebuild b/media-gfx/ueberzugpp/ueberzugpp-2.9.6.ebuild
index d3d4f397c2d9..0d960bbdcb46 100644
--- a/media-gfx/ueberzugpp/ueberzugpp-2.9.5.ebuild
+++ b/media-gfx/ueberzugpp/ueberzugpp-2.9.6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="X dbus opencv opengl wayland xcb-errors"
 REQUIRED_USE="xcb-errors? ( X )"
 
@@ -54,10 +54,9 @@ BDEPEND="
 "
 
 src_configure() {
-	if use X && tc-is-clang && has_version sys-libs/libcxx; then
+	if use X && [[ $(tc-get-cxx-stdlib) == libc++ ]]; then
 		# X support makes use of C++20's std::jthread which is currently
-		# marked experimental (at least) in <=libcxx-18 (should limit
-		# version in above libcxx check whenever this becomes unnecessary)
+		# marked experimental (at least) in <=libcxx-18
 		append-cxxflags $(test-flags-CXX -fexperimental-library)
 	fi
 
diff --git a/media-gfx/vkBasalt/Manifest b/media-gfx/vkBasalt/Manifest
index 629a71cfd4f6..5a587450e98e 100644
--- a/media-gfx/vkBasalt/Manifest
+++ b/media-gfx/vkBasalt/Manifest
@@ -1,3 +1,3 @@
 DIST vkBasalt-0.3.2.10.tar.gz 335903 BLAKE2B 535c84d40a213decac38e882878a977002ee377a38e3f496985d292f7a3d51f3879e1026340cbb3e87c473bab777a3dbae7ae63bb10829c5a636a70cb29e49a1 SHA512 b80ca0320b99832d05d2d38e5e9d8f5981a5608d1509a1e4ea16bb4d0970ac13474e53e35a1634f2683e24c9ca0e4661545edd388b63b23c63782998ec0e03a4
 EBUILD vkBasalt-0.3.2.10.ebuild 512 BLAKE2B 3fcd6b1150cf9a2288f02bfbfe17340c0f08d2583dbef816700f351dc1a6a767a575d92c477a98c4a5a1e811b5b97212be52241c6db4742234caed9f624f1235 SHA512 c7074454831b897382ecc9dd0d1749edf3f6ea6efaa064163ffdeb528a111633c3ff867888a35a5306199bbada133a8589b8ebdf2c7a744a4d814637bb4e9993
-MISC metadata.xml 331 BLAKE2B cdcbf3c8af2be299d746cf0d7e345eaeca10603ac17e7c17dca435353c015f05ee46a32cc5cd684f13aead565e8ebe8ca0601b4d250bb2ff06b154f0309a334f SHA512 e901776df7dc5af1e037c005631eface7633c0b68df8d60edaa7399799c6749bf526e4adfa98886efcf97601722dbeba1d1c68b2e15450762a6984d20f71a3b6
+MISC metadata.xml 253 BLAKE2B 12d74e69a0480a7e3915e9f7d6ac77104efabb25f6ab7609231ab9368b8b1f61ec90ecea71db9a8da2ae1e9f41c5ce86eaeb86c101d6ef495157cd075c1b494f SHA512 148e700197cdf811f337acaa81d8338f2b58e33e528be31339af343d7136f2467b690829e5a56e3a0be138db57c9b06e227eab1717086ae67ce98e24f5748b3a
diff --git a/media-gfx/vkBasalt/metadata.xml b/media-gfx/vkBasalt/metadata.xml
index 27df3f93f60e..8e173854dd87 100644
--- a/media-gfx/vkBasalt/metadata.xml
+++ b/media-gfx/vkBasalt/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">DadSchoorse/vkBasalt</remote-id>
 	</upstream>
diff --git a/media-gfx/xdot/Manifest b/media-gfx/xdot/Manifest
index a6232a3c9e26..0a534265aa8a 100644
--- a/media-gfx/xdot/Manifest
+++ b/media-gfx/xdot/Manifest
@@ -1,6 +1,4 @@
-DIST xdot-1.3.tar.gz 144187 BLAKE2B 38e89a8c47dd519a79221634ed3e451cc5ba9c0448545802561e92876c06af599b3327d2ab808d5f81842826baddc42d3921da9c6885a2b6485e39c79de80c9f SHA512 8d66a64182970b968adbb5031d17f0b2b3709d4daa0f6d32ba0e3616177be1e43bcaa62a3133a3a0d92f8468dbc12147918d04b5d543b94b5df6d39b7af31e17
 DIST xdot-1.4.tar.gz 144405 BLAKE2B bcca54099ad88ebbf82dc168d837f7343f527d8aff63d27e315e60267b4edecca97c2f69e47a6bd5889e9da7bd801ba38950f5f01ff1f0e40389551c6ded2890 SHA512 36065ca840ea0f3ffeca3d7bb16aa3f68b79ef3c7d43f0ba80d100d198f89edee1ca9cb3baff378a63c53a527c37dcccbd7262fd1aa26b7c61bc9e2c55c6e3ed
-EBUILD xdot-1.3.ebuild 1023 BLAKE2B 974c09e3cbf833f9be48b5d2898a2b6b9745dd16c2c58458dcdac77cb74c9843e75a741728ec8d61c906401b992c75cfd3d3cd337e392782087b92cfdabcc9fa SHA512 83b5deed98b8d8c1308a4186e844a8dfc8c0266d0b940a9ee1aea71c3e81164b2daafafb9f1f29e12a1a70b552fc8fce41f20441051174b845ecddcc9cecca64
-EBUILD xdot-1.4.ebuild 1070 BLAKE2B 13305d0d59d42e99b5a05ea269a1854159b05eeac7da9b306886735b6099ac2b609ae378321aabbfc27e84cb197472f75c0c8467e81460018c058ba704d5a13e SHA512 ddbd7668100468682142a26bcfabc03fec3107199e10fb771ede3eb4d223cb7ffe44015d3896d4578906e64c3562e77789366b8b5ff9b74490499cdd27d3584f
-EBUILD xdot-9999.ebuild 1070 BLAKE2B 13305d0d59d42e99b5a05ea269a1854159b05eeac7da9b306886735b6099ac2b609ae378321aabbfc27e84cb197472f75c0c8467e81460018c058ba704d5a13e SHA512 ddbd7668100468682142a26bcfabc03fec3107199e10fb771ede3eb4d223cb7ffe44015d3896d4578906e64c3562e77789366b8b5ff9b74490499cdd27d3584f
+EBUILD xdot-1.4.ebuild 1057 BLAKE2B 42d5f677249f93356a488dde0f7e41dc8efb417765f9b1938523b2c196e24c39dbbf07464c9a3e963b613d5dd9b3b905b28995af34f2f797b790ce90db87fa9f SHA512 b43f731e51139bd96526ddd2a46a6858179b5d433d766cfe01b11cadb201bee82c19ded3c0fa5f59e5347f429a209a04b52402a0f2921ff642a45509bf5f5c86
+EBUILD xdot-9999.ebuild 1064 BLAKE2B 1933ad6213a84a89974ab0543b59282ecdd149de46f6ccbdc0641306bb60c1a7a6cfba2e9745a44f3fc13cef721a38c787febd3da3c48d693177e133821f01a0 SHA512 6a251a856dd2c3a03b0a1b21efdd6d7ef1d6470dde75b0e2e8dc12ffdab150fd905f0f02805103d205f86ff5de3aac62f696067dfa3979a4f4f7245108b67bea
 MISC metadata.xml 399 BLAKE2B 06318ca9aa1bb3f53733542916d19d28c03133866e868aefeba88d7e6e1b7594a628488471fe7f6853e02402a14db8501e056f5df9ae1429c4eca66ab7b6a492 SHA512 16caf359c45841ae27bfdeee51c7fdd71d6282548773e6f519cbcbfe43f9fa39c65322a610d2b3d5cb4471129cfa3738e6ee66ff6b6e94b4263d918fd44ff30c
diff --git a/media-gfx/xdot/xdot-1.3.ebuild b/media-gfx/xdot/xdot-1.3.ebuild
deleted file mode 100644
index 2d99d3cb2ca2..000000000000
--- a/media-gfx/xdot/xdot-1.3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-MY_PN=xdot.py
-EGIT_REPO_URI="https://github.com/jrfonseca/${MY_PN}"
-
-if [[ ${PV} = 9999* ]]; then
-	GIT_ECLASS="git-r3"
-else
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
-	MY_P="${MY_PN}-${PV}"
-	S="${WORKDIR}/${MY_P}"
-	SRC_URI="https://github.com/jrfonseca/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-inherit ${GIT_ECLASS} distutils-r1 virtualx
-
-DESCRIPTION="Interactive viewer for Graphviz dot files"
-HOMEPAGE="https://github.com/jrfonseca/xdot.py"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-
-DEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	media-gfx/graphviz
-	test? ( x11-libs/gtk+:3[X] )
-"
-RDEPEND="${DEPEND}"
-
-run_test() {
-	cd tests && "${EPYTHON}" ../test.py *.dot graphs/*.gv
-	return "${?}"
-}
-
-python_test() {
-	virtx run_test
-}
diff --git a/media-gfx/xdot/xdot-1.4.ebuild b/media-gfx/xdot/xdot-1.4.ebuild
index bfd164986323..ee7b623c9b55 100644
--- a/media-gfx/xdot/xdot-1.4.ebuild
+++ b/media-gfx/xdot/xdot-1.4.ebuild
@@ -11,7 +11,7 @@ EGIT_REPO_URI="https://github.com/jrfonseca/${MY_PN}"
 if [[ ${PV} = 9999* ]]; then
 	GIT_ECLASS="git-r3"
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 	MY_P="${MY_PN}-${PV}"
 	S="${WORKDIR}/${MY_P}"
 	SRC_URI="https://github.com/jrfonseca/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
diff --git a/media-gfx/xdot/xdot-9999.ebuild b/media-gfx/xdot/xdot-9999.ebuild
index bfd164986323..35f32bc848ff 100644
--- a/media-gfx/xdot/xdot-9999.ebuild
+++ b/media-gfx/xdot/xdot-9999.ebuild
@@ -11,7 +11,7 @@ EGIT_REPO_URI="https://github.com/jrfonseca/${MY_PN}"
 if [[ ${PV} = 9999* ]]; then
 	GIT_ECLASS="git-r3"
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 	MY_P="${MY_PN}-${PV}"
 	S="${WORKDIR}/${MY_P}"
 	SRC_URI="https://github.com/jrfonseca/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
diff --git a/media-gfx/xli/Manifest b/media-gfx/xli/Manifest
index 68c203274efd..e132c5446291 100644
--- a/media-gfx/xli/Manifest
+++ b/media-gfx/xli/Manifest
@@ -4,5 +4,5 @@ AUX xli-1.17.0-fix-scale-zoom.patch 1942 BLAKE2B fefbcbec8d9dba30fc1435fc998e371
 AUX xli-1.17.0-libpng14.patch 245 BLAKE2B 681fd31f8d7f812272e54dc67de31ece9a936f4608d339e9d63fe7bdc2ba257d20d7ce01fb00b120662557bdfa44b908bbeb4e136665abdadeb062c1425e7af7 SHA512 079162bfd639994ea6553b49f9370faf5becee8ec1e99a1e71f43e32968f244c5a393433fba8920a399a9eb8bc4a3ec6097903bd2eaff46bdeef55f1f90d1fcf
 AUX xli-security-gentoo.diff 6940 BLAKE2B 907fd85a2b248083380ae2210665dd9c251a7d528a93b1e2dffd149827f4900cab54b84b8a0be67c198a73d180cf31f4c8cdd7c4a37a3a8c5b30718babd5b1bf SHA512 b992219eb4b89bfee57429afbf67be6d6a04051b50de6e814c84c1adb209494d2faff15a228b43a992530fbeac83f15a94e9c1988982f98eabf287c26716671e
 DIST xli-2005-02-27.tar.gz 201011 BLAKE2B c16f40368a7c55cb7d31777662e4e9c1515232904df4f6f0e7fdc4daf44fdafaa0a3d9d8298493dac9352fa10eaf5d2984f9e66832ca0bfd07d9e6d551f4dca5 SHA512 132b28396ebf3832dc35ff5fa7c102539ef30a194512fe6577ce1432bb84ecd7b4368e75eaf59f26a806900f63e1bfb9a93487ce1ebe3cfef2199256a783ccf7
-EBUILD xli-1.17.0-r6.ebuild 2145 BLAKE2B ca8a689edcade26e9e9d362a78fd46c14eecb2b84fcfd7bbc580e43d326aa77a6b2e2262d40b586e944e842d919022bbad2afb6696b0a53a62b5a58e6c5fef38 SHA512 8d58c6f32a94984381fdd533b69246a59870f242df0f87a7e39c75596b70e6b05b172666790cbeda3a471d46867be1afe202d8f38bf78c880430e2b53a7e42a1
+EBUILD xli-1.17.0-r6.ebuild 2139 BLAKE2B 4e3407ee763f37be8113717e29d01ed5402c2c35de2ff00cc096a19b82df047fcfa6f4862475c5e5c45a947ed0e6ba617f1c418cd05765c22fe3037154aa5b50 SHA512 ff207a7cfc91c96ca136a44e4646dc88e5c0bc6d050b642b0da250f78cc2c62085cb6c70b1ea320f8297ada84ffa911a4f0d7aee72c2b4fdfb439abf3d9c3064
 MISC metadata.xml 169 BLAKE2B 25149b73446be31f3ea3dd3a6394230987e7d4c601d1605fd3827b37bd99b3301c2e0edb95d0f59a4577ed27919f43c2cc02b1edf62c4012b935a82e709e0c05 SHA512 55c53f74b001bae56ba8c54581a4168335b6b3a28dac23a2102b76795d5fd41de33b8b3e1ec03f9acc6e7a3a77e93b1a6ff3e3967c3156dcbf22b5b5a6245ef5
diff --git a/media-gfx/xli/xli-1.17.0-r6.ebuild b/media-gfx/xli/xli-1.17.0-r6.ebuild
index a33109d2bef3..8ce0e204bb03 100644
--- a/media-gfx/xli/xli-1.17.0-r6.ebuild
+++ b/media-gfx/xli/xli-1.17.0-r6.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}-${SNAPSHOT}"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 RDEPEND="
 	app-arch/bzip2:=
diff --git a/media-gfx/xloadimage/Manifest b/media-gfx/xloadimage/Manifest
index f7b7003e9e9e..2f8f9890f0b2 100644
--- a/media-gfx/xloadimage/Manifest
+++ b/media-gfx/xloadimage/Manifest
@@ -10,7 +10,6 @@ AUX xloadimage-gentoo.patch 8956 BLAKE2B 9834cb47e16fb20f970e9d33a6e42fef09d5a3d
 DIST xloadimage-4.1-fix-build-for-clang16.patch.xz 23800 BLAKE2B 8417465020f06483c397dd86124297feb320530bd013d6f94b091ac2166da9dc45017b43a21e2ce7a6f03493188e2535294e9b79e7ebbe0062bf0f22166f13d7 SHA512 a8f40fe4a5e8750b2c2b98b1f7488275c1f0763d2814359ec8dce48d1201e78d87f189abf6fcb8fa4753828921fd0c593696ad1958345f954f740687502a896f
 DIST xloadimage-4.1-gentoo-r1.diff.bz2 41535 BLAKE2B 77cdbb2e6d5dda6084aae2831bcb8750a027f59a673f5a1f8eeb61385bd21243d640bd13a3be7fb24d2ce2cb475a05cb04c91c2b53977c61fb3aa4416e67e112 SHA512 a1a52d576eb68c44e5ff3b68a6bd87cd9b8f21f6fa8edee2d7df2329002d40f6513df6c04ecd57f66018583d0251019bd02e15756dac705b8c9cb8470cb386e3
 DIST xloadimage.4.1.tar.gz 596021 BLAKE2B 3c22facf05167d1836c21243799d8f66c211e44d659b4397668ed604cdd82b3bd8f11ab7b3be5e87c59a9b3aa8569d0d3d2e474b572c3bca07b6437b293014bf SHA512 2c91699c8ef07c101ff9b458708ace01cab2979a5e88cf8a4e47ec971f7b4cb5571108afa3e53271ade4e8ccfdcf72ef9e2e09edfc0be6b8afaba50847aa0586
-EBUILD xloadimage-4.1-r14.ebuild 2504 BLAKE2B 12c9a486786e1640d4697c39f4e2fb9fdb61adf775026c2023e9643c5e4191b6a4bf10bcfb8a0345a3650e178c91de58faee153bb0dceeac2c200423b80df7f9 SHA512 c57e7d7b571fc2ad4f56fdd1e7d5de1b56107782edb2703a0887c826d8ac230ce924e0c85772df15a419b1e2550e664f6d5c3716c7430a6fc95aed615e9ccb09
-EBUILD xloadimage-4.1-r15.ebuild 2488 BLAKE2B bd34e5765b9701eeec684f5da9ee6ae88d5147796c0bd44eed60dd2d409d89a3b794d95c95e5403bee9d64edebadf9fcc805e48b02986f88b5cf16c4287fded7 SHA512 a16a74df34fe271b0d3900b7bba2a3ef75e1d55781b4d02ff60e1e6d5b9fe11569e04fea86093fa5d10409ae7008ceea3db6ecff0c96ba2af526ec496061d27f
-EBUILD xloadimage-4.1-r16.ebuild 2554 BLAKE2B 5480f70de2690e720a10fd614423da2346e12d29394cb990368d753ef2b07f142db0fd9f6c39d405454f05c9ca16e2a26466dcd2da204b0e7932ed147d2c1192 SHA512 a42f4aec6fbf6e19944e8db128d2e16bb8993d976bd374b637e44d7dcc55f1a13c281dfd6280682b7e54ddd0b5a4cd462bd72a91e5efa1611f8e49ff9f7fb62e
+EBUILD xloadimage-4.1-r15.ebuild 2482 BLAKE2B da71736b8f2ba9eb0e539e0d0ecf72f23b1b6636d0ceadcae6711f2586e6f480214f565caabc348d32eb35eeaaa5f659746208549fdcf54de90032a0ee4f2c14 SHA512 be5ef8f4ca1934bded0a8f21fac46db5c3f00fb3c779ddd99f6fc0e6914602b8dd29ec37afa9283280ecfec2a23661c305944af4ccd0b6a4b29d98db156994dd
+EBUILD xloadimage-4.1-r16.ebuild 2548 BLAKE2B 1c119a00e638d2a9df4372e0bf58ae971ba77805cbac31d8d0f7a3baf7d96b9933bb46aa846c305fae6a2f343e0587e02f5a60326b2d0a6cb5e113cc543cb184 SHA512 9003ed1adb849509a835d43925f5fc852d203dac5393ab766d4313de1dad4f633715cb60f1d3538ec93311d756792f4ea12d00fbe76587abfb13892be948962b
 MISC metadata.xml 169 BLAKE2B 25149b73446be31f3ea3dd3a6394230987e7d4c601d1605fd3827b37bd99b3301c2e0edb95d0f59a4577ed27919f43c2cc02b1edf62c4012b935a82e709e0c05 SHA512 55c53f74b001bae56ba8c54581a4168335b6b3a28dac23a2102b76795d5fd41de33b8b3e1ec03f9acc6e7a3a77e93b1a6ff3e3967c3156dcbf22b5b5a6245ef5
diff --git a/media-gfx/xloadimage/xloadimage-4.1-r14.ebuild b/media-gfx/xloadimage/xloadimage-4.1-r14.ebuild
deleted file mode 100644
index ff90d31efe03..000000000000
--- a/media-gfx/xloadimage/xloadimage-4.1-r14.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools flag-o-matic toolchain-funcs
-
-DESCRIPTION="utility to view many different types of images under X11"
-HOMEPAGE="https://tracker.debian.org/pkg/xloadimage"
-SRC_URI="ftp://ftp.x.org/R5contrib/${P/-/.}.tar.gz
-	mirror://gentoo/${P}-gentoo-r1.diff.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="tiff jpeg png"
-
-RDEPEND="x11-libs/libX11
-	tiff? ( media-libs/tiff:= )
-	png? ( media-libs/libpng:= )
-	jpeg? ( media-libs/libjpeg-turbo:= )"
-DEPEND="${RDEPEND}
-	!media-gfx/xli"
-
-S=${WORKDIR}/${P/-/.}
-
-src_prepare() {
-	eapply "${WORKDIR}"/${P}-gentoo-r1.diff
-	eapply "${FILESDIR}"/${P}-zio-shell-meta-char.diff
-	eapply "${FILESDIR}"/${P}-endif.patch
-
-	# Do not define errno extern, but rather include errno.h
-	# <azarah@gentoo.org> (1 Jan 2003)
-	eapply "${FILESDIR}"/${P}-include-errno_h.patch
-
-	eapply "${FILESDIR}"/xloadimage-gentoo.patch
-
-	sed -i -e "s:OPT_FLAGS=:OPT_FLAGS=$CFLAGS:" Make.conf || die
-	sed -i -e "s:^#include <varargs.h>:#include <stdarg.h>:" rlelib.c || die
-
-	# On FreeBSD systems malloc.h is a false header asking for fixes.
-	# On MacOSX it would require malloc/malloc.h
-	# On other systems it's simply unneeded
-	sed -i -e 's,<malloc.h>,<stdlib.h>,' vicar.c || die
-
-	eapply "${FILESDIR}"/${P}-unaligned-access.patch
-	eapply "${FILESDIR}"/${P}-ldflags_and_exit.patch
-
-	sed -i -e "/^DEFS = /s:/etc:${EPREFIX}/etc:" Makefile.in || die
-
-	eapply "${FILESDIR}"/${P}-libpng15.patch
-	sed -i \
-		-e 's:png_set_gray_1_2_4_to_8:png_set_expand_gray_1_2_4_to_8:' \
-		png.c || die
-
-	# One of the previous patches screws up a bracket...
-	eapply "${FILESDIR}"/${P}-bracket.patch
-
-	default
-
-	chmod +x configure || die
-	eautoreconf
-}
-
-src_configure() {
-	# Set TIFFHeader to TIFFHeaderCommon wrt #319383
-	has_version '>=media-libs/tiff-4.0.0_pre' && \
-		append-flags -DTIFFHeader=TIFFHeaderCommon
-
-	tc-export CC
-	econf $(use_with jpeg) \
-		$(use_with png) \
-		$(use_with tiff)
-}
-
-src_compile() {
-	emake SYSPATHFILE="${EPREFIX}"/etc/X11/Xloadimage
-}
-
-src_install() {
-	dobin xloadimage uufilter
-
-	dosym xloadimage /usr/bin/xsetbg
-	dosym xloadimage /usr/bin/xview
-
-	insinto /etc/X11
-	doins xloadimagerc
-
-	newman xloadimage.man xloadimage.1
-	newman uufilter.man uufilter.1
-
-	echo ".so man1/xloadimage.1" > "${T}"/xsetbg.1 || die
-	doman "${T}"/xsetbg.1
-	newman "${T}"/xsetbg.1 xview.1
-
-	dodoc README
-}
diff --git a/media-gfx/xloadimage/xloadimage-4.1-r15.ebuild b/media-gfx/xloadimage/xloadimage-4.1-r15.ebuild
index b1ceb5b7a604..984fe17d6d40 100644
--- a/media-gfx/xloadimage/xloadimage-4.1-r15.ebuild
+++ b/media-gfx/xloadimage/xloadimage-4.1-r15.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}"/${P/-/.}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~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
diff --git a/media-gfx/xloadimage/xloadimage-4.1-r16.ebuild b/media-gfx/xloadimage/xloadimage-4.1-r16.ebuild
index 461bdfe35a16..4b96c6d802fe 100644
--- a/media-gfx/xloadimage/xloadimage-4.1-r16.ebuild
+++ b/media-gfx/xloadimage/xloadimage-4.1-r16.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}"/${P/-/.}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~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
diff --git a/media-gfx/xv/Manifest b/media-gfx/xv/Manifest
index a60c09120518..4864df17282c 100644
--- a/media-gfx/xv/Manifest
+++ b/media-gfx/xv/Manifest
@@ -5,8 +5,15 @@ AUX xv-3.10a-libpng15-r1.patch 16530 BLAKE2B 6233c9e49f021ba3e62f9a5e9da4e360126
 AUX xv-3.10a-osx-bsd-20070520.patch 1497 BLAKE2B 1dcd54c8de29b9552a50069e627fd9dbbd327a22a8e18a12f260c1aaec2978b536cbdc571d47f17cca3f477dd574730dca7748532e6ed41f4697fa76774d5384 SHA512 a6f1160c0658ae4f3394cf2bb0b324392593010539ac2dd52176a587c41844cd5bca61823af31633d765f3399a9cb52e0296f894a2f08060ef4c2b4d687d8b51
 AUX xv-3.10a-vdcomp-osx-20070520.patch 455 BLAKE2B fa6cfa3657f74da7254cce5e73140c2a82614df2398a66e98c57d3056b1f574fbe80b9bce925f2f0988133596fdc4ea5c580371613a23a0283e9b09343a700a9 SHA512 8e389040ae3ac52dd086fbc1858699ea4bef417053952766a5569aab4ec70dbbd674a4e26adbc9434c0b411754d9643064d4254e72fbc79f99d3aefaf35f997b
 AUX xv-3.10a-wformat-security.patch 519 BLAKE2B 7b0ba8ee6dc33af787040e72fdfd4cf1d638dd556ff30c60c5983f6e8158fa63b49a66c97c919bdac5084c766df2b9587597c4f103fff3e2718cff8a006c1c05 SHA512 7e1150fdda9359e7b105729c92b8059bf5c762d468bcdaeadbb91ed75c2517b0ad627784a7a6f2bb8f7857884dc47f2d41c7c7247824fa4af8533dc023ceea52
+AUX xv-5.2.0-osx-bsd.patch 2103 BLAKE2B f12287becac8bfa5227523677c6118816f9dd43fd8b41c400dd6695ea4b6c610bc713f6ffdd9d2d75f8bd2b4de1f228c5349f71d3b8f7c77f10c01ac30b77301 SHA512 e2b6673d202b20a9d88dfd7711e63f702a67de7ca56de049ab27803a76b8833745ba1057ffbc53b246d077e870bce44746d28b1ced0eca31d4d9746c2a3fe57f
 DIST xv-3.10a-jumbo-patches-20070520.tar.gz 1363802 BLAKE2B 1a9f77b950dfa817aa861d9b2b6898d6e378b4a61a57c746a8822793a8e11e54165faf859e073ef99c9fbea5aa0c4c8caa4608ef03f553003b779a4bf59c3ab6 SHA512 e2ac5a3b4d743bf142c162b00815dd9d8dcaf345d0649016b2c6441fe2329879471b19453808e677c1a0b8eeb3468295dba160b1f30eacb2a7a9d8524ce03e75
 DIST xv-3.10a.png.bz2 3082 BLAKE2B 05f56053fc0a77bba155db306ae181f5404bced3b2c22a33b3a0a0750b84461ffec98934d3dbabd764fbb6ec95ce2851f4cf3959682a315fe6e6653cbaaa5ae4 SHA512 41e81c34e74a034292c2a8f525d1452614a2b42e980a1a2c93e3fcf990db528853d633496815e5fb2c897a780a2da171af590f436e2c7ef181eea00eb6922e9b
 DIST xv-3.10a.tar.gz 2259124 BLAKE2B 42cea578a879c819be8f42ffb1d247643904d8b462a4d6faa208185e49566798605c89006cbc190725fa6356b87da3375cf04d2ba86b559419cf8f7471c867e5 SHA512 5b8c5890503e2796638921cabae8967e458c73e332acea8561b1025ed13c771bc44c0e309b4592852e33726eeaa9784f933d1312073b0ba2e0b8c0cedabcaa3f
-EBUILD xv-3.10a-r22.ebuild 2555 BLAKE2B 92911c150ebbbafeb7001347c864bd6579c96e92de3bff55349b10da50261fc57a48bac74ae8d3023e2c3a6318c1c774203575f784442eb8657841f18b189c20 SHA512 c8db57ebd0e1ad53ad0013e57874975176356d8d6bc1f3ce6e701a715d1703f85e9472e51716a75e76687e41bbbaa60be82958c7b0f742e061af632e70f4e406
-MISC metadata.xml 250 BLAKE2B 699d6b9629cb9e0fac6509f4eec3bd2a175002f57ddadb07c2041b583ac4fd57e8cf78506850997f3a140201cbe4bbbab49a768634a50aba337e0e72630eb4b2 SHA512 efce6490cf2258fec1a8f6c77dc22583376cc0adb5aa1f862b88beccc82a7492d12addd2276a58c0a14810a3b02d9750f8ad3f28ffa74d858a86f204e8c9ab01
+DIST xv-5.2.0.tar.gz 4785784 BLAKE2B 46dc637cbbeabfe1c034c34e73040de6efebbf5f423fe429028ebfeefd2fce5af0fdaff1c52db4807b8eb88de89dae6b7f0e2c8a3522a3d9b103d5777783a52d SHA512 0af7ff6db152be849c27be9fba116513595deeca9e3eb42ec6fd74a4756d0c525b55a40de49aa37dd5d2ea4a29e6d644c8c4c709f0e1ec0a98cbc0ae7221b110
+DIST xv-6.0.0.tar.gz 5051786 BLAKE2B 42c6e06848c5cc7a3f7da1d5c5b10a7d665601f41eb79bda4b3e904c103e88592da416559adc9565c820c6402c9b03271521f515b8f7c873cc959dfd3b5652e8 SHA512 600fde882e1279b5c7147089790006bcbd4e31ba6220309a272aca43242c56062d4c85b181fb1f2d4b0497f1546347206d7827204c2ebbbabaaf3de40c50191a
+DIST xv-6.0.1.tar.gz 5051856 BLAKE2B 7b7a76e211175776862312b48b1f5f91d1a901fffba2225390715c9e392a380add42eaee0429e0598dce677bbb4311e9bc1a506105b9a63595ab70e6253e6ae7 SHA512 7098a2600dc21f94ef1db3e1b23e79b0cdc989b93d792f891d7a29811037636a5887df88f1ad6df27b12be4b4b348f0cca34fe2ad0a58ed9b1228683f6b0b910
+EBUILD xv-3.10a-r22.ebuild 2676 BLAKE2B f1ddd711053394fca83d51218efeccf81dbfc3787bbd136be30a80120404448e1466b597e46cbb9977a0691d2317473914b1517e715cb2fe95188138bee92344 SHA512 5f92c36bac66a75b25bb4d0e8220982b504efa1e83c88719ad512a7b43be6b803460252c190e5e3b91ab7ff662e0d8c69bb6aa36b4bedb4adf8a28e66fe9f702
+EBUILD xv-5.2.0.ebuild 1353 BLAKE2B 1c8ac98f33a97f7d92f6a64b6768aaa329095af800666a6a9b4f042088e68eb3ca224747df1c16fb851d534495d2934a061b0db5edbccc5087ba10f65d0941ee SHA512 4de8cd70f8e4a2c9f92365dee3ef0803871feec9e4db2526338179c1250b98bd549f2ae07933da24d84cca65747b000d804d2e3aedfdc2e53589a09080a792a7
+EBUILD xv-6.0.0.ebuild 1459 BLAKE2B 373c543ccc3c09722add0089f67b3bacd9963396efbbf132a3c7a8b5f7d3b22b55bf321d930e5587bcab451017cb7b683ca755d93533a61cfba8e5bfa5f0ac9a SHA512 5add0e00da6333e5182c4433b9d9a3c884489a77e20c5c0e6c74925b12e4ef011407f36c5705ab9eb07867968524695f8855a67213fd2bbf539d5bc2e8eafc21
+EBUILD xv-6.0.1.ebuild 1455 BLAKE2B 52075cd5a9f6e94f9e492bdac2ccdbba52ca82707fc2a0877ec59305442ae9940094b43e7058721b1f659936c24b393ed74ad9e088268e3d5d3bf2d68d67a7af SHA512 8064e396decf789b1fe92f53495280920b96dea0688ce576b6af8a2790cc9783022aae784d6ad43cf16bf5f9af3949f64bee949a967086ebc5f872252800530a
+MISC metadata.xml 392 BLAKE2B e1e306f8f6bd480912d6e45b5af362d54900117ae05a21995023e6611c1410af6682af867150179ecebd9d319a9f9810723dffec59a26e3f9f9ecc0a56061127 SHA512 e8aad6d1b24943fc3aeb6533fb0dc048ea0d3edc04abe2efa9a27930698ff3ddb0185dc3a2da69e08c050c4545d907c8580add6732fd8e3258ed496784902364
diff --git a/media-gfx/xv/files/xv-5.2.0-osx-bsd.patch b/media-gfx/xv/files/xv-5.2.0-osx-bsd.patch
new file mode 100644
index 000000000000..27059386446d
--- /dev/null
+++ b/media-gfx/xv/files/xv-5.2.0-osx-bsd.patch
@@ -0,0 +1,51 @@
+diff '--color=auto' -ur a/src/vdcomp.c b/src/vdcomp.c
+--- a/src/vdcomp.c	2024-07-17 09:37:04.957769272 -0500
++++ b/src/vdcomp.c	2024-07-17 09:44:30.582594953 -0500
+@@ -130,6 +130,8 @@
+ 
+ #    if defined(hp300) || defined(hp800) || defined(NeXT)
+ #      include <sys/malloc.h>    /* it's in "sys" on HPs and NeXT */
++#    elif defined(__APPLE__)
++#      include <malloc/malloc.h>
+ #    else
+ #      include <malloc.h>        /* FIXME: should explicitly list systems that NEED this, not everyone that doesn't */
+ #    endif
+diff '--color=auto' -ur a/src/xv.h b/src/xv.h
+--- a/src/xv.h	2024-07-17 09:37:04.957769272 -0500
++++ b/src/xv.h	2024-07-17 09:41:42.912041683 -0500
+@@ -183,7 +183,7 @@
+ 
+ #ifndef VMS
+ #  include <errno.h>
+-#  ifndef __NetBSD__
++#  if !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__APPLE__)
+ #    if !(defined(__GLIBC__) && __GLIBC__ >= 2) && !defined(__OpenBSD__)
+        extern int   errno;         /* SHOULD be in errno.h, but often isn't */
+ #      ifndef XV_HAVE_SYSERRLISTDECL
+@@ -199,7 +199,7 @@
+ #  ifdef VMS
+ #    define ERRSTR(x) strerror(x, vaxc$errno)
+ #  else
+-#    if defined(__BEOS__) || defined(__linux__) /* or all modern/glibc systems? */
++#    if defined(__BEOS__) || defined(__linux__) || defined(__APPLE__) /* or all modern/glibc systems? */
+ #      define ERRSTR(x) strerror(x)
+ #    else
+ #      define ERRSTR(x) sys_errlist[x]
+@@ -236,6 +236,8 @@
+ #ifdef NEED_MALLOC_H
+ #  if defined(hp300) || defined(hp800) || defined(NeXT)
+ #    include <sys/malloc.h>    /* it's in "sys" on HPs and NeXT */
++#  elif defined(__APPLE__)
++#   include <malloc/malloc.h>
+ #  else
+ #    include <malloc.h>
+ #  endif
+@@ -399,7 +401,7 @@
+  *                them later. */
+ #ifndef VMS       /* VMS hates multi-line definitions */
+ #  if defined(__linux__) || defined(__OpenBSD__) || defined(__NetBSD__) || \
+-      defined(__bsdi__)
++      defined(__FreeBSD__) || defined(__bsdi__) || defined(__APPLE__)
+ #    ifndef USE_MKSTEMP
+ #      define USE_MKSTEMP       /* use 'mkstemp()' instead of 'mktemp()' */
+ #    endif                      /* >> SECURITY ISSUE << */
diff --git a/media-gfx/xv/metadata.xml b/media-gfx/xv/metadata.xml
index 03458a5affcb..6f2f9f849997 100644
--- a/media-gfx/xv/metadata.xml
+++ b/media-gfx/xv/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
+  <maintainer type="person">
+    <email>bkohler@gentoo.org</email>
+    <name>Ben Kohler</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">png-mng</remote-id>
+    <remote-id type="github">jasper-software/xv</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/media-gfx/xv/xv-3.10a-r22.ebuild b/media-gfx/xv/xv-3.10a-r22.ebuild
index 6349d9814431..7ea141f81af0 100644
--- a/media-gfx/xv/xv-3.10a-r22.ebuild
+++ b/media-gfx/xv/xv-3.10a-r22.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://downloads.sourceforge.net/png-mng/${P}-jumbo-patches-${JUMBOV}.
 
 LICENSE="xv"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="jpeg tiff png"
 
 DEPEND="
@@ -70,6 +70,11 @@ src_prepare() {
 }
 
 src_compile() {
+	# -Werror=lto-type-mismatch
+	# https://bugs.gentoo.org/859823
+	# https://github.com/jasper-software/xv/issues/25
+	filter-lto
+
 	emake \
 		CC="$(tc-getCC)" CCOPTS="${CPPFLAGS} ${CFLAGS}" LDFLAGS="${LDFLAGS}" \
 		PREFIX="${EPREFIX}"/usr \
diff --git a/media-gfx/xv/xv-5.2.0.ebuild b/media-gfx/xv/xv-5.2.0.ebuild
new file mode 100644
index 000000000000..c3fbb7eadc7c
--- /dev/null
+++ b/media-gfx/xv/xv-5.2.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake desktop flag-o-matic
+
+JUMBOV=20070520
+DESCRIPTION="Interactive image manipulation program supporting a wide variety of formats"
+HOMEPAGE="https://github.com/jasper-software/xv/"
+SRC_URI="https://github.com/jasper-software/xv/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+	mirror://gentoo/xv-3.10a.png.bz2"
+
+LICENSE="xv"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="jpeg tiff png webp"
+
+DEPEND="
+	x11-libs/libXt
+	jpeg? ( media-libs/libjpeg-turbo:= )
+	tiff? ( media-libs/tiff:= )
+	png? (
+		>=media-libs/libpng-1.2:=
+		sys-libs/zlib
+	)
+	webp? ( media-libs/libwebp:= )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/xv-5.2.0-osx-bsd.patch"
+)
+
+src_configure() {
+	# -Werror=lto-type-mismatch
+	# https://bugs.gentoo.org/859823
+	# https://github.com/jasper-software/xv/issues/25
+	filter-lto
+
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
+		-DXV_ENABLE_JPEG=$(usex jpeg)
+		-DXV_ENABLE_JP2K=OFF
+		-DXV_ENABLE_PNG=$(usex png)
+		-DXV_ENABLE_TIFF=$(usex tiff)
+		-DXV_ENABLE_WEBP=$(usex webp)
+		)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	newicon "${WORKDIR}"/xv-3.10a.png ${PN}.png
+	make_desktop_entry xv "" "" "Graphics;Viewer"
+}
diff --git a/media-gfx/xv/xv-6.0.0.ebuild b/media-gfx/xv/xv-6.0.0.ebuild
new file mode 100644
index 000000000000..485e5e12aeb0
--- /dev/null
+++ b/media-gfx/xv/xv-6.0.0.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake desktop flag-o-matic xdg-utils
+
+JUMBOV=20070520
+DESCRIPTION="Interactive image manipulation program supporting a wide variety of formats"
+HOMEPAGE="https://github.com/jasper-software/xv/"
+SRC_URI="https://github.com/jasper-software/xv/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+	mirror://gentoo/xv-3.10a.png.bz2"
+
+LICENSE="xv"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="jpeg tiff png webp"
+
+DEPEND="
+	x11-libs/libXt
+	jpeg? ( media-libs/libjpeg-turbo:= )
+	tiff? ( media-libs/tiff:= )
+	png? (
+		>=media-libs/libpng-1.2:=
+		sys-libs/zlib
+	)
+	webp? ( media-libs/libwebp:= )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/xv-5.2.0-osx-bsd.patch"
+)
+
+src_configure() {
+	# -Werror=lto-type-mismatch
+	# https://bugs.gentoo.org/859823
+	# https://github.com/jasper-software/xv/issues/25
+	filter-lto
+
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
+		-DXV_ENABLE_JPEG=$(usex jpeg)
+		-DXV_ENABLE_JP2K=OFF
+		-DXV_ENABLE_PNG=$(usex png)
+		-DXV_ENABLE_TIFF=$(usex tiff)
+		-DXV_ENABLE_WEBP=$(usex webp)
+		)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	newicon "${WORKDIR}"/xv-3.10a.png ${PN}.png
+	make_desktop_entry xv "" "" "Graphics;Viewer"
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/media-gfx/xv/xv-6.0.1.ebuild b/media-gfx/xv/xv-6.0.1.ebuild
new file mode 100644
index 000000000000..df12fbe4e881
--- /dev/null
+++ b/media-gfx/xv/xv-6.0.1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake desktop flag-o-matic xdg-utils
+
+JUMBOV=20070520
+DESCRIPTION="Interactive image manipulation program supporting a wide variety of formats"
+HOMEPAGE="https://github.com/jasper-software/xv/"
+SRC_URI="https://github.com/jasper-software/xv/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+	mirror://gentoo/xv-3.10a.png.bz2"
+
+LICENSE="xv"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~hppa ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="jpeg tiff png webp"
+
+DEPEND="
+	x11-libs/libXt
+	jpeg? ( media-libs/libjpeg-turbo:= )
+	tiff? ( media-libs/tiff:= )
+	png? (
+		>=media-libs/libpng-1.2:=
+		sys-libs/zlib
+	)
+	webp? ( media-libs/libwebp:= )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/xv-5.2.0-osx-bsd.patch"
+)
+
+src_configure() {
+	# -Werror=lto-type-mismatch
+	# https://bugs.gentoo.org/859823
+	# https://github.com/jasper-software/xv/issues/25
+	filter-lto
+
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
+		-DXV_ENABLE_JPEG=$(usex jpeg)
+		-DXV_ENABLE_JP2K=OFF
+		-DXV_ENABLE_PNG=$(usex png)
+		-DXV_ENABLE_TIFF=$(usex tiff)
+		-DXV_ENABLE_WEBP=$(usex webp)
+		)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	newicon "${WORKDIR}"/xv-3.10a.png ${PN}.png
+	make_desktop_entry xv "" "" "Graphics;Viewer"
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/media-gfx/yafaray/Manifest b/media-gfx/yafaray/Manifest
index cb194624192d..e7df4d4e48dc 100644
--- a/media-gfx/yafaray/Manifest
+++ b/media-gfx/yafaray/Manifest
@@ -2,5 +2,5 @@ AUX yafaray-3.5.1-0001-respect-distribution-CFLAGS.patch 1541 BLAKE2B ea13c623fe
 AUX yafaray-3.5.1-add-missing-include-statements-for-gcc-13.patch 475 BLAKE2B fd0b56cca68cd0108a8d16b1149f8b1fa19b61aecf987389dfb36194e7c6c0c2abb89a3094ba0fe80374202505960adc97dd07cbcfcbe8030314f28e65e14c00 SHA512 18646d3d5b223315ff25c0fe306d31e7f87d9735f2b9cf257dea0ab7f1575bab1e2dcca437d8e4df533bfe8474b9523d021146bcbe6af4460fd44cf29aa6ead9
 AUX yafaray-3.5.1-add-missing-limits-header.patch 556 BLAKE2B ef63f5deba7c633917030b34ddf2c7a48bbcf412d99f48a1be89761c6dd19a67082560b2d0bb7dc440b7d0e9db73d708068eec7566ebc4038098faaf31aa269f SHA512 89ff060607e69a5ca0d2fb3ef2651e22e4a2ff5adae7351df2195267f2236792e7feae9a761882f3debc04bff4c83760a6704598643fb0a60ba37af698752032
 DIST yafaray-3.5.1.tar.gz 1136455 BLAKE2B 6002f3b96f3626b83f57015eaf3ddd53dcb6b6fd863277912f7fec06e4f176ec81dc48b889a068e6259edf17727dd04d4b1bbc51b571bfe6aad5e48148201e2e SHA512 3ead4d8becd2d524aa5bb4bbde4b9d98b56f8a38d872e7aa49ba19081094406336def02e9bf1503e424ca8e6cade0db4b042214cea8f9345bd4fc542c9346dbe
-EBUILD yafaray-3.5.1-r4.ebuild 3206 BLAKE2B 72908566229ccbd7934d54487986e126a2542c502e3c5ece5b1e726c88a4227cfc9ec24bec0c510824331bdffc66bdb8b06f5a22d7e0bf312f16f225fd06f25c SHA512 88ca5a83e6e45ce6d9bad88523fb4febaa04e3ca4f74393e52e8825a58784726f9e844b82a24ddb400a294e2492abd44423c8a21fc74d7707ce723e77cc15d29
+EBUILD yafaray-3.5.1-r4.ebuild 3207 BLAKE2B ec1887e2fb8350b899340c95d1e30f490a7f6e2589b3210ee3948088462b2fd55b010eaf60c90257882e0e082a3a303b78dcbb4276773ea778f07b06eddc6bc1 SHA512 93571f844633b4b7414df287ce83c7b8a237cb8abcd1ecba61f99ecbd84f556e2b053a2534e6db4c8b5384a933a247ab3b2a5e7bef132db45628506e3befe132
 MISC metadata.xml 1173 BLAKE2B 746c3d67228fc04ce4034c26bb40285a8d1b8654d2e8236b504ec3c8bc72ac7dd4947c1f035938cfd30b54b47c479d17297ba9be12990c05d7973c46af669b61 SHA512 9610a1f125940bb9f3708eb9e5bde776a532e1ea49a2c3ca321990bac5e419af02dd11c9599a04f566089c17350d1ecdd19ee0ee36b70e98baccd3be19c389a6
diff --git a/media-gfx/yafaray/yafaray-3.5.1-r4.ebuild b/media-gfx/yafaray/yafaray-3.5.1-r4.ebuild
index faee7f24fff4..b5253b68852e 100644
--- a/media-gfx/yafaray/yafaray-3.5.1-r4.ebuild
+++ b/media-gfx/yafaray/yafaray-3.5.1-r4.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
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 # doesn't build with ninja when qt5 and python USE flags are both enabled
 CMAKE_MAKEFILE_GENERATOR="emake"
diff --git a/media-gfx/zbar/Manifest b/media-gfx/zbar/Manifest
index a664965b0405..e6f2bf572d8a 100644
--- a/media-gfx/zbar/Manifest
+++ b/media-gfx/zbar/Manifest
@@ -2,7 +2,11 @@ AUX zbar-0.23.90-fix-gtk-default.patch 1222 BLAKE2B 5d7bb46e1d1eafa34c75818bce15
 AUX zbar-0.23.90-fix-qt5x11extras-detect.patch 641 BLAKE2B ec0b86a83a149ef2a62585ea8a4db088e5fdc63ed28ff57f358b30372dff86b898364e6c0983a689efbbd6a4df82bc9764dc2dedf1f6beb68dcc1852336bce1b SHA512 5ca82734a32d12ac2aa451cba87081f44df46a4a9afc5ff8a60adf59cce30dbdca06866313b1a511c778e690f6e40994f22e868a7a9d098d69e4c62a9b26a004
 AUX zbar-0.23.90-fix-unittest.patch 2711 BLAKE2B 58d1bbebf60bb9533a7c2b40a29afa7e8229b79a925ebcd05e26c3a67c2144173baedc31f0d92d0341c51ccfb3763e95840ce2073012e7b61a0f252287d5d6b4 SHA512 cc5aaef37155ad72d6b72e05c2f53523268e15b84f573117e780e3f39cc4df3981d080558db83d0fb52d2daa47beeaab4f194e4f912e732648ac4c5bc683e11d
 AUX zbar-0.23.92-py311-set-size.patch 1100 BLAKE2B be9b804d7ba1c5c1bae2a20853154da852a6ca1922f9a65f0583ea8d68f76d04e0e009c940417d24539cfb6577e47d8a6ee1d342de1a32b797afd4ebde284560 SHA512 9980027fdda6f995577c15c5c6337a45557802ed534da07208edb20cd99b8575f0c9864f1e48b2f300d973e682e73a0bac105a9eee7429db48224ddbcd15e8d1
+AUX zbar-0.23.93-configure-ac-do-not-use-hardcoded-pkg-config-command.patch 2201 BLAKE2B 618def2024b4b6b3dbfdf298b0c30556a456bfc9e8f0e5bb6515a863e2b33c7603d861602be324b02af68df962f67370ecee7dd76f9a92bb129e1735e0f5b0b1 SHA512 ae3b1123d558d12690651da4ff7e77d5e805f3b2fb5372756cbb50ef18f73c87feee71aada35a2ca889e8f893d60969ed2d7a86c5e54c230902645d458e767e6
+AUX zbar-0.23.93-configure-ac-use-old-way-to-detect-qt5.patch 1177 BLAKE2B 7283d87ad174c746f79a9d0531e10d5285d25d3e22c6dcc375a62377a12a22656483a69e19288e90367eeb7d31e31397c75fc7f75f3a0aede0cdec2e3bc3d317 SHA512 8a69dd84731b95ab4d5d0dc37bd83ecf7fa368e197226f0fb63dcce6dce01ef96682b0e12d06489c602d964eedc2ea69ada04b83fba2ef6c4452ca466a25b037
 AUX zbar-0.23_fix_python_detect.patch 351 BLAKE2B d5261e9adb3c9b43f1208a41a655718b952d06ce0ec003bb08bf30979d6c467b2b50e6fb9a6cd06f95230ed4ae55e14599c276f9f41f03677b4d18167c6665c4 SHA512 d24d75f840d84488986cede3378e067ac68d218acac34a8c34888c88611df8f4b1b397cfd5ecfcda82480fd56ea2bada29d8373cc6e93ae8050b84e801c36ca7
 DIST zbar-0.23.92.tar.gz 1005358 BLAKE2B 97af3c399333abfcd64e45e6c4f38e5da6ed1540447f35f0efe9bc0fb8d296d80c964452afa29d26d22bddd8de31bc3ca6582db38afe8416e9480f11b939e040 SHA512 cae47fb199173fc1c052984865ca0e6aeab330bd6d77506a0937994d459deb4419a3e54e2dcd2e9830ffb8acf14f29e22e0a6becc9e4cfe19b07dad1babe9513
+DIST zbar-0.23.93.tar.gz 1009320 BLAKE2B 7476776fbb2b2dca4fb94e4eb8c6c5ca7795e32881e93c45002679bdc048cb0bf8d880d2b31f1469a95d718c6d027b7ee0da195951645478493d6f638ae186b5 SHA512 2dd607afbb1e52346bfb740f916c8616112d14153f071f82458b7c653f647b332290a5089543abebfe1c7679eae98b349a84777185d61cfb9ff275bfecc6e08f
 EBUILD zbar-0.23.92.ebuild 5477 BLAKE2B 4ad9610614f94c7bfd456ac625fb2685f9f39a6d77929fd02f19b67338f0eb46de3a88eb69c741174f0f9e46cec1aa951ec34fc57ca886a5f830cd844ef3fabf SHA512 bc55e7e43f35260f5ad30034b7859292f5518bdccb53892ae20c3b8e012d9ae6808c5ffd780273611e44a7a69a4e33b57256f3701ac08000e85904dfccc0b32c
+EBUILD zbar-0.23.93.ebuild 5460 BLAKE2B d0b4219cc9c23d5892391ddf3cf2e607f381b4b1a92e0372cde84e564743342896f3fc403e9e5d41e56e429cb37ffbc071179d4cd30495b35df844a05ddf9f09 SHA512 724d8129a8011fbce530eeffc2ec3570ad2b60a7479c991682ac02c704590ecb424ef48dd5a1957e2794a81438c8714457e2d59a35283a6f5ec5dd8fa0eb8886
 MISC metadata.xml 799 BLAKE2B 8ab0acd59bd0d2a661b75724a6c5406782ec6d993dcd6ccc386ee4e6fc9f105a221d5e8c8f0a398f67c6bc9b3de23e53f41b7024220a561d405e632b979e932f SHA512 2672939457e8efcc1fb3cc94047cbb37cf8b69830144b69514c26d9bb29b23e8877d9a98f1b5b60b62c620ddc89c402e2a3c8b82ef05a07e4f08a2c2b3ca5bb4
diff --git a/media-gfx/zbar/files/zbar-0.23.93-configure-ac-do-not-use-hardcoded-pkg-config-command.patch b/media-gfx/zbar/files/zbar-0.23.93-configure-ac-do-not-use-hardcoded-pkg-config-command.patch
new file mode 100644
index 000000000000..397ad6dd6fbf
--- /dev/null
+++ b/media-gfx/zbar/files/zbar-0.23.93-configure-ac-do-not-use-hardcoded-pkg-config-command.patch
@@ -0,0 +1,49 @@
+From 368571ffa1a0f6cc41f708dd0d27f9b6e9409df8 Mon Sep 17 00:00:00 2001
+From: Boyuan Yang <byang@debian.org>
+Date: Tue, 9 Jan 2024 07:56:32 -0500
+Subject: [PATCH] configure.ac: Do not use hardcoded pkg-config command
+
+Use overridable $PKG_CONFIG instead.
+
+Also fixes some M4 grammar errors in configure.ac.
+
+Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
+---
+ configure.ac | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index f0f9723c..a2251e3d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -663,23 +663,23 @@ AC_ARG_WITH([qt6],
+ 
+ AS_IF([test "x$with_qt" != "xno"],
+       [AS_IF([test "x$with_qt6" != "xno"],
+-	     PKG_CHECK_MODULES([QT],
++	     [PKG_CHECK_MODULES([QT],
+                                [Qt6],
+-                               [MOC=`pkg-config Qt6 --variable=moc`
++                               [MOC=`$PKG_CONFIG Qt6 --variable=moc`
+                                 QT_VERSION=`$PKG_CONFIG Qt6 --modversion`
+-                                QT6_HEADERS=`pkg-config Qt6 --variable=headerdir`
++                                QT6_HEADERS=`$PKG_CONFIG Qt6 --variable=headerdir`
+                                 CPPFLAGS="$CPPFLAGS -I$QT6_HEADERS -I$QT6_HEADERS/QtWidgets -I$QT6_HEADERS/QtCore -I$QT6_HEADERS/QtGui"
+                                 qt_pkgconfig_file="zbar-qt5.pc"
+                                ],
+-                               [with_qt6="no"]))
++                               [with_qt6="no"])])
+        AS_IF([test "x$with_qt6" = "xno"],
+-             PKG_CHECK_MODULES([QT],
++             [PKG_CHECK_MODULES([QT],
+                                [Qt5Core >= 5 Qt5Gui >= 5 Qt5Widgets >= 5.0 Qt5X11Extras >= 5.0],
+-                               [MOC=`pkg-config Qt5 --variable=moc`
++                               [MOC=`$PKG_CONFIG Qt5 --variable=moc`
+                                 QT_VERSION=`$PKG_CONFIG Qt5 --modversion`
+                                 qt_pkgconfig_file="zbar-qt5.pc"
+                                ],
+-                               [with_qt="no"]))
++                               [with_qt="no"])])
+       ])
+ 
+ AC_ARG_VAR([MOC], [full path to Qt moc program])
diff --git a/media-gfx/zbar/files/zbar-0.23.93-configure-ac-use-old-way-to-detect-qt5.patch b/media-gfx/zbar/files/zbar-0.23.93-configure-ac-use-old-way-to-detect-qt5.patch
new file mode 100644
index 000000000000..a5e9dba8ebea
--- /dev/null
+++ b/media-gfx/zbar/files/zbar-0.23.93-configure-ac-use-old-way-to-detect-qt5.patch
@@ -0,0 +1,26 @@
+From a549566ea11eb03622bd4458a1728ffe3f589163 Mon Sep 17 00:00:00 2001
+From: Boyuan Yang <byang@debian.org>
+Date: Wed, 10 Jan 2024 10:57:29 -0500
+Subject: [PATCH] configure.ac: Use old way to detect Qt5
+
+Bug: https://github.com/mchehab/zbar/issues/277
+Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
+---
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index a2251e3d..0e5641e5 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -675,8 +675,8 @@ AS_IF([test "x$with_qt" != "xno"],
+        AS_IF([test "x$with_qt6" = "xno"],
+              [PKG_CHECK_MODULES([QT],
+                                [Qt5Core >= 5 Qt5Gui >= 5 Qt5Widgets >= 5.0 Qt5X11Extras >= 5.0],
+-                               [MOC=`$PKG_CONFIG Qt5 --variable=moc`
+-                                QT_VERSION=`$PKG_CONFIG Qt5 --modversion`
++                               [AC_CHECK_PROGS([MOC], [moc-qt5 moc])
++                                QT_VERSION=`$PKG_CONFIG Qt5Gui --modversion`;
+                                 qt_pkgconfig_file="zbar-qt5.pc"
+                                ],
+                                [with_qt="no"])])
diff --git a/media-gfx/zbar/zbar-0.23.93.ebuild b/media-gfx/zbar/zbar-0.23.93.ebuild
new file mode 100644
index 000000000000..1bb7c4cc2030
--- /dev/null
+++ b/media-gfx/zbar/zbar-0.23.93.ebuild
@@ -0,0 +1,232 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+inherit autotools flag-o-matic java-pkg-opt-2 multilib-minimal python-single-r1 qmake-utils virtualx
+
+DESCRIPTION="Library and tools for reading barcodes from images or video"
+HOMEPAGE="https://github.com/mchehab/zbar"
+SRC_URI="https://github.com/mchehab/zbar/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 x86"
+IUSE="dbus graphicsmagick gtk +imagemagick introspection java jpeg nls python qt5 static-libs test +threads v4l X xv"
+
+REQUIRED_USE="
+	introspection? ( gtk )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	test? (
+		${PYTHON_REQUIRED_USE}
+		X? ( imagemagick )
+	)
+	xv? ( X )"
+
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+	gtk? (
+		dev-libs/glib:2[${MULTILIB_USEDEP}]
+		x11-libs/gtk+:3[${MULTILIB_USEDEP}]
+		introspection? ( dev-libs/gobject-introspection )
+	)
+	imagemagick? (
+		!graphicsmagick? ( media-gfx/imagemagick:=[png,jpeg?] )
+		graphicsmagick? ( media-gfx/graphicsmagick:=[png,jpeg?] )
+	)
+	jpeg? ( media-libs/libjpeg-turbo:0[${MULTILIB_USEDEP}] )
+	python? ( ${PYTHON_DEPS} )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtx11extras:5
+	)
+	v4l? ( media-libs/libv4l:0=[${MULTILIB_USEDEP}] )
+	X? (
+		x11-libs/libX11[${MULTILIB_USEDEP}]
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+		xv? ( x11-libs/libXv[${MULTILIB_USEDEP}] )
+	)"
+
+RDEPEND="${COMMON_DEPEND}
+	java? ( >=virtual/jre-1.8 )"
+
+DEPEND="${COMMON_DEPEND}
+	java? (
+		>=virtual/jdk-1.8
+		test? (
+			dev-java/hamcrest-core:1.3
+			dev-java/junit:4
+		)
+	)
+	test? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/pillow[${PYTHON_USEDEP}]
+		')
+		elibc_musl? ( sys-libs/argp-standalone )
+	)"
+
+BDEPEND="
+	app-text/xmlto
+	sys-devel/gettext
+	virtual/pkgconfig
+	gtk? ( dev-util/glib-utils )
+	nls? (
+		sys-devel/gettext
+		virtual/libiconv
+	)"
+
+DOCS=( README.md NEWS.md TODO.md HACKING.md TODO.md ChangeLog )
+
+PATCHES=(
+	# TODO: upstream?
+	"${FILESDIR}/${PN}-0.23_fix_python_detect.patch"
+	"${FILESDIR}/${PN}-0.23.90-fix-unittest.patch"
+	"${FILESDIR}/${PN}-0.23.93-configure-ac-do-not-use-hardcoded-pkg-config-command.patch"
+	"${FILESDIR}/${PN}-0.23.93-configure-ac-use-old-way-to-detect-qt5.patch"
+)
+
+pkg_setup() {
+	if use python || use test; then
+		python-single-r1_pkg_setup
+	fi
+	use java && java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	if use python || use test; then
+		if use test; then
+			# make tests happy
+			# because one of the test requires loadable py module from the current ${BUILD_DIR}
+			sed -e "s|PYTHONPATH=@abs_top_srcdir@|PYTHONPATH=@builddir@|g" \
+				-i test/Makefile.am.inc || die
+		fi
+
+		python_fix_shebang \
+			examples/*.py \
+			test/{test_python,barcodetest}.py # test_pygtk.py — py2 only
+	fi
+
+	if use java; then
+		java-pkg-opt-2_src_prepare
+		sed -e "s|javadir = \$(pkgdatadir)|javadir = /usr/$(get_libdir)/zbar|" \
+			-i java/Makefile.am || die
+	fi
+
+	# do not install {LICENSE,INSTALL,etc} doc files with 'make install' (use DOCS=() instead)
+	sed -e "s|^dist_doc_DATA =\(.*\)|dist_doc_DATA =|" -i Makefile.am || die
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	append-cppflags -DNDEBUG
+
+	local myeconfargs=(
+		$(use_with dbus)
+		$(use_with gtk gtk gtk3) # avoid 'auto'
+		$(use_with jpeg)
+		$(multilib_native_use_with introspection gir)
+		$(multilib_native_use_with java)
+		$(multilib_native_use_with python python auto)
+		$(use_enable nls)
+		$(use_enable static-libs static)
+		$(use_enable threads pthread)
+		$(use_enable v4l video)
+		$(use_with X x)
+		$(use_with X xshm)
+		$(use_with xv xv)
+	)
+
+	if multilib_is_native_abi; then
+		# both must be enabled to use GraphicsMagick
+		if use imagemagick && use graphicsmagick; then
+			myeconfargs+=(
+				--with-graphicsmagick
+				--without-imagemagick
+			)
+		elif ! use graphicsmagick && use imagemagick; then
+			myeconfargs+=(
+				--with-imagemagick
+				--without-graphicsmagick
+			)
+		else
+			myeconfargs+=(
+				--without-imagemagick
+				--without-graphicsmagick
+			)
+		fi
+
+		if use java; then
+			export JAVACFLAGS="$(java-pkg_javac-args)"
+			append-cflags "$(java-pkg_get-jni-cflags)"
+			if use test; then # bug 629078
+				myeconfargs+=( --with-java-unit )
+				CLASSPATH+=":$(java-pkg_getjar --build-only junit-4 junit.jar)"
+				CLASSPATH+=":$(java-pkg_getjar --build-only hamcrest-core-1.3 hamcrest-core.jar)"
+			fi
+		fi
+
+		if use qt5; then
+			myeconfargs+=(
+				--with-qt
+			)
+		else
+			myeconfargs+=( --without-qt )
+		fi
+
+		if use test && use elibc_musl; then
+			append-ldflags -largp
+		fi
+
+	else
+		myeconfargs+=(
+			--without-graphicsmagick
+			--without-imagemagick
+			--without-qt
+		)
+
+		# zbarimg tests with native abi only
+		# (this option from the patch above, stay up to date)
+		use test && myeconfargs+=( --without-zbarimg-tests )
+	fi
+
+	# use bash (bug 721370)
+	CONFIG_SHELL='/bin/bash' \
+	ECONF_SOURCE="${S}" \
+	MOC="$(qt5_get_bindir)"/moc \
+		econf "${myeconfargs[@]}"
+
+	# work around out-of-source build issues for multilib systems (bug 672184)
+	mkdir qt zbarcam || die
+}
+
+src_test() {
+	virtx multilib-minimal_src_test
+}
+
+src_install() {
+	if use qt5; then
+		local MULTILIB_WRAPPED_HEADERS=(
+			/usr/include/zbar/QZBar.h
+			/usr/include/zbar/QZBarImage.h
+		)
+	fi
+	multilib-minimal_src_install
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_preinst() {
+	use java && java-pkg-opt-2_pkg_preinst
+}