[gentoo-commits] proj/gentoo-mate:master commit in: mate-base/mate/

["Adam Feldman" <np-hardass@gentoo.org>]

commit:     f738870d4f206f81ccc15fcc541ce35cafed8241
Author:     Adam Feldman <NP-Hardass <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 31 18:51:45 2020 +0000
Commit:     Adam Feldman <np-hardass <AT> gentoo <DOT> org>
CommitDate: Thu Apr  9 22:49:26 2020 +0000
URL:        https://gitweb.gentoo.org/proj/gentoo-mate.git/commit/?id=f738870d

mate-base/mate: Drop old, sync with Gentoo

Package-Manager: Portage-2.3.96, Repoman-2.3.21
Signed-off-by: Adam Feldman <NP-Hardass <AT> gentoo.org>

 mate-base/mate/mate-1.12-r1.ebuild | 85 --------------------------------------
 mate-base/mate/mate-1.14.ebuild    | 84 -------------------------------------
 mate-base/mate/mate-1.16.ebuild    | 84 -------------------------------------
 mate-base/mate/mate-1.18.ebuild    | 84 -------------------------------------
 mate-base/mate/mate-1.22.ebuild    | 84 +++++++++++++++++++++++++++++++++++++
 mate-base/mate/mate-1.24.ebuild    | 85 ++++++++++++++++++++++++++++++++++++++
 mate-base/mate/mate-9999.ebuild    | 84 -------------------------------------
 mate-base/mate/metadata.xml        |  1 -
 8 files changed, 169 insertions(+), 422 deletions(-)

diff --git a/mate-base/mate/mate-1.12-r1.ebuild b/mate-base/mate/mate-1.12-r1.ebuild
deleted file mode 100644
index de459db..0000000
--- a/mate-base/mate/mate-1.12-r1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} == 9999 ]]; then
-	MATE_BRANCH=9999
-	MATE_THEMES_V=9999
-else
-	inherit versionator
-	MATE_BRANCH="$(get_version_component_range 1-2)"
-	MATE_THEMES_V=3
-	KEYWORDS="amd64 ~arm x86"
-fi
-
-SRC_URI=""
-DESCRIPTION="Meta ebuild for MATE, a traditional desktop environment"
-HOMEPAGE="http://mate-desktop.org"
-
-LICENSE="metapackage"
-
-SLOT="0"
-IUSE="+base -bluetooth gtk3 help +notification +themes +extras"
-
-S="${WORKDIR}"
-
-RDEPEND="
-	=mate-base/mate-desktop-${MATE_BRANCH}*:0[gtk3(-)?]
-	=mate-base/mate-menus-${MATE_BRANCH}*:0
-	=mate-base/mate-panel-${MATE_BRANCH}*:0[gtk3(-)?]
-	=mate-base/mate-session-manager-${MATE_BRANCH}*:0[gtk3(-)?]
-	=mate-base/mate-settings-daemon-${MATE_BRANCH}*:0[gtk3(-)?]
-	=x11-wm/marco-${MATE_BRANCH}*:0[gtk3(-)?]
-	base? (
-		=mate-base/caja-${MATE_BRANCH}*:0[gtk3(-)?]
-		=mate-base/mate-applets-meta-${MATE_BRANCH}*:0[gtk3(-)?]
-		=mate-base/mate-control-center-${MATE_BRANCH}*:0[gtk3(-)?]
-		=mate-extra/mate-media-${MATE_BRANCH}*:0[gtk3(-)?]
-		=x11-misc/mozo-${MATE_BRANCH}*:0[gtk3(-)?]
-		=x11-terms/mate-terminal-${MATE_BRANCH}*:0[gtk3(-)?]
-	)
-	bluetooth? ( net-wireless/blueman:0 )
-	themes? (
-		=x11-themes/mate-backgrounds-${MATE_BRANCH}*:0
-		=x11-themes/mate-icon-theme-${MATE_BRANCH}*:0
-		>=x11-themes/mate-themes-meta-${MATE_THEMES_V}:0
-	)
-	extras? (
-		=app-arch/engrampa-${MATE_BRANCH}*:0[gtk3(-)?]
-		=app-editors/pluma-${MATE_BRANCH}*:0[gtk3(-)?]
-		=app-text/atril-${MATE_BRANCH}*:0[gtk3(-)?]
-		gnome-extra/gnome-calculator:0
-		=mate-extra/caja-extensions-${MATE_BRANCH}*:0[gtk3(-)?]
-		=mate-extra/mate-netbook-${MATE_BRANCH}*:0[gtk3(-)?]
-		=mate-extra/mate-power-manager-${MATE_BRANCH}*:0[gtk3(-)?]
-		=mate-extra/mate-screensaver-${MATE_BRANCH}*:0[gtk3(-)?]
-		=mate-extra/mate-system-monitor-${MATE_BRANCH}*:0[gtk3(-)?]
-		=mate-extra/mate-utils-${MATE_BRANCH}*:0[gtk3(-)?]
-		=media-gfx/eom-${MATE_BRANCH}*:0[gtk3(-)?]
-		=net-analyzer/mate-netspeed-${MATE_BRANCH}*:0[gtk3(-)?]
-		sys-apps/gnome-disk-utility:0
-	)
-	help? (
-		gnome-extra/yelp:0
-		=mate-extra/mate-user-guide-${MATE_BRANCH}*:0
-	)
-"
-
-PDEPEND="
-	notification? ( =x11-misc/mate-notification-daemon-${MATE_BRANCH}*:0[gtk3(-)?] )
-	virtual/notification-daemon:0"
-
-pkg_postinst() {
-	elog "For installation, usage and troubleshooting details regarding MATE;"
-	elog "read more about it at Gentoo Wiki: https://wiki.gentoo.org/wiki/MATE"
-	elog ""
-	if ! has_version x11-misc/mate-notification-daemon; then
-		elog "If you experience any issues with notifications, please try using"
-		elog "x11-misc/mate-notification-daemon instead your currently installed daemon"
-		elog ""
-	fi
-	elog "Some packages that are not included in this meta-package but may be of interest:"
-	elog "		mate-extra/caja-dropbox"
-	elog "		mate-extra/mate-user-share"
-}

