x11-wm/marco: Drop old, sync with Gentoo

Package-Manager: Portage-2.3.82, Repoman-2.3.18
Signed-off-by: Adam Feldman <NP-Hardass@gentoo.org>

12 files changed, 286 insertions, 460 deletions

diff --git a/x11-wm/marco/Manifest b/x11-wm/marco/Manifest
index 845b8a6..06a9ac8 100644
--- a/x11-wm/marco/Manifest
+++ b/x11-wm/marco/Manifest
@@ -1,5 +1,4 @@
-DIST marco-1.12.1.tar.xz 1163996 BLAKE2B ff133af6d56a7c91c0b104fdbfe82ce16492429ec24a06251d106b76b52b3cf4c560ec1c304b398ced61350d79410aceb5e004fc4cd8d9893faae6743788cf34 SHA512 d271c4627fc50643d8e1a2faec33b5327999ad16a3975d62ea3ded956bccf3d5e015ed8085d43a200a34f1ea78f17d7e4ea4afaa9111e5f2e3a2230b51752945
-DIST marco-1.14.2.tar.xz 1244076 BLAKE2B a1f88f49a2d5048ba6fec2c5c5b86ff1ed546638256782ef1e9fa27f5253e65d67055e96d8d337d4bcc41fbe614164695483e76c2f2fac6bccd1f842548ab795 SHA512 6ca782f5dbbc01f5df4be901a1a6bf5b23398716e5802118482a0bf98e35f4dc544a6070358a931ca11f2d8b71cbbfb7e8768e0535c6605433a202be348ddf84
-DIST marco-1.16.0.tar.xz 1245540 BLAKE2B 11bd58e79f73f294edc808a9b0128dbba92f4bce190996a924fe15d4b0d9c718ab398f83d148e9e8c759fc9093c15eac554f5db65d1abcdd5c38894f8f5420cb SHA512 f353514dc69543e97fe08f9c67275c195ddc1c52b8b98dfb956351580b541a20b9f3a63d0b41939aca59e2416e58bb384206bbe2b8f56a26435b9760d23665b4
-DIST marco-1.16.1.tar.xz 1247072 BLAKE2B 71959f5b37a2e499ae7a304de279d0b87b56618ffb135e6792dccbbdf0fe4dbff091257d6c6e856162a0c80d3c08c0aae8233e94d8526af3072479b4d06a02b5 SHA512 c5f88d71378a210e6490edab2db8bedf12eb013ce89fe232863c6538b240f38b7393474893bcead6904aad1835d1dc8794328e71235f17194ba3f0c3c426de36
-DIST marco-1.18.2.tar.xz 1255492 BLAKE2B 034ad26789f894d7fa829e48ed39d11925e304dd8f6c3c74b14972a332b63782d1a8c4cb5b81b20f4d8bc12a74d053bf587ed72e3c1dca8b4fddd567dd6551ef SHA512 f18cd8d46c2ad6e6d86e6e110fb588ea8c6c301c6ffc1ee72ce80984125be5cbdeb20bf4a7fe8d1d1a60b93c7cb32de8dbd00532462c5637b747068f96e79129
+DIST marco-1.22.1.tar.xz 1357864 BLAKE2B 241e71795acfdcbf90070ef0d14f0cc55894a5cddbf48bd8741cf9580cfcaa035890b23a2182738875ce4d89d099a80d59aa7b1937e4a34a18a5a969830e7db9 SHA512 18093f4d419fbc90f957a04ec3e36a153b3c51a6bcdc1ac5884adcc0292f157bc5e4af51e171451a4b54b5bccffdee2e8a07ed13dafb6106773abfb06b6a8a4f
+DIST marco-1.22.2.tar.xz 1366104 BLAKE2B 6caa7da12c32b8adcc6d3ab4525fcf9e892585cb528bd73e47af1e2eeda2c31d174e55acd98f9a4759e22176fa06aa13d8a6ef6a6b2cc82d11bed27b156d6739 SHA512 96665120dbc698c78795eeaa559ae2bfd2a3c7ed4846e40bcfb1d6dfc8d7e359b860e1e715085a17e11c66ce7f31561d372da8372209c21c7b1ce6029a3f5ea1
+DIST marco-1.22.4.tar.xz 1368868 BLAKE2B 45a1bdfa13419f690e4a1604a18f1ef4f57b95cc64c628a8d1c4b8d5a92409eb8ecb946b60c9b9711151858a4668247f2ee031a95464463f3005952edd95265c SHA512 46867396b66453c63624e54c382845b898b10768db0560100f021e57ec80189785093be38eeaf19c50a9e4728de2b6e605267a8f1d5a5596aaa75958c0e3a6b0
+DIST marco-1.24.0.tar.xz 1827076 BLAKE2B e4bcf8584199cbe4f9f813c7512176dd9b84a39ed162cd051f1f174c428828d1d73d6ab64c19ca681f0aea966742e0474256935f2a7c0c490b77dda91147162c SHA512 b257994c097f174fe83f3f0f4d6b6991e8c0f402daffd99f8a9521d588b609c56953e73dd4d143be64f5c9a4caa8d890ff30a120e18a9d5b36c6f856a7190428
diff --git a/x11-wm/marco/marco-1.12.1-r1.ebuild b/x11-wm/marco/marco-1.12.1-r1.ebuild
deleted file mode 100644
index beb7936..0000000
--- a/x11-wm/marco/marco-1.12.1-r1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE2_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="MATE default window manager"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="gtk3 startup-notification test xinerama"
-
-RDEPEND="
-	dev-libs/atk:0
-	>=dev-libs/glib-2.32.10:2
-	>=gnome-base/libgtop-2:2=
-	gnome-extra/zenity:0
-	>=mate-base/mate-desktop-1.9[gtk3(-)=]
-	x11-libs/cairo:0
-	>=x11-libs/pango-1.2:0[X]
-	x11-libs/gdk-pixbuf:2
-	x11-libs/libICE:0
-	x11-libs/libSM:0
-	x11-libs/libX11:0
-	>=x11-libs/libXcomposite-0.3:0
-	x11-libs/libXcursor:0
-	x11-libs/libXdamage:0
-	x11-libs/libXext:0
-	x11-libs/libXfixes:0
-	x11-libs/libXrandr:0
-	x11-libs/libXrender:0
-	>=x11-libs/startup-notification-0.7:0
-	virtual/libintl:0
-	!gtk3? (
-		media-libs/libcanberra:0[gtk]
-		>=x11-libs/gtk+-2.24:2
-	)
-	gtk3? (
-		media-libs/libcanberra:0[gtk3]
-		>=x11-libs/gtk+-3.0:3
-	)
-	xinerama? ( x11-libs/libXinerama:0 )
-	!!x11-wm/mate-window-manager"
-
-DEPEND="${RDEPEND}
-	app-text/yelp-tools:0
-	>=dev-util/intltool-0.34.90:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*
-	x11-proto/xextproto:0
-	x11-proto/xproto:0
-	test? ( app-text/docbook-xml-dtd:4.5 )
-	xinerama? ( x11-proto/xineramaproto:0 )"
-
-src_configure() {
-	mate_src_configure \
-		--enable-compositor \
-		--enable-render \
-		--enable-shape \
-		--enable-sm \
-		--enable-xsync \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_enable startup-notification) \
-		$(use_enable xinerama)
-}
-
-src_install() {
-	mate_src_install
-	dodoc {,doc/}*.txt
-}
diff --git a/x11-wm/marco/marco-1.12.1.ebuild b/x11-wm/marco/marco-1.12.1.ebuild
deleted file mode 100644
index 5de2688..0000000
--- a/x11-wm/marco/marco-1.12.1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE2_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm x86"
-fi
-
-DESCRIPTION="MATE default window manager"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="gtk3 startup-notification test xinerama"
-
-RDEPEND="
-	dev-libs/atk:0
-	>=dev-libs/glib-2.32.10:2
-	>=gnome-base/libgtop-2:2=
-	gnome-extra/zenity:0
-	x11-libs/cairo:0
-	>=x11-libs/pango-1.2:0[X]
-	x11-libs/gdk-pixbuf:2
-	x11-libs/libICE:0
-	x11-libs/libSM:0
-	x11-libs/libX11:0
-	>=x11-libs/libXcomposite-0.3:0
-	x11-libs/libXcursor:0
-	x11-libs/libXdamage:0
-	x11-libs/libXext:0
-	x11-libs/libXfixes:0
-	x11-libs/libXrandr:0
-	x11-libs/libXrender:0
-	>=x11-libs/startup-notification-0.7:0
-	virtual/libintl:0
-	!gtk3? (
-		media-libs/libcanberra:0[gtk]
-		>=x11-libs/gtk+-2.24:2
-	)
-	gtk3? (
-		media-libs/libcanberra:0[gtk3]
-		>=x11-libs/gtk+-3.0:3
-	)
-	xinerama? ( x11-libs/libXinerama:0 )
-	!!x11-wm/mate-window-manager"
-
-DEPEND="${RDEPEND}
-	app-text/yelp-tools:0
-	>=dev-util/intltool-0.34.90:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*
-	x11-proto/xextproto:0
-	x11-proto/xproto:0
-	test? ( app-text/docbook-xml-dtd:4.5 )
-	xinerama? ( x11-proto/xineramaproto:0 )"
-
-src_configure() {
-	mate_src_configure \
-		--enable-compositor \
-		--enable-render \
-		--enable-shape \
-		--enable-sm \
-		--enable-xsync \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_enable startup-notification) \
-		$(use_enable xinerama)
-}
-
-src_install() {
-	mate_src_install
-	dodoc {,doc/}*.txt
-}
diff --git a/x11-wm/marco/marco-1.14.2-r1.ebuild b/x11-wm/marco/marco-1.14.2-r1.ebuild
deleted file mode 100644
index 5cdf56c..0000000
--- a/x11-wm/marco/marco-1.14.2-r1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE2_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="MATE default window manager"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="gtk3 startup-notification test xinerama"
-
-COMMON_DEPEND="
-	dev-libs/atk:0
-	>=dev-libs/glib-2.32.10:2
-	>=gnome-base/libgtop-2:2=
-	x11-libs/cairo:0
-	>=x11-libs/pango-1.2:0[X]
-	x11-libs/gdk-pixbuf:2
-	x11-libs/libICE:0
-	x11-libs/libSM:0
-	x11-libs/libX11:0
-	>=x11-libs/libXcomposite-0.3:0
-	x11-libs/libXcursor:0
-	x11-libs/libXdamage:0
-	x11-libs/libXext:0
-	x11-libs/libXfixes:0
-	x11-libs/libXrandr:0
-	x11-libs/libXrender:0
-	>=x11-libs/startup-notification-0.7:0
-	virtual/libintl:0
-	!gtk3? (
-		media-libs/libcanberra:0[gtk]
-		>=x11-libs/gtk+-2.24:2
-	)
-	gtk3? (
-		media-libs/libcanberra:0[gtk3]
-		>=x11-libs/gtk+-3.0:3
-	)
-	xinerama? ( x11-libs/libXinerama:0 )
-	!!x11-wm/mate-window-manager"
-
-RDEPEND="${COMMON_DEPEND}
-	gnome-extra/zenity:0
-	>=mate-base/mate-desktop-1.9[gtk3(-)=]
-"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/yelp-tools:0
-	>=dev-util/intltool-0.34.90:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*
-	x11-proto/xextproto:0
-	x11-proto/xproto:0
-	test? ( app-text/docbook-xml-dtd:4.5 )
-	xinerama? ( x11-proto/xineramaproto:0 )"
-
-src_configure() {
-	mate_src_configure \
-		--enable-compositor \
-		--enable-render \
-		--enable-shape \
-		--enable-sm \
-		--enable-xsync \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_enable startup-notification) \
-		$(use_enable xinerama)
-}
-
-src_install() {
-	mate_src_install
-	dodoc {,doc/}*.txt
-}
diff --git a/x11-wm/marco/marco-1.16.0-r1.ebuild b/x11-wm/marco/marco-1.16.0-r1.ebuild
deleted file mode 100644
index 5cdf56c..0000000
--- a/x11-wm/marco/marco-1.16.0-r1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE2_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="MATE default window manager"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="gtk3 startup-notification test xinerama"
-
-COMMON_DEPEND="
-	dev-libs/atk:0
-	>=dev-libs/glib-2.32.10:2
-	>=gnome-base/libgtop-2:2=
-	x11-libs/cairo:0
-	>=x11-libs/pango-1.2:0[X]
-	x11-libs/gdk-pixbuf:2
-	x11-libs/libICE:0
-	x11-libs/libSM:0
-	x11-libs/libX11:0
-	>=x11-libs/libXcomposite-0.3:0
-	x11-libs/libXcursor:0
-	x11-libs/libXdamage:0
-	x11-libs/libXext:0
-	x11-libs/libXfixes:0
-	x11-libs/libXrandr:0
-	x11-libs/libXrender:0
-	>=x11-libs/startup-notification-0.7:0
-	virtual/libintl:0
-	!gtk3? (
-		media-libs/libcanberra:0[gtk]
-		>=x11-libs/gtk+-2.24:2
-	)
-	gtk3? (
-		media-libs/libcanberra:0[gtk3]
-		>=x11-libs/gtk+-3.0:3
-	)
-	xinerama? ( x11-libs/libXinerama:0 )
-	!!x11-wm/mate-window-manager"
-
-RDEPEND="${COMMON_DEPEND}
-	gnome-extra/zenity:0
-	>=mate-base/mate-desktop-1.9[gtk3(-)=]
-"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/yelp-tools:0
-	>=dev-util/intltool-0.34.90:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*
-	x11-proto/xextproto:0
-	x11-proto/xproto:0
-	test? ( app-text/docbook-xml-dtd:4.5 )
-	xinerama? ( x11-proto/xineramaproto:0 )"
-
-src_configure() {
-	mate_src_configure \
-		--enable-compositor \
-		--enable-render \
-		--enable-shape \
-		--enable-sm \
-		--enable-xsync \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_enable startup-notification) \
-		$(use_enable xinerama)
-}
-
-src_install() {
-	mate_src_install
-	dodoc {,doc/}*.txt
-}
diff --git a/x11-wm/marco/marco-1.16.1.ebuild b/x11-wm/marco/marco-1.16.1.ebuild
deleted file mode 100644
index 5cdf56c..0000000
--- a/x11-wm/marco/marco-1.16.1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE2_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="MATE default window manager"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="gtk3 startup-notification test xinerama"
-
-COMMON_DEPEND="
-	dev-libs/atk:0
-	>=dev-libs/glib-2.32.10:2
-	>=gnome-base/libgtop-2:2=
-	x11-libs/cairo:0
-	>=x11-libs/pango-1.2:0[X]
-	x11-libs/gdk-pixbuf:2
-	x11-libs/libICE:0
-	x11-libs/libSM:0
-	x11-libs/libX11:0
-	>=x11-libs/libXcomposite-0.3:0
-	x11-libs/libXcursor:0
-	x11-libs/libXdamage:0
-	x11-libs/libXext:0
-	x11-libs/libXfixes:0
-	x11-libs/libXrandr:0
-	x11-libs/libXrender:0
-	>=x11-libs/startup-notification-0.7:0
-	virtual/libintl:0
-	!gtk3? (
-		media-libs/libcanberra:0[gtk]
-		>=x11-libs/gtk+-2.24:2
-	)
-	gtk3? (
-		media-libs/libcanberra:0[gtk3]
-		>=x11-libs/gtk+-3.0:3
-	)
-	xinerama? ( x11-libs/libXinerama:0 )
-	!!x11-wm/mate-window-manager"
-
-RDEPEND="${COMMON_DEPEND}
-	gnome-extra/zenity:0
-	>=mate-base/mate-desktop-1.9[gtk3(-)=]
-"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/yelp-tools:0
-	>=dev-util/intltool-0.34.90:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*
-	x11-proto/xextproto:0
-	x11-proto/xproto:0
-	test? ( app-text/docbook-xml-dtd:4.5 )
-	xinerama? ( x11-proto/xineramaproto:0 )"
-
-src_configure() {
-	mate_src_configure \
-		--enable-compositor \
-		--enable-render \
-		--enable-shape \
-		--enable-sm \
-		--enable-xsync \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_enable startup-notification) \
-		$(use_enable xinerama)
-}
-
-src_install() {
-	mate_src_install
-	dodoc {,doc/}*.txt
-}
diff --git a/x11-wm/marco/marco-1.22.1-r1.ebuild b/x11-wm/marco/marco-1.22.1-r1.ebuild
new file mode 100644
index 0000000..2bc660e
--- /dev/null
+++ b/x11-wm/marco/marco-1.22.1-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MATE2_LA_PUNT="yes"
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="amd64 ~arm ~arm64 x86"
+fi
+
+DESCRIPTION="MATE default window manager"
+LICENSE="FDL-1.2+ GPL-2+ LGPL-2+ MIT"
+SLOT="0"
+
+IUSE="startup-notification test xinerama"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	dev-libs/atk
+	>=dev-libs/glib-2.50:2
+	>=gnome-base/libgtop-2:2=
+	media-libs/libcanberra[gtk3]
+	x11-libs/cairo
+	>=x11-libs/pango-1.2[X]
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.22:3
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	>=x11-libs/libXcomposite-0.3
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXpresent
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	>=x11-libs/startup-notification-0.7
+	virtual/libintl
+	xinerama? ( x11-libs/libXinerama )
+	!!x11-wm/mate-window-manager"
+
+RDEPEND="${COMMON_DEPEND}
+	gnome-extra/zenity
+	>=mate-base/mate-desktop-1.20.0"
+
+DEPEND="${COMMON_DEPEND}
+	app-text/yelp-tools
+	>=dev-util/intltool-0.34.90
+	sys-devel/gettext:*
+	virtual/pkgconfig:*
+	x11-base/xorg-proto
+	test? ( app-text/docbook-xml-dtd:4.5 )
+	xinerama? ( x11-base/xorg-proto )"
+
+src_configure() {
+	mate_src_configure \
+		--enable-compositor \
+		--enable-render \
+		--enable-shape \
+		--enable-sm \
+		--enable-xsync \
+		$(use_enable startup-notification) \
+		$(use_enable xinerama)
+}
+
+src_install() {
+	mate_src_install
+	dodoc {,doc/}*.txt
+}
diff --git a/x11-wm/marco/marco-1.18.2.ebuild b/x11-wm/marco/marco-1.22.2.ebuild
index 58b0255..a693ad0 100644
--- a/x11-wm/marco/marco-1.18.2.ebuild
+++ b/x11-wm/marco/marco-1.22.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,48 +12,49 @@ if [[ ${PV} != 9999 ]]; then
 fi
 
 DESCRIPTION="MATE default window manager"
