gentoo resync : 25.08.2020

41 files changed, 404 insertions, 207 deletions

diff --git a/mate-extra/Manifest.gz b/mate-extra/Manifest.gz
index 1d5fa7862174..029ed203ffe6 100644
--- a/mate-extra/Manifest.gz
+++ b/mate-extra/Manifest.gz
diff --git a/mate-extra/caja-admin/Manifest b/mate-extra/caja-admin/Manifest
index 34b602f84f6b..0f8324c21ff1 100644
--- a/mate-extra/caja-admin/Manifest
+++ b/mate-extra/caja-admin/Manifest
@@ -1,8 +1,4 @@
-DIST caja-admin-0.0.1.tar.gz 26920 BLAKE2B 29aa35ef185cd588fd9242ea2b019cb64c4a4965b77523937b8b36c3a3437f7171dac3a000b85d9c4183a962a9dc6be787589408c7804f696aeac3576b7fee50 SHA512 12f54aad32ac11d34ee8344d564d31f29a53324308923e54426ac3837702e71701cf139b150ec3ff210fb0739eb9c46b05c6380d8596031f71b71899800b767d
-DIST caja-admin-0.0.2.tar.gz 27564 BLAKE2B 975bbba48508ed6a997190ea6d5432330710ee312fe6f1e130b47894331a35c32071a40691cf69f617d268ab85dca62bb8bb4577d49bdb3c75c65ce05b4b9220 SHA512 919a92e258585e4b6275d346c82a1f9fc90462aa0cdedafb78867b80496f44bbd3459ce5a67429c5dda499bff2928a014779e81c781278ac0603f6cbebd3ff9e
 DIST caja-admin-0.0.2_p20200328.tar.gz 27087 BLAKE2B 1d8ce82026249cff4dc3360cedffb79079e6608414a7718f265a19fce1a579d7f1fc4dadf3b05dd5ef19dbd12a92a61f90c04736cc9196d2dd5d4230c8c31784 SHA512 6a134e1d53bbdbf1a617582de67f7ddba7c7e0193a714246993092dd1c96c2ccc05afdb2da5cd2dfd974f7ab95e0aeedab244f2fa1335fd157ce45b4404a1f90
-EBUILD caja-admin-0.0.1.ebuild 985 BLAKE2B 19258e5b11024d68e2d2b25381e1693dfd9e3e1d96ec2da99dba83c5fcd689183607235a795b2acbdcc81c22e7ace97be2b945815ba6bd9d4c5bd6c81e7e7c3c SHA512 c49a2e259dfc2ea42334ba35bcabd14a1538a62fc2671ac4e154ec02dde3425593935b2474c9388126930089d4ae2054117bf5309f30a765f3035c1cfb1eb522
-EBUILD caja-admin-0.0.2.ebuild 1134 BLAKE2B cbd965950ae8ee96f4502cf838a8c04ef10e45d0d50ea45d270014d8a172246d437474b5f2bf538271061748a2132921f8eeacae7742f51b291f61f42b85955d SHA512 b68d3e320f62a799ecf76d7462b636ea5eff3742064afa1df07f99ba6573c729aa347a7cc7187948e7edb3771c956dfaf54295f8edf0b44c0baa049a020ccff9
-EBUILD caja-admin-0.0.2_p20200328.ebuild 1098 BLAKE2B 0388354dc0c894077fad7912a3898f2e0279c94b23c6b9f7fe50e2e34d5316b1eab212591cd73efc4eb22bc1baa3c5e9618a75a5f7f4bfa01e6247192709f171 SHA512 afa95da5771408fa307303d0caa6daaad0a85908521a32310db2cd2a858af53a0a4b5b480f60f722febd94e30c8c37907cab358a2b99a126ecd01043bd892ebf
+EBUILD caja-admin-0.0.2_p20200328.ebuild 1096 BLAKE2B 64ef8eabe177823e3985fe487f4f1b70de95ab3f183aa44c9c44f5ccd4a9ddcb889b26264faf597cc74a440570f6c26bbe4b8799d925b8fc549ce89894deb225 SHA512 7446f2fdf74d428ac87e756d4fa4a9275783cea3b830b666b3b51822ac3900176467f08bfb52914a4f4f0d320af24fa6ba60b3044b05a5e7f90aa7128bf0277d
 EBUILD caja-admin-9999.ebuild 1098 BLAKE2B 0388354dc0c894077fad7912a3898f2e0279c94b23c6b9f7fe50e2e34d5316b1eab212591cd73efc4eb22bc1baa3c5e9618a75a5f7f4bfa01e6247192709f171 SHA512 afa95da5771408fa307303d0caa6daaad0a85908521a32310db2cd2a858af53a0a4b5b480f60f722febd94e30c8c37907cab358a2b99a126ecd01043bd892ebf
 MISC metadata.xml 576 BLAKE2B 58ee67d8ab8d6d88fc88c26f67ab9e7df19c560d693de2212389768bfb936717ff979234e420998656c1f66cc09e6c751a5096bb99ef4e3a6ffcfd971d9e52fa SHA512 d620037387d28caeee09881c6335b244d50a778713dacd3598725e14db7bb35b1c5f3e0ac5ed671b2d5d8f6dcc8d37b5fe1bdd355c874d1e62c9e9096c57f426
diff --git a/mate-extra/caja-admin/caja-admin-0.0.1.ebuild b/mate-extra/caja-admin/caja-admin-0.0.1.ebuild
deleted file mode 100644
index 0f9713cd71c1..000000000000
--- a/mate-extra/caja-admin/caja-admin-0.0.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/infirit/caja-admin"
-elif [[ ${PV} =~ _p[0-9]{8,} ]]; then
-	SHA="0af109ac79df76fbcc406d577d79f1c64d1a1fca"
-	SRC_URI="https://github.com/infirit/${PN}/archive/${SHA}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/${PN}-${SHA}"
-else
-	SRC_URI="https://github.com/infirit/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-CMAKE_MIN_VERSION="2.6"
-PYTHON_COMPAT=( python{3_6,3_7} )
-
-inherit cmake-utils python-single-r1
-
-DESCRIPTION="Caja Admin Extension"
-HOMEPAGE="https://github.com/infirit/caja-admin"
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}"
-RDEPEND="${COMMON_DEPEND}
-	dev-python/python-caja[${PYTHON_SINGLE_USEDEP}]
-	sys-auth/polkit
-"
-DEPEND="${COMMON_DEPEND}
-	sys-devel/gettext
-"
-BDEPEND=""
diff --git a/mate-extra/caja-admin/caja-admin-0.0.2.ebuild b/mate-extra/caja-admin/caja-admin-0.0.2.ebuild
deleted file mode 100644
index e8b56019ac8f..000000000000
--- a/mate-extra/caja-admin/caja-admin-0.0.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/infirit/caja-admin"
-elif [[ ${PV} =~ _p[0-9]{8,} ]]; then
-	SHA="0af109ac79df76fbcc406d577d79f1c64d1a1fca"
-	SRC_URI="https://github.com/infirit/${PN}/archive/${SHA}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/${PN}-${SHA}"
-else
-	SRC_URI="https://github.com/infirit/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-CMAKE_MIN_VERSION="2.6"
-PYTHON_COMPAT=( python{3_6,3_7,3_8} )
-
-inherit cmake-utils python-single-r1
-
-DESCRIPTION="Caja Admin Extension"
-HOMEPAGE="https://github.com/infirit/caja-admin"
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}"
-RDEPEND="${COMMON_DEPEND}
-	app-editors/pluma
-	dev-python/python-caja[${PYTHON_SINGLE_USEDEP}]
-	sys-auth/polkit
-	x11-terms/mate-terminal
-"
-DEPEND="${COMMON_DEPEND}
-	sys-devel/gettext
-"
-BDEPEND=""
-
-src_install() {
-	cmake-utils_src_install
-	python_optimize "${D}/usr/share/caja-python/extensions"
-}
diff --git a/mate-extra/caja-admin/caja-admin-0.0.2_p20200328.ebuild b/mate-extra/caja-admin/caja-admin-0.0.2_p20200328.ebuild
index 23078ea5a48f..bf4dcec2641e 100644
--- a/mate-extra/caja-admin/caja-admin-0.0.2_p20200328.ebuild
+++ b/mate-extra/caja-admin/caja-admin-0.0.2_p20200328.ebuild
@@ -13,7 +13,7 @@ elif [[ ${PV} =~ _p[0-9]{8,} ]]; then
 	S="${WORKDIR}/${PN}-${SHA}"
 else
 	SRC_URI="https://github.com/infirit/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 PYTHON_COMPAT=( python{3_6,3_7,3_8} )
diff --git a/mate-extra/caja-dropbox/Manifest b/mate-extra/caja-dropbox/Manifest
index d74c972cf03d..df2608ce37b1 100644
--- a/mate-extra/caja-dropbox/Manifest
+++ b/mate-extra/caja-dropbox/Manifest
@@ -1,5 +1,5 @@
 DIST caja-dropbox-1.22.1.tar.xz 309600 BLAKE2B a54778bae439a52babd4b9c88ed77ef9cebf01cb5e396e9e2dae0e74b1d55bb6b575d301133593b130af86ecb06f35fd2d11c3b7e3d67a7e741798ad701d788d SHA512 e7e9107c7654fac910762727782f35e3039b45e737341937d225126b2f63f8911f99281097b2488d3b79c0ed09fff4270b4c557166b94a722a2b1cd30fea2a2c
 DIST caja-dropbox-1.24.0.tar.xz 309024 BLAKE2B 2ae560dcd6e744fe96d9e0fcd876a899c22ad06b8238c2ad9e5394cf80aa8844cd634431dc6bb245396e6d919da857645488214880947e5b90413c254cd4c6a2 SHA512 64d699b4c3957d5996ef69936b4b2746641bc2db4efb7b23535febf5eed3ee767330927aeeda67747c0d72e0f052a2979ae2160ffaaf01e4fd82aff68a5f27bf
 EBUILD caja-dropbox-1.22.1-r1.ebuild 2092 BLAKE2B 6453f8d7cf59f98e9d7ea46ef7f8a168cd9fd798bb1658956faf899f3fb59a22df9288612cf4df7e4658c95c9dca7aff70d0caa36e9c7355f614f6051f6ad59c SHA512 cec0411d6b28577a88e8c46f385f4e7ba5b87ab00bf1b4d1fc007b8b4f89ba1ab08195f18e4af29bca8b78b7c4472676970c092790f3201bcc0b29601b5f00e1
