gentoo resync : 07.10.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-10-07 11:03:14 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-10-07 11:03:14 +0100
commit: 957235cf19a691360c720f7913672adda4258ed0 (patch)
tree: 812bba7928f4293ead05a7ee9c1ac39c5ef9f12e /mate-base
parent: 62f67115b5c46134c34f88f4b1cbdacc19384c0a (diff)
69 files changed, 10 insertions, 3804 deletions
diff --git a/mate-base/Manifest.gz b/mate-base/Manifest.gz
index 3bebff54fa77..581cc4b77118 100644
--- a/mate-base/Manifest.gz
+++ b/mate-base/Manifest.gz
diff --git a/mate-base/caja/Manifest b/mate-base/caja/Manifest
index b882198159fa..f330596ee4cd 100644
--- a/mate-base/caja/Manifest
+++ b/mate-base/caja/Manifest
@@ -1,9 +1,3 @@
-DIST caja-1.12.7.tar.xz 3645820 BLAKE2B 75f76841b6a14aff27521d9a8db40f5ebfa536a10c727a272439c1ea8d54c9cba191eedcbdf2b8af42c92cd30f4f4b300bc159e3813239e6addd5a11a557945b SHA512 32761370cc419ab8d8f815a291782d1ce380d04bf2450dbcea9d0f17d91a1c0b9a487a67a51a0c769a5fcb11091638a7b60e27b28f3148899ba44fb6feb313da
-DIST caja-1.14.2.tar.xz 3560252 BLAKE2B 6fc45445c279085276a55f718f809db9813fc6602b45018487529a85176915fef5713492448b55703355e422da47d23b60365de1a675403d21b0a3290cd2fc00 SHA512 ef0c42e26fbeb2a2296c67fd0a1f59d18b104ba818761600dec2ab571fbd5a1d659471105b97a9fcd7b0e16afa1dfdf860decad1f65b299964017932f7dfdfbc
-DIST caja-1.16.6.tar.xz 3511140 BLAKE2B 88f965d89ecd027d76c64143d99dd0820f338aa2e6260702eca0f3ec0893fddddd0fffc26e2e678973ed12e27e0e3b9126490d845178d779341c0ddcd18f008b SHA512 21553b44e97f3d294996de59af151471928d0153234f986c0a3cd639ce0661eba5182975d3f03915f7e5ade72266837c9ba5747d02527b65f74f8e0ea6471fb0
 DIST caja-1.18.5.tar.xz 3528228 BLAKE2B c39d7ef97de44c3f57fe622f71291e607cb17b10bebb20e19885413d67d0fccc6e5733739c836b0babbf45c51a0026f1559e7c1ed9656be0ee6b960363474773 SHA512 44bc85e33937f1816cddd78bf72db38b4b43e549cb2680b5d73d252699e9b5d1aace27271729ae310cb9d4f892474164140782713a6fa9f408c78c1b4f0edd73
-EBUILD caja-1.12.7-r2.ebuild 2170 BLAKE2B 42053624182ca2de4c91f5a7ca0a4d2196c0508705b93aab7665ba3fe13f0cd40f6c9ad219f1b97be001446544b4a89507905f5679070cecef54ec8e1a525bd9 SHA512 88a39a9219ecdf4d56f2f03ec0108499f210a8bd85437b698905341df8ef48713a9b796d682f7da7edcda2d2c7f55a6940a32e45b6d75760d78824d9cc4ebbf7
-EBUILD caja-1.14.2.ebuild 2204 BLAKE2B c9cd0c103c2340a8a3ea2a7065017b3625b79f603f7d41fe7d24ea39f7cb03e8f7bdaf3130e0e0a62cffb742cc9a2be232891b2e7a4772a4bfc1d30c22e81919 SHA512 79245d5d02007280262641d001cb545de2bcd5427b02c9179005feb8629031003f4c3f76ba2ec5390a01eaac3d6778ca1466f3567d7fb39664d5fbf121f83500
-EBUILD caja-1.16.6.ebuild 2207 BLAKE2B 8506a9bd9dab659f05ad9e3d7230f5a4eb436203a3b6d3b6fc3d43ae04af7c6eff602d5d929fea0f5b601f2e3bc67c87cc46f59e2b0f46623e4c261db2952683 SHA512 a5aa456c6fb6b89ff7618baa7844c2bbba0feea51c830dd7d27b5438f5a8f737910ff8a8852eef220ec7d699810d03ee61671541b5b114ca6b637a77865d39c6
 EBUILD caja-1.18.5.ebuild 2070 BLAKE2B 0a53984070a8d2f3f67b695301cc71689966bb8d0f0a5d4e31f07d48a6fbdad47b73077adfb8fef3678a06c3b27d41e5e1db0ee68bf8e9127a480564fa84b057 SHA512 587350b7071d903e33e4d23989d48c0c870b103b9d30ef4f13335c83eac9960978470aee18cc2b2b3ab2fa651fd1d232458335a5faa3b89524eedd6aa3e834d8
-MISC metadata.xml 682 BLAKE2B e64e762f92934cacb28463f366ba5e79514fa609445f0524097de46f4983e40b129dfeccc05d37e9be2ff1cd30e4c900579d8cc1a40e6fa35b3b9b4793676e99 SHA512 731fdad4d4e0dd3c862df5dfbbc48817cd434c9c7fca9a5b71d6ccc844caaea871128774f4bc69acd0a0197746870b3a6353dfa1ba06f55e0841b616db7860e1
+MISC metadata.xml 621 BLAKE2B a717b23dad86bcba48b97bec310d1dfb161a3c9ab051e84408f08409c45b1fad5fed38af6af2f75a54e3c29cf635ce5843d54af60a3ad22ed74fbafa0d8fab59 SHA512 95daee371a545e58bcf73daad3261589442121c6f6216d45fcb03e02e8e0d979d45527aa23d4252a60c25b6e9ff2b21d17f504724aaeae3ff97e745e23d963ca
diff --git a/mate-base/caja/caja-1.12.7-r2.ebuild b/mate-base/caja/caja-1.12.7-r2.ebuild
deleted file mode 100644
index ebb0d4bf0506..000000000000
--- a/mate-base/caja/caja-1.12.7-r2.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-inherit mate virtualx
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm x86"
-fi
-
-DESCRIPTION="Caja file manager for the MATE desktop"
-LICENSE="GPL-2 LGPL-2 FDL-1.1"
-SLOT="0"
-
-IUSE="gtk3 +introspection +mate packagekit xmp"
-
-RDEPEND="dev-libs/atk:0
-	>=dev-libs/glib-2.36:2
-	>=dev-libs/libxml2-2.4.7:2
-	gnome-base/dconf:0
-	>=gnome-base/gvfs-1.10.1:0[udisks]
-	>=mate-base/mate-desktop-1.9:0[gtk3(-)=]
-	>=media-libs/libexif-0.6.14:0
-	x11-libs/cairo:0
-	x11-libs/gdk-pixbuf:2
-	x11-libs/libICE:0
-	x11-libs/libSM:0
-	x11-libs/libX11:0
-	x11-libs/libXext:0
-	x11-libs/libXft:0
-	x11-libs/libXrender:0
-	>=x11-libs/pango-1.1.2:0
-	virtual/libintl:0
-	!gtk3? (
-		>=dev-libs/libunique-1:1
-		>=x11-libs/gtk+-2.24:2[introspection?]
-	)
-	gtk3? (
-		>=dev-libs/libunique-3:3
-		>=x11-libs/gtk+-3.0:3[introspection?]
-	)
-	introspection? ( >=dev-libs/gobject-introspection-0.6.4:= )
-	packagekit? ( app-admin/packagekit-base )
-	xmp? ( >=media-libs/exempi-1.99.5:2 )"
-
-DEPEND="${RDEPEND}
-	!!mate-base/mate-file-manager
-	>=dev-lang/perl-5:0=
-	dev-util/gdbus-codegen:0
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.40.1:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-PDEPEND="mate? ( >=x11-themes/mate-icon-theme-${MATE_BRANCH} )"
-
-# TODO: Test fails because Caja is not merged yet:
-# GLib-GIO-ERROR **: Settings schema 'org.mate.caja.preferences' is not installed
-RESTRICT="test"
-
-src_prepare() {
-	# Remove unnecessary CFLAGS.
-	sed -i -e 's:-DG.*DISABLE_DEPRECATED::g' \
-		configure{,.ac} eel/Makefile.{am,in} || die
-
-	mate_src_prepare
-}
-
-src_configure() {
-	mate_src_configure \
-		--disable-update-mimedb \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_enable introspection) \
-		$(use_enable packagekit) \
-		$(use_enable xmp)
-}
-
-src_test() {
-	unset SESSION_MANAGER
-	unset DBUS_SESSION_BUS_ADDRESS
-
-	Xemake check || die "Test phase failed"
-}
-
-pkg_postinst() {
-	mate_pkg_postinst
-
-	elog "Caja can use gstreamer to preview audio files. Just make sure"
-	elog "to have the necessary plugins available to play the media type you"
-	elog "want to preview."
-}
diff --git a/mate-base/caja/caja-1.14.2.ebuild b/mate-base/caja/caja-1.14.2.ebuild
deleted file mode 100644
index fc09a87e70f5..000000000000
--- a/mate-base/caja/caja-1.14.2.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-inherit mate virtualx
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="Caja file manager for the MATE desktop"
-LICENSE="GPL-2 LGPL-2 FDL-1.1"
-SLOT="0"
-
-IUSE="gtk3 +introspection +mate packagekit xmp"
-
-COMMON_DEPEND="dev-libs/atk:0
-	>=dev-libs/glib-2.36:2
-	>=dev-libs/libxml2-2.4.7:2
-	gnome-base/dconf:0
-	>=gnome-base/gvfs-1.10.1:0[udisks]
-	>=mate-base/mate-desktop-1.9:0[gtk3(-)=]
-	>=media-libs/libexif-0.6.14:0
-	x11-libs/cairo:0
-	x11-libs/gdk-pixbuf:2
-	x11-libs/libICE:0
-	x11-libs/libSM:0
-	x11-libs/libX11:0
-	x11-libs/libXext:0
-	x11-libs/libXft:0
-	x11-libs/libXrender:0
-	>=x11-libs/pango-1.1.2:0
-	virtual/libintl:0
-	!gtk3? (
-		>=dev-libs/libunique-1:1
-		>=x11-libs/gtk+-2.24:2[introspection?]
-	)
-	gtk3? (
-		>=dev-libs/libunique-3:3
-		>=x11-libs/gtk+-3.0:3[introspection?]
-	)
-	introspection? ( >=dev-libs/gobject-introspection-0.6.4:= )
-	packagekit? ( app-admin/packagekit-base )
-	xmp? ( >=media-libs/exempi-1.99.5:2 )
-	!!mate-base/mate-file-manager"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	>=dev-lang/perl-5:0=
-	dev-util/gdbus-codegen:0
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.40.1:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-PDEPEND="mate? ( >=x11-themes/mate-icon-theme-${MATE_BRANCH} )"
-
-# TODO: Test fails because Caja is not merged yet:
-# GLib-GIO-ERROR **: Settings schema 'org.mate.caja.preferences' is not installed
-RESTRICT="test"
-
-src_prepare() {
-	# Remove unnecessary CFLAGS.
-	sed -i -e 's:-DG.*DISABLE_DEPRECATED::g' \
-		configure.ac eel/Makefile.am || die
-
-	mate_src_prepare
-}
-
-src_configure() {
-	mate_src_configure \
-		--disable-update-mimedb \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_enable introspection) \
-		$(use_enable packagekit) \
-		$(use_enable xmp)
-}
-
-src_test() {
-	unset SESSION_MANAGER
-	unset DBUS_SESSION_BUS_ADDRESS
-
-	Xemake check || die "Test phase failed"
-}
-
-pkg_postinst() {
-	mate_pkg_postinst
-
-	elog "Caja can use gstreamer to preview audio files. Just make sure"
-	elog "to have the necessary plugins available to play the media type you"
-	elog "want to preview."
-}
diff --git a/mate-base/caja/caja-1.16.6.ebuild b/mate-base/caja/caja-1.16.6.ebuild
deleted file mode 100644
index d0c09026f371..000000000000
--- a/mate-base/caja/caja-1.16.6.ebuild
+++ /dev/null
@@ -1,97 +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 virtualx
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="Caja file manager for the MATE desktop"
-LICENSE="GPL-2 LGPL-2 FDL-1.1"
-SLOT="0"
-
-IUSE="gtk3 +introspection +mate packagekit xmp"
-
-COMMON_DEPEND="dev-libs/atk:0
-	>=dev-libs/glib-2.36:2
-	>=dev-libs/libxml2-2.4.7:2
-	gnome-base/dconf:0
-	>=gnome-base/gvfs-1.10.1:0[udisks]
-	>=mate-base/mate-desktop-1.16.2:0[gtk3(-)=]
-	>=media-libs/libexif-0.6.14:0
-	x11-libs/cairo:0
-	x11-libs/gdk-pixbuf:2
-	x11-libs/libICE:0
-	x11-libs/libSM:0
-	x11-libs/libX11:0
-	x11-libs/libXext:0
-	x11-libs/libXft:0
-	x11-libs/libXrender:0
-	>=x11-libs/pango-1.1.2:0
-	virtual/libintl:0
-	!gtk3? (
-		>=dev-libs/libunique-1:1
-		>=x11-libs/gtk+-2.24:2[introspection?]
-	)
-	gtk3? (
-		>=dev-libs/libunique-3:3
-		>=x11-libs/gtk+-3.0:3[introspection?]
-	)
-	introspection? ( >=dev-libs/gobject-introspection-0.6.4:= )
-	packagekit? ( app-admin/packagekit-base )
-	xmp? ( >=media-libs/exempi-1.99.5:2 )
-	!!mate-base/mate-file-manager"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	>=dev-lang/perl-5:0=
-	dev-util/gdbus-codegen:0
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.40.1:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-PDEPEND="mate? ( >=x11-themes/mate-icon-theme-${MATE_BRANCH} )"
-
-# TODO: Test fails because Caja is not merged yet:
-# GLib-GIO-ERROR **: Settings schema 'org.mate.caja.preferences' is not installed
-RESTRICT="test"
-
-src_prepare() {
-	# Remove unnecessary CFLAGS.
-	sed -i -e 's:-DG.*DISABLE_DEPRECATED::g' \
-		configure.ac eel/Makefile.am || die
-
-	mate_src_prepare
-}
-
-src_configure() {
-	mate_src_configure \
-		--disable-update-mimedb \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_enable introspection) \
-		$(use_enable packagekit) \
-		$(use_enable xmp)
-}
-
-src_test() {
-	unset SESSION_MANAGER
-	unset DBUS_SESSION_BUS_ADDRESS
-
-	Xemake check || die "Test phase failed"
-}
-
-pkg_postinst() {
-	mate_pkg_postinst
-
-	elog "Caja can use gstreamer to preview audio files. Just make sure"
-	elog "to have the necessary plugins available to play the media type you"
-	elog "want to preview."
-}
diff --git a/mate-base/caja/metadata.xml b/mate-base/caja/metadata.xml
index fcee9f59fc63..1302ac7693b1 100644
--- a/mate-base/caja/metadata.xml
+++ b/mate-base/caja/metadata.xml
@@ -6,7 +6,6 @@
 		<name>Gentoo MATE Desktop</name>
 	</maintainer>
 	<use>
-		<flag name="gtk3">Build with GTK+3 instead of GTK+2</flag>
 		<flag name="mate">Install <pkg>x11-themes/mate-icon-theme</pkg> which 
 		is needed when this package is used in the MATE desktop 
 		environment.</flag>
diff --git a/mate-base/libmatekbd/Manifest b/mate-base/libmatekbd/Manifest
index 74188bb9b4f2..57d0e3a95cbf 100644
--- a/mate-base/libmatekbd/Manifest
+++ b/mate-base/libmatekbd/Manifest
@@ -1,9 +1,3 @@
-DIST libmatekbd-1.12.1.tar.xz 349492 BLAKE2B 8547ae2d7801ff7eb6593558cc2c53133b273df1e003aed96a9343d64f29ac8a692b7ca5694e45df400992d49df1c0f56cca5faf4d1f023ead298ba170aabe05 SHA512 ef07e7b7ff35a17465eb427aafef4c0679ccecf0d96989a66eaf337791dd62d5e85ec72f2c58de5b09e7065eac6df16afb401975fcd727e924e8d3b34b19c0aa
-DIST libmatekbd-1.14.1.tar.xz 367296 BLAKE2B ce5f549cc5c7f41c83b4e498367f7086aad544e372a17c3bf8fa62ccd428b71ca41d9a4a835b5d15bd73c855e3df2cda4bb2881d43fb163227ccead641b9667a SHA512 22e927f7db6c84e57b4bca823513220b305ba8989dabc5af2451be29d35bdc52f12f78dc19b69eb5dd11654cc75647b5ee67f6306162e781920aa58288c25b4c
-DIST libmatekbd-1.16.0.tar.xz 365412 BLAKE2B c7c4b571d581203d59235129d53f20e9ead64117aeb9c1d997c90719540b4923570e489b2fe843dcad2c75f640b01ba5da7f0e188cad97b41bf57b925d1fb872 SHA512 5ced3277e8f9a87407948d2d36fa7aea5a3eb6f2510c29cb53b430cdd202a36e38e48e82177b63bd8ccac6b0f317590ba99645c525b4c0d38b6b80633f62d96e
 DIST libmatekbd-1.18.2.tar.xz 369448 BLAKE2B 25f588dec8926b63f19fb62fc10a3e188c8692875a4dd7c65cd97957aa02e22f33d68644d564e02f114f1f42c818bf09625463086569b97824ed561741aba9c9 SHA512 97971fc406fac09e0a652ccb5f811194eeff695a4a8b093b24225230cb64ceebd221d91aab071b0ca7ffd20b1b38e13d428d68fc8249101a3b3f8342fbb1f71e
-EBUILD libmatekbd-1.12.1-r2.ebuild 901 BLAKE2B c68dbe0374634ae6521be0fc541272c9503cac9c94231c82b50ff81005bdfc17e45ac242f151e4fb9598cd4a1995770559d2467cd85257db103f66df5b970b05 SHA512 c40a03d1079adcfde119a399949672bff21eb5800310c6f78fd03b06c1845e14bacf3316aa37852d4039016c115388386c0535d3bf2df85298e5117211e38848
-EBUILD libmatekbd-1.14.1.ebuild 943 BLAKE2B 2116f9551f956c1c8a434707217d2a76384487e12e758a3de731c7bf33df61d2d7df496f0e93f071eea5a246713d547eb6fb7c38c3ffe577854b869a3f5019e1 SHA512 d51011c9445d229be8ea94a63a5d510b932ea3a5cba0daa922210d18d0815a69522eed1eebaa8c5226bd3c5f299418cb3b20b208d21aeaf4674c3bb65d3995d8
-EBUILD libmatekbd-1.16.0.ebuild 959 BLAKE2B e67da40aec8c94611136322cebf666e655eaf9ef59867f637de1d40985b03307e3390771e605abe0dce26ec1145f4dcfd40246a39acb149793572e73bf5896fd SHA512 0d8349a52d31f9bd754534ac5f4283ed5e125c0a5a6da3a2b4abde9957364371d81f79ae2c49a9bc99100d4fd5f52beca6b4481768d3067b2ec39e52a121c8e5
 EBUILD libmatekbd-1.18.2.ebuild 862 BLAKE2B cabcfcb33fe132b20f1f802142e207e77a5d0752508920edb0811b1330cfed4daf55d06c2062230c20c968da58b88c6b3bd862265a19018a887613b6fa047333 SHA512 def5428afeeb9e1507e4c6236f711b0d5fd88915d30c510a2856fbe337bd8771644c33e2aa5bb9a1efe2c7619e033c148a7acfe57ff9dbc4319bda88913e4d71
