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-extra
parent: 62f67115b5c46134c34f88f4b1cbdacc19384c0a (diff)
67 files changed, 11 insertions, 2695 deletions
diff --git a/mate-extra/Manifest.gz b/mate-extra/Manifest.gz
index ec31b653d76c..4edd3f66b4ad 100644
--- a/mate-extra/Manifest.gz
+++ b/mate-extra/Manifest.gz
diff --git a/mate-extra/caja-dropbox/Manifest b/mate-extra/caja-dropbox/Manifest
index 93f315514cb4..5eb9dd6110c3 100644
--- a/mate-extra/caja-dropbox/Manifest
+++ b/mate-extra/caja-dropbox/Manifest
@@ -1,10 +1,4 @@
 AUX caja-dropbox-1.8.0-system-rst2man.patch 463 BLAKE2B 1a182d2374ecdff9b1e720071f4da9b37bc6a082aff3f7282c24dcfc5c04d66f338671d8da784ed34ca885070a09afcfdea94937aa69106e4291e15c3a3e889e SHA512 c3fcfd5b87f7801c77e8935f20d26c2a32ad60a03f068eb891e4bc491296ee1b19763634a02e387d7cf8b4192c30931a6dd9d9bf44f7ce3f8965db62a184c806
-DIST caja-dropbox-1.12.0.tar.xz 311488 BLAKE2B 823ec57de4ca943914a14aa90bf6bc4c4ce25cde66cf2102cca21f82c39d47e5d0e75440e5c9050ee554db7ce21471f413a2c7050966ca825d73db9bd6100763 SHA512 32d8fcd2d2aa4a03a976c7848cd628e240558b802247ad6a36242ea95628aa97088aa55ae6d9c889616910e5fc36e2db6753c4f8854d6f9e626c990469d71223
-DIST caja-dropbox-1.14.0.tar.xz 310964 BLAKE2B dc58105549291e05b31752a69bed62f1f9a41699c1ef203e7e75937b3961bb188055f7d2b2569a86650a5a799b0af1b046f1e7d78f3cc0e83be187fa367a756f SHA512 e13012bff812d43eb5ddd9ca8a73907bf9aa2d46bd8947f58695b32fe590a4ecd6bea2ac0d30330c8bd1fa8c652681beb964e7bd658525e99cda73e36a207a50
-DIST caja-dropbox-1.16.0.tar.xz 311144 BLAKE2B f64af2c129906517f8d2bb189f0718c6848a298fd5694de09fcc7e5d17720273eee6453c88363018cafb2a8b10ee8116eb8156f1ac43316ed6164fd64397210b SHA512 ba8ec3952be08d520b10f55c3ff5dbfd38a062dcf3c4fa4569e8d68823f8fbebed596e963e5bf7d59161fea138dbc27b299f66e1d0f6064da54499c4023ac1ad
 DIST caja-dropbox-1.18.0.tar.xz 323116 BLAKE2B 1aafb5c15fea5935c7e89964ad4237fc2095a2c81921c14058d3472e4b51a4053327e175b144c17f2bdd0a3c106b32c436593b354db375689259501ec18b679b SHA512 0e240f8f6ef17ad3b6bbe21bede6d911b0ef89d8fd5a9faba6b96bc74f06472dcedf68caa94c6fbfb2c05c10c82e1f025b4022657cacc5b80d55ee41999be560
-EBUILD caja-dropbox-1.12.0-r1.ebuild 2042 BLAKE2B 6a4451bb9609eb3d5f961c1b5484f3d5da88f65d135599a0069907985fbdc7630fa882705215ecf7e6aef313a9af15bba3703954954d43d25e7e2b6a1fe56ddd SHA512 086d27e73708ba49f291d2776b3b0690f73fd7bdfe2439d06bc038b063331e5cc601932ae8710095c60578f745225a357498823c49c9b67810692d1ee5babfca
-EBUILD caja-dropbox-1.14.0.ebuild 2084 BLAKE2B 5089ad24a8b654f3b7b9b55e7a5a516f1bdb9ef5bb2c6b5f8baa998fb04eb275757baad0efc34df935c53845484dccb909ee34e16ba45078372cd4ae0b9be6b1 SHA512 cbbad2e017ebc5628893c4ed600fb10bbfc3772bf9e77a233134e985b42f31122293c4d5a862b34f2c92a4fd8b40dc0febac55358338aa04e70dac289869d43e
-EBUILD caja-dropbox-1.16.0.ebuild 2084 BLAKE2B 5089ad24a8b654f3b7b9b55e7a5a516f1bdb9ef5bb2c6b5f8baa998fb04eb275757baad0efc34df935c53845484dccb909ee34e16ba45078372cd4ae0b9be6b1 SHA512 cbbad2e017ebc5628893c4ed600fb10bbfc3772bf9e77a233134e985b42f31122293c4d5a862b34f2c92a4fd8b40dc0febac55358338aa04e70dac289869d43e
 EBUILD caja-dropbox-1.18.0.ebuild 2032 BLAKE2B c2909097067e16d044248a3ba916fe637ac37a7bd61db241ace065c71618af2aef6183c0cc2649d506cc826f8cb77e6dbde9f5da201320e83a8787cf74cdb291 SHA512 993142b1d96008ab8953b6245c5940e4acbc15375125a437467c7e45e4d13dae17107fb6ccbd5e67f9ab15d1bfb3154902b03d260ecf141290dcc23618917e17
 MISC metadata.xml 341 BLAKE2B b530aa03ccd9e514d43bd1014500548a5931fcd30e288bdc9b6c56e9b4fa8dc42dd4a31074efe3b8ecb5f2f55aab3da8e7edd30fa5f3c1645cc088e594da7761 SHA512 3ef87b907e90f2093cece194a580099964f434ec7a1d43e961f0c00adeaeca085fc6e141f25f4ef7da0399e71093b4e2c12f52d0c29cd2aa3768354380ec1c37
diff --git a/mate-extra/caja-dropbox/caja-dropbox-1.12.0-r1.ebuild b/mate-extra/caja-dropbox/caja-dropbox-1.12.0-r1.ebuild
deleted file mode 100644
index 696da441191b..000000000000
--- a/mate-extra/caja-dropbox/caja-dropbox-1.12.0-r1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-MATE_LA_PUNT="yes"
-
-inherit mate python-single-r1 linux-info user
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 x86"
-fi
-
-DESCRIPTION="Store, Sync and Share Files Online"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="debug"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	dev-libs/atk:0
-	>=dev-libs/glib-2.14:2
-	dev-python/pygtk:2[${PYTHON_USEDEP}]
-	dev-python/pygobject:2[${PYTHON_USEDEP}]
-	>=mate-base/caja-1.6
-	media-libs/fontconfig:1.0
-	media-libs/freetype:2
-	net-misc/dropbox:0
-	x11-libs/cairo:0
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:2
-	x11-libs/libXinerama:0
-	x11-libs/pango:0"
-
-DEPEND="${RDEPEND}
-	dev-python/docutils:0
-	virtual/pkgconfig:*"
-
-CONFIG_CHECK="~INOTIFY_USER"
-
-pkg_setup () {
-	python-single-r1_pkg_setup
-	check_extra_config
-	enewgroup dropbox
-}
-
-MATE_FORCE_AUTORECONF=true
-
-src_prepare() {
-	# Use system dropbox.
-	sed -e "s|~/[.]dropbox-dist|/opt/dropbox|" \
-		-e 's|\(DROPBOXD_PATH = \).*|\1"/opt/dropbox/dropboxd"|' \
-			-i caja-dropbox.in || die
-
-	# Use system rst2man.
-	epatch "${FILESDIR}"/${PN}-1.8.0-system-rst2man.patch
-
-	mate_src_prepare
-}
-
-src_configure() {
-	mate_src_configure \
-		--disable-static \
-		$(use_enable debug)
-}
-
-src_install () {
-	python_fix_shebang caja-dropbox.in
-
-	mate_src_install
-
-	local extensiondir="$(pkg-config --variable=extensiondir libcaja-extension)"
-	[ -z ${extensiondir} ] && die "pkg-config unable to get caja extensions dir"
-
-	# Strip $EPREFIX from $extensiondir as fowners/fperms act on $ED not $D.
-	extensiondir="${extensiondir#${EPREFIX}}"
-	use prefix || fowners root:dropbox "${extensiondir}"/libcaja-dropbox.so
-	fperms o-rwx "${extensiondir}"/libcaja-dropbox.so
-}
-
-pkg_postinst () {
-	mate_pkg_postinst
-
-	elog
-	elog "Add any users who wish to have access to the dropbox caja"
-	elog "plugin to the group 'dropbox'. You need to setup a drobox account"
-	elog "before using this plugin. Visit ${HOMEPAGE} for more information."
-	elog
-}
diff --git a/mate-extra/caja-dropbox/caja-dropbox-1.14.0.ebuild b/mate-extra/caja-dropbox/caja-dropbox-1.14.0.ebuild
deleted file mode 100644
index 192d02aaf1b5..000000000000
--- a/mate-extra/caja-dropbox/caja-dropbox-1.14.0.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-MATE_LA_PUNT="yes"
-
-inherit mate python-single-r1 linux-info user
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Store, Sync and Share Files Online"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="debug"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="
-	${PYTHON_DEPS}
-	dev-libs/atk:0
-	>=dev-libs/glib-2.14:2
-	dev-python/pygtk:2[${PYTHON_USEDEP}]
-	dev-python/pygobject:2[${PYTHON_USEDEP}]
-	>=mate-base/caja-1.6
-	media-libs/fontconfig:1.0
-	media-libs/freetype:2
-	x11-libs/cairo:0
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:2
-	x11-libs/libXinerama:0
-	x11-libs/pango:0"
-
-RDEPEND="${COMMON_DEPEND}
-	net-misc/dropbox:0"
-
-DEPEND="${COMMON_DEPEND}
-	dev-python/docutils:0
-	virtual/pkgconfig:*"
-
-CONFIG_CHECK="~INOTIFY_USER"
-
-pkg_setup () {
-	python-single-r1_pkg_setup
-	check_extra_config
-	enewgroup dropbox
-}
-
-MATE_FORCE_AUTORECONF=true
-
-src_prepare() {
-	# Use system dropbox.
-	sed -e "s|~/[.]dropbox-dist|/opt/dropbox|" \
-		-e 's|\(DROPBOXD_PATH = \).*|\1"/opt/dropbox/dropboxd"|' \
-			-i caja-dropbox.in || die
-
-	# Use system rst2man.
-	epatch "${FILESDIR}"/${PN}-1.8.0-system-rst2man.patch
-
-	mate_src_prepare
-}
-
-src_configure() {
-	mate_src_configure \
-		--disable-static \
-		$(use_enable debug)
-}
-
-src_install () {
-	python_fix_shebang caja-dropbox.in
-
-	mate_src_install
-
-	local extensiondir="$(pkg-config --variable=extensiondir libcaja-extension)"
-	[ -z ${extensiondir} ] && die "pkg-config unable to get caja extensions dir"
-
-	# Strip $EPREFIX from $extensiondir as fowners/fperms act on $ED not $D.
-	extensiondir="${extensiondir#${EPREFIX}}"
-	use prefix || fowners root:dropbox "${extensiondir}"/libcaja-dropbox.so
-	fperms o-rwx "${extensiondir}"/libcaja-dropbox.so
-}
-
-pkg_postinst () {
-	mate_pkg_postinst
-
-	elog
-	elog "Add any users who wish to have access to the dropbox caja"
-	elog "plugin to the group 'dropbox'. You need to setup a drobox account"
-	elog "before using this plugin. Visit ${HOMEPAGE} for more information."
-	elog
-}
diff --git a/mate-extra/caja-dropbox/caja-dropbox-1.16.0.ebuild b/mate-extra/caja-dropbox/caja-dropbox-1.16.0.ebuild
deleted file mode 100644
index 192d02aaf1b5..000000000000
--- a/mate-extra/caja-dropbox/caja-dropbox-1.16.0.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-MATE_LA_PUNT="yes"
-
-inherit mate python-single-r1 linux-info user
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Store, Sync and Share Files Online"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="debug"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="
-	${PYTHON_DEPS}
-	dev-libs/atk:0
-	>=dev-libs/glib-2.14:2
-	dev-python/pygtk:2[${PYTHON_USEDEP}]
-	dev-python/pygobject:2[${PYTHON_USEDEP}]
-	>=mate-base/caja-1.6
-	media-libs/fontconfig:1.0
-	media-libs/freetype:2
-	x11-libs/cairo:0
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:2
-	x11-libs/libXinerama:0
-	x11-libs/pango:0"
-
-RDEPEND="${COMMON_DEPEND}
-	net-misc/dropbox:0"
-
-DEPEND="${COMMON_DEPEND}
-	dev-python/docutils:0
-	virtual/pkgconfig:*"
-
-CONFIG_CHECK="~INOTIFY_USER"
-
-pkg_setup () {
-	python-single-r1_pkg_setup
-	check_extra_config
-	enewgroup dropbox
-}
-
-MATE_FORCE_AUTORECONF=true
-
-src_prepare() {
-	# Use system dropbox.
-	sed -e "s|~/[.]dropbox-dist|/opt/dropbox|" \
-		-e 's|\(DROPBOXD_PATH = \).*|\1"/opt/dropbox/dropboxd"|' \
-			-i caja-dropbox.in || die
-
-	# Use system rst2man.
-	epatch "${FILESDIR}"/${PN}-1.8.0-system-rst2man.patch
-
-	mate_src_prepare
-}
-
-src_configure() {
-	mate_src_configure \
-		--disable-static \
-		$(use_enable debug)
-}
-
-src_install () {
-	python_fix_shebang caja-dropbox.in
-
-	mate_src_install
-
-	local extensiondir="$(pkg-config --variable=extensiondir libcaja-extension)"
-	[ -z ${extensiondir} ] && die "pkg-config unable to get caja extensions dir"
-
-	# Strip $EPREFIX from $extensiondir as fowners/fperms act on $ED not $D.
-	extensiondir="${extensiondir#${EPREFIX}}"
-	use prefix || fowners root:dropbox "${extensiondir}"/libcaja-dropbox.so
-	fperms o-rwx "${extensiondir}"/libcaja-dropbox.so
-}
-
-pkg_postinst () {
-	mate_pkg_postinst
-
-	elog
-	elog "Add any users who wish to have access to the dropbox caja"
-	elog "plugin to the group 'dropbox'. You need to setup a drobox account"
-	elog "before using this plugin. Visit ${HOMEPAGE} for more information."
-	elog
-}
diff --git a/mate-extra/caja-extensions/Manifest b/mate-extra/caja-extensions/Manifest
index 3f7341f2d9f1..a6518ffdffb8 100644
--- a/mate-extra/caja-extensions/Manifest
+++ b/mate-extra/caja-extensions/Manifest
@@ -1,9 +1,3 @@
-DIST caja-extensions-1.12.0.tar.xz 370600 BLAKE2B 5a243eac18112158585c2c856a1e7664e15c5a140cf6e1c414e8b230fd266d1e8487126615bab52a18d7b00814ca09638702bb6831e0a7fd09f1d2d578106827 SHA512 b36f759f21a206d76dada61f9410135c393fea77eaaf387a81788c6c2757aed5536b8129add2b4469b8d18f17de115369d70ec9278e8a4b9b9a3cfbb24ac38fb
-DIST caja-extensions-1.14.1.tar.xz 400108 BLAKE2B 323ae913969b6e11361511633076adcfa172b1f15077e70c799de921eb2ea862afa39e7497bbb309a9ca4dfca28bff0e470f19efd9ea09b0c1bf8f88add2de5d SHA512 622ab7a2175c2eb4ea5153887fb500f7c63e7aea8bcea19d43e891013bceab5bb5e8f1d83eedf7ff167737185a22327e6a085e3c84bce40955d97938fff73527
-DIST caja-extensions-1.16.0.tar.xz 402208 BLAKE2B 47b20289d61e596e17d4d17a80535cd50778749c17fb46dfd59ab250186515866e456feb005dc0a7b4ded37ac0f11a0ec2f04d40f6b55e813afe015d3ecc09a9 SHA512 7f856ec1b087b605b7cb455a7ed5742d44eb79cc6dcd869a680d4a4e2466c795dbb96f556476959d12bea7670e63a2b460d35a6e19f197ef2350c59e157c475c
 DIST caja-extensions-1.18.2.tar.xz 410704 BLAKE2B e13dde75bf616463f34d41df0b3be28d283383bd3ef56e24ce6cc0f319f0a7fea1b8dd75076582a78157c076de26f72235fe7b6f445f150547944a072b62038e SHA512 cbc3e6c02cdf93aa98e17232b9cdc9579355e2a31ea9421e6829eb2ba6fe50c7d6ba33b737f1286c9b0730a8781e8c060140ea47b216ef60b0bbaafabc9d836d
-EBUILD caja-extensions-1.12.0-r2.ebuild 1718 BLAKE2B 0ffb9ebe9c697f87038fed28f48e65f86843794289abc79e5eb607b135c156c8906db2e39dd1a31f8c53fe833e988c2463a1ec470b053ed270b1be3781631224 SHA512 d0041e152633bb58cb2f52c3ffa749fa9386e04c5e1d24246015ab7dfb05d8943af07e21eabeb939806c1da7ffe70d1d7d745fdbf09d7f24c76a605f323bca8a
-EBUILD caja-extensions-1.14.1-r1.ebuild 1797 BLAKE2B fbdf8409bdc607c14d35c35542696969f4a784aa13af5bf30b22e04d075e61b250e9772a73bad18ca2d641c0c029245017a72ea8b93879ed2e38d7024898d3cd SHA512 7b21902c11fea28ca327bb168ec48e46de652af758e01d6fafaac9543fc308c391e479f2c9631de955b9a5f81617d1e4288f9ef9278a4fd835a3276583312f03
-EBUILD caja-extensions-1.16.0-r1.ebuild 1797 BLAKE2B fbdf8409bdc607c14d35c35542696969f4a784aa13af5bf30b22e04d075e61b250e9772a73bad18ca2d641c0c029245017a72ea8b93879ed2e38d7024898d3cd SHA512 7b21902c11fea28ca327bb168ec48e46de652af758e01d6fafaac9543fc308c391e479f2c9631de955b9a5f81617d1e4288f9ef9278a4fd835a3276583312f03
 EBUILD caja-extensions-1.18.2.ebuild 1822 BLAKE2B e2a5a6e007a514c8e7313e38c08ed02733331139d1d49f586ca539d4eb21867f1d74045084b4dab74b6b140631df58e3a4b9f010bbf72689bbf0e8b2572202a8 SHA512 58a86962559d83e42c93416af19ebcb9d5bb2474537b93d4321313cb27b52bf3939e98ef595b4169fbf24bf425fc36ba53d80f8feeaee999c21046f83fdadd17