diff --git a/mate-base/mate/mate-1.14.ebuild b/mate-base/mate/mate-1.14.ebuild
deleted file mode 100644
index b889e58..0000000
--- a/mate-base/mate/mate-1.14.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} == 9999 ]]; then
-	MATE_BRANCH=9999
-	MATE_THEMES_V=9999
-else
-	inherit versionator
-	MATE_BRANCH="$(get_version_component_range 1-2)"
-	MATE_THEMES_V=3
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-SRC_URI=""
-DESCRIPTION="Meta ebuild for MATE, a traditional desktop environment"
-HOMEPAGE="http://mate-desktop.org"
-
-LICENSE="metapackage"
-
-SLOT="0"
-IUSE="+base -bluetooth gtk3 help +notification +themes +extras"
-
-S="${WORKDIR}"
-
-RDEPEND="
-	=mate-base/mate-desktop-${MATE_BRANCH}*:0[gtk3(-)?]
-	=mate-base/mate-menus-${MATE_BRANCH}*:0
-	=mate-base/mate-panel-${MATE_BRANCH}*:0[gtk3(-)?]
-	=mate-base/mate-session-manager-${MATE_BRANCH}*:0[gtk3(-)?]
-	=mate-base/mate-settings-daemon-${MATE_BRANCH}*:0[gtk3(-)?]
-	=x11-wm/marco-${MATE_BRANCH}*:0[gtk3(-)?]
-	base? (
-		=mate-base/caja-${MATE_BRANCH}*:0[gtk3(-)?]
-		=mate-base/mate-applets-meta-${MATE_BRANCH}*:0[gtk3(-)?]
-		=mate-base/mate-control-center-${MATE_BRANCH}*:0[gtk3(-)?]
-		=mate-extra/mate-media-${MATE_BRANCH}*:0[gtk3(-)?]
-		=x11-misc/mozo-${MATE_BRANCH}*:0
-		=x11-terms/mate-terminal-${MATE_BRANCH}*:0[gtk3(-)?]
-	)
-	bluetooth? ( net-wireless/blueman:0 )
-	themes? (
-		=x11-themes/mate-backgrounds-${MATE_BRANCH}*:0
-		=x11-themes/mate-icon-theme-${MATE_BRANCH}*:0
-		>=x11-themes/mate-themes-meta-${MATE_THEMES_V}:0
-	)
-	extras? (
-		=app-arch/engrampa-${MATE_BRANCH}*:0[gtk3(-)?]
-		=app-editors/pluma-${MATE_BRANCH}*:0[gtk3(-)?]
-		=app-text/atril-${MATE_BRANCH}*:0[gtk3(-)?]
-		gnome-extra/gnome-calculator:0
-		=mate-extra/caja-extensions-${MATE_BRANCH}*:0[gtk3(-)?]
-		=mate-extra/mate-netbook-${MATE_BRANCH}*:0[gtk3(-)?]
-		=mate-extra/mate-power-manager-${MATE_BRANCH}*:0[gtk3(-)?]
-		=mate-extra/mate-screensaver-${MATE_BRANCH}*:0[gtk3(-)?]
-		=mate-extra/mate-system-monitor-${MATE_BRANCH}*:0
-		=mate-extra/mate-utils-${MATE_BRANCH}*:0[gtk3(-)?]
-		=media-gfx/eom-${MATE_BRANCH}*:0[gtk3(-)?]
-		sys-apps/gnome-disk-utility:0
-	)
-	help? (
-		gnome-extra/yelp:0
-		=mate-extra/mate-user-guide-${MATE_BRANCH}*:0
-	)
-"
-
-PDEPEND="
-	notification? ( =x11-misc/mate-notification-daemon-${MATE_BRANCH}*:0[gtk3(-)?] )
-	virtual/notification-daemon:0"
-
-pkg_postinst() {
-	elog "For installation, usage and troubleshooting details regarding MATE;"
-	elog "read more about it at Gentoo Wiki: https://wiki.gentoo.org/wiki/MATE"
-	elog ""
-	if ! has_version x11-misc/mate-notification-daemon; then
-		elog "If you experience any issues with notifications, please try using"
-		elog "x11-misc/mate-notification-daemon instead your currently installed daemon"
-		elog ""
-	fi
-	elog "Some packages that are not included in this meta-package but may be of interest:"
-	elog "		mate-extra/caja-dropbox"
-	elog "		mate-extra/mate-user-share"
-}