-MISC metadata.xml 415 BLAKE2B 42664968654d61a91a453da73b713228811d7b63bbf4b8618fcdad1d502f8d19e7c8cc558cfa0a3b375d6b4b51a5b8cf54e3b4bf6fb9b17642ca1554becbc090 SHA512 1ab91a901f989f1e3491982aa999b22cc64073a3bf0db8b6089d488096cf83bb386d10a04d78131e3a232c7808a01bd435fb6d1e80beee82eea3dbcf1d3fd87a
+MISC metadata.xml 339 BLAKE2B 0ba4a0bd94a0efe3c42d79da9b4f32dc50c577c616d2495a7a3019fb05c398ffdf614afddae5bda5bd1430716391d3991f99005c225e36d2ebc68ff5415ff5cf SHA512 fc767510a57712599986df86d68bf28122b5060b183f94dca26f69abd7a6b4866ab9efc37b85433d2271115374dba3299d2be6cd9461aeadaa2cb02864a6166d
diff --git a/mate-base/libmatekbd/libmatekbd-1.12.1-r2.ebuild b/mate-base/libmatekbd/libmatekbd-1.12.1-r2.ebuild
deleted file mode 100644
index c51d149aaf30..000000000000
--- a/mate-base/libmatekbd/libmatekbd-1.12.1-r2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm x86"
-fi
-
-DESCRIPTION="MATE keyboard configuration library"
-LICENSE="LGPL-2"
-SLOT="0"
-
-IUSE="X gtk3 +introspection test"
-
-RDEPEND=">=dev-libs/glib-2.36:2
-	x11-libs/cairo:0
-	>=x11-libs/gdk-pixbuf-2.24:2
-	x11-libs/libX11:0
-	>=x11-libs/libxklavier-5.0:0
-	x11-libs/pango:0
-	virtual/libintl:0
-	!gtk3? ( >=x11-libs/gtk+-2.24:2[introspection?] )
-	gtk3? ( >=x11-libs/gtk+-3.0:3[introspection?] )
-	introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )"
-
-DEPEND="${RDEPEND}
-	sys-devel/gettext:*
-	>=dev-util/intltool-0.50.1:*
-	virtual/pkgconfig:*"
-
-src_configure() {
-	mate_src_configure \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_with X x) \
-		$(use_enable introspection) \
-		$(use_enable test tests)
-}
diff --git a/mate-base/libmatekbd/libmatekbd-1.14.1.ebuild b/mate-base/libmatekbd/libmatekbd-1.14.1.ebuild
deleted file mode 100644
index 01f090d85d5f..000000000000
--- a/mate-base/libmatekbd/libmatekbd-1.14.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="MATE keyboard configuration library"
-LICENSE="LGPL-2"
-SLOT="0"
-
-IUSE="X gtk3 +introspection test"
-
-COMMON_DEPEND=">=dev-libs/glib-2.36:2
-	x11-libs/cairo:0
-	>=x11-libs/gdk-pixbuf-2.24:2
-	x11-libs/libX11:0
-	>=x11-libs/libxklavier-5.0:0
-	x11-libs/pango:0
-	virtual/libintl:0
-	!gtk3? ( >=x11-libs/gtk+-2.24:2[introspection?] )
-	gtk3? ( >=x11-libs/gtk+-3.0:3[introspection?] )
-	introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	sys-devel/gettext:*
-	>=dev-util/intltool-0.50.1:*
-	virtual/pkgconfig:*"
-
-src_configure() {
-	mate_src_configure \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_with X x) \
-		$(use_enable introspection) \
-		$(use_enable test tests)
-}
diff --git a/mate-base/libmatekbd/libmatekbd-1.16.0.ebuild b/mate-base/libmatekbd/libmatekbd-1.16.0.ebuild
deleted file mode 100644
index 3f50001e430c..000000000000
--- a/mate-base/libmatekbd/libmatekbd-1.16.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="MATE keyboard configuration library"
-LICENSE="LGPL-2"
-SLOT="0"
-
-IUSE="X gtk3 +introspection test"
-
-COMMON_DEPEND=">=dev-libs/glib-2.36:2
-	x11-libs/cairo:0
-	>=x11-libs/gdk-pixbuf-2.24:2
-	x11-libs/libX11:0
-	>=x11-libs/libxklavier-5.2:0[introspection?]
-	x11-libs/pango:0
-	virtual/libintl:0
-	!gtk3? ( >=x11-libs/gtk+-2.24:2[introspection?] )
-	gtk3? ( >=x11-libs/gtk+-3.0:3[introspection?] )
-	introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	sys-devel/gettext:*
-	>=dev-util/intltool-0.50.1:*
-	virtual/pkgconfig:*"
-
-src_configure() {
-	mate_src_configure \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_with X x) \
-		$(use_enable introspection) \
-		$(use_enable test tests)
-}
diff --git a/mate-base/libmatekbd/metadata.xml b/mate-base/libmatekbd/metadata.xml
index ad1360a0bcce..8743d781458d 100644
--- a/mate-base/libmatekbd/metadata.xml
+++ b/mate-base/libmatekbd/metadata.xml
@@ -5,9 +5,6 @@
 		<email>mate@gentoo.org</email>
 		<name>Gentoo MATE Desktop</name>
 	</maintainer>
-	<use>
-		<flag name="gtk3">Build with GTK+3 instead of GTK+2</flag>
-	</use>
 	<upstream>
 		<remote-id type="github">mate-desktop/libmatekbd</remote-id>
 	</upstream>
diff --git a/mate-base/mate-applets-meta/Manifest b/mate-base/mate-applets-meta/Manifest
index 470daaea4188..52c39c9c2e9b 100644
--- a/mate-base/mate-applets-meta/Manifest
+++ b/mate-base/mate-applets-meta/Manifest
@@ -1,5 +1,2 @@
-EBUILD mate-applets-meta-1.12.ebuild 749 BLAKE2B e577f4dc52796c9d7af7c57bcf6d8d36275775f3350935e0c04f9ac6db549cbe8c556755fceddfb5efffeae195de3f45a23a82e02106b47bd4f6c1e212a9723b SHA512 be8a46d9aa2cde42c5438144dbe7e14ee8ddd35417d824718a26ae11ecfa78d31a2c2c684f36da2510b320ec10eab7e3b1e6a225f06e18ed523e427f7f65a0f5
-EBUILD mate-applets-meta-1.14.ebuild 673 BLAKE2B 4d2265ad6b60190131743bf33b1caace236b5dc3156ae395087eaa3c80a6fa16d61b4feadd51afd13be0bf9434b67af188bda70a9efdc7adb0d46658a70c1f65 SHA512 b2e175dbf3dc06d31118dd45dc8d1b3d5a26ce3d6ebeef101dd582e52e142a93c41f9010465c37f90c318d923f694331a8e5f65259f749e2d2a5ec663957a8f4
-EBUILD mate-applets-meta-1.16.ebuild 673 BLAKE2B 4d2265ad6b60190131743bf33b1caace236b5dc3156ae395087eaa3c80a6fa16d61b4feadd51afd13be0bf9434b67af188bda70a9efdc7adb0d46658a70c1f65 SHA512 b2e175dbf3dc06d31118dd45dc8d1b3d5a26ce3d6ebeef101dd582e52e142a93c41f9010465c37f90c318d923f694331a8e5f65259f749e2d2a5ec663957a8f4
 EBUILD mate-applets-meta-1.18.ebuild 643 BLAKE2B 42259784e7e525789e22d32285c8c0fb74b591680e6931feb2fddd0a4c9a5c4176eaea4f52b80528458f7a27465f1147e7f422ec96e6ceeef8b528c0b8b4ba66 SHA512 5f0834fe4ac3c47f8cd1623f576cb2be61631a9cf70d63aa6367a6b93b64d469d7b039a6123e256a585ade5d20c7db0b9312d13522dd1a5754513dc85f71aa68
-MISC metadata.xml 680 BLAKE2B 9c8e608bc26dce5877b9ae5cfbf5243b70d9e1cc332ef9e9f17088be5f5d87e0d209b96aba43b16fa9ba15e6086ad3aa170e69899fd0ba83eaa0dc5b7572bc61 SHA512 d128aaeae00867672aac0914cd2031e71a209422cdc92c728f141279dbd7fbb0c99770d421871f7c914013215d8a396cb8aefef1b92d2b105b04dee8bf8c9f18
+MISC metadata.xml 485 BLAKE2B 683574e64bd4bec6a28e6e35eba5dd99f6823d460f1f1c548ad469719e8f68ca2b5a55733f9d146a8f66b654d68ce18747e6cb5532432e9338ea95e757809a1f SHA512 fe08bec233d3be25d3314850882bc8de353b57901e047c0eec5f7a06b83202bc24ad1ddb4271cafed57c760441f8dc235bfbb0cbd8f8bee392deff03946a943e
diff --git a/mate-base/mate-applets-meta/mate-applets-meta-1.12.ebuild b/mate-base/mate-applets-meta/mate-applets-meta-1.12.ebuild
deleted file mode 100644
index 1b98c00bb919..000000000000
--- a/mate-base/mate-applets-meta/mate-applets-meta-1.12.ebuild
+++ /dev/null
@@ -1,27 +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
-else
-	inherit versionator
-	MATE_BRANCH="$(get_version_component_range 1-2)"
-	KEYWORDS="amd64 ~arm x86"
-fi
-
-DESCRIPTION="Meta package for MATE panel applets"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI=""
-
-LICENSE="metapackage"
-SLOT="0"
-IUSE="appindicator gtk3 netspeed sensors"
-
-DEPEND=""
-RDEPEND="=mate-base/mate-applets-${MATE_BRANCH}*[gtk3(-)=]
-	appindicator? ( =mate-extra/mate-indicator-applet-${MATE_BRANCH}*[gtk3(-)=] )
-	netspeed? ( =net-analyzer/mate-netspeed-${MATE_BRANCH}*[gtk3(-)=] )
-	sensors? ( =mate-extra/mate-sensors-applet-${MATE_BRANCH}*[gtk3(-)=] )
-"
diff --git a/mate-base/mate-applets-meta/mate-applets-meta-1.14.ebuild b/mate-base/mate-applets-meta/mate-applets-meta-1.14.ebuild
deleted file mode 100644
index e6c203a6eadd..000000000000
--- a/mate-base/mate-applets-meta/mate-applets-meta-1.14.ebuild
+++ /dev/null
@@ -1,26 +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
-else
-	inherit versionator
-	MATE_BRANCH="$(get_version_component_range 1-2)"
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="Meta package for MATE panel applets"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI=""
-
-LICENSE="metapackage"
-SLOT="0"
-IUSE="appindicator gtk3 sensors"
-
-DEPEND=""
-RDEPEND="=mate-base/mate-applets-${MATE_BRANCH}*[gtk3(-)=]
-	appindicator? ( =mate-extra/mate-indicator-applet-${MATE_BRANCH}*[gtk3(-)=] )
-	sensors? ( =mate-extra/mate-sensors-applet-${MATE_BRANCH}*[gtk3(-)=] )
-"
diff --git a/mate-base/mate-applets-meta/mate-applets-meta-1.16.ebuild b/mate-base/mate-applets-meta/mate-applets-meta-1.16.ebuild
deleted file mode 100644
index e6c203a6eadd..000000000000
--- a/mate-base/mate-applets-meta/mate-applets-meta-1.16.ebuild
+++ /dev/null
@@ -1,26 +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
-else
-	inherit versionator
-	MATE_BRANCH="$(get_version_component_range 1-2)"
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="Meta package for MATE panel applets"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI=""
-
-LICENSE="metapackage"
-SLOT="0"
-IUSE="appindicator gtk3 sensors"
-
-DEPEND=""
-RDEPEND="=mate-base/mate-applets-${MATE_BRANCH}*[gtk3(-)=]
-	appindicator? ( =mate-extra/mate-indicator-applet-${MATE_BRANCH}*[gtk3(-)=] )
-	sensors? ( =mate-extra/mate-sensors-applet-${MATE_BRANCH}*[gtk3(-)=] )
-"
diff --git a/mate-base/mate-applets-meta/metadata.xml b/mate-base/mate-applets-meta/metadata.xml
index 69703b541d99..1d4f0490d71b 100644
--- a/mate-base/mate-applets-meta/metadata.xml
+++ b/mate-base/mate-applets-meta/metadata.xml
@@ -8,9 +8,6 @@
 	<use>
 		<flag name="appindicator">Pull in <pkg>mate-extra/mate-indicator-applet</pkg>
 			for AppIndicator applet</flag>
-		<flag name="gtk3">Make sure applets are built with GTK+3 instead of GTK+2</flag>
-		<flag name="netspeed">Pull in <pkg>net-analyzer/mate-netspeed</pkg>
-			for net speed monitoring applet</flag>
 		<flag name="sensors">Pull in <pkg>mate-extra/mate-sensors-applet</pkg>
 			for hw sensors applet</flag>
 	</use>
diff --git a/mate-base/mate-applets/Manifest b/mate-base/mate-applets/Manifest
index f0bd8f96ea5e..b7dbc34ce92f 100644
--- a/mate-base/mate-applets/Manifest
+++ b/mate-base/mate-applets/Manifest
@@ -1,16 +1,4 @@
-AUX mate-applets-1.10.4-cpupower-4.7.patch 1216 BLAKE2B 63522e5f4cc775ed3b6e0505f4b2ddbcb6324d3d8f3b3fad8190bb9e88bd9d6922ddc367c3f1d82dd2b493db3e2e61d910f80d7b516bab2896318c48be90aa1a SHA512 6e350080551b959062e4b51c0665c0743fa1064daa441d35abf45ce959be67614fafa90077dfce6cbe10b114420d78b4efdc3ea639eff523195baabd02f1bbdd
-AUX mate-applets-1.14.1-cpupower-4.7.patch 1142 BLAKE2B 0618d0be592cba3430ae3ee86d81e52c11da75dd7b8c3fb800b46e7dd9b38921dbcaa96a3217ed965ad9d93dd6819d1591e1762bcae2f6f40433de97c4eab086 SHA512 b7f2b66f7ac79ccad042704e8e00c5a5b452751aafe3ba19074c5c0e156f56dc89024133f1cfa432b564f2ba497d2444889c46b94af6f8f55d6f9af4102c618a
-AUX mate-applets-1.14.1-revert-upstream-cpupower-4.7-fix.patch 1093 BLAKE2B 9b645da20f66a2c42741da5e272b8deaec754e5d151adde2f487dc5b9f6e2193a39dc6ce0fb75a03ec8727903deb122febfd672e4baa52f10a4e08aed91f9589 SHA512 d47f08a1f983b958bbcaeff5f480752500589ead4cd4fa3eedbf596d48809c3a0a909db82271a5e663d394bed68c6ee395f7315a701c29112ed9b328633bfedc
 AUX mate-applets-1.16.0-cpupower-4.7.patch 1142 BLAKE2B 1222947dd918825d3905aa4c7e95e7c13115ac1aec0d0881b3fcca2f68947ed23a6decebbb0ec94010308ea943696c5d05ceda90803fe14c1bf7b151880e544a SHA512 7845655d2215e91286b19891cb8e6f018b8b11bebcb876d97b5c0a0232063cd030ef14754871f14e09f3e82d714f33d844d41f09f1168a088ac4d83cde527789
-DIST mate-applets-1.12.1.tar.xz 6816716 BLAKE2B 3268a6a4dd1ee1a238a9573315f9450dea4636b40a98f27857dff3cfd9379e5adefa9f2f7f0522837d3bc4fa1c54055d4e65b47165f42cc44400775ed8890b14 SHA512 c9acac98df31386b4016d42d3d1fe0e9ddd5e8fccc291269cff73e2a4c0853fabb85a649ee14f4aef3200c0f731c1d95f48aefdb3d8baaf014ad8776c1e94234
-DIST mate-applets-1.14.1.tar.xz 7151156 BLAKE2B 9b3540ea04c4473f8d9ee081a87d399ebfe74d77d96b96f4c5bf11d954dd53a1e764981eefe593d75480aadf3028626917fd21cdd1b45a5b8f14e4381fcd48ae SHA512 f7657a4dbeed5ff161dae33bd915bf868c95626d661b3d7e4eea9b86776f75449c4060c647d9a040ccf8a01556979b62a9b21c988b33e0cd8d5d90fd663a331d
-DIST mate-applets-1.16.0.tar.xz 7150340 BLAKE2B 0b5554b3e5f250dbc38ec3ecff795dca3d503045fda7f31ea8cb190c8c30a35b5576b990d5005f11b44035b26d6df2ce91e36edd369e983d893bfa2db5e4c00c SHA512 606fd39b95083e7cff2ce95e75b4acb0ec1f3d66621a15fa726891c6d6319f7757b92c8c26efd3ee05da9da3dc315b16a3a9089fd4bb8d420816d4728f8545af
 DIST mate-applets-1.18.2.tar.xz 7163260 BLAKE2B 58d057d1eded3ef26f33e133f86459a75df2903906f27df555640aaf51ca381e8f57b0b4fe6ed7b2d679e08d2a595fc85a6b0d9c4ad51d3ac01552e2875e00bb SHA512 6644a7dfde1dbf65c38cd3a0f52f862e096030f0b9f324f1fbfc34b6167c04b51071f01c322c3c8382e74843332c877b1340fe2129417d6cf9207c32ef2f70be
-EBUILD mate-applets-1.12.1-r4.ebuild 2264 BLAKE2B dec3daf4cb9c1d53b9a317457e4e40eced00956679fec63a9093efc6092b147c170b839208a70fccf62e016036201deb5fa99ec40304d01d03daf5571d01dcb4 SHA512 81b027473726418d372e07896dbfce908e5224c59dd044fcf2fd630c5b799ca02015270ba62751652c7e4deead7686432ddb6f625ae76b73056a78f1bfe6bf37
-EBUILD mate-applets-1.12.1-r5.ebuild 2302 BLAKE2B a8ae9a7e19e6521f99ed9f7c38fb7c9d26899460013e41182c29f862e6b69c754bf548241333dd98ddfc00c33b77e0e2249bc69c5882878b9723f43c71962464 SHA512 2bf780ce08385d2ad2f4266d3f05363bc10289627a4c79623813017633e2da41d6190a754aa11579245727c515ebbc7bd53eacf1022ee6b82c4daffa1c587d93
-EBUILD mate-applets-1.14.1-r1.ebuild 2453 BLAKE2B 879d76df7c9a12e7a2eb8ea3878ce3dc0b41dcea5becb9353e2914c5dcebdd585814b43a7f1ba1456f6bf2b84179b2262aad57ee87464cf7293a638032489fed SHA512 107118f190b7e9baecfe528949a8fa314a957712b4ea26d7599604f45044895ca4dd964dac1e001d09a5350b790a37efae8abc265d055000698094afb3bc5d8a
-EBUILD mate-applets-1.14.1-r2.ebuild 2410 BLAKE2B 862befae14e867cbf2cbe59e3cf2fa5961da8e54863dd4bbb701e984ffd5fc605209d57584ed8789f159e2592e8cdd12018cac14bc221f1510f469735f3b3b40 SHA512 c1a96efd69969b4cb5be6e9342ab365ca9bee4dd3133a56f2bfcaeb243d178ace5bf40dc77c0c603b11bcf5a5b7aa9990e29055c8e0b33ff82b36238c8865046
-EBUILD mate-applets-1.16.0-r1.ebuild 2370 BLAKE2B e973bb109010f615a6652e55487aaad98456b318829a20f8e8ecab9d2d2a880daedc6a796fb79a6da1ee36e85f83908fd60af6054b8de3205e650c15645f2e0e SHA512 cf8eb10cbd2300402a7309561bc3b179710995adfdfa7f70134aaf4aef2ceedd374ceea653905f4645532d8530faaa1a677fff7fc071eb2081c27b223d438ca2
-EBUILD mate-applets-1.16.0.ebuild 2413 BLAKE2B 1635d43378d5f761f840d0a433f188f04d59f69bb9bf9fd49a7471dbd2d21797d22f7d90c3624fb2509ce173fd124507e2d81768596cb9409bbe571a2b862dd3 SHA512 d447fac31a5492be65c6a8dfd1724b6956e1f0c657c1750e175d7476fa75b75411a140706c36c5cb54f8e54c7338da9f94a26a70edb1351f66f2c5f5805464fe
 EBUILD mate-applets-1.18.2.ebuild 2172 BLAKE2B 545fc8ca62d92b684ff4f40958b4534208f16dfdb2aa51c6bb3e779ae69524a9126b71c616618547339efd21547199896422a883e28dfe0e77b2f0250ef551ba SHA512 df63cfd7e0f041bc7c7bd3564799ec063741ebf77b3da970fbdb7bebe518c68f16838b91e1cf350c6d6d3c5fb6ed90d96755fddbe7627b3d2453d25062cb35cb
