gentoo resync : 28.04.2019

37 files changed, 57 insertions, 861 deletions

diff --git a/mate-base/Manifest.gz b/mate-base/Manifest.gz
index ba297e2946f8..8c7b9a6731a4 100644
--- a/mate-base/Manifest.gz
+++ b/mate-base/Manifest.gz
diff --git a/mate-base/caja/Manifest b/mate-base/caja/Manifest
index 69af8022deb5..42cdc1cca3f3 100644
--- a/mate-base/caja/Manifest
+++ b/mate-base/caja/Manifest
@@ -1,5 +1,3 @@
-DIST caja-1.18.5.tar.xz 3528228 BLAKE2B c39d7ef97de44c3f57fe622f71291e607cb17b10bebb20e19885413d67d0fccc6e5733739c836b0babbf45c51a0026f1559e7c1ed9656be0ee6b960363474773 SHA512 44bc85e33937f1816cddd78bf72db38b4b43e549cb2680b5d73d252699e9b5d1aace27271729ae310cb9d4f892474164140782713a6fa9f408c78c1b4f0edd73
 DIST caja-1.22.0.tar.xz 3562792 BLAKE2B 2f2a1d909e5e5a333228326b34daf8b5f461c836d2b132a78d53f93b14ab9ade5f39159adcb2ddb729838eca3eecdac1c0d3b98a875769bce942cd38cf88b664 SHA512 ca97a1e81cc7b061bb331d7a4574c76831dbff50bdc9ba0a162675def7278cf5dadb37aacb0e1e37a0ac2cf60df73f98353aaa36fa0e69a0097017eed5d325b6
-EBUILD caja-1.18.5.ebuild 2070 BLAKE2B 0a53984070a8d2f3f67b695301cc71689966bb8d0f0a5d4e31f07d48a6fbdad47b73077adfb8fef3678a06c3b27d41e5e1db0ee68bf8e9127a480564fa84b057 SHA512 587350b7071d903e33e4d23989d48c0c870b103b9d30ef4f13335c83eac9960978470aee18cc2b2b3ab2fa651fd1d232458335a5faa3b89524eedd6aa3e834d8
-EBUILD caja-1.22.0.ebuild 2043 BLAKE2B 552fe02db24fc8299e542e7c302b4fc717d82a15377169e8b9df62a9b4fa3f7350bf716f8e2aa64957a2549d0025caaae014f6184e8815416f7b70667e52f8f3 SHA512 98c523c449caf0901e7b9b5d4b851531fc420943eec4352b42925cc0ba9634a722a6e30250bdfd11f1c7abde63fd25f2c6e33e7fbafb96d373e37fbf1f86d772
+EBUILD caja-1.22.0.ebuild 2020 BLAKE2B 9be3ce9b680dee4987806c2fbc739f7d4eb3f96c08c136553f144ed34a672a86344698fc55fc3f2cbc55b740fc84e1c6efbe6c432e9bfec6f5f22a183c3a1503 SHA512 f4e6ee1163f4de21623fc8de82d26a6ba19bda87ed5e93034358833f6812928c09db671dc8c8d0f2c400145cd08725bae4e705708ecc75e135b61c17aa362086
 MISC metadata.xml 621 BLAKE2B a717b23dad86bcba48b97bec310d1dfb161a3c9ab051e84408f08409c45b1fad5fed38af6af2f75a54e3c29cf635ce5843d54af60a3ad22ed74fbafa0d8fab59 SHA512 95daee371a545e58bcf73daad3261589442121c6f6216d45fcb03e02e8e0d979d45527aa23d4252a60c25b6e9ff2b21d17f504724aaeae3ff97e745e23d963ca
diff --git a/mate-base/caja/caja-1.18.5.ebuild b/mate-base/caja/caja-1.18.5.ebuild
deleted file mode 100644
index 0bef8b734e92..000000000000
--- a/mate-base/caja/caja-1.18.5.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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 FDL-1.1"
-SLOT="0"
-
-IUSE="+introspection +mate packagekit xmp"
-
-COMMON_DEPEND="dev-libs/atk:0
-	>=dev-libs/glib-2.36:2
-	>=dev-libs/libxml2-2.4.7:2
-	gnome-base/dconf:0
-	>=gnome-base/gvfs-1.10.1:0[udisks]
-	>=mate-base/mate-desktop-1.17.0:0
-	>=media-libs/libexif-0.6.14:0
-	virtual/libintl:0
-	x11-libs/cairo:0
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.0:3[introspection?]
-	>=x11-libs/libnotify-0.7.0:0
-	x11-libs/libICE:0
-	x11-libs/libSM:0
-	x11-libs/libX11:0
-	x11-libs/libXext:0
-	x11-libs/libXft:0
-	x11-libs/libXrender:0
-	>=x11-libs/pango-1.1.2:0
-	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"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	>=dev-lang/perl-5:0=
-	dev-util/gdbus-codegen:0
-	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.0.ebuild b/mate-base/caja/caja-1.22.0.ebuild
index e6f942738401..606cd126e0bb 100644
--- a/mate-base/caja/caja-1.22.0.ebuild
+++ b/mate-base/caja/caja-1.22.0.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"
@@ -17,7 +17,8 @@ SLOT="0"
 
 IUSE="+introspection +mate packagekit xmp"
 
-COMMON_DEPEND="dev-libs/atk
+RDEPEND="
+	dev-libs/atk
 	>=dev-libs/glib-2.50:2
 	>=dev-libs/libxml2-2.4.7:2
 	gnome-base/dconf
@@ -41,16 +42,15 @@ COMMON_DEPEND="dev-libs/atk
 	xmp? ( >=media-libs/exempi-1.99.5:2 )
 	!!mate-base/mate-file-manager"
 
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
+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:*"
+	sys-devel/gettext
+	virtual/pkgconfig"
 
 PDEPEND="mate? ( >=x11-themes/mate-icon-theme-${MATE_BRANCH} )"
 
diff --git a/mate-base/libmatekbd/Manifest b/mate-base/libmatekbd/Manifest
index db5d7e1673cf..ff45ed543f61 100644
--- a/mate-base/libmatekbd/Manifest
+++ b/mate-base/libmatekbd/Manifest
@@ -1,5 +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
 EBUILD libmatekbd-1.18.2.ebuild 862 BLAKE2B cabcfcb33fe132b20f1f802142e207e77a5d0752508920edb0811b1330cfed4daf55d06c2062230c20c968da58b88c6b3bd862265a19018a887613b6fa047333 SHA512 def5428afeeb9e1507e4c6236f711b0d5fd88915d30c510a2856fbe337bd8771644c33e2aa5bb9a1efe2c7619e033c148a7acfe57ff9dbc4319bda88913e4d71
-EBUILD libmatekbd-1.22.0.ebuild 854 BLAKE2B 826a8e501ba8ca81f07819f3141bc1c37deb0033f8644147bd467c181e48a3bb5a9b566f1e97cd4f217ad4943bdf9bcbdd193252b0eb8625f2b682fc90b1043a SHA512 6a9a35b9b457c9397537bc3c630c51e875ce62212cf5c2639cdaa182d3ec5fb332423af0feae58ecad9f198e4aeb4c67fd3e8dc1e76f80314cf1c1a686494c25
+EBUILD libmatekbd-1.22.0.ebuild 827 BLAKE2B 89cd5cf4a9519aef8f87dd9d459b458f8b9b4c0100e28710bb1115a0c774e305b368eba9945363b9aea79f02b84163a025f9052b7f564b4042ec5ef3833a7f82 SHA512 2511398fc1d03c1d35ed75b505a8df096d367b1a7c0518f319d43abdf9035a057e8bc238d4d436561b9030f285b3cee5bcde9d0513056b37849bfb0d291b9daa
 MISC metadata.xml 339 BLAKE2B 0ba4a0bd94a0efe3c42d79da9b4f32dc50c577c616d2495a7a3019fb05c398ffdf614afddae5bda5bd1430716391d3991f99005c225e36d2ebc68ff5415ff5cf SHA512 fc767510a57712599986df86d68bf28122b5060b183f94dca26f69abd7a6b4866ab9efc37b85433d2271115374dba3299d2be6cd9461aeadaa2cb02864a6166d
