gentoo auto-resync : 01:01:2025 - 06:30:57

19 files changed, 28 insertions, 689 deletions

diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index bd81db9f640f..adb60e068d71 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/converseen/Manifest b/media-gfx/converseen/Manifest
index a526d9aad3ed..7e4e1ed8bb72 100644
--- a/media-gfx/converseen/Manifest
+++ b/media-gfx/converseen/Manifest
@@ -1,9 +1,6 @@
 AUX converseen-0.12.0.1-graphicsmagick-support.patch 3555 BLAKE2B 4f8880e02f893c0cb7533c4fd4e0d50f6e737917d0cec5a762c6a65f1febbefde79d1e0d973d3e5a72e0aabf138d6cecec285c81f16a83bed6fa1fcb90926c9d SHA512 d81214d953f3b83dab9c829ae26ebef318633c7ae02c6b467806ef60ac177d90bbb5f5f3dc8278da53b75083a1e7c145e4847b31ab6739594ce0909d45c68be6
-AUX converseen-0.9.11.1-graphicsmagick-support.patch 2051 BLAKE2B 463c48357df2f76b7e224e211e9c0f36356a1d143ffd5a7245f31c489fe91360262adf165a243b81798e084fee07923d2c89d7aaf45ecff2066928b2fea6547d SHA512 0c85c6ada5516c6b454bb57e829684b8ccbdb12f4de320cec01668df08ad86ea2088ae442ef3debbbf0fb947c72cd205c1aab3bb915d303d3ba9ac94329a7a96
 AUX converseen-0.9.9.0-appdata-path.patch 604 BLAKE2B ca524ae4a52f74b687e0e0246d758178d4287b3e866651293233c7055a38cdf6330fd2c2dfb0728c0b07f37b631dbd1c59159039b56be35fbc349d183dfd0dbd SHA512 411696d39dcca09a33119537600efd80bcf675714ea72548500f9c2a1112e61d53edc6d891cef770aac3cdd2cb881e169b4ab833521ae152859609871807066e
 AUX converseen-0.9.9.0-no-update.patch 540 BLAKE2B b8a7bcf561a4be48fdf9137a40c1f5b1451915a6cf4b2043f9adaf8dd1aa853b331ee1499bb34d05ae9e7da2d9f3f0515c62dca8146d4957126054557ebfcceb SHA512 b5ed008bd7a01cb99ec97faa6c9bd412009f1d438c420e201d2605c713ff57c346391d5389ed019c0538a263154d1ed36c4a581d0582d2c2eadf8dc77a67b97b
 DIST converseen-0.12.0.1.tar.gz 2296100 BLAKE2B 83a0271e1451fa196852d717332fa7446cd22bac7b675f3f306692aa1e11d4c5500d033fd9bbb7dd4ec9190ff3b15149bad1e9646006f533d930fc1d686b0a9b SHA512 4e6efa44953b097f8c6af19e3d849caf570a0fa2db673133e1d8ca2abee98b43d2fbd2d12e6c8c2a8ec6a9dd61a1ca3f25ee7a7787791cc783d8c967eacb9d9d
-DIST converseen-0.9.11.1.tar.gz 770024 BLAKE2B 671599099abf5b143bde7c57efc547626c14e15bebbd3a70ce4ec43d4febbaf69eebedebaaac935572b785afaa086c383b68bae0f02bc16ca68625dfb55b8c85 SHA512 1d61fa88d9e3d6ed23fb98d0495b00315adca880fd1d0d95e8322c48d9fdcd161ee00b5e2f5f52212c4db66d97e26ac0da561926e55de4bc047d3ad98b6f69dd
 EBUILD converseen-0.12.0.1.ebuild 1749 BLAKE2B 33e5141dfbac0ed89edfcca3f02c4c6092e3da22260229f44f60b0f03a616a6870877adfd26ce082eb2989fa736723740c363509c676cf76add5137a77fdcd19 SHA512 0d15cf3903d400ea87874662cfb1377bac1bd6edb80722aac08419e79fa343d3b9140de3e7c527260375402ef4f158b3916bcfa762692e688a3df74cec2eae76
-EBUILD converseen-0.9.11.1.ebuild 1759 BLAKE2B 5e73dd22acb4bed2e4555c07f79a956fa6049ed32956509ed76609d1419dedd0bbb1f39dbf7ea04d414686236d2378a0e24a1d47b3a8dcc83384e41b3756b49b SHA512 383d4445fa649dd36adfb32bf4430dcecf6b5091491c70adbefccc4238a65c6d796b17afcde27052f5d6a419b3b7fb6ac2ad148498c74d2185ec85e9db65cf3d
 MISC metadata.xml 490 BLAKE2B 7ee59abe13eee7dff622a3e7b701f6e0128a208e3e49f5b22b3fcaf06357991a50ece3ffa9cb607675f94a7784efcec37c2176464e4c7741efbfb8b8427cb5dc SHA512 a56719d55ea41683315c5d3f98b8351d3b15b68fd8f598a9e692691c771a94bec23b8263c8a017e29d63a20a8de8b440db1acfd26558c6f8d51add12e4016ba6
