gentoo resync : 28.04.2019

3 files changed, 2 insertions, 53 deletions

diff --git a/mate-base/mate-desktop/Manifest b/mate-base/mate-desktop/Manifest
index a108671779bc..89bf79317db6 100644
--- a/mate-base/mate-desktop/Manifest
+++ b/mate-base/mate-desktop/Manifest
@@ -1,5 +1,3 @@
-DIST mate-desktop-1.18.0.tar.xz 827332 BLAKE2B e5a0439c768a388a76f1bd2a7ba819d92fd020565d63d4b412c5edac54c28493e83d9fa9c5b9f7c82dd5d76338f257e7cb8db7318d7743f6101098f20d47db5c SHA512 0490e9810009923fa315e7f191103bc797c37f4417cf41bf317c55d26f7b52a848a65c28dde6903a861694c131ca52f3ed0be05cbbf6b2dd1cb216539f513220
 DIST mate-desktop-1.22.0.tar.xz 962580 BLAKE2B 0bc3418ab25fd9f30e216a5b845722327449f8d05944c028b4cb967acd6415ca9c3c560856485f34e90752c9a3263ba093e1eb69daaea2586c6371ad4c4ee22f SHA512 3950249c0bc026163da7f38a6fd5551c0e1e863e298e9d2ca224679b6c802d1deaf12e16ea873a2ea0539a7989a523d0495fb0dc4c556857203c0b04ab6edf7a
-EBUILD mate-desktop-1.18.0.ebuild 1099 BLAKE2B 4860142639df89d4b26afdd0345fb3ca15e731a8374d4afb44ffccc6e9a05a63bf170adce37a48cd7bad8a8020d39e37512b8e68e3d3fe910c67d4dc5a663ead SHA512 4e9d1a5d683ac97ae580bf1a0cd2fa7413b8ee6b074a0882e9c71e3fa4040d1af9585484663c193fd13e8e1d2414551c54eb09c9e65b3d550ebd3eb83af8afa7
-EBUILD mate-desktop-1.22.0.ebuild 1109 BLAKE2B 9803611be67f0adb1d3123514e36d593c098192ef8b5b35c56775e0b89797d07a6fc67ad107bd7c9a693fcbb3f6713f751538495cecd541a2de6fd19983650d0 SHA512 959a46cb55ef14ddabe7f6f780cbb88a343d8a2dbdc45cf46bba17a9428e27e35d1155fff86f6803df8900025bf9b8903fa75f037dc9cf81e15ffd35a4c8ca3f
+EBUILD mate-desktop-1.22.0.ebuild 1107 BLAKE2B b23dc26ec18e9f1d17d44e986ea56126ecf3e663e6dcc89ef1d2793ea2e2c76c2ad33313e6731d3f22e61177e4f5d95576f250dc808cbf1f77bd3e4f9c3dc846 SHA512 e0196b3c07cfc2d9200ba64e8942f309cb9b2ca8bb4ce0fe6b5721cc6c68d24d4a64870368a1f3c6a7d48f39fedaa06161be350b96a1375ac1f4161f08eabf94
 MISC metadata.xml 341 BLAKE2B d5ca73000fca7b5092f767fc927d65f32ab507a08f2d8c6f1a48d1a70ed25653467f75de3b556543512b3d7d9cc4b1704166eea72bd3ca708ad0b40e216e534a SHA512 7d54ddfb1e11f270908131ea9e1287efb589d0015305576d05bb2d57c74ec3778c004fa4a1533140026eeb4774c8b50f79045564877c9c2e06e4e446e101e08b
diff --git a/mate-base/mate-desktop/mate-desktop-1.18.0.ebuild b/mate-base/mate-desktop/mate-desktop-1.18.0.ebuild
deleted file mode 100644
index 1583d2db932b..000000000000
--- a/mate-base/mate-desktop/mate-desktop-1.18.0.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:*
-	virtual/pkgconfig:*
-	x11-base/xorg-proto"
-
-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
index 5046efd1706f..5bb00164ee03 100644
--- a/mate-base/mate-desktop/mate-desktop-1.22.0.ebuild
+++ b/mate-base/mate-desktop/mate-desktop-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="Libraries for the MATE desktop that are not part of the UI"