gentoo resync : 02.02.2022

author: V3n3RiX <venerix@koprulu.sector> 2022-02-02 01:39:05 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2022-02-02 01:39:05 +0000
commit: fcc5224904648a8e6eb528d7603154160a20022f (patch)
tree: 3bfce096b38a9cea8eed13fc70c1526c456e9abd /gnome-extra
parent: 2fd57282f0262ca084e05b0f2c63fbada395d02b (diff)
89 files changed, 639 insertions, 1726 deletions
diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index a0e3011a758b..4ea1b0249f26 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 fa29665ccb0c..8c27b5c58da9 100644
--- a/gnome-extra/cinnamon-control-center/Manifest
+++ b/gnome-extra/cinnamon-control-center/Manifest
@@ -1,6 +1,5 @@
-AUX cinnamon-control-center-4.8.2-build-fix.patch 1246 BLAKE2B c4e39834c7079573a363c9aa822a84839fdac5de2b9299545fafde9ed718e082ca3d37be63aa514fa43e60b33774d1cd1759202af6ade62b385c00a84cfb3e5a SHA512 3e3deadd7972ba4a642a8b69a809785ae34ff30cec1174e9d2a4ee8f9a27881e22629ae5b17dec92ba78c995bb012d1925d2a53d6acd89a155f17b3a74581df9
-DIST cinnamon-control-center-4.8.2.tar.gz 3865765 BLAKE2B 8e36888aec00252842bcdb3f29dd0728833c597260fdb6b2b160db455e900686086b1b04b393d58ec358f44aa64c14341e49738de7a85002a5e5d695974c578a SHA512 c64e554488b401291daf125cc5627201cac58d5e6efab697d0b9cac64b666a7d2a7e27f459bb560918876cc8cf5e3720c11a59cee70401e50682a4b82a20f1b5
 DIST cinnamon-control-center-5.0.2.tar.gz 3866962 BLAKE2B d292d610516647e149198cbfce652bfd094338612ef6b4765fcb80bd1fe15f2d643bbaa5343f1d79d57f3327c87a3256cfc3900493daf6f80569b1a0bacd821a SHA512 f47b88005ba1d7359ab99d80e99d2c42a93561ecddd98014f91674a5ae806b991169c88f3af6c8c187df23ebb8a9e12bbae5eefbfeaf2f3d087981192448c3c2
-EBUILD cinnamon-control-center-4.8.2.ebuild 2152 BLAKE2B d052a536b7af3cb8452c98d3c3273091335faf5d3106985c2ee2e8f2214a082fe7c487620467d35ec5c3f39e1f6cbbce67604ccf108312a95e8c1e89848ad02d SHA512 b4d36b1b3a76c6122d2bd041d871adfc637a1fc922a3d52816a83788291422515bc0a1571e164a22784c18190687343c964bd5440463cc70bcae335cf8241900
+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
 MISC metadata.xml 762 BLAKE2B 5a4411060287e76154bd0727feae76a45e8992077d7cbc6d1ad102d933246d98b3349bf0dc516f35d538e6c1d4a5d427e1561b646b628d408a5743666f5f2ca7 SHA512 c03709d9a1c8d678ce0957d08516e49f8affa6be2153f30607c0f1be7c29a1e00f4955f2112e82dc7c3b3e410a6dabf5ba2bdd9f3141b6a5299068598decd0c3
diff --git a/gnome-extra/cinnamon-control-center/cinnamon-control-center-4.8.2.ebuild b/gnome-extra/cinnamon-control-center/cinnamon-control-center-5.2.1.ebuild
index ffeb6732bad9..e8ca7c2831ca 100644
--- a/gnome-extra/cinnamon-control-center/cinnamon-control-center-4.8.2.ebuild
+++ b/gnome-extra/cinnamon-control-center/cinnamon-control-center-5.2.1.ebuild
@@ -3,7 +3,9 @@
 
 EAPI=7
 
-inherit meson xdg virtualx
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+
+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"
@@ -11,16 +13,16 @@ SRC_URI="https://github.com/linuxmint/cinnamon-control-center/archive/${PV}.tar.
 
 LICENSE="GPL-2+"
 SLOT="0"
-IUSE="+colord input_devices_wacom +networkmanager +modemmanager systemd test"
+IUSE="+colord input_devices_wacom +networkmanager +modemmanager gnome-online-accounts systemd test"
 REQUIRED_USE="modemmanager? ( networkmanager )"
-KEYWORDS="amd64 ~arm64 x86"
+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-4.8:0=
-	>=gnome-extra/cinnamon-menus-4.8:0=
+	>=gnome-extra/cinnamon-desktop-5.2:0=
+	>=gnome-extra/cinnamon-menus-5.2:0=
 	media-libs/fontconfig
 	>=sys-auth/polkit-0.103
 	>=x11-libs/gdk-pixbuf-2.23.0:2
@@ -32,7 +34,7 @@ COMMON_DEPEND="
 	colord? ( >=x11-misc/colord-0.1.14:0= )
 	input_devices_wacom? (
 		>=dev-libs/libwacom-0.7
-		>=gnome-extra/cinnamon-settings-daemon-4.8:0=
+		>=gnome-extra/cinnamon-settings-daemon-5.2:0=
 		>=x11-libs/libXi-1.2 )
 	networkmanager? (
 		>=gnome-extra/nm-applet-1.2.0
@@ -40,6 +42,9 @@ COMMON_DEPEND="
 
 		modemmanager? ( >=net-misc/modemmanager-0.7 )
 	)
+	gnome-online-accounts? (
+		>=net-libs/gnome-online-accounts-3.18.0
+	)
 "
 RDEPEND="
 	${COMMON_DEPEND}
@@ -56,24 +61,23 @@ DEPEND="
 	x11-base/xorg-proto
 "
 BDEPEND="
+	${PYTHON_DEPS}
 	dev-util/glib-utils
-	>=dev-util/intltool-0.40.1
 	>=sys-devel/gettext-0.17
 	virtual/pkgconfig
 "
 
-PATCHES=(
-	# Fix build when modemmanager is disabled
-	# https://github.com/linuxmint/cinnamon-control-center/pull/257
-	"${FILESDIR}/${PN}-4.8.2-build-fix.patch"
-)
+src_prepare() {
+	default
+	python_fix_shebang meson_install_schemas.py
+}
 
 src_configure() {
 	local emesonargs=(
-		-Donlineaccounts=false
 		$(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
@@ -82,3 +86,13 @@ 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/files/cinnamon-control-center-4.8.2-build-fix.patch b/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-4.8.2-build-fix.patch
deleted file mode 100644
index 041a5d23e500..000000000000
--- a/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-4.8.2-build-fix.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From a9d7d0f7f36bc724ecb65019999fc1c4d671bcba Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= <felix@piedallu.me>
-Date: Thu, 31 Dec 2020 10:09:17 +0100
-Subject: [PATCH] Add ifdefs to prevent undefined reference to modem functions
- in network panel
-
----
- panels/network/cc-network-panel.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/panels/network/cc-network-panel.c b/panels/network/cc-network-panel.c
-index 8b28439..38d9842 100644
---- a/panels/network/cc-network-panel.c
-+++ b/panels/network/cc-network-panel.c
-@@ -29,7 +29,9 @@
- #include <NetworkManager.h>
- 
- #include "net-device.h"
-+#ifdef BUILD_MODEM
- #include "net-device-mobile.h"
-+#endif
- #include "net-device-wifi.h"
- #include "net-device-ethernet.h"
- #include "net-object.h"
-@@ -651,9 +653,11 @@ panel_add_device (CcNetworkPanel *panel, NMDevice *device)
-         case NM_DEVICE_TYPE_ETHERNET:
-                 device_g_type = NET_TYPE_DEVICE_ETHERNET;
-                 break;
-+        #ifdef BUILD_MODEM
-         case NM_DEVICE_TYPE_MODEM:
-                 device_g_type = NET_TYPE_DEVICE_MOBILE;
-                 break;
-+        #endif
-         case NM_DEVICE_TYPE_WIFI:
-                 device_g_type = NET_TYPE_DEVICE_WIFI;
-                 break;
diff --git a/gnome-extra/cinnamon-desktop/Manifest b/gnome-extra/cinnamon-desktop/Manifest
index 797d0a23c8f3..212e72f72ba5 100644
--- a/gnome-extra/cinnamon-desktop/Manifest
+++ b/gnome-extra/cinnamon-desktop/Manifest
@@ -1,5 +1,5 @@
-DIST cinnamon-desktop-4.8.1.tar.gz 495417 BLAKE2B 3947d39168b2c74ef82a1ad5835d423721d34d1f9f7099050207ba070348abfb0236f08c340bf5896672764a59d19646cb34e342ddd4c7dbb501797ab20cbb10 SHA512 57eaba73cbaf2cd91e07a417bb0573bd0af86712babccfc4f307c6745dd219f0b279277f7a740dcf21d06a6f9a656213436b2e54eda4cbdb2f1f80a5ff085287
 DIST cinnamon-desktop-5.0.0.tar.gz 495362 BLAKE2B 955fea37ceca3d5ee33ab94aaa4e22cb6973fc87a53f05486cd16e7d05e6e0a5ca7d548f68544fbc13ecebe2f59aee07db73b0db2e810d020730f77f05843cf4 SHA512 1191feeea4a35b6cae5708e62ec472bc865e3e209717b597eb5853673dbe29d3d03b0be5d5ee486e74748fcc2f60ac0012900aa6340a85da8059eda4d40a2263
-EBUILD cinnamon-desktop-4.8.1.ebuild 1291 BLAKE2B 33971dce1fe8cdeae09572d9918108e29787f299f66dabd238a650131019732db7e9f8e81add1f7c7d880c75e4d10e7f57a4434effd24b327d259e5d2543543a SHA512 16b4fd71b58d6d143d59bb809f376bd5d55b28b321b305746458083c7863959e73057ed8f5e7991e55ce8fafd8719c2aaff6397102a93a527c453016ab0846d9
+DIST cinnamon-desktop-5.2.0.tar.gz 495118 BLAKE2B e9175230a482ae68bd5b22ce5e3dbba053494d7872c75089a0bd7922fb59e8a0787863b5ae962bca4f4d3a1ed8490c5f33d3c420c1984ce47ddb9cde6476afa6 SHA512 c4b7dcfe16c77f3c8390e6f41322db8e3ca9e2858c0fcd7629b4844834feda7baadb3f54d9239831a0ded97b139ce3d2362f222829ac1513184d32c7480e808b
 EBUILD cinnamon-desktop-5.0.0.ebuild 1298 BLAKE2B 4078ae0cdcfcbd1a0382ed78c3d1b7b5e47eca3e5198287440d08960ee52e5e95df2a4edd1a3b4778f296527ac180adbdba72fe7dfd26997ed56ddc607175398 SHA512 76bc37293c032d02990aa9e20e308971c4cb1ebf4559001b834b7a6d628fd9c29a376bc53e83991ca32b70dd5129c649550760f430c9d7233aa2893e37a74dd1
+EBUILD cinnamon-desktop-5.2.0.ebuild 1275 BLAKE2B 37969bbdef73f34603ea253e9b7bf01d04801e36ff8ebe55db6c7d364c6981601ab025a3dd8c6c2666119e3ea934b723715e75d9abd58fbd200f9023d5702333 SHA512 e8e5e7bad6fb5ddbce7d54ecdf8c3fd4b7519a1d759740c38bb54e813a741fee0b45cc0b75bfbde6a1ed46c403627ec544365080fd4b7e80bf3adba3fe4d4591
 MISC metadata.xml 496 BLAKE2B c019ef51b10de9ccafed1294e6d436dcdc8f02735170afe9e038689c6c4d76fb3e099bc9ec7f10c2a50d2bfa5e1d1c191667a470d734effad53d9d299f431664 SHA512 41a99dd4e1aad85dda44e2168bc150e2c27bb40a45c0dfe0f085e502242e6a0704ad8b47f64140d81afa7ff096cac735c46827f3d949962400de92d769505cc4
diff --git a/gnome-extra/cinnamon-desktop/cinnamon-desktop-4.8.1.ebuild b/gnome-extra/cinnamon-desktop/cinnamon-desktop-5.2.0.ebuild
index 97d38e57bf62..7add18e30f7e 100644
--- a/gnome-extra/cinnamon-desktop/cinnamon-desktop-4.8.1.ebuild
+++ b/gnome-extra/cinnamon-desktop/cinnamon-desktop-5.2.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9,10} )
 
 inherit meson gnome2-utils python-any-r1
 
@@ -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 x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.37.3:2[dbus]
@@ -37,7 +37,6 @@ DEPEND="
 BDEPEND="
 	${PYTHON_DEPS}
 	dev-util/glib-utils
-	>=dev-util/intltool-0.40.6
 	sys-devel/gettext
 	virtual/pkgconfig
 "
diff --git a/gnome-extra/cinnamon-menus/Manifest b/gnome-extra/cinnamon-menus/Manifest
index c8a0735ad4d3..a8873e095e57 100644
--- a/gnome-extra/cinnamon-menus/Manifest
+++ b/gnome-extra/cinnamon-menus/Manifest
@@ -1,5 +1,5 @@
-DIST cinnamon-menus-4.8.2.tar.gz 101831 BLAKE2B 6b731c21bee03fbd69360258d7573e35b774cc42ffdaf7536e7c8a3779e8ef9e8bc3684166a02f114838144fa9b7ea71a46b439e00f90abee56da1925bafec76 SHA512 6aa44e55ebcc60236361cd390fffbccd13422355e9fb4c61c8559479892d85890611d66971570454ce1a87a459c4a7de51cd2751eae4a042490155e0a9030e0a
 DIST cinnamon-menus-5.0.0.tar.gz 101957 BLAKE2B 1d2f95d5b599f73f8161caf7964d3508f34c4c28f677dc8367d4ba67004d77c00e1f77cb1851084bcf26482d1689da7d1734c21649ade89ca6d9ca15475623b8 SHA512 1f8d7b417f947909d9187288ed916739b5b146a8f9cade2f8695d4c59b56a69286c0db48ac026cab3342e571d40013595fb32155065355d6110a43a1cac7096a
-EBUILD cinnamon-menus-4.8.2.ebuild 824 BLAKE2B 7763ded54fe36d1b044bbc13cd4862ab47c481470d75b3ca9eab2ade6a97053d27b2ffd916ad01630942c5cc53afa18865fbfe19be489c65c10a4cc61ec271a9 SHA512 4349f776c47e78358c64bea2afc08d695ef28a8b6793b6185643cd3c2a903d00421898e94a90321c45ea136deb432a63b977766ebb843dcf2a52d241e3d1c649
+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
 MISC metadata.xml 494 BLAKE2B a27fd494a680cb42a41c806166cf6ce2f2df3d132d62af9e4a4f8c7ae66ecc93b05afc64e250122cdd62bad428fc065984ab68e31c0d6c5be2a070a8dc912d7b SHA512 1fe1a31acf83ea9070318e76a6acb09969c7dac0779292822a7d1800ac7be4392a26091a59bceeb3ce84381d95159c9c2c1cdb30e567c2b2896a2a02564656ff
diff --git a/gnome-extra/cinnamon-menus/cinnamon-menus-4.8.2.ebuild b/gnome-extra/cinnamon-menus/cinnamon-menus-5.2.0.ebuild
index 5ba6d82435ff..8ed39e12bb5c 100644
--- a/gnome-extra/cinnamon-menus/cinnamon-menus-4.8.2.ebuild
+++ b/gnome-extra/cinnamon-menus/cinnamon-menus-5.2.0.ebuild
@@ -11,19 +11,18 @@ SRC_URI="https://github.com/linuxmint/cinnamon-menus/archive/${PV}.tar.gz -> ${P
 
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE="gtk-doc"
 
 RDEPEND="
 	>=dev-libs/glib-2.29.15:2
-	>=dev-libs/gobject-introspection-0.9.12:=
+	>=dev-libs/gobject-introspection-1.58.3:=
 "
 DEPEND="
 	${RDEPEND}
 	dev-libs/gobject-introspection-common
 "
 BDEPEND="
-	>=dev-util/intltool-0.40.6
 	sys-devel/gettext
 	virtual/pkgconfig
 
diff --git a/gnome-extra/cinnamon-screensaver/Manifest b/gnome-extra/cinnamon-screensaver/Manifest
index fde058840ded..bb6d0e34ced8 100644
--- a/gnome-extra/cinnamon-screensaver/Manifest
+++ b/gnome-extra/cinnamon-screensaver/Manifest
@@ -1,5 +1,5 @@
-DIST cinnamon-screensaver-4.8.1.tar.gz 141996 BLAKE2B 73a61e28210efc58a205357abd7b1ca5efce85c542a14ba0de1688ca3c6c86cc81cf02b7eee7d7a13d015d43b6084a0e5a5a0f417a3be77771ff969381c24726 SHA512 5f165cddf5cd3f079192179f2308e015d7d70ce52f5214a56f8fc4318fdc6d6fc2b522b1c8eca31b4799074e58bd93bdce282d9774d1a552616c9ae1a0b46cae
 DIST cinnamon-screensaver-5.0.7.tar.gz 154480 BLAKE2B 38b89e2d4729ea2806903e9bd27024b274248325720d233485ab756477625bc07832582bbe99c599b7a7d4dbcf76d22b59df179ac8617a81b584b9f5684cb6d2 SHA512 ec5990e1f73983e96eb07f0d4d1a66076d067df28d56c68cce987dc7fce35871650273d2d4a64058d73c7daff2326722e3c1a2fd86afc761d81d1a6b2e7f9370
-EBUILD cinnamon-screensaver-4.8.1.ebuild 1627 BLAKE2B 7c70e371cda0b6de480e1f16ca781dd4b0df12ee6662e0b7ff59cd3aeba7ba225ebbd66c68ef3f12423ae5443dec4a565ccf989dfb1f6d66f97effb5c33d6de3 SHA512 974d19a75d0040350abb5584ec3a3d7cf28887d9711aaa8d5022b4acea68ec72a848633f353054fe34f2b32dccb8a27cdf93446e17cf8ce5c4497ae0a27d0a32
-EBUILD cinnamon-screensaver-5.0.7.ebuild 1642 BLAKE2B e491cc1be4e20ed4d45d03d019b2d56012ea45ace7ba5079ef2d727f9ff5c2c7503dd3d7e048b594d7c45db53913fd3d0a7f3905951a5215efc37e5997024b85 SHA512 aee87ba00aa42b0dbc9fb9ab562cda30f61493146a08aff7ae28f9a9884e0936e7b946182fa501500986e7ed3d1828241a62800dd75ce4f76b8f47ab0cbc4b8c
+DIST cinnamon-screensaver-5.2.0.tar.gz 154678 BLAKE2B 65e2ecf62319198b7637129711bc7cce08ad05a9ed89f30553bac77e5e4b147bdbcb992a1e8717e903912d0b4f70075684b40c136afc0099182c1101f1ba1a0b SHA512 d248ef848d2990a8464ff866b4d090b60531832c7a327b10f879c5a00558e14b70c6b45223550ad4100e7af1a491dc7c460c27d159c28eb289a37b916d89ad41
+EBUILD cinnamon-screensaver-5.0.7.ebuild 1650 BLAKE2B 9a1c629b7d4395fca8a184c2e114b0ee9cfc036d59e3711b09d08bc78b6aae7a2abf25b655c9c18fd4efaa7ce7ae01e72323b324665d5b4039165689c4eb2ebd SHA512 66a1ee63a072f344cf4c3b9fbcdf183785f6cf41505508df0b397e9763bfedba724b2b0985b902caa9f66f01da46d1f566a1801e9256f7a8467ab90f1b6c1545
+EBUILD cinnamon-screensaver-5.2.0.ebuild 1632 BLAKE2B 2f0b69b0e61a3499ac588c9113420582ea7d48362d457f04504e810139ae1bdafbc46a57c9e653cdb982eea75e2521ed107d453ad2941bc9cdcd8f6edf2dcbe8 SHA512 b54e19d1bed4b3fafe1a4cd606d9f6f2e59112146e6972f7ba955c83974edb7c320345a24a68f6ffb71507f3a3212fc8535d0f2281bbbf898042a584cf55813c
 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
index a0e443eb1e67..8761a2a6166a 100644
--- a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-5.0.7.ebuild
+++ b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-5.0.7.ebuild
@@ -40,7 +40,7 @@ RDEPEND="
 		dev-python/psutil[${PYTHON_USEDEP}]
 		dev-python/pygobject:3[${PYTHON_USEDEP}]
 		dev-python/setproctitle[${PYTHON_USEDEP}]
-		>=dev-python/xapp-2.2.0[${PYTHON_USEDEP}]
+		>=dev-python/python3-xapp-2.2.0[${PYTHON_USEDEP}]
 	')
 
 	systemd? ( >=sys-apps/systemd-31 )
diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-4.8.1.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-5.2.0.ebuild
index 2f57c3ceb435..f9fd96c4619b 100644
--- a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-4.8.1.ebuild
+++ b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-5.2.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9,10} )
 
 inherit meson python-single-r1 xdg
 
@@ -15,13 +15,13 @@ LICENSE="GPL-2+"
 SLOT="0"
 IUSE="systemd xinerama"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-KEYWORDS="amd64 ~arm64 x86"
+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-4.8:0=
+	>=gnome-extra/cinnamon-desktop-5.2:0=
 	sys-apps/dbus
 	sys-libs/pam
 	>=x11-libs/gtk+-3.22:3[introspection]
@@ -40,7 +40,7 @@ RDEPEND="
 		dev-python/psutil[${PYTHON_USEDEP}]
 		dev-python/pygobject:3[${PYTHON_USEDEP}]
 		dev-python/setproctitle[${PYTHON_USEDEP}]
-		dev-python/xapp[${PYTHON_USEDEP}]
+		>=dev-python/python3-xapp-2.2.1-r1[${PYTHON_USEDEP}]
 	')
 
 	systemd? ( >=sys-apps/systemd-31 )
@@ -52,7 +52,6 @@ DEPEND="
 "
 BDEPEND="
 	dev-util/gdbus-codegen
-	>=dev-util/intltool-0.40
 	sys-devel/gettext
 	virtual/pkgconfig
 "
diff --git a/gnome-extra/cinnamon-session/Manifest b/gnome-extra/cinnamon-session/Manifest
index fa7bfb01064d..8d683b648438 100644
--- a/gnome-extra/cinnamon-session/Manifest
+++ b/gnome-extra/cinnamon-session/Manifest
@@ -1,5 +1,5 @@
-DIST cinnamon-session-4.8.0.tar.gz 199684 BLAKE2B 07baa1d359376fb1c5150224d3420c2ea2c06c2c015739835ffa2c8f0be751362b8ea2299e155369c0cb2d3e8493d5c45ed3f521bb36b6ddb092aff493f01b1f SHA512 21e40d3776c2cd2fcb70bf5597e7f97d415a3236b7c2bdb46cc2359adcb62ec34ad529841154f87ea4a38013cd329cbba5cd6c88e16c4fc4e03acbe38a62edd7
 DIST cinnamon-session-5.0.1.tar.gz 200036 BLAKE2B a7e254d54daa63f5dcf5592843b85e0c63a3fdd34ce5c3045ff5c7ce410f2ab340b5c778b1579e7586f7d9e0517fdf00703934395b9bbbbd234cb181a1096fcf SHA512 0c367764269ce1597035288508909aad2c031ab5b8c04bde3d81cc420f38abf6cca82f169db199cf01218e92014653f1749c0ed2096950f7bc9f3b56f1fcdebc
-EBUILD cinnamon-session-4.8.0.ebuild 1439 BLAKE2B 49215712f53037c72db9ab6a18c8c7e08a08ad3dd954910a2b7c50192fe90ec9e2e413d9a3fdbb4fd641f3c6acced73f49728cf5cea46c2f62706541f2d1289f SHA512 be4d9a0179d5f47db2bec25fea1fe066f8e6422b31a039a01347b14d2d6a0fe0c700ec09f545b4bafff33d64156e2dd3c8f4e1a7cc70daf94af39b03b5f7d812
-EBUILD cinnamon-session-5.0.1.ebuild 1473 BLAKE2B 639e002463b663f51d12b9d9e2f57582256b3e794dbecabac6431fe04cc24b35c139e445bd933b70eff1f2f1bd24e5247ac6617fab3331054baeba7d2e120dcc SHA512 e8bb74e10fd985602ba60ad88f02775ab81b8961f3736ad2f3dbeb5c97246d605839b8a97bb4c2ba90a7d99f42d497c262f353d2bb2f0a7ddcdf5efce0330b9d
+DIST cinnamon-session-5.2.0.tar.gz 200208 BLAKE2B 2efe8ef0cb5dc4a828866c91bc020ffcc8b400423f92ac8be8ab47391202001123805c947af8e82eda530675b89cf4960f082b06acf24c296f083d6bcb941217 SHA512 3962529fed8d6c4c74e2f4b75014529d1a9b3307cf2d014c90088d0e2d3066ce375ccc3bbf5f07e9a181c08bba5360b07d5800cdb6386796255b4f1cb5c4d385
+EBUILD cinnamon-session-5.0.1.ebuild 1472 BLAKE2B 35cae54c1148f21f0304f7fd805d799bdd83c02617230829f4734c8ba98c09f5c911db418858ff0d652f52403c9ba5144eaf176de7fa457ae443b2cbbe41e71d SHA512 fe62504631d5e54138c9547668c413399e265bde98c05efc66e1a5f00878e9e40c267ca50f552b2fc076322782853fb385d13b1fe8408b53f4f8eb9ad97acab2
+EBUILD cinnamon-session-5.2.0.ebuild 1449 BLAKE2B 81a7a6fc407a11462a8974a683f33ca96d76c33fa71eefe312637256242750cb5b7ab7965737c128938eec1488a97c4b404d8e6af1d2f595fdfc430bc7f57acc SHA512 14a7d6736880e27d4fd32285810ca33821750920f565ed3ad274ced5b32c9fe4807c7b1850b545b243a3f7e30213b587d8ebda3259171d36b1aa28a66edeb36e
 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
