gentoo resync : 25.08.2020

63 files changed, 402 insertions, 1307 deletions

diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index f39910851069..4a24012759ae 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/blackbox/Manifest b/x11-wm/blackbox/Manifest
index 5ffa3def8ecc..1ebc18642c91 100644
--- a/x11-wm/blackbox/Manifest
+++ b/x11-wm/blackbox/Manifest
@@ -7,5 +7,5 @@ DIST blackbox-0.75.tar.gz 394605 BLAKE2B 6e1338f946fe1d211d88f060178a17c452ca2b5
 DIST blackbox-0.76.tar.gz 394032 BLAKE2B ffefd24277c581ca59216f53c10d5ffacd7231b33c7fd8bfd799a1f93f0b4953ab91f6c8e7061f91ca80036a8a2b8d7b118383e97b8ab58b8f4cd039155760a1 SHA512 bc97ae699820f8291399ce6f2a87ef4486fabcaeda2dc33fbeb31fc6405c01d722a52c85d8dc65ef44bb031e3dda63c326b76aa1bfca3e544bfcab0fac9d1afa
 EBUILD blackbox-0.70.1-r1.ebuild 1325 BLAKE2B 559c5f4066395f86e3e6699c48f66d54da0336768c733b4677b31a9a6027d5b8508cb4d871da392ac10385fae67e95b0bccc687f127e84eda342b5d5d112d6ca SHA512 e3f4e61fc05b16c08f6d394635adf4571456f3bc2697755d60ca8a5e965606ff9d7052075c5d7a7a0c92c0077929e7d0053ff7a4cfd4c9bf3a59149112e290df
 EBUILD blackbox-0.75.ebuild 1169 BLAKE2B 91ba3978e000215681f8561a2a88eaa8f59593b696a3d69a54c854dced333ffbb3ca7da7baadf4f1998ed4b0f57b7aeed416624fdcc736ba6ec5fda85939b3d6 SHA512 63ee8335f5d3d7a46a14e79738f091d1b3e6da27331420f4d4c7a1c68b5410cd0b2dd940ed99abb5d3faa65a0cbec314ddf0aff6319286820620ad9dc267197e
-EBUILD blackbox-0.76.ebuild 1163 BLAKE2B bdd113e78a785fd76f4aa1e98e0a4903053f010901cba52d53b262902842c54851178bd16fb7928abd87962e65565e47d9af493c8216d29144fbaf6e0537259f SHA512 e7b56ba2fed6111fb004f4b87cd5f9db97081a92f6487bde567b43660376157e5d497984ff35dd59e6eb16dc06ea0ec447c5c8bafaacbac5627a54c546ef656b
+EBUILD blackbox-0.76.ebuild 1162 BLAKE2B 277b053a5ec98ed842128fa6e5f2fbb274435c07899889a93445762a8c3ffe90424c4354b0f4e5a8120ff4a8b2b6f1e2d3a94294ac8e0054de1a92e9592ae5b2 SHA512 4edc1b8e2c76e0d92d90645ec975262b9f5b9dc0ae10cf71e0dc3f8b940eba4cb2115f0bbd0fbe926f8d532c7dd966a1f9a37e65e8e9dca2914abec271e9d86b
 MISC metadata.xml 572 BLAKE2B 3b4a1463dc3c3d78c92f1b983b66f3b7eebde350932374e9cdee846566f53c7a4bbdfb97006c8fd4bad8e945b0b4f70893853b8ae3d634c3ad3b9d6bd00e7860 SHA512 e4862cf23928cd2fe0db5b6d70caee609139cc48e1e5d2f5551142165c9c839c8c34ad3e8dbf2fb2e027ce4eef759a6d985063a3e7cc0332a72708262f1c8213
diff --git a/x11-wm/blackbox/blackbox-0.76.ebuild b/x11-wm/blackbox/blackbox-0.76.ebuild
index 14ccc52ea527..e516d6f34119 100644
--- a/x11-wm/blackbox/blackbox-0.76.ebuild
+++ b/x11-wm/blackbox/blackbox-0.76.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/bbidulock/blackboxwm/archive/${PV}.tar.gz -> ${P}.ta
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="nls truetype debug"
 
 RDEPEND="x11-libs/libXft
diff --git a/x11-wm/dwm/Manifest b/x11-wm/dwm/Manifest
index 102fa867ce92..6f9f3127e5bf 100644
--- a/x11-wm/dwm/Manifest
+++ b/x11-wm/dwm/Manifest
@@ -1,6 +1,6 @@
 AUX dwm-session2 170 BLAKE2B 10158b31ae25da00d7034ce88c321f0703f3374bcf0140ce4ad3ff00483ca634075b2b5b4fc3a97b105e66128c1c882154cd815bb420d473ad1e6af0ff1dce75 SHA512 e882c447824ec430862f9af968aad0f2276b7ab28cf60b8f8e49551e3b9cc2a249429987f4a7d6577eb18182b7709fb4d7c5c4651192a04dc2394ba9afa89f08
 AUX dwm.desktop 118 BLAKE2B e88e7e7376dc18c82c39cf2e07867febc49e0f4749a5e50fd3bca7a3e03af26222fd569aa3c38fa486e4998b64808fee5a3f17d4891eea0b410c54f726850004 SHA512 6a4ba9a9c80c9a39c181427eb48f28edc7c139c73e8452b4012774d1ea787054cad4996da9c839fa437e6dba3ddba521fea72050e3929d59fcf00988bee28db8
 DIST dwm-6.2.tar.gz 25273 BLAKE2B 2bb9e5b900a1d73f3eb94cb8454580ec98930dbacbabec1f2bbd394eb96696873434b6ddea4ac95eb9d171de2c09c5d4ca0b30649836f7e25f4769f44d25a6eb SHA512 01abcab954e5b7c20d011e6fd9c28025271fea2e85610c928812f7c6a09f99d7f9e93d11ffc2d6a7aca894b3fa7e507c6c2fe5f26ff5ddcfc650a9bbaaa41e06
-EBUILD dwm-6.2.ebuild 1075 BLAKE2B d32f47ca2dcc8c169fe50e8d4a05ac5b5e7696c43f2714245763222e71c5a07087088a8fcca023e47560692cf90718fc9ff65827ce8a6eca139702f061adc44f SHA512 e1f56ab69d6f4cfe1e7438db9ccc4d0b63681918d87de97891457bbe914e33863e42213c3c90a4abe0e31d8301bb9a24407af19d89927e37db466b20d60005ed
+EBUILD dwm-6.2.ebuild 1082 BLAKE2B af26ecd1f549e53bb570170d7ed1d19564c017651d84a0aa09481aec41ec360ee7d6adcfc69470320578de269d6acb15bc360f61a557df26a664513e96717564 SHA512 c07e11b8cd40c564aefa8fd5f253d977b8fd1d8b8216afe02e0a63c755441bace04e5310ea116209cce8b57e85ea86af957e0c4b3d27b3c271f6fa9a9016933e
 EBUILD dwm-9999.ebuild 1051 BLAKE2B b6cb69a1d68690bc904fd8276f60e3a4384cbcb54e7e334fe4562495485a7e382e613cd0481c63634c645c89012ad5a77375b8b9a8e297627ab917493a5a5e20 SHA512 377b6dbc10ef70c55e66af4c89b304ce6f146ccc81041ab814bb30e7bacba809e24383317bf9a932cf49bae025b4951c81f8c42dbb554d8cbe7113fd79f39482
 MISC metadata.xml 464 BLAKE2B daf6e362c09f3fc174b6ea81e49096899f5de5cf070553391ead7ab1cfe2b9a40bcbe6043b49db219ffa305c32e854864c9c94ef3c340c8b59c4bc2de675ff33 SHA512 e089b8fee6ede56ac362879d23548bef3aaf5abfcd6fe12c0ad1446b59068fd63ac840154d3d007d5fb0e2a5230bbe9bb84a397c44704e5dc3087cd9b5e3025d
diff --git a/x11-wm/dwm/dwm-6.2.ebuild b/x11-wm/dwm/dwm-6.2.ebuild
index 0c9d1daf079b..70a24ff487d9 100644
--- a/x11-wm/dwm/dwm-6.2.ebuild
+++ b/x11-wm/dwm/dwm-6.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://dl.suckless.org/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
 IUSE="xinerama"
 
 RDEPEND="
diff --git a/x11-wm/enlightenment/Manifest b/x11-wm/enlightenment/Manifest
index bc009c648b14..98116986e788 100644
--- a/x11-wm/enlightenment/Manifest
+++ b/x11-wm/enlightenment/Manifest
@@ -1,6 +1,5 @@
-AUX gentoo-sysactions.conf 3056 BLAKE2B 155b0826c544a5a4829214b4b43d49e2dad455d041f0afc7077dc44780d12bd1a99a1bc94bb5a4a9ba21f59f679e1d4c82609791ee5a5e9828543b1e9154fae5 SHA512 688f02cbff0d50a847eb08ca7832699b836adca9b22e15a780943a8e5a8213aac04b335cfdf3cb96adbff238f681ae8954a720153e8e35b2afaba3225d53206a
-DIST enlightenment-0.23.1.tar.xz 26426096 BLAKE2B d781dc951ad8eddd90f633b29a6b1180be63e6052a56e60644b4f738f4c0d42617aeb4f7326cf3284d0b331dd87d605fa0625ea6435f4e36b8f5b3ccce82ca53 SHA512 b5b8a34f6abe47d9b23dbcaf09d2f61f74b3f8d5a97b30a9666916b4bd307a45cb2ad874288419ab40ef06fa57c3b7dc15377dd9acaeb6eb71cd8c0c24fc42cb
 DIST enlightenment-0.24.1.tar.xz 28713452 BLAKE2B 1d4713a4887a687a5425888e65b358cd01fe12e42865799265f5092dc6784eb29c25b5563805d1c7be9856037b0570027c2f01a8eb848299e7729d905e291470 SHA512 3835d898f1fdb96ab6539543e9af910b4a9078372af5cfd90abb33c0d5ecb41496499629c54613e3fec4c230233b69bf1abde68f3ffba4996c69979a526da418
-EBUILD enlightenment-0.23.1-r1.ebuild 2752 BLAKE2B 272b992ec94ae89c9105c547b23511acc46b58f20cca99e608b1dd0684d9666957ee07b9f97272291362912a3ab7dcad9a6fd84bdfcd829d97c8c0ab89d6e6f6 SHA512 2c04ceb74c05e55911b18867693930e66846754d97dbe93c5f650ed706609f37227ed57cafc9ba5b333216cfbd4b315c4d093792298039a43864ffeac9d632e3
-EBUILD enlightenment-0.24.1.ebuild 2756 BLAKE2B eefd3a4b6928202d62388fcaf5d6875147a3810d455cffd9a476e93bbeffe73403ba93190ea94148ccb7ea9be79206b7d8390bf4b5264f2ee82b003a5b8e4614 SHA512 43b3831a3652e144f37497d35f99406ed93bc0c06d56af792c4d8acacbd51290028f46eed9ebe4e9e9043e833b48c82858b3f43e9654a437c3e72cf8bff674e5
+DIST enlightenment-0.24.2.tar.xz 28716060 BLAKE2B 432722693beaece97eeb318a1120b6101bf76e1536347b824b00ba4378326c093f3333eefa634d7266a59c09dc4337c8bd1f9a4d89e0a4c9a223fdcacd924fa0 SHA512 5d96b17d89e822271048a0a6a8356658fd02680f54da2f15dde7c632752bbf0a396eaf23986164402e61f631e68937b3ba7c29d9dd787ddd470cff4a390abace
+EBUILD enlightenment-0.24.1.ebuild 2834 BLAKE2B 67075f39d81bf0e9ff5c73439c8a34a9852899f82b054b31dac358cc4c32178732a802636e8a289fe5d53240b8d6f6a089fbf0b9f5823231ebea6608f4039015 SHA512 429ed851d600e7fe029637818ddef3473f78ed6cfbc3eb6d58ec2239b427b6d21873c0d564c5e0939c0cbffc57bed1a08ffc13d567729d7fc6f0ea4864bbbb48
+EBUILD enlightenment-0.24.2.ebuild 2836 BLAKE2B 590ee18adfcba7dde36322307fe0a0457f6b38602d715e0acfe434688d59545573dbe89e2d72894dff530eba8094216cde81a92fc375aa3c500fd7265c1bfde4 SHA512 0460438b0bda971bae141e3b1d3c0fe66f7cada94f8a2e3d80c3fbbcab7baf99a471421fcaa941d86f99d5eb5a9420f4a75c78f0b543bf2cb0de3c69f35e3a81
 MISC metadata.xml 721 BLAKE2B 85587a677b7e22cd1dbfe187c367574ccef7ad88a1bdde00acecc9fc5f62d48adb9e14c2086953287efc728cc616d6d286fde1b659a44404086fef5e6bde90b1 SHA512 6d22a2f8639b3b75fd1113c0b381edc2869d91e5d3d04d6c67c845c15fae9ba0e370918e30b45e89e91c695f873f1d0ef5966f7720ab5e9cd270c6254c792dc5
diff --git a/x11-wm/enlightenment/enlightenment-0.24.1.ebuild b/x11-wm/enlightenment/enlightenment-0.24.1.ebuild
index bf2169b4ee55..d0fb774324f3 100644
--- a/x11-wm/enlightenment/enlightenment-0.24.1.ebuild
+++ b/x11-wm/enlightenment/enlightenment-0.24.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.enlightenment.org/rel/apps/${PN}/${P}.tar.xz"
 
 LICENSE="BSD-2"
 SLOT="0.17/${PV%%_*}"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
 IUSE="acpi bluetooth connman doc geolocation nls pam policykit systemd udisks wayland wifi xwayland"
 
 REQUIRED_USE="xwayland? ( wayland )"