diff --git a/mate-base/libmatekbd/libmatekbd-1.22.0.ebuild b/mate-base/libmatekbd/libmatekbd-1.22.0.ebuild
index a32a2661a41a..b1f2113381e3 100644
--- a/mate-base/libmatekbd/libmatekbd-1.22.0.ebuild
+++ b/mate-base/libmatekbd/libmatekbd-1.22.0.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 keyboard configuration library"
@@ -17,7 +17,7 @@ SLOT="0"
 
 IUSE="X +introspection test"
 
-COMMON_DEPEND=">=dev-libs/glib-2.50:2
+RDEPEND=">=dev-libs/glib-2.50:2
 	x11-libs/cairo
 	>=x11-libs/gdk-pixbuf-2.24:2
 	x11-libs/libX11
@@ -27,12 +27,11 @@ COMMON_DEPEND=">=dev-libs/glib-2.50:2
 	>=x11-libs/gtk+-3.22: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:*"
+DEPEND="${RDEPEND}
+	dev-util/glib-utils
+	>=dev-util/intltool-0.50.1
+	sys-devel/gettext
+	virtual/pkgconfig"
 
 src_configure() {
 	mate_src_configure \
diff --git a/mate-base/mate-applets-meta/Manifest b/mate-base/mate-applets-meta/Manifest
index 8e4db1848518..f8638f62a095 100644
--- a/mate-base/mate-applets-meta/Manifest
+++ b/mate-base/mate-applets-meta/Manifest
@@ -1,3 +1,2 @@
-EBUILD mate-applets-meta-1.18.ebuild 643 BLAKE2B 42259784e7e525789e22d32285c8c0fb74b591680e6931feb2fddd0a4c9a5c4176eaea4f52b80528458f7a27465f1147e7f422ec96e6ceeef8b528c0b8b4ba66 SHA512 5f0834fe4ac3c47f8cd1623f576cb2be61631a9cf70d63aa6367a6b93b64d469d7b039a6123e256a585ade5d20c7db0b9312d13522dd1a5754513dc85f71aa68
-EBUILD mate-applets-meta-1.22.0.ebuild 620 BLAKE2B 14c46162150f0ed0dafbb2de28886de8a03d6648e89b75ed14a7af8135b4109d2163bc7946a8e4a11afa19bf81dfbee20b3000fe2f842f8aa31a8ccc5fb584da SHA512 2ecd06dbce5f4f8dd01413716d9948f8adb25a8a3fc662567f8b15da5862de358e7ea30bc484d2a4fb0cf2aef9c3a083911479f9e1f9cebafd0e1b0dd2560afb
+EBUILD mate-applets-meta-1.22.0.ebuild 618 BLAKE2B eb60ebca7434812bcb332889fdd4f40190a6c853a08bb58e27770cdc42192ed1b87f36895eccbb5e3aa2f1e332119c23a1f723fa6a18c556b14b6f27d19777c8 SHA512 ffcdd1d59a3f738b3501992bd63790cd7071547a47407c9d1dd36647784d0a80c8eff639d0a499e35b0434979c37d1927c2a80021d658f8b50a268676863cbb9
 MISC metadata.xml 485 BLAKE2B 683574e64bd4bec6a28e6e35eba5dd99f6823d460f1f1c548ad469719e8f68ca2b5a55733f9d146a8f66b654d68ce18747e6cb5532432e9338ea95e757809a1f SHA512 fe08bec233d3be25d3314850882bc8de353b57901e047c0eec5f7a06b83202bc24ad1ddb4271cafed57c760441f8dc235bfbb0cbd8f8bee392deff03946a943e
diff --git a/mate-base/mate-applets-meta/mate-applets-meta-1.18.ebuild b/mate-base/mate-applets-meta/mate-applets-meta-1.18.ebuild
deleted file mode 100644
index 4b7605128b22..000000000000
--- a/mate-base/mate-applets-meta/mate-applets-meta-1.18.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} == 9999 ]]; then
-	MATE_BRANCH=9999
-else
-	inherit versionator
-	MATE_BRANCH="$(get_version_component_range 1-2)"
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-DESCRIPTION="Meta package for MATE panel applets"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI=""
-
-LICENSE="metapackage"
-SLOT="0"
-IUSE="appindicator sensors"
-
-DEPEND=""
-RDEPEND="=mate-base/mate-applets-${MATE_BRANCH}*
-	appindicator? ( =mate-extra/mate-indicator-applet-${MATE_BRANCH}* )
-	sensors? ( =mate-extra/mate-sensors-applet-${MATE_BRANCH}* )
-"
diff --git a/mate-base/mate-applets-meta/mate-applets-meta-1.22.0.ebuild b/mate-base/mate-applets-meta/mate-applets-meta-1.22.0.ebuild
index e580bc128343..45432c8cc728 100644
--- a/mate-base/mate-applets-meta/mate-applets-meta-1.22.0.ebuild
+++ b/mate-base/mate-applets-meta/mate-applets-meta-1.22.0.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	inherit eapi7-ver
 	MATE_BRANCH="$(ver_cut 1-2)"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 DESCRIPTION="Meta package for MATE panel applets"
diff --git a/mate-base/mate-applets/Manifest b/mate-base/mate-applets/Manifest
index 68bcd28f5912..600554b6b10e 100644
--- a/mate-base/mate-applets/Manifest
+++ b/mate-base/mate-applets/Manifest
@@ -1,7 +1,4 @@
-AUX mate-applets-1.16.0-cpupower-4.7.patch 1142 BLAKE2B 1222947dd918825d3905aa4c7e95e7c13115ac1aec0d0881b3fcca2f68947ed23a6decebbb0ec94010308ea943696c5d05ceda90803fe14c1bf7b151880e544a SHA512 7845655d2215e91286b19891cb8e6f018b8b11bebcb876d97b5c0a0232063cd030ef14754871f14e09f3e82d714f33d844d41f09f1168a088ac4d83cde527789
 AUX mate-applets-1.22.0-cpupower.patch 1349 BLAKE2B 745b7c02a17a21d05494c25b4ffbb3451d94dadeda4c12b3ff7c5e889a8c8c311ac033344b6deffeab575ebe7e6b645f7c789f65ac5d5d57d033d05ea13cdc24 SHA512 214bdb8c711a7b1bef0f16bf2c2464578d46fa640ce5dcace6dbd74c08df5cb8276875ac6e7e7d4347125551c236c4813002798a3f478af2baaa94cea10df44a
-DIST mate-applets-1.18.2.tar.xz 7163260 BLAKE2B 58d057d1eded3ef26f33e133f86459a75df2903906f27df555640aaf51ca381e8f57b0b4fe6ed7b2d679e08d2a595fc85a6b0d9c4ad51d3ac01552e2875e00bb SHA512 6644a7dfde1dbf65c38cd3a0f52f862e096030f0b9f324f1fbfc34b6167c04b51071f01c322c3c8382e74843332c877b1340fe2129417d6cf9207c32ef2f70be
 DIST mate-applets-1.22.0.tar.xz 7739668 BLAKE2B dc3768d2f5eb987907f1ffb1a049dff990140c66c51427dc9095298be92b17b2b1e9695f3c35dae73433e1e50d05477e94aad1697b2bf15706515c16150096d7 SHA512 2f3e17414171ec5ab6967b76b1291d99783c3091b51127788f99148f46d5f2068edf7d890c3ebca1a59c29cbda4a06be11c852e5e88d4dc58e9981d906c9e34c