-EBUILD caja-dropbox-1.24.0.ebuild 2121 BLAKE2B a3621483d42f57639d9f74d4edbba6d955e875c065e3f0a0ea7f6a642e043cf5cc609e2d6e79560dbfa18d08b1b8a2879cfc110d3082aa611b4873aeacb24592 SHA512 7721243b421c4dc86da61dc15093c042eab0a1526b69e1038e35b3d7e08788fa7ed3067034476252a15629708ba836facc92cee884d3a1d32a5f0f215eccfb88
+EBUILD caja-dropbox-1.24.0.ebuild 2119 BLAKE2B 5bc58a6d1958fabca1f401fd5a4b4eab0aa7ae41a6673f4f708c3c693bf3b03fa9d0cef662ecb9f00312380a2557c692620c73859c2e6ad896004bdb56ce072a SHA512 e3f027363a02eb66fb0208905a54857f09b241b5937b10f13a78326d921c7da7abffbf6af1d4afc6c8977daa7911e969f2e7745a216cfc96e0535b1c7306318f
 MISC metadata.xml 341 BLAKE2B b530aa03ccd9e514d43bd1014500548a5931fcd30e288bdc9b6c56e9b4fa8dc42dd4a31074efe3b8ecb5f2f55aab3da8e7edd30fa5f3c1645cc088e594da7761 SHA512 3ef87b907e90f2093cece194a580099964f434ec7a1d43e961f0c00adeaeca085fc6e141f25f4ef7da0399e71093b4e2c12f52d0c29cd2aa3768354380ec1c37
diff --git a/mate-extra/caja-dropbox/caja-dropbox-1.24.0.ebuild b/mate-extra/caja-dropbox/caja-dropbox-1.24.0.ebuild
index 5d30f1adf582..9528233e661a 100644
--- a/mate-extra/caja-dropbox/caja-dropbox-1.24.0.ebuild
+++ b/mate-extra/caja-dropbox/caja-dropbox-1.24.0.ebuild
@@ -9,7 +9,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"
diff --git a/mate-extra/caja-extensions/Manifest b/mate-extra/caja-extensions/Manifest
index f5196768a2e6..892bc380cc76 100644
--- a/mate-extra/caja-extensions/Manifest
+++ b/mate-extra/caja-extensions/Manifest
@@ -1,6 +1,5 @@
 DIST caja-extensions-1.22.1.tar.xz 439516 BLAKE2B 2135e5a30c86b6f83396b9f80ff474355fe02c652cd898728431eddef22a6804e7a4ea15579b03c0984417e81f8ba89ff856aa384e94d5168b6a883e678b683a SHA512 4c0fb47a251d4118c83a985732d8a549355907519b746a68eb8843c84328d868eec1535b68484c46e3d0bf4b42f0e0340fe178714f50b5f7cc8434c0e1883906
 DIST caja-extensions-1.24.0.tar.xz 548828 BLAKE2B 0492e1f0ca7277737102f71fd195dd585614010b80c2aafd730aacd1d817b03fe0377c430615a3e4bd4a643558c02c9c4fdb2d451079a3b213fe0e6b9d4e02de SHA512 f05a7d83f16aebacb04f75b76ca86e44c1a01d9ad6c2aefeac19398c4d9da8385e6852fa0118c763aee630e7eb6c7c81d77e0c9452200aee9cf4f058487c4dbf
 EBUILD caja-extensions-1.22.1.ebuild 1776 BLAKE2B 799b4af09abaee50c94df23bcbaf486d8d2b70c55eb3681da13793d7e4ad352d9bbad437b52939620487c653508ea4ee60512c0a088fa06725c8ea8619003686 SHA512 d8e2b70341cbf5fe5af69058b5a9c80fa8bbf52c3e4bf6e3a0fee4db2ee153b8a65d939568468c895b1f5297431a5bdd8bad33e7ba2d793706ad3332ccae63e7
-EBUILD caja-extensions-1.24.0-r1.ebuild 1759 BLAKE2B 7635948c6419c6825a1cdacec402bfe207b3c8780444fc22675e6fe91daef940216d501e9a6c029b57880a9ef84045e09c5abf81b329a0f8a9e5245488eac1ef SHA512 39f12be054a61fc7abde24e7d22c0b02dfb26c2f1a0b45964c8de31ca87e2857f12f73aa94bd6a19b9741d5d27f0d20576591f4c3cc37a041dbdd7a9c0f5760d
-EBUILD caja-extensions-1.24.0.ebuild 1760 BLAKE2B 7df779f958bff8f27fd7f79e887ee5528ac61d3d382089a8de6449ea2aaccdd344280918c8a09980b4be7d8212c60ffff1e963bc042102dc39f0ab401100bb5c SHA512 c77e7559cde36b04a055e97a3d037269f647d12390dc629e71c567b258b0f3bd553c0eeb270afa43b64c72f795141b03444b6fd8f1b9bc8e55327e0a1511ace2
+EBUILD caja-extensions-1.24.0-r1.ebuild 1757 BLAKE2B fa6cabbc57ce1b18119e9473643effab562be713f12938897402c2eb7633aac61b1a61b0087f3c2516a715253ff7eadcbbab0abd8b3286d690eeea9a0ac6430e SHA512 f198fffa42b0bbb3a066c913c22c325184443b2aa45306aee7005f61cb41a313e07bed331391a534306cdd7f444756d311148bbe7fd7d67c435b235310286b5c
 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
index 5e99d5ebdcf2..a767e891c350 100644
--- a/mate-extra/caja-extensions/caja-extensions-1.24.0-r1.ebuild
+++ b/mate-extra/caja-extensions/caja-extensions-1.24.0-r1.ebuild
@@ -8,7 +8,7 @@ MATE_LA_PUNT="yes"
 inherit mate
 
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 DESCRIPTION="Several Caja extensions"
diff --git a/mate-extra/caja-extensions/caja-extensions-1.24.0.ebuild b/mate-extra/caja-extensions/caja-extensions-1.24.0.ebuild
deleted file mode 100644
index 53f34f0a74b7..000000000000
--- a/mate-extra/caja-extensions/caja-extensions-1.24.0.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/4 )
-	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-hide/Manifest b/mate-extra/caja-hide/Manifest
index a561d0a95e61..dafade1f9c3b 100644
--- a/mate-extra/caja-hide/Manifest
+++ b/mate-extra/caja-hide/Manifest
@@ -1,4 +1,4 @@
 AUX caja-hide-0.9.0-py3-support.patch 684 BLAKE2B d0288daa9870a00b2d77a865f54567c51809548314c4d9659c270698563f59c4378734ee7f2386e9bd643fe0a7fe0226f5e8693e0d84e19c1c03e72da09a2cad SHA512 eb78fb5495d34b1e5ccf22d39b2cdbe8b482d3f205c5a4dcc42d592c9c18ba7a9aa81a98d27dbfb4331e2d5db79a4c08e121565b206d84898d242500a7c82677
 DIST caja-hide-0.9.0.tar.gz 17487 BLAKE2B 182a4e65745a6c3dbbc40121d95f7b5b34b4660ceb9fcffc60ddd51bdc3949191b7eafa258950b0a6b9a6befd63e4b6842481f20ba31b4bfab0668c261e87470 SHA512 86a3d5a661a731caf740c4086ffc041f9f5cb21f996bc21d92cf5d53df108d6d14b753165ee992f3d5574957850f041d03e4d78447fb4db67bf989f16eb5471c
-EBUILD caja-hide-0.9.0.ebuild 859 BLAKE2B fefac3a73471edf4bdd4d4335a883dc639e9c031c168602023f8e748be775dfcb0364d1fff4cdaf7954cdba028b12e306fb23af056cc4ff39d32dc1c9acbf194 SHA512 ac9b2d0bc423a38b1f7a6474df994080d55b83b4a501976bf10757daccb5d7830fd5f74030ab875acee5499cd0a1d6922e06d1e05733505d0d46c4b7befd5b08
+EBUILD caja-hide-0.9.0.ebuild 857 BLAKE2B 357e596e4dac65d8ba7a976519ee419c3369ac83812fc41893a85bdc8626f51d7bd3afeb4c1fc032d7d8c16531e16ccd740d80b3738b2b9db301b2ad6c2ed8f4 SHA512 7c68967e1d378c66fcbb40bf4614cdb7c9b5023b2915e49f66545ffa5d78a46bd299b802490e2eb81e4501d003aadb0b5ebb1785c21b7348f8133628c9cc7085
 MISC metadata.xml 452 BLAKE2B 378ffb09ea6ab3c237a27b70a7bed09607e6d854e8e5471504babf9e28266c92689e3c51d61487e20109cf0f12fb4cf842311f5660b93e8242943c29aecb12c2 SHA512 d4e54e90c06e91e08b3f159e1a38170bd1602cebc85bb99d94624515f820203baa48ec5c9f992306369f1a49c6900337216a92d6b13e76b73a0e2233b0cd28e6
