gentoo resync : 18.05.2019

19 files changed, 589 insertions, 2 deletions

diff --git a/mate-base/Manifest.gz b/mate-base/Manifest.gz
index 8c7b9a6731a4..c297602f9ade 100644
--- a/mate-base/Manifest.gz
+++ b/mate-base/Manifest.gz
diff --git a/mate-base/caja/Manifest b/mate-base/caja/Manifest
index 42cdc1cca3f3..5350184a27d3 100644
--- a/mate-base/caja/Manifest
+++ b/mate-base/caja/Manifest
@@ -1,3 +1,5 @@
 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
 MISC metadata.xml 621 BLAKE2B a717b23dad86bcba48b97bec310d1dfb161a3c9ab051e84408f08409c45b1fad5fed38af6af2f75a54e3c29cf635ce5843d54af60a3ad22ed74fbafa0d8fab59 SHA512 95daee371a545e58bcf73daad3261589442121c6f6216d45fcb03e02e8e0d979d45527aa23d4252a60c25b6e9ff2b21d17f504724aaeae3ff97e745e23d963ca
diff --git a/mate-base/caja/caja-1.22.1.ebuild b/mate-base/caja/caja-1.22.1.ebuild
new file mode 100644
index 000000000000..950c9b46a39d
--- /dev/null
+++ b/mate-base/caja/caja-1.22.1.ebuild
@@ -0,0 +1,90 @@
+# 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/mate-applets/Manifest b/mate-base/mate-applets/Manifest
index 600554b6b10e..66a8b1f0aa94 100644
--- a/mate-base/mate-applets/Manifest
+++ b/mate-base/mate-applets/Manifest
@@ -1,4 +1,6 @@
 AUX mate-applets-1.22.0-cpupower.patch 1349 BLAKE2B 745b7c02a17a21d05494c25b4ffbb3451d94dadeda4c12b3ff7c5e889a8c8c311ac033344b6deffeab575ebe7e6b645f7c789f65ac5d5d57d033d05ea13cdc24 SHA512 214bdb8c711a7b1bef0f16bf2c2464578d46fa640ce5dcace6dbd74c08df5cb8276875ac6e7e7d4347125551c236c4813002798a3f478af2baaa94cea10df44a
 DIST mate-applets-1.22.0.tar.xz 7739668 BLAKE2B dc3768d2f5eb987907f1ffb1a049dff990140c66c51427dc9095298be92b17b2b1e9695f3c35dae73433e1e50d05477e94aad1697b2bf15706515c16150096d7 SHA512 2f3e17414171ec5ab6967b76b1291d99783c3091b51127788f99148f46d5f2068edf7d890c3ebca1a59c29cbda4a06be11c852e5e88d4dc58e9981d906c9e34c
+DIST mate-applets-1.22.1.tar.xz 7602112 BLAKE2B 22dc076d188cddf9c5160d7ecaddb14ecc41a575abac91b72959054f3fe1c961c80b1aa9171150e7c4ce61ccee0783572726386319312dc97f64d4f9266c1a6d SHA512 d132c8b5e433a557785745032235a5792d04edd7c249269d9a4066fb345b76955bdca71164f7b321f41f566803694d85d9cd7690fbd699daa54788572f0eb986
 EBUILD mate-applets-1.22.0.ebuild 1934 BLAKE2B 3799e17486bdf4129733260dc487d4726fe57c567f9b2dc7316b1c5e5838410311d172fa0a3d643728e167dd74d81c02d8deebd704d9cc6516acc3a86504a1a3 SHA512 4f1eb5ab368e46ea0d5f0ec3bf395b5cd19f7c42a0a4b80e1e0a7a41d116957757bb48d7cca305df10c413c4b2023e4328c4f52cfa4e75f31445fb5a62cec099
+EBUILD mate-applets-1.22.1.ebuild 1920 BLAKE2B 108297d6bde19aaabc63b314ae23a18c69c186caca9aa128569a7ea1114b3cee145eb98378859f4af4fff46f71b16e4ccca32f63bb999336f431753fc0fc3546 SHA512 04fded7e4002a8215f8412aa0614dbad4488fee8b84ea2287b292f5974f9c6764cc8e4c0db6720db3897a15677937f277eb05e7d048eee5caef54f782accff7b
 MISC metadata.xml 341 BLAKE2B 5013e079fa6d6c8dca84a8798ce1e360942b8284816842662f0a783895575cc4df2e992d67862928d436b188f87fb29e21b5299b455a838849dac4ecf2588ef1 SHA512 20bc118f3d597db418636c77744f83f398c25ce2dc783bc61f81fda1c0520b3ca9b18ee5f4bed149fecc70436bc3d2a79ac311559e7d1ee085322eac5963e7c9
