Revert "Добавлены ebuild mate 1.20"

This reverts commit aaab2b1c78.
2018-07-24 01:12:27 +03:00 · 2018-07-24 01:12:27 +03:00 · f7c294a87c
commit f7c294a87c
parent 9fbead2c40
97 changed files with 50 additions and 3825 deletions
--- a/app-arch/engrampa/Manifest
+++ b/app-arch/engrampa/Manifest
@ -1 +0,0 @@
-DIST engrampa-1.20.1.tar.xz 1446112 BLAKE2B 51ab835f9d79a8934195103c97e067ff138d8d945ec69c1562de65bff812f06fce7dfcbbba167ed0564a4fbdb0066ddebcd1d7239dcac7373b89f60df0ca112a SHA512 750c2cb54fced56196d61abdb05dab86b08f4ef4c485c53ec52f11bf397257c832a7f94b853e43d4222b9bad35c9d6188bd347012139424b69430824ddcc72eb
--- a/app-arch/engrampa/engrampa-1.20.1.ebuild
+++ b/app-arch/engrampa/engrampa-1.20.1.ebuild
@ -1,70 +0,0 @@
-# Copyright 1999-2018 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 arm64 x86"
-fi
-
-DESCRIPTION="Engrampa archive manager for MATE"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="caja magic packagekit"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.32.0:2
-	>=dev-libs/json-glib-0.14:0
-	x11-libs/gdk-pixbuf:2
-	x11-libs/pango:0
-	virtual/libintl:0
-	caja? ( >=mate-base/caja-1.17.1 )
-	>=x11-libs/gtk+-3.14:3[X]
-	magic? ( sys-apps/file )
-	packagekit? ( app-admin/packagekit-base )
-	!!app-arch/mate-file-archiver"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/yelp-tools
-	>=dev-util/intltool-0.50.1:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-src_configure() {
-	mate_src_configure \
-		--disable-run-in-place \
-		$(use_enable caja caja-actions) \
-		$(use_enable magic) \
-		$(use_enable packagekit)
-}
-
-pkg_postinst() {
-	mate_pkg_postinst
-
-	elog ""
-	elog "${PN} is a frontend for several archiving utilities. If you want a"
-	elog "particular achive format supported install the relevant package."
-	elog
-	elog "For example:"
-	elog "  7-zip   : emerge app-arch/p7zip"
-	elog "  ace     : emerge app-arch/unace"
-	elog "  arj     : emerge app-arch/arj"
-	elog "  cpio    : emerge app-arch/cpio"
-	elog "  deb     : emerge app-arch/dpkg"
-	elog "  iso     : emerge app-cdr/cdrtools"
-	elog "  jar,zip : emerge app-arch/zip  or  emerge app-arch/unzip"
-	elog "  lha     : emerge app-arch/lha"
-	elog "  lzma    : emerge app-arch/xz-utils"
-	elog "  lzop    : emerge app-arch/lzop"
-	elog "  rar     : emerge app-arch/unrar"
-	elog "  rpm     : emerge app-arch/rpm"
-	elog "  unstuff : emerge app-arch/stuffit"
-	elog "  zoo     : emerge app-arch/zoo"
-}
--- a/app-editors/pluma/Manifest
+++ b/app-editors/pluma/Manifest
@ -1 +0,0 @@
-DIST pluma-1.20.2.tar.xz 3504720 BLAKE2B 350f14f2c2d75bdc51d79079907fc792746327adb9bf87cbccdbac67774e8d7102a7bb525d59f3c2aed98606aae5f72f49474382a6b9023bb7773face691c0f8 SHA512 36ac5aca6661c8f273fd9ff1a981fdc6138296ed9b6ba280a2f97ca3f925cdb1bdfda890a35f028816b3c076f18f1fc2d0a02b7101e53af8b494f723fc0afeb7
--- a/app-editors/pluma/pluma-1.20.2.ebuild
+++ b/app-editors/pluma/pluma-1.20.2.ebuild
@ -1,77 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit mate multilib python-single-r1 virtualx
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 arm arm64 x86"
-fi
-
-DESCRIPTION="Pluma text editor for the MATE desktop"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="+introspection spell"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# Tests require gvfs sftp fs mounted and schema's installed. Disable tests.
-# https://github.com/mate-desktop/mate-text-editor/issues/33
-RESTRICT="test"
-
-COMMON_DEPEND="dev-libs/atk:0
-	>=dev-libs/glib-2.36:2
-	>=dev-libs/libpeas-1.2.0[gtk]
-	>=dev-libs/libxml2-2.5:2
-	x11-libs/cairo:0
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.14.0:3[introspection?]
-	>=x11-libs/gtksourceview-3.0.0:3.0
-	x11-libs/libICE:0
-	x11-libs/libX11:0
-	>=x11-libs/libSM-1.0
-	x11-libs/pango:0
-	virtual/libintl:0
-	introspection? ( >=dev-libs/gobject-introspection-0.9.3:= )
-	spell? (
-		>=app-text/enchant-1.2:0
-		>=app-text/iso-codes-0.35:0
-	)
-	!!app-editors/mate-text-editor"
-
-RDEPEND="${PYTHON_DEPS}
-	${COMMON_DEPEND}
-	>=mate-base/mate-desktop-1.9[introspection?]"
-
-DEPEND="${COMMON_DEPEND}
-	~app-text/docbook-xml-dtd-4.1.2
-	app-text/rarian:0
-	>=app-text/scrollkeeper-dtd-1:1.0
-	app-text/yelp-tools:0
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.50.1:*
-	>=sys-devel/libtool-2.2.6:2
-	>=sys-devel/gettext-0.17:*
-	virtual/pkgconfig:*"
-
-src_configure() {
-	mate_src_configure \
-		$(use_enable introspection) \
-		$(use_enable spell)
-}
-
-src_test() {
-	# FIXME: This should be handled at eclass level.
-	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die
-
-	unset DBUS_SESSION_BUS_ADDRESS
-
-	GSETTINGS_SCHEMA_DIR="${S}/data" Xemake check
-}
--- a/app-text/atril/Manifest
+++ b/app-text/atril/Manifest
@ -1 +0,0 @@
-DIST atril-1.20.2.tar.xz 1773132 BLAKE2B d02a0e44e99eeb840050a7bb1f51f4fd465804e560cbe3c6ea679a7e773039e4aadcbf6883ba371cdcf63dcd95cd5d66fa3876e16e74e9b5e2ebc7f7c2f306ba SHA512 b2d960b6e05e3c9c4939d4ae942da0aec06317cac5e31fae7b39d503274eb4e51a8ea8d63b2802bfeffd4cef09ddf4aed993bbd9bb9cd023bacad55499eced26
--- a/app-text/atril/atril-1.20.2.ebuild
+++ b/app-text/atril/atril-1.20.2.ebuild
@ -1,93 +0,0 @@
-# Copyright 1999-2018 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 ~arm64 x86"
-fi
-
-DESCRIPTION="Atril document viewer for MATE"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="caja dbus debug djvu dvi epub +introspection gnome-keyring +postscript t1lib tiff xps"
-
-REQUIRED_USE="t1lib? ( dvi )"
-
-COMMON_DEPEND=">=app-text/poppler-0.22:0=[cairo]
-	dev-libs/atk:0
-	>=dev-libs/glib-2.36:2
-	>=dev-libs/libxml2-2.5:2
-	sys-libs/zlib:0
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.14:3[introspection?]
-	x11-libs/libICE:0
-	>=x11-libs/libSM-1:0
-	x11-libs/libX11:0
-	>=x11-libs/cairo-1.9.10:0
-	x11-libs/pango:0
-	caja? ( >=mate-base/caja-1.17.1[introspection?] )
-	djvu? ( >=app-text/djvu-3.5.17:0 )
-	dvi? (
-		virtual/tex-base:0
-		t1lib? ( >=media-libs/t1lib-5:5 )
-	)
-	epub? (
-		dev-libs/mathjax
-		>=net-libs/webkit-gtk-2.4.3:4
-	)
-	gnome-keyring? ( >=app-crypt/libsecret-0.5:0 )
-	introspection? ( >=dev-libs/gobject-introspection-0.6:= )
-	postscript? ( >=app-text/libspectre-0.2:0 )
-	tiff? ( >=media-libs/tiff-3.6:0 )
-	xps? ( >=app-text/libgxps-0.2.1:0 )
-	!!app-text/mate-document-viewer"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/rarian:0
-	app-text/yelp-tools:0
-	>=app-text/scrollkeeper-dtd-1:1.0
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.50.1:*
-	virtual/pkgconfig:*
-	sys-devel/gettext:*"
-
-#PATCHES=(
-#	"${FILESDIR}"/${PN}-1.20.1-epub-webkitgtk.patch
-#)
-
-# Tests use dogtail which is not available on Gentoo.
-RESTRICT="test"
-
-src_configure() {
-	# Passing --disable-help would drop offline help, that would be inconsistent
-	# with helps of the most of GNOME apps that doesn't require network for that.
-	mate_src_configure \
-		--disable-tests \
-		--enable-comics \
-		--enable-pdf \
-		--enable-pixbuf \
-		--enable-previewer \
-		--enable-thumbnailer \
-		$(use_with gnome-keyring keyring) \
-		$(use_enable caja) \
-		$(use_enable dbus) \
-		$(use_enable debug) \
-		$(use_enable djvu) \
-		$(use_enable dvi) \
-		$(use_enable epub) \
-		$(use_enable introspection) \
-		$(use_enable postscript ps) \
-		$(use_enable t1lib) \
-		$(use_enable tiff) \
-		$(use_enable xps)
-}
--- a/dev-libs/libmateweather/Manifest
+++ b/dev-libs/libmateweather/Manifest
@ -1 +0,0 @@
-DIST libmateweather-1.20.1.tar.xz 3379644 BLAKE2B 19837dfefc92ebf98d4682f560857ced336caf695c6c4b621b9f051c423a8e658c0aa7426b840df736572b9af07e2f07537e94b27e2164a9720b5bf81754ee27 SHA512 8cf1d25cd1e456975c0228b1a57f66a8a3a94c22321eee196fdcb0eaa64ac9d97de50b2b5d6f974c77110769a687b89f90fd6391db5e3ef0031349dc8a47c5c4
--- a/dev-libs/libmateweather/libmateweather-1.20.1.ebuild
+++ b/dev-libs/libmateweather/libmateweather-1.20.1.ebuild
@ -1,42 +0,0 @@
-# Copyright 1999-2018 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 ~arm64 x86"
-fi
-
-DESCRIPTION="MATE library to access weather information from online services"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="debug"
-
-COMMON_DEPEND=">=dev-libs/glib-2.36:2
-	>=dev-libs/libxml2-2.6:2
-	>=net-libs/libsoup-2.34:2.4
-	>=sys-libs/timezone-data-2010k:0
-	x11-libs/gdk-pixbuf:2
-	virtual/libintl:0
-	>=x11-libs/gtk+-3.0:3"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.50.1:*
-	sys-devel/gettext:*
-	>=sys-devel/libtool-2.2.6:2
-	virtual/pkgconfig:*"
-
-src_configure() {
-	mate_src_configure \
-		--enable-locations-compression \
-		--disable-all-translations-in-one-xml
-}
--- a/dev-python/python-caja/Manifest
+++ b/dev-python/python-caja/Manifest
@ -1 +0,0 @@
-DIST python-caja-1.20.1.tar.xz 285008 BLAKE2B 83050cc51e98d79d019a824f2fd28c5ddd7cc84ebb310f40acb82cf598279bd7753ec80d2b65aa0974f5b1b0a4c8d757e64ccbab52b1b149f13bfa69e21b61ef SHA512 3b0c97b160f6af6552ab2bebb5a25b823a18aee241b512cebb24ab3089eb863714cbabeaaf722c8ffa8a6ed375b4d302f269e4b3d5d5b8ec329d1aa494a13f1f
--- a/dev-python/python-caja/python-caja-1.20.1.ebuild
+++ b/dev-python/python-caja/python-caja-1.20.1.ebuild
@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
-
-inherit mate python-single-r1
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm x86"
-fi
-
-DESCRIPTION="Python bindings for the Caja file manager"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="doc"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	dev-libs/glib:2
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	>=mate-base/caja-1.17.1[introspection]
-	x11-libs/gtk+:3"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	virtual/pkgconfig:*
-	doc? ( app-text/docbook-xml-dtd:4.1.2 )"
-
-src_install() {
-	mate_src_install
-
-	# Keep the directory for systemwide extensions.
-	keepdir /usr/share/python-caja/extensions/
-
-	# The HTML documentation generation is broken and commented out by upstream.
-	#
-	#if use doc ; then
-	#	insinto /usr/share/gtk-doc/html/nautilus-python # for dev-util/devhelp
-	#	doins -r docs/html/*
-	#fi
-}
--- a/eclass/mate-desktop.org.eclass
+++ b/eclass/mate-desktop.org.eclass
@ -1,64 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# @ECLASS: mate-desktop.org.eclass
-# @MAINTAINER:
-# mate@gentoo.org
-# @AUTHOR:
-# Authors: NP-Hardass <NP-Hardass@gentoo.org> based upon the gnome.org eclass.
-# @BLURB: Helper eclass for mate-desktop.org hosted archives
-# @DESCRIPTION:
-# Provide a default SRC_URI and EGIT_REPO_URI for MATE packages as well as
-# exporting some useful values like the MATE_BRANCH
-
-# EAPIs < 6 are banned.
-case "${EAPI:-0}" in
-	6) ;;
-	*) die "EAPI=${EAPI:-0} is not supported" ;;
-esac
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-fi
-
-inherit versionator
-
-# @ECLASS-VARIABLE: MATE_TARBALL_SUFFIX
-# @INTERNAL
-# @DESCRIPTION:
-# All projects hosted on mate-desktop.org provide tarballs as tar.xz.
-# Undefined in live ebuilds.
-[[ ${PV} != 9999 ]] && : ${MATE_TARBALL_SUFFIX:="xz"}
-
-# @ECLASS-VARIABLE: MATE_DESKTOP_ORG_PN
-# @DESCRIPTION:
-# Name of the package as hosted on mate-desktop.org.
-# Leave unset if package name matches PN.
-: ${MATE_DESKTOP_ORG_PN:=$PN}
-
-# @ECLASS-VARIABLE: MATE_DESKTOP_ORG_PV
-# @DESCRIPTION:
-# Package version string as listed on mate-desktop.org.
-# Leave unset if package version string matches PV.
-: ${MATE_DESKTOP_ORG_PV:=$PV}
-
-# @ECLASS-VARIABLE: MATE_BRANCH
-# @DESCRIPTION:
-# Major and minor numbers of the version number, unless live.
-# If live ebuild, will be set to '9999'.
-: ${MATE_BRANCH:=$(get_version_component_range 1-2)}
-
-# Set SRC_URI or EGIT_REPO_URI based on whether live 
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="
-		https://github.com/mate-desktop/${MATE_DESKTOP_ORG_PN}.git
-		git://github.com/mate-desktop/${MATE_DESKTOP_ORG_PN}.git
-		http://github.com/mate-desktop/${MATE_DESKTOP_ORG_PN}.git
-	"
-	SRC_URI=""
-else
-	SRC_URI="http://pub.mate-desktop.org/releases/${MATE_BRANCH}/${MATE_DESKTOP_ORG_PN}-${MATE_DESKTOP_ORG_PV}.tar.${MATE_TARBALL_SUFFIX}"
-fi
-
-# Set HOMEPAGE for all ebuilds
-HOMEPAGE="http://mate-desktop.org"
--- a/eclass/mate.eclass
+++ b/eclass/mate.eclass
@ -1,150 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# @ECLASS: mate.eclass
-# @MAINTAINER:
-# mate@gentoo.org
-# @AUTHOR:
-# Authors: NP-Hardass <NP-Hardass@gentoo.org> based upon the gnome2
-# and autotools-utils eclasses
-# @BLURB: Provides phases for MATE based packages.
-# @DESCRIPTION:
-# Exports portage base functions used by ebuilds written for packages using the
-# MATE framework. Occassionally acts as a wrapper to gnome2 due to the
-# fact that MATE is a GNOME fork. For additional functions, see gnome2-utils.eclass.
-
-# Check EAPI only
-case "${EAPI:-0}" in
-	6) ;;
-	*) die "EAPI=${EAPI:-0} is not supported" ;;
-esac
-
-# Inherit happens below after declaration of GNOME2_LA_PUNT
-
-# @ECLASS-VARIABLE: MATE_LA_PUNT
-# @DESCRIPTION:
-# Available values for MATE_LA_PUNT:
-# - "no": will not clean any .la files
-# - "yes": will run prune_libtool_files --modules
-# - If it is not set, it will run prune_libtool_files
-# MATE_LA_PUNT is a stub to GNOME2_LA_PUNT
-GNOME2_LA_PUNT=${MATE_LA_PUNT:-""}
-
-inherit gnome2 autotools mate-desktop.org
-
-case "${EAPI:-0}" in
-	6) EXPORT_FUNCTIONS src_prepare src_configure src_install pkg_preinst pkg_postinst pkg_postrm ;;
-	*) die "EAPI=${EAPI:-0} is not supported" ;;
-esac
-
-# Autotools requires our MATE m4 files
-DEPEND=">=mate-base/mate-common-${MATE_BRANCH}"
-
-# @FUNCTION: mate_py_cond_func_wrap
-# @DESCRIPTION:
-# Wraps a function for conditional python use, to run for each
-# python implementation in the build directory.
-# This function should only be used if the ebuild also inherits the
-# python-r1 eclass
-mate_py_cond_func_wrap() {
-	if [[ ! ${_PYTHON_R1} ]]; then
-		die "This function requires the inheritence of the python-r1 eclass"
-	fi
-	if use python; then
-		python_foreach_impl run_in_build_dir "$@"
-	else
-		$@
-	fi
-}
-
-# @ECLASS-VARIABLE: MATE_FORCE_AUTORECONF
-# @DESCRIPTION:
-# Available values for MATE_FORCE_AUTORECONF:
-# - true: will always run eautoreconf
-# - false: will default to automatic detect
-# - If it is not set, it will default to false
-: ${MATE_FORCE_AUTORECONF:="false"}
-
-# @FUNCTION: ematedocize
-# @DESCRIPTION:
-# A wrapper around mate-doc-common
-ematedocize() {
-	ebegin "Running mate-doc-common --copy"
-		mate-doc-common --copy || die
-	eend $?
-}
-
-# @FUNCTION: want_mate_doc
-# @DESCRIPTION:
-# Returns true/false based on whether eautoreconf should call
-# ematedocize
-want_mate_doc() {
-	grep -q USE_COMMON_DOC_BUILD autogen.sh
-}
-
-# @FUNCTION: mate_src_prepare
-# @DESCRIPTION:
-# Call gnome2_src_prepare to handle environment setup and patching, then
-# call eautoreconf if necessary
-mate_src_prepare() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	local force_autoreconf=${MATE_FORCE_AUTORECONF}
-	[[ ${PV} == 9999 ]] && force_autoreconf="true"
-
-	gen_chksum() {
-		find '(' -name 'Makefile.am' \
-			-o -name 'configure.ac' \
-			-o -name 'configure.in' ')' \
-			-exec cksum {} + | sort -k2
-	}
-
-	local chksum=$(gen_chksum)
-
-	gnome2_src_prepare "$@"
-
-	if [[ "${force_autoreconf}" == "true" ]] || [[ ${chksum} != $(gen_chksum) ]]; then
-		want_mate_doc && ematedocize
-		AT_NOELIBTOOLIZE="yes" eautoreconf # gnome2_src_prepare calls elibtoolize
-	fi
-}
-
-# @FUNCTION: mate_src_configure
-# @DESCRIPTION:
-# MATE specific configure handling
-# Stub to gnome2_src_configure()
-mate_src_configure() {
-	gnome2_src_configure "$@"
-}
-
-# @FUNCTION: mate_src_install
-# @DESCRIPTION:
-# MATE specific install. Stub to gnome2_src_install
-mate_src_install() {
-	gnome2_src_install "$@"
-}
-
-# @FUNCTION: mate_pkg_preinst
-# @DESCRIPTION:
-# Finds Icons, GConf and GSettings schemas for later handling in pkg_postinst
-# Stub to gnome2_pkg_preinst
-mate_pkg_preinst() {
-	gnome2_pkg_preinst "$@"
-}
-
-# @FUNCTION: mate_pkg_postinst
-# @DESCRIPTION:
-# Handle scrollkeeper, GConf, GSettings, Icons, desktop and mime
-# database updates.
-# Stub to gnome2_pkg_postinst
-mate_pkg_postinst() {
-	gnome2_pkg_postinst "$@"
-}
-
-# @FUNCTION: mate_pkg_postrm
-# @DESCRIPTION:
-# Handle scrollkeeper, GSettings, Icons, desktop and mime database updates.
-# Stub to gnome2_pkg_postrm
-mate_pkg_postrm() {
-	gnome2_pkg_postrm "$@"
-}
--- a/mate-base/caja/Manifest
+++ b/mate-base/caja/Manifest
@ -1 +0,0 @@
-DIST caja-1.20.2.tar.xz 3557280 BLAKE2B c164885448034b8805725c524aad87318efb23fcd6050f736f2b769b5348b643cc782e283481d6fcc9828386f289d3618347c71fd28e045955b9e6270b57ddb3 SHA512 3285f6dfcf7aa60cdca25490e1dd99aebf3946b74d7c160477116870718ab46d2b7534d1d53371bc0212e5bdbe6638d9b081e8b9086678060b1648374233addb
--- a/mate-base/caja/caja-1.20.2.ebuild
+++ b/mate-base/caja/caja-1.20.2.ebuild
@ -1,90 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-inherit mate virtualx
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-DESCRIPTION="Caja file manager for the MATE desktop"
-LICENSE="GPL-2 LGPL-2 FDL-1.1"
-SLOT="0"
-
-IUSE="+introspection +mate packagekit xmp"
-
-COMMON_DEPEND="dev-libs/atk:0
-	>=dev-libs/glib-2.36:2
-	>=dev-libs/libxml2-2.4.7:2
-	gnome-base/dconf:0
-	>=gnome-base/gvfs-1.10.1:0[udisks]
-	>=mate-base/mate-desktop-1.17.0:0
-	>=media-libs/libexif-0.6.14:0
-	virtual/libintl:0
-	x11-libs/cairo:0
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.0:3[introspection?]
-	>=x11-libs/libnotify-0.7.0:0
-	x11-libs/libICE:0
-	x11-libs/libSM:0
-	x11-libs/libX11:0
-	x11-libs/libXext:0
-	x11-libs/libXft:0
-	x11-libs/libXrender:0
-	>=x11-libs/pango-1.1.2:0
-	introspection? ( >=dev-libs/gobject-introspection-0.6.4:= )
-	packagekit? ( app-admin/packagekit-base )
-	xmp? ( >=media-libs/exempi-1.99.5:2 )
-	!!mate-base/mate-file-manager"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	>=dev-lang/perl-5:0=
-	dev-util/gdbus-codegen:0
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.40.1:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-PDEPEND="mate? ( >=x11-themes/mate-icon-theme-${MATE_BRANCH} )"
-
-# TODO: Test fails because Caja is not merged yet:
-# GLib-GIO-ERROR **: Settings schema 'org.mate.caja.preferences' is not installed
-RESTRICT="test"
-
-src_prepare() {
-	# Remove unnecessary CFLAGS.
-	sed -i -e 's:-DG.*DISABLE_DEPRECATED::g' \
-		configure.ac eel/Makefile.am || die
-
-	mate_src_prepare
-}
-
-src_configure() {
-	mate_src_configure \
-		--disable-update-mimedb \
-		$(use_enable introspection) \
-		$(use_enable packagekit) \
-		$(use_enable xmp)
-}
-
-src_test() {
-	unset SESSION_MANAGER
-	unset DBUS_SESSION_BUS_ADDRESS
-
-	Xemake check || die "Test phase failed"
-}
-
-pkg_postinst() {
-	mate_pkg_postinst
-
-	elog "Caja can use gstreamer to preview audio files. Just make sure"
-	elog "to have the necessary plugins available to play the media type you"
-	elog "want to preview."
-}
--- a/mate-base/libmatekbd/Manifest
+++ b/mate-base/libmatekbd/Manifest
@ -1 +0,0 @@
-DIST libmatekbd-1.20.2.tar.xz 372452 BLAKE2B be79862aad4ca04e76c2496f06c166bf06674f47dd1b686432a667f765fd1e71fa1717224a989f2db19d0a006264b989db55d3f8daf5f06a22c2861570db16b1 SHA512 14d332ea4c90fe66f602a3484ea2c140c8ec280874dc7fa9e9e0a344e8e94e9713afa0e45f901ecf6e033b8072055e2c29a4d68164c868c63a052307acd54250
--- a/mate-base/libmatekbd/libmatekbd-1.20.2.ebuild
+++ b/mate-base/libmatekbd/libmatekbd-1.20.2.ebuild
@ -1,42 +0,0 @@
-# Copyright 1999-2018 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 ~arm64 x86"
-fi
-
-DESCRIPTION="MATE keyboard configuration library"
-LICENSE="LGPL-2"
-SLOT="0"
-
-IUSE="X +introspection test"
-
-COMMON_DEPEND=">=dev-libs/glib-2.36:2
-	x11-libs/cairo:0
-	>=x11-libs/gdk-pixbuf-2.24:2
-	x11-libs/libX11:0
-	>=x11-libs/libxklavier-5.2:0[introspection?]
-	x11-libs/pango:0
-	virtual/libintl:0
-	>=x11-libs/gtk+-3.0:3[introspection?]
-	introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	sys-devel/gettext:*
-	>=dev-util/intltool-0.50.1:*
-	virtual/pkgconfig:*"
-
-src_configure() {
-	mate_src_configure \
-		$(use_with X x) \
-		$(use_enable introspection) \
-		$(use_enable test tests)
-}
--- a/mate-base/mate-applets-meta/mate-applets-meta-1.20.ebuild
+++ b/mate-base/mate-applets-meta/mate-applets-meta-1.20.ebuild
@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} == 9999 ]]; then
-	MATE_BRANCH=9999
-else
-	inherit versionator
-	MATE_BRANCH="$(get_version_component_range 1-2)"
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-DESCRIPTION="Meta package for MATE panel applets"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI=""
-
-LICENSE="metapackage"
-SLOT="0"
-IUSE="appindicator sensors"
-
-DEPEND=""
-RDEPEND="=mate-base/mate-applets-${MATE_BRANCH}*
-	appindicator? ( =mate-extra/mate-indicator-applet-${MATE_BRANCH}* )
-	sensors? ( =mate-extra/mate-sensors-applet-${MATE_BRANCH}* )
-"
--- a/mate-base/mate-applets/Manifest
+++ b/mate-base/mate-applets/Manifest
@ -1 +1 @@
-DIST mate-applets-1.20.2.tar.xz 7240884 BLAKE2B 9c26ac94fc17b2cc44f06680f2fafa50040308294fef348ba5b7a1b8ae272dbe4116e75fab0c4da1f88cc70c2b175e3e1f09e77123599f4cfd5a342f38aa75a4 SHA512 cff51c0a515165debb1eed56064fe3d5db698156117e89b2cb015d47f8f8dfd5b2d1d3e155ee33b1af372fc07579282d88bffe50dc71583a5bae13ceaab1f16f
+DIST mate-applets-1.18.1.tar.xz 7158716 SHA256 05bae1324de35659b37307bb345bb9da16b19391c83388ef697df51a22caf4da SHA512 3186af69f3b8b54a7f31d3c00a39ed439717200181a1e64d97b28eaf2e75b19ac79fdda44c40401687e9cece06feb1e29f52948cd73afadeb0099f64e672c036 WHIRLPOOL 2354d86b90cf599669c21c08cf6cf6d5ae0d197c54b87b0341b66b8535e175198d233f56e39a9c84aa857b4d12ce88c0d3f5f69ad8f16cc4d57ce5cc2ec3420d
--- a/mate-base/mate-applets/files/mate-applets-1.10.4-cpupower-4.7.patch
+++ b/mate-base/mate-applets/files/mate-applets-1.10.4-cpupower-4.7.patch
@ -1,46 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index c867af3..4ff5311 100644
--- a/configure.ac
-+++ b/configure.ac
-@@ -416,6 +416,8 @@ fi
- AM_CONDITIONAL(HAVE_LIBCPUFREQ, test x$have_libcpufreq = xyes)
- AC_SUBST(LIBCPUFREQ_LIBS)
- 
-+AC_CHECK_HEADERS([cpupower.h])
-+
- build_cpufreq_applet=no
- 
- if test x$disable_cpufreq = xno; then
-diff --git a/cpufreq/src/cpufreq-monitor-libcpufreq.c b/cpufreq/src/cpufreq-monitor-libcpufreq.c
-index 40c44ba..120693c 100644
--- a/cpufreq/src/cpufreq-monitor-libcpufreq.c
-+++ b/cpufreq/src/cpufreq-monitor-libcpufreq.c
-@@ -19,11 +19,16 @@
-  * Authors : Carlos García Campos <carlosgc@gnome.org>
-  */
- 
-+#include <config.h>
-+
- #include <glib.h>
- #include <glib/gi18n.h>
- 
- #include <stdlib.h>
- #include <cpufreq.h>
-+#ifdef HAVE_CPUPOWER_H
-+#include <cpupower.h>
-+#endif
- 
- #include "cpufreq-monitor-libcpufreq.h"
- #include "cpufreq-utils.h"
-@@ -111,7 +114,11 @@ cpufreq_monitor_libcpufreq_run (CPUFreqMonitor *monitor)
- 		/* Check whether it failed because
- 		 * cpu is not online.
- 		 */
-+#ifndef HAVE_CPUPOWER_H
- 		if (!cpufreq_cpu_exists (cpu)) {
-+#else
-+    if (cpupower_is_cpu_online (cpu)) {
-+#endif
- 			g_object_set (G_OBJECT (monitor), "online", FALSE, NULL);
- 			return TRUE;
- 		}
--- a/mate-base/mate-applets/files/mate-applets-1.14.1-cpupower-4.7.patch
+++ b/mate-base/mate-applets/files/mate-applets-1.14.1-cpupower-4.7.patch
@ -1,44 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index b49d127..6b87389 100644
--- a/configure.ac
-+++ b/configure.ac
-@@ -411,6 +411,8 @@ fi
- AM_CONDITIONAL(HAVE_LIBCPUFREQ, test x$have_libcpufreq = xyes)
- AC_SUBST(LIBCPUFREQ_LIBS)
- 
-+AC_CHECK_HEADERS([cpupower.h])
-+
- build_cpufreq_applet=no
- 
- if test x$disable_cpufreq = xno; then
-diff --git a/cpufreq/src/cpufreq-monitor-libcpufreq.c b/cpufreq/src/cpufreq-monitor-libcpufreq.c
-index 4fa9d4c..ba52fde 100644
--- a/cpufreq/src/cpufreq-monitor-libcpufreq.c
-+++ b/cpufreq/src/cpufreq-monitor-libcpufreq.c
-@@ -19,12 +19,16 @@
-  * Authors : Carlos García Campos <carlosgc@gnome.org>
-  */
- 
-+#include <config.h>
-+
- #include <glib.h>
- #include <glib/gi18n.h>
- 
- #include <stdlib.h>
-#include <linux/version.h>
- #include <cpufreq.h>
-+#ifdef HAVE_CPUPOWER_H
-+#include <cpupower.h>
-+#endif
- 
- #include "cpufreq-monitor-libcpufreq.h"
- #include "cpufreq-utils.h"
-@@ -112,7 +116,7 @@
- 		/* Check whether it failed because
- 		 * cpu is not online.
- 		 */
-#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 7, 0)
-+#ifndef HAVE_CPUPOWER_H
- 		if (!cpufreq_cpu_exists (cpu)) {
- #else
- 		if (cpupower_is_cpu_online (cpu)) {
--- a/mate-base/mate-applets/files/mate-applets-1.16.0-cpupower-4.7.patch
+++ b/mate-base/mate-applets/files/mate-applets-1.16.0-cpupower-4.7.patch
@ -1,44 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index b49d127..6b87389 100644
--- a/configure.ac
-+++ b/configure.ac
-@@ -411,6 +411,8 @@ fi
- AM_CONDITIONAL(HAVE_LIBCPUFREQ, test x$have_libcpufreq = xyes)
- AC_SUBST(LIBCPUFREQ_LIBS)
- 
-+AC_CHECK_HEADERS([cpupower.h])
-+
- build_cpufreq_applet=no
- 
- if test x$disable_cpufreq = xno; then
-diff --git a/cpufreq/src/cpufreq-monitor-libcpufreq.c b/cpufreq/src/cpufreq-monitor-libcpufreq.c
-index 4fa9d4c..ba52fde 100644
--- a/cpufreq/src/cpufreq-monitor-libcpufreq.c
-+++ b/cpufreq/src/cpufreq-monitor-libcpufreq.c
-@@ -19,12 +19,16 @@
-  * Authors : Carlos García Campos <carlosgc@gnome.org>
-  */
- 
-+#include <config.h>
-+
- #include <glib.h>
- #include <glib/gi18n.h>
- 
- #include <stdlib.h>
-#include <linux/version.h>
- #include <cpufreq.h>
-+#ifdef HAVE_CPUPOWER_H
-+#include <cpupower.h>
-+#endif
- #include "cpufreq-monitor-libcpufreq.h"
- #include "cpufreq-utils.h"
- 
-@@ -111,7 +115,7 @@
- 		/* Check whether it failed because
- 		 * cpu is not online.
- 		 */
-#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 7, 0)
-+#ifndef HAVE_CPUPOWER_H
- 		if (!cpufreq_cpu_exists (cpu)) {
- #else
- 		if (cpupower_is_cpu_online (cpu)) {
--- a/mate-base/mate-applets/mate-applets-1.18.1-r1.ebuild
+++ b/mate-base/mate-applets/mate-applets-1.18.1-r1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6
@ -8,16 +8,17 @@ PYTHON_COMPAT=( python2_7 )
 inherit mate python-single-r1

 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 x86"
+	KEYWORDS="~amd64 ~arm ~x86"
 fi

 DESCRIPTION="Applets for the MATE Desktop and Panel"
 LICENSE="GPL-2 FDL-1.1 LGPL-2"
 SLOT="0"

-IUSE="X ipv6 policykit +upower"
+IUSE="X cpupower ipv6 policykit +upower"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"

+#cpupower #593470
 COMMON_DEPEND="${PYTHON_DEPS}
 	dev-libs/atk:0
 	>=dev-libs/dbus-glib-0.74:0
@ -30,7 +31,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	>=mate-base/mate-panel-1.17.0
 	>=net-wireless/wireless-tools-28_pre9:0
 	>=sys-apps/dbus-1.1.2:0
-	sys-power/cpupower
+	cpupower? ( <sys-power/cpupower-4.7 )
 	x11-libs/gdk-pixbuf:2
 	>=x11-libs/gtk+-3.14:3
 	x11-libs/gtksourceview:3.0
@ -61,12 +62,12 @@ DEPEND="${COMMON_DEPEND}
 	sys-devel/gettext:*
 	virtual/pkgconfig:*"

-PATCHES=( "${FILESDIR}/${PN}-1.16.0-cpupower-4.7.patch" )
+PATCHES=( "${FILESDIR}/${PN}-1.14.1-revert-upstream-cpupower-4.7-fix.patch" )

 src_configure() {
 	mate_src_configure \
 		--libexecdir=/usr/libexec/mate-applets \
-		--with-cpufreq-lib=cpupower \
+		$(usex cpupower --with-cpufreq-lib=cpupower --disable-cpufreq) \
 		$(use_with X x) \
 		$(use_with upower) \
 		$(use_enable ipv6) \
@ -79,10 +80,11 @@ src_test() {
 }

 src_install() {
+	python_fix_shebang invest-applet
 	mate_src_install

 	local APPLETS="accessx-status battstat charpick command cpufreq drivemount
-			geyes mateweather multiload netspeed stickynotes
+			geyes invest-applet mateweather multiload netspeed stickynotes
 			timerapplet trashapplet"

 	for applet in ${APPLETS}; do
--- a/mate-base/mate-common/Manifest
+++ b/mate-base/mate-common/Manifest
@ -1 +0,0 @@
-DIST mate-common-1.20.0.tar.xz 73108 BLAKE2B d4aa2d1b9f0dce4346e5a62f519390b1fb56e44a0e59bd74abb2e0728b3f97ea8a8296d6a72ef894b7f95f18218b35f9653dcc4d45bcff8a8e365ef088b25530 SHA512 78fed107087f21f30a87b2fd635479f31162f1b9e7ae2f9c02146af275d7662a4ea466da2a049c35d726073d3a0bd9a043818b332b93670334c59aef36bc3b8a
--- a/mate-base/mate-common/mate-common-1.20.0.ebuild
+++ b/mate-base/mate-common/mate-common-1.20.0.ebuild
@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate-desktop.org
-
-if [[ ${PV} == 9999 ]]; then
-	inherit autotools
-else
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-DESCRIPTION="Common files for development of MATE packages"
-LICENSE="GPL-3"
-SLOT="0"
-
-src_prepare() {
-	default
-	if [[ ${PV} == 9999 ]]; then
-		eautoreconf
-	fi
-}
-
-src_install() {
-	mv doc-build/README README.doc-build \
-		|| die "Failed to rename doc-build/README."
-
-	default
-
-	dodoc doc/usage.txt
-}
--- a/mate-base/mate-control-center/Manifest
+++ b/mate-base/mate-control-center/Manifest
@ -1 +0,0 @@
-DIST mate-control-center-1.20.3.tar.xz 1354520 BLAKE2B 2a71cb81b4df4d0550c667e96cc898123c1d26b7d8a8e97d2ef459b2c6ff7b34e917b45d40b17c4bd9effc9bfffb9904fee31bda3a1c3a6a2a5f0c9a156314d4 SHA512 025dc9271c34794fe24453c5ce044612cdc0b388b02d59085a5133a6bbe9df12d5488d24d576c44c99bf23850615b5f2507c5b8e5d383dac6b614746bd19db07
--- a/mate-base/mate-control-center/mate-control-center-1.20.3.ebuild
+++ b/mate-base/mate-control-center/mate-control-center-1.20.3.ebuild
@ -1,77 +0,0 @@
-# Copyright 1999-2018 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 ~arm64 x86"
-fi
-
-DESCRIPTION="The MATE Desktop configuration tool"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="appindicator debug"
-
-COMMON_DEPEND="
-	dev-libs/atk:0
-	>=dev-libs/dbus-glib-0.73:0
-	>=dev-libs/glib-2.36:2
-	dev-libs/libxml2:2
-	>=gnome-base/dconf-0.13.4:0
-	>=gnome-base/librsvg-2.0:2
-	>=mate-base/libmatekbd-1.17.0
-	>=mate-base/mate-desktop-1.17.0
-	>=mate-base/caja-1.17.0
-	>=mate-base/mate-menus-1.1.0
-	>=mate-base/mate-settings-daemon-1.17.0
-	>=media-libs/fontconfig-1:1.0
-	media-libs/freetype:2
-	media-libs/libcanberra:0[gtk3]
-	>=sys-apps/dbus-1:0
-	x11-apps/xmodmap:0
-	x11-libs/cairo:0
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.14:3
-	x11-libs/libX11:0
-	x11-libs/libXScrnSaver:0
-	x11-libs/libXcursor:0
-	x11-libs/libXext:0
-	>=x11-libs/libXi-1.5:0
-	x11-libs/libXrandr:0
-	x11-libs/libXrender:0
-	x11-libs/libXxf86misc:0
-	>=x11-libs/libxklavier-4:0
-	x11-libs/pango:0
-	>=x11-wm/marco-1.17.0
-	virtual/libintl:0
-	appindicator? ( dev-libs/libappindicator:3 )"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/rarian:0
-	>=app-text/scrollkeeper-dtd-1:1.0
-	app-text/yelp-tools:0
-	dev-util/desktop-file-utils:0
-	>=dev-util/intltool-0.50.1:*
-	sys-devel/gettext:*
-	x11-proto/kbproto:0
-	x11-proto/randrproto:0
-	x11-proto/renderproto:0
-	x11-proto/scrnsaverproto:0
-	x11-proto/xextproto:0
-	x11-proto/xf86miscproto:0
-	x11-proto/xproto:0
-	virtual/pkgconfig:*"
-
-src_configure() {
-	mate_src_configure \
-		--disable-update-mimedb \
-		$(use_enable appindicator) \
-		$(use_enable debug)
-}
--- a/mate-base/mate-desktop/Manifest
+++ b/mate-base/mate-desktop/Manifest
@ -1 +0,0 @@
-DIST mate-desktop-1.20.3.tar.xz 937876 BLAKE2B 8b70774c0577a89b36b8c44b3520a5437da7b6216f1437ef2e282c21b692bddb2027ed2e277f7fc2eb641ba8d8d801c5c3797e2d84a4cb7fa5a24bce6859fedb SHA512 126eca6cec6d7d9d672396562bb856a70c7b5fd507dd8629a83e950b2517bd3f900af08cf1a0a61c190fe162104f09991f8bd9f590d629816af5f694942caff1
--- a/mate-base/mate-desktop/mate-desktop-1.20.3.ebuild
+++ b/mate-base/mate-desktop/mate-desktop-1.20.3.ebuild
@ -1,50 +0,0 @@
-# Copyright 1999-2018 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 ~arm64 x86"
-fi
-
-DESCRIPTION="Libraries for the MATE desktop that are not part of the UI"
-LICENSE="GPL-2 FDL-1.1 LGPL-2"
-SLOT="0"
-
-IUSE="X debug +introspection startup-notification"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.36:2
-	>=gnome-base/dconf-0.13.4:0
-	x11-libs/cairo:0
-	x11-libs/libX11:0
-	>=x11-libs/libXrandr-1.3:0
-	virtual/libintl:0
-	>=x11-libs/gtk+-3.0:3[introspection?]
-	introspection? ( >=dev-libs/gobject-introspection-0.9.7:= )
-	startup-notification? ( >=x11-libs/startup-notification-0.5:0 )"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.40:*
-	sys-devel/gettext:*
-	>=x11-proto/randrproto-1.3:0
-	x11-proto/xproto:0
-	virtual/pkgconfig:*"
-
-src_configure() {
-	mate_src_configure \
-		--enable-mate-about \
-		$(use_with X x) \
-		$(use_enable debug) \
-		$(use_enable introspection) \
-		$(use_enable startup-notification)
-}
--- a/mate-base/mate-menus/Manifest
+++ b/mate-base/mate-menus/Manifest
@ -1 +0,0 @@
-DIST mate-menus-1.20.1.tar.xz 359056 BLAKE2B aebf8b0f65df12283a9c95556011f4c326769d20153c7ed9a3d353eb56443730d047500b8a7385b96c3677d252a3617d4ccc61447fd81f32ae10eccbd1525c29 SHA512 a7c4a6da5c1dfd9741dde48f5b24185ce5049d0d350bddaba6da2e340adf3d1057fa253358cbba1d9a4ce5bce77046813b5cc50e6eff65e7ec88b186b3942314
--- a/mate-base/mate-menus/files/10-xdg-menu-mate
+++ b/mate-base/mate-menus/files/10-xdg-menu-mate
@ -1,6 +0,0 @@
-#!/bin/sh
-
-if [ -z "$XDG_MENU_PREFIX" ] && [ "$DESKTOP_SESSION" = "mate" ]
-then
-	export XDG_MENU_PREFIX=mate-
-fi
--- a/mate-base/mate-menus/mate-menus-1.20.1.ebuild
+++ b/mate-base/mate-menus/mate-menus-1.20.1.ebuild
@ -1,74 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-r1 mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-DESCRIPTION="MATE menu system, implementing the F.D.O cross-desktop spec"
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-
-IUSE="debug +introspection python"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-COMMON_DEPEND=">=dev-libs/glib-2.36.0:2
-	virtual/libintl:0
-	introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
-	python? (
-		dev-python/pygtk:2[${PYTHON_USEDEP}]
-		${PYTHON_DEPS}
-	)"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.40:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-src_prepare() {
-	mate_src_prepare
-	use python && python_copy_sources
-}
-
-src_configure() {
-	# Do NOT compile with --disable-debug/--enable-debug=no as it disables API
-	# usage checks.
-	mate_py_cond_func_wrap mate_src_configure \
-		--enable-debug=$(usex debug yes minimum) \
-		$(use_enable python) \
-		$(use_enable introspection)
-}
-
-src_compile() {
-	mate_py_cond_func_wrap default
-}
-
-src_test() {
-	mate_py_cond_func_wrap emake check
-}
-
-src_install() {
-	mate_py_cond_func_wrap mate_src_install
-
-	exeinto /etc/X11/xinit/xinitrc.d/
-	doexe "${FILESDIR}/10-xdg-menu-mate"
-}
-
-pkg_postinst() {
-	mate_pkg_postinst
-	einfo "Due to upstream bug"
-	einfo "https://github.com/mate-desktop/mate-menus/issues/2,"
-	einfo "it is highly recommended to run the following command"
-	einfo "once you have logged in to your desktop for the first time:"
-	einfo "cd ~/.config/menus && ln -s {,mate-}applications-merged"
-}
--- a/mate-base/mate-panel/Manifest
+++ b/mate-base/mate-panel/Manifest
@ -1 +0,0 @@
-DIST mate-panel-1.20.2.tar.xz 2087604 BLAKE2B fcdbe91d05dce9cbd27565a421646184876b63b6184b8b0222741b9387e0a484fd5c5423f3b9d33b48f5a2f1359a9ff8629b4a53b375f33db05c78059afd5ce9 SHA512 4e3141484f67a97dbc5fc2acd5902b8a33ffc85841365ae98c8b0a32625456006334b41c2ebbe959ec61cf965a09f43a8e31c55e308c547e61a075b6b47f1883
--- a/mate-base/mate-panel/mate-panel-1.20.2.ebuild
+++ b/mate-base/mate-panel/mate-panel-1.20.2.ebuild
@ -1,63 +0,0 @@
-# Copyright 1999-2018 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 ~arm64 x86"
-fi
-
-DESCRIPTION="The MATE panel"
-LICENSE="GPL-2 FDL-1.1 LGPL-2"
-SLOT="0"
-
-IUSE="X +introspection"
-
-COMMON_DEPEND="
-	dev-libs/atk:0
-	>=dev-libs/dbus-glib-0.80:0
-	>=dev-libs/glib-2.36:2
-	>=dev-libs/libmateweather-1.17.0
-	dev-libs/libxml2:2
-	>=gnome-base/dconf-0.13.4:0
-	>=gnome-base/librsvg-2.36.2:2
-	>=mate-base/mate-desktop-1.17.0
-	>=mate-base/mate-menus-1.10.0
-	>=sys-apps/dbus-1.1.2:0
-	>=x11-libs/cairo-1:0
-	>=x11-libs/gdk-pixbuf-2.7.1:2
-	>=x11-libs/gtk+-3.20:3[introspection?]
-	x11-libs/libICE:0
-	x11-libs/libSM:0
-	>=x11-libs/libwnck-3.0:3[introspection?]
-	x11-libs/libX11:0
-	>=x11-libs/pango-1.15.4:0[introspection?]
-	x11-libs/libXau:0
-	>=x11-libs/libXrandr-1.3:0
-	virtual/libintl:0
-	introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/yelp-tools:0
-	>=dev-lang/perl-5:0=
-	dev-util/gdbus-codegen:0
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.50.1:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-src_configure() {
-	mate_src_configure \
-		--libexecdir=/usr/libexec/mate-applets \
-		--disable-deprecation-flags \
-		$(use_with X x) \
-		$(use_enable introspection)
-}
--- a/mate-base/mate-session-manager/Manifest
+++ b/mate-base/mate-session-manager/Manifest
@ -1 +0,0 @@
-DIST mate-session-manager-1.20.1.tar.xz 587448 BLAKE2B 7f0b5ded48f2228e5c69e2e43f41fda390aa2919e2835d9d095a0dcc9950bd79e6d3acd26268ff89872d84c7af744df472515298f89b0084b39e1471f0508ff4 SHA512 d800fd1be1eb4c24e6c13889e582f127b189ff88e3bdf52aa5d85de4d19d8aee6a6bdead72f2efd1764a0e951e8b063f8d92f66e10ff5014876b71836f6530c6
--- a/mate-base/mate-session-manager/files/10-user-dirs-update-mate
+++ b/mate-base/mate-session-manager/files/10-user-dirs-update-mate
@ -1,10 +0,0 @@
-#!/bin/sh
-
-# Create various XDG directories, and write ~/.config/user-dirs.dirs, etc.
-# That file is read by glib to get XDG_PICTURES_DIR, etc
-
-if [ "$DESKTOP_SESSION" = "mate" ]; then
-	if type xdg-user-dirs-update >/dev/null 2>&1; then
-		xdg-user-dirs-update
-	fi
-fi
--- a/mate-base/mate-session-manager/files/15-xdg-data-mate
+++ b/mate-base/mate-session-manager/files/15-xdg-data-mate
@ -1,9 +0,0 @@
-#!/bin/sh
-
-if [ "$DESKTOP_SESSION" = "mate" ]; then
-	if [ -z "$XDG_DATA_DIRS" ]; then
-		export XDG_DATA_DIRS=/usr/share/mate:/usr/local/share/:/usr/share/
-	else
-		export XDG_DATA_DIRS=/usr/share/mate:"$XDG_DATA_DIRS"
-	fi
-fi
--- a/mate-base/mate-session-manager/files/MATE
+++ b/mate-base/mate-session-manager/files/MATE
@ -1,109 +0,0 @@
-#!/bin/sh
-#
-# This file has bitrotted badly. Someone needs to clean this up.
-#
-
-if [ -f /etc/xdg/menus/mate-applications.menu ] ; then
-	export XDG_MENU_PREFIX=mate-
-fi
-
-for errfile in "$HOME/.materc-errors" "${TMPDIR-/tmp}/materc-$USER/tmp/materc-$USER"
-do
-	if ( cp /dev/null "$errfile" 2> /dev/null )
-	then
-		chmod 600 "$errfile"
-		exec > "$errfile" 2>&1
-		break
-	fi
-done
-#
-#  Distributors:
-#  You should modify the paths here to fit your distro
-#  If you need to do so, send me (jirka@5z.com) a patch
-#  and I'll try to make the script detect the distro stuff
-#
-
-userresources=$HOME/.Xresources
-usermodmap=$HOME/.Xmodmap
-userxkbmap=$HOME/.Xkbmap
-
-sysresources=/etc/X11/Xresources
-sysmodmap=/etc/X11/Xmodmap
-sysxkbmap=/etc/X11/Xkbmap
-
-rh6sysresources=/etc/X11/xinit/Xresources
-rh6sysmodmap=/etc/X11/xinit/Xmodmap
-
-if [ -x "$HOME/.materc" ]; then
-	command="$HOME/.materc"
-elif [ -x /etc/X11/gdm/materc ]; then
-	command="/etc/X11/gdm/materc"
-else
-	# as fallback in case the config is screwed
-	command=`which mate-session`
-fi
-
-# merge in defaults
-if [ -f "$rh6sysresources" ]; then
-    xrdb -merge "$rh6sysresources"
-fi
-
-if [ -f "$sysresources" ]; then
-    xrdb -merge "$sysresources"
-fi
-
-if [ -f "$userresources" ]; then
-    xrdb -merge "$userresources"
-fi
-
-# merge in keymaps
-if [ -f "$sysxkbmap" ]; then
-    setxkbmap `cat "$sysxkbmap"`
-    XKB_IN_USE=yes
-fi
-
-if [ -f "$userxkbmap" ]; then
-    setxkbmap `cat "$userxkbmap"`
-    XKB_IN_USE=yes
-fi
-
-#
-# Eeek, this seems like too much magic here
-#
-if [ -z "$XKB_IN_USE" ] && [ ! -L /etc/X11/X ]; then
-    if grep '^exec.*/Xsun' /etc/X11/X > /dev/null 2>&1 && [ -f /etc/X11/XF86Config ]; then
-       xkbsymbols=`sed -n -e 's/^[     ]*XkbSymbols[   ]*"\(.*\)".*$/\1/p' /etc/X11/XF86Config`
-       if [ -n "$xkbsymbols" ]; then
-           setxkbmap -symbols "$xkbsymbols"
-           XKB_IN_USE=yes
-       fi
-    fi
-fi
-
-# xkb and xmodmap don't play nice together
-if [ -z "$XKB_IN_USE" ]; then
-    if [ -f "$rh6sysmodmap" ]; then
-       xmodmap "$rh6sysmodmap"
-    fi
-
-    if [ -f "$sysmodmap" ]; then
-       xmodmap "$sysmodmap"
-    fi
-
-    if [ -f "$usermodmap" ]; then
-       xmodmap "$usermodmap"
-    fi
-fi
-
-unset XKB_IN_USE
-
-# run all system xinitrc shell scripts.
-if [ -d /etc/X11/xinit/xinitrc.d ]; then
-    for i in /etc/X11/xinit/xinitrc.d/* ; do
-        if [ -x "$i" ]; then
-	    . "$i"
-        fi
-    done
-fi
-
-exec $command
--- a/mate-base/mate-session-manager/files/defaults.list
+++ b/mate-base/mate-session-manager/files/defaults.list
@ -1,336 +0,0 @@
-[Default Applications]
-application/rtf=abiword.desktop
-application/x-abiword=abiword.desktop
-text/abiword=abiword.desktop
-text/richtext=abiword.desktop
-text/rtf=abiword.desktop
-text/x-abiword=abiword.desktop
-text/x-xml-abiword=abiword.desktop
-x-content/blank-bd=brasero-caja.desktop
-x-content/blank-dvd=brasero-caja.desktop
-x-content/blank-cd=brasero-caja.desktop
-x-content/blank-hddvd=brasero-caja.desktop
-application/x-dia-diagram=dia.desktop
-image/bmp=eom.desktop
-image/gif=eom.desktop
-image/jpeg=eom.desktop
-image/jpg=eom.desktop
-image/pjpeg=eom.desktop
-image/png=eom.desktop
-image/svg+xml=eom.desktop
-image/svg+xml-compressed=eom.desktop
-image/x-bmp=eom.desktop
-image/x-gray=eom.desktop
-image/x-icb=eom.desktop
-image/x-ico=eom.desktop
-image/x-pcx=eom.desktop
-image/x-png=eom.desktop
-image/x-portable-anymap=eom.desktop
-image/x-portable-bitmap=eom.desktop
-image/x-portable-graymap=eom.desktop
-image/x-portable-pixmap=eom.desktop
-image/x-xbitmap=eom.desktop
-image/x-xpixmap=eom.desktop
-image/vnd.wap.wbmp=eom.desktop
-image/g3fax=gimp.desktop
-image/x-compressed-xcf=gimp.desktop
-image/x-fits=gimp.desktop
-image/x-icon=gimp.desktop
-image/x-psd=gimp.desktop
-image/x-sgi=gimp.desktop
-image/x-sun-raster=gimp.desktop
-image/x-tga=gimp.desktop
-image/x-xcf=gimp.desktop
-image/x-xwindowdump=gimp.desktop
-application/xhtml+xml=firefox.desktop;firefox-3.6.desktop;epiphany.desktop
-text/html=firefox.desktop;firefox-3.6.desktop;epiphany.desktop
-application/pdf=atril.desktop
-application/x-bzpdf=atril.desktop
-application/x-gzpdf=atril.desktop
-application/postscript=atril.desktop
-application/x-bzpostscript=atril.desktop
-application/x-gzpostscript=atril.desktop
-image/x-eps=atril.desktop
-image/x-bzeps=atril.desktop
-image/x-gzeps=atril.desktop
-application/x-dvi=atril.desktop
-application/x-bzdvi=atril.desktop
-application/x-gzdvi=atril.desktop
-image/vnd.djvu=atril.desktop
-image/tiff=atril.desktop
-application/x-cbr=atril.desktop
-application/x-cbz=atril.desktop
-application/x-cb7=atril.desktop
-application/x-7z-compressed=engrampa.desktop
-application/x-7z-compressed-tar=engrampa.desktop
-application/x-ace=engrampa.desktop
-application/x-alz=engrampa.desktop
-application/x-ar=engrampa.desktop
-application/x-arj=engrampa.desktop
-application/x-bzip=engrampa.desktop
-application/x-bzip-compressed-tar=engrampa.desktop
-application/x-bzip1=engrampa.desktop
-application/x-bzip1-compressed-tar=engrampa.desktop
-application/x-cabinet=engrampa.desktop
-application/x-cd-image=engrampa.desktop
-application/x-compress=engrampa.desktop
-application/x-compressed-tar=engrampa.desktop
-application/x-cpio=engrampa.desktop
-application/x-deb=engrampa.desktop
-application/x-ear=engrampa.desktop
-application/x-gtar=engrampa.desktop
-application/x-gzip=engrampa.desktop
-application/x-java-archive=engrampa.desktop
-application/x-lha=engrampa.desktop
-application/x-lhz=engrampa.desktop
-application/x-lzip=engrampa.desktop
-application/x-lzip-compressed-tar=engrampa.desktop
-application/x-lzma=engrampa.desktop
-application/x-lzma-compressed-tar=engrampa.desktop
-application/x-lzop=engrampa.desktop
-application/x-lzop-compressed-tar=engrampa.desktop
-application/x-rar=engrampa.desktop
-application/x-rar-compressed=engrampa.desktop
-application/x-rpm=engrampa.desktop
-application/x-rzip=engrampa.desktop
-application/x-tar=engrampa.desktop
-application/x-tarz=engrampa.desktop
-application/x-stuffit=engrampa.desktop
-application/x-war=engrampa.desktop
-application/x-xz=engrampa.desktop
-application/x-xz-compressed-tar=engrampa.desktop
-application/x-zip=engrampa.desktop
-application/x-zip-compressed=engrampa.desktop
-application/x-zoo=engrampa.desktop
-application/zip=engrampa.desktop
-multipart/x-zip=engrampa.desktop
-text/plain=pluma.desktop
-text/css=pluma.desktop
-text/javascript=pluma.desktop
-text/mathml=pluma.desktop
-text/x-csrc=pluma.desktop
-text/x-chdr=pluma.desktop
-text/x-dtd=pluma.desktop
-text/x-java=pluma.desktop
-text/x-javascript=pluma.desktop
-text/x-patch=pluma.desktop
-text/x-perl=pluma.destkop
-text/x-php=pluma.destkop
-text/x-python=pluma.destkop
-text/x-sql=pluma.desktop
-text/xml=pluma.desktop
-application/javascript=pluma.destkop
-application/x-cgi=pluma.desktop
-application/x-javascript=pluma.desktop
-application/x-perl=pluma.desktop
-application/x-php=pluma.desktop
-application/x-python=pluma.desktop
-application/xml=pluma.desktop
-application/xml-dtd=pluma.desktop
-application/x-font-ttf=mate-font-viewer.desktop
-application/x-font-pcf=mate-font-viewer.desktop
-application/x-font-type1=mate-font-viewer.desktop
-application/x-font-otf=mate-font-viewer.desktop
-application/csv=gnumeric.desktop
-application/excel=gnumeric.desktop
-application/msexcel=gnumeric.desktop
-application/tab-separated-values=gnumeric.desktop
-application/vnd.lotus-1-2-3=gnumeric.desktop
-application/vnd.ms-excel=gnumeric.desktop
-application/x-123=gnumeric.desktop
-application/x-applix-spreadsheet=gnumeric.desktop
-application/x-dbase=gnumeric.desktop
-application/x-dbf=gnumeric.desktop
-application/x-dos_ms_excel=gnumeric.desktop
-application/x-excel=gnumeric.desktop
-application/x-gnumeric=gnumeric.desktop
-application/x-mps=gnumeric.desktop
-application/x-ms-excel=gnumeric.desktop
-application/x-msexcel=gnumeric.desktop
-application/x-oleo=gnumeric.desktop
-application/x-planperfect=gnumeric.desktop
-application/x-quattropro=gnumeric.desktop
-application/x-sc=gnumeric.desktop
-application/x-sylk=gnumeric.desktop
-application/x-xbase=gnumeric.desktop
-application/x-xls=gnumeric.desktop
-application/xls=gnumeric.desktop
-text/comma-separated-values=gnumeric.desktop
-text/csv=gnumeric.desktop
-text/spreadsheet=gnumeric.desktop
-text/tab-separated-values=gnumeric.desktop
-text/x-comma-separated-values=gnumeric.desktop
-text/x-csv=gnumeric.desktop
-zz-application/zz-winassoc-xls=gnumeric.desktop
-x-content/software=caja-autorun-software.desktop
-x-directory/gnome-default-handler=caja-folder-handler.desktop
-x-directory/normal=caja-folder-handler.desktop
-inode/directory=caja-folder-handler.desktop
-application/x-gnome-saved-search=caja-folder-handler.desktop
-application/vnd.oasis.opendocument.spreadsheet=libreoffice-calc.desktop;openoffice.org-calc.desktop
-application/vnd.oasis.opendocument.spreadsheet-template=libreoffice-calc.desktop;openoffice.org-calc.desktop
-application/vnd.sun.xml.calc=libreoffice-calc.desktop;openoffice.org-calc.desktop
-application/vnd.sun.xml.calc.template=libreoffice-calc.desktop;openoffice.org-calc.desktop
-application/vnd.stardivision.calc=libreoffice-calc.desktop;openoffice.org-calc.desktop
-application/vnd.stardivision.chart=libreoffice-calc.desktop;openoffice.org-calc.desktop
-application/vnd.openxmlformats-officedocument.spreadsheetml.sheet=libreoffice-calc.desktop;openoffice.org-calc.desktop
-application/vnd.ms-excel.sheet.macroenabled.12=libreoffice-calc.desktop;openoffice.org-calc.desktop
-application/vnd.openxmlformats-officedocument.spreadsheetml.template=libreoffice-calc.desktop;openoffice.org-calc.desktop
-application/vnd.ms-excel.template.macroenabled.12=libreoffice-calc.desktop;openoffice.org-calc.desktop
-application/vnd.ms-excel.sheet.binary.macroenabled.12=libreoffice-calc.desktop;openoffice.org-calc.desktop
-application/vnd.oasis.opendocument.graphics=libreoffice-draw.desktop;openoffice.org-draw.desktop
-application/vnd.oasis.opendocument.graphics-template=libreoffice-draw.desktop;openoffice.org-draw.desktop
-application/vnd.sun.xml.draw=libreoffice-draw.desktop;openoffice.org-draw.desktop
-application/vnd.sun.xml.draw.template=libreoffice-draw.desktop;openoffice.org-draw.desktop
-application/vnd.stardivision.draw=libreoffice-draw.desktop;openoffice.org-draw.desktop
-application/vnd.oasis.opendocument.presentation=libreoffice-impress.desktop;openoffice.org-impress.desktop
-application/vnd.oasis.opendocument.presentation-template=libreoffice-impress.desktop;openoffice.org-impress.desktop
-application/vnd.sun.xml.impress=libreoffice-impress.desktop;openoffice.org-impress.desktop
-application/vnd.sun.xml.impress.template=libreoffice-impress.desktop;openoffice.org-impress.desktop
-application/vnd.stardivision.impress=libreoffice-impress.desktop;openoffice.org-impress.desktop
-application/mspowerpoint=libreoffice-impress.desktop;openoffice.org-impress.desktop
-application/vnd.ms-powerpoint=libreoffice-impress.desktop;openoffice.org-impress.desktop
-application/vnd.openxmlformats-officedocument.presentationml.presentation=libreoffice-impress.desktop;openoffice.org-impress.desktop
-application/vnd.ms-powerpoint.presentation.macroenabled.12=libreoffice-impress.desktop;openoffice.org-impress.desktop
-application/vnd.openxmlformats-officedocument.presentationml.template=libreoffice-impress.desktop;openoffice.org-impress.desktop
-application/vnd.ms-powerpoint.template.macroenabled.12=libreoffice-impress.desktop;openoffice.org-impress.desktop
-application/vnd.oasis.opendocument.formula=libreoffice-math.desktop;openoffice.org-math.desktop
-application/vnd.sun.xml.math=libreoffice-math.desktop;openoffice.org-math.desktop
-application/vnd.stardivision.math=libreoffice-math.desktop;openoffice.org-math.desktop
-application/vnd.oasis.opendocument.text=libreoffice-writer.desktop;openoffice.org-writer.desktop
-application/vnd.oasis.opendocument.text-template=libreoffice-writer.desktop;openoffice.org-writer.desktop
-application/vnd.oasis.opendocument.text-web=libreoffice-writer.desktop;openoffice.org-writer.desktop
-application/vnd.oasis.opendocument.text-master=libreoffice-writer.desktop;openoffice.org-writer.desktop
-application/vnd.sun.xml.writer=libreoffice-writer.desktop;openoffice.org-writer.desktop
-application/vnd.sun.xml.writer.template=libreoffice-writer.desktop;openoffice.org-writer.desktop
-application/vnd.sun.xml.writer.global=libreoffice-writer.desktop;openoffice.org-writer.desktop
-application/vnd.stardivision.writer=libreoffice-writer.desktop;openoffice.org-writer.desktop
-application/msword=libreoffice-writer.desktop;openoffice.org-writer.desktop
-application/vnd.ms-word=libreoffice-writer.desktop;openoffice.org-writer.desktop
-application/x-doc=libreoffice-writer.desktop;openoffice.org-writer.desktop
-application/vnd.wordperfect=libreoffice-writer.desktop;openoffice.org-writer.desktop
-application/wordperfect=libreoffice-writer.desktop;openoffice.org-writer.desktop
-application/vnd.openxmlformats-officedocument.wordprocessingml.document=libreoffice-writer.desktop;openoffice.org-writer.desktop
-application/vnd.ms-word.document.macroenabled.12=libreoffice-writer.desktop;openoffice.org-writer.desktop
-application/vnd.openxmlformats-officedocument.wordprocessingml.template=libreoffice-writer.desktop;openoffice.org-writer.desktop
-application/vnd.ms-word.template.macroenabled.12=libreoffice-writer.desktop;openoffice.org-writer.desktop
-x-content/audio-player=rhythmbox.desktop
-x-content/audio-cdda=sound-juicer.desktop
-application/x-shockwave-flash=swfdec-player.desktop
-application/futuresplash=swfdec-player.desktop
-application/mxf=vlc.desktop
-application/ogg=vlc.desktop
-application/ram=vlc.desktop
-application/sdp=vlc.desktop
-application/smil=vlc.desktop
-application/smil+xml=vlc.desktop
-application/vnd.ms-wpl=vlc.desktop
-application/vnd.rn-realmedia=vlc.desktop
-application/x-extension-m4a=vlc.desktop
-application/x-extension-mp4=vlc.desktop
-application/x-flac=vlc.desktop
-application/x-flash-video=vlc.desktop
-application/x-lyx=lyx.desktop
-application/x-matroska=vlc.desktop
-application/x-netshow-channel=vlc.desktop
-application/x-ogg=vlc.desktop
-application/x-quicktime-media-link=vlc.desktop
-application/x-quicktimeplayer=vlc.desktop
-application/x-shorten=vlc.desktop
-application/x-smil=vlc.desktop
-application/xspf+xml=vlc.desktop
-audio/3gpp=vlc.desktop
-audio/ac3=vlc.desktop
-audio/AMR=vlc.desktop
-audio/AMR-WB=vlc.desktop
-audio/basic=vlc.desktop
-audio/midi=vlc.desktop
-audio/mp4=vlc.desktop
-audio/mpeg=vlc.desktop
-audio/mpegurl=vlc.desktop
-audio/ogg=vlc.desktop
-audio/prs.sid=vlc.desktop
-audio/vnd.rn-realaudio=vlc.desktop
-audio/x-ape=vlc.desktop
-audio/x-flac=vlc.desktop
-audio/x-gsm=vlc.desktop
-audio/x-it=vlc.desktop
-audio/x-m4a=vlc.desktop
-audio/x-matroska=vlc.desktop
-audio/x-mod=vlc.desktop
-audio/x-mp3=vlc.desktop
-audio/x-mpeg=vlc.desktop
-audio/x-mpegurl=vlc.desktop
-audio/x-ms-asf=vlc.desktop
-audio/x-ms-asx=vlc.desktop
-audio/x-ms-wax=vlc.desktop
-audio/x-ms-wma=vlc.desktop
-audio/x-musepack=vlc.desktop
-audio/x-pn-aiff=vlc.desktop
-audio/x-pn-au=vlc.desktop
-audio/x-pn-realaudio=vlc.desktop
-audio/x-pn-realaudio-plugin=vlc.desktop
-audio/x-pn-wav=vlc.desktop
-audio/x-pn-windows-acm=vlc.desktop
-audio/x-realaudio=vlc.desktop
-audio/x-real-audio=vlc.desktop
-audio/x-sbc=vlc.desktop
-audio/x-scpls=vlc.desktop
-audio/x-speex=vlc.desktop
-audio/x-tta=vlc.desktop
-audio/x-vorbis=audacious.desktop
-audio/x-vorbis+ogg=audacious.desktop
-audio/x-wav=audacious.desktop
-audio/x-wavpack=audacious.desktop
-audio/x-xm=audacious.desktop
-image/vnd.rn-realpix=vlc.desktop
-image/x-pict=vlc.desktop
-misc/ultravox=vlc.desktop
-text/google-video-pointer=vlc.desktop
-text/x-google-video-pointer=vlc.desktop
-video/3gpp=vlc.desktop
-video/dv=vlc.desktop
-video/fli=vlc.desktop
-video/flv=vlc.desktop
-video/mp2t=vlc.desktop
-video/mp4=vlc.desktop
-video/mp4v-es=vlc.desktop
-video/mpeg=vlc.desktop
-video/msvideo=vlc.desktop
-video/ogg=vlc.desktop
-video/quicktime=vlc.desktop
-video/vivo=vlc.desktop
-video/vnd.divx=vlc.desktop
-video/vnd.rn-realvideo=vlc.desktop
-video/vnd.vivo=vlc.desktop
-video/webm=vlc.desktop
-video/x-anim=vlc.desktop
-video/x-avi=vlc.desktop
-video/x-flc=vlc.desktop
-video/x-fli=vlc.desktop
-video/x-flic=vlc.desktop
-video/x-flv=vlc.desktop
-video/x-m4v=vlc.desktop
-video/x-matroska=vlc.desktop
-video/x-mpeg=vlc.desktop
-video/x-ms-asf=vlc.desktop
-video/x-ms-asx=vlc.desktop
-video/x-msvideo=vlc.desktop
-video/x-ms-wm=vlc.desktop
-video/x-ms-wmv=vlc.desktop
-video/x-ms-wmx=vlc.desktop
-video/x-ms-wvx=vlc.desktop
-video/x-nsv=vlc.desktop
-video/x-ogm+ogg=vlc.desktop
-video/x-theora+ogg=vlc.desktop
-video/x-totem-stream=vlc.desktop
-x-content/video-dvd=vlc.desktop
-x-content/video-vcd=vlc.desktop
-x-content/video-svcd=vlc.desktop
-x-scheme-handler/ghelp=yelp.desktop;
-x-scheme-handler/help=yelp.desktop;
-x-scheme-handler/http=firefox.desktop;epiphany.desktop
-x-scheme-handler/https=firefox.desktop;epiphany.desktop
-x-scheme-handler/mailto=evolution.desktop
-application/x-bittorrent=transmission-gtk.desktop;deluge.desktop
-x-scheme-handler/magnet=transmission-gtk.desktop;deluge.desktop
--- a/mate-base/mate-session-manager/files/mate-session-manager-1.12.2-save-session-ui.patch
+++ b/mate-base/mate-session-manager/files/mate-session-manager-1.12.2-save-session-ui.patch
@ -1,535 +0,0 @@
-diff -burN a/capplet/gsm-properties-dialog.c b/capplet/gsm-properties-dialog.c
--- a/capplet/gsm-properties-dialog.c	2012-02-29 22:03:08.000000000 +0100
-+++ b/capplet/gsm-properties-dialog.c	2012-08-08 12:16:37.527332034 +0200
-@@ -26,6 +26,8 @@
- #include <glib.h>
- #include <glib/gi18n.h>
- #include <gtk/gtk.h>
-+#include <dbus/dbus-glib.h>
-+#include <dbus/dbus-glib-lowlevel.h>
- 
- #include <mateconf/mateconf-client.h>
- 
-@@ -36,6 +38,11 @@
- #include "gsp-app.h"
- #include "gsp-app-manager.h"
- 
-+
-+#define GSM_SERVICE_DBUS   "org.gnome.SessionManager"
-+#define GSM_PATH_DBUS      "/org.gnome.SessionManager"
-+#define GSM_INTERFACE_DBUS "org.gnome.SessionManager"
-+
- #define GSM_PROPERTIES_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSM_TYPE_PROPERTIES_DIALOG, GsmPropertiesDialogPrivate))
- 
- #define IS_STRING_EMPTY(x) ((x)==NULL||(x)[0]=='\0')
-@@ -50,6 +57,7 @@
- #define CAPPLET_DELETE_WIDGET_NAME        "session_properties_delete_button"
- #define CAPPLET_EDIT_WIDGET_NAME          "session_properties_edit_button"
- #define CAPPLET_SAVE_WIDGET_NAME          "session_properties_save_button"
-+#define CAPPLET_SESSION_SAVED_WIDGET_NAME "session_properties_session_saved_label"
- #define CAPPLET_REMEMBER_WIDGET_NAME      "session_properties_remember_toggle"
- 
- #define STARTUP_APP_ICON     "system-run"
-@@ -493,10 +501,66 @@
- }
- 
- static void
-+session_saved_message (GsmPropertiesDialog *dialog,
-+                       const char *msg,
-+                       gboolean is_error)
-+{
-+        GtkLabel *label;
-+        gchar *markup;
-+        
-+        label = GTK_LABEL (gtk_builder_get_object (dialog->priv->xml, CAPPLET_SESSION_SAVED_WIDGET_NAME));
-+        if (is_error)
-+                markup = g_markup_printf_escaped ("<span foreground=\"red\">%s</span>", msg);
-+        else
-+                markup = g_markup_escape_text (msg, -1);
-+
-+        gtk_label_set_markup (label, markup);
-+        g_free (markup);
-+}
-+
-+static void
-+session_saved_cb (DBusGProxy *proxy,
-+                  DBusGProxyCall *call_id,
-+                  void *user_data)
-+{
-+        gboolean res;
-+        GsmPropertiesDialog *dialog = user_data;
-+
-+        res = dbus_g_proxy_end_call (proxy, call_id, NULL, G_TYPE_INVALID);
-+        if (res)
-+                session_saved_message (dialog, _("Your session has been saved."), FALSE);
-+        else
-+                session_saved_message (dialog, _("Failed to save session"), TRUE);
-+
-+        g_object_unref (proxy);
-+}
-+
-+static void
- on_save_session_clicked (GtkWidget           *widget,
-                          GsmPropertiesDialog *dialog)
- {
-        g_debug ("Session saving is not implemented yet!");
-+        DBusGConnection *conn;
-+        DBusGProxy *proxy;
-+        DBusGProxyCall *call;
-+
-+        conn = dbus_g_bus_get (DBUS_BUS_SESSION, NULL);
-+        if (conn == NULL) {
-+                session_saved_message (dialog, _("Could not connect to the session bus"), TRUE);
-+                return;
-+        }
-+
-+        proxy = dbus_g_proxy_new_for_name (conn, GSM_SERVICE_DBUS, GSM_PATH_DBUS, GSM_INTERFACE_DBUS);
-+        if (proxy == NULL) {
-+                session_saved_message (dialog, _("Could not connect to the session manager"), TRUE);
-+                return;
-+        }
-+
-+        call = dbus_g_proxy_begin_call (proxy, "SaveSession", session_saved_cb, dialog, NULL, G_TYPE_INVALID);
-+        if (call == NULL) {
-+                session_saved_message (dialog, _("Failed to save session"), TRUE);
-+                g_object_unref (proxy);
-+                return;
-+        }
- }
- 
- static void
-diff -burN a/configure.ac b/configure.ac
--- a/configure.ac	2012-02-29 22:03:09.000000000 +0100
-+++ b/configure.ac	2012-08-08 12:18:58.740336360 +0200
-@@ -75,6 +75,7 @@
- PKG_CHECK_MODULES(SESSION_PROPERTIES,
-         glib-2.0 >= $GLIB_REQUIRED
-         gtk+-$GTK_API_VERSION >= $GTK_REQUIRED
-+        dbus-glib-1 >= $DBUS_GLIB_REQUIRED
- )
- 
- PKG_CHECK_MODULES(SM, sm)
-diff -burN a/data/session-properties.ui b/data/session-properties.ui
--- a/data/session-properties.ui	2012-02-29 22:03:08.000000000 +0100
-+++ b/data/session-properties.ui	2012-08-08 12:22:36.619343035 +0200
-@@ -148,6 +148,7 @@
-             <property name="visible">True</property>
-             <child>
-               <object class="GtkButton" id="session_properties_save_button">
-+                <property name="visible">True</property>
-                 <property name="can_focus">True</property>
-                 <property name="receives_default">True</property>
-                 <child>
-@@ -191,6 +192,17 @@
-             <property name="position">1</property>
-           </packing>
-         </child>
-+        <child>
-+          <object class="GtkLabel" id="session_properties_session_saved_label">
-+            <property name="visible">True</property>
-+            <property name="wrap">True</property>
-+          </object>
-+          <packing>
-+            <property name="expand">False</property>
-+            <property name="fill">False</property>
-+            <property name="position">2</property>
-+          </packing>
-+        </child>
-       </object>
-       <packing>
-         <property name="position">1</property>
-diff -burN a/mate-session/gsm-client.c b/mate-session/gsm-client.c
--- a/mate-session/gsm-client.c	2012-02-29 22:03:08.000000000 +0100
-+++ b/mate-session/gsm-client.c	2012-08-08 12:24:20.120346205 +0200
-@@ -510,6 +510,17 @@
-         g_signal_emit (client, signals[DISCONNECTED], 0);
- }
- 
-+gboolean
-+gsm_client_request_save (GsmClient *client,
-+                         guint      flags,
-+                         GError   **error)
-+{
-+        g_return_val_if_fail (GSM_IS_CLIENT (client), FALSE);
-+
-+        return GSM_CLIENT_GET_CLASS (client)->impl_request_save (client, flags, error);
-+}
-+
-+
- GKeyFile *
- gsm_client_save (GsmClient *client,
-                  GError   **error)
-diff -burN a/mate-session/gsm-client.h b/mate-session/gsm-client.h
--- a/mate-session/gsm-client.h	2012-02-29 22:03:09.000000000 +0100
-+++ b/mate-session/gsm-client.h	2012-08-08 12:26:38.848350455 +0200
-@@ -94,6 +94,9 @@
-                                                               GError   **error);
-         gboolean              (*impl_stop)                   (GsmClient *client,
-                                                               GError   **error);
-+        gboolean              (*impl_request_save)           (GsmClient *client,
-+                                                              guint      flags,
-+                                                              GError   **error);
-         GKeyFile *            (*impl_save)                   (GsmClient *client,
-                                                               GError   **error);
- };
-@@ -139,6 +142,10 @@
- 
- void                  gsm_client_disconnected               (GsmClient  *client);
- 
-+gboolean              gsm_client_request_save               (GsmClient  *client,
-+                                                             guint       flags,
-+                                                             GError    **error);
-+
- GKeyFile             *gsm_client_save                       (GsmClient  *client,
-                                                              GError    **error);
- /* exported to bus */
-diff -burN a/mate-session/gsm-dbus-client.c b/mate-session/gsm-dbus-client.c
--- a/mate-session/gsm-dbus-client.c	2012-02-29 22:03:08.000000000 +0100
-+++ b/mate-session/gsm-dbus-client.c	2012-08-08 12:38:15.393371794 +0200
-@@ -413,6 +413,19 @@
-         G_OBJECT_CLASS (gsm_dbus_client_parent_class)->finalize (object);
- }
- 
-+static gboolean
-+dbus_client_request_save (GsmClient *client,
-+                          guint      flags,
-+                          GError   **error)
-+{
-+        g_debug ("GsmDBusClient: sending save request to client with id %s",
-+                 gsm_client_peek_id (client));
-+
-+        /* FIXME: The protocol does not support this */
-+
-+        return FALSE;
-+}
-+
- static GKeyFile *
- dbus_client_save (GsmClient *client,
-                   GError   **error)
-@@ -665,6 +678,7 @@
-         object_class->set_property         = gsm_dbus_client_set_property;
-         object_class->dispose              = gsm_dbus_client_dispose;
- 
-+        client_class->impl_request_save           = dbus_client_request_save;
-         client_class->impl_save                   = dbus_client_save;
-         client_class->impl_stop                   = dbus_client_stop;
-         client_class->impl_query_end_session      = dbus_client_query_end_session;
-diff -burN a/mate-session/gsm-manager.c b/mate-session/gsm-manager.c
--- a/mate-session/gsm-manager.c	2012-02-29 22:03:09.000000000 +0100
-+++ b/mate-session/gsm-manager.c	2012-08-08 12:47:24.627388620 +0200
-@@ -68,6 +68,7 @@
- #define GSM_MANAGER_DBUS_NAME "org.gnome.SessionManager"
- 
- #define GSM_MANAGER_PHASE_TIMEOUT 30 /* seconds */
-+#define GSM_MANAGER_SAVE_SESSION_TIMEOUT 2
- 
- #define MDM_FLEXISERVER_COMMAND "mdmflexiserver"
- #define MDM_FLEXISERVER_ARGS    "--startnew Standard"
-@@ -1176,6 +1177,69 @@
- 
- }
- 
-+static gboolean
-+_client_request_save (GsmClient            *client,
-+                      ClientEndSessionData *data)
-+{
-+        gboolean ret;
-+        GError  *error;
-+
-+        error = NULL;
-+        ret = gsm_client_request_save (client, data->flags, &error);
-+        if (ret) {
-+                g_debug ("GsmManager: adding client to query clients: %s", gsm_client_peek_id (client));
-+                data->manager->priv->query_clients = g_slist_prepend (data->manager->priv->query_clients,
-+                                                                      client);
-+        } else if (error) {
-+                g_debug ("GsmManager: unable to query client: %s", error->message);
-+                g_error_free (error);
-+        }
-+
-+        return FALSE;
-+}
-+
-+static gboolean
-+_client_request_save_helper (const char           *id,
-+                             GsmClient            *client,
-+                             ClientEndSessionData *data)
-+{
-+        return _client_request_save (client, data);
-+}
-+
-+static void
-+query_save_session_complete (GsmManager *manager)
-+{
-+        GError *error = NULL;
-+
-+        if (g_slist_length (manager->priv->next_query_clients) > 0) {
-+                ClientEndSessionData data;
-+
-+                data.manager = manager;
-+                data.flags = GSM_CLIENT_END_SESSION_FLAG_LAST;
-+
-+                g_slist_foreach (manager->priv->next_query_clients,
-+                                 (GFunc)_client_request_save,
-+                                 &data);
-+
-+                g_slist_free (manager->priv->next_query_clients);
-+                manager->priv->next_query_clients = NULL;
-+
-+                return;
-+        }
-+
-+        if (manager->priv->query_timeout_id > 0) {
-+                g_source_remove (manager->priv->query_timeout_id);
-+                manager->priv->query_timeout_id = 0;
-+        }
-+
-+        gsm_session_save (manager->priv->clients, &error);
-+
-+        if (error) {
-+                g_warning ("Error saving session: %s", error->message);
-+                g_error_free (error);
-+        }
-+}
-+
- static guint32
- generate_cookie (void)
- {
-@@ -1250,6 +1314,21 @@
-         return FALSE;
- }
- 
-+static gboolean
-+_on_query_save_session_timeout (GsmManager *manager)
-+{
-+        manager->priv->query_timeout_id = 0;
-+
-+        g_debug ("GsmManager: query to save session timed out");
-+
-+        g_slist_free (manager->priv->query_clients);
-+        manager->priv->query_clients = NULL;
-+
-+        query_save_session_complete (manager);
-+
-+        return FALSE;
-+}
-+
- static void
- do_phase_query_end_session (GsmManager *manager)
- {
-@@ -1886,13 +1965,32 @@
-                                 const char *reason,
-                                 GsmManager *manager)
- {
-        /* just ignore if received outside of shutdown */
-        if (manager->priv->phase < GSM_MANAGER_PHASE_QUERY_END_SESSION) {
-+        /* just ignore if we are not yet running */
-+        if (manager->priv->phase < GSM_MANAGER_PHASE_RUNNING) {
-                 return;
-         }
- 
-         g_debug ("GsmManager: Response from end session request: is-ok=%d do-last=%d cancel=%d reason=%s", is_ok, do_last, cancel, reason ? reason :"");
- 
-+        if (manager->priv->phase == GSM_MANAGER_PHASE_RUNNING) {
-+                /* Ignore responses when no requests were sent */
-+                if (manager->priv->query_clients == NULL) {
-+                        return;
-+                }
-+
-+                manager->priv->query_clients = g_slist_remove (manager->priv->query_clients, client);
-+
-+                if (do_last) {
-+                        manager->priv->next_query_clients = g_slist_prepend (manager->priv->next_query_clients,
-+                                                                             client);
-+                }
-+
-+                if (manager->priv->query_clients == NULL) {
-+                        query_save_session_complete (manager);
-+                }
-+                return;
-+        }
-+
-         if (cancel) {
-                 cancel_end_session (manager);
-                 return;
-@@ -1991,6 +2089,15 @@
- }
- 
- static void
-+on_xsmp_client_save_request (GsmXSMPClient *client,
-+                             gboolean       show_dialog,
-+                             GsmManager    *manager)
-+{
-+        g_debug ("GsmManager: save_request");
-+        gsm_manager_save_session (manager, NULL);
-+}
-+
-+static void
- on_store_client_added (GsmStore   *store,
-                        const char *id,
-                        GsmManager *manager)
-@@ -2011,6 +2118,10 @@
-                                   "logout-request",
-                                   G_CALLBACK (on_xsmp_client_logout_request),
-                                   manager);
-+		g_signal_connect (client,
-+				  "save-request",
-+				  G_CALLBACK (on_xsmp_client_save_request),
-+				  manager);
-         }
- 
-         g_signal_connect (client,
-@@ -2968,6 +3079,41 @@
- }
- 
- gboolean
-+gsm_manager_save_session (GsmManager *manager,
-+                          GError     **error)
-+{
-+        ClientEndSessionData data;
-+
-+        g_debug ("GsmManager: SaveSession called");
-+
-+        g_return_val_if_fail (GSM_IS_MANAGER (manager), FALSE);
-+
-+        if (manager->priv->phase != GSM_MANAGER_PHASE_RUNNING) {
-+                g_set_error (error,
-+                             GSM_MANAGER_ERROR,
-+                             GSM_MANAGER_ERROR_NOT_IN_RUNNING,
-+                             "SaveSession interface is only available during the Running phase");
-+                return FALSE;
-+        }
-+
-+        data.manager = manager;
-+        data.flags = 0;
-+        gsm_store_foreach (manager->priv->clients,
-+                           (GsmStoreFunc)_client_request_save_helper,
-+                           &data);
-+
-+        if (manager->priv->query_clients) {
-+                manager->priv->query_timeout_id = g_timeout_add_seconds (GSM_MANAGER_SAVE_SESSION_TIMEOUT,
-+                                                                         (GSourceFunc)_on_query_save_session_timeout,
-+                                                                         manager);
-+                return TRUE;
-+        } else {
-+                g_debug ("GsmManager: Nothing to save");
-+                return FALSE;
-+        }
-+}
-+
-+gboolean
- gsm_manager_can_shutdown (GsmManager *manager,
-                           gboolean   *shutdown_available,
-                           GError    **error)
-diff -burN a/mate-session/gsm-manager.h b/mate-session/gsm-manager.h
--- a/mate-session/gsm-manager.h	2012-02-29 22:03:09.000000000 +0100
-+++ b/mate-session/gsm-manager.h	2012-08-08 12:49:14.262391979 +0200
-@@ -154,6 +154,9 @@
- gboolean            gsm_manager_shutdown                       (GsmManager     *manager,
-                                                                 GError        **error);
- 
-+gboolean            gsm_manager_save_session                   (GsmManager     *manager,
-+                                                                GError        **error);
-+
- gboolean            gsm_manager_can_shutdown                   (GsmManager     *manager,
-                                                                 gboolean       *shutdown_available,
-                                                                 GError        **error);
-diff -burN a/mate-session/gsm-xsmp-client.c b/mate-session/gsm-xsmp-client.c
--- a/mate-session/gsm-xsmp-client.c	2012-02-29 22:03:08.000000000 +0100
-+++ b/mate-session/gsm-xsmp-client.c	2012-08-08 12:52:27.719397905 +0200
-@@ -69,6 +69,7 @@
- enum {
-         REGISTER_REQUEST,
-         LOGOUT_REQUEST,
-+        SAVE_REQUEST,
-         LAST_SIGNAL
- };
- 
-@@ -502,6 +503,31 @@
-         return TRUE;
- }
- 
-+static gboolean
-+xsmp_request_save (GsmClient *client,
-+                   guint      flags,
-+                   GError   **error)
-+{
-+        GsmXSMPClient *xsmp = (GsmXSMPClient *) client;
-+
-+        g_debug ("GsmXSMPClient: xsmp_request_save ('%s')", xsmp->priv->description);
-+
-+        if (xsmp->priv->conn == NULL) {
-+                g_set_error (error,
-+                             GSM_CLIENT_ERROR,
-+                             GSM_CLIENT_ERROR_NOT_REGISTERED,
-+                             "Client is not registered");
-+                return FALSE;
-+        }
-+
-+        if (flags & GSM_CLIENT_END_SESSION_FLAG_LAST)
-+                xsmp_save_yourself_phase2 (client);
-+        else
-+                do_save_yourself (xsmp, SmSaveLocal, FALSE);
-+
-+        return TRUE;
-+}
-+
- static char *
- get_desktop_file_path (GsmXSMPClient *client)
- {
-@@ -976,6 +1002,8 @@
-         object_class->get_property         = gsm_xsmp_client_get_property;
-         object_class->set_property         = gsm_xsmp_client_set_property;
- 
-+
-+        client_class->impl_request_save           = xsmp_request_save;
-         client_class->impl_save                   = xsmp_save;
-         client_class->impl_stop                   = xsmp_stop;
-         client_class->impl_query_end_session      = xsmp_query_end_session;
-@@ -1003,6 +1031,16 @@
-                               NULL,
-                               NULL,
-                               g_cclosure_marshal_VOID__BOOLEAN,
-+                              G_TYPE_NONE,
-+                              1, G_TYPE_BOOLEAN);
-+        signals[SAVE_REQUEST] =
-+		g_signal_new ("save-request",
-+                              G_OBJECT_CLASS_TYPE (object_class),
-+                              G_SIGNAL_RUN_LAST,
-+                              G_STRUCT_OFFSET (GsmXSMPClientClass, save_request),
-+                              NULL,
-+                              NULL,
-+                              g_cclosure_marshal_VOID__BOOLEAN,
-                               G_TYPE_NONE,
-                               1, G_TYPE_BOOLEAN);
- 
-diff -burN a/mate-session/gsm-xsmp-client.h b/mate-session/gsm-xsmp-client.h
--- a/mate-session/gsm-xsmp-client.h	2012-02-29 22:03:09.000000000 +0100
-+++ b/mate-session/gsm-xsmp-client.h	2012-08-08 12:53:39.629400108 +0200
-@@ -57,6 +57,8 @@
-         gboolean (*logout_request)       (GsmXSMPClient  *client,
-                                           gboolean        prompt);
- 
-+        gboolean (*save_request)         (GsmXSMPClient  *client,
-+                                          gboolean        prompt);
- 
-         void     (*saved_state)          (GsmXSMPClient  *client);
- 
-diff -burN a/mate-session/org.gnome.SessionManager.xml b/mate-session/org.gnome.SessionManager.xml
--- a/mate-session/org.gnome.SessionManager.xml	2012-02-29 22:03:09.000000000 +0100
-+++ b/mate-session/org.gnome.SessionManager.xml	2012-08-08 12:57:41.216407509 +0200
-@@ -256,6 +256,14 @@
-       </doc:doc>
-     </method>
- 
-+    <method name="SaveSession">
-+      <doc:doc>
-+	    <doc:description>
-+	      <doc:para>Request to save session</doc:para>
-+	    </doc:description>
-+      </doc:doc>
-+    </method>
-+
-     <method name="CanShutdown">
-       <arg name="is_available" direction="out" type="b">
-         <doc:doc>
--- a/mate-base/mate-session-manager/mate-session-manager-1.20.1.ebuild
+++ b/mate-base/mate-session-manager/mate-session-manager-1.20.1.ebuild
@ -1,85 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-DESCRIPTION="MATE session manager"
-HOMEPAGE="http://mate-desktop.org/"
-
-LICENSE="GPL-2 LGPL-2 FDL-1.1"
-SLOT="0"
-
-IUSE="debug elibc_FreeBSD gnome-keyring ipv6 systemd +xtrans"
-
-# x11-misc/xdg-user-dirs{,-gtk} are needed to create the various XDG_*_DIRs, and
-# create .config/user-dirs.dirs which is read by glib to get G_USER_DIRECTORY_*
-# xdg-user-dirs-update is run during login (see 10-user-dirs-update-gnome below).
-
-COMMON_DEPEND=">=dev-libs/dbus-glib-0.76
-	>=dev-libs/glib-2.36:2
-	dev-libs/libxslt
-	sys-apps/dbus
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.14:3
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXau
-	x11-libs/libXext
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/pango
-	virtual/libintl
-	elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )
-	systemd? ( sys-apps/systemd )
-	!systemd? ( >=sys-auth/consolekit-0.9.2 )
-	xtrans? ( x11-libs/xtrans )"
-
-RDEPEND="${COMMON_DEPEND}
-	x11-apps/xdpyinfo
-	x11-misc/xdg-user-dirs
-	x11-misc/xdg-user-dirs-gtk
-	gnome-keyring? ( gnome-base/gnome-keyring )"
-
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.40:*
-	>=dev-lang/perl-5
-	>=sys-devel/gettext-0.10.40:*
-	virtual/pkgconfig:*
-	!<gnome-base/gdm-2.20.4"
-
-MATE_FORCE_AUTORECONF=true
-
-src_configure() {
-	mate_src_configure \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		$(use_with systemd) \
-		$(use_with xtrans)  \
-		$(use_enable debug) \
-		$(use_enable ipv6)
-}
-
-src_install() {
-	mate_src_install
-
-	dodir /etc/X11/Sessions/
-	exeinto /etc/X11/Sessions/
-	doexe "${FILESDIR}"/MATE
-
-	dodir /usr/share/mate/applications/
-	insinto /usr/share/mate/applications/
-	doins "${FILESDIR}"/defaults.list
-
-	dodir /etc/X11/xinit/xinitrc.d/
-	exeinto /etc/X11/xinit/xinitrc.d/
-	doexe "${FILESDIR}"/15-xdg-data-mate
-
-	# This should be done in MATE too, see Gentoo bug #270852
-	doexe "${FILESDIR}"/10-user-dirs-update-mate
-}
--- a/mate-base/mate-settings-daemon/Manifest
+++ b/mate-base/mate-settings-daemon/Manifest
@ -1 +0,0 @@
-DIST mate-settings-daemon-1.20.3.tar.xz 798016 BLAKE2B 21d3138c929991497491a1dce898c81112ec121fb1b6105a51e72260848a9d5674511d9d9433806df16162ca8bc302a010f3acce9549fe551e7529a8c4064d0e SHA512 5c13e5f525658f11762c4843e6cbbf01e6cab9c496d93d7b27914a22c0e2a00654f38f42c29f5c256dee03548ec3af8c1adab95f40ebe37cbb9c917a540261aa
--- a/mate-base/mate-settings-daemon/mate-settings-daemon-1.20.3.ebuild
+++ b/mate-base/mate-settings-daemon/mate-settings-daemon-1.20.3.ebuild
@ -1,72 +0,0 @@
-# Copyright 1999-2018 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 ~arm64 x86"
-fi
-
-DESCRIPTION="MATE Settings Daemon"
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-
-IUSE="X debug libnotify policykit pulseaudio smartcard +sound"
-
-REQUIRED_USE="pulseaudio? ( sound )"
-
-COMMON_DEPEND=">=dev-libs/dbus-glib-0.74:0
-	>=dev-libs/glib-2.17.3:2
-	>=gnome-base/dconf-0.13.4:0
-	>=mate-base/libmatekbd-1.17.0
-	>=mate-base/mate-desktop-1.17.0
-	media-libs/fontconfig:1.0
-	x11-libs/cairo:0
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.14:3
-	x11-libs/libX11:0
-	x11-libs/libXi:0
-	x11-libs/libXext:0
-	x11-libs/libXxf86misc:0
-	>=x11-libs/libxklavier-5.2:0
-	virtual/libintl:0
-	libnotify? ( >=x11-libs/libnotify-0.7:0 )
-	policykit? (
-		>=dev-libs/dbus-glib-0.71:0
-		>=sys-apps/dbus-1.1.2:0
-		>=sys-auth/polkit-0.97:0
-	)
-	pulseaudio? (
-		>=media-libs/libmatemixer-1.10:0[pulseaudio]
-		>=media-sound/pulseaudio-0.9.15:0
-	)
-	smartcard? ( >=dev-libs/nss-3.11.2:0 )
-	sound? (
-		>=media-libs/libmatemixer-1.10:0
-		media-libs/libcanberra:0[gtk3]
-	)"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.50.1:0
-	sys-devel/gettext:0
-	virtual/pkgconfig:0
-	x11-proto/inputproto:0
-	x11-proto/xproto:0"
-
-src_configure() {
-	mate_src_configure \
-		$(use_with X x) \
-		$(use_with libnotify) \
-		$(use_with sound libcanberra) \
-		$(use_with sound libmatemixer) \
-		$(use_enable debug) \
-		$(use_enable policykit polkit) \
-		$(use_enable pulseaudio pulse) \
-		$(use_enable smartcard smartcard-support)
-}
--- a/mate-base/mate/mate-1.20.ebuild
+++ b/mate-base/mate/mate-1.20.ebuild
@ -1,84 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} == 9999 ]]; then
-	MATE_BRANCH=9999
-	MATE_THEMES_V=9999
-else
-	inherit versionator
-	MATE_BRANCH="$(get_version_component_range 1-2)"
-	MATE_THEMES_V=3
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-SRC_URI=""
-DESCRIPTION="Meta ebuild for MATE, a traditional desktop environment"
-HOMEPAGE="http://mate-desktop.org"
-
-LICENSE="metapackage"
-
-SLOT="0"
-IUSE="+base -bluetooth help +notification +themes +extras"
-
-S="${WORKDIR}"
-
-RDEPEND="
-	=mate-base/mate-desktop-${MATE_BRANCH}*:0
-	=mate-base/mate-menus-${MATE_BRANCH}*:0
-	=mate-base/mate-panel-${MATE_BRANCH}*:0
-	=mate-base/mate-session-manager-${MATE_BRANCH}*:0
-	=mate-base/mate-settings-daemon-${MATE_BRANCH}*:0
-	=x11-wm/marco-${MATE_BRANCH}*:0
-	base? (
-		=mate-base/caja-${MATE_BRANCH}*:0
-		=mate-base/mate-applets-meta-${MATE_BRANCH}*:0
-		=mate-base/mate-control-center-${MATE_BRANCH}*:0
-		=mate-extra/mate-media-${MATE_BRANCH}*:0
-		=x11-misc/mozo-${MATE_BRANCH}*:0
-		=x11-terms/mate-terminal-${MATE_BRANCH}*:0
-	)
-	bluetooth? ( net-wireless/blueman:0 )
-	themes? (
-		=x11-themes/mate-backgrounds-${MATE_BRANCH}*:0
-		=x11-themes/mate-icon-theme-${MATE_BRANCH}*:0
-		>=x11-themes/mate-themes-meta-${MATE_THEMES_V}:0
-	)
-	extras? (
-		=app-arch/engrampa-${MATE_BRANCH}*:0
-		=app-editors/pluma-${MATE_BRANCH}*:0
-		=app-text/atril-${MATE_BRANCH}*:0
-		=mate-extra/caja-extensions-${MATE_BRANCH}*:0
-		=mate-extra/mate-calc-${MATE_BRANCH}*:0
-		=mate-extra/mate-netbook-${MATE_BRANCH}*:0
-		=mate-extra/mate-power-manager-${MATE_BRANCH}*:0
-		=mate-extra/mate-screensaver-${MATE_BRANCH}*:0
-		=mate-extra/mate-system-monitor-${MATE_BRANCH}*:0
-		=mate-extra/mate-utils-${MATE_BRANCH}*:0
-		=media-gfx/eom-${MATE_BRANCH}*:0
-		sys-apps/gnome-disk-utility:0
-	)
-	help? (
-		gnome-extra/yelp:0
-		=mate-extra/mate-user-guide-${MATE_BRANCH}*:0
-	)
-"
-
-PDEPEND="
-	notification? ( =x11-misc/mate-notification-daemon-${MATE_BRANCH}*:0 )
-	virtual/notification-daemon:0"
-
-pkg_postinst() {
-	elog "For installation, usage and troubleshooting details regarding MATE;"
-	elog "read more about it at Gentoo Wiki: https://wiki.gentoo.org/wiki/MATE"
-	elog ""
-	if ! has_version x11-misc/mate-notification-daemon; then
-		elog "If you experience any issues with notifications, please try using"
-		elog "x11-misc/mate-notification-daemon instead your currently installed daemon"
-		elog ""
-	fi
-	elog "Some packages that are not included in this meta-package but may be of interest:"
-	elog "		mate-extra/caja-dropbox"
-	elog "		mate-extra/mate-user-share"
-}
--- a/mate-extra/caja-dropbox/Manifest
+++ b/mate-extra/caja-dropbox/Manifest
@ -1 +0,0 @@
-DIST caja-dropbox-1.20.0.tar.xz 324948 BLAKE2B 5e52d3a2161f28dd5077b2ce0e71a331cbfdeab346d5a4fe541e74be2ebe278d1904d9ad1fd029cd626f162ab56d22a27cb05ba9424370403df8ef9ea4d4ee40 SHA512 13e888718ff7c5429772c938e7410378f16117a7c4582df1116c79130a2528b919ae9379779e31005d0a0a954019735fc3df1fdf11dbfdb2a886d95f6114ecf5
--- a/mate-extra/caja-dropbox/caja-dropbox-1.20.0.ebuild
+++ b/mate-extra/caja-dropbox/caja-dropbox-1.20.0.ebuild
@ -1,92 +0,0 @@
-# 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
-}
--- 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
@ -1,13 +0,0 @@
-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
--- a/mate-extra/caja-extensions/Manifest
+++ b/mate-extra/caja-extensions/Manifest
@ -1 +0,0 @@
-DIST caja-extensions-1.20.1.tar.xz 437604 BLAKE2B 4a6768e151a886965e8586472dca3153ab949dfdf1e1255e14f56a1807bee7a809eddf1d9dcc1de3eddf520740fcbc06e1a58c83c03946bd289b122a8075cfed SHA512 79e6de63ac6cce041b3f367bda37c7758a201f07e2a99b9bb825e25fc58acdb620175960832c40df71601f27344a9baa7146dca45d4b7c112feae456a0a251d7
--- a/mate-extra/caja-extensions/caja-extensions-1.20.1.ebuild
+++ b/mate-extra/caja-extensions/caja-extensions-1.20.1.ebuild
@ -1,75 +0,0 @@
-# Copyright 1999-2018 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 ~arm64 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)
-}
--- a/mate-extra/mate-calc/Manifest
+++ b/mate-extra/mate-calc/Manifest
@ -1 +0,0 @@
-DIST mate-calc-1.20.2.tar.xz 735340 BLAKE2B 5ea7a244db62a1b22904622802767811b773eec8e3cc291d61f2f48b4616fa354153c6f87bf43520cda849373cbc973b6ef78f0f9a0127d98d293a723f5e0732 SHA512 fe7aa522d21961b07945a9328a3b9dbadaf78be6e4b75d095e6c9e84a2244c447f2a9e4df62bb8daf0f634d1d697a4dc5ad3924f0059e4fec2275e620539db2a
--- a/mate-extra/mate-calc/mate-calc-1.20.2.ebuild
+++ b/mate-extra/mate-calc/mate-calc-1.20.2.ebuild
@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-DESCRIPTION="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:*"
--- a/mate-extra/mate-indicator-applet/Manifest
+++ b/mate-extra/mate-indicator-applet/Manifest
@ -1 +0,0 @@
-DIST mate-indicator-applet-1.20.1.tar.xz 337336 BLAKE2B eab0ac7f1bb934bcec9a5721326eb98e028e240dfd3fcfc5c2e5ee7258db72707dc6b78c8b6005d6c1f6bc49cd40ac66d222bdcd721d9c3243cd1f4e659ec4d3 SHA512 8e20761ec3b9f8be2ba972e732d4a039c3784f1a652150c76a66ddccdfbe0560650b59338c5757d7807a599c89992afe08cfdc14ccf0f14f822e9be63c93b079
--- a/mate-extra/mate-indicator-applet/mate-indicator-applet-1.20.1.ebuild
+++ b/mate-extra/mate-indicator-applet/mate-indicator-applet-1.20.1.ebuild
@ -1,27 +0,0 @@
-# Copyright 1999-2018 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"
--- a/mate-extra/mate-media/Manifest
+++ b/mate-extra/mate-media/Manifest
@ -1 +0,0 @@
-DIST mate-media-1.20.1.tar.xz 497844 BLAKE2B 466505342431adf5f53a4245838e99431b1ac86770ec5e0e9341c90a95f2929b610b25cd0711c1bfddbd8b4a6d5045f442833eae2c891669beef6eca0e1224b3 SHA512 2a7a0f8c7a931ece991702b3177daa8ba4ddec6b63c3bf05a03bd26711c7ebe92c279512614b92622c5bab51f2c442ac5d06ec5f720258dfeed5692cd2b33d34
--- a/mate-extra/mate-media/mate-media-1.20.1.ebuild
+++ b/mate-extra/mate-media/mate-media-1.20.1.ebuild
@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-DESCRIPTION="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:*"
--- a/mate-extra/mate-netbook/Manifest
+++ b/mate-extra/mate-netbook/Manifest
@ -1 +0,0 @@
-DIST mate-netbook-1.20.1.tar.xz 310404 BLAKE2B bb456ca50d1e69c1a75ade15ea986e4311062f87d600d0d3dc25d8e442b9348df04cf085bcef96ebd72241f52724440909a62540ddcca9ae2662c5385617c384 SHA512 d74b4f1ef16f6406abe2c5108148f6db207643b4b81d86d07c3b2bfe446c8246464c884cf68548e7860a0f328891f87ec7ae5966d1d6ecb6f1593c1ec9c158ae
--- a/mate-extra/mate-netbook/mate-netbook-1.20.1.ebuild
+++ b/mate-extra/mate-netbook/mate-netbook-1.20.1.ebuild
@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-DESCRIPTION="MATE 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:*"
--- a/mate-extra/mate-polkit/Manifest
+++ b/mate-extra/mate-polkit/Manifest
@ -1 +0,0 @@
-DIST mate-polkit-1.20.1.tar.xz 300196 BLAKE2B 3652182b5c781fc0f497fb8cdc100b47b8a8658e0fd1e4ab1cfeb8097623a024a15c1776515021f3929b75e58456f11c26c6452d927060177de4b7da4adfde2e SHA512 8e657c2783a575f634e5003d4225c438d92fdc100d313ba33e708f8454953ef335e38b0a83d975f990dcdac1cb36506cf6da32d729a2fac537995cddace0b8fd
--- a/mate-extra/mate-polkit/mate-polkit-1.20.1.ebuild
+++ b/mate-extra/mate-polkit/mate-polkit-1.20.1.ebuild
@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-DESCRIPTION="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)
-}
--- a/mate-extra/mate-power-manager/Manifest
+++ b/mate-extra/mate-power-manager/Manifest
@ -1 +0,0 @@
-DIST mate-power-manager-1.20.2.tar.xz 3206736 BLAKE2B 3e80b32e6dcfdcaabaed84ca93bf667dedab1fb6674d47540fce1265f03c03595263eec369162cb8364d39b42a56f2bb310e81750ff8ec142f4ffffaac728155 SHA512 d91e7d09362a23a2111c83a366d02debd8cb70188df4844aa501db3b97d9fcc59bc37ca84f03a5eaa471dab4488e3a2d9ffe2779cb2188496664ac91107b9c8f
--- a/mate-extra/mate-power-manager/mate-power-manager-1.20.2.ebuild
+++ b/mate-extra/mate-power-manager/mate-power-manager-1.20.2.ebuild
@ -1,67 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-DESCRIPTION="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"
-}
--- a/mate-extra/mate-screensaver/Manifest
+++ b/mate-extra/mate-screensaver/Manifest
@ -1 +0,0 @@
-DIST mate-screensaver-1.20.1.tar.xz 4952212 BLAKE2B 4e675eb9934cb606923ba9cfe2b9896d42d987b0b658c45a629d99d88cf26a5c33a2da5e5d065bc991c94bb38dc6a8f07e2b0b2925f6ec6d30d49bef3818e327 SHA512 b16b18f58c09b6b2ec417126b9943c8fb26d7aabec40b8ab8177955af653cb2847c9892de72944c2ed0e3ac1333b3bd2a0ac2384023b1503df5448420e09fd66
--- a/mate-extra/mate-screensaver/files/xss-conversion.txt
+++ b/mate-extra/mate-screensaver/files/xss-conversion.txt
@ -1,22 +0,0 @@
-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.
--- a/mate-extra/mate-screensaver/mate-screensaver-1.20.1.ebuild
+++ b/mate-extra/mate-screensaver/mate-screensaver-1.20.1.ebuild
@ -1,116 +0,0 @@
-# Copyright 1999-2018 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 ~arm64 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
-}
--- a/mate-extra/mate-sensors-applet/Manifest
+++ b/mate-extra/mate-sensors-applet/Manifest
@ -1 +0,0 @@
-DIST mate-sensors-applet-1.20.2.tar.xz 423380 BLAKE2B db481ac79f959df61aa55df90b082bafe4f700b8ce08eb5d4a2161a8c1fea60224c02d09217c197d73a79902f9cbb34a609e1e44b86c0108f81733bb7b343470 SHA512 00fc97769f00b4542263cb6eb19cf475ebe185c3e497af4a8207f91a26f15053ecba3c7f8b85782e5021bebe4aff5a3a890b707aadd50481b2d0b557c9c5de99
--- a/mate-extra/mate-sensors-applet/mate-sensors-applet-1.20.2.ebuild
+++ b/mate-extra/mate-sensors-applet/mate-sensors-applet-1.20.2.ebuild
@ -1,66 +0,0 @@
-# Copyright 1999-2018 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_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_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 \
-		--without-aticonfig \
-		$(use_enable libnotify) \
-		$(use_with lm_sensors libsensors) \
-		$(use_with video_cards_nvidia nvidia) \
-		${udisks}
-}
--- a/mate-extra/mate-system-monitor/Manifest
+++ b/mate-extra/mate-system-monitor/Manifest
@ -1 +0,0 @@
-DIST mate-system-monitor-1.20.1.tar.xz 2158808 BLAKE2B 8c2b92aa85e080be7ff9a146b503945bebf1174e5a1fe6a87a6b5e2e226f9b495f297710c92453c218264070426ae62b6479767f468865163fd19b0e24a1d7c4 SHA512 ee8813b33aac83fb31ceb1faa1e98015844c438d21d1505f621737546d48a68cf1d9de88858fa9e042934aa221b79c98219c8160915f73757e9870e48b851acb
--- a/mate-extra/mate-system-monitor/mate-system-monitor-1.20.1.ebuild
+++ b/mate-extra/mate-system-monitor/mate-system-monitor-1.20.1.ebuild
@ -1,53 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-DESCRIPTION="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."
-}
--- a/mate-extra/mate-user-guide/Manifest
+++ b/mate-extra/mate-user-guide/Manifest
@ -1 +0,0 @@
-DIST mate-user-guide-1.20.1.tar.xz 8232904 BLAKE2B a984b6232e52ed11e73cb444aaadfdf21f07ceaa69231f99e1db499182bd57b86e966746e81f3538854accfc866a07b3c76113e9d19aae5b8d5b18ee1a46c056 SHA512 f7cf8432ff5a9a54efcd690c57390e708b246fa81b8465043bf180ea33d5dff888c673ee00c8bad108b84dcf89f9872fd92b08d82279b89393f8326fea382e56
--- a/mate-extra/mate-user-guide/mate-user-guide-1.20.1.ebuild
+++ b/mate-extra/mate-user-guide/mate-user-guide-1.20.1.ebuild
@ -1,28 +0,0 @@
-# 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]"
--- a/mate-extra/mate-user-share/Manifest
+++ b/mate-extra/mate-user-share/Manifest
@ -1 +0,0 @@
-DIST mate-user-share-1.20.1.tar.xz 924404 BLAKE2B 4c678166bb6f451cba928b31982a9f3bf68803b8c853723354c08dfaa7c1bd09d0df37d1836f7838fc5fe06d9dfb1146c8a63c20af55fb9381fb90cc108cc55b SHA512 9628ae478909b9be9b9c7884f0fbc33ff597efc87ec60088b6bfca2ce497cdd707c245e6835fb95856cd2576524e385ae32bbea08d349c136255fec554eb8010
--- a/mate-extra/mate-user-share/mate-user-share-1.20.1.ebuild
+++ b/mate-extra/mate-user-share/mate-user-share-1.20.1.ebuild
@ -1,50 +0,0 @@
-# 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)
-}
--- a/mate-extra/mate-utils/Manifest
+++ b/mate-extra/mate-utils/Manifest
@ -1 +0,0 @@
-DIST mate-utils-1.20.1.tar.xz 6484584 BLAKE2B 6c77442ef90320f02b3a5bc5cabf601cf7d140b45665dc19438eab20b4cd927f67ab6b406b0edda7afbbd3d8592d8c64fa57c3f2d8392d8c6258ec2f3ce0de4c SHA512 6c262efd55bce814773d0604f8decaa90f07cb33158cc844ce533b063e757e17f62d530c9124786e9a6e68f85d7a15e690d12dcc039a4f34f15f596a994a9d56
--- a/mate-extra/mate-utils/mate-utils-1.20.1.ebuild
+++ b/mate-extra/mate-utils/mate-utils-1.20.1.ebuild
@ -1,65 +0,0 @@
-# Copyright 1999-2018 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 ~arm64 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)
-}
--- a/media-gfx/eom/Manifest
+++ b/media-gfx/eom/Manifest
@ -1 +0,0 @@
-DIST eom-1.20.1.tar.xz 2218364 BLAKE2B 0e76a538863c6455299f861241d42617e3f9bd8b9ecd039e4efa7b9564287087b990ccbbb167cd50b33807f94bc53285f285861cd117c8cca1a88412e57fd408 SHA512 d782e3500724c8bc03f4235300ed11c84318ac3bd97a91e7a2c643c8a1f3e119e9f09fdded83a56f5d6a3701636402cc8e52a79ac00860ae7384769e82384af3
--- a/media-gfx/eom/eom-1.20.1.ebuild
+++ b/media-gfx/eom/eom-1.20.1.ebuild
@ -1,65 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-DESCRIPTION="The MATE image viewer"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="X debug dbus exif +introspection jpeg lcms svg tiff xmp"
-
-COMMON_DEPEND="
-	dev-libs/atk:0
-	>=dev-libs/glib-2.36:2
-	>=dev-libs/libpeas-1.2.0[gtk]
-	>=dev-libs/libxml2-2:2
-	gnome-base/dconf:0
-	>=mate-base/mate-desktop-1.17.0
-	sys-libs/zlib:0
-	x11-libs/cairo:0
-	>=x11-libs/gdk-pixbuf-2.4:2[introspection?,jpeg?,tiff?]
-	>=x11-libs/gtk+-3.14:3[introspection?]
-	x11-libs/libX11:0
-	>=x11-misc/shared-mime-info-0.20:0
-	virtual/libintl:0
-	dbus? ( >=dev-libs/dbus-glib-0.71:0 )
-	exif? (
-		>=media-libs/libexif-0.6.14:0
-		virtual/jpeg:0
-	)
-	introspection? ( >=dev-libs/gobject-introspection-0.9.3:= )
-	jpeg? ( virtual/jpeg:0 )
-	lcms? ( media-libs/lcms:2 )
-	svg? ( >=gnome-base/librsvg-2.36.2:2 )
-	xmp? ( >=media-libs/exempi-1.99.5:2 )
-	!!media-gfx/mate-image-viewer"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/yelp-tools:0
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.50.1:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-src_configure() {
-	mate_src_configure \
-		$(use_enable debug) \
-		$(use_enable introspection) \
-		$(use_with X x) \
-		$(use_with dbus) \
-		$(use_with exif libexif) \
-		$(use_with jpeg libjpeg) \
-		$(use_with lcms cms) \
-		$(use_with svg librsvg) \
-		$(use_with xmp)
-}
--- a/media-gfx/eom/files/eom-1.12.2-gtk3-svg.patch
+++ b/media-gfx/eom/files/eom-1.12.2-gtk3-svg.patch
@ -1,33 +0,0 @@
-From 038530ed2e9b844f75e2af24e44e0421ad1ccdc8 Mon Sep 17 00:00:00 2001
-From: monsta <monsta@inbox.ru>
-Date: Wed, 24 Feb 2016 16:47:08 +0300
-Subject: [PATCH] fix svg rendering that's broken with GTK+3
-
-from
-https://git.gnome.org/browse/eog/commit/?id=a33950c14d7b8da8e1c6289709022affb910be2a
---
- src/eom-scroll-view.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/eom-scroll-view.c b/src/eom-scroll-view.c
-index 6385f29..6d1b290 100644
--- a/src/eom-scroll-view.c
-+++ b/src/eom-scroll-view.c
-@@ -1306,7 +1306,7 @@ display_expose_event (GtkWidget *widget, GdkEventExpose *event, gpointer data)
- 
- #ifdef HAVE_RSVG
- 	if (eom_image_is_svg (view->priv->image)) {
-		cairo_matrix_t matrix, translate, scale;
-+		cairo_matrix_t matrix, translate, scale, original;
- 		EomTransform *transform = eom_image_get_transform (priv->image);
- 		cairo_matrix_init_identity (&matrix);
- 		if (transform) {
-@@ -1343,6 +1343,8 @@ display_expose_event (GtkWidget *widget, GdkEventExpose *event, gpointer data)
- 		cairo_matrix_init_translate (&translate, xofs, yofs);
- 		cairo_matrix_multiply (&matrix, &matrix, &translate);
- 
-+		cairo_get_matrix (cr, &original);
-+		cairo_matrix_multiply (&matrix, &matrix, &original);
- 		cairo_set_matrix (cr, &matrix);
- 
- 		rsvg_handle_render_cairo (eom_image_get_svg (priv->image), cr);
--- a/media-libs/libmatemixer/Manifest
+++ b/media-libs/libmatemixer/Manifest
@ -1 +0,0 @@
-DIST libmatemixer-1.20.1.tar.xz 429004 BLAKE2B 59fd35eea4c3df8c9cbd78ff8e809c71e80363a5733b5022e311afd2f99032d4f30b246de12a0b4ed979ad00941b3c6d0f20ba0542e235262232cf7a1e817faf SHA512 2713643b4e6ba7eb28c0b064fce394a266e08d2becad252c1fd165c5aedd7e3faaf0cf20f97e5efced3df04ec271d48dfa77d632ca26c4edd2178c66cb2c5347
--- a/media-libs/libmatemixer/libmatemixer-1.20.1.ebuild
+++ b/media-libs/libmatemixer/libmatemixer-1.20.1.ebuild
@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-DESCRIPTION="Mixer library for MATE Desktop"
-LICENSE="LGPL-2 GPL-2"
-SLOT="0"
-
-IUSE="+alsa oss pulseaudio"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.36:2
-	sys-devel/gettext:*
-	alsa? ( >=media-libs/alsa-lib-1.0.5 )
-	pulseaudio? ( >=media-sound/pulseaudio-2.0.0:0[alsa?,glib] )"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.35.0:*
-	virtual/pkgconfig:*"
-
-src_configure() {
-	mate_src_configure \
-		--disable-null \
-		$(use_enable alsa) \
-		$(use_enable oss) \
-		$(use_enable pulseaudio)
-}
--- a/profiles/default/package.keywords/mate
+++ b/profiles/default/package.keywords/mate
@ -1,40 +1,40 @@
-<app-arch/engrampa-1.21 amd64 x86
-<app-editors/pluma-1.21 amd64 x86
-<app-text/atril-1.21 amd64 x86
-<dev-libs/libmateweather-1.21 amd64 x86
-<dev-python/python-caja-1.21 amd64 x86
-<mate-base/caja-1.21 amd64 x86
-<mate-base/libmatekbd-1.21 amd64 x86
-<mate-base/mate-1.21 amd64 x86
-<mate-base/mate-applets-1.21 amd64 x86
-<mate-base/mate-applets-meta-1.21 amd64 x86
-<mate-base/mate-common-1.21 amd64 x86
-<mate-base/mate-control-center-1.21 amd64 x86
-<mate-base/mate-desktop-1.21 amd64 x86
-<mate-base/mate-menus-1.21 amd64 x86
-<mate-base/mate-panel-1.21 amd64 x86
-<mate-base/mate-session-manager-1.21 amd64 x86
-<mate-base/mate-settings-daemon-1.21 amd64 x86
-<mate-extra/caja-dropbox-1.21 amd64 x86
-<mate-extra/caja-extensions-1.21 amd64 x86
-<mate-extra/mate-calc-1.21 amd64 x86
-<mate-extra/mate-indicator-applet-1.21 amd64 x86
-<mate-extra/mate-media-1.21 amd64 x86
-<mate-extra/mate-netbook-1.21 amd64 x86
-<mate-extra/mate-polkit-1.21 amd64 x86
-<mate-extra/mate-power-manager-1.21 amd64 x86
-<mate-extra/mate-screensaver-1.21 amd64 x86
-<mate-extra/mate-sensors-applet-1.21 amd64 x86
-<mate-extra/mate-system-monitor-1.21 amd64 x86
-<mate-extra/mate-user-guide-1.21 amd64 x86
-<mate-extra/mate-user-share-1.21 amd64 x86
-<mate-extra/mate-utils-1.21 amd64 x86
-<media-gfx/eom-1.21 amd64 x86
-<media-libs/libmatemixer-1.21 amd64 x86
-<x11-misc/mate-notification-daemon-1.21 amd64 x86
-<x11-misc/mozo-1.21 amd64 x86
-<x11-terms/mate-terminal-1.21 amd64 x86
-<x11-themes/mate-backgrounds-1.21 amd64 x86
-<x11-themes/mate-icon-theme-1.21 amd64 x86
-<x11-themes/mate-icon-theme-faenza-1.21 amd64 x86
-<x11-wm/marco-1.21 amd64 x86
+<app-arch/engrampa-1.19 amd64 x86
+<app-editors/pluma-1.19 amd64 x86
+<app-text/atril-1.19 amd64 x86
+<dev-libs/libmateweather-1.19 amd64 x86
+<dev-python/python-caja-1.19 amd64 x86
+<mate-base/caja-1.19 amd64 x86
+<mate-base/libmatekbd-1.19 amd64 x86
+<mate-base/mate-1.19 amd64 x86
+<mate-base/mate-applets-1.19 amd64 x86
+<mate-base/mate-applets-meta-1.19 amd64 x86
+<mate-base/mate-common-1.19 amd64 x86
+<mate-base/mate-control-center-1.19 amd64 x86
+<mate-base/mate-desktop-1.19 amd64 x86
+<mate-base/mate-menus-1.19 amd64 x86
+<mate-base/mate-panel-1.19 amd64 x86
+<mate-base/mate-session-manager-1.19 amd64 x86
+<mate-base/mate-settings-daemon-1.19 amd64 x86
+<mate-extra/caja-dropbox-1.19 amd64 x86
+<mate-extra/caja-extensions-1.19 amd64 x86
+<mate-extra/mate-calc-1.19 amd64 x86
+<mate-extra/mate-indicator-applet-1.19 amd64 x86
+<mate-extra/mate-media-1.19 amd64 x86
+<mate-extra/mate-netbook-1.19 amd64 x86
+<mate-extra/mate-polkit-1.19 amd64 x86
+<mate-extra/mate-power-manager-1.19 amd64 x86
+<mate-extra/mate-screensaver-1.19 amd64 x86
+<mate-extra/mate-sensors-applet-1.19 amd64 x86
+<mate-extra/mate-system-monitor-1.19 amd64 x86
+<mate-extra/mate-user-guide-1.19 amd64 x86
+<mate-extra/mate-user-share-1.19 amd64 x86
+<mate-extra/mate-utils-1.19 amd64 x86
+<media-gfx/eom-1.19 amd64 x86
+<media-libs/libmatemixer-1.19 amd64 x86
+<x11-misc/mate-notification-daemon-1.19 amd64 x86
+<x11-misc/mozo-1.19 amd64 x86
+<x11-terms/mate-terminal-1.19 amd64 x86
+<x11-themes/mate-backgrounds-1.19 amd64 x86
+<x11-themes/mate-icon-theme-1.19 amd64 x86
+<x11-themes/mate-icon-theme-faenza-1.19 amd64 x86
+<x11-wm/marco-1.19 amd64 x86
--- a/x11-misc/mate-notification-daemon/Manifest
+++ b/x11-misc/mate-notification-daemon/Manifest
@ -1 +0,0 @@
-DIST mate-notification-daemon-1.20.1.tar.xz 347592 BLAKE2B 3efa5ee4066cd2b51e2aae4059ee67886626d96cb23c12cf998e50b6b8dbb6d3bbc632f8a9b877ca0ca350cbc62b869e9eda51bda988374cb9c4685e1286afcd SHA512 bdec0447821887a78ddb3b1b48666f5450aee6a92cbb8654309ef83eacfa6b1177ea99b59a7c70d1264c63d28a406c4b213fcf38ab7377e512b7d904dbb9487b
--- a/x11-misc/mate-notification-daemon/files/org.freedesktop.Notifications.service
+++ b/x11-misc/mate-notification-daemon/files/org.freedesktop.Notifications.service
@ -1,3 +0,0 @@
-[D-BUS Service]
-Name=org.freedesktop.Notifications
-Exec=/usr/libexec/mate-notification-daemon
--- a/x11-misc/mate-notification-daemon/mate-notification-daemon-1.20.1.ebuild
+++ b/x11-misc/mate-notification-daemon/mate-notification-daemon-1.20.1.ebuild
@ -1,54 +0,0 @@
-# Copyright 1999-2018 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 ~arm64 x86"
-fi
-
-DESCRIPTION="MATE Notification daemon"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE=""
-
-COMMON_DEPEND="dev-libs/atk:0
-	>=dev-libs/dbus-glib-0.78:0
-	>=dev-libs/glib-2.36:2
-	>=sys-apps/dbus-1:0
-	x11-libs/cairo:0
-	>=x11-libs/gdk-pixbuf-2.22:2
-	>=x11-libs/libnotify-0.7:0
-	x11-libs/libX11:0
-	virtual/libintl:0
-	>=x11-libs/gtk+-3.14:3
-	>=x11-libs/libwnck-3:3
-	>=media-libs/libcanberra-0.4:0[gtk3]
-	!x11-misc/notify-osd:*
-	!x11-misc/qtnotifydaemon:*
-	!x11-misc/notification-daemon:*"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	app-arch/xz-utils:0
-	>=dev-util/intltool-0.50.1:*
-	sys-devel/gettext:*
-	>=sys-devel/libtool-2.2.6:2
-	virtual/pkgconfig:*"
-
-src_configure() {
-	mate_src_configure
-}
-
-src_install() {
-	mate_src_install
-
-	insinto /usr/share/dbus-1/services
-	doins "${FILESDIR}/org.freedesktop.Notifications.service"
-}
--- a/x11-misc/mozo/Manifest
+++ b/x11-misc/mozo/Manifest
@ -1 +0,0 @@
-DIST mozo-1.20.1.tar.xz 175920 BLAKE2B 65c8101249753e14b0375b69ae970c64bc8b782058040f7c9e640d9f250bb47b04303963527a5263e7322e5763a5cbaf9dd87d950ae4eb2ee8ff595b81204318 SHA512 a624abba13971bd3618674ae88097e15a66dd130d7ab03403d72a48582aef9f005fb97d981b1269d8362bdf86b1d13b9efc9faafc1081afa81cc428d11931b7e
--- a/x11-misc/mozo/mozo-1.20.1.ebuild
+++ b/x11-misc/mozo/mozo-1.20.1.ebuild
@ -1,66 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="xml"
-
-inherit python-r1 mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-DESCRIPTION="Mozo menu editor for MATE"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE=""
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	>=dev-python/pygobject-3:3[${PYTHON_USEDEP}]
-	>=mate-base/mate-menus-1.6[introspection,python]
-	x11-libs/gdk-pixbuf:2[introspection]
-	x11-libs/gtk+:3[introspection]
-	virtual/libintl:0
-	!!x11-misc/mate-menu-editor"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.40:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-src_prepare() {
-	mate_src_prepare
-	python_copy_sources
-}
-
-src_configure() {
-	python_foreach_impl run_in_build_dir mate_src_configure \
-		--disable-icon-update
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir default
-}
-
-src_test() {
-	python_foreach_impl run_in_build_dir emake check
-}
-
-src_install() {
-	installing() {
-		mate_src_install
-
-		# Massage shebang to make python_doscript happy
-		sed -e 's:#! '"${PYTHON}:#!/usr/bin/python:" \
-			-i mozo || die
-
-		python_doscript mozo
-	}
-
-	python_foreach_impl run_in_build_dir installing
-}
--- a/x11-terms/mate-terminal/Manifest
+++ b/x11-terms/mate-terminal/Manifest
@ -1 +0,0 @@
-DIST mate-terminal-1.20.1.tar.xz 1475176 BLAKE2B aedea2ed765b507b629e7a9edbe1877b1c26da87d89aed17a87940fc09d19bf7a95f60b066ad27cfa7dd9f680b683ff207e2a970e5c462698a3c5dac085d4323 SHA512 d3feba0ca70d2bfbc2fbaf234a759de23cef594574c9d9a26645e5dc1f32da9f939da967dd04975751b398a1d201f950843bac15402e1902a280e70ad50e6b41
--- a/x11-terms/mate-terminal/mate-terminal-1.20.1.ebuild
+++ b/x11-terms/mate-terminal/mate-terminal-1.20.1.ebuild
@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-DESCRIPTION="The MATE Terminal"
-LICENSE="GPL-3"
-SLOT="0"
-
-IUSE=""
-
-COMMON_DEPEND="dev-libs/atk:0
-	>=dev-libs/glib-2.36:2
-	>=gnome-base/dconf-0.13.4:0
-	x11-libs/gdk-pixbuf:2
-	x11-libs/libICE:0
-	x11-libs/libSM:0
-	x11-libs/libX11:0
-	x11-libs/pango:0
-	>=x11-libs/gtk+-3.14:3[X]
-	>=x11-libs/vte-0.38:2.91"
-
-RDEPEND="${COMMON_DEPEND}
-	>=mate-base/mate-desktop-1.6"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/rarian:0
-	>=app-text/scrollkeeper-dtd-1:1.0
-	app-text/yelp-tools:0
-	>=dev-util/intltool-0.50.1:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
--- a/x11-themes/mate-backgrounds/Manifest
+++ b/x11-themes/mate-backgrounds/Manifest
@ -1 +0,0 @@
-DIST mate-backgrounds-1.20.0.tar.xz 20892008 BLAKE2B 8c2d25090da9ab2c66222a191b1afabfcbc1e49c8ed11a9d1cade5b16881f4187c46c03cf52e1b2c363b7694a4c44fb18705090c082a9ee2c3b4a2675d0992e2 SHA512 6ecf802ad357ea001ebd32481223f62867729c617c4c85f6d3ef1e893f610705c5a72b3257a1fa38e8000b510c1ed60c743472c2045e2af0f4b22ce57ee611de
--- a/x11-themes/mate-backgrounds/mate-backgrounds-1.20.0.ebuild
+++ b/x11-themes/mate-backgrounds/mate-backgrounds-1.20.0.ebuild
@ -1,17 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-DESCRIPTION="A set of backgrounds packaged with the MATE desktop"
-LICENSE="GPL-2"
-SLOT="0"
-
-DEPEND=">=dev-util/intltool-0.35:*
-	sys-devel/gettext:*"
--- a/x11-themes/mate-icon-theme-faenza/Manifest
+++ b/x11-themes/mate-icon-theme-faenza/Manifest
@ -1 +0,0 @@
-DIST mate-icon-theme-faenza-1.20.0.tar.xz 19327552 BLAKE2B ce6162080d2dc1d3476970a17b37e200f3669e4c482b1e257a4b47d8a7329888966edbdf805fb360927b0eece72c4597ee5b4f2a7ee5a429f7908310199e946e SHA512 361de34fde13c6a14fdac5aa1af90aa784f639d64c0bf332c18b580cb6b4d1a10d7d188fa6b19ecda125c8bbb1fc5c63ab1d5e9ae31c512f2ec3eea288aa023d
--- a/x11-themes/mate-icon-theme-faenza/mate-icon-theme-faenza-1.20.0.ebuild
+++ b/x11-themes/mate-icon-theme-faenza/mate-icon-theme-faenza-1.20.0.ebuild
@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm x86"
-fi
-
-DESCRIPTION="Faenza icon theme, that was adapted for MATE desktop"
-LICENSE="GPL-3"
-SLOT="0"
-
-IUSE="minimal"
-
-RDEPEND="x11-themes/hicolor-icon-theme:0
-	!minimal? ( >=x11-themes/mate-icon-theme-${MATE_BRANCH} )"
-
-RESTRICT="binchecks strip"
-
-# https://github.com/mate-desktop/mate-icon-theme-faenza/issues/13
-MATE_FORCE_AUTORECONF=true
-
-src_prepare() {
-	# Remove broken libreoffice icons (dangling symlinks).
-	rm matefaenza/apps/16/*libreoffice* || die
-
-	mate_src_prepare
-}
--- a/x11-themes/mate-icon-theme/Manifest
+++ b/x11-themes/mate-icon-theme/Manifest
@ -1 +0,0 @@
-DIST mate-icon-theme-1.20.1.tar.xz 20804056 BLAKE2B 0121e068dadfd29ecca11927ecb6239939bcdbc77954f0f7a0ee3c69b46b69b2c1e03ce5827c50145591e87818901d22f20b26fe401ab44d5aaf59624a7c1917 SHA512 c09d391dfe6c9be93862ff7983c52fabdb1c3f4dce0b9b3530bcbf81b8d17222e79b3a5af6dea603e9ccd79e047762690733303a62d2174847e73ea44e9954ed
--- a/x11-themes/mate-icon-theme/mate-icon-theme-1.20.1.ebuild
+++ b/x11-themes/mate-icon-theme/mate-icon-theme-1.20.1.ebuild
@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-DESCRIPTION="MATE default icon themes"
-LICENSE="GPL-2"
-SLOT="0"
-
-COMMON_DEPEND=">=x11-themes/hicolor-icon-theme-0.10"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.40:*
-	>=x11-misc/icon-naming-utils-0.8.7:0
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-RESTRICT="binchecks strip"
-
-src_configure() {
-	mate_src_configure --enable-icon-mapping
-}
--- a/x11-themes/mate-themes-meta/mate-themes-meta-3-r3.ebuild
+++ b/x11-themes/mate-themes-meta/mate-themes-meta-3-r3.ebuild
@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} == 9999 ]]; then
-	MATE_THEMES_V=".9999"
-else
-	MATE_THEMES_V="*"
-	KEYWORDS="amd64 ~arm x86"
-fi
-
-DESCRIPTION="Meta package to facilitate easy use of x11-themes/mate-themes"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI=""
-
-LICENSE="metapackage"
-SLOT="0"
-IUSE="gtk2-only"
-
-DEPEND=""
-RDEPEND="|| (
-		gtk2-only? (
-			!!x11-libs/gtk+:3
-			x11-themes/mate-themes:0
-		)
-		(
-			=x11-libs/gtk+-3.22*:3
-			=x11-themes/mate-themes-3.22${MATE_THEMES_V}:0/3.22
-		)
-	)"
--- a/x11-themes/mate-themes/Manifest
+++ b/x11-themes/mate-themes/Manifest
@ -1 +0,0 @@
-DIST mate-themes-3.22.17.tar.xz 6109328 BLAKE2B a212462ae8a8bb3d210686ab25644cfffc4c89a7b3c24554dde3196d9484870cb54dbb9591cf7ea4f8a1dd262a6125c233d2dd0ac7034d76edd0f8106be711dd SHA512 d13defe06533ea91ebe7787fdb560bfc8c0569fc5e21728091abe82acca020dfe53befff5c6edfc5c5462d3d64124114c059a41a57127096aa0582f4dd006f63
--- a/x11-themes/mate-themes/mate-themes-3.22.17.ebuild
+++ b/x11-themes/mate-themes/mate-themes-3.22.17.ebuild
@ -1,58 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools gnome2-utils versionator
-
-MATE_GTK_V="$(get_version_component_range 1-2)"
-MATE_GTK_NV="3.$(( ${MATE_GTK_V#3.} + 1 ))" #variable to allow negation of =$P-1*
-
-if [[ ${PV#${MATE_GTK_V}.} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/mate-desktop/${PN}.git"
-	EGIT_BRANCH="gtk${MATE_GTK_V}"
-else
-	SRC_URI="http://pub.mate-desktop.org/releases/themes/${MATE_GTK_V}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm x86"
-fi
-
-HOMEPAGE="http://mate-desktop.org"
-DESCRIPTION="A set of MATE themes, with sets for users with limited or low vision"
-LICENSE="LGPL-2.1"
-SLOT="0/${MATE_GTK_V}"
-
-COMMON_DEPEND=">=x11-libs/gdk-pixbuf-2:2
-	>=x11-libs/gtk+-2:2
-	!<x11-libs/gtk+-${MATE_GTK_V}:3
-	!>=x11-libs/gtk+-${MATE_GTK_NV}:3
-	>=x11-themes/gtk-engines-2.15.3:2
-	x11-themes/gtk-engines-murrine"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.35:*
-	sys-devel/gettext:*
-	>=sys-devel/autoconf-2.53:*
-	>=x11-misc/icon-naming-utils-0.8.7:0
-	virtual/pkgconfig:*"
-
-RESTRICT="binchecks strip"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
--- a/x11-wm/marco/Manifest
+++ b/x11-wm/marco/Manifest
@ -1,2 +0,0 @@
-DIST marco-1.20.1.tar.xz 1423400 BLAKE2B be945877cba3c420ad5352853d7bbd04c5f999065f44a49e05ebedcd06845ff86683e436df201a6deed2ee2709ef50261df096e06ec42e6e730a22df1774aafc SHA512 3179b9b8c41788c0cdff4e20d1a315bbe7447a6d6622f5dafff0d1251671b4e4f6de84c865460ef26bdc7340d45ee1af09fdf06933050a81c061719c0f11257f
-DIST marco-1.20.2.tar.xz 1380060 BLAKE2B 23ef35b710d93ca6e0c2755f070062527a4bb7eb151c42f3bcea01cd6415277ecec94f507313191a0bbb1f6ac1e0cd675eafc46057f1b9e9b7de484a81fd39a8 SHA512 9e2863e37e43f39477fff7c2e0f49566a34d1b671900681f2e3e773c99ba1c9706e566935d9d2282c1f013dd7ce3c92de7d9b0bf480e0b0e587372d3432d2cc5
--- a/x11-wm/marco/marco-1.20.2.ebuild
+++ b/x11-wm/marco/marco-1.20.2.ebuild
@ -1,75 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE2_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-DESCRIPTION="MATE default window manager"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="startup-notification test xinerama xpresent"
-
-COMMON_DEPEND="
-	dev-libs/atk:0
-	>=dev-libs/glib-2.50:2
-	>=gnome-base/libgtop-2:2=
-	media-libs/libcanberra:0[gtk3]
-	x11-libs/cairo:0
-	>=x11-libs/pango-1.2:0[X]
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.22:3
-	x11-libs/libICE:0
-	x11-libs/libSM:0
-	x11-libs/libX11:0
-	>=x11-libs/libXcomposite-0.3:0
-	x11-libs/libXcursor:0
-	x11-libs/libXdamage:0
-	x11-libs/libXext:0
-	x11-libs/libXfixes:0
-	xpresent? ( x11-libs/libXpresent )
-	x11-libs/libXrandr:0
-	x11-libs/libXrender:0
-	>=x11-libs/startup-notification-0.7:0
-	virtual/libintl:0
-	xinerama? ( x11-libs/libXinerama:0 )
-	!!x11-wm/mate-window-manager"
-
-RDEPEND="${COMMON_DEPEND}
-	gnome-extra/zenity:0
-	>=mate-base/mate-desktop-1.17.0"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/yelp-tools:0
-	>=dev-util/intltool-0.34.90:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*
-	x11-proto/xextproto:0
-	x11-proto/xproto:0
-	test? ( app-text/docbook-xml-dtd:4.5 )
-	xinerama? ( x11-proto/xineramaproto:0 )"
-
-src_configure() {
-	mate_src_configure \
-		--enable-compositor \
-		--enable-render \
-		--enable-shape \
-		--enable-sm \
-		--enable-xsync \
-		$(use_enable startup-notification) \
-		$(use_enable xpresent) \
-		$(use_enable xinerama)
-
-}
-
-src_install() {
-	mate_src_install
-	dodoc {,doc/}*.txt
-}
				`@ -1 +0,0 @@`
				`DIST engrampa-1.20.1.tar.xz 1446112 BLAKE2B 51ab835f9d79a8934195103c97e067ff138d8d945ec69c1562de65bff812f06fce7dfcbbba167ed0564a4fbdb0066ddebcd1d7239dcac7373b89f60df0ca112a SHA512 750c2cb54fced56196d61abdb05dab86b08f4ef4c485c53ec52f11bf397257c832a7f94b853e43d4222b9bad35c9d6188bd347012139424b69430824ddcc72eb`
				`@ -1 +0,0 @@`
				`DIST pluma-1.20.2.tar.xz 3504720 BLAKE2B 350f14f2c2d75bdc51d79079907fc792746327adb9bf87cbccdbac67774e8d7102a7bb525d59f3c2aed98606aae5f72f49474382a6b9023bb7773face691c0f8 SHA512 36ac5aca6661c8f273fd9ff1a981fdc6138296ed9b6ba280a2f97ca3f925cdb1bdfda890a35f028816b3c076f18f1fc2d0a02b7101e53af8b494f723fc0afeb7`
				`@ -1 +0,0 @@`
				`DIST atril-1.20.2.tar.xz 1773132 BLAKE2B d02a0e44e99eeb840050a7bb1f51f4fd465804e560cbe3c6ea679a7e773039e4aadcbf6883ba371cdcf63dcd95cd5d66fa3876e16e74e9b5e2ebc7f7c2f306ba SHA512 b2d960b6e05e3c9c4939d4ae942da0aec06317cac5e31fae7b39d503274eb4e51a8ea8d63b2802bfeffd4cef09ddf4aed993bbd9bb9cd023bacad55499eced26`
				`@ -1 +0,0 @@`
				`DIST libmateweather-1.20.1.tar.xz 3379644 BLAKE2B 19837dfefc92ebf98d4682f560857ced336caf695c6c4b621b9f051c423a8e658c0aa7426b840df736572b9af07e2f07537e94b27e2164a9720b5bf81754ee27 SHA512 8cf1d25cd1e456975c0228b1a57f66a8a3a94c22321eee196fdcb0eaa64ac9d97de50b2b5d6f974c77110769a687b89f90fd6391db5e3ef0031349dc8a47c5c4`
				`@ -1 +0,0 @@`
				`DIST python-caja-1.20.1.tar.xz 285008 BLAKE2B 83050cc51e98d79d019a824f2fd28c5ddd7cc84ebb310f40acb82cf598279bd7753ec80d2b65aa0974f5b1b0a4c8d757e64ccbab52b1b149f13bfa69e21b61ef SHA512 3b0c97b160f6af6552ab2bebb5a25b823a18aee241b512cebb24ab3089eb863714cbabeaaf722c8ffa8a6ed375b4d302f269e4b3d5d5b8ec329d1aa494a13f1f`
				`@ -1 +0,0 @@`
				`DIST caja-1.20.2.tar.xz 3557280 BLAKE2B c164885448034b8805725c524aad87318efb23fcd6050f736f2b769b5348b643cc782e283481d6fcc9828386f289d3618347c71fd28e045955b9e6270b57ddb3 SHA512 3285f6dfcf7aa60cdca25490e1dd99aebf3946b74d7c160477116870718ab46d2b7534d1d53371bc0212e5bdbe6638d9b081e8b9086678060b1648374233addb`
				`@ -1 +0,0 @@`
				`DIST libmatekbd-1.20.2.tar.xz 372452 BLAKE2B be79862aad4ca04e76c2496f06c166bf06674f47dd1b686432a667f765fd1e71fa1717224a989f2db19d0a006264b989db55d3f8daf5f06a22c2861570db16b1 SHA512 14d332ea4c90fe66f602a3484ea2c140c8ec280874dc7fa9e9e0a344e8e94e9713afa0e45f901ecf6e033b8072055e2c29a4d68164c868c63a052307acd54250`
				`@ -1 +0,0 @@`
				`DIST mate-common-1.20.0.tar.xz 73108 BLAKE2B d4aa2d1b9f0dce4346e5a62f519390b1fb56e44a0e59bd74abb2e0728b3f97ea8a8296d6a72ef894b7f95f18218b35f9653dcc4d45bcff8a8e365ef088b25530 SHA512 78fed107087f21f30a87b2fd635479f31162f1b9e7ae2f9c02146af275d7662a4ea466da2a049c35d726073d3a0bd9a043818b332b93670334c59aef36bc3b8a`
				`@ -1 +0,0 @@`
				`DIST mate-control-center-1.20.3.tar.xz 1354520 BLAKE2B 2a71cb81b4df4d0550c667e96cc898123c1d26b7d8a8e97d2ef459b2c6ff7b34e917b45d40b17c4bd9effc9bfffb9904fee31bda3a1c3a6a2a5f0c9a156314d4 SHA512 025dc9271c34794fe24453c5ce044612cdc0b388b02d59085a5133a6bbe9df12d5488d24d576c44c99bf23850615b5f2507c5b8e5d383dac6b614746bd19db07`
				`@ -1 +0,0 @@`
				`DIST mate-desktop-1.20.3.tar.xz 937876 BLAKE2B 8b70774c0577a89b36b8c44b3520a5437da7b6216f1437ef2e282c21b692bddb2027ed2e277f7fc2eb641ba8d8d801c5c3797e2d84a4cb7fa5a24bce6859fedb SHA512 126eca6cec6d7d9d672396562bb856a70c7b5fd507dd8629a83e950b2517bd3f900af08cf1a0a61c190fe162104f09991f8bd9f590d629816af5f694942caff1`