gentoo auto-resync : 06:04:2024 - 00:30:33

21 files changed, 244 insertions, 502 deletions

diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index db0c3a62349c..f6ecfa6f3718 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest
index d946917db02a..eeed02e7e24d 100644
--- a/media-gfx/inkscape/Manifest
+++ b/media-gfx/inkscape/Manifest
@@ -1,10 +1,6 @@
-AUX inkscape-1.2.2-fix-compile.patch 1948 BLAKE2B 4482e3f021f9cdee4a26e0d179e5e18e21d2a0649d1801979ee08b2428a1b9ae8850a09cacaa2121a25069d763758123f0c550e1e7dac2a91c04198eb6bc960f SHA512 ccc4a593c903ce467e0076a8b036aac421a3f5a943815d6d7cf91c48acb07d49c76fb73b58ad01fc3a3f45af2c6e4bc78d6a13848ed3f91de42c3a074b1aeb17
 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
-DIST inkscape-1.2.2.tar.xz 39392040 BLAKE2B 7a4f0e42d1d8b67f42b924c760be484156e210e5661dc48408c992cbef5e0ac997a468cf1263e5c14cd5c0c0a83345e77055ff59fd7fb2d01b2d196f42a9e858 SHA512 b3e95f7d45612140b38c95fd758b051c27b0ed55bac7e7980c0491d3ba94c62edd7f0b27034314388bf74faf2046d829f36d2f6745cb4a54fb43b8b684df235f
 DIST inkscape-1.3.2.tar.xz 44720944 BLAKE2B 24120f8c671e1fb54bb6626cab95e7086e3c60fbc117bbe8017d081c799bc26812b1286e670771e7ffe88720ba25f237146c452afaf65c1ee2ee554fb07f79a2 SHA512 a6da4b676ba3e7f954f95e3916ce78ce358b49c8052795a52d478064ef02eeae0337b0a94e89b9752ea6824a5758d28072c2bbf83f1e9ee28daebd3b0ef87343
-EBUILD inkscape-1.2.2-r4.ebuild 5450 BLAKE2B 1c2938f4b6be6e65dd80ceae1371e3b64b18a1aba5b0ff0e34fb00e0b460f7da2b0938b464b061a19414c811b16dbbcd006d4a0fd7d3b44106387a96f437d6ce SHA512 4e6bafcc3c647f78294ec10f5c8698cd2f61945e31a09e8ed7e9910c7a1764da86401b4e78c8a9aa73e25379c2e06a1a065849b3ebfe7699f573d941575d5265
 EBUILD inkscape-1.3.2-r1.ebuild 5694 BLAKE2B 8d11ca11a339932e6c8a8d2cbdf26f151de8734691363e01edf6c20e7b899e2a7e445b8b63de227c8b93de4906b0a756ef1caaa6c1bd7da1937b056d85f259d8 SHA512 c6c6c82a66c8ea8de75d4959aa13ac772a2504cdf8315a356aace62ab83ea116b0a0a8ab782d470500f69c0b517db5a8d43a4255d11d7737920834afd326b073
-EBUILD inkscape-1.3.2.ebuild 5591 BLAKE2B 40a220a0bcb48020ba03a022994c548ff08e18e69dde2f7ba89ed838a44467e71fbaed29affbcf4c7370b76acbf9c1103ed4f499650302446c36711582970941 SHA512 2467361c532953141997c36ac11f27400f2362de96a3ea0c6f1b9d216946c4e96561f381327805e81c0b5fa4066675c850b08366e6d6651e5d91b736169dde08
 EBUILD inkscape-9999.ebuild 5578 BLAKE2B 8c903b0b5448b70125fa2b090f6fa703454ecb5a7e47ab069c1d6a2b7ddc9cae70c7f83be93a29853a7eb075c3b7bdd2e7f976a2d2011d62b685f4d35804a0d9 SHA512 60f0568fce4bb6557cf7deab0a72355ebff3eb8a1f90dd85eecf30a66bb0c4f9f37ab4817c18fa42d2ecb87760516572f7f50f956e9dbfa71ceb2d173e5d2e76
 MISC metadata.xml 982 BLAKE2B f44f534865614c8dd7bf71e92ce69cff708fc08e3eb701765bf93144b433ec52df52a506b69cc98969909c695015881b60592cccdf27613c6fe82812fc50727b SHA512 2963a9b473f139d06cefd1c3231ef148045c005adb4688850522c183f39ba15a36331b7eae7752e9bf15a26e6370f2af14ec02e59735f1753246c45821c0cdbc