diff --git a/mate-base/mate-applets/mate-applets-1.22.1.ebuild b/mate-base/mate-applets/mate-applets-1.22.1.ebuild
new file mode 100644
index 000000000000..7ff7fbac0175
--- /dev/null
+++ b/mate-base/mate-applets/mate-applets-1.22.1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+DESCRIPTION="Applets for the MATE Desktop and Panel"
+LICENSE="GPL-2 FDL-1.1 LGPL-2"
+SLOT="0"
+
+IUSE="X ipv6 policykit +upower"
+
+COMMON_DEPEND="dev-libs/atk
+	>=dev-libs/dbus-glib-0.74
+	>=dev-libs/glib-2.50:2
+	>=dev-libs/libmateweather-1.17.0
+	>=dev-libs/libxml2-2.5:2
+	>=gnome-base/libgtop-2.12.0:2=
+	>=gnome-extra/gucharmap-3.0:2.90
+	>=mate-base/mate-panel-1.17.0
+	>=net-wireless/wireless-tools-28_pre9:0
+	>=sys-apps/dbus-1.1.2
+	sys-power/cpupower
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.22:3
+	x11-libs/gtksourceview:3.0
+	>=x11-libs/libnotify-0.7
+	x11-libs/libX11
+	>=x11-libs/libwnck-3.0:3
+	x11-libs/pango
+	virtual/libintl
+	policykit? ( >=sys-auth/polkit-0.97:0 )
+	upower? ( >=sys-power/upower-0.9.23 )
+	!!net-analyzer/mate-netspeed"
+
+RDEPEND="${COMMON_DEPEND}
+	>=mate-base/mate-settings-daemon-1.6"
+
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xml-dtd:4.3
+	app-text/rarian
+	>=app-text/scrollkeeper-dtd-1:1.0
+	app-text/yelp-tools
+	>=dev-util/intltool-0.50.1
+	dev-libs/libxslt
+	sys-devel/gettext:*
+	virtual/pkgconfig:*"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.22.0-cpupower.patch )
+
+src_configure() {
+	mate_src_configure \
+		--libexecdir=/usr/libexec/mate-applets \
+		--with-cpufreq-lib=cpupower \
+		$(use_with X x) \
+		$(use_with upower) \
+		$(use_enable ipv6) \
+		$(use_enable policykit polkit)
+}
+
+src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+	emake check
+}
+
+src_install() {
+	mate_src_install
+
+	local APPLETS="accessx-status battstat charpick command cpufreq drivemount
+			geyes mateweather multiload netspeed stickynotes
+			timerapplet trashapplet"
+
+	for applet in ${APPLETS}; do
+		docinto ${applet}
+
+		for d in AUTHORS ChangeLog NEWS README README.themes TODO; do
+			[ -s ${applet}/${d} ] && dodoc ${applet}/${d}
+		done
+	done
+}
diff --git a/mate-base/mate-control-center/Manifest b/mate-base/mate-control-center/Manifest
index 96998b8cbc3a..39fab6fc9069 100644
--- a/mate-base/mate-control-center/Manifest
+++ b/mate-base/mate-control-center/Manifest
@@ -1,3 +1,5 @@
 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
