14 files changed, 342 insertions, 169 deletions
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 35edaf0d0b67..6b46ceb2a944 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/fotema/Manifest b/media-gfx/fotema/Manifest
index c8ec72492c0c..516920dd1cf5 100644
--- a/media-gfx/fotema/Manifest
+++ b/media-gfx/fotema/Manifest
@@ -1,7 +1,3 @@
-DIST fotema-1.14.0.tar.xz 78584796 BLAKE2B c7a53e07fd8ccbd6ba48d595fd280e428ce334908c7b00a4fb5021d92b69c17836ede51656d4a5ab2473fc8220a4b3cbfe25cbdf6da58bc4b7ba7bfbe6ed35dd SHA512 44ff2dd4d3d8268a3f9795f3c37651173a077a7ff831def8e968f658a75786755f7129bed565da674306194084519240b1aa4d378431c36689578f175a054df1
-DIST fotema-1.14.1.tar.xz 78613740 BLAKE2B d945e6be4ef8db99e3c380a75dd6328bcd3a94f885f75bd11db4f164a11f0d541c07d198087aed80a8df637945ca9abc9a98d4c240b0faafe4726d7a82eaef3a SHA512 f80650ccc7401b743e9f6f1b6623f99e5c78df8da44b1608ef1ebfaaf7028858d78a6ca574a712ff2ec1760d4fe0535a365925068be88858eb230ea820803eb2
 DIST fotema-1.14.2.tar.xz 78468972 BLAKE2B 59974a873381dd40cf80f274bb2fcd3763fbf946f168491e25f76f56c1646754b7cf49dd174a25726133fd774d04a9cee370c81d3c01f9d276e588d42b232f82 SHA512 27d96b0a47e312b2a7674f140646f24785dbfae47ea1bde74630fbb979946f23b1e1f5fab5ba20edb38ef91790003e138dcf4043ff371e3bf458c691dfd2db56
-EBUILD fotema-1.14.0.ebuild 1520 BLAKE2B 70ec8ef25ae8ac0ab77537f1fcd7d01a6921da7d9d9b24ae7bfea2c6360575f94a22bbde8e7903621fe9d2797c88ad9b73c33f5dab935bb1e828ff68e65c69ea SHA512 30081de6889d689e35bd5ff544046ac7ade1fb8ff721c1a11a24d807874b32da19adcdfdb2447eb1ebaa01d7bd99aafb1d846807452f0acd71fb6d9f0bbb239e
-EBUILD fotema-1.14.1.ebuild 1520 BLAKE2B 70ec8ef25ae8ac0ab77537f1fcd7d01a6921da7d9d9b24ae7bfea2c6360575f94a22bbde8e7903621fe9d2797c88ad9b73c33f5dab935bb1e828ff68e65c69ea SHA512 30081de6889d689e35bd5ff544046ac7ade1fb8ff721c1a11a24d807874b32da19adcdfdb2447eb1ebaa01d7bd99aafb1d846807452f0acd71fb6d9f0bbb239e
-EBUILD fotema-1.14.2.ebuild 1520 BLAKE2B 70ec8ef25ae8ac0ab77537f1fcd7d01a6921da7d9d9b24ae7bfea2c6360575f94a22bbde8e7903621fe9d2797c88ad9b73c33f5dab935bb1e828ff68e65c69ea SHA512 30081de6889d689e35bd5ff544046ac7ade1fb8ff721c1a11a24d807874b32da19adcdfdb2447eb1ebaa01d7bd99aafb1d846807452f0acd71fb6d9f0bbb239e
+EBUILD fotema-1.14.2-r1.ebuild 1688 BLAKE2B 765c563f6e95998ef1f2557ae3044f01e12f1cf896cda117ab0c4cdfa9a1eabb8ee0f43c4e94aa4e52dd296922a6e3ca64e11c0fa1bb8062256ec0843eaee83e SHA512 ead13df6fcf02f163f97a8b13797208b048c5461bd9dd7183368da836ebb60c6ccf39f0cfdc334fc4ecfcbbabade7a4b10e512e89912e1047a7ddc05cf0edfbf
 MISC metadata.xml 326 BLAKE2B 4ae1a2fadba80e1886d73fb01d493fbbaabae2b97dbffaa10d46e0dbec690e3cb6f8e604675aeb9d0167e50d53cb3f1ffcc2d2ec6c6aed14c36acfe8d6bc31bb SHA512 1f8f3199af710dd344962c425a5af0936be2f52cb41123bee1aba249c356c5c0cb74f3ac6ff7f0fdf71a7e6f8552269abb20cda7d6685e3f21fd5e95436bf552
