gentoo resync : 28.04.2019

45 files changed, 46 insertions, 931 deletions

diff --git a/mate-extra/Manifest.gz b/mate-extra/Manifest.gz
index 19445c235747..fdba75e77c70 100644
--- a/mate-extra/Manifest.gz
+++ b/mate-extra/Manifest.gz
diff --git a/mate-extra/caja-dropbox/Manifest b/mate-extra/caja-dropbox/Manifest
index c99ae634275d..90cac3715ca2 100644
--- a/mate-extra/caja-dropbox/Manifest
+++ b/mate-extra/caja-dropbox/Manifest
@@ -1,6 +1,3 @@
-AUX caja-dropbox-1.8.0-system-rst2man.patch 463 BLAKE2B 1a182d2374ecdff9b1e720071f4da9b37bc6a082aff3f7282c24dcfc5c04d66f338671d8da784ed34ca885070a09afcfdea94937aa69106e4291e15c3a3e889e SHA512 c3fcfd5b87f7801c77e8935f20d26c2a32ad60a03f068eb891e4bc491296ee1b19763634a02e387d7cf8b4192c30931a6dd9d9bf44f7ce3f8965db62a184c806
-DIST caja-dropbox-1.18.0.tar.xz 323116 BLAKE2B 1aafb5c15fea5935c7e89964ad4237fc2095a2c81921c14058d3472e4b51a4053327e175b144c17f2bdd0a3c106b32c436593b354db375689259501ec18b679b SHA512 0e240f8f6ef17ad3b6bbe21bede6d911b0ef89d8fd5a9faba6b96bc74f06472dcedf68caa94c6fbfb2c05c10c82e1f025b4022657cacc5b80d55ee41999be560
 DIST caja-dropbox-1.22.0.tar.xz 313492 BLAKE2B ce14fc1f466e8da9e5d13b576602a9815bdf32c88b5e55a03f0fe20d17845030b383151194340d20c658e99dda0eff1b51c633e6adf2a1c60f3fcaa69f9e54d9 SHA512 d21f44c0e0f7f28a963fb8611e6992b3ea58ba2ad5910e440d286ab447f2f91e4776496569eb271ed25cb2628e35d2bd80d12bf832bc76011241f6b09903a8b2
-EBUILD caja-dropbox-1.18.0.ebuild 2032 BLAKE2B c2909097067e16d044248a3ba916fe637ac37a7bd61db241ace065c71618af2aef6183c0cc2649d506cc826f8cb77e6dbde9f5da201320e83a8787cf74cdb291 SHA512 993142b1d96008ab8953b6245c5940e4acbc15375125a437467c7e45e4d13dae17107fb6ccbd5e67f9ab15d1bfb3154902b03d260ecf141290dcc23618917e17
-EBUILD caja-dropbox-1.22.0.ebuild 1997 BLAKE2B 3b8498690ac62f7ace41a51eacd146720b73164d8b22f4935839cf3482e271a4135d48515bc11af6a1e8392a9d21544c57cec80123498200a6638591b59c9c74 SHA512 ec6c18110d27844921d485669fc62927e74b47c752d2730a6e53e2b0ad6fbdfe56df1f942092077b7d435b5190c0a355d9ca1cbb97f0d7230d9f74c35650f498
+EBUILD caja-dropbox-1.22.0-r1.ebuild 1979 BLAKE2B f24e1780de82e2b460fb975e64d44e57d5ec991ea52ad9e89c4f41acc23fb28bfd337c83d7b68b4532dccc76accb45b41552783acc465128b6d33a3674bab220 SHA512 504927581945733b0f7940480a21596e5befe85ff720d5555b5cc41df7f419c010683b2ca9e45880b8300da067d197ee19ed7a4dcbc89e8f8619da5a67950c29
 MISC metadata.xml 341 BLAKE2B b530aa03ccd9e514d43bd1014500548a5931fcd30e288bdc9b6c56e9b4fa8dc42dd4a31074efe3b8ecb5f2f55aab3da8e7edd30fa5f3c1645cc088e594da7761 SHA512 3ef87b907e90f2093cece194a580099964f434ec7a1d43e961f0c00adeaeca085fc6e141f25f4ef7da0399e71093b4e2c12f52d0c29cd2aa3768354380ec1c37
diff --git a/mate-extra/caja-dropbox/caja-dropbox-1.18.0.ebuild b/mate-extra/caja-dropbox/caja-dropbox-1.18.0.ebuild
deleted file mode 100644
index 279018b76ca4..000000000000
--- a/mate-extra/caja-dropbox/caja-dropbox-1.18.0.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-MATE_LA_PUNT="yes"
-
-inherit mate python-single-r1 linux-info user
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 x86"
-fi
-
-DESCRIPTION="Store, Sync and Share Files Online"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="debug"
-
-COMMON_DEPEND="
-	dev-libs/atk:0
-	>=dev-libs/glib-2.36:2
-	dev-python/pygtk:2[${PYTHON_USEDEP}]
-	dev-python/pygobject:2[${PYTHON_USEDEP}]
-	>=mate-base/caja-1.17.1
-	media-libs/fontconfig:1.0
-	media-libs/freetype:2
-	x11-libs/cairo:0
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:2
-	x11-libs/libXinerama:0
-	x11-libs/pango:0"
-
-RDEPEND="${COMMON_DEPEND}
-	net-misc/dropbox:0"
-
-DEPEND="${COMMON_DEPEND}
-	dev-python/docutils:0
-	virtual/pkgconfig:*"
-
-CONFIG_CHECK="~INOTIFY_USER"
-
-pkg_setup () {
-	python-single-r1_pkg_setup
-	check_extra_config
-	enewgroup dropbox
-}
-
-MATE_FORCE_AUTORECONF=true
-
-src_prepare() {
-	# Use system dropbox.
-	sed -e "s|~/[.]dropbox-dist|/opt/dropbox|" \
-		-e 's|\(DROPBOXD_PATH = \).*|\1"/opt/dropbox/dropboxd"|' \
-			-i caja-dropbox.in || die
-
-	# Use system rst2man.
-	epatch "${FILESDIR}"/${PN}-1.8.0-system-rst2man.patch
-
-	mate_src_prepare
-}
-
-src_configure() {
-	mate_src_configure \
-		--disable-static \
-		$(use_enable debug)
-}
-
-src_install () {
-	python_fix_shebang caja-dropbox.in
-
-	mate_src_install
-
-	local extensiondir="$(pkg-config --variable=extensiondir libcaja-extension)"
-	[ -z ${extensiondir} ] && die "pkg-config unable to get caja extensions dir"
-
-	# Strip $EPREFIX from $extensiondir as fowners/fperms act on $ED not $D.
-	extensiondir="${extensiondir#${EPREFIX}}"
-	use prefix || fowners root:dropbox "${extensiondir}"/libcaja-dropbox.so
-	fperms o-rwx "${extensiondir}"/libcaja-dropbox.so
-}
-
-pkg_postinst () {
-	mate_pkg_postinst
-
-	elog
-	elog "Add any users who wish to have access to the dropbox caja"
-	elog "plugin to the group 'dropbox'. You need to setup a drobox account"
-	elog "before using this plugin. Visit ${HOMEPAGE} for more information."
-	elog
-}
diff --git a/mate-extra/caja-dropbox/caja-dropbox-1.22.0.ebuild b/mate-extra/caja-dropbox/caja-dropbox-1.22.0-r1.ebuild
index 7538fd886c35..2cfc55e854c4 100644
--- a/mate-extra/caja-dropbox/caja-dropbox-1.22.0.ebuild
+++ b/mate-extra/caja-dropbox/caja-dropbox-1.22.0-r1.ebuild
@@ -3,13 +3,13 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_{5,6,7} )
 MATE_LA_PUNT="yes"
 
 inherit mate python-single-r1 linux-info user
 
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 DESCRIPTION="Store, Sync and Share Files Online"
@@ -21,9 +21,8 @@ IUSE="debug"
 COMMON_DEPEND="
 	dev-libs/atk
 	>=dev-libs/glib-2.50:2
-	dev-python/pygtk:2[${PYTHON_USEDEP}]
-	dev-python/pygobject:2[${PYTHON_USEDEP}]
-	>=mate-base/caja-1.17.1
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	>=mate-base/caja-1.19.1
 	media-libs/fontconfig:1.0
 	media-libs/freetype:2
 	x11-libs/cairo
@@ -55,7 +54,7 @@ src_prepare() {
 		-e 's|\(DROPBOXD_PATH = \).*|\1"/opt/dropbox/dropboxd"|' \
 			-i caja-dropbox.in || die
 
-	sed  's|\(rst2man\)|\1.py|' configure.ac || die
+	sed -e 's|\[rst2man\]|\[rst2man\.py\]|' -i configure.ac || die
 
 	mate_src_prepare
 }
@@ -85,7 +84,7 @@ pkg_postinst () {
 
 	elog
 	elog "Add any users who wish to have access to the dropbox caja"
-	elog "plugin to the group 'dropbox'. You need to setup a drobox account"
+	elog "plugin to the group 'dropbox'. You need to setup a Dropbox account"
 	elog "before using this plugin. Visit ${HOMEPAGE} for more information."
 	elog
 }
diff --git a/mate-extra/caja-dropbox/files/caja-dropbox-1.8.0-system-rst2man.patch b/mate-extra/caja-dropbox/files/caja-dropbox-1.8.0-system-rst2man.patch
deleted file mode 100644
index 740418249d8d..000000000000
--- a/mate-extra/caja-dropbox/files/caja-dropbox-1.8.0-system-rst2man.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: nautilus-dropbox-0.7.0/configure.ac
-===================================================================
---- nautilus-dropbox-0.7.0.orig/configure.ac
-+++ nautilus-dropbox-0.7.0/configure.ac
-@@ -31,7 +31,7 @@ PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLI
- 
- AC_PATH_PROG([PYTHON], [python])
- 
--AC_PATH_PROG([RST2MAN], [rst2man], [python rst2man.py])
-+AC_PATH_PROG([RST2MAN], [rst2man.py], [python rst2man.py])
- AC_SUBST(RST2MAN)
- 
- # define module checking macro
diff --git a/mate-extra/caja-extensions/Manifest b/mate-extra/caja-extensions/Manifest
index f4465aab3125..f0049ed15bcb 100644
--- a/mate-extra/caja-extensions/Manifest
+++ b/mate-extra/caja-extensions/Manifest
@@ -1,5 +1,3 @@
-DIST caja-extensions-1.18.2.tar.xz 410704 BLAKE2B e13dde75bf616463f34d41df0b3be28d283383bd3ef56e24ce6cc0f319f0a7fea1b8dd75076582a78157c076de26f72235fe7b6f445f150547944a072b62038e SHA512 cbc3e6c02cdf93aa98e17232b9cdc9579355e2a31ea9421e6829eb2ba6fe50c7d6ba33b737f1286c9b0730a8781e8c060140ea47b216ef60b0bbaafabc9d836d
 DIST caja-extensions-1.22.0.tar.xz 444704 BLAKE2B d14f14e2ab18e9e6ea9c039d675e2948c309d470b1532e0585915f324bcf52a8e8425fdf0b6e725014e8813eefad77300172843c2118d098811b2b349d218fd1 SHA512 19fd287123b8d2ba67b636066e9f8910aadd47d375eb1d52136d9b808b48abacade81dde490ce3edb6fc4a9d2ddfd39d9abf294a58aed8bcaf620c1eff03e761