-MISC metadata.xml 427 BLAKE2B 3173ace743875b3fc77146513bea979bb88cfb6fd77845c1a4fdf733d19a32350caa6036b0db1d7c0ea7c9374fa3a862c22b60d99b134bae5827939fff1ba00a SHA512 ce23384af4d89040b75cc52a42890d6a61c2eafaf214a3ccc2137534371bcb7189c2948053b8a76de4cf9653ee422833d2d23a5ec740c9cdabdd95c4083771b3
+EBUILD mate-control-center-1.22.1.ebuild 1529 BLAKE2B 7c02df942f3fa1a4e4d05f6f352a621303d40f61e15edd51649d340c9e007180dbfe45f01473fc9f10bfe21f4c184bf4da2cfb265427a26031ff212d337b3a95 SHA512 ac134bac6c7d84aea4b1304c93197a17b1db2b39880dac13b683b8def7cee3198e94db0bf0fbbf0de724952fecd02e5b53382b1e8b4229d6d9f2db93cf04214c
+MISC metadata.xml 497 BLAKE2B 347467ee08069dc7467c58a2f16d13fe8ef5fed09e36797d6be25a43b53c1aad311cb8ac67ac7137e25ca71fe1ee08a65151fcfa3ec4f444fa5d9adf40c4142e SHA512 fb64ccce5b99663053bb6ae6b58197c22e452db909aa6751024bfe520b203b4996b662f5b3f919ce69bd2efbe254497edc4d36f4a15d284d67c4aa53e65b22e4
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
new file mode 100644
index 000000000000..ce347198bc92
--- /dev/null
+++ b/mate-base/mate-control-center/mate-control-center-1.22.1.ebuild
@@ -0,0 +1,71 @@
+# 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="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/metadata.xml b/mate-base/mate-control-center/metadata.xml
index 3442f108b7e3..ddbd22a4c058 100644
--- a/mate-base/mate-control-center/metadata.xml
+++ b/mate-base/mate-control-center/metadata.xml
@@ -6,6 +6,7 @@
 		<name>Gentoo MATE Desktop</name>
 	</maintainer>
 	<use>
+		<flag name="accountsservice">Add support for AccountsService</flag>
 		<flag name="appindicator">Add support for AppIndicator</flag>
 	</use>
 	<upstream>
diff --git a/mate-base/mate-desktop/Manifest b/mate-base/mate-desktop/Manifest
index 89bf79317db6..8b7c1f4da76e 100644
--- a/mate-base/mate-desktop/Manifest
+++ b/mate-base/mate-desktop/Manifest
@@ -1,3 +1,5 @@
 DIST mate-desktop-1.22.0.tar.xz 962580 BLAKE2B 0bc3418ab25fd9f30e216a5b845722327449f8d05944c028b4cb967acd6415ca9c3c560856485f34e90752c9a3263ba093e1eb69daaea2586c6371ad4c4ee22f SHA512 3950249c0bc026163da7f38a6fd5551c0e1e863e298e9d2ca224679b6c802d1deaf12e16ea873a2ea0539a7989a523d0495fb0dc4c556857203c0b04ab6edf7a
+DIST mate-desktop-1.22.1.tar.xz 901764 BLAKE2B 9da94899d48aa5b949dae466d9a581cd090feeba8b12949cbd9df20e79b8597420fb99785aab14f6a6faf2865e4a4b8356b2a2cc44d5eae087f37e7ec7957541 SHA512 bb2bf9de05439a0fcd4ab01ac628a2a235808cd07c1b7ce9abfbf2e64f98dc572603dfbd4a52bca5f03446825fba199715d7e08fcdc84f0df8d2ffeb4c87da62
 EBUILD mate-desktop-1.22.0.ebuild 1107 BLAKE2B b23dc26ec18e9f1d17d44e986ea56126ecf3e663e6dcc89ef1d2793ea2e2c76c2ad33313e6731d3f22e61177e4f5d95576f250dc808cbf1f77bd3e4f9c3dc846 SHA512 e0196b3c07cfc2d9200ba64e8942f309cb9b2ca8bb4ce0fe6b5721cc6c68d24d4a64870368a1f3c6a7d48f39fedaa06161be350b96a1375ac1f4161f08eabf94
+EBUILD mate-desktop-1.22.1.ebuild 1129 BLAKE2B e801fb39063917bd7300d261602fa242e55ab55f42b0fd26ad7af279f717696a50cd6af9df46a9a71b6e3717fe8616aa4e4e97fd54219b5a6b8a49430b2aba33 SHA512 6bdc8fbb1fdba56a9d35d5b2a4b6a8fa5641119ee8f24a864392003cc1563891d2517cf8a852df0d12765c8d8f1061dc95b6d8dc19b6b751f89d0ed78efbf04c
 MISC metadata.xml 341 BLAKE2B d5ca73000fca7b5092f767fc927d65f32ab507a08f2d8c6f1a48d1a70ed25653467f75de3b556543512b3d7d9cc4b1704166eea72bd3ca708ad0b40e216e534a SHA512 7d54ddfb1e11f270908131ea9e1287efb589d0015305576d05bb2d57c74ec3778c004fa4a1533140026eeb4774c8b50f79045564877c9c2e06e4e446e101e08b
