gentoo resync : 20.03.2022

author: V3n3RiX <venerix@koprulu.sector> 2022-03-20 00:40:44 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2022-03-20 00:40:44 +0000
commit: 4cbcc855382a06088e2f016f62cafdbcb7e40665 (patch)
tree: 356496503d52354aa6d9f2d36126302fed5f3a73 /gnome-extra
parent: fcc5224904648a8e6eb528d7603154160a20022f (diff)
133 files changed, 731 insertions, 2266 deletions
diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index 4ea1b0249f26..3fa12c494df7 100644
--- a/gnome-extra/Manifest.gz
+++ b/gnome-extra/Manifest.gz
diff --git a/gnome-extra/chrome-gnome-shell/Manifest b/gnome-extra/chrome-gnome-shell/Manifest
index c6536ed1d557..5f6b0fd3baee 100644
--- a/gnome-extra/chrome-gnome-shell/Manifest
+++ b/gnome-extra/chrome-gnome-shell/Manifest
@@ -1,3 +1,3 @@
 DIST chrome-gnome-shell-10.tar.xz 158972 BLAKE2B fe4df942f885aee40d5c5e01dcd127a9deb46aeb57765336c91a7a9c56f7c953eb36d822ffa821300b99e3d765c1b162767fc5debc24e42a16bddb1404796c9c SHA512 cf0d108c3fb57deb4926a4cf043dd64d776eda4c01ec595a1472c6c45726b8460381b9bd7cb1b43d7a5bd8a585be0d1b648c720a2f0a7a377c133b8750e76cd6
-EBUILD chrome-gnome-shell-10-r4.ebuild 1408 BLAKE2B d39507fa77f3d8010ef3116a2b327ce511581f9169f75a6924f26dfe3d90a483c1497ce09b3dff56e19abfcfb0abf014a00d438f51a12744708868efca4de43f SHA512 1a4aeb07487594df9bccd58ba78bcd009ebf81357cb3c1dd1b9184ea35c882e634da3f0eb779381ed903863e92585eeee7856a11c3fbed29637e4e8dee3218bb
+EBUILD chrome-gnome-shell-10-r5.ebuild 1401 BLAKE2B 71e9615355e527e5e4569889647f8871d1ce1e54660a0a96d32affb05fdeef752836cd863b1793142f81704a2a385f813b99967d463b225bc010248f9837497d SHA512 91ec86e2b3a9958f1f2c2056a9bbabc6a83a31ac34654cd820dadf17680f6d932ee56fb1c11b71ef5c95948cf2b648cb15a0cfe0d032d087f7ea69486667d5d5
 MISC metadata.xml 569 BLAKE2B 75ca01eca709bea5e7e2876676f2cead028f56f99ea921f6c8068191ab1497c2424f2b0b526a35b347bdf95a0ec851237b1091647294f122d208f7df4112e4e2 SHA512 93b2791f3bdcc9462030f0afcf5c9fe956f92ddb1fa26c024b9a689476cb0055dcefdfc4f62200d2648733e4b3a83e8592ec0c4bb79ce7400f7e5d3e5a8879b7
diff --git a/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-10-r4.ebuild b/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-10-r5.ebuild
index fdd0cb9ab06c..8198915b17bf 100644
--- a/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-10-r4.ebuild
+++ b/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-10-r5.ebuild
@@ -1,11 +1,11 @@
-# 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
 
 PYTHON_COMPAT=( python3_{8..10} )
 
-inherit cmake-utils python-single-r1
+inherit cmake python-single-r1
 
 DESCRIPTION="GNOME Shell integration for Chrome/Chromium, Firefox, Vivaldi, Opera browsers"
 HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShellIntegrationForChrome"
