gentoo resync : 28.04.2019

3 files changed, 2 insertions, 75 deletions

diff --git a/mate-base/mate-settings-daemon/Manifest b/mate-base/mate-settings-daemon/Manifest
index d8b91178f4b0..eadb6a2c6d39 100644
--- a/mate-base/mate-settings-daemon/Manifest
+++ b/mate-base/mate-settings-daemon/Manifest
@@ -1,5 +1,3 @@
-DIST mate-settings-daemon-1.18.2.tar.xz 787004 BLAKE2B 4549948a25016389c280e2df190febb9c1fda3a88ee9354ea72a01e4b8fe973bd0d85c1fd1b3533589dcb1b304893099e6e0171a9be9c64c72fef3608375d86d SHA512 2e07f7873d8f1e75391ae6ab7a132ce1f90a3afe661ca263fff9db1b68c0a02dc53255d6382c2d69861f997f22711d062e43468041a0b3476cdd3a051dec7039
 DIST mate-settings-daemon-1.22.0.tar.xz 810696 BLAKE2B 4b61441a96c3a5c59616f963b2356f418ccc81ca21ef1f3834a777f92779986afc114086ef16f42f69441031b24abb6e727a7326ae6209cb01545ae3359ca1da SHA512 e8fa2ba07195dd66a94312909be37abe67089c7a687afee3bfde5860a598e84481949c9cdc7408886f90776556b41d5574bd6efc0614ed7583908214d59c6cb5
-EBUILD mate-settings-daemon-1.18.2.ebuild 1584 BLAKE2B 96356dd2bafc6daaeec05f58215aaf7000755655b1b9f415322919c289a6268bbd8fd010f800300d2ba2ad9aeee51ae785c2671d237387032b0517cc8233900f SHA512 497272e21ebb9d4ab19e3c955eef5ad54224d2ad69a80c5b86f0c59a072d6448db1ec86d0973a70c6291c1c4ffe88045892599aa90ab21fae89d4bdd94c8dfbf
-EBUILD mate-settings-daemon-1.22.0.ebuild 1541 BLAKE2B 67016b7d07244245679bed1509f1bf73ae14f6b77a853270d77864b53fee1579133445a4fc0cd6a02ccaa7a9e19dbf194d4fd3a7ac647112f948a0b85a558281 SHA512 0f62a5dc96492d49aef192942a5c33c5fef7b6371beb8a1c46b33b3bf1a3dd7f5dbbf5472906f8bf8fadff0e2e55c84d269bb3ef607fe2e8d4f90cdfd30e032a
+EBUILD mate-settings-daemon-1.22.0.ebuild 1539 BLAKE2B baf90527306a3a0debc15c3cc4d3e6f4fcda344967c6bf2233e9de697f3e833ddea6c83380ae6344f23e06a01a2237405b9afd653f44bc58b89398eefffc3599 SHA512 40dfdb1d993b5b503245486351992c14ecd755a26e42b71aa1a92465d6cd49f8d55e889fd0a676a4751066f41298dfdbdb7f7362f1632d4f29114584e4f8650a
 MISC metadata.xml 349 BLAKE2B a6f74cac08d50c578b34f35764aaa46fe18c7b0003f19f3492c10fcf8cc3b1618fbb02c460de0d5cc7480e65a39a1e2ddb1029820f304f4b778e42af7589d801 SHA512 60b6cbc98f39edcf1716313dce83ee951c361f4cabf89232f8c0b8f482eb98bc262bdb748e5650d4fed4d7cbf084f02bbd534bb72dbab246abe95ba274f09abc
diff --git a/mate-base/mate-settings-daemon/mate-settings-daemon-1.18.2.ebuild b/mate-base/mate-settings-daemon/mate-settings-daemon-1.18.2.ebuild
deleted file mode 100644
index f61f1f6e488f..000000000000
--- a/mate-base/mate-settings-daemon/mate-settings-daemon-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="MATE Settings Daemon"
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-
-IUSE="X debug libnotify policykit pulseaudio smartcard +sound"
-
-REQUIRED_USE="pulseaudio? ( sound )"
-
-COMMON_DEPEND=">=dev-libs/dbus-glib-0.74:0
-	>=dev-libs/glib-2.17.3:2
-	>=gnome-base/dconf-0.13.4:0
-	>=mate-base/libmatekbd-1.17.0
-	>=mate-base/mate-desktop-1.17.0
-	media-libs/fontconfig:1.0
-	x11-libs/cairo:0
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.14:3
-	x11-libs/libX11:0
-	x11-libs/libXi:0
-	x11-libs/libXext:0
-	x11-libs/libXxf86misc:0
-	>=x11-libs/libxklavier-5.2:0
-	virtual/libintl:0
-	libnotify? ( >=x11-libs/libnotify-0.7:0 )
-	policykit? (
-		>=dev-libs/dbus-glib-0.71:0
-		>=sys-apps/dbus-1.1.2:0
-		>=sys-auth/polkit-0.97:0
-	)
-	pulseaudio? (
-		>=media-libs/libmatemixer-1.10:0[pulseaudio]
-		>=media-sound/pulseaudio-0.9.15:0
-	)
-	smartcard? ( >=dev-libs/nss-3.11.2:0 )
-	sound? (
-		>=media-libs/libmatemixer-1.10:0
-		media-libs/libcanberra:0[gtk3]
-	)"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.50.1:0
-	sys-devel/gettext:0
-	virtual/pkgconfig:0
-	x11-base/xorg-proto"
-
-src_configure() {
-	mate_src_configure \
-		$(use_with X x) \
-		$(use_with libnotify) \
-		$(use_with sound libcanberra) \
-		$(use_with sound libmatemixer) \
-		$(use_enable debug) \
-		$(use_enable policykit polkit) \
-		$(use_enable pulseaudio pulse) \
-		$(use_enable smartcard smartcard-support)
-}
diff --git a/mate-base/mate-settings-daemon/mate-settings-daemon-1.22.0.ebuild b/mate-base/mate-settings-daemon/mate-settings-daemon-1.22.0.ebuild
index 5be6e8518d22..ecb57972ef2c 100644
--- a/mate-base/mate-settings-daemon/mate-settings-daemon-1.22.0.ebuild
+++ b/mate-base/mate-settings-daemon/mate-settings-daemon-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="MATE Settings Daemon"