-MISC metadata.xml 1189 BLAKE2B 76dc7196eec25064224e259439ec6854527c4509931b3c03ad8d797a286b4921f81e2c83604cf23f9d7d818673edc4361905bccfa3bad4ff2f9454cef6575ace SHA512 bcac80f1664702cc3311a2e227d37e21e3042e8c649b8d0ed869ae49f9697206774ad86dcdb16db5b53765dc14609b1048b48c20b70705a34f312b76b5cba095
+MISC metadata.xml 1128 BLAKE2B 5f1862fa666e61097ef40a2f535941e1305a839f012efb0c47f064fa9241c637076500a92cb3458cd8222c7c0178e105fce4ad4574ebb503f39f5f3f7510524e SHA512 9a24726888b752691db1e0edfa8ab56916111ccc52a7754ed03b23037d5f7ecfd41b632364bd739e79122ae9ef3f8cf42a435637b2edf5d02caaabbf4001e019
diff --git a/mate-extra/caja-extensions/caja-extensions-1.12.0-r2.ebuild b/mate-extra/caja-extensions/caja-extensions-1.12.0-r2.ebuild
deleted file mode 100644
index 9f9fcdd3cb98..000000000000
--- a/mate-extra/caja-extensions/caja-extensions-1.12.0-r2.ebuild
+++ /dev/null
@@ -1,67 +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="Several Caja extensions"
-LICENSE="GPL-2"
-SLOT="0"
-
-SENDTO="cdr gajim +mail pidgin upnp"
-IUSE="gksu gtk3 image-converter +open-terminal share +wallpaper ${SENDTO}"
-
-RDEPEND=">=dev-libs/glib-2.36:2
-	>=mate-base/caja-1.7[gtk3(-)=]
-	virtual/libintl:0
-	x11-libs/gdk-pixbuf:2
-	cdr? ( >=app-cdr/brasero-2.32.1:0= )
-	gajim? (
-		net-im/gajim:0
-		>=dev-libs/dbus-glib-0.60:0
-		>=sys-apps/dbus-1:0
-	)
-	gksu? ( x11-libs/gksu )
-	!gtk3? ( >=x11-libs/gtk+-2.24:2 )
-	gtk3? ( >=x11-libs/gtk+-3.0:3 )
-	image-converter? ( virtual/imagemagick-tools )
-	open-terminal? ( >=mate-base/mate-desktop-1.7[gtk3(-)=] )
-	pidgin? ( >=dev-libs/dbus-glib-0.60:0 )
-	upnp? ( >=net-libs/gupnp-0.13:0= )"
-
-DEPEND="${RDEPEND}
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.18:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*
-	!!mate-extra/mate-file-manager-open-terminal
-	!!mate-extra/mate-file-manager-sendto
-	!!mate-extra/mate-file-manager-image-converter
-	!!mate-extra/mate-file-manager-share"
-
-src_configure() {
-	local sendto_plugins="removable-devices"
-	use cdr && sendto_plugins+=",caja-burn"
-	use mail && sendto_plugins+=",emailclient"
-	use pidgin && sendto_plugins+=",pidgin"
-	use gajim && sendto_plugins+=",gajim"
-	use upnp && sendto_plugins+=",upnp"
-
-	mate_src_configure \
-		--enable-sendto \
-		--with-sendto-plugins=${sendto_plugins}\
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_enable gksu) \
-		$(use_enable image-converter) \
-		$(use_enable open-terminal) \
-		$(use_enable share) \
-		$(use_enable wallpaper)
-}
diff --git a/mate-extra/caja-extensions/caja-extensions-1.14.1-r1.ebuild b/mate-extra/caja-extensions/caja-extensions-1.14.1-r1.ebuild
deleted file mode 100644
index e2dc40a1ed0c..000000000000
--- a/mate-extra/caja-extensions/caja-extensions-1.14.1-r1.ebuild
+++ /dev/null
@@ -1,70 +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="Several Caja extensions"
-LICENSE="GPL-2"
-SLOT="0"
-
-SENDTO="cdr gajim +mail pidgin upnp"
-IUSE="gksu gtk3 image-converter +open-terminal share +wallpaper ${SENDTO}"
-
-COMMON_DEPEND=">=dev-libs/glib-2.36:2
-	>=mate-base/caja-1.7[gtk3(-)=]
-	virtual/libintl:0
-	x11-libs/gdk-pixbuf:2
-	gajim? (
-		>=dev-libs/dbus-glib-0.60:0
-		>=sys-apps/dbus-1:0
-	)
-	!gtk3? ( >=x11-libs/gtk+-2.24:2 )
-	gtk3? ( >=x11-libs/gtk+-3.0:3 )
-	open-terminal? ( >=mate-base/mate-desktop-1.7[gtk3(-)=] )
-	pidgin? ( >=dev-libs/dbus-glib-0.60:0 )
-	upnp? ( >=net-libs/gupnp-0.13:0= )"
-
-RDEPEND="${COMMON_DEPEND}
-	cdr? ( >=app-cdr/brasero-2.32.1:0= )
-	gajim? ( net-im/gajim:0 )
-	gksu? ( x11-libs/gksu )
-	image-converter? ( virtual/imagemagick-tools )
-	pidgin? ( net-im/pidgin )"
-
-DEPEND="${COMMON_DEPEND}
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.18:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*
-	!!mate-extra/mate-file-manager-open-terminal
-	!!mate-extra/mate-file-manager-sendto
-	!!mate-extra/mate-file-manager-image-converter
-	!!mate-extra/mate-file-manager-share"
-
-src_configure() {
-	local sendto_plugins="removable-devices"
-	use cdr && sendto_plugins+=",caja-burn"
-	use mail && sendto_plugins+=",emailclient"
-	use pidgin && sendto_plugins+=",pidgin"
-	use gajim && sendto_plugins+=",gajim"
-	use upnp && sendto_plugins+=",upnp"
-
-	mate_src_configure \
-		--enable-sendto \
-		--with-sendto-plugins=${sendto_plugins}\
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_enable gksu) \
-		$(use_enable image-converter) \
-		$(use_enable open-terminal) \
-		$(use_enable share) \
-		$(use_enable wallpaper)
-}
diff --git a/mate-extra/caja-extensions/caja-extensions-1.16.0-r1.ebuild b/mate-extra/caja-extensions/caja-extensions-1.16.0-r1.ebuild
deleted file mode 100644
index e2dc40a1ed0c..000000000000
--- a/mate-extra/caja-extensions/caja-extensions-1.16.0-r1.ebuild
+++ /dev/null
@@ -1,70 +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="Several Caja extensions"
-LICENSE="GPL-2"
-SLOT="0"
-
-SENDTO="cdr gajim +mail pidgin upnp"
-IUSE="gksu gtk3 image-converter +open-terminal share +wallpaper ${SENDTO}"
-
-COMMON_DEPEND=">=dev-libs/glib-2.36:2
-	>=mate-base/caja-1.7[gtk3(-)=]
-	virtual/libintl:0
-	x11-libs/gdk-pixbuf:2
-	gajim? (
-		>=dev-libs/dbus-glib-0.60:0
-		>=sys-apps/dbus-1:0
-	)
-	!gtk3? ( >=x11-libs/gtk+-2.24:2 )
-	gtk3? ( >=x11-libs/gtk+-3.0:3 )
-	open-terminal? ( >=mate-base/mate-desktop-1.7[gtk3(-)=] )
-	pidgin? ( >=dev-libs/dbus-glib-0.60:0 )
-	upnp? ( >=net-libs/gupnp-0.13:0= )"
-
-RDEPEND="${COMMON_DEPEND}
-	cdr? ( >=app-cdr/brasero-2.32.1:0= )
-	gajim? ( net-im/gajim:0 )
-	gksu? ( x11-libs/gksu )
-	image-converter? ( virtual/imagemagick-tools )
-	pidgin? ( net-im/pidgin )"
-
-DEPEND="${COMMON_DEPEND}
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.18:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*
-	!!mate-extra/mate-file-manager-open-terminal
-	!!mate-extra/mate-file-manager-sendto
-	!!mate-extra/mate-file-manager-image-converter
-	!!mate-extra/mate-file-manager-share"
-
-src_configure() {
-	local sendto_plugins="removable-devices"
-	use cdr && sendto_plugins+=",caja-burn"
-	use mail && sendto_plugins+=",emailclient"
-	use pidgin && sendto_plugins+=",pidgin"
-	use gajim && sendto_plugins+=",gajim"
-	use upnp && sendto_plugins+=",upnp"
-
-	mate_src_configure \
-		--enable-sendto \
-		--with-sendto-plugins=${sendto_plugins}\
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_enable gksu) \
-		$(use_enable image-converter) \
-		$(use_enable open-terminal) \
-		$(use_enable share) \
-		$(use_enable wallpaper)
-}
diff --git a/mate-extra/caja-extensions/metadata.xml b/mate-extra/caja-extensions/metadata.xml
index 0852c69ac214..faa723208381 100644
--- a/mate-extra/caja-extensions/metadata.xml
+++ b/mate-extra/caja-extensions/metadata.xml
@@ -9,7 +9,6 @@
 		<flag name="cdr">Add an extension to burn files to cds using <pkg>app-cdr/brasero</pkg>.</flag>
 		<flag name="gajim">Add an extension to support <pkg>net-im/gajim</pkg>.</flag>
 		<flag name="gksu">Add an extension to support opening files as root with <pkg>x11-libs/gksu</pkg>.</flag>
-		<flag name="gtk3">Build with GTK+3 instead of GTK+2</flag>
 		<flag name="image-converter">Add image conversion support.</flag>
 		<flag name="mail">Add an extension to support e-mail functionality.</flag>
 		<flag name="open-terminal">Add an extension to support an open terminal.</flag>
diff --git a/mate-extra/mate-indicator-applet/Manifest b/mate-extra/mate-indicator-applet/Manifest
index 911b7be1751a..0550a19ac1f8 100644
--- a/mate-extra/mate-indicator-applet/Manifest
+++ b/mate-extra/mate-indicator-applet/Manifest
@@ -1,10 +1,3 @@
-AUX mate-indicator-applet-1.14.1-indicator-ng-configure-fix.patch 996 BLAKE2B cfbc8e798a9fa8631be6f61bcec1c1ade67e472c755850d10c0d9a8a66074e4676a94c3029f4b178c7952930f5d125e5dca8d4eb0bade7d63d52a9bbb04f4bbd SHA512 29bb260aa76533dbef27621080502cd3713afb7c825d7bb6c2803aeeb0c1f1873a70f8b8f121659c79878416fff0b13fcd685f98b738e7f5466fe727b7d4a84e
-DIST mate-indicator-applet-1.12.1.tar.xz 317984 BLAKE2B 98c5a52f499c1ed609b4c542aa96a3aecebcca529c66782e54954e3933ba50536ba3266f80522e576eddd1a6c97f1dff50059dfc48f38d4859ac57f370e120c2 SHA512 446ce32e8db22b153c7786292749645715e43c134e7fa00f81b7782a48163745307d396dbdd7765a63ec9514bec2f032f681028c55264e0fcf879c5e26fc9433
-DIST mate-indicator-applet-1.14.1.tar.xz 315480 BLAKE2B 337c216a11faa66332c4591cb8cf7b87dd0b2bf0180a5108f46c517fa8eb5353435c7f297a9f54431893033cb5d4b1f92b866825a304ea7b858a913540c8a2e8 SHA512 868f85546780d52aaadaa63ec14a8e92e673396653cebf7c5a9d0de459fc62d346fb10836298bf604eb50c63e5390cedd08576fb8903aeabdf2e2c4de5fc638f
-DIST mate-indicator-applet-1.16.0.tar.xz 317256 BLAKE2B d9a9da94702a59c225aa7d80ad228fbdafb65bea496dcf681cc4c76b3b16a1b985b33714df585a945076f0bacd7080b1c122021ff05bd86306168924541a488a SHA512 745f10ed20a453b02427982f59c81e85cdf80736aad62c4e149802c4df3646dfcd1dc822476f4d9cbd2f28c48e78c2e9a7e79652c8ba579a3e0bf9f16427b1a2
 DIST mate-indicator-applet-1.18.1.tar.xz 318464 BLAKE2B 989b84e2135ff3307a731b3eff981aea40002cbbd9b9e6ba61053a24e681fe3a3005b55ecf6dd027adf97d2bbfe3a12c0bdfdee2aac4860bac10fe3c03a4d681 SHA512 990cf60ff0b0a3e53f6ebc94abbdc15ce7b55258935763fb2d294a06c725e98e4b3389117e8fd04a9d1ce0ba691bc891542fd12c1ab58b29d99352a8369265d0
-EBUILD mate-indicator-applet-1.12.1-r1.ebuild 630 BLAKE2B 067af6429d8758595e64a35656fd8b4a76356093f047be637cd17baeba7b634f4e3b04f62f234603de612603f89a377fd29bdc86d69a2b71ef1357f2ab6251e0 SHA512 e5b55c8e0199aa4f13a283bb920ccabe113e94283f5dfcfba5ca6b84d63cf3ff653a52f1f5cfea93e5a7ef656763e0fcd68475f6fb16166648aa4fef042d6ef3
-EBUILD mate-indicator-applet-1.14.1-r1.ebuild 737 BLAKE2B 14e6047ce2b023857d310e689ca8978790644bb0863362176eae8d926f4957e2e5526a5a39c8d09fe023acd72420a19848eb8e1cac522b31fa47e079e5781992 SHA512 5f152aad87ec80339cb5c36e2647636af0cd936c86baaa0d5a43af5a03fd8d89b77ddda4a42673c949c677d36d4fdd3c1a708f00c412b1b8184222c457521c15
-EBUILD mate-indicator-applet-1.16.0.ebuild 672 BLAKE2B 104b9be047690211edbe0b7de8fb432855efbac809c9ac0620999b40c14c2a889f3074783dac4a1c34efa80808714024d6172adc55f0d5ce7dda3b293db66010 SHA512 9b32182a77cab459b28ec792fe7e919916f55fb52b3815238e404883c12d387bc3d9cb5ff9a659d878f8a254b3640cbdd59421d77c59902f986a96e71089e30c
 EBUILD mate-indicator-applet-1.18.1.ebuild 493 BLAKE2B a6284cc337a840d4ec5aa2a456a2fbeb6ecaa96f183467ce93278156f5d42ad4ed2a6b1c0e6d5e03c01ea930192b6b46b5fe9cdd5de220c45027f2d2f103ad72 SHA512 fcf317d1f96bdb007998fb2acbd33b66491ecea5e7a8c57ce9778ee02db75276a1db1b7b09985884f2d0dccb9db21c21e216572f0b1df7eab27d5ed35d84ed73
-MISC metadata.xml 426 BLAKE2B d357c7c86d9c19cb83f8bc2ccbe2f726e6f91e9798873ea2191a2b3679607741fd8798f712561a40a4b1d3ca81f2c7574793f12dbcc2491a18b3613a14e3798c SHA512 546adb619dcf891787a65bd23674411653136c82cad39e9937f6300b525049121ee15b94f3f62e555b50f0607367442f585c5f90274da92f506bb58c40b6c522
+MISC metadata.xml 350 BLAKE2B 96082001bda8c5a855c43e0ac4bba9d604b8ec94f66464859a37e30843f8f1ecddff2c3100a49ab465711bb529e288afddbb03aab9b6dde16de35370353a2fe7 SHA512 add12365e457c531f5dc3eec856099b5658f93a3d6ee2b3f80264374a84558566881213b8e8ffad03aeb3720025c385517d777af249a045b9dd2c22ce37b2f32
diff --git a/mate-extra/mate-indicator-applet/files/mate-indicator-applet-1.14.1-indicator-ng-configure-fix.patch b/mate-extra/mate-indicator-applet/files/mate-indicator-applet-1.14.1-indicator-ng-configure-fix.patch
deleted file mode 100644
index b9ae4fc8fecc..000000000000
--- a/mate-extra/mate-indicator-applet/files/mate-indicator-applet-1.14.1-indicator-ng-configure-fix.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 06f6db28648cdeff02cc07f9a7f1410b228450a4 Mon Sep 17 00:00:00 2001
-From: monsta <monsta@inbox.ru>
-Date: Wed, 14 Sep 2016 18:20:25 +0300
-Subject: [PATCH] check for libindicator 12.10.2 for new style indicators
- support
-
-fixes build on Gentoo which has 12.10.1 - turned out this version
-had no indicator-ng yet.
-
-note that (as of now) 12.10.2 isn't officially released upstream,
-and Ubuntu has post-12.10.1 repo snapshot packaged and labeled as
-12.10.2. however, that snapshot already has 12.10.2 version in .pc
-file, so the build works with it.
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 5e9c505..9b4dafc 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -46,7 +46,7 @@ case "$with_gtk" in
- esac
- 
- INDICATOR_REQUIRED_VERSION=0.3.90
--INDICATOR_NG_VERSION=12.10
-+INDICATOR_NG_VERSION=12.10.2
- INDICATOR_PKG=indicator$INDICATOR_API_VERSION-0.4
- 
- PKG_CHECK_MODULES(APPLET, gtk+-$GTK_API_VERSION >= $GTK_REQUIRED_VERSION
diff --git a/mate-extra/mate-indicator-applet/mate-indicator-applet-1.12.1-r1.ebuild b/mate-extra/mate-indicator-applet/mate-indicator-applet-1.12.1-r1.ebuild
deleted file mode 100644
index f87a16fc0829..000000000000
--- a/mate-extra/mate-indicator-applet/mate-indicator-applet-1.12.1-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate versionator
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm x86"
-fi
-
-DESCRIPTION="MATE indicator applet"
-LICENSE="GPL-2 FDL-1.1 LGPL-2"
-SLOT="0"
-
-IUSE="gtk3"
-
-RDEPEND="
-	>=mate-base/mate-panel-1.8[gtk3(-)=]
-	!gtk3? (
-		>=dev-libs/libindicator-0.3.90:0
-		>=x11-libs/gtk+-2.24:2
-	)
-	gtk3? (
-		>=dev-libs/libindicator-0.3.90:3
-		>=x11-libs/gtk+-3.0:3
-	)"
-
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.35.0
-	virtual/pkgconfig"
-
-src_configure() {
-	mate_src_configure \
-		--with-gtk=$(usex gtk3 3.0 2.0)
-}
diff --git a/mate-extra/mate-indicator-applet/mate-indicator-applet-1.14.1-r1.ebuild b/mate-extra/mate-indicator-applet/mate-indicator-applet-1.14.1-r1.ebuild
deleted file mode 100644
index 4af07eb73100..000000000000
--- a/mate-extra/mate-indicator-applet/mate-indicator-applet-1.14.1-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate versionator
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="MATE indicator applet"
-LICENSE="GPL-2 FDL-1.1 LGPL-2"
-SLOT="0"
-
-IUSE="gtk3"
-
-COMMON_DEPEND="
-	>=mate-base/mate-panel-1.8[gtk3(-)=]
-	!gtk3? (
-		>=dev-libs/libindicator-0.3.90:0
-		>=x11-libs/gtk+-2.24:2
-	)
-	gtk3? (
-		>=dev-libs/libindicator-0.3.90:3
-		>=x11-libs/gtk+-3.0:3
-	)"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.35.0
-	virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}/${P}-indicator-ng-configure-fix.patch" )
-
-src_configure() {
-	mate_src_configure \
-		--with-gtk=$(usex gtk3 3.0 2.0)
-}
diff --git a/mate-extra/mate-indicator-applet/mate-indicator-applet-1.16.0.ebuild b/mate-extra/mate-indicator-applet/mate-indicator-applet-1.16.0.ebuild
deleted file mode 100644
index 2f32c4cab09a..000000000000
--- a/mate-extra/mate-indicator-applet/mate-indicator-applet-1.16.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate versionator
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="MATE indicator applet"
-LICENSE="GPL-2 FDL-1.1 LGPL-2"
-SLOT="0"
-
-IUSE="gtk3"
-
-COMMON_DEPEND="
-	>=mate-base/mate-panel-1.8[gtk3(-)=]
-	!gtk3? (
-		>=dev-libs/libindicator-0.3.90:0
-		>=x11-libs/gtk+-2.24:2
-	)
-	gtk3? (
-		>=dev-libs/libindicator-0.3.90:3
-		>=x11-libs/gtk+-3.0:3
-	)"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.35.0
-	virtual/pkgconfig"
-
-src_configure() {
-	mate_src_configure \
-		--with-gtk=$(usex gtk3 3.0 2.0)
-}
diff --git a/mate-extra/mate-indicator-applet/metadata.xml b/mate-extra/mate-indicator-applet/metadata.xml
index 9561edc8026c..84f9d6c300e5 100644
--- a/mate-extra/mate-indicator-applet/metadata.xml
+++ b/mate-extra/mate-indicator-applet/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-indicator-applet</remote-id>
 	</upstream>