-MISC metadata.xml 417 BLAKE2B 415a8520ed9bb5dc3fb80e935e607c999254785ce733ada8ac88529876916c6beb0012addeeeacb37df02bc35ea42c1748b6fabc563c40bf4cba2dbb77ccc73e SHA512 8df2d630bab80c248991cb2d57c928b24bfdc92d72d9ecabd06bc362882bb0bc0f3dc376ba54deb77213676eda4fdb8c2a4362c634bdd58f8d2b3060a184309d
+MISC metadata.xml 341 BLAKE2B 5013e079fa6d6c8dca84a8798ce1e360942b8284816842662f0a783895575cc4df2e992d67862928d436b188f87fb29e21b5299b455a838849dac4ecf2588ef1 SHA512 20bc118f3d597db418636c77744f83f398c25ce2dc783bc61f81fda1c0520b3ca9b18ee5f4bed149fecc70436bc3d2a79ac311559e7d1ee085322eac5963e7c9
diff --git a/mate-base/mate-applets/files/mate-applets-1.10.4-cpupower-4.7.patch b/mate-base/mate-applets/files/mate-applets-1.10.4-cpupower-4.7.patch
deleted file mode 100644
index 070b41754ed0..000000000000
--- a/mate-base/mate-applets/files/mate-applets-1.10.4-cpupower-4.7.patch
+++ /dev/null
@@ -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;
- 		}
diff --git a/mate-base/mate-applets/files/mate-applets-1.14.1-cpupower-4.7.patch b/mate-base/mate-applets/files/mate-applets-1.14.1-cpupower-4.7.patch
deleted file mode 100644
index 203f1589a1b2..000000000000
--- a/mate-base/mate-applets/files/mate-applets-1.14.1-cpupower-4.7.patch
+++ /dev/null
@@ -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)) {
diff --git a/mate-base/mate-applets/files/mate-applets-1.14.1-revert-upstream-cpupower-4.7-fix.patch b/mate-base/mate-applets/files/mate-applets-1.14.1-revert-upstream-cpupower-4.7-fix.patch
deleted file mode 100644
index 85c2b24bc81b..000000000000
--- a/mate-base/mate-applets/files/mate-applets-1.14.1-revert-upstream-cpupower-4.7-fix.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From e82b68edbfa8d6e209b9ad7b3e6392a928da776e Mon Sep 17 00:00:00 2001
-From: mudler <mudler@sabayon.org>
-Date: Tue, 13 Sep 2016 23:33:58 +0200
-Subject: [PATCH] fix 1.14.1 on kernel-headers >=4.7
-
----
- cpufreq/src/cpufreq-monitor-libcpufreq.c | 6 +-----
- 1 file changed, 1 insertion(+), 5 deletions(-)
-
-diff --git a/cpufreq/src/cpufreq-monitor-libcpufreq.c b/cpufreq/src/cpufreq-monitor-libcpufreq.c
-index 228a890..587e316 100644
---- a/cpufreq/src/cpufreq-monitor-libcpufreq.c
-+++ b/cpufreq/src/cpufreq-monitor-libcpufreq.c
-@@ -23,7 +23,7 @@
- #include <glib/gi18n.h>
- 
- #include <stdlib.h>
--#include <linux/version.h>
-+
- #include <cpufreq.h>
- #include "cpufreq-monitor-libcpufreq.h"
- #include "cpufreq-utils.h"
-@@ -111,11 +111,7 @@ cpufreq_monitor_libcpufreq_run (CPUFreqMonitor *monitor)
- 		/* Check whether it failed because
- 		 * cpu is not online.
- 		 */
--#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 7, 0)
- 		if (!cpufreq_cpu_exists (cpu)) {
--#else
--		if (cpupower_is_cpu_online (cpu)) {
--#endif
- 			g_object_set (G_OBJECT (monitor), "online", FALSE, NULL);
- 			return TRUE;
- 		}
--- 
-2.9.2
-
diff --git a/mate-base/mate-applets/mate-applets-1.12.1-r4.ebuild b/mate-base/mate-applets/mate-applets-1.12.1-r4.ebuild
deleted file mode 100644
index a7a67439797a..000000000000
--- a/mate-base/mate-applets/mate-applets-1.12.1-r4.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit mate python-single-r1
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm x86"
-fi
-
-DESCRIPTION="Applets for the MATE Desktop and Panel"
-LICENSE="GPL-2 FDL-1.1 LGPL-2"
-SLOT="0"
-
-IUSE="X gtk3 ipv6 policykit +upower"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-#cpupower #593470
-RDEPEND="${PYTHON_DEPS}
-	app-text/rarian:0
-	dev-libs/atk:0
-	>=dev-libs/dbus-glib-0.74:0
-	>=dev-libs/glib-2.36:2
-	>=dev-libs/libmateweather-1.6.1[gtk3(-)=]
-	>=dev-libs/libxml2-2.5:2
-	dev-python/pygobject:3
-	>=gnome-base/libgtop-2.11.92:2=
-	>=mate-base/mate-desktop-1.9[gtk3(-)=]
-	>=mate-base/mate-panel-1.7[gtk3(-)=]
-	>=mate-base/mate-settings-daemon-1.6
-	>=sys-apps/dbus-1.1.2:0
-	<sys-power/cpupower-4.7
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/libnotify-0.7:0
-	x11-libs/libX11:0
-	x11-libs/pango:0
-	virtual/libintl:0
-	!gtk3? (
-		>=gnome-extra/gucharmap-2.32.1:0
-		>=x11-libs/gtk+-2.24:2
-		x11-libs/gtksourceview:2.0
-		>=x11-libs/libwnck-2.30:1
-	)
-	gtk3? (
-		>=gnome-extra/gucharmap-3.0:2.90
-		>=x11-libs/gtk+-3.0:3
-		x11-libs/gtksourceview:3.0
-		>=x11-libs/libwnck-3.0:3
-	)
-	policykit? ( >=sys-auth/polkit-0.92:0 )
-	upower? (
-		|| (
-			>=sys-power/upower-0.9.23
-			>=sys-power/upower-pm-utils-0.9.23
-		)
-	)"
-
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.3
-	>=app-text/scrollkeeper-dtd-1:1.0
-	app-text/yelp-tools:0
-	>=dev-util/intltool-0.50.1:*
-	dev-libs/libxslt:0
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-src_configure() {
-	mate_src_configure \
-		--libexecdir=/usr/libexec/mate-applets \
-		--with-cpufreq-lib=cpupower \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_with X x) \
-		$(use_with upower) \
-		$(use_enable ipv6) \
-		$(use_enable policykit polkit)
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	emake check
-}
-
-src_install() {
-	python_fix_shebang invest-applet
-	mate_src_install
-
-	local APPLETS="accessx-status battstat charpick command cpufreq drivemount
-			geyes invest-applet mateweather multiload null_applet stickynotes
-			timerapplet trashapplet"
-
-	for applet in ${APPLETS}; do
-		docinto ${applet}
-
-		for d in AUTHORS ChangeLog NEWS README README.themes TODO; do
-			[ -s ${applet}/${d} ] && dodoc ${applet}/${d}
-		done
-	done
-}
diff --git a/mate-base/mate-applets/mate-applets-1.12.1-r5.ebuild b/mate-base/mate-applets/mate-applets-1.12.1-r5.ebuild
deleted file mode 100644
index 3853add0fe5d..000000000000
--- a/mate-base/mate-applets/mate-applets-1.12.1-r5.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit mate python-single-r1
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="Applets for the MATE Desktop and Panel"
-LICENSE="GPL-2 FDL-1.1 LGPL-2"
-SLOT="0"
-
-IUSE="X gtk3 ipv6 policykit +upower"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	app-text/rarian:0
-	dev-libs/atk:0
-	>=dev-libs/dbus-glib-0.74:0
-	>=dev-libs/glib-2.36:2
-	>=dev-libs/libmateweather-1.6.1[gtk3(-)=]
-	>=dev-libs/libxml2-2.5:2
-	dev-python/pygobject:3
-	>=gnome-base/libgtop-2.11.92:2=
-	>=mate-base/mate-desktop-1.9[gtk3(-)=]
-	>=mate-base/mate-panel-1.7[gtk3(-)=]
-	>=mate-base/mate-settings-daemon-1.6
-	>=sys-apps/dbus-1.1.2:0
-	sys-power/cpupower
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/libnotify-0.7:0
-	x11-libs/libX11:0
-	x11-libs/pango:0
-	virtual/libintl:0
-	!gtk3? (
-		>=gnome-extra/gucharmap-2.32.1:0
-		>=x11-libs/gtk+-2.24:2
-		x11-libs/gtksourceview:2.0
-		>=x11-libs/libwnck-2.30:1
-	)
-	gtk3? (
-		>=gnome-extra/gucharmap-3.0:2.90
-		>=x11-libs/gtk+-3.0:3
-		x11-libs/gtksourceview:3.0
-		>=x11-libs/libwnck-3.0:3
-	)
-	policykit? ( >=sys-auth/polkit-0.92:0 )
-	upower? (
-		|| (
-			>=sys-power/upower-0.9.23
-			>=sys-power/upower-pm-utils-0.9.23
-		)
-	)"
-
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.3
-	>=app-text/scrollkeeper-dtd-1:1.0
-	app-text/yelp-tools:0
-	>=dev-util/intltool-0.50.1:*
-	dev-libs/libxslt:0
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-PATCHES=( "${FILESDIR}/${PN}-1.10.4-cpupower-4.7.patch" )
-
-src_configure() {
-	mate_src_configure \
-		--libexecdir=/usr/libexec/mate-applets \
-		--with-cpufreq-lib=cpupower \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_with X x) \
-		$(use_with upower) \
-		$(use_enable ipv6) \
-		$(use_enable policykit polkit)
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	emake check
-}
-
-src_install() {
-	python_fix_shebang invest-applet
-	mate_src_install
-
-	local APPLETS="accessx-status battstat charpick command cpufreq drivemount
-			geyes invest-applet mateweather multiload null_applet stickynotes
-			timerapplet trashapplet"
-
-	for applet in ${APPLETS}; do
-		docinto ${applet}
-
-		for d in AUTHORS ChangeLog NEWS README README.themes TODO; do
-			[ -s ${applet}/${d} ] && dodoc ${applet}/${d}
-		done
-	done
-}
diff --git a/mate-base/mate-applets/mate-applets-1.14.1-r1.ebuild b/mate-base/mate-applets/mate-applets-1.14.1-r1.ebuild
deleted file mode 100644
index a813ac75a5d4..000000000000
--- a/mate-base/mate-applets/mate-applets-1.14.1-r1.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit mate python-single-r1
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="Applets for the MATE Desktop and Panel"
-LICENSE="GPL-2 FDL-1.1 LGPL-2"
-SLOT="0"
-
-IUSE="X gtk3 ipv6 policykit +upower"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-#cpupower #593470
-COMMON_DEPEND="${PYTHON_DEPS}
-	dev-libs/atk:0
-	>=dev-libs/dbus-glib-0.74:0
-	>=dev-libs/glib-2.36:2
-	>=dev-libs/libmateweather-1.6.1[gtk3(-)=]
-	>=dev-libs/libxml2-2.5:2
-	dev-python/pygobject:3
-	>=gnome-base/libgtop-2.11.92:2=
-	>=mate-base/mate-desktop-1.9[gtk3(-)=]
-	>=mate-base/mate-panel-1.7[gtk3(-)=]
-	>=net-wireless/wireless-tools-28_pre9:0
-	>=sys-apps/dbus-1.1.2:0
-	<sys-power/cpupower-4.7
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/libnotify-0.7:0
-	x11-libs/libX11:0
-	x11-libs/pango:0
-	virtual/libintl:0
-	!gtk3? (
-		>=gnome-extra/gucharmap-2.32.1:0
-		>=x11-libs/gtk+-2.24:2
-		x11-libs/gtksourceview:2.0
-		>=x11-libs/libwnck-2.30:1
-	)
-	gtk3? (
-		>=gnome-extra/gucharmap-3.0:2.90
-		>=x11-libs/gtk+-3.0:3
-		x11-libs/gtksourceview:3.0
-		>=x11-libs/libwnck-3.0:3
-	)
-	policykit? ( >=sys-auth/polkit-0.92:0 )
-	upower? (
-		|| (
-			>=sys-power/upower-0.9.23
-			>=sys-power/upower-pm-utils-0.9.23
-		)
-	)
-	!!net-analyzer/mate-netspeed"
-
-RDEPEND="${COMMON_DEPEND}
-	>=mate-base/mate-settings-daemon-1.6"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.3
-	app-text/rarian:0
-	>=app-text/scrollkeeper-dtd-1:1.0
-	app-text/yelp-tools:0
-	>=dev-util/intltool-0.50.1:*
-	dev-libs/libxslt:0
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-PATCHES=( "${FILESDIR}/${PN}-1.14.1-revert-upstream-cpupower-4.7-fix.patch" )
-
-src_configure() {
-	mate_src_configure \
-		--libexecdir=/usr/libexec/mate-applets \
-		--with-cpufreq-lib=cpupower \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_with X x) \
-		$(use_with upower) \
-		$(use_enable ipv6) \
-		$(use_enable policykit polkit)
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	emake check
-}
-
-src_install() {
-	python_fix_shebang invest-applet
-	mate_src_install
-
-	local APPLETS="accessx-status battstat charpick command cpufreq drivemount
-			geyes invest-applet mateweather multiload netspeed stickynotes
-			timerapplet trashapplet"
-
-	for applet in ${APPLETS}; do
-		docinto ${applet}
-
-		for d in AUTHORS ChangeLog NEWS README README.themes TODO; do
-			[ -s ${applet}/${d} ] && dodoc ${applet}/${d}
-		done
-	done
-}
diff --git a/mate-base/mate-applets/mate-applets-1.14.1-r2.ebuild b/mate-base/mate-applets/mate-applets-1.14.1-r2.ebuild
deleted file mode 100644
index 900d90340920..000000000000
--- a/mate-base/mate-applets/mate-applets-1.14.1-r2.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit mate python-single-r1
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="Applets for the MATE Desktop and Panel"
-LICENSE="GPL-2 FDL-1.1 LGPL-2"
-SLOT="0"
-
-IUSE="X gtk3 ipv6 policykit +upower"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	dev-libs/atk:0
-	>=dev-libs/dbus-glib-0.74:0
-	>=dev-libs/glib-2.36:2
-	>=dev-libs/libmateweather-1.6.1[gtk3(-)=]
-	>=dev-libs/libxml2-2.5:2
-	dev-python/pygobject:3
-	>=gnome-base/libgtop-2.11.92:2=
-	>=mate-base/mate-desktop-1.9[gtk3(-)=]
-	>=mate-base/mate-panel-1.7[gtk3(-)=]
-	>=net-wireless/wireless-tools-28_pre9:0
-	>=sys-apps/dbus-1.1.2:0
-	sys-power/cpupower
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/libnotify-0.7:0
-	x11-libs/libX11:0
-	x11-libs/pango:0
-	virtual/libintl:0
-	!gtk3? (
-		>=gnome-extra/gucharmap-2.32.1:0
-		>=x11-libs/gtk+-2.24:2
-		x11-libs/gtksourceview:2.0
-		>=x11-libs/libwnck-2.30:1
-	)
-	gtk3? (
-		>=gnome-extra/gucharmap-3.0:2.90
-		>=x11-libs/gtk+-3.0:3
-		x11-libs/gtksourceview:3.0
-		>=x11-libs/libwnck-3.0:3
-	)
-	policykit? ( >=sys-auth/polkit-0.92:0 )
-	upower? (
-		|| (
-			>=sys-power/upower-0.9.23
-			>=sys-power/upower-pm-utils-0.9.23
-		)
-	)
-	!!net-analyzer/mate-netspeed"
-
-RDEPEND="${COMMON_DEPEND}
-	>=mate-base/mate-settings-daemon-1.6"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.3
-	app-text/rarian:0
-	>=app-text/scrollkeeper-dtd-1:1.0
-	app-text/yelp-tools:0
-	>=dev-util/intltool-0.50.1:*
-	dev-libs/libxslt:0
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-PATCHES=( "${FILESDIR}/${PN}-1.14.1-cpupower-4.7.patch" )
-
-src_configure() {
-	mate_src_configure \
-		--libexecdir=/usr/libexec/mate-applets \
-		--with-cpufreq-lib=cpupower \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_with X x) \
-		$(use_with upower) \
-		$(use_enable ipv6) \
-		$(use_enable policykit polkit)
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	emake check
-}
-
-src_install() {
-	python_fix_shebang invest-applet
-	mate_src_install
-
-	local APPLETS="accessx-status battstat charpick command cpufreq drivemount
-			geyes invest-applet mateweather multiload netspeed stickynotes
-			timerapplet trashapplet"
-
-	for applet in ${APPLETS}; do
-		docinto ${applet}
-
-		for d in AUTHORS ChangeLog NEWS README README.themes TODO; do
-			[ -s ${applet}/${d} ] && dodoc ${applet}/${d}
-		done
-	done
-}
diff --git a/mate-base/mate-applets/mate-applets-1.16.0-r1.ebuild b/mate-base/mate-applets/mate-applets-1.16.0-r1.ebuild
deleted file mode 100644
index d9c8b7e52daf..000000000000
--- a/mate-base/mate-applets/mate-applets-1.16.0-r1.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit mate python-single-r1
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="Applets for the MATE Desktop and Panel"
-LICENSE="GPL-2 FDL-1.1 LGPL-2"
-SLOT="0"
-
-IUSE="X gtk3 ipv6 policykit +upower"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	dev-libs/atk:0
-	>=dev-libs/dbus-glib-0.74:0
-	>=dev-libs/glib-2.36:2
-	>=dev-libs/libmateweather-1.6.1[gtk3(-)=]
-	>=dev-libs/libxml2-2.5:2
-	dev-python/pygobject:3
-	>=gnome-base/libgtop-2.11.92:2=
-	>=mate-base/mate-panel-1.7[gtk3(-)=]
-	>=net-wireless/wireless-tools-28_pre9:0
-	>=sys-apps/dbus-1.1.2:0
-	sys-power/cpupower
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/libnotify-0.7:0
-	x11-libs/libX11:0
-	x11-libs/pango:0
-	virtual/libintl:0
-	!gtk3? (
-		>=gnome-extra/gucharmap-2.32.1:0
-		>=x11-libs/gtk+-2.24:2
-		x11-libs/gtksourceview:2.0
-		>=x11-libs/libwnck-2.30:1
-	)
-	gtk3? (
-		>=gnome-extra/gucharmap-3.0:2.90
-		>=x11-libs/gtk+-3.0:3
-		x11-libs/gtksourceview:3.0
-		>=x11-libs/libwnck-3.0:3
-	)
-	policykit? ( >=sys-auth/polkit-0.97:0 )
-	upower? (
-		|| (
-			>=sys-power/upower-0.9.23
-			>=sys-power/upower-pm-utils-0.9.23
-		)
-	)
-	!!net-analyzer/mate-netspeed"
-
-RDEPEND="${COMMON_DEPEND}
-	>=mate-base/mate-settings-daemon-1.6"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.3
-	app-text/rarian:0
-	>=app-text/scrollkeeper-dtd-1:1.0
-	app-text/yelp-tools:0
-	>=dev-util/intltool-0.50.1:*
-	dev-libs/libxslt:0
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-PATCHES=( "${FILESDIR}/${PN}-1.16.0-cpupower-4.7.patch" )
-
-src_configure() {
-	mate_src_configure \
-		--libexecdir=/usr/libexec/mate-applets \
-		--with-cpufreq-lib=cpupower \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_with X x) \
-		$(use_with upower) \
-		$(use_enable ipv6) \
-		$(use_enable policykit polkit)
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	emake check
-}
-
-src_install() {
-	python_fix_shebang invest-applet
-	mate_src_install
-
-	local APPLETS="accessx-status battstat charpick command cpufreq drivemount
-			geyes invest-applet mateweather multiload netspeed stickynotes
-			timerapplet trashapplet"
-
-	for applet in ${APPLETS}; do
-		docinto ${applet}
-
-		for d in AUTHORS ChangeLog NEWS README README.themes TODO; do
-			[ -s ${applet}/${d} ] && dodoc ${applet}/${d}
-		done
-	done
-}
diff --git a/mate-base/mate-applets/mate-applets-1.16.0.ebuild b/mate-base/mate-applets/mate-applets-1.16.0.ebuild
deleted file mode 100644
index d54b6acf29fb..000000000000
--- a/mate-base/mate-applets/mate-applets-1.16.0.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit mate python-single-r1
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="Applets for the MATE Desktop and Panel"
-LICENSE="GPL-2 FDL-1.1 LGPL-2"
-SLOT="0"
-
-IUSE="X gtk3 ipv6 policykit +upower"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-#cpupower #593470
-COMMON_DEPEND="${PYTHON_DEPS}
-	dev-libs/atk:0
-	>=dev-libs/dbus-glib-0.74:0
-	>=dev-libs/glib-2.36:2
-	>=dev-libs/libmateweather-1.6.1[gtk3(-)=]
-	>=dev-libs/libxml2-2.5:2
-	dev-python/pygobject:3
-	>=gnome-base/libgtop-2.11.92:2=
-	>=mate-base/mate-panel-1.7[gtk3(-)=]
-	>=net-wireless/wireless-tools-28_pre9:0
-	>=sys-apps/dbus-1.1.2:0
-	<sys-power/cpupower-4.7
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/libnotify-0.7:0
-	x11-libs/libX11:0
-	x11-libs/pango:0
-	virtual/libintl:0
-	!gtk3? (
-		>=gnome-extra/gucharmap-2.32.1:0
-		>=x11-libs/gtk+-2.24:2
-		x11-libs/gtksourceview:2.0
-		>=x11-libs/libwnck-2.30:1
-	)
-	gtk3? (
-		>=gnome-extra/gucharmap-3.0:2.90
-		>=x11-libs/gtk+-3.0:3
-		x11-libs/gtksourceview:3.0
-		>=x11-libs/libwnck-3.0:3
-	)
-	policykit? ( >=sys-auth/polkit-0.97:0 )
-	upower? (
-		|| (
-			>=sys-power/upower-0.9.23
-			>=sys-power/upower-pm-utils-0.9.23
-		)
-	)
-	!!net-analyzer/mate-netspeed"
-
-RDEPEND="${COMMON_DEPEND}
-	>=mate-base/mate-settings-daemon-1.6"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.3
-	app-text/rarian:0
-	>=app-text/scrollkeeper-dtd-1:1.0
-	app-text/yelp-tools:0
-	>=dev-util/intltool-0.50.1:*
-	dev-libs/libxslt:0
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-PATCHES=( "${FILESDIR}/${PN}-1.14.1-revert-upstream-cpupower-4.7-fix.patch" )
-
-src_configure() {
-	mate_src_configure \
-		--libexecdir=/usr/libexec/mate-applets \
-		--with-cpufreq-lib=cpupower \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_with X x) \
-		$(use_with upower) \
-		$(use_enable ipv6) \
-		$(use_enable policykit polkit)
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	emake check
-}
-
-src_install() {
-	python_fix_shebang invest-applet
-	mate_src_install
-
-	local APPLETS="accessx-status battstat charpick command cpufreq drivemount
-			geyes invest-applet mateweather multiload netspeed stickynotes
-			timerapplet trashapplet"
-
-	for applet in ${APPLETS}; do
-		docinto ${applet}
-
-		for d in AUTHORS ChangeLog NEWS README README.themes TODO; do
-			[ -s ${applet}/${d} ] && dodoc ${applet}/${d}
-		done
-	done
-}
diff --git a/mate-base/mate-applets/metadata.xml b/mate-base/mate-applets/metadata.xml
index 80be46261aa9..b0eeaf57aae6 100644
--- a/mate-base/mate-applets/metadata.xml
+++ b/mate-base/mate-applets/metadata.xml
@@ -5,9 +5,6 @@
 		<email>mate@gentoo.org</email>
 		<name>Gentoo MATE Desktop</name>
 	</maintainer>
