gentoo resync : 12.05.2022

author: V3n3RiX <venerix@koprulu.sector> 2022-05-12 16:42:50 +0300
committer: V3n3RiX <venerix@koprulu.sector> 2022-05-12 16:42:50 +0300
commit: 752d6256e5204b958b0ef7905675a940b5e9172f (patch)
tree: 330d16e6362a49cbed8875a777fe641a43376cd3 /gnome-extra
parent: 0c100b7dd2b30e75b799d806df4ef899fd98e1ea (diff)
87 files changed, 1215 insertions, 1273 deletions
diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index bb6304b8205d..5ad5180d1f2b 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 8c27b5c58da9..308167238330 100644
--- a/gnome-extra/cinnamon-control-center/Manifest
+++ b/gnome-extra/cinnamon-control-center/Manifest
@@ -1,5 +1,4 @@
-DIST cinnamon-control-center-5.0.2.tar.gz 3866962 BLAKE2B d292d610516647e149198cbfce652bfd094338612ef6b4765fcb80bd1fe15f2d643bbaa5343f1d79d57f3327c87a3256cfc3900493daf6f80569b1a0bacd821a SHA512 f47b88005ba1d7359ab99d80e99d2c42a93561ecddd98014f91674a5ae806b991169c88f3af6c8c187df23ebb8a9e12bbae5eefbfeaf2f3d087981192448c3c2
+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.0.2.ebuild 2386 BLAKE2B 58c3555f2f224279ffc3f4e60930495f6dc53128731c501c351e749f7adabf23002a30c0164ec13b05128a7bdf727c1eeccaa56aa5e169eb0459704175579318 SHA512 68bc4a047d28ca8570794318d66970c79de7f6740b9499c4028cd010da1d021aa1713e392a97fbbb26deff23b214addae379f491d322b2cfc609d10bc8e1e66d
-EBUILD cinnamon-control-center-5.2.1.ebuild 2363 BLAKE2B 5b896e9520223203f6ac9f9ccaa8e28a235da184c378bfd345c6c84aceb8b1f1bcf958a1cc69e63b5dc7d9ab12bbaf767d270a5256b0b728dcae29a584e0af33 SHA512 8fadcf926de72405fdbe0f2ac1f7bad97260354de882654df1cc7ee991097ed87d7af75d2171ec98090b22b22f38b58732e9a3919377828c61f7b3c47824cfb3
+EBUILD cinnamon-control-center-5.2.1-r1.ebuild 2570 BLAKE2B 07724f5cf57160643e40eb463c68fffd61e960ae6e071958c8ff0cea3cad014e92fe92c3ff3a31d8ed46dd63ff87268d975584ccc467aff7149c047f2fe961fb SHA512 53ec4e294c9d98b170224e3f558232322611d4d428c86d943169263e7e0f201afe371c94428ab973da94b65a14950a0b580bbc4be1fd5f8b8c47827b7442dee0
 MISC metadata.xml 762 BLAKE2B 5a4411060287e76154bd0727feae76a45e8992077d7cbc6d1ad102d933246d98b3349bf0dc516f35d538e6c1d4a5d427e1561b646b628d408a5743666f5f2ca7 SHA512 c03709d9a1c8d678ce0957d08516e49f8affa6be2153f30607c0f1be7c29a1e00f4955f2112e82dc7c3b3e410a6dabf5ba2bdd9f3141b6a5299068598decd0c3
diff --git a/gnome-extra/cinnamon-control-center/cinnamon-control-center-5.0.2.ebuild b/gnome-extra/cinnamon-control-center/cinnamon-control-center-5.0.2.ebuild
deleted file mode 100644
index 47db2c39a177..000000000000
--- a/gnome-extra/cinnamon-control-center/cinnamon-control-center-5.0.2.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit meson gnome2-utils python-any-r1 xdg virtualx
-
-DESCRIPTION="Cinnamons's main interface to configure various aspects of the desktop"
-HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon-control-center"
-SRC_URI="https://github.com/linuxmint/cinnamon-control-center/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="+colord input_devices_wacom +networkmanager +modemmanager gnome-online-accounts systemd test"
-REQUIRED_USE="modemmanager? ( networkmanager )"
-KEYWORDS="amd64 ~arm64 ~riscv x86"
-RESTRICT="test"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.44.0:2
-	>=gnome-base/libgnomekbd-3.0.0:0=
-	>=gnome-extra/cinnamon-desktop-5.0:0=
-	>=gnome-extra/cinnamon-menus-5.0:0=
-	media-libs/fontconfig
-	>=sys-auth/polkit-0.103
-	>=x11-libs/gdk-pixbuf-2.23.0:2
-	>=x11-libs/gtk+-3.16.0:3
-	>=x11-libs/libnotify-0.7.3:0=
-	x11-libs/libX11
-	>=x11-libs/libxklavier-5.1
-
-	colord? ( >=x11-misc/colord-0.1.14:0= )
-	input_devices_wacom? (
-		>=dev-libs/libwacom-0.7
-		>=gnome-extra/cinnamon-settings-daemon-5.0:0=
-		>=x11-libs/libXi-1.2 )
-	networkmanager? (
-		>=gnome-extra/nm-applet-1.2.0
-		>=net-misc/networkmanager-1.2.0:=[modemmanager?]
-
-		modemmanager? ( >=net-misc/modemmanager-0.7 )
-	)
-	gnome-online-accounts? (
-		>=net-libs/gnome-online-accounts-3.18.0
-	)
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	x11-themes/adwaita-icon-theme
-
-	colord? ( >=gnome-extra/gnome-color-manager-3 )
-	input_devices_wacom? ( gnome-extra/cinnamon-settings-daemon[input_devices_wacom] )
-	systemd? ( >=sys-apps/systemd-31 )
-	!systemd? ( app-admin/openrc-settingsd )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	app-text/iso-codes
-	x11-base/xorg-proto
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-util/glib-utils
-	>=dev-util/intltool-0.40.1
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-	python_fix_shebang meson_install_schemas.py
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use colord color)
-		$(meson_use modemmanager)
-		$(meson_use networkmanager)
-		$(meson_use gnome-online-accounts onlineaccounts)
-		$(meson_use input_devices_wacom wacom)
-	)
-	meson_src_configure
-}
-
-src_test() {
-	virtx meson_src_test
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/cinnamon-control-center/cinnamon-control-center-5.2.1.ebuild b/gnome-extra/cinnamon-control-center/cinnamon-control-center-5.2.1-r1.ebuild
index e8ca7c2831ca..53c017c256aa 100644
--- a/gnome-extra/cinnamon-control-center/cinnamon-control-center-5.2.1.ebuild
+++ b/gnome-extra/cinnamon-control-center/cinnamon-control-center-5.2.1-r1.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,8,9,10} )
+PYTHON_COMPAT=( python3_{8,9,10} )
 
 inherit meson gnome2-utils python-any-r1 xdg virtualx
 
@@ -15,7 +15,7 @@ LICENSE="GPL-2+"
 SLOT="0"
 IUSE="+colord input_devices_wacom +networkmanager +modemmanager gnome-online-accounts systemd test"
 REQUIRED_USE="modemmanager? ( networkmanager )"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~riscv x86"
 RESTRICT="test"
 
 COMMON_DEPEND="
