gentoo resync : 11.07.2019

18 files changed, 10 insertions, 442 deletions

diff --git a/mate-extra/Manifest.gz b/mate-extra/Manifest.gz
index 8388b322e56c..aa309383dcd8 100644
--- a/mate-extra/Manifest.gz
+++ b/mate-extra/Manifest.gz
diff --git a/mate-extra/caja-dropbox/Manifest b/mate-extra/caja-dropbox/Manifest
index 6f58064e9b0b..fcf4ae83bff7 100644
--- a/mate-extra/caja-dropbox/Manifest
+++ b/mate-extra/caja-dropbox/Manifest
@@ -1,5 +1,3 @@
-DIST caja-dropbox-1.22.0.tar.xz 313492 BLAKE2B ce14fc1f466e8da9e5d13b576602a9815bdf32c88b5e55a03f0fe20d17845030b383151194340d20c658e99dda0eff1b51c633e6adf2a1c60f3fcaa69f9e54d9 SHA512 d21f44c0e0f7f28a963fb8611e6992b3ea58ba2ad5910e440d286ab447f2f91e4776496569eb271ed25cb2628e35d2bd80d12bf832bc76011241f6b09903a8b2
 DIST caja-dropbox-1.22.1.tar.xz 309600 BLAKE2B a54778bae439a52babd4b9c88ed77ef9cebf01cb5e396e9e2dae0e74b1d55bb6b575d301133593b130af86ecb06f35fd2d11c3b7e3d67a7e741798ad701d788d SHA512 e7e9107c7654fac910762727782f35e3039b45e737341937d225126b2f63f8911f99281097b2488d3b79c0ed09fff4270b4c557166b94a722a2b1cd30fea2a2c
-EBUILD caja-dropbox-1.22.0-r1.ebuild 1979 BLAKE2B f24e1780de82e2b460fb975e64d44e57d5ec991ea52ad9e89c4f41acc23fb28bfd337c83d7b68b4532dccc76accb45b41552783acc465128b6d33a3674bab220 SHA512 504927581945733b0f7940480a21596e5befe85ff720d5555b5cc41df7f419c010683b2ca9e45880b8300da067d197ee19ed7a4dcbc89e8f8619da5a67950c29
 EBUILD caja-dropbox-1.22.1.ebuild 1981 BLAKE2B c99aac37e67beed943ccbd6c620dbdad6ab0013213df748f0936290b46d45f94c330c3b301ceea32d8976ee32a5ce1ca7dd7d8794629e7a5496bc1c42f3a8ebf SHA512 9c0354a1138d20cd3b54651f0a4d64df597f05dbb35db7e662d26e853ca4e276954f530125363c3438758c0160c8d1059ace3f98b7e6bb1d3da28d8724f51341
 MISC metadata.xml 341 BLAKE2B b530aa03ccd9e514d43bd1014500548a5931fcd30e288bdc9b6c56e9b4fa8dc42dd4a31074efe3b8ecb5f2f55aab3da8e7edd30fa5f3c1645cc088e594da7761 SHA512 3ef87b907e90f2093cece194a580099964f434ec7a1d43e961f0c00adeaeca085fc6e141f25f4ef7da0399e71093b4e2c12f52d0c29cd2aa3768354380ec1c37