-EBUILD caja-extensions-1.18.2.ebuild 1785 BLAKE2B 8686ddc1483e1a1e4940552016046bc0d58f4649425e12ee700c04ed190921b26417cbeceb2e2e1b577157ceebae17db6f49347c73239966a587d66eeccf6a12 SHA512 5e5e9fcaae9e6b85f9eaad9f92abb6b00f160347a35ffa0c5967fcf50c6ef4b41e9631bc68f9de7cb4b90df572664a14db9f0c57535e73fae1e1def33e9abca1
-EBUILD caja-extensions-1.22.0.ebuild 1775 BLAKE2B 27a0cb508c48cb6d50484ca0f709b814de01500176081067a75ebbd8a87a0583dcf10a4c70539c63db23624f5b7acd81997c5282da63cc03082ba3493b253a11 SHA512 c8ec4f214f928e418ee0416ca39af1b5ee10349966f8259ddbf3a26027dc0789eae771107740568cbf3c232bc2d5b70923a3d7d60b901faf6c7e72197c8bb961
+EBUILD caja-extensions-1.22.0.ebuild 1773 BLAKE2B b4b020492afe71ca87446c069858d8389365753f662095597871770d4b1fb33b2984bd6a8f4374f36babfdbbcffe087f3aab083f0ce543bdd1f4899df239a0a2 SHA512 3363aea9b4547444e81b43f2d4dbe11978649905325e4e90d15234871ee141ced4e50db904d8c6b7bb79e90db0f4779aeb42cb8767d87506f05441b155125c48
 MISC metadata.xml 1020 BLAKE2B ab083cbce50c476d3c3c7d9f9588d3b61232b12cd5ef0f6446fd64ec027592d43dd4fee92782c5da98a2117d98e599c2aa9b13e1dcabc7d6e29f84f1f245c44b SHA512 21c041ecb2889d08d521e369249c4829fda0ee0812e4e2cf86ad3447834216595376055848636aaeed87cffdb584acf24ce9fb774be036c0a5b0279d961987ed
diff --git a/mate-extra/caja-extensions/caja-extensions-1.18.2.ebuild b/mate-extra/caja-extensions/caja-extensions-1.18.2.ebuild
deleted file mode 100644
index 5b174d4edf6e..000000000000
--- a/mate-extra/caja-extensions/caja-extensions-1.18.2.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2018 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="Several Caja extensions"
-LICENSE="GPL-2"
-SLOT="0"
-
-SENDTO="cdr gajim +mail pidgin upnp"
-IUSE="image-converter +open-terminal share +wallpaper xattr ${SENDTO}"
-
-COMMON_DEPEND=">=dev-libs/glib-2.36:2
-	>=mate-base/caja-1.17.1
-	virtual/libintl:0
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.14:3
-	gajim? (
-		>=dev-libs/dbus-glib-0.60:0
-		>=sys-apps/dbus-1:0
-	)
-	open-terminal? ( >=mate-base/mate-desktop-1.17.0 )
-	pidgin? ( >=dev-libs/dbus-glib-0.60:0 )
-	upnp? ( >=net-libs/gupnp-0.13:0= )
-	xattr? ( sys-apps/attr )"
-
-RDEPEND="${COMMON_DEPEND}
-	cdr? ( >=app-cdr/brasero-2.32.1:0= )
-	gajim? ( net-im/gajim:0 )
-	image-converter? (
-		|| (
-			media-gfx/imagemagick
-			media-gfx/graphicsmagick[imagemagick]
-		)
-	)
-	pidgin? ( net-im/pidgin )"
-
-DEPEND="${COMMON_DEPEND}
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.18:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*
-	!!mate-extra/mate-file-manager-open-terminal
-	!!mate-extra/mate-file-manager-sendto
-	!!mate-extra/mate-file-manager-image-converter
-	!!mate-extra/mate-file-manager-share"
-
-src_configure() {
-	local sendto_plugins="removable-devices"
-	use cdr && sendto_plugins+=",caja-burn"
-	use mail && sendto_plugins+=",emailclient"
-	use pidgin && sendto_plugins+=",pidgin"
-	use gajim && sendto_plugins+=",gajim"
-	use upnp && sendto_plugins+=",upnp"
-
-	mate_src_configure \
-		--enable-sendto \
-		--with-sendto-plugins=${sendto_plugins}\
-		--disable-gksu \
-		$(use_enable image-converter) \
-		$(use_enable open-terminal) \
-		$(use_enable share) \
-		$(use_enable wallpaper) \
-		$(use_enable xattr xattr-tags)
-}
diff --git a/mate-extra/caja-extensions/caja-extensions-1.22.0.ebuild b/mate-extra/caja-extensions/caja-extensions-1.22.0.ebuild
index 88f85a98d2ed..bc91725a62bf 100644
--- a/mate-extra/caja-extensions/caja-extensions-1.22.0.ebuild
+++ b/mate-extra/caja-extensions/caja-extensions-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="Several Caja extensions"
diff --git a/mate-extra/mate-calc/Manifest b/mate-extra/mate-calc/Manifest
index f1f44f77bdfe..a635d94d595a 100644
--- a/mate-extra/mate-calc/Manifest
+++ b/mate-extra/mate-calc/Manifest
@@ -1,5 +1,3 @@
-DIST mate-calc-1.18.1.tar.xz 727752 BLAKE2B 0659bd85c66186eead2e8999535a2980a4c35dc66f5443583b55ddfe06e2779ef351be22eabbd6a05c32085b3cdd638520770f40befbbe846c76b6cd1abd5944 SHA512 d9c95386427ebcb8c1525804f2b7f0f6b91c52a15bc90ff9c688d13bce07f97ed0db032a5e252a9a11ccbd6c04b66d3d74baf1c6bb27b6807506243b27ad25e5
 DIST mate-calc-1.22.0.tar.xz 623312 BLAKE2B ae40278e455c520649db9fb4f48aedb2dec3b9abc48175a9f0111bbc57b7aac289d20d8dc1703a7b6545351e75e0ae641432ce6227f5ae0a8de5cbed68120581 SHA512 a0d72a17dc9e7e97ef36cb2f089db126b1f91790d6a34ae829ef9cea87e82b025ba106f08e8c677352e72423a6670a3bf8751eecc67444cd8cea8dc8f3cf6728
-EBUILD mate-calc-1.18.1.ebuild 535 BLAKE2B eb000e41e1625b168fbc53695cdcfb86aced12c5456b4c624dbbe38442f4448337ed35673eff72e551eaa408f316d2a6e61452b43383e9f24e1879a81098ac69 SHA512 42c79aba25f92f9eee42c5172cdc96443eba15433f2c8b224a0cd8eb1e49013dccdd7cb79ea7987650550563a5218d72d0dd1d9631947938665f880647b3cd48
-EBUILD mate-calc-1.22.0.ebuild 526 BLAKE2B cffdd557681ae5127f5a9dbdba33eb46e7a1d08a0181bc025306b035ca16864fbdf15c07d3990c5db80efe65825d0a73a4bb1b0789f9ae216721d2fcc7ca1b6f SHA512 fbb7a654cf267deb07c6d6768055268f092c9da6f0023fd18e87841caf1abf43c54a406a3e90ef6dad1f0c4431c661acdacb9d3d7539a4fe6f5c68a9046dbe4c
+EBUILD mate-calc-1.22.0.ebuild 524 BLAKE2B 68dee096c32afdda8f2789f0fc87ed6b82d82400c60f4eca016e8f2621ec5bddf01a9d3e6b8ef635648d92c5065140ed94360dc2ce22b454e20f21ea4fcd3a2a SHA512 1c1f013d9bcc50c5efd6bb0fc5cf873c0d0a9a91246a446ce95958995c45f9a379963522dfbe847c971af8e59d5098c3f02268a5fa2d5d748d605a32dc9be84d
 MISC metadata.xml 529 BLAKE2B 35d3bc43838113fc4fa26e875cf6ffb519009307e6a8c06a9c2aa10a65231c231d5789c9b6c728fc4279dc76ed6c8442b68b3a538a973290785c2f65df776756 SHA512 3ed383251b99bfe8492c4a33d08f0bd42479d4d1ed3ccc4c316d2b64643bd611af27ed1238404969e6a924e1998ab0d47d8784d5b027bd276177d3875718e987
diff --git a/mate-extra/mate-calc/mate-calc-1.18.1.ebuild b/mate-extra/mate-calc/mate-calc-1.18.1.ebuild
deleted file mode 100644
index b6f772ca3557..000000000000
--- a/mate-extra/mate-calc/mate-calc-1.18.1.ebuild
+++ /dev/null
@@ -1,31 +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="Calculator for MATE"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE=""
-
-COMMON_DEPEND="
-	dev-libs/atk:0
-	>=dev-libs/glib-2.36:2
-	dev-libs/libxml2:2
-	>=x11-libs/gtk+-3.14:3
-	x11-libs/pango:0"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/yelp-tools:0
-	>=dev-util/intltool-0.35.0:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
diff --git a/mate-extra/mate-calc/mate-calc-1.22.0.ebuild b/mate-extra/mate-calc/mate-calc-1.22.0.ebuild
index ac780df7881c..da47eafc3691 100644
--- a/mate-extra/mate-calc/mate-calc-1.22.0.ebuild
+++ b/mate-extra/mate-calc/mate-calc-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="Calculator for MATE"
diff --git a/mate-extra/mate-indicator-applet/Manifest b/mate-extra/mate-indicator-applet/Manifest
index 3d0986c0b643..342f4b4bb228 100644
--- a/mate-extra/mate-indicator-applet/Manifest
+++ b/mate-extra/mate-indicator-applet/Manifest
@@ -1,5 +1,3 @@
-DIST mate-indicator-applet-1.18.1.tar.xz 318464 BLAKE2B 989b84e2135ff3307a731b3eff981aea40002cbbd9b9e6ba61053a24e681fe3a3005b55ecf6dd027adf97d2bbfe3a12c0bdfdee2aac4860bac10fe3c03a4d681 SHA512 990cf60ff0b0a3e53f6ebc94abbdc15ce7b55258935763fb2d294a06c725e98e4b3389117e8fd04a9d1ce0ba691bc891542fd12c1ab58b29d99352a8369265d0
 DIST mate-indicator-applet-1.22.0.tar.xz 339564 BLAKE2B 0655ced0b24cc681ebd8e66b0749c9d98f9bc361830431bb408158ab174d5ea27aa022344cc667e37405ae693b52ed5c20e5b5ecec01b484c1928df36e1673d0 SHA512 6e1dd133a521f247ecb648b3ffa542e326f504fd3b0719a74099e83ac1dfa9fd4d7676af284f89f69d6684e5640f240930bb0fb43bcf7d59472786adf4c3200c