@@ -38,6 +38,7 @@ COMMON_DEPEND="
 		>=x11-libs/libXi-1.2 )
 	networkmanager? (
 		>=gnome-extra/nm-applet-1.2.0
+		>=net-libs/libnma-1.8.34
 		>=net-misc/networkmanager-1.2.0:=[modemmanager?]
 
 		modemmanager? ( >=net-misc/modemmanager-0.7 )
@@ -67,6 +68,12 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+PATCHES=(
+	# Fix >=libnma-1.8.34
+	# https://github.com/linuxmint/cinnamon-control-center/commit/0f4d212874c4fbee18b860963d0a5c7bd54dcfd1
+	"${FILESDIR}"/${PN}-5.2.1-fix-libnma.patch
+)
+
 src_prepare() {
 	default
 	python_fix_shebang meson_install_schemas.py
diff --git a/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-5.2.1-fix-libnma.patch b/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-5.2.1-fix-libnma.patch
new file mode 100644
index 000000000000..ae9caceed7f9
--- /dev/null
+++ b/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-5.2.1-fix-libnma.patch
@@ -0,0 +1,61 @@
+https://bugs.gentoo.org/840317
+https://github.com/linuxmint/cinnamon/issues/10616
+
+From 0f4d212874c4fbee18b860963d0a5c7bd54dcfd1 Mon Sep 17 00:00:00 2001
+From: Michael Webster <miketwebster@gmail.com>
+Date: Mon, 31 Jan 2022 08:56:28 -0500
+Subject: [PATCH] network: Remove old workaround for openvpn widgets.
+
+I can't reproduce the original issue anymore, and NMACertChooser
+is removed in network-manager-openvpn 1.8.34.
+
+Fixes #10616
+
+ref:
+6db4961fd3a002182984d0e71ec364c9befdd93b
+---
+ meson.build                       |  2 --
+ panels/network/cc-network-panel.c | 10 ----------
+ 2 files changed, 12 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index f1f213b..c4d7d86 100644
+--- a/meson.build
++++ b/meson.build
+@@ -56,8 +56,6 @@ else
+   libnma= dependency('', required: false)
+ endif
+ 
+-config.set('HAVE_NMA_18', libnm.version().version_compare('>=1.8.0'))
+-
+ if get_option('modemmanager')
+   if not get_option('networkmanager')
+     error('*** NetworkManager is required by ModemManager ***')
+diff --git a/panels/network/cc-network-panel.c b/panels/network/cc-network-panel.c
+index a4289de..d1925e4 100644
+--- a/panels/network/cc-network-panel.c
++++ b/panels/network/cc-network-panel.c
+@@ -47,10 +47,6 @@
+ #include <libmm-glib.h>
+ #endif
+ 
+-#ifdef HAVE_NMA_18
+-#include <nma-cert-chooser.h>
+-#endif
+-
+ CC_PANEL_REGISTER (CcNetworkPanel, cc_network_panel)
+ 
+ #define NETWORK_PANEL_PRIVATE(o) \
+@@ -1244,12 +1240,6 @@ cc_network_panel_init (CcNetworkPanel *panel)
+                 return;
+         }
+ 
+-#ifdef HAVE_NMA_18
+-        /* some newer VPN plugins pre-require internal resources from libnma */
+-        /* this solution is really ugly, but works clean */
+-        gtk_widget_destroy (nma_cert_chooser_new ("dummy", NMA_CERT_CHOOSER_FLAG_NONE));
+-#endif
+-
+         panel->priv->cancellable = g_cancellable_new ();
+ 
+         panel->priv->treeview = GTK_WIDGET (gtk_builder_get_object (panel->priv->builder,
diff --git a/gnome-extra/cinnamon-desktop/Manifest b/gnome-extra/cinnamon-desktop/Manifest
index b33d027e630e..e593fff78966 100644
--- a/gnome-extra/cinnamon-desktop/Manifest
+++ b/gnome-extra/cinnamon-desktop/Manifest
@@ -1,5 +1,3 @@
-DIST cinnamon-desktop-5.0.0.tar.gz 495362 BLAKE2B 955fea37ceca3d5ee33ab94aaa4e22cb6973fc87a53f05486cd16e7d05e6e0a5ca7d548f68544fbc13ecebe2f59aee07db73b0db2e810d020730f77f05843cf4 SHA512 1191feeea4a35b6cae5708e62ec472bc865e3e209717b597eb5853673dbe29d3d03b0be5d5ee486e74748fcc2f60ac0012900aa6340a85da8059eda4d40a2263
 DIST cinnamon-desktop-5.2.1.tar.gz 495131 BLAKE2B 56b5e5018f5b1bdfa57af1550edc756e4336b079df75753f90445d51703efe64dc6e33c1e7635fcf2e2fcca1683008777b446d76570fd5222fb809b1a458f6f2 SHA512 383229a929f4bd18389851573c4c7decc3cb5d6ebfdeb86ab7628578486c75ca71a308755d2736243a4801d5d50f6b07d0a142712d48752e166f3a39c3b70466
-EBUILD cinnamon-desktop-5.0.0.ebuild 1298 BLAKE2B 4078ae0cdcfcbd1a0382ed78c3d1b7b5e47eca3e5198287440d08960ee52e5e95df2a4edd1a3b4778f296527ac180adbdba72fe7dfd26997ed56ddc607175398 SHA512 76bc37293c032d02990aa9e20e308971c4cb1ebf4559001b834b7a6d628fd9c29a376bc53e83991ca32b70dd5129c649550760f430c9d7233aa2893e37a74dd1
-EBUILD cinnamon-desktop-5.2.1.ebuild 1275 BLAKE2B fb284525afbe4e53f5864cb51614758f8188d97f80854de0626336e7f50f8840542f79785fd5f88a4bb17262174061076fbcbc4e9fde8e5f67b124403be3750a SHA512 42b2484107b0ea93448012820a1be2f6fe0c5d79f3f695ed7760c23df187525095d21fbc22a684e7c18995a969355f94a8af73fac3cd975387c76865b3b19d4a
+EBUILD cinnamon-desktop-5.2.1.ebuild 1273 BLAKE2B 2e3c1a400d86bb867c4acacdfc27fdf967524e6fdb8be7d9fc2e7519f5a78f45d8c7512335ce44560750da6ffb1ad44067433740d0886015448b80f0d54f1e6f SHA512 765d3db5109707939cd359238f122bede92dbfb682a49e8d488d0b6dcdddea1d504f547cf70f499b413c5c84802a3cbcb04cf092a4d634dc92337d80b4ae8a6b
 MISC metadata.xml 496 BLAKE2B c019ef51b10de9ccafed1294e6d436dcdc8f02735170afe9e038689c6c4d76fb3e099bc9ec7f10c2a50d2bfa5e1d1c191667a470d734effad53d9d299f431664 SHA512 41a99dd4e1aad85dda44e2168bc150e2c27bb40a45c0dfe0f085e502242e6a0704ad8b47f64140d81afa7ff096cac735c46827f3d949962400de92d769505cc4
diff --git a/gnome-extra/cinnamon-desktop/cinnamon-desktop-5.0.0.ebuild b/gnome-extra/cinnamon-desktop/cinnamon-desktop-5.0.0.ebuild
deleted file mode 100644
index b7ec032c8b37..000000000000
--- a/gnome-extra/cinnamon-desktop/cinnamon-desktop-5.0.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit meson gnome2-utils python-any-r1
-
-DESCRIPTION="A collection of libraries and utilites used by Cinnamon"
-HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon-desktop"
-SRC_URI="https://github.com/linuxmint/cinnamon-desktop/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
-SLOT="0/4" # subslot = libcinnamon-desktop soname version
-KEYWORDS="amd64 ~arm64 ~riscv x86"
-
-RDEPEND="
-	>=dev-libs/glib-2.37.3:2[dbus]
-	>=dev-libs/gobject-introspection-0.10.2:=
-	>=gnome-base/gsettings-desktop-schemas-3.5.91
-	media-sound/pulseaudio[glib]
-	sys-apps/accountsservice
-	x11-libs/cairo:=[X]
-	>=x11-libs/gdk-pixbuf-2.22:2[introspection]
-	>=x11-libs/gtk+-3.3.16:3[introspection]
-	x11-libs/libX11
-	>=x11-libs/libXext-1.1
-	x11-libs/libxkbfile
-	>=x11-libs/libXrandr-1.3
-	x11-misc/xkeyboard-config
-"
-DEPEND="
-	${RDEPEND}
-	x11-base/xorg-proto
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-util/glib-utils
-	>=dev-util/intltool-0.40.6
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-	python_fix_shebang install-scripts
-}
-
-pkg_postinst() {
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/cinnamon-desktop/cinnamon-desktop-5.2.1.ebuild b/gnome-extra/cinnamon-desktop/cinnamon-desktop-5.2.1.ebuild
index e6c66629ffe2..95044a0bb0aa 100644
--- a/gnome-extra/cinnamon-desktop/cinnamon-desktop-5.2.1.ebuild
+++ b/gnome-extra/cinnamon-desktop/cinnamon-desktop-5.2.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/linuxmint/cinnamon-desktop/archive/${PV}.tar.gz -> $
 
 LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
 SLOT="0/4" # subslot = libcinnamon-desktop soname version
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~riscv x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.37.3:2[dbus]
diff --git a/gnome-extra/cinnamon-menus/Manifest b/gnome-extra/cinnamon-menus/Manifest
index a8873e095e57..e280c82e76ec 100644
--- a/gnome-extra/cinnamon-menus/Manifest
+++ b/gnome-extra/cinnamon-menus/Manifest
@@ -1,5 +1,3 @@
-DIST cinnamon-menus-5.0.0.tar.gz 101957 BLAKE2B 1d2f95d5b599f73f8161caf7964d3508f34c4c28f677dc8367d4ba67004d77c00e1f77cb1851084bcf26482d1689da7d1734c21649ade89ca6d9ca15475623b8 SHA512 1f8d7b417f947909d9187288ed916739b5b146a8f9cade2f8695d4c59b56a69286c0db48ac026cab3342e571d40013595fb32155065355d6110a43a1cac7096a
 DIST cinnamon-menus-5.2.0.tar.gz 95316 BLAKE2B 150dbab3b5c1b1a5574c1d234ebc7978a9e517e027d3076f6e335f4c64ad1631689c5b57a9d7ca159daa7f9f832d00accd78b2f392f757552f2babbab25489d7 SHA512 822ad5f3bf20b6ecfa9f2e3aa4c6d85f6f7b54a68bf73b60a4c2ceec853d2ce8b7d1e42b308eff9395c993eb8b5dc1c580b714e89a8ff2153e264db380aa8dae
-EBUILD cinnamon-menus-5.0.0.ebuild 831 BLAKE2B 913c014b5378f9a870739739190e9f30125158ee1b703c768c4bc46e411a32e42d93f74a3d97fac1e2058b1eeb0d5bf4bf24de88411289e174a11e2b752025c9 SHA512 cb8d4f4bbd6c693c86aa46a43e01e72f53dadfe73d7a3b0dec50d957c6f61018c6e8b14b089611b6227ef8d4ff4bd889ded8f8820b7d1546c27ec532f092d7d2
-EBUILD cinnamon-menus-5.2.0.ebuild 805 BLAKE2B c70d81cf0f6cc29acafccd7a265866563280d42cf7e9056c7e9d14449d839a56c6dc423993ab3c7160f9cb0da04a18ea1895bba6bc65115d8d75513d60b7bc7a SHA512 ab0212f43c04c2ac37ed17b72f551719f9f77e92792f0a13d8a645e766bff7197ae613586576b848e7b5cede469eafef2f8d59d48903bfbaf51d0f58a4f115d1
+EBUILD cinnamon-menus-5.2.0.ebuild 803 BLAKE2B 46de959392fded19d4d7a6d2a2b8ddb4d2cdfc27373c1ff092f6c5c61816e6f65572e9b0fea9123c3f3cf79936fb462978825f32f99b646ef637f63eeea71931 SHA512 a3f698302e4bd9155bb14bd6655da651c1c464f8479a641cadc274143fc5bfe6c9ebf30aceab4ed58b89b861249cbe15b6f2b2f665aa1f02228594a69f3609e5
 MISC metadata.xml 494 BLAKE2B a27fd494a680cb42a41c806166cf6ce2f2df3d132d62af9e4a4f8c7ae66ecc93b05afc64e250122cdd62bad428fc065984ab68e31c0d6c5be2a070a8dc912d7b SHA512 1fe1a31acf83ea9070318e76a6acb09969c7dac0779292822a7d1800ac7be4392a26091a59bceeb3ce84381d95159c9c2c1cdb30e567c2b2896a2a02564656ff
diff --git a/gnome-extra/cinnamon-menus/cinnamon-menus-5.0.0.ebuild b/gnome-extra/cinnamon-menus/cinnamon-menus-5.0.0.ebuild
deleted file mode 100644
index a1337bd3ed36..000000000000
--- a/gnome-extra/cinnamon-menus/cinnamon-menus-5.0.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson xdg
-
-DESCRIPTION="Cinnamon's library for the Desktop Menu fd.o specification"
-HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon-menus"
-SRC_URI="https://github.com/linuxmint/cinnamon-menus/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv x86"
-IUSE="gtk-doc"
-
-RDEPEND="
-	>=dev-libs/glib-2.29.15:2
-	>=dev-libs/gobject-introspection-0.9.12:=
-"
-DEPEND="
-	${RDEPEND}
-	dev-libs/gobject-introspection-common
-"
-BDEPEND="
-	>=dev-util/intltool-0.40.6
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	gtk-doc? ( dev-util/gtk-doc )
-"
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use gtk-doc enable_docs)
-	)
-	meson_src_configure
-}
diff --git a/gnome-extra/cinnamon-menus/cinnamon-menus-5.2.0.ebuild b/gnome-extra/cinnamon-menus/cinnamon-menus-5.2.0.ebuild
index 8ed39e12bb5c..bea63f94efc8 100644
--- a/gnome-extra/cinnamon-menus/cinnamon-menus-5.2.0.ebuild
+++ b/gnome-extra/cinnamon-menus/cinnamon-menus-5.2.0.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
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/linuxmint/cinnamon-menus/archive/${PV}.tar.gz -> ${P
 
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~riscv x86"
 IUSE="gtk-doc"
 
 RDEPEND="
diff --git a/gnome-extra/cinnamon-screensaver/Manifest b/gnome-extra/cinnamon-screensaver/Manifest
index 750ba8681f51..6a3b28753b91 100644
--- a/gnome-extra/cinnamon-screensaver/Manifest
+++ b/gnome-extra/cinnamon-screensaver/Manifest
@@ -1,5 +1,3 @@
-DIST cinnamon-screensaver-5.0.7.tar.gz 154480 BLAKE2B 38b89e2d4729ea2806903e9bd27024b274248325720d233485ab756477625bc07832582bbe99c599b7a7d4dbcf76d22b59df179ac8617a81b584b9f5684cb6d2 SHA512 ec5990e1f73983e96eb07f0d4d1a66076d067df28d56c68cce987dc7fce35871650273d2d4a64058d73c7daff2326722e3c1a2fd86afc761d81d1a6b2e7f9370
 DIST cinnamon-screensaver-5.2.1.tar.gz 154920 BLAKE2B a50508f6ad5ffee797db4f74295ef7ffdfdb0024e9a9ca005398f5ccac83687f356743c80d8911ccf1ee9b343a285e4e6c72ce864fe639e3494ed54701a84e8b SHA512 db293f619df8ea3e43c209f5d32d649935f1efbc5763700369d5bd595866805a3e604930a3f70b6d43cbc4469c6d618f258b49cf4962f87c8b06447178ed1e7a
-EBUILD cinnamon-screensaver-5.0.7.ebuild 1650 BLAKE2B 9a1c629b7d4395fca8a184c2e114b0ee9cfc036d59e3711b09d08bc78b6aae7a2abf25b655c9c18fd4efaa7ce7ae01e72323b324665d5b4039165689c4eb2ebd SHA512 66a1ee63a072f344cf4c3b9fbcdf183785f6cf41505508df0b397e9763bfedba724b2b0985b902caa9f66f01da46d1f566a1801e9256f7a8467ab90f1b6c1545
-EBUILD cinnamon-screensaver-5.2.1.ebuild 1632 BLAKE2B 349f191aa9f31189e2747fbefa0cc808c7f747c5dc9c7c68e445315a37fc0fff3024b5377f96feb0c3692ec359db747de46789b6783b62b529ff9cba02660acf SHA512 b95a9ce8b339d6b762822682ce70d33d20f182154b9be15189409750c74e462ccfe23129da0debe716322841f1ea4a86dbd52dfc6858e4373aa2bec302486112
+EBUILD cinnamon-screensaver-5.2.1.ebuild 1630 BLAKE2B c47f4099ca9d28b2dd38cde034fb99eaea842066d28209c345bb52d74c9edae69cec5c694decf64d640a34f9e3edd0bd045ae5edad8367e9d1c6b317e28d86d6 SHA512 eeb2fb014bc177687f00097fe034ef5fd906438de439460a0f7333dd8cfeafc4ae17cbfe10f0de59c99d5605195b2a8a32bea401c255c2454cf5dd86af671f6a
 MISC metadata.xml 500 BLAKE2B 92b85c1d68491b0e4f88203070760f1e8d2b51b3bf9d3615e18a26cdaf6466eadaa700f18f1668a9b214a540fe01639a49a8535cd43435ddba192fef0267ce98 SHA512 35fc95aac49117f0bd643ccd17d2e461ad1cc5dc744256f6cf83f4248c087b33f66eb4352aeae8105983789e7f8ca74727fc48557f462edfba658d411bb536f7
diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-5.0.7.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-5.0.7.ebuild
deleted file mode 100644
index 8761a2a6166a..000000000000
--- a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-5.0.7.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit meson python-single-r1 xdg
-
-DESCRIPTION="Screensaver for Cinnamon"
-HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon-screensaver"
-SRC_URI="https://github.com/linuxmint/cinnamon-screensaver/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="systemd xinerama"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-KEYWORDS="amd64 ~arm64 ~riscv x86"
-
-COMMON_DEPEND="
-	${PYTHON_DEPS}
-	>=dev-libs/dbus-glib-0.78
-	>=dev-libs/glib-2.37.3:2[dbus]
-	>=gnome-extra/cinnamon-desktop-5.0:0=
-	sys-apps/dbus
-	sys-libs/pam
-	>=x11-libs/gtk+-3.22:3[introspection]
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrandr
-	x11-themes/adwaita-icon-theme
-
-	xinerama? ( x11-libs/libXinerama )
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	>=app-accessibility/caribou-0.3
-	sys-apps/accountsservice[introspection]
-	$(python_gen_cond_dep '
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-		dev-python/setproctitle[${PYTHON_USEDEP}]
-		>=dev-python/python3-xapp-2.2.0[${PYTHON_USEDEP}]
-	')
-
-	systemd? ( >=sys-apps/systemd-31 )
-	!systemd? ( sys-auth/elogind )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	x11-base/xorg-proto
-"
-BDEPEND="
-	dev-util/gdbus-codegen
-	>=dev-util/intltool-0.40
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-	python_fix_shebang install-scripts src
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use xinerama)
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	python_optimize "${ED}"/usr/share/cinnamon-screensaver/
-}
diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-5.2.1.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-5.2.1.ebuild
index 0ff66f127ab4..f66a07f20475 100644
--- a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-5.2.1.ebuild
+++ b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-5.2.1.ebuild
@@ -15,7 +15,7 @@ LICENSE="GPL-2+"
 SLOT="0"
 IUSE="systemd xinerama"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~riscv x86"
 
 COMMON_DEPEND="
 	${PYTHON_DEPS}
diff --git a/gnome-extra/cinnamon-session/Manifest b/gnome-extra/cinnamon-session/Manifest
index 2d6e2569f524..b6060462e4da 100644
--- a/gnome-extra/cinnamon-session/Manifest
+++ b/gnome-extra/cinnamon-session/Manifest
@@ -1,5 +1,3 @@
-DIST cinnamon-session-5.0.1.tar.gz 200036 BLAKE2B a7e254d54daa63f5dcf5592843b85e0c63a3fdd34ce5c3045ff5c7ce410f2ab340b5c778b1579e7586f7d9e0517fdf00703934395b9bbbbd234cb181a1096fcf SHA512 0c367764269ce1597035288508909aad2c031ab5b8c04bde3d81cc420f38abf6cca82f169db199cf01218e92014653f1749c0ed2096950f7bc9f3b56f1fcdebc
 DIST cinnamon-session-5.2.0.tar.gz 200208 BLAKE2B 2efe8ef0cb5dc4a828866c91bc020ffcc8b400423f92ac8be8ab47391202001123805c947af8e82eda530675b89cf4960f082b06acf24c296f083d6bcb941217 SHA512 3962529fed8d6c4c74e2f4b75014529d1a9b3307cf2d014c90088d0e2d3066ce375ccc3bbf5f07e9a181c08bba5360b07d5800cdb6386796255b4f1cb5c4d385
-EBUILD cinnamon-session-5.0.1.ebuild 1925 BLAKE2B 28662c19c0611a35728f11655f398a1b6ce51d153aed8d434062400a1b32b75b879f8b94c5beb017fb3aba89a7b99e0ead402f862835fc69884048e4133ce3a8 SHA512 b7a642c9406efa356c14d573675930cdd27a1ac4b9c7458b9b267b0dd47f8d442ab3cccdeb81026922f9287629d96b123ce0c11d03e473644fb18e3f5ce2bf7a
-EBUILD cinnamon-session-5.2.0.ebuild 1902 BLAKE2B 1da53dda72f770aaeb9839464023caa36150c9f8ca6383014a9b7c10a66fa926b7e21c3302c4a87b34b4ee8aabd9db14441de24f3829c2db0a0f52b34a73f942 SHA512 6f727d6109d59d881d2071b209ca3bbdf591b07347a685a62f5a665041cae2afdfbb46bceaf46bc64c9b9fd89742682e5d9c0135ce12713edd3aa0c13b6b7bcb
+EBUILD cinnamon-session-5.2.0.ebuild 1900 BLAKE2B 0b2bb02f64f56fe21cfd4f18464e3b23c43f9de1ac418dac2918bf9cec93f3000bca6fab2665196e67ecd2ae22232a445c766405d1832aaa6e20c0ff98a8e26c SHA512 007e3fdd465b58278ba61914e7359185dcdffc14c99627f3f27e28e9e5e76fa01013587ab5589f5ea4689340d2e63c8c615478e6b8f45256583fe9fe1ba0071a
 MISC metadata.xml 496 BLAKE2B 3b3170a447d7818cdd93b3183feee36751832a07da741b16dfdfe029e09733f3ba94815312e6444b3421dd7bc3df9b4ca2f1c1ac2a5d83ae3881b1ab7cf809c0 SHA512 65d223bf44f83d8d2bda72791b362c4302ec813e9090331cf5ddc97e10ed610c1a91c6d467ff72d7e1430e7d70dcfa09f9c8e35c50a86130236798c80e19a2f2