-EBUILD mate-applets-1.18.2.ebuild 2121 BLAKE2B 1ba438665d25d5fdf1cc90efb5a9bacf56069e7029fab8c07fd905868d35aa44b38c7def22ff2e9b6509b5ceabee68ef20a04fb31954ade6199525b5a5b95ab4 SHA512 d43072a084396b0a315d42c3c8069918967a5d78831d817be71ee4c512827fb9a4126fe147c7aaa4db8527a4a61a297f6130ff1cd12a9365ef82f04eecb06a2b
-EBUILD mate-applets-1.22.0.ebuild 1936 BLAKE2B e5f35b5e65ae1bbf0b31f1b1bd3809082c753a0d70350d03568716e0d3258df5c780272e4f2f95bb6579721dc12c65d8d3d02521ff4c4c8bc457d2a1b1bb2d25 SHA512 1c31c6d5561b46a5feb4e148e0943f1371d6b32ce0b439082661f4a4f061e5102a9c9b9674fb7d7a24eac4aba92ded19b4cb7c5dd0cbdd15181bd18e0974cb10
+EBUILD mate-applets-1.22.0.ebuild 1934 BLAKE2B 3799e17486bdf4129733260dc487d4726fe57c567f9b2dc7316b1c5e5838410311d172fa0a3d643728e167dd74d81c02d8deebd704d9cc6516acc3a86504a1a3 SHA512 4f1eb5ab368e46ea0d5f0ec3bf395b5cd19f7c42a0a4b80e1e0a7a41d116957757bb48d7cca305df10c413c4b2023e4328c4f52cfa4e75f31445fb5a62cec099
 MISC metadata.xml 341 BLAKE2B 5013e079fa6d6c8dca84a8798ce1e360942b8284816842662f0a783895575cc4df2e992d67862928d436b188f87fb29e21b5299b455a838849dac4ecf2588ef1 SHA512 20bc118f3d597db418636c77744f83f398c25ce2dc783bc61f81fda1c0520b3ca9b18ee5f4bed149fecc70436bc3d2a79ac311559e7d1ee085322eac5963e7c9
