gentoo resync : 14.05.2020

40 files changed, 18 insertions, 1309 deletions

diff --git a/mate-base/Manifest.gz b/mate-base/Manifest.gz
index 5b40134f7e4a..74ed34ed4a5a 100644
--- a/mate-base/Manifest.gz
+++ b/mate-base/Manifest.gz
diff --git a/mate-base/caja/Manifest b/mate-base/caja/Manifest
index 47a340342595..0235a4e5d14a 100644
--- a/mate-base/caja/Manifest
+++ b/mate-base/caja/Manifest
@@ -1,8 +1,6 @@
 AUX caja-1.22.3-gcc-10-fno-common.patch 3373 BLAKE2B 7e1b665c6f2a7816fe2f13fbe0dfc0670e9e5f1c695c8602f7c594a0174ca5f000dec088800992514ef8be1042c12b83011b54fbcb4a772c400047263c356cd8 SHA512 3522d44fd7a98c9a258fe32d06eb9ba7406e1a1e3e6528519b36c7761e980c2eb3782f2cb0d38eb722a75f75fa18c8c9e33e3e76d339124b598fbe544936cb55
-DIST caja-1.22.1.tar.xz 3462248 BLAKE2B d9c7c643778678e9562e0a2b79d04ea13eddd58dce00820d78452d670438aaef2ac86cc7ce341437c1496094ee625f462d0654c53a26705e835a6c612549792f SHA512 dea2e9cac7802df5335a716a1a7df149b637014525202600f4bf3eab293eff29bf2df66df22203aa036898149cb26ba1d05491234dc75203480925cce0333a17
 DIST caja-1.22.3.tar.xz 3493232 BLAKE2B a47e94380e882b8fab16ef615dd8938063c77f7f5edfcae816fb4c3d9b84e261902dbb07a8d3ba40d32487df61050dfacc464e2b5510785748d0199a13c082f8 SHA512 9063bd0a9b6fd815f76cfefd9e87eed88588821376d0c46df9cd3ea1cada828bcee4f5f2ddb42be0178ab09a4519b34bded62cebf201dbde5dda1cf3bad95c22
 DIST caja-1.24.0.tar.xz 5221716 BLAKE2B 66d628ac0f50e2c388935420e29dfe15a8f5f127fd7b39e92ebbd67b6c929cda1a2dec1f510fb89890602adaef6a741f0ee3e15d27ab9741c5223c7966b3b908 SHA512 a68b23876cfa1171d5b1c75e4998c6b15f0ceebdc4fcaabb8d362e32e35b915b1a91a38648532ac8acc162dac50aeb4d07eff417ce2db7a8c50d68bd38a0b548
-EBUILD caja-1.22.1.ebuild 2014 BLAKE2B a027af499242963207478098091b4f8c0042828508175da62a5f7bfc0d4c3848efa99383f6f035218ba0e63d6490d81fbaf8a6b7ce22926f7c570fd1b9a1a144 SHA512 5a3fcf4bb8f1d38eb9960371244a5d55f88b6fd6b0b17e090ad830e097b46cf18315ca67c584cbd7adc3f41f166f3ac8bef159f01d9b1fa94b180df08d00dec7
-EBUILD caja-1.22.3-r1.ebuild 2073 BLAKE2B 9b801fe8ca56b5e032372cb6f06319e57258004a44abec8eeff219cfb9b401b4dd85035df73a479670ae714bf4e685f98e30364a637c2896eecd9e332da136d6 SHA512 d7063545ba95af905bf9a82855671f8654ce7918a49ff91be6fc656bcb9fdcf6befbc176db39de699f13fb1215932925552b8570d5cf5ddb6d437dc101b1b116
+EBUILD caja-1.22.3-r1.ebuild 2071 BLAKE2B f77aa8022ad6c6d099cce58bcf6190d600c4b5a33c79c7c878fc69ca8f4c4dbaccda9132661037de8d6a09d2b0fa9c29259b85d486f043b919b08b99ca4da97f SHA512 00763f5562080b1c450d4c1fdd373c9d201e157b48ce012f8a02ed2edc31b1d7087fe057d70006fe6881e7c9d504b1f0d8122d4fd9b53d14e4466fcd63ec26d2
 EBUILD caja-1.24.0.ebuild 2052 BLAKE2B d3f84d9d29b973043f6e3eca2e6ce62aea6cc925e3522bd2211f5fdee9880e4758c3f932dc46478ec5486595491296cfb7ed7a0d89dc41c16277bc7389640176 SHA512 40e7c5c53859127332c928cdc21ed6d87f822e9bffc211366b8cbe657f36965e1ea99d30a548942219a7905cdfd03229b29314077749f08c23b3837e3bda1532
 MISC metadata.xml 600 BLAKE2B 51da0f96a4adaedcea06fcb9e63f58cee8cbe7d479d8195af4821f1be66d07ee62361d225126943b24da10235bf6a06946d215a4e817a38aff5e07d29d6449db SHA512 639000dfb46bb04d2d5df50a60ab60259aa59e8cc0ad9f29c62ec2cbfa06b9556b4f7cada01588179a453a69645f2e44530469953ef5e423a428a9d6a0cceb9a
diff --git a/mate-base/caja/caja-1.22.1.ebuild b/mate-base/caja/caja-1.22.1.ebuild
deleted file mode 100644
index 008adb1b2ed2..000000000000
--- a/mate-base/caja/caja-1.22.1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-inherit mate virtualx
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-DESCRIPTION="Caja file manager for the MATE desktop"
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0"
-
-IUSE="+introspection +mate packagekit xmp"
-
-RDEPEND="
-	dev-libs/atk
-	>=dev-libs/glib-2.50:2
-	>=dev-libs/libxml2-2.4.7:2
-	gnome-base/dconf
-	>=gnome-base/gvfs-1.10.1:0[udisks]
-	>=mate-base/mate-desktop-1.17.3:0
-	>=media-libs/libexif-0.6.14:0
-	virtual/libintl
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.22:3[introspection?]
-	>=x11-libs/libnotify-0.7.0:0
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXft
-	x11-libs/libXrender
-	>=x11-libs/pango-1.1.2
-	introspection? ( >=dev-libs/gobject-introspection-0.6.4:= )
-	packagekit? ( app-admin/packagekit-base )
-	xmp? ( >=media-libs/exempi-1.99.5:2 )
-	!!mate-base/mate-file-manager"
-
-DEPEND="${RDEPEND}
-	>=dev-lang/perl-5:=
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.40.1
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-PDEPEND="mate? ( >=x11-themes/mate-icon-theme-${MATE_BRANCH} )"
-
-# TODO: Test fails because Caja is not merged yet:
-# GLib-GIO-ERROR **: Settings schema 'org.mate.caja.preferences' is not installed
-RESTRICT="test"
-
-src_prepare() {
-	# Remove unnecessary CFLAGS.
-	sed -i -e 's:-DG.*DISABLE_DEPRECATED::g' \
-		configure.ac eel/Makefile.am || die
-
-	mate_src_prepare
-}
-
-src_configure() {
-	mate_src_configure \
-		--disable-update-mimedb \
-		$(use_enable introspection) \
-		$(use_enable packagekit) \
-		$(use_enable xmp)
-}
-
-src_test() {
-	unset SESSION_MANAGER
-	unset DBUS_SESSION_BUS_ADDRESS
-
-	Xemake check || die "Test phase failed"
-}
-
-pkg_postinst() {
-	mate_pkg_postinst
-
-	elog "Caja can use gstreamer to preview audio files. Just make sure"
-	elog "to have the necessary plugins available to play the media type you"
-	elog "want to preview."
-}
diff --git a/mate-base/caja/caja-1.22.3-r1.ebuild b/mate-base/caja/caja-1.22.3-r1.ebuild
index 1167ca298cd1..bee9e5f807fa 100644
--- a/mate-base/caja/caja-1.22.3-r1.ebuild
+++ b/mate-base/caja/caja-1.22.3-r1.ebuild
@@ -8,7 +8,7 @@ MATE_LA_PUNT="yes"
 inherit mate virtualx
 
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 DESCRIPTION="Caja file manager for the MATE desktop"
diff --git a/mate-base/libmatekbd/Manifest b/mate-base/libmatekbd/Manifest
index 461515b1b580..35fde45ab165 100644
--- a/mate-base/libmatekbd/Manifest
+++ b/mate-base/libmatekbd/Manifest
@@ -1,7 +1,5 @@
-DIST libmatekbd-1.18.2.tar.xz 369448 BLAKE2B 25f588dec8926b63f19fb62fc10a3e188c8692875a4dd7c65cd97957aa02e22f33d68644d564e02f114f1f42c818bf09625463086569b97824ed561741aba9c9 SHA512 97971fc406fac09e0a652ccb5f811194eeff695a4a8b093b24225230cb64ceebd221d91aab071b0ca7ffd20b1b38e13d428d68fc8249101a3b3f8342fbb1f71e
 DIST libmatekbd-1.22.0.tar.xz 374604 BLAKE2B 318c26cd6630773b0b1e89769e8b540545500d5bcc359e568d8cea0ffccebd17a1dd248cc8f61ba584058cb170171608f6c729256eb7936e8b23738657d5a9a5 SHA512 79f19455bb6c0df5a50e445907ac12d6bd92a54cd086e0303890bc67350de3d94b2fd665efdaec85f84a42d76af430ad0a1b9639da078179ac25d27c4a325281
 DIST libmatekbd-1.24.0.tar.xz 425720 BLAKE2B 6f5f808f55c57c3d651d5c871a5f95269397a6d1c2e3cd37d2b16a5519300a81e994e0ac10bf474b9860ec7c0f3c862332199e10c506f38107c7f7d791899b4d SHA512 6a04f4f38ac1d1ef372fdbaddfe4c935d79039cce1a3d68a6876fa5550556f1d568de1d53857531c6f0bd5994e815f2c9e5be0436218e97718f87e17973ea655
-EBUILD libmatekbd-1.18.2.ebuild 894 BLAKE2B 0f39c9fe057c27cc9c3b4c79a41009c65ea8e4d96b9c261dc3223ef5cbbde9e24afafea82e5bdc5ad41f9a9c859dff8359c33722e7310b2ebb7fdae50a981f65 SHA512 49713bc874a46484d2309a5470b5b3029008b89170f80e9dd2f580b260aa4a9f03d6f53342ef95754a2069fa982f6b3680c1345b986e59b7985d0e33c3638599
 EBUILD libmatekbd-1.22.0.ebuild 862 BLAKE2B 8581696469c4c2cdea0b44df89d0d4c9189c06d03c7a6ab351fd90766544f4c5ac41113245db8cfa8a7433fcfa8f2e80f279cfdbd7425daf58d62f6899fdf87d SHA512 fc3d59c01f3f62bdfb9be14c6db9eca513b08204ff256ef992bb1e29fe6b2f5783404715d2681c60672cf09cf0ba6808172c4e02523f50ec0e69c6b13951d6b5
 EBUILD libmatekbd-1.24.0.ebuild 865 BLAKE2B 95b670be22e970189c133115f22bfba55b70419f9fa852e84507fec127afd024491c19a44c6741643e2a8198b2708aa30ee0bdc0385d59b03326f2518e7384e8 SHA512 2fb426aa3a7d4257016ff5c290c572655b90fbbc8a58fcc22d82d89166b0daa65312209664cf29e451740da5ff16e8d019d83cd25e1f6ce0cf4091a025e4d417
 MISC metadata.xml 339 BLAKE2B 0ba4a0bd94a0efe3c42d79da9b4f32dc50c577c616d2495a7a3019fb05c398ffdf614afddae5bda5bd1430716391d3991f99005c225e36d2ebc68ff5415ff5cf SHA512 fc767510a57712599986df86d68bf28122b5060b183f94dca26f69abd7a6b4866ab9efc37b85433d2271115374dba3299d2be6cd9461aeadaa2cb02864a6166d