diff --git a/mate-extra/mate-media/Manifest b/mate-extra/mate-media/Manifest
index b96039893512..291d86efb65e 100644
--- a/mate-extra/mate-media/Manifest
+++ b/mate-extra/mate-media/Manifest
@@ -1,9 +1,3 @@
-DIST mate-media-1.12.1.tar.xz 507976 BLAKE2B c8a60c499becdf0e680ec3ce67a378ad8eb8b3b52f53f4e817a088c5268ac6b6be2675282b366b4628ec2a081cdc2607d82bc18cc13d7439e8bdbc9f1b33d208 SHA512 04dd05b62ea0fdfcd82321a77fa74d014c11e1a8434b445e42660c55f3158775341b36fe56f402940cef297b906b55fafd6d8eac3cd48ab5e34371b95c01d330
-DIST mate-media-1.14.1.tar.xz 490472 BLAKE2B 6b26d41524d5c2c1fbc1c09f245fa805bd669cefdc60e087c9cf240c4ef9cce4349a4af089c3193d73dce292ac2e324476f3041b6a370c4d8074c125efca37cf SHA512 dde83a93fbedca74c0f719a0a6b344785d6f83941bc0b4b6583d52aff4b9e514bbbc4e576993a573a7aab56e01222eba09ce64b4acea8b35799cfb4b85e6d6da
-DIST mate-media-1.16.0.tar.xz 491576 BLAKE2B 87762803d0b38d3691b0fd9a7995b39a9d4f0011a8b04148dd1a19fcf276b32c68943220225a19550256d6ec198674574fe15142872721b081fb4a48c502f83d SHA512 d5ad7097b100e3736cc7e7c651e40195b068b1db79b563035853e7f7fde439e830b750564cbc52b20828ee4a2d8091304897c5044a5bcb1774124626b000d965
 DIST mate-media-1.18.2.tar.xz 496148 BLAKE2B 5588c3c9d72ca73d7956db4e90b0989b040be59e85f2d93b740c085098cd4e643b0848d53015e7d8dc4da528edf4b7cb90dbf7c7d30e6ec3a7c898190ca90565 SHA512 bfd5933e95aac233354b0124919213cd6aba9f062eb4f240ff2df80447091473d2789ee87960fa00d5672c31daf3ac32b81a190f43f6cb32ca92fc8b6768fb38
-EBUILD mate-media-1.12.1.ebuild 940 BLAKE2B af25fcbe57592459a889afd86ba8bbe5f77388afcdcc6bf7348af923aec5c1e806beb94902bd58ebc2c5a6786410f50737a33a4ee45bd50bcb718e431c2fbdbc SHA512 46d400fede81656a1f7a42befdd6fc771eae4f20d711514fb00ce952b3306fb2e583e85dc5a340be779f56e101b9c34bb527f810521552edcac695de462c31b9
-EBUILD mate-media-1.14.1.ebuild 982 BLAKE2B d06372f2495aa566951294beb992cd1e3909cab8a4518f923d7b757fde43fb022825e5b9a45b2cd148e375464a09a5a588222b1fc20ae4804004174c9432cd23 SHA512 e540c9bd1c107e8dcc0406faac99cf89f54062d0d94e7fa8a4d46dc56be9c601161d76d6d3b22c449be1e34b1532b968b47a8c40548a8219dc67e78e0a0c1fd7
-EBUILD mate-media-1.16.0.ebuild 982 BLAKE2B d06372f2495aa566951294beb992cd1e3909cab8a4518f923d7b757fde43fb022825e5b9a45b2cd148e375464a09a5a588222b1fc20ae4804004174c9432cd23 SHA512 e540c9bd1c107e8dcc0406faac99cf89f54062d0d94e7fa8a4d46dc56be9c601161d76d6d3b22c449be1e34b1532b968b47a8c40548a8219dc67e78e0a0c1fd7
 EBUILD mate-media-1.18.2.ebuild 747 BLAKE2B f1637346bf915651164101b17ea71811a0d6504bb1054a87871daa5baa85e768494dc8a16790ee201fbccc7cc677030ffa472a61b2adef82ec145af29302842a SHA512 081ff51b52a30282dcb20391d9b34e95f2cc3c4985f52e8c01cd8f23220289eb3fb60b628ba5bfb9006459c9012b680f063bee44d61ea3eb8480b4ffa5de685f
-MISC metadata.xml 415 BLAKE2B 6ff09f57928a7bcad44b6830863ebf862eb3c793b202c4be4da91ec0570b26e18519e2235ff1ca71459266d5fbcf6770ddd2b4db69b8ecdb822c207b88ab1e29 SHA512 8021259f41090c51e2a485027cc52cb87a90781f6684c0d8795556b622eb6f4659f0633c7f53778c1fc918a281707a958257775cfdb67d52be262eb5a1da68a7
+MISC metadata.xml 339 BLAKE2B bd032fdad5c46fb56210712a25e50c24959053249e43ebe7da6a6d2cfb099642acc949db166abca0c847cb661c6b20d59f03366abc290b4e0656a547ede52a8b SHA512 6975819ad5dd4234e702e7eaa36a05f3598a830b3f997ea17f299e1e7a40f5d3463b732ca1816e7e9af015c4afeecff2ea94dc0562a20b31698870ffc0489968
diff --git a/mate-extra/mate-media/mate-media-1.12.1.ebuild b/mate-extra/mate-media/mate-media-1.12.1.ebuild
deleted file mode 100644
index e97d1043a69e..000000000000
--- a/mate-extra/mate-media/mate-media-1.12.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm x86"
-fi
-
-DESCRIPTION="Multimedia related programs for the MATE desktop"
-LICENSE="LGPL-2 GPL-2 FDL-1.1"
-SLOT="0"
-
-IUSE="gtk3"
-
-RDEPEND=">=dev-libs/glib-2.36.0:2
-	dev-libs/libxml2:2
-	>=mate-base/mate-panel-1.8[gtk3(-)=]
-	>=mate-base/mate-desktop-1.9.3[gtk3(-)=]
-	>=media-libs/libmatemixer-1.9.1
-	x11-libs/cairo:0
-	x11-libs/pango:0
-	virtual/libintl:0
-	!gtk3? (
-		>=dev-libs/libunique-1:1
-		>=media-libs/libcanberra-0.13:0[gtk]
-		>=x11-libs/gtk+-2.24:2
-	)
-	gtk3? (
-		>=dev-libs/libunique-3:3
-		>=media-libs/libcanberra-0.13:0[gtk3]
-		>=x11-libs/gtk+-3.0:3
-	)"
-
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.35.0:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*
-	!!<mate-base/mate-applets-1.8:*"
-
-src_configure() {
-	mate_src_configure \
-		--with-gtk=$(usex gtk3 3.0 2.0)
-}
diff --git a/mate-extra/mate-media/mate-media-1.14.1.ebuild b/mate-extra/mate-media/mate-media-1.14.1.ebuild
deleted file mode 100644
index 7e65f44ccc0d..000000000000
--- a/mate-extra/mate-media/mate-media-1.14.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="Multimedia related programs for the MATE desktop"
-LICENSE="LGPL-2 GPL-2 FDL-1.1"
-SLOT="0"
-
-IUSE="gtk3"
-
-COMMON_DEPEND=">=dev-libs/glib-2.36.0:2
-	dev-libs/libxml2:2
-	>=mate-base/mate-panel-1.8[gtk3(-)=]
-	>=mate-base/mate-desktop-1.9.3[gtk3(-)=]
-	>=media-libs/libmatemixer-1.9.1
-	x11-libs/cairo:0
-	x11-libs/pango:0
-	virtual/libintl:0
-	!gtk3? (
-		>=dev-libs/libunique-1:1
-		>=media-libs/libcanberra-0.13:0[gtk]
-		>=x11-libs/gtk+-2.24:2
-	)
-	gtk3? (
-		>=dev-libs/libunique-3:3
-		>=media-libs/libcanberra-0.13:0[gtk3]
-		>=x11-libs/gtk+-3.0:3
-	)"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.35.0:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*
-	!!<mate-base/mate-applets-1.8:*"
-
-src_configure() {
-	mate_src_configure \
-		--with-gtk=$(usex gtk3 3.0 2.0)
-}
diff --git a/mate-extra/mate-media/mate-media-1.16.0.ebuild b/mate-extra/mate-media/mate-media-1.16.0.ebuild
deleted file mode 100644
index 7e65f44ccc0d..000000000000
--- a/mate-extra/mate-media/mate-media-1.16.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="Multimedia related programs for the MATE desktop"
-LICENSE="LGPL-2 GPL-2 FDL-1.1"
-SLOT="0"
-
-IUSE="gtk3"
-
-COMMON_DEPEND=">=dev-libs/glib-2.36.0:2
-	dev-libs/libxml2:2
-	>=mate-base/mate-panel-1.8[gtk3(-)=]
-	>=mate-base/mate-desktop-1.9.3[gtk3(-)=]
-	>=media-libs/libmatemixer-1.9.1
-	x11-libs/cairo:0
-	x11-libs/pango:0
-	virtual/libintl:0
-	!gtk3? (
-		>=dev-libs/libunique-1:1
-		>=media-libs/libcanberra-0.13:0[gtk]
-		>=x11-libs/gtk+-2.24:2
-	)
-	gtk3? (
-		>=dev-libs/libunique-3:3
-		>=media-libs/libcanberra-0.13:0[gtk3]
-		>=x11-libs/gtk+-3.0:3
-	)"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.35.0:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*
-	!!<mate-base/mate-applets-1.8:*"
-
-src_configure() {
-	mate_src_configure \
-		--with-gtk=$(usex gtk3 3.0 2.0)
-}
diff --git a/mate-extra/mate-media/metadata.xml b/mate-extra/mate-media/metadata.xml
index d28e7fdae6e8..b92685571c01 100644
--- a/mate-extra/mate-media/metadata.xml
+++ b/mate-extra/mate-media/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-media</remote-id>
 	</upstream>
diff --git a/mate-extra/mate-netbook/Manifest b/mate-extra/mate-netbook/Manifest
index 5a81ea39f66f..fc643f2e13b9 100644
--- a/mate-extra/mate-netbook/Manifest
+++ b/mate-extra/mate-netbook/Manifest
@@ -1,9 +1,3 @@
-DIST mate-netbook-1.12.0.tar.xz 268632 BLAKE2B 8d5ec5ec4eac31f7aa7e93849b7a8d35ec5537cdf75e4c4358f919418b0ffa7addfcbbe7e23f55b9359ac45f9f77899c90e309bfd601d33576f3b22e3c1a0156 SHA512 3f46e537b48833fe3bd599dcaa6af89a265dacac4fc077d46ca87b5a35c2368810824747411d263541e2685e2700311996f8741aa9321122d6d306c1ad8fc15b
-DIST mate-netbook-1.14.0.tar.xz 284248 BLAKE2B 405d278573feaf875edb2e7c02d5e47004be2f137e1ede9ae84850b685b68ff9f315dadda9095eaf340923c1390bc6f04ea3f3f40a5d0a050def9452f41d3bf9 SHA512 aa5d5ed1a8c31df4b7e84cad8efaaf326f7bf2a9a392b34b053c30287404949ddd5f27d438d028bc569cbedc177dc1236af32e869b0418677021e7a6ef17dfe1
-DIST mate-netbook-1.16.2.tar.xz 299112 BLAKE2B 134c92225e4234944d28870bee994bce25967df5f35cb40603bfe2677bc71b71f331433b571543de739bedd4f0ae944f57266f547926ee654e19cb361316af92 SHA512 2a633164b1a4d57b659f6710969bf8d14b99d77351464b171cbb049635fc6bcfcb1925a0b36762c6593c45a7695fe20e981ada5a24816879b4c0b392da2803b4
 DIST mate-netbook-1.18.2.tar.xz 290816 BLAKE2B b12654088fc73f0ed38ea81366f24de5b737a9754a4c68720640ace14d5f8be76fd2d7bf8a5f4cb44b5410c187ce459b01aa72a4ad67eb6f182c1195a055b650 SHA512 0663eeaa47480f16146cce3e34d037c8eafcd6ca0e6d079dcfadfb6e97fca7b13ea7121896ca268238f161f5edc57754f620f9020f4480e23253a57490ec29e7
-EBUILD mate-netbook-1.12.0.ebuild 823 BLAKE2B fa6940772e447c775603d0e005a6fb818dd2022202ec0272714e37e7bbc7067abcc93908a955540e45fb82e51291b4ec586062a72cd38aa728e91afb9883d8de SHA512 c3517ac36aed51ae5875399626cf6f45ad2531cd8fb73500a71e8ca2ae8055bdf118d5eedbc1ad39ce72ae8953159d86e31070f738ed3f97349b22f949e55a2c
-EBUILD mate-netbook-1.14.0.ebuild 865 BLAKE2B 7adc25f80ce602b547a5ab32806d845651f34487a7b427f3a6c2f44740c5f8883906b17fe3988fb751dffbd012c8b00d712d2c48d5417e2d185bb6c0eba49101 SHA512 9d9c9e415576372b84a10b440a0cf6e9b3c35ace747ef673c2b298ad687765de1f19698b4073cfb7c91df56c69f20f80275044aa27df3e2a687551bc59da407a
-EBUILD mate-netbook-1.16.2.ebuild 779 BLAKE2B 918c6311f5caa276df0db09addd82d72f5452558fa8253b817b4624165f73b532744c263eb823a031aa642b6484b9efb87edfa87feeb8fc2ea795b175459b0d5 SHA512 8605b73d7c150d129f13a8bea1b4ab209eeb887f7ff658d0d430868bfd44bff5a37c87531e4bc11862bfbb0b0532f588e953b0710be2d0642d97ad17f238d2b7
 EBUILD mate-netbook-1.18.2.ebuild 637 BLAKE2B 2d986de17950483ece6e79119ef6d8c366ffb1a43c8cf2de49d89e9e5e4f9af057044b7738665d1f085ec3cba31d0097b50edf4e3dad81770f03ae5c0b7cc4a5 SHA512 83e1b8e1826e79f306add4e188f49ea7c97805a03403dfd473822cf35086dd7d1b0645b9b059061e10d850c11d3c862d5cf4dda7bd6722f56014eea43a83f251
-MISC metadata.xml 571 BLAKE2B f402acb0954e2b199d94e0281c4f76795a91f3d5d028a07a546d0ddb54aa134112f39b51dd00b2aa5132f58c21c121864d04c4c7ef4d768258ece8850b965033 SHA512 c615ac4dcce2738757c792d96a5af9db7d745b6587c1c8e36f70ece45128ec1b05141fc787320031559b8819969f1ac661a11876f8185fef2623d039f6832d76
+MISC metadata.xml 495 BLAKE2B 69f4f61082d017e4e92917edcfb1fc9be696c5472641b0cd81714c07a29f4495644f4120fbd0292f8c5d1d40b3642a095969281ed2c2ad8896ff3156c3fba3bd SHA512 8edc358ede2010384cdecc1e430aa9cbf90bb64c3f52d71ad2bf30d4cb84e38bdf48a4b2e45920b35ada734ffe4a46b44f363b6bf18ba2247f6abe290b5131db
diff --git a/mate-extra/mate-netbook/mate-netbook-1.12.0.ebuild b/mate-extra/mate-netbook/mate-netbook-1.12.0.ebuild
deleted file mode 100644
index 4dc8489e18d6..000000000000
--- a/mate-extra/mate-netbook/mate-netbook-1.12.0.ebuild
+++ /dev/null
@@ -1,47 +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 utilities for netbooks"
-LICENSE="GPL-3"
-SLOT="0"
-
-IUSE="gtk3"
-
-RDEPEND="
-	>=dev-libs/glib-2.36:2
-	>=mate-base/mate-desktop-1.9[gtk3(-)=]
-	>=mate-base/mate-panel-1.8[gtk3(-)=]
-	x11-libs/libfakekey:0
-	x11-libs/libXtst:0
-	x11-libs/libX11:0
-	x11-libs/cairo:0
-	virtual/libintl:0
-	!gtk3? (
-		dev-libs/libunique:1
-		x11-libs/gtk+:2
-		x11-libs/libwnck:1
-	)
-	gtk3? (
-		dev-libs/libunique:3
-		x11-libs/gtk+:3
-		x11-libs/libwnck:3
-	)"
-
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.50.1:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*
-	x11-base/xorg-proto"
-
-src_configure() {
-	mate_src_configure \
-		--with-gtk=$(usex gtk3 3.0 2.0)
-}
diff --git a/mate-extra/mate-netbook/mate-netbook-1.14.0.ebuild b/mate-extra/mate-netbook/mate-netbook-1.14.0.ebuild
deleted file mode 100644
index 49cee424aaff..000000000000
--- a/mate-extra/mate-netbook/mate-netbook-1.14.0.ebuild
+++ /dev/null
@@ -1,49 +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 utilities for netbooks"
-LICENSE="GPL-3"
-SLOT="0"
-
-IUSE="gtk3"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.36:2
-	>=mate-base/mate-desktop-1.9[gtk3(-)=]
-	>=mate-base/mate-panel-1.8[gtk3(-)=]
-	x11-libs/libfakekey:0
-	x11-libs/libXtst:0
-	x11-libs/libX11:0
-	x11-libs/cairo:0
-	virtual/libintl:0
-	!gtk3? (
-		dev-libs/libunique:1
-		x11-libs/gtk+:2
-		x11-libs/libwnck:1
-	)
-	gtk3? (
-		dev-libs/libunique:3
-		x11-libs/gtk+:3
-		x11-libs/libwnck:3
-	)"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.50.1:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*
-	x11-base/xorg-proto"
-
-src_configure() {
-	mate_src_configure \
-		--with-gtk=$(usex gtk3 3.0 2.0)
-}
diff --git a/mate-extra/mate-netbook/mate-netbook-1.16.2.ebuild b/mate-extra/mate-netbook/mate-netbook-1.16.2.ebuild
deleted file mode 100644
index 3ff9ea5945f3..000000000000
--- a/mate-extra/mate-netbook/mate-netbook-1.16.2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="MATE utilities for netbooks"
-LICENSE="GPL-3"
-SLOT="0"
-
-IUSE="gtk3"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.36:2
-	>=mate-base/mate-panel-1.8[gtk3(-)=]
-	x11-libs/libfakekey:0
-	x11-libs/libXtst:0
-	x11-libs/libX11:0
-	x11-libs/cairo:0
-	virtual/libintl:0
-	!gtk3? (
-		x11-libs/gtk+:2
-		x11-libs/libwnck:1
-	)
-	gtk3? (
-		x11-libs/gtk+:3
-		x11-libs/libwnck:3
-	)"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.50.1:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*
-	x11-base/xorg-proto"
-
-src_configure() {
-	mate_src_configure \
-		--with-gtk=$(usex gtk3 3.0 2.0)
-}
diff --git a/mate-extra/mate-netbook/metadata.xml b/mate-extra/mate-netbook/metadata.xml
index 2c589b8e9aed..755bd33a051b 100644
--- a/mate-extra/mate-netbook/metadata.xml
+++ b/mate-extra/mate-netbook/metadata.xml
@@ -9,9 +9,6 @@
 		MATE utilities for netbooks are an applet and a daemon to
 		maximize windows and move their titles on the panel.
 	</longdescription>
-	<use>
-		<flag name="gtk3">Build with GTK+3 instead of GTK+2</flag>
-	</use>
 	<upstream>
 		<remote-id type="github">mate-desktop/mate-netbook</remote-id>
 	</upstream>
diff --git a/mate-extra/mate-polkit/Manifest b/mate-extra/mate-polkit/Manifest
index a6ffc1246287..b9a45596c5ad 100644
--- a/mate-extra/mate-polkit/Manifest
+++ b/mate-extra/mate-polkit/Manifest
@@ -1,9 +1,3 @@
-DIST mate-polkit-1.12.0.tar.xz 324708 BLAKE2B 088ac84721f1a3274c935c40ed2ee2985a7743851bd3ea85cf5ef8891481d25319c37e6d9900e89ef0b7e9e7e29446028de8c762f7c93cb55fc161ebfbf5b557 SHA512 b6e771062e29d2f4f2823638e39f5e5b349b98fcf8fd8d652d847d568eee919d37956089d7bef1463d96f801f852d10d9423bb8c20f8a54dfe8188d19ab6fb0c
-DIST mate-polkit-1.14.0.tar.xz 339872 BLAKE2B 25bee9752133416d06e46f41e48fc13d71bc8756792a0f33ae582c59a6b0a40e1648157b5e512cd5016cf9dedf9eb1dad641a924076ac51e461ffb3cde018d4c SHA512 f3507380152798af192e3338b5f056b1105fd297e935f098803c21450b04b6d149bc22106f34129a6394655be2e6505c91ad1433e817c68274a1243cc862bcdf
-DIST mate-polkit-1.16.0.tar.xz 340500 BLAKE2B b8a42053af3b895029fda08f5a613301630941855cf229d509d3864e570be46f3adf1e85689a3906e01ac23f08f8336313a027907b914160aa9fdc36bc662d4c SHA512 9b2a1870fdbe828b39ced7b24e1096edb559dcd553bac3fb15a6ab8d5dbc442870916f5105550a0e14cf3e85ac06c798d7daf0b464a182ba686bb3eb1bac1cb4
 DIST mate-polkit-1.18.2.tar.xz 348272 BLAKE2B 38b2359be2f908181805fa213fcd6973d8b208bc52542702b19a7dc8162ea316540ad8c524b102b6fd95d85dd1e87c3eda29023c798dedf39eb301ff7f691d14 SHA512 4150e0a18ecc1ea1d554334ca3725ab62008f9ea5693ab95eb70df408cfd08a46717d3252017f14f99e9389a2e106add1f74fd63d26cd5db9011707a5a4f63f9
