Adding metadata

author: Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> 2022-12-19 12:52:50 +0000
committer: Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> 2022-12-19 12:52:50 +0000
commit: 81ced48f539e85b7b7d01de970edf99f1ae9ab09 (patch)
tree: 529e69d0aa6be4d01cdc1edb60cfb5a630328351 /mate-base
parent: bcc6560e8797a12125f07484ee14e28eaeb7aad6 (diff)
download: baldeagleos-repo-81ced48f539e85b7b7d01de970edf99f1ae9ab09.tar.gz
baldeagleos-repo-81ced48f539e85b7b7d01de970edf99f1ae9ab09.tar.xz
baldeagleos-repo-81ced48f539e85b7b7d01de970edf99f1ae9ab09.zip
79 files changed, 741 insertions, 1544 deletions
diff --git a/mate-base/caja/Manifest b/mate-base/caja/Manifest
index 2f2a25b9c6d3..3b818c569217 100644
--- a/mate-base/caja/Manifest
+++ b/mate-base/caja/Manifest
@@ -1,3 +1,3 @@
-DIST caja-1.24.0.tar.xz 5221716 BLAKE2B 66d628ac0f50e2c388935420e29dfe15a8f5f127fd7b39e92ebbd67b6c929cda1a2dec1f510fb89890602adaef6a741f0ee3e15d27ab9741c5223c7966b3b908 SHA512 a68b23876cfa1171d5b1c75e4998c6b15f0ceebdc4fcaabb8d362e32e35b915b1a91a38648532ac8acc162dac50aeb4d07eff417ce2db7a8c50d68bd38a0b548
 DIST caja-1.24.1.tar.xz 5308268 BLAKE2B 82d2ff39152bd6d961d233d3712237b8192cf680d419f44cb8a2857228f4648d7667213740a1b2fdf024ac5958586f9b0b8f99e3770710a5ec5c6651a85dadf1 SHA512 34ba1e384e3de4ee3e6dddafa4ef4ccd5f626352cf5b42d6178e96395762653478cbdabb109cd0f2418ed463fd4743ef8a34be0a6b4294ad5355fea6dbfd53cc
 DIST caja-1.26.0.tar.xz 5283368 BLAKE2B 8449d7d721a997458102abf0fefcb35734a1b254280a4b8baa14667913f2a3006c31583d956de54ad7fac9e1da70057e058547eb7e3652a1dca9df9e9628a3a9 SHA512 0abbaebe6dc24644d0e5057fe79e57f67a1e5208f6aa89289649e6e1940285e4c169ec42197ae933f663a9c69a7f09295003cc645492db6abbd9ebce7085c03a
