gentoo resync : 29.12.2022

8 files changed, 14 insertions, 307 deletions

diff --git a/gnome-base/gnome-desktop/Manifest b/gnome-base/gnome-desktop/Manifest
index 37502d08b2bb..a43fab730be1 100644
--- a/gnome-base/gnome-desktop/Manifest
+++ b/gnome-base/gnome-desktop/Manifest
@@ -1,12 +1,8 @@
-AUX 3.32.2-optional-introspection.patch 1376 BLAKE2B de57d769aab0cdc6a7fda25c0265f34d5d0fd555ae60a519273512021cf4f065db1e22ab72ce9004a914a47d077551b5a12ffbd5e81a9b8cf098a4762a0e461d SHA512 ea76e41aff067281497b98c86b66d8c382124ceead5b18e729342615a50b6aa3401f4d7c5553023b5d78ca0ea02823c7d6026ba9acca862804351269e4107d18
 AUX 42.0-meson-Add-optionality-for-introspection.patch 3275 BLAKE2B f3629eab79b830397646ea855991daf5d61a9bb992262deb452e32a19e1564be20f98dfa49f8b08f6ca6a36b69fe44e46bee16b23533a27d089b77e2ae524a07 SHA512 9982e691e080dfa03c5ee6038b9a3a0e47521272240082d0da1ebf00c75f958d60c5d764ebae580415489e39b18ee77bb0c99587d32b4575ae0495fc88793c83
-AUX 42.0-meson-Fix-build_gtk4-option.patch 4432 BLAKE2B 38d648ca67079db2f552b3af0e76ea928c15e1fc44e5b569992ffd3b469047659e9c681a3933f91d4bf7065c4465a95db8fac2c2891f8bbc8b09d9c239d6057d SHA512 d7f6d3cad1986bcc3d9c5013c870fa2e6d42d3b27648b4375e23dc2cb0a6d53c1a6b085fe2d009566938f4bff68773b1d61784abdf47667f85b01fc485a08e19
-DIST gnome-desktop-41.3.tar.xz 732804 BLAKE2B 40a88ba4454455f85a46676d4b2f37159617f7eae9d0f5e1a27c3f0ed1e44953ae9475e81558b7cce1b6fd8cd8804cd3f452d060d843d4f58a7af8748b4c35fa SHA512 b02d9fe3bfad56993f9ed7225b38b4b0b685c7ad1480a9d9db5f9a6a8e13c16918d87e6a51160ee3101ab8ce24f4c0632ae351e7bb11cc473523e216ee9cf6bf
-DIST gnome-desktop-42.0.tar.xz 743484 BLAKE2B 7c7d5e74fe01e082c8ec1994bb7666f191e0eed4212c8ef6257ebb4c3e3a5fb95c8a0c47f1c8f0864a36faa239251569e67eafa734cba4a181b6774233352357 SHA512 b9d37765d3cc43bb709e1e9b97deb6ef16d2a8e6ef7cc3c577ba465d4856bbfe8774fb7fc6eaae4d88064081aeeea0c0c77fe2b4ef79b4d9af1232c918526b44
 DIST gnome-desktop-42.1.tar.xz 743032 BLAKE2B 1eda3138e50b0ded50ede12179311ab8888ab0837c650f3e6bad600a4327cdba02b3fbf7cf7ff845669075cbb56b69ca600b8b63b4f05dce93b0a71e76cedbd7 SHA512 a084f705aedf2d159da91dc54f38261760a50e51041321e6a69ee0dff499e11f0a440f5a9582a31977b0270c87e3ba7de0f5c9cc182c0631858afa1d9508ecf4
