gentoo resync : 29.12.2022

author: V3n3RiX <venerix@koprulu.sector> 2022-06-29 12:04:12 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2022-06-29 12:04:12 +0100
commit: 0f558761aa2dee1017b4751e4017205e015a9560 (patch)
tree: 037df795519468a25d9362b4e95cdaeb84eb1cf9 /gnome-extra
parent: 752d6256e5204b958b0ef7905675a940b5e9172f (diff)
139 files changed, 305 insertions, 2407 deletions
diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index 5ad5180d1f2b..ae5544f6d8aa 100644
--- a/gnome-extra/Manifest.gz
+++ b/gnome-extra/Manifest.gz
diff --git a/gnome-extra/cinnamon-control-center/Manifest b/gnome-extra/cinnamon-control-center/Manifest
index 308167238330..efac85d1455f 100644
--- a/gnome-extra/cinnamon-control-center/Manifest
+++ b/gnome-extra/cinnamon-control-center/Manifest
@@ -1,4 +1,4 @@
 AUX cinnamon-control-center-5.2.1-fix-libnma.patch 1922 BLAKE2B af679e2e7744dee5f600ef7474795e4362e9d019289785752979bdd2eebdb21b59bc00765ddb5cbdfd57dc7a106856b6916792d01f5b589b0fb9df2f87108fe1 SHA512 0323343831012e7724694818d9cbe65b7ba91effd06811ddfa4e4b75a44029f83f1497a3495facbfa05cbd0450e14b327d15c13cc357851172566a80f309708a
 DIST cinnamon-control-center-5.2.1.tar.gz 3863530 BLAKE2B 826494b8f8a4dead32d6031d7b4b2a44d357b3e8fedf1065b61193caa86ad433ba68fd9344f70bbce77bb94e086ae15f8854dc73916a5f60c49b1b2bd9e7101c SHA512 d322a9b460f13c697d327dda75a3ea16dd96414ed52ffbcdfc19479533178585da795c064ae441b36ef02f1aa779704db039328ca4ac4c373f363967948f2301
-EBUILD cinnamon-control-center-5.2.1-r1.ebuild 2570 BLAKE2B 07724f5cf57160643e40eb463c68fffd61e960ae6e071958c8ff0cea3cad014e92fe92c3ff3a31d8ed46dd63ff87268d975584ccc467aff7149c047f2fe961fb SHA512 53ec4e294c9d98b170224e3f558232322611d4d428c86d943169263e7e0f201afe371c94428ab973da94b65a14950a0b580bbc4be1fd5f8b8c47827b7442dee0
+EBUILD cinnamon-control-center-5.2.1-r2.ebuild 2572 BLAKE2B d229569b2057b37880d025f9a8ed6e50db776d093d7b1b9ac2d191f908ce777fb9775822be2fb91afc3b6745bac42bfca49c7e18b634cdde2bbbed3f5fc68a76 SHA512 fab75a3a8502ae518aa521441b27c5cd6696076505b6e6e7825394f687462dc93ce933346485b280d9a437820786501d4ee9c17ca48cab2bf4a4ff66dcc45bc6
 MISC metadata.xml 762 BLAKE2B 5a4411060287e76154bd0727feae76a45e8992077d7cbc6d1ad102d933246d98b3349bf0dc516f35d538e6c1d4a5d427e1561b646b628d408a5743666f5f2ca7 SHA512 c03709d9a1c8d678ce0957d08516e49f8affa6be2153f30607c0f1be7c29a1e00f4955f2112e82dc7c3b3e410a6dabf5ba2bdd9f3141b6a5299068598decd0c3
diff --git a/gnome-extra/cinnamon-control-center/cinnamon-control-center-5.2.1-r1.ebuild b/gnome-extra/cinnamon-control-center/cinnamon-control-center-5.2.1-r2.ebuild
index 53c017c256aa..722bfca4fb20 100644
--- a/gnome-extra/cinnamon-control-center/cinnamon-control-center-5.2.1-r1.ebuild
+++ b/gnome-extra/cinnamon-control-center/cinnamon-control-center-5.2.1-r2.ebuild
@@ -33,7 +33,7 @@ COMMON_DEPEND="
 
 	colord? ( >=x11-misc/colord-0.1.14:0= )
 	input_devices_wacom? (
-		>=dev-libs/libwacom-0.7
+		>=dev-libs/libwacom-0.7:=
 		>=gnome-extra/cinnamon-settings-daemon-5.2:0=
 		>=x11-libs/libXi-1.2 )
 	networkmanager? (
diff --git a/gnome-extra/cinnamon-settings-daemon/Manifest b/gnome-extra/cinnamon-settings-daemon/Manifest
index fb78daa626a5..b3106bcffb51 100644
--- a/gnome-extra/cinnamon-settings-daemon/Manifest
+++ b/gnome-extra/cinnamon-settings-daemon/Manifest
@@ -1,3 +1,3 @@
 DIST cinnamon-settings-daemon-5.2.0.tar.gz 662588 BLAKE2B aca6aac0a7b85fa9fb60f1101e0027d5faf3f6d95f7d306ae0ad9dd2e19bb1b48ab4333bbcdff5405b52c306f67eb34bfce895b37529d3ce015182aac41dcf07 SHA512 ae076956715bc7b47746868df0f1cb4034a8ce26b2d64878c74654f08a4498155063f16bf7972316fa138f72e10a82e8589fdb607f8072bbcd92e106bedbe98e
-EBUILD cinnamon-settings-daemon-5.2.0.ebuild 2151 BLAKE2B 66d98a3a03bc67418a8e5a9d40b6624ea8500ad9e531650c0739b1f96b519dc5076f8e34c440ea55cc33a62f43937d86bb89b6d601479896edc8037c84d5f89b SHA512 f995743f386e30e805345708c3fcf409d471cf2afdd62022e950d38c353c94fbef591a75740d55e9a078260a15fdbf3cdf622ae4b50792ff22e068a2926add6c
+EBUILD cinnamon-settings-daemon-5.2.0-r1.ebuild 2153 BLAKE2B 4dfcaa317153a43301eb2d9914307bfddd22bcfd461f67c5c07c5f3d4c6cbb48d3aa7b6eb82e7797620e63ac090d1c239c26dbbff89acf8eaf5776ffd0ac7739 SHA512 7c2ca56aa2f58bdfcc5cdb6545bfef30b145995eb9faf17789f621e8353bcbcce869fe65516b4acab0626d282d52052d13c2d2339f6779176904a7df33de5407
 MISC metadata.xml 504 BLAKE2B 99901d6f11af1367053f408c6fc1dffafa3903dc04b9a38faed0b3261e578c33fad49948ce09ecfb6d277472a3f9c3d088a32231b02236677071413dc3d4917e SHA512 f5afa4c1e73b6765aee16c5762b3145223bf4c56cae60b7e65ef503aec0f684276de2a7a22b0b866996cd96376cfc69e36e395ad3da9e7ce593732cb075fd64c
diff --git a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-5.2.0.ebuild b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-5.2.0-r1.ebuild
index 21639e1d3fd9..4b3d25bbde20 100644
--- a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-5.2.0.ebuild
+++ b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-5.2.0-r1.ebuild
@@ -44,7 +44,7 @@ RDEPEND="
 		app-admin/system-config-printer
 		net-print/cups-pk-helper )
 	input_devices_wacom? (
-		>=dev-libs/libwacom-0.7
+		>=dev-libs/libwacom-0.7:=
 		>=gnome-base/librsvg-2.36.2
 		x11-drivers/xf86-input-wacom
 		x11-libs/libXtst )
diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest
index f2b7b9e6ea0e..9997827dc39f 100644
--- a/gnome-extra/cinnamon/Manifest
+++ b/gnome-extra/cinnamon/Manifest
@@ -5,5 +5,5 @@ AUX cinnamon-5.2.7-meson-0.61-fix.patch 1668 BLAKE2B bf0490423fcfa3d1228a3b10902
 AUX cinnamon-5.2.7-revert-meson-0.60-fix.patch 2020 BLAKE2B 83060c16d8f91188bbfc9e784633ad4d40ba1ab91c1b980866b5d6870cffddbabdce6eceb7121543618e7d94b5f02ed115ea915b7371acb8f271ce6391b98759 SHA512 2c41deff381bc043eee05fc106a7c6b4177728b6500279d0185b99a8f5014ca04158b6348ab3f47c28938f2559193916abc80d387c8ffbb1528532ad26ce1f33
 AUX polkit-cinnamon-authentication-agent-1.desktop 252 BLAKE2B 8a7c10fa19e19c479ab40e9599b8804bc42a78548b9a09f34edc497dc5c9cbcd6958dbbb93cede57c0bf7938cc22f49c229274941b9509ad220e8790ed26bf9e SHA512 7857dc3d08129c37c461b85049d3a12b6602853d7dc44e68d79ce28bbe1121051a2061a4a4de050402230f85755d2800143e3373708fa19d43a001f7f1100360
 DIST cinnamon-5.2.7.tar.gz 2423949 BLAKE2B f4ce9ec4c79eab3daadff958c0a334d49757548203078ab657ebe2450f3f179c942df9d0f9089efe313c268c929628d724db43371e12338606d284a2738ed62c SHA512 62cbbe2f719574b3f70a4895c231be9ad65a41220d2755cc1557bc06bb2b31ced93621c356f2973376d127d5a1e59f9295498bbc4812d428e8605e8f4882c733
-EBUILD cinnamon-5.2.7-r3.ebuild 5359 BLAKE2B 42d2bd0f2e6cf3c17b3df4f66c8854e472d32baba4cfae463add222a5961f6237beea873961ca05f60a657aef3b87e76fde71dfa5a6f7672c750023c80ac4120 SHA512 fe405b7a08816ec7e2629a9aa07d5f977f791c254b82e96510144bc0ec9da082760ccdd5ce697320ef766e66c108c7bf1b106a1e1ea80d2008381a62ad066b3b
+EBUILD cinnamon-5.2.7-r3.ebuild 5373 BLAKE2B 49144f3247ed9a97361a10f2e86a9324d3b15b8af1c8fafe5f2601ab97ced7fe4becc5ca0db8ef4a35ac3b0ff899dfbbe44ff49c3d0b45c1846a965a8222beb5 SHA512 1ed28f7b0fc90b058c606d0a1bbf53c33675377bb5592f17df86dac5cd25f3de1981c3004ab8aade3b07d679082a20c807b83be276b11dd1a6188e35d8584cb4
 MISC metadata.xml 488 BLAKE2B 422b0fe2eb6afbe708925e9fb6fa7f038497b11d51e06165e69e43515a27cf4a77c74a1a10156bbcfd6084704bbfa7f24d4e8a8409970c5d365aa6ba80ab5bd8 SHA512 5952deb426e8adcceb83a9bcaf94bbe96e4f065fbdfd6fa17b08988989f79c3f1de55e58ca13a26a6146b5cef90d8e3853d614d390c7afe0d2494d78ea3df744
diff --git a/gnome-extra/cinnamon/cinnamon-5.2.7-r3.ebuild b/gnome-extra/cinnamon/cinnamon-5.2.7-r3.ebuild
index d161aeb40ce5..f3850a65ba15 100644
--- a/gnome-extra/cinnamon/cinnamon-5.2.7-r3.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-5.2.7-r3.ebuild
@@ -16,7 +16,7 @@ LICENSE="GPL-2+"
 SLOT="0"
 IUSE="+eds +gstreamer gtk-doc +nls +networkmanager"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 ~riscv x86"
 
 DEPEND="
 	${PYTHON_DEPS}
diff --git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest
index 59bec445a3cb..738042ce9bf9 100644
--- a/gnome-extra/evolution-data-server/Manifest
+++ b/gnome-extra/evolution-data-server/Manifest
@@ -1,9 +1,7 @@
 AUX 3.36.5-gtk-doc-1.32-compat.patch 1016 BLAKE2B 6458aa6e2bb41ce07bf74910ef36aafab895dec6e85c4262c346bbe518165ca2ca7778e3d97182d4f6c619313ed016a186dc88fd349a9bd1770441afb09f6e01 SHA512 3a43ee8128896eccdc35e65155aba5d38a4311cd8d848f506cba3473248595ea078b748c639b9a5f11842272b5e212a01d714a3177e4cd1e95d15680081feaa5
 AUX calentry.schema 3661 BLAKE2B 0235e8d98d1367f209a31cc74da9563d53dfc12ca34e020f63a18fcb73c13345e58a9e4a9f5bb3e14a7774bdcd279118d84d971a4b164c8ce41cd26798efabdd SHA512 56606848319539b8c9af732a5d572db44e2d7da433b1689ef7f14a283880951e10d5fc39f27245a7ddc8f0cb2e7563a757060020c17e5411f875cae10b119834
-DIST evolution-data-server-3.42.4.tar.xz 4623968 BLAKE2B e2ae0b4dfc6f34fac384093dd52b88fadce70c646d70c7df1758a6d514bcec1f092e8f4d8f28d50651201b45791112f811b94c8083487ca072bd002f6a11b75a SHA512 e2eba6ffeac2924366169cdae4258c7fc7d1172c2aa3a0ced83bea60556627b39ee9ee6f45a64081de232e0c2e801e2cbb19b6fa4a8958ad0f868c87e0b20f4a
-DIST evolution-data-server-3.44.0.tar.xz 4782136 BLAKE2B 1e1a0419eba31b656107c9ce84f8e6cd4fed37e593417009a6466832ed418e12e8069e989b5eff75e454faeb51429373ddd123eae8a4bc544226d456232376ff SHA512 7c4e7fdc25814b03bf5d6bf3a1d368b318cb093f5656c39dbe59a1b85929a5eb3e6f36135cfcdeb7600baa9f5dedf6ac122974818f7e908b282578bc7122b6b5
 DIST evolution-data-server-3.44.1.tar.xz 4782040 BLAKE2B d12c885a2e2e0eaccb54c46c83117e70708322169e55fb2ec3e64d4d094042164e7586964aeee45f4648f6506ab01c3bd92349a5a182ef2e1e5cbcc395de9b33 SHA512 d09a9f79e1b93ae112c9ed58d7f71c5034db5c2bdc3db9b452475f1fb490ce7945afaaec5e4f80de033e4280d86a4f7eb8026bdda5a78d03da1f496dce000e6d
-EBUILD evolution-data-server-3.42.4.ebuild 4376 BLAKE2B 269803dedeea343d5b0993d8a4e700033c2769b7afeea2a32b908b56eeb3494be3a7f4fab31836a1cea2f08599519349ccc0c72257808daf5e98ddf5d272d43a SHA512 523d2bddfe075265398855568ad655fef74fed840ca49837a6551df66c35cae695172e39272861b5ef47d7bbd4ab746af96363a5129e26eecf29dfc082001397
-EBUILD evolution-data-server-3.44.0.ebuild 4371 BLAKE2B 6cf0d1f34588ecf9c91e2ed0a4781abbca3b83f7aeb4ddbfdecf8fc0e215a656a2e95976a6afb4378bc31448fe7e2ca2fc73b3d16317bafefcab9f3aebbe4fd6 SHA512 b5a25874a90b8bdbf327dcd21e8b46e55f75ed6ef2f5f936f553f150122975df384e7ed52066ebcfe01d15c12b068a0d8f5dc3560391e32a5e67d8d07ae250ff
-EBUILD evolution-data-server-3.44.1.ebuild 4371 BLAKE2B 6cf0d1f34588ecf9c91e2ed0a4781abbca3b83f7aeb4ddbfdecf8fc0e215a656a2e95976a6afb4378bc31448fe7e2ca2fc73b3d16317bafefcab9f3aebbe4fd6 SHA512 b5a25874a90b8bdbf327dcd21e8b46e55f75ed6ef2f5f936f553f150122975df384e7ed52066ebcfe01d15c12b068a0d8f5dc3560391e32a5e67d8d07ae250ff
+DIST evolution-data-server-3.44.2.tar.xz 4783272 BLAKE2B ab559d26345a8a42b350a042474084ecfc0efaba73e2ae7f93d350e8edd040c27600df590f25a9059db670ed0ddd3eaaab92518644db805d2f7beaa2a0c53803 SHA512 cf7fefeb00899cddca0fb9abeddead582ae944f41960c815813312ecf9bde5a19bcd41fa7038eddf7d5c7cf568fda51e9dbb0603bebec54284ce6ac1f9c10305
+EBUILD evolution-data-server-3.44.1.ebuild 4368 BLAKE2B 3e1521383bba494e35bc00c1bdf5b58f3a45851ab0eaf69f957a55b0eed90268eaccdb0a2cae00f574c52c2edecd5b8d095de49a51b6028dbfa3b1153456a06f SHA512 f0a09b4d83a58414c0c8d920fea6cd6ee90fef21e01a3d4093bf9990ac194ba39aa978be21bb1b482fc1d00735528722185918389504876a679c45ae2c7946f4
+EBUILD evolution-data-server-3.44.2.ebuild 4371 BLAKE2B 6cf0d1f34588ecf9c91e2ed0a4781abbca3b83f7aeb4ddbfdecf8fc0e215a656a2e95976a6afb4378bc31448fe7e2ca2fc73b3d16317bafefcab9f3aebbe4fd6 SHA512 b5a25874a90b8bdbf327dcd21e8b46e55f75ed6ef2f5f936f553f150122975df384e7ed52066ebcfe01d15c12b068a0d8f5dc3560391e32a5e67d8d07ae250ff
 MISC metadata.xml 850 BLAKE2B f3e730c63794d5890e76c1f2c7e388b1d6320fc6ef64fa405365a27e7d3883fd09b9cfd875ef0d774bdd51eae5237fff0fd7bd1e6be81a2e0d9252e0b1263afe SHA512 8657f87116f9ad70c24711f270f7b71a57e48bb4f9a8780900f9f6d3da550d0f7b6ae2da453ff6bb76ffd948935f534fdb4b3545a46b0129fbae68a8d1fcecdb
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.42.4.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.42.4.ebuild
deleted file mode 100644
index d840fb3a2838..000000000000
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.42.4.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-VALA_USE_DEPEND="vapigen"
-
-inherit cmake db-use flag-o-matic gnome2 vala virtualx
-
-DESCRIPTION="Evolution groupware backend"
-HOMEPAGE="https://wiki.gnome.org/Apps/Evolution"
-
-# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+".
-LICENSE="|| ( LGPL-2 LGPL-3 ) BSD Sleepycat"
-SLOT="0/63-26-20" # subslot = libcamel-1.2/libedataserver-1.2/libebook-1.2.so soname version
-
-IUSE="berkdb +gnome-online-accounts +gtk gtk-doc +introspection ipv6 ldap kerberos oauth vala +weather"
-REQUIRED_USE="vala? ( introspection )"
-
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-
-# gdata-0.17.7 soft required for new gdata_feed_get_next_page_token API to handle more than 100 google tasks
-# berkdb needed only for migrating old addressbook data from <3.13 versions, bug #519512
-# glib-2.70 for build-time optional GPowerProfileMonitor
-gdata_depend=">=dev-libs/libgdata-0.17.7:="
-RDEPEND="
-	>=app-crypt/gcr-3.4
-	>=app-crypt/libsecret-0.5[crypt]
-	>=dev-db/sqlite-3.7.17:=
-	>=dev-libs/glib-2.70:2
-	>=dev-libs/libical-3.0.8:=[glib,introspection?]
-	>=dev-libs/libxml2-2
-	>=dev-libs/nspr-4.4:=
-	>=dev-libs/nss-3.9:=
-	>=net-libs/libsoup-2.58:2.4
-
-	dev-libs/icu:=
-	sys-libs/zlib:=
-	virtual/libiconv
-
-	berkdb? ( >=sys-libs/db-4:= )
-	gtk? (
-		>=app-crypt/gcr-3.4[gtk]
-		>=x11-libs/gtk+-3.16:3
-		>=media-libs/libcanberra-0.25[gtk3]
-	)
-	oauth? (
-		>=dev-libs/json-glib-1.0.4
-		>=net-libs/webkit-gtk-2.28.0:4
-		${gdata_depend}
-	)
-	gnome-online-accounts? (
-		>=net-libs/gnome-online-accounts-3.8:=
-		${gdata_depend} )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.12:= )
-	kerberos? ( virtual/krb5:= )
-	ldap? ( >=net-nds/openldap-2:= )
-	weather? ( >=dev-libs/libgweather-3.10:2= )
-"
-DEPEND="${RDEPEND}
-	vala? ( $(vala_depend)
-		net-libs/libsoup:2.4[vala]
-		dev-libs/libical[vala]
-		oauth? ( dev-libs/libgdata[vala] )
-		gnome-online-accounts? ( dev-libs/libgdata[vala] )
-	)
-"
-BDEPEND="
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	dev-util/gperf
-	gtk-doc? ( >=dev-util/gtk-doc-1.14
-		app-text/docbook-xml-dtd:4.1.2 )
-	>=dev-util/intltool-0.35.5
-	>=sys-devel/gettext-0.18.3
-	virtual/pkgconfig
-"
-
-# Some tests fail due to missing locales.
-# Also, dbus tests are flaky, bugs #397975 #501834
-# It looks like a nightmare to disable those for now.
-RESTRICT="test !test? ( test )"
-
-# global scope PATCHES or DOCS array mustn't be used due to double default_src_prepare call
-src_prepare() {
-	use vala && vala_src_prepare
-	cmake_src_prepare
-	gnome2_src_prepare
-
-	eapply "${FILESDIR}"/3.36.5-gtk-doc-1.32-compat.patch
-
-	# Make CMakeLists versioned vala enabled
-	sed -e "s;\(find_program(VALAC\) valac);\1 ${VALAC});" \
-		-e "s;\(find_program(VAPIGEN\) vapigen);\1 ${VAPIGEN});" \
-		-i "${S}"/CMakeLists.txt || die
-}
-
-src_configure() {
-	# /usr/include/db.h is always db-1 on FreeBSD
-	# so include the right dir in CPPFLAGS
-	use berkdb && append-cppflags "-I$(db_includedir)"
-
-	local google_enable
-	if use oauth || use gnome-online-accounts; then
-		google_enable="ON"
-	else
-		google_enable="OFF"
-	fi
-
-	# phonenumber does not exist in tree
-	local mycmakeargs=(
-		-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
-		-DENABLE_GTK_DOC=$(usex gtk-doc)
-		-DWITH_PRIVATE_DOCS=$(usex gtk-doc)
-		-DENABLE_SCHEMAS_COMPILE=OFF
-		-DENABLE_INTROSPECTION=$(usex introspection)
-		-DWITH_KRB5=$(usex kerberos)
-		-DWITH_KRB5_INCLUDES=$(usex kerberos "${EPREFIX}"/usr "")
-		-DWITH_KRB5_LIBS=$(usex kerberos "${EPREFIX}"/usr/$(get_libdir) "")
-		-DWITH_OPENLDAP=$(usex ldap)
-		-DWITH_PHONENUMBER=OFF
-		-DENABLE_SMIME=ON
-		-DENABLE_GTK=$(usex gtk)
-		-DENABLE_CANBERRA=$(usex gtk)
-		-DENABLE_OAUTH2=$(usex oauth)
-		-DENABLE_EXAMPLES=OFF
-		-DENABLE_GOA=$(usex gnome-online-accounts)
-		-DWITH_LIBDB=$(usex berkdb "${EPREFIX}"/usr OFF)
-		# ENABLE_BACKTRACES requires libdwarf ?
-		-DENABLE_IPV6=$(usex ipv6)
-		-DENABLE_WEATHER=$(usex weather)
-		-DENABLE_GOOGLE=${google_enable}
-		-DENABLE_LARGEFILE=ON
-		-DENABLE_VALA_BINDINGS=$(usex vala)
-	)
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-}
-
-src_test() {
-	virtx cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-
-	if use ldap; then
-		insinto /etc/openldap/schema
-		doins "${FILESDIR}"/calentry.schema
-		dosym ../../../usr/share/${PN}/evolutionperson.schema /etc/openldap/schema/evolutionperson.schema
-	fi
-}
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.44.1.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.44.1.ebuild
index 768bfb30adc4..1fe248fefe52 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.44.1.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.44.1.ebuild
@@ -15,7 +15,7 @@ SLOT="0/63-26-20" # subslot = libcamel-1.2/libedataserver-1.2/libebook-1.2.so so
 IUSE="berkdb +gnome-online-accounts +gtk gtk-doc +introspection ipv6 ldap kerberos oauth vala +weather"
 REQUIRED_USE="vala? ( introspection )"
 
-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"
 
 # gdata-0.17.7 soft required for new gdata_feed_get_next_page_token API to handle more than 100 google tasks
 # berkdb needed only for migrating old addressbook data from <3.13 versions, bug #519512
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.44.0.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.44.2.ebuild
index 768bfb30adc4..768bfb30adc4 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.44.0.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.44.2.ebuild
diff --git a/gnome-extra/evolution-ews/Manifest b/gnome-extra/evolution-ews/Manifest
index ff500cbc67a6..31eae5664586 100644
--- a/gnome-extra/evolution-ews/Manifest
+++ b/gnome-extra/evolution-ews/Manifest
@@ -1,7 +1,5 @@
-DIST evolution-ews-3.42.4.tar.xz 686236 BLAKE2B f68a3c4c41419eb5d316ce8271a8c8411217e63b951230fb0151d79fca15e82e36248e3bd676518ae5f8a92d7e1d1dbf6a140bbd63dee6dca97fe48f76d502f9 SHA512 5ce1a228414d8c456962ce944a01efbeefb059bc9ff358c95bb7cec72e74ad29cd9476c9aa396b01df35d7c89fff743837dc2f9763129a5f794cbbd14557c2e3
-DIST evolution-ews-3.44.0.tar.xz 688444 BLAKE2B d563137c481dc51f9934fe44a3c563e7204d63ebdac1de7a018da27f8c05cc3d56ddc37848fb57ed909e6bc4d98e2752d401f39e92ccd20b507033404c6b7284 SHA512 0625262e485edf7dc5a0449acae3d65992d4f17dcc64196e449922e3eeb4c8ce57cf0220ecf626bcfcd81b5cea1273ccde18f0dbb9073f56ee923a3cbfb93a83
 DIST evolution-ews-3.44.1.tar.xz 688764 BLAKE2B bf3b5785a533721b6100479a6cd409a49d3aa37055d6a24a5b6d8ca1338f051ab4cb9801f24ab624d4c24dcb3c3cba7639001269514206749ef305ce0723063c SHA512 69d60ebd6e65fae505515b5ade626c867d9272e80f906f55933617c58148441da49f3d36a36205cacdb7f4997da4b90a77f3b9011775f20ac627728a41b210b0
-EBUILD evolution-ews-3.42.4.ebuild 1406 BLAKE2B 2efed5c1908dedf348d557257fa96afca953ca8ce5760c923e3d2ea77ccad02e23304020ea0d2e66a32837b0f177a6a910c040b5d65bc59038d2d13116c28da2 SHA512 deda632646a2586dd54fa80e06f78bd6b10cc8701b2024b4bfbd3cfcc85d76f3063285cac0eebf1d893c40f6be7c801b6f7d67726be3779687955c1b93614b16
-EBUILD evolution-ews-3.44.0.ebuild 1415 BLAKE2B 2be35cc918abc4b827f17fbb62748da42eebcb323cac56c227f647368617704238dcb9d9b33536add9cdc4be01898b8734e4969f67aded88c49d2f829324e4e1 SHA512 75e7e713ca8d846d168cc27713c7c1e4d78e16d5fdb192872e9269d4263298a7f60ddb29b49a550f13da018af5f34fa4ba82312ee5111b1a2b171df91dde48ef
-EBUILD evolution-ews-3.44.1.ebuild 1515 BLAKE2B 7041e1c003effc3fd82a1736651cf4ae19729eb2dee8d6d8c1692bb5b72a7ca1ec2cd1d69f90d37b0a87f78765df747595e4e079254f279a323aa7e657bd8231 SHA512 38c24b68896774d456266760c9c04fc9812ebb4b41abe954db5451b8f8556b7c4dcc9ec9108a6713e6d2d50f80d93bf5339558811e1f54b8ab04209e96bb260a
+DIST evolution-ews-3.44.2.tar.xz 690680 BLAKE2B 029083bcb29d8c6883105fb3e5648501f620946fb11aa60e87feb79857c3e92247ae9987e3a40c185552dd60887f6b6aab00fec3d47f8340357aabf51dcfd4b7 SHA512 dac8ddfc04993585de0dad8eb34ec7296ab2146806a49db1ef182844abee7f383187f621f5b8beaddf6ffbab431ea7d811ce02ff64b87448fb2ff324d28a3620
+EBUILD evolution-ews-3.44.1.ebuild 1513 BLAKE2B 2a75282687e78de16ab8f786332db8886ba8bae3401815209a60320d5a87277d1155d1fa2cf8a0c6d502414fe07e8104b2350544845bc4bbfc6fa5b8838d0174 SHA512 75ed530a0622b572b91980cfb4776b2fe3ceef5367569f73637f78a1fe8757b70b458d9209fc6d19c3a7242c48fed7acb79a478c59bde8108a1a8479af59e538
+EBUILD evolution-ews-3.44.2.ebuild 1515 BLAKE2B 7041e1c003effc3fd82a1736651cf4ae19729eb2dee8d6d8c1692bb5b72a7ca1ec2cd1d69f90d37b0a87f78765df747595e4e079254f279a323aa7e657bd8231 SHA512 38c24b68896774d456266760c9c04fc9812ebb4b41abe954db5451b8f8556b7c4dcc9ec9108a6713e6d2d50f80d93bf5339558811e1f54b8ab04209e96bb260a
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/gnome-extra/evolution-ews/evolution-ews-3.42.4.ebuild b/gnome-extra/evolution-ews/evolution-ews-3.42.4.ebuild
deleted file mode 100644
index 948957d9fe3c..000000000000
--- a/gnome-extra/evolution-ews/evolution-ews-3.42.4.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake gnome2
-
-DESCRIPTION="Evolution module for connecting to Microsoft Exchange Web Services"
-HOMEPAGE="https://wiki.gnome.org/Apps/Evolution"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-# libical-glib currently (2020-02-29) oddly behind USE=introspection
-RDEPEND="
-	dev-db/sqlite:3
-	>=dev-libs/glib-2.62:2
-	>=dev-libs/libical-3.0.5:0=[introspection(-)]
-	>=dev-libs/json-glib-1.0.4
-	>=dev-libs/libmspack-0.4
-	dev-libs/libxml2:2
-	>=gnome-extra/evolution-data-server-${PV}:0=
-	>=mail-client/evolution-${PV}:2.0
-	>=net-libs/libsoup-2.58:2.4
-	>=x11-libs/gtk+-3.10:3
-"
-DEPEND="${RDEPEND}
-	test? ( net-libs/uhttpmock )
-"
-BDEPEND="
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=dev-util/intltool-0.35.5
-	>=sys-devel/gettext-0.18.3
-	virtual/pkgconfig
-"
-
-# Unittests fail to find libevolution-ews.so
-RESTRICT="test !test? ( test )"
-
-# global scope PATCHES or DOCS array mustn't be used due to double default_src_prepare
-# call; if needed, set them after cmake_src_prepare call, if that works
-src_prepare() {
-	cmake_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_MSPACK=ON
-		-DENABLE_TESTS=$(usex test)
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-}
-
-src_test() {
-	cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-}
diff --git a/gnome-extra/evolution-ews/evolution-ews-3.44.1.ebuild b/gnome-extra/evolution-ews/evolution-ews-3.44.1.ebuild
index 478c6401b9f3..f4ca9c3b5500 100644
--- a/gnome-extra/evolution-ews/evolution-ews-3.44.1.ebuild
+++ b/gnome-extra/evolution-ews/evolution-ews-3.44.1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Evolution"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 IUSE="test"
 
 # libical-glib currently (2020-02-29) oddly behind USE=introspection
diff --git a/gnome-extra/evolution-ews/evolution-ews-3.44.0.ebuild b/gnome-extra/evolution-ews/evolution-ews-3.44.2.ebuild
index 4f5c552f73d3..478c6401b9f3 100644
--- a/gnome-extra/evolution-ews/evolution-ews-3.44.0.ebuild
+++ b/gnome-extra/evolution-ews/evolution-ews-3.44.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit cmake gnome2
+inherit cmake gnome2 optfeature
 
 DESCRIPTION="Evolution module for connecting to Microsoft Exchange Web Services"
 HOMEPAGE="https://wiki.gnome.org/Apps/Evolution"