-	<use>
-		<flag name="gtk3">Build with GTK+3 instead of GTK+2</flag>
-	</use>
 	<upstream>
 		<remote-id type="github">mate-desktop/mate-applets</remote-id>
 	</upstream>
diff --git a/mate-base/mate-common/Manifest b/mate-base/mate-common/Manifest
index f087815931cb..02eb819942e8 100644
--- a/mate-base/mate-common/Manifest
+++ b/mate-base/mate-common/Manifest
@@ -1,9 +1,3 @@
-DIST mate-common-1.12.0.tar.xz 66156 BLAKE2B bd9c37ebac53d098eaad7620b022c064cda9e5614b2c40791a9bf9ff6f10f3b1ba8b61f609d39b4ac6ad6a793f22913994e4a15a7bb2415fbcba677f848510d8 SHA512 3392cc38ee51dec37330ac7d309bd42dfec5f622b50d92af46e16d059781ed4bc1396cb4525518dfe1f2a913fecb426d3ef047731f2208219ef648f27bf54f32
-DIST mate-common-1.14.0.tar.xz 72368 BLAKE2B 3ef9fc5e38312979a6f6d7a00c07adf3e8dc2f67278c4fd76ce1f3ae54330f967bd3554a99313c6a945cbd3730b3ccfd7aad79f88e9b73b0ff0b7dd85ff0089d SHA512 fe0a824796dd65756f7dcd351370f3f537d9990b422cb365419f2f6ec446b6ec9660be35685847ff8ae295a80cda8780a968ab11441c49ac152eb8e50f30dc6a
-DIST mate-common-1.16.0.tar.xz 72392 BLAKE2B 574e1534a8b0cd5ff031a0f344830d3490f01c7b4092660f6cda0340dfbd4abd11dc0102c506046726b6dd2839e1c7e5370cf6723d80d812125c6cfdaebb0a70 SHA512 3cf13f28c43072a26f48099eeeceb920a88bd86c258ca91e58f36c164ffa12b9c43d379c1130734df5c39070c74ee3f144ef7d81a6561244bd07af2b81173224
 DIST mate-common-1.18.0.tar.xz 72608 BLAKE2B 7a280f440de8964ac725582f545c7ae15152c0fef21897dcacb820d539f74fb3aec1d87e9c75e98bc6053bf3db6a69daf2eca3cf2de0cbc8a32d65a62c43187e SHA512 cdc8d39a78ebb1a0fb0d8179814ce59691006a21cb10d78b818cf62a8f42c89d01c9126e93b5fa3b7ac27adce52d3a2512ac2fb63c41e6c5a698a767e9176563
-EBUILD mate-common-1.12.0.ebuild 524 BLAKE2B 2618c704ee84ad2f719f1f827dc14e18ee1da185da40035539ff8badfff0dadd0c80fef70ce147afaaa4053a3b49fe37571e8725407d4b61b0b7749522768acd SHA512 bda08b37eb4a867e2f9153a7510271c13a2cbf656aa5f926187dc8bcfd1bbe55661947ffb7b8c1822b2978e5991487cda45d3634df4b268013fc9a2b531c6596
-EBUILD mate-common-1.14.0.ebuild 526 BLAKE2B 12d9ab041d0ac6b2b10cc4e31ef6aad1b8d1d822e6fc56631c285dc6d18a79cfb2063ca53fc83340443b051c07af7d67d38b827bd591d399535c30f686ac28a8 SHA512 d5245a390ceadebbb2106ab147283a1dfe26622d72a3ac4580927ab78046eea7b61048be20c94edeaa90f99d058ed28cf2fc333918c95294d3b9802e89537bb2
-EBUILD mate-common-1.16.0.ebuild 526 BLAKE2B 12d9ab041d0ac6b2b10cc4e31ef6aad1b8d1d822e6fc56631c285dc6d18a79cfb2063ca53fc83340443b051c07af7d67d38b827bd591d399535c30f686ac28a8 SHA512 d5245a390ceadebbb2106ab147283a1dfe26622d72a3ac4580927ab78046eea7b61048be20c94edeaa90f99d058ed28cf2fc333918c95294d3b9802e89537bb2
 EBUILD mate-common-1.18.0.ebuild 531 BLAKE2B e7a9eb671fee1c0d0bec46e3b6b240fb9709da0675120b4d7ddb6bb3b8294c7af27042cee3870cb9343903963e9455d777a7b290a55f7e01eedde4df9b906290 SHA512 4e58fc07a4f8043c34609b2ee9b5b03e08f90ad464e1e830595aa6705b7d274c20c0cfba6b456f3bf7bcd58a7e8fda3f7c46070b94c6e1872ce7d56c7c11ea8e
 MISC metadata.xml 340 BLAKE2B df96462b37467cd5298fc394d73cfce122d7aea210e48a678d4c32d5c2b6a792cdfaf1c39e6968b33d6c3b9aecacd95fdbb4478cc98a58b6c0527c6708e404ef SHA512 06a836307e50d0ecf5e85516865436cddffaa2d69492c295bad163f3511ded0b7254b541fa73b8b5f314c1574c755f595c1a5af5f55c87f2c96aaf06fffc6262
diff --git a/mate-base/mate-common/mate-common-1.12.0.ebuild b/mate-base/mate-common/mate-common-1.12.0.ebuild
deleted file mode 100644
index 87e27bd29c5d..000000000000
--- a/mate-base/mate-common/mate-common-1.12.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate-desktop.org
-
-if [[ ${PV} == 9999 ]]; then
-	inherit autotools
-else
-	KEYWORDS="amd64 ~arm x86"
-fi
-
-DESCRIPTION="Common files for development of MATE packages"
-LICENSE="GPL-3"
-SLOT="0"
-
-src_prepare() {
-	default
-	if [[ ${PV} == 9999 ]]; then
-		eautoreconf
-	fi
-}
-
-src_install() {
-	mv doc-build/README README.doc-build \
-		|| die "Failed to rename doc-build/README."
-
-	default
-
-	dodoc doc/usage.txt
-}
diff --git a/mate-base/mate-common/mate-common-1.14.0.ebuild b/mate-base/mate-common/mate-common-1.14.0.ebuild
deleted file mode 100644
index 6908a4605805..000000000000
--- a/mate-base/mate-common/mate-common-1.14.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate-desktop.org
-
-if [[ ${PV} == 9999 ]]; then
-	inherit autotools
-else
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="Common files for development of MATE packages"
-LICENSE="GPL-3"
-SLOT="0"
-
-src_prepare() {
-	default
-	if [[ ${PV} == 9999 ]]; then
-		eautoreconf
-	fi
-}
-
-src_install() {
-	mv doc-build/README README.doc-build \
-		|| die "Failed to rename doc-build/README."
-
-	default
-
-	dodoc doc/usage.txt
-}
diff --git a/mate-base/mate-common/mate-common-1.16.0.ebuild b/mate-base/mate-common/mate-common-1.16.0.ebuild
deleted file mode 100644
index 6908a4605805..000000000000
--- a/mate-base/mate-common/mate-common-1.16.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate-desktop.org
-
-if [[ ${PV} == 9999 ]]; then
-	inherit autotools
-else
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="Common files for development of MATE packages"
-LICENSE="GPL-3"
-SLOT="0"
-
-src_prepare() {
-	default
-	if [[ ${PV} == 9999 ]]; then
-		eautoreconf
-	fi
-}
-
-src_install() {
-	mv doc-build/README README.doc-build \
-		|| die "Failed to rename doc-build/README."
-
-	default
-
-	dodoc doc/usage.txt
-}
diff --git a/mate-base/mate-control-center/Manifest b/mate-base/mate-control-center/Manifest
index caa9173e5e64..235b5942a6f2 100644
--- a/mate-base/mate-control-center/Manifest
+++ b/mate-base/mate-control-center/Manifest
@@ -1,10 +1,3 @@
-AUX mate-control-center-1.12.1-backport-appindicator-configure.patch 2662 BLAKE2B 8c5bc2cfb66aa4a0b97bda5f95faaaed9d9f347ef17549e46d2a5fdd298a1cab6351574c4505cbf106bdd4f3ab393b5910c1b6bff72e237ebc7f8de48cd8c387 SHA512 ffa139b6966935b22fa0ab59349b944318ba483670187de9b65135d64fdf8e18cafd0c67667b45e4e0450fdb77616c84b9e91eaa933e5ee30c2b6a6900be55d5
-DIST mate-control-center-1.12.1.tar.xz 1304732 BLAKE2B 7556f8b87f6c8e78475d77e7e6e1fde88a81f8c3c795cee2aa8bf0167dec9ed336e632e17b4d2d098fb7fb6fe3d48b01b374934ee2e2898f548e5ccde2eeface SHA512 4023511113c993b2420666803a273923b161cd3fff74b07e02f3dd9a80baea47278ca5c10a5baec673818390174a9f0b5c2d8db81c653f48c411cf5f53cc2dce
-DIST mate-control-center-1.14.1.tar.xz 1371360 BLAKE2B d896ba7733d42d440ef1c8f1518a0e0f71e3ca12f59599c47a6ee65a15ae20ee6884d90c067077ecbb15db18472181b4dbb0369ce7186c75e49a75084a8dac69 SHA512 c871486e69174801e6b509848ae416e1b9aa55ca21ea796f7bc9e408ad59d0dfe5feafde59258c8d0019448b620af2fbd73b75cc644c5dc7b031237e3170a30b
-DIST mate-control-center-1.16.1.tar.xz 1330348 BLAKE2B 3062a3a7dc1ad572ef967e5310a318c010036d9377724e007a9ac20b482e6f34246196f013f4f4e5d18ea608a774ee0d7de87fe9573e0758b900ed05e834c291 SHA512 6bba690455cd4097a6a10ea068627768a242dd68da2375e7ab898cae80fc07f5d3286265422edb13359adf3f2e451e41b1693da836d03f99410beda4951e1610
 DIST mate-control-center-1.18.2.tar.xz 1351644 BLAKE2B 30c093b11f3cbf32e3590368001d8d929b8f611c4efd58f6332a70905ef028b8e573e41cbb20b5342ad2b0f459327d9665c4db77104bf49b2b8be4935adc232c SHA512 0acc6d775aa26dd0265ddab80317b2ddd2f027394b55574e29e6ad233b8711bc0984803f76f2cbaeed2bfd2b4397cd5143d5540908f5078080a1749290dac7ab
-EBUILD mate-control-center-1.12.1-r1.ebuild 1823 BLAKE2B 8410aa55eab25a850696743a4751b1ac15bc16c66a64a1254fa0842362f25b04d7c8f643d1ea509a48079613328a0d9259e83480fd3116ca2492f38c01a13498 SHA512 8d42273826ecc9f967907e6a473894fef700db840c9f670fea8a525c65bcc50c1b1bed105068d213c85646200077c87c61dcc570bcd9d023c1d5da2143657d3c
-EBUILD mate-control-center-1.14.1-r1.ebuild 1869 BLAKE2B 2beee593e96e692271665d013077c235e32caeb5cb3527eb7d141f41e54ff94f4a826b7dba8968361676db0e24852d7314b52f787cdab603dd8df562aee8d235 SHA512 0557b63d62309976edd01cad8d6a7d9fc55130d901e54cd71766809fe92f575192adb698e06e8da866ec05b38e7aba0071335e6d774e6415b51c3b0155219bc3
-EBUILD mate-control-center-1.16.1.ebuild 1794 BLAKE2B 9c4fde7961d3729766836b535e0c5bb9f5daef390fefba01f4bb023bf5cdcb086c4d94a6d1d6bd9579300b06bd56ad726f39d8353f22cff1f061b4d711f79613 SHA512 5b915a4302cfaa97a577a5471fa01fefbb7b607f2492d87e471a1f1a09f24bd32a279bc8940704fe345bed396385b1734cc92f3062fdc25846c254bb80843702
 EBUILD mate-control-center-1.18.2.ebuild 1531 BLAKE2B 499ba1ad00d4be96d3875d6fcd80176ec3e9bcbd9ca7d6775ae83604ed8783a86a135833536811e96fe16f3fb55579986f4e7fef4e4b718f2a36e685fb3cc914 SHA512 cc6ef7367c9b00a8aabfa60581ab1f129ab59a83a417fb434506922a5d95c52269418a6a2c1953794c66f8d9507faa26197cb0632a0dd84be12b148f0f87e13a