diff --git a/mate-base/mate/mate-1.16.ebuild b/mate-base/mate/mate-1.16.ebuild
deleted file mode 100644
index 131f68c..0000000
--- a/mate-base/mate/mate-1.16.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} == 9999 ]]; then
-	MATE_BRANCH=9999
-	MATE_THEMES_V=9999
-else
-	inherit versionator
-	MATE_BRANCH="$(get_version_component_range 1-2)"
-	MATE_THEMES_V=3
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-SRC_URI=""
-DESCRIPTION="Meta ebuild for MATE, a traditional desktop environment"
-HOMEPAGE="http://mate-desktop.org"
-
-LICENSE="metapackage"
-
-SLOT="0"
-IUSE="+base -bluetooth gtk3 help +notification +themes +extras"
-
-S="${WORKDIR}"
-
-RDEPEND="
-	=mate-base/mate-desktop-${MATE_BRANCH}*:0[gtk3(-)?]
-	=mate-base/mate-menus-${MATE_BRANCH}*:0
-	=mate-base/mate-panel-${MATE_BRANCH}*:0[gtk3(-)?]
-	=mate-base/mate-session-manager-${MATE_BRANCH}*:0
-	=mate-base/mate-settings-daemon-${MATE_BRANCH}*:0[gtk3(-)?]
-	=x11-wm/marco-${MATE_BRANCH}*:0[gtk3(-)?]
-	base? (
-		=mate-base/caja-${MATE_BRANCH}*:0[gtk3(-)?]
-		=mate-base/mate-applets-meta-${MATE_BRANCH}*:0[gtk3(-)?]
-		=mate-base/mate-control-center-${MATE_BRANCH}*:0[gtk3(-)?]
-		=mate-extra/mate-media-${MATE_BRANCH}*:0[gtk3(-)?]
-		=x11-misc/mozo-${MATE_BRANCH}*:0
-		=x11-terms/mate-terminal-${MATE_BRANCH}*:0
-	)
-	bluetooth? ( net-wireless/blueman:0 )
-	themes? (
-		=x11-themes/mate-backgrounds-${MATE_BRANCH}*:0
-		=x11-themes/mate-icon-theme-${MATE_BRANCH}*:0
-		>=x11-themes/mate-themes-meta-${MATE_THEMES_V}:0
-	)
-	extras? (
-		=app-arch/engrampa-${MATE_BRANCH}*:0
-		=app-editors/pluma-${MATE_BRANCH}*:0[gtk3(-)?]
-		=app-text/atril-${MATE_BRANCH}*:0[gtk3(-)?]
-		gnome-extra/gnome-calculator:0
-		=mate-extra/caja-extensions-${MATE_BRANCH}*:0[gtk3(-)?]
-		=mate-extra/mate-netbook-${MATE_BRANCH}*:0[gtk3(-)?]
-		=mate-extra/mate-power-manager-${MATE_BRANCH}*:0[gtk3(-)?]
-		=mate-extra/mate-screensaver-${MATE_BRANCH}*:0[gtk3(-)?]
-		=mate-extra/mate-system-monitor-${MATE_BRANCH}*:0
-		=mate-extra/mate-utils-${MATE_BRANCH}*:0[gtk3(-)?]
-		=media-gfx/eom-${MATE_BRANCH}*:0[gtk3(-)?]
-		sys-apps/gnome-disk-utility:0
-	)
-	help? (
-		gnome-extra/yelp:0
-		=mate-extra/mate-user-guide-${MATE_BRANCH}*:0
-	)
-"
-
-PDEPEND="
-	notification? ( =x11-misc/mate-notification-daemon-${MATE_BRANCH}*:0 )
-	virtual/notification-daemon:0"
-
-pkg_postinst() {
-	elog "For installation, usage and troubleshooting details regarding MATE;"
-	elog "read more about it at Gentoo Wiki: https://wiki.gentoo.org/wiki/MATE"
-	elog ""
-	if ! has_version x11-misc/mate-notification-daemon; then
-		elog "If you experience any issues with notifications, please try using"
-		elog "x11-misc/mate-notification-daemon instead your currently installed daemon"
-		elog ""
-	fi
-	elog "Some packages that are not included in this meta-package but may be of interest:"
-	elog "		mate-extra/caja-dropbox"
-	elog "		mate-extra/mate-user-share"
-}

