gentoo resync : 31.05.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-05-31 20:59:14 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-05-31 20:59:14 +0100
commit: e748ba9741f6540f4675c23e3e37b73e822c13a4 (patch)
tree: 23dece8beabb3a3d7c6c0273b0eb40b21c62a889 /gnome-extra
parent: 908778078736bd36f7a60a2d576d415cb8e000fa (diff)
97 files changed, 182 insertions, 2464 deletions
diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index f5dcee642740..360d2c6f8da5 100644
--- a/gnome-extra/Manifest.gz
+++ b/gnome-extra/Manifest.gz
diff --git a/gnome-extra/eiciel/Manifest b/gnome-extra/eiciel/Manifest
index c4827bf161bf..3718162140c6 100644
--- a/gnome-extra/eiciel/Manifest
+++ b/gnome-extra/eiciel/Manifest
@@ -1,7 +1,4 @@
-AUX eiciel-0.9.12.1-xattr-header.patch 1368 BLAKE2B 6f8e8b2194286f2cf5314dc86c429ab17336a5f95a757c76d4542069c7ebdc840c9866d97dacb3c418578d0c87d0c1127b2e57ea31e059ef9a2c9df8b69d8ea0 SHA512 22286ea3973845ae5b489855ca0df5813ab95b46eed53820d5b472c2baa44327c673d4aa1c4b1d792cfcd59dc2f492612cce7b2e7f648223d6314d44773cc7b5
 AUX eiciel_participant_target.hpp 1067 BLAKE2B 552ecec8247cd85d9124a7be1fa263e96ffd8f5ed3de1a06d4fa6c071a2f3b40f8c9e238c182c241976158bc4361393e5adc853160c0ce998e4de0116e296348 SHA512 af9d3872d884b73b562a6447d9bace430039cec83a6e1b7ba2df47cf91b9b67d9bb09a7bbc71fc0862fddf0b2e34d7e72bedb90886b767a338725a5fa2fd8fda
-DIST eiciel-0.9.12.1.tar.bz2 723727 BLAKE2B e32f3af9f4664610169fc718a9d274ae9d91c5d0d56a6be9872da1c105b349584300879742b753a02ad621cdc597591c52f47d705222ad52cb37b0750616a553 SHA512 f54fbb149eed7f8fd534b77ec5e2d0f579c68a39afd7417a2298d75c7e95c459b49fc8ccb66d0188956ffaadf3bcc8a3eb048425cb82fc875573eb131f4b0494
 DIST eiciel-0.9.13.tar.bz2 707838 BLAKE2B 30702b20482984885dfdb222e631f7572f3199b93509baa48762c0925b1fd78e1601a1279e7454543ddc32e813288cd01f0fdc2cb0c2eb0c5812cefcf8cac29f SHA512 7b5fde27e2d28c69f02092896bb0065372f93319d8ff8ad285b8b0e52acbe6d43b96f7dc215d7210602c6f766b48d2e2c66361dd28ea0f567ed6faf3bbcfdd14
-EBUILD eiciel-0.9.12.1-r1.ebuild 884 BLAKE2B 3864d3ca1e9c01f10a47c6123ac4874e8356147fc7cd410eea7affe45615a8ba117f98e1514164f0d254eaacf9149cd14a497d70a6aab69f270f08387811bd38 SHA512 0911a36880069cef99e69d5f98038d9c35393c58c5f6f148d3a68b5f967333cce56909e3f5ce4442cc05af35541be9c7609a4b34ce52261235cac17a67ef938f
-EBUILD eiciel-0.9.13.ebuild 882 BLAKE2B fadcba5ff420fd2d655c9975a9bfb762fce11a6bb700f2ad0522dd34b888861b7570d7a23ff2bc3ca3b71dae87fcbdaf00749408f04d984f819b56bf768a3c11 SHA512 0b2c45456f245793cc02b611cf11ce255e65cfde622c13b279bbe2732a878c5440cc112eca4aa6148e3184d50f4523eeb59a1eda48877b81d4fe517090c6a403
+EBUILD eiciel-0.9.13.ebuild 880 BLAKE2B 6ffce24f22b0b6b6c7dbe5063102fa24981bceae0beb77de24f35e2fa605dfcea7163ab30d0fb11a700198726842f1217496b417baab4c84cda7e5b837a2dcc9 SHA512 37b69856c4c2d4e782ada9bdc55468b5d259ec509ac1302a5f63ed581c5f364cbe9dda8e7e3faa41f6bc3c08925f5938e45f481781d4fc60b078fa58e1e6ee64
 MISC metadata.xml 328 BLAKE2B 73e7203ec24879a8db2ef2adb8b1b3c51634ef3a6b320a8070c24de0530d4ce755568fc2140e09d0f585043b1753c4c505c5adc6a8abdf9658ceceac7f44bfe9 SHA512 37fa2d1b3f4a4978cbf04345e97c0f02ce610b29f97e69c9384509ec5a96393fe1feeb2a31645361027ceac8d32fddf4b7902f076ed28c83488f59e43269d6f2
diff --git a/gnome-extra/eiciel/eiciel-0.9.12.1-r1.ebuild b/gnome-extra/eiciel/eiciel-0.9.12.1-r1.ebuild
deleted file mode 100644
index 1ffc189370d6..000000000000
--- a/gnome-extra/eiciel/eiciel-0.9.12.1-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_EAUTORECONF="yes"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-
-DESCRIPTION="ACL editor for GNOME, with Nautilus extension"
-HOMEPAGE="https://rofi.roger-ferrer.org/eiciel/"
-SRC_URI="https://rofi.roger-ferrer.org/eiciel/download/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="nautilus xattr"
-
-RDEPEND="
-	>=sys-apps/acl-2.2.32
-	dev-cpp/gtkmm:3.0
-	nautilus? ( >=gnome-base/nautilus-3 )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=sys-devel/gettext-0.18.1
-"
-
-PATCHES=(
-	# attr/xattr.h is deprecated. Use sys/xattr.h instead (from 'master')
-	"${FILESDIR}"/${P}-xattr-header.patch
-)
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		--with-gnome-version=3 \
-		$(use_enable nautilus nautilus-extension) \
-		$(use_enable xattr user-attributes)
-}
diff --git a/gnome-extra/eiciel/eiciel-0.9.13.ebuild b/gnome-extra/eiciel/eiciel-0.9.13.ebuild
index d122ad8b681c..0c18719fb3d3 100644
--- a/gnome-extra/eiciel/eiciel-0.9.13.ebuild
+++ b/gnome-extra/eiciel/eiciel-0.9.13.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://rofi.roger-ferrer.org/eiciel/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="nautilus xattr"
 
 DEPEND="
diff --git a/gnome-extra/eiciel/files/eiciel-0.9.12.1-xattr-header.patch b/gnome-extra/eiciel/files/eiciel-0.9.12.1-xattr-header.patch
deleted file mode 100644
index 1b866f4bb75f..000000000000
--- a/gnome-extra/eiciel/files/eiciel-0.9.12.1-xattr-header.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From cf7e97ece39994d9c219bf3d4f3f70815e1c0867 Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Tue, 15 May 2018 13:40:37 +0200
-Subject: [PATCH] attr/xattr.h is deprecated. Use sys/xattr.h instead
-
-See also:
-http://git.savannah.nongnu.org/cgit/attr.git/commit/?id=7921157890d07858d092f4003ca4c6bae9fd2c38
----
- configure.ac          | 2 +-
- src/xattr_manager.hpp | 5 ++++-
- 2 files changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 040e88f..bc769f3 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -156,7 +156,7 @@ fi
- 
- if test x$enable_eua = xyes;
- then
--    AC_CHECK_HEADERS([attr/xattr.h], [], AC_MSG_ERROR([This header is mandatory for extended user attributes support]), [])
-+    AC_CHECK_HEADERS([sys/xattr.h], [], AC_MSG_ERROR([This header is mandatory for extended user attributes support]), [])
-     AC_DEFINE([ENABLE_USER_XATTR], [1], [Enables user extended attributes support])
- fi
- AM_CONDITIONAL(ENABLE_USER_XATTR, test x$enable_eua = xyes)
-diff --git a/src/xattr_manager.hpp b/src/xattr_manager.hpp
-index 5f59e17..3d41443 100644
---- a/src/xattr_manager.hpp
-+++ b/src/xattr_manager.hpp
-@@ -26,7 +26,10 @@
- #include <sys/stat.h>
- #include <unistd.h>
- 
--#include <attr/xattr.h>
-+#include <sys/xattr.h>
-+#ifndef ENOATTR
-+#define ENOATTR ENODATA
-+#endif
- 
- #include <string>
- #include <cstring>
diff --git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest
index 445759d5f931..396096ac2578 100644
--- a/gnome-extra/evolution-data-server/Manifest
+++ b/gnome-extra/evolution-data-server/Manifest
@@ -1,10 +1,5 @@
 AUX 3.36.5-gtk-doc-1.32-compat.patch 1016 BLAKE2B 6458aa6e2bb41ce07bf74910ef36aafab895dec6e85c4262c346bbe518165ca2ca7778e3d97182d4f6c619313ed016a186dc88fd349a9bd1770441afb09f6e01 SHA512 3a43ee8128896eccdc35e65155aba5d38a4311cd8d848f506cba3473248595ea078b748c639b9a5f11842272b5e212a01d714a3177e4cd1e95d15680081feaa5
-AUX 3.38-PrintableOptions.cmake-Correct-variable-name-compari.patch 2610 BLAKE2B d3c4f0e7fd9a2ba4882c01b673aab638ce7ef299708b23676bf40b0276329c478576ae4e818483ee158b5407b5b454fe81b83d6c0d04b0dccf9329fb564761b4 SHA512 33061b7bca017044bf7a795ebbe3231bb7db705d1b5c123dc44992b7bfee8d31ec7e3181b7cea85c029c84bed3fee4f475375dabc63541af50f205630a580a73
 AUX calentry.schema 3661 BLAKE2B 0235e8d98d1367f209a31cc74da9563d53dfc12ca34e020f63a18fcb73c13345e58a9e4a9f5bb3e14a7774bdcd279118d84d971a4b164c8ce41cd26798efabdd SHA512 56606848319539b8c9af732a5d572db44e2d7da433b1689ef7f14a283880951e10d5fc39f27245a7ddc8f0cb2e7563a757060020c17e5411f875cae10b119834
-DIST evolution-data-server-3.38.4.tar.xz 4663372 BLAKE2B 1be9159e210b88577dd367a64967aca1facea1c2f4a1611bdf773f8d01c2f4bacfa0eaaca37a9f094570c7897fc4a7be89bd303ce0739bd7f2fc925ac148bd84 SHA512 0b70850519316dd361e6d04607f3f9e4afe1bd0869a34e8403f02cefa7cc5ee683645031e337b6dcba4d89461aa7954e8d36d9c5b1c5bf12fd53b5411b908c3f
-DIST evolution-data-server-3.40.0.tar.xz 4623568 BLAKE2B 4c0b8de1eb9129e351f90477f06bcaa6b9f37b0d616df3dc2c53635e0f2ea3520546be7f88dd1ee68d32a37b385e68f5c48ca79d36c63a0f9d10261b557162c4 SHA512 d31ef0d270ef64909150c0e087835bb6308125155664eee3375be6a59c9c43cd251e9617adbf819846a7d9bb73309ec51699159ee06465266193ad5dea3c0a00
 DIST evolution-data-server-3.40.1.tar.xz 4625316 BLAKE2B d795183d07bc7b58a00e3c6f60d3704cf7e0cc6237b079c49f2e21dd7c22098c2b7b3fd2ca50fd3d9268aff8e5eaeea2e0e6c65d09c8bd68b7364445eb926c7c SHA512 47964a0965d412c329743423483c6694d078835b375d457aabe7e45a2b1b3406e4e0d4c1b855460f3c9b327d4d9320e659b0e43243816ec1e9bc49d0fea90f7d
-EBUILD evolution-data-server-3.38.4.ebuild 4316 BLAKE2B a60df67c9cba4bed928bddf01032f8ee669333fb3633f855912e1a03226b80808d46519e0c45aba4bc8bf417421ce803b899ba52d1a3abd8af990216f45f87f4 SHA512 4f821b8f78ae200a5f33e26323d0ec878356e3605ed151b63fe5dfad481e11cd56f25fc65aaca1f822e9d154c227ac7ac34b181d37f059fd5dc8842d5c4a6419
-EBUILD evolution-data-server-3.40.0.ebuild 4326 BLAKE2B 1711c611fc19269812011ed6d0a771ba03991ad9114081d971a40b8bb61f0cdf8e302c7e69ef9f5966fb7620fbc3a2017cddaf80cd8dde077ce041aab80c2344 SHA512 3eb72fd7633a1f2611ca72536ad0700e2ee6df037fddf1eef6f9cdc36ec28919335e3d91e9bf36a9bb9545628ccdb8291e7156a0de820070773dcb9c560313a8
-EBUILD evolution-data-server-3.40.1.ebuild 4240 BLAKE2B 174c00b54304e86aa8197988fe2f5352ac3f53513d6f3e8ae4d98777a812dee8fdaa6697f6b6506b2dbb8dba21583a840b1c4f9778e5fcc37d32a40a221f885b SHA512 9dafa06c7614caab9ca4b8ccd07d783c6d3a31294e6a5c38df0534883edf784b920a9bfdceb9a8c35f424694c44ac2cf41216e4bfa1bd833038ba0945ae2c96b
+EBUILD evolution-data-server-3.40.1.ebuild 4237 BLAKE2B 7f3f06fc021957a494ea0667a42df74aa086a1ff6bbd80ca74e0e5b2dd0eb3082581c9a1af99436e4b42b89210ef1b673c4c0ccc243de89ca55b8f546ec11b5c SHA512 d26011bdd56fa5f51254313d820975aaf93c209bd158f3420e71c450f556da0706a0e999c80684ebaed8a32de9096329bd69938335288b43153fcbe535b7dcae
 MISC metadata.xml 849 BLAKE2B a02a770ca4498189e14588af9aa58d82a7e28fbbfd99d891dfaa7e4148c71a0d7c89ae33a6b41899a174fd6dfa8ba012a2c0a3e342b58c8d84369010859f4b8c SHA512 da5fba1f5313c6bb027d870279ead3f9cf6da27a3fed183dced79abaaf3de4bbbc49076a01968e3af5dbe004f1641c7f0773801a040ba824924955894bcbbb1a
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.38.4.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.38.4.ebuild
deleted file mode 100644
index 1638eb60d284..000000000000
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.38.4.ebuild
+++ /dev/null
@@ -1,153 +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-25-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 ~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.10: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]
-	)
-"
-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
-	eapply "${FILESDIR}"/3.38-PrintableOptions.cmake-Correct-variable-name-compari.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.40.0.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.40.0.ebuild
deleted file mode 100644
index 339c57dfea0c..000000000000
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.40.0.ebuild
+++ /dev/null
@@ -1,153 +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 ~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:=[vala?]"
-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]
-	)
-"
-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
-	eapply "${FILESDIR}"/3.38-PrintableOptions.cmake-Correct-variable-name-compari.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.40.1.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.40.1.ebuild
index 02f51c3698ce..5219b100f94f 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.40.1.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.40.1.ebuild
@@ -16,7 +16,7 @@ SLOT="0/62-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 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 
 # gdata-0.17.7 soft required for new gdata_feed_get_next_page_token API to handle more than 100 google tasks
 # berkdb needed only for migrating old addressbook data from <3.13 versions, bug #519512
diff --git a/gnome-extra/evolution-data-server/files/3.38-PrintableOptions.cmake-Correct-variable-name-compari.patch b/gnome-extra/evolution-data-server/files/3.38-PrintableOptions.cmake-Correct-variable-name-compari.patch
deleted file mode 100644
index 95546b6daaa2..000000000000
--- a/gnome-extra/evolution-data-server/files/3.38-PrintableOptions.cmake-Correct-variable-name-compari.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From c95a70bfeae25ba11fbe50fe759a6cdb29388e44 Mon Sep 17 00:00:00 2001
-From: Milan Crha <mcrha@redhat.com>
-Date: Wed, 14 Apr 2021 16:58:08 +0200
-Subject: [PATCH] PrintableOptions.cmake: Correct variable name comparison
-
-CMake 3.20.1 errors out with:
-
-CMake Error at cmake/modules/PrintableOptions.cmake:38 (message):
-   variable name cannot be empty
- Call Stack (most recent call first):
-   CMakeLists.txt:152 (add_printable_variable)
-
-Change how the parameter value is compared, to fix it.
----
- cmake/modules/PrintableOptions.cmake | 20 ++++++++++----------
- 1 file changed, 10 insertions(+), 10 deletions(-)
-
-diff --git a/cmake/modules/PrintableOptions.cmake b/cmake/modules/PrintableOptions.cmake
-index ba1c9d0b7..339f1da4b 100644
---- a/cmake/modules/PrintableOptions.cmake
-+++ b/cmake/modules/PrintableOptions.cmake
-@@ -19,40 +19,40 @@
- #    prints all the build options previously added with the above functions
- 
- macro(add_printable_variable_bare _name)
--	if(_name STREQUAL "")
-+	if("${_name}" STREQUAL "")
- 		message(FATAL_ERROR "variable name cannot be empty")
--	endif(_name STREQUAL "")
-+	endif("${_name}" STREQUAL "")
- 	list(APPEND _printable_options ${_name})
- endmacro()
- 
- macro(add_printable_option _name _description _default_value)
--	if(_name STREQUAL "")
-+	if("${_name}" STREQUAL "")
- 		message(FATAL_ERROR "option name cannot be empty")
--	endif(_name STREQUAL "")
-+	endif("${_name}" STREQUAL "")
- 	option(${_name} ${_description} ${_default_value})
- 	add_printable_variable_bare(${_name})
- endmacro()
- 
- macro(add_printable_variable _name _description _default_value)
--	if(_name STREQUAL "")
-+	if("${_name}" STREQUAL "")
- 		message(FATAL_ERROR "variable name cannot be empty")
--	endif(_name STREQUAL "")
-+	endif("${_name}" STREQUAL "")
- 	set(${_name} ${_default_value} CACHE STRING ${_description})
- 	add_printable_variable_bare(${_name})
- endmacro()
- 
- macro(add_printable_variable_path _name _description _default_value)
--	if(_name STREQUAL "")
-+	if("${_name}" STREQUAL "")
- 		message(FATAL_ERROR "path variable name cannot be empty")
--	endif(_name STREQUAL "")
-+	endif("${_name}" STREQUAL "")
- 	set(${_name} ${_default_value} CACHE PATH ${_description})
- 	add_printable_variable_bare(${_name})
- endmacro()
- 
- macro(add_printable_variable_filepath _name _description _default_value)
--	if(_name STREQUAL "")
-+	if("${_name}" STREQUAL "")
- 		message(FATAL_ERROR "filepath variable name cannot be empty")
--	endif(_name STREQUAL "")
-+	endif("${_name}" STREQUAL "")
- 	set(${_name} ${_default_value} CACHE FILEPATH ${_description})
- 	add_printable_variable_bare(${_name})
- endmacro()
--- 
-2.26.3
-
diff --git a/gnome-extra/evolution-ews/Manifest b/gnome-extra/evolution-ews/Manifest
index 9bc00a5d9254..a469e53eaa59 100644
--- a/gnome-extra/evolution-ews/Manifest
+++ b/gnome-extra/evolution-ews/Manifest
@@ -1,8 +1,3 @@
-AUX evolution-ews-3.38.4-cmake-3.20.1.patch 2499 BLAKE2B 169eff8e666f732cf0040df67b834c32c351a6b6cfa09ff200dd5bb5aad6fa0be59a02722747c708ce1d7d448303d617054d2ccb1685cf2ab5c7aca3a80f4c1b SHA512 b5013334535f2fcfbba3a03767d9a8207dd5d6c7390ebbf97317973c481b93819c117eb103698bc4aa980f8fa27cda04671eba1f25d8ce62dfb22c05225017a3
-DIST evolution-ews-3.38.4.tar.xz 651384 BLAKE2B e4f71d38ddef6347ba3c137bac2246a6f4ffb5990ac2b6d3be72549326ae579c0a0f2bf11d19ce578ea37b99d0f8613d8d6a7e2ac75b9381e3b8c96646e483fc SHA512 98c1fecfa45bb2fe8337a1da54f09ef620128e4bba28b008aab3117291f7df708e6676421f3b8514448d035f1288591e54642f1426830fca7ba0320e3f3a99fc
-DIST evolution-ews-3.40.0.tar.xz 666148 BLAKE2B f8d7f6c917114e57bcc8ea93072f520069f7f183ce67ef5a5304c6721b3b9dae262ad5a2a8fc78b8ea75495f7f31f565b5db8e5bb02acaa5666ced15c0c3c5f2 SHA512 c5b0fdfbe455941444974738853a1c0346b77b96a483db8ff5b509a7c7dda90a0c1795749f3b17eeef4b3c2aceb06e51d2c5f9d784c0b6c17c78f8c37bc1c9af
 DIST evolution-ews-3.40.1.tar.xz 672448 BLAKE2B ac6548c2567dd1ca303def27a21974f93d44c1175e8474bebaa6576dc63f8624c32e9357186e2c1412ca2091412b17e0f244c60919652ede55fb77e1bb384b90 SHA512 8d0477b500ee1b0c6a9527f2d63fe0b4238862425a079729478a8df880f35e6a1166d2f8f77cafa73844351f0cffe171d857366c4527770d7436d8b4ace29b99
