gentoo auto-resync : 28:12:2024 - 06:30:54

12 files changed, 4 insertions, 1249 deletions

diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 9869e3776c20..dacc01fa0feb 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/freecad/Manifest b/media-gfx/freecad/Manifest
index 4cacccee8f44..1cf0ae2842bc 100644
--- a/media-gfx/freecad/Manifest
+++ b/media-gfx/freecad/Manifest
@@ -5,6 +5,6 @@ AUX freecad-9999-Gentoo-specific-don-t-check-vcs.patch 322 BLAKE2B 431b69d749c56
 AUX freecad-9999-tests-src-Qt-only-build-test-for-BUILD_GUI-ON.patch 469 BLAKE2B 23e56fbc49b3c3d5ede85e6ec15d26c88c93590fce105e0b75e8b0bd3fee125c500cd59d8db0144c610edb371df318396e056333ec7a411f7647b38d18006efc SHA512 82737af95603ff1f667bf49ee43b85b411eeeb5fd9b577ad7fca6e02bcbfda5c3bbb6c70386e5f69d2181d6226574f82cb68b7e66dfe8f4bb14d946f594582cf
 DIST freecad-1.0.0.tar.gz 91599325 BLAKE2B 65540eb42e7d508456c9edbf2122e0f288708c33e6d00d3c8c45550e7a614f658f91ba25978a66819bc094b7138aab72a89c0172d0841be1ff798ade5a8bdc64 SHA512 afc1079ea04fd5bb8135f8ad1012d9e4e05c8839dd0a4e00253eada58fe018f445c1200d1ca7ac9f268644c946cbf55b7b313dc3d6bd010f9da3a3334103b7db
 EBUILD freecad-1.0.0-r1.ebuild 8790 BLAKE2B c54aefe3eab6b32bb372b0ef40a821e7bb37534fd8b97654d91d2939ea87c5c47242333ffd06532208dea981438ec9795a96c7b63a27162d2601a18a56c0cbf1 SHA512 e7b8918fe4c37a875761da72c49b5235b44ab1e04468a9b929ae1e6cafc3876793d6bf222c80f7e89b750b470ca6e56367293108e5da532be6f22cce77be0a7a
-EBUILD freecad-1.0.0-r2.ebuild 8779 BLAKE2B 5c45f071879b51f5d750737b3882f7ee0744236f2c3c78b8975de0be53ef4a8f990d0f7e80c3c10db0c1ad45d6c9a07b873e92ddc9374a61d345b25c493dc507 SHA512 0d66b4121cd7d9bbc815c88d491646b04ce91e0023a36b90ad3a88ddab09256870dad6bb7a09777610a20d6d85ce4268ff4e9d5bd6bd54be1a958a880a041c16
+EBUILD freecad-1.0.0-r2.ebuild 8778 BLAKE2B 4ebe1a3df409e68328d89dd95120441324a5587a9eb85e110de83c70c161688cc5dfd33eea393ee6b70fb2a561048d78b3b4ac7c0bbd7f060f88edad30fce183 SHA512 d86c72823c9a61fef30fc58e8adf5c8c7ee45d4de0c8c4959c2f785b6d1cd48f1ecee1b6d38f4af34077683e5046292676166df57bc6fe14e76920ec8db76f57
 EBUILD freecad-9999.ebuild 8691 BLAKE2B a29795687e54446fa908ee5273b8723c5a4848ae29edda76d4466a1fc9a2b50503c95beaac6a15a14ee43fd1b28be8e1ba9e0aa5b76532667e3d318e59a1c45f SHA512 fb0232a5992141eac4ef96507af2bb31ff30db2f1ef877ffd11e44598de85ebcd0ca8af629c592d3224d75cc6be5caa4b4cc89281527be4a8f381dcf46b46213
 MISC metadata.xml 2907 BLAKE2B caf71b22b1a242778cd62fef19796e442500ec16850d38e07c1773f773b4d8ca3a063ccb13aa044ae6c4efc3e3c9ee8ba5b03465ccc4b9758c8f08e75675f8e4 SHA512 9d336ec1b1f307ca510b470ba362144ad8ca579de2968483661b7d8868a0dd0f6cd18090dbdf1d0f7c98a746e39f43f2e25422c1dfec4d995c572ac6083272ea
diff --git a/media-gfx/freecad/freecad-1.0.0-r2.ebuild b/media-gfx/freecad/freecad-1.0.0-r2.ebuild
index 99df349496ff..7812856f8a98 100644
--- a/media-gfx/freecad/freecad-1.0.0-r2.ebuild
+++ b/media-gfx/freecad/freecad-1.0.0-r2.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} == *9999* ]]; then
 	S="${WORKDIR}/freecad-${PV}"
 else
 	SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64"
 	S="${WORKDIR}/FreeCAD-${PV}"
 fi
 
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index 32f2fb2801ba..2475eaddce2f 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -1,21 +1,12 @@
 AUX gimp-2.10.36_c99_metadata.patch 1087 BLAKE2B 4f984da3c38b66afdbffab7ed0ee0a7f09475b05dd78f3a8fd8636fb61ecdb697f98b94723c6837e80912ab6d82be468aecb459a817c9393e17d4ac0f89bd010 SHA512 d4294b4320774d3094b0f8e0a5ca0942a0fc2038f466afcd2e341d0efe3653eebc6ddd328c5165c6c0eff4f1a3d47cdca01ea52819f9596ade8878ce2c4d5374
 AUX gimp-2.10.36_c99_tiff.patch 966 BLAKE2B 60abcfa47f10ff3c937475550ef6e5d1c6151347bfc5332268a3f5a3d51e5663a131b44fc9169c6e95036aee785d2edec14718495e1b53c868b17fe58600ade1 SHA512 e3c4c0179528d29a6c082536eab2977b7fa624235978b880d0f8aa36bced2408af8f91931628352b82fd0c198f0935949363d78402879aaf74a19e5eb1e9b8d3
-AUX gimp-2.10.36_fix_strict-aliasing.patch 1077 BLAKE2B 02bfb2b0836a4c8e31caac441c836e652edfce0570648f6db0232e34687621c68fab2b0ecd33b1552c5f9b269beaf41f71b0a6b9a047d148f37eece006ee3fe7 SHA512 e71a70fceb6d7104017306169acf6d5f28061e95498d0b0d21e218b060fd84649b5ac0d3c524f69033cc1d8ea95e7e8e0b91c2367b3b3e8889acd73611f5f3f5
 AUX gimp-2.10_fix_configure_GCC13_implicit_function_declarations.patch 583 BLAKE2B 5c7feb3e666b496ea718d63cd3e8d415604397d0e78c95e4449812b48d7548c3b81d194c955555d7ad516c46012826475191786486140e0516c91bac56df027c SHA512 d90e6bc41bc91114ee8068e2d2cdd8c83e707b30eba876aa7b369c44d0ee125953b387a8f041dd5cb521d0eb16824bb8496a9751595c75c5a76b4cc0b3251cc3
 AUX gimp-2.10_fix_musl_backtrace_backend_switch.patch 535 BLAKE2B 374433568330a4b5167e6f32bd9ecbe44e9ceb4004cce9504586b73dc31c7613d2766ae5615d74b2a51a05ff3592add2e7585b7d63eb43b219ebe6b37193edca SHA512 df0b9b357d085463ac3b791b6131dabfdd33d12e7b77f45f496379d08da1b0e8ae787b9b4b260ec221c22e3302d54b17493175db55514ec3e705782fdb80ec18
 AUX gimp-2.10_fix_test-appdata.patch 902 BLAKE2B 2b1a131d874d65422d8bdd44732b9843d89a570a1ea3c058cdb2a424a7791c686aa0e2ae2a0b472f333f2465f6e1a26750a532e9003933c5dffa1af32343c1dc SHA512 2983e8572f5e8113c9e2f564d31c1a5fe7e11ef273c50d2be739089124c6ec1a457da28222020bbd6015b2cbbcbf403b88d8660b9b35241800deb4fb3ad79067
 AUX gimp-2.10_libheif-1.18_unconditional_compat.patch 820 BLAKE2B 4e75ebc639bc6f985776861de119b85dd7bde2be3a2e385cb6c61bd6e44b29d80c9ff84736a7e518b76f092c72295c1bb7e2ed58eccbd52a54b7bc4c769b12e6 SHA512 4233e2d8c50222b4700e9f7c6b2e5a41e1d5b685899f4cb0db61aa96b9eba4a0538fcc74fe9fe77265932062ea4dc94e13036d381a96338a470bf00b5a53b437
