gentoo resync : 03.07.2021

41 files changed, 61 insertions, 663 deletions

diff --git a/mate-extra/Manifest.gz b/mate-extra/Manifest.gz
index 9c468de28de9..870f1ce5d938 100644
--- a/mate-extra/Manifest.gz
+++ b/mate-extra/Manifest.gz
diff --git a/mate-extra/caja-extensions/Manifest b/mate-extra/caja-extensions/Manifest
index 794474494cca..10b8e993bfe9 100644
--- a/mate-extra/caja-extensions/Manifest
+++ b/mate-extra/caja-extensions/Manifest
@@ -1,5 +1,3 @@
-DIST caja-extensions-1.24.0.tar.xz 548828 BLAKE2B 0492e1f0ca7277737102f71fd195dd585614010b80c2aafd730aacd1d817b03fe0377c430615a3e4bd4a643558c02c9c4fdb2d451079a3b213fe0e6b9d4e02de SHA512 f05a7d83f16aebacb04f75b76ca86e44c1a01d9ad6c2aefeac19398c4d9da8385e6852fa0118c763aee630e7eb6c7c81d77e0c9452200aee9cf4f058487c4dbf
 DIST caja-extensions-1.24.1.tar.xz 552340 BLAKE2B fff9b70ccdc79905283bdd4e773c8ad6e85cbbc543f4f70af992d91eba1e86d8c2be074dab4154360b836179718e8dbb2837261779a20321b42a2d00c69088ec SHA512 b844a774271d81ac811b1aff1f04be4a65c6e38a683938dfb593f65297a6398fbfe4c8f6a51c649a1311fb5ca8134b4478860f51b1b3eaf9965a6b8776af2817
-EBUILD caja-extensions-1.24.0-r1.ebuild 1757 BLAKE2B fa6cabbc57ce1b18119e9473643effab562be713f12938897402c2eb7633aac61b1a61b0087f3c2516a715253ff7eadcbbab0abd8b3286d690eeea9a0ac6430e SHA512 f198fffa42b0bbb3a066c913c22c325184443b2aa45306aee7005f61cb41a313e07bed331391a534306cdd7f444756d311148bbe7fd7d67c435b235310286b5c
-EBUILD caja-extensions-1.24.1.ebuild 1782 BLAKE2B 126650ed4dfad89f54c32d2d2e5b7da7bd5e798c6ff0836f06f43457cebc88fc6f87015b1c547e2fbece6a3a13a31502a3eee6917fe42daf302f97827ceafca9 SHA512 7a099a8d4662e46c876eaf729398728d9c4bce0cbde8fbb591cbf6dd5796374ede222161cfb2c1a3c27dab9e0a9623f4e9b8414a2e03e61674676a811c42e462
+EBUILD caja-extensions-1.24.1.ebuild 1780 BLAKE2B e6bb5bce1bb6704e001b2be16b9f2173b4c06967fcdb499666a8a00d660f9649812b3c734f811b454b1aae40f1596292978796b38301debf656304142fdb9e4b SHA512 dd9a4982d07ce253b10fdfac3baabcfb1cf6944c6a59e6e59876d3f535e6337ef5b07ba26a137edc27876c313fd6bbc3cbc2a5afb949887eb3bd51e2c5cf1c4f
 MISC metadata.xml 1020 BLAKE2B ab083cbce50c476d3c3c7d9f9588d3b61232b12cd5ef0f6446fd64ec027592d43dd4fee92782c5da98a2117d98e599c2aa9b13e1dcabc7d6e29f84f1f245c44b SHA512 21c041ecb2889d08d521e369249c4829fda0ee0812e4e2cf86ad3447834216595376055848636aaeed87cffdb584acf24ce9fb774be036c0a5b0279d961987ed
diff --git a/mate-extra/caja-extensions/caja-extensions-1.24.0-r1.ebuild b/mate-extra/caja-extensions/caja-extensions-1.24.0-r1.ebuild
deleted file mode 100644
index a767e891c350..000000000000
--- a/mate-extra/caja-extensions/caja-extensions-1.24.0-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-DESCRIPTION="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.50:2
-	>=mate-base/caja-1.21.3
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.22:3
-	gajim? (
-		>=dev-libs/dbus-glib-0.60
-		>=sys-apps/dbus-1
-	)
-	open-terminal? ( >=mate-base/mate-desktop-1.17.0 )
-	pidgin? ( >=dev-libs/dbus-glib-0.60 )
-	upnp? ( >=net-libs/gupnp-0.13:0= )
-	xattr? ( sys-apps/attr )"
-
-RDEPEND="${COMMON_DEPEND}
-	cdr? ( >=app-cdr/brasero-2.32.1:= )
-	gajim? ( net-im/gajim )
-	image-converter? (
-		|| (
-			media-gfx/imagemagick
-			media-gfx/graphicsmagick[imagemagick]
-		)
-	)
-	pidgin? ( net-im/pidgin )"
-
-DEPEND="${COMMON_DEPEND}
-	dev-libs/libxml2
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=sys-devel/gettext-0.19.8:*
-	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.24.1.ebuild b/mate-extra/caja-extensions/caja-extensions-1.24.1.ebuild
index d31c92bc108d..de9f157c8998 100644
--- a/mate-extra/caja-extensions/caja-extensions-1.24.1.ebuild
+++ b/mate-extra/caja-extensions/caja-extensions-1.24.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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 e17dec203929..062efc76b69f 100644
--- a/mate-extra/mate-calc/Manifest
+++ b/mate-extra/mate-calc/Manifest
@@ -1,5 +1,5 @@
-DIST mate-calc-1.24.0.tar.xz 939480 BLAKE2B 28a8184665096d477bdc80484fc9da3bf9835dd5d1c30d4de11722488d735f88336bcf990c50ef65dd0a5781fc083b5d011fd5085c2d1672e6599a28f4a01452 SHA512 ebb18f07ded5577bb0987b2027e7b73abc823a567bfa00f9cc9bfaf75de498f150b6b4c2e13486c530a3cbb078f1b798c415b33d668d952e8650799dd05c99eb
 DIST mate-calc-1.24.1.tar.xz 952372 BLAKE2B ae6c687d85f48f95fda89ba4fa2be44d1f2fc510708a25ac59fd8074d1f29bc6b440ec1c20b344566d4e8a2edc8ec0bdc0d565773f2c089d712c47db4e847805 SHA512 164fc57ed6bcc69b96afd75fff8dd6248ce682d6f806e83ddb73a21bddce99b89c7bb697d189b56d88d5c8d9a0b99f50f3fdd15c7d56f9121ee1d16689b16595
-EBUILD mate-calc-1.24.0.ebuild 555 BLAKE2B ab2c8c25a4d8ad07cba59771e7340c7f6205fcd59af25c03f415dbcc5278177dcd5a521d02bdefbc09fb6d656e06603f6b653d17e797f75e7818584b63991663 SHA512 10c0aca0510080a89441e4b7deede858eaf73900926fad1b284ff6b45bdaed65ffb9d90731bb201a951f0e3cebf26095f2909117dd90fda77a3eaa4d8887d213
-EBUILD mate-calc-1.24.1.ebuild 555 BLAKE2B 5b4df01579dee320194d1c917af24e6d0fb75d2081198b03191e985244570b3aa58e64b3e192f5f336f959c40954aadf63a6f9033e5582ee14e8070973c20cff SHA512 cce7513fa76710c1f4160561b5339689a7d84023e2655cf6783c3a9c8f37c07617e7f875e1519044d2bc953b81d6092762bc2691a24eb0ab1ea1d93e6df50255
+DIST mate-calc-1.24.2.tar.xz 969912 BLAKE2B 844a6bee102e7f4bbab59936c8c7d1f7284e3ec17e0d1c77863df9ec6c4dba80adcc29bc1159a29ccc9473df81d1a45505e55c1da20e1bcdf24674b9c70d8d36 SHA512 d790aefd2839237d6776c6b0508ded53d6eef52456a3025f08bcaf826f8c56754e079d50703a4f7f834f5167f802ddb3d7b95ece613e00faf3ad6f5c1d402e97
+EBUILD mate-calc-1.24.1.ebuild 553 BLAKE2B cf4d9387b87b6904c3341308d070f0ed74cc4f4f71556ccc562eca036026b554962ba56ab4b3c099dbee0aa8ef57b908edc53eb2f36999b9e07cf4dfbb4c956d SHA512 4d3e42658323d940c9e7534ef8fd66f04f16b3f2509658d664f74d4ed3068f9d48e6be239fc2523e18dd2132f7ec4b1fc4106f903e7cd39ec37df2bce8c1386f
+EBUILD mate-calc-1.24.2.ebuild 555 BLAKE2B 62ba9bad98b3009fd5c7c9da3744fbd52c87d3763e064fe6bd310439d291bb0aa724b87a3b0ed0a63aaad8cf5ec0226ef55b10e9119c03ed4cc013602d41c799 SHA512 88b0cf79b94cf1a639f098d5628a32aa833760f6d09b3a779b8e0cd7dbf449ed94c0ffed707e2a9ad4304b6981f8ee03a427e905327ca2f90d04338681b8f5a0
 MISC metadata.xml 529 BLAKE2B 35d3bc43838113fc4fa26e875cf6ffb519009307e6a8c06a9c2aa10a65231c231d5789c9b6c728fc4279dc76ed6c8442b68b3a538a973290785c2f65df776756 SHA512 3ed383251b99bfe8492c4a33d08f0bd42479d4d1ed3ccc4c316d2b64643bd611af27ed1238404969e6a924e1998ab0d47d8784d5b027bd276177d3875718e987
