gentoo resync : 18.05.2019

20 files changed, 275 insertions, 327 deletions

diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index 6a6e85a19f16..758c8fe6a147 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/awesome/Manifest b/x11-wm/awesome/Manifest
index e029c9d332a3..776cde80063f 100644
--- a/x11-wm/awesome/Manifest
+++ b/x11-wm/awesome/Manifest
@@ -13,7 +13,7 @@ DIST awesome-3.5.9.tar.xz 723084 BLAKE2B 96f4c5df98147399f28d1b1455ac53800f22229
 DIST awesome-4.2.tar.xz 987024 BLAKE2B b2aaa993bafa83121d165d21083dfcac825e373be9547490f8b93b8e8b0f90470395a0238affaf9990f719b8bd2f36a255f6468b6422406787a3c96946c4e831 SHA512 134dd3625c86243861b3d0701cc8bfd8c00986d7027f0832016c3f5e59e6b9a1ef2f677bb0d1d66ece63449533e4b13d8d7388e96e6f9014212030a79f163e09
 DIST awesome-4.3.tar.xz 1037816 BLAKE2B b4afc5e7bfb01ddc16b67776cc00dd7b0bcbefc9d17f9bec9c04256953858aef2bf0e4b15a525909029b7da771ade0d749758aba2878832f356d7b2c4f0363b7 SHA512 c5ef1e8dc593e7783b895d22143154aea8f211beeda24672a7ee4ed5112b4f4284043f848a151f3d3c4f569e91308670367a4353f705b20511b36495b22fa3f5
 EBUILD awesome-3.5.9-r2.ebuild 3120 BLAKE2B 71d1668a910bc570389cd9fdba9cf948c6937c53fb335df8d5cc8ab7fbc6811e0635895094be3fd67a49e4a7a43a7cc602d88a9b33534ffc6d6b684911ccc858 SHA512 c4c0d39f617c3cdede84786e4fc8a7c4f01b4e329a06d092a09a773af3be42dd0c28e6178f294710579737f3d441ef4f7cd88fd7afb1e1acfe2279ad81192ac4
-EBUILD awesome-4.2-r2.ebuild 4049 BLAKE2B 1e26ff62f5d79b790ce1d625b0a851335850dc1aeab475624d7390d6654e49c2babef35aa722556d8dbb6da19b556cfcf27c7f216dfd48886ed197c738f27d45 SHA512 914b169616d473a64b1c2c054dc69fc0d8a1fc429851748d90b0cade001d4c5cba188731247c32e8bac7da53b3da8b6dded8a16f0c591fc114b52d62a5282ca6
+EBUILD awesome-4.2-r2.ebuild 4048 BLAKE2B c346c0cee0af4e95becc345b7d30254df0db768ecf3d84c10fa22fb9b2cab14fba30144027b6f9f2d89a27b8e5aab69e46d94bda9961e871def26e07f4f77c33 SHA512 2779eab46b8f93eff87ff3cd540252dec968e714731c3068effae90b7f7f4e2a8c36474a6e1beb696ef2060d096e6a4adee42b4ed930d583dc812d9ea601e15f
 EBUILD awesome-4.3.ebuild 3696 BLAKE2B 2ecc88fe2aeccff7b40ee66b01e3d332a3a9e5efbf796fb04ec6bca266853c296abda8f5fa657efcbc2b752a75e13ebc27f706b4569ca45f07939a81c1d3aa33 SHA512 be1923652935a8fa73b07a9cb3f718a6909f20d85edc85a476f26c554b989167730c429aa7694c11190f7fb04d9f29e071c27a3362b7f66a3edc9e04dd4949fa
 EBUILD awesome-9999.ebuild 3612 BLAKE2B a7069d2671acfa6ca3c4d03fd1da6a89a794bd703c86889e082d8c6cb9bbbf1709f59d89264569b3f3d58315b1ffde3d0bef3aec925509dd47268c086c799aed SHA512 50a0836b211d4dab36b294e4a42a4775f6b84584bd5acb9aed3e45835b2089fdb85bfb5449d4ac5632de4a4d3992f285527756909bd25097e00dd8a7fe8891eb
 MISC metadata.xml 331 BLAKE2B 177b7ac838fb250b847c6a596c17e7a998715672112462c6c438ec15442b32d2402d87da6d4578e2b78d7bd2a16671a7df7974bebb645e0892bb3f785f95937a SHA512 14550c266d8de65db614c3f0893da85487656bef5166a2829e8a2bc636c50bbd1a505ff7972bc6c5ca553bdcb35caeb1dc4697171d4810ec9fe73420f880ebea
diff --git a/x11-wm/awesome/awesome-4.2-r2.ebuild b/x11-wm/awesome/awesome-4.2-r2.ebuild
index 230313463011..19707b82ac5a 100644
--- a/x11-wm/awesome/awesome-4.2-r2.ebuild
+++ b/x11-wm/awesome/awesome-4.2-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/awesomeWM/awesome-releases/raw/master/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd"
 IUSE="dbus doc elibc_FreeBSD gnome luajit test"
 RESTRICT="test"
 