+DIST caja-1.26.1.tar.xz 5263564 BLAKE2B 44cdbbc86a24d9d3d6f7830ba45dd82a69b0aadd233531a97ab1cc4dfc5f7466543d70d3f8d6cef4bc669c0ab12b77ca7f22d40f486f36e80c4103c992369002 SHA512 e5d14d1a5f0ae9f86d3250e5a2d10a4e0afdc7ba1b52fcac4c8efc0a4c555d0208be3caf3aac19cc4938fe4c20e82f1f81d259d30e5d8fffbc78708664d23d4e
diff --git a/mate-base/caja/caja-1.24.1-r2.ebuild b/mate-base/caja/caja-1.24.1-r2.ebuild
new file mode 100644
index 000000000000..3307cde288fd
--- /dev/null
+++ b/mate-base/caja/caja-1.24.1-r2.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MATE_LA_PUNT="yes"
+
+inherit mate virtualx
+
+if [[ "${PV}" != *9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
+fi
+
+DESCRIPTION="Caja file manager for the MATE desktop"
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+
+IUSE="+introspection +mate xmp"
+
+COMMON_DEPEND="
+	app-accessibility/at-spi2-core:2
+	>=dev-libs/glib-2.58.1:2
+	>=dev-libs/libxml2-2.4.7:2
+	gnome-base/dconf
+	>=gnome-base/gvfs-1.10.1:0[udisks]
+	>=mate-base/mate-desktop-1.17.3:0
+	>=media-libs/libexif-0.6.14:0
+	virtual/libintl
+	x11-libs/cairo
+	>=x11-libs/gdk-pixbuf-2.36.5:2
+	>=x11-libs/gtk+-3.22:3[introspection?]
+	>=x11-libs/libnotify-0.7.0:0
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXft
+	x11-libs/libXrender
+	>=x11-libs/pango-1.1.2
+	introspection? ( >=dev-libs/gobject-introspection-0.6.4:= )
+	xmp? ( >=media-libs/exempi-1.99.5:2= )
+"
+
+BDEPEND="
+	${COMMON_DEPEND}
+	>=dev-lang/perl-5:=
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	dev-util/gtk-doc
+	dev-util/gtk-doc-am
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+PDEPEND="mate? ( >=x11-themes/mate-icon-theme-${MATE_BRANCH} )"
+
+# TODO: Test fails because Caja is not merged yet:
+# GLib-GIO-ERROR **: Settings schema 'org.mate.caja.preferences' is not installed
+RESTRICT="test"
+
+src_prepare() {
+	# Remove unnecessary CFLAGS.
+	sed -i -e 's:-DG.*DISABLE_DEPRECATED::g' \
+		configure.ac eel/Makefile.am || die
+
+	mate_src_prepare
+}
+
+src_configure() {
+	mate_src_configure \
+		--disable-update-mimedb \
+		$(use_enable introspection) \
+		$(use_enable xmp) \
+		--disable-packagekit
+}
+
+src_test() {
+	unset SESSION_MANAGER
+	unset DBUS_SESSION_BUS_ADDRESS
+
+	virtx emake check || die "Test phase failed"
+}
+
+pkg_postinst() {
+	mate_pkg_postinst
+
+	elog "Caja can use gstreamer to preview audio files. Just make sure"
+	elog "to have the necessary plugins available to play the media type you"
+	elog "want to preview."
+}
diff --git a/mate-base/caja/caja-1.24.0-r2.ebuild b/mate-base/caja/caja-1.26.0-r2.ebuild
index 795d1f2bc01f..6d9dacd71193 100644
--- a/mate-base/caja/caja-1.24.0-r2.ebuild
+++ b/mate-base/caja/caja-1.26.0-r2.ebuild
@@ -1,30 +1,31 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 MATE_LA_PUNT="yes"
 
 inherit mate virtualx
 
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 x86"
+if [[ "${PV}" != *9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
 fi
 
 DESCRIPTION="Caja file manager for the MATE desktop"
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="0"
 
-IUSE="+introspection +mate packagekit xmp"
+IUSE="+introspection +mate nls xmp"
 
 COMMON_DEPEND="
-	dev-libs/atk
+	app-accessibility/at-spi2-core:2
 	>=dev-libs/glib-2.58.1:2
 	>=dev-libs/libxml2-2.4.7:2
 	gnome-base/dconf
 	>=gnome-base/gvfs-1.10.1:0[udisks]
 	>=mate-base/mate-desktop-1.17.3:0
 	>=media-libs/libexif-0.6.14:0
+	virtual/libintl
 	x11-libs/cairo
 	>=x11-libs/gdk-pixbuf-2.36.5:2
 	>=x11-libs/gtk+-3.22:3[introspection?]
@@ -37,16 +38,11 @@ COMMON_DEPEND="
 	x11-libs/libXrender
 	>=x11-libs/pango-1.1.2
 	introspection? ( >=dev-libs/gobject-introspection-0.6.4:= )
-	packagekit? ( app-admin/packagekit-base )
-	xmp? ( >=media-libs/exempi-1.99.5:2 )
-"
-
-RDEPEND="${COMMON_DEPEND}
-	virtual/libintl
-	!!mate-base/mate-file-manager
+	xmp? ( >=media-libs/exempi-1.99.5:2= )
 "
 
-DEPEND="${COMMON_DEPEND}
+BDEPEND="
+	${COMMON_DEPEND}
 	>=dev-lang/perl-5:=
 	dev-util/gdbus-codegen
 	dev-util/glib-utils
@@ -74,7 +70,7 @@ src_configure() {
 	mate_src_configure \
 		--disable-update-mimedb \
 		$(use_enable introspection) \
-		$(use_enable packagekit) \
+		$(use_enable nls) \
 		$(use_enable xmp)
 }
 
@@ -82,7 +78,7 @@ src_test() {
 	unset SESSION_MANAGER
 	unset DBUS_SESSION_BUS_ADDRESS
 
-	Xemake check || die "Test phase failed"
+	virtx emake check || die "Test phase failed"
 }
 
 pkg_postinst() {
diff --git a/mate-base/caja/caja-1.24.0.ebuild b/mate-base/caja/caja-1.26.1.ebuild
index 070d00abb7c0..6d9dacd71193 100644
--- a/mate-base/caja/caja-1.24.0.ebuild
+++ b/mate-base/caja/caja-1.26.1.ebuild
@@ -1,32 +1,33 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 MATE_LA_PUNT="yes"
 
 inherit mate virtualx
 
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+if [[ "${PV}" != *9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
 fi
 
 DESCRIPTION="Caja file manager for the MATE desktop"
-LICENSE="GPL-2 LGPL-2 FDL-1.1"
+LICENSE="GPL-2+ LGPL-2+"
 SLOT="0"
 
-IUSE="+introspection +mate packagekit xmp"
+IUSE="+introspection +mate nls xmp"
 
-RDEPEND="
-	dev-libs/atk
-	>=dev-libs/glib-2.50:2
+COMMON_DEPEND="
+	app-accessibility/at-spi2-core:2
+	>=dev-libs/glib-2.58.1:2
 	>=dev-libs/libxml2-2.4.7:2
 	gnome-base/dconf
 	>=gnome-base/gvfs-1.10.1:0[udisks]
 	>=mate-base/mate-desktop-1.17.3:0
 	>=media-libs/libexif-0.6.14:0
+	virtual/libintl
 	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gdk-pixbuf-2.36.5:2
 	>=x11-libs/gtk+-3.22:3[introspection?]
 	>=x11-libs/libnotify-0.7.0:0
 	x11-libs/libICE
@@ -37,18 +38,19 @@ RDEPEND="
 	x11-libs/libXrender
 	>=x11-libs/pango-1.1.2
 	introspection? ( >=dev-libs/gobject-introspection-0.6.4:= )
-	packagekit? ( app-admin/packagekit-base )
-	xmp? ( >=media-libs/exempi-1.99.5:2 )
-	!!mate-base/mate-file-manager"
+	xmp? ( >=media-libs/exempi-1.99.5:2= )
+"
 
-DEPEND="${RDEPEND}
+BDEPEND="
+	${COMMON_DEPEND}
 	>=dev-lang/perl-5:=
 	dev-util/gdbus-codegen
 	dev-util/glib-utils
 	dev-util/gtk-doc
 	dev-util/gtk-doc-am
-	sys-devel/gettext
-	virtual/pkgconfig"
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
 
 PDEPEND="mate? ( >=x11-themes/mate-icon-theme-${MATE_BRANCH} )"
 
@@ -68,7 +70,7 @@ src_configure() {
 	mate_src_configure \
 		--disable-update-mimedb \
 		$(use_enable introspection) \
-		$(use_enable packagekit) \
+		$(use_enable nls) \
 		$(use_enable xmp)
 }
 
@@ -76,7 +78,7 @@ src_test() {
 	unset SESSION_MANAGER
 	unset DBUS_SESSION_BUS_ADDRESS
 
-	Xemake check || die "Test phase failed"
+	virtx emake check || die "Test phase failed"
 }
 
 pkg_postinst() {
diff --git a/mate-base/caja/caja-9999.ebuild b/mate-base/caja/caja-9999.ebuild
index 9a3dfbb26570..6d9dacd71193 100644
--- a/mate-base/caja/caja-9999.ebuild
+++ b/mate-base/caja/caja-9999.ebuild
@@ -1,30 +1,31 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 MATE_LA_PUNT="yes"
 
 inherit mate virtualx
 
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+if [[ "${PV}" != *9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
 fi
 
 DESCRIPTION="Caja file manager for the MATE desktop"
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="0"
 
-IUSE="+introspection +mate packagekit xmp"
+IUSE="+introspection +mate nls xmp"
 
 COMMON_DEPEND="
-	dev-libs/atk
+	app-accessibility/at-spi2-core:2
 	>=dev-libs/glib-2.58.1:2
 	>=dev-libs/libxml2-2.4.7:2
 	gnome-base/dconf
 	>=gnome-base/gvfs-1.10.1:0[udisks]
 	>=mate-base/mate-desktop-1.17.3:0
 	>=media-libs/libexif-0.6.14:0
+	virtual/libintl
 	x11-libs/cairo
 	>=x11-libs/gdk-pixbuf-2.36.5:2
 	>=x11-libs/gtk+-3.22:3[introspection?]
@@ -37,16 +38,11 @@ COMMON_DEPEND="
 	x11-libs/libXrender
 	>=x11-libs/pango-1.1.2
 	introspection? ( >=dev-libs/gobject-introspection-0.6.4:= )
-	packagekit? ( app-admin/packagekit-base )
-	xmp? ( >=media-libs/exempi-1.99.5:2 )
-"
-
-RDEPEND="${COMMON_DEPEND}
-	virtual/libintl
-	!!mate-base/mate-file-manager
+	xmp? ( >=media-libs/exempi-1.99.5:2= )
 "
 
-DEPEND="${COMMON_DEPEND}
+BDEPEND="
+	${COMMON_DEPEND}
 	>=dev-lang/perl-5:=
 	dev-util/gdbus-codegen
 	dev-util/glib-utils
@@ -74,7 +70,7 @@ src_configure() {
 	mate_src_configure \
 		--disable-update-mimedb \
 		$(use_enable introspection) \
-		$(use_enable packagekit) \
+		$(use_enable nls) \
 		$(use_enable xmp)
 }
 
@@ -82,7 +78,7 @@ src_test() {
 	unset SESSION_MANAGER
 	unset DBUS_SESSION_BUS_ADDRESS
 
-	Xemake check || die "Test phase failed"
+	virtx emake check || die "Test phase failed"
 }
 
 pkg_postinst() {
diff --git a/mate-base/caja/files/caja-1.24.0-fix-selinux-automagic-dep.patch b/mate-base/caja/files/caja-1.24.0-fix-selinux-automagic-dep.patch
deleted file mode 100644
index ffc0a2903d16..000000000000
--- a/mate-base/caja/files/caja-1.24.0-fix-selinux-automagic-dep.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 052b4d0..12c818d 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -169,17 +169,24 @@ dnl ****************************
- dnl *** Check for libselinux ***
- dnl ****************************
- 
-+AC_ARG_ENABLE(selinux,
-+    [AC_HELP_STRING([--enable-selinux],
-+                    [build with selinux support])])
-+AM_CONDITIONAL([ENABLE_SELINUX],[test "x$enable_selinux" = "xyes"])
-+
- SELINUX_LIBS=
- msg_selinux=no
--AC_CHECK_LIB(selinux, is_selinux_enabled,
--   [AC_CHECK_HEADERS(selinux/selinux.h,
--     [AC_SEARCH_LIBS(selinux_raw_to_trans_context, selinux,
--       [AC_DEFINE(HAVE_SELINUX, 1, [Define to 1 if libselinux is available])
--        SELINUX_LIBS="-lselinux"
--        msg_selinux=yes])
--     ])
--   ])
--AC_SUBST(SELINUX_LIBS)
-+if test "x$enable_selinux" != "xno"; then
-+    AC_CHECK_LIB(selinux, is_selinux_enabled,
-+       [AC_CHECK_HEADERS(selinux/selinux.h,
-+         [AC_SEARCH_LIBS(selinux_raw_to_trans_context, selinux,
-+           [AC_DEFINE(HAVE_SELINUX, 1, [Define to 1 if libselinux is available])
-+            SELINUX_LIBS="-lselinux"
-+            msg_selinux=yes])
-+         ])
-+       ])
-+    AC_SUBST(SELINUX_LIBS)
-+fi
- 
- 
- AC_ARG_ENABLE(empty_view,
-@@ -353,6 +360,7 @@ caja-$VERSION:
-     warning flags:                ${WARNING_CFLAGS}
-     xmp support:                  $msg_xmp
-     PackageKit support:           $msg_packagekit
-+    SELinux support:              $msg_selinux
-     Self check:                   $msg_self_check
- 
-     caja-extension documentation: ${enable_gtk_doc}
diff --git a/mate-base/libmatekbd/Manifest b/mate-base/libmatekbd/Manifest
index 65c9bde424f2..892cdc5a5441 100644
--- a/mate-base/libmatekbd/Manifest
+++ b/mate-base/libmatekbd/Manifest
@@ -1,4 +1,2 @@
-DIST libmatekbd-1.23.0.tar.xz 363904 BLAKE2B 1b1ec3f7756127c1e41b4ff69069fcbf74505f3c844d1e3df1350d40f246ab96d017f4ec1326d3b72eba0b25eecbeaec9bc46b60d9f07e186e51c435015e56f7 SHA512 b20d0291b278aeb81e9d3e63d0740361960945e03936139e862cb44d0d3a32aecfee704569eecf7654a8d4e848ba29fe1b689ceefbe86a04e637c6bfc4f3ed3b
-DIST libmatekbd-1.24.0.tar.xz 425720 BLAKE2B 6f5f808f55c57c3d651d5c871a5f95269397a6d1c2e3cd37d2b16a5519300a81e994e0ac10bf474b9860ec7c0f3c862332199e10c506f38107c7f7d791899b4d SHA512 6a04f4f38ac1d1ef372fdbaddfe4c935d79039cce1a3d68a6876fa5550556f1d568de1d53857531c6f0bd5994e815f2c9e5be0436218e97718f87e17973ea655
 DIST libmatekbd-1.24.1.tar.xz 451404 BLAKE2B b05c469aabef69ba091ed4d9bdb4c207ed7f2042413c701d4a864cc514f1cc5b37b3750f01db544bf28fca712776a42262e6036043c5c1a9632789bf2f23d029 SHA512 982f973e90bd08c4068fc42f6c62d9d32f8ba4855f5616b3e4ce7167df787bd9dacf47fac3d95ddd0e7d622870bc394c1a22cfb929d0f3293c26095c2b5fe7e3
 DIST libmatekbd-1.26.0.tar.xz 453996 BLAKE2B 42b3933d27bde000cc599ba42223f01312db7d9b7a395378af4def91063dcdedeff66be43d35e6a763826c3fc0eafd354731c634a73a1d0b524a0cff6e38cc2d SHA512 1e8bdb331ecb97ccd54931ac59f0692af8665e7c0499a62b25ac69cfc6af1196b5198d707ef5e3985d8fe837a0813a014802b00760d32924af4f38b0df4b8b65
diff --git a/mate-base/libmatekbd/libmatekbd-1.23.0.ebuild b/mate-base/libmatekbd/libmatekbd-1.23.0.ebuild
deleted file mode 100644
index b1f2113381e3..000000000000
--- a/mate-base/libmatekbd/libmatekbd-1.23.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-DESCRIPTION="MATE keyboard configuration library"
-LICENSE="LGPL-2"
-SLOT="0"
-
-IUSE="X +introspection test"
-
-RDEPEND=">=dev-libs/glib-2.50:2
-	x11-libs/cairo
-	>=x11-libs/gdk-pixbuf-2.24:2
-	x11-libs/libX11
-	>=x11-libs/libxklavier-5.2:0[introspection?]
-	x11-libs/pango
-	virtual/libintl
-	>=x11-libs/gtk+-3.22:3[introspection?]
-	introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )"
-
-DEPEND="${RDEPEND}
-	dev-util/glib-utils
-	>=dev-util/intltool-0.50.1
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-src_configure() {
-	mate_src_configure \
-		$(use_with X x) \
-		$(use_enable introspection) \
-		$(use_enable test tests)
-}
diff --git a/mate-base/libmatekbd/libmatekbd-1.24.0.ebuild b/mate-base/libmatekbd/libmatekbd-1.24.0.ebuild
deleted file mode 100644
index 58407483815f..000000000000
--- a/mate-base/libmatekbd/libmatekbd-1.24.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-fi
-
-DESCRIPTION="MATE keyboard configuration library"
-LICENSE="LGPL-2"
-SLOT="0"
-
-IUSE="X +introspection test"
-
-RDEPEND=">=dev-libs/glib-2.50:2
-	x11-libs/cairo
-	>=x11-libs/gdk-pixbuf-2.24:2
-	x11-libs/libX11
-	>=x11-libs/libxklavier-5.2:0[introspection?]
-	x11-libs/pango
-	virtual/libintl
-	>=x11-libs/gtk+-3.22:3[introspection?]
-	introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )"
-
-DEPEND="${RDEPEND}
-	dev-util/glib-utils
-	>=dev-util/intltool-0.50.1
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-src_configure() {
-	mate_src_configure \
-		$(use_with X x) \
-		$(use_enable introspection) \
-		$(use_enable test tests)
-}
diff --git a/mate-base/libmatekbd/libmatekbd-1.24.1.ebuild b/mate-base/libmatekbd/libmatekbd-1.24.1.ebuild
index d9b5510e6c91..a1fad2fbab76 100644
--- a/mate-base/libmatekbd/libmatekbd-1.24.1.ebuild
+++ b/mate-base/libmatekbd/libmatekbd-1.24.1.ebuild
@@ -7,8 +7,8 @@ MATE_LA_PUNT="yes"
 
 inherit mate
 
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 x86"
+if [[ "${PV}" != *9999 ]]; then
+	KEYWORDS="amd64 ~arm ~arm64 ~loong ~riscv x86"
 fi
 
 DESCRIPTION="MATE keyboard configuration library"
diff --git a/mate-base/libmatekbd/libmatekbd-1.26.0.ebuild b/mate-base/libmatekbd/libmatekbd-1.26.0.ebuild
index ba2e39e4af0c..79c639b33f75 100644
--- a/mate-base/libmatekbd/libmatekbd-1.26.0.ebuild
+++ b/mate-base/libmatekbd/libmatekbd-1.26.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,8 +7,8 @@ MATE_LA_PUNT="yes"
 
 inherit mate
 
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64"
+if [[ "${PV}" != *9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
 fi
 
 DESCRIPTION="MATE keyboard configuration library"
@@ -32,8 +32,9 @@ COMMON_DEPEND="
 
 RDEPEND="${COMMON_DEPEND}"
 
-DEPEND="${COMMON_DEPEND}
-	dev-libs/libxml2
+DEPEND="${COMMON_DEPEND}"
+
+BDEPEND="
 	dev-util/glib-utils
 	>=sys-devel/gettext-0.19.8
 	virtual/pkgconfig
diff --git a/mate-base/libmatekbd/libmatekbd-9999.ebuild b/mate-base/libmatekbd/libmatekbd-9999.ebuild
index da2af0d7a8b1..79c639b33f75 100644
--- a/mate-base/libmatekbd/libmatekbd-9999.ebuild
+++ b/mate-base/libmatekbd/libmatekbd-9999.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 MATE_LA_PUNT="yes"
 
 inherit mate
 
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+if [[ "${PV}" != *9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
 fi
 
 DESCRIPTION="MATE keyboard configuration library"
@@ -32,8 +32,9 @@ COMMON_DEPEND="
 
 RDEPEND="${COMMON_DEPEND}"
 
-DEPEND="${COMMON_DEPEND}
-	dev-libs/libxml2
+DEPEND="${COMMON_DEPEND}"
+
+BDEPEND="
 	dev-util/glib-utils
 	>=sys-devel/gettext-0.19.8
 	virtual/pkgconfig
diff --git a/mate-base/mate-applets-meta/mate-applets-meta-1.24.0.ebuild b/mate-base/mate-applets-meta/mate-applets-meta-1.24.0.ebuild
index 8a69cb829888..5ff702ada2b5 100644
--- a/mate-base/mate-applets-meta/mate-applets-meta-1.24.0.ebuild
+++ b/mate-base/mate-applets-meta/mate-applets-meta-1.24.0.ebuild
@@ -1,18 +1,17 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-if [[ ${PV} == 9999 ]]; then
+if [[ "${PV}" == *9999 ]]; then
 	MATE_BRANCH=9999
 else
-	inherit eapi7-ver
 	MATE_BRANCH="$(ver_cut 1-2)"
-	KEYWORDS="amd64 ~arm ~arm64 x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~loong ~riscv x86"
 fi
 
 DESCRIPTION="Meta package for MATE panel applets"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:MATE"
 SRC_URI=""
 
 LICENSE="metapackage"
diff --git a/mate-base/mate-applets-meta/mate-applets-meta-1.24.ebuild b/mate-base/mate-applets-meta/mate-applets-meta-1.24.ebuild
deleted file mode 100644
index 8ff090932d48..000000000000
--- a/mate-base/mate-applets-meta/mate-applets-meta-1.24.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} == 9999 ]]; then
-	MATE_BRANCH=9999
-else
-	inherit eapi7-ver
-	MATE_BRANCH="$(ver_cut 1-2)"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-fi
-
-DESCRIPTION="Meta package for MATE panel applets"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI=""
-
-LICENSE="metapackage"
-SLOT="0"
-IUSE="appindicator sensors"
-
-DEPEND=""
-RDEPEND="=mate-base/mate-applets-${MATE_BRANCH}*
-	appindicator? ( =mate-extra/mate-indicator-applet-${MATE_BRANCH}* )
-	sensors? ( =mate-extra/mate-sensors-applet-${MATE_BRANCH}* )
-"
diff --git a/mate-base/mate-applets-meta/mate-applets-meta-1.26.0.ebuild b/mate-base/mate-applets-meta/mate-applets-meta-1.26.0.ebuild
index ba913600c5cf..3ca1b4ea5f93 100644
--- a/mate-base/mate-applets-meta/mate-applets-meta-1.26.0.ebuild
+++ b/mate-base/mate-applets-meta/mate-applets-meta-1.26.0.ebuild
@@ -1,18 +1,17 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-if [[ ${PV} == 9999 ]]; then
+if [[ "${PV}" == *9999 ]]; then
 	MATE_BRANCH=9999
 else
-	inherit eapi7-ver
 	MATE_BRANCH="$(ver_cut 1-2)"
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
 fi
 
 DESCRIPTION="Meta package for MATE panel applets"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:MATE"
 SRC_URI=""
 
 LICENSE="metapackage"
@@ -20,7 +19,8 @@ SLOT="0"
 IUSE="appindicator sensors"
 
 DEPEND=""
-RDEPEND="=mate-base/mate-applets-${MATE_BRANCH}*
+RDEPEND="
+	=mate-base/mate-applets-${MATE_BRANCH}*
 	appindicator? ( =mate-extra/mate-indicator-applet-${MATE_BRANCH}* )
 	sensors? ( =mate-extra/mate-sensors-applet-${MATE_BRANCH}* )
 "
diff --git a/mate-base/mate-applets-meta/mate-applets-meta-9999.ebuild b/mate-base/mate-applets-meta/mate-applets-meta-9999.ebuild
index e2fda45a92a6..3ca1b4ea5f93 100644
--- a/mate-base/mate-applets-meta/mate-applets-meta-9999.ebuild
+++ b/mate-base/mate-applets-meta/mate-applets-meta-9999.ebuild
@@ -1,18 +1,17 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-if [[ ${PV} == 9999 ]]; then
+if [[ "${PV}" == *9999 ]]; then
 	MATE_BRANCH=9999
 else
-	inherit eapi7-ver
 	MATE_BRANCH="$(ver_cut 1-2)"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
 fi
 
 DESCRIPTION="Meta package for MATE panel applets"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:MATE"
 SRC_URI=""
 
 LICENSE="metapackage"
diff --git a/mate-base/mate-applets/Manifest b/mate-base/mate-applets/Manifest
index d756e9f43c47..c82d0cc98972 100644
--- a/mate-base/mate-applets/Manifest
+++ b/mate-base/mate-applets/Manifest
@@ -1,3 +1,3 @@
-DIST mate-applets-1.24.0.tar.xz 8142812 BLAKE2B cbb76d6d64bb6e9b9f93197dbe79e2751877b0604c5a84ff4b6b00608f2930925bdbc2824dc96848c84496fa5f16ab38458775727b22cb07f4db9ca854f93c42 SHA512 345a80b123c705997d44ac5a4bea5249045d75181c3802cf49b2eb08decc14a12f75f2e06e6ebfae267b937ff10edf7638cd64332e2e2e731695e6260df5222e
 DIST mate-applets-1.24.1.tar.xz 8222540 BLAKE2B f018f131cedda486a28c3a125c07efaf5c3111f95c17b0c3fbdd0b1f084ddf851d46ea4ef511a1e57f6d9f7f29a28e48ab010abc4cc6d87c1315b79bfbf01849 SHA512 d29e39a140310fef84cb0fe631568e0177ca5faaf2bf566211a23b32613fd6aabf06dd8ecd81a16e09553c659a7feda9ba372bb62a70504a235be58e07726ed2
 DIST mate-applets-1.26.0.tar.xz 8442720 BLAKE2B b7e3d9cf868926c13652e93b214317c59f7693f3cedc277d2f8e676892bde026587893faabbfff1c6d35af2e6e7f900c3b71d89fc4a8065ff794d1be6e0e4f99 SHA512 4b7676afd8a3ca9e2389f3775abcad5e84bfd628394e98c66c1e77a99503f4893bfd5c8839d63e6044b1b11990aa1d6f7fa857522c1907461ee7b1f68efc7192
+DIST mate-applets-1.26.1.tar.xz 8475672 BLAKE2B 0f67f7dfd649c6168f51673f04287e49717ebf7077da63a631844594658d78079df55fd4d25e2be5e299c00d2ea3659ae23140bb508adc327b7c87a74ac4dd19 SHA512 7243825098f9101542b9eead2f60ac7f12e044ceb685da92a29fe72b2dc1271e1fa34dbc4c47148e2331a2af79d69f787dc8856c7112b75ef0a3dea97e4ab8fd
diff --git a/mate-base/mate-applets/files/mate-applets-1.10.0-replace-cpufreq-by-cpupower.patch b/mate-base/mate-applets/files/mate-applets-1.10.0-replace-cpufreq-by-cpupower.patch
deleted file mode 100644
index 1b9c33045e67..000000000000
--- a/mate-base/mate-applets/files/mate-applets-1.10.0-replace-cpufreq-by-cpupower.patch
+++ /dev/null
@@ -1,71 +0,0 @@
---- a/configure.ac	2015-06-16 01:32:25.485187109 +0000
-+++ b/configure.ac	2015-06-16 01:39:00.414170501 +0000
-@@ -409,12 +409,12 @@
- 
- AC_CHECK_HEADER(cpufreq.h, have_libcpufreq=yes, have_libcpufreq=no)
- LIBCPUFREQ_LIBS=
--if test "x$have_libcpufreq" = "xyes"; then
--   AC_DEFINE([HAVE_LIBCPUFREQ], [1], [Have libcpufreq.])
--   LIBCPUFREQ_LIBS="-l$with_cpufreq_lib"
-+if test "x$have_libcpupower" = "xyes"; then
-+   AC_DEFINE([HAVE_LIBCPOWER], [1], [Have libcpupower.])
-+   LIBCPUPOWER_LIBS="-lcpupower"
- fi
--AM_CONDITIONAL(HAVE_LIBCPUFREQ, test x$have_libcpufreq = xyes)
--AC_SUBST(LIBCPUFREQ_LIBS)
-+AM_CONDITIONAL(HAVE_LIBCPUPOWER, test x$have_libcpupower = xyes)
-+AC_SUBST(LIBCPUPOWER_LIBS)
- 
- build_cpufreq_applet=no
- 
---- a/cpufreq/src/cpufreq-selector/cpufreq-selector-factory.c	2015-06-16 01:42:36.709161405 +0000
-+++ b/cpufreq/src/cpufreq-selector/cpufreq-selector-factory.c	2015-06-16 01:47:30.191149062 +0000
-@@ -24,7 +24,7 @@
- #include "cpufreq-selector-factory.h"
- #include "cpufreq-selector-sysfs.h"
- #include "cpufreq-selector-procfs.h"
--#ifdef HAVE_LIBCPUFREQ
-+#ifdef HAVE_LIBCPUPOWER
- #include "cpufreq-selector-libcpufreq.h"
- #endif
- 
-@@ -33,7 +33,7 @@
- {
- 	CPUFreqSelector *selector = NULL;
- 	
--#ifdef HAVE_LIBCPUFREQ
-+#ifdef HAVE_LIBCPUPOWER
- 	selector = cpufreq_selector_libcpufreq_new (cpu);
- #else
- 	if (g_file_test ("/sys/devices/system/cpu/cpu0/cpufreq", G_FILE_TEST_EXISTS)) { /* 2.6 kernel */
-@@ -41,7 +41,7 @@
- 	} else if (g_file_test ("/proc/cpufreq", G_FILE_TEST_EXISTS)) { /* 2.4 kernel */
- 		selector = cpufreq_selector_procfs_new (cpu);
- 	}
--#endif /* HAVE_LIBCPUFREQ */
-+#endif /* HAVE_LIBCPUPOWER */
- 
- 	return selector;
- }
---- a/cpufreq/src/cpufreq-selector/Makefile.am	2015-06-16 01:49:29.208144057 +0000
-+++ b/cpufreq/src/cpufreq-selector/Makefile.am	2015-06-16 01:50:43.970140913 +0000
-@@ -16,7 +16,7 @@
- endif
- 
- 
--if HAVE_LIBCPUFREQ
-+if HAVE_LIBCPUPOWER
- cpufreq_files=cpufreq-selector-libcpufreq.c        cpufreq-selector-libcpufreq.h
- endif
- 
---- a/cpufreq/src/Makefile.am	2015-06-16 01:52:13.562137145 +0000
-+++ b/cpufreq/src/Makefile.am	2015-06-16 01:52:46.122135776 +0000
-@@ -12,7 +12,7 @@
- 
- libexec_PROGRAMS = mate-cpufreq-applet
- 
--if HAVE_LIBCPUFREQ
-+if HAVE_LIBCPUPOWER
- cpufreq_files=cpufreq-monitor-libcpufreq.c    cpufreq-monitor-libcpufreq.h
- endif
- 
diff --git a/mate-base/mate-applets/files/mate-applets-1.10.4-drop-icon-theme-dep.patch b/mate-base/mate-applets/files/mate-applets-1.10.4-drop-icon-theme-dep.patch
deleted file mode 100644
index 41370299b511..000000000000
--- a/mate-base/mate-applets/files/mate-applets-1.10.4-drop-icon-theme-dep.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 0a9439346e00aded616fe99773ffec2f3f7bcc49 Mon Sep 17 00:00:00 2001
-From: raveit65 <chat-to-me@raveit.de>
-Date: Thu, 1 Oct 2015 00:27:53 +0200
-Subject: [PATCH] drop dpendency to mate-icon-theme
-
-The dependency is not really needed; depending on GTK+ should be enough
-to guarantee the presence of a spec-compliant icon theme.
----
- configure.ac | 4 ----
- 1 file changed, 4 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index b69e1a4..284dba7 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -20,7 +20,6 @@ LIBNOTIFY_REQUIRED=0.7.0
- UPOWER_REQUIRED=0.9.4
- DBUS_REQUIRED=1.1.2
- DBUS_GLIB_REQUIRED=0.74
--MATE_ICON_THEME_REQUIRED=1.1.0
- LIBXML_REQUIRED=2.5.0
- POLKIT_REQUIRED=0.92
- dnl ***************************************************************************
-@@ -122,9 +121,6 @@ dnl ***************************************************************************
- dnl *** Use pkg-config to check for dependancies                            ***
- dnl ***************************************************************************
- 
--dnl -- Check for mate-icon-theme (required) ----------------------------------
--PKG_CHECK_MODULES(GIT, mate-icon-theme >= $MATE_ICON_THEME_REQUIRED)
--
- dnl -- check for gio (required) ------------------------------------------
- PKG_CHECK_MODULES(GIO, gio-2.0 >= $GIO_REQUIRED gio-unix-2.0)
- AC_SUBST(GIO_CFLAGS)
diff --git a/mate-base/mate-applets/files/mate-applets-1.14.1-revert-upstream-cpupower-4.7-fix.patch b/mate-base/mate-applets/files/mate-applets-1.14.1-revert-upstream-cpupower-4.7-fix.patch
deleted file mode 100644
index 85c2b24bc81b..000000000000
--- a/mate-base/mate-applets/files/mate-applets-1.14.1-revert-upstream-cpupower-4.7-fix.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From e82b68edbfa8d6e209b9ad7b3e6392a928da776e Mon Sep 17 00:00:00 2001
-From: mudler <mudler@sabayon.org>
-Date: Tue, 13 Sep 2016 23:33:58 +0200
-Subject: [PATCH] fix 1.14.1 on kernel-headers >=4.7
-
----
- cpufreq/src/cpufreq-monitor-libcpufreq.c | 6 +-----
- 1 file changed, 1 insertion(+), 5 deletions(-)
-
-diff --git a/cpufreq/src/cpufreq-monitor-libcpufreq.c b/cpufreq/src/cpufreq-monitor-libcpufreq.c
-index 228a890..587e316 100644
---- a/cpufreq/src/cpufreq-monitor-libcpufreq.c
-+++ b/cpufreq/src/cpufreq-monitor-libcpufreq.c
-@@ -23,7 +23,7 @@
- #include <glib/gi18n.h>
- 
- #include <stdlib.h>
--#include <linux/version.h>
-+
- #include <cpufreq.h>
- #include "cpufreq-monitor-libcpufreq.h"
- #include "cpufreq-utils.h"
-@@ -111,11 +111,7 @@ cpufreq_monitor_libcpufreq_run (CPUFreqMonitor *monitor)
- 		/* Check whether it failed because
- 		 * cpu is not online.
- 		 */
--#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 7, 0)
- 		if (!cpufreq_cpu_exists (cpu)) {
--#else
--		if (cpupower_is_cpu_online (cpu)) {
--#endif
- 			g_object_set (G_OBJECT (monitor), "online", FALSE, NULL);
- 			return TRUE;
- 		}
--- 
-2.9.2
-
diff --git a/mate-base/mate-applets/mate-applets-1.24.0.ebuild b/mate-base/mate-applets/mate-applets-1.24.1-r1.ebuild
index c5e7cc28f0c8..e6c5118c87a3 100644
--- a/mate-base/mate-applets/mate-applets-1.24.0.ebuild
+++ b/mate-base/mate-applets/mate-applets-1.24.1-r1.ebuild
@@ -1,21 +1,24 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit mate
 
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+if [[ "${PV}" != *9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
 fi
 
 DESCRIPTION="Applets for the MATE Desktop and Panel"
-LICENSE="GPL-2 FDL-1.1 LGPL-2"
+LICENSE="CC-BY-SA-3.0 FDL-1.1+ GPL-2+ GPL-3+ LGPL-2+"
 SLOT="0"
 
-IUSE="X ipv6 policykit +upower"
+IUSE="X +cpupower ipv6 policykit +upower"
 
-COMMON_DEPEND="dev-libs/atk
+REQUIRED_USE="policykit? ( cpupower )"
+
+COMMON_DEPEND="
+	app-accessibility/at-spi2-core:2
 	>=dev-libs/dbus-glib-0.74
 	>=dev-libs/glib-2.50:2
 	>=dev-libs/libmateweather-1.17.0
@@ -24,8 +27,7 @@ COMMON_DEPEND="dev-libs/atk
 	>=gnome-extra/gucharmap-3.0:2.90
 	>=mate-base/mate-panel-1.17.0
 	>=net-wireless/wireless-tools-28_pre9:0
-	>=sys-apps/dbus-1.1.2
-	sys-power/cpupower
+	>=sys-apps/dbus-1.10.0
 	x11-libs/gdk-pixbuf:2
 	>=x11-libs/gtk+-3.22:3
 	x11-libs/gtksourceview:3.0
@@ -33,35 +35,41 @@ COMMON_DEPEND="dev-libs/atk
 	x11-libs/libX11
 	>=x11-libs/libwnck-3.0:3
 	x11-libs/pango
-	virtual/libintl
-	policykit? ( >=sys-auth/polkit-0.97:0 )
+	cpupower? (
+		sys-power/cpupower
+		policykit? ( >=sys-auth/polkit-0.97:0 )
+	)
 	upower? ( >=sys-power/upower-0.9.23 )
-	!!net-analyzer/mate-netspeed"
+"
 
 RDEPEND="${COMMON_DEPEND}
-	>=mate-base/mate-settings-daemon-1.6"
+	mate-base/caja
+	mate-base/mate-desktop
+	>=mate-base/mate-settings-daemon-1.6
+	virtual/libintl
+"
 
-DEPEND="${COMMON_DEPEND}
+BDEPEND="${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/intltool-0.50.1
 	dev-libs/libxslt
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-# seems this issue is fixed in ee13eb9b2c5296fd3b2930a1408382dcced446a3 upstream
-# PATCHES=( "${FILESDIR}"/${PN}-1.22.0-cpupower.patch )
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
 
 src_configure() {
+
+	# configure.ac logic is a little hinky
+	# and ignores --enable flags for cpufreq
+	use cpupower || myconf=( --disable-cpufreq )
+
 	mate_src_configure \
 		--libexecdir=/usr/libexec/mate-applets \
-		--with-cpufreq-lib=cpupower \
 		$(use_with X x) \
 		$(use_with upower) \
 		$(use_enable ipv6) \
-		$(use_enable policykit polkit)
+		$(use_enable policykit polkit) \
+		"${myconf[@]}"
 }
 
 src_test() {
@@ -72,15 +80,17 @@ src_test() {
 src_install() {
 	mate_src_install
 
-	local APPLETS="accessx-status battstat charpick command cpufreq drivemount
-			geyes mateweather multiload netspeed stickynotes
-			timerapplet trashapplet"
+	local APPLETS=(
+		accessx-status battstat charpick command cpufreq drivemount
+		geyes mateweather multiload netspeed stickynotes
+		timerapplet trashapplet
+	)
 
-	for applet in ${APPLETS}; do
-		docinto ${applet}
+	for applet in "${APPLETS[@]}"; do
+		docinto "${applet}"
 
 		for d in AUTHORS ChangeLog NEWS README README.themes TODO; do
-			[ -s ${applet}/${d} ] && dodoc ${applet}/${d}
+			[[ -s "${applet}/${d}" ]] && dodoc "${applet}/${d}"
 		done
 	done
 }
diff --git a/mate-base/mate-applets/mate-applets-1.26.0-r1.ebuild b/mate-base/mate-applets/mate-applets-1.26.0-r1.ebuild
new file mode 100644
index 000000000000..c3c7832be414
--- /dev/null
+++ b/mate-base/mate-applets/mate-applets-1.26.0-r1.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit mate
+
+if [[ "${PV}" != *9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
+fi
+
+DESCRIPTION="Applets for the MATE Desktop and Panel"
+LICENSE="CC-BY-SA-3.0 FDL-1.1+ GPL-2+ GPL-3+ LGPL-2+"
+SLOT="0"
+
+IUSE="X +cpupower ipv6 netlink policykit +upower"
+
+REQUIRED_USE="policykit? ( cpupower )"
+
+COMMON_DEPEND="
+	app-accessibility/at-spi2-core:2
+	>=dev-libs/dbus-glib-0.74
+	>=dev-libs/glib-2.50:2
+	>=dev-libs/libmateweather-1.17.0
+	>=dev-libs/libxml2-2.5:2
+	>=gnome-base/libgtop-2.12.0:2=
+	>=gnome-extra/gucharmap-3.0:2.90
+	>=mate-base/mate-panel-1.25.2
+	>=net-wireless/wireless-tools-28_pre9:0
+	>=sys-apps/dbus-1.10.0
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.22:3
+	x11-libs/gtksourceview:3.0
+	>=x11-libs/libnotify-0.7
+	x11-libs/libX11
+	>=x11-libs/libwnck-3.0:3
+	x11-libs/pango
+	cpupower? (
+		sys-power/cpupower
+		policykit? ( >=sys-auth/polkit-0.97:0 )
+	)
+	netlink? (
+		dev-libs/libnl:3
+	)
+	upower? ( >=sys-power/upower-0.99.8 )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	mate-base/caja
+	mate-base/mate-desktop
+	>=mate-base/mate-settings-daemon-1.6
+	virtual/libintl
+"
+
+BDEPEND="${COMMON_DEPEND}
+	app-text/docbook-xml-dtd:4.3
+	app-text/yelp-tools
+	dev-libs/libxslt
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+src_configure() {
+
+	# configure.ac logic is a little hinky
+	# and ignores --enable flags for cpufreq
+	use cpupower || myconf=( --disable-cpufreq )
+
+	mate_src_configure \
+		--libexecdir=/usr/libexec/mate-applets \
+		$(use_with X x) \
+		$(use_with upower) \
+		$(use_with netlink nl) \
+		$(use_enable ipv6) \
+		$(use_enable policykit polkit) \
+		"${myconf[@]}"
+}
+
+src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+	emake check
+}
+
+src_install() {
+	mate_src_install
+
+	local APPLETS=(
+		accessx-status battstat charpick command cpufreq drivemount
+		geyes mateweather multiload netspeed stickynotes
+		timerapplet trashapplet
+	)
+
+	for applet in "${APPLETS[@]}"; do
+		docinto "${applet}"
+
+		for d in AUTHORS ChangeLog NEWS README README.themes TODO; do
+			[[ -s "${applet}/${d}" ]] && dodoc "${applet}/${d}"
+		done
+	done
+}
diff --git a/mate-base/mate-applets/mate-applets-1.26.1.ebuild b/mate-base/mate-applets/mate-applets-1.26.1.ebuild
new file mode 100644
index 000000000000..c3c7832be414
--- /dev/null
+++ b/mate-base/mate-applets/mate-applets-1.26.1.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit mate
+
+if [[ "${PV}" != *9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
+fi
+
+DESCRIPTION="Applets for the MATE Desktop and Panel"
+LICENSE="CC-BY-SA-3.0 FDL-1.1+ GPL-2+ GPL-3+ LGPL-2+"
+SLOT="0"
+
+IUSE="X +cpupower ipv6 netlink policykit +upower"
+
+REQUIRED_USE="policykit? ( cpupower )"
+
+COMMON_DEPEND="
+	app-accessibility/at-spi2-core:2
+	>=dev-libs/dbus-glib-0.74
+	>=dev-libs/glib-2.50:2
+	>=dev-libs/libmateweather-1.17.0
+	>=dev-libs/libxml2-2.5:2
+	>=gnome-base/libgtop-2.12.0:2=
+	>=gnome-extra/gucharmap-3.0:2.90
+	>=mate-base/mate-panel-1.25.2
+	>=net-wireless/wireless-tools-28_pre9:0
+	>=sys-apps/dbus-1.10.0
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.22:3
+	x11-libs/gtksourceview:3.0
+	>=x11-libs/libnotify-0.7
+	x11-libs/libX11
+	>=x11-libs/libwnck-3.0:3
+	x11-libs/pango
+	cpupower? (
+		sys-power/cpupower
+		policykit? ( >=sys-auth/polkit-0.97:0 )
+	)
+	netlink? (
+		dev-libs/libnl:3
+	)
+	upower? ( >=sys-power/upower-0.99.8 )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	mate-base/caja
+	mate-base/mate-desktop
+	>=mate-base/mate-settings-daemon-1.6
+	virtual/libintl
+"
+
+BDEPEND="${COMMON_DEPEND}
+	app-text/docbook-xml-dtd:4.3
+	app-text/yelp-tools
+	dev-libs/libxslt
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+src_configure() {
+
+	# configure.ac logic is a little hinky
+	# and ignores --enable flags for cpufreq
+	use cpupower || myconf=( --disable-cpufreq )
+
+	mate_src_configure \
+		--libexecdir=/usr/libexec/mate-applets \
+		$(use_with X x) \
+		$(use_with upower) \
+		$(use_with netlink nl) \
+		$(use_enable ipv6) \
+		$(use_enable policykit polkit) \
+		"${myconf[@]}"
+}
+
+src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+	emake check
+}
+
+src_install() {
+	mate_src_install
+
+	local APPLETS=(
+		accessx-status battstat charpick command cpufreq drivemount
+		geyes mateweather multiload netspeed stickynotes
+		timerapplet trashapplet
+	)
+
+	for applet in "${APPLETS[@]}"; do
+		docinto "${applet}"
+
+		for d in AUTHORS ChangeLog NEWS README README.themes TODO; do
+			[[ -s "${applet}/${d}" ]] && dodoc "${applet}/${d}"
+		done
+	done
+}
diff --git a/mate-base/mate-applets/metadata.xml b/mate-base/mate-applets/metadata.xml
index c200eee4191e..fb58e40e30da 100644
--- a/mate-base/mate-applets/metadata.xml
+++ b/mate-base/mate-applets/metadata.xml
@@ -10,6 +10,7 @@
   <flag name="cpupower">
 			Enable support for cpu frequency manipulation using <pkg>sys-power/cpupower</pkg>
 		</flag>
+  <flag name="netlink">Use <pkg>dev-libs/libnl</pkg></flag>
  </use>
  <origin>mate-overlay</origin>
 </pkgmetadata>
 \ No newline at end of file
diff --git a/mate-base/mate-common/Manifest b/mate-base/mate-common/Manifest
index 59162c76ae97..39fc82430e61 100644
--- a/mate-base/mate-common/Manifest
+++ b/mate-base/mate-common/Manifest
@@ -1,8 +1,2 @@
-DIST mate-common-1.20.0.tar.xz 73108 BLAKE2B d4aa2d1b9f0dce4346e5a62f519390b1fb56e44a0e59bd74abb2e0728b3f97ea8a8296d6a72ef894b7f95f18218b35f9653dcc4d45bcff8a8e365ef088b25530 SHA512 78fed107087f21f30a87b2fd635479f31162f1b9e7ae2f9c02146af275d7662a4ea466da2a049c35d726073d3a0bd9a043818b332b93670334c59aef36bc3b8a
-DIST mate-common-1.22.0.tar.xz 73448 BLAKE2B 7796423fd70732c063759e509c13a62fdc5c68e07768776b25ecbec7d06ca8bc68fad947287306ede99f5993a8def3b5f25a4560d3fa7677083a28c64d2c4288 SHA512 3887634081c126c6c23f560ca256ae83edbc5f77f0fc0128c2aaa2b5652672ec6f21ca29b0b44802b03c5dfd53bf0da860093ec73c46fba58f7be12a1db1d2a3
-DIST mate-common-1.22.2.tar.xz 69620 BLAKE2B 8acf4ff0ce792ea949913b2f6f591f3ab76e442ac40196ef6bfaf5fc46fdcde439a7e8f71698437c499b7effdbd8fdefd77e8aa254718af9dde053fa184e5716 SHA512 0afedfae9a93f9b3f8344d5f8a93d80b71b472f084e8322daa7f616e9f0861511536aa1f56f8cfc57abd7e1720cd4695dcecc0582483b009bc6e67daaa82107b
-DIST mate-common-1.23.3.tar.xz 69380 BLAKE2B 7f8998fc07ec462f892528c1343f502c7c73263ec953e19f20943091cffd4c346ac4664049fa4e760a83b8d7dd18206a1d4db716b5f72cf66f8cbaef7e1ece38 SHA512 89d8db5f827ef39c86f08adaf3c8d9300056461ccbce3804a25c1765fe8b7612c337548b2468da3c2bbde8ece6c56d11c7395c24db2b436af5e8c48fc0c466eb
-DIST mate-common-1.24.0.tar.xz 69284 BLAKE2B 27fe6af7bb96bd634801f8bd374e0b399d4fb7c8e8fb0bcbe85814256de4304098eccec0a17531a7d4ed91ccea1929a83ec5c914bd4bb3c2e4743153532ac8f5 SHA512 bbeead4b0493e386756670ca31e9f9cca92d9205e84282c87ee73d4a17b77ca258265569dc6f3483566ac04bc4a2de1aa737bcaaecbb01a83c73fb804b18a642
-DIST mate-common-1.24.1.tar.xz 69316 BLAKE2B e265994231d17bf4bda7a02e4cc2d54d8335eff5ee5c3b35b680335a01a21992d9d13632e95029c03b04cfb8d92ecd9b035f7bd2a8666feb4ccc54a937c71e3b SHA512 da3e670e5b4f566bf1893692b34b63d94cb5bd993ce94d0d8245a54c12b2cc2c6af7c29edd184b09ce5296566dbe34112bc318e740a8a7910e4767569e64d623
 DIST mate-common-1.24.2.tar.xz 69612 BLAKE2B 31010b5417824153046e07c4724c70e5ce9f69c0ad6945ccf276026c7f1d0238b6313cbe13a64a329a889f97a994fa749de152a0e6f02e8bc88e5f7ecf73febf SHA512 aae7cf6f4537b125d363e7be1f349cb4ba9515405d1e48704f87c647b2489647cfa14399f41b65a8c1b2a8851dfe8077ce47a3b618355767cc61a6e0037ba3d0
 DIST mate-common-1.26.0.tar.xz 69604 BLAKE2B 73c4b065eba0287d3f16ec3fdff8145dd97b765283f4017b31a7b86cb45949a4f7dde0207c244dc5c8047570830b85714955c23165889ae994a566f2f00a752c SHA512 9bfde79c9243d394f9ebc743f6a3c27199ec1e857f80020be0ff8b64a48cf1183fffd88783c1d375f2983a32c7437ca49b2f03b3e844e147c5750f71dbfb93bd
diff --git a/mate-base/mate-common/mate-common-1.23.3.ebuild b/mate-base/mate-common/mate-common-1.23.3.ebuild
deleted file mode 100644
index 212f79eb6cf8..000000000000
--- a/mate-base/mate-common/mate-common-1.23.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate-desktop.org
-
-if [[ ${PV} == 9999 ]]; then
-	inherit autotools
-else
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-DESCRIPTION="Common files for development of MATE packages"
-LICENSE="GPL-3"
-SLOT="0"
-
-src_prepare() {
-	default
-	if [[ ${PV} == 9999 ]]; then
-		eautoreconf
-	fi
-}
-
-src_install() {
-	mv doc-build/README README.doc-build \
-		|| die "Failed to rename doc-build/README."
-
-	default
-
-	dodoc doc/usage.txt
-}
diff --git a/mate-base/mate-common/mate-common-1.24.0.ebuild b/mate-base/mate-common/mate-common-1.24.0.ebuild
deleted file mode 100644
index f62fd085c893..000000000000
--- a/mate-base/mate-common/mate-common-1.24.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate-desktop.org
-
-if [[ ${PV} == 9999 ]]; then
-	inherit autotools
-else
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-fi
-
-DESCRIPTION="Common files for development of MATE packages"
-LICENSE="GPL-3"
-SLOT="0"
-
-src_prepare() {
-	default
-	if [[ ${PV} == 9999 ]]; then
-		eautoreconf
-	fi
-}
-
-src_install() {
-	mv doc-build/README README.doc-build \
-		|| die "Failed to rename doc-build/README."
-
-	default
-
-	dodoc doc/usage.txt
-}
diff --git a/mate-base/mate-common/mate-common-1.24.1.ebuild b/mate-base/mate-common/mate-common-1.24.1.ebuild
deleted file mode 100644
index f62fd085c893..000000000000
--- a/mate-base/mate-common/mate-common-1.24.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate-desktop.org
-
-if [[ ${PV} == 9999 ]]; then
-	inherit autotools
-else
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-fi
-
-DESCRIPTION="Common files for development of MATE packages"
-LICENSE="GPL-3"
-SLOT="0"
-
-src_prepare() {
-	default
-	if [[ ${PV} == 9999 ]]; then
-		eautoreconf
-	fi
-}
-
-src_install() {
-	mv doc-build/README README.doc-build \
-		|| die "Failed to rename doc-build/README."
-
-	default
-
-	dodoc doc/usage.txt
-}
diff --git a/mate-base/mate-common/mate-common-1.24.2.ebuild b/mate-base/mate-common/mate-common-1.24.2.ebuild
index 34c031021ccc..19cf771aa483 100644
--- a/mate-base/mate-common/mate-common-1.24.2.ebuild
+++ b/mate-base/mate-common/mate-common-1.24.2.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit mate-desktop.org
 
-if [[ ${PV} == 9999 ]]; then
+if [[ "${PV}" == *9999 ]]; then
 	inherit autotools
 else
-	KEYWORDS="amd64 ~arm ~arm64 x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
 fi
 
 DESCRIPTION="Common files for development of MATE packages"
@@ -17,7 +17,7 @@ SLOT="0"
 
 src_prepare() {
 	default
-	if [[ ${PV} == 9999 ]]; then
+	if [[ "${PV}" == *9999 ]]; then
 		eautoreconf
 	fi
 }
diff --git a/mate-base/mate-common/mate-common-1.26.0.ebuild b/mate-base/mate-common/mate-common-1.26.0.ebuild
index 4727a2e009ce..19cf771aa483 100644
--- a/mate-base/mate-common/mate-common-1.26.0.ebuild
+++ b/mate-base/mate-common/mate-common-1.26.0.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 inherit mate-desktop.org
 
-if [[ ${PV} == 9999 ]]; then
+if [[ "${PV}" == *9999 ]]; then
 	inherit autotools
 else
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
 fi
 
 DESCRIPTION="Common files for development of MATE packages"
@@ -17,7 +17,7 @@ SLOT="0"
 
 src_prepare() {
 	default
-	if [[ ${PV} == 9999 ]]; then
+	if [[ "${PV}" == *9999 ]]; then
 		eautoreconf
 	fi
 }
diff --git a/mate-base/mate-common/mate-common-9999.ebuild b/mate-base/mate-common/mate-common-9999.ebuild
index 6c83b6fdcda7..19cf771aa483 100644
--- a/mate-base/mate-common/mate-common-9999.ebuild
+++ b/mate-base/mate-common/mate-common-9999.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit mate-desktop.org
 
-if [[ ${PV} == 9999 ]]; then
+if [[ "${PV}" == *9999 ]]; then
 	inherit autotools
 else
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
 fi
 
 DESCRIPTION="Common files for development of MATE packages"
@@ -17,7 +17,7 @@ SLOT="0"
 
 src_prepare() {
 	default
-	if [[ ${PV} == 9999 ]]; then
+	if [[ "${PV}" == *9999 ]]; then
 		eautoreconf
 	fi
 }
diff --git a/mate-base/mate-control-center/Manifest b/mate-base/mate-control-center/Manifest
index 7111dfe4d649..2133d2e6a17a 100644
--- a/mate-base/mate-control-center/Manifest
+++ b/mate-base/mate-control-center/Manifest
@@ -1,4 +1,2 @@
-DIST mate-control-center-1.24.0.tar.xz 3488572 BLAKE2B 683b3326deeacf3f47a8ca3201de66a492cac022ae341dfc54cdc97c9a5260e223a082a3dd899b31680e4a8e5b3237d0338c7fd8125468f75e1b00b4e6a130c7 SHA512 78e70bc94a34f8e6083d1951b12fcb9f7e8b7c55c5fac612ee27c8175e91b3872f6ecf15162e747444586612a94f857a02fb91a6fad142b5d0a16e749792c2ce
-DIST mate-control-center-1.24.1.tar.xz 3395740 BLAKE2B 88efb5b170af461b2505be654b005818b5b9087f5535365b7fe4033c05debcbf842fa33a77e4c78e72d0c7426794e943b773612f4431128c01fa77a15f5c2670 SHA512 f0440bfa79099610eb1f9f03bda13347b57d9250264f27971b69a5900338cf750e6eeb14111d7069bf597f5d4c4ed66b0466b926a54e4719845da23de31665f4
 DIST mate-control-center-1.24.2.tar.xz 3434520 BLAKE2B 29499ffe07dbfae8efed5058d79267c11fd863463e24317c12353886f4692f9256b07b912eee4fe3dcfe832929cddf614012a1bb4695164f83df950d44019d81 SHA512 3aecbad0e26521d5222b8483561167e16fdda3bc1a3be09644b71fdba1f9f3f64705ae474fc8df5b702e84c7fef83441a75324040e801da5071f3b667d7a57e5
 DIST mate-control-center-1.26.0.tar.xz 3449952 BLAKE2B 46a3b25952417dc0c7b893caca956e5a6097a2e88f17ebc9f98822efc52ff36fdb4517a8bac54c96550787f1fb15b24b55898ad272d309db17c1ba1530cb488a SHA512 958c41200b6fecc5cfbebbe7112038468bb5e8a6a877e2b16a40af3b41c100e32052e176fc87029eba3d0ccc05767f9400b609ab413924a54222cb18748d746f
diff --git a/mate-base/mate-control-center/files/mate-control-center-1.12.1-backport-appindicator-configure.patch b/mate-base/mate-control-center/files/mate-control-center-1.12.1-backport-appindicator-configure.patch
deleted file mode 100644
index b713b7f3a8cc..000000000000
--- a/mate-base/mate-control-center/files/mate-control-center-1.12.1-backport-appindicator-configure.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 90195c0c2e3f45a355286f1640c2f0020a5556b8 Mon Sep 17 00:00:00 2001
-From: raveit65 <chat-to-me@raveit.de>
-Date: Fri, 17 Jun 2016 20:34:06 +0200
-Subject: [PATCH] configure: fix build with libappindicator3
-
----
- configure.ac | 14 +++++++++-----
- 1 file changed, 9 insertions(+), 5 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 9b27671..a11bfdc 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -63,6 +63,8 @@ dnl ==============================================
- dnl Check GTK+ API version
- dnl ==============================================
- 
-+APPINDICATOR_REQUIRED=0.0.13
-+
- AC_MSG_CHECKING([which gtk+ version to compile against])
- AC_ARG_WITH([gtk],
-   [AS_HELP_STRING([--with-gtk=2.0|3.0],[which gtk+ version to compile against (default: 2.0)])],
-@@ -80,6 +82,7 @@ case "$with_gtk" in
-        LIBCANBERRA_API_VERSION=
-        LIBUNIQUE_API_VERSION=1.0
-        ENGINES_FOLDER="engines"
-+       APPINDICATOR_API_VERSION=
-        ;;
-   3.0) GTK_API_VERSION=3.0
-        GTK_REQUIRED=3.0.0
-@@ -87,6 +90,7 @@ case "$with_gtk" in
-        LIBCANBERRA_API_VERSION=3
-        LIBUNIQUE_API_VERSION=3.0
-        ENGINES_FOLDER="theming-engines"
-+       APPINDICATOR_API_VERSION=3
-        ;;
- esac
- AC_SUBST(GTK_API_VERSION)
-@@ -101,7 +105,7 @@ AM_CONDITIONAL(HAVE_LIBCANBERRA_GTK, test "x$CANBERRA_GTK" = "x1")
- AM_CONDITIONAL(HAVE_TYPING_BREAK, test "x$TYPING_BREAK" = xtyping-break)
- 
- dnl app indicator
--APPINDICATOR_REQUIRED=0.0.7
-+APPINDICATOR_PKG=appindicator$APPINDICATOR_API_VERSION-0.1
- 
- AC_ARG_ENABLE(appindicator,
-                         AS_HELP_STRING([--enable-appindicator[=@<:@no/auto/yes@:>@]],[Build support for application indicators ]),
-@@ -109,16 +113,16 @@ AC_ARG_ENABLE(appindicator,
-                         [enable_appindicator="auto"])
- 
- if test x$enable_appindicator = xauto ; then
--        PKG_CHECK_EXISTS([appindicator-0.1 >= $APPINDICATOR_REQUIRED],
-+        PKG_CHECK_EXISTS([$APPINDICATOR_PKG >= $APPINDICATOR_REQUIRED],
-                          enable_appindicator="yes",
-                          enable_appindicator="no")
- fi
- 
- if test x$enable_appindicator = xyes ; then
--        PKG_CHECK_EXISTS([appindicator-0.1 >= $APPINDICATOR_REQUIRED],,
-+        PKG_CHECK_EXISTS([$APPINDICATOR_PKG >= $APPINDICATOR_REQUIRED],,
-                          AC_MSG_ERROR([appindicator-0.1 is not installed]))
-         PKG_CHECK_MODULES(APP_INDICATOR,
--                        appindicator-0.1 >= $APPINDICATOR_REQUIRED)
-+                        $APPINDICATOR_PKG >= $APPINDICATOR_REQUIRED)
-         AC_SUBST(APP_INDICATOR_CFLAGS)
-         AC_SUBST(APP_INDICATOR_LIBS)
-         AC_DEFINE(HAVE_APP_INDICATOR, 1, [Have AppIndicator])
diff --git a/mate-base/mate-control-center/files/mate-control-center-1.6.2-libsecret.patch b/mate-base/mate-control-center/files/mate-control-center-1.6.2-libsecret.patch
deleted file mode 100644
index b66a9af83a6b..000000000000
--- a/mate-base/mate-control-center/files/mate-control-center-1.6.2-libsecret.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/libslab/app-shell.c b/libslab/app-shell.c
-index 3c33230..5f4af23 100644
---- a/libslab/app-shell.c
-+++ b/libslab/app-shell.c
-@@ -987,8 +987,8 @@ static void handle_menu_action_performed (Tile * launcher, TileEvent * event, Ti
- 		return TRUE;
- 	}
- 
--	/* discard mate-keyring-manager if CASA is installed */
--	if ((exec && !strcmp (exec, "mate-keyring-manager"))
-+	/* discard gnome-keyring-manager if CASA is installed */
-+	if ((exec && !strcmp (exec, "gnome-keyring-manager"))
- 		&& (path = g_find_program_in_path ("CASAManager.sh")))
- 	{
- 		g_free (path);
diff --git a/mate-base/mate-control-center/mate-control-center-1.24.1.ebuild b/mate-base/mate-control-center/mate-control-center-1.24.2-r1.ebuild
index d8c9f8a977e8..ed7ab19d5a2b 100644
--- a/mate-base/mate-control-center/mate-control-center-1.24.1.ebuild
+++ b/mate-base/mate-control-center/mate-control-center-1.24.2-r1.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 MATE_LA_PUNT="yes"
 
 inherit mate
 
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 x86"
+if [[ "${PV}" != *9999 ]]; then
+	KEYWORDS="amd64 ~arm ~arm64 ~loong ~riscv x86"
 fi
 
 DESCRIPTION="The MATE Desktop configuration tool"
@@ -18,7 +18,7 @@ SLOT="0"
 IUSE="accountsservice appindicator debug"
 
 COMMON_DEPEND="
-	dev-libs/atk
+	app-accessibility/at-spi2-core:2
 	>=dev-libs/dbus-glib-0.73
 	>=dev-libs/glib-2.50:2
 	dev-libs/libxml2:2
@@ -54,9 +54,7 @@ COMMON_DEPEND="
 
 RDEPEND="${COMMON_DEPEND}"
 
-DEPEND="${COMMON_DEPEND}
-	app-text/rarian
-	>=app-text/scrollkeeper-dtd-1:1.0
+BDEPEND="${COMMON_DEPEND}
 	app-text/yelp-tools
 	dev-libs/libxml2
 	dev-util/desktop-file-utils
diff --git a/mate-base/mate-control-center/mate-control-center-1.24.0.ebuild b/mate-base/mate-control-center/mate-control-center-1.26.0-r1.ebuild
index 0939d6c436a9..d13258671b3b 100644
--- a/mate-base/mate-control-center/mate-control-center-1.24.0.ebuild
+++ b/mate-base/mate-control-center/mate-control-center-1.26.0-r1.ebuild
@@ -1,38 +1,36 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 MATE_LA_PUNT="yes"
 
 inherit mate
 
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+if [[ "${PV}" != *9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
 fi
 
 DESCRIPTION="The MATE Desktop configuration tool"
-LICENSE="GPL-2"
+LICENSE="FDL-1.1+ GPL-2+ LGPL-2+ LGPL-2.1+ HPND"
 SLOT="0"
 
-IUSE="accountsservice appindicator debug"
+IUSE="accountsservice appindicator debug nls"
 
-RDEPEND="
-	dev-libs/atk
-	>=dev-libs/dbus-glib-0.73
+COMMON_DEPEND="
+	app-accessibility/at-spi2-core:2
 	>=dev-libs/glib-2.50:2
 	dev-libs/libxml2:2
 	>=gnome-base/dconf-0.13.4
 	>=gnome-base/librsvg-2.0:2
 	>=mate-base/libmatekbd-1.17.0
-	>=mate-base/mate-desktop-1.21.2
+	>=mate-base/mate-desktop-1.25.0
 	>=mate-base/caja-1.20.0
 	>=mate-base/mate-menus-1.21.0
-	>=mate-base/mate-settings-daemon-1.21.2
 	>=media-libs/fontconfig-1:1.0
 	media-libs/freetype:2
 	media-libs/libcanberra:0[gtk3]
-	>=sys-apps/dbus-1
+	sys-auth/polkit[introspection]
 	x11-apps/xmodmap
 	x11-libs/cairo
 	x11-libs/gdk-pixbuf:2
@@ -46,23 +44,27 @@ RDEPEND="
 	x11-libs/libXrender
 	>=x11-libs/libxklavier-4
 	x11-libs/pango
-	>=x11-wm/marco-1.17.0
+	>=x11-wm/marco-1.17.0:=
 	accountsservice? ( sys-apps/accountsservice )
-	appindicator? ( dev-libs/libappindicator:3 )"
+	appindicator? ( dev-libs/libappindicator:3 )
+"
 
-DEPEND="${RDEPEND}
-	app-text/rarian
-	>=app-text/scrollkeeper-dtd-1:1.0
+RDEPEND="${COMMON_DEPEND}"
+
+BDEPEND="${COMMON_DEPEND}
 	app-text/yelp-tools
+	dev-libs/libxml2
 	dev-util/desktop-file-utils
 	dev-util/glib-utils
-	sys-devel/gettext
+	>=sys-devel/gettext-0.19.8
 	x11-base/xorg-proto
-	virtual/pkgconfig"
+	virtual/pkgconfig
+"
 
 src_configure() {
 	mate_src_configure \
 		--disable-update-mimedb \
 		$(use_enable appindicator) \
+		$(use_enable nls) \
 		$(use_enable debug)
 }
diff --git a/mate-base/mate-control-center/mate-control-center-9999.ebuild b/mate-base/mate-control-center/mate-control-center-9999.ebuild
index e686d34de0c2..d13258671b3b 100644
--- a/mate-base/mate-control-center/mate-control-center-9999.ebuild
+++ b/mate-base/mate-control-center/mate-control-center-9999.ebuild
@@ -1,38 +1,35 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 MATE_LA_PUNT="yes"
 
 inherit mate
 
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+if [[ "${PV}" != *9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
 fi
 
 DESCRIPTION="The MATE Desktop configuration tool"
 LICENSE="FDL-1.1+ GPL-2+ LGPL-2+ LGPL-2.1+ HPND"
 SLOT="0"
 
-IUSE="accountsservice appindicator debug"
+IUSE="accountsservice appindicator debug nls"
 
 COMMON_DEPEND="
-	dev-libs/atk
-	>=dev-libs/dbus-glib-0.73
+	app-accessibility/at-spi2-core:2
 	>=dev-libs/glib-2.50:2
 	dev-libs/libxml2:2
 	>=gnome-base/dconf-0.13.4
 	>=gnome-base/librsvg-2.0:2
 	>=mate-base/libmatekbd-1.17.0
-	>=mate-base/mate-desktop-1.23.2
+	>=mate-base/mate-desktop-1.25.0
 	>=mate-base/caja-1.20.0
 	>=mate-base/mate-menus-1.21.0
-	>=mate-base/mate-settings-daemon-1.23.1
 	>=media-libs/fontconfig-1:1.0
 	media-libs/freetype:2
 	media-libs/libcanberra:0[gtk3]
-	>=sys-apps/dbus-1
 	sys-auth/polkit[introspection]
 	x11-apps/xmodmap
 	x11-libs/cairo
@@ -54,9 +51,7 @@ COMMON_DEPEND="
 
 RDEPEND="${COMMON_DEPEND}"
 
-DEPEND="${COMMON_DEPEND}
-	app-text/rarian
-	>=app-text/scrollkeeper-dtd-1:1.0
+BDEPEND="${COMMON_DEPEND}
 	app-text/yelp-tools
 	dev-libs/libxml2
 	dev-util/desktop-file-utils
@@ -70,5 +65,6 @@ src_configure() {
 	mate_src_configure \
 		--disable-update-mimedb \
 		$(use_enable appindicator) \
+		$(use_enable nls) \
 		$(use_enable debug)
 }
diff --git a/mate-base/mate-desktop/Manifest b/mate-base/mate-desktop/Manifest
index f09e2fd19efb..46357d22ff6c 100644
--- a/mate-base/mate-desktop/Manifest
+++ b/mate-base/mate-desktop/Manifest
@@ -1,8 +1,2 @@
-DIST mate-desktop-1.20.3.tar.xz 937876 BLAKE2B 8b70774c0577a89b36b8c44b3520a5437da7b6216f1437ef2e282c21b692bddb2027ed2e277f7fc2eb641ba8d8d801c5c3797e2d84a4cb7fa5a24bce6859fedb SHA512 126eca6cec6d7d9d672396562bb856a70c7b5fd507dd8629a83e950b2517bd3f900af08cf1a0a61c190fe162104f09991f8bd9f590d629816af5f694942caff1
-DIST mate-desktop-1.22.0.tar.xz 962580 BLAKE2B 0bc3418ab25fd9f30e216a5b845722327449f8d05944c028b4cb967acd6415ca9c3c560856485f34e90752c9a3263ba093e1eb69daaea2586c6371ad4c4ee22f SHA512 3950249c0bc026163da7f38a6fd5551c0e1e863e298e9d2ca224679b6c802d1deaf12e16ea873a2ea0539a7989a523d0495fb0dc4c556857203c0b04ab6edf7a
-DIST mate-desktop-1.22.2.tar.xz 903312 BLAKE2B cadc8ade769d3a85b604ce7807235878d986a7d3bf3f2e05f836c783c3f3983cb760ff33b60b1c2f19538687aa62f5707f5f4eea9fef05d992080821d452783c SHA512 d2e965f9e26e4fe25337a4ef69521239388f38cff25e978331a307591555d8a9ff22d6a19ef3c92cf336c472fbfb231969ef5ac60e3a4c5908a81ded1e5f0f46
-DIST mate-desktop-1.23.2.tar.xz 1141960 BLAKE2B c85edea3ccc1cfad7407df517f2b01e3880324176007aeb7eb64450c4ba6f42c45d546398eab09875632b17b2f0ef43ebcda09c84d1143e7027fbc9aea0f0d98 SHA512 d7cf5830c845b2d8f864ef4f4625903738e54ac7cd014fd82e14e86106fdece4b7c3ad19cc34ea477140b48171d790cec2b5359a4fbd4f8e2212dbee2e77a559
-DIST mate-desktop-1.23.3.tar.xz 1113628 BLAKE2B ea4e1e7d838c7f640eed6d286d85462d539503c536c2394ae6fec0c18f5c6b96bf9d6422ad3e3d95f56d71473dbbe259cb56b65f82482185fbbf5827d1164791 SHA512 4627884452be1ed47d44eab7bfb3d75584fe6c5dcdea603548bd11a446e1bb7ea40e26ec49edb14f35c642af756d4ea992722cbbac64de798b599f3b51f36905
-DIST mate-desktop-1.24.0.tar.xz 1113912 BLAKE2B e5630ae4fe3f6a309d935153069b354a66d9d544bb3c2c7368373134b71a3d177385b157c01845742463ec8c91d0d4df1b39def7202142070221bb3dc7ba505b SHA512 ca60325e7f6167efd21bdd32ae40c2f2bf5ae9bef85f0a43afec05d50567fb650fc0426d94c510b3a42c625dc4b2d31d7559befa50cfbb6d9878635558a52323
 DIST mate-desktop-1.24.1.tar.xz 1115988 BLAKE2B 7dc5595a79d214f1cf947c5ab5372983598bcfc330ebd748d6b9daf10c3134d04150427c6242f754b638377db90d1558067a388e2e8e6a6aaf44a87e44e7a6f3 SHA512 0691dd613946d5d67596d98cd489536f5876cb97fb4c5290133b198479b4bfa3835ca52a16a2d0cc5e863d625aedda83ab01e85d67f58a09763673f0f18ebc5a
 DIST mate-desktop-1.26.0.tar.xz 1189048 BLAKE2B c12f4213d608b09c91b2381632f664f2e234ce6abdd13eb9f8de11d7aa575ca496945a5cc13b3e3a910094503d8572912ee0acfdad928b0be9414473432c894f SHA512 73189cf2d5106fa632ed9272d7ba069ed4ff4b3032d279dce9953e322b487463fca5ffc42af00eed4344cfdecbc9a2f95f1f2ae96386d26c0ad0cfcd0ed226cc
diff --git a/mate-base/mate-desktop/mate-desktop-1.20.3-r1.ebuild b/mate-base/mate-desktop/mate-desktop-1.20.3-r1.ebuild
deleted file mode 100644
index 9e7cab7690de..000000000000
--- a/mate-base/mate-desktop/mate-desktop-1.20.3-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-fi
-
-DESCRIPTION="Libraries for the MATE desktop that are not part of the UI"
-LICENSE="GPL-2 FDL-1.1 LGPL-2"
-SLOT="0"
-
-IUSE="X debug +introspection startup-notification"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.36:2
-	>=gnome-base/dconf-0.13.4:0
-	x11-libs/cairo:0
-	x11-libs/libX11:0
-	>=x11-libs/libXrandr-1.3:0
-	virtual/libintl:0
-	>=x11-libs/gtk+-3.0:3[introspection?]
-	introspection? ( >=dev-libs/gobject-introspection-0.9.7:= )
-	startup-notification? ( >=x11-libs/startup-notification-0.5:0 )"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.40:*
-	sys-devel/gettext:*
-	x11-base/xorg-proto:0
-	virtual/pkgconfig:*"
-
-src_configure() {
-	mate_src_configure \
-		--enable-mate-about \
-		$(use_with X x) \
-		$(use_enable debug) \
-		$(use_enable introspection) \
-		$(use_enable startup-notification)
-}
diff --git a/mate-base/mate-desktop/mate-desktop-1.22.0.ebuild b/mate-base/mate-desktop/mate-desktop-1.22.0.ebuild
deleted file mode 100644
index 5bb00164ee03..000000000000
--- a/mate-base/mate-desktop/mate-desktop-1.22.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-DESCRIPTION="Libraries for the MATE desktop that are not part of the UI"
-LICENSE="GPL-2 FDL-1.1 LGPL-2"
-SLOT="0"
-
-IUSE="X debug +introspection startup-notification"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.50:2
-	>=gnome-base/dconf-0.13.4
-	x11-libs/cairo
-	x11-libs/libX11
-	>=x11-libs/libXrandr-1.3
-	virtual/libintl
-	>=x11-libs/gtk+-3.22:3[introspection?]
-	introspection? ( >=dev-libs/gobject-introspection-0.9.7:= )
-	startup-notification? ( >=x11-libs/startup-notification-0.5:0 )"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/iso-codes
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.40:*
-	sys-devel/gettext:*
-	x11-base/xorg-proto
-	virtual/pkgconfig:*"
-
-src_configure() {
-	mate_src_configure \
-		--enable-mate-about \
-		$(use_with X x) \
-		$(use_enable debug) \
-		$(use_enable introspection) \
-		$(use_enable startup-notification)
-}
diff --git a/mate-base/mate-desktop/mate-desktop-1.22.2.ebuild b/mate-base/mate-desktop/mate-desktop-1.22.2.ebuild
deleted file mode 100644
index 5bb00164ee03..000000000000
--- a/mate-base/mate-desktop/mate-desktop-1.22.2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-DESCRIPTION="Libraries for the MATE desktop that are not part of the UI"
-LICENSE="GPL-2 FDL-1.1 LGPL-2"
-SLOT="0"
-
-IUSE="X debug +introspection startup-notification"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.50:2
-	>=gnome-base/dconf-0.13.4
-	x11-libs/cairo
-	x11-libs/libX11
-	>=x11-libs/libXrandr-1.3
-	virtual/libintl
-	>=x11-libs/gtk+-3.22:3[introspection?]
-	introspection? ( >=dev-libs/gobject-introspection-0.9.7:= )
-	startup-notification? ( >=x11-libs/startup-notification-0.5:0 )"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/iso-codes
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.40:*
-	sys-devel/gettext:*
-	x11-base/xorg-proto
-	virtual/pkgconfig:*"
-
-src_configure() {
-	mate_src_configure \
-		--enable-mate-about \
-		$(use_with X x) \
-		$(use_enable debug) \
-		$(use_enable introspection) \
-		$(use_enable startup-notification)
-}
diff --git a/mate-base/mate-desktop/mate-desktop-1.23.2.ebuild b/mate-base/mate-desktop/mate-desktop-1.23.2.ebuild
deleted file mode 100644
index 5bb00164ee03..000000000000
--- a/mate-base/mate-desktop/mate-desktop-1.23.2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-DESCRIPTION="Libraries for the MATE desktop that are not part of the UI"
-LICENSE="GPL-2 FDL-1.1 LGPL-2"
-SLOT="0"
-
-IUSE="X debug +introspection startup-notification"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.50:2
-	>=gnome-base/dconf-0.13.4
-	x11-libs/cairo
-	x11-libs/libX11
-	>=x11-libs/libXrandr-1.3
-	virtual/libintl
-	>=x11-libs/gtk+-3.22:3[introspection?]
-	introspection? ( >=dev-libs/gobject-introspection-0.9.7:= )
-	startup-notification? ( >=x11-libs/startup-notification-0.5:0 )"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/iso-codes
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.40:*
-	sys-devel/gettext:*
-	x11-base/xorg-proto
-	virtual/pkgconfig:*"
-
-src_configure() {
-	mate_src_configure \
-		--enable-mate-about \
-		$(use_with X x) \
-		$(use_enable debug) \
-		$(use_enable introspection) \
-		$(use_enable startup-notification)
-}
diff --git a/mate-base/mate-desktop/mate-desktop-1.23.3.ebuild b/mate-base/mate-desktop/mate-desktop-1.23.3.ebuild
deleted file mode 100644
index 31b161061fcc..000000000000
--- a/mate-base/mate-desktop/mate-desktop-1.23.3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-fi
-
-DESCRIPTION="Libraries for the MATE desktop that are not part of the UI"
-LICENSE="GPL-2 FDL-1.1 LGPL-2"
-SLOT="0"
-
-IUSE="X debug +introspection startup-notification"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.50:2
-	>=gnome-base/dconf-0.13.4
-	x11-libs/cairo
-	x11-libs/libX11
-	>=x11-libs/libXrandr-1.3
-	>=x11-libs/gtk+-3.22:3[introspection?]
-	introspection? ( >=dev-libs/gobject-introspection-0.9.7:= )
-	startup-notification? ( >=x11-libs/startup-notification-0.5:0 )"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/iso-codes
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	sys-devel/gettext:*
-	x11-base/xorg-proto
-	virtual/pkgconfig:*"
-
-src_configure() {
-	mate_src_configure \
-		--enable-mate-about \
-		$(use_with X x) \
-		$(use_enable debug) \
-		$(use_enable introspection) \
-		$(use_enable startup-notification)
-}
diff --git a/mate-base/mate-desktop/mate-desktop-1.24.0.ebuild b/mate-base/mate-desktop/mate-desktop-1.24.0.ebuild
deleted file mode 100644
index 31b161061fcc..000000000000
--- a/mate-base/mate-desktop/mate-desktop-1.24.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-fi
-
-DESCRIPTION="Libraries for the MATE desktop that are not part of the UI"
-LICENSE="GPL-2 FDL-1.1 LGPL-2"
-SLOT="0"
-
-IUSE="X debug +introspection startup-notification"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.50:2
-	>=gnome-base/dconf-0.13.4
-	x11-libs/cairo
-	x11-libs/libX11
-	>=x11-libs/libXrandr-1.3
-	>=x11-libs/gtk+-3.22:3[introspection?]
-	introspection? ( >=dev-libs/gobject-introspection-0.9.7:= )
-	startup-notification? ( >=x11-libs/startup-notification-0.5:0 )"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/iso-codes
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	sys-devel/gettext:*
-	x11-base/xorg-proto
-	virtual/pkgconfig:*"
-
-src_configure() {
-	mate_src_configure \
-		--enable-mate-about \
-		$(use_with X x) \
-		$(use_enable debug) \
-		$(use_enable introspection) \
-		$(use_enable startup-notification)
-}
diff --git a/mate-base/mate-desktop/mate-desktop-1.24.1.ebuild b/mate-base/mate-desktop/mate-desktop-1.24.1.ebuild
index 655142abce20..142ee16ff579 100644
--- a/mate-base/mate-desktop/mate-desktop-1.24.1.ebuild
+++ b/mate-base/mate-desktop/mate-desktop-1.24.1.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 MATE_LA_PUNT="yes"
 
 inherit mate
 
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 x86"
+if [[ "${PV}" != *9999 ]]; then
+	KEYWORDS="amd64 ~arm ~arm64 ~loong ~riscv x86"
 fi
 
 DESCRIPTION="Libraries for the MATE desktop that are not part of the UI"
@@ -32,17 +32,20 @@ RDEPEND="${COMMON_DEPEND}
 	virtual/libintl
 "
 
-DEPEND="${COMMON_DEPEND}
+BDEPEND="
 	app-text/docbook-xml-dtd:4.1.2
 	app-text/iso-codes
 	dev-util/gtk-doc
 	dev-util/gtk-doc-am
 	>=sys-devel/gettext-0.19.8
-	x11-base/xorg-proto
 	>=x11-libs/gdk-pixbuf-2.36.5
 	virtual/pkgconfig
 "
 
+DEPEND="${COMMON_DEPEND}
+	x11-base/xorg-proto
+"
+
 src_configure() {
 	mate_src_configure \
 		--enable-mate-about \
diff --git a/mate-base/mate-desktop/mate-desktop-1.26.0.ebuild b/mate-base/mate-desktop/mate-desktop-1.26.0-r1.ebuild
index 3314b9818e39..0958226fb4ea 100644
--- a/mate-base/mate-desktop/mate-desktop-1.26.0.ebuild
+++ b/mate-base/mate-desktop/mate-desktop-1.26.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,8 +7,8 @@ MATE_LA_PUNT="yes"
 
 inherit mate
 
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64"
+if [[ "${PV}" != *9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
 fi
 
 DESCRIPTION="Libraries for the MATE desktop that are not part of the UI"
@@ -28,21 +28,22 @@ COMMON_DEPEND="
 	startup-notification? ( >=x11-libs/startup-notification-0.5:0 )
 "
 
-RDEPEND="${COMMON_DEPEND}
-	virtual/libintl
-"
+RDEPEND="${COMMON_DEPEND}"
 
-DEPEND="${COMMON_DEPEND}
+BDEPEND="
 	app-text/docbook-xml-dtd:4.1.2
 	app-text/iso-codes
 	dev-util/gtk-doc
 	dev-util/gtk-doc-am
 	>=sys-devel/gettext-0.19.8
-	x11-base/xorg-proto
 	>=x11-libs/gdk-pixbuf-2.36.5
 	virtual/pkgconfig
 "
 
+DEPEND="${COMMON_DEPEND}
+	x11-base/xorg-proto
+"
+
 src_configure() {
 	mate_src_configure \
 		--enable-mate-about \
diff --git a/mate-base/mate-desktop/mate-desktop-9999.ebuild b/mate-base/mate-desktop/mate-desktop-9999.ebuild
index 13b996530016..0958226fb4ea 100644
--- a/mate-base/mate-desktop/mate-desktop-9999.ebuild
+++ b/mate-base/mate-desktop/mate-desktop-9999.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 MATE_LA_PUNT="yes"
 
 inherit mate
 
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+if [[ "${PV}" != *9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
 fi
 
 DESCRIPTION="Libraries for the MATE desktop that are not part of the UI"
@@ -28,21 +28,22 @@ COMMON_DEPEND="
 	startup-notification? ( >=x11-libs/startup-notification-0.5:0 )
 "
 
-RDEPEND="${COMMON_DEPEND}
-	virtual/libintl
-"
+RDEPEND="${COMMON_DEPEND}"
 
-DEPEND="${COMMON_DEPEND}
+BDEPEND="
 	app-text/docbook-xml-dtd:4.1.2
 	app-text/iso-codes
 	dev-util/gtk-doc
 	dev-util/gtk-doc-am
 	>=sys-devel/gettext-0.19.8
-	x11-base/xorg-proto
 	>=x11-libs/gdk-pixbuf-2.36.5
 	virtual/pkgconfig
 "
 
+DEPEND="${COMMON_DEPEND}
+	x11-base/xorg-proto
+"
+
 src_configure() {
 	mate_src_configure \
 		--enable-mate-about \
diff --git a/mate-base/mate-menus/Manifest b/mate-base/mate-menus/Manifest
index 487994ffa6ba..7e81b8c3b0ce 100644
--- a/mate-base/mate-menus/Manifest
+++ b/mate-base/mate-menus/Manifest
@@ -1,3 +1,2 @@
-DIST mate-menus-1.24.0.tar.xz 404028 BLAKE2B 18bea0a6c21444b0b568564d0c15ba0e231643dfcb9c74d6ab9a08cd57cab2289436dada030397737667f5a51c4ab39ab06fff3f585347ebb5f7afc40957acc0 SHA512 27f8ba0666b08fbcfc3f02a42e4b9f3d3431e3d171be0fe9569f412b2f9ead370fff15833feb920b64d2a067e81354970df2ee1c465f10faa3dbd9c97af20406
 DIST mate-menus-1.24.1.tar.xz 402968 BLAKE2B fb63e3dbffab2725407f03011618fc3698b80be1add349edf86a4bc0a26427bf2a69d696e0accdff16ee3d12b94e5458ef4874efb19c8a25b6c74769448d5374 SHA512 5235d3be31d30f8aeaf9b2da0f8fe8dc586e07ae0dcbc3da88a4f04181277a9dec9414dee9c255023b1ebd406f8b131197e3f526f9bac14eeb23d8014cfd22cb
 DIST mate-menus-1.26.0.tar.xz 410900 BLAKE2B 71ebc400ffd2217362485d80a8ddd3717ccb950ece7a7e7f9df971ecd5cffd3d456a678dc3bd3a958e90c4f99e234f8557600110efb813274bbc508a4745d9c2 SHA512 01d0b4f111c445df363baa8e24c87e63e12e6c84c1ccdac4b05bc12a3e3edba6be14651c6b2b34e05271fa35c57f237d79bdbee6dde1699273047519022a636c
diff --git a/mate-base/mate-menus/files/10-xdg-menu-mate b/mate-base/mate-menus/files/10-xdg-menu-mate
deleted file mode 100644
index 06a6a91368e2..000000000000
--- a/mate-base/mate-menus/files/10-xdg-menu-mate
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-if [ -z "$XDG_MENU_PREFIX" ] && [ "$DESKTOP_SESSION" = "mate" ]
-then
-	export XDG_MENU_PREFIX=mate-
-fi
diff --git a/mate-base/mate-menus/mate-menus-1.24.0.ebuild b/mate-base/mate-menus/mate-menus-1.24.0.ebuild
deleted file mode 100644
index f66ce50b1da1..000000000000
--- a/mate-base/mate-menus/mate-menus-1.24.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-GNOME2_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-fi
-
-DESCRIPTION="MATE menu system, implementing the F.D.O cross-desktop spec"
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-
-IUSE="debug +introspection"
-
-COMMON_DEPEND=">=dev-libs/glib-2.50:2
-	virtual/libintl
-	introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.40
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-src_configure() {
-	# Do NOT compile with --disable-debug/--enable-debug=no as it disables API
-	# usage checks.
-	mate_src_configure \
-		--enable-debug=$(usex debug yes minimum) \
-		$(use_enable introspection)
-}
-
-src_install() {
-	mate_src_install
-
-	exeinto /etc/X11/xinit/xinitrc.d/
-	doexe "${FILESDIR}/10-xdg-menu-mate"
-}
diff --git a/mate-base/mate-menus/mate-menus-1.24.1.ebuild b/mate-base/mate-menus/mate-menus-1.24.1.ebuild
index ed9f6bcd2da6..0a198574b991 100644
--- a/mate-base/mate-menus/mate-menus-1.24.1.ebuild
+++ b/mate-base/mate-menus/mate-menus-1.24.1.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 GNOME2_LA_PUNT="yes"
 
 inherit mate
 
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 x86"
+if [[ "${PV}" != *9999 ]]; then
+	KEYWORDS="amd64 ~arm ~arm64 ~loong ~riscv x86"
 fi
 
 DESCRIPTION="MATE menu system, implementing the F.D.O cross-desktop spec"
@@ -23,10 +23,11 @@ COMMON_DEPEND=">=dev-libs/glib-2.50:2
 
 RDEPEND="${COMMON_DEPEND}"
 
-DEPEND="${COMMON_DEPEND}
+BDEPEND="
 	>=sys-devel/gettext-0.19.8
 	virtual/pkgconfig
 "
+DEPEND="${COMMON_DEPEND}"
 
 src_configure() {
 	# Do NOT compile with --disable-debug/--enable-debug=no as it disables API
diff --git a/mate-base/mate-menus/mate-menus-1.26.0.ebuild b/mate-base/mate-menus/mate-menus-1.26.0.ebuild
index 89e98b8b6bc4..2ab582311b5d 100644
--- a/mate-base/mate-menus/mate-menus-1.26.0.ebuild
+++ b/mate-base/mate-menus/mate-menus-1.26.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,8 +7,8 @@ GNOME2_LA_PUNT="yes"
 
 inherit mate
 
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64"
+if [[ "${PV}" != *9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
 fi
 
 DESCRIPTION="MATE menu system, implementing the F.D.O cross-desktop spec"
@@ -23,10 +23,11 @@ COMMON_DEPEND=">=dev-libs/glib-2.50:2
 
 RDEPEND="${COMMON_DEPEND}"
 
-DEPEND="${COMMON_DEPEND}
+BDEPEND="
 	>=sys-devel/gettext-0.19.8
 	virtual/pkgconfig
 "
+DEPEND="${COMMON_DEPEND}"
 
 src_configure() {
 	# Do NOT compile with --disable-debug/--enable-debug=no as it disables API
diff --git a/mate-base/mate-panel/Manifest b/mate-base/mate-panel/Manifest
index b91775c003cf..78c75e3db93a 100644
--- a/mate-base/mate-panel/Manifest
+++ b/mate-base/mate-panel/Manifest
@@ -1,6 +1,2 @@
-DIST mate-panel-1.24.0.tar.xz 3040068 BLAKE2B 2ef2973014e32ab62ba9d4a05a820a2640415b493886d74e09089ed91bfe61d2d53ee6313c104945ddc95c992423403f6bca72a7f8b80ce189cd9f247add931c SHA512 12a88534400603998b4d4d415940947dd6372914135aa8eb6052c75e134412739a96064ad654e8f2625dbb6fe853e8cb376c41e530c30234e08141a46634820b
-DIST mate-panel-1.24.1.tar.xz 3265000 BLAKE2B eb5d2c8b6668ecb1d072e80ac4062574c97b7d52a1473133efff0fb12eca4e765df016d8ede4c6745f7bd9e6ea64114ccfcdf87045ca00797e63ab9ec215435c SHA512 1a1e62207d58472daa00d409ef2b04944929af7f9fe05592076adcc069e2d70012424b3386d30f8b9adccf05c328b8ab1662b8726e507465881a4ae26c26829f
 DIST mate-panel-1.24.2.tar.xz 3271432 BLAKE2B ca866ae2ba743d5871f75ba8840f05b556d77bcfb9263542f5e945310ebbaccdb211a266c3235ab706c70209740cd4a8a9f390363ddf18fc305ffd875723974d SHA512 6dd7b1329fc51389ad6213b5490fd44f8db7b76d17c1fa8f24b197390e9f24d4090fc7c439b7cc9c94be76f6b896ac31e69e920e903c067e297f941c844a1280
-DIST mate-panel-1.26.0.tar.xz 3303980 BLAKE2B b36ddb6d4db174bd26986193829e72e498f81e31d129aa0e64ef3927b3571b58c3bb940a1d3c4ceb14165d5d7810d812a3b39dd2ea7aad4bd9cdaf4dae84751e SHA512 394cf6a4a081980d286a03488370a5335dca681964271329b28d7254fc877457bc42883c95ad9f197a319f1bef71e237052d64b98606df616f5e11b9f9ae5f31
-DIST mate-panel-1.26.1.tar.xz 3309564 BLAKE2B 6afdd73abdb1f6224faaf6f868343dec8e02da475a340b3698daf535a1f1d488e3357edad70fd43ceb6a868f2deb7a2f7f7c127e6414c9f52e5d68a45a6fdc66 SHA512 54b0a98fe7840cfa84a47dbeea1778a603bdf0ddf18d0d7cf5e5239e707e4dd76006d651ae6a0b25fccf70c722da1e646dbb6535efe1333ea592e7c8998fc72d
 DIST mate-panel-1.26.2.tar.xz 3314092 BLAKE2B 6b33562728b7ffa3bc1c5a3341e2bd4b88c5daba504e6818810f194d8a6f736ac5b5936ed10c17ad5879eaa7a3e7f2a7d0dad6e59e7582d684f9bcdbb8421ddf SHA512 31f97b5cbacd5ac4a3661fdb8544313e5fb406489c9179d98c0f981001beae97890f3563bbf5886c451cf27db7235bfe70d40bf2582bc2e2206dadd396432ec7
diff --git a/mate-base/mate-panel/mate-panel-1.24.0-r2.ebuild b/mate-base/mate-panel/mate-panel-1.24.0-r2.ebuild
deleted file mode 100644
index b92c36425c67..000000000000
--- a/mate-base/mate-panel/mate-panel-1.24.0-r2.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-DESCRIPTION="The MATE panel"
-LICENSE="FDL-1.1+ GPL-2+ LGPL-2+"
-SLOT="0"
-
-IUSE="X +introspection wayland"
-
-REQUIRED_USE="|| ( X wayland )"
-
-COMMON_DEPEND="
-	dev-libs/atk
-	>=dev-libs/dbus-glib-0.80:0
-	>=dev-libs/glib-2.50:2
-	>=dev-libs/libmateweather-1.17.0
-	dev-libs/libxml2:2
-	>=gnome-base/dconf-0.13.4
-	>=gnome-base/librsvg-2.36.2:2
-	>=mate-base/mate-desktop-1.17.0
-	>=mate-base/mate-menus-1.21.0
-	>=sys-apps/dbus-1.1.2
-	>=x11-libs/cairo-1.0.0[X?]
-	>=x11-libs/gdk-pixbuf-2.25.2:2
-	>=x11-libs/gtk+-3.22:3[introspection?]
-	x11-libs/libICE
-	x11-libs/libSM
-	>=x11-libs/libwnck-3.4.6:3[introspection?]
-	>=x11-libs/pango-1.15.4:0[introspection?]
-	X? (
-		x11-libs/libX11
-		x11-libs/libXau
-		>=x11-libs/libXrandr-1.3
-	)
-	introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
-	wayland? ( gui-libs/gtk-layer-shell )"
-
-RDEPEND="${COMMON_DEPEND}
-	virtual/libintl
-"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/yelp-tools
-	>=dev-lang/perl-5:=
-	dev-util/glib-utils
-	dev-util/gdbus-codegen
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=sys-devel/gettext-0.19.8:*
-	virtual/pkgconfig"
-
-src_configure() {
-	mate_src_configure \
-		--disable-static \
-		--libexecdir=/usr/libexec/mate-applets \
-		--disable-deprecation-flags \
-		$(use_enable X x11) \
-		$(use_enable introspection) \
-		$(use_enable wayland)
-}
diff --git a/mate-base/mate-panel/mate-panel-1.24.1.ebuild b/mate-base/mate-panel/mate-panel-1.24.2-r1.ebuild
index ca07c1ae124f..6562cb639b1d 100644
--- a/mate-base/mate-panel/mate-panel-1.24.1.ebuild
+++ b/mate-base/mate-panel/mate-panel-1.24.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ MATE_LA_PUNT="yes"
 inherit mate
 
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~loong ~riscv x86"
 fi
 
 DESCRIPTION="The MATE panel"
@@ -20,7 +20,10 @@ IUSE="X +introspection wayland"
 REQUIRED_USE="|| ( X wayland )"
 
 COMMON_DEPEND="
-	dev-libs/atk
+	|| (
+		>=app-accessibility/at-spi2-core-2.46.0:2
+		dev-libs/atk
+	)
 	>=dev-libs/dbus-glib-0.80:0
 	>=dev-libs/glib-2.50:2
 	>=dev-libs/libmateweather-1.17.0
diff --git a/mate-base/mate-panel/mate-panel-1.24.2.ebuild b/mate-base/mate-panel/mate-panel-1.24.2-r2.ebuild
index c715fb2b1086..7ecaf0f74028 100644
--- a/mate-base/mate-panel/mate-panel-1.24.2.ebuild
+++ b/mate-base/mate-panel/mate-panel-1.24.2-r2.ebuild
@@ -1,26 +1,26 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 MATE_LA_PUNT="yes"
 
 inherit mate
 
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+if [[ "${PV}" != *9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
 fi
 
 DESCRIPTION="The MATE panel"
 LICENSE="FDL-1.1+ GPL-2+ LGPL-2+"
 SLOT="0"
 
-IUSE="X +introspection wayland"
+IUSE="+X +introspection wayland"
 
 REQUIRED_USE="|| ( X wayland )"
 
 COMMON_DEPEND="
-	dev-libs/atk
+	app-accessibility/at-spi2-core:2
 	>=dev-libs/dbus-glib-0.80:0
 	>=dev-libs/glib-2.50:2
 	>=dev-libs/libmateweather-1.17.0
@@ -50,7 +50,9 @@ RDEPEND="${COMMON_DEPEND}
 	virtual/libintl
 "
 
-DEPEND="${COMMON_DEPEND}
+DEPEND="${COMMON_DEPEND}"
+
+BDEPEND="
 	app-text/docbook-xml-dtd:4.1.2
 	app-text/yelp-tools
 	>=dev-lang/perl-5:=
diff --git a/mate-base/mate-panel/mate-panel-1.26.0.ebuild b/mate-base/mate-panel/mate-panel-1.26.0.ebuild
deleted file mode 100644
index 00fd5804e58f..000000000000
--- a/mate-base/mate-panel/mate-panel-1.26.0.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MATE_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="The MATE panel"
-LICENSE="FDL-1.1+ GPL-2+ LGPL-2+"
-SLOT="0"
-
-IUSE="X +introspection wayland"
-
-REQUIRED_USE="|| ( X wayland )"
-
-COMMON_DEPEND="
-	dev-libs/atk
-	>=dev-libs/glib-2.50:2
-	>=dev-libs/libmateweather-1.17.0
-	dev-libs/libxml2:2
-	>=gnome-base/dconf-0.13.4
-	>=mate-base/mate-desktop-1.17.0
-	>=mate-base/mate-menus-1.21.0
-	>=sys-apps/dbus-1.1.2
-	>=x11-libs/cairo-1.0.0[X?]
-	>=x11-libs/gdk-pixbuf-2.26.0:2
-	>=x11-libs/gtk+-3.22:3[introspection?]
-	x11-libs/libICE
-	x11-libs/libSM
-	>=x11-libs/libwnck-3.4.6:3[introspection?]
-	>=x11-libs/pango-1.15.4:0[introspection?]
-	X? (
-		x11-libs/libX11
-		x11-libs/libXau
-		>=x11-libs/libXrandr-1.3
-	)
-	introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
-	wayland? ( gui-libs/gtk-layer-shell )
-"
-
-RDEPEND="${COMMON_DEPEND}
-	virtual/libintl
-"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/yelp-tools
-	>=dev-lang/perl-5:=
-	dev-util/glib-utils
-	dev-util/gdbus-codegen
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-src_configure() {
-	mate_src_configure \
-		--libexecdir=/usr/libexec/mate-applets \
-		--disable-deprecation-flags \
-		$(use_enable X x11) \
-		$(use_enable introspection) \
-		$(use_enable wayland)
-}
diff --git a/mate-base/mate-panel/mate-panel-1.26.1.ebuild b/mate-base/mate-panel/mate-panel-1.26.2-r1.ebuild
index 00fd5804e58f..becb88a6353a 100644
--- a/mate-base/mate-panel/mate-panel-1.26.1.ebuild
+++ b/mate-base/mate-panel/mate-panel-1.26.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,20 +7,20 @@ MATE_LA_PUNT="yes"
 
 inherit mate
 
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64"
+if [[ "${PV}" != *9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
 fi
 
 DESCRIPTION="The MATE panel"
 LICENSE="FDL-1.1+ GPL-2+ LGPL-2+"
 SLOT="0"
 
-IUSE="X +introspection wayland"
+IUSE="+X +introspection wayland"
 
 REQUIRED_USE="|| ( X wayland )"
 
 COMMON_DEPEND="
-	dev-libs/atk
+	app-accessibility/at-spi2-core:2
 	>=dev-libs/glib-2.50:2
 	>=dev-libs/libmateweather-1.17.0
 	dev-libs/libxml2:2
@@ -48,7 +48,9 @@ RDEPEND="${COMMON_DEPEND}
 	virtual/libintl
 "
 
-DEPEND="${COMMON_DEPEND}
+DEPEND="${COMMON_DEPEND}"
+
+BDEPEND="
 	app-text/docbook-xml-dtd:4.1.2
 	app-text/yelp-tools
 	>=dev-lang/perl-5:=
diff --git a/mate-base/mate-panel/mate-panel-9999.ebuild b/mate-base/mate-panel/mate-panel-9999.ebuild
index 988e887a91f6..becb88a6353a 100644
--- a/mate-base/mate-panel/mate-panel-9999.ebuild
+++ b/mate-base/mate-panel/mate-panel-9999.ebuild
@@ -1,36 +1,35 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 MATE_LA_PUNT="yes"
 
 inherit mate
 
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+if [[ "${PV}" != *9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
 fi
 
 DESCRIPTION="The MATE panel"
 LICENSE="FDL-1.1+ GPL-2+ LGPL-2+"
 SLOT="0"
 
-IUSE="X +introspection wayland"
+IUSE="+X +introspection wayland"
 
 REQUIRED_USE="|| ( X wayland )"
 
 COMMON_DEPEND="
-	dev-libs/atk
+	app-accessibility/at-spi2-core:2
 	>=dev-libs/glib-2.50:2
 	>=dev-libs/libmateweather-1.17.0
 	dev-libs/libxml2:2
 	>=gnome-base/dconf-0.13.4
-	>=gnome-base/librsvg-2.36.2:2
 	>=mate-base/mate-desktop-1.17.0
 	>=mate-base/mate-menus-1.21.0
 	>=sys-apps/dbus-1.1.2
 	>=x11-libs/cairo-1.0.0[X?]
-	>=x11-libs/gdk-pixbuf-2.25.2:2
+	>=x11-libs/gdk-pixbuf-2.26.0:2
 	>=x11-libs/gtk+-3.22:3[introspection?]
 	x11-libs/libICE
 	x11-libs/libSM
@@ -49,7 +48,9 @@ RDEPEND="${COMMON_DEPEND}
 	virtual/libintl
 "
 
-DEPEND="${COMMON_DEPEND}
+DEPEND="${COMMON_DEPEND}"
+
+BDEPEND="
 	app-text/docbook-xml-dtd:4.1.2
 	app-text/yelp-tools
 	>=dev-lang/perl-5:=
diff --git a/mate-base/mate-session-manager/Manifest b/mate-base/mate-session-manager/Manifest
index 4c38e19e1bb3..a7678a5ae5d8 100644
--- a/mate-base/mate-session-manager/Manifest
+++ b/mate-base/mate-session-manager/Manifest
@@ -1,3 +1,2 @@
-DIST mate-session-manager-1.24.1.tar.xz 711188 BLAKE2B a2d48b53fbff6f2bf56cdf24efb709a17458341c75a37ab7494fcf344064b64f50e9527f11d74b681d2156508e24fefdb7a5c7637b72deddf1f3a82e4096031b SHA512 ca561e13080ef334a69f18b3aec0993532381ea5c178a0acf969bf2ed9cb5d484626404ab43d809727d8eef9b5eda29adc224168290f78a63da2621ac7ef79f5
 DIST mate-session-manager-1.24.3.tar.xz 713004 BLAKE2B d4968db81b1dee53fb70f68c8bf55f22ec65787d6be57d507db90dfe39bb52c0d0e0add2bc30cc66dd00d9676d8c38d8c637e16cb63f0733525141e9d70724cb SHA512 ea43caa350e5f3abda65001829fa7b84d043a7e8851ff74d1d09671f868b3f0be37ae951acca84f1764b26ec9b187c56791010f1b48bd8195ff8dbd70635446f
 DIST mate-session-manager-1.26.0.tar.xz 719572 BLAKE2B 17a575e6f5f610e64901f77cb21cc3031f84462fbb01d97d43432efe805fe11f61843c55db3bf33117847f41ab830a239c6646c48589c73089e72325c7b5c637 SHA512 ee5bcdc91d0adc47274dc835ecd9fcdf7ae77c15ed8f0b38e705089ec83142d433afd927fa9d9c70e10f6c4068fdb1b62f0aa04c94c766b4b738a1aa9f2e0585
diff --git a/mate-base/mate-session-manager/files/10-user-dirs-update-mate b/mate-base/mate-session-manager/files/10-user-dirs-update-mate
deleted file mode 100644
index 35973aae2447..000000000000
--- a/mate-base/mate-session-manager/files/10-user-dirs-update-mate
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-# Create various XDG directories, and write ~/.config/user-dirs.dirs, etc.
-# That file is read by glib to get XDG_PICTURES_DIR, etc
-
-if [ "$DESKTOP_SESSION" = "mate" ]; then
-	if type xdg-user-dirs-update >/dev/null 2>&1; then
-		xdg-user-dirs-update
-	fi
-fi
diff --git a/mate-base/mate-session-manager/files/15-xdg-data-mate b/mate-base/mate-session-manager/files/15-xdg-data-mate
deleted file mode 100644
index df360cf85fdd..000000000000
--- a/mate-base/mate-session-manager/files/15-xdg-data-mate
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-if [ "$DESKTOP_SESSION" = "mate" ]; then
-	if [ -z "$XDG_DATA_DIRS" ]; then
-		export XDG_DATA_DIRS=/usr/share/mate:/usr/local/share/:/usr/share/
-	else
-		export XDG_DATA_DIRS=/usr/share/mate:"$XDG_DATA_DIRS"
-	fi
-fi
diff --git a/mate-base/mate-session-manager/mate-session-manager-1.24.3-r1.ebuild b/mate-base/mate-session-manager/mate-session-manager-1.24.3-r1.ebuild
index 8f408cfa4118..76914c1dc939 100644
--- a/mate-base/mate-session-manager/mate-session-manager-1.24.3-r1.ebuild
+++ b/mate-base/mate-session-manager/mate-session-manager-1.24.3-r1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit mate
 
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+if [[ "${PV}" != *9999 ]]; then
+	KEYWORDS="amd64 ~arm ~arm64 ~loong ~riscv x86"
 fi
 
 DESCRIPTION="MATE session manager"
@@ -50,11 +50,12 @@ RDEPEND="${COMMON_DEPEND}
 	x11-misc/xdg-user-dirs
 	x11-misc/xdg-user-dirs-gtk
 	gnome-keyring? ( gnome-base/gnome-keyring )
-	!<gnome-base/gdm-2.20.4
 "
 
 DEPEND="${COMMON_DEPEND}
 	>=dev-lang/perl-5
+"
+BDEPEND="
 	dev-util/glib-utils
 	>=sys-devel/gettext-0.19.8
 	virtual/pkgconfig
diff --git a/mate-base/mate-session-manager/mate-session-manager-1.24.3-r2.ebuild b/mate-base/mate-session-manager/mate-session-manager-1.24.3-r2.ebuild
new file mode 100644
index 000000000000..b2192185ca5b
--- /dev/null
+++ b/mate-base/mate-session-manager/mate-session-manager-1.24.3-r2.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit mate
+
+if [[ "${PV}" != *9999 ]]; then
+	KEYWORDS="amd64 ~arm ~arm64 ~loong ~riscv x86"
+fi
+
+DESCRIPTION="MATE session manager"
+HOMEPAGE="https://mate-desktop.org/"
+
+LICENSE="GPL-2+ GPL-3+ HPND LGPL-2+ LGPL-2.1+"
+SLOT="0"
+IUSE="debug +elogind gles2 gnome-keyring systemd +xtrans"
+
+REQUIRED_USE="^^ ( elogind systemd )"
+
+# x11-misc/xdg-user-dirs{,-gtk} are needed to create the various XDG_*_DIRs, and
+# create .config/user-dirs.dirs which is read by glib to get G_USER_DIRECTORY_*
+# xdg-user-dirs-update is run during login (see 10-user-dirs-update-gnome below).
+
+COMMON_DEPEND="
+	>=dev-libs/dbus-glib-0.76
+	>=dev-libs/glib-2.50:2
+	dev-libs/libxslt
+	sys-apps/dbus
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.22:3
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libXext
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/pango
+	gles2? ( media-libs/mesa[egl(+),gles2] )
+	systemd? ( sys-apps/systemd )
+	elogind? ( sys-auth/elogind )
+	xtrans? ( x11-libs/xtrans )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	mate-base/mate-desktop
+	virtual/libintl
+	x11-apps/xdpyinfo
+	x11-misc/xdg-user-dirs
+	x11-misc/xdg-user-dirs-gtk
+	gnome-keyring? ( gnome-base/gnome-keyring )
+"
+
+DEPEND="${COMMON_DEPEND}
+	>=dev-lang/perl-5
+"
+BDEPEND="
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+MATE_FORCE_AUTORECONF=true
+
+src_configure() {
+	mate_src_configure \
+		--enable-ipv6 \
+		$(use_with elogind) \
+		$(use_with gles2 libglesv2) \
+		$(use_with systemd) \
+		$(use_with xtrans)  \
+		$(use_enable debug)
+}
+
+src_install() {
+	mate_src_install
+
+	exeinto /etc/X11/Sessions/
+	doexe "${FILESDIR}"/MATE
+
+	insinto /usr/share/mate/applications/
+	doins "${FILESDIR}"/defaults.list
+
+	exeinto /etc/X11/xinit/xinitrc.d/
+	newexe "${FILESDIR}"/15-xdg-data-mate-r2 15-xdg-data-mate
+
+	# This should be done in MATE too, see Gentoo bug #270852
+	newexe "${FILESDIR}"/10-user-dirs-update-mate-r2 10-user-dirs-update-mate
+}
diff --git a/mate-base/mate-session-manager/mate-session-manager-1.26.0-r1.ebuild b/mate-base/mate-session-manager/mate-session-manager-1.26.0-r1.ebuild
index d6d18ede0b5a..5ebcf8f1d7b4 100644
--- a/mate-base/mate-session-manager/mate-session-manager-1.26.0-r1.ebuild
+++ b/mate-base/mate-session-manager/mate-session-manager-1.26.0-r1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 inherit mate
 
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64"
+if [[ "${PV}" != *9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
 fi
 
 DESCRIPTION="MATE session manager"
@@ -50,11 +50,12 @@ RDEPEND="${COMMON_DEPEND}
 	x11-misc/xdg-user-dirs
 	x11-misc/xdg-user-dirs-gtk
 	gnome-keyring? ( gnome-base/gnome-keyring )
-	!<gnome-base/gdm-2.20.4
 "
 
 DEPEND="${COMMON_DEPEND}
 	>=dev-lang/perl-5
+"
+BDEPEND="
 	dev-util/glib-utils
 	>=sys-devel/gettext-0.19.8
 	virtual/pkgconfig
diff --git a/mate-base/mate-session-manager/mate-session-manager-1.24.1-r1.ebuild b/mate-base/mate-session-manager/mate-session-manager-1.26.0-r2.ebuild
index 4b6b7dc7abb9..11bed5d99c1a 100644
--- a/mate-base/mate-session-manager/mate-session-manager-1.24.1-r1.ebuild
+++ b/mate-base/mate-session-manager/mate-session-manager-1.26.0-r2.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit mate
 
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 x86"
+if [[ "${PV}" != *9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
 fi
 
 DESCRIPTION="MATE session manager"
@@ -14,7 +14,7 @@ HOMEPAGE="https://mate-desktop.org/"
 
 LICENSE="GPL-2+ GPL-3+ HPND LGPL-2+ LGPL-2.1+"
 SLOT="0"
-IUSE="debug elogind gles2 gnome-keyring ipv6 systemd +xtrans"
+IUSE="debug +elogind gles2 gnome-keyring nls systemd +xtrans"
 
 REQUIRED_USE="^^ ( elogind systemd )"
 
@@ -50,11 +50,12 @@ RDEPEND="${COMMON_DEPEND}
 	x11-misc/xdg-user-dirs
 	x11-misc/xdg-user-dirs-gtk
 	gnome-keyring? ( gnome-base/gnome-keyring )
-	!<gnome-base/gdm-2.20.4
 "
 
 DEPEND="${COMMON_DEPEND}
 	>=dev-lang/perl-5
+"
+BDEPEND="
 	dev-util/glib-utils
 	>=sys-devel/gettext-0.19.8
 	virtual/pkgconfig
@@ -64,12 +65,13 @@ MATE_FORCE_AUTORECONF=true
 
 src_configure() {
 	mate_src_configure \
+		--enable-ipv6 \
 		$(use_with elogind) \
 		$(use_with gles2 libglesv2) \
 		$(use_with systemd) \
 		$(use_with xtrans)  \
 		$(use_enable debug) \
-		$(use_enable ipv6)
+		$(use_enable nls)
 }
 
 src_install() {
diff --git a/mate-base/mate-session-manager/mate-session-manager-9999.ebuild b/mate-base/mate-session-manager/mate-session-manager-9999.ebuild
index 8f408cfa4118..53ade7914ebb 100644
--- a/mate-base/mate-session-manager/mate-session-manager-9999.ebuild
+++ b/mate-base/mate-session-manager/mate-session-manager-9999.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit mate
 
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+if [[ "${PV}" != *9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
 fi
 
 DESCRIPTION="MATE session manager"
@@ -14,7 +14,7 @@ HOMEPAGE="https://mate-desktop.org/"
 
 LICENSE="GPL-2+ GPL-3+ HPND LGPL-2+ LGPL-2.1+"
 SLOT="0"
-IUSE="debug elogind gles2 gnome-keyring ipv6 systemd +xtrans"
+IUSE="debug elogind gles2 gnome-keyring nls systemd +xtrans"
 
 REQUIRED_USE="^^ ( elogind systemd )"
 
@@ -50,11 +50,12 @@ RDEPEND="${COMMON_DEPEND}
 	x11-misc/xdg-user-dirs
 	x11-misc/xdg-user-dirs-gtk
 	gnome-keyring? ( gnome-base/gnome-keyring )
-	!<gnome-base/gdm-2.20.4
 "
 
 DEPEND="${COMMON_DEPEND}
 	>=dev-lang/perl-5
+"
+BDEPEND="
 	dev-util/glib-utils
 	>=sys-devel/gettext-0.19.8
 	virtual/pkgconfig
@@ -64,12 +65,13 @@ MATE_FORCE_AUTORECONF=true
 
 src_configure() {
 	mate_src_configure \
+		--enable-ipv6 \
 		$(use_with elogind) \
 		$(use_with gles2 libglesv2) \
 		$(use_with systemd) \
 		$(use_with xtrans)  \
 		$(use_enable debug) \
-		$(use_enable ipv6)
+		$(use_enable nls)
 }
 
 src_install() {
diff --git a/mate-base/mate-settings-daemon/Manifest b/mate-base/mate-settings-daemon/Manifest
index f69972e3dc76..f4df8e43c410 100644
--- a/mate-base/mate-settings-daemon/Manifest
+++ b/mate-base/mate-settings-daemon/Manifest
@@ -1,9 +1,2 @@
-DIST mate-settings-daemon-1.20.3.tar.xz 798016 BLAKE2B 21d3138c929991497491a1dce898c81112ec121fb1b6105a51e72260848a9d5674511d9d9433806df16162ca8bc302a010f3acce9549fe551e7529a8c4064d0e SHA512 5c13e5f525658f11762c4843e6cbbf01e6cab9c496d93d7b27914a22c0e2a00654f38f42c29f5c256dee03548ec3af8c1adab95f40ebe37cbb9c917a540261aa
-DIST mate-settings-daemon-1.22.0.tar.xz 810696 BLAKE2B 4b61441a96c3a5c59616f963b2356f418ccc81ca21ef1f3834a777f92779986afc114086ef16f42f69441031b24abb6e727a7326ae6209cb01545ae3359ca1da SHA512 e8fa2ba07195dd66a94312909be37abe67089c7a687afee3bfde5860a598e84481949c9cdc7408886f90776556b41d5574bd6efc0614ed7583908214d59c6cb5
-DIST mate-settings-daemon-1.22.1.tar.xz 766556 BLAKE2B 5e0eeb497795eae666adbe046acf0594f0da0f8c4583d0933541a45e0eb6ece3662ac408385ff21cc2db4f566fce4aa3685e8e0aee2d2ab1e9f22e0cf12ad24b SHA512 9a7d9d81f18e2603c45fab223b3341df1939ee92b0e2db00f0ca5c095a88511c67b33d668b951b1a8f93c81c1e801bfd35729e64fab8bf2962af1e443d8448b6
-DIST mate-settings-daemon-1.23.2.tar.xz 800696 BLAKE2B 7d6c7d2012a27af42c9c94b5e7c58c77c28a24dfdc319e6ce6c1ceec994acc743266a151e10b1e58512d1bcee971500917c7a65e65f124efccf3a166f376f3d8 SHA512 9421234c448abe7ca76f6e2d86f8c15b87c02fc8e85540164174afffa641205f9c9b9b1d1778d75634463fc70c2a089db07d7c2d0a57cd5d1dfa7aa61f904725
-DIST mate-settings-daemon-1.23.3.tar.xz 1025920 BLAKE2B 97610573b9f87966f3f838c06cd785ba2dbf22c11707fd8b09a8914798d6e742f87f7d331db6a39db7802a4eb4d831d364e61ff0d2a5085546c7264f92143688 SHA512 a724f581d739e215d1feabb06a483429788541be7c977e0386110ac29914a3ae229c36eba1b6fa3b9a06cd197c93b3150a3014dafabac34df5939fd559d9b274
-DIST mate-settings-daemon-1.24.0.tar.xz 1026248 BLAKE2B 134ad9c23488ae4a9619e5d9d4465bd3f2cbbacbd3b3e78924c3adcc95a88a8499c24b1c7bd844994b67517407c08c6bf22471597ad9311a4ae04cd7c96996fc SHA512 897d3540930ac407d802c9ecd1995e9bfee14eafadbbfad64aab1e7d93c9830111ac991d8f0df37e34efaa3f7cae9d59ee4d786b15acf0b87b8ba5d299bc1cc1
-DIST mate-settings-daemon-1.24.1.tar.xz 1033680 BLAKE2B ea8b3b277e97b9aa177eda711e1ccd507a5c9c1dded6f6b8812512c0b90469a0af256b1de1d12bffd7933b0a7b3a41f2e547cd7f830086929e41927d2e9c9ec3 SHA512 3a13a853bf2991f219f91398c31fda4aa3002fe5f5a4497c0e2097d2e8a812eb82bd1e4e1661d7b29061f185e74388f744bb37a0430d38bff63ddce6fe4d0bdd
 DIST mate-settings-daemon-1.24.2.tar.xz 1053556 BLAKE2B 94c28e1b88d36972f694858a01840747514be2d40789804719bca8cfcbd62a1f1434fca8b35569607813adc0d0ece6e547c1bed042ab66fea516c150c11343bb SHA512 421848dbfd75613df73003c7520cb7c1895ef55c85773c9b7d72e5f7361bf78d7221f86ecd2d2460b10950d77818a9ddc19569aaa2749f2bee1d3245c09805f8
 DIST mate-settings-daemon-1.26.0.tar.xz 1096588 BLAKE2B 49bc951a404375132d90488f2939f587a2beb27f153de7e14d48529e572155925b5dea2e52e0babb01209d67832313011cfd496b060eec6c9250b101250247d9 SHA512 a044d60b2ee00ea99aa29f23990942a37849ddc8cf80e1b8cd6ba12ec92a27a4e602f19586b86a0a7af067e93f71971acd6850ab5f9bc7ce451cd07518fefb91
diff --git a/mate-base/mate-settings-daemon/files/mate-settings-daemon-1.2.0-syndaemon-mode.patch b/mate-base/mate-settings-daemon/files/mate-settings-daemon-1.2.0-syndaemon-mode.patch
deleted file mode 100644
index a03571a03d0b..000000000000
--- a/mate-base/mate-settings-daemon/files/mate-settings-daemon-1.2.0-syndaemon-mode.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -burN a/plugins/mouse/msd-mouse-manager.c b/plugins/mouse/msd-mouse-manager.c
---- a/plugins/mouse/msd-mouse-manager.c	2012-02-28 23:45:55.000000000 +0100
-+++ b/plugins/mouse/msd-mouse-manager.c	2012-08-03 20:22:19.204115652 +0200
-@@ -548,7 +548,7 @@
- 
-         if (state) {
-                 GError *error = NULL;
--                char *args[5];
-+                char *args[6];
- 
-                 if (manager->priv->syndaemon_spawned)
-                         return 0;
-@@ -557,7 +557,8 @@
-                 args[1] = "-i";
-                 args[2] = "0.5";
-                 args[3] = "-k";
--                args[4] = NULL;
-+                args[4] = "-R";
-+                args[5] = NULL;
- 
-                 if (!g_find_program_in_path (args[0]))
-                         return 0;
diff --git a/mate-base/mate-settings-daemon/files/mate-settings-daemon-1.4.0-netfs-monitor.patch b/mate-base/mate-settings-daemon/files/mate-settings-daemon-1.4.0-netfs-monitor.patch
deleted file mode 100644
index 1890c915459a..000000000000
--- a/mate-base/mate-settings-daemon/files/mate-settings-daemon-1.4.0-netfs-monitor.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -burN a/plugins/housekeeping/msd-disk-space.c b/plugins/housekeeping/msd-disk-space.c
---- a/plugins/housekeeping/msd-disk-space.c	2012-07-11 03:54:10.000000000 +0200
-+++ b/plugins/housekeeping/msd-disk-space.c	2012-08-07 22:54:59.872216471 +0200
-@@ -309,19 +309,38 @@
-          * purpose
-          */
-                  
-+        /* We also ignore network filesystems */
-+        
-         const gchar *ignore_fs[] = {
-+                "adfs",
-+                "afs",
-                 "auto",
-                 "autofs",
-+                "autofs4",
-+                "cifs",
-+                "cxfs",
-                 "devfs",
-                 "devpts",
-                 "ecryptfs",
-+                "gfs",
-+                "gfs2",
-                 "kernfs",
-                 "linprocfs",
-+                "linsysfs",
-+                "lustre",
-+                "lustre_lite",
-+                "ncpfs",
-+                "nfs",
-+                "nfs4",
-+                "nfsd",
-+                "ocfs2",
-                 "proc",
-                 "procfs",
-                 "ptyfs",
-+                "rpc_pipefs",
-                 "selinuxfs",
-                 "linsysfs",
-+                "smbfs",
-                 "sysfs",
-                 "tmpfs",
-                 "usbfs",
diff --git a/mate-base/mate-settings-daemon/mate-settings-daemon-1.23.2.ebuild b/mate-base/mate-settings-daemon/mate-settings-daemon-1.23.2.ebuild
deleted file mode 100644
index 6c4a113e4999..000000000000
--- a/mate-base/mate-settings-daemon/mate-settings-daemon-1.23.2.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-fi
-
-DESCRIPTION="MATE Settings Daemon"
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-
-IUSE="X debug libnotify policykit pulseaudio rfkill smartcard +sound"
-
-REQUIRED_USE="pulseaudio? ( sound )"
-
-COMMON_DEPEND=">=dev-libs/dbus-glib-0.74
-	>=dev-libs/glib-2.50:2
-	>=gnome-base/dconf-0.13.4
-	>=mate-base/libmatekbd-1.17.0
-	>=mate-base/mate-desktop-1.21.1
-	media-libs/fontconfig:1.0
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.22:3
-	x11-libs/libX11
-	x11-libs/libXi
-	x11-libs/libXext
-	>=x11-libs/libxklavier-5.2
-	virtual/libintl
-	libnotify? ( >=x11-libs/libnotify-0.7:0 )
-	policykit? (
-		>=dev-libs/dbus-glib-0.71
-		>=sys-apps/dbus-1.1.2
-		>=sys-auth/polkit-0.97
-	)
-	pulseaudio? (
-		>=media-libs/libmatemixer-1.10[pulseaudio]
-		>=media-sound/pulseaudio-0.9.15
-	)
-	smartcard? ( >=dev-libs/nss-3.11.2 )
-	sound? (
-		>=media-libs/libmatemixer-1.10
-		media-libs/libcanberra[gtk3]
-	)"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.50.1
-	sys-devel/gettext
-	virtual/pkgconfig
-	x11-base/xorg-proto"
-
-src_configure() {
-	mate_src_configure \
-		$(use_with X x) \
-		$(use_with libnotify) \
-		$(use_with sound libcanberra) \
-		$(use_with sound libmatemixer) \
-		$(use_enable debug) \
-		$(use_enable policykit polkit) \
-		$(use_enable pulseaudio pulse) \
-		$(use_enable rfkill) \
-		$(use_enable smartcard smartcard-support)
-}
diff --git a/mate-base/mate-settings-daemon/mate-settings-daemon-1.24.0.ebuild b/mate-base/mate-settings-daemon/mate-settings-daemon-1.24.0.ebuild
deleted file mode 100644
index 143052823157..000000000000
--- a/mate-base/mate-settings-daemon/mate-settings-daemon-1.24.0.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-fi
-
-DESCRIPTION="MATE Settings Daemon"
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-
-IUSE="X debug libnotify policykit pulseaudio rfkill smartcard +sound"
-
-REQUIRED_USE="pulseaudio? ( sound )"
-
-COMMON_DEPEND=">=dev-libs/dbus-glib-0.74
-	>=dev-libs/glib-2.50:2
-	>=gnome-base/dconf-0.13.4
-	>=mate-base/libmatekbd-1.17.0
-	>=mate-base/mate-desktop-1.21.1
-	media-libs/fontconfig:1.0
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.22:3
-	x11-libs/libX11
-	x11-libs/libXi
-	x11-libs/libXext
-	>=x11-libs/libxklavier-5.2
-	libnotify? ( >=x11-libs/libnotify-0.7:0 )
-	policykit? (
-		>=dev-libs/dbus-glib-0.71
-		>=sys-apps/dbus-1.10.0
-		>=sys-auth/polkit-0.97
-	)
-	pulseaudio? (
-		>=media-libs/libmatemixer-1.10[pulseaudio]
-		>=media-sound/pulseaudio-0.9.15
-	)
-	smartcard? ( >=dev-libs/nss-3.11.2 )
-	sound? (
-		>=media-libs/libmatemixer-1.10
-		media-libs/libcanberra[gtk3]
-	)"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig
-	x11-base/xorg-proto"
-
-src_configure() {
-	mate_src_configure \
-		$(use_with X x) \
-		$(use_with libnotify) \
-		$(use_with sound libcanberra) \
-		$(use_with sound libmatemixer) \
-		$(use_enable debug) \
-		$(use_enable policykit polkit) \
-		$(use_enable pulseaudio pulse) \
-		$(use_enable rfkill) \
-		$(use_enable smartcard smartcard-support)
-}
diff --git a/mate-base/mate-settings-daemon/mate-settings-daemon-1.24.1.ebuild b/mate-base/mate-settings-daemon/mate-settings-daemon-1.24.2-r1.ebuild
index dbd52149cd0f..9e5f3a4ca956 100644
--- a/mate-base/mate-settings-daemon/mate-settings-daemon-1.24.1.ebuild
+++ b/mate-base/mate-settings-daemon/mate-settings-daemon-1.24.2-r1.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 MATE_LA_PUNT="yes"
 
 inherit mate
 
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 x86"
+if [[ "${PV}" != *9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
 fi
 
 DESCRIPTION="MATE Settings Daemon"
@@ -19,7 +19,8 @@ IUSE="X debug libnotify policykit pulseaudio rfkill smartcard +sound"
 
 REQUIRED_USE="pulseaudio? ( sound )"
 
-COMMON_DEPEND=">=dev-libs/dbus-glib-0.74
+COMMON_DEPEND="
+	>=dev-libs/dbus-glib-0.74
 	>=dev-libs/glib-2.50:2
 	>=gnome-base/dconf-0.13.4
 	>=mate-base/libmatekbd-1.17.0
@@ -53,8 +54,8 @@ RDEPEND="${COMMON_DEPEND}
 	virtual/libintl
 "
 
-DEPEND="${COMMON_DEPEND}
-	>=sys-devel/gettext-0.19.8
+BDEPEND="${COMMON_DEPEND}
+	sys-devel/gettext
 	virtual/pkgconfig
 	x11-base/xorg-proto
 "
diff --git a/mate-base/mate-settings-daemon/mate-settings-daemon-1.24.2.ebuild b/mate-base/mate-settings-daemon/mate-settings-daemon-1.24.2.ebuild
index db0f382da84b..231d1692ca6c 100644
--- a/mate-base/mate-settings-daemon/mate-settings-daemon-1.24.2.ebuild
+++ b/mate-base/mate-settings-daemon/mate-settings-daemon-1.24.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ MATE_LA_PUNT="yes"
 inherit mate
 
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~loong ~riscv x86"
 fi
 
 DESCRIPTION="MATE Settings Daemon"
diff --git a/mate-base/mate-settings-daemon/mate-settings-daemon-1.23.3.ebuild b/mate-base/mate-settings-daemon/mate-settings-daemon-1.26.0-r1.ebuild
index 143052823157..e5d0dae52db5 100644
--- a/mate-base/mate-settings-daemon/mate-settings-daemon-1.23.3.ebuild
+++ b/mate-base/mate-settings-daemon/mate-settings-daemon-1.26.0-r1.ebuild
@@ -1,29 +1,30 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 MATE_LA_PUNT="yes"
 
 inherit mate
 
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+if [[ "${PV}" != *9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
 fi
 
 DESCRIPTION="MATE Settings Daemon"
-LICENSE="GPL-2 LGPL-2.1"
+LICENSE="GPL-2+ GPL-3+ HPND LGPL-2+ LGPL-2.1+"
 SLOT="0"
 
-IUSE="X debug libnotify policykit pulseaudio rfkill smartcard +sound"
+IUSE="X accessibility debug libnotify policykit pulseaudio rfkill smartcard +sound"
 
 REQUIRED_USE="pulseaudio? ( sound )"
 
-COMMON_DEPEND=">=dev-libs/dbus-glib-0.74
+COMMON_DEPEND="
+	>=dev-libs/dbus-glib-0.74
 	>=dev-libs/glib-2.50:2
 	>=gnome-base/dconf-0.13.4
 	>=mate-base/libmatekbd-1.17.0
-	>=mate-base/mate-desktop-1.21.1
+	>=mate-base/mate-desktop-1.25.0
 	media-libs/fontconfig:1.0
 	x11-libs/cairo
 	x11-libs/gdk-pixbuf:2
@@ -32,6 +33,7 @@ COMMON_DEPEND=">=dev-libs/dbus-glib-0.74
 	x11-libs/libXi
 	x11-libs/libXext
 	>=x11-libs/libxklavier-5.2
+	accessibility? ( app-accessibility/at-spi2-core:2 )
 	libnotify? ( >=x11-libs/libnotify-0.7:0 )
 	policykit? (
 		>=dev-libs/dbus-glib-0.71
@@ -46,14 +48,18 @@ COMMON_DEPEND=">=dev-libs/dbus-glib-0.74
 	sound? (
 		>=media-libs/libmatemixer-1.10
 		media-libs/libcanberra[gtk3]
-	)"
+	)
+"
 
-RDEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+	virtual/libintl
+"
 
-DEPEND="${COMMON_DEPEND}
+BDEPEND="${COMMON_DEPEND}
 	sys-devel/gettext
 	virtual/pkgconfig
-	x11-base/xorg-proto"
+	x11-base/xorg-proto
+"
 
 src_configure() {
 	mate_src_configure \
diff --git a/mate-base/mate-settings-daemon/mate-settings-daemon-9999.ebuild b/mate-base/mate-settings-daemon/mate-settings-daemon-9999.ebuild
index 4d738752ea14..e5d0dae52db5 100644
--- a/mate-base/mate-settings-daemon/mate-settings-daemon-9999.ebuild
+++ b/mate-base/mate-settings-daemon/mate-settings-daemon-9999.ebuild
@@ -1,29 +1,30 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 MATE_LA_PUNT="yes"
 
 inherit mate
 
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+if [[ "${PV}" != *9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
 fi
 
 DESCRIPTION="MATE Settings Daemon"
 LICENSE="GPL-2+ GPL-3+ HPND LGPL-2+ LGPL-2.1+"
 SLOT="0"
 
-IUSE="X debug libnotify policykit pulseaudio rfkill smartcard +sound"
+IUSE="X accessibility debug libnotify policykit pulseaudio rfkill smartcard +sound"
 
 REQUIRED_USE="pulseaudio? ( sound )"
 
-COMMON_DEPEND=">=dev-libs/dbus-glib-0.74
+COMMON_DEPEND="
+	>=dev-libs/dbus-glib-0.74
 	>=dev-libs/glib-2.50:2
 	>=gnome-base/dconf-0.13.4
 	>=mate-base/libmatekbd-1.17.0
-	>=mate-base/mate-desktop-1.23.2
+	>=mate-base/mate-desktop-1.25.0
 	media-libs/fontconfig:1.0
 	x11-libs/cairo
 	x11-libs/gdk-pixbuf:2
@@ -32,6 +33,7 @@ COMMON_DEPEND=">=dev-libs/dbus-glib-0.74
 	x11-libs/libXi
 	x11-libs/libXext
 	>=x11-libs/libxklavier-5.2
+	accessibility? ( app-accessibility/at-spi2-core:2 )
 	libnotify? ( >=x11-libs/libnotify-0.7:0 )
 	policykit? (
 		>=dev-libs/dbus-glib-0.71
@@ -53,8 +55,8 @@ RDEPEND="${COMMON_DEPEND}
 	virtual/libintl
 "
 
-DEPEND="${COMMON_DEPEND}
-	>=sys-devel/gettext-0.19.8
+BDEPEND="${COMMON_DEPEND}
+	sys-devel/gettext
 	virtual/pkgconfig
 	x11-base/xorg-proto
 "
diff --git a/mate-base/mate/mate-1.22.ebuild b/mate-base/mate/mate-1.24-r1.ebuild
index 20802025cab1..b28eac4f989b 100644
--- a/mate-base/mate/mate-1.22.ebuild
+++ b/mate-base/mate/mate-1.24-r1.ebuild
@@ -1,16 +1,15 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-if [[ ${PV} == 9999 ]]; then
+if [[ "${PV}" == *9999 ]]; then
 	MATE_BRANCH=9999
 	MATE_THEMES_V=9999
 else
-	inherit eapi7-ver
 	MATE_BRANCH="$(ver_cut 1-2)"
 	MATE_THEMES_V=3
-	KEYWORDS="amd64 ~arm ~arm64 x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
 fi
 
 SRC_URI=""
@@ -20,7 +19,7 @@ HOMEPAGE="https://mate-desktop.org"
 LICENSE="metapackage"
 
 SLOT="0"
-IUSE="+base -bluetooth help +notification +themes +extras"
+IUSE="+base bluetooth help +notification +themes +extras"
 
 S="${WORKDIR}"
 
@@ -43,7 +42,6 @@ RDEPEND="
 	themes? (
 		=x11-themes/mate-backgrounds-${MATE_BRANCH}*
 		=x11-themes/mate-icon-theme-${MATE_BRANCH}*
-		>=x11-themes/mate-themes-meta-${MATE_THEMES_V}
 	)
 	extras? (
 		=app-arch/engrampa-${MATE_BRANCH}*
@@ -57,7 +55,6 @@ RDEPEND="
 		=mate-extra/mate-system-monitor-${MATE_BRANCH}*
 		=mate-extra/mate-utils-${MATE_BRANCH}*
 		=media-gfx/eom-${MATE_BRANCH}*
-		sys-apps/gnome-disk-utility
 	)
 	help? (
 		gnome-extra/yelp
@@ -81,4 +78,6 @@ pkg_postinst() {
 	elog "Some packages that are not included in this meta-package but may be of interest:"
 	elog "		mate-extra/caja-dropbox"
 	elog "		mate-extra/mate-user-share"
+	elog "		mate-extra/caja-admin"
+	elog "		mate-extra/caja-hide"
 }
diff --git a/mate-base/mate/mate-1.23.ebuild b/mate-base/mate/mate-1.26.0-r1.ebuild
index 21dfe4f86635..b28eac4f989b 100644
--- a/mate-base/mate/mate-1.23.ebuild
+++ b/mate-base/mate/mate-1.26.0-r1.ebuild
@@ -1,16 +1,15 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-if [[ ${PV} == 9999 ]]; then
+if [[ "${PV}" == *9999 ]]; then
 	MATE_BRANCH=9999
 	MATE_THEMES_V=9999
 else
-	inherit eapi7-ver
 	MATE_BRANCH="$(ver_cut 1-2)"
 	MATE_THEMES_V=3
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
 fi
 
 SRC_URI=""
@@ -20,7 +19,7 @@ HOMEPAGE="https://mate-desktop.org"
 LICENSE="metapackage"
 
 SLOT="0"
-IUSE="+base -bluetooth help +notification +themes +extras"
+IUSE="+base bluetooth help +notification +themes +extras"
 
 S="${WORKDIR}"
 
@@ -43,7 +42,6 @@ RDEPEND="
 	themes? (
 		=x11-themes/mate-backgrounds-${MATE_BRANCH}*
 		=x11-themes/mate-icon-theme-${MATE_BRANCH}*
-		>=x11-themes/mate-themes-meta-${MATE_THEMES_V}
 	)
 	extras? (
 		=app-arch/engrampa-${MATE_BRANCH}*
@@ -57,7 +55,6 @@ RDEPEND="
 		=mate-extra/mate-system-monitor-${MATE_BRANCH}*
 		=mate-extra/mate-utils-${MATE_BRANCH}*
 		=media-gfx/eom-${MATE_BRANCH}*
-		sys-apps/gnome-disk-utility
 	)
 	help? (
 		gnome-extra/yelp
@@ -81,4 +78,6 @@ pkg_postinst() {
 	elog "Some packages that are not included in this meta-package but may be of interest:"
 	elog "		mate-extra/caja-dropbox"
 	elog "		mate-extra/mate-user-share"
+	elog "		mate-extra/caja-admin"
+	elog "		mate-extra/caja-hide"
 }
diff --git a/mate-base/mate/mate-9999.ebuild b/mate-base/mate/mate-9999.ebuild
index 33d7a38ce0d5..b28eac4f989b 100644
--- a/mate-base/mate/mate-9999.ebuild
+++ b/mate-base/mate/mate-9999.ebuild
@@ -1,72 +1,69 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-if [[ ${PV} == 9999 ]]; then
+if [[ "${PV}" == *9999 ]]; then
 	MATE_BRANCH=9999
 	MATE_THEMES_V=9999
 else
-	inherit versionator
-	MATE_BRANCH="$(get_version_component_range 1-2)"
+	MATE_BRANCH="$(ver_cut 1-2)"
 	MATE_THEMES_V=3
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
 fi
 
 SRC_URI=""
 DESCRIPTION="Meta ebuild for MATE, a traditional desktop environment"
-HOMEPAGE="http://mate-desktop.org"
+HOMEPAGE="https://mate-desktop.org"
 
 LICENSE="metapackage"
 
 SLOT="0"
-IUSE="+base -bluetooth help +notification +themes +extras"
+IUSE="+base bluetooth help +notification +themes +extras"
 
 S="${WORKDIR}"
 
 RDEPEND="
-	=mate-base/mate-desktop-${MATE_BRANCH}*:0
-	=mate-base/mate-menus-${MATE_BRANCH}*:0
-	=mate-base/mate-panel-${MATE_BRANCH}*:0
-	=mate-base/mate-session-manager-${MATE_BRANCH}*:0
-	=mate-base/mate-settings-daemon-${MATE_BRANCH}*:0
-	=x11-wm/marco-${MATE_BRANCH}*:0
+	=mate-base/mate-desktop-${MATE_BRANCH}*
+	=mate-base/mate-menus-${MATE_BRANCH}*
+	=mate-base/mate-panel-${MATE_BRANCH}*
+	=mate-base/mate-session-manager-${MATE_BRANCH}*
+	=mate-base/mate-settings-daemon-${MATE_BRANCH}*
+	=x11-wm/marco-${MATE_BRANCH}*
 	base? (
-		=mate-base/caja-${MATE_BRANCH}*:0
-		=mate-base/mate-applets-meta-${MATE_BRANCH}*:0
-		=mate-base/mate-control-center-${MATE_BRANCH}*:0
-		=mate-extra/mate-media-${MATE_BRANCH}*:0
-		=x11-misc/mozo-${MATE_BRANCH}*:0
-		=x11-terms/mate-terminal-${MATE_BRANCH}*:0
+		=mate-base/caja-${MATE_BRANCH}*
+		=mate-base/mate-applets-meta-${MATE_BRANCH}*
+		=mate-base/mate-control-center-${MATE_BRANCH}*
+		=mate-extra/mate-media-${MATE_BRANCH}*
+		=x11-misc/mozo-${MATE_BRANCH}*
+		=x11-terms/mate-terminal-${MATE_BRANCH}*
 	)
-	bluetooth? ( net-wireless/blueman:0 )
+	bluetooth? ( net-wireless/blueman )
 	themes? (
-		=x11-themes/mate-backgrounds-${MATE_BRANCH}*:0
-		=x11-themes/mate-icon-theme-${MATE_BRANCH}*:0
-		>=x11-themes/mate-themes-meta-${MATE_THEMES_V}:0
+		=x11-themes/mate-backgrounds-${MATE_BRANCH}*
+		=x11-themes/mate-icon-theme-${MATE_BRANCH}*
 	)
 	extras? (
-		=app-arch/engrampa-${MATE_BRANCH}*:0
-		=app-editors/pluma-${MATE_BRANCH}*:0
-		=app-text/atril-${MATE_BRANCH}*:0
-		=mate-extra/caja-extensions-${MATE_BRANCH}*:0
-		=mate-extra/mate-calc-${MATE_BRANCH}*:0
-		=mate-extra/mate-netbook-${MATE_BRANCH}*:0
-		=mate-extra/mate-power-manager-${MATE_BRANCH}*:0
-		=mate-extra/mate-screensaver-${MATE_BRANCH}*:0
-		=mate-extra/mate-system-monitor-${MATE_BRANCH}*:0
-		=mate-extra/mate-utils-${MATE_BRANCH}*:0
-		=media-gfx/eom-${MATE_BRANCH}*:0
-		sys-apps/gnome-disk-utility:0
+		=app-arch/engrampa-${MATE_BRANCH}*
+		=app-editors/pluma-${MATE_BRANCH}*
+		=app-text/atril-${MATE_BRANCH}*
+		=mate-extra/caja-extensions-${MATE_BRANCH}*
+		=mate-extra/mate-calc-${MATE_BRANCH}*
+		=mate-extra/mate-netbook-${MATE_BRANCH}*
+		=mate-extra/mate-power-manager-${MATE_BRANCH}*
+		=mate-extra/mate-screensaver-${MATE_BRANCH}*
+		=mate-extra/mate-system-monitor-${MATE_BRANCH}*
+		=mate-extra/mate-utils-${MATE_BRANCH}*
+		=media-gfx/eom-${MATE_BRANCH}*
 	)
 	help? (
-		gnome-extra/yelp:0
-		=mate-extra/mate-user-guide-${MATE_BRANCH}*:0
+		gnome-extra/yelp
+		=mate-extra/mate-user-guide-${MATE_BRANCH}*
 	)
 "
 
 PDEPEND="
-	notification? ( =x11-misc/mate-notification-daemon-${MATE_BRANCH}*:0 )
+	notification? ( =x11-misc/mate-notification-daemon-${MATE_BRANCH}* )
 	virtual/notification-daemon:0"
 
 pkg_postinst() {
@@ -81,4 +78,6 @@ pkg_postinst() {
 	elog "Some packages that are not included in this meta-package but may be of interest:"
 	elog "		mate-extra/caja-dropbox"
 	elog "		mate-extra/mate-user-share"
+	elog "		mate-extra/caja-admin"
+	elog "		mate-extra/caja-hide"
 }
author	Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net>	2022-12-19 12:52:50 +0000
committer	Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net>	2022-12-19 12:52:50 +0000
commit	81ced48f539e85b7b7d01de970edf99f1ae9ab09 (patch)
tree	529e69d0aa6be4d01cdc1edb60cfb5a630328351 /mate-base
parent	bcc6560e8797a12125f07484ee14e28eaeb7aad6 (diff)
download	baldeagleos-repo-81ced48f539e85b7b7d01de970edf99f1ae9ab09.tar.gz baldeagleos-repo-81ced48f539e85b7b7d01de970edf99f1ae9ab09.tar.xz baldeagleos-repo-81ced48f539e85b7b7d01de970edf99f1ae9ab09.zip