diff --git a/mate-base/libmatekbd/libmatekbd-1.18.2.ebuild b/mate-base/libmatekbd/libmatekbd-1.18.2.ebuild
deleted file mode 100644
index 64b6b12cdc48..000000000000
--- a/mate-base/libmatekbd/libmatekbd-1.18.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-DESCRIPTION="MATE keyboard configuration library"
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0"
-
-IUSE="X +introspection test"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND=">=dev-libs/glib-2.36:2
-	x11-libs/cairo:0
-	>=x11-libs/gdk-pixbuf-2.24:2
-	x11-libs/libX11:0
-	>=x11-libs/libxklavier-5.2:0[introspection?]
-	x11-libs/pango:0
-	virtual/libintl:0
-	>=x11-libs/gtk+-3.0:3[introspection?]
-	introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	sys-devel/gettext:*
-	>=dev-util/intltool-0.50.1:*
-	virtual/pkgconfig:*"
-
-src_configure() {
-	mate_src_configure \
-		$(use_with X x) \
-		$(use_enable introspection) \
-		$(use_enable test tests)
-}
diff --git a/mate-base/mate-applets/Manifest b/mate-base/mate-applets/Manifest
index 4097af021196..4d7c12844f2e 100644
--- a/mate-base/mate-applets/Manifest
+++ b/mate-base/mate-applets/Manifest
@@ -1,11 +1,6 @@
-AUX mate-applets-1.22.0-cpupower.patch 1349 BLAKE2B 745b7c02a17a21d05494c25b4ffbb3451d94dadeda4c12b3ff7c5e889a8c8c311ac033344b6deffeab575ebe7e6b645f7c789f65ac5d5d57d033d05ea13cdc24 SHA512 214bdb8c711a7b1bef0f16bf2c2464578d46fa640ce5dcace6dbd74c08df5cb8276875ac6e7e7d4347125551c236c4813002798a3f478af2baaa94cea10df44a
 AUX mate-applets-1.22.2-gcc-10-fno-common.patch 1533 BLAKE2B 501301f29481c8947d9dc31b25c91dac415334819c06cf663b1a9fb431d89cfccd7e9ef67ca093d323b53e51a2732c57cdb986bb49f259176d256b553095f51c SHA512 3586835f5734e228a1e8b185aed26fd966c6910575046492ef3a92f5296fd1dffca3b14ab1270682734a9db20839521a9057aa872c9c325914c79a60bba452cf
-DIST mate-applets-1.22.0.tar.xz 7739668 BLAKE2B dc3768d2f5eb987907f1ffb1a049dff990140c66c51427dc9095298be92b17b2b1e9695f3c35dae73433e1e50d05477e94aad1697b2bf15706515c16150096d7 SHA512 2f3e17414171ec5ab6967b76b1291d99783c3091b51127788f99148f46d5f2068edf7d890c3ebca1a59c29cbda4a06be11c852e5e88d4dc58e9981d906c9e34c
-DIST mate-applets-1.22.1.tar.xz 7602112 BLAKE2B 22dc076d188cddf9c5160d7ecaddb14ecc41a575abac91b72959054f3fe1c961c80b1aa9171150e7c4ce61ccee0783572726386319312dc97f64d4f9266c1a6d SHA512 d132c8b5e433a557785745032235a5792d04edd7c249269d9a4066fb345b76955bdca71164f7b321f41f566803694d85d9cd7690fbd699daa54788572f0eb986
 DIST mate-applets-1.22.2.tar.xz 7648744 BLAKE2B 85235f12c1436c3caaa6429aabd16822ae34c5c4bd7a575aa9be2c2e9080734b39180e34b22fdf265a64b5ebffb24071d8768b99f55736631403da02882e45fe SHA512 a57ed37d6ddef303e40cbd8f811d1c6be473eeee78a5b56c5eb280d7dba10668678bf9203425f735fb3b356f4ec33eb2369867aa3ab4b446748fe36b80194e8f
 DIST mate-applets-1.24.0.tar.xz 8142812 BLAKE2B cbb76d6d64bb6e9b9f93197dbe79e2751877b0604c5a84ff4b6b00608f2930925bdbc2824dc96848c84496fa5f16ab38458775727b22cb07f4db9ca854f93c42 SHA512 345a80b123c705997d44ac5a4bea5249045d75181c3802cf49b2eb08decc14a12f75f2e06e6ebfae267b937ff10edf7638cd64332e2e2e731695e6260df5222e
-EBUILD mate-applets-1.22.0.ebuild 1957 BLAKE2B 2960725e78c39d2940bdf5bc14f126c34a75695c8678a17e72a1fa3309e088b7a739e7b07a867ef3b043b60d7f814aa0104ba5b3d2aefcd286d52f5e28beaa48 SHA512 2506940c8b170692f4103f66f0adce964a012e2985b4770ee80fef219ad4430c9ed9220a4ca4d8f0dc108f22566a09ebd671d90c7e902574a554eadb8fa0f089
-EBUILD mate-applets-1.22.1.ebuild 1943 BLAKE2B e7d9994d2dc687a9dd35ad9ac647e63042bcc2f764d08717143d42e4f5e93d749f129fd2d45ca742e162975bace094ef2390cb4b2326566f477a50d5c2f52d29 SHA512 d147db39ac2e12fdac98bb4f77e2a7f11cec1c765ec885feb81ccbf214aa4c79d0fbcdb272d5c90a0a9678d30ef4c41d4541c59818f97c96e3cd81846ae0fe1c
-EBUILD mate-applets-1.22.2-r1.ebuild 2128 BLAKE2B d86b7989e86f077b822d04c8b66a86cf7479a1a14b539eff1554db9a7e9855e61f7c75b48927540ba82a6cfb90d1fb5b5d51994494a068c3980e658e0a1f7f24 SHA512 21ea88ddfd24bfe60e4402c83f61c615a96cd61fbd7d43a09e72bcb55a5633291814eed1ab7de5f496259df80b09458984a2448e07ac38afa9b930d7cf38f87e
+EBUILD mate-applets-1.22.2-r1.ebuild 2126 BLAKE2B efb02795026fdab295ae37f9f2e6d48cae2404675a5d0cacebfcf174f354e0a84d900664c1e437766af0dc69a1e07ac51c1004fbbcfb8e12e861c8c3c118ac5f SHA512 1a4cc2631b36de20d34d671462aa88b2146abf9509d54550e8b62db7a8e7ae9cb99bb3b75ec00be2f87fa26181181105d3ceef9bef67458c6f89ed6677c92f17
 EBUILD mate-applets-1.24.0.ebuild 2054 BLAKE2B 2975ebf447220a2ff3a9b319b6775839ba432fd9ee21d047ca112584b78ba6e8f325832a30bbebfe936fccbe2c4975bf8c6570e8bfadd85e817a48d425de9c94 SHA512 a42f77747f8893e5e43d2404d9fafaedcd51c0b88fdb9954cc57cb671044518c2b50ac8cee2fd899e6479376d48916d9dcd1e23bce910941138926c474c0763a
 MISC metadata.xml 476 BLAKE2B 7e9ca9850dc90a6c22f661760b1aa54cc4e87eb53c1f6eb8f4087afa7b92f7a11e924c45b69cea8ad025203e894d24511a6d960d93b4f5341082447bc380fe34 SHA512 2b64230204857eb218fc42fdd18fb4ec9bdd7727d278e0c492630e38c561150cc8c5d45b5168cac619e8104aa9a737db6961045e71bbd005c235df20f72bd5c3