diff --git a/x11-wm/enlightenment/Manifest b/x11-wm/enlightenment/Manifest
index 645bc6083d0d..0cc9e051ad3f 100644
--- a/x11-wm/enlightenment/Manifest
+++ b/x11-wm/enlightenment/Manifest
@@ -1,6 +1,8 @@
+AUX enlightenment-0.22.4-efl-1.22-wayland.patch 2288 BLAKE2B 6e8a9f4d47318372c06a74bb6e3c233c36f9e57332519e706602a0472285e0b249c45d3d6fbd3074d6d720f157b6ddcf1a37da60b60f52908ee0f006a9e11239 SHA512 7ba3e501d7df99aa3f0336c1db09edaf5b2acd9eb6d2ad4f8465d92c595edd2b85e6a16c1408dc75502d73778cd2634ce2f409319887f6e53707208cd4128335
 AUX gentoo-sysactions.conf 3056 BLAKE2B 155b0826c544a5a4829214b4b43d49e2dad455d041f0afc7077dc44780d12bd1a99a1bc94bb5a4a9ba21f59f679e1d4c82609791ee5a5e9828543b1e9154fae5 SHA512 688f02cbff0d50a847eb08ca7832699b836adca9b22e15a780943a8e5a8213aac04b335cfdf3cb96adbff238f681ae8954a720153e8e35b2afaba3225d53206a
 DIST enlightenment-0.22.3.tar.xz 25648576 BLAKE2B 1abb1fab18c5932b65f1183875bbe0955ce1d608758af0855c550f5581c774bd19dd0b6c8dd8c724b668ff843e1ed4928531f30b60436d9182a07a65fa2af9e3 SHA512 01a9386ee009c76c46cee7176cdeb7f4e97977bdd5014caa51cceeff228ad72f97a362d1eff7e0240e3e2df8b24a6c9d1516c8ab05bd82d288abcfde0d171abd
 DIST enlightenment-0.22.4.tar.xz 25656972 BLAKE2B 5e24e226e5f9295d27658656aefaf39cc80ad3634ba1937ef1a3c8e1adeba8cf3cbab2c43cb9e80ac298107a7a64e248ff252084b19c26a974ffff9eb9e6c3fa SHA512 9f4366bfed4d65e7baaeffd4f5b8ba6febf6f9888e6156dd3e100c9fca42c377f76f156f3dd1f6ab97745ffcb69e1e8d320937e41333797580624a9b74d298ba
 EBUILD enlightenment-0.22.3.ebuild 2761 BLAKE2B afd66034af88b166bec62657b0d5d058697178fb42f94184f6bf099526d1755ba317fd96142a9ddd7590bcc65548b30fa06e1db75828fee67583e6bfcb270612 SHA512 5a32871dfa8c5671efc1870249411ca1ecd3b61737cdf11b7f662006293456083ea95223ea2e8b5033952fa1d96494ca437f1a24c34fcfc6c8d99cc400ab275f
+EBUILD enlightenment-0.22.4-r1.ebuild 2202 BLAKE2B 452b356c54a8f77a1cc81b8ec7cd9417f62c19a836c7ca2e1c3896ecdce46134c866c50d7ac033fa335a80f9622318fcf8c90185705292124eed3562dd8029f2 SHA512 b2388a95bb84e8e63ba500514360d144549816125465a33b1494f1f6a3ac6a4804d41672017d6df9dae440e37f4c38e030214254447167c5edf30001a6cca1a3
 EBUILD enlightenment-0.22.4.ebuild 2188 BLAKE2B e5edf01ab49f61a0318e0669f9193482bd713e3bdae5167f73d69d1eedfd3f233dec84f02711fbc39f59d3ef592ff1c1406ea605ed2f541e55a913c35f6ff8b6 SHA512 6082de94db744272db7ea7f767b6c3ef5d4320cabdd65c724248f17ba995c4ca9d914374101b6449a201275adc20ad4d580d59f40b3bdab4e853559467869a78