-EBUILD evolution-ews-3.38.4.ebuild 1462 BLAKE2B 8a7790c3a372f799b23060f14e13b0bb5bf8923f17cc7100c74af2fa48676dbc94bfb0fc46ea867e098beefce5ae46b06c93e52a15c935176a649d9e22404b4d SHA512 61760df6be1c7848a3ab1e5cf04b33f9d6f1ad393bad54b26138f9154861e4b09d45c44534c85db24cef85891a7e2a426b0264ecbc1871c27635a411f8910b46
-EBUILD evolution-ews-3.40.0.ebuild 1464 BLAKE2B aa9cf2a2aafed9c1900d7506e80b65dc55270618ee3978e8ccbeef37605617ec72f6c75c6ee304728a51ff8d659992c2af2859d0ecfa569c02d2a8149d1abfe4 SHA512 12890f61f4ce66e79156d6f507865b6aeebadd9fcc9df79b1d8ecbeae5cf84e212385dd77167ec825420ed94202d237dec888d112b801166f2c8ca96ca371bf2
-EBUILD evolution-ews-3.40.1.ebuild 1408 BLAKE2B 1d9a1cada17b2ccddf741b59f1b9171249f7ed899a469c2ab93c4d11c36c21ab9d30a73c811c64ac2432ef1083f7d57be78f6c4fd9b7ec7f9776781f157dcd6f SHA512 d89043f8af284e90ab7692eb25be59413af3f8c36534eddfbd81b021bb22439b8346a17213314c7b881fd33d795e752d29e3656a26dab064c1cd27a86dfd6b42
+EBUILD evolution-ews-3.40.1.ebuild 1406 BLAKE2B 3f9e641161aed979aeb855552dca3675183ca22390d3d1016e280416b227ba571b8af864ef02d5628f757ad33c6f523f50e269e6637958f36f7fe2375c777ffb SHA512 05b7067ab291bb6e126a2cdcaa28309ebc22669bd4a870762df1b292c0d0b34f0263f56fa652702606036c7816ea1ceb98d95d1bb9a41749259510244d594b2b
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/evolution-ews/evolution-ews-3.38.4.ebuild b/gnome-extra/evolution-ews/evolution-ews-3.38.4.ebuild
deleted file mode 100644
index adff76ede31a..000000000000
--- a/gnome-extra/evolution-ews/evolution-ews-3.38.4.ebuild
+++ /dev/null
@@ -1,71 +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.46: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
-
-	eapply "${FILESDIR}"/${PN}-3.38.4-cmake-3.20.1.patch
-
-	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.40.0.ebuild b/gnome-extra/evolution-ews/evolution-ews-3.40.0.ebuild
deleted file mode 100644
index 394ab53f0341..000000000000
--- a/gnome-extra/evolution-ews/evolution-ews-3.40.0.ebuild
+++ /dev/null
@@ -1,71 +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
-
-	eapply "${FILESDIR}"/${PN}-3.38.4-cmake-3.20.1.patch
-
-	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.40.1.ebuild b/gnome-extra/evolution-ews/evolution-ews-3.40.1.ebuild
index 2088827c2022..cf149d49e105 100644
--- a/gnome-extra/evolution-ews/evolution-ews-3.40.1.ebuild
+++ b/gnome-extra/evolution-ews/evolution-ews-3.40.1.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/evolution-ews/files/evolution-ews-3.38.4-cmake-3.20.1.patch b/gnome-extra/evolution-ews/files/evolution-ews-3.38.4-cmake-3.20.1.patch
deleted file mode 100644
index 050bacd7628c..000000000000
--- a/gnome-extra/evolution-ews/files/evolution-ews-3.38.4-cmake-3.20.1.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-https://gitlab.gnome.org/GNOME/evolution-ews/-/commit/6d8f7d303ec319539add2f0ba5331c2dab9d23c7.patch
-https://bugs.gentoo.org/783603
-
-From 6d8f7d303ec319539add2f0ba5331c2dab9d23c7 Mon Sep 17 00:00:00 2001
-From: Milan Crha <mcrha@redhat.com>
-Date: Wed, 14 Apr 2021 16:58:08 +0200
-Subject: [PATCH] PrintableOptions.cmake: Correct variable name comparison
-
-CMake 3.20.1 errors out with:
-
-CMake Error at cmake/modules/PrintableOptions.cmake:38 (message):
-   variable name cannot be empty
- Call Stack (most recent call first):
-   CMakeLists.txt:152 (add_printable_variable)
-
-Change how the parameter value is compared, to fix it.
---- a/cmake/modules/PrintableOptions.cmake
-+++ b/cmake/modules/PrintableOptions.cmake
-@@ -19,40 +19,40 @@
- #    prints all the build options previously added with the above functions
- 
- macro(add_printable_variable_bare _name)
--	if(_name STREQUAL "")
-+	if("${_name}" STREQUAL "")
- 		message(FATAL_ERROR "variable name cannot be empty")
--	endif(_name STREQUAL "")
-+	endif("${_name}" STREQUAL "")
- 	list(APPEND _printable_options ${_name})
- endmacro()
- 
- macro(add_printable_option _name _description _default_value)
--	if(_name STREQUAL "")
-+	if("${_name}" STREQUAL "")
- 		message(FATAL_ERROR "option name cannot be empty")
--	endif(_name STREQUAL "")
-+	endif("${_name}" STREQUAL "")
- 	option(${_name} ${_description} ${_default_value})
- 	add_printable_variable_bare(${_name})
- endmacro()
- 
- macro(add_printable_variable _name _description _default_value)
--	if(_name STREQUAL "")
-+	if("${_name}" STREQUAL "")
- 		message(FATAL_ERROR "variable name cannot be empty")
--	endif(_name STREQUAL "")
-+	endif("${_name}" STREQUAL "")
- 	set(${_name} ${_default_value} CACHE STRING ${_description})
- 	add_printable_variable_bare(${_name})
- endmacro()
- 
- macro(add_printable_variable_path _name _description _default_value)
--	if(_name STREQUAL "")
-+	if("${_name}" STREQUAL "")
- 		message(FATAL_ERROR "path variable name cannot be empty")
--	endif(_name STREQUAL "")
-+	endif("${_name}" STREQUAL "")
- 	set(${_name} ${_default_value} CACHE PATH ${_description})
- 	add_printable_variable_bare(${_name})
- endmacro()
- 
- macro(add_printable_variable_filepath _name _description _default_value)
--	if(_name STREQUAL "")
-+	if("${_name}" STREQUAL "")
- 		message(FATAL_ERROR "filepath variable name cannot be empty")
--	endif(_name STREQUAL "")
-+	endif("${_name}" STREQUAL "")
- 	set(${_name} ${_default_value} CACHE FILEPATH ${_description})
- 	add_printable_variable_bare(${_name})
- endmacro()
--- 
-GitLab
diff --git a/gnome-extra/gnome-boxes/Manifest b/gnome-extra/gnome-boxes/Manifest
index 46dad7fcc89a..7b3174586ed8 100644
--- a/gnome-extra/gnome-boxes/Manifest
+++ b/gnome-extra/gnome-boxes/Manifest
@@ -1,7 +1,3 @@
-DIST gnome-boxes-3.36.6.tar.xz 1275972 BLAKE2B a4b6bc98a8ed644020dce7ce5f5f08ae75291e2ac3351d1b3354d495a0579a59a245d63ba22754679b9641088bb71f96cd3abc7944f9996526ad7e6db9552458 SHA512 a37f34ea54d60d2d927dfe07a6ace6bd74910054b63a58bc2782f6dcd087d4a2153db0662d715a1bc67e2687742a162b3f66ff97b7678eb280f46b53765c7f73
-DIST gnome-boxes-40.0.tar.xz 1693528 BLAKE2B 15065fc28dcfa734ae2eea8b927042520466f56dd311b5328d224e220992b3db4ac24bca689a6f4d35c134721ba83ecb4f5a5a4760050a156069a45854c3218a SHA512 2ac569e5a423b67dc6b770eb754de6ce996e381032ce8610baf4de999dd45480eeba086211db783f440d465f3f50b06666c33e959270d8c87306e591b9aebeaf
 DIST gnome-boxes-40.1.tar.xz 1696528 BLAKE2B 7a593d535d2a6f0b0750c542a86a8210ac697fe8340f44830134c840d3a7500a6f6ecbbf901d6f37273f3354342b68cb1bdaf4cd7a5a98fc3047ee2ca5cc8b6a SHA512 a035454f3bdecc75222b27b6c1bf9807b21b9b3846300f2afafa3f30d4069b32a258e4d82f38cfeb407b21bd40d84031f57ddd63322dd6ba576c9795f355f33d