diff --git a/mate-base/mate-desktop/mate-desktop-1.22.1.ebuild b/mate-base/mate-desktop/mate-desktop-1.22.1.ebuild
new file mode 100644
index 000000000000..5e9e06c3e18d
--- /dev/null
+++ b/mate-base/mate-desktop/mate-desktop-1.22.1.ebuild
@@ -0,0 +1,51 @@
+# 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="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.50:2
+	>=gnome-base/dconf-0.13.4
+	x11-libs/cairo
+	x11-libs/libX11
+	>=x11-libs/libXrandr-1.3
+	virtual/libintl
+	>=x11-libs/gtk+-3.22: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
+	app-text/iso-codes
+	dev-util/gtk-doc
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.40:*
+	gnome-base/librsvg
+	sys-devel/gettext:*
+	x11-base/xorg-proto
+	virtual/pkgconfig:*"
+
+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-menus/Manifest b/mate-base/mate-menus/Manifest
index c5733580dfea..9866f4813739 100644
--- a/mate-base/mate-menus/Manifest
+++ b/mate-base/mate-menus/Manifest
@@ -1,4 +1,5 @@
 AUX 10-xdg-menu-mate 113 BLAKE2B e49a76bdbbe1b08782ccd216afbc40bc49b4b16cb399c29e7a6860154cbd0d6d2712f85bd2edef53e9f53a4d92d29ec9524916f123d44e930a81cca3e60a3cb6 SHA512 8d4c30c79ecca4d1ff4dad7e7946f9e967ac33cf54dcccb1e1325bff298ffef6306bcf5865071e388e3a17ba77bc79896246a4b44b42c72c20ed13c4677fb8ef
 DIST mate-menus-1.22.0.tar.xz 355948 BLAKE2B f65bd45c4c7c04f11f9228499991d7c2dfa60a3e74e4cbfcffc3a02f09e8e6cad6b4b4adb6d9227a4e893bad9dc032afc6cce8098ea62fd133ef836cbe9abdf2 SHA512 7ca02c1bb89c83b6b331fc2e8878862fa8f02f5cd52b297aa44b36dd5c2d1ee1ffeb1641d63a10bd4deb99f63ded9c3b890a05ab7f7faf32d7f895b0a2f68d70
+EBUILD mate-menus-1.22.0-r1.ebuild 916 BLAKE2B b73e2c8d0da3732de9a8764c8e965fbd7a0cc712807ef7d55981bd2257cca1611891bde7c06b46abf295335bfcbef0395d0cb1d3b4134537ff31b33bd0faee58 SHA512 b0c7865ab2d8496265303dc190c46d036ea8b2610aefc5b267a6e510c512dc9c16daf5f8cd0a859e9ebe5b9d93a855d97f9805f30da35c576c9afdda1b1eab3a
 EBUILD mate-menus-1.22.0.ebuild 1241 BLAKE2B 528075625e963e20aa0ba14add0d55a10868509c1a464c281816c9972dea125fd1b2ea312d92fc90c129cc7261ec0ed85648a7c56e50a6a6154bf4ee7aed332b SHA512 edcbb1c98c76ab1d614e08be3054a8bbb1126856c29e437136498548d63315a7030db225774bd46ba9f4e5289df4df3df269a9dbd1389c1049ea30e81639274f
 MISC metadata.xml 339 BLAKE2B 0aa628f37ca885f294c05a4f97ecea8b57a588e02997ef0ab33485ada19abbae35e2c1ed5ed9f18c2b9143d9f0e4cf76ec2adbfec74a96062b5ddee0fb337dfc SHA512 39239eed6c1808d1b279a5924b2c66dfd38a4548b182b79e2a2f9c00f64a799c4e99d510b30a2ca179a918218e4e49b021e7cb3386c30c86b776a36f3800b03c
