x11-libs/gtk+: remove due to lack of time to maintain. x11-libs/motif: Bump

Signed-off-by: Martin Väth <martin@mvath.de>

24 files changed, 8 insertions, 1509 deletions

diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index
index da4040ea..04f675d3 100644
--- a/metadata/pkg_desc_index
+++ b/metadata/pkg_desc_index
@@ -131,5 +131,4 @@ www-plugins/google-translator-for-firefox 3.0.3.3: Firefox webextension: transla
 www-plugins/no-color 0.9.4: Firefox webextension: remove colors and background images from the page
 www-plugins/noscript 11.4.8: Firefox webextension: restrict active contents like java/javascript/flash
 www-plugins/translate-to-me 1.1: Firefox webextension: translate the selected text with www.linguee.com
-x11-libs/gtk+ 2.24.33-r3 3.24.35 3.24.38: Gimp ToolKit +
-x11-libs/motif 2.3.8-r3: The Motif user interface component toolkit
+x11-libs/motif 2.3.8-r5: The Motif user interface component toolkit
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index d3984274..7a3bd569 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -137,9 +137,4 @@ sys-fs/squashfs-tools:zstd - Enable support for ZSTD compression using app-arch/
 sys-fs/squashfuse:lz4 - Enable support for lz4 compression
 sys-fs/squashfuse:zstd - Enable support for zstd compression
 sys-power/pm-utils:ntp - Install support for net-misc/ntp