diff --git a/mate-extra/caja-hide/caja-hide-0.9.0.ebuild b/mate-extra/caja-hide/caja-hide-0.9.0.ebuild
index b52dfc2604fc..60cecc4971d5 100644
--- a/mate-extra/caja-hide/caja-hide-0.9.0.ebuild
+++ b/mate-extra/caja-hide/caja-hide-0.9.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/Fred-Barclay/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/mate-extra/mate-calc/Manifest b/mate-extra/mate-calc/Manifest
index 38dd35e9a336..0d5cb022913a 100644
--- a/mate-extra/mate-calc/Manifest
+++ b/mate-extra/mate-calc/Manifest
@@ -1,5 +1,5 @@
 DIST mate-calc-1.22.2.tar.xz 626400 BLAKE2B f09bf3730a4b184026e324c4c64c7a06951ae858febf58d135b676d384d0fe77a44af0adbb2a3bedc8ab60547f029e7f314634876e7d2a878fcec3549069063a SHA512 4235e49df4517d1a43a1f6422220f5b35320c34f588eb9ff3c63aa2ff59123a53ea9723372d3fe4d8c29d40ef09a51f4bd536655b5056d840eb5c253f572afb5
 DIST mate-calc-1.24.0.tar.xz 939480 BLAKE2B 28a8184665096d477bdc80484fc9da3bf9835dd5d1c30d4de11722488d735f88336bcf990c50ef65dd0a5781fc083b5d011fd5085c2d1672e6599a28f4a01452 SHA512 ebb18f07ded5577bb0987b2027e7b73abc823a567bfa00f9cc9bfaf75de498f150b6b4c2e13486c530a3cbb078f1b798c415b33d668d952e8650799dd05c99eb
 EBUILD mate-calc-1.22.2.ebuild 538 BLAKE2B e3c20e1f4d90edb2da70fb6c08c48ccb5b5f5a6febce15a522c04db42b722f8254d00ddbf4a1855ba29c376daafef6c07cf7e7b9432d7191f25aaec7dc854df5 SHA512 d1f5c7c795b876ab8841550768a0a8637f55ca592c2801d5cfc5bd31e0fb6101634b4f8e02c86149fd21f4e22b6038ec2a7cede2ae386005cda6d4a1cd72e416
-EBUILD mate-calc-1.24.0.ebuild 557 BLAKE2B 606268c11cdcf56cc22e770b55ad77e26e3bafdb6262c28f53b67478ff5c3faa2e7325ac00a04efd4367a90c42b198e7a5c58790298df230da124d1094b5dcbe SHA512 d03ce21b14562c34f12fd25d8eea6e493e863149b663cfb44123f37ac3f7f39b6cfa623d13ebc57096c55463dcebccdea65d369ebd2a4448a80c4afa256ee343
+EBUILD mate-calc-1.24.0.ebuild 555 BLAKE2B ab2c8c25a4d8ad07cba59771e7340c7f6205fcd59af25c03f415dbcc5278177dcd5a521d02bdefbc09fb6d656e06603f6b653d17e797f75e7818584b63991663 SHA512 10c0aca0510080a89441e4b7deede858eaf73900926fad1b284ff6b45bdaed65ffb9d90731bb201a951f0e3cebf26095f2909117dd90fda77a3eaa4d8887d213
 MISC metadata.xml 529 BLAKE2B 35d3bc43838113fc4fa26e875cf6ffb519009307e6a8c06a9c2aa10a65231c231d5789c9b6c728fc4279dc76ed6c8442b68b3a538a973290785c2f65df776756 SHA512 3ed383251b99bfe8492c4a33d08f0bd42479d4d1ed3ccc4c316d2b64643bd611af27ed1238404969e6a924e1998ab0d47d8784d5b027bd276177d3875718e987
diff --git a/mate-extra/mate-calc/mate-calc-1.24.0.ebuild b/mate-extra/mate-calc/mate-calc-1.24.0.ebuild
index 77fe727bb331..971bea10a92a 100644
--- a/mate-extra/mate-calc/mate-calc-1.24.0.ebuild
+++ b/mate-extra/mate-calc/mate-calc-1.24.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 bd37a2a18829..96a90c9b3581 100644
--- a/mate-extra/mate-indicator-applet/Manifest
+++ b/mate-extra/mate-indicator-applet/Manifest
@@ -1,5 +1,5 @@
 DIST mate-indicator-applet-1.22.1.tar.xz 291104 BLAKE2B 665decd04fec83fb4b1391f3d344f7ce61a4bef557478fe2bae95d9494b633a0c64a2d24b1cde7f3fcb6255b429265a33148c1ff8d765de5463d8d119421a9b7 SHA512 2224e7222c36f04f78d4f5e10dfa7dffab31c687474fac605ec54795edaa7d230518168fef82459aba47e72362941b7968b94b11ccace40d8857adf605f8d8db
 DIST mate-indicator-applet-1.24.0.tar.xz 380136 BLAKE2B 1ae77c892f02127f7a0d778958e0f4acc2b14e01a4b8d8a316253c3b227eacd59cb556ed852de690f3ec4aec4d02874c2f594b41315cd85c87c16967ef9403ee SHA512 0e82f572c1855c8623e537a45c2c0c0b98d3d642e46333eedc16c26607205293098a062008d0e568890ffdf6b8dc4c30a7f5e2e41a150f940917b3671783e413
 EBUILD mate-indicator-applet-1.22.1.ebuild 496 BLAKE2B c19a2243445e3d7e6151b6dc1837751d75178f1e30a1ffe3f874009f430fcdc36b8f227dbbe247bac375a2b045afbd60d335424d32a8a638d84e9dc73251bea6 SHA512 fc1a659ac1e8880a6bf098c68e38288b70adde600a60dcff14ecb09ecea5703854c713d09cbd083f84bd508ee15cdc03a1028e0d7379e9cf351781270a689351
-EBUILD mate-indicator-applet-1.24.0.ebuild 520 BLAKE2B cc0529d6f9cc2ff2deaa7432120112ee121088020035bad9ca18c5442935d70823a53cebae92b20634ffd5608e825ab4087065b3b287db1e392044d5cb3ece2c SHA512 f452b80135f1c994b3925fdfd2efdb20563399708d9c888889c6546c0b7b317b32a0abbabc9f46524c76903b78f464c84732014cd0b42fef73345c626c4b7a54
+EBUILD mate-indicator-applet-1.24.0.ebuild 518 BLAKE2B 633f258367616716bb67dd3d68326f4d603ce1a31bf5b72f69e2c46e6244dc1566212c50c2c8871d4906b59cd76046914a4541930c8e1b33a499c77b9ad1e5fb SHA512 adc0448fe3de1bb0e4fe5271ce58b23abe4fa247c6ecfd7d441c2f3162b257887c937b8437b1fd49064ed047edce6a600bab85b8843462c6e629907b827f6f51
 MISC metadata.xml 350 BLAKE2B 96082001bda8c5a855c43e0ac4bba9d604b8ec94f66464859a37e30843f8f1ecddff2c3100a49ab465711bb529e288afddbb03aab9b6dde16de35370353a2fe7 SHA512 add12365e457c531f5dc3eec856099b5658f93a3d6ee2b3f80264374a84558566881213b8e8ffad03aeb3720025c385517d777af249a045b9dd2c22ce37b2f32
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
index 23ea522d31a3..da98ee53781d 100644
--- 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
@@ -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 ec2601bb0a37..7efe56207427 100644
--- a/mate-extra/mate-media/Manifest
+++ b/mate-extra/mate-media/Manifest
@@ -1,5 +1,5 @@
 DIST mate-media-1.22.2.tar.xz 490464 BLAKE2B 16851ea5c42967cd753af4f79cfab17e385ea3584418a68b54ea894ed99c7a16a0bbe1ad496432a1521b17acedcc6622444f10e7c5f1073e58ce4175d6ff0655 SHA512 88a78e7ddf02335ffe4d819921cbb978b9e2fc430e0edd950f04edb3999f94d59c4aa39a8089ac0c66af6b152b1514e20810ae4c577095dcd60735046a88ec3a
 DIST mate-media-1.24.0.tar.xz 568488 BLAKE2B 9c7d3f264489a3888ef6b45e4ce7e8c23a53634b3b72db32092889f1656afc8a6b2988b35e5ecdc0bb48ebb20c4e86b64dbc93ec308947159feb89877230673e SHA512 82ee6a16a49d9f4d229539cfacb5803c150af09dff227fb5995bf78e2b83a1f5bddb307756648e569a138124e4485ca56f635184e47fbfd76dcedd17f2bf0425
 EBUILD mate-media-1.22.2.ebuild 740 BLAKE2B 6fc429c87ec21a6e02bb419631c0d28399c1fed3f13c4f313195afba98a18507ff425afed49e93be76495049428bd71d121ff376d9258432d74d8a62cb46d4d1 SHA512 033e4002fe027a4e7c85d60926131f1c0e0be7ec498095604660ad7888bf8a27f17bc82193d9676e42fef638d7cbb350c2b423803d4506597e36ece1b350282c
-EBUILD mate-media-1.24.0.ebuild 725 BLAKE2B 500825bbc945209c3e82ee617f168be6554859bf8e6fa871aab0b140dc60b0b98cd824dedd30da94e81db27ae8a899fffc52b63ff83d7a27b6094219d8b1a242 SHA512 a29a19d74ac7422ee341d9f2473f132ae2f1dfa25c7779e5e3ee9ebd9a3682ec9c5dd33b69a38fa98c52737d0f24080cbf69bd55ceeaf202ee71993e4548888e
+EBUILD mate-media-1.24.0.ebuild 723 BLAKE2B 3544a043bc4b33afa66f6e4cf14e9a92f254837223b63c0f9e7f21f646a94c99e3ca9bb3d0920d865a4331150028e918576dda7e535280fdcff3c5e5e5fcc7f2 SHA512 e18a108e62a0ee33b8b8cc8003c8d3c82bf3a610607f06d6a614a2af09db77b16230ac5335314a3ed236428e5e125a589f8e5ea4c795d019994604438a2cf775
 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
index 1625c0268e62..71526aab9f0d 100644
--- a/mate-extra/mate-media/mate-media-1.24.0.ebuild
+++ b/mate-extra/mate-media/mate-media-1.24.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 744a89120769..2a397e3a8aaf 100644
--- a/mate-extra/mate-netbook/Manifest
+++ b/mate-extra/mate-netbook/Manifest
@@ -1,5 +1,5 @@
 DIST mate-netbook-1.22.2.tar.xz 308168 BLAKE2B 5b73d3299dc725d6f342535599bc38047c4d90f2e6aa953f07e81b9f2f71723124b0cf6574b44f96644b5c5804e8a8319d9870c491210dc4714f6d2c40d0a472 SHA512 caaa841857b86592dd7417fa77e8211d1527f8234cd248a00a3a74b2b1487bd1c06a4bfde44818e1c3b0a64350b94e47d8bfdbcd545d787365dfd76c3af2ff71
 DIST mate-netbook-1.24.0.tar.xz 356072 BLAKE2B 843e90753e660e531377cc25880a1bbab8a8f200c293bd05454fbb2d27f333684cd1429bfa5596c308c039505752d53156bd83fc09e6eba955eea7267eb502ac SHA512 fd2efbfaa3fb53f96bf9bff28eba70d3cd46b723a63e6748af0cb8314821cbafdc8d0122d402e89ac2742247685e630544f3d98149514114de5a3e38f7fbe471
 EBUILD mate-netbook-1.22.2.ebuild 630 BLAKE2B fcae07f42e969fd585c583174c6e627ce0fbffc00ff7a86c98249f2f58548b765f45b1b3e73a4058e6feb8108da862416dfdd855a79e5147814a6e25dd444852 SHA512 370737e83c170e6da175e99e9067a445121b135b056692bae391517f383294b89e323e91117527b1c7c7649fff5f563ef967d64165f4fb68a3b33d7369b4ccc4