diff --git a/media-gfx/inkscape/files/inkscape-1.2.2-fix-compile.patch b/media-gfx/inkscape/files/inkscape-1.2.2-fix-compile.patch
deleted file mode 100644
index c219a6e45273..000000000000
--- a/media-gfx/inkscape/files/inkscape-1.2.2-fix-compile.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-https://src.fedoraproject.org/rpms/inkscape/blob/rawhide/f/0001-Fix-build-with-GCC13.patch
-https://gitlab.com/inkscape/inkscape/-/merge_requests/5108
-https://gitlab.com/inkscape/inkscape/-/merge_requests/5111 (version which got accepted upstream)
-https://bugs.gentoo.org/903867
-
-From c68f5f9cade8a890efefcb4c2e0fc57762211286 Mon Sep 17 00:00:00 2001
-From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
-Date: Fri, 24 Feb 2023 14:01:18 -0500
-Subject: [PATCH] Fix build with GCC13
-
-GCC 13 now complains about this line:
-```
-src/ui/widget/selected-style.cpp:111:6: error: statement-expressions are not allowed outside functions nor in template-argument lists
-  111 |     {g_strdup("application/x-oswb-color"), 0, APP_OSWB_COLOR}
-      |      ^~~~~~~~
-```
-
-However, it is not necessary to strdup the string constant as the value
-just needs to exist indefinitely, and it will as a constant. While C
-doesn't mind the `const` difference, a simple cast will silence C++'s
-higher strictness.
-
-And in fact, the other use of `GtkTargetEntry` in
-`src/ui/drag-and-drop.cpp` does the same cast.
-
-Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
---- a/src/ui/widget/selected-style.cpp
-+++ b/src/ui/widget/selected-style.cpp
-@@ -100,14 +100,8 @@ enum ui_drop_target_info {
-     APP_OSWB_COLOR
- };
- 
--//TODO: warning: deprecated conversion from string constant to ‘gchar*’
--//
--//Turn out to be warnings that we should probably leave in place. The
--// pointers/types used need to be read-only. So until we correct the using
--// code, those warnings are actually desired. They say "Hey! Fix this". We
--// definitely don't want to hide/ignore them. --JonCruz
- static const GtkTargetEntry ui_drop_target_entries [] = {
--    {g_strdup("application/x-oswb-color"), 0, APP_OSWB_COLOR}
-+    {(gchar *)"application/x-oswb-color", 0, APP_OSWB_COLOR}
- };
- 
- static guint nui_drop_target_entries = G_N_ELEMENTS(ui_drop_target_entries);
--- 
-2.39.2
diff --git a/media-gfx/inkscape/inkscape-1.2.2-r4.ebuild b/media-gfx/inkscape/inkscape-1.2.2-r4.ebuild
deleted file mode 100644
index 00c5bc63f64e..000000000000
--- a/media-gfx/inkscape/inkscape-1.2.2-r4.ebuild
+++ /dev/null
@@ -1,197 +0,0 @@
-# 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="xml(+)"
-MY_P="${P/_/}"
-inherit cmake flag-o-matic xdg toolchain-funcs python-single-r1
-
-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/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86"
-fi
-
-DESCRIPTION="SVG based generic vector-drawing program"
-HOMEPAGE="https://inkscape.org/ https://gitlab.com/inkscape/inkscape/"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-IUSE="cdr dia exif graphicsmagick imagemagick inkjar jemalloc jpeg openmp postscript readline 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.54.1:2
-	dev-cpp/gtkmm:3.0
-	>=dev-cpp/pangomm-2.40:1.4
-	>=dev-libs/boehm-gc-7.1:=
-	dev-libs/boost:=
-	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/fontconfig
-	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?]
-	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/lockfile[${PYTHON_USEDEP}]
-		dev-python/lxml[${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] )
-	)
-	jemalloc? ( dev-libs/jemalloc )
-	jpeg? ( media-libs/libjpeg-turbo:= )
-	readline? ( sys-libs/readline:= )
-	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 )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.2.2-fix-compile.patch
-	"${FILESDIR}"/${PN}-1.3.2-libxml2-2.12.patch
-)
-
-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=$(usex jemalloc)
-		-DENABLE_LCMS=ON
-		-DWITH_OPENMP=$(usex openmp)
-		-DBUILD_SHARED_LIBS=ON
-		-DWITH_SVG2=$(usex svg2)
-		-DWITH_LIBVISIO=$(usex visio)
-		-DWITH_LIBWPG=$(usex wpg)
-		-DWITH_X11=$(usex X)
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	local myctestargs=(
-		# 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?
-		-E "(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)"
-	)
-
-	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_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/inkscape/inkscape-1.3.2.ebuild b/media-gfx/inkscape/inkscape-1.3.2.ebuild
deleted file mode 100644
index bcd4aa1ca77c..000000000000
--- a/media-gfx/inkscape/inkscape-1.3.2.ebuild
+++ /dev/null
@@ -1,209 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-PYTHON_REQ_USE="xml(+)"
-MY_P="${P/_/}"
-inherit cmake flag-o-matic xdg toolchain-funcs python-single-r1
-
-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/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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.54.1: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=
-	net-libs/libsoup:2.4
-	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/lockfile[${PYTHON_USEDEP}]
-		dev-python/lxml[${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 )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-libxml2-2.12.patch
-	"${FILESDIR}"/${P}-poppler-24.03.patch
-)
-
-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_CAIRO=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_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/iscan/Manifest b/media-gfx/iscan/Manifest
index 329098955e8b..6241327fa6ee 100644
--- a/media-gfx/iscan/Manifest
+++ b/media-gfx/iscan/Manifest
@@ -23,4 +23,4 @@ DIST userg_revQ_e.pdf 627189 BLAKE2B ff57871c58dc541e30d65127bd8f4cc2a20ec5341c1
 DIST userg_revQ_j.pdf 734920 BLAKE2B ed2cffdc2dbf0a2403dcbd93cef3349b9e35afb305f9b36f92b8f11bd42b5281fc7bfbec108703f327fb538868c530418406d37505e6eb6afa621d2d49d007ba SHA512 d5cb0cebaae0ac36951379cad516f0575e85e0bb509cf88549239e300c7d6c6a4996497145acaa9e9783de6b08c6e352c7ffbedb23ed04c15eefbe9c3cf0bc90
 EBUILD iscan-2.30.4.2-r3.ebuild 4012 BLAKE2B 11bba57421eda6c24c285fb0bd1e39e2e9618790b48dded5cace806a3b15fff661fcaef9ca0dddef13589387c0b490036c279b5026e1cfde3edd1519bc89c89c SHA512 27dafa8850935ab565f174b343c341bc96035ff3522fd33b32ec2642a85ec60173b231b7fa18ab5e2d7425fde7494c1c7e7f0a276519c36fa496e9518ad281ec
 EBUILD iscan-3.65.0-r2.ebuild 3070 BLAKE2B c52c3d075b0fd665bb3fb3449b7065e8cf4b70b2392335f3e7466a952c60a820ad1d60dcb7a7416e411a4328e87ad50b6c61ecc07a6e1a8dd51d552d8eee1aac SHA512 93cce9123d8a71543dcd708b0736f7751b48113b22fcb801067888be5028f74fb09ef36a07a422f975e5b5abf29a32fc297765900923b708f464987b6375085d