-EBUILD mate-polkit-1.12.0-r2.ebuild 1279 BLAKE2B 1b804e8896adb8f869a13485367f60f368e42409304b36d0ac50ec9cf4eb54adddcae1870be0da5e7efdd6aa127c59e638fd5ec504ac932a5b3b2ba5e24af773 SHA512 95dbf9f4ce16fda02fcf36ae58836afb2322685bda7640fc93081fea24092d39c5cd00e92e66604428f6a11f90f460007af4f97de79248c9ba720466118a387a
-EBUILD mate-polkit-1.14.0.ebuild 1321 BLAKE2B d8c4b905805155da433c3f76efef1f99d523fa1498e4a5165d8cd1c93aa59ae369e41375f6299edacd88b6359ff8f132b7e743bfe2788fdad327bdce41620582 SHA512 2a2645a6b926e7330b5396a2f1136e16393d4d1a7a3394b24e55850add872c0f1f21bc7a354af4f5eee9601bdcbb02520707182ecb64bc61f59549bf10b75ef3
-EBUILD mate-polkit-1.16.0.ebuild 1168 BLAKE2B b76bd93f60f65c4905632583fd166f63d9246b18ea138a8573d2851c7e6c60d4de784c3905ab7c0a1ad6976c10faf7d011fa8cf0231430ea2ae98bac045642cf SHA512 95f25b6ad35bd24f471338586aad989c1e66b3f78b99a5792fe501e3bb9e959e6f6e6ffa03dd7754183ba6cbf003c69832f200135941ddad123bb9f4062e062c
 EBUILD mate-polkit-1.18.2.ebuild 1173 BLAKE2B ce9f9edad6a3370ab67d96ae16db4efe03cdce7627110aee20dd65721c4dd828e667206ea58a8c7acc0f644f21fc63575cb1476f5f8c4cfcb9b1277389aa29a3 SHA512 e7ab3d40a8e7112d6f6ce930d78a0aaa573a8dd37593a3d9fd41fc7a0723b33b7bc696407cacf2a259d1759f609f8dd9cebfd181196cdbf96796e555aa86d51b
-MISC metadata.xml 566 BLAKE2B d3334594e1bbe74979176bce038c94caf751fc26a342b5184807398df411daa43f81f26b3d010db536f7f275702d0972049115bfedfdbb3b07b793944a458aba SHA512 3f12eeee64f074b271e1f3c1fc8e8cfd7a6aa2a4ec0e9f4ac0f60aaff31523c182e59291b355a0e2440c9e8a0c2a3dc116ebd84c0cc2d0dbd869072c39da5480
+MISC metadata.xml 505 BLAKE2B 280a6762e6d9c690b5b0e0383e9d7560551d131f72823fdd759175b89f04eb22bbb7c605f26e178cfab65cc63e590997dbc9fd5621afe7ec1a4dbb5acd129683 SHA512 eea439bc1d6d7444abdea4e5ce2ed33bfc4a7bc625d67ccff9b65348d72296f5dddb1c11c86efd7b2ebb84b2fc2f2ed8beab715d6016c8ec94d03626be4497ef
diff --git a/mate-extra/mate-polkit/mate-polkit-1.12.0-r2.ebuild b/mate-extra/mate-polkit/mate-polkit-1.12.0-r2.ebuild
deleted file mode 100644
index 95d9df6dc89f..000000000000
--- a/mate-extra/mate-polkit/mate-polkit-1.12.0-r2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm x86"
-fi
-
-DESCRIPTION="A MATE specific DBUS service that is used to bring up authentication dialogs"
-LICENSE="LGPL-2"
-SLOT="0"
-
-IUSE="accountsservice appindicator debug examples gtk3 +introspection"
-
-RDEPEND=">=dev-libs/glib-2.36:2
-	>=sys-auth/polkit-0.102:0[introspection?]
-	x11-libs/gdk-pixbuf:2[introspection?]
-	virtual/libintl:0
-	accountsservice? ( sys-apps/accountsservice:0[introspection?] )
-	!gtk3? (
-		>=x11-libs/gtk+-2.24:2[introspection?]
-		appindicator? ( dev-libs/libappindicator:2 )
-	)
-	gtk3? (
-		>=x11-libs/gtk+-3.0:3[introspection?]
-		appindicator? ( dev-libs/libappindicator:3 )
-	)
-	introspection? ( >=dev-libs/gobject-introspection-0.6.2:= )"
-
-DEPEND="${RDEPEND}
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.35:*
-	sys-devel/gettext:*
-	>=sys-devel/libtool-2.2.6
-	virtual/pkgconfig:*
-	!<gnome-extra/polkit-gnome-0.102:0"
-
-src_configure() {
-	mate_src_configure \
-		--disable-static \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_enable accountsservice) \
-		$(use_enable appindicator) \
-		$(use_enable debug) \
-		$(use_enable examples) \
-		$(use_enable introspection)
-}
diff --git a/mate-extra/mate-polkit/mate-polkit-1.14.0.ebuild b/mate-extra/mate-polkit/mate-polkit-1.14.0.ebuild
deleted file mode 100644
index 07a5529360d1..000000000000
--- a/mate-extra/mate-polkit/mate-polkit-1.14.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="A MATE specific DBUS service that is used to bring up authentication dialogs"
-LICENSE="LGPL-2"
-SLOT="0"
-
-IUSE="accountsservice appindicator debug examples gtk3 +introspection"
-
-COMMON_DEPEND=">=dev-libs/glib-2.36:2
-	>=sys-auth/polkit-0.102:0[introspection?]
-	x11-libs/gdk-pixbuf:2[introspection?]
-	virtual/libintl:0
-	!gtk3? (
-		>=x11-libs/gtk+-2.24:2[introspection?]
-		appindicator? ( dev-libs/libappindicator:2 )
-	)
-	gtk3? (
-		>=x11-libs/gtk+-3.0:3[introspection?]
-		appindicator? ( dev-libs/libappindicator:3 )
-	)
-	introspection? ( >=dev-libs/gobject-introspection-0.6.2:= )"
-
-RDEPEND="${COMMON_DEPEND}
-	accountsservice? ( sys-apps/accountsservice:0[introspection?] )"
-
-DEPEND="${COMMON_DEPEND}
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.35:*
-	sys-devel/gettext:*
-	>=sys-devel/libtool-2.2.6
-	virtual/pkgconfig:*
-	!<gnome-extra/polkit-gnome-0.102:0"
-
-src_configure() {
-	mate_src_configure \
-		--disable-static \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_enable accountsservice) \
-		$(use_enable appindicator) \
-		$(use_enable debug) \
-		$(use_enable examples) \
-		$(use_enable introspection)
-}
diff --git a/mate-extra/mate-polkit/mate-polkit-1.16.0.ebuild b/mate-extra/mate-polkit/mate-polkit-1.16.0.ebuild
deleted file mode 100644
index 294d7edfb02b..000000000000
--- a/mate-extra/mate-polkit/mate-polkit-1.16.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="A MATE specific DBUS service that is used to bring up authentication dialogs"
-LICENSE="LGPL-2"
-SLOT="0"
-
-IUSE="accountsservice appindicator debug examples +introspection"
-
-COMMON_DEPEND=">=dev-libs/glib-2.36:2
-	>=sys-auth/polkit-0.102:0[introspection?]
-	x11-libs/gdk-pixbuf:2[introspection?]
-	virtual/libintl:0
-	>=x11-libs/gtk+-3.14.0:3[introspection?]
-	appindicator? ( dev-libs/libappindicator:3 )
-	introspection? ( >=dev-libs/gobject-introspection-0.6.2:= )"
-
-RDEPEND="${COMMON_DEPEND}
-	accountsservice? ( sys-apps/accountsservice:0[introspection?] )"
-
-DEPEND="${COMMON_DEPEND}
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.35:*
-	sys-devel/gettext:*
-	>=sys-devel/libtool-2.2.6
-	virtual/pkgconfig:*
-	!<gnome-extra/polkit-gnome-0.102:0"
-
-src_configure() {
-	mate_src_configure \
-		--disable-static \
-		$(use_enable accountsservice) \
-		$(use_enable appindicator) \
-		$(use_enable debug) \
-		$(use_enable examples) \
-		$(use_enable introspection)
-}
diff --git a/mate-extra/mate-polkit/metadata.xml b/mate-extra/mate-polkit/metadata.xml
index a91d00933e6a..29daec0e17ce 100644
--- a/mate-extra/mate-polkit/metadata.xml
+++ b/mate-extra/mate-polkit/metadata.xml
@@ -11,6 +11,5 @@
 	<use>
 		<flag name="accountsservice">Support extraction of data from AccountsService</flag>
 		<flag name="appindicator">Add support for AppIndicator</flag>
-		<flag name="gtk3">Build with GTK+3 instead of GTK+2</flag>
 	</use>
 </pkgmetadata>
diff --git a/mate-extra/mate-power-manager/Manifest b/mate-extra/mate-power-manager/Manifest
index 5016c3efd7ef..4a32631c572e 100644
--- a/mate-extra/mate-power-manager/Manifest
+++ b/mate-extra/mate-power-manager/Manifest
@@ -1,9 +1,3 @@
-DIST mate-power-manager-1.12.1.tar.xz 3197824 BLAKE2B 17f2f7939bfd0cfce433253ca8d4af6c7b98d850aed2c705650ef33e09d01f0f33107612ffbeca0a07a333e31ce736786e1638e32681fef49c95691a67e33290 SHA512 60da8ab6988a4bbef363fcf4571260bc7f70ed90badf85e4233e6ed80cfc13446319bd8686ed6d4bf9752971a6f98021a5d0354e3aa7f9274b6fdbc8f9f920b4
-DIST mate-power-manager-1.14.0.tar.xz 3221144 BLAKE2B c8bf7f263f3c7388cf937bb40d81d016e5e8e227d503c7828029f1d52c48edfeb6d5a9c666c45d752edf26798f69e27199ac6221a0a8a6b84c0a1cf12e216a45 SHA512 b1e6c5c0fe18b8e5d70ad66af450e86e7cf9fd5429973907618a742093fa9dec0c137e598f766824cb092d7c8c90a6d7116bc6b0417c81320dc21f8426d1eae2
-DIST mate-power-manager-1.16.2.tar.xz 3197208 BLAKE2B 80b84f596f3dad097508a2bc155f77ce7858699a8e7f5ed9460934b4f949bed9708b073722a6f680ec2e81f88c44c5db8c252b2b83f8706bccc8c9bad10503ea SHA512 8b5c3141d5e9dde771188ef7fed27073efbe7bfa7c244e3fb97fd2e0cf2e964ed6fcf587f003b3c090267ab0bf77e908eba44038e1b98cbb8d275bde0c08df09
 DIST mate-power-manager-1.18.1.tar.xz 3210144 BLAKE2B 7ab427acefd02b4aeea6fa2dd3052e2eaa9de3231ed9f8aa7b81af3a46fbf15da20925b568364ff802598738a7c3387d1b1fa620bef3ff2fd5522bb6247c2f3c SHA512 f4b42f66607e54020901f1f686cb018962c419294e50e0b37724bfddb462cf98a2e74e7ed980c3fe968873ca3848ff401839b39f53f1b40876773bfbf91b51c1
-EBUILD mate-power-manager-1.12.1-r2.ebuild 2154 BLAKE2B 35bf0d617970cdc338070dc97f2fb13718be8e5084d4120a1a3c6852f435509b57195a1e4023768e65443216f9d0ffa55a1b7e634ab58935fa933a13dcc6147b SHA512 9ad5a638cd4f1809c38fa032d0e20a3b5d5d74a1ba0834c3c5f6bcd69324ea0bbbc846959718e875875e6c49036d62db45b4b8f48a85e7b0d35e04f9e6754d6a
-EBUILD mate-power-manager-1.14.0.ebuild 2156 BLAKE2B 6351bee9ef052b7554d9ef5d8ed8dfde204472474fbe5fd9b270af2d821b6065eb4c79eece76ddb9532b1f22982ff084604365cec780203922b73792be0de68e SHA512 2c8d9693cc967a6850c2a193fee446f5024f6b1105e44c1d88f34a5b1fb317cbf2257664adb82dbb07662347ea56fd2b07f61131cbeffddfd263299dfd34eeb8
-EBUILD mate-power-manager-1.16.2.ebuild 2089 BLAKE2B 0aa85e73ef0c115afecc4af602b8bdc80644bd7da7386db83be4e6175ea928972cf6c816e3714b67f752753a2bebd0e8f93fe665b5868e75068b81402044b521 SHA512 bc4583158898b6e13559b793712b085eb84e53619734d778563244a98f031857cf1571626f5b6eb1415c2333455aa9c6ad82ed6bdd9dd020603e10764282af5d
 EBUILD mate-power-manager-1.18.1.ebuild 1601 BLAKE2B 283e8689669541458cb3a920f9f9b4aa6f9c4f35e0cc63fd2159b43adf1933569b4544d4c7ea6d3f3780cb6ee93c1894fff0708b5499c2be9c4e67bba525622e SHA512 153529596ca37d31b76b2afb4a143bd2ee4614771768ceb02b6a0ae5666efc01cbb09c284961b60e185b0ca25ae0a10a12ea70b76a229869394b821e3e52f793
-MISC metadata.xml 697 BLAKE2B 37cf4e4380833f76e09a7da9f8c6d3d4ddc73aa0d481e9211a2f81ac16ed3978f49fda5511fc5b2c40618c6f06f5a324710ef9e8e9ca0c986d0e4e8905b037ca SHA512 bb4229159bc69879bf967fc082846e75e905ad7fcc772e70de1f3f2cd58117089d7d339903ea44adee01966b1aa04db8192c67b0021196a5fd56f78610a51399
+MISC metadata.xml 578 BLAKE2B 2417d0111c1c380d002b7a569509f58fc365d831e0b0bbcee60742f54208cf4f8d38600e7594efd110b8e5c9528f67e979fd59f4e952bb6728c9a7a6ab685d46 SHA512 fcd2da4970ae106cd4b1157c664196edc50516886815617d16d171b4e269200a0a62d4f968a6755dc8502ac5c289afa19707a3eb5bcaf46bb7730436ca0c8b2d
diff --git a/mate-extra/mate-power-manager/mate-power-manager-1.12.1-r2.ebuild b/mate-extra/mate-power-manager/mate-power-manager-1.12.1-r2.ebuild
deleted file mode 100644
index 0336f85cae5f..000000000000
--- a/mate-extra/mate-power-manager/mate-power-manager-1.12.1-r2.ebuild
+++ /dev/null
@@ -1,88 +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="A session daemon for MATE that makes it easy to manage your laptop or desktop"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="+applet gnome-keyring gtk3 man pm-utils policykit test"
-
-# Interactive testsuite.
-RESTRICT="test"
-
-COMMON_DEPEND="app-text/rarian:0
-	>=dev-libs/dbus-glib-0.70:0
-	>=dev-libs/glib-2.36:2
-	>=mate-base/mate-desktop-1.9[gtk3(-)=]
-	>=sys-apps/dbus-1:0
-	>=x11-apps/xrandr-1.3:0
-	>=x11-libs/cairo-1:0
-	>=x11-libs/gdk-pixbuf-2.11:2
-	x11-libs/libX11:0
-	x11-libs/libXext:0
-	x11-libs/libXrandr:0
-	>=x11-libs/libnotify-0.7:0
-	x11-libs/pango:0
-	applet? ( >=mate-base/mate-panel-1.6[gtk3(-)=] )
-	gnome-keyring? ( >=gnome-base/libgnome-keyring-3:0 )
-	!gtk3? (
-		>=dev-libs/libunique-1:1
-		>=media-libs/libcanberra-0.10:0[gtk]
-		>=x11-libs/gtk+-2.24:2
-	)
-	gtk3? (
-		>=dev-libs/libunique-3:3
-		>=media-libs/libcanberra-0.10:0[gtk3]
-		>=x11-libs/gtk+-3.0:3
-	)
-	pm-utils? ( >=sys-power/upower-pm-utils-0.9.23 )
-	!pm-utils? ( >=sys-power/upower-0.9.23:= )"
-
-RDEPEND="${COMMON_DEPEND}
-	policykit? ( >=mate-extra/mate-polkit-1.6 )"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.3
-	>=app-text/scrollkeeper-dtd-1:1.0
-	app-text/yelp-tools:0
-	>=dev-util/intltool-0.50.1:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*
-	x11-base/xorg-proto
-	man? ( app-text/docbook-sgml-utils:0
-		>=app-text/docbook-sgml-dtd-4.3 )"
-
-src_prepare() {
-	mate_src_prepare
-
-	# This needs to be after eautoreconf to prevent problems like bug #356277
-	# Remove the docbook2man rules here since it's not handled by a proper
-	# parameter in configure.in.
-	if ! use man; then
-		sed -e 's:@HAVE_DOCBOOK2MAN_TRUE@.*::' -i man/Makefile.in \
-			|| die "docbook sed failed"
-	fi
-}
-
-src_configure() {
-	mate_src_configure \
-		--enable-compile-warnings=minimum \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_with gnome-keyring keyring) \
-		$(use_enable applet applets) \
-		$(use_enable test tests)
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-
-	dbus-launch Xemake check || die "Test phase failed"
-}
diff --git a/mate-extra/mate-power-manager/mate-power-manager-1.14.0.ebuild b/mate-extra/mate-power-manager/mate-power-manager-1.14.0.ebuild
deleted file mode 100644
index 30909a7a26c2..000000000000
--- a/mate-extra/mate-power-manager/mate-power-manager-1.14.0.ebuild
+++ /dev/null
@@ -1,88 +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="A session daemon for MATE that makes it easy to manage your laptop or desktop"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="+applet gnome-keyring gtk3 man pm-utils policykit test"
-
-# Interactive testsuite.
-RESTRICT="test"
-
-COMMON_DEPEND=">=dev-libs/dbus-glib-0.70:0
-	>=dev-libs/glib-2.36:2
-	>=mate-base/mate-desktop-1.9[gtk3(-)=]
-	>=sys-apps/dbus-1:0
-	>=x11-apps/xrandr-1.3:0
-	>=x11-libs/cairo-1:0
-	>=x11-libs/gdk-pixbuf-2.11:2
-	x11-libs/libX11:0
-	x11-libs/libXext:0
-	x11-libs/libXrandr:0
-	>=x11-libs/libnotify-0.7:0
-	x11-libs/pango:0
-	applet? ( >=mate-base/mate-panel-1.6[gtk3(-)=] )
-	gnome-keyring? ( >=gnome-base/libgnome-keyring-3:0 )
-	!gtk3? (
-		>=dev-libs/libunique-1:1
-		>=media-libs/libcanberra-0.10:0[gtk]
-		>=x11-libs/gtk+-2.24:2
-	)
-	gtk3? (
-		>=dev-libs/libunique-3:3
-		>=media-libs/libcanberra-0.10:0[gtk3]
-		>=x11-libs/gtk+-3.0:3
-	)
-	pm-utils? ( >=sys-power/upower-pm-utils-0.9.23 )
-	!pm-utils? ( >=sys-power/upower-0.9.23:= )"
-
-RDEPEND="${COMMON_DEPEND}
-	policykit? ( >=mate-extra/mate-polkit-1.6 )"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.3
-	app-text/rarian:0
-	>=app-text/scrollkeeper-dtd-1:1.0
-	app-text/yelp-tools:0
-	>=dev-util/intltool-0.50.1:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*
-	x11-base/xorg-proto
-	man? ( app-text/docbook-sgml-utils:0
-		>=app-text/docbook-sgml-dtd-4.3 )"
-
-src_prepare() {
-	mate_src_prepare
-
-	# This needs to be after eautoreconf to prevent problems like bug #356277
-	# Remove the docbook2man rules here since it's not handled by a proper
-	# parameter in configure.in.
-	if ! use man; then
-		sed -e 's:@HAVE_DOCBOOK2MAN_TRUE@.*::' -i man/Makefile.in \
-			|| die "docbook sed failed"
-	fi
-}
-
-src_configure() {
-	mate_src_configure \
-		--enable-compile-warnings=minimum \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_with gnome-keyring keyring) \
-		$(use_enable applet applets) \
-		$(use_enable test tests)
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-
-	dbus-launch Xemake check || die "Test phase failed"
-}
diff --git a/mate-extra/mate-power-manager/mate-power-manager-1.16.2.ebuild b/mate-extra/mate-power-manager/mate-power-manager-1.16.2.ebuild
deleted file mode 100644
index 3b51b775714a..000000000000
--- a/mate-extra/mate-power-manager/mate-power-manager-1.16.2.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="A session daemon for MATE that makes it easy to manage your laptop or desktop"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="+applet gnome-keyring gtk3 man pm-utils policykit test"
-
-# Interactive testsuite.
-RESTRICT="test"
-
-COMMON_DEPEND=">=dev-libs/dbus-glib-0.70:0
-	>=dev-libs/glib-2.36:2
-	>=sys-apps/dbus-1:0
-	>=x11-apps/xrandr-1.3:0
-	>=x11-libs/cairo-1:0
-	>=x11-libs/gdk-pixbuf-2.11:2
-	x11-libs/libX11:0
-	x11-libs/libXext:0
-	x11-libs/libXrandr:0
-	>=x11-libs/libnotify-0.7:0
-	x11-libs/pango:0
-	applet? ( >=mate-base/mate-panel-1.6[gtk3(-)=] )
-	gnome-keyring? ( >=gnome-base/libgnome-keyring-3:0 )
-	!gtk3? (
-		>=dev-libs/libunique-1:1
-		>=media-libs/libcanberra-0.10:0[gtk]
-		>=x11-libs/gtk+-2.24:2
-	)
-	gtk3? (
-		>=media-libs/libcanberra-0.10:0[gtk3]
-		>=x11-libs/gtk+-3.0:3
-	)
-	pm-utils? ( >=sys-power/upower-pm-utils-0.9.23 )
-	!pm-utils? ( >=sys-power/upower-0.9.23:= )"
-
-RDEPEND="${COMMON_DEPEND}
-	policykit? ( >=mate-extra/mate-polkit-1.6 )"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.3
-	app-text/rarian:0
-	>=app-text/scrollkeeper-dtd-1:1.0
-	app-text/yelp-tools:0
-	>=dev-util/intltool-0.50.1:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*
-	x11-base/xorg-proto
-	man? ( app-text/docbook-sgml-utils:0
-		>=app-text/docbook-sgml-dtd-4.3 )"
-
-src_prepare() {
-	mate_src_prepare
-
-	# This needs to be after eautoreconf to prevent problems like bug #356277
-	# Remove the docbook2man rules here since it's not handled by a proper
-	# parameter in configure.in.
-	if ! use man; then
-		sed -e 's:@HAVE_DOCBOOK2MAN_TRUE@.*::' -i man/Makefile.in \
-			|| die "docbook sed failed"
-	fi
-}
-
-src_configure() {
-	mate_src_configure \
-		--enable-compile-warnings=minimum \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_with gnome-keyring keyring) \
-		$(use_enable applet applets) \
-		$(use_enable test tests)
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-
-	dbus-launch Xemake check || die "Test phase failed"
-}
diff --git a/mate-extra/mate-power-manager/metadata.xml b/mate-extra/mate-power-manager/metadata.xml
index aca679d561df..422a1960ab85 100644
--- a/mate-extra/mate-power-manager/metadata.xml
+++ b/mate-extra/mate-power-manager/metadata.xml
@@ -7,8 +7,6 @@
 	</maintainer>
 	<use>
 		<flag name="applet">Enable building of the MATE applet.</flag>