diff --git a/mate-base/mate-applets/files/mate-applets-1.22.0-cpupower.patch b/mate-base/mate-applets/files/mate-applets-1.22.0-cpupower.patch
deleted file mode 100644
index 9c1a80e93758..000000000000
--- a/mate-base/mate-applets/files/mate-applets-1.22.0-cpupower.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index b49d127..6b87389 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -370,6 +370,8 @@ fi
- AM_CONDITIONAL(HAVE_LIBCPUFREQ, test x$have_libcpufreq = xyes)
- AC_SUBST(LIBCPUFREQ_LIBS)
- 
-+AC_CHECK_HEADERS([cpupower.h])
-+
- build_cpufreq_applet=no
- 
- if test x$disable_cpufreq = xno; then
-diff --git a/cpufreq/src/cpufreq-monitor-libcpufreq.c b/cpufreq/src/cpufreq-monitor-libcpufreq.c
-index 4fa9d4c..ba52fde 100644
---- a/cpufreq/src/cpufreq-monitor-libcpufreq.c
-+++ b/cpufreq/src/cpufreq-monitor-libcpufreq.c
-@@ -19,12 +19,16 @@
-  * Authors : Carlos García Campos <carlosgc@gnome.org>
-  */
- 
-+#include <config.h>
-+
- #include <glib.h>
- #include <glib/gi18n.h>
- 
- #include <stdlib.h>
--#include <linux/version.h>
- #include <cpufreq.h>
-+#ifdef HAVE_CPUPOWER_H
-+#include <cpupower.h>
-+#endif
- #include "cpufreq-monitor-libcpufreq.h"
- #include "cpufreq-utils.h"
-
-@@ -98,7 +102,7 @@
-         return CPUFREQ_MONITOR (monitor);
- }
- 
--#if LINUX_VERSION_CODE > KERNEL_VERSION(4, 7, 0)
-+#ifndef HAVE_CPUPOWER_H
- extern int cpupower_is_cpu_online (unsigned int cpu);
- #endif
-  
-@@ -115,7 +119,7 @@
- 		/* Check whether it failed because
- 		 * cpu is not online.
- 		 */
--#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 7, 0)
-+#ifndef HAVE_CPUPOWER_H
- 		if (!cpufreq_cpu_exists (cpu)) {
- #else
- 		if (cpupower_is_cpu_online (cpu)) {
diff --git a/mate-base/mate-applets/mate-applets-1.22.0.ebuild b/mate-base/mate-applets/mate-applets-1.22.0.ebuild
deleted file mode 100644
index 077a17c344df..000000000000
--- a/mate-base/mate-applets/mate-applets-1.22.0.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-DESCRIPTION="Applets for the MATE Desktop and Panel"
-LICENSE="CC-BY-SA-3.0 FDL-1.1+ GPL-2+ GPL-3+ LGPL-2+"
-SLOT="0"
-
-IUSE="X ipv6 policykit +upower"
-
-COMMON_DEPEND="dev-libs/atk
-	>=dev-libs/dbus-glib-0.74
-	>=dev-libs/glib-2.50:2
-	>=dev-libs/libmateweather-1.17.0
-	>=dev-libs/libxml2-2.5:2
-	dev-python/pygobject:3
-	>=gnome-base/libgtop-2.12.0:2=
-	>=gnome-extra/gucharmap-3.0:2.90
-	>=mate-base/mate-panel-1.17.0
-	>=net-wireless/wireless-tools-28_pre9:0
-	>=sys-apps/dbus-1.1.2
-	sys-power/cpupower
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.22:3
-	x11-libs/gtksourceview:3.0
-	>=x11-libs/libnotify-0.7
-	x11-libs/libX11
-	>=x11-libs/libwnck-3.0:3
-	x11-libs/pango
-	virtual/libintl
-	policykit? ( >=sys-auth/polkit-0.97:0 )
-	upower? ( >=sys-power/upower-0.9.23 )
-	!!net-analyzer/mate-netspeed"
-
-RDEPEND="${COMMON_DEPEND}
-	>=mate-base/mate-settings-daemon-1.6"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.3
-	app-text/rarian
-	>=app-text/scrollkeeper-dtd-1:1.0
-	app-text/yelp-tools
-	>=dev-util/intltool-0.50.1
-	dev-libs/libxslt
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-PATCHES=( "${FILESDIR}"/${P}-cpupower.patch )
-
-src_configure() {
-	mate_src_configure \
-		--libexecdir=/usr/libexec/mate-applets \
-		--with-cpufreq-lib=cpupower \
-		$(use_with X x) \
-		$(use_with upower) \
-		$(use_enable ipv6) \
-		$(use_enable policykit polkit)
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	emake check
-}
-
-src_install() {
-	mate_src_install
-
-	local APPLETS="accessx-status battstat charpick command cpufreq drivemount
-			geyes mateweather multiload netspeed stickynotes
-			timerapplet trashapplet"
-
-	for applet in ${APPLETS}; do
-		docinto ${applet}
-
-		for d in AUTHORS ChangeLog NEWS README README.themes TODO; do
-			[ -s ${applet}/${d} ] && dodoc ${applet}/${d}
-		done
-	done
-}
diff --git a/mate-base/mate-applets/mate-applets-1.22.1.ebuild b/mate-base/mate-applets/mate-applets-1.22.1.ebuild
deleted file mode 100644
index 38f90f1bdb01..000000000000
--- a/mate-base/mate-applets/mate-applets-1.22.1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-fi
-
-DESCRIPTION="Applets for the MATE Desktop and Panel"
-LICENSE="CC-BY-SA-3.0 FDL-1.1+ GPL-2+ GPL-3+ LGPL-2+"
-SLOT="0"
-
-IUSE="X ipv6 policykit +upower"
-
-COMMON_DEPEND="dev-libs/atk
-	>=dev-libs/dbus-glib-0.74
-	>=dev-libs/glib-2.50:2
-	>=dev-libs/libmateweather-1.17.0
-	>=dev-libs/libxml2-2.5:2
-	>=gnome-base/libgtop-2.12.0:2=
-	>=gnome-extra/gucharmap-3.0:2.90
-	>=mate-base/mate-panel-1.17.0
-	>=net-wireless/wireless-tools-28_pre9:0
-	>=sys-apps/dbus-1.1.2
-	sys-power/cpupower
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.22:3
-	x11-libs/gtksourceview:3.0
-	>=x11-libs/libnotify-0.7
-	x11-libs/libX11
-	>=x11-libs/libwnck-3.0:3
-	x11-libs/pango
-	virtual/libintl
-	policykit? ( >=sys-auth/polkit-0.97:0 )
-	upower? ( >=sys-power/upower-0.9.23 )
-	!!net-analyzer/mate-netspeed"
-
-RDEPEND="${COMMON_DEPEND}
-	>=mate-base/mate-settings-daemon-1.6"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.3
-	app-text/rarian
-	>=app-text/scrollkeeper-dtd-1:1.0
-	app-text/yelp-tools
-	>=dev-util/intltool-0.50.1
-	dev-libs/libxslt
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.22.0-cpupower.patch )
-
-src_configure() {
-	mate_src_configure \
-		--libexecdir=/usr/libexec/mate-applets \
-		--with-cpufreq-lib=cpupower \
-		$(use_with X x) \
-		$(use_with upower) \
-		$(use_enable ipv6) \
-		$(use_enable policykit polkit)
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	emake check
-}
-
-src_install() {
-	mate_src_install
-
-	local APPLETS="accessx-status battstat charpick command cpufreq drivemount
-			geyes mateweather multiload netspeed stickynotes
-			timerapplet trashapplet"
-
-	for applet in ${APPLETS}; do
-		docinto ${applet}
-
-		for d in AUTHORS ChangeLog NEWS README README.themes TODO; do
-			[ -s ${applet}/${d} ] && dodoc ${applet}/${d}
-		done
-	done
-}
diff --git a/mate-base/mate-applets/mate-applets-1.22.2-r1.ebuild b/mate-base/mate-applets/mate-applets-1.22.2-r1.ebuild
index 97fbd7bd56cf..a92aa889f8a7 100644
--- a/mate-base/mate-applets/mate-applets-1.22.2-r1.ebuild
+++ b/mate-base/mate-applets/mate-applets-1.22.2-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit mate
 
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 DESCRIPTION="Applets for the MATE Desktop and Panel"
diff --git a/mate-base/mate-common/Manifest b/mate-base/mate-common/Manifest
index 6c6549179cf1..ad9431446e8f 100644
--- a/mate-base/mate-common/Manifest
+++ b/mate-base/mate-common/Manifest
@@ -1,7 +1,5 @@
-DIST mate-common-1.22.0.tar.xz 73448 BLAKE2B 7796423fd70732c063759e509c13a62fdc5c68e07768776b25ecbec7d06ca8bc68fad947287306ede99f5993a8def3b5f25a4560d3fa7677083a28c64d2c4288 SHA512 3887634081c126c6c23f560ca256ae83edbc5f77f0fc0128c2aaa2b5652672ec6f21ca29b0b44802b03c5dfd53bf0da860093ec73c46fba58f7be12a1db1d2a3
 DIST mate-common-1.22.2.tar.xz 69620 BLAKE2B 8acf4ff0ce792ea949913b2f6f591f3ab76e442ac40196ef6bfaf5fc46fdcde439a7e8f71698437c499b7effdbd8fdefd77e8aa254718af9dde053fa184e5716 SHA512 0afedfae9a93f9b3f8344d5f8a93d80b71b472f084e8322daa7f616e9f0861511536aa1f56f8cfc57abd7e1720cd4695dcecc0582483b009bc6e67daaa82107b
 DIST mate-common-1.24.1.tar.xz 69316 BLAKE2B e265994231d17bf4bda7a02e4cc2d54d8335eff5ee5c3b35b680335a01a21992d9d13632e95029c03b04cfb8d92ecd9b035f7bd2a8666feb4ccc54a937c71e3b SHA512 da3e670e5b4f566bf1893692b34b63d94cb5bd993ce94d0d8245a54c12b2cc2c6af7c29edd184b09ce5296566dbe34112bc318e740a8a7910e4767569e64d623
-EBUILD mate-common-1.22.0.ebuild 529 BLAKE2B d1aaa2d697656e1edf596cc555e629297956375658523a973f28ea759f1509feb3125c473e2884dcc78abac7d0c598aefd8beefd40b9647d5051cb1986576de4 SHA512 dac071470e7c27b380f6c707c5e55158d373cab5474188fc27755dc7e89938b95361b3cebadea3a2ee46254eebf04bce88a847aae0a4756c7a9cc4b10cbb20e8
-EBUILD mate-common-1.22.2.ebuild 531 BLAKE2B 4876eb92ae1dcc35dc922cf58981a1f38d030797ab029ae69782ca927aa890cf443c17cd749cd4eea3e5fa0dcc7b05e217749f6cbb187a9522f30710615a1268 SHA512 8f4b13244de3a6b00a8a14731cc8c2aec91a71fd7d35196b71753eaee21c500571bc84b1dbb8d2b471760dea1602ccf0f14a995aab5ad6325429340ea42788e1
+EBUILD mate-common-1.22.2.ebuild 529 BLAKE2B d1aaa2d697656e1edf596cc555e629297956375658523a973f28ea759f1509feb3125c473e2884dcc78abac7d0c598aefd8beefd40b9647d5051cb1986576de4 SHA512 dac071470e7c27b380f6c707c5e55158d373cab5474188fc27755dc7e89938b95361b3cebadea3a2ee46254eebf04bce88a847aae0a4756c7a9cc4b10cbb20e8
 EBUILD mate-common-1.24.1.ebuild 531 BLAKE2B 4876eb92ae1dcc35dc922cf58981a1f38d030797ab029ae69782ca927aa890cf443c17cd749cd4eea3e5fa0dcc7b05e217749f6cbb187a9522f30710615a1268 SHA512 8f4b13244de3a6b00a8a14731cc8c2aec91a71fd7d35196b71753eaee21c500571bc84b1dbb8d2b471760dea1602ccf0f14a995aab5ad6325429340ea42788e1
 MISC metadata.xml 340 BLAKE2B df96462b37467cd5298fc394d73cfce122d7aea210e48a678d4c32d5c2b6a792cdfaf1c39e6968b33d6c3b9aecacd95fdbb4478cc98a58b6c0527c6708e404ef SHA512 06a836307e50d0ecf5e85516865436cddffaa2d69492c295bad163f3511ded0b7254b541fa73b8b5f314c1574c755f595c1a5af5f55c87f2c96aaf06fffc6262
diff --git a/mate-base/mate-common/mate-common-1.22.0.ebuild b/mate-base/mate-common/mate-common-1.22.0.ebuild
deleted file mode 100644
index 2c3030de0d38..000000000000
--- a/mate-base/mate-common/mate-common-1.22.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate-desktop.org
-
-if [[ ${PV} == 9999 ]]; then
-	inherit autotools
-else
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-DESCRIPTION="Common files for development of MATE packages"
-LICENSE="GPL-3+"
-SLOT="0"
-
-src_prepare() {
-	default
-	if [[ ${PV} == 9999 ]]; then
-		eautoreconf
-	fi
-}
-
-src_install() {
-	mv doc-build/README README.doc-build \
-		|| die "Failed to rename doc-build/README."
-
-	default
-
-	dodoc doc/usage.txt
-}
diff --git a/mate-base/mate-common/mate-common-1.22.2.ebuild b/mate-base/mate-common/mate-common-1.22.2.ebuild
index 6c83b6fdcda7..2c3030de0d38 100644
--- a/mate-base/mate-common/mate-common-1.22.2.ebuild
+++ b/mate-base/mate-common/mate-common-1.22.2.ebuild
@@ -8,7 +8,7 @@ inherit mate-desktop.org
 if [[ ${PV} == 9999 ]]; then
 	inherit autotools
 else
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 DESCRIPTION="Common files for development of MATE packages"
diff --git a/mate-base/mate-control-center/Manifest b/mate-base/mate-control-center/Manifest
index 67aa941db06a..51e3272fa89f 100644
--- a/mate-base/mate-control-center/Manifest
+++ b/mate-base/mate-control-center/Manifest
@@ -1,8 +1,5 @@
-DIST mate-control-center-1.22.1.tar.xz 1445012 BLAKE2B 2dc129280510432c25d158d6acdb50e58dfffd2e027fade545459669a6e6dbeafc4efe2cc81e19483427ec563daee903e2422e61ee398c88fec566cd80842639 SHA512 92390bf5eea459effbd94f0488cdaf3d7b6ff4f548f1aafead928d75e064e85ec1ac7796289f96af2ca8f6cbf3ef57bd2ae37058192af0ec976f4770ec8abeca
 DIST mate-control-center-1.22.2.tar.xz 1614216 BLAKE2B cb6dfe509740b2bedc036e849c85f9b752a56310fffe1bb31a19edfd428b3e2e35bf3a5bff9d83e3b72fc05f7bbd97bccd003340bfcb8cb43e9b6964a63957e8 SHA512 994563b8970ebf51ba44afe49122e82ff67fdb6c78ab2e8175acc6f619d40a82284cbafc1d61b89b25ac9e8488b00f63433eda94118d40a4fbff0d644ae1ddd5
 DIST mate-control-center-1.24.0.tar.xz 3488572 BLAKE2B 683b3326deeacf3f47a8ca3201de66a492cac022ae341dfc54cdc97c9a5260e223a082a3dd899b31680e4a8e5b3237d0338c7fd8125468f75e1b00b4e6a130c7 SHA512 78e70bc94a34f8e6083d1951b12fcb9f7e8b7c55c5fac612ee27c8175e91b3872f6ecf15162e747444586612a94f857a02fb91a6fad142b5d0a16e749792c2ce
-EBUILD mate-control-center-1.22.1-r1.ebuild 1562 BLAKE2B 84d70e204156ffdb750a1cc3355efe247579e9d940db96cbcb45d98d0bef053c0be4a3e91d4d25d5ea5d96d8c9310c4b9a3bbe9ed2fd871351abd7b812374aa5 SHA512 46d1d4359b7e677264e71c2fdfb6eec19cb78ba8dbba3e02b8dad0810e8300922f77f527573b5e9367108866aaa2c9595714c8ac7d288c703584229557ff4564
-EBUILD mate-control-center-1.22.2-r1.ebuild 1541 BLAKE2B e65c328acdd70874c9760984c053b277031112d753439cbf9f2d0a60581da436fc56643c1b2f2071784acc37e28942d409c0ddbddfaab83748146732575d334f SHA512 903808162b73c900d3b0accca6db4fea38a801b59d18e845777cc375f7cc75f1fad3df219d04ac46a3b5e893668189e3ae825c1b4ffccccbde84b0b9294280ec
-EBUILD mate-control-center-1.22.2.ebuild 1539 BLAKE2B 1c5c0b999cc672f20b658edf83ac86111d23717ff006d066a8f641da831ccd4df7376580b7903db9a19c7e819bf63f1ebb210551f8341d71137510bf68140776 SHA512 53a3975d86fa9baba716b97b401acdf3231e55768e1198d812cdb98dce1576c05d71ce15d46ebcfed3434d3bfb467c02dce2e8a7c359d6bcd2da15ac0d191bb0
+EBUILD mate-control-center-1.22.2-r1.ebuild 1539 BLAKE2B 5b250b774169b23aaba4158a155866237683086f889162d3266cdc1add162e7b15685fa6a0f9c6df489f6a4c57158db8937d4d4e6efb4d85b627c1f7fb7163f6 SHA512 1c201d8f4c707654dc5b460b4e4952bccb2dae133e2c5006648edeb19e036392af5c30f56dbc6bfb3a0493d633e21f3d1ec8052a5c8b71dffff3d46c8961cc24
 EBUILD mate-control-center-1.24.0.ebuild 1557 BLAKE2B dc11305f1e33241ed8d5e786c0a960995e0c6c3e9da0600a556acfba1c33eb8fcaf836bcb19d68dd281f529edaf0b2049d467f81229d22b6da8b1ee81890b42a SHA512 c0072a918161cb82de812c417951264d64664f3af3ad498dab8b2c418368195a933a10622886f1737a9f1879ebe63957512930ea8b202fe978a4aa38aa240df0
 MISC metadata.xml 433 BLAKE2B 189e7b4c8a23defad0506d79de1bc2ee21a6538e9f591db9c11ea1e8b0743e209b7aa53c2a6e3c78c2f4729e8dfbd02e831081193c9124698fca283af8768e9f SHA512 487af436720ff58f170c6e2fcee903669c8bf7b8415dd81a2d1bb5b2feae2f4d1cfecdaed821ecf2e875bd26e9e3ce6013bec07c5e1d699581e0b0f5bb97b60a
diff --git a/mate-base/mate-control-center/mate-control-center-1.22.1-r1.ebuild b/mate-base/mate-control-center/mate-control-center-1.22.1-r1.ebuild
deleted file mode 100644
index 7ac9357bc872..000000000000
--- a/mate-base/mate-control-center/mate-control-center-1.22.1-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-DESCRIPTION="The MATE Desktop configuration tool"
-LICENSE="FDL-1.1+ GPL-2+ LGPL-2+ LGPL-2.1+ HPND"
-SLOT="0"
-
-IUSE="accountsservice appindicator debug"
-
-RDEPEND="
-	dev-libs/atk
-	>=dev-libs/dbus-glib-0.73
-	>=dev-libs/glib-2.50:2
-	dev-libs/libxml2:2
-	>=gnome-base/dconf-0.13.4
-	>=gnome-base/librsvg-2.0:2
-	>=mate-base/libmatekbd-1.17.0
-	>=mate-base/mate-desktop-1.21.2
-	>=mate-base/caja-1.20.0
-	>=mate-base/mate-menus-1.21.0
-	>=mate-base/mate-settings-daemon-1.21.2
-	>=media-libs/fontconfig-1:1.0
-	media-libs/freetype:2
-	media-libs/libcanberra:0[gtk3]
-	>=sys-apps/dbus-1
-	x11-apps/xmodmap
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.22:3
-	x11-libs/libX11
-	x11-libs/libXScrnSaver
-	x11-libs/libXcursor
-	x11-libs/libXext
-	>=x11-libs/libXi-1.5
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXxf86misc
-	>=x11-libs/libxklavier-4
-	x11-libs/pango
-	>=x11-wm/marco-1.17.0:=
-	virtual/libintl
-	accountsservice? ( sys-apps/accountsservice )
-	appindicator? ( dev-libs/libappindicator:3 )"
-
-DEPEND="${RDEPEND}
-	app-text/rarian
-	>=app-text/scrollkeeper-dtd-1:1.0
-	app-text/yelp-tools
-	dev-util/desktop-file-utils
-	dev-util/glib-utils
-	>=dev-util/intltool-0.50.1
-	sys-devel/gettext
-	x11-base/xorg-proto
-	virtual/pkgconfig"
-
-src_configure() {
-	mate_src_configure \
-		--disable-update-mimedb \
-		$(use_enable appindicator) \
-		$(use_enable debug)
-}
diff --git a/mate-base/mate-control-center/mate-control-center-1.22.2-r1.ebuild b/mate-base/mate-control-center/mate-control-center-1.22.2-r1.ebuild
index 5e28188ba32e..32b3570daa7b 100644
--- a/mate-base/mate-control-center/mate-control-center-1.22.2-r1.ebuild
+++ b/mate-base/mate-control-center/mate-control-center-1.22.2-r1.ebuild
@@ -8,7 +8,7 @@ MATE_LA_PUNT="yes"
 inherit mate
 
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 DESCRIPTION="The MATE Desktop configuration tool"
diff --git a/mate-base/mate-control-center/mate-control-center-1.22.2.ebuild b/mate-base/mate-control-center/mate-control-center-1.22.2.ebuild
deleted file mode 100644
index 6e0e3e43186d..000000000000
--- a/mate-base/mate-control-center/mate-control-center-1.22.2.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-fi
-
-DESCRIPTION="The MATE Desktop configuration tool"
-LICENSE="FDL-1.1+ GPL-2+ LGPL-2+ LGPL-2.1+ HPND"
-SLOT="0"
-
-IUSE="accountsservice appindicator debug"
-
-RDEPEND="
-	dev-libs/atk
-	>=dev-libs/dbus-glib-0.73
-	>=dev-libs/glib-2.50:2
-	dev-libs/libxml2:2
-	>=gnome-base/dconf-0.13.4
-	>=gnome-base/librsvg-2.0:2
-	>=mate-base/libmatekbd-1.17.0
-	>=mate-base/mate-desktop-1.21.2
-	>=mate-base/caja-1.20.0
-	>=mate-base/mate-menus-1.21.0
-	>=mate-base/mate-settings-daemon-1.21.2
-	>=media-libs/fontconfig-1:1.0
-	media-libs/freetype:2
-	media-libs/libcanberra:0[gtk3]
-	>=sys-apps/dbus-1
-	x11-apps/xmodmap
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.22:3
-	x11-libs/libX11
-	x11-libs/libXScrnSaver
-	x11-libs/libXcursor
-	x11-libs/libXext
-	>=x11-libs/libXi-1.5
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	>=x11-libs/libxklavier-4
-	x11-libs/pango
-	>=x11-wm/marco-1.17.0
-	virtual/libintl
-	accountsservice? ( sys-apps/accountsservice )
-	appindicator? ( dev-libs/libappindicator:3 )"
-
-DEPEND="${RDEPEND}
-	app-text/rarian
-	>=app-text/scrollkeeper-dtd-1:1.0
-	app-text/yelp-tools
-	dev-util/desktop-file-utils
-	dev-util/glib-utils
-	>=dev-util/intltool-0.50.1
-	sys-devel/gettext
-	x11-base/xorg-proto
-	virtual/pkgconfig"
-
-src_configure() {
-	mate_src_configure \
-		--disable-update-mimedb \
-		$(use_enable appindicator) \
-		$(use_enable debug)
-}
diff --git a/mate-base/mate-desktop/Manifest b/mate-base/mate-desktop/Manifest
index 3c1b0024fe73..f6bf7a75615b 100644
--- a/mate-base/mate-desktop/Manifest
+++ b/mate-base/mate-desktop/Manifest
@@ -1,9 +1,5 @@
-DIST mate-desktop-1.22.0.tar.xz 962580 BLAKE2B 0bc3418ab25fd9f30e216a5b845722327449f8d05944c028b4cb967acd6415ca9c3c560856485f34e90752c9a3263ba093e1eb69daaea2586c6371ad4c4ee22f SHA512 3950249c0bc026163da7f38a6fd5551c0e1e863e298e9d2ca224679b6c802d1deaf12e16ea873a2ea0539a7989a523d0495fb0dc4c556857203c0b04ab6edf7a
-DIST mate-desktop-1.22.1.tar.xz 901764 BLAKE2B 9da94899d48aa5b949dae466d9a581cd090feeba8b12949cbd9df20e79b8597420fb99785aab14f6a6faf2865e4a4b8356b2a2cc44d5eae087f37e7ec7957541 SHA512 bb2bf9de05439a0fcd4ab01ac628a2a235808cd07c1b7ce9abfbf2e64f98dc572603dfbd4a52bca5f03446825fba199715d7e08fcdc84f0df8d2ffeb4c87da62
 DIST mate-desktop-1.22.2.tar.xz 903312 BLAKE2B cadc8ade769d3a85b604ce7807235878d986a7d3bf3f2e05f836c783c3f3983cb760ff33b60b1c2f19538687aa62f5707f5f4eea9fef05d992080821d452783c SHA512 d2e965f9e26e4fe25337a4ef69521239388f38cff25e978331a307591555d8a9ff22d6a19ef3c92cf336c472fbfb231969ef5ac60e3a4c5908a81ded1e5f0f46
 DIST mate-desktop-1.24.0.tar.xz 1113912 BLAKE2B e5630ae4fe3f6a309d935153069b354a66d9d544bb3c2c7368373134b71a3d177385b157c01845742463ec8c91d0d4df1b39def7202142070221bb3dc7ba505b SHA512 ca60325e7f6167efd21bdd32ae40c2f2bf5ae9bef85f0a43afec05d50567fb650fc0426d94c510b3a42c625dc4b2d31d7559befa50cfbb6d9878635558a52323
-EBUILD mate-desktop-1.22.0.ebuild 1130 BLAKE2B 519cbaab260e93a713c0c3511f76bc1dc7de3ea43a3ed05d871e23e213b5c1cd99c395c6f0c95c3cee6bd3ca13bf28a0d004db90fb0c98224e54a0c7d3083d1d SHA512 0937a83aeefb1ed52a990a640402fe6a8a4c3f91d2c3238ec7a54ab3d0f551e225d1e3f3b0475e6ce960b57e811daf08fe2f7128dcaabb7b5ceaca32e3ffb9a9
-EBUILD mate-desktop-1.22.1.ebuild 1152 BLAKE2B ee51327a19934d9b90b32c9546bb516d5a74b0ae33fe9afeb83ac6faeb3fde06ca4cd3b21d2514ca24f9667b349aa7a5d598f3ce37316e66bb1c86e9af900026 SHA512 3fb89c0035f3baa3100371c1a39d93a40a923b42200d631a37cb04083b5eb75ee1c2d69dd8c189dbd20a01322ec70948cf7b11b5a4ce3b808d3cc8b5b79f2f3e
-EBUILD mate-desktop-1.22.2.ebuild 1132 BLAKE2B 43a6bbbf18d4f8577fa0e42ba3d6af593ebd82a4cd8d6195c81d38319431a18201e4165094a2cb8874b43f8b529f93fb8cd6e63fbd332f1b2d0f2fff16b83a3f SHA512 c3cdf8442e52e9c1dbb3ed2279bcffbf09b8a1033a454a2bc4ce05ca891a4b4b8662557ea3a1f9374386f21f763515c93568835ed19481fca076d583fb83f5f1
+EBUILD mate-desktop-1.22.2.ebuild 1130 BLAKE2B 519cbaab260e93a713c0c3511f76bc1dc7de3ea43a3ed05d871e23e213b5c1cd99c395c6f0c95c3cee6bd3ca13bf28a0d004db90fb0c98224e54a0c7d3083d1d SHA512 0937a83aeefb1ed52a990a640402fe6a8a4c3f91d2c3238ec7a54ab3d0f551e225d1e3f3b0475e6ce960b57e811daf08fe2f7128dcaabb7b5ceaca32e3ffb9a9
 EBUILD mate-desktop-1.24.0.ebuild 1144 BLAKE2B f34d0764bbaa359f61965374e6148a9d2ef3f945876923766028f2f72fa6ae44a6aa231da32526853ffb1872eb2ad45ade9b2ecfb1b9f76f5f91dabec924ed56 SHA512 a76152c24ba0c15d30c68dfb6787d26d28effaf588051f57ccaa387bc1b26dcf40c6bf46ef73a2495e53be09444c26fdb675f5a0cc7a043cab504284be7c3509
 MISC metadata.xml 341 BLAKE2B d5ca73000fca7b5092f767fc927d65f32ab507a08f2d8c6f1a48d1a70ed25653467f75de3b556543512b3d7d9cc4b1704166eea72bd3ca708ad0b40e216e534a SHA512 7d54ddfb1e11f270908131ea9e1287efb589d0015305576d05bb2d57c74ec3778c004fa4a1533140026eeb4774c8b50f79045564877c9c2e06e4e446e101e08b
diff --git a/mate-base/mate-desktop/mate-desktop-1.22.0.ebuild b/mate-base/mate-desktop/mate-desktop-1.22.0.ebuild
deleted file mode 100644
index af4e2dfd4549..000000000000
--- a/mate-base/mate-desktop/mate-desktop-1.22.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-DESCRIPTION="Libraries for the MATE desktop that are not part of the UI"
-LICENSE="GPL-2+ FDL-1.1 LGPL-2+ MIT-with-advertising"
-SLOT="0"
-
-IUSE="X debug +introspection startup-notification"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.50:2
-	>=gnome-base/dconf-0.13.4
-	x11-libs/cairo
-	x11-libs/libX11
-	>=x11-libs/libXrandr-1.3
-	virtual/libintl
-	>=x11-libs/gtk+-3.22:3[introspection?]
-	introspection? ( >=dev-libs/gobject-introspection-0.9.7:= )
-	startup-notification? ( >=x11-libs/startup-notification-0.5:0 )"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/iso-codes
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.40:*
-	sys-devel/gettext:*
-	x11-base/xorg-proto
-	virtual/pkgconfig:*"
-
-src_configure() {
-	mate_src_configure \
-		--enable-mate-about \
-		$(use_with X x) \
-		$(use_enable debug) \
-		$(use_enable introspection) \
-		$(use_enable startup-notification)
-}
diff --git a/mate-base/mate-desktop/mate-desktop-1.22.1.ebuild b/mate-base/mate-desktop/mate-desktop-1.22.1.ebuild
deleted file mode 100644
index f4d6e6924e88..000000000000
--- a/mate-base/mate-desktop/mate-desktop-1.22.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=6
-
-MATE_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-fi
-
-DESCRIPTION="Libraries for the MATE desktop that are not part of the UI"
-LICENSE="GPL-2+ FDL-1.1 LGPL-2+ MIT-with-advertising"
-SLOT="0"
-
-IUSE="X debug +introspection startup-notification"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.50:2
-	>=gnome-base/dconf-0.13.4
-	x11-libs/cairo
-	x11-libs/libX11
-	>=x11-libs/libXrandr-1.3
-	virtual/libintl
-	>=x11-libs/gtk+-3.22:3[introspection?]
-	introspection? ( >=dev-libs/gobject-introspection-0.9.7:= )
-	startup-notification? ( >=x11-libs/startup-notification-0.5:0 )"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/iso-codes
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.40:*
-	gnome-base/librsvg
-	sys-devel/gettext:*
-	x11-base/xorg-proto
-	virtual/pkgconfig:*"
-
-src_configure() {
-	mate_src_configure \
-		--enable-mate-about \
-		$(use_with X x) \
-		$(use_enable debug) \
-		$(use_enable introspection) \
-		$(use_enable startup-notification)
-}
diff --git a/mate-base/mate-desktop/mate-desktop-1.22.2.ebuild b/mate-base/mate-desktop/mate-desktop-1.22.2.ebuild
index d19a0f762d09..af4e2dfd4549 100644
--- a/mate-base/mate-desktop/mate-desktop-1.22.2.ebuild
+++ b/mate-base/mate-desktop/mate-desktop-1.22.2.ebuild
@@ -8,7 +8,7 @@ MATE_LA_PUNT="yes"
 inherit mate
 
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 DESCRIPTION="Libraries for the MATE desktop that are not part of the UI"
diff --git a/mate-base/mate-menus/Manifest b/mate-base/mate-menus/Manifest
index b1ddb196bbb8..2076af127646 100644
--- a/mate-base/mate-menus/Manifest
+++ b/mate-base/mate-menus/Manifest
@@ -1,10 +1,6 @@
-AUX 10-xdg-menu-mate 113 BLAKE2B e49a76bdbbe1b08782ccd216afbc40bc49b4b16cb399c29e7a6860154cbd0d6d2712f85bd2edef53e9f53a4d92d29ec9524916f123d44e930a81cca3e60a3cb6 SHA512 8d4c30c79ecca4d1ff4dad7e7946f9e967ac33cf54dcccb1e1325bff298ffef6306bcf5865071e388e3a17ba77bc79896246a4b44b42c72c20ed13c4677fb8ef
 AUX 10-xdg-menu-mate-r1 192 BLAKE2B e8614b8fa478d0fcf2cdd99b8f3a4c0ec9d82c98b550a767e552bac8105ab354de8e75e43678faa7130674b4047178bcfa45d8884f21ce4b6f3a12c6ba8a8768 SHA512 1f7be7596465c4c3116add1a73517582dc9463f0b7845ed9e9e61416e45afad0c10c6c923ab125a2542d9cbdab0f37bfcc4df8007dfc7d925ad617802278f258
-DIST mate-menus-1.22.0.tar.xz 355948 BLAKE2B f65bd45c4c7c04f11f9228499991d7c2dfa60a3e74e4cbfcffc3a02f09e8e6cad6b4b4adb6d9227a4e893bad9dc032afc6cce8098ea62fd133ef836cbe9abdf2 SHA512 7ca02c1bb89c83b6b331fc2e8878862fa8f02f5cd52b297aa44b36dd5c2d1ee1ffeb1641d63a10bd4deb99f63ded9c3b890a05ab7f7faf32d7f895b0a2f68d70
 DIST mate-menus-1.22.1.tar.xz 351080 BLAKE2B 3ec947d6befefc838580547970ad7753c914077faa8cde2f37b9f3c48cd5d1223f382b67992826017e8ab16353c7fd2b4749a0fbd615668c0a4c6ad638c26014 SHA512 2766cafa35c11da6f6d5d6129a5e39c09e73ca97f72382df757091198260a342d278c53f88cddf75e174231443c1015198dfa1800b3601d5b770553ec7047a00
 DIST mate-menus-1.24.0.tar.xz 404028 BLAKE2B 18bea0a6c21444b0b568564d0c15ba0e231643dfcb9c74d6ab9a08cd57cab2289436dada030397737667f5a51c4ab39ab06fff3f585347ebb5f7afc40957acc0 SHA512 27f8ba0666b08fbcfc3f02a42e4b9f3d3431e3d171be0fe9569f412b2f9ead370fff15833feb920b64d2a067e81354970df2ee1c465f10faa3dbd9c97af20406
-EBUILD mate-menus-1.22.0-r1.ebuild 928 BLAKE2B 51efae7373be4fa7f6f937561ff34707879e657a755b317af4d31045032a8484c41f9f0027c58ddbfeeafcbba791fafa309102576dc064221aeaafad3a30b3fc SHA512 38ef3454e755755d8f450f4f31d5f483a34231764ad00b55453cbcb975cb662c00eeb9b77fafe180d0468a9581b4a0a9dbd5513174778202595264438985c3db
-EBUILD mate-menus-1.22.0.ebuild 1253 BLAKE2B 541d7d7179cd35e08a50bcf5d87397c8f6ce1eba0583821137b919a28aff851eafc14f9efa59f352d01f659ab19dc16c8eaaea532412c774e5eebb8300e70f5f SHA512 d6c4855fb35ee948d7e69dc4ac3b8e765596908e7b7614c002d250c3487de466baa1a56205335707b86ec1b5940fda397bc5e4ec8211e4b7abbd7b93053ea21f
-EBUILD mate-menus-1.22.1-r1.ebuild 951 BLAKE2B 31cd55939d695daa5d004253d150a3933073e466bc3347006a6282cc76e154d709a342d84cc9ef2629d0c1c15f436dcacb4a1438a4b0e6f8c43d96b5789c3c89 SHA512 c08131221ca9e2932bb89afcafe5281341d4f04cd10af2a7b8d7db0a47077051a48337cc24f3f9e1cc4404d271f6847eea2ec2df12b5e03fa4fda1a769542a40
+EBUILD mate-menus-1.22.1-r1.ebuild 949 BLAKE2B 3906ccceb56c9eb55e925b40b67181e04f6ca591124e740284a5bd8bb5db0ad47f98696e0faab9f2bcd555c9f7c4f36ac140a29f0cf6a1fe70dd11b957d294f2 SHA512 6f5e49de065a52e950c9f8a41a046e706d07586b9d794a5b8700e1ca10e9954fac941e1e0eb5b1d789d42419961f51ac300a40ad3d0d74917d8af2837e29fe1a
 EBUILD mate-menus-1.24.0-r1.ebuild 917 BLAKE2B 6ec2d65ad47a01d850f1657361df54e0a03bc70fa46534b05e7222fc4bf13abc94ca1f8521c3961d08e8bbc7a3286a4a006937b0ae8aa4d4a2ecb1b439b8f73a SHA512 51383ada42d94970a3ffa202183fb36e90933cdbd8ef137207be3c4acece229491d8b0477ab5e245a7e948b11e460891d8316834beb7d304dacfd14d1f882f89
 MISC metadata.xml 339 BLAKE2B 0aa628f37ca885f294c05a4f97ecea8b57a588e02997ef0ab33485ada19abbae35e2c1ed5ed9f18c2b9143d9f0e4cf76ec2adbfec74a96062b5ddee0fb337dfc SHA512 39239eed6c1808d1b279a5924b2c66dfd38a4548b182b79e2a2f9c00f64a799c4e99d510b30a2ca179a918218e4e49b021e7cb3386c30c86b776a36f3800b03c
diff --git a/mate-base/mate-menus/files/10-xdg-menu-mate b/mate-base/mate-menus/files/10-xdg-menu-mate
deleted file mode 100644
index 06a6a91368e2..000000000000
--- a/mate-base/mate-menus/files/10-xdg-menu-mate
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-if [ -z "$XDG_MENU_PREFIX" ] && [ "$DESKTOP_SESSION" = "mate" ]
-then
-	export XDG_MENU_PREFIX=mate-
-fi
diff --git a/mate-base/mate-menus/mate-menus-1.22.0-r1.ebuild b/mate-base/mate-menus/mate-menus-1.22.0-r1.ebuild
deleted file mode 100644
index c93dbf13c79c..000000000000
--- a/mate-base/mate-menus/mate-menus-1.22.0-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-GNOME2_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-fi
-
-DESCRIPTION="MATE menu system, implementing the F.D.O cross-desktop spec"
-LICENSE="GPL-2+ LGPL-2+ LGPL-2.1+"
-SLOT="0"
-
-IUSE="debug +introspection"
-
-COMMON_DEPEND=">=dev-libs/glib-2.50:2
-	virtual/libintl
-	introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.40
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-src_configure() {
-	# Do NOT compile with --disable-debug/--enable-debug=no as it disables API
-	# usage checks.
-	mate_src_configure \
-		--enable-debug=$(usex debug yes minimum) \
-		$(use_enable introspection)
-}
-
-src_install() {
-	mate_src_install
-
-	exeinto /etc/X11/xinit/xinitrc.d/
-	doexe "${FILESDIR}/10-xdg-menu-mate"
-}
diff --git a/mate-base/mate-menus/mate-menus-1.22.0.ebuild b/mate-base/mate-menus/mate-menus-1.22.0.ebuild
deleted file mode 100644
index cce14f63a6fc..000000000000
--- a/mate-base/mate-menus/mate-menus-1.22.0.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
-
-GNOME2_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-DESCRIPTION="MATE menu system, implementing the F.D.O cross-desktop spec"
-LICENSE="GPL-2+ LGPL-2+ LGPL-2.1+"
-SLOT="0"
-
-IUSE="debug +introspection"
-
-COMMON_DEPEND=">=dev-libs/glib-2.50:2
-	virtual/libintl
-	introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.40
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-src_configure() {
-	# Do NOT compile with --disable-debug/--enable-debug=no as it disables API
-	# usage checks.
-	mate_src_configure \
-		--enable-debug=$(usex debug yes minimum) \
-		$(use_enable introspection)
-}
-
-src_install() {
-	mate_src_install
-
-	exeinto /etc/X11/xinit/xinitrc.d/
-	doexe "${FILESDIR}/10-xdg-menu-mate"
-}
-
-pkg_postinst() {
-	mate_pkg_postinst
-	einfo "Due to upstream bug"
-	einfo "https://github.com/mate-desktop/mate-menus/issues/2,"
-	einfo "it is highly recommended to run the following command"
-	einfo "once you have logged in to your desktop for the first time:"
-	einfo "cd ~/.config/menus && ln -s {,mate-}applications-merged"
-}
diff --git a/mate-base/mate-menus/mate-menus-1.22.1-r1.ebuild b/mate-base/mate-menus/mate-menus-1.22.1-r1.ebuild
index aa489e3e46e1..d9c99716e9be 100644
--- a/mate-base/mate-menus/mate-menus-1.22.1-r1.ebuild
+++ b/mate-base/mate-menus/mate-menus-1.22.1-r1.ebuild
@@ -8,7 +8,7 @@ GNOME2_LA_PUNT="yes"
 inherit mate
 
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 DESCRIPTION="MATE menu system, implementing the F.D.O cross-desktop spec"
diff --git a/mate-base/mate-panel/Manifest b/mate-base/mate-panel/Manifest
index 0cf987e1bfba..65b76a45c1f2 100644
--- a/mate-base/mate-panel/Manifest
+++ b/mate-base/mate-panel/Manifest
@@ -1,9 +1,5 @@
-DIST mate-panel-1.22.1.tar.xz 2142620 BLAKE2B 3b105c04cd2c1bf0c5077fb79dc8f0fea090eca96b766567a3921c25d35f915d36446ad765fd226f2fc2a70d4c95987a1c503bd60a92210f944fb50a83bc6a90 SHA512 023599a2c0a879e32df11fc09d7526a54b8dc5248173c940e61df1dd9cbe8c04e4c916da89f5a64e44fe3f99462d56c72849314fc182c0af58a7c19e1fac642f
 DIST mate-panel-1.22.2.tar.xz 2216064 BLAKE2B c23d2c1efb52af3b5f1102ba4b9ac344d107f2836704809c3d843197940a1ae5cc7b025cfe07ead740107cf5004e304209641fd17a2559a140c7800eb63f793f SHA512 ccfd9e44116e66688d4de53c86e1a7d0754fd221b8083d7bee729f2a02a777a54b98ff70332b979aa075c157bc36c6ed6651f9190fa4a7e37b8a029a1f2a623f
 DIST mate-panel-1.24.0.tar.xz 3040068 BLAKE2B 2ef2973014e32ab62ba9d4a05a820a2640415b493886d74e09089ed91bfe61d2d53ee6313c104945ddc95c992423403f6bca72a7f8b80ce189cd9f247add931c SHA512 12a88534400603998b4d4d415940947dd6372914135aa8eb6052c75e134412739a96064ad654e8f2625dbb6fe853e8cb376c41e530c30234e08141a46634820b
-EBUILD mate-panel-1.22.1.ebuild 1421 BLAKE2B 8694b6286ef520c77fadaccd53bb80adc8c201509605f9dfa288d92bbd790a73db8018e989cb32961d16aed5cf46fd49a8f4a208091ac474fdd088e189477ab9 SHA512 0353ac4d1f3c12f876c2756d4a01ffadae8534f7e09aee93bfcbb21e47bd5354f77f18d9ef3c278f8e0abc10fb2b7abb379db4bf1e433ce96089e81ce2281c18
-EBUILD mate-panel-1.22.2-r1.ebuild 1476 BLAKE2B bb30753fedceb2c51c71ce3cdd317858f7663eb85c6397729d2880202ad87c9a441ba7f72b1d5d92ba75a3a027c688a22d9032dc2b039bece3fb3edfac434b21 SHA512 b50a6b9dd81e85987336f49e0066ee320e75e9e4d5d70b0453ec9c1010ccad16a20ff0c5355d92090ad000895b45c17bc18ce8b12271a7fbad715141d3048d4d
-EBUILD mate-panel-1.22.2.ebuild 1423 BLAKE2B 1821e26d66c933001bdbb9b53ad04a2eeb86b3b8ad3836a9ded9b5df4e1bf28dbe8d3206d2615ff7c6e849c157000f77442f883b3f24d358c652e4876ad7da38 SHA512 33c0b89f43c2380aada008e615492e1db1d75cbda9e4b8b24c49660abdb1558cc86f9111cf1c39d7c3d0429a15b1c0b5180ca0dc0dc74789e56dc1fff9aa06dd
+EBUILD mate-panel-1.22.2-r1.ebuild 1474 BLAKE2B 8080fd63291557e50639980bb8af5d78a5ffb3f5e2b30c23bf32e8a1eb22980dca94b1922756dc7bdc9451dac711c8445540d5ab91031981d6217f01a2df2c1f SHA512 86a364b9a71a8865635f5bf3e966ea5756e7ffd64aa740694d595a926f8ce896ea12233f7d554405931708bbb6260ed81b381e6434dfcb65256c629879ae083d
 EBUILD mate-panel-1.24.0-r1.ebuild 1508 BLAKE2B fde595ddf40b07396ab9cf5147186f9890f7921c8a14fcd4ec6ac755d74c9658d4d72d435d7afbdd9aa496fec6125fe274b990229c5108e6e7a987677f6b6d79 SHA512 1f1241560d984779497563df65f52e66792f6b4dd86576d691adeb52bfb15e7509cc33476ca738c39093a52b53e4defb141cda23084f5420a26dbceafba16823
-EBUILD mate-panel-1.24.0.ebuild 1455 BLAKE2B 130c5e3ad46549cd2ce309e425f292ec9422fda8de3db84e2e8586a005fc59a6787ce2084fc8e76a2e66dfe5de21b0702bf3384b28e64cc2ac9c564d40cd8eef SHA512 51f09157156232aca77fd61adc50bc629716ff131459172e7b7fbfaac5412f02319c5aa78648747c45185587953e1a7006043c68b4fe35c3206956c8239476f0
 MISC metadata.xml 339 BLAKE2B d4e26fe24b5076b1a78c8de45bab802a438bd5fc171da7a6da6dc2460a7cb53677d4044abefc6c925a1b56d60d1a20fcb2334121ac0750d8347dc8ca3497b9c7 SHA512 788f53b6c90c485f6c8e4de2a9d1fd8f895b7c57cb7beeb0ec295a4710ceac5c8537ec9b3b567fbb5fae95cc08ce8892649a4198d40f30363b98f01267d67d26
diff --git a/mate-base/mate-panel/mate-panel-1.22.1.ebuild b/mate-base/mate-panel/mate-panel-1.22.1.ebuild
deleted file mode 100644
index cfc64f973573..000000000000
--- a/mate-base/mate-panel/mate-panel-1.22.1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-DESCRIPTION="The MATE panel"
-LICENSE="FDL-1.1+ GPL-2+ LGPL-2+"
-SLOT="0"
-
-IUSE="X +introspection wayland"
-
-RDEPEND="
-	dev-libs/atk
-	>=dev-libs/dbus-glib-0.80:0
-	>=dev-libs/glib-2.50:2
-	>=dev-libs/libmateweather-1.17.0
-	dev-libs/libxml2:2
-	>=gnome-base/dconf-0.13.4
-	>=gnome-base/librsvg-2.36.2:2
-	>=mate-base/mate-desktop-1.17.0
-	>=mate-base/mate-menus-1.21.0
-	>=sys-apps/dbus-1.1.2
-	>=x11-libs/cairo-1
-	>=x11-libs/gdk-pixbuf-2.25.2:2
-	>=x11-libs/gtk+-3.22:3[introspection?]
-	x11-libs/libICE
-	x11-libs/libSM
-	>=x11-libs/libwnck-3.4.6:3[introspection?]
-	x11-libs/libX11
-	>=x11-libs/pango-1.15.4:0[introspection?]
-	x11-libs/libXau
-	>=x11-libs/libXrandr-1.3
-	virtual/libintl
-	introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
-	wayland? ( dev-libs/wayland )"
-
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/yelp-tools
-	>=dev-lang/perl-5:=
-	dev-util/glib-utils
-	dev-util/gdbus-codegen
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.50.1
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-src_configure() {
-	mate_src_configure \
-		--libexecdir=/usr/libexec/mate-applets \
-		--disable-deprecation-flags \
-		$(use_enable X x11) \
-		$(use_enable introspection) \
-		$(use_enable wayland)
-}
diff --git a/mate-base/mate-panel/mate-panel-1.22.2-r1.ebuild b/mate-base/mate-panel/mate-panel-1.22.2-r1.ebuild
index 551a0d0867d4..a6d3ae62ad40 100644
--- a/mate-base/mate-panel/mate-panel-1.22.2-r1.ebuild
+++ b/mate-base/mate-panel/mate-panel-1.22.2-r1.ebuild
@@ -8,7 +8,7 @@ MATE_LA_PUNT="yes"
 inherit mate
 
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 DESCRIPTION="The MATE panel"
diff --git a/mate-base/mate-panel/mate-panel-1.22.2.ebuild b/mate-base/mate-panel/mate-panel-1.22.2.ebuild
deleted file mode 100644
index 8067bcbd4574..000000000000
--- a/mate-base/mate-panel/mate-panel-1.22.2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-fi
-
-DESCRIPTION="The MATE panel"
-LICENSE="FDL-1.1+ GPL-2+ LGPL-2+"
-SLOT="0"
-
-IUSE="X +introspection wayland"
-
-RDEPEND="
-	dev-libs/atk
-	>=dev-libs/dbus-glib-0.80:0
-	>=dev-libs/glib-2.50:2
-	>=dev-libs/libmateweather-1.17.0
-	dev-libs/libxml2:2
-	>=gnome-base/dconf-0.13.4
-	>=gnome-base/librsvg-2.36.2:2
-	>=mate-base/mate-desktop-1.17.0
-	>=mate-base/mate-menus-1.21.0
-	>=sys-apps/dbus-1.1.2
-	>=x11-libs/cairo-1
-	>=x11-libs/gdk-pixbuf-2.25.2:2
-	>=x11-libs/gtk+-3.22:3[introspection?]
-	x11-libs/libICE
-	x11-libs/libSM
-	>=x11-libs/libwnck-3.4.6:3[introspection?]
-	x11-libs/libX11
-	>=x11-libs/pango-1.15.4:0[introspection?]
-	x11-libs/libXau
-	>=x11-libs/libXrandr-1.3
-	virtual/libintl
-	introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
-	wayland? ( dev-libs/wayland )"
-
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/yelp-tools
-	>=dev-lang/perl-5:=
-	dev-util/glib-utils
-	dev-util/gdbus-codegen
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.50.1
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-src_configure() {
-	mate_src_configure \
-		--libexecdir=/usr/libexec/mate-applets \
-		--disable-deprecation-flags \
-		$(use_enable X x11) \
-		$(use_enable introspection) \
-		$(use_enable wayland)
-}
diff --git a/mate-base/mate-panel/mate-panel-1.24.0.ebuild b/mate-base/mate-panel/mate-panel-1.24.0.ebuild
deleted file mode 100644
index 5b97ca2b7613..000000000000
--- a/mate-base/mate-panel/mate-panel-1.24.0.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-fi
-
-DESCRIPTION="The MATE panel"
-LICENSE="FDL-1.1+ GPL-2+ LGPL-2+"
-SLOT="0"
-
-IUSE="X +introspection wayland"
-
-COMMON_DEPEND="
-	dev-libs/atk
-	>=dev-libs/dbus-glib-0.80:0
-	>=dev-libs/glib-2.50:2
-	>=dev-libs/libmateweather-1.17.0
-	dev-libs/libxml2:2
-	>=gnome-base/dconf-0.13.4
-	>=gnome-base/librsvg-2.36.2:2
-	>=mate-base/mate-desktop-1.17.0
-	>=mate-base/mate-menus-1.21.0
-	>=sys-apps/dbus-1.1.2
-	>=x11-libs/cairo-1
-	>=x11-libs/gdk-pixbuf-2.25.2:2
-	>=x11-libs/gtk+-3.22:3[introspection?]
-	x11-libs/libICE
-	x11-libs/libSM
-	>=x11-libs/libwnck-3.4.6:3[introspection?]
-	x11-libs/libX11
-	>=x11-libs/pango-1.15.4:0[introspection?]
-	x11-libs/libXau
-	>=x11-libs/libXrandr-1.3
-	introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
-	wayland? ( gui-libs/gtk-layer-shell )"
-
-RDEPEND="${COMMON_DEPEND}
-	virtual/libintl
-"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/yelp-tools
-	>=dev-lang/perl-5:=
-	dev-util/glib-utils
-	dev-util/gdbus-codegen
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=sys-devel/gettext-0.19.8:*
-	virtual/pkgconfig"
-
-src_configure() {
-	mate_src_configure \
-		--libexecdir=/usr/libexec/mate-applets \
-		--disable-deprecation-flags \
-		$(use_enable X x11) \
-		$(use_enable introspection) \
-		$(use_enable wayland)
-}
diff --git a/mate-base/mate-session-manager/Manifest b/mate-base/mate-session-manager/Manifest
index dff41c4bba4c..6451987c22c8 100644
--- a/mate-base/mate-session-manager/Manifest
+++ b/mate-base/mate-session-manager/Manifest
@@ -6,12 +6,8 @@ AUX MATE 2378 BLAKE2B 824c6e357c90322a499aeeece3e38d25bcfb87c23eab159e1bc3c4dc39
 AUX defaults.list 14293 BLAKE2B b8de50636f845e5ed197968a0f917a3d2c1f59b082ae7d76841c9802ce6182556a29faebcd28f71dfdd778ae73268ebba1d450c9f18ac730aedd5ba0f025e53c SHA512 d3b14a4676bbadb93bc33e94ddf74fc6a2c072c52ada51d8f658008301d795102d47b3e1b71f9884d117111329774deaab1a5c1718c3dab5bcf96df1657f3c9d
 AUX mate-session-manager-1.22.0-elogind.patch 3002 BLAKE2B 90f18a3e7c98d5dbadd34c327bb9ac0a971f4585da35b401625641842ac05c8fe0385cbf1ab0955e16865c106d2046de44409a452ce4a251e09ec127a33390e4 SHA512 aa5fba7040879aeeba931d5cc62896ff43fc5d770664cfcd9ca45cbf5959e7eec3fa74ba632ef19d653b2516589119a8c2c1349c054be1e9a8d42ccf3dd755da
 AUX mate-session-manager-1.22.0-fix-systemd-regression.patch 1833 BLAKE2B 894f6f223fefc7921ef42d604fccb30d3f9efb80ecea1bc0637b286e57552a9eaaad2f42c6e6bb2cdddd396954dea2712c8aa02da5ba54ca2974acb54d825acc SHA512 7a0036c706b56d4431fbb3d54be77930aede8d8d1d0889a568bc0432d91b15026ac26ef4ccdc0f41a860a6adf1a88cf07d4c260c810f66f1a910ff568b4e90fb
-DIST mate-session-manager-1.22.0.tar.xz 603016 BLAKE2B 5d7064756b7d7d2ca4fdebf18319dc8a8d8eca6ed31c5e8e37e503c7099a0d541186028d6b4e174bff1ce9ca727a374e9597498b2ca6d5494dc74f21fec0baeb SHA512 7e5e21e37c7ac55ca7d71302edef9aabeccf39233aec9edfe93a2fdcd4150d039e8121adecebb3d0a4a707eccef0c7afa1b54c5b52b57853242964c7506eeb9a
-DIST mate-session-manager-1.22.1.tar.xz 580992 BLAKE2B 313f353597b072e0bc118f5e52258c73e4f5c9c51f0e27ed5c7763591b27df77a37439487b05142de99bbae19e595f01501189449331ca5dcf59ba0c5143a95c SHA512 1c47134813d24abef7b2f5df098120a2cd138f822ea3d687a1a2566224bbde21482bf40ac47ba08a39ed0899ff35eeac3c3690c83c006774c47f22189688990b
 DIST mate-session-manager-1.22.3.tar.xz 582412 BLAKE2B 9e502b356e09aa4ecebb5a75771cfed0dd16a3e44baf176fd5ba3dbf9b5bd000f6572498dfee69e794971e491eb5d9f2fa3a8c923aefe2ee6e42a086521fdd9d SHA512 2a53722c1468c244e90632e3a949c331922e018998300ee8c5de44973e17116822d2a747b4d0d315348da9a20c011f46c2b5ea569eef0b6b90785f3df55d98f6
 DIST mate-session-manager-1.24.0.tar.xz 709712 BLAKE2B 6455872dfc89cdd3ced563a877e30ef59d2c6d94bd8f3b930eb778ea6b22a52ee860d785ba13d348e37e0d74526de4aef229d5c7b022e7f974ac949f553d7704 SHA512 ee519c8ded1f2df26e62a1384439e8929942d19560c258c91010f8d34bcc7518975406fbc0a5b76d4e73e954cdc2ea106d71476e446573d4a77d2704f6cc9e37
-EBUILD mate-session-manager-1.22.0.ebuild 2250 BLAKE2B 3eae2904a0493bc3edbcbf95364a667063bea0cfd766662a8325de84d0a3ca181109074faeb00a8e69557d23607c026761870f7f972365b4d15fc36b80e3b9b8 SHA512 48b54166b78d24c018f9b39714c527decc7d5e96571afc100126c19365021703689d6d1ac476bbcee0b2a492af6bb3abadf90ce65b8c94eec02545acd3c6518d
-EBUILD mate-session-manager-1.22.1.ebuild 2156 BLAKE2B 6f706c532c34fd3916577aad9229ceb20cd9576bf52308ca6834f0fc886cca81aa14545898737ec9ea002b28d92800c90a59f02adfd79b57540d05a2238d747c SHA512 b7ef794177ababf055ef6ef630eb9563531215428587184d6050ba6fbb8b346f88d4afe1c0a2d5f989d9699b293b04dcd1cb2dd191aeb2a473bbbd0fb717fea0
-EBUILD mate-session-manager-1.22.3-r2.ebuild 2017 BLAKE2B 272a406132bb7762fb5540ed55b5916298dd2f29d91a2fdb303e4c162181fc10805a79c999388d168eb5ea323adfbf1812f9f17c1d2ab3a2cff5539899f213e1 SHA512 09a343f311e57728b0c0bd0de3517d244bc316282b58c794b5fa6d766bef2174c98466720512d87c1b6aada5a15a3cdfa788ede3d92e4c37f69769e99e7eed98
+EBUILD mate-session-manager-1.22.3-r2.ebuild 2015 BLAKE2B ba9bf1a3e493a51607a7ed20efd3813a8cc8c2065da337fd1c70f882ec3edfde87a974ba1692e5f0021b9b3486d99f4449787d22c966e1c42e3e8c5fc41dddfc SHA512 d536c0824f5da33bb1dadccbea862cb25b4d153ee17f7d958b77586064dac236434942e012bb2f2f20b0770bab7e6c90f8f5ec723fdb13da1acd31dc02bdd28a
 EBUILD mate-session-manager-1.24.0-r2.ebuild 1992 BLAKE2B 6b1e025ede6f31c1bc9e4d4d0c164f8f2d963e0f28ca09817fee85895b6992707a6fa374f66f6c1ba764dc3c6564bf665d644ea7d5f1b575e1e88ba1e5ed4f46 SHA512 325e684caf458eecfd9107e1f90e6dff20b5100da0cfbd56287563d65d4e0b84af5c75a7f4c342195e5790f6bace6cd76b734017aae671dfd4fb386c0a517cd9
 MISC metadata.xml 497 BLAKE2B 85510300fad0274831fbbb5dbedb00bd3e6347518e0188838f8dce213064db44612ca7e7fbbe922cc46924f02f2fda50120ecba21774231af6e3acea45fc9db4 SHA512 19f431c7d3a9912baaa3df85fd222be5b2649f46a723ffdc084524b172c6c387e4a9928b219d9e73217c7e6ef677f2e5e82473547489001fc20fee7529373568
diff --git a/mate-base/mate-session-manager/mate-session-manager-1.22.0.ebuild b/mate-base/mate-session-manager/mate-session-manager-1.22.0.ebuild
deleted file mode 100644
index 899a3c8f7db2..000000000000
--- a/mate-base/mate-session-manager/mate-session-manager-1.22.0.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-DESCRIPTION="MATE session manager"
-HOMEPAGE="https://mate-desktop.org/"
-
-LICENSE="GPL-2+ GPL-3+ HPND LGPL-2+ LGPL-2.1+"
-SLOT="0"
-IUSE="debug elibc_FreeBSD elogind gnome-keyring ipv6 systemd +xtrans"
-
-REQUIRED_USE="?? ( elogind systemd )"
-
-# x11-misc/xdg-user-dirs{,-gtk} are needed to create the various XDG_*_DIRs, and
-# create .config/user-dirs.dirs which is read by glib to get G_USER_DIRECTORY_*
-# xdg-user-dirs-update is run during login (see 10-user-dirs-update-gnome below).
-
-COMMON_DEPEND="
-	>=dev-libs/dbus-glib-0.76
-	>=dev-libs/glib-2.50:2
-	dev-libs/libxslt
-	sys-apps/dbus
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.22:3
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXau
-	x11-libs/libXext
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/pango
-	virtual/libintl
-	elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )
-	systemd? ( sys-apps/systemd )
-	!systemd? (
-		elogind? ( sys-auth/elogind )
-		!elogind? ( >=sys-auth/consolekit-0.9.2 )
-	)
-	xtrans? ( x11-libs/xtrans )"
-
-RDEPEND="${COMMON_DEPEND}
-	x11-apps/xdpyinfo
-	x11-misc/xdg-user-dirs
-	x11-misc/xdg-user-dirs-gtk
-	gnome-keyring? ( gnome-base/gnome-keyring )
-	!<gnome-base/gdm-2.20.4"
-
-DEPEND="${COMMON_DEPEND}
-	>=dev-lang/perl-5
-	dev-util/glib-utils
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.10.40
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-fix-systemd-regression.patch
-	"${FILESDIR}"/${P}-elogind.patch
-)
-
-MATE_FORCE_AUTORECONF=true
-
-src_configure() {
-	mate_src_configure \
-		$(use_with elogind) \
-		$(use_with systemd) \
-		$(use_with xtrans)  \
-		$(use_enable debug) \
-		$(use_enable ipv6)
-}
-
-src_install() {
-	mate_src_install
-
-	dodir /etc/X11/Sessions/
-	exeinto /etc/X11/Sessions/
-	doexe "${FILESDIR}"/MATE
-
-	dodir /usr/share/mate/applications/
-	insinto /usr/share/mate/applications/
-	doins "${FILESDIR}"/defaults.list
-
-	dodir /etc/X11/xinit/xinitrc.d/
-	exeinto /etc/X11/xinit/xinitrc.d/
-	doexe "${FILESDIR}"/15-xdg-data-mate
-
-	# This should be done in MATE too, see Gentoo bug #270852
-	doexe "${FILESDIR}"/10-user-dirs-update-mate
-}
diff --git a/mate-base/mate-session-manager/mate-session-manager-1.22.1.ebuild b/mate-base/mate-session-manager/mate-session-manager-1.22.1.ebuild
deleted file mode 100644
index b0b88ae720e7..000000000000
--- a/mate-base/mate-session-manager/mate-session-manager-1.22.1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-fi
-
-DESCRIPTION="MATE session manager"
-HOMEPAGE="https://mate-desktop.org/"
-
-LICENSE="GPL-2+ GPL-3+ HPND LGPL-2+ LGPL-2.1+"
-SLOT="0"
-IUSE="debug elibc_FreeBSD elogind gnome-keyring ipv6 systemd +xtrans"
-
-REQUIRED_USE="?? ( elogind systemd )"
-
-# x11-misc/xdg-user-dirs{,-gtk} are needed to create the various XDG_*_DIRs, and
-# create .config/user-dirs.dirs which is read by glib to get G_USER_DIRECTORY_*
-# xdg-user-dirs-update is run during login (see 10-user-dirs-update-gnome below).
-
-COMMON_DEPEND="
-	>=dev-libs/dbus-glib-0.76
-	>=dev-libs/glib-2.50:2
-	dev-libs/libxslt
-	sys-apps/dbus
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.22:3
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXau
-	x11-libs/libXext
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/pango
-	virtual/libintl
-	elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )
-	systemd? ( sys-apps/systemd )
-	!systemd? (
-		elogind? ( sys-auth/elogind )
-		!elogind? ( >=sys-auth/consolekit-0.9.2 )
-	)
-	xtrans? ( x11-libs/xtrans )"
-
-RDEPEND="${COMMON_DEPEND}
-	x11-apps/xdpyinfo
-	x11-misc/xdg-user-dirs
-	x11-misc/xdg-user-dirs-gtk
-	gnome-keyring? ( gnome-base/gnome-keyring )
-	!<gnome-base/gdm-2.20.4"
-
-DEPEND="${COMMON_DEPEND}
-	>=dev-lang/perl-5
-	dev-util/glib-utils
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.10.40
-	virtual/pkgconfig"
-
-MATE_FORCE_AUTORECONF=true
-
-src_configure() {
-	mate_src_configure \
-		$(use_with elogind) \
-		$(use_with systemd) \
-		$(use_with xtrans)  \
-		$(use_enable debug) \
-		$(use_enable ipv6)
-}
-
-src_install() {
-	mate_src_install
-
-	dodir /etc/X11/Sessions/
-	exeinto /etc/X11/Sessions/
-	doexe "${FILESDIR}"/MATE
-
-	dodir /usr/share/mate/applications/
-	insinto /usr/share/mate/applications/
-	doins "${FILESDIR}"/defaults.list
-
-	dodir /etc/X11/xinit/xinitrc.d/
-	exeinto /etc/X11/xinit/xinitrc.d/
-	doexe "${FILESDIR}"/15-xdg-data-mate
-
-	# This should be done in MATE too, see Gentoo bug #270852
-	doexe "${FILESDIR}"/10-user-dirs-update-mate
-}
diff --git a/mate-base/mate-session-manager/mate-session-manager-1.22.3-r2.ebuild b/mate-base/mate-session-manager/mate-session-manager-1.22.3-r2.ebuild
index e729fb9e8e7c..1eca4cc57b54 100644
--- a/mate-base/mate-session-manager/mate-session-manager-1.22.3-r2.ebuild
+++ b/mate-base/mate-session-manager/mate-session-manager-1.22.3-r2.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit mate
 
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 DESCRIPTION="MATE session manager"
diff --git a/mate-base/mate-settings-daemon/Manifest b/mate-base/mate-settings-daemon/Manifest
index 4f1810e52306..254dadc02270 100644
--- a/mate-base/mate-settings-daemon/Manifest
+++ b/mate-base/mate-settings-daemon/Manifest
@@ -1,8 +1,5 @@
-DIST mate-settings-daemon-1.22.0.tar.xz 810696 BLAKE2B 4b61441a96c3a5c59616f963b2356f418ccc81ca21ef1f3834a777f92779986afc114086ef16f42f69441031b24abb6e727a7326ae6209cb01545ae3359ca1da SHA512 e8fa2ba07195dd66a94312909be37abe67089c7a687afee3bfde5860a598e84481949c9cdc7408886f90776556b41d5574bd6efc0614ed7583908214d59c6cb5
 DIST mate-settings-daemon-1.22.1.tar.xz 766556 BLAKE2B 5e0eeb497795eae666adbe046acf0594f0da0f8c4583d0933541a45e0eb6ece3662ac408385ff21cc2db4f566fce4aa3685e8e0aee2d2ab1e9f22e0cf12ad24b SHA512 9a7d9d81f18e2603c45fab223b3341df1939ee92b0e2db00f0ca5c095a88511c67b33d668b951b1a8f93c81c1e801bfd35729e64fab8bf2962af1e443d8448b6
 DIST mate-settings-daemon-1.24.0.tar.xz 1026248 BLAKE2B 134ad9c23488ae4a9619e5d9d4465bd3f2cbbacbd3b3e78924c3adcc95a88a8499c24b1c7bd844994b67517407c08c6bf22471597ad9311a4ae04cd7c96996fc SHA512 897d3540930ac407d802c9ecd1995e9bfee14eafadbbfad64aab1e7d93c9830111ac991d8f0df37e34efaa3f7cae9d59ee4d786b15acf0b87b8ba5d299bc1cc1
