gentoo resync : 14.05.2020

4 files changed, 2 insertions, 148 deletions

diff --git a/mate-base/mate-settings-daemon/Manifest b/mate-base/mate-settings-daemon/Manifest
index 4f1810e52306..254dadc02270 100644
--- a/mate-base/mate-settings-daemon/Manifest
+++ b/mate-base/mate-settings-daemon/Manifest
@@ -1,8 +1,5 @@
-DIST mate-settings-daemon-1.22.0.tar.xz 810696 BLAKE2B 4b61441a96c3a5c59616f963b2356f418ccc81ca21ef1f3834a777f92779986afc114086ef16f42f69441031b24abb6e727a7326ae6209cb01545ae3359ca1da SHA512 e8fa2ba07195dd66a94312909be37abe67089c7a687afee3bfde5860a598e84481949c9cdc7408886f90776556b41d5574bd6efc0614ed7583908214d59c6cb5
 DIST mate-settings-daemon-1.22.1.tar.xz 766556 BLAKE2B 5e0eeb497795eae666adbe046acf0594f0da0f8c4583d0933541a45e0eb6ece3662ac408385ff21cc2db4f566fce4aa3685e8e0aee2d2ab1e9f22e0cf12ad24b SHA512 9a7d9d81f18e2603c45fab223b3341df1939ee92b0e2db00f0ca5c095a88511c67b33d668b951b1a8f93c81c1e801bfd35729e64fab8bf2962af1e443d8448b6
 DIST mate-settings-daemon-1.24.0.tar.xz 1026248 BLAKE2B 134ad9c23488ae4a9619e5d9d4465bd3f2cbbacbd3b3e78924c3adcc95a88a8499c24b1c7bd844994b67517407c08c6bf22471597ad9311a4ae04cd7c96996fc SHA512 897d3540930ac407d802c9ecd1995e9bfee14eafadbbfad64aab1e7d93c9830111ac991d8f0df37e34efaa3f7cae9d59ee4d786b15acf0b87b8ba5d299bc1cc1
-EBUILD mate-settings-daemon-1.22.0-r1.ebuild 1595 BLAKE2B 657e08d60de47c42bb51b6a7aa502e70977c8ad84e715d3634daa000439c0a41410f3379487af95d21a9e57691980883665a72ab34905c6e0ff8c9837f8c7d1d SHA512 a779c25b34da31d583c69ad5942b6d3a2bdcaeb276df994ebe46e54caeb7e294114914ae3222a4dc7f95dc7432593d5b278671cf5c9e236402b868e46deb4167
-EBUILD mate-settings-daemon-1.22.0.ebuild 1561 BLAKE2B 13ebfdc12032845a924b3a7747c10596b5f6dd50d044d79a9f0d72dfacd5e0d168519ca3bfb01919ed2cf79c2e15b360216f334d05dba9193f8979d5a5a153a0 SHA512 c45f9acbf641e67e0b9059db26f7d336d5fbe29ace914fe1f9009858deb02e477d6d569000b6ac9fc22dfd83bf46b4669704f60d51e699116497535f6bc0621a
-EBUILD mate-settings-daemon-1.22.1.ebuild 1572 BLAKE2B 1cf18161241a52da00b9df73352d5630239f3bcaf8cc13fd89d3710cf93384ae14160ca0888bad314799da1639e714324a04ce0d6be802b52003626bbc1c27bc SHA512 cd6841f887bd103c84b3fdb3be14ec476dbec5ec4ab6634116aa70319da5655ebf28e047b63afc79e7aa82cc89634aed43efa4cd01d9357bf5d424c3eac456c1
+EBUILD mate-settings-daemon-1.22.1.ebuild 1570 BLAKE2B ac542583af47ee72c01176619fd9999d95466360e93bae97cc5c167d9b52ada71e31afb6d247473d0a4df5b6b5cdad503e786e7a36014775ce98a953e667c011 SHA512 edcdb4412837eab021d35ebb71c5ee336be67da2c72ac7572e664239d7053abf29c680c61a372e8f253c402b4996ba59bd0939311521a0561a74cd089fad4171
 EBUILD mate-settings-daemon-1.24.0.ebuild 1558 BLAKE2B be7608b9e2664205f154dc1d8ab760e664d02ea05a942620c8db221780de30af49702fac642c7e39a865bf8ac72efe36978501a29cadb3f3626f85ffcb10462f SHA512 84dcd4b18eeb3f7b9440984b0b8c4dcc01d156d4029ed65d95575e6e3d4763f7b6c7ab2c60315340a6d940e3261baa3df6fad5ba1ab12b84c1bce501642dcb06
 MISC metadata.xml 418 BLAKE2B c2bac7304f03cc8ce38351a4418a08bceb9bb71c1fde52acd7fafab37802c6c8d1bba307f84191944b7196e7220a93ea3c622f1c1db8aa93b13a51616c1fbdd9 SHA512 e87db5a05fd52a6660562ac76d26c2b978e6c0dab871eedb65172dbe2c24b2e090966d6808b6f2748f6807543d47a7e7455618bfb876d58e76ac01ae2a6622a7
