gentoo Easter resync : 12.04.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-04-12 03:41:30 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-04-12 03:41:30 +0100
commit: 623ee73d661e5ed8475cb264511f683407d87365 (patch)
tree: 993eb27c93ec7a2d2d19550300d888fc1fed9e69 /mate-extra
parent: ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 (diff)
68 files changed, 1764 insertions, 55 deletions
diff --git a/mate-extra/Manifest.gz b/mate-extra/Manifest.gz
index fc79ea736fa0..5dd054351fd1 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
new file mode 100644
index 000000000000..1308881bca10
--- /dev/null
+++ b/mate-extra/caja-admin/Manifest
@@ -0,0 +1,8 @@
+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 1138 BLAKE2B 976d5264997082ed9ad2cb788b6c2105c821ac13a82ced88de863025a4857a93c8732b61068d7bf26861d7703cfc82186b7170a6b1fff2b7d6be0c630ff6eeed SHA512 52e46efbda6b799c0e0381de73ce00183ce4b59003c15bbedbb9b436def37512683db1efa91b104d9e58a2d5ee18605495eec2858acedc5bec1c9f7f10a986ba
+EBUILD caja-admin-0.0.2_p20200328.ebuild 1102 BLAKE2B 8d03d74a550147e0d87c5616917dc08265d23bc550dcd74cc456e621d17e9392c731a88eaac74af1ccb112088f78ae4072ccb9dc88b600c95c6808a1111ac8d9 SHA512 31f2bde982cebef5048f23e4816ce9fc99089b2f4f38aa24b89635a62af69dfdd4a871de0710f8e4c84b303f21344912dbe7f6de088cecea045c26e0995bbdb1
+EBUILD caja-admin-9999.ebuild 1102 BLAKE2B 8d03d74a550147e0d87c5616917dc08265d23bc550dcd74cc456e621d17e9392c731a88eaac74af1ccb112088f78ae4072ccb9dc88b600c95c6808a1111ac8d9 SHA512 31f2bde982cebef5048f23e4816ce9fc99089b2f4f38aa24b89635a62af69dfdd4a871de0710f8e4c84b303f21344912dbe7f6de088cecea045c26e0995bbdb1
+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
new file mode 100644
index 000000000000..0f9713cd71c1
--- /dev/null
+++ b/mate-extra/caja-admin/caja-admin-0.0.1.ebuild
@@ -0,0 +1,40 @@
+# 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
new file mode 100644
index 000000000000..430515a518a7
--- /dev/null
+++ b/mate-extra/caja-admin/caja-admin-0.0.2.ebuild
@@ -0,0 +1,47 @@
+# 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{2_7,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
new file mode 100644
index 000000000000..ec008ecc87f5
--- /dev/null
+++ b/mate-extra/caja-admin/caja-admin-0.0.2_p20200328.ebuild
@@ -0,0 +1,46 @@
+# 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="b20de2dd2e1ef74db66705965fd7480e2bf98153"
+	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
+
+PYTHON_COMPAT=( python{2_7,3_6,3_7,3_8} )
+
+inherit meson 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() {
+	meson_src_install
+	python_optimize "${D}/usr/share/caja-python/extensions"
+}
diff --git a/mate-extra/caja-admin/caja-admin-9999.ebuild b/mate-extra/caja-admin/caja-admin-9999.ebuild
new file mode 100644
index 000000000000..ec008ecc87f5
--- /dev/null
+++ b/mate-extra/caja-admin/caja-admin-9999.ebuild
@@ -0,0 +1,46 @@
+# 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="b20de2dd2e1ef74db66705965fd7480e2bf98153"
+	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
+
+PYTHON_COMPAT=( python{2_7,3_6,3_7,3_8} )
+
+inherit meson 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() {
+	meson_src_install
+	python_optimize "${D}/usr/share/caja-python/extensions"
+}
diff --git a/mate-extra/caja-admin/metadata.xml b/mate-extra/caja-admin/metadata.xml
new file mode 100644
index 000000000000..ac5719457549
--- /dev/null
+++ b/mate-extra/caja-admin/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>mate@gentoo.org</email>
+		<name>Gentoo MATE Desktop</name>
+	</maintainer>
+	<longdescription lang="en">
+			An extension for Caja that allows administrator access, 
+			including spawning a Caja instance with administrator privileges,
+			editing files in Pluma, and executing files in Mate-Terminal
+	</longdescription>
+	<upstream>
+		<remote-id type="github">infirit/caja-admin</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/mate-extra/caja-dropbox/Manifest b/mate-extra/caja-dropbox/Manifest
index 8a6fda011e46..d74c972cf03d 100644
--- a/mate-extra/caja-dropbox/Manifest
+++ b/mate-extra/caja-dropbox/Manifest
@@ -1,3 +1,5 @@
 DIST caja-dropbox-1.22.1.tar.xz 309600 BLAKE2B a54778bae439a52babd4b9c88ed77ef9cebf01cb5e396e9e2dae0e74b1d55bb6b575d301133593b130af86ecb06f35fd2d11c3b7e3d67a7e741798ad701d788d SHA512 e7e9107c7654fac910762727782f35e3039b45e737341937d225126b2f63f8911f99281097b2488d3b79c0ed09fff4270b4c557166b94a722a2b1cd30fea2a2c
-EBUILD caja-dropbox-1.22.1-r1.ebuild 2064 BLAKE2B 34f838656573a407911b342ab0378c812c69b269b8a13981768349089b0ae40cc0712757d403d15f3d990362ba237f447771c6f54d74b2b4585616c41d75d2a3 SHA512 bf0b68420468ffc0aa9e2759dc02f8bf027f175dc7949d1879e537a3927a83e1b99d7da788a2fead26f6fa50bf1256dfd92d2f02d09c64d04675e73b739fff4b
+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
 MISC metadata.xml 341 BLAKE2B b530aa03ccd9e514d43bd1014500548a5931fcd30e288bdc9b6c56e9b4fa8dc42dd4a31074efe3b8ecb5f2f55aab3da8e7edd30fa5f3c1645cc088e594da7761 SHA512 3ef87b907e90f2093cece194a580099964f434ec7a1d43e961f0c00adeaeca085fc6e141f25f4ef7da0399e71093b4e2c12f52d0c29cd2aa3768354380ec1c37
diff --git a/mate-extra/caja-dropbox/caja-dropbox-1.22.1-r1.ebuild b/mate-extra/caja-dropbox/caja-dropbox-1.22.1-r1.ebuild
index 94e0300c6a8b..a5d05ac3aee3 100644
--- a/mate-extra/caja-dropbox/caja-dropbox-1.22.1-r1.ebuild
+++ b/mate-extra/caja-dropbox/caja-dropbox-1.22.1-r1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} != 9999 ]]; then
 fi
 
 DESCRIPTION="Store, Sync and Share Files Online"
-LICENSE="GPL-2"
+LICENSE="CC-BY-ND-3.0 GPL-3+ public-domain"
 SLOT="0"
 
 IUSE="debug"
diff --git a/mate-extra/caja-dropbox/caja-dropbox-1.24.0.ebuild b/mate-extra/caja-dropbox/caja-dropbox-1.24.0.ebuild
new file mode 100644
index 000000000000..5d30f1adf582
--- /dev/null
+++ b/mate-extra/caja-dropbox/caja-dropbox-1.24.0.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{6,7} )
+MATE_LA_PUNT="yes"
+
+inherit mate python-single-r1 linux-info user
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Store, Sync and Share Files Online"
+LICENSE="CC-BY-ND-3.0 GPL-3+ public-domain"
+SLOT="0"
+
+IUSE="debug"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	dev-libs/atk
+	>=dev-libs/glib-2.50:2
+	$(python_gen_cond_dep '
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+	')
+	>=mate-base/caja-1.19.1
+	mate-extra/caja-extensions
+	media-libs/fontconfig:1.0
+	media-libs/freetype:2
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.22:3
+	x11-libs/libXinerama
+	x11-libs/pango
+"
+
+RDEPEND="${COMMON_DEPEND}
+	net-misc/dropbox
+"
+
+DEPEND="${COMMON_DEPEND}
+	dev-python/docutils
+	virtual/pkgconfig:*
+"
+
+CONFIG_CHECK="~INOTIFY_USER"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	check_extra_config
+	enewgroup dropbox
+}
+
+MATE_FORCE_AUTORECONF=true
+
+src_prepare() {
+	# Use system dropbox.
+	sed -e "s|~/[.]dropbox-dist|/opt/dropbox|" \
+		-e 's|\(DROPBOXD_PATH = \).*|\1"/opt/dropbox/dropboxd"|' \
+			-i caja-dropbox.in || die
+
+	sed -e 's|\[rst2man\]|\[rst2man\.py\]|' -i configure.ac || die
+
+	mate_src_prepare
+}
+
+src_configure() {
+	mate_src_configure \
+		--disable-static \
+		$(use_enable debug)
+}
+
+src_install() {
+	python_fix_shebang caja-dropbox.in
+
+	mate_src_install
+
+	local extensiondir="$(pkg-config --variable=extensiondir libcaja-extension)"
+	[ -z ${extensiondir} ] && die "pkg-config unable to get caja extensions dir"
+
+	# Strip $EPREFIX from $extensiondir as fowners/fperms act on $ED not $D.
+	extensiondir="${extensiondir#${EPREFIX}}"
+	use prefix || fowners root:dropbox "${extensiondir}"/libcaja-dropbox.so
+	fperms o-rwx "${extensiondir}"/libcaja-dropbox.so
+}
+
+pkg_postinst() {
+	mate_pkg_postinst
+
+	elog
+	elog "Add any users who wish to have access to the dropbox caja"
+	elog "plugin to the group 'dropbox'. You need to setup a Dropbox account"
+	elog "before using this plugin. Visit ${HOMEPAGE} for more information."
+	elog
+}
diff --git a/mate-extra/caja-extensions/Manifest b/mate-extra/caja-extensions/Manifest
index c3db957e12fa..5ef815206c9b 100644
--- a/mate-extra/caja-extensions/Manifest
+++ b/mate-extra/caja-extensions/Manifest
@@ -1,3 +1,7 @@
 DIST caja-extensions-1.22.0.tar.xz 444704 BLAKE2B d14f14e2ab18e9e6ea9c039d675e2948c309d470b1532e0585915f324bcf52a8e8425fdf0b6e725014e8813eefad77300172843c2118d098811b2b349d218fd1 SHA512 19fd287123b8d2ba67b636066e9f8910aadd47d375eb1d52136d9b808b48abacade81dde490ce3edb6fc4a9d2ddfd39d9abf294a58aed8bcaf620c1eff03e761
-EBUILD caja-extensions-1.22.0.ebuild 1775 BLAKE2B 3f8cb501a4cdaf3bd3c91103d27e4b6b5ce4d9cf6f5109c7b3b88772954bbebcb410aaf6c110995e9e713820c635cb63b18a38c0644c5928d58048082b1db6a0 SHA512 9fe34eafdb200a6e5088eb951f96dccf117f2117f88f20f1e622909f80ebb9119ce13b87612591d768ec3e71ec15b02497d1fb92724b9199b181bfd57d0199d8
+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.0.ebuild 1776 BLAKE2B 799b4af09abaee50c94df23bcbaf486d8d2b70c55eb3681da13793d7e4ad352d9bbad437b52939620487c653508ea4ee60512c0a088fa06725c8ea8619003686 SHA512 d8e2b70341cbf5fe5af69058b5a9c80fa8bbf52c3e4bf6e3a0fee4db2ee153b8a65d939568468c895b1f5297431a5bdd8bad33e7ba2d793706ad3332ccae63e7
+EBUILD caja-extensions-1.22.1.ebuild 1778 BLAKE2B 67512ceb74b6127362f55c9d2373d24fadaa2c3245081c3917aa9115e331b4a2c80743937bc1cd9acc0adc3f42a8ca8b32b2c2498cf12e3a1bfeefcd19459590 SHA512 7d8b67aa9f2dd5756ca38b9a1675f7418fc6be50b7283568a1d0b016c34e6ae48ca10cb288a9e2794f0cdfaee9ba2e3f452472c31565ef9c639436993dc9bbcd
+EBUILD caja-extensions-1.24.0.ebuild 1760 BLAKE2B 7df779f958bff8f27fd7f79e887ee5528ac61d3d382089a8de6449ea2aaccdd344280918c8a09980b4be7d8212c60ffff1e963bc042102dc39f0ab401100bb5c SHA512 c77e7559cde36b04a055e97a3d037269f647d12390dc629e71c567b258b0f3bd553c0eeb270afa43b64c72f795141b03444b6fd8f1b9bc8e55327e0a1511ace2
 MISC metadata.xml 1020 BLAKE2B ab083cbce50c476d3c3c7d9f9588d3b61232b12cd5ef0f6446fd64ec027592d43dd4fee92782c5da98a2117d98e599c2aa9b13e1dcabc7d6e29f84f1f245c44b SHA512 21c041ecb2889d08d521e369249c4829fda0ee0812e4e2cf86ad3447834216595376055848636aaeed87cffdb584acf24ce9fb774be036c0a5b0279d961987ed