-EBUILD mate-settings-daemon-1.22.0-r1.ebuild 1595 BLAKE2B 657e08d60de47c42bb51b6a7aa502e70977c8ad84e715d3634daa000439c0a41410f3379487af95d21a9e57691980883665a72ab34905c6e0ff8c9837f8c7d1d SHA512 a779c25b34da31d583c69ad5942b6d3a2bdcaeb276df994ebe46e54caeb7e294114914ae3222a4dc7f95dc7432593d5b278671cf5c9e236402b868e46deb4167
-EBUILD mate-settings-daemon-1.22.0.ebuild 1561 BLAKE2B 13ebfdc12032845a924b3a7747c10596b5f6dd50d044d79a9f0d72dfacd5e0d168519ca3bfb01919ed2cf79c2e15b360216f334d05dba9193f8979d5a5a153a0 SHA512 c45f9acbf641e67e0b9059db26f7d336d5fbe29ace914fe1f9009858deb02e477d6d569000b6ac9fc22dfd83bf46b4669704f60d51e699116497535f6bc0621a
-EBUILD mate-settings-daemon-1.22.1.ebuild 1572 BLAKE2B 1cf18161241a52da00b9df73352d5630239f3bcaf8cc13fd89d3710cf93384ae14160ca0888bad314799da1639e714324a04ce0d6be802b52003626bbc1c27bc SHA512 cd6841f887bd103c84b3fdb3be14ec476dbec5ec4ab6634116aa70319da5655ebf28e047b63afc79e7aa82cc89634aed43efa4cd01d9357bf5d424c3eac456c1
+EBUILD mate-settings-daemon-1.22.1.ebuild 1570 BLAKE2B ac542583af47ee72c01176619fd9999d95466360e93bae97cc5c167d9b52ada71e31afb6d247473d0a4df5b6b5cdad503e786e7a36014775ce98a953e667c011 SHA512 edcdb4412837eab021d35ebb71c5ee336be67da2c72ac7572e664239d7053abf29c680c61a372e8f253c402b4996ba59bd0939311521a0561a74cd089fad4171
 EBUILD mate-settings-daemon-1.24.0.ebuild 1558 BLAKE2B be7608b9e2664205f154dc1d8ab760e664d02ea05a942620c8db221780de30af49702fac642c7e39a865bf8ac72efe36978501a29cadb3f3626f85ffcb10462f SHA512 84dcd4b18eeb3f7b9440984b0b8c4dcc01d156d4029ed65d95575e6e3d4763f7b6c7ab2c60315340a6d940e3261baa3df6fad5ba1ab12b84c1bce501642dcb06
 MISC metadata.xml 418 BLAKE2B c2bac7304f03cc8ce38351a4418a08bceb9bb71c1fde52acd7fafab37802c6c8d1bba307f84191944b7196e7220a93ea3c622f1c1db8aa93b13a51616c1fbdd9 SHA512 e87db5a05fd52a6660562ac76d26c2b978e6c0dab871eedb65172dbe2c24b2e090966d6808b6f2748f6807543d47a7e7455618bfb876d58e76ac01ae2a6622a7