-		<flag name="gtk3">Build with GTK+3 instead of GTK+2</flag>
-		<flag name="man">Build power manager's man page.</flag>
 		<flag name="pm-utils">Adds support for suspend/resume using
 			<pkg>sys-power/upower-pm-utils</pkg> instead of
 			<pkg>sys-power/upower</pkg></flag>
diff --git a/mate-extra/mate-screensaver/Manifest b/mate-extra/mate-screensaver/Manifest
index 2f48ae32c817..264d886839d1 100644
--- a/mate-extra/mate-screensaver/Manifest
+++ b/mate-extra/mate-screensaver/Manifest
@@ -1,10 +1,4 @@
 AUX xss-conversion.txt 1026 BLAKE2B 4675ecb7d7ce45b28183ff503739b5d3853e8a68adfb8e4bf92274944c034d4f043c8854cc54a801ad72160bf452c645dfc5a0d35a71b967c9094f2a8464e59a SHA512 149d28bf7ff9dffe75f0a59408d91eff6537ec27a9457bf2419efe78e9b39a11796b341176e6ba4b1a183cc3ead080abe0ba85f51a3d57b0ff54dae8a3ec312a
-DIST mate-screensaver-1.12.0.tar.xz 4868924 BLAKE2B b523e18eed64c7f4521e6ac5fb656479fc9ac15652ca6bb5a832b66944a52ac429bb9dcc73a6ac50fda49fc2ba22beda0ad3e58a7b5e44d96282066ab7d1a151 SHA512 01bdef496560eb8e9118b0ff66863568aaa6df872e7947d0a92fe9fcb1d305618b28928ea95c65a3367e3e4e79e9bdab7a8266287c8e3db2a5210b955d412c8d
-DIST mate-screensaver-1.14.1.tar.xz 4912772 BLAKE2B b317bd9e40d423fc16ec53966a5ca813dd07f250bee171dbbd351bfa14d33f4b28a2c98e71311903eea607c7059c75c12d38b09d91c55a13052bbe5026b46eec SHA512 28b5834450da9d7d2fd3a77504f244e69212e751435bd41a957f30a5231db312dba37ee39442c63a40098bb3d1e1fade81ea423f9d59b29fc5d1201522d1d8f8
-DIST mate-screensaver-1.16.1.tar.xz 4916316 BLAKE2B 0918082568752c52f8e03f52c8423f6d053327868eebca77615e22fcb5bab1225f0cbccdad2f66ec01325ba3b67fa67db617509855a27618be71e8cd9f76d60c SHA512 ac481226ccec9a2785321ecc18ef3ed7ec188ba3fcb6e31515bca97b86b68955b1b1e08d4f72dbb683552877240e2f294b48af6bdea36f23d39a0853e1620085
 DIST mate-screensaver-1.18.2.tar.xz 4926748 BLAKE2B 7790a579991886617accd3f38146b624c81145c588fbc93fe78b0015669ca53e493aca0689e157fc0c11b86248bbc3d00b479ad8c4c1c01288e853c1ef3dd40c SHA512 b8ec5705f1810ecb1b887d1c9ad2a5eca2a39f7a093154d45c8cfdbcef664520b09be0ed4ab5992b001a4445e71e4eefd4e28d83e22c7536788c9d32f703283e
-EBUILD mate-screensaver-1.12.0-r1.ebuild 3080 BLAKE2B eaa79327da7d0696a8a8b5386ba3ec7275331d40f53818272d10e3c72f3f131007e9d5992613f111537320bc7d03d30771277b68748d3afdb771fef96d71bfec SHA512 365e3055e344971d0ffff2a1df404c68e10cfeb9aa7faf1ee62a6e4d259690d50de88d01d83a85384a56a15fc91a78ded3a5599884fda4603e98a1c45bf69da2
-EBUILD mate-screensaver-1.14.1.ebuild 3122 BLAKE2B 6db2403634b30bd9ebcbc74d1b9a95a39f16263b9a74b1664edde9bf832bfb2bd7273d1616dc76836e7ad7b1ce9e55a03614c39c77fc1532f20f7b308578bb8a SHA512 c4a5617cbafc141883ca7885fa75b1aac9d57cf886ce8b297602a6a9d88093adb20f6b45e58992944593362f0c5cf804e44968c43db4e71731fbf8de69526c94
-EBUILD mate-screensaver-1.16.1.ebuild 3122 BLAKE2B 6db2403634b30bd9ebcbc74d1b9a95a39f16263b9a74b1664edde9bf832bfb2bd7273d1616dc76836e7ad7b1ce9e55a03614c39c77fc1532f20f7b308578bb8a SHA512 c4a5617cbafc141883ca7885fa75b1aac9d57cf886ce8b297602a6a9d88093adb20f6b45e58992944593362f0c5cf804e44968c43db4e71731fbf8de69526c94
 EBUILD mate-screensaver-1.18.2.ebuild 3027 BLAKE2B 4fcaa0fc8c5ba82d31fcb8594b46033964ce8aeb71aedbc5f2876bb61bbc7a1681006e3752145d6b072ea5e5f8aeba59e89e8fa7ca52a89ec1411713d0a3754e SHA512 7aff1f0f02fa1a3095405716d53bea7d380bd9acb931bc7bff5dc9775aea9aa7684742f95a4626a506c3731c655a1ce75ef8074c530979ae8d05bfca56ef2e3f
-MISC metadata.xml 508 BLAKE2B 0e4b0470e1a7c5259930d95e36a39314b708d0f9ae46e761fbbc03b6d4594e792f8f894f92787474097bdf012f561ae4952116189b2cf6d1ac982b72eb7d5527 SHA512 03f079381cf35a7c0d33ec93f9aba9e8924dd010e1d67ea64508d1fca59fe56685ccc06b2a721006c1144e16a217b32156b67205c9ee8e8d39410406612cc3e2
+MISC metadata.xml 447 BLAKE2B febc277d7b427ae9a48c3c6e318b779f8a3fb9e27f896b17a3ebafec9bc8b03c4af3f30de7881fcc7feff674fdc0106d0b46f91d72d7267d4c4eeffb1dbe341a SHA512 29d7b99ddd69b2503d91f185679e1811403ba34443e20e2b17782878ee509565dcd62c2e3339709b3d29f568168c9c5c5a9284823d0187392220e781792b73e8
diff --git a/mate-extra/mate-screensaver/mate-screensaver-1.12.0-r1.ebuild b/mate-extra/mate-screensaver/mate-screensaver-1.12.0-r1.ebuild
deleted file mode 100644
index d9b6e3f486be..000000000000
--- a/mate-extra/mate-screensaver/mate-screensaver-1.12.0-r1.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate multilib readme.gentoo-r1
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm x86"
-fi
-
-DESCRIPTION="Replaces xscreensaver, integrating with the MATE desktop"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="X debug consolekit gtk3 kernel_linux libnotify opengl pam systemd"
-
-DOC_CONTENTS="
-	Information for converting screensavers is located in
-	/usr/share/doc/${PF}/xss-conversion.txt*
-"
-
-RDEPEND="
-	>=dev-libs/dbus-glib-0.71:0
-	>=dev-libs/glib-2.36:2
-	gnome-base/dconf:0
-	>=mate-base/libmatekbd-1.7.1[gtk3(-)=]
-	>=mate-base/mate-desktop-1.9.4[gtk3(-)=]
-	>=mate-base/mate-menus-1.6
-	>=mate-base/mate-session-manager-1.6
-	>=sys-apps/dbus-0.30:0
-	>=x11-libs/gdk-pixbuf-2.14:2
-	>=x11-libs/libX11-1:0
-	x11-libs/cairo:0
-	x11-libs/libXext:0
-	x11-libs/libXrandr:0
-	x11-libs/libXScrnSaver:0
-	x11-libs/libXxf86misc:0
-	x11-libs/libXxf86vm:0
-	x11-libs/libxklavier:0
-	x11-libs/pango:0
-	virtual/libintl:0
-	consolekit? ( sys-auth/consolekit:0 )
-	!gtk3? ( >=x11-libs/gtk+-2.24:2 )
-	gtk3? ( >=x11-libs/gtk+-3.0:3 )
-	libnotify? ( >=x11-libs/libnotify-0.7:0 )
-	opengl? ( virtual/opengl:0 )
-	pam? ( gnome-base/gnome-keyring:0 virtual/pam:0 )
-	!pam? ( kernel_linux? ( sys-apps/shadow:0 ) )
-	systemd? ( sys-apps/systemd:0= )
-	!!<gnome-extra/gnome-screensaver-3:0"
-
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.50.1:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*
-	x11-base/xorg-proto"
-
-src_configure() {
-	mate_src_configure \
-		--enable-locking \
-		--with-kbd-layout-indicator \
-		--with-xf86gamma-ext \
-		--with-xscreensaverdir=/usr/share/xscreensaver/config \
-		--with-xscreensaverhackdir=/usr/$(get_libdir)/misc/xscreensaver \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_with X x) \
-		$(use_with consolekit console-kit) \
-		$(use_with libnotify) \
-		$(use_with opengl libgl) \
-		$(use_with systemd) \
-		$(use_enable debug) \
-		$(use_enable pam)
-}
-
-src_install() {
-	mate_src_install
-
-	# Install the conversion script in the documentation.
-	dodoc "${S}"/data/migrate-xscreensaver-config.sh
-	dodoc "${S}"/data/xscreensaver-config.xsl
-	dodoc "${FILESDIR}"/xss-conversion.txt
-
-	# Non PAM users will need this suid to read the password hashes.
-	# OpenPAM users will probably need this too when
-	# https://bugzilla.gnome.org/show_bug.cgi?id=370847
-	# is fixed.
-	if ! use pam ; then
-		fperms u+s /usr/libexec/mate-screensaver-dialog
-	fi
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	mate_pkg_postinst
-
-	if has_version "<x11-base/xorg-server-1.5.3-r4" ; then
-		ewarn "You have a too old xorg-server installation. This will cause"
-		ewarn "mate-screensaver to eat up your CPU. Please consider upgrading."
-		echo
-	fi
-
-	if has_version "<x11-misc/xscreensaver-4.22-r2" ; then
-		ewarn "You have xscreensaver installed, you probably want to disable it."
-		ewarn "To prevent a duplicate screensaver entry in the menu, you need to"
-		ewarn "build xscreensaver with -gnome in the USE flags."
-		ewarn "echo \"x11-misc/xscreensaver -gnome\" >> /etc/portage/package.use"
-		echo
-	fi
-
-	readme.gentoo_print_elog
-}
diff --git a/mate-extra/mate-screensaver/mate-screensaver-1.14.1.ebuild b/mate-extra/mate-screensaver/mate-screensaver-1.14.1.ebuild
deleted file mode 100644
index a2f6cdf98a7a..000000000000
--- a/mate-extra/mate-screensaver/mate-screensaver-1.14.1.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate multilib readme.gentoo-r1
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="Replaces xscreensaver, integrating with the MATE desktop"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="X debug consolekit gtk3 kernel_linux libnotify opengl pam systemd"
-
-DOC_CONTENTS="
-	Information for converting screensavers is located in
-	/usr/share/doc/${PF}/xss-conversion.txt*
-"
-
-COMMON_DEPEND="
-	>=dev-libs/dbus-glib-0.71:0
-	>=dev-libs/glib-2.36:2
-	gnome-base/dconf:0
-	>=mate-base/libmatekbd-1.7.1[gtk3(-)=]
-	>=mate-base/mate-desktop-1.9.4[gtk3(-)=]
-	>=mate-base/mate-menus-1.6
-	>=sys-apps/dbus-0.30:0
-	>=x11-libs/gdk-pixbuf-2.14:2
-	>=x11-libs/libX11-1:0
-	x11-libs/cairo:0
-	x11-libs/libXext:0
-	x11-libs/libXrandr:0
-	x11-libs/libXScrnSaver:0
-	x11-libs/libXxf86misc:0
-	x11-libs/libXxf86vm:0
-	x11-libs/libxklavier:0
-	x11-libs/pango:0
-	virtual/libintl:0
-	consolekit? ( sys-auth/consolekit:0 )
-	!gtk3? ( >=x11-libs/gtk+-2.24:2 )
-	gtk3? ( >=x11-libs/gtk+-3.0:3 )
-	libnotify? ( >=x11-libs/libnotify-0.7:0 )
-	opengl? ( virtual/opengl:0 )
-	pam? ( gnome-base/gnome-keyring:0 virtual/pam:0 )
-	!pam? ( kernel_linux? ( sys-apps/shadow:0 ) )
-	systemd? ( sys-apps/systemd:0= )
-	!!<gnome-extra/gnome-screensaver-3:0"
-
-RDEPEND="${COMMON_DEPEND}
-	>=mate-base/mate-session-manager-1.6"
-
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.50.1:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*
-	x11-base/xorg-proto"
-
-src_configure() {
-	mate_src_configure \
-		--enable-locking \
-		--with-kbd-layout-indicator \
-		--with-xf86gamma-ext \
-		--with-xscreensaverdir=/usr/share/xscreensaver/config \
-		--with-xscreensaverhackdir=/usr/$(get_libdir)/misc/xscreensaver \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_with X x) \
-		$(use_with consolekit console-kit) \
-		$(use_with libnotify) \
-		$(use_with opengl libgl) \
-		$(use_with systemd) \
-		$(use_enable debug) \
-		$(use_enable pam)
-}
-
-src_install() {
-	mate_src_install
-
-	# Install the conversion script in the documentation.
-	dodoc "${S}"/data/migrate-xscreensaver-config.sh
-	dodoc "${S}"/data/xscreensaver-config.xsl
-	dodoc "${FILESDIR}"/xss-conversion.txt
-
-	# Non PAM users will need this suid to read the password hashes.
-	# OpenPAM users will probably need this too when
-	# https://bugzilla.gnome.org/show_bug.cgi?id=370847
-	# is fixed.
-	if ! use pam ; then
-		fperms u+s /usr/libexec/mate-screensaver-dialog
-	fi
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	mate_pkg_postinst
-
-	if has_version "<x11-base/xorg-server-1.5.3-r4" ; then
-		ewarn "You have a too old xorg-server installation. This will cause"
-		ewarn "mate-screensaver to eat up your CPU. Please consider upgrading."
-		echo
-	fi
-
-	if has_version "<x11-misc/xscreensaver-4.22-r2" ; then
-		ewarn "You have xscreensaver installed, you probably want to disable it."
-		ewarn "To prevent a duplicate screensaver entry in the menu, you need to"
-		ewarn "build xscreensaver with -gnome in the USE flags."
-		ewarn "echo \"x11-misc/xscreensaver -gnome\" >> /etc/portage/package.use"
-		echo
-	fi
-
-	readme.gentoo_print_elog
-}
diff --git a/mate-extra/mate-screensaver/mate-screensaver-1.16.1.ebuild b/mate-extra/mate-screensaver/mate-screensaver-1.16.1.ebuild
deleted file mode 100644
index a2f6cdf98a7a..000000000000
--- a/mate-extra/mate-screensaver/mate-screensaver-1.16.1.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate multilib readme.gentoo-r1
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="Replaces xscreensaver, integrating with the MATE desktop"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="X debug consolekit gtk3 kernel_linux libnotify opengl pam systemd"
-
-DOC_CONTENTS="
-	Information for converting screensavers is located in
-	/usr/share/doc/${PF}/xss-conversion.txt*
-"
-
-COMMON_DEPEND="
-	>=dev-libs/dbus-glib-0.71:0
-	>=dev-libs/glib-2.36:2
-	gnome-base/dconf:0
-	>=mate-base/libmatekbd-1.7.1[gtk3(-)=]
-	>=mate-base/mate-desktop-1.9.4[gtk3(-)=]
-	>=mate-base/mate-menus-1.6
-	>=sys-apps/dbus-0.30:0
-	>=x11-libs/gdk-pixbuf-2.14:2
-	>=x11-libs/libX11-1:0
-	x11-libs/cairo:0
-	x11-libs/libXext:0
-	x11-libs/libXrandr:0
-	x11-libs/libXScrnSaver:0
-	x11-libs/libXxf86misc:0
-	x11-libs/libXxf86vm:0
-	x11-libs/libxklavier:0
-	x11-libs/pango:0
-	virtual/libintl:0
-	consolekit? ( sys-auth/consolekit:0 )
-	!gtk3? ( >=x11-libs/gtk+-2.24:2 )
-	gtk3? ( >=x11-libs/gtk+-3.0:3 )
-	libnotify? ( >=x11-libs/libnotify-0.7:0 )
-	opengl? ( virtual/opengl:0 )
-	pam? ( gnome-base/gnome-keyring:0 virtual/pam:0 )
-	!pam? ( kernel_linux? ( sys-apps/shadow:0 ) )
-	systemd? ( sys-apps/systemd:0= )
-	!!<gnome-extra/gnome-screensaver-3:0"
-
-RDEPEND="${COMMON_DEPEND}
-	>=mate-base/mate-session-manager-1.6"
-
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.50.1:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*
-	x11-base/xorg-proto"
-
-src_configure() {
-	mate_src_configure \
-		--enable-locking \
-		--with-kbd-layout-indicator \
-		--with-xf86gamma-ext \
-		--with-xscreensaverdir=/usr/share/xscreensaver/config \
-		--with-xscreensaverhackdir=/usr/$(get_libdir)/misc/xscreensaver \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_with X x) \
-		$(use_with consolekit console-kit) \
-		$(use_with libnotify) \
-		$(use_with opengl libgl) \
-		$(use_with systemd) \
-		$(use_enable debug) \
-		$(use_enable pam)
-}
-
-src_install() {
-	mate_src_install
-
-	# Install the conversion script in the documentation.
-	dodoc "${S}"/data/migrate-xscreensaver-config.sh
-	dodoc "${S}"/data/xscreensaver-config.xsl
-	dodoc "${FILESDIR}"/xss-conversion.txt
-
-	# Non PAM users will need this suid to read the password hashes.
-	# OpenPAM users will probably need this too when
-	# https://bugzilla.gnome.org/show_bug.cgi?id=370847
-	# is fixed.
-	if ! use pam ; then
-		fperms u+s /usr/libexec/mate-screensaver-dialog
-	fi
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	mate_pkg_postinst
-
-	if has_version "<x11-base/xorg-server-1.5.3-r4" ; then
-		ewarn "You have a too old xorg-server installation. This will cause"
-		ewarn "mate-screensaver to eat up your CPU. Please consider upgrading."
-		echo
-	fi
-
-	if has_version "<x11-misc/xscreensaver-4.22-r2" ; then
-		ewarn "You have xscreensaver installed, you probably want to disable it."
-		ewarn "To prevent a duplicate screensaver entry in the menu, you need to"
-		ewarn "build xscreensaver with -gnome in the USE flags."
-		ewarn "echo \"x11-misc/xscreensaver -gnome\" >> /etc/portage/package.use"
-		echo
-	fi
-
-	readme.gentoo_print_elog
-}
diff --git a/mate-extra/mate-screensaver/metadata.xml b/mate-extra/mate-screensaver/metadata.xml
index a0d6c3ac7d57..4be378966bcd 100644
--- a/mate-extra/mate-screensaver/metadata.xml
+++ b/mate-extra/mate-screensaver/metadata.xml
@@ -8,7 +8,6 @@
 	<use>
 		<flag name="consolekit">Enable support for 
 			<pkg>sys-auth/consolekit</pkg></flag>