diff --git a/gnome-extra/cinnamon-session/cinnamon-session-5.0.1.ebuild b/gnome-extra/cinnamon-session/cinnamon-session-5.0.1.ebuild
deleted file mode 100644
index 119f516fc728..000000000000
--- a/gnome-extra/cinnamon-session/cinnamon-session-5.0.1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit meson gnome2-utils python-any-r1 xdg-utils
-
-DESCRIPTION="Cinnamon session manager"
-HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon-session"
-SRC_URI="https://github.com/linuxmint/cinnamon-session/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv x86"
-IUSE="doc ipv6 systemd"
-
-DEPEND="
-	>=dev-libs/glib-2.37.3:2
-	media-libs/libcanberra[pulseaudio]
-	virtual/opengl
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3:3
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXau
-	x11-libs/libXcomposite
-	x11-libs/libXext
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/pango[X]
-	>=x11-libs/xapp-2.2.0
-
-	systemd? ( >=sys-apps/systemd-183 )
-	!systemd? ( sys-auth/elogind[policykit] )
-"
-RDEPEND="
-	${DEPEND}
-	>=gnome-extra/cinnamon-desktop-5.0:0=
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-util/gdbus-codegen
-	>=dev-util/intltool-0.40.6
-	virtual/pkgconfig
-
-	doc? (
-		app-text/xmlto
-		dev-libs/libxslt )
-"
-
-src_prepare() {
-	default
-	python_fix_shebang data
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dgconf=false
-		$(meson_use doc docbook)
-		$(meson_use ipv6)
-	)
-	meson_src_configure
-}
-
-src_install() {
-	# A bit icky. Let the docs be installed in the wrong dir, then
-	# install them to the correct dir.
-	local dbus_doc_dir="${ED}/usr/share/doc/cinnamon-session/dbus"
-	use doc && local HTML_DOCS=( "$dbus_doc_dir" )
-
-	meson_src_install
-
-	# Clean-up the incorrectly installed docs.
-	# Fail if unhandled (new) files are encountered.
-	if use doc; then
-		rm -r "$dbus_doc_dir" || die
-		rm -d "${ED}/usr/share/doc/cinnamon-session" || die
-	fi
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/cinnamon-session/cinnamon-session-5.2.0.ebuild b/gnome-extra/cinnamon-session/cinnamon-session-5.2.0.ebuild
index c89d9864b142..93a559658d99 100644
--- a/gnome-extra/cinnamon-session/cinnamon-session-5.2.0.ebuild
+++ b/gnome-extra/cinnamon-session/cinnamon-session-5.2.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/linuxmint/cinnamon-session/archive/${PV}.tar.gz -> $
 
 LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~riscv x86"
 IUSE="doc ipv6 systemd"
 
 DEPEND="
diff --git a/gnome-extra/cinnamon-settings-daemon/Manifest b/gnome-extra/cinnamon-settings-daemon/Manifest
index f4c9ba68bd70..fb78daa626a5 100644
--- a/gnome-extra/cinnamon-settings-daemon/Manifest
+++ b/gnome-extra/cinnamon-settings-daemon/Manifest
@@ -1,5 +1,3 @@
-DIST cinnamon-settings-daemon-5.0.4.tar.gz 663647 BLAKE2B 459ca8b407291e7a84742b75a272a621d05ef1929ec76dd913af477629db862429165cec26a5985c75f81ce8eaddccc6b74cfa882106784bbfb40e015a21bab8 SHA512 861847fb238ae53fdb31c55ab7f8475f3cad9b48a5dd3611e5ea05129e16b44cc48b3ff5d38c2fdcc3669191f952bf194b6bcba80816fb4daee9e91d85b1c781
 DIST cinnamon-settings-daemon-5.2.0.tar.gz 662588 BLAKE2B aca6aac0a7b85fa9fb60f1101e0027d5faf3f6d95f7d306ae0ad9dd2e19bb1b48ab4333bbcdff5405b52c306f67eb34bfce895b37529d3ce015182aac41dcf07 SHA512 ae076956715bc7b47746868df0f1cb4034a8ce26b2d64878c74654f08a4498155063f16bf7972316fa138f72e10a82e8589fdb607f8072bbcd92e106bedbe98e
-EBUILD cinnamon-settings-daemon-5.0.4.ebuild 2176 BLAKE2B aebb9e8a0d44b164827fc23ab77cac92040b7723c77081ae632b35fdc046092020a9801f41b8e5c1fb950d1ed2b2e7ea694f42f93baf956cab0ac8122cce8cee SHA512 cb7656f25108c5c239c961eb1618ad88f8e38193b4f23a9653dd7328eec9f50183f1b37e4b46bc9e8d8409ee2b5027cd064033a915443e8251c331554cdf6927
-EBUILD cinnamon-settings-daemon-5.2.0.ebuild 2153 BLAKE2B 8282b1cf60108efb8f0954c4114970648f14122d29113a1172f93ebfeb214b15a1ce3c58393ea0914f6345e43aea510c2802882fc885900d94b6b3b2ef9426e9 SHA512 73ad996d9310281e7ece8a7dc3dddf333a88a1daf9ad31de1413b40dae46248424429e17ed9d475bed7aa3f673553c29eea1d671a6d454bb81146bc88a5e5396
+EBUILD cinnamon-settings-daemon-5.2.0.ebuild 2151 BLAKE2B 66d98a3a03bc67418a8e5a9d40b6624ea8500ad9e531650c0739b1f96b519dc5076f8e34c440ea55cc33a62f43937d86bb89b6d601479896edc8037c84d5f89b SHA512 f995743f386e30e805345708c3fcf409d471cf2afdd62022e950d38c353c94fbef591a75740d55e9a078260a15fdbf3cdf622ae4b50792ff22e068a2926add6c
 MISC metadata.xml 504 BLAKE2B 99901d6f11af1367053f408c6fc1dffafa3903dc04b9a38faed0b3261e578c33fad49948ce09ecfb6d277472a3f9c3d088a32231b02236677071413dc3d4917e SHA512 f5afa4c1e73b6765aee16c5762b3145223bf4c56cae60b7e65ef503aec0f684276de2a7a22b0b866996cd96376cfc69e36e395ad3da9e7ce593732cb075fd64c
diff --git a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-5.0.4.ebuild b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-5.0.4.ebuild
deleted file mode 100644
index e7826a30f94d..000000000000
--- a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-5.0.4.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit meson gnome2-utils python-any-r1 xdg
-
-DESCRIPTION="Cinnamon's settings daemon"
-HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon-settings-daemon"
-SRC_URI="https://github.com/linuxmint/cinnamon-settings-daemon/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv x86"
-IUSE="+colord cups input_devices_wacom smartcard systemd"
-
-RDEPEND="
-	>=dev-libs/glib-2.40.0:2
-	dev-libs/libgudev:=
-	>=gnome-base/libgnomekbd-3.6
-	>=gnome-extra/cinnamon-desktop-5.0:0=
-	media-libs/fontconfig
-	>=media-libs/lcms-2.2:2
-	media-libs/libcanberra:0=[gtk3,pulseaudio]
-	>=media-sound/pulseaudio-0.9.16[glib]
-	>=sys-apps/dbus-1.1.2
-	dev-libs/dbus-glib
-	>=sys-auth/polkit-0.97
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.14.0:3
-	>=x11-libs/libnotify-0.7.3:0=
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	>=x11-libs/libxklavier-5.0
-	>=sys-power/upower-0.9.11
-
-	colord? ( >=x11-misc/colord-0.1.27:= )
-	cups? (
-		>=net-print/cups-1.4[dbus]
-		app-admin/system-config-printer
-		net-print/cups-pk-helper )
-	input_devices_wacom? (
-		>=dev-libs/libwacom-0.7
-		>=gnome-base/librsvg-2.36.2
-		x11-drivers/xf86-input-wacom
-		x11-libs/libXtst )
-	smartcard? ( >=dev-libs/nss-3.11.2 )
-	systemd? ( sys-apps/systemd:0= )
-	!systemd? ( sys-auth/elogind:0= )
-"
-DEPEND="
-	${RDEPEND}
-	dev-libs/libxml2:2
-	x11-base/xorg-proto
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-util/glib-utils
-	dev-util/gdbus-codegen
-	>=dev-util/intltool-0.37.1
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-	python_fix_shebang install-scripts
-}
-
-src_configure() {
-	# gudev not optional on Linux platforms
-	local emesonargs=(
-		-Duse_gudev=enabled
-		-Duse_polkit=enabled
-		-Duse_logind=enabled
-		$(meson_feature colord use_color)
-		$(meson_feature cups use_cups)
-		$(meson_feature smartcard use_smartcard)
-		$(meson_feature input_devices_wacom use_wacom)
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
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.ebuild
index b4238e71f45e..21639e1d3fd9 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.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
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/linuxmint/cinnamon-settings-daemon/archive/${PV}.tar
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~riscv x86"
 IUSE="+colord cups input_devices_wacom smartcard systemd"
 
 RDEPEND="
diff --git a/gnome-extra/cinnamon-translations/Manifest b/gnome-extra/cinnamon-translations/Manifest
index fc262b1b1528..a7dbf4151de7 100644
--- a/gnome-extra/cinnamon-translations/Manifest
+++ b/gnome-extra/cinnamon-translations/Manifest
@@ -1,5 +1,3 @@
-DIST cinnamon-translations-5.0.2.tar.gz 12241648 BLAKE2B ee2049154d378c4a48567593aa45277bae09101b1f0ef1916bab6ac5bafd7f7741ece4450398e784958aff8249d8da5b4277e19bf366da3064793bbd924e788a SHA512 97f119db2ee8f4b1c2327e4f2d0c56357cdd7fe2c53df380d6e48af715a56cc2326aecce9d5f5f3292854b0087bd139552d50e1f84938dcd838964bcf84a6cb4
 DIST cinnamon-translations-5.2.2.tar.gz 12587393 BLAKE2B 9609f515b87381ee433aa40d4814fd7630a78e448edf2e88f45264c08d66c324ec25e403eaafb79c9976de2721999ebb4808600ede8333dcebc9f1c8e1629b0b SHA512 2403faab704fd4415fa44c1c7b2c44db7c72fc2e489057c40355c75a2b18eb36d6de37757052c9c18a6ad6b0ca7dece2dac9ede1819420183ec9dda38d9c747a
-EBUILD cinnamon-translations-5.0.2.ebuild 1355 BLAKE2B 95f1ab5b5ab829d3a39ff59ff3f4ebce47868d222c4ee0b8d898c86096c13e70a82358efb3ffc83ec696a9d21bab47ded759ec65a6221c9a92746521b8aa39b8 SHA512 ee96e534287453270dfd9ace931232824d48f04b08329bf3fd2edc3d24769d553eba8011bc5158bf902d5b486b01c4b45313eba719c54007bf37b5140a8c34f5
-EBUILD cinnamon-translations-5.2.2.ebuild 1367 BLAKE2B d277efaa71a4c7ea3ddd3553bf1a150bb8a91a97086fb4ded781b2632ab7f5b8069a226c01c747b0bdfbb0351e63ebda6ac3295994a4bbf8dc3a8b1d79994fa4 SHA512 a87da3794fa32e7dc6dd237c0246fc6c7b46c9a49ec51a8658fc86aeb1b270fca281ab44932473f13e0da1917dac217a3701e8a5bf48fb9b1b7d3a022ae8f583
+EBUILD cinnamon-translations-5.2.2.ebuild 1365 BLAKE2B 02e4f6022c23cfa2cf1762722e5ab482cb4de8f8fce200a7659685ca982a570a47d3c34df59d4f9214710337df7dc124d8ea730594668f583d5cf05069de2164 SHA512 6a7cc5b3126f163bf72aa0f0b2cbcf0828d41a928cf43edbb404e1d7cc2d435090bbc1cdbe09974576a06ad6f628eee714b731ff1c4dfde4cf55c9acd3040b26
 MISC metadata.xml 501 BLAKE2B 79e5e721119bb7673c44beae1cfdb6d6987a028a3b16971170ba860c4edf845c6c51c236e4de5430a005e65dd364ea34937d821d47941ad03dbe4da436f6d729 SHA512 4a44ddca6b9e365a71f358d68d24b5cfe62d0cecbfe7c3b86e55c1e5d12e926414f7ae5bc73817eeac3c915f6a9aebfa141b7b880fa6f45d58d01225e2bb1cc3
diff --git a/gnome-extra/cinnamon-translations/cinnamon-translations-5.0.2.ebuild b/gnome-extra/cinnamon-translations/cinnamon-translations-5.0.2.ebuild
deleted file mode 100644
index bf4c8f950b8d..000000000000
--- a/gnome-extra/cinnamon-translations/cinnamon-translations-5.0.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PLOCALES="af am an ar ary as ast az be be@latin ber bg bn bn_IN br bs ca ca@valencia crh cs csb cy da de dz el en@shaw en_AU en_CA en_GB en_IE en_NZ en_ZA eo es es_AR et eu fa fi fil fo fr fr_CA frp fur fy ga gd gl gu ha he hi hr hu hy ia id ie ig is it ja jv ka kab kk km kn ko ksw ku ky la li lo lt lv mai mg mi mk ml mn mo mr ms my nap nb nds ne nl nn no nso oc om or pa pap pl ps pt pt_BR ro ru rue rw sa sc sco shn si sk sl so sq sr sr@ijekavian sr@ijekavianlatin sr@latin sv sw szl ta te tg th tk tl tlh tpi tr ts tt ug uk ur uz uz@cyrillic vi wa xh yi yo zgh zh_CN zh_HK zh_TW zu"
-
-inherit plocale
-
-DESCRIPTION="Translation data for Cinnamon"
-HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon-translations"
-SRC_URI="https://github.com/linuxmint/cinnamon-translations/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv x86"
-
-BDEPEND="sys-devel/gettext"
-
-src_configure() { :; }
-
-src_install() {
-	# Cannot run before since locales are not in the expected place for this to work
-	plocale_find_changes "${S}"/usr/share/locale "" ""
-
-	install_locale() {
-		insinto /usr/share/locale
-		doins -r usr/share/locale/${1}
-	}
-	plocale_for_each_locale install_locale
-}
diff --git a/gnome-extra/cinnamon-translations/cinnamon-translations-5.2.2.ebuild b/gnome-extra/cinnamon-translations/cinnamon-translations-5.2.2.ebuild
index 2d84d8de8e08..1af4eec9daff 100644
--- a/gnome-extra/cinnamon-translations/cinnamon-translations-5.2.2.ebuild
+++ b/gnome-extra/cinnamon-translations/cinnamon-translations-5.2.2.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
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/linuxmint/cinnamon-translations/archive/${PV}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~riscv x86"
 
 BDEPEND="sys-devel/gettext"
 
diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest
index bed102e51dcb..f2b7b9e6ea0e 100644
--- a/gnome-extra/cinnamon/Manifest
+++ b/gnome-extra/cinnamon/Manifest
@@ -4,8 +4,6 @@ AUX cinnamon-5.2.7-eds-detection.patch 5038 BLAKE2B 287cdf4bd91b8be422a471fd86dd
 AUX cinnamon-5.2.7-meson-0.61-fix.patch 1668 BLAKE2B bf0490423fcfa3d1228a3b1090264449c98f9beebdc064a5815e8603faa494473a46cf6be46e6003a32ab8610ff6e8621e815437052bb5b3d6cccd6c428088ba SHA512 69d8ca0413ad2d1b6e259eeb2d3538cff16b6c3a50491cb288c462363880f9ee9299547141120a3a8e9ab364049178eec0851ab972415e2845e9ed21d3075f9b
 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.0.6.tar.gz 2397950 BLAKE2B e54f8ed02fc36c121d15d30aaed4633f7db30bcf3e0179fb5fa0b9f12b42f0a29b341f531eed7ba19f849c0400ee9887ee59b5218f4558586a360d173798aeea SHA512 3ed835b1c41a34dfd1e2eac7746bfa01fe48359c6c3e8085877a4c18b895ea065efc343a855cbdee3fcbfb63aa40166bbe40fa19154ae1544be675411d49a962
 DIST cinnamon-5.2.7.tar.gz 2423949 BLAKE2B f4ce9ec4c79eab3daadff958c0a334d49757548203078ab657ebe2450f3f179c942df9d0f9089efe313c268c929628d724db43371e12338606d284a2738ed62c SHA512 62cbbe2f719574b3f70a4895c231be9ad65a41220d2755cc1557bc06bb2b31ced93621c356f2973376d127d5a1e59f9295498bbc4812d428e8605e8f4882c733
-EBUILD cinnamon-5.0.6-r1.ebuild 5094 BLAKE2B 6b3f64ffce5368b1ea6e725f0cfad7820b2b2e440d2da79087f3a2d26ea080d8312d220a735165c69ba13c1d7cef3fe60ca3638c570a654f627bdcb528e60c93 SHA512 e8bf1bbf34998df7df5b0fc31d1189d87a04c04cac91075a8cdb0608ec82cd1e277fb94f5477e804a45b3e267251a8e6a1d514a807d3396802073938d7eed10b
-EBUILD cinnamon-5.2.7-r2.ebuild 5372 BLAKE2B 2aed6a3cfe360040929edd5fae5e86952c9437cb8d50c51d56b62902865c6e8ecb0fdec8723d03b0c51a0d8f14b4cba3797d58d26095ddfc0bcb3622cce8618c SHA512 07e18607696498980903980dc779bbccc1904c95667961c2ab33920060ed9cc54c9956d71716d40238d66d2691acb0c14c2585fc6c3fb42e3f02aec2a3c7ae67
+EBUILD cinnamon-5.2.7-r3.ebuild 5359 BLAKE2B 42d2bd0f2e6cf3c17b3df4f66c8854e472d32baba4cfae463add222a5961f6237beea873961ca05f60a657aef3b87e76fde71dfa5a6f7672c750023c80ac4120 SHA512 fe405b7a08816ec7e2629a9aa07d5f977f791c254b82e96510144bc0ec9da082760ccdd5ce697320ef766e66c108c7bf1b106a1e1ea80d2008381a62ad066b3b
 MISC metadata.xml 488 BLAKE2B 422b0fe2eb6afbe708925e9fb6fa7f038497b11d51e06165e69e43515a27cf4a77c74a1a10156bbcfd6084704bbfa7f24d4e8a8409970c5d365aa6ba80ab5bd8 SHA512 5952deb426e8adcceb83a9bcaf94bbe96e4f065fbdfd6fa17b08988989f79c3f1de55e58ca13a26a6146b5cef90d8e3853d614d390c7afe0d2494d78ea3df744
diff --git a/gnome-extra/cinnamon/cinnamon-5.0.6-r1.ebuild b/gnome-extra/cinnamon/cinnamon-5.0.6-r1.ebuild
deleted file mode 100644
index d6c3792cf966..000000000000
--- a/gnome-extra/cinnamon/cinnamon-5.0.6-r1.ebuild
+++ /dev/null
@@ -1,176 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-PYTHON_REQ_USE="xml"
-
-inherit meson gnome2-utils pax-utils python-single-r1 xdg
-
-DESCRIPTION="A fork of GNOME Shell with layout similar to GNOME 2"
-HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon"
-SRC_URI="https://github.com/linuxmint/cinnamon/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="+gstreamer gtk-doc +nls +networkmanager"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-KEYWORDS="amd64 ~arm64 ~riscv x86"
-
-DEPEND="
-	${PYTHON_DEPS}
-	app-accessibility/at-spi2-atk:2
-	>=dev-libs/glib-2.52.0:2[dbus]
-	>=dev-libs/gobject-introspection-1.29.15:=
-	dev-libs/libxml2:2
-	>=gnome-extra/cinnamon-desktop-5.0:0=
-	>=gnome-extra/cinnamon-menus-5.0
-	>=gnome-extra/cjs-5.0[cairo]
-	net-libs/libsoup:2.4[introspection]
-	sys-apps/dbus
-	>=sys-auth/polkit-0.100[introspection]
-	virtual/opengl
-	x11-libs/gdk-pixbuf:2[introspection]
-	>=x11-libs/gtk+-3.12.0:3[introspection]
-	>=x11-libs/libnotify-0.7.3:0=[introspection]
-	x11-libs/libX11
-	>=x11-libs/libXfixes-5.0
-	x11-libs/pango[introspection]
-	>=x11-libs/startup-notification-0.11
-	>=x11-wm/muffin-5.0[introspection]
-
-	gstreamer? (
-		media-libs/gst-plugins-base:1.0
-		media-libs/gstreamer:1.0
-	)
-	networkmanager? (
-		net-misc/networkmanager[introspection]
-	)
-"
-# caribou used by onscreen keyboard
-# libtimezonemap used by datetime settings
-# iso-flag-png (unpackaged) used by keyboard layout settings
-RDEPEND="
-	${DEPEND}
-	>=app-accessibility/caribou-0.3
-	dev-libs/keybinder:3[introspection]
-	dev-libs/libtimezonemap
-	$(python_gen_cond_dep '
-		dev-python/dbus-python[${PYTHON_USEDEP}]
-		dev-python/distro[${PYTHON_USEDEP}]
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/pycairo[${PYTHON_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-		dev-python/pyinotify[${PYTHON_USEDEP}]
-		dev-python/pypam[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/setproctitle[${PYTHON_USEDEP}]
-		dev-python/tinycss2[${PYTHON_USEDEP}]
-		>=dev-python/python3-xapp-2.2.0[${PYTHON_USEDEP}]
-	')
-	>=gnome-base/dconf-0.4.1
-	>=gnome-base/gsettings-desktop-schemas-2.91.91
-	>=gnome-base/libgnomekbd-2.91.4
-	>=gnome-extra/cinnamon-control-center-5.0[networkmanager=]
-	>=gnome-extra/cinnamon-screensaver-5.0
-	>=gnome-extra/cinnamon-session-5.0
-	>=gnome-extra/cinnamon-settings-daemon-5.0
-	>=gnome-extra/nemo-5.0
-	gnome-extra/polkit-gnome
-	net-misc/wget
-	sys-apps/accountsservice[introspection]
-	sys-power/upower[introspection]
-	>=x11-libs/xapp-2.2.0[introspection]
-	x11-misc/xdg-utils
-	x11-themes/adwaita-icon-theme
-	x11-themes/gnome-themes-standard
-
-	nls? (
-		>=gnome-extra/cinnamon-translations-5.0
-	)
-"
-BDEPEND="
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-
-	gtk-doc? ( dev-util/gtk-doc )
-"
-
-PATCHES=(
-	# Fix backgrounds path as cinnamon doesn't provide them
-	# https://github.com/linuxmint/Cinnamon/issues/3575
-	"${FILESDIR}"/${PN}-3.8.0-gnome-background-compatibility.patch
-
-	# Use wheel group instead of sudo (from Fedora/Arch)
-	# https://github.com/linuxmint/Cinnamon/issues/3576
-	"${FILESDIR}"/${PN}-3.6.6-wheel-sudo.patch
-)
-
-src_prepare() {
-	xdg_src_prepare
-
-	# Add polkit agent to required components
-	# https://github.com/linuxmint/Cinnamon/issues/3579
-	sed -i "s/'REQUIRED', '/&polkit-cinnamon-authentication-agent-1;/" meson.build || die
-
-	# shebang fixing craziness
-	local p
-	for p in $(grep -rl '#!.*python3' || die); do
-		python_fix_shebang "${p}"
-	done
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use gstreamer build_recorder)
-		$(meson_use gtk-doc docs)
-		-Ddisable_networkmanager=$(usex networkmanager false true)
-		-Dpy3modules_dir="$(python_get_sitedir)"
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	python_optimize "${D}$(python_get_sitedir)"
-	python_optimize "${ED}"/usr/share/cinnamon/
-
-	# Required for gnome-shell on hardened/PaX, bug #398941
-	pax-mark mr "${ED}"/usr/bin/cinnamon
-
-	# Doesn't exist on Gentoo, causing this to be a dead symlink
-	rm "${ED}/etc/xdg/menus/cinnamon-applications-merged" || die
-
-	# Ensure authentication-agent is started, bug #523958
-	# https://github.com/linuxmint/Cinnamon/issues/3579
-	insinto /etc/xdg/autostart/
-	doins "${FILESDIR}"/polkit-cinnamon-authentication-agent-1.desktop
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-
-	if use gstreamer; then
-		if ! has_version 'media-libs/gst-plugins-good:1.0' || \
-		   ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then
-			ewarn "To make use of Cinnamon's built-in screen recording utility,"
-			ewarn "you need to either install media-libs/gst-plugins-good:1.0"
-			ewarn "and media-plugins/gst-plugins-vpx:1.0, or use dconf-editor to change"
-			ewarn "org.cinnamon.recorder/pipeline to what you want to use."
-		fi
-	else
-		ewarn "Cinnamon's built-in screen recording utility is not installed"
-		ewarn "because gstreamer support is disabled."
-	fi
-}
-
-pkg_postrm() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/cinnamon/cinnamon-5.2.7-r2.ebuild b/gnome-extra/cinnamon/cinnamon-5.2.7-r3.ebuild
index 5237a3b90b2a..d161aeb40ce5 100644
--- a/gnome-extra/cinnamon/cinnamon-5.2.7-r2.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-5.2.7-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9,10} )
+PYTHON_COMPAT=( python3_{8,9,10} )
 PYTHON_REQ_USE="xml"
 
 inherit meson gnome2-utils pax-utils python-single-r1 xdg
@@ -16,7 +16,7 @@ LICENSE="GPL-2+"
 SLOT="0"
 IUSE="+eds +gstreamer gtk-doc +nls +networkmanager"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="
 	${PYTHON_DEPS}
@@ -67,7 +67,7 @@ RDEPEND="
 		dev-python/pycairo[${PYTHON_USEDEP}]
 		dev-python/pygobject:3[${PYTHON_USEDEP}]
 		dev-python/pyinotify[${PYTHON_USEDEP}]
-		dev-python/pypam[${PYTHON_USEDEP}]
+		dev-python/python-pam[${PYTHON_USEDEP}]
 		dev-python/pytz[${PYTHON_USEDEP}]
 		dev-python/requests[${PYTHON_USEDEP}]
 		dev-python/setproctitle[${PYTHON_USEDEP}]
diff --git a/gnome-extra/cjs/Manifest b/gnome-extra/cjs/Manifest
index 12c512c61bff..583e6a48602d 100644
--- a/gnome-extra/cjs/Manifest
+++ b/gnome-extra/cjs/Manifest
@@ -1,5 +1,3 @@
-DIST cjs-5.0.1.tar.gz 602005 BLAKE2B 7592b5b0be8fed1efc9fe1c7baca081515b8010935e24ba0cb1e30ce78890941f5c3b2384ee3846a02c3ba5a50c6d6ce5df232f02507743cf15ac089e29d7f23 SHA512 a341e8deae33baf51ed21ea0b03484ba459d83be8689f3928acbd286ebe878719cdd6b4c576907b08b117b3c5738a11f95d0e37ae21f94ae6b88631fad5d3375
 DIST cjs-5.2.0.tar.gz 601982 BLAKE2B 99fe183add425e5178863aa6b0af6aa0579de0dabee72ad9bcc86e2edf0ad13093ce659ac60ed365edb33ff1eb54d54766a7e0df1a65aa64b7da34e5559297c7 SHA512 0ce5cc07be036fa9af93c7d98a179881789f883578a2034c3c28255ef9da96d32b4203fc39311eaea0bdbe5148f13920d72dd24acb717c4e60302b390097a825
-EBUILD cjs-5.0.1.ebuild 1493 BLAKE2B da585af0e9f2aa1ac2f85c289429446e4d64d56e01bddf9c445fe256a33ea60d4fccb123f3d4559861c178ab3ebf75dd7150ede71d61d50b0ebc73a3b4f94a0d SHA512 b816b83e782d770067b8d2f994e615eb03c566ade69be43ad1988953885be31f57be11fad3cd1cd31c4d43d3cce331cab379b0fd79d6dd00f6bd914847f1af2c
-EBUILD cjs-5.2.0.ebuild 1498 BLAKE2B 5129b3878c0e02f0c706ba315a2aa916bda4708dca6a1b07e9d72d1ddadc4c6e4debffd39cdf20a234bb6625937b456c6c57b6225da4a9974f6d9aeb9d3c73a3 SHA512 b035f955c4f66df8f416a82fc0aa5f8a22aefa5bc5f9a30a9e588ba43ac7dc920118c54a1c0b0e83acd7f36526c7ff039b64edae64902bfe052a26b768ce7238
+EBUILD cjs-5.2.0.ebuild 1496 BLAKE2B c73308067e90622a3f554737a205c44719ea368f7515715d1742c3365694b5a62555362d1cde894f6daf60a645bcc2f413b380d693d3ff5fa1c61e64fe4ca43b SHA512 f0785ecb4b441aebfd4ba67dec08ee10ab8809eaafc510018873bbaf6fc4b6c2624e3060ae052f3969553dadefb6b6442f07f323888d153c44ffd1c6a9ace580
 MISC metadata.xml 608 BLAKE2B 7cc55145357fc7b4b46e1a77f19570b60f5dc6207c81efc3b92adf7d5fdb025296d4e6b8b927f193ed7bd0a929274e61c9bdddad2371ca78a497b94fdbe87737 SHA512 672923005e936fd3d08367a8db65318f63217841e6f841623d469c21ce354724f6c2cea853ecca928280b21011d6aa0e133a7830841c9fa44dd8c36402b28066
diff --git a/gnome-extra/cjs/cjs-5.0.1.ebuild b/gnome-extra/cjs/cjs-5.0.1.ebuild
deleted file mode 100644
index cc39b0d608f5..000000000000
--- a/gnome-extra/cjs/cjs-5.0.1.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
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit meson pax-utils python-any-r1 virtualx
-
-DESCRIPTION="Linux Mint's fork of gjs for Cinnamon"
-HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cjs"
-SRC_URI="https://github.com/linuxmint/cjs/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
-SLOT="0"
-IUSE="+cairo examples readline sysprof test"
-KEYWORDS="amd64 ~arm64 ~riscv x86"
-
-RDEPEND="
-	dev-lang/spidermonkey:78
-	>=dev-libs/glib-2.58.0:2
-	>=dev-libs/gobject-introspection-1.58.3:=
-	>=dev-libs/libffi-3.2.1:0=
-
-	cairo? ( x11-libs/cairo[glib,X] )
-	readline? ( sys-libs/readline:0= )
-"
-DEPEND="
-	${RDEPEND}
-	sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 )
-	test? (
-		sys-apps/dbus
-		x11-libs/gtk+:3[introspection]
-	)
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-	python_fix_shebang build
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_feature cairo)
-		$(meson_feature readline)
-		$(meson_feature sysprof profiler)
-		-Dinstalled_tests=false
-		$(meson_use !test skip_dbus_tests)
-		$(meson_use !test skip_gtk_tests)
-	)
-	meson_src_configure
-}
-
-src_test() {
-	virtx meson_src_test
-}
-
-src_install() {
-	meson_src_install
-
-	if use examples; then
-		docinto examples
-		dodoc "${S}"/examples/*
-	fi
-
-	# Required for cjs-console to run correctly on PaX systems
-	pax-mark mr "${ED}/usr/bin/cjs-console"
-}
diff --git a/gnome-extra/cjs/cjs-5.2.0.ebuild b/gnome-extra/cjs/cjs-5.2.0.ebuild
index bf8e76b942a0..63325e9d3c4b 100644
--- a/gnome-extra/cjs/cjs-5.2.0.ebuild
+++ b/gnome-extra/cjs/cjs-5.2.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/linuxmint/cjs/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
 SLOT="0"
 IUSE="+cairo examples readline sysprof test"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~riscv x86"
 
 RDEPEND="
 	dev-lang/spidermonkey:78
diff --git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest
index 34c98997661d..59bec445a3cb 100644
--- a/gnome-extra/evolution-data-server/Manifest
+++ b/gnome-extra/evolution-data-server/Manifest
@@ -2,6 +2,8 @@ AUX 3.36.5-gtk-doc-1.32-compat.patch 1016 BLAKE2B 6458aa6e2bb41ce07bf74910ef36aa
 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
 MISC metadata.xml 850 BLAKE2B f3e730c63794d5890e76c1f2c7e388b1d6320fc6ef64fa405365a27e7d3883fd09b9cfd875ef0d774bdd51eae5237fff0fd7bd1e6be81a2e0d9252e0b1263afe SHA512 8657f87116f9ad70c24711f270f7b71a57e48bb4f9a8780900f9f6d3da550d0f7b6ae2da453ff6bb76ffd948935f534fdb4b3545a46b0129fbae68a8d1fcecdb
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
new file mode 100644
index 000000000000..768bfb30adc4
--- /dev/null
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.44.1.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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.91.0:4= )
+"
+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_setup
+	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)
+		-DWITH_GWEATHER4=ON
+		-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-ews/Manifest b/gnome-extra/evolution-ews/Manifest
index a7e870adb561..ff500cbc67a6 100644
--- a/gnome-extra/evolution-ews/Manifest
+++ b/gnome-extra/evolution-ews/Manifest
@@ -1,5 +1,7 @@
 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
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/gnome-extra/evolution-ews/evolution-ews-3.44.1.ebuild b/gnome-extra/evolution-ews/evolution-ews-3.44.1.ebuild
new file mode 100644
index 000000000000..478c6401b9f3
--- /dev/null
+++ b/gnome-extra/evolution-ews/evolution-ews-3.44.1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake gnome2 optfeature
+
+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 ~riscv ~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
+}
+
+pkg_postinst() {
+	optfeature "oauth support" gnome-extra/evolution-data-server[oauth]
+}
diff --git a/gnome-extra/filemanager-actions/Manifest b/gnome-extra/filemanager-actions/Manifest
deleted file mode 100644
index 94642388e126..000000000000
--- a/gnome-extra/filemanager-actions/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX fix-desktop-file.patch 1052 BLAKE2B 99e0c5c7a710e71fccaf315af57d3c1717cad9944f5a12d753674dbe0b7c63e45c4cd305a59aa8e303dcdc593e4fa2dfe61a20872a6dc3102341f52063972855 SHA512 8b3bd596ad13c54f6d7f5ee0a6de613df44c560d9db6b3a3a6fe25fce9fed782adfb120a650d8a3b2c4bd2084ace29b6aac5b6e6c7331cc2276fba2c4e48b449
-AUX fix-help-file.patch 1076 BLAKE2B 8689ef4b36cf5a2226b8a8c559d1cbb7e65e21e5a290d137fa6af9ab26427172a1fd8c88f76d79c7fc23f03cb043b531ec50184c75a71ec9f2fb22a73713739a SHA512 ed62712133ac7a25f9524a679d76652dd52c49a213a2fae9e5387848dce366fcb8e257f20267e4f1c8d8002665150dcfc78a0f2d51357fdba909ae98b903ccf0
-DIST filemanager-actions-3.4.tar.xz 3280320 BLAKE2B 140da4441c4408b57ee0e5de04a792b7376eb89e77ea6132b679058af117149f69c1dca0b614f1dd1153f5663b867859d98036bfc3d9b9d313453f1b4ee1510e SHA512 05e47832e5d97a664be617c7ad998ac94022f272369b7d23704f3f809e72f21b5087653ecccda663cca2c61553ebc3d009742004b2c59d3c99af92fa39af2010
-EBUILD filemanager-actions-3.4.ebuild 1975 BLAKE2B cb64bfbc94c111cff38781fece40c5a3fd079c332bbdfb830628ad8e9a70a804171901076ebd8b334af118ef1300470203b682f688d64495ffb9001b9e806c8b SHA512 a090fab0e2145f74f2bcc8151ec70d205e0e2f920900253b228a6ebdb047d8f68434ff4a132b4a2a6dcfb939854a88c9a5c912a69c398020cbb07aca4326ce02
-MISC metadata.xml 496 BLAKE2B e99fe0415eb3d059be68b8682de21a7eb2e52f56282fd7556a776b1ecc0a6464d0bb732803a9e29b4c34b76772e32b9a7210c214990397655c0acc9838ba1e4a SHA512 c134f60f11433867c8e00ac34e11ecd17ab632da8e8794eea523bc5367d323aafdab02b4e6f994701d7266d8ba2bdf2693adb4c9a1144ab044e851d62a93cb14
diff --git a/gnome-extra/filemanager-actions/filemanager-actions-3.4.ebuild b/gnome-extra/filemanager-actions/filemanager-actions-3.4.ebuild
deleted file mode 100644
index 397e5f5cdc0e..000000000000
--- a/gnome-extra/filemanager-actions/filemanager-actions-3.4.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-
-DESCRIPTION="File manager extension which offers user configurable context menu actions"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/filemanager-actions"
-
-LICENSE="GPL-2+ FDL-1.3"
-SLOT="3"
-KEYWORDS="amd64 x86"
-IUSE="caja +nautilus nemo"
-REQUIRED_USE="|| ( caja nautilus nemo )"
-
-RDEPEND="
-	>=x11-libs/gtk+-3.4.1:3
-	>=dev-libs/glib-2.32.1:2
-	>=gnome-base/libgtop-2.28.4:2
-	>=dev-libs/libxml2-2.7.8:2
-	sys-apps/util-linux
-	nautilus? ( >=gnome-base/nautilus-3.4.1 )
-	nemo? ( >=gnome-extra/nemo-1.8 )
-	caja? ( >=mate-base/caja-1.16.0 )
-	x11-libs/gdk-pixbuf:2
-"
-DEPEND="${RDEPEND}
-	app-text/gnome-doc-utils
-	dev-util/gdbus-codegen
-	>=dev-util/intltool-0.50.2
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/fix-desktop-file.patch
-	"${FILESDIR}"/fix-help-file.patch
-)
-
-src_prepare() {
-	# install docs in /usr/share/doc/${PF}, not ${P}
-	sed -i -e "s:/doc/@PACKAGE@-@VERSION@:/doc/${PF}:g" \
-		Makefile.{am,in} \
-		docs/Makefile.{am,in} \
-		docs/manual/Makefile.{am,in} || die
-	# Don't install HTML manual, there's already ghelp manual in /usr/share/gnome/help, opened in yelp via F1
-	sed -i -e "s|install-data-local: install-manuals|install-data-local:|g" docs/manual/Makefile.{am,in} || die
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-docs \
-		--enable-deprecated \
-		--disable-gconf \
-		$(use_with caja) \
-		$(use_with nautilus) \
-		$(use_with nemo)
-}
-
-src_install() {
-	gnome2_src_install
-	# Do not install files we don't really want in docdir
-	rm -v "${ED}usr/share/doc/${PF}"/COPYING* || die
-	rm -v "${ED}usr/share/doc/${PF}"/INSTALL* || die
-	rm -v "${ED}usr/share/doc/${PF}"/objects-hierarchy.odg* || die
-	# Currently empty AUTHORS (but newline including, so it doesn't get automatically deleted) - this is not the case in next release after 3.4
-	rm -v "${ED}usr/share/doc/${PF}"/AUTHORS* || die
-}
diff --git a/gnome-extra/filemanager-actions/files/fix-desktop-file.patch b/gnome-extra/filemanager-actions/files/fix-desktop-file.patch
deleted file mode 100644
index 73b0bf4b4694..000000000000
--- a/gnome-extra/filemanager-actions/files/fix-desktop-file.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From: Carlos Maddela <e7appew@gmail.com>
-Date: Sat, 1 Dec 2018 03:25:18 +1100
-Subject: Fix desktop file to use correct icon and keywords.
-
-Description: Fix desktop file to use correct icon and keywords.
-Author: Carlos Maddela <e7appew@gmail.com>
-Forwarded: https://gitlab.gnome.org/GNOME/filemanager-actions/merge_requests/2
-Last-Update: 2018-12-04
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
----
- src/ui/fma-config-tool.desktop.in | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/ui/fma-config-tool.desktop.in b/src/ui/fma-config-tool.desktop.in
-index ee0b7c3..b66713d 100644
---- a/src/ui/fma-config-tool.desktop.in
-+++ b/src/ui/fma-config-tool.desktop.in
-@@ -4,6 +4,7 @@ Type=Application
- _Name=FileManager-Actions Configuration Tool
- _Comment=Configure items to be added to the File-Manager context menus
- Exec=fma-config-tool
--Icon=fma-config-tool
-+Icon=filemanager-actions
- Categories=System;FileTools;FileManager;
-+Keywords=file tools;file manager;custom menu;custom action;
- StartupNotify=true
diff --git a/gnome-extra/filemanager-actions/files/fix-help-file.patch b/gnome-extra/filemanager-actions/files/fix-help-file.patch
deleted file mode 100644
index 419fbda91c3b..000000000000
--- a/gnome-extra/filemanager-actions/files/fix-help-file.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From: Carlos Maddela <e7appew@gmail.com>
-Date: Sat, 1 Dec 2018 03:33:29 +1100
-Subject: Launch the correct Gnome help file for spa-config-tool.
-
-Description: Launch the correct Gnome help file for spa-config-tool.
-Author: Carlos Maddela <e7appew@gmail.com>
-Forwarded: https://gitlab.gnome.org/GNOME/filemanager-actions/merge_requests/3
-Last-Update: 2018-12-04
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
----
- src/ui/fma-menu.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/ui/fma-menu.c b/src/ui/fma-menu.c
-index f31037a..deb2d73 100644
---- a/src/ui/fma-menu.c
-+++ b/src/ui/fma-menu.c
-@@ -281,7 +281,7 @@ on_app_help( GSimpleAction *action, GVariant *parameter, gpointer user_data )
- 	g_return_if_fail( user_data && FMA_IS_APPLICATION( user_data ));
- 
- 	error = NULL;
--	gtk_show_uri( NULL, "ghelp:filemanager-actions-config-tool", GDK_CURRENT_TIME, &error );
-+	gtk_show_uri( NULL, "ghelp:fma-config-tool", GDK_CURRENT_TIME, &error );
- 	if( error ){
- 		g_warning( "%s: %s", thisfn, error->message );
- 		g_error_free( error );
diff --git a/gnome-extra/filemanager-actions/metadata.xml b/gnome-extra/filemanager-actions/metadata.xml
deleted file mode 100644
index 143e16b93769..000000000000
--- a/gnome-extra/filemanager-actions/metadata.xml
+++ /dev/null
@@ -1,13 +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>
-<use>
-	<flag name="caja">Install the <pkg>mate-base/caja</pkg> extension</flag>
-	<flag name="nautilus">Install the <pkg>gnome-base/nautilus</pkg> extension</flag>
-	<flag name="nemo">Install the <pkg>gnome-extra/nemo</pkg> extension</flag>
-</use>
-</pkgmetadata>
diff --git a/gnome-extra/gnome-calculator/Manifest b/gnome-extra/gnome-calculator/Manifest
index ab126b01a779..5ad5bccccba1 100644
--- a/gnome-extra/gnome-calculator/Manifest
+++ b/gnome-extra/gnome-calculator/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-calculator-41.1.tar.xz 1046092 BLAKE2B 2c9a8757adcb9858f826f303ebcec44b869e3be95f49d2722e57765f187d725f82dda6b1cac1302640d686fdccebbf5c8565c5bbd064d1d647bc5d23434d55ba SHA512 fc0d5c0744c52cd68f076afa29e3028f4998fe04e2e253d267b0350514ebae72172e90a345db69bc13d4ead2c7679416529d7192a34cfd970c7b2773870b9604
 DIST gnome-calculator-42.0.tar.xz 1200548 BLAKE2B d628b1b112a1f4b42e8bbc696cb5c0f5aca969f0fa999a9367e495d93c2e9e01b7a8669dbc057da4aa019d9fa9ce3612210c35949bd9aab2664ebc413324d6fc SHA512 9c28126321fdbd9c60f4d992a37f3081b46de24eaf1a057373b8b905c4ad218145cfeb629b001094b4b137cafee5dcdeaae3920ca95f2ec2d4fbe8ea1ef1b72e
 EBUILD gnome-calculator-41.1.ebuild 1721 BLAKE2B 09161f86fba2639d75a60137f7ccf149c427234c5b7872621241b6c065d5618cb8b825a31d516ecb8ea3e07b568f00ea5291eeab6511c6e9cf70ca3f3cb6e03c SHA512 f966f823a9ad5825c8049e0336f5615c7893b1694a2c1333c3ec8731d5dd3f47b8e13a73cc789d7e8971a56c4be65e12eb946dd0581ddf4d0e41979f8cd28caa
-EBUILD gnome-calculator-42.0.ebuild 1630 BLAKE2B 55a37186a5f49e2f6116fa1b6a06b54f9c31aa73a743c08b7d8c4f11a24f1f610b21591c55cf4aeb05d50e9a189450d0a30492c67d6475e43b3bbaf2a7d50602 SHA512 aec63a6ea9e1c577b641a838edfdfeea6165bcc0b065e1a8942ac31631276f74de96ee2ef39238fb558cd2576670e57d126d1bdb968f87debd546485784fbea3
+EBUILD gnome-calculator-42.0.ebuild 1662 BLAKE2B 66e6b746213ffeea0a964ab5d859555d48835b646cbb48d7bd0821dd5c573cb289e1d94f7428575df5cb6a528ae851b6270a0ef7c8f3f285bf34140bd6ea1d2b SHA512 2924381ce76385e8e174f327de679890b439379838d408072cba2085061b78b0406ec5d0c931f6a710e1d5190a88194adebfd38101ed81c86a4b2cc91f38b159
 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 fe35f00effcd..6f85775dab64 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"
+KEYWORDS="~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~riscv"
 
 # 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-calendar/Manifest b/gnome-extra/gnome-calendar/Manifest
index 9a64c307b94e..66fcf2229899 100644
--- a/gnome-extra/gnome-calendar/Manifest
+++ b/gnome-extra/gnome-calendar/Manifest
@@ -1,6 +1,8 @@
 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
 MISC metadata.xml 523 BLAKE2B ac729de842a6c4af26151fe8a6325fd880715ef5bdba87af11d3fa8b39673c13a32d9cfcaf8c13c246640bd63af8391eed13d775840a337b4e5cf85acc779df0 SHA512 0e87a27fdbccd8d5b71a2b0c57a0b1af281f8f4c64da1a7d091825d03ed3bc4897995f705bb2210800c549aee7d038742edcb3874db0fabe2be1e918483f91b2
diff --git a/gnome-extra/gnome-calendar/gnome-calendar-42.1.ebuild b/gnome-extra/gnome-calendar/gnome-calendar-42.1.ebuild
new file mode 100644
index 000000000000..4a5ef1c8dce0
--- /dev/null
+++ b/gnome-extra/gnome-calendar/gnome-calendar-42.1.ebuild
@@ -0,0 +1,49 @@
+# 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="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
+	>=gui-libs/libadwaita-1.0.0:1=
+	>=dev-libs/glib-2.67.5:2
+	>=gui-libs/gtk-4.6.0:4
+	>=dev-libs/libgweather-4.0.0:4=
+	>=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
+"
+
+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-clocks/Manifest b/gnome-extra/gnome-clocks/Manifest
index 53df67047055..c168a9da2caf 100644
--- a/gnome-extra/gnome-clocks/Manifest
+++ b/gnome-extra/gnome-clocks/Manifest
@@ -1,5 +1,5 @@
 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 1122 BLAKE2B 73581f7183e2b6bf9c232c7da9f1db180a048b7357a20c9c965606aa95802fd0d09e6ac973381c988f4b5f061c205e8c6ddadd17f7c09965dec5e2516d6ca555 SHA512 bec845a57ce1eb6b70b34601585f77026368c4a11ac053b574d90a1419d119e0ef409558668b20b2cdb6e2decfbcc969abc60a48184b9bbfafb5fc00a4874e6c
+EBUILD gnome-clocks-42.0.ebuild 1129 BLAKE2B afb41378a0df82ee63cff4b4bbfd8471ffc0d86044c8794f3f30dcff21a79c482545695e9aefa7815a450f22d76ee0ac0865f2446a6fec6b2444836a3e990fb4 SHA512 189de1a1865f4bfc9d1688732dc10752e7b41bd341a102d55372d372abc98c198795e09d7a68784ab4aaec90d3a81932a02a02d521ae31e67532c135acb21fe3
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/gnome-extra/gnome-clocks/gnome-clocks-42.0.ebuild b/gnome-extra/gnome-clocks/gnome-clocks-42.0.ebuild
index 2433248fc543..6c59c7f71b53 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 ~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 c396d8771a60..b3d12fe32c0c 100644
--- a/gnome-extra/gnome-commander/Manifest
+++ b/gnome-extra/gnome-commander/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-commander-1.12.3.1.tar.xz 7530232 BLAKE2B 34a4cabafab52ab6f94619dafac4db87c12909eef22c13d50356dad925f129da182348eabd8993f69ffc398db163f81ec59c9a102530a9b49f7714b5d7c6db68 SHA512 1206d545493deeb2237af6b9026baf6faab2a8f6ae86eb1abb5c2e5ceb6212ad66382d3abd07c89f14271ac8709d14548f0bfe68fb0e11b1779e0c061e0272e5
 DIST gnome-commander-1.14.2.tar.xz 6868340 BLAKE2B 6b6f2a9435b9bb34a0318ddec0c509e1bef58399ce3bc1a77cf8ba6d97d5fec5e001d301e26ec7575e4c5a2f265ad0ca2e08e86f9f8045c04d6f558c17002bde SHA512 bfbc201ecaf6f9c0a71c7eba73f5d6ef9ba88f0ce8dba5d586058d87125bc51fc4b7f5e9752b7003343d686ea83db916ef78adf8c9d0df1e8715a3c88f9d1ce2
-EBUILD gnome-commander-1.12.3.1.ebuild 1409 BLAKE2B f8a11f356842ca79e089465de1cf70f2d75c7208cdd53333b931d682c4165544a69c374b2b1dca2e33d9e19bf2cac214385e5623faec344cb9a63b8f56dc5784 SHA512 a015e2f2ce55ed7988eeeb8658a01a45619d2befe96a77bec3e968719152cf5b78f5f2b45e08f975a96af54734bc2b7531b59d968352519eb921a011b8113d82
-EBUILD gnome-commander-1.14.2.ebuild 1239 BLAKE2B b035d7e0076c3cc7ebbab5f481fd67f908a9b95da9988bc0dcf5d0f396618ff391685fc691e93772b4eeae3adef9c160aa1ec6ea3355412f57679b9a3245b355 SHA512 11fdc4002cd424fb64e83d3fe12a7ce234b6d9692637fa8972e3d17e610b5e02b8acca2884d2aff3173bba70632719f02ec7e531eda0245d3afe2105e53fc685
-MISC metadata.xml 1185 BLAKE2B 8fde07ed3c4ec8e8b149e0caca0786d4ba66af7cfeb58faa5d00dbdb3ced9dcd5207f4eab13016b5b4cd7a522a28abe2d0da71084b5002a945d7b4206ed79e92 SHA512 894ecc4cff87b554aab27e8b65452d6523a3b0e833307537f79463c7637399d60db60de1ed6b34b02d3599a03f14b480ea62f991129404385c58b2bd1e3549b1
+EBUILD gnome-commander-1.14.2.ebuild 1237 BLAKE2B b7cd462bea2d11cd90042a95a4b1522121bf45f2ea2a3d8834ba71f397f2448f0b0e845248eb547f63e075d5a25d59f2901a0efa0209843471d926fe625d231c SHA512 40305dfb2e51557189f36e6542b946e0f134ecac8f1c835f77352f0e0790a2cf719d3fd2ada735c6e71b738085d37fac6b01724bae8c8f2e0df7a6a0fdc40cad
+MISC metadata.xml 1094 BLAKE2B e9a1616e9a5dc1811187299c0265b5e689b475d39d65e1901bb045540214be963c052aec0fd6ca45c7604037bb0c08dc79dbea3e561a0055380a416736ee59b3 SHA512 29f24a064c8193dd8e3c29f9c4c3f57daaaaf11b0425936becbb16fd84af04f9f046bc71ad2ab533c8fb0aafdfc03bc76e2ef9d49b38e5d2b527d0e0dfcb01b1
diff --git a/gnome-extra/gnome-commander/gnome-commander-1.12.3.1.ebuild b/gnome-extra/gnome-commander/gnome-commander-1.12.3.1.ebuild
deleted file mode 100644
index ae817455f405..000000000000
--- a/gnome-extra/gnome-commander/gnome-commander-1.12.3.1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-GNOME2_LA_PUNT="yes"
-
-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="chm exif gsf pdf samba taglib test +unique"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	app-text/yelp-tools
-	dev-libs/atk
-	dev-libs/glib:2
-	gnome-base/gconf:2
-	gnome-base/gnome-vfs
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/harfbuzz:=
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:2
-	x11-libs/pango
-	chm? ( dev-libs/chmlib )
-	exif? ( >=media-gfx/exiv2-0.14 )
-	gsf? ( gnome-extra/libgsf:= )
-	pdf? ( >=app-text/poppler-0.18 )
-	samba? ( gnome-base/gnome-vfs:=[samba] )
-	taglib? ( >=media-libs/taglib-1.4 )
-	unique? ( >=dev-libs/libunique-0.9.3:1 )
-"
-BDEPEND="
-	${RDEPEND}
-	dev-util/gtk-doc-am
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-DEPEND="
-	test? ( >=dev-cpp/gtest-1.7.0 )
-"
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		$(use_with chm libchm) \
-		$(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/gnome-commander-1.14.2.ebuild b/gnome-extra/gnome-commander/gnome-commander-1.14.2.ebuild
index 3cf67a8ee2a4..14c92b2782a1 100644
--- a/gnome-extra/gnome-commander/gnome-commander-1.14.2.ebuild
+++ b/gnome-extra/gnome-commander/gnome-commander-1.14.2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gcmd.github.io/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="exif gsf pdf samba taglib test +unique"
 RESTRICT="!test? ( test )"
 
diff --git a/gnome-extra/gnome-commander/metadata.xml b/gnome-extra/gnome-commander/metadata.xml
index 39ed35773264..f0e845edde9b 100644
--- a/gnome-extra/gnome-commander/metadata.xml
+++ b/gnome-extra/gnome-commander/metadata.xml
@@ -19,7 +19,6 @@
     <remote-id type="freecode">gnome-commander</remote-id>
   </upstream>
   <use>
-    <flag name="chm">Enable metadata support for Microsoft Compiled HTML Help files</flag>
     <flag name="gsf">Add metadata support for OLE, OLE2 and ODF</flag>
     <flag name="unique">Enable single instance support using dev-libs/libunique</flag>
     <flag name="pdf">Add metadata support for PDF</flag>
diff --git a/gnome-extra/gnome-contacts/Manifest b/gnome-extra/gnome-contacts/Manifest
index 6080cd016811..b94f7d723f69 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 1567 BLAKE2B d16d48de63a8a70cb19f6247c67c13ebf507c98566e12fc8b78517cf7b9fa730eab6ea976f841765b527fa938bf9b2348a220266fb955dc47fc70ce13d9b4fab SHA512 ad5b7307d0a744d30b10d063de9cb2a449e099b225b34eef3e66aa8d986495511382c92c31678dbb3d82fb4b016d3795d087fbd79f5205edf869d7aac0ce3dca
+EBUILD gnome-contacts-42.0.ebuild 1616 BLAKE2B 4b7c9863928f80b72c853a5b5e87546b23cbc5f4130e6b3fb2c006455bcb70f0eab60dad899e1c732e55b24c2275931f40b3e10db8a7deb3eeaac82636f12014 SHA512 69a97c113f7c133ee736805bef952b702e4d33239092d688495b3808518a9a54944b51043fdfc1a983dba176d84cf3ec946dc91332b62232f378d844f676d582
 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 c324e25a1c75..6650c92c6962 100644
--- a/gnome-extra/gnome-contacts/gnome-contacts-42.0.ebuild
+++ b/gnome-extra/gnome-contacts/gnome-contacts-42.0.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=8
 PYTHON_COMPAT=( python3_{8..10} )
+VALA_MIN_API_VERSION="0.54"
 
 inherit gnome.org gnome2-utils meson python-any-r1 vala xdg
 
@@ -12,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Design/Apps/Contacts"
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE="telepathy"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv"
 
 VALA_DEPEND="
 	$(vala_depend)
diff --git a/gnome-extra/gnome-search-tool/Manifest b/gnome-extra/gnome-search-tool/Manifest
deleted file mode 100644
index ce102bf5697e..000000000000
--- a/gnome-extra/gnome-search-tool/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gnome-search-tool-3.6.0.tar.xz 685172 BLAKE2B dab076a7f03d8d2cf7ebc884f65b737d627e27c67665b44147113aa898667aa84dda4fd5bb1196264e2cc3221c3bb166fc01bad36c5363f0400744d779330387 SHA512 55126e1d49b32015e5bc6db70a7094b3ea72ed447d66f530f72fa057af982faa1dbeae5f179cc3c0ed71fea58f756f47c40809e9d11c68239fa2232352e579a5
-EBUILD gnome-search-tool-3.6.0.ebuild 860 BLAKE2B 0e1046f7fe45123136458bd1182892ccf56197e889414728a3d3e890f96e033862eecc2a59b8561ef62ba86309a309d9c3a7004d3d9d8584d5ad12b5add0f552 SHA512 66c57572e249c9e728582d55c5850597268299e27387831c9b89de6c86b0d079f0ec75cb4cba0194d7e3aa4ae83814407a9363e4c2a67e9edb8857a97db3fbaf
-MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/gnome-extra/gnome-search-tool/gnome-search-tool-3.6.0.ebuild b/gnome-extra/gnome-search-tool/gnome-search-tool-3.6.0.ebuild
deleted file mode 100644
index 92196c5cd582..000000000000
--- a/gnome-extra/gnome-search-tool/gnome-search-tool-3.6.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-
-DESCRIPTION="Search tool for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Attic/GnomeUtils"
-
-LICENSE="GPL-2 FDL-1.1"
-SLOT="0"
-IUSE=""
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-
-COMMON_DEPEND="
-	dev-libs/atk
-	>=dev-libs/glib-2.30:2
-	sys-apps/grep
-	x11-libs/gdk-pixbuf
-	>=x11-libs/gtk+-3:3[X]
-	x11-libs/libICE
-	x11-libs/libSM
-"
-RDEPEND="${COMMON_DEPEND}
-	sys-apps/findutils
-	sys-apps/mlocate
-	!<gnome-extra/gnome-utils-3.4
-"
-# ${PN} was part of gnome-utils before 3.4
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-"
-
-src_configure() {
-	G2CONF="${G2CONF} ITSTOOL=$(type -P true)"
-	gnome2_src_configure
-}
diff --git a/gnome-extra/gnome-search-tool/metadata.xml b/gnome-extra/gnome-search-tool/metadata.xml
deleted file mode 100644
index 7b343b06be8a..000000000000
--- a/gnome-extra/gnome-search-tool/metadata.xml
+++ /dev/null
@@ -1,8 +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>
-</pkgmetadata>
diff --git a/gnome-extra/gnome-shell-extension-alphabetical-grid/Manifest b/gnome-extra/gnome-shell-extension-alphabetical-grid/Manifest
index ca36bb31f48d..2b125bd663a1 100644
--- a/gnome-extra/gnome-shell-extension-alphabetical-grid/Manifest
+++ b/gnome-extra/gnome-shell-extension-alphabetical-grid/Manifest
@@ -1,6 +1,8 @@
 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
+EBUILD gnome-shell-extension-alphabetical-grid-23.0.ebuild 1385 BLAKE2B efb9b1538244fd377e7f352cc17c68c668d4baecafc8c0ca90d52c9e22653876aabc2aad98aee489a1d6152a4fd2d04b9056dc3b3c5b91b04050966f9e41e0eb SHA512 2b7a39796b6ba90f538d6ef6225fd7d327240f63828f1d40ff65ebd80f754784a58154431a65a5fdeb6fdb46e514ec13dc9343f739ed3b4eb655075407c7602c
 MISC metadata.xml 241 BLAKE2B cb0374238d11e2a3f28f23b7049da09babd4310a99862738acfb7ba554f7758ac68cd09d1eb7a29068195c27010a846a540ed2c09b88fd043b37fb4f0762150f SHA512 b2c1d3e2cb6760ed4682da82af5370adcacd48afd558efa1abf84d955067b2ad32eda034af8cef95c71409622f97fa0113f2e07bee328f2d03512908ae931050
diff --git a/gnome-extra/gnome-shell-extension-alphabetical-grid/gnome-shell-extension-alphabetical-grid-23.0.ebuild b/gnome-extra/gnome-shell-extension-alphabetical-grid/gnome-shell-extension-alphabetical-grid-23.0.ebuild
new file mode 100644
index 000000000000..f52096ee48db
--- /dev/null
+++ b/gnome-extra/gnome-shell-extension-alphabetical-grid/gnome-shell-extension-alphabetical-grid-23.0.ebuild
@@ -0,0 +1,59 @@
+# 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
+	mv docs/icon.svg extension || die
+	cd extension || die
+	insinto /usr/share/glib-2.0/schemas
+	doins schemas/*.xml
+	rm -rf schemas || die
+	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-bing-wallpaper/Manifest b/gnome-extra/gnome-shell-extension-bing-wallpaper/Manifest
index 163a4fb38739..74975f7e720a 100644
--- a/gnome-extra/gnome-shell-extension-bing-wallpaper/Manifest
+++ b/gnome-extra/gnome-shell-extension-bing-wallpaper/Manifest
@@ -1,5 +1,7 @@
 DIST gnome-shell-extension-bing-wallpaper-37.tar.gz 6798688 BLAKE2B 9dd8e651905f2b90848bd416d222667aa528994d3d06ddc180926efc603670346513270d588be85aefc62b9c85986e5913441d643e399c1384fd6996b1cfdfc2 SHA512 1c75ff6a6068232c9be717018b93a3bc8810e6dd1b446d9dbe4cc77beecb34a35ed3d6a9904f68b3d2d4487f45f2eccee03379f1abe4f8b351642b75411d5adc
 DIST gnome-shell-extension-bing-wallpaper-39.tar.gz 6802966 BLAKE2B 262db45ef1eef37f750b502a9421d8c3052cd0f791f75f8398ed72c32867296698d2acf57a1b68c5044e7568d88a432c70ca07b4d90322d97633d55b6e3da307 SHA512 dec835098409a50ebbdb553103b7492a689135c52a74d031fa46995603d939beb1ccac232f29932e6e600e644f4d19c1c2b1b3442d3fb4ea6158671a009f655e
+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
 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
new file mode 100644
index 000000000000..c57276c6cfd2
--- /dev/null
+++ b/gnome-extra/gnome-shell-extension-bing-wallpaper/gnome-shell-extension-bing-wallpaper-40.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit gnome2-utils
+
+DESCRIPTION="Changes your wallpaper daily to the bing.com background image"
+HOMEPAGE="https://github.com/neffo/bing-wallpaper-gnome-extension"
+SRC_URI="https://github.com/neffo/bing-wallpaper-gnome-extension/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-libs/glib:2
+	app-eselect/eselect-gnome-shell-extensions
+	>=gnome-base/gnome-shell-3.36
+"
+DEPEND=""
+BDEPEND=""
+
+S="${WORKDIR}/bing-wallpaper-gnome-extension-${PV}"
+extension_uuid="BingWallpaper@ineffable-gmail.com"
+
+src_install() {
+	einstalldocs
+	rm -f README.md LICENSE || die
+	insinto /usr/share/glib-2.0/schemas
+	doins schemas/*.xml
+	rm -rf schemas
+	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-bluetooth-quick-connect/Manifest b/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/Manifest
index 4fd3f451e296..353e6edc321f 100644
--- a/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/Manifest
+++ b/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/Manifest
@@ -1,5 +1,7 @@
 DIST gnome-shell-extension-bluetooth-quick-connect-26.tar.gz 22163 BLAKE2B 7a0ab7bd1090a1a4f9736b33fd31e26da358212b62c0b9dfb13f4c009faeffc85c294f59e9d91bd21302e9dbc7c00146e5cd2c625ed982ef5e330e70be20f001 SHA512 9f1360a6b1c6f714923277159275aa87ea78a234b58e01d6804e122fd5f4428664c95bbd43c99e54117811676bb26a85658abdc58d4ab60fb6e37ae34877ab6a
 DIST gnome-shell-extension-bluetooth-quick-connect-27.tar.gz 22088 BLAKE2B 332a2ca33a6635484d43829275ff284f5117f04eeb7e25136ff52ebbb97759a4f04a48b5aa84a44cc7234129f84f71693cbe6febfef9081581a3f986395e7a92 SHA512 b81bd8a978b7ac672f04e3621c3cb195e027e44b15ac3c37f624e9014ccf7f20e5d4e6cebef1ed2607cd141e958d4c25b1663de9bc0b7aa904216b5f66fc6ef2
+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
 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
new file mode 100644
index 000000000000..a485c63f1867
--- /dev/null
+++ b/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/gnome-shell-extension-bluetooth-quick-connect-29.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit gnome2-utils
+
+DESCRIPTION="Allow to connect bluetooth paired devices from gnome control panel"
+HOMEPAGE="https://github.com/bjarosze/gnome-bluetooth-quick-connect"
+SRC_URI="https://github.com/bjarosze/gnome-bluetooth-quick-connect/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+IUSE=""
+
+RDEPEND="
+	net-wireless/bluez
+	app-eselect/eselect-gnome-shell-extensions
+	>=gnome-base/gnome-shell-40
+"
+DEPEND="${COMMON_DEPEND}"
+BDEPEND=""
+
+S="${WORKDIR}/${P/shell-extension-}"
+extension_uuid="bluetooth-quick-connect@bjarosze.gmail.com"
+
+src_install() {
+	einstalldocs
+	insinto /usr/share/glib-2.0/schemas
+	doins schemas/*.xml
+	rm -rf README.md LICENSE Makefile schemas || die
+	insinto /usr/share/gnome-shell/extensions/"${extension_uuid}"
+	doins -r *
+	dosym ../../../../../usr/share/glib-2.0/schemas /usr/share/gnome-shell/extensions/"${extension_uuid}"/schemas
+}
+
+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/Manifest b/gnome-extra/gnome-shell-extension-dash-to-panel/Manifest
index 4c106ccafbf3..b25351819544 100644
--- a/gnome-extra/gnome-shell-extension-dash-to-panel/Manifest
+++ b/gnome-extra/gnome-shell-extension-dash-to-panel/Manifest
@@ -1,7 +1,11 @@
 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
 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-47.ebuild b/gnome-extra/gnome-shell-extension-dash-to-panel/gnome-shell-extension-dash-to-panel-47.ebuild
new file mode 100644
index 000000000000..68b544af2082
--- /dev/null
+++ b/gnome-extra/gnome-shell-extension-dash-to-panel/gnome-shell-extension-dash-to-panel-47.ebuild
@@ -0,0 +1,74 @@
+# 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
new file mode 100644
index 000000000000..68b544af2082
--- /dev/null
+++ b/gnome-extra/gnome-shell-extension-dash-to-panel/gnome-shell-extension-dash-to-panel-50.ebuild
@@ -0,0 +1,74 @@
+# 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-desktop-icons-ng/Manifest b/gnome-extra/gnome-shell-extension-desktop-icons-ng/Manifest
index 5c9add85a367..1c50d26087ed 100644
--- a/gnome-extra/gnome-shell-extension-desktop-icons-ng/Manifest
+++ b/gnome-extra/gnome-shell-extension-desktop-icons-ng/Manifest
@@ -1,7 +1,9 @@
 DIST ding-0.24.0.tar.xz 101020 BLAKE2B a0f6b276cf41113dbee92ee6e34da3ffbf8f614765874b1185c226ddd350a2b63f369bdb40f71677444694a4083b34765f63eda09761bd3690355d5df6f97173 SHA512 0d066abb3e25cc2dacf593a1f05b14937394a89254bc541311c32f5206782e1d80be82cd1eee567809aee9bc0e3e80206eeae81119e72d444b965a2daf341493
 DIST ding-38.0.tar.xz 114328 BLAKE2B da825e08d4078ae8a1218fa7f404bccdf5bd9883e87a460eac2224457791928fe9819f0c1335cbef87a204b72806b82b28368ad9eb642f3dd99db45a0d0b455e SHA512 b46f75044d8dc3e9fb79f8fbc1a25ccdb69882955b946ce45c606bdd34b3d86dc2f5f1698d5d34735024a1ae333cc5267acc5f9219a312758c2e636bcaa45ece
 DIST ding-43.0.tar.xz 122712 BLAKE2B 17e0b8de53cc4e33dd36a06583b6887aef8b3280ffbbe3dbf2a278afd971ba65cd84dd3c6e3db782024a9ec8ce592bb8f1e32a3c2080630f8d0b1a5724b691e2 SHA512 ba6450789a7ca73cbadf7d3c546f8b6a4b14474ec5d1e7e850dca5aa4f15f7372978dd9f3aa18d0134bf94580828736aa73decbb3c41f607cf5eb230f34964e4
+DIST ding-45.0.tar.xz 127368 BLAKE2B 28d77192adf83d47e382ce647d2b4fc635bf3ebdd975aeb82695f22cd95b08272530eea4728dba14ca972abddf086abd053dd093895a16f6de4ee6ecd94e910e SHA512 73f9e4a37d914467197d61af7fb2b106fa2c129392520a87a23d471f1aad5f95e01900ed738688543760d971589a50b1a9c05a19eaa722a72d56ff3b9578edf8
 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
 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
new file mode 100644
index 000000000000..80654c86f352
--- /dev/null
+++ b/gnome-extra/gnome-shell-extension-desktop-icons-ng/gnome-shell-extension-desktop-icons-ng-45.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit gnome2-utils meson
+
+MY_PN="ding"
+MY_P="${MY_PN}-${PV}"
+COMMIT="eaa0b5e8e61258bd108897fc2fbd2da2"
+
+DESCRIPTION="Fork from the desktop-icons project, with several enhancements like Drag'n'Drop"
+HOMEPAGE="https://gitlab.com/rastersoft/desktop-icons-ng"
+SRC_URI="https://gitlab.com/rastersoft/desktop-icons-ng/uploads/${COMMIT}/${MY_P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="dev-libs/glib:2"
+RDEPEND="${COMMON_DEPEND}
+	app-eselect/eselect-gnome-shell-extensions
+	>=gnome-base/gnome-shell-3.38
+	>=gnome-base/nautilus-3.38
+"
+DEPEND="${COMMON_DEPEND}"
+BDEPEND=""
+
+S="${WORKDIR}/${MY_P}"
+extension_uuid="ding@rastersoft.com"
+
+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-weather-in-the-clock/Manifest b/gnome-extra/gnome-shell-extension-weather-in-the-clock/Manifest
index 59a62565bbc4..37972ade7b45 100644
--- a/gnome-extra/gnome-shell-extension-weather-in-the-clock/Manifest
+++ b/gnome-extra/gnome-shell-extension-weather-in-the-clock/Manifest
@@ -1,4 +1,6 @@
 DIST gnome-shell-extension-weather-in-the-clock-20211108.tar.gz 127000 BLAKE2B 9c884b7bf093ef29fcd1cf3aa58accb4d5f70fa38bf9bd0cc0cfb81564952de9c6b9f1dbead26dd3902cc09d3be42f30c8e813a8fecb33c3753f45abe833974e SHA512 bb16b470f9d0d7fdcd90d5ec4a2723a97d808d8341c816aacd973390201c5e63a71aec51efc9953903a70ad964e406a104b9029c3c08b25b7a333de3e673dd6e
+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
 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
new file mode 100644
index 000000000000..063eb74bb8bb
--- /dev/null
+++ b/gnome-extra/gnome-shell-extension-weather-in-the-clock/gnome-shell-extension-weather-in-the-clock-20220504.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit gnome2-utils
+
+DESCRIPTION="Display the current weather in the clock"
+HOMEPAGE="https://github.com/JasonLG1979/gnome-shell-extension-weather-in-the-clock"
+COMMIT="4c8dbc0831515e1b22d9b37601e83cebc2cc127d"
+SRC_URI="https://github.com/JasonLG1979/gnome-shell-extension-weather-in-the-clock/archive/${COMMIT}.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
+	gnome-extra/gnome-weather
+"
+DEPEND=""
+BDEPEND=""
+
+extension_uuid="weatherintheclock@JasonLG1979.github.io"
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+src_compile() { :; }
+
+src_install() {
+	einstalldocs
+	insinto /usr/share/gnome-shell/extensions/
+	doins -r "${extension_uuid}"
+}
+
+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-extensions/Manifest b/gnome-extra/gnome-shell-extensions/Manifest
index 4724427ca07a..110b7a40b03f 100644
--- a/gnome-extra/gnome-shell-extensions/Manifest
+++ b/gnome-extra/gnome-shell-extensions/Manifest
@@ -1,6 +1,8 @@
 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
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
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
new file mode 100644
index 000000000000..763ce0e49faf
--- /dev/null
+++ b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-42.1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+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."
+
+src_configure() {
+	local emesonargs=(
+		-Dextension_set=all
+		-Dclassic_mode=true
+	)
+	meson_src_configure
+}
+
+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-software/Manifest b/gnome-extra/gnome-software/Manifest
index 38629d108383..053172ab2a8e 100644
--- a/gnome-extra/gnome-software/Manifest
+++ b/gnome-extra/gnome-software/Manifest
@@ -1,3 +1,7 @@
 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
 MISC metadata.xml 579 BLAKE2B 4ac8aea21122da6a03605961d9f47721a06a4c49ffdc1ffa16eee5a473f5e5957c69760ee7d19e087688fe2b479a16f4cf417cbe0e2d3e149b0339881fecd2fc SHA512 3f783e0f7fbec5a95f498d622885de19babf8f786a66af2d3755907d242df0433a910b07c2628854ed1038920417d7d28c35c10f18adfcbd37e8922aa3c9253d
diff --git a/gnome-extra/gnome-software/gnome-software-42.0.ebuild b/gnome-extra/gnome-software/gnome-software-42.0.ebuild
new file mode 100644
index 000000000000..8ef94587b026
--- /dev/null
+++ b/gnome-extra/gnome-software/gnome-software-42.0.ebuild
@@ -0,0 +1,102 @@
+# 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.1.ebuild b/gnome-extra/gnome-software/gnome-software-42.1.ebuild
new file mode 100644
index 000000000000..8ef94587b026
--- /dev/null
+++ b/gnome-extra/gnome-software/gnome-software-42.1.ebuild
@@ -0,0 +1,102 @@
+# 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-utils/Manifest b/gnome-extra/gnome-utils/Manifest
deleted file mode 100644
index 7d06fc7b24f2..000000000000
--- a/gnome-extra/gnome-utils/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD gnome-utils-3.8.0-r1.ebuild 568 BLAKE2B ab8276d519d84cf7d3b4b125c8ff5c2c26a793164ff5d05ebf56a9956992cf57280dba6b4ffb76ad3933e72c04998ac864677b78e6bc84a7c9aebea4cbb30612 SHA512 d6f39e837a286ab6146af7ca037dfa8aebf9a638cd8eecf4d491cac74102e8cb75a6e93452f746f0d261d18a6ba05b4e7545f0377634cc49f034a5d02df81b21
-MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/gnome-extra/gnome-utils/gnome-utils-3.8.0-r1.ebuild b/gnome-extra/gnome-utils/gnome-utils-3.8.0-r1.ebuild
deleted file mode 100644
index adf4dba36c74..000000000000
--- a/gnome-extra/gnome-utils/gnome-utils-3.8.0-r1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Meta package for utilities for the GNOME desktop"
-HOMEPAGE="https://wiki.gnome.org/Apps/Attic/GnomeUtils"
-
-LICENSE="metapackage"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=app-admin/gnome-system-log-${PV}
-	>=app-dicts/gnome-dictionary-${PV}
-	>=gnome-extra/gnome-search-tool-3.6.0
-	>=media-gfx/gnome-font-viewer-${PV}
-	>=media-gfx/gnome-screenshot-${PV}
-	>=sys-apps/baobab-${PV}
-"
diff --git a/gnome-extra/gnome-utils/metadata.xml b/gnome-extra/gnome-utils/metadata.xml
deleted file mode 100644
index 7b343b06be8a..000000000000
--- a/gnome-extra/gnome-utils/metadata.xml
+++ /dev/null
@@ -1,8 +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>
-</pkgmetadata>
diff --git a/gnome-extra/libgda/Manifest b/gnome-extra/libgda/Manifest
index 7c0eb482535e..be9adedd4e4c 100644
--- a/gnome-extra/libgda/Manifest
+++ b/gnome-extra/libgda/Manifest
@@ -3,5 +3,5 @@ AUX libgda-4.99.1-gda-browser-doc-collision.patch 914 BLAKE2B a8dc2b9359aaf3f749
 AUX libgda-5.2-my_bool-error.patch 5804 BLAKE2B 85068c8d3164bb9fd6d5c26bd144cc389f3e7df28c56163dd3294fed2a1e709674031e0bb903aa8f111010d6682c7aef26692b1e16821f2a9002106eb8a250db SHA512 33a734e4f21364d4657db1347022129eef48b9b7cebd3743445963c74fb2d1b1043927c52a2e165db966df595a1b69dfcc8d9f3b2cddf328291bc7976273ecef
 AUX libgda-5.2.9-redefine-bool-error.patch 1223 BLAKE2B eafc8884016c98d673d4da347452a82e558a11d20143d19ce1a40926a8348af507a839010c342dad37f345efb6c7770d6ad2429ca26a310af67dd65e0166af25 SHA512 7ec9d88f7b0de2980c8e2f8a17f00eff26b279c46f938bff8dc3ba5c8e3c106bc778e65bdb078a30b9615bcf2497d4974bef4205cb51347fb50ceb6ac6ceb43c
 DIST libgda-5.2.9.tar.xz 12619160 BLAKE2B b82c304f6054a1de24b72e688fc03a7a9b416f14f47c95087c4901b7bce0ea5c642667feb14f1701bc62403359c752f3f5b121a697316340829af64b83fb7980 SHA512 a28324533298d42aacfce5d9f3d699314ddb5d5fe7e492433dbbe4232fb310b798d312ac08dffd4f4ebef5ceea3c6c49ef3c679ab97b5e9d1f64e3fed50b2231
-EBUILD libgda-5.2.9.ebuild 4675 BLAKE2B a491354c7e8dd81dc510b2458ee0a7ffe8cbfdd7744465108ea72402ad2ff9ae65b7784f30d1182294d48bdfe30843565413025db687379bf84b1a1551a4b6f7 SHA512 5e62421272b0e495e2396e5d6f0cd8da3c02837fd0e70422f7826de5439d199616f8a9f21be767e446e40e4d97d5616a044e272d14c1cb94e27859c91d81445b
+EBUILD libgda-5.2.9.ebuild 4682 BLAKE2B bf5408ba52ed13bb9727f31f63762d8a0cdd4d98084a5e978b3502ccd7a5edb91330223616d490c49d979cff4b16d61f8a30ecd71f0150e0f8bb6852c6ce2f5e SHA512 1220bb7b6f0e13daf9db6f2f4d7c72b2a5027b0764b339c7b0290fd354e9eeb153f549b26653aa5d5c472e4c7d664ec420bce77d855cad4d27569092856ac2a8
 MISC metadata.xml 683 BLAKE2B f0a94d1eecbd3715d628dce3f5411f13bc70204beac9204c41a2e0cb68333b391b008b047d97be4a8a5458d318d992766029886d78e21b1e014845f0ee448d5d SHA512 09479faba765f287c36e5eda88c491c7b144260936dddd3fe526cde175f67ed9c3db223d2328eeac150e7648889ef9476f5608a78b3670033a8c284c4ffcae01
diff --git a/gnome-extra/libgda/libgda-5.2.9.ebuild b/gnome-extra/libgda/libgda-5.2.9.ebuild
index 9a3fb0517f99..c32450ceda62 100644
--- a/gnome-extra/libgda/libgda-5.2.9.ebuild
+++ b/gnome-extra/libgda/libgda-5.2.9.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=6
@@ -22,7 +22,7 @@ REQUIRED_USE="
 # firebird license is not GPL compatible
 
 SLOT="5/4" # subslot = libgda-5.0 soname version
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	app-text/iso-codes
diff --git a/gnome-extra/nemo-fileroller/Manifest b/gnome-extra/nemo-fileroller/Manifest
index 4a5970e2c639..ff46eb4c8aeb 100644
--- a/gnome-extra/nemo-fileroller/Manifest
+++ b/gnome-extra/nemo-fileroller/Manifest
@@ -1,6 +1,3 @@
-AUX nemo-fileroller-5.0.1.patch 601 BLAKE2B 2289ab468b6cec08c4ec71bf7e7d8165b8e6420c1e787a9b227204c6333b9bdbe06b595d3227d2ab1b142516f177547a5f2ca4bb30b71df9adc59ce2d8dda421 SHA512 0f43d2de1527110c3f0dabcb5d589aacf23422ee205238d1e117958918c76abedc4c701435d20b78766a8311ce1cbe026ccc1b0fea94e48c0c11272f92e9ec9c
-DIST nemo-extensions-5.0.0.tar.gz 533061 BLAKE2B 4ff38064eb839cc13fd1a3610c3a8fda3e79447fc1e7355ba4fa7e13747b45a65ac9e572e02e4c5f4230f3bc089aa98339ef3bb4308a1fe145efede07cfaf587 SHA512 bd52404831960de820b4232b3a01c618e35e9be23dc2877f6c0e9462e377e2e72b5a0e61010f8767548cb6c8f2bbb3b555944f84741678720fb5ee1ae17202f7
 DIST nemo-extensions-5.2.0.tar.gz 533607 BLAKE2B 0c9ca96e2ac57a42765f3b598d4681e1f8a00b7804edd0ae500e80ce8d013f3fcdfafdd1ccba7d13d33639e6128aed54b5909baa463c040fd88d64d56d14dcdd SHA512 deaf8c8582119f75b13f65dd60e8b5a2db68dece6a3237e2d31c11adf35ca8fc3ea9b16d53b21a0ddb3772759b8a8993779da6e9ee4cf765889515fdcb03998d
-EBUILD nemo-fileroller-5.0.1.ebuild 691 BLAKE2B b32aaf409f38768f5869d860e325a75a676a8559f151814f22a2e420bd32027c9d0fcb9e35ec83f7f97f81e45ea3bb46dfe3680c89541dadd0b97c8f45332a44 SHA512 644012503833720bbf41851cc402d2af4ab83fd19b8fec7e550704b74c5402fe9a9beb448332ac59d3f655d1e0edd4bda9680de8418f7db1217635044d6fa090
-EBUILD nemo-fileroller-5.2.0.ebuild 590 BLAKE2B 5014dc6708b99063cb221e195880a9e2d077494711d231acced9d4655994615dae3b116bf5f0b8c84a3489c696f771e3cc5a65ff9d445ac2c064eabf4de9d7dc SHA512 fadae2004f07338ce1ee9a46309f373e90b9926f6f6932a52507c5b7a946991deada298f7eb86b4ab3177daec1245c4587c3a7b47a1cd7b4b42c5ded5164fbfc
+EBUILD nemo-fileroller-5.2.0.ebuild 588 BLAKE2B b20c73d1b54933dc51801eaf1177b42010efa648880ed4a871305f12f7580315c0ba7dd2cb48a23d75bf248e6573350ed6703a3bf5d2433a11728f50b9fbee95 SHA512 d016c4912d5bcfee5b52c0fe5d4ee9dbfab3b0b625c9adc71257f5a46918127aae1de5b70e915e478076aebc01701a4d44ab5990cda010139e908e202b65789f
 MISC metadata.xml 495 BLAKE2B 448c4a1b019897c3d8098b970e31849035b0125b707ac744eb668f7d295c76de0f121235edd1e76dc931051ccee1a508897679845dadfea04baf3d832baac5a5 SHA512 c86fa92ffb7d82826c4188c1ac63131fce88b40f5b9e13e2ef3162b3c83cc2d7cb6968c0e3e894a93e685cac818b7284072c55a4e8114dd44636a4678c415702
diff --git a/gnome-extra/nemo-fileroller/files/nemo-fileroller-5.0.1.patch b/gnome-extra/nemo-fileroller/files/nemo-fileroller-5.0.1.patch
deleted file mode 100644
index 814a076b5499..000000000000
--- a/gnome-extra/nemo-fileroller/files/nemo-fileroller-5.0.1.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/src/fileroller-module.c
-+++ b/src/fileroller-module.c
-@@ -31,10 +31,10 @@
- void
- nemo_module_initialize (GTypeModule*module)
- {
--	nemo_fr_register_type (module);
-+    bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
-+    bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
- 
--	bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
--	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
-+	nemo_fr_register_type (module);
- }
- 
- 
---- a/meson.build
-+++ b/meson.build
-@@ -1,6 +1,6 @@
- project('nemo-fileroller',
-     'c',
--    version: '5.0.0',
-+    version: '5.0.1',
-     meson_version: '>=0.49.0'
- )
- 
diff --git a/gnome-extra/nemo-fileroller/nemo-fileroller-5.0.1.ebuild b/gnome-extra/nemo-fileroller/nemo-fileroller-5.0.1.ebuild
deleted file mode 100644
index 513de21680c3..000000000000
--- a/gnome-extra/nemo-fileroller/nemo-fileroller-5.0.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson
-
-DESCRIPTION="Nemo file-roller integration"
-HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/nemo-extensions"
-SRC_URI="https://github.com/linuxmint/nemo-extensions/archive/5.0.0.tar.gz -> nemo-extensions-5.0.0.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv x86"
-
-DEPEND="
-	>=dev-libs/glib-2.14.0
-	>=gnome-extra/nemo-2.0.0
-"
-RDEPEND="
-	${DEPEND}
-	app-arch/file-roller
-"
-
-PATCHES=(
-	# Minor versions aren't tagged at the repository level.
-	"${FILESDIR}/${PN}-5.0.1.patch"
-)
-
-S="${WORKDIR}/nemo-extensions-5.0.0/${PN}"
diff --git a/gnome-extra/nemo-fileroller/nemo-fileroller-5.2.0.ebuild b/gnome-extra/nemo-fileroller/nemo-fileroller-5.2.0.ebuild
index 8af559eda917..7ace849bd382 100644
--- a/gnome-extra/nemo-fileroller/nemo-fileroller-5.2.0.ebuild
+++ b/gnome-extra/nemo-fileroller/nemo-fileroller-5.2.0.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
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/linuxmint/nemo-extensions/archive/5.2.0.tar.gz -> ne
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~riscv x86"
 
 DEPEND="
 	>=dev-libs/glib-2.14.0
diff --git a/gnome-extra/nemo/Manifest b/gnome-extra/nemo/Manifest
index bcff566d1a95..94d91b2d6086 100644
--- a/gnome-extra/nemo/Manifest
+++ b/gnome-extra/nemo/Manifest
@@ -1,6 +1,4 @@
 AUX nemo-5.0.3-use-detex.patch 252 BLAKE2B 24c27845065f64a58411a8d719fbc1ca41362001f08d469bc336f55601e49358c02ba3aba423c521a261955a5da9832d8ae2df49f3d372270e63256a45fafcda SHA512 142bd88c7843fa40fb30cab01f8f7dd23b2b5c338eae2ac5971c7e392f9f24a8a820ef4b17b1c4afea729cc85a66cb7ddb06ecd417ff6ad494118fe8d88f1498
-DIST nemo-5.0.4.tar.gz 1487156 BLAKE2B 4ecafb315673c0939dfb2585e97957ee9d76e9621fbbece2b93d9ed10b24ec86d2c49cdd8d18ac7c8607184752fe2541508a1b626fdce763fdc8ac1b6e713e49 SHA512 e03558d336785d77c1a57d2d100906263d2015330a00d54e2cc0161d9d822740ef5c314062f90a877cee5b031b4b5caf9ebf59f22fb5e15f2e91c75bb239e488
 DIST nemo-5.2.4.tar.gz 1492077 BLAKE2B dc6efb24921d5408938ff5b8660653789a77d6607e2e023d73eb5722a0a8bc75cd22d1241f5e852d0429d05f6ec4fd1abb798b8be1ecf513eeed108a256e506c SHA512 0aa3f7e0c2bdb9d7f1874c17caea0e4a3da062fc243de1f1657bdb83090a1afb099baa404f211092f83cf6852c423b244482faf0ad6beaaddc072cbce17cc6d4
-EBUILD nemo-5.0.4.ebuild 2844 BLAKE2B b32bf937f6e817bc4bce44bccedbc036349655384ce188a19fef65660df243fcda17d363db9f797cb96477217b8d76008c8b7e156d4ff7bfd2ad49533c8bb851 SHA512 086af48bdbf013ebf2ebdac565506593e0b78e3c6abc86a4e09c190f926722ecc850141733286822f6fc8bb4902d6cf67787dface4511a55608116cbe1136baa
-EBUILD nemo-5.2.4.ebuild 3026 BLAKE2B 7a750a94cb8f40249e6acfaa7a3244ab63a9e6206a7fe8dab21c269931f431ac0c92e415ba89e76938016a077cb00103263f8f999f7616d70bb98673e9103829 SHA512 842896fee0253f0b041cf72bbb8129327c0491b47b21b4e38ebf3c368fd8835ba954f9b6effb859e9fd1711d208aeadbadcedb2c0eaee99ef3c10f6abe933ad6
+EBUILD nemo-5.2.4.ebuild 3024 BLAKE2B 086e143d707ed41ea9afbca21f5cab49fd13ed6d15b2f39e064eba09ba11b7dd5b0d296eec4ccac675160843e4abe25a340dd142454dd0f2a6649d5d298a9724 SHA512 42987451c463a61968f2bb7c5b23350a1e01229ad05f92146269b08197e16cd6eab39cdfd12a7086a58dce8cb01bc4d84b9b6752d3a3bf337d1f09ffd4b1d89d
 MISC metadata.xml 580 BLAKE2B da0ac9cd13730b5c1727a6d0431f3289af829b77781baf4d3512c78139bca7b9a7d136563de8e2f5abf914520de8a5a092b1e0f2505558e5e61813fa5f9c09ad SHA512 d38cebfe673764a4a96d66a66afe55f6f04c74bf1d06d8fddc319a2eb9ed351b205e3a48c47bfeff7f3da85c89ad0512e11a420f82c228a548fc7553147b927e
diff --git a/gnome-extra/nemo/nemo-5.0.4.ebuild b/gnome-extra/nemo/nemo-5.0.4.ebuild
deleted file mode 100644
index a64b12d8ae3d..000000000000
--- a/gnome-extra/nemo/nemo-5.0.4.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit meson gnome2-utils python-single-r1 readme.gentoo-r1 virtualx xdg
-
-DESCRIPTION="A file manager for Cinnamon, forked from Nautilus"
-HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/nemo"
-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"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# https://github.com/linuxmint/nemo/issues/2501
-RESTRICT="test"
-
-COMMON_DEPEND="
-	${PYTHON_DEPS}
-	>=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.0:0=
-	gnome-extra/libgsf
-	>=x11-libs/gtk+-3.10.0:3[introspection]
-	>=x11-libs/libnotify-0.7:=
-	x11-libs/libX11
-	>=x11-libs/pango-1.40.0
-	>=x11-libs/xapp-2.2.0
-
-	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="
-	${COMMON_DEPEND}
-	$(python_gen_cond_dep '
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-	')
-	x11-themes/adwaita-icon-theme
-
-	nls? ( >=gnome-extra/cinnamon-translations-5.0 )
-"
-PDEPEND="
-	>=gnome-base/gvfs-0.1.2
-"
-DEPEND="
-	${COMMON_DEPEND}
-	x11-base/xorg-proto
-"
-BDEPEND="
-	>=dev-util/gdbus-codegen-2.31.0
-	>=dev-util/intltool-0.40.1
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	gtk-doc? ( dev-util/gtk-doc )
-"
-
-PATCHES=(
-	# Undo the switch to untex as it's not packaged.
-	"${FILESDIR}/${PN}-5.0.3-use-detex.patch"
-)
-
-DISABLE_AUTOFORMATTING="yes"
-FORCE_PRINT_ELOG="yes"
-DOC_CONTENTS="
-${PN} search capabilities can be extended through external
-helpers. Install any of the following packages to make
-their associated file types searchable.
-
-Image metadata           - media-gfx/exif
-MP3 tags                 - media-sound/id3
-Microsoft Office .doc    - app-text/catdoc
-Microsoft Office .xls    - dev-libs/libxls
-OpenDocument/LibreOffice - app-text/odt2txt or app-office/unoconv
-PDF                      - app-text/poppler[utils]
-PostScript               - app-text/ghostscript-gpl
-TeX                      - app-text/texlive-core
-"
-
-src_prepare() {
-	default
-	python_fix_shebang files/usr/share/nemo/actions install-scripts
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use exif)
-		$(meson_use tracker)
-		$(meson_use xmp)
-		$(meson_use selinux)
-		$(meson_use gtk-doc gtk_doc)
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	readme.gentoo_create_doc
-}
-
-src_test() {
-	virtx meson_src_test
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/nemo/nemo-5.2.4.ebuild b/gnome-extra/nemo/nemo-5.2.4.ebuild
index 1eabe047e65b..07647e1254fb 100644
--- a/gnome-extra/nemo/nemo-5.2.4.ebuild
+++ b/gnome-extra/nemo/nemo-5.2.4.ebuild
@@ -13,7 +13,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"
+KEYWORDS="amd64 ~arm64 ~riscv x86"
 IUSE="exif gtk-doc +nls selinux test tracker xmp"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/gnome-extra/pch-session/Manifest b/gnome-extra/pch-session/Manifest
index 04516dfeb0b3..eec4ae28189b 100644
--- a/gnome-extra/pch-session/Manifest
+++ b/gnome-extra/pch-session/Manifest
@@ -1,5 +1,7 @@
 DIST pch-session-40.2.tar.bz2 3610529 BLAKE2B 4ae2fa7d152edff0707c5f705c001d601a08f70a7629f3cefa53254b07eac124280d547392c80d9dad76c08fbb80e09aaaefceff06945ebdddfc8f61d31c3426 SHA512 6300e36f5914f8213ac912e1e44652c08ca90a31e3e480b5f6674ce54a798f8b3f1226d781859f7bf9fb4a64186ee11a8bc7d6f8d59017340ec3b65d10948f0b
 DIST pch-session-41.2.tar.bz2 3610591 BLAKE2B 0a3dc1a60ed29bb59cd30756039c4d991212443664f72a5b4684be63babfd8b052c943f403c043817d78ee34d8017cd3e2348114c79fa618ad3967d092f686af SHA512 296c92ec6efdaef7b23d3986937f9dbf01b424fc8cd69cec637cff93780b4ac8e0e1cffee1b56b30817b43cf4063a3f6626e1e5b2b91c99847b08fd73bc63103
+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
 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
new file mode 100644
index 000000000000..111755a3ad87
--- /dev/null
+++ b/gnome-extra/pch-session/pch-session-42.0.ebuild
@@ -0,0 +1,66 @@
+# Copyright 2019-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit gnome2-utils
+
+DESCRIPTION="Unofficial gnome based session with different default settings and extensions"
+HOMEPAGE="https://gitlab.com/pachoramos/pch-session"
+SRC_URI="https://gitlab.com/pachoramos/${PN}/-/archive/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="bluetooth qt5 webp"
+
+RDEPEND="
+	>=gnome-base/gnome-shell-42
+	>=gnome-extra/gnome-shell-extensions-42
+	>=gnome-extra/gnome-shell-extension-alphabetical-grid-23.0
+	>=gnome-extra/gnome-shell-extension-appindicator-42
+	>=gnome-extra/gnome-shell-extension-applications-overview-tooltip-15
+	>=gnome-extra/gnome-shell-extension-bing-wallpaper-40
+	>=gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen-20220323
+	>=gnome-extra/gnome-shell-extension-dash-to-panel-47
+	>=gnome-extra/gnome-shell-extension-desktop-icons-ng-43.0
+	>=gnome-extra/gnome-shell-extension-gsconnect-50
+	>=gnome-extra/gnome-shell-extension-weather-in-the-clock-20211108-r1
+	>=gnome-extra/gnome-tweaks-40.10
+
+	gnome-extra/gnome-clocks
+	gnome-extra/seahorse-nautilus
+	>=media-fonts/fonts-meta-2
+
+	bluetooth? ( >=gnome-extra/gnome-shell-extension-bluetooth-quick-connect-29 )
+	qt5? ( x11-themes/adwaita-qt )
+	webp? ( gui-libs/gdk-pixbuf-loader-webp )
+"
+BDEPEND=""
+DEPEND=""
+
+src_prepare() {
+	default
+	if ! use bluetooth; then
+		sed -i -e \
+			's:"bluetooth-quick-connect@bjarosze.gmail.com",::g' \
+			usr/share/gnome-shell/modes/pch*.json || die
+	fi
+}
+
+pkg_preinst() {
+	gnome2_schemas_update
+}
+
+src_install() {
+	insinto /usr
+	doins -r usr/.
+	einstalldocs
+}
+
+pkg_postinst() {
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	gnome2_schemas_update
+}
diff --git a/gnome-extra/zenity/Manifest b/gnome-extra/zenity/Manifest
index 739d72517309..d4f7376d63e0 100644
--- a/gnome-extra/zenity/Manifest
+++ b/gnome-extra/zenity/Manifest
@@ -1,5 +1,7 @@
 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
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/gnome-extra/zenity/zenity-3.42.1.ebuild b/gnome-extra/zenity/zenity-3.42.1.ebuild
new file mode 100644
index 000000000000..e81d45b27ae7
--- /dev/null
+++ b/gnome-extra/zenity/zenity-3.42.1.ebuild
@@ -0,0 +1,56 @@
+# 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
+}
author	V3n3RiX <venerix@koprulu.sector>	2022-05-12 16:42:50 +0300
committer	V3n3RiX <venerix@koprulu.sector>	2022-05-12 16:42:50 +0300
commit	752d6256e5204b958b0ef7905675a940b5e9172f (patch)
tree	330d16e6362a49cbed8875a777fe641a43376cd3 /gnome-extra
parent	0c100b7dd2b30e75b799d806df4ef899fd98e1ea (diff)