gentoo resync : 11.07.2019

10 files changed, 6 insertions, 234 deletions

diff --git a/mate-base/Manifest.gz b/mate-base/Manifest.gz
index c297602f9ade..f6c74a31cc83 100644
--- a/mate-base/Manifest.gz
+++ b/mate-base/Manifest.gz
diff --git a/mate-base/caja/Manifest b/mate-base/caja/Manifest
index 5350184a27d3..ad632ee8c56a 100644
--- a/mate-base/caja/Manifest
+++ b/mate-base/caja/Manifest
@@ -1,5 +1,3 @@
-DIST caja-1.22.0.tar.xz 3562792 BLAKE2B 2f2a1d909e5e5a333228326b34daf8b5f461c836d2b132a78d53f93b14ab9ade5f39159adcb2ddb729838eca3eecdac1c0d3b98a875769bce942cd38cf88b664 SHA512 ca97a1e81cc7b061bb331d7a4574c76831dbff50bdc9ba0a162675def7278cf5dadb37aacb0e1e37a0ac2cf60df73f98353aaa36fa0e69a0097017eed5d325b6
 DIST caja-1.22.1.tar.xz 3462248 BLAKE2B d9c7c643778678e9562e0a2b79d04ea13eddd58dce00820d78452d670438aaef2ac86cc7ce341437c1496094ee625f462d0654c53a26705e835a6c612549792f SHA512 dea2e9cac7802df5335a716a1a7df149b637014525202600f4bf3eab293eff29bf2df66df22203aa036898149cb26ba1d05491234dc75203480925cce0333a17
-EBUILD caja-1.22.0.ebuild 2020 BLAKE2B 9be3ce9b680dee4987806c2fbc739f7d4eb3f96c08c136553f144ed34a672a86344698fc55fc3f2cbc55b740fc84e1c6efbe6c432e9bfec6f5f22a183c3a1503 SHA512 f4e6ee1163f4de21623fc8de82d26a6ba19bda87ed5e93034358833f6812928c09db671dc8c8d0f2c400145cd08725bae4e705708ecc75e135b61c17aa362086
-EBUILD caja-1.22.1.ebuild 2022 BLAKE2B 9d683410ab5ef38f3b4432e86b37855bd6b7a3457961487a0e3ee3390aea9434b31e71559b1c52cb22127070ec175a04f819a163a1c5209b2229e23af41daeba SHA512 b36c3317b1beb2b60c4483d35bddf2f8b07f65eb04fc00230147f8428a221464ac993277772c855c5977cd8ac558645f957afb103725fe297b3ad07e517df030
+EBUILD caja-1.22.1.ebuild 2020 BLAKE2B 9be3ce9b680dee4987806c2fbc739f7d4eb3f96c08c136553f144ed34a672a86344698fc55fc3f2cbc55b740fc84e1c6efbe6c432e9bfec6f5f22a183c3a1503 SHA512 f4e6ee1163f4de21623fc8de82d26a6ba19bda87ed5e93034358833f6812928c09db671dc8c8d0f2c400145cd08725bae4e705708ecc75e135b61c17aa362086
 MISC metadata.xml 621 BLAKE2B a717b23dad86bcba48b97bec310d1dfb161a3c9ab051e84408f08409c45b1fad5fed38af6af2f75a54e3c29cf635ce5843d54af60a3ad22ed74fbafa0d8fab59 SHA512 95daee371a545e58bcf73daad3261589442121c6f6216d45fcb03e02e8e0d979d45527aa23d4252a60c25b6e9ff2b21d17f504724aaeae3ff97e745e23d963ca