-MISC metadata.xml 488 BLAKE2B 6def839521080b9734f402356249b2c318fce40541ff2f5063e829b1022dea8b74c24b8369d35a5fb1137262363b9b230755265a148f968656962beff32249ba SHA512 52b8617cf3bb2e4750d20e3c869f0624b290dc0a2b4dcaf56851fdbc3b978088bca2c616c76a8b161f5bc7c91f22b28bfb1043e415d615ce3ece59f435dbb137
+MISC metadata.xml 427 BLAKE2B 3173ace743875b3fc77146513bea979bb88cfb6fd77845c1a4fdf733d19a32350caa6036b0db1d7c0ea7c9374fa3a862c22b60d99b134bae5827939fff1ba00a SHA512 ce23384af4d89040b75cc52a42890d6a61c2eafaf214a3ccc2137534371bcb7189c2948053b8a76de4cf9653ee422833d2d23a5ec740c9cdabdd95c4083771b3
diff --git a/mate-base/mate-control-center/files/mate-control-center-1.12.1-backport-appindicator-configure.patch b/mate-base/mate-control-center/files/mate-control-center-1.12.1-backport-appindicator-configure.patch
deleted file mode 100644
index b713b7f3a8cc..000000000000
--- a/mate-base/mate-control-center/files/mate-control-center-1.12.1-backport-appindicator-configure.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 90195c0c2e3f45a355286f1640c2f0020a5556b8 Mon Sep 17 00:00:00 2001
-From: raveit65 <chat-to-me@raveit.de>
-Date: Fri, 17 Jun 2016 20:34:06 +0200
-Subject: [PATCH] configure: fix build with libappindicator3
-
----
- configure.ac | 14 +++++++++-----
- 1 file changed, 9 insertions(+), 5 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 9b27671..a11bfdc 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -63,6 +63,8 @@ dnl ==============================================
- dnl Check GTK+ API version
- dnl ==============================================
- 
-+APPINDICATOR_REQUIRED=0.0.13
-+
- AC_MSG_CHECKING([which gtk+ version to compile against])
- AC_ARG_WITH([gtk],
-   [AS_HELP_STRING([--with-gtk=2.0|3.0],[which gtk+ version to compile against (default: 2.0)])],
-@@ -80,6 +82,7 @@ case "$with_gtk" in
-        LIBCANBERRA_API_VERSION=
-        LIBUNIQUE_API_VERSION=1.0
-        ENGINES_FOLDER="engines"
-+       APPINDICATOR_API_VERSION=
-        ;;
-   3.0) GTK_API_VERSION=3.0
-        GTK_REQUIRED=3.0.0
-@@ -87,6 +90,7 @@ case "$with_gtk" in
-        LIBCANBERRA_API_VERSION=3
-        LIBUNIQUE_API_VERSION=3.0
-        ENGINES_FOLDER="theming-engines"
-+       APPINDICATOR_API_VERSION=3
-        ;;
- esac
- AC_SUBST(GTK_API_VERSION)
-@@ -101,7 +105,7 @@ AM_CONDITIONAL(HAVE_LIBCANBERRA_GTK, test "x$CANBERRA_GTK" = "x1")
- AM_CONDITIONAL(HAVE_TYPING_BREAK, test "x$TYPING_BREAK" = xtyping-break)
- 
- dnl app indicator
--APPINDICATOR_REQUIRED=0.0.7
-+APPINDICATOR_PKG=appindicator$APPINDICATOR_API_VERSION-0.1
- 
- AC_ARG_ENABLE(appindicator,
-                         AS_HELP_STRING([--enable-appindicator[=@<:@no/auto/yes@:>@]],[Build support for application indicators ]),
-@@ -109,16 +113,16 @@ AC_ARG_ENABLE(appindicator,
-                         [enable_appindicator="auto"])
- 
- if test x$enable_appindicator = xauto ; then
--        PKG_CHECK_EXISTS([appindicator-0.1 >= $APPINDICATOR_REQUIRED],
-+        PKG_CHECK_EXISTS([$APPINDICATOR_PKG >= $APPINDICATOR_REQUIRED],
-                          enable_appindicator="yes",
-                          enable_appindicator="no")
- fi
- 
- if test x$enable_appindicator = xyes ; then
--        PKG_CHECK_EXISTS([appindicator-0.1 >= $APPINDICATOR_REQUIRED],,
-+        PKG_CHECK_EXISTS([$APPINDICATOR_PKG >= $APPINDICATOR_REQUIRED],,
-                          AC_MSG_ERROR([appindicator-0.1 is not installed]))
-         PKG_CHECK_MODULES(APP_INDICATOR,
--                        appindicator-0.1 >= $APPINDICATOR_REQUIRED)
-+                        $APPINDICATOR_PKG >= $APPINDICATOR_REQUIRED)
-         AC_SUBST(APP_INDICATOR_CFLAGS)
-         AC_SUBST(APP_INDICATOR_LIBS)
-         AC_DEFINE(HAVE_APP_INDICATOR, 1, [Have AppIndicator])
diff --git a/mate-base/mate-control-center/mate-control-center-1.12.1-r1.ebuild b/mate-base/mate-control-center/mate-control-center-1.12.1-r1.ebuild
deleted file mode 100644
index f51605c92113..000000000000
--- a/mate-base/mate-control-center/mate-control-center-1.12.1-r1.ebuild
+++ /dev/null
@@ -1,80 +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="The MATE Desktop configuration tool"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="appindicator debug gtk3"
-
-RDEPEND="app-text/rarian:0
-	dev-libs/atk:0
-	>=dev-libs/dbus-glib-0.73:0
-	>=dev-libs/glib-2.36:2
-	dev-libs/libxml2:2
-	>=gnome-base/dconf-0.13.4:0
-	>=gnome-base/librsvg-2.0:2
-	>=mate-base/libmatekbd-1.6[gtk3(-)=]
-	>=mate-base/mate-desktop-1.11[gtk3(-)=]
-	>=mate-base/caja-1.8[gtk3(-)=]
-	>=mate-base/mate-menus-1.6
-	>=mate-base/mate-settings-daemon-1.11[gtk3(-)=]
-	>=media-libs/fontconfig-1:1.0
-	media-libs/freetype:2
-	>=sys-apps/dbus-1:0
-	x11-apps/xmodmap:0
-	x11-libs/cairo:0
-	x11-libs/gdk-pixbuf:2
-	x11-libs/libX11:0
-	x11-libs/libXScrnSaver:0
-	x11-libs/libXcursor:0
-	x11-libs/libXext:0
-	>=x11-libs/libXi-1.2:0
-	x11-libs/libXrandr:0
-	x11-libs/libXrender:0
-	x11-libs/libXxf86misc:0
-	>=x11-libs/libxklavier-4:0
-	x11-libs/pango:0
-	>=x11-wm/marco-1.9.1[gtk3(-)=]
-	virtual/libintl:0
-	!gtk3? (
-		>=dev-libs/libunique-1:1
-		media-libs/libcanberra:0[gtk]
-		>=x11-libs/gtk+-2.24:2
-		appindicator? ( dev-libs/libappindicator:2 )
-	)
-	gtk3? (
-		>=dev-libs/libunique-3:3
-		media-libs/libcanberra:0[gtk3]
-		>=x11-libs/gtk+-3.0:3
-		appindicator? ( dev-libs/libappindicator:3 )
-	)"
-
-DEPEND="${RDEPEND}
-	>=app-text/scrollkeeper-dtd-1:1.0
-	app-text/yelp-tools:0
-	dev-util/desktop-file-utils:0
-	>=dev-util/intltool-0.50.1:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*
-	x11-base/xorg-proto"
-
-PATCHES=( "${FILESDIR}/${PN}-1.12.1-backport-appindicator-configure.patch" )
-
-src_configure() {
-	mate_src_configure \
-		--disable-update-mimedb \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_enable appindicator) \
-		$(use_enable debug)
-}
diff --git a/mate-base/mate-control-center/mate-control-center-1.14.1-r1.ebuild b/mate-base/mate-control-center/mate-control-center-1.14.1-r1.ebuild
deleted file mode 100644
index 0a2e57bb6083..000000000000
--- a/mate-base/mate-control-center/mate-control-center-1.14.1-r1.ebuild
+++ /dev/null
@@ -1,83 +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="The MATE Desktop configuration tool"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="appindicator debug gtk3"
-
-COMMON_DEPEND="
-	dev-libs/atk:0
-	>=dev-libs/dbus-glib-0.73:0
-	>=dev-libs/glib-2.36:2
-	dev-libs/libxml2:2
-	>=gnome-base/dconf-0.13.4:0
-	>=gnome-base/librsvg-2.0:2
-	>=mate-base/libmatekbd-1.6[gtk3(-)=]
-	>=mate-base/mate-desktop-1.11[gtk3(-)=]
-	>=mate-base/caja-1.8[gtk3(-)=]
-	>=mate-base/mate-menus-1.6
-	>=mate-base/mate-settings-daemon-1.13.1[gtk3(-)=]
-	>=media-libs/fontconfig-1:1.0
-	media-libs/freetype:2
-	>=sys-apps/dbus-1:0
-	x11-apps/xmodmap:0
-	x11-libs/cairo:0
-	x11-libs/gdk-pixbuf:2
-	x11-libs/libX11:0
-	x11-libs/libXScrnSaver:0
-	x11-libs/libXcursor:0
-	x11-libs/libXext:0
-	>=x11-libs/libXi-1.2:0
-	x11-libs/libXrandr:0
-	x11-libs/libXrender:0
-	x11-libs/libXxf86misc:0
-	>=x11-libs/libxklavier-4:0
-	x11-libs/pango:0
-	>=x11-wm/marco-1.9.1[gtk3(-)=]
-	virtual/libintl:0
-	!gtk3? (
-		>=dev-libs/libunique-1:1
-		media-libs/libcanberra:0[gtk]
-		>=x11-libs/gtk+-2.24:2
-		appindicator? ( dev-libs/libappindicator:2 )
-	)
-	gtk3? (
-		>=dev-libs/libunique-3:3
-		media-libs/libcanberra:0[gtk3]
-		>=x11-libs/gtk+-3.0:3
-		appindicator? ( dev-libs/libappindicator:3 )
-	)"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/rarian:0
-	>=app-text/scrollkeeper-dtd-1:1.0
-	app-text/yelp-tools:0
-	dev-util/desktop-file-utils:0
-	>=dev-util/intltool-0.50.1:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*
-	x11-base/xorg-proto"
-
-PATCHES=( "${FILESDIR}/${PN}-1.12.1-backport-appindicator-configure.patch" )
-
-src_configure() {
-	mate_src_configure \
-		--disable-update-mimedb \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_enable appindicator) \
-		$(use_enable debug)
-}
diff --git a/mate-base/mate-control-center/mate-control-center-1.16.1.ebuild b/mate-base/mate-control-center/mate-control-center-1.16.1.ebuild
deleted file mode 100644
index cf625f137e25..000000000000
--- a/mate-base/mate-control-center/mate-control-center-1.16.1.ebuild
+++ /dev/null
@@ -1,81 +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="The MATE Desktop configuration tool"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="appindicator debug gtk3"
-
-COMMON_DEPEND="
-	dev-libs/atk:0
-	>=dev-libs/dbus-glib-0.73:0
-	>=dev-libs/glib-2.36:2
-	dev-libs/libxml2:2
-	>=gnome-base/dconf-0.13.4:0
-	>=gnome-base/librsvg-2.0:2
-	>=mate-base/libmatekbd-1.6[gtk3(-)=]
-	>=mate-base/mate-desktop-1.15.1[gtk3(-)=]
-	>=mate-base/caja-1.8[gtk3(-)=]
-	>=mate-base/mate-menus-1.6
-	>=mate-base/mate-settings-daemon-1.13.1[gtk3(-)=]
-	>=media-libs/fontconfig-1:1.0
-	media-libs/freetype:2
-	>=sys-apps/dbus-1:0
-	x11-apps/xmodmap:0
-	x11-libs/cairo:0
-	x11-libs/gdk-pixbuf:2
-	x11-libs/libX11:0
-	x11-libs/libXScrnSaver:0
-	x11-libs/libXcursor:0
-	x11-libs/libXext:0
-	>=x11-libs/libXi-1.2:0
-	x11-libs/libXrandr:0
-	x11-libs/libXrender:0
-	x11-libs/libXxf86misc:0
-	>=x11-libs/libxklavier-4:0
-	x11-libs/pango:0
-	>=x11-wm/marco-1.13.1[gtk3(-)=]
-	virtual/libintl:0
-	!gtk3? (
-		>=dev-libs/libunique-1:1
-		media-libs/libcanberra:0[gtk]
-		>=x11-libs/gtk+-2.24:2
-		appindicator? ( dev-libs/libappindicator:2 )
-	)
-	gtk3? (
-		>=dev-libs/libunique-3:3
-		media-libs/libcanberra:0[gtk3]
-		>=x11-libs/gtk+-3.0:3
-		appindicator? ( dev-libs/libappindicator:3 )
-	)"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/rarian:0
-	>=app-text/scrollkeeper-dtd-1:1.0
-	app-text/yelp-tools:0
-	dev-util/desktop-file-utils:0
-	>=dev-util/intltool-0.50.1:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*
-	x11-base/xorg-proto"
-
-src_configure() {
-	mate_src_configure \
-		--disable-update-mimedb \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_enable appindicator) \
-		$(use_enable debug)
-}
diff --git a/mate-base/mate-control-center/metadata.xml b/mate-base/mate-control-center/metadata.xml
index 5b149532c5d2..3442f108b7e3 100644
--- a/mate-base/mate-control-center/metadata.xml
+++ b/mate-base/mate-control-center/metadata.xml
@@ -7,7 +7,6 @@
 	</maintainer>
 	<use>
 		<flag name="appindicator">Add support for AppIndicator</flag>
-		<flag name="gtk3">Build with GTK+3 instead of GTK+2</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">mate-desktop/mate-control-center</remote-id>
diff --git a/mate-base/mate-desktop/Manifest b/mate-base/mate-desktop/Manifest
index ec325e5dd0c0..34564bdfd679 100644
--- a/mate-base/mate-desktop/Manifest
+++ b/mate-base/mate-desktop/Manifest
@@ -1,9 +1,3 @@
-DIST mate-desktop-1.12.1.tar.xz 773332 BLAKE2B 90e70929dcf1b3136a17ae658065d823dd052c53677db0b57e6843c4c86da4bd4de1f036c54b0fe0cc29b7c4e3bd83e9583a14ed148f30d67f8631a756891f50 SHA512 bcd3731bded736cdb4e0531d9c35253c025fa654d51f3ffb72ad7768ef62a1407b6ef62c2ff6beb45b0a30c2fe85e8d72c3e13068c92716e85f99f103b562c9e
-DIST mate-desktop-1.14.1.tar.xz 829244 BLAKE2B baecc3f130d095b2f1c679591ac48c28cf5fcb2b785ecd55ff03fde7b7b44b72cdf52dc38d931a2a312ce2999e5d3fc4a48cede4fc19d1ee2aa85f7e6003861e SHA512 b8d9688bfbea83d1264bce32be72fcb629b007e073553af24a9a79895baa29db3137cf6eed6a1bdf1a0b16ba3e02de892e85cbcfa62b84773d02fce71311496d
-DIST mate-desktop-1.16.2.tar.xz 822124 BLAKE2B 5c5ad8048dabfd460662e5c9b0f9ddc08119fc1eda31a6496ba3f344f4625e3243e9c88c1ea9fd2cdb54ffba7957ab0f6907beb5ec82dc81ab854d4e77567cd2 SHA512 da557edae0f5e2ed197b3d4601fa49e791274f7c5e6ba47846ee47d886ac660849786b7b143028826a5c29520465c06f100df7d9999717aace05d78d0da1f6d7
 DIST mate-desktop-1.18.0.tar.xz 827332 BLAKE2B e5a0439c768a388a76f1bd2a7ba819d92fd020565d63d4b412c5edac54c28493e83d9fa9c5b9f7c82dd5d76338f257e7cb8db7318d7743f6101098f20d47db5c SHA512 0490e9810009923fa315e7f191103bc797c37f4417cf41bf317c55d26f7b52a848a65c28dde6903a861694c131ca52f3ed0be05cbbf6b2dd1cb216539f513220
-EBUILD mate-desktop-1.12.1-r2.ebuild 1329 BLAKE2B 2c6bc45253936c8b2bb642be0c355e3592eb2a8d9f7e2cbd11c7ec41499b0dba864fd35be88ece2f6b69066acf6be2d753f68d1e2003de9e8d63ff332c91dc9b SHA512 0e61be636733c845f8e3a473dcf1b9477c713534479f1fa162107242faed887fa274840928b984bb966d0debc792cb89740b86ef55a18ace64fa1f3886c0fbc3
-EBUILD mate-desktop-1.14.1.ebuild 1217 BLAKE2B 1bbff2eea6460d5a714653f6f2d553503796e5993289c57dd8bda80d7e942fead6f9e0e2d9516ca0e499f88a76d0b3e3e351bddabae68a6650f446d5200fb95b SHA512 4c783e9a22216f32926a74fd093ccf400e7693b9ab16a5ae6e1d6b30b278b9a146822e9df55be9b07564503b826540521b43be5442ecf6bf5399de7424681b9d
-EBUILD mate-desktop-1.16.2.ebuild 1217 BLAKE2B 1bbff2eea6460d5a714653f6f2d553503796e5993289c57dd8bda80d7e942fead6f9e0e2d9516ca0e499f88a76d0b3e3e351bddabae68a6650f446d5200fb95b SHA512 4c783e9a22216f32926a74fd093ccf400e7693b9ab16a5ae6e1d6b30b278b9a146822e9df55be9b07564503b826540521b43be5442ecf6bf5399de7424681b9d
 EBUILD mate-desktop-1.18.0.ebuild 1099 BLAKE2B 4860142639df89d4b26afdd0345fb3ca15e731a8374d4afb44ffccc6e9a05a63bf170adce37a48cd7bad8a8020d39e37512b8e68e3d3fe910c67d4dc5a663ead SHA512 4e9d1a5d683ac97ae580bf1a0cd2fa7413b8ee6b074a0882e9c71e3fa4040d1af9585484663c193fd13e8e1d2414551c54eb09c9e65b3d550ebd3eb83af8afa7
-MISC metadata.xml 417 BLAKE2B 947a1abeccf86daa74d6dd42b4b63b32599287585397131e1a51b349bd4fdcd64d934467608cd6cfd682474201ff7b08b9c64553a4b08c09a867cf2d45d5efb6 SHA512 e3bc89370c680206ae9cab86e17bfcb36f4d2efa93b6d5a8b5964e445e95fd3873861a6c10f1069a8c9caae61268973aab97ff9ef72b3fdfe9334ad11ead0a51
+MISC metadata.xml 341 BLAKE2B d5ca73000fca7b5092f767fc927d65f32ab507a08f2d8c6f1a48d1a70ed25653467f75de3b556543512b3d7d9cc4b1704166eea72bd3ca708ad0b40e216e534a SHA512 7d54ddfb1e11f270908131ea9e1287efb589d0015305576d05bb2d57c74ec3778c004fa4a1533140026eeb4774c8b50f79045564877c9c2e06e4e446e101e08b
diff --git a/mate-base/mate-desktop/mate-desktop-1.12.1-r2.ebuild b/mate-base/mate-desktop/mate-desktop-1.12.1-r2.ebuild
deleted file mode 100644
index 59177607a9c1..000000000000
--- a/mate-base/mate-desktop/mate-desktop-1.12.1-r2.ebuild
+++ /dev/null
@@ -1,53 +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-r1
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm x86"
-fi
-
-DESCRIPTION="Libraries for the MATE desktop that are not part of the UI"
-LICENSE="GPL-2 FDL-1.1 LGPL-2"
-SLOT="0"
-
-IUSE="X debug gtk3 +introspection startup-notification"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-libs/glib-2.36:2
-	x11-libs/cairo:0
-	>=x11-libs/gdk-pixbuf-2.4:2[introspection?]
-	x11-libs/libX11:0
-	>=x11-libs/libXrandr-1.3:0
-	virtual/libintl:0
-	!gtk3? ( >=x11-libs/gtk+-2.24:2[introspection?] )
-	gtk3? ( >=x11-libs/gtk+-3.0:3[introspection?] )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.7:= )
-	startup-notification? ( >=x11-libs/startup-notification-0.5:0 )"
-
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.40:*
-	>=gnome-base/dconf-0.13.4:0
-	sys-devel/gettext:*
-	virtual/pkgconfig:*
-	x11-base/xorg-proto"
-
-src_configure() {
-	mate_src_configure \
-		--enable-mate-about \
-		--disable-mate-conf-import \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_with X x) \
-		$(use_enable debug) \
-		$(use_enable introspection) \
-		$(use_enable startup-notification)
-}
diff --git a/mate-base/mate-desktop/mate-desktop-1.14.1.ebuild b/mate-base/mate-desktop/mate-desktop-1.14.1.ebuild
deleted file mode 100644
index 6e2ff4767e73..000000000000
--- a/mate-base/mate-desktop/mate-desktop-1.14.1.ebuild
+++ /dev/null
@@ -1,52 +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="Libraries for the MATE desktop that are not part of the UI"
-LICENSE="GPL-2 FDL-1.1 LGPL-2"
-SLOT="0"
-
-IUSE="X debug gtk3 +introspection startup-notification"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.36:2
-	>=gnome-base/dconf-0.13.4:0
-	x11-libs/cairo:0
-	x11-libs/libX11:0
-	>=x11-libs/libXrandr-1.3:0
-	virtual/libintl:0
-	!gtk3? ( >=x11-libs/gtk+-2.24:2[introspection?] )
-	gtk3? ( >=x11-libs/gtk+-3.0:3[introspection?] )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.7:= )
-	startup-notification? ( >=x11-libs/startup-notification-0.5:0 )"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.40:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*
-	x11-base/xorg-proto"
-
-src_configure() {
-	mate_src_configure \
-		--disable-mpaste \
-		--enable-mate-about \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_with X x) \
-		$(use_enable debug) \
-		$(use_enable introspection) \
-		$(use_enable startup-notification)
-}
diff --git a/mate-base/mate-desktop/mate-desktop-1.16.2.ebuild b/mate-base/mate-desktop/mate-desktop-1.16.2.ebuild
deleted file mode 100644
index 6e2ff4767e73..000000000000
--- a/mate-base/mate-desktop/mate-desktop-1.16.2.ebuild
+++ /dev/null
@@ -1,52 +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="Libraries for the MATE desktop that are not part of the UI"
-LICENSE="GPL-2 FDL-1.1 LGPL-2"
-SLOT="0"
-
-IUSE="X debug gtk3 +introspection startup-notification"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.36:2
-	>=gnome-base/dconf-0.13.4:0
-	x11-libs/cairo:0
-	x11-libs/libX11:0
-	>=x11-libs/libXrandr-1.3:0
-	virtual/libintl:0
-	!gtk3? ( >=x11-libs/gtk+-2.24:2[introspection?] )
-	gtk3? ( >=x11-libs/gtk+-3.0:3[introspection?] )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.7:= )
-	startup-notification? ( >=x11-libs/startup-notification-0.5:0 )"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.40:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*
-	x11-base/xorg-proto"
-
-src_configure() {
-	mate_src_configure \
-		--disable-mpaste \
-		--enable-mate-about \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_with X x) \
-		$(use_enable debug) \
-		$(use_enable introspection) \
-		$(use_enable startup-notification)
-}
diff --git a/mate-base/mate-desktop/metadata.xml b/mate-base/mate-desktop/metadata.xml
index 5d6f0fede527..07d2ede1a16b 100644
--- a/mate-base/mate-desktop/metadata.xml
+++ b/mate-base/mate-desktop/metadata.xml
@@ -5,9 +5,6 @@
 		<email>mate@gentoo.org</email>
 		<name>Gentoo MATE Desktop</name>
 	</maintainer>