diff --git a/mate-base/mate-menus/mate-menus-1.22.0-r1.ebuild b/mate-base/mate-menus/mate-menus-1.22.0-r1.ebuild
new file mode 100644
index 000000000000..5fa032f4de2e
--- /dev/null
+++ b/mate-base/mate-menus/mate-menus-1.22.0-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+GNOME2_LA_PUNT="yes"
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+DESCRIPTION="MATE menu system, implementing the F.D.O cross-desktop spec"
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+
+IUSE="debug +introspection"
+
+COMMON_DEPEND=">=dev-libs/glib-2.50:2
+	virtual/libintl
+	introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )"
+
+RDEPEND="${COMMON_DEPEND}"
+
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/intltool-0.40
+	sys-devel/gettext:*
+	virtual/pkgconfig:*"
+
+src_configure() {
+	# Do NOT compile with --disable-debug/--enable-debug=no as it disables API
+	# usage checks.
+	mate_src_configure \
+		--enable-debug=$(usex debug yes minimum) \
+		$(use_enable introspection)
+}
+
+src_install() {
+	mate_src_install
+
+	exeinto /etc/X11/xinit/xinitrc.d/
+	doexe "${FILESDIR}/10-xdg-menu-mate"
+}
diff --git a/mate-base/mate-panel/Manifest b/mate-base/mate-panel/Manifest
index bee1960dc07f..9c6207e96d27 100644
--- a/mate-base/mate-panel/Manifest
+++ b/mate-base/mate-panel/Manifest
@@ -1,3 +1,5 @@
 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
 MISC metadata.xml 339 BLAKE2B d4e26fe24b5076b1a78c8de45bab802a438bd5fc171da7a6da6dc2460a7cb53677d4044abefc6c925a1b56d60d1a20fcb2334121ac0750d8347dc8ca3497b9c7 SHA512 788f53b6c90c485f6c8e4de2a9d1fd8f895b7c57cb7beeb0ec295a4710ceac5c8537ec9b3b567fbb5fae95cc08ce8892649a4198d40f30363b98f01267d67d26
diff --git a/mate-base/mate-panel/mate-panel-1.22.1.ebuild b/mate-base/mate-panel/mate-panel-1.22.1.ebuild
new file mode 100644
index 000000000000..fdfc53f24428
--- /dev/null
+++ b/mate-base/mate-panel/mate-panel-1.22.1.ebuild
@@ -0,0 +1,64 @@
+# 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 wayland"
+
+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.25.2:2
+	>=x11-libs/gtk+-3.22:3[introspection?]
+	x11-libs/libICE
+	x11-libs/libSM
+	>=x11-libs/libwnck-3.4.6: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:= )
+	wayland? ( dev-libs/wayland )"
+
+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) \
+		$(use_enable wayland)
+}
diff --git a/mate-base/mate-session-manager/Manifest b/mate-base/mate-session-manager/Manifest
index dd59a1a76934..49cac45ff0b4 100644
--- a/mate-base/mate-session-manager/Manifest
+++ b/mate-base/mate-session-manager/Manifest
@@ -5,5 +5,7 @@ AUX defaults.list 14293 BLAKE2B b8de50636f845e5ed197968a0f917a3d2c1f59b082ae7d76
 AUX mate-session-manager-1.22.0-elogind.patch 3002 BLAKE2B 90f18a3e7c98d5dbadd34c327bb9ac0a971f4585da35b401625641842ac05c8fe0385cbf1ab0955e16865c106d2046de44409a452ce4a251e09ec127a33390e4 SHA512 aa5fba7040879aeeba931d5cc62896ff43fc5d770664cfcd9ca45cbf5959e7eec3fa74ba632ef19d653b2516589119a8c2c1349c054be1e9a8d42ccf3dd755da
 AUX mate-session-manager-1.22.0-fix-systemd-regression.patch 1833 BLAKE2B 894f6f223fefc7921ef42d604fccb30d3f9efb80ecea1bc0637b286e57552a9eaaad2f42c6e6bb2cdddd396954dea2712c8aa02da5ba54ca2974acb54d825acc SHA512 7a0036c706b56d4431fbb3d54be77930aede8d8d1d0889a568bc0432d91b15026ac26ef4ccdc0f41a860a6adf1a88cf07d4c260c810f66f1a910ff568b4e90fb
 DIST mate-session-manager-1.22.0.tar.xz 603016 BLAKE2B 5d7064756b7d7d2ca4fdebf18319dc8a8d8eca6ed31c5e8e37e503c7099a0d541186028d6b4e174bff1ce9ca727a374e9597498b2ca6d5494dc74f21fec0baeb SHA512 7e5e21e37c7ac55ca7d71302edef9aabeccf39233aec9edfe93a2fdcd4150d039e8121adecebb3d0a4a707eccef0c7afa1b54c5b52b57853242964c7506eeb9a
