mate-extra/mate-utils: Drop old, synt with Gentoo

Package-Manager: Portage-2.3.96, Repoman-2.3.21
Signed-off-by: Adam Feldman <NP-Hardass@gentoo.org>

14 files changed, 456 insertions, 422 deletions

diff --git a/mate-extra/mate-utils/Manifest b/mate-extra/mate-utils/Manifest
index 8bd8f72..cd12a5d 100644
--- a/mate-extra/mate-utils/Manifest
+++ b/mate-extra/mate-utils/Manifest
@@ -1,5 +1,4 @@
-DIST mate-utils-1.12.0.tar.xz 6482900 BLAKE2B a9922a2cd4cb15f5d561c4e07528c265ef759f65fc306490a8f1aebbfd077ece481c6d69485c7df639611b61cbe9ab2789cccd32edc2800be36429718526acca SHA512 fe1db5c04b3adc616fdd0f76ddfb1291bbbfb6fb7d2f9ab11c5ffc33e19e0487ba3581babdfe74dd64553fd07f7d986fbac08fe2b14bcb79fca315e365069e47
-DIST mate-utils-1.14.1.tar.xz 6498448 BLAKE2B 21809b5bfe4e624c9aaafeda2f161acbd5648b237d013ba4098c8a421dcb22e474caeac5148e3b902e9f869655928a619d5282957d508856f909592944881125 SHA512 7c95fe390f83ee90405929025039ccef186ebf268f85e45a0dda0483b5de9bb67a6d3bbbe1a55315787996118c6bdf6a4fb29ad7236428eef89750c058b886e4
-DIST mate-utils-1.16.0.tar.xz 6502040 BLAKE2B a87a1fde570a0c37c1a563914d271702c2ae8507d45641981418d48e71ce9c1aee214132586454c3f7ddbd201431ba6b1e388c88e3d55e0a1b895fde58a3fd6a SHA512 a12883b732b0ac597c28c45609bde6fdf86369a3a00a16619617ec3834465fe85e83c4872a84a20d9d9a734c8180eae7e730f7cdfb4a6a41fdd14c59f607cacb
-DIST mate-utils-1.16.1.tar.xz 6517092 BLAKE2B 3a9fa4b12d29038872a90841eff36310aeac2834797ad8b4a1cde41c97b4c1f815546a379028ba4559c3dbaf4f6aa91102fd0b80418a0f60d9501da2b7915dbb SHA512 d902362b23b8b26377fa6741e8b96230ee224ef6dc9c4b02dc50e6bd43d87a28c266d2a1bb9c4c7be48cc43162988240257be40a4fb8b7f2569a2520f35b7aa0
-DIST mate-utils-1.18.3.tar.xz 6449580 BLAKE2B e8a892d0f924b37da82a8eb233c24b41609831d84fc706ac0082c05cfc0564ca150e6cbd350af8be48acf1e314253e4afe8123bcf4af189a344b3c51e6ccf7d2 SHA512 c9d80e037d32784b3d376aebe23abc6709e14d1df6f293f43c1fc7978f7903ac8b0fc159cebebb3d8dc471df210469b5dcc5dfebdc906ade30a2c7e8f7ca764a
+DIST mate-utils-1.22.0.tar.xz 7300112 BLAKE2B 8a613b6dcb99e652ad6b44bd64ad9b2f9c809713b5fb904059b64234b51e2a06b2290dcf14d7dde82e8011be2ca395fe74d87bcae5b903b196d55bb50e8fdf07 SHA512 248c6e4108900768a4e8b272d20ac9b2d70e8bf77375f4669a099f4d8386c2e8affeafb772d209f00906f96f20d7ee347167ef4837186f44d8aaad85ef855f70
+DIST mate-utils-1.22.1.tar.xz 7284496 BLAKE2B 83e7e39a0daadae595ab2cc90ad250f61a294afc896df28bf17259cec619af4b0c9d1927c07b03a0cdd7449174af258227678299823169e2cb4d9c4d3ec98c92 SHA512 0f70f088de80440ff6954c899eab75c2bf22d332293c1ec61bf8391396ed31a2ab126279dc4d9dab6f4932225120309bc52e122bcd5a8dc17abccfd6e480390d
+DIST mate-utils-1.22.2.tar.xz 7306448 BLAKE2B 0fb28f85e39ac58c1e78e6f5f4c6d01e72a2b8c32197739b93ec3f17617b4676fdfe251b81e3b5b01c44f69136d9bfc8d12d64fff832d5a9f1c30591b2facebb SHA512 bf33019ebd1dc4ff6010ba0824981334b7065a62dfc7a73170487df5f165ad20831a900ef4e4e0641ca130aa618f82aa27606f0a48c2cb9907ea7ef118f02a60
+DIST mate-utils-1.24.0.tar.xz 7930068 BLAKE2B 0e2c82afbc2d8a90b8c31d56d9bfbb3a477b1e9cd67108e52c96f4087d09336ed9e6980551e39b43797743b9ef86cc2beabfa84fd7a5820e38122e0d0a7c968d SHA512 d8945c85936a55d22f3ed94c9858ba84cadf552a63cdd2d9eec9120111ad71526ac88772f8e4b7a6a460b691574534e52706fba35a0395b1d894b27eece9e92c
diff --git a/mate-extra/mate-utils/files/mate-utils-1.12.0-dict-gtk3.patch b/mate-extra/mate-utils/files/mate-utils-1.12.0-dict-gtk3.patch
deleted file mode 100644
index dff6dbe..0000000
--- a/mate-extra/mate-utils/files/mate-utils-1.12.0-dict-gtk3.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 5ab184661ff38baca3ea2709d81932a578654392 Mon Sep 17 00:00:00 2001
-From: Kir Kolyshkin <kir@openvz.org>
-Date: Mon, 16 May 2016 14:52:28 -0700
-Subject: [PATCH] mate-dict.pc: depend upon proper gtk version
-
-If the package is built against gtk-3.0 (as in
-./configure --with-gtk=3.0), mate-dict.pc still wants gtk-2.0
-since it's hardcoded it there. This can lead to improper builds
-of packages using libmatedict (although I can't find any now),
-as well as improper RPM dependencies, like this:
-
-	$ rpm -e gtk2-devel
-	error: Failed dependencies:
-	...
-	pkgconfig(gtk+-2.0) is needed by (installed) mate-utils-devel-1.14.0-1gtk3.fc23.x86_64
-
-Fortunately, the file is already generated, so it's trivial to add
-a proper substitution.
-
-[v2: also add min GTK version required]
-
-Signed-off-by: Kir Kolyshkin <kir@openvz.org>
----
- configure.ac                             | 2 ++
- mate-dictionary/libgdict/mate-dict.pc.in | 2 +-
- 2 files changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 64aba70..39cc6f8 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -89,6 +89,8 @@ case "$with_gtk" in
- 		LIBCANBERRA_GTK_REQUIRED=0.4
- 		;;
- esac
-+AC_SUBST(GTK_API_VERSION)
-+AC_SUBST(GTK_REQUIRED)
- 
- # common checks
- PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLIB_REQUIRED)
-diff --git a/mate-dictionary/libgdict/mate-dict.pc.in b/mate-dictionary/libgdict/mate-dict.pc.in
-index e409a0c..8168de2 100644
---- a/mate-dictionary/libgdict/mate-dict.pc.in
-+++ b/mate-dictionary/libgdict/mate-dict.pc.in
-@@ -5,7 +5,7 @@ includedir=@includedir@
- 
- Name: gdict-1.0
- Description: MATE Dictionary Protocol client library
--Requires: gtk+-2.0
-+Requires: gtk+-@GTK_API_VERSION@ >= @GTK_REQUIRED@
- Version: @GDICT_VERSION@
- Libs: -L${libdir} -lmatedict
- Cflags: -I${includedir}/mate-dict
diff --git a/mate-extra/mate-utils/files/mate-utils-1.12.0-include-correct-header-to-fix-occasional-ftbfs.patch b/mate-extra/mate-utils/files/mate-utils-1.12.0-include-correct-header-to-fix-occasional-ftbfs.patch
deleted file mode 100644
index 09d2017..0000000
--- a/mate-extra/mate-utils/files/mate-utils-1.12.0-include-correct-header-to-fix-occasional-ftbfs.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 550229e422cd88fe39473f41cebe6cef12f6c8fb Mon Sep 17 00:00:00 2001
-From: monsta <monsta@inbox.ru>
-Date: Tue, 14 Mar 2017 15:08:47 +0300
-Subject: [PATCH] mate-dictionary: include correct header to fix occasional
- FTBFS
-
-taken from:
-https://git.gnome.org/browse/gnome-dictionary/commit/?id=d529e2dd056f05cb1115c2f68bb6f773b4b14948
----
- mate-dictionary/libgdict/gdict-client-context.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/mate-dictionary/libgdict/gdict-client-context.h b/mate-dictionary/libgdict/gdict-client-context.h
-index 2854fed..c52bbb4 100644
---- a/mate-dictionary/libgdict/gdict-client-context.h
-+++ b/mate-dictionary/libgdict/gdict-client-context.h
-@@ -20,7 +20,7 @@
- #ifndef __GDICT_CLIENT_CONTEXT_H__
- #define __GDICT_CLIENT_CONTEXT_H__
- 
--#include <glib-object.h>
-+#include "gdict-context.h"
- 
- #define GDICT_TYPE_CLIENT_CONTEXT		(gdict_client_context_get_type ())
- #define GDICT_CLIENT_CONTEXT(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), GDICT_TYPE_CLIENT_CONTEXT, GdictClientContext))
diff --git a/mate-extra/mate-utils/files/mate-utils-1.22.1-make-inkscape-optional.patch b/mate-extra/mate-utils/files/mate-utils-1.22.1-make-inkscape-optional.patch
new file mode 100644
index 0000000..57d984b
--- /dev/null
+++ b/mate-extra/mate-utils/files/mate-utils-1.22.1-make-inkscape-optional.patch
@@ -0,0 +1,192 @@
+From 563dec11a51f4c6517509642e335a1fd64cd4ec4 Mon Sep 17 00:00:00 2001
+From: rbuj <robert.buj@gmail.com>
+Date: Thu, 2 May 2019 20:51:09 +0200
+Subject: [PATCH] Make inkscape and rsvg-convert optional
+
+TEST on Fedora:
+inkscape, librsvg2-tools package are not installed on system: The user can build, install and distribute the package:
+
+  $ sudo dnf remove inkscape librsvg2-tools -y
+  $ ./configure --prefix=/usr
+  $ make
+  $ sudo make install
+  $ make distcheck
+
+logview/data/icons:
+
+Can not run build-png-icons target if inkscape package is not installed on system:
+
+  $ make -C logview/data/icons clean-png-icons
+make: Entering directory '/home/robert/devel/mate-utils/logview/data/icons'
+rm -f hicolor_apps_16x16_mate-system-log.png hicolor_apps_22x22_mate-system-log.png hicolor_apps_32x32_mate-system-log.png hicolor_apps_48x48_mate-system-log.png hicolor_apps_256x256_mate-system-log.png
+make: Leaving directory '/home/robert/devel/mate-utils/logview/data/icons'
+  $ make -C logview/data/icons build-png-icons
+make: Entering directory '/home/robert/devel/mate-utils/logview/data/icons'
+make: *** No rule to make target 'hicolor_apps_16x16_mate-system-log.png', needed by 'build-png-icons'.  Stop.
+make: Leaving directory '/home/robert/devel/mate-utils/logview/data/icons'
+
+Can run build-png-icons target if inkscape package is installed on system:
+
+  $ sudo dnf install inkscape -y
+  $ ./configure --prefix=/usr
+  $ make -C logview/data/icons build-png-icons
+make: Entering directory '/home/robert/devel/mate-utils/logview/data/icons'
+Background RRGGBBAA: ffffff00 Area 303:65:319:81 exported to 16 x 16 pixels (96 dpi) Bitmap saved as: hicolor_apps_16x16_mate-system-log.png
+Background RRGGBBAA: ffffff00 Area 303:101:325:123 exported to 22 x 22 pixels (96 dpi) Bitmap saved as: hicolor_apps_22x22_mate-system-log.png
+Background RRGGBBAA: ffffff00 Area 304:142:336:174 exported to 32 x 32 pixels (96 dpi) Bitmap saved as: hicolor_apps_32x32_mate-system-log.png
+Background RRGGBBAA: ffffff00 Area 296:202:344:250 exported to 48 x 48 pixels (96 dpi) Bitmap saved as: hicolor_apps_48x48_mate-system-log.png
+Background RRGGBBAA: ffffff00 Area 33:11:289:267 exported to 256 x 256 pixels (96 dpi) Bitmap saved as: hicolor_apps_256x256_mate-system-log.png
+make: Nothing to be done for 'build-png-icons'.
+make: Leaving directory '/home/robert/devel/mate-utils/logview/data/icons'
+
+baobab/pixmaps:
+
+Can not run build-png-icons target if librsvg2-tools package is not installed on system:
+
+  $ make -C baobab/pixmaps clean-png-icons
+make: Entering directory '/home/robert/devel/mate-utils/baobab/pixmaps'
+rm -f hicolor_apps_16x16_mate-disk-usage-analyzer.png hicolor_apps_22x22_mate-disk-usage-analyzer.png hicolor_apps_32x32_mate-disk-usage-analyzer.png hicolor_apps_48x48_mate-disk-usage-analyzer.png hicolor_apps_128x128_mate-disk-usage-analyzer.png
+make: Leaving directory '/home/robert/devel/mate-utils/baobab/pixmaps'
+  $ make -C baobab/pixmaps build-png-icons
+make: Entering directory '/home/robert/devel/mate-utils/baobab/pixmaps'
+make: *** No rule to make target 'hicolor_apps_16x16_mate-disk-usage-analyzer.png', needed by 'build-png-icons'.  Stop.
+make: Leaving directory '/home/robert/devel/mate-utils/baobab/pixmaps'
+
+Can run build-png-icons target if librsvg2-tools package is installed on system:
+
+  $ sudo dnf install -y librsvg2-tools
+  $ ./configure --prefix=/usr
+  $ make -C baobab/pixmaps build-png-icons
+make: Entering directory '/home/robert/devel/mate-utils/baobab/pixmaps'
+/usr/bin/rsvg-convert -w 16 -h 16 hicolor_apps_scalable_mate-disk-usage-analyzer.svg -o hicolor_apps_16x16_mate-disk-usage-analyzer.png
+/usr/bin/rsvg-convert -w 22 -h 22 hicolor_apps_scalable_mate-disk-usage-analyzer.svg -o hicolor_apps_22x22_mate-disk-usage-analyzer.png
+/usr/bin/rsvg-convert -w 32 -h 32 hicolor_apps_scalable_mate-disk-usage-analyzer.svg -o hicolor_apps_32x32_mate-disk-usage-analyzer.png
+/usr/bin/rsvg-convert -w 48 -h 48 hicolor_apps_scalable_mate-disk-usage-analyzer.svg -o hicolor_apps_48x48_mate-disk-usage-analyzer.png
+/usr/bin/rsvg-convert -w 128 -h 128 hicolor_apps_scalable_mate-disk-usage-analyzer.svg -o hicolor_apps_128x128_mate-disk-usage-analyzer.png
+make: Leaving directory '/home/robert/devel/mate-utils/baobab/pixmaps'
+
+Closes #223
+---
+ baobab/pixmaps/Makefile.am     |  6 ++++--
+ configure.ac                   |  8 ++------
+ logview/data/icons/Makefile.am | 31 ++++++++++++++++++++++++-------
+ 3 files changed, 30 insertions(+), 15 deletions(-)
+
+diff --git a/baobab/pixmaps/Makefile.am b/baobab/pixmaps/Makefile.am
+index f36e8bf3..6804bef9 100644
+--- a/baobab/pixmaps/Makefile.am
++++ b/baobab/pixmaps/Makefile.am
+@@ -11,8 +11,10 @@ public_icons = \
+ 	hicolor_apps_scalable_mate-disk-usage-analyzer.svg \
+ 	$(NULL)
+ 
++if HAVE_RSVG_CONVERT
+ hicolor_apps_%.png: hicolor_apps_scalable_mate-disk-usage-analyzer.svg
+ 	$(RSVG_CONVERT) -w $(word 1, $(subst x, ,$(word 1,$(subst _, ,$*)))) -h $(word 2, $(subst x, ,$(word 1,$(subst _, ,$*)))) $^ -o $@
++endif
+ 
+ EXTRA_DIST = \
+ 	$(public_icons)	\
+@@ -20,7 +22,7 @@ EXTRA_DIST = \
+ 
+ ###############################################################################
+ 
+-install-icons: $(public_icons)
++install-icons: | $(public_icons)
+ 	for icon in $(public_icons); do \
+ 		THEME=`echo $$icon | cut -d_ -f1`; \
+ 		CONTEXT=`echo $$icon | cut -d_ -f2`; \
+@@ -57,7 +59,7 @@ update-icon-cache:
+ 	fi
+ 
+ .PHONY: build-png-icons clean-png-icons
+-build-png-icons: $(png_icons)
++build-png-icons: | $(png_icons)
+ 
+ clean-png-icons:
+ 	rm -f $(png_icons)
+diff --git a/configure.ac b/configure.ac
+index d65e5b54..0907e194 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -31,13 +31,9 @@ AC_PATH_PROG(GLIB_MKENUMS, [glib-mkenums])
+ 
+ dnl ICONS: convert svg to png
+ AC_PATH_PROG(RSVG_CONVERT, rsvg-convert)
+-if test x$RSVG_CONVERT = x ; then
+-    AC_MSG_ERROR([could not locate rsvg-convert])
+-fi
++AM_CONDITIONAL([HAVE_RSVG_CONVERT], [test "x$RSVG_CONVERT" != x])
+ AC_PATH_PROG(INKSCAPE, inkscape)
+-if test x$INKSCAPE = x ; then
+-    AC_MSG_ERROR([could not locate inkscape])
+-fi
++AM_CONDITIONAL([HAVE_INKSCAPE], [test "x$INKSCAPE" != x])
+ 
+ MATE_COMPILE_WARNINGS([yes])
+ 
+diff --git a/logview/data/icons/Makefile.am b/logview/data/icons/Makefile.am
+index 9db44489..30fff904 100644
+--- a/logview/data/icons/Makefile.am
++++ b/logview/data/icons/Makefile.am
+@@ -17,20 +17,37 @@ public_icons = \
+ 	hicolor_apps_scalable_mate-system-log-symbolic.svg \
+ 	$(NULL)
+ 
++if HAVE_INKSCAPE
+ hicolor_apps_16x16_mate-system-log.png: logview.svg
+-	$(INKSCAPE) -z $^ --export-area=303:65:319:81 -w=16 -h=16 -e=$@
++	$(if $(wildcard $(INKSCAPE)), \
++		$(info $(shell $(INKSCAPE) -z $^ --export-area=303:65:319:81 -w=16 -h=16 -e=$@)), \
++		$(error could not locate inkscape) \
++	)
+ 
+ hicolor_apps_22x22_mate-system-log.png: logview.svg
+-	$(INKSCAPE) -z $^ --export-area=303:101:325:123 -w=22 -h=22 -e=$@
++	$(if $(wildcard $(INKSCAPE)), \
++		$(info $(shell $(INKSCAPE) -z $^ --export-area=303:101:325:123 -w=22 -h=22 -e=$@)), \
++		$(error could not locate inkscape) \
++	)
+ 
+ hicolor_apps_32x32_mate-system-log.png: logview.svg
+-	$(INKSCAPE) -z $^ --export-area=304:142:336:174 -w=32 -h=32 -e=$@
++	$(if $(wildcard $(INKSCAPE)), \
++		$(info $(shell $(INKSCAPE) -z $^ --export-area=304:142:336:174 -w=32 -h=32 -e=$@)), \
++		$(error could not locate inkscape) \
++	)
+ 
+ hicolor_apps_48x48_mate-system-log.png: logview.svg
+-	$(INKSCAPE) -z $^ --export-area=296:202:344:250 -w=48 -h=48 -e=$@
++	$(if $(wildcard $(INKSCAPE)), \
++		$(info $(shell $(INKSCAPE) -z $^ --export-area=296:202:344:250 -w=48 -h=48 -e=$@)), \
++		$(error could not locate inkscape) \
++	)
+ 
+ hicolor_apps_256x256_mate-system-log.png: logview.svg
+-	$(INKSCAPE) -z $^ --export-area=33:11:289:267 -w=256 -h=256 -e=$@
++	$(if $(wildcard $(INKSCAPE)), \
++		$(info $(shell $(INKSCAPE) -z $^ --export-area=33:11:289:267 -w=256 -h=256 -e=$@)), \
++		$(error could not locate inkscape) \
++	)
++endif
+ 
+ noinst_DATA = \
+ 	logview.svg \
+@@ -43,7 +60,7 @@ EXTRA_DIST = \
+ 
+ ###############################################################################
+ 
+-install-icons:
++install-icons: | $(public_icons)
+ 	for icon in $(public_icons); do \
+ 		THEME=`echo $$icon | cut -d_ -f1`; \
+ 		CONTEXT=`echo $$icon | cut -d_ -f2`; \
+@@ -80,7 +97,7 @@ update-icon-cache:
+ 	fi
+ 
+ .PHONY: build-png-icons clean-png-icons
+-build-png-icons: $(png_icons)
++build-png-icons: | $(png_icons)
+ 
+ clean-png-icons:
+ 	rm -f $(png_icons)
diff --git a/mate-extra/mate-utils/mate-utils-1.12.0-r2.ebuild b/mate-extra/mate-utils/mate-utils-1.12.0-r2.ebuild
deleted file mode 100644
index 8c6fda4..0000000
--- a/mate-extra/mate-utils/mate-utils-1.12.0-r2.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm x86"
-fi
-
-DESCRIPTION="Utilities for the MATE desktop"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="X applet debug gtk3 ipv6 test"
-
-RDEPEND="app-text/rarian:0
-	dev-libs/atk:0
-	>=dev-libs/glib-2.36:2
-	>=gnome-base/libgtop-2.12:2=
-	sys-libs/zlib:0
-	x11-libs/cairo:0
-	x11-libs/gdk-pixbuf:2
-	x11-libs/libICE:0
-	x11-libs/libSM:0
-	x11-libs/libX11:0
-	x11-libs/libXext:0
-	x11-libs/pango:0
-	applet? ( >=mate-base/mate-panel-1.6[gtk3(-)=] )
-	!gtk3? (
-		>=x11-libs/gtk+-2.24:2
-		>=media-libs/libcanberra-0.4:0[gtk]
-	)
-	gtk3? (
-		>=x11-libs/gtk+-3.0:3
-		>=media-libs/libcanberra-0.4:0[gtk3]
-	)"
-
-DEPEND="${RDEPEND}
-	>=app-text/scrollkeeper-dtd-1:1.0
-	app-text/yelp-tools:0
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.50.1:*
-	x11-proto/xextproto:0
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-PATCHES=(
-	"${FILESDIR}/${P}-dict-gtk3.patch"
-	"${FILESDIR}/${P}-include-correct-header-to-fix-occasional-ftbfs.patch"
-)
-
-src_prepare() {
-	# Make apps visible in all DEs.
-	LC_ALL=C find . -iname '*.desktop.in*' -exec \
-		sed -e '/OnlyShowIn/d' -i {} + || die
-
-	mate_src_prepare
-}
-
-src_configure() {
-	mate_src_configure \
-		--disable-maintainer-flags \
-		--enable-zlib \
-		--enable-debug=$(usex debug yes minimum) \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_with X x) \
-		$(use_enable applet gdict-applet) \
-		$(use_enable ipv6)
-}
diff --git a/mate-extra/mate-utils/mate-utils-1.14.1.ebuild b/mate-extra/mate-utils/mate-utils-1.14.1.ebuild
deleted file mode 100644
index 58b285e..0000000
--- a/mate-extra/mate-utils/mate-utils-1.14.1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="Utilities for the MATE desktop"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="X applet debug gtk3 ipv6 test"
-
-COMMON_DEPEND="
-	dev-libs/atk:0
-	>=dev-libs/glib-2.36:2
-	>=gnome-base/libgtop-2.12:2=
-	sys-libs/zlib:0
-	x11-libs/cairo:0
-	x11-libs/gdk-pixbuf:2
-	x11-libs/libICE:0
-	x11-libs/libSM:0
-	x11-libs/libX11:0
-	x11-libs/libXext:0
-	x11-libs/pango:0
-	applet? ( >=mate-base/mate-panel-1.6[gtk3(-)=] )
-	!gtk3? (
-		>=x11-libs/gtk+-2.24:2
-		>=media-libs/libcanberra-0.4:0[gtk]
-	)
-	gtk3? (
-		>=x11-libs/gtk+-3.0:3
-		>=media-libs/libcanberra-0.4:0[gtk3]
-	)"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/rarian:0
-	>=app-text/scrollkeeper-dtd-1:1.0
-	app-text/yelp-tools:0
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.50.1:*
-	x11-proto/xextproto:0
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-src_prepare() {
-	# Make apps visible in all DEs.
-	LC_ALL=C find . -iname '*.desktop.in*' -exec \
-		sed -e '/OnlyShowIn/d' -i {} + || die
-
-	mate_src_prepare
-}
-
-src_configure() {
-	mate_src_configure \
-		--disable-maintainer-flags \
-		--enable-zlib \
-		--enable-debug=$(usex debug yes minimum) \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_with X x) \
-		$(use_enable applet gdict-applet) \
-		$(use_enable ipv6)
-}
diff --git a/mate-extra/mate-utils/mate-utils-1.16.0.ebuild b/mate-extra/mate-utils/mate-utils-1.16.0.ebuild
deleted file mode 100644
index 58b285e..0000000
--- a/mate-extra/mate-utils/mate-utils-1.16.0.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="Utilities for the MATE desktop"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="X applet debug gtk3 ipv6 test"
-
-COMMON_DEPEND="
-	dev-libs/atk:0
-	>=dev-libs/glib-2.36:2
-	>=gnome-base/libgtop-2.12:2=
-	sys-libs/zlib:0
-	x11-libs/cairo:0
-	x11-libs/gdk-pixbuf:2
-	x11-libs/libICE:0
-	x11-libs/libSM:0
-	x11-libs/libX11:0
-	x11-libs/libXext:0
-	x11-libs/pango:0
-	applet? ( >=mate-base/mate-panel-1.6[gtk3(-)=] )
-	!gtk3? (
-		>=x11-libs/gtk+-2.24:2
-		>=media-libs/libcanberra-0.4:0[gtk]
-	)
-	gtk3? (
-		>=x11-libs/gtk+-3.0:3
-		>=media-libs/libcanberra-0.4:0[gtk3]
-	)"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/rarian:0
-	>=app-text/scrollkeeper-dtd-1:1.0
-	app-text/yelp-tools:0
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.50.1:*
-	x11-proto/xextproto:0
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-src_prepare() {
-	# Make apps visible in all DEs.
-	LC_ALL=C find . -iname '*.desktop.in*' -exec \
-		sed -e '/OnlyShowIn/d' -i {} + || die
-
-	mate_src_prepare
-}
-
-src_configure() {
-	mate_src_configure \
-		--disable-maintainer-flags \
-		--enable-zlib \
-		--enable-debug=$(usex debug yes minimum) \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_with X x) \
-		$(use_enable applet gdict-applet) \
-		$(use_enable ipv6)
-}
diff --git a/mate-extra/mate-utils/mate-utils-1.16.1.ebuild b/mate-extra/mate-utils/mate-utils-1.16.1.ebuild
deleted file mode 100644
index 0798d88..0000000
--- a/mate-extra/mate-utils/mate-utils-1.16.1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="Utilities for the MATE desktop"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="X applet debug gtk3 ipv6 test"
-
-COMMON_DEPEND="
-	dev-libs/atk:0
-	>=dev-libs/glib-2.36:2
-	>=gnome-base/libgtop-2.12:2=
-	sys-libs/zlib:0
-	x11-libs/cairo:0
-	x11-libs/gdk-pixbuf:2
-	x11-libs/libICE:0
-	x11-libs/libSM:0
-	x11-libs/libX11:0
-	x11-libs/libXext:0
-	x11-libs/pango:0
-	applet? ( >=mate-base/mate-panel-1.6[gtk3(-)=] )
-	!gtk3? (
-		>=x11-libs/gtk+-2.24:2
-		>=media-libs/libcanberra-0.4:0[gtk]
-	)
-	gtk3? (
-		>=x11-libs/gtk+-3.0:3
-		>=media-libs/libcanberra-0.4:0[gtk3]
-	)"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/rarian:0
-	>=app-text/scrollkeeper-dtd-1:1.0
-	app-text/yelp-tools:0
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.50.1:*
-	x11-proto/xextproto:0
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-src_prepare() {
-	# Make apps visible in all DEs.
-	LC_ALL=C find . -iname '*.desktop.in*' -exec \
-		sed -e '/OnlyShowIn/d' -i {} + || die
-
-	mate_src_prepare
-}
-
-src_configure() {
-	mate_src_configure \
-		--disable-maintainer-flags \
-		--enable-zlib \
-		--enable-debug=$(usex debug yes minimum) \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_with X x) \
-		$(use_enable applet gdict-applet) \
-		$(use_enable ipv6)
-}
diff --git a/mate-extra/mate-utils/mate-utils-1.22.0.ebuild b/mate-extra/mate-utils/mate-utils-1.22.0.ebuild
new file mode 100644
index 0000000..1d7235c
--- /dev/null
+++ b/mate-extra/mate-utils/mate-utils-1.22.0.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MATE_LA_PUNT="yes"
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="amd64 ~arm ~arm64 x86"
+fi
+
+DESCRIPTION="Utilities for the MATE desktop"
+LICENSE="FDL-1.1+ GPL-2+ GPL-3+ LGPL-2+"
+SLOT="0"
+
+IUSE="X applet debug ipv6 test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/atk
+	>=dev-libs/glib-2.50:2
+	>=gnome-base/libgtop-2.12:2=
+	>=media-libs/libcanberra-0.4[gtk3]
+	sys-libs/zlib
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.22:3
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/pango
+	applet? ( >=mate-base/mate-panel-1.17.0 )"
+
+DEPEND="${RDEPEND}
+	app-text/rarian
+	>=app-text/scrollkeeper-dtd-1:1.0
+	app-text/yelp-tools
+	dev-util/glib-utils
+	dev-util/gtk-doc
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.50.1
+	sys-devel/gettext
+	virtual/pkgconfig
+	x11-base/xorg-proto"
+
+src_prepare() {
+	# Make apps visible in all DEs.
+	LC_ALL=C find . -iname '*.desktop.in*' -exec \
+		sed -e '/OnlyShowIn/d' -i {} + || die
+
+	mate_src_prepare
+}
+
+src_configure() {
+	mate_src_configure \
+		--disable-maintainer-flags \
+		--enable-zlib \
+		--enable-debug=$(usex debug yes minimum) \
+		$(use_with X x) \
+		$(use_enable applet gdict-applet) \
+		$(use_enable ipv6)
+}
diff --git a/mate-extra/mate-utils/mate-utils-1.22.1-r1.ebuild b/mate-extra/mate-utils/mate-utils-1.22.1-r1.ebuild
new file mode 100644
index 0000000..eda9351
--- /dev/null
+++ b/mate-extra/mate-utils/mate-utils-1.22.1-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MATE_LA_PUNT="yes"
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+DESCRIPTION="Utilities for the MATE desktop"
+LICENSE="FDL-1.1+ GPL-2+ GPL-3+ LGPL-2+"
+SLOT="0"
+
+IUSE="X applet debug ipv6 test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/atk
+	>=dev-libs/glib-2.50:2
+	>=gnome-base/libgtop-2.12:2=
+	>=media-libs/libcanberra-0.4[gtk3]
+	sys-libs/zlib
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.22:3
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/pango
+	applet? ( >=mate-base/mate-panel-1.17.0 )"
+
+DEPEND="${RDEPEND}
+	app-text/rarian
+	>=app-text/scrollkeeper-dtd-1:1.0
+	app-text/yelp-tools
+	dev-util/glib-utils
+	dev-util/gtk-doc
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.50.1
+	gnome-base/librsvg
+	sys-devel/gettext
+	virtual/pkgconfig
+	x11-base/xorg-proto"
+
+PATCHES=( "${FILESDIR}/${PN}-1.22.1-make-inkscape-optional.patch" )
+
+src_prepare() {
+	# Make apps visible in all DEs.
+	LC_ALL=C find . -iname '*.desktop.in*' -exec \
+		sed -e '/OnlyShowIn/d' -i {} + || die
+
+	mate_src_prepare
+}
+
+src_configure() {
+	mate_src_configure \
+		--disable-maintainer-flags \
+		--enable-zlib \
+		--enable-debug=$(usex debug yes minimum) \
+		$(use_with X x) \
+		$(use_enable applet gdict-applet) \
+		$(use_enable ipv6)
+}
diff --git a/mate-extra/mate-utils/mate-utils-1.18.3.ebuild b/mate-extra/mate-utils/mate-utils-1.22.2.ebuild
index 198fc01..e739dfd 100644
--- a/mate-extra/mate-utils/mate-utils-1.18.3.ebuild
+++ b/mate-extra/mate-utils/mate-utils-1.22.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,39 +12,39 @@ if [[ ${PV} != 9999 ]]; then
 fi
 
 DESCRIPTION="Utilities for the MATE desktop"