diff --git a/mate-extra/caja-dropbox/caja-dropbox-1.22.0-r1.ebuild b/mate-extra/caja-dropbox/caja-dropbox-1.22.0-r1.ebuild
deleted file mode 100644
index 2cfc55e854c4..000000000000
--- a/mate-extra/caja-dropbox/caja-dropbox-1.22.0-r1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-MATE_LA_PUNT="yes"
-
-inherit mate python-single-r1 linux-info user
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 x86"
-fi
-
-DESCRIPTION="Store, Sync and Share Files Online"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="debug"
-
-COMMON_DEPEND="
-	dev-libs/atk
-	>=dev-libs/glib-2.50:2
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	>=mate-base/caja-1.19.1
-	media-libs/fontconfig:1.0
-	media-libs/freetype:2
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.22:3
-	x11-libs/libXinerama
-	x11-libs/pango"
-
-RDEPEND="${COMMON_DEPEND}
-	net-misc/dropbox"
-
-DEPEND="${COMMON_DEPEND}
-	dev-python/docutils
-	virtual/pkgconfig:*"
-
-CONFIG_CHECK="~INOTIFY_USER"
-
-pkg_setup () {
-	python-single-r1_pkg_setup
-	check_extra_config
-	enewgroup dropbox
-}
-
-MATE_FORCE_AUTORECONF=true
-
-src_prepare() {
-	# Use system dropbox.
-	sed -e "s|~/[.]dropbox-dist|/opt/dropbox|" \
-		-e 's|\(DROPBOXD_PATH = \).*|\1"/opt/dropbox/dropboxd"|' \
-			-i caja-dropbox.in || die
-
-	sed -e 's|\[rst2man\]|\[rst2man\.py\]|' -i configure.ac || die
-
-	mate_src_prepare
-}
-
-src_configure() {
-	mate_src_configure \
-		--disable-static \
-		$(use_enable debug)
-}
-
-src_install () {
-	python_fix_shebang caja-dropbox.in
-
-	mate_src_install
-
-	local extensiondir="$(pkg-config --variable=extensiondir libcaja-extension)"
-	[ -z ${extensiondir} ] && die "pkg-config unable to get caja extensions dir"
-
-	# Strip $EPREFIX from $extensiondir as fowners/fperms act on $ED not $D.
-	extensiondir="${extensiondir#${EPREFIX}}"
-	use prefix || fowners root:dropbox "${extensiondir}"/libcaja-dropbox.so
-	fperms o-rwx "${extensiondir}"/libcaja-dropbox.so
-}
-
-pkg_postinst () {
-	mate_pkg_postinst
-
-	elog
-	elog "Add any users who wish to have access to the dropbox caja"
-	elog "plugin to the group 'dropbox'. You need to setup a Dropbox account"
-	elog "before using this plugin. Visit ${HOMEPAGE} for more information."
-	elog
-}
diff --git a/mate-extra/mate-media/Manifest b/mate-extra/mate-media/Manifest
index 5cebd8ab4de3..5ca4bddacd32 100644
--- a/mate-extra/mate-media/Manifest
+++ b/mate-extra/mate-media/Manifest
@@ -1,5 +1,3 @@
-DIST mate-media-1.22.0.tar.xz 504312 BLAKE2B b91e3f22a082ca924459e89b0b3b9b98d9a17fb1a13c56ed78d723f34545bafaa560505ca2c373ebde9c04459ffe7f1945e8802d96f2737cc6ec2783d946eb35 SHA512 1c1751ebb0c848cece0e2fc10240832dff317dfcc08aa6721fe00feaf2cff907c700f5e0debd5a236078a199b9d65d59124ffca7a04f61d425d16b1adb02fc1f
 DIST mate-media-1.22.1.tar.xz 486664 BLAKE2B dae64f3a55137a760551261c1c92d34d4bf94c5057e16555d4c975f2ae6054812d6618cbaaf8da606392f23959118b8d98ffb2e6a8821d2171147ad2c74e6b73 SHA512 e7bce9128bc6e551cd918af669d52a7ca238a280a4ca09d15822f4d5b52fd9925b647278a39067a1f2a5dd0facfad4988385233939abbdf4aefecc21d2e089d9
-EBUILD mate-media-1.22.0.ebuild 732 BLAKE2B a1edd5c28e829b14cf899e7edbc3c48a298a5cf99752ddd35be9ecf22de26276917954a59820206b0479dcf8f9a574308dda031c87f37bf9b174d8690ae18383 SHA512 9dfc330c210f1bdb0171724bd0867de6f25ceb4b7ebf31f70c330d238d35caa6d5d4f1fbddb1eae790f5a68ee84f161fddca887684020a0c47ab2fb88630379b
-EBUILD mate-media-1.22.1.ebuild 734 BLAKE2B 1791b751e961fe62dc994be4445fa33bc80794539c0f3f7ad03655ff28732ae0a31a49a59ecadd6bc0af1092fac33f29c94ab1798406d9311faf08a812eed877 SHA512 4b9f9f744a93290abcdd4794c1ef4130c42a1f85b6f711e200e71825d435f05b35d2874a6c39b8eb9258c11ecd0613c096a62a1d4b1bc7359d7136a25252265c
+EBUILD mate-media-1.22.1.ebuild 732 BLAKE2B a1edd5c28e829b14cf899e7edbc3c48a298a5cf99752ddd35be9ecf22de26276917954a59820206b0479dcf8f9a574308dda031c87f37bf9b174d8690ae18383 SHA512 9dfc330c210f1bdb0171724bd0867de6f25ceb4b7ebf31f70c330d238d35caa6d5d4f1fbddb1eae790f5a68ee84f161fddca887684020a0c47ab2fb88630379b
 MISC metadata.xml 339 BLAKE2B bd032fdad5c46fb56210712a25e50c24959053249e43ebe7da6a6d2cfb099642acc949db166abca0c847cb661c6b20d59f03366abc290b4e0656a547ede52a8b SHA512 6975819ad5dd4234e702e7eaa36a05f3598a830b3f997ea17f299e1e7a40f5d3463b732ca1816e7e9af015c4afeecff2ea94dc0562a20b31698870ffc0489968