-EBUILD mate-netbook-1.24.0.ebuild 644 BLAKE2B a88a1b83140c21ecf1a84c983667222ef612798b08ef1d9ca12805833cbfe20798424b81943fddd703508e56fa7bfe302865db366815804778d8eb20117f9b84 SHA512 255133cdf6b3537d02adbcaf28e5891d781a13580062f18ce73c7988c15f61fa5bdc15392fd691cc9660818eaa060e43820d93db9c0c00f8ef5022e811aee344
+EBUILD mate-netbook-1.24.0.ebuild 642 BLAKE2B e40f8f24e7b6b760ca2ad21a3dfe2492db65a6fbd85eef29d6c9709f30fe048758dd5170a4e2181b3e5963060bd38ca7ef9219d83d2c3aa3c1ecb821631c3ad5 SHA512 760635e867113a09d095804b5ca622069632082d563019ddc6efe66142e03d914d9991eee6e729f386614508a278c7215bbc9fd061a788ebe38633641095e933
 MISC metadata.xml 495 BLAKE2B 69f4f61082d017e4e92917edcfb1fc9be696c5472641b0cd81714c07a29f4495644f4120fbd0292f8c5d1d40b3642a095969281ed2c2ad8896ff3156c3fba3bd SHA512 8edc358ede2010384cdecc1e430aa9cbf90bb64c3f52d71ad2bf30d4cb84e38bdf48a4b2e45920b35ada734ffe4a46b44f363b6bf18ba2247f6abe290b5131db
diff --git a/mate-extra/mate-netbook/mate-netbook-1.24.0.ebuild b/mate-extra/mate-netbook/mate-netbook-1.24.0.ebuild
index b6139aaa6463..baad717ade18 100644
--- a/mate-extra/mate-netbook/mate-netbook-1.24.0.ebuild
+++ b/mate-extra/mate-netbook/mate-netbook-1.24.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 5f02983f38fe..60b030d5698a 100644
--- a/mate-extra/mate-polkit/Manifest
+++ b/mate-extra/mate-polkit/Manifest
@@ -1,5 +1,5 @@
 DIST mate-polkit-1.22.0.tar.xz 302080 BLAKE2B 374fa5215c57a36fc3a6fa4660866b33bc02d067f1eaf5cbadca8711efe8771e4c59d496e8eb47c75567b5a0e472fd10782c5b5436b9d2a5e7fc834445e5cf06 SHA512 e761ec10842789b5bbb3831f568c64e969429131a893850e8323927b949e115a24b3907fd3def7f31f5f785f0831717d852c61f08a9028a009ea9cca0ba86393
 DIST mate-polkit-1.24.0.tar.xz 332652 BLAKE2B 293d964f2410d2f60047d1e01e2ba864c22e8bda00e5b659329d097391b2988349c70dfbd953f223c4212887d16d54f1f5a7eb21e38b69b553d54b1966647cb1 SHA512 8d759bd5f78750c75dc92ffa27e555ae36ae7199b76483cbfe7e0848d3a66cda5b82c98bf334068eb79a1344757665cf7d1bf403e4e908e332ca929c8ebe2a98
 EBUILD mate-polkit-1.22.0-r1.ebuild 929 BLAKE2B 2d8fdbfe252408ec965b7dd2713904fb5e82d2c3dbd0b13151c1686ca05da65d66f0d1e24969d2e1e0b5fe2d009b4288a3c0219db2471e2a8f364322a670062e SHA512 1e8271a1e889b8f951ac27afb4f4f98bdfd13b320f29aea5a63409bdcfaba19a2aa3da5815294d034726d9f056a439d19d9d807f5790a003f9519efbcce331b1
-EBUILD mate-polkit-1.24.0.ebuild 911 BLAKE2B c3394ed54133eda6fa6b46c008075a0d1e609a410127b046190db9f78c3f1cd14a1e7990c31342928a368a55389369c096d91cbc61590a55f81cb0b0c71f937b SHA512 e1ab97a5fb53a36b98f7f13680e2daa4067ac52fdcdd23c618f3976ced6060cccfb04fc536d5108b324b3fe9f8859be07918097a854766314043ebebef77f0ea
+EBUILD mate-polkit-1.24.0.ebuild 909 BLAKE2B 9f1ea23a2968804672ee3e5a71cf1c76115ad5d0e2dd6badea0168ef9ea3f50ec40f3f4e639957af57c7ea06a7e53d486954ad911bf36f99adec5c4761828ccc SHA512 f1e68e833cefcf16c5fd53e9e96abd4169d0269fc44df508a1a929ae6ff8bd8397a5c9207bd31fcd043d7c79d8cbfbb641d9869ea7ff621f6c1528def6562dde
 MISC metadata.xml 441 BLAKE2B 299b65dc443f658b080598b7e1dad457948870b53964f1fdf532192c5c4062ffcca29660003fd45bd6ac376f00b6511b5582ecc312c312179979a47ce9c4819a SHA512 dd57c92f8a4881df822821fa48ba75ea02eac47728fd2250fd15d79758be30b4dcc6bfcc7945de9b57bb64dde4139d32797ebbb7678b0d619c41c2eaaeb3129d
diff --git a/mate-extra/mate-polkit/mate-polkit-1.24.0.ebuild b/mate-extra/mate-polkit/mate-polkit-1.24.0.ebuild
index e209135516aa..c625aa776f5f 100644
--- a/mate-extra/mate-polkit/mate-polkit-1.24.0.ebuild
+++ b/mate-extra/mate-polkit/mate-polkit-1.24.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 89cdfc3d1bec..b9146c0fac65 100644
--- a/mate-extra/mate-power-manager/Manifest
+++ b/mate-extra/mate-power-manager/Manifest
@@ -1,7 +1,9 @@
+AUX mate-power-manager-1.24.1-libsecret.patch 10306 BLAKE2B cf9789f62117c3aded2ce2d73027393bb5c19364f847fbbddeaa7b3b9be1bccdff3b2b1de28198965d65d4f906994c7f91bbb45448cedad0515a8a35aef12e22 SHA512 8646269729d01287cdf213a2a20a262fb658ba95fac47b521dd727ac8a4c3b81776cd24f6d9a3afc9311a4ebf2fe5cacece1db9487ba74f6cb04f008fdbf6238
 DIST mate-power-manager-1.22.1.tar.xz 3188048 BLAKE2B af32a18e2561cc9689382ff9a94382180a5d2dc6ade34a6dc400a7b65730a6c26c6f32b72b6ec973210ac3baf4e8b6c54e489230e64b877cee4ffbbf1a195d28 SHA512 8eabd7f8171f0a6be610c849fad8346bb30ca2c69208e2e117f436daaa5ada3bf0fef479dc017f32f56ec6bd52a7ff7ff69d18baf01b402c5fa2747245261a81
 DIST mate-power-manager-1.22.2.tar.xz 3188752 BLAKE2B 351c18436183679b2b0ecf549a8efe16a691876b7299f06d88d7f7c3434feab1f35ac26a015b5425260dc1a41a4734f0244825a69bb77211320d60f4328ff63b SHA512 99a273558c072ce1d23c8964d9292f45a29a2d5a5e89b504e79e3686a65ad8cc7b200441ba22147d3d828f574e2cebc260c47531338e286b2c47988263763af6
 DIST mate-power-manager-1.24.1.tar.xz 6245524 BLAKE2B b9be1aab7e2f397edba9a681310a9903b11e11abf1af8557c613a1e6bf7b89d5aa495ddfcef4bc23f11aa6aca215b86e3a1c9adfdfd481f0e4353268ca5dd7cd SHA512 57bae519bfa2894bc6923bf0932f823bcabe2dc0de06dc6676597708482b369a24f39bb94558163f0fdcc2d764702b87f58abc1793679a1c7fb7f53be074bae5