-	<use>
-		<flag name="gtk3">Build with GTK+3 instead of GTK+2</flag>
-	</use>
 	<upstream>
 		<remote-id type="github">mate-desktop/mate-desktop</remote-id>
 	</upstream>
diff --git a/mate-base/mate-menus/Manifest b/mate-base/mate-menus/Manifest
index d62aa77f9bd2..6ac547ce9f2f 100644
--- a/mate-base/mate-menus/Manifest
+++ b/mate-base/mate-menus/Manifest
@@ -1,10 +1,4 @@
 AUX 10-xdg-menu-mate 113 BLAKE2B e49a76bdbbe1b08782ccd216afbc40bc49b4b16cb399c29e7a6860154cbd0d6d2712f85bd2edef53e9f53a4d92d29ec9524916f123d44e930a81cca3e60a3cb6 SHA512 8d4c30c79ecca4d1ff4dad7e7946f9e967ac33cf54dcccb1e1325bff298ffef6306bcf5865071e388e3a17ba77bc79896246a4b44b42c72c20ed13c4677fb8ef
-DIST mate-menus-1.12.0.tar.xz 342488 BLAKE2B da9ae8e64d4f498ac360e41646e49ccd0c2d76dddfa417a3bcd07f860e16f66b58679b3aae761fd11d2c9cc1d47a97a444b2de8b2d9d584fc43c1184da38727d SHA512 12788d5b88c1dba7b561a3119e311a9724629d1f9ae7d54a9e4443946b331c532310c79b7b39bcacc791697ac52d4b55338051da66c4d747c371575a03183ba6
-DIST mate-menus-1.14.0.tar.xz 362136 BLAKE2B cb4123add4f5c9e794050e8ee63ce4d8d3f3cf39e68111a8909df5b24ed5c89a1c614c0939616bc2ba0ef73e412d933f694f8e378c09a6fdee959aa04174c79a SHA512 9d82737669b37e85ab76e94e84a464d7cafb837b71d6af90cf08b4286480de901e1a37d279ba7f0af25e655c3c9c67481b1394587b6aad902a284a8ac58559c6
-DIST mate-menus-1.16.0.tar.xz 356832 BLAKE2B 1ef09eedb48424dcd740c37bb83bd7c2e15895506f26faa688f9eb0c4fdeb7c814b039d14e6a26a7ab8ac442e72e8b67a71a09180573ec1b6542b3e49e91be5e SHA512 c6cc3ce73dfdcbe7db4a10c68d1acc5c8433f077576d047b2c3488716ff40733ae86b50480abd5c4fa033275d6f6a04dbe4c6e049a4be85fd132e8291b0d97b5
 DIST mate-menus-1.18.1.tar.xz 359768 BLAKE2B c57095e772610c56a02a5b6b1405c5ccc11cb590ea959efa14bd0ffb5cafbe3a678f8a681e39ae9cf607225f57becfc520ec483e6451f07b7f9e80418496502b SHA512 bfd010735acd3447700a4732da16728d429ca8ba559c6bfc6edfdaea52f4e40552882bb09615fc4f040730bffac7614bb74fe18aee3ab8ee1684dad40a82d572
-EBUILD mate-menus-1.12.0-r1.ebuild 1615 BLAKE2B 32d5ee67192285745ed72daabd089b2e4a0373b36841bdf925a5cca116fc3891e0ac41b7de77452a1fd3c2726abcdee93006a5d0a21fd939015403cefc73a532 SHA512 c432cf2e3bae6db9af492b27b7faea5c7f1d0e1dfb4fffdbaccfad0f1116be8d6de26b224da0cf38342a1b77e09aa6ba8bbe5ab96d77c07c3e91479d9a57cbe6
-EBUILD mate-menus-1.14.0.ebuild 1657 BLAKE2B c5284ed6269c5f8cefe886b28e1bd5bb3179a1db579c9384e2a4a25de8148f02e6db01edef8b7ececcbc6ec58d6aef9608f3df9775c37ce3d01a828bef12b8ea SHA512 0f3d64f451d627ef7ac9fa2e39f391548e30158ea2dc5e7760dcac51df6a0566444e4976626f73435cab78ca9251bc73d4717f4e11747335d328df5819d6ddb3
-EBUILD mate-menus-1.16.0.ebuild 1657 BLAKE2B c5284ed6269c5f8cefe886b28e1bd5bb3179a1db579c9384e2a4a25de8148f02e6db01edef8b7ececcbc6ec58d6aef9608f3df9775c37ce3d01a828bef12b8ea SHA512 0f3d64f451d627ef7ac9fa2e39f391548e30158ea2dc5e7760dcac51df6a0566444e4976626f73435cab78ca9251bc73d4717f4e11747335d328df5819d6ddb3
 EBUILD mate-menus-1.18.1.ebuild 1662 BLAKE2B 769dee26a473f7ac70de68ea19596f888c2552f92be6a1e590caa70e352657b17f89882d5a86389141fbfc07377bf188b09325eccc70c3942e6d5f326d5da7ec SHA512 a34b7ef40a6bef926514bdfebdff1ac3a269aae1c02372c72f95e847cb1ecd5254d841c5795b8b95f912a4b566635fa2330d8115340b8ce8188939e884e442c7
 MISC metadata.xml 339 BLAKE2B 0aa628f37ca885f294c05a4f97ecea8b57a588e02997ef0ab33485ada19abbae35e2c1ed5ed9f18c2b9143d9f0e4cf76ec2adbfec74a96062b5ddee0fb337dfc SHA512 39239eed6c1808d1b279a5924b2c66dfd38a4548b182b79e2a2f9c00f64a799c4e99d510b30a2ca179a918218e4e49b021e7cb3386c30c86b776a36f3800b03c
diff --git a/mate-base/mate-menus/mate-menus-1.12.0-r1.ebuild b/mate-base/mate-menus/mate-menus-1.12.0-r1.ebuild
deleted file mode 100644
index 76d6841fb771..000000000000
--- a/mate-base/mate-menus/mate-menus-1.12.0-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-r1 mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm x86"
-fi
-
-DESCRIPTION="MATE menu system, implementing the F.D.O cross-desktop spec"
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-
-IUSE="debug +introspection python"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND=">=dev-libs/glib-2.36.0:2
-	virtual/libintl:0
-	introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
-	python? (
-		dev-python/pygtk:2[${PYTHON_USEDEP}]
-		${PYTHON_DEPS}
-	)"
-
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.40:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-src_prepare() {
-	mate_src_prepare
-	use python && python_copy_sources
-}
-
-src_configure() {
-	# Do NOT compile with --disable-debug/--enable-debug=no as it disables API
-	# usage checks.
-	mate_py_cond_func_wrap mate_src_configure \
-		--enable-debug=$(usex debug yes minimum) \
-		$(use_enable python) \
-		$(use_enable introspection)
-}
-
-src_compile() {
-	mate_py_cond_func_wrap default
-}
-
-src_test() {
-	mate_py_cond_func_wrap emake check
-}
-
-src_install() {
-	mate_py_cond_func_wrap mate_src_install
-
-	exeinto /etc/X11/xinit/xinitrc.d/
-	doexe "${FILESDIR}/10-xdg-menu-mate"
-}
-
-pkg_postinst() {
-	mate_pkg_postinst
-	einfo "Due to upstream bug"
-	einfo "https://github.com/mate-desktop/mate-menus/issues/2,"
-	einfo "it is highly recommended to run the following command"
-	einfo "once you have logged in to your desktop for the first time:"
-	einfo "cd ~/.config/menus && ln -s {,mate-}applications-merged"
-}
diff --git a/mate-base/mate-menus/mate-menus-1.14.0.ebuild b/mate-base/mate-menus/mate-menus-1.14.0.ebuild
deleted file mode 100644
index f32609d8757d..000000000000
--- a/mate-base/mate-menus/mate-menus-1.14.0.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-r1 mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="MATE menu system, implementing the F.D.O cross-desktop spec"
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-
-IUSE="debug +introspection python"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-COMMON_DEPEND=">=dev-libs/glib-2.36.0:2
-	virtual/libintl:0
-	introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
-	python? (
-		dev-python/pygtk:2[${PYTHON_USEDEP}]
-		${PYTHON_DEPS}
-	)"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.40:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-src_prepare() {
-	mate_src_prepare
-	use python && python_copy_sources
-}
-
-src_configure() {
-	# Do NOT compile with --disable-debug/--enable-debug=no as it disables API
-	# usage checks.
-	mate_py_cond_func_wrap mate_src_configure \
-		--enable-debug=$(usex debug yes minimum) \
-		$(use_enable python) \
-		$(use_enable introspection)
-}
-
-src_compile() {
-	mate_py_cond_func_wrap default
-}
-
-src_test() {
-	mate_py_cond_func_wrap emake check
-}
-
-src_install() {
-	mate_py_cond_func_wrap mate_src_install
-
-	exeinto /etc/X11/xinit/xinitrc.d/
-	doexe "${FILESDIR}/10-xdg-menu-mate"
-}
-
-pkg_postinst() {
-	mate_pkg_postinst
-	einfo "Due to upstream bug"
-	einfo "https://github.com/mate-desktop/mate-menus/issues/2,"
-	einfo "it is highly recommended to run the following command"
-	einfo "once you have logged in to your desktop for the first time:"
-	einfo "cd ~/.config/menus && ln -s {,mate-}applications-merged"
-}
diff --git a/mate-base/mate-menus/mate-menus-1.16.0.ebuild b/mate-base/mate-menus/mate-menus-1.16.0.ebuild
deleted file mode 100644
index f32609d8757d..000000000000
--- a/mate-base/mate-menus/mate-menus-1.16.0.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-r1 mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="MATE menu system, implementing the F.D.O cross-desktop spec"
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-
-IUSE="debug +introspection python"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-COMMON_DEPEND=">=dev-libs/glib-2.36.0:2
-	virtual/libintl:0
-	introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
-	python? (
-		dev-python/pygtk:2[${PYTHON_USEDEP}]
-		${PYTHON_DEPS}
-	)"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.40:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-src_prepare() {
-	mate_src_prepare
-	use python && python_copy_sources
-}
-
-src_configure() {
-	# Do NOT compile with --disable-debug/--enable-debug=no as it disables API
-	# usage checks.
-	mate_py_cond_func_wrap mate_src_configure \
-		--enable-debug=$(usex debug yes minimum) \
-		$(use_enable python) \
-		$(use_enable introspection)
-}
-
-src_compile() {
-	mate_py_cond_func_wrap default
-}
-
-src_test() {
-	mate_py_cond_func_wrap emake check
-}
-
-src_install() {
-	mate_py_cond_func_wrap mate_src_install
-
-	exeinto /etc/X11/xinit/xinitrc.d/
-	doexe "${FILESDIR}/10-xdg-menu-mate"
-}
-
-pkg_postinst() {
-	mate_pkg_postinst
-	einfo "Due to upstream bug"
-	einfo "https://github.com/mate-desktop/mate-menus/issues/2,"
-	einfo "it is highly recommended to run the following command"
-	einfo "once you have logged in to your desktop for the first time:"
-	einfo "cd ~/.config/menus && ln -s {,mate-}applications-merged"
-}
diff --git a/mate-base/mate-panel/Manifest b/mate-base/mate-panel/Manifest
index 360794683b62..4b6fd591bbf0 100644
--- a/mate-base/mate-panel/Manifest
+++ b/mate-base/mate-panel/Manifest
@@ -1,9 +1,3 @@
-DIST mate-panel-1.12.2.tar.xz 1930792 BLAKE2B 8694e39fb16a5565749cfbf62a23ce068f1656c0c64ee39384d3b184acb02212c9ab758d0c547b557d4710116c9335b3b4f5bb8917f811b54c7cb45a6f5aab9b SHA512 7810c3b3585e9def59c192914a91e2e64173b5b44cf43496808f6be46df798fc97358bb7bc300e52985fc401feb5201daad60bb0181e72e5e2512e7712aba6a4
-DIST mate-panel-1.14.2.tar.xz 1981716 BLAKE2B 1963d0035e8a5abf8940a88123408b089b4c19c9ca7a2d696635c653883d2023aa95de42e30bf40948c48c60ca6f410fa2c76f39879c51e44d734ddc9aecbffa SHA512 296a74fcbdd3a58337987c0e8bcc804a203fbf5f134183c2fe09016c609bbd67bfab4dc6e46e333c7714e9c264965f1c3897c9645a5003405866fbdaf0a04944
-DIST mate-panel-1.16.2.tar.xz 1953812 BLAKE2B 20dec8edb56a13774419f8d43ca4d9df1a12f9188001762edd5cb3ff3d1e93365a2fc825d1094538b0f93ad6d8d224d8d2d0afe302d998e453daff726f86f327 SHA512 4d5ad1a657a2a2f04b4a667b1fc4b13b158a2ee8cf379636ac196b16093589e5bb5d97ed06c0c621f72586e01bff791a364aa17ff16554c844f9d870e3b709bb
 DIST mate-panel-1.18.7.tar.xz 1943216 BLAKE2B c811a299d612e11827f6531f3093addfeeb5a8f18449f76dba0f70233f072bd2666bb4cd8b39111da298fbdd966f5b7f21b37ce3fe4870129da0563faabc5a2f SHA512 6de91f16f5ade7873d2baf3d813bd77304723f27629474fdf37aa9c590b5fcb31452f5b117b52926dd53a38e9f8edd964c654fd29c8271131c6901eec46b5a31
-EBUILD mate-panel-1.12.2-r3.ebuild 1688 BLAKE2B cbbdfa3e872b54ac8fa68d24ada32ba2fd9929a122b828ac8e92aed46ff6cb3868f55c0224b31103b445db518e8d08b527585f155d50b416414c708c350ea1f2 SHA512 a04aba1c58bab130082dedb17c2ac7d70fbf8b3cfae00fdb690b0cff0c9ae6acdf3c45bfef761b53d6a9ffe12423558610e0c1052c8b717859c2c1e9576bcd18
-EBUILD mate-panel-1.14.2.ebuild 1598 BLAKE2B 095c13daeeaf196f5eb268c00bb423b1d8883d9f633cbe4e491d8fd7f43ecf2368cd19f2942d15b7482c424477e4aec7c93919c1eb81fadda60cd4f769ad79f1 SHA512 148fd91c7f9db1bd062b26a9fa2a7fb5bb108e2d3b698bcdf7107d5693939db2a67ff9d36b1e3ec981c76297666cecd7230f78f6c58c016309f3e242f07fa6df
-EBUILD mate-panel-1.16.2.ebuild 1598 BLAKE2B bca60dfcdde93e589f7b737c2138956d97eabea5a3e1578748360b8cfda6495f531828da77d1851eb5a3beceb4dcce3f7aab8c63071e7b6ced45d8a433691861 SHA512 08b4afb3d62b322fbe2cadb83687214960476a9a7f531b40870dc7fed3844a98b1a114c27656df9867bf54cb9dfaca6859354a38445ab3c1179f3aa3f0f6ee09
 EBUILD mate-panel-1.18.7.ebuild 1399 BLAKE2B d73452975ad5ccd4d0cb71b58b0a126fd137fea684af580bbab2c6aeeb869a382112bac1cf56d48c6f104ad80f53feac775f4913d9a81485e664f8c3d307e251 SHA512 3fccd420eab25eaa587c3ce124747c0bc742146d0058602c600fb4d5b7a7ba840cb98c64f4711bf6398d8de514b82c44a42dbb43fefabfd53dcdb7a26c9ae6f9
-MISC metadata.xml 415 BLAKE2B b4ccf02438c98ac33146a6710c89166d57bcb48bc681e5089832e97bdd1373e63ab27e2983f5c15cbb384901acf7b72a5b17fa819d9ccf774ec4409d3b558358 SHA512 bb1d49b6f17d4dbb7115979faed200a7e5cf3953c87dd9326f2b96d48ff6daa1edaff6a50b7ba9c5d0706c2e3a9bcca414218cf9f1fcd1f02a0cbed4c64cc847
+MISC metadata.xml 339 BLAKE2B d4e26fe24b5076b1a78c8de45bab802a438bd5fc171da7a6da6dc2460a7cb53677d4044abefc6c925a1b56d60d1a20fcb2334121ac0750d8347dc8ca3497b9c7 SHA512 788f53b6c90c485f6c8e4de2a9d1fd8f895b7c57cb7beeb0ec295a4710ceac5c8537ec9b3b567fbb5fae95cc08ce8892649a4198d40f30363b98f01267d67d26
diff --git a/mate-base/mate-panel/mate-panel-1.12.2-r3.ebuild b/mate-base/mate-panel/mate-panel-1.12.2-r3.ebuild
deleted file mode 100644
index a9c737776581..000000000000
--- a/mate-base/mate-panel/mate-panel-1.12.2-r3.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm x86"
-fi
-
-DESCRIPTION="The MATE panel"
-LICENSE="GPL-2 FDL-1.1 LGPL-2"
-SLOT="0"
-
-IUSE="X gtk3 +introspection"
-
-RDEPEND="
-	dev-libs/atk:0
-	>=dev-libs/dbus-glib-0.80:0
-	>=dev-libs/glib-2.36:2
-	>=dev-libs/libmateweather-1.7[gtk3(-)=]
-	dev-libs/libxml2:2
-	>=gnome-base/dconf-0.10:0
-	gnome-base/librsvg:2
-	>=mate-base/mate-desktop-1.9.3[gtk3(-)=]
-	>=mate-base/mate-menus-1.6
-	>=sys-apps/dbus-1.1.2:0
-	>=x11-libs/cairo-1:0
-	>=x11-libs/gdk-pixbuf-2.7.1:2
-	x11-libs/libICE:0
-	x11-libs/libSM:0
-	x11-libs/libX11:0
-	>=x11-libs/pango-1.15.4:0[introspection?]
-	x11-libs/libXau:0
-	>=x11-libs/libXrandr-1.3:0
-	virtual/libintl:0
-	!gtk3? (
-		media-libs/libcanberra:0[gtk]
-		>=x11-libs/gtk+-2.19.7:2[introspection?]
-		>=x11-libs/libwnck-2.30:1[introspection?]
-	)
-	gtk3? (
-		media-libs/libcanberra:0[gtk3]
-		>=x11-libs/gtk+-3.0:3[introspection?]
-		>=x11-libs/libwnck-3.0:3[introspection?]
-	)
-	introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )"
-
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/yelp-tools:0
-	>=dev-lang/perl-5:0=
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.50.1:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-MATE_FORCE_AUTORECONF=true
-
-src_prepare() {
-	# Disable python check.
-	sed -e '/AM_PATH_PYTHON/d' -i configure.ac || die
-	mate_src_prepare
-}
-
-src_configure() {
-	mate_src_configure \
-		--libexecdir=/usr/libexec/mate-applets \
-		--disable-deprecation-flags \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_with X x) \
-		$(use_enable introspection)
-}
diff --git a/mate-base/mate-panel/mate-panel-1.14.2.ebuild b/mate-base/mate-panel/mate-panel-1.14.2.ebuild
deleted file mode 100644
index 8fca1161980f..000000000000
--- a/mate-base/mate-panel/mate-panel-1.14.2.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="The MATE panel"
-LICENSE="GPL-2 FDL-1.1 LGPL-2"
-SLOT="0"
-
-IUSE="X gtk3 +introspection"
-
-COMMON_DEPEND="
-	dev-libs/atk:0
-	>=dev-libs/dbus-glib-0.80:0
-	>=dev-libs/glib-2.36:2
-	>=dev-libs/libmateweather-1.7[gtk3(-)=]
-	dev-libs/libxml2:2
-	>=gnome-base/dconf-0.10:0
-	>=gnome-base/librsvg-2.36.2:2
-	>=mate-base/mate-desktop-1.9.3[gtk3(-)=]
-	>=mate-base/mate-menus-1.6
-	>=sys-apps/dbus-1.1.2:0
-	>=x11-libs/cairo-1:0
-	>=x11-libs/gdk-pixbuf-2.7.1:2
-	x11-libs/libICE:0
-	x11-libs/libSM:0
-	x11-libs/libX11:0
-	>=x11-libs/pango-1.15.4:0[introspection?]
-	x11-libs/libXau:0
-	>=x11-libs/libXrandr-1.3:0
-	virtual/libintl:0
-	!gtk3? (
-		media-libs/libcanberra:0[gtk]
-		>=x11-libs/gtk+-2.19.7:2[introspection?]
-		>=x11-libs/libwnck-2.30:1[introspection?]
-	)
-	gtk3? (
-		media-libs/libcanberra:0[gtk3]
-		>=x11-libs/gtk+-3.0:3[introspection?]
-		>=x11-libs/libwnck-3.0:3[introspection?]
-	)
-	introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/yelp-tools:0
-	>=dev-lang/perl-5:0=
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.50.1:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-src_configure() {
-	mate_src_configure \
-		--libexecdir=/usr/libexec/mate-applets \
-		--disable-deprecation-flags \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_with X x) \
-		$(use_enable introspection)
-}
diff --git a/mate-base/mate-panel/mate-panel-1.16.2.ebuild b/mate-base/mate-panel/mate-panel-1.16.2.ebuild
deleted file mode 100644
index 9f90e878faa4..000000000000
--- a/mate-base/mate-panel/mate-panel-1.16.2.ebuild
+++ /dev/null
@@ -1,71 +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="The MATE panel"
-LICENSE="GPL-2 FDL-1.1 LGPL-2"
-SLOT="0"
-
-IUSE="X gtk3 +introspection"
-
-COMMON_DEPEND="
-	dev-libs/atk:0
-	>=dev-libs/dbus-glib-0.80:0
-	>=dev-libs/glib-2.36:2
-	>=dev-libs/libmateweather-1.7[gtk3(-)=]
-	dev-libs/libxml2:2
-	>=gnome-base/dconf-0.10:0
-	>=gnome-base/librsvg-2.36.2:2
-	>=mate-base/mate-desktop-1.9.3[gtk3(-)=]
-	>=mate-base/mate-menus-1.6
-	>=sys-apps/dbus-1.1.2:0
-	>=x11-libs/cairo-1:0
-	>=x11-libs/gdk-pixbuf-2.7.1:2
-	x11-libs/libICE:0
-	x11-libs/libSM:0
-	x11-libs/libX11:0
-	>=x11-libs/pango-1.15.4:0[introspection?]
-	x11-libs/libXau:0
-	>=x11-libs/libXrandr-1.3:0
-	virtual/libintl:0
-	!gtk3? (
-		media-libs/libcanberra:0[gtk]
-		>=x11-libs/gtk+-2.19.7:2[introspection?]
-		>=x11-libs/libwnck-2.30:1[introspection?]
-	)
-	gtk3? (
-		media-libs/libcanberra:0[gtk3]
-		>=x11-libs/gtk+-3.0:3[introspection?]
-		>=x11-libs/libwnck-3.0:3[introspection?]
-	)
-	introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/yelp-tools:0
-	>=dev-lang/perl-5:0=
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.50.1:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-src_configure() {
-	mate_src_configure \
-		--libexecdir=/usr/libexec/mate-applets \
-		--disable-deprecation-flags \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_with X x) \
-		$(use_enable introspection)
-}
diff --git a/mate-base/mate-panel/metadata.xml b/mate-base/mate-panel/metadata.xml
index a7e9eb414582..834a9f1460e5 100644
--- a/mate-base/mate-panel/metadata.xml
+++ b/mate-base/mate-panel/metadata.xml
@@ -5,9 +5,6 @@
 		<email>mate@gentoo.org</email>
 		<name>Gentoo MATE Desktop</name>
 	</maintainer>