diff --git a/mate-base/caja/caja-1.22.0.ebuild b/mate-base/caja/caja-1.22.0.ebuild
deleted file mode 100644
index 606cd126e0bb..000000000000
--- a/mate-base/caja/caja-1.22.0.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-inherit mate virtualx
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-DESCRIPTION="Caja file manager for the MATE desktop"
-LICENSE="GPL-2 LGPL-2 FDL-1.1"
-SLOT="0"
-
-IUSE="+introspection +mate packagekit xmp"
-
-RDEPEND="
-	dev-libs/atk
-	>=dev-libs/glib-2.50:2
-	>=dev-libs/libxml2-2.4.7:2
-	gnome-base/dconf
-	>=gnome-base/gvfs-1.10.1:0[udisks]
-	>=mate-base/mate-desktop-1.17.3:0
-	>=media-libs/libexif-0.6.14:0
-	virtual/libintl
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.22:3[introspection?]
-	>=x11-libs/libnotify-0.7.0:0
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXft
-	x11-libs/libXrender
-	>=x11-libs/pango-1.1.2
-	introspection? ( >=dev-libs/gobject-introspection-0.6.4:= )
-	packagekit? ( app-admin/packagekit-base )
-	xmp? ( >=media-libs/exempi-1.99.5:2 )
-	!!mate-base/mate-file-manager"
-
-DEPEND="${RDEPEND}
-	>=dev-lang/perl-5:=
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.40.1
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-PDEPEND="mate? ( >=x11-themes/mate-icon-theme-${MATE_BRANCH} )"
-
-# TODO: Test fails because Caja is not merged yet:
-# GLib-GIO-ERROR **: Settings schema 'org.mate.caja.preferences' is not installed
-RESTRICT="test"
-
-src_prepare() {
-	# Remove unnecessary CFLAGS.
-	sed -i -e 's:-DG.*DISABLE_DEPRECATED::g' \
-		configure.ac eel/Makefile.am || die
-
-	mate_src_prepare
-}
-
-src_configure() {
-	mate_src_configure \
-		--disable-update-mimedb \
-		$(use_enable introspection) \
-		$(use_enable packagekit) \
-		$(use_enable xmp)
-}
-
-src_test() {
-	unset SESSION_MANAGER
-	unset DBUS_SESSION_BUS_ADDRESS
-
-	Xemake check || die "Test phase failed"
-}
-
-pkg_postinst() {
-	mate_pkg_postinst
-
-	elog "Caja can use gstreamer to preview audio files. Just make sure"
-	elog "to have the necessary plugins available to play the media type you"
-	elog "want to preview."
-}
diff --git a/mate-base/caja/caja-1.22.1.ebuild b/mate-base/caja/caja-1.22.1.ebuild
index 950c9b46a39d..606cd126e0bb 100644
--- a/mate-base/caja/caja-1.22.1.ebuild
+++ b/mate-base/caja/caja-1.22.1.ebuild
@@ -8,7 +8,7 @@ MATE_LA_PUNT="yes"
 inherit mate virtualx
 
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 DESCRIPTION="Caja file manager for the MATE desktop"
diff --git a/mate-base/mate-control-center/Manifest b/mate-base/mate-control-center/Manifest
index 39fab6fc9069..19ce99de4457 100644
--- a/mate-base/mate-control-center/Manifest
+++ b/mate-base/mate-control-center/Manifest
@@ -1,5 +1,3 @@
-DIST mate-control-center-1.22.0.tar.xz 1524084 BLAKE2B e0d7beb9fb358d6e60d6847fb6ee9e295793f856d25b0acf865efc360eefd446fa3f5a22d51121cd0fe675e01509b2612602587d4583b8835ec8e7157b795923 SHA512 3b2b88458848862a4c819d54104e9394817b29feb3d05117fe69441023ec5e6c922012395f24b5f70c9f9dbf6f8044f769840ec9996b1495441c4cb690f68371
 DIST mate-control-center-1.22.1.tar.xz 1445012 BLAKE2B 2dc129280510432c25d158d6acdb50e58dfffd2e027fade545459669a6e6dbeafc4efe2cc81e19483427ec563daee903e2422e61ee398c88fec566cd80842639 SHA512 92390bf5eea459effbd94f0488cdaf3d7b6ff4f548f1aafead928d75e064e85ec1ac7796289f96af2ca8f6cbf3ef57bd2ae37058192af0ec976f4770ec8abeca