-EBUILD mate-power-manager-1.22.1.ebuild 1633 BLAKE2B 712bdd6d4692164e0793e8afccf4aee4e18aaec7c0b0e84b622a5acc4e60d142bcd04c91f5e57d7caf43b7ffc729de640664dcc8d90f337cb7f533717939d84b SHA512 e32ce4c63f1b1731392c00ff05eac2205b9663468df21e2fd7a8d4e076cd269f03d3e34e4b0395b8da19d0ffeba54b71fca774f638267e54cd0ae19dc42e3db0
-EBUILD mate-power-manager-1.22.2.ebuild 1633 BLAKE2B 712bdd6d4692164e0793e8afccf4aee4e18aaec7c0b0e84b622a5acc4e60d142bcd04c91f5e57d7caf43b7ffc729de640664dcc8d90f337cb7f533717939d84b SHA512 e32ce4c63f1b1731392c00ff05eac2205b9663468df21e2fd7a8d4e076cd269f03d3e34e4b0395b8da19d0ffeba54b71fca774f638267e54cd0ae19dc42e3db0
-EBUILD mate-power-manager-1.24.1.ebuild 1653 BLAKE2B e937ad4e91a884bc86dc22c90facad23b4dc70752a298bca09737c9505738f9fe29d622e95132ff730f4afc969b3d19b6ed216add2c213462d67962583015300 SHA512 f5266ad79e8cb5c23945647f35aeb598b43af820e83eacae4ff1450f16298e9b84a35ce36ac0a70a3f5477b769a6e288a4f894dfa8c07f3e888bcdc7d3d0b4dc
-MISC metadata.xml 427 BLAKE2B 2a15897025c6693a2e99c56ee66f3c4da0fc62655c9d6e062451f7f8ef9d82b1fc8bd162d54b5fdee4a1cda0135f09c594f63c1609b622c9570568be05b2e6d7 SHA512 6922ccd9022b2b15fe7d57f196aa715aeed17f5f08d92444f3f07d8ef50f37dd48b62000adc5188076805138f651afea6af02c89d13f4abb3c66cd2419ccb30f
+EBUILD mate-power-manager-1.22.1-r1.ebuild 1589 BLAKE2B 621029918b229fc51db3db1b6a1bd3c9d58b28feddfbc7e1339f0f2af334be9b6e91ef535f0e45fed00290121dd9a7cc8d4bd2a5dd269602420c0d23ca00ef8b SHA512 42d62c1e85aadebd3f0177365cd267f395780f360b7213001e5dc195bbda4758df7eb784619ee6b3847a61136682f39feef7da31ab955ab2ac67e7c8a2888b1d
+EBUILD mate-power-manager-1.22.2-r1.ebuild 1589 BLAKE2B 621029918b229fc51db3db1b6a1bd3c9d58b28feddfbc7e1339f0f2af334be9b6e91ef535f0e45fed00290121dd9a7cc8d4bd2a5dd269602420c0d23ca00ef8b SHA512 42d62c1e85aadebd3f0177365cd267f395780f360b7213001e5dc195bbda4758df7eb784619ee6b3847a61136682f39feef7da31ab955ab2ac67e7c8a2888b1d
+EBUILD mate-power-manager-1.24.1-r1.ebuild 1591 BLAKE2B be6d02d78d810502f13ea111ca5afe07c86c893c187e1152f95d6e683b7ac725d182b942f4f64e6c6b5fc2fe1e88d4b913740c48a17eb45d0c1a29825c1b3ed7 SHA512 be55250a4ea5cdf721eed8f3975ccdff92031621a4b7d20ea725a0e21a99b8798a54a02cd16da825a53714dd3acf0f499cbd0d7d7df97a3be125b6b8d2a1b8e4
+EBUILD mate-power-manager-1.24.1-r2.ebuild 1618 BLAKE2B 4ed010d0237bc7693a330de6ca039e0a258d44adf61bdb587876c6cc3a6294086e33510c787505397b491ebd155748f0f930c1a733dcb39f39562564ee5ccd6c SHA512 ded032091b5595916d2ace03cfbdd11bac0fb5b5f88b047229756d26609a0756918be847678df85ccf80e616f00bfa36718287dfc1e185171c5dbb1735735766
+MISC metadata.xml 521 BLAKE2B f8f0c058645f6820653cc71154b94e7a8e0b0c221e18c6c50c53176f11ba0d7cfee37665bc7d138d81b44a6b80baf8266221b6a519ecc6ca129d604545ff9f75 SHA512 0bbcf48a03fde54a8b12ebfa3991ccb2e930a10496a39999c36640a971e4fb87acbc39fe88f1a72803ddaa10638ff4b1a9009858ca4ac2220529ce06b485a517
diff --git a/mate-extra/mate-power-manager/files/mate-power-manager-1.24.1-libsecret.patch b/mate-extra/mate-power-manager/files/mate-power-manager-1.24.1-libsecret.patch
new file mode 100644
index 000000000000..11a9f94b1008
--- /dev/null
+++ b/mate-extra/mate-power-manager/files/mate-power-manager-1.24.1-libsecret.patch
@@ -0,0 +1,287 @@
+From b2d876a16de9214270f248d7c445542120ae7800 Mon Sep 17 00:00:00 2001
+From: NP-Hardass <np.hardass@gmail.com>
+Date: Mon, 3 Aug 2020 01:46:00 -0400
+Subject: [PATCH 1/5] Add autotools support for libsecret
+
+---
+ README          |  1 +
+ configure.ac    | 22 ++++++++++++++++++++++
+ src/Makefile.am |  3 +++
+ 3 files changed, 26 insertions(+)
+
+diff --git a/README b/README
+index 118da697..32a8a5cc 100644
+--- a/README
++++ b/README
+@@ -15,6 +15,7 @@ To build, MATE Power Manager requires
+ 
+ 	- Glib (2.36.0 or later)
+ 	- GTK+3 (3.14.0 or later)
++	- libsecret (0.11 or later)
+ 	- GNOME Keyring (3.0.0 or later)
+ 	- DBus (0.70 or later)
+ 	- libnotify (0.7.0 or later)
+diff --git a/configure.ac b/configure.ac
+index 1db39321..b4758dca 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -68,6 +68,7 @@ GLIB_REQUIRED=2.50.0
+ GIO_REQUIRED=2.50.0
+ GDK_REQUIRED=3.22.0
+ GTK_REQUIRED=3.22.0
++LIBSECRET_REQUIRED=0.11
+ GNOME_KEYRING_REQUIRED=3.0.0
+ DBUS_REQUIRED=1.0
+ DBUS_GLIB_REQUIRED=0.70
+@@ -134,6 +135,22 @@ else
+ fi
+ AM_CONDITIONAL([HAVE_TESTS], [test $have_tests = yes])
+ 
++dnl ---------------------------------------------------------------------------
++dnl - Build libsecret support
++dnl ---------------------------------------------------------------------------
++AC_ARG_WITH(libsecret,
++        [AS_HELP_STRING([--with-libsecret],
++                        [Enable the use of libsecret])],
++        [],
++        [with_libsecret=no])
++
++AM_CONDITIONAL([WITH_LIBSECRET],[test "$with_libsecret" = "yes"])
++
++if test "$with_libsecret" = "yes"; then
++        PKG_CHECK_MODULES(LIBSECRET, libsecret-1 >= $LIBSECRET_REQUIRED)
++        AC_DEFINE([WITH_LIBSECRET],[1],[Define if LIBSECRET support is enabled])
++fi
++
+ dnl ---------------------------------------------------------------------------
+ dnl - Build gnome-keyring support
+ dnl ---------------------------------------------------------------------------
+@@ -150,6 +167,10 @@ if test "$with_keyring" = "yes"; then
+         AC_DEFINE([WITH_KEYRING],[1],[Define if KEYRING support is enabled])
+ fi
+ 
++if test "$with_libsecret" = "yes" -a "$with_keyring" = "yes"; then
++	AC_MSG_ERROR([Please select only 1, keyring or libsecret])
++fi
++
+ dnl ---------------------------------------------------------------------------
+ dnl - Build applets
+ dnl ---------------------------------------------------------------------------
+@@ -222,6 +243,7 @@ echo "
+         compiler:                  ${CC}
+         cflags:                    ${CFLAGS}
+         cwarnings:                 ${WARN_CFLAGS}
++        libsecret support:         ${with_libsecret}
+         gnome-keyring support:     ${with_keyring}
+         Building extra applets:    ${enable_applets}
+         Self test support:         ${have_tests}
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 1a966e8f..47815c5f 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -14,6 +14,7 @@ AM_CPPFLAGS =						\
+ 	$(GLIB_CFLAGS)					\
+ 	$(DBUS_CFLAGS)					\
+ 	$(CAIRO_CFLAGS)					\
++	$(LIBSECRET_CFLAGS)				\
+ 	$(KEYRING_CFLAGS)				\
+ 	$(X11_CFLAGS)					\
+ 	$(LIBNOTIFY_CFLAGS)				\
+@@ -197,6 +198,7 @@ mate_power_manager_LDADD =				\
+ 	$(X11_LIBS)					\
+ 	$(GSTREAMER_LIBS)				\
+ 	$(CAIRO_LIBS)					\
++	$(LIBSECRET_LIBS)					\
+ 	$(KEYRING_LIBS)					\
+ 	$(DBUS_LIBS)					\
+ 	$(X11_LIBS)					\
+@@ -259,6 +261,7 @@ mate_power_self_test_LDADD =				\
+ 	$(GLIB_LIBS)					\
+ 	$(X11_LIBS)					\
+ 	$(CAIRO_LIBS)					\
++	$(LIBSECRET_LIBS)					\
+ 	$(KEYRING_LIBS)					\
+ 	$(GSTREAMER_LIBS)				\
+ 	$(UPOWER_LIBS)					\
+
+From 7dbbf59fc5dc64cf512932993616a06903d5f22b Mon Sep 17 00:00:00 2001
+From: NP-Hardass <np.hardass@gmail.com>
+Date: Mon, 3 Aug 2020 01:49:47 -0400
+Subject: [PATCH 2/5] gpm-control.c: Add libsecret implementation to
+ gpm_control_suspend()
+
+---
+ src/gpm-control.c | 39 +++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 39 insertions(+)
+
+diff --git a/src/gpm-control.c b/src/gpm-control.c
+index 4834a050..e64bfb12 100644
+--- a/src/gpm-control.c
++++ b/src/gpm-control.c
+@@ -39,6 +39,9 @@
+ #include <gio/gio.h>
+ #include <glib/gi18n.h>
+ 
++#ifdef WITH_LIBSECRET
++#include <libsecret/secret.h>
++#endif /* WITH_LIBSECRET */
+ #ifdef WITH_KEYRING
+ #include <gnome-keyring.h>
+ #endif /* WITH_KEYRING */
+@@ -210,6 +213,13 @@ gpm_control_suspend (GpmControl *control, GError **error)
+ 	EggConsoleKit *console;
+ 	GpmScreensaver *screensaver;
+ 	guint32 throttle_cookie = 0;
++#ifdef WITH_LIBSECRET
++	gboolean lock_libsecret;
++  GCancellable *libsecret_cancellable = NULL;
++  SecretService *secretservice_proxy = NULL;
++	gint num_secrets_locked;
++  GList *libsecret_collections = NULL;
++#endif /* WITH_LIBSECRET */
+ #ifdef WITH_KEYRING
+ 	gboolean lock_gnome_keyring;
+ 	GnomeKeyringResult keyres;
+@@ -233,6 +243,35 @@ gpm_control_suspend (GpmControl *control, GError **error)
+ 		}
+ 	}
+ 
++#ifdef WITH_LIBSECRET
++	/* we should perhaps lock keyrings when sleeping #375681 */
++	lock_libsecret = g_settings_get_boolean (control->priv->settings, GPM_SETTINGS_LOCK_KEYRING_SUSPEND);
++	if (lock_libsecret) {
++    libsecret_cancellable = g_cancellable_new();
++    secretservice_proxy = secret_service_get_sync(SECRET_SERVICE_LOAD_COLLECTIONS,
++                    libsecret_cancellable,
++                    error);
++    if (secretservice_proxy == NULL) {
++      g_warning ("failed to connect to secret service");
++    } else {
++      libsecret_collections = secret_service_get_collections(secretservice_proxy);
++      if ( libsecret_collections == NULL) {
++        g_warning ("failed to get secret collections");
++      } else {
++        num_secrets_locked = secret_service_lock_sync(secretservice_proxy,
++                          libsecret_collections,
++                          libsecret_cancellable,
++                          NULL,
++                          error);
++        if (num_secrets_locked <= 0)
++          g_warning ("could not lock keyring");
++        g_list_free(libsecret_collections);
++      }
++      g_object_unref(secretservice_proxy);
++    }
++    g_object_unref(libsecret_cancellable);
++  }
++#endif /* WITH_LIBSECRET */
+ #ifdef WITH_KEYRING
+ 	/* we should perhaps lock keyrings when sleeping #375681 */
+ 	lock_gnome_keyring = g_settings_get_boolean (control->priv->settings, GPM_SETTINGS_LOCK_KEYRING_SUSPEND);
+
+From 74acfabab04f10e95dc91fdc633a893a4564a820 Mon Sep 17 00:00:00 2001
+From: NP-Hardass <np.hardass@gmail.com>
+Date: Mon, 3 Aug 2020 01:55:43 -0400
+Subject: [PATCH 3/5] gpm-control.c: Add libsecret implementation to
+ gpm_control_hibernate()
+
+---
+ src/gpm-control.c | 36 ++++++++++++++++++++++++++++++++++++
+ 1 file changed, 36 insertions(+)
+
+diff --git a/src/gpm-control.c b/src/gpm-control.c
+index e64bfb12..98bb6f4e 100644
+--- a/src/gpm-control.c
++++ b/src/gpm-control.c
+@@ -367,6 +367,13 @@ gpm_control_hibernate (GpmControl *control, GError **error)
+ 	EggConsoleKit *console;
+ 	GpmScreensaver *screensaver;
+ 	guint32 throttle_cookie = 0;
++#ifdef WITH_LIBSECRET
++	gboolean lock_libsecret;
++  GCancellable *libsecret_cancellable = NULL;
++  SecretService *secretservice_proxy = NULL;
++	gint num_secrets_locked;
++  GList *libsecret_collections = NULL;
++#endif /* WITH_LIBSECRET */
+ #ifdef WITH_KEYRING
+ 	gboolean lock_gnome_keyring;
+ 	GnomeKeyringResult keyres;
+@@ -390,6 +397,35 @@ gpm_control_hibernate (GpmControl *control, GError **error)
+ 		}
+ 	}
+ 
++#ifdef WITH_LIBSECRET
++	/* we should perhaps lock keyrings when sleeping #375681 */
++	lock_libsecret = g_settings_get_boolean (control->priv->settings, GPM_SETTINGS_LOCK_KEYRING_SUSPEND);
++	if (lock_libsecret) {
++    libsecret_cancellable = g_cancellable_new();
++    secretservice_proxy = secret_service_get_sync(SECRET_SERVICE_LOAD_COLLECTIONS,
++                    libsecret_cancellable,
++                    error);
++    if (secretservice_proxy == NULL) {
++      g_warning ("failed to connect to secret service");
++    } else {
++      libsecret_collections = secret_service_get_collections(secretservice_proxy);
++      if ( libsecret_collections == NULL) {
++        g_warning ("failed to get secret collections");
++      } else {
++        num_secrets_locked = secret_service_lock_sync(secretservice_proxy,
++                          libsecret_collections,
++                          libsecret_cancellable,
++                          NULL,
++                          error);
++        if (num_secrets_locked <= 0)
++          g_warning ("could not lock keyring");
++        g_list_free(libsecret_collections);
++      }
++      g_object_unref(secretservice_proxy);
++    }
++    g_object_unref(libsecret_cancellable);
++  }
++#endif /* WITH_LIBSECRET */
+ #ifdef WITH_KEYRING
+ 	/* we should perhaps lock keyrings when sleeping #375681 */
+ 	lock_gnome_keyring = g_settings_get_boolean (control->priv->settings, GPM_SETTINGS_LOCK_KEYRING_HIBERNATE);
+
+From a5b4e5b14510ea3aeb8824294876c152635503ae Mon Sep 17 00:00:00 2001
+From: NP-Hardass <np.hardass@gmail.com>
+Date: Mon, 3 Aug 2020 02:01:10 -0400
+Subject: [PATCH 5/5] Switch default from libgnome-keyring to libsecret
+
+---
+ configure.ac | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index b4758dca..7fbc8206 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -139,10 +139,10 @@ dnl ---------------------------------------------------------------------------
+ dnl - Build libsecret support
+ dnl ---------------------------------------------------------------------------
+ AC_ARG_WITH(libsecret,
+-        [AS_HELP_STRING([--with-libsecret],
+-                        [Enable the use of libsecret])],
++        [AS_HELP_STRING([--without-libsecret],
++                        [Disable the use of libsecret])],
+         [],
+-        [with_libsecret=no])
++        [with_libsecret=yes])
+ 
+ AM_CONDITIONAL([WITH_LIBSECRET],[test "$with_libsecret" = "yes"])
+ 
+@@ -155,10 +155,10 @@ dnl ---------------------------------------------------------------------------
+ dnl - Build gnome-keyring support
+ dnl ---------------------------------------------------------------------------
+ AC_ARG_WITH(keyring,
+-        [AS_HELP_STRING([--without-keyring],
+-                        [Disable the use of gnome-keyring])],
++        [AS_HELP_STRING([--with-keyring],
++                        [Enable the use of gnome-keyring])],
+         [],
+-        [with_keyring=yes])
++        [with_keyring=no])
+ 
+ AM_CONDITIONAL([WITH_KEYRING],[test "$with_keyring" = "yes"])
+ 
diff --git a/mate-extra/mate-power-manager/mate-power-manager-1.22.2.ebuild b/mate-extra/mate-power-manager/mate-power-manager-1.22.1-r1.ebuild
index f37314be82dd..628d7105fa80 100644
--- a/mate-extra/mate-power-manager/mate-power-manager-1.22.2.ebuild
+++ b/mate-extra/mate-power-manager/mate-power-manager-1.22.1-r1.ebuild
@@ -43,7 +43,6 @@ RDEPEND="${COMMON_DEPEND}
 	systemd? ( sys-apps/systemd )
 	!systemd? (
 		elogind? ( sys-auth/elogind )
-		!elogind? ( >=sys-auth/consolekit-0.9.2 )
 	)"
 
 DEPEND="${COMMON_DEPEND}