diff --git a/mate-extra/caja-extensions/caja-extensions-1.22.0.ebuild b/mate-extra/caja-extensions/caja-extensions-1.22.0.ebuild
index e3e77a3ce353..3f9edda48e19 100644
--- a/mate-extra/caja-extensions/caja-extensions-1.22.0.ebuild
+++ b/mate-extra/caja-extensions/caja-extensions-1.22.0.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} != 9999 ]]; then
 fi
 
 DESCRIPTION="Several Caja extensions"
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 
 SENDTO="cdr gajim +mail pidgin upnp"
diff --git a/mate-extra/caja-extensions/caja-extensions-1.22.1.ebuild b/mate-extra/caja-extensions/caja-extensions-1.22.1.ebuild
new file mode 100644
index 000000000000..da783c5b662a
--- /dev/null
+++ b/mate-extra/caja-extensions/caja-extensions-1.22.1.ebuild
@@ -0,0 +1,74 @@
+# 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
+	virtual/libintl
+	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-util/gtk-doc
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.18:*
+	sys-devel/gettext:*
+	virtual/pkgconfig:*
+	!!mate-extra/mate-file-manager-open-terminal
+	!!mate-extra/mate-file-manager-sendto
+	!!mate-extra/mate-file-manager-image-converter
+	!!mate-extra/mate-file-manager-share"
+
+src_configure() {
+	local sendto_plugins="removable-devices"
+	use cdr && sendto_plugins+=",caja-burn"
+	use mail && sendto_plugins+=",emailclient"
+	use pidgin && sendto_plugins+=",pidgin"
+	use gajim && sendto_plugins+=",gajim"
+	use upnp && sendto_plugins+=",upnp"
+
+	mate_src_configure \
+		--enable-sendto \
+		--with-sendto-plugins=${sendto_plugins}\
+		--disable-gksu \
+		$(use_enable image-converter) \
+		$(use_enable open-terminal) \
+		$(use_enable share) \
+		$(use_enable wallpaper) \
+		$(use_enable xattr xattr-tags)
+}
diff --git a/mate-extra/caja-extensions/caja-extensions-1.24.0.ebuild b/mate-extra/caja-extensions/caja-extensions-1.24.0.ebuild
new file mode 100644
index 000000000000..53f34f0a74b7
--- /dev/null
+++ b/mate-extra/caja-extensions/caja-extensions-1.24.0.ebuild
@@ -0,0 +1,73 @@
+# 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
new file mode 100644
index 000000000000..9ba11681ac31
--- /dev/null
+++ b/mate-extra/caja-hide/Manifest
@@ -0,0 +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 863 BLAKE2B fa480f13745c96cb3471216efa13e236e6697c966677b097136a9fa12ec251d74b77673f8e159814d26400e324a5ecc1cc4d56e92dbabbd24c573c330abc3c52 SHA512 b335b106ae991ea03c1074184d33aa626522d200347f28d1be9a5bbe9347811639414fd779f7511653f6324417e48d379fed3a8b5384784a1acde4e723e64e3e
+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
new file mode 100644
index 000000000000..029a1ed15148
--- /dev/null
+++ b/mate-extra/caja-hide/caja-hide-0.9.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_6,3_7,3_8} )
+inherit python-single-r1
+
+MY_PN="Caja-hide"
+
+DESCRIPTION="Hide files without renaming them in MATE's Caja"
+HOMEPAGE="https://github.com/Fred-Barclay/Caja-hide"
+SRC_URI="https://github.com/Fred-Barclay/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}"
+RDEPEND="${DEPEND}
+	$(python_gen_cond_dep 'dev-python/future[${PYTHON_MULTI_USEDEP}]')
+	dev-python/python-caja[${PYTHON_SINGLE_USEDEP}]
+	x11-misc/xautomation
+"
+BDEPEND=""
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-py3-support.patch"
+)
+
+src_install() {
+	insinto /usr/share/caja-python/extensions
+	doins src/caja-hide.py
+}
diff --git a/mate-extra/caja-hide/files/caja-hide-0.9.0-py3-support.patch b/mate-extra/caja-hide/files/caja-hide-0.9.0-py3-support.patch
new file mode 100644
index 000000000000..1e8e9994456e
--- /dev/null
+++ b/mate-extra/caja-hide/files/caja-hide-0.9.0-py3-support.patch
@@ -0,0 +1,20 @@
+# futurized
+--- a/src/caja-hide.py
++++ b/src/caja-hide.py
+@@ -1,3 +1,6 @@
++from __future__ import absolute_import
++from __future__ import division
++from __future__ import unicode_literals
+ # Caja Hide - Extension for Caja to hide files without renaming them
+ # Copyright (C) 2015-2016 Caja Hide authors.
+ #
+@@ -14,6 +17,9 @@
+ # You should have received a copy of the GNU General Public License
+ # along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ 
++from future import standard_library
++standard_library.install_aliases()
++from builtins import *
+ import os
+ from gi.repository import Caja, GObject
+ from gettext import ngettext, locale, bindtextdomain, textdomain
diff --git a/mate-extra/caja-hide/metadata.xml b/mate-extra/caja-hide/metadata.xml
new file mode 100644
index 000000000000..81973b835302
--- /dev/null
+++ b/mate-extra/caja-hide/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>mate@gentoo.org</email>
+		<name>Gentoo MATE Desktop</name>
+	</maintainer>
+	<longdescription lang="en">
+			An extension for Caja that hiding files without renaming them
+	</longdescription>
+	<upstream>
+		<remote-id type="github">Fred-Barclay/caja-hide</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/mate-extra/mate-calc/Manifest b/mate-extra/mate-calc/Manifest
index a635d94d595a..3b92179a4a1f 100644
--- a/mate-extra/mate-calc/Manifest
+++ b/mate-extra/mate-calc/Manifest
@@ -1,3 +1,5 @@
 DIST mate-calc-1.22.0.tar.xz 623312 BLAKE2B ae40278e455c520649db9fb4f48aedb2dec3b9abc48175a9f0111bbc57b7aac289d20d8dc1703a7b6545351e75e0ae641432ce6227f5ae0a8de5cbed68120581 SHA512 a0d72a17dc9e7e97ef36cb2f089db126b1f91790d6a34ae829ef9cea87e82b025ba106f08e8c677352e72423a6670a3bf8751eecc67444cd8cea8dc8f3cf6728
-EBUILD mate-calc-1.22.0.ebuild 524 BLAKE2B 68dee096c32afdda8f2789f0fc87ed6b82d82400c60f4eca016e8f2621ec5bddf01a9d3e6b8ef635648d92c5065140ed94360dc2ce22b454e20f21ea4fcd3a2a SHA512 1c1f013d9bcc50c5efd6bb0fc5cf873c0d0a9a91246a446ce95958995c45f9a379963522dfbe847c971af8e59d5098c3f02268a5fa2d5d748d605a32dc9be84d
+DIST mate-calc-1.24.0.tar.xz 939480 BLAKE2B 28a8184665096d477bdc80484fc9da3bf9835dd5d1c30d4de11722488d735f88336bcf990c50ef65dd0a5781fc083b5d011fd5085c2d1672e6599a28f4a01452 SHA512 ebb18f07ded5577bb0987b2027e7b73abc823a567bfa00f9cc9bfaf75de498f150b6b4c2e13486c530a3cbb078f1b798c415b33d668d952e8650799dd05c99eb
+EBUILD mate-calc-1.22.0.ebuild 538 BLAKE2B e3c20e1f4d90edb2da70fb6c08c48ccb5b5f5a6febce15a522c04db42b722f8254d00ddbf4a1855ba29c376daafef6c07cf7e7b9432d7191f25aaec7dc854df5 SHA512 d1f5c7c795b876ab8841550768a0a8637f55ca592c2801d5cfc5bd31e0fb6101634b4f8e02c86149fd21f4e22b6038ec2a7cede2ae386005cda6d4a1cd72e416
+EBUILD mate-calc-1.24.0.ebuild 557 BLAKE2B 606268c11cdcf56cc22e770b55ad77e26e3bafdb6262c28f53b67478ff5c3faa2e7325ac00a04efd4367a90c42b198e7a5c58790298df230da124d1094b5dcbe SHA512 d03ce21b14562c34f12fd25d8eea6e493e863149b663cfb44123f37ac3f7f39b6cfa623d13ebc57096c55463dcebccdea65d369ebd2a4448a80c4afa256ee343
 MISC metadata.xml 529 BLAKE2B 35d3bc43838113fc4fa26e875cf6ffb519009307e6a8c06a9c2aa10a65231c231d5789c9b6c728fc4279dc76ed6c8442b68b3a538a973290785c2f65df776756 SHA512 3ed383251b99bfe8492c4a33d08f0bd42479d4d1ed3ccc4c316d2b64643bd611af27ed1238404969e6a924e1998ab0d47d8784d5b027bd276177d3875718e987
diff --git a/mate-extra/mate-calc/mate-calc-1.22.0.ebuild b/mate-extra/mate-calc/mate-calc-1.22.0.ebuild
index da47eafc3691..3f9ecccc1aed 100644
--- a/mate-extra/mate-calc/mate-calc-1.22.0.ebuild
+++ b/mate-extra/mate-calc/mate-calc-1.22.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ if [[ ${PV} != 9999 ]]; then
 fi
 
 DESCRIPTION="Calculator for MATE"
-LICENSE="GPL-2"
+LICENSE="CC-BY-SA-3.0 GPL-2+"
 SLOT="0"
 
 IUSE=""
diff --git a/mate-extra/mate-calc/mate-calc-1.24.0.ebuild b/mate-extra/mate-calc/mate-calc-1.24.0.ebuild
new file mode 100644
index 000000000000..77fe727bb331
--- /dev/null
+++ b/mate-extra/mate-calc/mate-calc-1.24.0.ebuild
@@ -0,0 +1,33 @@
+# 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="Calculator for MATE"
+LICENSE="CC-BY-SA-3.0 GPL-2+"
+SLOT="0"
+
+IUSE=""
+
+COMMON_DEPEND="
+	dev-libs/atk
+	>=dev-libs/glib-2.50:2
+	dev-libs/libxml2:2
+	>=x11-libs/gtk+-3.22:3
+	x11-libs/pango"
+
+RDEPEND="${COMMON_DEPEND}
+	virtual/libintl
+"
+
+DEPEND="${COMMON_DEPEND}
+	app-text/yelp-tools
+	dev-libs/libxml2
+	>=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 342f4b4bb228..7c1c869b9fdd 100644
--- a/mate-extra/mate-indicator-applet/Manifest
+++ b/mate-extra/mate-indicator-applet/Manifest
@@ -1,3 +1,7 @@
 DIST mate-indicator-applet-1.22.0.tar.xz 339564 BLAKE2B 0655ced0b24cc681ebd8e66b0749c9d98f9bc361830431bb408158ab174d5ea27aa022344cc667e37405ae693b52ed5c20e5b5ecec01b484c1928df36e1673d0 SHA512 6e1dd133a521f247ecb648b3ffa542e326f504fd3b0719a74099e83ac1dfa9fd4d7676af284f89f69d6684e5640f240930bb0fb43bcf7d59472786adf4c3200c