-DIST gimp-2.10.34.tar.bz2 31405329 BLAKE2B 0b2d3a81abf89684bb90e2101896db3479a25c5da76738543dba8d0378e64608eee9aeb24888e15f5e347f72fa1df3e9b82aa27e503ee61d1c4d45d44fa7bddc SHA512 4802ce3758daba868570f1ac97a3f1cb41e1130fcc6376f9bf4c999441f8fd25937aa71b6f726d82d7c780f4153b11d2595bb76bc2356a42266909fbcc0bd34a
-DIST gimp-2.10.36.tar.bz2 31532334 BLAKE2B d033cd1407df3399b5968b7e3f7838d288143080b516476a5dd46599b6a84ac2efca591521368cef7a1c3d9935b45ed3262fb469e1ae36ccf60a1199f5cfa44d SHA512 dbe6152ea6ff99cca59bbf2c88a64fb4ff6b529d98ace7723eadf5dfb0e10d9cbaf2de1e0d5251e9ecf9abca73da9ae1a501f229997802fd4077fb9594f4ba66
 DIST gimp-2.10.38.tar.bz2 31698453 BLAKE2B 58c29e3e00d873e69a5e5f4e9c3ff4d868ccfb11914570306ef12c54ca7d3ef89a62d8c71fac1f2d1f426ac615dc4caf7a7260351c00301dce2b1aa4193bab6d SHA512 343bf1c3bd14bf8e7c7af79c05920faca213da68549127c1d8af53e2e872e55aeaf39a3cfcf578183a34fdc4f98e1c859be63956b0611067186eefd1fdee2aaa
-DIST gimp-2.99.18.tar.xz 25418968 BLAKE2B ccb76bb5c375925d4d71505f3e1546f05ba0e20533859b1b6250a4d9054efb6bec4927a5e0c525272fa24d5a6bdf4fb7881d60a1d34b1210ee38b90e661ef707 SHA512 151ccd0322601e76ed0198b40832ab0b6c138428f2e75806dd558e29c9b3437d9226a243142bf4a86113fa5ea4f5965b99cf7cd0ab0ecb7bdfc48036de35a9c6
 DIST gimp-3.0.0-RC1.tar.xz 28863948 BLAKE2B d9e1ae51809d1c8e5084a9e85b660cd0f3a763f8ee220075fe73f512940e9637d50675a06d0dca88c501571a26404cb6b53c9573348002586143c52736dfa196 SHA512 844896976b66b0498ba9149c7176f5442b2305fd3dc51fce7ff92eb05b7b0f86f16d0bd16e50a3c43ab2c6b9be4e610dbbfc50a99c84a62a4de80a6937d43985
-EBUILD gimp-2.10.34-r3.ebuild 6033 BLAKE2B 1a0c57ea0892099726875dfcdeb8b75d56e6101ccc63cf6006a8d56acc55f9d8bf4edf93f6a4c1e5de3c89b0951fecb2c06cc72ea14fcbf25ccef438df7bb901 SHA512 bdc9794b0d82172436b3b164e27d2de8697f33b9bbb8ae907dc9034bc8c6550075093d515cef82d900302745eaae856d22ead356ff1a55c49f7a2b758c6250c0
-EBUILD gimp-2.10.36-r3.ebuild 6005 BLAKE2B 2df114a4355ef257bd4b88b34b578883b044327c78282aa6239d082f382128cd35adea29af326e2288cd9110100b0e2fccf8c4d3f581e4bb2166dfb4fc188ca6 SHA512 487f909ee8c34a12d662b673b40551b8c80e0a340ce663c8937b216b61c3536ff3b85337b99ca85b33b238c3cece26f875e7195f381941f1f0a472a9c61c32f2
-EBUILD gimp-2.10.36-r4.ebuild 6152 BLAKE2B b0013afb683f05ea7b5dfd1e9ced41bafb6f394a7330b51932dd9021e53bf173ebdc1000062c6d2f8cd256877819805cf70e302b3741f9ec960286ad193c3821 SHA512 ed75fb99737b0e239ba569985cde4981e82a87b6e16286886f50dbe136293a084c872dfef99d086a29df6d940e3154cf9f6d108d60565ae767d3a2ec1e745bff
 EBUILD gimp-2.10.38-r1.ebuild 6261 BLAKE2B 4256b91c88e2d677d894ab6ba90f387713320574cf404e3e794c0ff390e4d4feb16e27534530994f0083a051e5dba5e404b1ac357e78fcdcef3cb624d195890f SHA512 a86bea4cb6d8cabbf981d42a1ca220c0befffb1e0dd8785708087b1e2c62c3bea95386be2abbb22192d65ee90bfec60910f5279f734771742e5b955c4f643655
-EBUILD gimp-2.99.18-r1.ebuild 7253 BLAKE2B 0c95a252589be3d821a73b7651e866207928cee724d16e934f585bd9080869620d1b20546672ddf229ef59bd21f54d5906da19bf2bafab76d479b05b3adfc403 SHA512 042f9a4d904d2be0bedbb6dde123a7d12f8c43b7502990e2a0c6884c287522db8e0bfeebc0fa621a54992739482db4a8b8f3675ba7f5af33999ea4c390f6bf37
-EBUILD gimp-2.99.18-r2.ebuild 7334 BLAKE2B 48ac3cbc7462d69b6bb36611f72d0d1dc26dee5ca4764c8acf1e65c434fc106aa6ea6f05a10e81b62f8608e109cfae52be6d2e84f46e7c9e5e2443db5a92ebbc SHA512 084e3039ff16d1e6eccb02ca01beee6d702dbac2748ba87e9550949766454cf810357c06c978c5fcb35dc10413aa00a5eee69355cc90fe2103749e0f83a37296
 EBUILD gimp-3.0.0_rc1.ebuild 7043 BLAKE2B bec2a409e288e90a58214febedf99b113bfc0c77412a823aef85a683b129ddc11876e8a3457d27380be780dc97ddd193be0b7341ecfce96aafceb77997575b2a SHA512 91396c43aa2beb6304a56cc84f9c088da4416a7b34e1d70b00f8fcb3c25eac22b96bdaac0c1523ae929014a5be17cd221cec5d56bd9dcf43e0f854222e5620a6
 EBUILD gimp-9999.ebuild 7259 BLAKE2B 1ccbd31727bac846d9bef5d3221a859cccc2069e98831bb8aeb03b6f9c52f6d7d13e8ce57db087a6082754acbdf4f3ae25f46d53232bcb7baa5303d8c2b17224 SHA512 149dbbb73e0116fc9694bbb5659033156f585fe9c8208939ab6d391c99332cafb5b2bdb59498df729b9024c05a14b1243aa90a07fb3192131262e7a425c10c7c
 MISC metadata.xml 655 BLAKE2B f6628a2c5edb90b16db0f59af05446a3f31316f5558ece238d30c9350632713cf2db3d315c90b31229596659ec20859c17fde6b051f9ab8f8fe34d64902dad57 SHA512 712a259ae41d9052bde0761087928685b9b66a132db3f3b49121241d87728f51bf31a00541aa385bd03b57a2e2a03a0176356045dd4752485a8dca2bd61c5886