diff --git a/mate-base/mate/mate-1.18.ebuild b/mate-base/mate/mate-1.18.ebuild
deleted file mode 100644
index a92bd81..0000000
--- a/mate-base/mate/mate-1.18.ebuild
+++ /dev/null
@@ -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"
-}

diff --git a/mate-base/mate/mate-1.22.ebuild b/mate-base/mate/mate-1.22.ebuild
new file mode 100644
index 0000000..a6f8fcb
--- /dev/null
+++ b/mate-base/mate/mate-1.22.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2020 Gentoo Authors
+# 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 eapi7-ver
+	MATE_BRANCH="$(ver_cut 1-2)"
+	MATE_THEMES_V=3
+	KEYWORDS="amd64 ~arm ~arm64 x86"
+fi
+
+SRC_URI=""
+DESCRIPTION="Meta ebuild for MATE, a traditional desktop environment"
+HOMEPAGE="https://mate-desktop.org"
+
+LICENSE="metapackage"
+
+SLOT="0"
+IUSE="+base -bluetooth help +notification +themes +extras"
+
+S="${WORKDIR}"
+
+RDEPEND="
+	=mate-base/mate-desktop-${MATE_BRANCH}*
+	=mate-base/mate-menus-${MATE_BRANCH}*
+	=mate-base/mate-panel-${MATE_BRANCH}*
+	=mate-base/mate-session-manager-${MATE_BRANCH}*
+	=mate-base/mate-settings-daemon-${MATE_BRANCH}*
+	=x11-wm/marco-${MATE_BRANCH}*
+	base? (
+		=mate-base/caja-${MATE_BRANCH}*
+		=mate-base/mate-applets-meta-${MATE_BRANCH}*
+		=mate-base/mate-control-center-${MATE_BRANCH}*
+		=mate-extra/mate-media-${MATE_BRANCH}*
+		=x11-misc/mozo-${MATE_BRANCH}*
+		=x11-terms/mate-terminal-${MATE_BRANCH}*
+	)
+	bluetooth? ( net-wireless/blueman )
+	themes? (
+		=x11-themes/mate-backgrounds-${MATE_BRANCH}*
+		=x11-themes/mate-icon-theme-${MATE_BRANCH}*
+		>=x11-themes/mate-themes-meta-${MATE_THEMES_V}
+	)
+	extras? (
+		=app-arch/engrampa-${MATE_BRANCH}*
+		=app-editors/pluma-${MATE_BRANCH}*
+		=app-text/atril-${MATE_BRANCH}*
+		=mate-extra/caja-extensions-${MATE_BRANCH}*
+		=mate-extra/mate-calc-${MATE_BRANCH}*
+		=mate-extra/mate-netbook-${MATE_BRANCH}*
+		=mate-extra/mate-power-manager-${MATE_BRANCH}*
+		=mate-extra/mate-screensaver-${MATE_BRANCH}*
+		=mate-extra/mate-system-monitor-${MATE_BRANCH}*
+		=mate-extra/mate-utils-${MATE_BRANCH}*
+		=media-gfx/eom-${MATE_BRANCH}*
+		sys-apps/gnome-disk-utility
+	)
+	help? (
+		gnome-extra/yelp
+		=mate-extra/mate-user-guide-${MATE_BRANCH}*
+	)
+"
+
+PDEPEND="
+	notification? ( =x11-misc/mate-notification-daemon-${MATE_BRANCH}* )
+	virtual/notification-daemon:0"
+
+pkg_postinst() {
+	elog "For installation, usage and troubleshooting details regarding MATE;"
+	elog "read more about it at Gentoo Wiki: https://wiki.gentoo.org/wiki/MATE"
+	elog ""
+	if ! has_version x11-misc/mate-notification-daemon; then
+		elog "If you experience any issues with notifications, please try using"
+		elog "x11-misc/mate-notification-daemon instead your currently installed daemon"
+		elog ""
+	fi
+	elog "Some packages that are not included in this meta-package but may be of interest:"
+	elog "		mate-extra/caja-dropbox"
+	elog "		mate-extra/mate-user-share"
+}