-EBUILD mate-indicator-applet-1.22.0.ebuild 488 BLAKE2B 8da57ba7b91a520decdcd46ee265c49fc9d440e5f9f6a44c95e208b3d678c979ffa51a267b7d9302149aaaf19df2080f268079fa718267b5ea4a7f7a71d5c8cb SHA512 69e2794e681d24e43d449f9e26687969afe7faf4240432699c0e9887f61bd01874eeb9cde014afe5e0afdaee3bc22cc01d91107a9ca4a78663fb949eaa35e8b1
+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.0.ebuild 496 BLAKE2B c19a2243445e3d7e6151b6dc1837751d75178f1e30a1ffe3f874009f430fcdc36b8f227dbbe247bac375a2b045afbd60d335424d32a8a638d84e9dc73251bea6 SHA512 fc1a659ac1e8880a6bf098c68e38288b70adde600a60dcff14ecb09ecea5703854c713d09cbd083f84bd508ee15cdc03a1028e0d7379e9cf351781270a689351
+EBUILD mate-indicator-applet-1.22.1.ebuild 498 BLAKE2B 2c86b370e7902323a2840482c850b80830710f69ff49c3faca707162ceee3cd3dc338e727de5ca0cdde31b49372ba911e4abccbd1d8176ce198272c8a3ee5fe7 SHA512 9575b9792705befa6de7c594b1b1b78913cdd1178d2b33e4b3d56cd47de2a606578f63a1429d7cb3c424df00c09092c2f7ef960ffd3d82c5c4c1799a5bb5e7f3
+EBUILD mate-indicator-applet-1.24.0.ebuild 520 BLAKE2B cc0529d6f9cc2ff2deaa7432120112ee121088020035bad9ca18c5442935d70823a53cebae92b20634ffd5608e825ab4087065b3b287db1e392044d5cb3ece2c SHA512 f452b80135f1c994b3925fdfd2efdb20563399708d9c888889c6546c0b7b317b32a0abbabc9f46524c76903b78f464c84732014cd0b42fef73345c626c4b7a54
 MISC metadata.xml 350 BLAKE2B 96082001bda8c5a855c43e0ac4bba9d604b8ec94f66464859a37e30843f8f1ecddff2c3100a49ab465711bb529e288afddbb03aab9b6dde16de35370353a2fe7 SHA512 add12365e457c531f5dc3eec856099b5658f93a3d6ee2b3f80264374a84558566881213b8e8ffad03aeb3720025c385517d777af249a045b9dd2c22ce37b2f32
diff --git a/mate-extra/mate-indicator-applet/mate-indicator-applet-1.22.0.ebuild b/mate-extra/mate-indicator-applet/mate-indicator-applet-1.22.0.ebuild
index ed3d14dae04e..02aae41238c2 100644
--- a/mate-extra/mate-indicator-applet/mate-indicator-applet-1.22.0.ebuild
+++ b/mate-extra/mate-indicator-applet/mate-indicator-applet-1.22.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ if [[ ${PV} != 9999 ]]; then
 fi
 
 DESCRIPTION="MATE indicator applet"
-LICENSE="GPL-2 FDL-1.1 LGPL-2"
+LICENSE="GPL-3 GPL-3+ LGPL-2+ LGPL-3+"
 SLOT="0"
 
 IUSE=""
diff --git a/mate-extra/mate-indicator-applet/mate-indicator-applet-1.22.1.ebuild b/mate-extra/mate-indicator-applet/mate-indicator-applet-1.22.1.ebuild
new file mode 100644
index 000000000000..c554bb2e477b
--- /dev/null
+++ b/mate-extra/mate-indicator-applet/mate-indicator-applet-1.22.1.ebuild
@@ -0,0 +1,27 @@
+# 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}"
+
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/intltool-0.35.0
+	virtual/pkgconfig"
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
new file mode 100644
index 000000000000..23ea522d31a3
--- /dev/null
+++ b/mate-extra/mate-indicator-applet/mate-indicator-applet-1.24.0.ebuild
@@ -0,0 +1,31 @@
+# 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 5ca4bddacd32..f279933c1ede 100644
--- a/mate-extra/mate-media/Manifest
+++ b/mate-extra/mate-media/Manifest
@@ -1,3 +1,7 @@
 DIST mate-media-1.22.1.tar.xz 486664 BLAKE2B dae64f3a55137a760551261c1c92d34d4bf94c5057e16555d4c975f2ae6054812d6618cbaaf8da606392f23959118b8d98ffb2e6a8821d2171147ad2c74e6b73 SHA512 e7bce9128bc6e551cd918af669d52a7ca238a280a4ca09d15822f4d5b52fd9925b647278a39067a1f2a5dd0facfad4988385233939abbdf4aefecc21d2e089d9
-EBUILD mate-media-1.22.1.ebuild 732 BLAKE2B a1edd5c28e829b14cf899e7edbc3c48a298a5cf99752ddd35be9ecf22de26276917954a59820206b0479dcf8f9a574308dda031c87f37bf9b174d8690ae18383 SHA512 9dfc330c210f1bdb0171724bd0867de6f25ceb4b7ebf31f70c330d238d35caa6d5d4f1fbddb1eae790f5a68ee84f161fddca887684020a0c47ab2fb88630379b
+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.1.ebuild 740 BLAKE2B 6fc429c87ec21a6e02bb419631c0d28399c1fed3f13c4f313195afba98a18507ff425afed49e93be76495049428bd71d121ff376d9258432d74d8a62cb46d4d1 SHA512 033e4002fe027a4e7c85d60926131f1c0e0be7ec498095604660ad7888bf8a27f17bc82193d9676e42fef638d7cbb350c2b423803d4506597e36ece1b350282c
+EBUILD mate-media-1.22.2.ebuild 742 BLAKE2B 8a965d158178e0ea0c3d2f01cf94b3405affdc0874f9e546a010b17f3aa717a9cb3570465b031719abeb3285b22263e396e2bb72276dc1bf4f87827cd407ea52 SHA512 bff659d9a0963889c2e4b0c2e4d3244a654028b4460b4a7fa9080b8314845d6160120290bed88177917048e2ec42257a13b5455832ee275642da8bc762ab0eea
+EBUILD mate-media-1.24.0.ebuild 725 BLAKE2B 500825bbc945209c3e82ee617f168be6554859bf8e6fa871aab0b140dc60b0b98cd824dedd30da94e81db27ae8a899fffc52b63ff83d7a27b6094219d8b1a242 SHA512 a29a19d74ac7422ee341d9f2473f132ae2f1dfa25c7779e5e3ee9ebd9a3682ec9c5dd33b69a38fa98c52737d0f24080cbf69bd55ceeaf202ee71993e4548888e
 MISC metadata.xml 339 BLAKE2B bd032fdad5c46fb56210712a25e50c24959053249e43ebe7da6a6d2cfb099642acc949db166abca0c847cb661c6b20d59f03366abc290b4e0656a547ede52a8b SHA512 6975819ad5dd4234e702e7eaa36a05f3598a830b3f997ea17f299e1e7a40f5d3463b732ca1816e7e9af015c4afeecff2ea94dc0562a20b31698870ffc0489968
diff --git a/mate-extra/mate-media/mate-media-1.22.1.ebuild b/mate-extra/mate-media/mate-media-1.22.1.ebuild
index 66ec91a9100d..f7499e578c64 100644
--- a/mate-extra/mate-media/mate-media-1.22.1.ebuild
+++ b/mate-extra/mate-media/mate-media-1.22.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ if [[ ${PV} != 9999 ]]; then
 fi
 
 DESCRIPTION="Multimedia related programs for the MATE desktop"
-LICENSE="LGPL-2 GPL-2 FDL-1.1"
+LICENSE="FDL-1.1+ GPL-2+ HPND LGPL-2+"
 SLOT="0"
 
 IUSE=""
diff --git a/mate-extra/mate-media/mate-media-1.22.2.ebuild b/mate-extra/mate-media/mate-media-1.22.2.ebuild
new file mode 100644
index 000000000000..6d13701ffbaa
--- /dev/null
+++ b/mate-extra/mate-media/mate-media-1.22.2.ebuild
@@ -0,0 +1,35 @@
+# 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
+	virtual/libintl"
+
+RDEPEND="${COMMON_DEPEND}"
+
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/intltool-0.35.0
+	sys-devel/gettext:*
+	virtual/pkgconfig:*
+	!!<mate-base/mate-applets-1.8:*"
diff --git a/mate-extra/mate-media/mate-media-1.24.0.ebuild b/mate-extra/mate-media/mate-media-1.24.0.ebuild
new file mode 100644
index 000000000000..1625c0268e62
--- /dev/null
+++ b/mate-extra/mate-media/mate-media-1.24.0.ebuild
@@ -0,0 +1,36 @@
+# 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-netbook/Manifest b/mate-extra/mate-netbook/Manifest
index 947a168e9c2f..cafb24a00c25 100644
--- a/mate-extra/mate-netbook/Manifest
+++ b/mate-extra/mate-netbook/Manifest
@@ -1,3 +1,7 @@
 DIST mate-netbook-1.22.1.tar.xz 307776 BLAKE2B 8d10de7926023d1c0e9a92c2a55306db797e156948096936864332a79f0bdf91406df2ecf523b951eb6b1d0770dfbe705d913d75c74043bc78f765615af76bdf SHA512 d0ba10d798e779e89b656a5bab2f5524c36755d58b877ba18482171c7673c5217ecf39b8098ff7b258634fbae62638d70bdf11e17f02f47c68ca96058f0ebb03
-EBUILD mate-netbook-1.22.1.ebuild 622 BLAKE2B cde7be94e8aba73a28235cf06bf5072a696b55ab9ad729a6021ef5b4b6b37af1ead3d58288fb4729bd5740656cf3ea5613588e50d9e79af48dd3924eef585be1 SHA512 cd445d62bb26a99b75929b9d035e27f55d9da5e8f1e7d4c19106044357269ded1c21039bc8d8f255366d688cb20b6ffa0166b39aedf97d281830a1b9bb70a749
+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.1.ebuild 630 BLAKE2B fcae07f42e969fd585c583174c6e627ce0fbffc00ff7a86c98249f2f58548b765f45b1b3e73a4058e6feb8108da862416dfdd855a79e5147814a6e25dd444852 SHA512 370737e83c170e6da175e99e9067a445121b135b056692bae391517f383294b89e323e91117527b1c7c7649fff5f563ef967d64165f4fb68a3b33d7369b4ccc4
+EBUILD mate-netbook-1.22.2.ebuild 632 BLAKE2B 1a7fe44dab109b27052a3c454d1b2eb470f0ea850ed327f2bf9433ee1cb86d7ec2ab4831b17cd691d6b21fc1fc85f5a43ea3b8a987f92a5a438e06bacf07f100 SHA512 86226c2aac24a3b5f0be767e154d174703ed5dcdc35de2dfc59fc5b86d7e12b0e8e6def8a6135c32ba68843da981c0345439ab1fd76a634f1c6f81a5b39a0006
+EBUILD mate-netbook-1.24.0.ebuild 644 BLAKE2B a88a1b83140c21ecf1a84c983667222ef612798b08ef1d9ca12805833cbfe20798424b81943fddd703508e56fa7bfe302865db366815804778d8eb20117f9b84 SHA512 255133cdf6b3537d02adbcaf28e5891d781a13580062f18ce73c7988c15f61fa5bdc15392fd691cc9660818eaa060e43820d93db9c0c00f8ef5022e811aee344
 MISC metadata.xml 495 BLAKE2B 69f4f61082d017e4e92917edcfb1fc9be696c5472641b0cd81714c07a29f4495644f4120fbd0292f8c5d1d40b3642a095969281ed2c2ad8896ff3156c3fba3bd SHA512 8edc358ede2010384cdecc1e430aa9cbf90bb64c3f52d71ad2bf30d4cb84e38bdf48a4b2e45920b35ada734ffe4a46b44f363b6bf18ba2247f6abe290b5131db
diff --git a/mate-extra/mate-netbook/mate-netbook-1.22.1.ebuild b/mate-extra/mate-netbook/mate-netbook-1.22.1.ebuild
index 483c783f4754..f440977f066b 100644
--- a/mate-extra/mate-netbook/mate-netbook-1.22.1.ebuild
+++ b/mate-extra/mate-netbook/mate-netbook-1.22.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ if [[ ${PV} != 9999 ]]; then
 fi
 
 DESCRIPTION="MATE utilities for netbooks"
-LICENSE="GPL-3"
+LICENSE="LGPL-2+ GPL-3"
 SLOT="0"
 
 IUSE=""