-x11-libs/gtk+:adwaita-icon-theme - Force the adwaita-icon-theme
-x11-libs/gtk+:atk-bridge - Enable the gtk3-atk-bridge, hard depending on app-accessibility/at-spi2-atk and thus on sys-apps/dbus
-x11-libs/gtk+:broadway - Enable the GDK Broadway backend.
-x11-libs/gtk+:colord - Use x11-misc/colord for color management in printing
-x11-libs/gtk+:sysprof - Enable profiling data capture support using dev-util/sysprof-capture
 x11-libs/motif:motif22-compatibility - Compatibility with Open Motif 2.2
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
deleted file mode 100644
index 6590fa22..00000000
--- a/x11-libs/gtk+/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gtk+-2.24.33.tar.xz 12661828 BLAKE2B f3488b220aaee54bf36fa77e2112d060152e57938845d240014a7d43a5743b1d4de19cc09c683d9d238fd1967cd67cc3c493f2475e4e481f6709f5cdc652c65c SHA512 71b588797c81f727dfac8dcb1be193f7436f717d30ecf18eae2d3aeb0f445b3be4743400acac16435490db8f564f01032065d3f42d27871317f80c98aef929d5
-DIST gtk+-3.24.35.tar.xz 17913328 BLAKE2B 3beea3cbda7247357238ad133c951e69d5670d68e06efb4de09fae7141b141f4eb17a8c79661cab928a3db427f7b32b518875d0951254941e76b1a7aab60e34f SHA512 3a1ec35756fe12f5be3cfe33ef332d583690458327572e69bffad8b4095059d2a744a4a53b2fd31bab5da2ca7b41a2a38fbbd8ba541a45fa8cc0d00eae005ade
-DIST gtk+-3.24.38.tar.xz 12398104 BLAKE2B d24e794025d09b01c215ffcc60382f1bb74214b80fbc019bc0fc2a01bd90673c5a9e94b07b6ec981e9b28caf42b8e98032dd8150ac44a9bcab22bae83445685e SHA512 e99ec10959191b55013fce37e83f0e85bf36597db101e324081479792a2047d032cf0d213d69c02eeb4b7cd6d56d6489b7b2a60904b2bd7af23ea1b9c5a79528
diff --git a/x11-libs/gtk+/files/gtk+-2.24.24-out-of-source.patch b/x11-libs/gtk+/files/gtk+-2.24.24-out-of-source.patch
deleted file mode 100644
index 451233ca..00000000
--- a/x11-libs/gtk+/files/gtk+-2.24.24-out-of-source.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 9e0f33144aff8d792ab105927cf686eda0afd25e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Sun, 18 May 2014 10:50:05 +0200
-Subject: [PATCH] aliasfilecheck: check for sources both in builddir & srcdir.
-
-The $gtk_all_c_sources variable contains both supplied and generated
-sources. The former reside in $srcdir, the latter in the build directory
-(cwd).
-
-In order to handle both kinds properly, first try to find each source
-file in cwd, and then fallback to $srcdir. This makes it possible to use
-out-of-source builds, and guarantees that fresh-built source files will
-be used rather than pre-generated copies included in the distribution
-tarball.
----
- gtk/aliasfilescheck.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/gtk/aliasfilescheck.sh b/gtk/aliasfilescheck.sh
-index 31b49d4..3636a82 100755
---- a/gtk/aliasfilescheck.sh
-+++ b/gtk/aliasfilescheck.sh
-@@ -6,6 +6,6 @@ if test "x$gtk_all_c_sources" = x; then
- fi
- 
- grep 'IN_FILE' ${srcdir-.}/gtk.symbols | sed 's/.*(//;s/).*//' | grep __ | sort -u > expected-files
--{ cd ${srcdir-.}; grep '^ *# *define __' $gtk_all_c_sources; } | sed 's/.*define //;s/ *$//' | sort > actual-files
-+{ for f in $gtk_all_c_sources; do if test -f ${f}; then grep '^ *# *define __' ${f}; else grep '^ *# *define __' "${srcdir-.}"/${f}; fi; done } | sed 's/.*define //;s/ *$//' | sort > actual-files
- 
- diff expected-files actual-files && rm -f expected-files actual-files
--- 
-1.9.3
-
diff --git a/x11-libs/gtk+/files/gtk+-2.24.31-fix-gtkentry-beep.patch b/x11-libs/gtk+/files/gtk+-2.24.31-fix-gtkentry-beep.patch
deleted file mode 100644
index 1d09721b..00000000
--- a/x11-libs/gtk+/files/gtk+-2.24.31-fix-gtkentry-beep.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From debba4d14155a9e5736de069c2b693ab6f6e21aa Mon Sep 17 00:00:00 2001
-From: Matthias Clasen <mclasen@redhat.com>
-Date: Wed, 5 Oct 2016 12:20:14 -0400
-Subject: [PATCH] entry: Fix a corner case of overwrite mode
-
-We currently beep when a character is appended at the end in
-overwrite mode. That is obviously not right. Patch based on
-a patch by Ian MacDonald.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=772389
----
- gtk/gtkentry.c | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
-index b522039..bc33754 100644
---- a/gtk/gtkentry.c
-+++ b/gtk/gtkentry.c
-@@ -5224,6 +5224,7 @@ gtk_entry_enter_text (GtkEntry       *entry,
-   GtkEditable *editable = GTK_EDITABLE (entry);
-   gint tmp_pos;
-   gboolean old_need_im_reset;
-+  guint text_length;
- 
-   old_need_im_reset = entry->need_im_reset;
-   entry->need_im_reset = FALSE;
-@@ -5233,7 +5234,11 @@ gtk_entry_enter_text (GtkEntry       *entry,
-   else
-     {
-       if (entry->overwrite_mode)
--        gtk_entry_delete_from_cursor (entry, GTK_DELETE_CHARS, 1);
-+        {
-+          text_length = gtk_entry_buffer_get_length (get_buffer (entry));
-+          if (entry->current_pos < text_length)
-+            gtk_entry_delete_from_cursor (entry, GTK_DELETE_CHARS, 1);
-+        }
-     }
- 
-   tmp_pos = entry->current_pos;
--- 
-2.10.0
-
diff --git a/x11-libs/gtk+/files/gtk+-2.24.31-update-icon-cache.patch b/x11-libs/gtk+/files/gtk+-2.24.31-update-icon-cache.patch
deleted file mode 100644
index 11dbb5e4..00000000
--- a/x11-libs/gtk+/files/gtk+-2.24.31-update-icon-cache.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From 260f94f3914ba18a256e6f1c222f643a57854e80 Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Sat, 9 May 2015 23:30:58 +0200
-Subject: [PATCH] Always use external gtk-update-icon-cache
-
----
- configure.ac                   |  8 +++-----
- docs/reference/gtk/Makefile.am |  2 +-
- gtk/Makefile.am                | 13 ++-----------
- 3 files changed, 6 insertions(+), 17 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 4e11b40..7ef8cb6 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -913,11 +913,9 @@ dnl Look for a host system's gdk-pixbuf-csource if we are cross-compiling
- 
- AM_CONDITIONAL(CROSS_COMPILING, test $cross_compiling = yes)
- 
--if test $cross_compiling = yes; then
--  AC_PATH_PROG(GTK_UPDATE_ICON_CACHE, gtk-update-icon-cache, no)
--  if test x$GTK_UPDATE_ICON_CACHE = xno; then
--    REBUILD_PNGS=#
--  fi
-+AC_PATH_PROG(GTK_UPDATE_ICON_CACHE, gtk-update-icon-cache, no)
-+if test x$GTK_UPDATE_ICON_CACHE = xno; then
-+  REBUILD_PNGS=#
- fi
- 
- AC_PATH_PROG(GDK_PIXBUF_CSOURCE, gdk-pixbuf-csource, no)
-diff --git a/docs/reference/gtk/Makefile.am b/docs/reference/gtk/Makefile.am
-index c239445..60b5265 100644
---- a/docs/reference/gtk/Makefile.am
-+++ b/docs/reference/gtk/Makefile.am
-@@ -368,7 +368,7 @@ EXTRA_DIST += version.xml.in
- 
- if ENABLE_MAN
- 
--man_MANS = gtk-query-immodules-2.0.1 gtk-update-icon-cache.1 gtk-builder-convert.1
-+man_MANS = gtk-query-immodules-2.0.1 gtk-builder-convert.1
- 
- %.1 : %.xml 
- 	@XSLTPROC@ -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
-diff --git a/gtk/Makefile.am b/gtk/Makefile.am
-index 8cc4536..a7afbf3 100644
---- a/gtk/Makefile.am
-+++ b/gtk/Makefile.am
-@@ -1087,8 +1087,7 @@ endif
- # Installed tools
- #
- bin_PROGRAMS = \
--	gtk-query-immodules-2.0 \
--	gtk-update-icon-cache
-+	gtk-query-immodules-2.0
- 
- bin_SCRIPTS = gtk-builder-convert
- 
-@@ -1438,16 +1437,8 @@ stamp-icons: $(STOCK_ICONS)
- 	) done 								\
- 	&& touch stamp-icons
- 
--if CROSS_COMPILING
--gtk_update_icon_cache_program = $(GTK_UPDATE_ICON_CACHE)
--else
--gtk_update_icon_cache_program =							\
--	   ./gtk-update-icon-cache
--endif
--
- gtkbuiltincache.h: @REBUILD@ stamp-icons
--	$(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache$(EXEEXT)
--	$(gtk_update_icon_cache_program) --force --ignore-theme-index		\
-+	$(GTK_UPDATE_ICON_CACHE) --force --ignore-theme-index		\
- 	   --include-image-data							\
- 	   --source builtin_icons stock-icons > gtkbuiltincache.h.tmp &&        \
- 	mv gtkbuiltincache.h.tmp gtkbuiltincache.h
--- 
-2.10.0
-
diff --git a/x11-libs/gtk+/files/gtk+-2.24.33-Fix-casts.patch b/x11-libs/gtk+/files/gtk+-2.24.33-Fix-casts.patch
deleted file mode 100644
index 4ee55d27..00000000
--- a/x11-libs/gtk+/files/gtk+-2.24.33-Fix-casts.patch
+++ /dev/null
@@ -1,167 +0,0 @@
-https://bugs.gentoo.org/880617
-
-From 81c42586e6d9db7434e9b3f657fbd238294dd9d9 Mon Sep 17 00:00:00 2001
-From: Matt Turner <mattst88@gentoo.org>
-Date: Sat, 13 May 2023 11:35:28 -0400
-Subject: [PATCH] Fix casts
-
----
- gtk/gtkcellrendererspin.c                        | 2 +-
- gtk/gtkcomboboxtext.c                            | 2 +-
- gtk/gtkimmodule.c                                | 2 +-
- gtk/gtklabel.c                                   | 2 +-
- gtk/gtkscale.c                                   | 2 +-
- gtk/gtktoolpalette.c                             | 2 +-
- gtk/gtktreeview.c                                | 2 +-
- gtk/gtkuimanager.c                               | 2 +-
- gtk/gtkwidget.c                                  | 2 +-
- modules/other/gail/gailtreeview.c                | 2 +-
- modules/printbackends/cups/gtkprintbackendcups.c | 2 +-
- 11 files changed, 11 insertions(+), 11 deletions(-)
-
-diff --git a/gtk/gtkcellrendererspin.c b/gtk/gtkcellrendererspin.c
-index 2a3961bf20..68e5b9aaae 100644
---- a/gtk/gtkcellrendererspin.c
-+++ b/gtk/gtkcellrendererspin.c
-@@ -207,7 +207,7 @@ gtk_cell_renderer_spin_set_property (GObject      *object,
- 	}
- 
-       if (obj)
--	priv->adjustment = g_object_ref_sink (obj);
-+	priv->adjustment = GTK_ADJUSTMENT (g_object_ref_sink (obj));
-       break;
-     case PROP_CLIMB_RATE:
-       priv->climb_rate = g_value_get_double (value);
-diff --git a/gtk/gtkcomboboxtext.c b/gtk/gtkcomboboxtext.c
-index 9ffba68766..42c51abebc 100644
---- a/gtk/gtkcomboboxtext.c
-+++ b/gtk/gtkcomboboxtext.c
-@@ -275,7 +275,7 @@ gtk_combo_box_text_buildable_custom_tag_start (GtkBuildable     *buildable,
- 
-       parser_data = g_slice_new0 (ItemParserData);
-       parser_data->builder = g_object_ref (builder);
--      parser_data->object = g_object_ref (buildable);
-+      parser_data->object = G_OBJECT (g_object_ref (buildable));
-       parser_data->domain = gtk_builder_get_translation_domain (builder);
-       *parser = item_parser;
-       *data = parser_data;
-diff --git a/gtk/gtkimmodule.c b/gtk/gtkimmodule.c
-index 1fcb17a7d8..445b2be87f 100644
---- a/gtk/gtkimmodule.c
-+++ b/gtk/gtkimmodule.c
-@@ -662,7 +662,7 @@ lookup_immodule (gchar **immodules_list)
- 	  gboolean found;
- 	  gchar *context_id;
- 	  found = g_hash_table_lookup_extended (contexts_hash, *immodules_list,
--						&context_id, NULL);
-+						(gpointer *) &context_id, NULL);
- 	  if (found)
- 	    return context_id;
- 	}
-diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c
-index c47de5924f..cf68685536 100644
---- a/gtk/gtklabel.c
-+++ b/gtk/gtklabel.c
-@@ -1336,7 +1336,7 @@ gtk_label_buildable_custom_tag_start (GtkBuildable     *buildable,
- 
-       parser_data = g_slice_new0 (PangoParserData);
-       parser_data->builder = g_object_ref (builder);
--      parser_data->object = g_object_ref (buildable);
-+      parser_data->object = G_OBJECT (g_object_ref (buildable));
-       *parser = pango_parser;
-       *data = parser_data;
-       return TRUE;
-diff --git a/gtk/gtkscale.c b/gtk/gtkscale.c
-index 4317523fb8..a573b2f6ba 100644
---- a/gtk/gtkscale.c
-+++ b/gtk/gtkscale.c
-@@ -1471,7 +1471,7 @@ gtk_scale_add_mark (GtkScale        *scale,
-   mark->position = position;
-  
-   priv->marks = g_slist_insert_sorted_with_data (priv->marks, mark,
--                                                 (GCompareFunc) compare_marks,
-+                                                 compare_marks,
-                                                  GINT_TO_POINTER (
-                                                    gtk_range_get_inverted (GTK_RANGE (scale)) 
-                                                    ));
-diff --git a/gtk/gtktoolpalette.c b/gtk/gtktoolpalette.c
-index b984193ca3..f64b552fb0 100644
---- a/gtk/gtktoolpalette.c
-+++ b/gtk/gtktoolpalette.c
-@@ -734,7 +734,7 @@ gtk_tool_palette_add (GtkContainer *container,
- 
-   g_ptr_array_add (palette->priv->groups, info);
-   info->pos = palette->priv->groups->len - 1;
--  info->widget = g_object_ref_sink (child);
-+  info->widget = (GtkToolItemGroup *) g_object_ref_sink (child);
- 
-   gtk_widget_set_parent (child, GTK_WIDGET (palette));
- }
-diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
-index 89301eb91d..0d2d15b488 100644
---- a/gtk/gtktreeview.c
-+++ b/gtk/gtktreeview.c
-@@ -14147,7 +14147,7 @@ gtk_tree_view_set_search_entry (GtkTreeView *tree_view,
- 
-   if (entry)
-     {
--      tree_view->priv->search_entry = g_object_ref (entry);
-+      tree_view->priv->search_entry = GTK_WIDGET (g_object_ref (entry));
-       tree_view->priv->search_custom_entry_set = TRUE;
- 
-       if (tree_view->priv->search_entry_changed_id == 0)
-diff --git a/gtk/gtkuimanager.c b/gtk/gtkuimanager.c
-index d004cf1ed3..8cbeda9e85 100644
---- a/gtk/gtkuimanager.c
-+++ b/gtk/gtkuimanager.c
-@@ -503,7 +503,7 @@ gtk_ui_manager_buildable_construct_child (GtkBuildable *buildable,
-   g_signal_connect (widget, "hierarchy-changed",
- 		    G_CALLBACK (child_hierarchy_changed_cb),
- 		    GTK_UI_MANAGER (buildable));
--  return g_object_ref (widget);
-+  return G_OBJECT (g_object_ref (widget));
- }
- 
- static void
-diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
-index 1d1f6bb60e..a2ae2b430f 100644
---- a/gtk/gtkwidget.c
-+++ b/gtk/gtkwidget.c
-@@ -10679,7 +10679,7 @@ gtk_widget_buildable_custom_tag_start (GtkBuildable     *buildable,
-       AccelGroupParserData *parser_data;
- 
-       parser_data = g_slice_new0 (AccelGroupParserData);
--      parser_data->object = g_object_ref (buildable);
-+      parser_data->object = G_OBJECT (g_object_ref (buildable));
-       *parser = accel_group_parser;
-       *data = parser_data;
-       return TRUE;
-diff --git a/modules/other/gail/gailtreeview.c b/modules/other/gail/gailtreeview.c
-index 23923c59a1..ac6ff0a1c4 100644
---- a/modules/other/gail/gailtreeview.c
-+++ b/modules/other/gail/gailtreeview.c
-@@ -995,7 +995,7 @@ gail_tree_view_ref_child (AtkObject *obj,
-         gail_cell_add_state (cell, ATK_STATE_FOCUSABLE, FALSE);
-         if (focus_index == i)
-           {
--            gailview->focus_cell = g_object_ref (cell);
-+            gailview->focus_cell = ATK_OBJECT (g_object_ref (cell));
-             gail_cell_add_state (cell, ATK_STATE_FOCUSED, FALSE);
-             g_signal_emit_by_name (gailview,
-                                    "active-descendant-changed",
-diff --git a/modules/printbackends/cups/gtkprintbackendcups.c b/modules/printbackends/cups/gtkprintbackendcups.c
-index 2a000dc16f..753c53cb89 100644
---- a/modules/printbackends/cups/gtkprintbackendcups.c
-+++ b/modules/printbackends/cups/gtkprintbackendcups.c
-@@ -3479,7 +3479,7 @@ cups_request_ppd (GtkPrinter *printer)
-   g_io_channel_set_encoding (data->ppd_io, NULL, NULL);
-   g_io_channel_set_close_on_unref (data->ppd_io, TRUE);
- 
--  data->printer = g_object_ref (printer);
-+  data->printer = GTK_PRINTER_CUPS (g_object_ref (printer));
- 
-   resource = g_strdup_printf ("/printers/%s.ppd", 
-                               gtk_printer_cups_get_ppd_name (GTK_PRINTER_CUPS (printer)));
--- 
-2.39.3
-
diff --git a/x11-libs/gtk+/files/gtk+-2.24.33-respect-NM.patch b/x11-libs/gtk+/files/gtk+-2.24.33-respect-NM.patch
deleted file mode 100644
index 0c74d962..00000000
--- a/x11-libs/gtk+/files/gtk+-2.24.33-respect-NM.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-https://bugs.gentoo.org/725852
---- a/configure.ac
-+++ b/configure.ac
-@@ -190,7 +190,7 @@ m4_ifdef([LT_OUTPUT], [LT_OUTPUT])
- AC_SYS_LARGEFILE
- 
- AM_PROG_AS
--AC_PATH_TOOL(NM, nm, nm)
-+AC_CHECK_TOOL(NM, nm, nm)
- 
- dnl Initialize maintainer mode
- AM_MAINTAINER_MODE([enable])
diff --git a/x11-libs/gtk+/files/gtk+-3.22.20-libcloudproviders-automagic.patch b/x11-libs/gtk+/files/gtk+-3.22.20-libcloudproviders-automagic.patch
deleted file mode 100644
index 8913bc88..00000000
--- a/x11-libs/gtk+/files/gtk+-3.22.20-libcloudproviders-automagic.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 4588c9c6463d8958d8305caafa58ea5c263fd352 Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Tue, 16 Jan 2018 09:07:38 +0100
-Subject: [PATCH] Fix libcloudproviders check
-
-Use autotools managed variables and make use of pkgconfig macros.
----
- configure.ac | 26 +++++++++++++-------------
- 1 file changed, 13 insertions(+), 13 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 24110386b4..cebe66c2e5 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -349,8 +349,10 @@ AC_ARG_ENABLE(mir-backend,
- 
- AC_ARG_ENABLE(cloudproviders,
-               [AS_HELP_STRING([--enable-cloudproviders],
--                              [enable libcloudproviders integration])],
--                              [cloudproviders_set=yes])
-+                              [enable libcloudproviders integration])
-+              ],
-+              [],
-+              [enable_cloudproviders=yes])
- 
- if test -z "$backend_set"; then
-   if test "$platform_win32" = yes; then
-@@ -1350,17 +1352,15 @@ fi
- # Check for libcloudproviders
- 
- CLOUDPROVIDER_PACKAGES=""
--if test "x$cloudproviders_set" = "xyes"; then
--  CLOUDPROVIDER_PACKAGES="cloudproviders >= cloudproviders_required_version"
--  if $PKG_CONFIG --exists $CLOUDPROVIDER_PACKAGES ; then
--    AC_DEFINE(HAVE_CLOUDPROVIDERS, [1],
--              [Define if libcloudproviders is available]
--              )
--  else
--    AC_MSG_ERROR([
--*** libcloudproviders not found.])
--  fi
--fi
-+AS_IF([test "$enable_cloudproviders" = "yes"],
-+      [
-+          CLOUDPROVIDER_PACKAGES="cloudproviders >= cloudproviders_required_version"
-+          PKG_CHECK_EXISTS(
-+              [$CLOUDPROVIDER_PACKAGES],
-+              [AC_DEFINE(HAVE_CLOUDPROVIDERS, [1], [Define if libcloudproviders is available])],
-+              [AC_MSG_ERROR([*** libcloudproviders not found])]
-+          )
-+      ])
- 
- CFLAGS="$saved_cflags"
- LDFLAGS="$saved_ldflags"
--- 
-2.15.1
-
diff --git a/x11-libs/gtk+/files/gtk+-3.24.25-update-icon-cache.patch b/x11-libs/gtk+/files/gtk+-3.24.25-update-icon-cache.patch
deleted file mode 100644
index a648ba40..00000000
--- a/x11-libs/gtk+/files/gtk+-3.24.25-update-icon-cache.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-From ce23725d2b25b61a4eec8db0899d49d5a9dbcc6d Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Tue, 1 Nov 2016 15:24:22 +0100
-Subject: [PATCH] Always use external gtk-update-icon-cache
-
-Check for gtk-update-icon-cache to install demos, otherwise it is not
-used when building.
----
- configure.ac                     |  2 ++
- demos/gtk-demo/Makefile.am       |  2 +-
- demos/widget-factory/Makefile.am |  2 +-
- docs/reference/gtk/Makefile.am   |  1 -
- gtk/Makefile.am                  | 27 ---------------------------
- 5 files changed, 4 insertions(+), 30 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 36dda2ebaf..df9d9b0e9b 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -974,6 +974,8 @@ dnl Look for a host system's gdk-pixbuf-csource if we are cross-compiling
- 
- AM_CONDITIONAL(CROSS_COMPILING, test $cross_compiling = yes)
- 
-+AC_PATH_PROG(GTK_UPDATE_ICON_CACHE, [gtk-update-icon-cache], [no])
-+
- ########################################
- # Windowing system checks
- ########################################
-diff --git a/demos/gtk-demo/Makefile.am b/demos/gtk-demo/Makefile.am
-index 4a2f827469..369ba5d3cc 100644
---- a/demos/gtk-demo/Makefile.am
-+++ b/demos/gtk-demo/Makefile.am
-@@ -174,7 +174,7 @@ dist_appsicon32_DATA = data/32x32/gtk3-demo.png data/32x32/gtk3-demo-symbolic.sy
- dist_appsicon48_DATA = data/48x48/gtk3-demo.png data/48x48/gtk3-demo-symbolic.symbolic.png
- dist_appsicon256_DATA = data/256x256/gtk3-demo.png data/256x256/gtk3-demo-symbolic.symbolic.png
- 
--update_icon_cache = $(top_builddir)/gtk/gtk-update-icon-cache$(EXEEXT) --ignore-theme-index --force
-+update_icon_cache = $(GTK_UPDATE_ICON_CACHE) --ignore-theme-index --force
- 
- install-data-hook: install-update-icon-cache
- uninstall-hook: uninstall-update-icon-cache
-diff --git a/demos/widget-factory/Makefile.am b/demos/widget-factory/Makefile.am
-index c33a6d0a95..291f389f53 100644
---- a/demos/widget-factory/Makefile.am
-+++ b/demos/widget-factory/Makefile.am
-@@ -47,7 +47,7 @@ dist_appsicon32_DATA = data/32x32/gtk3-widget-factory.png data/32x32/gtk3-widget
- dist_appsicon48_DATA = data/48x48/gtk3-widget-factory.png data/48x48/gtk3-widget-factory-symbolic.symbolic.png
- dist_appsicon256_DATA = data/256x256/gtk3-widget-factory.png data/256x256/gtk3-widget-factory-symbolic.symbolic.png
- 
--update_icon_cache = $(top_builddir)/gtk/gtk-update-icon-cache$(EXEEXT) --ignore-theme-index --force
-+update_icon_cache = $(GTK_UPDATE_ICON_CACHE) --ignore-theme-index --force
- 
- install-data-hook: install-update-icon-cache
- uninstall-hook: uninstall-update-icon-cache
-diff --git a/docs/reference/gtk/Makefile.am b/docs/reference/gtk/Makefile.am
-index dc9b80c6c5..bcaa4032c9 100644
---- a/docs/reference/gtk/Makefile.am
-+++ b/docs/reference/gtk/Makefile.am
-@@ -502,7 +502,6 @@ EXTRA_DIST += version.xml.in gtk3.types.in getting_started.xml.in
- 
- man_MANS = 				\
- 	gtk-query-immodules-3.0.1	\
--	gtk-update-icon-cache.1		\
- 	gtk-encode-symbolic-svg.1	\
- 	gtk-launch.1			\
- 	gtk3-demo.1			\
-diff --git a/gtk/Makefile.am b/gtk/Makefile.am
-index 9608ab3355..74792a4b40 100644
---- a/gtk/Makefile.am
-+++ b/gtk/Makefile.am
-@@ -1658,7 +1658,6 @@ endif
- #
- bin_PROGRAMS = \
- 	gtk-query-immodules-3.0	\
--	gtk-update-icon-cache \
- 	gtk-encode-symbolic-svg \
- 	gtk-builder-tool \
- 	gtk-query-settings \
-@@ -1671,9 +1670,6 @@ gtk_query_immodules_3_0_LDADD = 		\
- 	$(GMODULE_LIBS)				\
- 	$(GTK_DEP_LIBS)
- 
--gtk_update_icon_cache_SOURCES = updateiconcache.c
--gtk_update_icon_cache_LDADD = $(GDK_PIXBUF_LIBS)
--
- gtk_encode_symbolic_svg_SOURCES = encodesymbolic.c
- gtk_encode_symbolic_svg_LDADD =			\
- 	$(GDK_PIXBUF_LIBS)			\
-@@ -1698,29 +1694,6 @@ gtk_launch_LDADD =				\
- 	$(top_builddir)/gdk/libgdk-3.la		\
- 	$(GTK_DEP_LIBS)
- 
--if OS_WIN32
--
--# Workaround for UAC silliness: programs with "update" in their name
--# are believed to be installers and require elevated privileges to be
--# used... Embed a manifest file into executable to tell Windows that
--# gtk-update-icon-cache.exe doesn't require any special privileges.
--
--GTK_UPDATE_ICON_CACHE_MANIFEST = gtk-update-icon-cache.exe.manifest
--GTK_UPDATE_ICON_CACHE_RC = gtk-update-icon-cache.rc
--GTK_UPDATE_ICON_CACHE_MANIFEST_OBJECT = gtk-update-icon-cache_manifest.o
--
--$(GTK_UPDATE_ICON_CACHE_MANIFEST): Makefile generate-uac-manifest.py
--	$(PYTHON) $(srcdir)/generate-uac-manifest.py -p=gtk3 -n=gtk-update-icon-cache --pkg-version=$(GTK_VERSION) --output-dir=$(builddir)
--
--$(GTK_UPDATE_ICON_CACHE_RC): $(GTK_UPDATE_ICON_CACHE_MANIFEST)
--
--$(GTK_UPDATE_ICON_CACHE_MANIFEST_OBJECT): $(GTK_UPDATE_ICON_CACHE_RC) $(GTK_UPDATE_ICON_CACHE_MANIFEST)
--	$(WINDRES) --input $< --output $@ --output-format=coff
--
--gtk_update_icon_cache_LDADD += $(GTK_UPDATE_ICON_CACHE_MANIFEST_OBJECT)
--
--endif
--
- .PHONY: files
- 
- files:
--- 
-2.30.0
-
diff --git a/x11-libs/gtk+/files/gtk+-3.24.36-update-icon-cache.patch b/x11-libs/gtk+/files/gtk+-3.24.36-update-icon-cache.patch
deleted file mode 100644
index 19af75c3..00000000
--- a/x11-libs/gtk+/files/gtk+-3.24.36-update-icon-cache.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/docs/reference/gtk/meson.build
-+++ b/docs/reference/gtk/meson.build
-@@ -500,7 +500,6 @@
- 
-   man_files = [
-     [ 'gtk-query-immodules-3.0', '1', ],
--    [ 'gtk-update-icon-cache', '1', ],
-     [ 'gtk-encode-symbolic-svg', '1', ],
-     [ 'gtk-launch', '1', ],
-     [ 'gtk-builder-tool', '1', ],
---- a/gtk/meson.build
-+++ b/gtk/meson.build
-@@ -1109,16 +1109,6 @@
-   extra_update_icon_cache_objs = import('windows').compile_resources(uac_rc)
- endif
- 
--gtk_update_icon_cache = executable(
--  'gtk-update-icon-cache',
--  'updateiconcache.c',
--  extra_update_icon_cache_objs,
--  c_args: gtk_cargs,
--  dependencies: libgtk_dep,
--  install: true
--)
--gtk_tools += gtk_update_icon_cache
--
- gtk_query_immodules = executable(
-   'gtk-query-immodules-3.0',
-   'queryimmodules.c',
diff --git a/x11-libs/gtk+/files/gtk+-atk-bridge-config.ac.patch b/x11-libs/gtk+/files/gtk+-atk-bridge-config.ac.patch
deleted file mode 100644
index 8388a744..00000000
--- a/x11-libs/gtk+/files/gtk+-atk-bridge-config.ac.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-configure.ac,v 1.2 2014/09/08 12:06:48 wiz Exp $
-
-Make gtk3-atk-bridge an option to avoid unwanted dbus dependency.
-
---- 1/configure.ac
-+++ 2/configure.ac
-@@ -1295,8 +1295,13 @@ AC_SUBST(GDK_DEP_CFLAGS)
- # Check for Accessibility Toolkit flags
- ########################################
- 
--if test x$enable_x11_backend = xyes; then
-+AC_ARG_WITH(atk-bridge,
-+           AS_HELP_STRING([--without-atk-bridge], [Do not use atk-bridge-2.0]),
-+           :, with_atk_bridge=yes)
-+
-+if test x$enable_x11_backend = xyes -a x$with_atk_bridge = xyes; then
-    ATK_PACKAGES="atk atk-bridge-2.0"
-+   AC_DEFINE([HAVE_ATK_BRIDGE], [1], [Define if we're using atk-bridge-2.0])
- else
-    ATK_PACKAGES="atk"
- fi
diff --git a/x11-libs/gtk+/files/gtk+-atk-bridge-config.h.in.patch b/x11-libs/gtk+/files/gtk+-atk-bridge-config.h.in.patch
deleted file mode 100644
index 6dee2e42..00000000
--- a/x11-libs/gtk+/files/gtk+-atk-bridge-config.h.in.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-config.h.in,v 1.2 2014/09/08 12:06:48 wiz Exp $
-
-Make gtk3-atk-bridge an option to avoid unwanted dbus dependency.
-
---- 1/config.h.in
-+++ 1/config.h.in
-@@ -21,6 +21,9 @@
- /* Define the location where the catalogs will be installed */
- #undef GTK_LOCALEDIR
- 
-+/* Define if we're using atk-bridge-2.0 */
-+#undef HAVE_ATK_BRIDGE
-+
- /* Define to 1 if you have the `bind_textdomain_codeset' function. */
- #undef HAVE_BIND_TEXTDOMAIN_CODESET
- 
diff --git a/x11-libs/gtk+/files/gtk+-atk-bridge-gtkaccessibility.patch b/x11-libs/gtk+/files/gtk+-atk-bridge-gtkaccessibility.patch
deleted file mode 100644
index 276d2d16..00000000
--- a/x11-libs/gtk+/files/gtk+-atk-bridge-gtkaccessibility.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Make gtk3-atk-bridge an option to avoid unwanted dbus dependency.
---- 1/gtk/a11y/gtkaccessibility.c
-+++ 1/gtk/a11y/gtkaccessibility.c
-@@ -38,8 +38,10 @@
- #include <gtk/gtkaccessible.h>
- 
- #ifdef GDK_WINDOWING_X11
-+#ifdef HAVE_ATK_BRIDGE
- #include <atk-bridge.h>
- #endif
-+#endif
- 
- static gboolean gail_focus_watcher      (GSignalInvocationHint *ihint,
-                                          guint                  n_param_values,
-@@ -983,8 +985,10 @@ _gtk_accessibility_init (void)
-   do_window_event_initialization ();
- 
- #ifdef GDK_WINDOWING_X11
-+#ifdef HAVE_ATK_BRIDGE
-   atk_bridge_adaptor_init (NULL, NULL);
- #endif
-+#endif
- 
-   atk_misc_instance = g_object_new (GTK_TYPE_MISC_IMPL, NULL);
- }
diff --git a/x11-libs/gtk+/files/gtk+-atk-bridge-meson.build.patch b/x11-libs/gtk+/files/gtk+-atk-bridge-meson.build.patch
deleted file mode 100644
index ba07be50..00000000
--- a/x11-libs/gtk+/files/gtk+-atk-bridge-meson.build.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Martin V\"ath <martin at mvath.de>
-
-Honor atk_bridge option
-
---- 1/meson.build
-+++ 2/meson.build
-@@ -564,7 +564,12 @@
-   xfixes_dep     = dependency('xfixes', required: false)
-   xcomposite_dep = dependency('xcomposite', required: false)
-   fontconfig_dep = dependency('fontconfig', fallback: ['fontconfig', 'fontconfig_dep'])
--  atkbridge_dep  = dependency('atk-bridge-2.0', version: at_spi2_atk_req)
-+
-+  atk_bridge_enabled = get_option('atk_bridge')
-+  if atk_bridge_enabled
-+    atkbridge_dep  = dependency('atk-bridge-2.0', version: at_spi2_atk_req)
-+    cdata.set('HAVE_ATK_BRIDGE', 1)
-+  endif
- 
-   backend_immodules += ['xim']
- 
-@@ -583,7 +588,9 @@
-     x11_pkgs += ['xdamage']
-   endif
- 
--  atk_pkgs += ['atk-bridge-2.0']
-+  if atk_bridge_enabled
-+    atk_pkgs += ['atk-bridge-2.0']
-+  endif
- 
-   cdata.set('HAVE_XDAMAGE', xdamage_dep.found() ? 1 : false)
-   cdata.set('HAVE_XCURSOR', xcursor_dep.found() ? 1 : false)
diff --git a/x11-libs/gtk+/files/gtk+-atk-bridge-meson_options.txt.patch b/x11-libs/gtk+/files/gtk+-atk-bridge-meson_options.txt.patch
deleted file mode 100644
index a746d4fa..00000000
--- a/x11-libs/gtk+/files/gtk+-atk-bridge-meson_options.txt.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Martin V\"ath <martin at mvath.de>
-
-Add atk_bridge option
-
---- 1/meson_options.txt
-+++ 2/meson_options.txt
-@@ -47,3 +47,7 @@
- # input modules
- option('builtin_immodules', type: 'string',
-        value: '', description: 'Build specified immodules into GTK so/DLL (comma-separated list), "all", "none" or "backend"')
-+
-+# Recommended dependencies
-+option('atk_bridge', type: 'boolean', value: true,
-+  description : 'Enable atk-bridge support')
diff --git a/x11-libs/gtk+/files/gtkrc b/x11-libs/gtk+/files/gtkrc
deleted file mode 100644
index 8d178343..00000000
--- a/x11-libs/gtk+/files/gtkrc
+++ /dev/null
@@ -1,39 +0,0 @@
-style "default"
-
-{
- font = "-*-lucida-medium-r-normal-*-*-100-*-*-*-*-*-*"
-}
-
-style "button" = "default"
-
-{ 
- bg[PRELIGHT] = { 0.7, 0.7, 0.9 }
-}
-
-style "treeitem"
-{
-bg[ACTIVE] = { 0.7, 0.7, 0.9 }
-}
-
-style "scrollbar" = "button" 
-{
- bg[ACTIVE] = {0.6, 0.6, 0.6 }
-}
-
-style "status" {
- bg[PRELIGHT] = { 0.3, 1.0, 0.3 }
-}
-
-style "gtk-tooltips" {
- bg[NORMAL] = "#ffff60"
-}
-
-class "GtkWidget" style "default" 
-class "GtkButton" style "button"
-class "GtkItem" style "button"
-class "GtkProgressBar" style "status"
-class "GtkScrollbar" style "scrollbar"
-class "GtkTreeItem" style "treeitem"
-widget "gtk-tooltips" style "gtk-tooltips"
-
-
diff --git a/x11-libs/gtk+/files/settings.ini b/x11-libs/gtk+/files/settings.ini
deleted file mode 100644
index a65c0a81..00000000
--- a/x11-libs/gtk+/files/settings.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[Settings]
-gtk-theme-name = Adwaita
-gtk-icon-theme-name = gnome
-gtk-cursor-theme-name = Adwaita
diff --git a/x11-libs/gtk+/gtk+-2.24.33-r3.ebuild b/x11-libs/gtk+/gtk+-2.24.33-r3.ebuild
deleted file mode 100644
index bc5a2a5d..00000000
--- a/x11-libs/gtk+/gtk+-2.24.33-r3.ebuild
+++ /dev/null
@@ -1,322 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors and Martin V\"ath
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-GNOME2_EAUTORECONF="yes"
-
-inherit flag-o-matic gnome2 multilib multilib-minimal readme.gentoo-r1 virtualx
-
-DESCRIPTION="Gimp ToolKit +"
-HOMEPAGE="https://www.gtk.org/"
-SRC_URI=${SRC_URI}
-
-LICENSE="LGPL-2+"
-SLOT="2"
-IUSE="adwaita-icon-theme aqua cups doc examples +introspection test vim-syntax xinerama"
-REQUIRED_USE="
-	xinerama? ( !aqua )
-"
-
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-# Upstream wants us to do their job:
-# https://bugzilla.gnome.org/show_bug.cgi?id=768663#c1
-RESTRICT="test"
-
-COMMON_DEPEND="
-	>=app-accessibility/at-spi2-core-2.46.0[introspection(+)?,${MULTILIB_USEDEP}]
-	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
-	>=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
-	virtual/libintl[${MULTILIB_USEDEP}]
-	>=x11-libs/cairo-1.12.14-r4:=[aqua?,svg(+),${MULTILIB_USEDEP}]
-	>=x11-libs/gdk-pixbuf-2.30.7:2[introspection?,${MULTILIB_USEDEP}]
-	>=x11-libs/pango-1.36.3[introspection?,${MULTILIB_USEDEP}]
-	x11-misc/shared-mime-info
-
-	cups? ( >=net-print/cups-1.7.1-r2:=[${MULTILIB_USEDEP}] )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.3:= )
-	!aqua? (
-		>=x11-libs/cairo-1.12.14-r4:=[aqua?,svg(+),X,${MULTILIB_USEDEP}]
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXcomposite-0.4.4-r1[${MULTILIB_USEDEP}]
-		>=x11-libs/libXcursor-1.1.14[${MULTILIB_USEDEP}]
-		>=x11-libs/libXdamage-1.1.4-r1[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
-		>=x11-libs/libXi-1.7.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXrandr-1.5[${MULTILIB_USEDEP}]
-		>=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
-		xinerama? ( >=x11-libs/libXinerama-1.1.3[${MULTILIB_USEDEP}] )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	!aqua? ( x11-base/xorg-proto )
-	test? (
-		media-fonts/font-cursor-misc
-		media-fonts/font-misc-misc
-		x11-themes/hicolor-icon-theme
-	)
-"
-
-# gtk+-2.24.8 breaks Alt key handling in <=x11-libs/vte-0.28.2:0
-# Add blocker against old gtk-builder-convert to be sure we maintain both
-# in sync.
-RDEPEND="${COMMON_DEPEND}
-	>=dev-util/gtk-update-icon-cache-2
-	adwaita-icon-theme? (
-		>=x11-themes/adwaita-icon-theme-3.14
-		x11-themes/gnome-themes-standard
-	)
-	!<dev-util/gtk-builder-convert-${PV}
-"
-# librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710
-PDEPEND="
-	adwaita-icon-theme? (
-		gnome-base/librsvg[${MULTILIB_USEDEP}]
-		x11-themes/gtk-engines-adwaita
-	)
-	vim-syntax? ( app-vim/gtk-syntax )
-"
-# docbook-4.1.2 and xsl required for man pages
-# docbook-4.3 required for gtk-doc
-BDEPEND="
-	doc? (
-		app-text/docbook-xml-dtd:4.1.2
-		app-text/docbook-xml-dtd:4.3
-		app-text/docbook-xsl-stylesheets
-		dev-libs/libxslt
-	)
-	dev-libs/gobject-introspection-common
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1.20
-	>=sys-devel/gettext-0.18.3
-	virtual/pkgconfig
-	examples? ( x11-libs/gdk-pixbuf )
-"
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="To make the gtk2 file chooser use 'current directory' mode by default,
-edit ~/.config/gtk-2.0/gtkfilechooser.ini to contain the following:
-[Filechooser Settings]
-StartupMode=cwd"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/gtk-query-immodules-2.0$(get_exeext)
-)
-
-PATCHES=(
-	# Fix tests running when building out of sources, bug #510596, upstream bug #730319
-	"${FILESDIR}"/${PN}-2.24.24-out-of-source.patch
-	# Rely on split gtk-update-icon-cache package, bug #528810
-	"${FILESDIR}"/${PN}-2.24.31-update-icon-cache.patch # requires eautoreconf
-	# Respect ${NM}, bug #725852
-	"${FILESDIR}"/${PN}-2.24.33-respect-NM.patch # requires eautoreconf
-	# Fix casts, bug #880617
-	"${FILESDIR}"/${PN}-2.24.33-Fix-casts.patch
-)
-
-strip_builddir() {
-	local rule=$1
-	shift
-	local directory=$1
-	shift
-	sed -e "s/^\(${rule} =.*\)${directory}\(.*\)$/\1\2/" -i $@ \
-		|| die "Could not strip director ${directory} from build."
-}
-
-set_gtk2_confdir() {
-	# An arch specific config directory is used on multilib systems
-	GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
-}
-
-src_prepare() {
-	# Various glib marshaller churn could break build against a different glib version, force regeneration
-	rm -v gdk/gdkmarshalers.{c,h} gtk/gtkmarshal.{c,h} gtk/gtkmarshalers.{c,h} \
-		perf/marshalers.{c,h} gtk/gtkaliasdef.c gtk/gtkalias.h || die
-
-	# Stop trying to build unmaintained docs, bug #349754, upstream bug #623150
-	strip_builddir SUBDIRS tutorial docs/Makefile.{am,in}
-	strip_builddir SUBDIRS faq docs/Makefile.{am,in}
-
-	# -O3 and company cause random crashes in applications, bug #133469
-	replace-flags -O3 -O2
-	strip-flags
-
-	if ! use test ; then
-		# don't waste time building tests
-		strip_builddir SRC_SUBDIRS tests Makefile.{am,in}
-		strip_builddir SUBDIRS tests gdk/Makefile.{am,in} gtk/Makefile.{am,in}
-	else
-		# Non-working test in gentoo's env
-		sed 's:\(g_test_add_func ("/ui-tests/keys-events.*\):/*\1*/:g' \
-			-i gtk/tests/testing.c || die "sed 1 failed"
-
-		# Cannot work because glib is too clever to find real user's home
-		# gentoo bug #285687, upstream bug #639832
-		# XXX: /!\ Pay extra attention to second sed when bumping /!\
-		sed '/TEST_PROGS.*recentmanager/d' -i gtk/tests/Makefile.am \
-			|| die "failed to disable recentmanager test (1)"
-		sed '/^TEST_PROGS =/,+3 s/recentmanager//' -i gtk/tests/Makefile.in \
-			|| die "failed to disable recentmanager test (2)"
-		sed 's:\({ "GtkFileChooserButton".*},\):/*\1*/:g' -i gtk/tests/object.c \
-			|| die "failed to disable recentmanager test (3)"
-
-		# https://bugzilla.gnome.org/show_bug.cgi?id=617473
-		sed -i -e 's:pltcheck.sh:$(NULL):g' \
-			gtk/Makefile.am || die
-
-		# UI tests require immodules already installed; bug #413185
-		if ! has_version 'x11-libs/gtk+:2'; then
-			ewarn "Disabling UI tests because this is the first install of"
-			ewarn "gtk+:2 on this machine. Please re-run the tests after ${P}"
-			ewarn "has been installed."
-			sed '/g_test_add_func.*ui-tests/ d' \
-				-i gtk/tests/testing.c || die "sed 2 failed"
-		fi
-	fi
-
-	if ! use examples; then
-		# don't waste time building demos
-		strip_builddir SRC_SUBDIRS demos Makefile.{am,in}
-	fi
-
-	gnome2_src_prepare
-}
-
-multilib_src_configure() {
-	[[ ${ABI} == ppc64 ]] && append-flags -mminimal-toc
-
-	if use doc
-	then	set -- --enable-man --with-xml-catalog="${EPREFIX}"/etc/xml/catalog
-	else	set --
-	fi
-	ECONF_SOURCE=${S} \
-	gnome2_src_configure \
-		$(usex aqua --with-gdktarget=quartz --with-gdktarget=x11) \
-		$(usex aqua "" --with-xinput) \
-		$(use_enable cups cups auto) \
-		$(multilib_native_use_enable introspection) \
-		$(use_enable xinerama) \
-		--disable-papi \
-		"$@" \
-		CUPS_CONFIG="${EPREFIX}/usr/bin/${CHOST}-cups-config"
-
-	# work-around gtk-doc out-of-source brokedness
-	if multilib_is_native_abi; then
-		local d
-		for d in gdk gtk libgail-util; do
-			ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die
-		done
-	fi
-}
-
-multilib_src_test() {
-	virtx emake check
-}
-
-multilib_src_install() {
-	gnome2_src_install
-}
-
-multilib_src_install_all() {
-	# see bug #133241
-	# Also set more default variables in sync with gtk3 and other distributions
-	insinto /usr/share/gtk-2.0
-	newins - gtkrc <<- 'EOF'
-	gtk-fallback-icon-theme = "gnome"
-	gtk-theme-name = "Adwaita"
-	gtk-icon-theme-name = "$(usex Adwaita gnome)"
-	gtk-cursor-theme-name = "Adwaita"
-	EOF
-
-	einstalldocs
-	rm "${ED}"/usr/share/doc/${P}/ChangeLog # empty file
-
-	# dev-util/gtk-builder-convert split off into a separate package, #402905
-	rm "${ED}"/usr/bin/gtk-builder-convert || die
-	if use doc ; then
-		rm "${ED}"/usr/share/man/man1/gtk-builder-convert.* || die
-	fi
-
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	gnome2_pkg_preinst
-
-	multilib_pkg_preinst() {
-		# Make immodules.cache belongs to gtk+ alone
-		local cache="/usr/$(get_libdir)/gtk-2.0/2.10.0/immodules.cache"
-
-		if [[ -e "${EROOT}${cache}" ]]; then
-			cp "${EROOT}${cache}" "${ED}${cache}" || die
-		else
-			touch "${ED}${cache}" || die
-		fi
-	}
-	multilib_parallel_foreach_abi multilib_pkg_preinst
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	multilib_pkg_postinst() {
-		gnome2_query_immodules_gtk2 \
-			|| die "Update immodules cache failed (for ${ABI})"
-	}
-	multilib_parallel_foreach_abi multilib_pkg_postinst
-
-	set_gtk2_confdir
-
-	if [ -e "${EROOT}/etc/gtk-2.0/gtk.immodules" ]; then
-		elog "File /etc/gtk-2.0/gtk.immodules has been moved to \$CHOST"
-		elog "aware location. Removing deprecated file."
-		rm -f "${EROOT}/etc/gtk-2.0/gtk.immodules"
-	fi
-
-	if [ -e "${EROOT}${GTK2_CONFDIR}/gtk.immodules" ]; then
-		elog "File /etc/gtk-2.0/gtk.immodules has been moved to"
-		elog "${EROOT}/usr/$(get_libdir)/gtk-2.0/2.10.0/immodules.cache"
-		elog "Removing deprecated file."
-		rm -f "${EROOT}${GTK2_CONFDIR}/gtk.immodules"
-	fi
-
-	# pixbufs are now handled by x11-libs/gdk-pixbuf
-	if [ -e "${EROOT}${GTK2_CONFDIR}/gdk-pixbuf.loaders" ]; then
-		elog "File ${EROOT}${GTK2_CONFDIR}/gdk-pixbuf.loaders is now handled by x11-libs/gdk-pixbuf"
-		elog "Removing deprecated file."
-		rm -f "${EROOT}${GTK2_CONFDIR}/gdk-pixbuf.loaders"
-	fi
-
-	# two checks needed since we dropped multilib conditional
-	if [ -e "${EROOT}/etc/gtk-2.0/gdk-pixbuf.loaders" ]; then
-		elog "File ${EROOT}/etc/gtk-2.0/gdk-pixbuf.loaders is now handled by x11-libs/gdk-pixbuf"
-		elog "Removing deprecated file."
-		rm -f "${EROOT}/etc/gtk-2.0/gdk-pixbuf.loaders"
-	fi
-
-	if [ -e "${EROOT}"/usr/lib/gtk-2.0/2.[^1]* ]; then
-		elog "You need to rebuild ebuilds that installed into" "${EROOT}"/usr/lib/gtk-2.0/2.[^1]*
-		elog "to do that you can use qfile from portage-utils:"
-		elog "emerge -va1 \$(qfile -qC ${EPREFIX}/usr/lib/gtk-2.0/2.[^1]*)"
-	fi
-
-	if ! has_version "app-text/evince"; then
-		elog "Please install app-text/evince for print preview functionality."
-		elog "Alternatively, check \"gtk-print-preview-command\" documentation and"
-		elog "add it to your gtkrc."
-	fi
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-
-	if [[ -z ${REPLACED_BY_VERSION} ]]; then
-		multilib_pkg_postrm() {
-			rm -f "${EROOT}/usr/$(get_libdir)/gtk-2.0/2.10.0/immodules.cache"
-		}
-		multilib_foreach_abi multilib_pkg_postrm
-	fi
-}
diff --git a/x11-libs/gtk+/gtk+-3.24.35.ebuild b/x11-libs/gtk+/gtk+-3.24.35.ebuild
deleted file mode 100644
index dbf41cdd..00000000
--- a/x11-libs/gtk+/gtk+-3.24.35.ebuild
+++ /dev/null
@@ -1,256 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors and Martin V\"ath
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-GNOME2_EAUTORECONF="yes"
-
-inherit gnome2 multilib multilib-minimal virtualx
-
-DESCRIPTION="Gimp ToolKit +"
-HOMEPAGE="https://www.gtk.org/"
-SRC_URI="${SRC_URI-}"
-
-LICENSE="LGPL-2+"
-SLOT="3"
-IUSE="adwaita-icon-theme aqua atk-bridge broadway colord cups examples gtk-doc +introspection sysprof test vim-syntax wayland +X xinerama"
-REQUIRED_USE="
-	|| ( aqua wayland X )
-	xinerama? ( X )
-"
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-# Upstream wants us to do their job:
-# https://bugzilla.gnome.org/show_bug.cgi?id=768662#c1
-RESTRICT="test"
-
-# FIXME: introspection data is built against system installation of gtk+:3,
-# bug #????
-COMMON_DEPEND="
-	atk-bridge? ( >=app-accessibility/at-spi2-core-2.46.0[introspection(+)?,${MULTILIB_USEDEP}] )
-	>=dev-libs/fribidi-0.19.7[${MULTILIB_USEDEP}]
-	>=dev-libs/glib-2.57.2:2[${MULTILIB_USEDEP}]
-	media-libs/fontconfig[${MULTILIB_USEDEP}]
-	>=media-libs/harfbuzz-2.2.0:=
-	>=media-libs/libepoxy-1.4[X(+)?,${MULTILIB_USEDEP}]
-	virtual/libintl[${MULTILIB_USEDEP}]
-	>=x11-libs/cairo-1.14[aqua?,glib,svg(+),X?,${MULTILIB_USEDEP}]
-	>=x11-libs/gdk-pixbuf-2.30:2[introspection?,${MULTILIB_USEDEP}]
-	>=x11-libs/pango-1.44.0[introspection?,${MULTILIB_USEDEP}]
-	x11-misc/shared-mime-info
-
-	colord? ( >=x11-misc/colord-0.1.9:0=[${MULTILIB_USEDEP}] )
-	cups? ( >=net-print/cups-2.0[${MULTILIB_USEDEP}] )
-	introspection? ( >=dev-libs/gobject-introspection-1.39:= )
-	sysprof? ( >=dev-util/sysprof-capture-3.33.2:3[${MULTILIB_USEDEP}] )
-	wayland? (
-		>=dev-libs/wayland-1.14.91[${MULTILIB_USEDEP}]
-		>=dev-libs/wayland-protocols-1.21
-		media-libs/mesa[wayland,${MULTILIB_USEDEP}]
-		>=x11-libs/libxkbcommon-0.2[${MULTILIB_USEDEP}]
-	)
-	X? (
-		media-libs/libglvnd[X(+),${MULTILIB_USEDEP}]
-		x11-libs/libX11[${MULTILIB_USEDEP}]
-		x11-libs/libXcomposite[${MULTILIB_USEDEP}]
-		x11-libs/libXcursor[${MULTILIB_USEDEP}]
-		x11-libs/libXdamage[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
-		x11-libs/libXfixes[${MULTILIB_USEDEP}]
-		>=x11-libs/libXi-1.8[${MULTILIB_USEDEP}]
-		>=x11-libs/libXrandr-1.5[${MULTILIB_USEDEP}]
-		xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	test? (
-		media-fonts/font-cursor-misc
-		media-fonts/font-misc-misc
-	)
-	X? ( x11-base/xorg-proto )
-"
-RDEPEND="${COMMON_DEPEND}
-	>=dev-util/gtk-update-icon-cache-3
-"
-# librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710
-PDEPEND="
-	adwaita-icon-theme? ( gnome-base/librsvg[${MULTILIB_USEDEP}]
-	  >=x11-themes/adwaita-icon-theme-3.14 )
-	!adwaita-icon-theme? ( x11-themes/hicolor-icon-theme virtual/freedesktop-icon-theme )
-	vim-syntax? ( app-vim/gtk-syntax )
-"
-BDEPEND="
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/docbook-xsl-stylesheets
-	dev-libs/gobject-introspection-common
-	dev-libs/libxslt
-	>=dev-util/gdbus-codegen-2.48
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1.20
-	wayland? ( dev-util/wayland-scanner )
-	>=sys-devel/gettext-0.19.7
-	virtual/pkgconfig
-	x11-libs/gdk-pixbuf:2
-	gtk-doc? (
-		app-text/docbook-xml-dtd:4.3
-		>=dev-util/gtk-doc-1.20
-	)
-"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/gtk-query-immodules-3.0$(get_exeext)
-)
-
-PATCHES=(
-	# gtk-update-icon-cache is installed by dev-util/gtk-update-icon-cache
-	"${FILESDIR}"/${PN}-3.24.25-update-icon-cache.patch
-
-	# Fix broken autotools logic
-	"${FILESDIR}"/${PN}-3.22.20-libcloudproviders-automagic.patch
-)
-
-strip_builddir() {
-	local rule=$1
-	shift
-	local directory=$1
-	shift
-	sed -e "s/^\(${rule} =.*\)${directory}\(.*\)$/\1\2/" -i $@ \
-		|| die "Could not strip director ${directory} from build."
-}
-
-src_prepare() {
-	if ! use test ; then
-		# don't waste time building tests
-		strip_builddir SRC_SUBDIRS testsuite Makefile.{am,in}
-
-		# the tests dir needs to be build now because since commit
-		# 7ff3c6df80185e165e3bf6aa31bd014d1f8bf224 tests/gtkgears.o needs to be there
-		# strip_builddir SRC_SUBDIRS tests Makefile.{am,in}
-	fi
-
-	if ! use examples; then
-		# don't waste time building demos
-		strip_builddir SRC_SUBDIRS demos Makefile.{am,in}
-		strip_builddir SRC_SUBDIRS examples Makefile.{am,in}
-	fi
-
-	# Use patches from BSD to make gtk3-atk-bridge a true option -
-	# This was intentionally removed by upstream, see
-	# https://mail.gnome.org/archives/commits-list/2012-June/msg03813.html
-	eapply "${FILESDIR}"/${PN}-atk-bridge-config.ac.patch
-	eapply "${FILESDIR}"/${PN}-atk-bridge-config.h.in.patch
-	eapply "${FILESDIR}"/${PN}-atk-bridge-gtkaccessibility.patch
-
-	eautoreconf
-	gnome2_src_prepare
-}
-
-multilib_src_configure() {
-	local myconf=(
-		$(use_enable aqua quartz-backend)
-		$(use_enable broadway broadway-backend)
-		$(use_enable colord)
-		$(use_enable cups cups auto)
-		$(multilib_native_use_enable gtk-doc)
-		$(multilib_native_use_enable introspection)
-		$(use_enable sysprof profiler)
-		$(use_enable wayland wayland-backend)
-		$(use_enable X x11-backend)
-		$(use_enable X xcomposite)
-		$(use_enable X xdamage)
-		$(use_enable X xfixes)
-		$(use_enable X xkb)
-		$(use_enable X xrandr)
-		$(use_enable xinerama)
-		$(use_with atk-bridge)
-		# cloudprovider is not packaged in Gentoo yet
-		--disable-cloudproviders
-		--disable-papi
-		--enable-man
-		--with-xml-catalog="${EPREFIX}"/etc/xml/catalog
-		# need libdir here to avoid a double slash in a path that libtool doesn't
-		# grok so well during install (// between $EPREFIX and usr ...)
-		# TODO: Is this still the case?
-		--libdir="${EPREFIX}"/usr/$(get_libdir)
-		CUPS_CONFIG="${EPREFIX}/usr/bin/${CHOST}-cups-config"
-	)
-
-	if use wayland; then
-		myconf+=(
-			# Include wayland immodule into gtk itself, to avoid problems like
-			# https://gitlab.gnome.org/GNOME/gnome-shell/issues/109 from a
-			# user overridden GTK_IM_MODULE envvar
-			--with-included-immodules=wayland
-		)
-	fi;
-
-	ECONF_SOURCE=${S} gnome2_src_configure "${myconf[@]}"
-
-	# work-around gtk-doc out-of-source brokedness
-	if multilib_is_native_abi; then
-		local d
-		for d in gdk gtk libgail-util; do
-			ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die
-		done
-	fi
-}
-
-multilib_src_test() {
-	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/gtk" || die
-	GSETTINGS_SCHEMA_DIR="${S}/gtk" virtx emake check
-}
-
-multilib_src_install() {
-	gnome2_src_install
-}
-
-multilib_src_install_all() {
-	insinto /etc/gtk-3.0
-	doins "${FILESDIR}"/settings.ini
-	# Skip README.{in,commits,win32} that would get installed by default
-	DOCS=( AUTHORS ChangeLog NEWS README )
-	einstalldocs
-}
-
-pkg_preinst() {
-	gnome2_pkg_preinst
-
-	multilib_pkg_preinst() {
-		# Make immodules.cache belongs to gtk+ alone
-		local cache="/usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache"
-
-		if [[ -e ${EROOT}${cache} ]]; then
-			cp "${EROOT}${cache}" "${ED}${cache}" || die
-		else
-			touch "${ED}${cache}" || die
-		fi
-	}
-	multilib_parallel_foreach_abi multilib_pkg_preinst
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	multilib_pkg_postinst() {
-		gnome2_query_immodules_gtk3 \
-			|| die "Update immodules cache failed (for ${ABI})"
-	}
-	multilib_parallel_foreach_abi multilib_pkg_postinst
-
-	if ! has_version "app-text/evince"; then
-		elog "Please install app-text/evince for print preview functionality."
-		elog "Alternatively, check \"gtk-print-preview-command\" documentation and"
-		elog "add it to your settings.ini file."
-	fi
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-
-	if [[ -z ${REPLACED_BY_VERSION} ]]; then
-		multilib_pkg_postrm() {
-			rm -f "${EROOT}/usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache"
-		}
-		multilib_foreach_abi multilib_pkg_postrm
-	fi
-}
diff --git a/x11-libs/gtk+/gtk+-3.24.38.ebuild b/x11-libs/gtk+/gtk+-3.24.38.ebuild
deleted file mode 100644
index 0afcff6e..00000000
--- a/x11-libs/gtk+/gtk+-3.24.38.ebuild
+++ /dev/null
@@ -1,197 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors and Martin V\"ath
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit gnome2 meson-multilib multilib virtualx
-
-DESCRIPTION="Gimp ToolKit +"
-HOMEPAGE="https://www.gtk.org/"
-SRC_URI="${SRC_URI-}"
-
-LICENSE="LGPL-2+"
-SLOT="3"
-IUSE="adwaita-icon-theme aqua atk-bridge broadway cloudproviders colord cups examples gtk-doc +introspection sysprof test vim-syntax wayland +X xinerama"
-REQUIRED_USE="
-	|| ( aqua wayland X )
-	test? ( X )
-	xinerama? ( X )
-"
-RESTRICT="!test? ( test )"
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-COMMON_DEPEND="
-	>=dev-libs/fribidi-0.19.7[${MULTILIB_USEDEP}]
-	>=dev-libs/glib-2.57.2:2[${MULTILIB_USEDEP}]
-	media-libs/fontconfig[${MULTILIB_USEDEP}]
-	>=media-libs/harfbuzz-2.2.0:=
-	>=media-libs/libepoxy-1.4[X(+)?,${MULTILIB_USEDEP}]
-	virtual/libintl[${MULTILIB_USEDEP}]
-	>=x11-libs/cairo-1.14[aqua?,glib,svg(+),X?,${MULTILIB_USEDEP}]
-	>=x11-libs/gdk-pixbuf-2.30:2[introspection?,${MULTILIB_USEDEP}]
-	>=x11-libs/pango-1.44.0[introspection?,${MULTILIB_USEDEP}]
-	x11-misc/shared-mime-info
-
-	cloudproviders? ( net-libs/libcloudproviders[${MULTILIB_USEDEP}] )
-	colord? ( >=x11-misc/colord-0.1.9:0=[${MULTILIB_USEDEP}] )
-	cups? ( >=net-print/cups-2.0[${MULTILIB_USEDEP}] )
-	introspection? ( >=dev-libs/gobject-introspection-1.39:= )
-	sysprof? ( >=dev-util/sysprof-capture-3.33.2:3[${MULTILIB_USEDEP}] )
-	wayland? (
-		>=dev-libs/wayland-1.14.91[${MULTILIB_USEDEP}]
-		>=dev-libs/wayland-protocols-1.21
-		media-libs/mesa[wayland,${MULTILIB_USEDEP}]
-		>=x11-libs/libxkbcommon-0.2[${MULTILIB_USEDEP}]
-	)
-	X? (
-		media-libs/libglvnd[X(+),${MULTILIB_USEDEP}]
-		x11-libs/libX11[${MULTILIB_USEDEP}]
-		x11-libs/libXcomposite[${MULTILIB_USEDEP}]
-		x11-libs/libXcursor[${MULTILIB_USEDEP}]
-		x11-libs/libXdamage[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
-		x11-libs/libXfixes[${MULTILIB_USEDEP}]
-		>=x11-libs/libXi-1.8[${MULTILIB_USEDEP}]
-		>=x11-libs/libXrandr-1.5[${MULTILIB_USEDEP}]
-		xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	>=app-accessibility/at-spi2-core-2.46.0[introspection?,${MULTILIB_USEDEP}]
-	test? (
-		media-fonts/font-cursor-misc
-		media-fonts/font-misc-misc
-	)
-	X? ( x11-base/xorg-proto )
-"
-RDEPEND="${COMMON_DEPEND}
-	atk-bridge? ( >=app-accessibility/at-spi2-core-2.46.0[introspection(+)?,${MULTILIB_USEDEP}] )
-	>=dev-util/gtk-update-icon-cache-3
-"
-# librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710
-PDEPEND="
-	adwaita-icon-theme? ( gnome-base/librsvg[${MULTILIB_USEDEP}]
-	  >=x11-themes/adwaita-icon-theme-3.14 )
-	!adwaita-icon-theme? ( x11-themes/hicolor-icon-theme virtual/freedesktop-icon-theme )
-	vim-syntax? ( app-vim/gtk-syntax )
-"
-BDEPEND="
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/docbook-xsl-stylesheets
-	dev-libs/gobject-introspection-common
-	dev-libs/libxslt
-	>=dev-util/gdbus-codegen-2.48
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1.20
-	wayland? ( dev-util/wayland-scanner )
-	>=sys-devel/gettext-0.19.7
-	virtual/pkgconfig
-	x11-libs/gdk-pixbuf:2
-	gtk-doc? (
-		app-text/docbook-xml-dtd:4.3
-		>=dev-util/gtk-doc-1.20
-	)
-"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/gtk-query-immodules-3.0$(get_exeext)
-)
-
-PATCHES=(
-	# gtk-update-icon-cache is installed by dev-util/gtk-update-icon-cache
-	"${FILESDIR}"/${PN}-3.24.36-update-icon-cache.patch
-	"${FILESDIR}"/${PN}-atk-bridge-meson.build.patch
-	"${FILESDIR}"/${PN}-atk-bridge-meson_options.txt.patch
-	"${FILESDIR}"/${PN}-atk-bridge-gtkaccessibility.patch
-)
-
-multilib_src_configure() {
-	local emesonargs=(
-		$(meson_use aqua quartz_backend)
-		$(meson_use atk-bridge atk_bridge)
-		$(meson_use broadway broadway_backend)
-		$(meson_use cloudproviders)
-		$(meson_use examples demos)
-		$(meson_use examples)
-		$(meson_native_use_bool gtk-doc gtk_doc)
-		$(meson_native_use_bool introspection)
-		$(meson_use sysprof profiler)
-		$(meson_use wayland wayland_backend)
-		$(meson_use X x11_backend)
-		-Dcolord=$(usex colord yes no)
-		-Dprint_backends=$(usex cups cups,file,lpr file,lpr)
-		-Dxinerama=$(usex xinerama yes no)
-		# Include backend immodules into gtk itself, to avoid problems like
-		# https://gitlab.gnome.org/GNOME/gnome-shell/issues/109 from a
-		# user overridden GTK_IM_MODULE envvar
-		-Dbuiltin_immodules=backend
-		-Dman=true
-		$(meson_use test tests)
-		-Dtracker3=false
-	)
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_test() {
-	virtx meson_src_test
-}
-
-multilib_src_install() {
-	meson_src_install
-}
-
-multilib_src_install_all() {
-	insinto /etc/gtk-3.0
-	doins "${FILESDIR}"/settings.ini
-	# Skip README.win32.md that would get installed by default
-	DOCS=( NEWS README.md )
-	einstalldocs
-}
-
-pkg_preinst() {
-	gnome2_pkg_preinst
-
-	multilib_pkg_preinst() {
-		# Make immodules.cache belongs to gtk+ alone
-		local cache="/usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache"
-
-		if [[ -e ${EROOT}${cache} ]]; then
-			cp "${EROOT}${cache}" "${ED}${cache}" || die
-		else
-			touch "${ED}${cache}" || die
-		fi
-	}
-	multilib_parallel_foreach_abi multilib_pkg_preinst
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	multilib_pkg_postinst() {
-		gnome2_query_immodules_gtk3 \
-			|| die "Update immodules cache failed (for ${ABI})"
-	}
-	multilib_parallel_foreach_abi multilib_pkg_postinst
-
-	if ! has_version "app-text/evince"; then
-		elog "Please install app-text/evince for print preview functionality."
-		elog "Alternatively, check \"gtk-print-preview-command\" documentation and"
-		elog "add it to your settings.ini file."
-	fi
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-
-	if [[ -z ${REPLACED_BY_VERSION} ]]; then
-		multilib_pkg_postrm() {
-			rm -f "${EROOT}/usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache"
-		}
-		multilib_foreach_abi multilib_pkg_postrm
-	fi
-}
diff --git a/x11-libs/gtk+/metadata.xml b/x11-libs/gtk+/metadata.xml
deleted file mode 100644
index 41ecd6d2..00000000
--- a/x11-libs/gtk+/metadata.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>martin@mvath.de</email>
-		<name>Martin Väth</name>
-		<description>maintainer of the updates in the mv overlay</description>
-	</maintainer>
-	<maintainer type="project">
-		<email>gnome@gentoo.org</email>
-		<name>Gentoo GNOME Desktop</name>
-	</maintainer>
-	<longdescription>
-		GTK+ is a multi-platform toolkit for creating graphical user
-		interfaces. Offering a complete set of widgets, GTK+ is suitable
-		for projects ranging from small one-off projects to complete
-		application suites.
-	</longdescription>
-	<use>
-		<flag name="adwaita-icon-theme">Force the adwaita-icon-theme</flag>
-		<flag name="atk-bridge">Enable the gtk3-atk-bridge, hard depending on app-accessibility/at-spi2-atk and thus on sys-apps/dbus</flag>
-		<flag name="broadway">Enable the GDK Broadway backend.</flag>
-		<flag name="colord">Use <pkg>x11-misc/colord</pkg> for color management
-			in printing</flag>
-		<flag name="sysprof">Enable profiling data capture support using
-			<pkg>dev-util/sysprof-capture</pkg></flag>
-	</use>
-	<upstream>
-		<remote-id type="cpe">cpe:/a:gtk:gtk%2B</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/x11-libs/motif/Manifest b/x11-libs/motif/Manifest
index 72c74a1b..95f7f2d0 100644
--- a/x11-libs/motif/Manifest
+++ b/x11-libs/motif/Manifest
@@ -1,2 +1,2 @@
-DIST motif-2.3.8-patches-2.tar.xz 4068 BLAKE2B 5466f824d71edd1d787eebe5b1fa09de5b52ffa20cdf733301722c4f1d7509af8084f226d68dcba14c2e8d15d5b1ea7d49e408eea8f710af3c0b27c86aba444c SHA512 27e10c2a5b3dec8597acb04940bb8e000fc43c325e5b6f578246ab4187ef34264940369bff1e9c999ba967e85e093434e16a447f1d4da805d0a5ab1576e5ef80
+DIST motif-2.3.8-patches-5.tar.xz 6156 BLAKE2B b8d1ac1f2bea3521c97b506ecb480ea92c64708376c1bd9c00b853109568527f82eb8f87bd50d78afe9e15a4c84aab51f32598a12b040f7d67ae0dee422c0366 SHA512 594b39ded4e932789baf906e5e7e3cc402f1940cba147b35ae43aba52f65522ba48a05f3193ed9f8ff5c03fed1b517bfde35b38c189e1e7169745c8b97a5d924
 DIST motif-2.3.8.tar.gz 5704328 BLAKE2B 3755b7f46e50240e1e9e7046aa439fa89872e54ae5d03860383f509b6d0f09edf85bd7d92ea4d37925efd2e44401028aa2752d940c42d9cccb652b2bd1d85459 SHA512 1ab8e8eece25ef97e948592b5fa3e19d98e932695290a18b7a8e90f1aa2766bc4f082bdbc3999dff5660e684821178a149040f76bb477163e53ca06474d02b55
diff --git a/x11-libs/motif/motif-2.3.8-r3.ebuild b/x11-libs/motif/motif-2.3.8-r5.ebuild
index f94d12e6..dd0b1582 100644
--- a/x11-libs/motif/motif-2.3.8-r3.ebuild
+++ b/x11-libs/motif/motif-2.3.8-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors and Martin V\"ath
+# Copyright 1999-2023 Gentoo Authors and Martin V\"ath
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -9,11 +9,11 @@ DESCRIPTION="The Motif user interface component toolkit"
 HOMEPAGE="https://sourceforge.net/projects/motif/
 	https://motif.ics.com/"
 SRC_URI="mirror://sourceforge/project/motif/Motif%20${PV}%20Source%20Code/${P}.tar.gz
-	https://dev.gentoo.org/~ulm/distfiles/${P}-patches-2.tar.xz"
+	https://dev.gentoo.org/~ulm/distfiles/${P}-patches-5.tar.xz"
 
 LICENSE="LGPL-2.1+ MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="examples jpeg +motif22-compatibility png static-libs unicode xft"
 
 RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
@@ -39,6 +39,9 @@ src_prepare() {
 	eapply ../patch
 	eapply_user
 
+	# remove files generated by flex #864533
+	rm tools/wml/{wmllex,wmluiltok}.c || die
+
 	AT_M4DIR=. eautoreconf
 
 	# get around some LANG problems in make (#15119)