diff --git a/media-gfx/gimp/files/gimp-2.10.36_fix_strict-aliasing.patch b/media-gfx/gimp/files/gimp-2.10.36_fix_strict-aliasing.patch
deleted file mode 100644
index 2acf31361278..000000000000
--- a/media-gfx/gimp/files/gimp-2.10.36_fix_strict-aliasing.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Gentoo issue: https://bugs.gentoo.org/917497
-Upstream issue: https://gitlab.gnome.org/GNOME/gimp/-/issues/10359
-Upstream patch:
-
-From b45a304df4f038eccb64e098f3643ae35d8f3e77 Mon Sep 17 00:00:00 2001
-From: Alx Sa <cmyk.student@gmail.com>
-Date: Sun, 19 Nov 2023 13:54:00 +0000
-Subject: [PATCH] core: Fix strict-aliasing error on ASE load
-
-Resolves #10359
-
-When compiled with -Werror=strict-aliasing, the build fails
-on this line due to converting pointer datatypes.
-This patch switches to using memcpy () instead.
----
- app/core/gimppalette-load.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/app/core/gimppalette-load.c b/app/core/gimppalette-load.c
-index 7605b92fcfb..e9813ebb168 100644
---- a/app/core/gimppalette-load.c
-+++ b/app/core/gimppalette-load.c
-@@ -1095,7 +1095,7 @@ gimp_palette_load_ase (GimpContext   *context,
- 
-           /* Convert 4 bytes to a 32bit float value */
-           tmp = GINT32_FROM_BE (tmp);
--          pixels[j] = *(gfloat *) &tmp;
-+          memcpy (&pixels[j], &tmp, 4);
-         }
- 
-       if (! valid_color)
--- 
-GitLab
-
diff --git a/media-gfx/gimp/gimp-2.10.34-r3.ebuild b/media-gfx/gimp/gimp-2.10.34-r3.ebuild
deleted file mode 100644
index d1af397feaf9..000000000000
--- a/media-gfx/gimp/gimp-2.10.34-r3.ebuild
+++ /dev/null
@@ -1,219 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-GNOME2_EAUTORECONF=yes
-WANT_AUTOMAKE=
-
-inherit autotools gnome2 toolchain-funcs virtualx
-
-DESCRIPTION="GNU Image Manipulation Program"
-HOMEPAGE="https://www.gimp.org/"
-SRC_URI="mirror://gimp/v$(ver_cut 1-2)/${P}.tar.bz2"
-LICENSE="GPL-3+ LGPL-3+"
-SLOT="0/2"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv x86"
-
-IUSE="aalib alsa aqua debug doc gnome heif jpeg2k jpegxl mng openexr postscript udev unwind vector-icons webp wmf xpm cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse"
-
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	>=app-accessibility/at-spi2-core-2.46.0
-	>=app-text/poppler-0.50[cairo]
-	>=app-text/poppler-data-0.4.7
-	>=dev-libs/glib-2.56.2:2
-	>=dev-libs/json-glib-1.2.6
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	>=gnome-base/librsvg-2.40.6:2
-	>=media-gfx/mypaint-brushes-2.0.2:=
-	>=media-libs/babl-0.1.98
-	>=media-libs/fontconfig-2.12.4
-	>=media-libs/freetype-2.1.7
-	>=media-libs/gegl-0.4.40:0.4[cairo]
-	>=media-libs/gexiv2-0.10.6
-	>=media-libs/harfbuzz-0.9.19:=
-	>=media-libs/lcms-2.8:2
-	media-libs/libjpeg-turbo:=
-	>=media-libs/libmypaint-1.6.1:=
-	>=media-libs/libpng-1.6.25:0=
-	>=media-libs/tiff-3.5.7:=
-	net-libs/glib-networking[ssl]
-	sys-libs/zlib
-	>=x11-libs/cairo-1.12.2
-	>=x11-libs/gdk-pixbuf-2.31:2
-	>=x11-libs/gtk+-2.24.32:2
-	x11-libs/libXcursor
-	>=x11-libs/pango-1.29.4
-	aalib? ( media-libs/aalib )
-	alsa? ( >=media-libs/alsa-lib-1.0.0 )
-	aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 )
-	heif? ( >=media-libs/libheif-1.9.1:= )
-	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= )
-	jpegxl? ( >=media-libs/libjxl-0.7.0:= )
-	mng? ( media-libs/libmng:= )
-	openexr? ( >=media-libs/openexr-1.6.1:= )
-	postscript? ( app-text/ghostscript-gpl:= )
-	udev? ( dev-libs/libgudev:= )
-	unwind? ( >=sys-libs/libunwind-1.1.0:= )
-	webp? ( >=media-libs/libwebp-0.6.0:= )
-	wmf? ( >=media-libs/libwmf-0.2.8 )
-	xpm? ( x11-libs/libXpm )
-"
-
-RDEPEND="
-	${COMMON_DEPEND}
-	x11-themes/hicolor-icon-theme
-	gnome? ( gnome-base/gvfs )
-"
-
-DEPEND="
-	${COMMON_DEPEND}
-	>=dev-lang/perl-5.10.0
-	dev-libs/appstream-glib
-	>=dev-build/gtk-doc-am-1
-	dev-util/gtk-update-icon-cache
-	>=dev-util/intltool-0.40.1
-	>=sys-devel/gettext-0.19
-	>=dev-build/libtool-2.2
-	virtual/pkgconfig
-"
-
-DOCS=( "AUTHORS" "ChangeLog" "HACKING" "NEWS" "README" "README.i18n" )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.10_fix_test-appdata.patch" # Bugs 685210 (and duplicate 691070)
-	"${FILESDIR}/${PN}-2.10_fix_musl_backtrace_backend_switch.patch" #900148
-	"${FILESDIR}/${PN}-2.10_fix_configure_GCC13_implicit_function_declarations.patch" #899796
-)
-
-src_prepare() {
-	sed -i -e 's/mypaint-brushes-1.0/mypaint-brushes-2.0/' configure.ac || die #737794
-
-	sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864
-	sed 's/-DGIMP_DISABLE_DEPRECATED/-DGIMP_protect_DISABLE_DEPRECATED/g' -i configure.ac || die #615144
-
-	if use heif ; then
-		has_version -d ">=media-libs/libheif-1.18.0" && eapply "${FILESDIR}/${PN}-2.10_libheif-1.18_unconditional_compat.patch" # 940915
-	fi
-
-	gnome2_src_prepare  # calls eautoreconf
-
-	sed 's/-DGIMP_protect_DISABLE_DEPRECATED/-DGIMP_DISABLE_DEPRECATED/g' -i configure || die #615144
-	grep -F -q GIMP_DISABLE_DEPRECATED configure || die #615144, self-test
-
-	export CC_FOR_BUILD="$(tc-getBUILD_CC)"
-}
-
-_adjust_sandbox() {
-	# Bugs #569738 and #591214
-	local nv
-	for nv in /dev/nvidia-uvm /dev/nvidiactl /dev/nvidia{0..9} ; do
-		# We do not check for existence as they may show up later
-		# https://bugs.gentoo.org/show_bug.cgi?id=569738#c21
-		addwrite "${nv}"
-	done
-
-	addwrite /dev/dri/  # bugs #574038 and #684886
-	addwrite /dev/ati/  # bug #589198
-	addwrite /proc/mtrr  # bug #589198
-}
-
-src_configure() {
-	_adjust_sandbox
-
-	local myconf=(
-		GEGL="${EPREFIX}"/usr/bin/gegl-0.4
-		GDBUS_CODEGEN="${EPREFIX}"/bin/false
-
-		--enable-default-binary
-
-		--disable-check-update
-		--disable-python
-		--enable-mp
-		--with-appdata-test
-		--with-bug-report-url=https://bugs.gentoo.org/
-		--with-xmc
-		--without-libbacktrace
-		--without-webkit
-		--without-xvfb-run
-		$(use_enable cpu_flags_ppc_altivec altivec)
-		$(use_enable cpu_flags_x86_mmx mmx)
-		$(use_enable cpu_flags_x86_sse sse)
-		$(use_enable debug)
-		$(use_enable vector-icons)
-		$(use_with aalib aa)
-		$(use_with alsa)
-		$(use_with !aqua x)
-		$(use_with heif libheif)
-		$(use_with jpeg2k jpeg2000)
-		$(use_with jpegxl)
-		$(use_with mng libmng)
-		$(use_with openexr)
-		$(use_with postscript gs)
-		$(use_with udev gudev)
-		$(use_with unwind libunwind)
-		$(use_with webp)
-		$(use_with wmf)
-		$(use_with xpm libxpm)
-	)
-
-	gnome2_src_configure "${myconf[@]}"
-}
-
-src_compile() {
-	export XDG_DATA_DIRS="${EPREFIX}"/usr/share  # bug 587004
-	gnome2_src_compile
-}
-
-# for https://bugs.gentoo.org/664938
-_rename_plugins() {
-	einfo 'Renaming plug-ins to not collide with pre-2.10.6 file layout (bug #664938)...'
-	local prename=gimp-org-
-	(
-		cd "${ED}"/usr/$(get_libdir)/gimp/2.0/plug-ins || die
-		for plugin_slash in $(ls -d1 */); do
-		    plugin=${plugin_slash%/}
-		    if [[ -f ${plugin}/${plugin} ]]; then
-			# NOTE: Folder and file name need to match for Gimp to load that plug-in
-			#       so "file-svg/file-svg" becomes "${prename}file-svg/${prename}file-svg"
-			mv ${plugin}/{,${prename}}${plugin} || die
-			mv {,${prename}}${plugin} || die
-		    fi
-		done
-	)
-}
-
-src_test() {
-	virtx emake check
-}
-
-src_install() {
-	gnome2_src_install
-
-	# Workaround for bug #321111 to give GIMP the least
-	# precedence on PDF documents by default
-	mv "${ED}"/usr/share/applications/{,zzz-}gimp.desktop || die
-
-	find "${ED}" -name '*.la' -type f -delete || die
-
-	# Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527)
-	local gimp_app_version=$(ver_cut 1-2)
-	mv "${ED}"/usr/share/man/man1/gimp-console{-${gimp_app_version},}.1 || die
-
-	# Remove gimp devel-docs html files if user doesn't need it
-	if ! use doc; then
-		rm -r "${ED}"/usr/share/gtk-doc || die
-	fi
-
-	_rename_plugins || die
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-}
diff --git a/media-gfx/gimp/gimp-2.10.36-r3.ebuild b/media-gfx/gimp/gimp-2.10.36-r3.ebuild
deleted file mode 100644
index e0082d3fdfdb..000000000000
--- a/media-gfx/gimp/gimp-2.10.36-r3.ebuild
+++ /dev/null
@@ -1,218 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-GNOME2_EAUTORECONF=yes
-WANT_AUTOMAKE=
-
-inherit autotools gnome2 toolchain-funcs virtualx
-
-DESCRIPTION="GNU Image Manipulation Program"
-HOMEPAGE="https://www.gimp.org/"
-SRC_URI="mirror://gimp/v$(ver_cut 1-2)/${P}.tar.bz2"
-LICENSE="GPL-3+ LGPL-3+"
-SLOT="0/2"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv x86"
-
-IUSE="aalib alsa aqua debug doc gnome heif jpeg2k jpegxl mng openexr postscript udev unwind vector-icons webp wmf xpm cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse"
-
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	>=app-accessibility/at-spi2-core-2.46.0
-	>=app-text/poppler-0.50[cairo]
-	>=app-text/poppler-data-0.4.7
-	>=dev-libs/glib-2.56.2:2
-	>=dev-libs/json-glib-1.2.6
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	>=gnome-base/librsvg-2.40.6:2
-	>=media-gfx/mypaint-brushes-2.0.2:=
-	>=media-libs/babl-0.1.98
-	>=media-libs/fontconfig-2.12.4
-	>=media-libs/freetype-2.1.7
-	>=media-libs/gegl-0.4.40:0.4[cairo]
-	>=media-libs/gexiv2-0.10.6
-	>=media-libs/harfbuzz-0.9.19:=
-	>=media-libs/lcms-2.8:2
-	media-libs/libjpeg-turbo:=
-	>=media-libs/libmypaint-1.6.1:=
-	>=media-libs/libpng-1.6.25:0=
-	>=media-libs/tiff-3.5.7:=
-	net-libs/glib-networking[ssl]
-	sys-libs/zlib
-	>=x11-libs/cairo-1.12.2
-	>=x11-libs/gdk-pixbuf-2.31:2
-	>=x11-libs/gtk+-2.24.32:2
-	x11-libs/libXcursor
-	>=x11-libs/pango-1.29.4
-	aalib? ( media-libs/aalib )
-	alsa? ( >=media-libs/alsa-lib-1.0.0 )
-	aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 )
-	heif? ( >=media-libs/libheif-1.9.1:= )
-	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= )
-	jpegxl? ( >=media-libs/libjxl-0.7.0:= )
-	mng? ( media-libs/libmng:= )
-	openexr? ( >=media-libs/openexr-1.6.1:= )
-	postscript? ( app-text/ghostscript-gpl:= )
-	udev? ( dev-libs/libgudev:= )
-	unwind? ( >=sys-libs/libunwind-1.1.0:= )
-	webp? ( >=media-libs/libwebp-0.6.0:= )
-	wmf? ( >=media-libs/libwmf-0.2.8 )
-	xpm? ( x11-libs/libXpm )
-"
-
-RDEPEND="
-	${DEPEND}
-	x11-themes/hicolor-icon-theme
-	gnome? ( gnome-base/gvfs )
-"
-
-BDEPEND="
-	>=dev-lang/perl-5.10.0
-	dev-libs/appstream-glib
-	>=dev-build/gtk-doc-am-1
-	dev-util/gtk-update-icon-cache
-	>=dev-util/intltool-0.40.1
-	>=sys-devel/gettext-0.19.8
-	>=dev-build/libtool-2.2
-	virtual/pkgconfig
-"
-
-DOCS=( "AUTHORS" "ChangeLog" "HACKING" "NEWS" "README" "README.i18n" )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.10_fix_test-appdata.patch" # Bugs 685210 (and duplicate 691070)
-	"${FILESDIR}/${PN}-2.10_fix_musl_backtrace_backend_switch.patch" #900148
-	"${FILESDIR}/${PN}-2.10_fix_configure_GCC13_implicit_function_declarations.patch" #899796
-)
-
-src_prepare() {
-	sed -i -e 's/mypaint-brushes-1.0/mypaint-brushes-2.0/' configure.ac || die #737794
-
-	sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864
-	sed 's/-DGIMP_DISABLE_DEPRECATED/-DGIMP_protect_DISABLE_DEPRECATED/g' -i configure.ac || die #615144
-
-	if use heif ; then
-		has_version -d ">=media-libs/libheif-1.18.0" && eapply "${FILESDIR}/${PN}-2.10_libheif-1.18_unconditional_compat.patch" # 940915
-	fi
-
-	gnome2_src_prepare  # calls eautoreconf
-
-	sed 's/-DGIMP_protect_DISABLE_DEPRECATED/-DGIMP_DISABLE_DEPRECATED/g' -i configure || die #615144
-	grep -F -q GIMP_DISABLE_DEPRECATED configure || die #615144, self-test
-
-	export CC_FOR_BUILD="$(tc-getBUILD_CC)"
-}
-
-_adjust_sandbox() {
-	# Bugs #569738 and #591214
-	local nv
-	for nv in /dev/nvidia-uvm /dev/nvidiactl /dev/nvidia{0..9} ; do
-		# We do not check for existence as they may show up later
-		# https://bugs.gentoo.org/show_bug.cgi?id=569738#c21
-		addwrite "${nv}"
-	done
-
-	addwrite /dev/dri/  # bugs #574038 and #684886
-	addwrite /dev/ati/  # bug #589198
-	addwrite /proc/mtrr  # bug #589198
-}
-
-src_configure() {
-	_adjust_sandbox
-
-	local myconf=(
-		GEGL="${EPREFIX}"/usr/bin/gegl-0.4
-		GDBUS_CODEGEN="${EPREFIX}"/bin/false
-
-		--enable-default-binary
-
-		--disable-check-update
-		--disable-python
-		--enable-mp
-		--with-appdata-test
-		--with-bug-report-url=https://bugs.gentoo.org/
-		--with-xmc
-		--without-libbacktrace
-		--without-webkit
-		--without-xvfb-run
-		$(use_enable cpu_flags_ppc_altivec altivec)
-		$(use_enable cpu_flags_x86_mmx mmx)
-		$(use_enable cpu_flags_x86_sse sse)
-		$(use_enable debug)
-		$(use_enable vector-icons)
-		$(use_with aalib aa)
-		$(use_with alsa)
-		$(use_with !aqua x)
-		$(use_with heif libheif)
-		$(use_with jpeg2k jpeg2000)
-		$(use_with jpegxl)
-		$(use_with mng libmng)
-		$(use_with openexr)
-		$(use_with postscript gs)
-		$(use_with udev gudev)
-		$(use_with unwind libunwind)
-		$(use_with webp)
-		$(use_with wmf)
-		$(use_with xpm libxpm)
-	)
-
-	gnome2_src_configure "${myconf[@]}"
-}
-
-src_compile() {
-	export XDG_DATA_DIRS="${EPREFIX}"/usr/share  # bug 587004
-	gnome2_src_compile
-}
-
-# for https://bugs.gentoo.org/664938
-_rename_plugins() {
-	einfo 'Renaming plug-ins to not collide with pre-2.10.6 file layout (bug #664938)...'
-	local prename=gimp-org-
-	(
-		cd "${ED}"/usr/$(get_libdir)/gimp/2.0/plug-ins || die
-		for plugin_slash in $(ls -d1 */); do
-		    plugin=${plugin_slash%/}
-		    if [[ -f ${plugin}/${plugin} ]]; then
-			# NOTE: Folder and file name need to match for Gimp to load that plug-in
-			#       so "file-svg/file-svg" becomes "${prename}file-svg/${prename}file-svg"
-			mv ${plugin}/{,${prename}}${plugin} || die
-			mv {,${prename}}${plugin} || die
-		    fi
-		done
-	)
-}
-
-src_test() {
-	virtx emake check
-}
-
-src_install() {
-	gnome2_src_install
-
-	# Workaround for bug #321111 to give GIMP the least
-	# precedence on PDF documents by default
-	mv "${ED}"/usr/share/applications/{,zzz-}gimp.desktop || die
-
-	find "${ED}" -name '*.la' -type f -delete || die
-
-	# Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527)
-	local gimp_app_version=$(ver_cut 1-2)
-	mv "${ED}"/usr/share/man/man1/gimp-console{-${gimp_app_version},}.1 || die
-
-	# Remove gimp devel-docs html files if user doesn't need it
-	if ! use doc; then
-		rm -r "${ED}"/usr/share/gtk-doc || die
-	fi
-
-	_rename_plugins || die
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-}
diff --git a/media-gfx/gimp/gimp-2.10.36-r4.ebuild b/media-gfx/gimp/gimp-2.10.36-r4.ebuild
deleted file mode 100644
index 1acf5d818486..000000000000
--- a/media-gfx/gimp/gimp-2.10.36-r4.ebuild
+++ /dev/null
@@ -1,221 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-GNOME2_EAUTORECONF=yes
-WANT_AUTOMAKE=
-
-inherit autotools gnome2 toolchain-funcs virtualx
-
-DESCRIPTION="GNU Image Manipulation Program"
-HOMEPAGE="https://www.gimp.org/"
-SRC_URI="mirror://gimp/v$(ver_cut 1-2)/${P}.tar.bz2"
-LICENSE="GPL-3+ LGPL-3+"
-SLOT="0/2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86"
-
-IUSE="aalib alsa aqua debug doc gnome heif jpeg2k jpegxl mng openexr postscript udev unwind vector-icons webp wmf xpm cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse"
-
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	>=app-accessibility/at-spi2-core-2.46.0
-	>=app-text/poppler-0.50[cairo]
-	>=app-text/poppler-data-0.4.7
-	>=dev-libs/glib-2.56.2:2
-	>=dev-libs/json-glib-1.2.6
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	>=gnome-base/librsvg-2.40.6:2
-	>=media-gfx/mypaint-brushes-2.0.2:=
-	>=media-libs/babl-0.1.98
-	>=media-libs/fontconfig-2.12.4
-	>=media-libs/freetype-2.1.7
-	>=media-libs/gegl-0.4.40:0.4[cairo]
-	>=media-libs/gexiv2-0.10.6
-	>=media-libs/harfbuzz-0.9.19:=
-	>=media-libs/lcms-2.8:2
-	media-libs/libjpeg-turbo:=
-	>=media-libs/libmypaint-1.6.1:=
-	>=media-libs/libpng-1.6.25:0=
-	>=media-libs/tiff-3.5.7:=
-	net-libs/glib-networking[ssl]
-	sys-libs/zlib
-	>=x11-libs/cairo-1.12.2
-	>=x11-libs/gdk-pixbuf-2.31:2
-	>=x11-libs/gtk+-2.24.32:2
-	x11-libs/libXcursor
-	>=x11-libs/pango-1.29.4
-	aalib? ( media-libs/aalib )
-	alsa? ( >=media-libs/alsa-lib-1.0.0 )
-	aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 )
-	heif? ( >=media-libs/libheif-1.9.1:= )
-	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= )
-	jpegxl? ( >=media-libs/libjxl-0.7.0:= )
-	mng? ( media-libs/libmng:= )
-	openexr? ( >=media-libs/openexr-1.6.1:= )
-	postscript? ( app-text/ghostscript-gpl:= )
-	udev? ( dev-libs/libgudev:= )
-	unwind? ( >=sys-libs/libunwind-1.1.0:= )
-	webp? ( >=media-libs/libwebp-0.6.0:= )
-	wmf? ( >=media-libs/libwmf-0.2.8 )
-	xpm? ( x11-libs/libXpm )
-"
-
-RDEPEND="
-	${DEPEND}
-	x11-themes/hicolor-icon-theme
-	gnome? ( gnome-base/gvfs )
-"
-
-BDEPEND="
-	>=dev-lang/perl-5.10.0
-	dev-libs/appstream-glib
-	>=dev-build/gtk-doc-am-1
-	dev-util/gtk-update-icon-cache
-	>=dev-util/intltool-0.40.1
-	>=sys-devel/gettext-0.19.8
-	>=dev-build/libtool-2.2
-	virtual/pkgconfig
-"
-
-DOCS=( "AUTHORS" "ChangeLog" "HACKING" "NEWS" "README" "README.i18n" )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.10_fix_test-appdata.patch" # Bugs 685210 (and duplicate 691070)
-	"${FILESDIR}/${PN}-2.10_fix_musl_backtrace_backend_switch.patch" #900148
-	"${FILESDIR}/${PN}-2.10_fix_configure_GCC13_implicit_function_declarations.patch" #899796
-	"${FILESDIR}/${P}_fix_strict-aliasing.patch" #917497
-	"${FILESDIR}/${P}_c99_tiff.patch" #919282
-	"${FILESDIR}/${P}_c99_metadata.patch" #919282
-)
-
-src_prepare() {
-	sed -i -e 's/mypaint-brushes-1.0/mypaint-brushes-2.0/' configure.ac || die #737794
-
-	sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864
-	sed 's/-DGIMP_DISABLE_DEPRECATED/-DGIMP_protect_DISABLE_DEPRECATED/g' -i configure.ac || die #615144
-
-	if use heif ; then
-		has_version -d ">=media-libs/libheif-1.18.0" && eapply "${FILESDIR}/${PN}-2.10_libheif-1.18_unconditional_compat.patch" # 940915
-	fi
-
-	gnome2_src_prepare  # calls eautoreconf
-
-	sed 's/-DGIMP_protect_DISABLE_DEPRECATED/-DGIMP_DISABLE_DEPRECATED/g' -i configure || die #615144
-	grep -F -q GIMP_DISABLE_DEPRECATED configure || die #615144, self-test
-
-	export CC_FOR_BUILD="$(tc-getBUILD_CC)"
-}
-
-_adjust_sandbox() {
-	# Bugs #569738 and #591214
-	local nv
-	for nv in /dev/nvidia-uvm /dev/nvidiactl /dev/nvidia{0..9} ; do
-		# We do not check for existence as they may show up later
-		# https://bugs.gentoo.org/show_bug.cgi?id=569738#c21
-		addwrite "${nv}"
-	done
-
-	addwrite /dev/dri/  # bugs #574038 and #684886
-	addwrite /dev/ati/  # bug #589198
-	addwrite /proc/mtrr  # bug #589198
-}
-
-src_configure() {
-	_adjust_sandbox
-
-	local myconf=(
-		GEGL="${EPREFIX}"/usr/bin/gegl-0.4
-		GDBUS_CODEGEN="${EPREFIX}"/bin/false
-
-		--enable-default-binary
-
-		--disable-check-update
-		--disable-python
-		--enable-mp
-		--with-appdata-test
-		--with-bug-report-url=https://bugs.gentoo.org/
-		--with-xmc
-		--without-libbacktrace
-		--without-webkit
-		--without-xvfb-run
-		$(use_enable cpu_flags_ppc_altivec altivec)
-		$(use_enable cpu_flags_x86_mmx mmx)
-		$(use_enable cpu_flags_x86_sse sse)
-		$(use_enable debug)
-		$(use_enable vector-icons)
-		$(use_with aalib aa)
-		$(use_with alsa)
-		$(use_with !aqua x)
-		$(use_with heif libheif)
-		$(use_with jpeg2k jpeg2000)
-		$(use_with jpegxl)
-		$(use_with mng libmng)
-		$(use_with openexr)
-		$(use_with postscript gs)
-		$(use_with udev gudev)
-		$(use_with unwind libunwind)
-		$(use_with webp)
-		$(use_with wmf)
-		$(use_with xpm libxpm)
-	)
-
-	gnome2_src_configure "${myconf[@]}"
-}
-
-src_compile() {
-	export XDG_DATA_DIRS="${EPREFIX}"/usr/share  # bug 587004
-	gnome2_src_compile
-}
-
-# for https://bugs.gentoo.org/664938
-_rename_plugins() {
-	einfo 'Renaming plug-ins to not collide with pre-2.10.6 file layout (bug #664938)...'
-	local prename=gimp-org-
-	(
-		cd "${ED}"/usr/$(get_libdir)/gimp/2.0/plug-ins || die
-		for plugin_slash in $(ls -d1 */); do
-		    plugin=${plugin_slash%/}
-		    if [[ -f ${plugin}/${plugin} ]]; then
-			# NOTE: Folder and file name need to match for Gimp to load that plug-in
-			#       so "file-svg/file-svg" becomes "${prename}file-svg/${prename}file-svg"
-			mv ${plugin}/{,${prename}}${plugin} || die
-			mv {,${prename}}${plugin} || die
-		    fi
-		done
-	)
-}
-
-src_test() {
-	virtx emake check
-}
-
-src_install() {
-	gnome2_src_install
-
-	# Workaround for bug #321111 to give GIMP the least
-	# precedence on PDF documents by default
-	mv "${ED}"/usr/share/applications/{,zzz-}gimp.desktop || die
-
-	find "${ED}" -name '*.la' -type f -delete || die
-
-	# Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527)
-	local gimp_app_version=$(ver_cut 1-2)
-	mv "${ED}"/usr/share/man/man1/gimp-console{-${gimp_app_version},}.1 || die
-
-	# Remove gimp devel-docs html files if user doesn't need it
-	if ! use doc; then
-		rm -r "${ED}"/usr/share/gtk-doc || die
-	fi
-
-	_rename_plugins || die
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-}
diff --git a/media-gfx/gimp/gimp-2.99.18-r1.ebuild b/media-gfx/gimp/gimp-2.99.18-r1.ebuild
deleted file mode 100644
index a206f158550c..000000000000
--- a/media-gfx/gimp/gimp-2.99.18-r1.ebuild
+++ /dev/null
@@ -1,269 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( luajit )
-PYTHON_COMPAT=( python3_{10..12} )
-VALA_USE_DEPEND=vapigen
-
-inherit lua-single meson python-single-r1 toolchain-funcs vala xdg
-
-DESCRIPTION="GNU Image Manipulation Program"
-HOMEPAGE="https://www.gimp.org/"
-SRC_URI="mirror://gimp/v$(ver_cut 1-2)/${P}.tar.xz"
-
-LICENSE="GPL-3+ LGPL-3+"
-SLOT="0/3"
-
-IUSE="X aalib alsa doc fits gnome heif javascript jpeg2k jpegxl lua mng openexr openmp postscript python test udev unwind vala vector-icons webp wmf xpm"
-REQUIRED_USE="
-	lua? ( ${LUA_REQUIRED_USE} )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-RESTRICT="!test? ( test )"
-
-# media-libs/{babl,gegl} are required to be built with USE="introspection"
-# to fix the compilation checking of /usr/share/gir-1.0/{Babl-0.1gir,Gegl-0.4.gir}
-COMMON_DEPEND="
-	>=app-accessibility/at-spi2-core-2.46.0
-	>=app-text/poppler-0.90.1[cairo]
-	>=app-text/poppler-data-0.4.9
-	>=dev-libs/appstream-glib-0.7.16
-	>=dev-libs/glib-2.70.0:2
-	>=dev-libs/json-glib-1.4.4
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	>=gnome-base/librsvg-2.46.0:2
-	>=media-gfx/mypaint-brushes-2.0.2:=
-	>=media-libs/babl-0.1.98[introspection,lcms,vala?]
-	>=media-libs/fontconfig-2.12.6
-	>=media-libs/freetype-2.10.2
-	>=media-libs/gegl-0.4.48:0.4[cairo,introspection,lcms,vala?]
-	>=media-libs/gexiv2-0.14.0
-	>=media-libs/harfbuzz-2.6.5:=
-	>=media-libs/lcms-2.13.1:2
-	media-libs/libjpeg-turbo:=
-	>=media-libs/libmypaint-1.6.1:=
-	>=media-libs/libpng-1.6.37:0=
-	>=media-libs/tiff-4.1.0:=
-	net-libs/glib-networking[ssl]
-	sys-libs/zlib
-	>=x11-libs/cairo-1.16.0
-	>=x11-libs/gdk-pixbuf-2.40.0:2[introspection]
-	>=x11-libs/gtk+-3.24.16:3[introspection]
-	>=x11-libs/pango-1.50.0
-	>=x11-libs/libXmu-1.1.4
-	aalib? ( media-libs/aalib )
-	alsa? ( >=media-libs/alsa-lib-1.0.0 )
-	fits? ( sci-libs/cfitsio )
-	heif? ( >=media-libs/libheif-1.13.0:= )
-	javascript? ( dev-libs/gjs )
-	jpeg2k? ( >=media-libs/openjpeg-2.3.1:2= )
-	jpegxl? ( >=media-libs/libjxl-0.6.1:= )
-	lua? (
-		${LUA_DEPS}
-		$(lua_gen_cond_dep '
-			dev-lua/lgi[${LUA_USEDEP}]
-		')
-	)
-	mng? ( media-libs/libmng:= )
-	openexr? ( >=media-libs/openexr-2.3.0:= )
-	postscript? ( app-text/ghostscript-gpl:= )
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			>=dev-python/pygobject-3.0:3[${PYTHON_USEDEP}]
-		')
-	)
-	udev? ( >=dev-libs/libgudev-167:= )
-	unwind? ( >=sys-libs/libunwind-1.1.0:= )
-	webp? ( >=media-libs/libwebp-0.6.0:= )
-	wmf? ( >=media-libs/libwmf-0.2.8 )
-	X? ( x11-libs/libXcursor )
-	xpm? ( x11-libs/libXpm )
-"
-
-RDEPEND="
-	${COMMON_DEPEND}
-	x11-themes/hicolor-icon-theme
-	gnome? ( gnome-base/gvfs )
-"
-
-DEPEND="
-	${COMMON_DEPEND}
-	test? ( x11-misc/xvfb-run )
-	vala? ( $(vala_depend) )
-"
-
-# TODO: there are probably more atoms in DEPEND which should be in BDEPEND now
-BDEPEND="
-	>=dev-lang/perl-5.30.3
-	dev-util/gdbus-codegen
-	>=sys-devel/gettext-0.21
-	doc? (
-		app-text/yelp-tools
-		dev-libs/gobject-introspection[doctool]
-		dev-util/gi-docgen
-	)
-	virtual/pkgconfig
-"
-
-DOCS=( "AUTHORS" "NEWS" "README" "README.i18n" )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.10_fix_musl_backtrace_backend_switch.patch" #900148
-)
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-
-	use lua && lua-single_pkg_setup
-
-	if use python; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	default
-
-	sed -i -e 's/mypaint-brushes-1.0/mypaint-brushes-2.0/' meson.build || die #737794
-
-	# Fix Gimp  and GimpUI devel doc installation paths
-	sed -i -e "s/'doc'/'gtk-doc'/" devel-docs/reference/gimp/meson.build || die
-	sed -i -e "s/'doc'/'gtk-doc'/" devel-docs/reference/gimp-ui/meson.build || die
-
-	# Fix pygimp.interp python implementation path.
-	# Meson @PYTHON_PATH@ use sandbox path e.g.:
-	# '/var/tmp/portage/media-gfx/gimp-2.99.12/temp/python3.10/bin/python3'
-	sed -i -e 's/@PYTHON_PATH@/'${EPYTHON}'/' plug-ins/python/pygimp.interp.in || die
-
-	# Set proper intallation path of documentation logo
-	sed -i -e "s/'gimp-@0@'.format(gimp_app_version)/'gimp-${PVR}'/" data/images/meson.build || die
-}
-
-_adjust_sandbox() {
-	# Bugs #569738 and #591214
-	local nv
-	for nv in /dev/nvidia-uvm /dev/nvidiactl /dev/nvidia{0..9} ; do
-		# We do not check for existence as they may show up later
-		# https://bugs.gentoo.org/show_bug.cgi?id=569738#c21
-		addwrite "${nv}"
-	done
-
-	addwrite /dev/dri/  # bugs #574038 and #684886
-	addwrite /dev/ati/  # bug #589198
-	addwrite /proc/mtrr  # bug #589198
-}
-
-src_configure() {
-	_adjust_sandbox
-
-	use vala && vala_setup
-
-	local emesonargs=(
-		-Denable-default-bin=enabled
-
-		-Dcheck-update=no
-		-Denable-multiproc=true
-		-Dappdata-test=disabled
-		-Dbug-report-url=https://bugs.gentoo.org/
-		-Dilbm=disabled
-		-Dlibbacktrace=false
-		-Dwebkit-unmaintained=false
-		$(meson_feature aalib aa)
-		$(meson_feature alsa)
-		$(meson_feature doc gi-docgen)
-		$(meson_feature fits)
-		$(meson_feature heif)
-		$(meson_feature javascript)
-		$(meson_feature jpeg2k jpeg2000)
-		$(meson_feature jpegxl jpeg-xl)
-		$(meson_feature lua)
-		$(meson_feature mng)
-		$(meson_feature openexr)
-		$(meson_feature openmp)
-		$(meson_feature postscript ghostscript)
-		$(meson_feature python)
-		$(meson_feature test headless-tests)
-		$(meson_feature udev gudev)
-		$(meson_feature vala)
-		$(meson_feature webp)
-		$(meson_feature wmf)
-		$(meson_feature X xcursor)
-		$(meson_feature xpm)
-		$(meson_use doc g-ir-doc)
-		$(meson_use unwind libunwind)
-		$(meson_use vector-icons)
-	)
-
-	meson_src_configure
-}
-
-src_compile() {
-	export XDG_DATA_DIRS="${EPREFIX}"/usr/share  # bug 587004
-	meson_src_compile
-}
-
-# for https://bugs.gentoo.org/664938
-_rename_plugins() {
-	einfo 'Renaming plug-ins to not collide with pre-2.10.6 file layout (bug #664938)...'
-	local prename=gimp-org-
-	(
-		cd "${ED}"/usr/$(get_libdir)/gimp/2.99/plug-ins || exit 1
-		for plugin_slash in $(ls -d1 */); do
-			plugin=${plugin_slash%/}
-			if [[ -f ${plugin}/${plugin} ]]; then
-				# NOTE: Folder and file name need to match for Gimp to load that plug-in
-				#       so "file-svg/file-svg" becomes "${prename}file-svg/${prename}file-svg"
-				mv ${plugin}/{,${prename}}${plugin} || exit 1
-				mv {,${prename}}${plugin} || exit 1
-			fi
-		done
-	)
-}
-
-src_test() {
-	local -x LD_LIBRARY_PATH="${BUILD_DIR}/libgimp:${LD_LIBRARY_PATH}"
-	meson_src_test
-}
-
-src_install() {
-	meson_src_install
-
-	if use python; then
-		python_optimize
-	fi
-
-	# Workaround for bug #321111 to give GIMP the least
-	# precedence on PDF documents by default
-	mv "${ED}"/usr/share/applications/{,zzz-}gimp.desktop || die
-
-	find "${D}" -name '*.la' -type f -delete || die
-
-	# Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527)
-	mv "${ED}"/usr/share/man/man1/gimp-console{-*,}.1 || die
-
-	# Create symlinks for Gimp exec in /usr/bin
-	dosym "${ESYSROOT}"/usr/bin/gimp-2.99 /usr/bin/gimp
-	dosym "${ESYSROOT}"/usr/bin/gimp-console-2.99 /usr/bin/gimp-console
-	dosym "${ESYSROOT}"/usr/bin/gimp-script-fu-interpreter-3.0 /usr/bin/gimp-script-fu-interpreter
-	dosym "${ESYSROOT}"/usr/bin/gimp-test-clipboard-2.99 /usr/bin/gimp-test-clipboard
-	dosym "${ESYSROOT}"/usr/bin/gimptool-2.99 /usr/bin/gimptool
-
-	_rename_plugins || die
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-}
diff --git a/media-gfx/gimp/gimp-2.99.18-r2.ebuild b/media-gfx/gimp/gimp-2.99.18-r2.ebuild
deleted file mode 100644
index 9166dcd6ee43..000000000000
--- a/media-gfx/gimp/gimp-2.99.18-r2.ebuild
+++ /dev/null
@@ -1,275 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( luajit )
-PYTHON_COMPAT=( python3_{10..12} )
-VALA_USE_DEPEND=vapigen
-
-inherit lua-single meson python-single-r1 toolchain-funcs vala xdg
-
-DESCRIPTION="GNU Image Manipulation Program"
-HOMEPAGE="https://www.gimp.org/"
-SRC_URI="mirror://gimp/v$(ver_cut 1-2)/${P}.tar.xz"
-
-LICENSE="GPL-3+ LGPL-3+"
-SLOT="0/3"
-
-IUSE="X aalib alsa doc fits gnome heif javascript jpeg2k jpegxl lua mng openexr openmp postscript python test udev unwind vala vector-icons webp wmf xpm"
-REQUIRED_USE="
-	lua? ( ${LUA_REQUIRED_USE} )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	test? ( X )
-	xpm? ( X )
-"
-
-RESTRICT="!test? ( test )"
-
-# media-libs/{babl,gegl} are required to be built with USE="introspection"
-# to fix the compilation checking of /usr/share/gir-1.0/{Babl-0.1gir,Gegl-0.4.gir}
-COMMON_DEPEND="
-	>=app-accessibility/at-spi2-core-2.46.0
-	>=app-text/poppler-0.90.1[cairo]
-	>=app-text/poppler-data-0.4.9
-	>=dev-libs/appstream-glib-0.7.16
-	>=dev-libs/glib-2.70.0:2
-	>=dev-libs/json-glib-1.4.4
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	>=gnome-base/librsvg-2.46.0:2
-	>=media-gfx/mypaint-brushes-2.0.2:=
-	>=media-libs/babl-0.1.98[introspection,lcms,vala?]
-	>=media-libs/fontconfig-2.12.6
-	>=media-libs/freetype-2.10.2
-	>=media-libs/gegl-0.4.48:0.4[cairo,introspection,lcms,vala?]
-	>=media-libs/gexiv2-0.14.0
-	>=media-libs/harfbuzz-2.6.5:=
-	>=media-libs/lcms-2.13.1:2
-	media-libs/libjpeg-turbo:=
-	>=media-libs/libmypaint-1.6.1:=
-	>=media-libs/libpng-1.6.37:0=
-	>=media-libs/tiff-4.1.0:=
-	net-libs/glib-networking[ssl]
-	sys-libs/zlib
-	>=x11-libs/cairo-1.16.0[X=]
-	>=x11-libs/gdk-pixbuf-2.40.0:2[introspection]
-	>=x11-libs/gtk+-3.24.16:3[introspection,X=]
-	>=x11-libs/pango-1.50.0[X=]
-	aalib? ( media-libs/aalib )
-	alsa? ( >=media-libs/alsa-lib-1.0.0 )
-	fits? ( sci-libs/cfitsio )
-	heif? ( >=media-libs/libheif-1.13.0:= )
-	javascript? ( dev-libs/gjs )
-	jpeg2k? ( >=media-libs/openjpeg-2.3.1:2= )
-	jpegxl? ( >=media-libs/libjxl-0.6.1:= )
-	lua? (
-		${LUA_DEPS}
-		$(lua_gen_cond_dep '
-			dev-lua/lgi[${LUA_USEDEP}]
-		')
-	)
-	mng? ( media-libs/libmng:= )
-	openexr? ( >=media-libs/openexr-2.3.0:= )
-	postscript? ( app-text/ghostscript-gpl:= )
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			>=dev-python/pygobject-3.0:3[${PYTHON_USEDEP}]
-		')
-	)
-	udev? ( >=dev-libs/libgudev-167:= )
-	unwind? ( >=sys-libs/libunwind-1.1.0:= )
-	webp? ( >=media-libs/libwebp-0.6.0:= )
-	wmf? ( >=media-libs/libwmf-0.2.8[X=] )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXcursor
-		x11-libs/libXext
-		>=x11-libs/libXmu-1.1.4
-	)
-	xpm? ( x11-libs/libXpm )
-"
-
-RDEPEND="
-	${COMMON_DEPEND}
-	x11-themes/hicolor-icon-theme
-	gnome? ( gnome-base/gvfs )
-"
-
-DEPEND="
-	${COMMON_DEPEND}
-	test? ( x11-misc/xvfb-run )
-	vala? ( $(vala_depend) )
-"
-
-# TODO: there are probably more atoms in DEPEND which should be in BDEPEND now
-BDEPEND="
-	>=dev-lang/perl-5.30.3
-	dev-util/gdbus-codegen
-	>=sys-devel/gettext-0.21
-	doc? (
-		app-text/yelp-tools
-		dev-libs/gobject-introspection[doctool]
-		dev-util/gi-docgen
-	)
-	virtual/pkgconfig
-"
-
-DOCS=( "AUTHORS" "NEWS" "README" "README.i18n" )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.10_fix_musl_backtrace_backend_switch.patch" #900148
-)
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-
-	use lua && lua-single_pkg_setup
-
-	if use python; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	default
-
-	sed -i -e 's/mypaint-brushes-1.0/mypaint-brushes-2.0/' meson.build || die #737794
-
-	# Fix Gimp  and GimpUI devel doc installation paths
-	sed -i -e "s/'doc'/'gtk-doc'/" devel-docs/reference/gimp/meson.build || die
-	sed -i -e "s/'doc'/'gtk-doc'/" devel-docs/reference/gimp-ui/meson.build || die
-
-	# Fix pygimp.interp python implementation path.
-	# Meson @PYTHON_PATH@ use sandbox path e.g.:
-	# '/var/tmp/portage/media-gfx/gimp-2.99.12/temp/python3.10/bin/python3'
-	sed -i -e 's/@PYTHON_PATH@/'${EPYTHON}'/' plug-ins/python/pygimp.interp.in || die
-
-	# Set proper intallation path of documentation logo
-	sed -i -e "s/'gimp-@0@'.format(gimp_app_version)/'gimp-${PVR}'/" data/images/meson.build || die
-}
-
-_adjust_sandbox() {
-	# Bugs #569738 and #591214
-	local nv
-	for nv in /dev/nvidia-uvm /dev/nvidiactl /dev/nvidia{0..9} ; do
-		# We do not check for existence as they may show up later
-		# https://bugs.gentoo.org/show_bug.cgi?id=569738#c21
-		addwrite "${nv}"
-	done
-
-	addwrite /dev/dri/  # bugs #574038 and #684886
-	addwrite /dev/ati/  # bug #589198
-	addwrite /proc/mtrr  # bug #589198
-}
-
-src_configure() {
-	_adjust_sandbox
-
-	use vala && vala_setup
-
-	local emesonargs=(
-		-Denable-default-bin=enabled
-
-		-Dcheck-update=no
-		-Denable-multiproc=true
-		-Dappdata-test=disabled
-		-Dbug-report-url=https://bugs.gentoo.org/
-		-Dilbm=disabled
-		-Dlibbacktrace=false
-		-Dwebkit-unmaintained=false
-		$(meson_feature aalib aa)
-		$(meson_feature alsa)
-		$(meson_feature doc gi-docgen)
-		$(meson_feature fits)
-		$(meson_feature heif)
-		$(meson_feature javascript)
-		$(meson_feature jpeg2k jpeg2000)
-		$(meson_feature jpegxl jpeg-xl)
-		$(meson_feature lua)
-		$(meson_feature mng)
-		$(meson_feature openexr)
-		$(meson_feature openmp)
-		$(meson_feature postscript ghostscript)
-		$(meson_feature python)
-		$(meson_feature test headless-tests)
-		$(meson_feature udev gudev)
-		$(meson_feature vala)
-		$(meson_feature webp)
-		$(meson_feature wmf)
-		$(meson_feature X xcursor)
-		$(meson_feature xpm)
-		$(meson_use doc g-ir-doc)
-		$(meson_use unwind libunwind)
-		$(meson_use vector-icons)
-	)
-
-	meson_src_configure
-}
-
-src_compile() {
-	export XDG_DATA_DIRS="${EPREFIX}"/usr/share  # bug 587004
-	meson_src_compile
-}
-
-# for https://bugs.gentoo.org/664938
-_rename_plugins() {
-	einfo 'Renaming plug-ins to not collide with pre-2.10.6 file layout (bug #664938)...'
-	local prename=gimp-org-
-	(
-		cd "${ED}"/usr/$(get_libdir)/gimp/2.99/plug-ins || exit 1
-		for plugin_slash in $(ls -d1 */); do
-			plugin=${plugin_slash%/}
-			if [[ -f ${plugin}/${plugin} ]]; then
-				# NOTE: Folder and file name need to match for Gimp to load that plug-in
-				#       so "file-svg/file-svg" becomes "${prename}file-svg/${prename}file-svg"
-				mv ${plugin}/{,${prename}}${plugin} || exit 1
-				mv {,${prename}}${plugin} || exit 1
-			fi
-		done
-	)
-}
-
-src_test() {
-	local -x LD_LIBRARY_PATH="${BUILD_DIR}/libgimp:${LD_LIBRARY_PATH}"
-	meson_src_test
-}
-
-src_install() {
-	meson_src_install
-
-	if use python; then
-		python_optimize
-	fi
-
-	# Workaround for bug #321111 to give GIMP the least
-	# precedence on PDF documents by default
-	mv "${ED}"/usr/share/applications/{,zzz-}gimp.desktop || die
-
-	find "${D}" -name '*.la' -type f -delete || die
-
-	# Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527)
-	mv "${ED}"/usr/share/man/man1/gimp-console{-*,}.1 || die
-
-	# Create symlinks for Gimp exec in /usr/bin
-	dosym "${ESYSROOT}"/usr/bin/gimp-2.99 /usr/bin/gimp
-	dosym "${ESYSROOT}"/usr/bin/gimp-console-2.99 /usr/bin/gimp-console
-	dosym "${ESYSROOT}"/usr/bin/gimp-script-fu-interpreter-3.0 /usr/bin/gimp-script-fu-interpreter
-	dosym "${ESYSROOT}"/usr/bin/gimp-test-clipboard-2.99 /usr/bin/gimp-test-clipboard
-	dosym "${ESYSROOT}"/usr/bin/gimptool-2.99 /usr/bin/gimptool
-
-	_rename_plugins || die
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-}
diff --git a/media-gfx/xpaint/Manifest b/media-gfx/xpaint/Manifest
index ae2c80c1fe81..4b8a23ac79e0 100644
--- a/media-gfx/xpaint/Manifest
+++ b/media-gfx/xpaint/Manifest
@@ -6,5 +6,5 @@ AUX xpaint-3.1.4-gentoo-lto.patch 670 BLAKE2B 851334824d813029f2a78fb2b3698c85ee
 AUX xpaint-3.1.4-gentoo-shared-lib.patch 503 BLAKE2B 12bae42eb3a119c8acb3c5a6436191bf65c9697f6d743531633f0d64f5cdb26270f659eb0725a26efcc780cc06f91cf7f4e4f5032cf72f21614f3f7e48615b25 SHA512 971fb77386f2a896605d05346c4cf65fd68bdcc7b2f82e1319059f1c4ac37b0d76585c8ff0ce6d5841639bd94b420ac29b2e5275fe9309b31549cc540f2a9833
 DIST xpaint-3.1.4.tar.bz2 1630009 BLAKE2B 6090156f0c27742487edfd24e803e814d7f2801c3847a5435a896e575ee3bf0b17f498e8ba8f4b7a87536780dd7c15ec7e0c0e0acb28b225d95ed0c835abfa97 SHA512 ea81f0f0eaad2072fe487efba933b6f0a4f2a4d8ae7548169b8e765cf1232c9944149a822173350af91309535d8f3625b8e58814811a5f4491fa3e2fcdf92e1d
 EBUILD xpaint-3.1.4-r4.ebuild 1748 BLAKE2B 67ad09b81cbc78e7d609dbd6c6404bce63cf21581cd69f09b0f34a7f0b49611288fef904d6770385a30f6bc2bfac0f22380d51a02e6f5dfd13732ef432671222 SHA512 a433ef65a618cfdeee5041a7a637ca1dfb73df332f6d4bcd901c2e5155a24272344f406dbf67c1159055782886284478844e6e91b5436023e9bee4257d587c5f