diff --git a/mate-extra/mate-netbook/mate-netbook-1.22.2.ebuild b/mate-extra/mate-netbook/mate-netbook-1.22.2.ebuild
new file mode 100644
index 000000000000..f7ce5d624a4d
--- /dev/null
+++ b/mate-extra/mate-netbook/mate-netbook-1.22.2.ebuild
@@ -0,0 +1,35 @@
+# 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
+	virtual/libintl"
+
+RDEPEND="${COMMON_DEPEND}"
+
+DEPEND="${COMMON_DEPEND}
+	x11-base/xorg-proto
+	>=dev-util/intltool-0.50.1
+	sys-devel/gettext:*
+	virtual/pkgconfig:*"
diff --git a/mate-extra/mate-netbook/mate-netbook-1.24.0.ebuild b/mate-extra/mate-netbook/mate-netbook-1.24.0.ebuild
new file mode 100644
index 000000000000..b6139aaa6463
--- /dev/null
+++ b/mate-extra/mate-netbook/mate-netbook-1.24.0.ebuild
@@ -0,0 +1,38 @@
+# 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 8ee3efab01e6..1a6b9cf726fa 100644
--- a/mate-extra/mate-polkit/Manifest
+++ b/mate-extra/mate-polkit/Manifest
@@ -1,4 +1,6 @@
 DIST mate-polkit-1.22.0.tar.xz 302080 BLAKE2B 374fa5215c57a36fc3a6fa4660866b33bc02d067f1eaf5cbadca8711efe8771e4c59d496e8eb47c75567b5a0e472fd10782c5b5436b9d2a5e7fc834445e5cf06 SHA512 e761ec10842789b5bbb3831f568c64e969429131a893850e8323927b949e115a24b3907fd3def7f31f5f785f0831717d852c61f08a9028a009ea9cca0ba86393
-EBUILD mate-polkit-1.22.0-r1.ebuild 930 BLAKE2B 35d4c4048439c5cb6faad8c94f482542c2a757efd3c54ad6e413bfed13f362cd24135cca6704abe30e2c3334f158c6060d8fd13827d8b19e67894e6fbe0803ac SHA512 ca4763a15db3230a433ec339c7d6879cb50323b785ae8faa6e8ca01db8d8c57af4e424c25bcc4fd54e6384b88c38b92dccf71e42c0e47788a43fdf9286412e16
-EBUILD mate-polkit-1.22.0.ebuild 928 BLAKE2B ee78e39534eee2561d2b3aa2f701b4560464a2e3ef2604474cb154a000ba590f93b51d77f8b3e003491c12603e9932d7077608833ae131c421ff537ce5d523ce SHA512 95a0a3e5d9d109bd579bc255323bc61bfe7fa34e36c366d1a81ad73e62aa4fe2d9b32d5b2d94475935b4a4b60dc0ba627eed76132b4c884cfb53981eb2908847
+DIST mate-polkit-1.24.0.tar.xz 332652 BLAKE2B 293d964f2410d2f60047d1e01e2ba864c22e8bda00e5b659329d097391b2988349c70dfbd953f223c4212887d16d54f1f5a7eb21e38b69b553d54b1966647cb1 SHA512 8d759bd5f78750c75dc92ffa27e555ae36ae7199b76483cbfe7e0848d3a66cda5b82c98bf334068eb79a1344757665cf7d1bf403e4e908e332ca929c8ebe2a98
+EBUILD mate-polkit-1.22.0-r1.ebuild 931 BLAKE2B 54504db4a8f872b164970745df3a293605ac436f0714196e99fd69b304a6b917820dd970eb34d718fe413435a0dd9d6799067cbca4528b1fbda9fc7a653dbb24 SHA512 7cbf6f7750c440b6eb3bd3099c82a48f823af9e45be11d8c2ed90f4f8fc8a01af8e831c32c1ff14293d273de02f4a5c80b5c2071ce4d63421001e5a36deb0ccf
+EBUILD mate-polkit-1.22.0.ebuild 929 BLAKE2B f1eb3b90e397746647746d099aced8e19cccbdfb4b7814ddcf928bd6af10758fd7ac9e02efde28d4d9d59fa94c13e31b6659ebe0c37db8b17763ef43dfb67f5e SHA512 733e5a4ec2ea436a9b644cf56d21a13893f1fdd4c06d75f53788faa096742a322d641e93f1d382f9aa7ba7228d0cc60fa6385fd4835e49554ec9d2674e04bbfe
+EBUILD mate-polkit-1.24.0.ebuild 911 BLAKE2B c3394ed54133eda6fa6b46c008075a0d1e609a410127b046190db9f78c3f1cd14a1e7990c31342928a368a55389369c096d91cbc61590a55f81cb0b0c71f937b SHA512 e1ab97a5fb53a36b98f7f13680e2daa4067ac52fdcdd23c618f3976ced6060cccfb04fc536d5108b324b3fe9f8859be07918097a854766314043ebebef77f0ea
 MISC metadata.xml 505 BLAKE2B 280a6762e6d9c690b5b0e0383e9d7560551d131f72823fdd759175b89f04eb22bbb7c605f26e178cfab65cc63e590997dbc9fd5621afe7ec1a4dbb5acd129683 SHA512 eea439bc1d6d7444abdea4e5ce2ed33bfc4a7bc625d67ccff9b65348d72296f5dddb1c11c86efd7b2ebb84b2fc2f2ed8beab715d6016c8ec94d03626be4497ef
diff --git a/mate-extra/mate-polkit/mate-polkit-1.22.0-r1.ebuild b/mate-extra/mate-polkit/mate-polkit-1.22.0-r1.ebuild
index 68691a62f991..ebb71540060c 100644
--- a/mate-extra/mate-polkit/mate-polkit-1.22.0-r1.ebuild
+++ b/mate-extra/mate-polkit/mate-polkit-1.22.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ if [[ ${PV} != 9999 ]]; then
 fi
 
 DESCRIPTION="A MATE specific DBUS service that is used to bring up authentication dialogs"
-LICENSE="LGPL-2"
+LICENSE="LGPL-2+"
 SLOT="0"
 
 IUSE="accountsservice appindicator"
diff --git a/mate-extra/mate-polkit/mate-polkit-1.22.0.ebuild b/mate-extra/mate-polkit/mate-polkit-1.22.0.ebuild
index 39199db6278f..115ea19651f2 100644
--- a/mate-extra/mate-polkit/mate-polkit-1.22.0.ebuild
+++ b/mate-extra/mate-polkit/mate-polkit-1.22.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ if [[ ${PV} != 9999 ]]; then
 fi
 
 DESCRIPTION="A MATE specific DBUS service that is used to bring up authentication dialogs"
-LICENSE="LGPL-2"
+LICENSE="LGPL-2+"
 SLOT="0"
 
 IUSE="accountsservice appindicator"
diff --git a/mate-extra/mate-polkit/mate-polkit-1.24.0.ebuild b/mate-extra/mate-polkit/mate-polkit-1.24.0.ebuild
new file mode 100644
index 000000000000..e209135516aa
--- /dev/null
+++ b/mate-extra/mate-polkit/mate-polkit-1.24.0.ebuild
@@ -0,0 +1,42 @@
+# 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 1f80922c5bfb..716ad3f9ace9 100644
--- a/mate-extra/mate-power-manager/Manifest
+++ b/mate-extra/mate-power-manager/Manifest
@@ -1,3 +1,7 @@
 DIST mate-power-manager-1.22.1.tar.xz 3188048 BLAKE2B af32a18e2561cc9689382ff9a94382180a5d2dc6ade34a6dc400a7b65730a6c26c6f32b72b6ec973210ac3baf4e8b6c54e489230e64b877cee4ffbbf1a195d28 SHA512 8eabd7f8171f0a6be610c849fad8346bb30ca2c69208e2e117f436daaa5ada3bf0fef479dc017f32f56ec6bd52a7ff7ff69d18baf01b402c5fa2747245261a81
-EBUILD mate-power-manager-1.22.1.ebuild 1615 BLAKE2B e35d4d5c388d5ff46dfd56c22b0ef0bd6be2da3a433cabc69b0f8b8df663f72a8b92f432c5dd2a5f429fdee14b510f83e8dcdcb268fcb56e9d6366a6688d5de2 SHA512 0f94f0813876550377a681e006123e607f0aa2490973a62348b45d3b68ab5566f55750950ab568f0ebf122a6e9ad7101219c5f0236288f257abbce6628a1f261
+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 1635 BLAKE2B c9c04a5242fb8b90eee654bc656fe9a9f986b027e33e07aa36c86615b6c7ac1a3d9d821324f1daafee605206851732fe6959fc1a7919b3965748fbb69e973e8a SHA512 e73eea63c5f41c9269755b2ac5fd59601305bd5cbf25d154a7e08b32d42d98dd38623ab6a84468a227675a0e10631dca1fc4d2cb59a9adcca51a175a2e91cf8f
+EBUILD mate-power-manager-1.24.1.ebuild 1653 BLAKE2B e937ad4e91a884bc86dc22c90facad23b4dc70752a298bca09737c9505738f9fe29d622e95132ff730f4afc969b3d19b6ed216add2c213462d67962583015300 SHA512 f5266ad79e8cb5c23945647f35aeb598b43af820e83eacae4ff1450f16298e9b84a35ce36ac0a70a3f5477b769a6e288a4f894dfa8c07f3e888bcdc7d3d0b4dc
 MISC metadata.xml 427 BLAKE2B 2a15897025c6693a2e99c56ee66f3c4da0fc62655c9d6e062451f7f8ef9d82b1fc8bd162d54b5fdee4a1cda0135f09c594f63c1609b622c9570568be05b2e6d7 SHA512 6922ccd9022b2b15fe7d57f196aa715aeed17f5f08d92444f3f07d8ef50f37dd48b62000adc5188076805138f651afea6af02c89d13f4abb3c66cd2419ccb30f
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.1.ebuild
index 011dc99ed914..f37314be82dd 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.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ fi
 
 DESCRIPTION="A session daemon for MATE that makes it easy to manage your laptop or desktop"
 
-LICENSE="GPL-2"
+LICENSE="FDL-1.1+ GPL-2+ LGPL-2+"
 SLOT="0"
 IUSE="+applet elogind gnome-keyring policykit systemd test"
 
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.2.ebuild
new file mode 100644
index 000000000000..ecc7912423ab
--- /dev/null
+++ b/mate-extra/mate-power-manager/mate-power-manager-1.22.2.ebuild
@@ -0,0 +1,72 @@
+# 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 gnome-keyring 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
+	>=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 )
+	gnome-keyring? ( >=gnome-base/libgnome-keyring-3 )
+	>=sys-power/upower-0.9.23:="
+
+RDEPEND="${COMMON_DEPEND}
+	policykit? ( >=mate-extra/mate-polkit-1.6 )
+	systemd? ( sys-apps/systemd )
+	!systemd? (
+		elogind? ( sys-auth/elogind )
+		!elogind? ( >=sys-auth/consolekit-0.9.2 )
+	)"
+
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xml-dtd:4.3
+	app-text/rarian
+	>=app-text/scrollkeeper-dtd-1:1.0
+	app-text/yelp-tools
+	dev-util/glib-utils
+	>=dev-util/intltool-0.50.1
+	sys-devel/gettext
+	virtual/pkgconfig
+	x11-base/xorg-proto"
+
+src_configure() {
+	mate_src_configure \
+		--enable-compile-warnings=minimum \
+		$(use_with gnome-keyring keyring) \
+		$(use_enable applet applets) \
+		$(use_enable test tests)
+}
+
+src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+
+	dbus-launch Xemake check || die "Test phase failed"
+}
diff --git a/mate-extra/mate-power-manager/mate-power-manager-1.24.1.ebuild b/mate-extra/mate-power-manager/mate-power-manager-1.24.1.ebuild
new file mode 100644
index 000000000000..b188be8b1a4d
--- /dev/null
+++ b/mate-extra/mate-power-manager/mate-power-manager-1.24.1.ebuild
@@ -0,0 +1,73 @@
+# 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 gnome-keyring 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
+	>=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 )
+	gnome-keyring? ( >=gnome-base/libgnome-keyring-3 )
+	>=sys-power/upower-0.99.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 )
+	)"
+
+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"
+
+src_configure() {
+	mate_src_configure \
+		--enable-compile-warnings=minimum \
+		$(use_with gnome-keyring keyring) \
+		$(use_enable applet applets) \
+		$(use_enable test tests)
+}
+
+src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+
+	dbus-launch Xemake check || die "Test phase failed"
+}
diff --git a/mate-extra/mate-screensaver/Manifest b/mate-extra/mate-screensaver/Manifest
index 5a189859d756..cfc242b3f2e8 100644
--- a/mate-extra/mate-screensaver/Manifest
+++ b/mate-extra/mate-screensaver/Manifest
@@ -1,4 +1,8 @@
 AUX xss-conversion.txt 1026 BLAKE2B 4675ecb7d7ce45b28183ff503739b5d3853e8a68adfb8e4bf92274944c034d4f043c8854cc54a801ad72160bf452c645dfc5a0d35a71b967c9094f2a8464e59a SHA512 149d28bf7ff9dffe75f0a59408d91eff6537ec27a9457bf2419efe78e9b39a11796b341176e6ba4b1a183cc3ead080abe0ba85f51a3d57b0ff54dae8a3ec312a
 DIST mate-screensaver-1.22.1.tar.xz 4942928 BLAKE2B e82b6482ed9ec655bb8bea2795b0e2559cbdfcb2be5f27a2264486a2013b8234cb02292b6ca547f8812e6dc0c74646f51af8a2f8d7baf2f28bf1b688508350d5 SHA512 7ffb94d88095ff5580862fe9c958a2e4af7a424d40dc5e0f3c1da49a258035179573721fc7052710624916678e953a6347a898b53ff872a49e022987b8c02904