-MISC metadata.xml 582 BLAKE2B c2c7c28d7d52f45b5510fce9517d6b27b4aa848fb7e9bea9db57791171ef6466717565ff773eed7639803040e544f5fc20b12a8391a3b87def9d3a053a56d7ba SHA512 6390b2cc0d34c52fb819315c538079682eddf6af2509f07f80ed1f5af56ce84d658880fa4a7bc12056ab3dd83078177a3d61b87d7a29301683333f6f1a51b0c9
+MISC metadata.xml 662 BLAKE2B 4e3f0a36da1843565376e0e13d6db42c3b2b0a7b6a2a248a0107b7b3c29164341eba656415ff2156e9ddc6db623c7800e8a73853f1101293f47b422d3accd6cc SHA512 614944debf04a3ef11ce336d27be1d2999929175e3b19b2fc8f1107a914f92dd319946593e92e7b8311917e642554e4c47c1c71f59ce0b812a10f3aa9cab5872
diff --git a/media-gfx/iscan/metadata.xml b/media-gfx/iscan/metadata.xml
index da073556a520..0c4a31e7a4ac 100644
--- a/media-gfx/iscan/metadata.xml
+++ b/media-gfx/iscan/metadata.xml
@@ -9,4 +9,7 @@
 		scanners and all-in-ones. However, the scanner driver it provides can
 		be used by any other SANE standard compliant scanner utility.
 	</longdescription>
+	<upstream>
+		<remote-id type="gitlab">utsushi/utsushi</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-gfx/openvdb/Manifest b/media-gfx/openvdb/Manifest
index ca8009e79718..1ef720649894 100644
--- a/media-gfx/openvdb/Manifest
+++ b/media-gfx/openvdb/Manifest
@@ -7,6 +7,6 @@ AUX openvdb-8.1.0-glfw-libdir.patch 742 BLAKE2B 2ab1de05da49480584e373dba0f4a850
 AUX openvdb-9.0.0-fix-atomic.patch 1548 BLAKE2B 718d9eb0511ea50733d7f11b6720a90fd052452f049afbeceecedb2612963f8dfa53d81030671dd426acb1b8d9280e780bfe39030660152b933c80c21c5e1fbd SHA512 316eb3253d53f7fda43f90e3e6f432aa8e5a687c535cefee04c5af682ede05e744513394f16569c50b4cb2baf142750ed19ae815141738d25babad41699e8a46
 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 5111 BLAKE2B cd12c0484e98b98486c9d19d14a9f58fc7ce0c67514045295541ec116e7e0930ea7feb246fb42adcd356b47833114192341e7b1d76855473190424ef379509b8 SHA512 db706a6f488a0d26b58e0e54c675da319bf185cb6114f99e6a70f05afdec950a46ca81791483e4e09a1f21910b4241f9a024827043140c8f30b970f9b719080a
-EBUILD openvdb-11.0.0.ebuild 9615 BLAKE2B f167b204ed1758cf74cc5b1c9f33336a322d8dabec65dc003ace1c0623affcfe103a44e36f8ef05a5627aea7ba46f1dd86bd4c33f29a2d91875f80e8757a82b7 SHA512 255accf8149f1899369a238cc6c417fd255b4d34b96c70875d3af79f5a3a047f7e40bfa7f4d0f05d1053ea417ee11963990fce99a0946959853aac5cdd8d86fe
+EBUILD openvdb-10.0.1.ebuild 5301 BLAKE2B 23512715e9b40466b8ca6ee4000b794a0bc8806cd2c9822d3ff21744fa496f55be69b53436aa920eb40084cf6c5508df156eadecd7ac28f139e1b137ccc144da SHA512 0da78e71c150b055521883cee4f46aae2b240fcf1e2d7886b171fcbcba6c583eb734dd70035d610d1beeb0c2c4f01c738fb6e6f904055bae4e3ffa779406edfb
+EBUILD openvdb-11.0.0.ebuild 9792 BLAKE2B 371d507f0a4c7d8e9c521d8aff35832f7a75fa241d1317f462d34da2c36e435d30b2642abc7e400f8394e8740b264f4f3b4d97e7e257f35a5d03500338b2a7b7 SHA512 ec0620f9a985be0593f87373821b58df30ebfc6b0008c01b022bb3afb151b20715ea11f03d7e275c2d11ecc247e2892360503c9ad3007fc5c6a09739d70d2cb7
 MISC metadata.xml 1920 BLAKE2B acab685a9a9f5f4bab9179e71cac281a2faf5d5f7e4cfd5ecbcd581bb57d148c85f7effbfdb8d796152605d38b18a42c2321ed80a10adb9ba97d5baf95d5582f SHA512 e2736509047f65a51faf64b112387aa75c31d4c6a7e0996b5d30c2f555ae3d705d71b68359bb4b665a9f73d0147cdf40c95f5ba4a9daa6d873507bc9e55034ca