-EBUILD mate-indicator-applet-1.18.1.ebuild 493 BLAKE2B a6284cc337a840d4ec5aa2a456a2fbeb6ecaa96f183467ce93278156f5d42ad4ed2a6b1c0e6d5e03c01ea930192b6b46b5fe9cdd5de220c45027f2d2f103ad72 SHA512 fcf317d1f96bdb007998fb2acbd33b66491ecea5e7a8c57ce9778ee02db75276a1db1b7b09985884f2d0dccb9db21c21e216572f0b1df7eab27d5ed35d84ed73
-EBUILD mate-indicator-applet-1.22.0.ebuild 490 BLAKE2B d58d0ef89aeaa048f8c2fd7c0e3693384e67a546e3d3916b8fe056d7f3d34a3c04a4776bac1e678fd5cbd085c7922fa9fcd05db778f76ef9424ea3580bf1bbe5 SHA512 8c506b0a4fa4cf068514319cebef0d2a6038cdd1d3de3f6e3806a055ce05ed83e92b0edeadcbf21aadde045a0805633287ea2c40955c1d6d5a4e6f7e3291a720
+EBUILD mate-indicator-applet-1.22.0.ebuild 488 BLAKE2B 8da57ba7b91a520decdcd46ee265c49fc9d440e5f9f6a44c95e208b3d678c979ffa51a267b7d9302149aaaf19df2080f268079fa718267b5ea4a7f7a71d5c8cb SHA512 69e2794e681d24e43d449f9e26687969afe7faf4240432699c0e9887f61bd01874eeb9cde014afe5e0afdaee3bc22cc01d91107a9ca4a78663fb949eaa35e8b1
 MISC metadata.xml 350 BLAKE2B 96082001bda8c5a855c43e0ac4bba9d604b8ec94f66464859a37e30843f8f1ecddff2c3100a49ab465711bb529e288afddbb03aab9b6dde16de35370353a2fe7 SHA512 add12365e457c531f5dc3eec856099b5658f93a3d6ee2b3f80264374a84558566881213b8e8ffad03aeb3720025c385517d777af249a045b9dd2c22ce37b2f32
diff --git a/mate-extra/mate-indicator-applet/mate-indicator-applet-1.18.1.ebuild b/mate-extra/mate-indicator-applet/mate-indicator-applet-1.18.1.ebuild
deleted file mode 100644
index a590981bc241..000000000000
--- a/mate-extra/mate-indicator-applet/mate-indicator-applet-1.18.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate versionator
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm x86"
-fi
-
-DESCRIPTION="MATE indicator applet"
-LICENSE="GPL-2 FDL-1.1 LGPL-2"
-SLOT="0"
-
-IUSE=""
-
-COMMON_DEPEND="
-	>=dev-libs/libindicator-0.4:3
-	>=mate-base/mate-panel-1.17.0
-	>=x11-libs/gtk+-3.14:3"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.35.0
-	virtual/pkgconfig"
diff --git a/mate-extra/mate-indicator-applet/mate-indicator-applet-1.22.0.ebuild b/mate-extra/mate-indicator-applet/mate-indicator-applet-1.22.0.ebuild
index cf28e6636754..ed3d14dae04e 100644
--- a/mate-extra/mate-indicator-applet/mate-indicator-applet-1.22.0.ebuild
+++ b/mate-extra/mate-indicator-applet/mate-indicator-applet-1.22.0.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit mate eapi7-ver
 
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="amd64 ~arm x86"
 fi
 
 DESCRIPTION="MATE indicator applet"
diff --git a/mate-extra/mate-media/Manifest b/mate-extra/mate-media/Manifest
index 2a2710a6fa0a..a48574d32442 100644
--- a/mate-extra/mate-media/Manifest
+++ b/mate-extra/mate-media/Manifest
@@ -1,5 +1,3 @@
-DIST mate-media-1.18.2.tar.xz 496148 BLAKE2B 5588c3c9d72ca73d7956db4e90b0989b040be59e85f2d93b740c085098cd4e643b0848d53015e7d8dc4da528edf4b7cb90dbf7c7d30e6ec3a7c898190ca90565 SHA512 bfd5933e95aac233354b0124919213cd6aba9f062eb4f240ff2df80447091473d2789ee87960fa00d5672c31daf3ac32b81a190f43f6cb32ca92fc8b6768fb38
 DIST mate-media-1.22.0.tar.xz 504312 BLAKE2B b91e3f22a082ca924459e89b0b3b9b98d9a17fb1a13c56ed78d723f34545bafaa560505ca2c373ebde9c04459ffe7f1945e8802d96f2737cc6ec2783d946eb35 SHA512 1c1751ebb0c848cece0e2fc10240832dff317dfcc08aa6721fe00feaf2cff907c700f5e0debd5a236078a199b9d65d59124ffca7a04f61d425d16b1adb02fc1f
-EBUILD mate-media-1.18.2.ebuild 747 BLAKE2B f1637346bf915651164101b17ea71811a0d6504bb1054a87871daa5baa85e768494dc8a16790ee201fbccc7cc677030ffa472a61b2adef82ec145af29302842a SHA512 081ff51b52a30282dcb20391d9b34e95f2cc3c4985f52e8c01cd8f23220289eb3fb60b628ba5bfb9006459c9012b680f063bee44d61ea3eb8480b4ffa5de685f
-EBUILD mate-media-1.22.0.ebuild 734 BLAKE2B 1791b751e961fe62dc994be4445fa33bc80794539c0f3f7ad03655ff28732ae0a31a49a59ecadd6bc0af1092fac33f29c94ab1798406d9311faf08a812eed877 SHA512 4b9f9f744a93290abcdd4794c1ef4130c42a1f85b6f711e200e71825d435f05b35d2874a6c39b8eb9258c11ecd0613c096a62a1d4b1bc7359d7136a25252265c
+EBUILD mate-media-1.22.0.ebuild 732 BLAKE2B a1edd5c28e829b14cf899e7edbc3c48a298a5cf99752ddd35be9ecf22de26276917954a59820206b0479dcf8f9a574308dda031c87f37bf9b174d8690ae18383 SHA512 9dfc330c210f1bdb0171724bd0867de6f25ceb4b7ebf31f70c330d238d35caa6d5d4f1fbddb1eae790f5a68ee84f161fddca887684020a0c47ab2fb88630379b
 MISC metadata.xml 339 BLAKE2B bd032fdad5c46fb56210712a25e50c24959053249e43ebe7da6a6d2cfb099642acc949db166abca0c847cb661c6b20d59f03366abc290b4e0656a547ede52a8b SHA512 6975819ad5dd4234e702e7eaa36a05f3598a830b3f997ea17f299e1e7a40f5d3463b732ca1816e7e9af015c4afeecff2ea94dc0562a20b31698870ffc0489968
diff --git a/mate-extra/mate-media/mate-media-1.18.2.ebuild b/mate-extra/mate-media/mate-media-1.18.2.ebuild
deleted file mode 100644
index 49f7221c1c72..000000000000
--- a/mate-extra/mate-media/mate-media-1.18.2.ebuild
+++ /dev/null
@@ -1,35 +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="Multimedia related programs for the MATE desktop"
-LICENSE="LGPL-2 GPL-2 FDL-1.1"
-SLOT="0"
-
-IUSE=""
-
-COMMON_DEPEND=">=dev-libs/glib-2.36.0:2
-	dev-libs/libxml2:2
-	>=mate-base/mate-panel-1.17.0
-	>=mate-base/mate-desktop-1.17.0
-	>=media-libs/libcanberra-0.13:0[gtk3]
-	>=media-libs/libmatemixer-1.10.0
-	x11-libs/cairo:0
-	>=x11-libs/gtk+-3.14:3
-	x11-libs/pango:0
-	virtual/libintl:0"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.35.0:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*
-	!!<mate-base/mate-applets-1.8:*"
diff --git a/mate-extra/mate-media/mate-media-1.22.0.ebuild b/mate-extra/mate-media/mate-media-1.22.0.ebuild
index 03be87c0e796..66ec91a9100d 100644
--- a/mate-extra/mate-media/mate-media-1.22.0.ebuild
+++ b/mate-extra/mate-media/mate-media-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="Multimedia related programs for the MATE desktop"
diff --git a/mate-extra/mate-netbook/Manifest b/mate-extra/mate-netbook/Manifest
index 78f1325961e0..7ef3087983a3 100644
--- a/mate-extra/mate-netbook/Manifest
+++ b/mate-extra/mate-netbook/Manifest
@@ -1,5 +1,3 @@
-DIST mate-netbook-1.18.2.tar.xz 290816 BLAKE2B b12654088fc73f0ed38ea81366f24de5b737a9754a4c68720640ace14d5f8be76fd2d7bf8a5f4cb44b5410c187ce459b01aa72a4ad67eb6f182c1195a055b650 SHA512 0663eeaa47480f16146cce3e34d037c8eafcd6ca0e6d079dcfadfb6e97fca7b13ea7121896ca268238f161f5edc57754f620f9020f4480e23253a57490ec29e7
 DIST mate-netbook-1.22.0.tar.xz 314832 BLAKE2B 6d01b18bef37cde3c5c62c70460ebc539675a00c9550608d85085c0c678e84a672e7b112a832ade7d3900b851fa45b109729c7148eddb1dc5f058bac071fc3bf SHA512 faff1618e0a99b95b291d7556b1ccd5d0593be1ffa2b2ee30f4df2c9228ff797e9021cc7a0f6183c69b38fdb3dae1c4cb206539057174ff37a4b56b55d07c33a