-EBUILD mate-screensaver-1.22.1.ebuild 3087 BLAKE2B c6350e95ce07ca7b7cf839d80e0b2b167ddbe5d820fdf6456bc471b5fb4372a56c40adce6692061bfe73637bbf66e35c647b21c3be131fd03044c7b57c79d46a SHA512 e663fa58d57e70dd779d3b34db313f7531ac31dd433efedf36e74d4253a0072a65901861581b4052d12e43025165d8425501f79448f9d0b5da9a27f341617a56
+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.1.ebuild 3101 BLAKE2B f8d6c42a50c258f13abcf4ac2d113013e521752eb63a3cae040b1464925a7eebe359de2d54bd64690dda2c4053e1fd529a348d57d6d7def5300db23c9cc5cc38 SHA512 27c2ca64c3e3840f816c5bedd27a113d62c7f0123304b0e9c0da248f263203586c7d4fe9ce83f197ae7b4af49f470af18142d345903af7084898747e035a9675
+EBUILD mate-screensaver-1.22.2.ebuild 3080 BLAKE2B 2a34a2b7a4c520a91c18d5b2e6c9840823486b7fe77f4c5ab064199c2eded10e0e1eae05e1910d2328049169bb2f03b0b0c37defed7da571a20e6e720eaa26ba SHA512 8d8e64351000e69d2d1659b708048b4b2b9f1588b01e5ef71f163046702ca2a8de4188949173ec2d9b8ebf0711e7344b75c837fbc23639670b11c5a9c0d2bc5f
+EBUILD mate-screensaver-1.24.0.ebuild 3082 BLAKE2B daed17d9278b42deaa10f4aceda36ce782c5428296b2babad40dd8f865b2ca9420a9943031ee2c3ad955f876ed120f0dc7b73b1e29f66bc0d6be973e4b2ce4d0 SHA512 de201878ec7f161f77a5354c38a181609e8b92a85d679851e920c2133be6df4318ac59306bde9e59ecf5b5c690d2a5fab97e14e7969d0abb3133efbcfddd0047
 MISC metadata.xml 447 BLAKE2B febc277d7b427ae9a48c3c6e318b779f8a3fb9e27f896b17a3ebafec9bc8b03c4af3f30de7881fcc7feff674fdc0106d0b46f91d72d7267d4c4eeffb1dbe341a SHA512 29d7b99ddd69b2503d91f185679e1811403ba34443e20e2b17782878ee509565dcd62c2e3339709b3d29f568168c9c5c5a9284823d0187392220e781792b73e8
diff --git a/mate-extra/mate-screensaver/mate-screensaver-1.22.1.ebuild b/mate-extra/mate-screensaver/mate-screensaver-1.22.1.ebuild
index 9ce8ddaf71aa..07f6449a78d0 100644
--- a/mate-extra/mate-screensaver/mate-screensaver-1.22.1.ebuild
+++ b/mate-extra/mate-screensaver/mate-screensaver-1.22.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ fi
 
 DESCRIPTION="Replaces xscreensaver, integrating with the MATE desktop"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+ HPND LGPL-2+"
 SLOT="0"
 IUSE="X debug consolekit elogind kernel_linux libnotify opengl pam systemd"
 REQUIRED_USE="?? ( elogind systemd )"
diff --git a/mate-extra/mate-screensaver/mate-screensaver-1.22.2.ebuild b/mate-extra/mate-screensaver/mate-screensaver-1.22.2.ebuild
new file mode 100644
index 000000000000..5c25978f5d74
--- /dev/null
+++ b/mate-extra/mate-screensaver/mate-screensaver-1.22.2.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit mate readme.gentoo-r1
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+DESCRIPTION="Replaces xscreensaver, integrating with the MATE desktop"
+
+LICENSE="GPL-2+ HPND LGPL-2+"
+SLOT="0"
+IUSE="X debug consolekit 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
+	gnome-base/dconf
+	>=mate-base/libmatekbd-1.17.0
+	>=mate-base/mate-desktop-1.17.0
+	>=mate-base/mate-menus-1.21.0
+	>=sys-apps/dbus-0.30
+	>=x11-libs/gdk-pixbuf-2.14:2
+	>=x11-libs/libX11-1
+	x11-libs/cairo
+	>=x11-libs/gtk+-3.22:3
+	x11-libs/libXext
+	x11-libs/libXrandr
+	x11-libs/libXScrnSaver
+	x11-libs/libXxf86vm
+	x11-libs/libxklavier
+	x11-libs/pango
+	virtual/libintl
+	consolekit? ( sys-auth/consolekit )
+	libnotify? ( >=x11-libs/libnotify-0.7:0 )
+	opengl? ( virtual/opengl )
+	pam? ( gnome-base/gnome-keyring sys-libs/pam )
+	!pam? ( kernel_linux? ( sys-apps/shadow ) )
+	elogind? ( sys-auth/elogind )
+	systemd? ( sys-apps/systemd:= )
+	!!<gnome-extra/gnome-screensaver-3"
+
+RDEPEND="${COMMON_DEPEND}
+	>=mate-base/mate-session-manager-1.6"
+
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/intltool-0.50.1
+	sys-devel/gettext:*
+	x11-base/xorg-proto
+	virtual/pkgconfig:*"
+
+src_configure() {
+	local myconf=(
+		--enable-locking
+		--with-kbd-layout-indicator
+		--with-xf86gamma-ext
+		--with-xscreensaverdir=/usr/share/xscreensaver/config
+		--with-xscreensaverhackdir=/usr/$(get_libdir)/misc/xscreensaver
+		$(use_with X x)
+		$(use_with consolekit console-kit)
+		$(use_with elogind)
+		$(use_with libnotify)
+		$(use_with opengl libgl)
+		$(use_with systemd)
+		$(use_enable debug)
+		$(use_enable pam)
+	)
+
+	mate_src_configure "${myconf[@]}"
+}
+
+src_install() {
+	mate_src_install
+
+	# Install the conversion script in the documentation.
+	dodoc "${S}"/data/migrate-xscreensaver-config.sh
+	dodoc "${S}"/data/xscreensaver-config.xsl
+	dodoc "${FILESDIR}"/xss-conversion.txt
+
+	# Non PAM users will need this suid to read the password hashes.
+	# OpenPAM users will probably need this too when
+	# https://bugzilla.gnome.org/show_bug.cgi?id=370847
+	# is fixed.
+	if ! use pam ; then
+		fperms u+s /usr/libexec/mate-screensaver-dialog
+	fi
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	mate_pkg_postinst
+
+	if has_version "<x11-base/xorg-server-1.5.3-r4" ; then
+		ewarn "You have a too old xorg-server installation. This will cause"
+		ewarn "mate-screensaver to eat up your CPU. Please consider upgrading."
+		echo
+	fi
+
+	if has_version "<x11-misc/xscreensaver-4.22-r2" ; then
+		ewarn "You have xscreensaver installed, you probably want to disable it."
+		ewarn "To prevent a duplicate screensaver entry in the menu, you need to"
+		ewarn "build xscreensaver with -gnome in the USE flags."
+		ewarn "echo \"x11-misc/xscreensaver -gnome\" >> /etc/portage/package.use"
+		echo
+	fi
+
+	readme.gentoo_print_elog
+}
diff --git a/mate-extra/mate-screensaver/mate-screensaver-1.24.0.ebuild b/mate-extra/mate-screensaver/mate-screensaver-1.24.0.ebuild
new file mode 100644
index 000000000000..37afee1ef813
--- /dev/null
+++ b/mate-extra/mate-screensaver/mate-screensaver-1.24.0.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit mate readme.gentoo-r1
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+DESCRIPTION="Replaces xscreensaver, integrating with the MATE desktop"
+
+LICENSE="GPL-2+ HPND LGPL-2+"
+SLOT="0"
+IUSE="X debug consolekit 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
+	gnome-base/dconf
+	>=mate-base/libmatekbd-1.17.0
+	>=mate-base/mate-desktop-1.17.0
+	>=mate-base/mate-menus-1.21.0
+	>=sys-apps/dbus-0.30
+	>=x11-libs/gdk-pixbuf-2.14:2
+	>=x11-libs/libX11-1
+	x11-libs/cairo
+	>=x11-libs/gtk+-3.22:3
+	x11-libs/libXext
+	x11-libs/libXrandr
+	x11-libs/libXScrnSaver
+	x11-libs/libXxf86vm
+	x11-libs/libxklavier
+	x11-libs/pango
+	consolekit? ( sys-auth/consolekit )
+	libnotify? ( >=x11-libs/libnotify-0.7:0 )
+	opengl? ( virtual/opengl )
+	pam? ( gnome-base/gnome-keyring sys-libs/pam )
+	!pam? ( kernel_linux? ( sys-apps/shadow ) )
+	elogind? ( sys-auth/elogind )
+	systemd? ( sys-apps/systemd:= )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	>=mate-base/mate-session-manager-1.6
+	virtual/libintl
+	!!<gnome-extra/gnome-screensaver-3
+"
+
+DEPEND="${COMMON_DEPEND}
+	dev-libs/libxml2
+	>=sys-devel/gettext-0.19.8:*
+	x11-base/xorg-proto
+	virtual/pkgconfig:*
+"
+
+src_configure() {
+	local myconf=(
+		--enable-locking
+		--with-kbd-layout-indicator
+		--with-xf86gamma-ext
+		--with-xscreensaverdir=/usr/share/xscreensaver/config
+		--with-xscreensaverhackdir=/usr/$(get_libdir)/misc/xscreensaver
+		$(use_with X x)
+		$(use_with consolekit console-kit)
+		$(use_with elogind)
+		$(use_with libnotify)
+		$(use_with opengl libgl)
+		$(use_with systemd)
+		$(use_enable debug)
+		$(use_enable pam)
+	)
+
+	mate_src_configure "${myconf[@]}"
+}
+
+src_install() {
+	mate_src_install
+
+	# Install the conversion script in the documentation.
+	dodoc "${S}"/data/migrate-xscreensaver-config.sh
+	dodoc "${S}"/data/xscreensaver-config.xsl
+	dodoc "${FILESDIR}"/xss-conversion.txt
+
+	# Non PAM users will need this suid to read the password hashes.
+	# OpenPAM users will probably need this too when
+	# https://bugzilla.gnome.org/show_bug.cgi?id=370847
+	# is fixed.
+	if ! use pam ; then
+		fperms u+s /usr/libexec/mate-screensaver-dialog
+	fi
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	mate_pkg_postinst
+
+	if has_version "<x11-base/xorg-server-1.5.3-r4" ; then
+		ewarn "You have a too old xorg-server installation. This will cause"
+		ewarn "mate-screensaver to eat up your CPU. Please consider upgrading."
+		echo
+	fi
+
+	if has_version "<x11-misc/xscreensaver-4.22-r2" ; then
+		ewarn "You have xscreensaver installed, you probably want to disable it."
+		ewarn "To prevent a duplicate screensaver entry in the menu, you need to"
+		ewarn "build xscreensaver with -gnome in the USE flags."
+		ewarn "echo \"x11-misc/xscreensaver -gnome\" >> /etc/portage/package.use"
+		echo
+	fi
+
+	readme.gentoo_print_elog
+}
diff --git a/mate-extra/mate-sensors-applet/Manifest b/mate-extra/mate-sensors-applet/Manifest
index 49d85daa7246..29fb91aa72c7 100644
--- a/mate-extra/mate-sensors-applet/Manifest
+++ b/mate-extra/mate-sensors-applet/Manifest
@@ -1,3 +1,5 @@
 DIST mate-sensors-applet-1.22.1.tar.xz 496776 BLAKE2B 1f3ca3e7b6b48a3bdb4e3b370c65bd34bcbde250d21d2c9214eceadf790d2c1a45f87ccf615387edf9abaad2c3a899a536b78d8afece0574d735d80095c1b595 SHA512 4b6e608c92f03051044863f770b295d1526b19a9668513b566e81adeb28bc8524d8f458d114d2b44acf00f20c2f0a8d86b1ca7254fa165fde3b867c75a6b83e6