diff --git a/media-gfx/fotema/fotema-1.14.1.ebuild b/media-gfx/fotema/fotema-1.14.1.ebuild
deleted file mode 100644
index d4bc59161fe6..000000000000
--- a/media-gfx/fotema/fotema-1.14.1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# 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_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.0.ebuild b/media-gfx/fotema/fotema-1.14.2-r1.ebuild
index d4bc59161fe6..34219ad68ea2 100644
--- a/media-gfx/fotema/fotema-1.14.0.ebuild
+++ b/media-gfx/fotema/fotema-1.14.2-r1.ebuild
@@ -51,6 +51,14 @@ 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
 
diff --git a/media-gfx/fotema/fotema-1.14.2.ebuild b/media-gfx/fotema/fotema-1.14.2.ebuild
deleted file mode 100644
index d4bc59161fe6..000000000000
--- a/media-gfx/fotema/fotema-1.14.2.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# 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_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/geeqie/Manifest b/media-gfx/geeqie/Manifest
index 2a85538d271a..6cf49749027e 100644
--- a/media-gfx/geeqie/Manifest
+++ b/media-gfx/geeqie/Manifest
@@ -1,6 +1,10 @@
 AUX geeqie-2.3-test-ancillary.patch 630 BLAKE2B a997e60c3fd6fe78b72019babbf2ad7d9f4fccea275cc95903925ed7ed1e0486da2d82e76e0afd43f82932c123ee03891878bf68d0ef5d714528806f206db45a SHA512 69aa64bf6945f6cd11b6ccd93052c5589f332f55d3e022e5b23b0e5eee0fada4764c54b7dffa75b8e5432f5c7d4c27384992cdd61a18c779feede4827f2be5ff
+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
+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.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.5.ebuild b/media-gfx/geeqie/geeqie-2.5.ebuild
new file mode 100644
index 000000000000..8b572c0532f3
--- /dev/null
+++ b/media-gfx/geeqie/geeqie-2.5.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+LUA_COMPAT=( lua5-{3,4} )
+
+inherit lua-single meson optfeature xdg
+
+DESCRIPTION="A lightweight GTK image viewer forked from GQview"
+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:
+# 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.5-test-ancillary.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() {
+	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/gimp/Manifest b/media-gfx/gimp/Manifest
index 891eadbc92c1..b7e96fb30cb7 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -11,7 +11,7 @@ DIST gimp-2.99.18.tar.xz 25418968 BLAKE2B ccb76bb5c375925d4d71505f3e1546f05ba0e2
 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 6109 BLAKE2B ced90bb4c5a7218e714b427bab08d7c0546ef870cd62b73245aab21eed41f92e08536af608735fd6a591c916f7c46940a2f67cb2064991dc3c3b54e9ce2afcaa SHA512 35e1cc42a8da3cdff3dbde15311203df89ca41d9d2d32271fcddd65825c41891e91c94e5b47d9abf273c41cd4973f5e2ba2303da046973b1edca97059b8e3ecb
+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.38.ebuild b/media-gfx/gimp/gimp-2.10.38.ebuild
index 077e5d533e45..013da52ecc68 100644
--- a/media-gfx/gimp/gimp-2.10.38.ebuild
+++ b/media-gfx/gimp/gimp-2.10.38.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 ~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/krita/Manifest b/media-gfx/krita/Manifest
index 15545bbd4470..7b48f3b3de68 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -9,6 +9,8 @@ AUX krita-5.2.3-znver4-xsimd.patch 1650 BLAKE2B a534c96c1fdbaf3aeb59499c88079d70
 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.5.tar.xz 186553868 BLAKE2B 94739da1a91473b17e353f8ff7cd4927d803624d0f77712fbcc520b54faaded02d07d3462b7aa5111e47d15819d3cc98da8c07be05121c88a9317856901ef585 SHA512 08eca1c87265cde2a5636f72ec4f997af17084fcb29a80a573da2a0392a19299613318f4f6689b57d36c79c347f25147eac0bb560e8740b476ed759d7bb53ee7
 EBUILD krita-5.1.5.ebuild 3781 BLAKE2B ca13633df6861d9159cae079b667123280d3b4ed73e707e648b710782219999f67e8f7f806471f8eddb8c95c2e3f0a797434157a4fcc5db3cfb2a5430698ba05 SHA512 b12e60d70eb03c76c6a5dbb3df451d6666f37d07060fe90601b8c569d130ac1bb7d71ef95a6d87faa58a627b5a3823dd468eee8d0be7b370960e81957aec3316
 EBUILD krita-5.2.3.ebuild 3789 BLAKE2B 6b55cc22a1dfd1766561b37c9b812907e36354021099e1613bc5a0182f19d4653c3db574311fd65cd7d7fbab689d3a80f02b638ee188383b7fb56d381c32c78d SHA512 5e03c9129ddde0c1c595beb8af2772f1056c52f9a55c3e66257b2d94f5c88fa00e8e62f85651426a96a7adce4c3e8931c3a81b6dceda66e3c3c18fd607810af9