-EBUILD mate-control-center-1.22.0.ebuild 1463 BLAKE2B 69431837de846c6d0263a6856fed99c47acc6984b7089105dcf1d2c168033f5011b25891d685278f4469c21666c26f89e8cb7dfe306cb1266a11ea7cb9313238 SHA512 ac923228e8044223ddd5c07d81b561d98fa8c5b89cf0309393a8f969362ffe366671fd8aad57eb5d28c795afafdea3e0e06472f688ea43605d11c619652650f1
-EBUILD mate-control-center-1.22.1.ebuild 1529 BLAKE2B 7c02df942f3fa1a4e4d05f6f352a621303d40f61e15edd51649d340c9e007180dbfe45f01473fc9f10bfe21f4c184bf4da2cfb265427a26031ff212d337b3a95 SHA512 ac134bac6c7d84aea4b1304c93197a17b1db2b39880dac13b683b8def7cee3198e94db0bf0fbbf0de724952fecd02e5b53382b1e8b4229d6d9f2db93cf04214c
+EBUILD mate-control-center-1.22.1.ebuild 1527 BLAKE2B 732935e4119ca89066495efaf44587a8b1f42dfc33cbc5a25d3761a2a9290d770139def5fba472cc954b17dc8b8581a569ae2f884b75fad261914690437d19bb SHA512 72e5d6761b2e8a6dabcaae40c701f61c03e320b7ec6a62353ca4e79a36ea3f479850b1a2c60f29c224c1b13069e8658e1303022393f32e3f77da5a38d634c24a
 MISC metadata.xml 497 BLAKE2B 347467ee08069dc7467c58a2f16d13fe8ef5fed09e36797d6be25a43b53c1aad311cb8ac67ac7137e25ca71fe1ee08a65151fcfa3ec4f444fa5d9adf40c4142e SHA512 fb64ccce5b99663053bb6ae6b58197c22e452db909aa6751024bfe520b203b4996b662f5b3f919ce69bd2efbe254497edc4d36f4a15d284d67c4aa53e65b22e4
diff --git a/mate-base/mate-control-center/mate-control-center-1.22.0.ebuild b/mate-base/mate-control-center/mate-control-center-1.22.0.ebuild
deleted file mode 100644
index dca36e43fd8f..000000000000
--- a/mate-base/mate-control-center/mate-control-center-1.22.0.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2019 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="GPL-2"
-SLOT="0"
-
-IUSE="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.1.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
-	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.1.ebuild b/mate-base/mate-control-center/mate-control-center-1.22.1.ebuild
index ce347198bc92..aacac89cb364 100644
--- a/mate-base/mate-control-center/mate-control-center-1.22.1.ebuild
+++ b/mate-base/mate-control-center/mate-control-center-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="The MATE Desktop configuration tool"
diff --git a/mate-base/mate-panel/Manifest b/mate-base/mate-panel/Manifest
index 9c6207e96d27..34e59cda97bf 100644
--- a/mate-base/mate-panel/Manifest
+++ b/mate-base/mate-panel/Manifest
@@ -1,5 +1,3 @@
-DIST mate-panel-1.22.0.tar.xz 2251040 BLAKE2B 6a4da6080cec2fc7858c711fa0a2c7497f4d03a1e22394f481925be32b17f7905920d4155ca75b9bf0d6bbf4af078aac77abc99e6d5a22e84bf453e2290ba032 SHA512 078c6dcdc17970a7a7fab9a218eaf2c8cd6c4074c0c23ff4ce7ccf57e007d0afcbe797be4ad4c9d2c16d9033cc554cc5a979ec61dc721514db939a5e60de456b
 DIST mate-panel-1.22.1.tar.xz 2142620 BLAKE2B 3b105c04cd2c1bf0c5077fb79dc8f0fea090eca96b766567a3921c25d35f915d36446ad765fd226f2fc2a70d4c95987a1c503bd60a92210f944fb50a83bc6a90 SHA512 023599a2c0a879e32df11fc09d7526a54b8dc5248173c940e61df1dd9cbe8c04e4c916da89f5a64e44fe3f99462d56c72849314fc182c0af58a7c19e1fac642f