-	<use>
-		<flag name="gtk3">Build with GTK+3 instead of GTK+2</flag>
-	</use>
 	<upstream>
 		<remote-id type="github">mate-desktop/mate-panel</remote-id>
 	</upstream>
diff --git a/mate-base/mate-session-manager/Manifest b/mate-base/mate-session-manager/Manifest
index ba3677a4716f..90463cc368e2 100644
--- a/mate-base/mate-session-manager/Manifest
+++ b/mate-base/mate-session-manager/Manifest
@@ -2,16 +2,6 @@ AUX 10-user-dirs-update-mate 267 BLAKE2B d1943bd1ee27d95ffd9a09f7d6c4f98681b9c36
 AUX 15-xdg-data-mate 224 BLAKE2B ae38eaf5c0abc088a353d244de928ff12c7da020da0304c5592c7232ae4be69db55083da91fa8d95cdbb6bbc4c4d76ac37df3e011a5a5b984348435a0c615b3c SHA512 a19acef85d510d6244fd29ba7daa6d5cc314392257b47574d8aedea235e4a5273d36bd67c138da9496663c2786ba5f7f433ff4aa6990a91a39be267026e5694d
 AUX MATE 2378 BLAKE2B 824c6e357c90322a499aeeece3e38d25bcfb87c23eab159e1bc3c4dc39aeb535eb86f7833e8d9b9b1d48fc765414ca79120bee81ffde8c7d1f0ea6a112fe2dcc SHA512 dbb162f694eeee806a12b46bf45d47f4887a83562b61d05037b3de5a7778a68d79de5528327588da13a5c17c283c8b7590c10877eba77cea75ebe5113ef2c920
 AUX defaults.list 14293 BLAKE2B b8de50636f845e5ed197968a0f917a3d2c1f59b082ae7d76841c9802ce6182556a29faebcd28f71dfdd778ae73268ebba1d450c9f18ac730aedd5ba0f025e53c SHA512 d3b14a4676bbadb93bc33e94ddf74fc6a2c072c52ada51d8f658008301d795102d47b3e1b71f9884d117111329774deaab1a5c1718c3dab5bcf96df1657f3c9d
-AUX mate-session-manager-1.12.2-save-session-ui.patch 20029 BLAKE2B 11ac604f47ec4b4892666d117d1ad514026fa6d15cdcb973c8d4d0b9051f6505d219ea7bc884ca8b20cf51fcc77913840b7f1adc6b7ea26b993134b7abfa027f SHA512 43501ff0911a3c9e6e007b7b8da771a6bfaac46b33b7b7a7be1570e77cad8222e1b3c0f4db0e23c92e5f3bde593bf52770cb56cad37d78ead028ecce8e5c619d
-DIST mate-session-manager-1.12.2.tar.xz 538832 BLAKE2B 6442fae3076e2ac54b4705326469f1ccc4c4daca8cc06bcfb720a89e347a725e46c18e7b6d987043cb1a9371f73c9cc82324c0d1d6fdf97bbed8c894ae2d398d SHA512 4b4a3ecb0f7cbb25e17db8c5833f789858c94fb236ed60b9e98f59cffa320ec32c2b1960fdcbb9c2c9f476ed76cb1f37c3e07746c7c90e08a0dbcc62aac9793e
-DIST mate-session-manager-1.14.1.tar.xz 574804 BLAKE2B af3ed0abec15a7bf2002d965252b07eb5327c2fc351b1f475c0afc64011a7b18d21d0b4f3d40f56282ea11b8055e21e52ac0a2df9e509442b2e43eeeb549c9af SHA512 993f314c887bca8d8e0b9450f0e62686e133ea16ee2b6675ff69766564d47a4e7d48581867e8d5e8395ee2e3b1735b121f16cb1be22c7da29015a58f98edd638
-DIST mate-session-manager-1.16.1.tar.xz 574540 BLAKE2B 40abb2655acf84c90a8805e967817d1ef4739a1278369f5b632071302d22a9c6cf15d83d69e8ccf7503dc19f8c39844f14afa976a96f905dfd355a7071a609a1 SHA512 fdce8351b5541e7e8455659c1107be2976a24602e61010261fd8d1931d07298033d15fda43163fabc2bfcd6b42120c68e377278b820100686a8ef8e36852ff0e
-DIST mate-session-manager-1.18.0.tar.xz 578256 BLAKE2B ef58007798ac15934b6e8c071ce97ad3bd52d47fdbf639ac7a2e6c1120d67492e77a2d1159700a17a6a6321645b4a63e6de2c493fdc26d65aba4e98f7262c6c5 SHA512 0b1299eed5a745112a9976a85965847fc7a579e161236f4d661cf08a1292037aa8246bd3e3efcf3d0c6ea8b005e9dfc33cec797c8dc48615f7bc88ce5d351ba8
 DIST mate-session-manager-1.18.2.tar.xz 570336 BLAKE2B d1fd8f6a037fa38833d4aae05dcc9ed98ff192c712819342a77d19fb00e09febaa90fd0396048a3cee64ea424c6a72e8ae90f067d61929ef524825c97d500f8e SHA512 e3d3e2524cd0d00930b5c6b81134b969555f00550d23a357d426a6f0d475884ce6ab16be365fd5e95801dd53c250069ad091dec6c93f2ab70818460fbef4765e
-EBUILD mate-session-manager-1.12.2-r1.ebuild 2268 BLAKE2B f1413a4cab927cf550ac419223836dd3b506944c9cd5da37c34c85a4ab945a477d350ff65cdb6482b7ca10b9abb2e12f5e74793cfe364dd8ccc60404a6087b20 SHA512 a4192c79ddbb94ae522d87d304e485e292352b788a0aada7b0003f42b5573948a727deb3e695a5dd58004444ee27054fefca9c0de88c29a9fe43f94d1e3850b8
-EBUILD mate-session-manager-1.14.1.ebuild 2156 BLAKE2B af21c59cc37eb4a955ddd6a168bfe0351f37e8dc8904e510315b7b95da5cc3251a4ae9faf94a3bd32f0a7245ebd5eebacaae17fdbdc6adf1c4dfb85636b4aaad SHA512 ce5408ca30670daedceaa6942ca6097e85ca6cd4167af15d0f075260ab1416da0ed36eefdb46cf9a1854bf22ceea6d20bc88172e15268948fda04c5cfdbbf4e0
-EBUILD mate-session-manager-1.16.1.ebuild 2114 BLAKE2B a7c96a7322526dd5c936179a8b3d5d9d26f97af037aeb3a9ea754fb2c5832decdc4abfde4a79f3cf2bc0c35c69d0d1301cbf31f7bd5c9f107c3edc3aa8c2171f SHA512 b2d2acbab19357943cb195d74ff799435e33016dff4d01b859aa5307f745d4ad81ed1acefa83df8922ff614852b237f42760893b266a22db1819076f6b2713a9
-EBUILD mate-session-manager-1.18.0-r1.ebuild 2052 BLAKE2B aa45fe425cf05f7cd5b4b99d8ede2f8f33d83cc0f5c9d5043317198a591d08ed6fe0f2c508ec72d97148268ec3e551b43789d79228f34f94d19b7646a3a5afc9 SHA512 4ee6d2f4f33b5f2ec093bfec33eea15ef25f205721be118f94a05c95f6d833a3980fd7641a339cf292791dd048c459a2fad31e1045eab31e92d64ec0ac290d09
 EBUILD mate-session-manager-1.18.2-r1.ebuild 2050 BLAKE2B 9863863dcb955c561cd69f67c141608a73e7bfe70804efee79438f5271e342c80da8e2a45e00c25e66ad5092ed8ca944ef9afd8133232e80a181910b5a1fa945 SHA512 cf6cbac9c513aadafa94bbb995bf4ca2f91fde90a0b3f09daab720b3fd73b4fbb349336e8ab96663c3abc557d6eede12e49e37036545f492d67a9775cad5d31a
-EBUILD mate-session-manager-1.18.2.ebuild 2044 BLAKE2B 69a45c09931ab44a5821759ec50d2bc9c1dabbe88c87d92046f2b48d84ecc0b446fd133bee35eac74addd88ffe678b56dbe146d5d6dba098e0d211f9891045b1 SHA512 5538b863f80254dac59b449b453cdfd2468219e0a0274ed64cf628ea24ef6f3dfc8f3651bd3cff6e762825c97186cc1fa64d682dae8aa401b6a5c6b1a2761b17
-MISC metadata.xml 558 BLAKE2B 6c7b3116a26b07af4afe5be2f4635ffeba7a67bddddb5bee3009f20ad215c2fdd4bdd89d3d8f58c02e8edf6ac665da54b35a708936bb6edd12f4c1703360b497 SHA512 3ec5ae6695bb7477bf8384dc31143be21ff5d2f5ac0715309657b14e3b43b8013cfccf701307b2ee1a0f8e2cf0e7956d5db37739578c18006a299e428137ed14
+MISC metadata.xml 497 BLAKE2B 85510300fad0274831fbbb5dbedb00bd3e6347518e0188838f8dce213064db44612ca7e7fbbe922cc46924f02f2fda50120ecba21774231af6e3acea45fc9db4 SHA512 19f431c7d3a9912baaa3df85fd222be5b2649f46a723ffdc084524b172c6c387e4a9928b219d9e73217c7e6ef677f2e5e82473547489001fc20fee7529373568
diff --git a/mate-base/mate-session-manager/files/mate-session-manager-1.12.2-save-session-ui.patch b/mate-base/mate-session-manager/files/mate-session-manager-1.12.2-save-session-ui.patch
deleted file mode 100644
index e7040f47f45a..000000000000
--- a/mate-base/mate-session-manager/files/mate-session-manager-1.12.2-save-session-ui.patch
+++ /dev/null
@@ -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>
diff --git a/mate-base/mate-session-manager/mate-session-manager-1.12.2-r1.ebuild b/mate-base/mate-session-manager/mate-session-manager-1.12.2-r1.ebuild
deleted file mode 100644
index 1f8d061666fe..000000000000
--- a/mate-base/mate-session-manager/mate-session-manager-1.12.2-r1.ebuild
+++ /dev/null
@@ -1,89 +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 x86"
-fi
-
-DESCRIPTION="MATE session manager"
-HOMEPAGE="http://mate-desktop.org/"
-
-LICENSE="GPL-2 LGPL-2 FDL-1.1"
-SLOT="0"
-
-IUSE="debug elibc_FreeBSD gnome-keyring gtk3 ipv6 systemd upower"
-
-# x11-misc/xdg-user-dirs{,-gtk} are needed to create the various XDG_*_DIRs, and
-# create .config/user-dirs.dirs which is read by glib to get G_USER_DIRECTORY_*
-# xdg-user-dirs-update is run during login (see 10-user-dirs-update-gnome below).
-
-RDEPEND=">=dev-libs/dbus-glib-0.76
-	>=dev-libs/glib-2.36:2
-	dev-libs/libxslt
-	sys-apps/dbus
-	x11-apps/xdpyinfo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXau
-	x11-libs/libXext
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/pango
-	x11-libs/xtrans
-	x11-misc/xdg-user-dirs
-	x11-misc/xdg-user-dirs-gtk
-	virtual/libintl
-	elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )
-	gnome-keyring? ( gnome-base/gnome-keyring )
-	!gtk3? ( >=x11-libs/gtk+-2.14:2 )
-	gtk3? ( >=x11-libs/gtk+-3.0:3 )
-	systemd? ( sys-apps/systemd )
-	upower? ( || ( >=sys-power/upower-0.9.23 >=sys-power/upower-pm-utils-0.9.23 ) )"
-
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.40:*
-	>=dev-lang/perl-5
-	>=sys-devel/gettext-0.10.40:*
-	virtual/pkgconfig:*
-	!<gnome-base/gdm-2.20.4"
-
-# Add "session saving" button back,
-# see https://bugzilla.gnome.org/show_bug.cgi?id=575544
-PATCHES=( "${FILESDIR}"/${PN}-1.12.2-save-session-ui.patch )
-
-MATE_FORCE_AUTORECONF=true
-
-src_configure() {
-	mate_src_configure \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_with systemd) \
-		$(use_enable debug) \
-		$(use_enable ipv6) \
-		$(use_enable upower)
-}
-
-src_install() {
-	mate_src_install
-
-	dodir /etc/X11/Sessions/
-	exeinto /etc/X11/Sessions/
-	doexe "${FILESDIR}"/MATE
-
-	dodir /usr/share/mate/applications/
-	insinto /usr/share/mate/applications/
-	doins "${FILESDIR}"/defaults.list
-
-	dodir /etc/X11/xinit/xinitrc.d/
-	exeinto /etc/X11/xinit/xinitrc.d/
-	doexe "${FILESDIR}"/15-xdg-data-mate
-
-	# This should be done in MATE too, see Gentoo bug #270852
-	doexe "${FILESDIR}"/10-user-dirs-update-mate
-}
diff --git a/mate-base/mate-session-manager/mate-session-manager-1.14.1.ebuild b/mate-base/mate-session-manager/mate-session-manager-1.14.1.ebuild
deleted file mode 100644
index 3e193a85805e..000000000000
--- a/mate-base/mate-session-manager/mate-session-manager-1.14.1.ebuild
+++ /dev/null
@@ -1,87 +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 ~x86"
-fi
-
-DESCRIPTION="MATE session manager"
-HOMEPAGE="http://mate-desktop.org/"
-
-LICENSE="GPL-2 LGPL-2 FDL-1.1"
-SLOT="0"
-
-IUSE="debug elibc_FreeBSD gnome-keyring gtk3 ipv6 systemd upower"
-
-# x11-misc/xdg-user-dirs{,-gtk} are needed to create the various XDG_*_DIRs, and
-# create .config/user-dirs.dirs which is read by glib to get G_USER_DIRECTORY_*
-# xdg-user-dirs-update is run during login (see 10-user-dirs-update-gnome below).
-
-COMMON_DEPEND=">=dev-libs/dbus-glib-0.76
-	>=dev-libs/glib-2.36:2
-	dev-libs/libxslt
-	sys-apps/dbus
-	x11-libs/gdk-pixbuf:2
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXau
-	x11-libs/libXext
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/pango
-	x11-libs/xtrans
-	virtual/libintl
-	elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )
-	!gtk3? ( >=x11-libs/gtk+-2.14:2 )
-	gtk3? ( >=x11-libs/gtk+-3.0:3 )
-	systemd? ( sys-apps/systemd )
-	upower? ( || ( >=sys-power/upower-0.9.23 >=sys-power/upower-pm-utils-0.9.23 ) )"
-
-RDEPEND="${COMMON_DEPEND}
-	x11-apps/xdpyinfo
-	x11-misc/xdg-user-dirs
-	x11-misc/xdg-user-dirs-gtk
-	gnome-keyring? ( gnome-base/gnome-keyring )"
-
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.40:*
-	>=dev-lang/perl-5
-	>=sys-devel/gettext-0.10.40:*
-	virtual/pkgconfig:*
-	!<gnome-base/gdm-2.20.4"
-
-MATE_FORCE_AUTORECONF=true
-
-src_configure() {
-	mate_src_configure \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_with systemd) \
-		$(use_enable debug) \
-		$(use_enable ipv6) \
-		$(use_enable upower)
-}
-
-src_install() {
-	mate_src_install
-
-	dodir /etc/X11/Sessions/
-	exeinto /etc/X11/Sessions/
-	doexe "${FILESDIR}"/MATE
-
-	dodir /usr/share/mate/applications/
-	insinto /usr/share/mate/applications/
-	doins "${FILESDIR}"/defaults.list
-
-	dodir /etc/X11/xinit/xinitrc.d/
-	exeinto /etc/X11/xinit/xinitrc.d/
-	doexe "${FILESDIR}"/15-xdg-data-mate
-
-	# This should be done in MATE too, see Gentoo bug #270852
-	doexe "${FILESDIR}"/10-user-dirs-update-mate
-}
diff --git a/mate-base/mate-session-manager/mate-session-manager-1.16.1.ebuild b/mate-base/mate-session-manager/mate-session-manager-1.16.1.ebuild
deleted file mode 100644
index 8ca0b8b67a59..000000000000
--- a/mate-base/mate-session-manager/mate-session-manager-1.16.1.ebuild
+++ /dev/null
@@ -1,86 +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 ~x86"
-fi
-
-DESCRIPTION="MATE session manager"
-HOMEPAGE="http://mate-desktop.org/"
-
-LICENSE="GPL-2 LGPL-2 FDL-1.1"
-SLOT="0"
-
-IUSE="debug elibc_FreeBSD gnome-keyring ipv6 systemd upower +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/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 ) )
-	>=x11-libs/gtk+-3.14:3
-	systemd? ( sys-apps/systemd )
-	upower? ( || ( >=sys-power/upower-0.9.23 >=sys-power/upower-pm-utils-0.9.23 ) )
-	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) \
-		$(use_enable upower)
-}
-
-src_install() {
-	mate_src_install
-
-	dodir /etc/X11/Sessions/
-	exeinto /etc/X11/Sessions/
-	doexe "${FILESDIR}"/MATE
-
-	dodir /usr/share/mate/applications/
-	insinto /usr/share/mate/applications/
-	doins "${FILESDIR}"/defaults.list
-
-	dodir /etc/X11/xinit/xinitrc.d/
-	exeinto /etc/X11/xinit/xinitrc.d/
-	doexe "${FILESDIR}"/15-xdg-data-mate
-
-	# This should be done in MATE too, see Gentoo bug #270852
-	doexe "${FILESDIR}"/10-user-dirs-update-mate
-}
diff --git a/mate-base/mate-session-manager/mate-session-manager-1.18.0-r1.ebuild b/mate-base/mate-session-manager/mate-session-manager-1.18.0-r1.ebuild
deleted file mode 100644
index 30752431738a..000000000000
--- a/mate-base/mate-session-manager/mate-session-manager-1.18.0-r1.ebuild
+++ /dev/null
@@ -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
-}
diff --git a/mate-base/mate-session-manager/mate-session-manager-1.18.2.ebuild b/mate-base/mate-session-manager/mate-session-manager-1.18.2.ebuild
deleted file mode 100644
index ce7d45a672d5..000000000000
--- a/mate-base/mate-session-manager/mate-session-manager-1.18.2.ebuild
+++ /dev/null
@@ -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 ~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
-}
diff --git a/mate-base/mate-session-manager/metadata.xml b/mate-base/mate-session-manager/metadata.xml
index f69aac22ed08..ee3469ab6dba 100644
--- a/mate-base/mate-session-manager/metadata.xml
+++ b/mate-base/mate-session-manager/metadata.xml
@@ -6,7 +6,6 @@
 		<name>Gentoo MATE Desktop</name>
 	</maintainer>
 	<use>