-EBUILD gnome-desktop-41.3.ebuild 1922 BLAKE2B d2d6613309b0adba0b3afba8d8966e368a8ea7fd5c1676ee2f3aaa37a3518af6f861a5aa98ba0611c3ee023901ba5c7838f59eddd1ef43cdee27054dfc94bb7f SHA512 722b7d3f3c6e43c84c7bf37f202263a21021ed0fc3b8275ea1cd207b0d19cb3e7807bbc8eb539a54210a4296468994d677ebdbd1b82023e11514f00ca82c73e4
-EBUILD gnome-desktop-42.0-r300.ebuild 2094 BLAKE2B 15bde2ec3d978dfe8aea8519f7a988480e14e0a4c72e62555be0ed51dc63a5cc659c6b25afdfca0809d59c7b2c0732809ba8c7522143e66b29d0ce8de46f13da SHA512 95b49469f13d3793b745945e7c1a9ffea4b0b5a8cfde63fbb230edaa1d4a0b4de76753c050ea41612bfb58fa5514ca150ac948126ded0cfd343c7bea204d95ab
-EBUILD gnome-desktop-42.0-r400.ebuild 2033 BLAKE2B 61481f5683713a072c0ce771b13bc4975cc538908e57483e4bad79e72f3b12a3c2f23b213602ec2b8d98ee61017b7b7810d01127e4b046bfb0379a4047244ced SHA512 dc2a5ca55a1e0bd61729deb90007aa6f6fa785e792125d8f6f03113a6f874c60cab4e07dff23ee96fc12b877f27bd62fd770edb153eba1f6830315c6e84dd0b9
-EBUILD gnome-desktop-42.1-r300.ebuild 1933 BLAKE2B bd31d5ce6639e07a12a477cda29b4187e0b47e6ee75b4a6154c555373dd7d7f551914fc2f2864e4a4c7527be84f2abba57158385941e49b3c97cc6d062971c79 SHA512 1432bd1e60983bad1c7596090d26cbe7271e4737f6057b69270b8c1d8894f15fec399683786a542bf1ab0de79688a6ed0192f9144be133534b68b610a5f4fc34
-EBUILD gnome-desktop-42.1-r400.ebuild 1883 BLAKE2B c74b72dec53b61ee1116eb807fc54af24f90bc7e7a54bd416d744318c9caeeee8b2e28c970d165bec0dd44c6442d47a42cd300e461bf6cbbf2cb6947a757cb3f SHA512 e3fe0c1eb6ec267b388ce00dad35c6b5e8cc722808fa6a92b0eec11d6c3b8cfb0dc5f7dd365531e8677d2a545413a5bcf4511cd34af2a56b37c3ef9b504c17db
+DIST gnome-desktop-42.2.tar.xz 743268 BLAKE2B 8f8ee5ada3bf8b11f9bd6ddfa9925d50ccc22bb3b02f4cd8caefefe76b162347dbddb5de0d6200768e0bcaf6b60c6c774155dfc3767a827c575c48ddc40380a3 SHA512 6c7d90b539b80e45f729a14dd8bf553abb09f20d16e1a2cda751b81f1e2a52e2dcb98551faab3cd4ad17206300f45c9bc968d160fddab0b71a4933f0adc22e0e
+EBUILD gnome-desktop-42.1-r300.ebuild 1934 BLAKE2B 6920f1ce50aa1edd89676b5be034d01c8d71df6e687dddea1db296064ab63549448ebde729705710ea0a17756855261efbd5c0ee07e733e2c2181d3ba4693b7e SHA512 d16202197817d69c3280f703f287218c8af3e16ecb05a2e165a5018258009a61dfb723c6994272ee2ac67c7220f7584ec176be33d1938a589de062d283eef2d1
+EBUILD gnome-desktop-42.1-r400.ebuild 1894 BLAKE2B 3f52d48e3318f77055131351ad2d32de9c601ee9ef8227663dcc0c2f43e5aa8d3dee3ae911c3cf0efe1bd92c5044cf8de7af0a0ee036053e8de8931e479fc761 SHA512 c321c9fb0da94b23077be2362cca5d219512cf6f590cdc2f80088cc1f20163c3f81d531aff2f159e72fd7f5acb67473a9d76288a7a4a1a1b7c205fe3160300d4
+EBUILD gnome-desktop-42.2-r300.ebuild 1933 BLAKE2B bd31d5ce6639e07a12a477cda29b4187e0b47e6ee75b4a6154c555373dd7d7f551914fc2f2864e4a4c7527be84f2abba57158385941e49b3c97cc6d062971c79 SHA512 1432bd1e60983bad1c7596090d26cbe7271e4737f6057b69270b8c1d8894f15fec399683786a542bf1ab0de79688a6ed0192f9144be133534b68b610a5f4fc34
+EBUILD gnome-desktop-42.2-r400.ebuild 1897 BLAKE2B 61485a67a7b2c9b05bec3f65fe485225e27caa9405e996bd619db93fdb7b222a66f099058dba928bc2166527a0fce29eaed659e081c5ecdeb302371490e83ab6 SHA512 5e9d4528aa996af4d678dca04b0233d285cbe148926362d835b49270d9762638ed51f258728b43db491508cefee3d186f8efc3e2c2dfd9dd97cd9df0646c9648
 MISC metadata.xml 254 BLAKE2B de7a97001e5947704f42973c8a0c3a23c2d80afb976254f5fd21e9d372a946e055d4cdc3c0eaed010505f87929b56e8b1e650c945e2a302644adbc9440833be8 SHA512 c81da4f9b80e5691a167f4590906952e25356604ec17689c005be14efb394c0634776bbe84df936edde239480bdf46db41216b00da4a3a45f670e9ca18ab0132