diff --git a/mate-base/mate/mate-1.24.ebuild b/mate-base/mate/mate-1.24.ebuild
new file mode 100644
index 0000000..65b6fec
--- /dev/null
+++ b/mate-base/mate/mate-1.24.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2020 Gentoo Authors
+# 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 eapi7-ver
+	MATE_BRANCH="$(ver_cut 1-2)"
+	MATE_THEMES_V=3
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+SRC_URI=""
+DESCRIPTION="Meta ebuild for MATE, a traditional desktop environment"
+HOMEPAGE="https://mate-desktop.org"
+
+LICENSE="metapackage"
+
+SLOT="0"
+IUSE="+base -bluetooth help +notification +themes +extras"
+
+S="${WORKDIR}"
+
+RDEPEND="
+	=mate-base/mate-desktop-${MATE_BRANCH}*
+	=mate-base/mate-menus-${MATE_BRANCH}*
+	=mate-base/mate-panel-${MATE_BRANCH}*
+	=mate-base/mate-session-manager-${MATE_BRANCH}*
+	=mate-base/mate-settings-daemon-${MATE_BRANCH}*
+	=x11-wm/marco-${MATE_BRANCH}*
+	base? (
+		=mate-base/caja-${MATE_BRANCH}*
+		=mate-base/mate-applets-meta-${MATE_BRANCH}*
+		=mate-base/mate-control-center-${MATE_BRANCH}*
+		=mate-extra/mate-media-${MATE_BRANCH}*
+		=x11-misc/mozo-${MATE_BRANCH}*
+		=x11-terms/mate-terminal-${MATE_BRANCH}*
+	)
+	bluetooth? ( net-wireless/blueman )
+	themes? (
+		=x11-themes/mate-backgrounds-${MATE_BRANCH}*
+		=x11-themes/mate-icon-theme-${MATE_BRANCH}*
+		>=x11-themes/mate-themes-meta-${MATE_THEMES_V}
+	)
+	extras? (
+		=app-arch/engrampa-${MATE_BRANCH}*
+		=app-editors/pluma-${MATE_BRANCH}*
+		=app-text/atril-${MATE_BRANCH}*
+		=mate-extra/caja-extensions-${MATE_BRANCH}*
+		=mate-extra/mate-calc-${MATE_BRANCH}*
+		=mate-extra/mate-netbook-${MATE_BRANCH}*
+		=mate-extra/mate-power-manager-${MATE_BRANCH}*
+		=mate-extra/mate-screensaver-${MATE_BRANCH}*
+		=mate-extra/mate-system-monitor-${MATE_BRANCH}*
+		=mate-extra/mate-utils-${MATE_BRANCH}*
+		=media-gfx/eom-${MATE_BRANCH}*
+	)
+	help? (
+		gnome-extra/yelp
+		=mate-extra/mate-user-guide-${MATE_BRANCH}*
+	)
+"
+
+PDEPEND="
+	notification? ( =x11-misc/mate-notification-daemon-${MATE_BRANCH}* )
+	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"
+	elog "		mate-extra/caja-admin"
+	elog "		mate-extra/caja-hide"
+}