diff --git a/mate-extra/mate-calc/mate-calc-1.24.1.ebuild b/mate-extra/mate-calc/mate-calc-1.24.1.ebuild
index 31d748f655b3..ea4da845039e 100644
--- a/mate-extra/mate-calc/mate-calc-1.24.1.ebuild
+++ b/mate-extra/mate-calc/mate-calc-1.24.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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-calc/mate-calc-1.24.0.ebuild b/mate-extra/mate-calc/mate-calc-1.24.2.ebuild
index 971bea10a92a..71492571d36d 100644
--- a/mate-extra/mate-calc/mate-calc-1.24.0.ebuild
+++ b/mate-extra/mate-calc/mate-calc-1.24.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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"
@@ -20,7 +20,8 @@ COMMON_DEPEND="
 	>=dev-libs/glib-2.50:2
 	dev-libs/libxml2:2
 	>=x11-libs/gtk+-3.22:3
-	x11-libs/pango"
+	x11-libs/pango
+"
 
 RDEPEND="${COMMON_DEPEND}
 	virtual/libintl
@@ -29,5 +30,6 @@ RDEPEND="${COMMON_DEPEND}
 DEPEND="${COMMON_DEPEND}
 	app-text/yelp-tools
 	dev-libs/libxml2
-	>=sys-devel/gettext-0.19.8:*
-	virtual/pkgconfig:*"
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
diff --git a/mate-extra/mate-indicator-applet/Manifest b/mate-extra/mate-indicator-applet/Manifest
index 556586dd4669..86ce38aab627 100644
--- a/mate-extra/mate-indicator-applet/Manifest
+++ b/mate-extra/mate-indicator-applet/Manifest
@@ -1,4 +1,3 @@
 DIST mate-indicator-applet-1.24.0.tar.xz 380136 BLAKE2B 1ae77c892f02127f7a0d778958e0f4acc2b14e01a4b8d8a316253c3b227eacd59cb556ed852de690f3ec4aec4d02874c2f594b41315cd85c87c16967ef9403ee SHA512 0e82f572c1855c8623e537a45c2c0c0b98d3d642e46333eedc16c26607205293098a062008d0e568890ffdf6b8dc4c30a7f5e2e41a150f940917b3671783e413
-EBUILD mate-indicator-applet-1.24.0-r1.ebuild 518 BLAKE2B 757cafb3b7b9aedcd1c2d71faf94c259e2b7b29c2982856b91cf64e57a61a8c809da40556d3fa7a948336d6c991aa6a422983b6b31cf604f57bd8ae58b525f35 SHA512 421e4b03d5951c1bcc98884740055ca1ea4f9071a5c9723b9356e5fb02b9fb0614424b73b20278334bdae58cfa188fac730fab763fd3ef0e505703e278b15f08
-EBUILD mate-indicator-applet-1.24.0.ebuild 518 BLAKE2B 633f258367616716bb67dd3d68326f4d603ce1a31bf5b72f69e2c46e6244dc1566212c50c2c8871d4906b59cd76046914a4541930c8e1b33a499c77b9ad1e5fb SHA512 adc0448fe3de1bb0e4fe5271ce58b23abe4fa247c6ecfd7d441c2f3162b257887c937b8437b1fd49064ed047edce6a600bab85b8843462c6e629907b827f6f51
+EBUILD mate-indicator-applet-1.24.0-r1.ebuild 516 BLAKE2B bc5eefaabcd5ccf193c5dc2eac383ce37bfa221daadcdf65d1cac314e3eba4c2c329446892fc0ca105743253bdebc6f89f9989f23cb11a6a3c930701f1912281 SHA512 67f4ff8c4d0d4792d02334107300597231dee6efc2dabe7d24736cded0a9a538f94eee646aadedc394013c80d963c24733b09692622ebc661e0d435dccf6ce2f
 MISC metadata.xml 350 BLAKE2B 96082001bda8c5a855c43e0ac4bba9d604b8ec94f66464859a37e30843f8f1ecddff2c3100a49ab465711bb529e288afddbb03aab9b6dde16de35370353a2fe7 SHA512 add12365e457c531f5dc3eec856099b5658f93a3d6ee2b3f80264374a84558566881213b8e8ffad03aeb3720025c385517d777af249a045b9dd2c22ce37b2f32
diff --git a/mate-extra/mate-indicator-applet/mate-indicator-applet-1.24.0-r1.ebuild b/mate-extra/mate-indicator-applet/mate-indicator-applet-1.24.0-r1.ebuild
index 670d2a4bf3cd..5f1051f1e6fb 100644
--- a/mate-extra/mate-indicator-applet/mate-indicator-applet-1.24.0-r1.ebuild
+++ b/mate-extra/mate-indicator-applet/mate-indicator-applet-1.24.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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-indicator-applet/mate-indicator-applet-1.24.0.ebuild b/mate-extra/mate-indicator-applet/mate-indicator-applet-1.24.0.ebuild
deleted file mode 100644
index da98ee53781d..000000000000
--- a/mate-extra/mate-indicator-applet/mate-indicator-applet-1.24.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate eapi7-ver
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm x86"
-fi
-
-DESCRIPTION="MATE indicator applet"
-LICENSE="GPL-3 GPL-3+ LGPL-2+ LGPL-3+"
-SLOT="0"
-
-IUSE=""
-
-COMMON_DEPEND="
-	>=dev-libs/libindicator-0.4:3
-	>=mate-base/mate-panel-1.17.0
-	>=x11-libs/gtk+-3.22:3
-"
-
-RDEPEND="${COMMON_DEPEND}
-	virtual/libintl
-"
-
-DEPEND="${COMMON_DEPEND}
-	>=sys-devel/gettext-0.19.8:*
-	virtual/pkgconfig
-"
diff --git a/mate-extra/mate-media/Manifest b/mate-extra/mate-media/Manifest
index 289def6d639b..93f8cb40081d 100644
--- a/mate-extra/mate-media/Manifest
+++ b/mate-extra/mate-media/Manifest
@@ -1,5 +1,3 @@
-DIST mate-media-1.24.0.tar.xz 568488 BLAKE2B 9c7d3f264489a3888ef6b45e4ce7e8c23a53634b3b72db32092889f1656afc8a6b2988b35e5ecdc0bb48ebb20c4e86b64dbc93ec308947159feb89877230673e SHA512 82ee6a16a49d9f4d229539cfacb5803c150af09dff227fb5995bf78e2b83a1f5bddb307756648e569a138124e4485ca56f635184e47fbfd76dcedd17f2bf0425
 DIST mate-media-1.24.1.tar.xz 568328 BLAKE2B 715ca7954039d020915e86fd8e574508ae1436c5ab99a76c18ccb55ab86a8d95c85c5de1a321684c895cde31832ec9e756b841f796bd9292ff84cf8240f21ff0 SHA512 88a8f1b8ee1684c6270ee65d17cd4d031830cd968069cae38a1844b0688cdcac25fc2e09c415d8e55c5b8564c4e0421e2c111cc44de9221bf37cf0e31dc572d3