diff --git a/mate-extra/mate-media/mate-media-1.22.0.ebuild b/mate-extra/mate-media/mate-media-1.22.0.ebuild
deleted file mode 100644
index 66ec91a9100d..000000000000
--- a/mate-extra/mate-media/mate-media-1.22.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-DESCRIPTION="Multimedia related programs for the MATE desktop"
-LICENSE="LGPL-2 GPL-2 FDL-1.1"
-SLOT="0"
-
-IUSE=""
-
-COMMON_DEPEND=">=dev-libs/glib-2.50:2
-	dev-libs/libxml2:2
-	>=mate-base/mate-panel-1.17.0
-	>=mate-base/mate-desktop-1.17.0
-	>=media-libs/libcanberra-0.13[gtk3]
-	>=media-libs/libmatemixer-1.10.0
-	x11-libs/cairo
-	>=x11-libs/gtk+-3.22:3
-	x11-libs/pango
-	virtual/libintl"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.35.0
-	sys-devel/gettext:*
-	virtual/pkgconfig:*
-	!!<mate-base/mate-applets-1.8:*"
diff --git a/mate-extra/mate-media/mate-media-1.22.1.ebuild b/mate-extra/mate-media/mate-media-1.22.1.ebuild
index 03be87c0e796..66ec91a9100d 100644
--- a/mate-extra/mate-media/mate-media-1.22.1.ebuild
+++ b/mate-extra/mate-media/mate-media-1.22.1.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit mate
 
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 DESCRIPTION="Multimedia related programs for the MATE desktop"
diff --git a/mate-extra/mate-netbook/Manifest b/mate-extra/mate-netbook/Manifest
index 50ee489b0e59..947a168e9c2f 100644
--- a/mate-extra/mate-netbook/Manifest
+++ b/mate-extra/mate-netbook/Manifest
@@ -1,5 +1,3 @@
-DIST mate-netbook-1.22.0.tar.xz 314832 BLAKE2B 6d01b18bef37cde3c5c62c70460ebc539675a00c9550608d85085c0c678e84a672e7b112a832ade7d3900b851fa45b109729c7148eddb1dc5f058bac071fc3bf SHA512 faff1618e0a99b95b291d7556b1ccd5d0593be1ffa2b2ee30f4df2c9228ff797e9021cc7a0f6183c69b38fdb3dae1c4cb206539057174ff37a4b56b55d07c33a
 DIST mate-netbook-1.22.1.tar.xz 307776 BLAKE2B 8d10de7926023d1c0e9a92c2a55306db797e156948096936864332a79f0bdf91406df2ecf523b951eb6b1d0770dfbe705d913d75c74043bc78f765615af76bdf SHA512 d0ba10d798e779e89b656a5bab2f5524c36755d58b877ba18482171c7673c5217ecf39b8098ff7b258634fbae62638d70bdf11e17f02f47c68ca96058f0ebb03
-EBUILD mate-netbook-1.22.0.ebuild 622 BLAKE2B cde7be94e8aba73a28235cf06bf5072a696b55ab9ad729a6021ef5b4b6b37af1ead3d58288fb4729bd5740656cf3ea5613588e50d9e79af48dd3924eef585be1 SHA512 cd445d62bb26a99b75929b9d035e27f55d9da5e8f1e7d4c19106044357269ded1c21039bc8d8f255366d688cb20b6ffa0166b39aedf97d281830a1b9bb70a749
-EBUILD mate-netbook-1.22.1.ebuild 624 BLAKE2B bf999fdc0027a0dd010192f1388fdb5b1729dd28a2a575e3959932c29d9f6f0d1d4228dae55287f30d05bc08927ee5c457ddd6547c7938df24df43b4433d0a83 SHA512 fdfcfad65608a5b8e7265271fc00a74aee867a35a8a935d8eec464c91ed233af229f8cdefa6962f11908cf4df52b19db0ca48d8b11278a874d88c3cafd3410f7
+EBUILD mate-netbook-1.22.1.ebuild 622 BLAKE2B cde7be94e8aba73a28235cf06bf5072a696b55ab9ad729a6021ef5b4b6b37af1ead3d58288fb4729bd5740656cf3ea5613588e50d9e79af48dd3924eef585be1 SHA512 cd445d62bb26a99b75929b9d035e27f55d9da5e8f1e7d4c19106044357269ded1c21039bc8d8f255366d688cb20b6ffa0166b39aedf97d281830a1b9bb70a749
 MISC metadata.xml 495 BLAKE2B 69f4f61082d017e4e92917edcfb1fc9be696c5472641b0cd81714c07a29f4495644f4120fbd0292f8c5d1d40b3642a095969281ed2c2ad8896ff3156c3fba3bd SHA512 8edc358ede2010384cdecc1e430aa9cbf90bb64c3f52d71ad2bf30d4cb84e38bdf48a4b2e45920b35ada734ffe4a46b44f363b6bf18ba2247f6abe290b5131db