diff --git a/mate-base/mate-settings-daemon/mate-settings-daemon-1.22.0-r1.ebuild b/mate-base/mate-settings-daemon/mate-settings-daemon-1.22.0-r1.ebuild
deleted file mode 100644
index d370a5addaa7..000000000000
--- a/mate-base/mate-settings-daemon/mate-settings-daemon-1.22.0-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2020 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 ~arm64 ~x86"
-fi
-
-DESCRIPTION="MATE Settings Daemon"
-LICENSE="GPL-2+ GPL-3+ HPND LGPL-2+ LGPL-2.1+"
-SLOT="0"
-
-IUSE="X debug libnotify policykit pulseaudio rfkill smartcard +sound"
-
-REQUIRED_USE="pulseaudio? ( sound )"
-
-COMMON_DEPEND=">=dev-libs/dbus-glib-0.74
-	>=dev-libs/glib-2.50:2
-	>=gnome-base/dconf-0.13.4
-	>=mate-base/libmatekbd-1.17.0
-	>=mate-base/mate-desktop-1.21.1
-	media-libs/fontconfig:1.0
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.22:3
-	x11-libs/libX11
-	x11-libs/libXi
-	x11-libs/libXext
-	x11-libs/libXxf86misc
-	>=x11-libs/libxklavier-5.2
-	virtual/libintl
-	libnotify? ( >=x11-libs/libnotify-0.7:0 )
-	policykit? (
-		>=dev-libs/dbus-glib-0.71
-		>=sys-apps/dbus-1.1.2
-		>=sys-auth/polkit-0.97
-	)
-	pulseaudio? (
-		>=media-libs/libmatemixer-1.10[pulseaudio]
-		>=media-sound/pulseaudio-0.9.15
-	)
-	smartcard? ( >=dev-libs/nss-3.11.2 )
-	sound? (
-		>=media-libs/libmatemixer-1.10
-		media-libs/libcanberra[gtk3]
-	)"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.50.1
-	sys-devel/gettext
-	virtual/pkgconfig
-	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 rfkill) \
-		$(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
deleted file mode 100644
index fa1dd2df9e1b..000000000000
--- a/mate-base/mate-settings-daemon/mate-settings-daemon-1.22.0.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2020 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 ~arm64 x86"
-fi
-
-DESCRIPTION="MATE Settings Daemon"
-LICENSE="GPL-2+ GPL-3+ HPND LGPL-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
-	>=dev-libs/glib-2.50:2
-	>=gnome-base/dconf-0.13.4
-	>=mate-base/libmatekbd-1.17.0
-	>=mate-base/mate-desktop-1.21.1
-	media-libs/fontconfig:1.0
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.22:3
-	x11-libs/libX11
-	x11-libs/libXi
-	x11-libs/libXext
-	x11-libs/libXxf86misc
-	>=x11-libs/libxklavier-5.2
-	virtual/libintl
-	libnotify? ( >=x11-libs/libnotify-0.7:0 )
-	policykit? (
-		>=dev-libs/dbus-glib-0.71
-		>=sys-apps/dbus-1.1.2
-		>=sys-auth/polkit-0.97
-	)
-	pulseaudio? (
-		>=media-libs/libmatemixer-1.10[pulseaudio]
-		>=media-sound/pulseaudio-0.9.15
-	)
-	smartcard? ( >=dev-libs/nss-3.11.2 )
-	sound? (
-		>=media-libs/libmatemixer-1.10
-		media-libs/libcanberra[gtk3]
-	)"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.50.1
-	sys-devel/gettext
-	virtual/pkgconfig
-	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.1.ebuild b/mate-base/mate-settings-daemon/mate-settings-daemon-1.22.1.ebuild
index da4d01d94ab8..9fc81d53e05b 100644
--- a/mate-base/mate-settings-daemon/mate-settings-daemon-1.22.1.ebuild
+++ b/mate-base/mate-settings-daemon/mate-settings-daemon-1.22.1.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"