-EBUILD mate-sensors-applet-1.22.1.ebuild 1341 BLAKE2B 4ef978754b86f8f4b4aa7924f00f8486da0570a73b47181fd34676930b921a1adf98752cec27baf05b7448cb7385815726470f922a8c9ce468ebe7d7acf7600b SHA512 c2e53ef07461c900482d0d2ec8380c3e8637705b12d731bd1367c0a267c356af4f9bfdc9989ab57f57bc5d3173e8f2041f86786da4d85896dea18f285822ec8c
+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
 MISC metadata.xml 348 BLAKE2B 3e34850491c3dce6bfe3771ed94ea37e68d9c8131594f4056c40e754f5556a4dbf03e434a0f3d19eaa6177a0a484a1b50b8de1c67a4eadf1faf6e5b56fa70166 SHA512 32cad99749c326ae12caa346b0bbf85779cbf9f35b85c4f729358dd7171d468f486c761e33d2938fcac445485ec256d733150d7dedc7c9e6b271702ba7c454ab
diff --git a/mate-extra/mate-sensors-applet/mate-sensors-applet-1.22.1.ebuild b/mate-extra/mate-sensors-applet/mate-sensors-applet-1.22.1.ebuild
index 1d46b635f650..c96c17af7b0d 100644
--- a/mate-extra/mate-sensors-applet/mate-sensors-applet-1.22.1.ebuild
+++ b/mate-extra/mate-sensors-applet/mate-sensors-applet-1.22.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ if [[ ${PV} != 9999 ]]; then
 fi
 
 DESCRIPTION="MATE panel applet to display readings from hardware sensors"
-LICENSE="GPL-2"
+LICENSE="FDL-1.1+ GPL-2+"
 SLOT="0"
 
 IUSE="+dbus hddtemp libnotify lm-sensors video_cards_nvidia"
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
new file mode 100644
index 000000000000..d292f324537c
--- /dev/null
+++ b/mate-extra/mate-sensors-applet/mate-sensors-applet-1.24.0.ebuild
@@ -0,0 +1,65 @@
+# 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-system-monitor/Manifest b/mate-extra/mate-system-monitor/Manifest
index b0a5c8245c91..4d4f14f80d46 100644
--- a/mate-extra/mate-system-monitor/Manifest
+++ b/mate-extra/mate-system-monitor/Manifest
@@ -1,5 +1,9 @@
 DIST mate-system-monitor-1.22.0.tar.xz 2190688 BLAKE2B 83ab7dfbc0033f094896c663790c1200e71a498d3a813a82c94593e6c6434942b2afd0fa1c3067452a46e0e1829a9239f1c145a315b9de2c2853c9f4f50618ef SHA512 6f97f934626b49320ea0dbb4e14743c4f33b12a85671b69465f689765f3003f00e51685b616e34a482c3ec0ca09ca4e13cbdb2e3eb4719c0d1fc7b25b24436a7
 DIST mate-system-monitor-1.22.1.tar.xz 2202544 BLAKE2B 37eb2d265aedb259fd3f97aae64f76b7061eda6f4713137d4a9de9cdb078ce2176039c4a6cb7f9f63367c186df3bc181693b9526500f81fe0c9c52dc2e05e7a2 SHA512 ce5c514c333b85d6dd94b9fa212b51ed78212781da9719f730c50fc61fcf433e1a7df1d2665fe90e9529fba08207df59858b66f982bcd070845f62b22f8bd82f
-EBUILD mate-system-monitor-1.22.0.ebuild 1249 BLAKE2B 7e3b80defe98bbe95d310970a00016eea4007afafa140c1d5503ba4c6ee840004a40a65cfccbae9aa2ac5e01839bea8be709556cff8f70150b7123c7f5d99cdc SHA512 e114fde19d6b747f0f177770eea0d46dc9dae54d285050f71ab310d6a256d898376268c260cc98d4167a5c267eac0bd5948b7a454da5ab1ccf8cf142f57a91a1
-EBUILD mate-system-monitor-1.22.1.ebuild 1251 BLAKE2B fe910aabbc2bb3f3c72dc6b7941303dfbea244d9c4caa9d7a465e8600233281c48c0ad92b23ca372436346115318a2a1d7965fad20dd49c8df36040d326aa660 SHA512 167bcb0a93b58eea3032002a30d4523d15d6a09c176c0ea8364f0804b845d90fd313f8d1e825c3ea3e7f53f48c2933de49837e269299bcfa0cabab5c4774fdc7
+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.0.ebuild 1267 BLAKE2B 1425203026f746783086d8de17f3b16d1f82cac1060af73c7db29ff50dd9f916c9579a68f1521a4d114acbca9eb4686dc676afd3c617046eef1bb507ef4e2968 SHA512 227aa41d03c1663dce35e9a7d9c94e4f6ab2eeffe090af0bfe85c41a895c8608c61978bac0f184c2be6953ce4df4d3099ccc53fc861cdc3e78dab90c45d1332a
+EBUILD mate-system-monitor-1.22.1.ebuild 1269 BLAKE2B 852263ba82a1defde513a84ddfa103753195b2773e3f540096b16ba1d8087f0c5e7b107a41634b291c145d0f2767d0772b875cfd57595c37c0ac1e73587adc73 SHA512 47205462db50b8bf443dd828a9279ce612cba43c52ba8504746fdfd034e77879196e879645360cbbbb9c1858df66b2b80e3c5dc2746a5a9940a5fa6f0327bf3b
+EBUILD mate-system-monitor-1.22.2.ebuild 1269 BLAKE2B 852263ba82a1defde513a84ddfa103753195b2773e3f540096b16ba1d8087f0c5e7b107a41634b291c145d0f2767d0772b875cfd57595c37c0ac1e73587adc73 SHA512 47205462db50b8bf443dd828a9279ce612cba43c52ba8504746fdfd034e77879196e879645360cbbbb9c1858df66b2b80e3c5dc2746a5a9940a5fa6f0327bf3b
+EBUILD mate-system-monitor-1.24.0.ebuild 1251 BLAKE2B 2444494fb68a37b40961460ed4fd9816bac178afd23d35c720f532c86e5ef7d77b3e2709f80e39f1177ff2f26a7cfb60575b0402fda7018fff84f91e8960fe1e SHA512 365f198550af46e790741ae81e73b8556751cdf083038a63c36e9e2308c9ad47f102b04b1538d77439300f759ee9898408668f765b83ffdea5aae0b7cd87d8cd
 MISC metadata.xml 348 BLAKE2B fe7ff06b7a0366617fb30e7a98fa7054c32469bf49691855183ee7b9991c1aebd5f431081e5d7efe07ab3a2b2424630bea621c2b3369338f6bb5348d1ba70de7 SHA512 4cb1bd5f11887274393c957be697ce784af74a39258ead2e9ccb586ac8d4bcab06a6aa2a76e8f96a85d2d818092250eede243775b61222493739440c59cc9c9b
diff --git a/mate-extra/mate-system-monitor/mate-system-monitor-1.22.0.ebuild b/mate-extra/mate-system-monitor/mate-system-monitor-1.22.0.ebuild
index f65311fcd605..07ef770ebdcf 100644
--- a/mate-extra/mate-system-monitor/mate-system-monitor-1.22.0.ebuild
+++ b/mate-extra/mate-system-monitor/mate-system-monitor-1.22.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ fi
 
 DESCRIPTION="The MATE System Monitor"
 
-LICENSE="GPL-2"
+LICENSE="FDL-1.1+ GPL-2+ LGPL-2+"
 SLOT="0"
 IUSE="elogind systemd"
 
diff --git a/mate-extra/mate-system-monitor/mate-system-monitor-1.22.1.ebuild b/mate-extra/mate-system-monitor/mate-system-monitor-1.22.1.ebuild
index 2df1fb376d25..1cc367322d92 100644
--- a/mate-extra/mate-system-monitor/mate-system-monitor-1.22.1.ebuild
+++ b/mate-extra/mate-system-monitor/mate-system-monitor-1.22.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ fi
 
 DESCRIPTION="The MATE System Monitor"
 
-LICENSE="GPL-2"
+LICENSE="FDL-1.1+ GPL-2+ LGPL-2+"
 SLOT="0"
 IUSE="elogind systemd"
 
diff --git a/mate-extra/mate-system-monitor/mate-system-monitor-1.22.2.ebuild b/mate-extra/mate-system-monitor/mate-system-monitor-1.22.2.ebuild
new file mode 100644
index 000000000000..1cc367322d92
--- /dev/null
+++ b/mate-extra/mate-system-monitor/mate-system-monitor-1.22.2.ebuild
@@ -0,0 +1,62 @@
+# 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="The MATE System Monitor"
+
+LICENSE="FDL-1.1+ GPL-2+ LGPL-2+"
+SLOT="0"
+IUSE="elogind systemd"
+
+REQUIRED_USE="?? ( elogind systemd )"
+
+COMMON_DEPEND="
+	>=dev-cpp/glibmm-2.26:2
+	>=dev-cpp/gtkmm-3.8:3.0
+	>=dev-libs/glib-2.50:2
+	dev-libs/libsigc++:2
+	>=dev-libs/libxml2-2:2
+	>=gnome-base/libgtop-2.23.1:2=
+	>=gnome-base/librsvg-2.35:2
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.22:3
+	>=x11-libs/libwnck-3.0:3
+	virtual/libintl
+	elogind? ( sys-auth/elogind )
+	systemd? ( sys-apps/systemd )"
+
+RDEPEND="${COMMON_DEPEND}
+	>=sys-auth/polkit-0.97:0"
+
+DEPEND="${COMMON_DEPEND}
+	app-text/yelp-tools
+	>=dev-util/intltool-0.50.1:*
+	sys-devel/gettext:*
+	>=sys-devel/autoconf-2.63:*
+	virtual/pkgconfig:*"
+
+src_configure() {
+	local myconf=()
+
+	if use elogind || use systemd; then
+		myconf+=( --enable-systemd )
+		if use elogind; then
+			myconf+=(
+				SYSTEMD_CFLAGS=`pkg-config --cflags "libelogind" 2>/dev/null`
+				SYSTEMD_LIBS=`pkg-config --libs "libelogind" 2>/dev/null`
+			)
+		fi
+	else
+		myconf+=( --disable-systemd )
+	fi
+
+	mate_src_configure "${myconf[@]}"
+}
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
new file mode 100644
index 000000000000..99d44d10c547
--- /dev/null
+++ b/mate-extra/mate-system-monitor/mate-system-monitor-1.24.0.ebuild
@@ -0,0 +1,64 @@
+# 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="The MATE System Monitor"
+
+LICENSE="FDL-1.1+ GPL-2+ LGPL-2+"
+SLOT="0"
+IUSE="elogind systemd"
+
+REQUIRED_USE="?? ( elogind systemd )"
+
+COMMON_DEPEND="
+	>=dev-cpp/glibmm-2.26:2
+	>=dev-cpp/gtkmm-3.8:3.0
+	>=dev-libs/glib-2.56:2
+	dev-libs/libsigc++:2
+	>=dev-libs/libxml2-2:2
+	>=gnome-base/libgtop-2.37.2:2=
+	>=gnome-base/librsvg-2.35:2
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.22:3
+	>=x11-libs/libwnck-3.0:3
+	elogind? ( sys-auth/elogind )
+	systemd? ( sys-apps/systemd )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	>=sys-auth/polkit-0.97:0
+	virtual/libintl
+"
+
+DEPEND="${COMMON_DEPEND}
+	app-text/yelp-tools
+	>=sys-devel/gettext-0.19.8:*
+	>=sys-devel/autoconf-2.63:*
+	virtual/pkgconfig:*
+"
+
+src_configure() {
+	local myconf=()
+
+	if use elogind || use systemd; then
+		myconf+=( --enable-systemd )
+		if use elogind; then
+			myconf+=(
+				SYSTEMD_CFLAGS=`pkg-config --cflags "libelogind" 2>/dev/null`
+				SYSTEMD_LIBS=`pkg-config --libs "libelogind" 2>/dev/null`
+			)
+		fi
+	else
+		myconf+=( --disable-systemd )
+	fi
+
+	mate_src_configure "${myconf[@]}"
+}
diff --git a/mate-extra/mate-user-guide/Manifest b/mate-extra/mate-user-guide/Manifest
index f2ad6a0cb79d..e84cbe7692a4 100644
--- a/mate-extra/mate-user-guide/Manifest
+++ b/mate-extra/mate-user-guide/Manifest
@@ -1,5 +1,9 @@
 DIST mate-user-guide-1.22.0.tar.xz 8859936 BLAKE2B c8993835e064614de989046ae225e1e323d792e7592f6afe0980d74950a0c2ff64791dafb1f8a80be8514bd338ec3d5fdb7307dc9d3d366b847ebbd7761e3158 SHA512 faf82569d8289f13d31c0c3a548692194f4938dc341b5a2214ccd3bba1fafaa6b5446cc5455ade391e7172268354cf2088c2a119aee96d3d42e71ee4c094dd14
 DIST mate-user-guide-1.22.2.tar.xz 8955116 BLAKE2B b71c1a0311eb30b7e3e9059f1fb498538ce4e1916455ba876bc10736e830178e1d40a554b9627281670cd5b5871f0fbd98641932508d7d7b31f3ee3d08c12bd4 SHA512 94e5c6f45acad8f4e422c2e403ae19357702ce2aba5aee33b92cbdfd0610548aa821c3e74ded2824987e36a8da23b2b4a455b3277260c9bab2fa5b719745e06d