index cf00039e5dd4..b35ae9b0339a 100644
--- a/gnome-extra/cinnamon-session/cinnamon-session-5.0.1.ebuild
+++ b/gnome-extra/cinnamon-session/cinnamon-session-5.0.1.ebuild
@@ -32,7 +32,7 @@ DEPEND="
 	x11-libs/libXrender
 	x11-libs/libXtst
 	x11-libs/pango[X]
-	>=x11-libs/xapps-2.2.0
+	>=x11-libs/xapp-2.2.0
 
 	systemd? ( >=sys-apps/systemd-183 )
 	!systemd? ( sys-auth/elogind[policykit] )
diff --git a/gnome-extra/cinnamon-session/cinnamon-session-4.8.0.ebuild b/gnome-extra/cinnamon-session/cinnamon-session-5.2.0.ebuild
index 3d78ae2a526b..002c659ae87b 100644
--- a/gnome-extra/cinnamon-session/cinnamon-session-4.8.0.ebuild
+++ b/gnome-extra/cinnamon-session/cinnamon-session-5.2.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9,10} )
 
 inherit meson gnome2-utils python-any-r1 xdg-utils
 
@@ -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 x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE="doc ipv6 systemd"
 
 DEPEND="
@@ -32,18 +32,18 @@ DEPEND="
 	x11-libs/libXrender
 	x11-libs/libXtst
 	x11-libs/pango[X]
-	>=x11-libs/xapps-1.0.4
+	>=x11-libs/xapp-2.2.8
 
 	systemd? ( >=sys-apps/systemd-183 )
 	!systemd? ( sys-auth/elogind[policykit] )
 "
 RDEPEND="
 	${DEPEND}
-	>=gnome-extra/cinnamon-desktop-4.8
+	>=gnome-extra/cinnamon-desktop-5.2:0=
 "
 BDEPEND="
 	${PYTHON_DEPS}
-	>=dev-util/intltool-0.40.6
+	dev-util/gdbus-codegen
 	virtual/pkgconfig
 
 	doc? (
diff --git a/gnome-extra/cinnamon-settings-daemon/Manifest b/gnome-extra/cinnamon-settings-daemon/Manifest
index 6400085ae707..f4c9ba68bd70 100644
--- a/gnome-extra/cinnamon-settings-daemon/Manifest
+++ b/gnome-extra/cinnamon-settings-daemon/Manifest
@@ -1,6 +1,5 @@
-AUX cinnamon-settings-daemon-4.8.5-build-fixes.patch 4529 BLAKE2B 9e28834a8d2d091c816a74e6bc1c50260210e726251dad5ec310f68f450ccd5ec39057c15139218b65afef6e130efc8610b897f0720043a42cdc5702758458f7 SHA512 4f9fee4ec02b11789f387405f0b75f9eabdcc72d78e109b4015fe13575967ad7610a6ad208d8ee31e5b68531e6769d2a07ddc6a9b82db71bf03d7c70920b00a8
-DIST cinnamon-settings-daemon-4.8.5.tar.gz 662123 BLAKE2B b3ddd72e55c10c2cacc6dd29145e381395bd2ef68db7082a0770bb3eb647964041ed023d4a8357f2adcf5e8c9f8f713bac837809ed5926cc0434c2dc3e5c90ad SHA512 4a1d128b3f6faf3e2c13420d3569d4fd8cfaa1798ba5cf83fcb692662b9888d22f9f4bfb6fe18af59d0632583a2730a07e3ab48cca12c357b2d318d205fd7d0a
 DIST cinnamon-settings-daemon-5.0.4.tar.gz 663647 BLAKE2B 459ca8b407291e7a84742b75a272a621d05ef1929ec76dd913af477629db862429165cec26a5985c75f81ce8eaddccc6b74cfa882106784bbfb40e015a21bab8 SHA512 861847fb238ae53fdb31c55ab7f8475f3cad9b48a5dd3611e5ea05129e16b44cc48b3ff5d38c2fdcc3669191f952bf194b6bcba80816fb4daee9e91d85b1c781
-EBUILD cinnamon-settings-daemon-4.8.5.ebuild 2348 BLAKE2B c463d0b1b7c5304f4c8a485cfa30b9dc1d50057edc9b909ba339f988d760ede512896604be52c2ad9871bd1e2cdc13b731021c7847d1201b98f6ac0b35f9352a SHA512 6fa3c7aa4b52e67eb94cab700c78c110205f846858771afdb4ef4f05b8b0452a7540f3647a99da03ee5423337909926188ebf5c2e6ae2b7968cb3b5e94c7df5d
+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
 MISC metadata.xml 504 BLAKE2B 99901d6f11af1367053f408c6fc1dffafa3903dc04b9a38faed0b3261e578c33fad49948ce09ecfb6d277472a3f9c3d088a32231b02236677071413dc3d4917e SHA512 f5afa4c1e73b6765aee16c5762b3145223bf4c56cae60b7e65ef503aec0f684276de2a7a22b0b866996cd96376cfc69e36e395ad3da9e7ce593732cb075fd64c
diff --git a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-4.8.5.ebuild b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-5.2.0.ebuild
index f28af6802a1c..b4238e71f45e 100644
--- a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-4.8.5.ebuild
+++ b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-5.2.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9,10} )
 
 inherit meson gnome2-utils python-any-r1 xdg
 
@@ -13,14 +13,14 @@ SRC_URI="https://github.com/linuxmint/cinnamon-settings-daemon/archive/${PV}.tar
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+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-4.8:0=
+	>=gnome-extra/cinnamon-desktop-5.2:0=
 	media-libs/fontconfig
 	>=media-libs/lcms-2.2:2
 	media-libs/libcanberra:0=[gtk3,pulseaudio]
@@ -61,16 +61,9 @@ BDEPEND="
 	${PYTHON_DEPS}
 	dev-util/glib-utils
 	dev-util/gdbus-codegen
-	>=dev-util/intltool-0.37.1
 	virtual/pkgconfig
 "
 