diff --git a/mate-extra/mate-power-manager/mate-power-manager-1.22.1.ebuild b/mate-extra/mate-power-manager/mate-power-manager-1.22.2-r1.ebuild
index f37314be82dd..628d7105fa80 100644
--- a/mate-extra/mate-power-manager/mate-power-manager-1.22.1.ebuild
+++ b/mate-extra/mate-power-manager/mate-power-manager-1.22.2-r1.ebuild
@@ -43,7 +43,6 @@ RDEPEND="${COMMON_DEPEND}
 	systemd? ( sys-apps/systemd )
 	!systemd? (
 		elogind? ( sys-auth/elogind )
-		!elogind? ( >=sys-auth/consolekit-0.9.2 )
 	)"
 
 DEPEND="${COMMON_DEPEND}
diff --git a/mate-extra/mate-power-manager/mate-power-manager-1.24.1.ebuild b/mate-extra/mate-power-manager/mate-power-manager-1.24.1-r1.ebuild
index b188be8b1a4d..35ef260c44a7 100644
--- a/mate-extra/mate-power-manager/mate-power-manager-1.24.1.ebuild
+++ b/mate-extra/mate-power-manager/mate-power-manager-1.24.1-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 session daemon for MATE that makes it easy to manage your laptop or desktop"
@@ -15,7 +15,7 @@ LICENSE="FDL-1.1+ GPL-2+ LGPL-2+"
 SLOT="0"
 IUSE="+applet elogind gnome-keyring policykit systemd test"
 
-REQUIRED_USE="?? ( elogind systemd )"
+REQUIRED_USE="^^ ( elogind systemd )"
 
 # Interactive testsuite.
 RESTRICT="test"
@@ -42,10 +42,8 @@ RDEPEND="${COMMON_DEPEND}
 	virtual/libintl
 	policykit? ( >=mate-extra/mate-polkit-1.6 )
 	systemd? ( sys-apps/systemd )
-	!systemd? (
-		elogind? ( sys-auth/elogind )
-		!elogind? ( >=sys-auth/consolekit-0.9.2 )
-	)"
+	elogind? ( sys-auth/elogind )
+"
 
 DEPEND="${COMMON_DEPEND}
 	app-text/docbook-xml-dtd:4.3
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
new file mode 100644
index 000000000000..b476637a4ea4
--- /dev/null
+++ b/mate-extra/mate-power-manager/mate-power-manager-1.24.1-r2.ebuild
@@ -0,0 +1,75 @@
+# 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/metadata.xml b/mate-extra/mate-power-manager/metadata.xml
index ff952f0b3170..2eb98c6de08b 100644
--- a/mate-extra/mate-power-manager/metadata.xml
+++ b/mate-extra/mate-power-manager/metadata.xml
@@ -7,6 +7,7 @@
 	</maintainer>
 	<use>
 		<flag name="applet">Enable building of the MATE applet.</flag>
+		<flag name="libsecret">Support locking of keyring via <pkg>app-crypt/libsecret</pkg></flag>
 	</use>
 	<upstream>
 		<remote-id type="github">mate-desktop/mate-power-manager</remote-id>