diff --git a/media-gfx/converseen/converseen-0.9.11.1.ebuild b/media-gfx/converseen/converseen-0.9.11.1.ebuild
deleted file mode 100644
index c77e1a0977df..000000000000
--- a/media-gfx/converseen/converseen-0.9.11.1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake xdg-utils
-
-DESCRIPTION="Batch image converter and resizer based on ImageMagick"
-HOMEPAGE="https://converseen.fasterland.net/
-	https://github.com/Faster3ck/Converseen/"
-SRC_URI="https://github.com/Faster3ck/Converseen/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="graphicsmagick debug"
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	graphicsmagick? ( media-gfx/graphicsmagick:=[cxx,imagemagick] )
-	!graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-qt/linguist-tools:5
-"
-
-S="${WORKDIR}/${P^}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.9.9.0-appdata-path.patch"
-	"${FILESDIR}/${PN}-0.9.9.0-no-update.patch"
-	"${FILESDIR}/${PN}-0.9.11.1-graphicsmagick-support.patch"
-)
-
-src_prepare() {
-	cmake_src_prepare
-
-	if use graphicsmagick; then
-		# Replace variables in CMakeLists.txt
-		sed -i -e "s/GENTOO_LIB/\/usr\/$(get_libdir)/g" \
-				-e "s/GENTOO_INCLUDE/\/usr\/include/g" \
-				"${S}/CMakeLists.txt" ||
-			die "Failed to sed graphicsmagick patch"
-
-		# Replace MagickCore in globals.cpp
-		sed -i -e "s/MagickCore/MagickLib/" "${S}/src/globals.cpp" ||
-			die "Failed to sed globals.cpp"
-	fi
-}
-
-pkg_postinst() {
-	elog "Please note that due to security policy restrictions"
-	elog "on media-gfx/imagemagick the support for PS, PDF and"
-	elog "XPS files must be explicitly enabled by commenting out"
-	elog "the respective policies in /etc/ImageMagick-7/policy.xml."
-	elog "See https://wiki.gentoo.org/wiki/ImageMagick#Troubleshooting"
-	elog "for more information."
-
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/media-gfx/converseen/files/converseen-0.9.11.1-graphicsmagick-support.patch b/media-gfx/converseen/files/converseen-0.9.11.1-graphicsmagick-support.patch
deleted file mode 100644
index a76f108e335c..000000000000
--- a/media-gfx/converseen/files/converseen-0.9.11.1-graphicsmagick-support.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-# See https://bugs.gentoo.org/628688 for further info and
-# development discussion about this patch.
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -100,6 +100,14 @@ FIND_PACKAGE(ImageMagick REQUIRED)
- FIND_PACKAGE(ImageMagick COMPONENTS Magick++)

- FIND_PACKAGE(ImageMagick COMPONENTS MagickWand)

- FIND_PACKAGE(ImageMagick COMPONENTS MagickCore)

-+if (NOT ImageMagick_MagickCore_FOUND)

-+    set(ImageMagick_INCLUDE_DIRS "GENTOO_INCLUDE/GraphicsMagick")

-+    set(ImageMagick_Magick++_INCLUDE_DIRS "GENTOO_INCLUDE/GraphicsMagick/Magick++")

-+    set(ImageMagick_MagickCore_INCLUDE_DIRS "")

-+    set(ImageMagick_LIBRARY "GENTOO_LIB/libGraphicsMagick.so")

-+    set(ImageMagick_Magick++_LIBRARY "GENTOO_LIB/libGraphicsMagick++.so")

-+    set(ImageMagick_MagickCore_LIBRARY "")

-+endif ()

- 

- INCLUDE_DIRECTORIES(${Qt5Core_INCLUDE_DIRS})

- INCLUDE_DIRECTORIES(${Qt5Gui_INCLUDE_DIRS})

---- a/src/converter.cpp
-+++ b/src/converter.cpp
-@@ -254,8 +254,14 @@ bool Converter::writeImage(Image &my_image, const QString &format, const int &qu
- 
-     error_status = "";
- 
-+/*  Workaround to compile with GraphicsMagick:
-+    GraphicsMagick "MagickLibVersion" is greater that 0x100000
-+    e.g. GraphicsMagick-1.3.25 has "MagickLibVersion=0x181501"
-+    or GraphicsMagick-1.3.26 has "MagickLibVersion=0x191600" */
- #if MagickLibVersion < 0x700
-     hasTransparency = my_image.matte();
-+#elif MagickLibVersion > 0x100000
-+    hasTransparency = my_image.matte();
- #else
-     hasTransparency = my_image.alpha();
- #endif
---- a/src/globals.h
-+++ b/src/globals.h
-@@ -32,8 +32,14 @@
- using namespace Magick;
- using namespace std;
- 
-+/*  Workaround to compile with GraphicsMagick:
-+    GraphicsMagick "MagickLibVersion" is greater that 0x100000
-+    e.g. GraphicsMagick-1.3.25 has "MagickLibVersion=0x181501"
-+    or GraphicsMagick-1.3.26 has "MagickLibVersion=0x191600" */
- #if MagickLibVersion < 0x700
-     typedef FilterTypes IMFilterType;
-+#elif MagickLibVersion > 0x100000
-+    typedef FilterTypes IMFilterType;
- #else
-     typedef FilterType IMFilterType;
- #endif
diff --git a/media-gfx/enblend/Manifest b/media-gfx/enblend/Manifest
index 0405a67f33ca..f9b8950683ad 100644
--- a/media-gfx/enblend/Manifest
+++ b/media-gfx/enblend/Manifest
@@ -3,5 +3,5 @@ AUX enblend-4.2.0_p20161007-doc-scaleable-fonts.patch 650 BLAKE2B 633ae86947cfcb
 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_p20240424.tar.xz 505928 BLAKE2B 49a9cfd2cb332573a1d3882ce6d50513008ee71d7235f69bb7920fc9b71f6c0c6e5e7ae88de4c5879d4cb2ee94d437b1752d6c13117c07ad81a6832b45985684 SHA512 1eed2cac0dd6d0ddec41097c4d21ebbad01981e6abbb5fe3db69fc4ef50728ce997faad73dc17255997e8eee9af9d540e38bc2bdf106eb6ca338ef1650680894
-EBUILD enblend-4.2.0_p20240424.ebuild 1991 BLAKE2B 3848672da03b6b0bbda2f8cce23883328e9fba773b78e63043ca751d5be44c6bb980c3fe52525e10430a102f789245da0adccc2b4ce9884e337580682dfe2d82 SHA512 11540f7baa057d8ad2611d15a1ba6fcc0c700d270f8d58f5f27c618f9e24469c73e5dbba43d789db1dda812c7072d03516953808a8f5d17a8f32b5cacddeb6b3
+EBUILD enblend-4.2.0_p20240424.ebuild 1899 BLAKE2B d168a14f417c7ff30ba6067f501881cbf8075ec7c053c3846fa452ee8c918b5761c13fa97daedbae13abf319b2efe55de5144ff883ce928bc36661a01a7b9333 SHA512 528f234fdce620dd6208f37bfadcaeeef215016cc3855d8259fcc4d622942fd564443c796abd51607fe6a080127919083e363d4687713e00e4d2f03cf8a55269
 MISC metadata.xml 438 BLAKE2B 6e1f7ffb0f56a8e668608a97c02e045546c76b90c18777a77c031a94f23ce59abd2df8b6688973b509872e9cca867d16d6b0c201e06f4e8026dcde7c1eb1632f SHA512 86a9f0ca54ad8c9f1409957d4bdbe7aec7b1992e4272ab5e9e3734442e4ca7fc599bafc0e1e55d30ef0220dbaaa3d4f38e7fc8e4dbe4972fb392c4b2a86e6181
diff --git a/media-gfx/enblend/enblend-4.2.0_p20240424.ebuild b/media-gfx/enblend/enblend-4.2.0_p20240424.ebuild
index 109b429e2424..07b3b2dc1fd0 100644
--- a/media-gfx/enblend/enblend-4.2.0_p20240424.ebuild
+++ b/media-gfx/enblend/enblend-4.2.0_p20240424.ebuild
@@ -14,9 +14,7 @@ S=${WORKDIR}/enblend
 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 )"
+IUSE="cpu_flags_x86_sse2 doc openmp tcmalloc"
 
 BDEPEND="
 	sys-apps/help2man
@@ -40,7 +38,6 @@ RDEPEND="
 	media-libs/tiff:=
 	media-libs/vigra[openexr]
 	sci-libs/gsl:=
-	debug? ( dev-libs/dmalloc[threads] )
 	tcmalloc? ( dev-util/google-perftools )
 "
 DEPEND="${RDEPEND}
@@ -65,7 +62,7 @@ src_prepare() {
 src_configure() {
 	local mycmakeargs=(
 		-DENABLE_SSE2=$(usex cpu_flags_x86_sse2)
-		-DENABLE_DMALLOC=$(usex debug)
+		-DENABLE_DMALLOC=no
 		-DDOC=$(usex doc)
 		-DENABLE_OPENMP=$(usex openmp)
 		-DENABLE_TCMALLOC=$(usex tcmalloc)
diff --git a/media-gfx/flameshot/Manifest b/media-gfx/flameshot/Manifest
index 9b739993aa6f..2f2caebc2296 100644
--- a/media-gfx/flameshot/Manifest
+++ b/media-gfx/flameshot/Manifest
@@ -1,9 +1,3 @@
-DIST flameshot-0.10.2.tar.gz 7726687 BLAKE2B c7c7402d0cb6234473018571e67c39aebec3b4afa398fc2ef590f64527980ca218b1ebd8228ea47a3f9fd76e0edc2f8e1662965f79817bf6461bf0fc64d8b692 SHA512 b0eb1decd87dab1d4a375708448dd4c6f85c101d33814b76edbb328150d0e9ee7a588be698fddcb24e70e39cd4331f9aa2ff082525ff6975d52303a6d9c1ab12
-DIST flameshot-11.0.0.tar.gz 12662479 BLAKE2B 1adef0196a449c33ea57ecd214ad890f44a8530c9c1116d5bdc29074835c040c8fbbec207501e597fb09887ab1e80e937e8412acdc7eb38c8619aa993f986018 SHA512 de13f3c5bc18f164c6e37c0b3f42c8693d3ebfaba5f3d54360899df6479390e2a0c38970fa2595c9293304b4e52ca2198477f4f317abcb11df4c30a24ab1909f
-DIST flameshot-12.0.0.tar.gz 15617684 BLAKE2B 0c878c1efae7b1dd7fccc50471bb810bbf6067bcb1fe26b73965d4f5a78e514e33d74f4a0c28e68ff4e15875ec5d6f9eccfc91ee1635b6e0d31bb50133182277 SHA512 8a7d0878ff57f9c3fcb12791c33f2c11de08b057a68bb50684dd9195fbba8557e71236bc4f8a5f50062af021ed970d5b4362fc2bfdc90415143d7597c3df50f0
 DIST flameshot-12.1.0.tar.gz 15618560 BLAKE2B 975019d71a31f32785f081a05d224f72927628a1142697ba7ef9646f65d2cf1dcb5457633522143201716fe20a320224c95047904408dc411975c3e711e48002 SHA512 159bf3a8ff406b3881dcc77fc48d9e7cc0d595bd47ee2363396d7efc95f69160cf25ccf99cd1b2c2b527baeadf91c209784a7bca23ed5f17caacc385e161c83c
-EBUILD flameshot-0.10.2.ebuild 938 BLAKE2B 505886905aaff0562c06b3dc13e8b79394af3691f8d44931671089dda29de09962cba1a630c0e7275c7117143e63b566afbd1d19e8231c9d9da48f5334bc4b01 SHA512 6069cd9fd339931aa00d9f06125a8708605b978001fff5eb1f71994c54a680eac1231f320c06de92f1e96cc447578d4023aab45ae33c9d8920bff4488e464c68
-EBUILD flameshot-11.0.0.ebuild 870 BLAKE2B c5e5fea8d2b32a01d098223db0c6a5d58624ac500bf2be34382a3740c9449212f355b1498345d4884a9bfb1d2a9837eb91751d931fdc41fc0f9ec5f2a4e33da5 SHA512 d9049678692def8377946b10929bbf244dc0b292720f8916e800ba968d90e19ed3cf76e9fb593544a30dbef06d6c146b285d4f2c003be50e69dd981e3fcdbc9b
-EBUILD flameshot-12.0.0-r2.ebuild 969 BLAKE2B 490a48897bf56801194cb1afc94bbd52bb72644a72c0b5739133c73818cb02adb69db171494f6d5f64dce71107bdad75280fbd5bca20f19903725cd70ca11528 SHA512 d7dd73b964ae828839d5a42e5083b47d96103cedc2fa13041663a3269bd81c759d64454eb73f9fcb52c10cde795eb81e7ce300865042b27504a097969c590fbc
 EBUILD flameshot-12.1.0-r2.ebuild 1189 BLAKE2B 2afbe2cf52c5faaadc468281d108c1ec0b373a32253f2a12f6bfafcd2f1e8e99bab1e57fd15886ac80849e71f9a0c381d53a8a0dc330d5f0a65a564fa4ba0d53 SHA512 b947004d23bb33d9d3cdc09c9027ae44e7f64023448783ad8c4e0b53f88cc5c37f4489bf461a20b63c1c7d8482fb8339c3a0619df4b5982e61ba1b9dbe916765
 MISC metadata.xml 843 BLAKE2B 13d22e8a896623ab7dab785fc73e9871814590bd43e601005d691b7ba7fa7c0690b929857c9b03e801e07691c9989403237ef0c623f178bdb1370d6ea6774bd1 SHA512 b94fec86fab6b8801b36f9a086a5cf2d62c48fd1ca6e41c60f6317acbb9d58382936222a873caad4e3efc1717974830a44bd95c4881194370c9a5826d7c0a620
diff --git a/media-gfx/flameshot/flameshot-0.10.2.ebuild b/media-gfx/flameshot/flameshot-0.10.2.ebuild
deleted file mode 100644
index 9edb962ea42d..000000000000
--- a/media-gfx/flameshot/flameshot-0.10.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake xdg
-
-DESCRIPTION="Powerful yet simple to use screenshot software"
-HOMEPAGE="https://flameshot.org https://github.com/flameshot-org/flameshot"
-SRC_URI="https://github.com/flameshot-org/flameshot/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 Free-Art-1.3 GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	=dev-qt/qtsingleapplication-2.6*[qt5(+),X]
-	dev-qt/qtwidgets:5
-	dev-qt/qtsvg:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtdbus:5
-	sys-apps/dbus
-	dev-libs/spdlog:=
-"
-BDEPEND="
-	dev-qt/linguist-tools:5
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	rm -r external/spdlog || die
-	rm -r external/singleapplication || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_EXTERNAL_SPDLOG=1
-		-DUSE_EXTERNAL_SINGLEAPPLICATION=1
-		-DENABLE_CACHE=0
-	)
-
-	cmake_src_configure
-}
diff --git a/media-gfx/flameshot/flameshot-11.0.0.ebuild b/media-gfx/flameshot/flameshot-11.0.0.ebuild
deleted file mode 100644
index cccbfdf33cd5..000000000000
--- a/media-gfx/flameshot/flameshot-11.0.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake xdg
-
-DESCRIPTION="Powerful yet simple to use screenshot software"
-HOMEPAGE="https://flameshot.org https://github.com/flameshot-org/flameshot"
-SRC_URI="https://github.com/flameshot-org/flameshot/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 Free-Art-1.3 GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	=dev-qt/qtsingleapplication-2.6*[qt5(+),X]
-	dev-qt/qtwidgets:5
-	dev-qt/qtsvg:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtdbus:5
-	sys-apps/dbus
-"
-BDEPEND="
-	dev-qt/linguist-tools:5
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	rm -r external/singleapplication || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_EXTERNAL_SINGLEAPPLICATION=1
-		-DENABLE_CACHE=0
-	)
-
-	cmake_src_configure
-}
diff --git a/media-gfx/flameshot/flameshot-12.0.0-r2.ebuild b/media-gfx/flameshot/flameshot-12.0.0-r2.ebuild
deleted file mode 100644
index 708edafe52aa..000000000000
--- a/media-gfx/flameshot/flameshot-12.0.0-r2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake xdg
-
-DESCRIPTION="Powerful yet simple to use screenshot software"
-HOMEPAGE="https://flameshot.org https://github.com/flameshot-org/flameshot"
-SRC_URI="https://github.com/flameshot-org/flameshot/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 Free-Art-1.3 GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="wayland"
-
-DEPEND="
-	=dev-qt/qtsingleapplication-2.6*[qt5(+),X]
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	sys-apps/dbus
-	wayland? ( kde-frameworks/kguiaddons:5 )
-"
-BDEPEND="
-	dev-qt/linguist-tools:5
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	rm -r external/singleapplication || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_EXTERNAL_SINGLEAPPLICATION=1
-		-DENABLE_CACHE=0
-		-DUSE_WAYLAND_CLIPBOARD=$(usex wayland)
-	)
-
-	cmake_src_configure
-}
diff --git a/media-gfx/mandelbulber/Manifest b/media-gfx/mandelbulber/Manifest
index af442ef23165..c82775ce786f 100644
--- a/media-gfx/mandelbulber/Manifest
+++ b/media-gfx/mandelbulber/Manifest
@@ -1,3 +1,3 @@
-DIST mandelbulber2-2.31.tar.gz 133379945 BLAKE2B c7b4cfa151f3bf0161b5871d0b22cd05567edc5a7145d64f38c4059b1f4b6f19f1ac3285d7a60cfb2979cd98f10041b7c7dd9100dab9ec93258e567034a03d63 SHA512 cf70c73f80c89731da6711af6ad6e1be33d43d7b014e16a6516eabf22d39b49469ee3e7b4ecc5e5adad3a1b26c8c1892c1a82d5891fe2b71fe524cdd1c3460c7
-EBUILD mandelbulber-2.31.ebuild 1868 BLAKE2B 941e1c9659c9790cbba07264d52c887a90e1ec9ee3f5bf02ed52d1398a0b9e9508ea8a3daf6aa65a9ca59a805eb18b814ca285118a609624086a5229141a5151 SHA512 c0d651bacb929937bab45e7700f8d697d97e8f4bc8370ab0bb800a8360d3bced36cc040cf582312efab36284cbcca4ac16659b8ebab47e6da581857a2ceda713
+DIST mandelbulber2-2.32.tar.gz 134765742 BLAKE2B a43ab2e445a65901190c42d6afb947e94d322ddb41f179a9a4763feee8ae5b8e510c2ab6f842b7f17b5b800184a73088b2a3ee4b8d359ffa5e15159eb7f957ad SHA512 f42cebd4939a7d1216c1c09f669bf3bf244e249a8428c02919a735959a5dd91c8614313d21b25cb6f26acd5f7d711287e3c10239c143f542887706f4f970fff4
+EBUILD mandelbulber-2.32.ebuild 1836 BLAKE2B 0f1b10b8948dd3de901810cc1635f6352fe4a932009cd834a1812c1d33772988f60772b403372d6cd9f75e27010d943eaca13e3bb428dda82b18015f04adc182 SHA512 706d1ef002d5268897e9b32df73582eb25d085d85cdb1e4414b30505665f43fcf2c6282cb2aa4b5b680184d59584bdcf4f1795d5155c87ad7b553a8dfa8772a7
 MISC metadata.xml 672 BLAKE2B 8b7d423df1cd3f405b43bbeea9f6de9438951cf55b2020016b3174376e5498f2bc903295afde6626bf342b77050210eec78db8672cf2555f344f12248f1e58be SHA512 4005cd3324e642b6ea382e992949c1a3f459cef6f6094eb896e58fbc5651cd1d88c6575ef76896673bd0589e46285d3df9858a110f9b4b4c867c797a329dee77