-EBUILD mate-media-1.24.0.ebuild 723 BLAKE2B 3544a043bc4b33afa66f6e4cf14e9a92f254837223b63c0f9e7f21f646a94c99e3ca9bb3d0920d865a4331150028e918576dda7e535280fdcff3c5e5e5fcc7f2 SHA512 e18a108e62a0ee33b8b8cc8003c8d3c82bf3a610607f06d6a614a2af09db77b16230ac5335314a3ed236428e5e125a589f8e5ea4c795d019994604438a2cf775
-EBUILD mate-media-1.24.1.ebuild 722 BLAKE2B 72d3f870e4dcbf7f7f1d6ad99b820085e422cf51f40607393721864c9affcc8bc32669e7becd8d777c4a8ebd6e6b7054031f09b3a42b0285a7699d225dd71c86 SHA512 dea37bff3839c83daae49a219d9fad870142c011dfc468aacf555c7a146a164371be33f4a91eb239d4de7371336df4ce5957e9603756187b880eab994fb140c9
+EBUILD mate-media-1.24.1.ebuild 720 BLAKE2B 6dc03063ccf1e5731ebab8317010cf08d738dea2a7d93ab24b81edfd715fa0f63416b23889ade4706472297ee9863414004ef69e75a8bd0b447f6a116e58b38f SHA512 441509b6172f5e3c8d3ef4bc916a03070cbeb3ee5d589dcf098b953644da4fb6cedeef2c7ba2c1065a06bea5a9492e52d1729c6d0bd5285ba5106a7363130064
 MISC metadata.xml 339 BLAKE2B bd032fdad5c46fb56210712a25e50c24959053249e43ebe7da6a6d2cfb099642acc949db166abca0c847cb661c6b20d59f03366abc290b4e0656a547ede52a8b SHA512 6975819ad5dd4234e702e7eaa36a05f3598a830b3f997ea17f299e1e7a40f5d3463b732ca1816e7e9af015c4afeecff2ea94dc0562a20b31698870ffc0489968
diff --git a/mate-extra/mate-media/mate-media-1.24.0.ebuild b/mate-extra/mate-media/mate-media-1.24.0.ebuild
deleted file mode 100644
index 71526aab9f0d..000000000000
--- a/mate-extra/mate-media/mate-media-1.24.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-DESCRIPTION="Multimedia related programs for the MATE desktop"
-LICENSE="FDL-1.1+ GPL-2+ HPND LGPL-2+"
-SLOT="0"
-
-IUSE=""
-
-COMMON_DEPEND=">=dev-libs/glib-2.50:2
-	dev-libs/libxml2:2
-	>=mate-base/mate-panel-1.17.0
-	>=mate-base/mate-desktop-1.17.0
-	>=media-libs/libcanberra-0.13[gtk3]
-	>=media-libs/libmatemixer-1.10.0
-	x11-libs/cairo
-	>=x11-libs/gtk+-3.22:3
-	x11-libs/pango
-"
-
-RDEPEND="${COMMON_DEPEND}
-	virtual/libintl
-"
-
-DEPEND="${COMMON_DEPEND}
-	>=sys-devel/gettext-0.19.8:*
-	virtual/pkgconfig:*
-	!!<mate-base/mate-applets-1.8:*"
diff --git a/mate-extra/mate-media/mate-media-1.24.1.ebuild b/mate-extra/mate-media/mate-media-1.24.1.ebuild
index 33d437844873..6e69edb07a47 100644
--- a/mate-extra/mate-media/mate-media-1.24.1.ebuild
+++ b/mate-extra/mate-media/mate-media-1.24.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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 68cd6ef1de62..077717dcc705 100644
--- a/mate-extra/mate-netbook/Manifest
+++ b/mate-extra/mate-netbook/Manifest
@@ -1,4 +1,3 @@
 DIST mate-netbook-1.24.0.tar.xz 356072 BLAKE2B 843e90753e660e531377cc25880a1bbab8a8f200c293bd05454fbb2d27f333684cd1429bfa5596c308c039505752d53156bd83fc09e6eba955eea7267eb502ac SHA512 fd2efbfaa3fb53f96bf9bff28eba70d3cd46b723a63e6748af0cb8314821cbafdc8d0122d402e89ac2742247685e630544f3d98149514114de5a3e38f7fbe471
-EBUILD mate-netbook-1.24.0-r1.ebuild 640 BLAKE2B bcf513afe16d89328f67991b528db15131cc10e93905ac9bb8006b12e62ca498bf507ed0b33ef4e81a5adb387e8b36814500b1edee5cc4c75a497ce14c04e778 SHA512 5b5e9ddce5ba5a82a45a7a6903b8c95d416012a55319b2606e4dad563845a03349d8c4bc4755501cd4f42218430112c595282e27aa415a04cd871bd0501fa7ee
-EBUILD mate-netbook-1.24.0.ebuild 642 BLAKE2B e40f8f24e7b6b760ca2ad21a3dfe2492db65a6fbd85eef29d6c9709f30fe048758dd5170a4e2181b3e5963060bd38ca7ef9219d83d2c3aa3c1ecb821631c3ad5 SHA512 760635e867113a09d095804b5ca622069632082d563019ddc6efe66142e03d914d9991eee6e729f386614508a278c7215bbc9fd061a788ebe38633641095e933
+EBUILD mate-netbook-1.24.0-r1.ebuild 638 BLAKE2B 03df5791a2fd9a28fe9f4310e45a5987dbaf811552f0f1fb8177a1975d14f07a2c32b670bad3054b60649f547236004f903cc6122fe17bb91adaab2fd97515b0 SHA512 ca11dd03b5ffa00c071f24c44ce7c5701b0e0c21179b7fb7ab464cf170d14d07796ad415fd6a66b6dafd85e1227c7771b5529b7fae46c6524a24062ae8a0a7f3
 MISC metadata.xml 495 BLAKE2B 69f4f61082d017e4e92917edcfb1fc9be696c5472641b0cd81714c07a29f4495644f4120fbd0292f8c5d1d40b3642a095969281ed2c2ad8896ff3156c3fba3bd SHA512 8edc358ede2010384cdecc1e430aa9cbf90bb64c3f52d71ad2bf30d4cb84e38bdf48a4b2e45920b35ada734ffe4a46b44f363b6bf18ba2247f6abe290b5131db
diff --git a/mate-extra/mate-netbook/mate-netbook-1.24.0-r1.ebuild b/mate-extra/mate-netbook/mate-netbook-1.24.0-r1.ebuild
index fbc817ffde6b..17a460de85bc 100644
--- a/mate-extra/mate-netbook/mate-netbook-1.24.0-r1.ebuild
+++ b/mate-extra/mate-netbook/mate-netbook-1.24.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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-netbook/mate-netbook-1.24.0.ebuild b/mate-extra/mate-netbook/mate-netbook-1.24.0.ebuild
deleted file mode 100644
index baad717ade18..000000000000
--- a/mate-extra/mate-netbook/mate-netbook-1.24.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-DESCRIPTION="MATE utilities for netbooks"
-LICENSE="LGPL-2+ GPL-3"
-SLOT="0"
-
-IUSE=""
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.50:2
-	>=mate-base/mate-panel-1.17.0
-	>=x11-libs/gtk+-3.22:3
-	x11-libs/libfakekey
-	x11-libs/libwnck:3
-	x11-libs/libXtst
-	x11-libs/libX11
-	x11-libs/cairo
-"
-
-RDEPEND="${COMMON_DEPEND}
-	virtual/libintl
-"
-
-DEPEND="${COMMON_DEPEND}
-	x11-base/xorg-proto
-	>=dev-util/intltool-0.50.1
-	>=sys-devel/gettext-0.19.8:*
-	virtual/pkgconfig:*
-"
diff --git a/mate-extra/mate-polkit/Manifest b/mate-extra/mate-polkit/Manifest
index 24bc9d24f3ea..93aed35d8913 100644
--- a/mate-extra/mate-polkit/Manifest
+++ b/mate-extra/mate-polkit/Manifest
@@ -1,4 +1,3 @@
 DIST mate-polkit-1.24.0.tar.xz 332652 BLAKE2B 293d964f2410d2f60047d1e01e2ba864c22e8bda00e5b659329d097391b2988349c70dfbd953f223c4212887d16d54f1f5a7eb21e38b69b553d54b1966647cb1 SHA512 8d759bd5f78750c75dc92ffa27e555ae36ae7199b76483cbfe7e0848d3a66cda5b82c98bf334068eb79a1344757665cf7d1bf403e4e908e332ca929c8ebe2a98