-EBUILD mate-user-guide-1.22.0.ebuild 524 BLAKE2B 7d9f67575d7ccc46c34d998b26ce852199b3ae0398b658456911f66d4b63823d33dd3add1907644c389f1b48682ac998de5b8be044d8425c9694d5aa8f10a7e4 SHA512 eecd4b74d9ed18e0254578a229b6a9e4c267c91eda308136da6ca4220220edb3b986894854303c06e523f39db49412473f943863ec23b8f056f57ac554f2ecfc
-EBUILD mate-user-guide-1.22.2.ebuild 526 BLAKE2B eca831d3997976829fb7677502d1951ae8cfe4218538e0b223bf47ad528a4cbf2cc6532ea5fdcda219c0668c7011df9a07eb12bff11ced915ca57fe48a917056 SHA512 a91ad3083a1d8dfc7c63074c49a445ce31beeb2faa521807b0f39cc25ceea4595703150780796ae1ce997e9ffffc0950964d663194f2766d69766eb33e1cf8a9
+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.0.ebuild 527 BLAKE2B b5c7d5d04fd9ceabc537a9b47597dac70db2759fbbf13cca700816f68c641576357c9d4ac5bf307bca4323b9630965b3b4aff7a2f870c75429f30446d123827e SHA512 1a8cd577a9aad60bb3c7f974a9ceb06029fb70f6522156c4943a19b427836c84ee7e70c1adf7f1ded10879f81e8e0512d3e40edd442c9a08bec235cbed89e7de
+EBUILD mate-user-guide-1.22.2.ebuild 529 BLAKE2B 24f3f02df259bd9cfd944f2ecd3dc2fa10a84875440ccaf71bf2ae28354629b5a4e0d11299d32daeefe0e1c9dd22f3e9013593b425d0ebb3c350dc3c892eac32 SHA512 8f2b0dd9c8211f76c87fa19480d8e8ca16c83f668ae09f7d32e86025d001de9584cdb06567713266f0b1d5d713d307e8d59ba5dca2c938b141b150576f367aa9
+EBUILD mate-user-guide-1.22.3.ebuild 529 BLAKE2B 24f3f02df259bd9cfd944f2ecd3dc2fa10a84875440ccaf71bf2ae28354629b5a4e0d11299d32daeefe0e1c9dd22f3e9013593b425d0ebb3c350dc3c892eac32 SHA512 8f2b0dd9c8211f76c87fa19480d8e8ca16c83f668ae09f7d32e86025d001de9584cdb06567713266f0b1d5d713d307e8d59ba5dca2c938b141b150576f367aa9
+EBUILD mate-user-guide-1.24.0.ebuild 513 BLAKE2B 4d3773172b93b54f9ec71473fc0413f94d52cb852805946368d7b6d4430ef43c109139ac42cd81dd3fbda110521f9b9c18d2db0f14dcfad857ab6d03cc135908 SHA512 8feaaebcafc93701f26b74ff288ff03830eb4e01189fdb74e6f8b883343224e8daf10f3bd8320ca120ff48ad5ea7d90063ddd8cc49632382a98ad583c8a6b3ba
 MISC metadata.xml 344 BLAKE2B daf4b6a1920fba3efa9c5253a08edd91d26b90fe9a81bec69de4c3f21423ad9d7fd8b5ece9036c3e834900fa60b483e7c73b7572bdbbe8a31d16fc81a50aa09b SHA512 d0ce9f32a04fdae27a476a7197b067f85b1a4889ab758af1c761d2d59c6ca295a6d623db51a0296c64d3a6fb9ff9bea9577002f34020009b967d594b540440f4
diff --git a/mate-extra/mate-user-guide/mate-user-guide-1.22.0.ebuild b/mate-extra/mate-user-guide/mate-user-guide-1.22.0.ebuild
index 409f442d36fd..dcdcfc20439e 100644
--- a/mate-extra/mate-user-guide/mate-user-guide-1.22.0.ebuild
+++ b/mate-extra/mate-user-guide/mate-user-guide-1.22.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ if [[ ${PV} != 9999 ]]; then
 fi
 
 DESCRIPTION="User documentation for MATE Desktop"
-LICENSE="GPL-2 LGPL-2"
+LICENSE="FDL-1.1+ GPL-2+"
 SLOT="0"
 
 COMMON_DEPEND="virtual/libintl:0"
diff --git a/mate-extra/mate-user-guide/mate-user-guide-1.22.2.ebuild b/mate-extra/mate-user-guide/mate-user-guide-1.22.2.ebuild
index f1e2c40e91b5..8ad03779e476 100644
--- a/mate-extra/mate-user-guide/mate-user-guide-1.22.2.ebuild
+++ b/mate-extra/mate-user-guide/mate-user-guide-1.22.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ if [[ ${PV} != 9999 ]]; then
 fi
 
 DESCRIPTION="User documentation for MATE Desktop"
-LICENSE="GPL-2 LGPL-2"
+LICENSE="FDL-1.1+ GPL-2+"
 SLOT="0"
 
 COMMON_DEPEND="virtual/libintl:0"
diff --git a/mate-extra/mate-user-guide/mate-user-guide-1.22.3.ebuild b/mate-extra/mate-user-guide/mate-user-guide-1.22.3.ebuild
new file mode 100644
index 000000000000..8ad03779e476
--- /dev/null
+++ b/mate-extra/mate-user-guide/mate-user-guide-1.22.3.ebuild
@@ -0,0 +1,28 @@
+# 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="virtual/libintl:0"
+
+RDEPEND="${COMMON_DEPEND}
+	gnome-extra/yelp"
+
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/intltool-0.40
+	app-text/yelp-tools
+	sys-devel/gettext:*
+	virtual/pkgconfig:*
+	!!mate-base/mate-desktop[user-guide]"
diff --git a/mate-extra/mate-user-guide/mate-user-guide-1.24.0.ebuild b/mate-extra/mate-user-guide/mate-user-guide-1.24.0.ebuild
new file mode 100644
index 000000000000..bb1249647ecb
--- /dev/null
+++ b/mate-extra/mate-user-guide/mate-user-guide-1.24.0.ebuild
@@ -0,0 +1,29 @@
+# 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-share/Manifest b/mate-extra/mate-user-share/Manifest
index 9b8d31e5b2fe..9e22b97daac7 100644
--- a/mate-extra/mate-user-share/Manifest
+++ b/mate-extra/mate-user-share/Manifest
@@ -1,5 +1,7 @@
 DIST mate-user-share-1.22.0.tar.xz 927068 BLAKE2B a37d3a886ec3cad4427ccff94c00ce2d2412607f16aacf0a8ae4096f0c63c61f07f10cbd902d3a62d74f2a172b3dcbd5575f5c027045a9d31bdf4cffce4a8de2 SHA512 151532ebe031a973e8825d86c9a315697f5930f89d78960946da3ba135238e3130c59018d04cf9dc8d343ff1613e51254701bbf8e23a9881733ecbb7e6fb9f18
 DIST mate-user-share-1.22.1.tar.xz 921944 BLAKE2B dfa3b304bc81c82abf9a2354ede94b08672f2e8cd28b4def0f0dad0f6389c762d68ddb1924918c89eee40374eedfff312ffc4a9c65d3766be240ede182072837 SHA512 afd2c2f8484124e26ac9ced23abd89c1b553adb4df6ca8bd49159e3ec5d76f2b16f6576b7f5608488e5290cddef733e27c653433ee9f57a09a6b76b774555894
-EBUILD mate-user-share-1.22.0.ebuild 1106 BLAKE2B 396a85cb2d9af0c2b18b42b6eb6fe1b66411d9bb7d5b2a38c9a63dd5ea0c6405d395606b77186165a8a4904514d1bb7f5d9f435f0f6709487e8109ddb74ff34f SHA512 1f0b0e01d58819560ab8fe9efb9132633f164fa0ae61770a22854f59c9cbb2fb6c4746a6b20ed4b149d4f0a30cbd16870317c1dd6688bd38e115e77d4d552225
-EBUILD mate-user-share-1.22.1.ebuild 1108 BLAKE2B 145d227e176ddd5aef577b0e8187e64ee3145fa3b3126337a2f74879ce98db48e28bee95bef9847d011fb92823896aeea7acf33b754cd37fdb413362c8de2310 SHA512 69b8a32580beee3fc87c79158f3f7c3ec34c6d3433f8efbf25a72123c968cd9aa95586cf919c19b89685c569ddb933f13a6d7d5724dbe37e2b27ab95695f1bda
+DIST mate-user-share-1.24.0.tar.xz 1008992 BLAKE2B 0fe21e49ff30c88c32b6b88aba84e58b3e6310d3bbd7a4873be460c97366828a7edfd24be37d2c10ea88a51c6990ee482ad595582d288ded2e4f7e0ca6f0b4e0 SHA512 15ede8754bf95ac78844cd9645a43d2deb8419dd550aee5263936d710cd13ce7f4a68cfd53e589c2dd37f87f59c9e8153f8abac711a3a7f88a2e2789dbd4f664
+EBUILD mate-user-share-1.22.0.ebuild 1116 BLAKE2B 8316d50ca80bfd877de0b539c624fce4ecf661441bf04dff9d5aa9ea335ec0fb4d35ddd225e2637b30b7f2737c74a27ca6ba3ee46b04f8f2c38c5d2dd7ff46c8 SHA512 204c1173bd54a10500f202b10c4bf131fd8088aceb7579b66c00b0e108af9c2d61914079c7c3ab5014def87645f99ba87326bfe46eb6c6ab7ab8b4975711781f
+EBUILD mate-user-share-1.22.1.ebuild 1118 BLAKE2B 10aff3e7b65a56e5b739b3fc609e44a06176d05fb3d85732dad6bbe440d748f0ef740475707e2fd16925637a121b57fcd2aaec61a96efd99cfe960b143b0f58f SHA512 cfc360cfe803624ddee61896c95f13b27b2899c2ab97de155bdeef0332b64604409c8d4b2e88e0cb48ac3e694e6efe47ad53c797a237b720d61186444abc2a6d
+EBUILD mate-user-share-1.24.0.ebuild 1104 BLAKE2B 0fa36f0282b1c5e1281c2fe8c5e1d4dc86c2747673bcdd341d0803fecbda5ace69f2266967bb5817061ce36d84054dc0ef5c53b34d26be9d05931eca5aa8c93b SHA512 e868504a488e2d5ed2e2abaad3939fcce81d92606b24c2f98198f100469619b3234464776a898fdbaaea16cb260657e3e644d67ac299c1a532f323b4ff705fef
 MISC metadata.xml 344 BLAKE2B 72c35ab850378b1f7386ba3d9da729e2855c20779d23a1a503186706bff164487c5f0d398dcc96f4056c2a670f815e2de874f89ca6ffe0c85749fb61416c9d7d SHA512 866efce9c0b0fbd2b8916c71d07b42a255bda4a2c4f269a6fe3390b9913aa148b44ad4b6f779f964e51715f2cc79dcdfe9e8096f2382b3e35f3bda38d8646001
diff --git a/mate-extra/mate-user-share/mate-user-share-1.22.0.ebuild b/mate-extra/mate-user-share/mate-user-share-1.22.0.ebuild
index aa87a8dc105f..3373fa4c5436 100644
--- a/mate-extra/mate-user-share/mate-user-share-1.22.0.ebuild
+++ b/mate-extra/mate-user-share/mate-user-share-1.22.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ if [[ ${PV} != 9999 ]]; then
 fi
 
 DESCRIPTION="Personal file sharing for the MATE desktop"