diff --git a/mate-extra/mate-netbook/mate-netbook-1.22.0.ebuild b/mate-extra/mate-netbook/mate-netbook-1.22.0.ebuild
deleted file mode 100644
index 483c783f4754..000000000000
--- a/mate-extra/mate-netbook/mate-netbook-1.22.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-DESCRIPTION="MATE utilities for netbooks"
-LICENSE="GPL-3"
-SLOT="0"
-
-IUSE=""
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.50:2
-	>=mate-base/mate-panel-1.17.0
-	>=x11-libs/gtk+-3.22:3
-	x11-libs/libfakekey
-	x11-libs/libwnck:3
-	x11-libs/libXtst
-	x11-libs/libX11
-	x11-libs/cairo
-	virtual/libintl"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	x11-base/xorg-proto
-	>=dev-util/intltool-0.50.1
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
diff --git a/mate-extra/mate-netbook/mate-netbook-1.22.1.ebuild b/mate-extra/mate-netbook/mate-netbook-1.22.1.ebuild
index e5c2cc8427e5..483c783f4754 100644
--- a/mate-extra/mate-netbook/mate-netbook-1.22.1.ebuild
+++ b/mate-extra/mate-netbook/mate-netbook-1.22.1.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit mate
 
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 DESCRIPTION="MATE utilities for netbooks"
diff --git a/mate-extra/mate-power-manager/Manifest b/mate-extra/mate-power-manager/Manifest
index b645a6362419..1f80922c5bfb 100644
--- a/mate-extra/mate-power-manager/Manifest
+++ b/mate-extra/mate-power-manager/Manifest
@@ -1,5 +1,3 @@
-DIST mate-power-manager-1.22.0.tar.xz 3182040 BLAKE2B 3635001cab5551a29ecf57ebfd84cb6f3dff9f3e16cefdbc7811c1ce9d140e543f6054925b460714ebd4aa8749e39326663866535394664b5ec2f0e94d92337e SHA512 d36ec8d328e00ccc14b26c36ded74f20ea80578870541899560c6a744018e5e91b08ec9b4d517548404e82da6f1868ed1f2fcc0aada1223f98e68dd6e6009503
 DIST mate-power-manager-1.22.1.tar.xz 3188048 BLAKE2B af32a18e2561cc9689382ff9a94382180a5d2dc6ade34a6dc400a7b65730a6c26c6f32b72b6ec973210ac3baf4e8b6c54e489230e64b877cee4ffbbf1a195d28 SHA512 8eabd7f8171f0a6be610c849fad8346bb30ca2c69208e2e117f436daaa5ada3bf0fef479dc017f32f56ec6bd52a7ff7ff69d18baf01b402c5fa2747245261a81
-EBUILD mate-power-manager-1.22.0.ebuild 1615 BLAKE2B e35d4d5c388d5ff46dfd56c22b0ef0bd6be2da3a433cabc69b0f8b8df663f72a8b92f432c5dd2a5f429fdee14b510f83e8dcdcb268fcb56e9d6366a6688d5de2 SHA512 0f94f0813876550377a681e006123e607f0aa2490973a62348b45d3b68ab5566f55750950ab568f0ebf122a6e9ad7101219c5f0236288f257abbce6628a1f261
-EBUILD mate-power-manager-1.22.1.ebuild 1617 BLAKE2B d9c718b7669ca354942bf9490ff404b15ba548066e5bc23538a803975524891cca6398107054a4d6499279d831b4022291081d425a0ceeddca8bb61e28087c18 SHA512 ca5e1f85209fa59e8342a467a202e2c0442700c91d834d2de2121794321b37646f838addb4363f010ce843c69916ea95d7bcb760ec76f4393fb679c64f224bdd
+EBUILD mate-power-manager-1.22.1.ebuild 1615 BLAKE2B e35d4d5c388d5ff46dfd56c22b0ef0bd6be2da3a433cabc69b0f8b8df663f72a8b92f432c5dd2a5f429fdee14b510f83e8dcdcb268fcb56e9d6366a6688d5de2 SHA512 0f94f0813876550377a681e006123e607f0aa2490973a62348b45d3b68ab5566f55750950ab568f0ebf122a6e9ad7101219c5f0236288f257abbce6628a1f261
 MISC metadata.xml 427 BLAKE2B 2a15897025c6693a2e99c56ee66f3c4da0fc62655c9d6e062451f7f8ef9d82b1fc8bd162d54b5fdee4a1cda0135f09c594f63c1609b622c9570568be05b2e6d7 SHA512 6922ccd9022b2b15fe7d57f196aa715aeed17f5f08d92444f3f07d8ef50f37dd48b62000adc5188076805138f651afea6af02c89d13f4abb3c66cd2419ccb30f