diff --git a/media-gfx/mandelbulber/mandelbulber-2.31.ebuild b/media-gfx/mandelbulber/mandelbulber-2.32.ebuild
index 97b894bb80c0..328c2a2bef17 100644
--- a/media-gfx/mandelbulber/mandelbulber-2.31.ebuild
+++ b/media-gfx/mandelbulber/mandelbulber-2.32.ebuild
@@ -8,26 +8,23 @@ 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"
+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"
+IUSE="opencl openexr sndfile tiff"
 
+# IUSE="joystick"
+# 	joystick? ( dev-qt/qtgamepad:6 )
 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
+	dev-qt/qtbase:6[concurrent,gui,network,widgets]
+	dev-qt/qtmultimedia:6[qml]
 	media-libs/libpng:=
 	sci-libs/gsl:=
-	joystick? ( dev-qt/qtgamepad:5 )
 	opencl? (
 		dev-cpp/clhpp
 		virtual/opencl
@@ -40,7 +37,7 @@ RDEPEND="
 	tiff? ( media-libs/tiff:= )
 "
 DEPEND="${RDEPEND}
-	dev-qt/designer:5
+	dev-qt/qttools:6[designer]
 "
 BDEPEND="virtual/pkgconfig"
 
@@ -55,7 +52,7 @@ pkg_setup() {
 src_prepare() {
 	default
 
-	use joystick || sed -i -e "s/qtHaveModule(gamepad)/false/" makefiles/common.pri || die
+	sed -i -e "s/qtHaveModule(gamepad)/false/" makefiles/common.pri || die # TODO: dev-qt/qtgamepad:6
 	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
@@ -63,9 +60,9 @@ src_prepare() {
 
 src_configure() {
 	if use opencl; then
-		eqmake5 makefiles/${PN}-opencl.pro
+		eqmake6 makefiles/${PN}-opencl.pro
 	else
-		eqmake5 makefiles/${PN}.pro
+		eqmake6 makefiles/${PN}.pro
 	fi
 }
 
diff --git a/media-gfx/nomacs/Manifest b/media-gfx/nomacs/Manifest
index a0b7360cf4f0..0f63b018459f 100644
--- a/media-gfx/nomacs/Manifest
+++ b/media-gfx/nomacs/Manifest
@@ -8,5 +8,5 @@ DIST nomacs-3.19.1.tar.gz 1928697 BLAKE2B ee8a10ebd777a589df179b51591893fe083505
 DIST nomacs-plugins-3.16.tar.gz 561522 BLAKE2B 2bda4f36d56709653f6696af3404e416fd2d9fe7fa11de9636643c728028018ac769df3e2e519799322c5c42006cdc114d0e6406f9f60294234b07d9fd8d8409 SHA512 cd72f6ddbe3e07d7ed97f08405bac7574f4f3285c81e835f5630e011c8a9b105f23d892fed8084cb35ce521aca5524db071d0edb8bb04850dd2209d9ed019747
 DIST nomacs-plugins-3.19.0.tar.gz 559925 BLAKE2B 4e3d8e07974d418510d2e806980bc9793567813b9418c0754dcaaa9e6f43e88d76e35264f05e05b2e21345467c8038db3c37ce3d1b003adcd3b019796a737080 SHA512 36b96b0270cb7cc34ee3f9f948eb1f2e5b4facd1f6eb273afe1fbf865c7712fb6487ef59f3d4e7723b9bca7930255f4247a8381c05ee8cfb9acf2b5cc225303c
 EBUILD nomacs-3.16.224-r6.ebuild 1989 BLAKE2B 00d46fb6e2501fd71f69b256490c5899753498a6a144b8976f91edd1a660aa6c0daaac79d27f36bcc5af961abce8bf39c1a37625c1fde17af0ab130b29712edb SHA512 5a34f23eeb69b567f6e8aca96479599bdbfd0f9d683af1d08f6b1b41de62fe2bee259a8f07241740c43c1cc5ad1962d182aff03915c91612d14ad4408df80ec9
-EBUILD nomacs-3.19.1.ebuild 1685 BLAKE2B 18afd865899fd8c4fd44568845801bc41a063f8037af8a6b0fa775810c8effa5b6f26d66d3b34173525198f751557a64a897e591eb110a6b384ee1193383b1a9 SHA512 e26c13d5e00b317c2a13a49ef598ac85ba4a6e542b8cdd5857bb7220514949a95c6390f1417a81d2a8efbd7a8669e1706e9a7be62295ed4d1e4dfb2c37f8e58d
+EBUILD nomacs-3.19.1-r1.ebuild 1700 BLAKE2B 16f9b8ed491594f72782cd1c988f9d103f6baa94919f586c6c315c1358f7d6b92ce5326487a1e15be5f025442af6eddc96698484cb37abad617f143d6c73ad17 SHA512 5791ad99cf402dffe908d11f70500ca93e2f5b4f9105c0b13449812617ba85aecc5a95675ac352d29ca5c8f630d07c99011768dce330e0b3eed9c9b8fa3efa5f
 MISC metadata.xml 513 BLAKE2B 89bb56aaec4fc3411a5460f33d5915b4c1910c1385d5c6370d47af01a89bdeb3342a9ce206f531c5dc47e1c93930a0aa3f19e721a555ecdaa7c853ecb9504028 SHA512 f451fc573bcf1e4e9e413d5346eb5bb0d3c2b728dfe3eb3c88ad6097402a1038d625361656169f445797c793ea9323de9b4b95856533355721576394f703f7ea
diff --git a/media-gfx/nomacs/nomacs-3.19.1.ebuild b/media-gfx/nomacs/nomacs-3.19.1-r1.ebuild
index 4b9b1ed6c616..7b47804f0c79 100644
--- a/media-gfx/nomacs/nomacs-3.19.1.ebuild
+++ b/media-gfx/nomacs/nomacs-3.19.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,16 +15,16 @@ CMAKE_USE_DIR="${S}/ImageLounge"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm64 ~riscv x86 ~amd64-linux"
 IUSE="+opencv plugins raw +tiff test zip"
-RESTRICT="!test? ( test )"
-
 REQUIRED_USE="
 	raw? ( opencv )
 	tiff? ( opencv )
 "
+RESTRICT="!test? ( test )"
 
 RDEPEND="
+	dev-qt/qt5compat:6
 	dev-qt/qtbase:6[concurrent,cups,gui,network,widgets]
 	dev-qt/qtsvg:6
 	media-gfx/exiv2:=
@@ -36,8 +36,7 @@ RDEPEND="
 	)
 	zip? ( dev-libs/quazip:0=[qt6(+)] )
 "
-DEPEND="
-	${RDEPEND}
+DEPEND="${RDEPEND}
 	test? ( dev-cpp/gtest )
 "
 BDEPEND="
diff --git a/media-gfx/renderdoc/Manifest b/media-gfx/renderdoc/Manifest
index acc837ab510a..c66f143fbd2c 100644
--- a/media-gfx/renderdoc/Manifest
+++ b/media-gfx/renderdoc/Manifest
@@ -4,14 +4,8 @@ AUX renderdoc-1.18-system-flags.patch 845 BLAKE2B 0d4aae31af353b2d199ae66ec999be
 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 renderdoc-1.32.tar.gz 51324019 BLAKE2B 5f138bd1fa5dbf3689def983b996385b8670ad83c9da82b7978fc25c94687aac9f6f2f35b93e6af9c994064698b6931eb7b544f43d8f00ef0fc6836695ef1447 SHA512 2b8efde5d4684b4b66fb4c12bbc0cd15c04dc8df98fb9a93b78e1a36ef17b652b3b50043cb8400bbe6859a4e34c3ab8ba01b1a44ea379569ad7f265399d8afe4
 DIST renderdoc-1.32.tar.gz.asc 833 BLAKE2B f9769e654b03f73073e7a7c99a2148194879fab4a687ae44ed9096af881574b8ea945a8af02a4df019cb44808a1c65714146623aae8f879b396a8e4836bf09a8 SHA512 8c60ec37077fa6ef777585f4b55c15fe51c30ed6f6a852605e53abf982d6111210dccf031a4afba737bd7ce76004a44b7f52c6ed607e7525fe13ab7c03baae30
 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
 EBUILD renderdoc-1.32.ebuild 5069 BLAKE2B 521920beb5dd50ee7a8443bd3e955adaf8c8483dbe8a7c9e6318d5989cba5123e694fa4f4b5b6b686b0588cb2ffa9e8e9bb635870ee2be52e094112db4381b4c SHA512 778e590fda5e564a4ab03640fe78bcc0644a539f652ab4463f80d1f4676164b185d8ba1eee9cc7f831eb39d7c4eafc7176568e25174bbeb67474d2df29cb6ef6
 MISC metadata.xml 350 BLAKE2B 3f4889e1015daa270d9429d31a152ff03ec814a1c76e7ecf4c11f15aed9e29f50c02b0a4beef722bcb0f1b349e4f5723245f6bd2d26b86095da916de90a4eee0 SHA512 1af993015e1f5e7d030fc03bbe10ec2ee777c7064daa7f1e562834c3024b6700d7207f8202fc8382e785ef3a5c992b559a0804b365d46e967583cac698850e7d
diff --git a/media-gfx/renderdoc/renderdoc-1.30-r2.ebuild b/media-gfx/renderdoc/renderdoc-1.30-r2.ebuild
deleted file mode 100644
index 474d3abb42fe..000000000000
--- a/media-gfx/renderdoc/renderdoc-1.30-r2.ebuild
+++ /dev/null
@@ -1,188 +0,0 @@
-# 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
-)
-
-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/renderdoc/renderdoc-1.31.ebuild b/media-gfx/renderdoc/renderdoc-1.31.ebuild
deleted file mode 100644
index c8d27b42b52d..000000000000
--- a/media-gfx/renderdoc/renderdoc-1.31.ebuild
+++ /dev/null
@@ -1,191 +0,0 @@
-# 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/ttfautohint/Manifest b/media-gfx/ttfautohint/Manifest
index a32a031794e5..ee8a84ff1686 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
+EBUILD ttfautohint-1.8.4-r3.ebuild 1225 BLAKE2B 89ee2b00edee7f3bdede5fb51fdf197a6aa3366ebd1489802a619c9d56a952e4da203c00efd21b4b708522c5eeec7aa6e5d80d62cb357b8e82b71f2d846a96a4 SHA512 36c5a3efeed4e2ae90d19949ad7d3cbc4e8be1bbcb313c4e85ff59e6f0fc702323ea05528c90b95008ef8dc346f3fffa6b8fe2ebc63502f4810fba68df0c7ab9
 MISC metadata.xml 240 BLAKE2B 7383955337dcafd7da9cfd7fd9597e8543c054a4484e2761c141ed1ac472bee67609505972c5251da2fdfcb085877815add73e5995ae318efdca783c7bd9ca21 SHA512 82a8f1a45f126c30c170d574af01f547d575fa1888574b87556b8ad11910cf4c9e84d1acfeb694413aa1d17badf2bfdf574d6f47a0e8a616bd015e44e0736343
diff --git a/media-gfx/ttfautohint/ttfautohint-1.8.4-r3.ebuild b/media-gfx/ttfautohint/ttfautohint-1.8.4-r3.ebuild
index 899fa682a711..7fa443841d05 100644
--- a/media-gfx/ttfautohint/ttfautohint-1.8.4-r3.ebuild
+++ b/media-gfx/ttfautohint/ttfautohint-1.8.4-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,12 +12,12 @@ SRC_URI="https://download.savannah.gnu.org/releases/freetype/${P}.tar.gz"
 LICENSE="|| ( FTL GPL-2+ )"
 SLOT="0/1.0.3"
 KEYWORDS="amd64"
-IUSE="qt5"
+IUSE="gui"
 
 RDEPEND="
 	media-libs/freetype
 	media-libs/harfbuzz:=[truetype]
-	qt5? (
+	gui? (
 		dev-qt/qtcore:5
 		dev-qt/qtgui:5
 		dev-qt/qtwidgets:5
@@ -46,9 +46,8 @@ src_prepare() {
 
 src_configure() {
 	local myeconfargs=(
-		--disable-static
 		--without-doc
-		--with-qt="$(usex qt5 $(qt5_get_bindir) no)"
+		--with-qt="$(usex gui $(qt5_get_bindir) no)"
 	)
 
 	econf "${myeconfargs[@]}"
@@ -58,7 +57,7 @@ src_install() {
 	default
 
 	doman frontend/ttfautohint.1
-	use qt5 && doman frontend/ttfautohintGUI.1
+	use gui && doman frontend/ttfautohintGUI.1
 
 	find "${ED}" -name '*.la' -delete || die
 }