-EBUILD gnome-boxes-3.36.6-r1.ebuild 3855 BLAKE2B 54715fa7e8e2faf4ea26c9cc88314aad095a36497715893ed5ba18cf8d62a276a24c4fac0fc483d2c52ee53989adf43d585faa23f86e15ada600f9d2402f85f7 SHA512 842decd476504943ba29bdb8f18f3f5f3303dc14f71794f1770a4a9dab1baa392585081142a381eab7d78af0b136935b7ee56fe343c7e8d2cb58c90c408936f2
-EBUILD gnome-boxes-40.0-r1.ebuild 3884 BLAKE2B d9321b6bfec5b631ebd52e1bd318fd58ceae6753c5119f9d9dbfeb5c8bbc96509fc8dfcfedcb4d2641de18420a72d288817dd8b541289f39142a2be661603564 SHA512 1740b1ec84b0d53783463a5c3ffce68a42b17aa5546e8b2a00cc0f219bfea60644dba9e489a9b12924a07c2666805405a21bba6a9d172981cb792be3cfb98d06
-EBUILD gnome-boxes-40.1.ebuild 3884 BLAKE2B d9321b6bfec5b631ebd52e1bd318fd58ceae6753c5119f9d9dbfeb5c8bbc96509fc8dfcfedcb4d2641de18420a72d288817dd8b541289f39142a2be661603564 SHA512 1740b1ec84b0d53783463a5c3ffce68a42b17aa5546e8b2a00cc0f219bfea60644dba9e489a9b12924a07c2666805405a21bba6a9d172981cb792be3cfb98d06
+EBUILD gnome-boxes-40.1.ebuild 3883 BLAKE2B 078f3a13009bcc8a5b82097812d5c6426c43552f1668e81eb8cf7cb5e51fb72fd82b5f03d70fbcacc0a4031b1a2e73672a52d6d45f579d3f2c80d03541d4fb83 SHA512 b74a8cb8dd12ac1654d0f84ccf976b498d68f90f3a60545fef7c50c3e33ae36402ce9d5e3682cb0ea84155dc3d7e5137423d2f7d9c675deb13b77f139024b939
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/gnome-extra/gnome-boxes/gnome-boxes-3.36.6-r1.ebuild b/gnome-extra/gnome-boxes/gnome-boxes-3.36.6-r1.ebuild
deleted file mode 100644
index 6c8eb895689d..000000000000
--- a/gnome-extra/gnome-boxes/gnome-boxes-3.36.6-r1.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2020 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 3 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.22.20:3
-	>=net-libs/gtk-vnc-0.8.0-r1[gtk3(+)]
-	>=sys-libs/libosinfo-1.7.0
-	app-crypt/libsecret
-	>=net-libs/libsoup-2.44:2.4
-	virtual/libusb:1
-	>=app-emulation/libvirt-glib-3.0.0
-	>=dev-libs/libxml2-2.7.8:2
-	>=net-misc/spice-gtk-0.32[gtk3(+),smartcard,usbredir]
-	app-misc/tracker:0/2.0
-	>=x11-libs/vte-0.40.2:2.91
-	net-libs/webkit-gtk:4
-
-	>=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-2:0[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-40.0-r1.ebuild b/gnome-extra/gnome-boxes/gnome-boxes-40.0-r1.ebuild
deleted file mode 100644
index 2078408e917a..000000000000
--- a/gnome-extra/gnome-boxes/gnome-boxes-40.0-r1.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 3 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-40.1.ebuild b/gnome-extra/gnome-boxes/gnome-boxes-40.1.ebuild
index 2078408e917a..0915f9bd34f3 100644
--- a/gnome-extra/gnome-boxes/gnome-boxes-40.1.ebuild
+++ b/gnome-extra/gnome-boxes/gnome-boxes-40.1.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 d73153132209..4b2198edd57e 100644
--- a/gnome-extra/gnome-calculator/Manifest
+++ b/gnome-extra/gnome-calculator/Manifest
@@ -1,7 +1,3 @@
-DIST gnome-calculator-3.38.2.tar.xz 1004684 BLAKE2B c2b6a0ff2e6a91c43a1670945af989b715f0f7369050dac13bec02898ef6780ec4484c6ee9f6e6bb19b8ecc9d7d8c2df0c824ac9c3309783cbc89b96fe1f16b9 SHA512 41e58b34640e795108a552aa0d95b03f0c84c4d5af6eef7fe8350c5f4e031a0fad7cad73034b38b2121f09687815b6b10a6a86fb00c7cbf720ccb06a8eea0403
-DIST gnome-calculator-40.0.tar.xz 1022596 BLAKE2B 9522c8698492eeb07fbd86e8baeaee67433a1d43b2c97c4c895ca7ac8958a01c4e05c73598b1c14a2b333bfbc156b824669b20e878fcb681ade99c1ceef5ce72 SHA512 f22e9a9ade2f236142b7ebc3e54ed07834b049087ed8606571730e3bef2ab86317718df622368515266ba9578f660d7cd892cf87cf43bca9441369c838967c5d
 DIST gnome-calculator-40.1.tar.xz 1023164 BLAKE2B 977fc227adaa50efa271776035a11ca79166a703c9c8d618c13af477056622a9faa42c3a8876257a117486399e91fceec7a19b930293883078846a645db912fe SHA512 f46acc802ef130ec59e4376a02032ab683e6d166d691d7c5f626e2a978f017f171c0e8ad50991d1828cb325b1bd53f63ef256b9b24860842224fa3dd7e27f4da
-EBUILD gnome-calculator-3.38.2.ebuild 1595 BLAKE2B 508741b5f8eb80e83d16e3d035b61baf96253db07ef3f9dbdf08d4c0035d926be754087c6118cdf7186c9bf6c57f966363a5a388fcb76437faf0c711940d729d SHA512 7d1667034f9041836fcae738b6c197efd02126da6f95bf868da200040eea10ccc36e66a7aed61a49c546ab3578abee95ce9b4a5ff71bada6d0bd522c73943921
-EBUILD gnome-calculator-40.0.ebuild 1690 BLAKE2B 8a4c93d1c5466668b3bb2a8ac40124e15eba2ae5ade32cc1bb2a5282fb717bde09734f7a11fb791bacd6bf07ced3391691155f248d9c7d1a8706bee9a605b1a6 SHA512 bcf726e99cd69ee997aaa32d4059f328a3a93bf18633719bf44b7533303520bc12cb0f0cc4c815cff2b665134adb059a6b581f09f2420b123e41359f30ebb962
-EBUILD gnome-calculator-40.1.ebuild 1690 BLAKE2B 8a4c93d1c5466668b3bb2a8ac40124e15eba2ae5ade32cc1bb2a5282fb717bde09734f7a11fb791bacd6bf07ced3391691155f248d9c7d1a8706bee9a605b1a6 SHA512 bcf726e99cd69ee997aaa32d4059f328a3a93bf18633719bf44b7533303520bc12cb0f0cc4c815cff2b665134adb059a6b581f09f2420b123e41359f30ebb962
+EBUILD gnome-calculator-40.1.ebuild 1688 BLAKE2B 7b653a1ea2310a6c36a393b5fe04dd3df9bc78c7b42c12de6db74f62ab6c1346413ca46240c8f07514a6acd179c1c6842adda236afd6da139dc800acbc0a8a22 SHA512 e11e1cbe2a4876529bcfdee88b2da2f4c068f56b64997f7a23ba036bc6441cd165e8d18098e2bb5eb048571511c4bdd00c6db32f8fece103d724c27bf395196e
 MISC metadata.xml 435 BLAKE2B f9ee442cf41d13599b2ac8bbe73a3f69961b5bce68e82544e8d1e5f886c97301b92675ccd38607d5bad961c910ec8ed9ae30a12ca9028e3d9cd92a2ac3bd8681 SHA512 4af60d7bd9142bc3293176d47ff239dbbc10d86493801244e9766bddd556a9c3b34b188f76d250074b3f337e88dc3d97c803ce244e15503c7380015772a9228c
diff --git a/gnome-extra/gnome-calculator/gnome-calculator-3.38.2.ebuild b/gnome-extra/gnome-calculator/gnome-calculator-3.38.2.ebuild
deleted file mode 100644
index 466d1d3cd563..000000000000
--- a/gnome-extra/gnome-calculator/gnome-calculator-3.38.2.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-VALA_MIN_API_VERSION="0.40"
-
-inherit gnome.org gnome2-utils meson vala virtualx xdg
-
-DESCRIPTION="A calculator application for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Calculator"
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="+introspection test"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~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.19.3:3
-	>=x11-libs/gtksourceview-4.0.2:4
-	introspection? ( >=dev-libs/gobject-introspection-1.58:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-libs/appstream-glib
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	$(vala_depend)
-	net-libs/libsoup:2.4[vala]
-	x11-libs/gtksourceview:4[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-40.0.ebuild b/gnome-extra/gnome-calculator/gnome-calculator-40.0.ebuild
deleted file mode 100644
index 17bd94f4fdf8..000000000000
--- a/gnome-extra/gnome-calculator/gnome-calculator-40.0.ebuild
+++ /dev/null
@@ -1,73 +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 ~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]
-"
-
-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-40.1.ebuild b/gnome-extra/gnome-calculator/gnome-calculator-40.1.ebuild
index 17bd94f4fdf8..69a80e716f93 100644
--- a/gnome-extra/gnome-calculator/gnome-calculator-40.1.ebuild
+++ b/gnome-extra/gnome-calculator/gnome-calculator-40.1.ebuild
@@ -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 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~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 ee37602e4a15..e27889cc7eb1 100644
--- a/gnome-extra/gnome-calendar/Manifest
+++ b/gnome-extra/gnome-calendar/Manifest
@@ -1,7 +1,3 @@
-DIST gnome-calendar-3.38.2.tar.xz 547228 BLAKE2B ef7ba6dce47d9ee664d1dc648da81738cfd20108799e0c262b16152ce7b590613b711fbcf9ddbff4fb9ba597b1067b558697874744abd3f32ac08d7dcbe5550d SHA512 2744c91e37c8966f2deee1588fe439ccd520344c24f1b74422f7ba95f592c9691a2530984499a00af3065447932195879bc1b5b9e8ae6731487ac047e5d75267
-DIST gnome-calendar-40.0.tar.xz 552888 BLAKE2B 27480d15ab8c88cc28367468895247aa51bd96c955aef052e71c180c334d0034cd26406237ccf8dbece743b16a6c4b08809576882eb9a5d1018d5e2df12993c3 SHA512 8c1f7ecad90e8cefc2560795a0045ff243e4647d717b66d433b11deb10a01d07d2ab03978da8cb4d0e9227e91338213a8142ebae5044c0a8cf26e7c0f64f4b7e
 DIST gnome-calendar-40.1.tar.xz 553592 BLAKE2B 83517f9fc23d3b61f4b9ee824e7a95d0b002b61a6e8afc68805dd28b947347b9d68751e4ad9ce5a92287e3973f19a99e5daa3ad6829eae961988b56d9349f6b7 SHA512 f04db5da5ceb5518766d57ddf14eb0c3de19c499ba00a0f426f4059cf53b064529c2e317198d92f45f400d6f4ae2d34d0fde4dc60293a480584a199d2d3a3a5a
-EBUILD gnome-calendar-3.38.2.ebuild 1161 BLAKE2B b412b7ca1f052b5bd44a20be13f5c73c2e1396d059214c525988316ff7b71363d8c9e2b40cf50afabada283660f2a40dabb2cdecf3cc75e1ef068c7896ca3355 SHA512 caf494d9cfd5a908aa42da499fbef53adb71592fcf327b83fae29caeabbb1b0f67c3c0fccb0a67ff1d5d5cb69f08306a1a721cf36fa1e3aa9751e638712f5254
-EBUILD gnome-calendar-40.0.ebuild 1153 BLAKE2B f0d2893921ceb284a599c7f681bbc5bb7a34f72bd343b15dacece81537463bd2155f7fb90cf47785a5842d4a9dbb28593ec520ad73c7b50740a09f0dd7b71c4b SHA512 01d68497d5fbea653fe9d7343f733fa2dc60451d0155267a0a17b2ce91e2901ef77d7b0af8987e946e6165ca98d0895d1bf74dc739130cc96f498bea6a9b824a
-EBUILD gnome-calendar-40.1.ebuild 1153 BLAKE2B f0d2893921ceb284a599c7f681bbc5bb7a34f72bd343b15dacece81537463bd2155f7fb90cf47785a5842d4a9dbb28593ec520ad73c7b50740a09f0dd7b71c4b SHA512 01d68497d5fbea653fe9d7343f733fa2dc60451d0155267a0a17b2ce91e2901ef77d7b0af8987e946e6165ca98d0895d1bf74dc739130cc96f498bea6a9b824a
+EBUILD gnome-calendar-40.1.ebuild 1151 BLAKE2B d5f2a06f532763a4d35e03b55e5f91ec793d3f38f48a577bbe40675955ac41d48b7e3e9dffe90346fbc30c34ad4389d5c2c0dedf40a7de74b4c098b33b15f96c SHA512 f5fd61dd41338dfe0fe9b144bd06af5db9478588bf0af5ce5c82d568c69a3c521820bb594238b70fe1f5a564a4c8049e2762fdad9aa95d22da54dd2a9f4630c7
 MISC metadata.xml 522 BLAKE2B 24cb41757041daedf83e72cd8620bef49d2bced678ede42c1a071c3cf99f2f157b086acc393953b42a612dd5c4d622b0a869934f89661c28be742370cd4688c2 SHA512 f595d013522df745a86b01e6696ea5fe6dafa55d55e3fe22adf469fef56507846194f24c2ec5cd13382c69a494ca530438d12c69a6bec41247da1783fc78eef8
diff --git a/gnome-extra/gnome-calendar/gnome-calendar-3.38.2.ebuild b/gnome-extra/gnome-calendar/gnome-calendar-3.38.2.ebuild
deleted file mode 100644
index 1f4e715aeff6..000000000000
--- a/gnome-extra/gnome-calendar/gnome-calendar-3.38.2.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 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 x86"
-IUSE=""
-
-# >=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-0.0.9:0.0=
-	>=dev-libs/glib-2.58.0:2
-	>=x11-libs/gtk+-3.22.0:3
-	>=net-libs/gnome-online-accounts-3.2.0:=
-	>=dev-libs/libgweather-3.27.2:=
-	>=app-misc/geoclue-2.4:2.0
-	>=sci-geosciences/geocode-glib-3.23
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	dev-libs/appstream-glib
-	dev-libs/libxml2:2
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-src_test() {
-	virtx meson_src_test
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/gnome-calendar/gnome-calendar-40.0.ebuild b/gnome-extra/gnome-calendar/gnome-calendar-40.0.ebuild
deleted file mode 100644
index f79c40d6c495..000000000000
--- a/gnome-extra/gnome-calendar/gnome-calendar-40.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome.org gnome2-utils meson virtualx xdg
-
-DESCRIPTION="Manage your online calendars with simple and modern interface"
-HOMEPAGE="https://wiki.gnome.org/Apps/Calendar"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~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-3.27.2:=
-	>=app-misc/geoclue-2.4:2.0
-	>=sci-geosciences/geocode-glib-3.23
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	dev-libs/appstream-glib
-	dev-libs/libxml2:2
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-src_test() {
-	virtx meson_src_test
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/gnome-calendar/gnome-calendar-40.1.ebuild b/gnome-extra/gnome-calendar/gnome-calendar-40.1.ebuild
index f79c40d6c495..ec92dd3fcfdf 100644
--- a/gnome-extra/gnome-calendar/gnome-calendar-40.1.ebuild
+++ b/gnome-extra/gnome-calendar/gnome-calendar-40.1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Calendar"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 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 c675b052bf94..c09124641de9 100644
--- a/gnome-extra/gnome-characters/Manifest
+++ b/gnome-extra/gnome-characters/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-characters-3.34.0.tar.xz 188012 BLAKE2B 9e4f6dd972bb1a19a4ef91312bc35b8a4936dcdf8e40c97cb2e1286241ab405136b717e0ae6ec283c2b11a43d29509dcec45f0c8e59a196e98eeb1a19ed825e3 SHA512 4dc2f0027c7079034d50c2743607391a0e529bcaf4f8fdd495b05aa776027609a43686f4621bcf30f09a29fa6f4d5fba6ed6166e51ab66f03dedf3032bc65632
 DIST gnome-characters-40.0.tar.xz 195664 BLAKE2B dc14f80654acb2b00b48ebc0a76d6d9f1236cf9b2d95f2a5fb6e4eee197359f3efadfe6c53eed66746e57d5cde2701967731fcd99e4d24695170937b69cf229e SHA512 cefc4b62b20351739510c901661e94217df4bd6a5b6a2c2f439b80ac31adfd6ba90098bbc9a3169c501d8ada9b54ee615c83ceade2639af440e86e29bce7ee8e
-EBUILD gnome-characters-3.34.0.ebuild 810 BLAKE2B 79de33de77f87fecd365c350137498e624f32e1b2e5fce5aff0580ad8becf92c3a28b1ccad931d1362af52d0c991f4ecc7a3940d275ffac995e8694e6aacadc9 SHA512 9f8988e7fc0de0680f07067a90241599c780fb450bc8235d47756d364b7ad47f2a7d81439e2fd72a66736a92cd6bc4e81939f689a8cc0b57c440e69e51523fce
-EBUILD gnome-characters-40.0.ebuild 832 BLAKE2B 404bc65c0940a49892029ca374ec2d9e4cad28cb838908772fce5a4d35fa40778f8b3f413ac01354642b5993bf2999911b424837983a2851fe4460355d08e940 SHA512 d0d5d312680b6b5435cd151d99c1c510c0bda13b26e08a1ade2a7ba09cb4a685d1b097f94315591c18d534d9108db3c9bd5d4fb71456d8c078da06cd95ee00a5
+EBUILD gnome-characters-40.0.ebuild 830 BLAKE2B eea129b0d7bf12cd736dd923addae15b967d093e7025acfe30e475be00f65414a0ba06259eb0518e24ba7997d16df844a2f133c5faa08f939ef8b1dd6c7f23f4 SHA512 253f507b93b5657bf6d7933839686d300229c474991028a7f53117ca84c2675e16f712d83e0a16fd9a6da0ab60c860fe7229070a42e687733f01fb8ea0431ea7
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/gnome-extra/gnome-characters/gnome-characters-3.34.0.ebuild b/gnome-extra/gnome-characters/gnome-characters-3.34.0.ebuild
deleted file mode 100644
index 7b6c3be70c77..000000000000
--- a/gnome-extra/gnome-characters/gnome-characters-3.34.0.ebuild
+++ /dev/null
@@ -1,41 +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 x86"
-IUSE=""
-
-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]
-"
-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-40.0.ebuild b/gnome-extra/gnome-characters/gnome-characters-40.0.ebuild
index 11873061fbd9..37a15a0b4058 100644
--- a/gnome-extra/gnome-characters/gnome-characters-40.0.ebuild
+++ b/gnome-extra/gnome-characters/gnome-characters-40.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Design/Apps/CharacterMap"
 
 LICENSE="GPL-2+ BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 RDEPEND="
 	>=dev-libs/gjs-1.50
diff --git a/gnome-extra/gnome-clocks/Manifest b/gnome-extra/gnome-clocks/Manifest
index c87747656440..1312caf9e06f 100644
--- a/gnome-extra/gnome-clocks/Manifest
+++ b/gnome-extra/gnome-clocks/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-clocks-3.38.0.tar.xz 375400 BLAKE2B 3fa3a10c9bf42b9dacc9bc8b3b6b2193d97ec310fa324298a02c31b97b63b8d1c11e9a849f3cab79e63725fefb61f07bded9118357e71f25111420b9115e9425 SHA512 ecee2117b55e9b61ef380d9257d24ddfe8b5b4fa6d8c0372c92e8d30b5eafe5fa4736e6aa14708460b3c9fc598912cc29a8c32f3f8585ad18b0b2eb9f15fee14
 DIST gnome-clocks-40.0.tar.xz 378584 BLAKE2B 9521e6fbb048364f2cc678ea6e3e235d1b1fbdf214785ab2f5b1cfc87b8225f6ce55197459571dc762a3a0c18cc49a002bb4aa7a509fd229942686bf46d097f2 SHA512 7d117a7faead25d7f68dded7bbde650a61b2765fc2d22774dc2e7673fa0f711c8a59ac79c88b2dfdc70fc80277110c987e387fa7e95ce6c6b95f1efd5f392e85
-EBUILD gnome-clocks-3.38.0.ebuild 1045 BLAKE2B 4eb66dbe9c0891a3bf8444b5eda0b1203763b93bfbe452d0772e545f6d62ce843762f9a1d624fb11589f36749d545e9b3e3ce5d731c4b330b7771c5d2c3e170b SHA512 6a9fa7cdde337658c9c6c0ec3d815d253809500d8e6b0e901d4443f230b8247cc95dde397f75f4b86782e27c663082ddcc19c2fb19efc93755752493c876483f
-EBUILD gnome-clocks-40.0.ebuild 1079 BLAKE2B 951585cb4311795e5b3c22abe73f48c31497d1d6897926ca225813a71dc10f37fa59be72be743e080079de3ef4a44c7ff21e427ff365b9c36887c3522d3db940 SHA512 043d82eb1f284f59eea74af88fcb6bd59bdc9d31ac0b6e0bfce5b45f57033659c97b3df45bf71e25b77af08cea6ecacc9ef4d8c6fb04fb443dcad78e07dd1c12
+EBUILD gnome-clocks-40.0.ebuild 1077 BLAKE2B 122a5788443b3972639d333ae2e00937ba22f8eb36058aa0fdf676191c065684efec72342540e8cc42e564eea8761035551a0c700abc0870c3b49bc5f4d3e3bb SHA512 897270c876437f705ad75f3b00126bc9ee80e7b2e4602862e1fc61763e47bb351cadf8e8e73d2a2d1f528689b7458a2139b1f2af3900f58f087625aea6f3360f
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gnome-clocks/gnome-clocks-3.38.0.ebuild b/gnome-extra/gnome-clocks/gnome-clocks-3.38.0.ebuild
deleted file mode 100644
index 1f1779f507b6..000000000000
--- a/gnome-extra/gnome-clocks/gnome-clocks-3.38.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-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 x86"
-IUSE=""
-
-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() {
-	meson_src_configure -Dprofile=default
-}
-
-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-40.0.ebuild b/gnome-extra/gnome-clocks/gnome-clocks-40.0.ebuild
index 7631e76c4d18..1f6623673b41 100644
--- a/gnome-extra/gnome-clocks/gnome-clocks-40.0.ebuild
+++ b/gnome-extra/gnome-clocks/gnome-clocks-40.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Clocks"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.58:2
diff --git a/gnome-extra/gnome-contacts/Manifest b/gnome-extra/gnome-contacts/Manifest
index 1bcd2a2fbb2a..565b3776302f 100644
--- a/gnome-extra/gnome-contacts/Manifest
+++ b/gnome-extra/gnome-contacts/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-contacts-3.38.1.tar.xz 657376 BLAKE2B 5c042566ad99be1bda454466dcc2a42d6494cfbfb5a9f60eb0fa718a8d9bcbb986798ec48a87d5d322989b22d0fac2eee69df852ae39ba8a228ad91f50247c30 SHA512 bc2ed06d491c4773b9cedb2c51dc390a95d0271cf22d54864f5da4d892f80efece3cbdc1b90b4497f730039c8c83065b2a0ca590cecec579f011dd324ff8f134
 DIST gnome-contacts-40.0.tar.xz 270412 BLAKE2B 4d7970ac5417dfbd9b0acf51efd8ce1310cee51f90de8d8afa0239d918269642869e35befb64cbfb5acf1bde17ac738192d5ef802d27df47936165b03ed20b51 SHA512 5f9bb7e805cc67a379fd1ab5945774f5067be64d6577bc9cf0514c4ca6b53937555dc96591244d8be418b2b07f7c5401e8186dca5baff3a2b6c5a2ae459a676f
-EBUILD gnome-contacts-3.38.1.ebuild 1638 BLAKE2B 13ecf49290a796cbf04b66c01b702a311543f82c53021444088a51517bf8ba399eac9792e549f25e68f3acf480790271a029cade29f940ce418070f26af4fe4b SHA512 a83e01f87b803a5e258d449b6fcf01591e79560180355d8f89b490e270095cd44a676ab6eaba45fa63e8429ad3012cd786c8b484be6dcd67bab2baa9bd7002ae
-EBUILD gnome-contacts-40.0.ebuild 1703 BLAKE2B fe91ca45d0e6e629eb77f802f880ae0e74bc5a3b5e6c5d2787ad2f18060a1c78ead87143ad0728c3a75b8cca9623f07fe9810edc0a47a74e48e88246f5b04494 SHA512 81747627e73d7da2c7c8c3da6a5ab82def82d67af5adbf5ed9a2a74118e67dc6276291c4d28264e5efb9dac11769de972d710e6b5002fb4e1815dca395d1f0e8
+EBUILD gnome-contacts-40.0.ebuild 1701 BLAKE2B 3eb51627bb2f6c0553f2826082ac53cd53996f438e0dba18d3519dcb1b7872ad9858e6523015d5ad3ac643b0bacb66f64034dd29ceb430756b9ca4c3fc7b21a3 SHA512 61be9e976af8f3dca5ba758d8617ecdc5260a3c18ce7ddb8aa41f1189dfa64eea5c70a73ca1d9d5b12672dc9b33251dc9235aaede657d6f9e80029289abc723e
 MISC metadata.xml 325 BLAKE2B f00835a4dbd2fafbc578f1d36cd3101da6ccbd9236b6a874c862f6e584fe856c7fc1585e0d9da7c3c6a243cc1ea271fc281a127c2f330ba91495873baea0ac6b SHA512 5c6da9fcb4666a80a2fcdaeaa0263feee21140932084683dec7257bbb9e686a08d7d2b476684800216c13f3c851a92416267d5415c25643200250edd8d6041f5
diff --git a/gnome-extra/gnome-contacts/gnome-contacts-3.38.1.ebuild b/gnome-extra/gnome-contacts/gnome-contacts-3.38.1.ebuild
deleted file mode 100644
index 3a32c93b4bec..000000000000
--- a/gnome-extra/gnome-contacts/gnome-contacts-3.38.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
-VALA_MIN_API_VERSION="0.40"
-
-inherit gnome.org gnome2-utils meson 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.0.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="
-	${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-40.0.ebuild b/gnome-extra/gnome-contacts/gnome-contacts-40.0.ebuild
index 7cf6f2b6d3a1..55d8856f0982 100644
--- a/gnome-extra/gnome-contacts/gnome-contacts-40.0.ebuild
+++ b/gnome-extra/gnome-contacts/gnome-contacts-40.0.ebuild
@@ -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 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~sparc x86"
 
 VALA_DEPEND="
 	$(vala_depend)
diff --git a/gnome-extra/gnome-dvb-daemon/Manifest b/gnome-extra/gnome-dvb-daemon/Manifest
deleted file mode 100644
index 6d1a31935d91..000000000000
--- a/gnome-extra/gnome-dvb-daemon/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gnome-dvb-daemon-0.2.90.tar.xz 700504 BLAKE2B ff08784a7b7e995a0bddda724cd000a2f98da22d7e27897a837e345523c02c2bf016f96861341181b0d4f1ee9afc5104675f1ab2c77ab14815f08f34324693d5 SHA512 73e18ed5b267f1ef1ceebfe4ff25ccac3222bca9d7da164dd16acf9367c6b9f9710e915c81ef851c54b6fcae9b08f36d0c78665f4af425afc41b4c08eba49c40
-EBUILD gnome-dvb-daemon-0.2.90-r1.ebuild 1233 BLAKE2B b176effeb61e4a69b9990f2c4992ba411fa5a6b9f6128948d424dfcc0a92ae3adab74a04015a8a43f7d11c51bcc1c98c4c0803539031d344b142c9fb1e6e6c3b SHA512 81216f3cf17a1e012c50e2df31d513f30d2007d60e5d77887a57cdb63500c4d217c13d86e19b0a966a662323badedeebc10e8a9912c4ca0615297ebf607830b0
-MISC metadata.xml 499 BLAKE2B 196e31566bc7181b8f4ca791e7d43062092dde4cb932fd3d87519a7685b9ca1e4b8803f3d773242bb2c1b251c8a6d46243005b7f9e53504fa528d4fa51251d92 SHA512 beb670424cdcc964d0a3628e40c84f3244909e998d69efe644af500f678995ca78bffc5195349c20b2ebb1977e9f87d36d1f03f2827bda191d2aa843fb57dfac
diff --git a/gnome-extra/gnome-dvb-daemon/gnome-dvb-daemon-0.2.90-r1.ebuild b/gnome-extra/gnome-dvb-daemon/gnome-dvb-daemon-0.2.90-r1.ebuild
deleted file mode 100644
index b5e864f44b67..000000000000
--- a/gnome-extra/gnome-dvb-daemon/gnome-dvb-daemon-0.2.90-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python3_7 )
-
-inherit gnome2 python-single-r1
-
-DESCRIPTION="Setup your DVB devices, record and watch TV shows and browse EPG using GStreamer"
-HOMEPAGE="https://wiki.gnome.org/Projects/DVBDaemon"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND=">=dev-libs/glib-2.32.0:2
-	dev-libs/libgudev:0
-	>=media-libs/gstreamer-1.4.0:1.0
-	>=media-libs/gst-plugins-good-1.4.0:1.0
-	>=media-libs/gst-plugins-bad-1.4.0:1.0
-	>=dev-libs/libgee-0.8:0.8
-	>=dev-db/sqlite-3.4:3
-	>=media-libs/gst-rtsp-server-1.4.5:1.0
-	media-plugins/gst-plugins-dvb:1.0
-	dev-python/gst-python:1.0
-	>=dev-python/pygobject-3.2.1:3
-	>=dev-libs/gobject-introspection-1.44.0:=
-	x11-libs/pango[introspection]
-	x11-libs/gtk+:3[introspection]
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.40.0
-	virtual/pkgconfig:0
-	>=sys-devel/gettext-0.18.1
-"
-
-src_prepare() {
-	gnome2_src_prepare
-	python_fix_shebang .
-}
-
-src_configure() {
-	# Prevent sandbox violations, bug #569992
-	addpredict /dev
-	gnome2_src_configure --disable-totem-plugin
-}
-
-src_install() {
-	gnome2_src_install
-	python_optimize
-}
diff --git a/gnome-extra/gnome-dvb-daemon/metadata.xml b/gnome-extra/gnome-dvb-daemon/metadata.xml
deleted file mode 100644
index 5a4aadc6227c..000000000000
--- a/gnome-extra/gnome-dvb-daemon/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-<longdescription lang="en">
-	GNOME DVB Daemon is a daemon written in Vala based on GStreamer to setup your 
-	DVB devices, record and watch TV shows and browse EPG.	It can be controlled 
-	by any application via its D-Bus interface.
-</longdescription>
-</pkgmetadata>
diff --git a/gnome-extra/gnome-getting-started-docs/Manifest b/gnome-extra/gnome-getting-started-docs/Manifest
index 8ce7567d94bc..7608aeb79cfd 100644
--- a/gnome-extra/gnome-getting-started-docs/Manifest
+++ b/gnome-extra/gnome-getting-started-docs/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-getting-started-docs-3.36.3.tar.xz 81799224 BLAKE2B 33edbd8c7cb2b5f18411730cda0c33f696e2552f1d5ab1fe5bb8ca6b754dcd230d7f292680efffbddea9c237b811876fe313d282ac26561884d4c1b48ceb951e SHA512 7e1394329b73c3db18c1aa9b3542f0cc934bc6593e485a683cbcc8ac1ef4ecb00b6673f21d82fd36efed6348943656456d6fbc03223f4b2a61fabfaace7a84ff
 DIST gnome-getting-started-docs-3.38.1.tar.xz 81798220 BLAKE2B c2263ded6f09b4e10a8cac7e3a5a49ab604a0e5049b8f4c38a16ffaae36ac8b80c410bf061b848193d29b6aa9c9fa098c21e59b1c01012fda569aae8ae13c0a8 SHA512 125c750a91f8c3ae6d9f828501e24410436a849408971c9dd501dcfef7642a0296c79308066645658eeb89a96cd84c2030f9168fd31de7102b71d58b6e557451
-EBUILD gnome-getting-started-docs-3.36.3.ebuild 418 BLAKE2B 62ec6d5d13594c48310d994bd7d77f686071d0bc60f4beec0a6411ef3a43870fb19c978d4397fd14f0dee166296caa04ec60e6fea5f7512ee8eae4b2afc6ca90 SHA512 acde5280c0204874e1b50de7698e7bc9983eea9a4d56d70dd6408f18e39fa79e00c305bfdf0fb1ee062475579b9f30826bbd7eba2bbb61ab059b2c0d37cf1fb6
-EBUILD gnome-getting-started-docs-3.38.1.ebuild 416 BLAKE2B 1a717d095b90112bb2e88815b2da9eae268048fc44d481baebc9bdde358a857e21b0bb1eff04163626ee4af985e2243f2d63a0ac0c152ada3da0261a65f7d106 SHA512 bdd9ffb2dad906ecf7f18e8fb7a1e8a9bfaa4a77e7682e4a266aedba40279bd1f2ac8a3f78116b8693daf30290303423a82776b5c31382de6f3946b3e312111a
+EBUILD gnome-getting-started-docs-3.38.1.ebuild 414 BLAKE2B d167b2e17419437cb4c024e06b23b9722e6d58f0aadfacab607166b578a75be648ce8f9cf9e9ea8b982edec203f5ead02be29b610be8e3a9858e53a2c5c9fbb7 SHA512 08c95e74390435a415aa03c7d0670b655d6cc3e38124029c5bb644dea46c656d5a80cb8ba0c3ef0ab9ddc9cb85fa82addcc8b92da17a06060dcda18764062916
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gnome-getting-started-docs/gnome-getting-started-docs-3.36.3.ebuild b/gnome-extra/gnome-getting-started-docs/gnome-getting-started-docs-3.36.3.ebuild
deleted file mode 100644
index feb5e48c6b5c..000000000000
--- a/gnome-extra/gnome-getting-started-docs/gnome-getting-started-docs-3.36.3.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="Help a new user get started in GNOME"
-HOMEPAGE="https://help.gnome.org/"
-
-LICENSE="CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-RDEPEND="gnome-extra/gnome-user-docs"
-DEPEND="dev-util/itstool"
-
-# This ebuild does not install any binaries
-RESTRICT="binchecks strip"
diff --git a/gnome-extra/gnome-getting-started-docs/gnome-getting-started-docs-3.38.1.ebuild b/gnome-extra/gnome-getting-started-docs/gnome-getting-started-docs-3.38.1.ebuild
index b13e7bd25c5d..4d1327e65271 100644
--- a/gnome-extra/gnome-getting-started-docs/gnome-getting-started-docs-3.38.1.ebuild
+++ b/gnome-extra/gnome-getting-started-docs/gnome-getting-started-docs-3.38.1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://help.gnome.org/"
 
 LICENSE="CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 
 RDEPEND="gnome-extra/gnome-user-docs"
 BDEPEND="dev-util/itstool"
diff --git a/gnome-extra/gnome-shell-extension-appindicator/Manifest b/gnome-extra/gnome-shell-extension-appindicator/Manifest
index 453d0ac86b03..d35c5ca36949 100644
--- a/gnome-extra/gnome-shell-extension-appindicator/Manifest
+++ b/gnome-extra/gnome-shell-extension-appindicator/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-shell-extension-appindicator-34.tar.gz 34764 BLAKE2B 3a619f810d9ddf7984fc3b0c96735eb0f9233f36ff3cbddc5b28a8243f55d57cbc9c58b49516e99b30f35b12b6e747b7fa288fdc36f99cf7e61b7ad8cc2e84de SHA512 1f02a7cc3cfb90af8ee1a0bb39135fb3203bcc87d13cda0cf7f110db4b838a7c082eba30246a913306ef0e4b2fdb7c9f52f24f62525013ff8f1de9d054d45425
 DIST gnome-shell-extension-appindicator-37.tar.gz 39830 BLAKE2B 6e8af3acf6c9a4478fd663aa5814fae5a59e5ed01a759d7aa37d056794c3ea6c595203b622087f02170d9f05e6fa1c47138da9962ae33d9f398a7659a645be57 SHA512 2aeb93ca015936577f314e0313dd963d3712edf27a5e9721813b6d72b5050de9427d7aa3a296ced40352a421251ecae7022fb58c1da02947bc0a6205e2d41d1b
 EBUILD gnome-shell-extension-appindicator-34.ebuild 899 BLAKE2B 3827e3dff875e238cf07e61be9caabccd2d04f1b515cf2c3697595f163da0e5865bcf2eb9f88bb1d239f04b84b7846b2382761976c7e16df069ed45e95846671 SHA512 49f7bba575fbf669f12595328349958aee645d1e7ef3572f1ffebcb8c5fa6b8896afa7c6fcab4f12391fe3834002e15b2e081db4b2e470dad3ae9808103015ee
-EBUILD gnome-shell-extension-appindicator-37.ebuild 939 BLAKE2B a7925769590ff0489dfa677d6fa276bd918f46b040738e8651347cb2a9ed1b566e406b85509cb183770416f334369ce5ce5802e972e0c082d4f21d6ee501a26f SHA512 3b7f2736755aaea5a57732052421871a8dea56b8af82c601a155db054cf812bde40c8805d192ddc6e7564104d72797072c01c9a394b01071732f01fc1fe63047
+EBUILD gnome-shell-extension-appindicator-37.ebuild 937 BLAKE2B cdd832bd03c3ca6e39a1f273d5a91b70fd0e0fd6ea2db5889c1efca2dcf1383331cff7a1c8a34c1da8a3ada5489f774fad3e515692d30b5c03c5847c6ba68aa2 SHA512 d61874c0aedce603f251aa1071f253fb63ee83cff873ec510e978053d5d105d299786ed16a9ade53556c457db278dcf66b77ffa050ea69406d433426d4f50b28
 MISC metadata.xml 240 BLAKE2B 63b29b3fa5f9613689cca20017685c7b8fda461b37bd79b15deb70b8691afdbb1a262dac93cb3520a9d9e9c49ba745f8c797b269bb41933391a5a94667bb1c24 SHA512 2d1e63e0f72d6332021e3c9bdacb1e2b203a31b907c5a93c305e4f7b0eeef0856fb0cca37bc0d7d3d1ba77b08f81c7626f834239e3484e13032cedf59304239e
diff --git a/gnome-extra/gnome-shell-extension-appindicator/gnome-shell-extension-appindicator-37.ebuild b/gnome-extra/gnome-shell-extension-appindicator/gnome-shell-extension-appindicator-37.ebuild
index f06b56b39696..b3454b69d6b2 100644
--- a/gnome-extra/gnome-shell-extension-appindicator/gnome-shell-extension-appindicator-37.ebuild
+++ b/gnome-extra/gnome-shell-extension-appindicator/gnome-shell-extension-appindicator-37.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/ubuntu/gnome-shell-extension-appindicator/archive/v$
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/gnome-extra/gnome-shell-extension-applications-overview-tooltip/Manifest b/gnome-extra/gnome-shell-extension-applications-overview-tooltip/Manifest
index fcb67fd936a9..466ccc8bab0a 100644
--- a/gnome-extra/gnome-shell-extension-applications-overview-tooltip/Manifest
+++ b/gnome-extra/gnome-shell-extension-applications-overview-tooltip/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-shell-extension-applications-overview-tooltip-11.tar.gz 81717 BLAKE2B bbafaa58bd9b7b56c5cc12c953922d40c1901fe78491d5ea344ab6f3dda65e51c02851b2106ef271d662be365722ca35f61a836f509bc1e6a4e6c03ecf1de3eb SHA512 c108b8bbf09793a18eced02e7fc5a68f1d71b9b31f0480b9346bf9b44507fedf85e6c1e640fa7d282ea69b63ad056116acecb494beb5c18b784b00348e485f00
 DIST gnome-shell-extension-applications-overview-tooltip-12.tar.gz 27394 BLAKE2B 169460c7063fda0f664688303984c4a5c7fcd8a6b32281c2eb630ebea8143b95e96038f130b09c939371474b5ef27656cf77eec942412fcf3908a5d9fb8ae202 SHA512 4c993256d1f6d7d3a2c72c88f6f88facf7ff8237d489950484f54a68f09741e526f0e0a7c2862251fc2579fd3cdd496c9136bb222374abfacbace1615e263239
 EBUILD gnome-shell-extension-applications-overview-tooltip-11.ebuild 1191 BLAKE2B f094deaf4bb83af29d55dfa6db3164bca4fda8e857b99345de789a634c34def85fa778d854c4dfd0428c87c19b2617f689a59a12366ed19ab3c790a8b8d31319 SHA512 967887e1a33e42059907e9aeb44ea42c876784696457ac1364b8eed85213115ad3d33c6244eed56e56733bd3b88efedf25f204574151ea06e6b44c5d49cec117
-EBUILD gnome-shell-extension-applications-overview-tooltip-12.ebuild 1228 BLAKE2B ad7642f2f562d5b114e69e4b3d893e490e8e1faf0ec937666beac7998b2ce29c3665d8b68af09f49ccdc27a4a380d8a619e8df7e33e05b950b441bffd4d440c0 SHA512 5467126e43453bc3b11921d940ba8bcba6bd8dd6c0d8d09c615d67f85104cb9e250a193a2e1dd6007a490a7fbab5d2b50b5ee9f367d4b890fa424ab53a8fa26f
+EBUILD gnome-shell-extension-applications-overview-tooltip-12.ebuild 1226 BLAKE2B 2dc6ac1e429c81175dd32a188b2d4c6a8406f0c99c214c7b1e659e741b35cf66ac9e3200015ac39083c9bafe3d94ebcfbb00b09d1b2ec51ba615047ff3979695 SHA512 22d7d2de2eeea0dbb0135c2970fd37d5730408b197b39912543b1ab079c1eb0bcdee5a0eb132a46433e030953e07392d47d2506c962e97b8b505b56e4d03fb74
 MISC metadata.xml 240 BLAKE2B 63b29b3fa5f9613689cca20017685c7b8fda461b37bd79b15deb70b8691afdbb1a262dac93cb3520a9d9e9c49ba745f8c797b269bb41933391a5a94667bb1c24 SHA512 2d1e63e0f72d6332021e3c9bdacb1e2b203a31b907c5a93c305e4f7b0eeef0856fb0cca37bc0d7d3d1ba77b08f81c7626f834239e3484e13032cedf59304239e
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
index 6189ad2b2b21..7e7757ece5a3 100644
--- 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
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/RaphaelRochet/applications-overview-tooltip/archive/
 # https://github.com/RaphaelRochet/applications-overview-tooltip/issues/7
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/Manifest b/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/Manifest
index 51eb4c2ae0b3..27d5cf1b6e01 100644
--- a/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/Manifest
+++ b/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-shell-extension-bluetooth-quick-connect-16.tar.gz 20053 BLAKE2B 37cf71c319a3715a7c5acb9835f1a480eb8b383e6dca48b3852ab949233137f963ee583d01e16d558bec02a9c7b604883c62e7c1b606624aecc82f7e83bbf297 SHA512 e9052d2199b8339e86b69dc317c26f23086131a6ecd8286d8058dddd185fb5cea4215fa3fb11e8b214f0a07a86cac2c45cdab1d83a529df3ab1991143b6cf53c
 DIST gnome-shell-extension-bluetooth-quick-connect-20.tar.gz 20334 BLAKE2B 07998362457b4f8ccca56d22891d4998a00ba3eb8698d610778aa094df73f964a2e1bce1a1cf721b7ff037499a10b5356f3ba023fb4a04f898291a3bd7eb72a7 SHA512 947a181de76746a2a2f6d69984427b299f9e9f76c77e7e2afefd0e8c83f33226ff4c0b9a296252a21136feb481b5241d31a57f96360b9e8b1f911b043c7757b8
 EBUILD gnome-shell-extension-bluetooth-quick-connect-16-r1.ebuild 1224 BLAKE2B 602594a2a40010ed36b57ef16b6730c7e09227895742cad659f750fd47c3acc5ca816dbb4c53db0cc04a1b4c482bb092c7cd09794e3bb53e0d0bac33b1487632 SHA512 368db1327655ef669d3e4334950d00ab33d5a968ef405f6ed5cbf79871206082a03ea9d7c5963134fdf007800b854b67af37c8f312ae1096d194a379c5e8a555
-EBUILD gnome-shell-extension-bluetooth-quick-connect-20.ebuild 1238 BLAKE2B 67290fb111fbca8428ae6b3b36d973bf5382d5d2d0818884c6e7fd53582c1748ae54903485171e1ac5c125e2cd660322ef8bec6b6a6e3b42ae7a4912edc56231 SHA512 e1511d19656ee37777c85c7d4d6b049e19f5d963cdc4f9a91ffdc12a4865a75ddbc3d2bd9c7696f2c08bf15e720f9f96f2b0d8c935026c5146561036b2fabc10
+EBUILD gnome-shell-extension-bluetooth-quick-connect-20.ebuild 1236 BLAKE2B 300e4700f5cb9c0deed75ee283552372ec9bb0a6499bf609acc6e0da89a40e293095725f84609767e08c8aff6e39a3b6cd5d49c52d9cb87fc07d56280e46bad0 SHA512 84b3108d0030a062643a48fb576a0adcc0d8ddea08bdbac667ea414eafc70b30651befe0a6bc220cc88be4649bd68e2ee9cff8112b91d7770297e637401ff92e
 MISC metadata.xml 240 BLAKE2B 63b29b3fa5f9613689cca20017685c7b8fda461b37bd79b15deb70b8691afdbb1a262dac93cb3520a9d9e9c49ba745f8c797b269bb41933391a5a94667bb1c24 SHA512 2d1e63e0f72d6332021e3c9bdacb1e2b203a31b907c5a93c305e4f7b0eeef0856fb0cca37bc0d7d3d1ba77b08f81c7626f834239e3484e13032cedf59304239e
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
index b112e2e22c4e..5fc92ca3c53f 100644
--- 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
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/bjarosze/gnome-bluetooth-quick-connect/archive/v${PV
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen/Manifest b/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen/Manifest
index 8a6f3d8f0fa5..6f019d6a0d67 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,5 +1,5 @@
 AUX gnome-shell-extension-control-blur-effect-on-lock-screen-20201211-metadata.patch 539 BLAKE2B 0b26d5b929f1f9305912a3dbab1a117a0dd54d2831c7ab9d7054be9b766928243ecf22f2ed4d16ec90e1ca94cb2e19b3054b9a23043cc0bd8f5944380549f784 SHA512 f2cf7681c9629fdd56237f81b9304bca83152764d5201a5d9584ca90466e405aa9b8c1b42ef9833b7c6937fae56e7115cba2fc61948dfafd4303943655a742ec
 DIST gnome-shell-extension-control-blur-effect-on-lock-screen-20201211.tar.gz 15576 BLAKE2B 142cfb895f9adf2163e36a6005e222897c18e5ca347a9e6958664226abe9f4a6dd1a616b917ccee9531d3f1c27a3e8981a1d3335795543b782736a61b115fe67 SHA512 87efd0e222ba5676caabdff5fdb365e4f769ee4ca15a4718739934b40c3616c031283a1c3883d65dfc75ea59fdb63a9eaf3522465740602f987a136de688b19f
-EBUILD gnome-shell-extension-control-blur-effect-on-lock-screen-20201211-r1.ebuild 1453 BLAKE2B cfb459852e4cdd9be78e9fe1f05b5d1506450cc285fa2b6947944de71b4e807d0bd566731fabe251ac1937e1594a50c449fe6a28a51f9142d9d33a3fb0991d36 SHA512 87aa1da215dae0e9c7215272705ddcffb937dad8a6a18a514d9cab638f629951f3cb422ee9e11fb8eebb6700d9a1277cb547866f269bfe34ea5637d8b9e8de9d
+EBUILD gnome-shell-extension-control-blur-effect-on-lock-screen-20201211-r1.ebuild 1451 BLAKE2B b24c04f5146dc6ab5293b090fd06c26597580ed370953f6a96d9ec5abb054270e5d42fb720af5714a33ae135cf4e891cd95b98cd2506e8a812396e7a75852548 SHA512 25e5cc00061c94ec4d41d180bfa5617e4a080be76ec4461c11cb537ac31e123bf58d9b3d23252941ebaa7044e4ae3318641a2c4d7f294c5b236fbff373839a04
 EBUILD gnome-shell-extension-control-blur-effect-on-lock-screen-20201211.ebuild 1324 BLAKE2B befe19cb160c2a269b3c4dcf1f9a00d56f4d85540e59b9b4840db04d0cd1e7f1d51bc0406d8e772a1a507aee55d3f001c4739d4004f379cf485f2df6d7cee2b9 SHA512 26fbf34cce123893a05552ce239b025b604f5f64c13cbdaab82a22ccc62901a1679fe70ac07e06f096f678cc995ee59ca1e46ec28c5d7fbc1eee1b34b781a4d0
 MISC metadata.xml 240 BLAKE2B 63b29b3fa5f9613689cca20017685c7b8fda461b37bd79b15deb70b8691afdbb1a262dac93cb3520a9d9e9c49ba745f8c797b269bb41933391a5a94667bb1c24 SHA512 2d1e63e0f72d6332021e3c9bdacb1e2b203a31b907c5a93c305e4f7b0eeef0856fb0cca37bc0d7d3d1ba77b08f81c7626f834239e3484e13032cedf59304239e
diff --git a/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen/gnome-shell-extension-control-blur-effect-on-lock-screen-20201211-r1.ebuild b/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen/gnome-shell-extension-control-blur-effect-on-lock-screen-20201211-r1.ebuild
index 2f485afe4679..75851380a14f 100644
--- a/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen/gnome-shell-extension-control-blur-effect-on-lock-screen-20201211-r1.ebuild
+++ b/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen/gnome-shell-extension-control-blur-effect-on-lock-screen-20201211-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/PRATAP-KUMAR/Control_Blur_Effect_On_Lock_Screen/arch
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 # glib for glib-compile-schemas at build time, needed at runtime anyways
diff --git a/gnome-extra/gnome-shell-extension-dash-to-panel/Manifest b/gnome-extra/gnome-shell-extension-dash-to-panel/Manifest
index a13869b1444c..dbc6a3661969 100644
--- a/gnome-extra/gnome-shell-extension-dash-to-panel/Manifest
+++ b/gnome-extra/gnome-shell-extension-dash-to-panel/Manifest
@@ -1,5 +1,7 @@
 AUX gnome-shell-extension-dash-to-panel-26-branding.patch 637 BLAKE2B 1e124561143b577413090e16c7ad0c8cbb66911b079ae5844da9cf04e0197aab15fc4f746d3020ab7d4e6756b8a35befa773967c223d29289e13c6b3ffd70234 SHA512 8c176972ff10e87e957cfdda23e86a3e434dc050e8a954e7c2257942301daa5aa7c5b788188768f13c5b009d842fca8b14819a255a6a561dac8fa60e355ec211
 DIST gnome-shell-extension-dash-to-panel-42.tar.gz 21140972 BLAKE2B a4f6dc7a3770753f37cabb6c165f51a455a34456de5fe15cbfde1b3018f4aee32cdc6876286bb6e6671430f18f14f7fb370d2059fe6032d85d93b0adacdb9f48 SHA512 7746098395513cd2b94166358d2315e581248a2ad35dfa0ee685386633a95aed0897cea17335e73c22cdd81a68900de7718ed34e262614358706e560bbdc3bf8
+DIST gnome-shell-extension-dash-to-panel-43_pre20210510.tar.gz 21139555 BLAKE2B 2edd8dc8e16be6186791f7915f75f50abf355455ae54eadf0c9c45bca7b39f035b427027fa06485a004efc07dae37089268e244a911d39d42914619c36e13ced SHA512 db41b1d714a339b24c956805b14484c3be3572b1077c5b5b2f7a91d880a8784e1f02a024d515d40dcc1e65fa2ef60682d029ff6e6891aa2db687382b2b92dfbf
 DIST tango-gentoo-v1.1.tar.gz 29322 BLAKE2B 83fa2bf37727e60851dd679054fe1b153ebfea58c9a9a40f891f7d68d3b047b02e8effa1d1b4e08d64500a2072ce7200f159c92a352da7124de27e1b05bb6027 SHA512 87d47ddab68361db6d99866c51705dcb3e198f8345a1096859acf2c6cca5099dd23c7fb30d124f52c4933ea38fd45fadffbbe6ecbdfa84f5b60938a4824f9045
 EBUILD gnome-shell-extension-dash-to-panel-42.ebuild 1828 BLAKE2B 09db667d779d1911c1823db8d0fca16f2e9cd7e4830f9ba4a08707783379415444d073924a85f05f391e75d29e6aaa8ebdbd1984c12637e4cbd0164b12a853b1 SHA512 117aec5ea76083a1781013b937029db0434ac92187e0ac05480a35451a83b00b439b636b686b9c005e901a21593fc25d6aacbac3dabef514124ef68837c9ee5d
+EBUILD gnome-shell-extension-dash-to-panel-43_pre20210510.ebuild 1878 BLAKE2B 5115c3ef3a915854bfb10d6f457d93cc0aeb0179cb11b2058ed2fd7a269cb2559112b0a7efb51d62ae25d0ff2e3e45f952f00ec9192c7bce0fb7aa1770d475e1 SHA512 36a96d7184040ef05f2795ed5be04b626ce79039bdf8a4fe3902a9a588074dcbe24743b599e699c9c78aa12d5f5652b73d04c8085decdb5ffa0884f4305f057d
 MISC metadata.xml 240 BLAKE2B 63b29b3fa5f9613689cca20017685c7b8fda461b37bd79b15deb70b8691afdbb1a262dac93cb3520a9d9e9c49ba745f8c797b269bb41933391a5a94667bb1c24 SHA512 2d1e63e0f72d6332021e3c9bdacb1e2b203a31b907c5a93c305e4f7b0eeef0856fb0cca37bc0d7d3d1ba77b08f81c7626f834239e3484e13032cedf59304239e
diff --git a/gnome-extra/gnome-shell-extension-dash-to-panel/gnome-shell-extension-dash-to-panel-43_pre20210510.ebuild b/gnome-extra/gnome-shell-extension-dash-to-panel/gnome-shell-extension-dash-to-panel-43_pre20210510.ebuild
new file mode 100644
index 000000000000..5d63d5944f54
--- /dev/null
+++ b/gnome-extra/gnome-shell-extension-dash-to-panel/gnome-shell-extension-dash-to-panel-43_pre20210510.ebuild
@@ -0,0 +1,75 @@
+# 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"
+COMMIT="3fb7bdb83b69478341ec1568b31ef6829d004715"
+SRC_URI="
+	https://github.com/home-sweet-gnome/${MY_PN}/archive/${COMMIT}.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_PN}-${COMMIT}"
+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/"${extension_uuid}"/img
+		doins "${WORKDIR}/tango-gentoo-v1.1/scalable/gentoo.svg"
+	fi
+
+	# Install schemas system-wide
+	dodir /usr/share/glib-2.0/schemas
+	mv "${ED}/usr/share/gnome-shell/extensions/${extension_uuid}"/schemas/ "${ED}/usr/share/glib-2.0" || die
+	rm "${ED}/usr/share/glib-2.0/schemas/gschemas.compiled" || die
+}
+
+pkg_preinst() {
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	gnome2_schemas_update
+	ebegin "Updating list of installed extensions"
+	eselect gnome-shell-extensions update
+	eend $?
+}
+
+pkg_postrm() {
+	gnome2_schemas_update
+}
diff --git a/gnome-extra/gnome-shell-extension-desktop-icons-ng/Manifest b/gnome-extra/gnome-shell-extension-desktop-icons-ng/Manifest
index bf464ca9bd6c..82ed56d577f6 100644
--- a/gnome-extra/gnome-shell-extension-desktop-icons-ng/Manifest
+++ b/gnome-extra/gnome-shell-extension-desktop-icons-ng/Manifest
@@ -1,3 +1,3 @@
 DIST ding-0.17.0.tar.xz 71596 BLAKE2B 38770f2935c47242a47b377bc18c2599a6a54b9a13a7085c24a13a4b46c007c297adda1515cec9fc11cdf38ceb8d2ecebaedf6c1e64f27351ad6b923d0b02182 SHA512 425da33c45c908bc907ef2440c6d363fa666f460a997ae14ae53c39c398307aa96150b31fba21b7e7d39326dcff6f23951d4cb80937616003c4883c96e44d635
-EBUILD gnome-shell-extension-desktop-icons-ng-0.17.0.ebuild 984 BLAKE2B 4bdda4c2b49ccf9fc67ea0286fcc3d7397e609c3fabb19139906ee663d3f10ba1c1afc011f986e45ddfbf6729799afbbad983cb0ef1faaecca9036283eb6362c SHA512 32725c54ee3c1bcd2995d6f62efb525579b73ee3b2490803ef54243cf515ebaacdd74cce66e329dbc6d1e009822cd02341ce0b44d5d5fc913a1a6e712f3172ce
+EBUILD gnome-shell-extension-desktop-icons-ng-0.17.0.ebuild 982 BLAKE2B 0e04254e7e6043fc7854c3c7fb3eca59d71fa5a31b37680f3922576d893c89fe52cf98ab665632c60303715807fe548a0c9fe183da139853cb6685f864694f9e SHA512 e8f06a86bef1217a387bdddae31c926c2669a7250eae5bd067b900a318aa4bffd4ee38b394e8a2ca33eb4e22b6a3916bb3505461cb6e89ca2ed548ada85d7412
 MISC metadata.xml 240 BLAKE2B 63b29b3fa5f9613689cca20017685c7b8fda461b37bd79b15deb70b8691afdbb1a262dac93cb3520a9d9e9c49ba745f8c797b269bb41933391a5a94667bb1c24 SHA512 2d1e63e0f72d6332021e3c9bdacb1e2b203a31b907c5a93c305e4f7b0eeef0856fb0cca37bc0d7d3d1ba77b08f81c7626f834239e3484e13032cedf59304239e
diff --git a/gnome-extra/gnome-shell-extension-desktop-icons-ng/gnome-shell-extension-desktop-icons-ng-0.17.0.ebuild b/gnome-extra/gnome-shell-extension-desktop-icons-ng/gnome-shell-extension-desktop-icons-ng-0.17.0.ebuild
index 5b85f95673bb..7952e15af15e 100644
--- a/gnome-extra/gnome-shell-extension-desktop-icons-ng/gnome-shell-extension-desktop-icons-ng-0.17.0.ebuild
+++ b/gnome-extra/gnome-shell-extension-desktop-icons-ng/gnome-shell-extension-desktop-icons-ng-0.17.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://gitlab.com/rastersoft/desktop-icons-ng/uploads/a434978b57ec46ad
 
 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 a5d592a443bc..186161907b76 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-45.tar.gz 735089 BLAKE2B 44704b0a32d68c123581818f0e8e6bc429fc9be462c98addb98980ef19eefbfce0618c718e640a8bed1c60500f796dc31c4d74c8394a940bf6ecfa7644eccf45 SHA512 59b81316ff02116bf92525acf21a99152b15417459d42be4c710a25d879a326cc3f03a9c0595fa9879e2abd613d4acb067d340bc60c8a80bf88909ea7269903e
 DIST gnome-shell-extension-gsconnect-46.tar.gz 735155 BLAKE2B 86a7288953fe6001cfa15277dcc38feac3dd63fc60b8cca86dd95632b4d022587654393c3e6386a7e2cf7ad3af409efbae2e5ffe49eb36a9093887d0848cb080 SHA512 584348407a0f41f4317f52cddc1cc7e1e622fdd765e3eaa0b8012cc4bf46c09adedc97f9701a8c94aaa63dcd46d20fae35f49bfabe8c0d4abb4b407d8ac2c199
-EBUILD gnome-shell-extension-gsconnect-45.ebuild 1617 BLAKE2B 3a65514198733f4dfa0765dd81b193e9c1b27f98813b2933119ca19a598006c604990d4196393211ff6866c91fe465acad0ede4f42ec0e699eff6aceecd9f853 SHA512 a06534a64e6708b1ee031638e550544869ab9c07b64847a929150f0ec1616a2165d9717b5d3e9b1c2d64b1326ef3fc204def4da911415b128552e3f3f6096e9a
-EBUILD gnome-shell-extension-gsconnect-46.ebuild 1615 BLAKE2B 6d38053202c37bfe4014a553b5164b7dd629a67ae061e369d28ef0a47021c58d03af3c57585772aa261d2cd0c466c9ec281e957c239faede5e4b8dc410ee8b2e SHA512 bbf3115839b28690301fdad033d0e004ab4691bbe011032f592f96b85f1800997b9710c64f6b09aefd8ef75c8ef425585f18111f2c4d57143b2c48bbe082b703
+EBUILD gnome-shell-extension-gsconnect-46.ebuild 1613 BLAKE2B edc2b6614b2c3a69f1046b19b8de629b8bd35114cc1950ae2479b71d46d076407c63b96f9239945bda69b25ec6c190313b7d21d44ac5237c841d74adec754fca SHA512 f6485927888161e1ddf82a17941e91947486b96eb80f492bed6928e6771201aaf4985357bb9e22087b8dda402e2f13a72f7f3168eaa1372a48c6da543dcf4441
 MISC metadata.xml 345 BLAKE2B 77e44add98d26f7ad351ad6ba3a11852499b76435ee6e49b6c37f30aabd406fbbf65498463bf668fc5971ff03dcd7226e5f263e2e87fab7c208048f6ce6210e6 SHA512 5402440fca2d10c50ad20eac8225d99df4a0e6f13c3758f4b08a692d11e8b8bfa35a89909777b60a3675f229d2122a19861cc5832510122474be99f5c1addfa1
diff --git a/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-45.ebuild b/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-45.ebuild
deleted file mode 100644
index 052fefa61c6b..000000000000
--- a/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-45.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/andyholmes/gnome-shell-extension-gsconnect"
-SRC_URI="https://github.com/andyholmes/${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.48
-	=gnome-base/gnome-shell-3.38*
-	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-46.ebuild b/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-46.ebuild
index c046c64ae00b..bc9f45487557 100644
--- a/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-46.ebuild
+++ b/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-46.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/GSConnect/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="nautilus"
 
 COMMON_DEPEND="dev-libs/glib:2"
diff --git a/gnome-extra/gnome-shell-extensions/Manifest b/gnome-extra/gnome-shell-extensions/Manifest
index a631d03b3c8d..1ee198a3e64e 100644
--- a/gnome-extra/gnome-shell-extensions/Manifest
+++ b/gnome-extra/gnome-shell-extensions/Manifest
@@ -1,8 +1,3 @@
-AUX 40.0-windowsNavigator-Adjust-to-gnome-shell-change.patch 1889 BLAKE2B 830a11b7e76f1dae2308fecd30e0a1d9411ec21a95d1fbf3a71348a4b202c52c95b59dcab3223f7fbd8d5c75a2feadfe005463261f055f57d47f84463671aa23 SHA512 bbd470bf7f08728324ac997286df5f036b6ee8beaaafceb17483a2468fa24d366ccfb5ee1a26b8139242a3600634937aee23832a38bfa9ac39f98b384e258135
-DIST gnome-shell-extensions-3.38.2.tar.xz 209904 BLAKE2B b9a32e9c20046cb480dae3ed27791958799f534dc19026631290d2d0bcfac04955e77b2779f9a18e32d7ee56f837e8e17167bd40b575ff531b8cc328a9c0cc35 SHA512 5106946c10ea34b339ef413d5cf6bc3e1cd7f54f73b0ca773ae4076c1280e2b235327c9209e8269c5aca787035b489f73a76c7163380f191cb246c8591bc838c
-DIST gnome-shell-extensions-40.0.tar.xz 217772 BLAKE2B de2f88dd37a0b9bbbbcbd7373e18b8589d4a35a9497404a4e46a0e4aad7058890c6b596edd553cbb68dd6ab9db6bc81d8ae5457be02a4af2b2cc4b8fd2d8691d SHA512 9f4b4a5d91201c11246c2df880b568d69264ad875bfdc2b69d217aca0e4354223aeed51007396a339fb9a693eab9849362641fa9a064a5efdda7fad5b886af85
 DIST gnome-shell-extensions-40.1.tar.xz 218084 BLAKE2B 0f54dc53ce279af424658d540961bda698c4d6c2968bf778e626a91c7da47b8f56bd4b1dd874956dce9fbb0d1719bd64b8cf8883788d625049aa14dcc02ff313 SHA512 e537312c0790b6e54b3eebb0df189f65f093e81ec7cf1cde886df747188765775fc4616e98bff0157b543bac26c51a5c7006f1505f4554fea00972f790e781f1
-EBUILD gnome-shell-extensions-3.38.2.ebuild 1756 BLAKE2B 253307671aa10bfb66558f553c6ca3535f434f610ff74b4ad739523896df76ee7ea680dc3e2376ce3f3a69586f2b25f5987e3a6bdb2de0a3d3c808750fc4c06f SHA512 77d33546cceb52dc441ccffd769f6c26de76df4d8483eba73d6595febdadc034617d434ea842c32ecdf8def2ece8a33249bab4623175439df7f7d81ce31d5800
-EBUILD gnome-shell-extensions-40.0-r1.ebuild 1828 BLAKE2B bc3d843608850c029dac84b49e0e69a348f84ed8eb56e649c3525727be1f35e84883ed2a2129f18b77b5d2da33ff84df6731f9557d597d582e5ba4d94f13829b SHA512 2dd7d5ef357b7f914d07ebd78f5d4d3f0cf391c134ddd3a346de926ab07e3741bf31cff4cbcb8b8671277740076ec1be87a7d3bc5a610a6409ac4791feaf801f
-EBUILD gnome-shell-extensions-40.1.ebuild 1749 BLAKE2B b390d4f85164e8329c4f1693747df7ec0e0fb052dfc594e37332019f139f952a82ea7024e7004568ddf9821c1f8ea9ff9c604e024255c93c77ba1b37f5524924 SHA512 e5539db5696a3caf24a980eaf1141a402f2e19d45ab186e47e45083ee195c135779c072de3f4ed0f0165f5b732e330c20e138ae98b67dd9fc20cd2fc23765662
+EBUILD gnome-shell-extensions-40.1.ebuild 1747 BLAKE2B dea69b28f618b887447800e85a3f06b775fe0b73842ab6c258c5f7df4a5f6a66b47b2338380a583bc3559e6e8ecc1fb7000a617609361b06d958770b6362f6bd SHA512 e4ea0fa97656ab0150d7895ea9c258d0ff4c26634abbf92c00f13298550b75619e215139992c495dd53d01da74a5328dbfe8cf01d478e9af54d5393e84e6ab69
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gnome-shell-extensions/files/40.0-windowsNavigator-Adjust-to-gnome-shell-change.patch b/gnome-extra/gnome-shell-extensions/files/40.0-windowsNavigator-Adjust-to-gnome-shell-change.patch
deleted file mode 100644
index 9e335b781aad..000000000000
--- a/gnome-extra/gnome-shell-extensions/files/40.0-windowsNavigator-Adjust-to-gnome-shell-change.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From e094dead91389c4a5f602e5bef2747ad5e73e8bd Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
-Date: Thu, 8 Apr 2021 16:38:40 +0200
-Subject: [PATCH] windowsNavigator: Adjust to gnome-shell change
-
-Parts of WindowPreview were moved to C for performance reasons, which
-turned a formerly private JS property into a GObject property.
-
-https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/issues/302
-
-Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/merge_requests/170>
----
- extensions/windowsNavigator/extension.js | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/extensions/windowsNavigator/extension.js b/extensions/windowsNavigator/extension.js
-index 0ea9645..bb72d7b 100644
---- a/extensions/windowsNavigator/extension.js
-+++ b/extensions/windowsNavigator/extension.js
-@@ -84,17 +84,17 @@ class MyWorkspace extends Workspace.Workspace {
-             });
- 
-             this._text.add_constraint(new Clutter.BindConstraint({
--                source: this._windowContainer,
-+                source: this.windowContainer,
-                 coordinate: Clutter.BindCoordinate.POSITION,
-             }));
-             this._text.add_constraint(new Clutter.AlignConstraint({
--                source: this._windowContainer,
-+                source: this.windowContainer,
-                 align_axis: Clutter.AlignAxis.X_AXIS,
-                 pivot_point: new Graphene.Point({ x: 0.5, y: -1 }),
-                 factor: this._closeButtonSide === St.Side.LEFT ? 1 : 0,
-             }));
-             this._text.add_constraint(new Clutter.AlignConstraint({
--                source: this._windowContainer,
-+                source: this.windowContainer,
-                 align_axis: Clutter.AlignAxis.Y_AXIS,
-                 pivot_point: new Graphene.Point({ x: -1, y: 0.5 }),
-                 factor: 0,
--- 
-2.26.3
-
diff --git a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.38.2.ebuild b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.38.2.ebuild
deleted file mode 100644
index 88998ef7d417..000000000000
--- a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.38.2.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome.org readme.gentoo-r1 meson xdg
-
-DESCRIPTION="JavaScript extensions for GNOME Shell"
-HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell/Extensions"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 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-2)*
-	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="
-	dev-lang/sassc
-	>=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-40.0-r1.ebuild b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-40.0-r1.ebuild
deleted file mode 100644
index 1d9b5892655f..000000000000
--- a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-40.0-r1.ebuild
+++ /dev/null
@@ -1,71 +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 ~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-2)*
-	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
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-windowsNavigator-Adjust-to-gnome-shell-change.patch
-)
-
-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-40.1.ebuild b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-40.1.ebuild
index f5bc021adcaa..e985b912fe18 100644
--- a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-40.1.ebuild
+++ b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-40.1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell/Extensions"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 x86"
 
 DEPEND="
 	>=dev-libs/glib-2.26:2
diff --git a/gnome-extra/gnome-shell-frippery/Manifest b/gnome-extra/gnome-shell-frippery/Manifest
index 30b37b67a2eb..fc61d53258f3 100644
--- a/gnome-extra/gnome-shell-frippery/Manifest
+++ b/gnome-extra/gnome-shell-frippery/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-shell-frippery-3.38.0.tgz 82248 BLAKE2B c36b7e01b15cfe61af93377b22a2baa967846dbc69c0a9667352a80a7db62f554e9f66d3990cdbc932096d371c1bf46d300c25a2eb523adc6cbb90d8e9c4d9d0 SHA512 16d212a0fd6ce1625eabf6dced3d64bfb9635e4a67c131c5a9c57041cb53530bb9e514af24190599ff7324016ae86524455091c507f0bfef39ed2d57b3b1cbed
 DIST gnome-shell-frippery-40.0.tgz 82308 BLAKE2B 2466880cc04a46a8177640a19fa9ed89d784a34fbaa7a65d6948732d0794f270573df8d108c9a74c78296d2bd1565c4d3493caf4086a6f574e7e17b950eeb7db SHA512 68e2cc452df26a7c806f62b3ed2864ebaf766495ba47991531167e63aa87b2baeb301b83d2f288ad87802e7b2220576108d6962386ac5ee08fb3d89024d8bca2
-EBUILD gnome-shell-frippery-3.38.0.ebuild 911 BLAKE2B aac80e00006007bf3e3c69ff61f7409d906dfda5399329d15bc022329f2ed376cd985bccea96ab898ea5d0432399caca0759b3052f49843cdbe20edc761e1c8b SHA512 a39fa00e939256af96f0d1412cca2d4cc24ca17423f3d453e9d011f4326291ae7ab4db4040994361773c51272bc8876aa98c1654b2954e9c31c37dde2c874a70
-EBUILD gnome-shell-frippery-40.0.ebuild 913 BLAKE2B e80c51a8e49c3c73bf02367611226be7aea78b6427dde7f01cf7c7a45aaee74105066868737de2a614612d81cfff24cf222e8c466a0015740a10618ac229c748 SHA512 de10cd2e231f852b66875b7fdaf0783a6afac84e96163286e82c07636bc9a784b87309946159499d473d848d0f7cc86734994d5ed7794c85bae460677d7cfdd1
+EBUILD gnome-shell-frippery-40.0.ebuild 911 BLAKE2B aac80e00006007bf3e3c69ff61f7409d906dfda5399329d15bc022329f2ed376cd985bccea96ab898ea5d0432399caca0759b3052f49843cdbe20edc761e1c8b SHA512 a39fa00e939256af96f0d1412cca2d4cc24ca17423f3d453e9d011f4326291ae7ab4db4040994361773c51272bc8876aa98c1654b2954e9c31c37dde2c874a70
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-3.38.0.ebuild b/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-3.38.0.ebuild
deleted file mode 100644
index f2b8d032cb46..000000000000
--- a/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-3.38.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Unofficial extension pack providing GNOME 2-like features for GNOME 3"
-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:=
-	gnome-base/gnome-menus:3[introspection]
-	>=gnome-base/gnome-shell-3.38
-	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-40.0.ebuild b/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-40.0.ebuild
index fc8efefccf22..f2b8d032cb46 100644
--- a/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-40.0.ebuild
+++ b/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-40.0.ebuild
@@ -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-system-monitor/Manifest b/gnome-extra/gnome-system-monitor/Manifest
index ad4ba3a59d30..4f4b0d26b407 100644
--- a/gnome-extra/gnome-system-monitor/Manifest
+++ b/gnome-extra/gnome-system-monitor/Manifest
@@ -1,8 +1,3 @@
-AUX 40.0-Dropped-non-gnome-workaround-causing-crash-fixes-182.patch 1728 BLAKE2B 00c009a738b3144e7d097ae6ade1edb6b6f8ce373087e501a67569a9cfc2e860bd9cfdd67fe25a15d97aa55ffc4256359ba6755cbbe587ec3ac39a7b9cf84804 SHA512 22038ac59ac904089c4ad9d704cfdddbf0224f3a99f63887412fddd5ad88430985a4f650d55e8478a30fe1288e05f340e827ab5be07a3c3c870f185052dbb9f8
-DIST gnome-system-monitor-3.38.0.tar.xz 712320 BLAKE2B a59fbe39a8c04793c5584f645dbe0e0bcb9747394c0b923532afc95443aadeeb17ca211248a5c61747699eb95d4f8530fcc18076753bcc6d28cf2ce47a4f6825 SHA512 9f54045fa837b85d40a80bc8b519f91513ae27ca157e07f415860e906444bf144b7a7a66e4a2a9a5b1fea4e69305414cf081bb34624c91d1476265b37b59368c
-DIST gnome-system-monitor-40.0.tar.xz 763344 BLAKE2B 3a9b0f7a823eda4a00b58ece53604a127047a0d087fdc74584d5e1453744063332bb084ab32dc624812d80fa233a0fbbb39c20e2cc18b962dbd248799d587a3a SHA512 b0e326c3abdca0a3b5807976a04b7090861717840b11829d75fe5da91ef7adb34b80d2952aee4c1ff843bd5356dab7490d1c2e403712fd3c1381baddb8542501
 DIST gnome-system-monitor-40.1.tar.xz 763720 BLAKE2B 50d69ed95173301a566078d5bf32c48c011eb297a7fcb598dad1c515ee2900731362c9637dbf7793bb95d31a5584f7f84192b1c726b1a8362dc364b695f54263 SHA512 a6c870ae4e58c5fabdc87c290e10326b051398b3408f7ff159c854eef5c7940371e83766f37c6a713631d49ee5ee7b2670f441a462e2453fa849cba2f3255be4
-EBUILD gnome-system-monitor-3.38.0.ebuild 1158 BLAKE2B 5e44fb20f0873e29a0b965d1e8f40365bdde874694bd4d01906f88f62170e61cd46a1f7865df998970ab34b57a4e1305c5b76413ae82498ae4d2b553a398dd99 SHA512 68584c47b3c529ac63d605e19d8a36aedbbfecc0f92844a9a9a70f470cc9a043a8bc3e7b86f2f57fcba76f2641519fe1f97e068f39c9e2d093d03b30af57ed6b
-EBUILD gnome-system-monitor-40.0-r1.ebuild 1307 BLAKE2B 6b9f3d4e3b26300f95509ee9ef6e029b057d12e544dc84f49bb8f179678f3fa1140691ac902997d1b947af1a3a1aa9c333c9166954776f1de04440e867783a36 SHA512 216f16f1e128463cea0d8c277e727f6f1b7221d9f5eb7ffdbe7215c903a4398d6a7b18a3bf8eb49554576f6717a7ee95d7b07ddc5e926c6d085bd708d7870076
-EBUILD gnome-system-monitor-40.1.ebuild 1214 BLAKE2B bd64c30c1463b52acd4d1f9e5341fc98a15059349253d7ed3a7dbe9e62f46f7b7a773ab5f90294e6d19fd849cc9cbf207994626f5fc4306efaa6d05b6bf2891c SHA512 29c824fe1ac1b93c3a4965ed147fa03a9f101e4d96a8a827ff0333d1f2b615491535a9eb39acfc47bfe07fa6e0e9ffa805fc0f17db3f6d314ab5fa0eb175be34
+EBUILD gnome-system-monitor-40.1.ebuild 1212 BLAKE2B 7710188f514c4bd402ea6b1659a7f490cf7c5b2d1c4b7dc96e2e2d0fa15572cbb605600275212041d0d4418b81d3ef2117976962ca79258a64c5f60c2abeca7d SHA512 3fe75eab9eb90ad5569f7259149dbaea90e8f34bb6723811b56db4454d8a0b100f4d550fa303fa8c01f9989dd0df204f7d73b990aa9786dce27b6d8364374e24
 MISC metadata.xml 378 BLAKE2B 2087d7820bf1a1544e22fa7451cd241ce73b899e2e48886f0feb234bf72c97710ec9bdee27fbeefa96ca43a0c36fcf87eec2161805a46cf7d7047f3d9472a286 SHA512 62f13c436d761ad3e4dcad32486a4f163b88e19644e4d1299813c22b0158cbf23e1d8d41ec20aa800c7cf638e89e721e6296b93446144e7b067f26b66bcfda88
diff --git a/gnome-extra/gnome-system-monitor/files/40.0-Dropped-non-gnome-workaround-causing-crash-fixes-182.patch b/gnome-extra/gnome-system-monitor/files/40.0-Dropped-non-gnome-workaround-causing-crash-fixes-182.patch
deleted file mode 100644
index 595870bbabe2..000000000000
--- a/gnome-extra/gnome-system-monitor/files/40.0-Dropped-non-gnome-workaround-causing-crash-fixes-182.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From ba93af5b3e429db5a9c4dd7e2d06b800735a9071 Mon Sep 17 00:00:00 2001
-From: Robert Roth <robert.roth.off@gmail.com>
-Date: Sun, 28 Mar 2021 20:33:40 +0300
-Subject: [PATCH] Dropped non-gnome workaround causing crash (fixes #182)
-
----
- src/interface.cpp | 14 --------------
- 1 file changed, 14 deletions(-)
-
-diff --git a/src/interface.cpp b/src/interface.cpp
-index 48b42d0b..65e52682 100644
---- a/src/interface.cpp
-+++ b/src/interface.cpp
-@@ -698,7 +698,6 @@ create_main_window (GsmApplication *app)
-     GdkDisplay *display;
-     GdkMonitor *monitor;
-     GdkRectangle monitor_geometry;
--    const char* session;
- 
-     int width, height, xpos, ypos;
- 
-@@ -715,19 +714,6 @@ create_main_window (GsmApplication *app)
-     gtk_application_window_set_help_overlay (GTK_APPLICATION_WINDOW (app->main_window),
-                                              GTK_SHORTCUTS_WINDOW (gtk_builder_get_object (builder, "help_overlay")));
- 
--    session = g_getenv ("XDG_CURRENT_DESKTOP");
--    if (session && !strstr (session, "GNOME")){
--        GtkBox *mainbox;
--        HdyHeaderBar *headerbar;
--
--        mainbox = GTK_BOX (gtk_builder_get_object (builder, "main_box"));
--        headerbar = HDY_HEADER_BAR (gtk_builder_get_object (builder, "header_bar"));
--        gtk_style_context_remove_class (gtk_widget_get_style_context (GTK_WIDGET (headerbar)), "titlebar");
--        gtk_window_set_titlebar (GTK_WINDOW (main_window), NULL);
--        hdy_header_bar_set_show_close_button (headerbar, FALSE);
--        gtk_box_pack_start (mainbox, GTK_WIDGET (headerbar), FALSE, FALSE, 0);
--    }
--
-     g_settings_get (app->settings->gobj(), GSM_SETTING_WINDOW_STATE, "(iiii)",
-                     &width, &height, &xpos, &ypos);
-     
--- 
-2.26.3
-
diff --git a/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.38.0.ebuild b/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.38.0.ebuild
deleted file mode 100644
index 7c5f35133aca..000000000000
--- a/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.38.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome.org gnome2-utils meson xdg
-
-DESCRIPTION="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 ~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
-	>=gnome-base/libgtop-2.37.2:2=
-	>=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-40.0-r1.ebuild b/gnome-extra/gnome-system-monitor/gnome-system-monitor-40.0-r1.ebuild
deleted file mode 100644
index 61f0a37382fa..000000000000
--- a/gnome-extra/gnome-system-monitor/gnome-system-monitor-40.0-r1.ebuild
+++ /dev/null
@@ -1,58 +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 ~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
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-Dropped-non-gnome-workaround-causing-crash-fixes-182.patch
-)
-
-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-40.1.ebuild b/gnome-extra/gnome-system-monitor/gnome-system-monitor-40.1.ebuild
index 2a765ffce9bf..1ce8a850f83d 100644
--- a/gnome-extra/gnome-system-monitor/gnome-system-monitor-40.1.ebuild
+++ b/gnome-extra/gnome-system-monitor/gnome-system-monitor-40.1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://help.gnome.org/users/gnome-system-monitor/stable/"
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE="systemd X"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="
 	>=dev-cpp/glibmm-2.46:2
diff --git a/gnome-extra/gnome-tweaks/Manifest b/gnome-extra/gnome-tweaks/Manifest
index 5f8f7190291a..e68e364acad5 100644
--- a/gnome-extra/gnome-tweaks/Manifest
+++ b/gnome-extra/gnome-tweaks/Manifest
@@ -1,7 +1,4 @@
 AUX 3.28.1-gentoo-cursor-themes.patch 1019 BLAKE2B 1dc92c4f8e53c1303f884f6acc332a7a0f1bd11b463e91ddd4ae731938e678f75499692044b5c13021f24dd9bf61264c4454fab734fe65609b3b4c009cb2eee2 SHA512 e502e1ae5945517e7a69cd15436bc07e34fe0db739350e0617d02c9b7a45264f585229f80352a93595e1246d5f9c6e987242772dfb7293de06b400fbaf676971
-AUX 3.34.0-fix-python.patch 2877 BLAKE2B 95a064d63c4f70ee3a79015b96d371b9fa394d50cbc5b9bb7561b641901775dd3f49ebaa1d29c481159b083b9fb07d9e7314d0748cab1d3b312973eb4bffdd84 SHA512 ecdc7a0d5df02b70dcc50c8d5ac03198871e96671521e3820b192ee6547953146783ef35571d5cc8c3eaf4ea044d3b60ad603f0f2fd45aad2df9a04c2a5dc0b5
-DIST gnome-tweaks-3.34.1.tar.xz 247980 BLAKE2B 55fbb16bcdb1a9ea4b5ca84df802266e07347377eab3712284973146fcc0797af59df5985725b1a95a1fba0d26b580a1c9862675978876de5eeb0de9c0060be3 SHA512 c922bf696b9ff48c8c39fd4ae06f4b72ea7b18645ad41552b0367859066d7601bc59521643335931e1cce799344a1c1ac9a7c28408de4c19bfa4127594a2ec7d
 DIST gnome-tweaks-40.0.tar.xz 251908 BLAKE2B 4280e7565da3f95d7bcd81ba874d2f15e8c3834ab052cb4cf7cde8060eaea016670acf6f441d2cbce4b7566ba0bb7a7f9666b257893bc7b22b1cdc4d5a0edee2 SHA512 c3467f40af6bb79c2b10cb429e93aa29261066c2a5fd744bf2801c4e596cc270d45302ebfa942ee0c40067849c12e1ccd404c40e7f594bcff4c44cfe3f90bb97
-EBUILD gnome-tweaks-3.34.1.ebuild 1266 BLAKE2B 1fd2dcfade422e0b1cc4e79307a82c1c0d6c265c25c36ae6daf279bf8c7e8303a8f80f9bc68387e2b1a01b35bf924ea5dd3e7af1e7d9271c4d41d224a55be65a SHA512 058336d23e6fa7c8612ff9bc6c83e9bcde71495a8183ac41e6af9115ca06d59a0999057053852cb83cc90176ff5689653238022d68900b9104a3d3a002b2c71b
-EBUILD gnome-tweaks-40.0.ebuild 1229 BLAKE2B 4ecff75ea4caee1342c1173fd57aa0f507a05702df58808f69e39a22bb7aefc8b2e2a87b4c955c24436f53f2b29f6256e8a055082d217be2a3728180d29c6189 SHA512 2ad0bd9a05439fcb2f937cda44464e5b3e55a5ba35b1e41ed6c0a8681a15243b38759b3fd76afe88e326f69519b0226a3884205290358c14fc2dc4f9928e3ade
+EBUILD gnome-tweaks-40.0.ebuild 1227 BLAKE2B 50ce2441e4bd9f6726a398dfbe153119981bc8705a913ebedb98613d13457d867de3d2b6e8fe9483093f1a5553a8c374f1b20a2b4225cacd8e5360f19fbff58b SHA512 57496151b37405d1e8ebccb5914da0867e7d17a12831d82a6c30ea41cd44e9707bea99b9e0f082fdb7d01d9bcba0e8cbf5d7c807f30aad494d44f50d05c9305b
 MISC metadata.xml 556 BLAKE2B 0964398067f54577410c361418ce6f70d1afc4e1f064e3f67a1b3b6a7d37489124b7405f75c1bda57f0f25f74bc0b6ae144a4d5e04fd29bf1d180b5b4245a1a6 SHA512 1e6abce7e7e566d0c382956311c35ce9d70d044c8ee672103dc443eddcd7492e7bb4940b889213dfd7b49accce41269d820bb0b39d32e81857e3c6775609f67d
diff --git a/gnome-extra/gnome-tweaks/files/3.34.0-fix-python.patch b/gnome-extra/gnome-tweaks/files/3.34.0-fix-python.patch
deleted file mode 100644
index 8845a0d26ca9..000000000000
--- a/gnome-extra/gnome-tweaks/files/3.34.0-fix-python.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From 024bf6cbccc4ceb9c1e8243f43df225f5dff9098 Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Sun, 29 Mar 2020 16:05:36 +0300
-Subject: [PATCH] build: Fix python files installation handling
-
-The deprecated meson python3 module tends to end up installing only
-to a python version that meson is installed for too, possibly
-breaking some expectations downstream that want it installed to
-a specific python3 version, that might not match what the build
-machine uses for meson.
-Fix it by using the non-deprecated python module and methods from it.
-
-The python module exists since 0.46, which should be safe to require
-by now. There were meson 0.50 features used already, but unnecessarily,
-as the configure_file install parameter was added then, but all versions
-default to `true` anyhow. However in practice this only emitted a
-warning with newer meson versions and was able to build fine with older
-versions too. However fix it too, so that we are now warning-free for
-meson features after raising of the meson version dep.
----
- gtweak/meson.build |  5 ++---
- meson.build        | 10 +++++++---
- 2 files changed, 9 insertions(+), 6 deletions(-)
-
-diff --git a/gtweak/meson.build b/gtweak/meson.build
-index 3d9a743..4e558b4 100644
---- a/gtweak/meson.build
-+++ b/gtweak/meson.build
-@@ -11,7 +11,6 @@ configure_file(
-   input: 'defs.py.in',
-   output: 'defs.py',
-   configuration: defs_conf,
--  install: true,
-   install_dir: gtweakdir
- )
- 
-@@ -46,5 +45,5 @@ tweak_sources = [
-   'tweaks/tweak_wacom.py',
- ]
- 
--install_data(shell_sources, install_dir: gtweakdir)
--install_data(tweak_sources, install_dir: gtweakdir + '/tweaks')
-+python3.install_sources(shell_sources, subdir: 'gtweak')
-+python3.install_sources(tweak_sources, subdir: join_paths('gtweak', 'tweaks'))
-diff --git a/meson.build b/meson.build
-index cffa8af..60141c5 100644
---- a/meson.build
-+++ b/meson.build
-@@ -5,7 +5,12 @@ project('gnome-tweaks',
- 
- gnome = import('gnome')
- i18n = import('i18n')
--python3 = import('python3')
-+pymod = import('python')
-+python3 = pymod.find_installation('python3')
-+
-+if not python3.found()
-+    error('No valid python3 installation found')
-+endif
- 
- prefix = get_option('prefix')
- 
-@@ -13,13 +18,12 @@ bindir = join_paths(prefix, get_option('bindir'))
- datadir = join_paths(prefix, get_option('datadir'))
- libexecdir = join_paths(prefix, get_option('libexecdir'))
- localedir = join_paths(prefix, get_option('localedir'))
--pythondir = join_paths(prefix, python3.sysconfig_path('purelib'))
- 
- pkgdatadir = join_paths(datadir, meson.project_name())
- 
- appdatadir = join_paths(datadir, 'metainfo')
- desktopdir = join_paths(datadir, 'applications')
--gtweakdir = join_paths(pythondir, 'gtweak')
-+gtweakdir = python3.get_install_dir(subdir: 'gtweak')
- icondir = join_paths(datadir, 'icons', 'hicolor')
- schemadir = join_paths(datadir, 'glib-2.0', 'schemas')
- 
--- 
-2.26.2
-
diff --git a/gnome-extra/gnome-tweaks/gnome-tweaks-3.34.1.ebuild b/gnome-extra/gnome-tweaks/gnome-tweaks-3.34.1.ebuild
deleted file mode 100644
index 1590ddd10d26..000000000000
--- a/gnome-extra/gnome-tweaks/gnome-tweaks-3.34.1.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
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit gnome.org meson python-single-r1 xdg
-
-DESCRIPTION="Customize advanced GNOME 3 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 ~ppc ~ppc64 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_MULTI_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:0.0[introspection]
-	net-libs/libsoup:2.4[introspection]
-	x11-libs/libnotify[introspection]
-
-	>=gnome-base/gsettings-desktop-schemas-3.33.0
-	>=gnome-base/gnome-shell-3.24
-	x11-wm/mutter
-"
-BDEPEND=">=sys-devel/gettext-0.19.8"
-
-PATCHES=(
-	"${FILESDIR}"/3.28.1-gentoo-cursor-themes.patch # Add contents of Gentoo's cursor theme directory to cursor theme list
-	"${FILESDIR}"/3.34.0-fix-python.patch
-)
-
-src_install() {
-	meson_src_install
-	python_optimize
-	python_fix_shebang "${ED}"/usr/bin/
-}
diff --git a/gnome-extra/gnome-tweaks/gnome-tweaks-40.0.ebuild b/gnome-extra/gnome-tweaks/gnome-tweaks-40.0.ebuild
index 127de63566b9..4595dba16af3 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 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 
 DEPEND="${PYTHON_DEPS}"
 # See README.md for list of deps
diff --git a/gnome-extra/gnome-user-docs/Manifest b/gnome-extra/gnome-user-docs/Manifest
index 20057b59f5d0..1fa252b8784c 100644
--- a/gnome-extra/gnome-user-docs/Manifest
+++ b/gnome-extra/gnome-user-docs/Manifest
@@ -1,7 +1,3 @@
-DIST gnome-user-docs-3.36.6.tar.xz 10607064 BLAKE2B 2b6173905f16a72885ea684e79930ee9425adea7b98b11f324df48c5f788a6f72aafcf9b782aae764eca3db451bd232be6f2572eec6278e179ae04102c863a1f SHA512 62384715c9cfa82fcf39f93d574e61aa2a127060f558f7f68b7ce1a3a724cf1670affeff165cff16b6c019b2c4135a517d39da6be859e8756c850763c912f3ab
-DIST gnome-user-docs-40.0.tar.xz 8974868 BLAKE2B 4598074620fa08c4e9f9bb8d7267252abe4f0a026668d1236cd516f832b457e675326789ed0c8ac6efb71b81a75a1e40aa8dee6049a188d79c289a8af3991661 SHA512 0e878c28a1d8fa74dd44b5be0562f0a45056ab1eabd1f00e81db46d69fc39e9a5a833cbbd42704fd998a5f724c323902323ab5b100be6c58089d9051302a14b5
 DIST gnome-user-docs-40.1.tar.xz 9264892 BLAKE2B 3c27662d516839d411444b811d2c60da51b055a7200958ee50908092bd135e182c2b359f47b711b276a6a9b6b029b767b23bd88fecc32f2c80fa2652ace40184 SHA512 a5ebd9bfbdf13c6922db2035c740f729dc89a2dfa991e74cb835d1c8e28ec4d0d08aaf7388d00d6df83f53a6261bebc1ea32e5b57287c13b2237221a56a34332
-EBUILD gnome-user-docs-3.36.6.ebuild 949 BLAKE2B 79947eed8a51d76b6e1243cf65fb2c2a448a1e3e9aa0fb350ca3bdf0ff49209b900b433741d2a2be0354cadac2d32897fe45f0892a13eb5aa29f788b216ed21f SHA512 18027b921c1acf9d44ebaacae8c77db16bcf35fdf76fbee47b22e9d0d4c53394f9e7fa37105b03baf72e1274a872fac0a468cf878480990373fb54efc623e45a
-EBUILD gnome-user-docs-40.0.ebuild 938 BLAKE2B 399a4f043a4a19513de8674eb2ff7715d05b99ec703800b5bf92f7cd8320065df980bf63bd7d426621e7f36b7718210419cf98633397ea11ea33910da65d10c8 SHA512 6fdf644c671bdd9c51836670e6029021060b3f45af749abb5d641d8c3ef201c0e9d57a69cc87e75bc94081a735689c7f725b55398147fba1c6d5e39a113a70f7
-EBUILD gnome-user-docs-40.1.ebuild 938 BLAKE2B 399a4f043a4a19513de8674eb2ff7715d05b99ec703800b5bf92f7cd8320065df980bf63bd7d426621e7f36b7718210419cf98633397ea11ea33910da65d10c8 SHA512 6fdf644c671bdd9c51836670e6029021060b3f45af749abb5d641d8c3ef201c0e9d57a69cc87e75bc94081a735689c7f725b55398147fba1c6d5e39a113a70f7
+EBUILD gnome-user-docs-40.1.ebuild 936 BLAKE2B 5ed71e6738ceff62527e672a8934fbd2250be68a276f340be725cb6d0adcb78028c47b02e50552c157180ec27a39950fdb44fd887c665e1e9d48980a3e2aa65f SHA512 765e271a48d49b2047f1e1c5968c9570dac6c6c876d1d10284e7a7de57db0db36cbbf0a080224a64c1a4eb500cde9f5c29bdd99898ba06142c2eac8add2f7e24
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gnome-user-docs/gnome-user-docs-3.36.6.ebuild b/gnome-extra/gnome-user-docs/gnome-user-docs-3.36.6.ebuild
deleted file mode 100644
index 99ba4cb2760b..000000000000
--- a/gnome-extra/gnome-user-docs/gnome-user-docs-3.36.6.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="GNOME end user documentation"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-user-docs"
-
-LICENSE="CC-BY-3.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="
-	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.0.ebuild b/gnome-extra/gnome-user-docs/gnome-user-docs-40.0.ebuild
deleted file mode 100644
index aef106ecb64f..000000000000
--- a/gnome-extra/gnome-user-docs/gnome-user-docs-40.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome2
-
-DESCRIPTION="GNOME end user documentation"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-user-docs"
-
-LICENSE="CC-BY-3.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="test"
-
-BDEPEND="test? ( dev-libs/libxml2 )"
-# eautoreconf requires:
-#	app-text/yelp-tools
-# rebuilding translations requires:
-#	app-text/yelp-tools
-#	dev-util/gettext
-
-# This ebuild does not install any binaries
-RESTRICT="binchecks strip
-	!test? ( test )"
-
-src_configure() {
-	# itstool is only needed for rebuilding translations
-	# xmllint is only needed for tests
-	gnome2_src_configure \
-		$(usex test "" XMLLINT=$(type -P true)) \
-		ITSTOOL=$(type -P true)
-}
-
-src_compile() {
-	# Do not compile; "make all" with unset LINGUAS rebuilds all translations,
-	# which can take > 2 hours on a Core i7.
-	return
-}
diff --git a/gnome-extra/gnome-user-docs/gnome-user-docs-40.1.ebuild b/gnome-extra/gnome-user-docs/gnome-user-docs-40.1.ebuild
index aef106ecb64f..f9a0f49950e9 100644
--- a/gnome-extra/gnome-user-docs/gnome-user-docs-40.1.ebuild
+++ b/gnome-extra/gnome-user-docs/gnome-user-docs-40.1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-user-docs"
 
 LICENSE="CC-BY-3.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="test"
 
 BDEPEND="test? ( dev-libs/libxml2 )"
diff --git a/gnome-extra/gnome-weather/Manifest b/gnome-extra/gnome-weather/Manifest
index 8cb8621a5035..fd1120917025 100644
--- a/gnome-extra/gnome-weather/Manifest
+++ b/gnome-extra/gnome-weather/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-weather-3.36.1.tar.xz 5959192 BLAKE2B f0745506ffd2b72a1a5fe0783fe04c563691840fdf2150e7850cd331ba2027b1d1fcbbb4565830d05c7e39e62a2c94e4c87443ce5786cc70f3ebabcc66e97eec SHA512 c3d4b0e7258c0bfbc1ab2b5695d601fe79326e1bed856734edc309c612f1cc0adc9cfd6b4afb4ad3069b864c807ca0b21a60f89feba68f1dacac58d0fd2221be
 DIST gnome-weather-40.0.tar.xz 938732 BLAKE2B bc46da61e9620278f5abc7964b869520da85837739923618b2ade114c8561fc6125e7dca2f2aef5715fec7dfa0561c693f75278d050900cb948f8d1ea42f58ba SHA512 c4560c1a1535a0c2889c8cd934926217a7caceb1b646fa4bb961c7cbde38b9b545a567f24fb81e47c61a2ac3e456a5432e8979591eb5a169fe5849bbd99d6333
-EBUILD gnome-weather-3.36.1.ebuild 1333 BLAKE2B 8a40937674d245eaff3481b2e76fe9e1d0d176b5b6c23067a8bad7bc90a4f6b3027862176649051e814b128986e7680d24ed48f417635728fc4359b35a715379 SHA512 4fdace50c44207d79068e06da79d7e88c436cf364eb044798e1872d58cd41748e6fc07b3687bece07b98a182bfa74e93c089deab0effa0015386d319325f23a7
-EBUILD gnome-weather-40.0.ebuild 1366 BLAKE2B a0593a505379511a80bde93ef69ebd9f7ab4004343af37ba9609091f4935f006d95d48af3948250e26a8f7df0736df59216ff7d9498a6aed23e425839ed2b941 SHA512 39c16719aeb80b131c1994f37e3d8aa56b2d6ec3add588697e54b25e677c79c745567102328b8b3a225948f8503747b137d69087c12e28eb4b312d7a41efc0d4
+EBUILD gnome-weather-40.0.ebuild 1364 BLAKE2B efab2f425bca519fee370586a78e3b743eb849f210f52365cf2b7f4f1ff2435ef8a8309e022c64b535f753d9f12f0cf2f83fc4ce042257a5219c56770578d68d SHA512 6074f6b1fc33b676b57a75a9bf09a2d8832ffc4afe812a66355f0c6b582abdbf7f4b4b68691ec93036d9a006a69b97c14d6eb7f5fe0fc9274ba9a5759e0529cc
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gnome-weather/gnome-weather-3.36.1.ebuild b/gnome-extra/gnome-weather/gnome-weather-3.36.1.ebuild
deleted file mode 100644
index 7dbc4abe0b21..000000000000
--- a/gnome-extra/gnome-weather/gnome-weather-3.36.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 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 x86"
-
-DEPEND="
-	>=dev-libs/glib-2.32:2
-	>=dev-libs/gobject-introspection-1.56:=
-	>=x11-libs/gtk+-3.20:3
-	>=dev-libs/gjs-1.50
-	>=app-misc/geoclue-2.3.1:2.0
-	>=dev-libs/libgweather-3.28:=
-"
-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-40.0.ebuild b/gnome-extra/gnome-weather/gnome-weather-40.0.ebuild
index f468aa083404..72bdad82ee27 100644
--- a/gnome-extra/gnome-weather/gnome-weather-40.0.ebuild
+++ b/gnome-extra/gnome-weather/gnome-weather-40.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 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 DEPEND="
 	>=dev-libs/glib-2.32:2
diff --git a/gnome-extra/gucharmap/Manifest b/gnome-extra/gucharmap/Manifest
index eaa5ab2a24da..000ffee9168a 100644
--- a/gnome-extra/gucharmap/Manifest
+++ b/gnome-extra/gucharmap/Manifest
@@ -1,8 +1,6 @@
 AUX gucharmap-3.4.1.1-fix-doc.patch 348 BLAKE2B c6bf73a5e9940557fa43da04b8212ca527b9abdfaccf7f1522c9a6dfcb52af8f6c05a56a683621eb64c34452464605d7a5a98b77ab9b67224f5c84acc0b1cf68 SHA512 d6e468ce2bbd258e01be0125a1b16529c89ce9758c24504d91550181af3b3e7c6b0e4171d3b26c252339f099927d43a7184f967764d564a4ebf28610968d8d27
-DIST gucharmap-13.0.4.tar.gz 1900442 BLAKE2B 83925f04b23a5984e0180ae86d39842e419fe723604d3e93785241ed33ba56b80d68bfd8c99514ef542e515c78a0b64748781faa962d3a32e26746673ba4d2f0 SHA512 919f3298040962cf1b8636fe82a900e667d1f63c0f92c99b013d10cee7e7d5f074f3ffaa0ab8a8e3685b6764915a4e683e459fb680aeb65247c82c5a8a326bf9
 DIST gucharmap-13.0.7.tar.gz 1919890 BLAKE2B c90b09f2e52b27ea652a32c4a502a57767eb4f4cf5895a61f3a871f1f5fb81c27083938fc9394d2a74881bfd4c23fdf2cdbce2dc07a55cd3a7d9422e6da40ff9 SHA512 9ed3cea9560cfb53af61863b0811a4d62c347e404880154acd47c5e4148d5b5cf3c31a4ad3b8440081e0bc7b33666c6b0fed35c26f8ee9c0a1746d9ed61b19ca
 DIST gucharmap-3.0.1.tar.bz2 3275481 BLAKE2B 80dde7791abdc72677add9c65c59f810e6c6952116b92db34059c4c40d2657246b17844c105e68f32c86294e9b4e71e9d48e6f0522855465734d7c24e8d17608 SHA512 4d8a2276b5cb1a0b0fadca2a8522755c5884985a12d5b19341b9cefcd7f749ec1286c0271419e38ec84be7edcfa1293e7f0263eb682c75387d692792de3e1fb1
-EBUILD gucharmap-13.0.4.ebuild 1496 BLAKE2B 12ea9277f7a0f28f9ceeb1faccf80f65c70fca1bd1896b254d5060d179c8ac11a0e636e2ba9bf19bf28d8089db4c40abb05e06c910ad6158514d982d9d678f4a SHA512 3d6269ed657e97cdc9828980911f295940b9381e19ce8cdc0e5cb764dcdfd7b5f76fad844a40ab7026566445a41683f0ab0ee9f3d8d5646315bfae2e09ada179
-EBUILD gucharmap-13.0.7.ebuild 1503 BLAKE2B b1faaa7368f584453e45e518776334178272058057717ed9cebd884dc37f26dcafd133e69b1ba92f1cf14f937017d087cbf066e375edb605db37e874640c84d6 SHA512 a7aa5ac15dc53308d3bd5b509992c501d9f3d7d0c680a18fa292e5f88ab5f2538e5fd432655d4f23f291f221e4f7afdc976c480c8ccbcc11038fd8fbbc572cba
+EBUILD gucharmap-13.0.7.ebuild 1496 BLAKE2B 12ea9277f7a0f28f9ceeb1faccf80f65c70fca1bd1896b254d5060d179c8ac11a0e636e2ba9bf19bf28d8089db4c40abb05e06c910ad6158514d982d9d678f4a SHA512 3d6269ed657e97cdc9828980911f295940b9381e19ce8cdc0e5cb764dcdfd7b5f76fad844a40ab7026566445a41683f0ab0ee9f3d8d5646315bfae2e09ada179
 EBUILD gucharmap-3.0.1-r200.ebuild 1477 BLAKE2B 4ffe6feb86be5711b4850d4c1233bd79e2cb9cbca765977ac15b7a335c3b3f80beffe2119835a73024d38a22e4623037755c8672f77edb6016b818047b8c2256 SHA512 b0313be9418955ebfde4547603d66c8121cb36b7cf390e23ee9b536ea9ff21b4760bb9d9e0d843bd49fcb63db28b173d8536a6d5a5b72de1eef76a87bed769dd
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gucharmap/gucharmap-13.0.4.ebuild b/gnome-extra/gucharmap/gucharmap-13.0.4.ebuild
deleted file mode 100644
index 793250c94685..000000000000
--- a/gnome-extra/gucharmap/gucharmap-13.0.4.ebuild
+++ /dev/null
@@ -1,73 +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.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 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_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-13.0.7.ebuild b/gnome-extra/gucharmap/gucharmap-13.0.7.ebuild
index efc145ee7aae..793250c94685 100644
--- a/gnome-extra/gucharmap/gucharmap-13.0.7.ebuild
+++ b/gnome-extra/gucharmap/gucharmap-13.0.7.ebuild
@@ -14,7 +14,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 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
 
 UNICODE_VERSION="13.0"
 
diff --git a/gnome-extra/nm-applet/Manifest b/gnome-extra/nm-applet/Manifest
index 754adc740d16..cec3c11a76d7 100644
--- a/gnome-extra/nm-applet/Manifest
+++ b/gnome-extra/nm-applet/Manifest
@@ -1,5 +1,3 @@
-DIST network-manager-applet-1.20.0.tar.xz 1953772 BLAKE2B 1fb480887e61d7ef3a76ac5ded7ffe6723e99b2ae53d2a53990d3c2617eac45bc99b00b10b43929e8696488abc1b0be2194e800b931732f229d7d4bd17e1951e SHA512 3b7ffd61e4f810fedee5aaf64725fcc2a8ee3c6b776f2d0b93f337c207516392b4720acea35c56c80755842c600edb971a67813c1583c112a91496d3d8db2c67
 DIST network-manager-applet-1.22.0.tar.xz 1901680 BLAKE2B e1597d5ee332000082e2939745af10f5f5d5e9177b388f67fdb9822636226502a4c96f4f97187f01ae8de5bd1b4d853670e94dc9058e9b31cf9cadf11fe6a64b SHA512 80c9a8df750f1253a66aea254f30278a934ed4e11fecff03cfa50a31da9efcff5c8892caef672a4d62d8c5c473770358c35344b49a9f3d7956ad76063b794cac
-EBUILD nm-applet-1.20.0.ebuild 1214 BLAKE2B 1bf70341eec3f8414aed9d123f5b814f3f94dcb87f9eca83b6c096c709a0084820979f451e270c917abc072c7d4f6cb6c4ea7bc5083947a8a2c9d2dc6587f40f SHA512 6546b90d3aeeb373033395c7e456238fb4c5575655454b2d941f9d2ce20f14913751b8fd5934847b4dd5e2b74db1eb460010b69d23b0380f7ccd0f32c91b3d19
-EBUILD nm-applet-1.22.0.ebuild 1219 BLAKE2B 5db1c88c3b923a054eb4325386083e38af26eeda97193d9df9d92386a2da72e0f2996ce34b8f8de85396ad9c6a8fc47c2ead5d8dfc7c3eb0e5ab6608c4e0383e SHA512 c726308c390bb0cdfdecf4b44904d58b0d9f0f8fda637c9b5edffea87d1c8eb3ce284629ce46daa21046e141b3f5286b6a912962ab8cc503a0999d7f6c511af8
+EBUILD nm-applet-1.22.0.ebuild 1214 BLAKE2B 1bf70341eec3f8414aed9d123f5b814f3f94dcb87f9eca83b6c096c709a0084820979f451e270c917abc072c7d4f6cb6c4ea7bc5083947a8a2c9d2dc6587f40f SHA512 6546b90d3aeeb373033395c7e456238fb4c5575655454b2d941f9d2ce20f14913751b8fd5934847b4dd5e2b74db1eb460010b69d23b0380f7ccd0f32c91b3d19
 MISC metadata.xml 451 BLAKE2B 82878f455c7c0c79fc88fd65ffb9dc801a0d009427b104bd02a5ee5440b9b8487d386b39c1bcd7276ac276c00d94150c86c14cea5f310567c3375435b5a485bc SHA512 fd77b7a80454c27435ff3867634f987ca44d3789bb10f2fa6097e00f43cdfbe01a187c217e8f23a6d8c2a330917adfb8f9e6d8ad3408815f8b83ef05e1718cc8
diff --git a/gnome-extra/nm-applet/nm-applet-1.20.0.ebuild b/gnome-extra/nm-applet/nm-applet-1.20.0.ebuild
deleted file mode 100644
index 1e2838aca035..000000000000
--- a/gnome-extra/nm-applet/nm-applet-1.20.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-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 ~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
-"
-
-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.22.0.ebuild b/gnome-extra/nm-applet/nm-applet-1.22.0.ebuild
index 9a0c4cf3048d..1e2838aca035 100644
--- a/gnome-extra/nm-applet/nm-applet-1.22.0.ebuild
+++ b/gnome-extra/nm-applet/nm-applet-1.22.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 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 ~sparc x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.38:2
diff --git a/gnome-extra/pch-session/Manifest b/gnome-extra/pch-session/Manifest
index a31f3ead6dee..8a66af3796bd 100644
--- a/gnome-extra/pch-session/Manifest
+++ b/gnome-extra/pch-session/Manifest
@@ -1,3 +1,5 @@
 DIST pch-session-3.38.4.tar.bz2 3610553 BLAKE2B 68585f7e0ebcd04312bf5f7a60de04a9b5b7412fa3b3aee43409c0c10f074c2f3efd95ecf5e2bcea4ccc5765c556ec6ef6a43737be5bb0e2b470994810f87c40 SHA512 42364f44656be8652e1be0beb592068b727660f17ba573fb35836bf39dc225c19783deb4b488ae450143457ac8236601334150665162294285aadfe7cb9758d0
+DIST pch-session-40.0.tar.bz2 3610342 BLAKE2B 9d82fe4b20e136d5ddef020477ab9526bb920b7e67e3a357ac24c6fba5d83aa8e1735a9c581a156496f7013ce12c6e6c91f7a5b7e3e446503e81ad96070fc884 SHA512 32bb9ebb3127b47482150d11c1e8bb865e2fe34e39767670f07d03965044842526e4194f3130743c8f79a5658dccf858c922f88d1316ea4d065878090a77f128
 EBUILD pch-session-3.38.4.ebuild 1283 BLAKE2B 3e7bd310206f47130864e736d6165d265382af550f6222fa4b4a02e19de5bd7315693a89f876363310bf65e84548df9658636fc035f5802a79a0122254e98725 SHA512 c5861379df9b4d304dc8382ec66d1b8fabe65508db6f94c61e50e5124fcfa6ad97d5bc8178257268b7f6309c3cb3c956f850e787b284d623bc753e27c32acc91
+EBUILD pch-session-40.0.ebuild 1238 BLAKE2B 4aafe0c2a9284939b83b167f9f4e564fdc708af7c2f2a191986f85ffd77e9798e7ef620556e96769f01d9830f9839f06b44e97fcec0fa527b0b23f0ca60ff9e9 SHA512 219b7d308693da99310c9ff10d06009c1e6b52b1bab9ba40c225df30782191a8ce0aa22b286a11876ed64b9d91fa6c52e80ce515854ee358a66e0b50ae7d21e2
 MISC metadata.xml 240 BLAKE2B 63b29b3fa5f9613689cca20017685c7b8fda461b37bd79b15deb70b8691afdbb1a262dac93cb3520a9d9e9c49ba745f8c797b269bb41933391a5a94667bb1c24 SHA512 2d1e63e0f72d6332021e3c9bdacb1e2b203a31b907c5a93c305e4f7b0eeef0856fb0cca37bc0d7d3d1ba77b08f81c7626f834239e3484e13032cedf59304239e
diff --git a/gnome-extra/pch-session/pch-session-40.0.ebuild b/gnome-extra/pch-session/pch-session-40.0.ebuild
new file mode 100644
index 000000000000..3b5931d3af68
--- /dev/null
+++ b/gnome-extra/pch-session/pch-session-40.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+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-40
+	>=gnome-extra/gnome-shell-extensions-40
+	>=gnome-extra/gnome-shell-extension-appindicator-37
+	>=gnome-extra/gnome-shell-extension-applications-overview-tooltip-12
+	>=gnome-extra/gnome-shell-extension-bing-wallpaper-32
+	>=gnome-extra/gnome-shell-extension-bluetooth-quick-connect-20
+	>=gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen-20201211-r1
+	>=gnome-extra/gnome-shell-extension-dash-to-panel-43_pre20210510
+	>=gnome-extra/gnome-shell-extension-desktop-icons-ng-0.17.0
+	>=gnome-extra/gnome-shell-extension-gsconnect-46
+	>=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/polkit-gnome/Manifest b/gnome-extra/polkit-gnome/Manifest
index c31e04346662..acd7381f270b 100644
--- a/gnome-extra/polkit-gnome/Manifest
+++ b/gnome-extra/polkit-gnome/Manifest
@@ -1,3 +1,3 @@
 DIST polkit-gnome-0.105.tar.xz 310876 BLAKE2B c4b44d8d667ecf043516468fea061c668c94f670aeb0649ecfe1cecdd466d46156b6fffbf642020bd575f4e40f84e6155d3752ebfef57ef0491019616a4f0c21 SHA512 eae2504959bca6f2b53dbad1b743fc0414b82897e62623af80ee74c4080a10d6b07a4c90151ee1264891f27373321b8697ac8a747cba5254c765b4cd9161bd42
-EBUILD polkit-gnome-0.105-r2.ebuild 1059 BLAKE2B 8a8a9f303da9f5ae15a994ab7de3f9c7f1f87298ede15f9fce5d3f5aa8b188ad4fa2f600f755d74614626ad57757772fc1a7cee7b1cb6aca3fb27a2d80d54097 SHA512 00a189ea5eba2474dc580635e4ba0eddb62db0a01d19dcbc0aed9125d634c91e99ee702e354ae119bce38e6537dbb4234f1e7414da4870b4d1fd88fa270ed129
+EBUILD polkit-gnome-0.105-r2.ebuild 1066 BLAKE2B 40f20bd3a645f2e69b7fad5ec8fcd713c37ea47e0d8a66a304b350759e4e0b9cef45cdc25fa6b2effec2ba3c3e45c8eca8646783ec8d8bea1db24a3fdbcc6374 SHA512 15212f1e5491ea080a73972215131daac3f3199dc9c489cac1e52ae7d9827cb6f1fcad159daab3d88a773a6d9743143361b275ccbae1e0fb8686b474f0a6bc91
 MISC metadata.xml 266 BLAKE2B 9c01787259e2c33e012f96ae52558f21518e2dc4e2bae1e528e8d53b897a698d9d205226aaf5c3796002ac10335d09b57de0d7a0ec079ea9982c7e05d1f67091 SHA512 c4dde7027a929519d75bf240bdf01edee88b6ab874e56c9e524f783b801eb26b5e86a9378cf23b21f7fd2f0f9ee45764daa7deef9173a05e0fedd997e648313b
diff --git a/gnome-extra/polkit-gnome/polkit-gnome-0.105-r2.ebuild b/gnome-extra/polkit-gnome/polkit-gnome-0.105-r2.ebuild
index 76d00541ad3a..020b3c4822e4 100644
--- a/gnome-extra/polkit-gnome/polkit-gnome-0.105-r2.ebuild
+++ b/gnome-extra/polkit-gnome/polkit-gnome-0.105-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.freedesktop.org/polkit/polkit/"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
 IUSE=""
 
 DEPEND=">=dev-libs/glib-2.30
diff --git a/gnome-extra/yelp-xsl/Manifest b/gnome-extra/yelp-xsl/Manifest
index d53d27137150..bd3cd2a5b4f7 100644
--- a/gnome-extra/yelp-xsl/Manifest
+++ b/gnome-extra/yelp-xsl/Manifest
@@ -1,5 +1,3 @@
-DIST yelp-xsl-3.38.3.tar.xz 642928 BLAKE2B 30c27d3ebbce1d55bb91c705e1a2ec3aae361646cfec97874614eaac1f8c51535c3ffff6a777fc19c9b85fcf5979384b1c7f4d854a41b10afc643bd68714e0af SHA512 17e66f744de0f88462fe8c1e1d484ead76551c6c0e8d7f9cdf04e670e50829e5258a8190cf58e0723eeeb3cd7fc44004ee5dfb53b5dd6f7dac52d2b8d6cfbaa2
 DIST yelp-xsl-40.0.tar.xz 660148 BLAKE2B 3f53c568358a4325ffe36fbd3df71c39f638e1757f9a684d6d67b252463be867b66e9f20c115df3053becffe9baf5f9bf44aec32cf7aef1887ee3a8eb4c93b4c SHA512 50ada34e76bc3b14940e7ccae368ef60802b8baf354ac0784260fd4408dcecaedf08697f249226e3236a54b487b86d7e00bffea6845adde42285f10d2a8f8e4d
-EBUILD yelp-xsl-3.38.3.ebuild 561 BLAKE2B 4a655fc2d410531316481bd762b2b7f2ee6ca4cbbba77dfb4b5152a9b39a00d669f9aed1aa33b83202ef9d825db7eb2cd9c65662d9f4f09b9ba05b0063fb90e6 SHA512 5cd83a4655215478ad72cbe3f9d38439084dbdcee9ef52d5254c1dadd5e1661bef5e9122dafd3658ff61a03399d2933de50765870126c9ce99cfdcb5f3585c2f
-EBUILD yelp-xsl-40.0.ebuild 568 BLAKE2B b7e4b907e7e42511eb66e10556de94e8f5a86d8fb10204df85685f4714433aed0787c558b92e887c21d6bc54a2e8885e884f73b83f0bed300858688fd9f3ef63 SHA512 362bc0f94b18cd918a69df358281f7eb2a309e6f8a088c87d8d58728cf9f07d59582d9e946c07039be4fcd60878bc17775d4402bdbfa3190165bd5212a710a5e
+EBUILD yelp-xsl-40.0.ebuild 561 BLAKE2B 4a655fc2d410531316481bd762b2b7f2ee6ca4cbbba77dfb4b5152a9b39a00d669f9aed1aa33b83202ef9d825db7eb2cd9c65662d9f4f09b9ba05b0063fb90e6 SHA512 5cd83a4655215478ad72cbe3f9d38439084dbdcee9ef52d5254c1dadd5e1661bef5e9122dafd3658ff61a03399d2933de50765870126c9ce99cfdcb5f3585c2f
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/yelp-xsl/yelp-xsl-3.38.3.ebuild b/gnome-extra/yelp-xsl/yelp-xsl-3.38.3.ebuild
deleted file mode 100644
index 7ac0da7d4694..000000000000
--- a/gnome-extra/yelp-xsl/yelp-xsl-3.38.3.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 ~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-40.0.ebuild b/gnome-extra/yelp-xsl/yelp-xsl-40.0.ebuild
index fb0b0cda287d..7ac0da7d4694 100644
--- a/gnome-extra/yelp-xsl/yelp-xsl-40.0.ebuild
+++ b/gnome-extra/yelp-xsl/yelp-xsl-40.0.ebuild
@@ -10,7 +10,7 @@ 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 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-libs/libxml2-2.6.12:=
diff --git a/gnome-extra/yelp/Manifest b/gnome-extra/yelp/Manifest
index 4259e86c3dd5..0feca2852f24 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-3.38.3.tar.xz 1505460 BLAKE2B a9874d23b80094d4bf9d78e23072cee97b77c3f6cf0dd4eadad6d362a582559fa667862b11c34c5ca6569f4dc0ab4bf2b2e9f6f05d3100e674ecb717ad28eaf8 SHA512 7e4749b652fa60ab82a715f40be6b8e0430869ec94f47743e3c48b5a9894bc9867f8623574d27da6f3dfb3fe3269a384d02c817ef8c81188e559ab173412df79
 DIST yelp-40.0.tar.xz 1526456 BLAKE2B de76ce11775b2940a5590a72a0f9f821a3b083810087c65f870cfaf4d6bb0a34653025d87b28d01e11ce5e3dbd7bca8331c62d701d8c050938756c53797198d0 SHA512 efe88bc8d75d00b48b8a0a8d2a07cc95771a4fd8e7068003333f79336f1272f07f1738d91a6978e3c3a9258c6742551d25e8cd899a77cfa262f22e6cf9632590
-EBUILD yelp-3.38.3.ebuild 1214 BLAKE2B e4124caf8f33cd19ef9c0f926909b284618f9239614bfb2e5cd11003698a7db76fae13ba33753838a609c1c8640663fd582e3baffc6bc218b4787211cb604f37 SHA512 74c0a8c23930ff82c0d6d6be556a199f5ac6acd310f8b2832cd631c732433a1b9c83fe44494757741777087ec20f608bd84137160738321f198a3a2f1f44c2e2
-EBUILD yelp-40.0.ebuild 1216 BLAKE2B ac35d814f51eece4041a29d7620eb182705b77cb03de1ef7d5e1db13e61d3fb7a326a546727e21ae1187e69a1ef346c5a1852dff1adef8b6ed9b05a94ffdc67c SHA512 5526bd8ac48600bc749ec2771c0d5659ef908564c8131b9e32c27dd1aec608a9ac33ca2b984bc9dfb729a6fcf2fdc835a2f1380227b9548b97ac99efdddc3039
+EBUILD yelp-40.0.ebuild 1214 BLAKE2B e4124caf8f33cd19ef9c0f926909b284618f9239614bfb2e5cd11003698a7db76fae13ba33753838a609c1c8640663fd582e3baffc6bc218b4787211cb604f37 SHA512 74c0a8c23930ff82c0d6d6be556a199f5ac6acd310f8b2832cd631c732433a1b9c83fe44494757741777087ec20f608bd84137160738321f198a3a2f1f44c2e2
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/yelp/yelp-3.38.3.ebuild b/gnome-extra/yelp/yelp-3.38.3.ebuild
deleted file mode 100644
index 34af0767f4ae..000000000000
--- a/gnome-extra/yelp/yelp-3.38.3.ebuild
+++ /dev/null
@@ -1,57 +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"
-IUSE=""
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~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-40.0.ebuild b/gnome-extra/yelp/yelp-40.0.ebuild
index ff02c223d184..34af0767f4ae 100644
--- a/gnome-extra/yelp/yelp-40.0.ebuild
+++ b/gnome-extra/yelp/yelp-40.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Yelp"
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE=""
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 
 RDEPEND="
 	app-arch/bzip2:=
author	V3n3RiX <venerix@redcorelinux.org>	2021-05-31 20:59:14 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-05-31 20:59:14 +0100
commit	e748ba9741f6540f4675c23e3e37b73e822c13a4 (patch)
tree	23dece8beabb3a3d7c6c0273b0eb40b21c62a889 /gnome-extra
parent	908778078736bd36f7a60a2d576d415cb8e000fa (diff)