Merge updates from master

93 files changed, 2855 insertions, 184 deletions

diff --git a/app-arch/engrampa/Manifest b/app-arch/engrampa/Manifest
index 9440ad0745dc..d18b1d863fef 100644
--- a/app-arch/engrampa/Manifest
+++ b/app-arch/engrampa/Manifest
@@ -1,3 +1,4 @@
 DIST engrampa-1.12.0.tar.xz 1380144 SHA256 4f1f8b0829000f6bb2d8a53a8da098dc5b177638c6d8e5b3fb52402a4541759c SHA512 8c694b1f1baab099316f6e5d5ec67ae95171df3a988aee11b0527ae797717e7b3e57fa1ec53cb78e9aa397b1758f768736231ad1bd91c1bb8b2ba2f8f755cfec WHIRLPOOL b1132440b2d02fd2bfa9c903794113cf7d36eb7e67b4dc3222635dc7c33c459a87885ce1ec7bcdc623db8c75a6d33015ade6faaf3cfa8fd85fc85631d87366da
 DIST engrampa-1.14.1.tar.xz 1417444 SHA256 43d882e772c53d13856f02e44454927e3bab4c5d77094057572be6972e0310d8 SHA512 fea510d95fe483f676f66490706aa919b6a62bc20af9e22893304235ce0a38ff006c66494d548a3207dc4cd241cb785abe77652693d1b600e4ca6c8a0a60d763 WHIRLPOOL 6793b07c57d91ce73c102fc59b4e18141532f895814b4879547b10db4dec24029185d944cce5f34e8a880e9da2a2e229dfc44cf3d6d95ae264b2207ddcbedb8c
 DIST engrampa-1.16.0.tar.xz 1430028 SHA256 dd7f11d60693cb77691a589551bcaf4050d4921d996fbbbe3a61ed7fc4072efc SHA512 d0bf44040b4aa8298137605b632a1b022a69c665cc0324a3358693e7151091f1adba0f6eb01ee04b8ada09977f979ed3c3ed8b3f5314b06d96fede0c4ff37ce2 WHIRLPOOL 1f759fbec85e073d156b6f539e23cb3f610bfd38007e88ec640e37e14cab01743adc7cbdaf53ab6776b2ba1886a6b4a6dad6f0a4cd5c735c0998bfa72632242f
+DIST engrampa-1.18.1.tar.xz 1427140 SHA256 be7218078f13d715e35580d231c0b5090fac1210b9de83f93311079f39b8aabc SHA512 9b39783f508a0582a2e77ea6a2cd3665b6054274bea8ad14f78ed37e20533e78554eca23fc171e090bd881468d630d5f644d687bee8bb282f5a106c80b1daf17 WHIRLPOOL 5aee31a84c2fb3f098201cd5f1f1974ed601fef261adcf369be293e1daa94644a0d40c90a0130e6db52a2568d95ea1b212ed58c53c8c5fbba1e5b97dd4e488d5
diff --git a/app-arch/engrampa/engrampa-1.18.1.ebuild b/app-arch/engrampa/engrampa-1.18.1.ebuild
new file mode 100644
index 000000000000..408158541234
--- /dev/null
+++ b/app-arch/engrampa/engrampa-1.18.1.ebuild
@@ -0,0 +1,70 @@
+# 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="Engrampa archive manager for MATE"
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="caja magic packagekit"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.32.0:2
+	>=dev-libs/json-glib-0.14:0
+	x11-libs/gdk-pixbuf:2
+	x11-libs/pango:0
+	virtual/libintl:0
+	caja? ( >=mate-base/caja-1.17.1 )
+	>=x11-libs/gtk+-3.14:3[X]
+	magic? ( sys-apps/file )
+	packagekit? ( app-admin/packagekit-base )
+	!!app-arch/mate-file-archiver"
+
+RDEPEND="${COMMON_DEPEND}"
+
+DEPEND="${COMMON_DEPEND}
+	app-text/yelp-tools
+	>=dev-util/intltool-0.50.1:*
+	sys-devel/gettext:*
+	virtual/pkgconfig:*"
+
+src_configure() {
+	mate_src_configure \
+		--disable-run-in-place \
+		$(use_enable caja caja-actions) \
+		$(use_enable magic) \
+		$(use_enable packagekit)
+}
+
+pkg_postinst() {
+	mate_pkg_postinst
+
+	elog ""
+	elog "${PN} is a frontend for several archiving utilities. If you want a"
+	elog "particular achive format supported install the relevant package."
+	elog
+	elog "For example:"
+	elog "  7-zip   : emerge app-arch/p7zip"
+	elog "  ace     : emerge app-arch/unace"
+	elog "  arj     : emerge app-arch/arj"
+	elog "  cpio    : emerge app-arch/cpio"
+	elog "  deb     : emerge app-arch/dpkg"
+	elog "  iso     : emerge app-cdr/cdrtools"
+	elog "  jar,zip : emerge app-arch/zip  or  emerge app-arch/unzip"
+	elog "  lha     : emerge app-arch/lha"
+	elog "  lzma    : emerge app-arch/xz-utils"
+	elog "  lzop    : emerge app-arch/lzop"
+	elog "  rar     : emerge app-arch/unrar"
+	elog "  rpm     : emerge app-arch/rpm"
+	elog "  unstuff : emerge app-arch/stuffit"
+	elog "  zoo     : emerge app-arch/zoo"
+}
diff --git a/app-editors/pluma/Manifest b/app-editors/pluma/Manifest
index d444a0347bd2..a349d4845893 100644
--- a/app-editors/pluma/Manifest
+++ b/app-editors/pluma/Manifest
@@ -1,3 +1,4 @@
 DIST pluma-1.12.2.tar.xz 3397280 SHA256 eb74988a9fa9892f883b2ccdc9cf217478576815bcb02662d2e3cf2ae39ef870 SHA512 db2878161903868703514531ba214fc34dad1789885f18756e9192d6ba17950c8be03141ada72f8c386b515d8b0f9d58a0ee94a33fe3ffe00f360ea667c2b275 WHIRLPOOL 30e45dc3e399e77403d23ebe1c8fb98592f3a408de3bd5ee724e621168b26116de0c520348dd74929e360a251b8d727ef9967746b14732fc6e03d63ffb3091c4
 DIST pluma-1.14.1.tar.xz 3415364 SHA256 5517e9bf93ec22a3036498f2e95652fb9046229b8a0da66a742643eab7e595a1 SHA512 5d04e053ab2eb0f90e34d9af541004867c7317fd9386229c4e702e95a80420df16b20e4ae4c30bbee79fe904282f6134f7c361971be07cd6952612d975c88d11 WHIRLPOOL 217d447f0ebe9bcf069b6831421e9680256c7b70753ab126aaf5641ba518df12b4fc60041feb433873a0cbc2d7108bf871958e13186b71e050d9f0610db9b770
 DIST pluma-1.16.0.tar.xz 3412640 SHA256 0eb4a4486f1c83119969567cedb05894f25ac5d43cefb4c3ed88ca2f75eff29d SHA512 2472a1631cb89f4df0d09558bd274b6c6d042ae4cbb6ae0134a089cfefb5d0673ec28d78d3665dd1933f76a9c20517afe626f921e06703af9e3c71b9f3b96260 WHIRLPOOL 74c57e589e0f1c2013eb01b1c1aa9e455b0741486f5e1537588f641521fb180b6f7f7a02a9512e069dd94a1d9111fd3d52000a3c05adf30f84ef2ebbadeb0c22
+DIST pluma-1.18.2.tar.xz 3348500 SHA256 ff0f29d4eaa946cbb2b26bbdc2b2d5a308b2d16ec99ea384bcb13f1f3d1a09fc SHA512 285170531c92ad13fdd35286c06de62b75f0426a830c51f4f54799b4b5377d65b3e1fd1e1af3827462a356947e853e4203a4ed394a8b6137bbd87e289f490b6d WHIRLPOOL 13ede09dcede35be84797a3c597fbb1b3fc06aaf866dab17a831c19c577a22aa61af7b5758221a971cc6244bc2c966041228911947ecbaca59292b98d3c4da7d
diff --git a/app-editors/pluma/pluma-1.18.2.ebuild b/app-editors/pluma/pluma-1.18.2.ebuild
new file mode 100644
index 000000000000..65d4d2f88bc0
--- /dev/null
+++ b/app-editors/pluma/pluma-1.18.2.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"
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit mate multilib python-single-r1 virtualx
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+DESCRIPTION="Pluma text editor for the MATE desktop"
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="+introspection spell"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# Tests require gvfs sftp fs mounted and schema's installed. Disable tests.
+# https://github.com/mate-desktop/mate-text-editor/issues/33
+RESTRICT="test"
+
+COMMON_DEPEND="dev-libs/atk:0
+	>=dev-libs/glib-2.36:2
+	>=dev-libs/libpeas-1.2.0[gtk]
+	>=dev-libs/libxml2-2.5:2
+	x11-libs/cairo:0
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.14.0:3[introspection?]
+	>=x11-libs/gtksourceview-3.0.0:3.0
+	x11-libs/libICE:0
+	x11-libs/libX11:0
+	>=x11-libs/libSM-1.0
+	x11-libs/pango:0
+	virtual/libintl:0
+	introspection? ( >=dev-libs/gobject-introspection-0.9.3:= )
+	spell? (
+		>=app-text/enchant-1.2:0
+		>=app-text/iso-codes-0.35:0
+	)
+	!!app-editors/mate-text-editor"
+
+RDEPEND="${PYTHON_DEPS}
+	${COMMON_DEPEND}
+	>=mate-base/mate-desktop-1.9[introspection?]"
+
+DEPEND="${COMMON_DEPEND}
+	~app-text/docbook-xml-dtd-4.1.2
+	app-text/rarian:0
+	>=app-text/scrollkeeper-dtd-1:1.0
+	app-text/yelp-tools:0
+	dev-util/gtk-doc
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.50.1:*
+	>=sys-devel/libtool-2.2.6:2
+	>=sys-devel/gettext-0.17:*
+	virtual/pkgconfig:*"
+
+src_configure() {
+	mate_src_configure \
+		$(use_enable introspection) \
+		$(use_enable spell)
+}
+
+src_test() {
+	# FIXME: This should be handled at eclass level.
+	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die
+
+	unset DBUS_SESSION_BUS_ADDRESS
+
+	GSETTINGS_SCHEMA_DIR="${S}/data" Xemake check
+}
diff --git a/app-emulation/genymotion-bin/Manifest b/app-emulation/genymotion-bin/Manifest
index 4a64ae3a15c9..2f435a8ce5f6 100644
--- a/app-emulation/genymotion-bin/Manifest
+++ b/app-emulation/genymotion-bin/Manifest
@@ -1,2 +1 @@
-DIST genymotion-2.8.1_x64.bin 47061574 SHA256 4f971beb117c578d07ca71a7a8d6cd3a574fdee2df48eb165a15a26b57625408 SHA512 8ca4f46e983ffa2a19c21e961b6638af859f7635bd3a976c0b5709622a536569c81ccf3b08f52f0016e37990d83b1fd38cc86c9dbb5599e727fd48558567dfa7 WHIRLPOOL 2ccd896f1f017d2399366d822b5615b607fe74d557d3c3b6c746bdd2814cd081835397608a08f1135367cb79a26e19917f0f4186d1e535b63f347647afbbc5ce
 DIST genymotion-2.9.0-linux_x64.bin 44858494 SHA256 2392c8fdce45354d109b001e72d994f26bd6d4a3976ef91f02404178dc66c110 SHA512 cf96b804ecfb5c620d20ce601ab6a99bdcc9365efa9bf6e830ac54c75ad2838372115db425a549b89a05bc496ce39dbb51a3abeba1641e300f801f996eeaaf1f WHIRLPOOL 49b2abe0f04b34810140410deac8a0063787963828186b97bc595da94686b50b46c5c7422dcc4bb49b26eb8cf438e696914f11fd0bb37f0830731781bfe401d8