-LICENSE="GPL-2"
+LICENSE="FDL-1.2+ GPL-2+ LGPL-2+ MIT"
 SLOT="0"
 
 IUSE="startup-notification test xinerama"
+RESTRICT="!test? ( test )"
 
 COMMON_DEPEND="
-	dev-libs/atk:0
-	>=dev-libs/glib-2.32.10:2
+	dev-libs/atk
+	>=dev-libs/glib-2.50:2
 	>=gnome-base/libgtop-2:2=
-	media-libs/libcanberra:0[gtk3]
-	x11-libs/cairo:0
-	>=x11-libs/pango-1.2:0[X]
+	media-libs/libcanberra[gtk3]
+	x11-libs/cairo
+	>=x11-libs/pango-1.2[X]
 	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.0:3
-	x11-libs/libICE:0
-	x11-libs/libSM:0
-	x11-libs/libX11:0
-	>=x11-libs/libXcomposite-0.3:0
-	x11-libs/libXcursor:0
-	x11-libs/libXdamage:0
-	x11-libs/libXext:0
-	x11-libs/libXfixes:0
-	x11-libs/libXrandr:0
-	x11-libs/libXrender:0
-	>=x11-libs/startup-notification-0.7:0
-	virtual/libintl:0
-	xinerama? ( x11-libs/libXinerama:0 )
+	>=x11-libs/gtk+-3.22:3
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	>=x11-libs/libXcomposite-0.3
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXpresent
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	>=x11-libs/startup-notification-0.7
+	virtual/libintl
+	xinerama? ( x11-libs/libXinerama )
 	!!x11-wm/mate-window-manager"
 
 RDEPEND="${COMMON_DEPEND}