+DIST mate-session-manager-1.22.1.tar.xz 580992 BLAKE2B 313f353597b072e0bc118f5e52258c73e4f5c9c51f0e27ed5c7763591b27df77a37439487b05142de99bbae19e595f01501189449331ca5dcf59ba0c5143a95c SHA512 1c47134813d24abef7b2f5df098120a2cd138f822ea3d687a1a2566224bbde21482bf40ac47ba08a39ed0899ff35eeac3c3690c83c006774c47f22189688990b
 EBUILD mate-session-manager-1.22.0.ebuild 2280 BLAKE2B ae5048819f2ce655cac39e0670b62b52a506575c1e0bccc7deafeb82881ffa1e36ad90ae567332ce24d61b31a19f1953442cca8228ab93fd3580ab5b8ff18c69 SHA512 ddf3a6d7769213a8a4e91a53f448a52c44c89e446ab2b25f5cbc28fbe3b019e7fd808bb67480885ca0a50b9b9d06df73526b1a781673b20dc388657f2eab88a0
+EBUILD mate-session-manager-1.22.1.ebuild 2186 BLAKE2B f3dff4e34f0bd4f0520870777b0a54641065620ed31c5a55cde92bf4047516ee1e80ac9169017e0d1271c27d96d232f3689d8940b9c4a40cc14dc76b6d05bd31 SHA512 dd44a1f281fadebb01d78ec1427164b32eef502bfd529f9fe2b6f420c281b4aecf260b7042107f8399af2717bef39d307d252edd606d1492eaaa62b8b58ca8e3
 MISC metadata.xml 497 BLAKE2B 85510300fad0274831fbbb5dbedb00bd3e6347518e0188838f8dce213064db44612ca7e7fbbe922cc46924f02f2fda50120ecba21774231af6e3acea45fc9db4 SHA512 19f431c7d3a9912baaa3df85fd222be5b2649f46a723ffdc084524b172c6c387e4a9928b219d9e73217c7e6ef677f2e5e82473547489001fc20fee7529373568
diff --git a/mate-base/mate-session-manager/mate-session-manager-1.22.1.ebuild b/mate-base/mate-session-manager/mate-session-manager-1.22.1.ebuild
new file mode 100644
index 000000000000..e42570ea404c
--- /dev/null
+++ b/mate-base/mate-session-manager/mate-session-manager-1.22.1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+DESCRIPTION="MATE session manager"
+HOMEPAGE="https://mate-desktop.org/"
+
+LICENSE="GPL-2 LGPL-2 FDL-1.1"
+SLOT="0"
+IUSE="debug elibc_FreeBSD elogind gnome-keyring ipv6 systemd +xtrans"
+
+REQUIRED_USE="?? ( elogind systemd )"
+
+# x11-misc/xdg-user-dirs{,-gtk} are needed to create the various XDG_*_DIRs, and
+# create .config/user-dirs.dirs which is read by glib to get G_USER_DIRECTORY_*
+# xdg-user-dirs-update is run during login (see 10-user-dirs-update-gnome below).
+
+COMMON_DEPEND="
+	>=dev-libs/dbus-glib-0.76
+	>=dev-libs/glib-2.50:2
+	dev-libs/libxslt
+	sys-apps/dbus
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.22:3
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libXext
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/pango
+	virtual/libintl
+	elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )
+	systemd? ( sys-apps/systemd )
+	!systemd? (
+		elogind? ( sys-auth/elogind )
+		!elogind? ( >=sys-auth/consolekit-0.9.2 )
+	)
+	xtrans? ( x11-libs/xtrans )"
+
+RDEPEND="${COMMON_DEPEND}
+	x11-apps/xdpyinfo
+	x11-misc/xdg-user-dirs
+	x11-misc/xdg-user-dirs-gtk
+	gnome-keyring? ( gnome-base/gnome-keyring )
+	!<gnome-base/gdm-2.20.4"
+
+DEPEND="${COMMON_DEPEND}
+	>=dev-lang/perl-5
+	dev-util/glib-utils
+	>=dev-util/intltool-0.40
+	>=sys-devel/gettext-0.10.40
+	virtual/pkgconfig"
+
+MATE_FORCE_AUTORECONF=true
+
+src_configure() {
+	mate_src_configure \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		$(use_with elogind) \
+		$(use_with systemd) \
+		$(use_with xtrans)  \
+		$(use_enable debug) \
+		$(use_enable ipv6)
+}
+
+src_install() {
+	mate_src_install
+
+	dodir /etc/X11/Sessions/
+	exeinto /etc/X11/Sessions/
+	doexe "${FILESDIR}"/MATE
+
+	dodir /usr/share/mate/applications/
+	insinto /usr/share/mate/applications/
+	doins "${FILESDIR}"/defaults.list
+
+	dodir /etc/X11/xinit/xinitrc.d/
+	exeinto /etc/X11/xinit/xinitrc.d/
+	doexe "${FILESDIR}"/15-xdg-data-mate
+
+	# This should be done in MATE too, see Gentoo bug #270852
+	doexe "${FILESDIR}"/10-user-dirs-update-mate
+}
diff --git a/mate-base/mate-settings-daemon/Manifest b/mate-base/mate-settings-daemon/Manifest
index eadb6a2c6d39..7763e882730c 100644
--- a/mate-base/mate-settings-daemon/Manifest
+++ b/mate-base/mate-settings-daemon/Manifest
@@ -1,3 +1,4 @@
 DIST mate-settings-daemon-1.22.0.tar.xz 810696 BLAKE2B 4b61441a96c3a5c59616f963b2356f418ccc81ca21ef1f3834a777f92779986afc114086ef16f42f69441031b24abb6e727a7326ae6209cb01545ae3359ca1da SHA512 e8fa2ba07195dd66a94312909be37abe67089c7a687afee3bfde5860a598e84481949c9cdc7408886f90776556b41d5574bd6efc0614ed7583908214d59c6cb5
