reinit the tree, so we can have metadata

author: V3n3RiX <venerix@redcorelinux.org> 2017-10-09 18:53:29 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2017-10-09 18:53:29 +0100
commit: 4f2d7949f03e1c198bc888f2d05f421d35c57e21 (patch)
tree: ba5f07bf3f9d22d82e54a462313f5d244036c768 /mate-extra
86 files changed, 3781 insertions, 0 deletions
diff --git a/mate-extra/caja-dropbox/Manifest b/mate-extra/caja-dropbox/Manifest
new file mode 100644
index 000000000000..10fa8e17b58d
--- /dev/null
+++ b/mate-extra/caja-dropbox/Manifest
@@ -0,0 +1,12 @@
+AUX caja-dropbox-1.8.0-system-rst2man.patch 463 SHA256 6e2260a6bbf2f25911b23735f155a0a7e0da38bc0433bd7054e2f0ad9122380f SHA512 c3fcfd5b87f7801c77e8935f20d26c2a32ad60a03f068eb891e4bc491296ee1b19763634a02e387d7cf8b4192c30931a6dd9d9bf44f7ce3f8965db62a184c806 WHIRLPOOL b26c60b7bd75a08c5a737dbcc58f9e38b8aea5079f0be3e572e07198773adce4109adedf74bab8129fc18bedb0759153ae5bf2abd60b457b8f3ff0cc0a44d6df
+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
+EBUILD caja-dropbox-1.12.0-r1.ebuild 2042 SHA256 3a012025fe8ca00d4c2a7d4d08dd44bde74d2d80e8b29a81367f283cc2c1bbd8 SHA512 086d27e73708ba49f291d2776b3b0690f73fd7bdfe2439d06bc038b063331e5cc601932ae8710095c60578f745225a357498823c49c9b67810692d1ee5babfca WHIRLPOOL 148ca604e6a5c8681226741b2acbd23fa95d43182057d8b1b6732bbfd1d84732d58df1205c6e75053f520c8b5a346fb01b2b7f2d7fd129b1071788d7c6ca64c2
+EBUILD caja-dropbox-1.14.0.ebuild 2084 SHA256 1c8175f6d1402fb5be36ae7b609b504a44d58ed19d655794fa5463f391840376 SHA512 cbbad2e017ebc5628893c4ed600fb10bbfc3772bf9e77a233134e985b42f31122293c4d5a862b34f2c92a4fd8b40dc0febac55358338aa04e70dac289869d43e WHIRLPOOL d400fcf84eeb6a1610a63e10bc9cdea0cb054c16dfae0333bde1b622ca776b64475de633c2fb9ca4e5ff90a6959492634c0760a86785f4e2c51a13eafabde417
+EBUILD caja-dropbox-1.16.0.ebuild 2084 SHA256 1c8175f6d1402fb5be36ae7b609b504a44d58ed19d655794fa5463f391840376 SHA512 cbbad2e017ebc5628893c4ed600fb10bbfc3772bf9e77a233134e985b42f31122293c4d5a862b34f2c92a4fd8b40dc0febac55358338aa04e70dac289869d43e WHIRLPOOL d400fcf84eeb6a1610a63e10bc9cdea0cb054c16dfae0333bde1b622ca776b64475de633c2fb9ca4e5ff90a6959492634c0760a86785f4e2c51a13eafabde417
+EBUILD caja-dropbox-1.18.0.ebuild 2034 SHA256 4d62dc0bf3f0a4355d56f369f1711588adadc4d9655cb23c24e5f1d01e3d4db0 SHA512 f175396c6000dba28a39340b1655922cbd59dc8dbdcd1bd5e4ecee03c714496573f1bbf70d245607b612f2460a020a5b477f742dff2f1f5e58d97a87c1f41971 WHIRLPOOL 20998ac1e40ee2287d200bc4e383ca8e9d1819fe14371e8aba6dad162345f3c9d071425b1fe093c334e3d3525115b26c055c1e4986b9c293ed3698fa9ff7da5b
+MISC ChangeLog 4731 SHA256 ee40c45bfad1acb5cc07b5c665bdb193b1e2b285a19c8c380b56f41e8797dc7a SHA512 c3f74ffa4715a0b822daf635c5500b970cbf308e6a75db223be10c393ab6fcd75cfb86ca14e87583ca1e79ba1c7dba4f71f4828e4b94be74f405a2d1b388e3f1 WHIRLPOOL 662d29dccfc02cfc2c0fe1e24306f18c4daca60580673c9dc78d4b70525b0d08a152b22a635393e94cc3f0709ed86b69eaea08aa057158e1b4e793aa913f5311
+MISC ChangeLog-2015 1288 SHA256 a81a2d42b11a17f94da662cb5855cd192f0d471ac50903e8f2ce581d702dba14 SHA512 1c1a0243c9dac4c7d970215f4f3396a798352c5bf5ef1ad42273912a775f110e6c620e5f496d76504cee48c2fc3aa7773c4555ac1ffbe66fdabe1337f947f0f3 WHIRLPOOL 1e150092b6338bdec846b15955ea8173266c4b0aae8990d622c53de9e4204834690e50d51a5cffedab29995625d76740fca66d2bee7aa737428f93ef4abafd25
+MISC metadata.xml 341 SHA256 3b646e7490905da85de5b866d3c5e6229dba8d6fb0b4e8a37732e2a4031b21a1 SHA512 3ef87b907e90f2093cece194a580099964f434ec7a1d43e961f0c00adeaeca085fc6e141f25f4ef7da0399e71093b4e2c12f52d0c29cd2aa3768354380ec1c37 WHIRLPOOL 9c57de655dd81ad9ea557e63265e312ff0bbf7a9209903478570b3576679838dbffa8a5cdb2ac8b55bd4cf488d9b6dcbbc3427c1e5b96af78072fd363906ff75
diff --git a/mate-extra/caja-dropbox/caja-dropbox-1.12.0-r1.ebuild b/mate-extra/caja-dropbox/caja-dropbox-1.12.0-r1.ebuild
new file mode 100644
index 000000000000..696da441191b
--- /dev/null
+++ b/mate-extra/caja-dropbox/caja-dropbox-1.12.0-r1.ebuild
@@ -0,0 +1,91 @@
+# 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"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	dev-libs/atk:0
+	>=dev-libs/glib-2.14:2
+	dev-python/pygtk:2[${PYTHON_USEDEP}]
+	dev-python/pygobject:2[${PYTHON_USEDEP}]
+	>=mate-base/caja-1.6
+	media-libs/fontconfig:1.0
+	media-libs/freetype:2
+	net-misc/dropbox:0
+	x11-libs/cairo:0
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:2
+	x11-libs/libXinerama:0
+	x11-libs/pango:0"
+
+DEPEND="${RDEPEND}
+	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-dropbox/caja-dropbox-1.14.0.ebuild b/mate-extra/caja-dropbox/caja-dropbox-1.14.0.ebuild
new file mode 100644
index 000000000000..192d02aaf1b5
--- /dev/null
+++ b/mate-extra/caja-dropbox/caja-dropbox-1.14.0.ebuild
@@ -0,0 +1,93 @@
+# 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"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="
+	${PYTHON_DEPS}
+	dev-libs/atk:0
+	>=dev-libs/glib-2.14:2
+	dev-python/pygtk:2[${PYTHON_USEDEP}]
+	dev-python/pygobject:2[${PYTHON_USEDEP}]
+	>=mate-base/caja-1.6
+	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-dropbox/caja-dropbox-1.16.0.ebuild b/mate-extra/caja-dropbox/caja-dropbox-1.16.0.ebuild
new file mode 100644
index 000000000000..192d02aaf1b5
--- /dev/null
+++ b/mate-extra/caja-dropbox/caja-dropbox-1.16.0.ebuild
@@ -0,0 +1,93 @@
+# 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"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="
+	${PYTHON_DEPS}
+	dev-libs/atk:0
+	>=dev-libs/glib-2.14:2
+	dev-python/pygtk:2[${PYTHON_USEDEP}]
+	dev-python/pygobject:2[${PYTHON_USEDEP}]
+	>=mate-base/caja-1.6
+	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-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-dropbox/files/caja-dropbox-1.8.0-system-rst2man.patch b/mate-extra/caja-dropbox/files/caja-dropbox-1.8.0-system-rst2man.patch
new file mode 100644
index 000000000000..740418249d8d
--- /dev/null
+++ b/mate-extra/caja-dropbox/files/caja-dropbox-1.8.0-system-rst2man.patch
@@ -0,0 +1,13 @@
+Index: nautilus-dropbox-0.7.0/configure.ac
+===================================================================
+--- nautilus-dropbox-0.7.0.orig/configure.ac
++++ nautilus-dropbox-0.7.0/configure.ac
+@@ -31,7 +31,7 @@ PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLI
+ 
+ AC_PATH_PROG([PYTHON], [python])
+ 
+-AC_PATH_PROG([RST2MAN], [rst2man], [python rst2man.py])
++AC_PATH_PROG([RST2MAN], [rst2man.py], [python rst2man.py])
+ AC_SUBST(RST2MAN)
+ 
+ # define module checking macro
diff --git a/mate-extra/caja-dropbox/metadata.xml b/mate-extra/caja-dropbox/metadata.xml
new file mode 100644
index 000000000000..99ed34318ff4
--- /dev/null
+++ b/mate-extra/caja-dropbox/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>mate@gentoo.org</email>
+		<name>Gentoo MATE Desktop</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">mate-desktop/caja-dropbox</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/mate-extra/caja-extensions/Manifest b/mate-extra/caja-extensions/Manifest
new file mode 100644
index 000000000000..9fc515fe0a3d
--- /dev/null
+++ b/mate-extra/caja-extensions/Manifest
@@ -0,0 +1,11 @@
+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
+EBUILD caja-extensions-1.12.0-r2.ebuild 1718 SHA256 47deab257001e23ef9365cb0113146904bdc6a020f6f75e0b1b8043b6f954daa SHA512 d0041e152633bb58cb2f52c3ffa749fa9386e04c5e1d24246015ab7dfb05d8943af07e21eabeb939806c1da7ffe70d1d7d745fdbf09d7f24c76a605f323bca8a WHIRLPOOL c02f0a9dc1559fac1b2f2be0ea2d4a17a04ef54e6f2f4370ba6774b5b249039d54bb2c33ee05f756f1d554b324b588f9c819b265c8f50e1eec87ab93e7ffd8d1
+EBUILD caja-extensions-1.14.1-r1.ebuild 1797 SHA256 7b36f266b5f9aa27ef89898c968d45ff8a964ad079c274d75ed7d7d224aa0dd1 SHA512 7b21902c11fea28ca327bb168ec48e46de652af758e01d6fafaac9543fc308c391e479f2c9631de955b9a5f81617d1e4288f9ef9278a4fd835a3276583312f03 WHIRLPOOL 4b9ef7c05192a5c9a1580955370995b12863296c1117f38e0684bdb36edb649f396cf50c60be9e1e4bd500fe5c6c77d878f30c4f7bffda84a9ade9f07131de28
+EBUILD caja-extensions-1.16.0-r1.ebuild 1797 SHA256 7b36f266b5f9aa27ef89898c968d45ff8a964ad079c274d75ed7d7d224aa0dd1 SHA512 7b21902c11fea28ca327bb168ec48e46de652af758e01d6fafaac9543fc308c391e479f2c9631de955b9a5f81617d1e4288f9ef9278a4fd835a3276583312f03 WHIRLPOOL 4b9ef7c05192a5c9a1580955370995b12863296c1117f38e0684bdb36edb649f396cf50c60be9e1e4bd500fe5c6c77d878f30c4f7bffda84a9ade9f07131de28
+EBUILD caja-extensions-1.18.1.ebuild 1817 SHA256 c67fc8a27fbe054f284daf1042120903c1011b2d4168f48864348703ff7f5d3c SHA512 cbcb96aa6be05bfce9777cc01f20c44275344df582265a31548eeea73519f47078ff47f674a739ec1494bb8dc906e75ba80b6d49678a0449752b40ef349d5364 WHIRLPOOL ad7e229b3951f940c1964e7d6e9666a7d14d1bc24c8759f6f172f6f484c5e537a0f1055d7f425d38d8b42424cd86461349d311aff84c17c518808799db894cf3
+MISC ChangeLog 5494 SHA256 13a86f30c00a159f6dd20a005667c06308f7d938c17953387ed1d2adc08733eb SHA512 61f9712047cd5c1747102dd3c051f09746a607c2f5f58e0429f1e1fc997f03fcc4fed06ed87a7150879a5c47b2d07eea60bb71967d1d85f15c1292c4cde346e2 WHIRLPOOL b8a7732ae9ebbd758dbd4a6d759ca4a3f41e127bbaddfa18cf08eeca1544559c378ebec393e3952bdb0bdf825e03c8cc4b1b720953d11a86d7261458725e9d65
+MISC ChangeLog-2015 1066 SHA256 25e8a24a5c9c610fd1a773bc1c31eda959db3b2dd8aafd083d49f561144e51d2 SHA512 752416fd7e82c12f901ccc8e8e5142a672c58f7bda7642974fa0dcb60c15ea938e44b2f7b35cb68383266f73bebc28855a61fdaecb71107663fc293ad56f207c WHIRLPOOL 240349d73d01d7126384f58b1abbad44a37ca32b5901880650477d8939e4f8ef162aa412e54781aac6147150b0a2c51534c06d0cdeab8b0b93ecc624289a5d26
+MISC metadata.xml 1189 SHA256 dbf48bd8e6283c554acc4d357fe94c5df6158cc97ec0fb484e50c929cfb64f66 SHA512 bcac80f1664702cc3311a2e227d37e21e3042e8c649b8d0ed869ae49f9697206774ad86dcdb16db5b53765dc14609b1048b48c20b70705a34f312b76b5cba095 WHIRLPOOL e90a6a59bb192098deff24ea15f657980ac6f5eb232c529ff07582e6aeb07aaafa7c7f4b482525b2ac09bf321504d16226079130c4a1992c232fde899a32ca3f
diff --git a/mate-extra/caja-extensions/caja-extensions-1.12.0-r2.ebuild b/mate-extra/caja-extensions/caja-extensions-1.12.0-r2.ebuild
new file mode 100644
index 000000000000..9f9fcdd3cb98
--- /dev/null
+++ b/mate-extra/caja-extensions/caja-extensions-1.12.0-r2.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="Several Caja extensions"
+LICENSE="GPL-2"
+SLOT="0"
+
+SENDTO="cdr gajim +mail pidgin upnp"
+IUSE="gksu gtk3 image-converter +open-terminal share +wallpaper ${SENDTO}"
+
+RDEPEND=">=dev-libs/glib-2.36:2
+	>=mate-base/caja-1.7[gtk3(-)=]
+	virtual/libintl:0
+	x11-libs/gdk-pixbuf:2
+	cdr? ( >=app-cdr/brasero-2.32.1:0= )
+	gajim? (
+		net-im/gajim:0
+		>=dev-libs/dbus-glib-0.60:0
+		>=sys-apps/dbus-1:0
+	)
+	gksu? ( x11-libs/gksu )
+	!gtk3? ( >=x11-libs/gtk+-2.24:2 )
+	gtk3? ( >=x11-libs/gtk+-3.0:3 )
+	image-converter? ( virtual/imagemagick-tools )
+	open-terminal? ( >=mate-base/mate-desktop-1.7[gtk3(-)=] )
+	pidgin? ( >=dev-libs/dbus-glib-0.60:0 )
+	upnp? ( >=net-libs/gupnp-0.13:0= )"
+
+DEPEND="${RDEPEND}
+	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}\
+		--with-gtk=$(usex gtk3 3.0 2.0) \
+		$(use_enable gksu) \
+		$(use_enable image-converter) \
+		$(use_enable open-terminal) \
+		$(use_enable share) \
+		$(use_enable wallpaper)
+}
diff --git a/mate-extra/caja-extensions/caja-extensions-1.14.1-r1.ebuild b/mate-extra/caja-extensions/caja-extensions-1.14.1-r1.ebuild
new file mode 100644
index 000000000000..e2dc40a1ed0c
--- /dev/null
+++ b/mate-extra/caja-extensions/caja-extensions-1.14.1-r1.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="Several Caja extensions"
+LICENSE="GPL-2"
+SLOT="0"
+
+SENDTO="cdr gajim +mail pidgin upnp"
+IUSE="gksu gtk3 image-converter +open-terminal share +wallpaper ${SENDTO}"
+
+COMMON_DEPEND=">=dev-libs/glib-2.36:2
+	>=mate-base/caja-1.7[gtk3(-)=]
+	virtual/libintl:0
+	x11-libs/gdk-pixbuf:2
+	gajim? (
+		>=dev-libs/dbus-glib-0.60:0
+		>=sys-apps/dbus-1:0
+	)
+	!gtk3? ( >=x11-libs/gtk+-2.24:2 )
+	gtk3? ( >=x11-libs/gtk+-3.0:3 )
+	open-terminal? ( >=mate-base/mate-desktop-1.7[gtk3(-)=] )
+	pidgin? ( >=dev-libs/dbus-glib-0.60:0 )
+	upnp? ( >=net-libs/gupnp-0.13:0= )"
+
+RDEPEND="${COMMON_DEPEND}
+	cdr? ( >=app-cdr/brasero-2.32.1:0= )
+	gajim? ( net-im/gajim:0 )
+	gksu? ( x11-libs/gksu )
+	image-converter? ( virtual/imagemagick-tools )
+	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}\
+		--with-gtk=$(usex gtk3 3.0 2.0) \
+		$(use_enable gksu) \
+		$(use_enable image-converter) \
+		$(use_enable open-terminal) \
+		$(use_enable share) \
+		$(use_enable wallpaper)
+}
diff --git a/mate-extra/caja-extensions/caja-extensions-1.16.0-r1.ebuild b/mate-extra/caja-extensions/caja-extensions-1.16.0-r1.ebuild
new file mode 100644
index 000000000000..e2dc40a1ed0c
--- /dev/null
+++ b/mate-extra/caja-extensions/caja-extensions-1.16.0-r1.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="Several Caja extensions"
+LICENSE="GPL-2"
+SLOT="0"
+
+SENDTO="cdr gajim +mail pidgin upnp"
+IUSE="gksu gtk3 image-converter +open-terminal share +wallpaper ${SENDTO}"
+
+COMMON_DEPEND=">=dev-libs/glib-2.36:2
+	>=mate-base/caja-1.7[gtk3(-)=]
+	virtual/libintl:0
+	x11-libs/gdk-pixbuf:2
+	gajim? (
+		>=dev-libs/dbus-glib-0.60:0
+		>=sys-apps/dbus-1:0
+	)
+	!gtk3? ( >=x11-libs/gtk+-2.24:2 )
+	gtk3? ( >=x11-libs/gtk+-3.0:3 )
+	open-terminal? ( >=mate-base/mate-desktop-1.7[gtk3(-)=] )
+	pidgin? ( >=dev-libs/dbus-glib-0.60:0 )
+	upnp? ( >=net-libs/gupnp-0.13:0= )"
+
+RDEPEND="${COMMON_DEPEND}
+	cdr? ( >=app-cdr/brasero-2.32.1:0= )
+	gajim? ( net-im/gajim:0 )
+	gksu? ( x11-libs/gksu )
+	image-converter? ( virtual/imagemagick-tools )
+	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}\
+		--with-gtk=$(usex gtk3 3.0 2.0) \
+		$(use_enable gksu) \
+		$(use_enable image-converter) \
+		$(use_enable open-terminal) \
+		$(use_enable share) \
+		$(use_enable wallpaper)
+}
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/caja-extensions/metadata.xml b/mate-extra/caja-extensions/metadata.xml
new file mode 100644
index 000000000000..0852c69ac214
--- /dev/null
+++ b/mate-extra/caja-extensions/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>mate@gentoo.org</email>
+		<name>Gentoo MATE Desktop</name>
+	</maintainer>
+	<use>
+		<flag name="cdr">Add an extension to burn files to cds using <pkg>app-cdr/brasero</pkg>.</flag>
+		<flag name="gajim">Add an extension to support <pkg>net-im/gajim</pkg>.</flag>
+		<flag name="gksu">Add an extension to support opening files as root with <pkg>x11-libs/gksu</pkg>.</flag>
+		<flag name="gtk3">Build with GTK+3 instead of GTK+2</flag>
+		<flag name="image-converter">Add image conversion support.</flag>
+		<flag name="mail">Add an extension to support e-mail functionality.</flag>
+		<flag name="open-terminal">Add an extension to support an open terminal.</flag>
+		<flag name="pidgin">Add an extension to support <pkg>net-im/pidgin</pkg></flag>
+		<flag name="share">Add an extension to support sharing files.</flag>
+		<flag name="wallpaper">Add an extension to support setting an image as the current wallpaper</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">mate-desktop/caja-extensions</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/mate-extra/mate-calc/Manifest b/mate-extra/mate-calc/Manifest
new file mode 100644
index 000000000000..2a810a3dcbf0
--- /dev/null
+++ b/mate-extra/mate-calc/Manifest
@@ -0,0 +1,3 @@
+DIST mate-calc-1.18.0.tar.xz 751780 SHA256 9e02ea711000378d25274e532dd161f09172d1dcefdb3aa4b1ab7a2bfa34da61 SHA512 b34e8ba52599a56bf0286dd6c3d0cd460ea80732baaf48217d7abbca6166eaf16eb6bd9aba6fab6fbbf0c51937275f703568e114adb899b6e927a70f42f0949b WHIRLPOOL 3a4ab14186387d6b264f7c0748ed08c2357ea52e39a04abcf6e045deac0ec05c44d2e17909ede76a813b703524436c9754a3be90773c786fe403078c76d71072
+EBUILD mate-calc-1.18.0.ebuild 530 SHA256 06876204258e15196c5a1c0c451cb99cd8a802042e2b9f5159431bed52d2c8cb SHA512 30807a3423e766c12f716aa0b0e6fa0c542a4da9a0a0adce3c06f472b3c2f2c7789f37e682296f5cc4a9a4976a7caaf82d5503c302d210c48923fcd651ed8a6b WHIRLPOOL 72c5586f66c52ec4ba859f99515ab05edd46d323018dd16a810c60ce6dd4b7b1550208dfb0325ef2f247152218e6105bd13c19ec48d4f2991b75765436cf160a
+MISC metadata.xml 529 SHA256 2c5363553981e0ffe91365ac1f99eceb43c1dc82d9864d69bec1771019969eb4 SHA512 3ed383251b99bfe8492c4a33d08f0bd42479d4d1ed3ccc4c316d2b64643bd611af27ed1238404969e6a924e1998ab0d47d8784d5b027bd276177d3875718e987 WHIRLPOOL d533319110f57d3f0ba6d045d463fc164582a70f04626a049f81c5d1b4c33fb601db46b29f17ba3597b22a0e55cbbcaf2b58816c642be72c55239ba839edee5f
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..12ece44c302c
--- /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
new file mode 100644
index 000000000000..d76bae806f9e
--- /dev/null
+++ b/mate-extra/mate-indicator-applet/Manifest
@@ -0,0 +1,11 @@
+AUX mate-indicator-applet-1.14.1-indicator-ng-configure-fix.patch 996 SHA256 c323498ccdbcf66d3d96e213d9adb3ffce3ef24a34200d6122c9314d6448a41b SHA512 29bb260aa76533dbef27621080502cd3713afb7c825d7bb6c2803aeeb0c1f1873a70f8b8f121659c79878416fff0b13fcd685f98b738e7f5466fe727b7d4a84e WHIRLPOOL 5bdec621af7dbe66b730a6fb8d66f41ed8ac2ef3dd791681cf79fa78d8da7216cbd73674d3e6b7fd10a7a701f35c0f30bf893cd884149b02c30c25cfb6e93e40
+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
+EBUILD mate-indicator-applet-1.12.1-r1.ebuild 630 SHA256 2dd0fd77c30f9cfbee985891d983feb9dd914bb85f1a2795f4410de38474b7dc SHA512 e5b55c8e0199aa4f13a283bb920ccabe113e94283f5dfcfba5ca6b84d63cf3ff653a52f1f5cfea93e5a7ef656763e0fcd68475f6fb16166648aa4fef042d6ef3 WHIRLPOOL b717ae4106ebf7012dd8807837edcbfe60357e326e6de1dc19e262b7f8e2f57efa55a18737ed2ff978db4933ec8fcfbd0c8498b0353b3f879ed4e3408eccc9ef
+EBUILD mate-indicator-applet-1.14.1-r1.ebuild 737 SHA256 201a1fd8865533aa2f18e08553d3e72d17cc9218c6a31286f7b8c23be989ad2a SHA512 5f152aad87ec80339cb5c36e2647636af0cd936c86baaa0d5a43af5a03fd8d89b77ddda4a42673c949c677d36d4fdd3c1a708f00c412b1b8184222c457521c15 WHIRLPOOL dfb5cd58c52594531d79a2e732b828b3b5c8cdf5cf8f2d9996e4cfb97d510257e261355a269219f9f82d0e3eff6a6b3fd7fe873b074d86597be0913fdb533fe1
+EBUILD mate-indicator-applet-1.16.0.ebuild 672 SHA256 d37adf50057bd28ddbb0ae79105f133e2327a6ef51a90bb224fa98e27db64f9c SHA512 9b32182a77cab459b28ec792fe7e919916f55fb52b3815238e404883c12d387bc3d9cb5ff9a659d878f8a254b3640cbdd59421d77c59902f986a96e71089e30c WHIRLPOOL 74f76fc664f0e27846bc5c28ef1f6cb4b031149bbbec5b1fd0b8aef28f123969d6b798e1a44c3b1894d0341665e4fc9edf33a3ba6dede831a857c5a82f31795b
+EBUILD mate-indicator-applet-1.18.0.ebuild 495 SHA256 21fd6d1bead20ef9ac8ffd2dfc3c29c4b619457de7b75a0e019b730b940a7cfc SHA512 5eab961a3da6f82885a51d6c256d9d42f6088106ffeeb53f639d8d87cc973367bceda0523516b6c4bd452453ae5b07e0b4588c507070efd1c47c8a35d094f700 WHIRLPOOL 384850c01aba73cc35906539c730f21a8eae48a5e0ef2dcf248b2e801da31b9ed6e2808fd6e695047d83f9eea377e7b87d47702a84b4734f723c9afda905ce9a
+MISC ChangeLog 2241 SHA256 1784a08b2c8e2c1ec83a70393352dff5edaca5bb16e054168a1446a7831a5a9a SHA512 dca91e5bb970d7159675ea478615f7372083968fa569096dd9c80221d60b8fbfdc917a640f5b6625ead567d185607b570f135df1ce260ba29a741eb2a8f8c4e6 WHIRLPOOL aa5de8c8f96f500ed18faf45250fc7ef9be7d186b07840e428a74a2e6f69155bb81e5bcbd7647863f21e6ee8a6eeca91840572f80b6f4aafe118765c782d7554
+MISC metadata.xml 426 SHA256 8de2127a47ce83c7fcbb6d030f2ad37a34bf376bc82e95bfe95fff5afa31b06e SHA512 546adb619dcf891787a65bd23674411653136c82cad39e9937f6300b525049121ee15b94f3f62e555b50f0607367442f585c5f90274da92f506bb58c40b6c522 WHIRLPOOL 4a326a004b33b5f890c6bc48d27ca244ea3c8673394f4cf0289089e3ce8f521a706e50093444c64030f8f5f33a9bed0a0c66f1d049c00373dcb2b1230a728c28
diff --git a/mate-extra/mate-indicator-applet/files/mate-indicator-applet-1.14.1-indicator-ng-configure-fix.patch b/mate-extra/mate-indicator-applet/files/mate-indicator-applet-1.14.1-indicator-ng-configure-fix.patch
new file mode 100644
index 000000000000..b9ae4fc8fecc
--- /dev/null
+++ b/mate-extra/mate-indicator-applet/files/mate-indicator-applet-1.14.1-indicator-ng-configure-fix.patch
@@ -0,0 +1,30 @@
+From 06f6db28648cdeff02cc07f9a7f1410b228450a4 Mon Sep 17 00:00:00 2001
+From: monsta <monsta@inbox.ru>
+Date: Wed, 14 Sep 2016 18:20:25 +0300
+Subject: [PATCH] check for libindicator 12.10.2 for new style indicators
+ support
+
+fixes build on Gentoo which has 12.10.1 - turned out this version
+had no indicator-ng yet.
+
+note that (as of now) 12.10.2 isn't officially released upstream,
+and Ubuntu has post-12.10.1 repo snapshot packaged and labeled as
+12.10.2. however, that snapshot already has 12.10.2 version in .pc
+file, so the build works with it.
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 5e9c505..9b4dafc 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -46,7 +46,7 @@ case "$with_gtk" in
+ esac
+ 
+ INDICATOR_REQUIRED_VERSION=0.3.90
+-INDICATOR_NG_VERSION=12.10
++INDICATOR_NG_VERSION=12.10.2
+ INDICATOR_PKG=indicator$INDICATOR_API_VERSION-0.4
+ 
+ PKG_CHECK_MODULES(APPLET, gtk+-$GTK_API_VERSION >= $GTK_REQUIRED_VERSION
diff --git a/mate-extra/mate-indicator-applet/mate-indicator-applet-1.12.1-r1.ebuild b/mate-extra/mate-indicator-applet/mate-indicator-applet-1.12.1-r1.ebuild
new file mode 100644
index 000000000000..f87a16fc0829
--- /dev/null
+++ b/mate-extra/mate-indicator-applet/mate-indicator-applet-1.12.1-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2016 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="gtk3"
+
+RDEPEND="
+	>=mate-base/mate-panel-1.8[gtk3(-)=]
+	!gtk3? (
+		>=dev-libs/libindicator-0.3.90:0
+		>=x11-libs/gtk+-2.24:2
+	)
+	gtk3? (
+		>=dev-libs/libindicator-0.3.90:3
+		>=x11-libs/gtk+-3.0:3
+	)"
+
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.35.0
+	virtual/pkgconfig"
+
+src_configure() {
+	mate_src_configure \
+		--with-gtk=$(usex gtk3 3.0 2.0)
+}
diff --git a/mate-extra/mate-indicator-applet/mate-indicator-applet-1.14.1-r1.ebuild b/mate-extra/mate-indicator-applet/mate-indicator-applet-1.14.1-r1.ebuild
new file mode 100644
index 000000000000..4af07eb73100
--- /dev/null
+++ b/mate-extra/mate-indicator-applet/mate-indicator-applet-1.14.1-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2016 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="gtk3"
+
+COMMON_DEPEND="
+	>=mate-base/mate-panel-1.8[gtk3(-)=]
+	!gtk3? (
+		>=dev-libs/libindicator-0.3.90:0
+		>=x11-libs/gtk+-2.24:2
+	)
+	gtk3? (
+		>=dev-libs/libindicator-0.3.90:3
+		>=x11-libs/gtk+-3.0:3
+	)"
+
+RDEPEND="${COMMON_DEPEND}"
+
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/intltool-0.35.0
+	virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}/${P}-indicator-ng-configure-fix.patch" )
+
+src_configure() {
+	mate_src_configure \
+		--with-gtk=$(usex gtk3 3.0 2.0)
+}
diff --git a/mate-extra/mate-indicator-applet/mate-indicator-applet-1.16.0.ebuild b/mate-extra/mate-indicator-applet/mate-indicator-applet-1.16.0.ebuild
new file mode 100644
index 000000000000..2f32c4cab09a
--- /dev/null
+++ b/mate-extra/mate-indicator-applet/mate-indicator-applet-1.16.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2016 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="gtk3"
+
+COMMON_DEPEND="
+	>=mate-base/mate-panel-1.8[gtk3(-)=]
+	!gtk3? (
+		>=dev-libs/libindicator-0.3.90:0
+		>=x11-libs/gtk+-2.24:2
+	)
+	gtk3? (
+		>=dev-libs/libindicator-0.3.90:3
+		>=x11-libs/gtk+-3.0:3
+	)"
+
+RDEPEND="${COMMON_DEPEND}"
+
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/intltool-0.35.0
+	virtual/pkgconfig"
+
+src_configure() {
+	mate_src_configure \
+		--with-gtk=$(usex gtk3 3.0 2.0)
+}
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-indicator-applet/metadata.xml b/mate-extra/mate-indicator-applet/metadata.xml
new file mode 100644
index 000000000000..9561edc8026c
--- /dev/null
+++ b/mate-extra/mate-indicator-applet/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>mate@gentoo.org</email>
+		<name>Gentoo MATE Desktop</name>
+	</maintainer>
+	<use>
+		<flag name="gtk3">Build with GTK+3 instead of GTK+2</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">mate-desktop/mate-indicator-applet</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/mate-extra/mate-media/Manifest b/mate-extra/mate-media/Manifest
new file mode 100644
index 000000000000..99854f473fcb
--- /dev/null
+++ b/mate-extra/mate-media/Manifest
@@ -0,0 +1,11 @@
+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
+EBUILD mate-media-1.12.1.ebuild 940 SHA256 f7fcfff279de228d8947a8c31faf6f024c610d6ac3f053d277e2eb201142a2c5 SHA512 46d400fede81656a1f7a42befdd6fc771eae4f20d711514fb00ce952b3306fb2e583e85dc5a340be779f56e101b9c34bb527f810521552edcac695de462c31b9 WHIRLPOOL 5707556ebae34305233a8f75e7b400045127ca8c656c8c022e27021b3e7c1b8739ab4103da10b906d1e7b2d23ad0bb5efc232b99111529d4f4389eca9b558b1b
+EBUILD mate-media-1.14.1.ebuild 982 SHA256 88637ec150f535ae72b39292f4dfb9d83ec9046d41025dd6b19088e37a0df197 SHA512 e540c9bd1c107e8dcc0406faac99cf89f54062d0d94e7fa8a4d46dc56be9c601161d76d6d3b22c449be1e34b1532b968b47a8c40548a8219dc67e78e0a0c1fd7 WHIRLPOOL c4bc96ef38a55bf5ff2d7fd19cb2f584e4c5874e30ed21800a09d8030528277b2938dd0dd49a4cb67805fc7b91a48d6ee9a657f0b05587c5b8d698aba48ca587
+EBUILD mate-media-1.16.0.ebuild 982 SHA256 88637ec150f535ae72b39292f4dfb9d83ec9046d41025dd6b19088e37a0df197 SHA512 e540c9bd1c107e8dcc0406faac99cf89f54062d0d94e7fa8a4d46dc56be9c601161d76d6d3b22c449be1e34b1532b968b47a8c40548a8219dc67e78e0a0c1fd7 WHIRLPOOL c4bc96ef38a55bf5ff2d7fd19cb2f584e4c5874e30ed21800a09d8030528277b2938dd0dd49a4cb67805fc7b91a48d6ee9a657f0b05587c5b8d698aba48ca587
+EBUILD mate-media-1.18.0.ebuild 742 SHA256 9ab3ae68636ac14604865185be26d233bdd59c251fc16f065f1490b187272aad SHA512 ef70055a757eab0fb3b95492dd297f506309fbe4c14793338f61872eaf721a316926e6657c6526453ca19f4fc5ad54cc60ad6b87dc308a56aa7577afded8ad4e WHIRLPOOL a304c86bf9c34e22a296cc082291269de965536c4a71a5133e40fe1344c7b66a95f9f11f5638e0be561fe79a46182657404b8e3cec0fc9186cbb966004bf9318
+MISC ChangeLog 4363 SHA256 a8c4cdbebd172bac0d4adfe723a5a6404d254bb4fc340791c612eb6e9452a51f SHA512 1e02cca3115a2ed716bbcef7e6aa42e3e45b70b8317287c723974abd4c8c1f640d1bd38d9a9f3430a61cd0d3257eb33d9aa134e6a3cdb7748dc7d3ba24c7aba2 WHIRLPOOL ccefa9aafc470511668ff06ee099bb0b3fa61bccd9e67b8c164d541bee2bde0a316e8b595a628cb35c65c37f8ebbebfeabd7d39e0b06d1ae6abfdf945555f457
+MISC ChangeLog-2015 1421 SHA256 8c7ef3299bb921d1c5cefdc3bdfafe2ac1cd1eb8bdfbe18f0af7bd0f92e84002 SHA512 1c46ee527d59bb2b2288cfe58fa9bab2d9b115246ced3431923b4cb05500480c6f7d300e89211a37e19d17037a0976b849b3e1f4e0926cfd3ae20d17003da1a7 WHIRLPOOL 43c870b5c129adb713a2bec81472710daa09248d49600766698b839beff1e8deb3d24ae2e2aee1c5df2dc237ff6c1fdd88bacb60fec2f5ae1bce970e2965b86f
+MISC metadata.xml 415 SHA256 cdddaeeeba319b4a63c9030faf52653350d2c9b763d259f7c26a8db81d145ccf SHA512 8021259f41090c51e2a485027cc52cb87a90781f6684c0d8795556b622eb6f4659f0633c7f53778c1fc918a281707a958257775cfdb67d52be262eb5a1da68a7 WHIRLPOOL 9b1881ef8e3e4a4ecb4470e68597c19b144c451be7d9006a7ba8fcb1c969df2f68ce2d8808601f6a272782da6e79cbd3e6d0c892b2a32f30f571204db494c581
diff --git a/mate-extra/mate-media/mate-media-1.12.1.ebuild b/mate-extra/mate-media/mate-media-1.12.1.ebuild
new file mode 100644
index 000000000000..e97d1043a69e
--- /dev/null
+++ b/mate-extra/mate-media/mate-media-1.12.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="amd64 ~arm x86"
+fi
+
+DESCRIPTION="Multimedia related programs for the MATE desktop"
+LICENSE="LGPL-2 GPL-2 FDL-1.1"
+SLOT="0"
+
+IUSE="gtk3"
+
+RDEPEND=">=dev-libs/glib-2.36.0:2
+	dev-libs/libxml2:2
+	>=mate-base/mate-panel-1.8[gtk3(-)=]
+	>=mate-base/mate-desktop-1.9.3[gtk3(-)=]
+	>=media-libs/libmatemixer-1.9.1
+	x11-libs/cairo:0
+	x11-libs/pango:0
+	virtual/libintl:0
+	!gtk3? (
+		>=dev-libs/libunique-1:1
+		>=media-libs/libcanberra-0.13:0[gtk]
+		>=x11-libs/gtk+-2.24:2
+	)
+	gtk3? (
+		>=dev-libs/libunique-3:3
+		>=media-libs/libcanberra-0.13:0[gtk3]
+		>=x11-libs/gtk+-3.0:3
+	)"
+
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.35.0:*
+	sys-devel/gettext:*
+	virtual/pkgconfig:*
+	!!<mate-base/mate-applets-1.8:*"
+
+src_configure() {
+	mate_src_configure \
+		--with-gtk=$(usex gtk3 3.0 2.0)
+}
diff --git a/mate-extra/mate-media/mate-media-1.14.1.ebuild b/mate-extra/mate-media/mate-media-1.14.1.ebuild
new file mode 100644
index 000000000000..7e65f44ccc0d
--- /dev/null
+++ b/mate-extra/mate-media/mate-media-1.14.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+DESCRIPTION="Multimedia related programs for the MATE desktop"
+LICENSE="LGPL-2 GPL-2 FDL-1.1"
+SLOT="0"
+
+IUSE="gtk3"
+
+COMMON_DEPEND=">=dev-libs/glib-2.36.0:2
+	dev-libs/libxml2:2
+	>=mate-base/mate-panel-1.8[gtk3(-)=]
+	>=mate-base/mate-desktop-1.9.3[gtk3(-)=]
+	>=media-libs/libmatemixer-1.9.1
+	x11-libs/cairo:0
+	x11-libs/pango:0
+	virtual/libintl:0
+	!gtk3? (
+		>=dev-libs/libunique-1:1
+		>=media-libs/libcanberra-0.13:0[gtk]
+		>=x11-libs/gtk+-2.24:2
+	)
+	gtk3? (
+		>=dev-libs/libunique-3:3
+		>=media-libs/libcanberra-0.13:0[gtk3]
+		>=x11-libs/gtk+-3.0:3
+	)"
+
+RDEPEND="${COMMON_DEPEND}"
+
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/intltool-0.35.0:*
+	sys-devel/gettext:*
+	virtual/pkgconfig:*
+	!!<mate-base/mate-applets-1.8:*"
+
+src_configure() {
+	mate_src_configure \
+		--with-gtk=$(usex gtk3 3.0 2.0)
+}
diff --git a/mate-extra/mate-media/mate-media-1.16.0.ebuild b/mate-extra/mate-media/mate-media-1.16.0.ebuild
new file mode 100644
index 000000000000..7e65f44ccc0d
--- /dev/null
+++ b/mate-extra/mate-media/mate-media-1.16.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+DESCRIPTION="Multimedia related programs for the MATE desktop"
+LICENSE="LGPL-2 GPL-2 FDL-1.1"
+SLOT="0"
+
+IUSE="gtk3"
+
+COMMON_DEPEND=">=dev-libs/glib-2.36.0:2
+	dev-libs/libxml2:2
+	>=mate-base/mate-panel-1.8[gtk3(-)=]
+	>=mate-base/mate-desktop-1.9.3[gtk3(-)=]
+	>=media-libs/libmatemixer-1.9.1
+	x11-libs/cairo:0
+	x11-libs/pango:0
+	virtual/libintl:0
+	!gtk3? (
+		>=dev-libs/libunique-1:1
+		>=media-libs/libcanberra-0.13:0[gtk]
+		>=x11-libs/gtk+-2.24:2
+	)
+	gtk3? (
+		>=dev-libs/libunique-3:3
+		>=media-libs/libcanberra-0.13:0[gtk3]
+		>=x11-libs/gtk+-3.0:3
+	)"
+
+RDEPEND="${COMMON_DEPEND}"
+
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/intltool-0.35.0:*
+	sys-devel/gettext:*
+	virtual/pkgconfig:*
+	!!<mate-base/mate-applets-1.8:*"
+
+src_configure() {
+	mate_src_configure \
+		--with-gtk=$(usex gtk3 3.0 2.0)
+}
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-media/metadata.xml b/mate-extra/mate-media/metadata.xml
new file mode 100644
index 000000000000..d28e7fdae6e8
--- /dev/null
+++ b/mate-extra/mate-media/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>mate@gentoo.org</email>
+		<name>Gentoo MATE Desktop</name>
+	</maintainer>
+	<use>
+		<flag name="gtk3">Build with GTK+3 instead of GTK+2</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">mate-desktop/mate-media</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/mate-extra/mate-netbook/Manifest b/mate-extra/mate-netbook/Manifest
new file mode 100644
index 000000000000..95497f4e235e
--- /dev/null
+++ b/mate-extra/mate-netbook/Manifest
@@ -0,0 +1,10 @@
+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
+EBUILD mate-netbook-1.12.0.ebuild 822 SHA256 6370d048e2e86d7b671a8a2f36464193446799e05b68d91dbd92089e775de263 SHA512 3dcdb0cea9f2f01786b25f9e1975a8c1aeaadc35d38eddb746eff2066c97d060f66501135650dd29444836739229af741e6133ee508d0df8954f4011f3fd4d9d WHIRLPOOL 8d1c3f79f74254ada8c9705c43fd32777142410a258710c444c89b6cdf05c1526101b89f343ff7e2d3736f3b8019c66ccfc4cc69fb79b7ef8e85f4c0699841fe
+EBUILD mate-netbook-1.14.0.ebuild 864 SHA256 8093177b91c181723384748e739cc8e561de10a0b6d5c9abc5de8448d9d5b415 SHA512 eea09b5b9845e7a4570ab8be2488be1151e226e0c83435aaa26bae07a076b75b5140ea8f6cbfb3c95d0d0049b1c82e4ccbefec51fa68a14e48ae3baf9ad5385b WHIRLPOOL 46150ffd7920ae1a63457a0abff5129cf2c5d51a39e95ebbbf5ededcf46bc366d4c23fd39014408f66315a665c6738c4aa9ba48136e06e09b83bfa7e3b4ccb7d
+EBUILD mate-netbook-1.16.1.ebuild 778 SHA256 813b11bcb60cb5b5670eaa30a2fb03e86a70a710886b1a29abcb391d8c0d0285 SHA512 2dc07c6dc9f1ce0db205a7bdd29c7e3bffb13ce1d1a99eb1d2eacd7996f521e5c3df57fc9d1410c262e7f94aca38b41cbef68dac30b17c0f3e346cf071fe7146 WHIRLPOOL 5251012e17c121429b61d0fbb0736e7cf5bee99182c3b5d488e202e1f0dee16e47cc7f269ce270bd1debeb92eed25521e870e18a3e7ef888697c7f14f9c54146
+EBUILD mate-netbook-1.18.0.ebuild 631 SHA256 6ac52defb9200d52ec67af6a66e09a1348aeb108f80c7af4b252a4bbbecc7100 SHA512 5b6ba1dcc9337df81a9fc73a0ec471b23d2b9aa0cdb6d171493bdd6fc2b7b5ed5f4e9577ed606cb360068d4b64069463ee14252d26f3e2ff6e5a39d7cf117cf4 WHIRLPOOL fd0e4bbc893b165a893a0f0608a9a769fbde587a1fcf3a5a248ab70b63be55da56cb8506338b7496cdc2d9ce4523128373099fc4f350218cfd2dc6aa8cf25127
+MISC ChangeLog 1766 SHA256 a8bbde3a4d50e1047ed522a78ee42da3d7ce288059f1d5dcf2893a3272a81625 SHA512 6ef6e39cfcfc3544f8fd77f0c6114eb2eb43333ac9a70b9c86eaf531e78f7cfe1fba6bdca62b901c03fa6d29ffea9dc6e530e9df51fdc0cb15d7f7718e81539d WHIRLPOOL 477507d0a84a94f1f2f14cf34595906eea7779cb4f0b54c83fea5ce69efbb00000351025f170c70d60fb246cbfdfd5424951d9921743bbbb779c40661932ce02
+MISC metadata.xml 571 SHA256 cb2bd14dc32ea448532a7afdc90f7a826f700a547a090e764d0c368ccc3aad63 SHA512 c615ac4dcce2738757c792d96a5af9db7d745b6587c1c8e36f70ece45128ec1b05141fc787320031559b8819969f1ac661a11876f8185fef2623d039f6832d76 WHIRLPOOL aed81504ba29a873d232bdb68cd35b0a3c261218f67637e409a0a974df07ceeda318e6ef85001ae46bfa0c178ce0ff2b0176a1925e7910b89770f1e2a08eb96b
diff --git a/mate-extra/mate-netbook/mate-netbook-1.12.0.ebuild b/mate-extra/mate-netbook/mate-netbook-1.12.0.ebuild
new file mode 100644
index 000000000000..4d259177a2b2
--- /dev/null
+++ b/mate-extra/mate-netbook/mate-netbook-1.12.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="amd64 ~arm x86"
+fi
+
+DESCRIPTION="MATE utilities for netbooks"
+LICENSE="GPL-3"
+SLOT="0"
+
+IUSE="gtk3"
+
+RDEPEND="
+	>=dev-libs/glib-2.36:2
+	>=mate-base/mate-desktop-1.9[gtk3(-)=]
+	>=mate-base/mate-panel-1.8[gtk3(-)=]
+	x11-libs/libfakekey:0
+	x11-libs/libXtst:0
+	x11-libs/libX11:0
+	x11-libs/cairo:0
+	virtual/libintl:0
+	!gtk3? (
+		dev-libs/libunique:1
+		x11-libs/gtk+:2
+		x11-libs/libwnck:1
+	)
+	gtk3? (
+		dev-libs/libunique:3
+		x11-libs/gtk+:3
+		x11-libs/libwnck:3
+	)"
+
+DEPEND="${RDEPEND}
+	x11-proto/xproto:0
+	>=dev-util/intltool-0.50.1:*
+	sys-devel/gettext:*
+	virtual/pkgconfig:*"
+
+src_configure() {
+	mate_src_configure \
+		--with-gtk=$(usex gtk3 3.0 2.0)
+}
diff --git a/mate-extra/mate-netbook/mate-netbook-1.14.0.ebuild b/mate-extra/mate-netbook/mate-netbook-1.14.0.ebuild
new file mode 100644
index 000000000000..3f1a16adcc3a
--- /dev/null
+++ b/mate-extra/mate-netbook/mate-netbook-1.14.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+DESCRIPTION="MATE utilities for netbooks"
+LICENSE="GPL-3"
+SLOT="0"
+
+IUSE="gtk3"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.36:2
+	>=mate-base/mate-desktop-1.9[gtk3(-)=]
+	>=mate-base/mate-panel-1.8[gtk3(-)=]
+	x11-libs/libfakekey:0
+	x11-libs/libXtst:0
+	x11-libs/libX11:0
+	x11-libs/cairo:0
+	virtual/libintl:0
+	!gtk3? (
+		dev-libs/libunique:1
+		x11-libs/gtk+:2
+		x11-libs/libwnck:1
+	)
+	gtk3? (
+		dev-libs/libunique:3
+		x11-libs/gtk+:3
+		x11-libs/libwnck:3
+	)"
+
+RDEPEND="${COMMON_DEPEND}"
+
+DEPEND="${COMMON_DEPEND}
+	x11-proto/xproto:0
+	>=dev-util/intltool-0.50.1:*
+	sys-devel/gettext:*
+	virtual/pkgconfig:*"
+
+src_configure() {
+	mate_src_configure \
+		--with-gtk=$(usex gtk3 3.0 2.0)
+}
diff --git a/mate-extra/mate-netbook/mate-netbook-1.16.1.ebuild b/mate-extra/mate-netbook/mate-netbook-1.16.1.ebuild
new file mode 100644
index 000000000000..e8c29d5e123d
--- /dev/null
+++ b/mate-extra/mate-netbook/mate-netbook-1.16.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+DESCRIPTION="MATE utilities for netbooks"
+LICENSE="GPL-3"
+SLOT="0"
+
+IUSE="gtk3"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.36:2
+	>=mate-base/mate-panel-1.8[gtk3(-)=]
+	x11-libs/libfakekey:0
+	x11-libs/libXtst:0
+	x11-libs/libX11:0
+	x11-libs/cairo:0
+	virtual/libintl:0
+	!gtk3? (
+		x11-libs/gtk+:2
+		x11-libs/libwnck:1
+	)
+	gtk3? (
+		x11-libs/gtk+:3
+		x11-libs/libwnck:3
+	)"
+
+RDEPEND="${COMMON_DEPEND}"
+
+DEPEND="${COMMON_DEPEND}
+	x11-proto/xproto:0
+	>=dev-util/intltool-0.50.1:*
+	sys-devel/gettext:*
+	virtual/pkgconfig:*"
+
+src_configure() {
+	mate_src_configure \
+		--with-gtk=$(usex gtk3 3.0 2.0)
+}
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-netbook/metadata.xml b/mate-extra/mate-netbook/metadata.xml
new file mode 100644
index 000000000000..2c589b8e9aed
--- /dev/null
+++ b/mate-extra/mate-netbook/metadata.xml
@@ -0,0 +1,18 @@
+<?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 utilities for netbooks are an applet and a daemon to
+		maximize windows and move their titles on the panel.
+	</longdescription>
+	<use>
+		<flag name="gtk3">Build with GTK+3 instead of GTK+2</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">mate-desktop/mate-netbook</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/mate-extra/mate-polkit/Manifest b/mate-extra/mate-polkit/Manifest
new file mode 100644
index 000000000000..40db0b854b84
--- /dev/null
+++ b/mate-extra/mate-polkit/Manifest
@@ -0,0 +1,11 @@
+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
+EBUILD mate-polkit-1.12.0-r2.ebuild 1279 SHA256 6a7c301f171dedc83c2da1430f6960d2edc5dfa56329c668d1621b5048a6a9cc SHA512 95dbf9f4ce16fda02fcf36ae58836afb2322685bda7640fc93081fea24092d39c5cd00e92e66604428f6a11f90f460007af4f97de79248c9ba720466118a387a WHIRLPOOL 4cedd4c8b03609214bbba2340abf792a5a2ac5dd1f15953ae3f1ef07f0c54007a4e89c30800e41ff4b1ecc34dde395f05e5f1d453a66c06849f6ca3a43e11bed
+EBUILD mate-polkit-1.14.0.ebuild 1321 SHA256 433b57dac9b9e1c6aa798a64fc4685a145ab64c81adbc6efd3029db260d87b91 SHA512 2a2645a6b926e7330b5396a2f1136e16393d4d1a7a3394b24e55850add872c0f1f21bc7a354af4f5eee9601bdcbb02520707182ecb64bc61f59549bf10b75ef3 WHIRLPOOL a1b8cc2b77fad4a282041397c99fa22f951f250ac885b69fb42c7a4af8d5aee596c6894708a9976342b4f6413047e6845ffbccbea2b213c8fc6dc107f43d2e84
+EBUILD mate-polkit-1.16.0.ebuild 1168 SHA256 f6d63de7739abae779383902ece92d48a9ac9a00eb4d5ba6e03ed2fa5ddbc242 SHA512 95f25b6ad35bd24f471338586aad989c1e66b3f78b99a5792fe501e3bb9e959e6f6e6ffa03dd7754183ba6cbf003c69832f200135941ddad123bb9f4062e062c WHIRLPOOL d1e9597c5942bc2b0a151d55f11b25419334756e74a7c2c2d77f4df4f234299e6f60a96ab5d158e16508aa638c46565c0b71d928f8daaabd5156e1e606be8b72
+EBUILD mate-polkit-1.18.1.ebuild 1168 SHA256 f465a755b72b0ba969d57861880009be730b3b4d2a26f89198e6ee53d71d7ceb SHA512 1994e2c5bdab3bc3d5cd513549c835e2d8da906bae0a21e1ef997db77a1f6ecb1450f49225c675822f2b89e27ef059539553be42e565fc9756e2b88b4603a93b WHIRLPOOL 9cdc77fbd8bdd87abcee9c1d2f8259d31854b92460876a8316c07e22162ee90c76db3410dbdc2cee3ffb11f6e6285164bdaf966ae2da7a05a8557e02df632cbb
+MISC ChangeLog 4379 SHA256 e98484dc03e59094ab36571232abe2fbc47fc591ee018cd6d30f38d43a9ccece SHA512 779e84b12de7eb672102f0d68df068feb4a4f8110b21209f4f5d619a45cb38ec5c9ed945e24d5a07f3e3b7e8ab5e5984de3183f2f6f52d0f6b422edaf75c3143 WHIRLPOOL 1c483e2891e6d9bcb7de26d5c0cf6612bd443c77d3282abf7bf5b3890c615912f7aaae40cfcaca63896a223cbbf340fda9b9442aaef2bc6561ab8f315faa9820
+MISC ChangeLog-2015 1674 SHA256 bba77ed456ed2e7ed01d57428bbb9ab4d4cfc97891f18f7752b68fe2165a3504 SHA512 034598d324b8c67f977c6b030632d300cb446d01890a8dd6768aa54976efe00470446fd54f8743544bceea64aaf13f551f60a7c5b014c1eeaf4c3ba0fc67614d WHIRLPOOL 3aa5540890b5430cd79b6ad0bc45bafab1e5e8a0c31fc6be8f52d34f00792e1f9cc45bb8624bca08e76feed9c84009a3738e87b79ecf10202ea1faf14a991055
+MISC metadata.xml 566 SHA256 107cb1c5bbf321688fcc607043828b9c7632f9d31a3a31f43bf5b39915b6e191 SHA512 3f12eeee64f074b271e1f3c1fc8e8cfd7a6aa2a4ec0e9f4ac0f60aaff31523c182e59291b355a0e2440c9e8a0c2a3dc116ebd84c0cc2d0dbd869072c39da5480 WHIRLPOOL a1a63bba6abc14e691945bb367ff41de88b4c3f3a4328adebddfa9866b64bf5415bc387a065e9bdab5941e314feb1c2f79396ef6f7c0d16b1a579ce4afca1c41
diff --git a/mate-extra/mate-polkit/mate-polkit-1.12.0-r2.ebuild b/mate-extra/mate-polkit/mate-polkit-1.12.0-r2.ebuild
new file mode 100644
index 000000000000..95d9df6dc89f
--- /dev/null
+++ b/mate-extra/mate-polkit/mate-polkit-1.12.0-r2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="amd64 ~arm x86"
+fi
+
+DESCRIPTION="A MATE specific DBUS service that is used to bring up authentication dialogs"
+LICENSE="LGPL-2"
+SLOT="0"
+
+IUSE="accountsservice appindicator debug examples gtk3 +introspection"
+
+RDEPEND=">=dev-libs/glib-2.36:2
+	>=sys-auth/polkit-0.102:0[introspection?]
+	x11-libs/gdk-pixbuf:2[introspection?]
+	virtual/libintl:0
+	accountsservice? ( sys-apps/accountsservice:0[introspection?] )
+	!gtk3? (
+		>=x11-libs/gtk+-2.24:2[introspection?]
+		appindicator? ( dev-libs/libappindicator:2 )
+	)
+	gtk3? (
+		>=x11-libs/gtk+-3.0:3[introspection?]
+		appindicator? ( dev-libs/libappindicator:3 )
+	)
+	introspection? ( >=dev-libs/gobject-introspection-0.6.2:= )"
+
+DEPEND="${RDEPEND}
+	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 \
+		--with-gtk=$(usex gtk3 3.0 2.0) \
+		$(use_enable accountsservice) \
+		$(use_enable appindicator) \
+		$(use_enable debug) \
+		$(use_enable examples) \
+		$(use_enable introspection)
+}
diff --git a/mate-extra/mate-polkit/mate-polkit-1.14.0.ebuild b/mate-extra/mate-polkit/mate-polkit-1.14.0.ebuild
new file mode 100644
index 000000000000..07a5529360d1
--- /dev/null
+++ b/mate-extra/mate-polkit/mate-polkit-1.14.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+DESCRIPTION="A MATE specific DBUS service that is used to bring up authentication dialogs"
+LICENSE="LGPL-2"
+SLOT="0"
+
+IUSE="accountsservice appindicator debug examples gtk3 +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
+	!gtk3? (
+		>=x11-libs/gtk+-2.24:2[introspection?]
+		appindicator? ( dev-libs/libappindicator:2 )
+	)
+	gtk3? (
+		>=x11-libs/gtk+-3.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 \
+		--with-gtk=$(usex gtk3 3.0 2.0) \
+		$(use_enable accountsservice) \
+		$(use_enable appindicator) \
+		$(use_enable debug) \
+		$(use_enable examples) \
+		$(use_enable introspection)
+}
diff --git a/mate-extra/mate-polkit/mate-polkit-1.16.0.ebuild b/mate-extra/mate-polkit/mate-polkit-1.16.0.ebuild
new file mode 100644
index 000000000000..294d7edfb02b
--- /dev/null
+++ b/mate-extra/mate-polkit/mate-polkit-1.16.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+DESCRIPTION="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-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-polkit/metadata.xml b/mate-extra/mate-polkit/metadata.xml
new file mode 100644
index 000000000000..a91d00933e6a
--- /dev/null
+++ b/mate-extra/mate-polkit/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>mate@gentoo.org</email>
+		<name>Gentoo MATE Desktop</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">mate-desktop/mate-polkit</remote-id>
+	</upstream>
+	<use>
+		<flag name="accountsservice">Support extraction of data from AccountsService</flag>
+		<flag name="appindicator">Add support for AppIndicator</flag>
+		<flag name="gtk3">Build with GTK+3 instead of GTK+2</flag>
+	</use>
+</pkgmetadata>
diff --git a/mate-extra/mate-power-manager/Manifest b/mate-extra/mate-power-manager/Manifest
new file mode 100644
index 000000000000..3c706bf48146
--- /dev/null
+++ b/mate-extra/mate-power-manager/Manifest
@@ -0,0 +1,11 @@
+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
+EBUILD mate-power-manager-1.12.1-r2.ebuild 2186 SHA256 1b0e03ae659d7e798f56c353bf66e31a118620eb4ef2e2661fdddf0d3f82a0e9 SHA512 42f53a627a9eb59922cdfb2ed61fa211c14c62da24a4ee7ab9d85570cb6d49c5c2348cd376480078945b9edff1ab9058968c513dfc45cc57283f6befee832178 WHIRLPOOL 68530111bc11d5322fdd236e2fbda1b38e4658c03294725cc0a8a554400e6b68d1b1ff9c57ccc6f6c36874061744d05e144499b846a61baef60fd3e0e969f196
+EBUILD mate-power-manager-1.14.0.ebuild 2188 SHA256 0487cb721db1aa5f997fefa89f5074292427830e3bce75e7a5a8b0f9d3b7769d SHA512 8c83126c850a967e3a86db7094081adb097c5605011249ef46b2fdb801814900dfe741eebdb536bdd9de3e089a769b72d4bed484b8b8bbeb39fafd70266eb5af WHIRLPOOL 96a4047f9ed4325aa1775eb63b343295811d55c80a841dbfd22e42012b6036abc03ffbfca0c2b6ecc4f3d5ecad20391f9ccf9cb7a21cfbce11cd24f92f7cf56a
+EBUILD mate-power-manager-1.16.0.ebuild 2121 SHA256 23eb9dd807523ce06d67dca3762f6efb6a865d870dbecb6638fbc779cb894f20 SHA512 9d2e1cdd6b60ec9b03b557982ee44c265d78f193dfa724afb2815b7a04f8b5d1a03f186b4ad960506d5b1ebf7a71b2f5b8c2106e45f4d1c934af40d623e687f2 WHIRLPOOL aa891939303c72b48e77f4f5e2b227a92ca03b37906b3b005ea689245b3d5ef9dd8401d62352d78083dca66c0f8b629e5494fe7a2e7bf55585e0dfaddd64d49d
+EBUILD mate-power-manager-1.18.0.ebuild 1628 SHA256 d8de2b1b1ad6e41ad69528c7c980db06328109a8dc838f7673e151d4fb19f72d SHA512 88276237a45f4f6615cac96c295b008e04f5acc9bec7f537c26e4c99196eb167d099399baefe35264301ab6ae510ff0972ed4bd6872fc1ecfb52973ed62d850e WHIRLPOOL 15b419f78b1809e6195681fd9eb9b9bd3195af6a276bb38f60e789cf18aecc4c2e4454fb6515c1cb46695de172e9ed3028f3f8700bfdd9998c9216c55b701e80
+MISC ChangeLog 6602 SHA256 16b23e48626f4e197301aa825b87d250d02cf68ab3c48a1b26c2eece5e4a888f SHA512 933cda38357ea7a776347fc9bafadb5617935f90c93b9ba5174233028076241b24d0d9893bc1aeaf1f9bc29249242dc6d18aec9244bb0c1cbcbca9af906cc1cf WHIRLPOOL 3d19e3b7f9e624049792020c1c778dced3942cc5526fef1935f3aa1bc4109756f3636d08fd9141aada5a62de562d1fe80bbf8c71a04aa7e3629c24503d151985
+MISC ChangeLog-2015 3597 SHA256 20c869ece7e8b64180db7ac422e62ac3036b132d1e563e24b48c320f2b234619 SHA512 bf423e1ea83f6be5d3c34f42f3708df4c63c7ce5f0318feb27d066d4c975df96cf30b10152dc3eba718b4e740b46f8e088425d646fff7f564e5a2c063805f7f2 WHIRLPOOL 4d7fc9979a85aaf9d3db7818830f683cc852a4f8c1db3dd63ed3a79ee5a60b4ca7b9aa3ae96e42dc8c7909defa695233d656ad2db2e2963410c35df77262576a
+MISC metadata.xml 697 SHA256 80c86ca8ca6b79fd376fc2a74aafb7e2bae57a6fc52973c78c1b002fc50831f8 SHA512 bb4229159bc69879bf967fc082846e75e905ad7fcc772e70de1f3f2cd58117089d7d339903ea44adee01966b1aa04db8192c67b0021196a5fd56f78610a51399 WHIRLPOOL 4a6a1077dd4537ab046c1aff7c0bf16859244f3c3b0eb46deedd35ba90e3ec458564a08017991bd85c29149bd43f7530670f8c7cf8eb2df7620b10f6485b7016
diff --git a/mate-extra/mate-power-manager/mate-power-manager-1.12.1-r2.ebuild b/mate-extra/mate-power-manager/mate-power-manager-1.12.1-r2.ebuild
new file mode 100644
index 000000000000..446d6544622a
--- /dev/null
+++ b/mate-extra/mate-power-manager/mate-power-manager-1.12.1-r2.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="amd64 ~arm x86"
+fi
+
+DESCRIPTION="A session daemon for MATE that makes it easy to manage your laptop or desktop"
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="+applet gnome-keyring gtk3 man pm-utils policykit test"
+
+# Interactive testsuite.
+RESTRICT="test"
+
+COMMON_DEPEND="app-text/rarian:0
+	>=dev-libs/dbus-glib-0.70:0
+	>=dev-libs/glib-2.36:2
+	>=mate-base/mate-desktop-1.9[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/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.6[gtk3(-)=] )
+	gnome-keyring? ( >=gnome-base/libgnome-keyring-3:0 )
+	!gtk3? (
+		>=dev-libs/libunique-1:1
+		>=media-libs/libcanberra-0.10:0[gtk]
+		>=x11-libs/gtk+-2.24:2
+	)
+	gtk3? (
+		>=dev-libs/libunique-3:3
+		>=media-libs/libcanberra-0.10:0[gtk3]
+		>=x11-libs/gtk+-3.0:3
+	)
+	pm-utils? ( >=sys-power/upower-pm-utils-0.9.23 )
+	!pm-utils? ( >=sys-power/upower-0.9.23:= )"
+
+RDEPEND="${COMMON_DEPEND}
+	policykit? ( >=mate-extra/mate-polkit-1.6 )"
+
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xml-dtd:4.3
+	>=app-text/scrollkeeper-dtd-1:1.0
+	app-text/yelp-tools:0
+	>=dev-util/intltool-0.50.1:*
+	x11-proto/randrproto:0
+	>=x11-proto/xproto-7.0.15:0
+	sys-devel/gettext:*
+	virtual/pkgconfig:*
+	man? ( app-text/docbook-sgml-utils:0
+		>=app-text/docbook-sgml-dtd-4.3 )"
+
+src_prepare() {
+	mate_src_prepare
+
+	# This needs to be after eautoreconf to prevent problems like bug #356277
+	# Remove the docbook2man rules here since it's not handled by a proper
+	# parameter in configure.in.
+	if ! use man; then
+		sed -e 's:@HAVE_DOCBOOK2MAN_TRUE@.*::' -i man/Makefile.in \
+			|| die "docbook sed failed"
+	fi
+}
+
+src_configure() {
+	mate_src_configure \
+		--enable-compile-warnings=minimum \
+		--with-gtk=$(usex gtk3 3.0 2.0) \
+		$(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-power-manager/mate-power-manager-1.14.0.ebuild b/mate-extra/mate-power-manager/mate-power-manager-1.14.0.ebuild
new file mode 100644
index 000000000000..0b7f776a1bb3
--- /dev/null
+++ b/mate-extra/mate-power-manager/mate-power-manager-1.14.0.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+DESCRIPTION="A session daemon for MATE that makes it easy to manage your laptop or desktop"
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="+applet gnome-keyring gtk3 man pm-utils policykit test"
+
+# Interactive testsuite.
+RESTRICT="test"
+
+COMMON_DEPEND=">=dev-libs/dbus-glib-0.70:0
+	>=dev-libs/glib-2.36:2
+	>=mate-base/mate-desktop-1.9[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/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.6[gtk3(-)=] )
+	gnome-keyring? ( >=gnome-base/libgnome-keyring-3:0 )
+	!gtk3? (
+		>=dev-libs/libunique-1:1
+		>=media-libs/libcanberra-0.10:0[gtk]
+		>=x11-libs/gtk+-2.24:2
+	)
+	gtk3? (
+		>=dev-libs/libunique-3:3
+		>=media-libs/libcanberra-0.10:0[gtk3]
+		>=x11-libs/gtk+-3.0:3
+	)
+	pm-utils? ( >=sys-power/upower-pm-utils-0.9.23 )
+	!pm-utils? ( >=sys-power/upower-0.9.23:= )"
+
+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:*
+	man? ( app-text/docbook-sgml-utils:0
+		>=app-text/docbook-sgml-dtd-4.3 )"
+
+src_prepare() {
+	mate_src_prepare
+
+	# This needs to be after eautoreconf to prevent problems like bug #356277
+	# Remove the docbook2man rules here since it's not handled by a proper
+	# parameter in configure.in.
+	if ! use man; then
+		sed -e 's:@HAVE_DOCBOOK2MAN_TRUE@.*::' -i man/Makefile.in \
+			|| die "docbook sed failed"
+	fi
+}
+
+src_configure() {
+	mate_src_configure \
+		--enable-compile-warnings=minimum \
+		--with-gtk=$(usex gtk3 3.0 2.0) \
+		$(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-power-manager/mate-power-manager-1.16.0.ebuild b/mate-extra/mate-power-manager/mate-power-manager-1.16.0.ebuild
new file mode 100644
index 000000000000..5a16f8e82080
--- /dev/null
+++ b/mate-extra/mate-power-manager/mate-power-manager-1.16.0.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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 gtk3 man pm-utils policykit test"
+
+# Interactive testsuite.
+RESTRICT="test"
+
+COMMON_DEPEND=">=dev-libs/dbus-glib-0.70:0
+	>=dev-libs/glib-2.36:2
+	>=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/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.6[gtk3(-)=] )
+	gnome-keyring? ( >=gnome-base/libgnome-keyring-3:0 )
+	!gtk3? (
+		>=dev-libs/libunique-1:1
+		>=media-libs/libcanberra-0.10:0[gtk]
+		>=x11-libs/gtk+-2.24:2
+	)
+	gtk3? (
+		>=media-libs/libcanberra-0.10:0[gtk3]
+		>=x11-libs/gtk+-3.0:3
+	)
+	pm-utils? ( >=sys-power/upower-pm-utils-0.9.23 )
+	!pm-utils? ( >=sys-power/upower-0.9.23:= )"
+
+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:*
+	man? ( app-text/docbook-sgml-utils:0
+		>=app-text/docbook-sgml-dtd-4.3 )"
+
+src_prepare() {
+	mate_src_prepare
+
+	# This needs to be after eautoreconf to prevent problems like bug #356277
+	# Remove the docbook2man rules here since it's not handled by a proper
+	# parameter in configure.in.
+	if ! use man; then
+		sed -e 's:@HAVE_DOCBOOK2MAN_TRUE@.*::' -i man/Makefile.in \
+			|| die "docbook sed failed"
+	fi
+}
+
+src_configure() {
+	mate_src_configure \
+		--enable-compile-warnings=minimum \
+		--with-gtk=$(usex gtk3 3.0 2.0) \
+		$(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-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-power-manager/metadata.xml b/mate-extra/mate-power-manager/metadata.xml
new file mode 100644
index 000000000000..aca679d561df
--- /dev/null
+++ b/mate-extra/mate-power-manager/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>mate@gentoo.org</email>
+		<name>Gentoo MATE Desktop</name>
+	</maintainer>
+	<use>
+		<flag name="applet">Enable building of the MATE applet.</flag>
+		<flag name="gtk3">Build with GTK+3 instead of GTK+2</flag>
+		<flag name="man">Build power manager's man page.</flag>
+		<flag name="pm-utils">Adds support for suspend/resume using
+			<pkg>sys-power/upower-pm-utils</pkg> instead of
+			<pkg>sys-power/upower</pkg></flag>
+	</use>
+	<upstream>
+		<remote-id type="github">mate-desktop/mate-power-manager</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/mate-extra/mate-screensaver/Manifest b/mate-extra/mate-screensaver/Manifest
new file mode 100644
index 000000000000..b736152d4f3b
--- /dev/null
+++ b/mate-extra/mate-screensaver/Manifest
@@ -0,0 +1,12 @@
+AUX xss-conversion.txt 1026 SHA256 f1bcc5e85d45e53e6170d0cdf25dd3d10020aeef545cf2fdea5e3b4b30ec86c8 SHA512 149d28bf7ff9dffe75f0a59408d91eff6537ec27a9457bf2419efe78e9b39a11796b341176e6ba4b1a183cc3ead080abe0ba85f51a3d57b0ff54dae8a3ec312a WHIRLPOOL 95492336413595cd91fbf31dc44f616500714ec11ddedcbdf98e9c18b0d0897d83b3f5ef82fe410cdd45409060a2560a873b67141576ed3a196bc33f87734ee3
+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
+EBUILD mate-screensaver-1.12.0-r1.ebuild 3161 SHA256 df4e46de1b2441f9bfbb2056ef6931cf624fef0f6a9cd9f81c300618ee964c32 SHA512 98d6bbb3cb567947fb72c9f6f4c701efde4ca0221b2d67b1e07f6ff1bb33cda88d2499605314210d7e44ecef3684a4efcd330cd1fe773524aca2509a36479e50 WHIRLPOOL f0c7d57a06cff00ea5915e93aa2da82573af2abfdd3734c8f135dbef6f425003dd4ac8f26d9f4518f3966550c293b5cfe79dcb487e3f4fcaa44a62dcc2808c64
+EBUILD mate-screensaver-1.14.1.ebuild 3203 SHA256 1faa55c22b1be8e9d30a67a82b84cc04c53a8f856a77b79960523c249bbc9c72 SHA512 3a5e247804609e8b670680188789909c324182416dc7902db724ab265d86784d3f5ec89dc5b323a08e46b73bc976684f1f81e258c10ce974a678764ef9c7c1e6 WHIRLPOOL d71cbf81b8d257043218ce1a93426759b6d588e38f0cc216fb59803c4224e040d4d74eea21044102c20ea05b44e11852786e918c96fe7d4d4926cf876e54d20b
+EBUILD mate-screensaver-1.16.0.ebuild 3203 SHA256 1faa55c22b1be8e9d30a67a82b84cc04c53a8f856a77b79960523c249bbc9c72 SHA512 3a5e247804609e8b670680188789909c324182416dc7902db724ab265d86784d3f5ec89dc5b323a08e46b73bc976684f1f81e258c10ce974a678764ef9c7c1e6 WHIRLPOOL d71cbf81b8d257043218ce1a93426759b6d588e38f0cc216fb59803c4224e040d4d74eea21044102c20ea05b44e11852786e918c96fe7d4d4926cf876e54d20b
+EBUILD mate-screensaver-1.18.1.ebuild 3103 SHA256 e2af1d2531a06b36ed92c8813a6253eee1ffd48ef7c0732c4aa888e25c03b9dc SHA512 e88dab619e0cb8171fe9f1785bfa089a43ad65356b2d9390d9f0e7b6eba69aaf6a9f3a614aa1751b77756f930cb391a065dc7476ddb5098e6fe17ab7ebfa8ca5 WHIRLPOOL c34573f03737da790651ed78b81a8f1e0e8446139a24af6c5d6c33c8457f9f526e56e303338343b99efd92eb2aa07822e96cc5ba943e3d817f319f22046fdc1b
+MISC ChangeLog 6570 SHA256 4e8fa441f51ac3ba5e5e3bd06dcaa9b3915d860965e01f265e009b2874f06fa2 SHA512 b03d64dd60ce271f6daa271f9d4c8445026201886a29ed95cebb1c9771323dc0491929bcb95ac1162bd7b13633c7874e5263ceef0cfd84ceaa1595c640f1703b WHIRLPOOL 1a6e64933ed9466e37200d16332dd67ed08b8caf784cd85b340c1e582331de8924edea0f7085d11f5d46649f1c80926e0dca29406fbc05f624c9159594db7800
+MISC ChangeLog-2015 3292 SHA256 8cb4c78a7a90d1ae4da8bbb8de1a7a402a563b790a88c7098e9def8e62c7d615 SHA512 b4ff895b3b0e8dd573a9a95f8e6682800ad92a1d647b51c98c7df1341fb7900bf4a7c5755b7c900151a59303357005d4cee1970ac394468817a1affccb7523c5 WHIRLPOOL 9958cc43e7949ea316798491488cb43ad6ddd3be2928b8610e2ef7f33a1f1d7b89148a712f2c731f1ed7f1dd04a81d0172bd3e271016d25e30edc85263d00576
+MISC metadata.xml 508 SHA256 818913e7a6c5290f88a594b47ed24c64d15cbb7f8520f97a6f462c4ca03e1000 SHA512 03f079381cf35a7c0d33ec93f9aba9e8924dd010e1d67ea64508d1fca59fe56685ccc06b2a721006c1144e16a217b32156b67205c9ee8e8d39410406612cc3e2 WHIRLPOOL 11b1305ac55ca69d11f3c30f435b05dbe4bc1fdfaa9a3f34d277f04e91105801a948ec35aeb534554d2e564a7375d0d66a50484ffd34605f2e9d3964fffd6cb3
diff --git a/mate-extra/mate-screensaver/files/xss-conversion.txt b/mate-extra/mate-screensaver/files/xss-conversion.txt
new file mode 100644
index 000000000000..d69e50619589
--- /dev/null
+++ b/mate-extra/mate-screensaver/files/xss-conversion.txt
@@ -0,0 +1,22 @@
+There is a conversion script which you can use to convert XScreenSaver
+screensavers to the gnome-screensaver format.  The conversion script is located
+in the documentation directory (/usr/share/doc/${PF}/).
+
+The migrate-xscreensaver-config.sh and xscreensaver-config.xsl files will be
+needed to convert the screensaver.  Make sure to enable the executable bit on
+the script (chmod +x migrate-xscreensaver-config.sh).
+
+The script takes the module to convert and creates a .desktop file corresponding
+to the module.
+
+migrate-xscreensaver-config.sh /usr/share/xscreensaver/config/*.xml
+
+The above command should convert all xscreensaver modules.
+
+You must copy the desktop files into /usr/share/applications/gnome-screensavers (cp
+*.desktop /usr/share/applications/screensavers), and the executables from
+/usr/lib/misc/xscreensaver into /usr/libexec/gnome-screensaver
+(cp /usr/lib/misc/xscreensaver/* /usr/libexec/gnome-screensaver)
+
+Going to the gnome-screensaver-preferences dialog should now show the new
+modules in the list.
diff --git a/mate-extra/mate-screensaver/mate-screensaver-1.12.0-r1.ebuild b/mate-extra/mate-screensaver/mate-screensaver-1.12.0-r1.ebuild
new file mode 100644
index 000000000000..9b529f0d14c8
--- /dev/null
+++ b/mate-extra/mate-screensaver/mate-screensaver-1.12.0-r1.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 gtk3 kernel_linux libnotify opengl pam systemd"
+
+DOC_CONTENTS="
+	Information for converting screensavers is located in
+	/usr/share/doc/${PF}/xss-conversion.txt*
+"
+
+RDEPEND="
+	>=dev-libs/dbus-glib-0.71:0
+	>=dev-libs/glib-2.36:2
+	gnome-base/dconf:0
+	>=mate-base/libmatekbd-1.7.1[gtk3(-)=]
+	>=mate-base/mate-desktop-1.9.4[gtk3(-)=]
+	>=mate-base/mate-menus-1.6
+	>=mate-base/mate-session-manager-1.6
+	>=sys-apps/dbus-0.30:0
+	>=x11-libs/gdk-pixbuf-2.14:2
+	>=x11-libs/libX11-1:0
+	x11-libs/cairo:0
+	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 )
+	!gtk3? ( >=x11-libs/gtk+-2.24:2 )
+	gtk3? ( >=x11-libs/gtk+-3.0:3 )
+	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"
+
+DEPEND="${RDEPEND}
+	>=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 \
+		--with-gtk=$(usex gtk3 3.0 2.0) \
+		$(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
+	# https://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-screensaver/mate-screensaver-1.14.1.ebuild b/mate-extra/mate-screensaver/mate-screensaver-1.14.1.ebuild
new file mode 100644
index 000000000000..4bedd8f149c9
--- /dev/null
+++ b/mate-extra/mate-screensaver/mate-screensaver-1.14.1.ebuild
@@ -0,0 +1,118 @@
+# 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 gtk3 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.7.1[gtk3(-)=]
+	>=mate-base/mate-desktop-1.9.4[gtk3(-)=]
+	>=mate-base/mate-menus-1.6
+	>=sys-apps/dbus-0.30:0
+	>=x11-libs/gdk-pixbuf-2.14:2
+	>=x11-libs/libX11-1:0
+	x11-libs/cairo:0
+	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 )
+	!gtk3? ( >=x11-libs/gtk+-2.24:2 )
+	gtk3? ( >=x11-libs/gtk+-3.0:3 )
+	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 \
+		--with-gtk=$(usex gtk3 3.0 2.0) \
+		$(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
+	# https://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-screensaver/mate-screensaver-1.16.0.ebuild b/mate-extra/mate-screensaver/mate-screensaver-1.16.0.ebuild
new file mode 100644
index 000000000000..4bedd8f149c9
--- /dev/null
+++ b/mate-extra/mate-screensaver/mate-screensaver-1.16.0.ebuild
@@ -0,0 +1,118 @@
+# 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 gtk3 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.7.1[gtk3(-)=]
+	>=mate-base/mate-desktop-1.9.4[gtk3(-)=]
+	>=mate-base/mate-menus-1.6
+	>=sys-apps/dbus-0.30:0
+	>=x11-libs/gdk-pixbuf-2.14:2
+	>=x11-libs/libX11-1:0
+	x11-libs/cairo:0
+	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 )
+	!gtk3? ( >=x11-libs/gtk+-2.24:2 )
+	gtk3? ( >=x11-libs/gtk+-3.0:3 )
+	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 \
+		--with-gtk=$(usex gtk3 3.0 2.0) \
+		$(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
+	# https://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-screensaver/mate-screensaver-1.18.1.ebuild b/mate-extra/mate-screensaver/mate-screensaver-1.18.1.ebuild
new file mode 100644
index 000000000000..7024c0e10d58
--- /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
+	# https://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-screensaver/metadata.xml b/mate-extra/mate-screensaver/metadata.xml
new file mode 100644
index 000000000000..a0d6c3ac7d57
--- /dev/null
+++ b/mate-extra/mate-screensaver/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>mate@gentoo.org</email>
+		<name>Gentoo MATE Desktop</name>
+	</maintainer>
+	<use>
+		<flag name="consolekit">Enable support for 
+			<pkg>sys-auth/consolekit</pkg></flag>
+		<flag name="gtk3">Build with GTK+3 instead of GTK+2</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">mate-desktop/mate-screensaver</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/mate-extra/mate-sensors-applet/Manifest b/mate-extra/mate-sensors-applet/Manifest
new file mode 100644
index 000000000000..7a1c2a3ed58a
--- /dev/null
+++ b/mate-extra/mate-sensors-applet/Manifest
@@ -0,0 +1,11 @@
+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
+EBUILD mate-sensors-applet-1.12.1.ebuild 1596 SHA256 d519d8761e772dfddb6a055aa349c62456c296d99250ab93d835e7ce810c3f04 SHA512 a1cd24ac4d4348f78277991914137b3fe614619137db8109f0d940c69b89228e300e0722b38e3e0d6fce179d30fac8dd0ef2c7e61cb2f9f798d15b9327dd6041 WHIRLPOOL 886a1f762ab039a1ad42079684f32a407c0b2b468323816dd723a93ef4322665dd4ff2e19bbb6412f5f262e5a4e52195be100ff465ac7781765b071d10429ed0
+EBUILD mate-sensors-applet-1.14.0.ebuild 1638 SHA256 7862660387d541759ab5acf835dc5464460e91d7e3d0d59c90aa1f07490d7264 SHA512 65f80e50bf704f619049b2dbcae35450cc87d3bf1fb6d17f12c02c2455dfb94a2fa4e8cb07d309c7f993320f2914a9091011ae72abd33000f6d88e4de8d36f2e WHIRLPOOL f50caf16e1118bbcf70bc09954f328ab1827f427c3528741c1357acfcaf81569892fdc32eca8450f253b9a0acd3b51d0b1dd81397478016627dbea894fefbe62
+EBUILD mate-sensors-applet-1.16.0.ebuild 1638 SHA256 7862660387d541759ab5acf835dc5464460e91d7e3d0d59c90aa1f07490d7264 SHA512 65f80e50bf704f619049b2dbcae35450cc87d3bf1fb6d17f12c02c2455dfb94a2fa4e8cb07d309c7f993320f2914a9091011ae72abd33000f6d88e4de8d36f2e WHIRLPOOL f50caf16e1118bbcf70bc09954f328ab1827f427c3528741c1357acfcaf81569892fdc32eca8450f253b9a0acd3b51d0b1dd81397478016627dbea894fefbe62
+EBUILD mate-sensors-applet-1.18.2.ebuild 1546 SHA256 615bf2eb58f08e092929684f7dcac2e85284f5ee3550bcbd47da623e17f088d7 SHA512 e6cca19f4f6aff9d5a49a499743aaba4f75ebc173654568c4b290be76448c6be225dda996e2d93491542dda81c7e7317ee13d79e8c992070e84fed3bf9c59035 WHIRLPOOL 6c00f1ee79deb52ac9da2b3cc8909aa46da343c36b5810c72c03149654b73897e509e0b6ebd0b24f276aeb24e856cd7b480ae1fdacfd91b34a52fa2db012126e
+MISC ChangeLog 5099 SHA256 6ee2e9960d5b23bb9bb619a719b6581a87997400c98d8fa3125e1c83240f8583 SHA512 f41356f259a9dd2a2e4973d5ac36bdf0a02c0c26bd42b3d62034a54e9553c162a74874e6942dcbecaad88746d8f8264950b637fd40199f8f884d890a5a4a9972 WHIRLPOOL cb3cda106aed7b350a5223e5efb13eeb600f4b05c44b8c5bb7cf75631a1d8a519cb1007aff8866456c4920b22fc1320b60d18021f10071e546ae99b31e2ac112
+MISC ChangeLog-2015 1869 SHA256 fae6cdd82350867cffedecc797383d721358abe642102033930c12bf074b3a24 SHA512 b9125254be3c3cf723e2ea46947e0e6b685e0e5246e49f1b9e99c9559cc017918a18261cd642b87d3986253c16900228b728c0a86320175ba56a7abd7f192e21 WHIRLPOOL 54d32ea7af9664f6d204f2f99c5257529bcd5c82114e1d139803f3c2f3c936d577ff1318877714eff1c21784fe6e39671468b55d63400e9dc1d93cf5a3941d43
+MISC metadata.xml 424 SHA256 0de320779b648c027bbdd55a467823d30b889e2328d0b9c1814be0d4629c9ae8 SHA512 1bcb907fe8786f507b01dcc94309761ed2dba978ee0176d482c461c610b8b2e9876e29be1d0a3b36962ab9a7edd7e505c50851aafdb22e2bdc3588afb4aeaccb WHIRLPOOL 7dfd0ab9237276f1d80769a161aca9860768f30f6a3353ad31b25f7b5fdd57f1af7b548f5c407dd183bc2de08fec6952e2db7b311500968a4f2d3a525490fc8f
diff --git a/mate-extra/mate-sensors-applet/mate-sensors-applet-1.12.1.ebuild b/mate-extra/mate-sensors-applet/mate-sensors-applet-1.12.1.ebuild
new file mode 100644
index 000000000000..c684aa2eaa9f
--- /dev/null
+++ b/mate-extra/mate-sensors-applet/mate-sensors-applet-1.12.1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MATE_LA_PUNT="yes"
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="amd64 ~arm x86"
+fi
+
+DESCRIPTION="MATE panel applet to display readings from hardware sensors"
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="+dbus gtk3 hddtemp libnotify lm_sensors video_cards_fglrx video_cards_nvidia"
+
+RDEPEND="app-text/rarian:0
+	>=dev-libs/glib-2.36:2
+	>=mate-base/mate-panel-1.6[gtk3(-)=]
+	>=x11-libs/cairo-1.0.4:0
+	x11-libs/gdk-pixbuf:2
+	virtual/libintl:0
+	!gtk3? ( >=x11-libs/gtk+-2.24:2 )
+	gtk3? ( >=x11-libs/gtk+-3.0:3 )
+	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
+	) )"
+
+DEPEND="${RDEPEND}
+	>=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 \
+		--with-gtk=$(usex gtk3 3.0 2.0) \
+		$(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-sensors-applet/mate-sensors-applet-1.14.0.ebuild b/mate-extra/mate-sensors-applet/mate-sensors-applet-1.14.0.ebuild
new file mode 100644
index 000000000000..e0fb417cc7d7
--- /dev/null
+++ b/mate-extra/mate-sensors-applet/mate-sensors-applet-1.14.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MATE_LA_PUNT="yes"
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+DESCRIPTION="MATE panel applet to display readings from hardware sensors"
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="+dbus gtk3 hddtemp libnotify lm_sensors video_cards_fglrx video_cards_nvidia"
+
+COMMON_DEPEND=">=dev-libs/glib-2.36:2
+	>=mate-base/mate-panel-1.6[gtk3(-)=]
+	>=x11-libs/cairo-1.0.4:0
+	x11-libs/gdk-pixbuf:2
+	virtual/libintl:0
+	!gtk3? ( >=x11-libs/gtk+-2.24:2 )
+	gtk3? ( >=x11-libs/gtk+-3.0:3 )
+	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 \
+		--with-gtk=$(usex gtk3 3.0 2.0) \
+		$(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-sensors-applet/mate-sensors-applet-1.16.0.ebuild b/mate-extra/mate-sensors-applet/mate-sensors-applet-1.16.0.ebuild
new file mode 100644
index 000000000000..e0fb417cc7d7
--- /dev/null
+++ b/mate-extra/mate-sensors-applet/mate-sensors-applet-1.16.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MATE_LA_PUNT="yes"
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+DESCRIPTION="MATE panel applet to display readings from hardware sensors"
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="+dbus gtk3 hddtemp libnotify lm_sensors video_cards_fglrx video_cards_nvidia"
+
+COMMON_DEPEND=">=dev-libs/glib-2.36:2
+	>=mate-base/mate-panel-1.6[gtk3(-)=]
+	>=x11-libs/cairo-1.0.4:0
+	x11-libs/gdk-pixbuf:2
+	virtual/libintl:0
+	!gtk3? ( >=x11-libs/gtk+-2.24:2 )
+	gtk3? ( >=x11-libs/gtk+-3.0:3 )
+	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 \
+		--with-gtk=$(usex gtk3 3.0 2.0) \
+		$(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-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-sensors-applet/metadata.xml b/mate-extra/mate-sensors-applet/metadata.xml
new file mode 100644
index 000000000000..5cc849549b93
--- /dev/null
+++ b/mate-extra/mate-sensors-applet/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>mate@gentoo.org</email>
+		<name>Gentoo MATE Desktop</name>
+	</maintainer>
+	<use>
+		<flag name="gtk3">Build with GTK+3 instead of GTK+2</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">mate-desktop/mate-sensors-applet</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/mate-extra/mate-system-monitor/Manifest b/mate-extra/mate-system-monitor/Manifest
new file mode 100644
index 000000000000..455ba0b8640d
--- /dev/null
+++ b/mate-extra/mate-system-monitor/Manifest
@@ -0,0 +1,11 @@
+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
+EBUILD mate-system-monitor-1.12.2.ebuild 1015 SHA256 abf42c680a1e7f2eee7e1687bd9e432442f52927979e1ff3a626512bdf683f8d SHA512 464b7afd1531b963101721317612005ac075f1d4e24ff05d21be93564e52944da949a494d71d3bb2726578ccee126892acd23ef551d01354d7d470920017eca8 WHIRLPOOL 5f65b861333341af69fef41c37647f1d2b3d2d40db0830976b3eda2e41fee175297c7537c6d4f2d4f3f79611f0834880504fd6fc3d31ddd56735bcf24cfb4f6d
+EBUILD mate-system-monitor-1.14.0.ebuild 985 SHA256 5fdda4665b0717584607a9e8bed9fe6ac37c8fb9be6b76f2058d01f6b6cefbfb SHA512 4fd51f71d477cbb230ac4a072a2f5488e78a9b3de89e0f16da9485e4c954aeca9d1f03e4b817ca9f458e6bbdd666d92a6c46c47b960dc6fae82bf2dfe05f4c62 WHIRLPOOL 21ea5358a85f5709f16f169883d5313e3c586dcf332cc8a1004a6155faebbe7e4897c0d8071f619d5591b4f6d16f62dc2a5a388781eafee8cb9ae93971607c79
+EBUILD mate-system-monitor-1.16.0.ebuild 985 SHA256 5fdda4665b0717584607a9e8bed9fe6ac37c8fb9be6b76f2058d01f6b6cefbfb SHA512 4fd51f71d477cbb230ac4a072a2f5488e78a9b3de89e0f16da9485e4c954aeca9d1f03e4b817ca9f458e6bbdd666d92a6c46c47b960dc6fae82bf2dfe05f4c62 WHIRLPOOL 21ea5358a85f5709f16f169883d5313e3c586dcf332cc8a1004a6155faebbe7e4897c0d8071f619d5591b4f6d16f62dc2a5a388781eafee8cb9ae93971607c79
+EBUILD mate-system-monitor-1.18.0.ebuild 1011 SHA256 275115faf911e218f2f0b82bd0ae0d0290a85751349ecd2f2b843316c65e2d00 SHA512 811061185b98a96ee585f5829ffe353c33c866f737486611298cc69cc30039fb99a8e5aa495ed1cca9216eb00a08d65f6c95bd577b5e1d91094bd8392207d430 WHIRLPOOL c524a0af7c1998601ff0986754c70e8ca154a096608d90562bf6c9f26ba9fa35f7780e8985206f986d4bf3f483ed8011d23b7a99a7257a48f2fefe4bf32e5d06
+MISC ChangeLog 4600 SHA256 ec1d5049baea27ef938115efc196c8f928029de0677ca23d1e4884c2d399fe8d SHA512 f79a0f6bc9e34f705555106648b541503dc60967370e8891738ddddee2c54e5c00b3f24cf874ea142f54a894af7f3c060452a7c59855b10a3e5d54634610933c WHIRLPOOL 2e5a32abb012c86c59d00c8ec03cbb22ac57db2dfe992925dc0ebc81303ed0aea2e3d62265c6ccacfe71eebcdecfa80b9ec315fd1b2f315ed22fadffdb62041f
+MISC ChangeLog-2015 1545 SHA256 0cdd8d5bc6127dae356dd623d5aee8736476005c37741d2357136553fce58f19 SHA512 2115a9f50b72e40992a0453438618ccb4fe8474664236fd60b575ce08728df66e8a1211cce08879406ff697394b168a87c9e1d074431db0b1b5f34b6827abff5 WHIRLPOOL 7eb1802861ed9dd8c63f0e16e958a7dd4e7b89a53337d1586aaac8fcced6fdf0872e9c9e7adeaeb66e0ac0e911371c22b45f392f0cb87f5c57ef19437588570c
+MISC metadata.xml 424 SHA256 1217166b8ad654ae7486bfc78dec3a3ee9022b427404a0e84d35f7095e1ea5b0 SHA512 3f930932b1c3bdc51ebc07b28989e3a4c53eeca6479215b9c75c06323fcf95b46dfe3260a7f9e5391bb4dc76df87d0651ba87fdede28e1f816094921d00f31cc WHIRLPOOL 6058ffc5fb2e18adefdd1c739e0dded007e1c94c8b2eab342a00a0dfa2b670fcff76017baa7f274e7e374d9b05d43afca5f88fde6a6347fc91eb712b52aef1d1
diff --git a/mate-extra/mate-system-monitor/mate-system-monitor-1.12.2.ebuild b/mate-extra/mate-system-monitor/mate-system-monitor-1.12.2.ebuild
new file mode 100644
index 000000000000..a640204bee9e
--- /dev/null
+++ b/mate-extra/mate-system-monitor/mate-system-monitor-1.12.2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="amd64 ~arm x86"
+fi
+
+DESCRIPTION="The MATE System Monitor"
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="gtk3 systemd"
+
+RDEPEND="
+	>=dev-cpp/glibmm-2.26:2
+	>=dev-libs/dbus-glib-0.70: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
+	>=sys-apps/dbus-0.7:0
+	x11-libs/cairo:0
+	x11-libs/gdk-pixbuf:2
+	virtual/libintl:0
+	!gtk3? (
+		>=dev-cpp/gtkmm-2.22:2.4
+		>=x11-libs/gtk+-2.20:2
+		>=x11-libs/libwnck-2.5:1
+	)
+	gtk3? (
+		>=dev-cpp/gtkmm-3.0:3.0
+		>=x11-libs/gtk+-3.0:3
+		>=x11-libs/libwnck-2.91:3
+	)
+	systemd? ( sys-apps/systemd )"
+
+DEPEND="${RDEPEND}
+	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 \
+		--with-gtk=$(usex gtk3 3.0 2.0) \
+		$(use_enable systemd)
+}
diff --git a/mate-extra/mate-system-monitor/mate-system-monitor-1.14.0.ebuild b/mate-extra/mate-system-monitor/mate-system-monitor-1.14.0.ebuild
new file mode 100644
index 000000000000..5fb7d32fa1f6
--- /dev/null
+++ b/mate-extra/mate-system-monitor/mate-system-monitor-1.14.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+DESCRIPTION="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}"
+
+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-system-monitor/mate-system-monitor-1.16.0.ebuild b/mate-extra/mate-system-monitor/mate-system-monitor-1.16.0.ebuild
new file mode 100644
index 000000000000..5fb7d32fa1f6
--- /dev/null
+++ b/mate-extra/mate-system-monitor/mate-system-monitor-1.16.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+DESCRIPTION="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}"
+
+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-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-system-monitor/metadata.xml b/mate-extra/mate-system-monitor/metadata.xml
new file mode 100644
index 000000000000..abf6a9f6f1df
--- /dev/null
+++ b/mate-extra/mate-system-monitor/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>mate@gentoo.org</email>
+		<name>Gentoo MATE Desktop</name>
+	</maintainer>
+	<use>
+		<flag name="gtk3">Build with GTK+3 instead of GTK+2</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">mate-desktop/mate-system-monitor</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/mate-extra/mate-user-guide/Manifest b/mate-extra/mate-user-guide/Manifest
new file mode 100644
index 000000000000..d0891fa0b7a4
--- /dev/null
+++ b/mate-extra/mate-user-guide/Manifest
@@ -0,0 +1,10 @@
+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
+EBUILD mate-user-guide-1.12.0.ebuild 491 SHA256 b8c469d8cf6e8e1793becf725afafb23f8d24f6465b53999003b756ec7882782 SHA512 542f80c25d9d72f767f68fc0a4d05ec2bf610c42bcff7716831fe52d818899fce9c8b563ce1ace1eaa4bee07e365cf043a4aa3e228ce2b0e2fc04f40081db2eb WHIRLPOOL 1344fffcf61fa5032e4056728aa60769237e9736d2304ae290369142f07954135c1b1fc3b6897c021c2471a83de0b7caf1e1b8d5a78bdcde60d91e59f4ad3a65
+EBUILD mate-user-guide-1.14.0.ebuild 531 SHA256 e7577eee1f91be1feff07f1ec633866746b003455d909a6034fe0d367f3869f7 SHA512 b54808782cc92f4bf19e28b9a9cefa3a5b51508441d20a63ac7807abba3ac64583256312386284b72cd3e9ff9cbb53f1bf76c45e465a059c922453492316cac6 WHIRLPOOL 221e3816d139a6293d5fd8226a0e9607437f68db550cf4ec0f5b22e8b0238d52608bc7c8eba88771e6f3f0abb762f07b22c39a80509d7f7602af4585a8d7183c
+EBUILD mate-user-guide-1.16.0.ebuild 531 SHA256 e7577eee1f91be1feff07f1ec633866746b003455d909a6034fe0d367f3869f7 SHA512 b54808782cc92f4bf19e28b9a9cefa3a5b51508441d20a63ac7807abba3ac64583256312386284b72cd3e9ff9cbb53f1bf76c45e465a059c922453492316cac6 WHIRLPOOL 221e3816d139a6293d5fd8226a0e9607437f68db550cf4ec0f5b22e8b0238d52608bc7c8eba88771e6f3f0abb762f07b22c39a80509d7f7602af4585a8d7183c
+EBUILD mate-user-guide-1.18.0.ebuild 531 SHA256 fc183a63a7ae8f3f73fbba94aba2a5bd0ff253b9587d27ae9603c1af0ca3fa62 SHA512 2b75c17b7e43542ead8f08942386de9e0d1bafc66a7ab04b59074d400ed2c78de2282a27e55163af706dbd07dd311fcfa4189be9daf66e81f3f035a87e96249b WHIRLPOOL 35047feae080c80103a1cc0a5e601caaf6862f25199db0d5d58b9e3197239c79bf9b0c618ebe07a33b89ea121d250453b00ca054be275d5d195c55e0bf194c6a
+MISC ChangeLog 1159 SHA256 403f1cf12e8296f16292e4196793513747e5ed078501289e3784673b2a3c030b SHA512 6c19e6da33366a25ee467382239ba2fdddfb03e84c8657a93b853e64ab050d67b6fbd44870cb044bc5a3933d7d0c675a1dbcf46ced7d88014c927b6c0ecad49b WHIRLPOOL 05d1d428c9b8a60e8893bbf35de1274a20f6c296df592ad9c8816bb16142a34e5307eb84b7648bf87e7ab3973d630e9f96123622859436ed3ad36875dceeafe0
+MISC metadata.xml 344 SHA256 4c1df8bfbe02e237f63f90e86bca8c79f9f2f8f96791136fd82b944f22f19be7 SHA512 d0ce9f32a04fdae27a476a7197b067f85b1a4889ab758af1c761d2d59c6ca295a6d623db51a0296c64d3a6fb9ff9bea9577002f34020009b967d594b540440f4 WHIRLPOOL 97c968c09f612d786a5017f4b80285b4a40eb4d5e5b550f5d426f6ae3140e23e44e3c30544cba9020f14f2487b45fdb41d9e9e07bef2c8b3d42c354e9371a582
diff --git a/mate-extra/mate-user-guide/mate-user-guide-1.12.0.ebuild b/mate-extra/mate-user-guide/mate-user-guide-1.12.0.ebuild
new file mode 100644
index 000000000000..5000e6ccf896
--- /dev/null
+++ b/mate-extra/mate-user-guide/mate-user-guide-1.12.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MATE_LA_PUNT="yes"
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="amd64 ~arm x86"
+fi
+
+DESCRIPTION="User documentation for MATE Desktop"
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+
+RDEPEND="
+	gnome-extra/yelp
+	virtual/libintl:0"
+
+DEPEND="${RDEPEND}
+	>=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-guide/mate-user-guide-1.14.0.ebuild b/mate-extra/mate-user-guide/mate-user-guide-1.14.0.ebuild
new file mode 100644
index 000000000000..183d448a57fa
--- /dev/null
+++ b/mate-extra/mate-user-guide/mate-user-guide-1.14.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MATE_LA_PUNT="yes"
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+DESCRIPTION="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-guide/mate-user-guide-1.16.0.ebuild b/mate-extra/mate-user-guide/mate-user-guide-1.16.0.ebuild
new file mode 100644
index 000000000000..183d448a57fa
--- /dev/null
+++ b/mate-extra/mate-user-guide/mate-user-guide-1.16.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MATE_LA_PUNT="yes"
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+DESCRIPTION="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-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-guide/metadata.xml b/mate-extra/mate-user-guide/metadata.xml
new file mode 100644
index 000000000000..505c4052b33e
--- /dev/null
+++ b/mate-extra/mate-user-guide/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>mate@gentoo.org</email>
+		<name>Gentoo MATE Desktop</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">mate-desktop/mate-user-guide</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/mate-extra/mate-user-share/Manifest b/mate-extra/mate-user-share/Manifest
new file mode 100644
index 000000000000..545864c33b48
--- /dev/null
+++ b/mate-extra/mate-user-share/Manifest
@@ -0,0 +1,11 @@
+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
+EBUILD mate-user-share-1.12.0.ebuild 1285 SHA256 a62033e3d1cd39396dccd52243528d721fb05f7deff2defa199a8c431bb4eae8 SHA512 02a6d3c051446f7f35f21bd4ed50dbb8f3929c5437c8e3d2b63ba0ab2b3f30aabe246e9ccc9de7c61b32bdcc794afdc18b66cd89791e819b06c0a650cc678a5e WHIRLPOOL 28f3fb4018406a31024b784d86e30f7c3c59eb401a4908e25d57f563018d9efdbef0b46032149a2fccb1e8d16799fb3605f1e83d40afcd11a86653c0e9a9fa6e
+EBUILD mate-user-share-1.14.0.ebuild 1327 SHA256 122f19425e3d54b57288dcdece42f326045cd542e9941df93e19f5af604c1edc SHA512 03a59fe9da211e02ccd092e941feecae13b67b76c5ebad354d9b2ddbd2a58245203f147c45854f3151974b1205d09d0f92f02c8dd54e893dea349d2dc0d38e34 WHIRLPOOL 88eee4fba3840d5a83b92373de976c8732033be591802af1678aab2257042f21d92cfb826f31576bcea7836f7680004d6a464eceb5c9976421793a34c9476c8b
+EBUILD mate-user-share-1.16.0.ebuild 1300 SHA256 7638e3f20c3173796e5175efe897fdf90a4fb081ea636ebaa5408deca9999a58 SHA512 c91304ead3f606cc24c06bbc7564b0da6837bbbc13b05237facc5bddde6a7a51b876f626070502d113d76a8c017b6a3ff250d244c69092bc8c308a91b50bfec3 WHIRLPOOL 53c45e9b895725d68db8e3f7967f8a3b9e3623dac9c396d94954e564daaeaec1ecb6bc03eb665d55cc12f6d850246f073ffbbcb79986b1f0324e286fcb3a34d3
+EBUILD mate-user-share-1.18.0.ebuild 1142 SHA256 27484745ff907f8208767f608a1002a7f7246340deb571d797a2979326b9dfa8 SHA512 ab121797d1442d657857462dfec28e312f7cd4e500bb26b6e1f33314b0852811facee277c258358d2947ecc5eae79398cae3db95f0222f8a27e2e53b652aa64b WHIRLPOOL 0da76885f494bbd10e98197122c698fe6e9ba22712d502c076201158bdfad408b44240b8b7ff0d5b6c9b017b43406d3a7022068043ad06edbbc3d84860879559
+MISC ChangeLog 5173 SHA256 da607a7924829dfdb936dbf31c07dd6d604391978d5bfed81738229be850a318 SHA512 b0675d530220c2b48f7b4f21c790284f2044d5fd91b73f5b4ed02dd31a36c80979a0d18bf80d44cccd230b7a5fe53bc6b9f10a8b8192eadfe111b1b52902b19e WHIRLPOOL ebdab1be8614ca050783ef14964e7f607220a955d07ee95457bae353b014a38b851036cac830bc838bad465766a48669d30855d4330a66062a10f1d8ead9e0bf
+MISC ChangeLog-2015 1500 SHA256 52b2708e20c07cbde9264e0caf8704d66b3d2630117290bac72355fada9859ef SHA512 23cba534f6770be6d8f7829951bb5ae94d2cdf4f361078aa4654c31dff517e595a1abe013f0a2134bea44a01c9d7c48f9f461b178c2fb00b72fe40f6bbca077c WHIRLPOOL e872e450cdd5f67494cb8481b27d8336fd7f8ec8d9acf49118eed21e37a52474dc9fd2036e16fdb75d82d662b55d3633941054bdf29a8e3226a5cd9d89f01d7d
+MISC metadata.xml 420 SHA256 412ad8a791f906fcba16f16ebe573e3aaf43ba2b1505affa050644496016a42f SHA512 9696c73ac68c1c435e300709a7e38e3a77cc5eedbc76957cea7d01b5e3f282c3a22e1db7796911c501b8138ba981ddac590383ecbc405c98e1b7ef89743b90f4 WHIRLPOOL 2cd60d131428d48662601df467fc6ab3bc7cbabac0ae60912bf701213ba2591efdec287562830f6aa2e4d5cb30530fca18db8be3565537eb0d5268b5c003530e
diff --git a/mate-extra/mate-user-share/mate-user-share-1.12.0.ebuild b/mate-extra/mate-user-share/mate-user-share-1.12.0.ebuild
new file mode 100644
index 000000000000..477b173134ba
--- /dev/null
+++ b/mate-extra/mate-user-share/mate-user-share-1.12.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2016 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 gtk3"
+
+RDEPEND="
+	>=dev-libs/dbus-glib-0.70:0
+	>=dev-libs/glib-2.15.2:2
+	>=mate-base/caja-1.6[gtk3(-)=]
+	>=sys-apps/dbus-1.1.1:0
+	>=x11-libs/gdk-pixbuf-2:2
+	x11-libs/libX11:0
+	x11-libs/pango:0
+	>=x11-libs/libnotify-0.7:0
+	>=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]
+	virtual/libintl:0
+	!gtk3? (
+		>=dev-libs/libunique-1:1
+		media-libs/libcanberra:0[gtk]
+		>=x11-libs/gtk+-2.24:2
+	)
+	gtk3? (
+		>=dev-libs/libunique-3:3
+		media-libs/libcanberra:0[gtk3]
+		>=x11-libs/gtk+-3.0:3
+	)"
+
+DEPEND="${RDEPEND}
+	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 \
+		--with-gtk=$(usex gtk3 3.0 2.0) \
+		$(use_with X x)
+}
diff --git a/mate-extra/mate-user-share/mate-user-share-1.14.0.ebuild b/mate-extra/mate-user-share/mate-user-share-1.14.0.ebuild
new file mode 100644
index 000000000000..88e86f04f13b
--- /dev/null
+++ b/mate-extra/mate-user-share/mate-user-share-1.14.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2016 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 gtk3"
+
+COMMON_DEPEND="
+	>=dev-libs/dbus-glib-0.70:0
+	>=dev-libs/glib-2.15.2:2
+	>=mate-base/caja-1.6[gtk3(-)=]
+	>=sys-apps/dbus-1.1.1:0
+	>=x11-libs/gdk-pixbuf-2:2
+	x11-libs/libX11:0
+	x11-libs/pango:0
+	>=x11-libs/libnotify-0.7:0
+	virtual/libintl:0
+	!gtk3? (
+		>=dev-libs/libunique-1:1
+		media-libs/libcanberra:0[gtk]
+		>=x11-libs/gtk+-2.24:2
+	)
+	gtk3? (
+		>=dev-libs/libunique-3:3
+		media-libs/libcanberra:0[gtk3]
+		>=x11-libs/gtk+-3.0:3
+	)"
+
+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 \
+		--with-gtk=$(usex gtk3 3.0 2.0) \
+		$(use_with X x)
+}
diff --git a/mate-extra/mate-user-share/mate-user-share-1.16.0.ebuild b/mate-extra/mate-user-share/mate-user-share-1.16.0.ebuild
new file mode 100644
index 000000000000..11f1d7fe930e
--- /dev/null
+++ b/mate-extra/mate-user-share/mate-user-share-1.16.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2016 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 gtk3"
+
+COMMON_DEPEND="
+	>=dev-libs/dbus-glib-0.70:0
+	>=dev-libs/glib-2.15.2:2
+	>=mate-base/caja-1.6[gtk3(-)=]
+	>=sys-apps/dbus-1.1.1:0
+	>=x11-libs/gdk-pixbuf-2:2
+	x11-libs/libX11:0
+	x11-libs/pango:0
+	>=x11-libs/libnotify-0.7:0
+	virtual/libintl:0
+	!gtk3? (
+		>=dev-libs/libunique-1:1
+		media-libs/libcanberra:0[gtk]
+		>=x11-libs/gtk+-2.24:2
+	)
+	gtk3? (
+		media-libs/libcanberra:0[gtk3]
+		>=x11-libs/gtk+-3.0:3
+	)"
+
+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 \
+		--with-gtk=$(usex gtk3 3.0 2.0) \
+		$(use_with X x)
+}
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-user-share/metadata.xml b/mate-extra/mate-user-share/metadata.xml
new file mode 100644
index 000000000000..99735b0bd1f5
--- /dev/null
+++ b/mate-extra/mate-user-share/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>mate@gentoo.org</email>
+		<name>Gentoo MATE Desktop</name>
+	</maintainer>
+	<use>
+		<flag name="gtk3">Build with GTK+3 instead of GTK+2</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">mate-desktop/mate-user-share</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/mate-extra/mate-utils/Manifest b/mate-extra/mate-utils/Manifest
new file mode 100644
index 000000000000..e18a40d9f496
--- /dev/null
+++ b/mate-extra/mate-utils/Manifest
@@ -0,0 +1,12 @@
+AUX mate-utils-1.12.0-dict-gtk3.patch 1780 SHA256 694d2d5c7a5057b5878015e4cda64fa99854d5bc5d675544cf50fbf9c8e99740 SHA512 758eb7b3734852553df9a7c064370241ab3c3b1ba6eaf56a28021ebd7c61b92f1b4c354d4ef05d6647d3549ca518e9c576bd478c6dbcd96bed818dc63522ad7a WHIRLPOOL 0eb895d354aa8721d1e1e9bd5b072b95131b32664a1f0028ac7d63f2a2853da9e0a5fd29b76ad182c308a1e52e2c7f52ed3bfaec9948f1bb6fd0b4556aaa0394
+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
+EBUILD mate-utils-1.12.0-r2.ebuild 1442 SHA256 a7d001a35bbf33fc554be518b2492ce5d5cd9eeab1bedfabf73267019ae97b75 SHA512 6c043d0124bb98c69c073aa7d8f67ef0f1c131971f0b0c82c26083b01b6517ff7c21a5a2155c8f3c8f2f10bddc6f6ef3c5d9011e9425aab0c8b8cfd3a9458b6c WHIRLPOOL fd6ac8e8f9bac267a0980dcec2d2ce0bacd590661feb79764deefbe14364e9874b2d13cab67040f74a686a484022221888a656aedc16e582b429af9457f611b4
+EBUILD mate-utils-1.14.1.ebuild 1438 SHA256 bed2f5398664d8e430a47b22a13d398b448f3d76ecadfae5fb3ded534b4c3b55 SHA512 bc81e418c63e0c136dcbfc7efd381b9654f565e6a8ee7f8c8d84b97c740d57570a889208cad948409ba13751e77e5432a4cc832a6a1b6c8f5b90d64d713561b9 WHIRLPOOL ee142178954f8fb25ac8e82a2b3436d383845dcac69e44d8c668ab14532eee5fddf40fe28b25690e4be7f95f8ed170fd02d0fc5c9f77f7849610152c9a32954d
+EBUILD mate-utils-1.16.0.ebuild 1438 SHA256 bed2f5398664d8e430a47b22a13d398b448f3d76ecadfae5fb3ded534b4c3b55 SHA512 bc81e418c63e0c136dcbfc7efd381b9654f565e6a8ee7f8c8d84b97c740d57570a889208cad948409ba13751e77e5432a4cc832a6a1b6c8f5b90d64d713561b9 WHIRLPOOL ee142178954f8fb25ac8e82a2b3436d383845dcac69e44d8c668ab14532eee5fddf40fe28b25690e4be7f95f8ed170fd02d0fc5c9f77f7849610152c9a32954d
+EBUILD mate-utils-1.18.2.ebuild 1301 SHA256 36b56e371653f68394aa75ea8b915a9c3fd0cd26cc085b882e71c2d91c0e6851 SHA512 caa21aa81f89760d2fa03c3d2e6600d93512886270a7b04820847dd5c4487d4e2cb5495d518ee6e192e071b581dcc704358adb41b6f431ceb3c04d236971757d WHIRLPOOL ef2c81e0ae9c3d1a367850728e80f055d7edec5e41b56ccd3ced8d8e1580898ecd5d26387d5f21349b265773d93007c46c3e381e2226148a50499b3568dbeca5
+MISC ChangeLog 5501 SHA256 414995e6728264dc0b4e6e31f733f86b68dc91b4f003195e752058e88e182688 SHA512 8301488a8ba0c8bc6b5c3d6b28a5f7ccab32c41c839669fceea2f507409b607d704cdb34379d99ae2246607838bd8237e823f299fd62b34d2dba28f683cb0892 WHIRLPOOL e5a909c61afa6472bcdc034b3419f13470d0153ae26970643e6d47e4be603e165f876a65245cdff056e4971730e166fbd2f2a6fa50ed6a19d0e07e0e074740bd
+MISC ChangeLog-2015 1568 SHA256 08c727af32b3ed98fbdc53f0457963262b843d0ca77304b6bb60318af3d3db14 SHA512 98db154a45c973924d7808568320f578915062e74135f76a28751f4998523dfb165485a8d12da30b5bb6f8083c6bfd38dedaabee8eeb8695af3f6bb1e1321718 WHIRLPOOL 5b28c34be1783f71fe2ee8c2098639138ed63b5e32d41b044b1997f2181cc86f50da9f65d835db7c519418f5699e0f11d12e15342b72caf9945e828f6dd77c00
+MISC metadata.xml 478 SHA256 adb850aa85b98e9597b1169ac7ce46c15b8d1229d172445089ed8fd8e68e4270 SHA512 129a8bac28360c9260eca2a8db8e23aa5cef92464905b730952f0508fc8057c12929f590b1f6c2d0dfa72687a2dd63e7300fa01a2b25fb9346add99544e10db9 WHIRLPOOL 5792f07787b6f6e0032fa37114623f55c020d4201d3a2cf0c7c0139161886e2d353bdd10f605efccfce2f542591481242012006621234a5fce7805dd42beddcb
diff --git a/mate-extra/mate-utils/files/mate-utils-1.12.0-dict-gtk3.patch b/mate-extra/mate-utils/files/mate-utils-1.12.0-dict-gtk3.patch
new file mode 100644
index 000000000000..dff6dbe5582f
--- /dev/null
+++ b/mate-extra/mate-utils/files/mate-utils-1.12.0-dict-gtk3.patch
@@ -0,0 +1,53 @@
+From 5ab184661ff38baca3ea2709d81932a578654392 Mon Sep 17 00:00:00 2001
+From: Kir Kolyshkin <kir@openvz.org>
+Date: Mon, 16 May 2016 14:52:28 -0700
+Subject: [PATCH] mate-dict.pc: depend upon proper gtk version
+
+If the package is built against gtk-3.0 (as in
+./configure --with-gtk=3.0), mate-dict.pc still wants gtk-2.0
+since it's hardcoded it there. This can lead to improper builds
+of packages using libmatedict (although I can't find any now),
+as well as improper RPM dependencies, like this:
+
+	$ rpm -e gtk2-devel
+	error: Failed dependencies:
+	...
+	pkgconfig(gtk+-2.0) is needed by (installed) mate-utils-devel-1.14.0-1gtk3.fc23.x86_64
+
+Fortunately, the file is already generated, so it's trivial to add
+a proper substitution.
+
+[v2: also add min GTK version required]
+
+Signed-off-by: Kir Kolyshkin <kir@openvz.org>
+---
+ configure.ac                             | 2 ++
+ mate-dictionary/libgdict/mate-dict.pc.in | 2 +-
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 64aba70..39cc6f8 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -89,6 +89,8 @@ case "$with_gtk" in
+ 		LIBCANBERRA_GTK_REQUIRED=0.4
+ 		;;
+ esac
++AC_SUBST(GTK_API_VERSION)
++AC_SUBST(GTK_REQUIRED)
+ 
+ # common checks
+ PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLIB_REQUIRED)
+diff --git a/mate-dictionary/libgdict/mate-dict.pc.in b/mate-dictionary/libgdict/mate-dict.pc.in
+index e409a0c..8168de2 100644
+--- a/mate-dictionary/libgdict/mate-dict.pc.in
++++ b/mate-dictionary/libgdict/mate-dict.pc.in
+@@ -5,7 +5,7 @@ includedir=@includedir@
+ 
+ Name: gdict-1.0
+ Description: MATE Dictionary Protocol client library
+-Requires: gtk+-2.0
++Requires: gtk+-@GTK_API_VERSION@ >= @GTK_REQUIRED@
+ Version: @GDICT_VERSION@
+ Libs: -L${libdir} -lmatedict
+ Cflags: -I${includedir}/mate-dict
diff --git a/mate-extra/mate-utils/mate-utils-1.12.0-r2.ebuild b/mate-extra/mate-utils/mate-utils-1.12.0-r2.ebuild
new file mode 100644
index 000000000000..22464b1481fd
--- /dev/null
+++ b/mate-extra/mate-utils/mate-utils-1.12.0-r2.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MATE_LA_PUNT="yes"
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="amd64 ~arm x86"
+fi
+
+DESCRIPTION="Utilities for the MATE desktop"
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="X applet debug gtk3 ipv6 test"
+
+RDEPEND="app-text/rarian:0
+	dev-libs/atk:0
+	>=dev-libs/glib-2.36:2
+	>=gnome-base/libgtop-2.12:2=
+	sys-libs/zlib:0
+	x11-libs/cairo:0
+	x11-libs/gdk-pixbuf:2
+	x11-libs/libICE:0
+	x11-libs/libSM:0
+	x11-libs/libX11:0
+	x11-libs/libXext:0
+	x11-libs/pango:0
+	applet? ( >=mate-base/mate-panel-1.6[gtk3(-)=] )
+	!gtk3? (
+		>=x11-libs/gtk+-2.24:2
+		>=media-libs/libcanberra-0.4:0[gtk]
+	)
+	gtk3? (
+		>=x11-libs/gtk+-3.0:3
+		>=media-libs/libcanberra-0.4:0[gtk3]
+	)"
+
+DEPEND="${RDEPEND}
+	>=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:*"
+
+PATCHES=( "${FILESDIR}/${P}-dict-gtk3.patch" )
+
+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) \
+		--with-gtk=$(usex gtk3 3.0 2.0) \
+		$(use_with X x) \
+		$(use_enable applet gdict-applet) \
+		$(use_enable ipv6)
+}
diff --git a/mate-extra/mate-utils/mate-utils-1.14.1.ebuild b/mate-extra/mate-utils/mate-utils-1.14.1.ebuild
new file mode 100644
index 000000000000..58b285e69de6
--- /dev/null
+++ b/mate-extra/mate-utils/mate-utils-1.14.1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MATE_LA_PUNT="yes"
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+DESCRIPTION="Utilities for the MATE desktop"
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="X applet debug gtk3 ipv6 test"
+
+COMMON_DEPEND="
+	dev-libs/atk:0
+	>=dev-libs/glib-2.36:2
+	>=gnome-base/libgtop-2.12:2=
+	sys-libs/zlib:0
+	x11-libs/cairo:0
+	x11-libs/gdk-pixbuf:2
+	x11-libs/libICE:0
+	x11-libs/libSM:0
+	x11-libs/libX11:0
+	x11-libs/libXext:0
+	x11-libs/pango:0
+	applet? ( >=mate-base/mate-panel-1.6[gtk3(-)=] )
+	!gtk3? (
+		>=x11-libs/gtk+-2.24:2
+		>=media-libs/libcanberra-0.4:0[gtk]
+	)
+	gtk3? (
+		>=x11-libs/gtk+-3.0:3
+		>=media-libs/libcanberra-0.4:0[gtk3]
+	)"
+
+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) \
+		--with-gtk=$(usex gtk3 3.0 2.0) \
+		$(use_with X x) \
+		$(use_enable applet gdict-applet) \
+		$(use_enable ipv6)
+}
diff --git a/mate-extra/mate-utils/mate-utils-1.16.0.ebuild b/mate-extra/mate-utils/mate-utils-1.16.0.ebuild
new file mode 100644
index 000000000000..58b285e69de6
--- /dev/null
+++ b/mate-extra/mate-utils/mate-utils-1.16.0.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MATE_LA_PUNT="yes"
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+DESCRIPTION="Utilities for the MATE desktop"
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="X applet debug gtk3 ipv6 test"
+
+COMMON_DEPEND="
+	dev-libs/atk:0
+	>=dev-libs/glib-2.36:2
+	>=gnome-base/libgtop-2.12:2=
+	sys-libs/zlib:0
+	x11-libs/cairo:0
+	x11-libs/gdk-pixbuf:2
+	x11-libs/libICE:0
+	x11-libs/libSM:0
+	x11-libs/libX11:0
+	x11-libs/libXext:0
+	x11-libs/pango:0
+	applet? ( >=mate-base/mate-panel-1.6[gtk3(-)=] )
+	!gtk3? (
+		>=x11-libs/gtk+-2.24:2
+		>=media-libs/libcanberra-0.4:0[gtk]
+	)
+	gtk3? (
+		>=x11-libs/gtk+-3.0:3
+		>=media-libs/libcanberra-0.4:0[gtk3]
+	)"
+
+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) \
+		--with-gtk=$(usex gtk3 3.0 2.0) \
+		$(use_with X x) \
+		$(use_enable applet gdict-applet) \
+		$(use_enable ipv6)
+}
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/mate-extra/mate-utils/metadata.xml b/mate-extra/mate-utils/metadata.xml
new file mode 100644
index 000000000000..516aaa5d49f8
--- /dev/null
+++ b/mate-extra/mate-utils/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>mate@gentoo.org</email>
+		<name>Gentoo MATE Desktop</name>
+	</maintainer>
+	<use>
+		<flag name="applet">Enable the mate dictionary applet</flag>
+		<flag name="gtk3">Build with GTK+3 instead of GTK+2</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">mate-desktop/mate-utils</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/mate-extra/metadata.xml b/mate-extra/metadata.xml
new file mode 100644
index 000000000000..211105c47dc8
--- /dev/null
+++ b/mate-extra/metadata.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<catmetadata>
+	<longdescription lang="en">
+		The mate-extra category contains additional non-core MATE packages.
+	</longdescription>
+	<longdescription lang="de">
+		Die Kategorie mate-extra enthält zusätzliche MATE-Pakete die nicht
+		Teil des Basissystems sind.
+	</longdescription>
+	<longdescription lang="es">
+		La categoría mate-extra contiene paquetes adicionales de MATE.
+	</longdescription>
+	<longdescription lang="ja">
+		mate-extraカテゴリーにはMATEのコアなし拡張パッケージが含まれています。
+	</longdescription>
+	<longdescription lang="nl">
+		De mate-extra categorie bevat optionele extra's voor de MATE desktopomgeving.
+	</longdescription>
+	<longdescription lang="vi">
+		Nhóm mate-extra chứa các gói MATE bổ sung, không thuộc về các gói cốt lõi.
+	</longdescription>
+	<longdescription lang="it">
+		La categoria mate-extra contiene pacchetti vari per MATE.
+	</longdescription>
+	<longdescription lang="pt">
+		A categoria mate-extra contém pacotes adicionais de MATE.
+	</longdescription>
+	<longdescription lang="pl">
+		Kategoria mate-extra zawiera dodatkowe pakiety dla środowiska MATE.
+	</longdescription>
+</catmetadata>
+
author	V3n3RiX <venerix@redcorelinux.org>	2017-10-09 18:53:29 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2017-10-09 18:53:29 +0100
commit	4f2d7949f03e1c198bc888f2d05f421d35c57e21 (patch)
tree	ba5f07bf3f9d22d82e54a462313f5d244036c768 /mate-extra