@@ -94,6 +94,7 @@ pkg_postinst() {
 	xdg_mimeinfo_database_update
 
 	elog "Additional programs to complete full EFL suite: "
+	optfeature "better monitor backlight and brightness controls" app-misc/ddcutil
 	optfeature "office file thumbnails" app-office/libreoffice app-office/libreoffice-bin
 	optfeature "an EFL-based IDE" dev-util/edi
 	optfeature "image viewer" media-gfx/ephoto
diff --git a/x11-wm/enlightenment/enlightenment-0.23.1-r1.ebuild b/x11-wm/enlightenment/enlightenment-0.24.2.ebuild
index e499a09c51e8..b35c9836e6a5 100644
--- a/x11-wm/enlightenment/enlightenment-0.23.1-r1.ebuild
+++ b/x11-wm/enlightenment/enlightenment-0.24.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit eutils flag-o-matic meson xdg-utils
+inherit eutils meson xdg-utils
 
 DESCRIPTION="Enlightenment window manager"
 HOMEPAGE="https://www.enlightenment.org"
@@ -11,13 +11,12 @@ SRC_URI="https://download.enlightenment.org/rel/apps/${PN}/${P}.tar.xz"
 
 LICENSE="BSD-2"
 SLOT="0.17/${PV%%_*}"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
-IUSE="acpi bluetooth connman doc geolocation nls pam systemd udisks wayland wifi xwayland"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="acpi bluetooth connman doc geolocation nls pam policykit systemd udisks wayland wifi xwayland"
 
 REQUIRED_USE="xwayland? ( wayland )"
 
-RDEPEND="
-	>=dev-libs/efl-1.22.3[eet,X]
+RDEPEND=">=dev-libs/efl-1.24.1[eet,fontconfig,X]
 	virtual/udev
 	x11-libs/libXext
 	x11-libs/libxcb
@@ -28,6 +27,7 @@ RDEPEND="
 	connman? ( dev-libs/efl[connman] )
 	geolocation? ( app-misc/geoclue:2.0 )
 	pam? ( sys-libs/pam )
+	policykit? ( sys-auth/polkit )
 	systemd? ( sys-apps/systemd )
 	udisks? ( sys-fs/udisks:2 )
 	wayland? (
@@ -39,12 +39,9 @@ RDEPEND="
 	xwayland? (
 		dev-libs/efl[X,wayland]
 		x11-base/xorg-server[wayland]
-	)
-"
-BDEPEND="
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
+	)"
+BDEPEND="virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
 DEPEND="${RDEPEND}"
 
 src_configure() {
@@ -52,8 +49,8 @@ src_configure() {
 		-D device-udev=true
 		-D install-enlightenment-menu=true
 
-		-D bluez4=false
-		-D install-sysactions=false
+		-D install-sysactions=true
+		-D install-system=true
 		-D mount-eeze=false
 
 		-D packagekit=false
@@ -64,6 +61,7 @@ src_configure() {
 		$(meson_use geolocation)
 		$(meson_use nls)
 		$(meson_use pam)
+		$(meson_use policykit polkit)
 		$(meson_use systemd)
 		$(meson_use wayland wl)
 		$(meson_use wifi wireless)
@@ -82,24 +80,21 @@ src_configure() {
 		)
 	fi
 
-	append-cflags -fcommon
-
 	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_icon_cache_update
 	xdg_mimeinfo_database_update
 
-	einfo "Additional programs to complete full EFL suite: "
+	elog "Additional programs to complete full EFL suite: "
+	optfeature "better monitor backlight and brightness controls" app-misc/ddcutil
 	optfeature "office file thumbnails" app-office/libreoffice app-office/libreoffice-bin
 	optfeature "an EFL-based IDE" dev-util/edi
 	optfeature "image viewer" media-gfx/ephoto
@@ -112,5 +107,6 @@ pkg_postinst() {
 
 pkg_postrm() {
 	xdg_desktop_database_update
+	xdg_icon_cache_update
 	xdg_mimeinfo_database_update
 }
diff --git a/x11-wm/enlightenment/files/gentoo-sysactions.conf b/x11-wm/enlightenment/files/gentoo-sysactions.conf
deleted file mode 100644
index fe676238b907..000000000000
--- a/x11-wm/enlightenment/files/gentoo-sysactions.conf
+++ /dev/null
@@ -1,76 +0,0 @@
-# ENLIGHTENMENT SYSTEM ACTIONS CONFIGURATION
-#
-# This is a system configuration for allowing or denying certain users or
-# groups to be able to do certain actions that involve system restricted
-# actions such as halt, reboot, suspend, hibernate etc.
-# 
-# This file is read in order from top to bottom - the first rule to MATCH
-# will be used for a user or a group, and nothing after that is read.
-#
-# You must put all the ACTION definitons BEFORE user and group rule matches.
-# Any action definitons after a rule match has been found will be ignored.
-# This allows actions to be re-defined for different user groups, so matches
-# so the command for an action can change for matches to the rules later on.
-# 
-# Any user or group NOT matched by an allow or a deny will be ALLOWED to
-# perform the action by default (system administrators should be aware of
-# this and implement whatever policies they see fit). Generally speaking
-# a user of a workstation, desktop or laptop is intended to have such abilities
-# to perform these actions, thus the default of allow. For multi-user systems
-# the system administrator is considerd capable enough to restrict what they
-# see they need to.
-# 
-# A WARNING to admins: do NOT allow access for users to this system remotely
-# UNLESS you fully trust them or you have locked down permissions to halt/reboot
-# suspend etc. here first. You have been warned.
-#
-# FORMAT:
-#
-# action:   halt      /sbin/shutdown -h now
-# action:   reboot    /sbin/shutdown -r now
-# action:   suspend   /etc/acpi/sleep.sh force
-# action:   hibernate /etc/acpi/hibernate.sh force
-#
-# user:  username  allow: halt reboot suspend hibernate
-# group: groupname deny:  *
-# group: *         deny:  *
-# user:  *         allow: suspend
-# user:  billy     allow: halt reboot
-# group: staff     deny:  halt suspend hibernate
-#
-# etc.
-#
-# user and group name can use glob matches (* == all for example) like the
-# shell. as can action names allowed or denied. 
-
-action:   halt      /sbin/shutdown -h now
-action:   reboot    /sbin/shutdown -r now
-action:   suspend   /usr/sbin/pm-suspend
-action:   hibernate /usr/sbin/pm-hibernate
-
-# on FreeBSD use this instead of the above.
-#action suspend  /usr/sbin/zzz 
-
-# root is allowed to do anything - but it needs to be here explicitly anyway
-user:     root      allow: *
-# members of operator, staff and admin groups should be able to do all
-group:    operator  allow: *
-group:    staff     allow: *
-group:    admin     allow: *
-group:    sys       allow: *
-group:    wheel     allow: *
-# common "user" groups for "console users" on desktops/laptops
-group:    dialout   allow: *
-group:    disk      allow: *
-group:    adm       allow: *
-group:    cdrom     allow: *
-group:    floppy    allow: *
-group:    audio     allow: *
-group:    dip       allow: *
-group:    plugdev   allow: *
-# put in a list of other users and groups here that are allowed or denied etc.
-# e.g.
-# user:     myuser     allow:  *
-# user:     another    allow:  suspend hibernate
-# deny everyone else by default
-user:     *         deny:  *
diff --git a/x11-wm/fvwm/Manifest b/x11-wm/fvwm/Manifest
index 7d94bd475d64..5c50fccb73e8 100644
--- a/x11-wm/fvwm/Manifest
+++ b/x11-wm/fvwm/Manifest
@@ -8,5 +8,5 @@ DIST fvwm-2.6.8.tar.gz 3915662 BLAKE2B 0b71182c5c0b5a07314fde8a673efe46712b92484
 DIST fvwm-2.6.9.tar.gz 3942859 BLAKE2B 8faf2d420d96049ab0528a6c6a5dc6ed8ee9449f8e533b9ad9bb526faea86030684fc0aa8ed0d307cb64575457676611298adf582b1249c37a3db35a72b43bf1 SHA512 a9c2214ad19edd17da81446a6d4250284cc50b59b53c233212f2a9354c01143dbb870521392752f272f00af50bee2dd8f0b6bf6176b0d4b3075694d2a61a623e
 EBUILD fvwm-2.6.5-r3.ebuild 4829 BLAKE2B 00dc802a709c4ac1bdec33b723899895f26fe20e70ff245838c142d25b24eae646a16c93ba342395684b914ec52c3bd9f256efe5a4f876232b40b33bcb286277 SHA512 c1ae5188318030d01b65f6429874a990fe8df1a62afefe265e82beade9b5960958a40fd3f578c8ed1e34a10ec060ae6d2d277b493a399d292435585872152e25
 EBUILD fvwm-2.6.8-r2.ebuild 4105 BLAKE2B 8453a380d28fe71055c5fbfb73d0c4084409393c1be91e52ef772315389a413e902b14ee618d072449da9803b949ecc9192bb8b43dab3dc11ed0400b9a85d4bc SHA512 a783b93180542b66a5f2d394cba759f6af7fb4e51bdfb881f671aab3a9f4c62ed36fcee1e3e47d322a416d6d8153c74a888373b674599844e8dcbb425b0095b2
-EBUILD fvwm-2.6.9.ebuild 4105 BLAKE2B 8453a380d28fe71055c5fbfb73d0c4084409393c1be91e52ef772315389a413e902b14ee618d072449da9803b949ecc9192bb8b43dab3dc11ed0400b9a85d4bc SHA512 a783b93180542b66a5f2d394cba759f6af7fb4e51bdfb881f671aab3a9f4c62ed36fcee1e3e47d322a416d6d8153c74a888373b674599844e8dcbb425b0095b2
+EBUILD fvwm-2.6.9.ebuild 4102 BLAKE2B 875b3f30630d9fba8b1f2722f294b0dedc3fef1d1226c0f1d39027c6c1dbe7f85a4fc88fa20225050e4b1a0604ebce9a74ffcfb9c0c39e8315d2ad6deb238b9e SHA512 9d367e2b42c7db780721b21ac604058d54ad13f5f120026d7f41c2a22e9ab8248ed7468a2f7f24e9a60223bfb82c7ce640e1b0bafd5893863f16207375b13b79
 MISC metadata.xml 765 BLAKE2B 003f88ef882dda6da8b314975c8f40ea450faff79e086f962946e3634ec8722dc8b0d821692d8daa4d80ac6025d9b7e21827e64ccca3407ea60a79c12d752b3f SHA512 0feb8344498792784c3d640455316527855b7d37f1e6d3109776bec2749b48819bcc6b88f55b214d6675eab671add82e9338c52817cf4e0b25a20ae390519581
diff --git a/x11-wm/fvwm/fvwm-2.6.9.ebuild b/x11-wm/fvwm/fvwm-2.6.9.ebuild
index f72e00f30238..521b1b6fb663 100644
--- a/x11-wm/fvwm/fvwm-2.6.9.ebuild
+++ b/x11-wm/fvwm/fvwm-2.6.9.ebuild
@@ -10,7 +10,7 @@ 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"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ~ppc64 ~sparc x86"
 IUSE="bidi debug doc netpbm nls perl png readline rplay stroke svg tk truetype +vanilla xinerama lock"
 
 COMMON_DEPEND="
diff --git a/x11-wm/i3/Manifest b/x11-wm/i3/Manifest
index 2adc22cdbe8f..18ddc7d9bc5b 100644
--- a/x11-wm/i3/Manifest
+++ b/x11-wm/i3/Manifest
@@ -3,10 +3,12 @@ AUX i3-musl-GLOB_TILDE.patch 2828 BLAKE2B 6ab0b8e92aacfe648891da99ad6ae7058b7abc
 DIST i3-4.14.tar.gz 3936748 BLAKE2B 42678130be56bc695e5700e978ddbd34bfdaeda7a65252a05568581d76fe613e80e710f3a507110e7988077fe62048bf984d4009e722d877b178206cef600221 SHA512 fe3db78813987a15ed93d182968bcd5139e1d03f29d3e8effd9fce59f87bc8309407af0b2fa5f1cd83b8583e50ea0ade6b8eafc5dda6dea9161832dc9cebfdfe
 DIST i3-4.17.1.tar.bz2 1218418 BLAKE2B eb798eee2b618691ceb47b72c08fe09b09e2913c17fe667fab95426069c86497bff67278bea5fc97fdf90ebdfc6574e68cad36b21036a63d053edced1edf8592 SHA512 af397dc1768ea6530e4b2ce8ef21b20ecff8ab9eebf380df224456173eea4c3bacf28b55c8efcdc70f76f0d66543c163564a94cfd66028221ace481fa3c2913f
 DIST i3-4.18.1.tar.bz2 1217703 BLAKE2B 469a6ac09004f95861655858c47d9e6b2f378152bec7b7c6e7b08f06ee387043b8e2c382f888f14daf806ae8764d934025118e997f072709eee23c5cc52de21d SHA512 b001f539b1daf78be6dd9335a7c0474d30f8d969f79d131391ebd9ca310a058a1cc1234e4a9e60552efd520fc4983571f3c0b8cbd7be978e45957daaf86b3e90
+DIST i3-4.18.2.tar.bz2 1218440 BLAKE2B 55fba66b2399730cb3bc63d76efff18a439aad755c943f06d7622bd7c4d91502b3750cff638b98ef86d6f99746bc1858ffbd9396e2d89a7220f513575879e08a SHA512 997c7cdf32f95ba25cfcd483a09f7e37e5219e4501baefa5c1865ddffd206bc9725211e4082663fab4174dc947b663ff454d343a7e30340ac3ea451f999417fc
 DIST i3-4.18.tar.bz2 1218591 BLAKE2B 582b7ba3a54edf8dd2657add05eb54a64b7c004761a1a248d91dfcb061cb9df215ff35301c125b11aa69b571daeacd5732b498934c1fb17f69404a101fd16ec8 SHA512 0bbfda7f4b20a92a50ffb6abbfc3f6bfe6bb4c987ad4b5b1791192eb23b8c3389cc9949a699901797370c14de1ff8e12447a3b8ce330ab7d300fafdb60a432ec
 EBUILD i3-4.14-r1.ebuild 2140 BLAKE2B 941ebc7e16c4376bed180964e610ce38ff216b3d8b7c406edc07deb7b91f03390fe1dd064d3288048b1d77b47572ecc9c7d2643c868abd5c0d257b1dac89af22 SHA512 10d791310d6617ce95253d4dafc97291558e229dabea1c8ad44ecb1061d2baa9edeab2aef5c2b36ebceac85171339bddc81d33494f2fb244facc6c256cef2e6b
 EBUILD i3-4.17.1-r1.ebuild 2327 BLAKE2B 8f307ab43874156d97b3db51ac68fef7ca58f3f2381c495d815326076c1368473974143f00f0909ef66b1efb6e0ff2fda4ccfd7161d336e4d80ae6f6f9da5be0 SHA512 9405eaafba8cac4c6918cdd8343f61c558f58460c2a8dcda2321b1ad38e7318f8a7f6a51d4a3afcc450dcdc9a139d8baf158179c9bf6165c421288e1dc99b1e9
 EBUILD i3-4.18.1.ebuild 2133 BLAKE2B f5b1ca5ab47d57102c358e72d958d4b0153d24b41573067f8760f80860150567a16839b5baf9270f80c9ac2daeb751c103a893ca4c8246e7f476f401200451d9 SHA512 6006b8efd31270c81b4ab4047ef22abc15779729d71ff6a6e3ab2a82376bf84c1e19eb80a6e5d22d7f68ea03d78ca088edd9d4c35e9aa5093a39e2d689d6648a
+EBUILD i3-4.18.2.ebuild 2133 BLAKE2B f5b1ca5ab47d57102c358e72d958d4b0153d24b41573067f8760f80860150567a16839b5baf9270f80c9ac2daeb751c103a893ca4c8246e7f476f401200451d9 SHA512 6006b8efd31270c81b4ab4047ef22abc15779729d71ff6a6e3ab2a82376bf84c1e19eb80a6e5d22d7f68ea03d78ca088edd9d4c35e9aa5093a39e2d689d6648a
 EBUILD i3-4.18.ebuild 2126 BLAKE2B 29048fa9165965ccd572cbacc8fdcc15697384bb75039c2c77caa3970040b31592359c1aa4b8df9242fd8c455e0b1a44d33c76422a9e603235651828cb7020d3 SHA512 527a652e1c6e05b1730a404c38a612820aebc2619ea8baf63c3403cbaaa8a4a5608ba63586c4f5ab09d7d57225727ed3f1207da317110b2b50b31b224440820c
 EBUILD i3-9999.ebuild 1817 BLAKE2B e812d4a04b34d2afb67da16370baace1a3d3376e2a15f73ff77aabbb8a061104f750abd84721266926bcd4d8f05b60d0014f38643c1a706e3ba5126ce68139f5 SHA512 0a31fd5d8ceeeda0c6f8fe06e595be9aa9f0aeca7547c9a8dc24cb2f6c0034255269d256cd88f265d77517da7df0cc8cd116b02404207cc4163df8e27132e086
 MISC metadata.xml 470 BLAKE2B 1c4fd7b44860934e88fb5165254fe0e8ca7e647c11af9af7d959f240e51002e6a454d9b93b30da8944891a1aa6a989f7a3e2a8af44ba41de174e78745393dd79 SHA512 52eddb56541d1172b04ca3ae646d01e52fb300dd62f5dfeaf2abe9d791965813e87b24a1477743797227bf8d407051f79076d54edb599524f89f3cfc716cc47e
diff --git a/x11-wm/i3/i3-4.18.2.ebuild b/x11-wm/i3/i3-4.18.2.ebuild
new file mode 100644
index 000000000000..58a3f832182c
--- /dev/null
+++ b/x11-wm/i3/i3-4.18.2.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools out-of-source virtualx
+
+DESCRIPTION="An improved dynamic tiling window manager"
+HOMEPAGE="https://i3wm.org/"
+SRC_URI="https://i3wm.org/downloads/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="doc debug test"
+
+CDEPEND="dev-libs/libev
+	dev-libs/libpcre
+	dev-libs/yajl
+	x11-libs/libxcb[xkb]
+	x11-libs/libxkbcommon[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
+	x11-misc/xkeyboard-config
+	x11-libs/cairo[X,xcb(+)]
+	x11-libs/pango[X]"
+DEPEND="${CDEPEND}
+	test? (
+		dev-perl/AnyEvent
+		dev-perl/X11-XCB
+		dev-perl/Inline
+		dev-perl/Inline-C
+		dev-perl/IPC-Run
+		dev-perl/ExtUtils-PkgConfig
+		dev-perl/local-lib
+		virtual/perl-Test-Simple
+		x11-base/xorg-server[xephyr]
+		x11-misc/xvfb-run
+	)"
+RDEPEND="${CDEPEND}
+	dev-lang/perl
+	dev-perl/AnyEvent-I3
+	dev-perl/JSON-XS"
+BDEPEND="virtual/pkgconfig"
+
+# Test without debug will apply optimization levels, which results
+# in type-punned pointers - which in turn causes test failures.
+REQUIRED_USE="test? ( debug )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.16-musl-GLOB_TILDE.patch"
+)
+
+# https://github.com/i3/i3/issues/3013
+RESTRICT="test"
+
+src_prepare() {
+	default
+
+	cat <<- EOF > "${T}"/i3wm
+		#!/bin/sh
+		exec /usr/bin/i3
+	EOF
+
+	eautoreconf
+}
+
+my_src_configure() {
+	local myeconfargs=(
+		$(use_enable debug)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+my_src_test() {
+	emake check
+}
+
+my_src_install_all() {
+	doman man/*.1
+
+	einstalldocs
+	use doc && dodoc -r docs "RELEASE-NOTES-${PV}"
+
+	exeinto /etc/X11/Sessions
+	doexe "${T}/i3wm"
+}
+
+pkg_postinst() {
+	# Only show the elog information on a new install
+	if [[ ! ${REPLACING_VERSIONS} ]]; then
+		elog "There are several packages that you may find useful with ${PN} and"
+		elog "their usage is suggested by the upstream maintainers, namely:"
+		elog "  x11-misc/dmenu"
+		elog "  x11-misc/i3status"
+		elog "  x11-misc/i3lock"
+		elog "Please refer to their description for additional info."
+	fi
+}
diff --git a/x11-wm/icewm/Manifest b/x11-wm/icewm/Manifest
index a71559bd6ba4..eba91f6282cf 100644
--- a/x11-wm/icewm/Manifest
+++ b/x11-wm/icewm/Manifest
@@ -1,8 +1,6 @@
 AUX icewm 33 BLAKE2B 5605658012ad8ed16bbd4cf0c4cb7cbe5204f73c20ef2c3d9fef1011a80b9e68863de64b45e4b043604b147c9d31f3f5d2617d067b694f5ec5329ad895472b0e SHA512 3fe619e59cc5d354242ccd85d3b1982dd7db6d0f6170f46f9d33975872f6d5a342a08d69db763162dc43681eedb96e9ba5075455bf54adf4fb86bf19887bf6e0
-DIST icewm-1.5.5.tar.xz 1707656 BLAKE2B 670ab4d1c1648faa24c848ddb04f3e353a3acd8e9a105837229d00ca344a61b3432d7b23b89dc054e220797cfd56d6504ad233d8793a3a5d95d9943c79017797 SHA512 5d75d33bf6e45ea0b46ace5173d825e9d1a12318cf7a5319b20ea704b019f6c09391f0f199b0fac678ba0f160d8236fc1cfee5d3b47d1895b7ba3721ff62a05e
-DIST icewm-1.6.5.tar.lz 1681783 BLAKE2B 3b89bfc3a02ff714c4eb5ec81b64dacabccefa39027cc05d0718ef6f4d1d77af503099a4c1e4735e3a4a3122899d7e5ef04c0be3fddcc442c89c8af830ee294a SHA512 7914031fa2df42ed337aa9c65c04f959746210c255dc799361b636042f1614949e1f9a3b9a2357fe39f469f2ed9a75d4c916c7b4c3e61c7b7ab6dc2cf9d3d9be
 DIST icewm-1.6.6.tar.lz 1684639 BLAKE2B 20daba42f19d86ceff6ce31c8df9cb1b9b09cc53d8933f70a9a8e750470c4f485e79f8de5e47ed503c83ac5433931c4ff98b10584566941e6a3bcf22d58e3dbf SHA512 6d9848924253fee5f57be488d2eb0b602767f168ce623b10c768a73197dfc6265daee7e70373d45ff5fae1c15b029d62c77ad13f0f631283bbf13aaaa9c6234d
-EBUILD icewm-1.5.5.ebuild 2340 BLAKE2B bc642a3517caf7db6396f0123cc23f266bccb75b4af0c62f0519c98fd0d5ed61f3cbee29b6c48c979986c16bad87eed0cfe64aadcc345ef40b82feec02d56f5b SHA512 fd19bd04c7fc3b475af8b3915563e37be1939aecadf08f89f0b69c0a566f7b9adef413a8c4f35b17302a71da72a972f1e034c6f509b306fb32e17a5bc3e5df81
-EBUILD icewm-1.6.5.ebuild 2674 BLAKE2B 527d266c70c5a81b2664778a828f6d73156e64a03da93d0b33499fe83f9b2036e75f19ac4f687b069f834d72d0ba8503f27692c5d9c7a4d39365433ed6fd64eb SHA512 7497f2c29f337623c803fbb30ca1df6b0019a3ca76b143d0b320ca7a923ccc84389895797a1bce5382c6d2671e3c27f7ad73a554320d8ef0495e270228f0980a
-EBUILD icewm-1.6.6.ebuild 2674 BLAKE2B 527d266c70c5a81b2664778a828f6d73156e64a03da93d0b33499fe83f9b2036e75f19ac4f687b069f834d72d0ba8503f27692c5d9c7a4d39365433ed6fd64eb SHA512 7497f2c29f337623c803fbb30ca1df6b0019a3ca76b143d0b320ca7a923ccc84389895797a1bce5382c6d2671e3c27f7ad73a554320d8ef0495e270228f0980a
+DIST icewm-1.7.0.tar.lz 1668130 BLAKE2B 90739f862cf320c43dc2ddbd1a5ecdf2918e6525e45d5732b19adaaeef0f104d9a66d29acab776658f869d7149954d4b531a07e2595a4c80b4dc50dc679473f0 SHA512 1b0faed0e9ead837dcb0d3ce91ad5248d7fca5ad48455c838700c66482a3373bb4e552dbc252b93b0a5613d53e2663cea756e64b3f3fb073d9ba2797e2b69601
+EBUILD icewm-1.6.6.ebuild 2670 BLAKE2B 6fd31e08fe11f8ebb664ff0d11269df39b47433dfafc1058281af3896dcf10a81930707846efc4d2b964d881b9f6c7eef5a21548d50fba58462e101f360d6c95 SHA512 3dfb0a7502141b5916a2bb5d088bd533bc70281dc4c3171a8fbf87e65c94b7b88bf99c592ef3ec3e20994d9913226b760fb9037b2bec7b0aaabdcf679d428eab
+EBUILD icewm-1.7.0.ebuild 2674 BLAKE2B 527d266c70c5a81b2664778a828f6d73156e64a03da93d0b33499fe83f9b2036e75f19ac4f687b069f834d72d0ba8503f27692c5d9c7a4d39365433ed6fd64eb SHA512 7497f2c29f337623c803fbb30ca1df6b0019a3ca76b143d0b320ca7a923ccc84389895797a1bce5382c6d2671e3c27f7ad73a554320d8ef0495e270228f0980a
 MISC metadata.xml 747 BLAKE2B a986dc65f9b603519ef92fecc63cadd2921d6569e8735956a55ce91673426082e367664cce23c2b80cec19e0d997da357ac8f9d3d78c738ad92f42f6f426c225 SHA512 f9b84c60b780b5999c8a295b64bdf1bdb734108984e48f1271257cb35602df024a347560526de52f43ede16f67031551f4ae3f37401d3320e4dbdfb913e557fe
diff --git a/x11-wm/icewm/icewm-1.5.5.ebuild b/x11-wm/icewm/icewm-1.5.5.ebuild
deleted file mode 100644
index f5b8c004563d..000000000000
--- a/x11-wm/icewm/icewm-1.5.5.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Ice Window Manager with Themes"
-HOMEPAGE="https://ice-wm.org/ https://github.com/ice-wm/icewm"
-LICENSE="GPL-2"
-SRC_URI="https://github.com/ice-wm/icewm/releases/download/${PV}/${P}.tar.xz"
-
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86"
-IUSE="+alsa ao bidi debug nls truetype uclibc xinerama"
-
-# Tests broken in all versions, patches welcome, bug #323907, #389533
-RESTRICT="test"
-
-REQUIRED_USE="|| ( alsa ao )"
-
-#fix for icewm preversion package names
-S="${WORKDIR}/${P/_}"
-
-RDEPEND="
-	media-libs/fontconfig
-	x11-libs/gdk-pixbuf:2[X]
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXft
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	alsa? (
-		media-libs/alsa-lib
-		media-libs/libsndfile[alsa]
-	)
-	ao? (
-		media-libs/libao
-		media-libs/libsndfile
-	)
-	bidi? ( dev-libs/fribidi )
-	truetype? ( x11-libs/libXext )
-	xinerama? ( x11-libs/libXinerama )
-"
-DEPEND="
-	${RDEPEND}
-	gnome-base/librsvg
-	x11-base/xorg-proto
-	truetype? ( >=media-libs/freetype-2.0.9 )
-"
-
-BDEPEND="
-	app-text/asciidoc
-	nls? ( >=sys-devel/gettext-0.19.6 )
-"
-
-src_prepare() {
-	# Fix bug #486710 - TODO: Still needed?
-	#use uclibc && PATCHES+=( "${FILESDIR}/${PN}-1.3.8-uclibc.patch" )
-
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local icesound
-	if use alsa && use ao ; then
-		icesound="alsa,ao"
-	elif use alsa ; then
-		icesound="alsa"
-	elif use ao ; then
-		icesound="ao"
-	fi
-
-	local myconf=(
-		--enable-gdk-pixbuf
-		--enable-logevents
-		--enable-xrandr
-		--enable-xrender
-		--with-cfgdir=/etc/icewm
-		--with-docdir=/usr/share/doc/${PF}/html
-		--with-icesound="${icesound}"
-		--with-libdir=/usr/share/icewm
-		$(use_enable bidi fribidi)
-		$(use_enable debug)
-		$(use_enable nls i18n)
-		$(use_enable nls)
-		$(use_enable xinerama)
-	)
-	if use truetype ; then
-		myconf+=(
-			--enable-shape
-		)
-	else
-		myconf+=(
-			--disable-xfreetype
-			--enable-corefonts
-		)
-	fi
-
-	CXXFLAGS="${CXXFLAGS}" econf "${myconf[@]}"
-
-	sed -i "s:/icewm-\$(VERSION)::" src/Makefile || die
-	sed -i "s:ungif:gif:" src/Makefile || die "libungif fix failed"
-}
-
-src_install() {
-	local DOCS=( AUTHORS ChangeLog NEWS README.md TODO VERSION )
-
-	default
-
-	docinto html
-	dodoc doc/icewm.html
-	dodoc man/*.html
-
-	exeinto /etc/X11/Sessions
-	doexe "${FILESDIR}/icewm"
-}
diff --git a/x11-wm/icewm/icewm-1.6.6.ebuild b/x11-wm/icewm/icewm-1.6.6.ebuild
index f3a5bab3c272..fe0e2ed27f4e 100644
--- a/x11-wm/icewm/icewm-1.6.6.ebuild
+++ b/x11-wm/icewm/icewm-1.6.6.ebuild
@@ -11,7 +11,7 @@ LICENSE="GPL-2"
 SRC_URI="https://github.com/ice-wm/icewm/releases/download/${PV}/${P}.tar.lz"
 
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ppc sparc x86"
 IUSE="+alsa ao bidi debug +gdk-pixbuf nls truetype uclibc xinerama"
 
 # Tests broken in all versions, patches welcome, bug #323907, #389533
diff --git a/x11-wm/icewm/icewm-1.6.5.ebuild b/x11-wm/icewm/icewm-1.7.0.ebuild
index f3a5bab3c272..f3a5bab3c272 100644
--- a/x11-wm/icewm/icewm-1.6.5.ebuild
+++ b/x11-wm/icewm/icewm-1.7.0.ebuild
diff --git a/x11-wm/marco/Manifest b/x11-wm/marco/Manifest
index 677d0aa768bc..b013a61f3d28 100644
--- a/x11-wm/marco/Manifest
+++ b/x11-wm/marco/Manifest
@@ -1,6 +1,7 @@
 DIST marco-1.22.4.tar.xz 1368868 BLAKE2B 45a1bdfa13419f690e4a1604a18f1ef4f57b95cc64c628a8d1c4b8d5a92409eb8ecb946b60c9b9711151858a4668247f2ee031a95464463f3005952edd95265c SHA512 46867396b66453c63624e54c382845b898b10768db0560100f021e57ec80189785093be38eeaf19c50a9e4728de2b6e605267a8f1d5a5596aaa75958c0e3a6b0
 DIST marco-1.24.0.tar.xz 1827076 BLAKE2B e4bcf8584199cbe4f9f813c7512176dd9b84a39ed162cd051f1f174c428828d1d73d6ab64c19ca681f0aea966742e0474256935f2a7c0c490b77dda91147162c SHA512 b257994c097f174fe83f3f0f4d6b6991e8c0f402daffd99f8a9521d588b609c56953e73dd4d143be64f5c9a4caa8d890ff30a120e18a9d5b36c6f856a7190428
+DIST marco-1.24.1.tar.xz 1860008 BLAKE2B b147e6ce8aad9382b2e8d96eec2da0356cce91977f4387776359ffb1f26903d7f0b9d9a1d43a436d1a64033f545600e7f810a29e3ae6ecdfb0d73ef8073b782c SHA512 55607898b64f0da3a85dd8d7fd092d847c8f67cefa096a63dbe074c197157a3d661fcb3f2a495b4425340b583b600cda3d1c92ac08b7327904dbd4aab8e92c85
 EBUILD marco-1.22.4-r2.ebuild 1475 BLAKE2B 77a83a4e4e7d32f02a7d7de5d15e7ef5ff23a4386d30c8873bfdc3dbe4a562d470a0dae4724fad3cbffbb46d00d956d43bcd74ff6bdb5183bb75e647de7098b2 SHA512 6a8c138b654cb33f1389587dd60239847ba0d952e017a74407fbe2eecfcf6553770d249c7a2b036d3bb087dd24f55517db714c0359e39083dbea9239d81861f7
-EBUILD marco-1.24.0-r1.ebuild 1485 BLAKE2B dc08a2e61ce2eb12c552341552d97fe73063e696d13a3257de25554448e7c040bf1cb30f48b5c2cc2647df6a38816cae17653071b2aa50908c9d37390da8cccc SHA512 82d828b42511b687d67c5910ac9635fe0b61b690a187181363392a9e97f4a8e9f7199ef30615b4baf96350dcba2303c220965624eba7a4df6041912418f1ad6e
-EBUILD marco-1.24.0.ebuild 1483 BLAKE2B 892fc383553d75e6a572b8c3ed10256fb553909131758a6cebd3cb1e851c8a2ede9c9dcacc95a25ef61d8195354b263709718cd5871cf396be91fc97707f15dc SHA512 fe1bd773fd110d273800716894b391558a049e07c8cc0132a3892f69bac3593b44f378ad9c7a78f66502d37229a0e4863db1bcad94687f3900f3c6e2a63d012f
+EBUILD marco-1.24.0-r2.ebuild 1504 BLAKE2B 58da594bf9ce3e1930ccfd1f43b64cdddd5c74ce54d9fb4199aa5c99fa96961640c40bd1b67cabb306a5c72a4780d77d9eea078e488d8d133d7fef657a9ef98b SHA512 506253ae98268e699848c937f826b1072f13e41868a4057f30b6090f9ae2cea30ad319183a3ec2ff709a9bf5767d25a3f503eed281242b836e8c83095b5ae5b6
+EBUILD marco-1.24.1.ebuild 1506 BLAKE2B 23a2e5ed1605eb0457fe6ec558374aaea77775b9cc0aa9321209da72b4ac509ef896efed15b9665e7c50490b9f0b84f1f24a7e2f271a46e18f0282861f8e466d SHA512 aa40eae15416b859fc2c9c23b16c46b97763908325709743c14ef24596bae37a35e407f28ff7b876481df8586f8bc320c518a08df638ef734ff55916afd4dbfd
 MISC metadata.xml 334 BLAKE2B 4a521e1c77d597f68a11cdaa695afcb40a5a2670a7fd643db0999362884a0bad7fb8106b7ba479a939930fbf0323c7f22186cf3fca5583210227a819631ead5d SHA512 f55f007780c371bc133eb3b8eed1bb4f930cab1e29c9ff0ab2dd99cd2e1458058dc86bf3fd70e9f4e9f1db259a7b8a5a247b04282ca08e88d767ee2f1878a451
diff --git a/x11-wm/marco/marco-1.24.0.ebuild b/x11-wm/marco/marco-1.24.0-r2.ebuild
index 10f95fe208f8..3a7cf634c890 100644
--- a/x11-wm/marco/marco-1.24.0.ebuild
+++ b/x11-wm/marco/marco-1.24.0-r2.ebuild
@@ -8,12 +8,12 @@ MATE2_LA_PUNT="yes"
 inherit mate
 
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 DESCRIPTION="MATE default window manager"
 LICENSE="FDL-1.2+ GPL-2+ LGPL-2+ MIT"
-SLOT="0"
+SLOT="0/2"
 
 IUSE="startup-notification test xinerama"
 RESTRICT="!test? ( test )"
@@ -59,6 +59,7 @@ DEPEND="${COMMON_DEPEND}
 
 src_configure() {
 	mate_src_configure \
+		--disable-static \
 		--enable-compositor \
 		--enable-render \
 		--enable-shape \
diff --git a/x11-wm/marco/marco-1.24.0-r1.ebuild b/x11-wm/marco/marco-1.24.1.ebuild
index 83c4dce13d8e..02b3042b4bbc 100644
--- a/x11-wm/marco/marco-1.24.0-r1.ebuild
+++ b/x11-wm/marco/marco-1.24.1.ebuild
@@ -59,6 +59,7 @@ DEPEND="${COMMON_DEPEND}
 
 src_configure() {
 	mate_src_configure \
+		--disable-static \
 		--enable-compositor \
 		--enable-render \
 		--enable-shape \
diff --git a/x11-wm/metacity/Manifest b/x11-wm/metacity/Manifest
index 6ab368343586..3bc92a7c5272 100644
--- a/x11-wm/metacity/Manifest
+++ b/x11-wm/metacity/Manifest
@@ -1,3 +1,5 @@
 DIST metacity-3.34.1.tar.xz 2055708 BLAKE2B c1bac27f83d26718fa3d02f777a627324efc3e3eaffbf385a84dd97960adc30e84090f511500fe96a4fbbb373da80a38eaba4c5e14910fbcf8783857c0767ef2 SHA512 e9234ad0aee9fe27cf1c2030e31d8f2c292ae2ee2e9b8546ed86e396152faa9dc4cc67fa8321a0c3d3bf577a83bc143111c6ac225f423db243347a6a760695ee
+DIST metacity-3.36.1.tar.xz 2063452 BLAKE2B 2dd7b1c63e0b5f87ce4518d7d42d472223717012a46dd826dfda3c88f7e647809e6bf2449a28bd38573342fd5fec94e2233db958658ea4320b22c5451390e451 SHA512 98e73036cca238b713a112194b2cd7a866bcf7d08ef29fb590054b69a1bd807699317a51f9b851f9c474ae2557e27dc9fc4a52d7c436d93ad4a02babef68feeb
 EBUILD metacity-3.34.1.ebuild 1233 BLAKE2B 6849286bfcc9997d335d7e842a6b03a6150707adae71c0f224b7d4dbe2fe41d3fbf0c89d18780b4f3b36dee20c01026171caa98cae840751b30ef8fe18550a96 SHA512 3519262f4f14a86750a3f833adcb8ef88282ef797c2c2a8c47531ff507d6f81713f336e8a04eb2573b9e485db427de10d7a4469a2b4a832994b48cbcc8c4c621
+EBUILD metacity-3.36.1.ebuild 1230 BLAKE2B 5ed0a66a03c26b6dec890a10cefe295d703df73b2af5fa996d192d3f91d30f454a359886a71b329cc95f980541231ede4eb724d63dd3f828bc07f4316c9cf852 SHA512 55217e43229292e884d88d4abc6f88b7626ef41904127e0b39f77da84d44d73970f53bac28d803eff48ede7b5fa07cd8c2a06476b9aab021037e5932b4fedcf8
 MISC metadata.xml 477 BLAKE2B 592b2957c7bff2b55505a056a2eef8d8cec25eecb400b5046bfbbd84eadfc6baa1f1475fd772a568538360c6867f0b5c0934d85bc5c6fd6ad362d80bad31ea33 SHA512 e475ae41ee3fa97f037acca5634bcb8ded17e783183459aeb83b3566df36fe7d09832991e9252f59e900982bcd0c80e8987bccc2c3e042080405d5448af9423a
diff --git a/x11-wm/metacity/metacity-3.36.1.ebuild b/x11-wm/metacity/metacity-3.36.1.ebuild
new file mode 100644
index 000000000000..bc33e8f6558b
--- /dev/null
+++ b/x11-wm/metacity/metacity-3.36.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2
+
+DESCRIPTION="GNOME Flashback window manager"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/metacity/"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="+libcanberra vulkan xinerama"
+KEYWORDS="~amd64"
+
+# TODO: libgtop could be optional, but no knob
+RDEPEND="
+	>=dev-libs/glib-2.44.0:2
+	>=x11-libs/gtk+-3.22.0:3[X]
+	>=x11-libs/pango-1.2.0
+	>=x11-libs/libXcomposite-0.3
+	>=gnome-base/gsettings-desktop-schemas-3.3.0
+	x11-libs/libXfixes
+	x11-libs/libXrender
+	x11-libs/libXdamage
+	libcanberra? ( media-libs/libcanberra[gtk3] )
+	>=x11-libs/startup-notification-0.7
+	x11-libs/libXcursor
+	gnome-base/libgtop:2=
+	x11-libs/libX11
+	xinerama? ( x11-libs/libXinerama )
+	x11-libs/libXrandr
+	x11-libs/libXext
+	x11-libs/libICE
+	x11-libs/libSM
+	gnome-extra/zenity
+	vulkan? ( media-libs/vulkan-loader )
+"
+DEPEND="${RDEPEND}
+	vulkan? ( dev-util/vulkan-headers )
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.4
+	x11-base/xorg-proto
+	virtual/pkgconfig
+" # autoconf-archive for eautoreconf
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		$(use_enable libcanberra canberra) \
+		$(use_enable xinerama) \
+		$(use_enable vulkan)
+}
diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest
index bcefb1547381..5e5852cf2f98 100644
--- a/x11-wm/mutter/Manifest
+++ b/x11-wm/mutter/Manifest
@@ -1,11 +1,14 @@
 AUX 3.32-eglmesaext-include.patch 2078 BLAKE2B cea9ba1a8d2749eb3590dd17a598aace69ad96897cbc5a6c1061c4041a8fe3809ff9f5bcc99cbdc33611a3a3319cda20f74f88434e71f03f2a1cac108185f3fb SHA512 23296f0e0b6ffd4610be3f0c6e1d524d15a5d259c5607a7ded4a8c39846f555dee92e5a8bb9c766211b758f8bc7483715a9640718bb9b7daa42905d802b2ee71
 AUX 3.34.6-XInitThreads.patch 1625 BLAKE2B 5b9ff02d96643105d0b865da0821ed6d4a849c8a42d5787c0eadbee4f7943ba5028471bb8424b87ee716d7ae9581b29f6f219c65371a6307da8eb04e0a5a94a2 SHA512 b223845da63ddbba5eaffa9b2a85e1cdaaee9126707d10c902814d35596857fca733ac290b86648ec506cc7bea2432b95ed5c5ea18dd598e539fcd0670620065
 AUX 3.34.6-tests-dontreq-gdkwayland.patch 1730 BLAKE2B d796a4dc91d756ac4af24c411e9f6ef33fcd02443585a3662bf58f04498305aa6b458ab0ace5191a97d9c66ba81cec9ee75099d7e77436eb39c3bec33bb68e26 SHA512 841f59c00f061302f411ce5ed5c25ef041f13a57d44da011815cfb2c1f80cccea1963675dc023d82aac4824b620861876ca628b6165db74b150564222b786b22
-DIST mutter-3.34.5.tar.xz 2804640 BLAKE2B b73a34f4e064b74b321b7ac54749170663c10874a82c0e4f6b20b1f9d97662af0ba188e5ac13a187117765b8aee820fc7367dfbeecc26002942151e77433012c SHA512 4199cf66e6551ebf80b9d2217e3164b1de30b055c58a64bc2d88961aad3a35c137174f6aea96f0250fa3efb2bf4676aa409fefb1a9237bbc7acf438aeed2e78a
 DIST mutter-3.34.6-patchset.tar.xz 4748 BLAKE2B 103f17256c7a9f347aadd58119e0e92c844bf372723e1462ea343fe9a80d7ed9dd55ad04215216dd51f97143e23b201e056f2e17a1808a22fe2d4e0f8e8da659 SHA512 79e1d72d14643ef3b6d9da0532ca636e41a110bcc7e8fe1553940ca6c1e2cf6414923a707bdde7823449ef7b0535d8c97ae0ae57a02f55e90950e8c127340ade
 DIST mutter-3.34.6.tar.xz 2805328 BLAKE2B bba0e062ab81f8e88e7e59b6dbf51226b6e2d43932c7d61aca5a3e709119f909e30acea67a5444c95205ddf929a1f5bf7785eec7aed4f2da743c19543aa79962 SHA512 dd240fdcfc8ba0c62c0ff423a40ec6e0007d154f0be39e18cea543da7ff548e10a9b712f9b2cc09c58ad342b1e7eb50fb2a8790c55d284846bb6f1a76f8c6d6b
-EBUILD mutter-3.34.5.ebuild 4601 BLAKE2B bc7d2781611d8653fdab53b787f370232f7fce34ad9e981d570fcb3b862d6fb53742097735be12f1c338f24dc7e8d4f7fb3b18f9966d3e1e6f7abe63e802268e SHA512 c0c3779418ecbc68cb5a7cc3b54ae2b944b7f2cd64248e647d1f19104c7e344d797da5255c944cc5b21b88c53823bcbd5df0982944657ba2ee5157d2d959b9d0
+DIST mutter-3.36.4-patchset.tar.xz 9064 BLAKE2B 62a66010a2daf8584ae6bc79d81425e4283ebf3a97d9bbf4e52d486dc3460c9f501f1d18adcf95fc5016678b235931ed095c1edfa3f86374d826c8808927956a SHA512 fb84a44e7676f14b906c54c36696f7c4c0b154ff8e08786d87ae2320ddec2aa8f275b7d5481e434d4ea6c4a06d3221cfe53f8642bc7e98037937f3ff921b33c8
+DIST mutter-3.36.4.tar.xz 2687224 BLAKE2B edf86573bcecaff67b666205460ce8748e0e58f03a14f3f04ae01e0afed6e2909d16d4c2bc53d2e95e9ad2d5b3a8223d06245e01c7dbcc51dc6e04b463767935 SHA512 e7130e59d5539a53ac8a349a38ce1ce757c6eee2ba672fc9eab9330bde32217674a9a206bd977db03195dc42b6c327147467407dd0159c4e8585332d9c1daabb
+DIST mutter-3.36.5.tar.xz 2687916 BLAKE2B 15eedc6b1a7c5fdb3a355b8aa4b5586491d0fc50ef293b200b747e9d2a8540df9dcb5d492edb30d1a51b779bf4faceba9448535475c65864d08219eb94e71599 SHA512 cf02003578ebe4d025006b7dc8c277e5a2240373d41fd21e9e7a0ea3d7f323454925a09a5f77117e63a95d4f7663fc4ad7b6e21b042044a8a1a5238713f8d5ec
 EBUILD mutter-3.34.6-r1.ebuild 4693 BLAKE2B f5ec4765d9f830be04ff211c47bd90bcaa22b872907adefe4017f1dcb6c2ac6160c6e3d41b203c5863e5ba0fc9a21285b2ed2de66234bf1c8af73f9c6635f3fe SHA512 b0f35b7b730b90f9dd64ab2e1749904b9fd287d58ca80e1b16accdea79eff5d7fb8a369da495341bcc5c6d0d51fa1ed801fd282d84014be5722354940358701e
 EBUILD mutter-3.34.6-r2.ebuild 4758 BLAKE2B e1d099094f754a2554ef29263f6a2fe7573bcf6ea03f268a2d29b22047d4f1bc025ad1991e216da7329331de7216819afe703759670b9391c16b955a49c83a7e SHA512 06b01e1998c4c2b45ea91e4b96382ddadf28c841f0aef43becd078b239c8cc83b8543b34f452be16ed079f0ab9642979604bb2ca76ab55642e3992e1c3b83601
-EBUILD mutter-3.34.6.ebuild 4603 BLAKE2B 888ff9338623e03e37f9ca1bc3df553361c35ffe79aa85f7dfec96182436c1c4154fdabb5d7be36166322f996cfc6bc877fa2d42d7ccd4cbf38295a5ff50afbe SHA512 8840607602e87567e2cd8307196269655b5cc516834cce262ee2841debdbd8151b6889a901e39d6ce251eaf2261295326fd31d17d284dace45da618436e1ef59
+EBUILD mutter-3.36.4-r1.ebuild 4772 BLAKE2B 8fbe6abab388bb25743cef1fb2cfb3f533540330a49a4ff6600e69be1ef7bbb8ff02d5978cea9891c3553ce95027bd3214a8556b1b9287c72a438cdd84ccf1ac SHA512 939bf6555a4f030feafa231c5ccdbd31cccd757f96c07a1cdf2ecf96ce9b9fee9e8c61f23934d03ff11008a710aa2c6cef15d6d2f24579170a0a891caa5e2930
+EBUILD mutter-3.36.4.ebuild 4661 BLAKE2B e0e5d0a05570c74d936cb1257f41d1a0bcca8f5cbb2a455c2cd5ab19b0773b65560a395323145afbe11814770ed4abbf7790abc7149d6142c0afe4f9d153ea91 SHA512 ce2d1390285e22b2866fd4abb2aa6b0597d40375f67d02d85548150bab0c7359b057057cfd9faeb35169d835e5b719f24987bfed0eacc0ba3924a713e6e7a228
+EBUILD mutter-3.36.5.ebuild 4633 BLAKE2B b339ba281c3a153619156c7b69add8056abd50af5f356a8d46537e33810ff3cd061bba04c2a5ab1eaea0d671fd4197cf11b5ff43794ea5e8a7b1398a9683dfcf SHA512 7dd8fae79e9242ef11d624fb8296a2190ad720bf72cb2dede6cbca0871c598e8928ee64c8af52f54abad825f785bac0339cecf52f185b5b5513dde5d7eaa691b
 MISC metadata.xml 605 BLAKE2B 5dc68fbf8b85c2bf75ea435abe116a9ed7072ec40a45bda28de9cb277a03e5c363487f1c3aa5c60cab5f710e06f15d966790684cac1573676af635e59b3cdfbd SHA512 440e7a33404e218da15c127614d843edcd42c469aced4609c2e7d7d8ec1281c9eceb64aebe406a75e9ba0a05b6be18bbb721257e140f6d334aff6143b1233fb8
diff --git a/x11-wm/mutter/mutter-3.34.5.ebuild b/x11-wm/mutter/mutter-3.36.4-r1.ebuild
index 72c020d0f4a9..1378bd57cf53 100644
--- a/x11-wm/mutter/mutter-3.34.5.ebuild
+++ b/x11-wm/mutter/mutter-3.36.4-r1.ebuild
@@ -6,9 +6,10 @@ inherit gnome.org gnome2-utils meson virtualx xdg
 
 DESCRIPTION="GNOME 3 compositing window manager based on Clutter"
 HOMEPAGE="https://gitlab.gnome.org/GNOME/mutter/"
+SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
 
 LICENSE="GPL-2+"
-SLOT="0/5" # 0/libmutter_api_version - ONLY gnome-shell (or anything using mutter-clutter-<api_version>.pc) should use the subslot
+SLOT="0/6" # 0/libmutter_api_version - ONLY gnome-shell (or anything using mutter-clutter-<api_version>.pc) should use the subslot
 
 IUSE="elogind input_devices_wacom +introspection screencast +sysprof systemd test udev wayland"
 # native backend requires gles3 for hybrid graphics blitting support, udev and a logind provider
@@ -17,13 +18,14 @@ REQUIRED_USE="
 	test? ( wayland )"
 RESTRICT="!test? ( test )"
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 # gnome-settings-daemon is build checked, but used at runtime only for org.gnome.settings-daemon.peripherals.keyboard gschema
 # xorg-server is needed at build and runtime with USE=wayland for Xwayland
 # v3.32.2 has many excessive or unused *_req variables declared, thus currently the dep order ignores those and goes via dependency() call order
 DEPEND="
 	x11-libs/libX11
+	>=media-libs/graphene-1.9.3[introspection?]
 	>=x11-libs/gtk+-3.19.8:3[X,introspection?]
 	x11-libs/gdk-pixbuf:2
 	>=x11-libs/pango-1.30[introspection?]
@@ -52,13 +54,14 @@ DEPEND="
 	x11-libs/libICE
 	>=dev-libs/atk-2.5.3[introspection?]
 	>=media-libs/libcanberra-0.26
+	sys-apps/dbus
 	media-libs/mesa[X(+),egl]
 	wayland? (
-		>=dev-libs/wayland-protocols-1.18
+		>=dev-libs/wayland-protocols-1.19
 		>=dev-libs/wayland-1.13.0
 		x11-libs/libdrm:=
 		>=media-libs/mesa-10.3[egl,gbm,wayland,gles2]
-		>=dev-libs/libinput-1.4
+		>=dev-libs/libinput-1.7
 		systemd? ( sys-apps/systemd )
 		elogind? ( sys-auth/elogind )
 		x11-base/xorg-server[wayland]
@@ -68,7 +71,7 @@ DEPEND="
 	x11-libs/libSM
 	input_devices_wacom? ( >=dev-libs/libwacom-0.13 )
 	>=x11-libs/startup-notification-0.7
-	screencast? ( >=media-video/pipewire-0.2.2:0/0.2 )
+	screencast? ( >=media-video/pipewire-0.3.0:0/0.3 )
 	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
 "
 RDEPEND="${DEPEND}
@@ -76,8 +79,7 @@ RDEPEND="${DEPEND}
 "
 DEPEND="${DEPEND}
 	x11-base/xorg-proto
-	sysprof? ( >=dev-util/sysprof-capture-3.34.1-r1:3
-		<dev-util/sysprof-capture-3.35:3 )
+	sysprof? ( >=dev-util/sysprof-capture-3.35.2:3 )
 "
 # wayland bdepend for wayland-scanner, xorg-server for cvt utility
 BDEPEND="
@@ -93,7 +95,8 @@ BDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}"/3.32-eglmesaext-include.patch
+	"${WORKDIR}"/patches/ # various gnome-3-36 patches for screencast
+	"${FILESDIR}"/3.34.6-tests-dontreq-gdkwayland.patch
 )
 
 src_configure() {
diff --git a/x11-wm/mutter/mutter-3.36.4.ebuild b/x11-wm/mutter/mutter-3.36.4.ebuild
new file mode 100644
index 000000000000..e85b8ba36518
--- /dev/null
+++ b/x11-wm/mutter/mutter-3.36.4.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome.org gnome2-utils meson virtualx xdg
+
+DESCRIPTION="GNOME 3 compositing window manager based on Clutter"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/mutter/"
+
+LICENSE="GPL-2+"
+SLOT="0/6" # 0/libmutter_api_version - ONLY gnome-shell (or anything using mutter-clutter-<api_version>.pc) should use the subslot
+
+IUSE="elogind input_devices_wacom +introspection +sysprof systemd test udev wayland"
+# native backend requires gles3 for hybrid graphics blitting support, udev and a logind provider
+REQUIRED_USE="
+	wayland? ( ^^ ( elogind systemd ) udev )
+	test? ( wayland )"
+RESTRICT="!test? ( test )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+# gnome-settings-daemon is build checked, but used at runtime only for org.gnome.settings-daemon.peripherals.keyboard gschema
+# xorg-server is needed at build and runtime with USE=wayland for Xwayland
+# v3.32.2 has many excessive or unused *_req variables declared, thus currently the dep order ignores those and goes via dependency() call order
+DEPEND="
+	x11-libs/libX11
+	>=media-libs/graphene-1.9.3[introspection?]
+	>=x11-libs/gtk+-3.19.8:3[X,introspection?]
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/pango-1.30[introspection?]
+	>=dev-libs/fribidi-1.0.0
+	>=x11-libs/cairo-1.14[X]
+	>=gnome-base/gsettings-desktop-schemas-3.33.0[introspection?]
+	>=dev-libs/glib-2.61.1:2
+	gnome-base/gnome-settings-daemon
+	>=dev-libs/json-glib-0.12.0[introspection?]
+	gnome-base/gnome-desktop:3=
+	>=x11-libs/libXcomposite-0.4
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	>=x11-libs/libXfixes-3
+	>=x11-libs/libXi-1.7.4
+	x11-libs/libXtst
+	x11-libs/libxkbfile
+	x11-misc/xkeyboard-config
+	>=x11-libs/libxkbcommon-0.4.3[X]
+	x11-libs/libXrender
+	>=x11-libs/libXrandr-1.5.0
+	x11-libs/libxcb
+	x11-libs/libXinerama
+	x11-libs/libXau
+	x11-libs/libICE
+	>=dev-libs/atk-2.5.3[introspection?]
+	>=media-libs/libcanberra-0.26
+	sys-apps/dbus
+	media-libs/mesa[X(+),egl]
+	wayland? (
+		>=dev-libs/wayland-protocols-1.19
+		>=dev-libs/wayland-1.13.0
+		x11-libs/libdrm:=
+		>=media-libs/mesa-10.3[egl,gbm,wayland,gles2]
+		>=dev-libs/libinput-1.7
+		systemd? ( sys-apps/systemd )
+		elogind? ( sys-auth/elogind )
+		x11-base/xorg-server[wayland]
+	)
+	udev? ( >=dev-libs/libgudev-232:=
+		>=virtual/libudev-232-r1:= )
+	x11-libs/libSM
+	input_devices_wacom? ( >=dev-libs/libwacom-0.13 )
+	>=x11-libs/startup-notification-0.7
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+RDEPEND="${DEPEND}
+	gnome-extra/zenity
+"
+DEPEND="${DEPEND}
+	x11-base/xorg-proto
+	sysprof? ( >=dev-util/sysprof-capture-3.35.2:3 )
+"
+# wayland bdepend for wayland-scanner, xorg-server for cvt utility
+BDEPEND="
+	dev-libs/wayland
+	>=dev-util/meson-0.50.0
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	test? ( app-text/docbook-xml-dtd:4.5 )
+	wayland? ( >=sys-kernel/linux-headers-4.4
+		x11-base/xorg-server )
+"
+
+PATCHES=(
+	"${FILESDIR}"/3.34.6-tests-dontreq-gdkwayland.patch
+)
+
+src_configure() {
+	# TODO: Replicate debug vs release meson build type behaviour under our buildtype=plain
+	local emesonargs=(
+		-Dopengl=true
+		#opengl_libname
+		#gles2_libname
+		$(meson_use wayland gles2)
+		-Degl=true
+		-Dglx=true
+		$(meson_use wayland)
+		$(meson_use wayland native_backend)
+		-Dremote_desktop=false # TODO: Re-enable with pipewire:0.3, but first get patches from gnome-3-36 for screencast on top of 3.36.4
+		-Degl_device=false # This should be dependent on wayland,video_drivers_nvidia, once eglstream support is there
+		-Dwayland_eglstream=false # requires packages egl-wayland for wayland-eglstream-protocols.pc
+		$(meson_use udev)
+		$(meson_use input_devices_wacom libwacom)
+		-Dpango_ft2=true
+		-Dstartup_notification=true
+		-Dsm=true
+		$(meson_use introspection)
+		$(meson_use test cogl_tests)
+		$(meson_use wayland core_tests) # core tests require wayland; overall -Dtests option is honored on top, so no extra conditional needed
+		$(meson_use test clutter_tests)
+		$(meson_use test tests)
+		$(meson_use sysprof profiler)
+		-Dinstalled_tests=false
+		#verbose # Let upstream choose default for verbose mode
+		#xwayland_path
+		# TODO: relies on default settings, but in Gentoo we might have some more packages we want to give Xgrab access (mostly virtual managers and remote desktops)
+		#xwayland_grab_default_access_rules
+	)
+	meson_src_configure
+}
+
+src_test() {
+	glib-compile-schemas "${BUILD_DIR}"/data
+	GSETTINGS_SCHEMA_DIR="${BUILD_DIR}"/data virtx meson_src_test
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/x11-wm/mutter/mutter-3.34.6.ebuild b/x11-wm/mutter/mutter-3.36.5.ebuild
index 0d1a9f2d48c9..c4f63fe179e3 100644
--- a/x11-wm/mutter/mutter-3.34.6.ebuild
+++ b/x11-wm/mutter/mutter-3.36.5.ebuild
@@ -8,7 +8,7 @@ DESCRIPTION="GNOME 3 compositing window manager based on Clutter"
 HOMEPAGE="https://gitlab.gnome.org/GNOME/mutter/"
 
 LICENSE="GPL-2+"
-SLOT="0/5" # 0/libmutter_api_version - ONLY gnome-shell (or anything using mutter-clutter-<api_version>.pc) should use the subslot
+SLOT="0/6" # 0/libmutter_api_version - ONLY gnome-shell (or anything using mutter-clutter-<api_version>.pc) should use the subslot
 
 IUSE="elogind input_devices_wacom +introspection screencast +sysprof systemd test udev wayland"
 # native backend requires gles3 for hybrid graphics blitting support, udev and a logind provider
@@ -24,6 +24,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 # v3.32.2 has many excessive or unused *_req variables declared, thus currently the dep order ignores those and goes via dependency() call order
 DEPEND="
 	x11-libs/libX11
+	>=media-libs/graphene-1.9.3[introspection?]
 	>=x11-libs/gtk+-3.19.8:3[X,introspection?]
 	x11-libs/gdk-pixbuf:2
 	>=x11-libs/pango-1.30[introspection?]
@@ -52,13 +53,14 @@ DEPEND="
 	x11-libs/libICE
 	>=dev-libs/atk-2.5.3[introspection?]
 	>=media-libs/libcanberra-0.26
+	sys-apps/dbus
 	media-libs/mesa[X(+),egl]
 	wayland? (
-		>=dev-libs/wayland-protocols-1.18
+		>=dev-libs/wayland-protocols-1.19
 		>=dev-libs/wayland-1.13.0
 		x11-libs/libdrm:=
 		>=media-libs/mesa-10.3[egl,gbm,wayland,gles2]
-		>=dev-libs/libinput-1.4
+		>=dev-libs/libinput-1.7
 		systemd? ( sys-apps/systemd )
 		elogind? ( sys-auth/elogind )
 		x11-base/xorg-server[wayland]
@@ -68,7 +70,7 @@ DEPEND="
 	x11-libs/libSM
 	input_devices_wacom? ( >=dev-libs/libwacom-0.13 )
 	>=x11-libs/startup-notification-0.7
-	screencast? ( >=media-video/pipewire-0.2.2:0/0.2 )
+	screencast? ( >=media-video/pipewire-0.3.0:0/0.3 )
 	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
 "
 RDEPEND="${DEPEND}
@@ -76,8 +78,7 @@ RDEPEND="${DEPEND}
 "
 DEPEND="${DEPEND}
 	x11-base/xorg-proto
-	sysprof? ( >=dev-util/sysprof-capture-3.34.1-r1:3
-		<dev-util/sysprof-capture-3.35:3 )
+	sysprof? ( >=dev-util/sysprof-capture-3.35.2:3 )
 "
 # wayland bdepend for wayland-scanner, xorg-server for cvt utility
 BDEPEND="
@@ -93,7 +94,7 @@ BDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}"/3.32-eglmesaext-include.patch
+	"${FILESDIR}"/3.34.6-tests-dontreq-gdkwayland.patch
 )
 
 src_configure() {
diff --git a/x11-wm/openbox/Manifest b/x11-wm/openbox/Manifest
index 41101e863b37..ac7826a7eb6d 100644
--- a/x11-wm/openbox/Manifest
+++ b/x11-wm/openbox/Manifest
@@ -2,7 +2,6 @@ AUX openbox-3.5.2-gnome-session.patch 574 BLAKE2B 64d1d141245172140c16e7d4bee919
 AUX openbox-3.6.1-py3-xdg.patch 4702 BLAKE2B 52e8f35626bf71a10327efe99d518994aece46561f4cb4d26d71412f8f5e1528efbd17c48b38a902053b6d3eefbaa9b79f79c06783d669b0c76cbdf256300463 SHA512 7079cf38a79e2fe7e35c07a5600de8a4678961239d3990596378239f064522204ca40522861f1d403d6e621bca92ca14b06873645ba60fda2c86a4132a9aa16a
 DIST openbox-3.6.1.tar.gz 962665 BLAKE2B 1c0288137d7b02d443c384f970cd9a3f4d5d5585989917ac6ae8cf492e045dc086650c245907e168bc7b6d0ce701339854a5d94ad510823141cc78e28c1e13c5 SHA512 5e6f4a214005bea8b26bc8959fe5bb67356a387ddd317e014f43cb5b5bf263ec617a5973e2982eb76a08dc7d3ca5ec9e72e64c9b5efd751001a8999b420b1ad0
 DIST surreal-gentoo.tar.gz 13410 BLAKE2B e7d902278004785c68a2e5aa02aa326cee1ef04fe964fce283afde00cb668b06d5d8461207ef9571aa402b960ec16bdff6bf11cf38ca9a76335ced173592ffce SHA512 dd43cb78e5e33345767edad22d0470765ac9eeae02bbad0acd8098bc096c15a166bf651493d12a5953bc043c9be92e9b160607eafb4723a6bcfc5d1d6fae235e
-EBUILD openbox-3.6.1-r3.ebuild 2714 BLAKE2B 735fbe7b73f32fbd7c803fbc680d0477d02de029352a0221696d8037bf57d2a59b8c806193ae3f0a87310180e3a1ed3e9be5d3f88de84ca62227d3f02687000a SHA512 9f12c32c065eb54b9b50aa0444ea1d1e291e7a99c0b0b121c8940417c0ad99c2d1767dc2a2bdad786048882ce45356d97fa7da2d4711290153a3d94fe001f8d1
-EBUILD openbox-3.6.1.ebuild 2608 BLAKE2B 310fb7279464260f025ece227bad2a3481ce1fbe3f841d212949ed6a6d4ed2143789092b6c702628dea66569f03fa5a716442a0a7b686c437f707f15a0e06290 SHA512 a915e92e485f840e864280a1d633d7d75de916ca812158544a7561254d1335727f996ca0bd7724ea3b2ac4f4624d90a3a33ee800a39f9ffb747d11257b2d1612
-EBUILD openbox-9999.ebuild 2722 BLAKE2B 64238c8c479fdf98589cfa021d4bbd1e1962705f83baadb53a942a1f8220a598802b11d9dc8ce124f3384022a991e97a05751a320ca2875ee6bd56be20895d89 SHA512 78a05754f7dea9ef8d3be428b03ac286305b1fda2b19211233e569c46a94b433942964daae33ff323d6ba7bfe3a591522c4ed74f19e9b48239d6f1d789c8fac8
+EBUILD openbox-3.6.1-r3.ebuild 2730 BLAKE2B b1be9672b17b2567551398ff87b21d4ae763f8ca4d69b763a791ed734345ca6785d0c478f0d521bfa16cbb0b5abc656226f28b786db8650e7f630567bc8e7771 SHA512 5cbe020ce5824fb79a7a82be4bccd16d983c21d49f7df9df7d689891416d5519fc4a36472087ff7c6e11f337633296cefe3ce9049d143e584cdb4927e5798e20
+EBUILD openbox-9999.ebuild 2738 BLAKE2B 49e801f54ac09734cd974cd39ecb8314252b17d62642c4b83fb93846f59386e655cd8b93fef65d090e7eee3ce2c2bef41af07fdb5b6f44e802e2e7171dfbd880 SHA512 b809f5e7a3e127a863d911cf757baa08a6c2879bc015444d6a1695beaa0c4e6384e8654ba2207a47b15a4d12da9a1ba166d0e72242149801acce0d813acb9ccb
 MISC metadata.xml 704 BLAKE2B 6a8354358ddaa1b4af8e662aa43800168e49aecc074ec4e9c353813e70650e5e44c6647a1848f465e74571367d873a5d32ead3a340e4da730432524adfc4eec5 SHA512 f232879857441d09e1a0b7251849ab466e0a1a5c75e035ab28aa5bc91a7d11e962cd618672aaa65746ec019fb5cd08a190a28e001a89b9e6a82f9afc11d5c207
diff --git a/x11-wm/openbox/openbox-3.6.1-r3.ebuild b/x11-wm/openbox/openbox-3.6.1-r3.ebuild
index a5c37f022d90..55a0b32061e7 100644
--- a/x11-wm/openbox/openbox-3.6.1-r3.ebuild
+++ b/x11-wm/openbox/openbox-3.6.1-r3.ebuild
@@ -24,7 +24,12 @@ SLOT="3"
 IUSE="branding debug imlib nls session startup-notification static-libs svg xdg"
 REQUIRED_USE="xdg? ( ${PYTHON_REQUIRED_USE} )"
 
-RDEPEND="dev-libs/glib:2
+BDEPEND="
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+RDEPEND="
+	dev-libs/glib:2
 	>=dev-libs/libxml2-2.0
 	>=media-libs/fontconfig-2
 	x11-libs/cairo
@@ -46,9 +51,8 @@ RDEPEND="dev-libs/glib:2
 		')
 	)
 "
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig
+DEPEND="
+	${RDEPEND}
 	x11-base/xorg-proto
 "
 
diff --git a/x11-wm/openbox/openbox-3.6.1.ebuild b/x11-wm/openbox/openbox-3.6.1.ebuild
deleted file mode 100644
index 810985f6f7cf..000000000000
--- a/x11-wm/openbox/openbox-3.6.1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-inherit multilib autotools ltprune python-r1 eutils
-
-DESCRIPTION="A standards compliant, fast, light-weight, extensible window manager"
-HOMEPAGE="http://openbox.org/"
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="git://git.openbox.org/dana/openbox"
-	SRC_URI="branding? (
-	https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )"
-else
-	SRC_URI="http://openbox.org/dist/openbox/${P}.tar.gz
-	branding? ( https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )"
-	KEYWORDS="~alpha amd64 arm ~arm64 hppa ~mips ppc ppc64 sparc x86 ~x86-linux"
-fi
-
-LICENSE="GPL-2"
-SLOT="3"
-IUSE="branding debug imlib nls session startup-notification static-libs svg xdg"
-REQUIRED_USE="xdg? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="dev-libs/glib:2
-	>=dev-libs/libxml2-2.0
-	>=media-libs/fontconfig-2
-	x11-libs/cairo
-	x11-libs/libXau
-	x11-libs/libXcursor
-	x11-libs/libXext
-	x11-libs/libXft
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	x11-libs/libXt
-	>=x11-libs/pango-1.8[X]
-	imlib? ( media-libs/imlib2 )
-	startup-notification? ( >=x11-libs/startup-notification-0.8 )
-	svg? ( gnome-base/librsvg:2 )
-	xdg? (
-		${PYTHON_DEPS}
-		dev-python/pyxdg[${PYTHON_USEDEP}]
-	)
-	"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig
-	x11-base/xorg-proto"
-
-src_prepare() {
-	use xdg && python_setup
-	epatch "${FILESDIR}"/${PN}-3.5.2-gnome-session.patch
-	sed -i \
-		-e "s:-O0 -ggdb ::" \
-		-e 's/-fno-strict-aliasing//' \
-		"${S}"/m4/openbox.m4 || die
-	epatch_user
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		$(use_enable debug) \
-		$(use_enable static-libs static) \
-		$(use_enable nls) \
-		$(use_enable imlib imlib2) \
-		$(use_enable svg librsvg) \
-		$(use_enable startup-notification) \
-		$(use_enable session session-management) \
-		--with-x
-}
-
-src_install() {
-	dodir /etc/X11/Sessions
-	echo "/usr/bin/openbox-session" > "${ED}/etc/X11/Sessions/${PN}"
-	fperms a+x /etc/X11/Sessions/${PN}
-	emake DESTDIR="${D}" install
-	if use branding; then
-		insinto /usr/share/themes
-		doins -r "${WORKDIR}"/Surreal_Gentoo
-		# make it the default theme
-		sed -i \
-			-e "/<theme>/{n; s@<name>.*</name>@<name>Surreal_Gentoo</name>@}" \
-			"${D}"/etc/xdg/openbox/rc.xml \
-			|| die "failed to set Surreal Gentoo as the default theme"
-	fi
-	use static-libs || prune_libtool_files --all
-	if use xdg ; then
-		python_replicate_script "${ED}"/usr/libexec/openbox-xdg-autostart
-	else
-		rm "${ED}"/usr/libexec/openbox-xdg-autostart || die
-	fi
-}
diff --git a/x11-wm/openbox/openbox-9999.ebuild b/x11-wm/openbox/openbox-9999.ebuild
index 736a89bce398..ad62edb8fa6f 100644
--- a/x11-wm/openbox/openbox-9999.ebuild
+++ b/x11-wm/openbox/openbox-9999.ebuild
@@ -24,7 +24,12 @@ SLOT="3"
 IUSE="branding debug imlib nls session startup-notification static-libs svg xdg"
 REQUIRED_USE="xdg? ( ${PYTHON_REQUIRED_USE} )"
 
-RDEPEND="dev-libs/glib:2
+BDEPEND="
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+RDEPEND="
+	dev-libs/glib:2
 	>=dev-libs/libxml2-2.0
 	>=media-libs/fontconfig-2
 	x11-libs/cairo
@@ -46,9 +51,8 @@ RDEPEND="dev-libs/glib:2
 		')
 	)
 "
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig
+DEPEND="
+	${RDEPEND}
 	x11-base/xorg-proto
 "
 
diff --git a/x11-wm/plwm/Manifest b/x11-wm/plwm/Manifest
deleted file mode 100644
index b9ab02c3105f..000000000000
--- a/x11-wm/plwm/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX plwm-2.7_rc1-pep0263.patch 653 BLAKE2B ee6122379b19aadd9227f7e502d60edd2b88bf8edad238c0793bdcbb5662cb54b38d00f3c8c651aeab1c4cbefab004a963cfd22765dadc2a4a1a8e30555f994d SHA512 82b596bf7d82cbbfbd8aee08f8e80a958f1d2c73526f60ad959082ca294dd58f663bbfde00a6d0fdbbe09059a811994b9edb268725b1aa0bd9e64e29b4dde1fe
-DIST PLWM-2.7rc1.tar.gz 343570 BLAKE2B e164a1c3244e2ebd8dd2899327ec0f76ce3e0c9b7caa5babcc1afa0e7368d5d0d14a313c59cc124e04b20cd5461a63011cd2c53a6e60d688dc5a657297ea38b0 SHA512 4716677c86cf6b31ba8ea6c4e8fad729d9cf7d9c09b7d56ba6686173793c5b248865f0af281561a2df161433ea0fb2f2ca050dfb3b6c9fedbe41ff0ad0c07f7e
-EBUILD plwm-2.7_rc1-r1.ebuild 899 BLAKE2B a1fb4b16e8a86d13a126655245f8d43343942199b8e5b104ee1b5b39d5f4f0c56da8e00803991ba6a671064645207405d151af97a94157bf649e6f53099bf0be SHA512 1f48aa82a02bb61e0f83995ff03b20060d29784c2f3bd5aa37a7ab7485e35a52a441d8705d2c9cbd6eac3d6bf6d8e9bbf5fb3367dcb62b2e786c16256b1cc2f4
-MISC metadata.xml 477 BLAKE2B ab66f624a7bb5f8aa9792068431a37e9e148f752cfd48963fed7ebe90d9877d5b73e294b65744fe8cbee7150abe43d59da9f3a4d686af5065defa3909dffbd0d SHA512 51aecc6428095675351a58b4059c8060a591e21a43b793a8d7aabed3613c9d72ee09f01ff9296e941febfeedc83987956097af7d420d61feba203e60d5a07033
diff --git a/x11-wm/plwm/files/plwm-2.7_rc1-pep0263.patch b/x11-wm/plwm/files/plwm-2.7_rc1-pep0263.patch
deleted file mode 100644
index aadc8f86f458..000000000000
--- a/x11-wm/plwm/files/plwm-2.7_rc1-pep0263.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -ur PLWM-2.7rc1.orig/examples/hrwwm.py PLWM-2.7rc1/examples/hrwwm.py
---- PLWM-2.7rc1.orig/examples/hrwwm.py	2007-08-27 15:06:29.000000000 +0200
-+++ PLWM-2.7rc1/examples/hrwwm.py	2007-08-27 15:07:33.000000000 +0200
-@@ -1,4 +1,5 @@
- #!/usr/bin/env python
-+# -*- coding: utf-8 -*-
- #
- # hrwwm.py -- Example PLWM window manager "configuration"
- #
-diff -ur PLWM-2.7rc1.orig/plwm/mw_apm.py PLWM-2.7rc1/plwm/mw_apm.py
---- PLWM-2.7rc1.orig/plwm/mw_apm.py	2007-08-27 15:06:29.000000000 +0200
-+++ PLWM-2.7rc1/plwm/mw_apm.py	2007-08-27 15:07:00.000000000 +0200
-@@ -1,3 +1,4 @@
-+# -*- coding: utf-8 -*-
- #
- # mw_apm.py -- display APM status in a modewindow
- #
diff --git a/x11-wm/plwm/metadata.xml b/x11-wm/plwm/metadata.xml
deleted file mode 100644
index d646a8a2cb4a..000000000000
--- a/x11-wm/plwm/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>axs@gentoo.org</email>
-	</maintainer>
-	<longdescription>
-		PLWM is a Python package, containing classes suitable for
-		implementing a window manager. PLWM is also a window manager,
-		using the PLWM package.
-	</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">plwm</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/x11-wm/plwm/plwm-2.7_rc1-r1.ebuild b/x11-wm/plwm/plwm-2.7_rc1-r1.ebuild
deleted file mode 100644
index bead79daae86..000000000000
--- a/x11-wm/plwm/plwm-2.7_rc1-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 eutils
-
-MY_P=PLWM-${PV/_}
-
-DESCRIPTION="Python classes for, and an implementation of, a window manager"
-HOMEPAGE="http://plwm.sourceforge.net/"
-SRC_URI="mirror://sourceforge/plwm/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND=">=dev-python/python-xlib-0.14[${PYTHON_USEDEP}]"
-DEPEND="sys-apps/texinfo"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
-	"${FILESDIR}"/${P}-pep0263.patch
-)
-
-python_compile_all() {
-	emake -C "${S}"/doc
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	python_newscript examples/examplewm.py plwm
-	python_doscript utils/*.py
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	doinfo doc/*.info
-
-	dodoc ONEWS
-	dodoc -r examples
-	docinto utils
-	dodoc utils/ChangeLog
-}
diff --git a/x11-wm/qtile/Manifest b/x11-wm/qtile/Manifest
index 95eafa930f58..39546ec45d4d 100644
--- a/x11-wm/qtile/Manifest
+++ b/x11-wm/qtile/Manifest
@@ -1,8 +1,7 @@
-AUX qtile-0.12.0-tests.patch 415 BLAKE2B f0701a380584a7e31b5141a8307a163ac8c54060279e9d994c9ee42b0454c376bd6350fa76e4d7eac5bd01623875f85f5d6b3fe9e4e6ad0dc872a70f7f9e0e23 SHA512 a3cef5aa6680baaef6ea22207efbe0b58ca3dddb7f713443422eac58893d33f5900a178bc2331073e3d5b6c408ddac0e087253f3a29f8f65c822747c4f080b84
 AUX qtile-session 1854 BLAKE2B 260c39642f805f9b94e59ab25d9e8d6e53abcb9fbed76f33434fdd2ccd65dc24c71b7ea654ced6393404656f2f26d96dc45a2b7e580190da408a396e76af2897 SHA512 4d7418316f6baeaa28b254f341c74641004bd58444c425f626c92e44bff046ec108d128a9e91c10daae75b222c5758e8f0e8a5e3b778b2af36409f4d4b778cbe
-DIST qtile-0.14.2.tar.gz 492274 BLAKE2B b5418424a4cea6844d500ea00b4fa5c4b93d529503a3ece1f651c82cd1c63689d8ba95a706fd97e7d93cf823a6155196d724f18e47f9fe283e4df2586e55b56f SHA512 c6653e8dca24cef4b1cf48c26b2a0feb4bc125a1c966e0a3ea078fd1d1bba9c7306facf620438795aa2d2daecbd6e58bcda954753ab6b27f6c0cbead3766d8c0
 DIST qtile-0.15.1.tar.gz 522233 BLAKE2B cb5c35ab6b2e22d36c2ef69a3d6367033440a25a1c06dad5c4d455b67aa1ddf2c639451e051abcd40b5a76e93250a54271408bbe09008b44a5ebf0a520b3eb2e SHA512 57dfeeea212346c14b922303b5d2fd950292383a1da3be6bf5ca0880bedaa3adb7ffc121df617cf763fcd1208c44e34a7ba128a1f2a6e8d3042dd6906ece7e20
-EBUILD qtile-0.14.2-r1.ebuild 1578 BLAKE2B adc02800e1896fee7e0f545ff149e8073c19e6193b2643c6fc7d453043f6aa99207de0e7caf93304f1b7e84477371936cd9e46518b6f7a888246cba6192418b3 SHA512 f18c56542ecf2fb82cf495f945c613e1658b71f17418a31ec3a0f42cd5381c628e0d9e152e6566987c5db1c88e7fa266061af228102f2e9d63b96e61e47ffba8
+DIST qtile-0.16.0.tar.gz 543646 BLAKE2B d0d2ae1bf44e08c7a40601fee0643fb387807546ebee5ab6f6756d7651be22fff75034227226fe978042b33594158b5493ca6203ecab92434418219a423a5817 SHA512 c8f712fcf48f166be0782560541d02959809f5c7d6ee209e3bf0b12325309521be79eab81e4f17f5111fb9426601ac5445db0bb3dc8330e9b426fa1031e95065
 EBUILD qtile-0.15.1.ebuild 1524 BLAKE2B 5b0a5da5aeb221f0a3003913476e91716e6e992e258315c1363a49a0fbf313cdd5c897c974aa1814e205e6eee4de0860b3e89725cae5d6322d85121dda5fc9d6 SHA512 6472d1237ac9a1f47c1ee08c924cbcae018acaa6ee0f4e7d69de725eb31a964d39a67f6ab8bb58756e31ab25d964b4332ab851ca96ce56850691ba63a562e40d
+EBUILD qtile-0.16.0.ebuild 1524 BLAKE2B 5b0a5da5aeb221f0a3003913476e91716e6e992e258315c1363a49a0fbf313cdd5c897c974aa1814e205e6eee4de0860b3e89725cae5d6322d85121dda5fc9d6 SHA512 6472d1237ac9a1f47c1ee08c924cbcae018acaa6ee0f4e7d69de725eb31a964d39a67f6ab8bb58756e31ab25d964b4332ab851ca96ce56850691ba63a562e40d
 EBUILD qtile-9999.ebuild 1577 BLAKE2B 7f082e34f42d2bcf6e355c71be6076263cdbb7b6060819dfbf22e9b311e09c4f772630a290ea176e9a7c178796610e7cbef7ca0d67867a07d2502435888681af SHA512 44b510b6405c03808052311b557c7f27bc799715063cc589d5d1344d7a2735220ec542778353e97e3b892d5b8c394b747d5764521a8d1fdaa225e733144d43ae
 MISC metadata.xml 323 BLAKE2B e89bf065a17c1ae7499e749e1b2e0af729cb64cdadc6c2ad8b06d34290ae0afca0da51802e3b855c24c9ecd23e78bae8ba9ba89e3a7f464bcf88b90622a9a442 SHA512 33be266eccb74e19b4bc89ff482e44b3542543b3f693d00bb37f1e3cd08e2465632050119d2722410d23de278bb6b1a52e2769441ca3456d3c116ef890a99a7b
diff --git a/x11-wm/qtile/files/qtile-0.12.0-tests.patch b/x11-wm/qtile/files/qtile-0.12.0-tests.patch
deleted file mode 100644
index 8443381b1766..000000000000
--- a/x11-wm/qtile/files/qtile-0.12.0-tests.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-The '~' character doesn't expand to $HOME in all build envs.
-
---- qtile-0.12.0/test/test_bar.py
-+++ qtile-0.12.0/test/test_bar.py
-@@ -105,8 +105,8 @@
-     assert c.complete("/bi") == "/bin/"
-     c.reset()
-     assert c.complete("/bin") != "/bin/"
--    c.reset()
--    assert c.complete("~") != "~"
-+    #c.reset()
-+    #assert c.complete("~") != "~"
- 
-     c.reset()
-     s = "thisisatotallynonexistantpathforsure"
diff --git a/x11-wm/qtile/qtile-0.14.2-r1.ebuild b/x11-wm/qtile/qtile-0.16.0.ebuild
index 0a9cd75b50db..dae1095c6247 100644
--- a/x11-wm/qtile/qtile-0.14.2-r1.ebuild
+++ b/x11-wm/qtile/qtile-0.16.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{7,8} )
 
 inherit distutils-r1 virtualx
 
@@ -45,8 +45,6 @@ BDEPEND="
 # display retry backoff slowness and failures
 RESTRICT="test"
 
-PATCHES=( "${FILESDIR}"/${PN}-0.12.0-tests.patch )
-
 python_test() {
 	# force usage of built module
 	rm -rf "${S}"/libqtile || die
diff --git a/x11-wm/sawfish/Manifest b/x11-wm/sawfish/Manifest
index 45a1e612f5bb..de9d503c1baf 100644
--- a/x11-wm/sawfish/Manifest
+++ b/x11-wm/sawfish/Manifest
@@ -4,5 +4,5 @@ AUX sawfish-1.12.0-fno-common.patch 987 BLAKE2B 9f5a94a226453b831efab89b46dc0022
 DIST sawfish_1.12.0.tar.xz 2814340 BLAKE2B 58901cf62d10641ef32756a3283c6d53b27a68a4af7c578c49e6968045f5993f744eb0b6c7b81da08b91774f1fb8faec467a6a22cd046a2fea135f749ac24319 SHA512 e8f831a9f6206ccf4e2a823bc3464c11b9d2d38a72ada4a142f952813a56c620b511f9cd8912bbf06e38976e54f1d9445f68d6dd24ee5ed59918c18de379e71f
 DIST sawfish_1.12.90.tar.xz 2602372 BLAKE2B 180d3ed1081fffa0fe6c60c15b96a4b530be1349e162d0b6e7553e753e0462aea89caf7bfe379b1993f883e544e27bb553d259d0348fcceb53619dc54536cc47 SHA512 444cdc21b368d9ffb89e1ccd0377d9ce9d9b42f9bd93aa85ca29763781f90cb393a0c9c8da47ff0a161bf5e3881e6d6895a7c5749761ccc7b4b5a1ed8438c93d
 EBUILD sawfish-1.12.0-r1.ebuild 2032 BLAKE2B 6aefde862da34a34dc1f4c570385e65a223d1b5538322877313dc9bb177939f485afb4ff7c70605976bdc351c042830c82e32e39e18d208893819c16aaaf7f39 SHA512 5a85929922b63fec43b0c89ea512063b743a178048b6c84efbe829444683ee6e0d8978d0b35cd6cc25ef2ea7f2602b5d5c0067521d58e740f5dd775dccd58865
-EBUILD sawfish-1.12.90.ebuild 2212 BLAKE2B 84693e0db216ccf54a672c06541e5b7ec18debd313fd9bb6549642c7c25206f69828f652890dc9fc9b496785cbe1a7642b51b3003286d992e0b60a2e55a0ae08 SHA512 b8cec5c9ed88049b4d1fb2889bb873053320a462771895aec0c107a1ff7cca726eca67c1caabd11ba740d32a3dfbc4aa02c04d8b4f322737c2e102e748f72f37
+EBUILD sawfish-1.12.90.ebuild 2210 BLAKE2B 8e6c5f397d7a01bd354b3eeb46703d375314e5b4a7e3983de9f4ad1ada85fc7a193cc698d27e4dd692fdcaa5c00c62a0f0286b89f075e4187d184a3aa4268539 SHA512 c3d5ce5d931093a632cee59965f8136a09889dd25c98c819b2404277b14aaa3ab6876aab5a924b8e90b003567fa331b65b7af8f9896aab45ee2dea2afc232d1c
 MISC metadata.xml 357 BLAKE2B 7ff08550d41c65ecf933abf4a3c1932a06f9462016ea8cff09145c713e7017dd68dd5e6473845eac654e0ae1fdded17e6b92b36a4f97db539524dfb67b5aec4f SHA512 ab28ed64d52513cf76bea32b2f289dedab2420e91592ba31d2917efc2d7868a4bf949067562594254a601e62885cf530d7ec00404cf62dd4705b7ac1a892ba9b
diff --git a/x11-wm/sawfish/sawfish-1.12.90.ebuild b/x11-wm/sawfish/sawfish-1.12.90.ebuild
index 62df528557df..77aaaa611e22 100644
--- a/x11-wm/sawfish/sawfish-1.12.90.ebuild
+++ b/x11-wm/sawfish/sawfish-1.12.90.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://download.tuxfamily.org/sawfish/${MY_P}.tar.xz"
 
 LICENSE="GPL-2 Artistic-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="emacs kde nls xinerama"
 
 RDEPEND="
diff --git a/x11-wm/twm/Manifest b/x11-wm/twm/Manifest
index 0021daaaf25c..fa6a7e486744 100644
--- a/x11-wm/twm/Manifest
+++ b/x11-wm/twm/Manifest
@@ -1,5 +1,3 @@
-DIST twm-1.0.10.tar.bz2 287094 BLAKE2B c84d26119c2a9ed1b6482dc35a421e3d745af506d2faf6dff1027aa84752accc32ff6fffba0e9e8468bfd583bee17c774a88960fc4c5268e82b69c4dc6ae8e81 SHA512 1280683fce7ebbf5670239cb1f3cee2b40612bd9850d98827e793cf8bf298bdb58e48387cab943ea6befc6f7b34da2567353c22b8eaeb8bcf1b9e303cd7e6a9e
 DIST twm-1.0.11.tar.xz 261176 BLAKE2B 775ee483f34b1f45e737e0f1a907c07398883bd7bb2c17f729b38a2562af1a85f27b4dfa76b5fa1f88768e01c17c8cb364baaf39d80307aee3732183c5964653 SHA512 948034bba23e6b6c4412fcd2e46bb11a9980297601218a54a5055165ab0229a44dde0d50f338b24e82d76f390597e2fa09d11ff7f3fe1b1d736b10083c7da20d
-EBUILD twm-1.0.10.ebuild 440 BLAKE2B 502cc0b610b9264d479c1c9f32c77f21202e191650c38f3af04471cddb917783105e0a38ecb4997780eb9067a4a7ec1dece2341970215e7bc3d47e86f6d8f27b SHA512 b50d158ccd60a9547056324b61fb38f0b3f6085a4e533984a25395c123cc9023f01b84ff96639ca311f0ff7d5e0d34bd36a9da51f39290a2331ceaadcb9e7bc8
-EBUILD twm-1.0.11.ebuild 570 BLAKE2B 0d6eda16361c15dd9ba0523be4120038e4a43d1ba234c12e598d02ecb97164d5f2dc20cc915605685c1708a76120caa3eaff082c6bec12359cd41e8b19d74fa2 SHA512 b321373081d1a180c4ea2f495d5ef49c548fd78e2bfe9edb6621b6b1e455979daddec895bc3145da2ad305bdda443bae434753ff35f37684d387cffffd8c8109
+EBUILD twm-1.0.11.ebuild 561 BLAKE2B cf373f1576c973a1ef087ea16498bb1b12db59da8d8938e1f2b39d376393a0beda440f8607d2540c9f5a8aa49033f888ce71882ce80616e44955df3e0caaba73 SHA512 b1fe7bb9ea02a45671a15edc9c172394e7376a0cf83c229c08297356a4c2b3bffcdbed1e90e5ab2f804b35f9b791f8ab9442482ebc39e353ca20ff044a246095
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-wm/twm/twm-1.0.10.ebuild b/x11-wm/twm/twm-1.0.10.ebuild
deleted file mode 100644
index b2db6ae2e2b4..000000000000
--- a/x11-wm/twm/twm-1.0.10.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_STATIC=no
-inherit xorg-2
-
-DESCRIPTION="X.Org Tab Window Manager"
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXt
-	x11-libs/libXmu
-	x11-libs/libICE
-	x11-libs/libSM"
-DEPEND="${RDEPEND}
-	sys-devel/bison"
diff --git a/x11-wm/twm/twm-1.0.11.ebuild b/x11-wm/twm/twm-1.0.11.ebuild
index 051480ae348d..962cea70292b 100644
--- a/x11-wm/twm/twm-1.0.11.ebuild
+++ b/x11-wm/twm/twm-1.0.11.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Tab Window Manager"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/x11-wm/windowmaker/Manifest b/x11-wm/windowmaker/Manifest
index 41e2f111804b..547748a0d627 100644
--- a/x11-wm/windowmaker/Manifest
+++ b/x11-wm/windowmaker/Manifest
@@ -4,7 +4,7 @@ AUX wmaker.desktop 206 BLAKE2B 62fe60afde032c1f37c5c818bc37a97d70605e041e539e922
 DIST WindowMaker-0.95.8.tar.gz 3253515 BLAKE2B 225dae9eb10f913931e129fdf78860123a14406ad8e61ba42fe4eadcf5d3f03c88040a2b982e74abaf79088f4a063291ccfb7b7d42f1bf211adb7b02c765a664 SHA512 6ab16ed4304aba20f0f3a4083adf63a47fa674ade7bc39aaa8aa6466c7842e3f10ab73af96e2afce0842b11c57a35eb69f43183a4044d8cd95d4e2a4d2c079a2
 DIST WindowMaker-0.95.9.tar.gz 3397167 BLAKE2B ec751fe0139b359933f4388f8dac3f2bf18db1f28fb4cb290d86db1ded9ffdab0cf51b451e28475bc51ee2735cb71c7fd2b01fa7472f5f0f4f1a1e00e1509339 SHA512 ca3ddc863f5b5b782e90f38c0019fe14d1109d6b11d0a3d5d6c728ddc1817747eea92e22e36933d445e72c70661e039ee56efa70f2654657c8980269fd5b4584
 DIST WindowMaker-extra-0.1.tar.gz 238018 BLAKE2B 865b12975d0cdefc1f05a76344b449fdcf8a2841d6a7adf1ab6435857d89cbc4fda22bb62432a1bbba921267380d00a0cded718bfbd344bbb5e6207e59b76096 SHA512 0fe9b3ffc093942db167d8a01e15c0f6741f3a40959d1434ea4f23e7b9d4a9c13935a61eabef9691e5fdfd4e407564caafce15c2d65d66499960a6764a874ab8
-EBUILD windowmaker-0.95.8-r1.ebuild 3129 BLAKE2B a38ebca8e4f4c91eac78fe0b05e407db136b46a74b33f8972f9f71d089a0569b4e7dda75f2f17229fc9695bce08de34ac20b9212482f385cdc5eb51bec6fdef3 SHA512 a4d6cf969b04503b7268fb918d076c453f5bbd2179619e28d1a3bc9a47a7df8a4492ba450c74935846e63168ac546819a0eba93d1596947a57134911be3dd71f
+EBUILD windowmaker-0.95.8-r1.ebuild 3128 BLAKE2B 0a74d0b9ece181745ee2ca58bcd683991f061c5f31287b7d1e6c01eb560f809ab09b4d53312c38d2541a9a35394a0ac76cdea0f759ecd902c9e0f5bd688534ba SHA512 5acf9dfc7ecc4d1f53ad81357a3be4e0f0f52059a2777e205edbcc499a27103dab6836be3ea039c08d31dce04669ba8fb9d1fcf3ecec92d31b3f238d79a0401f
 EBUILD windowmaker-0.95.9-r1.ebuild 3090 BLAKE2B 370be7bc17a2577ad8ee1e30b2d9883bfdb3ef5da51b7255a1e53af9db9a0ddf91434dca33f0f656ea132ea4d6b8c9627c629cbcfac03ed3e3be4779d96d1bd3 SHA512 4ef74f85931d2d2ea4b217bb05ee2d4d4a8967806d0a5724d07edfbcb1ed1df1cfe10788bbf517fe2e9e9fc3796febc405276a33676d0b5e4b221f19f7ac8bb5
 EBUILD windowmaker-9999.ebuild 2906 BLAKE2B 2c34ae03201ba0ffce81ec94b337536aee7ffc6a165ca0c49068d2389fd12a20c54c46d28810798ab523c3b2843e90fadd0212e5f7a7592f51d0c910eb56ca60 SHA512 f7db50510fb3b9f6fc34f1bb84cc00a2928cf9af9fd7aad88aa4dab211f5586395f84c9c75ddde80def0ac0d4ad521c29850f81e948e2442f169ea683d5ae771
 MISC metadata.xml 490 BLAKE2B a74e46dfe5b90558720726c3a18b9c9cf2752fb90ade60450ae568547c52b807e9dee74d1deb842c11cc3e6f564c0793adc5f8e24686893138808669f6fc9766 SHA512 ae731acb1fe00cfbda949fc9cafad9f861b83fb37103a699157256840c67e4a2cd0023114d30eab0b25f6dcb154c00e2a659a4feffaabad97e8ed7aa2a03e3ca
diff --git a/x11-wm/windowmaker/windowmaker-0.95.8-r1.ebuild b/x11-wm/windowmaker/windowmaker-0.95.8-r1.ebuild
index 0d0b2824872b..940075ca05ae 100644
--- a/x11-wm/windowmaker/windowmaker-0.95.8-r1.ebuild
+++ b/x11-wm/windowmaker/windowmaker-0.95.8-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://windowmaker.org/pub/source/release/${P/windowm/WindowM}.tar.gz
 SLOT="0"
 LICENSE="GPL-2"
 IUSE="gif imagemagick jpeg modelock nls png tiff webp xinerama +xpm xrandr"
-KEYWORDS="~alpha amd64 ~arm hppa ~mips ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~mips ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND="media-libs/fontconfig
 	>=x11-libs/libXft-2.1.0
diff --git a/x11-wm/xmonad-contrib/Manifest b/x11-wm/xmonad-contrib/Manifest
index 2a5dd46a53c9..b0a7f1c12a1d 100644
--- a/x11-wm/xmonad-contrib/Manifest
+++ b/x11-wm/xmonad-contrib/Manifest
@@ -1,13 +1,3 @@
-AUX xmonad-contrib-0.11.2-ghc-7.8.patch 1094 BLAKE2B f7ae4dd802fcdbe06f699e01153967b36d5b4dd9357968fa2f00da03bf936f00100aabd020d4b9cbd073e84099b24094eb1a5e0de9b9b8a3ad4fde19fd326ddd SHA512 f4eff1596ef91e8b53a8cd9d31a315f83f3b2a0cb3d23bb9e045b7b38c9159583e3ea0a75c22557031bfafe72656cc01263c89bc5b83a41a76b03ae6b380e8f8
-AUX xmonad-contrib-0.11.4-import-Applicative.patch 918 BLAKE2B 2db877ca920a80ae3eb6e07005a19e703ab54c0aa18bdab68865bc911d01307204fe8358f576a8f9a41d7452ae1e7c59d0de1fff7e5746af18ccacb976c0f9b3 SHA512 a1ebc7a6d6fa5f04242e966b2894ea128cbd4ef32f6c6d3339695a11836b09650edc0624ea587e227f71423f9794decfec54bf56d135636a5518640305cb8f4b
-DIST xmonad-contrib-0.11.2.tar.gz 401758 BLAKE2B 06697bac621dabbbc3e066c38efbfc819087569c18cf7064820a826e0a28f48257b84f54659bc64db062b187129df899f694bb2ea8fa375b5dfb49afce1c170c SHA512 373e1ed1744cbdf26902402d74b4efafa043a4ccf1953c26ec55a03ef8de31818b0c4cfced08b43e664e5f052e52923c6dfb08d68be86726e9f0ed1d96ad7910
-DIST xmonad-contrib-0.11.4.tar.gz 401743 BLAKE2B f6962bcb88e88ebf620ef037c08de8c21ebbb10cb863852f60b5f3ba03d72d00dfb737b57ca0bb5f2fa3364a120fe00377d6c27735abbc8f7eb0b1992ec705b7 SHA512 3d747988baa497475255be4cc96f7eba5cf6fc81658f8f877ca92148fb9a154423ee98ebeb23690de00b186d2e34ad13d94cf1fe332d4ca4f1f4a64790e46ed7
-DIST xmonad-contrib-0.12.tar.gz 464978 BLAKE2B 72b08d01a24e1a878bc1d7175755b45d0751236f01c276f3b5baaf332f3baf5c81b2c75c8ab88e221f1cabde0f3ed3f7a613b672b038da95de0ef4d69f249307 SHA512 5bb145fc7d07ebc8e4dde5ba83b5340913fb089581d22e993663402fc6728eab9f6939466b7a262827c0098599073a928700e0acb8245b943b23e6cd01e63056
-DIST xmonad-contrib-0.13.tar.gz 485351 BLAKE2B ef42ad08bf5878046abfbc0c2cbb79853c01e2e0ba0e6ab0723e575531dc106c32dce58fe9e6e35b5e84f18b04456aec03ef838a9cb6fc34396415a311e1b2d5 SHA512 40b8a8fc8a1fa134f2726c273ff75eee26a43c9f18095bad9251e4b37b0cca5ee6c32eec5c42aa00c9e0c5c90ae54e6414739a2cee5b5d2917814358449d55f5
-DIST xmonad-contrib-0.15.tar.gz 524285 BLAKE2B e34b32a4899e98b00ae5ea4539a8566f056f794adb672df035d140532faf0996ef4bcf078998a1a6bd93320c5ebd41d51babf98a5332142c3a8644d3eb0e007d SHA512 c4669a51f6c1fbb50f5d484ae4a24b608d2b03c2e6814fa2ae079fe57a4b599e3072ae23c29b22fe2cf86a04840b4262a646ee4c7ba7c9a859ee78a31f99bc8a
-EBUILD xmonad-contrib-0.11.2.ebuild 1067 BLAKE2B a6fbccac4def0e616180b3a56d77a988d829451c8911d6cb4897a5576fbe05c270f82722b5790754ca55bfe4bb39fb4313d4ab7c5e3bb10c6c20b3a0ed52a520 SHA512 a252e5628979ee18d8e4674e7029a85eed5bef3012344fb6b427eef3dec9813ddd7f0a178aa4bd97b61c184634953330cde0221cdd1df982d0f6bb0efa171e83
-EBUILD xmonad-contrib-0.11.4.ebuild 1467 BLAKE2B 7e5788e4b64d656a63868e68157443e79cc1965fdf16a12fcfb32b3ad2061707582606775efb4fe8a4f9b069a3036af9faa3ab705267e15df95867f9b99d26bf SHA512 f7357f6b08fc9a68a94b8e23f73b7189b2361dc370cc98500e2c9c2101e06b4d27b106b23f656febd4bba00e7e7bbdf5e0aac7f9a73e4eb483098d1dd634d892
-EBUILD xmonad-contrib-0.12.ebuild 1103 BLAKE2B 59f8ffb2844cd05c2b2727101c7e0c4f64fab5bc34046d1a9daffbd8ce26f00c1593abf2840a34528ba370f5303af2d73d097e53163a4b42f55da08842cc31e2 SHA512 791a9f0597e7921d9992a46c961c54adc361fc9dd85ed9a45cb1050e6ba3d0f10935328f0dac8b507508eea01ac0a9cf1b08727c9d7c5bb2e30e2d0483c46bb6
-EBUILD xmonad-contrib-0.13.ebuild 1096 BLAKE2B de5ba1ec0213ec62b053820a35c3d7e632125a02c2441b3105eb99749ab77c336d6296da22980047b992601f90f0878ceaa2bb6887fda98e3429158f9a5edaa1 SHA512 243ef681db68e135cc9afb86bf023191ebcc2d6abfc25df51087482a54308df13bf73231a999bca83052e0fce046ef77738d8b243a415ee6a46601be6efa470e
-EBUILD xmonad-contrib-0.15.ebuild 1133 BLAKE2B 70747051a40bd68bc16f85f34647f45ce2630fa359c131c22fb7f08b22dff28700d7dc8b9f7fb6ea76de79dc10a632621802b16f969ffbee0f94cfd3472e4dbd SHA512 9c32f3ad4f2016d53ae5288fa7a272b7d9e1457c26b958def381c013ccb1565f66921f6ceca994c14a169f83fe57acb92c6bf2ed1227ee182907da17e607a301
+DIST xmonad-contrib-0.16.tar.gz 540237 BLAKE2B 7ddf8730481c39e9b5e40a548f3cbe36f301901656c57cc5ffdd11e05ad516019dc0b82c7dcf77665c152c390f7b7ae49c04ec6ae39347565b11a23aef23cce3 SHA512 22a18b4045cbfca0229cbf6c0bf1dfa595cbffbe6b82fd58b1fcf941cbfd306642160995b55859cead3cf574df696d2a3cea6507cac4d5c7c58cf09b3a86bc25
+EBUILD xmonad-contrib-0.16.ebuild 1129 BLAKE2B 13465d4c72818c72fe290942915da6913e96d9835b755139830e3bb1db039a4bae7f3f8a34cca1118232687d5595a853e7cb9a3a9f65470e0159181aa42a3dbb SHA512 51f21157803d431d9c681eeae7c2e5d27246caabf5464ea03b4a007201f148da6278c477bb9ff1aef3cc34f660b91b605f18ea3faa7d83ec528c3fd19eda398e
 MISC metadata.xml 708 BLAKE2B 0aae3704519ca0ffba4e25ae3236ebd02ecb6a9e7bef7d23a32107ad6e6826f09613dc6206fd1e350a8e3536061136cfdd463f7e2a80b16e7f38b30db14c4fc4 SHA512 570916b2bcf06efaeccb486d3161d0b751c675955abae7efc57d471961e2c1649075bc155e75849cd1b56c0a5917341f7ef2cbb12e81255787cfb282a6ea1fb7
diff --git a/x11-wm/xmonad-contrib/files/xmonad-contrib-0.11.2-ghc-7.8.patch b/x11-wm/xmonad-contrib/files/xmonad-contrib-0.11.2-ghc-7.8.patch
deleted file mode 100644
index 67e1f8cd8def..000000000000
--- a/x11-wm/xmonad-contrib/files/xmonad-contrib-0.11.2-ghc-7.8.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Sun Feb 17 19:33:56 FET 2013  Adam Vogt <vogt.adam@gmail.com>
-  * Remove unnecessary contexts from L.MultiToggle
-diff -rN -u old-XMonadContrib/XMonad/Layout/MultiToggle.hs new-XMonadContrib/XMonad/Layout/MultiToggle.hs
---- old-XMonadContrib/XMonad/Layout/MultiToggle.hs	2014-02-06 00:58:32.422844682 +0300
-+++ new-XMonadContrib/XMonad/Layout/MultiToggle.hs	2014-02-06 00:58:32.462844684 +0300
-@@ -99,7 +99,7 @@
-     transform :: (LayoutClass l a) => t -> l a ->
-         (forall l'. (LayoutClass l' a) => l' a -> (l' a -> l a) -> b) -> b
- 
--data (LayoutClass l a) => EL l a = forall l'. (LayoutClass l' a) => EL (l' a) (l' a -> l a)
-+data  EL l a = forall l'. (LayoutClass l' a) => EL (l' a) (l' a -> l a)
- 
- unEL :: (LayoutClass l a) => EL l a -> (forall l'. (LayoutClass l' a) => l' a -> b) -> b
- unEL (EL x _) k = k x
-@@ -159,7 +159,7 @@
- infixr 0 ??
- -- | Prepend an element to a heterogeneous list. Used to build transformer
- -- tables for 'mkToggle'.
--(??) :: (HList b w) => a -> b -> HCons a b
-+(??) ::  a -> b -> HCons a b
- (??) = HCons
- 
- -- | Construct a singleton transformer table.
diff --git a/x11-wm/xmonad-contrib/files/xmonad-contrib-0.11.4-import-Applicative.patch b/x11-wm/xmonad-contrib/files/xmonad-contrib-0.11.4-import-Applicative.patch
deleted file mode 100644
index d887e857da03..000000000000
--- a/x11-wm/xmonad-contrib/files/xmonad-contrib-0.11.4-import-Applicative.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- xmonad-contrib-0.11.4-orig/XMonad/Util/Invisible.hs	2015-03-28 05:00:21.000000000 +1100
-+++ xmonad-contrib-0.11.4/XMonad/Util/Invisible.hs	2015-04-03 15:12:17.485143018 +1100
-@@ -22,6 +22,8 @@
-                             , fromIMaybe
-                             ) where
- 
-+import Control.Applicative
-+
- -- $usage
- -- A wrapper data type to store layout state that shouldn't be persisted across
- -- restarts. A common wrapped type to use is @Maybe a@.
---- xmonad-contrib-0.11.4-orig/XMonad/Hooks/DebugEvents.hs	2015-03-28 05:00:21.000000000 +1100
-+++ xmonad-contrib-0.11.4/XMonad/Hooks/DebugEvents.hs	2015-04-03 15:17:02.207816322 +1100
-@@ -30,6 +30,7 @@
- 
- -- import           Graphics.X11.Xlib.Extras.GetAtomName        (getAtomName)
- 
-+import           Control.Applicative
- import           Control.Exception.Extensible         as E
- import           Control.Monad.State
- import           Control.Monad.Reader
diff --git a/x11-wm/xmonad-contrib/xmonad-contrib-0.11.2.ebuild b/x11-wm/xmonad-contrib/xmonad-contrib-0.11.2.ebuild
deleted file mode 100644
index c8eea5244c0c..000000000000
--- a/x11-wm/xmonad-contrib/xmonad-contrib-0.11.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit base haskell-cabal
-
-DESCRIPTION="Third party extensions for xmonad"
-HOMEPAGE="https://xmonad.org/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-# hackport-args: --always-disabled='testing'
-IUSE="+xft"
-
-RDEPEND="dev-haskell/extensible-exceptions:=[profile?]
-		>=dev-haskell/mtl-1:=[profile?]
-		<dev-haskell/mtl-3:=[profile?]
-		dev-haskell/random:=[profile?]
-		dev-haskell/utf8-string:=[profile?]
-		>=dev-haskell/x11-1.6.1:=[profile?]
-		<dev-haskell/x11-1.7:=[profile?]
-		>=dev-lang/ghc-6.10.4:=
-		=x11-wm/xmonad-0.11*:=[profile?]
-		xft? ( >=dev-haskell/x11-xft-0.2:=[profile?]
-		)"
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
-
-PATCHES=("${FILESDIR}"/${P}-ghc-7.8.patch)
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flags=-testing \
-		$(cabal_flag xft use_xft)
-}
diff --git a/x11-wm/xmonad-contrib/xmonad-contrib-0.11.4.ebuild b/x11-wm/xmonad-contrib/xmonad-contrib-0.11.4.ebuild
deleted file mode 100644
index 041f35dabc3a..000000000000
--- a/x11-wm/xmonad-contrib/xmonad-contrib-0.11.4.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-#hackport: flags: -testing,use_xft:xft
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit eutils haskell-cabal
-
-DESCRIPTION="Third party extensions for xmonad"
-HOMEPAGE="https://xmonad.org/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="+xft"
-
-RDEPEND="dev-haskell/extensible-exceptions:=[profile?]
-	>=dev-haskell/mtl-1:=[profile?] <dev-haskell/mtl-3:=[profile?]
-	dev-haskell/old-locale:=[profile?]
-	dev-haskell/old-time:=[profile?]
-	dev-haskell/random:=[profile?]
-	dev-haskell/utf8-string:=[profile?]
-	>=dev-haskell/x11-1.6.1:=[profile?] <dev-haskell/x11-1.7:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	>=x11-wm/xmonad-0.11:=[profile?] <x11-wm/xmonad-0.12:=[profile?]
-	xft? ( >=dev-haskell/x11-xft-0.2:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_prepare() {
-	# Upstream bug 597 xmonad-contrib-0.11.4 does not compile
-	# https://code.google.com/p/xmonad/issues/detail?id=597
-	epatch "${FILESDIR}"/${P}-import-Applicative.patch
-
-	# https://ghc.haskell.org/trac/ghc/ticket/10667
-	[[ $(ghc-version) == 7.10.1.20150630 ]] && replace-hcflags -g ''
-	[[ $(ghc-version) == 7.10.2 ]] && replace-hcflags -g ''
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-testing \
-		$(cabal_flag xft use_xft)
-}
diff --git a/x11-wm/xmonad-contrib/xmonad-contrib-0.12.ebuild b/x11-wm/xmonad-contrib/xmonad-contrib-0.12.ebuild
deleted file mode 100644
index c0f110a39125..000000000000
--- a/x11-wm/xmonad-contrib/xmonad-contrib-0.12.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-#hackport: flags: -testing,use_xft:xft
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Third party extensions for xmonad"
-HOMEPAGE="https://xmonad.org/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="+xft"
-
-RDEPEND="dev-haskell/extensible-exceptions:=[profile?]
-	>=dev-haskell/mtl-1:=[profile?] <dev-haskell/mtl-3:=[profile?]
-	dev-haskell/old-locale:=[profile?]
-	dev-haskell/old-time:=[profile?]
-	dev-haskell/random:=[profile?]
-	dev-haskell/utf8-string:=[profile?]
-	>=dev-haskell/x11-1.6.1:=[profile?] <dev-haskell/x11-1.7:=[profile?]
-	>=dev-lang/ghc-7.6.1:=
-	>=x11-wm/xmonad-0.12:=[profile?] <x11-wm/xmonad-0.13:=[profile?]
-	xft? ( >=dev-haskell/x11-xft-0.2:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-testing \
-		$(cabal_flag xft use_xft)
-}
diff --git a/x11-wm/xmonad-contrib/xmonad-contrib-0.13.ebuild b/x11-wm/xmonad-contrib/xmonad-contrib-0.13.ebuild
deleted file mode 100644
index 7d6c1775bc74..000000000000
--- a/x11-wm/xmonad-contrib/xmonad-contrib-0.13.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-#hackport: flags: -testing,use_xft:xft
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Third party extensions for xmonad"
-HOMEPAGE="https://xmonad.org/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+xft"
-
-RDEPEND="dev-haskell/extensible-exceptions:=[profile?]
-	>=dev-haskell/mtl-1:=[profile?] <dev-haskell/mtl-3:=[profile?]
-	dev-haskell/old-locale:=[profile?]
-	dev-haskell/old-time:=[profile?]
-	dev-haskell/random:=[profile?]
-	dev-haskell/utf8-string:=[profile?]
-	>=dev-haskell/x11-1.6.1:=[profile?] <dev-haskell/x11-1.9:=[profile?]
-	>=dev-lang/ghc-7.6.1:=
-	>=x11-wm/xmonad-0.13:=[profile?] <x11-wm/xmonad-0.14:=[profile?]
-	xft? ( >=dev-haskell/x11-xft-0.2:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-testing \
-		$(cabal_flag xft use_xft)
-}
diff --git a/x11-wm/xmonad-contrib/xmonad-contrib-0.15.ebuild b/x11-wm/xmonad-contrib/xmonad-contrib-0.16.ebuild
index a0ba3e779d74..5156c063509c 100644
--- a/x11-wm/xmonad-contrib/xmonad-contrib-0.15.ebuild
+++ b/x11-wm/xmonad-contrib/xmonad-contrib-0.16.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-# ebuild generated by hackport 0.5.6.9999
+# ebuild generated by hackport 0.6.1
 #hackport: flags: -testing,use_xft:xft
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
 
 DESCRIPTION="Third party extensions for xmonad"
-HOMEPAGE="https://xmonad.org/"
+HOMEPAGE="http://xmonad.org/"
 SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
@@ -26,12 +26,12 @@ RDEPEND="dev-haskell/extensible-exceptions:=[profile?]
 	dev-haskell/semigroups:=[profile?]
 	dev-haskell/utf8-string:=[profile?]
 	>=dev-haskell/x11-1.6.1:=[profile?] <dev-haskell/x11-1.10:=[profile?]
-	>=dev-lang/ghc-7.6.1:=
+	>=dev-lang/ghc-8.0.1:=
 	>=x11-wm/xmonad-0.15:=[profile?] <x11-wm/xmonad-0.16:=[profile?]
 	xft? ( >=dev-haskell/x11-xft-0.2:=[profile?] )
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
+	>=dev-haskell/cabal-1.24.0.0
 "
 
 src_configure() {
diff --git a/x11-wm/xmonad/Manifest b/x11-wm/xmonad/Manifest
index da6789851b11..ec1213f80b41 100644
--- a/x11-wm/xmonad/Manifest
+++ b/x11-wm/xmonad/Manifest
@@ -1,18 +1,5 @@
-AUX xmonad-0.11-ghc-7.10.patch 622 BLAKE2B 2bfcba1f9c5af821d37e45ec77760652200c21bfd7a423b27cff4ec4923da61fadf2478af099c2b658cb84d9a3d540bb1a9add03533a306fcf048b4a6e1a4859 SHA512 82fc07ffae272a3e87b3bf7bcbe94d815c8f5f8f6865ffa99d76f76f352d2f46cf88eefa49d6e993249a6365018e711276e782503ab76160775e4ae1411aa3ff
-AUX xmonad-0.11-sample.patch 3525 BLAKE2B cfa71c96bb2c4c63ad96d67d5cea5f9d9a2e72e1286e9507c5fc5892974a9eb5612289d7d9f30687dade2c5467aed9dae670b7b18d6ed5ef836206bfc181acf2 SHA512 4beb6452ac1609bd9be90f34eab87c0eee5bd02b982a88c59ad0d0efc5378de3e6a5cf4c1dd28bca6d550cff123258bfcb265b7357764a8c50b3780c5384bd7f
-AUX xmonad-0.12-check-repeat.patch 1882 BLAKE2B 37567d70c4ec194fd16c0bee5fce4952c03ae0c7dc03de457e2d4f06d2bbc6a98fef5de87502ff030c12fb4a4f55451b72f2df81707d4be53be24b229a3c3649 SHA512 cca001f3fc644e0454d30161d9643acadd3e17f0071633379866c00709423734c17e1f32ea118da72ff3679cf079604a8b6c3bbe9b97f3e61ab2475222855861
 AUX xmonad-0.14-check-repeat.patch 2393 BLAKE2B 1b173ab0598c650645af4286c5c6f7ed536f201bbab51f4f515fdf8c0433ea355e5836b9d63353cf7bc8aedba23e15b661bfc02ec94519e43b4a49e8818b569f SHA512 ff9341e4e7f065e9354cb723470ed88d9f8fb3858c0a529590d14c2bcb65672494c0df49b9678e502a812d36035f255780d3e50dd303e41ac96d52e1d946b731
-AUX xmonad-check-repeat.patch 1869 BLAKE2B ae8f76107a83e56a6aa394bf822436b69855acbc2ac888bad799a8049e172435003315af5831e0e83459ab858e71f1c88bf274b25d97b600cb6d4d47e119560c SHA512 531ba249222941c675ee3726f802824d7716e4a746c9fa8bc26914f4d6f4133111c2fa2c39bbcedb0cee78ddb85fdf9f80197b7db1a5587cd5b49e6070728d0c
 AUX xmonad.desktop 270 BLAKE2B dce8e606b7b1008dd77c74feb0ce96f7d7d59de299adc4b61b164cdcf9057eb2a4119bfd97c5f67a660d0810cd7a43d5ee580d9935b623c9dd877543de2adffe SHA512 b858edfb6fd6004f8ca0f95e97f298140ab489e246f7f09b1fdab3fe899dba66f3f150fe67981f7b5fd8f3a268df7dab2ee60db6d3f96bd874fab2b670435b4e
-DIST xmonad-0.11.1.tar.gz 59307 BLAKE2B 98dc31dd53e933f68dbf00121c6a0b4e4a24a19ce46410a7b1d7a21977b2c980de623187a59b097dec46944163b1685472902d8df4b47f0d0ac47db93844ee13 SHA512 4916451d81d359dbbf508f3b20f649f956255f526f14b1eb6c0d32bc789474db30d7acac768663ca32784c7fe361195a50f45a7cb7371ee9a29c9b8f1c64d528
-DIST xmonad-0.11.tar.gz 59119 BLAKE2B 75ae39e2e54d4b5ed14f99d0144d4ee7741c611f18b5692aedce49b0a4dc07a17f613280d93fd715b812a2c22e27ad9f7fe8693dba38739ccf6dde9742fe03b9 SHA512 34740f032508584f34f6b138d21394eca17e8020bccc4d8c6e8b3cb6b7ca64b153077cfd16636a6130768ebd145fe993569f8a229862d7816d0c89c905ee08bc
-DIST xmonad-0.12.tar.gz 61436 BLAKE2B ea42fc105e30be59a2cb0180c05ef88024e51a1a224bdd6bb910d45cddabc2709411e2f0c7aa6c5723f54653db242bda80ab92249204106955be75a4a077f1ea SHA512 e519c038d90db037bc81e7baf7b07cfa53922509e98ffddacfc4a6cc2c7376383be1e721f613057a5febbfcc661807b6382124eb673ac7a7cda23c738d3539ab
-DIST xmonad-0.13.tar.gz 72034 BLAKE2B c95b24ae406268da642168defcc633cf8185f0f2dbcede1122c48c3812bf250df69d917c479f328cca450dec362ae0614d2acaf09d62123d15d646dcae8d98ec SHA512 9d9436f36fe0f6a9732502b0211fc41a224b1320b843d266b6d2dd201e4329b688f7eed5b08597b2edd713cc25f2b88a2a1f1ee43e18615c0a78e97e4716b122
 DIST xmonad-0.15.tar.gz 68822 BLAKE2B 9ee9a070f6743fbab2cffe05ee9e60b64fded0b4916fdec03a550f5d5ec5a34102ab2d4e9586b9a0ca534db284a8058f11ee248072f3f3b312ae30c09873feff SHA512 f881f3faa4f5a0de7a5a37118cd7041083ae3a7569c7094b55dedb9aa858176789aff459d426b237ebae5cc4598b06de790938775a7ac968c2d76be3f0efc8ba
-EBUILD xmonad-0.11-r1.ebuild 1955 BLAKE2B 2c9775a221b3faee7fd993d441fa6290d071921ce977f54844ca50c1476f52bf5960c12bea88d541f45b248825f0f2b2c7c02af019d825852988e68674f1de49 SHA512 95d46b0547781c9272ebadc93c3bd230d21d469b4ec3755ce483a16fad57e2975af9af9a1ef8c1d75ec5e739638f0bfd106c53319c467347b55b5af7af7afa7b
-EBUILD xmonad-0.11-r3.ebuild 2203 BLAKE2B c04791210566c32048c34b3d77e05bbc2a39f4deb8eade0942d48f2d0b95ec400a3c33b6906675d1db592a7ff2f80db383a3a991a2376323a69d62691d39e2f3 SHA512 7b8b617c7b28e21c5a4a95b32dbe5426b8258c21cbeaaff97da921eb700c4352d6b2c3d72ad6059c63d42bbcdb3f082e5fba38a4ba24123b8e75475e169e940e
-EBUILD xmonad-0.11.1.ebuild 2168 BLAKE2B 47b506dcb73675d7e3450394ab41a497df25a72567d79ff0dde905e63d17ee9fa5186cb968098c19409757999cfa7e4e99483f9b4b3b94c2c01730b5c20b6fcc SHA512 a1d7a81a25b2b74037e1bf992b778f8435e709d5fdb7d249c155e6af628c6db74453cd8d469efe8e438cd376b77767de34aa151edb0be55df6c1c3dc884e4ec5
-EBUILD xmonad-0.12.ebuild 2447 BLAKE2B 0d3638eedf0ae42e7116c7c0a0143f46eb14012bf9c52569d60656fe1032f735122ae834639015463c5e962853e40c9ff0d3c069d60649bd335609475c5277d0 SHA512 662c4714b23eb1f212817cbc16e57e6a296658733fb8102410469bb887ee0faa46678be6a4649af667d60a0f9d3cc44effc5ae4a5e6864880fcd5b765d672245
-EBUILD xmonad-0.13.ebuild 2189 BLAKE2B 9999b6fd78531ddb7f0553c538143ba37c8edfa238cea8058085f4959620662ba19dde37fcd200fc5008d8db1ed9910089aca73d2d9553974d1b99263ebc2582 SHA512 f3147b417b085b582df296656d9d361726af34910a93de786a1c3e1ead5a9b5a428cd59d534d5146c51703b3768c03cdedc7e1f415691cc9d114834b52e40427
 EBUILD xmonad-0.15.ebuild 2340 BLAKE2B 846657af5db706832ea4adcff0126ff386dea3f1f2d46d830602ad75ef0c2f0be6837825403ed3904e72ea9e9cae40a06991ee3275abacfd20c98593896f2585 SHA512 c68f2b8da62c8314b3cf35f048754d3fd2e018be4e1761c105f2c01a46434f4435636cd36a4d02851502692fd50a2e08c2506aeb95eff304b3494f5deb797ab2
-MISC metadata.xml 1068 BLAKE2B 7ca1c1c62c82e0ecc3352798f8b78bf87787534ef1830bde94b08ecca74a51606c05905903c0ad4b0728282669bcfa532ef798ae2c13148fdef55b259c3168fe SHA512 96efc16a7a57b188e72f2db9fdd90c06cc6460e9a596ac68ca5a8187fd7fbb88feb9ab9ff4e9d8436df014a6c6203c459da317cda0f5ada779096ee0806da8d8
+MISC metadata.xml 944 BLAKE2B 1bf165521429318f0f7508d125c1203f4a866d05234ca1df2ea42f7cd5eb0a4b7280505928f83619a40c19327cb051f64450f953efa15ff718fdfba1e129cd70 SHA512 7ace3bf8c00d5677e3d8a9ced1487a92b5e243cf60824c100a9bb23f4a411bf0d602617bfcc8359b1e108b8ab4bc692f057320078d99df1daec2c7bf48ffdc9f
diff --git a/x11-wm/xmonad/files/xmonad-0.11-ghc-7.10.patch b/x11-wm/xmonad/files/xmonad-0.11-ghc-7.10.patch
deleted file mode 100644
index e92a31ec7044..000000000000
--- a/x11-wm/xmonad/files/xmonad-0.11-ghc-7.10.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Fri May  2 06:57:43 BST 2014  Adam Vogt <vogt.adam@gmail.com>
-  * derive Applicative instance for Query
-diff -rN -u old-xmonad/XMonad/Core.hs new-xmonad/XMonad/Core.hs
---- old-xmonad/XMonad/Core.hs	2015-01-08 21:40:45.320979242 +0000
-+++ new-xmonad/XMonad/Core.hs	2015-01-08 21:40:45.367979193 +0000
-@@ -155,7 +155,7 @@
- 
- type ManageHook = Query (Endo WindowSet)
- newtype Query a = Query (ReaderT Window X a)
--    deriving (Functor, Monad, MonadReader Window, MonadIO)
-+    deriving (Functor, Applicative, Monad, MonadReader Window, MonadIO)
- 
- runQuery :: Query a -> Window -> X a
- runQuery (Query m) w = runReaderT m w
diff --git a/x11-wm/xmonad/files/xmonad-0.11-sample.patch b/x11-wm/xmonad/files/xmonad-0.11-sample.patch
deleted file mode 100644
index 0780af8c18d4..000000000000
--- a/x11-wm/xmonad/files/xmonad-0.11-sample.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-Sun Jan  6 17:42:54 GMT 2013  Daniel Wagner <daniel@wagner-home.com>
-  * define the "help" string in the sample configuration bundled with xmonad
-diff -rN -u old-xmonad/man/xmonad.hs new-xmonad/man/xmonad.hs
---- old-xmonad/man/xmonad.hs	2015-02-27 08:38:26.993365307 +0000
-+++ new-xmonad/man/xmonad.hs	2015-02-27 08:38:27.046365303 +0000
-@@ -280,3 +280,54 @@
-         logHook            = myLogHook,
-         startupHook        = myStartupHook
-     }
-+
-+-- | Finally, a copy of the default bindings in simple textual tabular format.
-+help :: String
-+help = unlines ["The default modifier key is 'alt'. Default keybindings:",
-+    "",
-+    "-- launching and killing programs",
-+    "mod-Shift-Enter  Launch xterminal",
-+    "mod-p            Launch dmenu",
-+    "mod-Shift-p      Launch gmrun",
-+    "mod-Shift-c      Close/kill the focused window",
-+    "mod-Space        Rotate through the available layout algorithms",
-+    "mod-Shift-Space  Reset the layouts on the current workSpace to default",
-+    "mod-n            Resize/refresh viewed windows to the correct size",
-+    "",
-+    "-- move focus up or down the window stack",
-+    "mod-Tab        Move focus to the next window",
-+    "mod-Shift-Tab  Move focus to the previous window",
-+    "mod-j          Move focus to the next window",
-+    "mod-k          Move focus to the previous window",
-+    "mod-m          Move focus to the master window",
-+    "",
-+    "-- modifying the window order",
-+    "mod-Return   Swap the focused window and the master window",
-+    "mod-Shift-j  Swap the focused window with the next window",
-+    "mod-Shift-k  Swap the focused window with the previous window",
-+    "",
-+    "-- resizing the master/slave ratio",
-+    "mod-h  Shrink the master area",
-+    "mod-l  Expand the master area",
-+    "",
-+    "-- floating layer support",
-+    "mod-t  Push window back into tiling; unfloat and re-tile it",
-+    "",
-+    "-- increase or decrease number of windows in the master area",
-+    "mod-comma  (mod-,)   Increment the number of windows in the master area",
-+    "mod-period (mod-.)   Deincrement the number of windows in the master area",
-+    "",
-+    "-- quit, or restart",
-+    "mod-Shift-q  Quit xmonad",
-+    "mod-q        Restart xmonad",
-+    "mod-[1..9]   Switch to workSpace N",
-+    "",
-+    "-- Workspaces & screens",
-+    "mod-Shift-[1..9]   Move client to workspace N",
-+    "mod-{w,e,r}        Switch to physical/Xinerama screens 1, 2, or 3",
-+    "mod-Shift-{w,e,r}  Move client to screen 1, 2, or 3",
-+    "",
-+    "-- Mouse bindings: default actions bound to mouse events",
-+    "mod-button1  Set the window to floating mode and move by dragging",
-+    "mod-button2  Raise the window to the top of the stack",
-+    "mod-button3  Set the window to floating mode and resize by dragging"]
-Sun Jan  6 17:44:14 GMT 2013  Daniel Wagner <daniel@wagner-home.com>
-  * use "modm" instead of "modMask" in the sample config
-diff -rN -u old-xmonad/man/xmonad.hs new-xmonad/man/xmonad.hs
---- old-xmonad/man/xmonad.hs	2015-02-27 08:39:59.280358012 +0000
-+++ new-xmonad/man/xmonad.hs	2015-02-27 08:39:59.333358007 +0000
-@@ -129,7 +129,7 @@
-     , ((modm              , xK_q     ), spawn "xmonad --recompile; xmonad --restart")
- 
-     -- Run xmessage with a summary of the default keybindings (useful for beginners)
--    , ((modMask .|. shiftMask, xK_slash ), spawn ("echo \"" ++ help ++ "\" | xmessage -file -"))
-+    , ((modm .|. shiftMask, xK_slash ), spawn ("echo \"" ++ help ++ "\" | xmessage -file -"))
-     ]
-     ++
- 
diff --git a/x11-wm/xmonad/files/xmonad-0.12-check-repeat.patch b/x11-wm/xmonad/files/xmonad-0.12-check-repeat.patch
deleted file mode 100644
index 79bd2c2d21fa..000000000000
--- a/x11-wm/xmonad/files/xmonad-0.12-check-repeat.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- xmonad/src/XMonad/Core.hs	2010-09-05 05:11:42.000000000 +0400
-+++ xmonad/src/XMonad/Core.hs	2010-09-18 07:59:14.000000000 +0400
-@@ -65,6 +65,7 @@
-     , waitingUnmap     :: !(M.Map Window Int)            -- ^ the number of expected UnmapEvents
-     , dragging         :: !(Maybe (Position -> Position -> X (), X ()))
-     , numberlockMask   :: !KeyMask                       -- ^ The numlock modifier
-+    , keyPressed       :: !KeyCode                       -- ^ keycode of the key being pressed if any
-     , extensibleState  :: !(M.Map String (Either String StateExtension))
-     -- ^ stores custom state information.
-     --
---- xmonad/src/XMonad/Main.hs	2010-09-05 05:11:42.000000000 +0400
-+++ xmonad/src/XMonad/Main.hs	2010-09-18 08:03:11.000000000 +0400
-@@ -129,6 +129,7 @@
-             , mapped          = S.empty
-             , waitingUnmap    = M.empty
-             , dragging        = Nothing
-+            , keyPressed      = 0
-             , extensibleState = extState
-             }
-     allocaXEvent $ \e ->
-@@ -190,10 +191,15 @@
- -- run window manager command
- handle (KeyEvent {ev_event_type = t, ev_state = m, ev_keycode = code})
-     | t == keyPress = withDisplay $ \dpy -> do
--        s  <- io $ keycodeToKeysym dpy code 0
--        mClean <- cleanMask m
--        ks <- asks keyActions
--        userCodeDef () $ whenJust (M.lookup (mClean, s) ks) id
-+        kp <- gets keyPressed
-+        if kp /= code then do
-+                modify $ \s -> s { keyPressed = code }
-+                s  <- io $ keycodeToKeysym dpy code 0
-+                mClean <- cleanMask m
-+                ks <- asks keyActions
-+                userCodeDef () $ whenJust (M.lookup (mClean, s) ks) id
-+            else return ()
-+    | t == keyRelease = modify $ \s -> s { keyPressed = 0 }
- 
- -- manage a new window
- handle (MapRequestEvent    {ev_window = w}) = withDisplay $ \dpy -> do
diff --git a/x11-wm/xmonad/files/xmonad-check-repeat.patch b/x11-wm/xmonad/files/xmonad-check-repeat.patch
deleted file mode 100644
index 9b30cb5ece31..000000000000
--- a/x11-wm/xmonad/files/xmonad-check-repeat.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- xmonad//XMonad/Core.hs	2010-09-05 05:11:42.000000000 +0400
-+++ xmonad//XMonad/Core.hs	2010-09-18 07:59:14.000000000 +0400
-@@ -65,6 +65,7 @@
-     , waitingUnmap     :: !(M.Map Window Int)            -- ^ the number of expected UnmapEvents
-     , dragging         :: !(Maybe (Position -> Position -> X (), X ()))
-     , numberlockMask   :: !KeyMask                       -- ^ The numlock modifier
-+    , keyPressed       :: !KeyCode                       -- ^ keycode of the key being pressed if any
-     , extensibleState  :: !(M.Map String (Either String StateExtension))
-     -- ^ stores custom state information.
-     --
---- xmonad//XMonad/Main.hsc	2010-09-05 05:11:42.000000000 +0400
-+++ xmonad//XMonad/Main.hsc	2010-09-18 08:03:11.000000000 +0400
-@@ -129,6 +129,7 @@
-             , mapped          = S.empty
-             , waitingUnmap    = M.empty
-             , dragging        = Nothing
-+            , keyPressed      = 0
-             , extensibleState = extState
-             }
-     allocaXEvent $ \e ->
-@@ -190,10 +191,15 @@
- -- run window manager command
- handle (KeyEvent {ev_event_type = t, ev_state = m, ev_keycode = code})
-     | t == keyPress = withDisplay $ \dpy -> do
--        s  <- io $ keycodeToKeysym dpy code 0
--        mClean <- cleanMask m
--        ks <- asks keyActions
--        userCodeDef () $ whenJust (M.lookup (mClean, s) ks) id
-+    	kp <- gets keyPressed
-+        if kp /= code then do
-+                modify $ \s -> s { keyPressed = code }
-+                s  <- io $ keycodeToKeysym dpy code 0
-+                mClean <- cleanMask m
-+                ks <- asks keyActions
-+                userCodeDef () $ whenJust (M.lookup (mClean, s) ks) id
-+            else return ()
-+    | t == keyRelease = modify $ \s -> s { keyPressed = 0 }
- 
- -- manage a new window
- handle (MapRequestEvent    {ev_window = w}) = withDisplay $ \dpy -> do
diff --git a/x11-wm/xmonad/metadata.xml b/x11-wm/xmonad/metadata.xml
index 7ec6ab241848..e366d8236cab 100644
--- a/x11-wm/xmonad/metadata.xml
+++ b/x11-wm/xmonad/metadata.xml
@@ -6,8 +6,6 @@
 		<name>Gentoo Haskell</name>
 	</maintainer>
 	<use>
-		<flag name="default-term">Pull terminal specified in default xmonad config
-			to be a bit less hostile by default.</flag>
 		<flag name="no-autorepeat-keys">Allow ignoring of keyboard autorepeat.</flag>
 	</use>
 	<longdescription>
diff --git a/x11-wm/xmonad/xmonad-0.11-r1.ebuild b/x11-wm/xmonad/xmonad-0.11-r1.ebuild
deleted file mode 100644
index 5e216665b0dd..000000000000
--- a/x11-wm/xmonad/xmonad-0.11-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.1
-
-CABAL_FEATURES="bin lib profile haddock hscolour hoogle"
-inherit haskell-cabal
-
-DESCRIPTION="A tiling window manager"
-HOMEPAGE="https://xmonad.org/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="+default-term"
-
-RDEPEND="dev-haskell/extensible-exceptions:=[profile?]
-		dev-haskell/mtl:=[profile?]
-		=dev-haskell/utf8-string-0.3*:=[profile?]
-		>=dev-haskell/x11-1.5:=[profile?]
-		<dev-haskell/x11-1.7:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
-PDEPEND="default-term? ( x11-terms/xterm )
-	x11-apps/xmessage
-"
-
-SAMPLE_CONFIG="xmonad.hs"
-SAMPLE_CONFIG_LOC="man"
-
-src_prepare() {
-	# allow user patches
-	epatch_user
-}
-
-src_install() {
-	cabal_src_install
-
-	echo -e "#!/bin/sh\n/usr/bin/xmonad" > "${T}/${PN}"
-	exeinto /etc/X11/Sessions
-	doexe "${T}/${PN}"
-
-	insinto /usr/share/xsessions
-	doins "${FILESDIR}/${PN}.desktop"
-
-	doman man/xmonad.1
-	dohtml man/xmonad.1.html
-
-	dodoc CONFIG README
-}
-
-pkg_postinst() {
-	haskell-cabal_pkg_postinst
-
-	elog "A sample ${SAMPLE_CONFIG} configuration file can be found here:"
-	elog "    /usr/share/${PF}/ghc-$(ghc-version)/${SAMPLE_CONFIG_LOC}/${SAMPLE_CONFIG}"
-	elog "The parameters in this file are the defaults used by xmonad."
-	elog "To customize xmonad, copy this file to:"
-	elog "    ~/.xmonad/${SAMPLE_CONFIG}"
-	elog "After editing, use 'mod-q' to dynamically restart xmonad "
-	elog "(where the 'mod' key defaults to 'Alt')."
-	elog ""
-	elog "Read the README or man page for more information, and to see "
-	elog "other possible configurations go to:"
-	elog "    http://haskell.org/haskellwiki/Xmonad/Config_archive"
-	elog "Please note that many of these configurations will require the "
-	elog "x11-wm/xmonad-contrib package to be installed."
-}
diff --git a/x11-wm/xmonad/xmonad-0.11-r3.ebuild b/x11-wm/xmonad/xmonad-0.11-r3.ebuild
deleted file mode 100644
index fbe3e95182a9..000000000000
--- a/x11-wm/xmonad/xmonad-0.11-r3.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.1
-
-CABAL_FEATURES="bin lib profile haddock hscolour hoogle"
-inherit haskell-cabal
-
-DESCRIPTION="A tiling window manager"
-HOMEPAGE="https://xmonad.org/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="+default-term no-autorepeat-keys"
-
-RDEPEND="dev-haskell/extensible-exceptions:=[profile?]
-		dev-haskell/mtl:=[profile?]
-		>=dev-haskell/utf8-string-0.3:=[profile?]
-		>=dev-haskell/x11-1.5:=[profile?]
-		<dev-haskell/x11-1.7:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
-PDEPEND="default-term? ( x11-terms/xterm )
-	x11-apps/xmessage
-"
-
-SAMPLE_CONFIG="xmonad.hs"
-SAMPLE_CONFIG_LOC="man"
-
-src_prepare() {
-	epatch "$FILESDIR"/${P}-ghc-7.10.patch
-	epatch "$FILESDIR"/${P}-sample.patch
-	use no-autorepeat-keys && epatch "$FILESDIR"/${PN}-check-repeat.patch
-
-	cabal_chdeps \
-		"utf8-string >= 0.3 && < 0.4" "utf8-string >= 0.3 && < 1.1"
-
-	# allow user patches
-	epatch_user
-}
-
-src_install() {
-	cabal_src_install
-
-	echo -e "#!/bin/sh\n/usr/bin/xmonad" > "${T}/${PN}"
-	exeinto /etc/X11/Sessions
-	doexe "${T}/${PN}"
-
-	insinto /usr/share/xsessions
-	doins "${FILESDIR}/${PN}.desktop"
-
-	doman man/xmonad.1
-	dohtml man/xmonad.1.html
-
-	dodoc CONFIG README
-}
-
-pkg_postinst() {
-	haskell-cabal_pkg_postinst
-
-	elog "A sample ${SAMPLE_CONFIG} configuration file can be found here:"
-	elog "    /usr/share/${PF}/ghc-$(ghc-version)/${SAMPLE_CONFIG_LOC}/${SAMPLE_CONFIG}"
-	elog "The parameters in this file are the defaults used by xmonad."
-	elog "To customize xmonad, copy this file to:"
-	elog "    ~/.xmonad/${SAMPLE_CONFIG}"
-	elog "After editing, use 'mod-q' to dynamically restart xmonad "
-	elog "(where the 'mod' key defaults to 'Alt')."
-	elog ""
-	elog "Read the README or man page for more information, and to see "
-	elog "other possible configurations go to:"
-	elog "    http://haskell.org/haskellwiki/Xmonad/Config_archive"
-	elog "Please note that many of these configurations will require the "
-	elog "x11-wm/xmonad-contrib package to be installed."
-}
diff --git a/x11-wm/xmonad/xmonad-0.11.1.ebuild b/x11-wm/xmonad/xmonad-0.11.1.ebuild
deleted file mode 100644
index 588cc05d6bcd..000000000000
--- a/x11-wm/xmonad/xmonad-0.11.1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A tiling window manager"
-HOMEPAGE="https://xmonad.org/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="+default-term no-autorepeat-keys"
-
-RDEPEND="dev-haskell/extensible-exceptions:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/utf8-string-0.3:=[profile?]
-	>=dev-haskell/x11-1.5:=[profile?] <dev-haskell/x11-1.7:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-PDEPEND="default-term? ( x11-terms/xterm )
-	x11-apps/xmessage
-"
-
-SAMPLE_CONFIG="xmonad.hs"
-SAMPLE_CONFIG_LOC="man"
-
-src_prepare() {
-	epatch "$FILESDIR"/${PN}-0.11-sample.patch
-	use no-autorepeat-keys && epatch "$FILESDIR"/${PN}-check-repeat.patch
-
-	cabal_chdeps \
-		"utf8-string >= 0.3 && < 0.4" "utf8-string >= 0.3 && < 1.1"
-
-	# allow user patches
-	epatch_user
-}
-
-src_install() {
-	cabal_src_install
-
-	echo -e "#!/bin/sh\n/usr/bin/xmonad" > "${T}/${PN}"
-	exeinto /etc/X11/Sessions
-	doexe "${T}/${PN}"
-
-	insinto /usr/share/xsessions
-	doins "${FILESDIR}/${PN}.desktop"
-
-	doman man/xmonad.1
-	dohtml man/xmonad.1.html
-
-	dodoc CONFIG README
-}
-
-pkg_postinst() {
-	haskell-cabal_pkg_postinst
-
-	elog "A sample ${SAMPLE_CONFIG} configuration file can be found here:"
-	elog "    /usr/share/${PF}/ghc-$(ghc-version)/${SAMPLE_CONFIG_LOC}/${SAMPLE_CONFIG}"
-	elog "The parameters in this file are the defaults used by xmonad."
-	elog "To customize xmonad, copy this file to:"
-	elog "    ~/.xmonad/${SAMPLE_CONFIG}"
-	elog "After editing, use 'mod-q' to dynamically restart xmonad "
-	elog "(where the 'mod' key defaults to 'Alt')."
-	elog ""
-	elog "Read the README or man page for more information, and to see "
-	elog "other possible configurations go to:"
-	elog "    http://haskell.org/haskellwiki/Xmonad/Config_archive"
-	elog "Please note that many of these configurations will require the "
-	elog "x11-wm/xmonad-contrib package to be installed."
-}
diff --git a/x11-wm/xmonad/xmonad-0.12.ebuild b/x11-wm/xmonad/xmonad-0.12.ebuild
deleted file mode 100644
index def284ca7ba1..000000000000
--- a/x11-wm/xmonad/xmonad-0.12.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-#hackport: flags: -generatemanpage,-testing
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A tiling window manager"
-HOMEPAGE="https://xmonad.org/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="+default-term no-autorepeat-keys"
-
-RESTRICT=test # fails test on ghc-8 (assert has different text of exception)
-
-RDEPEND="dev-haskell/data-default:=[profile?]
-	dev-haskell/extensible-exceptions:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	dev-haskell/setlocale:=[profile?]
-	>=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
-	>=dev-haskell/x11-1.5:=[profile?] <dev-haskell/x11-1.7:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/quickcheck-2 )
-"
-PDEPEND="default-term? ( x11-terms/xterm )
-	x11-apps/xmessage
-"
-
-SAMPLE_CONFIG="xmonad.hs"
-SAMPLE_CONFIG_LOC="man"
-
-src_prepare() {
-	use no-autorepeat-keys && epatch "$FILESDIR"/${PN}-0.12-check-repeat.patch
-
-	# allow user patches
-	epatch_user
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-generatemanpage \
-		--flag=-testing
-}
-
-src_install() {
-	cabal_src_install
-
-	echo -e "#!/bin/sh\n/usr/bin/xmonad" > "${T}/${PN}"
-	exeinto /etc/X11/Sessions
-	doexe "${T}/${PN}"
-
-	insinto /usr/share/xsessions
-	doins "${FILESDIR}/${PN}.desktop"
-
-	doman man/xmonad.1
-	dohtml man/xmonad.1.html
-
-	dodoc CONFIG README.md CHANGES.md
-}
-
-pkg_postinst() {
-	haskell-cabal_pkg_postinst
-
-	elog "A sample ${SAMPLE_CONFIG} configuration file can be found here:"
-	elog "    /usr/share/${PF}/ghc-$(ghc-version)/${SAMPLE_CONFIG_LOC}/${SAMPLE_CONFIG}"
-	elog "The parameters in this file are the defaults used by xmonad."
-	elog "To customize xmonad, copy this file to:"
-	elog "    ~/.xmonad/${SAMPLE_CONFIG}"
-	elog "After editing, use 'mod-q' to dynamically restart xmonad "
-	elog "(where the 'mod' key defaults to 'Alt')."
-	elog ""
-	elog "Read the README or man page for more information, and to see "
-	elog "other possible configurations go to:"
-	elog "    http://haskell.org/haskellwiki/Xmonad/Config_archive"
-	elog "Please note that many of these configurations will require the "
-	elog "x11-wm/xmonad-contrib package to be installed."
-}
diff --git a/x11-wm/xmonad/xmonad-0.13.ebuild b/x11-wm/xmonad/xmonad-0.13.ebuild
deleted file mode 100644
index 80e6c99b32d2..000000000000
--- a/x11-wm/xmonad/xmonad-0.13.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-#hackport: flags: -generatemanpage,-testing,-profiling
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A tiling window manager"
-HOMEPAGE="https://xmonad.org/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+default-term"
-
-RDEPEND="dev-haskell/data-default:=[profile?]
-	dev-haskell/extensible-exceptions:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	dev-haskell/setlocale:=[profile?]
-	>=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
-	>=dev-haskell/x11-1.8:=[profile?] <dev-haskell/x11-1.9:=[profile?]
-	>=dev-lang/ghc-8.0.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.24.0.0
-	test? ( >=dev-haskell/quickcheck-2 )
-"
-PDEPEND="default-term? ( x11-terms/xterm )
-	x11-apps/xmessage
-"
-
-DOCS=( CONFIG README.md CHANGES.md )
-HTML_DOCS=( man/xmonad.1.html )
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-generatemanpage \
-		--flag=-profiling \
-		--flag=-testing
-}
-
-src_install() {
-	default
-
-	cabal_src_install
-
-	echo -e "#!/bin/sh\n/usr/bin/xmonad" > "${T}/${PN}"
-	exeinto /etc/X11/Sessions
-	doexe "${T}/${PN}"
-
-	insinto /usr/share/xsessions
-	doins "${FILESDIR}/${PN}.desktop"
-
-	doman man/xmonad.1
-}
-
-pkg_postinst() {
-	haskell-cabal_pkg_postinst
-
-	elog "A sample ${SAMPLE_CONFIG} configuration file can be found here:"
-	elog "    /usr/share/${PF}/ghc-$(ghc-version)/man/xmonad.hs"
-	elog "The parameters in this file are the defaults used by xmonad."
-	elog "To customize xmonad, copy this file to:"
-	elog "    ~/.xmonad/${SAMPLE_CONFIG}"
-	elog "After editing, use 'mod-q' to dynamically restart xmonad "
-	elog "(where the 'mod' key defaults to 'Alt')."
-	elog ""
-	elog "Read the README or man page for more information, and to see "
-	elog "other possible configurations go to:"
-	elog "    http://haskell.org/haskellwiki/Xmonad/Config_archive"
-	elog "Please note that many of these configurations will require the "
-	elog "x11-wm/xmonad-contrib package to be installed."
-}