diff --git a/mate-extra/mate-power-manager/mate-power-manager-1.22.0.ebuild b/mate-extra/mate-power-manager/mate-power-manager-1.22.0.ebuild
deleted file mode 100644
index 011dc99ed914..000000000000
--- a/mate-extra/mate-power-manager/mate-power-manager-1.22.0.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-DESCRIPTION="A session daemon for MATE that makes it easy to manage your laptop or desktop"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+applet elogind gnome-keyring policykit systemd test"
-
-REQUIRED_USE="?? ( elogind systemd )"
-
-# Interactive testsuite.
-RESTRICT="test"
-
-COMMON_DEPEND="
-	>=dev-libs/dbus-glib-0.70
-	>=dev-libs/glib-2.50:2
-	>=media-libs/libcanberra-0.10:0[gtk3]
-	>=sys-apps/dbus-1
-	>=x11-apps/xrandr-1.3
-	>=x11-libs/cairo-1
-	>=x11-libs/gdk-pixbuf-2.11:2
-	>=x11-libs/gtk+-3.22:3
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrandr
-	>=x11-libs/libnotify-0.7:0
-	x11-libs/pango
-	applet? ( >=mate-base/mate-panel-1.17.0 )
-	gnome-keyring? ( >=gnome-base/libgnome-keyring-3 )
-	>=sys-power/upower-0.9.23:="
-
-RDEPEND="${COMMON_DEPEND}
-	policykit? ( >=mate-extra/mate-polkit-1.6 )
-	systemd? ( sys-apps/systemd )
-	!systemd? (
-		elogind? ( sys-auth/elogind )
-		!elogind? ( >=sys-auth/consolekit-0.9.2 )
-	)"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.3
-	app-text/rarian
-	>=app-text/scrollkeeper-dtd-1:1.0
-	app-text/yelp-tools
-	dev-util/glib-utils
-	>=dev-util/intltool-0.50.1
-	sys-devel/gettext
-	virtual/pkgconfig
-	x11-base/xorg-proto"
-
-src_configure() {
-	mate_src_configure \
-		--enable-compile-warnings=minimum \
-		$(use_with gnome-keyring keyring) \
-		$(use_enable applet applets) \
-		$(use_enable test tests)
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-
-	dbus-launch Xemake check || die "Test phase failed"
-}
diff --git a/mate-extra/mate-power-manager/mate-power-manager-1.22.1.ebuild b/mate-extra/mate-power-manager/mate-power-manager-1.22.1.ebuild
index 7d44bbf340ea..011dc99ed914 100644
--- a/mate-extra/mate-power-manager/mate-power-manager-1.22.1.ebuild
+++ b/mate-extra/mate-power-manager/mate-power-manager-1.22.1.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit mate
 
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 DESCRIPTION="A session daemon for MATE that makes it easy to manage your laptop or desktop"
diff --git a/mate-extra/mate-screensaver/Manifest b/mate-extra/mate-screensaver/Manifest
index a1540404f653..a89d9f565390 100644
--- a/mate-extra/mate-screensaver/Manifest
+++ b/mate-extra/mate-screensaver/Manifest
@@ -1,6 +1,4 @@
 AUX xss-conversion.txt 1026 BLAKE2B 4675ecb7d7ce45b28183ff503739b5d3853e8a68adfb8e4bf92274944c034d4f043c8854cc54a801ad72160bf452c645dfc5a0d35a71b967c9094f2a8464e59a SHA512 149d28bf7ff9dffe75f0a59408d91eff6537ec27a9457bf2419efe78e9b39a11796b341176e6ba4b1a183cc3ead080abe0ba85f51a3d57b0ff54dae8a3ec312a
