gentoo auto-resync : 13:08:2024 - 11:06:03

11 files changed, 145 insertions, 304 deletions

diff --git a/gui-libs/Manifest.gz b/gui-libs/Manifest.gz
index ccd8ff89a6db..0ce542a6045b 100644
--- a/gui-libs/Manifest.gz
+++ b/gui-libs/Manifest.gz
diff --git a/gui-libs/egl-gbm/Manifest b/gui-libs/egl-gbm/Manifest
index e892bc0d1659..dbed73b0dba3 100644
--- a/gui-libs/egl-gbm/Manifest
+++ b/gui-libs/egl-gbm/Manifest
@@ -1,7 +1,5 @@
 AUX 15_nvidia_gbm.json 96 BLAKE2B ed3c97a8df4e80b969b479c46472143b81a986a9009d6cf9faed0bc99e59f977d0a9260204252151befe2d3454eac05c584776464d86aae263040f209df5ca8b SHA512 6a3e3bffb0f5352b4d8738f7b18003579664f69e062e2f50e5b8189f06a1161ee651d66e83dcb1b9338751908b4e410cbf9b98fc2e58c18269b66e3c2f2f3e34
 AUX egl-gbm-1.1.0-werror.patch 220 BLAKE2B c93b535d6f17ea35c39b61b8f655a1b9378b18260fcae319f22d94c28ec932557303d97b9e0b435006964ec5cc6a660e9e89b4823000893221dfe07a16efde39 SHA512 0c5eeea9eaaea637200314363da1cf1873a44b939287b27b0156cc05a99c274e311848ce6b69ce39df1fcf1b44deba5ec227d871db87a8785e7d0d27b447a066
-AUX egl-gbm-1.1.1-abi-check.patch 1049 BLAKE2B d26364ae3f93ac5de20c0a741314930db5c8880c37ed9e5e97f11e5f19bf2f1b613a1c87d593446bcfe98c030429d04d285c3137609fe328fb08e319cacd79ef SHA512 0ceea234cf4e7ccc457b45069a38e8c9240138f74d1d5012e64be736eac886d2648e628a039b45776b9a6e6fe9b9089f62f9a8e9ac3bc294abeeb380944923ce
-DIST egl-gbm-1.1.1.tar.gz 17888 BLAKE2B 65296a51623a77f10ef897b87c9cdbc9ef3cc721bded5289e9fa5e83f4cffbcdf7f7068480eeeaa9a9f7f958dbf04ebfe4b057fd252002117d597dac17d4451a SHA512 43650ec1681d9bdc9d8e559f5d9e38c1b09ceac6b3cec3b12ecf24d5f24d47cefaa87e50c3783dc491671d7bf85aa0a2da89ce09420cb716192356975c0d529a
-EBUILD egl-gbm-1.1.1-r2.ebuild 766 BLAKE2B 4317f3ed2d3e8ea53bb323f3f631eab87dac89b54009521b8891ea56699bbc04891abc8a6602dfff5f21b3cedd79c4db6d90b90ea5b2e0647873d21b18526027 SHA512 3aa1e009a28a01f155358d2cfedd1b133b32dfdf15e11038bc9ef319db2de005ad53a43c307348685c72079635e4f5d5ab994662de2795e7c97c0de9161e3b0a
-EBUILD egl-gbm-1.1.1.ebuild 712 BLAKE2B 834f11b9e05903c78326ed09b696b8e31c6093683d0ddad3129c5aa80cdad6338d2e1ed5a3a16a5265f401ff5411909173b845d98bc0dd488815a923df67e67e SHA512 94068e307d4d583afb60b7c720fde3ba14d70a38ef47143e925fbf1522a9db605c5213bbed042b75eaa394aa3b45b6ad6d121b733aed168fc72dd5c98f9bf174
+DIST egl-gbm-1.1.2.tar.gz 17897 BLAKE2B b13d1eba51bea5ebf388b6f12734e3e88dcbfd7ceb51be6ce2f7def2e06f5a676d6b148cd25a559466099a1a19a9a14c5f6fae30217879f2ef6cb63d82f75e6d SHA512 03e19ec9121c3a32469d6f9fb207286b0f8e2d728f2f1c501a5b470f40119b9df4f040d9eae3177b7529cfc1416797e80c54a33552d41dccb18c74133b50dc3c
+EBUILD egl-gbm-1.1.2.ebuild 730 BLAKE2B 8d3e672508965d25a82393767da89081a8fb7cde67399709aa7c8081af7b4c8e4654bc331d3a16a668558d82ca84b86a1217ec35874f24549fa8c055c24d6908 SHA512 341baf43ed194824270ec849caf27d44e9c15e4ca569ea2b604640a2e518061a142a5c940060cda4a1add3ffd217a79fd85420478280351190607eaf3708e656
 MISC metadata.xml 325 BLAKE2B b7fe17481f96e0fabd321b64090bc12c09ee61de8251531a0853c668b799522480f700fd2382e16bf6aa956c3aa6d3dd0ceff76a27355994b7517cbce7d25094 SHA512 8a3bdde2a17fcec7bbc55af10d33774e4fa648a88949b06ea9f5c7c8c83b2a05c67a3a8cdfcff44eac757639184b790b17b55a574d449cd0a5186b7a5414e5df
