gentoo resync : 14.05.2020

4 files changed, 2 insertions, 146 deletions

diff --git a/mate-base/mate-control-center/Manifest b/mate-base/mate-control-center/Manifest
index 67aa941db06a..51e3272fa89f 100644
--- a/mate-base/mate-control-center/Manifest
+++ b/mate-base/mate-control-center/Manifest
@@ -1,8 +1,5 @@
-DIST mate-control-center-1.22.1.tar.xz 1445012 BLAKE2B 2dc129280510432c25d158d6acdb50e58dfffd2e027fade545459669a6e6dbeafc4efe2cc81e19483427ec563daee903e2422e61ee398c88fec566cd80842639 SHA512 92390bf5eea459effbd94f0488cdaf3d7b6ff4f548f1aafead928d75e064e85ec1ac7796289f96af2ca8f6cbf3ef57bd2ae37058192af0ec976f4770ec8abeca
 DIST mate-control-center-1.22.2.tar.xz 1614216 BLAKE2B cb6dfe509740b2bedc036e849c85f9b752a56310fffe1bb31a19edfd428b3e2e35bf3a5bff9d83e3b72fc05f7bbd97bccd003340bfcb8cb43e9b6964a63957e8 SHA512 994563b8970ebf51ba44afe49122e82ff67fdb6c78ab2e8175acc6f619d40a82284cbafc1d61b89b25ac9e8488b00f63433eda94118d40a4fbff0d644ae1ddd5
 DIST mate-control-center-1.24.0.tar.xz 3488572 BLAKE2B 683b3326deeacf3f47a8ca3201de66a492cac022ae341dfc54cdc97c9a5260e223a082a3dd899b31680e4a8e5b3237d0338c7fd8125468f75e1b00b4e6a130c7 SHA512 78e70bc94a34f8e6083d1951b12fcb9f7e8b7c55c5fac612ee27c8175e91b3872f6ecf15162e747444586612a94f857a02fb91a6fad142b5d0a16e749792c2ce
-EBUILD mate-control-center-1.22.1-r1.ebuild 1562 BLAKE2B 84d70e204156ffdb750a1cc3355efe247579e9d940db96cbcb45d98d0bef053c0be4a3e91d4d25d5ea5d96d8c9310c4b9a3bbe9ed2fd871351abd7b812374aa5 SHA512 46d1d4359b7e677264e71c2fdfb6eec19cb78ba8dbba3e02b8dad0810e8300922f77f527573b5e9367108866aaa2c9595714c8ac7d288c703584229557ff4564
-EBUILD mate-control-center-1.22.2-r1.ebuild 1541 BLAKE2B e65c328acdd70874c9760984c053b277031112d753439cbf9f2d0a60581da436fc56643c1b2f2071784acc37e28942d409c0ddbddfaab83748146732575d334f SHA512 903808162b73c900d3b0accca6db4fea38a801b59d18e845777cc375f7cc75f1fad3df219d04ac46a3b5e893668189e3ae825c1b4ffccccbde84b0b9294280ec
-EBUILD mate-control-center-1.22.2.ebuild 1539 BLAKE2B 1c5c0b999cc672f20b658edf83ac86111d23717ff006d066a8f641da831ccd4df7376580b7903db9a19c7e819bf63f1ebb210551f8341d71137510bf68140776 SHA512 53a3975d86fa9baba716b97b401acdf3231e55768e1198d812cdb98dce1576c05d71ce15d46ebcfed3434d3bfb467c02dce2e8a7c359d6bcd2da15ac0d191bb0
+EBUILD mate-control-center-1.22.2-r1.ebuild 1539 BLAKE2B 5b250b774169b23aaba4158a155866237683086f889162d3266cdc1add162e7b15685fa6a0f9c6df489f6a4c57158db8937d4d4e6efb4d85b627c1f7fb7163f6 SHA512 1c201d8f4c707654dc5b460b4e4952bccb2dae133e2c5006648edeb19e036392af5c30f56dbc6bfb3a0493d633e21f3d1ec8052a5c8b71dffff3d46c8961cc24
 EBUILD mate-control-center-1.24.0.ebuild 1557 BLAKE2B dc11305f1e33241ed8d5e786c0a960995e0c6c3e9da0600a556acfba1c33eb8fcaf836bcb19d68dd281f529edaf0b2049d467f81229d22b6da8b1ee81890b42a SHA512 c0072a918161cb82de812c417951264d64664f3af3ad498dab8b2c418368195a933a10622886f1737a9f1879ebe63957512930ea8b202fe978a4aa38aa240df0
 MISC metadata.xml 433 BLAKE2B 189e7b4c8a23defad0506d79de1bc2ee21a6538e9f591db9c11ea1e8b0743e209b7aa53c2a6e3c78c2f4729e8dfbd02e831081193c9124698fca283af8768e9f SHA512 487af436720ff58f170c6e2fcee903669c8bf7b8415dd81a2d1bb5b2feae2f4d1cfecdaed821ecf2e875bd26e9e3ce6013bec07c5e1d699581e0b0f5bb97b60a
