gentoo resync : 28.04.2019

3 files changed, 7 insertions, 81 deletions

diff --git a/mate-base/mate-control-center/Manifest b/mate-base/mate-control-center/Manifest
index 54f5f98fb6aa..96998b8cbc3a 100644
--- a/mate-base/mate-control-center/Manifest
+++ b/mate-base/mate-control-center/Manifest
@@ -1,5 +1,3 @@
-DIST mate-control-center-1.18.2.tar.xz 1351644 BLAKE2B 30c093b11f3cbf32e3590368001d8d929b8f611c4efd58f6332a70905ef028b8e573e41cbb20b5342ad2b0f459327d9665c4db77104bf49b2b8be4935adc232c SHA512 0acc6d775aa26dd0265ddab80317b2ddd2f027394b55574e29e6ad233b8711bc0984803f76f2cbaeed2bfd2b4397cd5143d5540908f5078080a1749290dac7ab
 DIST mate-control-center-1.22.0.tar.xz 1524084 BLAKE2B e0d7beb9fb358d6e60d6847fb6ee9e295793f856d25b0acf865efc360eefd446fa3f5a22d51121cd0fe675e01509b2612602587d4583b8835ec8e7157b795923 SHA512 3b2b88458848862a4c819d54104e9394817b29feb3d05117fe69441023ec5e6c922012395f24b5f70c9f9dbf6f8044f769840ec9996b1495441c4cb690f68371
-EBUILD mate-control-center-1.18.2.ebuild 1531 BLAKE2B 499ba1ad00d4be96d3875d6fcd80176ec3e9bcbd9ca7d6775ae83604ed8783a86a135833536811e96fe16f3fb55579986f4e7fef4e4b718f2a36e685fb3cc914 SHA512 cc6ef7367c9b00a8aabfa60581ab1f129ab59a83a417fb434506922a5d95c52269418a6a2c1953794c66f8d9507faa26197cb0632a0dd84be12b148f0f87e13a
-EBUILD mate-control-center-1.22.0.ebuild 1488 BLAKE2B 0cb11f9446d3a3802f95b080613ad154f309c5bf6ac2175350040f539dd20843e9b38475fc55c3f81b954bc87a5b705f32da50bfa2eef9ee92b6dfcc0918bf73 SHA512 49a04279739e44f49f084cbd054793d7e23c164a6161058c88baa5cc7361a985d7299060cef3172fc34c962fdf4e81cbcc4b8feb70a2ef6d9162c2bd2f71eb8e
+EBUILD mate-control-center-1.22.0.ebuild 1463 BLAKE2B 69431837de846c6d0263a6856fed99c47acc6984b7089105dcf1d2c168033f5011b25891d685278f4469c21666c26f89e8cb7dfe306cb1266a11ea7cb9313238 SHA512 ac923228e8044223ddd5c07d81b561d98fa8c5b89cf0309393a8f969362ffe366671fd8aad57eb5d28c795afafdea3e0e06472f688ea43605d11c619652650f1
 MISC metadata.xml 427 BLAKE2B 3173ace743875b3fc77146513bea979bb88cfb6fd77845c1a4fdf733d19a32350caa6036b0db1d7c0ea7c9374fa3a862c22b60d99b134bae5827939fff1ba00a SHA512 ce23384af4d89040b75cc52a42890d6a61c2eafaf214a3ccc2137534371bcb7189c2948053b8a76de4cf9653ee422833d2d23a5ec740c9cdabdd95c4083771b3
diff --git a/mate-base/mate-control-center/mate-control-center-1.18.2.ebuild b/mate-base/mate-control-center/mate-control-center-1.18.2.ebuild
deleted file mode 100644
index a16f1929ab70..000000000000
--- a/mate-base/mate-control-center/mate-control-center-1.18.2.ebuild
+++ /dev/null
@@ -1,71 +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="The MATE Desktop configuration tool"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="appindicator debug"
-
-COMMON_DEPEND="
-	dev-libs/atk:0
-	>=dev-libs/dbus-glib-0.73:0
-	>=dev-libs/glib-2.36:2
-	dev-libs/libxml2:2
-	>=gnome-base/dconf-0.13.4:0
-	>=gnome-base/librsvg-2.0:2
-	>=mate-base/libmatekbd-1.17.0
-	>=mate-base/mate-desktop-1.17.0
-	>=mate-base/caja-1.17.0
-	>=mate-base/mate-menus-1.1.0
-	>=mate-base/mate-settings-daemon-1.17.0
-	>=media-libs/fontconfig-1:1.0
-	media-libs/freetype:2
-	media-libs/libcanberra:0[gtk3]
-	>=sys-apps/dbus-1:0
-	x11-apps/xmodmap:0
-	x11-libs/cairo:0
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.14:3
-	x11-libs/libX11:0
-	x11-libs/libXScrnSaver:0
-	x11-libs/libXcursor:0
-	x11-libs/libXext:0
-	>=x11-libs/libXi-1.5:0
-	x11-libs/libXrandr:0
-	x11-libs/libXrender:0
-	x11-libs/libXxf86misc:0
-	>=x11-libs/libxklavier-4:0
-	x11-libs/pango:0
-	>=x11-wm/marco-1.17.0
-	virtual/libintl:0
-	appindicator? ( dev-libs/libappindicator:3 )"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/rarian:0
-	>=app-text/scrollkeeper-dtd-1:1.0
-	app-text/yelp-tools:0
-	dev-util/desktop-file-utils:0
-	>=dev-util/intltool-0.50.1:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*
-	x11-base/xorg-proto"
-
-src_configure() {
-	mate_src_configure \
-		--disable-update-mimedb \
-		$(use_enable appindicator) \
-		$(use_enable debug)
-}
diff --git a/mate-base/mate-control-center/mate-control-center-1.22.0.ebuild b/mate-base/mate-control-center/mate-control-center-1.22.0.ebuild
index d631f5548d9d..dca36e43fd8f 100644
--- a/mate-base/mate-control-center/mate-control-center-1.22.0.ebuild
+++ b/mate-base/mate-control-center/mate-control-center-1.22.0.ebuild
@@ -8,7 +8,7 @@ MATE_LA_PUNT="yes"
 inherit mate
 
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 DESCRIPTION="The MATE Desktop configuration tool"
@@ -17,7 +17,7 @@ SLOT="0"
 
 IUSE="appindicator debug"
 
-COMMON_DEPEND="
+RDEPEND="
 	dev-libs/atk
 	>=dev-libs/dbus-glib-0.73
 	>=dev-libs/glib-2.50:2
@@ -51,17 +51,16 @@ COMMON_DEPEND="
 	virtual/libintl
 	appindicator? ( dev-libs/libappindicator:3 )"
 
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
+DEPEND="${RDEPEND}
 	app-text/rarian
 	>=app-text/scrollkeeper-dtd-1:1.0
 	app-text/yelp-tools
 	dev-util/desktop-file-utils
+	dev-util/glib-utils
 	>=dev-util/intltool-0.50.1
-	sys-devel/gettext:*
+	sys-devel/gettext
 	x11-base/xorg-proto
-	virtual/pkgconfig:*"
+	virtual/pkgconfig"
 
 src_configure() {
 	mate_src_configure \