diff --git a/mate-extra/mate-screensaver/Manifest b/mate-extra/mate-screensaver/Manifest
index 2b8651bd63c2..860f5d3bf10b 100644
--- a/mate-extra/mate-screensaver/Manifest
+++ b/mate-extra/mate-screensaver/Manifest
@@ -2,5 +2,5 @@ AUX xss-conversion.txt 1026 BLAKE2B 4675ecb7d7ce45b28183ff503739b5d3853e8a68adfb
 DIST mate-screensaver-1.22.2.tar.xz 4943380 BLAKE2B 20d28ee7496af9fd9ac23d4f083eaee716eb97e1c3a9b921fc6b3655cfe4c6dc6e482827eb7fad40fbfd5dfb705bcac57aff3bf60e232b84562e496a7a56c354 SHA512 6d28f7261556d59af0bdb8c59ac13fc042c9c5b4cce47e7f6d4148041eb7f05d5cb062f85f05dddb51d009e4aebac31c21fc1243c0e07813adc050fede134ef3
 DIST mate-screensaver-1.24.0.tar.xz 5075860 BLAKE2B f669cb9ce1c84cdd2dd84b1c88b668ad1910102ae5d9765117d313b6ece03e535b5fdaae600d8f3315346ac1109d1316e15c0dcac5bd4a637b682fa7b5d1e22b SHA512 8947b85ab8b006a1756649131a9184e4eb8f44c563f5a1b55840aa8280820713bca1ce46fece92b5ac44a73193bfe965e8ef0d17e8e403a751807ee72c674cc0
 EBUILD mate-screensaver-1.22.2.ebuild 3078 BLAKE2B db76628a7d0d7b8aa85237676cfeb96d67094296b6f6b049651c96bd8eeefef6c12715f918980f332bced324ff66eff8479c0599b8c5ea48be7b39063cd4fdc7 SHA512 f3903815084ff470b88a62e3bde2a33a4c7607194bbc962cad894c4197b9485780c3d849390815a745d7b312ec3ba918a12b15d69a39c917d4b29a536d2d6f19
-EBUILD mate-screensaver-1.24.0.ebuild 3082 BLAKE2B daed17d9278b42deaa10f4aceda36ce782c5428296b2babad40dd8f865b2ca9420a9943031ee2c3ad955f876ed120f0dc7b73b1e29f66bc0d6be973e4b2ce4d0 SHA512 de201878ec7f161f77a5354c38a181609e8b92a85d679851e920c2133be6df4318ac59306bde9e59ecf5b5c690d2a5fab97e14e7969d0abb3133efbcfddd0047
+EBUILD mate-screensaver-1.24.0.ebuild 3080 BLAKE2B 9a7966ce3094c466b4c863167d3f7a50ec44d1674e5c806ec9b84fdb3e1deb11cdc91ddfa0ebe0202bcdfba91e9d29e584ddee11d29554c15d84d69311419f73 SHA512 7ae2ff9ba2e8b08e5fa8b262f24514ae638bf6f65cf3c8f40e142b11b5dac241523ec0851c2130cc18c551ddecb16dd4f3beaaf0599bb108534f2a26541dd3c8
 MISC metadata.xml 447 BLAKE2B febc277d7b427ae9a48c3c6e318b779f8a3fb9e27f896b17a3ebafec9bc8b03c4af3f30de7881fcc7feff674fdc0106d0b46f91d72d7267d4c4eeffb1dbe341a SHA512 29d7b99ddd69b2503d91f185679e1811403ba34443e20e2b17782878ee509565dcd62c2e3339709b3d29f568168c9c5c5a9284823d0187392220e781792b73e8
diff --git a/mate-extra/mate-screensaver/mate-screensaver-1.24.0.ebuild b/mate-extra/mate-screensaver/mate-screensaver-1.24.0.ebuild
index 37afee1ef813..91e4469d03f3 100644
--- a/mate-extra/mate-screensaver/mate-screensaver-1.24.0.ebuild
+++ b/mate-extra/mate-screensaver/mate-screensaver-1.24.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 29fb91aa72c7..f9c0cbb4e7d2 100644
--- a/mate-extra/mate-sensors-applet/Manifest
+++ b/mate-extra/mate-sensors-applet/Manifest
@@ -1,5 +1,5 @@
 DIST mate-sensors-applet-1.22.1.tar.xz 496776 BLAKE2B 1f3ca3e7b6b48a3bdb4e3b370c65bd34bcbde250d21d2c9214eceadf790d2c1a45f87ccf615387edf9abaad2c3a899a536b78d8afece0574d735d80095c1b595 SHA512 4b6e608c92f03051044863f770b295d1526b19a9668513b566e81adeb28bc8524d8f458d114d2b44acf00f20c2f0a8d86b1ca7254fa165fde3b867c75a6b83e6
 DIST mate-sensors-applet-1.24.0.tar.xz 580536 BLAKE2B a72198917a3b87c1a9ed941aa272cab7439bcd07cb1bb2dbadb0fcd21bb5d6f1cc05986800de7d0f68c2c260cf9556f1e239a2ad2fd01bec8bdccad0180117b2 SHA512 039834b7cfe641e670e372e311da3d737254ab3cf13b27e71c6555888ac1165766fe2d940bcea44a5ceed5f0ddcd3390d01331d927121137c21a6647c68875c2
 EBUILD mate-sensors-applet-1.22.1.ebuild 1351 BLAKE2B 1c5309dbfc599953e3b23e66572fdb98cc681c51f69995a208925765cc06fcb96305fa71665b5df881553004a224e12997eed2cf4e87d79c2df811e0fbd670f9 SHA512 48a7d87f21adb541f731a634c283bbde765fbd2bb50282d3d68c086e4f41673b1066d563f4afdbd7f15c02fcfa1778d9a9f6d0f18c2b6d0d62cc9faef68a99da
-EBUILD mate-sensors-applet-1.24.0.ebuild 1337 BLAKE2B 8aa2d0273514e425236fbd2e4ea0fbb222ec18690c8b7d94907b87737b4295662c7b5531a0522ac13ec5cdd2a513725171a62237b374c1a771d4de02d19f7a5e SHA512 cd4d4fe4d7854363f4eb36b885a3edfcdddad643a349aa186e01da4da8658b9b9b79581453c22b06384479a9a57b8f72db3a2889f5357f8aa79d7aa0a7de24ac
+EBUILD mate-sensors-applet-1.24.0.ebuild 1335 BLAKE2B 7160531f1356b6b10f554aa06ac752287f34359a8bdc912eecc1e163c28bdcd4b4f0046afea25c137efd0c4eb8c9c7e3b614706f68c77f6f80223eb9f661ed04 SHA512 8847de42c71ed2e27cbe54316c6c453844cf94cf27ddde7328a214d261db22f37e364632664bc755ad90e23cfe8a771b6ba72bb909f419625bb00737700874a5
 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
index d292f324537c..7f07d8dd5b0f 100644
--- 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
@@ -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 1ec00d478323..32d66c5a7ee5 100644
--- a/mate-extra/mate-system-monitor/Manifest
+++ b/mate-extra/mate-system-monitor/Manifest
@@ -1,5 +1,5 @@
 DIST mate-system-monitor-1.22.2.tar.xz 2209852 BLAKE2B d5437596454e767cdbb32e7de062d5a9c6f55edce45f9439cfd555e9455f7cf935a4d15fcd8f19494feab1faae4e0ee07f469b6650d2da03372f9e2bea3ed8ac SHA512 47ccb38e27906c4de0cc18abc9d43ffc3b2c8f2f33b3f4cea3e47fd82c48870f03927fab39d323b61b9b871614b24bb2bc258d1c547650cdfb6b8eef65cb0de3
 DIST mate-system-monitor-1.24.0.tar.xz 2437396 BLAKE2B 78c8774ee1832772b2cda06bca051c91e10e882b841373e3f30575ab1d05cc2b799962d964be4cc8416f9747e44031e579410d9851bb82d6a13f6023f1a30b2a SHA512 430a2bf81f447143ba53cecb1c2659903cd957e313f6690adea363e9a8deccfd4ad64ebd8ce18dfb31a67fa7b51cbe087ffed7b5dcba5dd03b1010ec41b4d282
 EBUILD mate-system-monitor-1.22.2.ebuild 1267 BLAKE2B 1425203026f746783086d8de17f3b16d1f82cac1060af73c7db29ff50dd9f916c9579a68f1521a4d114acbca9eb4686dc676afd3c617046eef1bb507ef4e2968 SHA512 227aa41d03c1663dce35e9a7d9c94e4f6ab2eeffe090af0bfe85c41a895c8608c61978bac0f184c2be6953ce4df4d3099ccc53fc861cdc3e78dab90c45d1332a
-EBUILD mate-system-monitor-1.24.0.ebuild 1251 BLAKE2B 2444494fb68a37b40961460ed4fd9816bac178afd23d35c720f532c86e5ef7d77b3e2709f80e39f1177ff2f26a7cfb60575b0402fda7018fff84f91e8960fe1e SHA512 365f198550af46e790741ae81e73b8556751cdf083038a63c36e9e2308c9ad47f102b04b1538d77439300f759ee9898408668f765b83ffdea5aae0b7cd87d8cd
+EBUILD mate-system-monitor-1.24.0.ebuild 1249 BLAKE2B a7bf3a309d34a3048370637503b97ee631353dfe463cbd6d4626b7966c02c640787843d8875c67d262caf8ee94195d696311508505913335dfc78c77eeac9fcf SHA512 98dd6ff095b7bee2d21023af6c57b8e7eaac291302f2f4c916d8173b7191f4da0600c9f04a2e9cb3b53e92865addce88514c0651744f6dae01f1bfa94ab51aef
 MISC metadata.xml 348 BLAKE2B fe7ff06b7a0366617fb30e7a98fa7054c32469bf49691855183ee7b9991c1aebd5f431081e5d7efe07ab3a2b2424630bea621c2b3369338f6bb5348d1ba70de7 SHA512 4cb1bd5f11887274393c957be697ce784af74a39258ead2e9ccb586ac8d4bcab06a6aa2a76e8f96a85d2d818092250eede243775b61222493739440c59cc9c9b
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.0.ebuild
index 99d44d10c547..d6a7c0848c40 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.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 17055ccc245c..cb59be0c457f 100644
--- a/mate-extra/mate-user-guide/Manifest
+++ b/mate-extra/mate-user-guide/Manifest
@@ -1,5 +1,5 @@
 DIST mate-user-guide-1.22.3.tar.xz 8959336 BLAKE2B 5e8b122aedee7121315eb4c1ec0a73146034d417784390a88eb782b52648f5be07066ab61f5245d4c19dde3569e5b8b2d764cb786e795b9f27a39930f9b6302a SHA512 87524a59143f3f79996e7bec9de059954d6447391f73238591ce437d4ff9ff21c5ec54d73876342a3077899315e8d7e9b620c2f38ca84b3a75c929e02463bc7b
 DIST mate-user-guide-1.24.0.tar.xz 9029524 BLAKE2B 304209588d67f83e0d3505277a2a964c7f76582755073886ebac5693a3dcd771bde1d1547430ac94113929da0441c85f5f86a6f27cb995c252a770d44c113154 SHA512 80129fcbf628dd10d0748d0a35f9456c15a3748c1cd407aa7adf4d90e5f87d999778d136d772c64392279152da9b76912378b16a894f03dc5d11bec478ad6301
 EBUILD mate-user-guide-1.22.3-r1.ebuild 532 BLAKE2B 11a3cc79d45be7600030dd789dc872e9c6660b993c9f16781e93205bf0dc8481e74c562c6ab8ff96d00969d7c6438ee7d76a9067e84bcfec36dc0d3d7b296c42 SHA512 2fd0ffd392dd809c60f1ba7dd6d76952437156867e2e0338d0b0d54fbc2d729911c7bdea12d5ac5c641f3be90ba917e55ae979fb79d4de0e805e118f40bad62c