diff --git a/media-gfx/openvdb/openvdb-10.0.1.ebuild b/media-gfx/openvdb/openvdb-10.0.1.ebuild
index 287893b0cff4..5a0a42c5aed3 100644
--- a/media-gfx/openvdb/openvdb-10.0.1.ebuild
+++ b/media-gfx/openvdb/openvdb-10.0.1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{9..11} )
 
-inherit cmake cuda llvm python-single-r1
+inherit cmake cuda flag-o-matic llvm python-single-r1
 
 DESCRIPTION="Library for the efficient manipulation of volumetric data"
 HOMEPAGE="https://www.openvdb.org"
@@ -100,6 +100,12 @@ src_prepare() {
 }
 
 src_configure() {
+	# -Werror=strict-aliasing
+	# https://bugs.gentoo.org/926820
+	# https://github.com/AcademySoftwareFoundation/openvdb/issues/1784
+	append-flags -fno-strict-aliasing
+	filter-lto
+
 	local myprefix="${EPREFIX}/usr/"
 
 	local version
diff --git a/media-gfx/openvdb/openvdb-11.0.0.ebuild b/media-gfx/openvdb/openvdb-11.0.0.ebuild
index 056d464f7218..35a71fe06c64 100644
--- a/media-gfx/openvdb/openvdb-11.0.0.ebuild
+++ b/media-gfx/openvdb/openvdb-11.0.0.ebuild
@@ -352,6 +352,12 @@ my_src_install() {
 }
 
 src_configure() {
+	# -Werror=strict-aliasing
+	# https://bugs.gentoo.org/926820
+	# https://github.com/AcademySoftwareFoundation/openvdb/issues/1784
+	append-flags -fno-strict-aliasing
+	filter-lto
+
 	multibuild_foreach_variant my_src_configure
 }
 
diff --git a/media-gfx/prusaslicer/Manifest b/media-gfx/prusaslicer/Manifest
index ac973d18f3b5..05b0ffc2b830 100644
--- a/media-gfx/prusaslicer/Manifest
+++ b/media-gfx/prusaslicer/Manifest
@@ -5,9 +5,9 @@ AUX prusaslicer-2.7.2-opencascade-7.8.0.patch 432 BLAKE2B e7ac72dbe7ab6f79703c7e
 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.2.tar.gz 64915607 BLAKE2B 25f531df0e1ed941cd5f15f6e30938dceb89148d4166b4042db60e587b5277d02e310738a9b368e9f3b88aea3abb9c9d5e2be89b5774b42191b7cae0589ce5c8 SHA512 74467cc353fd611133b0b0bc7b8026dc67bce0c7f1d14a47368dd5bac6c33b6400f73e2ecc46b7b43e8c724f0ec6e5f509bafed04c2c7349e5ffb1022af2f4db
-DIST prusaslicer-2.7.3.tar.gz 65398513 BLAKE2B 0aa135a7106061978a2c5f5d874ad1885e42a976a9a7834f6dd9fea4e80f4224b781b6abe7e680e4c6826f90f95ecfcc547f9dcca645b885a082e32a3efc504a SHA512 aef22b742d93d4b3348f17809403e579fa187c1a27813a79b729cd2576db3f3ff9a73676b7815f8fff469e967e880e51de378ec24f36d5e35d73a7fc6850e0c8
+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.2.ebuild 2171 BLAKE2B 51048af1ddd27962697f084a3771e0ed1e9e8e316a115643b0682649645e77aeb27d02f7c442cbdb54766a050cf37474fec35e94c0fafcce1516ab5729d11970 SHA512 19cc3898a9c493c723c04db8bb224523b8e8832d0fdf38aab85b90de8c1f7f7ff112c747ec6c257d2e423bd63073ccf323d522f70ca53da52d24d9e36e6d8be5
-EBUILD prusaslicer-2.7.3.ebuild 2171 BLAKE2B 51048af1ddd27962697f084a3771e0ed1e9e8e316a115643b0682649645e77aeb27d02f7c442cbdb54766a050cf37474fec35e94c0fafcce1516ab5729d11970 SHA512 19cc3898a9c493c723c04db8bb224523b8e8832d0fdf38aab85b90de8c1f7f7ff112c747ec6c257d2e423bd63073ccf323d522f70ca53da52d24d9e36e6d8be5
+EBUILD prusaslicer-2.7.4.ebuild 2171 BLAKE2B 51048af1ddd27962697f084a3771e0ed1e9e8e316a115643b0682649645e77aeb27d02f7c442cbdb54766a050cf37474fec35e94c0fafcce1516ab5729d11970 SHA512 19cc3898a9c493c723c04db8bb224523b8e8832d0fdf38aab85b90de8c1f7f7ff112c747ec6c257d2e423bd63073ccf323d522f70ca53da52d24d9e36e6d8be5
 MISC metadata.xml 1028 BLAKE2B a267e6b0ee72a85b895046cc7d5f659cca379fd799a9ebb802dc1fafd7edfa1b989784b10eb93ac24f1ea6153153b892e28e20055b0a7d2021f6db7742e065b4 SHA512 5760ea954f5ccf09e5d69e101b6d68839a4517a9375adc3009b1bf846b98091ee0555e9c92bb0cf316670efec699cd24d04b4ebe7db5b65e363f83051d868512
diff --git a/media-gfx/prusaslicer/prusaslicer-2.7.3.ebuild b/media-gfx/prusaslicer/prusaslicer-2.7.4.ebuild
index a4ea9747ee33..a4ea9747ee33 100644
--- a/media-gfx/prusaslicer/prusaslicer-2.7.3.ebuild
+++ b/media-gfx/prusaslicer/prusaslicer-2.7.4.ebuild
diff --git a/media-gfx/renderdoc/Manifest b/media-gfx/renderdoc/Manifest
index e82c0fb8a80b..5d13a0cdf226 100644
--- a/media-gfx/renderdoc/Manifest
+++ b/media-gfx/renderdoc/Manifest
@@ -3,8 +3,12 @@ AUX renderdoc-1.18-conditional-pyside.patch 2178 BLAKE2B b79e3fc960b83248a6991c0
 AUX renderdoc-1.18-system-flags.patch 845 BLAKE2B 0d4aae31af353b2d199ae66ec999beefa04e2105e6368305bb89359806fa99f4b7048c3d6c30a2787a3125718d3cbd7c97d3381f61f4f98a2e08730b5a22db02 SHA512 bd2692f14729360983f5ca4fb8af87085ab5bd209d82f3cfd99e7753d0dd406905a6280051aa5d1476b863566b385cdc28fbe9120d0d6f5efd78411af15b68ef
 AUX renderdoc-1.27-env-home.patch 438 BLAKE2B a42c86648314382bba7b93ee544fe6d82b4f1ec122c57d7b989475bd442dd7003de8bfd7f467e88693deac6212846103038f48501ffef9eae7d0c38100669eac SHA512 c0b340582de7c23637afa7a95dcd2f3f4c6f28ad9c244c92235e29e428ba40a991cbcac83197a3b52c1c689f4d07ede2fc0c96d4b1b3c67dc94866137a7ce4b7
 AUX renderdoc-1.30-r1-system-compress.patch 4565 BLAKE2B 62ac93b27e7b2fd1962075241cab49acc3971f76b9046a53b0ccdb7707f849aca1c6b4306e07455bdb5e4c9df7f72bba5665a2b3927dfc782722486e2fc152c7 SHA512 7815ea6170583899ee6f48c1aec8a175082208c6b4d1f6c651f3274317c9b9575548f8bb900abc5137309df5448c4643b4fc4e74b367aa18c3dc7dacabba842a
+AUX renderdoc-1.31-lld.patch 604 BLAKE2B 175a2a54e18ae6a8051f54e058aa5b516cc8834a71f09d8a352e253a0b4a38cb3a43275c4cfbd8a7799698dca46553bb6319ce1963175757dbd0b3de0d6b5abb SHA512 f4db95aad6602197afc9fa6de7934638a0fd47903aa4488fc994a53bc67e557cd22450e9253aa047ca70c9af30cdc372c69528b64943878498cf781a1a703e96
 DIST renderdoc-1.30.tar.gz 50938458 BLAKE2B 2e9364a8eabca64384e066709c98be8df0ed3c970c173074f9d38eea21d4dc31a50b862818879ccb9f32be8b839643c2d01ddda70d9da8c338c2fc305549eaa9 SHA512 33437f7420d6a79f2b02536ae63bc31537cfab83cdac2d44efdef377e93db7c0c15f2e46ecc67a6ea780f36b162f04d7a00ac3fe5d382fe761fa986664aceb60
 DIST renderdoc-1.30.tar.gz.asc 833 BLAKE2B c829329806de5cfc672c2cc976596a5c126cd5f24bef189f6832de8f8f3721461e56688823d562e82eae89792c5fc4a500037cc97c2cce2b762b211a951c1d19 SHA512 f68a04aec4e304df0eba3dcba2876f99182fecff82b6b600d621e48c15bce42c07f20aebc811fd36aff5c04f550a51483af2b499051700a2c5bc936311a534de
+DIST renderdoc-1.31.tar.gz 51193992 BLAKE2B a51e2d380b61f462e29b97679b0c2014e26cf108e3d9bc70874fedfbee5a9f391e8693f54c76fae51b9459b70d2197c362b95054a54c5e2e889c8ce85ba74305 SHA512 c119fdd7f27ef4f617b5b5aad94267326f403802648d6ed0970651e48b2467729ce5768ea64c77cab337ff0bdde4c17eaa01028dfebb15568bb4500693cf6d6e
+DIST renderdoc-1.31.tar.gz.asc 833 BLAKE2B 82d360070eea9cf037b3ec7de899c58372e64540d2346cc209edb8cc3c321fd628954fbb1275b27366a2d91dd8604e9ebdd961cfd4dcab0abea1fb3bc793817b SHA512 878dd0a042aa8af97b7ba158fd88776cb2ea3ca662cfc95752d477727686342153db217302d9325f0f6bbd76628eb608820350981bf0d819812e57cea773f499
 DIST swig-renderdoc-7.tar.gz 4006241 BLAKE2B 619f41239f4aef496264d61f44ae042cf80d3ff28491d452cf11ad07e898554c4a32df6119ee0e8e3de36e6bee61855358cd968ad01c9281976e24e9a6cac839 SHA512 5285a65924c069cfb9f73104ad8a95251badac4001293a1757b97ebead5953730c03289159741f82da4c5afe4f61f7c826b105eaf82df044ed2fa21810242c86
 EBUILD renderdoc-1.30-r2.ebuild 5017 BLAKE2B 4c22e5bd875ecbf7627467b86dbaca3a753c0539d432c7a14182c999a5d820e05a0d42321c626d2362a4c550392c5779974b1f39e41acfe34542512cc97d092f SHA512 a77878ca913bcb5c2864060364d2f0d2db2080ffa5e355dfb60a6c0d176ae109ed07103d0212fc9c4c5e364ff74563ee78a663006f0d053b2f90393f9d01eeab
+EBUILD renderdoc-1.31.ebuild 5070 BLAKE2B 9dff8e948cb7b876c782d62631526579a5168fcc5ba94a77c9bb172948385ccd2a2ee10a3b418fda071619a3d7a16b10162105f32a8b6aba9b080b2e253cf2bf SHA512 07a20446e20bc3cfe1425fc2342ffcc1f9835118fce3c08746ee1ffc4a384de6ee1bac989a3e64d54fef7d5e079561e81fc06ad04fc00822fb2ec42dc1eb35a1
 MISC metadata.xml 435 BLAKE2B 888315bf64deb77094dc4ee8411d79df42a70c5ab1e0968d1ad30dc68b76f465bd25572f3d2835541c28d2fc8bdc8c63f49c7b27252b84378707b525119e02aa SHA512 aadde747071d106a31f0c12f8024339179fb8f552e099732868135fe026ba4300629f36a2e4cb5eaa98661808e1748c40acc8e77053dd5d1d0008041a18f519d
diff --git a/media-gfx/renderdoc/files/renderdoc-1.31-lld.patch b/media-gfx/renderdoc/files/renderdoc-1.31-lld.patch
new file mode 100644
index 000000000000..4c19c97bf28e
--- /dev/null
+++ b/media-gfx/renderdoc/files/renderdoc-1.31-lld.patch
@@ -0,0 +1,23 @@
+Remove undefined symbols from version script.
+
+Bug: https://bugs.gentoo.org/925578
+--- a/renderdoc/renderdoc.version
++++ b/renderdoc/renderdoc.version
+@@ -6,17 +6,14 @@
+                 egl[A-Z]*;
+                 vk_icd*;
+                 dlopen;
+-                dlsym;
+                 fork;
+                 execl;
+                 execlp;
+                 execle;
+-                execlpe;
+                 execv;
+                 execvp;
+                 execve;
+                 execvpe;
+-                _exit;
+                 RENDERDOC_*;
+                 VK_LAYER_RENDERDOC_*;
+         local:
diff --git a/media-gfx/renderdoc/renderdoc-1.31.ebuild b/media-gfx/renderdoc/renderdoc-1.31.ebuild
new file mode 100644
index 000000000000..c8d27b42b52d
--- /dev/null
+++ b/media-gfx/renderdoc/renderdoc-1.31.ebuild
@@ -0,0 +1,191 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# The swig fork is required for compatibility with both provided and
+# 3rd-party Python scripts.  Required patch was sent to upstream in
+# 2014: https://github.com/swig/swig/pull/251
+MY_SWIG_VER=7
+MY_SWIG=swig-${PN}-${MY_SWIG_VER}
+
+AUTOTOOLS_AUTO_DEPEND="no"
+DOCS_BUILDER="sphinx"
+DOCS_DIR="docs"
+PYTHON_COMPAT=( python3_{9..12} )
+inherit autotools cmake flag-o-matic optfeature python-single-r1 docs qmake-utils verify-sig xdg
+
+DESCRIPTION="A stand-alone graphics debugging tool"
+HOMEPAGE="https://renderdoc.org https://github.com/baldurk/renderdoc"
+SRC_URI="
+	https://github.com/baldurk/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+	qt5? ( https://github.com/baldurk/swig/archive/${PN}-modified-${MY_SWIG_VER}.tar.gz -> ${MY_SWIG}.tar.gz )
+	verify-sig? ( https://github.com/baldurk/renderdoc/releases/download/v${PV}/v${PV}.tar.gz.asc -> ${P}.tar.gz.asc )
+"
+
+# renderdoc: MIT
+#   + cmdline: BSD (not compatible with upstream lib)
+#   + farm fresh icons: CC-BY-3.0
+#   + half: MIT (not compatible with system dev-libs/half)
+#   + include-bin ZLIB (upstream doesn't exist anymore, maintained in tree)
+#   + md5: public-domain
+#   + plthook: BSD-2
+#   + pugixml: MIT
+#   + radeon gpu analyzer: MIT
+#   + source code pro: OFL-1.1
+#   + stb: public-domain
+#   + tinyfiledialogs: ZLIB
+#   + glslang: BSD
+#   + docs? ( sphinx.paramlinks: MIT )
+# swig: GPL-3+ BSD BSD-2
+LICENSE="BSD BSD-2 CC-BY-3.0 GPL-3+ MIT OFL-1.1 public-domain ZLIB"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="qt5"
+REQUIRED_USE="doc? ( qt5 ) qt5? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	app-arch/lz4:=
+	app-arch/zstd:=
+	dev-libs/miniz:=
+	x11-libs/libX11
+	x11-libs/libxcb:=
+	x11-libs/xcb-util-keysyms
+	virtual/opengl
+	qt5? (
+		${PYTHON_DEPS}
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtnetwork:5[ssl]
+		dev-qt/qtsvg:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtx11extras:5
+	)
+"
+DEPEND="${RDEPEND}"
+# qtcore provides qmake, which is required to build the qrenderdoc gui.
+BDEPEND="
+	x11-base/xorg-proto
+	virtual/pkgconfig
+	qt5? (
+		${AUTOTOOLS_DEPEND}
+		${PYTHON_DEPS}
+		dev-libs/libpcre
+		dev-qt/qtcore:5
+		app-alternatives/yacc
+	)
+	verify-sig? ( sec-keys/openpgp-keys-baldurkarlsson )
+"
+
+PATCHES=(
+	# The analytics seem very reasonable, and even without this patch
+	# they are NOT sent before the user accepts.  But default the
+	# selection to off, just in case.
+	"${FILESDIR}"/${PN}-1.18-analytics-off.patch
+
+	# Only search for PySide2 if pyside2 USE flag is set.
+	# Bug #833627
+	"${FILESDIR}"/${PN}-1.18-conditional-pyside.patch
+
+	# Pass CXXFLAGS and LDFLAGS through to qmake when qrenderdoc is
+	# built.
+	"${FILESDIR}"/${PN}-1.18-system-flags.patch
+
+	# Needed to prevent sandbox violations during build.
+	"${FILESDIR}"/${PN}-1.27-env-home.patch
+
+	"${FILESDIR}"/${PN}-1.30-r1-system-compress.patch
+
+	# Bug #925578
+	"${FILESDIR}"/${PN}-1.31-lld.patch
+)
+
+DOCS=( util/LINUX_DIST_README )
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/baldurkarlsson.gpg
+
+pkg_setup() {
+	use qt5 && python-single-r1_pkg_setup
+}
+
+src_unpack() {
+	if use verify-sig; then
+	   verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.asc}
+	fi
+
+	# Do not unpack the swig sources here.  CMake will do that if
+	# required.
+	unpack ${P}.tar.gz
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	# Remove the calls to install the documentation files.  Instead,
+	# install them with einstalldocs.
+	sed -i '/share\/doc\/renderdoc/d' \
+		"${S}"/CMakeLists.txt "${S}"/qrenderdoc/CMakeLists.txt \
+		|| die 'sed remove doc install failed'
+
+	# Assumes that the build directory is "${S}"/build, which it is not.
+	sed -i "s|../build/lib|${BUILD_DIR}/lib|" \
+		"${S}"/docs/conf.py \
+		|| die 'sed patch doc sys.path failed'
+
+	# Bug #836235
+	sed -i '/#include <stdarg/i #include <time.h>' \
+		"${S}"/renderdoc/os/os_specific.h \
+		|| die 'sed include time.h failed'
+}
+
+src_configure() {
+	local mycmakeargs=(
+		# Build system does not know that this is a tagged release, as
+		# we just have the tarball and not the git repository.
+		-DBUILD_VERSION_STABLE=ON
+
+		-DENABLE_EGL=ON
+		-DENABLE_GL=ON
+		-DENABLE_GLES=ON
+		-DENABLE_PYRENDERDOC=$(usex qt5)
+		-DENABLE_QRENDERDOC=$(usex qt5)
+		-DENABLE_VULKAN=ON
+
+		# Upstream says that this option is unsupported and should not
+		# be used yet.
+		-DENABLE_UNSUPPORTED_EXPERIMENTAL_POSSIBLY_BROKEN_WAYLAND=OFF
+
+		-DENABLE_XCB=ON
+		-DENABLE_XLIB=ON
+
+		# renderdoc_capture.json is installed here
+		-DVULKAN_LAYER_FOLDER="${EPREFIX}"/etc/vulkan/implicit_layer.d
+	)
+
+	use qt5 && mycmakeargs+=(
+		-DPython3_EXECUTABLE="${PYTHON}"
+		-DRENDERDOC_SWIG_PACKAGE="${DISTDIR}"/${MY_SWIG}.tar.gz
+
+		# Needed after qtchooser removal, bug #836474.
+		-DQMAKE_QT5_COMMAND="$(qt5_get_bindir)"/qmake
+
+		# Bug #926549
+		-DQRENDERDOC_ENABLE_PYSIDE2=OFF
+	)
+
+	# Lots of type mismatch issues.
+	filter-lto
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	docs_compile
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	optfeature "android remote contexts" dev-util/android-tools
+	optfeature "vulkan contexts" media-libs/vulkan-loader
+}
diff --git a/media-gfx/sane-backends/Manifest b/media-gfx/sane-backends/Manifest
index 890a1cd11361..5b2bfd9c1d51 100644
--- a/media-gfx/sane-backends/Manifest
+++ b/media-gfx/sane-backends/Manifest
@@ -15,7 +15,7 @@ AUX saned_at.service 434 BLAKE2B 6dad3c809e01c17c0064a52c4103486b19294ed3cf8fc71
 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 9413 BLAKE2B 2243bd613fb414a961dc53f7cc4e23ee44f0e3e9ae1089974675ce5fff36a976e050232b521217c90332615384bd43507434dea6c85a032b30f77acfa9b8fc80 SHA512 a1ed3f7788982bf0fe7204953a74e85aba992780f30fe2cd1bceec45035a25a2f009571c67af1febf7934df5c4ced6754a1bde17372b1bd0312a3750c317e57a
-EBUILD sane-backends-1.1.1-r13.ebuild 9575 BLAKE2B 00591ad78d9cb5af2a3a8121cb32d376fad8751146229ea67aae5e2d5d495e60f409b1f9f92fc9ecff2fdd88a438ac75ec63f5b98ce96a58209e50e303fb34d4 SHA512 45614fca94a7aa6d7709f7a65434cdf4841e8948614cf859d565d07d4b41ad30767cdb4f7fa540693589c361b24e9c8f6c635559788593fe1325368cf25cb0c8
-EBUILD sane-backends-1.2.1.ebuild 9388 BLAKE2B a1837f2002282ba0f46db7339fd0744534e08eed589147c2801b7688d4afbb22110112e29a439cbd47eb48e602a33c70a582eb1e90fd3969486f80fc949be5ee SHA512 8c6a152f1ee802a06dada63641172a77d0b230f766dc863942ab7f90a08cb1eb4734a93d0fe82edc1f1d37a4255376b593bc9171091fdf3a1056d0d25b82c9e6
+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
 MISC metadata.xml 333 BLAKE2B 7d543cb4daa6542f7facef3e1f57c09144baed3198010d7c39df40398ab82791f56271375bce36e829a1364350d05f81c332a2359e7038b047df31407543d331 SHA512 52ac311d50fcfe020b4ec891bcbc1df2834d5d1e3ade7ab6926c6f85a31712dd5886b834739f6155873e1e09967c8f565b913c807acd7ea47a4d3b94160fff37
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
index 044b4fd553fc..7cda923f849d 100644
--- a/media-gfx/sane-backends/sane-backends-1.1.1-r11.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.1.1-r11.ebuild
@@ -190,19 +190,8 @@ MULTILIB_CHOST_TOOLS=(
 src_prepare() {
 	default
 
-	# Patch out the git reference so we can run eautoreconf
-	sed \
-		-e "s/m4_esyscmd_s(\[git describe --dirty\])/${PV}/" \
-		-e '/^AM_MAINTAINER_MODE/d' \
-		-i configure.ac || die
 	eautoreconf
 
-	# Fix for "make check".  Upstream sometimes forgets to update this.
-	local ver=$(./configure --version | awk '{print $NF; exit 0}')
-	sed -i \
-		-e "/by sane-desc 3.5 from sane-backends/s:sane-backends .*:sane-backends ${ver}:" \
-		testsuite/tools/data/html* || die
-
 	# don't bleed user LDFLAGS into pkgconfig files
 	sed 's|@LDFLAGS@ ||' -i tools/*.pc.in || die
 
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
index 99b7d0e574d9..cc8ec2c60f74 100644
--- a/media-gfx/sane-backends/sane-backends-1.1.1-r13.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.1.1-r13.ebuild
@@ -195,19 +195,8 @@ MULTILIB_CHOST_TOOLS=(
 src_prepare() {
 	default
 
-	# Patch out the git reference so we can run eautoreconf
-	sed \
-		-e "s/m4_esyscmd_s(\[git describe --dirty\])/${PV}/" \
-		-e '/^AM_MAINTAINER_MODE/d' \
-		-i configure.ac || die
 	eautoreconf
 
-	# Fix for "make check".  Upstream sometimes forgets to update this.
-	local ver=$(./configure --version | awk '{print $NF; exit 0}')
-	sed -i \
-		-e "/by sane-desc 3.5 from sane-backends/s:sane-backends .*:sane-backends ${ver}:" \
-		testsuite/tools/data/html* || die
-
 	# don't bleed user LDFLAGS into pkgconfig files
 	sed 's|@LDFLAGS@ ||' -i tools/*.pc.in || die
 
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 0654e5f25260..2b69e30c7d17 100644
--- a/media-gfx/sane-backends/sane-backends-1.2.1.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.2.1.ebuild
@@ -190,22 +190,8 @@ MULTILIB_CHOST_TOOLS=(
 src_prepare() {
 	default
 
-	# Patch out the git reference so we can run eautoreconf
-	sed \
-		-e "s/m4_esyscmd_s(\[git describe --dirty\])/${PV}/" \
-		-e '/^AM_MAINTAINER_MODE/d' \
-		-i configure.ac || die
 	eautoreconf
 
-	# Fix for "make check".  Upstream sometimes forgets to update this.
-	local ver=$(./configure --version | awk '{print $NF; exit 0}')
-	sed -i \
-		-e "/by sane-desc 3.5 from sane-backends/s:sane-backends .*:sane-backends ${ver}:" \
-		testsuite/tools/data/html* || die
-
-	# 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
 }
diff --git a/media-gfx/svg2rlg/Manifest b/media-gfx/svg2rlg/Manifest
index 5ee4ce0e625c..fb95bd989f00 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
-MISC metadata.xml 248 BLAKE2B b8c3f3218b1a5b5a815a2a09751730237a898cdfe3b4efddbbe6cf0289c4784c1317447a7d511af25cd83e9b24cf0a1d2ead158ffd3917f2e83d83ff9868743b SHA512 403566e808f63d98634f04fa0953a6e1ec6d679a2d68cc88d38c8b150388bc93960ce9ef3134d16d72602a531ffa4dde18c8bb09c1f1d82658e381e514c859af
+MISC metadata.xml 293 BLAKE2B d66e1fe65900e1b049f3cb1635362e0dc2fb5fd20a4be3c00f6452b9bd21ef74b60582cdef06b8417a727ede8f4360ee4a4584d191b47f77ba243e4bda9a558d SHA512 0be54a59a6088ed5dad4da3cc774ea41ea6b45a3cfa875b9cd0072de4d0b7d9205abb20221c3d45ed84b9e38b4f94377eda3038cf84d386ea4522d747d346709
diff --git a/media-gfx/svg2rlg/metadata.xml b/media-gfx/svg2rlg/metadata.xml
index e7c9ced3cbbf..045f92209279 100644
--- a/media-gfx/svg2rlg/metadata.xml
+++ b/media-gfx/svg2rlg/metadata.xml
@@ -4,5 +4,6 @@
 	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">sarnold/svg2rlg</remote-id>
+		<remote-id type="pypi">svg2rlg</remote-id>
 	</upstream>
 </pkgmetadata>