-DIST mate-screensaver-1.22.0.tar.xz 4959732 BLAKE2B 23d7622ea992c8a29966a12a4e8db36fb489d0d07124907cb3fc2325dedb7fb99394bc551b0d889247989bbea27ba540fb17f55dbd12644e10a9abc242b07d8a SHA512 e253495ad700264ee7833d7b5a732cabff53058384801ff5e874d45f812cea1e4bd3877a1688ecec6197c37f32761f69a4924a47a6556332f1fec736e540e333
 DIST mate-screensaver-1.22.1.tar.xz 4942928 BLAKE2B e82b6482ed9ec655bb8bea2795b0e2559cbdfcb2be5f27a2264486a2013b8234cb02292b6ca547f8812e6dc0c74646f51af8a2f8d7baf2f28bf1b688508350d5 SHA512 7ffb94d88095ff5580862fe9c958a2e4af7a424d40dc5e0f3c1da49a258035179573721fc7052710624916678e953a6347a898b53ff872a49e022987b8c02904
-EBUILD mate-screensaver-1.22.0.ebuild 3251 BLAKE2B 4d18b9b6d63c22e0cbaf99facdc469b7b0faf78ea7dc2198a6b0fa6aa193e960168f672dedc47fd241e98305249ca25170f1f2180c67c02222254f8e8b4778aa SHA512 e69c1d310d8933b9d7e29583c2098feaa5f61bbfd0129c4bd7a0b6f0c3e175ca95920172cde0cc734f1c6af3aa71203e241d3d01df1de0b739264b344bc5aee5
-EBUILD mate-screensaver-1.22.1.ebuild 3088 BLAKE2B 73520bea9b93ae23a85aea3896f2da53d727466773acb1c539eb596e90554647af6add8293323ec218c147f5e57fee062a5601f027817a2eb7b96027f8934341 SHA512 488fe8be47268ea1e8ce9a544970db0d95aab5c9574bc66ee97b9ca8e02f3e8f8ea6cd85ae33743b17e464a31b77fe98a238eba3b76d75d4f324d50e84e6a3ea
+EBUILD mate-screensaver-1.22.1.ebuild 3086 BLAKE2B 3bed773d2a9d1ef3bd8bb07ee4cbc0b4ee43853fe5bc4420d954272eabf14b40edce2875e72be5402efccae46d35ca8572a7300a87e0bb0e8957f2ceaa96f591 SHA512 be123f59d695f2e463827071566e3ae85fa0a6b77f6c9b6f72e990a192831e018e5bbfc201c24497de071a8dda3d093bff0c880b096852c591e6cf60697e8747
 MISC metadata.xml 447 BLAKE2B febc277d7b427ae9a48c3c6e318b779f8a3fb9e27f896b17a3ebafec9bc8b03c4af3f30de7881fcc7feff674fdc0106d0b46f91d72d7267d4c4eeffb1dbe341a SHA512 29d7b99ddd69b2503d91f185679e1811403ba34443e20e2b17782878ee509565dcd62c2e3339709b3d29f568168c9c5c5a9284823d0187392220e781792b73e8