-LICENSE="GPL-2"
+LICENSE="FDL-1.1+ GPL-2+ GPL-3+ LGPL-2+"
 SLOT="0"
 
 IUSE="X applet debug ipv6 test"
+RESTRICT="!test? ( test )"
 
-COMMON_DEPEND="
-	dev-libs/atk:0
-	>=dev-libs/glib-2.36:2
+RDEPEND="
+	dev-libs/atk
+	>=dev-libs/glib-2.50:2
 	>=gnome-base/libgtop-2.12:2=
-	>=media-libs/libcanberra-0.4:0[gtk3]
-	sys-libs/zlib:0
-	x11-libs/cairo:0
+	>=media-libs/libcanberra-0.4[gtk3]
+	sys-libs/zlib
+	x11-libs/cairo
 	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.14:3
-	x11-libs/libICE:0
-	x11-libs/libSM:0
-	x11-libs/libX11:0
-	x11-libs/libXext:0
-	x11-libs/pango:0
+	>=x11-libs/gtk+-3.22:3
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/pango
 	applet? ( >=mate-base/mate-panel-1.17.0 )"
 
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/rarian:0
+DEPEND="${RDEPEND}
+	app-text/rarian
 	>=app-text/scrollkeeper-dtd-1:1.0
-	app-text/yelp-tools:0
+	app-text/yelp-tools
+	dev-util/glib-utils
 	dev-util/gtk-doc
 	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.50.1:*