diff --git a/mate-base/mate-applets/files/mate-applets-1.16.0-cpupower-4.7.patch b/mate-base/mate-applets/files/mate-applets-1.16.0-cpupower-4.7.patch
deleted file mode 100644
index 3f4f4fa519f1..000000000000
--- a/mate-base/mate-applets/files/mate-applets-1.16.0-cpupower-4.7.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index b49d127..6b87389 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -411,6 +411,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"
- 
-@@ -111,7 +115,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.18.2.ebuild b/mate-base/mate-applets/mate-applets-1.18.2.ebuild
deleted file mode 100644
index fff5a4222fc3..000000000000
--- a/mate-base/mate-applets/mate-applets-1.18.2.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit mate python-single-r1
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-DESCRIPTION="Applets for the MATE Desktop and Panel"
-LICENSE="GPL-2 FDL-1.1 LGPL-2"
-SLOT="0"
-
-IUSE="X ipv6 policykit +upower"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	dev-libs/atk:0
-	>=dev-libs/dbus-glib-0.74:0
-	>=dev-libs/glib-2.36: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:0
-	sys-power/cpupower
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.14:3
-	x11-libs/gtksourceview:3.0
-	>=x11-libs/libnotify-0.7:0
-	x11-libs/libX11:0
-	>=x11-libs/libwnck-3.0:3
-	x11-libs/pango:0
-	virtual/libintl:0
-	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:0
-	>=app-text/scrollkeeper-dtd-1:1.0
-	app-text/yelp-tools:0
-	>=dev-util/intltool-0.50.1:*
-	dev-libs/libxslt:0
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-PATCHES=( "${FILESDIR}/${PN}-1.16.0-cpupower-4.7.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() {
-	python_fix_shebang invest-applet
-	mate_src_install
-
-	local APPLETS="accessx-status battstat charpick command cpufreq drivemount
-			geyes invest-applet 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.0.ebuild b/mate-base/mate-applets/mate-applets-1.22.0.ebuild
index 1a1b62dec8c9..79f7b2082756 100644
--- a/mate-base/mate-applets/mate-applets-1.22.0.ebuild
+++ b/mate-base/mate-applets/mate-applets-1.22.0.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 3191346db157..d3c2868a5d8d 100644
--- a/mate-base/mate-common/Manifest
+++ b/mate-base/mate-common/Manifest
@@ -1,5 +1,3 @@
-DIST mate-common-1.18.0.tar.xz 72608 BLAKE2B 7a280f440de8964ac725582f545c7ae15152c0fef21897dcacb820d539f74fb3aec1d87e9c75e98bc6053bf3db6a69daf2eca3cf2de0cbc8a32d65a62c43187e SHA512 cdc8d39a78ebb1a0fb0d8179814ce59691006a21cb10d78b818cf62a8f42c89d01c9126e93b5fa3b7ac27adce52d3a2512ac2fb63c41e6c5a698a767e9176563
 DIST mate-common-1.22.0.tar.xz 73448 BLAKE2B 7796423fd70732c063759e509c13a62fdc5c68e07768776b25ecbec7d06ca8bc68fad947287306ede99f5993a8def3b5f25a4560d3fa7677083a28c64d2c4288 SHA512 3887634081c126c6c23f560ca256ae83edbc5f77f0fc0128c2aaa2b5652672ec6f21ca29b0b44802b03c5dfd53bf0da860093ec73c46fba58f7be12a1db1d2a3
-EBUILD mate-common-1.18.0.ebuild 531 BLAKE2B e7a9eb671fee1c0d0bec46e3b6b240fb9709da0675120b4d7ddb6bb3b8294c7af27042cee3870cb9343903963e9455d777a7b290a55f7e01eedde4df9b906290 SHA512 4e58fc07a4f8043c34609b2ee9b5b03e08f90ad464e1e830595aa6705b7d274c20c0cfba6b456f3bf7bcd58a7e8fda3f7c46070b94c6e1872ce7d56c7c11ea8e
-EBUILD mate-common-1.22.0.ebuild 530 BLAKE2B 3f7366c25f281e2a1f9d081a06f56a5e8d2897d286d683a4259ef980db0997da0ac354b3966a8e7b1903f868df75c1dd4802ee35e72484326ab1c0eee4dfd2f6 SHA512 6330b572818f89992de84aef12349a6a92bf05d1b21c4c20f222486e114e0a9e7a0e8e56280574680b3fb214710ecbcc5750a3a53ec4486ff26230531d2ae696
+EBUILD mate-common-1.22.0.ebuild 528 BLAKE2B b9072008bf44830c139c90d8bd5f9ec14c386544e10a8943e7248fd2270a76bad326747919f6ba74de9d35957c260d5ff5c6ca3b59dc1b9c3d0a89f0e10ef685 SHA512 d444a47ee4f1881d7c3446c142e43ae62c21963f01e841b8bc8c65000829bc22d73538a47d9fb2d24981a36b5238a93892b11877296699b1ab28ef1d307fd4b5
 MISC metadata.xml 340 BLAKE2B df96462b37467cd5298fc394d73cfce122d7aea210e48a678d4c32d5c2b6a792cdfaf1c39e6968b33d6c3b9aecacd95fdbb4478cc98a58b6c0527c6708e404ef SHA512 06a836307e50d0ecf5e85516865436cddffaa2d69492c295bad163f3511ded0b7254b541fa73b8b5f314c1574c755f595c1a5af5f55c87f2c96aaf06fffc6262
diff --git a/mate-base/mate-common/mate-common-1.18.0.ebuild b/mate-base/mate-common/mate-common-1.18.0.ebuild
deleted file mode 100644
index e04018d3f05a..000000000000
--- a/mate-base/mate-common/mate-common-1.18.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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.0.ebuild b/mate-base/mate-common/mate-common-1.22.0.ebuild
index 9692272ccbe5..212f79eb6cf8 100644
--- a/mate-base/mate-common/mate-common-1.22.0.ebuild
+++ b/mate-base/mate-common/mate-common-1.22.0.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 54f5f98fb6aa..96998b8cbc3a 100644
--- a/mate-base/mate-control-center/Manifest
+++ b/mate-base/mate-control-center/Manifest
@@ -1,5 +1,3 @@
-DIST mate-control-center-1.18.2.tar.xz 1351644 BLAKE2B 30c093b11f3cbf32e3590368001d8d929b8f611c4efd58f6332a70905ef028b8e573e41cbb20b5342ad2b0f459327d9665c4db77104bf49b2b8be4935adc232c SHA512 0acc6d775aa26dd0265ddab80317b2ddd2f027394b55574e29e6ad233b8711bc0984803f76f2cbaeed2bfd2b4397cd5143d5540908f5078080a1749290dac7ab
 DIST mate-control-center-1.22.0.tar.xz 1524084 BLAKE2B e0d7beb9fb358d6e60d6847fb6ee9e295793f856d25b0acf865efc360eefd446fa3f5a22d51121cd0fe675e01509b2612602587d4583b8835ec8e7157b795923 SHA512 3b2b88458848862a4c819d54104e9394817b29feb3d05117fe69441023ec5e6c922012395f24b5f70c9f9dbf6f8044f769840ec9996b1495441c4cb690f68371
-EBUILD mate-control-center-1.18.2.ebuild 1531 BLAKE2B 499ba1ad00d4be96d3875d6fcd80176ec3e9bcbd9ca7d6775ae83604ed8783a86a135833536811e96fe16f3fb55579986f4e7fef4e4b718f2a36e685fb3cc914 SHA512 cc6ef7367c9b00a8aabfa60581ab1f129ab59a83a417fb434506922a5d95c52269418a6a2c1953794c66f8d9507faa26197cb0632a0dd84be12b148f0f87e13a
-EBUILD mate-control-center-1.22.0.ebuild 1488 BLAKE2B 0cb11f9446d3a3802f95b080613ad154f309c5bf6ac2175350040f539dd20843e9b38475fc55c3f81b954bc87a5b705f32da50bfa2eef9ee92b6dfcc0918bf73 SHA512 49a04279739e44f49f084cbd054793d7e23c164a6161058c88baa5cc7361a985d7299060cef3172fc34c962fdf4e81cbcc4b8feb70a2ef6d9162c2bd2f71eb8e
+EBUILD mate-control-center-1.22.0.ebuild 1463 BLAKE2B 69431837de846c6d0263a6856fed99c47acc6984b7089105dcf1d2c168033f5011b25891d685278f4469c21666c26f89e8cb7dfe306cb1266a11ea7cb9313238 SHA512 ac923228e8044223ddd5c07d81b561d98fa8c5b89cf0309393a8f969362ffe366671fd8aad57eb5d28c795afafdea3e0e06472f688ea43605d11c619652650f1
 MISC metadata.xml 427 BLAKE2B 3173ace743875b3fc77146513bea979bb88cfb6fd77845c1a4fdf733d19a32350caa6036b0db1d7c0ea7c9374fa3a862c22b60d99b134bae5827939fff1ba00a SHA512 ce23384af4d89040b75cc52a42890d6a61c2eafaf214a3ccc2137534371bcb7189c2948053b8a76de4cf9653ee422833d2d23a5ec740c9cdabdd95c4083771b3
diff --git a/mate-base/mate-control-center/mate-control-center-1.18.2.ebuild b/mate-base/mate-control-center/mate-control-center-1.18.2.ebuild
deleted file mode 100644
index a16f1929ab70..000000000000
--- a/mate-base/mate-control-center/mate-control-center-1.18.2.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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="GPL-2"
-SLOT="0"
-
-IUSE="appindicator debug"
-
-COMMON_DEPEND="
-	dev-libs/atk:0
-	>=dev-libs/dbus-glib-0.73:0
-	>=dev-libs/glib-2.36:2
-	dev-libs/libxml2:2
-	>=gnome-base/dconf-0.13.4:0
-	>=gnome-base/librsvg-2.0:2
-	>=mate-base/libmatekbd-1.17.0
-	>=mate-base/mate-desktop-1.17.0
-	>=mate-base/caja-1.17.0
-	>=mate-base/mate-menus-1.1.0
-	>=mate-base/mate-settings-daemon-1.17.0
-	>=media-libs/fontconfig-1:1.0
-	media-libs/freetype:2
-	media-libs/libcanberra:0[gtk3]
-	>=sys-apps/dbus-1:0
-	x11-apps/xmodmap:0
-	x11-libs/cairo:0
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.14:3
-	x11-libs/libX11:0
-	x11-libs/libXScrnSaver:0
-	x11-libs/libXcursor:0
-	x11-libs/libXext:0
-	>=x11-libs/libXi-1.5:0
-	x11-libs/libXrandr:0
-	x11-libs/libXrender:0
-	x11-libs/libXxf86misc:0
-	>=x11-libs/libxklavier-4:0
-	x11-libs/pango:0
-	>=x11-wm/marco-1.17.0
-	virtual/libintl:0
-	appindicator? ( dev-libs/libappindicator:3 )"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/rarian:0
-	>=app-text/scrollkeeper-dtd-1:1.0
-	app-text/yelp-tools:0
-	dev-util/desktop-file-utils:0
-	>=dev-util/intltool-0.50.1:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*
-	x11-base/xorg-proto"
-
-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.0.ebuild b/mate-base/mate-control-center/mate-control-center-1.22.0.ebuild
index d631f5548d9d..dca36e43fd8f 100644
--- a/mate-base/mate-control-center/mate-control-center-1.22.0.ebuild
+++ b/mate-base/mate-control-center/mate-control-center-1.22.0.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"
@@ -17,7 +17,7 @@ SLOT="0"
 
 IUSE="appindicator debug"
 
-COMMON_DEPEND="
+RDEPEND="
 	dev-libs/atk
 	>=dev-libs/dbus-glib-0.73
 	>=dev-libs/glib-2.50:2
@@ -51,17 +51,16 @@ COMMON_DEPEND="
 	virtual/libintl
 	appindicator? ( dev-libs/libappindicator:3 )"
 
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
+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:*
+	sys-devel/gettext
 	x11-base/xorg-proto
-	virtual/pkgconfig:*"
+	virtual/pkgconfig"
 
 src_configure() {
 	mate_src_configure \
diff --git a/mate-base/mate-desktop/Manifest b/mate-base/mate-desktop/Manifest
index a108671779bc..89bf79317db6 100644
--- a/mate-base/mate-desktop/Manifest
+++ b/mate-base/mate-desktop/Manifest
@@ -1,5 +1,3 @@
-DIST mate-desktop-1.18.0.tar.xz 827332 BLAKE2B e5a0439c768a388a76f1bd2a7ba819d92fd020565d63d4b412c5edac54c28493e83d9fa9c5b9f7c82dd5d76338f257e7cb8db7318d7743f6101098f20d47db5c SHA512 0490e9810009923fa315e7f191103bc797c37f4417cf41bf317c55d26f7b52a848a65c28dde6903a861694c131ca52f3ed0be05cbbf6b2dd1cb216539f513220
 DIST mate-desktop-1.22.0.tar.xz 962580 BLAKE2B 0bc3418ab25fd9f30e216a5b845722327449f8d05944c028b4cb967acd6415ca9c3c560856485f34e90752c9a3263ba093e1eb69daaea2586c6371ad4c4ee22f SHA512 3950249c0bc026163da7f38a6fd5551c0e1e863e298e9d2ca224679b6c802d1deaf12e16ea873a2ea0539a7989a523d0495fb0dc4c556857203c0b04ab6edf7a
-EBUILD mate-desktop-1.18.0.ebuild 1099 BLAKE2B 4860142639df89d4b26afdd0345fb3ca15e731a8374d4afb44ffccc6e9a05a63bf170adce37a48cd7bad8a8020d39e37512b8e68e3d3fe910c67d4dc5a663ead SHA512 4e9d1a5d683ac97ae580bf1a0cd2fa7413b8ee6b074a0882e9c71e3fa4040d1af9585484663c193fd13e8e1d2414551c54eb09c9e65b3d550ebd3eb83af8afa7
-EBUILD mate-desktop-1.22.0.ebuild 1109 BLAKE2B 9803611be67f0adb1d3123514e36d593c098192ef8b5b35c56775e0b89797d07a6fc67ad107bd7c9a693fcbb3f6713f751538495cecd541a2de6fd19983650d0 SHA512 959a46cb55ef14ddabe7f6f780cbb88a343d8a2dbdc45cf46bba17a9428e27e35d1155fff86f6803df8900025bf9b8903fa75f037dc9cf81e15ffd35a4c8ca3f
+EBUILD mate-desktop-1.22.0.ebuild 1107 BLAKE2B b23dc26ec18e9f1d17d44e986ea56126ecf3e663e6dcc89ef1d2793ea2e2c76c2ad33313e6731d3f22e61177e4f5d95576f250dc808cbf1f77bd3e4f9c3dc846 SHA512 e0196b3c07cfc2d9200ba64e8942f309cb9b2ca8bb4ce0fe6b5721cc6c68d24d4a64870368a1f3c6a7d48f39fedaa06161be350b96a1375ac1f4161f08eabf94
 MISC metadata.xml 341 BLAKE2B d5ca73000fca7b5092f767fc927d65f32ab507a08f2d8c6f1a48d1a70ed25653467f75de3b556543512b3d7d9cc4b1704166eea72bd3ca708ad0b40e216e534a SHA512 7d54ddfb1e11f270908131ea9e1287efb589d0015305576d05bb2d57c74ec3778c004fa4a1533140026eeb4774c8b50f79045564877c9c2e06e4e446e101e08b
diff --git a/mate-base/mate-desktop/mate-desktop-1.18.0.ebuild b/mate-base/mate-desktop/mate-desktop-1.18.0.ebuild
deleted file mode 100644
index 1583d2db932b..000000000000
--- a/mate-base/mate-desktop/mate-desktop-1.18.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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"
-SLOT="0"
-
-IUSE="X debug +introspection startup-notification"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.36:2
-	>=gnome-base/dconf-0.13.4:0
-	x11-libs/cairo:0
-	x11-libs/libX11:0
-	>=x11-libs/libXrandr-1.3:0
-	virtual/libintl:0
-	>=x11-libs/gtk+-3.0: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
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.40:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*
-	x11-base/xorg-proto"
-
-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.0.ebuild b/mate-base/mate-desktop/mate-desktop-1.22.0.ebuild
index 5046efd1706f..5bb00164ee03 100644
--- a/mate-base/mate-desktop/mate-desktop-1.22.0.ebuild
+++ b/mate-base/mate-desktop/mate-desktop-1.22.0.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 551c8d9d71b8..c5733580dfea 100644
--- a/mate-base/mate-menus/Manifest
+++ b/mate-base/mate-menus/Manifest
@@ -1,6 +1,4 @@
 AUX 10-xdg-menu-mate 113 BLAKE2B e49a76bdbbe1b08782ccd216afbc40bc49b4b16cb399c29e7a6860154cbd0d6d2712f85bd2edef53e9f53a4d92d29ec9524916f123d44e930a81cca3e60a3cb6 SHA512 8d4c30c79ecca4d1ff4dad7e7946f9e967ac33cf54dcccb1e1325bff298ffef6306bcf5865071e388e3a17ba77bc79896246a4b44b42c72c20ed13c4677fb8ef
-DIST mate-menus-1.18.1.tar.xz 359768 BLAKE2B c57095e772610c56a02a5b6b1405c5ccc11cb590ea959efa14bd0ffb5cafbe3a678f8a681e39ae9cf607225f57becfc520ec483e6451f07b7f9e80418496502b SHA512 bfd010735acd3447700a4732da16728d429ca8ba559c6bfc6edfdaea52f4e40552882bb09615fc4f040730bffac7614bb74fe18aee3ab8ee1684dad40a82d572
 DIST mate-menus-1.22.0.tar.xz 355948 BLAKE2B f65bd45c4c7c04f11f9228499991d7c2dfa60a3e74e4cbfcffc3a02f09e8e6cad6b4b4adb6d9227a4e893bad9dc032afc6cce8098ea62fd133ef836cbe9abdf2 SHA512 7ca02c1bb89c83b6b331fc2e8878862fa8f02f5cd52b297aa44b36dd5c2d1ee1ffeb1641d63a10bd4deb99f63ded9c3b890a05ab7f7faf32d7f895b0a2f68d70
-EBUILD mate-menus-1.18.1.ebuild 1662 BLAKE2B 769dee26a473f7ac70de68ea19596f888c2552f92be6a1e590caa70e352657b17f89882d5a86389141fbfc07377bf188b09325eccc70c3942e6d5f326d5da7ec SHA512 a34b7ef40a6bef926514bdfebdff1ac3a269aae1c02372c72f95e847cb1ecd5254d841c5795b8b95f912a4b566635fa2330d8115340b8ce8188939e884e442c7
-EBUILD mate-menus-1.22.0.ebuild 1243 BLAKE2B edaaef29997a53690ed0609f5c71472e713c9215b706b86736f3ad5a63ec82f3dd7c7f5f5eba746dc306e821834000c070031291accbbf406e6c6533db2077a7 SHA512 feb748cafb32af050ed2c3240586e2f78af8180cd8f307be97de1f8fa80dce074f964d15969a457cf001990b74dc74efc0cae9e7d1c01f4472a235c47629c758
+EBUILD mate-menus-1.22.0.ebuild 1241 BLAKE2B 528075625e963e20aa0ba14add0d55a10868509c1a464c281816c9972dea125fd1b2ea312d92fc90c129cc7261ec0ed85648a7c56e50a6a6154bf4ee7aed332b SHA512 edcbb1c98c76ab1d614e08be3054a8bbb1126856c29e437136498548d63315a7030db225774bd46ba9f4e5289df4df3df269a9dbd1389c1049ea30e81639274f
 MISC metadata.xml 339 BLAKE2B 0aa628f37ca885f294c05a4f97ecea8b57a588e02997ef0ab33485ada19abbae35e2c1ed5ed9f18c2b9143d9f0e4cf76ec2adbfec74a96062b5ddee0fb337dfc SHA512 39239eed6c1808d1b279a5924b2c66dfd38a4548b182b79e2a2f9c00f64a799c4e99d510b30a2ca179a918218e4e49b021e7cb3386c30c86b776a36f3800b03c
diff --git a/mate-base/mate-menus/mate-menus-1.18.1.ebuild b/mate-base/mate-menus/mate-menus-1.18.1.ebuild
deleted file mode 100644
index e549475bddf7..000000000000
--- a/mate-base/mate-menus/mate-menus-1.18.1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-r1 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"
-SLOT="0"
-
-IUSE="debug +introspection python"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-COMMON_DEPEND=">=dev-libs/glib-2.36.0:2
-	virtual/libintl:0
-	introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
-	python? (
-		dev-python/pygtk:2[${PYTHON_USEDEP}]
-		${PYTHON_DEPS}
-	)"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.40:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-src_prepare() {
-	mate_src_prepare
-	use python && python_copy_sources
-}
-
-src_configure() {
-	# Do NOT compile with --disable-debug/--enable-debug=no as it disables API
-	# usage checks.
-	mate_py_cond_func_wrap mate_src_configure \
-		--enable-debug=$(usex debug yes minimum) \
-		$(use_enable python) \
-		$(use_enable introspection)
-}
-
-src_compile() {
-	mate_py_cond_func_wrap default
-}
-
-src_test() {
-	mate_py_cond_func_wrap emake check
-}
-
-src_install() {
-	mate_py_cond_func_wrap 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.0.ebuild b/mate-base/mate-menus/mate-menus-1.22.0.ebuild
index 02319461b199..c7d1f30030ec 100644
--- a/mate-base/mate-menus/mate-menus-1.22.0.ebuild
+++ b/mate-base/mate-menus/mate-menus-1.22.0.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 176cbf11c5e7..bee1960dc07f 100644
--- a/mate-base/mate-panel/Manifest
+++ b/mate-base/mate-panel/Manifest
@@ -1,5 +1,3 @@
-DIST mate-panel-1.18.7.tar.xz 1943216 BLAKE2B c811a299d612e11827f6531f3093addfeeb5a8f18449f76dba0f70233f072bd2666bb4cd8b39111da298fbdd966f5b7f21b37ce3fe4870129da0563faabc5a2f SHA512 6de91f16f5ade7873d2baf3d813bd77304723f27629474fdf37aa9c590b5fcb31452f5b117b52926dd53a38e9f8edd964c654fd29c8271131c6901eec46b5a31
 DIST mate-panel-1.22.0.tar.xz 2251040 BLAKE2B 6a4da6080cec2fc7858c711fa0a2c7497f4d03a1e22394f481925be32b17f7905920d4155ca75b9bf0d6bbf4af078aac77abc99e6d5a22e84bf453e2290ba032 SHA512 078c6dcdc17970a7a7fab9a218eaf2c8cd6c4074c0c23ff4ce7ccf57e007d0afcbe797be4ad4c9d2c16d9033cc554cc5a979ec61dc721514db939a5e60de456b
-EBUILD mate-panel-1.18.7.ebuild 1399 BLAKE2B d73452975ad5ccd4d0cb71b58b0a126fd137fea684af580bbab2c6aeeb869a382112bac1cf56d48c6f104ad80f53feac775f4913d9a81485e664f8c3d307e251 SHA512 3fccd420eab25eaa587c3ce124747c0bc742146d0058602c600fb4d5b7a7ba840cb98c64f4711bf6398d8de514b82c44a42dbb43fefabfd53dcdb7a26c9ae6f9
-EBUILD mate-panel-1.22.0.ebuild 1375 BLAKE2B a944020e27ea5b888cd4ff1f05f9dcf6420833fc728a04cba65f3c56d2c3526d6aead2a7c4e932d60793454db29c28cf65ee41a9948092f98fce745cac4a7f20 SHA512 69786a0c3574c8c69a5716ae7ffff2ec1b6e99c822f0104a52b91d3efcf4a781d2c46f20e633aab178829cc64bc84e1db8409ee2926b6162b5b0e9e8e758392d
+EBUILD mate-panel-1.22.0.ebuild 1350 BLAKE2B 4ce80bd99af1ec21b05dc2368be45a26a3c3b92fa2142cb1a8d6626e7fae4c7e373b31eb8f7ed2f3820a230ce954cc167c37aad00b8bd39b43f08a6113a45fc3 SHA512 07be1580b09cbe9e8b4d92d5972a68e67738efd67278f009598ec5b122ddbc8a1d34962193fe4d78534586c5443a0371774904882431dd60e6387a97edcb2d39
 MISC metadata.xml 339 BLAKE2B d4e26fe24b5076b1a78c8de45bab802a438bd5fc171da7a6da6dc2460a7cb53677d4044abefc6c925a1b56d60d1a20fcb2334121ac0750d8347dc8ca3497b9c7 SHA512 788f53b6c90c485f6c8e4de2a9d1fd8f895b7c57cb7beeb0ec295a4710ceac5c8537ec9b3b567fbb5fae95cc08ce8892649a4198d40f30363b98f01267d67d26
diff --git a/mate-base/mate-panel/mate-panel-1.18.7.ebuild b/mate-base/mate-panel/mate-panel-1.18.7.ebuild
deleted file mode 100644
index 40616e1e1392..000000000000
--- a/mate-base/mate-panel/mate-panel-1.18.7.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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="GPL-2 FDL-1.1 LGPL-2"
-SLOT="0"
-
-IUSE="X +introspection"
-
-COMMON_DEPEND="
-	dev-libs/atk:0
-	>=dev-libs/dbus-glib-0.80:0
-	>=dev-libs/glib-2.36:2
-	>=dev-libs/libmateweather-1.17.0
-	dev-libs/libxml2:2
-	>=gnome-base/dconf-0.13.4:0
-	>=gnome-base/librsvg-2.36.2:2
-	>=mate-base/mate-desktop-1.17.0
-	>=mate-base/mate-menus-1.10.0
-	>=sys-apps/dbus-1.1.2:0
-	>=x11-libs/cairo-1:0
-	>=x11-libs/gdk-pixbuf-2.7.1:2
-	>=x11-libs/gtk+-3.20:3[introspection?]
-	x11-libs/libICE:0
-	x11-libs/libSM:0
-	>=x11-libs/libwnck-3.0:3[introspection?]
-	x11-libs/libX11:0
-	>=x11-libs/pango-1.15.4:0[introspection?]
-	x11-libs/libXau:0
-	>=x11-libs/libXrandr-1.3:0
-	virtual/libintl:0
-	introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/yelp-tools:0
-	>=dev-lang/perl-5:0=
-	dev-util/gdbus-codegen:0
-	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_with X x) \
-		$(use_enable introspection)
-}
diff --git a/mate-base/mate-panel/mate-panel-1.22.0.ebuild b/mate-base/mate-panel/mate-panel-1.22.0.ebuild
index b185c6daaa0f..f844c383f222 100644
--- a/mate-base/mate-panel/mate-panel-1.22.0.ebuild
+++ b/mate-base/mate-panel/mate-panel-1.22.0.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"
@@ -17,7 +17,7 @@ SLOT="0"
 
 IUSE="X +introspection"
 