diff --git a/gui-libs/egl-gbm/egl-gbm-1.1.1.ebuild b/gui-libs/egl-gbm/egl-gbm-1.1.1.ebuild
deleted file mode 100644
index e6486609a809..000000000000
--- a/gui-libs/egl-gbm/egl-gbm-1.1.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson
-
-DESCRIPTION="GBM EGL external platform library"
-HOMEPAGE="https://github.com/NVIDIA/egl-gbm/"
-SRC_URI="https://github.com/NVIDIA/egl-gbm/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-
-RDEPEND="
-	media-libs/mesa[gbm(+)]
-	x11-libs/libdrm
-	!<x11-drivers/nvidia-drivers-495.46-r20[wayland(-)]
-"
-DEPEND="
-	${RDEPEND}
-	gui-libs/eglexternalplatform
-	media-libs/libglvnd
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.1.0-werror.patch
-)
-
-src_install() {
-	meson_src_install
-
-	insinto /usr/share/egl/egl_external_platform.d
-	doins "${FILESDIR}"/15_nvidia_gbm.json
-}
diff --git a/gui-libs/egl-gbm/egl-gbm-1.1.1-r2.ebuild b/gui-libs/egl-gbm/egl-gbm-1.1.2.ebuild
index e24fa8e90dfd..2309eed1d1df 100644
--- a/gui-libs/egl-gbm/egl-gbm-1.1.1-r2.ebuild
+++ b/gui-libs/egl-gbm/egl-gbm-1.1.2.ebuild
@@ -28,7 +28,6 @@ DEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.1.0-werror.patch
-	"${FILESDIR}"/${P}-abi-check.patch
 )
 
 src_install() {
diff --git a/gui-libs/egl-gbm/files/egl-gbm-1.1.1-abi-check.patch b/gui-libs/egl-gbm/files/egl-gbm-1.1.1-abi-check.patch
deleted file mode 100644
index 8d46edb71b0f..000000000000
--- a/gui-libs/egl-gbm/files/egl-gbm-1.1.1-abi-check.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Backport required to function properly with >=nvidia-drivers-560,
-but no release with this change has been made yet.
-
-https://github.com/NVIDIA/egl-gbm/commit/1352ca845fb78b28e3a097586abee2bcf2dbafb8
-From: Kyle Brenneman <kbrenneman@nvidia.com>
-Date: Fri, 12 Apr 2024 09:10:23 -0600
-Subject: [PATCH] Fix the ABI version check.
-
-The EGL_EXTERNAL_PLATFORM_VERSION_CHECK macro checks whether the given
-version is older than EGL_EXTERNAL_PLATFORM_VERSION_MAJOR/MINOR, not
-newer.
-
-That's correct for using it in EGL_EXTERNAL_PLATFORM_HAS, since it'll
-check whether the build-time version supports a given feature, but it's
-wrong for checking the ABI version that the driver reports.
-
-Instead, use EGL_EXTERNAL_PLATFORM_VERSION_CMP.
---- a/src/gbm-platform.c
-+++ b/src/gbm-platform.c
-@@ -167,5 +167,6 @@
- {
-     if (!platform ||
--        !EGL_EXTERNAL_PLATFORM_VERSION_CHECK(major, minor)) {
-+        !EGL_EXTERNAL_PLATFORM_VERSION_CMP(major, minor,
-+            GBM_EXTERNAL_VERSION_MAJOR, GBM_EXTERNAL_VERSION_MINOR)) {
-         return EGL_FALSE;
-     }
diff --git a/gui-libs/gtk/Manifest b/gui-libs/gtk/Manifest
index 9cb119874f51..b8f5d502694c 100644
--- a/gui-libs/gtk/Manifest
+++ b/gui-libs/gtk/Manifest
@@ -1,9 +1,9 @@
 AUX 0001-gdk-add-a-poison-macro-to-hide-GDK_WINDOWING_.patch 2632 BLAKE2B 407b112917f7925fc0f86e0dfb359ad9810cfcf766219985408b4b86081f776aa3776275fab09d272c0b9843937c3243851ebb260080ee0f2bbbff734f8114c6 SHA512 612a2632b6083ebdbb4500eef3e3781138e6f8dafbbd4356bbe10a37fe496850a371ffa72943197db789005bda5f7982596987a5ef511afd2269540f113785bd
+AUX 6510b876d1cb5428db4822974cdebfed209692b0.patch 4322 BLAKE2B 22c556b97cf4c588ef1a7b4852501b6a183ca5a02d3103e0984071d5be5a8c3288da2ee0da24ee401274679500eb504eca7a66fd5a00478ccf1d5ae01a57ad2a SHA512 7b2f251869ff22814d26385160590f5157038df2dac41089db35f91371db7b504240d954b9472909f548ef38754510c05d8f43eb704327faefd73e9c8e9cb5d0
 DIST gtk-4.12.5.tar.xz 17314760 BLAKE2B ce6a88d2c3ecfa2a9773682645ff00a61fd932b9a6de764794ef8abd10c5c75df386801143c32d10fec110029e997a16c4cdcb0ef050905562c6dd9fdc46039d SHA512 813758f4fe23b99b2ea1cf22156b86b22df30024717ae3b30bbe36111f9b1363bbd4da5fe8e5f69268c43794ea165e12c1c5bc52fd64bcbb1f9ccd3121540ac4
 DIST gtk-4.14.3.tar.xz 18340444 BLAKE2B 20238e061c6500a8b253617010ac017e84ec2cacd9f10a7d2e982e9d72b72d78ee46abb3eb836d853d1d10736c697fc7468b2700b16ce5477a34400e8758e2b8 SHA512 2502fff3e98cb45f2293c94d86c32ff9b7c88d72eb7500a19fc9e589e1eda69af94c4eae78c044dcf5cf345cb99537d264250115d633034d9552cadc67f71e8e
 DIST gtk-4.14.4.tar.xz 18306548 BLAKE2B 352831cb6373488593831e0d3489d425ca19b2b6c5541e269e251bb4f0455b435d73d24befef441fe09537838446eb773f33cbca746a9aeeed2204c413535ac0 SHA512 33a983f4ebac9088eaf9d3794a171d1619632bbcb27d9f46d894305dc15f83615a18443598b3c62a553b9596438b58226560ba17c41e539c76c3ee8a2b62c651
-EBUILD gtk-4.12.5-r1.ebuild 5983 BLAKE2B a544726ecd1c05419ac336a1799849a49b2c621e1478c9cf176efa84d730eba7df268c5f300e56040da69b86b6e92e26d2870c3f13a78b4d698e8c47dda189a4 SHA512 c0a3642fa84613bbf1b5c4a627e29435f0b26f35f9661524b2ead95586318bb8903bbcd7b6cb02efa0d8aaba2c280d6afab2d3eae0dc24160d5345efaafecb2e
-EBUILD gtk-4.12.5-r2.ebuild 6279 BLAKE2B 676ed7da195dca42ce44845fc70f0a341eeb6de60d5e2e8e9fb4046bed6baf643ac0d9c2fe945a382a40c4bb5bc6eacc0dca37135f1921fc06e5cdcd22fbd8a3 SHA512 84d79f6ce83804b577918c18accd279bac570b3a67e6d20d54f25b063d67c59281bc23b484a3eb745df64470ad89da660e525d74f8a80986ab6ccd20dffe4e07
+EBUILD gtk-4.12.5-r2.ebuild 6412 BLAKE2B daecf847b2cafd04bb74422e51dcb61f2dc8ffcfcdeb558f69596f61c4e26c46e93370fede65d5672ddc25235cf3306e719042452c2b6b83dc9e57f67c991fe2 SHA512 586d21fb12527f41737a079c46e6af195ea3640aaaa65868c0a2b5473ef548b484c631d724e8912916b029228c6910db38083556cacda08a7e1590125f9d6b74
 EBUILD gtk-4.14.3-r1.ebuild 6779 BLAKE2B 167dca7c56b9a402a856cafa8b2f01a7a699edc7dfa07d12f06bdbe0ce68adc11b675bcb7dc8abd48476e8098131f27df379ea94ddcbca44b8da02ef15f53625 SHA512 7075b8d36f6446de6c89cdc2367bb4178c21244eb9444c211f72241a06ace7a8c4c1a0734ad557722ae2dbce2e29c0ffec9b7d9b5eca2e23978c4979168df7b6
 EBUILD gtk-4.14.4-r1.ebuild 6779 BLAKE2B 167dca7c56b9a402a856cafa8b2f01a7a699edc7dfa07d12f06bdbe0ce68adc11b675bcb7dc8abd48476e8098131f27df379ea94ddcbca44b8da02ef15f53625 SHA512 7075b8d36f6446de6c89cdc2367bb4178c21244eb9444c211f72241a06ace7a8c4c1a0734ad557722ae2dbce2e29c0ffec9b7d9b5eca2e23978c4979168df7b6
 MISC metadata.xml 775 BLAKE2B a679a63b050be837319131924b4196dc7fdd2a1dcbca4b099eebc8550db3120dc8afe2b743acd68ce386fda7e4bd3af1eb2eb11d333542e1dbcc8b8a68c6c919 SHA512 15d8dc9c2701575b59d596cc10b1ca18691d10c3a418989eece698650e82a34720bea9d53a4ca4aa83745ce5d254cec5438f1ab10093ab2f765e77d0c9c24433
diff --git a/gui-libs/gtk/files/6510b876d1cb5428db4822974cdebfed209692b0.patch b/gui-libs/gtk/files/6510b876d1cb5428db4822974cdebfed209692b0.patch
new file mode 100644
index 000000000000..0ff0398ab0c8
--- /dev/null
+++ b/gui-libs/gtk/files/6510b876d1cb5428db4822974cdebfed209692b0.patch
@@ -0,0 +1,134 @@
+From 6510b876d1cb5428db4822974cdebfed209692b0 Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <mclasen@redhat.com>
+Date: Tue, 9 Apr 2024 21:01:26 -0400
+Subject: [PATCH] build: Add a missing dependency
+
+Add the generated gdk headers to the sources for all the backends,
+to guarantee that they are generated before the library is used.
+
+Fixes: #6618
+---
+ gdk/broadway/meson.build |  3 +--
+ gdk/macos/meson.build    |  2 +-
+ gdk/meson.build          | 12 +++++++++---
+ gdk/wayland/meson.build  |  7 +------
+ gdk/win32/meson.build    |  2 +-
+ gdk/x11/meson.build      |  7 +------
+ 6 files changed, 14 insertions(+), 19 deletions(-)
+
+diff --git a/gdk/broadway/meson.build b/gdk/broadway/meson.build
+index ef7fa0ef589..f0a77b37c2d 100644
+--- a/gdk/broadway/meson.build
++++ b/gdk/broadway/meson.build
+@@ -52,8 +52,7 @@ broadwayjs_h = custom_target('broadwayjs.h',
+ )
+ 
+ libgdk_broadway = static_library('gdk-broadway',
+-  clienthtml_h, broadwayjs_h,
+-  gdk_broadway_sources, gdkconfig, gdkenum_h,
++  sources: [ clienthtml_h, broadwayjs_h, gdk_broadway_sources, gdk_gen_headers ],
+   include_directories: [confinc, gdkinc],
+   c_args: [
+     '-DGTK_COMPILATION',
+diff --git a/gdk/macos/meson.build b/gdk/macos/meson.build
+index b3baefb898e..d80334b8946 100644
+--- a/gdk/macos/meson.build
++++ b/gdk/macos/meson.build
+@@ -61,7 +61,7 @@ gdk_macos_deps = [
+ libgdk_c_args += ['-xobjective-c']
+ 
+ libgdk_macos = static_library('gdk-macos',
+-  gdk_macos_sources, gdkconfig, gdkenum_h,
++  sources: [ gdk_macos_sources, gdk_gen_headers ],
+   include_directories: [ confinc, gdkinc, ],
+   c_args: [ libgdk_c_args, common_cflags, ],
+   link_with: [],
+diff --git a/gdk/meson.build b/gdk/meson.build
+index 9c0a36e19ec..62e80ea6c44 100644
+--- a/gdk/meson.build
++++ b/gdk/meson.build
+@@ -202,7 +202,13 @@ gdkwayland_inc = include_directories('wayland')
+ wlinc = include_directories('.')
+ win32rcinc = include_directories('win32/rc')
+ 
+-gdk_gen_headers = [gdkenum_h, gdkmarshal_h, gdkconfig, gdkversionmacros_h, gdk_visibility_h]
++gdk_gen_headers = [
++  gdkenum_h,
++  gdkmarshal_h,
++  gdkconfig,
++  gdkversionmacros_h,
++  gdk_visibility_h,
++]
+ 
+ gdk_deps = [
+   libm,
+@@ -278,7 +284,7 @@ if gdk_backends.length() == 0
+ endif
+ 
+ libgdk = static_library('gdk',
+-  sources: [gdk_sources, gdk_backends_gen_headers, gdkconfig],
++  sources: [gdk_sources, gdk_backends_gen_headers, gdk_gen_headers],
+   dependencies: gdk_deps + [libgtk_css_dep],
+   link_with: [libgtk_css],
+   include_directories: [confinc, gdkx11_inc, wlinc],
+@@ -290,7 +296,7 @@ libgdk = static_library('gdk',
+ # list the dependencies and generated headers and such, for use in the
+ # "public" libgtk_dep used by internal executables.
+ libgdk_dep = declare_dependency(
+-  sources: ['gdk.h', gdkconfig, gdkenum_h],
++  sources: ['gdk.h', gdk_gen_headers],
+   include_directories: [confinc, gdkx11_inc, wlinc],
+   dependencies: gdk_deps + [libgtk_css_dep],
+ )
+diff --git a/gdk/wayland/meson.build b/gdk/wayland/meson.build
+index 00e584a1053..e7c1ac34103 100644
+--- a/gdk/wayland/meson.build
++++ b/gdk/wayland/meson.build
+@@ -117,12 +117,7 @@ foreach p: proto_sources
+ endforeach
+ 
+ libgdk_wayland = static_library('gdk-wayland',
+-  sources: [
+-    gdk_wayland_sources,
+-    gdk_wayland_gen_headers,
+-    gdkconfig,
+-    gdkenum_h,
+-  ],
++  sources: [ gdk_wayland_sources, gdk_wayland_gen_headers, gdk_gen_headers ],
+   include_directories: [ confinc, gdkinc, ],
+   c_args: [
+     '-DGTK_COMPILATION',
+diff --git a/gdk/win32/meson.build b/gdk/win32/meson.build
+index 3dc16aabb6c..cc56a15d95a 100644
+--- a/gdk/win32/meson.build
++++ b/gdk/win32/meson.build
+@@ -64,7 +64,7 @@ gdk_win32_deps = [
+ ]
+ 
+ libgdk_win32 = static_library('gdk-win32',
+-  gdk_win32_sources, gdkconfig, gdkenum_h,
++  sources: [ gdk_win32_sources, gdk_gen_headers ],
+   include_directories: [ confinc, gdkinc ],
+   c_args: [
+     '-DGTK_COMPILATION',
+diff --git a/gdk/x11/meson.build b/gdk/x11/meson.build
+index 013d8b1d00c..c9aa5383ab1 100644
+--- a/gdk/x11/meson.build
++++ b/gdk/x11/meson.build
+@@ -73,12 +73,7 @@ gdk_x11_deps = [
+ ]
+ 
+ libgdk_x11 = static_library('gdk-x11',
+-  sources: [
+-    gdkmarshal_h,
+-    gdkenum_h,
+-    gdkconfig,
+-    gdk_x11_sources,
+-  ],
++  sources: [ gdk_gen_headers, gdk_x11_sources ],
+   include_directories: [ confinc, gdkinc, ],
+   c_args: [
+     '-DGTK_COMPILATION',
+-- 
+GitLab
+
diff --git a/gui-libs/gtk/gtk-4.12.5-r1.ebuild b/gui-libs/gtk/gtk-4.12.5-r1.ebuild
deleted file mode 100644
index cd5ffd7bad88..000000000000
--- a/gui-libs/gtk/gtk-4.12.5-r1.ebuild
+++ /dev/null
@@ -1,232 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{10..12} )
-inherit gnome.org gnome2-utils meson optfeature python-any-r1 toolchain-funcs virtualx xdg
-
-DESCRIPTION="GTK is a multi-platform toolkit for creating graphical user interfaces"
-HOMEPAGE="https://www.gtk.org/ https://gitlab.gnome.org/GNOME/gtk/"
-
-LICENSE="LGPL-2+"
-SLOT="4"
-IUSE="aqua broadway cloudproviders colord cups examples ffmpeg gstreamer +introspection sysprof test vulkan wayland +X cpu_flags_x86_f16c"
-REQUIRED_USE="
-	|| ( aqua wayland X )
-	test? ( introspection )
-"
-
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv sparc x86"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.76.0:2
-	>=x11-libs/cairo-1.17.6[aqua?,glib,svg(+),X?]
-	>=x11-libs/pango-1.50.0[introspection?]
-	>=dev-libs/fribidi-1.0.6
-	>=media-libs/harfbuzz-2.6.0:=
-	>=x11-libs/gdk-pixbuf-2.30:2[introspection?]
-	media-libs/libpng:=
-	media-libs/tiff:=
-	media-libs/libjpeg-turbo:=
-	>=media-libs/libepoxy-1.4[egl(+),X(+)?]
-	>=media-libs/graphene-1.10.0[introspection?]
-	app-text/iso-codes
-	x11-misc/shared-mime-info
-
-	cloudproviders? ( net-libs/libcloudproviders )
-	colord? ( >=x11-misc/colord-0.1.9:0= )
-	cups? ( >=net-print/cups-2.0 )
-	ffmpeg? ( media-video/ffmpeg:= )
-	gstreamer? (
-		>=media-libs/gst-plugins-bad-1.12.3:1.0
-		>=media-libs/gst-plugins-base-1.12.3:1.0[opengl]
-	)
-	introspection? ( >=dev-libs/gobject-introspection-1.76:= )
-	vulkan? ( media-libs/vulkan-loader:= )
-	wayland? (
-		>=dev-libs/wayland-1.21.0
-		>=dev-libs/wayland-protocols-1.31
-		media-libs/mesa[wayland]
-		>=x11-libs/libxkbcommon-0.2
-	)
-	X? (
-		>=app-accessibility/at-spi2-core-2.46.0
-		media-libs/fontconfig
-		media-libs/mesa[X(+)]
-		x11-libs/libX11
-		>=x11-libs/libXi-1.8
-		x11-libs/libXext
-		>=x11-libs/libXrandr-1.5
-		x11-libs/libXcursor
-		x11-libs/libXfixes
-		x11-libs/libXdamage
-		x11-libs/libXinerama
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 )
-	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="
-	gnome-base/librsvg
-	>=x11-themes/adwaita-icon-theme-3.14
-"
-BDEPEND="
-	dev-libs/gobject-introspection-common
-	introspection? (
-		${PYTHON_DEPS}
-		$(python_gen_any_dep '
-			dev-python/pygobject:3[${PYTHON_USEDEP}]
-		')
-	)
-	dev-python/docutils
-	dev-libs/glib
-	>=dev-util/gdbus-codegen-2.48
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.7
-	virtual/pkgconfig
-	vulkan? ( media-libs/shaderc )
-	wayland? (
-		dev-util/wayland-scanner
-	)
-	test? (
-		dev-libs/glib:2
-		media-fonts/cantarell
-		wayland? ( dev-libs/weston[headless] )
-	)
-"
-
-python_check_deps() {
-	python_has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return
-}
-
-pkg_setup() {
-	use introspection && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	xdg_environment_reset
-
-	# Nothing should use gtk4-update-icon-cache and an unversioned one is shipped by dev-util/gtk-update-icon-cache
-	sed -i \
-		-e '/gtk4-update-icon-cache/d' \
-		docs/reference/gtk/meson.build \
-		tools/meson.build \
-		|| die
-
-	# The border-image-excess-size.ui test is known to fail on big-endian platforms
-	# See https://gitlab.gnome.org/GNOME/gtk/-/issues/5904
-	if [[ $(tc-endian) == big ]]; then
-		sed -i \
-			-e "/border-image-excess-size.ui/d" \
-			-e "/^xfails =/a 'border-image-excess-size.ui'," \
-			testsuite/reftests/meson.build || die
-	fi
-}
-
-src_configure() {
-	local emesonargs=(
-		# GDK backends
-		$(meson_use X x11-backend)
-		$(meson_use wayland wayland-backend)
-		$(meson_use broadway broadway-backend)
-		-Dwin32-backend=false
-		$(meson_use aqua macos-backend)
-
-		# Media backends
-		$(meson_feature ffmpeg media-ffmpeg)
-		$(meson_feature gstreamer media-gstreamer)
-
-		# Print backends
-		-Dprint-cpdb=disabled
-		$(meson_feature cups print-cups)
-
-		# Optional dependencies
-		$(meson_feature vulkan)
-		$(meson_feature cloudproviders)
-		$(meson_feature sysprof)
-		-Dtracker=disabled  # tracker3 is not packaged in Gentoo yet
-		$(meson_feature colord)
-		# Expected to fail with GCC < 11
-		# See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=71993
-		$(meson_feature cpu_flags_x86_f16c f16c)
-
-		# Introspection
-		$(meson_feature introspection)
-
-		# Documentation
-		-Ddocumentation=false # we ship pregenerated API docs from tarball
-		-Dscreenshots=false
-		-Dman-pages=true
-
-		# Demos, examples, and tests
-		-Ddemo-profile=default
-		$(meson_use examples build-demos)
-		$(meson_use test build-testsuite)
-		$(meson_use examples build-examples)
-		-Dbuild-tests=false
-	)
-	meson_src_configure
-}
-
-src_test() {
-	"${BROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/gtk" || die
-
-	if use X; then
-		einfo "Running tests under X"
-		GSETTINGS_SCHEMA_DIR="${S}/gtk" virtx meson_src_test --setup=x11 --timeout-multiplier=130
-	fi
-
-	if use wayland; then
-		einfo "Running tests under Weston"
-
-		export XDG_RUNTIME_DIR="$(mktemp -p $(pwd) -d xdg-runtime-XXXXXX)"
-
-		weston --backend=headless-backend.so --socket=wayland-5 --idle-time=0 &
-		compositor=$!
-		export WAYLAND_DISPLAY=wayland-5
-
-		GSETTINGS_SCHEMA_DIR="${S}/gtk" meson_src_test --setup=wayland --timeout-multiplier=130
-
-		exit_code=$?
-		kill ${compositor}
-	fi
-}
-
-src_install() {
-	meson_src_install
-
-	insinto /usr/share/gtk-doc/html
-	# This will install API docs specific to X11 and wayland regardless of USE flags, but this is intentional
-	doins -r "${S}"/docs/reference/{gtk/gtk4,gsk/gsk4,gdk/gdk4{,-wayland,-x11}}
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-
-	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
-
-	if use examples ; then
-		optfeature "syntax highlighting in gtk4-demo" app-text/highlight
-	fi
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gui-libs/gtk/gtk-4.12.5-r2.ebuild b/gui-libs/gtk/gtk-4.12.5-r2.ebuild
index ded47b8e3d93..976e4ff77b5f 100644
--- a/gui-libs/gtk/gtk-4.12.5-r2.ebuild
+++ b/gui-libs/gtk/gtk-4.12.5-r2.ebuild
@@ -106,6 +106,8 @@ PATCHES=(
 	# such support.
 	# https://bugs.gentoo.org/624960
 	"${FILESDIR}"/0001-gdk-add-a-poison-macro-to-hide-GDK_WINDOWING_.patch
+	# backport patch to fix race conditions in building generated headers
+	"${FILESDIR}"/6510b876d1cb5428db4822974cdebfed209692b0.patch
 )
 
 python_check_deps() {
diff --git a/gui-libs/vte/Manifest b/gui-libs/vte/Manifest
index 3ab7dc520cf1..5bac3a2d527f 100644
--- a/gui-libs/vte/Manifest
+++ b/gui-libs/vte/Manifest
@@ -5,5 +5,5 @@ DIST vte-0.76.3-a11y-implement-GtkAccessibleText.patch.xz 9548 BLAKE2B 2c34f44cf
 DIST vte-0.76.3-command-notify.patch.xz 4336 BLAKE2B d3fd8eef9c3322af20ceac4678635edbb00159fa88147a897f655a5920c638da19fff10e08215a891df2cdd5721cd808b6041d84e74980a9f129e07de621526b SHA512 1c974ae97823659bee873036d656423255fae2b71baa4f4221b656055d69d55120f5cccfe3d9e514a64a2c5f87f94c1e4b47b4a2a233faf28ca06a959efe3e3b
 DIST vte-0.76.3.tar.xz 961684 BLAKE2B 066eaa2e35652481e9cf487084e522f55fdedfccf6435440d13d80523e64fd9969b7ee0a235c6a97c5c0531ddad6977bfc42ccb6915d52990965b1af9a63470e SHA512 59cf3241f59b7ce795098814a04816d150330e4464a2438c974ac03cfd6aa05e7e037121a6a21929d6b12eb17fb1a4bf48c936604f0e0b770e3f125adb5a4c50
 EBUILD vte-0.74.2.ebuild 3331 BLAKE2B 1107f756e3bb913459eb61e20234478c82e8ff5f342c4e2d71982863eea000100142e08bace13cd5f3dfacb14d656dfc8611d5bcdfc19d1e2673278c9c52afe2 SHA512 1159db76c0fd5cbe71c6a99fef69c36b1ce2e8185657205a003971be98c43c64ff505f9ced09e89b029d55472aa4f5f68f6ea2b632905a234d211552fe6292b4
-EBUILD vte-0.76.3.ebuild 3402 BLAKE2B 603d8a2fa302b0e41bd29fce25829712df981c266c170e0641cbcfb18f55b8fb2ce8da6c21b4f26ba948ea036ced396a622d193ca5a5814c8c6b43cb9085ecb7 SHA512 970f9e949dada674fc753f5c3a69c6e844731008224177d874d439a73da1993a2303429a7ec5b1a28b5537d5b2f5f7463344e51e7e5e6ae02eb1c2756cd47c0c
+EBUILD vte-0.76.3.ebuild 3505 BLAKE2B 3563c9fa3dceb44cf26727e06d5fb044b7613179135b36f381ff4b80861e233cd5d1fab39c7e87671546c6084f5a3150dd7df06f260aa89eadef091842e29d22 SHA512 066e6a4b9c0e00416b060975c3dbb7e4e5e315e7c6580897ba661ba1f08fc7ee9f6e1bded36ae4e7e22cea6ce858d79d7e14718a59ad192cbceaf476902292d6
 MISC metadata.xml 612 BLAKE2B 3243ec48375bf8e69a367e5d631cf84c0ba60b43d1f4a25c313a407bfb1c9826ddd1cd75784bc302e7d8998d1bedaac9d75c7f329255e605315d9f0bf6154a73 SHA512 0abc6f1deb0a7900b6b35620ad3dfa26a900445526cc6474f974ce5cca2dad65cb3f3c4e3b8a59540821a9922e2cafcc7011d705570e77d2a46c907f3962a73d
diff --git a/gui-libs/vte/vte-0.76.3.ebuild b/gui-libs/vte/vte-0.76.3.ebuild
index 1d0866faf17d..32ba40bcda9b 100644
--- a/gui-libs/vte/vte-0.76.3.ebuild
+++ b/gui-libs/vte/vte-0.76.3.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 PYTHON_COMPAT=( python3_{10..13} )
 
-inherit gnome.org meson python-any-r1 vala xdg
+inherit flag-o-matic gnome.org meson python-any-r1 vala xdg
 
 DESCRIPTION="Library providing a virtual terminal emulator widget"
 HOMEPAGE="https://gitlab.gnome.org/GNOME/vte/"
@@ -74,6 +74,9 @@ src_prepare() {
 }
 
 src_configure() {
+	# Upstream don't support LTO & error out on it in meson.build (bug #926156)
+	filter-lto
+
 	local emesonargs=(
 		-Da11y=true
 		$(meson_use debug)