-EBUILD mate-user-guide-1.24.0-r1.ebuild 517 BLAKE2B 89e310e87171d26eb4cec1e0d2060991e23215ca7cfa9333563dc57fe4f877a35108246f24589e2d3469d7a6760dddbe1ef78fe71f89440a4029abba930eea51 SHA512 91c2e240e4c1c1a04a4aa0fb59f403fc7efb818454d028bbde5116f14fb8abe5a58dc0490f97c06d3f5ab6e01115dfc496600bdab8606c459f4a500e4f8cc20e
+EBUILD mate-user-guide-1.24.0-r1.ebuild 515 BLAKE2B 800ac8965e40aa057ab2cb4ac11fb3d22e0ebcce687d775a30b498fef83711c0734eb3acf467bcfd4b6211f331e0149a39d4cf8f37616f716bd428be662d1d4f SHA512 fea873ae2b677d428f6e438e2d7ef19784a8e5782d7110146f2a4e9c768a4abb0a0a87fa8388edf5953b68d58b18d7faf773c67a21f647352622d890411a90f8
 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
index deeed05b7a11..d9957b00f534 100644
--- 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
@@ -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 4505a1eb1abb..16b5c062ed16 100644
--- a/mate-extra/mate-user-share/Manifest
+++ b/mate-extra/mate-user-share/Manifest
@@ -1,5 +1,5 @@
 DIST mate-user-share-1.22.1.tar.xz 921944 BLAKE2B dfa3b304bc81c82abf9a2354ede94b08672f2e8cd28b4def0f0dad0f6389c762d68ddb1924918c89eee40374eedfff312ffc4a9c65d3766be240ede182072837 SHA512 afd2c2f8484124e26ac9ced23abd89c1b553adb4df6ca8bd49159e3ec5d76f2b16f6576b7f5608488e5290cddef733e27c653433ee9f57a09a6b76b774555894
 DIST mate-user-share-1.24.0.tar.xz 1008992 BLAKE2B 0fe21e49ff30c88c32b6b88aba84e58b3e6310d3bbd7a4873be460c97366828a7edfd24be37d2c10ea88a51c6990ee482ad595582d288ded2e4f7e0ca6f0b4e0 SHA512 15ede8754bf95ac78844cd9645a43d2deb8419dd550aee5263936d710cd13ce7f4a68cfd53e589c2dd37f87f59c9e8153f8abac711a3a7f88a2e2789dbd4f664
 EBUILD mate-user-share-1.22.1.ebuild 1116 BLAKE2B 8316d50ca80bfd877de0b539c624fce4ecf661441bf04dff9d5aa9ea335ec0fb4d35ddd225e2637b30b7f2737c74a27ca6ba3ee46b04f8f2c38c5d2dd7ff46c8 SHA512 204c1173bd54a10500f202b10c4bf131fd8088aceb7579b66c00b0e108af9c2d61914079c7c3ab5014def87645f99ba87326bfe46eb6c6ab7ab8b4975711781f
-EBUILD mate-user-share-1.24.0.ebuild 1104 BLAKE2B 0fa36f0282b1c5e1281c2fe8c5e1d4dc86c2747673bcdd341d0803fecbda5ace69f2266967bb5817061ce36d84054dc0ef5c53b34d26be9d05931eca5aa8c93b SHA512 e868504a488e2d5ed2e2abaad3939fcce81d92606b24c2f98198f100469619b3234464776a898fdbaaea16cb260657e3e644d67ac299c1a532f323b4ff705fef
+EBUILD mate-user-share-1.24.0.ebuild 1102 BLAKE2B 975da5ec09b6f4c1160a742905d10bc4e1c9770be0723dc9ec97e4ce8e59d3f44c2fbfde5bdfa1a8404d3d8d8c5fbc6d7d38e7479561834457f8d024b0f78683 SHA512 9cfecad9df86b00fa698f633602d77de3b554600d40703cc3a2cb26f64ad7eb566653269afda1f764d90a0b8e50c61d3254b87dcdf30e5047f6b620f1258d77b
 MISC metadata.xml 344 BLAKE2B 72c35ab850378b1f7386ba3d9da729e2855c20779d23a1a503186706bff164487c5f0d398dcc96f4056c2a670f815e2de874f89ca6ffe0c85749fb61416c9d7d SHA512 866efce9c0b0fbd2b8916c71d07b42a255bda4a2c4f269a6fe3390b9913aa148b44ad4b6f779f964e51715f2cc79dcdfe9e8096f2382b3e35f3bda38d8646001
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
index dbfca4d5174f..ec2217c7e294 100644
--- 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
@@ -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 6997177a3f40..f2659c010a6e 100644
--- a/mate-extra/mate-utils/Manifest
+++ b/mate-extra/mate-utils/Manifest
@@ -2,5 +2,5 @@ AUX mate-utils-1.22.2-gcc-10-fno-common.patch 1022 BLAKE2B 772c831ae0c4ed0c640d2
 DIST mate-utils-1.22.2.tar.xz 7306448 BLAKE2B 0fb28f85e39ac58c1e78e6f5f4c6d01e72a2b8c32197739b93ec3f17617b4676fdfe251b81e3b5b01c44f69136d9bfc8d12d64fff832d5a9f1c30591b2facebb SHA512 bf33019ebd1dc4ff6010ba0824981334b7065a62dfc7a73170487df5f165ad20831a900ef4e4e0641ca130aa618f82aa27606f0a48c2cb9907ea7ef118f02a60
 DIST mate-utils-1.24.0.tar.xz 7930068 BLAKE2B 0e2c82afbc2d8a90b8c31d56d9bfbb3a477b1e9cd67108e52c96f4087d09336ed9e6980551e39b43797743b9ef86cc2beabfa84fd7a5820e38122e0d0a7c968d SHA512 d8945c85936a55d22f3ed94c9858ba84cadf552a63cdd2d9eec9120111ad71526ac88772f8e4b7a6a460b691574534e52706fba35a0395b1d894b27eece9e92c
 EBUILD mate-utils-1.22.2-r1.ebuild 1363 BLAKE2B 9359f0dffa230b21ea9e2fb7190ec4d9bff60be87a057aaf6859651346f438396ab1c885a1ec503bae9f487bfafd440f9cdc474907f91a4a24a5f4b39d62ba42 SHA512 59b1ff239be0649938702c11206c321b0abbb94fa2a6dfeba1e9975605d35c1f1f6af6b256cee47cda68c160e2a1066a27302624879e6c01198f074b652e819c
-EBUILD mate-utils-1.24.0.ebuild 1427 BLAKE2B f95fb1d0fd7fc14cc034d3da299fa20faa02616e31ee5240666e5f8c8499da4371ff6721a80c7afb13b64c8ce0ec4db75b900aa0e709ec98c1252961e92cfcbc SHA512 ba54d08e0fbfd512c1a84862d2b5484d601c0a03328e4a2d01e469960b66f090c47cfdb694311de7f375c6a3711e73b38b9dfa0a2ab1ab049797b37ef13f7f9a
+EBUILD mate-utils-1.24.0-r1.ebuild 1446 BLAKE2B a8e3f2c898596884e2fd5cddb519747e0e7d69efddb98c41ae9943e64f6e37096e4d9afecfef222ad060c875f50bd044c81c24ef8bda1e04ed2d40994d6d95fe SHA512 4aa7e34aa7eb2471166279e5062fc63bd37e26cccd407b7f08901c259851d841d176cbf28727f3c7df35b5e5709c2d380b3f7d5671ead8596150cfb940c3eb26
 MISC metadata.xml 417 BLAKE2B af181dbce0a3bd1d40160da5b7b1be3a4ba345b3d31dc8d4988a146af5318bf473ad2962e9fd63fa2bfa74e61daddb5e84dd977891dee5b3b483189321bf7b1f SHA512 4c4eeb71f1cbd778f48f19da5185d9a75444a87a7abbe5d055e032f38b9891e996af84a383d7bc67ad11113da09ad034a159ec425b106340c696fad479fecee4
diff --git a/mate-extra/mate-utils/mate-utils-1.24.0.ebuild b/mate-extra/mate-utils/mate-utils-1.24.0-r1.ebuild
index c6f28252c16d..28df90e36ad4 100644
--- a/mate-extra/mate-utils/mate-utils-1.24.0.ebuild
+++ b/mate-extra/mate-utils/mate-utils-1.24.0-r1.ebuild
@@ -8,7 +8,7 @@ MATE_LA_PUNT="yes"
 inherit mate
 
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 DESCRIPTION="Utilities for the MATE desktop"
@@ -63,6 +63,7 @@ src_prepare() {
 
 src_configure() {
 	mate_src_configure \
+		--disable-static \
 		--enable-zlib \
 		--enable-debug=$(usex debug yes minimum) \
 		$(use_with X x) \