-COMMON_DEPEND="
+RDEPEND="
 	dev-libs/atk
 	>=dev-libs/dbus-glib-0.80:0
 	>=dev-libs/glib-2.50:2
@@ -26,7 +26,7 @@ COMMON_DEPEND="
 	>=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.10.0
+	>=mate-base/mate-menus-1.21.0
 	>=sys-apps/dbus-1.1.2
 	>=x11-libs/cairo-1
 	>=x11-libs/gdk-pixbuf-2.7.1:2
@@ -41,18 +41,17 @@ COMMON_DEPEND="
 	virtual/libintl
 	introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )"
 
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
+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:*"
+	sys-devel/gettext
+	virtual/pkgconfig"
 
 src_configure() {
 	mate_src_configure \
diff --git a/mate-base/mate-session-manager/Manifest b/mate-base/mate-session-manager/Manifest
index 220e5965eac3..dd59a1a76934 100644
--- a/mate-base/mate-session-manager/Manifest
+++ b/mate-base/mate-session-manager/Manifest
@@ -4,8 +4,6 @@ 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.18.2.tar.xz 570336 BLAKE2B d1fd8f6a037fa38833d4aae05dcc9ed98ff192c712819342a77d19fb00e09febaa90fd0396048a3cee64ea424c6a72e8ae90f067d61929ef524825c97d500f8e SHA512 e3d3e2524cd0d00930b5c6b81134b969555f00550d23a357d426a6f0d475884ce6ab16be365fd5e95801dd53c250069ad091dec6c93f2ab70818460fbef4765e
 DIST mate-session-manager-1.22.0.tar.xz 603016 BLAKE2B 5d7064756b7d7d2ca4fdebf18319dc8a8d8eca6ed31c5e8e37e503c7099a0d541186028d6b4e174bff1ce9ca727a374e9597498b2ca6d5494dc74f21fec0baeb SHA512 7e5e21e37c7ac55ca7d71302edef9aabeccf39233aec9edfe93a2fdcd4150d039e8121adecebb3d0a4a707eccef0c7afa1b54c5b52b57853242964c7506eeb9a
-EBUILD mate-session-manager-1.18.2-r1.ebuild 2050 BLAKE2B 9863863dcb955c561cd69f67c141608a73e7bfe70804efee79438f5271e342c80da8e2a45e00c25e66ad5092ed8ca944ef9afd8133232e80a181910b5a1fa945 SHA512 cf6cbac9c513aadafa94bbb995bf4ca2f91fde90a0b3f09daab720b3fd73b4fbb349336e8ab96663c3abc557d6eede12e49e37036545f492d67a9775cad5d31a
-EBUILD mate-session-manager-1.22.0.ebuild 2262 BLAKE2B 9a22af81b50bde176f0b7573209de64c11038ce9faab201e8548bb79acbc97176afe3fd49e2c2293f80a42f3e9cff4dc0423cd0c57b83a7d8f7165744e95646c SHA512 dd98ed6e03760881fb88d33df67c94bc47c6a7d93967deadbcb505b1fc96c7f947196f9a822e2243e85406192d8208dd96e503febab300752799c858a881b3ee
+EBUILD mate-session-manager-1.22.0.ebuild 2280 BLAKE2B ae5048819f2ce655cac39e0670b62b52a506575c1e0bccc7deafeb82881ffa1e36ad90ae567332ce24d61b31a19f1953442cca8228ab93fd3580ab5b8ff18c69 SHA512 ddf3a6d7769213a8a4e91a53f448a52c44c89e446ab2b25f5cbc28fbe3b019e7fd808bb67480885ca0a50b9b9d06df73526b1a781673b20dc388657f2eab88a0
 MISC metadata.xml 497 BLAKE2B 85510300fad0274831fbbb5dbedb00bd3e6347518e0188838f8dce213064db44612ca7e7fbbe922cc46924f02f2fda50120ecba21774231af6e3acea45fc9db4 SHA512 19f431c7d3a9912baaa3df85fd222be5b2649f46a723ffdc084524b172c6c387e4a9928b219d9e73217c7e6ef677f2e5e82473547489001fc20fee7529373568
diff --git a/mate-base/mate-session-manager/mate-session-manager-1.18.2-r1.ebuild b/mate-base/mate-session-manager/mate-session-manager-1.18.2-r1.ebuild
deleted file mode 100644
index 8945b342d69f..000000000000
--- a/mate-base/mate-session-manager/mate-session-manager-1.18.2-r1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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="http://mate-desktop.org/"
-
-LICENSE="GPL-2 LGPL-2 FDL-1.1"
-SLOT="0"
-
-IUSE="debug elibc_FreeBSD gnome-keyring ipv6 systemd +xtrans"
-
-# 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.36:2
-	dev-libs/libxslt
-	sys-apps/dbus
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.14: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? ( >=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 )"
-
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.40:*
-	>=dev-lang/perl-5
-	>=sys-devel/gettext-0.10.40:*
-	virtual/pkgconfig:*
-	!<gnome-base/gdm-2.20.4"
-
-MATE_FORCE_AUTORECONF=true
-
-src_configure() {
-	mate_src_configure \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		$(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.0.ebuild b/mate-base/mate-session-manager/mate-session-manager-1.22.0.ebuild
index 47d803f592f3..0550bb93150d 100644
--- 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
@@ -6,11 +6,11 @@ EAPI=6
 inherit mate
 
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 DESCRIPTION="MATE session manager"
-HOMEPAGE="http://mate-desktop.org/"
+HOMEPAGE="https://mate-desktop.org/"
 
 LICENSE="GPL-2 LGPL-2 FDL-1.1"
 SLOT="0"
@@ -22,7 +22,8 @@ REQUIRED_USE="?? ( elogind systemd )"
 # 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
+COMMON_DEPEND="
+	>=dev-libs/dbus-glib-0.76
 	>=dev-libs/glib-2.50:2
 	dev-libs/libxslt
 	sys-apps/dbus
@@ -49,14 +50,15 @@ RDEPEND="${COMMON_DEPEND}
 	x11-apps/xdpyinfo
 	x11-misc/xdg-user-dirs
 	x11-misc/xdg-user-dirs-gtk
-	gnome-keyring? ( gnome-base/gnome-keyring )"
+	gnome-keyring? ( gnome-base/gnome-keyring )
+	!<gnome-base/gdm-2.20.4"
 
 DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.40
 	>=dev-lang/perl-5
-	>=sys-devel/gettext-0.10.40:*
-	virtual/pkgconfig:*
-	!<gnome-base/gdm-2.20.4"
+	dev-util/glib-utils
+	>=dev-util/intltool-0.40
+	>=sys-devel/gettext-0.10.40
+	virtual/pkgconfig"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-fix-systemd-regression.patch
diff --git a/mate-base/mate-settings-daemon/Manifest b/mate-base/mate-settings-daemon/Manifest
index d8b91178f4b0..eadb6a2c6d39 100644
--- a/mate-base/mate-settings-daemon/Manifest
+++ b/mate-base/mate-settings-daemon/Manifest
@@ -1,5 +1,3 @@
-DIST mate-settings-daemon-1.18.2.tar.xz 787004 BLAKE2B 4549948a25016389c280e2df190febb9c1fda3a88ee9354ea72a01e4b8fe973bd0d85c1fd1b3533589dcb1b304893099e6e0171a9be9c64c72fef3608375d86d SHA512 2e07f7873d8f1e75391ae6ab7a132ce1f90a3afe661ca263fff9db1b68c0a02dc53255d6382c2d69861f997f22711d062e43468041a0b3476cdd3a051dec7039
 DIST mate-settings-daemon-1.22.0.tar.xz 810696 BLAKE2B 4b61441a96c3a5c59616f963b2356f418ccc81ca21ef1f3834a777f92779986afc114086ef16f42f69441031b24abb6e727a7326ae6209cb01545ae3359ca1da SHA512 e8fa2ba07195dd66a94312909be37abe67089c7a687afee3bfde5860a598e84481949c9cdc7408886f90776556b41d5574bd6efc0614ed7583908214d59c6cb5
-EBUILD mate-settings-daemon-1.18.2.ebuild 1584 BLAKE2B 96356dd2bafc6daaeec05f58215aaf7000755655b1b9f415322919c289a6268bbd8fd010f800300d2ba2ad9aeee51ae785c2671d237387032b0517cc8233900f SHA512 497272e21ebb9d4ab19e3c955eef5ad54224d2ad69a80c5b86f0c59a072d6448db1ec86d0973a70c6291c1c4ffe88045892599aa90ab21fae89d4bdd94c8dfbf
-EBUILD mate-settings-daemon-1.22.0.ebuild 1541 BLAKE2B 67016b7d07244245679bed1509f1bf73ae14f6b77a853270d77864b53fee1579133445a4fc0cd6a02ccaa7a9e19dbf194d4fd3a7ac647112f948a0b85a558281 SHA512 0f62a5dc96492d49aef192942a5c33c5fef7b6371beb8a1c46b33b3bf1a3dd7f5dbbf5472906f8bf8fadff0e2e55c84d269bb3ef607fe2e8d4f90cdfd30e032a
+EBUILD mate-settings-daemon-1.22.0.ebuild 1539 BLAKE2B baf90527306a3a0debc15c3cc4d3e6f4fcda344967c6bf2233e9de697f3e833ddea6c83380ae6344f23e06a01a2237405b9afd653f44bc58b89398eefffc3599 SHA512 40dfdb1d993b5b503245486351992c14ecd755a26e42b71aa1a92465d6cd49f8d55e889fd0a676a4751066f41298dfdbdb7f7362f1632d4f29114584e4f8650a
 MISC metadata.xml 349 BLAKE2B a6f74cac08d50c578b34f35764aaa46fe18c7b0003f19f3492c10fcf8cc3b1618fbb02c460de0d5cc7480e65a39a1e2ddb1029820f304f4b778e42af7589d801 SHA512 60b6cbc98f39edcf1716313dce83ee951c361f4cabf89232f8c0b8f482eb98bc262bdb748e5650d4fed4d7cbf084f02bbd534bb72dbab246abe95ba274f09abc
diff --git a/mate-base/mate-settings-daemon/mate-settings-daemon-1.18.2.ebuild b/mate-base/mate-settings-daemon/mate-settings-daemon-1.18.2.ebuild
deleted file mode 100644
index f61f1f6e488f..000000000000
--- a/mate-base/mate-settings-daemon/mate-settings-daemon-1.18.2.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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 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:0
-	>=dev-libs/glib-2.17.3:2
-	>=gnome-base/dconf-0.13.4:0
-	>=mate-base/libmatekbd-1.17.0
-	>=mate-base/mate-desktop-1.17.0
-	media-libs/fontconfig:1.0
-	x11-libs/cairo:0
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.14:3
-	x11-libs/libX11:0
-	x11-libs/libXi:0
-	x11-libs/libXext:0
-	x11-libs/libXxf86misc:0
-	>=x11-libs/libxklavier-5.2:0
-	virtual/libintl:0
-	libnotify? ( >=x11-libs/libnotify-0.7:0 )
-	policykit? (
-		>=dev-libs/dbus-glib-0.71:0
-		>=sys-apps/dbus-1.1.2:0
-		>=sys-auth/polkit-0.97:0
-	)
-	pulseaudio? (
-		>=media-libs/libmatemixer-1.10:0[pulseaudio]
-		>=media-sound/pulseaudio-0.9.15:0
-	)
-	smartcard? ( >=dev-libs/nss-3.11.2:0 )
-	sound? (
-		>=media-libs/libmatemixer-1.10:0
-		media-libs/libcanberra:0[gtk3]
-	)"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.50.1:0
-	sys-devel/gettext:0
-	virtual/pkgconfig:0
-	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.0.ebuild b/mate-base/mate-settings-daemon/mate-settings-daemon-1.22.0.ebuild
index 5be6e8518d22..ecb57972ef2c 100644
--- 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
@@ -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"
diff --git a/mate-base/mate/Manifest b/mate-base/mate/Manifest
index c44ae508eb5e..eb76e62e7c6c 100644
--- a/mate-base/mate/Manifest
+++ b/mate-base/mate/Manifest
@@ -1,3 +1,2 @@
-EBUILD mate-1.18.ebuild 2576 BLAKE2B cc156c65df6b3d72b2abb6cc0c49131d0eba04e3c9da771304aa04c51a41cce63f2deaf06393ad689cd3f6985b7c51f51d4fff3b1edd197a78a34d831b9cc8f8 SHA512 75841b52b473e25e4436099963000fab949cd89272d0f68fb664a5f155625b208a900c3463e1d524412dfe951639de597533733923b84aae3e40626011f47fba
-EBUILD mate-1.22.ebuild 2491 BLAKE2B e8dfe19753da5e4cda977c196020ccf6e54567cc82a63251e69cef7489c4a4842067f8cfe3c9e8e395f8c7419c2c1def52f5ef5ba55d51ce6e9b33f1edca7771 SHA512 7468d6f82cd813ba8366a54423d254d514f4c380ba777113070abdd6a3094c97a3d0ba4e3bee3daad1386b080bf6e3e41853a67216610b2cb7807981bc4f816c
+EBUILD mate-1.22.ebuild 2490 BLAKE2B abfd4c3d91446a8eaf4a7f197b59142625bca9fc2338e84848b6a77101969be369c6150fb9fca90561c3ee43f68c93be69a0fc15b7492b8c95ff8b3a276b7e07 SHA512 91af130aafd1f15cfef653647e00c64b15523773a6950d49d890cd361f017099a04da277d5e5097b6fb0d57ed62c557c63b7dd646d996dd52e2fb482f8081607
 MISC metadata.xml 1342 BLAKE2B da370118ca35235d9015c6fca17a4766067c1bb5393a68cbb84caa724ef970cb30925c6c5b4eb59fdc5d67eebf6c7031173de7bf868a61108cb5bb7354207d3e SHA512 cd369cf3b32404c16975cdda320043b27898838b2d5c3732bbe2a62f16332eab9f55a2c00e7f8bb1f98cc5cf7d00ec6fe40b74a106b7b72db5f252ec576aff85
diff --git a/mate-base/mate/mate-1.18.ebuild b/mate-base/mate/mate-1.18.ebuild
deleted file mode 100644
index 0a80191d8d5d..000000000000
--- a/mate-base/mate/mate-1.18.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} == 9999 ]]; then
-	MATE_BRANCH=9999
-	MATE_THEMES_V=9999
-else
-	inherit versionator
-	MATE_BRANCH="$(get_version_component_range 1-2)"
-	MATE_THEMES_V=3
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-SRC_URI=""
-DESCRIPTION="Meta ebuild for MATE, a traditional desktop environment"
-HOMEPAGE="http://mate-desktop.org"
-
-LICENSE="metapackage"
-
-SLOT="0"
-IUSE="+base -bluetooth help +notification +themes +extras"
-
-S="${WORKDIR}"
-
-RDEPEND="
-	=mate-base/mate-desktop-${MATE_BRANCH}*:0
-	=mate-base/mate-menus-${MATE_BRANCH}*:0
-	=mate-base/mate-panel-${MATE_BRANCH}*:0
-	=mate-base/mate-session-manager-${MATE_BRANCH}*:0
-	=mate-base/mate-settings-daemon-${MATE_BRANCH}*:0
-	=x11-wm/marco-${MATE_BRANCH}*:0
-	base? (
-		=mate-base/caja-${MATE_BRANCH}*:0
-		=mate-base/mate-applets-meta-${MATE_BRANCH}*:0
-		=mate-base/mate-control-center-${MATE_BRANCH}*:0
-		=mate-extra/mate-media-${MATE_BRANCH}*:0
-		=x11-misc/mozo-${MATE_BRANCH}*:0
-		=x11-terms/mate-terminal-${MATE_BRANCH}*:0
-	)
-	bluetooth? ( net-wireless/blueman:0 )
-	themes? (
-		=x11-themes/mate-backgrounds-${MATE_BRANCH}*:0
-		=x11-themes/mate-icon-theme-${MATE_BRANCH}*:0
-		>=x11-themes/mate-themes-meta-${MATE_THEMES_V}:0
-	)
-	extras? (
-		=app-arch/engrampa-${MATE_BRANCH}*:0
-		=app-editors/pluma-${MATE_BRANCH}*:0
-		=app-text/atril-${MATE_BRANCH}*:0
-		=mate-extra/caja-extensions-${MATE_BRANCH}*:0
-		=mate-extra/mate-calc-${MATE_BRANCH}*:0
-		=mate-extra/mate-netbook-${MATE_BRANCH}*:0
-		=mate-extra/mate-power-manager-${MATE_BRANCH}*:0
-		=mate-extra/mate-screensaver-${MATE_BRANCH}*:0
-		=mate-extra/mate-system-monitor-${MATE_BRANCH}*:0
-		=mate-extra/mate-utils-${MATE_BRANCH}*:0
-		=media-gfx/eom-${MATE_BRANCH}*:0
-		sys-apps/gnome-disk-utility:0
-	)
-	help? (
-		gnome-extra/yelp:0
-		=mate-extra/mate-user-guide-${MATE_BRANCH}*:0
-	)
-"
-
-PDEPEND="
-	notification? ( =x11-misc/mate-notification-daemon-${MATE_BRANCH}*:0 )
-	virtual/notification-daemon:0"
-
-pkg_postinst() {
-	elog "For installation, usage and troubleshooting details regarding MATE;"
-	elog "read more about it at Gentoo Wiki: https://wiki.gentoo.org/wiki/MATE"
-	elog ""
-	if ! has_version x11-misc/mate-notification-daemon; then
-		elog "If you experience any issues with notifications, please try using"
-		elog "x11-misc/mate-notification-daemon instead your currently installed daemon"
-		elog ""
-	fi
-	elog "Some packages that are not included in this meta-package but may be of interest:"
-	elog "		mate-extra/caja-dropbox"
-	elog "		mate-extra/mate-user-share"
-}
diff --git a/mate-base/mate/mate-1.22.ebuild b/mate-base/mate/mate-1.22.ebuild
index eb43ab877759..20802025cab1 100644
--- a/mate-base/mate/mate-1.22.ebuild
+++ b/mate-base/mate/mate-1.22.ebuild
@@ -10,12 +10,12 @@ else
 	inherit eapi7-ver
 	MATE_BRANCH="$(ver_cut 1-2)"
 	MATE_THEMES_V=3
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 SRC_URI=""
 DESCRIPTION="Meta ebuild for MATE, a traditional desktop environment"
-HOMEPAGE="http://mate-desktop.org"
+HOMEPAGE="https://mate-desktop.org"
 
 LICENSE="metapackage"