+EBUILD krita-5.2.5.ebuild 3738 BLAKE2B e09b053369e25ca24d7814917e5b88b37b56796559435c8a9750bfbc4da6a91745f9e9fe22385679456986f4c13929abfab4c6436c816e5ba359e282ccf1a44e SHA512 404b398e3d6436163d73e39538150aba4c201b9271a92b01ee887d03f865768d6616d67aadfe209acbf492222d8d1b45f378945104d3da89dec9cd8347cf800d
 MISC metadata.xml 832 BLAKE2B 53e632c3407b42c5d0f165bdcf67dfdd3a30bf1ec3c19ea79b90323ccbe5415e7cd34fbc79ebbb0e513359f28f381e3dac5d2534daf9ae7696f83ea77acb8130 SHA512 6cb02292d63602c80451759f6b935f65c9dfc2f01b32ac540d8cd4422ab2a70e04261fabc67b570c60e116f03e34d0165c8db6dcf9595db6cfa10849d8066336
diff --git a/media-gfx/krita/krita-5.2.5.ebuild b/media-gfx/krita/krita-5.2.5.ebuild
new file mode 100644
index 000000000000..0a1c86338154
--- /dev/null
+++ b/media-gfx/krita/krita-5.2.5.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/plantuml/Manifest b/media-gfx/plantuml/Manifest
index b917a99b6fe7..a2151a741008 100644
--- a/media-gfx/plantuml/Manifest
+++ b/media-gfx/plantuml/Manifest
@@ -1,5 +1,7 @@
 DIST plantuml-1.2024.5.tar.gz 12119170 BLAKE2B 97fd8f48aa04d9d8b089547871abd954b8b1c189d32b844f1de4ac33678dabe2968a3307fb573f571adf541dbbbfd5eb5c21839b14f3cb9ed2e86ac7b447bb87 SHA512 20b9502a3d6ac9ceccb667943f8ea70990102f778175001852b1fcd2b9b7fa570f5b7a7fb237b6831c0411667c3e986f2b0ea09ce2602b5c1ca98694b37c20a5
 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.5-r1.ebuild 1379 BLAKE2B d9828453b19199934914faa621789747aea212803c63c48500bc283907359c6c04671ff62c00c0ef17e7accd9e2c948bb354c54d796bb77439a5339bef31c0fe SHA512 6ae5acbbb52f987d5d270c90a8940cad08430f7fd02d61d38cf9850ddd3807f664f78a265a8d2ea2bda054fb728ce603e164a4ecf17eaaae53b39b1b649a04b7
 EBUILD plantuml-1.2024.6.ebuild 1380 BLAKE2B cbfc68c40d4cb2f2db79154facbcd198c44ce49920ba9298eab723b951e89aba7d2a947eff781dc2a258a586db833ca534459b9b8723cc194430a3cdac88a9bd SHA512 32c34377f41bd1deedb2e1b81aec248dc2fc1f7aaa779664094f90abc4f258ec708635eadbac2206a4160ae28d6078b71a5f224dd745a4717d61d40b042e9cb0
+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/plantuml-1.2024.7.ebuild b/media-gfx/plantuml/plantuml-1.2024.7.ebuild
new file mode 100644
index 000000000000..eafb36810423
--- /dev/null
+++ b/media-gfx/plantuml/plantuml-1.2024.7.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
+}