-		<flag name="gtk3">Build with GTK+3 instead of GTK+2</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">mate-desktop/mate-screensaver</remote-id>
diff --git a/mate-extra/mate-sensors-applet/Manifest b/mate-extra/mate-sensors-applet/Manifest
index 32deb9e632ba..575e19625092 100644
--- a/mate-extra/mate-sensors-applet/Manifest
+++ b/mate-extra/mate-sensors-applet/Manifest
@@ -1,9 +1,3 @@
-DIST mate-sensors-applet-1.12.1.tar.xz 369492 BLAKE2B cdc0bc46639e5234c9ed37cbd62b9439e1dbf1da9d2b377c57502d370e1f6e19a87e307c00a9bfbcde32812fde2804d3c248805f55dcb29b70d10cd38ca08210 SHA512 2e96708e4e27d545b0ad010dbd04139c5d340be1138236ba1197c2cf16486005905264e381f8dde75ea6c23c29bd1a0dd03afb5726340cad718d06914d4dd994
-DIST mate-sensors-applet-1.14.0.tar.xz 389960 BLAKE2B e220374ac5e56fb0e5fc86c036dd49f509def048421903597d82df8a14ed8877586282880419d168d1319fc05d890f6ffd61cdc49622d53f9dc5d4d51e82332a SHA512 8d1afdb491e3a4a72dbee098ff3383a9562ab47da81d68807cb1fe72ee9f2ccad31cbe355268d7641fc213dcabf8a4527f03e04c4d8a166584730e934f006f5f
-DIST mate-sensors-applet-1.16.1.tar.xz 393360 BLAKE2B 01afa10059a94bcedb0af497203f481dba2fcbf9b9633b3c69ecd1d28ac8894159abc8e26ef61de7ffcfa62d51d7d651adf73f53850b4fe7446aa8b56dadfbd2 SHA512 35ea60f7f63b636dc8d8f6fa6f9a8fac516cea6e3005eaaf715f3f5bc3d03f1d04f24fe9f5bbba3edea41498efaa78fdec085f63d1940bc1265e0b1d70da62cc
 DIST mate-sensors-applet-1.18.3.tar.xz 385728 BLAKE2B 42a38121db367788af906aec08261512b8aa96ad3782c1aca0d29b8371a598855ee0d7a3c63306929d45e4d58fb01e117efd91b4bd6b104c49790ff8e73c292f SHA512 39e23839eebe460a99d002d6f897d3053a6940cb33a24c923790e976b72be7a260cd06be326abbb3917b85b6b6fa779cc5f1c06dbf9c19c45ec3f1bf6a93a96e
-EBUILD mate-sensors-applet-1.12.1.ebuild 1508 BLAKE2B e68ffc6abfd064d9e7a9ead780b581a07085344b317eb0e7c1bdd42218f876392a3ad28e37b56155c9eb30aab83b9a7396912dac7557564cf97780fe551bb05b SHA512 4e5ad947d984975d3915a46150ab450fb932dbb69a92a26170c73f876d6f8d55b3e257f1adfef4c9c53e7699ada8d3e4d8336cc220d7ed970554550991c31287
-EBUILD mate-sensors-applet-1.14.0.ebuild 1550 BLAKE2B 273d425daeffebc84c5780c5c829eb2b429849f6e7eb33ecdd7a2bad3a4a312923df2b1383d0d961bdd12d9084acc091fa91b2932fba16018e62e10deb0f0a72 SHA512 2f216c9e421e42899eb6f7b8646fb56352d9b6589decdcaf8453277b76ad074877871112888d60f97c4fb589a5d5568924207693d235fa07e3253fec66686dc7
-EBUILD mate-sensors-applet-1.16.1.ebuild 1550 BLAKE2B d4d58b9c33f4a609150fb9badaacd8a78e0b1da5b8f6f45f0057137bc4435fa8a49f8c8ec1d505f85b63b6fedfa18bbcd0b0c80f353183acf64e9979a2c0dac7 SHA512 dd0e5257ba32bff392dee3b50c00ba3c49c756d378eeefc7bc1959bddb319013510e47a04d2cf749e0d22c95b661dd3c9744def4ab9df4d579fb67b61e2fb82e
 EBUILD mate-sensors-applet-1.18.3.ebuild 1456 BLAKE2B 82b54b5512e38a9eeea46218b48e84a75b667a7aed23e3babdd3a2e2cdcdcdcbbdf006833ffc7cd14f0ebba84e69882514990f3b4bd65dc9a7fc8166a025fbd6 SHA512 4083091cb8a0b79dc80a9ade6f16c4ca2c6810c04c1b460da42dfdc5aa543b9d4393047f1571b992685e4ff212be52984f25cec251b99c1bc45f5f53214b2ff6
-MISC metadata.xml 424 BLAKE2B 4f531e8f367a68662eb43f995f304b74661ccd2dc00870128252e8cda1a21b5c9b659b2ab32e6a0cc4066243dd724c7ce2b853dbf07234b27aa0a776a4d539ef SHA512 1bcb907fe8786f507b01dcc94309761ed2dba978ee0176d482c461c610b8b2e9876e29be1d0a3b36962ab9a7edd7e505c50851aafdb22e2bdc3588afb4aeaccb
+MISC metadata.xml 348 BLAKE2B 3e34850491c3dce6bfe3771ed94ea37e68d9c8131594f4056c40e754f5556a4dbf03e434a0f3d19eaa6177a0a484a1b50b8de1c67a4eadf1faf6e5b56fa70166 SHA512 32cad99749c326ae12caa346b0bbf85779cbf9f35b85c4f729358dd7171d468f486c761e33d2938fcac445485ec256d733150d7dedc7c9e6b271702ba7c454ab
diff --git a/mate-extra/mate-sensors-applet/mate-sensors-applet-1.12.1.ebuild b/mate-extra/mate-sensors-applet/mate-sensors-applet-1.12.1.ebuild
deleted file mode 100644
index 186a36d76bf3..000000000000
--- a/mate-extra/mate-sensors-applet/mate-sensors-applet-1.12.1.ebuild
+++ /dev/null
@@ -1,66 +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="MATE panel applet to display readings from hardware sensors"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="+dbus gtk3 hddtemp libnotify lm_sensors video_cards_nvidia"
-
-RDEPEND="app-text/rarian:0
-	>=dev-libs/glib-2.36:2
-	>=mate-base/mate-panel-1.6[gtk3(-)=]
-	>=x11-libs/cairo-1.0.4:0
-	x11-libs/gdk-pixbuf:2
-	virtual/libintl:0
-	!gtk3? ( >=x11-libs/gtk+-2.24:2 )
-	gtk3? ( >=x11-libs/gtk+-3.0:3 )
-	hddtemp? (
-		dbus? (
-			>=dev-libs/dbus-glib-0.80:0
-			>=dev-libs/libatasmart-0.16:0 )
-		!dbus? ( >=app-admin/hddtemp-0.3_beta13:0 ) )
-	libnotify? ( >=x11-libs/libnotify-0.7:0 )
-	lm_sensors? ( sys-apps/lm_sensors:0 )
-	video_cards_nvidia? ( || (
-		>=x11-drivers/nvidia-drivers-100.14.09:0[static-libs,tools]
-		media-video/nvidia-settings:0
-	) )"
-
-DEPEND="${RDEPEND}
-	>=app-text/scrollkeeper-dtd-1:1.0
-	app-text/yelp-tools:0
-	>=dev-util/intltool-0.50.1:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-PDEPEND="hddtemp? ( dbus? ( sys-fs/udisks:0 ) )"
-
-src_configure() {
-	local udisks
-
-	if use hddtemp && use dbus; then
-		udisks="--enable-udisks"
-	else
-		udisks="--disable-udisks"
-	fi
-
-	mate_src_configure \
-		--disable-static \
-		--without-aticonfig \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_enable libnotify) \
-		$(use_with lm_sensors libsensors) \
-		$(use_with video_cards_nvidia nvidia) \
-		${udisks}
-}
diff --git a/mate-extra/mate-sensors-applet/mate-sensors-applet-1.14.0.ebuild b/mate-extra/mate-sensors-applet/mate-sensors-applet-1.14.0.ebuild
deleted file mode 100644
index 4e3e5391b775..000000000000
--- a/mate-extra/mate-sensors-applet/mate-sensors-applet-1.14.0.ebuild
+++ /dev/null
@@ -1,68 +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="MATE panel applet to display readings from hardware sensors"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="+dbus gtk3 hddtemp libnotify lm_sensors video_cards_nvidia"
-
-COMMON_DEPEND=">=dev-libs/glib-2.36:2
-	>=mate-base/mate-panel-1.6[gtk3(-)=]
-	>=x11-libs/cairo-1.0.4:0
-	x11-libs/gdk-pixbuf:2
-	virtual/libintl:0
-	!gtk3? ( >=x11-libs/gtk+-2.24:2 )
-	gtk3? ( >=x11-libs/gtk+-3.0:3 )
-	hddtemp? (
-		dbus? (
-			>=dev-libs/dbus-glib-0.80:0
-			>=dev-libs/libatasmart-0.16:0 )
-		!dbus? ( >=app-admin/hddtemp-0.3_beta13:0 ) )
-	libnotify? ( >=x11-libs/libnotify-0.7:0 )
-	lm_sensors? ( sys-apps/lm_sensors:0 )
-	video_cards_nvidia? ( || (
-		>=x11-drivers/nvidia-drivers-100.14.09:0[static-libs,tools]
-		media-video/nvidia-settings:0
-	) )"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/rarian:0
-	>=app-text/scrollkeeper-dtd-1:1.0
-	app-text/yelp-tools:0
-	>=dev-util/intltool-0.50.1:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-PDEPEND="hddtemp? ( dbus? ( sys-fs/udisks:0 ) )"
-
-src_configure() {
-	local udisks
-
-	if use hddtemp && use dbus; then
-		udisks="--enable-udisks"
-	else
-		udisks="--disable-udisks"
-	fi
-
-	mate_src_configure \
-		--disable-static \
-		--without-aticonfig \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_enable libnotify) \
-		$(use_with lm_sensors libsensors) \
-		$(use_with video_cards_nvidia nvidia) \
-		${udisks}
-}
diff --git a/mate-extra/mate-sensors-applet/mate-sensors-applet-1.16.1.ebuild b/mate-extra/mate-sensors-applet/mate-sensors-applet-1.16.1.ebuild
deleted file mode 100644
index caab01e9f30e..000000000000
--- a/mate-extra/mate-sensors-applet/mate-sensors-applet-1.16.1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="MATE panel applet to display readings from hardware sensors"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="+dbus gtk3 hddtemp libnotify lm_sensors video_cards_nvidia"
-
-COMMON_DEPEND=">=dev-libs/glib-2.36:2
-	>=mate-base/mate-panel-1.6[gtk3(-)=]
-	>=x11-libs/cairo-1.0.4:0
-	x11-libs/gdk-pixbuf:2
-	virtual/libintl:0
-	!gtk3? ( >=x11-libs/gtk+-2.24:2 )
-	gtk3? ( >=x11-libs/gtk+-3.0:3 )
-	hddtemp? (
-		dbus? (
-			>=dev-libs/dbus-glib-0.80:0
-			>=dev-libs/libatasmart-0.16:0 )
-		!dbus? ( >=app-admin/hddtemp-0.3_beta13:0 ) )
-	libnotify? ( >=x11-libs/libnotify-0.7:0 )
-	lm_sensors? ( sys-apps/lm_sensors:0 )
-	video_cards_nvidia? ( || (
-		>=x11-drivers/nvidia-drivers-100.14.09:0[static-libs,tools]
-		media-video/nvidia-settings:0
-	) )"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/rarian:0
-	>=app-text/scrollkeeper-dtd-1:1.0
-	app-text/yelp-tools:0
-	>=dev-util/intltool-0.50.1:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-PDEPEND="hddtemp? ( dbus? ( sys-fs/udisks:0 ) )"
-
-src_configure() {
-	local udisks
-
-	if use hddtemp && use dbus; then
-		udisks="--enable-udisks"
-	else
-		udisks="--disable-udisks"
-	fi
-
-	mate_src_configure \
-		--disable-static \
-		--without-aticonfig \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_enable libnotify) \
-		$(use_with lm_sensors libsensors) \
-		$(use_with video_cards_nvidia nvidia) \
-		${udisks}
-}
diff --git a/mate-extra/mate-sensors-applet/metadata.xml b/mate-extra/mate-sensors-applet/metadata.xml
index 5cc849549b93..c1da9f712590 100644
--- a/mate-extra/mate-sensors-applet/metadata.xml
+++ b/mate-extra/mate-sensors-applet/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-sensors-applet</remote-id>
 	</upstream>
diff --git a/mate-extra/mate-system-monitor/Manifest b/mate-extra/mate-system-monitor/Manifest
index 481975696162..bbfc9c18005b 100644
--- a/mate-extra/mate-system-monitor/Manifest
+++ b/mate-extra/mate-system-monitor/Manifest
@@ -1,9 +1,3 @@
-DIST mate-system-monitor-1.12.2.tar.xz 2114504 BLAKE2B ceec8177fa020cf739f132d9970a2f56029d12eb767853b3dce671d483fa661ade6d2190e68fdfc7250fd1cbf03ac5b9845a5337a27a75027ebe664ef756038b SHA512 f001d36b7a343cba68bf76094abad4e07cc89537c71dba873bb5ffc61045f440a319e3db8d5ee55ff301f52dbdad8b275ca71a4ab6c5fbe34d75c2e65edd7c23
-DIST mate-system-monitor-1.14.0.tar.xz 2135464 BLAKE2B e390fcfa7d41aaf2b407f0a4e22acf1c9f3eaccfb1a13d8137cc56964751126c94569cf16427409118f86a8125147f27e59a8db05b20349c7ab18065451fa31d SHA512 f19fa0241228be8ec8600db43e71495750039288292ba5714489a84acb3e5cc9f4c87d39a63d29a0fc6f907af6ecc319382cd4276ae2de1125bba059d5b24be5
-DIST mate-system-monitor-1.16.0.tar.xz 2120984 BLAKE2B 560a811774ffe8ee46876fb7618ff373dc810f0e6e068fef1265dba72c71b4ff808228be5b25c8f22d278e46be074b0a176d6722a3ce0dc3886311b35ed4ef11 SHA512 6ee8e1d1a3af5e3b295c2cca74b3e6bdf8a09eb6aa7d63f13db006829c2df25b580b72cc8d6e34e2844b243999cd4f059a42aa67a88c60825defdb7880150796
 DIST mate-system-monitor-1.18.1.tar.xz 2159100 BLAKE2B babac7ad0dc3a3bccf5c6d4567bee0c95aad1f5fffdb1d6d566316f4712a345e7083c8032c19b6615a9f9d06fbbe8b89357407b897206f3131294b7d2305b45d SHA512 47dd2ba46cd6fbd1beef2e6f0a93332c7142f701d18f6894b4986134c557f63f3e2bed382af17cc5bf45693b556a91ccab36fde940126fdceb5834d4cea08356
-EBUILD mate-system-monitor-1.12.2.ebuild 1015 BLAKE2B 80fa49e73cfca4eaf3e783e3b85966ca477ec832a672e6fdcb02a19d0958315b80669f83885b3f51e47fa1044a120e298d30fee1e4217536c5a136131b54cd8f SHA512 464b7afd1531b963101721317612005ac075f1d4e24ff05d21be93564e52944da949a494d71d3bb2726578ccee126892acd23ef551d01354d7d470920017eca8
-EBUILD mate-system-monitor-1.14.0.ebuild 985 BLAKE2B 365a008303b29c90deaf728fefd8dd00bea98e9151c9c1762b358a79117ed0599b1dbd4c519c427158e16e5e604bad1a9d52a9f6ec2b8b962d004f00ace6db4f SHA512 4fd51f71d477cbb230ac4a072a2f5488e78a9b3de89e0f16da9485e4c954aeca9d1f03e4b817ca9f458e6bbdd666d92a6c46c47b960dc6fae82bf2dfe05f4c62
-EBUILD mate-system-monitor-1.16.0.ebuild 985 BLAKE2B 365a008303b29c90deaf728fefd8dd00bea98e9151c9c1762b358a79117ed0599b1dbd4c519c427158e16e5e604bad1a9d52a9f6ec2b8b962d004f00ace6db4f SHA512 4fd51f71d477cbb230ac4a072a2f5488e78a9b3de89e0f16da9485e4c954aeca9d1f03e4b817ca9f458e6bbdd666d92a6c46c47b960dc6fae82bf2dfe05f4c62
 EBUILD mate-system-monitor-1.18.1.ebuild 1016 BLAKE2B 1bbe2ee50460b8c3db678d658df3228e999fdf10bd887365a72ab8a8b26207db3df6a5b70a93b0e562203c766f3f6e84c46e18ee234ca78374ff8fd1b418cad9 SHA512 1d773cd89876cbbf9c0b3e7a16561b797d1272c5b412e860f7c0e9f5586ef8e4924e810f5629c8ea32cfeb38275a7ea3a21ffda6002e910f262be472d2eabd1c