-LICENSE="GPL-2"
+LICENSE="FDL-1.1+ GPL-2+"
 SLOT="0"
 
 IUSE="X"
diff --git a/mate-extra/mate-user-share/mate-user-share-1.22.1.ebuild b/mate-extra/mate-user-share/mate-user-share-1.22.1.ebuild
index 80932af77200..4d22498948df 100644
--- a/mate-extra/mate-user-share/mate-user-share-1.22.1.ebuild
+++ b/mate-extra/mate-user-share/mate-user-share-1.22.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ if [[ ${PV} != 9999 ]]; then
 fi
 
 DESCRIPTION="Personal file sharing for the MATE desktop"
-LICENSE="GPL-2"
+LICENSE="FDL-1.1+ GPL-2+"
 SLOT="0"
 
 IUSE="X"
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
new file mode 100644
index 000000000000..dbfca4d5174f
--- /dev/null
+++ b/mate-extra/mate-user-share/mate-user-share-1.24.0.ebuild
@@ -0,0 +1,52 @@
+# 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 7dde938f858e..2afcf02f2983 100644
--- a/mate-extra/mate-utils/Manifest
+++ b/mate-extra/mate-utils/Manifest
@@ -1,6 +1,11 @@
 AUX mate-utils-1.22.1-make-inkscape-optional.patch 8395 BLAKE2B 139854ae3e3c94aa561deef18d81ca18bc25cdcb6d4f1b27633cd2f120caf453dbc03b1c93acc54ba92120112687d30e8f5cef5d3b3e7821f8189083333500ab SHA512 7d8f3b8b0b9ee34d8c891dc996eb67907ce48964c3235eecaff32a74ad744a9cb7b2b12b347ce0102ab7eff34c1a85094b22adfbc8f7ea759ba83bbcab86f72a
+AUX mate-utils-1.22.2-gcc-10-fno-common.patch 1022 BLAKE2B 772c831ae0c4ed0c640d2d4302c08335b83b4e1bb0d88cb7e0bb84ac7709edc3bc28c7f81d59531b502610e6676e8cba37e10c7de1572e4530c27b58f40a4f37 SHA512 9c4252dc5fd68b0fff87c19ae46c02da634ea238537ab2fb3be7614726e289607ac85d551f5ad5f22e162cc7bfbb2ea1fc6be5523ccf44b5912e56ffea31e997
 DIST mate-utils-1.22.0.tar.xz 7300112 BLAKE2B 8a613b6dcb99e652ad6b44bd64ad9b2f9c809713b5fb904059b64234b51e2a06b2290dcf14d7dde82e8011be2ca395fe74d87bcae5b903b196d55bb50e8fdf07 SHA512 248c6e4108900768a4e8b272d20ac9b2d70e8bf77375f4669a099f4d8386c2e8affeafb772d209f00906f96f20d7ee347167ef4837186f44d8aaad85ef855f70
 DIST mate-utils-1.22.1.tar.xz 7284496 BLAKE2B 83e7e39a0daadae595ab2cc90ad250f61a294afc896df28bf17259cec619af4b0c9d1927c07b03a0cdd7449174af258227678299823169e2cb4d9c4d3ec98c92 SHA512 0f70f088de80440ff6954c899eab75c2bf22d332293c1ec61bf8391396ed31a2ab126279dc4d9dab6f4932225120309bc52e122bcd5a8dc17abccfd6e480390d
-EBUILD mate-utils-1.22.0.ebuild 1281 BLAKE2B 6464c91a19011aa475d0cccc7260f2ff631b527ae48c51430d7b193906eb15a9adbbf95a952943ed511b0681340e58f35a21737875f2744b462aeda17b619dc2 SHA512 45010ceb9051115810be8102fc6f6d118b27220668c5e53dd39c581fdf8feb2b401ff29edb14f16ffa10ea6f0e7c0453527be5433442ac21ce2c23714206bd1e
-EBUILD mate-utils-1.22.1-r1.ebuild 1372 BLAKE2B f5a6cb0b9efbf253e54fe3af02f0b8d1bf0244d58cb9a0ccdd9d8d86dd53f63d8a1b66688561630a3c1e6c27c41b28faf487a451f766251ce466b6b3e77b8cf1 SHA512 92b3f30436221bc8883725433749ba1280a9089ca04d6ae97d4a101d719378b9c3a6eab5be40adde58f20bb432149e349bfc3e3e70f572fb532cb4b04aece785
+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.0.ebuild 1306 BLAKE2B f19e55915234d9aee662a2200db160fae980e11db87d0f0e583036c08d51973cb01133a83214606d0ee236e9b07583a6ab792db2f31424bf924893d7514f913c SHA512 a5bf9bd7266506356521cea66be6d0b3ea22a6221f94190af0522f7fc1fed261785583a466d7f60789258f73eadc7b29ec2efa9cebf67ee81afab1b2bad49c9c
+EBUILD mate-utils-1.22.1-r1.ebuild 1397 BLAKE2B d1fa2e028a80a282bc24a6ee737c11cdd6bda68ac7ed1b4173beb6d81bb1364b41e6d0d42ee0302a40ef8364ea40c1c97784a14c0598dc12da7f9d615d3e7ab8 SHA512 f642f6d9dde2917e988741958c2de7f7b6d88627dfe180b7be963ce4f582c231ebe2a9006b1df825d1dc32ec8a6c1c5e133dbc989640ce4c283ef628970bbc8c
+EBUILD mate-utils-1.22.2-r1.ebuild 1365 BLAKE2B 522cdf2c0b26c404e425b7074ad76ca33a6fc7424a08512f9767309a4d9701ff5823aee88707430caef7e53fa9d09cf2f815fae7da5e9cb626c2bf3c9e7880d9 SHA512 b5b37c5afb0bd14bca0e49587a808d819bfb91844b325a4662e298cfebf6f25c18434870b086506339811722e0907bd6fca361a0fe76930ee244ddd79e0dc320
+EBUILD mate-utils-1.24.0.ebuild 1427 BLAKE2B f95fb1d0fd7fc14cc034d3da299fa20faa02616e31ee5240666e5f8c8499da4371ff6721a80c7afb13b64c8ce0ec4db75b900aa0e709ec98c1252961e92cfcbc SHA512 ba54d08e0fbfd512c1a84862d2b5484d601c0a03328e4a2d01e469960b66f090c47cfdb694311de7f375c6a3711e73b38b9dfa0a2ab1ab049797b37ef13f7f9a
 MISC metadata.xml 417 BLAKE2B af181dbce0a3bd1d40160da5b7b1be3a4ba345b3d31dc8d4988a146af5318bf473ad2962e9fd63fa2bfa74e61daddb5e84dd977891dee5b3b483189321bf7b1f SHA512 4c4eeb71f1cbd778f48f19da5185d9a75444a87a7abbe5d055e032f38b9891e996af84a383d7bc67ad11113da09ad034a159ec425b106340c696fad479fecee4
diff --git a/mate-extra/mate-utils/files/mate-utils-1.22.2-gcc-10-fno-common.patch b/mate-extra/mate-utils/files/mate-utils-1.22.2-gcc-10-fno-common.patch
new file mode 100644
index 000000000000..052c1a27bbe1
--- /dev/null
+++ b/mate-extra/mate-utils/files/mate-utils-1.22.2-gcc-10-fno-common.patch
@@ -0,0 +1,37 @@
+From d2d4902a68b8eabf4dc26a8ba49019e5ea6040c6 Mon Sep 17 00:00:00 2001
+From: rbuj <robert.buj@gmail.com>
+Date: Wed, 29 Jan 2020 16:22:09 +0100
+Subject: [PATCH] Fix build using gcc 10 -fno-common flag
+
+Closes #258
+---
+ baobab/src/baobab.c | 2 ++
+ baobab/src/baobab.h | 2 +-
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/baobab/src/baobab.c b/baobab/src/baobab.c
+index 07af1a1d..d4edde1f 100644
+--- a/baobab/src/baobab.c
++++ b/baobab/src/baobab.c
+@@ -42,6 +42,8 @@
+ static void push_iter_in_stack (GtkTreeIter *);
+ static GtkTreeIter pop_iter_from_stack (void);
+ 
++BaobabApplication baobab;
++
+ static gint currentdepth = 0;
+ static GtkTreeIter currentiter;
+ static GtkTreeIter firstiter;
+diff --git a/baobab/src/baobab.h b/baobab/src/baobab.h
+index b8d01817..76b22d6a 100644
+--- a/baobab/src/baobab.h
++++ b/baobab/src/baobab.h
+@@ -99,7 +99,7 @@ struct _BaobabApplication {
+ };
+ 
+ /* Application singleton */
+-BaobabApplication baobab;
++extern BaobabApplication baobab;
+ 
+ struct chan_data {
+ 	guint64 size;
diff --git a/mate-extra/mate-utils/mate-utils-1.22.0.ebuild b/mate-extra/mate-utils/mate-utils-1.22.0.ebuild
index a2cc4f1b501f..1d7235cde03e 100644
--- a/mate-extra/mate-utils/mate-utils-1.22.0.ebuild
+++ b/mate-extra/mate-utils/mate-utils-1.22.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ if [[ ${PV} != 9999 ]]; then
 fi
 
 DESCRIPTION="Utilities for the MATE desktop"
-LICENSE="GPL-2"
+LICENSE="FDL-1.1+ GPL-2+ GPL-3+ LGPL-2+"
 SLOT="0"
 
 IUSE="X applet debug ipv6 test"
diff --git a/mate-extra/mate-utils/mate-utils-1.22.1-r1.ebuild b/mate-extra/mate-utils/mate-utils-1.22.1-r1.ebuild
index 55038d726a0a..eda93518f5ea 100644
--- a/mate-extra/mate-utils/mate-utils-1.22.1-r1.ebuild
+++ b/mate-extra/mate-utils/mate-utils-1.22.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ if [[ ${PV} != 9999 ]]; then
 fi
 
 DESCRIPTION="Utilities for the MATE desktop"
-LICENSE="GPL-2"
+LICENSE="FDL-1.1+ GPL-2+ GPL-3+ LGPL-2+"
 SLOT="0"
 
 IUSE="X applet debug ipv6 test"
diff --git a/mate-extra/mate-utils/mate-utils-1.22.2-r1.ebuild b/mate-extra/mate-utils/mate-utils-1.22.2-r1.ebuild
new file mode 100644
index 000000000000..63022e807b7b
--- /dev/null
+++ b/mate-extra/mate-utils/mate-utils-1.22.2-r1.ebuild
@@ -0,0 +1,69 @@
+# 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"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	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 )"
+
+DEPEND="${RDEPEND}
+	app-text/rarian
+	>=app-text/scrollkeeper-dtd-1:1.0
+	app-text/yelp-tools
+	dev-util/glib-utils
+	dev-util/gtk-doc
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.50.1
+	sys-devel/gettext
+	virtual/pkgconfig
+	x11-base/xorg-proto"
+
+PATCHES=(
+	"${FILESDIR}/${P}-gcc-10-fno-common.patch"
+)
+
+src_prepare() {
+	# Make apps visible in all DEs.
+	LC_ALL=C find . -iname '*.desktop.in*' -exec \
+		sed -e '/OnlyShowIn/d' -i {} + || die
+
+	mate_src_prepare
+}
+
+src_configure() {
+	mate_src_configure \
+		--disable-maintainer-flags \
+		--enable-zlib \
+		--enable-debug=$(usex debug yes minimum) \
+		$(use_with X x) \
+		$(use_enable applet gdict-applet) \
+		$(use_enable ipv6)
+}
diff --git a/mate-extra/mate-utils/mate-utils-1.24.0.ebuild b/mate-extra/mate-utils/mate-utils-1.24.0.ebuild
new file mode 100644
index 000000000000..c6f28252c16d
--- /dev/null
+++ b/mate-extra/mate-utils/mate-utils-1.24.0.ebuild
@@ -0,0 +1,72 @@
+# 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 \
+		--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)
+}
author	V3n3RiX <venerix@redcorelinux.org>	2020-04-12 03:41:30 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-04-12 03:41:30 +0100
commit	623ee73d661e5ed8475cb264511f683407d87365 (patch)
tree	993eb27c93ec7a2d2d19550300d888fc1fed9e69 /mate-extra
parent	ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 (diff)