-MISC metadata.xml 823 BLAKE2B b52bcbb857584b986c8b371cbc8d743cbb6510817c93bce44b46bd42025a35b7d3f98ce3e409b37f2f2da32228e8daa6baa7a8408b4a223d735113a857197351 SHA512 8a31834065385bed8e7e5ce79dbdd53e8f3a321cfd0c386bf30c4951d2212c6aaac8712f643f442ce566ad22726d157964919c570fc4b897230039558c56b1b2
+MISC metadata.xml 892 BLAKE2B 05d547df7e3f87b0e2d32bb7c3a0b30ad1b233778081c3595071fccdd5124b263d3a34de09c880f79199885b8da4a3c6cd499304ccd249cea9b764be4ba84bf3 SHA512 79cf7b40de376a2d3344d3e76cdb632bad71162814a9039f322ce12ce8473da3398fcc6aecad188a592dcd31ec7d32ce1563955e057c0750c4ed0e68b7551022
diff --git a/x11-wm/enlightenment/enlightenment-0.22.4-r1.ebuild b/x11-wm/enlightenment/enlightenment-0.22.4-r1.ebuild
new file mode 100644
index 000000000000..99d2165d2e07
--- /dev/null
+++ b/x11-wm/enlightenment/enlightenment-0.22.4-r1.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson xdg-utils
+
+DESCRIPTION="Enlightenment window manager"
+HOMEPAGE="https://www.enlightenment.org"
+SRC_URI="https://download.enlightenment.org/rel/apps/${PN}/${P}.tar.xz"
+
+LICENSE="BSD-2"
+SLOT="0.17/${PV%%_*}"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+IUSE="acpi bluetooth connman doc geolocation nls packagekit pam systemd udisks wayland wifi xwayland"
+
+REQUIRED_USE="xwayland? ( wayland )"
+
+RDEPEND="
+	>=dev-libs/efl-1.20.5[eet,X]
+	virtual/udev
+	x11-libs/libXext
+	x11-libs/libxcb
+	x11-libs/xcb-util-keysyms
+	x11-misc/xkeyboard-config
+	acpi? ( sys-power/acpid )
+	bluetooth? ( net-wireless/bluez )
+	connman? ( dev-libs/efl[connman] )
+	geolocation? ( app-misc/geoclue:2.0 )
+	packagekit? ( app-admin/packagekit-base )
+	pam? ( sys-libs/pam )
+	systemd? ( sys-apps/systemd )
+	udisks? ( sys-fs/udisks:2 )
+	wayland? (
+		>=dev-libs/efl-1.22.0[drm,wayland]
+		dev-libs/wayland
+		x11-libs/libxkbcommon
+		x11-libs/pixman
+	)
+	xwayland? (
+		dev-libs/efl[X,wayland]
+		x11-base/xorg-server[wayland]
+	)
+"
+BDEPEND="
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-efl-1.22-wayland.patch" )
+
+src_configure() {
+	local emesonargs=(
+		-D device-udev=true
+		-D install-sysactions=false
+
+		$(meson_use udisks mount-udisks)
+		$(meson_use bluetooth bluez4)
+		$(meson_use connman)
+		$(meson_use geolocation)
+		$(meson_use nls)
+		$(meson_use packagekit)
+		$(meson_use pam)
+		$(meson_use systemd)
+		$(meson_use wayland)
+		$(meson_use wifi wireless)
+		$(meson_use xwayland)
+	)
+
+	if ! use wayland; then
+		emesonargs+=(
+			-D wl-buffer=false
+			-D wl-desktop-shell=false
+			-D wl-drm=false
+			-D wl-text-input=false
+			-D wl-weekeyboard=false
+			-D wl-wl=false
+			-D wl-x11=false
+		)
+	fi
+
+	meson_src_configure
+}
+
+src_install() {
+	insinto /etc/enlightenment
+	newins "${FILESDIR}"/gentoo-sysactions.conf sysactions.conf
+
+	use doc && local HTML_DOCS=( doc/. )
+	meson_src_install
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/x11-wm/enlightenment/files/enlightenment-0.22.4-efl-1.22-wayland.patch b/x11-wm/enlightenment/files/enlightenment-0.22.4-efl-1.22-wayland.patch
new file mode 100644
index 000000000000..3321390cf62a
--- /dev/null
+++ b/x11-wm/enlightenment/files/enlightenment-0.22.4-efl-1.22-wayland.patch
@@ -0,0 +1,65 @@
+From ea3f6ed68f948cea4b64432a6cdb72fca85e6987 Mon Sep 17 00:00:00 2001
+From: "Carsten Haitzler (Rasterman)" <raster@rasterman.com>
+Date: Fri, 22 Feb 2019 11:12:00 +0000
+Subject: e - unbreak build due to efl changes
+
+---
+ src/bin/e.h         | 1 +
+ src/bin/e_comp_wl.c | 8 ++++----
+ 2 files changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/src/bin/e.h b/src/bin/e.h
+index 7d00d819e..abe5ed731 100644
+--- a/src/bin/e.h
++++ b/src/bin/e.h
+@@ -17,6 +17,7 @@
+ # endif
+ 
+ #ifdef HAVE_WAYLAND
++# define EFL_EO_API_SUPPORT
+ # define EFL_BETA_API_SUPPORT
+ #endif
+ 
+diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c
+index a9adad104..e56e4e6f8 100644
+--- a/src/bin/e_comp_wl.c
++++ b/src/bin/e_comp_wl.c
+@@ -2188,7 +2188,7 @@ _cb_early_frame_cb(void *data, const Efl_Event *event EINA_UNUSED)
+    if (ec->comp_data->early_frame++ > 15)
+      {
+        ec->comp_data->early_frame = 0;
+-       efl_event_callback_del(e_comp->evas, EFL_EVENT_ANIMATOR_TICK,
++       efl_event_callback_del(e_comp->evas, EFL_CANVAS_OBJECT_EVENT_ANIMATOR_TICK,
+                               _cb_early_frame_cb, data);
+      }
+ }
+@@ -2198,14 +2198,14 @@ _e_comp_wl_surface_early_frame(E_Client *ec)
+ {
+    if (e_comp_object_damage_exists(ec->frame))
+      {
+-        efl_event_callback_del(e_comp->evas, EFL_EVENT_ANIMATOR_TICK,
++        efl_event_callback_del(e_comp->evas, EFL_CANVAS_OBJECT_EVENT_ANIMATOR_TICK,
+                                _cb_early_frame_cb, ec);
+         ec->comp_data->early_frame = 0;
+         return;
+      }
+    if (ec->on_post_updates) return;
+    if (!ec->comp_data->early_frame)
+-       efl_event_callback_add(e_comp->evas, EFL_EVENT_ANIMATOR_TICK,
++       efl_event_callback_add(e_comp->evas, EFL_CANVAS_OBJECT_EVENT_ANIMATOR_TICK,
+                               _cb_early_frame_cb, ec);
+    ec->comp_data->early_frame = 1;
+ }
+@@ -2582,7 +2582,7 @@ _e_comp_wl_client_cb_del(void *data EINA_UNUSED, E_Client *ec)
+    /* make sure this is a wayland client */
+    if (e_pixmap_type_get(ec->pixmap) != E_PIXMAP_TYPE_WL) return;
+ 
+-   efl_event_callback_del(e_comp->evas, EFL_EVENT_ANIMATOR_TICK,
++   efl_event_callback_del(e_comp->evas, EFL_CANVAS_OBJECT_EVENT_ANIMATOR_TICK,
+                           _cb_early_frame_cb, ec);
+    ec->comp_data->early_frame = 0;
+ 
+-- 
+cgit v1.2.1
+
+
diff --git a/x11-wm/enlightenment/metadata.xml b/x11-wm/enlightenment/metadata.xml
index f29f0f98962f..aca5ea1b717c 100644
--- a/x11-wm/enlightenment/metadata.xml
+++ b/x11-wm/enlightenment/metadata.xml
@@ -10,6 +10,7 @@
   </maintainer>
   <use>
     <flag name="packagekit">Enable module for package manager integration</flag>
+    <flag name="xwayland">Enable XWayland application support</flag>
   </use>
   <longdescription>
     Enlightenment is classed as a "desktop shell" as it provides everything you need to 
diff --git a/x11-wm/fvwm/Manifest b/x11-wm/fvwm/Manifest
index 6220cc7eb8b5..b2c5e834ab49 100644
--- a/x11-wm/fvwm/Manifest
+++ b/x11-wm/fvwm/Manifest
@@ -2,9 +2,9 @@ AUX README.translucency 3723 BLAKE2B aae37e9dbdf8f7b730b6947d55f0e286c1269d5cacc
 AUX fvwm-2.5.27-translucent-menus.diff 15765 BLAKE2B 85623d5d671d97842ffe819ddfa1045b91ef76101ccf8cc6fdf4854c1675b397715977efafb174e340c487bafed12677a1cacb83e201424a9fed43bdfa7f8475 SHA512 92f78b624ea2bfddb88f825f40930a0a7e4bb1d284276e62985f189cd5b72ee8a92131f7d2a91efdbf508fc8ef002f5b4168188b12b0e23e28fb1ebec471969d
 AUX fvwm-2.6.5-ar.patch 1077 BLAKE2B ebd3226a706087c7e7f7935a9862c59e628551e19be66d110441075839484b6bb26667104090258267b3e484c6fc0b0650349488902d216f3cf841c23e45b59e SHA512 fc66ee5c79b96860705d72b18aab3f8c8f8ad84fead47c4f8f944474a6bfbe0569ee08aa51e8a4d7982541eecd5c302499f99ebf8568f4b4fb1c9e2369233e45
 AUX fvwm-2.6.5-mouse-buttons.patch 519 BLAKE2B 23b31933e9dcc456d73be15573226017fc213da59156040136ff447b208b45691fca00b5d16cdaf57ab8411e2834d759b3bb7e53550b13ec72de4b7f70486abb SHA512 d28a9724697859ca7beac1cc2813c12413654e1c0749297c34fb0ef8bbf97369ac8039d2a82ec673d885b39e1544259b70cecf292639caa9ff99c1b42d34c196
+AUX fvwm-2.6.8-perl528.patch 515 BLAKE2B 44df7b8aef71d85c3aefefb40ab45b9e6227ef6a13aaab60cec8956db669013b4ee4dc869216972e1a443d1f69e6550e7f80dc81cdf8b7642d6c49ae46793b2a SHA512 ab35b8aef3c6d8a07f1e03290c209736ee892729d98fece3d0134fd9994f8c57bdd5703492b405a6eb52cfcd67cd9cd72c16bc25a729a46560eb6e21f2d7918f
 DIST fvwm-2.6.5.tar.bz2 2582655 BLAKE2B 02c6f3124c0bb2ffe5dd25c218e4137977030ee6e96c7d20517e10dc93b85b295d941c700786f53231045b1b76e6d069b0387942ccf55b8543b0efe9ae303520 SHA512 a1b8cf5a5124b939441834a2fb44c885c579939e4099cf2c8178ea2c4261258df4e565068593699f9446e363135a2666c9288c1bce551a6cf5c6c79287104698
 DIST fvwm-2.6.8.tar.gz 3915662 BLAKE2B 0b71182c5c0b5a07314fde8a673efe46712b92484e1164cd6357ad2e36e557dd822bf6c25d201092953ec10200bb0f93846af6cde0d701c65c81a4086de64652 SHA512 12e0def0a1d565c1c44356b48b4e516b7be4f51f13f91d9f8b89364ae106f6d7773e12fd17c71b6f0569c64fb3a5374c036c118cb76f739a63b1e17b5dfba287
-EBUILD fvwm-2.6.5-r2.ebuild 4793 BLAKE2B 10d28f244881fd41ba3ec89b36b25cffad5bb33daf609cfabe8f159a61307c4704c4652906a330c4df8f185497a3b5d288b2938707b8477683ae4abcc349ffcf SHA512 f30727158ce0f7962963396efe10c8b860516ef7413e9a10da1247d850f8ab3b2968860f1b7b45e5041fe045a6c51597c8bfd16575856c7e3d8665ffd0c43da5
-EBUILD fvwm-2.6.8-r1.ebuild 4081 BLAKE2B 49cb162bd5f249f556043369657e895c4e7a39759936e223531b873539effe9690d7e23b1a9937abba673f65878264b80b39568e56a53d65592b4a255d83f561 SHA512 cf138e0c8477d0166b8b9695c218e277d52ed1ed80b1d07bbe0071014dc1fb7b4018026c86de03302afdc6709645a47d149f247dbc9820d91c50889ff6103053
-EBUILD fvwm-2.6.8.ebuild 4030 BLAKE2B 34e314c8d5eec26e851bc6590b33814ab9d7cc4902a000c92f782133f48fdae50c67916cb93f39adf26cb73b5e767ff4c2479abdb9fef634b629ebf488e99877 SHA512 03e7d5d30383bd81c533a642d92fc78d8ce5e1ed9db11859c5c3c24b8b035e1eb2343dade1cb5d87500e87ab568aff4713dec8b0fc0c3e72bc1e9bfcef867f9e
+EBUILD fvwm-2.6.5-r3.ebuild 4846 BLAKE2B 69d879a5d907e4f6b449fb4e5ff1b43a7cf136b68f7fa4e7f05b3e424183c74185630f11537db583653850c9d557ca75350e4017aa3431ae5a8735dddc2915e6 SHA512 600da4d0d08b08a6775a6ed2cbc2c4aeb8024bfe0973b8cdd2d434bd2fbf340a0b4f179d41206baf5c632590832bd94c66515a316cd5af5385d966904f84248a
+EBUILD fvwm-2.6.8-r2.ebuild 4155 BLAKE2B 314c6982645449e98021bc7c9a6830f41d3ce2b60a5ad33147b985c3e668ba6a07878b12c15be803b100f3e002dc80a9c985ed5c805aed196bdfb12ccd110f62 SHA512 28795e230d8ce1038c639e538821d214ba4e90d351a1d21ee74e3ad4117a2345984995d3227a50d4a43aa081dc8e4f8f32203e2d91f553ae475df2172acf488e
 MISC metadata.xml 765 BLAKE2B 003f88ef882dda6da8b314975c8f40ea450faff79e086f962946e3634ec8722dc8b0d821692d8daa4d80ac6025d9b7e21827e64ccca3407ea60a79c12d752b3f SHA512 0feb8344498792784c3d640455316527855b7d37f1e6d3109776bec2749b48819bcc6b88f55b214d6675eab671add82e9338c52817cf4e0b25a20ae390519581
diff --git a/x11-wm/fvwm/files/fvwm-2.6.8-perl528.patch b/x11-wm/fvwm/files/fvwm-2.6.8-perl528.patch
new file mode 100644
index 000000000000..5735fb1f89b7
--- /dev/null
+++ b/x11-wm/fvwm/files/fvwm-2.6.8-perl528.patch
@@ -0,0 +1,15 @@
+--- modules/FvwmPerl/FvwmPerl.in	2018-04-28 07:46:28.000000000 -0400
++++ modules/FvwmPerl/FvwmPerl.in	2019-01-06 20:44:59.035950968 -0500
+@@ -319,11 +319,11 @@
+ 		$FVWM_DATADIR = $FVWM_DATADIR || $module->site_data_dir;
+ 		$FVWM_USERDIR = $FVWM_USERDIR || $module->user_data_dir;
+ 	}
+ 
+ 	# perl code substitution first
+-	$$text_ref =~ s/\Q$quote1\E { ( .*? ) } \Q$quote2\E/
++	$$text_ref =~ s/\Q$quote1\E \{ ( .*? ) \} \Q$quote2\E/
+ 		my $result = eval "
+ 			no strict;
+ 			package PreprocessNamespace;
+ 			$1
+ 		";
diff --git a/x11-wm/fvwm/fvwm-2.6.5-r2.ebuild b/x11-wm/fvwm/fvwm-2.6.5-r3.ebuild
index 9f65b7d88423..9cb180c1f0c3 100644
--- a/x11-wm/fvwm/fvwm-2.6.5-r2.ebuild
+++ b/x11-wm/fvwm/fvwm-2.6.5-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -74,6 +74,7 @@ src_prepare() {
 	fi
 
 	epatch "${FILESDIR}/${PN}-2.6.5-ar.patch" #474528
+	epatch "${FILESDIR}/${PN}-2.6.8-perl528.patch" #674742
 	eautoreconf
 }
 
diff --git a/x11-wm/fvwm/fvwm-2.6.8-r1.ebuild b/x11-wm/fvwm/fvwm-2.6.8-r2.ebuild
index ffbb42db076a..02edbfa8a8f9 100644
--- a/x11-wm/fvwm/fvwm-2.6.8-r1.ebuild
+++ b/x11-wm/fvwm/fvwm-2.6.8-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -73,6 +73,9 @@ src_prepare() {
 
 	eapply -p0 "${FILESDIR}/${PN}-2.6.5-ar.patch" #474528
 
+	# Fix for Perl 5.28
+	eapply -p0 "${FILESDIR}/${PN}-2.6.8-perl528.patch"
+
 	default
 	eautoreconf
 }
diff --git a/x11-wm/fvwm/fvwm-2.6.8.ebuild b/x11-wm/fvwm/fvwm-2.6.8.ebuild
deleted file mode 100644
index b6a281cf445b..000000000000
--- a/x11-wm/fvwm/fvwm-2.6.8.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools flag-o-matic desktop
-
-DESCRIPTION="An extremely powerful ICCCM-compliant multiple virtual desktop window manager"
-HOMEPAGE="http://www.fvwm.org/"
-SRC_URI="https://github.com/fvwmorg/fvwm/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2 FVWM"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="bidi debug doc netpbm nls perl png readline rplay stroke svg tk truetype +vanilla xinerama lock"
-
-COMMON_DEPEND="
-	sys-libs/zlib
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXau
-	x11-libs/libxcb
-	x11-libs/libXcursor
-	x11-libs/libXdmcp
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXpm
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	bidi? ( dev-libs/fribidi )
-	png? ( media-libs/libpng:0= )
-	readline? (
-		sys-libs/ncurses:0=
-		sys-libs/readline:0=
-	)
-	stroke? ( dev-libs/libstroke )
-	svg? ( gnome-base/librsvg )
-	truetype? (
-		media-libs/fontconfig
-		x11-libs/libXft
-	)
-	xinerama? ( x11-libs/libXinerama )
-"
-RDEPEND="${COMMON_DEPEND}
-	dev-lang/perl
-	perl? ( tk? (
-			dev-lang/tk
-			dev-perl/Tk
-			>=dev-perl/X11-Protocol-0.56
-		)
-	)
-	rplay? ( media-sound/rplay )
-	lock? ( x11-misc/xlockmore )
-	userland_GNU? ( sys-apps/debianutils )
-	!x86-fbsd? ( netpbm? ( media-libs/netpbm ) )
-"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	x11-base/xorg-proto
-	doc? ( dev-libs/libxslt )
-"
-
-src_prepare() {
-	if ! use vanilla; then
-		# Enables fast translucent menus; patch from fvwm-user mailing list.
-		eapply -p0 "${FILESDIR}/${PN}-2.5.27-translucent-menus.diff"
-
-		# Allow more mouse buttons, bug #411811
-		eapply -p0 "${FILESDIR}/${PN}-2.6.5-mouse-buttons.patch"
-	fi
-
-	eapply -p0 "${FILESDIR}/${PN}-2.6.5-ar.patch" #474528
-	eapply_user
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--libexecdir="${EPREFIX}"/usr/$(get_libdir)
-		--with-imagepath=/usr/include/X11/bitmaps:/usr/include/X11/pixmaps:/usr/share/icons/fvwm
-		--enable-package-subdirs
-		--docdir="/usr/share/doc/${P}"
-		$(use_enable bidi)
-		$(use_enable debug debug-msgs)
-		$(use_enable debug command-log)
-		$(use_enable doc htmldoc)
-		$(use_enable nls)
-		$(use_enable nls iconv)
-		$(use_enable perl perllib)
-		$(use_enable png)
-		$(use_with readline readline-library)
-		$(use_with rplay rplay-library)
-		$(use_with stroke stroke-library)
-		$(use_enable svg rsvg)
-		$(use_enable truetype xft)
-		$(use_enable xinerama)
-	)
-
-	# Non-upstream email where bugs should be sent; used in fvwm-bug.
-	export FVWM_BUGADDR="desktop-wm@gentoo.org"
-
-	# Recommended by upstream.
-	append-flags -fno-strict-aliasing
-
-	# Signed chars are required.
-	use ppc && append-flags -fsigned-char
-
-	use readline && myeconfargs+=( --without-termcap-library )
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	make_session_desktop fvwm /usr/bin/fvwm
-
-	if ! use lock; then
-		find "${D}" -name '*fvwm-menu-xlock' -exec rm -f '{}' \; 2>/dev/null
-	fi
-
-	if use perl; then
-		if ! use tk; then
-			rm "${D}"/usr/share/fvwm/perllib/FVWM/Module/Tk.pm || die
-			rm "${D}"/usr/share/fvwm/perllib/FVWM/Module/Toolkit.pm || die
-			find "${D}"/usr/share/fvwm/perllib -depth -type d -exec rmdir '{}' \; 2>/dev/null
-		fi
-	else
-		# Completely wipe it if ! use perl
-		rm -r "${D}"/usr/bin/fvwm-perllib "${D}"/usr/share/man/man1/fvwm-perllib.1
-	fi
-
-	# Utility for testing FVWM behaviour by creating a simple window with
-	# configurable hints.
-	if use debug; then
-		dobin "${S}"/tests/hints/hints_test
-		newdoc "${S}"/tests/hints/README README.hints
-	fi
-
-	dodir /etc/X11/Sessions
-	echo "/usr/bin/fvwm" > "${D}"/etc/X11/Sessions/${PN} || die
-	fperms a+x /etc/X11/Sessions/${PN} || die
-
-	dodoc docs/{COMMANDS,DEVELOPERS.md}
-
-	# README file for translucent menus patch.
-	if ! use vanilla; then
-		dodoc "${FILESDIR}"/README.translucency
-		ewarn "You are using a patched build, so, please, don't"
-		ewarn "report bugs at the fvwm-workers list unless you are"
-		ewarn "also able to reproduce them with a vanilla build (USE=vanilla)."
-	fi
-}
diff --git a/x11-wm/i3-gaps/Manifest b/x11-wm/i3-gaps/Manifest
index 4fd2e6f7f739..4cbdee3fc85b 100644
--- a/x11-wm/i3-gaps/Manifest
+++ b/x11-wm/i3-gaps/Manifest
@@ -1,7 +1,4 @@
-AUX i3-gaps-4.15-musl.patch 2473 BLAKE2B acb148b7a7f14f7e75523ade9ae4374d6b18d3397f97d6b639f416f86abfd114bddd97fab19a61385fff5504bcd0f614c53175da4c30cf31e00f6b612dfb3d0d SHA512 8ce7d00371c43b93dabbe0dadf9caf7c58a68f4a0079f5a9b9552c15c55bfa0df16d7e87a281595af2ac5254632ba28ccf82a467cea16159b41490f6f2910299
 AUX i3-gaps-4.16-musl.patch 2783 BLAKE2B 9dea47af64b78a77006d3aa641273aa7a77846d4425e1da17424528445450112ab275cdf7098ba8c2a76f1b08561b1d1a852cb9fd4ee4c61e53832ca702ad55d SHA512 fdff65255e7c9b30eefdbf032e04ba568d5b75a5b7dfc5fce1aecaac0f0d376b6bb4f87338e1eaf5f20b1c5882ebfc7349f8ab43c804349b5f5c626f9fc1d340
-DIST i3-gaps-4.15.0.1.tar.gz 3965631 BLAKE2B ea65886c40f377125bafbd80e2d56c1d66a4c5c06d942d645b2cb226323a0903e98aa58b67da9c31c60240b5d99d10ecc20864aeede95a5039ea0ffdff8dcb8b SHA512 76ff860e4ca0edd0e22bdff9ae9b1bc150df2b5bc15b0d7ea7a63d373e8d156a43bd91f8a40c48b4c771603f7de7c18c6d16c53fef582e53f51c53a197fa7a0a
 DIST i3-gaps-4.16.1.tar.gz 3983420 BLAKE2B f0d5a85b06ce33e1cc177af6da29f9cdf42ed754bb767aa9eaa5ab52f3b9f4f688d251f2a16fb222fc8cf5052e79859891c4185b1325b2ef6c1a813aa220468c SHA512 904c2f63c6a35573f13fd216625c1349ac71de70ae8f0440667c9d76048cdaf30a398ab358f2366d5f46502d87e801713b625cb509a05f39dbca1371d2b8d0e9
-EBUILD i3-gaps-4.15.0.1.ebuild 1751 BLAKE2B bd1da83f5652b82ca30f1fe6b3eafcb582f1359d29e88066ef82469e5bb30900ecbc490f9758b1d31455aa204ed859e4e40ccf20d2f5a2b005cf45bdef90afd1 SHA512 57a83814bc1758ef00930c1fd05b1636314360a6f183238920257a1d7870c25b225f2e78477dca2fc9223dfe0b685580662326bd2ffaea8757fc730076d0eb7b
-EBUILD i3-gaps-4.16.1.ebuild 1728 BLAKE2B 63314cf555b99ce93e0449b5f7e37ef7aa598adfbee710a2b1925a48689f86ac1c69aa5e18a86dacbead104d0c2d2c3e64c91f9a253649cd66e7d2f06d216889 SHA512 b656d1844ce8b6f5bc70486f88b980a4914b6103658f8153983d08c73f68e9b0b1db27b96ecab21eff6ebc6213be994b5f9c52fb5998d71b49fb423914a1f973
+EBUILD i3-gaps-4.16.1.ebuild 1727 BLAKE2B baceb7766ffb3113638ac33ba2bc24135dc067649dff1be81911f56d697247f6f1c95edfed41c5b3f2ff70ccf189997676a53d0a3ba7b8b0c78077da979c447d SHA512 d17165aaeef4e73552052d6cb2c8e3877ae7978836eee3d349a20966ff70544fccbd3155778cf0e400ffe17be358b053f7a50b58f2166850f9ce04a477050516
 MISC metadata.xml 322 BLAKE2B bdba5a4519158f97944784fc4e2813c1b8e8d4f6f90d43b3a935e8b2565ecc5d2444c4b7b4d11266263d25a76b5c2dba55ec6535fdaab03129bb022206abbce2 SHA512 d3ca96f88473d21b81c420795c6eee5dd41f43354de85fd549a9ae8127e46f10d00034730bf850ddd6df8607821d30fce17aa349b1b2575f43fd3303a2da1cf6
diff --git a/x11-wm/i3-gaps/files/i3-gaps-4.15-musl.patch b/x11-wm/i3-gaps/files/i3-gaps-4.15-musl.patch
deleted file mode 100644
index 82ad6195b8e5..000000000000
--- a/x11-wm/i3-gaps/files/i3-gaps-4.15-musl.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-diff -urp i3-4.11/i3bar/src/main.c i3-4.11.new/i3bar/src/main.c
---- i3-4.11/i3bar/src/main.c	2015-09-30 07:55:10.000000000 +0100
-+++ i3-4.11.new/i3bar/src/main.c	2016-02-08 20:03:41.777392482 +0000
-@@ -45,14 +45,20 @@ void debuglog(char *fmt, ...) {
-  *
-  */
- char *expand_path(char *path) {
--    static glob_t globbuf;
--    if (glob(path, GLOB_NOCHECK | GLOB_TILDE, NULL, &globbuf) < 0) {
--        ELOG("glob() failed\n");
--        exit(EXIT_FAILURE);
-+    char *home, *expanded;
-+
-+    if (strncmp(path, "~/", 2) == 0) {
-+        home = getenv("HOME");
-+        if (home != NULL) {
-+            /* new length: sum - 1 (omit '~') + 1 (for '\0') */
-+            expanded = scalloc(strlen(home)+strlen(path), 1);
-+            strcpy(expanded, home);
-+            strcat(expanded, path+1);
-+            return expanded;
-+        }
-     }
--    char *result = sstrdup(globbuf.gl_pathc > 0 ? globbuf.gl_pathv[0] : path);
--    globfree(&globbuf);
--    return result;
-+
-+    return sstrdup(path);
- }
- 
- void print_usage(char *elf_name) {
-diff -urp i3-4.11/libi3/resolve_tilde.c i3-4.11.new/libi3/resolve_tilde.c
---- i3-4.11/libi3/resolve_tilde.c	2015-09-30 07:55:10.000000000 +0100
-+++ i3-4.11.new/libi3/resolve_tilde.c	2016-02-08 20:03:47.849230953 +0000
-@@ -19,27 +19,18 @@
-  *
-  */
- char *resolve_tilde(const char *path) {
--    static glob_t globbuf;
--    char *head, *tail, *result;
-+    char *home, *expanded;
- 
--    tail = strchr(path, '/');
--    head = sstrndup(path, tail ? (size_t)(tail - path) : strlen(path));
--
--    int res = glob(head, GLOB_TILDE, NULL, &globbuf);
--    free(head);
--    /* no match, or many wildcard matches are bad */
--    if (res == GLOB_NOMATCH || globbuf.gl_pathc != 1)
--        result = sstrdup(path);
--    else if (res != 0) {
--        err(EXIT_FAILURE, "glob() failed");
--    } else {
--        head = globbuf.gl_pathv[0];
--        result = scalloc(strlen(head) + (tail ? strlen(tail) : 0) + 1, 1);
--        strncpy(result, head, strlen(head));
--        if (tail)
--            strncat(result, tail, strlen(tail));
-+    if (strncmp(path, "~/", 2) == 0) {
-+        home = getenv("HOME");
-+        if (home != NULL) {
-+            /* new length: sum - 1 (omit '~') + 1 (for '\0') */
-+            expanded = scalloc(strlen(home)+strlen(path), 1);
-+            strcpy(expanded, home);
-+            strcat(expanded, path+1);
-+            return expanded;
-+        }
-     }
--    globfree(&globbuf);
- 
--    return result;
-+    return sstrdup(path);
- }
diff --git a/x11-wm/i3-gaps/i3-gaps-4.15.0.1.ebuild b/x11-wm/i3-gaps/i3-gaps-4.15.0.1.ebuild
deleted file mode 100644
index a4357937c21a..000000000000
--- a/x11-wm/i3-gaps/i3-gaps-4.15.0.1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eapi7-ver
-
-DESCRIPTION="i3 fork with gaps and some more features"
-HOMEPAGE="https://github.com/Airblader/i3"
-SRC_URI="https://github.com/Airblader/i3/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-CDEPEND="
-	dev-libs/glib:2
-	dev-libs/libev
-	dev-libs/libpcre
-	dev-libs/yajl
-	x11-libs/cairo[X,xcb]
-	x11-libs/libxcb[xkb]
-	x11-libs/libxkbcommon[X]
-	x11-libs/pango[X]
-	x11-libs/startup-notification
-	x11-libs/xcb-util
-	x11-libs/xcb-util-cursor
-	x11-libs/xcb-util-keysyms
-	x11-libs/xcb-util-wm
-	x11-libs/xcb-util-xrm
-"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-"
-RDEPEND="${CDEPEND}
-	dev-lang/perl
-	dev-perl/AnyEvent-I3
-	dev-perl/JSON-XS
-	!x11-wm/i3
-"
-
-S=${WORKDIR}/i3-${PV}
-
-DOCS=( RELEASE-NOTES-$(ver_cut 1-2) )
-
-PATCHES=( "${FILESDIR}/${PN}-$(ver_cut 1-2)-musl.patch" )
-
-src_prepare() {
-	default
-	sed -e '/AC_PATH_PROG(\[PATH_ASCIIDOC/d' -i configure.ac || die
-	eautoreconf
-	cat <<- EOF > "${T}"/i3wm
-		#!/bin/sh
-		exec /usr/bin/i3
-	EOF
-}
-
-src_configure() {
-	# disable sanitizer: otherwise injects -O0 -g
-	local myeconfargs=(
-		--enable-debug=no
-		--disable-sanitizers
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	emake -C "${CBUILD}"
-}
-
-src_install() {
-	emake -C "${CBUILD}" DESTDIR="${D}" install
-	einstalldocs
-
-	exeinto /etc/X11/Sessions
-	doexe "${T}"/i3wm
-}
-
-pkg_postinst() {
-	einfo "There are several packages that you may find useful with ${PN} and"
-	einfo "their usage is suggested by the upstream maintainers, namely:"
-	einfo "  x11-misc/dmenu"
-	einfo "  x11-misc/i3lock"
-	einfo "  x11-misc/i3status"
-	einfo "Please refer to their description for additional info."
-}
diff --git a/x11-wm/i3-gaps/i3-gaps-4.16.1.ebuild b/x11-wm/i3-gaps/i3-gaps-4.16.1.ebuild
index 7a503f28a2e2..c0e648622171 100644
--- a/x11-wm/i3-gaps/i3-gaps-4.16.1.ebuild
+++ b/x11-wm/i3-gaps/i3-gaps-4.16.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Airblader/i3/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/x11-wm/marco/Manifest b/x11-wm/marco/Manifest
index 2b16cedcd6fe..e704a99de4e3 100644
--- a/x11-wm/marco/Manifest
+++ b/x11-wm/marco/Manifest
@@ -1,3 +1,5 @@
 DIST marco-1.22.0.tar.xz 1406400 BLAKE2B 4c3ebf92111e2d211f80e3cf65e9eab661a8157e51021b5178f621113d739efda45eb15af4e87479587b530c773a7f7bd4c3bf85ffb053da9bf0ee3529073dd7 SHA512 0935ca1532fde882e21ebbc67b41afe80e15e8519b413b9b8bde351196be347a8dcac2e092da818ec0bc700216e38211f192a891eafec8ac7d9bf63d3a42328d
+DIST marco-1.22.1.tar.xz 1357864 BLAKE2B 241e71795acfdcbf90070ef0d14f0cc55894a5cddbf48bd8741cf9580cfcaa035890b23a2182738875ce4d89d099a80d59aa7b1937e4a34a18a5a969830e7db9 SHA512 18093f4d419fbc90f957a04ec3e36a153b3c51a6bcdc1ac5884adcc0292f157bc5e4af51e171451a4b54b5bccffdee2e8a07ed13dafb6106773abfb06b6a8a4f
 EBUILD marco-1.22.0.ebuild 1405 BLAKE2B 32af147cdcf6b7d6d4b9cb687624f15f73255e5922e371386ff51df96e544c50bf96e396dcb0be565a3dcbc8b0426c7d01ce1b54da2fa204647f1b8c9adf5042 SHA512 f475ee831c03fa06a6c0717b065ff62e98dfacce4bbff364ce585cbd886ce04567dcf9f90598c9012f15caa198f85bc35717a7f10cd4b25c2b1796ac4b25c183
+EBUILD marco-1.22.1.ebuild 1429 BLAKE2B 2e7f5e07d63a6809bf0230b1b3069bc0356a15011c13fad0e1dd34b1890072eabdfbe088c10388fd8d758dc9393d3215325611f96f9ab45f2f88f8f7b32bd584 SHA512 597cb535d1abff62577ac3d2ead428534faa4fcc8e612445307804e4cfd245a54b0117f9f86fe1ba85edc2d4be351a2aabd15d9011c7e916dee9429d0fd4cdb7
 MISC metadata.xml 334 BLAKE2B 4a521e1c77d597f68a11cdaa695afcb40a5a2670a7fd643db0999362884a0bad7fb8106b7ba479a939930fbf0323c7f22186cf3fca5583210227a819631ead5d SHA512 f55f007780c371bc133eb3b8eed1bb4f930cab1e29c9ff0ab2dd99cd2e1458058dc86bf3fd70e9f4e9f1db259a7b8a5a247b04282ca08e88d767ee2f1878a451
diff --git a/x11-wm/marco/marco-1.22.1.ebuild b/x11-wm/marco/marco-1.22.1.ebuild
new file mode 100644
index 000000000000..0f12a9455680
--- /dev/null
+++ b/x11-wm/marco/marco-1.22.1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2019 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="GPL-2"
+SLOT="0"
+
+IUSE="startup-notification test xinerama"
+
+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/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
+	x11-libs/libXpresent
+	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/mutter/Manifest b/x11-wm/mutter/Manifest
index 39a43df76603..3467a0d5c300 100644
--- a/x11-wm/mutter/Manifest
+++ b/x11-wm/mutter/Manifest
@@ -10,6 +10,6 @@ DIST mutter-3.30.2-r1-patchset.tar.xz 14096 BLAKE2B 83f2e975a4404b878e832a70fe7a
 DIST mutter-3.30.2.tar.xz 3725692 BLAKE2B 280b7a6319e5d4705baee965936df6f31ba8ca96ce3812cf640578c6817aaa82b6ff8fde7b2740ecd8edb6c4746f4608f997772a24d67f12fcb0c5c77fc9b29a SHA512 3890270b7eb4b8753274d30ad26693b829a69b31f36501845c59b000deb174be58b5167f6754767dba02ebc44688697fbe7344a327879a073955047b69333a2e
 EBUILD mutter-3.24.4.ebuild 3692 BLAKE2B e548157553fa97d84821a7a3c5cda25dd85ac1b9ac7301352810228ebfc12a1a91e5c332dc153d77038dba74a0598d0409d4fa0d7d30afceb63ff1531b795a6c SHA512 91e4831d296738b21a14846e5e6d9edc30cbad82845c2e2fc7c8a5df992944e2b6168f51eeb58c12ea61d8424c7a9980dbad04b18edbfdf9d7973e32a4537440
 EBUILD mutter-3.26.2-r1.ebuild 4036 BLAKE2B ac9aba438fa514748247827c3d6eb87b036c36528fad4818292778605de06423cbb9ef1fce00cca51c4a90581f7429079e563416ab656664e5c3a6d7a45d74ad SHA512 d4d168a12dd1fd3b3f32b036808fd55c976a9234d5f4c4d944fd6c88277d72d260c6e23dea57fd86d7e556029c6a5d6619c8af871e06f60598cbf8bc83388373
-EBUILD mutter-3.30.2-r1.ebuild 4819 BLAKE2B 0331ce71d812745f6c67112cb52dbf81537540fbef1c4b60b98818020b6083bbe33822e6f3d50a74204bf67d6ebca516daadc998d461460427f54b84eeacc23b SHA512 21c5d1ad6d85a1676ee838562c2c989fdbc5cf5c1b957fe2d5e2e71ffd98f2c11fc1f54de6d9f0f93abffb1a2a3a759b7c8398f43c050d1ffa6f6d5df1bf57dc
+EBUILD mutter-3.30.2-r1.ebuild 4817 BLAKE2B e2128d9fe651f03bff0153be4102245a8da5270614b9cec07528d523e0bde4d5cd86b7f3f5c79437cec0425f8414ff5c57d816f06ba0b830520aa1fee4e50daa SHA512 bd965f23aea6eee86f4e647f3a4b38fdcc54b5fd9abf2c9c6971858940ffbcc73e0244b437635a1d831bdb126e78a360c3c57da12049145b799f7f469e747268
 EBUILD mutter-3.30.2.ebuild 4818 BLAKE2B 126dd5d0082b588430ab8c3a46e5c71de4f13dd44f1d8130b6c44a6f96e4da71b642209aa1323f94cab950b770a0f9ef843e81c4f3d86e9811bb56ce6927a596 SHA512 da8b9b619dd648db52e635b29dae7c20cb782b491fda438b3e05d8f620d2b32d7c0278140a023f444d5f5e20ee19dec4cd8911e4c4ae91abb4aa8f7c5cffdea9
 MISC metadata.xml 431 BLAKE2B 224bce7cb810d88b198f757a6df09da0ba641a08ec75aba918d0fe4e914a3e572e73a863d88bbbd05ab1be52f10d2b30dc20e3420a79fdaa5893b51e72aea476 SHA512 e66679d251265d2666ef26d927110d647d09dbdf4b6fd1f4f1fbac14a35074bfd77182c78e798cba7e2a4649b2a54c16431620a211f9558f922281c522944b85
diff --git a/x11-wm/mutter/mutter-3.30.2-r1.ebuild b/x11-wm/mutter/mutter-3.30.2-r1.ebuild
index 67f779d74521..c0fa10f52b91 100644
--- a/x11-wm/mutter/mutter-3.30.2-r1.ebuild
+++ b/x11-wm/mutter/mutter-3.30.2-r1.ebuild
@@ -17,7 +17,7 @@ IUSE="debug elogind gles2 input_devices_wacom +introspection systemd test udev w
 REQUIRED_USE="
 	wayland? ( ^^ ( elogind systemd ) )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 # libXi-1.7.4 or newer needed per:
 # https://bugzilla.gnome.org/show_bug.cgi?id=738944