diff --git a/mate-extra/mate-screensaver/mate-screensaver-1.22.0.ebuild b/mate-extra/mate-screensaver/mate-screensaver-1.22.0.ebuild
deleted file mode 100644
index 92449016a7c4..000000000000
--- a/mate-extra/mate-screensaver/mate-screensaver-1.22.0.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate readme.gentoo-r1
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-DESCRIPTION="Replaces xscreensaver, integrating with the MATE desktop"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="X debug consolekit elogind kernel_linux libnotify opengl pam systemd"
-REQUIRED_USE="?? ( elogind systemd )"
-
-DOC_CONTENTS="
-	Information for converting screensavers is located in
-	/usr/share/doc/${PF}/xss-conversion.txt*
-"
-
-COMMON_DEPEND="
-	>=dev-libs/dbus-glib-0.71:0
-	>=dev-libs/glib-2.50:2
-	gnome-base/dconf
-	>=mate-base/libmatekbd-1.17.0
-	>=mate-base/mate-desktop-1.17.0
-	>=mate-base/mate-menus-1.10.0
-	>=sys-apps/dbus-0.30
-	>=x11-libs/gdk-pixbuf-2.14:2
-	>=x11-libs/libX11-1
-	x11-libs/cairo
-	>=x11-libs/gtk+-3.22:3
-	x11-libs/libXext
-	x11-libs/libXrandr
-	x11-libs/libXScrnSaver
-	x11-libs/libXxf86misc
-	x11-libs/libXxf86vm
-	x11-libs/libxklavier
-	x11-libs/pango
-	virtual/libintl
-	consolekit? ( sys-auth/consolekit )
-	libnotify? ( >=x11-libs/libnotify-0.7:0 )
-	opengl? ( virtual/opengl )
-	pam? ( gnome-base/gnome-keyring virtual/pam )
-	!pam? ( kernel_linux? ( sys-apps/shadow ) )
-	elogind? ( sys-auth/elogind )
-	systemd? ( sys-apps/systemd:= )
-	!!<gnome-extra/gnome-screensaver-3"
-
-RDEPEND="${COMMON_DEPEND}
-	>=mate-base/mate-session-manager-1.6"
-
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.50.1
-	sys-devel/gettext:*
-	x11-base/xorg-proto
-	virtual/pkgconfig:*"
-
-src_configure() {
-	local myconf=(
-		--enable-locking
-		--with-kbd-layout-indicator
-		--with-xf86gamma-ext
-		--with-xscreensaverdir=/usr/share/xscreensaver/config
-		--with-xscreensaverhackdir=/usr/$(get_libdir)/misc/xscreensaver
-		$(use_with X x)
-		$(use_with consolekit console-kit)
-		$(use_with libnotify)
-		$(use_with opengl libgl)
-		$(use_with systemd)
-		$(use_enable debug)
-		$(use_enable pam)
-	)
-
-	if use elogind; then
-		myconf+=(
-			--with-systemd
-			SYSTEMD_CFLAGS=`pkg-config --cflags "libelogind" 2>/dev/null`
-			SYSTEMD_LIBS=`pkg-config --libs "libelogind" 2>/dev/null`
-		)
-	fi
-
-	mate_src_configure "${myconf[@]}"
-}
-
-src_install() {
-	mate_src_install
-
-	# Install the conversion script in the documentation.
-	dodoc "${S}"/data/migrate-xscreensaver-config.sh
-	dodoc "${S}"/data/xscreensaver-config.xsl
-	dodoc "${FILESDIR}"/xss-conversion.txt
-
-	# Non PAM users will need this suid to read the password hashes.
-	# OpenPAM users will probably need this too when
-	# https://bugzilla.gnome.org/show_bug.cgi?id=370847
-	# is fixed.
-	if ! use pam ; then
-		fperms u+s /usr/libexec/mate-screensaver-dialog
-	fi
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	mate_pkg_postinst
-
-	if has_version "<x11-base/xorg-server-1.5.3-r4" ; then
-		ewarn "You have a too old xorg-server installation. This will cause"
-		ewarn "mate-screensaver to eat up your CPU. Please consider upgrading."
-		echo
-	fi
-
-	if has_version "<x11-misc/xscreensaver-4.22-r2" ; then
-		ewarn "You have xscreensaver installed, you probably want to disable it."
-		ewarn "To prevent a duplicate screensaver entry in the menu, you need to"
-		ewarn "build xscreensaver with -gnome in the USE flags."
-		ewarn "echo \"x11-misc/xscreensaver -gnome\" >> /etc/portage/package.use"
-		echo
-	fi
-
-	readme.gentoo_print_elog
-}
diff --git a/mate-extra/mate-screensaver/mate-screensaver-1.22.1.ebuild b/mate-extra/mate-screensaver/mate-screensaver-1.22.1.ebuild
index 1d3642612562..907a28193b77 100644
--- a/mate-extra/mate-screensaver/mate-screensaver-1.22.1.ebuild
+++ b/mate-extra/mate-screensaver/mate-screensaver-1.22.1.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit mate readme.gentoo-r1
 
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 DESCRIPTION="Replaces xscreensaver, integrating with the MATE desktop"
diff --git a/mate-extra/mate-sensors-applet/Manifest b/mate-extra/mate-sensors-applet/Manifest
index 8b9fdd0f10d2..c192e820124e 100644
--- a/mate-extra/mate-sensors-applet/Manifest
+++ b/mate-extra/mate-sensors-applet/Manifest
@@ -1,5 +1,3 @@
-DIST mate-sensors-applet-1.22.0.tar.xz 511876 BLAKE2B 6e2008d60a5530ab233da0fe67a38fea2abfba0d745386d82d44e21e59a5d7a08e7f97390f3b8e3df16699c8b69bf1f9c3d4762b45f4652838672c57ec91bf34 SHA512 f756fdff4dd8fe824fbe41956411ca1e6ce251fc1d43276c7244a8a806e91bacc283c412b831935136682971509e23c08538264963af31488bee15ce5644d5cb
 DIST mate-sensors-applet-1.22.1.tar.xz 496776 BLAKE2B 1f3ca3e7b6b48a3bdb4e3b370c65bd34bcbde250d21d2c9214eceadf790d2c1a45f87ccf615387edf9abaad2c3a899a536b78d8afece0574d735d80095c1b595 SHA512 4b6e608c92f03051044863f770b295d1526b19a9668513b566e81adeb28bc8524d8f458d114d2b44acf00f20c2f0a8d86b1ca7254fa165fde3b867c75a6b83e6