diff --git a/mate-base/mate/mate-9999.ebuild b/mate-base/mate/mate-9999.ebuild
deleted file mode 100644
index 0a25a2b..0000000
--- a/mate-base/mate/mate-9999.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} == 9999 ]]; then
-	MATE_BRANCH=9999
-	MATE_THEMES_V=9999
-else
-	inherit versionator
-	MATE_BRANCH="$(get_version_component_range 1-2)"
-	MATE_THEMES_V=3
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-SRC_URI=""
-DESCRIPTION="Meta ebuild for MATE, a traditional desktop environment"
-HOMEPAGE="http://mate-desktop.org"
-
-LICENSE="metapackage"
-
-SLOT="0"
-IUSE="+base -bluetooth help +notification +themes +extras"
-
-S="${WORKDIR}"
-
-RDEPEND="
-	=mate-base/mate-desktop-${MATE_BRANCH}*:0
-	=mate-base/mate-menus-${MATE_BRANCH}*:0
-	=mate-base/mate-panel-${MATE_BRANCH}*:0
-	=mate-base/mate-session-manager-${MATE_BRANCH}*:0
-	=mate-base/mate-settings-daemon-${MATE_BRANCH}*:0
-	=x11-wm/marco-${MATE_BRANCH}*:0
-	base? (
-		=mate-base/caja-${MATE_BRANCH}*:0
-		=mate-base/mate-applets-meta-${MATE_BRANCH}*:0
-		=mate-base/mate-control-center-${MATE_BRANCH}*:0
-		=mate-extra/mate-media-${MATE_BRANCH}*:0
-		=x11-misc/mozo-${MATE_BRANCH}*:0
-		=x11-terms/mate-terminal-${MATE_BRANCH}*:0
-	)
-	bluetooth? ( net-wireless/blueman:0 )
-	themes? (
-		=x11-themes/mate-backgrounds-${MATE_BRANCH}*:0
-		=x11-themes/mate-icon-theme-${MATE_BRANCH}*:0
-		>=x11-themes/mate-themes-meta-${MATE_THEMES_V}:0
-	)
-	extras? (
-		=app-arch/engrampa-${MATE_BRANCH}*:0
-		=app-editors/pluma-${MATE_BRANCH}*:0
-		=app-text/atril-${MATE_BRANCH}*:0
-		=mate-extra/caja-extensions-${MATE_BRANCH}*:0
-		=mate-extra/mate-calc-${MATE_BRANCH}*:0
-		=mate-extra/mate-netbook-${MATE_BRANCH}*:0
-		=mate-extra/mate-power-manager-${MATE_BRANCH}*:0
-		=mate-extra/mate-screensaver-${MATE_BRANCH}*:0
-		=mate-extra/mate-system-monitor-${MATE_BRANCH}*:0
-		=mate-extra/mate-utils-${MATE_BRANCH}*:0
-		=media-gfx/eom-${MATE_BRANCH}*:0
-		sys-apps/gnome-disk-utility:0
-	)
-	help? (
-		gnome-extra/yelp:0
-		=mate-extra/mate-user-guide-${MATE_BRANCH}*:0
-	)
-"
-
-PDEPEND="
-	notification? ( =x11-misc/mate-notification-daemon-${MATE_BRANCH}*:0 )
-	virtual/notification-daemon:0"
-
-pkg_postinst() {
-	elog "For installation, usage and troubleshooting details regarding MATE;"
-	elog "read more about it at Gentoo Wiki: https://wiki.gentoo.org/wiki/MATE"
-	elog ""
-	if ! has_version x11-misc/mate-notification-daemon; then
-		elog "If you experience any issues with notifications, please try using"
-		elog "x11-misc/mate-notification-daemon instead your currently installed daemon"
-		elog ""
-	fi
-	elog "Some packages that are not included in this meta-package but may be of interest:"
-	elog "		mate-extra/caja-dropbox"
-	elog "		mate-extra/mate-user-share"
-}

diff --git a/mate-base/mate/metadata.xml b/mate-base/mate/metadata.xml
index 0977780..da90dca 100644
--- a/mate-base/mate/metadata.xml
+++ b/mate-base/mate/metadata.xml
@@ -10,7 +10,6 @@
 			recommended for the most common usage; for example, this installs
 			the file manager. Disable this and other USE flags if you want a
 			more minimal MATE Desktop.</flag>
-		<flag name="gtk3">Build all of MATE DE with GTK+3 instead of GTK+2</flag>
 		<flag name="notification">Force notification daemon to default to MATE's
 			notification daemon. Enabled by default. Disable if it causes conflicts
 			with other installed desktop environments.</flag>