-EBUILD mate-netbook-1.18.2.ebuild 637 BLAKE2B 2d986de17950483ece6e79119ef6d8c366ffb1a43c8cf2de49d89e9e5e4f9af057044b7738665d1f085ec3cba31d0097b50edf4e3dad81770f03ae5c0b7cc4a5 SHA512 83e1b8e1826e79f306add4e188f49ea7c97805a03403dfd473822cf35086dd7d1b0645b9b059061e10d850c11d3c862d5cf4dda7bd6722f56014eea43a83f251
-EBUILD mate-netbook-1.22.0.ebuild 624 BLAKE2B bf999fdc0027a0dd010192f1388fdb5b1729dd28a2a575e3959932c29d9f6f0d1d4228dae55287f30d05bc08927ee5c457ddd6547c7938df24df43b4433d0a83 SHA512 fdfcfad65608a5b8e7265271fc00a74aee867a35a8a935d8eec464c91ed233af229f8cdefa6962f11908cf4df52b19db0ca48d8b11278a874d88c3cafd3410f7
+EBUILD mate-netbook-1.22.0.ebuild 622 BLAKE2B cde7be94e8aba73a28235cf06bf5072a696b55ab9ad729a6021ef5b4b6b37af1ead3d58288fb4729bd5740656cf3ea5613588e50d9e79af48dd3924eef585be1 SHA512 cd445d62bb26a99b75929b9d035e27f55d9da5e8f1e7d4c19106044357269ded1c21039bc8d8f255366d688cb20b6ffa0166b39aedf97d281830a1b9bb70a749
 MISC metadata.xml 495 BLAKE2B 69f4f61082d017e4e92917edcfb1fc9be696c5472641b0cd81714c07a29f4495644f4120fbd0292f8c5d1d40b3642a095969281ed2c2ad8896ff3156c3fba3bd SHA512 8edc358ede2010384cdecc1e430aa9cbf90bb64c3f52d71ad2bf30d4cb84e38bdf48a4b2e45920b35ada734ffe4a46b44f363b6bf18ba2247f6abe290b5131db
diff --git a/mate-extra/mate-netbook/mate-netbook-1.18.2.ebuild b/mate-extra/mate-netbook/mate-netbook-1.18.2.ebuild
deleted file mode 100644
index fb3391ef3c9a..000000000000
--- a/mate-extra/mate-netbook/mate-netbook-1.18.2.ebuild
+++ /dev/null
@@ -1,35 +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 utilities for netbooks"
-LICENSE="GPL-3"
-SLOT="0"
-
-IUSE=""
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.36:2
-	>=mate-base/mate-panel-1.17.0
-	>=x11-libs/gtk+-3.14:3
-	x11-libs/libfakekey:0
-	x11-libs/libwnck:3
-	x11-libs/libXtst:0
-	x11-libs/libX11:0
-	x11-libs/cairo:0
-	virtual/libintl:0"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.50.1:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*
-	x11-base/xorg-proto"
diff --git a/mate-extra/mate-netbook/mate-netbook-1.22.0.ebuild b/mate-extra/mate-netbook/mate-netbook-1.22.0.ebuild
index e5c2cc8427e5..483c783f4754 100644
--- a/mate-extra/mate-netbook/mate-netbook-1.22.0.ebuild
+++ b/mate-extra/mate-netbook/mate-netbook-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="MATE utilities for netbooks"
diff --git a/mate-extra/mate-polkit/Manifest b/mate-extra/mate-polkit/Manifest
index 21b31bf96923..e3a397888603 100644
--- a/mate-extra/mate-polkit/Manifest
+++ b/mate-extra/mate-polkit/Manifest
@@ -1,5 +1,3 @@
-DIST mate-polkit-1.18.2.tar.xz 348272 BLAKE2B 38b2359be2f908181805fa213fcd6973d8b208bc52542702b19a7dc8162ea316540ad8c524b102b6fd95d85dd1e87c3eda29023c798dedf39eb301ff7f691d14 SHA512 4150e0a18ecc1ea1d554334ca3725ab62008f9ea5693ab95eb70df408cfd08a46717d3252017f14f99e9389a2e106add1f74fd63d26cd5db9011707a5a4f63f9
 DIST mate-polkit-1.22.0.tar.xz 302080 BLAKE2B 374fa5215c57a36fc3a6fa4660866b33bc02d067f1eaf5cbadca8711efe8771e4c59d496e8eb47c75567b5a0e472fd10782c5b5436b9d2a5e7fc834445e5cf06 SHA512 e761ec10842789b5bbb3831f568c64e969429131a893850e8323927b949e115a24b3907fd3def7f31f5f785f0831717d852c61f08a9028a009ea9cca0ba86393
-EBUILD mate-polkit-1.18.2.ebuild 1173 BLAKE2B ce9f9edad6a3370ab67d96ae16db4efe03cdce7627110aee20dd65721c4dd828e667206ea58a8c7acc0f644f21fc63575cb1476f5f8c4cfcb9b1277389aa29a3 SHA512 e7ab3d40a8e7112d6f6ce930d78a0aaa573a8dd37593a3d9fd41fc7a0723b33b7bc696407cacf2a259d1759f609f8dd9cebfd181196cdbf96796e555aa86d51b
-EBUILD mate-polkit-1.22.0.ebuild 930 BLAKE2B 4d3442a783a12e1d309161cad720df1815b46f7a9a51b6a82cb81049af67288d2d89cb62c187bd4fb9f58b231acad0f7b11be80d00dab3596ae3b2a8129069d9 SHA512 8108b5e9114581936b16626c5758babb6498622e9b9ae459565ed25d3786811d89308c4fe0f908d4097a3f546c9ae427e8116e66a09388e46a7bf383863e7ccf
+EBUILD mate-polkit-1.22.0.ebuild 928 BLAKE2B ee78e39534eee2561d2b3aa2f701b4560464a2e3ef2604474cb154a000ba590f93b51d77f8b3e003491c12603e9932d7077608833ae131c421ff537ce5d523ce SHA512 95a0a3e5d9d109bd579bc255323bc61bfe7fa34e36c366d1a81ad73e62aa4fe2d9b32d5b2d94475935b4a4b60dc0ba627eed76132b4c884cfb53981eb2908847
 MISC metadata.xml 505 BLAKE2B 280a6762e6d9c690b5b0e0383e9d7560551d131f72823fdd759175b89f04eb22bbb7c605f26e178cfab65cc63e590997dbc9fd5621afe7ec1a4dbb5acd129683 SHA512 eea439bc1d6d7444abdea4e5ce2ed33bfc4a7bc625d67ccff9b65348d72296f5dddb1c11c86efd7b2ebb84b2fc2f2ed8beab715d6016c8ec94d03626be4497ef
diff --git a/mate-extra/mate-polkit/mate-polkit-1.18.2.ebuild b/mate-extra/mate-polkit/mate-polkit-1.18.2.ebuild
deleted file mode 100644
index 9ffee786b21c..000000000000
--- a/mate-extra/mate-polkit/mate-polkit-1.18.2.ebuild
+++ /dev/null
@@ -1,46 +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="A MATE specific DBUS service that is used to bring up authentication dialogs"
-LICENSE="LGPL-2"
-SLOT="0"
-
-IUSE="accountsservice appindicator debug examples +introspection"
-
-COMMON_DEPEND=">=dev-libs/glib-2.36:2
-	>=sys-auth/polkit-0.102:0[introspection?]
-	x11-libs/gdk-pixbuf:2[introspection?]
-	virtual/libintl:0
-	>=x11-libs/gtk+-3.14.0:3[introspection?]
-	appindicator? ( dev-libs/libappindicator:3 )
-	introspection? ( >=dev-libs/gobject-introspection-0.6.2:= )"
-
-RDEPEND="${COMMON_DEPEND}
-	accountsservice? ( sys-apps/accountsservice:0[introspection?] )"
-
-DEPEND="${COMMON_DEPEND}
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.35:*
-	sys-devel/gettext:*
-	>=sys-devel/libtool-2.2.6
-	virtual/pkgconfig:*
-	!<gnome-extra/polkit-gnome-0.102:0"
-
-src_configure() {
-	mate_src_configure \
-		--disable-static \
-		$(use_enable accountsservice) \
-		$(use_enable appindicator) \
-		$(use_enable debug) \
-		$(use_enable examples) \
-		$(use_enable introspection)
-}
diff --git a/mate-extra/mate-polkit/mate-polkit-1.22.0.ebuild b/mate-extra/mate-polkit/mate-polkit-1.22.0.ebuild
index b90bf8fd614b..39199db6278f 100644
--- a/mate-extra/mate-polkit/mate-polkit-1.22.0.ebuild
+++ b/mate-extra/mate-polkit/mate-polkit-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="A MATE specific DBUS service that is used to bring up authentication dialogs"
diff --git a/mate-extra/mate-power-manager/Manifest b/mate-extra/mate-power-manager/Manifest
index 889bd36db7a1..83b2ed76dcdd 100644
--- a/mate-extra/mate-power-manager/Manifest
+++ b/mate-extra/mate-power-manager/Manifest
@@ -1,5 +1,3 @@
-DIST mate-power-manager-1.18.1.tar.xz 3210144 BLAKE2B 7ab427acefd02b4aeea6fa2dd3052e2eaa9de3231ed9f8aa7b81af3a46fbf15da20925b568364ff802598738a7c3387d1b1fa620bef3ff2fd5522bb6247c2f3c SHA512 f4b42f66607e54020901f1f686cb018962c419294e50e0b37724bfddb462cf98a2e74e7ed980c3fe968873ca3848ff401839b39f53f1b40876773bfbf91b51c1
 DIST mate-power-manager-1.22.0.tar.xz 3182040 BLAKE2B 3635001cab5551a29ecf57ebfd84cb6f3dff9f3e16cefdbc7811c1ce9d140e543f6054925b460714ebd4aa8749e39326663866535394664b5ec2f0e94d92337e SHA512 d36ec8d328e00ccc14b26c36ded74f20ea80578870541899560c6a744018e5e91b08ec9b4d517548404e82da6f1868ed1f2fcc0aada1223f98e68dd6e6009503
-EBUILD mate-power-manager-1.18.1.ebuild 1524 BLAKE2B 46d737ef12bb186fb6d12ab081903869c9b0588e607d0c6e99028580211b37cbccfb25dc45a7500fdeb12dc0137cd1b660ca86adbb494eefe3d0408419642b57 SHA512 235ed9ad8df77b4fed90d11b39bc9cd37b2aa58aa313c0bcc6f506a020cb454a498c6e01e4969318a45f1ff4437fa9721aed3a1655ec79b1622033737eb3a020
-EBUILD mate-power-manager-1.22.0.ebuild 1600 BLAKE2B e862da75759f53096a3e37d14c4e4a633bae945ff36a69b30fcb0608e78b0b59730b961504f07a4603a24297052ddadf2bd90cce9ace33177cebfb6808412102 SHA512 126a64b5632522be9d20f876f7fb9b70b2ae4e1c7f5e499703d72be480fbd8a33300f744202aa0e918f5fc4c213fe8ee99a232764e08ffb9b76b34c67c4a4411
+EBUILD mate-power-manager-1.22.0.ebuild 1615 BLAKE2B e35d4d5c388d5ff46dfd56c22b0ef0bd6be2da3a433cabc69b0f8b8df663f72a8b92f432c5dd2a5f429fdee14b510f83e8dcdcb268fcb56e9d6366a6688d5de2 SHA512 0f94f0813876550377a681e006123e607f0aa2490973a62348b45d3b68ab5566f55750950ab568f0ebf122a6e9ad7101219c5f0236288f257abbce6628a1f261
 MISC metadata.xml 427 BLAKE2B 2a15897025c6693a2e99c56ee66f3c4da0fc62655c9d6e062451f7f8ef9d82b1fc8bd162d54b5fdee4a1cda0135f09c594f63c1609b622c9570568be05b2e6d7 SHA512 6922ccd9022b2b15fe7d57f196aa715aeed17f5f08d92444f3f07d8ef50f37dd48b62000adc5188076805138f651afea6af02c89d13f4abb3c66cd2419ccb30f