-EBUILD mate-sensors-applet-1.22.0-r1.ebuild 1341 BLAKE2B 4c5b0a611bc8bddc25f0c5fc0d91a36109aad973ce1ac7b2c232a023bf918ceb7af7b41c1f65c7027d0e4a515af2bb0cd452402b2baf1bf225571e77f6b5bc56 SHA512 92c2ed89a0b7969bcadda1f65f65cff201e9abc99fe52a42ab25b87c41453154e2d00c41304041907acf08c7af7535a98584f7e2d226587c5b320b6a987dbf54
-EBUILD mate-sensors-applet-1.22.1.ebuild 1343 BLAKE2B a98f8642e50aa7dc991c87112186fb2bb47661f75c5a662efccfc35eb7c4d8ee963c6056e5be59b724066e6e1c2dd10f0008001282f8d1f5d62737cabdeb7fa8 SHA512 711a98f3a37c7e1de8355983c57ba0b73a72176562d12ac93cd295facb2aafc1fd5ad6b303b5d5419a580ce9fa4e90b0d3aa4a6ccea6d90e4621220c20fdff0a
+EBUILD mate-sensors-applet-1.22.1.ebuild 1341 BLAKE2B 4c5b0a611bc8bddc25f0c5fc0d91a36109aad973ce1ac7b2c232a023bf918ceb7af7b41c1f65c7027d0e4a515af2bb0cd452402b2baf1bf225571e77f6b5bc56 SHA512 92c2ed89a0b7969bcadda1f65f65cff201e9abc99fe52a42ab25b87c41453154e2d00c41304041907acf08c7af7535a98584f7e2d226587c5b320b6a987dbf54
 MISC metadata.xml 348 BLAKE2B 3e34850491c3dce6bfe3771ed94ea37e68d9c8131594f4056c40e754f5556a4dbf03e434a0f3d19eaa6177a0a484a1b50b8de1c67a4eadf1faf6e5b56fa70166 SHA512 32cad99749c326ae12caa346b0bbf85779cbf9f35b85c4f729358dd7171d468f486c761e33d2938fcac445485ec256d733150d7dedc7c9e6b271702ba7c454ab
diff --git a/mate-extra/mate-sensors-applet/mate-sensors-applet-1.22.0-r1.ebuild b/mate-extra/mate-sensors-applet/mate-sensors-applet-1.22.0-r1.ebuild
deleted file mode 100644
index 7df62276db70..000000000000
--- a/mate-extra/mate-sensors-applet/mate-sensors-applet-1.22.0-r1.ebuild
+++ /dev/null
@@ -1,62 +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 x86"
-fi
-
-DESCRIPTION="MATE panel applet to display readings from hardware sensors"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="+dbus hddtemp libnotify lm_sensors video_cards_nvidia"
-
-COMMON_DEPEND=">=dev-libs/glib-2.50:2
-	>=mate-base/mate-panel-1.17.0
-	>=x11-libs/cairo-1.0.4
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.22:3
-	virtual/libintl
-	hddtemp? ( >=app-admin/hddtemp-0.3_beta13 )
-	libnotify? ( >=x11-libs/libnotify-0.7 )
-	lm_sensors? ( sys-apps/lm_sensors )
-	video_cards_nvidia? ( || (
-		>=x11-drivers/nvidia-drivers-100.14.09:0[static-libs,tools]
-	) )"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/rarian
-	>=app-text/scrollkeeper-dtd-1:1.0
-	app-text/yelp-tools
-	>=dev-util/intltool-0.50.1:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-PDEPEND="hddtemp? ( dbus? ( sys-fs/udisks:2 ) )"
-
-src_configure() {
-	local udisks
-
-	if use hddtemp && use dbus; then
-		udisks="--enable-udisks2"
-	else
-		udisks="--disable-udisks2"
-	fi
-
-	mate_src_configure \
-		--disable-netbsd \
-		--disable-static \
-		--without-aticonfig \
-		$(use_enable libnotify) \
-		$(use_with lm_sensors libsensors) \
-		$(use_with video_cards_nvidia nvidia) \
-		${udisks}
-}
diff --git a/mate-extra/mate-sensors-applet/mate-sensors-applet-1.22.1.ebuild b/mate-extra/mate-sensors-applet/mate-sensors-applet-1.22.1.ebuild
index 1bbeca988faf..7df62276db70 100644
--- a/mate-extra/mate-sensors-applet/mate-sensors-applet-1.22.1.ebuild
+++ b/mate-extra/mate-sensors-applet/mate-sensors-applet-1.22.1.ebuild
@@ -8,7 +8,7 @@ MATE_LA_PUNT="yes"
 inherit mate
 
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="amd64 ~arm x86"
 fi
 
 DESCRIPTION="MATE panel applet to display readings from hardware sensors"