diff --git a/app-emulation/genymotion-bin/genymotion-bin-2.8.1-r1.ebuild b/app-emulation/genymotion-bin/genymotion-bin-2.8.1-r1.ebuild
deleted file mode 100644
index 45b76acfd35f..000000000000
--- a/app-emulation/genymotion-bin/genymotion-bin-2.8.1-r1.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils bash-completion-r1
-
-MY_PN="${PN/-bin}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Complete set of tools that provide a virtual environment for Android"
-HOMEPAGE="http://genymotion.com"
-SRC_URI="${MY_P}_x64.bin"
-DOWNLOAD_URL="https://www.genymotion.com/download/"
-
-LICENSE="genymotion"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-
-DEPEND=""
-RDEPEND="|| ( >=app-emulation/virtualbox-5.0.28 >=app-emulation/virtualbox-bin-5.0.28 )
-	virtual/opengl
-	media-libs/libpng:1.2
-	dev-libs/openssl
-	dev-qt/qtgui:5[libinput,xcb]
-	dev-qt/qtsql:5[sqlite]
-	dev-qt/qtwebkit:5
-	dev-qt/qtsvg:5
-	dev-qt/qtx11extras:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtconcurrent:5
-	dev-util/android-sdk-update-manager
-	media-libs/jpeg:8
-	dev-libs/double-conversion
-	sys-apps/util-linux
-	media-libs/fontconfig:1.0
-	media-libs/harfbuzz[graphite]
-	>=dev-libs/libffi-3.0.13-r1
-	media-libs/gstreamer[orc]
-"
-RESTRICT="bindist fetch"
-S="${WORKDIR}"
-
-pkg_nofetch() {
-	einfo
-	einfo "Please visit ${DOWNLOAD_URL} and download ${MY_P}_x64.bin"
-	einfo "which must be placed in ${DISTDIR}"
-	einfo
-}
-
-src_unpack() {
-	cp "${DISTDIR}/${A}" "${WORKDIR}" || die "cp failed"
-}
-
-src_prepare() {
-	default
-
-	# removed function _install_desktop_file because happens outside of sandbox
-	sed -i -e "s/_install_desktop_file\ ||\ abort//" ${A} || die "sed failed"
-	chmod +x ${A} || die "chmod failed"
-	yes | ./${A} -d "${S}" > /dev/null || die "unpack failed"
-
-	# removed windows line for bashcompletion
-	sed -i -e "s/complete\ -F\ _gmtool\ gmtool.exe//" "${S}/${MY_PN}/completion/bash/gmtool.bash" || die "sed failed"
-}
-
-QA_PREBUILT="
-	opt/${MY_PN}/*.so*
-	opt/${MY_PN}/imageformats/*.so
-	opt/${MY_PN}/plugins/*.so*
-	opt/${MY_PN}/device-upgrade
-	opt/${MY_PN}/${MY_PN}
-	opt/${MY_PN}/genyshell
-	opt/${MY_PN}/player
-	opt/${MY_PN}/${MY_PN}adbtunneld
-	opt/${MY_PN}/gmtool
-"
-
-src_install() {
-	insinto /opt/"${MY_PN}"
-	doins -r "${MY_PN}"/{plugins,translations,icons}
-
-	doins "${MY_PN}"/{libcom,librendering}.so*
-	# library that differ from system version
-	doins "${MY_PN}"/{libicudata,libicui18n,libicuuc,libswscale,libavutil,libprotobuf}.so*
-	# android library
-	doins "${MY_PN}"/{libEGL_translator,libGLES_CM_translator,libGLES_V2_translator,libOpenglRender}.so*
-
-	insopts -m0755
-	doins "${MY_PN}"/{device-upgrade,genymotion,genyshell,player,genymotionadbtunneld,gmtool}
-
-	dosym "${ED%/}"/opt/"${MY_PN}"/genyshell /opt/bin/genyshell
-	dosym "${ED%/}"/opt/"${MY_PN}"/"${MY_PN}" /opt/bin/"${MY_PN}"
-	dosym "${ED%/}"/opt/"${MY_PN}"/device-upgrade /opt/bin/"${MY_PN}"-device-upgrade
-	dosym "${ED%/}"/opt/"${MY_PN}"/player /opt/bin/"${MY_PN}"-player
-	dosym "${ED%/}"/opt/"${MY_PN}"/"${MY_PN}"adbtunneld /opt/bin/"${MY_PN}"adbtunneld
-	dosym "${ED%/}"/opt/"${MY_PN}"/gmtool /opt/bin/gmtool
-
-	# Workaround
-	dosym "${ED%/}/"usr/$(get_libdir)/qt5/plugins/imageformats/libqsvg.so /opt/"${MY_PN}"/imageformats/libqsvg.so
-
-	newbashcomp "${MY_PN}/completion/bash/gmtool.bash" gmtool
-
-	if has_version "app-shells/zsh" ; then
-		insinto /usr/share/zsh/site-functions
-		doins "${MY_PN}/completion/zsh/_gmtool"
-	fi
-
-	make_desktop_entry "/opt/${MY_PN}/${MY_PN}" "Genymotion ${PV}" "/opt/${MY_PN}/icons/icon.png" "Development;Emulator;"
-	mv "${ED%/}"/usr/share/applications/*.desktop "${ED%/}"/usr/share/applications/"${MY_PN}".desktop || die "mv failed"
-}
-
-pkg_postinst() {
-	elog "Genymotion needs adb to work correctly: install with android-sdk-update-manager"
-	elog "'Android SDK Platform-tools' and 'Android SDK Tools'"
-	elog "Your user should also be in the android group to work correctly"
-	elog "Then in Genymotion set the android-sdk-update-manager directory: (Settings->ADB)"
-	elog
-	elog "      /opt/android-sdk-update-manager"
-}
diff --git a/app-emulation/genymotion-bin/genymotion-bin-2.9.0.ebuild b/app-emulation/genymotion-bin/genymotion-bin-2.9.0-r1.ebuild
index 535cd7d4ae10..b0faa6ff4a4f 100644
--- a/app-emulation/genymotion-bin/genymotion-bin-2.9.0.ebuild
+++ b/app-emulation/genymotion-bin/genymotion-bin-2.9.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit eutils bash-completion-r1
+inherit eutils bash-completion-r1 pax-utils
 
 MY_PN="${PN/-bin}"
 MY_P="${MY_PN}-${PV}"
@@ -20,24 +20,25 @@ KEYWORDS="-* ~amd64"
 DEPEND=""
 RDEPEND="|| ( >=app-emulation/virtualbox-5.0.28 >=app-emulation/virtualbox-bin-5.0.28 )
 	virtual/opengl
-	media-libs/libpng:1.2
 	dev-libs/openssl
-	dev-qt/qtgui:5[libinput,xcb]
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtopengl:5
 	dev-qt/qtsql:5[sqlite]
 	dev-qt/qtwebkit:5
+	dev-qt/qtwebsockets:5
 	dev-qt/qtsvg:5
 	dev-qt/qtx11extras:5
-	dev-qt/qtdeclarative:5
+	dev-qt/qtdeclarative:5[widgets]
+	dev-qt/qtquickcontrols:5
 	dev-qt/qtconcurrent:5
-	dev-util/android-sdk-update-manager
-	media-libs/jpeg:8
-	dev-libs/double-conversion
+	dev-qt/qtgraphicaleffects:5
 	sys-apps/util-linux
-	media-libs/fontconfig:1.0
-	media-libs/harfbuzz[graphite]
-	>=dev-libs/libffi-3.0.13-r1
-	media-libs/gstreamer[orc]
 "
+# note if you compile protobuf with >=gcc-5.1 you need to disable the new c++11 abi
+# -D_GLIBCXX_USE_CXX11_ABI=0  to your CXXFLAGS for protobuf
+#	=dev-libs/protobuf-2.6*
+
 RESTRICT="bindist fetch"
 S="${WORKDIR}"
 
@@ -82,22 +83,23 @@ src_install() {
 
 	doins "${MY_PN}"/{libcom,librendering}.so*
 	# library that differ from system version
-	doins "${MY_PN}"/{libicudata,libicui18n,libicuuc,libswscale,libavutil,libprotobuf}.so*
+	doins "${MY_PN}"/{libswscale,libavutil,libprotobuf}.so*
 	# android library
 	doins "${MY_PN}"/{libEGL_translator,libGLES_CM_translator,libGLES_V2_translator,libOpenglRender,libemugl_logger}.so*
 
 	insopts -m0755
 	doins "${MY_PN}"/{device-upgrade,genymotion,genyshell,player,genymotionadbtunneld,gmtool}
 
+	pax-mark -m "${ED%/}/opt/${MY_PN}/${MY_PN}"
+	pax-mark -m "${ED%/}/opt/${MY_PN}/gmtool"
+
 	dosym "${ED%/}"/opt/"${MY_PN}"/genyshell /opt/bin/genyshell
 	dosym "${ED%/}"/opt/"${MY_PN}"/"${MY_PN}" /opt/bin/"${MY_PN}"
-	dosym "${ED%/}"/opt/"${MY_PN}"/device-upgrade /opt/bin/"${MY_PN}"-device-upgrade
-	dosym "${ED%/}"/opt/"${MY_PN}"/player /opt/bin/"${MY_PN}"-player
-	dosym "${ED%/}"/opt/"${MY_PN}"/"${MY_PN}"adbtunneld /opt/bin/"${MY_PN}"adbtunneld
 	dosym "${ED%/}"/opt/"${MY_PN}"/gmtool /opt/bin/gmtool
 
 	# Workaround
 	dosym "${ED%/}/"usr/$(get_libdir)/qt5/plugins/imageformats/libqsvg.so /opt/"${MY_PN}"/imageformats/libqsvg.so
+	dosym "${ED%/}/"usr/$(get_libdir)/qt5/plugins/sqldrivers/libqsqlite.so /opt/"${MY_PN}"/sqldrivers/libqsqlite.so
 
 	newbashcomp "${MY_PN}/completion/bash/gmtool.bash" gmtool
 
diff --git a/app-text/atril/Manifest b/app-text/atril/Manifest
index 4d3fbcb37522..e36496ca9b6d 100644
--- a/app-text/atril/Manifest
+++ b/app-text/atril/Manifest
@@ -1,3 +1,4 @@
 DIST atril-1.12.2.tar.xz 1663920 SHA256 47cd22969d4ff6ef860a310a57f77f1fcc0c5674113a72ee507d2b1b5c780226 SHA512 2ceeda42adeb284a25caff3a69d15a231129988fb410e4d502a281ccf5819307b9963722a2e330307a1c3b15d3c82405b708d983ed1c266e091a35264766e6ec WHIRLPOOL 8eb8a0cd40c0c3d21141493a09b3dc8f2c4d902fff1ed80fe5468b1ac342c81312518c015cbd288372f228bc4bb91bb1555af8f8b5842e72e4eb895fc787988c
 DIST atril-1.14.2.tar.xz 1703272 SHA256 9a8eadd85bda4539560f01a2127be4d6c358c07c6a744c09d1fdb5bff7ce14f4 SHA512 9f77abe43848a3a35df1484edef4a6bbc6339f82b0d8e9f3c149c44fd632f2720acf24bcc1354b944c5c364fc4ce1d70b733c1ec5bc40b1a17041e59acf7bd9b WHIRLPOOL 3e4bf2f6af6369b7cf410f161c159f6f0221d311b354c24d8b86fbcb14c3553d01ea6d79667d9817541aa401202bc8590d074f635745730854a148ca74b41dfc
 DIST atril-1.16.1.tar.xz 1691456 SHA256 c74a5f8c8603fa5952efb4343f055677e4474f1907080be9658d4456d3dc092f SHA512 69128171f13f50079b0b40bfada868967c289b5970e3cda3454f10e7cf723000ab29290c7c9ada67648c370472fd51eeb0a8dbbfa0af05babfc85cb28e3570fe WHIRLPOOL a7b386897c598e473642aa8c3ba2a40211c4389ef3560e574adf04072882887e37a50a7d83ff5fab4c74982908994c926211272d33220fb47a360e05c851a670
+DIST atril-1.18.0.tar.xz 1688144 SHA256 c2284f17f7b683efa22615f00cf2768ea07667981d8304566e49c3d863de80fd SHA512 71e40faebfac08c60c90e7c919d2274976a5f03e6f9c6882fe81d4736152c14b1baf45da770f357030708d103203a4ffc47387c736c4df8737dfc5caf1fd466a WHIRLPOOL 4cef97e4a832a2123ddfc1ddaf2af8d44af9a746676ce356c0d7dcc4fe463a762ab33982fa2045ca9bf461dd79c52b513d6fe263fd153121ff3a6afad1708ecc
diff --git a/app-text/atril/atril-1.18.0.ebuild b/app-text/atril/atril-1.18.0.ebuild
new file mode 100644
index 000000000000..e253873cfbba
--- /dev/null
+++ b/app-text/atril/atril-1.18.0.ebuild
@@ -0,0 +1,89 @@
+# 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="Atril document viewer for MATE"
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="caja dbus debug djvu dvi epub +introspection gnome-keyring +postscript t1lib tiff xps"
+
+REQUIRED_USE="t1lib? ( dvi )"
+
+COMMON_DEPEND=">=app-text/poppler-0.22:0=[cairo]
+	dev-libs/atk:0
+	>=dev-libs/glib-2.36:2
+	>=dev-libs/libxml2-2.5:2
+	sys-libs/zlib:0
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.14:3[introspection?]
+	x11-libs/libICE:0
+	>=x11-libs/libSM-1:0
+	x11-libs/libX11:0
+	>=x11-libs/cairo-1.9.10:0
+	x11-libs/pango:0
+	caja? ( >=mate-base/caja-1.17.1[introspection?] )
+	djvu? ( >=app-text/djvu-3.5.17:0 )
+	dvi? (
+		virtual/tex-base:0
+		t1lib? ( >=media-libs/t1lib-5:5 )
+	)
+	epub? (
+		dev-libs/mathjax
+		>=net-libs/webkit-gtk-2.4.3:4
+	)
+	gnome-keyring? ( >=app-crypt/libsecret-0.5:0 )
+	introspection? ( >=dev-libs/gobject-introspection-0.6:= )
+	postscript? ( >=app-text/libspectre-0.2:0 )
+	tiff? ( >=media-libs/tiff-3.6:0 )
+	xps? ( >=app-text/libgxps-0.2.1:0 )
+	!!app-text/mate-document-viewer"
+
+RDEPEND="${COMMON_DEPEND}"
+
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/rarian:0
+	app-text/yelp-tools:0
+	>=app-text/scrollkeeper-dtd-1:1.0
+	dev-util/gtk-doc
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.50.1:*
+	virtual/pkgconfig:*
+	sys-devel/gettext:*"
+
+# Tests use dogtail which is not available on Gentoo.
+RESTRICT="test"
+
+src_configure() {
+	# Passing --disable-help would drop offline help, that would be inconsistent
+	# with helps of the most of GNOME apps that doesn't require network for that.
+	mate_src_configure \
+		--disable-tests \
+		--enable-comics \
+		--enable-pdf \
+		--enable-pixbuf \
+		--enable-previewer \
+		--enable-thumbnailer \
+		$(use_with gnome-keyring keyring) \
+		$(use_enable caja) \
+		$(use_enable dbus) \
+		$(use_enable debug) \
+		$(use_enable djvu) \
+		$(use_enable dvi) \
+		$(use_enable epub) \
+		$(use_enable introspection) \
+		$(use_enable postscript ps) \
+		$(use_enable t1lib) \
+		$(use_enable tiff) \
+		$(use_enable xps)
+}
diff --git a/dev-libs/libmateweather/Manifest b/dev-libs/libmateweather/Manifest
index ee8ea0a28dec..4f37c0f2a064 100644
--- a/dev-libs/libmateweather/Manifest
+++ b/dev-libs/libmateweather/Manifest
@@ -1,3 +1,4 @@
 DIST libmateweather-1.12.2.tar.xz 3394620 SHA256 9e94acc29b86db0eeb4ba1c0b0d64476a537a8deb31830b98bbeae74e6f2e944 SHA512 057037c6983ba6d21ae8c9af67d5b1bde1f7da81dbc5ef89e5eabc1b844178d2d121d29d90484baa001d22cb24e8dc832bcb1ad2702460d22f48db430fa20fd9 WHIRLPOOL 1c168a94980a42ee8e4f533138a4bdaa7ee2a07d08b5b8ae172402540d7029b893450b5c12732604698cfcd5f536258f7bcab21e99044ce09260bacb5efd8ea6
 DIST libmateweather-1.14.3.tar.xz 3345244 SHA256 21507911543bccdaec57541b030de0d5522ef9640b1ac24044223bb43d026266 SHA512 51e1a29b5faca6d433f6a84fc3e08bf39e87ac48d77ff90085cd7d394b3f31388f7b6b3382e4b75dbdf3b2d07f16e9f9f92bff713d3a038270314313f614af36 WHIRLPOOL d87ce7627e1b0427ad8b2ae0fd997e77ce8caead61f5f930f5b925d0366c7efa27d48ff881dfb670f27de46de6379583fa7ea548ed159b34d541a92cde95e889
 DIST libmateweather-1.16.1.tar.xz 3346620 SHA256 a3569ea5a51ec75eb29aadfba253faf04fbd3815d0a7882ddf6bd6c9c2422b70 SHA512 7cc49cc3fc16a3f06cd50db49f868d8f31a2acc95cf0c6912724248a1b35700ae0600363cd891d5bdf9961d3ae373841a0df412382933084f5e5224ff21aa386 WHIRLPOOL 5269293f740a1c8ef9d30351278514c52569e437ba1d231480b77cf42ae64ec738c22e9336275f5a8908ed86479690d53d6001b420832180b3cc634bfb37b803
+DIST libmateweather-1.18.0.tar.xz 3453408 SHA256 72e205f92bd9aed1a1d82abb17c5e26d447198d8bbdccf969d50c1c7c429b287 SHA512 505ec9b273fe5e4b50f5ea5cc470b3932fdde13e5b1687a3a8ec4dfe247cd56a2339d9265672a7de3bde55fe1410701ee6d5d10c459a7b991c60f4285474050d WHIRLPOOL 26e23fba099f3cdc5cadde6d9820ab0f60375d21ce966876ac99b79c31a92516835aeb89216dab5309deae304f66c5f404877cabd3acbca60a46732fe4ee9a83
diff --git a/dev-libs/libmateweather/libmateweather-1.18.0.ebuild b/dev-libs/libmateweather/libmateweather-1.18.0.ebuild
new file mode 100644
index 000000000000..c18aa299ea65
--- /dev/null
+++ b/dev-libs/libmateweather/libmateweather-1.18.0.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 library to access weather information from online services"
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="debug"
+
+COMMON_DEPEND=">=dev-libs/glib-2.36:2
+	>=dev-libs/libxml2-2.6:2
+	>=net-libs/libsoup-2.34:2.4
+	>=sys-libs/timezone-data-2010k:0
+	x11-libs/gdk-pixbuf:2
+	virtual/libintl:0
+	>=x11-libs/gtk+-3.0:3"
+
+RDEPEND="${COMMON_DEPEND}"
+
+DEPEND="${COMMON_DEPEND}
+	dev-util/gtk-doc
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.50.1:*
+	sys-devel/gettext:*
+	>=sys-devel/libtool-2.2.6:2
+	virtual/pkgconfig:*"
+
+src_configure() {
+	mate_src_configure \
+		--enable-locations-compression \
+		--disable-all-translations-in-one-xml
+}
diff --git a/dev-python/python-caja/Manifest b/dev-python/python-caja/Manifest
index 00db4d4253ef..40a89125a0fe 100644
--- a/dev-python/python-caja/Manifest
+++ b/dev-python/python-caja/Manifest
@@ -1,3 +1,4 @@
 DIST python-caja-1.12.0.tar.xz 265720 SHA256 5418ffcc5c4a33c15348a0f10ded161d26fd1dfb46b3f68b2c6e3d2d1a7ba975 SHA512 fbec1a7f5e560cda2b3bba41dcd93c0484f2b7b7527577a2b2114c84019203df92c136fecbbe6c889785c610035a582f1912ad7da9bb1258ada661b56edf4be7 WHIRLPOOL fdf60f678762480f0a9e5532dad08fddead1f3551b2c74d82889b597389cdf37351f9b82bdcf0420dd0505167cb890a75dda3ae5268ba502717cf020a8b922fd
 DIST python-caja-1.14.0.tar.xz 279432 SHA256 441506e2fd32f77adf1d81dc9748ae27b2123c6a39dc0407932c0f10b11a02ac SHA512 835d9c1df112746fb3ecfe2e661e0c36814f3e2b21c763450354ce9bc0119d055b6773efa64d252ea8a618ec6c36e2d9cbfca698ffa6652cad0b94a499167497 WHIRLPOOL 66df5024c8e47d8973c562a5144dd872adaf02e7ba15ff0c2c4115f33dec1ee5916469d0d28458779800d9543510c557bf629feb8ba9c5360a1ff8f09b811e92
 DIST python-caja-1.16.0.tar.xz 280956 SHA256 14a86d174be0af753c24425469b56432ea3fbc46d954bf06ab679613f15c0ce4 SHA512 ce82fbd6d1127df33153920fbf703f77be2e1dabeb6ba33275fb1b1ba5d8aabc96222cf42280844237f0e182b0eccf764fd8ea33a8de96e844eeb0d5ef0cd5de WHIRLPOOL af036fc96a0a7b9bf322da3c3f1474331cfeaa4ef5d51fbb4eb93a318641ed90c6330487e65b818a3101f4b74db4d9c88308d0ae3336920e23be935864582432
+DIST python-caja-1.18.0.tar.xz 282504 SHA256 45b565de9ec06c05a6f65a49099645f3e82baf588b640c23adb4ab5676474403 SHA512 3836daaa4102da10d2601bc52dd8b8336459172a8ac1275f8d5f945e37cbb41f89e7a1ff737484dd4f5374ca00a0a3c6601fe28a48d7895f8efcaf793695fbcb WHIRLPOOL fbe204dfac8315b3eebe3fa223f26e5f9330e2b83dfcc791c1774d5bf11ab1ef0123dabedeaeeafec747bb6e0b8156878e6c79b18bde33dc47c24cffcad55fce
diff --git a/dev-python/python-caja/python-caja-1.18.0.ebuild b/dev-python/python-caja/python-caja-1.18.0.ebuild
new file mode 100644
index 000000000000..f30cc7c52d15
--- /dev/null
+++ b/dev-python/python-caja/python-caja-1.18.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 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 python-single-r1
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+DESCRIPTION="Python bindings for the Caja file manager"
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="doc"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	dev-libs/glib:2
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	>=mate-base/caja-1.17.1[introspection]
+	x11-libs/gtk+:3"
+
+RDEPEND="${COMMON_DEPEND}"
+
+DEPEND="${COMMON_DEPEND}
+	dev-util/gtk-doc
+	dev-util/gtk-doc-am
+	virtual/pkgconfig:*
+	doc? ( app-text/docbook-xml-dtd:4.1.2 )"
+
+src_install() {
+	mate_src_install
+
+	# Keep the directory for systemwide extensions.
+	keepdir /usr/share/python-caja/extensions/
+
+	# The HTML documentation generation is broken and commented out by upstream.
+	#
+	#if use doc ; then
+	#	insinto /usr/share/gtk-doc/html/nautilus-python # for dev-util/devhelp
+	#	doins -r docs/html/*
+	#fi
+}
diff --git a/dev-vcs/git-lfs/Manifest b/dev-vcs/git-lfs/Manifest
index 74ded4736cbd..8ed7acc5fcb2 100644
--- a/dev-vcs/git-lfs/Manifest
+++ b/dev-vcs/git-lfs/Manifest
@@ -1,4 +1,3 @@
 DIST git-lfs-1.5.6.tar.gz 604139 SHA256 4efbc806cde1ea6ab4e1d61db3e1f6939796fd53bf6e9c94ac564610147ea5cd SHA512 f5f2da9ac44647335b25cad3104027cf5476e25ef9763019744123f9e1ef81edadbf5b08a146b8070487b32a18aa202c799f910aee6f2f0144ca411ad6d7cfd2 WHIRLPOOL 2f785abffc917a322fe59f4354980d5f565572620569b9b53e85ecdf84b5d7ad407ced8853c897814daa816cac6efd1f85c9098cae9fe48b179cd3381c5f840d
 DIST git-lfs-2.0.2.tar.gz 633786 SHA256 e266bdffa53e947ba1d0bf8944d73029384bad2ed05af92bc10918d07eec6b63 SHA512 af5d82234b4136e8d5637c93f7786b56ef552ff30bff01c444ac6fa9685785225148f7a8714c108691195a6f720a7c22f3bcaccaed080cffecf011d8480781ed WHIRLPOOL e7706e7fe949c5d65b2acb34c73e9c1605d0cbe2c607baee93f3c6c67b183f8eb70be2abca3b3c549a26947aef32ddb65742aca33614b519611acdb6dae74f0c
-DIST git-lfs-2.1.0.tar.gz 645947 SHA256 638e079aab661a8e4d886fd9d4ea728c5e4efcbf657ad4f5497ba39b91e91c08 SHA512 8674d850d4d03ddbea9088fc79dd0956273ed0a76626500344c0c48d5729c2d6bab3e22d298361726a5b87232a9365eb7ca7c910cc0b782117b315dbc7488348 WHIRLPOOL 312258dd0a39a482d2a423128ca81d80c3797c29e2eb855aa6c20c5bfec07b39b0a2f728be72049eab1b9a2edc72ad8bb9393e450754b24cbfc8d8b8bfcc15a3
 DIST git-lfs-2.1.1.tar.gz 649611 SHA256 655c1e9bf931afb958c2b81de5c1c38b3ebd6831a04ca5fdcf58cba05e2948d8 SHA512 9061cb9fdf93a0c119d5762ceebdbc0573491dedb1815512e7eae9da54574087c1e499ea97ba0a87d7356499314beb53d60d1800b5c85983ef835dae37e7dd84 WHIRLPOOL 0cfbb0912314ca1afbb426b73521c136d35d2da37ee71cc5a952b17ed0bc92b7706483923f2a701f0bfef1407c34b3f4f5f85f97a655efb7f4d3caf615a0c380
diff --git a/dev-vcs/git-lfs/git-lfs-2.1.0.ebuild b/dev-vcs/git-lfs/git-lfs-2.1.0.ebuild
deleted file mode 100644
index 7a32ca36cc92..000000000000
--- a/dev-vcs/git-lfs/git-lfs-2.1.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="github.com/git-lfs/${PN}"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit golang-vcs
-else
-	SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-	inherit golang-vcs-snapshot
-fi
-
-DESCRIPTION="command line extension and specification for managing large files with Git"
-HOMEPAGE="https://git-lfs.github.com/"
-
-LICENSE="MIT BSD BSD-2 BSD-4 Apache-2.0"
-SLOT="0"
-IUSE="+doc"
-
-# since version 2.0.2 git-lfs uses time.Until that was introduced in golang >=1.8
-# https://github.com/golang/go/commit/67ea710792eabdae1182e2bf4845f512136cccce
-DEPEND=">=dev-lang/go-1.8.1:=
-	doc? ( app-text/ronn )"
-
-RDEPEND="dev-vcs/git"
-
-S="${WORKDIR}/${P}/src/${EGO_PN}"
-
-src_compile() {
-	# can't use golang-build_src_compile for go generate
-	# and others steps executed by build.go
-	GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" \
-	go run script/*.go -cmd build || die "build failed"
-
-	if use doc; then
-		ronn docs/man/*.ronn || die "man building failed"
-	fi
-}
-
-src_install() {
-	dobin bin/git-lfs
-
-	use doc && doman docs/man/*.1
-}
diff --git a/mate-base/caja/Manifest b/mate-base/caja/Manifest
index 7b02b995ea1d..edebcede649a 100644
--- a/mate-base/caja/Manifest
+++ b/mate-base/caja/Manifest
@@ -1,3 +1,4 @@
 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
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/libmatekbd/Manifest b/mate-base/libmatekbd/Manifest
index 7c6a88af12e6..5e310fcdadd2 100644
--- a/mate-base/libmatekbd/Manifest
+++ b/mate-base/libmatekbd/Manifest
@@ -1,3 +1,4 @@
 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
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/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/Manifest b/mate-base/mate-applets/Manifest
index f949587c7fc4..dc7d28c48a2e 100644
--- a/mate-base/mate-applets/Manifest
+++ b/mate-base/mate-applets/Manifest
@@ -1,3 +1,4 @@
 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
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-common/Manifest b/mate-base/mate-common/Manifest
index 981a8ab595e7..0446489a485d 100644
--- a/mate-base/mate-common/Manifest
+++ b/mate-base/mate-common/Manifest
@@ -1,3 +1,4 @@
 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
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-control-center/Manifest b/mate-base/mate-control-center/Manifest
index b931ea637a46..7a555043a423 100644
--- a/mate-base/mate-control-center/Manifest
+++ b/mate-base/mate-control-center/Manifest
@@ -1,3 +1,4 @@
 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
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-desktop/Manifest b/mate-base/mate-desktop/Manifest
index d27dc1fb967e..79b6bf2bd5c3 100644
--- a/mate-base/mate-desktop/Manifest
+++ b/mate-base/mate-desktop/Manifest
@@ -1,3 +1,4 @@
 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
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-menus/Manifest b/mate-base/mate-menus/Manifest
index d8e0479a681b..3d0408ce7b4b 100644
--- a/mate-base/mate-menus/Manifest
+++ b/mate-base/mate-menus/Manifest
@@ -1,3 +1,4 @@
 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
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-panel/Manifest b/mate-base/mate-panel/Manifest
index 727b8fcb2d2c..9c4fe50950f5 100644
--- a/mate-base/mate-panel/Manifest
+++ b/mate-base/mate-panel/Manifest
@@ -1,3 +1,4 @@
 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
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-session-manager/Manifest b/mate-base/mate-session-manager/Manifest
index fcf8650d8c84..a69279682ea2 100644
--- a/mate-base/mate-session-manager/Manifest
+++ b/mate-base/mate-session-manager/Manifest
@@ -1,3 +1,4 @@
 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
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-settings-daemon/Manifest b/mate-base/mate-settings-daemon/Manifest
index f5d3d0b36b57..32150463a8b1 100644
--- a/mate-base/mate-settings-daemon/Manifest
+++ b/mate-base/mate-settings-daemon/Manifest
@@ -1,3 +1,4 @@
 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
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/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-extra/caja-dropbox/Manifest b/mate-extra/caja-dropbox/Manifest
index 3003532823c0..2b5bb0f958fe 100644
--- a/mate-extra/caja-dropbox/Manifest
+++ b/mate-extra/caja-dropbox/Manifest
@@ -1,3 +1,4 @@
 DIST caja-dropbox-1.12.0.tar.xz 311488 SHA256 027f16529e9fd9139a4fc721aa6971f6ac91f7cf74a7bd22d8a3f2b7315bf247 SHA512 32d8fcd2d2aa4a03a976c7848cd628e240558b802247ad6a36242ea95628aa97088aa55ae6d9c889616910e5fc36e2db6753c4f8854d6f9e626c990469d71223 WHIRLPOOL 6e78e8f216a475ba8594db40ca8bb348276cb47d498993ac01d2a3f5283e90affc2f89c1e5f717874741f09475f84c87aed852d5c82199b8ccf25102f8e85495
 DIST caja-dropbox-1.14.0.tar.xz 310964 SHA256 780c7a734dff297b7c832affa01f223b88e8f61862f18d0563f934bb3d7eba87 SHA512 e13012bff812d43eb5ddd9ca8a73907bf9aa2d46bd8947f58695b32fe590a4ecd6bea2ac0d30330c8bd1fa8c652681beb964e7bd658525e99cda73e36a207a50 WHIRLPOOL 3dd0d73a2faf9d5c8c0a22439b3f47e48ded755408bb7ed39ddce593a2bc3b04884ef19aaa03467b49276eb5f2c6c01e1a4a2cc4d93efc375bd920492c95b8a5
 DIST caja-dropbox-1.16.0.tar.xz 311144 SHA256 9c726a4af41c2c2e9231a495eb5423acc4627c02aa66d0662f64345be872cbb1 SHA512 ba8ec3952be08d520b10f55c3ff5dbfd38a062dcf3c4fa4569e8d68823f8fbebed596e963e5bf7d59161fea138dbc27b299f66e1d0f6064da54499c4023ac1ad WHIRLPOOL d2a54eb6cb0d555b5ed23f2677bd58201b5459531e926280479c7f580d3b5184f1e9a0d00b8d3800cf648068c9d79c952166a4573fccfcf7c04d5359096c907a
+DIST caja-dropbox-1.18.0.tar.xz 323116 SHA256 af88597b7da5815f7debe33c1bb95098a21abe4a7057e9834546752597428da3 SHA512 0e240f8f6ef17ad3b6bbe21bede6d911b0ef89d8fd5a9faba6b96bc74f06472dcedf68caa94c6fbfb2c05c10c82e1f025b4022657cacc5b80d55ee41999be560 WHIRLPOOL fc636c5383b2e787c1cfbb4031044128fe1fe038549528dcdf55b08705eaf5380b5ce36bac0ccaa9fb4790f3e338c7902b082467a6d6f40db566fa9cf0ea897b
diff --git a/mate-extra/caja-dropbox/caja-dropbox-1.18.0.ebuild b/mate-extra/caja-dropbox/caja-dropbox-1.18.0.ebuild
new file mode 100644
index 000000000000..b02406cc40c5
--- /dev/null
+++ b/mate-extra/caja-dropbox/caja-dropbox-1.18.0.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+MATE_LA_PUNT="yes"
+
+inherit mate python-single-r1 linux-info user
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Store, Sync and Share Files Online"
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="debug"
+
+COMMON_DEPEND="
+	dev-libs/atk:0
+	>=dev-libs/glib-2.36:2
+	dev-python/pygtk:2[${PYTHON_USEDEP}]
+	dev-python/pygobject:2[${PYTHON_USEDEP}]
+	>=mate-base/caja-1.17.1
+	media-libs/fontconfig:1.0
+	media-libs/freetype:2
+	x11-libs/cairo:0
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:2
+	x11-libs/libXinerama:0
+	x11-libs/pango:0"
+
+RDEPEND="${COMMON_DEPEND}
+	net-misc/dropbox:0"
+
+DEPEND="${COMMON_DEPEND}
+	dev-python/docutils:0
+	virtual/pkgconfig:*"
+
+CONFIG_CHECK="~INOTIFY_USER"
+
+pkg_setup () {
+	python-single-r1_pkg_setup
+	check_extra_config
+	enewgroup dropbox
+}
+
+MATE_FORCE_AUTORECONF=true
+
+src_prepare() {
+	# Use system dropbox.
+	sed -e "s|~/[.]dropbox-dist|/opt/dropbox|" \
+		-e 's|\(DROPBOXD_PATH = \).*|\1"/opt/dropbox/dropboxd"|' \
+			-i caja-dropbox.in || die
+
+	# Use system rst2man.
+	epatch "${FILESDIR}"/${PN}-1.8.0-system-rst2man.patch
+
+	mate_src_prepare
+}
+
+src_configure() {
+	mate_src_configure \
+		--disable-static \
+		$(use_enable debug)
+}
+
+src_install () {
+	python_fix_shebang caja-dropbox.in
+
+	mate_src_install
+
+	local extensiondir="$(pkg-config --variable=extensiondir libcaja-extension)"
+	[ -z ${extensiondir} ] && die "pkg-config unable to get caja extensions dir"
+
+	# Strip $EPREFIX from $extensiondir as fowners/fperms act on $ED not $D.
+	extensiondir="${extensiondir#${EPREFIX}}"
+	use prefix || fowners root:dropbox "${extensiondir}"/libcaja-dropbox.so
+	fperms o-rwx "${extensiondir}"/libcaja-dropbox.so
+}
+
+pkg_postinst () {
+	mate_pkg_postinst
+
+	elog
+	elog "Add any users who wish to have access to the dropbox caja"
+	elog "plugin to the group 'dropbox'. You need to setup a drobox account"
+	elog "before using this plugin. Visit ${HOMEPAGE} for more information."
+	elog
+}
diff --git a/mate-extra/caja-extensions/Manifest b/mate-extra/caja-extensions/Manifest
index 30be89c55b39..35d0ffa6be51 100644
--- a/mate-extra/caja-extensions/Manifest
+++ b/mate-extra/caja-extensions/Manifest
@@ -1,3 +1,4 @@
 DIST caja-extensions-1.12.0.tar.xz 370600 SHA256 efb76a8bcb9dd0d1fb47682e4cb018645e243d73ba9a6ebc3d06332e02c7fb36 SHA512 b36f759f21a206d76dada61f9410135c393fea77eaaf387a81788c6c2757aed5536b8129add2b4469b8d18f17de115369d70ec9278e8a4b9b9a3cfbb24ac38fb WHIRLPOOL eac4aabd023e6917c6f7fa13b8760641f05e1d1db554178345aa134c7bc45613ce372fac213ee779ffd1265e1cac4ab49b95252364ed1623dc599f849b6b7fcf
 DIST caja-extensions-1.14.1.tar.xz 400108 SHA256 c76e73a6e79678bc8049a4b069ec0f52dae5266b62f911c23e98f9c529b5b2e2 SHA512 622ab7a2175c2eb4ea5153887fb500f7c63e7aea8bcea19d43e891013bceab5bb5e8f1d83eedf7ff167737185a22327e6a085e3c84bce40955d97938fff73527 WHIRLPOOL d2ffe0c88e062e660088e39aa6e50ee0520e5e1d9533f4ec21e6ba268f11f26048008ded6d60c5e6762301fb522e5586db54e4984be1a70224fd4c6d843c8dcf
 DIST caja-extensions-1.16.0.tar.xz 402208 SHA256 7c6c2e414c391f8f2879dd9578e49f1c146eedf306c2ad7789c81032a9f28171 SHA512 7f856ec1b087b605b7cb455a7ed5742d44eb79cc6dcd869a680d4a4e2466c795dbb96f556476959d12bea7670e63a2b460d35a6e19f197ef2350c59e157c475c WHIRLPOOL bb3ecfc5c289ea86e5ecb23421225bc6d4419943452816b34ffd6507083736f39ae8c1b9023f0240730523e8aa3ff701999fad8c990ff360ecaadef1bc72ccbe
+DIST caja-extensions-1.18.1.tar.xz 409948 SHA256 bcb2f355c883bdca06a28028ca9a832d84e693257a60ea24304abbf98fa2ea41 SHA512 177f8c1f95892945678e7717c13436a79e2021a940db166cbafb9c2a78a1f1c671ae79c9dbf96f51f94fdadeff13a0c4995f6c2cbbd2c304566549e862d2ccae WHIRLPOOL 13ee5f463418d605ff4ef9374a977668ceb92c85532d6a9f2f7a9c459e3a1663bf2998987364d48d4aa719f8c0bd25210db84f30107d96a88a3bde5c89cfd9af
diff --git a/mate-extra/caja-extensions/caja-extensions-1.18.1.ebuild b/mate-extra/caja-extensions/caja-extensions-1.18.1.ebuild
new file mode 100644
index 000000000000..e589dd08e5fc
--- /dev/null
+++ b/mate-extra/caja-extensions/caja-extensions-1.18.1.ebuild
@@ -0,0 +1,75 @@
+# 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="Several Caja extensions"
+LICENSE="GPL-2"
+SLOT="0"
+
+SENDTO="cdr gajim +mail pidgin upnp"
+IUSE="gksu image-converter +open-terminal share +wallpaper xattr ${SENDTO}"
+
+COMMON_DEPEND=">=dev-libs/glib-2.36:2
+	>=mate-base/caja-1.17.1
+	virtual/libintl:0
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.14:3
+	gajim? (
+		>=dev-libs/dbus-glib-0.60:0
+		>=sys-apps/dbus-1:0
+	)
+	open-terminal? ( >=mate-base/mate-desktop-1.17.0 )
+	pidgin? ( >=dev-libs/dbus-glib-0.60:0 )
+	upnp? ( >=net-libs/gupnp-0.13:0= )
+	xattr? ( sys-apps/attr )"
+
+RDEPEND="${COMMON_DEPEND}
+	cdr? ( >=app-cdr/brasero-2.32.1:0= )
+	gajim? ( net-im/gajim:0 )
+	gksu? ( x11-libs/gksu )
+	image-converter? (
+		|| (
+			media-gfx/imagemagick
+			media-gfx/graphicsmagick[imagemagick]
+		)
+	)
+	pidgin? ( net-im/pidgin )"
+
+DEPEND="${COMMON_DEPEND}
+	dev-util/gtk-doc
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.18:*
+	sys-devel/gettext:*
+	virtual/pkgconfig:*
+	!!mate-extra/mate-file-manager-open-terminal
+	!!mate-extra/mate-file-manager-sendto
+	!!mate-extra/mate-file-manager-image-converter
+	!!mate-extra/mate-file-manager-share"
+
+src_configure() {
+	local sendto_plugins="removable-devices"
+	use cdr && sendto_plugins+=",caja-burn"
+	use mail && sendto_plugins+=",emailclient"
+	use pidgin && sendto_plugins+=",pidgin"
+	use gajim && sendto_plugins+=",gajim"
+	use upnp && sendto_plugins+=",upnp"
+
+	mate_src_configure \
+		--enable-sendto \
+		--with-sendto-plugins=${sendto_plugins}\
+		$(use_enable gksu) \
+		$(use_enable image-converter) \
+		$(use_enable open-terminal) \
+		$(use_enable share) \
+		$(use_enable wallpaper) \
+		$(use_enable xattr xattr-tags)
+}
diff --git a/mate-extra/mate-calc/Manifest b/mate-extra/mate-calc/Manifest
new file mode 100644
index 000000000000..299b815c71e0
--- /dev/null
+++ b/mate-extra/mate-calc/Manifest
@@ -0,0 +1 @@
+DIST mate-calc-1.18.0.tar.xz 751780 SHA256 9e02ea711000378d25274e532dd161f09172d1dcefdb3aa4b1ab7a2bfa34da61 SHA512 b34e8ba52599a56bf0286dd6c3d0cd460ea80732baaf48217d7abbca6166eaf16eb6bd9aba6fab6fbbf0c51937275f703568e114adb899b6e927a70f42f0949b WHIRLPOOL 3a4ab14186387d6b264f7c0748ed08c2357ea52e39a04abcf6e045deac0ec05c44d2e17909ede76a813b703524436c9754a3be90773c786fe403078c76d71072
diff --git a/mate-extra/mate-calc/mate-calc-1.18.0.ebuild b/mate-extra/mate-calc/mate-calc-1.18.0.ebuild
new file mode 100644
index 000000000000..c97886357fa4
--- /dev/null
+++ b/mate-extra/mate-calc/mate-calc-1.18.0.ebuild
@@ -0,0 +1,31 @@
+# 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="Calculator for MATE"
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE=""
+
+COMMON_DEPEND="
+	dev-libs/atk:0
+	>=dev-libs/glib-2.36:2
+	dev-libs/libxml2:2
+	>=x11-libs/gtk+-3.14:3
+	x11-libs/pango:0"
+
+RDEPEND="${COMMON_DEPEND}"
+
+DEPEND="${COMMON_DEPEND}
+	app-text/yelp-tools:0
+	>=dev-util/intltool-0.35.0:*
+	sys-devel/gettext:*
+	virtual/pkgconfig:*"
diff --git a/mate-extra/mate-calc/metadata.xml b/mate-extra/mate-calc/metadata.xml
new file mode 100644
index 000000000000..9bb28751aac2
--- /dev/null
+++ b/mate-extra/mate-calc/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>
+    <longdescription>
+        MATE Calculator is a fork of gnome-calc, the calculator application that was previously in the OpenWindows Deskset of the Solaris 8 operating system.
+    </longdescription>
+    <upstream>
+        <remote-id type="github">mate-desktop/mate-calc</remote-id>
+    </upstream>
+</pkgmetadata>
diff --git a/mate-extra/mate-indicator-applet/Manifest b/mate-extra/mate-indicator-applet/Manifest
index 7b05886394aa..89603c010cd5 100644
--- a/mate-extra/mate-indicator-applet/Manifest
+++ b/mate-extra/mate-indicator-applet/Manifest
@@ -1,3 +1,4 @@
 DIST mate-indicator-applet-1.12.1.tar.xz 317984 SHA256 4a55e539f129a23e3471b7f25f8dbbd92ea7330c0e90c26e42396db17713b40e SHA512 446ce32e8db22b153c7786292749645715e43c134e7fa00f81b7782a48163745307d396dbdd7765a63ec9514bec2f032f681028c55264e0fcf879c5e26fc9433 WHIRLPOOL e4fdcee746c5409ee751d573e8aae8b56dbb20f8c875d2d4102f459fb569e539ae79480f09bf5cd6e534d1e154f08913cb99b6d7993fc33a59a14a60273a4a44
 DIST mate-indicator-applet-1.14.1.tar.xz 315480 SHA256 78ec8cc717ce8e7e2cad5a4f408f8d2f227bbf7826e1c7732853d71f648b7896 SHA512 868f85546780d52aaadaa63ec14a8e92e673396653cebf7c5a9d0de459fc62d346fb10836298bf604eb50c63e5390cedd08576fb8903aeabdf2e2c4de5fc638f WHIRLPOOL 7a10da818fd3e9587d314a27bbf35fd1e034c01f1e069b668201cff09d38b18aa7a9755efa0419152df8bdd07827100692126abfceabd0cc566bc95d356e4720
 DIST mate-indicator-applet-1.16.0.tar.xz 317256 SHA256 5b60ecd36109d2e036b7706fde3c642be3fb157e3189af07017e08b70e55cf21 SHA512 745f10ed20a453b02427982f59c81e85cdf80736aad62c4e149802c4df3646dfcd1dc822476f4d9cbd2f28c48e78c2e9a7e79652c8ba579a3e0bf9f16427b1a2 WHIRLPOOL 97fd3bcf37e72473fb9e4f81084cb693aa37db5a9bc437191a4c9985d9dd674bb35883208098c6e68a94dda08c687dea352073a701e364557b9d1e3631e57f14
+DIST mate-indicator-applet-1.18.0.tar.xz 329792 SHA256 4fe04328f2d86a1f0817e320a0fb841f7eb5839d0ae5131b44a8413d49489829 SHA512 5c7690c00e165c72290dfada899a188c3fc72ed2d9c19c0168aba6d2ea3fb40f1f7f152eddfb2160cf16aea01247245b91e84c88f7b8a6e76778c6144864aec8 WHIRLPOOL 03f080209ce0381320bb73c8512512935ecfc3f163770750063b9f9b54151b6d1b5182fb002c3dded2cdeb8c4c8feb961209314f1113e8029206853ac3f3e551
diff --git a/mate-extra/mate-indicator-applet/mate-indicator-applet-1.18.0.ebuild b/mate-extra/mate-indicator-applet/mate-indicator-applet-1.18.0.ebuild
new file mode 100644
index 000000000000..0540e493e3cb
--- /dev/null
+++ b/mate-extra/mate-indicator-applet/mate-indicator-applet-1.18.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit mate versionator
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+DESCRIPTION="MATE indicator applet"
+LICENSE="GPL-2 FDL-1.1 LGPL-2"
+SLOT="0"
+
+IUSE=""
+
+COMMON_DEPEND="
+	>=dev-libs/libindicator-0.4:3
+	>=mate-base/mate-panel-1.17.0
+	>=x11-libs/gtk+-3.14:3"
+
+RDEPEND="${COMMON_DEPEND}"
+
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/intltool-0.35.0
+	virtual/pkgconfig"
diff --git a/mate-extra/mate-media/Manifest b/mate-extra/mate-media/Manifest
index 846d6ebc424a..7bb042fa5b28 100644
--- a/mate-extra/mate-media/Manifest
+++ b/mate-extra/mate-media/Manifest
@@ -1,3 +1,4 @@
 DIST mate-media-1.12.1.tar.xz 507976 SHA256 c6d19a5d88e031156bcc0bc156c3eeaf4becb9953bb75b6f88e419154f393efc SHA512 04dd05b62ea0fdfcd82321a77fa74d014c11e1a8434b445e42660c55f3158775341b36fe56f402940cef297b906b55fafd6d8eac3cd48ab5e34371b95c01d330 WHIRLPOOL aea32fe1d8f00071231090ee394732a8956f4647a651556b62785d7fb76c1748587ae5034bd2910126f6b93e0eff52745ac81ed47145ac588f7e455b21cc408b
 DIST mate-media-1.14.1.tar.xz 490472 SHA256 d7f55665bf919eb0cbc7583aa99d0c8a76ced4ef5ecb3cb29389dbc47c02c587 SHA512 dde83a93fbedca74c0f719a0a6b344785d6f83941bc0b4b6583d52aff4b9e514bbbc4e576993a573a7aab56e01222eba09ce64b4acea8b35799cfb4b85e6d6da WHIRLPOOL 7b1f7d1b976c1c93b2c35053ceda9b356de841ccf33af96b47e3e4a2f94a72b7e96c4002bc1752ed0fff54c47b985e892b1860e83c15c61f6a3e9746ed9cec19
 DIST mate-media-1.16.0.tar.xz 491576 SHA256 87a6aab1635cdf0890b4f99b733eb786144c90730a96d04c41e05ea781cd0a20 SHA512 d5ad7097b100e3736cc7e7c651e40195b068b1db79b563035853e7f7fde439e830b750564cbc52b20828ee4a2d8091304897c5044a5bcb1774124626b000d965 WHIRLPOOL af98a53eb0f5259f42fe48cafe91169185820024008702c16af77d05118d43898227fc60bab244742e8a3ea4ce10b6028ef27332a281daed747bc5167dd9daaf
+DIST mate-media-1.18.0.tar.xz 492648 SHA256 94d26b96199a3b30e2050596d17e0125f86edf9ef009d4eb318308896f54296c SHA512 c79e9fb5ae3c33e237c7ac4550f15ccc1f6bdf6ea316a8ed35e21989cf6393e600e966380d6f0bf7d66f7dfe72307404ed85d590b996af409b54fda73a14a466 WHIRLPOOL 1c39d48721f11a4068a95a47051857d68955e66c21d4e9be3e4295ab1ff55b88b46e3b7b8238caedf6b07a6146dfa6bb3ae722a976e45c8f31568ae81e24df54
diff --git a/mate-extra/mate-media/mate-media-1.18.0.ebuild b/mate-extra/mate-media/mate-media-1.18.0.ebuild
new file mode 100644
index 000000000000..a46080b0dd08
--- /dev/null
+++ b/mate-extra/mate-media/mate-media-1.18.0.ebuild
@@ -0,0 +1,35 @@
+# 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="Multimedia related programs for the MATE desktop"
+LICENSE="LGPL-2 GPL-2 FDL-1.1"
+SLOT="0"
+
+IUSE=""
+
+COMMON_DEPEND=">=dev-libs/glib-2.36.0:2
+	dev-libs/libxml2:2
+	>=mate-base/mate-panel-1.17.0
+	>=mate-base/mate-desktop-1.17.0
+	>=media-libs/libcanberra-0.13:0[gtk3]
+	>=media-libs/libmatemixer-1.10.0
+	x11-libs/cairo:0
+	>=x11-libs/gtk+-3.14:3
+	x11-libs/pango:0
+	virtual/libintl:0"
+
+RDEPEND="${COMMON_DEPEND}"
+
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/intltool-0.35.0:*
+	sys-devel/gettext:*
+	virtual/pkgconfig:*
+	!!<mate-base/mate-applets-1.8:*"
diff --git a/mate-extra/mate-netbook/Manifest b/mate-extra/mate-netbook/Manifest
index 69a66555722d..e6e7273eabde 100644
--- a/mate-extra/mate-netbook/Manifest
+++ b/mate-extra/mate-netbook/Manifest
@@ -1,3 +1,4 @@
 DIST mate-netbook-1.12.0.tar.xz 268632 SHA256 96f65b971b03932fc10060a8f8745c29bcd2db48fb5b4b396048f0cbcf87d7d3 SHA512 3f46e537b48833fe3bd599dcaa6af89a265dacac4fc077d46ca87b5a35c2368810824747411d263541e2685e2700311996f8741aa9321122d6d306c1ad8fc15b WHIRLPOOL 4eb462cd69ca82752ecee3da3b8d57e27c4518ae05f1b1c441872e5b3a6b8e7d360b894f0cff2293ceb04c8369ee69e949c9955b61b6dede661ba133bad9e0af
 DIST mate-netbook-1.14.0.tar.xz 284248 SHA256 4236ed28f2aa33b9ec4be2c9bd72410b908eefba5674280273b252354b4ce0c0 SHA512 aa5d5ed1a8c31df4b7e84cad8efaaf326f7bf2a9a392b34b053c30287404949ddd5f27d438d028bc569cbedc177dc1236af32e869b0418677021e7a6ef17dfe1 WHIRLPOOL c1ac9862ddba339de5409d0175d712cc8fe7049da1a08ddf9b281fed19e3769b97d48c4fc2f85c07671f2d03a824f944f927b9c24a72d8046ec82f2a6397fbe7
 DIST mate-netbook-1.16.1.tar.xz 287092 SHA256 911f0a92c190bd377a29458ce3a70ad2e47fbae145509c2cb42ef02ae4ffea76 SHA512 9f79ed82210254b11be0ccbabed3089e82070056d3d096c16dd0c092a3cc4621fd8449d38b2db5781a460ed9f6b6974d9ee59b8c40b554bbb13eae282cb8a74d WHIRLPOOL 1c678cbc459744c5e0857595cc5af2c0ff9de8c37fa0c0ffa7b4f82d181f604e89980d07d5966fadd255d6bffdfac8afa4a07dd29bc2c7a62b398b36a065eff2
+DIST mate-netbook-1.18.0.tar.xz 300904 SHA256 ca441a20b6afc340340520d45cfd84f36ecde2c665c4c0e178fc710e38cbe293 SHA512 4004b62ed0b2e0c578bb01ff39483e69e80e294ffb131e433c4ba41cd4462da122362dd98c37a6bd734a38fabc526429c0b8694c7f1edf440ff7a4d841aad419 WHIRLPOOL 4c265f9270e073a6620c5ca78aae705e68bf9563861daeb0be64e1c41a55bdfd54bf85aa34eeda259a42bf2c122d646ef082ee6d1526902b16972e031a5cbcd4
diff --git a/mate-extra/mate-netbook/mate-netbook-1.18.0.ebuild b/mate-extra/mate-netbook/mate-netbook-1.18.0.ebuild
new file mode 100644
index 000000000000..e5d0ce6a7aa4
--- /dev/null
+++ b/mate-extra/mate-netbook/mate-netbook-1.18.0.ebuild
@@ -0,0 +1,35 @@
+# 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 utilities for netbooks"
+LICENSE="GPL-3"
+SLOT="0"
+
+IUSE=""
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.36:2
+	>=mate-base/mate-panel-1.17.0
+	>=x11-libs/gtk+-3.14:3
+	x11-libs/libfakekey:0
+	x11-libs/libwnck:3
+	x11-libs/libXtst:0
+	x11-libs/libX11:0
+	x11-libs/cairo:0
+	virtual/libintl:0"
+
+RDEPEND="${COMMON_DEPEND}"
+
+DEPEND="${COMMON_DEPEND}
+	x11-proto/xproto:0
+	>=dev-util/intltool-0.50.1:*
+	sys-devel/gettext:*
+	virtual/pkgconfig:*"
diff --git a/mate-extra/mate-polkit/Manifest b/mate-extra/mate-polkit/Manifest
index 93a58402ef5a..49c91ef38ce5 100644
--- a/mate-extra/mate-polkit/Manifest
+++ b/mate-extra/mate-polkit/Manifest
@@ -1,3 +1,4 @@
 DIST mate-polkit-1.12.0.tar.xz 324708 SHA256 c38f0a0c3d4e10fc95d27fa4e8d47eb6948e8c9279a82f316f563666571bf8b9 SHA512 b6e771062e29d2f4f2823638e39f5e5b349b98fcf8fd8d652d847d568eee919d37956089d7bef1463d96f801f852d10d9423bb8c20f8a54dfe8188d19ab6fb0c WHIRLPOOL bc35601f824af52ac1162aeb3342789e8fbb4f6a09b5352fffd5db87d9c02f6ddba326002a13533531c772234994c845dfbe1473563bec1c442606688b6909f4
 DIST mate-polkit-1.14.0.tar.xz 339872 SHA256 929d5710d6284f924dc65824b75e9da23b5809c50033da18b6b4b79e0f599ddd SHA512 f3507380152798af192e3338b5f056b1105fd297e935f098803c21450b04b6d149bc22106f34129a6394655be2e6505c91ad1433e817c68274a1243cc862bcdf WHIRLPOOL 034f05c91c5f79f1c77b073ff8f310e0264541e9783d98dabdc0dda5b0bc36da83ad4468563d9ecb6bdd389065b1b5d828deba02c15a94867124c6687ff54098
 DIST mate-polkit-1.16.0.tar.xz 340500 SHA256 e0aba1f4be2fef30a74509aef92c5773ee17c2279f158a7295415f700713457c SHA512 9b2a1870fdbe828b39ced7b24e1096edb559dcd553bac3fb15a6ab8d5dbc442870916f5105550a0e14cf3e85ac06c798d7daf0b464a182ba686bb3eb1bac1cb4 WHIRLPOOL feab6da57d80707f12dc42d3acd75dff58e1c61023d726579929b5b1901edc35629d68265ff369f020ca18e0be64a238d8d6acace2437a66df8dfefd3f201873
+DIST mate-polkit-1.18.1.tar.xz 346904 SHA256 ec011e845184bb766684811b6befaef3797f12895cf21807d71f3de92d146e97 SHA512 086723b0b0c14a6b1ea77e1f0a294546ef3e44d42a460e424b22c92e8f962bf55c9c379600fb6642be60167ef07f07835c2eb939232941051aa397af805e79fa WHIRLPOOL 7c3ab89de18de65172ad9c683026e8c2d8bddedaed9cf053a8c0774285e0156f71d6e2c75b698da296ab3978f66001f495e54ba44efb5fa0e59da0cf118955ae
diff --git a/mate-extra/mate-polkit/mate-polkit-1.18.1.ebuild b/mate-extra/mate-polkit/mate-polkit-1.18.1.ebuild
new file mode 100644
index 000000000000..1f0aa4fde187
--- /dev/null
+++ b/mate-extra/mate-polkit/mate-polkit-1.18.1.ebuild
@@ -0,0 +1,46 @@
+# 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="A MATE specific DBUS service that is used to bring up authentication dialogs"
+LICENSE="LGPL-2"
+SLOT="0"
+
+IUSE="accountsservice appindicator debug examples +introspection"
+
+COMMON_DEPEND=">=dev-libs/glib-2.36:2
+	>=sys-auth/polkit-0.102:0[introspection?]
+	x11-libs/gdk-pixbuf:2[introspection?]
+	virtual/libintl:0
+	>=x11-libs/gtk+-3.14.0:3[introspection?]
+	appindicator? ( dev-libs/libappindicator:3 )
+	introspection? ( >=dev-libs/gobject-introspection-0.6.2:= )"
+
+RDEPEND="${COMMON_DEPEND}
+	accountsservice? ( sys-apps/accountsservice:0[introspection?] )"
+
+DEPEND="${COMMON_DEPEND}
+	dev-util/gtk-doc
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.35:*
+	sys-devel/gettext:*
+	>=sys-devel/libtool-2.2.6
+	virtual/pkgconfig:*
+	!<gnome-extra/polkit-gnome-0.102:0"
+
+src_configure() {
+	mate_src_configure \
+		--disable-static \
+		$(use_enable accountsservice) \
+		$(use_enable appindicator) \
+		$(use_enable debug) \
+		$(use_enable examples) \
+		$(use_enable introspection)
+}
diff --git a/mate-extra/mate-power-manager/Manifest b/mate-extra/mate-power-manager/Manifest
index cc9a484d0a72..3bfaa1d3bb3b 100644
--- a/mate-extra/mate-power-manager/Manifest
+++ b/mate-extra/mate-power-manager/Manifest
@@ -1,3 +1,4 @@
 DIST mate-power-manager-1.12.1.tar.xz 3197824 SHA256 c43aa2ae75335a758d71cdab4b939141c352a7fb179c3e41a064ce9c007b587f SHA512 60da8ab6988a4bbef363fcf4571260bc7f70ed90badf85e4233e6ed80cfc13446319bd8686ed6d4bf9752971a6f98021a5d0354e3aa7f9274b6fdbc8f9f920b4 WHIRLPOOL de61b88835ffc9bc5f861dcc1c05726f331735ae430a71ce126fcb3553ea307e5d9163c226c16a39d1781d60d67b46d0d39c255c4a620782346e4d39e051639a
 DIST mate-power-manager-1.14.0.tar.xz 3221144 SHA256 2306f7210298dba705277b748f8e3da1481889af4cb047a3eb76f196c4ded898 SHA512 b1e6c5c0fe18b8e5d70ad66af450e86e7cf9fd5429973907618a742093fa9dec0c137e598f766824cb092d7c8c90a6d7116bc6b0417c81320dc21f8426d1eae2 WHIRLPOOL 80773ee914217c409ae49b8f8741b64ec55aa3ec8e6550441e4d0a3d99a7f44e3a0833b073c3be742fa30362da43425ace953af48820c09628ddef9c3443419a
 DIST mate-power-manager-1.16.0.tar.xz 3178780 SHA256 70449008afb448daf4c18f533d3999f76c642b492594b0eaa751dec749330a3e SHA512 c05edf0a28e9ba5aa84f8d8f2280a08c0214e03eede4701e3292747a242dd7a120078955348121faa9b68a5cc8d7601ff3d94f52ed13b918421c7b18fe028970 WHIRLPOOL e6bf8d5c86d705b18648d4bc5fe1c69d1705e76309263a590bd950eb85aabc3381e58de25206b0cef812779f9c6466139bfa487753c9ae630181831efb46fb56
+DIST mate-power-manager-1.18.0.tar.xz 3180036 SHA256 dd0c5fc82d0ea81246890a95d57de92c60c3d735ad06f5946c79eebe7c52b3be SHA512 dabd0d6757171ce0556d65c8d2c4234a8fd7ab4e191caf45447d0797d779a83f23538c96b36d1f959f5fcb63e2305cd3ede6cb13d504e59a2daaf1e75e5a7bd1 WHIRLPOOL b027f549fa4341472222781959d408060bf9827ff4c6d562aaeb4de87bb58a818bfa785f95f518507cb443a1ed401b91afd13e703d9458be6b3b374d67f450d5
diff --git a/mate-extra/mate-power-manager/mate-power-manager-1.18.0.ebuild b/mate-extra/mate-power-manager/mate-power-manager-1.18.0.ebuild
new file mode 100644
index 000000000000..91ede72b724c
--- /dev/null
+++ b/mate-extra/mate-power-manager/mate-power-manager-1.18.0.ebuild
@@ -0,0 +1,67 @@
+# 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="A session daemon for MATE that makes it easy to manage your laptop or desktop"
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="+applet gnome-keyring pm-utils policykit systemd test"
+
+# Interactive testsuite.
+RESTRICT="test"
+
+COMMON_DEPEND=">=dev-libs/dbus-glib-0.70:0
+	>=dev-libs/glib-2.36:2
+	>=media-libs/libcanberra-0.10:0[gtk3]
+	>=sys-apps/dbus-1:0
+	>=x11-apps/xrandr-1.3:0
+	>=x11-libs/cairo-1:0
+	>=x11-libs/gdk-pixbuf-2.11:2
+	>=x11-libs/gtk+-3.14:3
+	x11-libs/libX11:0
+	x11-libs/libXext:0
+	x11-libs/libXrandr:0
+	>=x11-libs/libnotify-0.7:0
+	x11-libs/pango:0
+	applet? ( >=mate-base/mate-panel-1.17.0 )
+	gnome-keyring? ( >=gnome-base/libgnome-keyring-3:0 )
+	pm-utils? ( >=sys-power/upower-pm-utils-0.9.23 )
+	!pm-utils? ( >=sys-power/upower-0.9.23:= )
+	systemd? ( sys-apps/systemd )
+	!systemd? ( >=sys-auth/consolekit-0.9.2 )"
+
+RDEPEND="${COMMON_DEPEND}
+	policykit? ( >=mate-extra/mate-polkit-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:*
+	x11-proto/randrproto:0
+	>=x11-proto/xproto-7.0.15:0
+	sys-devel/gettext:*
+	virtual/pkgconfig:*"
+
+src_configure() {
+	mate_src_configure \
+		--enable-compile-warnings=minimum \
+		$(use_with gnome-keyring keyring) \
+		$(use_enable applet applets) \
+		$(use_enable test tests)
+}
+
+src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+
+	dbus-launch Xemake check || die "Test phase failed"
+}
diff --git a/mate-extra/mate-screensaver/Manifest b/mate-extra/mate-screensaver/Manifest
index f661ce2300c9..9b7c54805ef0 100644
--- a/mate-extra/mate-screensaver/Manifest
+++ b/mate-extra/mate-screensaver/Manifest
@@ -1,3 +1,4 @@
 DIST mate-screensaver-1.12.0.tar.xz 4868924 SHA256 198cb5159bd6321c90e0069115909be52eb4382de25cb9c4ba33fa29e3fdc693 SHA512 01bdef496560eb8e9118b0ff66863568aaa6df872e7947d0a92fe9fcb1d305618b28928ea95c65a3367e3e4e79e9bdab7a8266287c8e3db2a5210b955d412c8d WHIRLPOOL 2cf7db69a1609cd785eef50c070743722cd190633a3b34b4cc87c11aa46164106a785dd027e728121e18a671c1b36cd5d20d30f232011a1ac6a4ff5f37953dc4
 DIST mate-screensaver-1.14.1.tar.xz 4912772 SHA256 e903932d9e3b01b527abf8b4957d68797afd1b6b035854bcbbd5e4e6934da5c6 SHA512 28b5834450da9d7d2fd3a77504f244e69212e751435bd41a957f30a5231db312dba37ee39442c63a40098bb3d1e1fade81ea423f9d59b29fc5d1201522d1d8f8 WHIRLPOOL c39b1f2ee9bb3082a038c765c9c007c500470ab4c73d5221d3d5e49de9c54fa950e9eeabec9f02f4791f7ade984076574ad8c25357af43bf5ff39d3623cff74b
 DIST mate-screensaver-1.16.0.tar.xz 4918240 SHA256 fda3051346f4d23b383142fe5a86abb7e745c4a3fbcd9ac0c449fbc8a1cb5aa5 SHA512 e25d654ce4090108a0d1c38c3a7d7315c3c3b6226f694ad1833c6d2d26c6682bf52450809b33c75b1276c3ad6cbfe709df44556cdc9a0c2e7faa66373efcdc9d WHIRLPOOL 6a6c43d6f628f566d90288b065d89980a9173395e14914962b60445f21d8161297de595ac5af8650ccf3dcfb21a44fcd13c928eb48826149aba4ad5f417e28b1
+DIST mate-screensaver-1.18.1.tar.xz 4923504 SHA256 32bd34ac058e4a9206da5eeea07902f8f9321e76961f766aded605a71c08d135 SHA512 6e41a44e0d12af6080e69461a86b66b8ac4696dcf2b140d8e31b07945f4ac8848c872e9b1c07a6cf706042d3254567848c177a726038a862514471104242e807 WHIRLPOOL f8cd6bac92440c0ee45a587cf83d5060ed6e48bcbe99ffe641c158672162a4f04d5f52dc0eb34d6d77bf861a2775add439a9e25c5b752798c61fa998b336b20b
diff --git a/mate-extra/mate-screensaver/mate-screensaver-1.18.1.ebuild b/mate-extra/mate-screensaver/mate-screensaver-1.18.1.ebuild
new file mode 100644
index 000000000000..284f9368217c
--- /dev/null
+++ b/mate-extra/mate-screensaver/mate-screensaver-1.18.1.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit mate multilib readme.gentoo-r1
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+DESCRIPTION="Replaces xscreensaver, integrating with the MATE desktop"
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="X debug consolekit kernel_linux libnotify opengl pam systemd"
+
+DOC_CONTENTS="
+	Information for converting screensavers is located in
+	/usr/share/doc/${PF}/xss-conversion.txt*
+"
+
+COMMON_DEPEND="
+	>=dev-libs/dbus-glib-0.71:0
+	>=dev-libs/glib-2.36:2
+	gnome-base/dconf:0
+	>=mate-base/libmatekbd-1.17.0
+	>=mate-base/mate-desktop-1.17.0
+	>=mate-base/mate-menus-1.10.0
+	>=sys-apps/dbus-0.30:0
+	>=x11-libs/gdk-pixbuf-2.14:2
+	>=x11-libs/libX11-1:0
+	x11-libs/cairo:0
+	>=x11-libs/gtk+-3.14:3
+	x11-libs/libXext:0
+	x11-libs/libXrandr:0
+	x11-libs/libXScrnSaver:0
+	x11-libs/libXxf86misc:0
+	x11-libs/libXxf86vm:0
+	x11-libs/libxklavier:0
+	x11-libs/pango:0
+	virtual/libintl:0
+	consolekit? ( sys-auth/consolekit:0 )
+	libnotify? ( >=x11-libs/libnotify-0.7:0 )
+	opengl? ( virtual/opengl:0 )
+	pam? ( gnome-base/gnome-keyring:0 virtual/pam:0 )
+	!pam? ( kernel_linux? ( sys-apps/shadow:0 ) )
+	systemd? ( sys-apps/systemd:0= )
+	!!<gnome-extra/gnome-screensaver-3:0"
+
+RDEPEND="${COMMON_DEPEND}
+	>=mate-base/mate-session-manager-1.6"
+
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/intltool-0.50.1:*
+	sys-devel/gettext:*
+	x11-proto/randrproto:0
+	x11-proto/scrnsaverproto:0
+	x11-proto/xextproto:0
+	x11-proto/xf86miscproto:0
+	virtual/pkgconfig:*"
+
+src_configure() {
+	mate_src_configure \
+		--enable-locking \
+		--with-kbd-layout-indicator \
+		--with-xf86gamma-ext \
+		--with-xscreensaverdir=/usr/share/xscreensaver/config \
+		--with-xscreensaverhackdir=/usr/$(get_libdir)/misc/xscreensaver \
+		$(use_with X x) \
+		$(use_with consolekit console-kit) \
+		$(use_with libnotify) \
+		$(use_with opengl libgl) \
+		$(use_with systemd) \
+		$(use_enable debug) \
+		$(use_enable pam)
+}
+
+src_install() {
+	mate_src_install
+
+	# Install the conversion script in the documentation.
+	dodoc "${S}"/data/migrate-xscreensaver-config.sh
+	dodoc "${S}"/data/xscreensaver-config.xsl
+	dodoc "${FILESDIR}"/xss-conversion.txt
+
+	# Non PAM users will need this suid to read the password hashes.
+	# OpenPAM users will probably need this too when
+	# http://bugzilla.gnome.org/show_bug.cgi?id=370847
+	# is fixed.
+	if ! use pam ; then
+		fperms u+s /usr/libexec/mate-screensaver-dialog
+	fi
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	mate_pkg_postinst
+
+	if has_version "<x11-base/xorg-server-1.5.3-r4" ; then
+		ewarn "You have a too old xorg-server installation. This will cause"
+		ewarn "mate-screensaver to eat up your CPU. Please consider upgrading."
+		echo
+	fi
+
+	if has_version "<x11-misc/xscreensaver-4.22-r2" ; then
+		ewarn "You have xscreensaver installed, you probably want to disable it."
+		ewarn "To prevent a duplicate screensaver entry in the menu, you need to"
+		ewarn "build xscreensaver with -gnome in the USE flags."
+		ewarn "echo \"x11-misc/xscreensaver -gnome\" >> /etc/portage/package.use"
+		echo
+	fi
+
+	readme.gentoo_print_elog
+}
diff --git a/mate-extra/mate-sensors-applet/Manifest b/mate-extra/mate-sensors-applet/Manifest
index 038c6fec1639..6e051f0ab64c 100644
--- a/mate-extra/mate-sensors-applet/Manifest
+++ b/mate-extra/mate-sensors-applet/Manifest
@@ -1,3 +1,4 @@
 DIST mate-sensors-applet-1.12.1.tar.xz 369492 SHA256 94d1eae184d11431a922eabc3210bb192f3686ca75441718ac5ff9e05bd39933 SHA512 2e96708e4e27d545b0ad010dbd04139c5d340be1138236ba1197c2cf16486005905264e381f8dde75ea6c23c29bd1a0dd03afb5726340cad718d06914d4dd994 WHIRLPOOL 5534897f6532fb4d2b8016cd06b2f64bef7b97aca7156062327def9174a9a03e497e2120fb09f0acf36b663256c809db10a30d1edad922a8590e23e32c2e59e6
 DIST mate-sensors-applet-1.14.0.tar.xz 389960 SHA256 f825e663d409458cc9e6c399ae78140422e3f5f225aa3bebf2e1837434da1a8f SHA512 8d1afdb491e3a4a72dbee098ff3383a9562ab47da81d68807cb1fe72ee9f2ccad31cbe355268d7641fc213dcabf8a4527f03e04c4d8a166584730e934f006f5f WHIRLPOOL f1af968c8770482d4a11e6954aa12ae57a939997ffc06ae888672107138fe257af5aeeb99599f0ac47b464cad17f8dee9e24c8dec8720f418ac62a6e5e26cde6
 DIST mate-sensors-applet-1.16.0.tar.xz 393436 SHA256 878cef0dddc3f77b143e04e5d01f9057fa8a387d1f2bb4ee4f1f5123143ab127 SHA512 7fef6e9ef7ef9d4596e0e58217c600a1a800cc483cede875ed60316dda5a51bc98746b4e2a6d650ada8bb3438ab8fc4f7cc451c552df54191152d66e7a7da34a WHIRLPOOL 71de0235643d225379b9f1d1e4d57db43e23d866fff96689ab7a36614607509d808789e49e606db0a8579a043e91eef18106b4d0470a012d594cf80d28a7aa70
+DIST mate-sensors-applet-1.18.2.tar.xz 397340 SHA256 404b609c9363135407525c3dda9e4a2663528ebf68530cf4778e21223c3d4e2e SHA512 67a998b20924d81490fe7f63f64ceace8298e58a7cf8b8f565f9604b1c063e3cfdf331c6bb6436f5631465bcbf2095c2b9877edeeebb5edb24f93109c50d0245 WHIRLPOOL c5cc39e38e96b8fdaf21ea857c4a0fa4c9055d8f7870e9e20dce590205de14b6e87a9afc2a6846fa7385baaa6eabe373a9706b981905f920217c553b87227f56
diff --git a/mate-extra/mate-sensors-applet/mate-sensors-applet-1.18.2.ebuild b/mate-extra/mate-sensors-applet/mate-sensors-applet-1.18.2.ebuild
new file mode 100644
index 000000000000..0c55ffc6fb8d
--- /dev/null
+++ b/mate-extra/mate-sensors-applet/mate-sensors-applet-1.18.2.ebuild
@@ -0,0 +1,67 @@
+# 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 panel applet to display readings from hardware sensors"
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="+dbus hddtemp libnotify lm_sensors video_cards_fglrx video_cards_nvidia"
+
+COMMON_DEPEND=">=dev-libs/glib-2.36:2
+	>=mate-base/mate-panel-1.17.0
+	>=x11-libs/cairo-1.0.4:0
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.14:3
+	virtual/libintl:0
+	hddtemp? (
+		dbus? (
+			>=dev-libs/dbus-glib-0.80:0
+			>=dev-libs/libatasmart-0.16:0 )
+		!dbus? ( >=app-admin/hddtemp-0.3_beta13:0 ) )
+	libnotify? ( >=x11-libs/libnotify-0.7:0 )
+	lm_sensors? ( sys-apps/lm_sensors:0 )
+	video_cards_fglrx? ( x11-drivers/ati-drivers:* )
+	video_cards_nvidia? ( || (
+		>=x11-drivers/nvidia-drivers-100.14.09:0[static-libs,tools]
+		media-video/nvidia-settings:0
+	) )"
+
+RDEPEND="${COMMON_DEPEND}"
+
+DEPEND="${COMMON_DEPEND}
+	app-text/rarian:0
+	>=app-text/scrollkeeper-dtd-1:1.0
+	app-text/yelp-tools:0
+	>=dev-util/intltool-0.50.1:*
+	sys-devel/gettext:*
+	virtual/pkgconfig:*"
+
+PDEPEND="hddtemp? ( dbus? ( sys-fs/udisks:0 ) )"
+
+src_configure() {
+	local udisks
+
+	if use hddtemp && use dbus; then
+		udisks="--enable-udisks"
+	else
+		udisks="--disable-udisks"
+	fi
+
+	mate_src_configure \
+		--disable-static \
+		$(use_enable libnotify) \
+		$(use_with lm_sensors libsensors) \
+		$(use_with video_cards_fglrx aticonfig) \
+		$(use_with video_cards_nvidia nvidia) \
+		${udisks}
+}
diff --git a/mate-extra/mate-system-monitor/Manifest b/mate-extra/mate-system-monitor/Manifest
index 3faaefca324f..bae6148439ca 100644
--- a/mate-extra/mate-system-monitor/Manifest
+++ b/mate-extra/mate-system-monitor/Manifest
@@ -1,3 +1,4 @@
 DIST mate-system-monitor-1.12.2.tar.xz 2114504 SHA256 78b91ae43fd0f06e0577d71d3b92b9c03ff2dc8809ba2b06dc0c4dc9e93683f5 SHA512 f001d36b7a343cba68bf76094abad4e07cc89537c71dba873bb5ffc61045f440a319e3db8d5ee55ff301f52dbdad8b275ca71a4ab6c5fbe34d75c2e65edd7c23 WHIRLPOOL 7270766f4434cb0e489f3f1ef805586987751fbea6a0a020df8fa7fa38dbbf264d0d1f3694fbba8e9d14cf2ddaee217ac562a391b4b87f1033cf2850067ae1a0
 DIST mate-system-monitor-1.14.0.tar.xz 2135464 SHA256 ccd7f52836af22d18138e516335ee259448749b6618327feb908ad396d0c650a SHA512 f19fa0241228be8ec8600db43e71495750039288292ba5714489a84acb3e5cc9f4c87d39a63d29a0fc6f907af6ecc319382cd4276ae2de1125bba059d5b24be5 WHIRLPOOL d354dfbf7121b838af6fac73148e381c23df4e3bc50a59f68f6469416f608235a0b6d990214e9de87bc01e1254f16e1ba9d1f631e18554205ae45ebc4b84f149
 DIST mate-system-monitor-1.16.0.tar.xz 2120984 SHA256 abbbfeba699f73a6eacb7545927693daba4fb6203a75170a93df4842cacd9fe1 SHA512 6ee8e1d1a3af5e3b295c2cca74b3e6bdf8a09eb6aa7d63f13db006829c2df25b580b72cc8d6e34e2844b243999cd4f059a42aa67a88c60825defdb7880150796 WHIRLPOOL 2fa9402bab4c9a9441e5dae2094cc12862bf484827f3cd5c238ee234792f03b0a751229c08b81d0def97194e6901f61736747a6656a9738d3bd2f52116e30a70
+DIST mate-system-monitor-1.18.0.tar.xz 2133484 SHA256 887c0d91fa866af75cc066591fcd521107976f123784b1b887535a4709cd9bf1 SHA512 95e85b87f52db32f3c192c29b866020b78638462dd362376180087f24c041b690d3bb66d8ad1174abc89051450efe1f19171746204c68455ddcc6e965339db82 WHIRLPOOL dc4791fbb1090264d4b42883c734bb84fa14cd39d37f33335472077592097b8a9c3c2c45723464038f91efecc271b7b92b69fa2e7985f7f74d6e22613b19a147
diff --git a/mate-extra/mate-system-monitor/mate-system-monitor-1.18.0.ebuild b/mate-extra/mate-system-monitor/mate-system-monitor-1.18.0.ebuild
new file mode 100644
index 000000000000..2f99dc8cf7bc
--- /dev/null
+++ b/mate-extra/mate-system-monitor/mate-system-monitor-1.18.0.ebuild
@@ -0,0 +1,53 @@
+# 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="The MATE System Monitor"
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="systemd"
+
+COMMON_DEPEND="
+	>=dev-cpp/glibmm-2.26:2
+	>=dev-cpp/gtkmm-3.8:3.0
+	>=dev-libs/glib-2.36:2
+	dev-libs/libsigc++:2
+	>=dev-libs/libxml2-2:2
+	>=gnome-base/libgtop-2.23.1:2=
+	>=gnome-base/librsvg-2.35:2
+	x11-libs/cairo:0
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.14:3
+	>=x11-libs/libwnck-3.0:3
+	virtual/libintl:0
+	systemd? ( sys-apps/systemd )"
+
+RDEPEND="${COMMON_DEPEND}
+	>=sys-auth/polkit-0.97:0"
+
+DEPEND="${COMMON_DEPEND}
+	app-text/yelp-tools:0
+	>=dev-util/intltool-0.50.1:*
+	sys-devel/gettext:*
+	>=sys-devel/autoconf-2.63:*
+	virtual/pkgconfig:*"
+
+src_configure() {
+	mate_src_configure \
+		$(use_enable systemd)
+}
+
+pkg_postinst() {
+	mate_pkg_postinst
+
+	einfo "${PN} may run commands with escalated privileges using"
+	einfo "x11-libs/gksu."
+}
diff --git a/mate-extra/mate-user-guide/Manifest b/mate-extra/mate-user-guide/Manifest
index 136215747f08..03c8df823b44 100644
--- a/mate-extra/mate-user-guide/Manifest
+++ b/mate-extra/mate-user-guide/Manifest
@@ -1,3 +1,4 @@
 DIST mate-user-guide-1.12.0.tar.xz 8296724 SHA256 1733b5429a38b1ca5bf5922f530f8149df80b9caf613d405fd98c05762bd4c29 SHA512 b92a58e2104d22007bf61ca2dc71e02acd250886393a9b3ccb397a3172a1f0542a34589ea2c82f9b985af0ae3ce505012f69731d82d8412949f5ffc254356456 WHIRLPOOL caf177ba7b4dc783fede776bf5960f55696737bb584b425c2d4038e71260e66d9fb803759ec3aa17771f249efd4855ccc5d6fcb8000455b138148f1a91d09e99
 DIST mate-user-guide-1.14.0.tar.xz 8375176 SHA256 acf817fa980e78842f1b73da1b499a07018e15bb22fb53316fea23de4bae7988 SHA512 62df5ee3372d452f52d7e63f18991b68996081dad05ae04fb4902d65246aeef7fc85686b4c4145974fd5cd2db95178f156b9847003f6f0576939d0afae501e60 WHIRLPOOL 665b584bc168f8b65f7f6a4ae427aa514df200915f329f934e6243411e8192e8e655547e25a6c71b223ba45b9ba5f5ad58fbd362d7467ab0a9be5eb06aad1792
 DIST mate-user-guide-1.16.0.tar.xz 8377540 SHA256 78aef5ba91b776f6e50dd2770b3a2fda258d76679dc9f723797a37fb100a4f5f SHA512 90dd0af23c2532d401a52442b2837bb43329c18b4c76cf7ac67c84434e9b87fbf75050e5456f1b242755869c8540f5de3abd7a004bd400a1bf81cce66e3ccf80 WHIRLPOOL b3492496784ef2afdba6d9c215f070d807d61ac7135322393cc6b836b2002031bd4edd6979de7420c4f48b532356a2d5b7d9af9f538c799bfbdcd26844087858
+DIST mate-user-guide-1.18.0.tar.xz 8375200 SHA256 abe2ee40b9788c887abccc7554564bd951eb26ed08c89b4fe59e0d95b2216b38 SHA512 023b6ee04764e8a6004ac1cba69427af33be22228d475666cfacd4aa2ef4b61df4c9e269e003345a7073ef5eb7b783850e4efd5b41356052e3b69860d6df054a WHIRLPOOL a7cca9e23f5286e70130e62e79a6dbef50d5de79a05b0bf7e0b4c4265ca89dcc8b3ac8b61ca12e9792d58ac154af0320cee83caf5cf2138e9728bf60dd2de82b
diff --git a/mate-extra/mate-user-guide/mate-user-guide-1.18.0.ebuild b/mate-extra/mate-user-guide/mate-user-guide-1.18.0.ebuild
new file mode 100644
index 000000000000..aa66b657ee6e
--- /dev/null
+++ b/mate-extra/mate-user-guide/mate-user-guide-1.18.0.ebuild
@@ -0,0 +1,28 @@
+# 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="User documentation for MATE Desktop"
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+
+COMMON_DEPEND="virtual/libintl:0"
+
+RDEPEND="${COMMON_DEPEND}
+	gnome-extra/yelp"
+
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/intltool-0.40:*
+	app-text/yelp-tools
+	sys-devel/gettext:*
+	virtual/pkgconfig:*
+	!!mate-base/mate-desktop[user-guide]"
diff --git a/mate-extra/mate-user-share/Manifest b/mate-extra/mate-user-share/Manifest
index 118f67239ae1..f8b8a06c1192 100644
--- a/mate-extra/mate-user-share/Manifest
+++ b/mate-extra/mate-user-share/Manifest
@@ -1,3 +1,4 @@
 DIST mate-user-share-1.12.0.tar.xz 931776 SHA256 06b4798079e28fa6ca6085b2867dbe42ff2f78b45e722dc535d333f4922ddfe8 SHA512 928bcfa594ba56b84bde249b71fb6315d7dd20fc46c1300edb4f9ab3296a468f1105934ba8cb351e47cef52dac5ca70bdc2f3f7d2166219ded7b7016bea23c24 WHIRLPOOL be5b5ee61ef83abac3cc0f6b79b349dce1a227bd2838c435846b87e646146eb83ce2d83657581a165656f4ac952d8b782ebcf4f9d90e2c3126dc9e2ee8d750b8
 DIST mate-user-share-1.14.0.tar.xz 902728 SHA256 b43c6658e941cef3781dba5eea47472aa50eb40815bdc36a983b95ef8c4d5f5c SHA512 a9ad934b0681d1168d7ea3b7d3120cb39f230b7267cd71a91f511f03f132a8e8022bb339fcd017c243988214a82dd337cacb65875d9e35e4c10f014f39eefbe1 WHIRLPOOL 8fb9d5ea5e89d9acfc08f83daf9f20985ec6d09236f40c4e7c9093ac72c5a17fec807cd2d205cfb8502fd1ff1eb872f378c3506b17e85d2fd7440d12b8c1b192
 DIST mate-user-share-1.16.0.tar.xz 918148 SHA256 ccdb8ead854a6c0829ab89cc3aad27b82d131367cf8358ab0852ac345ee7ee68 SHA512 fe8994f288360bbecfc7055a0222f18be81b5cd74d620948c7e60365f56869c9dd25efb3262224a3b5d1071ec36419c3fde925c31038d04e60026c63d132252c WHIRLPOOL 6b7faf685b3ac85eac6e47f150589782a9df11d7b3c4a6052e9726b8ff3f3c4e74c0056649fce0647e040e4cbfc480788edea43d8dfd64f0a6a3e5708ad9387d
+DIST mate-user-share-1.18.0.tar.xz 919404 SHA256 36f83c16bb2d87143a4844bdd35b63c9f80edc98ee06d9190cc48a50ab3cf970 SHA512 581a53efc115b3b2bac455d828bb689c79bc2a0c5bf3fb2a560ae7eb153b6a8c9589695ca540bb759498c0dc21e016f634a0aabf8e9863c42c5ae7712c91d058 WHIRLPOOL 2731ef7d358b1ff0683118fd0827ca11eeef88fe9fc12f29739bba73d916f89ef6ce7757385e63e907afb7e30c2b19e504a2c65691b92efdd760970eede04a81
diff --git a/mate-extra/mate-user-share/mate-user-share-1.18.0.ebuild b/mate-extra/mate-user-share/mate-user-share-1.18.0.ebuild
new file mode 100644
index 000000000000..5fe69b733432
--- /dev/null
+++ b/mate-extra/mate-user-share/mate-user-share-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 multilib
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+DESCRIPTION="Personal file sharing for the MATE desktop"
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="X"
+
+COMMON_DEPEND="
+	>=dev-libs/dbus-glib-0.70:0
+	>=dev-libs/glib-2.15.2:2
+	>=mate-base/caja-1.17.1
+	media-libs/libcanberra:0[gtk3]
+	>=sys-apps/dbus-1.1.1:0
+	>=x11-libs/gdk-pixbuf-2:2
+	>=x11-libs/gtk+-3.14:3
+	x11-libs/libX11:0
+	x11-libs/pango:0
+	>=x11-libs/libnotify-0.7:0
+	virtual/libintl:0"
+
+RDEPEND="${COMMON_DEPEND}
+	>=www-apache/mod_dnssd-0.6:0
+	>=www-servers/apache-2.2:2[apache2_modules_dav,apache2_modules_dav_fs,apache2_modules_authn_file,apache2_modules_auth_digest,apache2_modules_authz_groupfile]"
+
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/yelp-tools:0
+	>=dev-util/intltool-0.35:*
+	sys-devel/gettext:*
+	virtual/pkgconfig:*"
+
+src_configure() {
+	mate_src_configure \
+		--with-httpd=apache2 \
+		--with-modules-path=/usr/$(get_libdir)/apache2/modules/ \
+		--disable-bluetooth \
+		$(use_with X x)
+}
diff --git a/mate-extra/mate-utils/Manifest b/mate-extra/mate-utils/Manifest
index 57d7f6547256..c11c495a5e49 100644
--- a/mate-extra/mate-utils/Manifest
+++ b/mate-extra/mate-utils/Manifest
@@ -1,3 +1,4 @@
 DIST mate-utils-1.12.0.tar.xz 6482900 SHA256 60da98d984065d5001ba23f7fb02fb2acd1c1ec864e4a2730274f8791a96d69f SHA512 fe1db5c04b3adc616fdd0f76ddfb1291bbbfb6fb7d2f9ab11c5ffc33e19e0487ba3581babdfe74dd64553fd07f7d986fbac08fe2b14bcb79fca315e365069e47 WHIRLPOOL 36d00040b6d655e78192f5554ee773fe5998a9395040fa0ef5b3d9560d73e8cb582fbc750136f5581dc462cea6ad2e7306cdc94027a6d63d5f1e8aacc3dc1699
 DIST mate-utils-1.14.1.tar.xz 6498448 SHA256 6632c1fe72187ed1d77ee8e55cf70885b2611c086b606b92010d2a4f193ab4dd SHA512 7c95fe390f83ee90405929025039ccef186ebf268f85e45a0dda0483b5de9bb67a6d3bbbe1a55315787996118c6bdf6a4fb29ad7236428eef89750c058b886e4 WHIRLPOOL 7cd60dc07f1c75c053c783064eb10c87711189d2b5b4b0e9258a4f9c7b78bf1e141b64a30e37cdfcb82bf8e04599a2032641f08b2617c61fe24c7bcbd7f24c85
 DIST mate-utils-1.16.0.tar.xz 6502040 SHA256 05aad0bc57647e2d084f6588dd43692c8bd2a4284c9917d17033ca016b47c842 SHA512 a12883b732b0ac597c28c45609bde6fdf86369a3a00a16619617ec3834465fe85e83c4872a84a20d9d9a734c8180eae7e730f7cdfb4a6a41fdd14c59f607cacb WHIRLPOOL 2c2752faf19b6a5605a229b9c2e69dd948b5e3a700668c16e3f29508a601c42b3b581a5a1b4a40e9483608f1454f2519cdb97e44992c3f40107b14b5a5e7eb77
+DIST mate-utils-1.18.2.tar.xz 6442576 SHA256 bbd80f772d9f4dd379794105fd7a4f5452c71ff3e634a06f0af245875b492373 SHA512 4db4dd0ad986c52978a9fe7f893a0e1d8086b1685d8b162df9b7e7b33c9d8e47a85efc45f2db4cf45058cc91df3f909ece1b44e46c16a1a389070d8cd022348d WHIRLPOOL ea31ec3b8d20ebe2cdc0d552734cb72ffc82dbf87b660d66e48b316398e55b68d0884b7615a9960a75593c264b8f21849d7485d77458ffd509e8003fb75c3ebe
diff --git a/mate-extra/mate-utils/mate-utils-1.18.2.ebuild b/mate-extra/mate-utils/mate-utils-1.18.2.ebuild
new file mode 100644
index 000000000000..2f8a04b2b5db
--- /dev/null
+++ b/mate-extra/mate-utils/mate-utils-1.18.2.ebuild
@@ -0,0 +1,65 @@
+# 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="Utilities for the MATE desktop"
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="X applet debug ipv6 test"
+
+COMMON_DEPEND="
+	dev-libs/atk:0
+	>=dev-libs/glib-2.36:2
+	>=gnome-base/libgtop-2.12:2=
+	>=media-libs/libcanberra-0.4:0[gtk3]
+	sys-libs/zlib:0
+	x11-libs/cairo:0
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.14:3
+	x11-libs/libICE:0
+	x11-libs/libSM:0
+	x11-libs/libX11:0
+	x11-libs/libXext:0
+	x11-libs/pango:0
+	applet? ( >=mate-base/mate-panel-1.17.0 )"
+
+RDEPEND="${COMMON_DEPEND}"
+
+DEPEND="${COMMON_DEPEND}
+	app-text/rarian:0
+	>=app-text/scrollkeeper-dtd-1:1.0
+	app-text/yelp-tools:0
+	dev-util/gtk-doc
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.50.1:*
+	x11-proto/xextproto:0
+	sys-devel/gettext:*
+	virtual/pkgconfig:*"
+
+src_prepare() {
+	# Make apps visible in all DEs.
+	LC_ALL=C find . -iname '*.desktop.in*' -exec \
+		sed -e '/OnlyShowIn/d' -i {} + || die
+
+	mate_src_prepare
+}
+
+src_configure() {
+	mate_src_configure \
+		--disable-maintainer-flags \
+		--enable-zlib \
+		--enable-debug=$(usex debug yes minimum) \
+		$(use_with X x) \
+		$(use_enable applet gdict-applet) \
+		$(use_enable ipv6)
+}
diff --git a/media-gfx/eom/Manifest b/media-gfx/eom/Manifest
index f10e1bbb5bab..4fdd8e5052df 100644
--- a/media-gfx/eom/Manifest
+++ b/media-gfx/eom/Manifest
@@ -1,3 +1,4 @@
 DIST eom-1.12.2.tar.xz 2213260 SHA256 38ad10a6794e02e9e319a293393a36532e86572010442ba2f1d3773313c0a1da SHA512 03283cb1cae817c7c21219913fe2f3ab64e0fa6662a63193d4fa012bd0b5c286cbd25131a5bd5e52c1d9304b4b10ae8c37d38a88ea985215c5b277303d7b8cc4 WHIRLPOOL ad1745e5a0b223b96f715488b36c9c96a6b0f439a5ace02f06c2e05d09c6260bbf29c6d103fb40adfbbe6140d5a981f954185b04d0065b90b5f71625eec7783c
 DIST eom-1.14.2.tar.xz 2254180 SHA256 ffdd2a229e6a1c3a133b3d4e981b820e9573983e4195cc66b98300ed6113fda2 SHA512 87d7c5e62249d598474324f24bac1f5f3388bb11517fc54531792fc0291ef42199f3339e492dfc1a1caafed575cf3b21e36ea91f15d0a03b8e912a3d16e5f3b7 WHIRLPOOL 8a337a80c0f9e1def14bf57d7e46675fd223ddff80d4843c908e9e5fbc33c07f1c319498c912f10ba12b620127565b4f20411cb3aeaca7ec95b2f5a6247e4301
 DIST eom-1.16.0.tar.xz 2214612 SHA256 974356c10bf96b974b777614d5d6f88f982a6c9ab3735d9397b4a33a6812c4fe SHA512 ed1dfb8bfd8af6e74def133c38bcbaef81adbbc98df428479cf8a4037379f1cea0df2033eeb4ea28e5cba2c5996b0c248012be34e5450b2cfda575f2f79a5f36 WHIRLPOOL f4341940cb66a2096cfa561cd7616d0ac8d281acec35496178fdffa6c538a86968ea8b62afba4cb533010d21cd019e4d863db75929d9b3dad82c5fcf54e1194d
+DIST eom-1.18.2.tar.xz 2196228 SHA256 0755a43f48fe1a09b826cdd6ed239631f5e4f9163ccb481362534d8fcf3bda02 SHA512 d0d8aaa7837564fafd949da26e477e675a6cbecf6efd799ea0f29ba23800d4df36147f83bf059dcf38f9c4a9601e8501ec78065e02125fb18261011e1c3ac12c WHIRLPOOL 57db81a9e27f71f8e844fc53451eca51be0ddba5bddbaa6745c31be7d982f70f7a1ef418590da93aaec00de392fcaef4d4fab2e16782dc8acf670edaff9c26f3
diff --git a/media-gfx/eom/eom-1.18.2.ebuild b/media-gfx/eom/eom-1.18.2.ebuild
new file mode 100644
index 000000000000..429377265824
--- /dev/null
+++ b/media-gfx/eom/eom-1.18.2.ebuild
@@ -0,0 +1,65 @@
+# 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="The MATE image viewer"
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="X debug dbus exif +introspection jpeg lcms svg tiff xmp"
+
+COMMON_DEPEND="
+	dev-libs/atk:0
+	>=dev-libs/glib-2.36:2
+	>=dev-libs/libpeas-1.2.0[gtk]
+	>=dev-libs/libxml2-2:2
+	gnome-base/dconf:0
+	>=mate-base/mate-desktop-1.17.0
+	sys-libs/zlib:0
+	x11-libs/cairo:0
+	>=x11-libs/gdk-pixbuf-2.4:2[introspection?,jpeg?,tiff?]
+	>=x11-libs/gtk+-3.14:3[introspection?]
+	x11-libs/libX11:0
+	>=x11-misc/shared-mime-info-0.20:0
+	virtual/libintl:0
+	dbus? ( >=dev-libs/dbus-glib-0.71:0 )
+	exif? (
+		>=media-libs/libexif-0.6.14:0
+		virtual/jpeg:0
+	)
+	introspection? ( >=dev-libs/gobject-introspection-0.9.3:= )
+	jpeg? ( virtual/jpeg:0 )
+	lcms? ( media-libs/lcms:2 )
+	svg? ( >=gnome-base/librsvg-2.36.2:2 )
+	xmp? ( >=media-libs/exempi-1.99.5:2 )
+	!!media-gfx/mate-image-viewer"
+
+RDEPEND="${COMMON_DEPEND}"
+
+DEPEND="${COMMON_DEPEND}
+	app-text/yelp-tools: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 \
+		$(use_enable debug) \
+		$(use_enable introspection) \
+		$(use_with X x) \
+		$(use_with dbus) \
+		$(use_with exif libexif) \
+		$(use_with jpeg libjpeg) \
+		$(use_with lcms cms) \
+		$(use_with svg librsvg) \
+		$(use_with xmp)
+}
diff --git a/media-libs/libmatemixer/Manifest b/media-libs/libmatemixer/Manifest
index 4822d0e163d0..58bdcb7c4937 100644
--- a/media-libs/libmatemixer/Manifest
+++ b/media-libs/libmatemixer/Manifest
@@ -1,3 +1,4 @@
 DIST libmatemixer-1.12.1.tar.xz 382444 SHA256 decddd15f3cfb7410428922a30e210d89ac9b87b4433919ae152f14a61ce0ff0 SHA512 6aa0a9d7af254ef85051a8052b2f7ffb2a705e07636da1eea358667e8577aad0f459b21b45751f256a58cbcac33d3b6628227e70f55e9ff0cdfe211bdfa7b0da WHIRLPOOL 0ce5f8a2b45f17e0c226ceebc9e64b4bec21f5e553b46e0819f7c59c2f1e38b7e3c15d90e3b2aecf63b785b98454afcece421f7f4aacfad9cd9d4382a0d946b2
 DIST libmatemixer-1.14.0.tar.xz 413824 SHA256 8293a0b0c125b4749e415fb2e4f80adcf313b769ce02f49521d6ddd323d7c07d SHA512 e7ac0d583d740df87af75f3b590e81d0716e0169ec9021bfe2d0e2065f78905ed96a37b606233b4cfbf190116e111edfca89d912bdb37d37d724d22bfb8d84fb WHIRLPOOL 24d01b99c649e86b21f76fae740f19cd83d790d24972614ce26d6bd0b22ac177305bd5f92ca26ae6480b35c013698cd4a49b059abe8d330fe763051fa34a99f9
 DIST libmatemixer-1.16.0.tar.xz 415876 SHA256 83ca5fbfd7d8c3904e5ebfd84c17e0b005682551541463f77f703fa97804cf09 SHA512 6dbf87ff81f32d6d9dfc5627fa3b97cf24a4b466c74f52958fdab8a889fe3e830dab62520eda72e93a9666dee3c45946cc0e300a1b15b16c70ff839b4faf480b WHIRLPOOL 373431e4e2a6d99e77d65df88740f4957358169b6f8e781696704e9e99fb872ae55b8a2dd0a236f7832574564cde5cb99790b870664085158c69fb59e8aa0de1
+DIST libmatemixer-1.18.0.tar.xz 418772 SHA256 b99209e310ba614c5b0bd6a97545ba974bc34a74cd29fd50189a5365a9ed7e27 SHA512 254d1ff74f036d813f9ec2b983b86a730fec0d1f2009e7d22a9d779e509aec92409225cec5ff1f7c747c468c5e40affaa67130df4bb7087d5ee61036359b4407 WHIRLPOOL db7d06f7c74ffbcad206100876852482860709e6feafd5407c7360913e35c0cbb422a18e1368a30f7fe25b04a78acf31dcbe5b6b81f8dc738cee3506f2f12b5c
diff --git a/media-libs/libmatemixer/libmatemixer-1.18.0.ebuild b/media-libs/libmatemixer/libmatemixer-1.18.0.ebuild
new file mode 100644
index 000000000000..261e3dc7a6c9
--- /dev/null
+++ b/media-libs/libmatemixer/libmatemixer-1.18.0.ebuild
@@ -0,0 +1,39 @@
+# 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="Mixer library for MATE Desktop"
+LICENSE="LGPL-2 GPL-2"
+SLOT="0"
+
+IUSE="+alsa oss pulseaudio"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.36:2
+	sys-devel/gettext:*
+	alsa? ( >=media-libs/alsa-lib-1.0.5 )
+	pulseaudio? ( >=media-sound/pulseaudio-2.0.0:0[alsa?,glib] )"
+
+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.35.0:*
+	virtual/pkgconfig:*"
+
+src_configure() {
+	mate_src_configure \
+		--disable-null \
+		$(use_enable alsa) \
+		$(use_enable oss) \
+		$(use_enable pulseaudio)
+}
diff --git a/x11-misc/mate-notification-daemon/Manifest b/x11-misc/mate-notification-daemon/Manifest
index db7acf06fd0d..053307ebc8a7 100644
--- a/x11-misc/mate-notification-daemon/Manifest
+++ b/x11-misc/mate-notification-daemon/Manifest
@@ -1,3 +1,4 @@
 DIST mate-notification-daemon-1.12.1.tar.xz 304752 SHA256 856bad2bb90e2b7d1124c0ae197c07a321b3cc2767897b3e6b78e59a3096a7dd SHA512 ce9cd1737cc70b0e17fa856730b51747f78bb40639ff58e205a3f1432edf53aba38442d59b7a4fca6ff460cbdc6c611c0a05a46bbf5db92db0ce5e714e19daae WHIRLPOOL b925ac68692f1535bc57bed23f9c19239583c5ca674e5f6493223d31ff6be6ca2bb94b89cdb12baa0eafcaad1cf1c3d6df7ee717b71730b6947be0c0c81a22cd
 DIST mate-notification-daemon-1.14.1.tar.xz 336196 SHA256 8ddefb29d5fe626787fba29d4e76993b5e0efcbd36b2bb9aa2faa1cd64f732fd SHA512 6913e0a7891726fb2f4098b4c7ba578344d29960e6d27a9fa917687f745aedb9482fb65ea9c6d8816a0c8e505ef586f13ac08b010e558b6557e14e8961b1c1f6 WHIRLPOOL ba9fe7f7e30d2a92b93c51a1564414c27ad5533a3dd5d5c5946c697d6d2c3fc0ed586bf051b65a6d06852b08517ca60a262946cfb6f4b415b0a9459307c0ec2a
 DIST mate-notification-daemon-1.16.1.tar.xz 337088 SHA256 dcbb253ecfb6dcd020cb1645cde319d98402c04a0df388834b5144f91e5cb9e6 SHA512 93c9a09801e54f7cd7f3c6542e3593886201bb59a9bca56af7454ff901540ef7fbb236c38786ba9444fe3aaff7598c549c274ce0a90fee27bcf28fc201f64b88 WHIRLPOOL 0053e914960def3f4ce158392a22a9badf1c36139ba11b4df96bb1c2b842f6f874f94180cf55b315c6a389f517685d047a93cbf811a36db760ee6f07dcbfc275
+DIST mate-notification-daemon-1.18.0.tar.xz 340828 SHA256 4c1f08fa348cdba0b7786a4207b0b4a40d06deb878f3d71ca1c7f71b53da1066 SHA512 5405a33dd4f78d22fa5f666b94b74d20c046518d5c631a95b286f370dfd6dc4d1ae6dd2b0676fcf8e01c1d1d40bbfd9055180e1cab869913c3d56a1a5d0872aa WHIRLPOOL 023d4f16b39da554162f463d57fd98b631f7cc900e360f881403bba540ecd98d1494867fe47959d4d4909dd1f80fa413a27d76d28f001d5660fd4ecbb9466ca6
diff --git a/x11-misc/mate-notification-daemon/mate-notification-daemon-1.18.0.ebuild b/x11-misc/mate-notification-daemon/mate-notification-daemon-1.18.0.ebuild
new file mode 100644
index 000000000000..d83471e84741
--- /dev/null
+++ b/x11-misc/mate-notification-daemon/mate-notification-daemon-1.18.0.ebuild
@@ -0,0 +1,54 @@
+# 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 Notification daemon"
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE=""
+
+COMMON_DEPEND="dev-libs/atk:0
+	>=dev-libs/dbus-glib-0.78:0
+	>=dev-libs/glib-2.36:2
+	>=sys-apps/dbus-1:0
+	x11-libs/cairo:0
+	>=x11-libs/gdk-pixbuf-2.22:2
+	>=x11-libs/libnotify-0.7:0
+	x11-libs/libX11:0
+	virtual/libintl:0
+	>=x11-libs/gtk+-3.14:3
+	>=x11-libs/libwnck-3:3
+	>=media-libs/libcanberra-0.4:0[gtk3]
+	!x11-misc/notify-osd:*
+	!x11-misc/qtnotifydaemon:*
+	!x11-misc/notification-daemon:*"
+
+RDEPEND="${COMMON_DEPEND}"
+
+DEPEND="${COMMON_DEPEND}
+	app-arch/xz-utils:0
+	>=dev-util/intltool-0.50.1:*
+	sys-devel/gettext:*
+	>=sys-devel/libtool-2.2.6:2
+	virtual/pkgconfig:*"
+
+src_configure() {
+	mate_src_configure
+}
+
+src_install() {
+	mate_src_install
+
+	insinto /usr/share/dbus-1/services
+	doins "${FILESDIR}/org.freedesktop.Notifications.service"
+}
diff --git a/x11-misc/mozo/Manifest b/x11-misc/mozo/Manifest
index bf6435e0634c..77144e829ee0 100644
--- a/x11-misc/mozo/Manifest
+++ b/x11-misc/mozo/Manifest
@@ -2,3 +2,4 @@ DIST mozo-1.12.0-gtk3.patch.bz2 6562 SHA256 b8aed33b49bd7d5c09d9546770ba79d8643b
 DIST mozo-1.12.0.tar.xz 163820 SHA256 59ab1c873064177e5515ba31c493fe9fd158c37b1054f7ae638c6571640aecc7 SHA512 93e760b791a74b6a6ca0377d5aaa060c8bf339dcfde91fcb146ef1e37cc25912b3c93fa2b4d612c0abf2bbd00597c80b58769bc88b57925ec4c465967f32c05b WHIRLPOOL 188419370e749b984d6cc1437baf67dc2611e255d9e18ee2cee113eff578cde8db078064050d63e523d457d5b1fa391a6f1a1db0e95f23c0c79742e484670932
 DIST mozo-1.14.1.tar.xz 171576 SHA256 6ec9afc8de9c61ac44d0a65e09bdad847caae5050b1ffe66ca02bc6d479f7163 SHA512 62269ed358807d7ebcf04e6bcbfd3689f019396ebd43a8634bca752f13d6609e94b97688b5fdfa83b1168f0e1cdf284275dc08054e27ab507ce40c2de881bc76 WHIRLPOOL ef795b2268a05ebc6343b62d67e0546b993fe4d6e01d4fbba5c4e8528cb7dae267116de22ddc9dcda91d6aeb332d41411efa2e598ed322ca4acf9da6403f0ea9
 DIST mozo-1.16.0.tar.xz 172312 SHA256 1bba88f32caafbc2b1c6bd3095acc07d10de40f242b8c15acb98f0b6e1747432 SHA512 507a35bbdad944ec55ce81e5193af9e5697747c2fc55817b3e3913aca68f1d99caa75df1d79f3b7abc1ba354a5c4f34c868e054e20cb86e5d0a7d65b463af57a WHIRLPOOL dd55a9510784927b11d3bbdccb26dfaa5901769cea0e817fcfeeaaee42220296424599eac6887968724729020594a27ab0d5d4b2a39056c6739b62d240db0300
+DIST mozo-1.18.0.tar.xz 173432 SHA256 ab24241d3203aca75974f0aeb96dbd215c5ac7ca67cd7af72caa6062f84ad613 SHA512 e333c572e5bc1d0905daed17eacd3dda10df5f80ed5b5b01ca3478d345a8c724e0161ccf51914f4982f16df71f252a3b08b194bec18e6aee05eb7af021369a12 WHIRLPOOL 825ae8090e505c71d0daca5373944b8251360a367ec3c6b05b92dcdf21f4216d1aa71083973b3f18bdad8fddabbf9c03fbbe7d08ee6ed5d955b2ee2271dadb22
diff --git a/x11-misc/mozo/mozo-1.18.0.ebuild b/x11-misc/mozo/mozo-1.18.0.ebuild
new file mode 100644
index 000000000000..5d07223cc286
--- /dev/null
+++ b/x11-misc/mozo/mozo-1.18.0.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="xml"
+
+inherit python-r1 mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+DESCRIPTION="Mozo menu editor for MATE"
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE=""
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	>=dev-python/pygobject-3:3[${PYTHON_USEDEP}]
+	>=mate-base/mate-menus-1.6[introspection,python]
+	x11-libs/gdk-pixbuf:2[introspection]
+	x11-libs/gtk+:3[introspection]
+	virtual/libintl:0
+	!!x11-misc/mate-menu-editor"
+
+RDEPEND="${COMMON_DEPEND}"
+
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/intltool-0.40:*
+	sys-devel/gettext:*
+	virtual/pkgconfig:*"
+
+src_prepare() {
+	mate_src_prepare
+	python_copy_sources
+}
+
+src_configure() {
+	python_foreach_impl run_in_build_dir mate_src_configure \
+		--disable-icon-update
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir default
+}
+
+src_test() {
+	python_foreach_impl run_in_build_dir emake check
+}
+
+src_install() {
+	installing() {
+		mate_src_install
+
+		# Massage shebang to make python_doscript happy
+		sed -e 's:#! '"${PYTHON}:#!/usr/bin/python:" \
+			-i mozo || die
+
+		python_doscript mozo
+	}
+
+	python_foreach_impl run_in_build_dir installing
+}
diff --git a/x11-terms/mate-terminal/Manifest b/x11-terms/mate-terminal/Manifest
index 9b98c5cb4b09..295e85f7fb32 100644
--- a/x11-terms/mate-terminal/Manifest
+++ b/x11-terms/mate-terminal/Manifest
@@ -1,3 +1,4 @@
 DIST mate-terminal-1.12.1.tar.xz 1143628 SHA256 d4e16a7b2742e0a904e304b2251fb8e5028833a6813e75bd8214ee542cd86c0e SHA512 c37b725db1522153fcb4dc596205f9382605bf981504217c8b087a4d7e6086a5c40644cdab1eb3c0593632d4f38d45fbcdfd763cb1ef62ff7359335c54b6ff42 WHIRLPOOL 8e0dc57b48e19cab8f821e922519045dd97bf9c3b18052aa3aad81ce2d238a8f1c513e2cf5ca426b7b87cbfeb184c02cd02ecd2f2c1c63a912856860d53c2813
 DIST mate-terminal-1.14.1.tar.xz 1313612 SHA256 248f8e4db544a76a521e7e80cceb3e6736b60c64880376b08f552cb66c378b29 SHA512 e7c68dfce1e9b886449774567f225cf267366ab857e510de3bae9867442306defe0b1d86bc90782326f4c252620311f6846a50b89a3f8939e8cfb816e25db209 WHIRLPOOL fc1337b2f270ccc7bab7d3887ef3afb3e50b917995133d44497e276e395670564d5c20289ce114f1da71105ebd535cd815037d66266d942f4e0d183a2a0d7e9d
 DIST mate-terminal-1.16.1.tar.xz 1269040 SHA256 c032a11a6a4f5ccb84c3453cedba6c0b7100858cf1a2fa5d7f97173d4c33bccc SHA512 28505ba425ecdcacb33a49b082101887ee012b37026d92a2ec666f5251ca28fb6c039c1066c55d533cad195c75577c00d93a2b3fad08d20f3619891596e6c2e1 WHIRLPOOL caf3607c674a8ee62b417ae02dd9acf30e1d6b1726b0c2485889071eb8e946f66f31333c0191ba0d67e83eb9450ef5eeda0c066fb92ddc6bbb601e5fcad0d272
+DIST mate-terminal-1.18.1.tar.xz 1299492 SHA256 4135b2212a2ed5d6c20b645e17a76d814aa8212f68f83c0a67a9899680a930fe SHA512 3b102c683137951d425c5c4f177e1498be037cabb9483bd89fea61c1c03e9a5d481a5aa9418e92f3007ac64f7ed3bf298109ba9564f741634c4b5dad94ddddf3 WHIRLPOOL e7d347b523ec0d0a1d7ce2e3ecd0b48bc7900e6da181be7af9cb56a9c72779bc9927096a15d1546c46417672f12363e949f6a7cb38407b3188b841b5a30a8e1a
diff --git a/x11-terms/mate-terminal/mate-terminal-1.18.1.ebuild b/x11-terms/mate-terminal/mate-terminal-1.18.1.ebuild
new file mode 100644
index 000000000000..4184916b569b
--- /dev/null
+++ b/x11-terms/mate-terminal/mate-terminal-1.18.1.ebuild
@@ -0,0 +1,38 @@
+# 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="The MATE Terminal"
+LICENSE="GPL-3"
+SLOT="0"
+
+IUSE=""
+
+COMMON_DEPEND="dev-libs/atk:0
+	>=dev-libs/glib-2.36:2
+	>=gnome-base/dconf-0.13.4:0
+	x11-libs/gdk-pixbuf:2
+	x11-libs/libICE:0
+	x11-libs/libSM:0
+	x11-libs/libX11:0
+	x11-libs/pango:0
+	>=x11-libs/gtk+-3.14:3[X]
+	>=x11-libs/vte-0.38:2.91"
+
+RDEPEND="${COMMON_DEPEND}
+	>=mate-base/mate-desktop-1.6"
+
+DEPEND="${COMMON_DEPEND}
+	app-text/rarian:0
+	>=app-text/scrollkeeper-dtd-1:1.0
+	app-text/yelp-tools:0
+	>=dev-util/intltool-0.50.1:*
+	sys-devel/gettext:*
+	virtual/pkgconfig:*"
diff --git a/x11-themes/mate-backgrounds/Manifest b/x11-themes/mate-backgrounds/Manifest
index 588e0543cb82..41a506baec61 100644
--- a/x11-themes/mate-backgrounds/Manifest
+++ b/x11-themes/mate-backgrounds/Manifest
@@ -1,3 +1,4 @@
 DIST mate-backgrounds-1.12.0.tar.xz 20885844 SHA256 841f098c94967fce74d6dd57cd0291e7aaee65effbd94d767a16b2f25feb6c2d SHA512 3dfb175bf0a2240b2639a6038625679d9f13ed7c9b8e381eb4249f9938410cbb24593fa00baac7a1dd7458ecd00ea6e24ab03ff161381d250ddbac5b5cbabc55 WHIRLPOOL aee7ddc6212c83064fb3caf816cfea2884f7ed6d341e9c32acab42fcbecc54ddc69d8cc8aed9841c0de9ac751d2f335068151a254ceaa2aae2879c170b4af602
 DIST mate-backgrounds-1.14.0.tar.xz 20889156 SHA256 1e01411969496e766db479b53ea1caa66ae7e3b350d011aa112840dcffd30751 SHA512 01bbe17b6c42626a056e3648bdbaef5b3fac950c7da951641634f543b496b24f5b0777d85269d6905f0b08e636eb50e19a348030b874e6c91208434c042d204f WHIRLPOOL ca73db034f5ea3f02a44e0f5e8954ab74ae1227184d9df193fd441d5d9ec70a79c6470e013a78b7f4ea901d2ef94bce2c2873395666b6b6cb2bb95cae506ac16
 DIST mate-backgrounds-1.16.0.tar.xz 20889904 SHA256 37cc2489033b1bba03de2ada567f8e40de3d5c3e36b7af16270baaf3765a1a39 SHA512 fa9d3913089a90fa4260820b4d074d7d1209cf9a384929cd041fe9eef396b6796cc61eb3897d08283eb4d7ad852686e8e99d345514194523cdfb22566c5487e8 WHIRLPOOL a4cd54f1be6c29e1aec501587337d87ab68469c6d6f7d95360beebe7d323fedc449c8936b47709d94565708d4ceaa3be78ead5bf2065939224951c46470a8edf
+DIST mate-backgrounds-1.18.0.tar.xz 20890260 SHA256 f103d38898cc088608c813d732e4681fd6a8b9cf2a9564b9d057461da59e081b SHA512 489ed3c57f60b471cba6afa8243cd752b534ac1881db30310b603949af7e3bfb3c9fa8d55c37942377cb36c0fc7545d940de2d03c1166e829b128e6c576f587e WHIRLPOOL c0d85b40169214aff15488b67aec284806ba16b1a026329f88772f7c2cede7b98e6ccb6380a38990420244eaa3aa71e4ee8a99587553c335b71bfa139f52de65
diff --git a/x11-themes/mate-backgrounds/mate-backgrounds-1.18.0.ebuild b/x11-themes/mate-backgrounds/mate-backgrounds-1.18.0.ebuild
new file mode 100644
index 000000000000..09489cabe1b2
--- /dev/null
+++ b/x11-themes/mate-backgrounds/mate-backgrounds-1.18.0.ebuild
@@ -0,0 +1,17 @@
+# 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="A set of backgrounds packaged with the MATE desktop"
+LICENSE="GPL-2"
+SLOT="0"
+
+DEPEND=">=dev-util/intltool-0.35:*
+	sys-devel/gettext:*"
diff --git a/x11-themes/mate-icon-theme-faenza/Manifest b/x11-themes/mate-icon-theme-faenza/Manifest
index 2364af71945b..be864da17972 100644
--- a/x11-themes/mate-icon-theme-faenza/Manifest
+++ b/x11-themes/mate-icon-theme-faenza/Manifest
@@ -1,3 +1,4 @@
 DIST mate-icon-theme-faenza-1.12.0.tar.xz 19058516 SHA256 c8f6eaac54fdd6d3a81e5cbf18e2bb342c51fd07e0d3deaafc7ca2180bf0b97c SHA512 58c26458027bc9938ca01f88942faedce5189b090302adb3c4f63f1c042616fb4fb8f53f1454a9d7de1b642af1074fa3f7a1a75eeaacbc675a4467dad9b95be4 WHIRLPOOL 06caf42f694c25a92c0206476711361208d7dba71da7daaed802242a1bd020bfb6280bec45e1cb35e17cc53d0d60c01ae12951a671548d29eceb015a2da2c4d6
 DIST mate-icon-theme-faenza-1.14.0.tar.xz 19314908 SHA256 d912ffc86e01e71e96499c993cc429922ffd2576abc075e5c212cd95095fb984 SHA512 91c92eb1e3db91425a6fba13803b050227acf3bc0e9b6c0f07f6805d7c154cc21e2dbf38fac567aa4953abebb678663936491a65a0de5889be837f53068a6e58 WHIRLPOOL 597f961079bf742f091558f41daa47f3370c8a55520f38b6c2b51ba8697ecb95b5a86792ab419c88ddf663f54dc88aac8d01069e9142885dd4b1b6a232adc049
 DIST mate-icon-theme-faenza-1.16.0.tar.xz 19312972 SHA256 6f45684c4df51598115e891c95e6949c1f066e436ef0a685fc30ef95151e7f5c SHA512 27d7521f52edf274eb066c7a7c689237dc584b68712787e5e008b22d90427391c952fd59eb372c4d08063af7f0bd85dbab35c57fd63b3e86fda174010f76c0fb WHIRLPOOL 777eb785cd285b3d6b624dfb717f3b6e3bb8f459aa2976a9662f840532a1a46f2f3b05527ab309b095e956f02bd4d097759baef54587afc7ff46f69d12cdd40b
+DIST mate-icon-theme-faenza-1.18.1.tar.xz 19330596 SHA256 8920a19b5c1755bf3b489b3bf45b90d88e273825ff455a3ba83dfb42d3e3836d SHA512 16ddccf5b69c69a8a6c8167c38ef4603c997b756e222e61d7b2d1540598efabde01cafbc1248082054e92d078dcc792f2afd1c68ceedcbf15846cdbe6241875b WHIRLPOOL 2f69f00b88390d22fde74c98d73f7eb4428a347e3541ff93fe0d87db1da1789bd87499d60017c5e30f48dc3d750a9f0ca10ee04a26f8ff61e47165c446efa9d3
diff --git a/x11-themes/mate-icon-theme-faenza/mate-icon-theme-faenza-1.18.1.ebuild b/x11-themes/mate-icon-theme-faenza/mate-icon-theme-faenza-1.18.1.ebuild
new file mode 100644
index 000000000000..d5ebf38ca9fd
--- /dev/null
+++ b/x11-themes/mate-icon-theme-faenza/mate-icon-theme-faenza-1.18.1.ebuild
@@ -0,0 +1,31 @@
+# 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="Faenza icon theme, that was adapted for MATE desktop"
+LICENSE="GPL-3"
+SLOT="0"
+
+IUSE="minimal"
+
+RDEPEND="x11-themes/hicolor-icon-theme:0
+	!minimal? ( >=x11-themes/mate-icon-theme-${MATE_BRANCH} )"
+
+RESTRICT="binchecks strip"
+
+# https://github.com/mate-desktop/mate-icon-theme-faenza/issues/13
+MATE_FORCE_AUTORECONF=true
+
+src_prepare() {
+	# Remove broken libreoffice icons (dangling symlinks).
+	rm matefaenza/apps/16/*libreoffice* || die
+
+	mate_src_prepare
+}
diff --git a/x11-themes/mate-icon-theme/Manifest b/x11-themes/mate-icon-theme/Manifest
index b3a4a9a9f792..13b2a126bb48 100644
--- a/x11-themes/mate-icon-theme/Manifest
+++ b/x11-themes/mate-icon-theme/Manifest
@@ -1,3 +1,4 @@
 DIST mate-icon-theme-1.12.0.tar.xz 19330108 SHA256 77e253e8c332d7283384aca82c607513201477376bb15621a27df09ce8ce2135 SHA512 b108a677ead07eec8811c4e97d478c1d0ee319a684e48076cffca893120537564748e9ecba02b44feabf3e255610e2d596c1490fdb2fc9fed5b04f1908c5726f WHIRLPOOL f6dbe3837e80624a4b5ad09451077c5ca1cc82aaf5e26a692e384ab1de66415ce8d5aba2951bbf5f98922fdf18b72cabc5a95ffdbb1383759acbca13bc5fb9a8
 DIST mate-icon-theme-1.14.0.tar.xz 19054508 SHA256 15bb2bed0046d7d4d8f770c04d00ffb55ffd72d601b05ac07f112265e9261eb5 SHA512 e75c1d6ad0781050a359fe1b54f836e9bc4e099f465a5bc4dc3e235432558304561c047f7f1e4d1764522073f04aa65ca9ae4dbde44627de8b3a9de1e7178490 WHIRLPOOL 2d3a2cdc084894ce51bbd30010883387c2ba839d308be723bb5f7709e104064b3fa2ebf7c12ce2e0d0fdab95a2939f3fd57732b9b0e0bf767f97769bdcf09fa5
 DIST mate-icon-theme-1.16.0.tar.xz 19056916 SHA256 edec67867b26974ef286cd85e968efee3ee5ea4d232b86b48ee6c47085e08dfe SHA512 3d5d609715119d9e3b7c5aebafa3572e60757d9445978cba0a33d58e19623f2886f9a83ab58bfa29839acd773f5b46690b5619a9934828c123c4f2d727099714 WHIRLPOOL 51506e6339c53fb8899ffa233aa7cecf2c4c70870db43722eb1b90eca46855d99f034a2bb15365d90bd8c2dce0984e61b051f065e79739b6d13c71b3739874bc
+DIST mate-icon-theme-1.18.2.tar.xz 20071792 SHA256 9091373f9672634b5bc09344d4819df717e48ac55b6a057f21faa83f47a4236a SHA512 6e6d60b7eeba474d4d9d4d069f9fa4f8098cf54aa8367c02b05c5ec556ccd5310d791183ec961e9227867b37ec7e27b8ac8aadfee1f1446b34cee1985b4ef1fb WHIRLPOOL 9a073174863e5a3091015a58a5a87b8fba1197b821f66a80c218457fcaf92ce42506442b1844a5af26bf5ba3d19767d5ad06c56c6cc6e2b3781a3e4b366e43b8
diff --git a/x11-themes/mate-icon-theme/mate-icon-theme-1.18.2.ebuild b/x11-themes/mate-icon-theme/mate-icon-theme-1.18.2.ebuild
new file mode 100644
index 000000000000..1e10653efdf6
--- /dev/null
+++ b/x11-themes/mate-icon-theme/mate-icon-theme-1.18.2.ebuild
@@ -0,0 +1,30 @@
+# 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 default icon themes"
+LICENSE="GPL-2"
+SLOT="0"
+
+COMMON_DEPEND=">=x11-themes/hicolor-icon-theme-0.10"
+
+RDEPEND="${COMMON_DEPEND}"
+
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/intltool-0.40:*
+	>=x11-misc/icon-naming-utils-0.8.7:0
+	sys-devel/gettext:*
+	virtual/pkgconfig:*"
+
+RESTRICT="binchecks strip"
+
+src_configure() {
+	mate_src_configure --enable-icon-mapping
+}
diff --git a/x11-themes/mate-themes/Manifest b/x11-themes/mate-themes/Manifest
index 2775e61dee0c..9215e5abdf1d 100644
--- a/x11-themes/mate-themes/Manifest
+++ b/x11-themes/mate-themes/Manifest
@@ -1,7 +1,15 @@
 DIST mate-themes-3.16.3.tar.xz 4304720 SHA256 5ab8e1d2093993c9f87061289b51c431a5a1c303793c69e1abcaa9b38dbedab8 SHA512 6edaec87c830bb88b9500ec106259e62767bc333d75bc4025866c42700c4cf8e2be0ab6c9d6b9518c5d89a5fc6cfc928eac3102c4354ef4cdd181f1e30eb5dfc WHIRLPOOL 825d309e002182fc8a59dc2a907a431b0e8d76d9918d6ca8d2a87d5f21eb54f86d4493649eecfc857cec55f7840d438e47aff7c4ba72c83aa64d5e0a97d30744
+DIST mate-themes-3.16.5.tar.xz 4307832 SHA256 b8ca34337e2d8aaf06777b9d4340656faed7d8eac3b43a7c418479bb57c1440a SHA512 157c84416b0df0bc72bb84e0952cbb58b7314cbe347d9e9f1316ebd5633063eba69c740e64829167e28422649bee66d1e34e5cbf66fb282d15887db188935e08 WHIRLPOOL 4b9671c662639a6a8b3f65ab04a18aecbb3c77dae45607eae6e02ae5db29473fe7c9d6fd83e084a66f312e150295d785aa17176c8c0103c4065e9ac38c586fc2
+DIST mate-themes-3.16.6.tar.xz 4298004 SHA256 de732eb4a92c7a4d6431daa931661275411e8e39251931079bb5501153d0243c SHA512 28e216765ffb7fff0885e7be9ba8976e962ffd6554db81103766d3c7023a812a504090cc89b33cf73e43b266762d831124646cde391a80681043d3ee2da76228 WHIRLPOOL 203afda99f46dc9275e7aa089facd141462425a290fd594847484f3db29e974023f85593b078cd3f5768a09aae74008268bccdaea253e01ce188b60b555ec527
 DIST mate-themes-3.18.3.tar.xz 4326564 SHA256 c5628cf8b8e48bc3821fac68ec9d1d39f7e2b2b1f7acc23b2fa95a69e5a66f27 SHA512 7138c1e49b843116812e43ce723af57845bfef9d2e1ff7f455c57f02f613b0a8ef7da6f641ac76dbf8209207d75327c1e101f09e8ac76b4ffa497c0a6167fa39 WHIRLPOOL 6c4ea6548669dbbfcaea04cac71719ef6676321a83577ad84b6c95516ede1c75ca37aada98a514dbcc6f3fcfc943b712eb57bbfd03da6e2cabd348c67d98cf3d
+DIST mate-themes-3.18.5.tar.xz 4331036 SHA256 5681468305de36b377485cc27bb00ea8525c3b937d2c3add4bf89e3398d40da1 SHA512 941b04b02925d2d503ebc6568857a87d82cf8d675eae55ff04d87fbadebae1133b8889b76c5b081191413d54916976a5e78dd6095805b940fab127564fd06190 WHIRLPOOL 3564b00854d3aeba1b009210520f57a0640527999d28bba123406ce579198e633b8d6c41b372af2754be52fab9e4994e28b2aec5cee5679469c19c7071632900
+DIST mate-themes-3.18.6.tar.xz 4325356 SHA256 d244073ef7f0ac968bdf578ace9cec43e37e73a35e954e61e11d7e1993a6bbc8 SHA512 aa6a7dd54fa872efff22f555ecd78f909cf493a6bda1b64d08b933297716503f92b139421c5fa9f55f6748025542520993c4fe1cd745f5db225be9e0e4e0bc4d WHIRLPOOL 1e77fd8e21ad5e16f55b39bc7f8adba2e74887753b4eb61353bbd001300953077d63dafbbcff44a08bf706807b13c9b04c0dc36f682303cb2c6aaa608965e9ff
 DIST mate-themes-3.20.10.tar.xz 4254436 SHA256 91c114fcb14979d88dae76a7e2e3b37f439f5daf0dd8a492c17a6174638b102e SHA512 23f3e26c914480e85a4d1792e81885f720042c46b6850bc0096cea5d59112ed22f83fa79d4fb85a96d1b4210c5021179e8ac7cd1a3cfe4f640d1573349cf0895 WHIRLPOOL d78dc5f607802be1885a4942e72b0cd7d068a60c4e87ce44f70fdf9cd65f27491befba55fb0f848b0bd972b3925c0d54dcc28dc49c66e9ccb911f3e88ac6181e
 DIST mate-themes-3.20.11.tar.xz 4252692 SHA256 b81845c2b1a7f4dfb273982d2380fbdb53d124dfd5b91018c620db9282c5c3b2 SHA512 9c437385be1e4476d6ec5caf2dd1170c3dc700f19eb00108edfc45ca9c8a9b63ffa0f71da3b411c1f6546963b47efee28cb3a99fe5e9d9d61a4dbb65fc129c8c WHIRLPOOL 41f2b3a174132780334aae2f14dd384aad23c1ffc2df0330c9319e1466bf7feea324a26aed62df376e43a136956691c78f6b0f2d3c461e47532870840717f962
 DIST mate-themes-3.20.13.tar.xz 4260048 SHA256 129580613eb2059ce1e0d99655bb7d706f698ef69d2f4bb72dca17d64d94a219 SHA512 bb2d513d417ffe58e6e2b0664b63a81c3d17539f2926a99909595560f8e89c5b6122e5d0392e8c485c941a9af6194e82d52d270eeb4d2a0e2f91c68b5ae100ef WHIRLPOOL b295138a804d39d316f2a12bd028195de1a9b54fa03c1f949afe5afbeacd932a11af550ee8083f95b35c1da7f45c3f1f51b8685641dd0688263e0a3643397817
+DIST mate-themes-3.20.16.tar.xz 4263684 SHA256 fbe4105c940e5a2055e6ca3a82701a60d938847b0a6bfb04ca4c3383afa47fb7 SHA512 1f45f221a6715b2cb642d316533d56034e0b9d832ef9cf9a2fdafd25793c0f24a6ffa188104e854d4ad44bce828565958414d75d4ffa748e46d6d0a1f45c81f0 WHIRLPOOL f25947fd32111d97e8468702ed5825397172ff4cc3edfac684d36b994a79ca096496b767bcb344d1b14b5bc354801dc369f4a4ba079747919f3ae7bbc8845636
+DIST mate-themes-3.20.17.tar.xz 4258980 SHA256 5e70e2a9fcdb94ae91e8e54cca42e01ac60052ade976b876a2fa988509602468 SHA512 2ec2a498c66f1fc94bff79c415bef1224036de342575d4459890e6b19b1c7a4a413e2715115ff730d2715f8d9552083b398d23db2c99ef750e8c59afa0f8042b WHIRLPOOL b47fe4feefff7393e8b669b27fa705396e5140dea8d4aa098b25a783714a41ed27e1b302865799081fd88512306211637cc4964bd5603a9fa637ba69c3b29304
+DIST mate-themes-3.20.20.tar.xz 4266764 SHA256 773d043f9e177f2b4500cb9e099a51412ba72dd3a73baf35c9cbdf570904c3cb SHA512 29e3debd9fd5181118ef93abab535093315248d48c9fba96de73580aafc8e9df2d5c7ed4b9d39c9f4f445c2b71b15d13391b2c2e58bbf784c1af1267a1956f8b WHIRLPOOL af5a0ca136d8974f66d28285de0ecdbaeea1d7aca51cca80243a47e5721654bfcc8157714eec2eac6e06e497cf4628d015bb5e2d6a8825b19f4520d42a707808
+DIST mate-themes-3.22.11.tar.xz 4268704 SHA256 d529a64b84a97152417f2398d2d4f366c6a820fad1a49a46f0c8e0e12d0bcabd SHA512 e8f36ed93485b8229370cb9a009e2473695477574ef2d70f638ecc5757b4d387a0e59a5eadfad5a5c240460cd61f594ee56be015730cdaf62490fc66a652c234 WHIRLPOOL f67d34f93b35049702329a6cf6bd9e8db2f533daaf41ca19481e5e777c4db6450f47de4a0d26be41e969f9b6c267788ab4b9953c158b3a2035869a44afd4826f
 DIST mate-themes-3.22.7.tar.xz 4266344 SHA256 60963bb92d2a99619aeb163c1fd486954df54dc2cc4976ba18f203dd26864cce SHA512 bf44841686461fc55238bb3d62a6bdccf41e23116b321787dae2c4995ab5c5df7c9431dc7c831473c0a78867eb10f6142554434991a7654fa59ab3f76eafdca2 WHIRLPOOL 11cddd2bf9920c671fd001f9f7702a30cba57b3eb75a4527ea00e0de507800b6b0e32e9c9962ebd34a0eb4f5a494dcaf17931cdb619fcb4b1ea47a02c5cf3b42
 DIST mate-themes-3.22.8.tar.xz 4266436 SHA256 c312684500afe066f34f250530a08ba6c2c52881f398a2fbde8586f89feb9b3f SHA512 1ee02a93ff03a2e2c50c352e9a4b2fd3f093a8d7990fce36bc0d3af65501202a281904bee74c095eda549b1be9a50bf4a293071cf0980fced8158df97d986d0e WHIRLPOOL 754622fba8f07845717d04f2ff090fb0675cb4b38d87ec717a7fed2a46741f164d16657ceb3b2927b73c79d363fd6f632d1129bd502f9964e515cf7fb39ce139
diff --git a/x11-themes/mate-themes/mate-themes-3.16.5.ebuild b/x11-themes/mate-themes/mate-themes-3.16.5.ebuild
new file mode 100644
index 000000000000..6e88f31b8f6d
--- /dev/null
+++ b/x11-themes/mate-themes/mate-themes-3.16.5.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools gnome2-utils versionator
+
+MATE_GTK_V="$(get_version_component_range 1-2)"
+MATE_GTK_NV="3.$(( ${MATE_GTK_V#3.} + 1 ))" #variable to allow negation of =$P-1*
+
+if [[ ${PV#${MATE_GTK_V}.} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/mate-desktop/${PN}.git"
+	EGIT_BRANCH="gtk${MATE_GTK_V}"
+else
+	SRC_URI="http://pub.mate-desktop.org/releases/themes/${MATE_GTK_V}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+HOMEPAGE="http://mate-desktop.org"
+DESCRIPTION="A set of MATE themes, with sets for users with limited or low vision"
+LICENSE="LGPL-2.1"
+SLOT="0/${MATE_GTK_V}"
+
+RDEPEND="
+	>=x11-libs/gdk-pixbuf-2:2
+	>=x11-libs/gtk+-2:2
+	!<x11-libs/gtk+-${MATE_GTK_V}:3
+	!>=x11-libs/gtk+-${MATE_GTK_NV}:3
+	>=x11-themes/gtk-engines-2.15.3:2
+	x11-themes/gtk-engines-murrine"
+
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.35:*
+	sys-devel/gettext:*
+	>=sys-devel/autoconf-2.53:*
+	>=x11-misc/icon-naming-utils-0.8.7:0
+	virtual/pkgconfig:*"
+
+RESTRICT="binchecks strip"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/x11-themes/mate-themes/mate-themes-3.16.6.ebuild b/x11-themes/mate-themes/mate-themes-3.16.6.ebuild
new file mode 100644
index 000000000000..55aed57590a7
--- /dev/null
+++ b/x11-themes/mate-themes/mate-themes-3.16.6.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools gnome2-utils versionator
+
+MATE_GTK_V="$(get_version_component_range 1-2)"
+MATE_GTK_NV="3.$(( ${MATE_GTK_V#3.} + 1 ))" #variable to allow negation of =$P-1*
+
+if [[ ${PV#${MATE_GTK_V}.} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/mate-desktop/${PN}.git"
+	EGIT_BRANCH="gtk${MATE_GTK_V}"
+else
+	SRC_URI="http://pub.mate-desktop.org/releases/themes/${MATE_GTK_V}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+HOMEPAGE="http://mate-desktop.org"
+DESCRIPTION="A set of MATE themes, with sets for users with limited or low vision"
+LICENSE="LGPL-2.1"
+SLOT="0/${MATE_GTK_V}"
+
+COMMON_DEPEND=">=x11-libs/gdk-pixbuf-2:2
+	>=x11-libs/gtk+-2:2
+	!<x11-libs/gtk+-${MATE_GTK_V}:3
+	!>=x11-libs/gtk+-${MATE_GTK_NV}:3
+	>=x11-themes/gtk-engines-2.15.3:2
+	x11-themes/gtk-engines-murrine"
+
+RDEPEND="${COMMON_DEPEND}"
+
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/intltool-0.35:*
+	sys-devel/gettext:*
+	>=sys-devel/autoconf-2.53:*
+	>=x11-misc/icon-naming-utils-0.8.7:0
+	virtual/pkgconfig:*"
+
+RESTRICT="binchecks strip"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/x11-themes/mate-themes/mate-themes-3.18.5.ebuild b/x11-themes/mate-themes/mate-themes-3.18.5.ebuild
new file mode 100644
index 000000000000..6e88f31b8f6d
--- /dev/null
+++ b/x11-themes/mate-themes/mate-themes-3.18.5.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools gnome2-utils versionator
+
+MATE_GTK_V="$(get_version_component_range 1-2)"
+MATE_GTK_NV="3.$(( ${MATE_GTK_V#3.} + 1 ))" #variable to allow negation of =$P-1*
+
+if [[ ${PV#${MATE_GTK_V}.} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/mate-desktop/${PN}.git"
+	EGIT_BRANCH="gtk${MATE_GTK_V}"
+else
+	SRC_URI="http://pub.mate-desktop.org/releases/themes/${MATE_GTK_V}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+HOMEPAGE="http://mate-desktop.org"
+DESCRIPTION="A set of MATE themes, with sets for users with limited or low vision"
+LICENSE="LGPL-2.1"
+SLOT="0/${MATE_GTK_V}"
+
+RDEPEND="
+	>=x11-libs/gdk-pixbuf-2:2
+	>=x11-libs/gtk+-2:2
+	!<x11-libs/gtk+-${MATE_GTK_V}:3
+	!>=x11-libs/gtk+-${MATE_GTK_NV}:3
+	>=x11-themes/gtk-engines-2.15.3:2
+	x11-themes/gtk-engines-murrine"
+
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.35:*
+	sys-devel/gettext:*
+	>=sys-devel/autoconf-2.53:*
+	>=x11-misc/icon-naming-utils-0.8.7:0
+	virtual/pkgconfig:*"
+
+RESTRICT="binchecks strip"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/x11-themes/mate-themes/mate-themes-3.18.6.ebuild b/x11-themes/mate-themes/mate-themes-3.18.6.ebuild
new file mode 100644
index 000000000000..55aed57590a7
--- /dev/null
+++ b/x11-themes/mate-themes/mate-themes-3.18.6.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools gnome2-utils versionator
+
+MATE_GTK_V="$(get_version_component_range 1-2)"
+MATE_GTK_NV="3.$(( ${MATE_GTK_V#3.} + 1 ))" #variable to allow negation of =$P-1*
+
+if [[ ${PV#${MATE_GTK_V}.} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/mate-desktop/${PN}.git"
+	EGIT_BRANCH="gtk${MATE_GTK_V}"
+else
+	SRC_URI="http://pub.mate-desktop.org/releases/themes/${MATE_GTK_V}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+HOMEPAGE="http://mate-desktop.org"
+DESCRIPTION="A set of MATE themes, with sets for users with limited or low vision"
+LICENSE="LGPL-2.1"
+SLOT="0/${MATE_GTK_V}"
+
+COMMON_DEPEND=">=x11-libs/gdk-pixbuf-2:2
+	>=x11-libs/gtk+-2:2
+	!<x11-libs/gtk+-${MATE_GTK_V}:3
+	!>=x11-libs/gtk+-${MATE_GTK_NV}:3
+	>=x11-themes/gtk-engines-2.15.3:2
+	x11-themes/gtk-engines-murrine"
+
+RDEPEND="${COMMON_DEPEND}"
+
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/intltool-0.35:*
+	sys-devel/gettext:*
+	>=sys-devel/autoconf-2.53:*
+	>=x11-misc/icon-naming-utils-0.8.7:0
+	virtual/pkgconfig:*"
+
+RESTRICT="binchecks strip"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/x11-themes/mate-themes/mate-themes-3.20.16.ebuild b/x11-themes/mate-themes/mate-themes-3.20.16.ebuild
new file mode 100644
index 000000000000..55aed57590a7
--- /dev/null
+++ b/x11-themes/mate-themes/mate-themes-3.20.16.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools gnome2-utils versionator
+
+MATE_GTK_V="$(get_version_component_range 1-2)"
+MATE_GTK_NV="3.$(( ${MATE_GTK_V#3.} + 1 ))" #variable to allow negation of =$P-1*
+
+if [[ ${PV#${MATE_GTK_V}.} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/mate-desktop/${PN}.git"
+	EGIT_BRANCH="gtk${MATE_GTK_V}"
+else
+	SRC_URI="http://pub.mate-desktop.org/releases/themes/${MATE_GTK_V}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+HOMEPAGE="http://mate-desktop.org"
+DESCRIPTION="A set of MATE themes, with sets for users with limited or low vision"
+LICENSE="LGPL-2.1"
+SLOT="0/${MATE_GTK_V}"
+
+COMMON_DEPEND=">=x11-libs/gdk-pixbuf-2:2
+	>=x11-libs/gtk+-2:2
+	!<x11-libs/gtk+-${MATE_GTK_V}:3
+	!>=x11-libs/gtk+-${MATE_GTK_NV}:3
+	>=x11-themes/gtk-engines-2.15.3:2
+	x11-themes/gtk-engines-murrine"
+
+RDEPEND="${COMMON_DEPEND}"
+
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/intltool-0.35:*
+	sys-devel/gettext:*
+	>=sys-devel/autoconf-2.53:*
+	>=x11-misc/icon-naming-utils-0.8.7:0
+	virtual/pkgconfig:*"
+
+RESTRICT="binchecks strip"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/x11-themes/mate-themes/mate-themes-3.20.17.ebuild b/x11-themes/mate-themes/mate-themes-3.20.17.ebuild
new file mode 100644
index 000000000000..55aed57590a7
--- /dev/null
+++ b/x11-themes/mate-themes/mate-themes-3.20.17.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools gnome2-utils versionator
+
+MATE_GTK_V="$(get_version_component_range 1-2)"
+MATE_GTK_NV="3.$(( ${MATE_GTK_V#3.} + 1 ))" #variable to allow negation of =$P-1*
+
+if [[ ${PV#${MATE_GTK_V}.} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/mate-desktop/${PN}.git"
+	EGIT_BRANCH="gtk${MATE_GTK_V}"
+else
+	SRC_URI="http://pub.mate-desktop.org/releases/themes/${MATE_GTK_V}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+HOMEPAGE="http://mate-desktop.org"
+DESCRIPTION="A set of MATE themes, with sets for users with limited or low vision"
+LICENSE="LGPL-2.1"
+SLOT="0/${MATE_GTK_V}"
+
+COMMON_DEPEND=">=x11-libs/gdk-pixbuf-2:2
+	>=x11-libs/gtk+-2:2
+	!<x11-libs/gtk+-${MATE_GTK_V}:3
+	!>=x11-libs/gtk+-${MATE_GTK_NV}:3
+	>=x11-themes/gtk-engines-2.15.3:2
+	x11-themes/gtk-engines-murrine"
+
+RDEPEND="${COMMON_DEPEND}"
+
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/intltool-0.35:*
+	sys-devel/gettext:*
+	>=sys-devel/autoconf-2.53:*
+	>=x11-misc/icon-naming-utils-0.8.7:0
+	virtual/pkgconfig:*"
+
+RESTRICT="binchecks strip"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/x11-themes/mate-themes/mate-themes-3.20.20.ebuild b/x11-themes/mate-themes/mate-themes-3.20.20.ebuild
new file mode 100644
index 000000000000..55aed57590a7
--- /dev/null
+++ b/x11-themes/mate-themes/mate-themes-3.20.20.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools gnome2-utils versionator
+
+MATE_GTK_V="$(get_version_component_range 1-2)"
+MATE_GTK_NV="3.$(( ${MATE_GTK_V#3.} + 1 ))" #variable to allow negation of =$P-1*
+
+if [[ ${PV#${MATE_GTK_V}.} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/mate-desktop/${PN}.git"
+	EGIT_BRANCH="gtk${MATE_GTK_V}"
+else
+	SRC_URI="http://pub.mate-desktop.org/releases/themes/${MATE_GTK_V}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+HOMEPAGE="http://mate-desktop.org"
+DESCRIPTION="A set of MATE themes, with sets for users with limited or low vision"
+LICENSE="LGPL-2.1"
+SLOT="0/${MATE_GTK_V}"
+
+COMMON_DEPEND=">=x11-libs/gdk-pixbuf-2:2
+	>=x11-libs/gtk+-2:2
+	!<x11-libs/gtk+-${MATE_GTK_V}:3
+	!>=x11-libs/gtk+-${MATE_GTK_NV}:3
+	>=x11-themes/gtk-engines-2.15.3:2
+	x11-themes/gtk-engines-murrine"
+
+RDEPEND="${COMMON_DEPEND}"
+
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/intltool-0.35:*
+	sys-devel/gettext:*
+	>=sys-devel/autoconf-2.53:*
+	>=x11-misc/icon-naming-utils-0.8.7:0
+	virtual/pkgconfig:*"
+
+RESTRICT="binchecks strip"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/x11-themes/mate-themes/mate-themes-3.22.11.ebuild b/x11-themes/mate-themes/mate-themes-3.22.11.ebuild
new file mode 100644
index 000000000000..55aed57590a7
--- /dev/null
+++ b/x11-themes/mate-themes/mate-themes-3.22.11.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools gnome2-utils versionator
+
+MATE_GTK_V="$(get_version_component_range 1-2)"
+MATE_GTK_NV="3.$(( ${MATE_GTK_V#3.} + 1 ))" #variable to allow negation of =$P-1*
+
+if [[ ${PV#${MATE_GTK_V}.} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/mate-desktop/${PN}.git"
+	EGIT_BRANCH="gtk${MATE_GTK_V}"
+else
+	SRC_URI="http://pub.mate-desktop.org/releases/themes/${MATE_GTK_V}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+HOMEPAGE="http://mate-desktop.org"
+DESCRIPTION="A set of MATE themes, with sets for users with limited or low vision"
+LICENSE="LGPL-2.1"
+SLOT="0/${MATE_GTK_V}"
+
+COMMON_DEPEND=">=x11-libs/gdk-pixbuf-2:2
+	>=x11-libs/gtk+-2:2
+	!<x11-libs/gtk+-${MATE_GTK_V}:3
+	!>=x11-libs/gtk+-${MATE_GTK_NV}:3
+	>=x11-themes/gtk-engines-2.15.3:2
+	x11-themes/gtk-engines-murrine"
+
+RDEPEND="${COMMON_DEPEND}"
+
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/intltool-0.35:*
+	sys-devel/gettext:*
+	>=sys-devel/autoconf-2.53:*
+	>=x11-misc/icon-naming-utils-0.8.7:0
+	virtual/pkgconfig:*"
+
+RESTRICT="binchecks strip"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/x11-wm/marco/Manifest b/x11-wm/marco/Manifest
index b13b394d7fc1..a1ce6de30296 100644
--- a/x11-wm/marco/Manifest
+++ b/x11-wm/marco/Manifest
@@ -1,3 +1,4 @@
 DIST marco-1.12.1.tar.xz 1163996 SHA256 7f799115952a209e5063e5bd88d61d0baf430e630ca7783626af4dce46add084 SHA512 d271c4627fc50643d8e1a2faec33b5327999ad16a3975d62ea3ded956bccf3d5e015ed8085d43a200a34f1ea78f17d7e4ea4afaa9111e5f2e3a2230b51752945 WHIRLPOOL 960074cb63e4bc3381c128f016b0f1c30b1ba2d04ccd3e9a059ac43fb14d81a562dd7b3d5004ddae3a77146737d078eddeed52da3cf66f5106fb22f2500a9e42
 DIST marco-1.14.2.tar.xz 1244076 SHA256 31ab76950bd6f8e829c1c40be8cb53c0d77a17791137752d196e73f3d9e55be4 SHA512 6ca782f5dbbc01f5df4be901a1a6bf5b23398716e5802118482a0bf98e35f4dc544a6070358a931ca11f2d8b71cbbfb7e8768e0535c6605433a202be348ddf84 WHIRLPOOL 61ca2466f9965452e9481f42fc5803041303e5a4696cc11433b0803c23938eb2bc74bfb3f8d7d3b12d6ced37479ea9765f683d06087d5819ab9b23099c9cf617
 DIST marco-1.16.0.tar.xz 1245540 SHA256 33c0fbced78a4d0f22b16858517f9b3574f5de2e34dadf168ba7df5e9de0d0e3 SHA512 f353514dc69543e97fe08f9c67275c195ddc1c52b8b98dfb956351580b541a20b9f3a63d0b41939aca59e2416e58bb384206bbe2b8f56a26435b9760d23665b4 WHIRLPOOL db8636dd91358af76695074a6cfc1340e61a56418bae3b090ace87a7df73d8db715bdd6da1871c8abd757ff4d158c0202ddbbd157bc90d6c43818e317380f802
+DIST marco-1.18.1.tar.xz 1251108 SHA256 65a276104745817208582e5da1894eeb86391ea2e288775aa1d098e679ba8b53 SHA512 d6851c8c1c5bc25993dc72de7e5090736d236942ad37124ef52d0c23cc66faa1e4288273160bb9c1d1c303c99e3e096dcf031b2ea70bde93858627f31034708c WHIRLPOOL 94114a29315e5efe3a0204111f9299e23a7861993c37228d96a68c21fbceb3e0ea4de671056b9a3a21130aaa1ab0b23c4ef326a8e8ab65beaf58550fd0a10d58
diff --git a/x11-wm/marco/marco-1.18.1.ebuild b/x11-wm/marco/marco-1.18.1.ebuild
new file mode 100644
index 000000000000..c662c1eca330
--- /dev/null
+++ b/x11-wm/marco/marco-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
+
+MATE2_LA_PUNT="yes"
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+DESCRIPTION="MATE default window manager"
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="startup-notification test xinerama"
+
+COMMON_DEPEND="
+	dev-libs/atk:0
+	>=dev-libs/glib-2.32.10:2
+	>=gnome-base/libgtop-2:2=
+	media-libs/libcanberra:0[gtk3]
+	x11-libs/cairo:0
+	>=x11-libs/pango-1.2:0[X]
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.0:3
+	x11-libs/libICE:0
+	x11-libs/libSM:0
+	x11-libs/libX11:0
+	>=x11-libs/libXcomposite-0.3:0
+	x11-libs/libXcursor:0
+	x11-libs/libXdamage:0
+	x11-libs/libXext:0
+	x11-libs/libXfixes:0
+	x11-libs/libXrandr:0
+	x11-libs/libXrender:0
+	>=x11-libs/startup-notification-0.7:0
+	virtual/libintl:0
+	xinerama? ( x11-libs/libXinerama:0 )
+	!!x11-wm/mate-window-manager"
+
+RDEPEND="${COMMON_DEPEND}
+	gnome-extra/zenity:0
+	>=mate-base/mate-desktop-1.17.0"
+
+DEPEND="${COMMON_DEPEND}
+	app-text/yelp-tools:0
+	>=dev-util/intltool-0.34.90:*
+	sys-devel/gettext:*
+	virtual/pkgconfig:*
+	x11-proto/xextproto:0
+	x11-proto/xproto:0
+	test? ( app-text/docbook-xml-dtd:4.5 )
+	xinerama? ( x11-proto/xineramaproto:0 )"
+
+src_configure() {
+	mate_src_configure \
+		--enable-compositor \
+		--enable-render \
+		--enable-shape \
+		--enable-sm \
+		--enable-xsync \
+		$(use_enable startup-notification) \
+		$(use_enable xinerama)
+}
+
+src_install() {
+	mate_src_install
+	dodoc {,doc/}*.txt
+}