diff --git a/mate-base/mate-control-center/mate-control-center-1.22.1-r1.ebuild b/mate-base/mate-control-center/mate-control-center-1.22.1-r1.ebuild
deleted file mode 100644
index 7ac9357bc872..000000000000
--- a/mate-base/mate-control-center/mate-control-center-1.22.1-r1.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="The MATE Desktop configuration tool"
-LICENSE="FDL-1.1+ GPL-2+ LGPL-2+ LGPL-2.1+ HPND"
-SLOT="0"
-
-IUSE="accountsservice appindicator debug"
-
-RDEPEND="
-	dev-libs/atk
-	>=dev-libs/dbus-glib-0.73
-	>=dev-libs/glib-2.50:2
-	dev-libs/libxml2:2
-	>=gnome-base/dconf-0.13.4
-	>=gnome-base/librsvg-2.0:2
-	>=mate-base/libmatekbd-1.17.0
-	>=mate-base/mate-desktop-1.21.2
-	>=mate-base/caja-1.20.0
-	>=mate-base/mate-menus-1.21.0
-	>=mate-base/mate-settings-daemon-1.21.2
-	>=media-libs/fontconfig-1:1.0
-	media-libs/freetype:2
-	media-libs/libcanberra:0[gtk3]
-	>=sys-apps/dbus-1
-	x11-apps/xmodmap
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.22:3
-	x11-libs/libX11
-	x11-libs/libXScrnSaver
-	x11-libs/libXcursor
-	x11-libs/libXext
-	>=x11-libs/libXi-1.5
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXxf86misc
-	>=x11-libs/libxklavier-4
-	x11-libs/pango
-	>=x11-wm/marco-1.17.0:=
-	virtual/libintl
-	accountsservice? ( sys-apps/accountsservice )
-	appindicator? ( dev-libs/libappindicator:3 )"
-
-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
-	x11-base/xorg-proto
-	virtual/pkgconfig"
-
-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.2-r1.ebuild b/mate-base/mate-control-center/mate-control-center-1.22.2-r1.ebuild
index 5e28188ba32e..32b3570daa7b 100644
--- a/mate-base/mate-control-center/mate-control-center-1.22.2-r1.ebuild
+++ b/mate-base/mate-control-center/mate-control-center-1.22.2-r1.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"
diff --git a/mate-base/mate-control-center/mate-control-center-1.22.2.ebuild b/mate-base/mate-control-center/mate-control-center-1.22.2.ebuild
deleted file mode 100644
index 6e0e3e43186d..000000000000
--- a/mate-base/mate-control-center/mate-control-center-1.22.2.ebuild
+++ /dev/null
@@ -1,70 +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="The MATE Desktop configuration tool"
-LICENSE="FDL-1.1+ GPL-2+ LGPL-2+ LGPL-2.1+ HPND"
-SLOT="0"
-
-IUSE="accountsservice appindicator debug"
-
-RDEPEND="
-	dev-libs/atk
-	>=dev-libs/dbus-glib-0.73
-	>=dev-libs/glib-2.50:2
-	dev-libs/libxml2:2
-	>=gnome-base/dconf-0.13.4
-	>=gnome-base/librsvg-2.0:2
-	>=mate-base/libmatekbd-1.17.0
-	>=mate-base/mate-desktop-1.21.2
-	>=mate-base/caja-1.20.0
-	>=mate-base/mate-menus-1.21.0
-	>=mate-base/mate-settings-daemon-1.21.2
-	>=media-libs/fontconfig-1:1.0
-	media-libs/freetype:2
-	media-libs/libcanberra:0[gtk3]
-	>=sys-apps/dbus-1
-	x11-apps/xmodmap
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.22:3
-	x11-libs/libX11
-	x11-libs/libXScrnSaver
-	x11-libs/libXcursor
-	x11-libs/libXext
-	>=x11-libs/libXi-1.5
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	>=x11-libs/libxklavier-4
-	x11-libs/pango
-	>=x11-wm/marco-1.17.0
-	virtual/libintl
-	accountsservice? ( sys-apps/accountsservice )
-	appindicator? ( dev-libs/libappindicator:3 )"
-
-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
-	x11-base/xorg-proto
-	virtual/pkgconfig"
-
-src_configure() {
-	mate_src_configure \
-		--disable-update-mimedb \
-		$(use_enable appindicator) \
-		$(use_enable debug)
-}