diff --git a/mate-extra/mate-power-manager/mate-power-manager-1.18.1.ebuild b/mate-extra/mate-power-manager/mate-power-manager-1.18.1.ebuild
deleted file mode 100644
index 070c84c13b32..000000000000
--- a/mate-extra/mate-power-manager/mate-power-manager-1.18.1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2018 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="A session daemon for MATE that makes it easy to manage your laptop or desktop"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="+applet gnome-keyring policykit systemd test"
-
-# Interactive testsuite.
-RESTRICT="test"
-
-COMMON_DEPEND=">=dev-libs/dbus-glib-0.70:0
-	>=dev-libs/glib-2.36:2
-	>=media-libs/libcanberra-0.10:0[gtk3]
-	>=sys-apps/dbus-1:0
-	>=x11-apps/xrandr-1.3:0
-	>=x11-libs/cairo-1:0
-	>=x11-libs/gdk-pixbuf-2.11:2
-	>=x11-libs/gtk+-3.14:3
-	x11-libs/libX11:0
-	x11-libs/libXext:0
-	x11-libs/libXrandr:0
-	>=x11-libs/libnotify-0.7:0
-	x11-libs/pango:0
-	applet? ( >=mate-base/mate-panel-1.17.0 )
-	gnome-keyring? ( >=gnome-base/libgnome-keyring-3:0 )
-	>=sys-power/upower-0.9.23:=
-	systemd? ( sys-apps/systemd )
-	!systemd? ( >=sys-auth/consolekit-0.9.2 )"
-
-RDEPEND="${COMMON_DEPEND}
-	policykit? ( >=mate-extra/mate-polkit-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:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*
-	x11-base/xorg-proto"
-
-src_configure() {
-	mate_src_configure \
-		--enable-compile-warnings=minimum \
-		$(use_with gnome-keyring keyring) \
-		$(use_enable applet applets) \
-		$(use_enable test tests)
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-
-	dbus-launch Xemake check || die "Test phase failed"
-}
diff --git a/mate-extra/mate-power-manager/mate-power-manager-1.22.0.ebuild b/mate-extra/mate-power-manager/mate-power-manager-1.22.0.ebuild
index 9b2c5e906964..011dc99ed914 100644
--- a/mate-extra/mate-power-manager/mate-power-manager-1.22.0.ebuild
+++ b/mate-extra/mate-power-manager/mate-power-manager-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="A session daemon for MATE that makes it easy to manage your laptop or desktop"
@@ -20,7 +20,8 @@ REQUIRED_USE="?? ( elogind systemd )"
 # Interactive testsuite.
 RESTRICT="test"
 
-COMMON_DEPEND=">=dev-libs/dbus-glib-0.70
+COMMON_DEPEND="
+	>=dev-libs/dbus-glib-0.70
 	>=dev-libs/glib-2.50:2
 	>=media-libs/libcanberra-0.10:0[gtk3]
 	>=sys-apps/dbus-1
@@ -50,10 +51,11 @@ DEPEND="${COMMON_DEPEND}
 	app-text/rarian
 	>=app-text/scrollkeeper-dtd-1:1.0
 	app-text/yelp-tools
-	>=dev-util/intltool-0.50.1:*
-	x11-base/xorg-proto
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
+	dev-util/glib-utils
+	>=dev-util/intltool-0.50.1
+	sys-devel/gettext
+	virtual/pkgconfig
+	x11-base/xorg-proto"
 
 src_configure() {
 	mate_src_configure \
diff --git a/mate-extra/mate-screensaver/Manifest b/mate-extra/mate-screensaver/Manifest
index 45a769e329e0..daa7481f5738 100644
--- a/mate-extra/mate-screensaver/Manifest
+++ b/mate-extra/mate-screensaver/Manifest
@@ -1,6 +1,4 @@
 AUX xss-conversion.txt 1026 BLAKE2B 4675ecb7d7ce45b28183ff503739b5d3853e8a68adfb8e4bf92274944c034d4f043c8854cc54a801ad72160bf452c645dfc5a0d35a71b967c9094f2a8464e59a SHA512 149d28bf7ff9dffe75f0a59408d91eff6537ec27a9457bf2419efe78e9b39a11796b341176e6ba4b1a183cc3ead080abe0ba85f51a3d57b0ff54dae8a3ec312a
-DIST mate-screensaver-1.18.2.tar.xz 4926748 BLAKE2B 7790a579991886617accd3f38146b624c81145c588fbc93fe78b0015669ca53e493aca0689e157fc0c11b86248bbc3d00b479ad8c4c1c01288e853c1ef3dd40c SHA512 b8ec5705f1810ecb1b887d1c9ad2a5eca2a39f7a093154d45c8cfdbcef664520b09be0ed4ab5992b001a4445e71e4eefd4e28d83e22c7536788c9d32f703283e
 DIST mate-screensaver-1.22.0.tar.xz 4959732 BLAKE2B 23d7622ea992c8a29966a12a4e8db36fb489d0d07124907cb3fc2325dedb7fb99394bc551b0d889247989bbea27ba540fb17f55dbd12644e10a9abc242b07d8a SHA512 e253495ad700264ee7833d7b5a732cabff53058384801ff5e874d45f812cea1e4bd3877a1688ecec6197c37f32761f69a4924a47a6556332f1fec736e540e333
-EBUILD mate-screensaver-1.18.2.ebuild 3027 BLAKE2B 4fcaa0fc8c5ba82d31fcb8594b46033964ce8aeb71aedbc5f2876bb61bbc7a1681006e3752145d6b072ea5e5f8aeba59e89e8fa7ca52a89ec1411713d0a3754e SHA512 7aff1f0f02fa1a3095405716d53bea7d380bd9acb931bc7bff5dc9775aea9aa7684742f95a4626a506c3731c655a1ce75ef8074c530979ae8d05bfca56ef2e3f
-EBUILD mate-screensaver-1.22.0.ebuild 3253 BLAKE2B 87bfaf8fd0d174fb9a66f8cbf8c65cf4689225ee8af9ac91caf81a57d1a10618b8a31d67ed99a75da0d0bd5c3b47006bd0f5e5a6c28904a1f257c58c1c3fc5ca SHA512 26ca99778f2482e749ced813ce4596be2b728d72819b639d0279e1cccaa7cdedd0836b350832f08028046bf700491a2caa61e7f19aebd04f5d2e426fa59773b1
+EBUILD mate-screensaver-1.22.0.ebuild 3251 BLAKE2B 4d18b9b6d63c22e0cbaf99facdc469b7b0faf78ea7dc2198a6b0fa6aa193e960168f672dedc47fd241e98305249ca25170f1f2180c67c02222254f8e8b4778aa SHA512 e69c1d310d8933b9d7e29583c2098feaa5f61bbfd0129c4bd7a0b6f0c3e175ca95920172cde0cc734f1c6af3aa71203e241d3d01df1de0b739264b344bc5aee5
 MISC metadata.xml 447 BLAKE2B febc277d7b427ae9a48c3c6e318b779f8a3fb9e27f896b17a3ebafec9bc8b03c4af3f30de7881fcc7feff674fdc0106d0b46f91d72d7267d4c4eeffb1dbe341a SHA512 29d7b99ddd69b2503d91f185679e1811403ba34443e20e2b17782878ee509565dcd62c2e3339709b3d29f568168c9c5c5a9284823d0187392220e781792b73e8
diff --git a/mate-extra/mate-screensaver/mate-screensaver-1.18.2.ebuild b/mate-extra/mate-screensaver/mate-screensaver-1.18.2.ebuild
deleted file mode 100644
index 5ccb8b491503..000000000000
--- a/mate-extra/mate-screensaver/mate-screensaver-1.18.2.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate multilib readme.gentoo-r1
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-DESCRIPTION="Replaces xscreensaver, integrating with the MATE desktop"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="X debug consolekit kernel_linux libnotify opengl pam systemd"
-
-DOC_CONTENTS="
-	Information for converting screensavers is located in
-	/usr/share/doc/${PF}/xss-conversion.txt*
-"
-
-COMMON_DEPEND="
-	>=dev-libs/dbus-glib-0.71:0
-	>=dev-libs/glib-2.36:2
-	gnome-base/dconf:0
-	>=mate-base/libmatekbd-1.17.0
-	>=mate-base/mate-desktop-1.17.0
-	>=mate-base/mate-menus-1.10.0
-	>=sys-apps/dbus-0.30:0
-	>=x11-libs/gdk-pixbuf-2.14:2
-	>=x11-libs/libX11-1:0
-	x11-libs/cairo:0
-	>=x11-libs/gtk+-3.14:3
-	x11-libs/libXext:0
-	x11-libs/libXrandr:0
-	x11-libs/libXScrnSaver:0
-	x11-libs/libXxf86misc:0
-	x11-libs/libXxf86vm:0
-	x11-libs/libxklavier:0
-	x11-libs/pango:0
-	virtual/libintl:0
-	consolekit? ( sys-auth/consolekit:0 )
-	libnotify? ( >=x11-libs/libnotify-0.7:0 )
-	opengl? ( virtual/opengl:0 )
-	pam? ( gnome-base/gnome-keyring:0 virtual/pam:0 )
-	!pam? ( kernel_linux? ( sys-apps/shadow:0 ) )
-	systemd? ( sys-apps/systemd:0= )
-	!!<gnome-extra/gnome-screensaver-3:0"
-
-RDEPEND="${COMMON_DEPEND}
-	>=mate-base/mate-session-manager-1.6"
-
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.50.1:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*
-	x11-base/xorg-proto"
-
-src_configure() {
-	mate_src_configure \
-		--enable-locking \
-		--with-kbd-layout-indicator \
-		--with-xf86gamma-ext \
-		--with-xscreensaverdir=/usr/share/xscreensaver/config \
-		--with-xscreensaverhackdir=/usr/$(get_libdir)/misc/xscreensaver \
-		$(use_with X x) \
-		$(use_with consolekit console-kit) \
-		$(use_with libnotify) \
-		$(use_with opengl libgl) \
-		$(use_with systemd) \
-		$(use_enable debug) \
-		$(use_enable pam)
-}
-
-src_install() {
-	mate_src_install
-
-	# Install the conversion script in the documentation.
-	dodoc "${S}"/data/migrate-xscreensaver-config.sh
-	dodoc "${S}"/data/xscreensaver-config.xsl
-	dodoc "${FILESDIR}"/xss-conversion.txt
-
-	# Non PAM users will need this suid to read the password hashes.
-	# OpenPAM users will probably need this too when
-	# https://bugzilla.gnome.org/show_bug.cgi?id=370847
-	# is fixed.
-	if ! use pam ; then
-		fperms u+s /usr/libexec/mate-screensaver-dialog
-	fi
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	mate_pkg_postinst
-
-	if has_version "<x11-base/xorg-server-1.5.3-r4" ; then
-		ewarn "You have a too old xorg-server installation. This will cause"
-		ewarn "mate-screensaver to eat up your CPU. Please consider upgrading."
-		echo
-	fi
-
-	if has_version "<x11-misc/xscreensaver-4.22-r2" ; then
-		ewarn "You have xscreensaver installed, you probably want to disable it."
-		ewarn "To prevent a duplicate screensaver entry in the menu, you need to"
-		ewarn "build xscreensaver with -gnome in the USE flags."
-		ewarn "echo \"x11-misc/xscreensaver -gnome\" >> /etc/portage/package.use"
-		echo
-	fi
-
-	readme.gentoo_print_elog
-}
diff --git a/mate-extra/mate-screensaver/mate-screensaver-1.22.0.ebuild b/mate-extra/mate-screensaver/mate-screensaver-1.22.0.ebuild
index cea71578dfcb..92449016a7c4 100644
--- a/mate-extra/mate-screensaver/mate-screensaver-1.22.0.ebuild
+++ b/mate-extra/mate-screensaver/mate-screensaver-1.22.0.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit mate readme.gentoo-r1
 
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 DESCRIPTION="Replaces xscreensaver, integrating with the MATE desktop"
diff --git a/mate-extra/mate-sensors-applet/Manifest b/mate-extra/mate-sensors-applet/Manifest
index 10b92ae9654b..15cf0a074fe9 100644
--- a/mate-extra/mate-sensors-applet/Manifest
+++ b/mate-extra/mate-sensors-applet/Manifest
@@ -1,6 +1,3 @@
-DIST mate-sensors-applet-1.18.3.tar.xz 385728 BLAKE2B 42a38121db367788af906aec08261512b8aa96ad3782c1aca0d29b8371a598855ee0d7a3c63306929d45e4d58fb01e117efd91b4bd6b104c49790ff8e73c292f SHA512 39e23839eebe460a99d002d6f897d3053a6940cb33a24c923790e976b72be7a260cd06be326abbb3917b85b6b6fa779cc5f1c06dbf9c19c45ec3f1bf6a93a96e
 DIST mate-sensors-applet-1.22.0.tar.xz 511876 BLAKE2B 6e2008d60a5530ab233da0fe67a38fea2abfba0d745386d82d44e21e59a5d7a08e7f97390f3b8e3df16699c8b69bf1f9c3d4762b45f4652838672c57ec91bf34 SHA512 f756fdff4dd8fe824fbe41956411ca1e6ce251fc1d43276c7244a8a806e91bacc283c412b831935136682971509e23c08538264963af31488bee15ce5644d5cb
-EBUILD mate-sensors-applet-1.18.3.ebuild 1411 BLAKE2B ef15529ff5db1a8909f6c76d6188b348ad34ddbe7206cbf290810524c12237a667499ce8b37a3d7845735a478635ff790abbcdaaa268fdbd7edfe6b63034c3da SHA512 9ac6a446f48023d70f2f9f2de2a70dc8c865d49a08c9cc8d06538e8f7d0b2815a59b2f60d0d12b88405acaa3a0146325f84f64c5e256e4beaffcb32e581ff51e
-EBUILD mate-sensors-applet-1.22.0-r1.ebuild 1343 BLAKE2B a98f8642e50aa7dc991c87112186fb2bb47661f75c5a662efccfc35eb7c4d8ee963c6056e5be59b724066e6e1c2dd10f0008001282f8d1f5d62737cabdeb7fa8 SHA512 711a98f3a37c7e1de8355983c57ba0b73a72176562d12ac93cd295facb2aafc1fd5ad6b303b5d5419a580ce9fa4e90b0d3aa4a6ccea6d90e4621220c20fdff0a
-EBUILD mate-sensors-applet-1.22.0.ebuild 1405 BLAKE2B cbe36508a6a65e4ae7761c5f31471090e8e4c4caedde23f9689de54873562a46a87ce3e787c3a5baa4cedf2bacdd9d1008c17d21feef8e3141368980f14dcf3b SHA512 72388e89950c8f986b87d34cfc54137d4bb76e273a316b41128a18a71faadb2ae448e24f1d926ea0052961b6c624da2928b22b227a6ef59a0793fd5d0562a87b
+EBUILD mate-sensors-applet-1.22.0-r1.ebuild 1341 BLAKE2B 4c5b0a611bc8bddc25f0c5fc0d91a36109aad973ce1ac7b2c232a023bf918ceb7af7b41c1f65c7027d0e4a515af2bb0cd452402b2baf1bf225571e77f6b5bc56 SHA512 92c2ed89a0b7969bcadda1f65f65cff201e9abc99fe52a42ab25b87c41453154e2d00c41304041907acf08c7af7535a98584f7e2d226587c5b320b6a987dbf54
 MISC metadata.xml 348 BLAKE2B 3e34850491c3dce6bfe3771ed94ea37e68d9c8131594f4056c40e754f5556a4dbf03e434a0f3d19eaa6177a0a484a1b50b8de1c67a4eadf1faf6e5b56fa70166 SHA512 32cad99749c326ae12caa346b0bbf85779cbf9f35b85c4f729358dd7171d468f486c761e33d2938fcac445485ec256d733150d7dedc7c9e6b271702ba7c454ab
diff --git a/mate-extra/mate-sensors-applet/mate-sensors-applet-1.18.3.ebuild b/mate-extra/mate-sensors-applet/mate-sensors-applet-1.18.3.ebuild
deleted file mode 100644
index 62ee356d61a6..000000000000
--- a/mate-extra/mate-sensors-applet/mate-sensors-applet-1.18.3.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2018 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 x86"
-fi
-
-DESCRIPTION="MATE panel applet to display readings from hardware sensors"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="+dbus hddtemp libnotify lm_sensors video_cards_nvidia"
-
-COMMON_DEPEND=">=dev-libs/glib-2.36:2
-	>=mate-base/mate-panel-1.17.0
-	>=x11-libs/cairo-1.0.4:0
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.14:3
-	virtual/libintl:0
-	hddtemp? (
-		dbus? (
-			>=dev-libs/dbus-glib-0.80:0
-			>=dev-libs/libatasmart-0.16:0 )
-		!dbus? ( >=app-admin/hddtemp-0.3_beta13:0 ) )
-	libnotify? ( >=x11-libs/libnotify-0.7:0 )
-	lm_sensors? ( sys-apps/lm_sensors:0 )
-	video_cards_nvidia? ( >=x11-drivers/nvidia-drivers-100.14.09:0[static-libs,tools] )"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/rarian:0
-	>=app-text/scrollkeeper-dtd-1:1.0
-	app-text/yelp-tools:0
-	>=dev-util/intltool-0.50.1:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-PDEPEND="hddtemp? ( dbus? ( sys-fs/udisks:0 ) )"
-
-src_configure() {
-	local udisks
-
-	if use hddtemp && use dbus; then
-		udisks="--enable-udisks"
-	else
-		udisks="--disable-udisks"
-	fi
-
-	mate_src_configure \
-		--disable-static \
-		--without-aticonfig \
-		$(use_enable libnotify) \
-		$(use_with lm_sensors libsensors) \
-		$(use_with video_cards_nvidia nvidia) \
-		${udisks}
-}
diff --git a/mate-extra/mate-sensors-applet/mate-sensors-applet-1.22.0-r1.ebuild b/mate-extra/mate-sensors-applet/mate-sensors-applet-1.22.0-r1.ebuild
index 1bbeca988faf..7df62276db70 100644
--- a/mate-extra/mate-sensors-applet/mate-sensors-applet-1.22.0-r1.ebuild
+++ b/mate-extra/mate-sensors-applet/mate-sensors-applet-1.22.0-r1.ebuild
@@ -8,7 +8,7 @@ MATE_LA_PUNT="yes"
 inherit mate
 
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="amd64 ~arm x86"
 fi
 
 DESCRIPTION="MATE panel applet to display readings from hardware sensors"
diff --git a/mate-extra/mate-sensors-applet/mate-sensors-applet-1.22.0.ebuild b/mate-extra/mate-sensors-applet/mate-sensors-applet-1.22.0.ebuild
deleted file mode 100644
index 9af3b881d01f..000000000000
--- a/mate-extra/mate-sensors-applet/mate-sensors-applet-1.22.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2019 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 ~x86"
-fi
-
-DESCRIPTION="MATE panel applet to display readings from hardware sensors"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="+dbus hddtemp libnotify lm_sensors video_cards_nvidia"
-
-COMMON_DEPEND=">=dev-libs/glib-2.50:2
-	>=mate-base/mate-panel-1.17.0
-	>=x11-libs/cairo-1.0.4
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.22:3
-	virtual/libintl
-	hddtemp? (
-		dbus? (
-			>=dev-libs/dbus-glib-0.80
-			>=dev-libs/libatasmart-0.16 )
-		!dbus? ( >=app-admin/hddtemp-0.3_beta13 ) )
-	libnotify? ( >=x11-libs/libnotify-0.7 )
-	lm_sensors? ( sys-apps/lm_sensors )
-	video_cards_nvidia? ( || (
-		>=x11-drivers/nvidia-drivers-100.14.09:0[static-libs,tools]
-	) )"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/rarian
-	>=app-text/scrollkeeper-dtd-1:1.0
-	app-text/yelp-tools
-	>=dev-util/intltool-0.50.1:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-PDEPEND="hddtemp? ( dbus? ( sys-fs/udisks:0 ) )"
-
-src_configure() {
-	local udisks
-
-	if use hddtemp && use dbus; then
-		udisks="--enable-udisks"
-	else
-		udisks="--disable-udisks"
-	fi
-
-	mate_src_configure \
-		--disable-static \
-		--without-aticonfig \
-		$(use_enable libnotify) \
-		$(use_with lm_sensors libsensors) \
-		$(use_with video_cards_nvidia nvidia) \
-		${udisks}
-}
diff --git a/mate-extra/mate-system-monitor/Manifest b/mate-extra/mate-system-monitor/Manifest
index b78f7b774cd3..6a650b1e92b1 100644
--- a/mate-extra/mate-system-monitor/Manifest
+++ b/mate-extra/mate-system-monitor/Manifest
@@ -1,5 +1,3 @@
-DIST mate-system-monitor-1.18.1.tar.xz 2159100 BLAKE2B babac7ad0dc3a3bccf5c6d4567bee0c95aad1f5fffdb1d6d566316f4712a345e7083c8032c19b6615a9f9d06fbbe8b89357407b897206f3131294b7d2305b45d SHA512 47dd2ba46cd6fbd1beef2e6f0a93332c7142f701d18f6894b4986134c557f63f3e2bed382af17cc5bf45693b556a91ccab36fde940126fdceb5834d4cea08356
 DIST mate-system-monitor-1.22.0.tar.xz 2190688 BLAKE2B 83ab7dfbc0033f094896c663790c1200e71a498d3a813a82c94593e6c6434942b2afd0fa1c3067452a46e0e1829a9239f1c145a315b9de2c2853c9f4f50618ef SHA512 6f97f934626b49320ea0dbb4e14743c4f33b12a85671b69465f689765f3003f00e51685b616e34a482c3ec0ca09ca4e13cbdb2e3eb4719c0d1fc7b25b24436a7
-EBUILD mate-system-monitor-1.18.1.ebuild 1016 BLAKE2B 1bbe2ee50460b8c3db678d658df3228e999fdf10bd887365a72ab8a8b26207db3df6a5b70a93b0e562203c766f3f6e84c46e18ee234ca78374ff8fd1b418cad9 SHA512 1d773cd89876cbbf9c0b3e7a16561b797d1272c5b412e860f7c0e9f5586ef8e4924e810f5629c8ea32cfeb38275a7ea3a21ffda6002e910f262be472d2eabd1c
-EBUILD mate-system-monitor-1.22.0.ebuild 1251 BLAKE2B fe910aabbc2bb3f3c72dc6b7941303dfbea244d9c4caa9d7a465e8600233281c48c0ad92b23ca372436346115318a2a1d7965fad20dd49c8df36040d326aa660 SHA512 167bcb0a93b58eea3032002a30d4523d15d6a09c176c0ea8364f0804b845d90fd313f8d1e825c3ea3e7f53f48c2933de49837e269299bcfa0cabab5c4774fdc7
+EBUILD mate-system-monitor-1.22.0.ebuild 1249 BLAKE2B 7e3b80defe98bbe95d310970a00016eea4007afafa140c1d5503ba4c6ee840004a40a65cfccbae9aa2ac5e01839bea8be709556cff8f70150b7123c7f5d99cdc SHA512 e114fde19d6b747f0f177770eea0d46dc9dae54d285050f71ab310d6a256d898376268c260cc98d4167a5c267eac0bd5948b7a454da5ab1ccf8cf142f57a91a1
 MISC metadata.xml 348 BLAKE2B fe7ff06b7a0366617fb30e7a98fa7054c32469bf49691855183ee7b9991c1aebd5f431081e5d7efe07ab3a2b2424630bea621c2b3369338f6bb5348d1ba70de7 SHA512 4cb1bd5f11887274393c957be697ce784af74a39258ead2e9ccb586ac8d4bcab06a6aa2a76e8f96a85d2d818092250eede243775b61222493739440c59cc9c9b
diff --git a/mate-extra/mate-system-monitor/mate-system-monitor-1.18.1.ebuild b/mate-extra/mate-system-monitor/mate-system-monitor-1.18.1.ebuild
deleted file mode 100644
index 2421673a931a..000000000000
--- a/mate-extra/mate-system-monitor/mate-system-monitor-1.18.1.ebuild
+++ /dev/null
@@ -1,53 +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="The MATE System Monitor"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="systemd"
-
-COMMON_DEPEND="
-	>=dev-cpp/glibmm-2.26:2
-	>=dev-cpp/gtkmm-3.8:3.0
-	>=dev-libs/glib-2.36:2
-	dev-libs/libsigc++:2
-	>=dev-libs/libxml2-2:2
-	>=gnome-base/libgtop-2.23.1:2=
-	>=gnome-base/librsvg-2.35:2
-	x11-libs/cairo:0
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.14:3
-	>=x11-libs/libwnck-3.0:3
-	virtual/libintl:0
-	systemd? ( sys-apps/systemd )"
-
-RDEPEND="${COMMON_DEPEND}
-	>=sys-auth/polkit-0.97:0"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/yelp-tools:0
-	>=dev-util/intltool-0.50.1:*
-	sys-devel/gettext:*
-	>=sys-devel/autoconf-2.63:*
-	virtual/pkgconfig:*"
-
-src_configure() {
-	mate_src_configure \
-		$(use_enable systemd)
-}
-
-pkg_postinst() {
-	mate_pkg_postinst
-
-	einfo "${PN} may run commands with escalated privileges using"
-	einfo "x11-libs/gksu."
-}
diff --git a/mate-extra/mate-system-monitor/mate-system-monitor-1.22.0.ebuild b/mate-extra/mate-system-monitor/mate-system-monitor-1.22.0.ebuild
index 2df1fb376d25..f65311fcd605 100644
--- a/mate-extra/mate-system-monitor/mate-system-monitor-1.22.0.ebuild
+++ b/mate-extra/mate-system-monitor/mate-system-monitor-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="The MATE System Monitor"
diff --git a/mate-extra/mate-user-guide/Manifest b/mate-extra/mate-user-guide/Manifest
index 96654ff4d316..6cf366578e7f 100644
--- a/mate-extra/mate-user-guide/Manifest
+++ b/mate-extra/mate-user-guide/Manifest
@@ -1,5 +1,3 @@
-DIST mate-user-guide-1.18.0.tar.xz 8375200 BLAKE2B 2e77dbdf713a86dc5b2208de49053c99606d98fa0ca431c91b5d0ee47dc01e63be14e2b5112246baeb64f04c8df93601d1f3d2e24e6120eddac36512a4e38bcf SHA512 023b6ee04764e8a6004ac1cba69427af33be22228d475666cfacd4aa2ef4b61df4c9e269e003345a7073ef5eb7b783850e4efd5b41356052e3b69860d6df054a
 DIST mate-user-guide-1.22.0.tar.xz 8859936 BLAKE2B c8993835e064614de989046ae225e1e323d792e7592f6afe0980d74950a0c2ff64791dafb1f8a80be8514bd338ec3d5fdb7307dc9d3d366b847ebbd7761e3158 SHA512 faf82569d8289f13d31c0c3a548692194f4938dc341b5a2214ccd3bba1fafaa6b5446cc5455ade391e7172268354cf2088c2a119aee96d3d42e71ee4c094dd14
-EBUILD mate-user-guide-1.18.0.ebuild 529 BLAKE2B 9fac3ae05aacc5109af2a77adbfedd73c05bb5ef956711726a1452aeaabbd2acdf2f1418edf21a4dcc32a5c698bb98aa619d41c155b9bbff39465ec4ebcf8caa SHA512 f1ebfa2e5c1258f65aa53f0c08c6dd4e86d71aa9dcc83326cb043fef717b3bbfb92c5af0aa44c04d39965d9875b0d1277c2faf381e351ae11211fb8c76e514ec
-EBUILD mate-user-guide-1.22.0.ebuild 526 BLAKE2B eca831d3997976829fb7677502d1951ae8cfe4218538e0b223bf47ad528a4cbf2cc6532ea5fdcda219c0668c7011df9a07eb12bff11ced915ca57fe48a917056 SHA512 a91ad3083a1d8dfc7c63074c49a445ce31beeb2faa521807b0f39cc25ceea4595703150780796ae1ce997e9ffffc0950964d663194f2766d69766eb33e1cf8a9
+EBUILD mate-user-guide-1.22.0.ebuild 524 BLAKE2B 7d9f67575d7ccc46c34d998b26ce852199b3ae0398b658456911f66d4b63823d33dd3add1907644c389f1b48682ac998de5b8be044d8425c9694d5aa8f10a7e4 SHA512 eecd4b74d9ed18e0254578a229b6a9e4c267c91eda308136da6ca4220220edb3b986894854303c06e523f39db49412473f943863ec23b8f056f57ac554f2ecfc
 MISC metadata.xml 344 BLAKE2B daf4b6a1920fba3efa9c5253a08edd91d26b90fe9a81bec69de4c3f21423ad9d7fd8b5ece9036c3e834900fa60b483e7c73b7572bdbbe8a31d16fc81a50aa09b SHA512 d0ce9f32a04fdae27a476a7197b067f85b1a4889ab758af1c761d2d59c6ca295a6d623db51a0296c64d3a6fb9ff9bea9577002f34020009b967d594b540440f4
diff --git a/mate-extra/mate-user-guide/mate-user-guide-1.18.0.ebuild b/mate-extra/mate-user-guide/mate-user-guide-1.18.0.ebuild
deleted file mode 100644
index d784ff1efef2..000000000000
--- a/mate-extra/mate-user-guide/mate-user-guide-1.18.0.ebuild
+++ /dev/null
@@ -1,28 +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 x86"
-fi
-
-DESCRIPTION="User documentation for MATE Desktop"
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-
-COMMON_DEPEND="virtual/libintl:0"
-
-RDEPEND="${COMMON_DEPEND}
-	gnome-extra/yelp"
-
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.40:*
-	app-text/yelp-tools
-	sys-devel/gettext:*
-	virtual/pkgconfig:*
-	!!mate-base/mate-desktop[user-guide]"
diff --git a/mate-extra/mate-user-guide/mate-user-guide-1.22.0.ebuild b/mate-extra/mate-user-guide/mate-user-guide-1.22.0.ebuild
index f1e2c40e91b5..409f442d36fd 100644
--- a/mate-extra/mate-user-guide/mate-user-guide-1.22.0.ebuild
+++ b/mate-extra/mate-user-guide/mate-user-guide-1.22.0.ebuild
@@ -8,7 +8,7 @@ MATE_LA_PUNT="yes"
 inherit mate
 
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="amd64 ~arm x86"
 fi
 
 DESCRIPTION="User documentation for MATE Desktop"
diff --git a/mate-extra/mate-user-share/Manifest b/mate-extra/mate-user-share/Manifest
index e70e0f9de0b5..8313194b8539 100644
--- a/mate-extra/mate-user-share/Manifest
+++ b/mate-extra/mate-user-share/Manifest
@@ -1,5 +1,3 @@
-DIST mate-user-share-1.18.0.tar.xz 919404 BLAKE2B fc81dbe17a0ed57eb7baaa385fe786d73a5d64171e51735de061c9c7fbe69f0174f984d75ae39e7b0dcd7bf5562655cf599f394ab7ed50bba520b8472da1111f SHA512 581a53efc115b3b2bac455d828bb689c79bc2a0c5bf3fb2a560ae7eb153b6a8c9589695ca540bb759498c0dc21e016f634a0aabf8e9863c42c5ae7712c91d058
 DIST mate-user-share-1.22.0.tar.xz 927068 BLAKE2B a37d3a886ec3cad4427ccff94c00ce2d2412607f16aacf0a8ae4096f0c63c61f07f10cbd902d3a62d74f2a172b3dcbd5575f5c027045a9d31bdf4cffce4a8de2 SHA512 151532ebe031a973e8825d86c9a315697f5930f89d78960946da3ba135238e3130c59018d04cf9dc8d343ff1613e51254701bbf8e23a9881733ecbb7e6fb9f18
-EBUILD mate-user-share-1.18.0.ebuild 1140 BLAKE2B ee04b9b2c5405d9eedea9ee634c73aacf715ac3c0c3b7708d4af6c16d95e4a3d48c86ac0f27eb6077fea2ed0b77ae2d8bb4dd4b201a7dd54b0f8aeb95ddef55e SHA512 f3c17574014123ad34e7f64920a1e120dfde11f6be19c9df648fcd44e27581f5c621bc52c486aeb735bdf29bc56e99cc1d1770134137046a64f4197963053f6f
-EBUILD mate-user-share-1.22.0.ebuild 1108 BLAKE2B 145d227e176ddd5aef577b0e8187e64ee3145fa3b3126337a2f74879ce98db48e28bee95bef9847d011fb92823896aeea7acf33b754cd37fdb413362c8de2310 SHA512 69b8a32580beee3fc87c79158f3f7c3ec34c6d3433f8efbf25a72123c968cd9aa95586cf919c19b89685c569ddb933f13a6d7d5724dbe37e2b27ab95695f1bda
+EBUILD mate-user-share-1.22.0.ebuild 1106 BLAKE2B 396a85cb2d9af0c2b18b42b6eb6fe1b66411d9bb7d5b2a38c9a63dd5ea0c6405d395606b77186165a8a4904514d1bb7f5d9f435f0f6709487e8109ddb74ff34f SHA512 1f0b0e01d58819560ab8fe9efb9132633f164fa0ae61770a22854f59c9cbb2fb6c4746a6b20ed4b149d4f0a30cbd16870317c1dd6688bd38e115e77d4d552225
 MISC metadata.xml 344 BLAKE2B 72c35ab850378b1f7386ba3d9da729e2855c20779d23a1a503186706bff164487c5f0d398dcc96f4056c2a670f815e2de874f89ca6ffe0c85749fb61416c9d7d SHA512 866efce9c0b0fbd2b8916c71d07b42a255bda4a2c4f269a6fe3390b9913aa148b44ad4b6f779f964e51715f2cc79dcdfe9e8096f2382b3e35f3bda38d8646001
diff --git a/mate-extra/mate-user-share/mate-user-share-1.18.0.ebuild b/mate-extra/mate-user-share/mate-user-share-1.18.0.ebuild
deleted file mode 100644
index 41b9177bfed6..000000000000
--- a/mate-extra/mate-user-share/mate-user-share-1.18.0.ebuild
+++ /dev/null
@@ -1,50 +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 multilib
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm x86"
-fi
-
-DESCRIPTION="Personal file sharing for the MATE desktop"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="X"
-
-COMMON_DEPEND="
-	>=dev-libs/dbus-glib-0.70:0
-	>=dev-libs/glib-2.15.2:2
-	>=mate-base/caja-1.17.1
-	media-libs/libcanberra:0[gtk3]
-	>=sys-apps/dbus-1.1.1:0
-	>=x11-libs/gdk-pixbuf-2:2
-	>=x11-libs/gtk+-3.14:3
-	x11-libs/libX11:0
-	x11-libs/pango:0
-	>=x11-libs/libnotify-0.7:0
-	virtual/libintl:0"
-
-RDEPEND="${COMMON_DEPEND}
-	>=www-apache/mod_dnssd-0.6:0
-	>=www-servers/apache-2.2:2[apache2_modules_dav,apache2_modules_dav_fs,apache2_modules_authn_file,apache2_modules_auth_digest,apache2_modules_authz_groupfile]"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/yelp-tools:0
-	>=dev-util/intltool-0.35:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-src_configure() {
-	mate_src_configure \
-		--with-httpd=apache2 \
-		--with-modules-path=/usr/$(get_libdir)/apache2/modules/ \
-		--disable-bluetooth \
-		$(use_with X x)
-}
diff --git a/mate-extra/mate-user-share/mate-user-share-1.22.0.ebuild b/mate-extra/mate-user-share/mate-user-share-1.22.0.ebuild
index 80932af77200..aa87a8dc105f 100644
--- a/mate-extra/mate-user-share/mate-user-share-1.22.0.ebuild
+++ b/mate-extra/mate-user-share/mate-user-share-1.22.0.ebuild
@@ -8,7 +8,7 @@ MATE_LA_PUNT="yes"
 inherit mate
 
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="amd64 ~arm x86"
 fi
 
 DESCRIPTION="Personal file sharing for the MATE desktop"
diff --git a/mate-extra/mate-utils/Manifest b/mate-extra/mate-utils/Manifest
index 9a1874a92a22..4a0cd046b4e6 100644
--- a/mate-extra/mate-utils/Manifest
+++ b/mate-extra/mate-utils/Manifest
@@ -1,5 +1,3 @@
-DIST mate-utils-1.18.3.tar.xz 6449580 BLAKE2B e8a892d0f924b37da82a8eb233c24b41609831d84fc706ac0082c05cfc0564ca150e6cbd350af8be48acf1e314253e4afe8123bcf4af189a344b3c51e6ccf7d2 SHA512 c9d80e037d32784b3d376aebe23abc6709e14d1df6f293f43c1fc7978f7903ac8b0fc159cebebb3d8dc471df210469b5dcc5dfebdc906ade30a2c7e8f7ca764a
 DIST mate-utils-1.22.0.tar.xz 7300112 BLAKE2B 8a613b6dcb99e652ad6b44bd64ad9b2f9c809713b5fb904059b64234b51e2a06b2290dcf14d7dde82e8011be2ca395fe74d87bcae5b903b196d55bb50e8fdf07 SHA512 248c6e4108900768a4e8b272d20ac9b2d70e8bf77375f4669a099f4d8386c2e8affeafb772d209f00906f96f20d7ee347167ef4837186f44d8aaad85ef855f70
-EBUILD mate-utils-1.18.3.ebuild 1304 BLAKE2B 6b0593b985fa61b397dfb19647f5a4bbea3bb9c601ee702e7fa5ebf08f6a287d5a45e7ae34adba4a2c66d77f9adab1608b93cbb1cb5f7d9bac05f470843582e9 SHA512 c00b6223c110f628bb0563742ae0671c4d3a563d25f234e108b1ed23d4a07c1c8d562b7d418b3a2e9f84c29cff90d1914c343250f222aebd45e1a775e4e72450
-EBUILD mate-utils-1.22.0.ebuild 1279 BLAKE2B 8bf12c54095edbd84e41b68451c61dbb6ee42afd15390ad131f04391ac19f4fedcbf99d0b0c52be53207fd2fb0e08ca2e26ba83fe208c99b909db9eb3260e8d3 SHA512 77399ef0e05d2481263497f73c9e5dcd870872ee45e602348c0e4f17b80bb501456c4377e919d01a7ce1215beb1d3c5aa19461ed76a95158482425b62c985f16
+EBUILD mate-utils-1.22.0.ebuild 1254 BLAKE2B 89cb686511996bb973510b175da72c6948048ae6a998d0670fe8c2a6db167eafd3c472ec0359c9be3bec3390d66fa7a2172bb095f02955bf7c8b7249b452e3a0 SHA512 b1922162b32eab1d4f62766a960368f2ce38e9d158fe7683a743745ffbc6e0068b26bb1ef4cb8026f2b3c3dca81bf035da4dda63c5add86552ff79cf4d8a557b
 MISC metadata.xml 417 BLAKE2B af181dbce0a3bd1d40160da5b7b1be3a4ba345b3d31dc8d4988a146af5318bf473ad2962e9fd63fa2bfa74e61daddb5e84dd977891dee5b3b483189321bf7b1f SHA512 4c4eeb71f1cbd778f48f19da5185d9a75444a87a7abbe5d055e032f38b9891e996af84a383d7bc67ad11113da09ad034a159ec425b106340c696fad479fecee4
diff --git a/mate-extra/mate-utils/mate-utils-1.18.3.ebuild b/mate-extra/mate-utils/mate-utils-1.18.3.ebuild
deleted file mode 100644
index b870194cc0bd..000000000000
--- a/mate-extra/mate-utils/mate-utils-1.18.3.ebuild
+++ /dev/null
@@ -1,65 +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="Utilities for the MATE desktop"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="X applet debug ipv6 test"
-
-COMMON_DEPEND="
-	dev-libs/atk:0
-	>=dev-libs/glib-2.36:2
-	>=gnome-base/libgtop-2.12:2=
-	>=media-libs/libcanberra-0.4:0[gtk3]
-	sys-libs/zlib:0
-	x11-libs/cairo:0
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.14:3
-	x11-libs/libICE:0
-	x11-libs/libSM:0
-	x11-libs/libX11:0
-	x11-libs/libXext:0
-	x11-libs/pango:0
-	applet? ( >=mate-base/mate-panel-1.17.0 )"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/rarian:0
-	>=app-text/scrollkeeper-dtd-1:1.0
-	app-text/yelp-tools:0
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.50.1:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*
-	x11-base/xorg-proto"
-
-src_prepare() {
-	# Make apps visible in all DEs.
-	LC_ALL=C find . -iname '*.desktop.in*' -exec \
-		sed -e '/OnlyShowIn/d' -i {} + || die
-
-	mate_src_prepare
-}
-
-src_configure() {
-	mate_src_configure \
-		--disable-maintainer-flags \
-		--enable-zlib \
-		--enable-debug=$(usex debug yes minimum) \
-		$(use_with X x) \
-		$(use_enable applet gdict-applet) \
-		$(use_enable ipv6)
-}
diff --git a/mate-extra/mate-utils/mate-utils-1.22.0.ebuild b/mate-extra/mate-utils/mate-utils-1.22.0.ebuild
index cbba18e16de9..c252fd672cdb 100644
--- a/mate-extra/mate-utils/mate-utils-1.22.0.ebuild
+++ b/mate-extra/mate-utils/mate-utils-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="Utilities for the MATE desktop"
@@ -17,7 +17,7 @@ SLOT="0"
 
 IUSE="X applet debug ipv6 test"
 
-COMMON_DEPEND="
+RDEPEND="
 	dev-libs/atk
 	>=dev-libs/glib-2.50:2
 	>=gnome-base/libgtop-2.12:2=
@@ -33,18 +33,17 @@ COMMON_DEPEND="
 	x11-libs/pango
 	applet? ( >=mate-base/mate-panel-1.17.0 )"
 
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
+DEPEND="${RDEPEND}
 	app-text/rarian
 	>=app-text/scrollkeeper-dtd-1:1.0
 	app-text/yelp-tools
+	dev-util/glib-utils
 	dev-util/gtk-doc
 	dev-util/gtk-doc-am
 	>=dev-util/intltool-0.50.1
-	x11-base/xorg-proto
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
+	sys-devel/gettext
+	virtual/pkgconfig
+	x11-base/xorg-proto"
 
 src_prepare() {
 	# Make apps visible in all DEs.