-EBUILD mate-polkit-1.24.0-r1.ebuild 890 BLAKE2B 014164db70e1bd8b397216399094311e43f3612cba45c2cc51dc643a12d8f8aac9ecc941e055f86eff7ecba18e4401f343c72275b31ebabf3f8b402f6e8daad4 SHA512 b376f1108c45bfce0aceb36382df13982dfd6faece4f5ad61b1e40787096bad2eede67c726d3878bf56b6642e6ff5139a8f74c68474e51a904f12a20c69c5908
-EBUILD mate-polkit-1.24.0.ebuild 909 BLAKE2B 9f1ea23a2968804672ee3e5a71cf1c76115ad5d0e2dd6badea0168ef9ea3f50ec40f3f4e639957af57c7ea06a7e53d486954ad911bf36f99adec5c4761828ccc SHA512 f1e68e833cefcf16c5fd53e9e96abd4169d0269fc44df508a1a929ae6ff8bd8397a5c9207bd31fcd043d7c79d8cbfbb641d9869ea7ff621f6c1528def6562dde
+EBUILD mate-polkit-1.24.0-r1.ebuild 888 BLAKE2B 4f45e3f7b07cc0342ac4900e2eab5cc4afd80aa2586a6ffe753e7532a19f9a726ae191bb1d3ec6dc8e3ff2b98ad0e5df88cf59807a403bb5a2e51f0129856715 SHA512 38337866b1663fd09cada7f7e8c65cdba8b2b9c191ba971d035fa10fce43b1a0856f34fb389f8c51ffc7045c0104228a3a806c62823b12b85f3de9446ef5a37c
 MISC metadata.xml 441 BLAKE2B 299b65dc443f658b080598b7e1dad457948870b53964f1fdf532192c5c4062ffcca29660003fd45bd6ac376f00b6511b5582ecc312c312179979a47ce9c4819a SHA512 dd57c92f8a4881df822821fa48ba75ea02eac47728fd2250fd15d79758be30b4dcc6bfcc7945de9b57bb64dde4139d32797ebbb7678b0d619c41c2eaaeb3129d
diff --git a/mate-extra/mate-polkit/mate-polkit-1.24.0-r1.ebuild b/mate-extra/mate-polkit/mate-polkit-1.24.0-r1.ebuild
index 429c5e890f73..a8482da2b7c7 100644
--- a/mate-extra/mate-polkit/mate-polkit-1.24.0-r1.ebuild
+++ b/mate-extra/mate-polkit/mate-polkit-1.24.0-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit mate
 
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 DESCRIPTION="A MATE specific DBUS service that is used to bring up authentication dialogs"
diff --git a/mate-extra/mate-polkit/mate-polkit-1.24.0.ebuild b/mate-extra/mate-polkit/mate-polkit-1.24.0.ebuild
deleted file mode 100644
index c625aa776f5f..000000000000
--- a/mate-extra/mate-polkit/mate-polkit-1.24.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-DESCRIPTION="A MATE specific DBUS service that is used to bring up authentication dialogs"
-LICENSE="LGPL-2+"
-SLOT="0"
-
-IUSE="accountsservice appindicator"
-
-COMMON_DEPEND=">=dev-libs/glib-2.50:2
-	>=sys-auth/polkit-0.102
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.22.0:3
-	appindicator? ( dev-libs/libappindicator:3 )"
-
-RDEPEND="${COMMON_DEPEND}
-	accountsservice? ( sys-apps/accountsservice )
-	virtual/libintl
-"
-
-DEPEND="${COMMON_DEPEND}
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=sys-devel/gettext-0.19.8:*
-	>=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)
-}
diff --git a/mate-extra/mate-power-manager/Manifest b/mate-extra/mate-power-manager/Manifest
index f66879dad7e9..1b576f464677 100644
--- a/mate-extra/mate-power-manager/Manifest
+++ b/mate-extra/mate-power-manager/Manifest
@@ -1,6 +1,4 @@
 AUX mate-power-manager-1.24.1-libsecret.patch 10306 BLAKE2B cf9789f62117c3aded2ce2d73027393bb5c19364f847fbbddeaa7b3b9be1bccdff3b2b1de28198965d65d4f906994c7f91bbb45448cedad0515a8a35aef12e22 SHA512 8646269729d01287cdf213a2a20a262fb658ba95fac47b521dd727ac8a4c3b81776cd24f6d9a3afc9311a4ebf2fe5cacece1db9487ba74f6cb04f008fdbf6238
-DIST mate-power-manager-1.24.1.tar.xz 6245524 BLAKE2B b9be1aab7e2f397edba9a681310a9903b11e11abf1af8557c613a1e6bf7b89d5aa495ddfcef4bc23f11aa6aca215b86e3a1c9adfdfd481f0e4353268ca5dd7cd SHA512 57bae519bfa2894bc6923bf0932f823bcabe2dc0de06dc6676597708482b369a24f39bb94558163f0fdcc2d764702b87f58abc1793679a1c7fb7f53be074bae5
 DIST mate-power-manager-1.24.2.tar.xz 6194976 BLAKE2B 6f533f9d6cbe99e9acf6e0fe9deb641e771d38f80add33b1f51aaa27aff46e2bb77d7da60ee7994908667d34b6f05c868472283cf9fd52c251467482c7c64bb3 SHA512 edbad37f41e67219790dfe704936be6fcf1d727cdff3b51cb43234b0d48f53666361d0f048704a594a594b5e124d7d8ea9d626c560cbc23ba4de3dcaafbd55ff
-EBUILD mate-power-manager-1.24.1-r2.ebuild 1616 BLAKE2B 07bf9c2fbf929be13eb5adfb0f3ad63f7b54546df60b41d791a32e17410fcd8ab20e229ebfe574af0e7b9b9417918903742e27346899cf4e1974d886599953f0 SHA512 c183f8bd73a3ca03c8db60e2d8a18d4bb13147f9107be3523d0c580f87aa7727c10aa37d615646ebd303115d5f7f11a68460ae56feaac713a1b6285b32b1fffc
-EBUILD mate-power-manager-1.24.2.ebuild 1624 BLAKE2B 4dfdd3c1463555491e2c4290e7a099c3a4ac89212f8e51ac0f880b09f42d6cd273cab6873e83a866d337012e057ef9bafe70a98ff54e6795915f144a73a075a7 SHA512 e69c5cc4c1bdd2a0bc8e6e81453a90881fe185a1809782c64ef428d9ea23200686a91575b987a58b0ce3eba8f7a44ea0db5fffe3624870ae38fd14544f375c5a
+EBUILD mate-power-manager-1.24.2.ebuild 1622 BLAKE2B ea09d2a0d2ae88b78b2073a5fa300eb6f519a60e8c887daf48b4e2e84faec1bdc96dd12c1c30411aee2a17a02e76c8ebe8df7e893cc4e97c8bcfd03f57f19a9b SHA512 7dd686e2f90da5caaffcc9d9586be3c3211ecd24173e975e14df45cedc73e47c5a21c0402b1ef13746ac8e4e8823ef7dbd0fbfa39c4a39f410bc6cc18b5cc960
 MISC metadata.xml 521 BLAKE2B f8f0c058645f6820653cc71154b94e7a8e0b0c221e18c6c50c53176f11ba0d7cfee37665bc7d138d81b44a6b80baf8266221b6a519ecc6ca129d604545ff9f75 SHA512 0bbcf48a03fde54a8b12ebfa3991ccb2e930a10496a39999c36640a971e4fb87acbc39fe88f1a72803ddaa10638ff4b1a9009858ca4ac2220529ce06b485a517