-	gnome-extra/zenity:0
-	>=mate-base/mate-desktop-1.17.0"
+	gnome-extra/zenity
+	>=mate-base/mate-desktop-1.20.0"
 
 DEPEND="${COMMON_DEPEND}
-	app-text/yelp-tools:0
-	>=dev-util/intltool-0.34.90:*
+	app-text/yelp-tools
+	>=dev-util/intltool-0.34.90
 	sys-devel/gettext:*
 	virtual/pkgconfig:*
-	x11-proto/xextproto:0
-	x11-proto/xproto:0
+	x11-base/xorg-proto
 	test? ( app-text/docbook-xml-dtd:4.5 )
-	xinerama? ( x11-proto/xineramaproto:0 )"
+	xinerama? ( x11-base/xorg-proto )"
 
 src_configure() {
 	mate_src_configure \
diff --git a/x11-wm/marco/marco-1.22.4.ebuild b/x11-wm/marco/marco-1.22.4.ebuild
new file mode 100644
index 0000000..a693ad0
--- /dev/null
+++ b/x11-wm/marco/marco-1.22.4.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MATE2_LA_PUNT="yes"
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+DESCRIPTION="MATE default window manager"
+LICENSE="FDL-1.2+ GPL-2+ LGPL-2+ MIT"
+SLOT="0"
+
+IUSE="startup-notification test xinerama"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	dev-libs/atk
+	>=dev-libs/glib-2.50:2
+	>=gnome-base/libgtop-2:2=
+	media-libs/libcanberra[gtk3]
+	x11-libs/cairo
+	>=x11-libs/pango-1.2[X]
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.22:3
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	>=x11-libs/libXcomposite-0.3
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXpresent
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	>=x11-libs/startup-notification-0.7
+	virtual/libintl
+	xinerama? ( x11-libs/libXinerama )
+	!!x11-wm/mate-window-manager"
+
+RDEPEND="${COMMON_DEPEND}
+	gnome-extra/zenity
+	>=mate-base/mate-desktop-1.20.0"
+
+DEPEND="${COMMON_DEPEND}
+	app-text/yelp-tools
+	>=dev-util/intltool-0.34.90
+	sys-devel/gettext:*
+	virtual/pkgconfig:*
+	x11-base/xorg-proto
+	test? ( app-text/docbook-xml-dtd:4.5 )
+	xinerama? ( x11-base/xorg-proto )"
+
+src_configure() {
+	mate_src_configure \
+		--enable-compositor \
+		--enable-render \
+		--enable-shape \
+		--enable-sm \
+		--enable-xsync \
+		$(use_enable startup-notification) \
+		$(use_enable xinerama)
+}
+
+src_install() {
+	mate_src_install
+	dodoc {,doc/}*.txt
+}
diff --git a/x11-wm/marco/marco-1.24.0.ebuild b/x11-wm/marco/marco-1.24.0.ebuild
new file mode 100644
index 0000000..10f95fe
--- /dev/null
+++ b/x11-wm/marco/marco-1.24.0.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MATE2_LA_PUNT="yes"
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+DESCRIPTION="MATE default window manager"
+LICENSE="FDL-1.2+ GPL-2+ LGPL-2+ MIT"
+SLOT="0"
+
+IUSE="startup-notification test xinerama"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	dev-libs/atk
+	>=dev-libs/glib-2.58:2
+	>=gnome-base/libgtop-2:2=
+	media-libs/libcanberra[gtk3]
+	x11-libs/cairo
+	>=x11-libs/pango-1.2[X]
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.22:3
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	>=x11-libs/libXcomposite-0.3
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXpresent
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	>=x11-libs/startup-notification-0.7
+	xinerama? ( x11-libs/libXinerama )
+	!!x11-wm/mate-window-manager"
+
+RDEPEND="${COMMON_DEPEND}
+	gnome-extra/zenity
+	>=mate-base/mate-desktop-1.20.0
+	virtual/libintl
+"
+
+DEPEND="${COMMON_DEPEND}
+	app-text/yelp-tools
+	>=sys-devel/gettext-0.19.8:*
+	>=sys-devel/libtool-2.0.0
+	virtual/pkgconfig:*
+	x11-base/xorg-proto
+	test? ( app-text/docbook-xml-dtd:4.5 )
+	xinerama? ( x11-base/xorg-proto )"
+
+src_configure() {
+	mate_src_configure \
+		--enable-compositor \
+		--enable-render \
+		--enable-shape \
+		--enable-sm \
+		--enable-xsync \
+		$(use_enable startup-notification) \
+		$(use_enable xinerama)
+}
+
+src_install() {
+	mate_src_install
+	dodoc doc/*.txt
+}
diff --git a/x11-wm/marco/marco-9999.ebuild b/x11-wm/marco/marco-9999.ebuild
index c662c1e..10f95fe 100644
--- a/x11-wm/marco/marco-9999.ebuild
+++ b/x11-wm/marco/marco-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,52 +8,54 @@ MATE2_LA_PUNT="yes"
 inherit mate
 
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 
 DESCRIPTION="MATE default window manager"
-LICENSE="GPL-2"
+LICENSE="FDL-1.2+ GPL-2+ LGPL-2+ MIT"
 SLOT="0"
 
 IUSE="startup-notification test xinerama"
+RESTRICT="!test? ( test )"
 
 COMMON_DEPEND="
-	dev-libs/atk:0
-	>=dev-libs/glib-2.32.10:2
+	dev-libs/atk
+	>=dev-libs/glib-2.58:2
 	>=gnome-base/libgtop-2:2=
-	media-libs/libcanberra:0[gtk3]
-	x11-libs/cairo:0
-	>=x11-libs/pango-1.2:0[X]
+	media-libs/libcanberra[gtk3]
+	x11-libs/cairo
+	>=x11-libs/pango-1.2[X]
 	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.0:3
-	x11-libs/libICE:0
-	x11-libs/libSM:0
-	x11-libs/libX11:0
-	>=x11-libs/libXcomposite-0.3:0
-	x11-libs/libXcursor:0
-	x11-libs/libXdamage:0
-	x11-libs/libXext:0
-	x11-libs/libXfixes:0
-	x11-libs/libXrandr:0
-	x11-libs/libXrender:0
-	>=x11-libs/startup-notification-0.7:0
-	virtual/libintl:0
-	xinerama? ( x11-libs/libXinerama:0 )
+	>=x11-libs/gtk+-3.22:3
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	>=x11-libs/libXcomposite-0.3
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXpresent
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	>=x11-libs/startup-notification-0.7
+	xinerama? ( x11-libs/libXinerama )
 	!!x11-wm/mate-window-manager"
 
 RDEPEND="${COMMON_DEPEND}
-	gnome-extra/zenity:0
-	>=mate-base/mate-desktop-1.17.0"
+	gnome-extra/zenity
+	>=mate-base/mate-desktop-1.20.0
+	virtual/libintl
+"
 
 DEPEND="${COMMON_DEPEND}
-	app-text/yelp-tools:0
-	>=dev-util/intltool-0.34.90:*
-	sys-devel/gettext:*
+	app-text/yelp-tools
+	>=sys-devel/gettext-0.19.8:*
+	>=sys-devel/libtool-2.0.0
 	virtual/pkgconfig:*
-	x11-proto/xextproto:0
-	x11-proto/xproto:0
+	x11-base/xorg-proto
 	test? ( app-text/docbook-xml-dtd:4.5 )
-	xinerama? ( x11-proto/xineramaproto:0 )"
+	xinerama? ( x11-base/xorg-proto )"
 
 src_configure() {
 	mate_src_configure \
@@ -68,5 +70,5 @@ src_configure() {
 
 src_install() {
 	mate_src_install
-	dodoc {,doc/}*.txt
+	dodoc doc/*.txt
 }
diff --git a/x11-wm/marco/metadata.xml b/x11-wm/marco/metadata.xml
index e500955..cfe84ac 100644
--- a/x11-wm/marco/metadata.xml
+++ b/x11-wm/marco/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/marco</remote-id>
 	</upstream>