@@ -18,10 +18,7 @@ IUSE=""
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-DEPEND="${PYTHON_DEPS}
-	app-misc/jq
-	sys-apps/coreutils
-"
+DEPEND="${PYTHON_DEPS}"
 RDEPEND="${PYTHON_DEPS}
 	$(python_gen_cond_dep '
 		dev-python/pygobject:3[${PYTHON_USEDEP}]
@@ -29,14 +26,18 @@ RDEPEND="${PYTHON_DEPS}
 	')
 	gnome-base/gnome-shell
 "
+BDEPEND="
+	app-misc/jq
+	sys-apps/coreutils
+"
 
 src_configure() {
 	local mycmakeargs=( -DBUILD_EXTENSION=OFF )
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	if [[ $(get_libdir) != "lib" && "${SYMLINK_LIB}" != yes ]]; then
 		# Workaround www-client/firefox-bin manifests location
diff --git a/gnome-extra/cinnamon-desktop/Manifest b/gnome-extra/cinnamon-desktop/Manifest
index 212e72f72ba5..b33d027e630e 100644
--- a/gnome-extra/cinnamon-desktop/Manifest
+++ b/gnome-extra/cinnamon-desktop/Manifest
@@ -1,5 +1,5 @@
 DIST cinnamon-desktop-5.0.0.tar.gz 495362 BLAKE2B 955fea37ceca3d5ee33ab94aaa4e22cb6973fc87a53f05486cd16e7d05e6e0a5ca7d548f68544fbc13ecebe2f59aee07db73b0db2e810d020730f77f05843cf4 SHA512 1191feeea4a35b6cae5708e62ec472bc865e3e209717b597eb5853673dbe29d3d03b0be5d5ee486e74748fcc2f60ac0012900aa6340a85da8059eda4d40a2263
-DIST cinnamon-desktop-5.2.0.tar.gz 495118 BLAKE2B e9175230a482ae68bd5b22ce5e3dbba053494d7872c75089a0bd7922fb59e8a0787863b5ae962bca4f4d3a1ed8490c5f33d3c420c1984ce47ddb9cde6476afa6 SHA512 c4b7dcfe16c77f3c8390e6f41322db8e3ca9e2858c0fcd7629b4844834feda7baadb3f54d9239831a0ded97b139ce3d2362f222829ac1513184d32c7480e808b
+DIST cinnamon-desktop-5.2.1.tar.gz 495131 BLAKE2B 56b5e5018f5b1bdfa57af1550edc756e4336b079df75753f90445d51703efe64dc6e33c1e7635fcf2e2fcca1683008777b446d76570fd5222fb809b1a458f6f2 SHA512 383229a929f4bd18389851573c4c7decc3cb5d6ebfdeb86ab7628578486c75ca71a308755d2736243a4801d5d50f6b07d0a142712d48752e166f3a39c3b70466
 EBUILD cinnamon-desktop-5.0.0.ebuild 1298 BLAKE2B 4078ae0cdcfcbd1a0382ed78c3d1b7b5e47eca3e5198287440d08960ee52e5e95df2a4edd1a3b4778f296527ac180adbdba72fe7dfd26997ed56ddc607175398 SHA512 76bc37293c032d02990aa9e20e308971c4cb1ebf4559001b834b7a6d628fd9c29a376bc53e83991ca32b70dd5129c649550760f430c9d7233aa2893e37a74dd1
-EBUILD cinnamon-desktop-5.2.0.ebuild 1275 BLAKE2B 37969bbdef73f34603ea253e9b7bf01d04801e36ff8ebe55db6c7d364c6981601ab025a3dd8c6c2666119e3ea934b723715e75d9abd58fbd200f9023d5702333 SHA512 e8e5e7bad6fb5ddbce7d54ecdf8c3fd4b7519a1d759740c38bb54e813a741fee0b45cc0b75bfbde6a1ed46c403627ec544365080fd4b7e80bf3adba3fe4d4591
+EBUILD cinnamon-desktop-5.2.1.ebuild 1275 BLAKE2B fb284525afbe4e53f5864cb51614758f8188d97f80854de0626336e7f50f8840542f79785fd5f88a4bb17262174061076fbcbc4e9fde8e5f67b124403be3750a SHA512 42b2484107b0ea93448012820a1be2f6fe0c5d79f3f695ed7760c23df187525095d21fbc22a684e7c18995a969355f94a8af73fac3cd975387c76865b3b19d4a
 MISC metadata.xml 496 BLAKE2B c019ef51b10de9ccafed1294e6d436dcdc8f02735170afe9e038689c6c4d76fb3e099bc9ec7f10c2a50d2bfa5e1d1c191667a470d734effad53d9d299f431664 SHA512 41a99dd4e1aad85dda44e2168bc150e2c27bb40a45c0dfe0f085e502242e6a0704ad8b47f64140d81afa7ff096cac735c46827f3d949962400de92d769505cc4
diff --git a/gnome-extra/cinnamon-desktop/cinnamon-desktop-5.2.0.ebuild b/gnome-extra/cinnamon-desktop/cinnamon-desktop-5.2.1.ebuild
index 7add18e30f7e..e6c66629ffe2 100644
--- a/gnome-extra/cinnamon-desktop/cinnamon-desktop-5.2.0.ebuild
+++ b/gnome-extra/cinnamon-desktop/cinnamon-desktop-5.2.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
diff --git a/gnome-extra/cinnamon-screensaver/Manifest b/gnome-extra/cinnamon-screensaver/Manifest
index bb6d0e34ced8..750ba8681f51 100644
--- a/gnome-extra/cinnamon-screensaver/Manifest
+++ b/gnome-extra/cinnamon-screensaver/Manifest
@@ -1,5 +1,5 @@
 DIST cinnamon-screensaver-5.0.7.tar.gz 154480 BLAKE2B 38b89e2d4729ea2806903e9bd27024b274248325720d233485ab756477625bc07832582bbe99c599b7a7d4dbcf76d22b59df179ac8617a81b584b9f5684cb6d2 SHA512 ec5990e1f73983e96eb07f0d4d1a66076d067df28d56c68cce987dc7fce35871650273d2d4a64058d73c7daff2326722e3c1a2fd86afc761d81d1a6b2e7f9370
-DIST cinnamon-screensaver-5.2.0.tar.gz 154678 BLAKE2B 65e2ecf62319198b7637129711bc7cce08ad05a9ed89f30553bac77e5e4b147bdbcb992a1e8717e903912d0b4f70075684b40c136afc0099182c1101f1ba1a0b SHA512 d248ef848d2990a8464ff866b4d090b60531832c7a327b10f879c5a00558e14b70c6b45223550ad4100e7af1a491dc7c460c27d159c28eb289a37b916d89ad41
+DIST cinnamon-screensaver-5.2.1.tar.gz 154920 BLAKE2B a50508f6ad5ffee797db4f74295ef7ffdfdb0024e9a9ca005398f5ccac83687f356743c80d8911ccf1ee9b343a285e4e6c72ce864fe639e3494ed54701a84e8b SHA512 db293f619df8ea3e43c209f5d32d649935f1efbc5763700369d5bd595866805a3e604930a3f70b6d43cbc4469c6d618f258b49cf4962f87c8b06447178ed1e7a
 EBUILD cinnamon-screensaver-5.0.7.ebuild 1650 BLAKE2B 9a1c629b7d4395fca8a184c2e114b0ee9cfc036d59e3711b09d08bc78b6aae7a2abf25b655c9c18fd4efaa7ce7ae01e72323b324665d5b4039165689c4eb2ebd SHA512 66a1ee63a072f344cf4c3b9fbcdf183785f6cf41505508df0b397e9763bfedba724b2b0985b902caa9f66f01da46d1f566a1801e9256f7a8467ab90f1b6c1545
-EBUILD cinnamon-screensaver-5.2.0.ebuild 1632 BLAKE2B 2f0b69b0e61a3499ac588c9113420582ea7d48362d457f04504e810139ae1bdafbc46a57c9e653cdb982eea75e2521ed107d453ad2941bc9cdcd8f6edf2dcbe8 SHA512 b54e19d1bed4b3fafe1a4cd606d9f6f2e59112146e6972f7ba955c83974edb7c320345a24a68f6ffb71507f3a3212fc8535d0f2281bbbf898042a584cf55813c
+EBUILD cinnamon-screensaver-5.2.1.ebuild 1632 BLAKE2B 349f191aa9f31189e2747fbefa0cc808c7f747c5dc9c7c68e445315a37fc0fff3024b5377f96feb0c3692ec359db747de46789b6783b62b529ff9cba02660acf SHA512 b95a9ce8b339d6b762822682ce70d33d20f182154b9be15189409750c74e462ccfe23129da0debe716322841f1ea4a86dbd52dfc6858e4373aa2bec302486112
 MISC metadata.xml 500 BLAKE2B 92b85c1d68491b0e4f88203070760f1e8d2b51b3bf9d3615e18a26cdaf6466eadaa700f18f1668a9b214a540fe01639a49a8535cd43435ddba192fef0267ce98 SHA512 35fc95aac49117f0bd643ccd17d2e461ad1cc5dc744256f6cf83f4248c087b33f66eb4352aeae8105983789e7f8ca74727fc48557f462edfba658d411bb536f7
diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-5.2.0.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-5.2.1.ebuild
index f9fd96c4619b..0ff66f127ab4 100644
--- a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-5.2.0.ebuild
+++ b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-5.2.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
diff --git a/gnome-extra/cinnamon-session/Manifest b/gnome-extra/cinnamon-session/Manifest
index 8d683b648438..2d6e2569f524 100644
--- a/gnome-extra/cinnamon-session/Manifest
+++ b/gnome-extra/cinnamon-session/Manifest
@@ -1,5 +1,5 @@
 DIST cinnamon-session-5.0.1.tar.gz 200036 BLAKE2B a7e254d54daa63f5dcf5592843b85e0c63a3fdd34ce5c3045ff5c7ce410f2ab340b5c778b1579e7586f7d9e0517fdf00703934395b9bbbbd234cb181a1096fcf SHA512 0c367764269ce1597035288508909aad2c031ab5b8c04bde3d81cc420f38abf6cca82f169db199cf01218e92014653f1749c0ed2096950f7bc9f3b56f1fcdebc
 DIST cinnamon-session-5.2.0.tar.gz 200208 BLAKE2B 2efe8ef0cb5dc4a828866c91bc020ffcc8b400423f92ac8be8ab47391202001123805c947af8e82eda530675b89cf4960f082b06acf24c296f083d6bcb941217 SHA512 3962529fed8d6c4c74e2f4b75014529d1a9b3307cf2d014c90088d0e2d3066ce375ccc3bbf5f07e9a181c08bba5360b07d5800cdb6386796255b4f1cb5c4d385
-EBUILD cinnamon-session-5.0.1.ebuild 1472 BLAKE2B 35cae54c1148f21f0304f7fd805d799bdd83c02617230829f4734c8ba98c09f5c911db418858ff0d652f52403c9ba5144eaf176de7fa457ae443b2cbbe41e71d SHA512 fe62504631d5e54138c9547668c413399e265bde98c05efc66e1a5f00878e9e40c267ca50f552b2fc076322782853fb385d13b1fe8408b53f4f8eb9ad97acab2
-EBUILD cinnamon-session-5.2.0.ebuild 1449 BLAKE2B 81a7a6fc407a11462a8974a683f33ca96d76c33fa71eefe312637256242750cb5b7ab7965737c128938eec1488a97c4b404d8e6af1d2f595fdfc430bc7f57acc SHA512 14a7d6736880e27d4fd32285810ca33821750920f565ed3ad274ced5b32c9fe4807c7b1850b545b243a3f7e30213b587d8ebda3259171d36b1aa28a66edeb36e
+EBUILD cinnamon-session-5.0.1.ebuild 1925 BLAKE2B 28662c19c0611a35728f11655f398a1b6ce51d153aed8d434062400a1b32b75b879f8b94c5beb017fb3aba89a7b99e0ead402f862835fc69884048e4133ce3a8 SHA512 b7a642c9406efa356c14d573675930cdd27a1ac4b9c7458b9b267b0dd47f8d442ab3cccdeb81026922f9287629d96b123ce0c11d03e473644fb18e3f5ce2bf7a
+EBUILD cinnamon-session-5.2.0.ebuild 1902 BLAKE2B 1da53dda72f770aaeb9839464023caa36150c9f8ca6383014a9b7c10a66fa926b7e21c3302c4a87b34b4ee8aabd9db14441de24f3829c2db0a0f52b34a73f942 SHA512 6f727d6109d59d881d2071b209ca3bbdf591b07347a685a62f5a665041cae2afdfbb46bceaf46bc64c9b9fd89742682e5d9c0135ce12713edd3aa0c13b6b7bcb
 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 b35ae9b0339a..119f516fc728 100644
--- a/gnome-extra/cinnamon-session/cinnamon-session-5.0.1.ebuild
+++ b/gnome-extra/cinnamon-session/cinnamon-session-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
@@ -66,6 +66,22 @@ src_configure() {
 	meson_src_configure
 }
 
+src_install() {
+	# A bit icky. Let the docs be installed in the wrong dir, then
+	# install them to the correct dir.
+	local dbus_doc_dir="${ED}/usr/share/doc/cinnamon-session/dbus"
+	use doc && local HTML_DOCS=( "$dbus_doc_dir" )
+
+	meson_src_install
+
+	# Clean-up the incorrectly installed docs.
+	# Fail if unhandled (new) files are encountered.
+	if use doc; then
+		rm -r "$dbus_doc_dir" || die
+		rm -d "${ED}/usr/share/doc/cinnamon-session" || die
+	fi
+}
+
 pkg_postinst() {
 	xdg_icon_cache_update
 	gnome2_schemas_update
diff --git a/gnome-extra/cinnamon-session/cinnamon-session-5.2.0.ebuild b/gnome-extra/cinnamon-session/cinnamon-session-5.2.0.ebuild
index 002c659ae87b..c89d9864b142 100644
--- a/gnome-extra/cinnamon-session/cinnamon-session-5.2.0.ebuild
+++ b/gnome-extra/cinnamon-session/cinnamon-session-5.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -65,6 +65,22 @@ src_configure() {
 	meson_src_configure
 }
 
+src_install() {
+	# A bit icky. Let the docs be installed in the wrong dir, then
+	# install them to the correct dir.
+	local dbus_doc_dir="${ED}/usr/share/doc/cinnamon-session/dbus"
+	use doc && local HTML_DOCS=( "$dbus_doc_dir" )
+
+	meson_src_install
+
+	# Clean-up the incorrectly installed docs.
+	# Fail if unhandled (new) files are encountered.
+	if use doc; then
+		rm -r "$dbus_doc_dir" || die
+		rm -d "${ED}/usr/share/doc/cinnamon-session" || die
+	fi
+}
+
 pkg_postinst() {
 	xdg_icon_cache_update
 	gnome2_schemas_update
diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest
index 2ca12ed50615..bed102e51dcb 100644
--- a/gnome-extra/cinnamon/Manifest
+++ b/gnome-extra/cinnamon/Manifest
@@ -1,9 +1,11 @@
 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-5.2.7-optional-eds.patch 2550 BLAKE2B c6d1a8fcc476201b692869ea47bc2262b4a79d754ada3c7c9828eb5c48102c7ad79c81482805797fdf3418c8d1f91b833783a6e7e5139c0004fecdfba8539121 SHA512 18187b72bdec52f91fb10835aa4a00df8c392056c447513cb14f8d455243d5c1ea36d25b872b872e0bd23a74a68f1eb46e7214a3ff0277c58264499b1486c9c3
+AUX cinnamon-5.2.7-eds-detection.patch 5038 BLAKE2B 287cdf4bd91b8be422a471fd86dd6083d26cf9eabbcbc573d6efd27b55c58fb94b47f3c474b6dbb9dbc8d0da700bfccb56599e23995983d94b6f5b2aa4026ef7 SHA512 da73e53738987fbb045070061fbc88c21b9dac53fc4d35ecb5320661663ef0e4019e88cf362dd3eb8e172797f0a7dd93e33723bf727cb7db24042c0815933565
+AUX cinnamon-5.2.7-meson-0.61-fix.patch 1668 BLAKE2B bf0490423fcfa3d1228a3b1090264449c98f9beebdc064a5815e8603faa494473a46cf6be46e6003a32ab8610ff6e8621e815437052bb5b3d6cccd6c428088ba SHA512 69d8ca0413ad2d1b6e259eeb2d3538cff16b6c3a50491cb288c462363880f9ee9299547141120a3a8e9ab364049178eec0851ab972415e2845e9ed21d3075f9b
+AUX cinnamon-5.2.7-revert-meson-0.60-fix.patch 2020 BLAKE2B 83060c16d8f91188bbfc9e784633ad4d40ba1ab91c1b980866b5d6870cffddbabdce6eceb7121543618e7d94b5f02ed115ea915b7371acb8f271ce6391b98759 SHA512 2c41deff381bc043eee05fc106a7c6b4177728b6500279d0185b99a8f5014ca04158b6348ab3f47c28938f2559193916abc80d387c8ffbb1528532ad26ce1f33
 AUX polkit-cinnamon-authentication-agent-1.desktop 252 BLAKE2B 8a7c10fa19e19c479ab40e9599b8804bc42a78548b9a09f34edc497dc5c9cbcd6958dbbb93cede57c0bf7938cc22f49c229274941b9509ad220e8790ed26bf9e SHA512 7857dc3d08129c37c461b85049d3a12b6602853d7dc44e68d79ce28bbe1121051a2061a4a4de050402230f85755d2800143e3373708fa19d43a001f7f1100360
 DIST cinnamon-5.0.6.tar.gz 2397950 BLAKE2B e54f8ed02fc36c121d15d30aaed4633f7db30bcf3e0179fb5fa0b9f12b42f0a29b341f531eed7ba19f849c0400ee9887ee59b5218f4558586a360d173798aeea SHA512 3ed835b1c41a34dfd1e2eac7746bfa01fe48359c6c3e8085877a4c18b895ea065efc343a855cbdee3fcbfb63aa40166bbe40fa19154ae1544be675411d49a962
 DIST cinnamon-5.2.7.tar.gz 2423949 BLAKE2B f4ce9ec4c79eab3daadff958c0a334d49757548203078ab657ebe2450f3f179c942df9d0f9089efe313c268c929628d724db43371e12338606d284a2738ed62c SHA512 62cbbe2f719574b3f70a4895c231be9ad65a41220d2755cc1557bc06bb2b31ced93621c356f2973376d127d5a1e59f9295498bbc4812d428e8605e8f4882c733
-EBUILD cinnamon-5.0.6.ebuild 5054 BLAKE2B 52f7e2a5ec5beb15ae6126bacbd00b50a265fc5ce5d3001688b1a31e3c117b4c25d990ca1501d854198146d9350333bd590f198e5fbfd9e9a0156e41c8f11f75 SHA512 5fd51ead2890c68de3f02938dfd422503e163a1b38b9d95c45de3e25e285f2063ecb01acc68da85539b4b682ace4bd6d68f427f3d978372684a1ce7b262fd9d6
-EBUILD cinnamon-5.2.7.ebuild 5253 BLAKE2B 7a30123d42393780b6bb7c938e3ee23dd03b8fab6567a1385484327131e58f084c8b50381f978bcb41de4f7322028cee4db48aa78d773053fd78beb5cd356dbf SHA512 1df5b0ae6c058414310270ef58d77e21e529f52b0c264fb45aa83e78a8ce359154b4904083acc2e59e7fbd24452782a6c3d39b49f46df837d05ce83e3a3b0989
+EBUILD cinnamon-5.0.6-r1.ebuild 5094 BLAKE2B 6b3f64ffce5368b1ea6e725f0cfad7820b2b2e440d2da79087f3a2d26ea080d8312d220a735165c69ba13c1d7cef3fe60ca3638c570a654f627bdcb528e60c93 SHA512 e8bf1bbf34998df7df5b0fc31d1189d87a04c04cac91075a8cdb0608ec82cd1e277fb94f5477e804a45b3e267251a8e6a1d514a807d3396802073938d7eed10b
+EBUILD cinnamon-5.2.7-r2.ebuild 5372 BLAKE2B 2aed6a3cfe360040929edd5fae5e86952c9437cb8d50c51d56b62902865c6e8ecb0fdec8723d03b0c51a0d8f14b4cba3797d58d26095ddfc0bcb3622cce8618c SHA512 07e18607696498980903980dc779bbccc1904c95667961c2ab33920060ed9cc54c9956d71716d40238d66d2691acb0c14c2585fc6c3fb42e3f02aec2a3c7ae67
 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-r1.ebuild
index f07b7f6d2201..d6c3792cf966 100644
--- a/gnome-extra/cinnamon/cinnamon-5.0.6.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-5.0.6-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
@@ -66,6 +66,7 @@ RDEPEND="
 		dev-python/pyinotify[${PYTHON_USEDEP}]
 		dev-python/pypam[${PYTHON_USEDEP}]
 		dev-python/pytz[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
 		dev-python/setproctitle[${PYTHON_USEDEP}]
 		dev-python/tinycss2[${PYTHON_USEDEP}]
 		>=dev-python/python3-xapp-2.2.0[${PYTHON_USEDEP}]
diff --git a/gnome-extra/cinnamon/cinnamon-5.2.7.ebuild b/gnome-extra/cinnamon/cinnamon-5.2.7-r2.ebuild
index 976736f285f6..5237a3b90b2a 100644
--- a/gnome-extra/cinnamon/cinnamon-5.2.7.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-5.2.7-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -69,6 +69,7 @@ RDEPEND="
 		dev-python/pyinotify[${PYTHON_USEDEP}]
 		dev-python/pypam[${PYTHON_USEDEP}]
 		dev-python/pytz[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
 		dev-python/setproctitle[${PYTHON_USEDEP}]
 		dev-python/tinycss2[${PYTHON_USEDEP}]
 		>=dev-python/python3-xapp-2.2.1-r1[${PYTHON_USEDEP}]
@@ -112,7 +113,11 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-3.6.6-wheel-sudo.patch
 
 	# Make evolution-data-server integration optional
-	"${FILESDIR}"/${PN}-5.2.7-optional-eds.patch
+	"${FILESDIR}"/${PN}-5.2.7-eds-detection.patch
+
+	# Meson fixes
+	"${FILESDIR}"/${PN}-5.2.7-revert-meson-0.60-fix.patch
+	"${FILESDIR}"/${PN}-5.2.7-meson-0.61-fix.patch
 )
 
 src_prepare() {
@@ -131,7 +136,6 @@ 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)
diff --git a/gnome-extra/cinnamon/files/cinnamon-5.2.7-eds-detection.patch b/gnome-extra/cinnamon/files/cinnamon-5.2.7-eds-detection.patch
new file mode 100644
index 000000000000..bda0feedceb7
--- /dev/null
+++ b/gnome-extra/cinnamon/files/cinnamon-5.2.7-eds-detection.patch
@@ -0,0 +1,114 @@
+https://github.com/linuxmint/cinnamon/commit/ef463cc0aaedd714f2956daab227aeda1d87897e
+
+From ef463cc0aaedd714f2956daab227aeda1d87897e Mon Sep 17 00:00:00 2001
+From: Michael Webster <miketwebster@gmail.com>
+Date: Wed, 12 Jan 2022 14:50:47 -0500
+Subject: [PATCH] calendar events: Check if evolution-data-server is running
+ before enabling events.
+
+None of the e-d-s libraries actually depend on evolution-data-server
+(which is what provides the backend to these libraries). Also, not
+everyone may want this sort of thing in the first place.
+
+So, check if the e-d-s service we require is active before trying
+to enable event support.
+
+ref: #10597, #10567
+---
+ .../applets/calendar@cinnamon.org/calendar.js |  2 +-
+ .../calendar@cinnamon.org/eventView.js        | 43 +++++++++++++++----
+ js/misc/interfaces.js                         |  4 ++
+ 3 files changed, 39 insertions(+), 10 deletions(-)
+
+diff --git a/files/usr/share/cinnamon/applets/calendar@cinnamon.org/calendar.js b/files/usr/share/cinnamon/applets/calendar@cinnamon.org/calendar.js
+index 460883c063..5078a201ed 100644
+--- a/files/usr/share/cinnamon/applets/calendar@cinnamon.org/calendar.js
++++ b/files/usr/share/cinnamon/applets/calendar@cinnamon.org/calendar.js
+@@ -159,7 +159,7 @@ class Calendar {
+         this.desktop_settings = new Gio.Settings({ schema_id: DESKTOP_SCHEMA });
+         this.desktop_settings.connect("changed::" + FIRST_WEEKDAY_KEY, Lang.bind(this, this._onSettingsChange));
+ 
+-        this.events_enabled = true;
++        this.events_enabled = false;
+         this.events_manager.connect("events-updated", this._events_updated.bind(this));
+         this.events_manager.connect("events-manager-ready", this._update_events_enabled.bind(this));
+         this.events_manager.connect("has-calendars-changed", this._update_events_enabled.bind(this));
+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 1d1035c605..2e73363fb7 100644
+--- a/files/usr/share/cinnamon/applets/calendar@cinnamon.org/eventView.js
++++ b/files/usr/share/cinnamon/applets/calendar@cinnamon.org/eventView.js
+@@ -17,6 +17,7 @@ const Main = imports.ui.main;
+ const Util = imports.misc.util;
+ const Mainloop = imports.mainloop;
+ const Tweener = imports.ui.tweener;
++const Interfaces = imports.misc.interfaces;
+ 
+ const STATUS_UNKNOWN = 0;
+ const STATUS_NO_CALENDARS = 1;
+@@ -302,18 +303,42 @@ class EventsManager {
+ 
+     start_events() {
+         if (this._calendar_server == null) {
+-            Cinnamon.CalendarServerProxy.new_for_bus(
+-                Gio.BusType.SESSION,
+-                // Gio.DBusProxyFlags.NONE,
+-                Gio.DBusProxyFlags.DO_NOT_AUTO_START_AT_CONSTRUCTION,
+-                "org.cinnamon.CalendarServer",
+-                "/org/cinnamon/CalendarServer",
+-                null,
+-                this._calendar_server_ready.bind(this)
+-            );
++            Interfaces.getDBusAsync((proxy, error) => {
++                if (error) {
++                    this.log_dbus_error(error);
++                    return;
++                }
++
++                proxy.NameHasOwnerRemote("org.gnome.evolution.dataserver.Calendar8", (has_owner, error) => {
++                    if (error) {
++                        this.log_dbus_error(error);
++                        return;
++                    }
++
++                    if (has_owner[0]) {
++                        log("calendar@cinnamon.org: Calendar events supported.")
++
++                        Cinnamon.CalendarServerProxy.new_for_bus(
++                            Gio.BusType.SESSION,
++                            Gio.DBusProxyFlags.DO_NOT_AUTO_START_AT_CONSTRUCTION,
++                            "org.cinnamon.CalendarServer",
++                            "/org/cinnamon/CalendarServer",
++                            null,
++                            this._calendar_server_ready.bind(this)
++                        );
++                    } else {
++                        log("calendar@cinnamon.org: No calendar event support (needs evolution-data-server)")
++
++                    }
++                });
++            })
+         }
+     }
+ 
++    log_dbus_error(e) {
++        global.logError(`calendar@cinnamon.org: Could not check for calendar event support: ${e.toString()}`);
++    }
++
+     _calendar_server_ready(obj, res) {
+         try {
+             this._calendar_server = Cinnamon.CalendarServerProxy.new_for_bus_finish(res);
+diff --git a/js/misc/interfaces.js b/js/misc/interfaces.js
+index 8bc6e717d4..6bdb7b78c2 100644
+--- a/js/misc/interfaces.js
++++ b/js/misc/interfaces.js
+@@ -13,6 +13,10 @@ const DBusIface = '\
+             <arg type="s" direction="in" /> \
+             <arg type="s" direction="out" /> \
+         </method> \
++        <method name="NameHasOwner"> \
++            <arg type="s" direction="in" /> \
++            <arg type="b" direction="out" /> \
++        </method> \
+         <method name="ListNames"> \
+             <arg type="as" direction="out" /> \
+         </method> \
diff --git a/gnome-extra/cinnamon/files/cinnamon-5.2.7-meson-0.61-fix.patch b/gnome-extra/cinnamon/files/cinnamon-5.2.7-meson-0.61-fix.patch
new file mode 100644
index 000000000000..3645221cc7a3
--- /dev/null
+++ b/gnome-extra/cinnamon/files/cinnamon-5.2.7-meson-0.61-fix.patch
@@ -0,0 +1,41 @@
+https://github.com/linuxmint/cinnamon/commit/9ccce54c29f7c78404e8819d7be7a051efff4df1
+
+From 9ccce54c29f7c78404e8819d7be7a051efff4df1 Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz@archlinux.org>
+Date: Thu, 3 Feb 2022 09:09:24 -0500
+Subject: [PATCH] gtkdoc: remove dependencies on custom target files (#10606)
+
+Sadly, the `dependencies` kwarg does not actually do what it seems to be
+trying to be used for, here. It is for listing dependency or library
+objects whose compiler flags should be added to gtkdoc-scangobj.
+
+It will not actually add ninja target dependencies. The similar kwarg in
+other meson functions (e.g. genmarshal and compile_schemas) that *do*
+allow adding target dependencies, is `depend_files`.
+
+Older versions of meson simply did nothing in an if/elif/elif block
+where these custom_targets never matched anything, and were thus
+silently ignored.
+
+Meson 0.61 type-validates the arguments and rejects CustomTarget as
+invalid:
+
+```
+docs/reference/cinnamon-js/meson.build:11:6: ERROR: gnome.gtkdoc keyword argument 'dependencies' was of type array[CustomTarget] but should have been array[Dependency | SharedLibrary | StaticLibrary]
+```
+---
+ docs/reference/cinnamon-js/meson.build | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/docs/reference/cinnamon-js/meson.build b/docs/reference/cinnamon-js/meson.build
+index 7c96c875a0..66a5e156eb 100644
+--- a/docs/reference/cinnamon-js/meson.build
++++ b/docs/reference/cinnamon-js/meson.build
+@@ -12,7 +12,6 @@ gnome.gtkdoc(
+     'cinnamon-js',
+     mode: 'xml',
+     main_xml: 'cinnamon-js-docs.sgml',
+-    dependencies: parts_files,
+     src_dir: meson.current_build_dir(),
+     install: true,
+ )
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
deleted file mode 100644
index c0646359552b..000000000000
--- a/gnome-extra/cinnamon/files/cinnamon-5.2.7-optional-eds.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-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/cinnamon/files/cinnamon-5.2.7-revert-meson-0.60-fix.patch b/gnome-extra/cinnamon/files/cinnamon-5.2.7-revert-meson-0.60-fix.patch
new file mode 100644
index 000000000000..aa5503517ec7
--- /dev/null
+++ b/gnome-extra/cinnamon/files/cinnamon-5.2.7-revert-meson-0.60-fix.patch
@@ -0,0 +1,55 @@
+https://github.com/linuxmint/cinnamon/commit/aac7baf119dc48b685aefb3438e5ba3e61c8cb09
+
+From aac7baf119dc48b685aefb3438e5ba3e61c8cb09 Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz@archlinux.org>
+Date: Thu, 3 Feb 2022 09:11:39 -0500
+Subject: [PATCH] Revert "build: disable gir install via list to pacify meson
+ >= 0.60.2 (#10489)" (#10596)
+
+This reverts commit 8fc2df08b40aa3e1958ed2fde853c50676d8cf48.
+
+This commit was wrong, because it tried to work around a bug in a single
+version of meson by using something that isn't, wasn't, and won't be a
+valid value.
+
+The fixed version of meson 0.60.x has been out for a while now, which
+once again accepts `false`, and 0.61.0 also accepts `false` but was
+known at the time of this workaround to not work in meson-git master
+(now meson 0.61.0).
+
+Using `false` is acceptable and the failure to accept it has been
+qualified as a meson regression. Using `[false]` is just... trying to
+fuzz meson with random objects until you get something that slips its
+way through the argument checker and produces desired effects on the
+python implementation level.
+---
+ src/meson.build    | 2 +-
+ src/st/meson.build | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/meson.build b/src/meson.build
+index 7999c0a67b..34b130d50f 100644
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -196,7 +196,7 @@ cinnamon_gir = gnome.generate_gir(
+     includes: cinnamon_gir_includes,
+     install: true,
+     install_dir_typelib: pkglibdir,
+-    install_dir_gir: [false],
++    install_dir_gir: false,
+     extra_args: [
+         '-DST_COMPILATION',
+         '--quiet',
+diff --git a/src/st/meson.build b/src/st/meson.build
+index d299727d06..ec7d7b30a1 100644
+--- a/src/st/meson.build
++++ b/src/st/meson.build
+@@ -213,7 +213,7 @@ st_gir = gnome.generate_gir(
+     includes: st_gir_includes,
+     install: true,
+     install_dir_typelib: pkglibdir,
+-    install_dir_gir: [false],
++    install_dir_gir: false,
+     extra_args: [
+         '-DST_COMPILATION',
+         '--quiet',
diff --git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest
index 934d9d353d57..50da2b6c96a9 100644
--- a/gnome-extra/evolution-data-server/Manifest
+++ b/gnome-extra/evolution-data-server/Manifest
@@ -1,7 +1,5 @@
 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.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.3.ebuild 4379 BLAKE2B cf31bde4a61e4345825de1bed73899147da670b57a070e495782aa9bace79fb3c1f9c5e201c7dd319190f37c45f8fd9469a37225a4107e6f607c562359e63f22 SHA512 aa2a410c5b66465744deac23b1c43e0933177b68cdebd0186e5f922d4361bb6da518b604810b2044c5f4630898a149ddec7a5a7f61bbb9343a19a248d804705d
+DIST evolution-data-server-3.42.4.tar.xz 4623968 BLAKE2B e2ae0b4dfc6f34fac384093dd52b88fadce70c646d70c7df1758a6d514bcec1f092e8f4d8f28d50651201b45791112f811b94c8083487ca072bd002f6a11b75a SHA512 e2eba6ffeac2924366169cdae4258c7fc7d1172c2aa3a0ced83bea60556627b39ee9ee6f45a64081de232e0c2e801e2cbb19b6fa4a8958ad0f868c87e0b20f4a
+EBUILD evolution-data-server-3.42.4.ebuild 4376 BLAKE2B 269803dedeea343d5b0993d8a4e700033c2769b7afeea2a32b908b56eeb3494be3a7f4fab31836a1cea2f08599519349ccc0c72257808daf5e98ddf5d272d43a SHA512 523d2bddfe075265398855568ad655fef74fed840ca49837a6551df66c35cae695172e39272861b5ef47d7bbd4ab746af96363a5129e26eecf29dfc082001397
 MISC metadata.xml 850 BLAKE2B f3e730c63794d5890e76c1f2c7e388b1d6320fc6ef64fa405365a27e7d3883fd09b9cfd875ef0d774bdd51eae5237fff0fd7bd1e6be81a2e0d9252e0b1263afe SHA512 8657f87116f9ad70c24711f270f7b71a57e48bb4f9a8780900f9f6d3da550d0f7b6ae2da453ff6bb76ffd948935f534fdb4b3545a46b0129fbae68a8d1fcecdb
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.40.4.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.40.4.ebuild
deleted file mode 100644
index 266c3291aa5a..000000000000
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.40.4.ebuild
+++ /dev/null
@@ -1,154 +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/62-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
-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.46:2
-	>=dev-libs/libical-3.0.8:=[glib,introspection?]
-	>=dev-libs/libxml2-2
-	>=dev-libs/nspr-4.4:=
-	>=dev-libs/nss-3.9:=
-	>=net-libs/libsoup-2.58:2.4
-
-	dev-libs/icu:=
-	sys-libs/zlib:=
-	virtual/libiconv
-
-	berkdb? ( >=sys-libs/db-4:= )
-	gtk? (
-		>=app-crypt/gcr-3.4[gtk]
-		>=x11-libs/gtk+-3.16:3
-		>=media-libs/libcanberra-0.25[gtk3]
-	)
-	oauth? (
-		>=dev-libs/json-glib-1.0.4
-		>=net-libs/webkit-gtk-2.28.0:4
-		${gdata_depend}
-	)
-	gnome-online-accounts? (
-		>=net-libs/gnome-online-accounts-3.8:=
-		${gdata_depend} )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.12:= )
-	kerberos? ( virtual/krb5:= )
-	ldap? ( >=net-nds/openldap-2:= )
-	weather? ( >=dev-libs/libgweather-3.10:2= )
-"
-DEPEND="${RDEPEND}
-	vala? ( $(vala_depend)
-		net-libs/libsoup:2.4[vala]
-		dev-libs/libical[vala]
-		oauth? ( dev-libs/libgdata[vala] )
-		gnome-online-accounts? ( dev-libs/libgdata[vala] )
-	)
-"
-BDEPEND="
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	dev-util/gperf
-	gtk-doc? ( >=dev-util/gtk-doc-1.14
-		app-text/docbook-xml-dtd:4.1.2 )
-	>=dev-util/intltool-0.35.5
-	>=sys-devel/gettext-0.18.3
-	virtual/pkgconfig
-"
-
-# Some tests fail due to missing locales.
-# Also, dbus tests are flaky, bugs #397975 #501834
-# It looks like a nightmare to disable those for now.
-RESTRICT="test !test? ( test )"
-
-# global scope PATCHES or DOCS array mustn't be used due to double default_src_prepare call
-src_prepare() {
-	use vala && vala_src_prepare
-	cmake_src_prepare
-	gnome2_src_prepare
-
-	eapply "${FILESDIR}"/3.36.5-gtk-doc-1.32-compat.patch
-
-	# Make CMakeLists versioned vala enabled
-	sed -e "s;\(find_program(VALAC\) valac);\1 ${VALAC});" \
-		-e "s;\(find_program(VAPIGEN\) vapigen);\1 ${VAPIGEN});" \
-		-i "${S}"/CMakeLists.txt || die
-}
-
-src_configure() {
-	# /usr/include/db.h is always db-1 on FreeBSD
-	# so include the right dir in CPPFLAGS
-	use berkdb && append-cppflags "-I$(db_includedir)"
-
-	local google_enable
-	if use oauth || use gnome-online-accounts; then
-		google_enable="ON"
-	else
-		google_enable="OFF"
-	fi
-
-	# phonenumber does not exist in tree
-	local mycmakeargs=(
-		-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
-		-DENABLE_GTK_DOC=$(usex gtk-doc)
-		-DWITH_PRIVATE_DOCS=$(usex gtk-doc)
-		-DENABLE_SCHEMAS_COMPILE=OFF
-		-DENABLE_INTROSPECTION=$(usex introspection)
-		-DWITH_KRB5=$(usex kerberos)
-		-DWITH_KRB5_INCLUDES=$(usex kerberos "${EPREFIX}"/usr "")
-		-DWITH_KRB5_LIBS=$(usex kerberos "${EPREFIX}"/usr/$(get_libdir) "")
-		-DWITH_OPENLDAP=$(usex ldap)
-		-DWITH_PHONENUMBER=OFF
-		-DENABLE_SMIME=ON
-		-DENABLE_GTK=$(usex gtk)
-		-DENABLE_CANBERRA=$(usex gtk)
-		-DENABLE_OAUTH2=$(usex oauth)
-		-DENABLE_EXAMPLES=OFF
-		-DENABLE_GOA=$(usex gnome-online-accounts)
-		-DWITH_LIBDB=$(usex berkdb "${EPREFIX}"/usr OFF)
-		# ENABLE_BACKTRACES requires libdwarf ?
-		-DENABLE_IPV6=$(usex ipv6)
-		-DENABLE_WEATHER=$(usex weather)
-		-DENABLE_GOOGLE=${google_enable}
-		-DENABLE_LARGEFILE=ON
-		-DENABLE_VALA_BINDINGS=$(usex vala)
-	)
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-}
-
-src_test() {
-	virtx cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-
-	if use ldap; then
-		insinto /etc/openldap/schema
-		doins "${FILESDIR}"/calentry.schema
-		dosym ../../../usr/share/${PN}/evolutionperson.schema /etc/openldap/schema/evolutionperson.schema
-	fi
-}
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.42.3.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.42.4.ebuild
index 116b3be98c0f..d840fb3a2838 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.42.3.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.42.4.ebuild
@@ -16,7 +16,7 @@ SLOT="0/63-26-20" # subslot = libcamel-1.2/libedataserver-1.2/libebook-1.2.so so
 IUSE="berkdb +gnome-online-accounts +gtk gtk-doc +introspection ipv6 ldap kerberos oauth vala +weather"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 
 # gdata-0.17.7 soft required for new gdata_feed_get_next_page_token API to handle more than 100 google tasks
 # berkdb needed only for migrating old addressbook data from <3.13 versions, bug #519512
diff --git a/gnome-extra/evolution-ews/Manifest b/gnome-extra/evolution-ews/Manifest
index 5fe70618ef43..a1771fb16267 100644
--- a/gnome-extra/evolution-ews/Manifest
+++ b/gnome-extra/evolution-ews/Manifest
@@ -1,5 +1,3 @@
-DIST evolution-ews-3.40.4.tar.xz 673888 BLAKE2B 532b708795db3ffdff69b44d31c49ff9c4800b527b09d4440b383a16f6ad283cea5ebdfae5cf104e08d8f2166d7269d6810d4ae6ead2c55af7f77633292d7376 SHA512 7f89e8cebf5931bd7d2f636b1780d914f069fb62ac4e14ad0ab2c9759e4553bc5d58a53b65a635c7b5be298fc017f375f9ca4d1c96002804093b9f47107455f2
-DIST evolution-ews-3.42.3.tar.xz 685692 BLAKE2B 6e9a06c78d54f119e0d942dc830d118fc7a0b19c16fa3729491b695ac01c582b1124d895d3f56ccadf72fca5716491f29a6ca6ac216fea2ea2cd1a26bdd3f5ed SHA512 e740796e4c4afc8946592195d21aac2171724cad6069001c7d2af36f1deb8d25f89ce825898faa9e042fb6e32571f7556579bf984da0573118739e314fb7bff9
-EBUILD evolution-ews-3.40.4.ebuild 1406 BLAKE2B 3f9e641161aed979aeb855552dca3675183ca22390d3d1016e280416b227ba571b8af864ef02d5628f757ad33c6f523f50e269e6637958f36f7fe2375c777ffb SHA512 05b7067ab291bb6e126a2cdcaa28309ebc22669bd4a870762df1b292c0d0b34f0263f56fa652702606036c7816ea1ceb98d95d1bb9a41749259510244d594b2b
-EBUILD evolution-ews-3.42.3.ebuild 1408 BLAKE2B 0422bddd8f72fbdeed4e4a47e5950ee83126e8c03ec28d39710c47c6433842c0672588a5a1d92d1f158d05e3eced244b642f03a753b61877153b2c6098c1598e SHA512 d0d8d90698a4b8fd100e863da528e7d7de63da178df1f9cf5d01227a23f5a098e3357a81314ba670da7be7c87554f718aa94d7bd87241682d7919838541bfe05
+DIST evolution-ews-3.42.4.tar.xz 686236 BLAKE2B f68a3c4c41419eb5d316ce8271a8c8411217e63b951230fb0151d79fca15e82e36248e3bd676518ae5f8a92d7e1d1dbf6a140bbd63dee6dca97fe48f76d502f9 SHA512 5ce1a228414d8c456962ce944a01efbeefb059bc9ff358c95bb7cec72e74ad29cd9476c9aa396b01df35d7c89fff743837dc2f9763129a5f794cbbd14557c2e3
+EBUILD evolution-ews-3.42.4.ebuild 1406 BLAKE2B 2efed5c1908dedf348d557257fa96afca953ca8ce5760c923e3d2ea77ccad02e23304020ea0d2e66a32837b0f177a6a910c040b5d65bc59038d2d13116c28da2 SHA512 deda632646a2586dd54fa80e06f78bd6b10cc8701b2024b4bfbd3cfcc85d76f3063285cac0eebf1d893c40f6be7c801b6f7d67726be3779687955c1b93614b16
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/gnome-extra/evolution-ews/evolution-ews-3.40.4.ebuild b/gnome-extra/evolution-ews/evolution-ews-3.40.4.ebuild
deleted file mode 100644
index cf149d49e105..000000000000
--- a/gnome-extra/evolution-ews/evolution-ews-3.40.4.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.3.ebuild b/gnome-extra/evolution-ews/evolution-ews-3.42.4.ebuild
index e3822dd52ce6..948957d9fe3c 100644
--- a/gnome-extra/evolution-ews/evolution-ews-3.42.3.ebuild
+++ b/gnome-extra/evolution-ews/evolution-ews-3.42.4.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Evolution"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 # libical-glib currently (2020-02-29) oddly behind USE=introspection
diff --git a/gnome-extra/gnome-boxes/Manifest b/gnome-extra/gnome-boxes/Manifest
index 294ab8837d99..3a725399625e 100644
--- a/gnome-extra/gnome-boxes/Manifest
+++ b/gnome-extra/gnome-boxes/Manifest
@@ -1,6 +1,4 @@
 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.3.tar.xz 1614656 BLAKE2B 1d2a53ba833cdf130f1b2a350871344b0fd4c3f223e069d707e8279748a2fbd21e0d618d0cb229bb3bcfaa84e41d32da763df1d84efd7b749d890f28aceae904 SHA512 6aa8daf03898b7ec28397897b054e220bf2eabb7acbf4ea4dab7035bbe24e44c8a75e488c788f2b8cc56d6e72785651574cffa84cc1a06e5c9c7e0772839bfe7
-EBUILD gnome-boxes-40.3.ebuild 3881 BLAKE2B 91ab277097e6aa0ae96d2f0b9be598f170794005b6a4d6168ab8790cc0d3a06d5d6ab57424a1013ff009bacc4e86f4ead3f184bb0513afcd7c6f049ca89ccea8 SHA512 e8ede58a1bcaa336b74aff627613c6623c1ef25d09bf6c5364cdafef600c2799a2a133548579843af01a89617508af1aff290f22fc3ce0abc384f3b26c198051
-EBUILD gnome-boxes-41.3.ebuild 3950 BLAKE2B 3f48ea962b2365ad16f97f4cc371b282b027588e91db7c87deb711621208b3f26d03e18366b448f675f7bc5c3400924deb38cbf4b22baf2c39290bc7c2f31df5 SHA512 0637ecee8f366bb11521a8479d7dc9d3c9e9d6568863eec9e12f81d8e3be5489d036d73a22e54ab0d39d906c55ef4eb83687f5c6705b15f725da0d3006a60e74
+EBUILD gnome-boxes-41.3.ebuild 3949 BLAKE2B 56bad55abc79cfb709f4a6bd595353a6022bbbe47da9b67981aba7e58d67209ad1233f1c1e4eaece23c7d435ce824839a7d891b4613603ae769a0af1035d54cd SHA512 3620a1f56bd98e51bd7e67a1f90dc7372af0218bf284f9bff3bd7fe331c5d1e32879b7c6d375ee285d824ebb17c088747b84a4116db756a3cdd0979c9b434fdb
 MISC metadata.xml 254 BLAKE2B de7a97001e5947704f42973c8a0c3a23c2d80afb976254f5fd21e9d372a946e055d4cdc3c0eaed010505f87929b56e8b1e650c945e2a302644adbc9440833be8 SHA512 c81da4f9b80e5691a167f4590906952e25356604ec17689c005be14efb394c0634776bbe84df936edde239480bdf46db41216b00da4a3a45f670e9ca18ab0132
diff --git a/gnome-extra/gnome-boxes/gnome-boxes-40.3.ebuild b/gnome-extra/gnome-boxes/gnome-boxes-40.3.ebuild
deleted file mode 100644
index efb4ea47f40c..000000000000
--- a/gnome-extra/gnome-boxes/gnome-boxes-40.3.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2021 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 1c25fa6b9c26..771dda8dc471 100644
--- a/gnome-extra/gnome-boxes/gnome-boxes-41.3.ebuild
+++ b/gnome-extra/gnome-boxes/gnome-boxes-41.3.ebuild
@@ -14,7 +14,7 @@ LICENSE="LGPL-2+ CC-BY-2.0"
 SLOT="0"
 
 IUSE="rdp"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 # FIXME: qemu probably needs to depend on spice[smartcard] directly with USE=spice
 # FIXME: Check over libvirt USE=libvirtd,qemu and the smartcard/usbredir requirements
diff --git a/gnome-extra/gnome-calculator/Manifest b/gnome-extra/gnome-calculator/Manifest
index a25b9d43cb29..9d0da1a04ff3 100644
--- a/gnome-extra/gnome-calculator/Manifest
+++ b/gnome-extra/gnome-calculator/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-calculator-40.1.tar.xz 1023164 BLAKE2B 977fc227adaa50efa271776035a11ca79166a703c9c8d618c13af477056622a9faa42c3a8876257a117486399e91fceec7a19b930293883078846a645db912fe SHA512 f46acc802ef130ec59e4376a02032ab683e6d166d691d7c5f626e2a978f017f171c0e8ad50991d1828cb325b1bd53f63ef256b9b24860842224fa3dd7e27f4da
 DIST gnome-calculator-41.1.tar.xz 1046092 BLAKE2B 2c9a8757adcb9858f826f303ebcec44b869e3be95f49d2722e57765f187d725f82dda6b1cac1302640d686fdccebbf5c8565c5bbd064d1d647bc5d23434d55ba SHA512 fc0d5c0744c52cd68f076afa29e3028f4998fe04e2e253d267b0350514ebae72172e90a345db69bc13d4ead2c7679416529d7192a34cfd970c7b2773870b9604
-EBUILD gnome-calculator-40.1.ebuild 1722 BLAKE2B 885739e6bcee098222db8154ccf7ac20ca0f43ca1885fe3b1a61f98fa66184cb704f437859ef59960124296cd853f6e5f1f9f68ed9dc4652ec124403fa2cf310 SHA512 b54c2c17f73e221dc60b31adc9aaa60cd1ad4e311bfe4ba6ec4c2887e857eed3f78f122fc39dd33df70cb353cbe551b8fe91394121636af0dcbd92a79dfedcf2
-EBUILD gnome-calculator-41.1.ebuild 1724 BLAKE2B c7de0274e014a1f17d4085717b1bfcd40723d707512a8611347e489888028c0dbcff9e86211feb610ca1e2d22f8a8041c23e35651afc66a8315be64cabd69741 SHA512 b0fda6bffbd15a99d505bcb3120a0e9890c3d6e5b646310066f9bfde05e8cf0e8cd49b58440ef8a7b85509a8522cf18d71af0f55901d2b168c3c518e08e73c17
+EBUILD gnome-calculator-41.1.ebuild 1721 BLAKE2B 09161f86fba2639d75a60137f7ccf149c427234c5b7872621241b6c065d5618cb8b825a31d516ecb8ea3e07b568f00ea5291eeab6511c6e9cf70ca3f3cb6e03c SHA512 f966f823a9ad5825c8049e0336f5615c7893b1694a2c1333c3ec8731d5dd3f47b8e13a73cc789d7e8971a56c4be65e12eb946dd0581ddf4d0e41979f8cd28caa
 MISC metadata.xml 436 BLAKE2B 32bdac72c16828ca6ef52e23f380603787e6f08829abe8576cc7475cc48fa3e2612d39891e7ece1a1cce1eb4b7e45ca53af8e058de5d68cbc1a9ea4e2c62f133 SHA512 04f0795da8fbdcd87eb4a77a70934bec3c7be51876248782b90fb94c0831ae2ba30e619bcbd078196fcca6164225752a84361964e91f2b74a10a22e75d3fd902
diff --git a/gnome-extra/gnome-calculator/gnome-calculator-40.1.ebuild b/gnome-extra/gnome-calculator/gnome-calculator-40.1.ebuild
deleted file mode 100644
index b195c51ffa50..000000000000
--- a/gnome-extra/gnome-calculator/gnome-calculator-40.1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-VALA_MIN_API_VERSION="0.40"
-
-inherit gnome.org gnome2-utils meson python-any-r1 vala virtualx xdg
-
-DESCRIPTION="A calculator application for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Calculator"
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="+introspection test"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
-
-# gtksourceview vapi definitions in dev-lang/vala itself are too old, and newer vala removes them
-# altogether, thus we need them installed by gtksourceview[vala]
-RDEPEND="
-	>=dev-libs/glib-2.40.0:2
-	dev-libs/libxml2:2
-	>=net-libs/libsoup-2.42:2.4
-	>=dev-libs/libgee-0.20.0:0.8
-	dev-libs/mpc:=
-	dev-libs/mpfr:0=
-	>=x11-libs/gtk+-3.24.1:3
-	>=gui-libs/libhandy-1.0.0:1=
-	>=x11-libs/gtksourceview-4.0.2:4
-	introspection? ( >=dev-libs/gobject-introspection-1.58:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-libs/appstream-glib
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	$(vala_depend)
-	net-libs/libsoup:2.4[vala]
-	x11-libs/gtksourceview:4[vala]
-	gui-libs/libhandy:1[vala]
-"
-
-src_prepare() {
-	xdg_src_prepare
-	vala_src_prepare
-	# Automagic dep on valadoc - don't bother for now
-	sed -e '/subdir.*doc/d' -i meson.build || die
-}
-
-src_configure() {
-	local emesonargs=(
-		-Ddisable-ui=false
-		#-Dvala-version # doesn't do anything in 3.34
-		$(meson_use !introspection disable-introspection)
-		$(meson_use test ui-tests)
-	)
-	meson_src_configure
-}
-
-src_test() {
-	virtx meson_src_test
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/gnome-calculator/gnome-calculator-41.1.ebuild b/gnome-extra/gnome-calculator/gnome-calculator-41.1.ebuild
index 037952ba22f8..f9b7ca77e111 100644
--- a/gnome-extra/gnome-calculator/gnome-calculator-41.1.ebuild
+++ b/gnome-extra/gnome-calculator/gnome-calculator-41.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 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Calculator"
 LICENSE="GPL-3+"
 SLOT="0"
 IUSE="+introspection test"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 
 # gtksourceview vapi definitions in dev-lang/vala itself are too old, and newer vala removes them
 # altogether, thus we need them installed by gtksourceview[vala]
diff --git a/gnome-extra/gnome-calendar/Manifest b/gnome-extra/gnome-calendar/Manifest
index 5a17b569bb54..804ce9e21110 100644
--- a/gnome-extra/gnome-calendar/Manifest
+++ b/gnome-extra/gnome-calendar/Manifest
@@ -1,6 +1,4 @@
 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.2.tar.xz 583584 BLAKE2B ef21836ef87ba19de0c25f5cb73631b73a60352ca97db88dabbc1632097d3ef7e12c257fe946f7d92466f232248e1b27891394b44d73d61a3336521b2bb5d883 SHA512 1540a1e24d54bb157fadabe4201a97f2cae2c9487e267fff98273aa0dfc3715c4f734ba1e459c3c296c470337547a2b303309911ee7762e17738b292c18cc1bb
-EBUILD gnome-calendar-40.2.ebuild 1212 BLAKE2B 8644d6e5ea9f732b9e2d661c9dd84624f7ef18881f84738f99926661c0b456c3f2134316aed5d3d507648e0941759f9feb640d141a218b497d40c70f49ff297c SHA512 668bf8a755ae6289a9f32f4c90d2e952237827740c4c7f8180978f9fa9fbbcd38f6b8208edae6a90ba38072050b4ae4acc8db0b72797a0831bb7df20070a2d8a
-EBUILD gnome-calendar-41.2.ebuild 1221 BLAKE2B 132f88ffbfa724f267293361afe2b3a4f8687c637dbf1bc2bc10541d107275c23bd1556b95df02d9e9e1ce112ba020d66b83f9555ac9ef39482ecf3956b29500 SHA512 c4c1a868e859dff2899ddee5db9c528c39c5f6c2777d8abeddcf5660890160ff7f9b57ec36ff712969a4c5ed2b9e6d2674f8197ea0df515558dd729c4e79db59
+EBUILD gnome-calendar-41.2.ebuild 1218 BLAKE2B bc4e3fa9635ef8460c292e806a7ceb8658a5a32aec240b0ec574461756682a16475c4fc5993ae7c09fd199f515bd4a27a9b534e4eb82110379ca80a63276922c SHA512 a740044bcc16abf72ee2c52b43cd63c1cb8099ff32d0bacb8708b7961e2da3058659af65d63376c12aedd6dfc165d732bfbc945b42ce87edddd57a3df9293663
 MISC metadata.xml 523 BLAKE2B ac729de842a6c4af26151fe8a6325fd880715ef5bdba87af11d3fa8b39673c13a32d9cfcaf8c13c246640bd63af8391eed13d775840a337b4e5cf85acc779df0 SHA512 0e87a27fdbccd8d5b71a2b0c57a0b1af281f8f4c64da1a7d091825d03ed3bc4897995f705bb2210800c549aee7d038742edcb3874db0fabe2be1e918483f91b2
diff --git a/gnome-extra/gnome-calendar/gnome-calendar-40.2.ebuild b/gnome-extra/gnome-calendar/gnome-calendar-40.2.ebuild
deleted file mode 100644
index b011342f854b..000000000000
--- a/gnome-extra/gnome-calendar/gnome-calendar-40.2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome.org gnome2-utils meson virtualx xdg
-
-DESCRIPTION="Manage your online calendars with simple and modern interface"
-HOMEPAGE="https://wiki.gnome.org/Apps/Calendar"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
-
-# >=libical-1.0.1 for https://bugzilla.gnome.org/show_bug.cgi?id=751244
-DEPEND="
-	>=dev-libs/libical-1.0.1:0=
-	>=gnome-base/gsettings-desktop-schemas-3.21.2
-	>=gnome-extra/evolution-data-server-3.33.2:=[gtk]
-	net-libs/libsoup:2.4
-	>=dev-libs/libdazzle-3.33.1
-	>=gui-libs/libhandy-1.0.0:1=
-	>=dev-libs/glib-2.67.5:2
-	>=x11-libs/gtk+-3.22.0:3
-	>=net-libs/gnome-online-accounts-3.2.0:=
-	>=dev-libs/libgweather-40.0:=
-	>=app-misc/geoclue-2.4:2.0
-	>=sci-geosciences/geocode-glib-3.23
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	dev-libs/appstream-glib
-	dev-libs/libxml2:2
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-40.2-meson-0.61.patch
-)
-
-src_test() {
-	virtx meson_src_test
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/gnome-calendar/gnome-calendar-41.2.ebuild b/gnome-extra/gnome-calendar/gnome-calendar-41.2.ebuild
index 7045bd688f26..d9ffb9a87b0c 100644
--- a/gnome-extra/gnome-calendar/gnome-calendar-41.2.ebuild
+++ b/gnome-extra/gnome-calendar/gnome-calendar-41.2.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Calendar"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 
 # >=libical-1.0.1 for https://bugzilla.gnome.org/show_bug.cgi?id=751244
 DEPEND="
diff --git a/gnome-extra/gnome-characters/Manifest b/gnome-extra/gnome-characters/Manifest
index a87b873d6cc2..75ddeab6141b 100644
--- a/gnome-extra/gnome-characters/Manifest
+++ b/gnome-extra/gnome-characters/Manifest
@@ -1,5 +1,4 @@
-DIST gnome-characters-40.0.tar.xz 195664 BLAKE2B dc14f80654acb2b00b48ebc0a76d6d9f1236cf9b2d95f2a5fb6e4eee197359f3efadfe6c53eed66746e57d5cde2701967731fcd99e4d24695170937b69cf229e SHA512 cefc4b62b20351739510c901661e94217df4bd6a5b6a2c2f439b80ac31adfd6ba90098bbc9a3169c501d8ada9b54ee615c83ceade2639af440e86e29bce7ee8e
+AUX fix-build-with-meson-0.61.patch 575 BLAKE2B 29986accfef997c31c3810781a1f896de0548b742897964ce2149a8dc4d52cb2bed0cad67271d059dfb8c9ae760861fa6dd16f654ea28c488e3c3b9d8bfe8e79 SHA512 8c083dad0840cb0f304022e9bdfe1622a224070d10c9295efb35900f99f13d434c1a26fe90d587426a6285cd5adc745cbcd4054f1f8885fd64d7a20f2291962f
 DIST gnome-characters-41.0.tar.xz 197092 BLAKE2B d903489ed8fc4b722c5635fe5aa57eb00803b5a357405b7fbbe9af844cc3112070ef8fbcf79147578ce99dacafda287e43bfc57a2f5e9cf75dae56e388453109 SHA512 faa76b8ced642d5a1c4641fc4670800f851dd0aae98cd227fd0847c5b930d572f6838e677e11858d62f672a6cabfb1c5aa582a534cd8e37541e9fc1bb16fcc04
-EBUILD gnome-characters-40.0.ebuild 880 BLAKE2B f488ceabc0ea5e449a3d470830e6deadb81af80be4d9dba8bc96c16abcbe1dbf83b819056a4b2683693329db9fa6ecfb2c538ca66685c063934b396d59ebe20b SHA512 1198a6c6e8d2c126aff906e15b05281778a7d0e48c596113de1e8c09e96a04e6d0005fd3c67c715379819d44b98000ffeacce450e67b33fcb9213d332856d045
-EBUILD gnome-characters-41.0.ebuild 889 BLAKE2B c131b225508c2b27a4e35bdb3c4112f5d299c4b773a16f3042b1682c9cdf40b19a3712fe92fc3cd427659996bd61d361eed10f0129800855092c5d363f429477 SHA512 3d1b00d1854ff14c0c1a8ff9c5cc8ca047f88da60b1e96f05dbb2e309f08c027907cd02b288af440483b9be7d42274d280a0de12efe53f071f8e0d2616de5385
+EBUILD gnome-characters-41.0.ebuild 946 BLAKE2B 9b14d0665331d3018fcec439346d3379f0a792e8000897e2fce554c96617365727397802f6c5182f52908a5b1f8bc26f16234ef64fcaed9f925b8313fe39444b SHA512 92a6dd7d59d18ee1489afc56ad28c839d6fed49e8d3403d82adbd235b44565ae90af01d5f128d1b6b4dc823eb25615bc7a451430dd4ce5e7961e49f7424c1b18
 MISC metadata.xml 254 BLAKE2B de7a97001e5947704f42973c8a0c3a23c2d80afb976254f5fd21e9d372a946e055d4cdc3c0eaed010505f87929b56e8b1e650c945e2a302644adbc9440833be8 SHA512 c81da4f9b80e5691a167f4590906952e25356604ec17689c005be14efb394c0634776bbe84df936edde239480bdf46db41216b00da4a3a45f670e9ca18ab0132
diff --git a/gnome-extra/gnome-characters/files/fix-build-with-meson-0.61.patch b/gnome-extra/gnome-characters/files/fix-build-with-meson-0.61.patch
new file mode 100644
index 000000000000..4033314ea517
--- /dev/null
+++ b/gnome-extra/gnome-characters/files/fix-build-with-meson-0.61.patch
@@ -0,0 +1,20 @@
+Part of https://gitlab.gnome.org/GNOME/gnome-characters/-/commit/3b84cc750b70482a1cc30864dc51cde60df0332d
+https://bugs.gentoo.org/831471
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -47,7 +47,6 @@
+ desktop_conf.set('bindir', characters_bindir)
+ 
+ i18n.merge_file(
+-  'desktop-file',
+   type: 'desktop',
+   input: configure_file (
+     input: characters_name + '.desktop.in',
+@@ -61,7 +60,6 @@
+ )
+ 
+ appdata_file = i18n.merge_file(
+-  'appdata-file',
+   input: characters_name + '.appdata.xml.in',
+   output: characters_application_id + '.appdata.xml',
+   po_dir: po_dir,
diff --git a/gnome-extra/gnome-characters/gnome-characters-40.0.ebuild b/gnome-extra/gnome-characters/gnome-characters-40.0.ebuild
deleted file mode 100644
index 5f24e60e6cc9..000000000000
--- a/gnome-extra/gnome-characters/gnome-characters-40.0.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 gnome.org gnome2-utils meson xdg
-
-DESCRIPTION="Unicode character map viewer and library"
-HOMEPAGE="https://wiki.gnome.org/Design/Apps/CharacterMap"
-
-LICENSE="GPL-2+ BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
-
-RDEPEND="
-	>=dev-libs/gjs-1.50
-	>=dev-libs/glib-2.32:2
-	>=dev-libs/gobject-introspection-1.35.9:=
-	>=dev-libs/libunistring-0.9.5:=
-	>=x11-libs/gtk+-3.20:3[introspection]
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/pango-1.36[introspection]
-	gnome-base/gnome-desktop:3[introspection]
-	>=gui-libs/libhandy-1.1:1=
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-libs/libxml2:2
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postinst() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/gnome-characters/gnome-characters-41.0.ebuild b/gnome-extra/gnome-characters/gnome-characters-41.0.ebuild
index 3154b414c2fc..38255a48b231 100644
--- a/gnome-extra/gnome-characters/gnome-characters-41.0.ebuild
+++ b/gnome-extra/gnome-characters/gnome-characters-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
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Design/Apps/CharacterMap"
 
 LICENSE="GPL-2+ BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 
 RDEPEND="
 	>=dev-libs/gjs-1.50
@@ -31,6 +31,10 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+PATCHES=(
+	"${FILESDIR}"/fix-build-with-meson-0.61.patch
+)
+
 pkg_postinst() {
 	xdg_pkg_postinst
 	gnome2_schemas_update
diff --git a/gnome-extra/gnome-clocks/Manifest b/gnome-extra/gnome-clocks/Manifest
index 0927b1f310aa..2049bbc49ab8 100644
--- a/gnome-extra/gnome-clocks/Manifest
+++ b/gnome-extra/gnome-clocks/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-clocks-40.0.tar.xz 378584 BLAKE2B 9521e6fbb048364f2cc678ea6e3e235d1b1fbdf214785ab2f5b1cfc87b8225f6ce55197459571dc762a3a0c18cc49a002bb4aa7a509fd229942686bf46d097f2 SHA512 7d117a7faead25d7f68dded7bbde650a61b2765fc2d22774dc2e7673fa0f711c8a59ac79c88b2dfdc70fc80277110c987e387fa7e95ce6c6b95f1efd5f392e85
 DIST gnome-clocks-41.0.tar.xz 385088 BLAKE2B d2c83212b2817767f8711cfd9352a642059f1dfbabbed007c04d4ae5c1086152eeaa5f6e4f9e88d3593a67b95212f5ab5817bd6abf9c61f6c880628adc1534eb SHA512 da0d0b487310d63f14c99dd7e4018dfb0779482e9936594641bb26b1d12479d373da5a2652392d6927a16ec072ee7c08515548c347fb7dcc82e32be5c0e626ba
-EBUILD gnome-clocks-40.0.ebuild 1084 BLAKE2B ffd763852390d93eef81c8ba48fc20ca16c790b0e12dfac249b7fc6785a5f85e57489b677791768c068840624a2060c4cfa06a059266e1dc19da60c7aebd8be2 SHA512 861d6090819f64bf8a81352d321b112990ac9af4c43360c81c91cef1d8801d73179e0ccbfac5f03e1b6a7f9e3baad337cbfe060167b574cfd8330b8c33a36bb8
-EBUILD gnome-clocks-41.0.ebuild 1100 BLAKE2B 6bb1feea4b8d32a7cc6557d230d0ebfa4a7ad2ceab4576c8ae0feb72be40be1ead2f4b4292f3f00497308dc1174e2081737310c79756e949f4f998b9e0822e80 SHA512 4cd178857ff7b851d8bde9e5e842261fe3a47cd7f0a2e041a231124cdf48d50b6e7d6267806da41444d067b1451abc1ae536b1001bbc2f57ba9af6001e0a6449
+EBUILD gnome-clocks-41.0.ebuild 1098 BLAKE2B 5d2ff8a0ee8f1f2fa059cd53d6d78504f7c124e4853da5eccacf1896cdda38cf4438352f5c972a4690a037a5df805e90c5886a6fd5f8384b1f8d6308027bdf71 SHA512 7c948fba4cbd1d7af5847f575b4ca4786fe6c767a0502c78444e69c0e74e7b984ad11c30a101c414142cad6c5916305a932dc3fcb24aaa7b795cb32b9b281661
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/gnome-extra/gnome-clocks/gnome-clocks-40.0.ebuild b/gnome-extra/gnome-clocks/gnome-clocks-40.0.ebuild
deleted file mode 100644
index c78773cf46eb..000000000000
--- a/gnome-extra/gnome-clocks/gnome-clocks-40.0.ebuild
+++ /dev/null
@@ -1,59 +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 vala xdg
-
-DESCRIPTION="Clocks application for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Clocks"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-RDEPEND="
-	>=dev-libs/glib-2.58:2
-	>=x11-libs/gtk+-3.20:3
-	>=media-libs/gsound-0.98
-	>=dev-libs/libgweather-3.32.0:2=
-	>=gnome-base/gnome-desktop-3.8:3=
-	>=sci-geosciences/geocode-glib-1
-	>=app-misc/geoclue-2.4:2.0
-	>=gui-libs/libhandy-1.0.0:1
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-libs/libxml2:2
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	$(vala_depend)
-	dev-libs/libgweather:2[vala]
-	media-libs/gsound[vala]
-	gui-libs/libhandy:1[vala]
-"
-
-DOCS=( AUTHORS.md CONTRIBUTING.md README.md )
-
-src_prepare() {
-	xdg_src_prepare
-	vala_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dprofile=default
-		-Ddocs=false
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/gnome-clocks/gnome-clocks-41.0.ebuild b/gnome-extra/gnome-clocks/gnome-clocks-41.0.ebuild
index dc0a16ceb91e..eb652e17d2b7 100644
--- a/gnome-extra/gnome-clocks/gnome-clocks-41.0.ebuild
+++ b/gnome-extra/gnome-clocks/gnome-clocks-41.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Clocks"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.68:2
diff --git a/gnome-extra/gnome-commander/Manifest b/gnome-extra/gnome-commander/Manifest
index 09264f6ad9d8..ce9aad26ee34 100644
--- a/gnome-extra/gnome-commander/Manifest
+++ b/gnome-extra/gnome-commander/Manifest
@@ -1,3 +1,7 @@
 DIST gnome-commander-1.12.3.1.tar.xz 7530232 BLAKE2B 34a4cabafab52ab6f94619dafac4db87c12909eef22c13d50356dad925f129da182348eabd8993f69ffc398db163f81ec59c9a102530a9b49f7714b5d7c6db68 SHA512 1206d545493deeb2237af6b9026baf6faab2a8f6ae86eb1abb5c2e5ceb6212ad66382d3abd07c89f14271ac8709d14548f0bfe68fb0e11b1779e0c061e0272e5
+DIST gnome-commander-1.14.0.tar.xz 6909816 BLAKE2B fa7b3fc2696ec6520a5d2473d8728ceb16efb33134628e00a7b82f3656088a61247e5b2eeb7f3fb306866c9c1a454dbe4bb49af3a8217a1f2be6b951d7851fd2 SHA512 769f1272331ed71f558b87a73a920b9bfd5a2ea2af66972bdcac44d7a7623a6cb32460b0b650bd26d07c27bdc8b71c7d8bc2038076778aa356b638c4765ce4a5
+DIST gnome-commander-1.14.1.tar.xz 6883188 BLAKE2B e3f36e98de8883bb65c4732d74ea630ba2ac14037586b8d73518b8e52c5e2c2667f158def91f3462e10797d3ea3574f28a1e5731fe02d69cb2f11a95956e04ea SHA512 e601486c01201e9798f32b3938a470d41931225d69cafd7b497e83c05b549f4c643f56e3754d8e492939fc3f167cfc7cfb0645628e3e0fd1578cc6eadce485ce
 EBUILD gnome-commander-1.12.3.1.ebuild 1409 BLAKE2B f8a11f356842ca79e089465de1cf70f2d75c7208cdd53333b931d682c4165544a69c374b2b1dca2e33d9e19bf2cac214385e5623faec344cb9a63b8f56dc5784 SHA512 a015e2f2ce55ed7988eeeb8658a01a45619d2befe96a77bec3e968719152cf5b78f5f2b45e08f975a96af54734bc2b7531b59d968352519eb921a011b8113d82
-MISC metadata.xml 1185 BLAKE2B 56389cab7656d7c1ca18798e9d1f0168ee967225f864b8c7534151d9c909f3c68b72cb28154674843abee817c8c485f3d1df27ad04a1613bdb40d4330eaf0038 SHA512 ae95ad3a4b61fc0886ea155f2f22ceeb9b48660711d9c6f0c1c47d27ca3d272422426f46aae4213959b74d763ee8df83ea811a489b7d7f52d457a0089d9abea1
+EBUILD gnome-commander-1.14.0.ebuild 1282 BLAKE2B 66237864d999ecec22b0d9ff59a6759aa352f3b7a4554d239ea2caf634335bae1d652f59caec6d153f5d6750eaf7966c04fa57d11ace24fe100321c443c6ed6f SHA512 73ce75a55fb623e53988c5648ec061551cb6ceb6235b15a8ba662178a6e0070bb3ece5a65439a726e9ed34de554bc7c4d16fa4ebe6d6226f6b04bf02bd9ba970
+EBUILD gnome-commander-1.14.1.ebuild 1239 BLAKE2B b035d7e0076c3cc7ebbab5f481fd67f908a9b95da9988bc0dcf5d0f396618ff391685fc691e93772b4eeae3adef9c160aa1ec6ea3355412f57679b9a3245b355 SHA512 11fdc4002cd424fb64e83d3fe12a7ce234b6d9692637fa8972e3d17e610b5e02b8acca2884d2aff3173bba70632719f02ec7e531eda0245d3afe2105e53fc685
+MISC metadata.xml 1185 BLAKE2B 8fde07ed3c4ec8e8b149e0caca0786d4ba66af7cfeb58faa5d00dbdb3ced9dcd5207f4eab13016b5b4cd7a522a28abe2d0da71084b5002a945d7b4206ed79e92 SHA512 894ecc4cff87b554aab27e8b65452d6523a3b0e833307537f79463c7637399d60db60de1ed6b34b02d3599a03f14b480ea62f991129404385c58b2bd1e3549b1
diff --git a/gnome-extra/gnome-commander/gnome-commander-1.14.0.ebuild b/gnome-extra/gnome-commander/gnome-commander-1.14.0.ebuild
new file mode 100644
index 000000000000..3a53f3f845dc
--- /dev/null
+++ b/gnome-extra/gnome-commander/gnome-commander-1.14.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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="exif gsf pdf samba taglib test +unique"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	app-text/yelp-tools
+	>=dev-libs/glib-2.70.0:2
+	>=x11-libs/gtk+-2.24.0:2
+	exif? ( >=media-gfx/exiv2-0.14 )
+	gsf? ( >=gnome-extra/libgsf-1.12:= )
+	pdf? ( >=app-text/poppler-0.18 )
+	samba? ( gnome-base/gvfs[samba] )
+	taglib? ( >=media-libs/taglib-1.4 )
+	unique? ( >=dev-libs/libunique-0.9.3:1 )
+"
+BDEPEND="
+	app-text/yelp-tools
+	dev-util/glib-utils
+	dev-util/gtk-doc-am
+	sys-devel/flex
+	>=sys-devel/gettext-0.19.7
+	virtual/pkgconfig
+"
+DEPEND="
+	${RDEPEND}
+	test? ( >=dev-cpp/gtest-1.7.0 )
+"
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		--without-libchm \
+		$(use_with exif exiv2) \
+		$(use_with gsf libgsf) \
+		$(use_with pdf poppler) \
+		$(use_with samba) \
+		$(use_with taglib) \
+		$(use_with unique)
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	optfeature "synchronizing files and directories" dev-util/meld
+	optfeature "viewing the documentation" gnome-extra/yelp
+}
diff --git a/gnome-extra/gnome-commander/gnome-commander-1.14.1.ebuild b/gnome-extra/gnome-commander/gnome-commander-1.14.1.ebuild
new file mode 100644
index 000000000000..3cf67a8ee2a4
--- /dev/null
+++ b/gnome-extra/gnome-commander/gnome-commander-1.14.1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome2 optfeature
+
+DESCRIPTION="A graphical, full featured, twin-panel file manager"
+HOMEPAGE="https://gcmd.github.io/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="exif gsf pdf samba taglib test +unique"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	app-text/yelp-tools
+	>=dev-libs/glib-2.70.0:2
+	>=x11-libs/gtk+-2.24.0:2
+	exif? ( >=media-gfx/exiv2-0.14 )
+	gsf? ( >=gnome-extra/libgsf-1.12:= )
+	pdf? ( >=app-text/poppler-0.18 )
+	samba? ( gnome-base/gvfs[samba] )
+	taglib? ( >=media-libs/taglib-1.4 )
+	unique? ( >=dev-libs/libunique-0.9.3:1 )
+"
+BDEPEND="
+	app-text/yelp-tools
+	dev-util/glib-utils
+	dev-util/gtk-doc-am
+	sys-devel/flex
+	>=sys-devel/gettext-0.19.7
+	virtual/pkgconfig
+"
+DEPEND="
+	${RDEPEND}
+	test? ( >=dev-cpp/gtest-1.7.0 )
+"
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		$(use_with exif exiv2) \
+		$(use_with gsf libgsf) \
+		$(use_with pdf poppler) \
+		$(use_with samba) \
+		$(use_with taglib) \
+		$(use_with unique)
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	optfeature "synchronizing files and directories" dev-util/meld
+	optfeature "viewing the documentation" gnome-extra/yelp
+}
diff --git a/gnome-extra/gnome-commander/metadata.xml b/gnome-extra/gnome-commander/metadata.xml
index 7cd8868bdcd7..39ed35773264 100644
--- a/gnome-extra/gnome-commander/metadata.xml
+++ b/gnome-extra/gnome-commander/metadata.xml
@@ -14,7 +14,7 @@
       <email>u.scholz83@gmx.de</email>
       <name>Uwe Scholz</name>
     </maintainer>
-    <changelog>https://gitlab.gnome.org/GNOME/gnome-commander/blob/gcmd-1-4/NEWS</changelog>
+    <changelog>https://gitlab.gnome.org/GNOME/gnome-commander/-/blob/master/NEWS</changelog>
     <bugs-to>https://gitlab.gnome.org/GNOME/gnome-commander/issues</bugs-to>
     <remote-id type="freecode">gnome-commander</remote-id>
   </upstream>
diff --git a/gnome-extra/gnome-contacts/Manifest b/gnome-extra/gnome-contacts/Manifest
index 69e03ae34c7e..13e9070deab5 100644
--- a/gnome-extra/gnome-contacts/Manifest
+++ b/gnome-extra/gnome-contacts/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-contacts-40.0.tar.xz 270412 BLAKE2B 4d7970ac5417dfbd9b0acf51efd8ce1310cee51f90de8d8afa0239d918269642869e35befb64cbfb5acf1bde17ac738192d5ef802d27df47936165b03ed20b51 SHA512 5f9bb7e805cc67a379fd1ab5945774f5067be64d6577bc9cf0514c4ca6b53937555dc96591244d8be418b2b07f7c5401e8186dca5baff3a2b6c5a2ae459a676f
 DIST gnome-contacts-41.0.tar.xz 275248 BLAKE2B c0611a131ce1ebb74b96e96e2e1b9370526b56c49ee43876273fdf5b2f3b333ad2aad85c50ddcebaac85ee8c996037fec3209c6765cab7b37b49ced04a82a7a8 SHA512 310f333c0863d8e58c2280b994071b2655eee7224ab80a468ffc7acc61834d3f6dbb794bbdc5b8d4428226bab96f3ea65b8bed39df79d88704e38b51a8f4b05f
-EBUILD gnome-contacts-40.0.ebuild 1701 BLAKE2B 3eb51627bb2f6c0553f2826082ac53cd53996f438e0dba18d3519dcb1b7872ad9858e6523015d5ad3ac643b0bacb66f64034dd29ceb430756b9ca4c3fc7b21a3 SHA512 61be9e976af8f3dca5ba758d8617ecdc5260a3c18ce7ddb8aa41f1189dfa64eea5c70a73ca1d9d5b12672dc9b33251dc9235aaede657d6f9e80029289abc723e
-EBUILD gnome-contacts-41.0.ebuild 1710 BLAKE2B 61cd5841bbae0dd8592507d7b040f4695b62e3975e247442a2bc2c350de5a15a90184ace20406254ecaaeb99c7e5bd2e0d77845d24149db9fac347c3880978ee SHA512 7f8d8d273d9df9d9584ff02f0f6ab05081138e2a1fe91a949c641315a59b29a7451fb6a7a7085e867f0ad63b7264884263482e0677d28d6ef0776068eac32bd9
+EBUILD gnome-contacts-41.0.ebuild 1707 BLAKE2B b2d3dd5685a8ff16f0df0a0296aea2edae198d72591cd65d040da35e635751df938e66a1a56ec2f50fcb671d34544de24e810506267418b983f23c089b6470dd SHA512 fb4109232b8a992fee3e0db88ba17ae201f7082c092840d71fc4ddadc2291d341101035aa9b44fe191b46be518125fff382904017419bd4e6c345737e7673205
 MISC metadata.xml 326 BLAKE2B 2a56fccc6957b8379b65dafdc5e0893083d0f454785fbd96f3c7695fb16bdbc75db3ece95320549158e227a9e82d84f0ad2144d4ed716647b6433081d36c56d1 SHA512 077fb36f1482d3da1c655d653d693368ba35494429a6c28a64f41f8c37705a5e5a5e49acc3caee6207dd6511cb105d020cc6f17a8b89f8fb4d54a7b26feac1f9
diff --git a/gnome-extra/gnome-contacts/gnome-contacts-40.0.ebuild b/gnome-extra/gnome-contacts/gnome-contacts-40.0.ebuild
deleted file mode 100644
index 55d8856f0982..000000000000
--- a/gnome-extra/gnome-contacts/gnome-contacts-40.0.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-VALA_MIN_API_VERSION="0.40"
-
-inherit gnome.org gnome2-utils meson python-any-r1 vala xdg
-
-DESCRIPTION="GNOME contact management application"
-HOMEPAGE="https://wiki.gnome.org/Design/Apps/Contacts"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="telepathy v4l"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~sparc x86"
-
-VALA_DEPEND="
-	$(vala_depend)
-	>=dev-libs/gobject-introspection-1.54
-	dev-libs/folks[vala(+)]
-	net-libs/gnome-online-accounts[vala]
-	gnome-extra/evolution-data-server[gtk,vala]
-	telepathy? ( net-libs/telepathy-glib[vala] )
-	>=gui-libs/libhandy-1.1.0:1[vala]
-"
-# Configure is wrong; it needs cheese-3.5.91, not 3.3.91
-RDEPEND="
-	>=gnome-extra/evolution-data-server-3.30:=[gnome-online-accounts]
-	>=dev-libs/folks-0.11.4:=[eds,telepathy?]
-	>=dev-libs/glib-2.58:2
-	>=dev-libs/libgee-0.10:0.8
-	>=gnome-base/gnome-desktop-3.0:3=
-	net-libs/gnome-online-accounts:=
-	>=x11-libs/gtk+-3.23.1:3
-	v4l? ( >=media-video/cheese-3.5.91:= )
-	telepathy? ( >=net-libs/telepathy-glib-0.22 )
-	>=gui-libs/libhandy-1.0.0:1
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	${PYTHON_DEPS}
-	${VALA_DEPEND}
-	app-text/docbook-xml-dtd:4.2
-	app-text/docbook-xsl-stylesheets
-	dev-libs/appstream-glib
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	xdg_src_prepare
-	vala_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_feature v4l cheese)
-		$(meson_use telepathy)
-		-Dmanpage=true
-		-Ddocs=false
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/gnome-contacts/gnome-contacts-41.0.ebuild b/gnome-extra/gnome-contacts/gnome-contacts-41.0.ebuild
index eaa395516ce5..c0f1d80d7643 100644
--- a/gnome-extra/gnome-contacts/gnome-contacts-41.0.ebuild
+++ b/gnome-extra/gnome-contacts/gnome-contacts-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
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Design/Apps/Contacts"
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE="telepathy v4l"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv ~sparc x86"
 
 VALA_DEPEND="
 	$(vala_depend)
diff --git a/gnome-extra/gnome-documents/Manifest b/gnome-extra/gnome-documents/Manifest
index 71c2a990bed0..fd94a3adec69 100644
--- a/gnome-extra/gnome-documents/Manifest
+++ b/gnome-extra/gnome-documents/Manifest
@@ -1,3 +1,4 @@
+AUX fix-build-with-meson-0.61.patch 480 BLAKE2B 88070a5628a4e6416a3870131f7f964188bf2997fa763dbcafc315b4fa44efe8312a9d29ee9dc09b8f7668ffd00beb50c1b37807bd5718ad4a8186d3dd6e727a SHA512 e2c51086c371e469eb274cdf302121609da6ac1b7d4a3300dbdb98a774a699094c9c8d267ca0b1462f6e25a153151155dcd8bf6c5af075ec6a9489f78c3ec386
 DIST gnome-documents-3.34.0.tar.xz 914100 BLAKE2B 5b59931d488a5b3d3b2940852b64b0af3cff71c685d62e07bee5d0e981e9a78bb913db853c0c3f138ea1728d2ff7495b689f1f5509064131ee2a4649e65d527f SHA512 5867b148aaffd02089e4f1148cf0fbce37ba0ed40c7d255f9261cd225757f56b68293d59476ab7c11ebbe310cc7935081b2770e7bc24bdbddb5934da5ea0cf87
-EBUILD gnome-documents-3.34.0-r1.ebuild 1609 BLAKE2B 6d0c6db300bfd956f2e7170ebbd7f151f0359abc94690df4c2354c9911a599cee85b2a9a3710b3234946e77b788b0284d8f1567d3e36d6c61863aa0960126cb5 SHA512 66a4a7efba0563967dd462137978e1dae4da200e55e0816626cdb03c3bda29749a910fb09b485ef75b1d3aa5572e605c0c20c21f618a6c5ff65af22fb6234a6e
+EBUILD gnome-documents-3.34.0-r1.ebuild 1669 BLAKE2B 627a4f39b8060cf4e181ff5f6a69c9d5bcad48ee9a408b7f64353fcac6da5543b73643a7876ca4440698e8bd8f8db573ef60cd3ae59f6f0e130a50a237422f9c SHA512 64ccbfb66db946182d6e33112fbe44b8d3b73abd3a50c72276d3ac581d4f1a0c74053cebf5b45951a5812301bda0288f45329cb7e97dc35238012b55512eff60
 MISC metadata.xml 546 BLAKE2B c847c48f46a7ed40653eb3b2363df0219a8cfd1b876ac7f6cd29290227497cc74c0490a650f03fcc7593ca2fe01d83e3cc122f51e6292b75d31c3afb4bd7f0df SHA512 fa2a5b960480dcf34e48f082ccedcd2d88996573a179c42207a8ccf0aa9961145691142cf354ba4492bf3b358545994c6a25e3ff0d97d62db0621097537ba8b2
diff --git a/gnome-extra/gnome-documents/files/fix-build-with-meson-0.61.patch b/gnome-extra/gnome-documents/files/fix-build-with-meson-0.61.patch
new file mode 100644
index 000000000000..2a3a5cd3d3e3
--- /dev/null
+++ b/gnome-extra/gnome-documents/files/fix-build-with-meson-0.61.patch
@@ -0,0 +1,19 @@
+https://bugs.gentoo.org/833843
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -56,7 +56,6 @@ foreach app: documents_apps
+   appdata = app + '.appdata.xml'
+ 
+   appdata_file = i18n.merge_file(
+-    appdata,
+     input: appdata + '.in',
+     output: appdata,
+     po_dir: po_dir,
+@@ -76,7 +75,6 @@ foreach app: documents_apps
+   desktop = app + '.desktop'
+ 
+   desktop_file = i18n.merge_file(
+-    desktop,
+     type: 'desktop',
+     input: desktop + '.in',
+     output: desktop,
diff --git a/gnome-extra/gnome-documents/gnome-documents-3.34.0-r1.ebuild b/gnome-extra/gnome-documents/gnome-documents-3.34.0-r1.ebuild
index 3b571baadadb..5245d0f95f9d 100644
--- a/gnome-extra/gnome-documents/gnome-documents-3.34.0-r1.ebuild
+++ b/gnome-extra/gnome-documents/gnome-documents-3.34.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -49,6 +49,10 @@ DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig
 "
 
+PATCHES=(
+	"${FILESDIR}"/fix-build-with-meson-0.61.patch
+)
+
 src_configure() {
 	local emesonargs=(
 		-Ddocumentation=true #manpage
diff --git a/gnome-extra/gnome-shell-extension-alphabetical-grid/Manifest b/gnome-extra/gnome-shell-extension-alphabetical-grid/Manifest
index 3a0901bdd18f..ac3082730bd4 100644
--- a/gnome-extra/gnome-shell-extension-alphabetical-grid/Manifest
+++ b/gnome-extra/gnome-shell-extension-alphabetical-grid/Manifest
@@ -1,3 +1,5 @@
-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
+DIST gnome-shell-extension-alphabetical-grid-19.0.tar.gz 288661 BLAKE2B b3df5594422f7d5ba249ec5a3eebf178e845fc2f36f838f61c86c0aa1918f9ca7e942a6af358e3f1744ce7f25a507f3e97bac71848cf6c0bac6339139ffd0d3d SHA512 139f1d06ebeef3b76ac84f71190cf77ebc77571ff3b489bb86f578cfa01ce7de47e53798fece93cb6c45bd82cb6b2a425ba255c1485d5b8739da28bd9959fce8
+DIST gnome-shell-extension-alphabetical-grid-20.0.tar.gz 288708 BLAKE2B 7a03ccc523f950d7df5ac3b2a75894094963db63df72813f3dae0780e4b49eb51958d8069128df76a38a49fc624114bd7ef901db214d0b612278e33d636151e3 SHA512 681ce3be3700db94ba9095c573b3c322d2c7d1ab875bec1f67a821872121318df8c4568281345cf9985c0ed87656e08fc59a48e3a253e63696304d29f5c8a4b6
+EBUILD gnome-shell-extension-alphabetical-grid-19.0.ebuild 1422 BLAKE2B 71bca6a4078f41a08c2a2b3291acad0440c60262b9a6b5c05ffea13485dfa3958aa665395f72b996568fdff222f68d28b36ee715949e9fb2a24434393250d271 SHA512 00ebf81e517bcafb935f061cb11162d3dd99dc13398a9d44eec08f951f22e42402b7f72ae0885d99d72524cf101fffb53db3959756520b2c1bdf43f3f728608e
+EBUILD gnome-shell-extension-alphabetical-grid-20.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-19.0.ebuild b/gnome-extra/gnome-shell-extension-alphabetical-grid/gnome-shell-extension-alphabetical-grid-19.0.ebuild
new file mode 100644
index 000000000000..6a8af9a70239
--- /dev/null
+++ b/gnome-extra/gnome-shell-extension-alphabetical-grid/gnome-shell-extension-alphabetical-grid-19.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/gnome-shell-extension-alphabetical-grid-18.0.ebuild b/gnome-extra/gnome-shell-extension-alphabetical-grid/gnome-shell-extension-alphabetical-grid-20.0.ebuild
index 2164b03efc89..2164b03efc89 100644
--- 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-20.0.ebuild
diff --git a/gnome-extra/gnome-shell-extension-appindicator/Manifest b/gnome-extra/gnome-shell-extension-appindicator/Manifest
index c728887d3253..b27e93407e8f 100644
--- a/gnome-extra/gnome-shell-extension-appindicator/Manifest
+++ b/gnome-extra/gnome-shell-extension-appindicator/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-shell-extension-appindicator-40.tar.gz 48681 BLAKE2B cec52930bcb163a6761662deb3bd52202abadfc90fdd12877c711e4f4cf5038b9e7f3822259ced5ba39a632d2a1e0a83ffc4dc563ba184742dd1de2941acfe73 SHA512 72b3ecf0eadde40fd3567b19d7c7064953847ec86298691097f9fe14cada37206f8edd898c1d2a8fe71aeb0ace4921d1797d2dcc9eeacc0cb04a25841125b2ef
 DIST gnome-shell-extension-appindicator-41.tar.gz 52835 BLAKE2B 0d0bdc73bc10057ea012d26bd640c7ecd8005a7b36e7316b7d616e28a429e43f3b36ab2615ac4d6227dd5176b3a4f629a70c960e8f8961063c6979d5b04e5005 SHA512 8c67011884bc4cf6e4ddfc3ac0c191830775050d07cf3f8d7462ff4e0050cea00fd3f8372b1c75211e433344c64fea9903982769bc4d0428b51161efd275f5d9
-EBUILD gnome-shell-extension-appindicator-40.ebuild 1112 BLAKE2B d830ad05d43394f4a234656e2cdb9c3d5b102f0525669447a4541151560a6a7cd394c8f0ca3e3a7770f8cf90c7c2c5769c8be3465c6a00f02fd1b05085a74949 SHA512 1eabc95ee57da7bf48a991ac0a296bed7ebd9b01cb82f8a34ba559be1eac1c50385e6e6da9053912f77b1ba4e6384cff58d45bfe7c07b3f8f3f36b34ad8a0a74
 EBUILD gnome-shell-extension-appindicator-41.ebuild 943 BLAKE2B 126a39b88acf2f64dc97a782575d1a7963178f80273abc725adbdf0f2f7589a6ad535b975cbe2709e460607050554e78be64f20b6383d10eb821e3191e2c7074 SHA512 2d0e5ec7d85894b7087529842a0b2f4ac9a92ed89e2352467b752528c409f8ef87f9f914d9bfc23af09873715e42371f40ded5e2e717e819e370b02e670c4203
 MISC metadata.xml 241 BLAKE2B cb0374238d11e2a3f28f23b7049da09babd4310a99862738acfb7ba554f7758ac68cd09d1eb7a29068195c27010a846a540ed2c09b88fd043b37fb4f0762150f SHA512 b2c1d3e2cb6760ed4682da82af5370adcacd48afd558efa1abf84d955067b2ad32eda034af8cef95c71409622f97fa0113f2e07bee328f2d03512908ae931050
diff --git a/gnome-extra/gnome-shell-extension-appindicator/gnome-shell-extension-appindicator-40.ebuild b/gnome-extra/gnome-shell-extension-appindicator/gnome-shell-extension-appindicator-40.ebuild
deleted file mode 100644
index 7ef25ca41aeb..000000000000
--- a/gnome-extra/gnome-shell-extension-appindicator/gnome-shell-extension-appindicator-40.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 gnome2-utils
-
-DESCRIPTION="Support Ubuntu AppIndicators and KStatusNotifierItems in Gnome"
-HOMEPAGE="https://github.com/ubuntu/gnome-shell-extension-appindicator"
-SRC_URI="https://github.com/ubuntu/gnome-shell-extension-appindicator/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	app-eselect/eselect-gnome-shell-extensions
-	dev-libs/libappindicator:3
-	>=gnome-base/gnome-shell-3.34
-"
-DEPEND=""
-BDEPEND=""
-
-extension_uuid="appindicatorsupport@rgcjonas.gmail.com"
-
-src_install() {
-	einstalldocs
-	dodoc AUTHORS.md
-
-	insinto /usr/share/glib-2.0/schemas
-	doins schemas/*.xml
-
-	rm -rf schemas/ AUTHORS.md LICENSE Makefile README.md || die
-	insinto /usr/share/gnome-shell/extensions/"${extension_uuid}"
-	doins -r *
-}
-
-pkg_preinst() {
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	gnome2_schemas_update
-	ebegin "Updating list of installed extensions"
-	eselect gnome-shell-extensions update
-	eend $?
-}
-
-pkg_postrm() {
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/gnome-shell-extension-applications-overview-tooltip/Manifest b/gnome-extra/gnome-shell-extension-applications-overview-tooltip/Manifest
index a0ea0aee8a41..bdde8dca61d5 100644
--- a/gnome-extra/gnome-shell-extension-applications-overview-tooltip/Manifest
+++ b/gnome-extra/gnome-shell-extension-applications-overview-tooltip/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-shell-extension-applications-overview-tooltip-12.tar.gz 27394 BLAKE2B 169460c7063fda0f664688303984c4a5c7fcd8a6b32281c2eb630ebea8143b95e96038f130b09c939371474b5ef27656cf77eec942412fcf3908a5d9fb8ae202 SHA512 4c993256d1f6d7d3a2c72c88f6f88facf7ff8237d489950484f54a68f09741e526f0e0a7c2862251fc2579fd3cdd496c9136bb222374abfacbace1615e263239
 DIST gnome-shell-extension-applications-overview-tooltip-14.tar.gz 27058 BLAKE2B 442e1b144358c40c6132ab2a067bb29439e826ccd540583a6e95d35841bca3eda53ac9b6004285c8ab63006d9e71dbdb46f0fb77310366cf976381bb70b50223 SHA512 6e5805f720e262181e4519ec8a19cf57dae41e3dcff3da4a4a1bc4a132bcc23aae575cc15aa0a0f5f04fe1a25a9ff3e03d5bcacb326c7bbc8d0b28351e0ecbfe
-EBUILD gnome-shell-extension-applications-overview-tooltip-12.ebuild 1226 BLAKE2B 2dc6ac1e429c81175dd32a188b2d4c6a8406f0c99c214c7b1e659e741b35cf66ac9e3200015ac39083c9bafe3d94ebcfbb00b09d1b2ec51ba615047ff3979695 SHA512 22d7d2de2eeea0dbb0135c2970fd37d5730408b197b39912543b1ab079c1eb0bcdee5a0eb132a46433e030953e07392d47d2506c962e97b8b505b56e4d03fb74
 EBUILD gnome-shell-extension-applications-overview-tooltip-14.ebuild 1148 BLAKE2B 6c41570b1705b7137c62146fd731840f8405c7fdad3faa9165e03d5eeff9d11dec837623d48b15f670631f486bfbbeaf9c34cbac9a7c0ace93cac2eceee914de SHA512 3d1466567c72b19298d2d9cca10ae2b1785492fa244afad59e39625cca35f014b4b5a9805f7b6a261ca3954229c833f85b37a3011f19dfe47f4a816dd669c84a
 MISC metadata.xml 241 BLAKE2B cb0374238d11e2a3f28f23b7049da09babd4310a99862738acfb7ba554f7758ac68cd09d1eb7a29068195c27010a846a540ed2c09b88fd043b37fb4f0762150f SHA512 b2c1d3e2cb6760ed4682da82af5370adcacd48afd558efa1abf84d955067b2ad32eda034af8cef95c71409622f97fa0113f2e07bee328f2d03512908ae931050
diff --git a/gnome-extra/gnome-shell-extension-applications-overview-tooltip/gnome-shell-extension-applications-overview-tooltip-12.ebuild b/gnome-extra/gnome-shell-extension-applications-overview-tooltip/gnome-shell-extension-applications-overview-tooltip-12.ebuild
deleted file mode 100644
index 7e7757ece5a3..000000000000
--- a/gnome-extra/gnome-shell-extension-applications-overview-tooltip/gnome-shell-extension-applications-overview-tooltip-12.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome2-utils
-
-# Workaround until https://bugzilla.gnome.org/show_bug.cgi?id=663725 is fixed
-DESCRIPTION="Show tooltip with full name and description"
-HOMEPAGE="https://github.com/RaphaelRochet/applications-overview-tooltip"
-SRC_URI="https://github.com/RaphaelRochet/applications-overview-tooltip/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-# https://github.com/RaphaelRochet/applications-overview-tooltip/issues/7
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	app-eselect/eselect-gnome-shell-extensions
-	>=gnome-base/gnome-shell-40
-"
-DEPEND=""
-BDEPEND=""
-
-S="${WORKDIR}/${P/gnome-shell-extension-}"
-extension_uuid="applications-overview-tooltip@RaphaelRochet"
-
-src_install() {
-	einstalldocs
-	insinto /usr/share/glib-2.0/schemas
-	doins schemas/*.xml
-	rm -rf README.md schemas || die
-	insinto /usr/share/gnome-shell/extensions/"${extension_uuid}"
-	doins -r *
-}
-
-pkg_preinst() {
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	gnome2_schemas_update
-	ebegin "Updating list of installed extensions"
-	eselect gnome-shell-extensions update
-	eend $?
-}
-
-pkg_postrm() {
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/gnome-shell-extension-bing-wallpaper/Manifest b/gnome-extra/gnome-shell-extension-bing-wallpaper/Manifest
index d19bd42729c8..5f39672b927f 100644
--- a/gnome-extra/gnome-shell-extension-bing-wallpaper/Manifest
+++ b/gnome-extra/gnome-shell-extension-bing-wallpaper/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-shell-extension-bing-wallpaper-36.tar.gz 6060192 BLAKE2B 0daec2bdc94e25032b8ab04e63a673177edae9fe181ad02bcd9ceee7597d8c3f44187dcdb0bded5477be515dfea3cf81adc08e306a33b8c444e3e2c8295c5fab SHA512 335c1e9f5dd1d93ec60f15eef2d0127be6f0149bb29b98f4751c9ea820fd0b28e119d0d2c9fab4444ace4b8d2a5c0523b06bbbd337093ceafc1421a9d665eaa5
 DIST gnome-shell-extension-bing-wallpaper-37.tar.gz 6798688 BLAKE2B 9dd8e651905f2b90848bd416d222667aa528994d3d06ddc180926efc603670346513270d588be85aefc62b9c85986e5913441d643e399c1384fd6996b1cfdfc2 SHA512 1c75ff6a6068232c9be717018b93a3bc8810e6dd1b446d9dbe4cc77beecb34a35ed3d6a9904f68b3d2d4487f45f2eccee03379f1abe4f8b351642b75411d5adc
-EBUILD gnome-shell-extension-bing-wallpaper-36.ebuild 1103 BLAKE2B 8192d6f5820fe66d719b41aeea459f4a328e74cc605a01d74df1f34d5ca71c0bf2f5beffce00ff62afba9ef41a387c31e9a8802a039a0010d5174f0e78f6a214 SHA512 970b84e8e80e7c34b23f710164bc9ae00972524b83796f361139b00238cd170f249709c81ae245f3b14a0d003563ab82f47a7a348aa0f6123a1425ac31a73d42
 EBUILD gnome-shell-extension-bing-wallpaper-37.ebuild 1103 BLAKE2B a04fc6a3b3e7f4b8e4e8b049017a52d30b1b8d442f4806e5f67966f6ff7fcb05435285c9a46c238ce08623f8da65031a1a41742622b87a2c29ef835d045ffb80 SHA512 d2d83659ecac676bfb6cb88287e8b6d79caebf04fecd813182ca29868976c2aadcd7b277da8026e42afd15c19df45f9e9632aa4122aaad803956f39433ec6e3e
 MISC metadata.xml 241 BLAKE2B cb0374238d11e2a3f28f23b7049da09babd4310a99862738acfb7ba554f7758ac68cd09d1eb7a29068195c27010a846a540ed2c09b88fd043b37fb4f0762150f SHA512 b2c1d3e2cb6760ed4682da82af5370adcacd48afd558efa1abf84d955067b2ad32eda034af8cef95c71409622f97fa0113f2e07bee328f2d03512908ae931050
diff --git a/gnome-extra/gnome-shell-extension-bing-wallpaper/gnome-shell-extension-bing-wallpaper-36.ebuild b/gnome-extra/gnome-shell-extension-bing-wallpaper/gnome-shell-extension-bing-wallpaper-36.ebuild
deleted file mode 100644
index 015ffb1bd01a..000000000000
--- a/gnome-extra/gnome-shell-extension-bing-wallpaper/gnome-shell-extension-bing-wallpaper-36.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome2-utils
-
-DESCRIPTION="Changes your wallpaper daily to the bing.com background image"
-HOMEPAGE="https://github.com/neffo/bing-wallpaper-gnome-extension"
-SRC_URI="https://github.com/neffo/bing-wallpaper-gnome-extension/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	dev-libs/glib:2
-	app-eselect/eselect-gnome-shell-extensions
-	>=gnome-base/gnome-shell-3.28
-"
-DEPEND=""
-BDEPEND=""
-
-S="${WORKDIR}/bing-wallpaper-gnome-extension-${PV}"
-extension_uuid="BingWallpaper@ineffable-gmail.com"
-
-src_install() {
-	einstalldocs
-	rm -f README.md LICENSE || die
-	insinto /usr/share/glib-2.0/schemas
-	doins schemas/*.xml
-	rm -rf schemas
-	insinto /usr/share/gnome-shell/extensions/"${extension_uuid}"
-	doins -r *
-}
-
-pkg_preinst() {
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	gnome2_schemas_update
-	ebegin "Updating list of installed extensions"
-	eselect gnome-shell-extensions update
-	eend $?
-}
-
-pkg_postrm() {
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/Manifest b/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/Manifest
index 57fde8e53250..99d87c1027e2 100644
--- a/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/Manifest
+++ b/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/Manifest
@@ -1,9 +1,3 @@
-DIST gnome-shell-extension-bluetooth-quick-connect-20.tar.gz 20334 BLAKE2B 07998362457b4f8ccca56d22891d4998a00ba3eb8698d610778aa094df73f964a2e1bce1a1cf721b7ff037499a10b5356f3ba023fb4a04f898291a3bd7eb72a7 SHA512 947a181de76746a2a2f6d69984427b299f9e9f76c77e7e2afefd0e8c83f33226ff4c0b9a296252a21136feb481b5241d31a57f96360b9e8b1f911b043c7757b8
-DIST gnome-shell-extension-bluetooth-quick-connect-23.tar.gz 20319 BLAKE2B d43c8291de5e14922046ced9e3e097c925788f7af444ecceb52a175d71030a7583f3df61a2badeca6289ab9f5f2361710004e9e0ce2ff18627b4a7d667138443 SHA512 e13d95073a8450efdf68ae1ac2df8e60832ba6e7b7238514a9f5d799257167bc71c7fcd2a554ea8549a5e59e92d25f39ed10ebf251e15afa7a3d106695415aa8
-DIST gnome-shell-extension-bluetooth-quick-connect-25.tar.gz 22075 BLAKE2B cf1f0f98c0ac11c80b3cbe1dfe92a784f405762f22dd810b9e7f17ec21991faf52f6bc564367c4e6cf7902d56bf2433fe9a4e8434b9bbd2293c719e11cc18408 SHA512 55a7a41715ab5d5e6b944d1a7ba1b0763663547db04dead720c34afdb715ef5f94e8f5b91edc64147b9d879c92d9b81a8bb5ddff81435d663d3d7a4633a4efcd
 DIST gnome-shell-extension-bluetooth-quick-connect-26.tar.gz 22163 BLAKE2B 7a0ab7bd1090a1a4f9736b33fd31e26da358212b62c0b9dfb13f4c009faeffc85c294f59e9d91bd21302e9dbc7c00146e5cd2c625ed982ef5e330e70be20f001 SHA512 9f1360a6b1c6f714923277159275aa87ea78a234b58e01d6804e122fd5f4428664c95bbd43c99e54117811676bb26a85658abdc58d4ab60fb6e37ae34877ab6a
-EBUILD gnome-shell-extension-bluetooth-quick-connect-20.ebuild 1243 BLAKE2B 87ef0a12ae87b7c8805b7e0f6b6f3894ecb9d40a9f674899b1fe7d0b56bb94a6ac3a7164c763b8f00ffb643548de24e942c88dcfdad688eb3baef3f909c98a59 SHA512 5d9a5c25adf8dfb79be4b19d67b5fd1852abf3621380aa6ff8147f2ba4de2e8fdbd80abba99f5abf973514ab5868075de95e7f8986306a12d9e3ca4e6dc0785a
-EBUILD gnome-shell-extension-bluetooth-quick-connect-23.ebuild 1245 BLAKE2B aa68a2d9dc0f05d7f6471359b6f01d5756b010e547d87b88cccd29f79fa409339a0656cb866a2c0e53b6adb7e5bb12ce7070a3cc62f184f392773c3d1d7d1d23 SHA512 40276148fd360e89a823bb49dc49aa41d236d9dc750fd162c5725dab8cb85c62f0bef571fbcceccabd662b58041170f876779ec4d4cfd61c54fd183ca06edf65
-EBUILD gnome-shell-extension-bluetooth-quick-connect-25.ebuild 1245 BLAKE2B aa68a2d9dc0f05d7f6471359b6f01d5756b010e547d87b88cccd29f79fa409339a0656cb866a2c0e53b6adb7e5bb12ce7070a3cc62f184f392773c3d1d7d1d23 SHA512 40276148fd360e89a823bb49dc49aa41d236d9dc750fd162c5725dab8cb85c62f0bef571fbcceccabd662b58041170f876779ec4d4cfd61c54fd183ca06edf65
 EBUILD gnome-shell-extension-bluetooth-quick-connect-26.ebuild 1243 BLAKE2B 87ef0a12ae87b7c8805b7e0f6b6f3894ecb9d40a9f674899b1fe7d0b56bb94a6ac3a7164c763b8f00ffb643548de24e942c88dcfdad688eb3baef3f909c98a59 SHA512 5d9a5c25adf8dfb79be4b19d67b5fd1852abf3621380aa6ff8147f2ba4de2e8fdbd80abba99f5abf973514ab5868075de95e7f8986306a12d9e3ca4e6dc0785a
 MISC metadata.xml 241 BLAKE2B cb0374238d11e2a3f28f23b7049da09babd4310a99862738acfb7ba554f7758ac68cd09d1eb7a29068195c27010a846a540ed2c09b88fd043b37fb4f0762150f SHA512 b2c1d3e2cb6760ed4682da82af5370adcacd48afd558efa1abf84d955067b2ad32eda034af8cef95c71409622f97fa0113f2e07bee328f2d03512908ae931050
diff --git a/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/gnome-shell-extension-bluetooth-quick-connect-20.ebuild b/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/gnome-shell-extension-bluetooth-quick-connect-20.ebuild
deleted file mode 100644
index 0924f3a71235..000000000000
--- a/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/gnome-shell-extension-bluetooth-quick-connect-20.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome2-utils
-
-DESCRIPTION="Allow to connect bluetooth paired devices from gnome control panel"
-HOMEPAGE="https://github.com/bjarosze/gnome-bluetooth-quick-connect"
-SRC_URI="https://github.com/bjarosze/gnome-bluetooth-quick-connect/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-IUSE=""
-
-RDEPEND="
-	net-wireless/bluez
-	app-eselect/eselect-gnome-shell-extensions
-	>=gnome-base/gnome-shell-40
-"
-DEPEND="${COMMON_DEPEND}"
-BDEPEND=""
-
-S="${WORKDIR}/${P/shell-extension-}"
-extension_uuid="bluetooth-quick-connect@bjarosze.gmail.com"
-
-src_install() {
-	einstalldocs
-	insinto /usr/share/glib-2.0/schemas
-	doins schemas/*.xml
-	rm -rf README.md LICENSE Makefile schemas || die
-	insinto /usr/share/gnome-shell/extensions/"${extension_uuid}"
-	doins -r *
-	dosym ../../../../../usr/share/glib-2.0/schemas /usr/share/gnome-shell/extensions/"${extension_uuid}"/schemas
-}
-
-pkg_preinst() {
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	gnome2_schemas_update
-	ebegin "Updating list of installed extensions"
-	eselect gnome-shell-extensions update
-	eend $?
-}
-
-pkg_postrm() {
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/gnome-shell-extension-bluetooth-quick-connect-23.ebuild b/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/gnome-shell-extension-bluetooth-quick-connect-23.ebuild
deleted file mode 100644
index dcf84bd1bafc..000000000000
--- a/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/gnome-shell-extension-bluetooth-quick-connect-23.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome2-utils
-
-DESCRIPTION="Allow to connect bluetooth paired devices from gnome control panel"
-HOMEPAGE="https://github.com/bjarosze/gnome-bluetooth-quick-connect"
-SRC_URI="https://github.com/bjarosze/gnome-bluetooth-quick-connect/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
-IUSE=""
-
-RDEPEND="
-	net-wireless/bluez
-	app-eselect/eselect-gnome-shell-extensions
-	>=gnome-base/gnome-shell-40
-"
-DEPEND="${COMMON_DEPEND}"
-BDEPEND=""
-
-S="${WORKDIR}/${P/shell-extension-}"
-extension_uuid="bluetooth-quick-connect@bjarosze.gmail.com"
-
-src_install() {
-	einstalldocs
-	insinto /usr/share/glib-2.0/schemas
-	doins schemas/*.xml
-	rm -rf README.md LICENSE Makefile schemas || die
-	insinto /usr/share/gnome-shell/extensions/"${extension_uuid}"
-	doins -r *
-	dosym ../../../../../usr/share/glib-2.0/schemas /usr/share/gnome-shell/extensions/"${extension_uuid}"/schemas
-}
-
-pkg_preinst() {
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	gnome2_schemas_update
-	ebegin "Updating list of installed extensions"
-	eselect gnome-shell-extensions update
-	eend $?
-}
-
-pkg_postrm() {
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/gnome-shell-extension-bluetooth-quick-connect-25.ebuild b/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/gnome-shell-extension-bluetooth-quick-connect-25.ebuild
deleted file mode 100644
index dcf84bd1bafc..000000000000
--- a/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/gnome-shell-extension-bluetooth-quick-connect-25.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome2-utils
-
-DESCRIPTION="Allow to connect bluetooth paired devices from gnome control panel"
-HOMEPAGE="https://github.com/bjarosze/gnome-bluetooth-quick-connect"
-SRC_URI="https://github.com/bjarosze/gnome-bluetooth-quick-connect/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
-IUSE=""
-
-RDEPEND="
-	net-wireless/bluez
-	app-eselect/eselect-gnome-shell-extensions
-	>=gnome-base/gnome-shell-40
-"
-DEPEND="${COMMON_DEPEND}"
-BDEPEND=""
-
-S="${WORKDIR}/${P/shell-extension-}"
-extension_uuid="bluetooth-quick-connect@bjarosze.gmail.com"
-
-src_install() {
-	einstalldocs
-	insinto /usr/share/glib-2.0/schemas
-	doins schemas/*.xml
-	rm -rf README.md LICENSE Makefile schemas || die
-	insinto /usr/share/gnome-shell/extensions/"${extension_uuid}"
-	doins -r *
-	dosym ../../../../../usr/share/glib-2.0/schemas /usr/share/gnome-shell/extensions/"${extension_uuid}"/schemas
-}
-
-pkg_preinst() {
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	gnome2_schemas_update
-	ebegin "Updating list of installed extensions"
-	eselect gnome-shell-extensions update
-	eend $?
-}
-
-pkg_postrm() {
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen/Manifest b/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen/Manifest
index a0cfc1ea960d..292e9f738ce2 100644
--- a/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen/Manifest
+++ b/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen/Manifest
@@ -1,9 +1,5 @@
-DIST gnome-shell-extension-control-blur-effect-on-lock-screen-20210614.tar.gz 14863 BLAKE2B 11133a5bf6ea06acd2fce6f215fcc6a37a658857161b9babab51246d6d7d382773e92f395796410fafa903ace656aa664c749a501bcbd4d05ebbd81ea9fd5018 SHA512 06f6329a6a2b2e03cacd305e1dad81768b81d6193782739caeadc51f141da9238d2bff563276235673e492ad7f13977fe7f1eaba73ca940a410b94defbeae5b0
-DIST gnome-shell-extension-control-blur-effect-on-lock-screen-20210721.tar.gz 2592 BLAKE2B 205309c4057094301e3469471b0f2da06a6cdf6f36b430b636f5341acde98ae999a537ca3a815a257fd9e3abde8f30bffb9a78f38926224eea3ec29d92548f2b SHA512 d314227588dac2f51b1d6946bac29501607b3e4fa6c3394b4bf56576453d6e6aa5a76fb2b576e216d5e62dabd8994418f11838d95bd90f134d261223fab04dd8
 DIST gnome-shell-extension-control-blur-effect-on-lock-screen-20211111.tar.gz 2595 BLAKE2B c15c74cd534e571585b1129216fe644d7c8c2b78cf360d26ac48cf1773e3b69e97c3889e13f39355c24b2066168f9cdd2a6e49f830c20f1f6f853aecba6b0ebe SHA512 b3dfa72863972af9ada7803aeff409139708840b795842c32ce6b07cea21e472c06c4ec86eb141b0fd89a31912971d3b97fd96ee4e3d8bc63928f551bf7c9836
 DIST gnome-shell-extension-control-blur-effect-on-lock-screen-20211209.tar.gz 2609 BLAKE2B 17b75fab4c2c01635ef578444ab2d17ef19abad4fe9ef92ac46ea00e6ee7fa5138364e950e75b7ed581249c650e745fb7cb6adfa18a85a42cbba2d9a7d62555e SHA512 ceaf49c034d90d30534b36a0bd47b18e492a052724820887e284f4e5fe7b7faac24baa19581d113f176ce13082ec080de5562555dc2b65481b187543a60da9cc
-EBUILD gnome-shell-extension-control-blur-effect-on-lock-screen-20210614.ebuild 1338 BLAKE2B 1a24cb39abe74cc8fb7a7681e327f62bafd8db533e854834d804baa7435c90ab15892d71fa21694fa22d8854edf0c9913357fb103d9f420f1055af477ea64d2c SHA512 d8ad8ff5ee49f55ec35ee425030dcd43a02c2c67a61a2367b46ee030c10ce8eacfb68440e03536c80250ba82d912ee32d669df7c6a17b4472ec3d42eb57dce68
-EBUILD gnome-shell-extension-control-blur-effect-on-lock-screen-20210721.ebuild 1320 BLAKE2B 0e1461f3162ced1368abd886fd0b2e81aa8d729ec4d24b3ff5196d9bca9438993bd091d6656af86d122cdb1629626a82627e7df68c3942e4bdd8ecaa1231ed33 SHA512 67b172d4fc9d7f9a0c098510a1b34c5c7132b5db94236342e4cd6dcab85bb0ada5fff165d84e6491bf4f5102362c13ff64c56a1cd3e9a4a8e5331ab2e392796b
 EBUILD gnome-shell-extension-control-blur-effect-on-lock-screen-20211111.ebuild 1320 BLAKE2B c435fec4b1344e1c5675669b67f29e3a540159bdddaa7221de38ab77dd29dbe213064b9932ca3dda3b646a307ceb98f322270e1c64303e1b501285959076d9dc SHA512 501c53f9cd9b5a20555a918fa3bc8b5f68ed5d9ccd453060fb49029b0cbd02e502d6e9678b4aaee32236234ce45f22fa53cac80a5c6676fe77eeb28c7f1f5f07
-EBUILD gnome-shell-extension-control-blur-effect-on-lock-screen-20211209.ebuild 1317 BLAKE2B 07cb561848382d13b54cd838fe784e2b205e40f2ed67090ebceb761c69173fe6a5dc57384f7b354d1b07dc66fad9af0824c6b5af02366af7f6341223d0697e99 SHA512 3347f16463eae6a4a3dfa458bdb063dedd0be92caca16f5aa2c3ebd84a136f61fd4efa8670351c572a9f239aa03d6a4dfd4b16e1316c3073565d75ee620e291f
+EBUILD gnome-shell-extension-control-blur-effect-on-lock-screen-20211209.ebuild 1315 BLAKE2B 61ba8106064e68f49f75828e7b48a651fcf22483545933a2250f3994b159ebe04642042ff32388e446cc065281545ad73696918c9c94ce1cdec2c600b7289a03 SHA512 8c0339e817c1407846f098e66487ec5a43a0280a087cdb917a113be67bf6f1d91b932ee2b8810c84980f2eab2bfe63216a7908fb0da9b8daa384702423c28ee0
 MISC metadata.xml 241 BLAKE2B cb0374238d11e2a3f28f23b7049da09babd4310a99862738acfb7ba554f7758ac68cd09d1eb7a29068195c27010a846a540ed2c09b88fd043b37fb4f0762150f SHA512 b2c1d3e2cb6760ed4682da82af5370adcacd48afd558efa1abf84d955067b2ad32eda034af8cef95c71409622f97fa0113f2e07bee328f2d03512908ae931050
diff --git a/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen/gnome-shell-extension-control-blur-effect-on-lock-screen-20210614.ebuild b/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen/gnome-shell-extension-control-blur-effect-on-lock-screen-20210614.ebuild
deleted file mode 100644
index 1e7738c07f57..000000000000
--- a/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen/gnome-shell-extension-control-blur-effect-on-lock-screen-20210614.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome2-utils
-
-DESCRIPTION="Control the blur effect on gnome-shell lock screen"
-HOMEPAGE="https://github.com/PRATAP-KUMAR/Control_Blur_Effect_On_Lock_Screen"
-COMMIT="71afc1a01df765bf03cc756d309be1e040184f20"
-SRC_URI="https://github.com/PRATAP-KUMAR/Control_Blur_Effect_On_Lock_Screen/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-# glib for glib-compile-schemas at build time, needed at runtime anyways
-COMMON_DEPEND="
-	dev-libs/glib:2
-"
-RDEPEND="${COMMON_DEPEND}
-	app-eselect/eselect-gnome-shell-extensions
-	>=gnome-base/gnome-shell-40
-"
-DEPEND="${COMMON_DEPEND}"
-BDEPEND=""
-
-extension_uuid="ControlBlurEffectOnLockScreen@pratap.fastmail.fm"
-S="${WORKDIR}/Control_Blur_Effect_On_Lock_Screen-${COMMIT}/${extension_uuid}"
-
-src_compile() { :; }
-
-src_install() {
-	einstalldocs
-	insinto /usr/share/glib-2.0/schemas
-	doins schemas/*.xml
-	rm -rf LICENSE README.md schemas
-	insinto /usr/share/gnome-shell/extensions/"${extension_uuid}"
-	doins -r *
-}
-
-pkg_preinst() {
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	gnome2_schemas_update
-	ebegin "Updating list of installed extensions"
-	eselect gnome-shell-extensions update
-	eend $?
-}
-
-pkg_postrm() {
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen/gnome-shell-extension-control-blur-effect-on-lock-screen-20210721.ebuild b/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen/gnome-shell-extension-control-blur-effect-on-lock-screen-20210721.ebuild
deleted file mode 100644
index cbe665183057..000000000000
--- a/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen/gnome-shell-extension-control-blur-effect-on-lock-screen-20210721.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome2-utils
-
-DESCRIPTION="Control the blur effect on gnome-shell lock screen"
-HOMEPAGE="https://github.com/PRATAP-KUMAR/Control_Blur_Effect_On_Lock_Screen"
-COMMIT="1dc40c2a9e3bfdf851c7726b041484c8663b28e9"
-SRC_URI="https://github.com/PRATAP-KUMAR/Control_Blur_Effect_On_Lock_Screen/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-# glib for glib-compile-schemas at build time, needed at runtime anyways
-COMMON_DEPEND="
-	dev-libs/glib:2
-"
-RDEPEND="${COMMON_DEPEND}
-	app-eselect/eselect-gnome-shell-extensions
-	>=gnome-base/gnome-shell-40
-"
-DEPEND="${COMMON_DEPEND}"
-BDEPEND=""
-
-extension_uuid="ControlBlurEffectOnLockScreen@pratap.fastmail.fm"
-S="${WORKDIR}/Control_Blur_Effect_On_Lock_Screen-${COMMIT}"
-
-src_compile() { :; }
-
-src_install() {
-	einstalldocs
-	insinto /usr/share/glib-2.0/schemas
-	doins schemas/*.xml
-	rm -rf LICENSE README.md schemas
-	insinto /usr/share/gnome-shell/extensions/"${extension_uuid}"
-	doins -r *
-}
-
-pkg_preinst() {
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	gnome2_schemas_update
-	ebegin "Updating list of installed extensions"
-	eselect gnome-shell-extensions update
-	eend $?
-}
-
-pkg_postrm() {
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen/gnome-shell-extension-control-blur-effect-on-lock-screen-20211209.ebuild b/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen/gnome-shell-extension-control-blur-effect-on-lock-screen-20211209.ebuild
index 12902d135edb..4d65aa5f8a8c 100644
--- a/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen/gnome-shell-extension-control-blur-effect-on-lock-screen-20211209.ebuild
+++ b/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen/gnome-shell-extension-control-blur-effect-on-lock-screen-20211209.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=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/PRATAP-KUMAR/Control_Blur_Effect_On_Lock_Screen/arch
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 # glib for glib-compile-schemas at build time, needed at runtime anyways
diff --git a/gnome-extra/gnome-shell-extension-dash-to-panel/Manifest b/gnome-extra/gnome-shell-extension-dash-to-panel/Manifest
index a9b4887edca8..46d0d1832ae5 100644
--- a/gnome-extra/gnome-shell-extension-dash-to-panel/Manifest
+++ b/gnome-extra/gnome-shell-extension-dash-to-panel/Manifest
@@ -1,9 +1,5 @@
 AUX gnome-shell-extension-dash-to-panel-26-branding.patch 637 BLAKE2B 1e124561143b577413090e16c7ad0c8cbb66911b079ae5844da9cf04e0197aab15fc4f746d3020ab7d4e6756b8a35befa773967c223d29289e13c6b3ffd70234 SHA512 8c176972ff10e87e957cfdda23e86a3e434dc050e8a954e7c2257942301daa5aa7c5b788188768f13c5b009d842fca8b14819a255a6a561dac8fa60e355ec211
-DIST gnome-shell-extension-dash-to-panel-43.tar.gz 21140181 BLAKE2B cfac79409ae5415bf371b1f45ef1e55bb4d06a8613ef0b0ff481a231edf33ebd44d1dcd9b37dd0bbe78791ea39e66aa914a6741dd5150e9f4eb55ad2b56478eb SHA512 41b2b3553bc75f82c868ee69a411ad3f82f456cde1cfc06792bb602c9fd95e78c9538aecd58752a3500e9aad2e98e17176c2d754da6c77eb3cc453cd0c3b235c
-DIST gnome-shell-extension-dash-to-panel-44.tar.gz 21141085 BLAKE2B b9a143f47c17caf818db3d10efc1fc6c908671b555c2df101d1aaa8e7d6889b2175cff36c4b0ef9e6107eff5d2320690dbec2800ff69e02eb24d7f0d60fbe18d SHA512 fd7b4a9ce77a6c28811999703ab7b21f253745bf2afa843c586290ce99fd0676464865cd812950fa23058f6d346b08d0febcd786106a20dac346a35c820490df
 DIST gnome-shell-extension-dash-to-panel-45.tar.gz 21158475 BLAKE2B fa44e2c0ae33f39f79584b78ade1091eead28c1158c55f7b7511479ee5ba0c52054d0f447fa0bf7787c89c10254cbc5348abdaef048296ef8782b8a2480b066e SHA512 fa621a23ef6349cd2925069107e3bb4a4f2bdfeca953acee5512a48d78df60304f062348bd80e8c46bbb3a958b9745140aa0a5454b6494f0314cdd40a9c77472
 DIST tango-gentoo-v1.1.tar.gz 29322 BLAKE2B 83fa2bf37727e60851dd679054fe1b153ebfea58c9a9a40f891f7d68d3b047b02e8effa1d1b4e08d64500a2072ce7200f159c92a352da7124de27e1b05bb6027 SHA512 87d47ddab68361db6d99866c51705dcb3e198f8345a1096859acf2c6cca5099dd23c7fb30d124f52c4933ea38fd45fadffbbe6ecbdfa84f5b60938a4824f9045
-EBUILD gnome-shell-extension-dash-to-panel-43.ebuild 1824 BLAKE2B 59fd8b915e1570aaab7fefb4123af35f7443eb141e58f86cfaeb317aee0a1984d986f8e804dd154145da75e1b2c2d39cb0449b5bb8d4e7875b06eca24063b254 SHA512 0d046c9e1f1140db2f52dfff8de0dd2dd4d95fc3c1d61b531d73c2e7cd7cabe19d235ebec499c4dd7481dcd79447163afed3f6623aa03e9620b47d2138ca0eda
-EBUILD gnome-shell-extension-dash-to-panel-44.ebuild 1824 BLAKE2B f1d0d91acbd8bf962c5de8b7650ff91f4e832bd55063126283fc1b8757006c6a83c614c74744326274b14bddddfd585852515d1bbf72247b2f77892da3e0b294 SHA512 e467a07059be06c15b52d9316c2c815b22039113a4a150b8354364df7072823140b3486928088c5107f8dec612417eb8bf2e25c42ac8836c2eb54b5fbe0f8bf7
-EBUILD gnome-shell-extension-dash-to-panel-45.ebuild 1833 BLAKE2B 89e89d57a5008255b3361956d3031335412bd016255575bc86e262fec37b70460bfddb1dff3b926cc384721f23f198f5c39663de65108eb037589db5a62022fe SHA512 e5bc28e02977928ce32d73dfed0a63c444ad677fbbace785c7a3e41ddfbc22e002e1f95f20af68a8dfd7aaa1b12e2451421c55f25103fbc96d3f40c7655db300
+EBUILD gnome-shell-extension-dash-to-panel-45.ebuild 1831 BLAKE2B 77d6a9b5879fd3d984478fb2809c4f28c0ebace7fe1f930b043be47388121fa013ced6a482c49f9ffca2cd2f4afbbdc81b0ec7cbc78f16e4000bb24df6607b83 SHA512 c5d8224195d66280e3ba37e1b6e75e0c13fc538cb035b651682c4e87afa9c045eb817c58e7183009fa8aa0d88dfdfd438bda2c0a2cfe9bc835b7103f93f0cb6b
 MISC metadata.xml 241 BLAKE2B cb0374238d11e2a3f28f23b7049da09babd4310a99862738acfb7ba554f7758ac68cd09d1eb7a29068195c27010a846a540ed2c09b88fd043b37fb4f0762150f SHA512 b2c1d3e2cb6760ed4682da82af5370adcacd48afd558efa1abf84d955067b2ad32eda034af8cef95c71409622f97fa0113f2e07bee328f2d03512908ae931050
diff --git a/gnome-extra/gnome-shell-extension-dash-to-panel/gnome-shell-extension-dash-to-panel-43.ebuild b/gnome-extra/gnome-shell-extension-dash-to-panel/gnome-shell-extension-dash-to-panel-43.ebuild
deleted file mode 100644
index e7bbdf9bfe31..000000000000
--- a/gnome-extra/gnome-shell-extension-dash-to-panel/gnome-shell-extension-dash-to-panel-43.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome2-utils
-
-MY_PN="${PN/gnome-shell-extension-/}"
-MY_P="${MY_PN}-${PV}"
-DESCRIPTION="An icon taskbar for the Gnome Shell"
-HOMEPAGE="https://github.com/home-sweet-gnome/dash-to-panel"
-SRC_URI="
-	https://github.com/home-sweet-gnome/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	branding? ( https://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz )
-"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="branding"
-
-COMMON_DEPEND="dev-libs/glib:2"
-RDEPEND="${COMMON_DEPEND}
-	app-eselect/eselect-gnome-shell-extensions
-	>=gnome-base/gnome-shell-40
-"
-DEPEND="${COMMON_DEPEND}"
-BDEPEND="
-	dev-util/intltool
-	sys-devel/gettext
-"
-
-S="${WORKDIR}/${MY_P}"
-extension_uuid="dash-to-panel@jderose9.github.com"
-
-src_prepare() {
-	default
-
-	# Set correct version
-	export VERSION="${PV}"
-
-	# Don't install README and COPYING in unwanted locations
-	sed -i -e 's/COPYING//g' -e 's/README.md//g' Makefile || die
-
-	# Provide fancy Gentoo icon when requested
-	use branding && eapply "${FILESDIR}"/${PN}-26-branding.patch
-}
-
-src_install() {
-	default
-	if use branding; then
-		insinto /usr/share/gnome-shell/extensions/dash-to-panel@jderose9.github.com/img
-		doins "${WORKDIR}/tango-gentoo-v1.1/scalable/gentoo.svg"
-	fi
-
-	# Install schemas system-wide
-	dodir /usr/share/glib-2.0/schemas
-	mv "${ED}/usr/share/gnome-shell/extensions/${extension_uuid}"/schemas/ "${ED}/usr/share/glib-2.0" || die
-	rm "${ED}/usr/share/glib-2.0/schemas/gschemas.compiled" || die
-}
-
-pkg_preinst() {
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	gnome2_schemas_update
-	ebegin "Updating list of installed extensions"
-	eselect gnome-shell-extensions update
-	eend $?
-}
-
-pkg_postrm() {
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/gnome-shell-extension-dash-to-panel/gnome-shell-extension-dash-to-panel-44.ebuild b/gnome-extra/gnome-shell-extension-dash-to-panel/gnome-shell-extension-dash-to-panel-44.ebuild
deleted file mode 100644
index afbdfe9cfb22..000000000000
--- a/gnome-extra/gnome-shell-extension-dash-to-panel/gnome-shell-extension-dash-to-panel-44.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome2-utils
-
-MY_PN="${PN/gnome-shell-extension-/}"
-MY_P="${MY_PN}-${PV}"
-DESCRIPTION="An icon taskbar for the Gnome Shell"
-HOMEPAGE="https://github.com/home-sweet-gnome/dash-to-panel"
-SRC_URI="
-	https://github.com/home-sweet-gnome/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	branding? ( https://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz )
-"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="branding"
-
-COMMON_DEPEND="dev-libs/glib:2"
-RDEPEND="${COMMON_DEPEND}
-	app-eselect/eselect-gnome-shell-extensions
-	=gnome-base/gnome-shell-40*
-"
-DEPEND="${COMMON_DEPEND}"
-BDEPEND="
-	dev-util/intltool
-	sys-devel/gettext
-"
-
-S="${WORKDIR}/${MY_P}"
-extension_uuid="dash-to-panel@jderose9.github.com"
-
-src_prepare() {
-	default
-
-	# Set correct version
-	export VERSION="${PV}"
-
-	# Don't install README and COPYING in unwanted locations
-	sed -i -e 's/COPYING//g' -e 's/README.md//g' Makefile || die
-
-	# Provide fancy Gentoo icon when requested
-	use branding && eapply "${FILESDIR}"/${PN}-26-branding.patch
-}
-
-src_install() {
-	default
-	if use branding; then
-		insinto /usr/share/gnome-shell/extensions/dash-to-panel@jderose9.github.com/img
-		doins "${WORKDIR}/tango-gentoo-v1.1/scalable/gentoo.svg"
-	fi
-
-	# Install schemas system-wide
-	dodir /usr/share/glib-2.0/schemas
-	mv "${ED}/usr/share/gnome-shell/extensions/${extension_uuid}"/schemas/ "${ED}/usr/share/glib-2.0" || die
-	rm "${ED}/usr/share/glib-2.0/schemas/gschemas.compiled" || die
-}
-
-pkg_preinst() {
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	gnome2_schemas_update
-	ebegin "Updating list of installed extensions"
-	eselect gnome-shell-extensions update
-	eend $?
-}
-
-pkg_postrm() {
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/gnome-shell-extension-dash-to-panel/gnome-shell-extension-dash-to-panel-45.ebuild b/gnome-extra/gnome-shell-extension-dash-to-panel/gnome-shell-extension-dash-to-panel-45.ebuild
index 40a9f5109c18..419cb876463b 100644
--- a/gnome-extra/gnome-shell-extension-dash-to-panel/gnome-shell-extension-dash-to-panel-45.ebuild
+++ b/gnome-extra/gnome-shell-extension-dash-to-panel/gnome-shell-extension-dash-to-panel-45.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 x86"
 IUSE="branding"
 
 COMMON_DEPEND="dev-libs/glib:2"
diff --git a/gnome-extra/gnome-shell-extension-desktop-icons-ng/Manifest b/gnome-extra/gnome-shell-extension-desktop-icons-ng/Manifest
index 59aa9cabe4e1..5202935c782e 100644
--- a/gnome-extra/gnome-shell-extension-desktop-icons-ng/Manifest
+++ b/gnome-extra/gnome-shell-extension-desktop-icons-ng/Manifest
@@ -1,7 +1,5 @@
 DIST ding-0.24.0.tar.xz 101020 BLAKE2B a0f6b276cf41113dbee92ee6e34da3ffbf8f614765874b1185c226ddd350a2b63f369bdb40f71677444694a4083b34765f63eda09761bd3690355d5df6f97173 SHA512 0d066abb3e25cc2dacf593a1f05b14937394a89254bc541311c32f5206782e1d80be82cd1eee567809aee9bc0e3e80206eeae81119e72d444b965a2daf341493
-DIST ding-33.0.tar.xz 106484 BLAKE2B ca1126eb61bc41bbe50938c17ffa8611886aa4656902969270e00fd1e783497bc47f16215d641f74f96cb21763dff134508304e13063bf8cbaea2e3ae584a1c0 SHA512 27bccb7fbea8044fadd9c9732a0f557424af30a3b8d88aa3fe5354ce507f2ae4219fce785ff31dd5f102db1cdd9ced25f733a5a0c5cb39b453e9fcede6815734
 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
+EBUILD gnome-shell-extension-desktop-icons-ng-38.0.ebuild 1001 BLAKE2B 5090f816926d836d32712659f88d0bd8c3a86b9b106f6a49bed69981f877ca574878da3eccd9c21083fe5e9297b6e2df4374b6de393dd367d2503f31600e8b90 SHA512 47dd6b467409a9126639f81425ec6a601fae1c6f7da1aea4a42eef98a80f6b0002d7392fce1c708843908fa43712c07cd486040d05e61f83c941fd8e94be065b
 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-33.0.ebuild b/gnome-extra/gnome-shell-extension-desktop-icons-ng/gnome-shell-extension-desktop-icons-ng-33.0.ebuild
deleted file mode 100644
index 210bf6fcb7b5..000000000000
--- a/gnome-extra/gnome-shell-extension-desktop-icons-ng/gnome-shell-extension-desktop-icons-ng-33.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit gnome2-utils meson
-
-MY_PN="ding"
-MY_P="${MY_PN}-${PV}"
-COMMIT="af3dc1568f069d145722920017474829"
-
-DESCRIPTION="Fork from the desktop-icons project, with several enhancements like Drag'n'Drop"
-HOMEPAGE="https://gitlab.com/rastersoft/desktop-icons-ng"
-SRC_URI="https://gitlab.com/rastersoft/desktop-icons-ng/uploads/${COMMIT}/${MY_P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-COMMON_DEPEND="dev-libs/glib:2"
-RDEPEND="${COMMON_DEPEND}
-	app-eselect/eselect-gnome-shell-extensions
-	>=gnome-base/gnome-shell-3.38
-	>=gnome-base/nautilus-3.38
-"
-DEPEND="${COMMON_DEPEND}"
-BDEPEND=""
-
-S="${WORKDIR}/${MY_P}"
-extension_uuid="ding@rastersoft.com"
-
-pkg_preinst() {
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	gnome2_schemas_update
-	ebegin "Updating list of installed extensions"
-	eselect gnome-shell-extensions update
-	eend $?
-}
-
-pkg_postrm() {
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/gnome-shell-extension-desktop-icons-ng/gnome-shell-extension-desktop-icons-ng-38.0.ebuild b/gnome-extra/gnome-shell-extension-desktop-icons-ng/gnome-shell-extension-desktop-icons-ng-38.0.ebuild
index a18cbd29e685..e6939f08f661 100644
--- a/gnome-extra/gnome-shell-extension-desktop-icons-ng/gnome-shell-extension-desktop-icons-ng-38.0.ebuild
+++ b/gnome-extra/gnome-shell-extension-desktop-icons-ng/gnome-shell-extension-desktop-icons-ng-38.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://gitlab.com/rastersoft/desktop-icons-ng/uploads/${COMMIT}/${MY_P
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 COMMON_DEPEND="dev-libs/glib:2"
diff --git a/gnome-extra/gnome-shell-extension-gsconnect/Manifest b/gnome-extra/gnome-shell-extension-gsconnect/Manifest
index f29a1f4c5052..398c3fb4daf9 100644
--- a/gnome-extra/gnome-shell-extension-gsconnect/Manifest
+++ b/gnome-extra/gnome-shell-extension-gsconnect/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-shell-extension-gsconnect-47.tar.gz 737392 BLAKE2B d2f09ae4650c17cf9f5ef90c18beb2ff46c3c077d27e4ea11fdb5f41522cb231aea47b168848c5da2c0ae35fbd1df734fa11f13c38abbde2ccab585137b7e116 SHA512 c1e900b225cda8edbcc1b3a16883b58d09a110b67cb503f3e7e71f8e0abafb565081528958cbd44e5685a1de2d7f54cee88a87a8e35f2344571eab8935b80c91
 DIST gnome-shell-extension-gsconnect-48.tar.gz 795292 BLAKE2B d7885d5a29c2a71d5180baed0da201b921ea9058c284b110becbc84594610f6b5ffd539b598c091113f3ad2e12f9adb486d216d4b37064ef1b6218edc547ec82 SHA512 309e4fdb3f13d4c14f744316f7904aa7c4d5c2c712187625ac1db6de7f1a03fe156754468ba4b982ebed9042006701c3f7eb7114d1e84a7051332edf58c5b21b
-EBUILD gnome-shell-extension-gsconnect-47.ebuild 1613 BLAKE2B edc2b6614b2c3a69f1046b19b8de629b8bd35114cc1950ae2479b71d46d076407c63b96f9239945bda69b25ec6c190313b7d21d44ac5237c841d74adec754fca SHA512 f6485927888161e1ddf82a17941e91947486b96eb80f492bed6928e6771201aaf4985357bb9e22087b8dda402e2f13a72f7f3168eaa1372a48c6da543dcf4441
-EBUILD gnome-shell-extension-gsconnect-48.ebuild 1615 BLAKE2B 67df849a26b7a5551cc90c0f2d83692de52d1917b78652d59091168b9ba156e761a4f325351fa42ba3bfc05ed2837370acfc6c2131cd37342ed5b5265a82770b SHA512 4c59d4c62b9b90a7e20602079df2511a2dfac8601607695bf56a5b3952893468d8ae28a1779777faae9cc0c45aab371fceddeccbba1434c66956dbdf4551732c
+EBUILD gnome-shell-extension-gsconnect-48.ebuild 1613 BLAKE2B 5e28e0f1fbdd6702d852005824323377be862563e2b8665c8f702eacde65af657a90c0c1d1aebc9c9f5863bf4a34b7ff108b6b938b5729a43468b6c5555326fb SHA512 a6c936a108d23de5df14fd53ecb378b8e31ecfc16eacc0443a2a0cb5df99288c08bfe299c0a2883df275979ce7475e045253ced5ddc6d9318a18963b43be9d1b
 MISC metadata.xml 346 BLAKE2B d1e2c79cae69a58f7af962316046f4620238b88d42e0f211a28ba271633993bae4df79956ab9dde4f4e94e7e77233288657d5b3c1876c9192118a11ee5ee678f SHA512 00b2e45892280f1a042b3ec03d66c3fcc7a2b95f94534d22fb8df936976384bb78433337b339ae023ae9850f2e4c0cfb8b12fae28ae7863d2ebe93a47784a77a
diff --git a/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-47.ebuild b/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-47.ebuild
deleted file mode 100644
index bc9f45487557..000000000000
--- a/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-47.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 gnome2-utils meson readme.gentoo-r1 xdg
-
-DESCRIPTION="KDE Connect implementation for Gnome Shell"
-HOMEPAGE="https://github.com/GSConnect/gnome-shell-extension-gsconnect"
-SRC_URI="https://github.com/GSConnect/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="nautilus"
-
-COMMON_DEPEND="dev-libs/glib:2"
-RDEPEND="${COMMON_DEPEND}
-	app-eselect/eselect-gnome-shell-extensions
-	>=dev-libs/gjs-1.68
-	=gnome-base/gnome-shell-40*
-	gnome-base/gvfs
-	gnome-extra/evolution-data-server
-	|| ( media-libs/libcanberra media-libs/gsound )
-	nautilus? (
-		dev-python/nautilus-python
-		gnome-base/nautilus[introspection] )
-"
-DEPEND="${COMMON_DEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="For knowing more about how to do the setup, please visit:
-https://github.com/andyholmes/gnome-shell-extension-gsconnect/wiki/Installation"
-
-src_configure() {
-	# nemo support relies on nemo-python from https://github.com/linuxmint/nemo-extensions
-	# https://bugs.gentoo.org/694388
-	meson_src_configure \
-		-Dinstalled_tests=false \
-		-Dnemo=false \
-		$(meson_use nautilus)
-}
-
-src_install() {
-	meson_src_install
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	gnome2_schemas_savelist
-	xdg_pkg_preinst
-}
-
-pkg_postinst() {
-	gnome2_schemas_update
-	xdg_pkg_postinst
-	ebegin "Updating list of installed extensions"
-	eselect gnome-shell-extensions update
-	eend $?
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	gnome2_schemas_update
-	xdg_pkg_postrm
-}
diff --git a/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-48.ebuild b/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-48.ebuild
index 0a71c76c18eb..d682f1b280ab 100644
--- a/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-48.ebuild
+++ b/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-48.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/GSConnect/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="nautilus"
 
 COMMON_DEPEND="dev-libs/glib:2"
diff --git a/gnome-extra/gnome-shell-extension-weather-in-the-clock/Manifest b/gnome-extra/gnome-shell-extension-weather-in-the-clock/Manifest
index 150cd7862bc6..0a072bdce173 100644
--- a/gnome-extra/gnome-shell-extension-weather-in-the-clock/Manifest
+++ b/gnome-extra/gnome-shell-extension-weather-in-the-clock/Manifest
@@ -1,3 +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
+EBUILD gnome-shell-extension-weather-in-the-clock-20211108.ebuild 1082 BLAKE2B 0b56378521ac77b3d9e81c957bcb222f7af18e1136ee42203b8245032e7306aee8042e79cedc5574c986e933e7457d9268fe101770d285542ca4951543352e3f SHA512 faa2b5e9a4cc6ed0b6c0e5aba5adb0b9d65bdee68d933b25bce7eda9c718d7c6e47495441f27aee16244dee1eec6224d51e587ec9a11c7d1ff9352722adc2dfb
 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
index 1d7cf088c5ac..7d129c378e4e 100644
--- 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
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/JasonLG1979/gnome-shell-extension-weather-in-the-clo
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/gnome-extra/gnome-shell-extensions/Manifest b/gnome-extra/gnome-shell-extensions/Manifest
index 4e8eb241464b..b4c1147fdd3b 100644
--- a/gnome-extra/gnome-shell-extensions/Manifest
+++ b/gnome-extra/gnome-shell-extensions/Manifest
@@ -1,5 +1,4 @@
-DIST gnome-shell-extensions-40.4.tar.xz 218088 BLAKE2B f992c98fa5ceec84c774881468e0c9736d24f1834b9d6976f7cddc2dce455393fad0ad055c1e02b308135914029874c4d87d3a09733a7b4686308e9052cef21a SHA512 79f087c9fbc7764241751441190819b3e768530257ffe3a7b39b1004f8997de9c8ea381338ec0544a39b8cc6866137d315e56f3f058c9b66a9ed566ec40712ef
-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.1.ebuild 1777 BLAKE2B 08a538766888b93b71bcae8055851d218d66b4a3664e9e561cc5dd13e5178b84de178a1c8b253f41141c86fd7a8d06e9781d68c79f6dd357694e1c2d549922fb SHA512 7beda3a2f8db19ebe4231f74ebc81e6526776e30b1ed86e0a735b346a86445d0305987eb8c927c8180ae1bdf4268b1a60ecc44d5c2280c30ccb4bddf2c1f01cc
+AUX gnome-shell-extensions-41.1-meson-0.61.patch 383 BLAKE2B f40a994294b3a6fe1aafa92d87774aabe5e1ec75913f1902c746227198db4baf928c2f96c63eda8531668dd998eee0484ab6a506785491bad1bfe5a3721b3547 SHA512 beed6cece8b0bce2e8fe5f210b7ebb36f75192ef91e7cd407ae83216516f6bacbcbb76c2591b601cf7fe1866ac30c220026b349066aa95f06bbbf2393cf32b65
+DIST gnome-shell-extensions-41.2.tar.xz 222528 BLAKE2B 132fdbc1e1c81a886dc250dabd44721aeeaefed5939f30274e2484ec6a8dfff25fd0c481a04edf47f732ccb34b9c8d132d106a45d862db07fc9fb8d835fee6de SHA512 3b581dbc289f630bb85b0285a2f5956142a412e124d15e085770a578a9304211b1868f4eb940b79637b9cfa78b0da5973a717ee5866d75e9d15f38e91d4f414f
+EBUILD gnome-shell-extensions-41.2.ebuild 1830 BLAKE2B 5035f1592b076b4246143c32a6cd2364cfc61c7d20152dd05aed60950e8da92802820e9f841200cba0d431f449fb45f406589339b1e56469ff7e0ca526c15629 SHA512 6d00475aab927daaff770203eeb9e719440c47013f98644cb0a44f95e1b6315242dfa3f560ca6a9b3bf1ba6d73fc96fac612abcbb3fac2684e9541333fc07eaa
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/gnome-extra/gnome-shell-extensions/files/gnome-shell-extensions-41.1-meson-0.61.patch b/gnome-extra/gnome-shell-extensions/files/gnome-shell-extensions-41.1-meson-0.61.patch
new file mode 100644
index 000000000000..692f828ecd7f
--- /dev/null
+++ b/gnome-extra/gnome-shell-extensions/files/gnome-shell-extensions-41.1-meson-0.61.patch
@@ -0,0 +1,12 @@
+Rebased version of https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/commit/cdaa837d48894737ca0b4e7d2dfb365119e53759
+https://bugs.gentoo.org/831938
+
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -1,5 +1,5 @@
+ session_desktop = 'gnome-classic.desktop'
+-i18n.merge_file('',
++i18n.merge_file(
+   input:  session_desktop + '.in',
+   output: session_desktop,
+   po_dir: '../po',
diff --git a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-40.4-r1.ebuild b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-40.4-r1.ebuild
deleted file mode 100644
index 95dea1595032..000000000000
--- a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-40.4-r1.ebuild
+++ /dev/null
@@ -1,67 +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 https://extensions.gnome.org/ web interface, the
-gnome-extra/gnome-tweaks GUI, 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-shell-extensions/gnome-shell-extensions-41.1.ebuild b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-41.2.ebuild
index aea37b082f55..9b2f0bc48e2e 100644
--- a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-41.1.ebuild
+++ b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-41.2.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell/Extensions"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 
 DEPEND="
 	>=dev-libs/glib-2.26:2
@@ -46,6 +46,10 @@ https://extensions.gnome.org/ web interface, or modify the
 org.gnome.shell enabled-extensions gsettings key from the command
 line or a script."
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-41.1-meson-0.61.patch
+)
+
 src_configure() {
 	meson_src_configure \
 		-Dextension_set=all \
diff --git a/gnome-extra/gnome-shell-frippery/Manifest b/gnome-extra/gnome-shell-frippery/Manifest
index 6bcada01cd6f..c9793d3e93c3 100644
--- a/gnome-extra/gnome-shell-frippery/Manifest
+++ b/gnome-extra/gnome-shell-frippery/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-shell-frippery-40.2.tgz 82612 BLAKE2B 9bb92df42ca3702743d4e5a497d1de610e4909dedf7c96ac74eb374d6d9cbcbb13d9aded266602cab10a73bfbc018dee84fc07e1ec44184c2ad89b60c8880d9b SHA512 d6136dbaf798d87a2c4c3e8a1e09875759a877e77904f3f96843e0d86720213453139a9376aafa4c13a3defb0457f0ed6a659e47afed2f30a244e31266c69dda
 DIST gnome-shell-frippery-41.1.tgz 82583 BLAKE2B 74d08c904712d51e53609f50b581cd60ef8fb62af8122ed3101896c8c6bf0c8fa8e69152c51496365011a98a2ed91ee2bb7b49d0ea58d3c231505e0a94c393c6 SHA512 769bb336b4abc2557b451401ac66050b3a6a9b33b9a80643e1e4054dd804b94b13a94ad576706570c1cd1da3c4912841d9fe4d011e834fe22ce7343f7a240a27
-EBUILD gnome-shell-frippery-40.2.ebuild 983 BLAKE2B 889eb440aee336e20f6d260142b5ad38ef6e214a758d965addb8b0b2b2b77d3c0aca3ff0194c0460aa46dd86dba83283278b1cf292dde1d6f60817cc9d763e90 SHA512 22c455b87a28a60e01791116fd0bbed0fb4b8dbd8c3f1f76536e0534aed4b0e579402463737f825b6979b358fa4b95589a081af77b29db41dc811f5a0e9856f2
-EBUILD gnome-shell-frippery-41.1.ebuild 970 BLAKE2B 84c0f9145b7de6119601099428d590f9c57c9840346ad69622b02790c491df98159ba17f5cc77bdc6fceac452f83afacfe6c55fa4d91009f2b9a6031c032fe08 SHA512 5671ecfe88f8a9d2cb0fd77c2bb5d7952bfc5e217993f74f9e296596666d5937f1928394f58360a40027e6d52a8410e27990355437bb320283407113733b7032
+EBUILD gnome-shell-frippery-41.1.ebuild 968 BLAKE2B f44d082d81e53a08ddcba5797aab92df5df32a4f7670370f92c8599818ce093a9bc4acd768114566a82d841b47f4e43aef896cde5afdcb3376d7669b68e3b5aa SHA512 555266695ba4875e2c7008efcd3f43bad5514b230f1be3fe7bdd673495f9141afa4c0d97435822da54a62e560034fae5d1feb3d7d4634c69228e98ba7e664732
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-40.2.ebuild b/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-40.2.ebuild
deleted file mode 100644
index 985601cff4bc..000000000000
--- a/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-40.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Unofficial extension pack providing GNOME 2-like features"
-HOMEPAGE="http://frippery.org/extensions/index.html"
-SRC_URI="http://frippery.org/extensions/${P}.tgz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	app-eselect/eselect-gnome-shell-extensions
-	>=dev-libs/gjs-1.29
-	dev-libs/gobject-introspection:=
-	gui-libs/gtk:4[introspection]
-	gnome-base/gnome-menus:3[introspection]
-	=x11-wm/mutter-$(ver_cut 1)*[introspection]
-	=gnome-base/gnome-shell-$(ver_cut 1)*
-	media-libs/clutter:1.0[introspection]
-	x11-libs/pango[introspection]
-"
-DEPEND=""
-
-S="${WORKDIR}/.local/share/gnome-shell"
-
-src_install() {
-	insinto /usr/share/gnome-shell/extensions
-	doins -r extensions/*@*
-	dodoc gnome-shell-frippery/{CHANGELOG,README}
-}
-
-pkg_postinst() {
-	ebegin "Updating list of installed extensions"
-	eselect gnome-shell-extensions update
-	eend $?
-}
diff --git a/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-41.1.ebuild b/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-41.1.ebuild
index 2fcaa73149ba..46b91da32cf7 100644
--- a/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-41.1.ebuild
+++ b/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-41.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
@@ -9,7 +9,7 @@ SRC_URI="http://frippery.org/extensions/${P}.tgz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/gnome-extra/gnome-software/Manifest b/gnome-extra/gnome-software/Manifest
index 6c647e9909bc..38629d108383 100644
--- a/gnome-extra/gnome-software/Manifest
+++ b/gnome-extra/gnome-software/Manifest
@@ -1,3 +1,3 @@
-DIST gnome-software-40.4.tar.xz 3108460 BLAKE2B 696736d94fe245f98a619a58c8df1a3c6196a9f3f07ccc82f0c92c3226ab4914ee5bdbf2f6414b8e8fca99215451d08ef03b164b5cd885af36d69b1cc9043b7a SHA512 5ef7ad754cb161ad5e181dc9b189fe57066a92ebbe3a5871412b638896a02d6e9114e5fdce91e3225af990a580a1f534b936008ff3a2d50a59154406f055a3e7
-EBUILD gnome-software-40.4.ebuild 2867 BLAKE2B d8a554fc78b90119096851fba15410f6cf4f9ed2c42d05fbf1f282cbba3b800fe0f177af3db93dc5513869f01b3f2b471426581f31500d0c4c7a1983e619e34c SHA512 8a4c87e6443f45e2a45ceb39d7cd7f5a141a9476155d4242200939d3060f5b9f5327140f2ce7333a095aed9f3b5152fc44f694bbfa94a077c743227d39749ad8
+DIST gnome-software-41.4.tar.xz 3243380 BLAKE2B a8511c776d902639a01b1194e7dd23f22e98c6fa5fd0624cf9d7b7ae96f0ca313eb139a396e4bf8c7b2ec94db66a3f6ef89a8d77cbd1820291f01cd6c70ec2db SHA512 97c51fd21bd5fd2f7d11e00811747992ff0e404380f84cda07e5c7cae3962034c9169ebad95f875056233c9b1d44347a0c15c61e0f018bb3128e7c7d5d3c74b2
+EBUILD gnome-software-41.4.ebuild 2833 BLAKE2B de6ab68841f924484e15ea7b899f3c2b82177bf1f0fc0420dd5bd2c97b4a600bcb623415d5ac12dcd6c40058f06f9dc66f89d39c7e34de1154104bd001df4fe1 SHA512 5151920c8cf7a9ec7f235b0b267b72857a76c42d8a372cf94d7717d29a1b777a04bf406495a6ea5a6e86d7ddfe4e54c0946666810b70f5d0a795f51a5c39ea1b
 MISC metadata.xml 579 BLAKE2B 4ac8aea21122da6a03605961d9f47721a06a4c49ffdc1ffa16eee5a473f5e5957c69760ee7d19e087688fe2b479a16f4cf417cbe0e2d3e149b0339881fecd2fc SHA512 3f783e0f7fbec5a95f498d622885de19babf8f786a66af2d3755907d242df0433a910b07c2628854ed1038920417d7d28c35c10f18adfcbd37e8922aa3c9253d
diff --git a/gnome-extra/gnome-software/gnome-software-40.4.ebuild b/gnome-extra/gnome-software/gnome-software-41.4.ebuild
index 4f2ba4e19e8a..69002ba173ae 100644
--- a/gnome-extra/gnome-software/gnome-software-40.4.ebuild
+++ b/gnome-extra/gnome-software/gnome-software-41.4.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
@@ -18,12 +18,11 @@ 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=
+	>=gui-libs/libhandy-1.2.0:1=
 	sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 )
 	gnome? ( >=gnome-base/gsettings-desktop-schemas-3.18.0 )
 	spell? ( app-text/gspell:= )
@@ -72,7 +71,6 @@ src_configure() {
 		$(meson_use flatpak)
 		-Dmalcontent=false
 		-Drpm_ostree=false
-		-Dodrs=false
 		$(meson_use udev gudev)
 		-Dapt=false
 		-Dsnap=false
@@ -83,6 +81,7 @@ src_configure() {
 		-Ddefault_featured_apps=false # TODO: Will this be beneficial to us with flatpak at least? If enabled, it shows some apps under installed (probably merely due to /usr/share/app-info presence), but launching and removal of them is broken
 		-Dmogwai=false #TODO?
 		$(meson_feature sysprof)
+		-Dprofile=''
 	)
 	meson_src_configure
 }
diff --git a/gnome-extra/gnome-system-monitor/Manifest b/gnome-extra/gnome-system-monitor/Manifest
index 5b8124eff6f0..187d8f27385c 100644
--- a/gnome-extra/gnome-system-monitor/Manifest
+++ b/gnome-extra/gnome-system-monitor/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-system-monitor-40.1.tar.xz 763720 BLAKE2B 50d69ed95173301a566078d5bf32c48c011eb297a7fcb598dad1c515ee2900731362c9637dbf7793bb95d31a5584f7f84192b1c726b1a8362dc364b695f54263 SHA512 a6c870ae4e58c5fabdc87c290e10326b051398b3408f7ff159c854eef5c7940371e83766f37c6a713631d49ee5ee7b2670f441a462e2453fa849cba2f3255be4
 DIST gnome-system-monitor-41.0.tar.xz 774644 BLAKE2B 9aafaaf77b414435301eebd8bc84f04faa171139a7d9e6e71ad9bae8f097eaf6d637502ab64f0868636f7964a2b76353364ad27ee2b56c3d8f9131e0a7ee1df2 SHA512 1eecddc479f0d9e986f1821a8c4b72246a6995f7853a6b35c8435d1aaa1afd7bc1df0cc0b9748785e4581563985652be19beb12b193ee17439ba4564febf5d20
-EBUILD gnome-system-monitor-40.1.ebuild 1219 BLAKE2B 6a6ea5297b2d78b5d663c84c62d93aa0f8e47c63d28ae2027d6d0ef77da19c790d6443daa483028e7b9bfc196d2837dc76734f64192479128a1493c53b2cbc61 SHA512 9e3ae1b4fcf6c2beecc3e15ee76b6e9dfc3bb8f9ae2009bd40951c4dc192aa5263fd6b1aa3b8c1ee23ebd3b1dfd9ab149a89b7f443ac270a3dd074c2a0d90292
-EBUILD gnome-system-monitor-41.0.ebuild 1221 BLAKE2B 60d5de799d0ebd0da1986916454dcb8cd481ae519e4e5f0755fb4a2477b04c1fe81aeceb08fc989c971988d8869cbbf642fa0bd8a98c785bce6ff18f644e75ba SHA512 ab2ed8af09bacfa15949ea76b030e5dbc42e4e551787ba2697d3d9f751fb29e3a29b9397986dae2315952631e3aff85779bf327b647f2bdeec278ef502c51bc9
+EBUILD gnome-system-monitor-41.0.ebuild 1218 BLAKE2B 4be801cd19ce9f284a58bdd8ec60bda0a0c3a21b901445d1884d03f3f663221b1184a92e7897418c18a75a68c9f73c7b789968db23b8cfe0fbc35766721fef7c SHA512 0f54159ba0465b192b322cb472f9e8495ad871097cb990daef3bd2b6522ad3896cac0d4f7cdad2485bceb98d578ba92c056167f3a097fd50fd0fc89c6ff1da84
 MISC metadata.xml 379 BLAKE2B 6427637b2adc503ee411ddf8897458780db85a500e2cf7ec23c96640cb01ba718a2adba649cd112fae3e8405ba89539dc712d4d955f5e36f0b1719ce4afdada1 SHA512 0b64ee41da44fb823f9e34f2571e26c04d901709ca2b1242e27daae3ca7c7767e5df8f809f20316a135a72debd81bc629a0c218860d3288e4636bc3e3681d248
diff --git a/gnome-extra/gnome-system-monitor/gnome-system-monitor-40.1.ebuild b/gnome-extra/gnome-system-monitor/gnome-system-monitor-40.1.ebuild
deleted file mode 100644
index 18c7d1f16eb6..000000000000
--- a/gnome-extra/gnome-system-monitor/gnome-system-monitor-40.1.ebuild
+++ /dev/null
@@ -1,54 +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="The Gnome System Monitor"
-HOMEPAGE="https://help.gnome.org/users/gnome-system-monitor/stable/"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="systemd X"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
-
-RDEPEND="
-	>=dev-cpp/glibmm-2.46:2
-	>=dev-libs/glib-2.56.0:2
-	>=x11-libs/gtk+-3.22:3[X(+)]
-	>=dev-cpp/gtkmm-3.3.18:3.0
-	>=dev-cpp/atkmm-2.28:0
-	>=gnome-base/libgtop-2.37.2:2=
-	>=gui-libs/libhandy-1.0.0:1=
-	>=gnome-base/librsvg-2.35:2
-	>=dev-libs/libxml2-2.0:2
-	X? ( >=x11-libs/libwnck-2.91.0:3 )
-	systemd? ( >=sys-apps/systemd-44:0= )
-"
-# eautoreconf requires gnome-base/gnome-common
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/glib-utils
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	>=sys-auth/polkit-0.114
-" # polkit needed at buildtime for ITS rules of policy files, first available in 0.114
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use X wnck)
-		$(meson_use systemd)
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/gnome-system-monitor/gnome-system-monitor-41.0.ebuild b/gnome-extra/gnome-system-monitor/gnome-system-monitor-41.0.ebuild
index 3b074de77b55..be5bd4a7a192 100644
--- a/gnome-extra/gnome-system-monitor/gnome-system-monitor-41.0.ebuild
+++ b/gnome-extra/gnome-system-monitor/gnome-system-monitor-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
@@ -10,7 +10,7 @@ HOMEPAGE="https://help.gnome.org/users/gnome-system-monitor/stable/"
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE="systemd X"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	>=dev-cpp/glibmm-2.46:2
diff --git a/gnome-extra/gnome-tweaks/Manifest b/gnome-extra/gnome-tweaks/Manifest
index 99423306626f..aeb18288d40a 100644
--- a/gnome-extra/gnome-tweaks/Manifest
+++ b/gnome-extra/gnome-tweaks/Manifest
@@ -1,5 +1,7 @@
 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 1393 BLAKE2B b4848ee8644ea7ff366472a2b251c867b5d209ad2aa56a2713bc3a5ac0a979ee4715200817a73f9686d12353df3d84b5537f01dcb4ba40de50df116412308947 SHA512 e191fa4643d842bbe515649473f518f7007e2399e56c1f255a5fb6a6f6feb2269342096c3b99edd3c6e0ab0aaeb5b054e19cda2afa640045175af95aeed098e3
+DIST gnome-tweaks-40.10.tar.xz 251712 BLAKE2B 7e9e04b86ffcff25cafd2a6dfc0c7be14c8caa4ae003369c34ed2c40c36ce857b05de9994f7c2187cbdd535f464b92f782ec91b835318c2b5d2219ad817fbe56 SHA512 1247933ad2f93bd7817af367d715468591840df4840d45641033ca19ea26c64239828ba3e24fafb8694014a98024b911266c314172ba8e37d6c4165e7e6e8a29
+EBUILD gnome-tweaks-40.0.ebuild 1392 BLAKE2B 78eb50a92f55665a95e11d08b4770c5558690f0ec9868432de4225b14c6d831ac3480cf5c3afadda2fdfcd0f403e5983ce8daa04866e757dbd31fafa80994aef SHA512 ccff3f0cc0aaffc9f994ef971222c0ac2813366553a2d5c4925308609d037d83e12a30cfa14669842931deeed3dd3f3ef2088a275b396e402bfee392171b66bd
+EBUILD gnome-tweaks-40.10.ebuild 1351 BLAKE2B 7e48ef65d327c8516e9efc04329f0786e0972ac44e2dbfa74cdbfdd93c06a6441eaaf729ccfac746f6f9f68bf5b12ec8c605646138ef782e95b6d00e3c72201d SHA512 5787088aa284ed5f3c3c41ae1994954c2aab1e568690a76f2c43f0cc926ca202199d9a552e767d5eba72d51b39c18c36d0462fe58d635ade871f59ac9dcd28d4
 MISC metadata.xml 557 BLAKE2B 377b3b95f3dfade66ceb83a955bae45820c7db9cb286fbc9fb7f597909d6e58b3ccbdde1acc5bc01bda97bcde90a062a8e4676c8593edfc95c46f27c311ca83e SHA512 9a24c8eedb00ba7ceaba017cfeef778a7def43d7baf62c23067376f7648fad3b333e16a9dc4f8c41f66279b4bbe8acf54844ab5460d56366d32c325ea5d06e2d
diff --git a/gnome-extra/gnome-tweaks/gnome-tweaks-40.0.ebuild b/gnome-extra/gnome-tweaks/gnome-tweaks-40.0.ebuild
index 68e456f9a872..e290c8ab5396 100644
--- a/gnome-extra/gnome-tweaks/gnome-tweaks-40.0.ebuild
+++ b/gnome-extra/gnome-tweaks/gnome-tweaks-40.0.ebuild
@@ -14,7 +14,7 @@ SLOT="0"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 
 DEPEND="${PYTHON_DEPS}"
 # See README.md for list of deps
diff --git a/gnome-extra/gnome-tweaks/gnome-tweaks-40.10.ebuild b/gnome-extra/gnome-tweaks/gnome-tweaks-40.10.ebuild
new file mode 100644
index 000000000000..30feae50500c
--- /dev/null
+++ b/gnome-extra/gnome-tweaks/gnome-tweaks-40.10.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit gnome.org gnome2-utils meson python-single-r1 xdg
+
+DESCRIPTION="Customize advanced GNOME options"
+HOMEPAGE="https://wiki.gnome.org/Apps/Tweaks"
+
+LICENSE="GPL-3+ CC0-1.0"
+SLOT="0"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+DEPEND="${PYTHON_DEPS}"
+# See README.md for list of deps
+RDEPEND="${DEPEND}
+	$(python_gen_cond_dep '
+		>=dev-python/pygobject-3.10.2:3[${PYTHON_USEDEP}]
+	')
+	>=gnome-base/gnome-settings-daemon-3
+	x11-themes/sound-theme-freedesktop
+
+	>=dev-libs/glib-2.58:2
+	>=x11-libs/gtk+-3.12:3[introspection]
+	>=gnome-base/gnome-desktop-3.30:3[introspection]
+	gui-libs/libhandy:1[introspection]
+	net-libs/libsoup:2.4[introspection]
+	x11-libs/libnotify[introspection]
+
+	>=gnome-base/gsettings-desktop-schemas-40.0
+	>=gnome-base/gnome-shell-3.24
+	x11-wm/mutter
+"
+BDEPEND=">=sys-devel/gettext-0.19.8"
+
+PATCHES=(
+	"${FILESDIR}"/3.28.1-gentoo-cursor-themes.patch # Add contents of Gentoo's cursor theme directory to cursor theme list
+)
+
+src_install() {
+	meson_src_install
+	python_optimize
+	python_fix_shebang "${ED}"/usr/bin/
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/gnome-extra/gnome-user-docs/Manifest b/gnome-extra/gnome-user-docs/Manifest
index 744496172223..d10b5063e68d 100644
--- a/gnome-extra/gnome-user-docs/Manifest
+++ b/gnome-extra/gnome-user-docs/Manifest
@@ -1,5 +1,3 @@
-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.5.ebuild 936 BLAKE2B 5ed71e6738ceff62527e672a8934fbd2250be68a276f340be725cb6d0adcb78028c47b02e50552c157180ec27a39950fdb44fd887c665e1e9d48980a3e2aa65f SHA512 765e271a48d49b2047f1e1c5968c9570dac6c6c876d1d10284e7a7de57db0db36cbbf0a080224a64c1a4eb500cde9f5c29bdd99898ba06142c2eac8add2f7e24
-EBUILD gnome-user-docs-41.1.ebuild 945 BLAKE2B 8cf285e1ae36038670c31156fb06beff40f25111da8311eeb9340cb46bac239be3381ae6a037cd491bdb0c47002ea9bf04646b36fdd48a91f5367f59da711593 SHA512 fe0a2534cdc8477a9b343734fa4c6dc3839d5416e1be9389783e4a02a2b3de4ac0b8e8bc36b0247dc1e66e17e8b533ceb6316fae06df624b34877defd2c912a2
+DIST gnome-user-docs-41.2.tar.xz 9407232 BLAKE2B 81c6d638e6cf3011cf4f2ee835c293fd0152435d2f4d07e7bc403882e378d140d7e03fbaca7f87e23f6c65d104dc7be4a2bc0902a3e1a5ab42815ceb250ff4b0 SHA512 982fa4c491a530df0067c3f437c961f84c393f1f95895e86f348609fa0407ffa6a33dbc961c87c5083180d4ad1a069ec2886d0ec841e9c965f21cb0b55322f4b
+EBUILD gnome-user-docs-41.2.ebuild 942 BLAKE2B 978c25c4ed533255a16ee88e7f670ee92c8e838c9b0c884645fd1477e91f1e63558c5e2cc21ca2e407098b97bc5e18dfd70b422614a7999221022fe767dbcc2b SHA512 72898d7193955b3d5bac304e4bbd2283de883ec8b4d97bc8ea8071b05d6be6a790e3255c29a89b03476db7459515e85c7dacf997b4e78388e5fb78a32d73dc45
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/gnome-extra/gnome-user-docs/gnome-user-docs-41.1.ebuild b/gnome-extra/gnome-user-docs/gnome-user-docs-41.1.ebuild
deleted file mode 100644
index 63ac52f4afea..000000000000
--- a/gnome-extra/gnome-user-docs/gnome-user-docs-41.1.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 ~riscv ~sparc ~x86"
-IUSE="test"
-
-BDEPEND="test? ( dev-libs/libxml2 )"
-# eautoreconf requires:
-#	app-text/yelp-tools
-# rebuilding translations requires:
-#	app-text/yelp-tools
-#	dev-util/gettext
-
-# This ebuild does not install any binaries
-RESTRICT="binchecks strip
-	!test? ( test )"
-
-src_configure() {
-	# itstool is only needed for rebuilding translations
-	# xmllint is only needed for tests
-	gnome2_src_configure \
-		$(usex test "" XMLLINT=$(type -P true)) \
-		ITSTOOL=$(type -P true)
-}
-
-src_compile() {
-	# Do not compile; "make all" with unset LINGUAS rebuilds all translations,
-	# which can take > 2 hours on a Core i7.
-	return
-}
diff --git a/gnome-extra/gnome-user-docs/gnome-user-docs-40.5.ebuild b/gnome-extra/gnome-user-docs/gnome-user-docs-41.2.ebuild
index f9a0f49950e9..5087dc81bc50 100644
--- a/gnome-extra/gnome-user-docs/gnome-user-docs-40.5.ebuild
+++ b/gnome-extra/gnome-user-docs/gnome-user-docs-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
@@ -9,7 +9,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-user-docs"
 
 LICENSE="CC-BY-3.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
 IUSE="test"
 
 BDEPEND="test? ( dev-libs/libxml2 )"
diff --git a/gnome-extra/gnome-user-share/Manifest b/gnome-extra/gnome-user-share/Manifest
index 890e1e19df99..c7a85cd78a07 100644
--- a/gnome-extra/gnome-user-share/Manifest
+++ b/gnome-extra/gnome-user-share/Manifest
@@ -1,4 +1,5 @@
-AUX gnome-user-share-3.18.1-no-prefork.patch 553 BLAKE2B 201db9747d9bf68ac9421a6bd0341d2c4ab42b2eb5ca331deac58f669a02bdf559fc29e01cd028bcfd3494733e76bf649d4ca77836307e219c7060554b251583 SHA512 f1a8156d09e0f7dad2422b79000f34843567a7e0b66838774e03576a81cc243a52e0bf52d88bf7be98f2454e3119b3080a6c72c1320faf6ab5e4494d7be4fe0b
+AUX fix-build-with-meson-0.61.patch 224 BLAKE2B 9c7cd30c4703eab7949ebc6ac771b72c021d0845bf4fedf2aaa046713b174bbe892dd3147fc5583b22ac29a21dbfa4f966e0f4deda189b37adff92b34fcb5b32 SHA512 48ab3d7c9f793d52b1be0f31a46cb81ff66e54a420a12a3b45fadbed1022456c859370a7832f0f2d198ec362d126e83eb888ef8e84534d33c56727deb51a27b7
+AUX gnome-user-share-3.18.1-no-prefork.patch 450 BLAKE2B 2b3f7ae96c09599e67e39bb6fec3085bfee944ef5c01a58517c4f49e8b415c10e6cc2543ca808957dc61afb6e584817a6c369f269f449ac01b707d02155ecbbf SHA512 2707eba2cbbb2cba57562dea3e2bf6ff677669aefe4c4e52c236a9f3b6bb008036ef3eefa1a8f5dc675d2ad2157415816c75817a17daaf9c2398624cd86e3946
 DIST gnome-user-share-3.34.0.tar.xz 109560 BLAKE2B 02d0788ff6b4b1a87ebd1d5dee2a853ce0418a553aa2be262227f0b8984ed8bcf84bec774b43952425e96d8b14f4100fd42e0dbec02cc91e67e0881f9155005d SHA512 7aa5f0cad4b96af41b5e4b4a125cb7a9d7a7c27ba10cdf7c4acd2aaffe5bfb3494c9319b997e547c996017827383f7653905c3e0af67c65922635b7ac49803f5
-EBUILD gnome-user-share-3.34.0.ebuild 1320 BLAKE2B 51d2c7841977a3e2641f0e491f217ab7eb123db3b3aab3ec381b9261ed4fc0741200c6a63643820930ce5863b9aee2ef92cbdc8ff423b16af61158f8fc4c037f SHA512 bf57628bf53b0f814664ebc8612976392df5312d6cd9efe9b249ebf2928957f16000ef69ae8b5dcfd5706ae8cc44ebd686d77086fa40a3b613b116a475553f81
+EBUILD gnome-user-share-3.34.0.ebuild 1366 BLAKE2B 260076c25d789d880b1f0f13e4670ede3af95275339f50c0189d44696a0540ddc292e3b7b8c3e0fd0796c42ab7a774a57e024819816dc310211c17db4081f6d2 SHA512 8c78cc89a475bea9c7fc6f43b85553467c37af02b76cd21c6c4bdde1ade1e4479e2315ec1d6227be8ae1ff30cfc0e7c3554cdf94cdaa1a4c0e7c9ac225bdf051
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/gnome-extra/gnome-user-share/files/fix-build-with-meson-0.61.patch b/gnome-extra/gnome-user-share/files/fix-build-with-meson-0.61.patch
new file mode 100644
index 000000000000..2721f2ac876f
--- /dev/null
+++ b/gnome-extra/gnome-user-share/files/fix-build-with-meson-0.61.patch
@@ -0,0 +1,11 @@
+https://bugs.gentoo.org/831939
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -7,7 +7,6 @@ desktop_in = configure_file(
+ )
+ 
+ i18n.merge_file(
+-  desktop,
+   type: 'desktop',
+   input: desktop_in,
+   output: '@BASENAME@',
diff --git a/gnome-extra/gnome-user-share/files/gnome-user-share-3.18.1-no-prefork.patch b/gnome-extra/gnome-user-share/files/gnome-user-share-3.18.1-no-prefork.patch
index 156721d286cf..ca5eff008aa0 100644
--- a/gnome-extra/gnome-user-share/files/gnome-user-share-3.18.1-no-prefork.patch
+++ b/gnome-extra/gnome-user-share/files/gnome-user-share-3.18.1-no-prefork.patch
@@ -1,10 +1,11 @@
---- gnome-user-share-3.14.2/data/dav_user_2.4.conf.orig 2015-06-03 20:21:27.512774376 -0600
-+++ gnome-user-share-3.14.2/data/dav_user_2.4.conf      2015-06-03 20:21:33.588774303 -0600
-@@ -9,7 +9,6 @@
- LimitXMLRequestBody 100000
- 
- LoadModule unixd_module ${HTTP_MODULES_PATH}/mod_unixd.so
--LoadModule mpm_prefork_module ${HTTP_MODULES_PATH}/mod_mpm_prefork.so
- LoadModule dav_module ${HTTP_MODULES_PATH}/mod_dav.so
- LoadModule dav_fs_module ${HTTP_MODULES_PATH}/mod_dav_fs.so
- LoadModule authn_core_module ${HTTP_MODULES_PATH}/mod_authn_core.so
-\ No newline at end of file
+https://bugs.gentoo.org/551012
+--- a/data/dav_user_2.4.conf
++++ b/data/dav_user_2.4.conf
+@@ -9,7 +9,6 @@
+ LimitXMLRequestBody 100000
+ 
+ LoadModule unixd_module ${HTTP_MODULES_PATH}/mod_unixd.so
+-LoadModule mpm_prefork_module ${HTTP_MODULES_PATH}/mod_mpm_prefork.so
+ LoadModule dav_module ${HTTP_MODULES_PATH}/mod_dav.so
+ LoadModule dav_fs_module ${HTTP_MODULES_PATH}/mod_dav_fs.so
+ LoadModule authn_core_module ${HTTP_MODULES_PATH}/mod_authn_core.so
diff --git a/gnome-extra/gnome-user-share/gnome-user-share-3.34.0.ebuild b/gnome-extra/gnome-user-share/gnome-user-share-3.34.0.ebuild
index c3f33f67da0d..d18fc0340e76 100644
--- a/gnome-extra/gnome-user-share/gnome-user-share-3.34.0.ebuild
+++ b/gnome-extra/gnome-user-share/gnome-user-share-3.34.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
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-user-share"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 IUSE=""
 
 # FIXME: could libnotify be made optional ?
@@ -33,6 +33,7 @@ PATCHES=(
 	# that is problematic for us (bug #551012)
 	# https://bugzilla.gnome.org/show_bug.cgi?id=750525#c2
 	"${FILESDIR}"/${PN}-3.18.1-no-prefork.patch
+	"${FILESDIR}"/fix-build-with-meson-0.61.patch
 )
 
 src_configure() {
diff --git a/gnome-extra/gnome-weather/Manifest b/gnome-extra/gnome-weather/Manifest
index bad9225396ac..0edf6256ba7c 100644
--- a/gnome-extra/gnome-weather/Manifest
+++ b/gnome-extra/gnome-weather/Manifest
@@ -1,6 +1,4 @@
 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.1.ebuild 1371 BLAKE2B 0b44742ad803ff856f973ccddb9cf8d0fa95546bb485b88eb7cbccb127887d63e321aa922f0ed6172597489bc45a9b65e8e797bdbe951ad3603081b12df1a0d7 SHA512 05efa37eb207d20ac68884449fb2f0cc50bffbed0b1a1ff670662c6c2115919e18ea01b5c424972c536a76164da8612f9874f76c6b3b238521d0ffc77ad11c02
-EBUILD gnome-weather-41.0.ebuild 1441 BLAKE2B fe25981ceed86ae76e611b720252b2c6f05a2de8c9e5e648024dcbda6bcdd36bb45af4d2a89a299abbc2a6ea68b47c2fd57fe347b0ebb83d9b5f0ddd13043157 SHA512 797514267620f3e09d2138b972a8df937df4fddd0845729c4ef8d725ca3c8ee047618aa459ddbe169b517a0c852099239c980bbf86a8ffcb0529d04fda646521
+EBUILD gnome-weather-41.0.ebuild 1438 BLAKE2B 8d9d61fba786d3a290ab7f32ee524dc10f915fe052310600a59af893f231d5431f98f35b1816f8653ae5c7aaa16e66962116cbc0a6c0ad57abcc98385dc2ab89 SHA512 48488d4616a23d69ac6ea37c84c360509341183b65cbedf5471bc62c87b985af5569269c213f7368b71e90b3afa41977ff2a1db5d4a47368f5e8b13c948c060c
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/gnome-extra/gnome-weather/gnome-weather-40.1.ebuild b/gnome-extra/gnome-weather/gnome-weather-40.1.ebuild
deleted file mode 100644
index 9899247ecc28..000000000000
--- a/gnome-extra/gnome-weather/gnome-weather-40.1.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-40.0:=
-	>=gui-libs/libhandy-1.1.90:1=
-"
-RDEPEND="${DEPEND}
-	gnome-base/gsettings-desktop-schemas
-"
-# libxml2 required for glib-compile-resources
-BDEPEND="
-	dev-libs/appstream-glib
-	dev-libs/libxml2:2
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-# Tests have a lot of issues, starting with reliance on a system installation,
-# accessing the network and other intermittent failures with network-sandbox disabled
-# https://gitlab.gnome.org/GNOME/gnome-weather/issues/67 (and rest not filed)
-# test dep: $(python_gen_any_dep 'dev-util/dogtail[${PYTHON_USEDEP}]')
-# With 3.34, this is now behind a dogtail option we can pass (and have data validation)
-
-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 59f506be80f2..dfb941231680 100644
--- a/gnome-extra/gnome-weather/gnome-weather-41.0.ebuild
+++ b/gnome-extra/gnome-weather/gnome-weather-41.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Design/Apps/Weather"
 
 LICENSE="GPL-2+ LGPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 
 DEPEND="
 	>=dev-libs/glib-2.32:2
diff --git a/gnome-extra/gucharmap/Manifest b/gnome-extra/gucharmap/Manifest
index ac82016a94d9..3f5c32083627 100644
--- a/gnome-extra/gucharmap/Manifest
+++ b/gnome-extra/gucharmap/Manifest
@@ -2,10 +2,8 @@ AUX 14.0.1-fix-file-conflicts.patch 699 BLAKE2B a276814cd000ebc34b38b4031e478139
 AUX 14.0.1-install-user-help.patch 749 BLAKE2B 954bae11770bccdbf5babea1c06cc829ef069777a52542ffb683ca0709300edbfaa452aea7da44497b900dc653c00b129bcdca0ee6808e6d5f610d43437858d6 SHA512 c1fedabf8eff11256cd4a93130db028c3e599f6f0fd249ff8a4533c1ebf7d3f8c17422b3765dbc047f25bd9c4725c43212de585642a246338c7fcd1c78c3d914
 AUX 14.0.1-meson-0.60-fix.patch 785 BLAKE2B 24caa4cb052a4669d6b3e04bd7e7a0825232b0a2659f2968a9ae2f7b2215229bbaf1792bead1a0f73fa27a9db8f3045ad83d7b691fecc187499d883e60aa68b1 SHA512 6d5c4271e7aa8a4cbad8e1af8c18354e9e01477fb0381cc404485a832a47ecb788fe68819e24350555046c64024772d4d6c24a19a32e2cfcc634a32022590b9b
 AUX gucharmap-3.4.1.1-fix-doc.patch 348 BLAKE2B c6bf73a5e9940557fa43da04b8212ca527b9abdfaccf7f1522c9a6dfcb52af8f6c05a56a683621eb64c34452464605d7a5a98b77ab9b67224f5c84acc0b1cf68 SHA512 d6e468ce2bbd258e01be0125a1b16529c89ce9758c24504d91550181af3b3e7c6b0e4171d3b26c252339f099927d43a7184f967764d564a4ebf28610968d8d27
-DIST gucharmap-13.0.8.tar.gz 1920107 BLAKE2B 247b6683358e1fcbba02cad8146b8b1e7a4ccd5e56d3f9c6e597b47bcd38d11759a02e60d5635c3f2e26defe166b6e4ded696b5d1f6e1be6564d6139e3ed1ab8 SHA512 15eacbf351c8b2357e59913e5b4cccd279aed7a492351c42101dd26020658f2f4d7aaff2a3b95ca340a73606592f47edf9645c93234afb1a086362ef32904bcf
-DIST gucharmap-14.0.1.tar.gz 1925102 BLAKE2B 134d48703efb27d5eb3a19e8d90031d6feb8f0fa7321596efc1209377653590fe5f4191af739f012c1dee15df75e2d70ca2ed8850d30b57cc87b97343716de85 SHA512 5a79afe1a7e9f2a54f7499a578a34db690853f096a9374b335786abd3439812f511222792447f6cc603c2611490d3514d6a179844dd03fbf7f289133e29cf015
+DIST gucharmap-14.0.2.tar.gz 1925142 BLAKE2B 3936c187ecdc104534b80830f9089417e8c2166a8e8dbfc848788a58acd9d65889f1242ecd3a2d9a5f2e657dcc052dee22b3ed543d2113509905a472192b19eb SHA512 4cfcebca0cac5cef8e6601c077a49e12aa56e76fec131ccf5ca1fb11bf40e5df8b6ae5ec83c2b64764c9d223d52824d4007c114ee7d85b4246855b8fc15c6c2d
 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.2.ebuild 1659 BLAKE2B 5bd582b14249e249fbb70dc653196dec4b894381ea95323b7e51a43893587f18d908fd2176600fc832d95bed70e9e59084ffc5b63309424563a792c9e1c6ac94 SHA512 b095807a056006c37da95a83d2a165e02e2c201eee0f634d14d67bb3926c3663095d9ab1b26a402cc96aa45eaaa0577aa14ee34366c2b526333ca4b9a858c7ee
 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-13.0.8.ebuild b/gnome-extra/gucharmap/gucharmap-13.0.8.ebuild
deleted file mode 100644
index 3d55d12f7e08..000000000000
--- a/gnome-extra/gucharmap/gucharmap-13.0.8.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..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="13.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
-	>=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
-}
-
-src_test() {
-	meson_src_test
-}
-
-src_install() {
-	meson_src_install
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/gucharmap/gucharmap-14.0.1-r1.ebuild b/gnome-extra/gucharmap/gucharmap-14.0.2.ebuild
index b276ab3b6f18..19d4d299483f 100644
--- a/gnome-extra/gucharmap/gucharmap-14.0.1-r1.ebuild
+++ b/gnome-extra/gucharmap/gucharmap-14.0.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://gitlab.gnome.org/GNOME/${PN}/-/archive/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="2.90"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86"
 
 UNICODE_VERSION="14.0"
 
@@ -40,7 +40,6 @@ BDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}"/${PV}-meson-0.60-fix.patch
 	"${FILESDIR}"/14.0.1-install-user-help.patch
 	"${FILESDIR}"/14.0.1-fix-file-conflicts.patch
 )
diff --git a/gnome-extra/libgsf/Manifest b/gnome-extra/libgsf/Manifest
index 2dc673f12c09..c992473a535f 100644
--- a/gnome-extra/libgsf/Manifest
+++ b/gnome-extra/libgsf/Manifest
@@ -1,5 +1,3 @@
-DIST libgsf-1.14.47.tar.xz 691448 BLAKE2B 7be095fef159ff7a52f2cf4d83b59b5bb591e0d4fb1d69d88bc6f2eba4286337af2a2c46ac7d6603d5a68b9b6f03d41f647d34b0bee5e61244696c5ba02be569 SHA512 143d48eb02be8202b9eb97e29e5909061a0e1a562b86e4bb4b2eac3fb0a42b139ead131ed1ffa4dfe304b65527089777823122223a74ebbc9df94c17d013f97b
 DIST libgsf-1.14.48.tar.xz 701760 BLAKE2B 762fe424ad45ac9739e1ea2cd9971f80f9c4d573147c6043c6bbf7b416a6c69c3b0bbfa42f6424176a545f7f9e7257d33e62c92482945786bb142063390a9d08 SHA512 6efba54c1427f9bdf71203b265ee4cdaa7366f78f299d38deffb657198244fb6436ab4e077a010079a28832539cdef08796e43feb76450ab0420da56016cd95e
-EBUILD libgsf-1.14.47.ebuild 985 BLAKE2B 2853a0a472b785b671e4bb32b98882279cc37ef8c9e6a85985fa733b9d8c535f12e9cc2748dde22e3f117d444f27d174344bdd21557eb62d2665a316089044e8 SHA512 b7e3fbd56479859ca174a1fd4ce38d4e05b4eececbcddf709f19ecb1b302c66de5ed72a0cda6197fedd2880141522820076903740c8ba9682e6e99303a97f761
-EBUILD libgsf-1.14.48.ebuild 997 BLAKE2B dd3eaeeca69b2ccf6d01eae31ee6987fe79fda8383801d77304c693d261d58a0c346f6db0b89d913ef085c5125168258598e518442e1c24d2cb79b4cef0efcc3 SHA512 ce51d27936dd2f626685b591d3bcd3d93df7272c002147eb2950710a580e63864155c6adf6cb690ad64560d1eee54ee98749bde4cb748ee7b6023cbf59dd9e0b
+EBUILD libgsf-1.14.48.ebuild 1053 BLAKE2B f64d22b99dcf1c4336622707fc389af1c8bc50e286d41505616160c7f8515f4440d0c455bc26ac5a966c1daedfca19e10ac25aa11565c64ae4e90d472b491a5c SHA512 1f26d57a919ffce788887545d808ff4b97b4ba1500443f2e0da58e7ff27d01bca4d5b4c8bfd3c3056f35c5fcb355bd9f703be7a1c2ff25203676634a8a2c37ab
 MISC metadata.xml 321 BLAKE2B 0d1e16740ce0beddcea428308ea06e6a4201a312764ae81ce6cb8e2770319416ea0ab98ac536d85b38ce548a0bf9e2e03319b7aad0b672d1ee3b8f22d932af33 SHA512 64fa3ad72c8d27f271fcef49f9657fd2988f73eb2136c1ef84813b459dfe5bc0a40566efd9c8f0684f0da8c8eb56fcd78586f5947e02664f7663a8d8fc2a1148
diff --git a/gnome-extra/libgsf/libgsf-1.14.47.ebuild b/gnome-extra/libgsf/libgsf-1.14.47.ebuild
deleted file mode 100644
index 6e26ff2caed7..000000000000
--- a/gnome-extra/libgsf/libgsf-1.14.47.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="The GNOME Structured File Library"
-HOMEPAGE="https://developer.gnome.org/gsf/"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0/114" # libgsf-1.so version
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="bzip2 gtk +introspection"
-
-RDEPEND="
-	>=dev-libs/glib-2.36:2
-	>=dev-libs/libxml2-2.4.16:2
-	sys-libs/zlib
-	bzip2? ( app-arch/bzip2 )
-	gtk? (
-		x11-libs/gdk-pixbuf:2
-		virtual/imagemagick-tools
-		)
-	introspection? ( >=dev-libs/gobject-introspection-1:= )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.12
-	dev-libs/gobject-introspection-common
-	>=sys-devel/gettext-0.19.6
-	virtual/pkgconfig
-"
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		$(use_with bzip2 bz2) \
-		$(use_enable introspection) \
-		$(use_with gtk gdk-pixbuf)
-}
diff --git a/gnome-extra/libgsf/libgsf-1.14.48.ebuild b/gnome-extra/libgsf/libgsf-1.14.48.ebuild
index 317027803298..bbb8eb7238de 100644
--- a/gnome-extra/libgsf/libgsf-1.14.48.ebuild
+++ b/gnome-extra/libgsf/libgsf-1.14.48.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=8
@@ -9,8 +9,9 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/libgsf"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0/114" # libgsf-1.so version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="bzip2 gtk +introspection"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="bzip2 gtk +introspection test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-libs/glib-2.36:2
@@ -28,6 +29,7 @@ DEPEND="${RDEPEND}
 	dev-libs/gobject-introspection-common
 	>=sys-devel/gettext-0.19.6
 	virtual/pkgconfig
+	test? ( dev-perl/XML-Parser )
 "
 
 src_configure() {
diff --git a/gnome-extra/nautilus-sendto/Manifest b/gnome-extra/nautilus-sendto/Manifest
index 0f5f95e5e1ae..bc0fbb18e9f5 100644
--- a/gnome-extra/nautilus-sendto/Manifest
+++ b/gnome-extra/nautilus-sendto/Manifest
@@ -1,3 +1,4 @@
+AUX fix-build-with-meson-0.61.patch 372 BLAKE2B d7f593ecd289aebf196968d798fc77c42532de43516a472a5008f722abfea26fe7f61794cc34cf26d738ead9995726c6d4e634f12cd288a7fbd3f77ff431e35a SHA512 c3b3d214f475646c8b8529fffca9852ba2dda3adc647ea729fd01ed6fe0f123c846ddf01a93f54443071cccb61233c5b66d3822ba506cf23ae3d551136a99ca2
 DIST nautilus-sendto-3.8.6.tar.xz 109428 BLAKE2B bc1f0798962d09ca05a64a0db7b98b697c68c7f63239eaf59278ebab7039061cb5b04b0235209db89bf537219039bcc8fff49c9dba2379fcbff32a7f9482dda3 SHA512 c690acdd6d53bde2fc2898362d1030b04312b857924e18735bb330621c64ab63656612a36b646fd34b586af5c34a93bd37c3f969c93bd87c4efe870f55934b92
-EBUILD nautilus-sendto-3.8.6.ebuild 682 BLAKE2B a178f78184579a1c9c249d94c5e2053c67908a3422b9c78ebc37a2aa89bacf36c0cc3da6cb007afcfcd9589925af0ba675555b17a126e47c8342107a046885c9 SHA512 4a55368eff90ad5e522b2a579faf91eb85c0bfb537d77b1010adda6b248e3d955be4dee5f6a80b021e8ad57e13361653a7eb54cc5ca73206cf5c4dce5f8224bf
+EBUILD nautilus-sendto-3.8.6.ebuild 742 BLAKE2B d7ee618d0c5b9eb6811c45cd92924ab5dbdb5259221890e949fd803a8d5065fd84230e65be966b7950a4e9725329356bc2345de7d28e5ca24aa44f0ec366dbd9 SHA512 404506157fb892ff7a01967607a3cc47e93d4176e364c19b50faae0766abda1873f661700a79e970447e324045646920aa4105468a0c2f71f5c57ef3f8a04982
 MISC metadata.xml 254 BLAKE2B de7a97001e5947704f42973c8a0c3a23c2d80afb976254f5fd21e9d372a946e055d4cdc3c0eaed010505f87929b56e8b1e650c945e2a302644adbc9440833be8 SHA512 c81da4f9b80e5691a167f4590906952e25356604ec17689c005be14efb394c0634776bbe84df936edde239480bdf46db41216b00da4a3a45f670e9ca18ab0132
diff --git a/gnome-extra/nautilus-sendto/files/fix-build-with-meson-0.61.patch b/gnome-extra/nautilus-sendto/files/fix-build-with-meson-0.61.patch
new file mode 100644
index 000000000000..556fab877bd1
--- /dev/null
+++ b/gnome-extra/nautilus-sendto/files/fix-build-with-meson-0.61.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/831837
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -7,7 +7,7 @@ executable('nautilus-sendto',
+ 
+ po_dir = join_paths(meson.source_root(), 'po')
+ 
+-i18n.merge_file ('appdata',
++i18n.merge_file (
+                  input: 'nautilus-sendto.metainfo.xml.in',
+                  output: 'nautilus-sendto.metainfo.xml',
+                  install: true,
diff --git a/gnome-extra/nautilus-sendto/nautilus-sendto-3.8.6.ebuild b/gnome-extra/nautilus-sendto/nautilus-sendto-3.8.6.ebuild
index be615119ac23..988f463cb538 100644
--- a/gnome-extra/nautilus-sendto/nautilus-sendto-3.8.6.ebuild
+++ b/gnome-extra/nautilus-sendto/nautilus-sendto-3.8.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,6 +19,10 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 "
 
+PATCHES=(
+	"${FILESDIR}"/fix-build-with-meson-0.61.patch
+)
+
 pkg_postinst() {
 	if ! has_version "gnome-base/nautilus[sendto]"; then
 		einfo "Note that ${CATEGORY}/${PN} is meant to be used as a helper by gnome-base/nautilus[sendto]"
diff --git a/gnome-extra/nemo/Manifest b/gnome-extra/nemo/Manifest
index 08b7028a5735..bcff566d1a95 100644
--- a/gnome-extra/nemo/Manifest
+++ b/gnome-extra/nemo/Manifest
@@ -1,6 +1,6 @@
 AUX nemo-5.0.3-use-detex.patch 252 BLAKE2B 24c27845065f64a58411a8d719fbc1ca41362001f08d469bc336f55601e49358c02ba3aba423c521a261955a5da9832d8ae2df49f3d372270e63256a45fafcda SHA512 142bd88c7843fa40fb30cab01f8f7dd23b2b5c338eae2ac5971c7e392f9f24a8a820ef4b17b1c4afea729cc85a66cb7ddb06ecd417ff6ad494118fe8d88f1498
 DIST nemo-5.0.4.tar.gz 1487156 BLAKE2B 4ecafb315673c0939dfb2585e97957ee9d76e9621fbbece2b93d9ed10b24ec86d2c49cdd8d18ac7c8607184752fe2541508a1b626fdce763fdc8ac1b6e713e49 SHA512 e03558d336785d77c1a57d2d100906263d2015330a00d54e2cc0161d9d822740ef5c314062f90a877cee5b031b4b5caf9ebf59f22fb5e15f2e91c75bb239e488
-DIST nemo-5.2.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
+DIST nemo-5.2.4.tar.gz 1492077 BLAKE2B dc6efb24921d5408938ff5b8660653789a77d6607e2e023d73eb5722a0a8bc75cd22d1241f5e852d0429d05f6ec4fd1abb798b8be1ecf513eeed108a256e506c SHA512 0aa3f7e0c2bdb9d7f1874c17caea0e4a3da062fc243de1f1657bdb83090a1afb099baa404f211092f83cf6852c423b244482faf0ad6beaaddc072cbce17cc6d4
+EBUILD nemo-5.0.4.ebuild 2844 BLAKE2B b32bf937f6e817bc4bce44bccedbc036349655384ce188a19fef65660df243fcda17d363db9f797cb96477217b8d76008c8b7e156d4ff7bfd2ad49533c8bb851 SHA512 086af48bdbf013ebf2ebdac565506593e0b78e3c6abc86a4e09c190f926722ecc850141733286822f6fc8bb4902d6cf67787dface4511a55608116cbe1136baa
+EBUILD nemo-5.2.4.ebuild 3026 BLAKE2B 7a750a94cb8f40249e6acfaa7a3244ab63a9e6206a7fe8dab21c269931f431ac0c92e415ba89e76938016a077cb00103263f8f999f7616d70bb98673e9103829 SHA512 842896fee0253f0b041cf72bbb8129327c0491b47b21b4e38ebf3c368fd8835ba954f9b6effb859e9fd1711d208aeadbadcedb2c0eaee99ef3c10f6abe933ad6
 MISC metadata.xml 580 BLAKE2B da0ac9cd13730b5c1727a6d0431f3289af829b77781baf4d3512c78139bca7b9a7d136563de8e2f5abf914520de8a5a092b1e0f2505558e5e61813fa5f9c09ad SHA512 d38cebfe673764a4a96d66a66afe55f6f04c74bf1d06d8fddc319a2eb9ed351b205e3a48c47bfeff7f3da85c89ad0512e11a420f82c228a548fc7553147b927e
diff --git a/gnome-extra/nemo/nemo-5.0.4.ebuild b/gnome-extra/nemo/nemo-5.0.4.ebuild
index 49839c4d1aa3..a64b12d8ae3d 100644
--- a/gnome-extra/nemo/nemo-5.0.4.ebuild
+++ b/gnome-extra/nemo/nemo-5.0.4.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
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/linuxmint/nemo/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-2+ LGPL-2+ FDL-1.1"
 SLOT="0"
 KEYWORDS="amd64 ~arm64 ~riscv x86"
-IUSE="doc exif +nls selinux test tracker xmp"
+IUSE="exif gtk-doc +nls selinux test tracker xmp"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 # https://github.com/linuxmint/nemo/issues/2501
@@ -61,7 +61,7 @@ BDEPEND="
 	sys-devel/gettext
 	virtual/pkgconfig
 
-	doc? ( dev-util/gtk-doc )
+	gtk-doc? ( dev-util/gtk-doc )
 "
 
 PATCHES=(
@@ -97,7 +97,7 @@ src_configure() {
 		$(meson_use tracker)
 		$(meson_use xmp)
 		$(meson_use selinux)
-		$(meson_use doc gtk_doc)
+		$(meson_use gtk-doc gtk_doc)
 	)
 	meson_src_configure
 }
diff --git a/gnome-extra/nemo/nemo-5.2.3.ebuild b/gnome-extra/nemo/nemo-5.2.4.ebuild
index 47194cd5ea22..1eabe047e65b 100644
--- a/gnome-extra/nemo/nemo-5.2.3.ebuild
+++ b/gnome-extra/nemo/nemo-5.2.4.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
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/linuxmint/nemo/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-2+ LGPL-2+ FDL-1.1"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-IUSE="doc exif +nls selinux test tracker xmp"
+IUSE="exif gtk-doc +nls selinux test tracker xmp"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 # https://github.com/linuxmint/nemo/issues/2501
@@ -61,7 +61,7 @@ BDEPEND="
 	sys-devel/gettext
 	virtual/pkgconfig
 
-	doc? ( dev-util/gtk-doc )
+	gtk-doc? ( dev-util/gtk-doc )
 "
 
 PATCHES=(
@@ -102,7 +102,7 @@ src_configure() {
 		$(meson_use tracker)
 		$(meson_use xmp)
 		$(meson_use selinux)
-		$(meson_use doc gtk_doc)
+		$(meson_use gtk-doc gtk_doc)
 	)
 	meson_src_configure
 }
diff --git a/gnome-extra/nm-applet/Manifest b/gnome-extra/nm-applet/Manifest
index 32244e629bb8..7266c17a8eb2 100644
--- a/gnome-extra/nm-applet/Manifest
+++ b/gnome-extra/nm-applet/Manifest
@@ -1,6 +1,4 @@
 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 1268 BLAKE2B 54412fc36e950cab4cf3eed2640164a9386260ffbf47143eef1cd0e115de11e304212307b6d8633d9579bc9d4e1f481e3a678ab00f74afe0a590b7d223b9129a SHA512 72be709f6ee2709d855982a00dcc26bb2b26a766ae98f498a9bdccc6f91104a0d1ff1d471ada91fbf65f43546782d16e7ffbaef3b514cbc216e96652fa2b457c
-EBUILD nm-applet-1.24.0.ebuild 1273 BLAKE2B 967345056fd32e0cc72a90d9f50b3b1d0a3db33542b28d4e6ee879fb5842a0bd5395026c787353f8aa18036f91cfd7d219ff0e5109b57192d2da09c12bf2d090 SHA512 a16f17d70ac3701e3cc51d8f4939526e9e1c6842929d3864c1d3b7b5204f3dc4acae048f7a6c4536ee926cb668bd5d724ccf67cc2b9750957ceb6590e8d66368
+EBUILD nm-applet-1.24.0.ebuild 1268 BLAKE2B 54412fc36e950cab4cf3eed2640164a9386260ffbf47143eef1cd0e115de11e304212307b6d8633d9579bc9d4e1f481e3a678ab00f74afe0a590b7d223b9129a SHA512 72be709f6ee2709d855982a00dcc26bb2b26a766ae98f498a9bdccc6f91104a0d1ff1d471ada91fbf65f43546782d16e7ffbaef3b514cbc216e96652fa2b457c
 MISC metadata.xml 452 BLAKE2B b17e0338356cd0b24f3de4e1e4d8c13ab7b551707f0309c7a233c28b92cf7b27ef66b36f58717228a11cb76dba2892f23455f50f9dcc6fe7905f312b848f1695 SHA512 2e4fd5feb6f4b6fb8a503b26ac5ef1c388ea699a873ff70ec5144b796b2ff75b7e572a5de5efab60a7844a9bc2d639f6296db97260a0c38f9b37d46c33543d40
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
deleted file mode 100644
index 6498d20d7f96..000000000000
--- a/gnome-extra/nm-applet/nm-applet-1.22.0-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-GNOME_ORG_MODULE="network-manager-applet"
-
-inherit gnome.org meson xdg
-
-DESCRIPTION="NetworkManager connection editor and applet"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="appindicator modemmanager selinux teamd"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 ~riscv ~sparc x86"
-
-RDEPEND="
-	>=dev-libs/glib-2.38:2
-	>=app-crypt/libsecret-0.18
-	>=net-libs/libnma-1.8.27
-	>=x11-libs/gtk+-3.10:3
-	>=dev-libs/libgudev-147:=
-	>=x11-libs/libnotify-0.7.0
-	>=net-misc/networkmanager-1.16:=[modemmanager?,teamd?]
-	appindicator? (
-		dev-libs/libappindicator:3
-		>=dev-libs/libdbusmenu-16.04.0
-	)
-	modemmanager? ( net-misc/modemmanager )
-	selinux? ( sys-libs/libselinux )
-	teamd? ( >=dev-libs/jansson-2.7:= )
-
-	virtual/freedesktop-icon-theme
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-libs/libxml2
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}/meson-0.61.patch"
-)
-
-src_configure() {
-	local emesonargs=(
-		-Dappindicator=$(usex appindicator ubuntu no)
-		$(meson_use modemmanager wwan)
-		$(meson_use selinux)
-		$(meson_use teamd team)
-		-Dmore_asserts=0
-		-Dld_gc=false
-	)
-	meson_src_configure
-}
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 0d966ed53377..6498d20d7f96 100644
--- a/gnome-extra/nm-applet/nm-applet-1.24.0.ebuild
+++ b/gnome-extra/nm-applet/nm-applet-1.24.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE="appindicator modemmanager selinux teamd"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.38:2
diff --git a/gnome-extra/pch-session/Manifest b/gnome-extra/pch-session/Manifest
index 993eebb37ed4..04516dfeb0b3 100644
--- a/gnome-extra/pch-session/Manifest
+++ b/gnome-extra/pch-session/Manifest
@@ -1,7 +1,5 @@
 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
+DIST pch-session-41.2.tar.bz2 3610591 BLAKE2B 0a3dc1a60ed29bb59cd30756039c4d991212443664f72a5b4684be63babfd8b052c943f403c043817d78ee34d8017cd3e2348114c79fa618ad3967d092f686af SHA512 296c92ec6efdaef7b23d3986937f9dbf01b424fc8cd69cec637cff93780b4ac8e0e1cffee1b56b30817b43cf4063a3f6626e1e5b2b91c99847b08fd73bc63103
 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
+EBUILD pch-session-41.2.ebuild 1433 BLAKE2B 872ce0c6153768fc2dd317740c9b0f128f48df4b51c81874dacd5857097d6507c8d62a495dc2c6cbfb8b707841be2dc7e7b721c3fc24222e5f86667cbcf48744 SHA512 25ddd36d35cc7f5b819deed592fac5efeb6706683bb36fb81ca7868bb56e5508ce1bfc2f9b9971c22e56c09188427e5d12881ddf8aa121740f67d155ae696627
 MISC metadata.xml 241 BLAKE2B cb0374238d11e2a3f28f23b7049da09babd4310a99862738acfb7ba554f7758ac68cd09d1eb7a29068195c27010a846a540ed2c09b88fd043b37fb4f0762150f SHA512 b2c1d3e2cb6760ed4682da82af5370adcacd48afd558efa1abf84d955067b2ad32eda034af8cef95c71409622f97fa0113f2e07bee328f2d03512908ae931050
diff --git a/gnome-extra/pch-session/pch-session-41.0.ebuild b/gnome-extra/pch-session/pch-session-41.0.ebuild
deleted file mode 100644
index 478c7693aebd..000000000000
--- a/gnome-extra/pch-session/pch-session-41.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 2019-2021 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-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-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
-}
diff --git a/gnome-extra/pch-session/pch-session-41.1.ebuild b/gnome-extra/pch-session/pch-session-41.2.ebuild
index 05ff9874d4c0..4919ccdd7b66 100644
--- a/gnome-extra/pch-session/pch-session-41.1.ebuild
+++ b/gnome-extra/pch-session/pch-session-41.2.ebuild
@@ -10,8 +10,8 @@ SRC_URI="https://gitlab.com/pachoramos/${PN}/-/archive/${PV}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
+KEYWORDS="amd64 x86"
+IUSE="qt5 webp"
 
 RDEPEND="
 	>=gnome-base/gnome-shell-41
@@ -27,6 +27,8 @@ RDEPEND="
 	>=gnome-extra/gnome-shell-extension-gsconnect-48
 	>=gnome-extra/gnome-shell-extension-weather-in-the-clock-20211108
 	>=gnome-extra/gnome-tweaks-40.0
+	qt5? ( x11-themes/adwaita-qt )
+	webp? ( gui-libs/gdk-pixbuf-loader-webp )
 "
 BDEPEND=""
 DEPEND=""
diff --git a/gnome-extra/sushi/Manifest b/gnome-extra/sushi/Manifest
index cd51b5d271b7..c26d1b4d142c 100644
--- a/gnome-extra/sushi/Manifest
+++ b/gnome-extra/sushi/Manifest
@@ -1,5 +1,3 @@
-DIST sushi-3.38.1.tar.xz 79384 BLAKE2B 7306d375f85cc491fa8819e6857b1d61d158149045069002ed7a9c0f08c021ce0e9ed5ee751404a507dfdffdfa99895288f9c9601001818b4d1bc987f94bd823 SHA512 b999e6892314875725bd4029163ae58813b46f0e5c59e58b62fc4491d611b48fc39459f6c5b5e1a7d75d792cfeb66681f4d3a7057e8cde8f5c3364a2312e0be7
 DIST sushi-41.0.tar.xz 80940 BLAKE2B 211fb0c96ac0a911809007ed2e79659cc90a32be23d61137d85cc4502beb995d2131f62bbbb9a66f8da9328a4bf7d83b0c05f93e8913c8390be5cf22baaaeb00 SHA512 690018b846b23b3b21db244ae6e1f373870cc8cdb374dee2f4ba7eebf65af5d33a3366d37476b5f4556daf196c3f9cf8bf44903193831340f23ad33eef3ed484
-EBUILD sushi-3.38.1.ebuild 1324 BLAKE2B 82f4e9004950823abed357e188a4f90e51af15f560e46fe370333d4dd4d78d7d74523894bd7b71101cb0ef0ceb9c82e91ebcc842d8fbd57f32af6530735c708b SHA512 d3d46b3141563662982104e08a651a156d9a9bfda449a90854e77f929c19161d672b87c3f63efbf8fc651fd32e3963d84dd5842f632fe0506beef1a04e329b11
-EBUILD sushi-41.0.ebuild 1306 BLAKE2B 0bb737a6bf6a09419fa1d1cfe4ea79c6be06fbbbc8f371fd89459cb1204c5d6f5b696a96aa2a132632379ba390b4377554dd05cca7734a810f148cac36b5ab6b SHA512 96682a1475b696510c35e922c9a6cc73be19ce793c49c85fce2839eefdd3a9245286f796d886b25a1a195f5b1d92a878903708d4dd76e13e0bf1308f86b816e8
+EBUILD sushi-41.0.ebuild 1303 BLAKE2B b3266138ec01f3ce8af3acdfedddcaa603e497e26c5d8a5e68b6113c588e5ba51eae51a4edccd925ae82caf2837f0d6eec00219e85a55634a0072ed6b7f1fc77 SHA512 e0472db272aef64e1434ec7897a26222e10cd2aa1f7d82d89600c11028452eca374bc934925f0e9c460823422389b9e9d8ff8221aed59539048f2000df977400
 MISC metadata.xml 385 BLAKE2B 8b38e81530f0280af7c0d773ae60a0cf4144d3a7d876b30574da186bafb023da5da9abd75471543d528f0e6aa9664ba787aeb45bc46dab64077f3a1a0c8bc932 SHA512 d5d35182551e497f3ac5a89734387a1a6e03848ce02f017c6982d5261edbdc72ee342ec7ccc9304f08918f3bc81548bbc26039d7c88a397a627c4a37215808e0
diff --git a/gnome-extra/sushi/sushi-3.38.1.ebuild b/gnome-extra/sushi/sushi-3.38.1.ebuild
deleted file mode 100644
index e8530d38474a..000000000000
--- a/gnome-extra/sushi/sushi-3.38.1.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 meson xdg
-
-DESCRIPTION="A quick previewer for Nautilus, the GNOME file manager"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/sushi"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~sparc x86"
-IUSE="office wayland +X"
-REQUIRED_USE="|| ( wayland X )"
-
-# Optional app-office/libreoffice support (OOo to pdf and then preview)
-DEPEND="
-	media-libs/libepoxy
-	>=app-text/evince-3.0[introspection]
-	media-libs/freetype:2
-	>=x11-libs/gdk-pixbuf-2.23.0[introspection]
-	>=dev-libs/glib-2.29.14:2
-	media-libs/gstreamer:1.0[introspection]
-	media-libs/gst-plugins-base:1.0[introspection]
-	>=x11-libs/gtk+-3.13.2:3[introspection,wayland?,X?]
-	>=x11-libs/gtksourceview-4.0.3:4[introspection]
-	>=media-libs/harfbuzz-0.9.9:=
-	>=dev-libs/gobject-introspection-1.54:=
-	media-libs/musicbrainz:5=
-	net-libs/webkit-gtk:4[introspection]
-	>=dev-libs/gjs-1.40
-"
-RDEPEND="${DEPEND}
-	>=gnome-base/nautilus-3.1.90
-	office? ( app-office/libreoffice )
-"
-BDEPEND="
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-src_configure() {
-	meson_src_configure \
-		$(meson_feature wayland) \
-		$(meson_feature X X11)
-}
-
-src_compile() {
-	local -x GST_PLUGIN_SYSTEM_PATH_1_0=
-	meson_src_compile
-}
diff --git a/gnome-extra/sushi/sushi-41.0.ebuild b/gnome-extra/sushi/sushi-41.0.ebuild
index 0ce63af012ee..2e36edd3cbbe 100644
--- a/gnome-extra/sushi/sushi-41.0.ebuild
+++ b/gnome-extra/sushi/sushi-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
@@ -9,7 +9,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/sushi"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv ~sparc x86"
 IUSE="office wayland +X"
 REQUIRED_USE="|| ( wayland X )"
 
diff --git a/gnome-extra/yelp-xsl/Manifest b/gnome-extra/yelp-xsl/Manifest
index 099872f5832d..90025e379f1a 100644
--- a/gnome-extra/yelp-xsl/Manifest
+++ b/gnome-extra/yelp-xsl/Manifest
@@ -1,5 +1,3 @@
-DIST yelp-xsl-40.2.tar.xz 660556 BLAKE2B 1cc5605f8a272c968b1deff85917e755d6ae13c826ccb21b8a14f8e6d2d21ea2d5ce5781350370994ba1f84009fea15789389b392f8ce111e67e3f948d042b42 SHA512 d365d6d873878a640244053efa9f2b9f7330a8bbca1c47073f0617c1f9150f58e91b48ac7d28e5b65fd113d612afd65b5f9c3d16a6958a957130f85d2f866483
 DIST yelp-xsl-41.1.tar.xz 661572 BLAKE2B d7a0ab809722d7159d587a0fa761f69c0c73c7336caabad85e685a79e541d87b9aec9cabc474376f55596f92dc0dbbb146fcbe885dbc0377641312549d8eb5a3 SHA512 1ffdf2feb5ca69824efdb86c3e290ebbe639c41f3cef7bd5af3550ddf1667e9e347ecc20d66cbd6f5860ae9245ba34d359d1fdaf53fa3944fd578d9ac5652a59
-EBUILD yelp-xsl-40.2.ebuild 568 BLAKE2B b7ff5cc343c6aecb3947cf50b198acefc6f0954211b64cb3a6d65e959f80720e54f1fc6a19ad0f259ac7447e998147e4620faf4de92ea75b337b556a7b31a972 SHA512 f83159a3674d363019e0dbb80cb50222b3d0cee8da2dc3560fbe7ebe8e32cdef8cbc730fd2f73dfa29571eac59ba46ad4f9280169ded9b5145cbaf82b6759ce3
-EBUILD yelp-xsl-41.1.ebuild 577 BLAKE2B be2a166c7dd32886bc9079957bac57b345b0d532760e0d1b553b7ab2cccc1674206be3bdfc1696d1b0a1a29325f0e223361367df2a650bb0dca911f52a5af005 SHA512 ce4f83a92d16b0225a6d2136c58553ecc845a9a7137977d2e9514f01de0c75f9a8040dddf4259695c91daaf27f23aca02a62410965e2a755152ecfb8950d5399
+EBUILD yelp-xsl-41.1.ebuild 570 BLAKE2B e80515499a859a01d6370ac836d833312ff18a3566ac2d1426e201cfe2850371ba72bc80e0e160fce156be7ef708c4d3e43e2ba835e0d056d5cc201a2cae536f SHA512 a6dcb834dc8dfac61b4a8de203139bb2de9163f6803abec1039386c96916a0e9414d09621cdeca4a18aeb8987278a8dce68ca735356b64cf5b9cbaac53d0a329
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/gnome-extra/yelp-xsl/yelp-xsl-40.2.ebuild b/gnome-extra/yelp-xsl/yelp-xsl-40.2.ebuild
deleted file mode 100644
index 207fdba66c3d..000000000000
--- a/gnome-extra/yelp-xsl/yelp-xsl-40.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="XSL stylesheets for yelp"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/yelp-xsl"
-
-LICENSE="GPL-2+ LGPL-2.1+ MIT FDL-1.1+"
-SLOT="0"
-IUSE=""
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-libs/libxml2-2.6.12:=
-	>=dev-libs/libxslt-1.1.8:=
-"
-DEPEND="${RDEPEND}
-	>=dev-util/itstool-1.2.0
-	>=sys-devel/gettext-0.19.8
-	virtual/awk
-	virtual/pkgconfig
-"
diff --git a/gnome-extra/yelp-xsl/yelp-xsl-41.1.ebuild b/gnome-extra/yelp-xsl/yelp-xsl-41.1.ebuild
index 54fb45cb2f9a..f09ca253c8ab 100644
--- a/gnome-extra/yelp-xsl/yelp-xsl-41.1.ebuild
+++ b/gnome-extra/yelp-xsl/yelp-xsl-41.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
@@ -9,7 +9,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/yelp-xsl"
 
 LICENSE="GPL-2+ LGPL-2.1+ MIT FDL-1.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 DEPEND="
 	>=dev-libs/libxml2-2.6.12:=
diff --git a/gnome-extra/yelp/Manifest b/gnome-extra/yelp/Manifest
index 68ef55735f65..bdc697485235 100644
--- a/gnome-extra/yelp/Manifest
+++ b/gnome-extra/yelp/Manifest
@@ -1,6 +1,4 @@
 AUX yelp-3.20.0-man-compatibility.patch 4229 BLAKE2B 1ebe101f4a0031ca46d6801e8dc19eb4225c0bd0d5789d379f3192fdc71afabf6a940156463bc60be414e4f607abcaa998f5e8ff81a74c107a5853490402f163 SHA512 427ee66fa1c156991254fd10511bead4fbed6b05a930da157cec61bd7fafcd83f0dd447ce8aa62d0dc76e2231cf5f34fbeccc8103de4ee9062b6d79955b9cc1d
-DIST yelp-40.3.tar.xz 1506144 BLAKE2B e9cb9f2e1390fca1c3cf144a1c0278e6ad8506f6177b84c6966fa4a1088ba316afc3eec2e5292e49878c45bacedeb06c1980e4f16d7ec1c8bd22d8fb10ba07fe SHA512 d043273884daf1b9ea45065deaf6839b776cece48fcd0bee6b81d9d7d384422f98005340adee2f00a6013e09cf5455a340ac5b9a40fc02b58b163352be907c28
 DIST yelp-41.2.tar.xz 1531228 BLAKE2B 310bb73b8b841ed72e40530fe7d94fa2b223003fea40530cddb774cff059ce47cb613693ff3e45d2e9fb6beb2130c30d8d0b760e61c749b5d7e02143d17c2efd SHA512 171020b258531d26d1ab6193222b1b31bbde0be7da87524911e38143a606f38b29f9d76cb600cffc71da63d81274f656c426e79101acfa64caaf29e1a44020bf
-EBUILD yelp-40.3.ebuild 1218 BLAKE2B a399bce01c389b27dbb36aa83b72c38600121e6eb46d78e1382a22dcbdc89f32a8e34cf3a3a73c9a060b6ea7dbd298571491106522a2fe7904184cf617186c0f SHA512 bf83d4afc4463213ef2d99780f8f87fa891d265b26bf9a9cccb028e383b9ce862eb0cce9b15bfac2db75b8d75580c650741823e23558e58b8d3e14247873c1c5
-EBUILD yelp-41.2.ebuild 1246 BLAKE2B 52e0bf89e07523142845c1a00f77a35edf804c83f1624a847a58f6cc8f4c53297bb86bbc847ff50fba5caf4d31958dd2a4e623b7e298d1b7de9add5e7f6af889 SHA512 535e5a00d3a9473b3deb74fd9f4cf063e4b623002c48b111adbe1843ddd81e0b5b7bc27cdd9244bba93578856d1cb45c119376c265befb12976582f2569faf18
+EBUILD yelp-41.2.ebuild 1243 BLAKE2B 5dfc26d807817829f4d45186b71bc664b026a42f8ce09c55e6153174dfcad12b48c805df5e63d0b025352dde689de57fe64ba68c985b3c9d3c6993b127a8f521 SHA512 b7ac32f2d3f306c47b040827cc5117152355e7364cc62cd7f853b65093675208a451be976a43d9e4bf9425b64cf39464f98992ca518d1a22fe761e1662c7b641
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/gnome-extra/yelp/yelp-40.3.ebuild b/gnome-extra/yelp/yelp-40.3.ebuild
deleted file mode 100644
index 3e42d5a48f46..000000000000
--- a/gnome-extra/yelp/yelp-40.3.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-GNOME2_EAUTORECONF="yes"
-
-inherit gnome2
-
-DESCRIPTION="Help browser for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Yelp"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-
-RDEPEND="
-	app-arch/bzip2:=
-	>=app-arch/xz-utils-4.9:=
-	dev-db/sqlite:3=
-	>=dev-libs/glib-2.38:2
-	>=dev-libs/libxml2-2.6.5:2
-	>=dev-libs/libxslt-1.1.4
-	>=gnome-extra/yelp-xsl-3.27.1
-	>=net-libs/webkit-gtk-2.19.2:4
-	>=x11-libs/gtk+-3.13.3:3
-	x11-themes/adwaita-icon-theme
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-libs/appstream-glib
-	>=dev-util/gtk-doc-am-1.13
-	dev-util/glib-utils
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	# Fix compatibility with Gentoo's sys-apps/man
-	# https://bugzilla.gnome.org/show_bug.cgi?id=648854
-	"${FILESDIR}"/${PN}-3.20.0-man-compatibility.patch # needs eautoreconf
-)
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		--enable-bz2 \
-		--enable-lzma \
-		APPSTREAM_UTIL=$(type -P true)
-}
-
-src_install() {
-	gnome2_src_install
-	exeinto /usr/libexec/
-	doexe "${S}"/libyelp/yelp-groff
-}
diff --git a/gnome-extra/yelp/yelp-41.2.ebuild b/gnome-extra/yelp/yelp-41.2.ebuild
index 70fe29b08280..fdea6bef9a3e 100644
--- a/gnome-extra/yelp/yelp-41.2.ebuild
+++ b/gnome-extra/yelp/yelp-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
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Yelp"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 
 RDEPEND="
 	app-arch/bzip2:=
diff --git a/gnome-extra/zenity/Manifest b/gnome-extra/zenity/Manifest
index 920ea9cb2ff7..c82f5a4c51c5 100644
--- a/gnome-extra/zenity/Manifest
+++ b/gnome-extra/zenity/Manifest
@@ -1,5 +1,3 @@
-DIST zenity-3.32.0.tar.xz 4753752 BLAKE2B 220fbd374f2564b345f4668c0583f2678a296bbb0d344af55b849b4e7e718f29856bd43f7ae2b0fa492e3d1d8180ca160236fcc806cd483716f680d03aa019d0 SHA512 d057df25dbb2d780c6be184ec167b0f569eadf0ac1c460d63509843157f14dfdcebe46bb6f93b17c6069ef0208902ce9ecbb4025933f7dc7572323032ec34fda
 DIST zenity-3.41.0.tar.xz 3093244 BLAKE2B 582a2e935331120c47ef997d100c28943694a9b8b35c70673c8dca6e129bf39d9a32c92cf6504602513ad6eb223239be584c56ef44fe609f8af320f27713ca4a SHA512 b198ae68fda77f74c9f6deba683759612067c4ee28551a667c96500296db89313f3f2330fcaa53b6e4840ee3367d438e766be8ba7c006952872aebe93684b307
-EBUILD zenity-3.32.0.ebuild 1080 BLAKE2B 499a9885dac700e56cc7caf7f7cf533e84a11a5299adce53f5421abbab6c7d2b17b99d76ae196ab69b46794de95b959bfa47024d2ad5b1c92341dea4931d3817 SHA512 e80d877a4847f4fa99eaefc7c87b05e0133f728540ad52922f9155faeee703a37a9890d11983be8900b6ce7b297dac2051c2d48aef9a0518404f77e90d25f48e
-EBUILD zenity-3.41.0.ebuild 1178 BLAKE2B 2df2ba2c0d69e8bc73fc945d706be641872321dbf2ab2e309c49b6cbe3fbd16afc8be459db3e4c91f796b3f334c0a0908d4840b2deaede6aacaed0ddad7fd90a SHA512 b2afa157e76a26427aef9e58ac7dff6a5d192b4749dc7b4c71e93fd91d3b34a3add1906b1d191e031e981f393e73f67f004367380ba012d58cea7b8db8c48463
+EBUILD zenity-3.41.0.ebuild 1175 BLAKE2B a9f24605f1504c439a8aed8b288103e5f76740094e9862a378f6d71bdf3403034285ae67ecbd678fde4549c752cd03f37b50c27d06f28d1a59e84a4107299caf SHA512 ff77d8bc6564c934e16ae69bbce8920fb0b03f55bb91788fdabc4e9a8470e0359c80343d3357f227181d5374fb0a6b30fc28f6516fd40e0cc7fb42494de2fb54
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/gnome-extra/zenity/zenity-3.32.0.ebuild b/gnome-extra/zenity/zenity-3.32.0.ebuild
deleted file mode 100644
index 77bb951dc867..000000000000
--- a/gnome-extra/zenity/zenity-3.32.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome2
-
-DESCRIPTION="Tool to display dialogs from the commandline and shell scripts"
-HOMEPAGE="https://wiki.gnome.org/Projects/Zenity"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="debug libnotify webkit"
-
-# TODO: X11 dependency is automagically enabled
-RDEPEND="
-	>=dev-libs/glib-2.8:2
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3:3[X]
-	x11-libs/libX11
-	x11-libs/pango
-	libnotify? ( >=x11-libs/libnotify-0.6.1:= )
-	webkit? ( >=net-libs/webkit-gtk-2.8.1:4 )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.4
-	virtual/pkgconfig
-"
-
-src_configure() {
-	gnome2_src_configure \
-		$(usex debug --enable-debug=yes ' ') \
-		$(use_enable libnotify) \
-		$(use_enable webkit webkitgtk) \
-		PERL=$(type -P false)
-}
-
-src_install() {
-	gnome2_src_install
-
-	# Not really needed and prevent us from needing perl
-	rm "${ED}/usr/bin/gdialog" || die "rm gdialog failed!"
-}
diff --git a/gnome-extra/zenity/zenity-3.41.0.ebuild b/gnome-extra/zenity/zenity-3.41.0.ebuild
index 2bfa70251944..30a09ff4990b 100644
--- a/gnome-extra/zenity/zenity-3.41.0.ebuild
+++ b/gnome-extra/zenity/zenity-3.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
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Zenity"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="libnotify webkit"
 
 # TODO: X11 dependency is automagically enabled
author	V3n3RiX <venerix@koprulu.sector>	2022-03-20 00:40:44 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2022-03-20 00:40:44 +0000
commit	4cbcc855382a06088e2f016f62cafdbcb7e40665 (patch)
tree	356496503d52354aa6d9f2d36126302fed5f3a73 /gnome-extra
parent	fcc5224904648a8e6eb528d7603154160a20022f (diff)