-		<flag name="gtk3">Build with GTK+3 instead of GTK+2</flag>
 		<flag name="xtrans">Build with Xtrans support; 
 		WARNING: Disabling this flag will result in ICE binding on all interfaces</flag>
 	</use>
diff --git a/mate-base/mate-settings-daemon/Manifest b/mate-base/mate-settings-daemon/Manifest
index 8461b58f8440..9e35a9f95233 100644
--- a/mate-base/mate-settings-daemon/Manifest
+++ b/mate-base/mate-settings-daemon/Manifest
@@ -1,9 +1,3 @@
-DIST mate-settings-daemon-1.12.1.tar.xz 781388 BLAKE2B dad221eb742f7748b4c3b70123ce3689509752a73d3f090e027f56d9f64a5d4d11e0c49a5c293c6e8569e250cec7d027dd7dc93a76e8541b8e70828f33ec94de SHA512 36c0d2cacef22db1d27e694602ee390fd0a24e3478837fd7fbfe069f55278c7a7ff3f7d280e0bf9cd4e827beeb9b3d40f505e5772686036e47e3d0b7d1e4b47e
-DIST mate-settings-daemon-1.14.1.tar.xz 760936 BLAKE2B dd3365faa55c743cfad7ee5dded7fd4d88c5b5080afd0e806600879e57a7dcbffb4f77217faefa766b1faa85f622ccfdf9e0774604d4e67d68fc8ab0758647da SHA512 e237c1c7df4a42183e3c3079c88dfc94422b604ed9b197363a5ea9bfdf7a16782681f6d82ee3b5b7c5edac6b90b0f2875072a108f5fe9b954bbbf1c8cc27e6d5
-DIST mate-settings-daemon-1.16.2.tar.xz 767820 BLAKE2B 1057d21f88799978a58fb0db8b15e72f4905995f7673c1baa92100b823232ae1ed4886d88b5a37e30cd05e1d1ca72b8fa3c58ee9f3211581bda4845f745e52b7 SHA512 e4b527791f65c500ac0b432744c3b128a6a438077261ee182993c82c175d165c2f67fa60620ac03c6f6f532ef6cb4a2a6df52164022a30015e7a071a03df043e
 DIST mate-settings-daemon-1.18.2.tar.xz 787004 BLAKE2B 4549948a25016389c280e2df190febb9c1fda3a88ee9354ea72a01e4b8fe973bd0d85c1fd1b3533589dcb1b304893099e6e0171a9be9c64c72fef3608375d86d SHA512 2e07f7873d8f1e75391ae6ab7a132ce1f90a3afe661ca263fff9db1b68c0a02dc53255d6382c2d69861f997f22711d062e43468041a0b3476cdd3a051dec7039
-EBUILD mate-settings-daemon-1.12.1.ebuild 1684 BLAKE2B adb2cd736afae30d6472fda63677b098d12d043ff9e73cdd09c3b61a858f26625e8ca988e0b416ae9f2ba662d85a256ec066bbf6eeeaca9a3847a54d7b19e50a SHA512 292415701b750988db63176bcb15e8199030b6e4bb2b177094fff23689a0a7ef9e0fad5490465fd9e5b14457e554115c956dc3060e8d734037ac2c4d066dcbd3
-EBUILD mate-settings-daemon-1.14.1.ebuild 1726 BLAKE2B fb77abe7d9ced8184ace1b3b19d473105b1761a5086a6a69cf6daeae16da317f61a886c0e02777de798dd47e744bed43e2afc040081dce13f30eab1bef6fda89 SHA512 892ad37be146462498f2fc3895bdeab11e3729a59283c6172ec94717fb957fbb538acdd280e42ef650c82ee4c73e294902992d36011a3b663c2ae0daa39d239b
-EBUILD mate-settings-daemon-1.16.2.ebuild 1726 BLAKE2B fb77abe7d9ced8184ace1b3b19d473105b1761a5086a6a69cf6daeae16da317f61a886c0e02777de798dd47e744bed43e2afc040081dce13f30eab1bef6fda89 SHA512 892ad37be146462498f2fc3895bdeab11e3729a59283c6172ec94717fb957fbb538acdd280e42ef650c82ee4c73e294902992d36011a3b663c2ae0daa39d239b
 EBUILD mate-settings-daemon-1.18.2.ebuild 1584 BLAKE2B 96356dd2bafc6daaeec05f58215aaf7000755655b1b9f415322919c289a6268bbd8fd010f800300d2ba2ad9aeee51ae785c2671d237387032b0517cc8233900f SHA512 497272e21ebb9d4ab19e3c955eef5ad54224d2ad69a80c5b86f0c59a072d6448db1ec86d0973a70c6291c1c4ffe88045892599aa90ab21fae89d4bdd94c8dfbf
-MISC metadata.xml 425 BLAKE2B f4dd8aa58084e192d3f20df7f926845f1aabe03c4a03c20177e42c9daeb5f7db7f1ca535ac7131c58a3731e1d250c1de144a00bbd6f2434539fd52b749be55ac SHA512 3849ef93c7ebd9b753a15bab1c1fb3142d4c3270fe1ac29585862c27265a78f389478962475038680e194d976812ecfab398ecb89d26c2372e1fdb060432d932
+MISC metadata.xml 349 BLAKE2B a6f74cac08d50c578b34f35764aaa46fe18c7b0003f19f3492c10fcf8cc3b1618fbb02c460de0d5cc7480e65a39a1e2ddb1029820f304f4b778e42af7589d801 SHA512 60b6cbc98f39edcf1716313dce83ee951c361f4cabf89232f8c0b8f482eb98bc262bdb748e5650d4fed4d7cbf084f02bbd534bb72dbab246abe95ba274f09abc
diff --git a/mate-base/mate-settings-daemon/mate-settings-daemon-1.12.1.ebuild b/mate-base/mate-settings-daemon/mate-settings-daemon-1.12.1.ebuild
deleted file mode 100644
index fff4079c0979..000000000000
--- a/mate-base/mate-settings-daemon/mate-settings-daemon-1.12.1.ebuild
+++ /dev/null
@@ -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 x86"
-fi
-
-DESCRIPTION="MATE Settings Daemon"
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-
-IUSE="X debug gtk3 libnotify policykit pulseaudio smartcard +sound"
-
-REQUIRED_USE="pulseaudio? ( sound )"
-
-RDEPEND=">=dev-libs/dbus-glib-0.74:0
-	>=dev-libs/glib-2.17.3:2
-	>=gnome-base/dconf-0.13.4:0
-	>=mate-base/libmatekbd-1.7[gtk3(-)=]
-	>=mate-base/mate-desktop-1.9[gtk3(-)=]
-	media-libs/fontconfig:1.0
-	x11-libs/cairo:0
-	x11-libs/gdk-pixbuf:2
-	x11-libs/libX11:0
-	x11-libs/libXi:0
-	x11-libs/libXext:0
-	x11-libs/libXxf86misc:0
-	>=x11-libs/libxklavier-5:0
-	virtual/libintl:0
-	!gtk3? ( >=x11-libs/gtk+-2.24:2 )
-	gtk3? ( >=x11-libs/gtk+-3.0:3 )
-	libnotify? ( >=x11-libs/libnotify-0.7:0 )
-	policykit? (
-		>=dev-libs/dbus-glib-0.71:0
-		>=sys-apps/dbus-1.1.2:0
-		>=sys-auth/polkit-0.97:0
-	)
-	pulseaudio? (
-		>=media-libs/libmatemixer-1.10:0[pulseaudio]
-		>=media-sound/pulseaudio-0.9.15:0
-	)
-	smartcard? ( >=dev-libs/nss-3.11.2:0 )
-	sound? (
-		>=media-libs/libmatemixer-1.9
-		!gtk3? ( media-libs/libcanberra:0[gtk] )
-		gtk3? ( media-libs/libcanberra:0[gtk3] )
-	)"
-
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.50.1:0
-	sys-devel/gettext:0
-	virtual/pkgconfig:0
-	x11-base/xorg-proto"
-
-src_configure() {
-	mate_src_configure \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_with X x) \
-		$(use_with libnotify) \
-		$(use_with sound libcanberra) \
-		$(use_with sound libmatemixer) \
-		$(use_enable debug) \
-		$(use_enable policykit polkit) \
-		$(use_enable pulseaudio pulse) \
-		$(use_enable smartcard smartcard-support)
-}
diff --git a/mate-base/mate-settings-daemon/mate-settings-daemon-1.14.1.ebuild b/mate-base/mate-settings-daemon/mate-settings-daemon-1.14.1.ebuild
deleted file mode 100644
index 1161e4944d37..000000000000
--- a/mate-base/mate-settings-daemon/mate-settings-daemon-1.14.1.ebuild
+++ /dev/null
@@ -1,74 +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 Settings Daemon"
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-
-IUSE="X debug gtk3 libnotify policykit pulseaudio smartcard +sound"
-
-REQUIRED_USE="pulseaudio? ( sound )"
-
-COMMON_DEPEND=">=dev-libs/dbus-glib-0.74:0
-	>=dev-libs/glib-2.17.3:2
-	>=gnome-base/dconf-0.13.4:0
-	>=mate-base/libmatekbd-1.7[gtk3(-)=]
-	>=mate-base/mate-desktop-1.9[gtk3(-)=]
-	media-libs/fontconfig:1.0
-	x11-libs/cairo:0
-	x11-libs/gdk-pixbuf:2
-	x11-libs/libX11:0
-	x11-libs/libXi:0
-	x11-libs/libXext:0
-	x11-libs/libXxf86misc:0
-	>=x11-libs/libxklavier-5:0
-	virtual/libintl:0
-	!gtk3? ( >=x11-libs/gtk+-2.24:2 )
-	gtk3? ( >=x11-libs/gtk+-3.0:3 )
-	libnotify? ( >=x11-libs/libnotify-0.7:0 )
-	policykit? (
-		>=dev-libs/dbus-glib-0.71:0
-		>=sys-apps/dbus-1.1.2:0
-		>=sys-auth/polkit-0.97:0
-	)
-	pulseaudio? (
-		>=media-libs/libmatemixer-1.10:0[pulseaudio]
-		>=media-sound/pulseaudio-0.9.15:0
-	)
-	smartcard? ( >=dev-libs/nss-3.11.2:0 )
-	sound? (
-		>=media-libs/libmatemixer-1.9
-		!gtk3? ( media-libs/libcanberra:0[gtk] )
-		gtk3? ( media-libs/libcanberra:0[gtk3] )
-	)"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.50.1:0
-	sys-devel/gettext:0
-	virtual/pkgconfig:0
-	x11-base/xorg-proto"
-
-src_configure() {
-	mate_src_configure \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_with X x) \
-		$(use_with libnotify) \
-		$(use_with sound libcanberra) \
-		$(use_with sound libmatemixer) \
-		$(use_enable debug) \
-		$(use_enable policykit polkit) \
-		$(use_enable pulseaudio pulse) \
-		$(use_enable smartcard smartcard-support)
-}
diff --git a/mate-base/mate-settings-daemon/mate-settings-daemon-1.16.2.ebuild b/mate-base/mate-settings-daemon/mate-settings-daemon-1.16.2.ebuild
deleted file mode 100644
index 1161e4944d37..000000000000
--- a/mate-base/mate-settings-daemon/mate-settings-daemon-1.16.2.ebuild
+++ /dev/null
@@ -1,74 +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 Settings Daemon"
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-
-IUSE="X debug gtk3 libnotify policykit pulseaudio smartcard +sound"
-
-REQUIRED_USE="pulseaudio? ( sound )"
-
-COMMON_DEPEND=">=dev-libs/dbus-glib-0.74:0
-	>=dev-libs/glib-2.17.3:2
-	>=gnome-base/dconf-0.13.4:0
-	>=mate-base/libmatekbd-1.7[gtk3(-)=]
-	>=mate-base/mate-desktop-1.9[gtk3(-)=]
-	media-libs/fontconfig:1.0
-	x11-libs/cairo:0
-	x11-libs/gdk-pixbuf:2
-	x11-libs/libX11:0
-	x11-libs/libXi:0
-	x11-libs/libXext:0
-	x11-libs/libXxf86misc:0
-	>=x11-libs/libxklavier-5:0
-	virtual/libintl:0
-	!gtk3? ( >=x11-libs/gtk+-2.24:2 )
-	gtk3? ( >=x11-libs/gtk+-3.0:3 )
-	libnotify? ( >=x11-libs/libnotify-0.7:0 )
-	policykit? (
-		>=dev-libs/dbus-glib-0.71:0
-		>=sys-apps/dbus-1.1.2:0
-		>=sys-auth/polkit-0.97:0
-	)
-	pulseaudio? (
-		>=media-libs/libmatemixer-1.10:0[pulseaudio]
-		>=media-sound/pulseaudio-0.9.15:0
-	)
-	smartcard? ( >=dev-libs/nss-3.11.2:0 )
-	sound? (
-		>=media-libs/libmatemixer-1.9
-		!gtk3? ( media-libs/libcanberra:0[gtk] )
-		gtk3? ( media-libs/libcanberra:0[gtk3] )
-	)"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.50.1:0
-	sys-devel/gettext:0
-	virtual/pkgconfig:0
-	x11-base/xorg-proto"
-
-src_configure() {
-	mate_src_configure \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_with X x) \
-		$(use_with libnotify) \
-		$(use_with sound libcanberra) \
-		$(use_with sound libmatemixer) \
-		$(use_enable debug) \
-		$(use_enable policykit polkit) \
-		$(use_enable pulseaudio pulse) \
-		$(use_enable smartcard smartcard-support)
-}
diff --git a/mate-base/mate-settings-daemon/metadata.xml b/mate-base/mate-settings-daemon/metadata.xml
index a2f583c4bc9c..d216474cda3b 100644
--- a/mate-base/mate-settings-daemon/metadata.xml
+++ b/mate-base/mate-settings-daemon/metadata.xml
@@ -5,9 +5,6 @@
 		<email>mate@gentoo.org</email>
 		<name>Gentoo MATE Desktop</name>
 	</maintainer>
-	<use>
-		<flag name="gtk3">Build with GTK+3 instead of GTK+2</flag>
-	</use>
 	<upstream>
 		<remote-id type="github">mate-desktop/mate-settings-daemon</remote-id>
 	</upstream>
diff --git a/mate-base/mate/Manifest b/mate-base/mate/Manifest
index e802d0210f0e..ec4541ab5f43 100644
--- a/mate-base/mate/Manifest
+++ b/mate-base/mate/Manifest
@@ -1,5 +1,2 @@
-EBUILD mate-1.12-r1.ebuild 2843 BLAKE2B 4bd4f16c4ffc1fc606bdf769234afd143cc9a0c1737f7681e91713086cc2907582ce366680ccbe3f0dbed8ea7c19dbe7b52e4feab865e1009caa0353b2d4b859 SHA512 82930d68a25a6aa86207c5548f333d1d7b6e4591fc7be7df41791aecbb36bf26aebcc3979115547ec3b46783f4ffbf6889eadbd2cc3b3b4e4985c8c5d35cc6df
-EBUILD mate-1.14.ebuild 2767 BLAKE2B daa6821e81e933b8edfde83ecaf6035e606e7ec9f427b140ea1de52cff73108470582400e1459750844121efa8cd8f984028669554af31d7b7f983685af074ea SHA512 d4eb265d58f3dcf8606b5c56ac7076136f216e1f3be7bb17d19cb66dee3f6dd3958e8e42c0ed13d2714a9ee346cfa42ae737e7ea19c126fe71385553860456c2
-EBUILD mate-1.16.ebuild 2727 BLAKE2B ba9915063143819c101245db3cacdcf648a435fc7078513f527c766ddb1b71772a2ca01386755d44c32c6aa81a4cf7ec0249d6264f445df1331fc02da294aa05 SHA512 1c56bd9b4f567cbbbdafff3a19af03955b69020995308c13cfdcdff92320a562d17a25136c213cdd4b5448ee18133c660ec1c9c628a7dc57d964cc760b0798ff
 EBUILD mate-1.18.ebuild 2576 BLAKE2B cc156c65df6b3d72b2abb6cc0c49131d0eba04e3c9da771304aa04c51a41cce63f2deaf06393ad689cd3f6985b7c51f51d4fff3b1edd197a78a34d831b9cc8f8 SHA512 75841b52b473e25e4436099963000fab949cd89272d0f68fb664a5f155625b208a900c3463e1d524412dfe951639de597533733923b84aae3e40626011f47fba
-MISC metadata.xml 1418 BLAKE2B 5a9ad3ba8177e5081b7c18da63daa9c3cd00b5bfd5bf710c0ab208dd7ae4ee85f0a3c9c558024a47cb08c9ef1e9d6f369f25b5c77c667fc05aa60390ea08fd80 SHA512 eb85701a1ea94e137810700a7d27bc0a3bb9591aeb7c3af5bbf3c939ec5edfbae68fbf49449e5490444cdc8d6fde7afc755865010a7cffe090c305c7613169e7
+MISC metadata.xml 1342 BLAKE2B da370118ca35235d9015c6fca17a4766067c1bb5393a68cbb84caa724ef970cb30925c6c5b4eb59fdc5d67eebf6c7031173de7bf868a61108cb5bb7354207d3e SHA512 cd369cf3b32404c16975cdda320043b27898838b2d5c3732bbe2a62f16332eab9f55a2c00e7f8bb1f98cc5cf7d00ec6fe40b74a106b7b72db5f252ec576aff85
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 de459dbe4178..000000000000
--- 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 b889e588bb81..000000000000
--- 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 131f68cc80f2..000000000000
--- 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/metadata.xml b/mate-base/mate/metadata.xml
index 097778096d4d..da90dca1bd5f 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>
author	V3n3RiX <venerix@redcorelinux.org>	2018-10-07 11:03:14 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-10-07 11:03:14 +0100
commit	957235cf19a691360c720f7913672adda4258ed0 (patch)
tree	812bba7928f4293ead05a7ee9c1ac39c5ef9f12e /mate-base
parent	62f67115b5c46134c34f88f4b1cbdacc19384c0a (diff)