reinit the tree, so we can have metadata

author: V3n3RiX <venerix@redcorelinux.org> 2017-10-09 18:53:29 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2017-10-09 18:53:29 +0100
commit: 4f2d7949f03e1c198bc888f2d05f421d35c57e21 (patch)
tree: ba5f07bf3f9d22d82e54a462313f5d244036c768 /mate-base
89 files changed, 5392 insertions, 0 deletions
diff --git a/mate-base/caja/Manifest b/mate-base/caja/Manifest
new file mode 100644
index 000000000000..ad22884ab2d6
--- /dev/null
+++ b/mate-base/caja/Manifest
@@ -0,0 +1,11 @@
+DIST caja-1.12.7.tar.xz 3645820 SHA256 94bd13a34a8a1ef725bb9d9de7f0db8da16e701fc5bcf5d2f1d39c7af18f42cf SHA512 32761370cc419ab8d8f815a291782d1ce380d04bf2450dbcea9d0f17d91a1c0b9a487a67a51a0c769a5fcb11091638a7b60e27b28f3148899ba44fb6feb313da WHIRLPOOL 373e24e548f620a7c5c48838d8660a298c021b3c49bda3d524b3bde9d70b012ef057752c3be3eec8c3a170f28da294fa1b000debe7a3cc1e45e3ffa0e881170b
+DIST caja-1.14.2.tar.xz 3560252 SHA256 39a4d7ff1b71d1612d52cdc727ab13e34ec5960f532b406907b994cf99eebac6 SHA512 ef0c42e26fbeb2a2296c67fd0a1f59d18b104ba818761600dec2ab571fbd5a1d659471105b97a9fcd7b0e16afa1dfdf860decad1f65b299964017932f7dfdfbc WHIRLPOOL 56be105f1040a59c34d09d31998a8a60f8b17ad719c3efdfe3839c16296b5b239041f98da797f52c46fbcca61d55e374618a0f85c5155f3dbd9f0cfee485d2db
+DIST caja-1.16.1.tar.xz 3508944 SHA256 5d201a43bf8aff9366410d03a1a53906073c6bca2201887fcf513050bd69789d SHA512 c0b8f4aeec8c649c54d0ff7a51db4973547f3cac17b3b28a36b3656eeb8234cf25d185c547c0f1bcc015beeac25b5931a2db678227b183e3921f4b4feb2a6e0f WHIRLPOOL 974bfb4be62c4a7229c229654eff2f5f92471bcc2402a0d876ba1b15ba17598b9f087eee5596281cc18e4044075b1ae3f8902ba5b0d13a89a4cb5084ece3b8f5
+DIST caja-1.18.3.tar.xz 3526224 SHA256 b562c544f907944b2e1ce426b5e1d1d02886ecfff8d44f0a3ae2a2793ac39256 SHA512 845f7532fbf701fecc5b0e29036ee4b4d6c65f520d6d7fdbddd05d7e7bcd0f7bbd52c54cb45dbb0bd7a5bbf2ece11e584e5074e4c86954b2730baa469168a566 WHIRLPOOL 0fc000c99438876112110669ab8f499cf22d6a52a3fe01b945f1e6030df70e8bec9ddbdb2c3daa64726423dca8a97e5b5c2f8ff0a24d7c57e3ecc2b4b2067e76
+EBUILD caja-1.12.7-r2.ebuild 2170 SHA256 35a91cd07df24e13e9e22023b46da45188ddcb7bd21cd8c3cbecec722ca4d9f1 SHA512 88a39a9219ecdf4d56f2f03ec0108499f210a8bd85437b698905341df8ef48713a9b796d682f7da7edcda2d2c7f55a6940a32e45b6d75760d78824d9cc4ebbf7 WHIRLPOOL b4f519b8a2b5dedf616411f749c3117588d430bc262df9cfd2df3c2c7f9612b19c358745c1ad3555dee8be2cfd9b19bfe2cd8c1c9330ae8c5d40d8acedac4c71
+EBUILD caja-1.14.2.ebuild 2204 SHA256 3438acd4d68ab460f3a74199cceeb882b1d5e2334e9bd19eda44d3c9f6a3d643 SHA512 79245d5d02007280262641d001cb545de2bcd5427b02c9179005feb8629031003f4c3f76ba2ec5390a01eaac3d6778ca1466f3567d7fb39664d5fbf121f83500 WHIRLPOOL ffb2ffb4053cb699b272814393fd66af7bc84be8945795353a627309827ddb9fda503410d1a31476e7eddaa57ef4fbe5a7244251d620dbbe3ba3a7c389b0ed1e
+EBUILD caja-1.16.1.ebuild 2207 SHA256 741d6cb229883cc69b171dd25dfa4b49e138d819417fb459b778b9d3f79585eb SHA512 829635e5b133d2a62a459397baa82744ab2744d763a84766d2b88e6bff2437a3f0fe37e53a37b3e651ac68f71dc81e33ff109aaad829ce45ea9c02f7c32104e3 WHIRLPOOL 8981b939da59a62259386c7f140e065d3463e2f65de13fe95cc62ded57bf15f7b272b5f83dc6fffec97aad24251ac1b43fdd9c4bdb7d88618e3b0e30df907f9a
+EBUILD caja-1.18.3.ebuild 2065 SHA256 11e6215b813d0a8518553a07600f40f14a732c70a0c9dc1408a4e08d8c241a0b SHA512 116993aaa2343c39a7e6230c55eb1c2c46feb46cddb352b8e4356e74a46bbbc124080481dbae0856d9fc67a98873d69204a455408d01e637c3fde081e1dd8878 WHIRLPOOL a925762720a09f8388cef4e530feeadc4a1cd88bd97030a7a213f1e0cfb251b6b05dda3bb394f7ae7c79069529ce2b9db45a1aeb2d7a4dce4cbe576867dd1e45
+MISC ChangeLog 4873 SHA256 bb029efa1f129968201c8b3c57265a80f5e25f9b976473bf7603b7b67c4fc2b3 SHA512 c83e265e8d464e5539d2001265c9bd253e4d65b91a650df31d462b2d6e0430df624c8a25894ed4a15d6f434c30b4a5534b7833ff162ea96760f6c79e1a8ddc01 WHIRLPOOL 0a9b6461a0784e6febfd2bb22fb9f91ec2752ef9b829e6990b484dd7319d18bb1a0e717d9500da0373c8d141fe5e31c7ffcd1e3fc16d2df61fc8698b11ba6065
+MISC ChangeLog-2015 1763 SHA256 b7c0006ef6ee437dea2c9181765ab4bf033c3feea1f1dd6e71d0a0b525dd6452 SHA512 b04790a50b02a93f63186f7abc2559b871bc2edf103163aa050b687d2c945c86ec0044dabe29f26c4d491ee3c3e86a0832a70788842e5bc10ff9657ba4f45e3f WHIRLPOOL 57d551adf53594d34994ce2bbbb0d2232445f4393002f626a2b2b93ba8efb7652cfa51d4cf153334333853db71aba36c5c027aca6fd37061742299d69611fdb0
+MISC metadata.xml 682 SHA256 0b2e7f4151580187fca21550af7e133588cabc79ecfe75b1ffed5d9698071009 SHA512 731fdad4d4e0dd3c862df5dfbbc48817cd434c9c7fca9a5b71d6ccc844caaea871128774f4bc69acd0a0197746870b3a6353dfa1ba06f55e0841b616db7860e1 WHIRLPOOL 189ae2deb8610a5d1a9df97df71509dc10646d9afdf31ce06f3ac60628f2f852bc8d122bf1333803d748737e38446f8233689780d181a2e4199e916157193683
diff --git a/mate-base/caja/caja-1.12.7-r2.ebuild b/mate-base/caja/caja-1.12.7-r2.ebuild
new file mode 100644
index 000000000000..ebb0d4bf0506
--- /dev/null
+++ b/mate-base/caja/caja-1.12.7-r2.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2016 Gentoo Foundation
+# 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 x86"
+fi
+
+DESCRIPTION="Caja file manager for the MATE desktop"
+LICENSE="GPL-2 LGPL-2 FDL-1.1"
+SLOT="0"
+
+IUSE="gtk3 +introspection +mate packagekit xmp"
+
+RDEPEND="dev-libs/atk:0
+	>=dev-libs/glib-2.36:2
+	>=dev-libs/libxml2-2.4.7:2
+	gnome-base/dconf:0
+	>=gnome-base/gvfs-1.10.1:0[udisks]
+	>=mate-base/mate-desktop-1.9:0[gtk3(-)=]
+	>=media-libs/libexif-0.6.14:0
+	x11-libs/cairo:0
+	x11-libs/gdk-pixbuf:2
+	x11-libs/libICE:0
+	x11-libs/libSM:0
+	x11-libs/libX11:0
+	x11-libs/libXext:0
+	x11-libs/libXft:0
+	x11-libs/libXrender:0
+	>=x11-libs/pango-1.1.2:0
+	virtual/libintl:0
+	!gtk3? (
+		>=dev-libs/libunique-1:1
+		>=x11-libs/gtk+-2.24:2[introspection?]
+	)
+	gtk3? (
+		>=dev-libs/libunique-3:3
+		>=x11-libs/gtk+-3.0:3[introspection?]
+	)
+	introspection? ( >=dev-libs/gobject-introspection-0.6.4:= )
+	packagekit? ( app-admin/packagekit-base )
+	xmp? ( >=media-libs/exempi-1.99.5:2 )"
+
+DEPEND="${RDEPEND}
+	!!mate-base/mate-file-manager
+	>=dev-lang/perl-5:0=
+	dev-util/gdbus-codegen:0
+	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,in} || die
+
+	mate_src_prepare
+}
+
+src_configure() {
+	mate_src_configure \
+		--disable-update-mimedb \
+		--with-gtk=$(usex gtk3 3.0 2.0) \
+		$(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.14.2.ebuild b/mate-base/caja/caja-1.14.2.ebuild
new file mode 100644
index 000000000000..fc09a87e70f5
--- /dev/null
+++ b/mate-base/caja/caja-1.14.2.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2016 Gentoo Foundation
+# 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 ~x86"
+fi
+
+DESCRIPTION="Caja file manager for the MATE desktop"
+LICENSE="GPL-2 LGPL-2 FDL-1.1"
+SLOT="0"
+
+IUSE="gtk3 +introspection +mate packagekit xmp"
+
+COMMON_DEPEND="dev-libs/atk:0
+	>=dev-libs/glib-2.36:2
+	>=dev-libs/libxml2-2.4.7:2
+	gnome-base/dconf:0
+	>=gnome-base/gvfs-1.10.1:0[udisks]
+	>=mate-base/mate-desktop-1.9:0[gtk3(-)=]
+	>=media-libs/libexif-0.6.14:0
+	x11-libs/cairo:0
+	x11-libs/gdk-pixbuf:2
+	x11-libs/libICE:0
+	x11-libs/libSM:0
+	x11-libs/libX11:0
+	x11-libs/libXext:0
+	x11-libs/libXft:0
+	x11-libs/libXrender:0
+	>=x11-libs/pango-1.1.2:0
+	virtual/libintl:0
+	!gtk3? (
+		>=dev-libs/libunique-1:1
+		>=x11-libs/gtk+-2.24:2[introspection?]
+	)
+	gtk3? (
+		>=dev-libs/libunique-3:3
+		>=x11-libs/gtk+-3.0:3[introspection?]
+	)
+	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"
+
+RDEPEND="${COMMON_DEPEND}"
+
+DEPEND="${COMMON_DEPEND}
+	>=dev-lang/perl-5:0=
+	dev-util/gdbus-codegen:0
+	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 \
+		--with-gtk=$(usex gtk3 3.0 2.0) \
+		$(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.16.1.ebuild b/mate-base/caja/caja-1.16.1.ebuild
new file mode 100644
index 000000000000..ac3b4ee07a0d
--- /dev/null
+++ b/mate-base/caja/caja-1.16.1.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2016 Gentoo Foundation
+# 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 ~x86"
+fi
+
+DESCRIPTION="Caja file manager for the MATE desktop"
+LICENSE="GPL-2 LGPL-2 FDL-1.1"
+SLOT="0"
+
+IUSE="gtk3 +introspection +mate packagekit xmp"
+
+COMMON_DEPEND="dev-libs/atk:0
+	>=dev-libs/glib-2.36:2
+	>=dev-libs/libxml2-2.4.7:2
+	gnome-base/dconf:0
+	>=gnome-base/gvfs-1.10.1:0[udisks]
+	>=mate-base/mate-desktop-1.15.1:0[gtk3(-)=]
+	>=media-libs/libexif-0.6.14:0
+	x11-libs/cairo:0
+	x11-libs/gdk-pixbuf:2
+	x11-libs/libICE:0
+	x11-libs/libSM:0
+	x11-libs/libX11:0
+	x11-libs/libXext:0
+	x11-libs/libXft:0
+	x11-libs/libXrender:0
+	>=x11-libs/pango-1.1.2:0
+	virtual/libintl:0
+	!gtk3? (
+		>=dev-libs/libunique-1:1
+		>=x11-libs/gtk+-2.24:2[introspection?]
+	)
+	gtk3? (
+		>=dev-libs/libunique-3:3
+		>=x11-libs/gtk+-3.0:3[introspection?]
+	)
+	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"
+
+RDEPEND="${COMMON_DEPEND}"
+
+DEPEND="${COMMON_DEPEND}
+	>=dev-lang/perl-5:0=
+	dev-util/gdbus-codegen:0
+	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 \
+		--with-gtk=$(usex gtk3 3.0 2.0) \
+		$(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.18.3.ebuild b/mate-base/caja/caja-1.18.3.ebuild
new file mode 100644
index 000000000000..49801be08b3a
--- /dev/null
+++ b/mate-base/caja/caja-1.18.3.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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 ~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"
+
+COMMON_DEPEND="dev-libs/atk:0
+	>=dev-libs/glib-2.36:2
+	>=dev-libs/libxml2-2.4.7:2
+	gnome-base/dconf:0
+	>=gnome-base/gvfs-1.10.1:0[udisks]
+	>=mate-base/mate-desktop-1.17.0:0
+	>=media-libs/libexif-0.6.14:0
+	virtual/libintl:0
+	x11-libs/cairo:0
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.0:3[introspection?]
+	>=x11-libs/libnotify-0.7.0:0
+	x11-libs/libICE:0
+	x11-libs/libSM:0
+	x11-libs/libX11:0
+	x11-libs/libXext:0
+	x11-libs/libXft:0
+	x11-libs/libXrender:0
+	>=x11-libs/pango-1.1.2:0
+	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"
+
+RDEPEND="${COMMON_DEPEND}"
+
+DEPEND="${COMMON_DEPEND}
+	>=dev-lang/perl-5:0=
+	dev-util/gdbus-codegen:0
+	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/metadata.xml b/mate-base/caja/metadata.xml
new file mode 100644
index 000000000000..fcee9f59fc63
--- /dev/null
+++ b/mate-base/caja/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>mate@gentoo.org</email>
+		<name>Gentoo MATE Desktop</name>
+	</maintainer>
+	<use>
+		<flag name="gtk3">Build with GTK+3 instead of GTK+2</flag>
+		<flag name="mate">Install <pkg>x11-themes/mate-icon-theme</pkg> which 
+		is needed when this package is used in the MATE desktop 
+		environment.</flag>
+		<flag name="packagekit">Enable support for installing via <pkg>app-admin/packagekit</pkg>
+		based on mimetype</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">mate-desktop/caja</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/mate-base/libmatekbd/Manifest b/mate-base/libmatekbd/Manifest
new file mode 100644
index 000000000000..4ea778afc94d
--- /dev/null
+++ b/mate-base/libmatekbd/Manifest
@@ -0,0 +1,11 @@
+DIST libmatekbd-1.12.1.tar.xz 349492 SHA256 58a0494fb23fd0ab47836aa35b3e5068e1d5ec63df0185a08ef8c2767bb64ea2 SHA512 ef07e7b7ff35a17465eb427aafef4c0679ccecf0d96989a66eaf337791dd62d5e85ec72f2c58de5b09e7065eac6df16afb401975fcd727e924e8d3b34b19c0aa WHIRLPOOL b939cc61d6309b94f543397570a62d49f4b392542166d97860e3d769bf35986b3fd131955b89bed46aef71bf2c5b5f9e498c9d19f03b85bc50bb37bd761809fe
+DIST libmatekbd-1.14.1.tar.xz 367296 SHA256 2fba3796d138fff901057345a36947392a0fbb5b46a4d5053d3c033b1aadc9d5 SHA512 22e927f7db6c84e57b4bca823513220b305ba8989dabc5af2451be29d35bdc52f12f78dc19b69eb5dd11654cc75647b5ee67f6306162e781920aa58288c25b4c WHIRLPOOL 7d504315c804d06428f695ffb610c466a831c790bc7f5ed36803291d8d336645f12734ac7140772e9bf00cdace67e6347164be6fcf55e748f909910c2e6d6915
+DIST libmatekbd-1.16.0.tar.xz 365412 SHA256 7834c3d70892851bf5346e6b344662b5f8dc79a0f4a7cacbff5eac3bbfd26e9a SHA512 5ced3277e8f9a87407948d2d36fa7aea5a3eb6f2510c29cb53b430cdd202a36e38e48e82177b63bd8ccac6b0f317590ba99645c525b4c0d38b6b80633f62d96e WHIRLPOOL da02139d9e6e0cf53a5b91eef629f351d163e5f999f2f45361097bf9b200074169164d32f0fd31861e1091a2b9635439a2228d17786a63412745c70a19336e9b
+DIST libmatekbd-1.18.2.tar.xz 369448 SHA256 03df100cf931a1f6880a32b0b3eb90e82e81f6d17085bb44a2a7ca8551a00b0c SHA512 97971fc406fac09e0a652ccb5f811194eeff695a4a8b093b24225230cb64ceebd221d91aab071b0ca7ffd20b1b38e13d428d68fc8249101a3b3f8342fbb1f71e WHIRLPOOL 658d294780a0f18c5f94070e012a5dc12e0a0623d71e12c8633d8ac88c8c454115ec552bbebd41fdbeda57fd16dcb9ddf04bdc5dfd49b5868078d66fe761269f
+EBUILD libmatekbd-1.12.1-r2.ebuild 901 SHA256 880f0ce6489db23820083fb49875aa0b38dcdb738e64023cc750904bb9d1be3f SHA512 c40a03d1079adcfde119a399949672bff21eb5800310c6f78fd03b06c1845e14bacf3316aa37852d4039016c115388386c0535d3bf2df85298e5117211e38848 WHIRLPOOL 4914d5ba3bafbb79d792d597012559eff6e1fa7a0f4ab8a46338914d0779b8390f1576c6228e22158b8c698d649cd02b26714dd880e9b5130650ba589f077893
+EBUILD libmatekbd-1.14.1.ebuild 943 SHA256 ddd2380881fee737c07760fcad17ea36fbd82a7dbce2ed9b9888f17b30056d6d SHA512 d51011c9445d229be8ea94a63a5d510b932ea3a5cba0daa922210d18d0815a69522eed1eebaa8c5226bd3c5f299418cb3b20b208d21aeaf4674c3bb65d3995d8 WHIRLPOOL 32ec623e308d8002a9ed848b6bd3e186126e5ff965122b583e55523cec16ee7de63f12b68be42351c9be579c8dc04b02fa69e293c90543efd6745e1cce25673c
+EBUILD libmatekbd-1.16.0.ebuild 959 SHA256 6022926de0d220e9d60093b8b0c44920d006b771eb701fe99eee3b38b51f7c3c SHA512 0d8349a52d31f9bd754534ac5f4283ed5e125c0a5a6da3a2b4abde9957364371d81f79ae2c49a9bc99100d4fd5f52beca6b4481768d3067b2ec39e52a121c8e5 WHIRLPOOL b1f2c6572e19cf1a407ffbe79e4a6a43baa1e14c2f3cad940f8f0ed391e15c29afa4f242d9e12c0900e1bcc0f49259ae791876a336ee322ec830baa93b05ad00
+EBUILD libmatekbd-1.18.2.ebuild 857 SHA256 1c40b13ce53b911dd43d4e4281d6773ae315aed02f9ca1283ff1642bc60d2fc0 SHA512 cd84e8a3d7dd8d6dfc440d7dd3e6180d3c7a4aff6fb6477d1e7679e335a24ac7366c70334c5690962bcb52f0600da1ac8c8cd7eda6c1f47b52e4c1e195209180 WHIRLPOOL 22177fa734c309b4bf2b30e82a8a7a1d0d02daa88e02b6d255db1a107d838d9bc5426ba497979392c04bbc731100fddb6c5dce85cd5b9ea079aae4321e983b4e
+MISC ChangeLog 4213 SHA256 22970e6939deeb59d9d848870fa01400f3c6ad74cad359fb49ff90da6403d344 SHA512 954408437157d41fe64a55dfd4243c6103d663e8b079e12519e206f9d837e6045902cac669f0ee7bbd9c8d993f727b1b04a13cd2fbdef7926faf4b65f71f2eb8 WHIRLPOOL 1d7776283ba264fd0f787e2e0e78572b6b83c27f8d390ee819e939e01547c3361712c88276d807efca03984fc00265621616eb45c09f3d8d66eb02da49e63a02
+MISC ChangeLog-2015 1695 SHA256 c694925ec6826140730f7b4e88ce6e35e47174038c21e18ed57ab62c750f720c SHA512 50248146100791789b33765dd7455656a4422debd43c6045a5f558fc0f98c78a2f25bdf09619f0d4d5ac73478659068a2e26e9cba957674a878d7f3014b667e9 WHIRLPOOL 12eafa304c06ae68481fd55d342a49b6fecf505406f4a5fb182819a361e0276f3a393453ad4edb01556e9cb7722379a9a48c62fafb93515ba31294a540973cb0
+MISC metadata.xml 415 SHA256 033806ac5482d83188fad06614f9011095c779a9ed2293e3dc50bf37fff2f45d SHA512 1ab91a901f989f1e3491982aa999b22cc64073a3bf0db8b6089d488096cf83bb386d10a04d78131e3a232c7808a01bd435fb6d1e80beee82eea3dbcf1d3fd87a WHIRLPOOL b1c74972775ff86212f4c470b92b5297cfddb0fe5ea1c64f7bf383ac40dea34a35ae365b2fda5f270b144ea96b50b7a28d929888614355aba8965634b04df67c
diff --git a/mate-base/libmatekbd/libmatekbd-1.12.1-r2.ebuild b/mate-base/libmatekbd/libmatekbd-1.12.1-r2.ebuild
new file mode 100644
index 000000000000..c51d149aaf30
--- /dev/null
+++ b/mate-base/libmatekbd/libmatekbd-1.12.1-r2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2016 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 x86"
+fi
+
+DESCRIPTION="MATE keyboard configuration library"
+LICENSE="LGPL-2"
+SLOT="0"
+
+IUSE="X gtk3 +introspection test"
+
+RDEPEND=">=dev-libs/glib-2.36:2
+	x11-libs/cairo:0
+	>=x11-libs/gdk-pixbuf-2.24:2
+	x11-libs/libX11:0
+	>=x11-libs/libxklavier-5.0:0
+	x11-libs/pango:0
+	virtual/libintl:0
+	!gtk3? ( >=x11-libs/gtk+-2.24:2[introspection?] )
+	gtk3? ( >=x11-libs/gtk+-3.0:3[introspection?] )
+	introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )"
+
+DEPEND="${RDEPEND}
+	sys-devel/gettext:*
+	>=dev-util/intltool-0.50.1:*
+	virtual/pkgconfig:*"
+
+src_configure() {
+	mate_src_configure \
+		--with-gtk=$(usex gtk3 3.0 2.0) \
+		$(use_with X x) \
+		$(use_enable introspection) \
+		$(use_enable test tests)
+}
diff --git a/mate-base/libmatekbd/libmatekbd-1.14.1.ebuild b/mate-base/libmatekbd/libmatekbd-1.14.1.ebuild
new file mode 100644
index 000000000000..01f090d85d5f
--- /dev/null
+++ b/mate-base/libmatekbd/libmatekbd-1.14.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2016 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 ~x86"
+fi
+
+DESCRIPTION="MATE keyboard configuration library"
+LICENSE="LGPL-2"
+SLOT="0"
+
+IUSE="X gtk3 +introspection test"
+
+COMMON_DEPEND=">=dev-libs/glib-2.36:2
+	x11-libs/cairo:0
+	>=x11-libs/gdk-pixbuf-2.24:2
+	x11-libs/libX11:0
+	>=x11-libs/libxklavier-5.0:0
+	x11-libs/pango:0
+	virtual/libintl:0
+	!gtk3? ( >=x11-libs/gtk+-2.24:2[introspection?] )
+	gtk3? ( >=x11-libs/gtk+-3.0:3[introspection?] )
+	introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )"
+
+RDEPEND="${COMMON_DEPEND}"
+
+DEPEND="${COMMON_DEPEND}
+	sys-devel/gettext:*
+	>=dev-util/intltool-0.50.1:*
+	virtual/pkgconfig:*"
+
+src_configure() {
+	mate_src_configure \
+		--with-gtk=$(usex gtk3 3.0 2.0) \
+		$(use_with X x) \
+		$(use_enable introspection) \
+		$(use_enable test tests)
+}
diff --git a/mate-base/libmatekbd/libmatekbd-1.16.0.ebuild b/mate-base/libmatekbd/libmatekbd-1.16.0.ebuild
new file mode 100644
index 000000000000..3f50001e430c
--- /dev/null
+++ b/mate-base/libmatekbd/libmatekbd-1.16.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2016 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 ~x86"
+fi
+
+DESCRIPTION="MATE keyboard configuration library"
+LICENSE="LGPL-2"
+SLOT="0"
+
+IUSE="X gtk3 +introspection test"
+
+COMMON_DEPEND=">=dev-libs/glib-2.36:2
+	x11-libs/cairo:0
+	>=x11-libs/gdk-pixbuf-2.24:2
+	x11-libs/libX11:0
+	>=x11-libs/libxklavier-5.2:0[introspection?]
+	x11-libs/pango:0
+	virtual/libintl:0
+	!gtk3? ( >=x11-libs/gtk+-2.24:2[introspection?] )
+	gtk3? ( >=x11-libs/gtk+-3.0:3[introspection?] )
+	introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )"
+
+RDEPEND="${COMMON_DEPEND}"
+
+DEPEND="${COMMON_DEPEND}
+	sys-devel/gettext:*
+	>=dev-util/intltool-0.50.1:*
+	virtual/pkgconfig:*"
+
+src_configure() {
+	mate_src_configure \
+		--with-gtk=$(usex gtk3 3.0 2.0) \
+		$(use_with X x) \
+		$(use_enable introspection) \
+		$(use_enable test tests)
+}
diff --git a/mate-base/libmatekbd/libmatekbd-1.18.2.ebuild b/mate-base/libmatekbd/libmatekbd-1.18.2.ebuild
new file mode 100644
index 000000000000..a8272a32a909
--- /dev/null
+++ b/mate-base/libmatekbd/libmatekbd-1.18.2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 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 ~x86"
+fi
+
+DESCRIPTION="MATE keyboard configuration library"
+LICENSE="LGPL-2"
+SLOT="0"
+
+IUSE="X +introspection test"
+
+COMMON_DEPEND=">=dev-libs/glib-2.36:2
+	x11-libs/cairo:0
+	>=x11-libs/gdk-pixbuf-2.24:2
+	x11-libs/libX11:0
+	>=x11-libs/libxklavier-5.2:0[introspection?]
+	x11-libs/pango:0
+	virtual/libintl:0
+	>=x11-libs/gtk+-3.0:3[introspection?]
+	introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )"
+
+RDEPEND="${COMMON_DEPEND}"
+
+DEPEND="${COMMON_DEPEND}
+	sys-devel/gettext:*
+	>=dev-util/intltool-0.50.1:*
+	virtual/pkgconfig:*"
+
+src_configure() {
+	mate_src_configure \
+		$(use_with X x) \
+		$(use_enable introspection) \
+		$(use_enable test tests)
+}
diff --git a/mate-base/libmatekbd/metadata.xml b/mate-base/libmatekbd/metadata.xml
new file mode 100644
index 000000000000..ad1360a0bcce
--- /dev/null
+++ b/mate-base/libmatekbd/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>mate@gentoo.org</email>
+		<name>Gentoo MATE Desktop</name>
+	</maintainer>
+	<use>
+		<flag name="gtk3">Build with GTK+3 instead of GTK+2</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">mate-desktop/libmatekbd</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/mate-base/mate-applets-meta/Manifest b/mate-base/mate-applets-meta/Manifest
new file mode 100644
index 000000000000..f46ee8633ffe
--- /dev/null
+++ b/mate-base/mate-applets-meta/Manifest
@@ -0,0 +1,6 @@
+EBUILD mate-applets-meta-1.12.ebuild 749 SHA256 e9efce8455533b3e65a70d430e6eb60079047bee99f9afd87f6002b647a1163f SHA512 be8a46d9aa2cde42c5438144dbe7e14ee8ddd35417d824718a26ae11ecfa78d31a2c2c684f36da2510b320ec10eab7e3b1e6a225f06e18ed523e427f7f65a0f5 WHIRLPOOL af90ea110b49cc4e98d17be69d2230cc8e8ee5ca1537b6f2b011f1f2317f519b0f97fb0174823bfb9470f6563a93cf2f943e18eac97ec74050c350ab29f47cd5
+EBUILD mate-applets-meta-1.14.ebuild 673 SHA256 b3975abda2b8771d8bd0af30e9e7fd14011be2728d26086edc18cfbbdbea198f SHA512 b2e175dbf3dc06d31118dd45dc8d1b3d5a26ce3d6ebeef101dd582e52e142a93c41f9010465c37f90c318d923f694331a8e5f65259f749e2d2a5ec663957a8f4 WHIRLPOOL ea78e561f0faed9bd2813e7c5789663eadaed8b72b95878f493de9b3c28cb23b29a06c3be8f22634b8f67ed9cdfd0a857e6c17b2979ea6f83e608c3dd10f865a
+EBUILD mate-applets-meta-1.16.ebuild 673 SHA256 b3975abda2b8771d8bd0af30e9e7fd14011be2728d26086edc18cfbbdbea198f SHA512 b2e175dbf3dc06d31118dd45dc8d1b3d5a26ce3d6ebeef101dd582e52e142a93c41f9010465c37f90c318d923f694331a8e5f65259f749e2d2a5ec663957a8f4 WHIRLPOOL ea78e561f0faed9bd2813e7c5789663eadaed8b72b95878f493de9b3c28cb23b29a06c3be8f22634b8f67ed9cdfd0a857e6c17b2979ea6f83e608c3dd10f865a
+EBUILD mate-applets-meta-1.18.ebuild 638 SHA256 e92e8ac10d6bc7179a9d5e787fb678caa5fe63a4b9f06cd99bbeb3c865728738 SHA512 aec0b21b63c561eca3c0f8a2673f1276b868b93b30e325a2d1bbd3192a387666b2e5ca32dfb27bbecb3bf8eba5f6e46592e6c4094aa3a2dc737fd72559a462ba WHIRLPOOL 733e2dfec1cafa4060a8af8c0c583e3066a1879ec5107a2798d66872b21a5ca8009ffa38cc7127eb5088654781eb0f95d0b837ae58f15221b6af5d42bfa6d731
+MISC ChangeLog 1892 SHA256 79e7fbf44d98437d90079a617f41def54a3fe3a176625c5958889350dfedb8ae SHA512 7d9058441ca10000a80d8ddde51442926bf8f8b0d75388a7a3f411ae0fd09cb7e27b21a6cbc1da849137a0d1680ab3361403cb962103dd90bec1176b34dd0216 WHIRLPOOL 2b7637125743c34c55bd9d88b9b681fdfe94c6b11028b0f98d5db4d9d4fd3bb08fc11dc677462d4c7ee2ed2a80570bc6b8e12c2b933377ae19bb71ac42f5dcd3
+MISC metadata.xml 680 SHA256 d666d71a07f054fefc92e4557c26bdfa92de6d0603e53f7835e38e1ec31d4cec SHA512 d128aaeae00867672aac0914cd2031e71a209422cdc92c728f141279dbd7fbb0c99770d421871f7c914013215d8a396cb8aefef1b92d2b105b04dee8bf8c9f18 WHIRLPOOL 52c47359371f32e262f633f12e6f6531c6200ff5eaa8c27b68f5777cf9e8279d86a88f513a5de072e71fd2be15b80284ff79e6dc5a6f3cc417650462c5095b2c
diff --git a/mate-base/mate-applets-meta/mate-applets-meta-1.12.ebuild b/mate-base/mate-applets-meta/mate-applets-meta-1.12.ebuild
new file mode 100644
index 000000000000..1b98c00bb919
--- /dev/null
+++ b/mate-base/mate-applets-meta/mate-applets-meta-1.12.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == 9999 ]]; then
+	MATE_BRANCH=9999
+else
+	inherit versionator
+	MATE_BRANCH="$(get_version_component_range 1-2)"
+	KEYWORDS="amd64 ~arm x86"
+fi
+
+DESCRIPTION="Meta package for MATE panel applets"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI=""
+
+LICENSE="metapackage"
+SLOT="0"
+IUSE="appindicator gtk3 netspeed sensors"
+
+DEPEND=""
+RDEPEND="=mate-base/mate-applets-${MATE_BRANCH}*[gtk3(-)=]
+	appindicator? ( =mate-extra/mate-indicator-applet-${MATE_BRANCH}*[gtk3(-)=] )
+	netspeed? ( =net-analyzer/mate-netspeed-${MATE_BRANCH}*[gtk3(-)=] )
+	sensors? ( =mate-extra/mate-sensors-applet-${MATE_BRANCH}*[gtk3(-)=] )
+"
diff --git a/mate-base/mate-applets-meta/mate-applets-meta-1.14.ebuild b/mate-base/mate-applets-meta/mate-applets-meta-1.14.ebuild
new file mode 100644
index 000000000000..e6c203a6eadd
--- /dev/null
+++ b/mate-base/mate-applets-meta/mate-applets-meta-1.14.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == 9999 ]]; then
+	MATE_BRANCH=9999
+else
+	inherit versionator
+	MATE_BRANCH="$(get_version_component_range 1-2)"
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+DESCRIPTION="Meta package for MATE panel applets"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI=""
+
+LICENSE="metapackage"
+SLOT="0"
+IUSE="appindicator gtk3 sensors"
+
+DEPEND=""
+RDEPEND="=mate-base/mate-applets-${MATE_BRANCH}*[gtk3(-)=]
+	appindicator? ( =mate-extra/mate-indicator-applet-${MATE_BRANCH}*[gtk3(-)=] )
+	sensors? ( =mate-extra/mate-sensors-applet-${MATE_BRANCH}*[gtk3(-)=] )
+"
diff --git a/mate-base/mate-applets-meta/mate-applets-meta-1.16.ebuild b/mate-base/mate-applets-meta/mate-applets-meta-1.16.ebuild
new file mode 100644
index 000000000000..e6c203a6eadd
--- /dev/null
+++ b/mate-base/mate-applets-meta/mate-applets-meta-1.16.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == 9999 ]]; then
+	MATE_BRANCH=9999
+else
+	inherit versionator
+	MATE_BRANCH="$(get_version_component_range 1-2)"
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+DESCRIPTION="Meta package for MATE panel applets"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI=""
+
+LICENSE="metapackage"
+SLOT="0"
+IUSE="appindicator gtk3 sensors"
+
+DEPEND=""
+RDEPEND="=mate-base/mate-applets-${MATE_BRANCH}*[gtk3(-)=]
+	appindicator? ( =mate-extra/mate-indicator-applet-${MATE_BRANCH}*[gtk3(-)=] )
+	sensors? ( =mate-extra/mate-sensors-applet-${MATE_BRANCH}*[gtk3(-)=] )
+"
diff --git a/mate-base/mate-applets-meta/mate-applets-meta-1.18.ebuild b/mate-base/mate-applets-meta/mate-applets-meta-1.18.ebuild
new file mode 100644
index 000000000000..1ed7c6ed84c8
--- /dev/null
+++ b/mate-base/mate-applets-meta/mate-applets-meta-1.18.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == 9999 ]]; then
+	MATE_BRANCH=9999
+else
+	inherit versionator
+	MATE_BRANCH="$(get_version_component_range 1-2)"
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+DESCRIPTION="Meta package for MATE panel applets"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI=""
+
+LICENSE="metapackage"
+SLOT="0"
+IUSE="appindicator sensors"
+
+DEPEND=""
+RDEPEND="=mate-base/mate-applets-${MATE_BRANCH}*
+	appindicator? ( =mate-extra/mate-indicator-applet-${MATE_BRANCH}* )
+	sensors? ( =mate-extra/mate-sensors-applet-${MATE_BRANCH}* )
+"
diff --git a/mate-base/mate-applets-meta/metadata.xml b/mate-base/mate-applets-meta/metadata.xml
new file mode 100644
index 000000000000..69703b541d99
--- /dev/null
+++ b/mate-base/mate-applets-meta/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>mate@gentoo.org</email>
+		<name>Gentoo MATE Desktop</name>
+	</maintainer>
+	<use>
+		<flag name="appindicator">Pull in <pkg>mate-extra/mate-indicator-applet</pkg>
+			for AppIndicator applet</flag>
+		<flag name="gtk3">Make sure applets are built with GTK+3 instead of GTK+2</flag>
+		<flag name="netspeed">Pull in <pkg>net-analyzer/mate-netspeed</pkg>
+			for net speed monitoring applet</flag>
+		<flag name="sensors">Pull in <pkg>mate-extra/mate-sensors-applet</pkg>
+			for hw sensors applet</flag>
+	</use>
+</pkgmetadata>
diff --git a/mate-base/mate-applets/Manifest b/mate-base/mate-applets/Manifest
new file mode 100644
index 000000000000..e2e6b6de2d65
--- /dev/null
+++ b/mate-base/mate-applets/Manifest
@@ -0,0 +1,19 @@
+AUX mate-applets-1.10.4-cpupower-4.7.patch 1216 SHA256 0926cce50a835e3ca9fe801d56aeed298cf065750c9696f512bea79a192c1539 SHA512 6e350080551b959062e4b51c0665c0743fa1064daa441d35abf45ce959be67614fafa90077dfce6cbe10b114420d78b4efdc3ea639eff523195baabd02f1bbdd WHIRLPOOL 681c61850a2d9ec5260458249892315c959b7da293938df73cebf59f528a071fbc24e88d86c6fa6ff7b4286b78d2608d03a2845aa9ccf9557dff776beabad9c7
+AUX mate-applets-1.14.1-cpupower-4.7.patch 1142 SHA256 cd8e66736c3d57189f9cfeaa9c8385fbe09847f271922475b990a8ef083c912d SHA512 b7f2b66f7ac79ccad042704e8e00c5a5b452751aafe3ba19074c5c0e156f56dc89024133f1cfa432b564f2ba497d2444889c46b94af6f8f55d6f9af4102c618a WHIRLPOOL 87d1668fc74b4e9de4dc458face42ae62704d8da9b865cac49c582e3bd2127e5c70e16ad2716639001f234bb53b1271af29a45fa60c9f26f249f6e673453af6b
+AUX mate-applets-1.14.1-revert-upstream-cpupower-4.7-fix.patch 1093 SHA256 4fc461929b91fbc38b008c7d3084e5cebb0928d73a15308c319c7132c1066b31 SHA512 d47f08a1f983b958bbcaeff5f480752500589ead4cd4fa3eedbf596d48809c3a0a909db82271a5e663d394bed68c6ee395f7315a701c29112ed9b328633bfedc WHIRLPOOL b6db66082e58914ab89a002b75329d81420c88fbb6c6d57046a73fde6224e7912733826fd8a243c678b1600e0d7a536ad2b2696fc46f50865a31b9003c16624a
+AUX mate-applets-1.16.0-cpupower-4.7.patch 1142 SHA256 6a3c1f8964f7065607b089aa2110cb5d93380f11655e4715f93b456091c79812 SHA512 7845655d2215e91286b19891cb8e6f018b8b11bebcb876d97b5c0a0232063cd030ef14754871f14e09f3e82d714f33d844d41f09f1168a088ac4d83cde527789 WHIRLPOOL 138d404fedb3d6a128024c54097bf96fa1c1e1e7b56593ae1c5610444b4fe6821b8c294290a504f332e74b52266f02d8406417d9aa2d2699d360067c9d23fe77
+DIST mate-applets-1.12.1.tar.xz 6816716 SHA256 0a3bc19e59c69eccdcc2342f29b7837563e51fbefdb232ca1884ca23d8f69c99 SHA512 c9acac98df31386b4016d42d3d1fe0e9ddd5e8fccc291269cff73e2a4c0853fabb85a649ee14f4aef3200c0f731c1d95f48aefdb3d8baaf014ad8776c1e94234 WHIRLPOOL 9f3569fcdd610935689a54600153bbbb47ac46100b8689f74d0bc37ac227e129edbf06e6f86e3471f7f40454c37c00291382ccc51e95b3dd2fac008b4e865620
+DIST mate-applets-1.14.1.tar.xz 7151156 SHA256 411dc105afae61b2ee0e3b197ea0a00f8670ceb680dd5a549f8ef586289b9d6a SHA512 f7657a4dbeed5ff161dae33bd915bf868c95626d661b3d7e4eea9b86776f75449c4060c647d9a040ccf8a01556979b62a9b21c988b33e0cd8d5d90fd663a331d WHIRLPOOL 90d13900c8aaed4a08e6d4f55adf600f1da82900f164d9bf5c7a8a6c9e51452668bacbe5e8ae7ee4ccaa156d70121dffefe1c8cce8bd12ad190e5c04d42b1c0e
+DIST mate-applets-1.16.0.tar.xz 7150340 SHA256 adcc895478f5b1e1c5c40f3f20537dcf809e0f06802850b890d323602f16d817 SHA512 606fd39b95083e7cff2ce95e75b4acb0ec1f3d66621a15fa726891c6d6319f7757b92c8c26efd3ee05da9da3dc315b16a3a9089fd4bb8d420816d4728f8545af WHIRLPOOL 8a2145970391e337054b2ab4e3449bcdfe2befeb4a8fdb258a3c4820511ec9849537f950b466098a2c3b53a63c132cfb6f9b6d66dfeca268ddd477aa96ae1a28
+DIST mate-applets-1.18.1.tar.xz 7158716 SHA256 05bae1324de35659b37307bb345bb9da16b19391c83388ef697df51a22caf4da SHA512 3186af69f3b8b54a7f31d3c00a39ed439717200181a1e64d97b28eaf2e75b19ac79fdda44c40401687e9cece06feb1e29f52948cd73afadeb0099f64e672c036 WHIRLPOOL 2354d86b90cf599669c21c08cf6cf6d5ae0d197c54b87b0341b66b8535e175198d233f56e39a9c84aa857b4d12ce88c0d3f5f69ad8f16cc4d57ce5cc2ec3420d
+EBUILD mate-applets-1.12.1-r4.ebuild 2264 SHA256 52c3d9d7d2c718d9038c1cd746d8a825f9dc9c11832807439710fc978ddaa4ae SHA512 81b027473726418d372e07896dbfce908e5224c59dd044fcf2fd630c5b799ca02015270ba62751652c7e4deead7686432ddb6f625ae76b73056a78f1bfe6bf37 WHIRLPOOL 24f5cfab9b8da7f0a371850faa065d28019ad5071661e22af665a946d85de0344b1532218ed03ac738065dcab61fb2489e52dddfedd6d0f8cd32f60176c4831b
+EBUILD mate-applets-1.12.1-r5.ebuild 2302 SHA256 075180eefe7cce452247fc6ec385b0df5541bc32bf039c03449f71cad0aef4f1 SHA512 2bf780ce08385d2ad2f4266d3f05363bc10289627a4c79623813017633e2da41d6190a754aa11579245727c515ebbc7bd53eacf1022ee6b82c4daffa1c587d93 WHIRLPOOL 2631c1cc3ec3af544dd00730da022757c7dd193d5b4b762bf88b89e9eb7bbcc918eda4ca4a31ff18beaebccc6c89d8a867e66406237bf41b90789184b83222cc
+EBUILD mate-applets-1.14.1-r1.ebuild 2453 SHA256 7320e58dafe271bd418eb628f50b80d046b3891d2feb8899dbd4bd579463a921 SHA512 107118f190b7e9baecfe528949a8fa314a957712b4ea26d7599604f45044895ca4dd964dac1e001d09a5350b790a37efae8abc265d055000698094afb3bc5d8a WHIRLPOOL 598cb7edeb82953bd6719dbe9d471a59a2c61711f58a355f7b65c80ab1a89b10686f3a72e56183f7046fab8b2e448e548b11e324a7f53104e9015cb0edc05f14
+EBUILD mate-applets-1.14.1-r2.ebuild 2410 SHA256 eb0fc073f73fef6886afa9adaf2902dc885ad3d8c014314764b88646108c711a SHA512 c1a96efd69969b4cb5be6e9342ab365ca9bee4dd3133a56f2bfcaeb243d178ace5bf40dc77c0c603b11bcf5a5b7aa9990e29055c8e0b33ff82b36238c8865046 WHIRLPOOL c988935aff4d95d93c2865ead234e17570df8568ebb6a0d8e3f8050ce3f2c1d6386ad29db5b8685305023ab3365e1fe028dbe4c79bb2fc79871b6fb0e8d7b995
+EBUILD mate-applets-1.16.0-r1.ebuild 2370 SHA256 1d9e2dfac4eb13ff909b1647f43c0e1a8a8c718a6665d97074bf774d14bd6150 SHA512 cf8eb10cbd2300402a7309561bc3b179710995adfdfa7f70134aaf4aef2ceedd374ceea653905f4645532d8530faaa1a677fff7fc071eb2081c27b223d438ca2 WHIRLPOOL 45a21b50932ec09fcc297dc91c6522b9cc35455a2a3110c42aa6e34c0d88c588f4e2753302c9f947cfee9bb53f4b13127e7f4b722ede7dae6f24675f829467cf
+EBUILD mate-applets-1.16.0.ebuild 2413 SHA256 47559a9e0a1968336d2b8791d7812439c6e958f7ec7caadc3042bd5490f3b4ff SHA512 d447fac31a5492be65c6a8dfd1724b6956e1f0c657c1750e175d7476fa75b75411a140706c36c5cb54f8e54c7338da9f94a26a70edb1351f66f2c5f5805464fe WHIRLPOOL 3aa5a74988b587d8d70a27f4bba863d7edc7bc7180e39c29b5da5f72c2dc80143ba26faf8e5e7cb8f7bf93fe472f3a75f3a346f384dd50595dcec3ef6725cf73
+EBUILD mate-applets-1.18.1-r1.ebuild 2167 SHA256 f624ef1de04a673c2f83dccde6e952209eab9d81b3c0bf32df634180bb19fa79 SHA512 b1270cffa52fb2eb299879d5e90d7df6b8b52293a6dd1819c7f89ed07ba0097a7bde17d32dbf07d85c7cfa24ff5064ceda3bd173dadd3860eb0c940bf2d57c8e WHIRLPOOL a5621e9cf5900538ed0ab9d84ed22d8c4abc601511d656f65a363931121dc7273cdf6da1d8ec6d7a2e64bd11de195edddd001c4498b1092cb394bb961020161e
+EBUILD mate-applets-1.18.1.ebuild 2210 SHA256 027291ca8820c002d90ec533e76d627804849174a7ae00580e60428b1999955a SHA512 7c4d3c17037c9d574a2ee4ae56047f612857858acbf6a3bc54ada6ca5e4e39bb49a09a2f01fa50f9db851204eead92163f7d1cec530f1663418369cbd572c244 WHIRLPOOL 0f1e317bef5041571de035261170e76c3cca44c1da5f45c1295dffb2b75ec883f67f8e52e709b72d19020ed11dfa93791589b113b769c6f568c83650e72129c5
+MISC ChangeLog 8205 SHA256 04309c554315a656a1681d0588e3b357dd09ecb2a91239d90c4cc54a436ccc63 SHA512 0f3246b873e39a9f451c5b071219c3dafbfecad7daf6bfc5ff6b5d6fb0d1de4b9d06ce3d6d6c9e257821b906478eb653460d3ccdc43994fb98770266908054d0 WHIRLPOOL 93073da9ec398a77e395da4b1ba7be1a06424b3692be739b122c0767f2dc690603924e2f966b91bdbda795e7d9b99f25b6d84f57cb1f46cef43f8615739b1273
+MISC ChangeLog-2015 3578 SHA256 c05187abb800be067a1294f6f586fe1bc098ff15e9d067368f2e37f60b9d1574 SHA512 23ce4e6abdc4184208bfbba59dbe0f0fbbd56fbc8907ef2d91b0ce10cde0163434c7c484e144a2c0a22f8b71058a4415b79a4d8992c831211871cbf48903c112 WHIRLPOOL b71c04299a84c785e6e37809d158aa6dbfc79a3fb08ca118f5c7cb6149a27c98f16fe38e13c9b9bdda4ba2736be90d74b150af4dc2cdfd08df616c1e542caf0d
+MISC metadata.xml 417 SHA256 ff19020bc9a57f518fcff20f1f57ff2213fe86c5e906bb8ad53aca4e511e6855 SHA512 8df2d630bab80c248991cb2d57c928b24bfdc92d72d9ecabd06bc362882bb0bc0f3dc376ba54deb77213676eda4fdb8c2a4362c634bdd58f8d2b3060a184309d WHIRLPOOL 54c434eadd86db7d39a08074f78b1af60b6830daf4808626d7be259ba4e1e55a3fd2e9e71a714339fc9b55c5bd8c246629a697a2cda55907d351e7d6a5c0716b
diff --git a/mate-base/mate-applets/files/mate-applets-1.10.4-cpupower-4.7.patch b/mate-base/mate-applets/files/mate-applets-1.10.4-cpupower-4.7.patch
new file mode 100644
index 000000000000..070b41754ed0
--- /dev/null
+++ b/mate-base/mate-applets/files/mate-applets-1.10.4-cpupower-4.7.patch
@@ -0,0 +1,46 @@
+diff --git a/configure.ac b/configure.ac
+index c867af3..4ff5311 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -416,6 +416,8 @@ fi
+ AM_CONDITIONAL(HAVE_LIBCPUFREQ, test x$have_libcpufreq = xyes)
+ AC_SUBST(LIBCPUFREQ_LIBS)
+ 
++AC_CHECK_HEADERS([cpupower.h])
++
+ build_cpufreq_applet=no
+ 
+ if test x$disable_cpufreq = xno; then
+diff --git a/cpufreq/src/cpufreq-monitor-libcpufreq.c b/cpufreq/src/cpufreq-monitor-libcpufreq.c
+index 40c44ba..120693c 100644
+--- a/cpufreq/src/cpufreq-monitor-libcpufreq.c
++++ b/cpufreq/src/cpufreq-monitor-libcpufreq.c
+@@ -19,11 +19,16 @@
+  * Authors : Carlos Garc�a Campos <carlosgc@gnome.org>
+  */
+ 
++#include <config.h>
++
+ #include <glib.h>
+ #include <glib/gi18n.h>
+ 
+ #include <stdlib.h>
+ #include <cpufreq.h>
++#ifdef HAVE_CPUPOWER_H
++#include <cpupower.h>
++#endif
+ 
+ #include "cpufreq-monitor-libcpufreq.h"
+ #include "cpufreq-utils.h"
+@@ -111,7 +114,11 @@ cpufreq_monitor_libcpufreq_run (CPUFreqMonitor *monitor)
+ 		/* Check whether it failed because
+ 		 * cpu is not online.
+ 		 */
++#ifndef HAVE_CPUPOWER_H
+ 		if (!cpufreq_cpu_exists (cpu)) {
++#else
++    if (cpupower_is_cpu_online (cpu)) {
++#endif
+ 			g_object_set (G_OBJECT (monitor), "online", FALSE, NULL);
+ 			return TRUE;
+ 		}
diff --git a/mate-base/mate-applets/files/mate-applets-1.14.1-cpupower-4.7.patch b/mate-base/mate-applets/files/mate-applets-1.14.1-cpupower-4.7.patch
new file mode 100644
index 000000000000..203f1589a1b2
--- /dev/null
+++ b/mate-base/mate-applets/files/mate-applets-1.14.1-cpupower-4.7.patch
@@ -0,0 +1,44 @@
+diff --git a/configure.ac b/configure.ac
+index b49d127..6b87389 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -411,6 +411,8 @@ fi
+ AM_CONDITIONAL(HAVE_LIBCPUFREQ, test x$have_libcpufreq = xyes)
+ AC_SUBST(LIBCPUFREQ_LIBS)
+ 
++AC_CHECK_HEADERS([cpupower.h])
++
+ build_cpufreq_applet=no
+ 
+ if test x$disable_cpufreq = xno; then
+diff --git a/cpufreq/src/cpufreq-monitor-libcpufreq.c b/cpufreq/src/cpufreq-monitor-libcpufreq.c
+index 4fa9d4c..ba52fde 100644
+--- a/cpufreq/src/cpufreq-monitor-libcpufreq.c
++++ b/cpufreq/src/cpufreq-monitor-libcpufreq.c
+@@ -19,12 +19,16 @@
+  * Authors : Carlos Garc�a Campos <carlosgc@gnome.org>
+  */
+ 
++#include <config.h>
++
+ #include <glib.h>
+ #include <glib/gi18n.h>
+ 
+ #include <stdlib.h>
+-#include <linux/version.h>
+ #include <cpufreq.h>
++#ifdef HAVE_CPUPOWER_H
++#include <cpupower.h>
++#endif
+ 
+ #include "cpufreq-monitor-libcpufreq.h"
+ #include "cpufreq-utils.h"
+@@ -112,7 +116,7 @@
+ 		/* Check whether it failed because
+ 		 * cpu is not online.
+ 		 */
+-#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 7, 0)
++#ifndef HAVE_CPUPOWER_H
+ 		if (!cpufreq_cpu_exists (cpu)) {
+ #else
+ 		if (cpupower_is_cpu_online (cpu)) {
diff --git a/mate-base/mate-applets/files/mate-applets-1.14.1-revert-upstream-cpupower-4.7-fix.patch b/mate-base/mate-applets/files/mate-applets-1.14.1-revert-upstream-cpupower-4.7-fix.patch
new file mode 100644
index 000000000000..85c2b24bc81b
--- /dev/null
+++ b/mate-base/mate-applets/files/mate-applets-1.14.1-revert-upstream-cpupower-4.7-fix.patch
@@ -0,0 +1,37 @@
+From e82b68edbfa8d6e209b9ad7b3e6392a928da776e Mon Sep 17 00:00:00 2001
+From: mudler <mudler@sabayon.org>
+Date: Tue, 13 Sep 2016 23:33:58 +0200
+Subject: [PATCH] fix 1.14.1 on kernel-headers >=4.7
+
+---
+ cpufreq/src/cpufreq-monitor-libcpufreq.c | 6 +-----
+ 1 file changed, 1 insertion(+), 5 deletions(-)
+
+diff --git a/cpufreq/src/cpufreq-monitor-libcpufreq.c b/cpufreq/src/cpufreq-monitor-libcpufreq.c
+index 228a890..587e316 100644
+--- a/cpufreq/src/cpufreq-monitor-libcpufreq.c
++++ b/cpufreq/src/cpufreq-monitor-libcpufreq.c
+@@ -23,7 +23,7 @@
+ #include <glib/gi18n.h>
+ 
+ #include <stdlib.h>
+-#include <linux/version.h>
++
+ #include <cpufreq.h>
+ #include "cpufreq-monitor-libcpufreq.h"
+ #include "cpufreq-utils.h"
+@@ -111,11 +111,7 @@ cpufreq_monitor_libcpufreq_run (CPUFreqMonitor *monitor)
+ 		/* Check whether it failed because
+ 		 * cpu is not online.
+ 		 */
+-#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 7, 0)
+ 		if (!cpufreq_cpu_exists (cpu)) {
+-#else
+-		if (cpupower_is_cpu_online (cpu)) {
+-#endif
+ 			g_object_set (G_OBJECT (monitor), "online", FALSE, NULL);
+ 			return TRUE;
+ 		}
+-- 
+2.9.2
+
diff --git a/mate-base/mate-applets/files/mate-applets-1.16.0-cpupower-4.7.patch b/mate-base/mate-applets/files/mate-applets-1.16.0-cpupower-4.7.patch
new file mode 100644
index 000000000000..3f4f4fa519f1
--- /dev/null
+++ b/mate-base/mate-applets/files/mate-applets-1.16.0-cpupower-4.7.patch
@@ -0,0 +1,44 @@
+diff --git a/configure.ac b/configure.ac
+index b49d127..6b87389 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -411,6 +411,8 @@ fi
+ AM_CONDITIONAL(HAVE_LIBCPUFREQ, test x$have_libcpufreq = xyes)
+ AC_SUBST(LIBCPUFREQ_LIBS)
+ 
++AC_CHECK_HEADERS([cpupower.h])
++
+ build_cpufreq_applet=no
+ 
+ if test x$disable_cpufreq = xno; then
+diff --git a/cpufreq/src/cpufreq-monitor-libcpufreq.c b/cpufreq/src/cpufreq-monitor-libcpufreq.c
+index 4fa9d4c..ba52fde 100644
+--- a/cpufreq/src/cpufreq-monitor-libcpufreq.c
++++ b/cpufreq/src/cpufreq-monitor-libcpufreq.c
+@@ -19,12 +19,16 @@
+  * Authors : Carlos Garc�a Campos <carlosgc@gnome.org>
+  */
+ 
++#include <config.h>
++
+ #include <glib.h>
+ #include <glib/gi18n.h>
+ 
+ #include <stdlib.h>
+-#include <linux/version.h>
+ #include <cpufreq.h>
++#ifdef HAVE_CPUPOWER_H
++#include <cpupower.h>
++#endif
+ #include "cpufreq-monitor-libcpufreq.h"
+ #include "cpufreq-utils.h"
+ 
+@@ -111,7 +115,7 @@
+ 		/* Check whether it failed because
+ 		 * cpu is not online.
+ 		 */
+-#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 7, 0)
++#ifndef HAVE_CPUPOWER_H
+ 		if (!cpufreq_cpu_exists (cpu)) {
+ #else
+ 		if (cpupower_is_cpu_online (cpu)) {
diff --git a/mate-base/mate-applets/mate-applets-1.12.1-r4.ebuild b/mate-base/mate-applets/mate-applets-1.12.1-r4.ebuild
new file mode 100644
index 000000000000..a7a67439797a
--- /dev/null
+++ b/mate-base/mate-applets/mate-applets-1.12.1-r4.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit mate python-single-r1
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="amd64 ~arm x86"
+fi
+
+DESCRIPTION="Applets for the MATE Desktop and Panel"
+LICENSE="GPL-2 FDL-1.1 LGPL-2"
+SLOT="0"
+
+IUSE="X gtk3 ipv6 policykit +upower"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+#cpupower #593470
+RDEPEND="${PYTHON_DEPS}
+	app-text/rarian:0
+	dev-libs/atk:0
+	>=dev-libs/dbus-glib-0.74:0
+	>=dev-libs/glib-2.36:2
+	>=dev-libs/libmateweather-1.6.1[gtk3(-)=]
+	>=dev-libs/libxml2-2.5:2
+	dev-python/pygobject:3
+	>=gnome-base/libgtop-2.11.92:2=
+	>=mate-base/mate-desktop-1.9[gtk3(-)=]
+	>=mate-base/mate-panel-1.7[gtk3(-)=]
+	>=mate-base/mate-settings-daemon-1.6
+	>=sys-apps/dbus-1.1.2:0
+	<sys-power/cpupower-4.7
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/libnotify-0.7:0
+	x11-libs/libX11:0
+	x11-libs/pango:0
+	virtual/libintl:0
+	!gtk3? (
+		>=gnome-extra/gucharmap-2.32.1:0
+		>=x11-libs/gtk+-2.24:2
+		x11-libs/gtksourceview:2.0
+		>=x11-libs/libwnck-2.30:1
+	)
+	gtk3? (
+		>=gnome-extra/gucharmap-3.0:2.90
+		>=x11-libs/gtk+-3.0:3
+		x11-libs/gtksourceview:3.0
+		>=x11-libs/libwnck-3.0:3
+	)
+	policykit? ( >=sys-auth/polkit-0.92:0 )
+	upower? (
+		|| (
+			>=sys-power/upower-0.9.23
+			>=sys-power/upower-pm-utils-0.9.23
+		)
+	)"
+
+DEPEND="${RDEPEND}
+	app-text/docbook-xml-dtd:4.3
+	>=app-text/scrollkeeper-dtd-1:1.0
+	app-text/yelp-tools:0
+	>=dev-util/intltool-0.50.1:*
+	dev-libs/libxslt:0
+	sys-devel/gettext:*
+	virtual/pkgconfig:*"
+
+src_configure() {
+	mate_src_configure \
+		--libexecdir=/usr/libexec/mate-applets \
+		--with-cpufreq-lib=cpupower \
+		--with-gtk=$(usex gtk3 3.0 2.0) \
+		$(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() {
+	python_fix_shebang invest-applet
+	mate_src_install
+
+	local APPLETS="accessx-status battstat charpick command cpufreq drivemount
+			geyes invest-applet mateweather multiload null_applet 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-applets/mate-applets-1.12.1-r5.ebuild b/mate-base/mate-applets/mate-applets-1.12.1-r5.ebuild
new file mode 100644
index 000000000000..3853add0fe5d
--- /dev/null
+++ b/mate-base/mate-applets/mate-applets-1.12.1-r5.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit mate python-single-r1
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+DESCRIPTION="Applets for the MATE Desktop and Panel"
+LICENSE="GPL-2 FDL-1.1 LGPL-2"
+SLOT="0"
+
+IUSE="X gtk3 ipv6 policykit +upower"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	app-text/rarian:0
+	dev-libs/atk:0
+	>=dev-libs/dbus-glib-0.74:0
+	>=dev-libs/glib-2.36:2
+	>=dev-libs/libmateweather-1.6.1[gtk3(-)=]
+	>=dev-libs/libxml2-2.5:2
+	dev-python/pygobject:3
+	>=gnome-base/libgtop-2.11.92:2=
+	>=mate-base/mate-desktop-1.9[gtk3(-)=]
+	>=mate-base/mate-panel-1.7[gtk3(-)=]
+	>=mate-base/mate-settings-daemon-1.6
+	>=sys-apps/dbus-1.1.2:0
+	sys-power/cpupower
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/libnotify-0.7:0
+	x11-libs/libX11:0
+	x11-libs/pango:0
+	virtual/libintl:0
+	!gtk3? (
+		>=gnome-extra/gucharmap-2.32.1:0
+		>=x11-libs/gtk+-2.24:2
+		x11-libs/gtksourceview:2.0
+		>=x11-libs/libwnck-2.30:1
+	)
+	gtk3? (
+		>=gnome-extra/gucharmap-3.0:2.90
+		>=x11-libs/gtk+-3.0:3
+		x11-libs/gtksourceview:3.0
+		>=x11-libs/libwnck-3.0:3
+	)
+	policykit? ( >=sys-auth/polkit-0.92:0 )
+	upower? (
+		|| (
+			>=sys-power/upower-0.9.23
+			>=sys-power/upower-pm-utils-0.9.23
+		)
+	)"
+
+DEPEND="${RDEPEND}
+	app-text/docbook-xml-dtd:4.3
+	>=app-text/scrollkeeper-dtd-1:1.0
+	app-text/yelp-tools:0
+	>=dev-util/intltool-0.50.1:*
+	dev-libs/libxslt:0
+	sys-devel/gettext:*
+	virtual/pkgconfig:*"
+
+PATCHES=( "${FILESDIR}/${PN}-1.10.4-cpupower-4.7.patch" )
+
+src_configure() {
+	mate_src_configure \
+		--libexecdir=/usr/libexec/mate-applets \
+		--with-cpufreq-lib=cpupower \
+		--with-gtk=$(usex gtk3 3.0 2.0) \
+		$(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() {
+	python_fix_shebang invest-applet
+	mate_src_install
+
+	local APPLETS="accessx-status battstat charpick command cpufreq drivemount
+			geyes invest-applet mateweather multiload null_applet 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-applets/mate-applets-1.14.1-r1.ebuild b/mate-base/mate-applets/mate-applets-1.14.1-r1.ebuild
new file mode 100644
index 000000000000..a813ac75a5d4
--- /dev/null
+++ b/mate-base/mate-applets/mate-applets-1.14.1-r1.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit mate python-single-r1
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+DESCRIPTION="Applets for the MATE Desktop and Panel"
+LICENSE="GPL-2 FDL-1.1 LGPL-2"
+SLOT="0"
+
+IUSE="X gtk3 ipv6 policykit +upower"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+#cpupower #593470
+COMMON_DEPEND="${PYTHON_DEPS}
+	dev-libs/atk:0
+	>=dev-libs/dbus-glib-0.74:0
+	>=dev-libs/glib-2.36:2
+	>=dev-libs/libmateweather-1.6.1[gtk3(-)=]
+	>=dev-libs/libxml2-2.5:2
+	dev-python/pygobject:3
+	>=gnome-base/libgtop-2.11.92:2=
+	>=mate-base/mate-desktop-1.9[gtk3(-)=]
+	>=mate-base/mate-panel-1.7[gtk3(-)=]
+	>=net-wireless/wireless-tools-28_pre9:0
+	>=sys-apps/dbus-1.1.2:0
+	<sys-power/cpupower-4.7
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/libnotify-0.7:0
+	x11-libs/libX11:0
+	x11-libs/pango:0
+	virtual/libintl:0
+	!gtk3? (
+		>=gnome-extra/gucharmap-2.32.1:0
+		>=x11-libs/gtk+-2.24:2
+		x11-libs/gtksourceview:2.0
+		>=x11-libs/libwnck-2.30:1
+	)
+	gtk3? (
+		>=gnome-extra/gucharmap-3.0:2.90
+		>=x11-libs/gtk+-3.0:3
+		x11-libs/gtksourceview:3.0
+		>=x11-libs/libwnck-3.0:3
+	)
+	policykit? ( >=sys-auth/polkit-0.92:0 )
+	upower? (
+		|| (
+			>=sys-power/upower-0.9.23
+			>=sys-power/upower-pm-utils-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:0
+	>=app-text/scrollkeeper-dtd-1:1.0
+	app-text/yelp-tools:0
+	>=dev-util/intltool-0.50.1:*
+	dev-libs/libxslt:0
+	sys-devel/gettext:*
+	virtual/pkgconfig:*"
+
+PATCHES=( "${FILESDIR}/${PN}-1.14.1-revert-upstream-cpupower-4.7-fix.patch" )
+
+src_configure() {
+	mate_src_configure \
+		--libexecdir=/usr/libexec/mate-applets \
+		--with-cpufreq-lib=cpupower \
+		--with-gtk=$(usex gtk3 3.0 2.0) \
+		$(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() {
+	python_fix_shebang invest-applet
+	mate_src_install
+
+	local APPLETS="accessx-status battstat charpick command cpufreq drivemount
+			geyes invest-applet 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-applets/mate-applets-1.14.1-r2.ebuild b/mate-base/mate-applets/mate-applets-1.14.1-r2.ebuild
new file mode 100644
index 000000000000..900d90340920
--- /dev/null
+++ b/mate-base/mate-applets/mate-applets-1.14.1-r2.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit mate python-single-r1
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+DESCRIPTION="Applets for the MATE Desktop and Panel"
+LICENSE="GPL-2 FDL-1.1 LGPL-2"
+SLOT="0"
+
+IUSE="X gtk3 ipv6 policykit +upower"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	dev-libs/atk:0
+	>=dev-libs/dbus-glib-0.74:0
+	>=dev-libs/glib-2.36:2
+	>=dev-libs/libmateweather-1.6.1[gtk3(-)=]
+	>=dev-libs/libxml2-2.5:2
+	dev-python/pygobject:3
+	>=gnome-base/libgtop-2.11.92:2=
+	>=mate-base/mate-desktop-1.9[gtk3(-)=]
+	>=mate-base/mate-panel-1.7[gtk3(-)=]
+	>=net-wireless/wireless-tools-28_pre9:0
+	>=sys-apps/dbus-1.1.2:0
+	sys-power/cpupower
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/libnotify-0.7:0
+	x11-libs/libX11:0
+	x11-libs/pango:0
+	virtual/libintl:0
+	!gtk3? (
+		>=gnome-extra/gucharmap-2.32.1:0
+		>=x11-libs/gtk+-2.24:2
+		x11-libs/gtksourceview:2.0
+		>=x11-libs/libwnck-2.30:1
+	)
+	gtk3? (
+		>=gnome-extra/gucharmap-3.0:2.90
+		>=x11-libs/gtk+-3.0:3
+		x11-libs/gtksourceview:3.0
+		>=x11-libs/libwnck-3.0:3
+	)
+	policykit? ( >=sys-auth/polkit-0.92:0 )
+	upower? (
+		|| (
+			>=sys-power/upower-0.9.23
+			>=sys-power/upower-pm-utils-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:0
+	>=app-text/scrollkeeper-dtd-1:1.0
+	app-text/yelp-tools:0
+	>=dev-util/intltool-0.50.1:*
+	dev-libs/libxslt:0
+	sys-devel/gettext:*
+	virtual/pkgconfig:*"
+
+PATCHES=( "${FILESDIR}/${PN}-1.14.1-cpupower-4.7.patch" )
+
+src_configure() {
+	mate_src_configure \
+		--libexecdir=/usr/libexec/mate-applets \
+		--with-cpufreq-lib=cpupower \
+		--with-gtk=$(usex gtk3 3.0 2.0) \
+		$(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() {
+	python_fix_shebang invest-applet
+	mate_src_install
+
+	local APPLETS="accessx-status battstat charpick command cpufreq drivemount
+			geyes invest-applet 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-applets/mate-applets-1.16.0-r1.ebuild b/mate-base/mate-applets/mate-applets-1.16.0-r1.ebuild
new file mode 100644
index 000000000000..d9c8b7e52daf
--- /dev/null
+++ b/mate-base/mate-applets/mate-applets-1.16.0-r1.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit mate python-single-r1
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+DESCRIPTION="Applets for the MATE Desktop and Panel"
+LICENSE="GPL-2 FDL-1.1 LGPL-2"
+SLOT="0"
+
+IUSE="X gtk3 ipv6 policykit +upower"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	dev-libs/atk:0
+	>=dev-libs/dbus-glib-0.74:0
+	>=dev-libs/glib-2.36:2
+	>=dev-libs/libmateweather-1.6.1[gtk3(-)=]
+	>=dev-libs/libxml2-2.5:2
+	dev-python/pygobject:3
+	>=gnome-base/libgtop-2.11.92:2=
+	>=mate-base/mate-panel-1.7[gtk3(-)=]
+	>=net-wireless/wireless-tools-28_pre9:0
+	>=sys-apps/dbus-1.1.2:0
+	sys-power/cpupower
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/libnotify-0.7:0
+	x11-libs/libX11:0
+	x11-libs/pango:0
+	virtual/libintl:0
+	!gtk3? (
+		>=gnome-extra/gucharmap-2.32.1:0
+		>=x11-libs/gtk+-2.24:2
+		x11-libs/gtksourceview:2.0
+		>=x11-libs/libwnck-2.30:1
+	)
+	gtk3? (
+		>=gnome-extra/gucharmap-3.0:2.90
+		>=x11-libs/gtk+-3.0:3
+		x11-libs/gtksourceview:3.0
+		>=x11-libs/libwnck-3.0:3
+	)
+	policykit? ( >=sys-auth/polkit-0.97:0 )
+	upower? (
+		|| (
+			>=sys-power/upower-0.9.23
+			>=sys-power/upower-pm-utils-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:0
+	>=app-text/scrollkeeper-dtd-1:1.0
+	app-text/yelp-tools:0
+	>=dev-util/intltool-0.50.1:*
+	dev-libs/libxslt:0
+	sys-devel/gettext:*
+	virtual/pkgconfig:*"
+
+PATCHES=( "${FILESDIR}/${PN}-1.16.0-cpupower-4.7.patch" )
+
+src_configure() {
+	mate_src_configure \
+		--libexecdir=/usr/libexec/mate-applets \
+		--with-cpufreq-lib=cpupower \
+		--with-gtk=$(usex gtk3 3.0 2.0) \
+		$(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() {
+	python_fix_shebang invest-applet
+	mate_src_install
+
+	local APPLETS="accessx-status battstat charpick command cpufreq drivemount
+			geyes invest-applet 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-applets/mate-applets-1.16.0.ebuild b/mate-base/mate-applets/mate-applets-1.16.0.ebuild
new file mode 100644
index 000000000000..d54b6acf29fb
--- /dev/null
+++ b/mate-base/mate-applets/mate-applets-1.16.0.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit mate python-single-r1
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+DESCRIPTION="Applets for the MATE Desktop and Panel"
+LICENSE="GPL-2 FDL-1.1 LGPL-2"
+SLOT="0"
+
+IUSE="X gtk3 ipv6 policykit +upower"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+#cpupower #593470
+COMMON_DEPEND="${PYTHON_DEPS}
+	dev-libs/atk:0
+	>=dev-libs/dbus-glib-0.74:0
+	>=dev-libs/glib-2.36:2
+	>=dev-libs/libmateweather-1.6.1[gtk3(-)=]
+	>=dev-libs/libxml2-2.5:2
+	dev-python/pygobject:3
+	>=gnome-base/libgtop-2.11.92:2=
+	>=mate-base/mate-panel-1.7[gtk3(-)=]
+	>=net-wireless/wireless-tools-28_pre9:0
+	>=sys-apps/dbus-1.1.2:0
+	<sys-power/cpupower-4.7
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/libnotify-0.7:0
+	x11-libs/libX11:0
+	x11-libs/pango:0
+	virtual/libintl:0
+	!gtk3? (
+		>=gnome-extra/gucharmap-2.32.1:0
+		>=x11-libs/gtk+-2.24:2
+		x11-libs/gtksourceview:2.0
+		>=x11-libs/libwnck-2.30:1
+	)
+	gtk3? (
+		>=gnome-extra/gucharmap-3.0:2.90
+		>=x11-libs/gtk+-3.0:3
+		x11-libs/gtksourceview:3.0
+		>=x11-libs/libwnck-3.0:3
+	)
+	policykit? ( >=sys-auth/polkit-0.97:0 )
+	upower? (
+		|| (
+			>=sys-power/upower-0.9.23
+			>=sys-power/upower-pm-utils-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:0
+	>=app-text/scrollkeeper-dtd-1:1.0
+	app-text/yelp-tools:0
+	>=dev-util/intltool-0.50.1:*
+	dev-libs/libxslt:0
+	sys-devel/gettext:*
+	virtual/pkgconfig:*"
+
+PATCHES=( "${FILESDIR}/${PN}-1.14.1-revert-upstream-cpupower-4.7-fix.patch" )
+
+src_configure() {
+	mate_src_configure \
+		--libexecdir=/usr/libexec/mate-applets \
+		--with-cpufreq-lib=cpupower \
+		--with-gtk=$(usex gtk3 3.0 2.0) \
+		$(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() {
+	python_fix_shebang invest-applet
+	mate_src_install
+
+	local APPLETS="accessx-status battstat charpick command cpufreq drivemount
+			geyes invest-applet 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-applets/mate-applets-1.18.1-r1.ebuild b/mate-base/mate-applets/mate-applets-1.18.1-r1.ebuild
new file mode 100644
index 000000000000..4db7d9bb26fc
--- /dev/null
+++ b/mate-base/mate-applets/mate-applets-1.18.1-r1.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit mate python-single-r1
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~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"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	dev-libs/atk:0
+	>=dev-libs/dbus-glib-0.74:0
+	>=dev-libs/glib-2.36:2
+	>=dev-libs/libmateweather-1.17.0
+	>=dev-libs/libxml2-2.5:2
+	dev-python/pygobject:3
+	>=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:0
+	sys-power/cpupower
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.14:3
+	x11-libs/gtksourceview:3.0
+	>=x11-libs/libnotify-0.7:0
+	x11-libs/libX11:0
+	>=x11-libs/libwnck-3.0:3
+	x11-libs/pango:0
+	virtual/libintl:0
+	policykit? ( >=sys-auth/polkit-0.97:0 )
+	upower? (
+		|| (
+			>=sys-power/upower-0.9.23
+			>=sys-power/upower-pm-utils-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:0
+	>=app-text/scrollkeeper-dtd-1:1.0
+	app-text/yelp-tools:0
+	>=dev-util/intltool-0.50.1:*
+	dev-libs/libxslt:0
+	sys-devel/gettext:*
+	virtual/pkgconfig:*"
+
+PATCHES=( "${FILESDIR}/${PN}-1.16.0-cpupower-4.7.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() {
+	python_fix_shebang invest-applet
+	mate_src_install
+
+	local APPLETS="accessx-status battstat charpick command cpufreq drivemount
+			geyes invest-applet 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-applets/mate-applets-1.18.1.ebuild b/mate-base/mate-applets/mate-applets-1.18.1.ebuild
new file mode 100644
index 000000000000..d1b6e7177f43
--- /dev/null
+++ b/mate-base/mate-applets/mate-applets-1.18.1.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit mate python-single-r1
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~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"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+#cpupower #593470
+COMMON_DEPEND="${PYTHON_DEPS}
+	dev-libs/atk:0
+	>=dev-libs/dbus-glib-0.74:0
+	>=dev-libs/glib-2.36:2
+	>=dev-libs/libmateweather-1.17.0
+	>=dev-libs/libxml2-2.5:2
+	dev-python/pygobject:3
+	>=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:0
+	<sys-power/cpupower-4.7
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.14:3
+	x11-libs/gtksourceview:3.0
+	>=x11-libs/libnotify-0.7:0
+	x11-libs/libX11:0
+	>=x11-libs/libwnck-3.0:3
+	x11-libs/pango:0
+	virtual/libintl:0
+	policykit? ( >=sys-auth/polkit-0.97:0 )
+	upower? (
+		|| (
+			>=sys-power/upower-0.9.23
+			>=sys-power/upower-pm-utils-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:0
+	>=app-text/scrollkeeper-dtd-1:1.0
+	app-text/yelp-tools:0
+	>=dev-util/intltool-0.50.1:*
+	dev-libs/libxslt:0
+	sys-devel/gettext:*
+	virtual/pkgconfig:*"
+
+PATCHES=( "${FILESDIR}/${PN}-1.14.1-revert-upstream-cpupower-4.7-fix.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() {
+	python_fix_shebang invest-applet
+	mate_src_install
+
+	local APPLETS="accessx-status battstat charpick command cpufreq drivemount
+			geyes invest-applet 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-applets/metadata.xml b/mate-base/mate-applets/metadata.xml
new file mode 100644
index 000000000000..80be46261aa9
--- /dev/null
+++ b/mate-base/mate-applets/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>mate@gentoo.org</email>
+		<name>Gentoo MATE Desktop</name>
+	</maintainer>
+	<use>
+		<flag name="gtk3">Build with GTK+3 instead of GTK+2</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">mate-desktop/mate-applets</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/mate-base/mate-common/Manifest b/mate-base/mate-common/Manifest
new file mode 100644
index 000000000000..628a5dd15d0c
--- /dev/null
+++ b/mate-base/mate-common/Manifest
@@ -0,0 +1,11 @@
+DIST mate-common-1.12.0.tar.xz 66156 SHA256 7c178326ac810c6580647da16d13a8a36a5cc04725ce3a62419c5e2228c8b934 SHA512 3392cc38ee51dec37330ac7d309bd42dfec5f622b50d92af46e16d059781ed4bc1396cb4525518dfe1f2a913fecb426d3ef047731f2208219ef648f27bf54f32 WHIRLPOOL ac12bb8bd880e9bb943f137e5070b74be855e7b1f24fc6249178de2366c7d0d172be416f611ce1e3435c630feed2274e196e27bb59e33c6953563a39b1cbc842
+DIST mate-common-1.14.0.tar.xz 72368 SHA256 04b7196ac6b301cc88dc31e88ef19a9732ac338c9bd5c3d9b42f6fc387e56cf6 SHA512 fe0a824796dd65756f7dcd351370f3f537d9990b422cb365419f2f6ec446b6ec9660be35685847ff8ae295a80cda8780a968ab11441c49ac152eb8e50f30dc6a WHIRLPOOL fddbb8fc3acc9b3c5e0231f8c2dfdd7f9a01f426adc3630332080c87b7895ee1eda1d74b2b46bd61170327ad3dcf9531e7d8c6a5df6722065d778e4ddc635eaa
+DIST mate-common-1.16.0.tar.xz 72392 SHA256 34d3a8c58647806aebde24f705c07e1dc8083cd4baa55b45d3e51e367c2ef20a SHA512 3cf13f28c43072a26f48099eeeceb920a88bd86c258ca91e58f36c164ffa12b9c43d379c1130734df5c39070c74ee3f144ef7d81a6561244bd07af2b81173224 WHIRLPOOL c64bca770e07501c9bc88e6a34316d719d1ba200cb88c2af99904860f6a11a25a865f0a46be9d754ecd88e29ecfade12f6263a04205d31672596f81f8bf53147
+DIST mate-common-1.18.0.tar.xz 72608 SHA256 d77c44546e748f94cf93707ab3593146109401c9bcde533fc308863f9ca20580 SHA512 cdc8d39a78ebb1a0fb0d8179814ce59691006a21cb10d78b818cf62a8f42c89d01c9126e93b5fa3b7ac27adce52d3a2512ac2fb63c41e6c5a698a767e9176563 WHIRLPOOL 278a5245ff96b8fe4bd014b6ae330fb90101d6ca9526c68ceea4739d438fe489f4a4a8f350d5927a4b8287b6ea29eae7442f1a56e61e905bd33c1a3537d02985
+EBUILD mate-common-1.12.0.ebuild 524 SHA256 b66a8087e334196bbdb71366dc228a80a36171e5ae9a2849a167ca53ce8fba4f SHA512 bda08b37eb4a867e2f9153a7510271c13a2cbf656aa5f926187dc8bcfd1bbe55661947ffb7b8c1822b2978e5991487cda45d3634df4b268013fc9a2b531c6596 WHIRLPOOL 20566a4fb323e2bc794ecd211a6cb5b50f900c809e153b1f0a4d09fa5f28da780ad4d314d07492732a736caf567d55d2e904421c2779d2faa9be4a8fafbc1c3e
+EBUILD mate-common-1.14.0.ebuild 526 SHA256 32437bfdf3bc4a03cb838db7fad1e47bd7c678c7386705fddb0f21b224937295 SHA512 d5245a390ceadebbb2106ab147283a1dfe26622d72a3ac4580927ab78046eea7b61048be20c94edeaa90f99d058ed28cf2fc333918c95294d3b9802e89537bb2 WHIRLPOOL fd8dfc16d3641f78a9fd514340fdbfc99d6ec6529922c8756f25a5eac7fae023c520daddcedc5416b102ec6f22b0cda28d4a7239a67c5d8cede9d8baa649afc3
+EBUILD mate-common-1.16.0.ebuild 526 SHA256 32437bfdf3bc4a03cb838db7fad1e47bd7c678c7386705fddb0f21b224937295 SHA512 d5245a390ceadebbb2106ab147283a1dfe26622d72a3ac4580927ab78046eea7b61048be20c94edeaa90f99d058ed28cf2fc333918c95294d3b9802e89537bb2 WHIRLPOOL fd8dfc16d3641f78a9fd514340fdbfc99d6ec6529922c8756f25a5eac7fae023c520daddcedc5416b102ec6f22b0cda28d4a7239a67c5d8cede9d8baa649afc3
+EBUILD mate-common-1.18.0.ebuild 526 SHA256 86488918e3ae45425ddddca0c201f27bf6ef1314125c7c7d1440d5e1e028ed1b SHA512 f7e460fa618150858ddd14fc9ba101333717989034eff46261b3b9150eba023a79e60b3a38c3a1808c79e11d1844fd3d7ea0f13825f7dc8d5d5de5bed1164482 WHIRLPOOL 72c7058ef13a62492d47a9e74a48ae64e4060fd801640eb7cae370399b5702026cf7f76d1504b03ab58d505b71a52afde83f0f423cdbf08980838b39ddb8fe1e
+MISC ChangeLog 4081 SHA256 ba5e9bfa694c37cbd510cce4b040f33f7cf29050c6d511f9dc45ac460b158605 SHA512 3f9a938afc311019d171f1c9be3f4fe802c6936e7dff737193f5f26c28e803cb636267fa002de2f70fe49d2480d2f52f50c7678f21b5911351c701b254b03e9a WHIRLPOOL bd5f6d2aab5ffd081c08a7a442b1d7507e1ff0e016e263b7a2440c3d0ab70f71c3c3890532f16d9345f703d9dc4ce09ca748434f7e82afd43ae29a842a27d75e
+MISC ChangeLog-2015 1403 SHA256 a65694706ecf4149c754d1b47f57ff4d01cfc6dd6758779b34bf8a30098a443c SHA512 22d28bb6334008ff055eed8d0913eb4fe60a90afd17163a6bfaf8ac2feee024dbc4500346aaf97b0b2627f114d3fd5651ab834ca580dc2b38807c99908b30bea WHIRLPOOL b0638722846bebe2c5ee571a9f2169033228677592e9a29e1a95b3553b3d5c550606eb59b9ee2d71b679ba122b22f20f43e82d98c2fd4e225343a37c76b6259f
+MISC metadata.xml 340 SHA256 18007fd627f16b94aea291245eef3a8971f2de9061cda1b0ec39d5e421610fbf SHA512 06a836307e50d0ecf5e85516865436cddffaa2d69492c295bad163f3511ded0b7254b541fa73b8b5f314c1574c755f595c1a5af5f55c87f2c96aaf06fffc6262 WHIRLPOOL 7899d343323d6d465951d3035a00a25460e68c22bb2481bf0612879831a94796250e9ac5865776c3d4e1336dea4f05f7463fde1c2790732c1568dc9febd4efd0
diff --git a/mate-base/mate-common/mate-common-1.12.0.ebuild b/mate-base/mate-common/mate-common-1.12.0.ebuild
new file mode 100644
index 000000000000..87e27bd29c5d
--- /dev/null
+++ b/mate-base/mate-common/mate-common-1.12.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit mate-desktop.org
+
+if [[ ${PV} == 9999 ]]; then
+	inherit autotools
+else
+	KEYWORDS="amd64 ~arm x86"
+fi
+
+DESCRIPTION="Common files for development of MATE packages"
+LICENSE="GPL-3"
+SLOT="0"
+
+src_prepare() {
+	default
+	if [[ ${PV} == 9999 ]]; then
+		eautoreconf
+	fi
+}
+
+src_install() {
+	mv doc-build/README README.doc-build \
+		|| die "Failed to rename doc-build/README."
+
+	default
+
+	dodoc doc/usage.txt
+}
diff --git a/mate-base/mate-common/mate-common-1.14.0.ebuild b/mate-base/mate-common/mate-common-1.14.0.ebuild
new file mode 100644
index 000000000000..6908a4605805
--- /dev/null
+++ b/mate-base/mate-common/mate-common-1.14.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit mate-desktop.org
+
+if [[ ${PV} == 9999 ]]; then
+	inherit autotools
+else
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+DESCRIPTION="Common files for development of MATE packages"
+LICENSE="GPL-3"
+SLOT="0"
+
+src_prepare() {
+	default
+	if [[ ${PV} == 9999 ]]; then
+		eautoreconf
+	fi
+}
+
+src_install() {
+	mv doc-build/README README.doc-build \
+		|| die "Failed to rename doc-build/README."
+
+	default
+
+	dodoc doc/usage.txt
+}
diff --git a/mate-base/mate-common/mate-common-1.16.0.ebuild b/mate-base/mate-common/mate-common-1.16.0.ebuild
new file mode 100644
index 000000000000..6908a4605805
--- /dev/null
+++ b/mate-base/mate-common/mate-common-1.16.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit mate-desktop.org
+
+if [[ ${PV} == 9999 ]]; then
+	inherit autotools
+else
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+DESCRIPTION="Common files for development of MATE packages"
+LICENSE="GPL-3"
+SLOT="0"
+
+src_prepare() {
+	default
+	if [[ ${PV} == 9999 ]]; then
+		eautoreconf
+	fi
+}
+
+src_install() {
+	mv doc-build/README README.doc-build \
+		|| die "Failed to rename doc-build/README."
+
+	default
+
+	dodoc doc/usage.txt
+}
diff --git a/mate-base/mate-common/mate-common-1.18.0.ebuild b/mate-base/mate-common/mate-common-1.18.0.ebuild
new file mode 100644
index 000000000000..47c9b9f3d9ea
--- /dev/null
+++ b/mate-base/mate-common/mate-common-1.18.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit mate-desktop.org
+
+if [[ ${PV} == 9999 ]]; then
+	inherit autotools
+else
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+DESCRIPTION="Common files for development of MATE packages"
+LICENSE="GPL-3"
+SLOT="0"
+
+src_prepare() {
+	default
+	if [[ ${PV} == 9999 ]]; then
+		eautoreconf
+	fi
+}
+
+src_install() {
+	mv doc-build/README README.doc-build \
+		|| die "Failed to rename doc-build/README."
+
+	default
+
+	dodoc doc/usage.txt
+}
diff --git a/mate-base/mate-common/metadata.xml b/mate-base/mate-common/metadata.xml
new file mode 100644
index 000000000000..cb12bbb43226
--- /dev/null
+++ b/mate-base/mate-common/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>mate@gentoo.org</email>
+		<name>Gentoo MATE Desktop</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">mate-desktop/mate-common</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/mate-base/mate-control-center/Manifest b/mate-base/mate-control-center/Manifest
new file mode 100644
index 000000000000..fc34703a3e70
--- /dev/null
+++ b/mate-base/mate-control-center/Manifest
@@ -0,0 +1,12 @@
+AUX mate-control-center-1.12.1-backport-appindicator-configure.patch 2662 SHA256 79ce169fc5631fee2b4acc73cc448582e6bd3b2c182725af23f10ae6311f1779 SHA512 ffa139b6966935b22fa0ab59349b944318ba483670187de9b65135d64fdf8e18cafd0c67667b45e4e0450fdb77616c84b9e91eaa933e5ee30c2b6a6900be55d5 WHIRLPOOL 8eaa890d25e5134d9cf57bc08e9c405b9f21a77fa369b0404a49d31d6d6d1646b2331967e70d470f9dfad035e5b3b6e4966d07bdaa32ecb07cc5d8d3df12e057
+DIST mate-control-center-1.12.1.tar.xz 1304732 SHA256 851f08e69ec8f513b8971262a439c83ef837b2a7467690313672b6a9d9a179fb SHA512 4023511113c993b2420666803a273923b161cd3fff74b07e02f3dd9a80baea47278ca5c10a5baec673818390174a9f0b5c2d8db81c653f48c411cf5f53cc2dce WHIRLPOOL 88a7d704f1e0665d45fa2f4b51c9c588fff1040dc8190fd60548fd49254f98f01ef2cde3e51abf995f88acf6c0c4f40f4d7694927fe028b4b97ea6a6f9dfb461
+DIST mate-control-center-1.14.1.tar.xz 1371360 SHA256 b06deae1feb449a3f3debe27a2a406e64561d68bea7af0bcd311bf5d7dd5641b SHA512 c871486e69174801e6b509848ae416e1b9aa55ca21ea796f7bc9e408ad59d0dfe5feafde59258c8d0019448b620af2fbd73b75cc644c5dc7b031237e3170a30b WHIRLPOOL ea73aa7f726280b4e900d7fdebfe05dd303a901a07ff1c8ac858d35c1ebbf8888edfd317771ae1896338f70d1babcc7dc25d30066dd0943a2c8061107b0587a7
+DIST mate-control-center-1.16.0.tar.xz 1341724 SHA256 155226a482c3d0e402ec49ca53f6691afc5688df8cc958a5e216827e19525e22 SHA512 891cddc3a908bd0a6aeeb05241290f4c0bbc247bc8923c34a1aa1a7ee55d62881c3958a9e65e338d2e79ecae91cdd5641e2186cea44a5fdb762a9a765a065496 WHIRLPOOL c9cd2d204daced5d7ecfcdfa3b337639757250fde5107c92437bdbaa98b0d5ba8c48ef1ca4b7f557080f41f9a6b061831f05a88a0fa45b4b79d7776561f2e419
+DIST mate-control-center-1.18.1.tar.xz 1343276 SHA256 1d5c1fe4da8fc5c453d4d3d2b91e18c4dadd2baf65f4da167b27292e34874bd5 SHA512 0d4828f7175394a970c30ce7777cf175aaf0e79e9f379661d4efc6973c22516b6a93548f7166d793bb4dd1ad8e757bff4c7aee744f142d3320c3f9a49b5dd76d WHIRLPOOL 89d36b1dfb71c0c93dbeeeec94dd1e772e204ded3b70e3a89a17a2e8195fad418a6bb48d704ef16b0a9a5171fa4613a1c9440a01bf8ae595dcefb6f17e31fea8
+EBUILD mate-control-center-1.12.1-r1.ebuild 1970 SHA256 077d31c64137e1cac202c1392ba81ece33ed95b9f81848d07938c5f4346c7ad0 SHA512 5b102497f3cc90d248cea6b892c7ccd3c89503e04964d75655caacc6ff2cebee7137fbfba83ffc441d89417c077dc5caa70e2f25826873daeca8b6053efb2a11 WHIRLPOOL b7c017af87389b2f311eea49a2ed79f847152a5528fb093a0be1beae2efb066bf2289282867ac6f4b00cdae4f106ab8f1742c4036cba4732f8caa064d3600034
+EBUILD mate-control-center-1.14.1-r1.ebuild 2016 SHA256 2d6de4483e414e12a7002bcfdd32952af4b05c8cc25f413f4df9e96b3992778d SHA512 7f72998610c1ef755092a9fe1f31fbfa0cfcd5b13232baf9cd6cf2560cb095df0631d08caf98544a564c3a8604411dc54ef9f891e55bb38f8775285b2c5f18e5 WHIRLPOOL b0cbd53769c8d9ef2eff4dfb2c80be61f1918b74f764fd7d92406f9e93229dc3d033a341b37cc37e226412fab5865b7d0ad0e28ecd39ae6d2c99037b09dd4c97
+EBUILD mate-control-center-1.16.0.ebuild 1941 SHA256 cf4c642799de61b6eef24404de1926d6d3a41c2dbfb07de102761499fe767721 SHA512 ce1f3f057026c5dee9e43900d034c439b4bf0410749da9155e67fd8b43f38d3a8c9fc46c73b32c5fc7c852b6b17d69bfb607f111d7b1becd865d04cbfe590941 WHIRLPOOL ad62b673dcda7b879e1eb3aab50b9e303569b80320434af2d40fbccae7224e11b852306f92b711afc9eb499c767b9235c87c5926d9cfa4e47c505407404485a3
+EBUILD mate-control-center-1.18.1.ebuild 1673 SHA256 760b640c57fdf756bd64c4ffb2c11ac133e955ccf3add3ab3844c32b10f4d0b1 SHA512 d2d70339952953847e0bcda4cc56cb43fda8e94c17eab8eab1982061681f6c5b431768ee4e74bb823e776386f1ca57362805e6673db3402ae69df15f0173064f WHIRLPOOL 26cf804f1387f1e2ddb22065d53f4b84392cf42d8d89265e28f1a2f57e17a2e96bdb7e060b47354a8a5ca073945807421c1ad278b3807bbcc98f1b22e227483f
+MISC ChangeLog 5504 SHA256 b3cf55dc8f641271a6f70ffb1026598f402c8d6228fe03e1e3e415339d6f0444 SHA512 62d113efdf4c72ea0038f7ac626042b7729636982e959e9c89199ab3a222d585396dcd046017d6c882345b8c5b33641462abd7c72dc04c32df4d5927b52da281 WHIRLPOOL 2f50d2073dba60aeadbeddc2277874a70c0d88cef0c9bb0f989cdc96d78ead650f292b16dd9e5274d177dd8cad28076ef55255c8a482b217eb3d2eb22aa9551a
+MISC ChangeLog-2015 2130 SHA256 1ea67fd6b318339d6c11f24242039d7d3f03ea0d6f8fe707933a3f67036bb64f SHA512 7b37354ee9433353d7aeed68b345ad39c613ba8ae51e06a087f2f9a56374535510f1cc6cc4f4a4fa092cea5c799f5f7e3e6ffb4e340356c26f838821d0dba162 WHIRLPOOL 8e9ba2694e8d6a1e9946f1e801521f711333404db94da1f69f28ef18790f91dd986cf198ca47ae2eb2de245fa7813272656dcfc6d93c54aebe960f3f3d8d647b
+MISC metadata.xml 488 SHA256 e464487182e030c2cb6b384aaab293ae1054c0d421e5dd81b616ca128d20b934 SHA512 52b8617cf3bb2e4750d20e3c869f0624b290dc0a2b4dcaf56851fdbc3b978088bca2c616c76a8b161f5bc7c91f22b28bfb1043e415d615ce3ece59f435dbb137 WHIRLPOOL 9f8a22568946895a7c1828da1c2b8699d06b35354fd58b7b3eee01733970936a9c0126889f3e01eed7704a5f26606542e602291b501fc6f2d1f2dfc326f082bc
diff --git a/mate-base/mate-control-center/files/mate-control-center-1.12.1-backport-appindicator-configure.patch b/mate-base/mate-control-center/files/mate-control-center-1.12.1-backport-appindicator-configure.patch
new file mode 100644
index 000000000000..b713b7f3a8cc
--- /dev/null
+++ b/mate-base/mate-control-center/files/mate-control-center-1.12.1-backport-appindicator-configure.patch
@@ -0,0 +1,67 @@
+From 90195c0c2e3f45a355286f1640c2f0020a5556b8 Mon Sep 17 00:00:00 2001
+From: raveit65 <chat-to-me@raveit.de>
+Date: Fri, 17 Jun 2016 20:34:06 +0200
+Subject: [PATCH] configure: fix build with libappindicator3
+
+---
+ configure.ac | 14 +++++++++-----
+ 1 file changed, 9 insertions(+), 5 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 9b27671..a11bfdc 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -63,6 +63,8 @@ dnl ==============================================
+ dnl Check GTK+ API version
+ dnl ==============================================
+ 
++APPINDICATOR_REQUIRED=0.0.13
++
+ AC_MSG_CHECKING([which gtk+ version to compile against])
+ AC_ARG_WITH([gtk],
+   [AS_HELP_STRING([--with-gtk=2.0|3.0],[which gtk+ version to compile against (default: 2.0)])],
+@@ -80,6 +82,7 @@ case "$with_gtk" in
+        LIBCANBERRA_API_VERSION=
+        LIBUNIQUE_API_VERSION=1.0
+        ENGINES_FOLDER="engines"
++       APPINDICATOR_API_VERSION=
+        ;;
+   3.0) GTK_API_VERSION=3.0
+        GTK_REQUIRED=3.0.0
+@@ -87,6 +90,7 @@ case "$with_gtk" in
+        LIBCANBERRA_API_VERSION=3
+        LIBUNIQUE_API_VERSION=3.0
+        ENGINES_FOLDER="theming-engines"
++       APPINDICATOR_API_VERSION=3
+        ;;
+ esac
+ AC_SUBST(GTK_API_VERSION)
+@@ -101,7 +105,7 @@ AM_CONDITIONAL(HAVE_LIBCANBERRA_GTK, test "x$CANBERRA_GTK" = "x1")
+ AM_CONDITIONAL(HAVE_TYPING_BREAK, test "x$TYPING_BREAK" = xtyping-break)
+ 
+ dnl app indicator
+-APPINDICATOR_REQUIRED=0.0.7
++APPINDICATOR_PKG=appindicator$APPINDICATOR_API_VERSION-0.1
+ 
+ AC_ARG_ENABLE(appindicator,
+                         AS_HELP_STRING([--enable-appindicator[=@<:@no/auto/yes@:>@]],[Build support for application indicators ]),
+@@ -109,16 +113,16 @@ AC_ARG_ENABLE(appindicator,
+                         [enable_appindicator="auto"])
+ 
+ if test x$enable_appindicator = xauto ; then
+-        PKG_CHECK_EXISTS([appindicator-0.1 >= $APPINDICATOR_REQUIRED],
++        PKG_CHECK_EXISTS([$APPINDICATOR_PKG >= $APPINDICATOR_REQUIRED],
+                          enable_appindicator="yes",
+                          enable_appindicator="no")
+ fi
+ 
+ if test x$enable_appindicator = xyes ; then
+-        PKG_CHECK_EXISTS([appindicator-0.1 >= $APPINDICATOR_REQUIRED],,
++        PKG_CHECK_EXISTS([$APPINDICATOR_PKG >= $APPINDICATOR_REQUIRED],,
+                          AC_MSG_ERROR([appindicator-0.1 is not installed]))
+         PKG_CHECK_MODULES(APP_INDICATOR,
+-                        appindicator-0.1 >= $APPINDICATOR_REQUIRED)
++                        $APPINDICATOR_PKG >= $APPINDICATOR_REQUIRED)
+         AC_SUBST(APP_INDICATOR_CFLAGS)
+         AC_SUBST(APP_INDICATOR_LIBS)
+         AC_DEFINE(HAVE_APP_INDICATOR, 1, [Have AppIndicator])
diff --git a/mate-base/mate-control-center/mate-control-center-1.12.1-r1.ebuild b/mate-base/mate-control-center/mate-control-center-1.12.1-r1.ebuild
new file mode 100644
index 000000000000..25346ddc62a0
--- /dev/null
+++ b/mate-base/mate-control-center/mate-control-center-1.12.1-r1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2016 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 x86"
+fi
+
+DESCRIPTION="The MATE Desktop configuration tool"
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="appindicator debug gtk3"
+
+RDEPEND="app-text/rarian:0
+	dev-libs/atk:0
+	>=dev-libs/dbus-glib-0.73:0
+	>=dev-libs/glib-2.36:2
+	dev-libs/libxml2:2
+	>=gnome-base/dconf-0.13.4:0
+	>=gnome-base/librsvg-2.0:2
+	>=mate-base/libmatekbd-1.6[gtk3(-)=]
+	>=mate-base/mate-desktop-1.11[gtk3(-)=]
+	>=mate-base/caja-1.8[gtk3(-)=]
+	>=mate-base/mate-menus-1.6
+	>=mate-base/mate-settings-daemon-1.11[gtk3(-)=]
+	>=media-libs/fontconfig-1:1.0
+	media-libs/freetype:2
+	>=sys-apps/dbus-1:0
+	x11-apps/xmodmap:0
+	x11-libs/cairo:0
+	x11-libs/gdk-pixbuf:2
+	x11-libs/libX11:0
+	x11-libs/libXScrnSaver:0
+	x11-libs/libXcursor:0
+	x11-libs/libXext:0
+	>=x11-libs/libXi-1.2:0
+	x11-libs/libXrandr:0
+	x11-libs/libXrender:0
+	x11-libs/libXxf86misc:0
+	>=x11-libs/libxklavier-4:0
+	x11-libs/pango:0
+	>=x11-wm/marco-1.9.1[gtk3(-)=]
+	virtual/libintl:0
+	!gtk3? (
+		>=dev-libs/libunique-1:1
+		media-libs/libcanberra:0[gtk]
+		>=x11-libs/gtk+-2.24:2
+		appindicator? ( dev-libs/libappindicator:2 )
+	)
+	gtk3? (
+		>=dev-libs/libunique-3:3
+		media-libs/libcanberra:0[gtk3]
+		>=x11-libs/gtk+-3.0:3
+		appindicator? ( dev-libs/libappindicator:3 )
+	)"
+
+DEPEND="${RDEPEND}
+	>=app-text/scrollkeeper-dtd-1:1.0
+	app-text/yelp-tools:0
+	dev-util/desktop-file-utils:0
+	>=dev-util/intltool-0.50.1:*
+	sys-devel/gettext:*
+	x11-proto/kbproto:0
+	x11-proto/randrproto:0
+	x11-proto/renderproto:0
+	x11-proto/scrnsaverproto:0
+	x11-proto/xextproto:0
+	x11-proto/xf86miscproto:0
+	x11-proto/xproto:0
+	virtual/pkgconfig:*"
+
+PATCHES=( "${FILESDIR}/${PN}-1.12.1-backport-appindicator-configure.patch" )
+
+src_configure() {
+	mate_src_configure \
+		--disable-update-mimedb \
+		--with-gtk=$(usex gtk3 3.0 2.0) \
+		$(use_enable appindicator) \
+		$(use_enable debug)
+}
diff --git a/mate-base/mate-control-center/mate-control-center-1.14.1-r1.ebuild b/mate-base/mate-control-center/mate-control-center-1.14.1-r1.ebuild
new file mode 100644
index 000000000000..a8ace75b4cfc
--- /dev/null
+++ b/mate-base/mate-control-center/mate-control-center-1.14.1-r1.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2016 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 ~x86"
+fi
+
+DESCRIPTION="The MATE Desktop configuration tool"
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="appindicator debug gtk3"
+
+COMMON_DEPEND="
+	dev-libs/atk:0
+	>=dev-libs/dbus-glib-0.73:0
+	>=dev-libs/glib-2.36:2
+	dev-libs/libxml2:2
+	>=gnome-base/dconf-0.13.4:0
+	>=gnome-base/librsvg-2.0:2
+	>=mate-base/libmatekbd-1.6[gtk3(-)=]
+	>=mate-base/mate-desktop-1.11[gtk3(-)=]
+	>=mate-base/caja-1.8[gtk3(-)=]
+	>=mate-base/mate-menus-1.6
+	>=mate-base/mate-settings-daemon-1.13.1[gtk3(-)=]
+	>=media-libs/fontconfig-1:1.0
+	media-libs/freetype:2
+	>=sys-apps/dbus-1:0
+	x11-apps/xmodmap:0
+	x11-libs/cairo:0
+	x11-libs/gdk-pixbuf:2
+	x11-libs/libX11:0
+	x11-libs/libXScrnSaver:0
+	x11-libs/libXcursor:0
+	x11-libs/libXext:0
+	>=x11-libs/libXi-1.2:0
+	x11-libs/libXrandr:0
+	x11-libs/libXrender:0
+	x11-libs/libXxf86misc:0
+	>=x11-libs/libxklavier-4:0
+	x11-libs/pango:0
+	>=x11-wm/marco-1.9.1[gtk3(-)=]
+	virtual/libintl:0
+	!gtk3? (
+		>=dev-libs/libunique-1:1
+		media-libs/libcanberra:0[gtk]
+		>=x11-libs/gtk+-2.24:2
+		appindicator? ( dev-libs/libappindicator:2 )
+	)
+	gtk3? (
+		>=dev-libs/libunique-3:3
+		media-libs/libcanberra:0[gtk3]
+		>=x11-libs/gtk+-3.0:3
+		appindicator? ( dev-libs/libappindicator:3 )
+	)"
+
+RDEPEND="${COMMON_DEPEND}"
+
+DEPEND="${COMMON_DEPEND}
+	app-text/rarian:0
+	>=app-text/scrollkeeper-dtd-1:1.0
+	app-text/yelp-tools:0
+	dev-util/desktop-file-utils:0
+	>=dev-util/intltool-0.50.1:*
+	sys-devel/gettext:*
+	x11-proto/kbproto:0
+	x11-proto/randrproto:0
+	x11-proto/renderproto:0
+	x11-proto/scrnsaverproto:0
+	x11-proto/xextproto:0
+	x11-proto/xf86miscproto:0
+	x11-proto/xproto:0
+	virtual/pkgconfig:*"
+
+PATCHES=( "${FILESDIR}/${PN}-1.12.1-backport-appindicator-configure.patch" )
+
+src_configure() {
+	mate_src_configure \
+		--disable-update-mimedb \
+		--with-gtk=$(usex gtk3 3.0 2.0) \
+		$(use_enable appindicator) \
+		$(use_enable debug)
+}
diff --git a/mate-base/mate-control-center/mate-control-center-1.16.0.ebuild b/mate-base/mate-control-center/mate-control-center-1.16.0.ebuild
new file mode 100644
index 000000000000..336b30d617c1
--- /dev/null
+++ b/mate-base/mate-control-center/mate-control-center-1.16.0.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2016 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 ~x86"
+fi
+
+DESCRIPTION="The MATE Desktop configuration tool"
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="appindicator debug gtk3"
+
+COMMON_DEPEND="
+	dev-libs/atk:0
+	>=dev-libs/dbus-glib-0.73:0
+	>=dev-libs/glib-2.36:2
+	dev-libs/libxml2:2
+	>=gnome-base/dconf-0.13.4:0
+	>=gnome-base/librsvg-2.0:2
+	>=mate-base/libmatekbd-1.6[gtk3(-)=]
+	>=mate-base/mate-desktop-1.15.1[gtk3(-)=]
+	>=mate-base/caja-1.8[gtk3(-)=]
+	>=mate-base/mate-menus-1.6
+	>=mate-base/mate-settings-daemon-1.13.1[gtk3(-)=]
+	>=media-libs/fontconfig-1:1.0
+	media-libs/freetype:2
+	>=sys-apps/dbus-1:0
+	x11-apps/xmodmap:0
+	x11-libs/cairo:0
+	x11-libs/gdk-pixbuf:2
+	x11-libs/libX11:0
+	x11-libs/libXScrnSaver:0
+	x11-libs/libXcursor:0
+	x11-libs/libXext:0
+	>=x11-libs/libXi-1.2:0
+	x11-libs/libXrandr:0
+	x11-libs/libXrender:0
+	x11-libs/libXxf86misc:0
+	>=x11-libs/libxklavier-4:0
+	x11-libs/pango:0
+	>=x11-wm/marco-1.13.1[gtk3(-)=]
+	virtual/libintl:0
+	!gtk3? (
+		>=dev-libs/libunique-1:1
+		media-libs/libcanberra:0[gtk]
+		>=x11-libs/gtk+-2.24:2
+		appindicator? ( dev-libs/libappindicator:2 )
+	)
+	gtk3? (
+		>=dev-libs/libunique-3:3
+		media-libs/libcanberra:0[gtk3]
+		>=x11-libs/gtk+-3.0:3
+		appindicator? ( dev-libs/libappindicator:3 )
+	)"
+
+RDEPEND="${COMMON_DEPEND}"
+
+DEPEND="${COMMON_DEPEND}
+	app-text/rarian:0
+	>=app-text/scrollkeeper-dtd-1:1.0
+	app-text/yelp-tools:0
+	dev-util/desktop-file-utils:0
+	>=dev-util/intltool-0.50.1:*
+	sys-devel/gettext:*
+	x11-proto/kbproto:0
+	x11-proto/randrproto:0
+	x11-proto/renderproto:0
+	x11-proto/scrnsaverproto:0
+	x11-proto/xextproto:0
+	x11-proto/xf86miscproto:0
+	x11-proto/xproto:0
+	virtual/pkgconfig:*"
+
+src_configure() {
+	mate_src_configure \
+		--disable-update-mimedb \
+		--with-gtk=$(usex gtk3 3.0 2.0) \
+		$(use_enable appindicator) \
+		$(use_enable debug)
+}
diff --git a/mate-base/mate-control-center/mate-control-center-1.18.1.ebuild b/mate-base/mate-control-center/mate-control-center-1.18.1.ebuild
new file mode 100644
index 000000000000..6bf961c945c6
--- /dev/null
+++ b/mate-base/mate-control-center/mate-control-center-1.18.1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2017 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 ~x86"
+fi
+
+DESCRIPTION="The MATE Desktop configuration tool"
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="appindicator debug"
+
+COMMON_DEPEND="
+	dev-libs/atk:0
+	>=dev-libs/dbus-glib-0.73:0
+	>=dev-libs/glib-2.36:2
+	dev-libs/libxml2:2
+	>=gnome-base/dconf-0.13.4:0
+	>=gnome-base/librsvg-2.0:2
+	>=mate-base/libmatekbd-1.17.0
+	>=mate-base/mate-desktop-1.17.0
+	>=mate-base/caja-1.17.0
+	>=mate-base/mate-menus-1.1.0
+	>=mate-base/mate-settings-daemon-1.17.0
+	>=media-libs/fontconfig-1:1.0
+	media-libs/freetype:2
+	media-libs/libcanberra:0[gtk3]
+	>=sys-apps/dbus-1:0
+	x11-apps/xmodmap:0
+	x11-libs/cairo:0
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.14:3
+	x11-libs/libX11:0
+	x11-libs/libXScrnSaver:0
+	x11-libs/libXcursor:0
+	x11-libs/libXext:0
+	>=x11-libs/libXi-1.5:0
+	x11-libs/libXrandr:0
+	x11-libs/libXrender:0
+	x11-libs/libXxf86misc:0
+	>=x11-libs/libxklavier-4:0
+	x11-libs/pango:0
+	>=x11-wm/marco-1.17.0
+	virtual/libintl:0
+	appindicator? ( dev-libs/libappindicator:3 )"
+
+RDEPEND="${COMMON_DEPEND}"
+
+DEPEND="${COMMON_DEPEND}
+	app-text/rarian:0
+	>=app-text/scrollkeeper-dtd-1:1.0
+	app-text/yelp-tools:0
+	dev-util/desktop-file-utils:0
+	>=dev-util/intltool-0.50.1:*
+	sys-devel/gettext:*
+	x11-proto/kbproto:0
+	x11-proto/randrproto:0
+	x11-proto/renderproto:0
+	x11-proto/scrnsaverproto:0
+	x11-proto/xextproto:0
+	x11-proto/xf86miscproto:0
+	x11-proto/xproto:0
+	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
new file mode 100644
index 000000000000..5b149532c5d2
--- /dev/null
+++ b/mate-base/mate-control-center/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>mate@gentoo.org</email>
+		<name>Gentoo MATE Desktop</name>
+	</maintainer>
+	<use>
+		<flag name="appindicator">Add support for AppIndicator</flag>
+		<flag name="gtk3">Build with GTK+3 instead of GTK+2</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">mate-desktop/mate-control-center</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/mate-base/mate-desktop/Manifest b/mate-base/mate-desktop/Manifest
new file mode 100644
index 000000000000..b53d22de859a
--- /dev/null
+++ b/mate-base/mate-desktop/Manifest
@@ -0,0 +1,11 @@
+DIST mate-desktop-1.12.1.tar.xz 773332 SHA256 d9b96ac455340916a11b221d45a940c347e4428e5096035496d9f703eacf5a03 SHA512 bcd3731bded736cdb4e0531d9c35253c025fa654d51f3ffb72ad7768ef62a1407b6ef62c2ff6beb45b0a30c2fe85e8d72c3e13068c92716e85f99f103b562c9e WHIRLPOOL 149b970d99d684230f9ec0d31b08062d2dcc8a547973dcde105f5bc903714b0f5cbbf60f2a06c3fbb1bdf87892362bd0785784b81c7f61ceeac319feefd2a445
+DIST mate-desktop-1.14.1.tar.xz 829244 SHA256 97b5067c3b9a0b96494cf189dc94e64ac852cd21cddc27961e7b744f550d5786 SHA512 b8d9688bfbea83d1264bce32be72fcb629b007e073553af24a9a79895baa29db3137cf6eed6a1bdf1a0b16ba3e02de892e85cbcfa62b84773d02fce71311496d WHIRLPOOL ade1e0367d033386393d95eabafbcc0f8a8d21c025875997aa0e4ff52cdf5c53c7b61eccdf8cddcc81c023b4268dd35098807c111545b40dc81576d698dddff4
+DIST mate-desktop-1.16.1.tar.xz 810184 SHA256 587a8da6e65386015101992e1082bb4d4d38420873c70348ba55dc9f9f63f6df SHA512 4daec6ef5e9fd523962d34d59ecda91acb3831825100b2a96836d402dc187e1a4123642149bfa600a22a9ff1ed2a83632176a5864e2df027b29c5d42ef9d598d WHIRLPOOL be024eaea8b0f149dcc2316e481b2e8b9005580d742ee8f3088863580cbe665a8bd480cdd5b6b228934e51fbd1af9bd549721e2c0b4c1b7a569ffad113284985
+DIST mate-desktop-1.18.0.tar.xz 827332 SHA256 6f2dd9fc60bacd0ff27b8328c7addceb9e73a75c7dce7db4132659d588173b8a SHA512 0490e9810009923fa315e7f191103bc797c37f4417cf41bf317c55d26f7b52a848a65c28dde6903a861694c131ca52f3ed0be05cbbf6b2dd1cb216539f513220 WHIRLPOOL bfa312c8b8abb476c8e322874c5f9ddd586b8341c0324b01cc4193d9d7b7dd135bb00eda5a89ca881276dae940f2d920cda8ace36290211b55134e45cd6241fb
+EBUILD mate-desktop-1.12.1-r2.ebuild 1358 SHA256 1c7e3acaac92a0a5522b3320335c21f1f5972b5623f2a1c928ecb99b4e55b934 SHA512 e8ae99d0cad3306375a46fce6860cc949b03065e4d36577ebc4ec2225d2c7acb28a7a50f4f52113111c7fce5384441f871e7a37cb4a869036642a4a38a2d6362 WHIRLPOOL 931efbea0021119103e2cc352e7903c90bab40bd237ebef1ec3fe2e809e5a3b8f13bb3083a35ae29cc6b5ae02b93ad02d5768c34fd64ad2cd74d29f85537cefd
+EBUILD mate-desktop-1.14.1.ebuild 1246 SHA256 a75c986b5a12b167db4334cac553d41d57908cb0986a3011074f487255e78e04 SHA512 6ab4261ed1bbc06724a7e81f9942cb23881be02065760a735074da3647f87bfd574213317dd83c81f96e609a6bb0a1033faf72535e88274f4ce5bb1e8d6c164e WHIRLPOOL b45e3f5a64bf6baad24eb94a08becd15be2dbdbb86ee5902f1032fac2fde942d201bb3d50882191c2a2940b6c0ed34215cba3fc331aeabe00e10bc7e9f16a2f3
+EBUILD mate-desktop-1.16.1.ebuild 1246 SHA256 a75c986b5a12b167db4334cac553d41d57908cb0986a3011074f487255e78e04 SHA512 6ab4261ed1bbc06724a7e81f9942cb23881be02065760a735074da3647f87bfd574213317dd83c81f96e609a6bb0a1033faf72535e88274f4ce5bb1e8d6c164e WHIRLPOOL b45e3f5a64bf6baad24eb94a08becd15be2dbdbb86ee5902f1032fac2fde942d201bb3d50882191c2a2940b6c0ed34215cba3fc331aeabe00e10bc7e9f16a2f3
+EBUILD mate-desktop-1.18.0.ebuild 1123 SHA256 0fc4e9d0a9bf8f2b94941e4ec94f1f1c199bdd5f244a2e46a06e74dd5ef4090e SHA512 c79c42cba2ef36b1583f6510e52b2266f6290093cbe5c3e21bb8a4cf455a7745314e2dc91737d49e59cfd49237238b2b36fa9bc86d72111912083b057d4cbc7a WHIRLPOOL 754d7b0ad0c078c8d9358cbf75489c12ca00e27feac266134bf29d9cd4f5fcf542c021e15b6990860a1d68eed39ce9d44c587a942bbd1050772e3edbda2073c7
+MISC ChangeLog 4457 SHA256 5da69241245db2aa42d6dbd9f1cb395444ca9767ba3e7fb4561d39f84fb1e90f SHA512 654b5753e3dbc733642fa0cb7d1c29262ba79cc4af6d9e8f9a842b52c8cd6804c3a0602b91806accb8c447bfd7a4141b60bc35d827ff42be0bf0cd4c2586ded6 WHIRLPOOL 10f3b78c191236fa9782e8bc4f1267bd32cd054cf03a3cd45103b999bf5d3bb39f3672f2a4e6e22c637bc1e942d0ec6bb411bf9ebf174e637e868ad6b58b57c1
+MISC ChangeLog-2015 3007 SHA256 8379910ea85e9e77f55c00c6fed8c778e9f61f606f9a62187b4b180e865d2c8a SHA512 89a748d3f3ea44ad682d352ee49f6245e73c5dc2976218ac1f4a41cbfe7463af3b1e1fd94b4833214279098c6ccff66b16d238f4239b346fc9b6fc95ed2819fb WHIRLPOOL 2e1d5908865415c690bd7662e2e6287cac1f7e9b5d1dc4811f84d9d6d62eca91119d4ef3314d5a46d2c8feb894681ab3ee9a5b33c6c0f667f732c2a09701da14
+MISC metadata.xml 417 SHA256 67e7e32669af36de255276f1c1e20a0192429ffacbfc990f68eff1b506cc421d SHA512 e3bc89370c680206ae9cab86e17bfcb36f4d2efa93b6d5a8b5964e445e95fd3873861a6c10f1069a8c9caae61268973aab97ff9ef72b3fdfe9334ad11ead0a51 WHIRLPOOL fae2a6268770a446c2987710932c6a0d23b422b9af42f358d656d251c19db0ebe9b42158d545a451a7365c1b25c15056add9b44093a1f0d3145102c1117ad6aa
diff --git a/mate-base/mate-desktop/mate-desktop-1.12.1-r2.ebuild b/mate-base/mate-desktop/mate-desktop-1.12.1-r2.ebuild
new file mode 100644
index 000000000000..a48d9660443c
--- /dev/null
+++ b/mate-base/mate-desktop/mate-desktop-1.12.1-r2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MATE_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_7 )
+
+inherit mate multilib python-r1
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="amd64 ~arm 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 gtk3 +introspection startup-notification"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	>=dev-libs/glib-2.36:2
+	x11-libs/cairo:0
+	>=x11-libs/gdk-pixbuf-2.4:2[introspection?]
+	x11-libs/libX11:0
+	>=x11-libs/libXrandr-1.3:0
+	virtual/libintl:0
+	!gtk3? ( >=x11-libs/gtk+-2.24:2[introspection?] )
+	gtk3? ( >=x11-libs/gtk+-3.0:3[introspection?] )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.7:= )
+	startup-notification? ( >=x11-libs/startup-notification-0.5:0 )"
+
+DEPEND="${RDEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	dev-util/gtk-doc
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.40:*
+	>=gnome-base/dconf-0.13.4:0
+	sys-devel/gettext:*
+	>=x11-proto/randrproto-1.3:0
+	x11-proto/xproto:0
+	virtual/pkgconfig:*"
+
+src_configure() {
+	mate_src_configure \
+		--enable-mate-about \
+		--disable-mate-conf-import \
+		--with-gtk=$(usex gtk3 3.0 2.0) \
+		$(use_with X x) \
+		$(use_enable debug) \
+		$(use_enable introspection) \
+		$(use_enable startup-notification)
+}
diff --git a/mate-base/mate-desktop/mate-desktop-1.14.1.ebuild b/mate-base/mate-desktop/mate-desktop-1.14.1.ebuild
new file mode 100644
index 000000000000..16df086e4c73
--- /dev/null
+++ b/mate-base/mate-desktop/mate-desktop-1.14.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2016 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 ~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 gtk3 +introspection startup-notification"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.36:2
+	>=gnome-base/dconf-0.13.4:0
+	x11-libs/cairo:0
+	x11-libs/libX11:0
+	>=x11-libs/libXrandr-1.3:0
+	virtual/libintl:0
+	!gtk3? ( >=x11-libs/gtk+-2.24:2[introspection?] )
+	gtk3? ( >=x11-libs/gtk+-3.0: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
+	dev-util/gtk-doc
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.40:*
+	sys-devel/gettext:*
+	>=x11-proto/randrproto-1.3:0
+	x11-proto/xproto:0
+	virtual/pkgconfig:*"
+
+src_configure() {
+	mate_src_configure \
+		--disable-mpaste \
+		--enable-mate-about \
+		--with-gtk=$(usex gtk3 3.0 2.0) \
+		$(use_with X x) \
+		$(use_enable debug) \
+		$(use_enable introspection) \
+		$(use_enable startup-notification)
+}
diff --git a/mate-base/mate-desktop/mate-desktop-1.16.1.ebuild b/mate-base/mate-desktop/mate-desktop-1.16.1.ebuild
new file mode 100644
index 000000000000..16df086e4c73
--- /dev/null
+++ b/mate-base/mate-desktop/mate-desktop-1.16.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2016 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 ~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 gtk3 +introspection startup-notification"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.36:2
+	>=gnome-base/dconf-0.13.4:0
+	x11-libs/cairo:0
+	x11-libs/libX11:0
+	>=x11-libs/libXrandr-1.3:0
+	virtual/libintl:0
+	!gtk3? ( >=x11-libs/gtk+-2.24:2[introspection?] )
+	gtk3? ( >=x11-libs/gtk+-3.0: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
+	dev-util/gtk-doc
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.40:*
+	sys-devel/gettext:*
+	>=x11-proto/randrproto-1.3:0
+	x11-proto/xproto:0
+	virtual/pkgconfig:*"
+
+src_configure() {
+	mate_src_configure \
+		--disable-mpaste \
+		--enable-mate-about \
+		--with-gtk=$(usex gtk3 3.0 2.0) \
+		$(use_with X x) \
+		$(use_enable debug) \
+		$(use_enable introspection) \
+		$(use_enable startup-notification)
+}
diff --git a/mate-base/mate-desktop/mate-desktop-1.18.0.ebuild b/mate-base/mate-desktop/mate-desktop-1.18.0.ebuild
new file mode 100644
index 000000000000..ff8a88e3707d
--- /dev/null
+++ b/mate-base/mate-desktop/mate-desktop-1.18.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2017 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 ~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.36:2
+	>=gnome-base/dconf-0.13.4:0
+	x11-libs/cairo:0
+	x11-libs/libX11:0
+	>=x11-libs/libXrandr-1.3:0
+	virtual/libintl:0
+	>=x11-libs/gtk+-3.0: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
+	dev-util/gtk-doc
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.40:*
+	sys-devel/gettext:*
+	>=x11-proto/randrproto-1.3:0
+	x11-proto/xproto:0
+	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-desktop/metadata.xml b/mate-base/mate-desktop/metadata.xml
new file mode 100644
index 000000000000..5d6f0fede527
--- /dev/null
+++ b/mate-base/mate-desktop/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>mate@gentoo.org</email>
+		<name>Gentoo MATE Desktop</name>
+	</maintainer>
+	<use>
+		<flag name="gtk3">Build with GTK+3 instead of GTK+2</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">mate-desktop/mate-desktop</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/mate-base/mate-menus/Manifest b/mate-base/mate-menus/Manifest
new file mode 100644
index 000000000000..3b023a45c312
--- /dev/null
+++ b/mate-base/mate-menus/Manifest
@@ -0,0 +1,12 @@
+AUX 10-xdg-menu-mate 113 SHA256 8e09c26f25cbdd6869bc13fb35fb67096f25c4e1f99bdd9302a3fce242a97023 SHA512 8d4c30c79ecca4d1ff4dad7e7946f9e967ac33cf54dcccb1e1325bff298ffef6306bcf5865071e388e3a17ba77bc79896246a4b44b42c72c20ed13c4677fb8ef WHIRLPOOL 9eace58d3e30f41e967ddf920e9ad50c01bd8d5c1dff12837bdba8b19b048e920af7a924dfa9b33a0c988c2b7b0690d95bbbd44fc1953ec5969a7179606b5f96
+DIST mate-menus-1.12.0.tar.xz 342488 SHA256 b0b735be91cca632d7c63f254a9442201608b24f1d5588a1ff05b50da41b95c4 SHA512 12788d5b88c1dba7b561a3119e311a9724629d1f9ae7d54a9e4443946b331c532310c79b7b39bcacc791697ac52d4b55338051da66c4d747c371575a03183ba6 WHIRLPOOL ec1137ea30f36537dda4aa6d6432f6712a644fa942b618f83a069c8dcdf357b3106e2db6aea86a3dce19f66c053b4fb6e780143e4eab0f42e4eb246bdda29981
+DIST mate-menus-1.14.0.tar.xz 362136 SHA256 26585cafa82496e22851fd7c767260797eb029d24698ca8059ddfe3f70226cc5 SHA512 9d82737669b37e85ab76e94e84a464d7cafb837b71d6af90cf08b4286480de901e1a37d279ba7f0af25e655c3c9c67481b1394587b6aad902a284a8ac58559c6 WHIRLPOOL ac0a45e91ab619c40ba946624de68f71a6df8dec7c83562fa471018f7be113aa2ac9cbb9e74d44929923c3595bb0f4756d4f9458cb5f2572864ecc5e90a5fab6
+DIST mate-menus-1.16.0.tar.xz 356832 SHA256 85d51e02cd94f33b13265ba4847e93d99cef5ec3ce7ee4499958f3afe3013c33 SHA512 c6cc3ce73dfdcbe7db4a10c68d1acc5c8433f077576d047b2c3488716ff40733ae86b50480abd5c4fa033275d6f6a04dbe4c6e049a4be85fd132e8291b0d97b5 WHIRLPOOL ea606d03462e2b93b6d36de78fce39486f4f88e585640e20dd4b59e567489dd7e5d83e55e46ccd260352ed07fb27f319dfdb415a1988723954514863c6443d2f
+DIST mate-menus-1.18.0.tar.xz 358032 SHA256 f07cdb952934b732678ed37a9cd740c8860e9e2d0ddb4d73a8d06cdccfc87e16 SHA512 0c9d8162f67208cecead4e2dcaf4eddf63b10484396e1b28381d98607de007c5aaf1126f36400183d8545ea21c6273f5df48b4f47847fba2470d92d9943a123b WHIRLPOOL 75a159c09e6b290934db760347ffaa22adefbc5cafbff8704e1227cfa68438a8acaaa51fda28dffbf1f67f07ee1c256e69d8ea4ee307fe9d16f9520e20d69b82
+EBUILD mate-menus-1.12.0-r1.ebuild 1615 SHA256 50fe826096a09bfdf6e87a4a36caab8d12a575371ca28ad1558ccb1aa8226332 SHA512 c432cf2e3bae6db9af492b27b7faea5c7f1d0e1dfb4fffdbaccfad0f1116be8d6de26b224da0cf38342a1b77e09aa6ba8bbe5ab96d77c07c3e91479d9a57cbe6 WHIRLPOOL 1e409baea391641c585598e08385c670fdf7504445d53030225fb9794b869059b3d85e49a2b305e1ab622d2150beaad7b306f903f4311f632b898edbf670f73c
+EBUILD mate-menus-1.14.0.ebuild 1657 SHA256 6dc03764f85f170724bdd88e6aab413b2eff43fcff7379e014c742f4ee147e42 SHA512 0f3d64f451d627ef7ac9fa2e39f391548e30158ea2dc5e7760dcac51df6a0566444e4976626f73435cab78ca9251bc73d4717f4e11747335d328df5819d6ddb3 WHIRLPOOL ec7b672653b32757680a8598d6c21e17c186f1abe2f55bdf612f82ae72a0406559d717a3fba85a4a4bfb9e2dbc1027c9194eb3733f575f3bc7c52839d18feb41
+EBUILD mate-menus-1.16.0.ebuild 1657 SHA256 6dc03764f85f170724bdd88e6aab413b2eff43fcff7379e014c742f4ee147e42 SHA512 0f3d64f451d627ef7ac9fa2e39f391548e30158ea2dc5e7760dcac51df6a0566444e4976626f73435cab78ca9251bc73d4717f4e11747335d328df5819d6ddb3 WHIRLPOOL ec7b672653b32757680a8598d6c21e17c186f1abe2f55bdf612f82ae72a0406559d717a3fba85a4a4bfb9e2dbc1027c9194eb3733f575f3bc7c52839d18feb41
+EBUILD mate-menus-1.18.0.ebuild 1657 SHA256 bb9472b7b5b34aeb0bc2ac2c9bf907ba056f8ad23fff158c85fd2494e85a1bb3 SHA512 8b42bf5f85d54f3aa7be5b461a94fe67088085233b57789b3e6f8f796828fd0ab573e72bfb659f1dbdd67128a82b9be2af495ba0a4e7bf19a8d6d85de540f5ac WHIRLPOOL f031a3c73fe6c09ca73765eb7e5809082bb8d9c0521e461a9c5d95bb524c1141bee9f130c4118e3e12505b4e919350fb6517a0010b42a494f57deb3edfa19ff5
+MISC ChangeLog 4154 SHA256 f491be004e29fb0513fab9906c01048af79d17dc770d3a3ca287fe3769916550 SHA512 610173deca2fcdaa64d3aa651cbec99a80f8d1d5b7f960883696d8ae110795a0a680148a55c24afacf2f97f92814a0bb8ca61368c634144282de9b90c65ec9f3 WHIRLPOOL 2451855713816196d8f35a8b08d3382446c2fda52b5a80c9dc2c6a83e0684e888b6f56d72f7a1442552851e5efd04fe425eb81e72b2bf5c538eeefef48b32d9d
+MISC ChangeLog-2015 2107 SHA256 ae349f4d1a9f4501388125bb8e62f6da903d8a426e8069ca3339b06775b39f48 SHA512 6678df6b25a7e84f14f918864e099378fe94f0a240e8430c4129628b485067880ee0749dc6d5041501b68b98523f6200b18cc38eed25c45b48fcb0827e55d0d0 WHIRLPOOL 2e1f3364e06c4e9b2703ca8bc9718a7aa82c7ef870f29f7f1ce7e9228ddb3ce0c8698e1719a9fafacf744ab16cec8b6576098ba9768587cd7887610da535474d
+MISC metadata.xml 339 SHA256 7dc99646841437fd0cc409529ccb042fc4ee428d58690bb99425d498e14af42a SHA512 39239eed6c1808d1b279a5924b2c66dfd38a4548b182b79e2a2f9c00f64a799c4e99d510b30a2ca179a918218e4e49b021e7cb3386c30c86b776a36f3800b03c WHIRLPOOL 14fbe94e37c8ff35a07428d3d3edfef8885242420e8d415c93f3d5ec0ab9a4c0223a108f997c9879a75491a533621a5a689d883b354ec77d369ec89d367b0f4d
diff --git a/mate-base/mate-menus/files/10-xdg-menu-mate b/mate-base/mate-menus/files/10-xdg-menu-mate
new file mode 100644
index 000000000000..06a6a91368e2
--- /dev/null
+++ b/mate-base/mate-menus/files/10-xdg-menu-mate
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+if [ -z "$XDG_MENU_PREFIX" ] && [ "$DESKTOP_SESSION" = "mate" ]
+then
+	export XDG_MENU_PREFIX=mate-
+fi
diff --git a/mate-base/mate-menus/mate-menus-1.12.0-r1.ebuild b/mate-base/mate-menus/mate-menus-1.12.0-r1.ebuild
new file mode 100644
index 000000000000..76d6841fb771
--- /dev/null
+++ b/mate-base/mate-menus/mate-menus-1.12.0-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-r1 mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="amd64 ~arm x86"
+fi
+
+DESCRIPTION="MATE menu system, implementing the F.D.O cross-desktop spec"
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+
+IUSE="debug +introspection python"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND=">=dev-libs/glib-2.36.0:2
+	virtual/libintl:0
+	introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
+	python? (
+		dev-python/pygtk:2[${PYTHON_USEDEP}]
+		${PYTHON_DEPS}
+	)"
+
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.40:*
+	sys-devel/gettext:*
+	virtual/pkgconfig:*"
+
+src_prepare() {
+	mate_src_prepare
+	use python && python_copy_sources
+}
+
+src_configure() {
+	# Do NOT compile with --disable-debug/--enable-debug=no as it disables API
+	# usage checks.
+	mate_py_cond_func_wrap mate_src_configure \
+		--enable-debug=$(usex debug yes minimum) \
+		$(use_enable python) \
+		$(use_enable introspection)
+}
+
+src_compile() {
+	mate_py_cond_func_wrap default
+}
+
+src_test() {
+	mate_py_cond_func_wrap emake check
+}
+
+src_install() {
+	mate_py_cond_func_wrap mate_src_install
+
+	exeinto /etc/X11/xinit/xinitrc.d/
+	doexe "${FILESDIR}/10-xdg-menu-mate"
+}
+
+pkg_postinst() {
+	mate_pkg_postinst
+	einfo "Due to upstream bug"
+	einfo "https://github.com/mate-desktop/mate-menus/issues/2,"
+	einfo "it is highly recommended to run the following command"
+	einfo "once you have logged in to your desktop for the first time:"
+	einfo "cd ~/.config/menus && ln -s {,mate-}applications-merged"
+}
diff --git a/mate-base/mate-menus/mate-menus-1.14.0.ebuild b/mate-base/mate-menus/mate-menus-1.14.0.ebuild
new file mode 100644
index 000000000000..f32609d8757d
--- /dev/null
+++ b/mate-base/mate-menus/mate-menus-1.14.0.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-r1 mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+DESCRIPTION="MATE menu system, implementing the F.D.O cross-desktop spec"
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+
+IUSE="debug +introspection python"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+COMMON_DEPEND=">=dev-libs/glib-2.36.0:2
+	virtual/libintl:0
+	introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
+	python? (
+		dev-python/pygtk:2[${PYTHON_USEDEP}]
+		${PYTHON_DEPS}
+	)"
+
+RDEPEND="${COMMON_DEPEND}"
+
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/intltool-0.40:*
+	sys-devel/gettext:*
+	virtual/pkgconfig:*"
+
+src_prepare() {
+	mate_src_prepare
+	use python && python_copy_sources
+}
+
+src_configure() {
+	# Do NOT compile with --disable-debug/--enable-debug=no as it disables API
+	# usage checks.
+	mate_py_cond_func_wrap mate_src_configure \
+		--enable-debug=$(usex debug yes minimum) \
+		$(use_enable python) \
+		$(use_enable introspection)
+}
+
+src_compile() {
+	mate_py_cond_func_wrap default
+}
+
+src_test() {
+	mate_py_cond_func_wrap emake check
+}
+
+src_install() {
+	mate_py_cond_func_wrap mate_src_install
+
+	exeinto /etc/X11/xinit/xinitrc.d/
+	doexe "${FILESDIR}/10-xdg-menu-mate"
+}
+
+pkg_postinst() {
+	mate_pkg_postinst
+	einfo "Due to upstream bug"
+	einfo "https://github.com/mate-desktop/mate-menus/issues/2,"
+	einfo "it is highly recommended to run the following command"
+	einfo "once you have logged in to your desktop for the first time:"
+	einfo "cd ~/.config/menus && ln -s {,mate-}applications-merged"
+}
diff --git a/mate-base/mate-menus/mate-menus-1.16.0.ebuild b/mate-base/mate-menus/mate-menus-1.16.0.ebuild
new file mode 100644
index 000000000000..f32609d8757d
--- /dev/null
+++ b/mate-base/mate-menus/mate-menus-1.16.0.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-r1 mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+DESCRIPTION="MATE menu system, implementing the F.D.O cross-desktop spec"
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+
+IUSE="debug +introspection python"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+COMMON_DEPEND=">=dev-libs/glib-2.36.0:2
+	virtual/libintl:0
+	introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
+	python? (
+		dev-python/pygtk:2[${PYTHON_USEDEP}]
+		${PYTHON_DEPS}
+	)"
+
+RDEPEND="${COMMON_DEPEND}"
+
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/intltool-0.40:*
+	sys-devel/gettext:*
+	virtual/pkgconfig:*"
+
+src_prepare() {
+	mate_src_prepare
+	use python && python_copy_sources
+}
+
+src_configure() {
+	# Do NOT compile with --disable-debug/--enable-debug=no as it disables API
+	# usage checks.
+	mate_py_cond_func_wrap mate_src_configure \
+		--enable-debug=$(usex debug yes minimum) \
+		$(use_enable python) \
+		$(use_enable introspection)
+}
+
+src_compile() {
+	mate_py_cond_func_wrap default
+}
+
+src_test() {
+	mate_py_cond_func_wrap emake check
+}
+
+src_install() {
+	mate_py_cond_func_wrap mate_src_install
+
+	exeinto /etc/X11/xinit/xinitrc.d/
+	doexe "${FILESDIR}/10-xdg-menu-mate"
+}
+
+pkg_postinst() {
+	mate_pkg_postinst
+	einfo "Due to upstream bug"
+	einfo "https://github.com/mate-desktop/mate-menus/issues/2,"
+	einfo "it is highly recommended to run the following command"
+	einfo "once you have logged in to your desktop for the first time:"
+	einfo "cd ~/.config/menus && ln -s {,mate-}applications-merged"
+}
diff --git a/mate-base/mate-menus/mate-menus-1.18.0.ebuild b/mate-base/mate-menus/mate-menus-1.18.0.ebuild
new file mode 100644
index 000000000000..0f543950da70
--- /dev/null
+++ b/mate-base/mate-menus/mate-menus-1.18.0.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-r1 mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+DESCRIPTION="MATE menu system, implementing the F.D.O cross-desktop spec"
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+
+IUSE="debug +introspection python"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+COMMON_DEPEND=">=dev-libs/glib-2.36.0:2
+	virtual/libintl:0
+	introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
+	python? (
+		dev-python/pygtk:2[${PYTHON_USEDEP}]
+		${PYTHON_DEPS}
+	)"
+
+RDEPEND="${COMMON_DEPEND}"
+
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/intltool-0.40:*
+	sys-devel/gettext:*
+	virtual/pkgconfig:*"
+
+src_prepare() {
+	mate_src_prepare
+	use python && python_copy_sources
+}
+
+src_configure() {
+	# Do NOT compile with --disable-debug/--enable-debug=no as it disables API
+	# usage checks.
+	mate_py_cond_func_wrap mate_src_configure \
+		--enable-debug=$(usex debug yes minimum) \
+		$(use_enable python) \
+		$(use_enable introspection)
+}
+
+src_compile() {
+	mate_py_cond_func_wrap default
+}
+
+src_test() {
+	mate_py_cond_func_wrap emake check
+}
+
+src_install() {
+	mate_py_cond_func_wrap mate_src_install
+
+	exeinto /etc/X11/xinit/xinitrc.d/
+	doexe "${FILESDIR}/10-xdg-menu-mate"
+}
+
+pkg_postinst() {
+	mate_pkg_postinst
+	einfo "Due to upstream bug"
+	einfo "https://github.com/mate-desktop/mate-menus/issues/2,"
+	einfo "it is highly recommended to run the following command"
+	einfo "once you have logged in to your desktop for the first time:"
+	einfo "cd ~/.config/menus && ln -s {,mate-}applications-merged"
+}
diff --git a/mate-base/mate-menus/metadata.xml b/mate-base/mate-menus/metadata.xml
new file mode 100644
index 000000000000..56bfe33fb64a
--- /dev/null
+++ b/mate-base/mate-menus/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>mate@gentoo.org</email>
+		<name>Gentoo MATE Desktop</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">mate-desktop/mate-menus</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/mate-base/mate-panel/Manifest b/mate-base/mate-panel/Manifest
new file mode 100644
index 000000000000..d1fc8e0b4ac1
--- /dev/null
+++ b/mate-base/mate-panel/Manifest
@@ -0,0 +1,11 @@
+DIST mate-panel-1.12.2.tar.xz 1930792 SHA256 b757bb5ea3da1b36fcf599d4f123534e936f0e46859b3307816085f486667fa1 SHA512 7810c3b3585e9def59c192914a91e2e64173b5b44cf43496808f6be46df798fc97358bb7bc300e52985fc401feb5201daad60bb0181e72e5e2512e7712aba6a4 WHIRLPOOL 2af7cdf4b38aab536497196dd8abd67583d93d915288d2a2eda67f31e9eba5030ee5360f6ad47cbc4d21389160b3209e99d84eecde1b2093ee9ce566b7cacd5a
+DIST mate-panel-1.14.2.tar.xz 1981716 SHA256 ae3d2106f830583115e58fc8782fff63b27023f717068d407b239bfe548b6d24 SHA512 296a74fcbdd3a58337987c0e8bcc804a203fbf5f134183c2fe09016c609bbd67bfab4dc6e46e333c7714e9c264965f1c3897c9645a5003405866fbdaf0a04944 WHIRLPOOL b0e7d0c0ce2595bac3cc858b2a284166e4f6aeb7831419b833e9b194fc13f6902e4b95a7946da3f30bda38004987cb346ccff06b1cd0521e578c3f97f5f9e0c7
+DIST mate-panel-1.16.0.tar.xz 1945868 SHA256 085b4236f793556381769aeb11744abdebff37254b2ab3eb9f57008d9f93094a SHA512 96ea6e71dc602b2ff81294984f22854079e0daeb41d00a52646a6f2eb211f26b51eba43f97a3548707f3948b1f226480e3a8242c84de7eb4cd7f69e9b143fa36 WHIRLPOOL f7ecb648cb3cccfb7aa930a76f025c409724c076ca4e90f50f1b977bf86b535d0eab82570ecd8eb840c07fed7d37acd18db39216ad028c0bbe0788fa9e071ff5
+DIST mate-panel-1.18.2.tar.xz 1946680 SHA256 6c4f5d63b173079c298ae2d05375081c2e452745f3ccf339da757bf83e5d3e17 SHA512 c0b7b25a2f2aee928324badeb577707e856f1c6669190e0967592dc86b0991006d6cabdbabf8aa8e24807a974e120b096312916ff2acb4601e73aaad2208f869 WHIRLPOOL 3d4ef30fa95e8b1ecf70f93dec5c952ae5b760984c867406099cd69915e389ec86d84f822bb6101f95d8b7b2922e3ab1a97d3197d823fb5149475158fafee0ec
+EBUILD mate-panel-1.12.2-r3.ebuild 1688 SHA256 964da2432943d4404a4c349e35b02591c35a401104c96e23488e85ef96247005 SHA512 a04aba1c58bab130082dedb17c2ac7d70fbf8b3cfae00fdb690b0cff0c9ae6acdf3c45bfef761b53d6a9ffe12423558610e0c1052c8b717859c2c1e9576bcd18 WHIRLPOOL cb2620c4d2a502bb490946686142bd445cbfb9596f2ed8fb27322123d76d4d0ba9e6a2fd4a22325c7ea19e4b0d527c9a39c789111df850fd3655f0562f4ff3d3
+EBUILD mate-panel-1.14.2.ebuild 1598 SHA256 2f5ec74972fab27f605b881224fb74e25b4942f771669a79b2c434c873232687 SHA512 148fd91c7f9db1bd062b26a9fa2a7fb5bb108e2d3b698bcdf7107d5693939db2a67ff9d36b1e3ec981c76297666cecd7230f78f6c58c016309f3e242f07fa6df WHIRLPOOL bb9a4bbe13e24bd69b9cffd5c032df68b5ccdcbfb4a2e557b37d1f9b64d0a367ddb103a414f96895712b93b7aaaa54e87fd8ecef9241c240929aec7219ea12fe
+EBUILD mate-panel-1.16.0.ebuild 1598 SHA256 2f5ec74972fab27f605b881224fb74e25b4942f771669a79b2c434c873232687 SHA512 148fd91c7f9db1bd062b26a9fa2a7fb5bb108e2d3b698bcdf7107d5693939db2a67ff9d36b1e3ec981c76297666cecd7230f78f6c58c016309f3e242f07fa6df WHIRLPOOL bb9a4bbe13e24bd69b9cffd5c032df68b5ccdcbfb4a2e557b37d1f9b64d0a367ddb103a414f96895712b93b7aaaa54e87fd8ecef9241c240929aec7219ea12fe
+EBUILD mate-panel-1.18.2.ebuild 1394 SHA256 a741b4c819962cbad709418b81382084066c372cb40426e5787e5697b0af13ac SHA512 77ddde37918f149ad91029f2fddb0baa37776c26ce1b94a37c14ab05fc3d21a9d16a6843e85d2bad530a5fdad61b1a56c708bc62dfb3dd94ac8d7fbf7856456d WHIRLPOOL 857400e971344fa7ddbe4987bcd33e7a76fbb2d1fd449ba435ebff864d6b9b18ff35ec50deb8ef5f313c254f2db379e4bef4c16d15767ed542b9fab28bd77418
+MISC ChangeLog 5545 SHA256 55db3c5edeaae9cf85a11517a0d847499783d1e4103be7ae1aa2b5e7bd3671c5 SHA512 0e504047518c5aba127cd2a766c842abe3bc20a864798585b8df43acd95cd468e6208b6b5733a33721499dd9700953efb2c87727b16f72bf9af669b4f24bd7b4 WHIRLPOOL 43094107177a8ee904f699b256e4b2801b949851c05917d16048166a9fca6db451d583fe5036607796a4124923765c6a5ac987baf84353d6a72f11e552997e61
+MISC ChangeLog-2015 2851 SHA256 b5faec0e84aa5c9fdb2d16129f17393d92e1a7cbacf27c56586cf25a21d21f12 SHA512 c9cfb523edcf0ecedc44613276ff1dfaccf49413cc545d0879f984f3040140b3df245d812887ee5996e2638bb4d7793ac776298da8ba1225b532b33622d76d1c WHIRLPOOL 0ed95043c532e6dd8b2d6c6b96e9d3d70f47cae1f67a9c9d8b73c3e06e2c590a2cb6d996eceeeeacfd09d57e91058904963b6fb22bafd030973951e39f4ab171
+MISC metadata.xml 415 SHA256 66e7904a19feec40bf82449aefea79e759c0f4db1fdac6d09d1155286ebc879a SHA512 bb1d49b6f17d4dbb7115979faed200a7e5cf3953c87dd9326f2b96d48ff6daa1edaff6a50b7ba9c5d0706c2e3a9bcca414218cf9f1fcd1f02a0cbed4c64cc847 WHIRLPOOL 9acc7c36a11a990864bcf8a31177613ed1c4f870ce216eb346682883342cd7fa041e1c4d400f14c53a3b5de62a6099966a8fc897993e2eba327f621e52b1786a
diff --git a/mate-base/mate-panel/mate-panel-1.12.2-r3.ebuild b/mate-base/mate-panel/mate-panel-1.12.2-r3.ebuild
new file mode 100644
index 000000000000..a9c737776581
--- /dev/null
+++ b/mate-base/mate-panel/mate-panel-1.12.2-r3.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2016 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 x86"
+fi
+
+DESCRIPTION="The MATE panel"
+LICENSE="GPL-2 FDL-1.1 LGPL-2"
+SLOT="0"
+
+IUSE="X gtk3 +introspection"
+
+RDEPEND="
+	dev-libs/atk:0
+	>=dev-libs/dbus-glib-0.80:0
+	>=dev-libs/glib-2.36:2
+	>=dev-libs/libmateweather-1.7[gtk3(-)=]
+	dev-libs/libxml2:2
+	>=gnome-base/dconf-0.10:0
+	gnome-base/librsvg:2
+	>=mate-base/mate-desktop-1.9.3[gtk3(-)=]
+	>=mate-base/mate-menus-1.6
+	>=sys-apps/dbus-1.1.2:0
+	>=x11-libs/cairo-1:0
+	>=x11-libs/gdk-pixbuf-2.7.1:2
+	x11-libs/libICE:0
+	x11-libs/libSM:0
+	x11-libs/libX11:0
+	>=x11-libs/pango-1.15.4:0[introspection?]
+	x11-libs/libXau:0
+	>=x11-libs/libXrandr-1.3:0
+	virtual/libintl:0
+	!gtk3? (
+		media-libs/libcanberra:0[gtk]
+		>=x11-libs/gtk+-2.19.7:2[introspection?]
+		>=x11-libs/libwnck-2.30:1[introspection?]
+	)
+	gtk3? (
+		media-libs/libcanberra:0[gtk3]
+		>=x11-libs/gtk+-3.0:3[introspection?]
+		>=x11-libs/libwnck-3.0:3[introspection?]
+	)
+	introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )"
+
+DEPEND="${RDEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/yelp-tools:0
+	>=dev-lang/perl-5:0=
+	dev-util/gtk-doc
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.50.1:*
+	sys-devel/gettext:*
+	virtual/pkgconfig:*"
+
+MATE_FORCE_AUTORECONF=true
+
+src_prepare() {
+	# Disable python check.
+	sed -e '/AM_PATH_PYTHON/d' -i configure.ac || die
+	mate_src_prepare
+}
+
+src_configure() {
+	mate_src_configure \
+		--libexecdir=/usr/libexec/mate-applets \
+		--disable-deprecation-flags \
+		--with-gtk=$(usex gtk3 3.0 2.0) \
+		$(use_with X x) \
+		$(use_enable introspection)
+}
diff --git a/mate-base/mate-panel/mate-panel-1.14.2.ebuild b/mate-base/mate-panel/mate-panel-1.14.2.ebuild
new file mode 100644
index 000000000000..8fca1161980f
--- /dev/null
+++ b/mate-base/mate-panel/mate-panel-1.14.2.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2016 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 ~x86"
+fi
+
+DESCRIPTION="The MATE panel"
+LICENSE="GPL-2 FDL-1.1 LGPL-2"
+SLOT="0"
+
+IUSE="X gtk3 +introspection"
+
+COMMON_DEPEND="
+	dev-libs/atk:0
+	>=dev-libs/dbus-glib-0.80:0
+	>=dev-libs/glib-2.36:2
+	>=dev-libs/libmateweather-1.7[gtk3(-)=]
+	dev-libs/libxml2:2
+	>=gnome-base/dconf-0.10:0
+	>=gnome-base/librsvg-2.36.2:2
+	>=mate-base/mate-desktop-1.9.3[gtk3(-)=]
+	>=mate-base/mate-menus-1.6
+	>=sys-apps/dbus-1.1.2:0
+	>=x11-libs/cairo-1:0
+	>=x11-libs/gdk-pixbuf-2.7.1:2
+	x11-libs/libICE:0
+	x11-libs/libSM:0
+	x11-libs/libX11:0
+	>=x11-libs/pango-1.15.4:0[introspection?]
+	x11-libs/libXau:0
+	>=x11-libs/libXrandr-1.3:0
+	virtual/libintl:0
+	!gtk3? (
+		media-libs/libcanberra:0[gtk]
+		>=x11-libs/gtk+-2.19.7:2[introspection?]
+		>=x11-libs/libwnck-2.30:1[introspection?]
+	)
+	gtk3? (
+		media-libs/libcanberra:0[gtk3]
+		>=x11-libs/gtk+-3.0:3[introspection?]
+		>=x11-libs/libwnck-3.0:3[introspection?]
+	)
+	introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )"
+
+RDEPEND="${COMMON_DEPEND}"
+
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/yelp-tools:0
+	>=dev-lang/perl-5:0=
+	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 \
+		--with-gtk=$(usex gtk3 3.0 2.0) \
+		$(use_with X x) \
+		$(use_enable introspection)
+}
diff --git a/mate-base/mate-panel/mate-panel-1.16.0.ebuild b/mate-base/mate-panel/mate-panel-1.16.0.ebuild
new file mode 100644
index 000000000000..8fca1161980f
--- /dev/null
+++ b/mate-base/mate-panel/mate-panel-1.16.0.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2016 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 ~x86"
+fi
+
+DESCRIPTION="The MATE panel"
+LICENSE="GPL-2 FDL-1.1 LGPL-2"
+SLOT="0"
+
+IUSE="X gtk3 +introspection"
+
+COMMON_DEPEND="
+	dev-libs/atk:0
+	>=dev-libs/dbus-glib-0.80:0
+	>=dev-libs/glib-2.36:2
+	>=dev-libs/libmateweather-1.7[gtk3(-)=]
+	dev-libs/libxml2:2
+	>=gnome-base/dconf-0.10:0
+	>=gnome-base/librsvg-2.36.2:2
+	>=mate-base/mate-desktop-1.9.3[gtk3(-)=]
+	>=mate-base/mate-menus-1.6
+	>=sys-apps/dbus-1.1.2:0
+	>=x11-libs/cairo-1:0
+	>=x11-libs/gdk-pixbuf-2.7.1:2
+	x11-libs/libICE:0
+	x11-libs/libSM:0
+	x11-libs/libX11:0
+	>=x11-libs/pango-1.15.4:0[introspection?]
+	x11-libs/libXau:0
+	>=x11-libs/libXrandr-1.3:0
+	virtual/libintl:0
+	!gtk3? (
+		media-libs/libcanberra:0[gtk]
+		>=x11-libs/gtk+-2.19.7:2[introspection?]
+		>=x11-libs/libwnck-2.30:1[introspection?]
+	)
+	gtk3? (
+		media-libs/libcanberra:0[gtk3]
+		>=x11-libs/gtk+-3.0:3[introspection?]
+		>=x11-libs/libwnck-3.0:3[introspection?]
+	)
+	introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )"
+
+RDEPEND="${COMMON_DEPEND}"
+
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/yelp-tools:0
+	>=dev-lang/perl-5:0=
+	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 \
+		--with-gtk=$(usex gtk3 3.0 2.0) \
+		$(use_with X x) \
+		$(use_enable introspection)
+}
diff --git a/mate-base/mate-panel/mate-panel-1.18.2.ebuild b/mate-base/mate-panel/mate-panel-1.18.2.ebuild
new file mode 100644
index 000000000000..c0c96905cb5a
--- /dev/null
+++ b/mate-base/mate-panel/mate-panel-1.18.2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2017 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 ~x86"
+fi
+
+DESCRIPTION="The MATE panel"
+LICENSE="GPL-2 FDL-1.1 LGPL-2"
+SLOT="0"
+
+IUSE="X +introspection"
+
+COMMON_DEPEND="
+	dev-libs/atk:0
+	>=dev-libs/dbus-glib-0.80:0
+	>=dev-libs/glib-2.36:2
+	>=dev-libs/libmateweather-1.17.0
+	dev-libs/libxml2:2
+	>=gnome-base/dconf-0.13.4:0
+	>=gnome-base/librsvg-2.36.2:2
+	>=mate-base/mate-desktop-1.17.0
+	>=mate-base/mate-menus-1.10.0
+	>=sys-apps/dbus-1.1.2:0
+	>=x11-libs/cairo-1:0
+	>=x11-libs/gdk-pixbuf-2.7.1:2
+	>=x11-libs/gtk+-3.20:3[introspection?]
+	x11-libs/libICE:0
+	x11-libs/libSM:0
+	>=x11-libs/libwnck-3.0:3[introspection?]
+	x11-libs/libX11:0
+	>=x11-libs/pango-1.15.4:0[introspection?]
+	x11-libs/libXau:0
+	>=x11-libs/libXrandr-1.3:0
+	virtual/libintl:0
+	introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )"
+
+RDEPEND="${COMMON_DEPEND}"
+
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/yelp-tools:0
+	>=dev-lang/perl-5:0=
+	dev-util/gdbus-codegen:0
+	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_with X x) \
+		$(use_enable introspection)
+}
diff --git a/mate-base/mate-panel/metadata.xml b/mate-base/mate-panel/metadata.xml
new file mode 100644
index 000000000000..a7e9eb414582
--- /dev/null
+++ b/mate-base/mate-panel/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>mate@gentoo.org</email>
+		<name>Gentoo MATE Desktop</name>
+	</maintainer>
+	<use>
+		<flag name="gtk3">Build with GTK+3 instead of GTK+2</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">mate-desktop/mate-panel</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/mate-base/mate-session-manager/Manifest b/mate-base/mate-session-manager/Manifest
new file mode 100644
index 000000000000..3f639120a95a
--- /dev/null
+++ b/mate-base/mate-session-manager/Manifest
@@ -0,0 +1,17 @@
+AUX 10-user-dirs-update-mate 267 SHA256 b973a333aae367d0b9786e4b67c14f08acab7cf8959ebc747a665066ee0ad5dc SHA512 3f2803e9dfc7368ce6effdd538f67714e3ec5554b32fcc4ada4ef033e8e4dabcca17db095c49c368ab7f76a478bf536bd0ce26cceaf1b20ec5e75db470656076 WHIRLPOOL 4d08fc8df30a60627b869230c1f87617364d81d5441ba23c739ed82f5dedeb3f4bd6e6dc89f9210febc55c88f6b908a1f6ff9af744c62b5bfb7cdeda5e095dbd
+AUX 15-xdg-data-mate 224 SHA256 cb56c4b4ed8fb2c53de0c85d73e478da567ae01f3eceda8518089f1963120564 SHA512 a19acef85d510d6244fd29ba7daa6d5cc314392257b47574d8aedea235e4a5273d36bd67c138da9496663c2786ba5f7f433ff4aa6990a91a39be267026e5694d WHIRLPOOL 43470f1c5fb41e29b783bf8b550c4fcca0ae2f2a23093d673bdf4b6269dc703c24cfb11d55ef558961c1034304e99df1dcc4472988964be170def4255da1eace
+AUX MATE 2378 SHA256 dd97845a38a2ba17694c671edd9d42be3457de1f192931856ad4b729821b0932 SHA512 dbb162f694eeee806a12b46bf45d47f4887a83562b61d05037b3de5a7778a68d79de5528327588da13a5c17c283c8b7590c10877eba77cea75ebe5113ef2c920 WHIRLPOOL 06cd034b3a63a8595b48e1b3f4830b10af583963ca1ed4eeb5d84c3ffb6e6f8c5db3646ad37b808573cc7c71faef29d0e311204c3a1d93288d2e0556a5bd2c7f
+AUX defaults.list 14293 SHA256 ccb574804b6f0efd1868e4db7e1ab7810df5391e82af334969cb38fa2a319686 SHA512 d3b14a4676bbadb93bc33e94ddf74fc6a2c072c52ada51d8f658008301d795102d47b3e1b71f9884d117111329774deaab1a5c1718c3dab5bcf96df1657f3c9d WHIRLPOOL 4a343f0bca9bb25695f1235ca2c18184843104dd3688e4db2167274b5480dee442ee84f2e0a846eebaa72e1bf568a0cac4a08ca6e4617c1d97b14558b4349c84
+AUX mate-session-manager-1.12.2-save-session-ui.patch 20029 SHA256 fb8b2e660dd7d932768f111af80702bfd6e4cb31f779e1bd0e5ff1a6543453a8 SHA512 43501ff0911a3c9e6e007b7b8da771a6bfaac46b33b7b7a7be1570e77cad8222e1b3c0f4db0e23c92e5f3bde593bf52770cb56cad37d78ead028ecce8e5c619d WHIRLPOOL a58ac6d9e2b8f611fda7d4212680594881684e6ac3cf44ca7b839ecf62cb1909d753a4df5e7de13423f6daa718344a6ae091f4145ecee25f7d623c9d658b266b
+DIST mate-session-manager-1.12.2.tar.xz 538832 SHA256 bd4221e654a425f7cf05a8b5073dfa10b2f4f99b6e9c2f0b331e0f82142edf93 SHA512 4b4a3ecb0f7cbb25e17db8c5833f789858c94fb236ed60b9e98f59cffa320ec32c2b1960fdcbb9c2c9f476ed76cb1f37c3e07746c7c90e08a0dbcc62aac9793e WHIRLPOOL c7ed6044f99b639716e84135674d4c7e4b001d1284c07f2f0fda6c70e6e2aa420574020fc6f1a53d96b420d7e5ba98c82ca6aeab2168e9494c78729ab1fcbf98
+DIST mate-session-manager-1.14.1.tar.xz 574804 SHA256 26bb04472e19d637db6e9653235d5343dd7b6f2a128a4d2b19366a8bd01d4502 SHA512 993f314c887bca8d8e0b9450f0e62686e133ea16ee2b6675ff69766564d47a4e7d48581867e8d5e8395ee2e3b1735b121f16cb1be22c7da29015a58f98edd638 WHIRLPOOL 309f42c3d7b40f6074e5704783eaa83880fe2578d24b1784be992d5418149d1dfaa5f56c347557450e8281f48f990d21d624afe5493d14cba4493cb0b4c951a4
+DIST mate-session-manager-1.16.0.tar.xz 574464 SHA256 15a5b986c6ba32bab381ed68d21d50ca14fdbe1e2c28ca990a833f21539b41c6 SHA512 55eeef35c388a1f2ed1ad21002863b09d462f5549fb14edcde530715d52e012ee4ecb09c7757775011159b261db7e02be13dccad710fdcd66455383b84a26b86 WHIRLPOOL 6cef60b4d9816361f51a73dd7048c493d440322df8c4c82f33fcb10c4b73e439aabb0178876cb25dcdc69c0c012dc7d1120e4409843ab45314e61dc0b012ef3b
+DIST mate-session-manager-1.18.0.tar.xz 578256 SHA256 1c50f7866d8c75c1a918754960c6629798d6cb0f8d06aa3e48516ea672c7d419 SHA512 0b1299eed5a745112a9976a85965847fc7a579e161236f4d661cf08a1292037aa8246bd3e3efcf3d0c6ea8b005e9dfc33cec797c8dc48615f7bc88ce5d351ba8 WHIRLPOOL d94e9a2d46aefe017ba38987a61721b71b6465b002feb713694146f75dea75798ada81ffc7c1b79e8d76c7badf12b9180292eefcaa0bc97ef7d6a8ba39c71f3e
+EBUILD mate-session-manager-1.12.2-r1.ebuild 2230 SHA256 e844d05beb96e4f2081bbc1ee25171bf9e30ce9b433169618128acfdfa59e893 SHA512 55063c103ad5851136df465c4a7dc7cbc0032805da4acf4df22e0c3276dfc21b1ae41dc91d6f27cfae76983c5f36d9703e83a114023a2da67ac4b3422f4dec54 WHIRLPOOL f39890dd245a957bd8b40467a7f7fd85b69f7c247d3c9d8ade835b50ad4340cffc8faec3af33b3ac4fc68cc06984ced35b04d04602ccbcb32142b8cb0526a1d2
+EBUILD mate-session-manager-1.14.1.ebuild 2118 SHA256 20a0667eb497011265f827b0b9998366864d6463138b68459439f8ccf6ae8216 SHA512 9249fb51db47698f455dc127ad136166ab4500fd00419da86af3e6013fee9b1969376bb24675985095f74ee31f14683efb6f37508d8c4e996948d1a75ba60a14 WHIRLPOOL 616d48c3778c631ed775eb004f7c61ab134a6876d3f56ca3138a8f7d227fcafa3559173c074637c24b9cfdbb6028a03ed2ac09c4535c73d8df88cc8839c2c10c
+EBUILD mate-session-manager-1.16.0.ebuild 2033 SHA256 670de94b250332ac9403fae6d4558e5f193d5307932b19e9fae1c16507296f94 SHA512 935987758e365e1719ef0d7e29ea7a03e40e7f3a6b0b311c464663f89a7259e0e6cda994dc5705181deb43e4beb027364b0b614e03b48aa5272d9fadbd759733 WHIRLPOOL f5ad709457f744305ff0cbf3d49a7cc458f8ff83e4fe48adac878683867689e894d65977507803181ee02b3a05c121b3181de1c1686607447f2b6b51376fab39
+EBUILD mate-session-manager-1.18.0-r1.ebuild 2007 SHA256 916cc10a1e8fbe695d240dc61f18d577f7944be14e6b6e9631cf45c59e0c14bd SHA512 c371ba1c9c92b82e4e8f62f201abec2270ede3be9ed83da235ad4677a5c35cd42ec05e87fa0d2949d1a86bd060bc25c12ceb64652a18113a4c9082096ac3d75b WHIRLPOOL 01891c37e71f605afeccfb977ecec18452782729b90e1bcde2283e47f466e96fc468df59f563a48a35e4f0f27bac81e3a0861775a92172efbf3d26c5b4654251
+EBUILD mate-session-manager-1.18.0.ebuild 2006 SHA256 d6d5aa63a7e6529a7b4c0b33b9e94b834ec098df75cf89549b841a69a6b5af06 SHA512 fb1e2010ae2bec4a6e931cdbc9ac2169baaa027f3254b7ca1c9fb3a77fba19fc661ea12b76d5ad62725e4b0688aebd1cd2ace107e0ed177aa3892ae6b393be6d WHIRLPOOL 7a092c50e272f887c2047ecca5614cbcc4c1f4adac193941f3c7557fd808d867f11e7ad7146b725ade2d2ebca8820169d7af1e95d3ac8a040b88dab4a967d902
+MISC ChangeLog 5360 SHA256 6e564e3d9b860aff37ff372306eb1d0d934f0cb4230fd5942cd952c36a27ff3f SHA512 fd831ac918edc065989bd49a1f378ff1664be76e0dab63439bd14a0bd0715bdb1dcff0a4a4ca43725c7dd09f9666dcb23dc24dde899bd7677950a11846fa57c5 WHIRLPOOL a858bd29cc3fb8c50653a0fb0d892c1b40e19d5a90a5e8dca7bc446449b2c8adfb6198c0c8ee64f3023b59df359ce428c07803f1422784678de2fcbc6dc8f6fc
+MISC ChangeLog-2015 3680 SHA256 169c0feb5c363264938f5aeb73c46539707d7bfeb48354d59b8567f6dcf39082 SHA512 2325098365135e472a9a6b31f0b5ab51e4585ae3015dba62f1ee66923b4d0c4c0d90b2a6fa8c68fe0814b5b0a42682e2616abb00f6a144ee1a2694723e9d774e WHIRLPOOL 12d9b0261bf9e7ac278770a8202ed8bc5decee28220d4d8b79d18e3e791241c8457ae8deb499fca61ad5587f496164f51443187848f196dfbb942931126149ef
+MISC metadata.xml 558 SHA256 8f29486dfd5af8e63384ca966ca9be7afbff76032035248d26ec8c8ef77f57c0 SHA512 3ec5ae6695bb7477bf8384dc31143be21ff5d2f5ac0715309657b14e3b43b8013cfccf701307b2ee1a0f8e2cf0e7956d5db37739578c18006a299e428137ed14 WHIRLPOOL 2a5fbbdecc2bdca4a223ab03b7a4e028773e23ffe229e2d79c21e9bc1825c5cb992b58d251832b5972125fa69df076b275c153d6e84c90012d4ee7ac5630ce18
diff --git a/mate-base/mate-session-manager/files/10-user-dirs-update-mate b/mate-base/mate-session-manager/files/10-user-dirs-update-mate
new file mode 100644
index 000000000000..35973aae2447
--- /dev/null
+++ b/mate-base/mate-session-manager/files/10-user-dirs-update-mate
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+# Create various XDG directories, and write ~/.config/user-dirs.dirs, etc.
+# That file is read by glib to get XDG_PICTURES_DIR, etc
+
+if [ "$DESKTOP_SESSION" = "mate" ]; then
+	if type xdg-user-dirs-update >/dev/null 2>&1; then
+		xdg-user-dirs-update
+	fi
+fi
diff --git a/mate-base/mate-session-manager/files/15-xdg-data-mate b/mate-base/mate-session-manager/files/15-xdg-data-mate
new file mode 100644
index 000000000000..df360cf85fdd
--- /dev/null
+++ b/mate-base/mate-session-manager/files/15-xdg-data-mate
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+if [ "$DESKTOP_SESSION" = "mate" ]; then
+	if [ -z "$XDG_DATA_DIRS" ]; then
+		export XDG_DATA_DIRS=/usr/share/mate:/usr/local/share/:/usr/share/
+	else
+		export XDG_DATA_DIRS=/usr/share/mate:"$XDG_DATA_DIRS"
+	fi
+fi
diff --git a/mate-base/mate-session-manager/files/MATE b/mate-base/mate-session-manager/files/MATE
new file mode 100644
index 000000000000..baa154bdbfd7
--- /dev/null
+++ b/mate-base/mate-session-manager/files/MATE
@@ -0,0 +1,109 @@
+#!/bin/sh
+#
+# This file has bitrotted badly. Someone needs to clean this up.
+#
+
+if [ -f /etc/xdg/menus/mate-applications.menu ] ; then
+	export XDG_MENU_PREFIX=mate-
+fi
+
+for errfile in "$HOME/.materc-errors" "${TMPDIR-/tmp}/materc-$USER/tmp/materc-$USER"
+do
+	if ( cp /dev/null "$errfile" 2> /dev/null )
+	then
+		chmod 600 "$errfile"
+		exec > "$errfile" 2>&1
+		break
+	fi
+done
+#
+#  Distributors:
+#  You should modify the paths here to fit your distro
+#  If you need to do so, send me (jirka@5z.com) a patch
+#  and I'll try to make the script detect the distro stuff
+#
+
+userresources=$HOME/.Xresources
+usermodmap=$HOME/.Xmodmap
+userxkbmap=$HOME/.Xkbmap
+
+sysresources=/etc/X11/Xresources
+sysmodmap=/etc/X11/Xmodmap
+sysxkbmap=/etc/X11/Xkbmap
+
+rh6sysresources=/etc/X11/xinit/Xresources
+rh6sysmodmap=/etc/X11/xinit/Xmodmap
+
+if [ -x "$HOME/.materc" ]; then
+	command="$HOME/.materc"
+elif [ -x /etc/X11/gdm/materc ]; then
+	command="/etc/X11/gdm/materc"
+else
+	# as fallback in case the config is screwed
+	command=`which mate-session`
+fi
+
+# merge in defaults
+if [ -f "$rh6sysresources" ]; then
+    xrdb -merge "$rh6sysresources"
+fi
+
+if [ -f "$sysresources" ]; then
+    xrdb -merge "$sysresources"
+fi
+
+if [ -f "$userresources" ]; then
+    xrdb -merge "$userresources"
+fi
+
+# merge in keymaps
+if [ -f "$sysxkbmap" ]; then
+    setxkbmap `cat "$sysxkbmap"`
+    XKB_IN_USE=yes
+fi
+
+if [ -f "$userxkbmap" ]; then
+    setxkbmap `cat "$userxkbmap"`
+    XKB_IN_USE=yes
+fi
+
+#
+# Eeek, this seems like too much magic here
+#
+if [ -z "$XKB_IN_USE" ] && [ ! -L /etc/X11/X ]; then
+    if grep '^exec.*/Xsun' /etc/X11/X > /dev/null 2>&1 && [ -f /etc/X11/XF86Config ]; then
+       xkbsymbols=`sed -n -e 's/^[     ]*XkbSymbols[   ]*"\(.*\)".*$/\1/p' /etc/X11/XF86Config`
+       if [ -n "$xkbsymbols" ]; then
+           setxkbmap -symbols "$xkbsymbols"
+           XKB_IN_USE=yes
+       fi
+    fi
+fi
+
+# xkb and xmodmap don't play nice together
+if [ -z "$XKB_IN_USE" ]; then
+    if [ -f "$rh6sysmodmap" ]; then
+       xmodmap "$rh6sysmodmap"
+    fi
+
+    if [ -f "$sysmodmap" ]; then
+       xmodmap "$sysmodmap"
+    fi
+
+    if [ -f "$usermodmap" ]; then
+       xmodmap "$usermodmap"
+    fi
+fi
+
+unset XKB_IN_USE
+
+# run all system xinitrc shell scripts.
+if [ -d /etc/X11/xinit/xinitrc.d ]; then
+    for i in /etc/X11/xinit/xinitrc.d/* ; do
+        if [ -x "$i" ]; then
+	    . "$i"
+        fi
+    done
+fi
+
+exec $command
diff --git a/mate-base/mate-session-manager/files/defaults.list b/mate-base/mate-session-manager/files/defaults.list
new file mode 100644
index 000000000000..0d6d6bf9509a
--- /dev/null
+++ b/mate-base/mate-session-manager/files/defaults.list
@@ -0,0 +1,336 @@
+[Default Applications]
+application/rtf=abiword.desktop
+application/x-abiword=abiword.desktop
+text/abiword=abiword.desktop
+text/richtext=abiword.desktop
+text/rtf=abiword.desktop
+text/x-abiword=abiword.desktop
+text/x-xml-abiword=abiword.desktop
+x-content/blank-bd=brasero-caja.desktop
+x-content/blank-dvd=brasero-caja.desktop
+x-content/blank-cd=brasero-caja.desktop
+x-content/blank-hddvd=brasero-caja.desktop
+application/x-dia-diagram=dia.desktop
+image/bmp=eom.desktop
+image/gif=eom.desktop
+image/jpeg=eom.desktop
+image/jpg=eom.desktop
+image/pjpeg=eom.desktop
+image/png=eom.desktop
+image/svg+xml=eom.desktop
+image/svg+xml-compressed=eom.desktop
+image/x-bmp=eom.desktop
+image/x-gray=eom.desktop
+image/x-icb=eom.desktop
+image/x-ico=eom.desktop
+image/x-pcx=eom.desktop
+image/x-png=eom.desktop
+image/x-portable-anymap=eom.desktop
+image/x-portable-bitmap=eom.desktop
+image/x-portable-graymap=eom.desktop
+image/x-portable-pixmap=eom.desktop
+image/x-xbitmap=eom.desktop
+image/x-xpixmap=eom.desktop
+image/vnd.wap.wbmp=eom.desktop
+image/g3fax=gimp.desktop
+image/x-compressed-xcf=gimp.desktop
+image/x-fits=gimp.desktop
+image/x-icon=gimp.desktop
+image/x-psd=gimp.desktop
+image/x-sgi=gimp.desktop
+image/x-sun-raster=gimp.desktop
+image/x-tga=gimp.desktop
+image/x-xcf=gimp.desktop
+image/x-xwindowdump=gimp.desktop
+application/xhtml+xml=firefox.desktop;firefox-3.6.desktop;epiphany.desktop
+text/html=firefox.desktop;firefox-3.6.desktop;epiphany.desktop
+application/pdf=atril.desktop
+application/x-bzpdf=atril.desktop
+application/x-gzpdf=atril.desktop
+application/postscript=atril.desktop
+application/x-bzpostscript=atril.desktop
+application/x-gzpostscript=atril.desktop
+image/x-eps=atril.desktop
+image/x-bzeps=atril.desktop
+image/x-gzeps=atril.desktop
+application/x-dvi=atril.desktop
+application/x-bzdvi=atril.desktop
+application/x-gzdvi=atril.desktop
+image/vnd.djvu=atril.desktop
+image/tiff=atril.desktop
+application/x-cbr=atril.desktop
+application/x-cbz=atril.desktop
+application/x-cb7=atril.desktop
+application/x-7z-compressed=engrampa.desktop
+application/x-7z-compressed-tar=engrampa.desktop
+application/x-ace=engrampa.desktop
+application/x-alz=engrampa.desktop
+application/x-ar=engrampa.desktop
+application/x-arj=engrampa.desktop
+application/x-bzip=engrampa.desktop
+application/x-bzip-compressed-tar=engrampa.desktop
+application/x-bzip1=engrampa.desktop
+application/x-bzip1-compressed-tar=engrampa.desktop
+application/x-cabinet=engrampa.desktop
+application/x-cd-image=engrampa.desktop
+application/x-compress=engrampa.desktop
+application/x-compressed-tar=engrampa.desktop
+application/x-cpio=engrampa.desktop
+application/x-deb=engrampa.desktop
+application/x-ear=engrampa.desktop
+application/x-gtar=engrampa.desktop
+application/x-gzip=engrampa.desktop
+application/x-java-archive=engrampa.desktop
+application/x-lha=engrampa.desktop
+application/x-lhz=engrampa.desktop
+application/x-lzip=engrampa.desktop
+application/x-lzip-compressed-tar=engrampa.desktop
+application/x-lzma=engrampa.desktop
+application/x-lzma-compressed-tar=engrampa.desktop
+application/x-lzop=engrampa.desktop
+application/x-lzop-compressed-tar=engrampa.desktop
+application/x-rar=engrampa.desktop
+application/x-rar-compressed=engrampa.desktop
+application/x-rpm=engrampa.desktop
+application/x-rzip=engrampa.desktop
+application/x-tar=engrampa.desktop
+application/x-tarz=engrampa.desktop
+application/x-stuffit=engrampa.desktop
+application/x-war=engrampa.desktop
+application/x-xz=engrampa.desktop
+application/x-xz-compressed-tar=engrampa.desktop
+application/x-zip=engrampa.desktop
+application/x-zip-compressed=engrampa.desktop
+application/x-zoo=engrampa.desktop
+application/zip=engrampa.desktop
+multipart/x-zip=engrampa.desktop
+text/plain=pluma.desktop
+text/css=pluma.desktop
+text/javascript=pluma.desktop
+text/mathml=pluma.desktop
+text/x-csrc=pluma.desktop
+text/x-chdr=pluma.desktop
+text/x-dtd=pluma.desktop
+text/x-java=pluma.desktop
+text/x-javascript=pluma.desktop
+text/x-patch=pluma.desktop
+text/x-perl=pluma.destkop
+text/x-php=pluma.destkop
+text/x-python=pluma.destkop
+text/x-sql=pluma.desktop
+text/xml=pluma.desktop
+application/javascript=pluma.destkop
+application/x-cgi=pluma.desktop
+application/x-javascript=pluma.desktop
+application/x-perl=pluma.desktop
+application/x-php=pluma.desktop
+application/x-python=pluma.desktop
+application/xml=pluma.desktop
+application/xml-dtd=pluma.desktop
+application/x-font-ttf=mate-font-viewer.desktop
+application/x-font-pcf=mate-font-viewer.desktop
+application/x-font-type1=mate-font-viewer.desktop
+application/x-font-otf=mate-font-viewer.desktop
+application/csv=gnumeric.desktop
+application/excel=gnumeric.desktop
+application/msexcel=gnumeric.desktop
+application/tab-separated-values=gnumeric.desktop
+application/vnd.lotus-1-2-3=gnumeric.desktop
+application/vnd.ms-excel=gnumeric.desktop
+application/x-123=gnumeric.desktop
+application/x-applix-spreadsheet=gnumeric.desktop
+application/x-dbase=gnumeric.desktop
+application/x-dbf=gnumeric.desktop
+application/x-dos_ms_excel=gnumeric.desktop
+application/x-excel=gnumeric.desktop
+application/x-gnumeric=gnumeric.desktop
+application/x-mps=gnumeric.desktop
+application/x-ms-excel=gnumeric.desktop
+application/x-msexcel=gnumeric.desktop
+application/x-oleo=gnumeric.desktop
+application/x-planperfect=gnumeric.desktop
+application/x-quattropro=gnumeric.desktop
+application/x-sc=gnumeric.desktop
+application/x-sylk=gnumeric.desktop
+application/x-xbase=gnumeric.desktop
+application/x-xls=gnumeric.desktop
+application/xls=gnumeric.desktop
+text/comma-separated-values=gnumeric.desktop
+text/csv=gnumeric.desktop
+text/spreadsheet=gnumeric.desktop
+text/tab-separated-values=gnumeric.desktop
+text/x-comma-separated-values=gnumeric.desktop
+text/x-csv=gnumeric.desktop
+zz-application/zz-winassoc-xls=gnumeric.desktop
+x-content/software=caja-autorun-software.desktop
+x-directory/gnome-default-handler=caja-folder-handler.desktop
+x-directory/normal=caja-folder-handler.desktop
+inode/directory=caja-folder-handler.desktop
+application/x-gnome-saved-search=caja-folder-handler.desktop
+application/vnd.oasis.opendocument.spreadsheet=libreoffice-calc.desktop;openoffice.org-calc.desktop
+application/vnd.oasis.opendocument.spreadsheet-template=libreoffice-calc.desktop;openoffice.org-calc.desktop
+application/vnd.sun.xml.calc=libreoffice-calc.desktop;openoffice.org-calc.desktop
+application/vnd.sun.xml.calc.template=libreoffice-calc.desktop;openoffice.org-calc.desktop
+application/vnd.stardivision.calc=libreoffice-calc.desktop;openoffice.org-calc.desktop
+application/vnd.stardivision.chart=libreoffice-calc.desktop;openoffice.org-calc.desktop
+application/vnd.openxmlformats-officedocument.spreadsheetml.sheet=libreoffice-calc.desktop;openoffice.org-calc.desktop
+application/vnd.ms-excel.sheet.macroenabled.12=libreoffice-calc.desktop;openoffice.org-calc.desktop
+application/vnd.openxmlformats-officedocument.spreadsheetml.template=libreoffice-calc.desktop;openoffice.org-calc.desktop
+application/vnd.ms-excel.template.macroenabled.12=libreoffice-calc.desktop;openoffice.org-calc.desktop
+application/vnd.ms-excel.sheet.binary.macroenabled.12=libreoffice-calc.desktop;openoffice.org-calc.desktop
+application/vnd.oasis.opendocument.graphics=libreoffice-draw.desktop;openoffice.org-draw.desktop
+application/vnd.oasis.opendocument.graphics-template=libreoffice-draw.desktop;openoffice.org-draw.desktop
+application/vnd.sun.xml.draw=libreoffice-draw.desktop;openoffice.org-draw.desktop
+application/vnd.sun.xml.draw.template=libreoffice-draw.desktop;openoffice.org-draw.desktop
+application/vnd.stardivision.draw=libreoffice-draw.desktop;openoffice.org-draw.desktop
+application/vnd.oasis.opendocument.presentation=libreoffice-impress.desktop;openoffice.org-impress.desktop
+application/vnd.oasis.opendocument.presentation-template=libreoffice-impress.desktop;openoffice.org-impress.desktop
+application/vnd.sun.xml.impress=libreoffice-impress.desktop;openoffice.org-impress.desktop
+application/vnd.sun.xml.impress.template=libreoffice-impress.desktop;openoffice.org-impress.desktop
+application/vnd.stardivision.impress=libreoffice-impress.desktop;openoffice.org-impress.desktop
+application/mspowerpoint=libreoffice-impress.desktop;openoffice.org-impress.desktop
+application/vnd.ms-powerpoint=libreoffice-impress.desktop;openoffice.org-impress.desktop
+application/vnd.openxmlformats-officedocument.presentationml.presentation=libreoffice-impress.desktop;openoffice.org-impress.desktop
+application/vnd.ms-powerpoint.presentation.macroenabled.12=libreoffice-impress.desktop;openoffice.org-impress.desktop
+application/vnd.openxmlformats-officedocument.presentationml.template=libreoffice-impress.desktop;openoffice.org-impress.desktop
+application/vnd.ms-powerpoint.template.macroenabled.12=libreoffice-impress.desktop;openoffice.org-impress.desktop
+application/vnd.oasis.opendocument.formula=libreoffice-math.desktop;openoffice.org-math.desktop
+application/vnd.sun.xml.math=libreoffice-math.desktop;openoffice.org-math.desktop
+application/vnd.stardivision.math=libreoffice-math.desktop;openoffice.org-math.desktop
+application/vnd.oasis.opendocument.text=libreoffice-writer.desktop;openoffice.org-writer.desktop
+application/vnd.oasis.opendocument.text-template=libreoffice-writer.desktop;openoffice.org-writer.desktop
+application/vnd.oasis.opendocument.text-web=libreoffice-writer.desktop;openoffice.org-writer.desktop
+application/vnd.oasis.opendocument.text-master=libreoffice-writer.desktop;openoffice.org-writer.desktop
+application/vnd.sun.xml.writer=libreoffice-writer.desktop;openoffice.org-writer.desktop
+application/vnd.sun.xml.writer.template=libreoffice-writer.desktop;openoffice.org-writer.desktop
+application/vnd.sun.xml.writer.global=libreoffice-writer.desktop;openoffice.org-writer.desktop
+application/vnd.stardivision.writer=libreoffice-writer.desktop;openoffice.org-writer.desktop
+application/msword=libreoffice-writer.desktop;openoffice.org-writer.desktop
+application/vnd.ms-word=libreoffice-writer.desktop;openoffice.org-writer.desktop
+application/x-doc=libreoffice-writer.desktop;openoffice.org-writer.desktop
+application/vnd.wordperfect=libreoffice-writer.desktop;openoffice.org-writer.desktop
+application/wordperfect=libreoffice-writer.desktop;openoffice.org-writer.desktop
+application/vnd.openxmlformats-officedocument.wordprocessingml.document=libreoffice-writer.desktop;openoffice.org-writer.desktop
+application/vnd.ms-word.document.macroenabled.12=libreoffice-writer.desktop;openoffice.org-writer.desktop
+application/vnd.openxmlformats-officedocument.wordprocessingml.template=libreoffice-writer.desktop;openoffice.org-writer.desktop
+application/vnd.ms-word.template.macroenabled.12=libreoffice-writer.desktop;openoffice.org-writer.desktop
+x-content/audio-player=rhythmbox.desktop
+x-content/audio-cdda=sound-juicer.desktop
+application/x-shockwave-flash=swfdec-player.desktop
+application/futuresplash=swfdec-player.desktop
+application/mxf=vlc.desktop
+application/ogg=vlc.desktop
+application/ram=vlc.desktop
+application/sdp=vlc.desktop
+application/smil=vlc.desktop
+application/smil+xml=vlc.desktop
+application/vnd.ms-wpl=vlc.desktop
+application/vnd.rn-realmedia=vlc.desktop
+application/x-extension-m4a=vlc.desktop
+application/x-extension-mp4=vlc.desktop
+application/x-flac=vlc.desktop
+application/x-flash-video=vlc.desktop
+application/x-lyx=lyx.desktop
+application/x-matroska=vlc.desktop
+application/x-netshow-channel=vlc.desktop
+application/x-ogg=vlc.desktop
+application/x-quicktime-media-link=vlc.desktop
+application/x-quicktimeplayer=vlc.desktop
+application/x-shorten=vlc.desktop
+application/x-smil=vlc.desktop
+application/xspf+xml=vlc.desktop
+audio/3gpp=vlc.desktop
+audio/ac3=vlc.desktop
+audio/AMR=vlc.desktop
+audio/AMR-WB=vlc.desktop
+audio/basic=vlc.desktop
+audio/midi=vlc.desktop
+audio/mp4=vlc.desktop
+audio/mpeg=vlc.desktop
+audio/mpegurl=vlc.desktop
+audio/ogg=vlc.desktop
+audio/prs.sid=vlc.desktop
+audio/vnd.rn-realaudio=vlc.desktop
+audio/x-ape=vlc.desktop
+audio/x-flac=vlc.desktop
+audio/x-gsm=vlc.desktop
+audio/x-it=vlc.desktop
+audio/x-m4a=vlc.desktop
+audio/x-matroska=vlc.desktop
+audio/x-mod=vlc.desktop
+audio/x-mp3=vlc.desktop
+audio/x-mpeg=vlc.desktop
+audio/x-mpegurl=vlc.desktop
+audio/x-ms-asf=vlc.desktop
+audio/x-ms-asx=vlc.desktop
+audio/x-ms-wax=vlc.desktop
+audio/x-ms-wma=vlc.desktop
+audio/x-musepack=vlc.desktop
+audio/x-pn-aiff=vlc.desktop
+audio/x-pn-au=vlc.desktop
+audio/x-pn-realaudio=vlc.desktop
+audio/x-pn-realaudio-plugin=vlc.desktop
+audio/x-pn-wav=vlc.desktop
+audio/x-pn-windows-acm=vlc.desktop
+audio/x-realaudio=vlc.desktop
+audio/x-real-audio=vlc.desktop
+audio/x-sbc=vlc.desktop
+audio/x-scpls=vlc.desktop
+audio/x-speex=vlc.desktop
+audio/x-tta=vlc.desktop
+audio/x-vorbis=audacious.desktop
+audio/x-vorbis+ogg=audacious.desktop
+audio/x-wav=audacious.desktop
+audio/x-wavpack=audacious.desktop
+audio/x-xm=audacious.desktop
+image/vnd.rn-realpix=vlc.desktop
+image/x-pict=vlc.desktop
+misc/ultravox=vlc.desktop
+text/google-video-pointer=vlc.desktop
+text/x-google-video-pointer=vlc.desktop
+video/3gpp=vlc.desktop
+video/dv=vlc.desktop
+video/fli=vlc.desktop
+video/flv=vlc.desktop
+video/mp2t=vlc.desktop
+video/mp4=vlc.desktop
+video/mp4v-es=vlc.desktop
+video/mpeg=vlc.desktop
+video/msvideo=vlc.desktop
+video/ogg=vlc.desktop
+video/quicktime=vlc.desktop
+video/vivo=vlc.desktop
+video/vnd.divx=vlc.desktop
+video/vnd.rn-realvideo=vlc.desktop
+video/vnd.vivo=vlc.desktop
+video/webm=vlc.desktop
+video/x-anim=vlc.desktop
+video/x-avi=vlc.desktop
+video/x-flc=vlc.desktop
+video/x-fli=vlc.desktop
+video/x-flic=vlc.desktop
+video/x-flv=vlc.desktop
+video/x-m4v=vlc.desktop
+video/x-matroska=vlc.desktop
+video/x-mpeg=vlc.desktop
+video/x-ms-asf=vlc.desktop
+video/x-ms-asx=vlc.desktop
+video/x-msvideo=vlc.desktop
+video/x-ms-wm=vlc.desktop
+video/x-ms-wmv=vlc.desktop
+video/x-ms-wmx=vlc.desktop
+video/x-ms-wvx=vlc.desktop
+video/x-nsv=vlc.desktop
+video/x-ogm+ogg=vlc.desktop
+video/x-theora+ogg=vlc.desktop
+video/x-totem-stream=vlc.desktop
+x-content/video-dvd=vlc.desktop
+x-content/video-vcd=vlc.desktop
+x-content/video-svcd=vlc.desktop
+x-scheme-handler/ghelp=yelp.desktop;
+x-scheme-handler/help=yelp.desktop;
+x-scheme-handler/http=firefox.desktop;epiphany.desktop
+x-scheme-handler/https=firefox.desktop;epiphany.desktop
+x-scheme-handler/mailto=evolution.desktop
+application/x-bittorrent=transmission-gtk.desktop;deluge.desktop
+x-scheme-handler/magnet=transmission-gtk.desktop;deluge.desktop
diff --git a/mate-base/mate-session-manager/files/mate-session-manager-1.12.2-save-session-ui.patch b/mate-base/mate-session-manager/files/mate-session-manager-1.12.2-save-session-ui.patch
new file mode 100644
index 000000000000..e7040f47f45a
--- /dev/null
+++ b/mate-base/mate-session-manager/files/mate-session-manager-1.12.2-save-session-ui.patch
@@ -0,0 +1,535 @@
+diff -burN a/capplet/gsm-properties-dialog.c b/capplet/gsm-properties-dialog.c
+--- a/capplet/gsm-properties-dialog.c	2012-02-29 22:03:08.000000000 +0100
++++ b/capplet/gsm-properties-dialog.c	2012-08-08 12:16:37.527332034 +0200
+@@ -26,6 +26,8 @@
+ #include <glib.h>
+ #include <glib/gi18n.h>
+ #include <gtk/gtk.h>
++#include <dbus/dbus-glib.h>
++#include <dbus/dbus-glib-lowlevel.h>
+ 
+ #include <mateconf/mateconf-client.h>
+ 
+@@ -36,6 +38,11 @@
+ #include "gsp-app.h"
+ #include "gsp-app-manager.h"
+ 
++
++#define GSM_SERVICE_DBUS   "org.gnome.SessionManager"
++#define GSM_PATH_DBUS      "/org.gnome.SessionManager"
++#define GSM_INTERFACE_DBUS "org.gnome.SessionManager"
++
+ #define GSM_PROPERTIES_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSM_TYPE_PROPERTIES_DIALOG, GsmPropertiesDialogPrivate))
+ 
+ #define IS_STRING_EMPTY(x) ((x)==NULL||(x)[0]=='\0')
+@@ -50,6 +57,7 @@
+ #define CAPPLET_DELETE_WIDGET_NAME        "session_properties_delete_button"
+ #define CAPPLET_EDIT_WIDGET_NAME          "session_properties_edit_button"
+ #define CAPPLET_SAVE_WIDGET_NAME          "session_properties_save_button"
++#define CAPPLET_SESSION_SAVED_WIDGET_NAME "session_properties_session_saved_label"
+ #define CAPPLET_REMEMBER_WIDGET_NAME      "session_properties_remember_toggle"
+ 
+ #define STARTUP_APP_ICON     "system-run"
+@@ -493,10 +501,66 @@
+ }
+ 
+ static void
++session_saved_message (GsmPropertiesDialog *dialog,
++                       const char *msg,
++                       gboolean is_error)
++{
++        GtkLabel *label;
++        gchar *markup;
++        
++        label = GTK_LABEL (gtk_builder_get_object (dialog->priv->xml, CAPPLET_SESSION_SAVED_WIDGET_NAME));
++        if (is_error)
++                markup = g_markup_printf_escaped ("<span foreground=\"red\">%s</span>", msg);
++        else
++                markup = g_markup_escape_text (msg, -1);
++
++        gtk_label_set_markup (label, markup);
++        g_free (markup);
++}
++
++static void
++session_saved_cb (DBusGProxy *proxy,
++                  DBusGProxyCall *call_id,
++                  void *user_data)
++{
++        gboolean res;
++        GsmPropertiesDialog *dialog = user_data;
++
++        res = dbus_g_proxy_end_call (proxy, call_id, NULL, G_TYPE_INVALID);
++        if (res)
++                session_saved_message (dialog, _("Your session has been saved."), FALSE);
++        else
++                session_saved_message (dialog, _("Failed to save session"), TRUE);
++
++        g_object_unref (proxy);
++}
++
++static void
+ on_save_session_clicked (GtkWidget           *widget,
+                          GsmPropertiesDialog *dialog)
+ {
+-        g_debug ("Session saving is not implemented yet!");
++        DBusGConnection *conn;
++        DBusGProxy *proxy;
++        DBusGProxyCall *call;
++
++        conn = dbus_g_bus_get (DBUS_BUS_SESSION, NULL);
++        if (conn == NULL) {
++                session_saved_message (dialog, _("Could not connect to the session bus"), TRUE);
++                return;
++        }
++
++        proxy = dbus_g_proxy_new_for_name (conn, GSM_SERVICE_DBUS, GSM_PATH_DBUS, GSM_INTERFACE_DBUS);
++        if (proxy == NULL) {
++                session_saved_message (dialog, _("Could not connect to the session manager"), TRUE);
++                return;
++        }
++
++        call = dbus_g_proxy_begin_call (proxy, "SaveSession", session_saved_cb, dialog, NULL, G_TYPE_INVALID);
++        if (call == NULL) {
++                session_saved_message (dialog, _("Failed to save session"), TRUE);
++                g_object_unref (proxy);
++                return;
++        }
+ }
+ 
+ static void
+diff -burN a/configure.ac b/configure.ac
+--- a/configure.ac	2012-02-29 22:03:09.000000000 +0100
++++ b/configure.ac	2012-08-08 12:18:58.740336360 +0200
+@@ -75,6 +75,7 @@
+ PKG_CHECK_MODULES(SESSION_PROPERTIES,
+         glib-2.0 >= $GLIB_REQUIRED
+         gtk+-$GTK_API_VERSION >= $GTK_REQUIRED
++        dbus-glib-1 >= $DBUS_GLIB_REQUIRED
+ )
+ 
+ PKG_CHECK_MODULES(SM, sm)
+diff -burN a/data/session-properties.ui b/data/session-properties.ui
+--- a/data/session-properties.ui	2012-02-29 22:03:08.000000000 +0100
++++ b/data/session-properties.ui	2012-08-08 12:22:36.619343035 +0200
+@@ -148,6 +148,7 @@
+             <property name="visible">True</property>
+             <child>
+               <object class="GtkButton" id="session_properties_save_button">
++                <property name="visible">True</property>
+                 <property name="can_focus">True</property>
+                 <property name="receives_default">True</property>
+                 <child>
+@@ -191,6 +192,17 @@
+             <property name="position">1</property>
+           </packing>
+         </child>
++        <child>
++          <object class="GtkLabel" id="session_properties_session_saved_label">
++            <property name="visible">True</property>
++            <property name="wrap">True</property>
++          </object>
++          <packing>
++            <property name="expand">False</property>
++            <property name="fill">False</property>
++            <property name="position">2</property>
++          </packing>
++        </child>
+       </object>
+       <packing>
+         <property name="position">1</property>
+diff -burN a/mate-session/gsm-client.c b/mate-session/gsm-client.c
+--- a/mate-session/gsm-client.c	2012-02-29 22:03:08.000000000 +0100
++++ b/mate-session/gsm-client.c	2012-08-08 12:24:20.120346205 +0200
+@@ -510,6 +510,17 @@
+         g_signal_emit (client, signals[DISCONNECTED], 0);
+ }
+ 
++gboolean
++gsm_client_request_save (GsmClient *client,
++                         guint      flags,
++                         GError   **error)
++{
++        g_return_val_if_fail (GSM_IS_CLIENT (client), FALSE);
++
++        return GSM_CLIENT_GET_CLASS (client)->impl_request_save (client, flags, error);
++}
++
++
+ GKeyFile *
+ gsm_client_save (GsmClient *client,
+                  GError   **error)
+diff -burN a/mate-session/gsm-client.h b/mate-session/gsm-client.h
+--- a/mate-session/gsm-client.h	2012-02-29 22:03:09.000000000 +0100
++++ b/mate-session/gsm-client.h	2012-08-08 12:26:38.848350455 +0200
+@@ -94,6 +94,9 @@
+                                                               GError   **error);
+         gboolean              (*impl_stop)                   (GsmClient *client,
+                                                               GError   **error);
++        gboolean              (*impl_request_save)           (GsmClient *client,
++                                                              guint      flags,
++                                                              GError   **error);
+         GKeyFile *            (*impl_save)                   (GsmClient *client,
+                                                               GError   **error);
+ };
+@@ -139,6 +142,10 @@
+ 
+ void                  gsm_client_disconnected               (GsmClient  *client);
+ 
++gboolean              gsm_client_request_save               (GsmClient  *client,
++                                                             guint       flags,
++                                                             GError    **error);
++
+ GKeyFile             *gsm_client_save                       (GsmClient  *client,
+                                                              GError    **error);
+ /* exported to bus */
+diff -burN a/mate-session/gsm-dbus-client.c b/mate-session/gsm-dbus-client.c
+--- a/mate-session/gsm-dbus-client.c	2012-02-29 22:03:08.000000000 +0100
++++ b/mate-session/gsm-dbus-client.c	2012-08-08 12:38:15.393371794 +0200
+@@ -413,6 +413,19 @@
+         G_OBJECT_CLASS (gsm_dbus_client_parent_class)->finalize (object);
+ }
+ 
++static gboolean
++dbus_client_request_save (GsmClient *client,
++                          guint      flags,
++                          GError   **error)
++{
++        g_debug ("GsmDBusClient: sending save request to client with id %s",
++                 gsm_client_peek_id (client));
++
++        /* FIXME: The protocol does not support this */
++
++        return FALSE;
++}
++
+ static GKeyFile *
+ dbus_client_save (GsmClient *client,
+                   GError   **error)
+@@ -665,6 +678,7 @@
+         object_class->set_property         = gsm_dbus_client_set_property;
+         object_class->dispose              = gsm_dbus_client_dispose;
+ 
++        client_class->impl_request_save           = dbus_client_request_save;
+         client_class->impl_save                   = dbus_client_save;
+         client_class->impl_stop                   = dbus_client_stop;
+         client_class->impl_query_end_session      = dbus_client_query_end_session;
+diff -burN a/mate-session/gsm-manager.c b/mate-session/gsm-manager.c
+--- a/mate-session/gsm-manager.c	2012-02-29 22:03:09.000000000 +0100
++++ b/mate-session/gsm-manager.c	2012-08-08 12:47:24.627388620 +0200
+@@ -68,6 +68,7 @@
+ #define GSM_MANAGER_DBUS_NAME "org.gnome.SessionManager"
+ 
+ #define GSM_MANAGER_PHASE_TIMEOUT 30 /* seconds */
++#define GSM_MANAGER_SAVE_SESSION_TIMEOUT 2
+ 
+ #define MDM_FLEXISERVER_COMMAND "mdmflexiserver"
+ #define MDM_FLEXISERVER_ARGS    "--startnew Standard"
+@@ -1176,6 +1177,69 @@
+ 
+ }
+ 
++static gboolean
++_client_request_save (GsmClient            *client,
++                      ClientEndSessionData *data)
++{
++        gboolean ret;
++        GError  *error;
++
++        error = NULL;
++        ret = gsm_client_request_save (client, data->flags, &error);
++        if (ret) {
++                g_debug ("GsmManager: adding client to query clients: %s", gsm_client_peek_id (client));
++                data->manager->priv->query_clients = g_slist_prepend (data->manager->priv->query_clients,
++                                                                      client);
++        } else if (error) {
++                g_debug ("GsmManager: unable to query client: %s", error->message);
++                g_error_free (error);
++        }
++
++        return FALSE;
++}
++
++static gboolean
++_client_request_save_helper (const char           *id,
++                             GsmClient            *client,
++                             ClientEndSessionData *data)
++{
++        return _client_request_save (client, data);
++}
++
++static void
++query_save_session_complete (GsmManager *manager)
++{
++        GError *error = NULL;
++
++        if (g_slist_length (manager->priv->next_query_clients) > 0) {
++                ClientEndSessionData data;
++
++                data.manager = manager;
++                data.flags = GSM_CLIENT_END_SESSION_FLAG_LAST;
++
++                g_slist_foreach (manager->priv->next_query_clients,
++                                 (GFunc)_client_request_save,
++                                 &data);
++
++                g_slist_free (manager->priv->next_query_clients);
++                manager->priv->next_query_clients = NULL;
++
++                return;
++        }
++
++        if (manager->priv->query_timeout_id > 0) {
++                g_source_remove (manager->priv->query_timeout_id);
++                manager->priv->query_timeout_id = 0;
++        }
++
++        gsm_session_save (manager->priv->clients, &error);
++
++        if (error) {
++                g_warning ("Error saving session: %s", error->message);
++                g_error_free (error);
++        }
++}
++
+ static guint32
+ generate_cookie (void)
+ {
+@@ -1250,6 +1314,21 @@
+         return FALSE;
+ }
+ 
++static gboolean
++_on_query_save_session_timeout (GsmManager *manager)
++{
++        manager->priv->query_timeout_id = 0;
++
++        g_debug ("GsmManager: query to save session timed out");
++
++        g_slist_free (manager->priv->query_clients);
++        manager->priv->query_clients = NULL;
++
++        query_save_session_complete (manager);
++
++        return FALSE;
++}
++
+ static void
+ do_phase_query_end_session (GsmManager *manager)
+ {
+@@ -1886,13 +1965,32 @@
+                                 const char *reason,
+                                 GsmManager *manager)
+ {
+-        /* just ignore if received outside of shutdown */
+-        if (manager->priv->phase < GSM_MANAGER_PHASE_QUERY_END_SESSION) {
++        /* just ignore if we are not yet running */
++        if (manager->priv->phase < GSM_MANAGER_PHASE_RUNNING) {
+                 return;
+         }
+ 
+         g_debug ("GsmManager: Response from end session request: is-ok=%d do-last=%d cancel=%d reason=%s", is_ok, do_last, cancel, reason ? reason :"");
+ 
++        if (manager->priv->phase == GSM_MANAGER_PHASE_RUNNING) {
++                /* Ignore responses when no requests were sent */
++                if (manager->priv->query_clients == NULL) {
++                        return;
++                }
++
++                manager->priv->query_clients = g_slist_remove (manager->priv->query_clients, client);
++
++                if (do_last) {
++                        manager->priv->next_query_clients = g_slist_prepend (manager->priv->next_query_clients,
++                                                                             client);
++                }
++
++                if (manager->priv->query_clients == NULL) {
++                        query_save_session_complete (manager);
++                }
++                return;
++        }
++
+         if (cancel) {
+                 cancel_end_session (manager);
+                 return;
+@@ -1991,6 +2089,15 @@
+ }
+ 
+ static void
++on_xsmp_client_save_request (GsmXSMPClient *client,
++                             gboolean       show_dialog,
++                             GsmManager    *manager)
++{
++        g_debug ("GsmManager: save_request");
++        gsm_manager_save_session (manager, NULL);
++}
++
++static void
+ on_store_client_added (GsmStore   *store,
+                        const char *id,
+                        GsmManager *manager)
+@@ -2011,6 +2118,10 @@
+                                   "logout-request",
+                                   G_CALLBACK (on_xsmp_client_logout_request),
+                                   manager);
++		g_signal_connect (client,
++				  "save-request",
++				  G_CALLBACK (on_xsmp_client_save_request),
++				  manager);
+         }
+ 
+         g_signal_connect (client,
+@@ -2968,6 +3079,41 @@
+ }
+ 
+ gboolean
++gsm_manager_save_session (GsmManager *manager,
++                          GError     **error)
++{
++        ClientEndSessionData data;
++
++        g_debug ("GsmManager: SaveSession called");
++
++        g_return_val_if_fail (GSM_IS_MANAGER (manager), FALSE);
++
++        if (manager->priv->phase != GSM_MANAGER_PHASE_RUNNING) {
++                g_set_error (error,
++                             GSM_MANAGER_ERROR,
++                             GSM_MANAGER_ERROR_NOT_IN_RUNNING,
++                             "SaveSession interface is only available during the Running phase");
++                return FALSE;
++        }
++
++        data.manager = manager;
++        data.flags = 0;
++        gsm_store_foreach (manager->priv->clients,
++                           (GsmStoreFunc)_client_request_save_helper,
++                           &data);
++
++        if (manager->priv->query_clients) {
++                manager->priv->query_timeout_id = g_timeout_add_seconds (GSM_MANAGER_SAVE_SESSION_TIMEOUT,
++                                                                         (GSourceFunc)_on_query_save_session_timeout,
++                                                                         manager);
++                return TRUE;
++        } else {
++                g_debug ("GsmManager: Nothing to save");
++                return FALSE;
++        }
++}
++
++gboolean
+ gsm_manager_can_shutdown (GsmManager *manager,
+                           gboolean   *shutdown_available,
+                           GError    **error)
+diff -burN a/mate-session/gsm-manager.h b/mate-session/gsm-manager.h
+--- a/mate-session/gsm-manager.h	2012-02-29 22:03:09.000000000 +0100
++++ b/mate-session/gsm-manager.h	2012-08-08 12:49:14.262391979 +0200
+@@ -154,6 +154,9 @@
+ gboolean            gsm_manager_shutdown                       (GsmManager     *manager,
+                                                                 GError        **error);
+ 
++gboolean            gsm_manager_save_session                   (GsmManager     *manager,
++                                                                GError        **error);
++
+ gboolean            gsm_manager_can_shutdown                   (GsmManager     *manager,
+                                                                 gboolean       *shutdown_available,
+                                                                 GError        **error);
+diff -burN a/mate-session/gsm-xsmp-client.c b/mate-session/gsm-xsmp-client.c
+--- a/mate-session/gsm-xsmp-client.c	2012-02-29 22:03:08.000000000 +0100
++++ b/mate-session/gsm-xsmp-client.c	2012-08-08 12:52:27.719397905 +0200
+@@ -69,6 +69,7 @@
+ enum {
+         REGISTER_REQUEST,
+         LOGOUT_REQUEST,
++        SAVE_REQUEST,
+         LAST_SIGNAL
+ };
+ 
+@@ -502,6 +503,31 @@
+         return TRUE;
+ }
+ 
++static gboolean
++xsmp_request_save (GsmClient *client,
++                   guint      flags,
++                   GError   **error)
++{
++        GsmXSMPClient *xsmp = (GsmXSMPClient *) client;
++
++        g_debug ("GsmXSMPClient: xsmp_request_save ('%s')", xsmp->priv->description);
++
++        if (xsmp->priv->conn == NULL) {
++                g_set_error (error,
++                             GSM_CLIENT_ERROR,
++                             GSM_CLIENT_ERROR_NOT_REGISTERED,
++                             "Client is not registered");
++                return FALSE;
++        }
++
++        if (flags & GSM_CLIENT_END_SESSION_FLAG_LAST)
++                xsmp_save_yourself_phase2 (client);
++        else
++                do_save_yourself (xsmp, SmSaveLocal, FALSE);
++
++        return TRUE;
++}
++
+ static char *
+ get_desktop_file_path (GsmXSMPClient *client)
+ {
+@@ -976,6 +1002,8 @@
+         object_class->get_property         = gsm_xsmp_client_get_property;
+         object_class->set_property         = gsm_xsmp_client_set_property;
+ 
++
++        client_class->impl_request_save           = xsmp_request_save;
+         client_class->impl_save                   = xsmp_save;
+         client_class->impl_stop                   = xsmp_stop;
+         client_class->impl_query_end_session      = xsmp_query_end_session;
+@@ -1003,6 +1031,16 @@
+                               NULL,
+                               NULL,
+                               g_cclosure_marshal_VOID__BOOLEAN,
++                              G_TYPE_NONE,
++                              1, G_TYPE_BOOLEAN);
++        signals[SAVE_REQUEST] =
++		g_signal_new ("save-request",
++                              G_OBJECT_CLASS_TYPE (object_class),
++                              G_SIGNAL_RUN_LAST,
++                              G_STRUCT_OFFSET (GsmXSMPClientClass, save_request),
++                              NULL,
++                              NULL,
++                              g_cclosure_marshal_VOID__BOOLEAN,
+                               G_TYPE_NONE,
+                               1, G_TYPE_BOOLEAN);
+ 
+diff -burN a/mate-session/gsm-xsmp-client.h b/mate-session/gsm-xsmp-client.h
+--- a/mate-session/gsm-xsmp-client.h	2012-02-29 22:03:09.000000000 +0100
++++ b/mate-session/gsm-xsmp-client.h	2012-08-08 12:53:39.629400108 +0200
+@@ -57,6 +57,8 @@
+         gboolean (*logout_request)       (GsmXSMPClient  *client,
+                                           gboolean        prompt);
+ 
++        gboolean (*save_request)         (GsmXSMPClient  *client,
++                                          gboolean        prompt);
+ 
+         void     (*saved_state)          (GsmXSMPClient  *client);
+ 
+diff -burN a/mate-session/org.gnome.SessionManager.xml b/mate-session/org.gnome.SessionManager.xml
+--- a/mate-session/org.gnome.SessionManager.xml	2012-02-29 22:03:09.000000000 +0100
++++ b/mate-session/org.gnome.SessionManager.xml	2012-08-08 12:57:41.216407509 +0200
+@@ -256,6 +256,14 @@
+       </doc:doc>
+     </method>
+ 
++    <method name="SaveSession">
++      <doc:doc>
++	    <doc:description>
++	      <doc:para>Request to save session</doc:para>
++	    </doc:description>
++      </doc:doc>
++    </method>
++
+     <method name="CanShutdown">
+       <arg name="is_available" direction="out" type="b">
+         <doc:doc>
diff --git a/mate-base/mate-session-manager/mate-session-manager-1.12.2-r1.ebuild b/mate-base/mate-session-manager/mate-session-manager-1.12.2-r1.ebuild
new file mode 100644
index 000000000000..02ad708b1ee7
--- /dev/null
+++ b/mate-base/mate-session-manager/mate-session-manager-1.12.2-r1.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="amd64 ~arm x86"
+fi
+
+DESCRIPTION="MATE session manager"
+HOMEPAGE="http://mate-desktop.org/"
+
+LICENSE="GPL-2 LGPL-2 FDL-1.1"
+SLOT="0"
+
+IUSE="debug elibc_FreeBSD gnome-keyring gtk3 ipv6 systemd upower"
+
+# 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).
+
+RDEPEND=">=dev-libs/dbus-glib-0.76
+	>=dev-libs/glib-2.36:2
+	dev-libs/libxslt
+	sys-apps/dbus
+	x11-apps/xdpyinfo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libXext
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/pango
+	x11-libs/xtrans
+	x11-misc/xdg-user-dirs
+	x11-misc/xdg-user-dirs-gtk
+	virtual/libintl
+	elibc_FreeBSD? ( dev-libs/libexecinfo )
+	gnome-keyring? ( gnome-base/gnome-keyring )
+	!gtk3? ( >=x11-libs/gtk+-2.14:2 )
+	gtk3? ( >=x11-libs/gtk+-3.0:3 )
+	systemd? ( sys-apps/systemd )
+	upower? ( || ( >=sys-power/upower-0.9.23 >=sys-power/upower-pm-utils-0.9.23 ) )"
+
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.40:*
+	>=dev-lang/perl-5
+	>=sys-devel/gettext-0.10.40:*
+	virtual/pkgconfig:*
+	!<gnome-base/gdm-2.20.4"
+
+# Add "session saving" button back,
+# see https://bugzilla.gnome.org/show_bug.cgi?id=575544
+PATCHES=( "${FILESDIR}"/${PN}-1.12.2-save-session-ui.patch )
+
+MATE_FORCE_AUTORECONF=true
+
+src_configure() {
+	mate_src_configure \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--with-gtk=$(usex gtk3 3.0 2.0) \
+		$(use_with systemd) \
+		$(use_enable debug) \
+		$(use_enable ipv6) \
+		$(use_enable upower)
+}
+
+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-session-manager/mate-session-manager-1.14.1.ebuild b/mate-base/mate-session-manager/mate-session-manager-1.14.1.ebuild
new file mode 100644
index 000000000000..054ad67775f6
--- /dev/null
+++ b/mate-base/mate-session-manager/mate-session-manager-1.14.1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+DESCRIPTION="MATE session manager"
+HOMEPAGE="http://mate-desktop.org/"
+
+LICENSE="GPL-2 LGPL-2 FDL-1.1"
+SLOT="0"
+
+IUSE="debug elibc_FreeBSD gnome-keyring gtk3 ipv6 systemd upower"
+
+# 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.36:2
+	dev-libs/libxslt
+	sys-apps/dbus
+	x11-libs/gdk-pixbuf:2
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libXext
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/pango
+	x11-libs/xtrans
+	virtual/libintl
+	elibc_FreeBSD? ( dev-libs/libexecinfo )
+	!gtk3? ( >=x11-libs/gtk+-2.14:2 )
+	gtk3? ( >=x11-libs/gtk+-3.0:3 )
+	systemd? ( sys-apps/systemd )
+	upower? ( || ( >=sys-power/upower-0.9.23 >=sys-power/upower-pm-utils-0.9.23 ) )"
+
+RDEPEND="${COMMON_DEPEND}
+	x11-apps/xdpyinfo
+	x11-misc/xdg-user-dirs
+	x11-misc/xdg-user-dirs-gtk
+	gnome-keyring? ( gnome-base/gnome-keyring )"
+
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/intltool-0.40:*
+	>=dev-lang/perl-5
+	>=sys-devel/gettext-0.10.40:*
+	virtual/pkgconfig:*
+	!<gnome-base/gdm-2.20.4"
+
+MATE_FORCE_AUTORECONF=true
+
+src_configure() {
+	mate_src_configure \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--with-gtk=$(usex gtk3 3.0 2.0) \
+		$(use_with systemd) \
+		$(use_enable debug) \
+		$(use_enable ipv6) \
+		$(use_enable upower)
+}
+
+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-session-manager/mate-session-manager-1.16.0.ebuild b/mate-base/mate-session-manager/mate-session-manager-1.16.0.ebuild
new file mode 100644
index 000000000000..3991dbb0bf5e
--- /dev/null
+++ b/mate-base/mate-session-manager/mate-session-manager-1.16.0.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+DESCRIPTION="MATE session manager"
+HOMEPAGE="http://mate-desktop.org/"
+
+LICENSE="GPL-2 LGPL-2 FDL-1.1"
+SLOT="0"
+
+IUSE="debug elibc_FreeBSD gnome-keyring ipv6 systemd upower"
+
+# 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.36:2
+	dev-libs/libxslt
+	sys-apps/dbus
+	x11-libs/gdk-pixbuf:2
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libXext
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/pango
+	x11-libs/xtrans
+	virtual/libintl
+	elibc_FreeBSD? ( dev-libs/libexecinfo )
+	>=x11-libs/gtk+-3.14:3
+	systemd? ( sys-apps/systemd )
+	upower? ( || ( >=sys-power/upower-0.9.23 >=sys-power/upower-pm-utils-0.9.23 ) )"
+
+RDEPEND="${COMMON_DEPEND}
+	x11-apps/xdpyinfo
+	x11-misc/xdg-user-dirs
+	x11-misc/xdg-user-dirs-gtk
+	gnome-keyring? ( gnome-base/gnome-keyring )"
+
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/intltool-0.40:*
+	>=dev-lang/perl-5
+	>=sys-devel/gettext-0.10.40:*
+	virtual/pkgconfig:*
+	!<gnome-base/gdm-2.20.4"
+
+MATE_FORCE_AUTORECONF=true
+
+src_configure() {
+	mate_src_configure \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		$(use_with systemd) \
+		$(use_enable debug) \
+		$(use_enable ipv6) \
+		$(use_enable upower)
+}
+
+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-session-manager/mate-session-manager-1.18.0-r1.ebuild b/mate-base/mate-session-manager/mate-session-manager-1.18.0-r1.ebuild
new file mode 100644
index 000000000000..750c70fd689c
--- /dev/null
+++ b/mate-base/mate-session-manager/mate-session-manager-1.18.0-r1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+DESCRIPTION="MATE session manager"
+HOMEPAGE="http://mate-desktop.org/"
+
+LICENSE="GPL-2 LGPL-2 FDL-1.1"
+SLOT="0"
+
+IUSE="debug elibc_FreeBSD gnome-keyring ipv6 systemd +xtrans"
+
+# 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.36:2
+	dev-libs/libxslt
+	sys-apps/dbus
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.14: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 )
+	systemd? ( sys-apps/systemd )
+	!systemd? ( >=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 )"
+
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/intltool-0.40:*
+	>=dev-lang/perl-5
+	>=sys-devel/gettext-0.10.40:*
+	virtual/pkgconfig:*
+	!<gnome-base/gdm-2.20.4"
+
+MATE_FORCE_AUTORECONF=true
+
+src_configure() {
+	mate_src_configure \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		$(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-session-manager/mate-session-manager-1.18.0.ebuild b/mate-base/mate-session-manager/mate-session-manager-1.18.0.ebuild
new file mode 100644
index 000000000000..dae79928d3a0
--- /dev/null
+++ b/mate-base/mate-session-manager/mate-session-manager-1.18.0.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+DESCRIPTION="MATE session manager"
+HOMEPAGE="http://mate-desktop.org/"
+
+LICENSE="GPL-2 LGPL-2 FDL-1.1"
+SLOT="0"
+
+IUSE="debug elibc_FreeBSD gnome-keyring ipv6 systemd xtrans"
+
+# 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.36:2
+	dev-libs/libxslt
+	sys-apps/dbus
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.14: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 )
+	systemd? ( sys-apps/systemd )
+	!systemd? ( >=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 )"
+
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/intltool-0.40:*
+	>=dev-lang/perl-5
+	>=sys-devel/gettext-0.10.40:*
+	virtual/pkgconfig:*
+	!<gnome-base/gdm-2.20.4"
+
+MATE_FORCE_AUTORECONF=true
+
+src_configure() {
+	mate_src_configure \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		$(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-session-manager/metadata.xml b/mate-base/mate-session-manager/metadata.xml
new file mode 100644
index 000000000000..f69aac22ed08
--- /dev/null
+++ b/mate-base/mate-session-manager/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>mate@gentoo.org</email>
+		<name>Gentoo MATE Desktop</name>
+	</maintainer>
+	<use>
+		<flag name="gtk3">Build with GTK+3 instead of GTK+2</flag>
+		<flag name="xtrans">Build with Xtrans support; 
+		WARNING: Disabling this flag will result in ICE binding on all interfaces</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">mate-desktop/mate-session-manager</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/mate-base/mate-settings-daemon/Manifest b/mate-base/mate-settings-daemon/Manifest
new file mode 100644
index 000000000000..13bc1ca98da5
--- /dev/null
+++ b/mate-base/mate-settings-daemon/Manifest
@@ -0,0 +1,11 @@
+DIST mate-settings-daemon-1.12.1.tar.xz 781388 SHA256 a0d9ea55ba5828500e873eff6c771dae645fa3218c1ba9d701c408f0eb71e988 SHA512 36c0d2cacef22db1d27e694602ee390fd0a24e3478837fd7fbfe069f55278c7a7ff3f7d280e0bf9cd4e827beeb9b3d40f505e5772686036e47e3d0b7d1e4b47e WHIRLPOOL 771efca75fa7c0d337648b81e52f81d085fc62287e34ccdb132c3844fedbb7e3df2a49e327d7a34048515c661ac417cffa5d5c4f74a7589f136af2e628bc2a32
+DIST mate-settings-daemon-1.14.1.tar.xz 760936 SHA256 81bc955ecebd054939cb5f90338ed86616f5aebedd8ecc581600120f5db374ad SHA512 e237c1c7df4a42183e3c3079c88dfc94422b604ed9b197363a5ea9bfdf7a16782681f6d82ee3b5b7c5edac6b90b0f2875072a108f5fe9b954bbbf1c8cc27e6d5 WHIRLPOOL 1ac365064a8980557867f8bab22f8cdf17020536c439778fc2419065c8e19469ea3bcadfbddef5b57bfdac9a7b39c949989eca300d81bf0bb240c62806c0aa57
+DIST mate-settings-daemon-1.16.0.tar.xz 767136 SHA256 7876b7377adb89a11812c1b3fd44e1e78f371f8418f4f05bf5be25ea8efce4d0 SHA512 39ab6cd52008bfb92949f225b003186ed27f9ad215a59015a3ccaa1f02e618b786fe9db94d993bc89660b03c50700b364de1ac4a9b7cf23a83ca545fc93bbee3 WHIRLPOOL 618fe5ac34387111f4ea80bb93964b86d4888f1f8a8a106bdbc4269c2b3f6333e5f4d68734b8d7becd796e0827560435c1d7c6e77e76961a7c726abf17d5234d
+DIST mate-settings-daemon-1.18.1.tar.xz 778776 SHA256 a64597c7bb9ac56b9b3f71671a20a3e68a83da4893b5f97293f6808dfb94621d SHA512 35ea953a508c1a8a2359a13f36789f2b171873e2b153f3c7e5e779a900672cf19a4f36892136d4886e61349f536706f0ab0e781cbde3e246c490c66af3e621d6 WHIRLPOOL 249a70d96be48aa378a20c78aa651129c2de1a21ed3911deccd3ccb167796d4e88bde7620c3acb76bdebf1ad428e2847812a47ffb1be6b25e0b281fb2beb3906
+EBUILD mate-settings-daemon-1.12.1.ebuild 1707 SHA256 937a05bae4665172ba42718e4321acd0c88c21fd271ed3fe48939b34b09784e4 SHA512 24bfac7cb9c14c148d6a848db9385c520beb7439dca96805a3726c2f3ce65137bc0afa90ddcd692ffab972ee19bb55fcc56355b6f1a1702dc2c444a9948c0240 WHIRLPOOL 60387dc3d0e58214e0088f55cad4fcb807bdf7196618f85cadf9e59efea10084a9fe2793cfbb41610b231364dee9718581b2d2cb524c0534ad5cf98f7dffca31
+EBUILD mate-settings-daemon-1.14.1.ebuild 1749 SHA256 8fc83eee694a3dea890152ed17e6cb87fc586303d7557e2e2e1d6ca10621feee SHA512 441ee4c9c62956e6b2d9419510e1747d1847423aabb4cd2128f6e7668c8960d32ee6387ee0963989a277f49b6870ea7f3f9c02244e5a6fd6b2ed9cbdcb4f84bc WHIRLPOOL 1daba047646c0751b3028972913298089d0ffec4492838a29f565dfa290b560c41c33e2b797adbed377d1689de0709558efa1d7e2e3c7afbc6c1fb7596ef23f7
+EBUILD mate-settings-daemon-1.16.0.ebuild 1749 SHA256 8fc83eee694a3dea890152ed17e6cb87fc586303d7557e2e2e1d6ca10621feee SHA512 441ee4c9c62956e6b2d9419510e1747d1847423aabb4cd2128f6e7668c8960d32ee6387ee0963989a277f49b6870ea7f3f9c02244e5a6fd6b2ed9cbdcb4f84bc WHIRLPOOL 1daba047646c0751b3028972913298089d0ffec4492838a29f565dfa290b560c41c33e2b797adbed377d1689de0709558efa1d7e2e3c7afbc6c1fb7596ef23f7
+EBUILD mate-settings-daemon-1.18.1.ebuild 1602 SHA256 77a3e8a76db86b1b882500713ea13c050361aa79ac4a0d11fcf37e19fefe3ed7 SHA512 22729a370da233b7bee16ed591412d380b9cce2f87042ba6589e238cd8b9e86d7f0f141b27185c4a622ca6403d09fa10bbf98a9281a9b6bdfe3bfdff37d3cda5 WHIRLPOOL da2ece78b52ed44f5afd99c4daeda653645dccba2866475de3e180ae9b168a6f6d8bf445e4f2a4568a5a80a54bb344e1e4917aac70733499a8b327040311ea91
+MISC ChangeLog 5265 SHA256 fa4b0801078f6e6b36239a421c86d88d9ad1a67e260dc3ef8888ad3f63f53680 SHA512 02ae83b10ef8dfdcbcd2fbf5697120f072442fa67e91d825291d1128f7fd9fae338eb2c971d43b12471d0799f8ea3499d1efc29841faba3387101285646d9326 WHIRLPOOL 20ac19fda68d47bbb628f64de79938129986eed589676a5dda3ee84906d684623714214a3a1efb2325458d7d17532e9b1eb8212156160843bdca8a0870d90a0d
+MISC ChangeLog-2015 2346 SHA256 49306670d07ff3470fdc50ca3974ba3efffcebd5647369ebc6688d1362a59f0f SHA512 2109182125a7b330368fec1140cf2a875416119b7401669b9bd6c59a2417230ddb132174917a6981039f5b667961d3e3b408a8c3ed6a23a67a3078fd3974dd96 WHIRLPOOL 4ac812af88050265b4fb2b81318b169fa79c911056cc317ac4b1b6308e70fb8c74aa5bb39bcada9e314aacd63d53b0e8211dc2eb819ec1581aee87f2caea624a
+MISC metadata.xml 425 SHA256 5237ac5cf6f0ea8485184aed6b3c06e43156ff06024067ca00ee6ba35d9afb2b SHA512 3849ef93c7ebd9b753a15bab1c1fb3142d4c3270fe1ac29585862c27265a78f389478962475038680e194d976812ecfab398ecb89d26c2372e1fdb060432d932 WHIRLPOOL d6c42f790abc46a75c4086e17b3a97b5a9ca9c7a3cc88f8aa481aa00f8c9fe0028cd6a3723dba74da16d95d8384b1bf163a300146f0bcfdda9a844d14e546db8
diff --git a/mate-base/mate-settings-daemon/mate-settings-daemon-1.12.1.ebuild b/mate-base/mate-settings-daemon/mate-settings-daemon-1.12.1.ebuild
new file mode 100644
index 000000000000..af03f9d70d16
--- /dev/null
+++ b/mate-base/mate-settings-daemon/mate-settings-daemon-1.12.1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2016 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 x86"
+fi
+
+DESCRIPTION="MATE Settings Daemon"
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+
+IUSE="X debug gtk3 libnotify policykit pulseaudio smartcard +sound"
+
+REQUIRED_USE="pulseaudio? ( sound )"
+
+RDEPEND=">=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.7[gtk3(-)=]
+	>=mate-base/mate-desktop-1.9[gtk3(-)=]
+	media-libs/fontconfig:1.0
+	x11-libs/cairo:0
+	x11-libs/gdk-pixbuf:2
+	x11-libs/libX11:0
+	x11-libs/libXi:0
+	x11-libs/libXext:0
+	x11-libs/libXxf86misc:0
+	>=x11-libs/libxklavier-5:0
+	virtual/libintl:0
+	!gtk3? ( >=x11-libs/gtk+-2.24:2 )
+	gtk3? ( >=x11-libs/gtk+-3.0:3 )
+	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.9
+		!gtk3? ( media-libs/libcanberra:0[gtk] )
+		gtk3? ( media-libs/libcanberra:0[gtk3] )
+	)"
+
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.50.1:0
+	sys-devel/gettext:0
+	virtual/pkgconfig:0
+	x11-proto/inputproto:0
+	x11-proto/xproto:0"
+
+src_configure() {
+	mate_src_configure \
+		--with-gtk=$(usex gtk3 3.0 2.0) \
+		$(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.14.1.ebuild b/mate-base/mate-settings-daemon/mate-settings-daemon-1.14.1.ebuild
new file mode 100644
index 000000000000..262630d7c4a6
--- /dev/null
+++ b/mate-base/mate-settings-daemon/mate-settings-daemon-1.14.1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2016 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 ~x86"
+fi
+
+DESCRIPTION="MATE Settings Daemon"
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+
+IUSE="X debug gtk3 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.7[gtk3(-)=]
+	>=mate-base/mate-desktop-1.9[gtk3(-)=]
+	media-libs/fontconfig:1.0
+	x11-libs/cairo:0
+	x11-libs/gdk-pixbuf:2
+	x11-libs/libX11:0
+	x11-libs/libXi:0
+	x11-libs/libXext:0
+	x11-libs/libXxf86misc:0
+	>=x11-libs/libxklavier-5:0
+	virtual/libintl:0
+	!gtk3? ( >=x11-libs/gtk+-2.24:2 )
+	gtk3? ( >=x11-libs/gtk+-3.0:3 )
+	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.9
+		!gtk3? ( media-libs/libcanberra:0[gtk] )
+		gtk3? ( 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-proto/inputproto:0
+	x11-proto/xproto:0"
+
+src_configure() {
+	mate_src_configure \
+		--with-gtk=$(usex gtk3 3.0 2.0) \
+		$(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.16.0.ebuild b/mate-base/mate-settings-daemon/mate-settings-daemon-1.16.0.ebuild
new file mode 100644
index 000000000000..262630d7c4a6
--- /dev/null
+++ b/mate-base/mate-settings-daemon/mate-settings-daemon-1.16.0.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2016 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 ~x86"
+fi
+
+DESCRIPTION="MATE Settings Daemon"
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+
+IUSE="X debug gtk3 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.7[gtk3(-)=]
+	>=mate-base/mate-desktop-1.9[gtk3(-)=]
+	media-libs/fontconfig:1.0
+	x11-libs/cairo:0
+	x11-libs/gdk-pixbuf:2
+	x11-libs/libX11:0
+	x11-libs/libXi:0
+	x11-libs/libXext:0
+	x11-libs/libXxf86misc:0
+	>=x11-libs/libxklavier-5:0
+	virtual/libintl:0
+	!gtk3? ( >=x11-libs/gtk+-2.24:2 )
+	gtk3? ( >=x11-libs/gtk+-3.0:3 )
+	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.9
+		!gtk3? ( media-libs/libcanberra:0[gtk] )
+		gtk3? ( 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-proto/inputproto:0
+	x11-proto/xproto:0"
+
+src_configure() {
+	mate_src_configure \
+		--with-gtk=$(usex gtk3 3.0 2.0) \
+		$(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.18.1.ebuild b/mate-base/mate-settings-daemon/mate-settings-daemon-1.18.1.ebuild
new file mode 100644
index 000000000000..938b47d22773
--- /dev/null
+++ b/mate-base/mate-settings-daemon/mate-settings-daemon-1.18.1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2017 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 ~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-proto/inputproto:0
+	x11-proto/xproto:0"
+
+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/metadata.xml b/mate-base/mate-settings-daemon/metadata.xml
new file mode 100644
index 000000000000..a2f583c4bc9c
--- /dev/null
+++ b/mate-base/mate-settings-daemon/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>mate@gentoo.org</email>
+		<name>Gentoo MATE Desktop</name>
+	</maintainer>
+	<use>
+		<flag name="gtk3">Build with GTK+3 instead of GTK+2</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">mate-desktop/mate-settings-daemon</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/mate-base/mate/Manifest b/mate-base/mate/Manifest
new file mode 100644
index 000000000000..37e880496bc3
--- /dev/null
+++ b/mate-base/mate/Manifest
@@ -0,0 +1,7 @@
+EBUILD mate-1.12-r1.ebuild 2843 SHA256 1f685f083e8def17e317c53197937bf78df174c364c0fd74c208887edcb3f5ad SHA512 82930d68a25a6aa86207c5548f333d1d7b6e4591fc7be7df41791aecbb36bf26aebcc3979115547ec3b46783f4ffbf6889eadbd2cc3b3b4e4985c8c5d35cc6df WHIRLPOOL 49ce0a9b21cf4dffea6bcdf92cb33a2aad8135d0976930fa1fcb1dfb5966f762a6debbee328a7109611e58a310079962adc960ab92ed7b2ee188df62c1cf216d
+EBUILD mate-1.14.ebuild 2767 SHA256 21a77f81423049d5c3735bb9fbadab9586df94443017dd02bc781792422803ca SHA512 d4eb265d58f3dcf8606b5c56ac7076136f216e1f3be7bb17d19cb66dee3f6dd3958e8e42c0ed13d2714a9ee346cfa42ae737e7ea19c126fe71385553860456c2 WHIRLPOOL 89a9091632d5f2ba29e3678cfff1258969850d5006711b3d7f0b4a16cfe6d3b65d5fb6e2fc606d49aab2a8dbe9d898ced7ed6148f174ffdde9a58013191f350e
+EBUILD mate-1.16.ebuild 2727 SHA256 74ce6b93e503f7d337736bd45101d43d7c44473525614c59e27ccbc758f64320 SHA512 1c56bd9b4f567cbbbdafff3a19af03955b69020995308c13cfdcdff92320a562d17a25136c213cdd4b5448ee18133c660ec1c9c628a7dc57d964cc760b0798ff WHIRLPOOL d105d04454b1aeaa5a1cd16f026d835029e56420204517478f8fdc597199c6dc6fb81ed75238878272ce1a9e435ff5b2f0f5bd920a01e91b177ad8cbefe9df85
+EBUILD mate-1.18.ebuild 2571 SHA256 9994d5dc6fb01703f5db29d53aa2e77215b86b295ecad2a258063eb0c87a2356 SHA512 a82c16c632a559714a7c50fdba10973bed7b20fc86306f02b4a3db7b930eeca0f3102c925080ac982a1392435a4c43dcaedf6780ce022a60190efc9b9859835d WHIRLPOOL d49efdf8738e34355d1644b93f8829e925ccbd61de5d9ce707194b5ae0f44145c9f5a1c7aaf9914c7ad58547c81eef4bedaeceae9caf9615c3bfeb3604231b87
+MISC ChangeLog 4820 SHA256 5550adfccc54b59428dba13e0302d816aa6dc7f5acde573a2911ee45489bdb8d SHA512 f2e740f642832bb53364c6dc1c117b21bf663b75ff2cbb6ba9ff40b4d8fd3e2df6823c69a43de72b7dc2091ac1bc31727a39b41a575c852581fd3dd091174306 WHIRLPOOL 9d0cdf36e8a55af05f2d8faa15bcf7584ae00e04df318b296f50da9f4a80fe8ede44291044ac9a14e4b84ce7a46a130b91f5873cd97b4f12ab5f11c918f555a1
+MISC ChangeLog-2015 1690 SHA256 7c85aacfe94d04da3bf2a71f64c62fac4133e3ecd4bbf3dbc0f7648ce3860399 SHA512 916ea5322bdd9a3f660a79242f48a69ceeebc12ba4421cc43f6aa13deef11f85487a58a46a948a76dc810f8bf51f155d276dcee0b773b1ef801c9ec3ca8205c4 WHIRLPOOL 6efb2b9260819d750a4ca36075637ee0591a10c0719e9ce0d572bb57e694a8dd5d009de091edc5cea5f335fbc6e97481e79d273d8e4892f9b4500116207f8076
+MISC metadata.xml 1418 SHA256 d7dd8356fd323005c42824da865a1ad7627830edab396a16619f43144a0e51af SHA512 eb85701a1ea94e137810700a7d27bc0a3bb9591aeb7c3af5bbf3c939ec5edfbae68fbf49449e5490444cdc8d6fde7afc755865010a7cffe090c305c7613169e7 WHIRLPOOL 5c94134f2187d104055a75262be140187080eb1fe05ab693c64c6d946d3dde99b9678c3db28286f970877fa1ed20b0921127e28fb65f469557c31e96e9d5d698
diff --git a/mate-base/mate/mate-1.12-r1.ebuild b/mate-base/mate/mate-1.12-r1.ebuild
new file mode 100644
index 000000000000..de459dbe4178
--- /dev/null
+++ b/mate-base/mate/mate-1.12-r1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == 9999 ]]; then
+	MATE_BRANCH=9999
+	MATE_THEMES_V=9999
+else
+	inherit versionator
+	MATE_BRANCH="$(get_version_component_range 1-2)"
+	MATE_THEMES_V=3
+	KEYWORDS="amd64 ~arm x86"
+fi
+
+SRC_URI=""
+DESCRIPTION="Meta ebuild for MATE, a traditional desktop environment"
+HOMEPAGE="http://mate-desktop.org"
+
+LICENSE="metapackage"
+
+SLOT="0"
+IUSE="+base -bluetooth gtk3 help +notification +themes +extras"
+
+S="${WORKDIR}"
+
+RDEPEND="
+	=mate-base/mate-desktop-${MATE_BRANCH}*:0[gtk3(-)?]
+	=mate-base/mate-menus-${MATE_BRANCH}*:0
+	=mate-base/mate-panel-${MATE_BRANCH}*:0[gtk3(-)?]
+	=mate-base/mate-session-manager-${MATE_BRANCH}*:0[gtk3(-)?]
+	=mate-base/mate-settings-daemon-${MATE_BRANCH}*:0[gtk3(-)?]
+	=x11-wm/marco-${MATE_BRANCH}*:0[gtk3(-)?]
+	base? (
+		=mate-base/caja-${MATE_BRANCH}*:0[gtk3(-)?]
+		=mate-base/mate-applets-meta-${MATE_BRANCH}*:0[gtk3(-)?]
+		=mate-base/mate-control-center-${MATE_BRANCH}*:0[gtk3(-)?]
+		=mate-extra/mate-media-${MATE_BRANCH}*:0[gtk3(-)?]
+		=x11-misc/mozo-${MATE_BRANCH}*:0[gtk3(-)?]
+		=x11-terms/mate-terminal-${MATE_BRANCH}*:0[gtk3(-)?]
+	)
+	bluetooth? ( net-wireless/blueman:0 )
+	themes? (
+		=x11-themes/mate-backgrounds-${MATE_BRANCH}*:0
+		=x11-themes/mate-icon-theme-${MATE_BRANCH}*:0
+		>=x11-themes/mate-themes-meta-${MATE_THEMES_V}:0
+	)
+	extras? (
+		=app-arch/engrampa-${MATE_BRANCH}*:0[gtk3(-)?]
+		=app-editors/pluma-${MATE_BRANCH}*:0[gtk3(-)?]
+		=app-text/atril-${MATE_BRANCH}*:0[gtk3(-)?]
+		gnome-extra/gnome-calculator:0
+		=mate-extra/caja-extensions-${MATE_BRANCH}*:0[gtk3(-)?]
+		=mate-extra/mate-netbook-${MATE_BRANCH}*:0[gtk3(-)?]
+		=mate-extra/mate-power-manager-${MATE_BRANCH}*:0[gtk3(-)?]
+		=mate-extra/mate-screensaver-${MATE_BRANCH}*:0[gtk3(-)?]
+		=mate-extra/mate-system-monitor-${MATE_BRANCH}*:0[gtk3(-)?]
+		=mate-extra/mate-utils-${MATE_BRANCH}*:0[gtk3(-)?]
+		=media-gfx/eom-${MATE_BRANCH}*:0[gtk3(-)?]
+		=net-analyzer/mate-netspeed-${MATE_BRANCH}*:0[gtk3(-)?]
+		sys-apps/gnome-disk-utility:0
+	)
+	help? (
+		gnome-extra/yelp:0
+		=mate-extra/mate-user-guide-${MATE_BRANCH}*:0
+	)
+"
+
+PDEPEND="
+	notification? ( =x11-misc/mate-notification-daemon-${MATE_BRANCH}*:0[gtk3(-)?] )
+	virtual/notification-daemon:0"
+
+pkg_postinst() {
+	elog "For installation, usage and troubleshooting details regarding MATE;"
+	elog "read more about it at Gentoo Wiki: https://wiki.gentoo.org/wiki/MATE"
+	elog ""
+	if ! has_version x11-misc/mate-notification-daemon; then
+		elog "If you experience any issues with notifications, please try using"
+		elog "x11-misc/mate-notification-daemon instead your currently installed daemon"
+		elog ""
+	fi
+	elog "Some packages that are not included in this meta-package but may be of interest:"
+	elog "		mate-extra/caja-dropbox"
+	elog "		mate-extra/mate-user-share"
+}
diff --git a/mate-base/mate/mate-1.14.ebuild b/mate-base/mate/mate-1.14.ebuild
new file mode 100644
index 000000000000..b889e588bb81
--- /dev/null
+++ b/mate-base/mate/mate-1.14.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == 9999 ]]; then
+	MATE_BRANCH=9999
+	MATE_THEMES_V=9999
+else
+	inherit versionator
+	MATE_BRANCH="$(get_version_component_range 1-2)"
+	MATE_THEMES_V=3
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+SRC_URI=""
+DESCRIPTION="Meta ebuild for MATE, a traditional desktop environment"
+HOMEPAGE="http://mate-desktop.org"
+
+LICENSE="metapackage"
+
+SLOT="0"
+IUSE="+base -bluetooth gtk3 help +notification +themes +extras"
+
+S="${WORKDIR}"
+
+RDEPEND="
+	=mate-base/mate-desktop-${MATE_BRANCH}*:0[gtk3(-)?]
+	=mate-base/mate-menus-${MATE_BRANCH}*:0
+	=mate-base/mate-panel-${MATE_BRANCH}*:0[gtk3(-)?]
+	=mate-base/mate-session-manager-${MATE_BRANCH}*:0[gtk3(-)?]
+	=mate-base/mate-settings-daemon-${MATE_BRANCH}*:0[gtk3(-)?]
+	=x11-wm/marco-${MATE_BRANCH}*:0[gtk3(-)?]
+	base? (
+		=mate-base/caja-${MATE_BRANCH}*:0[gtk3(-)?]
+		=mate-base/mate-applets-meta-${MATE_BRANCH}*:0[gtk3(-)?]
+		=mate-base/mate-control-center-${MATE_BRANCH}*:0[gtk3(-)?]
+		=mate-extra/mate-media-${MATE_BRANCH}*:0[gtk3(-)?]
+		=x11-misc/mozo-${MATE_BRANCH}*:0
+		=x11-terms/mate-terminal-${MATE_BRANCH}*:0[gtk3(-)?]
+	)
+	bluetooth? ( net-wireless/blueman:0 )
+	themes? (
+		=x11-themes/mate-backgrounds-${MATE_BRANCH}*:0
+		=x11-themes/mate-icon-theme-${MATE_BRANCH}*:0
+		>=x11-themes/mate-themes-meta-${MATE_THEMES_V}:0
+	)
+	extras? (
+		=app-arch/engrampa-${MATE_BRANCH}*:0[gtk3(-)?]
+		=app-editors/pluma-${MATE_BRANCH}*:0[gtk3(-)?]
+		=app-text/atril-${MATE_BRANCH}*:0[gtk3(-)?]
+		gnome-extra/gnome-calculator:0
+		=mate-extra/caja-extensions-${MATE_BRANCH}*:0[gtk3(-)?]
+		=mate-extra/mate-netbook-${MATE_BRANCH}*:0[gtk3(-)?]
+		=mate-extra/mate-power-manager-${MATE_BRANCH}*:0[gtk3(-)?]
+		=mate-extra/mate-screensaver-${MATE_BRANCH}*:0[gtk3(-)?]
+		=mate-extra/mate-system-monitor-${MATE_BRANCH}*:0
+		=mate-extra/mate-utils-${MATE_BRANCH}*:0[gtk3(-)?]
+		=media-gfx/eom-${MATE_BRANCH}*:0[gtk3(-)?]
+		sys-apps/gnome-disk-utility:0
+	)
+	help? (
+		gnome-extra/yelp:0
+		=mate-extra/mate-user-guide-${MATE_BRANCH}*:0
+	)
+"
+
+PDEPEND="
+	notification? ( =x11-misc/mate-notification-daemon-${MATE_BRANCH}*:0[gtk3(-)?] )
+	virtual/notification-daemon:0"
+
+pkg_postinst() {
+	elog "For installation, usage and troubleshooting details regarding MATE;"
+	elog "read more about it at Gentoo Wiki: https://wiki.gentoo.org/wiki/MATE"
+	elog ""
+	if ! has_version x11-misc/mate-notification-daemon; then
+		elog "If you experience any issues with notifications, please try using"
+		elog "x11-misc/mate-notification-daemon instead your currently installed daemon"
+		elog ""
+	fi
+	elog "Some packages that are not included in this meta-package but may be of interest:"
+	elog "		mate-extra/caja-dropbox"
+	elog "		mate-extra/mate-user-share"
+}
diff --git a/mate-base/mate/mate-1.16.ebuild b/mate-base/mate/mate-1.16.ebuild
new file mode 100644
index 000000000000..131f68cc80f2
--- /dev/null
+++ b/mate-base/mate/mate-1.16.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == 9999 ]]; then
+	MATE_BRANCH=9999
+	MATE_THEMES_V=9999
+else
+	inherit versionator
+	MATE_BRANCH="$(get_version_component_range 1-2)"
+	MATE_THEMES_V=3
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+SRC_URI=""
+DESCRIPTION="Meta ebuild for MATE, a traditional desktop environment"
+HOMEPAGE="http://mate-desktop.org"
+
+LICENSE="metapackage"
+
+SLOT="0"
+IUSE="+base -bluetooth gtk3 help +notification +themes +extras"
+
+S="${WORKDIR}"
+
+RDEPEND="
+	=mate-base/mate-desktop-${MATE_BRANCH}*:0[gtk3(-)?]
+	=mate-base/mate-menus-${MATE_BRANCH}*:0
+	=mate-base/mate-panel-${MATE_BRANCH}*:0[gtk3(-)?]
+	=mate-base/mate-session-manager-${MATE_BRANCH}*:0
+	=mate-base/mate-settings-daemon-${MATE_BRANCH}*:0[gtk3(-)?]
+	=x11-wm/marco-${MATE_BRANCH}*:0[gtk3(-)?]
+	base? (
+		=mate-base/caja-${MATE_BRANCH}*:0[gtk3(-)?]
+		=mate-base/mate-applets-meta-${MATE_BRANCH}*:0[gtk3(-)?]
+		=mate-base/mate-control-center-${MATE_BRANCH}*:0[gtk3(-)?]
+		=mate-extra/mate-media-${MATE_BRANCH}*:0[gtk3(-)?]
+		=x11-misc/mozo-${MATE_BRANCH}*:0
+		=x11-terms/mate-terminal-${MATE_BRANCH}*:0
+	)
+	bluetooth? ( net-wireless/blueman:0 )
+	themes? (
+		=x11-themes/mate-backgrounds-${MATE_BRANCH}*:0
+		=x11-themes/mate-icon-theme-${MATE_BRANCH}*:0
+		>=x11-themes/mate-themes-meta-${MATE_THEMES_V}:0
+	)
+	extras? (
+		=app-arch/engrampa-${MATE_BRANCH}*:0
+		=app-editors/pluma-${MATE_BRANCH}*:0[gtk3(-)?]
+		=app-text/atril-${MATE_BRANCH}*:0[gtk3(-)?]
+		gnome-extra/gnome-calculator:0
+		=mate-extra/caja-extensions-${MATE_BRANCH}*:0[gtk3(-)?]
+		=mate-extra/mate-netbook-${MATE_BRANCH}*:0[gtk3(-)?]
+		=mate-extra/mate-power-manager-${MATE_BRANCH}*:0[gtk3(-)?]
+		=mate-extra/mate-screensaver-${MATE_BRANCH}*:0[gtk3(-)?]
+		=mate-extra/mate-system-monitor-${MATE_BRANCH}*:0
+		=mate-extra/mate-utils-${MATE_BRANCH}*:0[gtk3(-)?]
+		=media-gfx/eom-${MATE_BRANCH}*:0[gtk3(-)?]
+		sys-apps/gnome-disk-utility:0
+	)
+	help? (
+		gnome-extra/yelp:0
+		=mate-extra/mate-user-guide-${MATE_BRANCH}*:0
+	)
+"
+
+PDEPEND="
+	notification? ( =x11-misc/mate-notification-daemon-${MATE_BRANCH}*:0 )
+	virtual/notification-daemon:0"
+
+pkg_postinst() {
+	elog "For installation, usage and troubleshooting details regarding MATE;"
+	elog "read more about it at Gentoo Wiki: https://wiki.gentoo.org/wiki/MATE"
+	elog ""
+	if ! has_version x11-misc/mate-notification-daemon; then
+		elog "If you experience any issues with notifications, please try using"
+		elog "x11-misc/mate-notification-daemon instead your currently installed daemon"
+		elog ""
+	fi
+	elog "Some packages that are not included in this meta-package but may be of interest:"
+	elog "		mate-extra/caja-dropbox"
+	elog "		mate-extra/mate-user-share"
+}
diff --git a/mate-base/mate/mate-1.18.ebuild b/mate-base/mate/mate-1.18.ebuild
new file mode 100644
index 000000000000..0a25a2befbeb
--- /dev/null
+++ b/mate-base/mate/mate-1.18.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == 9999 ]]; then
+	MATE_BRANCH=9999
+	MATE_THEMES_V=9999
+else
+	inherit versionator
+	MATE_BRANCH="$(get_version_component_range 1-2)"
+	MATE_THEMES_V=3
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+SRC_URI=""
+DESCRIPTION="Meta ebuild for MATE, a traditional desktop environment"
+HOMEPAGE="http://mate-desktop.org"
+
+LICENSE="metapackage"
+
+SLOT="0"
+IUSE="+base -bluetooth help +notification +themes +extras"
+
+S="${WORKDIR}"
+
+RDEPEND="
+	=mate-base/mate-desktop-${MATE_BRANCH}*:0
+	=mate-base/mate-menus-${MATE_BRANCH}*:0
+	=mate-base/mate-panel-${MATE_BRANCH}*:0
+	=mate-base/mate-session-manager-${MATE_BRANCH}*:0
+	=mate-base/mate-settings-daemon-${MATE_BRANCH}*:0
+	=x11-wm/marco-${MATE_BRANCH}*:0
+	base? (
+		=mate-base/caja-${MATE_BRANCH}*:0
+		=mate-base/mate-applets-meta-${MATE_BRANCH}*:0
+		=mate-base/mate-control-center-${MATE_BRANCH}*:0
+		=mate-extra/mate-media-${MATE_BRANCH}*:0
+		=x11-misc/mozo-${MATE_BRANCH}*:0
+		=x11-terms/mate-terminal-${MATE_BRANCH}*:0
+	)
+	bluetooth? ( net-wireless/blueman:0 )
+	themes? (
+		=x11-themes/mate-backgrounds-${MATE_BRANCH}*:0
+		=x11-themes/mate-icon-theme-${MATE_BRANCH}*:0
+		>=x11-themes/mate-themes-meta-${MATE_THEMES_V}:0
+	)
+	extras? (
+		=app-arch/engrampa-${MATE_BRANCH}*:0
+		=app-editors/pluma-${MATE_BRANCH}*:0
+		=app-text/atril-${MATE_BRANCH}*:0
+		=mate-extra/caja-extensions-${MATE_BRANCH}*:0
+		=mate-extra/mate-calc-${MATE_BRANCH}*:0
+		=mate-extra/mate-netbook-${MATE_BRANCH}*:0
+		=mate-extra/mate-power-manager-${MATE_BRANCH}*:0
+		=mate-extra/mate-screensaver-${MATE_BRANCH}*:0
+		=mate-extra/mate-system-monitor-${MATE_BRANCH}*:0
+		=mate-extra/mate-utils-${MATE_BRANCH}*:0
+		=media-gfx/eom-${MATE_BRANCH}*:0
+		sys-apps/gnome-disk-utility:0
+	)
+	help? (
+		gnome-extra/yelp:0
+		=mate-extra/mate-user-guide-${MATE_BRANCH}*:0
+	)
+"
+
+PDEPEND="
+	notification? ( =x11-misc/mate-notification-daemon-${MATE_BRANCH}*:0 )
+	virtual/notification-daemon:0"
+
+pkg_postinst() {
+	elog "For installation, usage and troubleshooting details regarding MATE;"
+	elog "read more about it at Gentoo Wiki: https://wiki.gentoo.org/wiki/MATE"
+	elog ""
+	if ! has_version x11-misc/mate-notification-daemon; then
+		elog "If you experience any issues with notifications, please try using"
+		elog "x11-misc/mate-notification-daemon instead your currently installed daemon"
+		elog ""
+	fi
+	elog "Some packages that are not included in this meta-package but may be of interest:"
+	elog "		mate-extra/caja-dropbox"
+	elog "		mate-extra/mate-user-share"
+}
diff --git a/mate-base/mate/metadata.xml b/mate-base/mate/metadata.xml
new file mode 100644
index 000000000000..097778096d4d
--- /dev/null
+++ b/mate-base/mate/metadata.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>mate@gentoo.org</email>
+		<name>Gentoo MATE Desktop</name>
+	</maintainer>
+	<use>
+		<flag name="base">Install base MATE Desktop applications that are
+			recommended for the most common usage; for example, this installs
+			the file manager. Disable this and other USE flags if you want a
+			more minimal MATE Desktop.</flag>
+		<flag name="gtk3">Build all of MATE DE with GTK+3 instead of GTK+2</flag>
+		<flag name="notification">Force notification daemon to default to MATE's
+			notification daemon. Enabled by default. Disable if it causes conflicts
+			with other installed desktop environments.</flag>
+		<flag name="themes">Install MATE Desktop's themes; if you use other
+			themes, you can disable this to spare some space and time.</flag>
+		<flag name="extras">Install additional MATE Desktop applications that
+			are recommended for extended usage of the MATE Desktop as upstream
+			sees it; for example, this installs MATE Desktop's office related
+			applications. Disable this if you plan to use your own non-MATE
+			Desktop alternatives or a custom mixture of MATE and non-MATE
+			packages.</flag>
+		<flag name="help">Install <pkg>gnome-extra/yelp</pkg> to handle in application
+			help menus and documentation browsing</flag>
+	</use>
+</pkgmetadata>
diff --git a/mate-base/metadata.xml b/mate-base/metadata.xml
new file mode 100644
index 000000000000..faf505708ede
--- /dev/null
+++ b/mate-base/metadata.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<catmetadata>
+	<longdescription lang="en">
+		The mate-base category contains core MATE packages.
+	</longdescription>
+	<longdescription lang="de">
+		Die Kategorie mate-base enthält die MATE Basispakete.
+	</longdescription>
+	<longdescription lang="es">
+		La catagoría mate-base contiene los paquetes principales de MATE.
+	</longdescription>
+	<longdescription lang="ja">
+		mate-baseカテゴリーにはMATEのコア・パッケージが含まれています。
+	</longdescription>
+	<longdescription lang="nl">
+		De mate-base categorie bevat de basisonderdelen van de MATE desktopomgeving.
+	</longdescription>
+	<longdescription lang="vi">
+		Nhóm mate-base chứa các gói MATE cốt lõi.
+	</longdescription>
+	<longdescription lang="it">
+		La categoria mate-base contiene i pacchetti base di MATE.
+	</longdescription>
+	<longdescription lang="pt">
+		A categoria mate-base contém os pacotes principais de MATE.
+	</longdescription>
+	<longdescription lang="pl">
+		Kategoria mate-base zawiera podstawowe pakiety środowiska MATE.
+	</longdescription>
+</catmetadata>
+\ No newline at end of file
author	V3n3RiX <venerix@redcorelinux.org>	2017-10-09 18:53:29 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2017-10-09 18:53:29 +0100
commit	4f2d7949f03e1c198bc888f2d05f421d35c57e21 (patch)
tree	ba5f07bf3f9d22d82e54a462313f5d244036c768 /mate-base