+EBUILD mate-settings-daemon-1.22.0-r1.ebuild 1573 BLAKE2B 673643b13512e99632b3c562917d556dc390a5ca87f8aa36850f4bd60d3672b124c817401f33cac66ea1ef4694524fef1dad5bc8625e46f2b21e449aebb690e0 SHA512 588cb3822d770a0121ff56c7ec6f10e30bbb66922a9d41bab5aa7a29cd6d4c88e875cb805dfed3cc604a49089a8b80ecee352a8e0c2c1c6cd7630d55733a6c48
 EBUILD mate-settings-daemon-1.22.0.ebuild 1539 BLAKE2B baf90527306a3a0debc15c3cc4d3e6f4fcda344967c6bf2233e9de697f3e833ddea6c83380ae6344f23e06a01a2237405b9afd653f44bc58b89398eefffc3599 SHA512 40dfdb1d993b5b503245486351992c14ecd755a26e42b71aa1a92465d6cd49f8d55e889fd0a676a4751066f41298dfdbdb7f7362f1632d4f29114584e4f8650a
-MISC metadata.xml 349 BLAKE2B a6f74cac08d50c578b34f35764aaa46fe18c7b0003f19f3492c10fcf8cc3b1618fbb02c460de0d5cc7480e65a39a1e2ddb1029820f304f4b778e42af7589d801 SHA512 60b6cbc98f39edcf1716313dce83ee951c361f4cabf89232f8c0b8f482eb98bc262bdb748e5650d4fed4d7cbf084f02bbd534bb72dbab246abe95ba274f09abc
+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
new file mode 100644
index 000000000000..878cb4861cc8
--- /dev/null
+++ b/mate-base/mate-settings-daemon/mate-settings-daemon-1.22.0-r1.ebuild
@@ -0,0 +1,72 @@
+# 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="MATE Settings Daemon"
+LICENSE="GPL-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/metadata.xml b/mate-base/mate-settings-daemon/metadata.xml
index d216474cda3b..1b788213f0ac 100644
--- a/mate-base/mate-settings-daemon/metadata.xml
+++ b/mate-base/mate-settings-daemon/metadata.xml
@@ -8,4 +8,7 @@
 	<upstream>
 		<remote-id type="github">mate-desktop/mate-settings-daemon</remote-id>
 	</upstream>
+	<use>
+		<flag name="rfkill">build support for rfkill</flag>
+	</use>
 </pkgmetadata>