-MISC metadata.xml 424 BLAKE2B 15e1b8bbe54d362601038fc43a18c7ac25e11ddae7fb992b2123a2e5130a103161d7cd68fb4a0e8c60d0029e273eb2a9bb1faabf9c2f5eb953e58beaa4d38fb6 SHA512 3f930932b1c3bdc51ebc07b28989e3a4c53eeca6479215b9c75c06323fcf95b46dfe3260a7f9e5391bb4dc76df87d0651ba87fdede28e1f816094921d00f31cc
+MISC metadata.xml 348 BLAKE2B fe7ff06b7a0366617fb30e7a98fa7054c32469bf49691855183ee7b9991c1aebd5f431081e5d7efe07ab3a2b2424630bea621c2b3369338f6bb5348d1ba70de7 SHA512 4cb1bd5f11887274393c957be697ce784af74a39258ead2e9ccb586ac8d4bcab06a6aa2a76e8f96a85d2d818092250eede243775b61222493739440c59cc9c9b
diff --git a/mate-extra/mate-system-monitor/mate-system-monitor-1.12.2.ebuild b/mate-extra/mate-system-monitor/mate-system-monitor-1.12.2.ebuild
deleted file mode 100644
index a640204bee9e..000000000000
--- a/mate-extra/mate-system-monitor/mate-system-monitor-1.12.2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm x86"
-fi
-
-DESCRIPTION="The MATE System Monitor"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="gtk3 systemd"
-
-RDEPEND="
-	>=dev-cpp/glibmm-2.26:2
-	>=dev-libs/dbus-glib-0.70:0
-	>=dev-libs/glib-2.36:2
-	dev-libs/libsigc++:2
-	>=dev-libs/libxml2-2:2
-	>=gnome-base/libgtop-2.23.1:2=
-	>=gnome-base/librsvg-2.35:2
-	>=sys-apps/dbus-0.7:0
-	x11-libs/cairo:0
-	x11-libs/gdk-pixbuf:2
-	virtual/libintl:0
-	!gtk3? (
-		>=dev-cpp/gtkmm-2.22:2.4
-		>=x11-libs/gtk+-2.20:2
-		>=x11-libs/libwnck-2.5:1
-	)
-	gtk3? (
-		>=dev-cpp/gtkmm-3.0:3.0
-		>=x11-libs/gtk+-3.0:3
-		>=x11-libs/libwnck-2.91:3
-	)
-	systemd? ( sys-apps/systemd )"
-
-DEPEND="${RDEPEND}
-	app-text/yelp-tools:0
-	>=dev-util/intltool-0.50.1:*
-	sys-devel/gettext:*
-	>=sys-devel/autoconf-2.63:*
-	virtual/pkgconfig:*"
-
-src_configure() {
-	mate_src_configure \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_enable systemd)
-}
diff --git a/mate-extra/mate-system-monitor/mate-system-monitor-1.14.0.ebuild b/mate-extra/mate-system-monitor/mate-system-monitor-1.14.0.ebuild
deleted file mode 100644
index 5fb7d32fa1f6..000000000000
--- a/mate-extra/mate-system-monitor/mate-system-monitor-1.14.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="The MATE System Monitor"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="systemd"
-
-COMMON_DEPEND="
-	>=dev-cpp/glibmm-2.26:2
-	>=dev-cpp/gtkmm-3.8:3.0
-	>=dev-libs/glib-2.36:2
-	dev-libs/libsigc++:2
-	>=dev-libs/libxml2-2:2
-	>=gnome-base/libgtop-2.23.1:2=
-	>=gnome-base/librsvg-2.35:2
-	x11-libs/cairo:0
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.14:3
-	>=x11-libs/libwnck-3.0:3
-	virtual/libintl:0
-	systemd? ( sys-apps/systemd )"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/yelp-tools:0
-	>=dev-util/intltool-0.50.1:*
-	sys-devel/gettext:*
-	>=sys-devel/autoconf-2.63:*
-	virtual/pkgconfig:*"
-
-src_configure() {
-	mate_src_configure \
-		$(use_enable systemd)
-}
-
-pkg_postinst() {
-	mate_pkg_postinst
-
-	einfo "${PN} may run commands with escalated privileges using"
-	einfo "x11-libs/gksu."
-}
diff --git a/mate-extra/mate-system-monitor/mate-system-monitor-1.16.0.ebuild b/mate-extra/mate-system-monitor/mate-system-monitor-1.16.0.ebuild
deleted file mode 100644
index 5fb7d32fa1f6..000000000000
--- a/mate-extra/mate-system-monitor/mate-system-monitor-1.16.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="The MATE System Monitor"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="systemd"
-
-COMMON_DEPEND="
-	>=dev-cpp/glibmm-2.26:2
-	>=dev-cpp/gtkmm-3.8:3.0
-	>=dev-libs/glib-2.36:2
-	dev-libs/libsigc++:2
-	>=dev-libs/libxml2-2:2
-	>=gnome-base/libgtop-2.23.1:2=
-	>=gnome-base/librsvg-2.35:2
-	x11-libs/cairo:0
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.14:3
-	>=x11-libs/libwnck-3.0:3
-	virtual/libintl:0
-	systemd? ( sys-apps/systemd )"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/yelp-tools:0
-	>=dev-util/intltool-0.50.1:*
-	sys-devel/gettext:*
-	>=sys-devel/autoconf-2.63:*
-	virtual/pkgconfig:*"
-
-src_configure() {
-	mate_src_configure \
-		$(use_enable systemd)
-}
-
-pkg_postinst() {
-	mate_pkg_postinst
-
-	einfo "${PN} may run commands with escalated privileges using"
-	einfo "x11-libs/gksu."
-}
diff --git a/mate-extra/mate-system-monitor/metadata.xml b/mate-extra/mate-system-monitor/metadata.xml
index abf6a9f6f1df..4e0e9ce5b40f 100644
--- a/mate-extra/mate-system-monitor/metadata.xml
+++ b/mate-extra/mate-system-monitor/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-system-monitor</remote-id>
 	</upstream>
diff --git a/mate-extra/mate-user-guide/Manifest b/mate-extra/mate-user-guide/Manifest
index e19fff66ecb1..17efdb9ddaca 100644
--- a/mate-extra/mate-user-guide/Manifest
+++ b/mate-extra/mate-user-guide/Manifest
@@ -1,9 +1,3 @@
-DIST mate-user-guide-1.12.0.tar.xz 8296724 BLAKE2B d6b0b1f50996cccdc25f0be519b115ca3182dce15fc61883db34b1d52c984a3e48d81054b410c6ddc5d9242f649fc71f8a94053f7bfa5323e1fff978b9c2a20b SHA512 b92a58e2104d22007bf61ca2dc71e02acd250886393a9b3ccb397a3172a1f0542a34589ea2c82f9b985af0ae3ce505012f69731d82d8412949f5ffc254356456
-DIST mate-user-guide-1.14.0.tar.xz 8375176 BLAKE2B 31b46111f8e7fcd57fdc961a18c1a60a25992dcd3f8f6df3b1aff773b6788fa447793b6a18958a9045236e1ad534e90a926ca080fd5a2b5ad2b96e657600742b SHA512 62df5ee3372d452f52d7e63f18991b68996081dad05ae04fb4902d65246aeef7fc85686b4c4145974fd5cd2db95178f156b9847003f6f0576939d0afae501e60
-DIST mate-user-guide-1.16.0.tar.xz 8377540 BLAKE2B 82bf0ff92c4e5e6e06052feb4f370433515f483e171f1e19afb6550fe08e4ab93a47c5927c6ac6ce7921e4bf8f5ded8511773c90541ed153b83507596d59b016 SHA512 90dd0af23c2532d401a52442b2837bb43329c18b4c76cf7ac67c84434e9b87fbf75050e5456f1b242755869c8540f5de3abd7a004bd400a1bf81cce66e3ccf80
 DIST mate-user-guide-1.18.0.tar.xz 8375200 BLAKE2B 2e77dbdf713a86dc5b2208de49053c99606d98fa0ca431c91b5d0ee47dc01e63be14e2b5112246baeb64f04c8df93601d1f3d2e24e6120eddac36512a4e38bcf SHA512 023b6ee04764e8a6004ac1cba69427af33be22228d475666cfacd4aa2ef4b61df4c9e269e003345a7073ef5eb7b783850e4efd5b41356052e3b69860d6df054a
-EBUILD mate-user-guide-1.12.0.ebuild 491 BLAKE2B 0f6c3ae86b57651713d3b50516dcf3fc10504aa364a8f9253ec1ec60217fe08e706758532c296e61c517055b98eebe915536b2da56bc52453f48e728212cac66 SHA512 542f80c25d9d72f767f68fc0a4d05ec2bf610c42bcff7716831fe52d818899fce9c8b563ce1ace1eaa4bee07e365cf043a4aa3e228ce2b0e2fc04f40081db2eb
-EBUILD mate-user-guide-1.14.0.ebuild 531 BLAKE2B c144c5deb0ff0317de6faa11f531b8a49f665aa2727d522782700c9d1880de83a1c1eb25300e9fb708f19779c66faee62d6cd1f4b576c70bdfa2b03f6bf82f29 SHA512 b54808782cc92f4bf19e28b9a9cefa3a5b51508441d20a63ac7807abba3ac64583256312386284b72cd3e9ff9cbb53f1bf76c45e465a059c922453492316cac6
-EBUILD mate-user-guide-1.16.0.ebuild 531 BLAKE2B c144c5deb0ff0317de6faa11f531b8a49f665aa2727d522782700c9d1880de83a1c1eb25300e9fb708f19779c66faee62d6cd1f4b576c70bdfa2b03f6bf82f29 SHA512 b54808782cc92f4bf19e28b9a9cefa3a5b51508441d20a63ac7807abba3ac64583256312386284b72cd3e9ff9cbb53f1bf76c45e465a059c922453492316cac6
 EBUILD mate-user-guide-1.18.0.ebuild 529 BLAKE2B 9fac3ae05aacc5109af2a77adbfedd73c05bb5ef956711726a1452aeaabbd2acdf2f1418edf21a4dcc32a5c698bb98aa619d41c155b9bbff39465ec4ebcf8caa SHA512 f1ebfa2e5c1258f65aa53f0c08c6dd4e86d71aa9dcc83326cb043fef717b3bbfb92c5af0aa44c04d39965d9875b0d1277c2faf381e351ae11211fb8c76e514ec
 MISC metadata.xml 344 BLAKE2B daf4b6a1920fba3efa9c5253a08edd91d26b90fe9a81bec69de4c3f21423ad9d7fd8b5ece9036c3e834900fa60b483e7c73b7572bdbbe8a31d16fc81a50aa09b SHA512 d0ce9f32a04fdae27a476a7197b067f85b1a4889ab758af1c761d2d59c6ca295a6d623db51a0296c64d3a6fb9ff9bea9577002f34020009b967d594b540440f4
diff --git a/mate-extra/mate-user-guide/mate-user-guide-1.12.0.ebuild b/mate-extra/mate-user-guide/mate-user-guide-1.12.0.ebuild
deleted file mode 100644
index 5000e6ccf896..000000000000
--- a/mate-extra/mate-user-guide/mate-user-guide-1.12.0.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
-
-MATE_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm x86"
-fi
-
-DESCRIPTION="User documentation for MATE Desktop"
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-
-RDEPEND="
-	gnome-extra/yelp
-	virtual/libintl:0"
-
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.40:*
-	app-text/yelp-tools
-	sys-devel/gettext:*
-	virtual/pkgconfig:*
-	!!mate-base/mate-desktop[user-guide]"
diff --git a/mate-extra/mate-user-guide/mate-user-guide-1.14.0.ebuild b/mate-extra/mate-user-guide/mate-user-guide-1.14.0.ebuild
deleted file mode 100644
index 183d448a57fa..000000000000
--- a/mate-extra/mate-user-guide/mate-user-guide-1.14.0.ebuild
+++ /dev/null
@@ -1,28 +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="User documentation for MATE Desktop"
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-
-COMMON_DEPEND="virtual/libintl:0"
-
-RDEPEND="${COMMON_DEPEND}
-	gnome-extra/yelp"
-
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.40:*
-	app-text/yelp-tools
-	sys-devel/gettext:*
-	virtual/pkgconfig:*
-	!!mate-base/mate-desktop[user-guide]"
diff --git a/mate-extra/mate-user-guide/mate-user-guide-1.16.0.ebuild b/mate-extra/mate-user-guide/mate-user-guide-1.16.0.ebuild
deleted file mode 100644
index 183d448a57fa..000000000000
--- a/mate-extra/mate-user-guide/mate-user-guide-1.16.0.ebuild
+++ /dev/null
@@ -1,28 +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="User documentation for MATE Desktop"
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-
-COMMON_DEPEND="virtual/libintl:0"
-
-RDEPEND="${COMMON_DEPEND}
-	gnome-extra/yelp"
-
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.40:*
-	app-text/yelp-tools
-	sys-devel/gettext:*
-	virtual/pkgconfig:*
-	!!mate-base/mate-desktop[user-guide]"
diff --git a/mate-extra/mate-user-share/Manifest b/mate-extra/mate-user-share/Manifest
index c52d24c0147b..fa0a78771d0e 100644
--- a/mate-extra/mate-user-share/Manifest
+++ b/mate-extra/mate-user-share/Manifest
@@ -1,9 +1,3 @@
-DIST mate-user-share-1.12.0.tar.xz 931776 BLAKE2B 810441690c333b5fcc77904bd39f4bbc3548fccb99852aa6a05a0c6021fec470c636fe34f1c2ecef020ed1499c55648463a40fce23a14168315838849719fdf2 SHA512 928bcfa594ba56b84bde249b71fb6315d7dd20fc46c1300edb4f9ab3296a468f1105934ba8cb351e47cef52dac5ca70bdc2f3f7d2166219ded7b7016bea23c24
-DIST mate-user-share-1.14.0.tar.xz 902728 BLAKE2B 12ca9cf01b7f91bb3e67fdcfd259dc31a4712524404507302f49a88bb2dc9ce1bb8cda480ec6172ecbc4cbe55e6111dae90298bc61a0a9bf4cd6776380b1a1e6 SHA512 a9ad934b0681d1168d7ea3b7d3120cb39f230b7267cd71a91f511f03f132a8e8022bb339fcd017c243988214a82dd337cacb65875d9e35e4c10f014f39eefbe1
-DIST mate-user-share-1.16.0.tar.xz 918148 BLAKE2B 1cb1be82876eb383eb6642ef1f562c0c7d770391524ae15529a1b06f0fa3e48c9b9b1babb7e75c4543f35798b666d8ffefee40c6a4d5ceff86486e610557841b SHA512 fe8994f288360bbecfc7055a0222f18be81b5cd74d620948c7e60365f56869c9dd25efb3262224a3b5d1071ec36419c3fde925c31038d04e60026c63d132252c
 DIST mate-user-share-1.18.0.tar.xz 919404 BLAKE2B fc81dbe17a0ed57eb7baaa385fe786d73a5d64171e51735de061c9c7fbe69f0174f984d75ae39e7b0dcd7bf5562655cf599f394ab7ed50bba520b8472da1111f SHA512 581a53efc115b3b2bac455d828bb689c79bc2a0c5bf3fb2a560ae7eb153b6a8c9589695ca540bb759498c0dc21e016f634a0aabf8e9863c42c5ae7712c91d058
-EBUILD mate-user-share-1.12.0.ebuild 1285 BLAKE2B 2e2d7e66a0a257860787fd9d0c74567953570e212513165df18fb246a08213d1863812708fcd51bc801600c8a4db5502b40fba41852a32f1386b9b6c60c42ecf SHA512 02a6d3c051446f7f35f21bd4ed50dbb8f3929c5437c8e3d2b63ba0ab2b3f30aabe246e9ccc9de7c61b32bdcc794afdc18b66cd89791e819b06c0a650cc678a5e
-EBUILD mate-user-share-1.14.0.ebuild 1327 BLAKE2B 7c340c90b854ec13a807740c085c562004bf8b0b8c5be943aba9c8f1f9c6049e06b9e2e72cf203c2440394c97c6a4555f5119c00938b6ace62381709a98cc0d5 SHA512 03a59fe9da211e02ccd092e941feecae13b67b76c5ebad354d9b2ddbd2a58245203f147c45854f3151974b1205d09d0f92f02c8dd54e893dea349d2dc0d38e34
-EBUILD mate-user-share-1.16.0.ebuild 1300 BLAKE2B 6ab388b9f76abc587bfc6e41455621601bbe24fa5483edd80a1703c912973e39a1ad2e1e58e3aeb23e78f584dbbba6692ca2b9ac41fc1b7011e8cda73f4da474 SHA512 c91304ead3f606cc24c06bbc7564b0da6837bbbc13b05237facc5bddde6a7a51b876f626070502d113d76a8c017b6a3ff250d244c69092bc8c308a91b50bfec3
 EBUILD mate-user-share-1.18.0.ebuild 1140 BLAKE2B ee04b9b2c5405d9eedea9ee634c73aacf715ac3c0c3b7708d4af6c16d95e4a3d48c86ac0f27eb6077fea2ed0b77ae2d8bb4dd4b201a7dd54b0f8aeb95ddef55e SHA512 f3c17574014123ad34e7f64920a1e120dfde11f6be19c9df648fcd44e27581f5c621bc52c486aeb735bdf29bc56e99cc1d1770134137046a64f4197963053f6f
-MISC metadata.xml 420 BLAKE2B 3a8632e2b937d861ccd8462d8ee991201d04413fb36ac12195548de039416c6210173d8e28f2b467463b2e060616133ca18d7a6a0318f134533aaa7d4ad3a0c0 SHA512 9696c73ac68c1c435e300709a7e38e3a77cc5eedbc76957cea7d01b5e3f282c3a22e1db7796911c501b8138ba981ddac590383ecbc405c98e1b7ef89743b90f4
+MISC metadata.xml 344 BLAKE2B 72c35ab850378b1f7386ba3d9da729e2855c20779d23a1a503186706bff164487c5f0d398dcc96f4056c2a670f815e2de874f89ca6ffe0c85749fb61416c9d7d SHA512 866efce9c0b0fbd2b8916c71d07b42a255bda4a2c4f269a6fe3390b9913aa148b44ad4b6f779f964e51715f2cc79dcdfe9e8096f2382b3e35f3bda38d8646001
diff --git a/mate-extra/mate-user-share/mate-user-share-1.12.0.ebuild b/mate-extra/mate-user-share/mate-user-share-1.12.0.ebuild
deleted file mode 100644
index 477b173134ba..000000000000
--- a/mate-extra/mate-user-share/mate-user-share-1.12.0.ebuild
+++ /dev/null
@@ -1,57 +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 multilib
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm x86"
-fi
-
-DESCRIPTION="Personal file sharing for the MATE desktop"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="X gtk3"
-
-RDEPEND="
-	>=dev-libs/dbus-glib-0.70:0
-	>=dev-libs/glib-2.15.2:2
-	>=mate-base/caja-1.6[gtk3(-)=]
-	>=sys-apps/dbus-1.1.1:0
-	>=x11-libs/gdk-pixbuf-2:2
-	x11-libs/libX11:0
-	x11-libs/pango:0
-	>=x11-libs/libnotify-0.7:0
-	>=www-apache/mod_dnssd-0.6:0
-	>=www-servers/apache-2.2:2[apache2_modules_dav,apache2_modules_dav_fs,apache2_modules_authn_file,apache2_modules_auth_digest,apache2_modules_authz_groupfile]
-	virtual/libintl:0
-	!gtk3? (
-		>=dev-libs/libunique-1:1
-		media-libs/libcanberra:0[gtk]
-		>=x11-libs/gtk+-2.24:2
-	)
-	gtk3? (
-		>=dev-libs/libunique-3:3
-		media-libs/libcanberra:0[gtk3]
-		>=x11-libs/gtk+-3.0:3
-	)"
-
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/yelp-tools:0
-	>=dev-util/intltool-0.35:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-src_configure() {
-	mate_src_configure \
-		--with-httpd=apache2 \
-		--with-modules-path=/usr/$(get_libdir)/apache2/modules/ \
-		--disable-bluetooth \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_with X x)
-}
diff --git a/mate-extra/mate-user-share/mate-user-share-1.14.0.ebuild b/mate-extra/mate-user-share/mate-user-share-1.14.0.ebuild
deleted file mode 100644
index 88e86f04f13b..000000000000
--- a/mate-extra/mate-user-share/mate-user-share-1.14.0.ebuild
+++ /dev/null
@@ -1,59 +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 multilib
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="Personal file sharing for the MATE desktop"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="X gtk3"
-
-COMMON_DEPEND="
-	>=dev-libs/dbus-glib-0.70:0
-	>=dev-libs/glib-2.15.2:2
-	>=mate-base/caja-1.6[gtk3(-)=]
-	>=sys-apps/dbus-1.1.1:0
-	>=x11-libs/gdk-pixbuf-2:2
-	x11-libs/libX11:0
-	x11-libs/pango:0
-	>=x11-libs/libnotify-0.7:0
-	virtual/libintl:0
-	!gtk3? (
-		>=dev-libs/libunique-1:1
-		media-libs/libcanberra:0[gtk]
-		>=x11-libs/gtk+-2.24:2
-	)
-	gtk3? (
-		>=dev-libs/libunique-3:3
-		media-libs/libcanberra:0[gtk3]
-		>=x11-libs/gtk+-3.0:3
-	)"
-
-RDEPEND="${COMMON_DEPEND}
-	>=www-apache/mod_dnssd-0.6:0
-	>=www-servers/apache-2.2:2[apache2_modules_dav,apache2_modules_dav_fs,apache2_modules_authn_file,apache2_modules_auth_digest,apache2_modules_authz_groupfile]"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/yelp-tools:0
-	>=dev-util/intltool-0.35:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-src_configure() {
-	mate_src_configure \
-		--with-httpd=apache2 \
-		--with-modules-path=/usr/$(get_libdir)/apache2/modules/ \
-		--disable-bluetooth \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_with X x)
-}
diff --git a/mate-extra/mate-user-share/mate-user-share-1.16.0.ebuild b/mate-extra/mate-user-share/mate-user-share-1.16.0.ebuild
deleted file mode 100644
index 11f1d7fe930e..000000000000
--- a/mate-extra/mate-user-share/mate-user-share-1.16.0.ebuild
+++ /dev/null
@@ -1,58 +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 multilib
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="Personal file sharing for the MATE desktop"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="X gtk3"
-
-COMMON_DEPEND="
-	>=dev-libs/dbus-glib-0.70:0
-	>=dev-libs/glib-2.15.2:2
-	>=mate-base/caja-1.6[gtk3(-)=]
-	>=sys-apps/dbus-1.1.1:0
-	>=x11-libs/gdk-pixbuf-2:2
-	x11-libs/libX11:0
-	x11-libs/pango:0
-	>=x11-libs/libnotify-0.7:0
-	virtual/libintl:0
-	!gtk3? (
-		>=dev-libs/libunique-1:1
-		media-libs/libcanberra:0[gtk]
-		>=x11-libs/gtk+-2.24:2
-	)
-	gtk3? (
-		media-libs/libcanberra:0[gtk3]
-		>=x11-libs/gtk+-3.0:3
-	)"
-
-RDEPEND="${COMMON_DEPEND}
-	>=www-apache/mod_dnssd-0.6:0
-	>=www-servers/apache-2.2:2[apache2_modules_dav,apache2_modules_dav_fs,apache2_modules_authn_file,apache2_modules_auth_digest,apache2_modules_authz_groupfile]"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/yelp-tools:0
-	>=dev-util/intltool-0.35:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-src_configure() {
-	mate_src_configure \
-		--with-httpd=apache2 \
-		--with-modules-path=/usr/$(get_libdir)/apache2/modules/ \
-		--disable-bluetooth \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_with X x)
-}
diff --git a/mate-extra/mate-user-share/metadata.xml b/mate-extra/mate-user-share/metadata.xml
index 99735b0bd1f5..e67f167e102a 100644
--- a/mate-extra/mate-user-share/metadata.xml
+++ b/mate-extra/mate-user-share/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-user-share</remote-id>
 	</upstream>