diff --git a/mate-base/mate-settings-daemon/mate-settings-daemon-1.22.0-r1.ebuild b/mate-base/mate-settings-daemon/mate-settings-daemon-1.22.0-r1.ebuild
deleted file mode 100644
index d370a5addaa7..000000000000
--- a/mate-base/mate-settings-daemon/mate-settings-daemon-1.22.0-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-fi
-
-DESCRIPTION="MATE Settings Daemon"
-LICENSE="GPL-2+ GPL-3+ HPND LGPL-2+ LGPL-2.1+"
-SLOT="0"
-
-IUSE="X debug libnotify policykit pulseaudio rfkill smartcard +sound"
-
-REQUIRED_USE="pulseaudio? ( sound )"
-
-COMMON_DEPEND=">=dev-libs/dbus-glib-0.74
-	>=dev-libs/glib-2.50:2
-	>=gnome-base/dconf-0.13.4
-	>=mate-base/libmatekbd-1.17.0
-	>=mate-base/mate-desktop-1.21.1
-	media-libs/fontconfig:1.0
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.22:3
-	x11-libs/libX11
-	x11-libs/libXi
-	x11-libs/libXext
-	x11-libs/libXxf86misc
-	>=x11-libs/libxklavier-5.2
-	virtual/libintl
-	libnotify? ( >=x11-libs/libnotify-0.7:0 )
-	policykit? (
-		>=dev-libs/dbus-glib-0.71
-		>=sys-apps/dbus-1.1.2
-		>=sys-auth/polkit-0.97
-	)
-	pulseaudio? (
-		>=media-libs/libmatemixer-1.10[pulseaudio]
-		>=media-sound/pulseaudio-0.9.15
-	)
-	smartcard? ( >=dev-libs/nss-3.11.2 )
-	sound? (
-		>=media-libs/libmatemixer-1.10
-		media-libs/libcanberra[gtk3]
-	)"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.50.1
-	sys-devel/gettext
-	virtual/pkgconfig
-	x11-base/xorg-proto"
-
-src_configure() {
-	mate_src_configure \
-		$(use_with X x) \
-		$(use_with libnotify) \
-		$(use_with sound libcanberra) \
-		$(use_with sound libmatemixer) \
-		$(use_enable debug) \
-		$(use_enable policykit polkit) \
-		$(use_enable pulseaudio pulse) \
-		$(use_enable rfkill) \
-		$(use_enable smartcard smartcard-support)
-}
diff --git a/mate-base/mate-settings-daemon/mate-settings-daemon-1.22.0.ebuild b/mate-base/mate-settings-daemon/mate-settings-daemon-1.22.0.ebuild
deleted file mode 100644
index fa1dd2df9e1b..000000000000
--- a/mate-base/mate-settings-daemon/mate-settings-daemon-1.22.0.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-DESCRIPTION="MATE Settings Daemon"
-LICENSE="GPL-2+ GPL-3+ HPND LGPL-2+ LGPL-2.1+"
-SLOT="0"
-
-IUSE="X debug libnotify policykit pulseaudio smartcard +sound"
-
-REQUIRED_USE="pulseaudio? ( sound )"
-
-COMMON_DEPEND=">=dev-libs/dbus-glib-0.74
-	>=dev-libs/glib-2.50:2
-	>=gnome-base/dconf-0.13.4
-	>=mate-base/libmatekbd-1.17.0
-	>=mate-base/mate-desktop-1.21.1
-	media-libs/fontconfig:1.0
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.22:3
-	x11-libs/libX11
-	x11-libs/libXi
-	x11-libs/libXext
-	x11-libs/libXxf86misc
-	>=x11-libs/libxklavier-5.2
-	virtual/libintl
-	libnotify? ( >=x11-libs/libnotify-0.7:0 )
-	policykit? (
-		>=dev-libs/dbus-glib-0.71
-		>=sys-apps/dbus-1.1.2
-		>=sys-auth/polkit-0.97
-	)
-	pulseaudio? (
-		>=media-libs/libmatemixer-1.10[pulseaudio]
-		>=media-sound/pulseaudio-0.9.15
-	)
-	smartcard? ( >=dev-libs/nss-3.11.2 )
-	sound? (
-		>=media-libs/libmatemixer-1.10
-		media-libs/libcanberra[gtk3]
-	)"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.50.1
-	sys-devel/gettext
-	virtual/pkgconfig
-	x11-base/xorg-proto"
-
-src_configure() {
-	mate_src_configure \
-		$(use_with X x) \
-		$(use_with libnotify) \
-		$(use_with sound libcanberra) \
-		$(use_with sound libmatemixer) \
-		$(use_enable debug) \
-		$(use_enable policykit polkit) \
-		$(use_enable pulseaudio pulse) \
-		$(use_enable smartcard smartcard-support)
-}
diff --git a/mate-base/mate-settings-daemon/mate-settings-daemon-1.22.1.ebuild b/mate-base/mate-settings-daemon/mate-settings-daemon-1.22.1.ebuild
index da4d01d94ab8..9fc81d53e05b 100644
--- a/mate-base/mate-settings-daemon/mate-settings-daemon-1.22.1.ebuild
+++ b/mate-base/mate-settings-daemon/mate-settings-daemon-1.22.1.ebuild
@@ -8,7 +8,7 @@ MATE_LA_PUNT="yes"
 inherit mate
 
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 DESCRIPTION="MATE Settings Daemon"