-PATCHES=(
-	# Miscellaneous meson configuration/compilation fixes
-	# https://github.com/linuxmint/cinnamon-settings-daemon/pull/314
-	"${FILESDIR}/${PN}-4.8.5-build-fixes.patch"
-)
-
 src_prepare() {
 	default
 	python_fix_shebang install-scripts
diff --git a/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-4.8.5-build-fixes.patch b/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-4.8.5-build-fixes.patch
deleted file mode 100644
index f70d1e544e94..000000000000
--- a/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-4.8.5-build-fixes.patch
+++ /dev/null
@@ -1,140 +0,0 @@
-From 281bc6b8e0085a91b7e59af45469c4da397646c2 Mon Sep 17 00:00:00 2001
-From: Sparky Bluefang <sparky@bluefang-logic.com>
-Date: Mon, 28 Dec 2020 17:05:21 -0500
-Subject: [PATCH] build: Add missing defines. Fix optional wacom build. Make
- build options behave consistently.
-
----
- meson.build                | 20 ++++++++++++--------
- meson_options.txt          | 14 ++++++++++----
- plugins/meson.build        |  2 +-
- plugins/xrandr/meson.build |  1 +
- 4 files changed, 24 insertions(+), 13 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index 0e11d50..0d6c35a 100644
---- a/meson.build
-+++ b/meson.build
-@@ -9,6 +9,7 @@ pkgname = meson.project_name().to_lower()
- api_version = '3.0'
- 
- cc = meson.get_compiler('c')
-+cargs = []
- 
- # directories
- prefix = get_option('prefix')
-@@ -43,7 +44,7 @@ endif
- cinnamon_desktop_required = '>= 4.8.0'
- canberra = dependency('libcanberra-gtk3')
- cinnamon_desktop = dependency('cinnamon-desktop', version: cinnamon_desktop_required)
--colord = dependency('colord', version: '>= 0.1.27')
-+colord = dependency('colord', version: '>= 0.1.27', required: get_option('use_color'))
- cups = dependency('cups', version: '>= 1.4', required: get_option('use_cups'))
- cvc = dependency('cvc', version: cinnamon_desktop_required)
- fontconfig = dependency('fontconfig')
-@@ -56,13 +57,13 @@ gtk = dependency('gtk+-3.0', version: '>= 3.14.0')
- gudev = dependency('gudev-1.0', required: get_option('use_gudev'))
- libnotify = dependency('libnotify', version: '>= 0.7.3')
- kbproto = dependency('kbproto')
--nss = dependency('nss', version: '>= 3.11.2', required: get_option('enable_smartcard'))
-+nss = dependency('nss', version: '>= 3.11.2', required: get_option('use_smartcard'))
- polkit = dependency('polkit-gobject-1', version: '>= 0.97', required: get_option('use_polkit'))
- pulse_required = '>= 0.9.16'
- pulse = dependency('libpulse', version: pulse_required)
- pulse_glib = dependency('libpulse-mainloop-glib', version: pulse_required)
- upower_glib = dependency('upower-glib', version: '>= 0.9.11')
--wacom = dependency('libwacom', version: '>= 0.7', required: false)
-+wacom = dependency('libwacom', version: '>= 0.7', required: get_option('use_wacom'))
- x11 = dependency('x11')
- xext = dependency('xext')
- xfixes = dependency('xfixes')
-@@ -80,13 +81,12 @@ librsvg = dependency('librsvg-2.0', version: '>= 2.36.2', required: wacom.found(
- xorg_wacom = dependency('xorg-wacom', required: wacom.found())
- 
- lcms = dependency('lcms2', version: '>= 2.2', required: false)
--has_new_lcms = lcms.found()
--if not has_new_lcms
--    lcms = dependency('lcms2')
-+if lcms.found()
-+    cargs += '-DHAVE_NEW_LCMS'
-+else
-+    lcms = dependency('lcms2', required: colord.found())
- endif
- 
--cargs = []
--
- using_logind = false
- if not get_option('use_logind').disabled()
-     logind = dependency('libsystemd-logind', required: false)
-@@ -125,6 +125,10 @@ if gudev.found()
-     cargs += '-DHAVE_GUDEV'
- endif
- 
-+if wacom.found()
-+    cargs += '-DHAVE_WACOM'
-+endif
-+
- if not get_option('enable_debug')
-     cargs += [
-           '-Wno-deprecated-declarations',
-diff --git a/meson_options.txt b/meson_options.txt
-index 0a6941b..e3c89f3 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -35,20 +35,26 @@ option(
-     description: 'Whether cups (and therefore the print notifications plugin) support should be enabled'
- )
- option(
--    'enable_smartcard',
-+    'use_smartcard',
-     type: 'feature',
-     value: 'enabled',
-     description: 'Set to false to disable smartcard support'
- )
- option(
-     'use_color',
--    type: 'boolean',
--    value: true,
-+    type: 'feature',
-+    value: 'enabled',
-     description: 'Whether the color plugin should be enabled'
- )
-+option(
-+    'use_wacom',
-+    type: 'feature',
-+    value: 'auto',
-+    description: 'Whether the wacom plugin should be enabled'
-+)
- option(
-     'enable_debug',
-     type: 'boolean',
-     value: false,
-     description: 'Show additional build warnings'
--)
-\ No newline at end of file
-+)
-diff --git a/plugins/meson.build b/plugins/meson.build
-index 0d11a52..069366d 100644
---- a/plugins/meson.build
-+++ b/plugins/meson.build
-@@ -24,7 +24,7 @@ subdir('sound')
- subdir('xrandr')
- subdir('xsettings')
- 
--if get_option('use_color')
-+if colord.found()
-     subdir('color')
- endif
- 
-diff --git a/plugins/xrandr/meson.build b/plugins/xrandr/meson.build
-index db2bf73..3296f1a 100644
---- a/plugins/xrandr/meson.build
-+++ b/plugins/xrandr/meson.build
-@@ -11,6 +11,7 @@ xrandr_deps = [
-     csd_dep,
-     libnotify,
-     upower_glib,
-+    wacom,
-     xfixes,
- ]
- 
diff --git a/gnome-extra/cinnamon-translations/Manifest b/gnome-extra/cinnamon-translations/Manifest
index c5f091468feb..fc262b1b1528 100644
--- a/gnome-extra/cinnamon-translations/Manifest
+++ b/gnome-extra/cinnamon-translations/Manifest
@@ -1,5 +1,5 @@
-DIST cinnamon-translations-4.8.3.tar.gz 12010514 BLAKE2B a1635f08376ff85a082078e3da64d0f5159d818ba1c57ae79439168553dd8c7e80e2d1aed93361c9df164d790f8be41059e7227c76ebee2285ea53a10df4f9ae SHA512 e7e674be8c542bb34cab9e191f4124b17d0fd932315838be241a7e0fea82aaa72f35e3ecf2d01972def7bd8c4b7a697107a6a14a64ab26c0d1cea4692cf62ff1
 DIST cinnamon-translations-5.0.2.tar.gz 12241648 BLAKE2B ee2049154d378c4a48567593aa45277bae09101b1f0ef1916bab6ac5bafd7f7741ece4450398e784958aff8249d8da5b4277e19bf366da3064793bbd924e788a SHA512 97f119db2ee8f4b1c2327e4f2d0c56357cdd7fe2c53df380d6e48af715a56cc2326aecce9d5f5f3292854b0087bd139552d50e1f84938dcd838964bcf84a6cb4
-EBUILD cinnamon-translations-4.8.3.ebuild 1328 BLAKE2B ea49f6317fc3b79941ec10b429e409f1610678618f8214aafae7603266c5f45060d4bd9ff1d6fe78c1a79e7486384651a19e5433da323cb86fe40a7c3a86b4db SHA512 79f14733848351b0d7408e471753f61c2747b40ff56daffaa7e50961b74810e1b14bfead230549c99007088a48096df4088f100683d1024ecff9e13106769771
+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
 MISC metadata.xml 501 BLAKE2B 79e5e721119bb7673c44beae1cfdb6d6987a028a3b16971170ba860c4edf845c6c51c236e4de5430a005e65dd364ea34937d821d47941ad03dbe4da436f6d729 SHA512 4a44ddca6b9e365a71f358d68d24b5cfe62d0cecbfe7c3b86e55c1e5d12e926414f7ae5bc73817eeac3c915f6a9aebfa141b7b880fa6f45d58d01225e2bb1cc3
diff --git a/gnome-extra/cinnamon-translations/cinnamon-translations-4.8.3.ebuild b/gnome-extra/cinnamon-translations/cinnamon-translations-5.2.2.ebuild
index 8c96fc799eb9..2d84d8de8e08 100644
--- a/gnome-extra/cinnamon-translations/cinnamon-translations-4.8.3.ebuild
+++ b/gnome-extra/cinnamon-translations/cinnamon-translations-5.2.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PLOCALES="af am an ar 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 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@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"
+PLOCALES="aa af am an ar ary as ast ay 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 hsb 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
 
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/linuxmint/cinnamon-translations/archive/${PV}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 
 BDEPEND="sys-devel/gettext"
 
diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest
index 274451c38722..2ca12ed50615 100644
--- a/gnome-extra/cinnamon/Manifest
+++ b/gnome-extra/cinnamon/Manifest
@@ -1,9 +1,9 @@
 AUX cinnamon-3.6.6-wheel-sudo.patch 1342 BLAKE2B 173bb9331b51cd0a3110477c8631bd2c887cba6c085d8e8f299810aa83fc83f3e72f8855c40e74637a0453f0fc6b47d972d1a54280ea2eb5538dbe08e7dccd49 SHA512 e59432ca4463652eb5f47075898b78b9025c3a83ca4a305a2c545b9791f8e715cb96c54c550175277dab53cac0f5a6c9fbf78352a09ac977a192e75e800ddb74
 AUX cinnamon-3.8.0-gnome-background-compatibility.patch 1069 BLAKE2B 4908d36ef03e202b76956c96df2dea7f2401d03c3c679ce19ec7e6ad046abf0fa1f1715ee94194a370605454dd3f3a777493c9cad9a88a3878093cda96b77b39 SHA512 a8b810f0aafab57984e8189bcc827e72dad7b9201ff88b36948b701cddb61c3bf003aa7b1986ad3ea526242800cbd183890218471fde7e7d7d2b9550b6688dcc
-AUX cinnamon-4.8.6-build-fixes.patch 981 BLAKE2B 735028024dfe3b0d280875411d03a2a005efb6344650e2278778621e655818c074c894f0988c1f5974ee73e341f8a4304c9834e205701fb2fe0646fbf9b7c9a4 SHA512 6a9de0e477bec8cdddf302c0878dd213f02047a71cdd6b6090cf8ed6616d185880fa18033c24c13bed6e0e651224ddd9c779320c3f441398d6c36b2741a6bd4d
+AUX cinnamon-5.2.7-optional-eds.patch 2550 BLAKE2B c6d1a8fcc476201b692869ea47bc2262b4a79d754ada3c7c9828eb5c48102c7ad79c81482805797fdf3418c8d1f91b833783a6e7e5139c0004fecdfba8539121 SHA512 18187b72bdec52f91fb10835aa4a00df8c392056c447513cb14f8d455243d5c1ea36d25b872b872e0bd23a74a68f1eb46e7214a3ff0277c58264499b1486c9c3
 AUX polkit-cinnamon-authentication-agent-1.desktop 252 BLAKE2B 8a7c10fa19e19c479ab40e9599b8804bc42a78548b9a09f34edc497dc5c9cbcd6958dbbb93cede57c0bf7938cc22f49c229274941b9509ad220e8790ed26bf9e SHA512 7857dc3d08129c37c461b85049d3a12b6602853d7dc44e68d79ce28bbe1121051a2061a4a4de050402230f85755d2800143e3373708fa19d43a001f7f1100360
-DIST cinnamon-4.8.6.tar.gz 2378117 BLAKE2B ae98bf81aa3b2f26d33aa1b5a8109b50d969cb3568322159808c23d13fea6a11790d877a446b3ee4a54f5811fddfb5fca220f46bc213ffc2aa4560e344563f9d SHA512 827d93fa72213e00977d6318da25d9b03279666485ed4c4fd45ece9914c7481f39fa98c64940529a7459cc239783caa9427a2a702f77ffb77fb2c38073e42bbd
 DIST cinnamon-5.0.6.tar.gz 2397950 BLAKE2B e54f8ed02fc36c121d15d30aaed4633f7db30bcf3e0179fb5fa0b9f12b42f0a29b341f531eed7ba19f849c0400ee9887ee59b5218f4558586a360d173798aeea SHA512 3ed835b1c41a34dfd1e2eac7746bfa01fe48359c6c3e8085877a4c18b895ea065efc343a855cbdee3fcbfb63aa40166bbe40fa19154ae1544be675411d49a962
-EBUILD cinnamon-4.8.6.ebuild 5028 BLAKE2B 3afddcd102ded05641665b6b0ba2571119296a4d58aba59bea55824fcbf3e0eef53f84e0a3ed88d168ad4cb06b9169771819d75d46270a01503e0c0aed84ffc2 SHA512 398060a0c4e903a8ebccfc7995ac823f14518fcedf81a1ab771996e7e9314accadb84def76b557d72aaf56c4f43dbd4ca8c09fe1111526f0eb5b8c0c93cca2af
-EBUILD cinnamon-5.0.6.ebuild 5047 BLAKE2B 6729b479ebd8e49e50ada5137affa83b13d864afb5cc0467f031f19d0942390e81ceca4629a95af38d454135d085d5ce0aecd78b9defe63366dc124a8393bb39 SHA512 8af350b2b11231aabccd9690b5c7234912b294ad753ce8c1948e869219ebb3c5afe5519487d129f22adb3866810b6ecc744f87be71f8a358d699da0500aaef21
+DIST cinnamon-5.2.7.tar.gz 2423949 BLAKE2B f4ce9ec4c79eab3daadff958c0a334d49757548203078ab657ebe2450f3f179c942df9d0f9089efe313c268c929628d724db43371e12338606d284a2738ed62c SHA512 62cbbe2f719574b3f70a4895c231be9ad65a41220d2755cc1557bc06bb2b31ced93621c356f2973376d127d5a1e59f9295498bbc4812d428e8605e8f4882c733
+EBUILD cinnamon-5.0.6.ebuild 5054 BLAKE2B 52f7e2a5ec5beb15ae6126bacbd00b50a265fc5ce5d3001688b1a31e3c117b4c25d990ca1501d854198146d9350333bd590f198e5fbfd9e9a0156e41c8f11f75 SHA512 5fd51ead2890c68de3f02938dfd422503e163a1b38b9d95c45de3e25e285f2063ecb01acc68da85539b4b682ace4bd6d68f427f3d978372684a1ce7b262fd9d6
+EBUILD cinnamon-5.2.7.ebuild 5253 BLAKE2B 7a30123d42393780b6bb7c938e3ee23dd03b8fab6567a1385484327131e58f084c8b50381f978bcb41de4f7322028cee4db48aa78d773053fd78beb5cd356dbf SHA512 1df5b0ae6c058414310270ef58d77e21e529f52b0c264fb45aa83e78a8ce359154b4904083acc2e59e7fbd24452782a6c3d39b49f46df837d05ce83e3a3b0989
 MISC metadata.xml 488 BLAKE2B 422b0fe2eb6afbe708925e9fb6fa7f038497b11d51e06165e69e43515a27cf4a77c74a1a10156bbcfd6084704bbfa7f24d4e8a8409970c5d365aa6ba80ab5bd8 SHA512 5952deb426e8adcceb83a9bcaf94bbe96e4f065fbdfd6fa17b08988989f79c3f1de55e58ca13a26a6146b5cef90d8e3853d614d390c7afe0d2494d78ea3df744
diff --git a/gnome-extra/cinnamon/cinnamon-5.0.6.ebuild b/gnome-extra/cinnamon/cinnamon-5.0.6.ebuild
index ffd267b82e46..f07b7f6d2201 100644
--- a/gnome-extra/cinnamon/cinnamon-5.0.6.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-5.0.6.ebuild
@@ -68,7 +68,7 @@ RDEPEND="
 		dev-python/pytz[${PYTHON_USEDEP}]
 		dev-python/setproctitle[${PYTHON_USEDEP}]
 		dev-python/tinycss2[${PYTHON_USEDEP}]
-		>=dev-python/xapp-2.2.0[${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
@@ -82,7 +82,7 @@ RDEPEND="
 	net-misc/wget
 	sys-apps/accountsservice[introspection]
 	sys-power/upower[introspection]
-	>=x11-libs/xapps-2.2.0[introspection]
+	>=x11-libs/xapp-2.2.0[introspection]
 	x11-misc/xdg-utils
 	x11-themes/adwaita-icon-theme
 	x11-themes/gnome-themes-standard
diff --git a/gnome-extra/cinnamon/cinnamon-4.8.6.ebuild b/gnome-extra/cinnamon/cinnamon-5.2.7.ebuild
index 768aacbecf1d..976736f285f6 100644
--- a/gnome-extra/cinnamon/cinnamon-4.8.6.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-5.2.7.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9,10} )
 PYTHON_REQ_USE="xml"
 
 inherit meson gnome2-utils pax-utils python-single-r1 xdg
@@ -14,9 +14,9 @@ SRC_URI="https://github.com/linuxmint/cinnamon/archive/${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-2+"
 SLOT="0"
-IUSE="+gstreamer gtk-doc +nls +networkmanager"
+IUSE="+eds +gstreamer gtk-doc +nls +networkmanager"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 
 DEPEND="
 	${PYTHON_DEPS}
@@ -24,9 +24,9 @@ DEPEND="
 	>=dev-libs/glib-2.52.0:2[dbus]
 	>=dev-libs/gobject-introspection-1.29.15:=
 	dev-libs/libxml2:2
-	>=gnome-extra/cinnamon-desktop-4.8:0=
-	>=gnome-extra/cinnamon-menus-4.8
-	>=gnome-extra/cjs-4.8[cairo]
+	>=gnome-extra/cinnamon-desktop-5.2:0=
+	>=gnome-extra/cinnamon-menus-5.2
+	>=gnome-extra/cjs-5.2[cairo]
 	net-libs/libsoup:2.4[introspection]
 	sys-apps/dbus
 	>=sys-auth/polkit-0.100[introspection]
@@ -38,8 +38,11 @@ DEPEND="
 	>=x11-libs/libXfixes-5.0
 	x11-libs/pango[introspection]
 	>=x11-libs/startup-notification-0.11
-	>=x11-wm/muffin-4.8.0[introspection]
+	>=x11-wm/muffin-5.2[introspection]
 
+	eds? (
+		gnome-extra/evolution-data-server
+	)
 	gstreamer? (
 		media-libs/gst-plugins-base:1.0
 		media-libs/gstreamer:1.0
@@ -68,27 +71,27 @@ RDEPEND="
 		dev-python/pytz[${PYTHON_USEDEP}]
 		dev-python/setproctitle[${PYTHON_USEDEP}]
 		dev-python/tinycss2[${PYTHON_USEDEP}]
-		dev-python/xapp[${PYTHON_USEDEP}]
+		>=dev-python/python3-xapp-2.2.1-r1[${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-4.8[networkmanager=]
-	>=gnome-extra/cinnamon-screensaver-4.8
-	>=gnome-extra/cinnamon-session-4.8
-	>=gnome-extra/cinnamon-settings-daemon-4.8
-	>=gnome-extra/nemo-4.8
+	>=gnome-extra/cinnamon-control-center-5.2[networkmanager=]
+	>=gnome-extra/cinnamon-screensaver-5.2
+	>=gnome-extra/cinnamon-session-5.2
+	>=gnome-extra/cinnamon-settings-daemon-5.2
+	>=gnome-extra/nemo-5.2
 	gnome-extra/polkit-gnome
 	net-misc/wget
 	sys-apps/accountsservice[introspection]
 	sys-power/upower[introspection]
-	>=x11-libs/xapps-2.0.5[introspection]
+	>=x11-libs/xapp-2.2.8[introspection]
 	x11-misc/xdg-utils
 	x11-themes/adwaita-icon-theme
 	x11-themes/gnome-themes-standard
 
 	nls? (
-		>=gnome-extra/cinnamon-translations-4.8
+		>=gnome-extra/cinnamon-translations-5.2
 	)
 "
 BDEPEND="
@@ -108,9 +111,8 @@ PATCHES=(
 	# https://github.com/linuxmint/Cinnamon/issues/3576
 	"${FILESDIR}"/${PN}-3.6.6-wheel-sudo.patch
 
-	# GStreamer only needed for recorder
-	# https://github.com/linuxmint/cinnamon/pull/9809
-	"${FILESDIR}"/${PN}-4.8.6-build-fixes.patch
+	# Make evolution-data-server integration optional
+	"${FILESDIR}"/${PN}-5.2.7-optional-eds.patch
 )
 
 src_prepare() {
@@ -129,9 +131,11 @@ src_prepare() {
 
 src_configure() {
 	local emesonargs=(
+		$(meson_use eds build_calendar_server)
 		$(meson_use gstreamer build_recorder)
 		$(meson_use gtk-doc docs)
 		-Ddisable_networkmanager=$(usex networkmanager false true)
+		-Dpy3modules_dir="$(python_get_sitedir)"
 	)
 	meson_src_configure
 }
@@ -139,6 +143,7 @@ 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
@@ -166,7 +171,8 @@ pkg_postinst() {
 			ewarn "org.cinnamon.recorder/pipeline to what you want to use."
 		fi
 	else
-		ewarn "Cinnamon's built-in screen recording utility is disabled."
+		ewarn "Cinnamon's built-in screen recording utility is not installed"
+		ewarn "because gstreamer support is disabled."
 	fi
 }
 
diff --git a/gnome-extra/cinnamon/files/cinnamon-4.8.6-build-fixes.patch b/gnome-extra/cinnamon/files/cinnamon-4.8.6-build-fixes.patch
deleted file mode 100644
index bc4476a5892e..000000000000
--- a/gnome-extra/cinnamon/files/cinnamon-4.8.6-build-fixes.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/meson.build b/meson.build
-index a4d49a16..eff937ac 100644
---- a/meson.build
-+++ b/meson.build
-@@ -36,8 +36,6 @@ gio_unix = dependency('gio-unix-2.0')
- gl = dependency('gl')
- glib_version = '2.52.0'
- glib = dependency('glib-2.0', version: '>= ' + glib_version)
--gstreamer = dependency('gstreamer-1.0')
--gstreamer_base = dependency('gstreamer-base-1.0')
- gtk = dependency('gtk+-3.0', version: '>= 3.12.0')
- muffin = dependency('libmuffin', version: '>= 4.0.3')
- muffinlibdir = muffin.get_pkgconfig_variable('typelibdir')
-@@ -53,6 +51,14 @@ if has_nm
-     dependency('libnm')
- endif
- 
-+if get_option('build_recorder')
-+	gstreamer = dependency('gstreamer-1.0')
-+	gstreamer_base = dependency('gstreamer-base-1.0')
-+else
-+	gstreamer = dependency('', required: false)
-+	gstreamer_base = dependency('', required: false)
-+endif
-+
- # on some systems we need to find the math lib to make sure it builds
- cc = meson.get_compiler('c')
- math = cc.find_library('m', required: false)
diff --git a/gnome-extra/cinnamon/files/cinnamon-5.2.7-optional-eds.patch b/gnome-extra/cinnamon/files/cinnamon-5.2.7-optional-eds.patch
new file mode 100644
index 000000000000..c0646359552b
--- /dev/null
+++ b/gnome-extra/cinnamon/files/cinnamon-5.2.7-optional-eds.patch
@@ -0,0 +1,85 @@
+diff --git a/files/usr/share/cinnamon/applets/calendar@cinnamon.org/eventView.js b/files/usr/share/cinnamon/applets/calendar@cinnamon.org/eventView.js
+index 1d1035c60..ebfd5a3a4 100644
+--- a/files/usr/share/cinnamon/applets/calendar@cinnamon.org/eventView.js
++++ b/files/usr/share/cinnamon/applets/calendar@cinnamon.org/eventView.js
+@@ -301,7 +301,7 @@ class EventsManager {
+     }
+ 
+     start_events() {
+-        if (this._calendar_server == null) {
++        if (this._calendar_server == null && Cinnamon.CalendarServerProxy) {
+             Cinnamon.CalendarServerProxy.new_for_bus(
+                 Gio.BusType.SESSION,
+                 // Gio.DBusProxyFlags.NONE,
+diff --git a/meson.build b/meson.build
+index 2c1baf47d..aba5d5a30 100644
+--- a/meson.build
++++ b/meson.build
+@@ -179,6 +179,9 @@ install_subdir(
+     strip_directory: true,
+ )
+ 
+-subdir('calendar-server')
++
++if get_option('build_calendar_server')
++    subdir('calendar-server')
++endif
+ subdir('python3')
+ subdir('install-scripts')
+diff --git a/meson_options.txt b/meson_options.txt
+index 82422246b..752f7904e 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -13,6 +13,11 @@ option('build_recorder',
+     value: true,
+     description: 'Build the cinnamon recorder into source'
+ )
++option('build_calendar_server',
++    type: 'boolean',
++    value: true,
++    description: 'Build the cinnamon EDS calendar server'
++)
+ option('disable_networkmanager',
+     type: 'boolean',
+     value: false,
+diff --git a/src/meson.build b/src/meson.build
+index 7999c0a67..1b22aa279 100644
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -3,12 +3,6 @@ subdir('hotplug-sniffer')
+ 
+ include_src = include_directories('.')
+ 
+-calendar_generated = gnome.gdbus_codegen('cinnamon-calendar',
+-  sources: 'org.cinnamon.CalendarServer.xml',
+-  interface_prefix: 'org.cinnamon.',
+-  namespace: 'Cinnamon'
+-)
+-
+ cinnamon_headers = [
+     'cinnamon-app.h',
+     'cinnamon-app-system.h',
+@@ -59,10 +53,21 @@ cinnamon_sources = [
+     'cinnamon-window-tracker.c',
+     'cinnamon-wm.c',
+     'cinnamon-xfixes-cursor.c',
+-    cinnamon_headers,
+-    calendar_generated
++    cinnamon_headers
+ ]
+ 
++if get_option('build_calendar_server')
++    calendar_generated = gnome.gdbus_codegen('cinnamon-calendar',
++      sources: 'org.cinnamon.CalendarServer.xml',
++      interface_prefix: 'org.cinnamon.',
++      namespace: 'Cinnamon'
++    )
++
++    cinnamon_sources += [
++        calendar_generated
++    ]
++endif
++
+ cinnamon_enum_types = gnome.mkenums_simple(
+     'cinnamon-enum-types',
+     sources: cinnamon_headers,
diff --git a/gnome-extra/cjs/Manifest b/gnome-extra/cjs/Manifest
index 6e6ce17d7fd3..12c512c61bff 100644
--- a/gnome-extra/cjs/Manifest
+++ b/gnome-extra/cjs/Manifest
@@ -1,6 +1,5 @@
-AUX cjs-5.0.1-meson-0.60.2.patch 3157 BLAKE2B 94732f1365b4d6bb103ebe61d58e2503693ed50d36be20977cafb426c2c564812cb58ae17dfc0f38eddcc4eb6f14a146c4df287acda48643e49136597d7b5baf SHA512 8bccc41dda24c86efb9e01bb4370d7387f415c3a809049cd5788410b1ca93b1c887ad5f9b71c1628c2c2e80028445df58b3d999117b35b58c94241970ae21f21
-DIST cjs-4.8.2.tar.gz 600711 BLAKE2B d1506e599c05301083479df4145d3177c9cbb057d3ed260e9744994da70fe392eb2cd872dc00b1ef6269efe9442e32e16878ba975f57f1abc35851cb15e7bb97 SHA512 c607198847a3229443bbfa6906b05036295b6d7f95d3b355780b28e69382407a8f6ef5f637f411fbf2ae474c4c7c5f68f64fec6dd7a2e7f944945927f5efac91
 DIST cjs-5.0.1.tar.gz 602005 BLAKE2B 7592b5b0be8fed1efc9fe1c7baca081515b8010935e24ba0cb1e30ce78890941f5c3b2384ee3846a02c3ba5a50c6d6ce5df232f02507743cf15ac089e29d7f23 SHA512 a341e8deae33baf51ed21ea0b03484ba459d83be8689f3928acbd286ebe878719cdd6b4c576907b08b117b3c5738a11f95d0e37ae21f94ae6b88631fad5d3375
-EBUILD cjs-4.8.2-r1.ebuild 1500 BLAKE2B 98ddb93f7a2821d36c85711294e7c5980a93e5acbfcb85e664a40cd612c692306c5c49b145c77c264015383671340b53a1a6ad3ef7fb052a2f985ca567539c2e SHA512 a0f6e4494134d72a9f04d291c4d79557c9fee193c3fb07aa757724e6df6bcaef04e43837bad39c2c8e273ae9e9bf158d365b381a82369f707e8f129efd266fa7
-EBUILD cjs-5.0.1.ebuild 1564 BLAKE2B 8292114e5681b8de5226bf7a212f99392e71e82aec35fd8a7ab7ce977652e70137fdc93ab39bd9064b5a2509cc5ec78c621a623bf1bb5946a3a4039db83457e9 SHA512 fd16ccdc02ba6ef4d8c033cbc2ab5c98217aeb5c1c373c4bc094771cbaacc99d7078d59c1f86c63b22b0928dfdf70b996aa77b53e6547e4f80c40c715c952900
+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
 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
index 6252c94cb33f..cc39b0d608f5 100644
--- a/gnome-extra/cjs/cjs-5.0.1.ebuild
+++ b/gnome-extra/cjs/cjs-5.0.1.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/cjs/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
 SLOT="0"
-IUSE="+cairo examples gtk readline sysprof test"
+IUSE="+cairo examples readline sysprof test"
 KEYWORDS="amd64 ~arm64 ~riscv x86"
 
 RDEPEND="
@@ -30,8 +30,7 @@ DEPEND="
 	sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 )
 	test? (
 		sys-apps/dbus
-
-		gtk? ( x11-libs/gtk+:3[introspection] )
+		x11-libs/gtk+:3[introspection]
 	)
 "
 BDEPEND="
@@ -39,10 +38,6 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
-PATCHES=(
-	"${FILESDIR}/cjs-5.0.1-meson-0.60.2.patch"
-)
-
 src_prepare() {
 	default
 	python_fix_shebang build
diff --git a/gnome-extra/cjs/cjs-4.8.2-r1.ebuild b/gnome-extra/cjs/cjs-5.2.0.ebuild
index 921184eaa289..bf8e76b942a0 100644
--- a/gnome-extra/cjs/cjs-4.8.2-r1.ebuild
+++ b/gnome-extra/cjs/cjs-5.2.0.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} )
+PYTHON_COMPAT=( python3_{7,8,9,10} )
 
 inherit meson pax-utils python-any-r1 virtualx
 
@@ -13,8 +13,8 @@ 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 gtk readline sysprof test"
-KEYWORDS="amd64 ~arm64 x86"
+IUSE="+cairo examples readline sysprof test"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 
 RDEPEND="
 	dev-lang/spidermonkey:78
@@ -30,8 +30,7 @@ DEPEND="
 	sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 )
 	test? (
 		sys-apps/dbus
-
-		gtk? ( x11-libs/gtk+:3[introspection] )
+		x11-libs/gtk+:3[introspection]
 	)
 "
 BDEPEND="
diff --git a/gnome-extra/cjs/files/cjs-5.0.1-meson-0.60.2.patch b/gnome-extra/cjs/files/cjs-5.0.1-meson-0.60.2.patch
deleted file mode 100644
index 1ce4eef2abb2..000000000000
--- a/gnome-extra/cjs/files/cjs-5.0.1-meson-0.60.2.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 61823ced59db5ce7a4223ce2759f3da52d83a0de Mon Sep 17 00:00:00 2001
-From: Jan Beich <jbeich@FreeBSD.org>
-Date: Sat, 27 Nov 2021 23:21:56 +0000
-Subject: [PATCH] build: disable gir install via list to pacify meson >= 0.60.2
-
-meson.build:541:0: ERROR: "install_dir" must be specified when installing a target
-installed-tests/js/meson.build:47:0: ERROR: "install_dir" must be specified when installing a target
-installed-tests/js/meson.build:66:0: ERROR: "install_dir" must be specified when installing a target
-installed-tests/js/meson.build:81:0: ERROR: "install_dir" must be specified when installing a target
----
- installed-tests/js/meson.build | 6 +++---
- meson.build                    | 2 +-
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/installed-tests/js/meson.build b/installed-tests/js/meson.build
-index d3125a7c..564124f2 100644
---- a/installed-tests/js/meson.build
-+++ b/installed-tests/js/meson.build
-@@ -48,7 +48,7 @@ regress_gir = gnome.generate_gir(libregress, includes: regress_gir_includes,
-     sources: regress_sources, namespace: 'Regress', nsversion: '1.0',
-     identifier_prefix: 'Regress', symbol_prefix: 'regress_',
-     extra_args: ['--warn-all', '--warn-error'] + regress_gir_c_args,
--    install: get_option('installed_tests'), install_dir_gir: false,
-+    install: get_option('installed_tests'), install_dir_gir: [false],
-     install_dir_typelib: installed_tests_execdir)
- regress_typelib = regress_gir[1]
- 
-@@ -66,7 +66,7 @@ libwarnlib = library('warnlib', warnlib_sources,
- warnlib_gir = gnome.generate_gir(libwarnlib, includes: ['Gio-2.0'],
-     sources: warnlib_sources, namespace: 'WarnLib', nsversion: '1.0',
-     symbol_prefix: 'warnlib_', header: 'warnlib.h',
--    install: get_option('installed_tests'), install_dir_gir: false,
-+    install: get_option('installed_tests'), install_dir_gir: [false],
-     install_dir_typelib: installed_tests_execdir)
- warnlib_typelib = warnlib_gir[1]
- 
-@@ -82,7 +82,7 @@ gimarshallingtests_gir = gnome.generate_gir(libgimarshallingtests,
-     includes: ['Gio-2.0'], sources: gimarshallingtests_sources,
-     namespace: 'GIMarshallingTests', nsversion: '1.0',
-     symbol_prefix: 'gi_marshalling_tests_', extra_args: '--warn-error',
--    install: get_option('installed_tests'), install_dir_gir: false,
-+    install: get_option('installed_tests'), install_dir_gir: [false],
-     install_dir_typelib: installed_tests_execdir)
- gimarshallingtests_typelib = gimarshallingtests_gir[1]
- 
-diff --git a/meson.build b/meson.build
-index aa55addc..43ba4af1 100644
---- a/meson.build
-+++ b/meson.build
-@@ -542,7 +542,7 @@ gjs_private_gir = gnome.generate_gir(libgjs,
-     includes: ['GObject-2.0', 'Gio-2.0'], sources: libgjs_private_sources,
-     namespace: 'CjsPrivate', nsversion: '1.0', identifier_prefix: 'Gjs',
-     symbol_prefix: 'gjs_', extra_args: '--warn-error', install: true,
--    install_dir_gir: false, install_dir_typelib: pkglibdir / 'girepository-1.0')
-+    install_dir_gir: [false], install_dir_typelib: pkglibdir / 'girepository-1.0')
- gjs_private_typelib = gjs_private_gir[1]
- 
- ### Build gjs-console interpreter ##############################################
diff --git a/gnome-extra/eiciel/Manifest b/gnome-extra/eiciel/Manifest
index a8c5fe8e5e7f..5e6e63c99d52 100644
--- a/gnome-extra/eiciel/Manifest
+++ b/gnome-extra/eiciel/Manifest
@@ -1,6 +1,3 @@
-AUX eiciel_participant_target.hpp 1067 BLAKE2B 552ecec8247cd85d9124a7be1fa263e96ffd8f5ed3de1a06d4fa6c071a2f3b40f8c9e238c182c241976158bc4361393e5adc853160c0ce998e4de0116e296348 SHA512 af9d3872d884b73b562a6447d9bace430039cec83a6e1b7ba2df47cf91b9b67d9bb09a7bbc71fc0862fddf0b2e34d7e72bedb90886b767a338725a5fa2fd8fda
 DIST eiciel-0.9.13.1.tar.bz2 708191 BLAKE2B f80faf2f529db99fe60c78d60f854e8d92cc3fc3f1044517b5282a09175d80b695bfaee13b8f58fbfb2b7e1eff8a702f552231d75970ceedb3da813a8a95cea1 SHA512 91a79be7585a21addf47b23df7d03d6a44bdf541f52026b3124d6434e4fa379b9a1cd55eb9f164dba843c1fa73b669cca5d2a34d44b6c325dd0bdbaa701c7c9d
-DIST eiciel-0.9.13.tar.bz2 707838 BLAKE2B 30702b20482984885dfdb222e631f7572f3199b93509baa48762c0925b1fd78e1601a1279e7454543ddc32e813288cd01f0fdc2cb0c2eb0c5812cefcf8cac29f SHA512 7b5fde27e2d28c69f02092896bb0065372f93319d8ff8ad285b8b0e52acbe6d43b96f7dc215d7210602c6f766b48d2e2c66361dd28ea0f567ed6faf3bbcfdd14
-EBUILD eiciel-0.9.13.1.ebuild 749 BLAKE2B a0b23d0cb42aea89316b716816b6b4847e96471981e15f9f1ff60a6dc2ec4383313d5e2fe99692ba3eb9150ae41d3dbc5e3e4beb51b136069efa0828aceba709 SHA512 5b547c823834af5d3a24a38f7bdf3e1e897fe3c22f6530e7583d177336f9ef735f561a853f61966801c44d7a735712a2c71bbf35718d116b577cb086b00af7b6
-EBUILD eiciel-0.9.13.ebuild 880 BLAKE2B 6ffce24f22b0b6b6c7dbe5063102fa24981bceae0beb77de24f35e2fa605dfcea7163ab30d0fb11a700198726842f1217496b417baab4c84cda7e5b837a2dcc9 SHA512 37b69856c4c2d4e782ada9bdc55468b5d259ec509ac1302a5f63ed581c5f364cbe9dda8e7e3faa41f6bc3c08925f5938e45f481781d4fc60b078fa58e1e6ee64
+EBUILD eiciel-0.9.13.1.ebuild 747 BLAKE2B 1a265316a9f59aac0bd8df70b7c8a03a3abb9fa4c9c37e906f85ea5e87d0ecbb9240ef4b45ceea8b0861b5a06a4659b1122532ba24d05b0f4e92c35bd1245425 SHA512 5b6636ad007e38431c94146b7c142707a0d4320230327b0e7f129e13e0c31b7c4ca0c1549a4a092934c8c43587bcf7cdb41a5a49f3e4c3cacc654afd86e6f038
 MISC metadata.xml 329 BLAKE2B f1e869ec74fb864b9c7f702320f112d1fbd7ac9cc6af91c0b3b1ffdcff9d777fcc312eda26f646aba09cbaa8b32bd3fe12f94432cd92dd7db5a733ddf522ce57 SHA512 50f8ff97a66fb03b6035c4cd82fde3fff026dd95c4d95e845d1204d7959398333803b8cb0fb5dd0499bd6a5edb5bbafb87e40c0bfac1a119a42774674b6f1112
diff --git a/gnome-extra/eiciel/eiciel-0.9.13.1.ebuild b/gnome-extra/eiciel/eiciel-0.9.13.1.ebuild
index 5ea9779a81fb..40621f642107 100644
--- a/gnome-extra/eiciel/eiciel-0.9.13.1.ebuild
+++ b/gnome-extra/eiciel/eiciel-0.9.13.1.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://rofi.roger-ferrer.org/eiciel/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="nautilus xattr"
 
 DEPEND="
diff --git a/gnome-extra/eiciel/eiciel-0.9.13.ebuild b/gnome-extra/eiciel/eiciel-0.9.13.ebuild
deleted file mode 100644
index 0c18719fb3d3..000000000000
--- a/gnome-extra/eiciel/eiciel-0.9.13.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome2
-
-DESCRIPTION="ACL editor for GNOME, with Nautilus extension"
-HOMEPAGE="https://rofi.roger-ferrer.org/eiciel/"
-SRC_URI="https://rofi.roger-ferrer.org/eiciel/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="nautilus xattr"
-
-DEPEND="
-	>=sys-apps/acl-2.2.32
-	dev-cpp/gtkmm:3.0
-	>=dev-cpp/glibmm-2.50:2
-	nautilus? ( >=gnome-base/nautilus-3 )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	>=sys-devel/gettext-0.18.1
-"
-
-src_unpack() {
-	default
-
-	# https://github.com/rofirrim/eiciel/pull/6
-	cp "${FILESDIR}"/eiciel_participant_target.hpp "${S}"/src/
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		--with-gnome-version=3 \
-		$(use_enable nautilus nautilus-extension) \
-		$(use_enable xattr user-attributes)
-}
diff --git a/gnome-extra/eiciel/files/eiciel_participant_target.hpp b/gnome-extra/eiciel/files/eiciel_participant_target.hpp
deleted file mode 100644
index a8072b642ff9..000000000000
--- a/gnome-extra/eiciel/files/eiciel_participant_target.hpp
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
-    Eiciel - GNOME editor of ACL file permissions.
-    Copyright (C) 2019 Roger Ferrer Ibáñez
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301,  USA
-*/
-
-#ifndef EICIEL_PARTICIPANT_TARGET_HPP
-#define EICIEL_PARTICIPANT_TARGET_HPP
-
-enum class AddParticipantTarget {
-  ADD_PARTICIPANT = 0,
-  ADD_PARTICIPANT_TO_DIRECTORY,
-  ADD_PARTICIPANT_TO_FILE,
-};
-
-#endif // EICIEL_PARTICIPANT_TARGET_HPP
diff --git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest
index 5fa8daf702f4..934d9d353d57 100644
--- a/gnome-extra/evolution-data-server/Manifest
+++ b/gnome-extra/evolution-data-server/Manifest
@@ -1,9 +1,7 @@
 AUX 3.36.5-gtk-doc-1.32-compat.patch 1016 BLAKE2B 6458aa6e2bb41ce07bf74910ef36aafab895dec6e85c4262c346bbe518165ca2ca7778e3d97182d4f6c619313ed016a186dc88fd349a9bd1770441afb09f6e01 SHA512 3a43ee8128896eccdc35e65155aba5d38a4311cd8d848f506cba3473248595ea078b748c639b9a5f11842272b5e212a01d714a3177e4cd1e95d15680081feaa5
 AUX calentry.schema 3661 BLAKE2B 0235e8d98d1367f209a31cc74da9563d53dfc12ca34e020f63a18fcb73c13345e58a9e4a9f5bb3e14a7774bdcd279118d84d971a4b164c8ce41cd26798efabdd SHA512 56606848319539b8c9af732a5d572db44e2d7da433b1689ef7f14a283880951e10d5fc39f27245a7ddc8f0cb2e7563a757060020c17e5411f875cae10b119834
 DIST evolution-data-server-3.40.4.tar.xz 4622640 BLAKE2B 93a4570da53fb34b496cd471e5daff07fa044ed5c230f7de85276ab9aacd0f2e6c6f749a0d63d076fc192e695f68a0c451a7a6573621ff5092cd5ea6a9302ee2 SHA512 664c2d41b6f212e6ddef554767ca651e4179ce861898cb11ed373f30473c2a1a3a47191ae504be7d38beb0e721782564b70f5f519a3184216a02be1bd89678b5
-DIST evolution-data-server-3.42.2.tar.xz 4622324 BLAKE2B e321302c64317773122701a40f9ac418165e6fa98500481b73e05fcb86f71974de1469ade4d0aa42c6e9a0cae73e570a8abc0f70b846de72fa20305d2296273d SHA512 a0329180bac12d9723efd42938335ae46492cdd774358c411e89de3ef34b4d2cdbdb77fb13d8e1ad27a89f9bf64d2f78f3e25e54fbbaa9076dab2d866705de05
 DIST evolution-data-server-3.42.3.tar.xz 4622976 BLAKE2B 41dc75929f8e1067f93f2f05e9c9a036274625722266e023e79d8415d3b38c74c18fd47225b23dfe03ed6ec8a34234bbeca11a6f7224825abea3c030b683ea3e SHA512 2c50e1c381b70e478d8dd6d548a3ae0228cd60619a3c3d660d4a291d7b986b42c7d5b262d57f6fc4aacf0623c084edb59353f3f2d5ada9f39747a2a94627176b
 EBUILD evolution-data-server-3.40.4.ebuild 4327 BLAKE2B a48594fcfc6e193d5e31f3f46c2df1afdd2ab9126db45bc05b4f7143c7aeaff306513e18eace0886a00b675fcb8a47afbeeef477384d54223f112f6f51c52b95 SHA512 289672fb429342cc47d7bf61906658fad63a519d7e8c09433f39d558bc7318c2a5feb427504e5b86eb2c937962ce75e5ff5c06214635601706438c67b840a7f6
-EBUILD evolution-data-server-3.42.2.ebuild 4387 BLAKE2B 1f8c25701df8fd5de3a19d62ce7e9c24fd6cb247145c3df9c40f88348f08688c5e060eabcd20780e653b1322eaddfb59ccb162dc47c9e6a79d445af4d6d3987c SHA512 4440e08b1614e8408f1aaa99299feeb44ec3eda9ee0acdbec963fa9ac7270d5c705637bd4d0412a8b727fffabeb1d1db35d73732df6a0d3dd8fb06f8a6f6a36b
 EBUILD evolution-data-server-3.42.3.ebuild 4379 BLAKE2B cf31bde4a61e4345825de1bed73899147da670b57a070e495782aa9bace79fb3c1f9c5e201c7dd319190f37c45f8fd9469a37225a4107e6f607c562359e63f22 SHA512 aa2a410c5b66465744deac23b1c43e0933177b68cdebd0186e5f922d4361bb6da518b604810b2044c5f4630898a149ddec7a5a7f61bbb9343a19a248d804705d
 MISC metadata.xml 850 BLAKE2B f3e730c63794d5890e76c1f2c7e388b1d6320fc6ef64fa405365a27e7d3883fd09b9cfd875ef0d774bdd51eae5237fff0fd7bd1e6be81a2e0d9252e0b1263afe SHA512 8657f87116f9ad70c24711f270f7b71a57e48bb4f9a8780900f9f6d3da550d0f7b6ae2da453ff6bb76ffd948935f534fdb4b3545a46b0129fbae68a8d1fcecdb
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.42.2.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.42.2.ebuild
deleted file mode 100644
index 42b2525574f3..000000000000
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.42.2.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-VALA_USE_DEPEND="vapigen"
-
-inherit cmake db-use flag-o-matic gnome2 systemd vala virtualx
-
-DESCRIPTION="Evolution groupware backend"
-HOMEPAGE="https://wiki.gnome.org/Apps/Evolution"
-
-# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+".
-LICENSE="|| ( LGPL-2 LGPL-3 ) BSD Sleepycat"
-SLOT="0/63-26-20" # subslot = libcamel-1.2/libedataserver-1.2/libebook-1.2.so soname version
-
-IUSE="berkdb +gnome-online-accounts +gtk gtk-doc +introspection ipv6 ldap kerberos oauth vala +weather"
-REQUIRED_USE="vala? ( introspection )"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-
-# gdata-0.17.7 soft required for new gdata_feed_get_next_page_token API to handle more than 100 google tasks
-# berkdb needed only for migrating old addressbook data from <3.13 versions, bug #519512
-# glib-2.70 for build-time optional GPowerProfileMonitor
-gdata_depend=">=dev-libs/libgdata-0.17.7:="
-RDEPEND="
-	>=app-crypt/gcr-3.4
-	>=app-crypt/libsecret-0.5[crypt]
-	>=dev-db/sqlite-3.7.17:=
-	>=dev-libs/glib-2.70:2
-	>=dev-libs/libical-3.0.8:=[glib,introspection?]
-	>=dev-libs/libxml2-2
-	>=dev-libs/nspr-4.4:=
-	>=dev-libs/nss-3.9:=
-	>=net-libs/libsoup-2.58:2.4
-
-	dev-libs/icu:=
-	sys-libs/zlib:=
-	virtual/libiconv
-
-	berkdb? ( >=sys-libs/db-4:= )
-	gtk? (
-		>=app-crypt/gcr-3.4[gtk]
-		>=x11-libs/gtk+-3.16:3
-		>=media-libs/libcanberra-0.25[gtk3]
-	)
-	oauth? (
-		>=dev-libs/json-glib-1.0.4
-		>=net-libs/webkit-gtk-2.28.0:4
-		${gdata_depend}
-	)
-	gnome-online-accounts? (
-		>=net-libs/gnome-online-accounts-3.8:=
-		${gdata_depend} )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.12:= )
-	kerberos? ( virtual/krb5:= )
-	ldap? ( >=net-nds/openldap-2:= )
-	weather? ( >=dev-libs/libgweather-3.10:2= )
-"
-DEPEND="${RDEPEND}
-	vala? ( $(vala_depend)
-		net-libs/libsoup:2.4[vala]
-		dev-libs/libical[vala]
-		oauth? ( dev-libs/libgdata[vala] )
-		gnome-online-accounts? ( dev-libs/libgdata[vala] )
-	)
-"
-BDEPEND="
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	dev-util/gperf
-	gtk-doc? ( >=dev-util/gtk-doc-1.14
-		app-text/docbook-xml-dtd:4.1.2 )
-	>=dev-util/intltool-0.35.5
-	>=sys-devel/gettext-0.18.3
-	virtual/pkgconfig
-"
-
-# Some tests fail due to missing locales.
-# Also, dbus tests are flaky, bugs #397975 #501834
-# It looks like a nightmare to disable those for now.
-RESTRICT="test !test? ( test )"
-
-# global scope PATCHES or DOCS array mustn't be used due to double default_src_prepare call
-src_prepare() {
-	use vala && vala_src_prepare
-	cmake_src_prepare
-	gnome2_src_prepare
-
-	eapply "${FILESDIR}"/3.36.5-gtk-doc-1.32-compat.patch
-
-	# Make CMakeLists versioned vala enabled
-	sed -e "s;\(find_program(VALAC\) valac);\1 ${VALAC});" \
-		-e "s;\(find_program(VAPIGEN\) vapigen);\1 ${VAPIGEN});" \
-		-i "${S}"/CMakeLists.txt || die
-}
-
-src_configure() {
-	# /usr/include/db.h is always db-1 on FreeBSD
-	# so include the right dir in CPPFLAGS
-	use berkdb && append-cppflags "-I$(db_includedir)"
-
-	local google_enable
-	if use oauth || use gnome-online-accounts; then
-		google_enable="ON"
-	else
-		google_enable="OFF"
-	fi
-
-	# phonenumber does not exist in tree
-	local mycmakeargs=(
-		-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
-		-DENABLE_GTK_DOC=$(usex gtk-doc)
-		-DWITH_PRIVATE_DOCS=$(usex gtk-doc)
-		-DENABLE_SCHEMAS_COMPILE=OFF
-		-DENABLE_INTROSPECTION=$(usex introspection)
-		-DWITH_KRB5=$(usex kerberos)
-		-DWITH_KRB5_INCLUDES=$(usex kerberos "${EPREFIX}"/usr "")
-		-DWITH_KRB5_LIBS=$(usex kerberos "${EPREFIX}"/usr/$(get_libdir) "")
-		-DWITH_OPENLDAP=$(usex ldap)
-		-DWITH_PHONENUMBER=OFF
-		-DENABLE_SMIME=ON
-		-DENABLE_GTK=$(usex gtk)
-		-DENABLE_CANBERRA=$(usex gtk)
-		-DENABLE_OAUTH2=$(usex oauth)
-		-DENABLE_EXAMPLES=OFF
-		-DENABLE_GOA=$(usex gnome-online-accounts)
-		-DWITH_LIBDB=$(usex berkdb "${EPREFIX}"/usr OFF)
-		# ENABLE_BACKTRACES requires libdwarf ?
-		-DENABLE_IPV6=$(usex ipv6)
-		-DENABLE_WEATHER=$(usex weather)
-		-DENABLE_GOOGLE=${google_enable}
-		-DENABLE_LARGEFILE=ON
-		-DENABLE_VALA_BINDINGS=$(usex vala)
-	)
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-}
-
-src_test() {
-	virtx cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-
-	if use ldap; then
-		insinto /etc/openldap/schema
-		doins "${FILESDIR}"/calentry.schema
-		dosym ../../../usr/share/${PN}/evolutionperson.schema /etc/openldap/schema/evolutionperson.schema
-	fi
-}
diff --git a/gnome-extra/evolution-ews/Manifest b/gnome-extra/evolution-ews/Manifest
index 7cd77c8e1887..5fe70618ef43 100644
--- a/gnome-extra/evolution-ews/Manifest
+++ b/gnome-extra/evolution-ews/Manifest
@@ -1,11 +1,5 @@
-DIST evolution-ews-3.40.3.tar.xz 673800 BLAKE2B 4d8cbce33552a40551db08f25bb784ec1b54df0672bab95cd278de6a761a0ed05d5d21754107043fcfde1b533edfbce6a25b2d7fc3c6e885bc7618efd8c89763 SHA512 c35da74f1c52dabf1d3373654a70a7fa005cbc8ebb30a64c3315cffae222221a049918eb9821773020a7178c64caac0b9360ea562eda748b1e26911fcb4fcb90
 DIST evolution-ews-3.40.4.tar.xz 673888 BLAKE2B 532b708795db3ffdff69b44d31c49ff9c4800b527b09d4440b383a16f6ad283cea5ebdfae5cf104e08d8f2166d7269d6810d4ae6ead2c55af7f77633292d7376 SHA512 7f89e8cebf5931bd7d2f636b1780d914f069fb62ac4e14ad0ab2c9759e4553bc5d58a53b65a635c7b5be298fc017f375f9ca4d1c96002804093b9f47107455f2
-DIST evolution-ews-3.42.0.tar.xz 682796 BLAKE2B 6b9fe9d2cae4be586d0cc96188a9e4b10c2fdc3ba0044b19daac70039019f2422416899a7c020c633d473372d424c826aa3a78b5d4b6f0d091364d9db6786ce2 SHA512 62e912827a31b6cf23b572206f27981b255d27cccd252209b1927eb99e39ad6a9a3db7e0c410664c81ff6dfa2156cf0853ea211de3e8fdb4c26db22b19f9ddd9
-DIST evolution-ews-3.42.1.tar.xz 685356 BLAKE2B b3be78f64fbac8fac5fca284850e214304a1b8fdad7354a7ce5134fa12514d36425bf8b841c1a21c58df5604f94a86650325efc052bd5f826105a7d5d001deaf SHA512 42dd9a935d6bd59ccd54340b92fcbaf31c262234563928792116edc31bdf5b078caa8fba0d54084ce168f243652a890e02d3789d44512bcfc808083515bd5e32
 DIST evolution-ews-3.42.3.tar.xz 685692 BLAKE2B 6e9a06c78d54f119e0d942dc830d118fc7a0b19c16fa3729491b695ac01c582b1124d895d3f56ccadf72fca5716491f29a6ca6ac216fea2ea2cd1a26bdd3f5ed SHA512 e740796e4c4afc8946592195d21aac2171724cad6069001c7d2af36f1deb8d25f89ce825898faa9e042fb6e32571f7556579bf984da0573118739e314fb7bff9
-EBUILD evolution-ews-3.40.3.ebuild 1406 BLAKE2B 3f9e641161aed979aeb855552dca3675183ca22390d3d1016e280416b227ba571b8af864ef02d5628f757ad33c6f523f50e269e6637958f36f7fe2375c777ffb SHA512 05b7067ab291bb6e126a2cdcaa28309ebc22669bd4a870762df1b292c0d0b34f0263f56fa652702606036c7816ea1ceb98d95d1bb9a41749259510244d594b2b
 EBUILD evolution-ews-3.40.4.ebuild 1406 BLAKE2B 3f9e641161aed979aeb855552dca3675183ca22390d3d1016e280416b227ba571b8af864ef02d5628f757ad33c6f523f50e269e6637958f36f7fe2375c777ffb SHA512 05b7067ab291bb6e126a2cdcaa28309ebc22669bd4a870762df1b292c0d0b34f0263f56fa652702606036c7816ea1ceb98d95d1bb9a41749259510244d594b2b
-EBUILD evolution-ews-3.42.0.ebuild 1408 BLAKE2B 1d9a1cada17b2ccddf741b59f1b9171249f7ed899a469c2ab93c4d11c36c21ab9d30a73c811c64ac2432ef1083f7d57be78f6c4fd9b7ec7f9776781f157dcd6f SHA512 d89043f8af284e90ab7692eb25be59413af3f8c36534eddfbd81b021bb22439b8346a17213314c7b881fd33d795e752d29e3656a26dab064c1cd27a86dfd6b42
-EBUILD evolution-ews-3.42.1.ebuild 1408 BLAKE2B 1d9a1cada17b2ccddf741b59f1b9171249f7ed899a469c2ab93c4d11c36c21ab9d30a73c811c64ac2432ef1083f7d57be78f6c4fd9b7ec7f9776781f157dcd6f SHA512 d89043f8af284e90ab7692eb25be59413af3f8c36534eddfbd81b021bb22439b8346a17213314c7b881fd33d795e752d29e3656a26dab064c1cd27a86dfd6b42
 EBUILD evolution-ews-3.42.3.ebuild 1408 BLAKE2B 0422bddd8f72fbdeed4e4a47e5950ee83126e8c03ec28d39710c47c6433842c0672588a5a1d92d1f158d05e3eced244b642f03a753b61877153b2c6098c1598e SHA512 d0d8d90698a4b8fd100e863da528e7d7de63da178df1f9cf5d01227a23f5a098e3357a81314ba670da7be7c87554f718aa94d7bd87241682d7919838541bfe05
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/gnome-extra/evolution-ews/evolution-ews-3.40.3.ebuild b/gnome-extra/evolution-ews/evolution-ews-3.40.3.ebuild
deleted file mode 100644
index cf149d49e105..000000000000
--- a/gnome-extra/evolution-ews/evolution-ews-3.40.3.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake gnome2
-
-DESCRIPTION="Evolution module for connecting to Microsoft Exchange Web Services"
-HOMEPAGE="https://wiki.gnome.org/Apps/Evolution"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-# libical-glib currently (2020-02-29) oddly behind USE=introspection
-RDEPEND="
-	dev-db/sqlite:3
-	>=dev-libs/glib-2.62:2
-	>=dev-libs/libical-3.0.5:0=[introspection(-)]
-	>=dev-libs/json-glib-1.0.4
-	>=dev-libs/libmspack-0.4
-	dev-libs/libxml2:2
-	>=gnome-extra/evolution-data-server-${PV}:0=
-	>=mail-client/evolution-${PV}:2.0
-	>=net-libs/libsoup-2.58:2.4
-	>=x11-libs/gtk+-3.10:3
-"
-DEPEND="${RDEPEND}
-	test? ( net-libs/uhttpmock )
-"
-BDEPEND="
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=dev-util/intltool-0.35.5
-	>=sys-devel/gettext-0.18.3
-	virtual/pkgconfig
-"
-
-# Unittests fail to find libevolution-ews.so
-RESTRICT="test !test? ( test )"
-
-# global scope PATCHES or DOCS array mustn't be used due to double default_src_prepare
-# call; if needed, set them after cmake_src_prepare call, if that works
-src_prepare() {
-	cmake_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_MSPACK=ON
-		-DENABLE_TESTS=$(usex test)
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-}
-
-src_test() {
-	cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-}
diff --git a/gnome-extra/evolution-ews/evolution-ews-3.42.0.ebuild b/gnome-extra/evolution-ews/evolution-ews-3.42.0.ebuild
deleted file mode 100644
index 2088827c2022..000000000000
--- a/gnome-extra/evolution-ews/evolution-ews-3.42.0.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake gnome2
-
-DESCRIPTION="Evolution module for connecting to Microsoft Exchange Web Services"
-HOMEPAGE="https://wiki.gnome.org/Apps/Evolution"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-# libical-glib currently (2020-02-29) oddly behind USE=introspection
-RDEPEND="
-	dev-db/sqlite:3
-	>=dev-libs/glib-2.62:2
-	>=dev-libs/libical-3.0.5:0=[introspection(-)]
-	>=dev-libs/json-glib-1.0.4
-	>=dev-libs/libmspack-0.4
-	dev-libs/libxml2:2
-	>=gnome-extra/evolution-data-server-${PV}:0=
-	>=mail-client/evolution-${PV}:2.0
-	>=net-libs/libsoup-2.58:2.4
-	>=x11-libs/gtk+-3.10:3
-"
-DEPEND="${RDEPEND}
-	test? ( net-libs/uhttpmock )
-"
-BDEPEND="
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=dev-util/intltool-0.35.5
-	>=sys-devel/gettext-0.18.3
-	virtual/pkgconfig
-"
-
-# Unittests fail to find libevolution-ews.so
-RESTRICT="test !test? ( test )"
-
-# global scope PATCHES or DOCS array mustn't be used due to double default_src_prepare
-# call; if needed, set them after cmake_src_prepare call, if that works
-src_prepare() {
-	cmake_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_MSPACK=ON
-		-DENABLE_TESTS=$(usex test)
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-}
-
-src_test() {
-	cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-}
diff --git a/gnome-extra/evolution-ews/evolution-ews-3.42.1.ebuild b/gnome-extra/evolution-ews/evolution-ews-3.42.1.ebuild
deleted file mode 100644
index 2088827c2022..000000000000
--- a/gnome-extra/evolution-ews/evolution-ews-3.42.1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake gnome2
-
-DESCRIPTION="Evolution module for connecting to Microsoft Exchange Web Services"
-HOMEPAGE="https://wiki.gnome.org/Apps/Evolution"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-# libical-glib currently (2020-02-29) oddly behind USE=introspection
-RDEPEND="
-	dev-db/sqlite:3
-	>=dev-libs/glib-2.62:2
-	>=dev-libs/libical-3.0.5:0=[introspection(-)]
-	>=dev-libs/json-glib-1.0.4
-	>=dev-libs/libmspack-0.4
-	dev-libs/libxml2:2
-	>=gnome-extra/evolution-data-server-${PV}:0=
-	>=mail-client/evolution-${PV}:2.0
-	>=net-libs/libsoup-2.58:2.4
-	>=x11-libs/gtk+-3.10:3
-"
-DEPEND="${RDEPEND}
-	test? ( net-libs/uhttpmock )
-"
-BDEPEND="
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=dev-util/intltool-0.35.5
-	>=sys-devel/gettext-0.18.3
-	virtual/pkgconfig
-"
-
-# Unittests fail to find libevolution-ews.so
-RESTRICT="test !test? ( test )"
-
-# global scope PATCHES or DOCS array mustn't be used due to double default_src_prepare
-# call; if needed, set them after cmake_src_prepare call, if that works
-src_prepare() {
-	cmake_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_MSPACK=ON
-		-DENABLE_TESTS=$(usex test)
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-}
-
-src_test() {
-	cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-}
diff --git a/gnome-extra/gnome-boxes/Manifest b/gnome-extra/gnome-boxes/Manifest
index e1531e31c2d2..294ab8837d99 100644
--- a/gnome-extra/gnome-boxes/Manifest
+++ b/gnome-extra/gnome-boxes/Manifest
@@ -1,7 +1,6 @@
+AUX 41.3-fix-build-with-meson-0.61.1.patch 1237 BLAKE2B 4f010d12654cbc7d67ddfaa4980f1ed04a46e4161e96d66700b7c341350b1e22122b26a544e7c699f0e8e14ec7612dd800b1ae90922659ad946b4ec396ef5c2e SHA512 79fd82c6edf250384ef4ad73021b3dd77b088fcc7972fedb9beaaeaadcb103e07f53e3e388683ef992e45407f2685284a75a51b5c4ca51bcac3c041f155ab33b
 DIST gnome-boxes-40.3.tar.xz 1697444 BLAKE2B a7c1677224dde80142abdeeff8b99929c7b86ce38a3432bf0368ec93146df0a813cbeae033fc8cbcd2fb8cd5b28170e0385224f36a9517ed54244e94a3453b6c SHA512 1944414feb6fab054f46e32b5f245042c882cf0a1ecde0eafced81adda16af1018203139177d3f9fa1d2eaf1565ee9e3b3fdff63c4a4b06b0802e20a2f064890
-DIST gnome-boxes-41.2.tar.xz 1614708 BLAKE2B 9896d558951d36d60843e8e4bc237007b7917fe6cd672e6af0d801de1b8a44cefe5098666b5bce95b8aebf4c4cd4ebbbe5ec6c94d88dfeff54216f524554ba66 SHA512 ef14d4bfeb3202664bb96047de5656295f0186121599bf7a82184f4815e956e18f5ce60d0a45ec6e405ec4d22134cc4138018f0d3f86b8372303c0c639751803
 DIST gnome-boxes-41.3.tar.xz 1614656 BLAKE2B 1d2a53ba833cdf130f1b2a350871344b0fd4c3f223e069d707e8279748a2fbd21e0d618d0cb229bb3bcfaa84e41d32da763df1d84efd7b749d890f28aceae904 SHA512 6aa8daf03898b7ec28397897b054e220bf2eabb7acbf4ea4dab7035bbe24e44c8a75e488c788f2b8cc56d6e72785651574cffa84cc1a06e5c9c7e0772839bfe7
 EBUILD gnome-boxes-40.3.ebuild 3881 BLAKE2B 91ab277097e6aa0ae96d2f0b9be598f170794005b6a4d6168ab8790cc0d3a06d5d6ab57424a1013ff009bacc4e86f4ead3f184bb0513afcd7c6f049ca89ccea8 SHA512 e8ede58a1bcaa336b74aff627613c6623c1ef25d09bf6c5364cdafef600c2799a2a133548579843af01a89617508af1aff290f22fc3ce0abc384f3b26c198051
-EBUILD gnome-boxes-41.2.ebuild 3882 BLAKE2B b8f7183fa7be203d31014a7eba873c206d68988c47b42843df5805212fb8efe98ca0f5207a7619a71daed4dca08605ea9eb55493ccb2787232a5db36e0acf601 SHA512 67d1d4b8539b5542426e556258e6718b2a6da6d0d950af457156fd87200410ad3d754bcce6da8575a19d8582d75397c50d5a7661698b0d6cd5f7b423e821c312
-EBUILD gnome-boxes-41.3.ebuild 3882 BLAKE2B b8f7183fa7be203d31014a7eba873c206d68988c47b42843df5805212fb8efe98ca0f5207a7619a71daed4dca08605ea9eb55493ccb2787232a5db36e0acf601 SHA512 67d1d4b8539b5542426e556258e6718b2a6da6d0d950af457156fd87200410ad3d754bcce6da8575a19d8582d75397c50d5a7661698b0d6cd5f7b423e821c312
+EBUILD gnome-boxes-41.3.ebuild 3950 BLAKE2B 3f48ea962b2365ad16f97f4cc371b282b027588e91db7c87deb711621208b3f26d03e18366b448f675f7bc5c3400924deb38cbf4b22baf2c39290bc7c2f31df5 SHA512 0637ecee8f366bb11521a8479d7dc9d3c9e9d6568863eec9e12f81d8e3be5489d036d73a22e54ab0d39d906c55ef4eb83687f5c6705b15f725da0d3006a60e74
 MISC metadata.xml 254 BLAKE2B de7a97001e5947704f42973c8a0c3a23c2d80afb976254f5fd21e9d372a946e055d4cdc3c0eaed010505f87929b56e8b1e650c945e2a302644adbc9440833be8 SHA512 c81da4f9b80e5691a167f4590906952e25356604ec17689c005be14efb394c0634776bbe84df936edde239480bdf46db41216b00da4a3a45f670e9ca18ab0132
diff --git a/gnome-extra/gnome-boxes/files/41.3-fix-build-with-meson-0.61.1.patch b/gnome-extra/gnome-boxes/files/41.3-fix-build-with-meson-0.61.1.patch
new file mode 100644
index 000000000000..d777e414f9f7
--- /dev/null
+++ b/gnome-extra/gnome-boxes/files/41.3-fix-build-with-meson-0.61.1.patch
@@ -0,0 +1,38 @@
+https://gitlab.gnome.org/GNOME/gnome-boxes/-/commit/fd0acfbe79444687c73dea182c2d1a5fa1c77324
+https://bugs.gentoo.org/831934
+
+From: Michal Vasilek <michal@vasilek.cz>
+Date: Sat, 15 Jan 2022 00:07:31 +0100
+Subject: [PATCH] build: remove positional i18n.merge_file arguments
+
+otherwise building with meson 0.61+ fails:
+
+    ERROR: Function does not take positional arguments.
+---
+ data/meson.build | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index d32638a8..2dc1798b 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -20,7 +20,6 @@ resources = gnome.compile_resources ('org.gnome.Boxes',
+ desktop_conf = configuration_data ()
+ desktop_conf.set ('icon', application_id)
+ desktop = i18n.merge_file (
+-  'desktop',
+   input: configure_file (
+     input: files ('org.gnome.Boxes.desktop.in'),
+     output: 'org.gnome.Boxes.desktop.in',
+@@ -65,7 +64,7 @@ configure_file (
+ 
+ appdata_conf = configuration_data()
+ appdata_conf.set('appid', application_id)
+-appdata_file = i18n.merge_file ('appdata-file',
++appdata_file = i18n.merge_file (
+   input: configure_file (
+     input: files ('org.gnome.Boxes.appdata.xml.in'),
+     output: 'org.gnome.Boxes.appdata.xml.in',
+-- 
+GitLab
+
diff --git a/gnome-extra/gnome-boxes/gnome-boxes-41.2.ebuild b/gnome-extra/gnome-boxes/gnome-boxes-41.2.ebuild
deleted file mode 100644
index a2108ec7a02c..000000000000
--- a/gnome-extra/gnome-boxes/gnome-boxes-41.2.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-VALA_USE_DEPEND="vapigen"
-VALA_MIN_API_VERSION="0.40"
-
-inherit gnome.org gnome2-utils linux-info meson readme.gentoo-r1 vala xdg
-
-DESCRIPTION="Simple GNOME application to access remote or virtual systems"
-HOMEPAGE="https://wiki.gnome.org/Apps/Boxes"
-
-LICENSE="LGPL-2+ CC-BY-2.0"
-SLOT="0"
-
-IUSE="rdp"
-KEYWORDS="~amd64"
-
-# FIXME: qemu probably needs to depend on spice[smartcard] directly with USE=spice
-# FIXME: Check over libvirt USE=libvirtd,qemu and the smartcard/usbredir requirements
-# Technically vala itself still ships a libsoup vapi, but that may change, and it should be better to use the .vapi from the same libsoup version
-# gtk-vnc raised due to missing vala bindings in earlier ebuilds
-DEPEND="
-	>=app-arch/libarchive-3.0.0:=
-	>=dev-libs/glib-2.52:2
-	>=x11-libs/gtk+-3.24.1:3
-	>=net-libs/gtk-vnc-0.8.0-r1[gtk3(+)]
-	x11-libs/gtksourceview:4
-	>=sys-libs/libosinfo-1.7.0
-	app-crypt/libsecret
-	>=net-libs/libsoup-2.44:2.4
-	virtual/libusb:1
-	>=app-emulation/libvirt-glib-4.0.0
-	>=dev-libs/libxml2-2.7.8:2
-	>=net-misc/spice-gtk-0.32[gtk3(+),smartcard,usbredir]
-	app-misc/tracker:3
-	>=net-libs/webkit-gtk-2.26.0:4
-	>=gui-libs/libhandy-1.0.0:1=
-
-	>=dev-libs/gobject-introspection-1.56:=
-	>=dev-libs/libgudev-165:=
-	rdp? ( >=net-misc/freerdp-2.0.0:= )
-" # gobject-introspection needed for libovf subproject (and gtk-frdp subproject with USE=rdp)
-# These are called via exec():
-# sys-fs/mtools mcopy for unattended file copying for files that libarchive doesn't support
-# app-cdr/cdrtools mkisofs is needed for unattended installer secondary disk image creation
-# app-emulation/libguestfs virt-sysprep is used for VM cloing, if not there, it logs debug and doesn't function
-# sys-apps/policycoreutils restorecon is used for checking selinux context
-# app-emulation/libvirt virsh used for various checks (and we need the library anyways)
-# sys-auth/polkit used for making all libvirt system disks readable via "pkexec chmod a+r" that aren't already readable to the user (libvirt system importer)
-# app-emulation/qemu qemu-img used to convert image to QCOW2 format during copy
-RDEPEND="${DEPEND}
-	app-cdr/cdrtools
-	app-misc/tracker-miners:3[iso]
-	app-emulation/spice[smartcard]
-	>=app-emulation/libvirt-0.9.3[libvirtd,qemu]
-	>=app-emulation/qemu-1.3.1[spice,smartcard,usbredir]
-	sys-fs/mtools
-	sys-auth/polkit
-"
-# gtk-frdp generates gir and needs gtk+ introspection for it
-# This is only needed for creating the .vapi file, but gnome-boxes needs it
-BDEPEND="
-	$(vala_depend)
-	net-libs/gtk-vnc[vala]
-	sys-libs/libosinfo[vala]
-	app-crypt/libsecret[vala]
-	net-libs/libsoup:2.4[vala]
-	app-emulation/libvirt-glib[vala]
-	net-misc/spice-gtk[vala]
-	x11-libs/vte:2.91[vala]
-	dev-libs/appstream-glib
-	rdp? ( x11-libs/gtk+:3[introspection] )
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="Before running gnome-boxes for local VMs, you will need to load the KVM modules.
-If you have an Intel Processor, run:
-# modprobe kvm-intel
-
-If you have an AMD Processor, run:
-# modprobe kvm-amd"
-
-pkg_pretend() {
-	linux-info_get_any_version
-
-	if linux_config_exists; then
-		if ! { linux_chkconfig_present KVM_AMD || \
-			linux_chkconfig_present KVM_INTEL; }; then
-			ewarn "You need KVM support in your kernel to use GNOME Boxes local VM support!"
-		fi
-	fi
-}
-
-src_prepare() {
-	xdg_src_prepare
-	vala_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		-Ddistributor_name=Gentoo
-		-Ddistributor_version=${PVR}
-		$(meson_use rdp)
-		-Dinstalled_tests=false
-		-Dflatpak=false
-		-Dprofile=default
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	readme.gentoo_create_doc
-}
-
-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/gnome-boxes/gnome-boxes-41.3.ebuild b/gnome-extra/gnome-boxes/gnome-boxes-41.3.ebuild
index a2108ec7a02c..1c25fa6b9c26 100644
--- a/gnome-extra/gnome-boxes/gnome-boxes-41.3.ebuild
+++ b/gnome-extra/gnome-boxes/gnome-boxes-41.3.ebuild
@@ -76,6 +76,10 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+PATCHES=(
+	"${FILESDIR}/${PV}"-fix-build-with-meson-0.61.1.patch
+)
+
 DISABLE_AUTOFORMATTING="yes"
 DOC_CONTENTS="Before running gnome-boxes for local VMs, you will need to load the KVM modules.
 If you have an Intel Processor, run:
diff --git a/gnome-extra/gnome-calendar/Manifest b/gnome-extra/gnome-calendar/Manifest
index 29f193cc4c41..5a17b569bb54 100644
--- a/gnome-extra/gnome-calendar/Manifest
+++ b/gnome-extra/gnome-calendar/Manifest
@@ -1,9 +1,6 @@
+AUX gnome-calendar-40.2-meson-0.61.patch 708 BLAKE2B 65a37339599bd0303adc9126eb3246b8b84956a52814c671b14484f9fddc4198533e6a06c536aed98384b4b832b462966f3079c1c8ec3d0f893c1835c0e27bde SHA512 fe89025d23bf9a08df7352891a841729f5350817c73803da96c450f7cf46d5ec0c4e436336de3666d61a1e61bc0a781480ec1b4bfc2db5c76e2234eed40c467f
 DIST gnome-calendar-40.2.tar.xz 553344 BLAKE2B a144d94d16502ce6d864b66405f07f8115ef9705859d4e54025dfabcb8e99add6d1b25ba84152850378a79db858c4c7eb35b30c8e9ce80cac9384fb4876b0676 SHA512 1697eedfebd72fbd946024998246f7636c724550583ddc04d1c333b0824d38b2a806db0838a9ea5f39b64802c83fcb97cac792aeb4dc344e955e9c811dabd9b7
-DIST gnome-calendar-41.0.tar.xz 576612 BLAKE2B b9544e9402edb25fae5b0598621116ac6c3215b2092675ef48b1b686cceebc43422a54b963ad6639b104833e6c07b58e57d86c5c514b7c025da0374d915a13ac SHA512 ba57af23f967a0900fd64399d9358c2dd131be86120e01d68cd4eee436e8a0bac6f4a3b154ffcfbb2d307ae632cfed7de29f79f843e4692cc1a81a82dadc5e4a
-DIST gnome-calendar-41.1.tar.xz 582736 BLAKE2B bccb63eeb4092d5e451cb5e20858ef63c0b79bd381dc0b2982882b716e216e6195fed3cfe418ba191996c21db9048d7cf5d0b29ee92787a3e92558a4f052cd82 SHA512 c17ea429acbaf377036310bb42856f66632f712397a8e38279e7c537d6b4545a48935ada33d4169fd687022ad39ec73a2022b3e2f66c38325e60d45dfe41fcc6
 DIST gnome-calendar-41.2.tar.xz 583584 BLAKE2B ef21836ef87ba19de0c25f5cb73631b73a60352ca97db88dabbc1632097d3ef7e12c257fe946f7d92466f232248e1b27891394b44d73d61a3336521b2bb5d883 SHA512 1540a1e24d54bb157fadabe4201a97f2cae2c9487e267fff98273aa0dfc3715c4f734ba1e459c3c296c470337547a2b303309911ee7762e17738b292c18cc1bb
-EBUILD gnome-calendar-40.2.ebuild 1156 BLAKE2B a47dc8bdc46a5ff301f19df1b29b0cd80f197920a5bde87e533062c727b6fef02b6068f5f2621cce7e9ba6296e48e86edb3d3ca3ac9d3227112fae891ac5d267 SHA512 a87ec1383bcdb7a2be0f4e5bb06d6dc341731a6a55ba005cf270eb46f08a81beea2c85641d8df75370d963a4842b5a36b301c663842e0ada22dae72ceca50b31
-EBUILD gnome-calendar-41.0.ebuild 1158 BLAKE2B 37d5212888d98a3896fc2e5cfdf3276be1a6aaa441d4a894e1f94dc6aaed404af07ed7707ac611693707bde532484aed68c25767453273b1d3a73b4b5f691315 SHA512 24c472057fb19b6fd6fb30f8b000df3f3481264ab485ed637de7e9ac28e35ca35a38a2f496c32be1d150967fbe7e078593a6557e5f9a3eba98a0ba9abb16fc30
-EBUILD gnome-calendar-41.1.ebuild 1158 BLAKE2B 37d5212888d98a3896fc2e5cfdf3276be1a6aaa441d4a894e1f94dc6aaed404af07ed7707ac611693707bde532484aed68c25767453273b1d3a73b4b5f691315 SHA512 24c472057fb19b6fd6fb30f8b000df3f3481264ab485ed637de7e9ac28e35ca35a38a2f496c32be1d150967fbe7e078593a6557e5f9a3eba98a0ba9abb16fc30
-EBUILD gnome-calendar-41.2.ebuild 1165 BLAKE2B 0718030bbfdf731de10a5c860c944b2f0fcbddf76501495ebde1b82fd8f047d643d5ff070c8d3a14f86264e6529c62fd256766014b809fc5b44026e506b3485d SHA512 482f2ee157eb7ae21ae14426c3019b59574846cc5bfead8cdececd1940164b2cafa9989831567f2c799689e2ec869db51f74f98845ad2e2083668d617827a820
+EBUILD gnome-calendar-40.2.ebuild 1212 BLAKE2B 8644d6e5ea9f732b9e2d661c9dd84624f7ef18881f84738f99926661c0b456c3f2134316aed5d3d507648e0941759f9feb640d141a218b497d40c70f49ff297c SHA512 668bf8a755ae6289a9f32f4c90d2e952237827740c4c7f8180978f9fa9fbbcd38f6b8208edae6a90ba38072050b4ae4acc8db0b72797a0831bb7df20070a2d8a
+EBUILD gnome-calendar-41.2.ebuild 1221 BLAKE2B 132f88ffbfa724f267293361afe2b3a4f8687c637dbf1bc2bc10541d107275c23bd1556b95df02d9e9e1ce112ba020d66b83f9555ac9ef39482ecf3956b29500 SHA512 c4c1a868e859dff2899ddee5db9c528c39c5f6c2777d8abeddcf5660890160ff7f9b57ec36ff712969a4c5ed2b9e6d2674f8197ea0df515558dd729c4e79db59
 MISC metadata.xml 523 BLAKE2B ac729de842a6c4af26151fe8a6325fd880715ef5bdba87af11d3fa8b39673c13a32d9cfcaf8c13c246640bd63af8391eed13d775840a337b4e5cf85acc779df0 SHA512 0e87a27fdbccd8d5b71a2b0c57a0b1af281f8f4c64da1a7d091825d03ed3bc4897995f705bb2210800c549aee7d038742edcb3874db0fabe2be1e918483f91b2
diff --git a/gnome-extra/gnome-calendar/files/gnome-calendar-40.2-meson-0.61.patch b/gnome-extra/gnome-calendar/files/gnome-calendar-40.2-meson-0.61.patch
new file mode 100644
index 000000000000..ec5dc0fc6fca
--- /dev/null
+++ b/gnome-extra/gnome-calendar/files/gnome-calendar-40.2-meson-0.61.patch
@@ -0,0 +1,20 @@
+https://gitlab.gnome.org/GNOME/gnome-calendar/-/merge_requests/198.patch
+https://bugs.gentoo.org/831926
+
+From e35dbc1acd03dd1751b755b6c8e1932a692ad4e1 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex@linutronix.de>
+Date: Fri, 21 Jan 2022 21:18:39 +0100
+Subject: [PATCH] meson.build: fix meson 0.61 builds
+
+Signed-off-by: Alexander Kanavin <alex@linutronix.de>
+--- a/data/appdata/meson.build
++++ b/data/appdata/meson.build
+@@ -1,7 +1,6 @@
+ appdata_conf = configuration_data()
+ appdata_conf.set('appid', application_id)
+ appdata = i18n.merge_file(
+-  'appdata',
+   input: configure_file(
+     input: files('org.gnome.Calendar.appdata.xml.in.in'),
+     output: 'org.gnome.Calendar.appdata.xml.in',
+GitLab
diff --git a/gnome-extra/gnome-calendar/gnome-calendar-40.2.ebuild b/gnome-extra/gnome-calendar/gnome-calendar-40.2.ebuild
index e0432410aee0..b011342f854b 100644
--- a/gnome-extra/gnome-calendar/gnome-calendar-40.2.ebuild
+++ b/gnome-extra/gnome-calendar/gnome-calendar-40.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
@@ -36,6 +36,10 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-40.2-meson-0.61.patch
+)
+
 src_test() {
 	virtx meson_src_test
 }
diff --git a/gnome-extra/gnome-calendar/gnome-calendar-41.0.ebuild b/gnome-extra/gnome-calendar/gnome-calendar-41.0.ebuild
deleted file mode 100644
index ac5e1d4c4c46..000000000000
--- a/gnome-extra/gnome-calendar/gnome-calendar-41.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome.org gnome2-utils meson virtualx xdg
-
-DESCRIPTION="Manage your online calendars with simple and modern interface"
-HOMEPAGE="https://wiki.gnome.org/Apps/Calendar"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-
-# >=libical-1.0.1 for https://bugzilla.gnome.org/show_bug.cgi?id=751244
-DEPEND="
-	>=dev-libs/libical-1.0.1:0=
-	>=gnome-base/gsettings-desktop-schemas-3.21.2
-	>=gnome-extra/evolution-data-server-3.33.2:=[gtk]
-	net-libs/libsoup:2.4
-	>=dev-libs/libdazzle-3.33.1
-	>=gui-libs/libhandy-1.0.0:1=
-	>=dev-libs/glib-2.67.5:2
-	>=x11-libs/gtk+-3.22.0:3
-	>=net-libs/gnome-online-accounts-3.2.0:=
-	>=dev-libs/libgweather-40.0:=
-	>=app-misc/geoclue-2.4:2.0
-	>=sci-geosciences/geocode-glib-3.23
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	dev-libs/appstream-glib
-	dev-libs/libxml2:2
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-src_test() {
-	virtx meson_src_test
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/gnome-calendar/gnome-calendar-41.1.ebuild b/gnome-extra/gnome-calendar/gnome-calendar-41.1.ebuild
deleted file mode 100644
index ac5e1d4c4c46..000000000000
--- a/gnome-extra/gnome-calendar/gnome-calendar-41.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome.org gnome2-utils meson virtualx xdg
-
-DESCRIPTION="Manage your online calendars with simple and modern interface"
-HOMEPAGE="https://wiki.gnome.org/Apps/Calendar"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-
-# >=libical-1.0.1 for https://bugzilla.gnome.org/show_bug.cgi?id=751244
-DEPEND="
-	>=dev-libs/libical-1.0.1:0=
-	>=gnome-base/gsettings-desktop-schemas-3.21.2
-	>=gnome-extra/evolution-data-server-3.33.2:=[gtk]
-	net-libs/libsoup:2.4
-	>=dev-libs/libdazzle-3.33.1
-	>=gui-libs/libhandy-1.0.0:1=
-	>=dev-libs/glib-2.67.5:2
-	>=x11-libs/gtk+-3.22.0:3
-	>=net-libs/gnome-online-accounts-3.2.0:=
-	>=dev-libs/libgweather-40.0:=
-	>=app-misc/geoclue-2.4:2.0
-	>=sci-geosciences/geocode-glib-3.23
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	dev-libs/appstream-glib
-	dev-libs/libxml2:2
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-src_test() {
-	virtx meson_src_test
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/gnome-calendar/gnome-calendar-41.2.ebuild b/gnome-extra/gnome-calendar/gnome-calendar-41.2.ebuild
index 4ccb6627d062..7045bd688f26 100644
--- a/gnome-extra/gnome-calendar/gnome-calendar-41.2.ebuild
+++ b/gnome-extra/gnome-calendar/gnome-calendar-41.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
@@ -36,6 +36,10 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-40.2-meson-0.61.patch
+)
+
 src_test() {
 	virtx meson_src_test
 }
diff --git a/gnome-extra/gnome-commander/Manifest b/gnome-extra/gnome-commander/Manifest
index b0d404cc0af8..09264f6ad9d8 100644
--- a/gnome-extra/gnome-commander/Manifest
+++ b/gnome-extra/gnome-commander/Manifest
@@ -1,7 +1,3 @@
-DIST gnome-commander-1.12.1.tar.xz 7532412 BLAKE2B 92a4c71e716aca5354cd53ca10440ce11426f9baa11342c37a8dbd5d3fe2898ea9e7aa577d584d0e91e85a8213a5480dd045c6d0ffbd05155b05d74c2a0b52e7 SHA512 74756af9a720ab81904e3f7834ae008af67d635cc1d1b961420d02c029616465dfe06a18bc5b443d0a9725cfefe6e9f7cdba68faa62515f8ccb85a2246867010
-DIST gnome-commander-1.12.2.tar.xz 7529048 BLAKE2B 468279fcfd25111c673d7ce75124bb4b1773c74952759f749e6e526c0525ec801484a9be01f5819942302d634c7427b313e25fea85c3d792d66967d4edf92ca7 SHA512 0f56450a09fcf8a73cc31e91564b133fd5fd199ea75c9376a2c329e070554c2c3ae4916f899940f92ddea5fff29656c9485a207dd22a28f1cda12a46f4cab32c
 DIST gnome-commander-1.12.3.1.tar.xz 7530232 BLAKE2B 34a4cabafab52ab6f94619dafac4db87c12909eef22c13d50356dad925f129da182348eabd8993f69ffc398db163f81ec59c9a102530a9b49f7714b5d7c6db68 SHA512 1206d545493deeb2237af6b9026baf6faab2a8f6ae86eb1abb5c2e5ceb6212ad66382d3abd07c89f14271ac8709d14548f0bfe68fb0e11b1779e0c061e0272e5
-EBUILD gnome-commander-1.12.1.ebuild 1504 BLAKE2B cb7ba0f30b7ffc26f074266be5b35a7bf75631475f9fd477bfb25d491677fdd789825109911bf0ce7a8a2d9d70a118eb0e849f1619ff2cc0b9f62a2e9cfeb775 SHA512 e953d57b4a39d7bba1d21eb28e0ea24ab5447ef8246e4a4506fbb8dd09e73d0c36c64107c9c40c8c137d4ae7c148c576795916f1f22fc2a7eb1f05aa466c5a53
-EBUILD gnome-commander-1.12.2.ebuild 1411 BLAKE2B 090ef17a6be2870c1bdfc9a125cc48d172284fc2daa0a1e4ba917ff24d629029520a725ecf6e298225714ad56f3ad964bf42dbc373a1a48a3e699a2f24d5cd1b SHA512 758565a4faf50960dfaeed13ddad9d2b09a3b648aec14be6f51f9e462bc2e276cecc9d9ca23319815dc9e10e46f09b115dede245b2c84f1fbc17d67a1992ba55
 EBUILD gnome-commander-1.12.3.1.ebuild 1409 BLAKE2B f8a11f356842ca79e089465de1cf70f2d75c7208cdd53333b931d682c4165544a69c374b2b1dca2e33d9e19bf2cac214385e5623faec344cb9a63b8f56dc5784 SHA512 a015e2f2ce55ed7988eeeb8658a01a45619d2befe96a77bec3e968719152cf5b78f5f2b45e08f975a96af54734bc2b7531b59d968352519eb921a011b8113d82
 MISC metadata.xml 1185 BLAKE2B 56389cab7656d7c1ca18798e9d1f0168ee967225f864b8c7534151d9c909f3c68b72cb28154674843abee817c8c485f3d1df27ad04a1613bdb40d4330eaf0038 SHA512 ae95ad3a4b61fc0886ea155f2f22ceeb9b48660711d9c6f0c1c47d27ca3d272422426f46aae4213959b74d763ee8df83ea811a489b7d7f52d457a0089d9abea1
diff --git a/gnome-extra/gnome-commander/gnome-commander-1.12.1.ebuild b/gnome-extra/gnome-commander/gnome-commander-1.12.1.ebuild
deleted file mode 100644
index ec2378c5fab5..000000000000
--- a/gnome-extra/gnome-commander/gnome-commander-1.12.1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2 optfeature toolchain-funcs
-
-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/glib-2.62.0:2
-	>=gnome-base/gnome-vfs-2.0.0
-	>=x11-libs/gtk+-2.24.0:2
-	chm? ( dev-libs/chmlib )
-	exif? ( >=media-gfx/exiv2-0.14 )
-	gsf? ( >=gnome-extra/libgsf-1.12.0 )
-	pdf? ( >=app-text/poppler-0.18 )
-	samba? ( >=gnome-base/gnome-vfs-2.0.0[samba] )
-	taglib? ( >=media-libs/taglib-1.4 )
-	unique? ( >=dev-libs/libunique-0.9.3:1 )
-"
-BDEPEND="
-	dev-util/gtk-doc-am
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-DEPEND="
-	${RDEPEND}
-	test? ( >=dev-cpp/gtest-1.7.0 )
-"
-
-pkg_pretend() {
-	if tc-is-gcc && [[ $(gcc-major-version) -lt 8 ]]; then
-		eerror "Compilation with gcc older than version 8 is not supported"
-		die "GCC too old, please use gcc-8 or above"
-	fi
-}
-
-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.12.2.ebuild b/gnome-extra/gnome-commander/gnome-commander-1.12.2.ebuild
deleted file mode 100644
index 477dffa8b809..000000000000
--- a/gnome-extra/gnome-commander/gnome-commander-1.12.2.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2021 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="
-	dev-util/gtk-doc-am
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-DEPEND="
-	${RDEPEND}
-	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-shell-extension-alphabetical-grid/Manifest b/gnome-extra/gnome-shell-extension-alphabetical-grid/Manifest
new file mode 100644
index 000000000000..3a0901bdd18f
--- /dev/null
+++ b/gnome-extra/gnome-shell-extension-alphabetical-grid/Manifest
@@ -0,0 +1,3 @@
+DIST gnome-shell-extension-alphabetical-grid-18.0.tar.gz 289276 BLAKE2B 8556fab62659a188c58cc98a642b81a11681ac463590b4beef537f7963b968de371af323f63ca8e989d439837443411db946561e2ab4f993c38d179890575e87 SHA512 7a68e0bbda7c1a071805f0481185941552896ee477920b4e328cf5cafea4d93b4faf474ae6bc9cde4e0d78f4e83af697fe5f9ed1a675d6de5834a97a40b5c5b6
+EBUILD gnome-shell-extension-alphabetical-grid-18.0.ebuild 1424 BLAKE2B 10dffeb0d196fb8953138099e44668b24c794b8e798d047e017e2de188dfbab451af316eb393e3cfdf46c5e1309276e14eda25ea227233007ebc90e35e7e1ce0 SHA512 290c18e414855f137448aa72d41bfec80d83b07881a86ab822ae7ce4bc93f3a97665b2ca73b14ae04ab44518d7f12be47136b83f0930615689bb5e853fbe5a45
+MISC metadata.xml 241 BLAKE2B cb0374238d11e2a3f28f23b7049da09babd4310a99862738acfb7ba554f7758ac68cd09d1eb7a29068195c27010a846a540ed2c09b88fd043b37fb4f0762150f SHA512 b2c1d3e2cb6760ed4682da82af5370adcacd48afd558efa1abf84d955067b2ad32eda034af8cef95c71409622f97fa0113f2e07bee328f2d03512908ae931050
diff --git a/gnome-extra/gnome-shell-extension-alphabetical-grid/gnome-shell-extension-alphabetical-grid-18.0.ebuild b/gnome-extra/gnome-shell-extension-alphabetical-grid/gnome-shell-extension-alphabetical-grid-18.0.ebuild
new file mode 100644
index 000000000000..2164b03efc89
--- /dev/null
+++ b/gnome-extra/gnome-shell-extension-alphabetical-grid/gnome-shell-extension-alphabetical-grid-18.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit gnome2-utils
+
+# Useful specially to prevent
+# https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/4684
+# https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/3180
+DESCRIPTION="Restore the alphabetical ordering of the app grid"
+HOMEPAGE="https://github.com/stuarthayhurst/alphabetical-grid-extension"
+SRC_URI="https://github.com/stuarthayhurst/alphabetical-grid-extension/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	app-eselect/eselect-gnome-shell-extensions
+	>=gnome-base/gnome-shell-3.38
+"
+DEPEND="${COMMON_DEPEND}"
+BDEPEND=""
+
+S="${WORKDIR}/alphabetical-grid-extension-${PV}"
+extension_uuid="AlphabeticalAppGrid@stuarthayhurst"
+
+# Tests are only useful for upstream
+RESTRICT="test"
+
+# Not useful for us
+src_compile() { :; }
+
+src_install() {
+	einstalldocs
+	insinto /usr/share/glib-2.0/schemas
+	doins schemas/*.xml
+	rm -rf README.md LICENSE.txt Makefile schemas || die
+	mv -v ui/* . || die # Searches for these files in parent dir
+	insinto /usr/share/gnome-shell/extensions/"${extension_uuid}"
+	doins -r *
+}
+
+pkg_preinst() {
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	gnome2_schemas_update
+	ebegin "Updating list of installed extensions"
+	eselect gnome-shell-extensions update
+	eend $?
+}
+
+pkg_postrm() {
+	gnome2_schemas_update
+}
diff --git a/gnome-extra/gnome-shell-extension-alphabetical-grid/metadata.xml b/gnome-extra/gnome-shell-extension-alphabetical-grid/metadata.xml
new file mode 100644
index 000000000000..3947e1bf6d57
--- /dev/null
+++ b/gnome-extra/gnome-shell-extension-alphabetical-grid/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>pacho@gentoo.org</email>
+	</maintainer>
+	<stabilize-allarches/>
+</pkgmetadata>
diff --git a/gnome-extra/gnome-shell-extension-desktop-icons-ng/Manifest b/gnome-extra/gnome-shell-extension-desktop-icons-ng/Manifest
index 52ad29d6b7e3..59aa9cabe4e1 100644
--- a/gnome-extra/gnome-shell-extension-desktop-icons-ng/Manifest
+++ b/gnome-extra/gnome-shell-extension-desktop-icons-ng/Manifest
@@ -1,7 +1,7 @@
-DIST ding-0.20.0.tar.xz 82000 BLAKE2B 56bdd067985281daa836b34b2969a487314e056f0eb2d60014122f4a3ee8eff159948c4b6cce20b327e7189d88a3cc0311720171f7b407b6b82928b4c1a03cfc SHA512 71cef5993c177f393c77889676b5e593de9beec936f42dbc4d5cac0f415706517598f73fc6aee0a0786eb77f3140852b791cac9a2dd5d01545ba8955a02f4a9c
 DIST ding-0.24.0.tar.xz 101020 BLAKE2B a0f6b276cf41113dbee92ee6e34da3ffbf8f614765874b1185c226ddd350a2b63f369bdb40f71677444694a4083b34765f63eda09761bd3690355d5df6f97173 SHA512 0d066abb3e25cc2dacf593a1f05b14937394a89254bc541311c32f5206782e1d80be82cd1eee567809aee9bc0e3e80206eeae81119e72d444b965a2daf341493
 DIST ding-33.0.tar.xz 106484 BLAKE2B ca1126eb61bc41bbe50938c17ffa8611886aa4656902969270e00fd1e783497bc47f16215d641f74f96cb21763dff134508304e13063bf8cbaea2e3ae584a1c0 SHA512 27bccb7fbea8044fadd9c9732a0f557424af30a3b8d88aa3fe5354ce507f2ae4219fce785ff31dd5f102db1cdd9ced25f733a5a0c5cb39b453e9fcede6815734
-EBUILD gnome-shell-extension-desktop-icons-ng-0.20.0.ebuild 1001 BLAKE2B 22fd91c4ae8117c7b54641cfd83b0826fad684a74b0edaf540d7a63025e240cfd77b8b5804640c8a716349bc434a49e36e0d192f654fb3016a7aae8ddd1c3a97 SHA512 b606ba2878f0eab8935210398aae0fddbc5e91c834cc71e28b06ab0e0ace2829aac8aeab95055d2c59ca6911415b585d1beeac4fa0055b97999d6ed8a241bc61
+DIST ding-38.0.tar.xz 114328 BLAKE2B da825e08d4078ae8a1218fa7f404bccdf5bd9883e87a460eac2224457791928fe9819f0c1335cbef87a204b72806b82b28368ad9eb642f3dd99db45a0d0b455e SHA512 b46f75044d8dc3e9fb79f8fbc1a25ccdb69882955b946ce45c606bdd34b3d86dc2f5f1698d5d34735024a1ae333cc5267acc5f9219a312758c2e636bcaa45ece
 EBUILD gnome-shell-extension-desktop-icons-ng-0.24.0.ebuild 1001 BLAKE2B 40bd684e478a1136a284a2da08222cfe99eeeb06835989d6a1882d55239c2ffba030f38e593388c316c1c25c7beffbb53296760f29b0d9ba2840e6454b3be28a SHA512 01032de352d6ab9f3354cde22b4d0c90b4df3f6971085b4e493ef0fd54878fc586329d19c2e7fb36264462c65bed62b8ef6b3f65644c9bc108001108e5dbf74a
 EBUILD gnome-shell-extension-desktop-icons-ng-33.0.ebuild 1003 BLAKE2B 199768a7802a288358a0b3ccf58f68d36c0dfa66170644caebf1411af8a5588539e27e671af602fec4249ebd50b2f4f0c5cffabdf8c7077583fbf68d58bbdd76 SHA512 690768eaba9d8e5d8ba9f6dfe122bf1615a9d1a01284de200b768e253b8850c334e1b733d362ffb4c3e7e0dc55e81177bf15d3f122c67e1ad527c54c6ce20fea
+EBUILD gnome-shell-extension-desktop-icons-ng-38.0.ebuild 1003 BLAKE2B f93070cecfe10f9d482310ee303610c588c68e5a78de4bd41496656e84eed10a82354caa9a35e7bb942c7463e10c6b8e4439c988b7ed784c64cd3c7ed6053af8 SHA512 af4cfe02ddcdbff567aa1397b989fa489e908178705c1a15422a7dee75a62b03f36d535c93c303e9c3cf964949ad7634c5cea3b99e4129912f686453ff8fbb83
 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-0.20.0.ebuild b/gnome-extra/gnome-shell-extension-desktop-icons-ng/gnome-shell-extension-desktop-icons-ng-38.0.ebuild
index 6b02b8204112..a18cbd29e685 100644
--- a/gnome-extra/gnome-shell-extension-desktop-icons-ng/gnome-shell-extension-desktop-icons-ng-0.20.0.ebuild
+++ b/gnome-extra/gnome-shell-extension-desktop-icons-ng/gnome-shell-extension-desktop-icons-ng-38.0.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 inherit gnome2-utils meson
 
 MY_PN="ding"
 MY_P="${MY_PN}-${PV}"
-COMMIT="093f01a7b52a77bccfc094f1b771cdac"
+COMMIT="29844c90747e6a91c4d2d74313c49ce1"
 
 DESCRIPTION="Fork from the desktop-icons project, with several enhancements like Drag'n'Drop"
 HOMEPAGE="https://gitlab.com/rastersoft/desktop-icons-ng"
@@ -14,7 +14,7 @@ SRC_URI="https://gitlab.com/rastersoft/desktop-icons-ng/uploads/${COMMIT}/${MY_P
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 COMMON_DEPEND="dev-libs/glib:2"
diff --git a/gnome-extra/gnome-shell-extension-weather-in-the-clock/Manifest b/gnome-extra/gnome-shell-extension-weather-in-the-clock/Manifest
new file mode 100644
index 000000000000..150cd7862bc6
--- /dev/null
+++ b/gnome-extra/gnome-shell-extension-weather-in-the-clock/Manifest
@@ -0,0 +1,3 @@
+DIST gnome-shell-extension-weather-in-the-clock-20211108.tar.gz 127000 BLAKE2B 9c884b7bf093ef29fcd1cf3aa58accb4d5f70fa38bf9bd0cc0cfb81564952de9c6b9f1dbead26dd3902cc09d3be42f30c8e813a8fecb33c3753f45abe833974e SHA512 bb16b470f9d0d7fdcd90d5ec4a2723a97d808d8341c816aacd973390201c5e63a71aec51efc9953903a70ad964e406a104b9029c3c08b25b7a333de3e673dd6e
+EBUILD gnome-shell-extension-weather-in-the-clock-20211108.ebuild 1084 BLAKE2B cf62a95327ef71c7145b0221cc824cf5d8eb03929b18f2d42813676aa6a0db5a6123d5ffe8b0ecefe91b9ca7e65cf841b2eb67e2fa8a21a60c160f393e4f9115 SHA512 44d74474d9964601609a8d5352a161e379efc13614a5ee3258f0d239a2a5eae9f2cdd1fc99461998eb4f0b2e66069eb67a5e30f2c97ca98c60481ca41fae0e70
+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-20211108.ebuild b/gnome-extra/gnome-shell-extension-weather-in-the-clock/gnome-shell-extension-weather-in-the-clock-20211108.ebuild
new file mode 100644
index 000000000000..1d7cf088c5ac
--- /dev/null
+++ b/gnome-extra/gnome-shell-extension-weather-in-the-clock/gnome-shell-extension-weather-in-the-clock-20211108.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="b36cc55bf41af1a4c801ddeb0fd71d1294892c4c"
+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-extension-weather-in-the-clock/metadata.xml b/gnome-extra/gnome-shell-extension-weather-in-the-clock/metadata.xml
new file mode 100644
index 000000000000..3947e1bf6d57
--- /dev/null
+++ b/gnome-extra/gnome-shell-extension-weather-in-the-clock/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>pacho@gentoo.org</email>
+	</maintainer>
+	<stabilize-allarches/>
+</pkgmetadata>
diff --git a/gnome-extra/gnome-shell-extensions/Manifest b/gnome-extra/gnome-shell-extensions/Manifest
index c8753f9e43c5..4e8eb241464b 100644
--- a/gnome-extra/gnome-shell-extensions/Manifest
+++ b/gnome-extra/gnome-shell-extensions/Manifest
@@ -1,7 +1,5 @@
 DIST gnome-shell-extensions-40.4.tar.xz 218088 BLAKE2B f992c98fa5ceec84c774881468e0c9736d24f1834b9d6976f7cddc2dce455393fad0ad055c1e02b308135914029874c4d87d3a09733a7b4686308e9052cef21a SHA512 79f087c9fbc7764241751441190819b3e768530257ffe3a7b39b1004f8997de9c8ea381338ec0544a39b8cc6866137d315e56f3f058c9b66a9ed566ec40712ef
-DIST gnome-shell-extensions-41.0.tar.xz 219664 BLAKE2B 1d73d9f1255f93740d2effad48420b2992872b89df12e0baaf99c3344c356de5f92f76300c30cac32230c7a97a4a9ce6bb74308078fb6844fa3051f24594eaf7 SHA512 4332821044029020404c0ed5d040b7d5e5548a67447517424a54ed4c586bad3461ab1e25f0dcb37c24ea2a1496d1cbf2b95f24de0eda79f0c6921b6b1f085f83
 DIST gnome-shell-extensions-41.1.tar.xz 219848 BLAKE2B 31da29fa8f804b1568677a9a875ac6efcb1906588f239a34c360d5dcc1947d4c99200dc1b63ca6d17b257ccc5c22d6eed9401fba625eda1bded57aac0d83c22f SHA512 2cbcd1ff384254545645cf4cd6a6f887e4fb42088bcff3fbb4179fd3400f1eb62ebeb87ccb25cd327bdb01060d1994c5dec1c26103bc968366ac521f7eaa8cde
 EBUILD gnome-shell-extensions-40.4-r1.ebuild 1745 BLAKE2B 6a307a1b0c01e33df542b3f6261faf7c3c4157429629f8a182c74a50cef451087b6092fbb023ae438547f3c7c34757b6f8591c753aa58a5b2cf591557197b507 SHA512 63329ec042c5fee18948bc8ab6cf00963ba71c046bc030ab074608f71d78321033b6a50ce2c68a9f82403b46cf51acd1b3717002f816a87750478c16b1515c10
-EBUILD gnome-shell-extensions-41.0.ebuild 1763 BLAKE2B 28cf1f4d8fa43e655954d5e32a72ef7d546b1e1645e8c026430380e0c0553bc2aa439076bf6602b3df0878c005b8c8b3cd2613e7fa49d16a5223baffec443740 SHA512 88dfc426ac303d7fc2da7e4db185219b006a55db9978d4da81403e6425ae1ca11ce206998b6305b3c35bcc7efafbf5b3fb959bc72720aba5cb849801e9561da1
 EBUILD gnome-shell-extensions-41.1.ebuild 1777 BLAKE2B 08a538766888b93b71bcae8055851d218d66b4a3664e9e561cc5dd13e5178b84de178a1c8b253f41141c86fd7a8d06e9781d68c79f6dd357694e1c2d549922fb SHA512 7beda3a2f8db19ebe4231f74ebc81e6526776e30b1ed86e0a735b346a86445d0305987eb8c927c8180ae1bdf4268b1a60ecc44d5c2280c30ccb4bddf2c1f01cc
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-41.0.ebuild b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-41.0.ebuild
deleted file mode 100644
index d9aef6246858..000000000000
--- a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-41.0.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome.org readme.gentoo-r1 meson xdg
-
-DESCRIPTION="JavaScript extensions for GNOME Shell"
-HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell/Extensions"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~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() {
-	meson_src_configure \
-		-Dextension_set=all \
-		-Dclassic_mode=true
-}
-
-src_install() {
-	meson_src_install
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	ebegin "Updating list of installed extensions"
-	eselect gnome-shell-extensions update
-	eend $?
-
-	readme.gentoo_print_elog
-}
diff --git a/gnome-extra/gnome-software/Manifest b/gnome-extra/gnome-software/Manifest
index 508b5b14eb40..6c647e9909bc 100644
--- a/gnome-extra/gnome-software/Manifest
+++ b/gnome-extra/gnome-software/Manifest
@@ -1,7 +1,3 @@
-DIST gnome-software-40.2.tar.xz 3093012 BLAKE2B 0d51e7e752b9399f79c2fc16ea12b99bb58a486fe050e38a8fd606a2afd9db32d67d14b4ed50d21da163238b30fac20f93f8947b165d8ae611c27057dd572d34 SHA512 ded29be4c59130a4016d43d3e18a67c8cf3fec4761a7a57c067bf075a6f1da5b7726000172e2303ba129b3b5cb8bd22ebfad8fbf0e3248285a4864350f3a1679
-DIST gnome-software-40.3.tar.xz 3108332 BLAKE2B 2b271db8994a252fcaf784452231585dd430b5e8363e6f2fed8e5bc0e7d1287e0cb5b22fa323a99a6f448cb23b0995ecef55b5a7675960f5dfb891cc5cb9aeae SHA512 6070f8f59fa9872282a081b6ba4f740616a799cffae43a8a541ebf4e0d7b189710dbdce679b1e5136a3fff5f8da29ec8e1ed9df7289c0a6ed697eb0ad693271f
 DIST gnome-software-40.4.tar.xz 3108460 BLAKE2B 696736d94fe245f98a619a58c8df1a3c6196a9f3f07ccc82f0c92c3226ab4914ee5bdbf2f6414b8e8fca99215451d08ef03b164b5cd885af36d69b1cc9043b7a SHA512 5ef7ad754cb161ad5e181dc9b189fe57066a92ebbe3a5871412b638896a02d6e9114e5fdce91e3225af990a580a1f534b936008ff3a2d50a59154406f055a3e7
-EBUILD gnome-software-40.2-r1.ebuild 2934 BLAKE2B 3d551cb5032801a734b265f9f3f295e21429d5f2f5c22681a599471288ed0d83c22dbaeec6ff9726b16db2c32475078904c5358cc3b0517df05aa9c8475391ea SHA512 8773115d02f5009d92f3cd07beadbc7184e885c114a640008576be74d5507301ae942d4ec0b73b94d83d241dbc47d82f2945e2fa275c87af8ada0acdc8acee79
-EBUILD gnome-software-40.3.ebuild 2934 BLAKE2B 3d551cb5032801a734b265f9f3f295e21429d5f2f5c22681a599471288ed0d83c22dbaeec6ff9726b16db2c32475078904c5358cc3b0517df05aa9c8475391ea SHA512 8773115d02f5009d92f3cd07beadbc7184e885c114a640008576be74d5507301ae942d4ec0b73b94d83d241dbc47d82f2945e2fa275c87af8ada0acdc8acee79
 EBUILD gnome-software-40.4.ebuild 2867 BLAKE2B d8a554fc78b90119096851fba15410f6cf4f9ed2c42d05fbf1f282cbba3b800fe0f177af3db93dc5513869f01b3f2b471426581f31500d0c4c7a1983e619e34c SHA512 8a4c87e6443f45e2a45ceb39d7cd7f5a141a9476155d4242200939d3060f5b9f5327140f2ce7333a095aed9f3b5152fc44f694bbfa94a077c743227d39749ad8
-MISC metadata.xml 658 BLAKE2B e2e7317aaa061d4d55de5367f17c18c64f57de122226d97161bb61574a2ca90914c1098f7c7b89a2f0e67c663906ee21bc112e63c829fdbf32692e3a435f3c5a SHA512 bf385417b659419d0ee8b63d4475e71f3896606fef2545ed36d09d61b126de39e5d2223bb1d2f1166a55bd8fb72f9f21d599fbf9a75b97dfe8c2958e66414471
+MISC metadata.xml 579 BLAKE2B 4ac8aea21122da6a03605961d9f47721a06a4c49ffdc1ffa16eee5a473f5e5957c69760ee7d19e087688fe2b479a16f4cf417cbe0e2d3e149b0339881fecd2fc SHA512 3f783e0f7fbec5a95f498d622885de19babf8f786a66af2d3755907d242df0433a910b07c2628854ed1038920417d7d28c35c10f18adfcbd37e8922aa3c9253d
diff --git a/gnome-extra/gnome-software/gnome-software-40.2-r1.ebuild b/gnome-extra/gnome-software/gnome-software-40.2-r1.ebuild
deleted file mode 100644
index b3b1497a808e..000000000000
--- a/gnome-extra/gnome-software/gnome-software-40.2-r1.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome.org gnome2-utils meson xdg
-
-DESCRIPTION="Gnome install & update software"
-HOMEPAGE="https://wiki.gnome.org/Apps/Software"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="flatpak +firmware gnome gtk-doc packagekit spell sysprof udev"
-RESTRICT="test" # writes to and deletes files in /var/tmp/self-test/
-
-RDEPEND="
-	>=dev-libs/appstream-0.14.0:0=
-	>=x11-libs/gdk-pixbuf-2.32.0:2
-	>=dev-libs/libxmlb-0.1.7:=
-	net-libs/gnome-online-accounts:=
-	>=x11-libs/gtk+-3.22.4:3
-	>=dev-libs/glib-2.56:2
-	>=dev-libs/json-glib-1.2.0
-	>=net-libs/libsoup-2.52.0:2.4
-	>=gui-libs/libhandy-1.0.2:1=
-	sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 )
-	gnome? ( >=gnome-base/gsettings-desktop-schemas-3.18.0 )
-	spell? ( app-text/gspell:= )
-	sys-auth/polkit
-	packagekit? ( >=app-admin/packagekit-base-1.1.0 )
-	firmware? ( >=sys-apps/fwupd-1.0.3 )
-	flatpak? (
-		>=sys-apps/flatpak-1.0.4
-		dev-util/ostree
-	)
-	udev? ( dev-libs/libgudev )
-	>=gnome-base/gsettings-desktop-schemas-3.11.5
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-libs/libxml2:2
-	dev-util/gdbus-codegen
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	gtk-doc? (
-		dev-util/gtk-doc
-		app-text/docbook-xml-dtd:4.3 )
-"
-# test? ( dev-util/valgrind )
-
-src_prepare() {
-	xdg_src_prepare
-	sed -i -e '/install_data.*README\.md.*share\/doc\/gnome-software/d' meson.build || die
-	# We don't need language packs download support, and it fails tests in 3.34.2 for us (if they are enabled)
-	sed -i -e '/subdir.*fedora-langpacks/d' plugins/meson.build || die
-	# Trouble talking to spawned gnome-keyring socket for some reason, even if wrapped in dbus-run-session
-	# TODO: Investigate; seems to work outside ebuild .. test/emerge
-	sed -i -e '/g_test_add_func.*gs_auth_secret_func/d' lib/gs-self-test.c || die
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dtests=false #$(meson_use test tests)
-		$(meson_use spell gspell)
-		$(meson_feature gnome gsettings_desktop_schemas) # Honoring of GNOME date format settings.
-		-Dman=true
-		$(meson_use packagekit)
-		# -Dpackagekit_autoremove
-		-Dpolkit=true
-		-Deos_updater=false # Endless OS updater
-		$(meson_use firmware fwupd)
-		$(meson_use flatpak)
-		-Dmalcontent=false
-		-Drpm_ostree=false
-		-Dodrs=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)
-	)
-	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-40.3.ebuild b/gnome-extra/gnome-software/gnome-software-40.3.ebuild
deleted file mode 100644
index b3b1497a808e..000000000000
--- a/gnome-extra/gnome-software/gnome-software-40.3.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome.org gnome2-utils meson xdg
-
-DESCRIPTION="Gnome install & update software"
-HOMEPAGE="https://wiki.gnome.org/Apps/Software"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="flatpak +firmware gnome gtk-doc packagekit spell sysprof udev"
-RESTRICT="test" # writes to and deletes files in /var/tmp/self-test/
-
-RDEPEND="
-	>=dev-libs/appstream-0.14.0:0=
-	>=x11-libs/gdk-pixbuf-2.32.0:2
-	>=dev-libs/libxmlb-0.1.7:=
-	net-libs/gnome-online-accounts:=
-	>=x11-libs/gtk+-3.22.4:3
-	>=dev-libs/glib-2.56:2
-	>=dev-libs/json-glib-1.2.0
-	>=net-libs/libsoup-2.52.0:2.4
-	>=gui-libs/libhandy-1.0.2:1=
-	sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 )
-	gnome? ( >=gnome-base/gsettings-desktop-schemas-3.18.0 )
-	spell? ( app-text/gspell:= )
-	sys-auth/polkit
-	packagekit? ( >=app-admin/packagekit-base-1.1.0 )
-	firmware? ( >=sys-apps/fwupd-1.0.3 )
-	flatpak? (
-		>=sys-apps/flatpak-1.0.4
-		dev-util/ostree
-	)
-	udev? ( dev-libs/libgudev )
-	>=gnome-base/gsettings-desktop-schemas-3.11.5
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-libs/libxml2:2
-	dev-util/gdbus-codegen
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	gtk-doc? (
-		dev-util/gtk-doc
-		app-text/docbook-xml-dtd:4.3 )
-"
-# test? ( dev-util/valgrind )
-
-src_prepare() {
-	xdg_src_prepare
-	sed -i -e '/install_data.*README\.md.*share\/doc\/gnome-software/d' meson.build || die
-	# We don't need language packs download support, and it fails tests in 3.34.2 for us (if they are enabled)
-	sed -i -e '/subdir.*fedora-langpacks/d' plugins/meson.build || die
-	# Trouble talking to spawned gnome-keyring socket for some reason, even if wrapped in dbus-run-session
-	# TODO: Investigate; seems to work outside ebuild .. test/emerge
-	sed -i -e '/g_test_add_func.*gs_auth_secret_func/d' lib/gs-self-test.c || die
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dtests=false #$(meson_use test tests)
-		$(meson_use spell gspell)
-		$(meson_feature gnome gsettings_desktop_schemas) # Honoring of GNOME date format settings.
-		-Dman=true
-		$(meson_use packagekit)
-		# -Dpackagekit_autoremove
-		-Dpolkit=true
-		-Deos_updater=false # Endless OS updater
-		$(meson_use firmware fwupd)
-		$(meson_use flatpak)
-		-Dmalcontent=false
-		-Drpm_ostree=false
-		-Dodrs=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)
-	)
-	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/metadata.xml b/gnome-extra/gnome-software/metadata.xml
index c2405e464043..e84edacc8e32 100644
--- a/gnome-extra/gnome-software/metadata.xml
+++ b/gnome-extra/gnome-software/metadata.xml
@@ -8,7 +8,6 @@
 	<use>
 		<flag name="firmware">Enable firmware update support through <pkg>sys-apps/fwupd</pkg></flag>
 		<flag name="flatpak">Enable support for flatpak applications using <pkg>sys-apps/flatpak</pkg></flag>
-		<flag name="packagekit">Enable module for package manager integration</flag>
 		<flag name="sysprof">Enable profiling data capture support using <pkg>dev-util/sysprof-capture</pkg></flag>
 	</use>
 </pkgmetadata>
diff --git a/gnome-extra/gnome-tweaks/Manifest b/gnome-extra/gnome-tweaks/Manifest
index f5296c8a170d..99423306626f 100644
--- a/gnome-extra/gnome-tweaks/Manifest
+++ b/gnome-extra/gnome-tweaks/Manifest
@@ -1,4 +1,5 @@
 AUX 3.28.1-gentoo-cursor-themes.patch 1019 BLAKE2B 1dc92c4f8e53c1303f884f6acc332a7a0f1bd11b463e91ddd4ae731938e678f75499692044b5c13021f24dd9bf61264c4454fab734fe65609b3b4c009cb2eee2 SHA512 e502e1ae5945517e7a69cd15436bc07e34fe0db739350e0617d02c9b7a45264f585229f80352a93595e1246d5f9c6e987242772dfb7293de06b400fbaf676971
+AUX gnome-tweaks-40.0-meson-0.61.patch 944 BLAKE2B b7ecf7ec1a492610fb7001721e8c1b60e0d8dd1d6c50ce443acd395c27e09f664db68a7c160e3143538bc6df48516f216ef4d8ccd4352e0786057837856620d2 SHA512 ff7ffd60a4c187fd7caeb6bebb5b06c1841d5e921d7d7d2d549f67e5d367a152d2545a49e07c6e8c1954b203a2e3826e692e1a37b81a62db14196a504cf8faaf
 DIST gnome-tweaks-40.0.tar.xz 251908 BLAKE2B 4280e7565da3f95d7bcd81ba874d2f15e8c3834ab052cb4cf7cde8060eaea016670acf6f441d2cbce4b7566ba0bb7a7f9666b257893bc7b22b1cdc4d5a0edee2 SHA512 c3467f40af6bb79c2b10cb429e93aa29261066c2a5fd744bf2801c4e596cc270d45302ebfa942ee0c40067849c12e1ccd404c40e7f594bcff4c44cfe3f90bb97
-EBUILD gnome-tweaks-40.0.ebuild 1349 BLAKE2B ceee43dd34f660931273c8ac72a35c43fac2f4be6b4aa598d0643d1981ac0b627bf8a3f7ab9dbbcc6155a14b26d26f7ed5957f0ef0d4612b05fcbdb0ce96eade SHA512 4c3bd5cf36c294935fdb468243a3bc7fcc0d338022d4a34205e8faa37b3348553e56b4e4b4f08a4c9ab880d54b0de48a072a2beb89f38fee0d585a1289bda074
+EBUILD gnome-tweaks-40.0.ebuild 1393 BLAKE2B b4848ee8644ea7ff366472a2b251c867b5d209ad2aa56a2713bc3a5ac0a979ee4715200817a73f9686d12353df3d84b5537f01dcb4ba40de50df116412308947 SHA512 e191fa4643d842bbe515649473f518f7007e2399e56c1f255a5fb6a6f6feb2269342096c3b99edd3c6e0ab0aaeb5b054e19cda2afa640045175af95aeed098e3
 MISC metadata.xml 557 BLAKE2B 377b3b95f3dfade66ceb83a955bae45820c7db9cb286fbc9fb7f597909d6e58b3ccbdde1acc5bc01bda97bcde90a062a8e4676c8593edfc95c46f27c311ca83e SHA512 9a24c8eedb00ba7ceaba017cfeef778a7def43d7baf62c23067376f7648fad3b333e16a9dc4f8c41f66279b4bbe8acf54844ab5460d56366d32c325ea5d06e2d
diff --git a/gnome-extra/gnome-tweaks/files/gnome-tweaks-40.0-meson-0.61.patch b/gnome-extra/gnome-tweaks/files/gnome-tweaks-40.0-meson-0.61.patch
new file mode 100644
index 000000000000..9ef4db33ecb5
--- /dev/null
+++ b/gnome-extra/gnome-tweaks/files/gnome-tweaks-40.0-meson-0.61.patch
@@ -0,0 +1,31 @@
+https://gitlab.gnome.org/GNOME/gnome-tweaks/-/merge_requests/86.patch
+https://bugs.gentoo.org/831937
+
+From 56f39dc7d04a1be91de1149683874f9c83b794fb Mon Sep 17 00:00:00 2001
+From: Mae Dartmann <mae@meanderingmind.me>
+Date: Sat, 22 Jan 2022 18:09:21 +0100
+Subject: [PATCH] meson: fix invalid positional argument
+
+This was deprecated in meson 0.60 and removed in 0.61. See
+https://github.com/mesonbuild/meson/pull/9445 for details.
+
+Signed-off-by: Mae Dartmann <mae@meanderingmind.me>
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -1,5 +1,5 @@
+ appdata_file = 'org.gnome.tweaks.appdata.xml'
+-i18n.merge_file(appdata_file,
++i18n.merge_file(
+   input: appdata_file + '.in',
+   output: appdata_file,
+   po_dir: '../po',
+@@ -8,7 +8,7 @@ i18n.merge_file(appdata_file,
+ )
+ 
+ desktop_file = 'org.gnome.tweaks.desktop'
+-i18n.merge_file(desktop_file,
++i18n.merge_file(
+   input: desktop_file + '.in',
+   output: desktop_file,
+   po_dir: '../po',
+GitLab
diff --git a/gnome-extra/gnome-tweaks/gnome-tweaks-40.0.ebuild b/gnome-extra/gnome-tweaks/gnome-tweaks-40.0.ebuild
index c5732da246a7..68e456f9a872 100644
--- a/gnome-extra/gnome-tweaks/gnome-tweaks-40.0.ebuild
+++ b/gnome-extra/gnome-tweaks/gnome-tweaks-40.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
@@ -40,6 +40,8 @@ BDEPEND=">=sys-devel/gettext-0.19.8"
 
 PATCHES=(
 	"${FILESDIR}"/3.28.1-gentoo-cursor-themes.patch # Add contents of Gentoo's cursor theme directory to cursor theme list
+
+	"${FILESDIR}"/${PN}-40.0-meson-0.61.patch
 )
 
 src_install() {
diff --git a/gnome-extra/gnome-user-docs/Manifest b/gnome-extra/gnome-user-docs/Manifest
index dcd1fe8208a3..744496172223 100644
--- a/gnome-extra/gnome-user-docs/Manifest
+++ b/gnome-extra/gnome-user-docs/Manifest
@@ -1,9 +1,5 @@
-DIST gnome-user-docs-40.3.tar.xz 9141728 BLAKE2B 9634dfa526d7e781400563e0800f25fc8aa520d97fe0e02f3a06a1f82bb0019ff28e9bf0c8a2698c7d081d7b54a1d53be4475db6615d40c3407b632252cc8aae SHA512 e96f4535761c902999b210060f9bbf19384151752315abc7cf20f8b0ef1f599fe132f398db61318ea24eab8e3dc65812fc05a5ed549e4cedabaf809af39f515b
-DIST gnome-user-docs-40.4.tar.xz 9195696 BLAKE2B 438f52d72a8975125b758acedfbc8c08a36397af6bb0dff01d0c73d517cee67999724e9e29d2731344fbc822309510f36f367052eeff3ba4e1dc36554eb76ffe SHA512 50c8df61a02eaa077ad3faa18d622ead97c7a8926717b2b85d6a9fb86f93e0adb3c9f212f0fbfb4781a35135fc0251d664f793665343b7daaf41a390b10fe868
 DIST gnome-user-docs-40.5.tar.xz 9210512 BLAKE2B 0fe638636377d1c392d208c55016cdc346fa1ec64d327ab9ded9b58744d115c74d5a03927836138cb2d58c9df735d8bc032da4a7ff3ef3ffa53a1a59b88a3006 SHA512 dbef51c262862b211304158fd9aa7bf75ab20bbf21ed0bebe0a1c547cb53e580d32062a6f362f0750a8fbe1e93e8987593c80fa7fbb758c1a61827256db69d52
 DIST gnome-user-docs-41.1.tar.xz 9402668 BLAKE2B 952f2c117df9a9e35ae9fab13e5da402f804bce8d4fc96c07355d99e10debeb7b214f72b976826d016ae9f8d8c8a1b558d9a06f8f20e37ddd56404b6a794925a SHA512 49e08947b87ff551cfcf7de9e791de664d32f5628e1e7b4dbcf4b03e38d3e09edda602239dc52bef22a3711c437b669f8a092a33a385531e15311a0c858e78b1
-EBUILD gnome-user-docs-40.3.ebuild 936 BLAKE2B 5ed71e6738ceff62527e672a8934fbd2250be68a276f340be725cb6d0adcb78028c47b02e50552c157180ec27a39950fdb44fd887c665e1e9d48980a3e2aa65f SHA512 765e271a48d49b2047f1e1c5968c9570dac6c6c876d1d10284e7a7de57db0db36cbbf0a080224a64c1a4eb500cde9f5c29bdd99898ba06142c2eac8add2f7e24
-EBUILD gnome-user-docs-40.4.ebuild 938 BLAKE2B 399a4f043a4a19513de8674eb2ff7715d05b99ec703800b5bf92f7cd8320065df980bf63bd7d426621e7f36b7718210419cf98633397ea11ea33910da65d10c8 SHA512 6fdf644c671bdd9c51836670e6029021060b3f45af749abb5d641d8c3ef201c0e9d57a69cc87e75bc94081a735689c7f725b55398147fba1c6d5e39a113a70f7
 EBUILD gnome-user-docs-40.5.ebuild 936 BLAKE2B 5ed71e6738ceff62527e672a8934fbd2250be68a276f340be725cb6d0adcb78028c47b02e50552c157180ec27a39950fdb44fd887c665e1e9d48980a3e2aa65f SHA512 765e271a48d49b2047f1e1c5968c9570dac6c6c876d1d10284e7a7de57db0db36cbbf0a080224a64c1a4eb500cde9f5c29bdd99898ba06142c2eac8add2f7e24
 EBUILD gnome-user-docs-41.1.ebuild 945 BLAKE2B 8cf285e1ae36038670c31156fb06beff40f25111da8311eeb9340cb46bac239be3381ae6a037cd491bdb0c47002ea9bf04646b36fdd48a91f5367f59da711593 SHA512 fe0a2534cdc8477a9b343734fa4c6dc3839d5416e1be9389783e4a02a2b3de4ac0b8e8bc36b0247dc1e66e17e8b533ceb6316fae06df624b34877defd2c912a2
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/gnome-extra/gnome-user-docs/gnome-user-docs-40.3.ebuild b/gnome-extra/gnome-user-docs/gnome-user-docs-40.3.ebuild
deleted file mode 100644
index f9a0f49950e9..000000000000
--- a/gnome-extra/gnome-user-docs/gnome-user-docs-40.3.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 gnome2
-
-DESCRIPTION="GNOME end user documentation"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-user-docs"
-
-LICENSE="CC-BY-3.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="test"
-
-BDEPEND="test? ( dev-libs/libxml2 )"
-# eautoreconf requires:
-#	app-text/yelp-tools
-# rebuilding translations requires:
-#	app-text/yelp-tools
-#	dev-util/gettext
-
-# This ebuild does not install any binaries
-RESTRICT="binchecks strip
-	!test? ( test )"
-
-src_configure() {
-	# itstool is only needed for rebuilding translations
-	# xmllint is only needed for tests
-	gnome2_src_configure \
-		$(usex test "" XMLLINT=$(type -P true)) \
-		ITSTOOL=$(type -P true)
-}
-
-src_compile() {
-	# Do not compile; "make all" with unset LINGUAS rebuilds all translations,
-	# which can take > 2 hours on a Core i7.
-	return
-}
diff --git a/gnome-extra/gnome-user-docs/gnome-user-docs-40.4.ebuild b/gnome-extra/gnome-user-docs/gnome-user-docs-40.4.ebuild
deleted file mode 100644
index aef106ecb64f..000000000000
--- a/gnome-extra/gnome-user-docs/gnome-user-docs-40.4.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 gnome2
-
-DESCRIPTION="GNOME end user documentation"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-user-docs"
-
-LICENSE="CC-BY-3.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="test"
-
-BDEPEND="test? ( dev-libs/libxml2 )"
-# eautoreconf requires:
-#	app-text/yelp-tools
-# rebuilding translations requires:
-#	app-text/yelp-tools
-#	dev-util/gettext
-
-# This ebuild does not install any binaries
-RESTRICT="binchecks strip
-	!test? ( test )"
-
-src_configure() {
-	# itstool is only needed for rebuilding translations
-	# xmllint is only needed for tests
-	gnome2_src_configure \
-		$(usex test "" XMLLINT=$(type -P true)) \
-		ITSTOOL=$(type -P true)
-}
-
-src_compile() {
-	# Do not compile; "make all" with unset LINGUAS rebuilds all translations,
-	# which can take > 2 hours on a Core i7.
-	return
-}
diff --git a/gnome-extra/gnome-weather/Manifest b/gnome-extra/gnome-weather/Manifest
index 7466789eb287..bad9225396ac 100644
--- a/gnome-extra/gnome-weather/Manifest
+++ b/gnome-extra/gnome-weather/Manifest
@@ -1,7 +1,6 @@
-DIST gnome-weather-40.0.tar.xz 938732 BLAKE2B bc46da61e9620278f5abc7964b869520da85837739923618b2ade114c8561fc6125e7dca2f2aef5715fec7dfa0561c693f75278d050900cb948f8d1ea42f58ba SHA512 c4560c1a1535a0c2889c8cd934926217a7caceb1b646fa4bb961c7cbde38b9b545a567f24fb81e47c61a2ac3e456a5432e8979591eb5a169fe5849bbd99d6333
+AUX gnome-weather-41.0-fix-meson-0.61-build.patch 706 BLAKE2B 9023904ae76060fe81992bcf2c5185241335c9eb79941f92e27c5b645fe467e7b69774fddcfcb9698ed4388c65816927d377786b331bd94672f730ecf8ca5823 SHA512 365e7119ccc3d7bf50675f9870558c835da1d893f4d366f54beb73aa64d6f3cb3a7165a0b0e33bdd5f39b6eb33a98d7058487efd1f009cec30869bd65bdfeaea
 DIST gnome-weather-40.1.tar.xz 941636 BLAKE2B 110b972eb3eb6319632d00592f9bf50220bb6976bb27f814606758fd6ce98ad9dfdfabcb0e2d4a68f8005aa3cb92538e4820c8add8f7f8cb94a96f7df9453cf8 SHA512 47086225a2f0212665e53f053d46b54792d4daebff841bb751a7ed8ca7e2e1d60f0247d890011a03cab4104b0461b71316ff9b6eaea671c68bc1713c38e447dc
 DIST gnome-weather-41.0.tar.xz 943500 BLAKE2B a349360f001bc8a3246227fcdad51bdb115db382650ead36e9768c002f0d7892296610320bf90bb569915c72c48492002268f8aa049055ebc687dc08052d6170 SHA512 f625a83ecfffe1ad58aa268b6ab3009504f839f3d56e52c642bc23ee32c0b51638888de17a1b4bc0990b2fd6718a7266fe5cd79230594a06ae58a816308b2b99
-EBUILD gnome-weather-40.0.ebuild 1371 BLAKE2B e602d5fd95238b9a88deaf4ce43e3f9de71c76042dce1e6345970549e0de1b68565d96dc637090253e1f83794b65778d30599306d273c5d4e3c2526092e0d306 SHA512 9777853eca87d926a23c0456b04e36e6b264cb4879a999520ebd1076e839a88532011cc2a8b1a2870b503f7014f20c2f8fb955d63e0a7a328f05edd11dfc7e85
 EBUILD gnome-weather-40.1.ebuild 1371 BLAKE2B 0b44742ad803ff856f973ccddb9cf8d0fa95546bb485b88eb7cbccb127887d63e321aa922f0ed6172597489bc45a9b65e8e797bdbe951ad3603081b12df1a0d7 SHA512 05efa37eb207d20ac68884449fb2f0cc50bffbed0b1a1ff670662c6c2115919e18ea01b5c424972c536a76164da8612f9874f76c6b3b238521d0ffc77ad11c02
-EBUILD gnome-weather-41.0.ebuild 1380 BLAKE2B f5d1fb15643ed74694908b2fbf75ee2af712b08a5bf3d0a7a97c5a097775ae1122a40b507d9283c0fcbc83375185fb1713423ecdd99a9fad3aa9ef9f604ca8b3 SHA512 211161c41e49784fa5546dc0bf8538f6268aed0cede4f00bdf41811ae035904009c7221d483752944d0616b614888c52f6edb3616a63bf6b6833c14509145bc3
+EBUILD gnome-weather-41.0.ebuild 1441 BLAKE2B fe25981ceed86ae76e611b720252b2c6f05a2de8c9e5e648024dcbda6bcdd36bb45af4d2a89a299abbc2a6ea68b47c2fd57fe347b0ebb83d9b5f0ddd13043157 SHA512 797514267620f3e09d2138b972a8df937df4fddd0845729c4ef8d725ca3c8ee047618aa459ddbe169b517a0c852099239c980bbf86a8ffcb0529d04fda646521
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/gnome-extra/gnome-weather/files/gnome-weather-41.0-fix-meson-0.61-build.patch b/gnome-extra/gnome-weather/files/gnome-weather-41.0-fix-meson-0.61-build.patch
new file mode 100644
index 000000000000..6756c77f8b7d
--- /dev/null
+++ b/gnome-extra/gnome-weather/files/gnome-weather-41.0-fix-meson-0.61-build.patch
@@ -0,0 +1,20 @@
+https://gitlab.gnome.org/GNOME/gnome-weather/-/commit/4be71525f07189e97720688472172604879d49a5
+https://bugs.gentoo.org/831749
+
+From: rvalue <i@rvalue.moe>
+Date: Fri, 17 Dec 2021 12:26:42 +0000
+Subject: [PATCH] Remove incorrect args for i18n.merge_file
+
+`i18n.merge_file` has been ignoring positional arguments for a time and
+explicitly rejects with error since meson 0.60.0
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -59,7 +59,6 @@ endif
+ appdata_conf = configuration_data()
+ appdata_conf.set('app_id', weather_id)
+ appdata = i18n.merge_file(
+-  'appdata',
+   input: configure_file(
+     input: '@0@.appdata.xml.in.in'.format(default_id),
+     output: '@0@.appdata.xml.in'.format(default_id),
+GitLab
diff --git a/gnome-extra/gnome-weather/gnome-weather-40.0.ebuild b/gnome-extra/gnome-weather/gnome-weather-40.0.ebuild
deleted file mode 100644
index 0302c9bd140a..000000000000
--- a/gnome-extra/gnome-weather/gnome-weather-40.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome.org gnome2-utils meson xdg
-
-DESCRIPTION="A weather application for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Design/Apps/Weather"
-
-LICENSE="GPL-2+ LGPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
-
-DEPEND="
-	>=dev-libs/glib-2.32:2
-	>=dev-libs/gobject-introspection-1.56:=
-	>=x11-libs/gtk+-3.20:3
-	>=dev-libs/gjs-1.50
-	>=app-misc/geoclue-2.3.1:2.0
-	>=dev-libs/libgweather-3.28:=
-	>=gui-libs/libhandy-1.1.90:1=
-"
-RDEPEND="${DEPEND}
-	gnome-base/gsettings-desktop-schemas
-"
-# libxml2 required for glib-compile-resources
-BDEPEND="
-	dev-libs/appstream-glib
-	dev-libs/libxml2:2
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-# Tests have a lot of issues, starting with reliance on a system installation,
-# accessing the network and other intermittent failures with network-sandbox disabled
-# https://gitlab.gnome.org/GNOME/gnome-weather/issues/67 (and rest not filed)
-# test dep: $(python_gen_any_dep 'dev-util/dogtail[${PYTHON_USEDEP}]')
-# With 3.34, this is now behind a dogtail option we can pass (and have data validation)
-
-src_configure() {
-	meson_src_configure -Dprofile=default -Ddogtail=false
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/gnome-weather/gnome-weather-41.0.ebuild b/gnome-extra/gnome-weather/gnome-weather-41.0.ebuild
index 571ac23d8b64..59f506be80f2 100644
--- a/gnome-extra/gnome-weather/gnome-weather-41.0.ebuild
+++ b/gnome-extra/gnome-weather/gnome-weather-41.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
@@ -31,12 +31,17 @@ BDEPEND="
 	>=sys-devel/gettext-0.19.8
 	virtual/pkgconfig
 "
+
 # Tests have a lot of issues, starting with reliance on a system installation,
 # accessing the network and other intermittent failures with network-sandbox disabled
 # https://gitlab.gnome.org/GNOME/gnome-weather/issues/67 (and rest not filed)
 # test dep: $(python_gen_any_dep 'dev-util/dogtail[${PYTHON_USEDEP}]')
 # With 3.34, this is now behind a dogtail option we can pass (and have data validation)
 
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-meson-0.61-build.patch
+)
+
 src_configure() {
 	meson_src_configure -Dprofile=default -Ddogtail=false
 }
diff --git a/gnome-extra/gucharmap/Manifest b/gnome-extra/gucharmap/Manifest
index 18ca7fdefde4..ac82016a94d9 100644
--- a/gnome-extra/gucharmap/Manifest
+++ b/gnome-extra/gucharmap/Manifest
@@ -7,6 +7,5 @@ DIST gucharmap-14.0.1.tar.gz 1925102 BLAKE2B 134d48703efb27d5eb3a19e8d90031d6feb
 DIST gucharmap-3.0.1.tar.bz2 3275481 BLAKE2B 80dde7791abdc72677add9c65c59f810e6c6952116b92db34059c4c40d2657246b17844c105e68f32c86294e9b4e71e9d48e6f0522855465734d7c24e8d17608 SHA512 4d8a2276b5cb1a0b0fadca2a8522755c5884985a12d5b19341b9cefcd7f749ec1286c0271419e38ec84be7edcfa1293e7f0263eb682c75387d692792de3e1fb1
 EBUILD gucharmap-13.0.8.ebuild 1514 BLAKE2B 37ed1aa8adf126665056dda6ee7b23744404d3ad567a6c73d38e40e45563d2196c4ac931e857be355d726712287be48539736d14fa662cd1f0328f78fc8ff801 SHA512 ef556d1dbf9be4f040d1b8cc7dd5a2fdc762698c3a6765d90627bcbb7e1b622c96dcfcaf003a607b202ff0efa56052340e40b460264fef355f4d8779a52f2f1b
 EBUILD gucharmap-14.0.1-r1.ebuild 1708 BLAKE2B 990a3a55a1578594d5014620594c89b535f2074b105fcdd13efde935f9b5c1d7aafa01241b419cb7b463808e6b026ae21e0e7e4e75c81fa2cf376a2c20460899 SHA512 dffe514e85cfcef953ba10dbe8f03733b02c131e88f2742c471a9e3bdbc16a6f6e4ecc6762133fc47291fa8da29ec1545444dc42df950f486b6e618e8e81b64b
-EBUILD gucharmap-14.0.1.ebuild 1480 BLAKE2B 70d51350fb8ad7d0c76a5bd453dd12113c8adb9e715fdc51adc040e668cf7a01d7da757b1dcfa977981d9c5ad6bc08bd3a8a8c4c9d1006ef942d4b0292e4fda4 SHA512 7dac7d9a481e280feb875c91f4004a671cde113d2b45a54b0f6363526e5d7a9bce319902cf2ea711197fca90a058d2b5a351eb59f26eac2568afa1b908ea3398
 EBUILD gucharmap-3.0.1-r200.ebuild 1477 BLAKE2B 4ffe6feb86be5711b4850d4c1233bd79e2cb9cbca765977ac15b7a335c3b3f80beffe2119835a73024d38a22e4623037755c8672f77edb6016b818047b8c2256 SHA512 b0313be9418955ebfde4547603d66c8121cb36b7cf390e23ee9b536ea9ff21b4760bb9d9e0d843bd49fcb63db28b173d8536a6d5a5b72de1eef76a87bed769dd
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/gnome-extra/gucharmap/gucharmap-14.0.1.ebuild b/gnome-extra/gucharmap/gucharmap-14.0.1.ebuild
deleted file mode 100644
index c3f9b85f6609..000000000000
--- a/gnome-extra/gucharmap/gucharmap-14.0.1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
-VALA_MIN_API_VERSION="0.26"
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome2-utils meson python-any-r1 vala xdg
-
-DESCRIPTION="Unicode character map viewer and library"
-HOMEPAGE="https://wiki.gnome.org/Apps/Gucharmap"
-SRC_URI="https://gitlab.gnome.org/GNOME/${PN}/-/archive/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="2.90"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-UNICODE_VERSION="14.0"
-
-IUSE="debug +introspection gtk-doc vala"
-REQUIRED_USE="vala? ( introspection )"
-
-BDEPEND="
-	${PYTHON_DEPS}
-	virtual/pkgconfig
-	>=sys-devel/gettext-0.19.8
-	gtk-doc? ( >=dev-util/gtk-doc-1 )
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-	vala? ( $(vala_depend) )"
-
-DEPEND="=app-i18n/unicode-data-${UNICODE_VERSION}*
-	>=dev-libs/glib-2.32:2
-	media-libs/freetype:2
-	>=dev-libs/libpcre2-10.21:=
-	>=x11-libs/gtk+-3.22:3[introspection?]
-	>=x11-libs/pango-1.42.4-r2[introspection?]"
-
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	use vala && vala_src_prepare
-	xdg_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		-Ducd_path="${EPREFIX}/usr/share/unicode-data"
-		$(meson_use debug dbg)
-		$(meson_use gtk-doc docs)
-		$(meson_use introspection gir)
-		$(meson_use vala vapi)
-	)
-
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/nemo-fileroller/Manifest b/gnome-extra/nemo-fileroller/Manifest
index 41383d59217e..4a5970e2c639 100644
--- a/gnome-extra/nemo-fileroller/Manifest
+++ b/gnome-extra/nemo-fileroller/Manifest
@@ -1,4 +1,6 @@
 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
 MISC metadata.xml 495 BLAKE2B 448c4a1b019897c3d8098b970e31849035b0125b707ac744eb668f7d295c76de0f121235edd1e76dc931051ccee1a508897679845dadfea04baf3d832baac5a5 SHA512 c86fa92ffb7d82826c4188c1ac63131fce88b40f5b9e13e2ef3162b3c83cc2d7cb6968c0e3e894a93e685cac818b7284072c55a4e8114dd44636a4678c415702
diff --git a/gnome-extra/nemo-fileroller/nemo-fileroller-5.2.0.ebuild b/gnome-extra/nemo-fileroller/nemo-fileroller-5.2.0.ebuild
new file mode 100644
index 000000000000..8af559eda917
--- /dev/null
+++ b/gnome-extra/nemo-fileroller/nemo-fileroller-5.2.0.ebuild
@@ -0,0 +1,25 @@
+# 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.2.0.tar.gz -> nemo-extensions-5.2.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
+"
+
+S="${WORKDIR}/nemo-extensions-5.2.0/${PN}"
diff --git a/gnome-extra/nemo/Manifest b/gnome-extra/nemo/Manifest
index 468bdba65126..08b7028a5735 100644
--- a/gnome-extra/nemo/Manifest
+++ b/gnome-extra/nemo/Manifest
@@ -1,7 +1,6 @@
-AUX nemo-4.6-captions-fix.patch 1113 BLAKE2B 1b6abccebfcf3719559cdf7c077e71c1b20b53fad0538d15012cbf026933ad1708394d709b39b9109c6f6d880a4bcc54d528b840cfc46f05bb46515796a159c8 SHA512 444f4274af3d332efb0c3764beed5027114415dc5a6a79c644a51b440bd476c876a9efa35e9563a5848750949845d481e99e268a564bfc305d6700d454ce7fbe
 AUX nemo-5.0.3-use-detex.patch 252 BLAKE2B 24c27845065f64a58411a8d719fbc1ca41362001f08d469bc336f55601e49358c02ba3aba423c521a261955a5da9832d8ae2df49f3d372270e63256a45fafcda SHA512 142bd88c7843fa40fb30cab01f8f7dd23b2b5c338eae2ac5971c7e392f9f24a8a820ef4b17b1c4afea729cc85a66cb7ddb06ecd417ff6ad494118fe8d88f1498
-DIST nemo-4.8.4.tar.gz 1464683 BLAKE2B 10945a385defdf1bdc7fac9432306e31476ec015489a5150a5b4f9d5f31977b93da6e92241ce153cd5435c789c7a6ce16d2a86002758f26fc587a33dc5343e63 SHA512 b63ee2bd85f67e7d18271032ac3d95c7446b5110b71a3236f7e8c4ccb31e2baf11912060dde36f12ed4b90491c3bb1215a0de38c419130d692c775031cc0e11e
 DIST nemo-5.0.4.tar.gz 1487156 BLAKE2B 4ecafb315673c0939dfb2585e97957ee9d76e9621fbbece2b93d9ed10b24ec86d2c49cdd8d18ac7c8607184752fe2541508a1b626fdce763fdc8ac1b6e713e49 SHA512 e03558d336785d77c1a57d2d100906263d2015330a00d54e2cc0161d9d822740ef5c314062f90a877cee5b031b4b5caf9ebf59f22fb5e15f2e91c75bb239e488
-EBUILD nemo-4.8.4-r1.ebuild 2143 BLAKE2B cb5a7f52f156f396fede37d330153257c3f577fb4f21395d1025e02ec092a8eadd96fb9cb3d1730603f5d0e4490e5a6c81636414cec465b760f0548047b4cf4a SHA512 6ccd7e6d7b9fd97cca59bdb39dced70ac7f38982b58cb1c2818dc67eb099019513f5131f0be0dca8d58784020c94eff580a37d6fbe0bd7ee1d89763d0ba47256
-EBUILD nemo-5.0.4.ebuild 2833 BLAKE2B 8ab31858c47ea649f921557e8e1b1cc9668f34c99a5730cc529badaf745a0d4a882a3b6a2b413f59be5bcdc371e290b4c6ab9af9230f604b51aa0ec9f4a235f0 SHA512 4ef8487432ed65b868dece5e591099a63046eb51b66e4ad2ea9b704563abee3dcce097af25bf0b7adf92644f477d17d180e149b410fe24fba2026e004beec84e
+DIST nemo-5.2.3.tar.gz 1491685 BLAKE2B 55687410d9b1029accdcb446c3406a1a8c9e32aa9ccfcce2096a9afe14d0634729c180e5221ae193593f34518aece90c08e679b510394d27d36fb4defd80802b SHA512 141bf578a6df060f8ceb5778e271b7c474531d96562a148f200149bc77c92bdac409eb75684287c3d98b0ec088798dca292dca85c53c0c794a28c2949b82993b
+EBUILD nemo-5.0.4.ebuild 2832 BLAKE2B e71c00bda8dde526f21df606d8d7dd20249481cf2b914ffd2f687b91bedb3341564fc7ceb08165af5d60077e27473839d90c8aeef11782820353b3f9924b269e SHA512 246e86fdc13240f22fcdc8df68387ceb70ed52af72d9a7be97a1a0e265a4089bfea7d609a47fc40933f3ff25b492539a3cbc8aeee2aca1749cb103594c8a7d6c
+EBUILD nemo-5.2.3.ebuild 3014 BLAKE2B c901799125d09ede48ecc0fb5397dabfa2a2a2153ca082ecf96bf6e95da5e7925d59b0ee6a86967267ce068c60b3c2028fe2d8d82bb4c34914d2d72507475a9f SHA512 a7ed6d0054125514f1e97e9b35c160e0b2b935375c0f750f7231979bd348ee8a054a2c16a1b5136bf67daf6214bb0fe992b7c36e3c7be31929a062ddcecdd366
 MISC metadata.xml 580 BLAKE2B da0ac9cd13730b5c1727a6d0431f3289af829b77781baf4d3512c78139bca7b9a7d136563de8e2f5abf914520de8a5a092b1e0f2505558e5e61813fa5f9c09ad SHA512 d38cebfe673764a4a96d66a66afe55f6f04c74bf1d06d8fddc319a2eb9ed351b205e3a48c47bfeff7f3da85c89ad0512e11a420f82c228a548fc7553147b927e
diff --git a/gnome-extra/nemo/files/nemo-4.6-captions-fix.patch b/gnome-extra/nemo/files/nemo-4.6-captions-fix.patch
deleted file mode 100644
index 0ea0c9158ad2..000000000000
--- a/gnome-extra/nemo/files/nemo-4.6-captions-fix.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From b0c2b99b46797ca91bdba1d95fda33808174466b Mon Sep 17 00:00:00 2001
-From: Michael Webster <miketwebster@gmail.com>
-Date: Thu, 21 Jan 2021 09:41:40 -0500
-Subject: [PATCH] nemo-icon-canvas-item.c: restore the style context after
- drawing any caption text.
-
-This seemed to be causing style recalculations to accumulate over
-time, and particularly when changing the style for window focus
-in/out events. This would eventually have a huge impact on user
-interaction.
-
-Fixes #2472
----
- libnemo-private/nemo-icon-canvas-item.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/libnemo-private/nemo-icon-canvas-item.c b/libnemo-private/nemo-icon-canvas-item.c
-index d1b6cbfad..b32de357d 100644
---- a/libnemo-private/nemo-icon-canvas-item.c
-+++ b/libnemo-private/nemo-icon-canvas-item.c
-@@ -1143,6 +1143,7 @@ draw_label_text (NemoIconCanvasItem *item,
- 		gtk_render_layout (context, cr,
- 				   x, text_rect.y0 + details->editable_text_height + LABEL_LINE_SPACING + TEXT_TOP_GAP,
- 				   additional_layout);
-+        gtk_style_context_restore (context);
- 	}
- 
- 	if (item->details->is_highlighted_as_keyboard_focus) {
diff --git a/gnome-extra/nemo/nemo-5.0.4.ebuild b/gnome-extra/nemo/nemo-5.0.4.ebuild
index 33b49024deed..49839c4d1aa3 100644
--- a/gnome-extra/nemo/nemo-5.0.4.ebuild
+++ b/gnome-extra/nemo/nemo-5.0.4.ebuild
@@ -32,7 +32,7 @@ COMMON_DEPEND="
 	>=x11-libs/libnotify-0.7:=
 	x11-libs/libX11
 	>=x11-libs/pango-1.40.0
-	>=x11-libs/xapps-2.2.0
+	>=x11-libs/xapp-2.2.0
 
 	exif? ( >=media-libs/libexif-0.6.20:= )
 	selinux? ( sys-libs/libselinux )
diff --git a/gnome-extra/nemo/nemo-4.8.4-r1.ebuild b/gnome-extra/nemo/nemo-5.2.3.ebuild
index f3d71f05f38e..47194cd5ea22 100644
--- a/gnome-extra/nemo/nemo-4.8.4-r1.ebuild
+++ b/gnome-extra/nemo/nemo-5.2.3.ebuild
@@ -3,9 +3,9 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9,10} )
 
-inherit meson gnome2-utils python-single-r1 virtualx xdg
+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"
@@ -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 x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE="doc exif +nls selinux test tracker xmp"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
@@ -26,12 +26,13 @@ COMMON_DEPEND="
 	>=dev-libs/gobject-introspection-0.9.12:=
 	>=dev-libs/libxml2-2.7.8:2
 	gnome-base/dconf:0=
-	>=gnome-extra/cinnamon-desktop-4.8:0=
+	>=gnome-extra/cinnamon-desktop-5.2: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/xapps-2.0.5
+	>=x11-libs/xapp-2.2.8
 
 	exif? ( >=media-libs/libexif-0.6.20:= )
 	selinux? ( sys-libs/libselinux )
@@ -45,7 +46,7 @@ RDEPEND="
 	')
 	x11-themes/adwaita-icon-theme
 
-	nls? ( >=gnome-extra/cinnamon-translations-4.8 )
+	nls? ( >=gnome-extra/cinnamon-translations-5.2 )
 "
 PDEPEND="
 	>=gnome-base/gvfs-0.1.2
@@ -64,11 +65,32 @@ BDEPEND="
 "
 
 PATCHES=(
-	# Fix performance regression when icon captions enabled.
-	# https://github.com/linuxmint/nemo/issues/2472
-	"${FILESDIR}/${PN}-4.6-captions-fix.patch"
+	# 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} functionality can be extended by installing other packages.
+
+sys-apps/gnome-disk-utility - Mount archive files
+gnome-extra/nemo-fileroller - Extract/Create archive files
+
+${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-python/xlrd
+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
@@ -85,6 +107,11 @@ src_configure() {
 	meson_src_configure
 }
 
+src_install() {
+	meson_src_install
+	readme.gentoo_create_doc
+}
+
 src_test() {
 	virtx meson_src_test
 }
@@ -92,6 +119,7 @@ src_test() {
 pkg_postinst() {
 	xdg_pkg_postinst
 	gnome2_schemas_update
+	readme.gentoo_print_elog
 }
 
 pkg_postrm() {
diff --git a/gnome-extra/nm-applet/Manifest b/gnome-extra/nm-applet/Manifest
index d503e2479ff6..32244e629bb8 100644
--- a/gnome-extra/nm-applet/Manifest
+++ b/gnome-extra/nm-applet/Manifest
@@ -1,5 +1,6 @@
+AUX meson-0.61.patch 998 BLAKE2B e97d3460c28892df096d50a815826560eba89f050e36166c39e816e6a65d855635ea881edf07fd393ce1cbd0100c3fb2579982a00a71b089fbf765fe266c8879 SHA512 7103e31effe841f4d8af0d002c586f06ea199c024b0757a84617ce42a4aaff6b59350cd8cd90f3d4bfacb53333f2a806dab04c7ad40b3be568687df2afa40814
 DIST network-manager-applet-1.22.0.tar.xz 1901680 BLAKE2B e1597d5ee332000082e2939745af10f5f5d5e9177b388f67fdb9822636226502a4c96f4f97187f01ae8de5bd1b4d853670e94dc9058e9b31cf9cadf11fe6a64b SHA512 80c9a8df750f1253a66aea254f30278a934ed4e11fecff03cfa50a31da9efcff5c8892caef672a4d62d8c5c473770358c35344b49a9f3d7956ad76063b794cac
 DIST network-manager-applet-1.24.0.tar.xz 1903280 BLAKE2B a969ab18e2d2d85d378d9964e635281cfcd4bc46e0542ec94e187cbe7e740c5fad8e10b3d7d3ae3b85352ba5368787650f933b89740d05ee06d78057e1c31712 SHA512 7b91bd54d53b1b485bc5e401f83c683804175900557a7a4bc40a3f759fa9d4ca1c42b193bcd56a39a8cb79ec5b0c6f7cbeccfc08200099c08d933650c92faecb
-EBUILD nm-applet-1.22.0-r1.ebuild 1223 BLAKE2B 0dff6055d849a1c8dbd45ed5d6f65881f8204e25daa8463ba7ca5b6b6cf6d70147b3c913f709cce638c621a3ce4577975f1452148a6517d11b8d3f71707a852f SHA512 53725fca8fecf6df0975ead5fb686454659d06f8602c309d42f0ec659766e11840bfdcd34f6431edc379d98dbcab8e939f7a4cba02a529cdfcd0f3a5cb4565c1
-EBUILD nm-applet-1.24.0.ebuild 1228 BLAKE2B 0d216d8f8323b3a2c76083ad697381c665a1b12361cbe2f9b34b19ffba2b248bd1942a128ceca129170b01fba0efb81d87d9e685adcd196170ed95f18f560b63 SHA512 863bca4a333fc007412f82e673ed07cd01056d825078fc15e9a5dbc6b994d9a12e2f362e7d461e2840663949370bbb39d81c95fb70dddb28c5a131e7a5bcc4b2
+EBUILD nm-applet-1.22.0-r1.ebuild 1268 BLAKE2B 54412fc36e950cab4cf3eed2640164a9386260ffbf47143eef1cd0e115de11e304212307b6d8633d9579bc9d4e1f481e3a678ab00f74afe0a590b7d223b9129a SHA512 72be709f6ee2709d855982a00dcc26bb2b26a766ae98f498a9bdccc6f91104a0d1ff1d471ada91fbf65f43546782d16e7ffbaef3b514cbc216e96652fa2b457c
+EBUILD nm-applet-1.24.0.ebuild 1273 BLAKE2B 967345056fd32e0cc72a90d9f50b3b1d0a3db33542b28d4e6ee879fb5842a0bd5395026c787353f8aa18036f91cfd7d219ff0e5109b57192d2da09c12bf2d090 SHA512 a16f17d70ac3701e3cc51d8f4939526e9e1c6842929d3864c1d3b7b5204f3dc4acae048f7a6c4536ee926cb668bd5d724ccf67cc2b9750957ceb6590e8d66368
 MISC metadata.xml 452 BLAKE2B b17e0338356cd0b24f3de4e1e4d8c13ab7b551707f0309c7a233c28b92cf7b27ef66b36f58717228a11cb76dba2892f23455f50f9dcc6fe7905f312b848f1695 SHA512 2e4fd5feb6f4b6fb8a503b26ac5ef1c388ea699a873ff70ec5144b796b2ff75b7e572a5de5efab60a7844a9bc2d639f6296db97260a0c38f9b37d46c33543d40
diff --git a/gnome-extra/nm-applet/files/meson-0.61.patch b/gnome-extra/nm-applet/files/meson-0.61.patch
new file mode 100644
index 000000000000..e2366c0f64e1
--- /dev/null
+++ b/gnome-extra/nm-applet/files/meson-0.61.patch
@@ -0,0 +1,36 @@
+https://bugs.gentoo.org/831829
+https://gitlab.gnome.org/GNOME/network-manager-applet/-/merge_requests/107
+
+From b92fa5ba6d65aaa9e2d1494beaf340a33d9ba07f Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex@linutronix.de>
+Date: Fri, 21 Jan 2022 22:34:09 +0100
+Subject: [PATCH] meson.build: address meson 0.61 failures
+
+Signed-off-by: Alexander Kanavin <alex@linutronix.de>
+---
+ meson.build | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 33adb632..6178c0eb 100644
+--- a/meson.build
++++ b/meson.build
+@@ -254,7 +254,6 @@ desktop_file_validate = find_program('desktop-file-validate', required: false)
+ 
+ foreach desktop: desktop_files
+   i18n.merge_file(
+-    desktop + '-desktop',
+     input: desktop + '.desktop.in',
+     output: desktop + '.desktop',
+     install: true,
+@@ -275,7 +274,6 @@ endforeach
+ appdata = 'nm-connection-editor.appdata.xml'
+ 
+ i18n.merge_file(
+-  'desktop',
+   input: appdata + '.in',
+   output: appdata,
+   install: true,
+-- 
+GitLab
+
diff --git a/gnome-extra/nm-applet/nm-applet-1.22.0-r1.ebuild b/gnome-extra/nm-applet/nm-applet-1.22.0-r1.ebuild
index 57ab47600412..6498d20d7f96 100644
--- a/gnome-extra/nm-applet/nm-applet-1.22.0-r1.ebuild
+++ b/gnome-extra/nm-applet/nm-applet-1.22.0-r1.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
@@ -39,6 +39,10 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+PATCHES=(
+	"${FILESDIR}/meson-0.61.patch"
+)
+
 src_configure() {
 	local emesonargs=(
 		-Dappindicator=$(usex appindicator ubuntu no)
diff --git a/gnome-extra/nm-applet/nm-applet-1.24.0.ebuild b/gnome-extra/nm-applet/nm-applet-1.24.0.ebuild
index 769fc0bab392..0d966ed53377 100644
--- a/gnome-extra/nm-applet/nm-applet-1.24.0.ebuild
+++ b/gnome-extra/nm-applet/nm-applet-1.24.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
@@ -39,6 +39,10 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+PATCHES=(
+	"${FILESDIR}/meson-0.61.patch"
+)
+
 src_configure() {
 	local emesonargs=(
 		-Dappindicator=$(usex appindicator ubuntu no)
diff --git a/gnome-extra/pch-session/Manifest b/gnome-extra/pch-session/Manifest
index f1b9aa74be4d..993eebb37ed4 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.0.tar.bz2 3610621 BLAKE2B 65c6cca06b95ca6a3770867972f613cc0c064d6622dd16e86b177b5a52b8db7b8385a8f8e5202f535e7c8f254c9c5b921553c8a04418639dcefb2adf2c37f325 SHA512 b4911c865aebf9969fc5a95c4865c5a6bab3cd3bac2d70c59ef4e6b44f6b83a4cbc77877c5412c58ba99a688510b5ea9d1b213887cd5e6b2a7011c1f1c398b5a
+DIST pch-session-41.1.tar.bz2 3610620 BLAKE2B 89ba9f49492f2e767259923bdcbc5c4d11c03da8d4bbb7b7db3ca25d05ac3e681e3835ffe8b9fcc381d0fcd9cf0dc93c7c42003ea93cd41bdeadd1417f3d9864 SHA512 9f4791070af32ebc841f5e2915d76bb7462934d95f8daee96f1ae7619e9962c2d7e3b8b94a62ff29d5beb02f0609a628de974a05066e721eee789e2c0b81a061
 EBUILD pch-session-40.2.ebuild 1238 BLAKE2B 4aafe0c2a9284939b83b167f9f4e564fdc708af7c2f2a191986f85ffd77e9798e7ef620556e96769f01d9830f9839f06b44e97fcec0fa527b0b23f0ca60ff9e9 SHA512 219b7d308693da99310c9ff10d06009c1e6b52b1bab9ba40c225df30782191a8ce0aa22b286a11876ed64b9d91fa6c52e80ce515854ee358a66e0b50ae7d21e2
 EBUILD pch-session-41.0.ebuild 1225 BLAKE2B 5fc14b6d417a928b6fb2e3bdaa276fd452f54d48b5d195f04852851bce0631aa3c27cc81977ed71b29905d7d77c033f81a7268438cb5c91d1e4c86cb75642edb SHA512 0e48e29a139b764e9d8922553e4884198d4caf9e8ce2a4e2fe1d6fdd9575045aa3e27c73083719371b39fe8f5261b2dbab2e81e6953e72b368248c4f481756bb
+EBUILD pch-session-41.1.ebuild 1352 BLAKE2B 1fa1c28a5424d4850bd285ee2b427ab08476956a3788474e2f3bc93ccf0b04080342291ad78f6b6ee7ced1fff9e80e46d557365384c7858de8fc8b1177fa4cde SHA512 043fd179d89b3e90780802252f50e3ba42b70a576accf91e645dd3a63a2ac4cf9cc340f5a5e09947e14f41ba36c3bbde27474cc006227539ba057f6fc1a11a53
 MISC metadata.xml 241 BLAKE2B cb0374238d11e2a3f28f23b7049da09babd4310a99862738acfb7ba554f7758ac68cd09d1eb7a29068195c27010a846a540ed2c09b88fd043b37fb4f0762150f SHA512 b2c1d3e2cb6760ed4682da82af5370adcacd48afd558efa1abf84d955067b2ad32eda034af8cef95c71409622f97fa0113f2e07bee328f2d03512908ae931050
diff --git a/gnome-extra/pch-session/pch-session-41.1.ebuild b/gnome-extra/pch-session/pch-session-41.1.ebuild
new file mode 100644
index 000000000000..05ff9874d4c0
--- /dev/null
+++ b/gnome-extra/pch-session/pch-session-41.1.ebuild
@@ -0,0 +1,50 @@
+# 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=""
+
+RDEPEND="
+	>=gnome-base/gnome-shell-41
+	>=gnome-extra/gnome-shell-extensions-41
+	>=gnome-extra/gnome-shell-extension-alphabetical-grid-17.0
+	>=gnome-extra/gnome-shell-extension-appindicator-41
+	>=gnome-extra/gnome-shell-extension-applications-overview-tooltip-14
+	>=gnome-extra/gnome-shell-extension-bing-wallpaper-36
+	>=gnome-extra/gnome-shell-extension-bluetooth-quick-connect-23
+	>=gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen-20211111
+	>=gnome-extra/gnome-shell-extension-dash-to-panel-45
+	>=gnome-extra/gnome-shell-extension-desktop-icons-ng-0.24.0
+	>=gnome-extra/gnome-shell-extension-gsconnect-48
+	>=gnome-extra/gnome-shell-extension-weather-in-the-clock-20211108
+	>=gnome-extra/gnome-tweaks-40.0
+"
+BDEPEND=""
+DEPEND=""
+
+pkg_preinst() {
+	gnome2_schemas_update
+}
+
+src_install() {
+	insinto /usr
+	doins -r usr/.
+	einstalldocs
+}
+
+pkg_postinst() {
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	gnome2_schemas_update
+}
author	V3n3RiX <venerix@koprulu.sector>	2022-02-02 01:39:05 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2022-02-02 01:39:05 +0000
commit	fcc5224904648a8e6eb528d7603154160a20022f (patch)
tree	3bfce096b38a9cea8eed13fc70c1526c456e9abd /gnome-extra
parent	2fd57282f0262ca084e05b0f2c63fbada395d02b (diff)