-	x11-proto/xextproto:0
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
+	>=dev-util/intltool-0.50.1
+	sys-devel/gettext
+	virtual/pkgconfig
+	x11-base/xorg-proto"
 
 src_prepare() {
 	# Make apps visible in all DEs.
diff --git a/mate-extra/mate-utils/mate-utils-1.24.0.ebuild b/mate-extra/mate-utils/mate-utils-1.24.0.ebuild
new file mode 100644
index 0000000..c6f2825
--- /dev/null
+++ b/mate-extra/mate-utils/mate-utils-1.24.0.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MATE_LA_PUNT="yes"
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+DESCRIPTION="Utilities for the MATE desktop"
+LICENSE="FDL-1.1+ GPL-2+ GPL-3+ LGPL-2+"
+SLOT="0"
+
+IUSE="X applet debug ipv6 test udisks"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	dev-libs/atk
+	>=dev-libs/glib-2.50:2
+	>=gnome-base/libgtop-2.12:2=
+	>=media-libs/libcanberra-0.4[gtk3]
+	sys-libs/zlib
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.22:3
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/pango
+	applet? ( >=mate-base/mate-panel-1.17.0 )
+	udisks? ( >=sys-fs/udisks-1.90.0:2 )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	virtual/libintl
+"
+
+DEPEND="${COMMON_DEPEND}
+	app-text/rarian
+	>=app-text/scrollkeeper-dtd-1:1.0
+	app-text/yelp-tools
+	dev-libs/libxml2
+	dev-util/glib-utils
+	dev-util/gtk-doc
+	dev-util/gtk-doc-am
+	>=sys-devel/gettext-0.19.8:*
+	virtual/pkgconfig
+	x11-base/xorg-proto
+"
+
+src_prepare() {
+	# Make apps visible in all DEs.
+	LC_ALL=C find . -iname '*.desktop.in*' -exec \
+		sed -e '/OnlyShowIn/d' -i {} + || die
+
+	mate_src_prepare
+}
+
+src_configure() {
+	mate_src_configure \
+		--enable-zlib \
+		--enable-debug=$(usex debug yes minimum) \
+		$(use_with X x) \
+		$(use_enable applet gdict-applet) \
+		$(use_enable ipv6) \
+		$(use_enable udisks disk_image_mounter)
+}
diff --git a/mate-extra/mate-utils/mate-utils-9999.ebuild b/mate-extra/mate-utils/mate-utils-9999.ebuild
index 2f8a04b..c6f2825 100644
--- a/mate-extra/mate-utils/mate-utils-9999.ebuild
+++ b/mate-extra/mate-utils/mate-utils-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,43 +8,50 @@ MATE_LA_PUNT="yes"
 inherit mate
 
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 
 DESCRIPTION="Utilities for the MATE desktop"
-LICENSE="GPL-2"
+LICENSE="FDL-1.1+ GPL-2+ GPL-3+ LGPL-2+"
 SLOT="0"
 
-IUSE="X applet debug ipv6 test"
+IUSE="X applet debug ipv6 test udisks"
+RESTRICT="!test? ( test )"
 
 COMMON_DEPEND="
-	dev-libs/atk:0
-	>=dev-libs/glib-2.36:2
+	dev-libs/atk
+	>=dev-libs/glib-2.50:2
 	>=gnome-base/libgtop-2.12:2=
-	>=media-libs/libcanberra-0.4:0[gtk3]
-	sys-libs/zlib:0
-	x11-libs/cairo:0
+	>=media-libs/libcanberra-0.4[gtk3]
+	sys-libs/zlib
+	x11-libs/cairo
 	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.14:3
-	x11-libs/libICE:0
-	x11-libs/libSM:0
-	x11-libs/libX11:0
-	x11-libs/libXext:0
-	x11-libs/pango:0
-	applet? ( >=mate-base/mate-panel-1.17.0 )"
+	>=x11-libs/gtk+-3.22:3
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/pango
+	applet? ( >=mate-base/mate-panel-1.17.0 )
+	udisks? ( >=sys-fs/udisks-1.90.0:2 )
+"
 
-RDEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+	virtual/libintl
+"
 
 DEPEND="${COMMON_DEPEND}
-	app-text/rarian:0
+	app-text/rarian
 	>=app-text/scrollkeeper-dtd-1:1.0
-	app-text/yelp-tools:0
+	app-text/yelp-tools
+	dev-libs/libxml2
+	dev-util/glib-utils
 	dev-util/gtk-doc
 	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.50.1:*
-	x11-proto/xextproto:0
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
+	>=sys-devel/gettext-0.19.8:*
+	virtual/pkgconfig
+	x11-base/xorg-proto
+"
 
 src_prepare() {
 	# Make apps visible in all DEs.
@@ -56,10 +63,10 @@ src_prepare() {
 
 src_configure() {
 	mate_src_configure \
-		--disable-maintainer-flags \
 		--enable-zlib \
 		--enable-debug=$(usex debug yes minimum) \
 		$(use_with X x) \
 		$(use_enable applet gdict-applet) \
-		$(use_enable ipv6)
+		$(use_enable ipv6) \
+		$(use_enable udisks disk_image_mounter)
 }
diff --git a/mate-extra/mate-utils/metadata.xml b/mate-extra/mate-utils/metadata.xml
index 516aaa5..eaae506 100644
--- a/mate-extra/mate-utils/metadata.xml
+++ b/mate-extra/mate-utils/metadata.xml
@@ -7,7 +7,6 @@
 	</maintainer>
 	<use>
 		<flag name="applet">Enable the mate dictionary applet</flag>
-		<flag name="gtk3">Build with GTK+3 instead of GTK+2</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">mate-desktop/mate-utils</remote-id>