diff --git a/mate-extra/mate-power-manager/mate-power-manager-1.24.1-r2.ebuild b/mate-extra/mate-power-manager/mate-power-manager-1.24.1-r2.ebuild
deleted file mode 100644
index 7f390cf798f3..000000000000
--- a/mate-extra/mate-power-manager/mate-power-manager-1.24.1-r2.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-DESCRIPTION="A session daemon for MATE that makes it easy to manage your laptop or desktop"
-
-LICENSE="FDL-1.1+ GPL-2+ LGPL-2+"
-SLOT="0"
-IUSE="+applet elogind libsecret policykit systemd test"
-
-REQUIRED_USE="^^ ( elogind systemd )"
-
-# Interactive testsuite.
-RESTRICT="test"
-
-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
-	>=sys-power/upower-0.99.8:=
-	>=x11-apps/xrandr-1.3
-	>=x11-libs/cairo-1
-	>=x11-libs/gdk-pixbuf-2.11:2
-	>=x11-libs/gtk+-3.22:3
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrandr
-	>=x11-libs/libnotify-0.7:0
-	x11-libs/pango
-	applet? ( >=mate-base/mate-panel-1.17.0 )
-	libsecret? ( >=app-crypt/libsecret-0.11 )
-"
-
-RDEPEND="${COMMON_DEPEND}
-	virtual/libintl
-	policykit? ( >=mate-extra/mate-polkit-1.6 )
-	systemd? ( sys-apps/systemd )
-	elogind? ( sys-auth/elogind )
-"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.3
-	app-text/rarian
-	>=app-text/scrollkeeper-dtd-1:1.0
-	app-text/yelp-tools
-	dev-libs/libxml2
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.8:*
-	virtual/pkgconfig
-	x11-base/xorg-proto
-"
-
-PATCHES=( "${FILESDIR}/${P}-libsecret.patch" )
-
-src_configure() {
-	mate_src_configure \
-		--enable-compile-warnings=minimum \
-		$(use_with libsecret) \
-		$(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.24.2.ebuild b/mate-extra/mate-power-manager/mate-power-manager-1.24.2.ebuild
index 0e47db7552d7..74f964b68e4d 100644
--- a/mate-extra/mate-power-manager/mate-power-manager-1.24.2.ebuild
+++ b/mate-extra/mate-power-manager/mate-power-manager-1.24.2.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"
diff --git a/mate-extra/mate-screensaver/Manifest b/mate-extra/mate-screensaver/Manifest
index 49e7ea443a38..643740ccdf96 100644
--- a/mate-extra/mate-screensaver/Manifest
+++ b/mate-extra/mate-screensaver/Manifest
@@ -1,6 +1,6 @@
 AUX xss-conversion.txt 1026 BLAKE2B 4675ecb7d7ce45b28183ff503739b5d3853e8a68adfb8e4bf92274944c034d4f043c8854cc54a801ad72160bf452c645dfc5a0d35a71b967c9094f2a8464e59a SHA512 149d28bf7ff9dffe75f0a59408d91eff6537ec27a9457bf2419efe78e9b39a11796b341176e6ba4b1a183cc3ead080abe0ba85f51a3d57b0ff54dae8a3ec312a
-DIST mate-screensaver-1.24.0.tar.xz 5075860 BLAKE2B f669cb9ce1c84cdd2dd84b1c88b668ad1910102ae5d9765117d313b6ece03e535b5fdaae600d8f3315346ac1109d1316e15c0dcac5bd4a637b682fa7b5d1e22b SHA512 8947b85ab8b006a1756649131a9184e4eb8f44c563f5a1b55840aa8280820713bca1ce46fece92b5ac44a73193bfe965e8ef0d17e8e403a751807ee72c674cc0
 DIST mate-screensaver-1.24.1.tar.xz 5073836 BLAKE2B 501c8dffbb5e53b88414c799a6e4d25cf89dfe490e6a902901c339b142e2b687dc2e668f65349a2ff43b6eb44d7721658de771b1a698624f95d1828da2fbda67 SHA512 f7cab280da90623ad265beb84770e48431ae6685fbb1eabc7cd2ad07b0f8ed5da2426017243d83271b969d2e020b8afcc93a6135b4c8e42a29f454a4e826b277
-EBUILD mate-screensaver-1.24.0.ebuild 3019 BLAKE2B c0733bc666d0a3267afd70e62433761277a29124bd5df24c26a9d4f271b5bd1425a7e1cb4afe086115eea8b7930fafdb5651c346c8b8d51821e0a697c7ed7927 SHA512 5b4f1fe5b6b37b5605eeacdc87233b63bbddde4a66082c6088c386c085f312d6f13befbabb6bf7186ad6b323a9b45f0ad55b40a0da02b66c1ab70a82f4d96985
-EBUILD mate-screensaver-1.24.1.ebuild 3021 BLAKE2B d61744e295fd8001a450ae67858ba2b3add837d9420933cf7b050fdda54841f6e393246d931bd10781d9256acd7b2fcafb7851238e2ba6bef74aedee62a842ef SHA512 4169f1fcb5b42c90e74542834289e672867370396d5b69f065db7d5b7df1bebf1f3659b0915a8779337b16a6528522dbe89da783453a9aa69442d491e13003e8
+DIST mate-screensaver-1.24.2.tar.xz 5099224 BLAKE2B aec1d95ba23f983d592e93ef97ed446b3fb05888d3ad99cf366476b84bf4feff59c3f84696ec0cc525acde69433f4a335b9f1bd8df8f42e602f6c7188c707436 SHA512 4c41d25ee2345e3db0c9fd7b463f430a8a4a7dbe8a589670d2072719bc0812c32c2ff8f5dbcd88d712e4aca1c8c0c89262a58581f8b17ead036360dd37c72d9e
+EBUILD mate-screensaver-1.24.1.ebuild 3019 BLAKE2B 423bf1a71a2b8d2b3af23f5cf35faccb0919bdcfee51b63d5f5de12c3d79afdc539d3cc09435becc7dda102d62460e8b323467a7d7bc60d3b9fdbcbd91c47f5a SHA512 3b3a54d0bb9f5239bcb0b0759678cf1272c59bea69e841ee193ef22a78543e5258509d8064ef8c96b9cde1b4812811d71430b46d3349ef2bf2d886f24f9c1aca
+EBUILD mate-screensaver-1.24.2.ebuild 3021 BLAKE2B 0cf7644beeb16e974980028ad58e06b93e50d61c873acc8a4f940e2c0f77061b39496c635d26074cc3f49478d60a68b7b1c085bd969e92034b07fbcf8a8958b6 SHA512 a8d17288cb1fa41435505c4ac46d168dc6e6dc4fe154717f4515223f2ec8cb86ed776973f254a9f5b1eca036ddcf4045939957266b5b4aa23aa6fbae12ad1c2e
 MISC metadata.xml 345 BLAKE2B 28455ac89b99bf42e67e5da0bf1efb013c7275aebdd43b3c3c518f86afcd517eb761f9f4ee23a0558dbd797ac3d9a6ef04fc0dcc54666e38a51233742598406c SHA512 d9cd02ca623afdaf1d5edf70bbca3cb7f21e510f3a7f51d7293f104c0e445ec1e1f90c8d3f2ad8493599227ea2a46144b2748db27499d81e4f6d72e1da2cb2cf
diff --git a/mate-extra/mate-screensaver/mate-screensaver-1.24.1.ebuild b/mate-extra/mate-screensaver/mate-screensaver-1.24.1.ebuild
index b17ccf088202..9e7c7df9c0c9 100644
--- a/mate-extra/mate-screensaver/mate-screensaver-1.24.1.ebuild
+++ b/mate-extra/mate-screensaver/mate-screensaver-1.24.1.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-screensaver/mate-screensaver-1.24.0.ebuild b/mate-extra/mate-screensaver/mate-screensaver-1.24.2.ebuild
index c496eac13b11..5ea1141f975d 100644
--- a/mate-extra/mate-screensaver/mate-screensaver-1.24.0.ebuild
+++ b/mate-extra/mate-screensaver/mate-screensaver-1.24.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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"
@@ -16,11 +16,6 @@ SLOT="0"
 IUSE="X debug elogind kernel_linux libnotify opengl pam systemd"
 REQUIRED_USE="?? ( elogind 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.50:2
@@ -60,6 +55,11 @@ DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig:*
 "
 
+DOC_CONTENTS="
+	Information for converting screensavers is located in
+	/usr/share/doc/${PF}/xss-conversion.txt*
+"
+
 src_configure() {
 	local myconf=(
 		--enable-locking
diff --git a/mate-extra/mate-sensors-applet/Manifest b/mate-extra/mate-sensors-applet/Manifest
index b41766d599f8..575e242285c9 100644
--- a/mate-extra/mate-sensors-applet/Manifest
+++ b/mate-extra/mate-sensors-applet/Manifest
@@ -1,5 +1,3 @@
-DIST mate-sensors-applet-1.24.0.tar.xz 580536 BLAKE2B a72198917a3b87c1a9ed941aa272cab7439bcd07cb1bb2dbadb0fcd21bb5d6f1cc05986800de7d0f68c2c260cf9556f1e239a2ad2fd01bec8bdccad0180117b2 SHA512 039834b7cfe641e670e372e311da3d737254ab3cf13b27e71c6555888ac1165766fe2d940bcea44a5ceed5f0ddcd3390d01331d927121137c21a6647c68875c2
 DIST mate-sensors-applet-1.24.1.tar.xz 578964 BLAKE2B e9a7eacb032738014c3e91595ae1f2673973b20c09fd02bd186aa5468773a1322022fbb245b9ec6e9c987405014b91e0f7c12e072f9c3ba6cd9df32c1ee99703 SHA512 3bf21d501e067a2ce002c5149f42161cc6917609ceb2396b705e905987cb4d989725ca825c6de7bbe4e950f7a01e755c2cd5b45532d6f65aef690f394741489a
-EBUILD mate-sensors-applet-1.24.0.ebuild 1335 BLAKE2B 7160531f1356b6b10f554aa06ac752287f34359a8bdc912eecc1e163c28bdcd4b4f0046afea25c137efd0c4eb8c9c7e3b614706f68c77f6f80223eb9f661ed04 SHA512 8847de42c71ed2e27cbe54316c6c453844cf94cf27ddde7328a214d261db22f37e364632664bc755ad90e23cfe8a771b6ba72bb909f419625bb00737700874a5
-EBUILD mate-sensors-applet-1.24.1.ebuild 1302 BLAKE2B 9bd28123ab68d71c5d41b88109e9f71bffe9760a680b3cb9e57d3a0fac2939ca1fa3c62acffa5d58208593c597a03c9dcfce204b18a9c6d2f2778a100bc89a32 SHA512 6d34b82c622e9a18cacedd0b8dffae400856183b0c43e50512765c1b6da9226f65cbf5c74fa5171a8cbf30691134f5df953c5a136cbf221239847cb6a94a4783
+EBUILD mate-sensors-applet-1.24.1.ebuild 1300 BLAKE2B 755c4ca998d6551ec1109866786f9dda4453aed3607a7bb44148abebb494319fe4b8fa9656de2d74bd180039f6e365be1fa5cc87baca9dc7dd3e1d39ffdde924 SHA512 3f472fa9e518b7a69844e31e0165b867f060a7001ea1412f4a105ab9cff0b99cf7c0bb5f633f3e4ba9968e2cc193e5ca02a46b8d291af4d40ae370902c2e808b
 MISC metadata.xml 348 BLAKE2B 3e34850491c3dce6bfe3771ed94ea37e68d9c8131594f4056c40e754f5556a4dbf03e434a0f3d19eaa6177a0a484a1b50b8de1c67a4eadf1faf6e5b56fa70166 SHA512 32cad99749c326ae12caa346b0bbf85779cbf9f35b85c4f729358dd7171d468f486c761e33d2938fcac445485ec256d733150d7dedc7c9e6b271702ba7c454ab
diff --git a/mate-extra/mate-sensors-applet/mate-sensors-applet-1.24.0.ebuild b/mate-extra/mate-sensors-applet/mate-sensors-applet-1.24.0.ebuild
deleted file mode 100644
index 7f07d8dd5b0f..000000000000
--- a/mate-extra/mate-sensors-applet/mate-sensors-applet-1.24.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm x86"
-fi
-
-DESCRIPTION="MATE panel applet to display readings from hardware sensors"
-LICENSE="FDL-1.1+ 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
-	hddtemp? ( >=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}
-	virtual/libintl
-"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/rarian
-	>=app-text/scrollkeeper-dtd-1:1.0
-	app-text/yelp-tools
-	>=sys-devel/gettext-0.19.8:*
-	virtual/pkgconfig:*
-"
-
-PDEPEND="hddtemp? ( dbus? ( sys-fs/udisks:2 ) )"
-
-src_configure() {
-	local udisks
-
-	if use hddtemp && use dbus; then
-		udisks="--enable-udisks2"
-	else
-		udisks="--disable-udisks2"
-	fi
-
-	mate_src_configure \
-		--disable-netbsd \
-		--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.24.1.ebuild b/mate-extra/mate-sensors-applet/mate-sensors-applet-1.24.1.ebuild
index eea8796ced63..429b41a3b98d 100644
--- a/mate-extra/mate-sensors-applet/mate-sensors-applet-1.24.1.ebuild
+++ b/mate-extra/mate-sensors-applet/mate-sensors-applet-1.24.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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-system-monitor/Manifest b/mate-extra/mate-system-monitor/Manifest
index 08fa14f9748a..206f1f0bf728 100644
--- a/mate-extra/mate-system-monitor/Manifest
+++ b/mate-extra/mate-system-monitor/Manifest
@@ -1,5 +1,5 @@
-DIST mate-system-monitor-1.24.0.tar.xz 2437396 BLAKE2B 78c8774ee1832772b2cda06bca051c91e10e882b841373e3f30575ab1d05cc2b799962d964be4cc8416f9747e44031e579410d9851bb82d6a13f6023f1a30b2a SHA512 430a2bf81f447143ba53cecb1c2659903cd957e313f6690adea363e9a8deccfd4ad64ebd8ce18dfb31a67fa7b51cbe087ffed7b5dcba5dd03b1010ec41b4d282
 DIST mate-system-monitor-1.24.1.tar.xz 2420872 BLAKE2B 27572e523ea358a5315b6a42dc29e6c48c4341d4cdf34edb039429a455e1d924417aeb8602e0a71d4e71b04988ccadc82bc84794411644eefb1bd976e5744e90 SHA512 5fdf8ff52584f91fbe12270af2b5bb1c81d5c4d6001bdaad9c6001dbb6e6020254048e32aa6549eb686ad17998c1aa220e5463057502ba514c4a5b82953f2b05
-EBUILD mate-system-monitor-1.24.0.ebuild 1292 BLAKE2B e4b2e5ade0eb677b7e55c1a0f461a7644ec0859515c7509d33d91d15042222d62938d79f6399dd0cbe620a42be383c9d89c8561295cd1d4cdffec9bd7633927e SHA512 08d59d42599f6420ddb23bccc5cfec42e3d031965da89fba241ca18664a0bd778387f5c0861b07f55990e820cc6a7fe762f88080e70424c2f6bb7b38fee0143b
-EBUILD mate-system-monitor-1.24.1.ebuild 1290 BLAKE2B aa765ce8a8f318b083cbfa538a5a1fbcfdba64ff816eefe1e12cc6d8bbca24f219f3147de77f0c6d74e0fd4152ad3d2674ff9304813761133a381f0ed9fa4acb SHA512 5137ac77d37f9b35bdcacf2356db868efd2a09775413819bfdf3daace60fa9a5437283a6b1c696e16422b6dbd1c73d572d24e2371a4699f3bfe8941d1f741558
+DIST mate-system-monitor-1.24.2.tar.xz 2429196 BLAKE2B 03d0555d74ba4ba9a80727fa383ad02515a46f61fd1df3487b7acabef4b0561e03d86082c9c161a533716416bab73fad5bd826329c69d1826eeb7dd73a1b4e41 SHA512 4fd0f1a3dc5611d66b2e1ca35171f2056994332f87d895321c384a696afa359a2b78d2b0c2d698923039549f886976f04b1a8c92c928dfe9e2a1a159540a1895
+EBUILD mate-system-monitor-1.24.1.ebuild 1288 BLAKE2B 6d06d9bfdec4a216fb87d479ec57635c895846aa84c7286302480d867d112ca8a054f48af0bfb70f6b1fda49b9dfedb3557248e1a28c569facab336197d9f8d5 SHA512 d44f3ba0bfa611a8c0faae404c2b8bff7abee9282835dd55c9bc8755694dd2738e01a2ef18e93faacfe4c67f0a5ba2e9da7ceab5739f91089868ac4d22054d59
+EBUILD mate-system-monitor-1.24.2.ebuild 1290 BLAKE2B 3baf4eb20c1e2e3b5411ebe2a3c606339660c77dc83c4fffec51d38c9fa49bc3d2a4cdbbd493d00adb96248d329d9b68ed6c17e02bd5d6ff52d9c3488cda2cda SHA512 9791e3e1708db37957cddcde6c05258220abfd6cc46d014d29262f86eb443bfc1be0f92dc873f7b7b884019a8705c11dc7f187fc83e93b677b02720ce3dff5c3
 MISC metadata.xml 348 BLAKE2B fe7ff06b7a0366617fb30e7a98fa7054c32469bf49691855183ee7b9991c1aebd5f431081e5d7efe07ab3a2b2424630bea621c2b3369338f6bb5348d1ba70de7 SHA512 4cb1bd5f11887274393c957be697ce784af74a39258ead2e9ccb586ac8d4bcab06a6aa2a76e8f96a85d2d818092250eede243775b61222493739440c59cc9c9b
diff --git a/mate-extra/mate-system-monitor/mate-system-monitor-1.24.1.ebuild b/mate-extra/mate-system-monitor/mate-system-monitor-1.24.1.ebuild
index a031a4ddd4c4..50c9dad29452 100644
--- a/mate-extra/mate-system-monitor/mate-system-monitor-1.24.1.ebuild
+++ b/mate-extra/mate-system-monitor/mate-system-monitor-1.24.1.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit mate toolchain-funcs
 
 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-system-monitor/mate-system-monitor-1.24.0.ebuild b/mate-extra/mate-system-monitor/mate-system-monitor-1.24.2.ebuild
index 5634e8c0117e..1c7ebffed1d0 100644
--- a/mate-extra/mate-system-monitor/mate-system-monitor-1.24.0.ebuild
+++ b/mate-extra/mate-system-monitor/mate-system-monitor-1.24.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 inherit mate toolchain-funcs
 
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 
 DESCRIPTION="The MATE System Monitor"
@@ -40,9 +40,9 @@ RDEPEND="${COMMON_DEPEND}
 
 DEPEND="${COMMON_DEPEND}
 	app-text/yelp-tools
-	>=sys-devel/gettext-0.19.8:*
+	>=sys-devel/gettext-0.19.8
 	>=sys-devel/autoconf-2.63:*
-	virtual/pkgconfig:*
+	virtual/pkgconfig
 "
 
 src_configure() {
@@ -53,8 +53,8 @@ src_configure() {
 		if use elogind; then
 			local pkgconfig="$(tc-getPKG_CONFIG)"
 			myconf+=(
-				SYSTEMD_CFLAGS="$(${pkgconfig} --cflags "libelogind")"
-				SYSTEMD_LIBS="$(${pkgconfig} --libs "libelogind")"
+				SYSTEMD_CFLAGS="$(${pkgconfig} --cflags 'libelogind')"
+				SYSTEMD_LIBS="$(${pkgconfig} --libs 'libelogind')"
 			)
 		fi
 	else
diff --git a/mate-extra/mate-user-guide/Manifest b/mate-extra/mate-user-guide/Manifest
index ccab810c1507..431e2332205c 100644
--- a/mate-extra/mate-user-guide/Manifest
+++ b/mate-extra/mate-user-guide/Manifest
@@ -1,4 +1,3 @@
 DIST mate-user-guide-1.24.0.tar.xz 9029524 BLAKE2B 304209588d67f83e0d3505277a2a964c7f76582755073886ebac5693a3dcd771bde1d1547430ac94113929da0441c85f5f86a6f27cb995c252a770d44c113154 SHA512 80129fcbf628dd10d0748d0a35f9456c15a3748c1cd407aa7adf4d90e5f87d999778d136d772c64392279152da9b76912378b16a894f03dc5d11bec478ad6301
-EBUILD mate-user-guide-1.24.0-r1.ebuild 515 BLAKE2B 800ac8965e40aa057ab2cb4ac11fb3d22e0ebcce687d775a30b498fef83711c0734eb3acf467bcfd4b6211f331e0149a39d4cf8f37616f716bd428be662d1d4f SHA512 fea873ae2b677d428f6e438e2d7ef19784a8e5782d7110146f2a4e9c768a4abb0a0a87fa8388edf5953b68d58b18d7faf773c67a21f647352622d890411a90f8
-EBUILD mate-user-guide-1.24.0-r2.ebuild 537 BLAKE2B 0a3b383d19dc9ffe16a408c365d18142a3732d18a8720ee1ee960732a8312793aea68b29b53b03e8634b0cc2e8b7c9b310440e3ca422500c677d2ade278ac707 SHA512 867a56a2ecf36de38f7ff893e16f30f7a123c9ae4e25678157ead1d1981761897c053ade4c27214167db8ac6866c9205f246cb48a5f7e7992eb81c324f4bc6db
+EBUILD mate-user-guide-1.24.0-r2.ebuild 535 BLAKE2B 363c12c819d0cd29770e3cd20a5179ec10b81022e8a286a1b071070dff42198ed6c3b00889d8ed978764d52d66977395bacb99eac2d7d3dd9edb86804deb9b3f SHA512 e00e83ab0d4f8887b6dd1c79cc6e789fc3a74c4385fc16dbfee9e18c20661db05279acbfad77ff38e596328d3ec2e45552a66897f7e1545d78f5a77ae07c61f1
 MISC metadata.xml 344 BLAKE2B daf4b6a1920fba3efa9c5253a08edd91d26b90fe9a81bec69de4c3f21423ad9d7fd8b5ece9036c3e834900fa60b483e7c73b7572bdbbe8a31d16fc81a50aa09b SHA512 d0ce9f32a04fdae27a476a7197b067f85b1a4889ab758af1c761d2d59c6ca295a6d623db51a0296c64d3a6fb9ff9bea9577002f34020009b967d594b540440f4
diff --git a/mate-extra/mate-user-guide/mate-user-guide-1.24.0-r1.ebuild b/mate-extra/mate-user-guide/mate-user-guide-1.24.0-r1.ebuild
deleted file mode 100644
index d9957b00f534..000000000000
--- a/mate-extra/mate-user-guide/mate-user-guide-1.24.0-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm x86"
-fi
-
-DESCRIPTION="User documentation for MATE Desktop"
-LICENSE="FDL-1.1+ GPL-2+"
-SLOT="0"
-
-COMMON_DEPEND=""
-
-RDEPEND="${COMMON_DEPEND}
-	gnome-extra/yelp
-	virtual/libintl
-"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/yelp-tools
-	>=sys-devel/gettext-0.19.8:*
-	virtual/pkgconfig:*
-	!!mate-base/mate-desktop[user-guide(-)]
-"
diff --git a/mate-extra/mate-user-guide/mate-user-guide-1.24.0-r2.ebuild b/mate-extra/mate-user-guide/mate-user-guide-1.24.0-r2.ebuild
index b7c4ca9b315f..78d5656701c6 100644
--- a/mate-extra/mate-user-guide/mate-user-guide-1.24.0-r2.ebuild
+++ b/mate-extra/mate-user-guide/mate-user-guide-1.24.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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 5523e0c84b62..12b949e52bb9 100644
--- a/mate-extra/mate-user-share/Manifest
+++ b/mate-extra/mate-user-share/Manifest
@@ -1,4 +1,3 @@
 DIST mate-user-share-1.24.0.tar.xz 1008992 BLAKE2B 0fe21e49ff30c88c32b6b88aba84e58b3e6310d3bbd7a4873be460c97366828a7edfd24be37d2c10ea88a51c6990ee482ad595582d288ded2e4f7e0ca6f0b4e0 SHA512 15ede8754bf95ac78844cd9645a43d2deb8419dd550aee5263936d710cd13ce7f4a68cfd53e589c2dd37f87f59c9e8153f8abac711a3a7f88a2e2789dbd4f664
-EBUILD mate-user-share-1.24.0-r1.ebuild 1100 BLAKE2B 2dd083ad60b109c651ad46c2179326286c5d5e4891d0fbbbbf73a6f069826bb28dfa46215d0b350b33e4462cf6126f9733cf442b1ec89c499bb515db6e083f39 SHA512 1dc25f06dda89668b41046e76bc5db7c08ea93bdd26d2528cfbdb6044dc9271263d300475407276769cb3189d3e68457ea8aedf875c469fb270291167960fd10
-EBUILD mate-user-share-1.24.0.ebuild 1102 BLAKE2B 975da5ec09b6f4c1160a742905d10bc4e1c9770be0723dc9ec97e4ce8e59d3f44c2fbfde5bdfa1a8404d3d8d8c5fbc6d7d38e7479561834457f8d024b0f78683 SHA512 9cfecad9df86b00fa698f633602d77de3b554600d40703cc3a2cb26f64ad7eb566653269afda1f764d90a0b8e50c61d3254b87dcdf30e5047f6b620f1258d77b
+EBUILD mate-user-share-1.24.0-r1.ebuild 1098 BLAKE2B 80888945dafd4dfb006cca9c54a2d23723dff013263b13eb81eb3fe5e8acde7d6b294906ebd0fc2bd6c324bee76c93f8a645ce674adfc86a05af5a0bc0bf2274 SHA512 69523f9505bb17d705e6deb196dd9a843bcebb09508cdaec2bcba21304f32a48cf6ed3995dafc4382b4dba4430a0f54c5a4480bddef26b0c87f379ee210f95f3
 MISC metadata.xml 344 BLAKE2B 72c35ab850378b1f7386ba3d9da729e2855c20779d23a1a503186706bff164487c5f0d398dcc96f4056c2a670f815e2de874f89ca6ffe0c85749fb61416c9d7d SHA512 866efce9c0b0fbd2b8916c71d07b42a255bda4a2c4f269a6fe3390b9913aa148b44ad4b6f779f964e51715f2cc79dcdfe9e8096f2382b3e35f3bda38d8646001
diff --git a/mate-extra/mate-user-share/mate-user-share-1.24.0-r1.ebuild b/mate-extra/mate-user-share/mate-user-share-1.24.0-r1.ebuild
index 5b09cfcba02b..ad03ba381bf4 100644
--- a/mate-extra/mate-user-share/mate-user-share-1.24.0-r1.ebuild
+++ b/mate-extra/mate-user-share/mate-user-share-1.24.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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-user-share/mate-user-share-1.24.0.ebuild b/mate-extra/mate-user-share/mate-user-share-1.24.0.ebuild
deleted file mode 100644
index ec2217c7e294..000000000000
--- a/mate-extra/mate-user-share/mate-user-share-1.24.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm x86"
-fi
-
-DESCRIPTION="Personal file sharing for the MATE desktop"
-LICENSE="FDL-1.1+ GPL-2+"
-SLOT="0"
-
-IUSE="X"
-
-COMMON_DEPEND="
-	>=dev-libs/dbus-glib-0.70
-	>=dev-libs/glib-2.50:2
-	>=mate-base/caja-1.17.1
-	media-libs/libcanberra[gtk3]
-	>=sys-apps/dbus-1.1.1
-	>=x11-libs/gdk-pixbuf-2:2
-	>=x11-libs/gtk+-3.22:3
-	x11-libs/libX11
-	x11-libs/pango
-	>=x11-libs/libnotify-0.7
-"
-
-RDEPEND="${COMMON_DEPEND}
-	>=www-apache/mod_dnssd-0.6
-	>=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]
-	virtual/libintl
-"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/yelp-tools
-	>=sys-devel/gettext-0.19.8:*
-	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-utils/Manifest b/mate-extra/mate-utils/Manifest
index b9037a010fed..af3d3812ae4d 100644
--- a/mate-extra/mate-utils/Manifest
+++ b/mate-extra/mate-utils/Manifest
@@ -1,5 +1,3 @@
 DIST mate-utils-1.24.0.tar.xz 7930068 BLAKE2B 0e2c82afbc2d8a90b8c31d56d9bfbb3a477b1e9cd67108e52c96f4087d09336ed9e6980551e39b43797743b9ef86cc2beabfa84fd7a5820e38122e0d0a7c968d SHA512 d8945c85936a55d22f3ed94c9858ba84cadf552a63cdd2d9eec9120111ad71526ac88772f8e4b7a6a460b691574534e52706fba35a0395b1d894b27eece9e92c
-EBUILD mate-utils-1.24.0-r1.ebuild 1446 BLAKE2B a8e3f2c898596884e2fd5cddb519747e0e7d69efddb98c41ae9943e64f6e37096e4d9afecfef222ad060c875f50bd044c81c24ef8bda1e04ed2d40994d6d95fe SHA512 4aa7e34aa7eb2471166279e5062fc63bd37e26cccd407b7f08901c259851d841d176cbf28727f3c7df35b5e5709c2d380b3f7d5671ead8596150cfb940c3eb26
-EBUILD mate-utils-1.24.0-r2.ebuild 1472 BLAKE2B 24536bfddb8365c55c0a06940580dbc750a1a166d0d0882ddcf23eda6fc815d0e6930b12a623924281b59b26b4d6227764cb6d653db8901c3de5337a84204ed5 SHA512 c92aedd66b91e61a0faf0e6f536f7ec72a83146b9e248bf4ac8acd6582869adbbcd40b017ecc409eb3d6e7366c342af43dd858150aee9ba3d5c24413045707c4
-EBUILD mate-utils-1.24.0-r3.ebuild 1449 BLAKE2B 3b7e579e51c38c965d7d065d56b80b5acd88fa14846ac1fd03e2dc7c903e3b8ea4e6b2280f4b0fa949372b2d2a6065213f1af37e96ed9a25cb3251f91ec4e2a8 SHA512 8ecc2c36655fb2b7e2bec374a01d535a5eaabc292eec2bc625816d79062ea45b366d2dcfdb4cdb8f566a3fcb845adbff4fd9c54ef7f9fea7a7c8e6d3284c3263
+EBUILD mate-utils-1.24.0-r3.ebuild 1447 BLAKE2B b75a916ed25cd9538914028414d5026a84c8b3e9990d9a452c4ca80b2a717534a63bb9410c9a1542d591f5ea4b6df8fac1f2b28eea5d924bb3b6de83877c906f SHA512 5ba53c89c5d2ee4603a7834c215e7231e6e00066b62a69e12470ae8c5dac02f5f23c64f4de0ea804fa2ccd18263cd7bdd1525cd24113553d5661c0f8c365391f
 MISC metadata.xml 417 BLAKE2B af181dbce0a3bd1d40160da5b7b1be3a4ba345b3d31dc8d4988a146af5318bf473ad2962e9fd63fa2bfa74e61daddb5e84dd977891dee5b3b483189321bf7b1f SHA512 4c4eeb71f1cbd778f48f19da5185d9a75444a87a7abbe5d055e032f38b9891e996af84a383d7bc67ad11113da09ad034a159ec425b106340c696fad479fecee4
diff --git a/mate-extra/mate-utils/mate-utils-1.24.0-r1.ebuild b/mate-extra/mate-utils/mate-utils-1.24.0-r1.ebuild
deleted file mode 100644
index 28df90e36ad4..000000000000
--- a/mate-extra/mate-utils/mate-utils-1.24.0-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-DESCRIPTION="Utilities for the MATE desktop"
-LICENSE="FDL-1.1+ GPL-2+ GPL-3+ LGPL-2+"
-SLOT="0"
-
-IUSE="X applet debug ipv6 test udisks"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	dev-libs/atk
-	>=dev-libs/glib-2.50:2
-	>=gnome-base/libgtop-2.12:2=
-	>=media-libs/libcanberra-0.4[gtk3]
-	sys-libs/zlib
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.22:3
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/pango
-	applet? ( >=mate-base/mate-panel-1.17.0 )
-	udisks? ( >=sys-fs/udisks-1.90.0:2 )
-"
-
-RDEPEND="${COMMON_DEPEND}
-	virtual/libintl
-"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/rarian
-	>=app-text/scrollkeeper-dtd-1:1.0
-	app-text/yelp-tools
-	dev-libs/libxml2
-	dev-util/glib-utils
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=sys-devel/gettext-0.19.8:*
-	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-static \
-		--enable-zlib \
-		--enable-debug=$(usex debug yes minimum) \
-		$(use_with X x) \
-		$(use_enable applet gdict-applet) \
-		$(use_enable ipv6) \
-		$(use_enable udisks disk_image_mounter)
-}
diff --git a/mate-extra/mate-utils/mate-utils-1.24.0-r2.ebuild b/mate-extra/mate-utils/mate-utils-1.24.0-r2.ebuild
deleted file mode 100644
index bb4e5c54a2b4..000000000000
--- a/mate-extra/mate-utils/mate-utils-1.24.0-r2.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-fi
-
-DESCRIPTION="Utilities for the MATE desktop"
-LICENSE="FDL-1.1+ GPL-2+ GPL-3+ LGPL-2+"
-SLOT="0"
-
-IUSE="X applet debug ipv6 test udisks"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	dev-libs/atk
-	>=dev-libs/glib-2.50:2
-	>=gnome-base/libgtop-2.12:2=
-	>=media-libs/libcanberra-0.4[gtk3]
-	sys-libs/zlib
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.22:3
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/pango
-	applet? ( >=mate-base/mate-panel-1.17.0 )
-	udisks? ( >=sys-fs/udisks-1.90.0:2 )
-"
-
-RDEPEND="${COMMON_DEPEND}
-	mate-base/mate-desktop
-	virtual/libintl
-"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/rarian
-	>=app-text/scrollkeeper-dtd-1:1.0
-	app-text/yelp-tools
-	dev-libs/libxml2
-	dev-util/glib-utils
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=sys-devel/gettext-0.19.8:*
-	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-static \
-		--enable-zlib \
-		--enable-debug=$(usex debug yes minimum) \
-		$(use_with X x) \
-		$(use_enable applet gdict-applet) \
-		$(use_enable ipv6) \
-		$(use_enable udisks disk_image_mounter)
-}
diff --git a/mate-extra/mate-utils/mate-utils-1.24.0-r3.ebuild b/mate-extra/mate-utils/mate-utils-1.24.0-r3.ebuild
index 4ad6eec71a55..c9c3477d6b10 100644
--- a/mate-extra/mate-utils/mate-utils-1.24.0-r3.ebuild
+++ b/mate-extra/mate-utils/mate-utils-1.24.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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"