gentoo resync : 28.04.2019

3 files changed, 8 insertions, 74 deletions

diff --git a/mate-base/mate-panel/Manifest b/mate-base/mate-panel/Manifest
index 176cbf11c5e7..bee1960dc07f 100644
--- a/mate-base/mate-panel/Manifest
+++ b/mate-base/mate-panel/Manifest
@@ -1,5 +1,3 @@
-DIST mate-panel-1.18.7.tar.xz 1943216 BLAKE2B c811a299d612e11827f6531f3093addfeeb5a8f18449f76dba0f70233f072bd2666bb4cd8b39111da298fbdd966f5b7f21b37ce3fe4870129da0563faabc5a2f SHA512 6de91f16f5ade7873d2baf3d813bd77304723f27629474fdf37aa9c590b5fcb31452f5b117b52926dd53a38e9f8edd964c654fd29c8271131c6901eec46b5a31
 DIST mate-panel-1.22.0.tar.xz 2251040 BLAKE2B 6a4da6080cec2fc7858c711fa0a2c7497f4d03a1e22394f481925be32b17f7905920d4155ca75b9bf0d6bbf4af078aac77abc99e6d5a22e84bf453e2290ba032 SHA512 078c6dcdc17970a7a7fab9a218eaf2c8cd6c4074c0c23ff4ce7ccf57e007d0afcbe797be4ad4c9d2c16d9033cc554cc5a979ec61dc721514db939a5e60de456b
-EBUILD mate-panel-1.18.7.ebuild 1399 BLAKE2B d73452975ad5ccd4d0cb71b58b0a126fd137fea684af580bbab2c6aeeb869a382112bac1cf56d48c6f104ad80f53feac775f4913d9a81485e664f8c3d307e251 SHA512 3fccd420eab25eaa587c3ce124747c0bc742146d0058602c600fb4d5b7a7ba840cb98c64f4711bf6398d8de514b82c44a42dbb43fefabfd53dcdb7a26c9ae6f9
-EBUILD mate-panel-1.22.0.ebuild 1375 BLAKE2B a944020e27ea5b888cd4ff1f05f9dcf6420833fc728a04cba65f3c56d2c3526d6aead2a7c4e932d60793454db29c28cf65ee41a9948092f98fce745cac4a7f20 SHA512 69786a0c3574c8c69a5716ae7ffff2ec1b6e99c822f0104a52b91d3efcf4a781d2c46f20e633aab178829cc64bc84e1db8409ee2926b6162b5b0e9e8e758392d
+EBUILD mate-panel-1.22.0.ebuild 1350 BLAKE2B 4ce80bd99af1ec21b05dc2368be45a26a3c3b92fa2142cb1a8d6626e7fae4c7e373b31eb8f7ed2f3820a230ce954cc167c37aad00b8bd39b43f08a6113a45fc3 SHA512 07be1580b09cbe9e8b4d92d5972a68e67738efd67278f009598ec5b122ddbc8a1d34962193fe4d78534586c5443a0371774904882431dd60e6387a97edcb2d39
 MISC metadata.xml 339 BLAKE2B d4e26fe24b5076b1a78c8de45bab802a438bd5fc171da7a6da6dc2460a7cb53677d4044abefc6c925a1b56d60d1a20fcb2334121ac0750d8347dc8ca3497b9c7 SHA512 788f53b6c90c485f6c8e4de2a9d1fd8f895b7c57cb7beeb0ec295a4710ceac5c8537ec9b3b567fbb5fae95cc08ce8892649a4198d40f30363b98f01267d67d26
diff --git a/mate-base/mate-panel/mate-panel-1.18.7.ebuild b/mate-base/mate-panel/mate-panel-1.18.7.ebuild
deleted file mode 100644
index 40616e1e1392..000000000000
--- a/mate-base/mate-panel/mate-panel-1.18.7.ebuild
+++ /dev/null
@@ -1,63 +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 panel"
-LICENSE="GPL-2 FDL-1.1 LGPL-2"
-SLOT="0"
-
-IUSE="X +introspection"
-
-COMMON_DEPEND="
-	dev-libs/atk:0
-	>=dev-libs/dbus-glib-0.80:0
-	>=dev-libs/glib-2.36:2
-	>=dev-libs/libmateweather-1.17.0
-	dev-libs/libxml2:2
-	>=gnome-base/dconf-0.13.4:0
-	>=gnome-base/librsvg-2.36.2:2
-	>=mate-base/mate-desktop-1.17.0
-	>=mate-base/mate-menus-1.10.0
-	>=sys-apps/dbus-1.1.2:0
-	>=x11-libs/cairo-1:0
-	>=x11-libs/gdk-pixbuf-2.7.1:2
-	>=x11-libs/gtk+-3.20:3[introspection?]
-	x11-libs/libICE:0
-	x11-libs/libSM:0
-	>=x11-libs/libwnck-3.0:3[introspection?]
-	x11-libs/libX11:0
-	>=x11-libs/pango-1.15.4:0[introspection?]
-	x11-libs/libXau:0
-	>=x11-libs/libXrandr-1.3:0
-	virtual/libintl:0
-	introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/yelp-tools:0
-	>=dev-lang/perl-5:0=
-	dev-util/gdbus-codegen:0
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.50.1:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-src_configure() {
-	mate_src_configure \
-		--libexecdir=/usr/libexec/mate-applets \
-		--disable-deprecation-flags \
-		$(use_with X x) \
-		$(use_enable introspection)
-}
diff --git a/mate-base/mate-panel/mate-panel-1.22.0.ebuild b/mate-base/mate-panel/mate-panel-1.22.0.ebuild
index b185c6daaa0f..f844c383f222 100644
--- a/mate-base/mate-panel/mate-panel-1.22.0.ebuild
+++ b/mate-base/mate-panel/mate-panel-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 panel"
@@ -17,7 +17,7 @@ SLOT="0"
 
 IUSE="X +introspection"
 
-COMMON_DEPEND="
+RDEPEND="
 	dev-libs/atk
 	>=dev-libs/dbus-glib-0.80:0
 	>=dev-libs/glib-2.50:2
@@ -26,7 +26,7 @@ COMMON_DEPEND="
 	>=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.10.0
+	>=mate-base/mate-menus-1.21.0
 	>=sys-apps/dbus-1.1.2
 	>=x11-libs/cairo-1
 	>=x11-libs/gdk-pixbuf-2.7.1:2
@@ -41,18 +41,17 @@ COMMON_DEPEND="
 	virtual/libintl
 	introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )"
 
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
+DEPEND="${RDEPEND}
 	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
 	>=dev-util/intltool-0.50.1
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
+	sys-devel/gettext
+	virtual/pkgconfig"
 
 src_configure() {
 	mate_src_configure \