-EBUILD xpaint-3.1.4-r5.ebuild 1790 BLAKE2B 1a46c2fcdc98efad74a4c8e755bfecb5c8c4c40df7c582bd951008cb2fd7cba61404d8be303726c1cbf5294b1bfb258af378d4a45baf0810e03e2e7dffddaf1e SHA512 2ec89753cddfd97112c246d83f7249f471984085fb2ebc0fc11bad3ff450825a4b3e2806a88c96cde86bc78b756c325cf516506583896a2f27833e7b9fee3e1c
+EBUILD xpaint-3.1.4-r5.ebuild 1788 BLAKE2B 25037019abf4597dab32aff3d7bcbddad6b4d20fb27c375093d977c4592cce9b411eb0db35ac072ee1b7dd9a5e7b88b92df9f9d1ac5c50414793294e2283f0f8 SHA512 70d4fbf3a1a3bce1341dbc11918bae5ab86b8370397b4f6ceee29523cde7073848281ad30c9d9044e0a2634e713f648d757096ecb2a14fc12ab056f8f4c6e18b
 MISC metadata.xml 1286 BLAKE2B 1a10d6e7ee2270c3b014e51d0f2deabef64f926dfcd54f46c898b0cea35d769eaaeafc061bfa95f0b1621cffae48732faf824590354883a86fb0f7e1ce0be5ba SHA512 3ef1cf69a09bfd7ab4963f3f4a76203b504d106307ce37a2bef7ac1623070d8c629b7e52a1e44f5d3380b21d6b660cdb1842e582b7fc26f052ed7d353ef7129d
diff --git a/media-gfx/xpaint/xpaint-3.1.4-r5.ebuild b/media-gfx/xpaint/xpaint-3.1.4-r5.ebuild
index 063cff5eb62b..ab6575b0483c 100644
--- a/media-gfx/xpaint/xpaint-3.1.4-r5.ebuild
+++ b/media-gfx/xpaint/xpaint-3.1.4-r5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/sf-xpaint/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="pgf tiff"
 # jpeg2k disabled for blocking media-libs/openjpeg:0 security cleanup, bug 735592