diff --git a/mate-extra/mate-utils/Manifest b/mate-extra/mate-utils/Manifest
index 064bdaa4ad84..7094c69e1c3f 100644
--- a/mate-extra/mate-utils/Manifest
+++ b/mate-extra/mate-utils/Manifest
@@ -1,11 +1,3 @@
-AUX mate-utils-1.12.0-dict-gtk3.patch 1780 BLAKE2B 9f852c4531437a1868d69f7b62b7dbe0b21283fd7446262cb329f882e71297b46e62b2da3f825b61c10ad1fb116084ceb9da399b2d608b9b8f7e5e20ede84153 SHA512 758eb7b3734852553df9a7c064370241ab3c3b1ba6eaf56a28021ebd7c61b92f1b4c354d4ef05d6647d3549ca518e9c576bd478c6dbcd96bed818dc63522ad7a
-AUX mate-utils-1.12.0-include-correct-header-to-fix-occasional-ftbfs.patch 1029 BLAKE2B d8c2860cd94625d29d02286795e78b4720ac3a439ae044797383bc59acf95e36e1896431f82f2f60e38c20bf8bb58ac4c6bd27ebae38d493360d856718f5482c SHA512 55bea637bfb20995c8bcb2d346fe1a6caadc57bc1cfd2b95c521e9d4e767ae8cf55a2e1e864c28a355928b534ce59bd16be284df25f2a1910cf056128bc12353
-DIST mate-utils-1.12.0.tar.xz 6482900 BLAKE2B a9922a2cd4cb15f5d561c4e07528c265ef759f65fc306490a8f1aebbfd077ece481c6d69485c7df639611b61cbe9ab2789cccd32edc2800be36429718526acca SHA512 fe1db5c04b3adc616fdd0f76ddfb1291bbbfb6fb7d2f9ab11c5ffc33e19e0487ba3581babdfe74dd64553fd07f7d986fbac08fe2b14bcb79fca315e365069e47
-DIST mate-utils-1.14.1.tar.xz 6498448 BLAKE2B 21809b5bfe4e624c9aaafeda2f161acbd5648b237d013ba4098c8a421dcb22e474caeac5148e3b902e9f869655928a619d5282957d508856f909592944881125 SHA512 7c95fe390f83ee90405929025039ccef186ebf268f85e45a0dda0483b5de9bb67a6d3bbbe1a55315787996118c6bdf6a4fb29ad7236428eef89750c058b886e4
-DIST mate-utils-1.16.1.tar.xz 6517092 BLAKE2B 3a9fa4b12d29038872a90841eff36310aeac2834797ad8b4a1cde41c97b4c1f815546a379028ba4559c3dbaf4f6aa91102fd0b80418a0f60d9501da2b7915dbb SHA512 d902362b23b8b26377fa6741e8b96230ee224ef6dc9c4b02dc50e6bd43d87a28c266d2a1bb9c4c7be48cc43162988240257be40a4fb8b7f2569a2520f35b7aa0
 DIST mate-utils-1.18.3.tar.xz 6449580 BLAKE2B e8a892d0f924b37da82a8eb233c24b41609831d84fc706ac0082c05cfc0564ca150e6cbd350af8be48acf1e314253e4afe8123bcf4af189a344b3c51e6ccf7d2 SHA512 c9d80e037d32784b3d376aebe23abc6709e14d1df6f293f43c1fc7978f7903ac8b0fc159cebebb3d8dc471df210469b5dcc5dfebdc906ade30a2c7e8f7ca764a
-EBUILD mate-utils-1.12.0-r2.ebuild 1514 BLAKE2B 360d8ec8d842a5d3a981d183301e72007dd1d75c389e6fc0f769f563640984d554e3caa51050472fbdc2ed4fc9c8a032244e1ab8bd699a37761ee9c52856e8d8 SHA512 fb947fa1645a328fce11b9fda9dab1488ad0c96209bd11c345727ff637126a5092a39cd04b9d55b99f828cb1a0198a835ab8d4ea071cb1a5613561c8ce39e569
-EBUILD mate-utils-1.14.1.ebuild 1436 BLAKE2B 8dbf28ec89d85884404c0ff8d25af5efae640eaf38221208f6dfa73b7230230ba071b3095c91f96c9313be20b026c2335cf75f1a7fb0bb0951e5a1e09d125db1 SHA512 dfb09955c609977855dc9db6274f5f8a70acbfaa2735173097156b374390d643683387ca4262afe5b7e3f09387add300cf102da26c2bb2f910d11eb1382d7877
-EBUILD mate-utils-1.16.1.ebuild 1436 BLAKE2B 8dbf28ec89d85884404c0ff8d25af5efae640eaf38221208f6dfa73b7230230ba071b3095c91f96c9313be20b026c2335cf75f1a7fb0bb0951e5a1e09d125db1 SHA512 dfb09955c609977855dc9db6274f5f8a70acbfaa2735173097156b374390d643683387ca4262afe5b7e3f09387add300cf102da26c2bb2f910d11eb1382d7877
 EBUILD mate-utils-1.18.3.ebuild 1304 BLAKE2B 6b0593b985fa61b397dfb19647f5a4bbea3bb9c601ee702e7fa5ebf08f6a287d5a45e7ae34adba4a2c66d77f9adab1608b93cbb1cb5f7d9bac05f470843582e9 SHA512 c00b6223c110f628bb0563742ae0671c4d3a563d25f234e108b1ed23d4a07c1c8d562b7d418b3a2e9f84c29cff90d1914c343250f222aebd45e1a775e4e72450
-MISC metadata.xml 478 BLAKE2B 2ed326f51a418eb5a2b3bed542f07e97107c3e1f8e1d438b4b757bf81ef34e5762b0ededcbd7474990ac6a6b07dfa58970b05bb1da5ebe2c629a2726534afc98 SHA512 129a8bac28360c9260eca2a8db8e23aa5cef92464905b730952f0508fc8057c12929f590b1f6c2d0dfa72687a2dd63e7300fa01a2b25fb9346add99544e10db9
+MISC metadata.xml 417 BLAKE2B af181dbce0a3bd1d40160da5b7b1be3a4ba345b3d31dc8d4988a146af5318bf473ad2962e9fd63fa2bfa74e61daddb5e84dd977891dee5b3b483189321bf7b1f SHA512 4c4eeb71f1cbd778f48f19da5185d9a75444a87a7abbe5d055e032f38b9891e996af84a383d7bc67ad11113da09ad034a159ec425b106340c696fad479fecee4
diff --git a/mate-extra/mate-utils/files/mate-utils-1.12.0-dict-gtk3.patch b/mate-extra/mate-utils/files/mate-utils-1.12.0-dict-gtk3.patch
deleted file mode 100644
index dff6dbe5582f..000000000000
--- a/mate-extra/mate-utils/files/mate-utils-1.12.0-dict-gtk3.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 5ab184661ff38baca3ea2709d81932a578654392 Mon Sep 17 00:00:00 2001
-From: Kir Kolyshkin <kir@openvz.org>
-Date: Mon, 16 May 2016 14:52:28 -0700
-Subject: [PATCH] mate-dict.pc: depend upon proper gtk version
-
-If the package is built against gtk-3.0 (as in
-./configure --with-gtk=3.0), mate-dict.pc still wants gtk-2.0
-since it's hardcoded it there. This can lead to improper builds
-of packages using libmatedict (although I can't find any now),
-as well as improper RPM dependencies, like this:
-
-	$ rpm -e gtk2-devel
-	error: Failed dependencies:
-	...
-	pkgconfig(gtk+-2.0) is needed by (installed) mate-utils-devel-1.14.0-1gtk3.fc23.x86_64
-
-Fortunately, the file is already generated, so it's trivial to add
-a proper substitution.
-
-[v2: also add min GTK version required]
-
-Signed-off-by: Kir Kolyshkin <kir@openvz.org>
----
- configure.ac                             | 2 ++
- mate-dictionary/libgdict/mate-dict.pc.in | 2 +-
- 2 files changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 64aba70..39cc6f8 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -89,6 +89,8 @@ case "$with_gtk" in
- 		LIBCANBERRA_GTK_REQUIRED=0.4
- 		;;
- esac
-+AC_SUBST(GTK_API_VERSION)
-+AC_SUBST(GTK_REQUIRED)
- 
- # common checks
- PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLIB_REQUIRED)
-diff --git a/mate-dictionary/libgdict/mate-dict.pc.in b/mate-dictionary/libgdict/mate-dict.pc.in
-index e409a0c..8168de2 100644
---- a/mate-dictionary/libgdict/mate-dict.pc.in
-+++ b/mate-dictionary/libgdict/mate-dict.pc.in
-@@ -5,7 +5,7 @@ includedir=@includedir@
- 
- Name: gdict-1.0
- Description: MATE Dictionary Protocol client library
--Requires: gtk+-2.0
-+Requires: gtk+-@GTK_API_VERSION@ >= @GTK_REQUIRED@
- Version: @GDICT_VERSION@
- Libs: -L${libdir} -lmatedict
- Cflags: -I${includedir}/mate-dict
diff --git a/mate-extra/mate-utils/files/mate-utils-1.12.0-include-correct-header-to-fix-occasional-ftbfs.patch b/mate-extra/mate-utils/files/mate-utils-1.12.0-include-correct-header-to-fix-occasional-ftbfs.patch
deleted file mode 100644
index 09d201763f69..000000000000
--- a/mate-extra/mate-utils/files/mate-utils-1.12.0-include-correct-header-to-fix-occasional-ftbfs.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 550229e422cd88fe39473f41cebe6cef12f6c8fb Mon Sep 17 00:00:00 2001
-From: monsta <monsta@inbox.ru>
-Date: Tue, 14 Mar 2017 15:08:47 +0300
-Subject: [PATCH] mate-dictionary: include correct header to fix occasional
- FTBFS
-
-taken from:
-https://git.gnome.org/browse/gnome-dictionary/commit/?id=d529e2dd056f05cb1115c2f68bb6f773b4b14948
----
- mate-dictionary/libgdict/gdict-client-context.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/mate-dictionary/libgdict/gdict-client-context.h b/mate-dictionary/libgdict/gdict-client-context.h
-index 2854fed..c52bbb4 100644
---- a/mate-dictionary/libgdict/gdict-client-context.h
-+++ b/mate-dictionary/libgdict/gdict-client-context.h
-@@ -20,7 +20,7 @@
- #ifndef __GDICT_CLIENT_CONTEXT_H__
- #define __GDICT_CLIENT_CONTEXT_H__
- 
--#include <glib-object.h>
-+#include "gdict-context.h"
- 
- #define GDICT_TYPE_CLIENT_CONTEXT		(gdict_client_context_get_type ())
- #define GDICT_CLIENT_CONTEXT(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), GDICT_TYPE_CLIENT_CONTEXT, GdictClientContext))
diff --git a/mate-extra/mate-utils/mate-utils-1.12.0-r2.ebuild b/mate-extra/mate-utils/mate-utils-1.12.0-r2.ebuild
deleted file mode 100644
index d933999c86c2..000000000000
--- a/mate-extra/mate-utils/mate-utils-1.12.0-r2.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="Utilities for the MATE desktop"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="X applet debug gtk3 ipv6 test"
-
-RDEPEND="app-text/rarian:0
-	dev-libs/atk:0
-	>=dev-libs/glib-2.36:2
-	>=gnome-base/libgtop-2.12:2=
-	sys-libs/zlib:0
-	x11-libs/cairo:0
-	x11-libs/gdk-pixbuf:2
-	x11-libs/libICE:0
-	x11-libs/libSM:0
-	x11-libs/libX11:0
-	x11-libs/libXext:0
-	x11-libs/pango:0
-	applet? ( >=mate-base/mate-panel-1.6[gtk3(-)=] )
-	!gtk3? (
-		>=x11-libs/gtk+-2.24:2
-		>=media-libs/libcanberra-0.4:0[gtk]
-	)
-	gtk3? (
-		>=x11-libs/gtk+-3.0:3
-		>=media-libs/libcanberra-0.4:0[gtk3]
-	)"
-
-DEPEND="${RDEPEND}
-	>=app-text/scrollkeeper-dtd-1:1.0
-	app-text/yelp-tools:0
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.50.1:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*
-	x11-base/xorg-proto"
-
-PATCHES=(
-	"${FILESDIR}/${P}-dict-gtk3.patch"
-	"${FILESDIR}/${P}-include-correct-header-to-fix-occasional-ftbfs.patch"
-)
-
-src_prepare() {
-	# Make apps visible in all DEs.
-	LC_ALL=C find . -iname '*.desktop.in*' -exec \
-		sed -e '/OnlyShowIn/d' -i {} + || die
-
-	mate_src_prepare
-}
-
-src_configure() {
-	mate_src_configure \
-		--disable-maintainer-flags \
-		--enable-zlib \
-		--enable-debug=$(usex debug yes minimum) \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_with X x) \
-		$(use_enable applet gdict-applet) \
-		$(use_enable ipv6)
-}
diff --git a/mate-extra/mate-utils/mate-utils-1.14.1.ebuild b/mate-extra/mate-utils/mate-utils-1.14.1.ebuild
deleted file mode 100644
index 62cb6981a096..000000000000
--- a/mate-extra/mate-utils/mate-utils-1.14.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="Utilities for the MATE desktop"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="X applet debug gtk3 ipv6 test"
-
-COMMON_DEPEND="
-	dev-libs/atk:0
-	>=dev-libs/glib-2.36:2
-	>=gnome-base/libgtop-2.12:2=
-	sys-libs/zlib:0
-	x11-libs/cairo:0
-	x11-libs/gdk-pixbuf:2
-	x11-libs/libICE:0
-	x11-libs/libSM:0
-	x11-libs/libX11:0
-	x11-libs/libXext:0
-	x11-libs/pango:0
-	applet? ( >=mate-base/mate-panel-1.6[gtk3(-)=] )
-	!gtk3? (
-		>=x11-libs/gtk+-2.24:2
-		>=media-libs/libcanberra-0.4:0[gtk]
-	)
-	gtk3? (
-		>=x11-libs/gtk+-3.0:3
-		>=media-libs/libcanberra-0.4:0[gtk3]
-	)"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/rarian:0
-	>=app-text/scrollkeeper-dtd-1:1.0
-	app-text/yelp-tools:0
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.50.1:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*
-	x11-base/xorg-proto"
-
-src_prepare() {
-	# Make apps visible in all DEs.
-	LC_ALL=C find . -iname '*.desktop.in*' -exec \
-		sed -e '/OnlyShowIn/d' -i {} + || die
-
-	mate_src_prepare
-}
-
-src_configure() {
-	mate_src_configure \
-		--disable-maintainer-flags \
-		--enable-zlib \
-		--enable-debug=$(usex debug yes minimum) \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_with X x) \
-		$(use_enable applet gdict-applet) \
-		$(use_enable ipv6)
-}
diff --git a/mate-extra/mate-utils/mate-utils-1.16.1.ebuild b/mate-extra/mate-utils/mate-utils-1.16.1.ebuild
deleted file mode 100644
index 62cb6981a096..000000000000
--- a/mate-extra/mate-utils/mate-utils-1.16.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="Utilities for the MATE desktop"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="X applet debug gtk3 ipv6 test"
-
-COMMON_DEPEND="
-	dev-libs/atk:0
-	>=dev-libs/glib-2.36:2
-	>=gnome-base/libgtop-2.12:2=
-	sys-libs/zlib:0
-	x11-libs/cairo:0
-	x11-libs/gdk-pixbuf:2
-	x11-libs/libICE:0
-	x11-libs/libSM:0
-	x11-libs/libX11:0
-	x11-libs/libXext:0
-	x11-libs/pango:0
-	applet? ( >=mate-base/mate-panel-1.6[gtk3(-)=] )
-	!gtk3? (
-		>=x11-libs/gtk+-2.24:2
-		>=media-libs/libcanberra-0.4:0[gtk]
-	)
-	gtk3? (
-		>=x11-libs/gtk+-3.0:3
-		>=media-libs/libcanberra-0.4:0[gtk3]
-	)"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/rarian:0
-	>=app-text/scrollkeeper-dtd-1:1.0
-	app-text/yelp-tools:0
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.50.1:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*
-	x11-base/xorg-proto"
-
-src_prepare() {
-	# Make apps visible in all DEs.
-	LC_ALL=C find . -iname '*.desktop.in*' -exec \
-		sed -e '/OnlyShowIn/d' -i {} + || die
-
-	mate_src_prepare
-}
-
-src_configure() {
-	mate_src_configure \
-		--disable-maintainer-flags \
-		--enable-zlib \
-		--enable-debug=$(usex debug yes minimum) \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_with X x) \
-		$(use_enable applet gdict-applet) \
-		$(use_enable ipv6)
-}
diff --git a/mate-extra/mate-utils/metadata.xml b/mate-extra/mate-utils/metadata.xml
index 516aaa5d49f8..eaae50638534 100644
--- a/mate-extra/mate-utils/metadata.xml
+++ b/mate-extra/mate-utils/metadata.xml
@@ -7,7 +7,6 @@
 	</maintainer>
 	<use>
 		<flag name="applet">Enable the mate dictionary applet</flag>
-		<flag name="gtk3">Build with GTK+3 instead of GTK+2</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">mate-desktop/mate-utils</remote-id>
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-extra
parent	62f67115b5c46134c34f88f4b1cbdacc19384c0a (diff)