diff --git a/gnome-base/gnome-desktop/files/3.32.2-optional-introspection.patch b/gnome-base/gnome-desktop/files/3.32.2-optional-introspection.patch
deleted file mode 100644
index 7471a3e6a2dc..000000000000
--- a/gnome-base/gnome-desktop/files/3.32.2-optional-introspection.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 1b8fb6b0fd155975f64b5e2ef03bece96a5e3340 Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Wed, 18 Sep 2019 22:28:21 +0300
-Subject: [PATCH] build: Add optionality for introspection
-
----
- libgnome-desktop/meson.build | 2 ++
- meson_options.txt            | 4 ++++
- 2 files changed, 6 insertions(+)
-
-diff --git a/libgnome-desktop/meson.build b/libgnome-desktop/meson.build
-index c365b448..a7355f31 100644
---- a/libgnome-desktop/meson.build
-+++ b/libgnome-desktop/meson.build
-@@ -96,6 +96,7 @@ libgnome_desktop_dep = declare_dependency(
-   link_with: libgnome_desktop
- )
- 
-+if get_option('introspection')
- gnome.generate_gir(libgnome_desktop,
-   sources: introspection_sources + libgnome_desktop_headers,
-   export_packages: 'gnome-desktop-3.0',
-@@ -107,6 +108,7 @@ gnome.generate_gir(libgnome_desktop,
-   symbol_prefix: 'gnome',
-   install: true
- )
-+endif
- 
- desktop_pc = pkg.generate(
-   libraries: libgnome_desktop,
-diff --git a/meson_options.txt b/meson_options.txt
-index e3402a11..7efe43ce 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -17,6 +17,10 @@ option('debug_tools',
-   type: 'boolean', value: true, description: 'Build debug tools'
- )
- 
-+option('introspection',
-+  type: 'boolean', value: true, description: 'Whether to build introspection files'
-+)
-+
- option('udev',
-   type: 'feature', description: 'Udev support'
- )
--- 
-2.20.1
-
diff --git a/gnome-base/gnome-desktop/files/42.0-meson-Fix-build_gtk4-option.patch b/gnome-base/gnome-desktop/files/42.0-meson-Fix-build_gtk4-option.patch
deleted file mode 100644
index 9b166e23bab8..000000000000
--- a/gnome-base/gnome-desktop/files/42.0-meson-Fix-build_gtk4-option.patch
+++ /dev/null
@@ -1,165 +0,0 @@
-https://gitlab.gnome.org/GNOME/gnome-desktop/-/merge_requests/138
-
-From a9ad6e704f9fead5748c2a9697990b01e91b9de0 Mon Sep 17 00:00:00 2001
-From: Matt Turner <mattst88@gmail.com>
-Date: Sun, 20 Mar 2022 18:07:17 -0700
-Subject: [PATCH 1/2] meson: Fix build_gtk4 option
-
----
- libgnome-desktop/meson.build | 134 +++++++++++++++++------------------
- 1 file changed, 67 insertions(+), 67 deletions(-)
-
-diff --git a/libgnome-desktop/meson.build b/libgnome-desktop/meson.build
-index e81530ed..a0fb11f8 100644
---- a/libgnome-desktop/meson.build
-+++ b/libgnome-desktop/meson.build
-@@ -86,79 +86,79 @@ libgnome_desktop_base_headers = [
-   'gnome-xkb-info.h',
- ]
- 
--install_headers(libgnome_desktop_base_headers,
--  subdir: 'gnome-desktop-4.0/libgnome-desktop'
--)
-+if get_option('build_gtk4')
-+  install_headers(libgnome_desktop_base_headers,
-+    subdir: 'gnome-desktop-4.0/libgnome-desktop'
-+  )
- 
--base_deps = [
--  gdk_pixbuf_dep,
--  glib_dep,
--  gio_dep,
--  gio_unix_dep,
--  libsystemd_dep,
--  schemas_dep,
--  xkb_config_dep,
--  xkbregistry_dep,
--  iso_codes_dep,
--  udev_dep,
--  seccomp_dep,
--  m_dep,
--  rt_dep,
--]
-+  base_deps = [
-+    gdk_pixbuf_dep,
-+    glib_dep,
-+    gio_dep,
-+    gio_unix_dep,
-+    libsystemd_dep,
-+    schemas_dep,
-+    xkb_config_dep,
-+    xkbregistry_dep,
-+    iso_codes_dep,
-+    udev_dep,
-+    seccomp_dep,
-+    m_dep,
-+    rt_dep,
-+  ]
- 
--libgnome_desktop_base = library('gnome-desktop-4',
--  sources: [
--    libgnome_desktop_base_sources,
--    libgnome_desktop_base_private_sources,
--    dbus_idle_built_sources,
--  ],
--  dependencies: base_deps,
--  soversion: soversion,
--  version: libversion,
--  c_args: libargs,
--  link_args: base_ldflags,
--  install: true,
--  include_directories: [
--    include_directories('.'),
--    include_directories('..'),
--  ],
--)
-+  libgnome_desktop_base = library('gnome-desktop-4',
-+    sources: [
-+      libgnome_desktop_base_sources,
-+      libgnome_desktop_base_private_sources,
-+      dbus_idle_built_sources,
-+    ],
-+    dependencies: base_deps,
-+    soversion: soversion,
-+    version: libversion,
-+    c_args: libargs,
-+    link_args: base_ldflags,
-+    install: true,
-+    include_directories: [
-+      include_directories('.'),
-+      include_directories('..'),
-+    ],
-+  )
- 
--libgnome_desktop_base_gir = gnome.generate_gir(libgnome_desktop_base,
--  sources: [libgnome_desktop_base_headers, libgnome_desktop_base_sources],
--  export_packages: 'gnome-desktop-4',
--  namespace: 'GnomeDesktop',
--  nsversion: '4.0',
--  includes: ['GObject-2.0', 'Gio-2.0', 'GDesktopEnums-3.0', 'GdkPixbuf-2.0'],
--  extra_args: ['-DGNOME_DESKTOP_USE_UNSTABLE_API', '--quiet', '--warn-all'],
--  identifier_prefix: 'Gnome',
--  symbol_prefix: 'gnome',
--  install: true,
--)
-+  libgnome_desktop_base_gir = gnome.generate_gir(libgnome_desktop_base,
-+    sources: [libgnome_desktop_base_headers, libgnome_desktop_base_sources],
-+    export_packages: 'gnome-desktop-4',
-+    namespace: 'GnomeDesktop',
-+    nsversion: '4.0',
-+    includes: ['GObject-2.0', 'Gio-2.0', 'GDesktopEnums-3.0', 'GdkPixbuf-2.0'],
-+    extra_args: ['-DGNOME_DESKTOP_USE_UNSTABLE_API', '--quiet', '--warn-all'],
-+    identifier_prefix: 'Gnome',
-+    symbol_prefix: 'gnome',
-+    install: true,
-+  )
- 
--pkg.generate(
--  libgnome_desktop_base,
--  requires: ['gsettings-desktop-schemas'],
--  version: meson.project_version(),
--  name: 'gnome-desktop-4',
--  filebase: 'gnome-desktop-4',
--  description: 'Utility library for GNOME desktop components',
--  subdirs: 'gnome-desktop-4.0',
--)
-+  pkg.generate(
-+    libgnome_desktop_base,
-+    requires: ['gsettings-desktop-schemas'],
-+    version: meson.project_version(),
-+    name: 'gnome-desktop-4',
-+    filebase: 'gnome-desktop-4',
-+    description: 'Utility library for GNOME desktop components',
-+    subdirs: 'gnome-desktop-4.0',
-+  )
- 
--libgnome_desktop_base_dep = declare_dependency(
--  sources: [
--    libgnome_desktop_base_gir,
--  ],
--  dependencies: base_deps,
--  link_with: libgnome_desktop_base,
--  include_directories: [
--    include_directories('.'),
--    include_directories('..'),
--  ],
--)
-+  libgnome_desktop_base_dep = declare_dependency(
-+    sources: [
-+      libgnome_desktop_base_gir,
-+    ],
-+    dependencies: base_deps,
-+    link_with: libgnome_desktop_base,
-+    include_directories: [
-+      include_directories('.'),
-+      include_directories('..'),
-+    ],
-+  )
- 
--if gtk4_dep.found()
-   subdir('gnome-bg')
-   subdir('gnome-rr')
- endif
--- 
-2.34.1
-
diff --git a/gnome-base/gnome-desktop/gnome-desktop-41.3.ebuild b/gnome-base/gnome-desktop/gnome-desktop-41.3.ebuild
deleted file mode 100644
index 7aeb9c59632c..000000000000
--- a/gnome-base/gnome-desktop/gnome-desktop-41.3.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome.org meson xdg
-
-DESCRIPTION="Library with common API for various GNOME modules"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-desktop/"
-
-LICENSE="GPL-2+ LGPL-2+ FDL-1.1+"
-SLOT="3/19" # subslot = libgnome-desktop-3 soname version
-IUSE="debug gtk-doc +introspection seccomp systemd udev"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-
-COMMON_DEPEND="
-	>=x11-libs/gdk-pixbuf-2.36.5:2[introspection?]
-	>=x11-libs/gtk+-3.3.6:3[X,introspection?]
-	>=dev-libs/glib-2.53.0:2
-	>=gnome-base/gsettings-desktop-schemas-3.27.0[introspection?]
-	x11-misc/xkeyboard-config
-	x11-libs/libxkbcommon
-	app-text/iso-codes
-	systemd? ( sys-apps/systemd:= )
-	udev? ( virtual/libudev:= )
-	seccomp? ( sys-libs/libseccomp )
-
-	x11-libs/cairo:=
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-"
-DEPEND="${COMMON_DEPEND}
-	media-libs/fontconfig
-"
-RDEPEND="${COMMON_DEPEND}
-	seccomp? ( sys-apps/bubblewrap )
-"
-BDEPEND="
-	app-text/docbook-xml-dtd:4.1.2
-	dev-util/gdbus-codegen
-	gtk-doc? ( >=dev-util/gtk-doc-1.14 )
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	x11-base/xorg-proto
-	virtual/pkgconfig
-"
-# Includes X11/Xatom.h in libgnome-desktop/gnome-bg.c which comes from xorg-proto
-
-PATCHES=(
-	"${FILESDIR}"/3.32.2-optional-introspection.patch # add introspection meson option
-)
-
-src_prepare() {
-	# Don't build manual test programs that will never get run
-	sed -i -e "/'test-.*'/d" libgnome-desktop/meson.build || die
-	xdg_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dgnome_distributor=Gentoo
-		-Ddate_in_gnome_version=true
-		-Ddesktop_docs=true
-		$(meson_use debug debug_tools)
-		$(meson_use introspection)
-		$(meson_feature udev)
-		$(meson_feature systemd)
-		$(meson_use gtk-doc gtk_doc)
-		-Dinstalled_tests=false
-	)
-	meson_src_configure
-}
diff --git a/gnome-base/gnome-desktop/gnome-desktop-42.1-r300.ebuild b/gnome-base/gnome-desktop/gnome-desktop-42.1-r300.ebuild
index 1c3c7ed2fd59..213db2dcf6c5 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-42.1-r300.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-42.1-r300.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-desktop/"
 LICENSE="GPL-2+ LGPL-2+ FDL-1.1+"
 SLOT="3/19" # subslot = libgnome-desktop-3 soname version
 IUSE="debug +introspection seccomp systemd udev"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 
 COMMON_DEPEND="
 	>=x11-libs/gdk-pixbuf-2.36.5:2[introspection?]
@@ -74,7 +74,7 @@ src_install() {
 	meson_src_install
 
 	rm -r \
-		${ED}/usr/share/gnome/gnome-version.xml \
-		${ED}/usr/share/locale \
+		"${ED}"/usr/share/gnome/gnome-version.xml \
+		"${ED}"/usr/share/locale \
 		|| die
 }
diff --git a/gnome-base/gnome-desktop/gnome-desktop-42.1-r400.ebuild b/gnome-base/gnome-desktop/gnome-desktop-42.1-r400.ebuild
index 8367ef9c9ff2..ce09a049440c 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-42.1-r400.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-42.1-r400.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-desktop/"
 LICENSE="GPL-2+ LGPL-2+ FDL-1.1+"
 SLOT="4/1" # subslot = libgnome-desktop-4 soname version
 IUSE="debug gtk-doc +introspection seccomp systemd udev"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 
 COMMON_DEPEND="
 	>=x11-libs/gdk-pixbuf-2.36.5:2[introspection?]
diff --git a/gnome-base/gnome-desktop/gnome-desktop-42.0-r300.ebuild b/gnome-base/gnome-desktop/gnome-desktop-42.2-r300.ebuild
index 16f7cb36d9a1..1c3c7ed2fd59 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-42.0-r300.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-42.2-r300.ebuild
@@ -14,7 +14,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-
 
 COMMON_DEPEND="
 	>=x11-libs/gdk-pixbuf-2.36.5:2[introspection?]
-	>=x11-libs/gtk+-3.3.6:3[X,introspection?]
+	>=x11-libs/gtk+-3.3.6:3[introspection?]
 	>=dev-libs/glib-2.53.0:2
 	>=gnome-base/gsettings-desktop-schemas-3.27.0[introspection?]
 	x11-misc/xkeyboard-config
@@ -38,14 +38,11 @@ BDEPEND="
 	dev-util/gdbus-codegen
 	dev-util/itstool
 	>=sys-devel/gettext-0.19.8
-	x11-base/xorg-proto
 	virtual/pkgconfig
 "
-# Includes X11/Xatom.h in libgnome-desktop/gnome-bg.c which comes from xorg-proto
 
 PATCHES=(
-	"${FILESDIR}"/${PV}-meson-Fix-build_gtk4-option.patch
-	"${FILESDIR}"/${PV}-meson-Add-optionality-for-introspection.patch
+	"${FILESDIR}"/42.0-meson-Add-optionality-for-introspection.patch
 )
 
 src_prepare() {
diff --git a/gnome-base/gnome-desktop/gnome-desktop-42.0-r400.ebuild b/gnome-base/gnome-desktop/gnome-desktop-42.2-r400.ebuild
index f6e75723a277..96fb0604f50c 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-42.0-r400.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-42.2-r400.ebuild
@@ -10,11 +10,11 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-desktop/"
 LICENSE="GPL-2+ LGPL-2+ FDL-1.1+"
 SLOT="4/1" # subslot = libgnome-desktop-4 soname version
 IUSE="debug gtk-doc +introspection seccomp systemd udev"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
 
 COMMON_DEPEND="
 	>=x11-libs/gdk-pixbuf-2.36.5:2[introspection?]
-	>=gui-libs/gtk-4.4.0:4[X,introspection?]
+	>=gui-libs/gtk-4.4.0:4[introspection?]
 	>=dev-libs/glib-2.53.0:2
 	>=gnome-base/gsettings-desktop-schemas-3.27.0[introspection?]
 	x11-misc/xkeyboard-config
@@ -40,14 +40,11 @@ BDEPEND="
 	gtk-doc? ( >=dev-util/gtk-doc-1.14 )
 	dev-util/itstool
 	>=sys-devel/gettext-0.19.8
-	x11-base/xorg-proto
 	virtual/pkgconfig
 "
-# Includes X11/Xatom.h in libgnome-desktop/gnome-bg.c which comes from xorg-proto
 
 PATCHES=(
-	"${FILESDIR}"/${PV}-meson-Fix-build_gtk4-option.patch
-	"${FILESDIR}"/${PV}-meson-Add-optionality-for-introspection.patch
+	"${FILESDIR}"/42.0-meson-Add-optionality-for-introspection.patch
 )
 
 src_prepare() {