@@ -66,3 +66,7 @@ src_test() {
 src_install() {
 	cmake_src_install
 }
+
+pkg_postinst() {
+	optfeature "oauth support" gnome-extra/evolution-data-server[oauth]
+}
diff --git a/gnome-extra/gnome-boxes/Manifest b/gnome-extra/gnome-boxes/Manifest
index 1ef795688f31..e3a090feab8a 100644
--- a/gnome-extra/gnome-boxes/Manifest
+++ b/gnome-extra/gnome-boxes/Manifest
@@ -1,6 +1,5 @@
-AUX 41.3-fix-build-with-meson-0.61.1.patch 1237 BLAKE2B 4f010d12654cbc7d67ddfaa4980f1ed04a46e4161e96d66700b7c341350b1e22122b26a544e7c699f0e8e14ec7612dd800b1ae90922659ad946b4ec396ef5c2e SHA512 79fd82c6edf250384ef4ad73021b3dd77b088fcc7972fedb9beaaeaadcb103e07f53e3e388683ef992e45407f2685284a75a51b5c4ca51bcac3c041f155ab33b
-DIST gnome-boxes-41.3.tar.xz 1614656 BLAKE2B 1d2a53ba833cdf130f1b2a350871344b0fd4c3f223e069d707e8279748a2fbd21e0d618d0cb229bb3bcfaa84e41d32da763df1d84efd7b749d890f28aceae904 SHA512 6aa8daf03898b7ec28397897b054e220bf2eabb7acbf4ea4dab7035bbe24e44c8a75e488c788f2b8cc56d6e72785651574cffa84cc1a06e5c9c7e0772839bfe7
 DIST gnome-boxes-42.0.1.tar.xz 1231252 BLAKE2B e80503c1a2dbc4a4990ff8fb477f7e72fe1a880412a91d42fffd93c68226c91d254daf28301d816e3555f8a88c9b3f27b35df406bde7483a4a8e98dd3e83e756 SHA512 74968525943ff1a695f2d0cbcd3b9066f2b8c87d6b3b7dea5dab2911600fb09c961ee547a759eed2a23636c7b242a86b56e5ee579dc01e9e9c9caac67a845b03
-EBUILD gnome-boxes-41.3.ebuild 3949 BLAKE2B 56bad55abc79cfb709f4a6bd595353a6022bbbe47da9b67981aba7e58d67209ad1233f1c1e4eaece23c7d435ce824839a7d891b4613603ae769a0af1035d54cd SHA512 3620a1f56bd98e51bd7e67a1f90dc7372af0218bf284f9bff3bd7fe331c5d1e32879b7c6d375ee285d824ebb17c088747b84a4116db756a3cdd0979c9b434fdb
-EBUILD gnome-boxes-42.0.1.ebuild 3853 BLAKE2B 9d3dab4e21c33ecdb5ef733afa2614b31bb89117a777fc3ea89bfec730ac046d4ef2c2216bbddcd71844bcfe2a19a270f8bc75286aa5748772479b7c7a26d064 SHA512 ef898a44103bcc5219833dd786702e72aa49aaf40d69a2f5a00981f22065a3a93f4f300a0416eab67150d1a0127e8685979c63c5198ac74bda61ecd61cad9227
+DIST gnome-boxes-42.1.tar.xz 1235760 BLAKE2B 4de67e369d2135acc2407789c06441840da32c2d13eb329ab874021a56685f64c66fcf47a00a9ddc287a5eeccc2fae799a26147a9ade6ab8b1877a3865407ac7 SHA512 8233c06abe7c6a3e816d599fd2f2729e19b356f130d0ec0cc9d3c47cab0d10ffcc9e8e3f263999ac50c17a7ea63bb417213465cca641fff60ea4bf1c79caaaa7
+EBUILD gnome-boxes-42.0.1.ebuild 3852 BLAKE2B f077a6d89ead04038dce83f85f0c7ee1d363fc26a0a2e07db5748d65f140cde0d55d2f89e57bd566dbdaefbac9e9dda8fba3173dbd918444d9d05c30b3db01d8 SHA512 6f1ebb0dd036865f817d0c3651b4d6739967814778aecfa7039a1f7e5eb04c9258f030d94924ec2ebb56ad14c42c774b29ea17396fed4d7d68cb3262fec0364c
+EBUILD gnome-boxes-42.1.ebuild 3853 BLAKE2B 9d3dab4e21c33ecdb5ef733afa2614b31bb89117a777fc3ea89bfec730ac046d4ef2c2216bbddcd71844bcfe2a19a270f8bc75286aa5748772479b7c7a26d064 SHA512 ef898a44103bcc5219833dd786702e72aa49aaf40d69a2f5a00981f22065a3a93f4f300a0416eab67150d1a0127e8685979c63c5198ac74bda61ecd61cad9227
 MISC metadata.xml 254 BLAKE2B de7a97001e5947704f42973c8a0c3a23c2d80afb976254f5fd21e9d372a946e055d4cdc3c0eaed010505f87929b56e8b1e650c945e2a302644adbc9440833be8 SHA512 c81da4f9b80e5691a167f4590906952e25356604ec17689c005be14efb394c0634776bbe84df936edde239480bdf46db41216b00da4a3a45f670e9ca18ab0132
diff --git a/gnome-extra/gnome-boxes/files/41.3-fix-build-with-meson-0.61.1.patch b/gnome-extra/gnome-boxes/files/41.3-fix-build-with-meson-0.61.1.patch
deleted file mode 100644
index d777e414f9f7..000000000000
--- a/gnome-extra/gnome-boxes/files/41.3-fix-build-with-meson-0.61.1.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-https://gitlab.gnome.org/GNOME/gnome-boxes/-/commit/fd0acfbe79444687c73dea182c2d1a5fa1c77324
-https://bugs.gentoo.org/831934
-
-From: Michal Vasilek <michal@vasilek.cz>
-Date: Sat, 15 Jan 2022 00:07:31 +0100
-Subject: [PATCH] build: remove positional i18n.merge_file arguments
-
-otherwise building with meson 0.61+ fails:
-
-    ERROR: Function does not take positional arguments.
----
- data/meson.build | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/data/meson.build b/data/meson.build
-index d32638a8..2dc1798b 100644
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -20,7 +20,6 @@ resources = gnome.compile_resources ('org.gnome.Boxes',
- desktop_conf = configuration_data ()
- desktop_conf.set ('icon', application_id)
- desktop = i18n.merge_file (
--  'desktop',
-   input: configure_file (
-     input: files ('org.gnome.Boxes.desktop.in'),
-     output: 'org.gnome.Boxes.desktop.in',
-@@ -65,7 +64,7 @@ configure_file (
- 
- appdata_conf = configuration_data()
- appdata_conf.set('appid', application_id)
--appdata_file = i18n.merge_file ('appdata-file',
-+appdata_file = i18n.merge_file (
-   input: configure_file (
-     input: files ('org.gnome.Boxes.appdata.xml.in'),
-     output: 'org.gnome.Boxes.appdata.xml.in',
--- 
-GitLab
-
diff --git a/gnome-extra/gnome-boxes/gnome-boxes-42.0.1.ebuild b/gnome-extra/gnome-boxes/gnome-boxes-42.0.1.ebuild
index 52f6b07c7db3..4d6d803a385d 100644
--- a/gnome-extra/gnome-boxes/gnome-boxes-42.0.1.ebuild
+++ b/gnome-extra/gnome-boxes/gnome-boxes-42.0.1.ebuild
@@ -13,7 +13,7 @@ LICENSE="LGPL-2+ CC-BY-2.0"
 SLOT="0"
 
 IUSE="rdp"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 # FIXME: qemu probably needs to depend on spice[smartcard] directly with USE=spice
 # FIXME: Check over libvirt USE=libvirtd,qemu and the smartcard/usbredir requirements
diff --git a/gnome-extra/gnome-boxes/gnome-boxes-41.3.ebuild b/gnome-extra/gnome-boxes/gnome-boxes-42.1.ebuild
index 771dda8dc471..52f6b07c7db3 100644
--- a/gnome-extra/gnome-boxes/gnome-boxes-41.3.ebuild
+++ b/gnome-extra/gnome-boxes/gnome-boxes-42.1.ebuild
@@ -1,8 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-VALA_USE_DEPEND="vapigen"
+EAPI=8
 VALA_MIN_API_VERSION="0.40"
 
 inherit gnome.org gnome2-utils linux-info meson readme.gentoo-r1 vala xdg
@@ -14,7 +13,7 @@ LICENSE="LGPL-2+ CC-BY-2.0"
 SLOT="0"
 
 IUSE="rdp"
-KEYWORDS="amd64"
+KEYWORDS="~amd64"
 
 # FIXME: qemu probably needs to depend on spice[smartcard] directly with USE=spice
 # FIXME: Check over libvirt USE=libvirtd,qemu and the smartcard/usbredir requirements
@@ -25,7 +24,7 @@ DEPEND="
 	>=dev-libs/glib-2.52:2
 	>=x11-libs/gtk+-3.24.1:3
 	>=net-libs/gtk-vnc-0.8.0-r1[gtk3(+)]
-	x11-libs/gtksourceview:4
+	>=gui-libs/libhandy-1.5.0:1=
 	>=sys-libs/libosinfo-1.7.0
 	app-crypt/libsecret
 	>=net-libs/libsoup-2.44:2.4
@@ -35,7 +34,6 @@ DEPEND="
 	>=net-misc/spice-gtk-0.32[gtk3(+),smartcard,usbredir]
 	app-misc/tracker:3
 	>=net-libs/webkit-gtk-2.26.0:4
-	>=gui-libs/libhandy-1.0.0:1=
 
 	>=dev-libs/gobject-introspection-1.56:=
 	>=dev-libs/libgudev-165:=
@@ -76,10 +74,6 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
-PATCHES=(
-	"${FILESDIR}/${PV}"-fix-build-with-meson-0.61.1.patch
-)
-
 DISABLE_AUTOFORMATTING="yes"
 DOC_CONTENTS="Before running gnome-boxes for local VMs, you will need to load the KVM modules.
 If you have an Intel Processor, run:
@@ -100,8 +94,9 @@ pkg_pretend() {
 }
 
 src_prepare() {
-	xdg_src_prepare
-	vala_src_prepare
+	default
+	vala_setup
+	xdg_environment_reset
 }
 
 src_configure() {
@@ -112,6 +107,7 @@ src_configure() {
 		-Dinstalled_tests=false
 		-Dflatpak=false
 		-Dprofile=default
+		-Duefi=true
 	)
 	meson_src_configure
 }
diff --git a/gnome-extra/gnome-calculator/Manifest b/gnome-extra/gnome-calculator/Manifest
index 5ad5bccccba1..6f465ec8c49b 100644
--- a/gnome-extra/gnome-calculator/Manifest
+++ b/gnome-extra/gnome-calculator/Manifest
@@ -1,5 +1,7 @@
 DIST gnome-calculator-41.1.tar.xz 1046092 BLAKE2B 2c9a8757adcb9858f826f303ebcec44b869e3be95f49d2722e57765f187d725f82dda6b1cac1302640d686fdccebbf5c8565c5bbd064d1d647bc5d23434d55ba SHA512 fc0d5c0744c52cd68f076afa29e3028f4998fe04e2e253d267b0350514ebae72172e90a345db69bc13d4ead2c7679416529d7192a34cfd970c7b2773870b9604
 DIST gnome-calculator-42.0.tar.xz 1200548 BLAKE2B d628b1b112a1f4b42e8bbc696cb5c0f5aca969f0fa999a9367e495d93c2e9e01b7a8669dbc057da4aa019d9fa9ce3612210c35949bd9aab2664ebc413324d6fc SHA512 9c28126321fdbd9c60f4d992a37f3081b46de24eaf1a057373b8b905c4ad218145cfeb629b001094b4b137cafee5dcdeaae3920ca95f2ec2d4fbe8ea1ef1b72e
+DIST gnome-calculator-42.1.tar.xz 1199604 BLAKE2B ffb2cd60847aa4365d2624827153bb76f3a142237193c9bb3b924827cca22f7b3fbbd21d02af8e2352bb567fe1bae025e12003769e57716e406b982a6f390563 SHA512 c919322e14fb917b3cb02eb365e806872d0b696f7207b25b0f4eaa192d2994fca83e2470355c20bf119f8fd95734beb9575d0c29e7a7b1bf1a9926c0b5ccf736
 EBUILD gnome-calculator-41.1.ebuild 1721 BLAKE2B 09161f86fba2639d75a60137f7ccf149c427234c5b7872621241b6c065d5618cb8b825a31d516ecb8ea3e07b568f00ea5291eeab6511c6e9cf70ca3f3cb6e03c SHA512 f966f823a9ad5825c8049e0336f5615c7893b1694a2c1333c3ec8731d5dd3f47b8e13a73cc789d7e8971a56c4be65e12eb946dd0581ddf4d0e41979f8cd28caa
-EBUILD gnome-calculator-42.0.ebuild 1662 BLAKE2B 66e6b746213ffeea0a964ab5d859555d48835b646cbb48d7bd0821dd5c573cb289e1d94f7428575df5cb6a528ae851b6270a0ef7c8f3f285bf34140bd6ea1d2b SHA512 2924381ce76385e8e174f327de679890b439379838d408072cba2085061b78b0406ec5d0c931f6a710e1d5190a88194adebfd38101ed81c86a4b2cc91f38b159
+EBUILD gnome-calculator-42.0.ebuild 1672 BLAKE2B c8a76674ce80811f96f15715ae29b4ebdd871a1694762cc9c7996e25dd188cdacccc88b02264a7300c31fb2a390f0e262d36e5ae480169e43317d984d2112556 SHA512 e3fefd896304cdcf0eafdf6691de2bdfee9c25a30eb8bc221f89839da574f31e3357372994da81127b98981e40a9c0139c795601f23da24f427c7daae948f8e3
+EBUILD gnome-calculator-42.1.ebuild 1615 BLAKE2B cc82573c9adde6d2e4b5b35e1edc4fd41722044c77d3a66bc3ecc667a3b420b91b3e2769188846eed12cb9dc81698e6a41659aeb34bf41f2690cde2870aa9973 SHA512 5fd7c36554b0209d317d40f9036801fa064b06ec20a95c47b6971a678cc38262779a8ee07c218b0e7c2c291af252e47bad428e1de53ad64c23a9b5e6f603c96b
 MISC metadata.xml 436 BLAKE2B 32bdac72c16828ca6ef52e23f380603787e6f08829abe8576cc7475cc48fa3e2612d39891e7ece1a1cce1eb4b7e45ca53af8e058de5d68cbc1a9ea4e2c62f133 SHA512 04f0795da8fbdcd87eb4a77a70934bec3c7be51876248782b90fb94c0831ae2ba30e619bcbd078196fcca6164225752a84361964e91f2b74a10a22e75d3fd902
diff --git a/gnome-extra/gnome-calculator/gnome-calculator-42.0.ebuild b/gnome-extra/gnome-calculator/gnome-calculator-42.0.ebuild
index 6f85775dab64..89afc16a63a3 100644
--- a/gnome-extra/gnome-calculator/gnome-calculator-42.0.ebuild
+++ b/gnome-extra/gnome-calculator/gnome-calculator-42.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Calculator"
 LICENSE="GPL-3+"
 SLOT="0"
 IUSE="+introspection test"
-KEYWORDS="~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~riscv"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc"
 
 # gtksourceview vapi definitions in dev-lang/vala itself are too old, and newer vala removes them
 # altogether, thus we need them installed by gtksourceview[vala]
diff --git a/gnome-extra/gnome-calculator/gnome-calculator-42.1.ebuild b/gnome-extra/gnome-calculator/gnome-calculator-42.1.ebuild
new file mode 100644
index 000000000000..4215d0bb9217
--- /dev/null
+++ b/gnome-extra/gnome-calculator/gnome-calculator-42.1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+VALA_MIN_API_VERSION="0.40"
+
+inherit gnome.org gnome2-utils meson vala virtualx xdg
+
+DESCRIPTION="A calculator application for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Calculator"
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="+introspection test"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+# gtksourceview vapi definitions in dev-lang/vala itself are too old, and newer vala removes them
+# altogether, thus we need them installed by gtksourceview[vala]
+RDEPEND="
+	>=dev-libs/glib-2.40.0:2
+	dev-libs/libxml2:2
+	>=net-libs/libsoup-2.42:2.4
+	>=dev-libs/libgee-0.20.0:0.8
+	dev-libs/mpc:=
+	dev-libs/mpfr:0=
+	>=gui-libs/gtk-4.4.1:4
+	>=gui-libs/libadwaita-1.0.0:1
+	>=gui-libs/gtksourceview-5.3.0:5
+	introspection? ( >=dev-libs/gobject-introspection-1.58:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-libs/appstream-glib
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	$(vala_depend)
+	net-libs/libsoup:2.4[vala]
+	gui-libs/gtksourceview:5[vala]
+	gui-libs/libhandy:1[vala]
+"
+
+src_prepare() {
+	default
+	vala_setup
+	# Automagic dep on valadoc - don't bother for now
+	sed -e '/subdir.*doc/d' -i meson.build || die
+}
+
+src_configure() {
+	local emesonargs=(
+		-Ddisable-ui=false
+		#-Dvala-version # doesn't do anything in 3.34
+		$(meson_use !introspection disable-introspection)
+		$(meson_use test ui-tests)
+	)
+	meson_src_configure
+}
+
+src_test() {
+	virtx meson_src_test
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/gnome-extra/gnome-calendar/Manifest b/gnome-extra/gnome-calendar/Manifest
index 66fcf2229899..c424bf9b1cf6 100644
--- a/gnome-extra/gnome-calendar/Manifest
+++ b/gnome-extra/gnome-calendar/Manifest
@@ -1,8 +1,5 @@
-AUX gnome-calendar-40.2-meson-0.61.patch 708 BLAKE2B 65a37339599bd0303adc9126eb3246b8b84956a52814c671b14484f9fddc4198533e6a06c536aed98384b4b832b462966f3079c1c8ec3d0f893c1835c0e27bde SHA512 fe89025d23bf9a08df7352891a841729f5350817c73803da96c450f7cf46d5ec0c4e436336de3666d61a1e61bc0a781480ec1b4bfc2db5c76e2234eed40c467f
-DIST gnome-calendar-41.2.tar.xz 583584 BLAKE2B ef21836ef87ba19de0c25f5cb73631b73a60352ca97db88dabbc1632097d3ef7e12c257fe946f7d92466f232248e1b27891394b44d73d61a3336521b2bb5d883 SHA512 1540a1e24d54bb157fadabe4201a97f2cae2c9487e267fff98273aa0dfc3715c4f734ba1e459c3c296c470337547a2b303309911ee7762e17738b292c18cc1bb
-DIST gnome-calendar-42.0.tar.xz 579044 BLAKE2B ab6b7f10b234b277364dcee95aec7b616a0ffc8049d949545972a74805ee0953b8e04a75933c9a5bb29e5e67855142fc712a1d453843d15cdf4cdedb373029f8 SHA512 3a0950683bb0c5b57bd8fca3d49815bf1bf05005a075e50e8f4a61e6a5bc0f875230a89033bfd4945ed5550253ab4686788a1e2239eff4f76f58716b86cf6fbe
 DIST gnome-calendar-42.1.tar.xz 578424 BLAKE2B a9c62093eb89e198bec801aa070d9e2afed87833dce85a55775d4938cda23fc7dd166b9739e208e17d40b82e7dfcf0e76c83c09eb07786f9d79c38fed910d616 SHA512 5f50ab84f98c3ddf4c1e49f9556e47f6590c5eb8a3b598edb76d96d5c8eab48003e957d5b199a94a3955951453e3c3b783745c9b9376aee2d93d14ff95178093
-EBUILD gnome-calendar-41.2.ebuild 1218 BLAKE2B bc4e3fa9635ef8460c292e806a7ceb8658a5a32aec240b0ec574461756682a16475c4fc5993ae7c09fd199f515bd4a27a9b534e4eb82110379ca80a63276922c SHA512 a740044bcc16abf72ee2c52b43cd63c1cb8099ff32d0bacb8708b7961e2da3058659af65d63376c12aedd6dfc165d732bfbc945b42ce87edddd57a3df9293663
-EBUILD gnome-calendar-42.0.ebuild 1096 BLAKE2B d92a32cb3cbee8723b892eac246790a6fa3f22c247dc38ec19664a8cf7b1148dc04951fdafcd7b72ad2494d241d9d396fcc5b9a058b6142f9bb0f2f33dbbd46d SHA512 c574b92de73dca21e67988dc4408f9021ab8b9305f2ace73a17992c1432dfae2cc3a4f114b0c4a13a02e3937211370918979560163e50360eec02d4cb370c727
-EBUILD gnome-calendar-42.1.ebuild 1096 BLAKE2B d92a32cb3cbee8723b892eac246790a6fa3f22c247dc38ec19664a8cf7b1148dc04951fdafcd7b72ad2494d241d9d396fcc5b9a058b6142f9bb0f2f33dbbd46d SHA512 c574b92de73dca21e67988dc4408f9021ab8b9305f2ace73a17992c1432dfae2cc3a4f114b0c4a13a02e3937211370918979560163e50360eec02d4cb370c727
+DIST gnome-calendar-42.2.tar.xz 578276 BLAKE2B 44684f7c1b6db6865bf0b9bc7096a990212b086d7c2e748cb41e4ac6ced4a1bec0e14f5ed3d6253f49006f4e736666578ded9cd6cd84533fcc03316c5a437b4d SHA512 6ab72017dc0230dc396c7c19cdeab633744b6a44ac4a5c2183389cadca1507bf696c5cdf39def1c0158fb0be5f1988f2a30a6fc2ea0090d6fc341adc45daddbe
+EBUILD gnome-calendar-42.1.ebuild 1093 BLAKE2B eaa1a3b269addf90f7b23c35586ed606b08811fa24dd0b303e88ff40871fada4d72357e2025acf52da8eda9e2eb6ffcbbc0ac777d37f4dd4b54d6e1fc1d8b6df SHA512 30409e17f23f833624e318cba0881268034f37cafe6c76ad6187df4185b02aeacb12cee6b654b53f735743c4df3aaf8a6a236912cc8bc00701d7af2366191343
+EBUILD gnome-calendar-42.2.ebuild 1096 BLAKE2B d92a32cb3cbee8723b892eac246790a6fa3f22c247dc38ec19664a8cf7b1148dc04951fdafcd7b72ad2494d241d9d396fcc5b9a058b6142f9bb0f2f33dbbd46d SHA512 c574b92de73dca21e67988dc4408f9021ab8b9305f2ace73a17992c1432dfae2cc3a4f114b0c4a13a02e3937211370918979560163e50360eec02d4cb370c727
 MISC metadata.xml 523 BLAKE2B ac729de842a6c4af26151fe8a6325fd880715ef5bdba87af11d3fa8b39673c13a32d9cfcaf8c13c246640bd63af8391eed13d775840a337b4e5cf85acc779df0 SHA512 0e87a27fdbccd8d5b71a2b0c57a0b1af281f8f4c64da1a7d091825d03ed3bc4897995f705bb2210800c549aee7d038742edcb3874db0fabe2be1e918483f91b2
diff --git a/gnome-extra/gnome-calendar/files/gnome-calendar-40.2-meson-0.61.patch b/gnome-extra/gnome-calendar/files/gnome-calendar-40.2-meson-0.61.patch
deleted file mode 100644
index ec5dc0fc6fca..000000000000
--- a/gnome-extra/gnome-calendar/files/gnome-calendar-40.2-meson-0.61.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-https://gitlab.gnome.org/GNOME/gnome-calendar/-/merge_requests/198.patch
-https://bugs.gentoo.org/831926
-
-From e35dbc1acd03dd1751b755b6c8e1932a692ad4e1 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex@linutronix.de>
-Date: Fri, 21 Jan 2022 21:18:39 +0100
-Subject: [PATCH] meson.build: fix meson 0.61 builds
-
-Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---- a/data/appdata/meson.build
-+++ b/data/appdata/meson.build
-@@ -1,7 +1,6 @@
- appdata_conf = configuration_data()
- appdata_conf.set('appid', application_id)
- appdata = i18n.merge_file(
--  'appdata',
-   input: configure_file(
-     input: files('org.gnome.Calendar.appdata.xml.in.in'),
-     output: 'org.gnome.Calendar.appdata.xml.in',
-GitLab
diff --git a/gnome-extra/gnome-calendar/gnome-calendar-41.2.ebuild b/gnome-extra/gnome-calendar/gnome-calendar-41.2.ebuild
deleted file mode 100644
index d9ffb9a87b0c..000000000000
--- a/gnome-extra/gnome-calendar/gnome-calendar-41.2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome.org gnome2-utils meson virtualx xdg
-
-DESCRIPTION="Manage your online calendars with simple and modern interface"
-HOMEPAGE="https://wiki.gnome.org/Apps/Calendar"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
-
-# >=libical-1.0.1 for https://bugzilla.gnome.org/show_bug.cgi?id=751244
-DEPEND="
-	>=dev-libs/libical-1.0.1:0=
-	>=gnome-base/gsettings-desktop-schemas-3.21.2
-	>=gnome-extra/evolution-data-server-3.33.2:=[gtk]
-	net-libs/libsoup:2.4
-	>=dev-libs/libdazzle-3.33.1
-	>=gui-libs/libhandy-1.0.0:1=
-	>=dev-libs/glib-2.67.5:2
-	>=x11-libs/gtk+-3.22.0:3
-	>=net-libs/gnome-online-accounts-3.2.0:=
-	>=dev-libs/libgweather-40.0:=
-	>=app-misc/geoclue-2.4:2.0
-	>=sci-geosciences/geocode-glib-3.23
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	dev-libs/appstream-glib
-	dev-libs/libxml2:2
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-40.2-meson-0.61.patch
-)
-
-src_test() {
-	virtx meson_src_test
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/gnome-calendar/gnome-calendar-42.1.ebuild b/gnome-extra/gnome-calendar/gnome-calendar-42.1.ebuild
index 4a5ef1c8dce0..ed7f77824527 100644
--- a/gnome-extra/gnome-calendar/gnome-calendar-42.1.ebuild
+++ b/gnome-extra/gnome-calendar/gnome-calendar-42.1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Calendar"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 
 # >=libical-1.0.1 for https://bugzilla.gnome.org/show_bug.cgi?id=751244
 DEPEND="
diff --git a/gnome-extra/gnome-calendar/gnome-calendar-42.0.ebuild b/gnome-extra/gnome-calendar/gnome-calendar-42.2.ebuild
index 4a5ef1c8dce0..4a5ef1c8dce0 100644
--- a/gnome-extra/gnome-calendar/gnome-calendar-42.0.ebuild
+++ b/gnome-extra/gnome-calendar/gnome-calendar-42.2.ebuild
diff --git a/gnome-extra/gnome-characters/Manifest b/gnome-extra/gnome-characters/Manifest
index d9462599b574..5b63f15b20b6 100644
--- a/gnome-extra/gnome-characters/Manifest
+++ b/gnome-extra/gnome-characters/Manifest
@@ -1,6 +1,3 @@
-AUX fix-build-with-meson-0.61.patch 575 BLAKE2B 29986accfef997c31c3810781a1f896de0548b742897964ce2149a8dc4d52cb2bed0cad67271d059dfb8c9ae760861fa6dd16f654ea28c488e3c3b9d8bfe8e79 SHA512 8c083dad0840cb0f304022e9bdfe1622a224070d10c9295efb35900f99f13d434c1a26fe90d587426a6285cd5adc745cbcd4054f1f8885fd64d7a20f2291962f
-DIST gnome-characters-41.0.tar.xz 197092 BLAKE2B d903489ed8fc4b722c5635fe5aa57eb00803b5a357405b7fbbe9af844cc3112070ef8fbcf79147578ce99dacafda287e43bfc57a2f5e9cf75dae56e388453109 SHA512 faa76b8ced642d5a1c4641fc4670800f851dd0aae98cd227fd0847c5b930d572f6838e677e11858d62f672a6cabfb1c5aa582a534cd8e37541e9fc1bb16fcc04
 DIST gnome-characters-42.0.tar.xz 561308 BLAKE2B 454d2bbdc5e8486f50b3f21bba4a65aa0920654c2cc3376cdda62070011c1a296f240632ddcd412add7953fccb2780ba37ac3196aef138e9771cdf5a81061441 SHA512 ba6fa07ff90ede1cba0e541f0c4bda63f1d6122c18af44dafa3bfb0fa6f9580a3cd8580d0a12510e2eb95afedb4b0f350accc37eee85c3aa4422a66732dff404
-EBUILD gnome-characters-41.0.ebuild 946 BLAKE2B 9b14d0665331d3018fcec439346d3379f0a792e8000897e2fce554c96617365727397802f6c5182f52908a5b1f8bc26f16234ef64fcaed9f925b8313fe39444b SHA512 92a6dd7d59d18ee1489afc56ad28c839d6fed49e8d3403d82adbd235b44565ae90af01d5f128d1b6b4dc823eb25615bc7a451430dd4ce5e7961e49f7424c1b18
-EBUILD gnome-characters-42.0.ebuild 889 BLAKE2B 65ee1ec9ee99394868ff61373a7ba1ebe88a8325cfcc9ef56ca338ebe189cddc9d526239ed1e3e1c174ab2111304f007a821a7308fe215122cc0e99dd6599666 SHA512 53ef8279032ed5bec03f1ab3b3062397d9b7445e100c324ebdd868282b8fe98e82bbe649b45ee368a65b8524abd9423b7524c96ae9aaec64f0b31ff147fce239
+EBUILD gnome-characters-42.0.ebuild 886 BLAKE2B 8b8dca7593698dc38ede5d17edbed25f9214c77ea9d93782a81ba30240d03cfc43f3dd468945016b2e85ec15375da4f279efa7572571e1664dc55700c3274671 SHA512 683a6a69912d74edac3951c1885f8aac9c46c6cd7c385003553882c66530ec1fb6dd35b5db84f57dd1dc960e786531344591de7087f0fd32c39a5776c95fa80e
 MISC metadata.xml 254 BLAKE2B de7a97001e5947704f42973c8a0c3a23c2d80afb976254f5fd21e9d372a946e055d4cdc3c0eaed010505f87929b56e8b1e650c945e2a302644adbc9440833be8 SHA512 c81da4f9b80e5691a167f4590906952e25356604ec17689c005be14efb394c0634776bbe84df936edde239480bdf46db41216b00da4a3a45f670e9ca18ab0132
diff --git a/gnome-extra/gnome-characters/files/fix-build-with-meson-0.61.patch b/gnome-extra/gnome-characters/files/fix-build-with-meson-0.61.patch
deleted file mode 100644
index 4033314ea517..000000000000
--- a/gnome-extra/gnome-characters/files/fix-build-with-meson-0.61.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Part of https://gitlab.gnome.org/GNOME/gnome-characters/-/commit/3b84cc750b70482a1cc30864dc51cde60df0332d
-https://bugs.gentoo.org/831471
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -47,7 +47,6 @@
- desktop_conf.set('bindir', characters_bindir)
- 
- i18n.merge_file(
--  'desktop-file',
-   type: 'desktop',
-   input: configure_file (
-     input: characters_name + '.desktop.in',
-@@ -61,7 +60,6 @@
- )
- 
- appdata_file = i18n.merge_file(
--  'appdata-file',
-   input: characters_name + '.appdata.xml.in',
-   output: characters_application_id + '.appdata.xml',
-   po_dir: po_dir,
diff --git a/gnome-extra/gnome-characters/gnome-characters-41.0.ebuild b/gnome-extra/gnome-characters/gnome-characters-41.0.ebuild
deleted file mode 100644
index 38255a48b231..000000000000
--- a/gnome-extra/gnome-characters/gnome-characters-41.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome.org gnome2-utils meson xdg
-
-DESCRIPTION="Unicode character map viewer and library"
-HOMEPAGE="https://wiki.gnome.org/Design/Apps/CharacterMap"
-
-LICENSE="GPL-2+ BSD"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
-
-RDEPEND="
-	>=dev-libs/gjs-1.50
-	>=dev-libs/glib-2.32:2
-	>=dev-libs/gobject-introspection-1.35.9:=
-	>=dev-libs/libunistring-0.9.5:=
-	>=x11-libs/gtk+-3.20:3[introspection]
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/pango-1.36[introspection]
-	gnome-base/gnome-desktop:3[introspection]
-	>=gui-libs/libhandy-1.1:1=
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-libs/libxml2:2
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/fix-build-with-meson-0.61.patch
-)
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postinst() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/gnome-characters/gnome-characters-42.0.ebuild b/gnome-extra/gnome-characters/gnome-characters-42.0.ebuild
index ec5ee407a8a9..7faa01532845 100644
--- a/gnome-extra/gnome-characters/gnome-characters-42.0.ebuild
+++ b/gnome-extra/gnome-characters/gnome-characters-42.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Design/Apps/CharacterMap"
 
 LICENSE="GPL-2+ BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 
 RDEPEND="
 	>=dev-libs/gjs-1.50
diff --git a/gnome-extra/gnome-clocks/Manifest b/gnome-extra/gnome-clocks/Manifest
index c168a9da2caf..85b2f295d140 100644
--- a/gnome-extra/gnome-clocks/Manifest
+++ b/gnome-extra/gnome-clocks/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-clocks-41.0.tar.xz 385088 BLAKE2B d2c83212b2817767f8711cfd9352a642059f1dfbabbed007c04d4ae5c1086152eeaa5f6e4f9e88d3593a67b95212f5ab5817bd6abf9c61f6c880628adc1534eb SHA512 da0d0b487310d63f14c99dd7e4018dfb0779482e9936594641bb26b1d12479d373da5a2652392d6927a16ec072ee7c08515548c347fb7dcc82e32be5c0e626ba
 DIST gnome-clocks-42.0.tar.xz 360968 BLAKE2B de66b802dbce8e57a97594c76e8fe5f7a4d65c1426d3c45217f3eb1e27e553fda9f1484b83827e6f44db10c8623581c7e1cd79f0bd79352966f67345e59fcf30 SHA512 f642cb4a626de2a97ad78c25922bb933bdac917d363097fcf5149310111abd11834410b48bfb4fc9cbae06f0ab30b0a5200d45304ce292b5a9558a90b922edb4
-EBUILD gnome-clocks-41.0.ebuild 1098 BLAKE2B 5d2ff8a0ee8f1f2fa059cd53d6d78504f7c124e4853da5eccacf1896cdda38cf4438352f5c972a4690a037a5df805e90c5886a6fd5f8384b1f8d6308027bdf71 SHA512 7c948fba4cbd1d7af5847f575b4ca4786fe6c767a0502c78444e69c0e74e7b984ad11c30a101c414142cad6c5916305a932dc3fcb24aaa7b795cb32b9b281661
-EBUILD gnome-clocks-42.0.ebuild 1129 BLAKE2B afb41378a0df82ee63cff4b4bbfd8471ffc0d86044c8794f3f30dcff21a79c482545695e9aefa7815a450f22d76ee0ac0865f2446a6fec6b2444836a3e990fb4 SHA512 189de1a1865f4bfc9d1688732dc10752e7b41bd341a102d55372d372abc98c198795e09d7a68784ab4aaec90d3a81932a02a02d521ae31e67532c135acb21fe3
+EBUILD gnome-clocks-42.0.ebuild 1127 BLAKE2B 6530638907264cdfad879c6abac3e75bef414a9dfc1b5ad3ceeb99b832117257caadf3d378522a6213b13e368c5ff28aaa04c4aaed3e6874d1eebb209dfb6113 SHA512 5440eb4f6f7649f7870df3a69fe397385eb1691ede189b376fa90e85550dca82aabd4aaf4f55670c1caa08bbd4be4141449bf609bc947f7b66f42120b5a62e30
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/gnome-extra/gnome-clocks/gnome-clocks-41.0.ebuild b/gnome-extra/gnome-clocks/gnome-clocks-41.0.ebuild
deleted file mode 100644
index eb652e17d2b7..000000000000
--- a/gnome-extra/gnome-clocks/gnome-clocks-41.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome.org gnome2-utils meson vala xdg
-
-DESCRIPTION="Clocks application for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Clocks"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
-
-RDEPEND="
-	>=dev-libs/glib-2.68:2
-	>=x11-libs/gtk+-3.20:3
-	>=media-libs/gsound-0.98
-	>=dev-libs/libgweather-3.32.0:2=
-	>=gnome-base/gnome-desktop-3.8:3=
-	>=sci-geosciences/geocode-glib-1
-	>=app-misc/geoclue-2.4:2.0
-	>=gui-libs/libhandy-1.0.0:1
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-libs/libxml2:2
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	$(vala_depend)
-	dev-libs/libgweather:2[vala]
-	media-libs/gsound[vala]
-	gui-libs/libhandy:1[vala]
-"
-
-DOCS=( AUTHORS.md CONTRIBUTING.md README.md )
-
-src_prepare() {
-	xdg_src_prepare
-	vala_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dprofile=default
-		-Ddocs=false
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/gnome-clocks/gnome-clocks-42.0.ebuild b/gnome-extra/gnome-clocks/gnome-clocks-42.0.ebuild
index 6c59c7f71b53..6c7a31b686e4 100644
--- a/gnome-extra/gnome-clocks/gnome-clocks-42.0.ebuild
+++ b/gnome-extra/gnome-clocks/gnome-clocks-42.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Clocks"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.68:2
diff --git a/gnome-extra/gnome-commander/Manifest b/gnome-extra/gnome-commander/Manifest
index b3d12fe32c0c..2bc6bbd195b7 100644
--- a/gnome-extra/gnome-commander/Manifest
+++ b/gnome-extra/gnome-commander/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-commander-1.14.2.tar.xz 6868340 BLAKE2B 6b6f2a9435b9bb34a0318ddec0c509e1bef58399ce3bc1a77cf8ba6d97d5fec5e001d301e26ec7575e4c5a2f265ad0ca2e08e86f9f8045c04d6f558c17002bde SHA512 bfbc201ecaf6f9c0a71c7eba73f5d6ef9ba88f0ce8dba5d586058d87125bc51fc4b7f5e9752b7003343d686ea83db916ef78adf8c9d0df1e8715a3c88f9d1ce2
+DIST gnome-commander-1.14.3.tar.xz 6862280 BLAKE2B 802a3d147c056b08025164b68d48dfc731a0db0d78ada3c5e81866e0918903d82c101fc688bb6a101760605fa17e6d45bb18800aa659b7150e376844d00d0a22 SHA512 a3a89b922c23b49587d1b459760a263c886636735549c8dcd592b1ccb838838a3748ec83eb65ca8bbb62d82d4b588479a7673314d6924075b733b31318e52756
 EBUILD gnome-commander-1.14.2.ebuild 1237 BLAKE2B b7cd462bea2d11cd90042a95a4b1522121bf45f2ea2a3d8834ba71f397f2448f0b0e845248eb547f63e075d5a25d59f2901a0efa0209843471d926fe625d231c SHA512 40305dfb2e51557189f36e6542b946e0f134ecac8f1c835f77352f0e0790a2cf719d3fd2ada735c6e71b738085d37fac6b01724bae8c8f2e0df7a6a0fdc40cad
-MISC metadata.xml 1094 BLAKE2B e9a1616e9a5dc1811187299c0265b5e689b475d39d65e1901bb045540214be963c052aec0fd6ca45c7604037bb0c08dc79dbea3e561a0055380a416736ee59b3 SHA512 29f24a064c8193dd8e3c29f9c4c3f57daaaaf11b0425936becbb16fd84af04f9f046bc71ad2ab533c8fb0aafdfc03bc76e2ef9d49b38e5d2b527d0e0dfcb01b1
+EBUILD gnome-commander-1.14.3.ebuild 1239 BLAKE2B b035d7e0076c3cc7ebbab5f481fd67f908a9b95da9988bc0dcf5d0f396618ff391685fc691e93772b4eeae3adef9c160aa1ec6ea3355412f57679b9a3245b355 SHA512 11fdc4002cd424fb64e83d3fe12a7ce234b6d9692637fa8972e3d17e610b5e02b8acca2884d2aff3173bba70632719f02ec7e531eda0245d3afe2105e53fc685
+MISC metadata.xml 1035 BLAKE2B d1859613430fe587c40a7af96d70ee0c64bf145fb19769a9f101343e4fd48fb7957e815d4ce9e6568186ce31d8524cc60edaa2fe2fcd50e574d03cbd3a450adb SHA512 ab6001f9adb293e652187d451e71cc4c38fdd2f104c528c9aa95eec898fdf33944c32b38bb4813882246d83c36028b475a8373399f4f953f7ef60838eff8b311
diff --git a/gnome-extra/gnome-commander/gnome-commander-1.14.3.ebuild b/gnome-extra/gnome-commander/gnome-commander-1.14.3.ebuild
new file mode 100644
index 000000000000..3cf67a8ee2a4
--- /dev/null
+++ b/gnome-extra/gnome-commander/gnome-commander-1.14.3.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome2 optfeature
+
+DESCRIPTION="A graphical, full featured, twin-panel file manager"
+HOMEPAGE="https://gcmd.github.io/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="exif gsf pdf samba taglib test +unique"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	app-text/yelp-tools
+	>=dev-libs/glib-2.70.0:2
+	>=x11-libs/gtk+-2.24.0:2
+	exif? ( >=media-gfx/exiv2-0.14 )
+	gsf? ( >=gnome-extra/libgsf-1.12:= )
+	pdf? ( >=app-text/poppler-0.18 )
+	samba? ( gnome-base/gvfs[samba] )
+	taglib? ( >=media-libs/taglib-1.4 )
+	unique? ( >=dev-libs/libunique-0.9.3:1 )
+"
+BDEPEND="
+	app-text/yelp-tools
+	dev-util/glib-utils
+	dev-util/gtk-doc-am
+	sys-devel/flex
+	>=sys-devel/gettext-0.19.7
+	virtual/pkgconfig
+"
+DEPEND="
+	${RDEPEND}
+	test? ( >=dev-cpp/gtest-1.7.0 )
+"
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		$(use_with exif exiv2) \
+		$(use_with gsf libgsf) \
+		$(use_with pdf poppler) \
+		$(use_with samba) \
+		$(use_with taglib) \
+		$(use_with unique)
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	optfeature "synchronizing files and directories" dev-util/meld
+	optfeature "viewing the documentation" gnome-extra/yelp
+}
diff --git a/gnome-extra/gnome-commander/metadata.xml b/gnome-extra/gnome-commander/metadata.xml
index f0e845edde9b..2ba2944b6f0d 100644
--- a/gnome-extra/gnome-commander/metadata.xml
+++ b/gnome-extra/gnome-commander/metadata.xml
@@ -16,7 +16,6 @@
     </maintainer>
     <changelog>https://gitlab.gnome.org/GNOME/gnome-commander/-/blob/master/NEWS</changelog>
     <bugs-to>https://gitlab.gnome.org/GNOME/gnome-commander/issues</bugs-to>
-    <remote-id type="freecode">gnome-commander</remote-id>
   </upstream>
   <use>
     <flag name="gsf">Add metadata support for OLE, OLE2 and ODF</flag>
diff --git a/gnome-extra/gnome-contacts/Manifest b/gnome-extra/gnome-contacts/Manifest
index b94f7d723f69..dd21618c88f4 100644
--- a/gnome-extra/gnome-contacts/Manifest
+++ b/gnome-extra/gnome-contacts/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-contacts-41.0.tar.xz 275248 BLAKE2B c0611a131ce1ebb74b96e96e2e1b9370526b56c49ee43876273fdf5b2f3b333ad2aad85c50ddcebaac85ee8c996037fec3209c6765cab7b37b49ced04a82a7a8 SHA512 310f333c0863d8e58c2280b994071b2655eee7224ab80a468ffc7acc61834d3f6dbb794bbdc5b8d4428226bab96f3ea65b8bed39df79d88704e38b51a8f4b05f
 DIST gnome-contacts-42.0.tar.xz 343312 BLAKE2B a86bc70301a4f04bf7be426802e75d412abfa468555172233c5b540fcc0e630c433607ebe2a5dbffa58d49ab23773deb6099f88fdfa06f44f767d3fce57821bc SHA512 09a0d70a1550136717c4f837f2e4526928559de4bccedb71b34a216d99c36886bfd5786fcc3487198c488b4778046453d0069da55ab283ef87513c2d668a11cd
 EBUILD gnome-contacts-41.0.ebuild 1707 BLAKE2B b2d3dd5685a8ff16f0df0a0296aea2edae198d72591cd65d040da35e635751df938e66a1a56ec2f50fcb671d34544de24e810506267418b983f23c089b6470dd SHA512 fb4109232b8a992fee3e0db88ba17ae201f7082c092840d71fc4ddadc2291d341101035aa9b44fe191b46be518125fff382904017419bd4e6c345737e7673205
-EBUILD gnome-contacts-42.0.ebuild 1616 BLAKE2B 4b7c9863928f80b72c853a5b5e87546b23cbc5f4130e6b3fb2c006455bcb70f0eab60dad899e1c732e55b24c2275931f40b3e10db8a7deb3eeaac82636f12014 SHA512 69a97c113f7c133ee736805bef952b702e4d33239092d688495b3808518a9a54944b51043fdfc1a983dba176d84cf3ec946dc91332b62232f378d844f676d582
+EBUILD gnome-contacts-42.0.ebuild 1631 BLAKE2B 845ad45aeb1ce1721f437ee2b6d4b244be719ae311095dfb44d67a0d922d887d3ab963f008c8ff1313e6cfc60509b630a40d3007c4431fdbc7773dbf2043385e SHA512 95f8c01f41e0c2efb8c8a2c5f3837512edae9fe684f5b8762862d61cbe0abb84dcc59a8ebc856f763f4a83e64a5424426d7e87f501160b68f04fa5d9080c8722
 MISC metadata.xml 326 BLAKE2B 2a56fccc6957b8379b65dafdc5e0893083d0f454785fbd96f3c7695fb16bdbc75db3ece95320549158e227a9e82d84f0ad2144d4ed716647b6433081d36c56d1 SHA512 077fb36f1482d3da1c655d653d693368ba35494429a6c28a64f41f8c37705a5e5a5e49acc3caee6207dd6511cb105d020cc6f17a8b89f8fb4d54a7b26feac1f9
diff --git a/gnome-extra/gnome-contacts/gnome-contacts-42.0.ebuild b/gnome-extra/gnome-contacts/gnome-contacts-42.0.ebuild
index 6650c92c6962..a1351affebff 100644
--- a/gnome-extra/gnome-contacts/gnome-contacts-42.0.ebuild
+++ b/gnome-extra/gnome-contacts/gnome-contacts-42.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Design/Apps/Contacts"
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE="telepathy"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv ~sparc ~x86"
 
 VALA_DEPEND="
 	$(vala_depend)
diff --git a/gnome-extra/gnome-documents/Manifest b/gnome-extra/gnome-documents/Manifest
deleted file mode 100644
index fd94a3adec69..000000000000
--- a/gnome-extra/gnome-documents/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX fix-build-with-meson-0.61.patch 480 BLAKE2B 88070a5628a4e6416a3870131f7f964188bf2997fa763dbcafc315b4fa44efe8312a9d29ee9dc09b8f7668ffd00beb50c1b37807bd5718ad4a8186d3dd6e727a SHA512 e2c51086c371e469eb274cdf302121609da6ac1b7d4a3300dbdb98a774a699094c9c8d267ca0b1462f6e25a153151155dcd8bf6c5af075ec6a9489f78c3ec386
-DIST gnome-documents-3.34.0.tar.xz 914100 BLAKE2B 5b59931d488a5b3d3b2940852b64b0af3cff71c685d62e07bee5d0e981e9a78bb913db853c0c3f138ea1728d2ff7495b689f1f5509064131ee2a4649e65d527f SHA512 5867b148aaffd02089e4f1148cf0fbce37ba0ed40c7d255f9261cd225757f56b68293d59476ab7c11ebbe310cc7935081b2770e7bc24bdbddb5934da5ea0cf87
-EBUILD gnome-documents-3.34.0-r1.ebuild 1669 BLAKE2B 627a4f39b8060cf4e181ff5f6a69c9d5bcad48ee9a408b7f64353fcac6da5543b73643a7876ca4440698e8bd8f8db573ef60cd3ae59f6f0e130a50a237422f9c SHA512 64ccbfb66db946182d6e33112fbe44b8d3b73abd3a50c72276d3ac581d4f1a0c74053cebf5b45951a5812301bda0288f45329cb7e97dc35238012b55512eff60
-MISC metadata.xml 546 BLAKE2B c847c48f46a7ed40653eb3b2363df0219a8cfd1b876ac7f6cd29290227497cc74c0490a650f03fcc7593ca2fe01d83e3cc122f51e6292b75d31c3afb4bd7f0df SHA512 fa2a5b960480dcf34e48f082ccedcd2d88996573a179c42207a8ccf0aa9961145691142cf354ba4492bf3b358545994c6a25e3ff0d97d62db0621097537ba8b2
diff --git a/gnome-extra/gnome-documents/files/fix-build-with-meson-0.61.patch b/gnome-extra/gnome-documents/files/fix-build-with-meson-0.61.patch
deleted file mode 100644
index 2a3a5cd3d3e3..000000000000
--- a/gnome-extra/gnome-documents/files/fix-build-with-meson-0.61.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-https://bugs.gentoo.org/833843
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -56,7 +56,6 @@ foreach app: documents_apps
-   appdata = app + '.appdata.xml'
- 
-   appdata_file = i18n.merge_file(
--    appdata,
-     input: appdata + '.in',
-     output: appdata,
-     po_dir: po_dir,
-@@ -76,7 +75,6 @@ foreach app: documents_apps
-   desktop = app + '.desktop'
- 
-   desktop_file = i18n.merge_file(
--    desktop,
-     type: 'desktop',
-     input: desktop + '.in',
-     output: desktop,
diff --git a/gnome-extra/gnome-documents/gnome-documents-3.34.0-r1.ebuild b/gnome-extra/gnome-documents/gnome-documents-3.34.0-r1.ebuild
deleted file mode 100644
index 5245d0f95f9d..000000000000
--- a/gnome-extra/gnome-documents/gnome-documents-3.34.0-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome.org gnome2-utils meson xdg
-
-DESCRIPTION="A document manager application for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Documents"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE=""
-KEYWORDS="amd64 x86"
-
-# cairo-1.14 for cairo_surface_set_device_scale check and usage
-COMMON_DEPEND="
-	>=app-text/evince-3.13.3[introspection]
-	app-misc/tracker:0/2.0
-	>=dev-libs/gjs-1.48.0
-	>=dev-libs/glib-2.39.3:2
-	gnome-base/gnome-desktop:3=[introspection]
-	>=dev-libs/gobject-introspection-1.54:=
-	>=x11-libs/gtk+-3.22.15:3[introspection]
-	>=net-libs/libsoup-2.41.3:2.4
-	>=net-libs/webkit-gtk-2.6:4[introspection]
-
-	>=dev-libs/libgdata-0.13.3:=[crypt,gnome-online-accounts,introspection]
-	>=net-libs/gnome-online-accounts-3.2.0[introspection]
-	>=net-libs/libzapojit-0.0.2[introspection]
-
-	>=x11-libs/cairo-1.14
-	x11-libs/gdk-pixbuf:2[introspection]
-	x11-libs/pango[introspection]
-"
-RDEPEND="${COMMON_DEPEND}
-	>=app-misc/tracker-miners-2:0
-	net-misc/gnome-online-miners
-	sys-apps/dbus
-	x11-themes/adwaita-icon-theme
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.2
-	app-text/docbook-xsl-stylesheets
-	dev-libs/appstream-glib
-	dev-libs/libxslt
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.8
-	dev-util/itstool
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/fix-build-with-meson-0.61.patch
-)
-
-src_configure() {
-	local emesonargs=(
-		-Ddocumentation=true #manpage
-		-Dgetting_started=false #inkscape and pdfunite build deps
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/gnome-documents/metadata.xml b/gnome-extra/gnome-documents/metadata.xml
deleted file mode 100644
index a45b9ff52292..000000000000
--- a/gnome-extra/gnome-documents/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-<longdescription lang="en">
-	A simple application to access, organize and share your documents on
-	GNOME. It is meant to be a simple and elegant replacement for using a
-	file manager to deal with documents. Seamless cloud integration is offered
-	through GNOME Online Accounts.
-</longdescription>
-</pkgmetadata>
diff --git a/gnome-extra/gnome-integration-spotify/Manifest b/gnome-extra/gnome-integration-spotify/Manifest
index 8d1d04628cd6..31475b513a62 100644
--- a/gnome-extra/gnome-integration-spotify/Manifest
+++ b/gnome-extra/gnome-integration-spotify/Manifest
@@ -2,5 +2,5 @@ AUX gnome-integration-spotify-command-line-parsing.patch 357 BLAKE2B b1e823c8477
 AUX gnome-integration-spotify-correct-interface.patch 797 BLAKE2B fab74ff1202d47b60acb4350fe542116d9eae8abc4efff748713f6026e8adebb33a48ff89f76375510951f27a9c1c93a8bf9dbf6c6403a0d8745b660a027f0e7 SHA512 d875db53ea7eae23a1280534278ac17fd12a75673162029a86d9b232bd6cc27ea71287f5d904a0fa9328b2716d3e115675a72e5729748491ee1482ff0522f9b2
 AUX gnome-integration-spotify-use-glib.patch 1209 BLAKE2B 1cc5ca0d145dd73d2ad78b43d291034ee291e1974b110291560c8d952afe0e2170f205f78bb477a06bc0153583a0cc2bc02150701baa170b8466825665730bad SHA512 daaa2ba1f3484946c916e1cac821d9d09b54c2ca1da0cdbd0db58d6b576d54a68cdb285d9e424fa070ebf1074f32a4cf43305741314ae49026eaa9bf2fde6a37
 DIST gnome-integration-spotify-20140907.tar.gz 6709 BLAKE2B b66018e5d0e5da4ee2a63b4f2fe1622d1c09c63fc3f69a13a353dbec0ae862d7188d2f83016d1d12892cc69f69dc8f2d4930de494e5cfaf377cdb28af377b5ff SHA512 51e0e7fdb0912e230b0965ca05740b01633b3bc0219dd6e8c31ad5a9378b15c1b44ce1f99098900af7a478f0d6180c3ee015c1717603b6c2fb4c54769dddb874
-EBUILD gnome-integration-spotify-20140907-r2.ebuild 1293 BLAKE2B cbe4c59cd511a986d8d31919703020f95b650619030d63f5d6d32be01bcc69c76ee57626276239118d9d51fa50175eb5a4e531526f995b46da1f05296ceaa341 SHA512 15f6b9d9541ff7d59de203d9a245f54b58daa7fc1db5cb1a7f2e53df452c42c5626a2a2fa274922ab88ac755c681d9cfd296114097974f5c490813e204f15406
+EBUILD gnome-integration-spotify-20140907-r2.ebuild 1304 BLAKE2B fa5a74f49b5c7b5d56ce9ca5290f0fc188af5a6ba55d8a1ddc894e5132c293a2e4b97add5622949fe456d8d1bb310f82e3ec909bbd89e84e46b80974d36557fc SHA512 72f9ca3e9952960921a20fc9fb38a4fd4ec59e1191b422334ab2860314dd0beb9366ca4b2ff806a1c9a369829eec409a9350a25b21fdfe21d0a0977ef4957d5c
 MISC metadata.xml 355 BLAKE2B c910f51ce5afc9cb2164bf16f7b8dfd25654e0b75de0850888f541fbe155a2590a319e1d4ae9ea0e02718a4b190aef745b953741ea44bacf25a1d0eb02679ad8 SHA512 6d4a275b0dacc7f571d16e3c3c4d2873c446abbb8289e3616587b2b671d9e823d7c2e5ab6cdd81c046fd58918145bb79034e5ad2b83b2164d5a06dd05a53ac8b
diff --git a/gnome-extra/gnome-integration-spotify/gnome-integration-spotify-20140907-r2.ebuild b/gnome-extra/gnome-integration-spotify/gnome-integration-spotify-20140907-r2.ebuild
index 5e822f8ad79e..dd762e2d1488 100644
--- a/gnome-extra/gnome-integration-spotify/gnome-integration-spotify-20140907-r2.ebuild
+++ b/gnome-extra/gnome-integration-spotify/gnome-integration-spotify-20140907-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_7 python3_8 python3_9 )
+PYTHON_COMPAT=( python3_7 python3_8 python3_9 python3_10 )
 
 inherit gnome2-utils python-r1
 
diff --git a/gnome-extra/gnome-logs/Manifest b/gnome-extra/gnome-logs/Manifest
index 5fb0802ddff1..ee0bd79af02b 100644
--- a/gnome-extra/gnome-logs/Manifest
+++ b/gnome-extra/gnome-logs/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-logs-3.36.0.tar.xz 744104 BLAKE2B 585c39577ff1eba6b3af638d0cd5d452cbb20ce0444386fcd8fbbbc0192e59a7cc9139263ecbfb7ada85f71f044a998c51172cae1a7ba481c14c0a1650817cb5 SHA512 3a4a1f6af63f97a8814fcdbcf6e23e6a89dd150f2a5c5ebce21d8b9b74f6a8985ae5b3789aa37857b1631b33108d5048d7cfe32ebb7c7413d8ce27f25c8a58b8
 DIST gnome-logs-42.0.tar.xz 461520 BLAKE2B 6c4c22b4d9b428d3d90aba851171f7ec96ddc0157ca9d03a46ff84c915d4057f4f6c0462f01285954b4d0a49c26073e03c31ac10bbc862b4a6ab3ebee73f34ab SHA512 94634006148391bf158878e845bf04f1139f90b78bc3d63bb687bb683bb07c8b5fbec9d7c1e9f7454bf5345862578d83226207d3f78611dbf96566994190766f
-EBUILD gnome-logs-3.36.0.ebuild 789 BLAKE2B d94bed94d0e35e647465bb4b2e0d247cbef489cb32cef1137b192b17e9c5d4cc4588af3966ca9c315e906d9985b490b27065feda462f9a1a37a6a23de4a4fcfe SHA512 f918c67c67002169bfac23e55ebe6ba69ded4f9c00295fb9fa8ff10d51a86a9a98372b689844f1757bd4f7861e6d76bcb8a26d3012679d75feb5dd506faba003
-EBUILD gnome-logs-42.0.ebuild 820 BLAKE2B badff9b8506f660083c202ef76f64e215e05f47f3fb85b54cace9a89668b7c7290a3027f721b42216d7dbf696f036fb3c296e527da3d0ee5287107abd4c2c350 SHA512 3957e02be4a3d7871e6fdc5756d551cf4573c30a99f894678923920c257bea13b9d12faa1990d0c9a48b44b0488ec9b07de5f4cdbf2a8519a3024f3d6aeb4d5f
+EBUILD gnome-logs-42.0.ebuild 818 BLAKE2B 108b0b563d1fbb5aeba042ea61022dffe312ee93508286244b978d3fe9fadf845591e86bc78b1a67a26bda13b86aaadae6c2a20c4c32a63d1a303de5159b31b8 SHA512 464b6442ff72d87dd2f78114469254995c20ee4cbcb5effcdc3acae17302f26273260a9cc6bc7c3d3b1d9771ec35f326ae41572d5b7c186560408ca82efe037d
 MISC metadata.xml 254 BLAKE2B de7a97001e5947704f42973c8a0c3a23c2d80afb976254f5fd21e9d372a946e055d4cdc3c0eaed010505f87929b56e8b1e650c945e2a302644adbc9440833be8 SHA512 c81da4f9b80e5691a167f4590906952e25356604ec17689c005be14efb394c0634776bbe84df936edde239480bdf46db41216b00da4a3a45f670e9ca18ab0132
diff --git a/gnome-extra/gnome-logs/gnome-logs-3.36.0.ebuild b/gnome-extra/gnome-logs/gnome-logs-3.36.0.ebuild
deleted file mode 100644
index f6ec67a9021e..000000000000
--- a/gnome-extra/gnome-logs/gnome-logs-3.36.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome.org gnome2-utils meson xdg
-
-DESCRIPTION="Log viewer for the systemd journal"
-HOMEPAGE="https://wiki.gnome.org/Apps/Logs"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
-
-RDEPEND="
-	gnome-base/gsettings-desktop-schemas
-	>=dev-libs/glib-2.43.90:2
-	>=x11-libs/gtk+-3.22:3
-	sys-apps/systemd:=
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.8
-	app-text/docbook-xml-dtd:4.3
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	dev-util/itstool
-	virtual/pkgconfig
-"
-
-src_configure() {
-	meson_src_configure -Dman=true
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/gnome-logs/gnome-logs-42.0.ebuild b/gnome-extra/gnome-logs/gnome-logs-42.0.ebuild
index a77cf4b94132..f0bf9500b3a1 100644
--- a/gnome-extra/gnome-logs/gnome-logs-42.0.ebuild
+++ b/gnome-extra/gnome-logs/gnome-logs-42.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Logs"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 
 RDEPEND="
 	gnome-base/gsettings-desktop-schemas
diff --git a/gnome-extra/gnome-power-manager/Manifest b/gnome-extra/gnome-power-manager/Manifest
index ecddac0c6da9..c92c2347d8a6 100644
--- a/gnome-extra/gnome-power-manager/Manifest
+++ b/gnome-extra/gnome-power-manager/Manifest
@@ -1,3 +1,3 @@
 DIST gnome-power-manager-3.32.0.tar.xz 379136 BLAKE2B 3f9b385c37fcf1de3741781627d275057f67d489ed4b372f6f68495a707d9e67b78be9f186922a99a606a80008addd570943800ddb2ddd17d2071161b7276c49 SHA512 0ea11085dd015e30c1bdc6913000b63eabf7df76720f2d51d63b075f3b7bd2a610aaa484c53a4092d78d3c484ed8c4e81ec66603bdc6c132b0316113ec6a24a0
-EBUILD gnome-power-manager-3.32.0.ebuild 1099 BLAKE2B 65a6da8db2173ea97e29d862def828e79196bbb919cff254de1af0759093f434d5f59e970888b42f0789c8b596093c6f3b35237dd568455ad353f9cd2f5c80b7 SHA512 12ab459efc74ad7fb9cd4848e8326e297b3ca0515f5d0767ba5007d83806a91ae637ffadeca679addfc627fd5f9d7cac7dd5cc74a69879498190a6863d89e573
+EBUILD gnome-power-manager-3.32.0-r1.ebuild 1112 BLAKE2B 11bf88b2c34953a79643c3a775f50fae4ac028f6b01f4759911cbbb99e77bf64f556a2ebe44b606829121f8d3395d1323eb80aae40b7d7fb12c2349803600534 SHA512 f98c5f5f944a8e3ec5ca7e0192750f6b0b1cbf5fc26c89f875032fdef53d3956dc56c43095b648283d0f5bff4e7bc8fa4a16e64ed61b908981063ad1c7c4a9ba
 MISC metadata.xml 601 BLAKE2B d7c18f13a8eb5b49e623fc12e179a8c4dcc4423ed811a6240b551b26a2328cbeb0b553e192a31b4d21001959b616e635ce2361d8569c0802ba51a65aea336813 SHA512 faebc91de329a93bfdfb2275deb587f03f91d5c56624cc1c5dadcb1995527f45a774a343f6c1d3bb49b1b97e52ac67a6144abfec1ae24e6b2e3993eac35347f9
diff --git a/gnome-extra/gnome-power-manager/gnome-power-manager-3.32.0.ebuild b/gnome-extra/gnome-power-manager/gnome-power-manager-3.32.0-r1.ebuild
index afdfc9a1f305..25d97722abba 100644
--- a/gnome-extra/gnome-power-manager/gnome-power-manager-3.32.0.ebuild
+++ b/gnome-extra/gnome-power-manager/gnome-power-manager-3.32.0-r1.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
+
 inherit gnome.org gnome2-utils meson virtualx xdg
 
 DESCRIPTION="GNOME power statistics"
@@ -9,9 +10,9 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-power-manager"
 
 LICENSE="GPL-2+"
 SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 COMMON_DEPEND="
 	>=dev-libs/glib-2.45.8:2
@@ -23,10 +24,12 @@ RDEPEND="${COMMON_DEPEND}
 	x11-themes/adwaita-icon-theme
 "
 DEPEND="${COMMON_DEPEND}
+	x11-base/xorg-proto
+"
+BDEPEND="
 	app-text/docbook-sgml-dtd:4.1
 	app-text/docbook-sgml-utils
 	>=sys-devel/gettext-0.19.7
-	x11-base/xorg-proto
 	virtual/pkgconfig
 	test? ( sys-apps/dbus )
 "
diff --git a/gnome-extra/gnome-shell-extension-alphabetical-grid/Manifest b/gnome-extra/gnome-shell-extension-alphabetical-grid/Manifest
index 2b125bd663a1..f885e956a871 100644
--- a/gnome-extra/gnome-shell-extension-alphabetical-grid/Manifest
+++ b/gnome-extra/gnome-shell-extension-alphabetical-grid/Manifest
@@ -1,8 +1,5 @@
-AUX gnome-shell-extension-alphabetical-grid-22.0-redisplay.patch 1164 BLAKE2B e25d1101d5bc70f61404de17762bbb17638b9c9f9ad5d921498fd7292df3858c5aff7c44c8b281aedc87c9d2bdae36908aa2f78a949e91a11e0d8a39d0417309 SHA512 16a5794abf382ed9a5c63b35b100d654a1790a5bf4aecd33f65b6b21475cf881444bd8ea6d18e2b86dd68d8373fc42932d5544095df876e8c77f3c490a4f3c2b
-DIST gnome-shell-extension-alphabetical-grid-19.0.tar.gz 288661 BLAKE2B b3df5594422f7d5ba249ec5a3eebf178e845fc2f36f838f61c86c0aa1918f9ca7e942a6af358e3f1744ce7f25a507f3e97bac71848cf6c0bac6339139ffd0d3d SHA512 139f1d06ebeef3b76ac84f71190cf77ebc77571ff3b489bb86f578cfa01ce7de47e53798fece93cb6c45bd82cb6b2a425ba255c1485d5b8739da28bd9959fce8
-DIST gnome-shell-extension-alphabetical-grid-22.0.tar.gz 208959 BLAKE2B 08ab108c0e51249531950ecdec18cdf9b205c0727aeb3e359fd8fb0a1ca9c0d4afec7c3a54b4ee130bc9b63ad58d6619e2d15d17622ccf68172aed38fcc5b97f SHA512 ae8cc174d5c003debe7e78ff415fbde66b495d93ea7130b2aef459ce42b6e7970c4c14221ec7f5febb3f6d2ff05365b738c92e7bc2357867495185e05a82ffea
 DIST gnome-shell-extension-alphabetical-grid-23.0.tar.gz 209076 BLAKE2B 82fd5fdd4d10cb134bd47221d0ecdf651f86e7c77872373a27489aec526df715eedd3d7e4407fc4c53617d14984d2690ff0fe6db5ba3c92dabf13d175f0d7a21 SHA512 6c932216956f421838c608fc8e6426039761e6233305dfb1ea0a0bf6c8afc65632983fed12d3f5a3605ff1ef73f8ebc11715ff47ac7570960ff2361e436760f8
-EBUILD gnome-shell-extension-alphabetical-grid-19.0.ebuild 1422 BLAKE2B 71bca6a4078f41a08c2a2b3291acad0440c60262b9a6b5c05ffea13485dfa3958aa665395f72b996568fdff222f68d28b36ee715949e9fb2a24434393250d271 SHA512 00ebf81e517bcafb935f061cb11162d3dd99dc13398a9d44eec08f951f22e42402b7f72ae0885d99d72524cf101fffb53db3959756520b2c1bdf43f3f728608e
-EBUILD gnome-shell-extension-alphabetical-grid-22.0.ebuild 1434 BLAKE2B 1deaa43cfe9d041f62783e1f9daebd0293061aac412469539f8feffa80221c113728ed84971db83607a0f17652179704ffc7551241d682dc6f5c6febf8eb8dfc SHA512 bdc37596751fbce2d96cac831291bb7f0d80485eef816971ef44fd6dfdd6a5d09437cde3a1e6e30d442afca932a97898ab7759d34ed6061f7ee66da226510e1f
+DIST gnome-shell-extension-alphabetical-grid-24.0.tar.gz 210398 BLAKE2B 6b782085328ca9d61f9aa7406db1f586d35abe50b20e8c2fd06e534166985b1be688b930d4b4f19cd460a69fc4fd5004cf49600fde9a435c7c592d101191f2f6 SHA512 b54ac0b00b4c538ab4064c6bcc197fa65c730e732a80c23e23ed78915e53a8211634f68b842b2f00935b3d48669a19e66ac0eb1d43bcd34955967108a570ebaa
 EBUILD gnome-shell-extension-alphabetical-grid-23.0.ebuild 1385 BLAKE2B efb9b1538244fd377e7f352cc17c68c668d4baecafc8c0ca90d52c9e22653876aabc2aad98aee489a1d6152a4fd2d04b9056dc3b3c5b91b04050966f9e41e0eb SHA512 2b7a39796b6ba90f538d6ef6225fd7d327240f63828f1d40ff65ebd80f754784a58154431a65a5fdeb6fdb46e514ec13dc9343f739ed3b4eb655075407c7602c
+EBUILD gnome-shell-extension-alphabetical-grid-24.0.ebuild 1387 BLAKE2B 66acfb635b5537f8ee83127cf7dbad393c655409748899053872010b341f2b035106f39666acddd424e50661fc391236df89306a14bfbdd69f569d7138416979 SHA512 f011b5ad3f59ce6ef68bc548682e2cd60e47eca862022b95f84c597fc0c60d0d573db35f0e892ba29fc0df44e5e27714dfe1baedce8b0873b7b9f474fb243615
 MISC metadata.xml 241 BLAKE2B cb0374238d11e2a3f28f23b7049da09babd4310a99862738acfb7ba554f7758ac68cd09d1eb7a29068195c27010a846a540ed2c09b88fd043b37fb4f0762150f SHA512 b2c1d3e2cb6760ed4682da82af5370adcacd48afd558efa1abf84d955067b2ad32eda034af8cef95c71409622f97fa0113f2e07bee328f2d03512908ae931050
diff --git a/gnome-extra/gnome-shell-extension-alphabetical-grid/files/gnome-shell-extension-alphabetical-grid-22.0-redisplay.patch b/gnome-extra/gnome-shell-extension-alphabetical-grid/files/gnome-shell-extension-alphabetical-grid-22.0-redisplay.patch
deleted file mode 100644
index 7010a11735ef..000000000000
--- a/gnome-extra/gnome-shell-extension-alphabetical-grid/files/gnome-shell-extension-alphabetical-grid-22.0-redisplay.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From ae8d9c55ede615c244729e1dd0bd20de3f09e386 Mon Sep 17 00:00:00 2001
-From: stuarthayhurst <stuart.a.hayhurst@gmail.com>
-Date: Fri, 8 Apr 2022 16:06:10 +0100
-Subject: [PATCH] Call original _redisplay() once to setup, respect internal
- pages updating lock
-
----
- extension/extension.js | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/extension/extension.js b/extension/extension.js
-index 2c8cc71..7f6b4db 100644
---- a/extension/extension.js
-+++ b/extension/extension.js
-@@ -23,6 +23,7 @@ function enable() {
-   ExtensionHelper.loggingEnabled = Me.metadata.debug || gridReorder.extensionSettings.get_boolean('logging-enabled');
- 
-   //Patch shell, reorder and trigger listeners
-+  AppDisplay._redisplay();
-   gridReorder.patchShell();
-   gridReorder.startListeners();
-   gridReorder.reorderGrid('Reordering app grid');
-@@ -93,7 +94,7 @@ class Extension {
- 
-   reorderGrid(logMessage) {
-     //Detect lock to avoid multiple changes at once
--    if (!this._currentlyUpdating) {
-+    if (!this._currentlyUpdating && !AppDisplay._pageManager._updatingPages) {
-       this._currentlyUpdating = true;
-       ExtensionHelper.logMessage(logMessage);
- 
diff --git a/gnome-extra/gnome-shell-extension-alphabetical-grid/gnome-shell-extension-alphabetical-grid-19.0.ebuild b/gnome-extra/gnome-shell-extension-alphabetical-grid/gnome-shell-extension-alphabetical-grid-19.0.ebuild
deleted file mode 100644
index 6a8af9a70239..000000000000
--- a/gnome-extra/gnome-shell-extension-alphabetical-grid/gnome-shell-extension-alphabetical-grid-19.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit gnome2-utils
-
-# Useful specially to prevent
-# https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/4684
-# https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/3180
-DESCRIPTION="Restore the alphabetical ordering of the app grid"
-HOMEPAGE="https://github.com/stuarthayhurst/alphabetical-grid-extension"
-SRC_URI="https://github.com/stuarthayhurst/alphabetical-grid-extension/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	app-eselect/eselect-gnome-shell-extensions
-	>=gnome-base/gnome-shell-3.38
-"
-DEPEND="${COMMON_DEPEND}"
-BDEPEND=""
-
-S="${WORKDIR}/alphabetical-grid-extension-${PV}"
-extension_uuid="AlphabeticalAppGrid@stuarthayhurst"
-
-# Tests are only useful for upstream
-RESTRICT="test"
-
-# Not useful for us
-src_compile() { :; }
-
-src_install() {
-	einstalldocs
-	insinto /usr/share/glib-2.0/schemas
-	doins schemas/*.xml
-	rm -rf README.md LICENSE.txt Makefile schemas || die
-	mv -v ui/* . || die # Searches for these files in parent dir
-	insinto /usr/share/gnome-shell/extensions/"${extension_uuid}"
-	doins -r *
-}
-
-pkg_preinst() {
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	gnome2_schemas_update
-	ebegin "Updating list of installed extensions"
-	eselect gnome-shell-extensions update
-	eend $?
-}
-
-pkg_postrm() {
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/gnome-shell-extension-alphabetical-grid/gnome-shell-extension-alphabetical-grid-22.0.ebuild b/gnome-extra/gnome-shell-extension-alphabetical-grid/gnome-shell-extension-alphabetical-grid-24.0.ebuild
index 75bba270503a..435d2222d99b 100644
--- a/gnome-extra/gnome-shell-extension-alphabetical-grid/gnome-shell-extension-alphabetical-grid-22.0.ebuild
+++ b/gnome-extra/gnome-shell-extension-alphabetical-grid/gnome-shell-extension-alphabetical-grid-24.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/stuarthayhurst/alphabetical-grid-extension/archive/r
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="
@@ -29,10 +29,6 @@ extension_uuid="AlphabeticalAppGrid@stuarthayhurst"
 # Tests are only useful for upstream
 RESTRICT="test"
 
-PATCHES=(
-	"${FILESDIR}/${P}-redisplay.patch"
-)
-
 # Not useful for us
 src_compile() { :; }
 
diff --git a/gnome-extra/gnome-shell-extension-appindicator/Manifest b/gnome-extra/gnome-shell-extension-appindicator/Manifest
index c901fcce4263..1599c54ee8f8 100644
--- a/gnome-extra/gnome-shell-extension-appindicator/Manifest
+++ b/gnome-extra/gnome-shell-extension-appindicator/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-shell-extension-appindicator-41.tar.gz 52835 BLAKE2B 0d0bdc73bc10057ea012d26bd640c7ecd8005a7b36e7316b7d616e28a429e43f3b36ab2615ac4d6227dd5176b3a4f629a70c960e8f8961063c6979d5b04e5005 SHA512 8c67011884bc4cf6e4ddfc3ac0c191830775050d07cf3f8d7462ff4e0050cea00fd3f8372b1c75211e433344c64fea9903982769bc4d0428b51161efd275f5d9
 DIST gnome-shell-extension-appindicator-42.tar.gz 55122 BLAKE2B 995711c1f70105ab0b74ad61d567cb0efbf388df94097a4fb7dd59594a2df5ec22f6e24ff93999177ac845953ad392d7f27e7176fa47ff045eae056dcea49232 SHA512 a4c392a65afafc8e963539f87489eca604863a9e55a2e5fbcc905da144e70e3805a7ff8c1c40302a925a8cfe8dd5431fbc675ac127a04304fa5c3a5ea39beab0
 EBUILD gnome-shell-extension-appindicator-41.ebuild 943 BLAKE2B 126a39b88acf2f64dc97a782575d1a7963178f80273abc725adbdf0f2f7589a6ad535b975cbe2709e460607050554e78be64f20b6383d10eb821e3191e2c7074 SHA512 2d0e5ec7d85894b7087529842a0b2f4ac9a92ed89e2352467b752528c409f8ef87f9f914d9bfc23af09873715e42371f40ded5e2e717e819e370b02e670c4203
-EBUILD gnome-shell-extension-appindicator-42.ebuild 928 BLAKE2B c4dd7290ebda7e84a4604d18b2ebfd85e0a86eabdef5b7339d1ea73142f4734e7f7dbd40e6afa0ca25907cc4ab6636938882ad0c4461a4d25b1853deca3af8e6 SHA512 2aa88a96ef6877fce354df20b2b99a8d594edfc8e08e975b105842bff6442ea6695223300c82c7bcb923eded622458efa76eb5352ab5c746235a90959d0db82b
+EBUILD gnome-shell-extension-appindicator-42.ebuild 926 BLAKE2B 4e414ca60c66cd2fb9d9e0bfbe538b604853a87d5d30a87df15340c66a6f3bb4133f765330824ad0d1c0599f9c310a86d6b39d05e15e6acb5e2f13b51054c750 SHA512 a1ed94588838a4c5ef271466aac635d2f7b135a69fce1114fddfd18924a66dcacbe9c44f34e9db55581be872c3ecb5ad59946e1e626f720d388f50f9f845c475
 MISC metadata.xml 241 BLAKE2B cb0374238d11e2a3f28f23b7049da09babd4310a99862738acfb7ba554f7758ac68cd09d1eb7a29068195c27010a846a540ed2c09b88fd043b37fb4f0762150f SHA512 b2c1d3e2cb6760ed4682da82af5370adcacd48afd558efa1abf84d955067b2ad32eda034af8cef95c71409622f97fa0113f2e07bee328f2d03512908ae931050
diff --git a/gnome-extra/gnome-shell-extension-appindicator/gnome-shell-extension-appindicator-42.ebuild b/gnome-extra/gnome-shell-extension-appindicator/gnome-shell-extension-appindicator-42.ebuild
index e8439a3ef588..5261f65d1d5b 100644
--- a/gnome-extra/gnome-shell-extension-appindicator/gnome-shell-extension-appindicator-42.ebuild
+++ b/gnome-extra/gnome-shell-extension-appindicator/gnome-shell-extension-appindicator-42.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ubuntu/gnome-shell-extension-appindicator/archive/v$
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 
 RDEPEND="
 	app-eselect/eselect-gnome-shell-extensions
diff --git a/gnome-extra/gnome-shell-extension-applications-overview-tooltip/Manifest b/gnome-extra/gnome-shell-extension-applications-overview-tooltip/Manifest
index 34d10d9032c7..c4a2b6731b8d 100644
--- a/gnome-extra/gnome-shell-extension-applications-overview-tooltip/Manifest
+++ b/gnome-extra/gnome-shell-extension-applications-overview-tooltip/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-shell-extension-applications-overview-tooltip-14.tar.gz 27058 BLAKE2B 442e1b144358c40c6132ab2a067bb29439e826ccd540583a6e95d35841bca3eda53ac9b6004285c8ab63006d9e71dbdb46f0fb77310366cf976381bb70b50223 SHA512 6e5805f720e262181e4519ec8a19cf57dae41e3dcff3da4a4a1bc4a132bcc23aae575cc15aa0a0f5f04fe1a25a9ff3e03d5bcacb326c7bbc8d0b28351e0ecbfe
 DIST gnome-shell-extension-applications-overview-tooltip-15.tar.gz 25388 BLAKE2B 66efa481ac9fa10a74e5d57d309ed5a3ab8b6a11bda59273252f452b79086ab2bdd4da07ebaf7b152407409cb452bf9b3dcdceec94662c0c6d643002b1fd1f35 SHA512 34d4be856f21318c17d1675e8c097d8e2e5331b32e018d7c07a8c025ea4b9fdffa52ca491d75d4a182a2e4b63beea746707c5581e0d10d25280ec5627e92f882
 EBUILD gnome-shell-extension-applications-overview-tooltip-14.ebuild 1148 BLAKE2B 6c41570b1705b7137c62146fd731840f8405c7fdad3faa9165e03d5eeff9d11dec837623d48b15f670631f486bfbbeaf9c34cbac9a7c0ace93cac2eceee914de SHA512 3d1466567c72b19298d2d9cca10ae2b1785492fa244afad59e39625cca35f014b4b5a9805f7b6a261ca3954229c833f85b37a3011f19dfe47f4a816dd669c84a
-EBUILD gnome-shell-extension-applications-overview-tooltip-15.ebuild 1150 BLAKE2B 67842ad993a0376d00b41a9662c99aee9db328b95d88951526c2873160083b2bed5ae1616e8b353519f4ae22720cb1ddff2379e198878ff37a89a6de7ebe3460 SHA512 91175cf1f726238a17212d9a58f6f1a5b6aa74f10b2cd587c3b082485ede22ea53c3fc720e2ebaa84f6d26e6411d775c4e16732cc5562ad8d5250076096de88b
+EBUILD gnome-shell-extension-applications-overview-tooltip-15.ebuild 1148 BLAKE2B 77d87558041e1337fa12a213744818797b02c2f42386ccea5c529409bcaf92c9bb5be2503332e97347c2b3a3a57e4575cd14e9d3ae39283c2672cc155d7a62a2 SHA512 5fa881869449d38d3ceb22e710d3f76c8d1cd0be6ea00a74b53d7f9c76bb50ecd4304aab4df4ac33507f01fe7b89d9b35a5647a851c60a1347dd7799e2496a14
 MISC metadata.xml 241 BLAKE2B cb0374238d11e2a3f28f23b7049da09babd4310a99862738acfb7ba554f7758ac68cd09d1eb7a29068195c27010a846a540ed2c09b88fd043b37fb4f0762150f SHA512 b2c1d3e2cb6760ed4682da82af5370adcacd48afd558efa1abf84d955067b2ad32eda034af8cef95c71409622f97fa0113f2e07bee328f2d03512908ae931050
diff --git a/gnome-extra/gnome-shell-extension-applications-overview-tooltip/gnome-shell-extension-applications-overview-tooltip-15.ebuild b/gnome-extra/gnome-shell-extension-applications-overview-tooltip/gnome-shell-extension-applications-overview-tooltip-15.ebuild
index 26b68add6dc1..c94e4e1956e4 100644
--- a/gnome-extra/gnome-shell-extension-applications-overview-tooltip/gnome-shell-extension-applications-overview-tooltip-15.ebuild
+++ b/gnome-extra/gnome-shell-extension-applications-overview-tooltip/gnome-shell-extension-applications-overview-tooltip-15.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/RaphaelRochet/applications-overview-tooltip/archive/
 # https://github.com/RaphaelRochet/applications-overview-tooltip/issues/7
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/gnome-extra/gnome-shell-extension-bing-wallpaper/Manifest b/gnome-extra/gnome-shell-extension-bing-wallpaper/Manifest
index 74975f7e720a..252e92c69f89 100644
--- a/gnome-extra/gnome-shell-extension-bing-wallpaper/Manifest
+++ b/gnome-extra/gnome-shell-extension-bing-wallpaper/Manifest
@@ -3,5 +3,5 @@ DIST gnome-shell-extension-bing-wallpaper-39.tar.gz 6802966 BLAKE2B 262db45ef1ee
 DIST gnome-shell-extension-bing-wallpaper-40.tar.gz 6809128 BLAKE2B d1fa68367238ef32a83c85c525ba1d032e44a67a993ab85672e48803fb95149057de4877fa10e0daefca2cf0154b24f232ca1da13ecae5058c4d06928c53a45b SHA512 0715c690c9ae33d640b468156d9dbfe81f7e9618b77f2feddf6d5697445200bdd44b77f8b12f7134655c3a9ab3eae128607b642b8a3865f158e5960edc84a096
 EBUILD gnome-shell-extension-bing-wallpaper-37.ebuild 1103 BLAKE2B a04fc6a3b3e7f4b8e4e8b049017a52d30b1b8d442f4806e5f67966f6ff7fcb05435285c9a46c238ce08623f8da65031a1a41742622b87a2c29ef835d045ffb80 SHA512 d2d83659ecac676bfb6cb88287e8b6d79caebf04fecd813182ca29868976c2aadcd7b277da8026e42afd15c19df45f9e9632aa4122aaad803956f39433ec6e3e
 EBUILD gnome-shell-extension-bing-wallpaper-39.ebuild 1105 BLAKE2B b29fe359d92f2543cf6fd044a304892e241fccbf1c82840e7e072f8c86ccbbf7c15cf815ef51e308dae65479dd2ad826563c5bcc369bcd2a604890995e3e4d0b SHA512 19ad9cf77a5ee0898369f8300d2d56e304b9ac3541ca07305b0d093c599b9f08c5b35fb4cbccfd8a37ea7ebd409f48ea7f54d21761daf743d28c9c89c6c35924
-EBUILD gnome-shell-extension-bing-wallpaper-40.ebuild 1105 BLAKE2B 558223641c900bcb8f1e3b7bf810d7c77e3b37b4f6a51f67d5fe4e48261d8d29e5a08148aed12fddf6c5e867c13b7159b10406457d6ad2c73609c8426bd4bbc8 SHA512 5d7d4e0e5f04dcc2850edcb790bf3d89af915bcd3dc52fd2cc44bb7e42b8a6d31a47c083f24dab32fdfc7ad82f51e380df92e140d4eca67aa64c6a4672dd453f
+EBUILD gnome-shell-extension-bing-wallpaper-40.ebuild 1103 BLAKE2B e9cda5380f55468bcedd9cbde7bb1f1f0f0f2394fa30d1714933e6085a7d68b40a226b141c305a56a1f52adf47dbc0b599f23283b0b2f355f3af897cafbf6fce SHA512 f676ba686cfc6f60657600b103683d0f36b9de086ee4feac3ab7cf68af82dc5efef1b62e99f30423216a2058cd7c157a2ff831346619c2433a95ff868f874057
 MISC metadata.xml 241 BLAKE2B cb0374238d11e2a3f28f23b7049da09babd4310a99862738acfb7ba554f7758ac68cd09d1eb7a29068195c27010a846a540ed2c09b88fd043b37fb4f0762150f SHA512 b2c1d3e2cb6760ed4682da82af5370adcacd48afd558efa1abf84d955067b2ad32eda034af8cef95c71409622f97fa0113f2e07bee328f2d03512908ae931050
diff --git a/gnome-extra/gnome-shell-extension-bing-wallpaper/gnome-shell-extension-bing-wallpaper-40.ebuild b/gnome-extra/gnome-shell-extension-bing-wallpaper/gnome-shell-extension-bing-wallpaper-40.ebuild
index c57276c6cfd2..9d0bf9746e94 100644
--- a/gnome-extra/gnome-shell-extension-bing-wallpaper/gnome-shell-extension-bing-wallpaper-40.ebuild
+++ b/gnome-extra/gnome-shell-extension-bing-wallpaper/gnome-shell-extension-bing-wallpaper-40.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/neffo/bing-wallpaper-gnome-extension/archive/v${PV}.
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/Manifest b/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/Manifest
index 353e6edc321f..f21481bbb07a 100644
--- a/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/Manifest
+++ b/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/Manifest
@@ -3,5 +3,5 @@ DIST gnome-shell-extension-bluetooth-quick-connect-27.tar.gz 22088 BLAKE2B 332a2
 DIST gnome-shell-extension-bluetooth-quick-connect-29.tar.gz 22626 BLAKE2B 9bc2e08b9fe04f742431a61a84846b09fea43d7735ad907bcbff0e9f5456f4068dbc999d407152965ba07dcbea609fb2c6f3bf14ab209f40beb65c2dbfc83f33 SHA512 01efe1eb9e2982da9c75119268c3748af5f25ceb21bef8aeffe322429572eae871b148fc92668a211739761f42691731815fd74eaf91870bd14e55f3ee557256
 EBUILD gnome-shell-extension-bluetooth-quick-connect-26.ebuild 1243 BLAKE2B 87ef0a12ae87b7c8805b7e0f6b6f3894ecb9d40a9f674899b1fe7d0b56bb94a6ac3a7164c763b8f00ffb643548de24e942c88dcfdad688eb3baef3f909c98a59 SHA512 5d9a5c25adf8dfb79be4b19d67b5fd1852abf3621380aa6ff8147f2ba4de2e8fdbd80abba99f5abf973514ab5868075de95e7f8986306a12d9e3ca4e6dc0785a
 EBUILD gnome-shell-extension-bluetooth-quick-connect-27.ebuild 1245 BLAKE2B 0772818f0400803915cf662d8b3d9e41d6ac9f007e2408d1f773ea3df6f877113f66842369f9cd041327fe86e47764a872179e9acca77f563272329014a9bd29 SHA512 cc80f5560a9b7fc667fa30e4c474bfddedbcb2fad524bf18d6f752831154f1bb9b8ac54ed124c5ca9ce69435f6bf700b5bfaa61269fb1d70039e87c1e2d673f6
-EBUILD gnome-shell-extension-bluetooth-quick-connect-29.ebuild 1245 BLAKE2B f1f6416c8dc95891a22f3b678b2bd89238f0fee18f4d98ad3fb65e33f6b0e4738b10d5b2fb4e6599c58cf6078fed7a9b88096c684e232a7f052503df6f9ff5c1 SHA512 6371e394c269eb671b0b4df8a1046f5c071f864ba1a8c4e35b0f6f942e17004c9bd41de1b0ad5e91afec282aff98f6076873132a22f1b3dee15923a049947392
+EBUILD gnome-shell-extension-bluetooth-quick-connect-29.ebuild 1243 BLAKE2B 50870a61acc9a684aead504b1e9278fe288f1545844a587e4dbfea19e617949c55872828301d2a0cbb1f7e2f98f1eaf244569dee248ffd570a1f84fe09dde776 SHA512 f0687ff3eeeeeed9c3c6496cdc1a544b72df06daa4b875e577d72d6d7d546cd3894cce822ce2810be22f5e2cb7b18acf991c45f9a18d3fe3d26ef823d9f8cbc5
 MISC metadata.xml 241 BLAKE2B cb0374238d11e2a3f28f23b7049da09babd4310a99862738acfb7ba554f7758ac68cd09d1eb7a29068195c27010a846a540ed2c09b88fd043b37fb4f0762150f SHA512 b2c1d3e2cb6760ed4682da82af5370adcacd48afd558efa1abf84d955067b2ad32eda034af8cef95c71409622f97fa0113f2e07bee328f2d03512908ae931050
diff --git a/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/gnome-shell-extension-bluetooth-quick-connect-29.ebuild b/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/gnome-shell-extension-bluetooth-quick-connect-29.ebuild
index a485c63f1867..e19b94a25c9c 100644
--- a/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/gnome-shell-extension-bluetooth-quick-connect-29.ebuild
+++ b/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/gnome-shell-extension-bluetooth-quick-connect-29.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/bjarosze/gnome-bluetooth-quick-connect/archive/v${PV
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 IUSE=""
 
 RDEPEND="
diff --git a/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen/Manifest b/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen/Manifest
index cde5a2f5d1a5..ada1417de364 100644
--- a/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen/Manifest
+++ b/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen/Manifest
@@ -3,5 +3,5 @@ DIST gnome-shell-extension-control-blur-effect-on-lock-screen-20211209.tar.gz 26
 DIST gnome-shell-extension-control-blur-effect-on-lock-screen-20220323.tar.gz 2618 BLAKE2B 050f801bcc1ced63647c49badb779ce60a7de329ecebfef324cb8d1992e992933524a5e0e08272cf93bd9e24c9be72ba3b1365721b7954422ae0dfab7c1448bf SHA512 c13bff5676d5cf5ad6c932c6f19f1229fe65b3c4c0bcad6d0f3dfbce5bb763ebbd5cea7140e7b3ad5417819ee27e4e49369740d634b13b7f037fa4dc324dbced
 EBUILD gnome-shell-extension-control-blur-effect-on-lock-screen-20211111.ebuild 1320 BLAKE2B c435fec4b1344e1c5675669b67f29e3a540159bdddaa7221de38ab77dd29dbe213064b9932ca3dda3b646a307ceb98f322270e1c64303e1b501285959076d9dc SHA512 501c53f9cd9b5a20555a918fa3bc8b5f68ed5d9ccd453060fb49029b0cbd02e502d6e9678b4aaee32236234ce45f22fa53cac80a5c6676fe77eeb28c7f1f5f07
 EBUILD gnome-shell-extension-control-blur-effect-on-lock-screen-20211209.ebuild 1315 BLAKE2B 61ba8106064e68f49f75828e7b48a651fcf22483545933a2250f3994b159ebe04642042ff32388e446cc065281545ad73696918c9c94ce1cdec2c600b7289a03 SHA512 8c0339e817c1407846f098e66487ec5a43a0280a087cdb917a113be67bf6f1d91b932ee2b8810c84980f2eab2bfe63216a7908fb0da9b8daa384702423c28ee0
-EBUILD gnome-shell-extension-control-blur-effect-on-lock-screen-20220323.ebuild 1317 BLAKE2B a854d195f16ff93212be8462116cb40e77fc1cc450185d8abef6726a5b40ac562e78d445b04ebc10ffaf0c5c32ea144d1fefe56fb58d2a39942dde54be13d7df SHA512 e8e973b075d3d60492b44d9948ce2ce62f4b1b0fe269222305d3d4a9c7e2f374179962dc28fab58a7979a8b0ab8160ea8733bd8ae341e9c86d93dbfd92a850e0
+EBUILD gnome-shell-extension-control-blur-effect-on-lock-screen-20220323.ebuild 1315 BLAKE2B 4d0f829bde6be46cc8e8efcc13e06931c9c0447e60a49149dca05ccb797177b8fe6ea33ec4dd9dc7564bcb9f63065f644fed6989c6a8a0b9e5b0f2d95d282c45 SHA512 c7de0a13490579dc1721ffe38816cad742bac5b2a85658383ad3e5884d1bd4471f92bdc4f0fb7a3fe982df5eed902548a6e283d130b3016cfd06f9289a9922da
 MISC metadata.xml 241 BLAKE2B cb0374238d11e2a3f28f23b7049da09babd4310a99862738acfb7ba554f7758ac68cd09d1eb7a29068195c27010a846a540ed2c09b88fd043b37fb4f0762150f SHA512 b2c1d3e2cb6760ed4682da82af5370adcacd48afd558efa1abf84d955067b2ad32eda034af8cef95c71409622f97fa0113f2e07bee328f2d03512908ae931050
diff --git a/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen/gnome-shell-extension-control-blur-effect-on-lock-screen-20220323.ebuild b/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen/gnome-shell-extension-control-blur-effect-on-lock-screen-20220323.ebuild
index 759a266978ca..334817d3669b 100644
--- a/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen/gnome-shell-extension-control-blur-effect-on-lock-screen-20220323.ebuild
+++ b/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen/gnome-shell-extension-control-blur-effect-on-lock-screen-20220323.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/PRATAP-KUMAR/Control_Blur_Effect_On_Lock_Screen/arch
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 # glib for glib-compile-schemas at build time, needed at runtime anyways
diff --git a/gnome-extra/gnome-shell-extension-dash-to-panel/Manifest b/gnome-extra/gnome-shell-extension-dash-to-panel/Manifest
index b25351819544..751eb1dcef51 100644
--- a/gnome-extra/gnome-shell-extension-dash-to-panel/Manifest
+++ b/gnome-extra/gnome-shell-extension-dash-to-panel/Manifest
@@ -1,11 +1,5 @@
 AUX gnome-shell-extension-dash-to-panel-26-branding.patch 637 BLAKE2B 1e124561143b577413090e16c7ad0c8cbb66911b079ae5844da9cf04e0197aab15fc4f746d3020ab7d4e6756b8a35befa773967c223d29289e13c6b3ffd70234 SHA512 8c176972ff10e87e957cfdda23e86a3e434dc050e8a954e7c2257942301daa5aa7c5b788188768f13c5b009d842fca8b14819a255a6a561dac8fa60e355ec211
-DIST gnome-shell-extension-dash-to-panel-45.tar.gz 21158475 BLAKE2B fa44e2c0ae33f39f79584b78ade1091eead28c1158c55f7b7511479ee5ba0c52054d0f447fa0bf7787c89c10254cbc5348abdaef048296ef8782b8a2480b066e SHA512 fa621a23ef6349cd2925069107e3bb4a4f2bdfeca953acee5512a48d78df60304f062348bd80e8c46bbb3a958b9745140aa0a5454b6494f0314cdd40a9c77472
-DIST gnome-shell-extension-dash-to-panel-46.tar.gz 21156093 BLAKE2B b2c1013a90672b17bb2cf05df07a0402199d5aa372595c199c4e9687d0aea7f5aeaa2016fdeca4d1b0d4ab2ff5c044759db8178ddc2f2b1db28037dfb91d4087 SHA512 7d1b2058974650f8577d8b1bc8898861af07bd1006d170a5b5ab73f4f2bda5bb40bf43ad3e6f94db26a0d1a065f7fac0a0bcef874e7f4f254b931411c236e413
-DIST gnome-shell-extension-dash-to-panel-47.tar.gz 21165567 BLAKE2B c776b7185bdc96efd7e44878a140322a0f4a4c9044abeda9dc2fe303922c3d4f0bbf015e113983c5580e04d84550bd754f1c6171191b724571b478d501042e51 SHA512 33059a085e3636d45dd12bd92710bf7c27e7e641b6ff0bfc860e7b60b6e45ca5a61669b6495d616196e2ae58c160db844beb010e5df9d17f3035251986489fe6
 DIST gnome-shell-extension-dash-to-panel-50.tar.gz 21167530 BLAKE2B 2caad505593bc037ff17c428b238ac8f8f81f0e70cd09cc76fb3ca57f285321a0921e509fb74aa82dc07964ef8d999f48334b271a9fe08a221e0e1537a93395b SHA512 d8e52dfe1159107376fb74e672a821b3dc7d524ef7d8091b213dac725e876c022cf4caa4690c63f288a1ffaff613718f703dd244db9b5ce6719c3f2b927fd8a2
 DIST tango-gentoo-v1.1.tar.gz 29322 BLAKE2B 83fa2bf37727e60851dd679054fe1b153ebfea58c9a9a40f891f7d68d3b047b02e8effa1d1b4e08d64500a2072ce7200f159c92a352da7124de27e1b05bb6027 SHA512 87d47ddab68361db6d99866c51705dcb3e198f8345a1096859acf2c6cca5099dd23c7fb30d124f52c4933ea38fd45fadffbbe6ecbdfa84f5b60938a4824f9045
-EBUILD gnome-shell-extension-dash-to-panel-45.ebuild 1831 BLAKE2B 77d6a9b5879fd3d984478fb2809c4f28c0ebace7fe1f930b043be47388121fa013ced6a482c49f9ffca2cd2f4afbbdc81b0ec7cbc78f16e4000bb24df6607b83 SHA512 c5d8224195d66280e3ba37e1b6e75e0c13fc538cb035b651682c4e87afa9c045eb817c58e7183009fa8aa0d88dfdfd438bda2c0a2cfe9bc835b7103f93f0cb6b
-EBUILD gnome-shell-extension-dash-to-panel-46.ebuild 1833 BLAKE2B 1988fb4ff96e0503ed61192fb8a0b0a9e893efd8279ed36566c4380dbbe5fa757697c5dde703e69a3d0f792a1d64a51843d077e170d00230dd910b661fc4b948 SHA512 718fb48aa881f72c07da9d137842544806e7ca4df85d65c7c5492f88e8997e5a04c1602255b89a626f98cea4b9be54469205261a0c97001e524214228e83e6b4
-EBUILD gnome-shell-extension-dash-to-panel-47.ebuild 1833 BLAKE2B 1988fb4ff96e0503ed61192fb8a0b0a9e893efd8279ed36566c4380dbbe5fa757697c5dde703e69a3d0f792a1d64a51843d077e170d00230dd910b661fc4b948 SHA512 718fb48aa881f72c07da9d137842544806e7ca4df85d65c7c5492f88e8997e5a04c1602255b89a626f98cea4b9be54469205261a0c97001e524214228e83e6b4
-EBUILD gnome-shell-extension-dash-to-panel-50.ebuild 1833 BLAKE2B 1988fb4ff96e0503ed61192fb8a0b0a9e893efd8279ed36566c4380dbbe5fa757697c5dde703e69a3d0f792a1d64a51843d077e170d00230dd910b661fc4b948 SHA512 718fb48aa881f72c07da9d137842544806e7ca4df85d65c7c5492f88e8997e5a04c1602255b89a626f98cea4b9be54469205261a0c97001e524214228e83e6b4
+EBUILD gnome-shell-extension-dash-to-panel-50.ebuild 1831 BLAKE2B b95e33936528d9d09abf6de9830e0c57e6abae252a9f264c657850d9987203c82342a33072cda794f159bcecfb9865792feb0e25c5747f7b2d00bb07ee160f21 SHA512 9e22c63ee872b4fcf2a59c0960f03524d4fef6a6a893515b4bed1487dab40513733c596406def66cfa335bb32b451da46206d754fe6982a2de068e9684077c3d
 MISC metadata.xml 241 BLAKE2B cb0374238d11e2a3f28f23b7049da09babd4310a99862738acfb7ba554f7758ac68cd09d1eb7a29068195c27010a846a540ed2c09b88fd043b37fb4f0762150f SHA512 b2c1d3e2cb6760ed4682da82af5370adcacd48afd558efa1abf84d955067b2ad32eda034af8cef95c71409622f97fa0113f2e07bee328f2d03512908ae931050
diff --git a/gnome-extra/gnome-shell-extension-dash-to-panel/gnome-shell-extension-dash-to-panel-45.ebuild b/gnome-extra/gnome-shell-extension-dash-to-panel/gnome-shell-extension-dash-to-panel-45.ebuild
deleted file mode 100644
index 419cb876463b..000000000000
--- a/gnome-extra/gnome-shell-extension-dash-to-panel/gnome-shell-extension-dash-to-panel-45.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome2-utils
-
-MY_PN="${PN/gnome-shell-extension-/}"
-MY_P="${MY_PN}-${PV}"
-DESCRIPTION="An icon taskbar for the Gnome Shell"
-HOMEPAGE="https://github.com/home-sweet-gnome/dash-to-panel"
-SRC_URI="
-	https://github.com/home-sweet-gnome/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	branding? ( https://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz )
-"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
-IUSE="branding"
-
-COMMON_DEPEND="dev-libs/glib:2"
-RDEPEND="${COMMON_DEPEND}
-	app-eselect/eselect-gnome-shell-extensions
-	=gnome-base/gnome-shell-41*
-"
-DEPEND="${COMMON_DEPEND}"
-BDEPEND="
-	dev-util/intltool
-	sys-devel/gettext
-"
-
-S="${WORKDIR}/${MY_P}"
-extension_uuid="dash-to-panel@jderose9.github.com"
-
-src_prepare() {
-	default
-
-	# Set correct version
-	export VERSION="${PV}"
-
-	# Don't install README and COPYING in unwanted locations
-	sed -i -e 's/COPYING//g' -e 's/README.md//g' Makefile || die
-
-	# Provide fancy Gentoo icon when requested
-	use branding && eapply "${FILESDIR}"/${PN}-26-branding.patch
-}
-
-src_install() {
-	default
-	if use branding; then
-		insinto /usr/share/gnome-shell/extensions/dash-to-panel@jderose9.github.com/img
-		doins "${WORKDIR}/tango-gentoo-v1.1/scalable/gentoo.svg"
-	fi
-
-	# Install schemas system-wide
-	dodir /usr/share/glib-2.0/schemas
-	mv "${ED}/usr/share/gnome-shell/extensions/${extension_uuid}"/schemas/ "${ED}/usr/share/glib-2.0" || die
-	rm "${ED}/usr/share/glib-2.0/schemas/gschemas.compiled" || die
-}
-
-pkg_preinst() {
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	gnome2_schemas_update
-	ebegin "Updating list of installed extensions"
-	eselect gnome-shell-extensions update
-	eend $?
-}
-
-pkg_postrm() {
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/gnome-shell-extension-dash-to-panel/gnome-shell-extension-dash-to-panel-46.ebuild b/gnome-extra/gnome-shell-extension-dash-to-panel/gnome-shell-extension-dash-to-panel-46.ebuild
deleted file mode 100644
index 68b544af2082..000000000000
--- a/gnome-extra/gnome-shell-extension-dash-to-panel/gnome-shell-extension-dash-to-panel-46.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit gnome2-utils
-
-MY_PN="${PN/gnome-shell-extension-/}"
-MY_P="${MY_PN}-${PV}"
-DESCRIPTION="An icon taskbar for the Gnome Shell"
-HOMEPAGE="https://github.com/home-sweet-gnome/dash-to-panel"
-SRC_URI="
-	https://github.com/home-sweet-gnome/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	branding? ( https://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz )
-"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="branding"
-
-COMMON_DEPEND="dev-libs/glib:2"
-RDEPEND="${COMMON_DEPEND}
-	app-eselect/eselect-gnome-shell-extensions
-	>=gnome-base/gnome-shell-41
-"
-DEPEND="${COMMON_DEPEND}"
-BDEPEND="
-	dev-util/intltool
-	sys-devel/gettext
-"
-
-S="${WORKDIR}/${MY_P}"
-extension_uuid="dash-to-panel@jderose9.github.com"
-
-src_prepare() {
-	default
-
-	# Set correct version
-	export VERSION="${PV}"
-
-	# Don't install README and COPYING in unwanted locations
-	sed -i -e 's/COPYING//g' -e 's/README.md//g' Makefile || die
-
-	# Provide fancy Gentoo icon when requested
-	use branding && eapply "${FILESDIR}"/${PN}-26-branding.patch
-}
-
-src_install() {
-	default
-	if use branding; then
-		insinto /usr/share/gnome-shell/extensions/dash-to-panel@jderose9.github.com/img
-		doins "${WORKDIR}/tango-gentoo-v1.1/scalable/gentoo.svg"
-	fi
-
-	# Install schemas system-wide
-	dodir /usr/share/glib-2.0/schemas
-	mv "${ED}/usr/share/gnome-shell/extensions/${extension_uuid}"/schemas/ "${ED}/usr/share/glib-2.0" || die
-	rm "${ED}/usr/share/glib-2.0/schemas/gschemas.compiled" || die
-}
-
-pkg_preinst() {
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	gnome2_schemas_update
-	ebegin "Updating list of installed extensions"
-	eselect gnome-shell-extensions update
-	eend $?
-}
-
-pkg_postrm() {
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/gnome-shell-extension-dash-to-panel/gnome-shell-extension-dash-to-panel-47.ebuild b/gnome-extra/gnome-shell-extension-dash-to-panel/gnome-shell-extension-dash-to-panel-47.ebuild
deleted file mode 100644
index 68b544af2082..000000000000
--- a/gnome-extra/gnome-shell-extension-dash-to-panel/gnome-shell-extension-dash-to-panel-47.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit gnome2-utils
-
-MY_PN="${PN/gnome-shell-extension-/}"
-MY_P="${MY_PN}-${PV}"
-DESCRIPTION="An icon taskbar for the Gnome Shell"
-HOMEPAGE="https://github.com/home-sweet-gnome/dash-to-panel"
-SRC_URI="
-	https://github.com/home-sweet-gnome/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	branding? ( https://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz )
-"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="branding"
-
-COMMON_DEPEND="dev-libs/glib:2"
-RDEPEND="${COMMON_DEPEND}
-	app-eselect/eselect-gnome-shell-extensions
-	>=gnome-base/gnome-shell-41
-"
-DEPEND="${COMMON_DEPEND}"
-BDEPEND="
-	dev-util/intltool
-	sys-devel/gettext
-"
-
-S="${WORKDIR}/${MY_P}"
-extension_uuid="dash-to-panel@jderose9.github.com"
-
-src_prepare() {
-	default
-
-	# Set correct version
-	export VERSION="${PV}"
-
-	# Don't install README and COPYING in unwanted locations
-	sed -i -e 's/COPYING//g' -e 's/README.md//g' Makefile || die
-
-	# Provide fancy Gentoo icon when requested
-	use branding && eapply "${FILESDIR}"/${PN}-26-branding.patch
-}
-
-src_install() {
-	default
-	if use branding; then
-		insinto /usr/share/gnome-shell/extensions/dash-to-panel@jderose9.github.com/img
-		doins "${WORKDIR}/tango-gentoo-v1.1/scalable/gentoo.svg"
-	fi
-
-	# Install schemas system-wide
-	dodir /usr/share/glib-2.0/schemas
-	mv "${ED}/usr/share/gnome-shell/extensions/${extension_uuid}"/schemas/ "${ED}/usr/share/glib-2.0" || die
-	rm "${ED}/usr/share/glib-2.0/schemas/gschemas.compiled" || die
-}
-
-pkg_preinst() {
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	gnome2_schemas_update
-	ebegin "Updating list of installed extensions"
-	eselect gnome-shell-extensions update
-	eend $?
-}
-
-pkg_postrm() {
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/gnome-shell-extension-dash-to-panel/gnome-shell-extension-dash-to-panel-50.ebuild b/gnome-extra/gnome-shell-extension-dash-to-panel/gnome-shell-extension-dash-to-panel-50.ebuild
index 68b544af2082..ce6cf7c2a060 100644
--- a/gnome-extra/gnome-shell-extension-dash-to-panel/gnome-shell-extension-dash-to-panel-50.ebuild
+++ b/gnome-extra/gnome-shell-extension-dash-to-panel/gnome-shell-extension-dash-to-panel-50.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 x86"
 IUSE="branding"
 
 COMMON_DEPEND="dev-libs/glib:2"
diff --git a/gnome-extra/gnome-shell-extension-desktop-icons-ng/Manifest b/gnome-extra/gnome-shell-extension-desktop-icons-ng/Manifest
index 1c50d26087ed..6c6551133a40 100644
--- a/gnome-extra/gnome-shell-extension-desktop-icons-ng/Manifest
+++ b/gnome-extra/gnome-shell-extension-desktop-icons-ng/Manifest
@@ -5,5 +5,5 @@ DIST ding-45.0.tar.xz 127368 BLAKE2B 28d77192adf83d47e382ce647d2b4fc635bf3ebdd97
 EBUILD gnome-shell-extension-desktop-icons-ng-0.24.0.ebuild 1001 BLAKE2B 40bd684e478a1136a284a2da08222cfe99eeeb06835989d6a1882d55239c2ffba030f38e593388c316c1c25c7beffbb53296760f29b0d9ba2840e6454b3be28a SHA512 01032de352d6ab9f3354cde22b4d0c90b4df3f6971085b4e493ef0fd54878fc586329d19c2e7fb36264462c65bed62b8ef6b3f65644c9bc108001108e5dbf74a
 EBUILD gnome-shell-extension-desktop-icons-ng-38.0.ebuild 1001 BLAKE2B 5090f816926d836d32712659f88d0bd8c3a86b9b106f6a49bed69981f877ca574878da3eccd9c21083fe5e9297b6e2df4374b6de393dd367d2503f31600e8b90 SHA512 47dd6b467409a9126639f81425ec6a601fae1c6f7da1aea4a42eef98a80f6b0002d7392fce1c708843908fa43712c07cd486040d05e61f83c941fd8e94be065b
 EBUILD gnome-shell-extension-desktop-icons-ng-43.0.ebuild 1003 BLAKE2B 51154343a9ed9226e6e56ddd4fb5a40d4a2a65a284cf33e97233cff10004e6edd08b1f019ab5acadf514cfddea29dbf67b91e0edbda0d95d267fda0e93d77918 SHA512 9502e8e6a765d0f9d1bc4b91876ab01aefeae1420faeac80a9d3fbad0013ea965241dfbd3485ee1c949e487cffdae8c3fb3ccaafacb1c4885b753349737c6985
-EBUILD gnome-shell-extension-desktop-icons-ng-45.0.ebuild 1003 BLAKE2B c92050f889cd1b25987aec0a12ed3cae75a508d4332c5d4c69d6076e53f5ef26d2d336d89a38da797529ffde5616e523def3cbc8ffc4b2b3c1633275203f0e46 SHA512 8d5650a77b395b702c60c9beb492c1376c6467ee5f15d9c641174546eda76c6059f60926ad620e0c8eb7d04b3ccdfe492fc0c0a3bfa3d309600fd4dcdd0c476e
+EBUILD gnome-shell-extension-desktop-icons-ng-45.0.ebuild 1001 BLAKE2B e9393d867bdbdeeb2abb6103c09a8379dcb6996664ab90bda14303f6dff7865446424b3fd509cf1e9c74f2fbdd8c839400690df8da76f8edd10f620a21d19da9 SHA512 f60215df7f025e1f4653025bdd68e3dd440821acc52e64e6018a59e220cd58200fc9d6cb998fbd1e11ba03faa3afaab497027ad22582e1b0d1847e132629c947
 MISC metadata.xml 241 BLAKE2B cb0374238d11e2a3f28f23b7049da09babd4310a99862738acfb7ba554f7758ac68cd09d1eb7a29068195c27010a846a540ed2c09b88fd043b37fb4f0762150f SHA512 b2c1d3e2cb6760ed4682da82af5370adcacd48afd558efa1abf84d955067b2ad32eda034af8cef95c71409622f97fa0113f2e07bee328f2d03512908ae931050
diff --git a/gnome-extra/gnome-shell-extension-desktop-icons-ng/gnome-shell-extension-desktop-icons-ng-45.0.ebuild b/gnome-extra/gnome-shell-extension-desktop-icons-ng/gnome-shell-extension-desktop-icons-ng-45.0.ebuild
index 80654c86f352..3951dfa41ade 100644
--- a/gnome-extra/gnome-shell-extension-desktop-icons-ng/gnome-shell-extension-desktop-icons-ng-45.0.ebuild
+++ b/gnome-extra/gnome-shell-extension-desktop-icons-ng/gnome-shell-extension-desktop-icons-ng-45.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://gitlab.com/rastersoft/desktop-icons-ng/uploads/${COMMIT}/${MY_P
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 COMMON_DEPEND="dev-libs/glib:2"
diff --git a/gnome-extra/gnome-shell-extension-gsconnect/Manifest b/gnome-extra/gnome-shell-extension-gsconnect/Manifest
index 47fe68870ad9..85af12299c52 100644
--- a/gnome-extra/gnome-shell-extension-gsconnect/Manifest
+++ b/gnome-extra/gnome-shell-extension-gsconnect/Manifest
@@ -1,7 +1,3 @@
-DIST gnome-shell-extension-gsconnect-48.tar.gz 795292 BLAKE2B d7885d5a29c2a71d5180baed0da201b921ea9058c284b110becbc84594610f6b5ffd539b598c091113f3ad2e12f9adb486d216d4b37064ef1b6218edc547ec82 SHA512 309e4fdb3f13d4c14f744316f7904aa7c4d5c2c712187625ac1db6de7f1a03fe156754468ba4b982ebed9042006701c3f7eb7114d1e84a7051332edf58c5b21b
-DIST gnome-shell-extension-gsconnect-49.tar.gz 852895 BLAKE2B 21822c3bd724638be0ee537c5cfe86deda9e68fccc58d4f84ad8981d98e42ffc35c9065e9a8cb64baa07e9eea647439bbbdd01d2985c20d2e940cfa3238fe536 SHA512 35da54b9603adefb2dd42e2af3037c414565ab5e936f24180a193c9378ec9e9c0ae02663048679a29385a57050ebe93838fe45190444c41f82cd571ac1a39b52
 DIST gnome-shell-extension-gsconnect-50.tar.gz 852893 BLAKE2B 2da626ac3a2c6a06b01a6d502a63a208c0bd603ba2d989b254c57d4feaaf693134b5fd176449eb2465be1d910eb8bddd5398dbe2fb00b9bfe0bec6a428f074af SHA512 39edad97388f8c228d9698c7f2fc51ea04d74f5e3bdeb16f387dc2f5bae87966c6d1a3d7eaf06cc1d095638df1254c3b796875d403912d0c39424965b395cbc8
-EBUILD gnome-shell-extension-gsconnect-48.ebuild 1613 BLAKE2B 5e28e0f1fbdd6702d852005824323377be862563e2b8665c8f702eacde65af657a90c0c1d1aebc9c9f5863bf4a34b7ff108b6b938b5729a43468b6c5555326fb SHA512 a6c936a108d23de5df14fd53ecb378b8e31ecfc16eacc0443a2a0cb5df99288c08bfe299c0a2883df275979ce7475e045253ced5ddc6d9318a18963b43be9d1b
-EBUILD gnome-shell-extension-gsconnect-49.ebuild 1615 BLAKE2B 1ddab322dbb2d81db604ccaaf5953df0b26dce2fcc1f9ed0688fce8d4d844d0f08f3752a668138ba7ae06db21c36315de9be670a1474579e14a86db4c56087c1 SHA512 222a8ba4f2666eb05f92f4793fc895d1967ae2adcb43de4014fe507894c3b649afb673fbf07817f801a689663bb78f403b2895cc5aa449a12e7aa926b01657f1
-EBUILD gnome-shell-extension-gsconnect-50.ebuild 1615 BLAKE2B 69695289e41dd33461542337fc4342d73e20cef6dd474c77141778db02792363f284c0111396a2a1b264271307c0a00f31585a12865dd3a7a10d68fc844244b9 SHA512 89f7588f079885b71b2a55aa686521b2b2c62aaa67e4b15b11ae5bb85105aaa8b3f0aee85b0c4cc6ae1fa3e1510b9edefbe0bdce1764647861cc83f3cd880bad
+EBUILD gnome-shell-extension-gsconnect-50.ebuild 1613 BLAKE2B 6ba214ae5266706cc8cd9336436eb91904397ec0ee66a1b43d473381216b567e107161bf3cd4d42e8c93b282929d3aba6e0ab71dd2b13efbeb854b2e84fee2cf SHA512 590407aa5ab7eafabc96a9022e2a1badddbfe218df48c55661bc081b1d1a438d7387e2beb45b78bffcb5b79b8329564bce22003bbe417dddad1ccfc77f68617c
 MISC metadata.xml 346 BLAKE2B d1e2c79cae69a58f7af962316046f4620238b88d42e0f211a28ba271633993bae4df79956ab9dde4f4e94e7e77233288657d5b3c1876c9192118a11ee5ee678f SHA512 00b2e45892280f1a042b3ec03d66c3fcc7a2b95f94534d22fb8df936976384bb78433337b339ae023ae9850f2e4c0cfb8b12fae28ae7863d2ebe93a47784a77a
diff --git a/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-48.ebuild b/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-48.ebuild
deleted file mode 100644
index d682f1b280ab..000000000000
--- a/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-48.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome2-utils meson readme.gentoo-r1 xdg
-
-DESCRIPTION="KDE Connect implementation for Gnome Shell"
-HOMEPAGE="https://github.com/GSConnect/gnome-shell-extension-gsconnect"
-SRC_URI="https://github.com/GSConnect/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="nautilus"
-
-COMMON_DEPEND="dev-libs/glib:2"
-RDEPEND="${COMMON_DEPEND}
-	app-eselect/eselect-gnome-shell-extensions
-	>=dev-libs/gjs-1.68
-	=gnome-base/gnome-shell-41*
-	gnome-base/gvfs
-	gnome-extra/evolution-data-server
-	|| ( media-libs/libcanberra media-libs/gsound )
-	nautilus? (
-		dev-python/nautilus-python
-		gnome-base/nautilus[introspection] )
-"
-DEPEND="${COMMON_DEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="For knowing more about how to do the setup, please visit:
-https://github.com/andyholmes/gnome-shell-extension-gsconnect/wiki/Installation"
-
-src_configure() {
-	# nemo support relies on nemo-python from https://github.com/linuxmint/nemo-extensions
-	# https://bugs.gentoo.org/694388
-	meson_src_configure \
-		-Dinstalled_tests=false \
-		-Dnemo=false \
-		$(meson_use nautilus)
-}
-
-src_install() {
-	meson_src_install
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	gnome2_schemas_savelist
-	xdg_pkg_preinst
-}
-
-pkg_postinst() {
-	gnome2_schemas_update
-	xdg_pkg_postinst
-	ebegin "Updating list of installed extensions"
-	eselect gnome-shell-extensions update
-	eend $?
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	gnome2_schemas_update
-	xdg_pkg_postrm
-}
diff --git a/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-49.ebuild b/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-49.ebuild
deleted file mode 100644
index 02be1761f68f..000000000000
--- a/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-49.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit gnome2-utils meson readme.gentoo-r1 xdg
-
-DESCRIPTION="KDE Connect implementation for Gnome Shell"
-HOMEPAGE="https://github.com/GSConnect/gnome-shell-extension-gsconnect"
-SRC_URI="https://github.com/GSConnect/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nautilus"
-
-COMMON_DEPEND="dev-libs/glib:2"
-RDEPEND="${COMMON_DEPEND}
-	app-eselect/eselect-gnome-shell-extensions
-	>=dev-libs/gjs-1.68
-	=gnome-base/gnome-shell-41*
-	gnome-base/gvfs
-	gnome-extra/evolution-data-server
-	|| ( media-libs/libcanberra media-libs/gsound )
-	nautilus? (
-		dev-python/nautilus-python
-		gnome-base/nautilus[introspection] )
-"
-DEPEND="${COMMON_DEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="For knowing more about how to do the setup, please visit:
-https://github.com/andyholmes/gnome-shell-extension-gsconnect/wiki/Installation"
-
-src_configure() {
-	# nemo support relies on nemo-python from https://github.com/linuxmint/nemo-extensions
-	# https://bugs.gentoo.org/694388
-	meson_src_configure \
-		-Dinstalled_tests=false \
-		-Dnemo=false \
-		$(meson_use nautilus)
-}
-
-src_install() {
-	meson_src_install
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	gnome2_schemas_savelist
-	xdg_pkg_preinst
-}
-
-pkg_postinst() {
-	gnome2_schemas_update
-	xdg_pkg_postinst
-	ebegin "Updating list of installed extensions"
-	eselect gnome-shell-extensions update
-	eend $?
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	gnome2_schemas_update
-	xdg_pkg_postrm
-}
diff --git a/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-50.ebuild b/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-50.ebuild
index 458473b6871f..18fec91712f8 100644
--- a/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-50.ebuild
+++ b/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-50.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/GSConnect/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="nautilus"
 
 COMMON_DEPEND="dev-libs/glib:2"
diff --git a/gnome-extra/gnome-shell-extension-weather-in-the-clock/Manifest b/gnome-extra/gnome-shell-extension-weather-in-the-clock/Manifest
index 37972ade7b45..327b1312b35d 100644
--- a/gnome-extra/gnome-shell-extension-weather-in-the-clock/Manifest
+++ b/gnome-extra/gnome-shell-extension-weather-in-the-clock/Manifest
@@ -2,5 +2,5 @@ DIST gnome-shell-extension-weather-in-the-clock-20211108.tar.gz 127000 BLAKE2B 9
 DIST gnome-shell-extension-weather-in-the-clock-20220504.tar.gz 127002 BLAKE2B 38ad139e29660f8c91629048140c4a2ed7578376ad5e13c8138eda8c487ccfdbdd7fd1a3b1ce7d85407d0a2486c40e776f665cf11c897b218477c8e6d17b187d SHA512 27109e25e0e630233a895576e691c5daa550bb032bd748f6105560553ed05f5a8a47a3eb27ae90eee24dbff2508fed5420d1f81ceb4879f11ef0a98c63616923
 EBUILD gnome-shell-extension-weather-in-the-clock-20211108-r1.ebuild 1292 BLAKE2B 993d4bdfd1447eb713aad9a58435ccacb2de0cc884c10d1e7a92d411fe345024b80ac7cb440bb022c32dcb6656a72cd1223e8569fb745e0fabba13b2e1fe0238 SHA512 b8dd5777401b9eb8a1ab10343adf71d1999078595ab6a0a705d050e0a4415b5d56801e8857bff7d7a2ac34cec3760d74833fc3a9666b59238d74c8e5283c99a4
 EBUILD gnome-shell-extension-weather-in-the-clock-20211108.ebuild 1082 BLAKE2B 0b56378521ac77b3d9e81c957bcb222f7af18e1136ee42203b8245032e7306aee8042e79cedc5574c986e933e7457d9268fe101770d285542ca4951543352e3f SHA512 faa2b5e9a4cc6ed0b6c0e5aba5adb0b9d65bdee68d933b25bce7eda9c718d7c6e47495441f27aee16244dee1eec6224d51e587ec9a11c7d1ff9352722adc2dfb
-EBUILD gnome-shell-extension-weather-in-the-clock-20220504.ebuild 1084 BLAKE2B 0411d3df3caf2b3e0bcf139ca457ef1dabe2355e5d9d7a34702ec13138288a69b6b36fcc9be65c550a2bf306f53a83a5aa8c0ee2b80bdb41ee2100bb200211dc SHA512 6235449b926d94cee3b6075354bfa59d9dbd7c8e7c0580c25fa6d37522d161aa0abd5825e022d844c9873ad1dd8513e491a684d26f681d2d7408130f5f2621bc
+EBUILD gnome-shell-extension-weather-in-the-clock-20220504.ebuild 1082 BLAKE2B 11638e96c13e231bf39977561aff843abd83cec3fd5beb2a8b862086809c5d2489ee42d473caea53c07fcc5826912ecd1c1d8f3d4e0d8d2b4840b0f21d12ce93 SHA512 6df67d5e70a34f1ffab2ac728a227e6789b5eefd7120b43a8f5b3842130c729bceff3bb949b8513f7d65aecf9265f435fbf02a6e9988d1719555507517dc54e8
 MISC metadata.xml 241 BLAKE2B cb0374238d11e2a3f28f23b7049da09babd4310a99862738acfb7ba554f7758ac68cd09d1eb7a29068195c27010a846a540ed2c09b88fd043b37fb4f0762150f SHA512 b2c1d3e2cb6760ed4682da82af5370adcacd48afd558efa1abf84d955067b2ad32eda034af8cef95c71409622f97fa0113f2e07bee328f2d03512908ae931050
diff --git a/gnome-extra/gnome-shell-extension-weather-in-the-clock/gnome-shell-extension-weather-in-the-clock-20220504.ebuild b/gnome-extra/gnome-shell-extension-weather-in-the-clock/gnome-shell-extension-weather-in-the-clock-20220504.ebuild
index 063eb74bb8bb..5f762465f788 100644
--- a/gnome-extra/gnome-shell-extension-weather-in-the-clock/gnome-shell-extension-weather-in-the-clock-20220504.ebuild
+++ b/gnome-extra/gnome-shell-extension-weather-in-the-clock/gnome-shell-extension-weather-in-the-clock-20220504.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/JasonLG1979/gnome-shell-extension-weather-in-the-clo
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/gnome-extra/gnome-shell-extensions/Manifest b/gnome-extra/gnome-shell-extensions/Manifest
index 110b7a40b03f..3e1d82ba893f 100644
--- a/gnome-extra/gnome-shell-extensions/Manifest
+++ b/gnome-extra/gnome-shell-extensions/Manifest
@@ -1,8 +1,5 @@
-AUX gnome-shell-extensions-41.1-meson-0.61.patch 383 BLAKE2B f40a994294b3a6fe1aafa92d87774aabe5e1ec75913f1902c746227198db4baf928c2f96c63eda8531668dd998eee0484ab6a506785491bad1bfe5a3721b3547 SHA512 beed6cece8b0bce2e8fe5f210b7ebb36f75192ef91e7cd407ae83216516f6bacbcbb76c2591b601cf7fe1866ac30c220026b349066aa95f06bbbf2393cf32b65
-DIST gnome-shell-extensions-41.2.tar.xz 222528 BLAKE2B 132fdbc1e1c81a886dc250dabd44721aeeaefed5939f30274e2484ec6a8dfff25fd0c481a04edf47f732ccb34b9c8d132d106a45d862db07fc9fb8d835fee6de SHA512 3b581dbc289f630bb85b0285a2f5956142a412e124d15e085770a578a9304211b1868f4eb940b79637b9cfa78b0da5973a717ee5866d75e9d15f38e91d4f414f
-DIST gnome-shell-extensions-42.0.tar.xz 226240 BLAKE2B c0c13ef58f632e3a8449580af52c40677b979c9f81fa037d936d31ebb693bc070bea5f0ec7a4715ff3f19480cc12d4ec471efa1d6b684e2924a5fbdd943e381c SHA512 d413f8a7c12c9e4c71a51b4f5c3cc8e0145b57eec24648e928f02ccdeb4a02b44ad3adf9668f3ba65870d772490f2389582f4f5e8f4037da3ab88a0bb5958f5d
 DIST gnome-shell-extensions-42.1.tar.xz 225068 BLAKE2B 9041259a480be745476278f638be20ae6ac0b86019d01609cf6b0ba3fa129dac74d56851d0301a6e1b8a0b172b6d375aeeb2f2df389f3c0dfe0e01384248b5d8 SHA512 b139400d239be2dbc7685afc666d0b17ab187b68fa2631b586b0e04bf05de3d59ac70d2f692ade8e0003fea99f207b05871deab3898ba34586521dda747970c3
-EBUILD gnome-shell-extensions-41.2.ebuild 1830 BLAKE2B 5035f1592b076b4246143c32a6cd2364cfc61c7d20152dd05aed60950e8da92802820e9f841200cba0d431f449fb45f406589339b1e56469ff7e0ca526c15629 SHA512 6d00475aab927daaff770203eeb9e719440c47013f98644cb0a44f95e1b6315242dfa3f560ca6a9b3bf1ba6d73fc96fac612abcbb3fac2684e9541333fc07eaa
-EBUILD gnome-shell-extensions-42.0.ebuild 1777 BLAKE2B 08a538766888b93b71bcae8055851d218d66b4a3664e9e561cc5dd13e5178b84de178a1c8b253f41141c86fd7a8d06e9781d68c79f6dd357694e1c2d549922fb SHA512 7beda3a2f8db19ebe4231f74ebc81e6526776e30b1ed86e0a735b346a86445d0305987eb8c927c8180ae1bdf4268b1a60ecc44d5c2280c30ccb4bddf2c1f01cc
-EBUILD gnome-shell-extensions-42.1.ebuild 1796 BLAKE2B 05aa950938c17dc8d784c40e27592c3af938d229933cbc73a62c69f96b898621ecfc5f0da95a30ae70a4d041b42ab0bf984eb771fe58ad0b073ff0a08022b597 SHA512 4693587edd6aebebbf3920828f521e013b26655aedca454c476a4488bea82244b2079b897645a2b3650d7f76b2c3a767c84fcb0ebcf97602559d22f542705244
+DIST gnome-shell-extensions-42.2.tar.xz 225040 BLAKE2B 992207185af12ee8f41e888891d3b60536ce0f70359abce58c57ca372823925d948d23372fea7dc8d09e2734549044cd89e7a644e3815e985c75ee64eaf34992 SHA512 175cf5dd7cdd29ee30857e4960355ce164f2ae8c038473409b26e0f201f0b19782924ffc532a05d58cf76ade332ab87afffa52512cb9b8ff69fa36b78da293c9
+EBUILD gnome-shell-extensions-42.1.ebuild 1793 BLAKE2B 154b897688f44ce9666a2ed25b5d79e4e98020f4147532ddd0325ad18a161712f724e5391a8fbf4bd1d78a66590395c2bbb81e568335a5940139879c6272e10d SHA512 dc2527a2ea9e53682c0057712c1bc183e9365f262c5838e5bfab8895a7c887583ec794a91440ff69cba0cc559ed8f03f5e6750433585ca4840cbfc4ed3f9a774
+EBUILD gnome-shell-extensions-42.2.ebuild 1796 BLAKE2B 05aa950938c17dc8d784c40e27592c3af938d229933cbc73a62c69f96b898621ecfc5f0da95a30ae70a4d041b42ab0bf984eb771fe58ad0b073ff0a08022b597 SHA512 4693587edd6aebebbf3920828f521e013b26655aedca454c476a4488bea82244b2079b897645a2b3650d7f76b2c3a767c84fcb0ebcf97602559d22f542705244
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/gnome-extra/gnome-shell-extensions/files/gnome-shell-extensions-41.1-meson-0.61.patch b/gnome-extra/gnome-shell-extensions/files/gnome-shell-extensions-41.1-meson-0.61.patch
deleted file mode 100644
index 692f828ecd7f..000000000000
--- a/gnome-extra/gnome-shell-extensions/files/gnome-shell-extensions-41.1-meson-0.61.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Rebased version of https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/commit/cdaa837d48894737ca0b4e7d2dfb365119e53759
-https://bugs.gentoo.org/831938
-
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -1,5 +1,5 @@
- session_desktop = 'gnome-classic.desktop'
--i18n.merge_file('',
-+i18n.merge_file(
-   input:  session_desktop + '.in',
-   output: session_desktop,
-   po_dir: '../po',
diff --git a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-41.2.ebuild b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-41.2.ebuild
deleted file mode 100644
index 9b2f0bc48e2e..000000000000
--- a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-41.2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome.org readme.gentoo-r1 meson xdg
-
-DESCRIPTION="JavaScript extensions for GNOME Shell"
-HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell/Extensions"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
-
-DEPEND="
-	>=dev-libs/glib-2.26:2
-	>=gnome-base/libgtop-2.28.3[introspection]
-	>=app-eselect/eselect-gnome-shell-extensions-20111211
-"
-RDEPEND="${DEPEND}
-	>=dev-libs/gjs-1.29
-	dev-libs/gobject-introspection:=
-	dev-libs/atk[introspection]
-	gnome-base/gnome-menus:3[introspection]
-	=gnome-base/gnome-shell-$(ver_cut 1)*
-	media-libs/clutter:1.0[introspection]
-	net-libs/telepathy-glib[introspection]
-	x11-libs/gdk-pixbuf:2[introspection]
-	x11-libs/gtk+:3[introspection]
-	x11-libs/pango[introspection]
-	x11-themes/adwaita-icon-theme
-	>=x11-wm/mutter-3.32[introspection]
-"
-BDEPEND="
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="Installed extensions installed are initially disabled by default.
-To change the system default and enable some extensions, you can use
-# eselect gnome-shell-extensions
-
-Alternatively, to enable/disable extensions on a per-user basis,
-you can use the gnome-extensions-app (included with gnome-shell),
-https://extensions.gnome.org/ web interface, or modify the
-org.gnome.shell enabled-extensions gsettings key from the command
-line or a script."
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-41.1-meson-0.61.patch
-)
-
-src_configure() {
-	meson_src_configure \
-		-Dextension_set=all \
-		-Dclassic_mode=true
-}
-
-src_install() {
-	meson_src_install
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	ebegin "Updating list of installed extensions"
-	eselect gnome-shell-extensions update
-	eend $?
-
-	readme.gentoo_print_elog
-}
diff --git a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-42.1.ebuild b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-42.1.ebuild
index 763ce0e49faf..c9a61b00860a 100644
--- a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-42.1.ebuild
+++ b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-42.1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell/Extensions"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 
 DEPEND="
 	>=dev-libs/glib-2.26:2
diff --git a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-42.0.ebuild b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-42.2.ebuild
index aea37b082f55..763ce0e49faf 100644
--- a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-42.0.ebuild
+++ b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-42.2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 inherit gnome.org readme.gentoo-r1 meson xdg
 
 DESCRIPTION="JavaScript extensions for GNOME Shell"
@@ -47,9 +47,11 @@ org.gnome.shell enabled-extensions gsettings key from the command
 line or a script."
 
 src_configure() {
-	meson_src_configure \
-		-Dextension_set=all \
+	local emesonargs=(
+		-Dextension_set=all
 		-Dclassic_mode=true
+	)
+	meson_src_configure
 }
 
 src_install() {
diff --git a/gnome-extra/gnome-shell-frippery/Manifest b/gnome-extra/gnome-shell-frippery/Manifest
index c10d06245284..c5c6fde06e2d 100644
--- a/gnome-extra/gnome-shell-frippery/Manifest
+++ b/gnome-extra/gnome-shell-frippery/Manifest
@@ -1,7 +1,3 @@
-DIST gnome-shell-frippery-41.1.tgz 82583 BLAKE2B 74d08c904712d51e53609f50b581cd60ef8fb62af8122ed3101896c8c6bf0c8fa8e69152c51496365011a98a2ed91ee2bb7b49d0ea58d3c231505e0a94c393c6 SHA512 769bb336b4abc2557b451401ac66050b3a6a9b33b9a80643e1e4054dd804b94b13a94ad576706570c1cd1da3c4912841d9fe4d011e834fe22ce7343f7a240a27
-DIST gnome-shell-frippery-41.2.tgz 82737 BLAKE2B 11bce1943e651e95c0466123c5f0bb2adf0a2d589f63655133f285ded0c3f612ac16b97f975e8c8f72e97d8c1208f982860f4a54f59620343ca9bdcd2c65341d SHA512 aff8a73a6c69b34815491c3b130c419cc7c354fc5a78b164fb07d9918fccbbff84fdb0a8a398a527b2efc136616844f96ea8175160176c6345accc680d390ff3
 DIST gnome-shell-frippery-42.0.tgz 78792 BLAKE2B d7195fa6bad1be93d5a247fe091e49debe5c53d5f701cae327e33774c69587a9eb0d0d1e5f42891834e8da1d22bdd40bb3066dd85d986dd82fd145f2ada2e327 SHA512 b71f7183befef0f8a1334ede7dca31ebc9437e0bb2415cb4b52e72859e3dfa760b26a118f3ccbe1b05c956342bf2f342ac0350f921f79be2ed5a849c3bca4237
-EBUILD gnome-shell-frippery-41.1.ebuild 968 BLAKE2B f44d082d81e53a08ddcba5797aab92df5df32a4f7670370f92c8599818ce093a9bc4acd768114566a82d841b47f4e43aef896cde5afdcb3376d7669b68e3b5aa SHA512 555266695ba4875e2c7008efcd3f43bad5514b230f1be3fe7bdd673495f9141afa4c0d97435822da54a62e560034fae5d1feb3d7d4634c69228e98ba7e664732
-EBUILD gnome-shell-frippery-41.2.ebuild 922 BLAKE2B c4c09946b71a3edd412f644ec0c65027218f4ad9d7712ad1d10215fd36bd00344fe113dcf9fc1079e3f591f397426f735cd4acd4dfc75d40b379ffedfb1c0825 SHA512 6f6dce2c9295a32c9581b39e9aedafea8c5824ecedce2bd76275cb564de53fb12658cf8e9333db543188c67ee25d35376f6bf21785e53e3b914638efee1df436
-EBUILD gnome-shell-frippery-42.0.ebuild 922 BLAKE2B c4c09946b71a3edd412f644ec0c65027218f4ad9d7712ad1d10215fd36bd00344fe113dcf9fc1079e3f591f397426f735cd4acd4dfc75d40b379ffedfb1c0825 SHA512 6f6dce2c9295a32c9581b39e9aedafea8c5824ecedce2bd76275cb564de53fb12658cf8e9333db543188c67ee25d35376f6bf21785e53e3b914638efee1df436
+EBUILD gnome-shell-frippery-42.0-r1.ebuild 920 BLAKE2B cf866454cad31318c136d517c622d78edabbab3045182a9246f7a10bf0d9d13aad098e43c5ac04eb3509703d48c39781e94d834a8ee085158b4730e56d8130e9 SHA512 3fe78239e776f951a7401c56d587eb18ecf734b2270f8ce6fb51aeff388b7512002e505443699984a86ba2f116d44e305d6328b238df8c195d49bb81751aea4f
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-41.1.ebuild b/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-41.1.ebuild
deleted file mode 100644
index 46b91da32cf7..000000000000
--- a/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-41.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Unofficial extension pack providing GNOME 2-like features"
-HOMEPAGE="http://frippery.org/extensions/index.html"
-SRC_URI="http://frippery.org/extensions/${P}.tgz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	app-eselect/eselect-gnome-shell-extensions
-	>=dev-libs/gjs-1.29
-	dev-libs/gobject-introspection:=
-	gui-libs/gtk:4[introspection]
-	gnome-base/gnome-menus:3[introspection]
-	|| (
-		=gnome-base/gnome-shell-41*
-		=gnome-base/gnome-shell-40*
-	)
-	media-libs/clutter:1.0[introspection]
-	x11-libs/pango[introspection]
-"
-DEPEND=""
-
-S="${WORKDIR}/.local/share/gnome-shell"
-
-src_install() {
-	insinto /usr/share/gnome-shell/extensions
-	doins -r extensions/*@*
-	dodoc gnome-shell-frippery/{CHANGELOG,README}
-}
-
-pkg_postinst() {
-	ebegin "Updating list of installed extensions"
-	eselect gnome-shell-extensions update
-	eend $?
-}
diff --git a/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-41.2.ebuild b/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-41.2.ebuild
deleted file mode 100644
index a3bc5335896c..000000000000
--- a/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-41.2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Unofficial extension pack providing GNOME 2-like features"
-HOMEPAGE="http://frippery.org/extensions/index.html"
-SRC_URI="http://frippery.org/extensions/${P}.tgz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	app-eselect/eselect-gnome-shell-extensions
-	>=dev-libs/gjs-1.29
-	dev-libs/gobject-introspection:=
-	gui-libs/gtk:4[introspection]
-	gnome-base/gnome-menus:3[introspection]
-	=gnome-base/gnome-shell-41*
-	media-libs/clutter:1.0[introspection]
-	x11-libs/pango[introspection]
-"
-DEPEND=""
-
-S="${WORKDIR}/.local/share/gnome-shell"
-
-src_install() {
-	insinto /usr/share/gnome-shell/extensions
-	doins -r extensions/*@*
-	dodoc gnome-shell-frippery/{CHANGELOG,README}
-}
-
-pkg_postinst() {
-	ebegin "Updating list of installed extensions"
-	eselect gnome-shell-extensions update
-	eend $?
-}
diff --git a/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-42.0.ebuild b/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-42.0-r1.ebuild
index a3bc5335896c..ae80b2801b6e 100644
--- a/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-42.0.ebuild
+++ b/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-42.0-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://frippery.org/extensions/${P}.tgz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	app-eselect/eselect-gnome-shell-extensions
@@ -17,7 +17,7 @@ RDEPEND="
 	dev-libs/gobject-introspection:=
 	gui-libs/gtk:4[introspection]
 	gnome-base/gnome-menus:3[introspection]
-	=gnome-base/gnome-shell-41*
+	=gnome-base/gnome-shell-42*
 	media-libs/clutter:1.0[introspection]
 	x11-libs/pango[introspection]
 "
diff --git a/gnome-extra/gnome-software/Manifest b/gnome-extra/gnome-software/Manifest
index 053172ab2a8e..91af127d1a4c 100644
--- a/gnome-extra/gnome-software/Manifest
+++ b/gnome-extra/gnome-software/Manifest
@@ -1,7 +1,3 @@
-DIST gnome-software-41.4.tar.xz 3243380 BLAKE2B a8511c776d902639a01b1194e7dd23f22e98c6fa5fd0624cf9d7b7ae96f0ca313eb139a396e4bf8c7b2ec94db66a3f6ef89a8d77cbd1820291f01cd6c70ec2db SHA512 97c51fd21bd5fd2f7d11e00811747992ff0e404380f84cda07e5c7cae3962034c9169ebad95f875056233c9b1d44347a0c15c61e0f018bb3128e7c7d5d3c74b2
-DIST gnome-software-42.0.tar.xz 2266316 BLAKE2B c672ecd32d80168aca9b651beb1f58562fb2874656f3c400c9301a0ed87e19cdd74554ef5995daec7f435cf689ad9dc3404623cab4dbb1e00602aa8b191ed996 SHA512 f630232d164d1a7adcf9a91133769c6fe4ce62cdaeccd49b991330682eeccfddc8f83c7326802aaabdb4fc537243c0fd19741c702f4d23d75ebd71e9abb3da92
-DIST gnome-software-42.1.tar.xz 2266468 BLAKE2B 9dfe336184e2a1ffc244ef37d31b006831e18e399e6393013842d25492062d2093210117182f6fc7521892f25864056244200c7f9a88f65da86e99373bc40daa SHA512 292a17e94c7409198fdff4250a88cb240a126c3d77a9cfee1ea8608fdc482d75af6f8fc91c5c6c068b474edea6dcb197f88ec09081a8b270d5f3eda67db755ad
-EBUILD gnome-software-41.4.ebuild 2833 BLAKE2B de6ab68841f924484e15ea7b899f3c2b82177bf1f0fc0420dd5bd2c97b4a600bcb623415d5ac12dcd6c40058f06f9dc66f89d39c7e34de1154104bd001df4fe1 SHA512 5151920c8cf7a9ec7f235b0b267b72857a76c42d8a372cf94d7717d29a1b777a04bf406495a6ea5a6e86d7ddfe4e54c0946666810b70f5d0a795f51a5c39ea1b
-EBUILD gnome-software-42.0.ebuild 2754 BLAKE2B bdddbf59bb104e86ddd954e47f6d6275c1ac2caab95a7cafb701eb44f6f49cffaf4473cbbed0361cb099f8bd60ac8dc41a48e8e4d288348526261f2ee9db2b79 SHA512 f1e6e33e06324b670583cfc88a59c3d21da8bb68ba2dd28f9add19f68310fc886dc9cea571e7b304697d558db6c762ae31ee96bdc8767f98bff1866b63c3719a
-EBUILD gnome-software-42.1.ebuild 2754 BLAKE2B bdddbf59bb104e86ddd954e47f6d6275c1ac2caab95a7cafb701eb44f6f49cffaf4473cbbed0361cb099f8bd60ac8dc41a48e8e4d288348526261f2ee9db2b79 SHA512 f1e6e33e06324b670583cfc88a59c3d21da8bb68ba2dd28f9add19f68310fc886dc9cea571e7b304697d558db6c762ae31ee96bdc8767f98bff1866b63c3719a
+DIST gnome-software-42.2.tar.xz 2274824 BLAKE2B 0c971bbe8f7e074ddc23923f14aeca4e95a0c305d016548d69bc51100859dfc30fcfcfbfe88189b6a0e4d2531c8223822aa8f16bee5bba6046266077e7c26eda SHA512 2b231afbedb241b8957fa902c37cd85734cdb8b2071cd32ac75ae2e9e064483fe1e9e8d49f2e6df478fdd01e9c6225a85887ba2af1792a9150b89cea75ef8bb4
+EBUILD gnome-software-42.2.ebuild 2754 BLAKE2B bdddbf59bb104e86ddd954e47f6d6275c1ac2caab95a7cafb701eb44f6f49cffaf4473cbbed0361cb099f8bd60ac8dc41a48e8e4d288348526261f2ee9db2b79 SHA512 f1e6e33e06324b670583cfc88a59c3d21da8bb68ba2dd28f9add19f68310fc886dc9cea571e7b304697d558db6c762ae31ee96bdc8767f98bff1866b63c3719a
 MISC metadata.xml 579 BLAKE2B 4ac8aea21122da6a03605961d9f47721a06a4c49ffdc1ffa16eee5a473f5e5957c69760ee7d19e087688fe2b479a16f4cf417cbe0e2d3e149b0339881fecd2fc SHA512 3f783e0f7fbec5a95f498d622885de19babf8f786a66af2d3755907d242df0433a910b07c2628854ed1038920417d7d28c35c10f18adfcbd37e8922aa3c9253d
diff --git a/gnome-extra/gnome-software/gnome-software-41.4.ebuild b/gnome-extra/gnome-software/gnome-software-41.4.ebuild
deleted file mode 100644
index 69002ba173ae..000000000000
--- a/gnome-extra/gnome-software/gnome-software-41.4.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome.org gnome2-utils meson xdg
-
-DESCRIPTION="Gnome install & update software"
-HOMEPAGE="https://wiki.gnome.org/Apps/Software"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="flatpak +firmware gnome gtk-doc spell sysprof udev"
-RESTRICT="test" # writes to and deletes files in /var/tmp/self-test/
-
-RDEPEND="
-	>=dev-libs/appstream-0.14.0:0=
-	>=x11-libs/gdk-pixbuf-2.32.0:2
-	>=dev-libs/libxmlb-0.1.7:=
-	>=x11-libs/gtk+-3.22.4:3
-	>=dev-libs/glib-2.56:2
-	>=dev-libs/json-glib-1.2.0
-	>=net-libs/libsoup-2.52.0:2.4
-	>=gui-libs/libhandy-1.2.0:1=
-	sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 )
-	gnome? ( >=gnome-base/gsettings-desktop-schemas-3.18.0 )
-	spell? ( app-text/gspell:= )
-	sys-auth/polkit
-	firmware? ( >=sys-apps/fwupd-1.0.3 )
-	flatpak? (
-		>=sys-apps/flatpak-1.0.4
-		dev-util/ostree
-	)
-	udev? ( dev-libs/libgudev )
-	>=gnome-base/gsettings-desktop-schemas-3.11.5
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-libs/libxml2:2
-	dev-util/gdbus-codegen
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	gtk-doc? (
-		dev-util/gtk-doc
-		app-text/docbook-xml-dtd:4.3 )
-"
-# test? ( dev-util/valgrind )
-
-src_prepare() {
-	xdg_src_prepare
-	sed -i -e '/install_data.*README\.md.*share\/doc\/gnome-software/d' meson.build || die
-	# We don't need language packs download support, and it fails tests in 3.34.2 for us (if they are enabled)
-	sed -i -e '/subdir.*fedora-langpacks/d' plugins/meson.build || die
-	# Trouble talking to spawned gnome-keyring socket for some reason, even if wrapped in dbus-run-session
-	# TODO: Investigate; seems to work outside ebuild .. test/emerge
-	sed -i -e '/g_test_add_func.*gs_auth_secret_func/d' lib/gs-self-test.c || die
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dtests=false #$(meson_use test tests)
-		$(meson_use spell gspell)
-		$(meson_feature gnome gsettings_desktop_schemas) # Honoring of GNOME date format settings.
-		-Dman=true
-		-Dpackagekit=false
-		# -Dpackagekit_autoremove
-		-Dpolkit=true
-		-Deos_updater=false # Endless OS updater
-		$(meson_use firmware fwupd)
-		$(meson_use flatpak)
-		-Dmalcontent=false
-		-Drpm_ostree=false
-		$(meson_use udev gudev)
-		-Dapt=false
-		-Dsnap=false
-		-Dexternal_appstream=false
-		-Dvalgrind=false
-		$(meson_use gtk-doc gtk_doc)
-		-Dhardcoded_popular=true
-		-Ddefault_featured_apps=false # TODO: Will this be beneficial to us with flatpak at least? If enabled, it shows some apps under installed (probably merely due to /usr/share/app-info presence), but launching and removal of them is broken
-		-Dmogwai=false #TODO?
-		$(meson_feature sysprof)
-		-Dprofile=''
-	)
-	meson_src_configure
-}
-
-#src_test() {
-#	virtx meson_src_test
-#}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/gnome-software/gnome-software-42.1.ebuild b/gnome-extra/gnome-software/gnome-software-42.1.ebuild
deleted file mode 100644
index 8ef94587b026..000000000000
--- a/gnome-extra/gnome-software/gnome-software-42.1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit gnome.org gnome2-utils meson virtualx xdg
-
-DESCRIPTION="Gnome install & update software"
-HOMEPAGE="https://wiki.gnome.org/Apps/Software"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="flatpak +firmware gnome gtk-doc sysprof udev"
-RESTRICT="test" # See TODO below
-
-RDEPEND="
-	>=dev-libs/appstream-0.14.0:0=
-	>=x11-libs/gdk-pixbuf-2.32.0:2
-	>=dev-libs/libxmlb-0.1.7:=
-	>=gui-libs/gtk-4.6:4
-	>=dev-libs/glib-2.66.0:2
-	>=dev-libs/json-glib-1.6.0
-	>=net-libs/libsoup-2.52.0:2.4
-	>=gui-libs/libadwaita-1.0.1:1
-	sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 )
-	gnome? ( >=gnome-base/gsettings-desktop-schemas-3.18.0 )
-	sys-auth/polkit
-	firmware? ( >=sys-apps/fwupd-1.5.6 )
-	flatpak? (
-		>=sys-apps/flatpak-1.9.1
-		dev-util/ostree
-	)
-	udev? ( dev-libs/libgudev )
-	>=gnome-base/gsettings-desktop-schemas-3.11.5
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-libs/libxml2:2
-	dev-util/gdbus-codegen
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	gtk-doc? (
-		dev-util/gtk-doc
-		app-text/docbook-xml-dtd:4.3 )
-"
-# test? ( dev-util/valgrind )
-
-src_prepare() {
-	default
-	xdg_environment_reset
-
-	sed -i -e '/install_data.*README\.md.*share\/doc\/gnome-software/d' meson.build || die
-	# We don't need language packs download support, and it fails tests in 3.34.2 for us (if they are enabled)
-	sed -i -e '/subdir.*fedora-langpacks/d' plugins/meson.build || die
-	# Trouble talking to spawned gnome-keyring socket for some reason, even if wrapped in dbus-run-session
-	# TODO: Investigate; seems to work outside ebuild .. test/emerge
-	sed -i -e '/g_test_add_func.*gs_auth_secret_func/d' lib/gs-self-test.c || die
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use test tests)
-		$(meson_feature gnome gsettings_desktop_schemas) # Honoring of GNOME date format settings.
-		-Dman=true
-		-Dpackagekit=false
-		# -Dpackagekit_autoremove
-		-Dpolkit=true
-		-Deos_updater=false # Endless OS updater
-		$(meson_use firmware fwupd)
-		$(meson_use flatpak)
-		-Dmalcontent=false
-		-Drpm_ostree=false
-		$(meson_use udev gudev)
-		-Dapt=false
-		-Dsnap=false
-		-Dexternal_appstream=false
-		-Dvalgrind=false
-		$(meson_use gtk-doc gtk_doc)
-		-Dhardcoded_popular=true
-		-Ddefault_featured_apps=false # TODO: Will this be beneficial to us with flatpak at least? If enabled, it shows some apps under installed (probably merely due to /usr/share/app-info presence), but launching and removal of them is broken
-		-Dmogwai=false #TODO?
-		$(meson_feature sysprof)
-		-Dprofile=''
-		-Dsoup2=true
-	)
-	meson_src_configure
-}
-
-src_test() {
-	virtx meson_src_test
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/gnome-software/gnome-software-42.0.ebuild b/gnome-extra/gnome-software/gnome-software-42.2.ebuild
index 8ef94587b026..8ef94587b026 100644
--- a/gnome-extra/gnome-software/gnome-software-42.0.ebuild
+++ b/gnome-extra/gnome-software/gnome-software-42.2.ebuild
diff --git a/gnome-extra/gnome-system-monitor/Manifest b/gnome-extra/gnome-system-monitor/Manifest
index b0c97455ef24..0c79effe5ed2 100644
--- a/gnome-extra/gnome-system-monitor/Manifest
+++ b/gnome-extra/gnome-system-monitor/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-system-monitor-41.0.tar.xz 774644 BLAKE2B 9aafaaf77b414435301eebd8bc84f04faa171139a7d9e6e71ad9bae8f097eaf6d637502ab64f0868636f7964a2b76353364ad27ee2b56c3d8f9131e0a7ee1df2 SHA512 1eecddc479f0d9e986f1821a8c4b72246a6995f7853a6b35c8435d1aaa1afd7bc1df0cc0b9748785e4581563985652be19beb12b193ee17439ba4564febf5d20
 DIST gnome-system-monitor-42.0.tar.xz 978208 BLAKE2B ba52048e643eef1dd556dc833fc5ebdf6a07559551c5e28dc46c3d143676571f7704667263f9974d87d6ed3679c15c955178a02e9ed5f69b4bc25c78d9b32e4e SHA512 880093fd75a87993ff8def1db9f6f090edaad43c6dc08564f61b9dbfa8c10df5e6d6a9a9072737d802503b34ba70de7bf7ef5aab2bf055ea68e795ec11a48bdd
-EBUILD gnome-system-monitor-41.0.ebuild 1218 BLAKE2B 4be801cd19ce9f284a58bdd8ec60bda0a0c3a21b901445d1884d03f3f663221b1184a92e7897418c18a75a68c9f73c7b789968db23b8cfe0fbc35766721fef7c SHA512 0f54159ba0465b192b322cb472f9e8495ad871097cb990daef3bd2b6522ad3896cac0d4f7cdad2485bceb98d578ba92c056167f3a097fd50fd0fc89c6ff1da84
-EBUILD gnome-system-monitor-42.0.ebuild 1221 BLAKE2B 14ed66e3bce5d62a25261a3860879a11764b9da7943e97e73a2a3794c357a562988a63a450ee6f17a62b22dcf4a7e175ac27a709947f2bb514c85eed7a85e40d SHA512 937096d0ce6d72120aacd88633044864eb84a0a6b2422a998ae2bf888fcd3f81f0202f97c28b13f8859a316d7eb977b44fe1587a5c50adb669c9de8ceb798ca6
+EBUILD gnome-system-monitor-42.0.ebuild 1218 BLAKE2B 0b4d68985ed1f90aa1a73e5cb97835de80700d2b3ae97391a5d4d5e3951cb36a954f12499b98a14206c0a777de93c6967eb6cac5e0a94b18e683dc960d5a8e77 SHA512 1c0de5dd10e5e3bdf794397d9475df7a07fe3cc62462d19cf04358793e55d6d95b7c5785c7a9c681a00318c81676c719085c9b2d139e4bbbadc8af9052d53097
 MISC metadata.xml 379 BLAKE2B 6427637b2adc503ee411ddf8897458780db85a500e2cf7ec23c96640cb01ba718a2adba649cd112fae3e8405ba89539dc712d4d955f5e36f0b1719ce4afdada1 SHA512 0b64ee41da44fb823f9e34f2571e26c04d901709ca2b1242e27daae3ca7c7767e5df8f809f20316a135a72debd81bc629a0c218860d3288e4636bc3e3681d248
diff --git a/gnome-extra/gnome-system-monitor/gnome-system-monitor-41.0.ebuild b/gnome-extra/gnome-system-monitor/gnome-system-monitor-41.0.ebuild
deleted file mode 100644
index be5bd4a7a192..000000000000
--- a/gnome-extra/gnome-system-monitor/gnome-system-monitor-41.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome.org gnome2-utils meson xdg
-
-DESCRIPTION="The Gnome System Monitor"
-HOMEPAGE="https://help.gnome.org/users/gnome-system-monitor/stable/"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="systemd X"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
-
-RDEPEND="
-	>=dev-cpp/glibmm-2.46:2
-	>=dev-libs/glib-2.56.0:2
-	>=x11-libs/gtk+-3.22:3[X(+)]
-	>=dev-cpp/gtkmm-3.3.18:3.0
-	>=dev-cpp/atkmm-2.28:0
-	>=gnome-base/libgtop-2.37.2:2=
-	>=gui-libs/libhandy-1.0.0:1=
-	>=gnome-base/librsvg-2.35:2
-	>=dev-libs/libxml2-2.0:2
-	X? ( >=x11-libs/libwnck-2.91.0:3 )
-	systemd? ( >=sys-apps/systemd-44:0= )
-"
-# eautoreconf requires gnome-base/gnome-common
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/glib-utils
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	>=sys-auth/polkit-0.114
-" # polkit needed at buildtime for ITS rules of policy files, first available in 0.114
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use X wnck)
-		$(meson_use systemd)
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/gnome-system-monitor/gnome-system-monitor-42.0.ebuild b/gnome-extra/gnome-system-monitor/gnome-system-monitor-42.0.ebuild
index 76f02b713576..5ba7db4040cb 100644
--- a/gnome-extra/gnome-system-monitor/gnome-system-monitor-42.0.ebuild
+++ b/gnome-extra/gnome-system-monitor/gnome-system-monitor-42.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://help.gnome.org/users/gnome-system-monitor/stable/"
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE="systemd X"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	>=dev-cpp/glibmm-2.46:2
diff --git a/gnome-extra/gnome-tweaks/Manifest b/gnome-extra/gnome-tweaks/Manifest
index aeb18288d40a..090b51403644 100644
--- a/gnome-extra/gnome-tweaks/Manifest
+++ b/gnome-extra/gnome-tweaks/Manifest
@@ -1,7 +1,4 @@
 AUX 3.28.1-gentoo-cursor-themes.patch 1019 BLAKE2B 1dc92c4f8e53c1303f884f6acc332a7a0f1bd11b463e91ddd4ae731938e678f75499692044b5c13021f24dd9bf61264c4454fab734fe65609b3b4c009cb2eee2 SHA512 e502e1ae5945517e7a69cd15436bc07e34fe0db739350e0617d02c9b7a45264f585229f80352a93595e1246d5f9c6e987242772dfb7293de06b400fbaf676971
-AUX gnome-tweaks-40.0-meson-0.61.patch 944 BLAKE2B b7ecf7ec1a492610fb7001721e8c1b60e0d8dd1d6c50ce443acd395c27e09f664db68a7c160e3143538bc6df48516f216ef4d8ccd4352e0786057837856620d2 SHA512 ff7ffd60a4c187fd7caeb6bebb5b06c1841d5e921d7d7d2d549f67e5d367a152d2545a49e07c6e8c1954b203a2e3826e692e1a37b81a62db14196a504cf8faaf
-DIST gnome-tweaks-40.0.tar.xz 251908 BLAKE2B 4280e7565da3f95d7bcd81ba874d2f15e8c3834ab052cb4cf7cde8060eaea016670acf6f441d2cbce4b7566ba0bb7a7f9666b257893bc7b22b1cdc4d5a0edee2 SHA512 c3467f40af6bb79c2b10cb429e93aa29261066c2a5fd744bf2801c4e596cc270d45302ebfa942ee0c40067849c12e1ccd404c40e7f594bcff4c44cfe3f90bb97
 DIST gnome-tweaks-40.10.tar.xz 251712 BLAKE2B 7e9e04b86ffcff25cafd2a6dfc0c7be14c8caa4ae003369c34ed2c40c36ce857b05de9994f7c2187cbdd535f464b92f782ec91b835318c2b5d2219ad817fbe56 SHA512 1247933ad2f93bd7817af367d715468591840df4840d45641033ca19ea26c64239828ba3e24fafb8694014a98024b911266c314172ba8e37d6c4165e7e6e8a29
-EBUILD gnome-tweaks-40.0.ebuild 1392 BLAKE2B 78eb50a92f55665a95e11d08b4770c5558690f0ec9868432de4225b14c6d831ac3480cf5c3afadda2fdfcd0f403e5983ce8daa04866e757dbd31fafa80994aef SHA512 ccff3f0cc0aaffc9f994ef971222c0ac2813366553a2d5c4925308609d037d83e12a30cfa14669842931deeed3dd3f3ef2088a275b396e402bfee392171b66bd
-EBUILD gnome-tweaks-40.10.ebuild 1351 BLAKE2B 7e48ef65d327c8516e9efc04329f0786e0972ac44e2dbfa74cdbfdd93c06a6441eaaf729ccfac746f6f9f68bf5b12ec8c605646138ef782e95b6d00e3c72201d SHA512 5787088aa284ed5f3c3c41ae1994954c2aab1e568690a76f2c43f0cc926ca202199d9a552e767d5eba72d51b39c18c36d0462fe58d635ade871f59ac9dcd28d4
+EBUILD gnome-tweaks-40.10.ebuild 1348 BLAKE2B b8e170da11721de60b5305efbcfdf03d7f611d99ee3bf49fc7063e70515cf4e93959b7fade4ad539e5dcaa5216b81c711b30a3dc5f268dc774b18bd232c66072 SHA512 40d9e6f3f39c4fd5266403828213f991258e6c5910a16502dda48ca7d82ec8daaa45ee1d618c7600a5646dd51566c4627155e5a53de04c753741e1cce227668e
 MISC metadata.xml 557 BLAKE2B 377b3b95f3dfade66ceb83a955bae45820c7db9cb286fbc9fb7f597909d6e58b3ccbdde1acc5bc01bda97bcde90a062a8e4676c8593edfc95c46f27c311ca83e SHA512 9a24c8eedb00ba7ceaba017cfeef778a7def43d7baf62c23067376f7648fad3b333e16a9dc4f8c41f66279b4bbe8acf54844ab5460d56366d32c325ea5d06e2d
diff --git a/gnome-extra/gnome-tweaks/files/gnome-tweaks-40.0-meson-0.61.patch b/gnome-extra/gnome-tweaks/files/gnome-tweaks-40.0-meson-0.61.patch
deleted file mode 100644
index 9ef4db33ecb5..000000000000
--- a/gnome-extra/gnome-tweaks/files/gnome-tweaks-40.0-meson-0.61.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-https://gitlab.gnome.org/GNOME/gnome-tweaks/-/merge_requests/86.patch
-https://bugs.gentoo.org/831937
-
-From 56f39dc7d04a1be91de1149683874f9c83b794fb Mon Sep 17 00:00:00 2001
-From: Mae Dartmann <mae@meanderingmind.me>
-Date: Sat, 22 Jan 2022 18:09:21 +0100
-Subject: [PATCH] meson: fix invalid positional argument
-
-This was deprecated in meson 0.60 and removed in 0.61. See
-https://github.com/mesonbuild/meson/pull/9445 for details.
-
-Signed-off-by: Mae Dartmann <mae@meanderingmind.me>
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -1,5 +1,5 @@
- appdata_file = 'org.gnome.tweaks.appdata.xml'
--i18n.merge_file(appdata_file,
-+i18n.merge_file(
-   input: appdata_file + '.in',
-   output: appdata_file,
-   po_dir: '../po',
-@@ -8,7 +8,7 @@ i18n.merge_file(appdata_file,
- )
- 
- desktop_file = 'org.gnome.tweaks.desktop'
--i18n.merge_file(desktop_file,
-+i18n.merge_file(
-   input: desktop_file + '.in',
-   output: desktop_file,
-   po_dir: '../po',
-GitLab
diff --git a/gnome-extra/gnome-tweaks/gnome-tweaks-40.0.ebuild b/gnome-extra/gnome-tweaks/gnome-tweaks-40.0.ebuild
deleted file mode 100644
index e290c8ab5396..000000000000
--- a/gnome-extra/gnome-tweaks/gnome-tweaks-40.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit gnome.org gnome2-utils meson python-single-r1 xdg
-
-DESCRIPTION="Customize advanced GNOME options"
-HOMEPAGE="https://wiki.gnome.org/Apps/Tweaks"
-
-LICENSE="GPL-3+ CC0-1.0"
-SLOT="0"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-
-DEPEND="${PYTHON_DEPS}"
-# See README.md for list of deps
-RDEPEND="${DEPEND}
-	$(python_gen_cond_dep '
-		>=dev-python/pygobject-3.10.2:3[${PYTHON_USEDEP}]
-	')
-	>=gnome-base/gnome-settings-daemon-3
-	x11-themes/sound-theme-freedesktop
-
-	>=dev-libs/glib-2.58:2
-	>=x11-libs/gtk+-3.12:3[introspection]
-	>=gnome-base/gnome-desktop-3.30:3[introspection]
-	gui-libs/libhandy:1[introspection]
-	net-libs/libsoup:2.4[introspection]
-	x11-libs/libnotify[introspection]
-
-	>=gnome-base/gsettings-desktop-schemas-40.0
-	>=gnome-base/gnome-shell-3.24
-	x11-wm/mutter
-"
-BDEPEND=">=sys-devel/gettext-0.19.8"
-
-PATCHES=(
-	"${FILESDIR}"/3.28.1-gentoo-cursor-themes.patch # Add contents of Gentoo's cursor theme directory to cursor theme list
-
-	"${FILESDIR}"/${PN}-40.0-meson-0.61.patch
-)
-
-src_install() {
-	meson_src_install
-	python_optimize
-	python_fix_shebang "${ED}"/usr/bin/
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/gnome-tweaks/gnome-tweaks-40.10.ebuild b/gnome-extra/gnome-tweaks/gnome-tweaks-40.10.ebuild
index 30feae50500c..883e664b39ae 100644
--- a/gnome-extra/gnome-tweaks/gnome-tweaks-40.10.ebuild
+++ b/gnome-extra/gnome-tweaks/gnome-tweaks-40.10.ebuild
@@ -14,7 +14,7 @@ SLOT="0"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 
 DEPEND="${PYTHON_DEPS}"
 # See README.md for list of deps
diff --git a/gnome-extra/gnome-user-docs/Manifest b/gnome-extra/gnome-user-docs/Manifest
index 2c8309800a8d..19f26cfd7473 100644
--- a/gnome-extra/gnome-user-docs/Manifest
+++ b/gnome-extra/gnome-user-docs/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-user-docs-41.2.tar.xz 9407232 BLAKE2B 81c6d638e6cf3011cf4f2ee835c293fd0152435d2f4d07e7bc403882e378d140d7e03fbaca7f87e23f6c65d104dc7be4a2bc0902a3e1a5ab42815ceb250ff4b0 SHA512 982fa4c491a530df0067c3f437c961f84c393f1f95895e86f348609fa0407ffa6a33dbc961c87c5083180d4ad1a069ec2886d0ec841e9c965f21cb0b55322f4b
 DIST gnome-user-docs-42.0.tar.xz 10273312 BLAKE2B c3cc30d75f686bacae2f4f3789215ac6cb505483a2c2ae1bf8766e7767ea7a5d7ef922fe6117e9b6a773771ee83f32f113bc18f4056dda66848c17ccbc256c77 SHA512 524dfeaf0ca77c19906395f81f45ac2a7873fc116a6794bae53130b32c1fcdd063566ee0ec4f3e51cfc18e12db8aed5219fd8817a7de3cae6d6a68f228212905
-EBUILD gnome-user-docs-41.2.ebuild 942 BLAKE2B 978c25c4ed533255a16ee88e7f670ee92c8e838c9b0c884645fd1477e91f1e63558c5e2cc21ca2e407098b97bc5e18dfd70b422614a7999221022fe767dbcc2b SHA512 72898d7193955b3d5bac304e4bbd2283de883ec8b4d97bc8ea8071b05d6be6a790e3255c29a89b03476db7459515e85c7dacf997b4e78388e5fb78a32d73dc45
-EBUILD gnome-user-docs-42.0.ebuild 945 BLAKE2B 0d43c04de9a5c75bcddb3b11758fa8dee8d15f6399bcc81e3d93b0a4c34bdbdfb08bf531854c4da527c68e9ed69aec12e0134f7a6dea14af686e2181117c310f SHA512 eee2d128b0676f56ff54b6b9d78f49d15fb83956176404401bd9a0f462a1ce5817541a96ad103e8d84ec4ecab0d84779a60126c877c47b5bedeb2ca3225b9266
+EBUILD gnome-user-docs-42.0.ebuild 942 BLAKE2B c4811c7f2a17bb92457dd928ad91bcd5e09965652bdc1cd612f3bcca78e3b7420501af5a5db00f3e0fd7f9e0d4ba1104f26f779e1991011cf7963f157d372d5d SHA512 e613d016928f092efe90d5201cee9192ededa9d05b9f15b7b7a52530efd038ce71698928c6777aca4e773a0269ed8a938198c4518605655c64898a045f45a333
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/gnome-extra/gnome-user-docs/gnome-user-docs-41.2.ebuild b/gnome-extra/gnome-user-docs/gnome-user-docs-41.2.ebuild
deleted file mode 100644
index 5087dc81bc50..000000000000
--- a/gnome-extra/gnome-user-docs/gnome-user-docs-41.2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome2
-
-DESCRIPTION="GNOME end user documentation"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-user-docs"
-
-LICENSE="CC-BY-3.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
-IUSE="test"
-
-BDEPEND="test? ( dev-libs/libxml2 )"
-# eautoreconf requires:
-#	app-text/yelp-tools
-# rebuilding translations requires:
-#	app-text/yelp-tools
-#	dev-util/gettext
-
-# This ebuild does not install any binaries
-RESTRICT="binchecks strip
-	!test? ( test )"
-
-src_configure() {
-	# itstool is only needed for rebuilding translations
-	# xmllint is only needed for tests
-	gnome2_src_configure \
-		$(usex test "" XMLLINT=$(type -P true)) \
-		ITSTOOL=$(type -P true)
-}
-
-src_compile() {
-	# Do not compile; "make all" with unset LINGUAS rebuilds all translations,
-	# which can take > 2 hours on a Core i7.
-	return
-}
diff --git a/gnome-extra/gnome-user-docs/gnome-user-docs-42.0.ebuild b/gnome-extra/gnome-user-docs/gnome-user-docs-42.0.ebuild
index 889d05a30d13..69360df4152a 100644
--- a/gnome-extra/gnome-user-docs/gnome-user-docs-42.0.ebuild
+++ b/gnome-extra/gnome-user-docs/gnome-user-docs-42.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-user-docs"
 
 LICENSE="CC-BY-3.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
 IUSE="test"
 
 BDEPEND="test? ( dev-libs/libxml2 )"
diff --git a/gnome-extra/gnome-weather/Manifest b/gnome-extra/gnome-weather/Manifest
index 939fcaed8fdb..d088f5ec971b 100644
--- a/gnome-extra/gnome-weather/Manifest
+++ b/gnome-extra/gnome-weather/Manifest
@@ -1,6 +1,3 @@
-AUX gnome-weather-41.0-fix-meson-0.61-build.patch 706 BLAKE2B 9023904ae76060fe81992bcf2c5185241335c9eb79941f92e27c5b645fe467e7b69774fddcfcb9698ed4388c65816927d377786b331bd94672f730ecf8ca5823 SHA512 365e7119ccc3d7bf50675f9870558c835da1d893f4d366f54beb73aa64d6f3cb3a7165a0b0e33bdd5f39b6eb33a98d7058487efd1f009cec30869bd65bdfeaea
-DIST gnome-weather-41.0.tar.xz 943500 BLAKE2B a349360f001bc8a3246227fcdad51bdb115db382650ead36e9768c002f0d7892296610320bf90bb569915c72c48492002268f8aa049055ebc687dc08052d6170 SHA512 f625a83ecfffe1ad58aa268b6ab3009504f839f3d56e52c642bc23ee32c0b51638888de17a1b4bc0990b2fd6718a7266fe5cd79230594a06ae58a816308b2b99
 DIST gnome-weather-42.0.tar.xz 233552 BLAKE2B 64cdefbcdc93359518b4e08564eafc3235d7b2ab92d69d79b558c5d4f5ce03425d87fb8e7e351165d00983eab5807ebc05aa7c0eb604a618d135afb66170c8ff SHA512 10471a32adc148fad393e03098396a3cfccc75d1cd18985cdd2c287927213aeb493f2878ea986e1d3a3af4b1d3f439afcdb96833d849bbd5fbe7aebb1d1992e6
-EBUILD gnome-weather-41.0.ebuild 1438 BLAKE2B 8d9d61fba786d3a290ab7f32ee524dc10f915fe052310600a59af893f231d5431f98f35b1816f8653ae5c7aaa16e66962116cbc0a6c0ad57abcc98385dc2ab89 SHA512 48488d4616a23d69ac6ea37c84c360509341183b65cbedf5471bc62c87b985af5569269c213f7368b71e90b3afa41977ff2a1db5d4a47368f5e8b13c948c060c
-EBUILD gnome-weather-42.0.ebuild 1385 BLAKE2B d356d9a73c0dabefd19231ca7c505678dfc1a5226a5322b1f8dce9c040b80e97f319629bf5ab6aebe3792e4ecf1e0d67c5d0dadb24426670a1540da0af6d25d4 SHA512 2bca241744fc08a0ae8c8236b1e5187a309c1b0b5dfdbd57213ea9c87ea776582fa5fe0465e7052e4f86f3aeaf8ad325469d416c39a5b4f0841aa03c2e922196
+EBUILD gnome-weather-42.0.ebuild 1382 BLAKE2B 069122582d8254035b83a6a8e10158b7cf839ed92c6034f3fb50270071d86753b5179917eb6a60cebbae09c3605a7e6ce7403855b0acdb8e86116ed94e53312c SHA512 eb1ea4938a0854d35ea6179b673c0230367c9c8a272f42544a5c242f5961ef0cddde6061a6ea95bdedb8891095b2a6b27d77d319cc3ad0f9d842b64937860511
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/gnome-extra/gnome-weather/files/gnome-weather-41.0-fix-meson-0.61-build.patch b/gnome-extra/gnome-weather/files/gnome-weather-41.0-fix-meson-0.61-build.patch
deleted file mode 100644
index 6756c77f8b7d..000000000000
--- a/gnome-extra/gnome-weather/files/gnome-weather-41.0-fix-meson-0.61-build.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-https://gitlab.gnome.org/GNOME/gnome-weather/-/commit/4be71525f07189e97720688472172604879d49a5
-https://bugs.gentoo.org/831749
-
-From: rvalue <i@rvalue.moe>
-Date: Fri, 17 Dec 2021 12:26:42 +0000
-Subject: [PATCH] Remove incorrect args for i18n.merge_file
-
-`i18n.merge_file` has been ignoring positional arguments for a time and
-explicitly rejects with error since meson 0.60.0
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -59,7 +59,6 @@ endif
- appdata_conf = configuration_data()
- appdata_conf.set('app_id', weather_id)
- appdata = i18n.merge_file(
--  'appdata',
-   input: configure_file(
-     input: '@0@.appdata.xml.in.in'.format(default_id),
-     output: '@0@.appdata.xml.in'.format(default_id),
-GitLab
diff --git a/gnome-extra/gnome-weather/gnome-weather-41.0.ebuild b/gnome-extra/gnome-weather/gnome-weather-41.0.ebuild
deleted file mode 100644
index dfb941231680..000000000000
--- a/gnome-extra/gnome-weather/gnome-weather-41.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome.org gnome2-utils meson xdg
-
-DESCRIPTION="A weather application for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Design/Apps/Weather"
-
-LICENSE="GPL-2+ LGPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
-
-DEPEND="
-	>=dev-libs/glib-2.32:2
-	>=dev-libs/gobject-introspection-1.56:=
-	>=x11-libs/gtk+-3.20:3
-	>=dev-libs/gjs-1.50
-	>=app-misc/geoclue-2.3.1:2.0
-	>=dev-libs/libgweather-40.0:=
-	>=gui-libs/libhandy-1.1.90:1=
-"
-RDEPEND="${DEPEND}
-	gnome-base/gsettings-desktop-schemas
-"
-# libxml2 required for glib-compile-resources
-BDEPEND="
-	dev-libs/appstream-glib
-	dev-libs/libxml2:2
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-# Tests have a lot of issues, starting with reliance on a system installation,
-# accessing the network and other intermittent failures with network-sandbox disabled
-# https://gitlab.gnome.org/GNOME/gnome-weather/issues/67 (and rest not filed)
-# test dep: $(python_gen_any_dep 'dev-util/dogtail[${PYTHON_USEDEP}]')
-# With 3.34, this is now behind a dogtail option we can pass (and have data validation)
-
-PATCHES=(
-	"${FILESDIR}"/${P}-fix-meson-0.61-build.patch
-)
-
-src_configure() {
-	meson_src_configure -Dprofile=default -Ddogtail=false
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/gnome-weather/gnome-weather-42.0.ebuild b/gnome-extra/gnome-weather/gnome-weather-42.0.ebuild
index 82a788f80ae0..0012f418f914 100644
--- a/gnome-extra/gnome-weather/gnome-weather-42.0.ebuild
+++ b/gnome-extra/gnome-weather/gnome-weather-42.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Design/Apps/Weather"
 
 LICENSE="GPL-2+ LGPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 
 DEPEND="
 	>=dev-libs/glib-2.32:2
diff --git a/gnome-extra/gucharmap/Manifest b/gnome-extra/gucharmap/Manifest
index 276c6bd6d127..52d3198b3c80 100644
--- a/gnome-extra/gucharmap/Manifest
+++ b/gnome-extra/gucharmap/Manifest
@@ -1,10 +1,8 @@
 AUX 14.0.1-fix-file-conflicts.patch 699 BLAKE2B a276814cd000ebc34b38b4031e47813935ac0a166acbdfe719e27eb3d83e50ce5eb55486dfe6dfd4bbd53bf56c28d3d213cc266148063fbe8aee06967a423622 SHA512 160d3bcf8ea27fecd51470a15e83ef29c99f9b4c86cce1286d8ba2a6432a11a0fa4ec602db80c8daba3ad5e5e24c602a876fc8ad90e07a65d968ed47e46badfc
 AUX 14.0.1-install-user-help.patch 749 BLAKE2B 954bae11770bccdbf5babea1c06cc829ef069777a52542ffb683ca0709300edbfaa452aea7da44497b900dc653c00b129bcdca0ee6808e6d5f610d43437858d6 SHA512 c1fedabf8eff11256cd4a93130db028c3e599f6f0fd249ff8a4533c1ebf7d3f8c17422b3765dbc047f25bd9c4725c43212de585642a246338c7fcd1c78c3d914
 AUX gucharmap-3.4.1.1-fix-doc.patch 348 BLAKE2B c6bf73a5e9940557fa43da04b8212ca527b9abdfaccf7f1522c9a6dfcb52af8f6c05a56a683621eb64c34452464605d7a5a98b77ab9b67224f5c84acc0b1cf68 SHA512 d6e468ce2bbd258e01be0125a1b16529c89ce9758c24504d91550181af3b3e7c6b0e4171d3b26c252339f099927d43a7184f967764d564a4ebf28610968d8d27
-DIST gucharmap-14.0.2.tar.gz 1925142 BLAKE2B 3936c187ecdc104534b80830f9089417e8c2166a8e8dbfc848788a58acd9d65889f1242ecd3a2d9a5f2e657dcc052dee22b3ed543d2113509905a472192b19eb SHA512 4cfcebca0cac5cef8e6601c077a49e12aa56e76fec131ccf5ca1fb11bf40e5df8b6ae5ec83c2b64764c9d223d52824d4007c114ee7d85b4246855b8fc15c6c2d
 DIST gucharmap-14.0.3.tar.gz 1931686 BLAKE2B e72b46450ad97a49519014882cbfd5792a07daf782fdf0d80e4b9221537548a57d3b43dc2b421f3f72d3b0adfee6f11c53304b4468c78b766ffee9536efebba2 SHA512 cb43265a2b54231c15331c299ed10bba8bb83bdc1860ee50764bed8a40ce1421f49edfeb7fa5814c8aac6c23f80936a966346849db83ddf7f94a370adeffc6c8
 DIST gucharmap-3.0.1.tar.bz2 3275481 BLAKE2B 80dde7791abdc72677add9c65c59f810e6c6952116b92db34059c4c40d2657246b17844c105e68f32c86294e9b4e71e9d48e6f0522855465734d7c24e8d17608 SHA512 4d8a2276b5cb1a0b0fadca2a8522755c5884985a12d5b19341b9cefcd7f749ec1286c0271419e38ec84be7edcfa1293e7f0263eb682c75387d692792de3e1fb1
-EBUILD gucharmap-14.0.2.ebuild 1659 BLAKE2B 5bd582b14249e249fbb70dc653196dec4b894381ea95323b7e51a43893587f18d908fd2176600fc832d95bed70e9e59084ffc5b63309424563a792c9e1c6ac94 SHA512 b095807a056006c37da95a83d2a165e02e2c201eee0f634d14d67bb3926c3663095d9ab1b26a402cc96aa45eaaa0577aa14ee34366c2b526333ca4b9a858c7ee
-EBUILD gucharmap-14.0.3.ebuild 1708 BLAKE2B 9f27eb9f913b1849cfa9e51a0ac3f2988efd66fe42aba02cda43c89980838facea1f5251b6447f1f3c10ccf344624be2b50a3042b118d7c0c6c87ae265e29de0 SHA512 acf13378e8913e6425a5cc66149285710c8e8e9aec020fa8cb3791ac11e523d897a257f794ad3f71c19db88fad2d67b3ae3040dbcdbc0e25fbf29ae09fc3c575
+EBUILD gucharmap-14.0.3.ebuild 1708 BLAKE2B 31654745e590266a69f0e716e884e65eafe3e211a111f4df42092f463d762a16780824710c7bfb40ce2cd85ea83dc7cfc8b81a462596fe9d9a19992d5c71a605 SHA512 af36e8e7e29d0c05db8ed6c6cd36645da80ffb7342e70c15c0f61060cd91ca6583dea5034ae3f2c01102f86f96346c6d4c6c21e826d2a754d5e069b5a847f9c4
 EBUILD gucharmap-3.0.1-r200.ebuild 1477 BLAKE2B 4ffe6feb86be5711b4850d4c1233bd79e2cb9cbca765977ac15b7a335c3b3f80beffe2119835a73024d38a22e4623037755c8672f77edb6016b818047b8c2256 SHA512 b0313be9418955ebfde4547603d66c8121cb36b7cf390e23ee9b536ea9ff21b4760bb9d9e0d843bd49fcb63db28b173d8536a6d5a5b72de1eef76a87bed769dd
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/gnome-extra/gucharmap/gucharmap-14.0.2.ebuild b/gnome-extra/gucharmap/gucharmap-14.0.2.ebuild
deleted file mode 100644
index 19d4d299483f..000000000000
--- a/gnome-extra/gucharmap/gucharmap-14.0.2.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
-VALA_MIN_API_VERSION="0.26"
-
-inherit gnome2-utils meson python-any-r1 vala xdg
-
-DESCRIPTION="Unicode character map viewer and library"
-HOMEPAGE="https://wiki.gnome.org/Apps/Gucharmap"
-SRC_URI="https://gitlab.gnome.org/GNOME/${PN}/-/archive/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="2.90"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86"
-
-UNICODE_VERSION="14.0"
-
-IUSE="+introspection gtk-doc vala"
-REQUIRED_USE="vala? ( introspection )"
-
-RDEPEND="media-libs/freetype:2
-	>=dev-libs/glib-2.32:2
-	>=x11-libs/gtk+-3.22:3[introspection?]
-	>=dev-libs/libpcre2-10.21:=
-	=app-i18n/unicode-data-${UNICODE_VERSION}*
-	>=x11-libs/pango-1.42.4-r2[introspection?]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	${PYTHON_DEPS}
-	app-text/docbook-xml-dtd:4.1.2
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	gtk-doc? ( >=dev-util/gtk-doc-1 )
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-	vala? ( $(vala_depend) )
-"
-
-PATCHES=(
-	"${FILESDIR}"/14.0.1-install-user-help.patch
-	"${FILESDIR}"/14.0.1-fix-file-conflicts.patch
-)
-
-src_prepare() {
-	use vala && vala_src_prepare
-	xdg_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dcharmap=true
-		-Ddbg=false # in 14.0.1 all this does is pass -ggdb3
-		$(meson_use gtk-doc docs)
-		$(meson_use introspection gir)
-		-Dgtk3=true
-		-Ducd_path="${EPREFIX}/usr/share/unicode-data"
-		$(meson_use vala vapi)
-	)
-
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/gucharmap/gucharmap-14.0.3.ebuild b/gnome-extra/gucharmap/gucharmap-14.0.3.ebuild
index e8739e727c8c..a0b9f394281e 100644
--- a/gnome-extra/gucharmap/gucharmap-14.0.3.ebuild
+++ b/gnome-extra/gucharmap/gucharmap-14.0.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://gitlab.gnome.org/GNOME/${PN}/-/archive/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="2.90"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv sparc x86"
 
 UNICODE_VERSION="14.0"
 
diff --git a/gnome-extra/libgsf/Manifest b/gnome-extra/libgsf/Manifest
index 2d4399432d6a..b72a0c9f53b4 100644
--- a/gnome-extra/libgsf/Manifest
+++ b/gnome-extra/libgsf/Manifest
@@ -1,5 +1,4 @@
-DIST libgsf-1.14.48.tar.xz 701760 BLAKE2B 762fe424ad45ac9739e1ea2cd9971f80f9c4d573147c6043c6bbf7b416a6c69c3b0bbfa42f6424176a545f7f9e7257d33e62c92482945786bb142063390a9d08 SHA512 6efba54c1427f9bdf71203b265ee4cdaa7366f78f299d38deffb657198244fb6436ab4e077a010079a28832539cdef08796e43feb76450ab0420da56016cd95e
+AUX 1.14.49-skip-valgrind-tests.patch 716 BLAKE2B 2a65162dc1448f673afd30153d3d7d8c99391a85ae3fa77d73833c6064576eb290b19388d5fd4698c4246af90684ceaad57c2225d8bb12775e72c05e82fc04bb SHA512 30fd7729989e741ae8c1391ca88882ceffdaef7c3c9bc4d71e93225c5c7ddb213356732c7545c2ba8710c7a9b3d9f9fc6972a5697bacf65f20d0018255a5b969
 DIST libgsf-1.14.49.tar.xz 702644 BLAKE2B 05ee17200d5170380138a7996dd37d5473eb9fe9a13cfb06b68e17470525d9640a4921d111e83963f245ecf6b669116322d9358d9a0b473c8149c56ff9c983ba SHA512 a847a3c7fe26865e110bb87cb7ed74c477fdaf41fdec1c97cd3ea85ab3ba2f618e609a38fb4087a2c9b58d8d4b430c2148c93cbbb8425af41b6c751efef3298e
-EBUILD libgsf-1.14.48.ebuild 1053 BLAKE2B f64d22b99dcf1c4336622707fc389af1c8bc50e286d41505616160c7f8515f4440d0c455bc26ac5a966c1daedfca19e10ac25aa11565c64ae4e90d472b491a5c SHA512 1f26d57a919ffce788887545d808ff4b97b4ba1500443f2e0da58e7ff27d01bca4d5b4c8bfd3c3056f35c5fcb355bd9f703be7a1c2ff25203676634a8a2c37ab
-EBUILD libgsf-1.14.49.ebuild 1060 BLAKE2B bb010264cc68175f996797380d9be59a992dae3624b3936e9127f9bcb4920f240297571d249ef961424ff72992a2b768cbc4e7ec4efbb02801d91d9b4b079e20 SHA512 c25c5dedfe9ebad23220a01376de6221b0b322af48405549bd0e35c356d331982f473f45e8eab26671e77b3c76c3437839d50de7dd904571b9f39b8ac54039bc
+EBUILD libgsf-1.14.49.ebuild 1115 BLAKE2B 500861727a9918e74731406ea8e08dc4d693144a91fe70763cd3649afb627e10228550861ca59576f4a44a99b630ec77313198689e992428f3e78f9570eb34dd SHA512 41f2e5c6410d835f6327a7925246d57970fce12af0831f3c839930fc26c93cf6bfb8c25fd200d23d6ada9867bad950ad16c9fdbffa52acd3892bc978e3fb1d0c
 MISC metadata.xml 321 BLAKE2B 0d1e16740ce0beddcea428308ea06e6a4201a312764ae81ce6cb8e2770319416ea0ab98ac536d85b38ce548a0bf9e2e03319b7aad0b672d1ee3b8f22d932af33 SHA512 64fa3ad72c8d27f271fcef49f9657fd2988f73eb2136c1ef84813b459dfe5bc0a40566efd9c8f0684f0da8c8eb56fcd78586f5947e02664f7663a8d8fc2a1148
diff --git a/gnome-extra/libgsf/files/1.14.49-skip-valgrind-tests.patch b/gnome-extra/libgsf/files/1.14.49-skip-valgrind-tests.patch
new file mode 100644
index 000000000000..81993e34ebd7
--- /dev/null
+++ b/gnome-extra/libgsf/files/1.14.49-skip-valgrind-tests.patch
@@ -0,0 +1,27 @@
+diff --git a/tests/t8000-valgrind-zip.pl b/tests/t8000-valgrind-zip.pl
+index ad7597c..8c96b85 100755
+--- a/tests/t8000-valgrind-zip.pl
++++ b/tests/t8000-valgrind-zip.pl
+@@ -5,6 +5,8 @@ use strict;
+ use lib ($0 =~ m|^(.*/)| ? $1 : ".");
+ use LibGsfTest;
+ 
++exit 77; # Skip test, bug #840353
++
+ my $archive = "test.zip";
+ &LibGsfTest::junkfile ($archive);
+ 
+diff --git a/tests/t8020-valgrind-ole.pl b/tests/t8020-valgrind-ole.pl
+index d6df5d7..b8200e9 100755
+--- a/tests/t8020-valgrind-ole.pl
++++ b/tests/t8020-valgrind-ole.pl
+@@ -5,6 +5,8 @@ use strict;
+ use lib ($0 =~ m|^(.*/)| ? $1 : ".");
+ use LibGsfTest;
+ 
++exit 77; # Skip test, bug #840353
++
+ my $archive = "test.ole";
+ &LibGsfTest::junkfile ($archive);
+ 
+-- 
diff --git a/gnome-extra/libgsf/libgsf-1.14.48.ebuild b/gnome-extra/libgsf/libgsf-1.14.48.ebuild
deleted file mode 100644
index bbb8eb7238de..000000000000
--- a/gnome-extra/libgsf/libgsf-1.14.48.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit gnome2
-
-DESCRIPTION="The GNOME Structured File Library"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/libgsf"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0/114" # libgsf-1.so version
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="bzip2 gtk +introspection test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/glib-2.36:2
-	>=dev-libs/libxml2-2.4.16:2
-	sys-libs/zlib
-	bzip2? ( app-arch/bzip2 )
-	gtk? (
-		x11-libs/gdk-pixbuf:2
-		virtual/imagemagick-tools
-		)
-	introspection? ( >=dev-libs/gobject-introspection-1:= )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.12
-	dev-libs/gobject-introspection-common
-	>=sys-devel/gettext-0.19.6
-	virtual/pkgconfig
-	test? ( dev-perl/XML-Parser )
-"
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		$(use_with bzip2 bz2) \
-		$(use_enable introspection) \
-		$(use_with gtk gdk-pixbuf)
-}
diff --git a/gnome-extra/libgsf/libgsf-1.14.49.ebuild b/gnome-extra/libgsf/libgsf-1.14.49.ebuild
index 795fb272712c..8d6907d2c266 100644
--- a/gnome-extra/libgsf/libgsf-1.14.49.ebuild
+++ b/gnome-extra/libgsf/libgsf-1.14.49.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/libgsf"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0/114" # libgsf-1.so version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 gtk +introspection test"
 RESTRICT="!test? ( test )"
 
@@ -32,6 +32,10 @@ DEPEND="${RDEPEND}
 	test? ( dev-perl/XML-Parser )
 "
 
+PATCHES=(
+	"${FILESDIR}"/1.14.49-skip-valgrind-tests.patch
+)
+
 src_configure() {
 	gnome2_src_configure \
 		--disable-static \
diff --git a/gnome-extra/nautilus-sendto/Manifest b/gnome-extra/nautilus-sendto/Manifest
index bc0fbb18e9f5..b770c5b2499c 100644
--- a/gnome-extra/nautilus-sendto/Manifest
+++ b/gnome-extra/nautilus-sendto/Manifest
@@ -1,4 +1,4 @@
 AUX fix-build-with-meson-0.61.patch 372 BLAKE2B d7f593ecd289aebf196968d798fc77c42532de43516a472a5008f722abfea26fe7f61794cc34cf26d738ead9995726c6d4e634f12cd288a7fbd3f77ff431e35a SHA512 c3b3d214f475646c8b8529fffca9852ba2dda3adc647ea729fd01ed6fe0f123c846ddf01a93f54443071cccb61233c5b66d3822ba506cf23ae3d551136a99ca2
 DIST nautilus-sendto-3.8.6.tar.xz 109428 BLAKE2B bc1f0798962d09ca05a64a0db7b98b697c68c7f63239eaf59278ebab7039061cb5b04b0235209db89bf537219039bcc8fff49c9dba2379fcbff32a7f9482dda3 SHA512 c690acdd6d53bde2fc2898362d1030b04312b857924e18735bb330621c64ab63656612a36b646fd34b586af5c34a93bd37c3f969c93bd87c4efe870f55934b92
-EBUILD nautilus-sendto-3.8.6.ebuild 742 BLAKE2B d7ee618d0c5b9eb6811c45cd92924ab5dbdb5259221890e949fd803a8d5065fd84230e65be966b7950a4e9725329356bc2345de7d28e5ca24aa44f0ec366dbd9 SHA512 404506157fb892ff7a01967607a3cc47e93d4176e364c19b50faae0766abda1873f661700a79e970447e324045646920aa4105468a0c2f71f5c57ef3f8a04982
+EBUILD nautilus-sendto-3.8.6-r1.ebuild 743 BLAKE2B b3b3b5d23f2dd4662612abe4d97b424e90ef4a57a3d7f6af9da45830f3998ec37f5f3bc351ad4d67d256e426fd89294001ae483fa37102117839bf406e3e3ce6 SHA512 fe889ff436249fbd597a48befcf5c9c0f92b5ee1745e20b5f6174d0d3a07007b264ffb5e01773211f376dc4cd58658874917e59cfc0293e0a71e1d69dab7fa7f
 MISC metadata.xml 254 BLAKE2B de7a97001e5947704f42973c8a0c3a23c2d80afb976254f5fd21e9d372a946e055d4cdc3c0eaed010505f87929b56e8b1e650c945e2a302644adbc9440833be8 SHA512 c81da4f9b80e5691a167f4590906952e25356604ec17689c005be14efb394c0634776bbe84df936edde239480bdf46db41216b00da4a3a45f670e9ca18ab0132
diff --git a/gnome-extra/nautilus-sendto/nautilus-sendto-3.8.6.ebuild b/gnome-extra/nautilus-sendto/nautilus-sendto-3.8.6-r1.ebuild
index 988f463cb538..71755aeddda9 100644
--- a/gnome-extra/nautilus-sendto/nautilus-sendto-3.8.6.ebuild
+++ b/gnome-extra/nautilus-sendto/nautilus-sendto-3.8.6-r1.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
+
 inherit gnome.org meson
 
 DESCRIPTION="A nautilus extension for sending files to locations"
@@ -13,15 +14,13 @@ KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
 IUSE="debug"
 
 RDEPEND=">=dev-libs/glib-2.25.9:2"
-DEPEND="${RDEPEND}
-	>=sys-devel/gettext-0.19.8
+DEPEND="${RDEPEND}"
+BDEPEND="
 	dev-libs/appstream-glib
-	virtual/pkgconfig
-"
+	sys-devel/gettext
+	virtual/pkgconfig"
 
-PATCHES=(
-	"${FILESDIR}"/fix-build-with-meson-0.61.patch
-)
+PATCHES=( "${FILESDIR}"/fix-build-with-meson-0.61.patch )
 
 pkg_postinst() {
 	if ! has_version "gnome-base/nautilus[sendto]"; then
diff --git a/gnome-extra/nemo/Manifest b/gnome-extra/nemo/Manifest
index 94d91b2d6086..6bc3721b7812 100644
--- a/gnome-extra/nemo/Manifest
+++ b/gnome-extra/nemo/Manifest
@@ -1,4 +1,4 @@
 AUX nemo-5.0.3-use-detex.patch 252 BLAKE2B 24c27845065f64a58411a8d719fbc1ca41362001f08d469bc336f55601e49358c02ba3aba423c521a261955a5da9832d8ae2df49f3d372270e63256a45fafcda SHA512 142bd88c7843fa40fb30cab01f8f7dd23b2b5c338eae2ac5971c7e392f9f24a8a820ef4b17b1c4afea729cc85a66cb7ddb06ecd417ff6ad494118fe8d88f1498
 DIST nemo-5.2.4.tar.gz 1492077 BLAKE2B dc6efb24921d5408938ff5b8660653789a77d6607e2e023d73eb5722a0a8bc75cd22d1241f5e852d0429d05f6ec4fd1abb798b8be1ecf513eeed108a256e506c SHA512 0aa3f7e0c2bdb9d7f1874c17caea0e4a3da062fc243de1f1657bdb83090a1afb099baa404f211092f83cf6852c423b244482faf0ad6beaaddc072cbce17cc6d4
-EBUILD nemo-5.2.4.ebuild 3024 BLAKE2B 086e143d707ed41ea9afbca21f5cab49fd13ed6d15b2f39e064eba09ba11b7dd5b0d296eec4ccac675160843e4abe25a340dd142454dd0f2a6649d5d298a9724 SHA512 42987451c463a61968f2bb7c5b23350a1e01229ad05f92146269b08197e16cd6eab39cdfd12a7086a58dce8cb01bc4d84b9b6752d3a3bf337d1f09ffd4b1d89d
-MISC metadata.xml 580 BLAKE2B da0ac9cd13730b5c1727a6d0431f3289af829b77781baf4d3512c78139bca7b9a7d136563de8e2f5abf914520de8a5a092b1e0f2505558e5e61813fa5f9c09ad SHA512 d38cebfe673764a4a96d66a66afe55f6f04c74bf1d06d8fddc319a2eb9ed351b205e3a48c47bfeff7f3da85c89ad0512e11a420f82c228a548fc7553147b927e
+EBUILD nemo-5.2.4-r1.ebuild 3092 BLAKE2B 9fc127a7e29861d024a5e603edfcda617b70d8250e9f54aeb68378fe96df031f0403b2f2604abe4619b575c76ece3489876541262ea69136724d6375b9616715 SHA512 82d6a328788dddb575f704e6f2a2c87204e74b03ca1a57ac289efc5f972db4b356aee31bd7b1e90ed56a5d91206cbc24719037723bf12787b2f8a956ace1267b
+MISC metadata.xml 484 BLAKE2B a017ca92892fd2c8c6ece97319fc7d25d96a8c154cfe59a8e39c7a41c8a1ba031f52dce6279389fc0d74cc14a805fa1b6e65f724612b818ff0e6fb1a5267a648 SHA512 63617f4151eef2570461a9799b7d48dbd148b3a4a14fa120066da651883fb791056f269f86cf59ae7cd82c92b1428cb7a583e5cfc5b4329129b2f4b552d78686
diff --git a/gnome-extra/nemo/metadata.xml b/gnome-extra/nemo/metadata.xml
index c675b141f70a..a7f8d807b96f 100644
--- a/gnome-extra/nemo/metadata.xml
+++ b/gnome-extra/nemo/metadata.xml
@@ -12,7 +12,4 @@
 	<upstream>
 		<remote-id type="github">linuxmint/nemo</remote-id>
 	</upstream>
-	<use>
-		<flag name="tracker">Add support for <pkg>app-misc/tracker</pkg> search</flag>
-	</use>
 </pkgmetadata>
diff --git a/gnome-extra/nemo/nemo-5.2.4.ebuild b/gnome-extra/nemo/nemo-5.2.4-r1.ebuild
index 07647e1254fb..218cfe997317 100644
--- a/gnome-extra/nemo/nemo-5.2.4.ebuild
+++ b/gnome-extra/nemo/nemo-5.2.4-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/linuxmint/nemo/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-2+ LGPL-2+ FDL-1.1"
 SLOT="0"
 KEYWORDS="amd64 ~arm64 ~riscv x86"
-IUSE="exif gtk-doc +nls selinux test tracker xmp"
+IUSE="exif gtk-doc +nls selinux test xmp"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 # https://github.com/linuxmint/nemo/issues/2501
@@ -22,21 +22,23 @@ RESTRICT="test"
 
 COMMON_DEPEND="
 	${PYTHON_DEPS}
+	dev-libs/atk
 	>=dev-libs/glib-2.45.7:2[dbus]
 	>=dev-libs/gobject-introspection-0.9.12:=
 	>=dev-libs/libxml2-2.7.8:2
 	gnome-base/dconf:0=
 	>=gnome-extra/cinnamon-desktop-5.2:0=
-	gnome-extra/libgsf
+	gnome-extra/libgsf:=
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
 	>=x11-libs/gtk+-3.10.0:3[introspection]
-	>=x11-libs/libnotify-0.7:=
+	>=x11-libs/libnotify-0.7
 	x11-libs/libX11
 	>=x11-libs/pango-1.40.0
 	>=x11-libs/xapp-2.2.8
 
 	exif? ( >=media-libs/libexif-0.6.20:= )
 	selinux? ( sys-libs/libselinux )
-	tracker? ( >=app-misc/tracker-2.0:0= )
 	xmp? ( >=media-libs/exempi-2.2.0:= )
 "
 RDEPEND="
@@ -97,12 +99,14 @@ src_prepare() {
 }
 
 src_configure() {
+	# tracker: only supports unmaintained tracker-2, not >=tracker-3.
 	local emesonargs=(
 		$(meson_use exif)
-		$(meson_use tracker)
 		$(meson_use xmp)
 		$(meson_use selinux)
 		$(meson_use gtk-doc gtk_doc)
+
+		-Dtracker=false
 	)
 	meson_src_configure
 }
diff --git a/gnome-extra/nm-applet/Manifest b/gnome-extra/nm-applet/Manifest
index 2b630cca1c35..74f8e72e366b 100644
--- a/gnome-extra/nm-applet/Manifest
+++ b/gnome-extra/nm-applet/Manifest
@@ -1,6 +1,5 @@
-AUX meson-0.61.patch 998 BLAKE2B e97d3460c28892df096d50a815826560eba89f050e36166c39e816e6a65d855635ea881edf07fd393ce1cbd0100c3fb2579982a00a71b089fbf765fe266c8879 SHA512 7103e31effe841f4d8af0d002c586f06ea199c024b0757a84617ce42a4aaff6b59350cd8cd90f3d4bfacb53333f2a806dab04c7ad40b3be568687df2afa40814
-DIST network-manager-applet-1.24.0.tar.xz 1903280 BLAKE2B a969ab18e2d2d85d378d9964e635281cfcd4bc46e0542ec94e187cbe7e740c5fad8e10b3d7d3ae3b85352ba5368787650f933b89740d05ee06d78057e1c31712 SHA512 7b91bd54d53b1b485bc5e401f83c683804175900557a7a4bc40a3f759fa9d4ca1c42b193bcd56a39a8cb79ec5b0c6f7cbeccfc08200099c08d933650c92faecb
 DIST network-manager-applet-1.26.0.tar.xz 1971896 BLAKE2B ab87b0e5f8b1c293ac3f2e36c8f834e645fb647e46ce1bf22ac94ed33e6f2f7f8aca5ed43ed46029a281545595978c145773102f06de9b42e579efb8d3e631c3 SHA512 ae3c4f8e55a2cd13093161e1e28873d3cda1c531168ee18115f3f710816f1bdfcf669cd2f796bd38f226d3f6be76407fccbcb19cf9c994b99969b688397b2c71
-EBUILD nm-applet-1.24.0.ebuild 1268 BLAKE2B 54412fc36e950cab4cf3eed2640164a9386260ffbf47143eef1cd0e115de11e304212307b6d8633d9579bc9d4e1f481e3a678ab00f74afe0a590b7d223b9129a SHA512 72be709f6ee2709d855982a00dcc26bb2b26a766ae98f498a9bdccc6f91104a0d1ff1d471ada91fbf65f43546782d16e7ffbaef3b514cbc216e96652fa2b457c
-EBUILD nm-applet-1.26.0.ebuild 1228 BLAKE2B 2e926b722629952460cd4175207fe0191062decb0d0fc00c1dc244e13504133943e83b2d6c47e49eb2c1dae24dda923240400e5ab7311c5e8b2e3cedfc57574e SHA512 eb999bc7e4935046eed8581931954f59595b7ef80b4162fe91ca8b24c43d897a27ad281f8f0afcd82c67b224d1e01a987f7e96070013d09aa9b863e5ab5d0f53
+DIST network-manager-applet-1.28.0.tar.xz 1894104 BLAKE2B f8263b49b215cf3dbe43a5247a3b04ca77288fe6e7098c08af2346d9cdf7c5102ee1d1e611ce03b322e22dc3a34991aeb45d6544b27e38f113da72674d3b9341 SHA512 1e594c6a8ecfd7c92e718238f036f95c0706a70699b9836ba4ca3b6b033db1b36a08ef4778e6615cfd0cfcaec120063a67c642734c45d71aee86b17a5de4b647
+EBUILD nm-applet-1.26.0.ebuild 1216 BLAKE2B e7594ee60992d4b46bd465a365bf7cc6fdf85ef37a64dd7272f8693bb9cbbbf77d498c6a8daf7dd87f4499a5b333d5633d61e38abd771de546650c549c310908 SHA512 7fb311f77c19edc936dff7bdaa06a5acedfaf4b70cf2c682dc1d906aac80768f65697b568c95b2e960aa1f26e37fa4f5423986a0c3a47d21f6638586f7b30f0f
+EBUILD nm-applet-1.28.0.ebuild 1221 BLAKE2B d1e9f9ce149baf9ee30f2274e16ff0fe1ca78967a9f1b7877f2d282f23a1a1379788a499dc6ff554dd41d354d39fe444b657df8c8fa2df76a21f73102f47b1c8 SHA512 788421a867506e20ed6f3a18e5cde3a805a68aff5d81df05d2768deff4352bd34c948a383fbb817f461bd8e6e5c71180eebdc7096e701ad26d4874f063a1cbb6
 MISC metadata.xml 452 BLAKE2B b17e0338356cd0b24f3de4e1e4d8c13ab7b551707f0309c7a233c28b92cf7b27ef66b36f58717228a11cb76dba2892f23455f50f9dcc6fe7905f312b848f1695 SHA512 2e4fd5feb6f4b6fb8a503b26ac5ef1c388ea699a873ff70ec5144b796b2ff75b7e572a5de5efab60a7844a9bc2d639f6296db97260a0c38f9b37d46c33543d40
diff --git a/gnome-extra/nm-applet/files/meson-0.61.patch b/gnome-extra/nm-applet/files/meson-0.61.patch
deleted file mode 100644
index e2366c0f64e1..000000000000
--- a/gnome-extra/nm-applet/files/meson-0.61.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-https://bugs.gentoo.org/831829
-https://gitlab.gnome.org/GNOME/network-manager-applet/-/merge_requests/107
-
-From b92fa5ba6d65aaa9e2d1494beaf340a33d9ba07f Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex@linutronix.de>
-Date: Fri, 21 Jan 2022 22:34:09 +0100
-Subject: [PATCH] meson.build: address meson 0.61 failures
-
-Signed-off-by: Alexander Kanavin <alex@linutronix.de>
----
- meson.build | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index 33adb632..6178c0eb 100644
---- a/meson.build
-+++ b/meson.build
-@@ -254,7 +254,6 @@ desktop_file_validate = find_program('desktop-file-validate', required: false)
- 
- foreach desktop: desktop_files
-   i18n.merge_file(
--    desktop + '-desktop',
-     input: desktop + '.desktop.in',
-     output: desktop + '.desktop',
-     install: true,
-@@ -275,7 +274,6 @@ endforeach
- appdata = 'nm-connection-editor.appdata.xml'
- 
- i18n.merge_file(
--  'desktop',
-   input: appdata + '.in',
-   output: appdata,
-   install: true,
--- 
-GitLab
-
diff --git a/gnome-extra/nm-applet/nm-applet-1.26.0.ebuild b/gnome-extra/nm-applet/nm-applet-1.26.0.ebuild
index e49a7e278547..c89abc74e789 100644
--- a/gnome-extra/nm-applet/nm-applet-1.26.0.ebuild
+++ b/gnome-extra/nm-applet/nm-applet-1.26.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE="appindicator modemmanager selinux teamd"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.38:2
diff --git a/gnome-extra/nm-applet/nm-applet-1.24.0.ebuild b/gnome-extra/nm-applet/nm-applet-1.28.0.ebuild
index 6498d20d7f96..52c9d5df3847 100644
--- a/gnome-extra/nm-applet/nm-applet-1.24.0.ebuild
+++ b/gnome-extra/nm-applet/nm-applet-1.28.0.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 GNOME_ORG_MODULE="network-manager-applet"
 
 inherit gnome.org meson xdg
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE="appindicator modemmanager selinux teamd"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.38:2
@@ -39,10 +39,6 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
-PATCHES=(
-	"${FILESDIR}/meson-0.61.patch"
-)
-
 src_configure() {
 	local emesonargs=(
 		-Dappindicator=$(usex appindicator ubuntu no)
diff --git a/gnome-extra/pch-session/Manifest b/gnome-extra/pch-session/Manifest
index eec4ae28189b..7dc85ec792ec 100644
--- a/gnome-extra/pch-session/Manifest
+++ b/gnome-extra/pch-session/Manifest
@@ -3,5 +3,5 @@ DIST pch-session-41.2.tar.bz2 3610591 BLAKE2B 0a3dc1a60ed29bb59cd30756039c4d9912
 DIST pch-session-42.0.tar.bz2 3610664 BLAKE2B c14529dd7be8854e4d24b4b4c3335c44ebd714b4dcd8ada8bf6e8da6236d962c57fb537b4a651118e8f719b7da87141a8c1512bf6a360c7998f23384ed06b14c SHA512 63a73a753cc95dc8e152a4d535674d420861e87a57a9c47b1063b9bdad410ad4c93e2ed2a5e547fae75f9e76b0f640ffc8d0f3116195afbaa18e6a2fdb9c5ae7
 EBUILD pch-session-40.2.ebuild 1238 BLAKE2B 4aafe0c2a9284939b83b167f9f4e564fdc708af7c2f2a191986f85ffd77e9798e7ef620556e96769f01d9830f9839f06b44e97fcec0fa527b0b23f0ca60ff9e9 SHA512 219b7d308693da99310c9ff10d06009c1e6b52b1bab9ba40c225df30782191a8ce0aa22b286a11876ed64b9d91fa6c52e80ce515854ee358a66e0b50ae7d21e2
 EBUILD pch-session-41.2.ebuild 1433 BLAKE2B 872ce0c6153768fc2dd317740c9b0f128f48df4b51c81874dacd5857097d6507c8d62a495dc2c6cbfb8b707841be2dc7e7b721c3fc24222e5f86667cbcf48744 SHA512 25ddd36d35cc7f5b819deed592fac5efeb6706683bb36fb81ca7868bb56e5508ce1bfc2f9b9971c22e56c09188427e5d12881ddf8aa121740f67d155ae696627
-EBUILD pch-session-42.0.ebuild 1727 BLAKE2B 14efd1fab235a8df8d4bd8205da21556f2bd2345cf3b7bf7a94337b08b385fe787422bf98028739c92dc61ff2ba7b17c434249c1ad6d2b0bbb442770460baa1b SHA512 9832c5b1abf92191e50763a0b69cc57ceca2139bafe6de3e510015800b7778a82b0591d8be9e063275ac2da28ac76af1a811c33225def8286f71926172fcbe75
+EBUILD pch-session-42.0.ebuild 1725 BLAKE2B 768146feb544efe7b7b02d5e007a7fb5f5915029d88905c4b8aab24cf70f6bd60c6b5dbec97bcce33ea7563f7f7d74852b41a3c8583508ee51e703cca2d52519 SHA512 61c663f9e2e8889c8fd2e6bc0bde00193fb43f20cd43f68714f213cd3bd6c6abfe2b87b2bd646c6483e43562cd51846ea993f2a5dbc3d4f77e26c8f6970c0492
 MISC metadata.xml 241 BLAKE2B cb0374238d11e2a3f28f23b7049da09babd4310a99862738acfb7ba554f7758ac68cd09d1eb7a29068195c27010a846a540ed2c09b88fd043b37fb4f0762150f SHA512 b2c1d3e2cb6760ed4682da82af5370adcacd48afd558efa1abf84d955067b2ad32eda034af8cef95c71409622f97fa0113f2e07bee328f2d03512908ae931050
diff --git a/gnome-extra/pch-session/pch-session-42.0.ebuild b/gnome-extra/pch-session/pch-session-42.0.ebuild
index 111755a3ad87..029b1ff13167 100644
--- a/gnome-extra/pch-session/pch-session-42.0.ebuild
+++ b/gnome-extra/pch-session/pch-session-42.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://gitlab.com/pachoramos/${PN}/-/archive/${PV}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="bluetooth qt5 webp"
 
 RDEPEND="
diff --git a/gnome-extra/polkit-gnome/Manifest b/gnome-extra/polkit-gnome/Manifest
index 953410cfba00..00d8d71f638f 100644
--- a/gnome-extra/polkit-gnome/Manifest
+++ b/gnome-extra/polkit-gnome/Manifest
@@ -1,3 +1,3 @@
 DIST polkit-gnome-0.105.tar.xz 310876 BLAKE2B c4b44d8d667ecf043516468fea061c668c94f670aeb0649ecfe1cecdd466d46156b6fffbf642020bd575f4e40f84e6155d3752ebfef57ef0491019616a4f0c21 SHA512 eae2504959bca6f2b53dbad1b743fc0414b82897e62623af80ee74c4080a10d6b07a4c90151ee1264891f27373321b8697ac8a747cba5254c765b4cd9161bd42
-EBUILD polkit-gnome-0.105-r2.ebuild 1066 BLAKE2B 40f20bd3a645f2e69b7fad5ec8fcd713c37ea47e0d8a66a304b350759e4e0b9cef45cdc25fa6b2effec2ba3c3e45c8eca8646783ec8d8bea1db24a3fdbcc6374 SHA512 15212f1e5491ea080a73972215131daac3f3199dc9c489cac1e52ae7d9827cb6f1fcad159daab3d88a773a6d9743143361b275ccbae1e0fb8686b474f0a6bc91
+EBUILD polkit-gnome-0.105-r2.ebuild 1073 BLAKE2B 2756439ebef9a9533e81f73f69bad2e89280ab721e595a5679b7e0bddd7b05943a37af0eb827f1e9a55e82aa477f642657cf3590c383c124734e9d59fe5b2924 SHA512 bed6bbfac01fa028ada4ecab282f3a2da3517be7ba347ecbbd94af6ad12050d31197a73fb3628f2a0e636ec9dd34835b3fda659fdf9d2657b04bda25344de5d4
 MISC metadata.xml 267 BLAKE2B ef54b6ba9665188ba4761836dbc7fa03e202ebee4a80e5d83ab96dc55be82dec71bd830a909cb254f3169be9dd26f0359bd7ed46d7d75974d62a6f0669b70187 SHA512 38c06607eccc2d3e3df74e1b5eca49eb1396a1f9460cf13a6f1c0519c26c413e461b58a526e137b9d163c40f76a391eab5178956b01964ba46938d72ab0176bf
diff --git a/gnome-extra/polkit-gnome/polkit-gnome-0.105-r2.ebuild b/gnome-extra/polkit-gnome/polkit-gnome-0.105-r2.ebuild
index 020b3c4822e4..ba1296ebd096 100644
--- a/gnome-extra/polkit-gnome/polkit-gnome-0.105-r2.ebuild
+++ b/gnome-extra/polkit-gnome/polkit-gnome-0.105-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.freedesktop.org/polkit/polkit/"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86"
 IUSE=""
 
 DEPEND=">=dev-libs/glib-2.30
diff --git a/gnome-extra/sushi/Manifest b/gnome-extra/sushi/Manifest
index 177fe1d0d79d..626a3fa5b40d 100644
--- a/gnome-extra/sushi/Manifest
+++ b/gnome-extra/sushi/Manifest
@@ -1,7 +1,3 @@
-DIST sushi-41.0.tar.xz 80940 BLAKE2B 211fb0c96ac0a911809007ed2e79659cc90a32be23d61137d85cc4502beb995d2131f62bbbb9a66f8da9328a4bf7d83b0c05f93e8913c8390be5cf22baaaeb00 SHA512 690018b846b23b3b21db244ae6e1f373870cc8cdb374dee2f4ba7eebf65af5d33a3366d37476b5f4556daf196c3f9cf8bf44903193831340f23ad33eef3ed484
-DIST sushi-41.1.tar.xz 81228 BLAKE2B 8bff3ed2b70be8335139499fb982efc89163ab1ec95ff9053a117a72945d8733f0125ec4c64b7d175212a9d74f36212319e75f46e84b1eda90896a0ea4b26be7 SHA512 55fca36e73842943bb54a2e1ae005ffe0818763e787e1f987479b71527ce36970aa502c22053195fc3711b8cfcbb6892d3f1add674e425b9358d3682972026d5
 DIST sushi-41.2.tar.xz 81252 BLAKE2B 811b02e0738aa3aba22d71545e888ec0334779591a56d6a28f3942d5d79fb9fece2fdffe0203757ba0806352584a50228b669fc0969f7ad75265fc40a3a1cd67 SHA512 c47b22a013fe31de6943d8af0f333b8050a8f0ecb0e827ea71666cd0175d5cc99336eb7ad96b21ba7aaf87f23d01b4f37a1ca8c0fc644fa89aa8960699b61f43
-EBUILD sushi-41.0.ebuild 1303 BLAKE2B b3266138ec01f3ce8af3acdfedddcaa603e497e26c5d8a5e68b6113c588e5ba51eae51a4edccd925ae82caf2837f0d6eec00219e85a55634a0072ed6b7f1fc77 SHA512 e0472db272aef64e1434ec7897a26222e10cd2aa1f7d82d89600c11028452eca374bc934925f0e9c460823422389b9e9d8ff8221aed59539048f2000df977400
-EBUILD sushi-41.1.ebuild 1354 BLAKE2B fbf5e36f0fa4298a965d6d6458ab6753efa25a6b08d6efd5bff4932e6dfb3e9237723c9166c299855680b933b090fea281604a6e2873d01e9eba60dfa1566167 SHA512 cea5a9f2f8c79da7975e56570201b3ab302d1cc13852a71a5ca4461bd76389514dff977c609cf4270aea74e58d5dde4def857313990b3f72454412b329f5a3f9
-EBUILD sushi-41.2.ebuild 1354 BLAKE2B 3ddf0774aebbb1d71354b5c1e49a1d6dc88393715c0aa6f021e63e1e2095741aeb473e5da8dda744cdde3419bc78bb238106ae72c8560e2da157e7e4abeb9aaa SHA512 c5715e84990188dea90ee0df90a076c7431c0f46d2d6add4c87b6fcc56f5cf6d0b37ec245fb5b8d97eb7d05bab6a8913756db44d000e9c97196ac005d0d2689d
+EBUILD sushi-41.2.ebuild 1351 BLAKE2B 34a9d481054c67c915bf0315fc554b7e50134238140259656e5f1d7da04c1d0484de1cd2dbe74dba993c46ff71e9abb51a3b7b7c4a76a1c55513572c8f04081a SHA512 3324cd7ef6c1bad685354e6e1a4bc6a04fd99a007f9b842e626bf9b400954b6cff5298ba14d73967b9aefca3eed73bb9b6e2f5c75856ada4408c96cab405442b
 MISC metadata.xml 385 BLAKE2B 8b38e81530f0280af7c0d773ae60a0cf4144d3a7d876b30574da186bafb023da5da9abd75471543d528f0e6aa9664ba787aeb45bc46dab64077f3a1a0c8bc932 SHA512 d5d35182551e497f3ac5a89734387a1a6e03848ce02f017c6982d5261edbdc72ee342ec7ccc9304f08918f3bc81548bbc26039d7c88a397a627c4a37215808e0
diff --git a/gnome-extra/sushi/sushi-41.0.ebuild b/gnome-extra/sushi/sushi-41.0.ebuild
deleted file mode 100644
index 2e36edd3cbbe..000000000000
--- a/gnome-extra/sushi/sushi-41.0.ebuild
+++ /dev/null
@@ -1,51 +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="A quick previewer for Nautilus, the GNOME file manager"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/sushi"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv ~sparc x86"
-IUSE="office wayland +X"
-REQUIRED_USE="|| ( wayland X )"
-
-# Optional app-office/libreoffice support (OOo to pdf and then preview)
-DEPEND="
-	media-libs/libepoxy
-	>=app-text/evince-3.0[introspection]
-	media-libs/freetype:2
-	>=x11-libs/gdk-pixbuf-2.23.0[introspection]
-	>=dev-libs/glib-2.29.14:2
-	media-libs/gstreamer:1.0[introspection]
-	media-libs/gst-plugins-base:1.0[introspection]
-	>=x11-libs/gtk+-3.13.2:3[introspection,wayland?,X?]
-	>=x11-libs/gtksourceview-4.0.3:4[introspection]
-	>=media-libs/harfbuzz-0.9.9:=
-	>=dev-libs/gobject-introspection-1.54:=
-	>=net-libs/webkit-gtk-2.34:4[introspection]
-	>=dev-libs/gjs-1.40
-"
-RDEPEND="${DEPEND}
-	>=gnome-base/nautilus-3.1.90
-	office? ( app-office/libreoffice )
-"
-BDEPEND="
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-src_configure() {
-	meson_src_configure \
-		$(meson_feature wayland) \
-		$(meson_feature X X11)
-}
-
-src_compile() {
-	local -x GST_PLUGIN_SYSTEM_PATH_1_0=
-	meson_src_compile
-}
diff --git a/gnome-extra/sushi/sushi-41.1.ebuild b/gnome-extra/sushi/sushi-41.1.ebuild
deleted file mode 100644
index fbf71c2e59eb..000000000000
--- a/gnome-extra/sushi/sushi-41.1.ebuild
+++ /dev/null
@@ -1,52 +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="A quick previewer for Nautilus, the GNOME file manager"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/sushi"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~sparc ~x86"
-IUSE="office wayland +X"
-REQUIRED_USE="|| ( wayland X )"
-
-# Optional app-office/libreoffice support (OOo to pdf and then preview)
-DEPEND="
-	media-libs/libepoxy
-	>=app-text/evince-3.0[introspection]
-	media-libs/freetype:2
-	>=x11-libs/gdk-pixbuf-2.23.0[introspection]
-	>=dev-libs/glib-2.29.14:2
-	media-libs/gstreamer:1.0[introspection]
-	media-libs/gst-plugins-base:1.0[introspection]
-	>=x11-libs/gtk+-3.13.2:3[introspection,wayland?,X?]
-	>=x11-libs/gtksourceview-4.0.3:4[introspection]
-	>=media-libs/harfbuzz-0.9.9:=
-	>=dev-libs/gobject-introspection-1.54:=
-	>=net-libs/webkit-gtk-2.34:4[introspection]
-	>=dev-libs/gjs-1.40
-"
-RDEPEND="${DEPEND}
-	>=gnome-base/nautilus-3.1.90
-	media-plugins/gst-plugins-gtk:1.0[wayland?,X?]
-	office? ( app-office/libreoffice )
-"
-BDEPEND="
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-src_configure() {
-	meson_src_configure \
-		$(meson_feature wayland) \
-		$(meson_feature X X11)
-}
-
-src_compile() {
-	local -x GST_PLUGIN_SYSTEM_PATH_1_0=
-	meson_src_compile
-}
diff --git a/gnome-extra/sushi/sushi-41.2.ebuild b/gnome-extra/sushi/sushi-41.2.ebuild
index a9e7cb992539..45d17675ad3e 100644
--- a/gnome-extra/sushi/sushi-41.2.ebuild
+++ b/gnome-extra/sushi/sushi-41.2.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/sushi"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv ~sparc x86"
 IUSE="office wayland +X"
 REQUIRED_USE="|| ( wayland X )"
 
diff --git a/gnome-extra/yelp-xsl/Manifest b/gnome-extra/yelp-xsl/Manifest
index 29a352caf361..4fa7916518ab 100644
--- a/gnome-extra/yelp-xsl/Manifest
+++ b/gnome-extra/yelp-xsl/Manifest
@@ -1,5 +1,3 @@
-DIST yelp-xsl-41.1.tar.xz 661572 BLAKE2B d7a0ab809722d7159d587a0fa761f69c0c73c7336caabad85e685a79e541d87b9aec9cabc474376f55596f92dc0dbbb146fcbe885dbc0377641312549d8eb5a3 SHA512 1ffdf2feb5ca69824efdb86c3e290ebbe639c41f3cef7bd5af3550ddf1667e9e347ecc20d66cbd6f5860ae9245ba34d359d1fdaf53fa3944fd578d9ac5652a59
 DIST yelp-xsl-42.0.tar.xz 663824 BLAKE2B bf1ceae255a6166cda81be57e0cae14c25e4668d70e16bafb3aeaf0958b2393c4c6be8a4575b24fc7560fdddd60c3790b89890015d13f4124445f037549781de SHA512 70d86bedd00fd38ffefb82962b591b710aa6ba59f9a12c968d5c47afeed9f4afecfb5e1228fbaba3acab5d5673cb6511d3d51674f7602f5001835d9c134fedda
-EBUILD yelp-xsl-41.1.ebuild 570 BLAKE2B e80515499a859a01d6370ac836d833312ff18a3566ac2d1426e201cfe2850371ba72bc80e0e160fce156be7ef708c4d3e43e2ba835e0d056d5cc201a2cae536f SHA512 a6dcb834dc8dfac61b4a8de203139bb2de9163f6803abec1039386c96916a0e9414d09621cdeca4a18aeb8987278a8dce68ca735356b64cf5b9cbaac53d0a329
-EBUILD yelp-xsl-42.0.ebuild 577 BLAKE2B 85d66401b99001033e677d93b478fb3bd2d25b7a1a3c985f1fec4974225ed9c35be3870fcb2d7c483a328594d4dad65977955049fcc5e652d3f124ac95c44d7c SHA512 d4d0175bb715acaff11e24f357f01bb4443890628af854271bfc872405d30fa88cb6248b544f29ee093aea9c451752813eace3bb35208b4dc174cbd8e27e1acc
+EBUILD yelp-xsl-42.0.ebuild 577 BLAKE2B d0ada46e925a9cf0f7a0374c29d28cda3eebf779873dd77349b78a9f59b109e77d778aadcc255d351c6e62410712950280876b0dd76c686cb8f26c92c3cb1ce1 SHA512 81e51a501d561e3866dd7ed83736587bdece73bf5910aaefb692f46ea6abb941f1e50f9c6af5c9d024be85c491c02999b04615016a017fab00f449d5a8c2ed1d
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/gnome-extra/yelp-xsl/yelp-xsl-41.1.ebuild b/gnome-extra/yelp-xsl/yelp-xsl-41.1.ebuild
deleted file mode 100644
index f09ca253c8ab..000000000000
--- a/gnome-extra/yelp-xsl/yelp-xsl-41.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome2
-
-DESCRIPTION="XSL stylesheets for yelp"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/yelp-xsl"
-
-LICENSE="GPL-2+ LGPL-2.1+ MIT FDL-1.1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-DEPEND="
-	>=dev-libs/libxml2-2.6.12:=
-	>=dev-libs/libxslt-1.1.8:=
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	>=dev-util/itstool-1.2.0
-	>=sys-devel/gettext-0.19.8
-	virtual/awk
-	virtual/pkgconfig
-"
diff --git a/gnome-extra/yelp-xsl/yelp-xsl-42.0.ebuild b/gnome-extra/yelp-xsl/yelp-xsl-42.0.ebuild
index 382c6415e10f..b4e465c7bc46 100644
--- a/gnome-extra/yelp-xsl/yelp-xsl-42.0.ebuild
+++ b/gnome-extra/yelp-xsl/yelp-xsl-42.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/yelp-xsl"
 
 LICENSE="GPL-2+ LGPL-2.1+ MIT FDL-1.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 DEPEND="
 	>=dev-libs/libxml2-2.6.12:=
diff --git a/gnome-extra/yelp/Manifest b/gnome-extra/yelp/Manifest
index 0f20ba7e78ff..d5b6856150af 100644
--- a/gnome-extra/yelp/Manifest
+++ b/gnome-extra/yelp/Manifest
@@ -1,8 +1,4 @@
 AUX yelp-3.20.0-man-compatibility.patch 4229 BLAKE2B 1ebe101f4a0031ca46d6801e8dc19eb4225c0bd0d5789d379f3192fdc71afabf6a940156463bc60be414e4f607abcaa998f5e8ff81a74c107a5853490402f163 SHA512 427ee66fa1c156991254fd10511bead4fbed6b05a930da157cec61bd7fafcd83f0dd447ce8aa62d0dc76e2231cf5f34fbeccc8103de4ee9062b6d79955b9cc1d
-DIST yelp-41.2.tar.xz 1531228 BLAKE2B 310bb73b8b841ed72e40530fe7d94fa2b223003fea40530cddb774cff059ce47cb613693ff3e45d2e9fb6beb2130c30d8d0b760e61c749b5d7e02143d17c2efd SHA512 171020b258531d26d1ab6193222b1b31bbde0be7da87524911e38143a606f38b29f9d76cb600cffc71da63d81274f656c426e79101acfa64caaf29e1a44020bf
-DIST yelp-42.0.tar.xz 1512792 BLAKE2B f8a24849e9fd2d4fb5e10bb4449ddded77e2548313546308c69189fc07216e090f1a0a28090537477b20a039f8891374465ef3c585d2196febfc73e9e5dfae5c SHA512 3e2ce7436145d290eb67f39935f8351cafa316c1fc96e41fa316deb4e5f29582b1b224f308e4e22bf2590755286f8a927c5bc988633e14f7d10f0de2d62f962c
 DIST yelp-42.1.tar.xz 1512620 BLAKE2B a0ba02a560c19e516c42f77a34f3296dd6dd9d3dba9b34b2243a2c7689b7117cd82dea8e169ec7001ba15860c74f1c7ace061094516391b38f5054b566e613b2 SHA512 3c8150503e828c8d2994b7af6f7c673b696b01f4a82abcbbc0395909a0e0eb2d64a9e445a5b1683a0c9aa0abc7040cc563917e55b126879ce7c4dda117bbf3db
-EBUILD yelp-41.2.ebuild 1243 BLAKE2B 5dfc26d807817829f4d45186b71bc664b026a42f8ce09c55e6153174dfcad12b48c805df5e63d0b025352dde689de57fe64ba68c985b3c9d3c6993b127a8f521 SHA512 b7ac32f2d3f306c47b040827cc5117152355e7364cc62cd7f853b65093675208a451be976a43d9e4bf9425b64cf39464f98992ca518d1a22fe761e1662c7b641
-EBUILD yelp-42.0.ebuild 1275 BLAKE2B ab8665b75eb0c49e40371d06865da247b5b96efc249d257fc69fb4aef72cd690c511718aa3bd4205284b2d3d7b68410f6479945b97653d34e194cc3202468c46 SHA512 aaa1d9152331d24cbd10d3fb4ae686131d18837125ab9cfc0ddf59511eace5421aa978eadec16427d2d20199149fb6555480ac502e7d1cd2d89df9671b4ac3d3
-EBUILD yelp-42.1.ebuild 1275 BLAKE2B ab8665b75eb0c49e40371d06865da247b5b96efc249d257fc69fb4aef72cd690c511718aa3bd4205284b2d3d7b68410f6479945b97653d34e194cc3202468c46 SHA512 aaa1d9152331d24cbd10d3fb4ae686131d18837125ab9cfc0ddf59511eace5421aa978eadec16427d2d20199149fb6555480ac502e7d1cd2d89df9671b4ac3d3
+EBUILD yelp-42.1.ebuild 1272 BLAKE2B 626fa34fbc4832e188afddd5e9e72aefffa33f45e1789ce3733611f9b994b9989101a002700618483c7b31822f4cfa55188afcaeb9d433d67484500a03e05f18 SHA512 6be9e23ad264d1ba8f132ceac58e7fc0ec29927ab0b1c8497e6a821933a4a369c407bd87a6b3e5f50b713d0c5908162367a55686e046061a3698e0803e98b70c
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/gnome-extra/yelp/yelp-41.2.ebuild b/gnome-extra/yelp/yelp-41.2.ebuild
deleted file mode 100644
index fdea6bef9a3e..000000000000
--- a/gnome-extra/yelp/yelp-41.2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-GNOME2_EAUTORECONF="yes"
-
-inherit gnome2
-
-DESCRIPTION="Help browser for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Yelp"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-
-RDEPEND="
-	app-arch/bzip2:=
-	>=app-arch/xz-utils-4.9:=
-	dev-db/sqlite:3=
-	>=dev-libs/glib-2.67.4:2
-	>=dev-libs/libxml2-2.6.5:2
-	>=dev-libs/libxslt-1.1.4
-	>=gnome-extra/yelp-xsl-41.0
-	>=net-libs/webkit-gtk-2.19.2:4
-	>=x11-libs/gtk+-3.13.3:3
-	x11-themes/adwaita-icon-theme
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-libs/appstream-glib
-	>=dev-util/gtk-doc-am-1.13
-	dev-util/glib-utils
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	# Fix compatibility with Gentoo's sys-apps/man
-	# https://bugzilla.gnome.org/show_bug.cgi?id=648854
-	"${FILESDIR}"/${PN}-3.20.0-man-compatibility.patch # needs eautoreconf
-)
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		--with-webkit2gtk-4-0 \
-		--enable-bz2 \
-		--enable-lzma \
-		APPSTREAM_UTIL=$(type -P true)
-}
-
-src_install() {
-	gnome2_src_install
-	exeinto /usr/libexec/
-	doexe "${S}"/libyelp/yelp-groff
-}
diff --git a/gnome-extra/yelp/yelp-42.0.ebuild b/gnome-extra/yelp/yelp-42.0.ebuild
deleted file mode 100644
index db120a9de577..000000000000
--- a/gnome-extra/yelp/yelp-42.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-GNOME2_EAUTORECONF="yes"
-
-inherit gnome2
-
-DESCRIPTION="Help browser for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Yelp"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-
-RDEPEND="
-	app-arch/bzip2:=
-	>=app-arch/xz-utils-4.9:=
-	dev-db/sqlite:3=
-	>=dev-libs/glib-2.67.4:2
-	>=dev-libs/libxml2-2.6.5:2
-	>=dev-libs/libxslt-1.1.4
-	>=gnome-extra/yelp-xsl-41.0
-	>=net-libs/webkit-gtk-2.19.2:4
-	>=x11-libs/gtk+-3.13.3:3
-	>=gui-libs/libhandy-1.5.0:1
-	x11-themes/adwaita-icon-theme
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-libs/appstream-glib
-	>=dev-util/gtk-doc-am-1.13
-	dev-util/glib-utils
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	# Fix compatibility with Gentoo's sys-apps/man
-	# https://bugzilla.gnome.org/show_bug.cgi?id=648854
-	"${FILESDIR}"/${PN}-3.20.0-man-compatibility.patch # needs eautoreconf
-)
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		--with-webkit2gtk-4-0 \
-		--enable-bz2 \
-		--enable-lzma \
-		APPSTREAM_UTIL=$(type -P true)
-}
-
-src_install() {
-	gnome2_src_install
-	exeinto /usr/libexec/
-	doexe "${S}"/libyelp/yelp-groff
-}
diff --git a/gnome-extra/yelp/yelp-42.1.ebuild b/gnome-extra/yelp/yelp-42.1.ebuild
index db120a9de577..e87454464d17 100644
--- a/gnome-extra/yelp/yelp-42.1.ebuild
+++ b/gnome-extra/yelp/yelp-42.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Yelp"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 
 RDEPEND="
 	app-arch/bzip2:=
diff --git a/gnome-extra/zenity/Manifest b/gnome-extra/zenity/Manifest
index d4f7376d63e0..704387e5d2e6 100644
--- a/gnome-extra/zenity/Manifest
+++ b/gnome-extra/zenity/Manifest
@@ -1,7 +1,3 @@
-DIST zenity-3.41.0.tar.xz 3093244 BLAKE2B 582a2e935331120c47ef997d100c28943694a9b8b35c70673c8dca6e129bf39d9a32c92cf6504602513ad6eb223239be584c56ef44fe609f8af320f27713ca4a SHA512 b198ae68fda77f74c9f6deba683759612067c4ee28551a667c96500296db89313f3f2330fcaa53b6e4840ee3367d438e766be8ba7c006952872aebe93684b307
-DIST zenity-3.42.0.tar.xz 3091448 BLAKE2B 0a2f595164f5f9e8ebfa800855b15b116ab453435a2a1287ba7c85698d391dfecce3c8e2f8237ce73403ce7187a340ed5353e4ff283b05a0ecdcdc55f950f526 SHA512 a17b7ee46f480ca3e3804d301d1a499393aa10aee62d96d5087841ca8951a46f2b51e8355dd63b81b078efd69a11d57ed4fa187052d98880b12e56fd11e53ddb
 DIST zenity-3.42.1.tar.xz 3091752 BLAKE2B 7364ce9175efb7d4954956c1c2bd347ffd8060f02be3c21ec65525ee84e082eeffd8af3cb72b3f051f401a9ff90595c0a015223efcd96b6069e9bc3d276de16e SHA512 a8239e7dde351f3d3f75a59c95588f672c69333d4a53d50465d05fb73e61d1bbff6aca89acffc35a8d6802f465048ad2cbd7421bc3e3200a5a393ee3c9319106
-EBUILD zenity-3.41.0.ebuild 1175 BLAKE2B a9f24605f1504c439a8aed8b288103e5f76740094e9862a378f6d71bdf3403034285ae67ecbd678fde4549c752cd03f37b50c27d06f28d1a59e84a4107299caf SHA512 ff77d8bc6564c934e16ae69bbce8920fb0b03f55bb91788fdabc4e9a8470e0359c80343d3357f227181d5374fb0a6b30fc28f6516fd40e0cc7fb42494de2fb54
-EBUILD zenity-3.42.0.ebuild 1178 BLAKE2B 64c8330e520726cc52b09f3ff524abc7fae3193d24dd5d51cabae094a99d3ebb7cbebaa7769b933ae9e9cf6c11662d9473baa12403a08020ef967e35b0924fbf SHA512 348d67d796772a328321641411bad741d629259f2c31fafd2188c33c1629f0b2b613852949f512abc8f4e1344025da788ebcdf2781695443ea665b9e6e59e0c4
-EBUILD zenity-3.42.1.ebuild 1178 BLAKE2B 64c8330e520726cc52b09f3ff524abc7fae3193d24dd5d51cabae094a99d3ebb7cbebaa7769b933ae9e9cf6c11662d9473baa12403a08020ef967e35b0924fbf SHA512 348d67d796772a328321641411bad741d629259f2c31fafd2188c33c1629f0b2b613852949f512abc8f4e1344025da788ebcdf2781695443ea665b9e6e59e0c4
+EBUILD zenity-3.42.1.ebuild 1182 BLAKE2B c78305f887de89912e8c437301649399a55ec0994b5359c0dbc201db8efd30925d2bcc4e709df884734e3b3f0d55728c9cd44e5681189be9b890d429e71a76b8 SHA512 03ef2a3e6cf1e053d0e6defa2836718ba1c6fc1225ab47a3e861ec0520706539ec84ccb4b2ab1c8b1807e513803c974d4297660dde5db4fb3aa0b1b56b9100b5
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/gnome-extra/zenity/zenity-3.41.0.ebuild b/gnome-extra/zenity/zenity-3.41.0.ebuild
deleted file mode 100644
index 30a09ff4990b..000000000000
--- a/gnome-extra/zenity/zenity-3.41.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome.org gnome2-utils meson xdg
-
-DESCRIPTION="Tool to display dialogs from the commandline and shell scripts"
-HOMEPAGE="https://wiki.gnome.org/Projects/Zenity"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="libnotify webkit"
-
-# TODO: X11 dependency is automagically enabled
-RDEPEND="
-	>=x11-libs/gtk+-3.16.0:3[X]
-	>=dev-libs/glib-2.43.4:2
-	libnotify? ( >=x11-libs/libnotify-0.6.1:= )
-	webkit? ( >=net-libs/webkit-gtk-2.8.1:4 )
-	x11-libs/libX11
-
-	x11-libs/gdk-pixbuf:2
-	x11-libs/pango
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.4
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use libnotify)
-		$(meson_use webkit webkitgtk)
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	# Not really needed and prevent us from needing perl
-	rm "${ED}/usr/bin/gdialog" || die "rm gdialog failed!"
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/zenity/zenity-3.42.0.ebuild b/gnome-extra/zenity/zenity-3.42.0.ebuild
deleted file mode 100644
index e81d45b27ae7..000000000000
--- a/gnome-extra/zenity/zenity-3.42.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit gnome.org gnome2-utils meson xdg
-
-DESCRIPTION="Tool to display dialogs from the commandline and shell scripts"
-HOMEPAGE="https://wiki.gnome.org/Projects/Zenity"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="libnotify webkit"
-
-# TODO: X11 dependency is automagically enabled
-RDEPEND="
-	>=x11-libs/gtk+-3.16.0:3[X]
-	>=dev-libs/glib-2.43.4:2
-	libnotify? ( >=x11-libs/libnotify-0.6.1:= )
-	webkit? ( >=net-libs/webkit-gtk-2.8.1:4 )
-	x11-libs/libX11
-
-	x11-libs/gdk-pixbuf:2
-	x11-libs/pango
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.4
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use libnotify)
-		$(meson_use webkit webkitgtk)
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	# Not really needed and prevent us from needing perl
-	rm "${ED}/usr/bin/gdialog" || die "rm gdialog failed!"
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/zenity/zenity-3.42.1.ebuild b/gnome-extra/zenity/zenity-3.42.1.ebuild
index e81d45b27ae7..2c6860c366be 100644
--- a/gnome-extra/zenity/zenity-3.42.1.ebuild
+++ b/gnome-extra/zenity/zenity-3.42.1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Zenity"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="libnotify webkit"
 
 # TODO: X11 dependency is automagically enabled
author	V3n3RiX <venerix@koprulu.sector>	2022-06-29 12:04:12 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2022-06-29 12:04:12 +0100
commit	0f558761aa2dee1017b4751e4017205e015a9560 (patch)
tree	037df795519468a25d9362b4e95cdaeb84eb1cf9 /gnome-extra
parent	752d6256e5204b958b0ef7905675a940b5e9172f (diff)