-EBUILD mate-panel-1.22.0.ebuild 1350 BLAKE2B 4ce80bd99af1ec21b05dc2368be45a26a3c3b92fa2142cb1a8d6626e7fae4c7e373b31eb8f7ed2f3820a230ce954cc167c37aad00b8bd39b43f08a6113a45fc3 SHA512 07be1580b09cbe9e8b4d92d5972a68e67738efd67278f009598ec5b122ddbc8a1d34962193fe4d78534586c5443a0371774904882431dd60e6387a97edcb2d39
-EBUILD mate-panel-1.22.1.ebuild 1420 BLAKE2B 5ee1b7f38e5f335268535119dfb8f07788fa00252f7650756d9ac3ca3486e273fcd4325663ccbef2c7fbc9b1ceaa6f706b5d872c414b6002144215dc6b1b9fe2 SHA512 53d6dac4fef0e25623d4626dde7f8d6efae0df3ef600b92b25bfb839aa4290f526feca15987ac2e0f21e72e9e96c9f8a8d9261ad1479a1c32d818351d578a62d
+EBUILD mate-panel-1.22.1.ebuild 1418 BLAKE2B 9fe7783cf32a5d48fb100b09b87a6d42fc2fb0607998f3d6fb484e6bf838e884a65252daf2b0b2c6f146fa52b5725d7566624d9a6da679b1717657712a420f9c SHA512 1d5931b12edbaa79b75341d073e2ef6cd7dd696a025721ab0accebe22db67e73df9d79908b309f7c8db8bcbf3a0da9a9bd5fc00c99d8ee5c68d6b02c0e3913d1
 MISC metadata.xml 339 BLAKE2B d4e26fe24b5076b1a78c8de45bab802a438bd5fc171da7a6da6dc2460a7cb53677d4044abefc6c925a1b56d60d1a20fcb2334121ac0750d8347dc8ca3497b9c7 SHA512 788f53b6c90c485f6c8e4de2a9d1fd8f895b7c57cb7beeb0ec295a4710ceac5c8537ec9b3b567fbb5fae95cc08ce8892649a4198d40f30363b98f01267d67d26
diff --git a/mate-base/mate-panel/mate-panel-1.22.0.ebuild b/mate-base/mate-panel/mate-panel-1.22.0.ebuild
deleted file mode 100644
index f844c383f222..000000000000
--- a/mate-base/mate-panel/mate-panel-1.22.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2019 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 panel"
-LICENSE="GPL-2 FDL-1.1 LGPL-2"
-SLOT="0"
-
-IUSE="X +introspection"
-
-RDEPEND="
-	dev-libs/atk
-	>=dev-libs/dbus-glib-0.80:0
-	>=dev-libs/glib-2.50:2
-	>=dev-libs/libmateweather-1.17.0
-	dev-libs/libxml2:2
-	>=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.21.0
-	>=sys-apps/dbus-1.1.2
-	>=x11-libs/cairo-1
-	>=x11-libs/gdk-pixbuf-2.7.1:2
-	>=x11-libs/gtk+-3.22:3[introspection?]
-	x11-libs/libICE
-	x11-libs/libSM
-	>=x11-libs/libwnck-3.0:3[introspection?]
-	x11-libs/libX11
-	>=x11-libs/pango-1.15.4:0[introspection?]
-	x11-libs/libXau
-	>=x11-libs/libXrandr-1.3
-	virtual/libintl
-	introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )"
-
-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"
-
-src_configure() {
-	mate_src_configure \
-		--libexecdir=/usr/libexec/mate-applets \
-		--disable-deprecation-flags \
-		$(use_enable X x11) \
-		$(use_enable introspection)
-}
diff --git a/mate-base/mate-panel/mate-panel-1.22.1.ebuild b/mate-base/mate-panel/mate-panel-1.22.1.ebuild
index fdfc53f24428..fb93ff7449f1 100644
--- a/mate-base/mate-panel/mate-panel-1.22.1.ebuild
+++ b/mate-base/mate-panel/mate-panel-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="The MATE panel"