gentoo Easter resync : 12.04.2020

49 files changed, 788 insertions, 222 deletions

diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index f042bd3951a9..6ec20c357d8a 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/blackbox/Manifest b/x11-wm/blackbox/Manifest
index 3a79f02151d8..c1695ad4c09b 100644
--- a/x11-wm/blackbox/Manifest
+++ b/x11-wm/blackbox/Manifest
@@ -5,7 +5,7 @@ AUX blackbox.desktop 128 BLAKE2B 3acb8eec34024ad4b5625d76f16206e40cceb11db194a08
 DIST blackbox-0.70.1.tar.bz2 492399 BLAKE2B d6faed388d2a1fbfbf10baf2b848f78fc5d99bc4e5fb2daf28df7ec9732d9ad5de9dfa87763cea9a954ed72b23207563dda65c92bb37ba2136e8f6e6049e0ab7 SHA512 6e8cf6fd04030a5f97ffd8dbe97aaa0f683f776e7237cdd46f2b93265cd8de665cffce5a352624a2235aa6c42628be13f98d565af765b3f06e95bff404fb0ccb
 DIST blackbox-0.75.tar.gz 394605 BLAKE2B 6e1338f946fe1d211d88f060178a17c452ca2b5f700d8ab73c62e2f01fd7bc81a52d06dcb42941c133528b144a6707c6ecc4711cb10630ce2921214d0b699669 SHA512 64d1ec45f9cb143dc5e3688a490acb3e20e303c57f778656dda227215b2fa13ca2db753aebc7b1ea9605a9d66c69ff8cfdf8010dc2f37ddc4609d9d3865ec068
 DIST blackbox-0.76.tar.gz 394032 BLAKE2B ffefd24277c581ca59216f53c10d5ffacd7231b33c7fd8bfd799a1f93f0b4953ab91f6c8e7061f91ca80036a8a2b8d7b118383e97b8ab58b8f4cd039155760a1 SHA512 bc97ae699820f8291399ce6f2a87ef4486fabcaeda2dc33fbeb31fc6405c01d722a52c85d8dc65ef44bb031e3dda63c326b76aa1bfca3e544bfcab0fac9d1afa
-EBUILD blackbox-0.70.1-r1.ebuild 1324 BLAKE2B c1742fcfbaafea572d5c0aa74dca7886252020a78adfc0f49f62c2ed5d2f8c6b6a478f57f20b63d1ff19b297c89111c230efd3124734d14e6a9d941c994342d5 SHA512 8183bd4bf14db7e8a676ef04d5b63bf43ed47dc9ca947dd6f2d5b7df9aeeddbeca17e487d1502b16f898ec553976d3600f17b6386dc4f8780cf4dd6fd14fb046
+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 1169 BLAKE2B 91ba3978e000215681f8561a2a88eaa8f59593b696a3d69a54c854dced333ffbb3ca7da7baadf4f1998ed4b0f57b7aeed416624fdcc736ba6ec5fda85939b3d6 SHA512 63ee8335f5d3d7a46a14e79738f091d1b3e6da27331420f4d4c7a1c68b5410cd0b2dd940ed99abb5d3faa65a0cbec314ddf0aff6319286820620ad9dc267197e
 MISC metadata.xml 572 BLAKE2B 3b4a1463dc3c3d78c92f1b983b66f3b7eebde350932374e9cdee846566f53c7a4bbdfb97006c8fd4bad8e945b0b4f70893853b8ae3d634c3ad3b9d6bd00e7860 SHA512 e4862cf23928cd2fe0db5b6d70caee609139cc48e1e5d2f5551142165c9c839c8c34ad3e8dbf2fb2e027ce4eef759a6d985063a3e7cc0332a72708262f1c8213
diff --git a/x11-wm/blackbox/blackbox-0.70.1-r1.ebuild b/x11-wm/blackbox/blackbox-0.70.1-r1.ebuild
index 1e59f5025522..967d5117112d 100644
--- a/x11-wm/blackbox/blackbox-0.70.1-r1.ebuild
+++ b/x11-wm/blackbox/blackbox-0.70.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}wm/${P}.tar.bz2"
 
 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/enlightenment/Manifest b/x11-wm/enlightenment/Manifest
index b19bbd8423b8..5582668c5dc8 100644
--- a/x11-wm/enlightenment/Manifest
+++ b/x11-wm/enlightenment/Manifest
@@ -1,4 +1,4 @@
 AUX gentoo-sysactions.conf 3056 BLAKE2B 155b0826c544a5a4829214b4b43d49e2dad455d041f0afc7077dc44780d12bd1a99a1bc94bb5a4a9ba21f59f679e1d4c82609791ee5a5e9828543b1e9154fae5 SHA512 688f02cbff0d50a847eb08ca7832699b836adca9b22e15a780943a8e5a8213aac04b335cfdf3cb96adbff238f681ae8954a720153e8e35b2afaba3225d53206a
 DIST enlightenment-0.23.1.tar.xz 26426096 BLAKE2B d781dc951ad8eddd90f633b29a6b1180be63e6052a56e60644b4f738f4c0d42617aeb4f7326cf3284d0b331dd87d605fa0625ea6435f4e36b8f5b3ccce82ca53 SHA512 b5b8a34f6abe47d9b23dbcaf09d2f61f74b3f8d5a97b30a9666916b4bd307a45cb2ad874288419ab40ef06fa57c3b7dc15377dd9acaeb6eb71cd8c0c24fc42cb
-EBUILD enlightenment-0.23.1.ebuild 2777 BLAKE2B 039f6940649fe7b1ac6d95a75bb76e7f923d5f898a34a966359a0cc2db505d1fb627f9a49e5e5bd1179f441e4c4f72cb4acd5b614732d0260c1a37e470fdfc13 SHA512 5bf887ad0f03bca7e60844042c6736331c9fe26a97442a2c9a234891a16206cda2aba3bdcbb44c7655ae1da34a36e692d30184573b894ee273c00c2d2ba28596
+EBUILD enlightenment-0.23.1.ebuild 2771 BLAKE2B 20d010c60aaa1797b5a0c3f2c5014fc0cb9ea7cc16224f4002ebf7670ccf5f59452cba86bc558b3fa8010506b55ef283e03797eeccb90a1b169c873347ade3c6 SHA512 1ed389d8b6a23c03b32a1a524596654ec66ea381a0df8e4256fd081ba8f083b5a2a2139db5418813b10bbfa7e2cf2f03fe5462e2870d607b164476c7e4fe6b4e
 MISC metadata.xml 802 BLAKE2B b7b4f3531b89d5aa743c0153171fc9c36e732ba609eb7703961fd65780c59662ebf796cd7c822ab3cfeed7198fbf4fe8f9b481755f6ac5792729f30e4cc13c6c SHA512 4634f5d13c9f6ae6a7ddeb2c50e8882fac00ac17de37e8eabc24d5edd2470a5e35ffcf21a885be572d1d55f12610eb7496b39a29aad5b3d5f48e67ec26be884b
diff --git a/x11-wm/enlightenment/enlightenment-0.23.1.ebuild b/x11-wm/enlightenment/enlightenment-0.23.1.ebuild
index 4b8be24627ab..f7ace1703863 100644
--- a/x11-wm/enlightenment/enlightenment-0.23.1.ebuild
+++ b/x11-wm/enlightenment/enlightenment-0.23.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 ~hppa ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
 IUSE="acpi bluetooth connman doc geolocation nls packagekit pam systemd udisks wayland wifi xwayland"
 
 REQUIRED_USE="xwayland? ( wayland )"
diff --git a/x11-wm/herbstluftwm/Manifest b/x11-wm/herbstluftwm/Manifest
index 32f8a11d2eba..dff46614e8e2 100644
--- a/x11-wm/herbstluftwm/Manifest
+++ b/x11-wm/herbstluftwm/Manifest
@@ -1,4 +1,6 @@
 DIST herbstluftwm-0.7.2.tar.gz 245506 BLAKE2B 72d0bb2a77e519161d193ac7b2b9f1f878ccb6cfe4914b6c75d060e2daa0bec4203ee4ebf203b9fa1dfb844d71d50aa7c03257c78aa22e906bf42519d1e592af SHA512 abb49bbc3de9a0ef619ce7063c1cea0d0d25ab2195c53dc0d33e061ad24060da4bbe9b99b9b9126028cdf68b462d4fcc8d1534431e4892d571ff897a68d2113c
+DIST herbstluftwm-0.8.0.tar.gz 358434 BLAKE2B 770aa66c2e8926d5f73b36ae2376e33ac92f9f72e2d45f55caa3247710f88b0eef72bed8a7242ba4ef298d9e8a7af3768114bd5149aa5596aa4682caef7e9e91 SHA512 108ef76e6f81d98742c37a1a5ecf1ce998d6fc8ee43642acb08716a5bee2e7a691f1f8defe9c81ecc8930f8b29ba7a49efe2eb00a3699c22de1a5f841266873c
 EBUILD herbstluftwm-0.7.2-r1.ebuild 1534 BLAKE2B a88a23d3cdcaf5761198b31112ebeeac213f5e576e3d5e566121713875e1e9b8a78d9c7e63659da6144b6733905f0b2def82761dff36e29400b899670d3c2aec SHA512 8bf19a5fc434271eeafc58a168dd852a8962cd9c8c35ecd2779eb2f195d4fae3942ff7884c96c8177592d4374e4b3bcd63a5c33bee46e73ff5b08b5dd20f0e9f
-EBUILD herbstluftwm-9999.ebuild 1536 BLAKE2B 9b2409c32676bf95b45a03a9fb29a4a29016eb706832ce641dbbc8b15deafebcbce5e4e52d22adf2e134d4b3d23fb6337dde128b5498b847d15431a987830f12 SHA512 9b72fb3fd625334d74d45c2c110eedf0d0975a6f4170a2fc4df57b57078ddfbb6ed9626bf99e3887a44ea8dfb03c0635c9810024c508e5dbb0b013da7080f0f4
+EBUILD herbstluftwm-0.8.0.ebuild 1191 BLAKE2B 52eb2606709ce651cca110d2c4cd31f08be1da2cba221e359308960db130e7ea55db7229c500b587b6d18d521f3d9394c719c574e02bdcba923b9e2a9df20ab8 SHA512 23a5a10bf2fbe879f443d9e86078a1e1af30217f2e92f7631d3805b1960dd201ae5decc65a0cdf4e409f107c9d249a61a63344b6b5a3f210ca334619841c0c35
+EBUILD herbstluftwm-9999.ebuild 1191 BLAKE2B 52eb2606709ce651cca110d2c4cd31f08be1da2cba221e359308960db130e7ea55db7229c500b587b6d18d521f3d9394c719c574e02bdcba923b9e2a9df20ab8 SHA512 23a5a10bf2fbe879f443d9e86078a1e1af30217f2e92f7631d3805b1960dd201ae5decc65a0cdf4e409f107c9d249a61a63344b6b5a3f210ca334619841c0c35
 MISC metadata.xml 210 BLAKE2B bb9591af5406abbf589664053ab6e5cb38933fe6ef97c11609405392b050b26cff8e94e04e85e5798124abd46283bee67b2a74923a5041616df15aaa9cff6da9 SHA512 f7cbe57a24b67a28696f91061ad8bd61d7d4cf3d59d20c3dcc6a4921e29672d00ecf3ece70a8813399d2467ebd626f8f829300e81fc722e9aaa527e213a5fb54
diff --git a/x11-wm/herbstluftwm/herbstluftwm-0.8.0.ebuild b/x11-wm/herbstluftwm/herbstluftwm-0.8.0.ebuild
new file mode 100644
index 000000000000..c6dbf314e58c
--- /dev/null
+++ b/x11-wm/herbstluftwm/herbstluftwm-0.8.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs cmake-utils
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/herbstluftwm/herbstluftwm"
+	BDEPEND="app-text/asciidoc"
+else
+	SRC_URI="https://herbstluftwm.org/tarballs/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	BDEPEND=""
+fi
+
+DESCRIPTION="A manual tiling window manager for X"
+HOMEPAGE="https://herbstluftwm.org/"
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="examples xinerama zsh-completion"
+
+DEPEND="
+	>=dev-libs/glib-2.24:2
+	x11-libs/libX11
+	x11-libs/libXext
+	xinerama? ( x11-libs/libXinerama )
+"
+RDEPEND="
+	${DEPEND}
+	app-shells/bash
+	zsh-completion? ( app-shells/zsh )
+"
+BDEPEND+="
+	virtual/pkgconfig
+"
+
+src_configure() {
+	sed -i \
+		-e '/^install.*LICENSEDIR/d' \
+		-e '/set(DOCDIR / s#.*#set(DOCDIR ${CMAKE_INSTALL_DOCDIR})#' \
+		CMakeLists.txt || die
+
+	mycmakeargs=(
+		-DWITH_XINERAMA=$(usex xinerama)
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if ! use examples; then
+		rm -r "${ED}"/usr/share/doc/${PF}/examples || die
+	fi
+
+	if ! use zsh-completion; then
+		rm -r "${ED}"/usr/share/zsh || die
+	fi
+}
diff --git a/x11-wm/herbstluftwm/herbstluftwm-9999.ebuild b/x11-wm/herbstluftwm/herbstluftwm-9999.ebuild
index 191f2848d3bf..c6dbf314e58c 100644
--- a/x11-wm/herbstluftwm/herbstluftwm-9999.ebuild
+++ b/x11-wm/herbstluftwm/herbstluftwm-9999.ebuild
@@ -2,9 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit toolchain-funcs bash-completion-r1
+inherit toolchain-funcs cmake-utils
 
-if [[ ${PV} == 9999* ]] ; then
+if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/herbstluftwm/herbstluftwm"
 	BDEPEND="app-text/asciidoc"
@@ -36,37 +36,27 @@ BDEPEND+="
 	virtual/pkgconfig
 "
 
-src_compile() {
-	tc-export CC CXX LD PKG_CONFIG
+src_configure() {
+	sed -i \
+		-e '/^install.*LICENSEDIR/d' \
+		-e '/set(DOCDIR / s#.*#set(DOCDIR ${CMAKE_INSTALL_DOCDIR})#' \
+		CMakeLists.txt || die
 
-	emake LDXX="$(tc-getCXX)" COLOR=0 VERBOSE= \
-		$(use xinerama || echo XINERAMAFLAGS= XINERAMALIBS= )
+	mycmakeargs=(
+		-DWITH_XINERAMA=$(usex xinerama)
+	)
+
+	cmake-utils_src_configure
 }
 
 src_install() {
-	dobin herbstluftwm herbstclient
-	dodoc BUGS MIGRATION NEWS README.md
-
-	doman doc/{herbstluftwm,herbstclient}.1
-
-	exeinto /etc/xdg/herbstluftwm
-	doexe share/{autostart,panel.sh,restartpanels.sh}
-
-	insinto /usr/share/xsessions
-	doins share/herbstluftwm.desktop
-
-	newbashcomp share/herbstclient-completion herbstclient
+	cmake-utils_src_install
 
-	if use zsh-completion ; then
-		insinto /usr/share/zsh/site-functions
-		doins share/_herbstclient
+	if ! use examples; then
+		rm -r "${ED}"/usr/share/doc/${PF}/examples || die
 	fi
 
-	if use examples ; then
-		exeinto /usr/share/doc/${PF}/examples
-		doexe scripts/*.sh
-		docinto examples
-		dodoc scripts/README
-		docompress -x /usr/share/doc/${PF}/examples
+	if ! use zsh-completion; then
+		rm -r "${ED}"/usr/share/zsh || die
 	fi
 }
diff --git a/x11-wm/icewm/Manifest b/x11-wm/icewm/Manifest
index f173a209837f..a9f9f108c6d4 100644
--- a/x11-wm/icewm/Manifest
+++ b/x11-wm/icewm/Manifest
@@ -1,8 +1,8 @@
 AUX icewm 33 BLAKE2B 5605658012ad8ed16bbd4cf0c4cb7cbe5204f73c20ef2c3d9fef1011a80b9e68863de64b45e4b043604b147c9d31f3f5d2617d067b694f5ec5329ad895472b0e SHA512 3fe619e59cc5d354242ccd85d3b1982dd7db6d0f6170f46f9d33975872f6d5a342a08d69db763162dc43681eedb96e9ba5075455bf54adf4fb86bf19887bf6e0
 DIST icewm-1.5.5.tar.xz 1707656 BLAKE2B 670ab4d1c1648faa24c848ddb04f3e353a3acd8e9a105837229d00ca344a61b3432d7b23b89dc054e220797cfd56d6504ad233d8793a3a5d95d9943c79017797 SHA512 5d75d33bf6e45ea0b46ace5173d825e9d1a12318cf7a5319b20ea704b019f6c09391f0f199b0fac678ba0f160d8236fc1cfee5d3b47d1895b7ba3721ff62a05e
-DIST icewm-1.6.3.tar.lz 1678149 BLAKE2B cfb41b104f0e64172b1aa983b542dc42b6369061ad4365547b14f4f96bccba6610c9b4324ccdc691421354c387c37fa80e525658139ba4213b6ea8d86448e3cf SHA512 18d77695c22131fac98172c09e27c014c10e908f4fc0cbeeb376b9308a659f0a51b466c80fc39875d8e0cf52fd6b385e636faf96c55fcb80b2cb9c1d0eb57e41
 DIST icewm-1.6.4.tar.lz 1684348 BLAKE2B 63d2c609277f78ca438720c8f38108cf5b8f82361810773a79f42b161ccfb598f468cb6352ed3e1c7d523869ba6152be09e8f4ee008f300431dbe4fde4dc0325 SHA512 6a8c3b2e561c4471759b0566a4c5dc390f4abd6f266ab738a80a21445dffe9f45b24eca898507ff7c9b84ea12331262b81967b5a76be0b19e737842a66bcb000
+DIST icewm-1.6.5.tar.lz 1681783 BLAKE2B 3b89bfc3a02ff714c4eb5ec81b64dacabccefa39027cc05d0718ef6f4d1d77af503099a4c1e4735e3a4a3122899d7e5ef04c0be3fddcc442c89c8af830ee294a SHA512 7914031fa2df42ed337aa9c65c04f959746210c255dc799361b636042f1614949e1f9a3b9a2357fe39f469f2ed9a75d4c916c7b4c3e61c7b7ab6dc2cf9d3d9be
 EBUILD icewm-1.5.5.ebuild 2340 BLAKE2B bc642a3517caf7db6396f0123cc23f266bccb75b4af0c62f0519c98fd0d5ed61f3cbee29b6c48c979986c16bad87eed0cfe64aadcc345ef40b82feec02d56f5b SHA512 fd19bd04c7fc3b475af8b3915563e37be1939aecadf08f89f0b69c0a566f7b9adef413a8c4f35b17302a71da72a972f1e034c6f509b306fb32e17a5bc3e5df81
-EBUILD icewm-1.6.3.ebuild 2674 BLAKE2B 527d266c70c5a81b2664778a828f6d73156e64a03da93d0b33499fe83f9b2036e75f19ac4f687b069f834d72d0ba8503f27692c5d9c7a4d39365433ed6fd64eb SHA512 7497f2c29f337623c803fbb30ca1df6b0019a3ca76b143d0b320ca7a923ccc84389895797a1bce5382c6d2671e3c27f7ad73a554320d8ef0495e270228f0980a
 EBUILD icewm-1.6.4.ebuild 2674 BLAKE2B 527d266c70c5a81b2664778a828f6d73156e64a03da93d0b33499fe83f9b2036e75f19ac4f687b069f834d72d0ba8503f27692c5d9c7a4d39365433ed6fd64eb SHA512 7497f2c29f337623c803fbb30ca1df6b0019a3ca76b143d0b320ca7a923ccc84389895797a1bce5382c6d2671e3c27f7ad73a554320d8ef0495e270228f0980a
+EBUILD icewm-1.6.5.ebuild 2674 BLAKE2B 527d266c70c5a81b2664778a828f6d73156e64a03da93d0b33499fe83f9b2036e75f19ac4f687b069f834d72d0ba8503f27692c5d9c7a4d39365433ed6fd64eb SHA512 7497f2c29f337623c803fbb30ca1df6b0019a3ca76b143d0b320ca7a923ccc84389895797a1bce5382c6d2671e3c27f7ad73a554320d8ef0495e270228f0980a
 MISC metadata.xml 747 BLAKE2B a986dc65f9b603519ef92fecc63cadd2921d6569e8735956a55ce91673426082e367664cce23c2b80cec19e0d997da357ac8f9d3d78c738ad92f42f6f426c225 SHA512 f9b84c60b780b5999c8a295b64bdf1bdb734108984e48f1271257cb35602df024a347560526de52f43ede16f67031551f4ae3f37401d3320e4dbdfb913e557fe
diff --git a/x11-wm/icewm/icewm-1.6.3.ebuild b/x11-wm/icewm/icewm-1.6.5.ebuild
index f3a5bab3c272..f3a5bab3c272 100644
--- a/x11-wm/icewm/icewm-1.6.3.ebuild
+++ b/x11-wm/icewm/icewm-1.6.5.ebuild
diff --git a/x11-wm/lumina/Manifest b/x11-wm/lumina/Manifest
index 944b33900044..1e62d9a004c5 100644
--- a/x11-wm/lumina/Manifest
+++ b/x11-wm/lumina/Manifest
@@ -3,6 +3,6 @@ AUX lumina-session 2011 BLAKE2B bec6e1161c89ef0ae5f6506d57b6deff09f907b2c16b0d34
 DIST lumina-1.5.0.tar.gz 20657364 BLAKE2B 62b064e1be3ce69c078e68524e011a8ce4d61c680a4732da7992a7b72833363fceb0a0895a228ec9de7921d989253c70c518810b91c23226aded1f54b23b1aea SHA512 37106d71a9ba7188c4ded0614d2d4424f732519e11288ae312dfcd9a0b5b26dd31dfa812e74a96c0e3e0fb99fae4dc00806fd7a24183746688c72d997054af7d
 DIST lumina-1.6.0.tar.gz 20662000 BLAKE2B c016f07fb86333e792d6a0a0ddaa9ea09f322d6de69d099abf9340d7db6cb9e23624b62882579ba6c13eec71fcf663f1688424fd940cd7e09e625f6fcc4b281f SHA512 e923961568ab9cc32206386066daef8cd1fd2db2d5c3e260e5c1da1dcda39a516576418f607cefbe5a1c47d8684591d0e595fb344e7d6aa2859fc3b326e73e30
 EBUILD lumina-1.5.0-r1.ebuild 2416 BLAKE2B 3ac8557090047e11dc95cb497549767d2bd9d8b222faa4ee8ee1ca978d6fefd259070347f1194f8dbea6b619fdacb14d2e4d261d2c59acf8b1f95d25db56c956 SHA512 6ffdee6ef07be2f20b50e63bf8b49ad99b0a38ec28897fafd98c0be4029c35d2187ef1f52b7e97ce45a120041742cbab65e1871e86ea825f167b93cf37d502fd
-EBUILD lumina-1.6.0.ebuild 2418 BLAKE2B 5edf64f68c136c88d406cb51ad273a1c1be9aad51762c54125616569a90e9ab9568a2f9582ddf2db8209d97f04791b8ffd6088004b6b4cc2fec57180edc54645 SHA512 4186526b3679ba0c708b4c8a061742dedafb640b97db1cd3fe49ce93aaeed57d96a542d5cc5c5e7342f60fe49d6aefda65e4205c06accc49b6d2f3f1e6735fe9
+EBUILD lumina-1.6.0.ebuild 2416 BLAKE2B 3ac8557090047e11dc95cb497549767d2bd9d8b222faa4ee8ee1ca978d6fefd259070347f1194f8dbea6b619fdacb14d2e4d261d2c59acf8b1f95d25db56c956 SHA512 6ffdee6ef07be2f20b50e63bf8b49ad99b0a38ec28897fafd98c0be4029c35d2187ef1f52b7e97ce45a120041742cbab65e1871e86ea825f167b93cf37d502fd
 EBUILD lumina-9999.ebuild 1389 BLAKE2B f38168a489101f25833660e2de3ff1666d69b47b620469376cde8825ca4d0a6f6ded5739be7f791df80d94a950e86cd3d8bbd1bb018712e94956df80ac8dfc81 SHA512 30168658fccea7521658148c795202513fbe07e089d1207b895270b0e28002a7a77f450c1af27e5c0e0f3e707f81cd6a46f966010239d457cedf43ee14b58ac1
 MISC metadata.xml 1981 BLAKE2B 260d71ea029aa07a26cc0af9d937c51253029b0bc4c70f11d4330da3a10d371be15959c93f4b1af1436b7a3c5a8a1ecb2a8f3cdea2078133384bcec3015f9940 SHA512 a55aba75dcdfc78363be5a59ebbcb7760fb1370685d7a893b976aba9497094f9674e7493ed0df3899ad917165967c3a58984bc04f3651b46416fa91fcb29de6c
diff --git a/x11-wm/lumina/lumina-1.6.0.ebuild b/x11-wm/lumina/lumina-1.6.0.ebuild
index 7ec4ca3bc6d1..a55056735a3b 100644
--- a/x11-wm/lumina/lumina-1.6.0.ebuild
+++ b/x11-wm/lumina/lumina-1.6.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/trueos/${PN}/archive/v${PV/_/-}.tar.gz -> ${P}.tar.g
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="desktop-utils"
 
 COMMON_DEPEND="dev-qt/qtcore:5
diff --git a/x11-wm/marco/Manifest b/x11-wm/marco/Manifest
index dfe571142938..478b8ab41192 100644
--- a/x11-wm/marco/Manifest
+++ b/x11-wm/marco/Manifest
@@ -1,5 +1,9 @@
 DIST marco-1.22.1.tar.xz 1357864 BLAKE2B 241e71795acfdcbf90070ef0d14f0cc55894a5cddbf48bd8741cf9580cfcaa035890b23a2182738875ce4d89d099a80d59aa7b1937e4a34a18a5a969830e7db9 SHA512 18093f4d419fbc90f957a04ec3e36a153b3c51a6bcdc1ac5884adcc0292f157bc5e4af51e171451a4b54b5bccffdee2e8a07ed13dafb6106773abfb06b6a8a4f
-DIST marco-1.22.2.tar.xz 1366104 BLAKE2B 6caa7da12c32b8adcc6d3ab4525fcf9e892585cb528bd73e47af1e2eeda2c31d174e55acd98f9a4759e22176fa06aa13d8a6ef6a6b2cc82d11bed27b156d6739 SHA512 96665120dbc698c78795eeaa559ae2bfd2a3c7ed4846e40bcfb1d6dfc8d7e359b860e1e715085a17e11c66ce7f31561d372da8372209c21c7b1ce6029a3f5ea1
-EBUILD marco-1.22.1-r1.ebuild 1454 BLAKE2B 53ed1c98621ad69fe6653f96a15d70cd508d1572f81c51eb8f57019c5bb435c80f6ba2762b45d7758ee91508926d2082d57c3dc3ba226e251835e7c334507c6b SHA512 5b2f331b387f279eea544589c7f2fc91d4f1ceb905e9694b28a7e382e8bd080e504eb386abf9c19e4d11fa2306653ebd9d835b40b62384d782ece5a681511791
-EBUILD marco-1.22.2.ebuild 1456 BLAKE2B 3796b983fb64d7284f8ff0be2198cc79049936781abc6f5ac70265a4d0ab2750212227c1bc4ee43bc9b6b3bacf6b965e2949348e5d70ec5f35cddb159d915888 SHA512 9c4bcb7c3bc31cd7e43db200b617d18caf5887ad21c939dbaa90eab969859750a020c6a468dcb76a35eedc42538c11ce214a16fc49a085363d3c2a5dd446a225
+DIST marco-1.22.4.tar.xz 1368868 BLAKE2B 45a1bdfa13419f690e4a1604a18f1ef4f57b95cc64c628a8d1c4b8d5a92409eb8ecb946b60c9b9711151858a4668247f2ee031a95464463f3005952edd95265c SHA512 46867396b66453c63624e54c382845b898b10768db0560100f021e57ec80189785093be38eeaf19c50a9e4728de2b6e605267a8f1d5a5596aaa75958c0e3a6b0
+DIST marco-1.24.0.tar.xz 1827076 BLAKE2B e4bcf8584199cbe4f9f813c7512176dd9b84a39ed162cd051f1f174c428828d1d73d6ab64c19ca681f0aea966742e0474256935f2a7c0c490b77dda91147162c SHA512 b257994c097f174fe83f3f0f4d6b6991e8c0f402daffd99f8a9521d588b609c56953e73dd4d143be64f5c9a4caa8d890ff30a120e18a9d5b36c6f856a7190428
+EBUILD marco-1.22.1-r2.ebuild 1478 BLAKE2B b0e7be73aee1d0a4cb23aecbc4aa3389c495f5a01159bc70b1805986fdd976539e5892cb6826b0e41f9d6dcfa105e719ac5844c54782460970f91c61acda1f9b SHA512 41c1b18086fdce186a0caf28ea85849682492a39e69acc6eb5cd3b825dd1ba2ce494ebaa15156743809ab2fee8df529aa0bcccb4961d699e9461c78f6e4bb3e0
+EBUILD marco-1.22.4-r1.ebuild 1480 BLAKE2B e6cedb9687d8c8d102f644bc03f9f14a4497cf54da113cf555e73505fc2fb195f8d8b728801a6680a8be0595104971513cccbd91a28a2a8aa1487505cf60c733 SHA512 c4758e8f6c5c3657cf2e1a29bbc3396cc6e2d7227a476d70967c5ff7d9b8c5d3b525e60108012e463e0aeff35bd85d083d662169f3f8a781056899c5f3743999
+EBUILD marco-1.22.4.ebuild 1478 BLAKE2B 91e512c87fb2df54950faf531d537272457ae4538f0590e32eee49466820ae88278de23046ecfa06d2ad54da9dffaaa01062e237a030d42cf57bf6a3f6b4c261 SHA512 8fd77016b4741cd0a48399d2840290f09cf8dcbe1cdd0288eeef468ab3eafaf2d1a179b0e017e37fe66b1dbf5d4579e6f6e52e505e28fe22c1c382b6d6c4fd62
+EBUILD marco-1.24.0-r1.ebuild 1485 BLAKE2B dc08a2e61ce2eb12c552341552d97fe73063e696d13a3257de25554448e7c040bf1cb30f48b5c2cc2647df6a38816cae17653071b2aa50908c9d37390da8cccc SHA512 82d828b42511b687d67c5910ac9635fe0b61b690a187181363392a9e97f4a8e9f7199ef30615b4baf96350dcba2303c220965624eba7a4df6041912418f1ad6e
+EBUILD marco-1.24.0.ebuild 1483 BLAKE2B 892fc383553d75e6a572b8c3ed10256fb553909131758a6cebd3cb1e851c8a2ede9c9dcacc95a25ef61d8195354b263709718cd5871cf396be91fc97707f15dc SHA512 fe1bd773fd110d273800716894b391558a049e07c8cc0132a3892f69bac3593b44f378ad9c7a78f66502d37229a0e4863db1bcad94687f3900f3c6e2a63d012f
 MISC metadata.xml 334 BLAKE2B 4a521e1c77d597f68a11cdaa695afcb40a5a2670a7fd643db0999362884a0bad7fb8106b7ba479a939930fbf0323c7f22186cf3fca5583210227a819631ead5d SHA512 f55f007780c371bc133eb3b8eed1bb4f930cab1e29c9ff0ab2dd99cd2e1458058dc86bf3fd70e9f4e9f1db259a7b8a5a247b04282ca08e88d767ee2f1878a451
diff --git a/x11-wm/marco/marco-1.22.1-r1.ebuild b/x11-wm/marco/marco-1.22.1-r2.ebuild
index 1390d88f009e..a55e5ffb66ba 100644
--- a/x11-wm/marco/marco-1.22.1-r1.ebuild
+++ b/x11-wm/marco/marco-1.22.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,8 +12,8 @@ if [[ ${PV} != 9999 ]]; then
 fi
 
 DESCRIPTION="MATE default window manager"
-LICENSE="GPL-2"
-SLOT="0"
+LICENSE="FDL-1.2+ GPL-2+ LGPL-2+ MIT"
+SLOT="0/1"
 
 IUSE="startup-notification test xinerama"
 RESTRICT="!test? ( test )"
diff --git a/x11-wm/marco/marco-1.22.4-r1.ebuild b/x11-wm/marco/marco-1.22.4-r1.ebuild
new file mode 100644
index 000000000000..f20058b183b5
--- /dev/null
+++ b/x11-wm/marco/marco-1.22.4-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MATE2_LA_PUNT="yes"
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+DESCRIPTION="MATE default window manager"
+LICENSE="FDL-1.2+ GPL-2+ LGPL-2+ MIT"
+SLOT="0/2"
+
+IUSE="startup-notification test xinerama"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	dev-libs/atk
+	>=dev-libs/glib-2.50:2
+	>=gnome-base/libgtop-2:2=
+	media-libs/libcanberra[gtk3]
+	x11-libs/cairo
+	>=x11-libs/pango-1.2[X]
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.22:3
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	>=x11-libs/libXcomposite-0.3
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXpresent
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	>=x11-libs/startup-notification-0.7
+	virtual/libintl
+	xinerama? ( x11-libs/libXinerama )
+	!!x11-wm/mate-window-manager"
+
+RDEPEND="${COMMON_DEPEND}
+	gnome-extra/zenity
+	>=mate-base/mate-desktop-1.20.0"
+
+DEPEND="${COMMON_DEPEND}
+	app-text/yelp-tools
+	>=dev-util/intltool-0.34.90
+	sys-devel/gettext:*
+	virtual/pkgconfig:*
+	x11-base/xorg-proto
+	test? ( app-text/docbook-xml-dtd:4.5 )
+	xinerama? ( x11-base/xorg-proto )"
+
+src_configure() {
+	mate_src_configure \
+		--enable-compositor \
+		--enable-render \
+		--enable-shape \
+		--enable-sm \
+		--enable-xsync \
+		$(use_enable startup-notification) \
+		$(use_enable xinerama)
+}
+
+src_install() {
+	mate_src_install
+	dodoc {,doc/}*.txt
+}
diff --git a/x11-wm/marco/marco-1.22.2.ebuild b/x11-wm/marco/marco-1.22.4.ebuild
index 9745be329973..a693ad0e7c52 100644
--- a/x11-wm/marco/marco-1.22.2.ebuild
+++ b/x11-wm/marco/marco-1.22.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ if [[ ${PV} != 9999 ]]; then
 fi
 
 DESCRIPTION="MATE default window manager"
-LICENSE="GPL-2"
+LICENSE="FDL-1.2+ GPL-2+ LGPL-2+ MIT"
 SLOT="0"
 
 IUSE="startup-notification test xinerama"
diff --git a/x11-wm/marco/marco-1.24.0-r1.ebuild b/x11-wm/marco/marco-1.24.0-r1.ebuild
new file mode 100644
index 000000000000..83c4dce13d8e
--- /dev/null
+++ b/x11-wm/marco/marco-1.24.0-r1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MATE2_LA_PUNT="yes"
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+DESCRIPTION="MATE default window manager"
+LICENSE="FDL-1.2+ GPL-2+ LGPL-2+ MIT"
+SLOT="0/2"
+
+IUSE="startup-notification test xinerama"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	dev-libs/atk
+	>=dev-libs/glib-2.58:2
+	>=gnome-base/libgtop-2:2=
+	media-libs/libcanberra[gtk3]
+	x11-libs/cairo
+	>=x11-libs/pango-1.2[X]
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.22:3
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	>=x11-libs/libXcomposite-0.3
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXpresent
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	>=x11-libs/startup-notification-0.7
+	xinerama? ( x11-libs/libXinerama )
+	!!x11-wm/mate-window-manager"
+
+RDEPEND="${COMMON_DEPEND}
+	gnome-extra/zenity
+	>=mate-base/mate-desktop-1.20.0
+	virtual/libintl
+"
+
+DEPEND="${COMMON_DEPEND}
+	app-text/yelp-tools
+	>=sys-devel/gettext-0.19.8:*
+	>=sys-devel/libtool-2.0.0
+	virtual/pkgconfig:*
+	x11-base/xorg-proto
+	test? ( app-text/docbook-xml-dtd:4.5 )
+	xinerama? ( x11-base/xorg-proto )"
+
+src_configure() {
+	mate_src_configure \
+		--enable-compositor \
+		--enable-render \
+		--enable-shape \
+		--enable-sm \
+		--enable-xsync \
+		$(use_enable startup-notification) \
+		$(use_enable xinerama)
+}
+
+src_install() {
+	mate_src_install
+	dodoc doc/*.txt
+}
diff --git a/x11-wm/marco/marco-1.24.0.ebuild b/x11-wm/marco/marco-1.24.0.ebuild
new file mode 100644
index 000000000000..10f95fe208f8
--- /dev/null
+++ b/x11-wm/marco/marco-1.24.0.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MATE2_LA_PUNT="yes"
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+DESCRIPTION="MATE default window manager"
+LICENSE="FDL-1.2+ GPL-2+ LGPL-2+ MIT"
+SLOT="0"
+
+IUSE="startup-notification test xinerama"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	dev-libs/atk
+	>=dev-libs/glib-2.58:2
+	>=gnome-base/libgtop-2:2=
+	media-libs/libcanberra[gtk3]
+	x11-libs/cairo
+	>=x11-libs/pango-1.2[X]
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.22:3
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	>=x11-libs/libXcomposite-0.3
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXpresent
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	>=x11-libs/startup-notification-0.7
+	xinerama? ( x11-libs/libXinerama )
+	!!x11-wm/mate-window-manager"
+
+RDEPEND="${COMMON_DEPEND}
+	gnome-extra/zenity
+	>=mate-base/mate-desktop-1.20.0
+	virtual/libintl
+"
+
+DEPEND="${COMMON_DEPEND}
+	app-text/yelp-tools
+	>=sys-devel/gettext-0.19.8:*
+	>=sys-devel/libtool-2.0.0
+	virtual/pkgconfig:*
+	x11-base/xorg-proto
+	test? ( app-text/docbook-xml-dtd:4.5 )
+	xinerama? ( x11-base/xorg-proto )"
+
+src_configure() {
+	mate_src_configure \
+		--enable-compositor \
+		--enable-render \
+		--enable-shape \
+		--enable-sm \
+		--enable-xsync \
+		$(use_enable startup-notification) \
+		$(use_enable xinerama)
+}
+
+src_install() {
+	mate_src_install
+	dodoc doc/*.txt
+}
diff --git a/x11-wm/metacity/Manifest b/x11-wm/metacity/Manifest
index ecb64f1c9dbe..84ad4f836459 100644
--- a/x11-wm/metacity/Manifest
+++ b/x11-wm/metacity/Manifest
@@ -1,3 +1,5 @@
 DIST metacity-3.32.0.tar.xz 2055388 BLAKE2B c8ed41e44b0a4890129fe7e79e2dcd486c986541c6b19b8873264f2c179b98c17095f19fbd93290ad253571d0c9ae5f5367df1fe1ba2ac68685139680a2e3afd SHA512 2260411b9ab07fcd1aee8152d700f1e2aa7f1f0753cae6dab82a55cac2cac186a5c9f42377a311a6f90a53ba8ba200d9f5d73a770abc76b558896cd58c30abde
+DIST metacity-3.34.1.tar.xz 2055708 BLAKE2B c1bac27f83d26718fa3d02f777a627324efc3e3eaffbf385a84dd97960adc30e84090f511500fe96a4fbbb373da80a38eaba4c5e14910fbcf8783857c0767ef2 SHA512 e9234ad0aee9fe27cf1c2030e31d8f2c292ae2ee2e9b8546ed86e396152faa9dc4cc67fa8321a0c3d3bf577a83bc143111c6ac225f423db243347a6a760695ee
 EBUILD metacity-3.32.0.ebuild 1233 BLAKE2B 4bcaab355a10be79e9a5a2865463fadc773ec40308ca98774a828dda0dcf0a92b8cb1c0de36bd065f42b21ff9d6c07c0082b6526685cf77d596cdeffe310bfec SHA512 e28076ddbfd40149522a83f8cc16cb022554a592aedd29d8de6e62dec874315e676447867be428d6abe5a5ff9d136c279e83e17a2cf7fb1a9a20cbd0045b5cb9
+EBUILD metacity-3.34.1.ebuild 1233 BLAKE2B 6849286bfcc9997d335d7e842a6b03a6150707adae71c0f224b7d4dbe2fe41d3fbf0c89d18780b4f3b36dee20c01026171caa98cae840751b30ef8fe18550a96 SHA512 3519262f4f14a86750a3f833adcb8ef88282ef797c2c2a8c47531ff507d6f81713f336e8a04eb2573b9e485db427de10d7a4469a2b4a832994b48cbcc8c4c621
 MISC metadata.xml 477 BLAKE2B 592b2957c7bff2b55505a056a2eef8d8cec25eecb400b5046bfbbd84eadfc6baa1f1475fd772a568538360c6867f0b5c0934d85bc5c6fd6ad362d80bad31ea33 SHA512 e475ae41ee3fa97f037acca5634bcb8ded17e783183459aeb83b3566df36fe7d09832991e9252f59e900982bcd0c80e8987bccc2c3e042080405d5448af9423a
diff --git a/x11-wm/metacity/metacity-3.34.1.ebuild b/x11-wm/metacity/metacity-3.34.1.ebuild
new file mode 100644
index 000000000000..bc7f2172a507
--- /dev/null
+++ b/x11-wm/metacity/metacity-3.34.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[X]
+	>=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 122d27ff58e1..b138f0ed7bd4 100644
--- a/x11-wm/mutter/Manifest
+++ b/x11-wm/mutter/Manifest
@@ -5,6 +5,11 @@ DIST mutter-3.26.2-patchset.tar.xz 48156 BLAKE2B 7b33495a8bb7ac69f5610e1dfcb1fef
 DIST mutter-3.26.2.tar.xz 3622904 BLAKE2B b32af24c6ffcd0e6af38ab1ff7cd0ba16ea3ceb84c62ed21d9e38fff5357eda2648050beada3fc8727474407a419a2c218331c8a87f7eb68eddf824d26ca9c51 SHA512 95885b4c053d4bc467a7c11615ee3d1a3086a674ae10e7cb9bb241f692e66dd8190508db1cdf1760bc2f19100e532e68d5e147d344e94d1430d80dd26ca0156b
 DIST mutter-3.32.2-patchset.tar.xz 26872 BLAKE2B 026c87cc3859624bcfd273694a8a34661d97cc77776e3df5f6f5de16b8758fc435773b1c96172b867fe0d9bea421c56986db2e7263c6ec3482171cc2adf06295 SHA512 e318fcfa4ee7850814cdfb5fbcc118a92fa3df524a78b24a440346be6a6c7cb975f90218a2d4feeacd222f2daf56c4cff4195c83e3ed74726dc1da63d38a93c5
 DIST mutter-3.32.2.tar.xz 2797664 BLAKE2B 8b69436778d9c3e10b0373c83e1f306cb2718e49ad1f351f2e3a1ef92caeb1eb7a391be07c60578cfb2601eea5dc3949b1d8305e9f079b2b00d43ff305409f00 SHA512 e4494d028ae71441fbdc584bd8acd9c2559d52ac72402bad9a7cb43f4f519487d11df6453172fd27a9df7f2cade020d6317931613bd0be343c66170e6cda0269
+DIST mutter-3.34.4-patchset.tar.xz 7216 BLAKE2B 6a9d503a8da80a9255649150c1256ea0d1459b11c0803728553f6699f0bb54b56161a411e9dec3725e5cd4230531c90b0160ef702083285443849c9ec4ca8278 SHA512 b592a6ded20c61c15fe8dc5a69fb73e81143975632237a32329bbf40239bdc2c392aef4676cd8800f7ad39eb16e8f159b0cec87c8bd035302db0a8001ddeda2e
+DIST mutter-3.34.4.tar.xz 2791624 BLAKE2B cd7ea49333dc50574f993f15638504eac0d0a6f1e85f34a617accbabcec71f02244ce6cd292c968def302652707e21692d94dcccb01d59b3661220c90cefd802 SHA512 6cae8473071d9ab105a3635cee314157a268894fc3b18e53857e097223a9c2677e1cd51b10b501a3b85f74c83470c2ce87986972218f9833c9f6ad31b1910f6a
+DIST mutter-3.34.5.tar.xz 2804640 BLAKE2B b73a34f4e064b74b321b7ac54749170663c10874a82c0e4f6b20b1f9d97662af0ba188e5ac13a187117765b8aee820fc7367dfbeecc26002942151e77433012c SHA512 4199cf66e6551ebf80b9d2217e3164b1de30b055c58a64bc2d88961aad3a35c137174f6aea96f0250fa3efb2bf4676aa409fefb1a9237bbc7acf438aeed2e78a
 EBUILD mutter-3.26.2-r1.ebuild 4109 BLAKE2B a4073e48c06b2185bf37a22c509c1959c0855cb838151d91d9b697e4679bc7ec9438b92eaa6499ecfa0f6e389415254b64621d24efa6df9c0abc1a8711ec7c14 SHA512 05266bd54e4bc87fc0bab475354dae4670da1c1d64a6db7cfae3dace6069b78515c5a904d6542cfc471f5cc056b2204dbf95cdabbdf5d49e7854b0c98d8e3592
 EBUILD mutter-3.32.2.ebuild 4619 BLAKE2B 09a4dca8c10a02d8aa1b211ba2c453b60f75c2e307c5d261bd9ab9ad028ef7337ea83c66f6425eaf9d64415732498f781cef066b888ede050a3b42801b523fd3 SHA512 fc14e72a1e2ae68997c0c9f55265d1ebef27f4b016830e5d3902e004270eace97229f09657406e29475544d98471364485f365b5bd5abada0f12bbef388dbe04
-MISC metadata.xml 552 BLAKE2B 1e0ae54a432b5f0882ec17726ae8753e0168a8191c57fe204f7dbbd54ead1eb543224a46e42644508b7c69d6969d8849bf80dd16f0af2f5075f1942725851e40 SHA512 cf8d304399b4af16bcfb43c5ba3b1ea94ea9bf92be925fab584b4febf8ede21bb0f95dd590b12e1a5528f48372792da2ca31c5c469ad443c7fd20e5b8f7cc700
+EBUILD mutter-3.34.4.ebuild 4721 BLAKE2B 50eef6d2ec032e2a3d1079bf08d786920643e3eee7fc4ccbf0baa6f901ea3923f9fd8e351453e02cb0378ddcc72836346dda79276d19f195a3c635d0cb65a459 SHA512 ed1cb27b361d6203d2dfe2aedc7ce3867a2bb529513e0fbd5ed51f8e0197f1a0054f60e2ad9ac565f65ca05dcc463902ac4a5700756b46d9eede8630177cb281
+EBUILD mutter-3.34.5.ebuild 4568 BLAKE2B d8cf3267696b61193efbe0189e45bf2c5e96e5d6f44e727c630a19b4b33b6796a23596b51171cb8bdbe40879d05a73f66a1438c828067086e279bc87a01e560c SHA512 b47cc0637b4a59e7a680dace7f3ca95b32c6ef9b903cfffcd34395dca037f88b859ac2905fb97d4ca6e91e4277d035d781cd257d471ccc9b25dfb9d71af15bf6
+MISC metadata.xml 662 BLAKE2B 500aef5ca1856da7a8027c1f69c30639791430cf7e94302de37edca6b8c85aa10f244bb85dcd193c1bab65854652b1999219c35fbe8eab49c33647a3b6a0b486 SHA512 b36d65b3f0bd8bf904cc3270b963d997eebe188ee98425a2cffe9df2e15dc28106baea2d0437972c8c211045200b979cd9fb6a902527efe2f6640380bed15801
diff --git a/x11-wm/mutter/metadata.xml b/x11-wm/mutter/metadata.xml
index 4da93b48e48d..9bd58e53b934 100644
--- a/x11-wm/mutter/metadata.xml
+++ b/x11-wm/mutter/metadata.xml
@@ -9,5 +9,6 @@
 		<flag name="elogind">Rely on <pkg>sys-auth/elogind</pkg> as logind provider for Wayland sessions</flag>
 		<flag name="gles2">Enable OpenGL ES 2.0 support</flag>
 		<flag name="screencast">Enable support for remote desktop and screen cast using <pkg>media-video/pipewire</pkg></flag>
+		<flag name="sysprof">Enable profiling data capture support using <pkg>dev-util/sysprof-capture</pkg></flag>
 	</use>
 </pkgmetadata>
diff --git a/x11-wm/mutter/mutter-3.34.4.ebuild b/x11-wm/mutter/mutter-3.34.4.ebuild
new file mode 100644
index 000000000000..edd7e4a06986
--- /dev/null
+++ b/x11-wm/mutter/mutter-3.34.4.ebuild
@@ -0,0 +1,149 @@
+# 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/"
+SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${PF}-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
+
+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
+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
+	>=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
+	media-libs/mesa[X(+),egl]
+	wayland? (
+		>=dev-libs/wayland-protocols-1.18
+		>=dev-libs/wayland-1.13.0
+		x11-libs/libdrm:=
+		>=media-libs/mesa-10.3[egl,gbm,wayland,gles2]
+		>=dev-libs/libinput-1.4
+		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
+	screencast? ( >=media-video/pipewire-0.2.2:0/0.2 )
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+RDEPEND="${DEPEND}
+	gnome-extra/zenity
+"
+DEPEND="${DEPEND}
+	x11-base/xorg-proto
+	sysprof? ( >=dev-util/sysprof-capture-3.34.1-r1: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=(
+	# Some patches from gnome-3-34 branch on top of 3.34.4
+	"${WORKDIR}"/patches/
+
+	"${FILESDIR}"/3.32-eglmesaext-include.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)
+		$(meson_use screencast remote_desktop)
+		-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.5.ebuild b/x11-wm/mutter/mutter-3.34.5.ebuild
new file mode 100644
index 000000000000..4703c77a3b87
--- /dev/null
+++ b/x11-wm/mutter/mutter-3.34.5.ebuild
@@ -0,0 +1,145 @@
+# 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/5" # 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
+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
+	>=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
+	media-libs/mesa[X(+),egl]
+	wayland? (
+		>=dev-libs/wayland-protocols-1.18
+		>=dev-libs/wayland-1.13.0
+		x11-libs/libdrm:=
+		>=media-libs/mesa-10.3[egl,gbm,wayland,gles2]
+		>=dev-libs/libinput-1.4
+		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
+	screencast? ( >=media-video/pipewire-0.2.2:0/0.2 )
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+RDEPEND="${DEPEND}
+	gnome-extra/zenity
+"
+DEPEND="${DEPEND}
+	x11-base/xorg-proto
+	sysprof? ( >=dev-util/sysprof-capture-3.34.1-r1: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.32-eglmesaext-include.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)
+		$(meson_use screencast remote_desktop)
+		-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/openbox/Manifest b/x11-wm/openbox/Manifest
index db785f79d471..3a43f3f8d368 100644
--- a/x11-wm/openbox/Manifest
+++ b/x11-wm/openbox/Manifest
@@ -2,8 +2,7 @@ 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-r1.ebuild 2543 BLAKE2B 35b5d31e709a9cabeda75e86c7893e7143000b9717282241606d79e669d670921de0463b18ef01db088eabb0281c5174e4ccc80581afbe92b234431662419061 SHA512 b5c71991d92afb92e4c0081b2809df14c6ac4547f9c7905bc4054bccb52fe1185f5b21dfa7cfe1fe52d4c0a3e1ac2cf3e8ad65ca0f81806501b8088e6850b37c
-EBUILD openbox-3.6.1-r3.ebuild 2679 BLAKE2B 053ef97fd99ebee7f712c22dca8dc0ca4ddb236505f65f857bde5a56b62987b6e1adc5e54916304deba49c0319be5ecbcfbcebad4afaa3be40a59edf6725c8fc SHA512 a9089012e0eaba41046d19a9d3fe9174e2b50b7784dfe0093cd17414c1c8dd9f8b6d54edb8f66b1e471dcc0579e01fea00ed7d6a21c9cefbb32653bfbd921799
+EBUILD openbox-3.6.1-r3.ebuild 2722 BLAKE2B 64238c8c479fdf98589cfa021d4bbd1e1962705f83baadb53a942a1f8220a598802b11d9dc8ce124f3384022a991e97a05751a320ca2875ee6bd56be20895d89 SHA512 78a05754f7dea9ef8d3be428b03ac286305b1fda2b19211233e569c46a94b433942964daae33ff323d6ba7bfe3a591522c4ed74f19e9b48239d6f1d789c8fac8
 EBUILD openbox-3.6.1.ebuild 2608 BLAKE2B 310fb7279464260f025ece227bad2a3481ce1fbe3f841d212949ed6a6d4ed2143789092b6c702628dea66569f03fa5a716442a0a7b686c437f707f15a0e06290 SHA512 a915e92e485f840e864280a1d633d7d75de916ca812158544a7561254d1335727f996ca0bd7724ea3b2ac4f4624d90a3a33ee800a39f9ffb747d11257b2d1612
-EBUILD openbox-9999.ebuild 2530 BLAKE2B 52d2b1c5b655448b82d2b41f96e16d40f198fde8633c5de7e26b56ad8ab33c37ce3817112cd4a672ecc32d568a973d6b2cb683f608b7874564c54aed77100039 SHA512 1e964e9ba48812727e9b488fea8b1e984a4952f822af18897a1fe8e497d7a472bc174289395c22d16fc0fa2b181be10981fd59c6b58d7b09c4b05667dc7e1578
-MISC metadata.xml 719 BLAKE2B 3236c3d611795444ade10b779d3453ab3e3823654ce11e2b0a961f360b40b443806c41f84a015d5ec4f6f0b14058002f286ec899a0714ed339c510ec00d68230 SHA512 b43b7e174748e26c812a0549c924ca01ce892177a7964c3cd777af9096b68c21e869278a3f05c613f9e071fdcd4804d837cfe04bc1b2c19a2ce1fe6b2d9db127
+EBUILD openbox-9999.ebuild 2722 BLAKE2B 64238c8c479fdf98589cfa021d4bbd1e1962705f83baadb53a942a1f8220a598802b11d9dc8ce124f3384022a991e97a05751a320ca2875ee6bd56be20895d89 SHA512 78a05754f7dea9ef8d3be428b03ac286305b1fda2b19211233e569c46a94b433942964daae33ff323d6ba7bfe3a591522c4ed74f19e9b48239d6f1d789c8fac8
+MISC metadata.xml 704 BLAKE2B 6a8354358ddaa1b4af8e662aa43800168e49aecc074ec4e9c353813e70650e5e44c6647a1848f465e74571367d873a5d32ead3a340e4da730432524adfc4eec5 SHA512 f232879857441d09e1a0b7251849ab466e0a1a5c75e035ab28aa5bc91a7d11e962cd618672aaa65746ec019fb5cd08a190a28e001a89b9e6a82f9afc11d5c207
diff --git a/x11-wm/openbox/metadata.xml b/x11-wm/openbox/metadata.xml
index 8919f0518e2c..716db565e9a5 100644
--- a/x11-wm/openbox/metadata.xml
+++ b/x11-wm/openbox/metadata.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
-		<email>lxde@gentoo.org</email>
-		<name>Gentoo LXDE Project</name>
+		<email>lxqt@gentoo.org</email>
+		<name>LXQt</name>
 	</maintainer>
 	<use>
 		<flag name="session">Enables support for session managers</flag>
diff --git a/x11-wm/openbox/openbox-3.6.1-r1.ebuild b/x11-wm/openbox/openbox-3.6.1-r1.ebuild
deleted file mode 100644
index 7866f2eda029..000000000000
--- a/x11-wm/openbox/openbox-3.6.1-r1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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"
-
-PATCHES=( "${FILESDIR}/${PN}-3.5.2-gnome-session.patch" )
-
-src_prepare() {
-	default
-	sed -i \
-		-e "s:-O0 -ggdb ::" \
-		-e 's/-fno-strict-aliasing//' \
-		"${S}"/m4/openbox.m4 || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(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-3.6.1-r3.ebuild b/x11-wm/openbox/openbox-3.6.1-r3.ebuild
index ac1119033279..736a89bce398 100644
--- a/x11-wm/openbox/openbox-3.6.1-r3.ebuild
+++ b/x11-wm/openbox/openbox-3.6.1-r3.ebuild
@@ -4,21 +4,21 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8} )
-inherit multilib autotools python-single-r1 eutils
+inherit autotools python-single-r1
 
 DESCRIPTION="A standards compliant, fast, light-weight, extensible window manager"
-HOMEPAGE="http://openbox.org/"
+HOMEPAGE="http://openbox.org/wiki/Main_Page"
+
 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"
+	SRC_URI="http://openbox.org/dist/openbox/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86	~x86-linux"
 fi
 
+SRC_URI+=" branding? ( https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )"
+
 LICENSE="GPL-2"
 SLOT="3"
 IUSE="branding debug imlib nls session startup-notification static-libs svg xdg"
@@ -45,11 +45,12 @@ RDEPEND="dev-libs/glib:2
 			dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
 		')
 	)
-	"
+"
 DEPEND="${RDEPEND}
 	sys-devel/gettext
 	virtual/pkgconfig
-	x11-base/xorg-proto"
+	x11-base/xorg-proto
+"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-3.5.2-gnome-session.patch"
@@ -57,7 +58,16 @@ PATCHES=(
 	"${FILESDIR}/${PN}-3.6.1-py3-xdg.patch"
 )
 
+src_unpack() {
+	if [[ ${PV} == *9999* ]]; then
+		git-r3_src_unpack
+	fi
+
+	default
+}
+
 src_prepare() {
+	use xdg && python-single-r1_pkg_setup
 	default
 	sed -i \
 		-e "s:-O0 -ggdb ::" \
diff --git a/x11-wm/openbox/openbox-9999.ebuild b/x11-wm/openbox/openbox-9999.ebuild
index 75bd3b71f0f6..736a89bce398 100644
--- a/x11-wm/openbox/openbox-9999.ebuild
+++ b/x11-wm/openbox/openbox-9999.ebuild
@@ -1,24 +1,24 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python2_7 )
-inherit multilib autotools ltprune python-r1 eutils
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit autotools python-single-r1
 
 DESCRIPTION="A standards compliant, fast, light-weight, extensible window manager"
-HOMEPAGE="http://openbox.org/"
+HOMEPAGE="http://openbox.org/wiki/Main_Page"
+
 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 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-linux"
+	SRC_URI="http://openbox.org/dist/openbox/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86	~x86-linux"
 fi
 
+SRC_URI+=" branding? ( https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )"
+
 LICENSE="GPL-2"
 SLOT="3"
 IUSE="branding debug imlib nls session startup-notification static-libs svg xdg"
@@ -41,17 +41,33 @@ RDEPEND="dev-libs/glib:2
 	svg? ( gnome-base/librsvg:2 )
 	xdg? (
 		${PYTHON_DEPS}
-		dev-python/pyxdg[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
+		')
 	)
-	"
+"
 DEPEND="${RDEPEND}
 	sys-devel/gettext
 	virtual/pkgconfig
-	x11-base/xorg-proto"
+	x11-base/xorg-proto
+"
 
-PATCHES=( "${FILESDIR}/${PN}-3.5.2-gnome-session.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-3.5.2-gnome-session.patch"
+	# see https://github.com/danakj/openbox/pull/35
+	"${FILESDIR}/${PN}-3.6.1-py3-xdg.patch"
+)
+
+src_unpack() {
+	if [[ ${PV} == *9999* ]]; then
+		git-r3_src_unpack
+	fi
+
+	default
+}
 
 src_prepare() {
+	use xdg && python-single-r1_pkg_setup
 	default
 	sed -i \
 		-e "s:-O0 -ggdb ::" \
@@ -86,9 +102,9 @@ src_install() {
 			"${D}"/etc/xdg/openbox/rc.xml \
 			|| die "failed to set Surreal Gentoo as the default theme"
 	fi
-	use static-libs || prune_libtool_files --all
+	use static-libs || find "${D}" -name '*.la' -delete
 	if use xdg ; then
-		python_replicate_script "${ED}"/usr/libexec/openbox-xdg-autostart
+		python_fix_shebang "${ED}"/usr/libexec/openbox-xdg-autostart
 	else
 		rm "${ED}"/usr/libexec/openbox-xdg-autostart || die
 	fi
diff --git a/x11-wm/qtile/Manifest b/x11-wm/qtile/Manifest
index f0d4530b0456..0c562e32e86b 100644
--- a/x11-wm/qtile/Manifest
+++ b/x11-wm/qtile/Manifest
@@ -1,6 +1,6 @@
 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
-EBUILD qtile-0.14.2-r1.ebuild 1653 BLAKE2B 357dbdafffc3e98b7672860251431d258ca5fbfc3297de319bf1b30ece0befbeee9864a2caf241b3f2f004e70d946ddeb70f481d1c4c74434d90b13754ff2144 SHA512 0dc5f2ce9df0cc12e515c325e87851f577487e1f79ec8e3f98ca344d820d268ae5771c75361771f45c49e8adbb54b87c4b31daf9e65c66cd8a998677610a05bb
-EBUILD qtile-9999.ebuild 1653 BLAKE2B 357dbdafffc3e98b7672860251431d258ca5fbfc3297de319bf1b30ece0befbeee9864a2caf241b3f2f004e70d946ddeb70f481d1c4c74434d90b13754ff2144 SHA512 0dc5f2ce9df0cc12e515c325e87851f577487e1f79ec8e3f98ca344d820d268ae5771c75361771f45c49e8adbb54b87c4b31daf9e65c66cd8a998677610a05bb
+EBUILD qtile-0.14.2-r1.ebuild 1578 BLAKE2B adc02800e1896fee7e0f545ff149e8073c19e6193b2643c6fc7d453043f6aa99207de0e7caf93304f1b7e84477371936cd9e46518b6f7a888246cba6192418b3 SHA512 f18c56542ecf2fb82cf495f945c613e1658b71f17418a31ec3a0f42cd5381c628e0d9e152e6566987c5db1c88e7fa266061af228102f2e9d63b96e61e47ffba8
+EBUILD qtile-9999.ebuild 1578 BLAKE2B adc02800e1896fee7e0f545ff149e8073c19e6193b2643c6fc7d453043f6aa99207de0e7caf93304f1b7e84477371936cd9e46518b6f7a888246cba6192418b3 SHA512 f18c56542ecf2fb82cf495f945c613e1658b71f17418a31ec3a0f42cd5381c628e0d9e152e6566987c5db1c88e7fa266061af228102f2e9d63b96e61e47ffba8
 MISC metadata.xml 323 BLAKE2B e89bf065a17c1ae7499e749e1b2e0af729cb64cdadc6c2ad8b06d34290ae0afca0da51802e3b855c24c9ecd23e78bae8ba9ba89e3a7f464bcf88b90622a9a442 SHA512 33be266eccb74e19b4bc89ff482e44b3542543b3f693d00bb37f1e3cd08e2465632050119d2722410d23de278bb6b1a52e2769441ca3456d3c116ef890a99a7b
diff --git a/x11-wm/qtile/qtile-0.14.2-r1.ebuild b/x11-wm/qtile/qtile-0.14.2-r1.ebuild
index f3000cecff6d..0a9cd75b50db 100644
--- a/x11-wm/qtile/qtile-0.14.2-r1.ebuild
+++ b/x11-wm/qtile/qtile-0.14.2-r1.ebuild
@@ -30,7 +30,6 @@ RDEPEND="
 	>=dev-python/cffi-1.1.0[${PYTHON_USEDEP}]
 	>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
 	>=dev-python/xcffib-0.8.1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/trollius[${PYTHON_USEDEP}]' 'python2*')
 "
 BDEPEND="
 	test? (
diff --git a/x11-wm/qtile/qtile-9999.ebuild b/x11-wm/qtile/qtile-9999.ebuild
index f3000cecff6d..0a9cd75b50db 100644
--- a/x11-wm/qtile/qtile-9999.ebuild
+++ b/x11-wm/qtile/qtile-9999.ebuild
@@ -30,7 +30,6 @@ RDEPEND="
 	>=dev-python/cffi-1.1.0[${PYTHON_USEDEP}]
 	>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
 	>=dev-python/xcffib-0.8.1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/trollius[${PYTHON_USEDEP}]' 'python2*')
 "
 BDEPEND="
 	test? (
diff --git a/x11-wm/ratpoison/Manifest b/x11-wm/ratpoison/Manifest
index e6a2ef91f7dd..405a3834ae77 100644
--- a/x11-wm/ratpoison/Manifest
+++ b/x11-wm/ratpoison/Manifest
@@ -4,7 +4,7 @@ AUX ratpoison.el-gentoo.patch 220 BLAKE2B 4c5339912466401efcc6a3a3e23178af24da58
 AUX ratpoison.xsession 19 BLAKE2B fa3cca1a3a03b0b6da08f6976cd6436fd2e115961fd1c8b7f5603483b7be6e90a6f3f57e35ae06f9b9c609d3d02765c3e5e5085b10f80bd8abb6e7f51a29913c SHA512 684dbc8aa49355bac63254beaef79ec0d499f5f4d20976fae9daa686102c5120e564fc3a60eb9a770c0c648c998e49b63414fb92b8e5b5af0f5fc23695cd6b8e
 DIST ratpoison-1.4.8.tar.xz 364700 BLAKE2B 0422606cda247cd6c87f7d661b3a09edd51311f8ade6df95ce69be1ffef03fb2837adc4bf9eafa737d14d47e788ad4ff54885f3bb030acf278893a91f099a841 SHA512 10b44489e60d3186ca407a5bd87e23dbd737cdafee22ea7284ac4db8bb4463081af483460d1899161fbae2973f4d25fbd1bfd354e3ffb59735baf69bbd6f94f6
 DIST ratpoison-1.4.9.tar.xz 315584 BLAKE2B 18cff2ed835579b606ea99defda04db6ebaedc8bc71d3f7d12cf859caf908d427f50b345089ca3aae52a407ae763818d91a2dd4026c9b32ead95adfb2d065c25 SHA512 97f705efd2092b8e12528496890c59f613e6fcec010aca94a5a59bd641e22dfc50dd500a4b94af7a07553a8a6359f6bec4eee0db1a7ded29d7f051904b09beef
-EBUILD ratpoison-1.4.8-r1.ebuild 1805 BLAKE2B 1383dcb8b820e28eb5aabdcb5a73db12fffa57628ccf9995ba47fe823162a4ef5499466ff8cbc0e929b49c18973924a840efac44529f4b67789968691c526141 SHA512 2663165018dc02d8aa96fa678c53a379b62523c3091df68cdc953d52b7bf0a9217f04d0bd57bd94ca2e75e28de8cd10dc883423c733c3ee9b7f3a55cc25fe2ca
-EBUILD ratpoison-1.4.9.ebuild 1847 BLAKE2B 346a6f0f621e65687c4b0a7ac574b29ee448cd3374771c015b5cbd6a97b5120f384c8a54e963cfd1f95f085b34525497172d0f312184ed2fd3d13e6cccadbe76 SHA512 e4e816a68b567366c2982cf609c9ec41e866122417ed1886548fa708372476797c3e28bc02e25bd990a9fc6caea7de1447f4b1619c35846ff7b30c8351ef7025
+EBUILD ratpoison-1.4.8-r1.ebuild 1806 BLAKE2B 0f89cf825b9e89482f2f78174a48a74bb082c81dd0a0f449b0355b98037f4f3369ee9025dd864b0f87c36ca867e0fe84042a3b5c3be7de04060081341c170e7f SHA512 ea3bdca5248dc8e71841717dc7af88b8b5342278aad37e64456cdf15b8036cc782df894ec7c1d537d9805cf23bdc633a41833bc1ad10b1582a631d46164b9f77
+EBUILD ratpoison-1.4.9.ebuild 1848 BLAKE2B 435bacde6d01720216be440df1ebe9aa933e9f546a33a5c7cb72f30399b1f6e6165ff99fdc44b0321f9a93807a17cac848a7963c42b2c8080424018adb363b3f SHA512 9ccb71e717e2e43b42cbdba32f475a837928fc5b7dc4066d9ee3aad1d9b613bc84806e5e0f505824b8cb398ed9365161a690290783305497e3fb213aefcb7866
 EBUILD ratpoison-9999.ebuild 1849 BLAKE2B 980bdfe6a063c8fd949f123cadb2086684b06a708fe0aa0df8fc811121f4108ef68454f52405a0bec625c531900cd146a546104242b95240b56ddeb2df5ac1c9 SHA512 3a764c4fa0cc0e7a48d6f079c618faceb00fd0a5755e28f061811802e052683e9d4c304ae263d09af43f7d591a8d226ca0f8b5b5e26c782a8694883d908d3335
 MISC metadata.xml 1036 BLAKE2B 5982e3f331cef53bcc5b9809dab21e7d6f7cae85665c66650e2b09b66e7a7657511eada8fa450bad6b27804cf20dc56867686222e2cb35edc614ab2ff0ea83a0 SHA512 d40c0383ad7243df552727fda5979063a1138224b3eb4ed85cd730ad61af76fa688a74d023c46562856655f1d0c15af748d933f4cc8b61faa7cbc7eed6f4c149
diff --git a/x11-wm/ratpoison/ratpoison-1.4.8-r1.ebuild b/x11-wm/ratpoison/ratpoison-1.4.8-r1.ebuild
index 6d854b0b3a2d..96f03c5961ba 100644
--- a/x11-wm/ratpoison/ratpoison-1.4.8-r1.ebuild
+++ b/x11-wm/ratpoison/ratpoison-1.4.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ SRC_URI="http://download.savannah.gnu.org/releases/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 hppa ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~hppa ppc x86 ~amd64-linux ~x86-linux"
 IUSE="debug emacs +history sloppy +xft"
 
 RDEPEND="
diff --git a/x11-wm/ratpoison/ratpoison-1.4.9.ebuild b/x11-wm/ratpoison/ratpoison-1.4.9.ebuild
index 07ae28d01454..4c8158573b9c 100644
--- a/x11-wm/ratpoison/ratpoison-1.4.9.ebuild
+++ b/x11-wm/ratpoison/ratpoison-1.4.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="http://download.savannah.gnu.org/releases/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 hppa ~ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~hppa ~ppc x86 ~amd64-linux ~x86-linux"
 IUSE="debug emacs +history sloppy +xft +xrandr"
 
 RDEPEND="
diff --git a/x11-wm/sawfish/Manifest b/x11-wm/sawfish/Manifest
index aa80ceeeeb59..d6e51176080c 100644
--- a/x11-wm/sawfish/Manifest
+++ b/x11-wm/sawfish/Manifest
@@ -1,5 +1,5 @@
 AUX 50sawfish-gentoo.el 366 BLAKE2B 5d068cfae8fd522037656d009a2007188ab272d4ea0c541d6b389b1f87cf7b209bfd54cbdb0677e80ae34c31fb3fadb767f4f890fc51fb0412aebac308429dca SHA512 a05fe8328ed42c11fcf7ce43eac8278e53d69610a53118283d1292c89c690aa85b43090cbcfd0995a9e2e92cb61277848404a27b1797e33c80ad09db752d8ba5
 AUX sawfish-1.12.0-desktop.patch 839 BLAKE2B cbc68895b979d5d0eb794f95a6e002f4807cd7712be992bdfe7d20bfc5fe6bfcf8a1c0407f8a1394ad2bfed8fe5663745edd761a7d41c0ced226f400c414a7d1 SHA512 ab96ea42c01e1fb2bde192f55273fc647a6fd9904c6bcd05303eea03dc306dde90c152ab7dfea003a50441dcd344f37478e184d9a9c1124961b96556e3aab40d
 DIST sawfish_1.12.0.tar.xz 2814340 BLAKE2B 58901cf62d10641ef32756a3283c6d53b27a68a4af7c578c49e6968045f5993f744eb0b6c7b81da08b91774f1fb8faec467a6a22cd046a2fea135f749ac24319 SHA512 e8f831a9f6206ccf4e2a823bc3464c11b9d2d38a72ada4a142f952813a56c620b511f9cd8912bbf06e38976e54f1d9445f68d6dd24ee5ed59918c18de379e71f
-EBUILD sawfish-1.12.0-r1.ebuild 1982 BLAKE2B 1d400ef70ac6fbf106aa7814ff274569ebe283f12149504f04361017bd2bdc09a4ca3bc4f9f236c2128f7949cffde569a2f5358c236bbdaba656878207070033 SHA512 dcc232d5352c65165eb87696941df38155c7b052064669945028bffc6dd083ccafe550c9f4a7a4a1a162c0ec3deed0dfaf3c8a8ca12a4d0e5a04916b5018df81
+EBUILD sawfish-1.12.0-r1.ebuild 1979 BLAKE2B 2863b90066e24ffdd94413b06988418fed6a645453c948ec584ca49707f176461cfc0debacc2c52b93dce69ca89380a0ed301c5ac707a963597bcefc74453db5 SHA512 daade87efb6433bdac2ca3bc87c6a6418fc812ae07717a64fea97f6e88fdc58b8c29a4229e3a8708c4207b63d308242f47f1dac39757b15711358fd179fdb6f6
 MISC metadata.xml 357 BLAKE2B 7ff08550d41c65ecf933abf4a3c1932a06f9462016ea8cff09145c713e7017dd68dd5e6473845eac654e0ae1fdded17e6b92b36a4f97db539524dfb67b5aec4f SHA512 ab28ed64d52513cf76bea32b2f289dedab2420e91592ba31d2917efc2d7868a4bf949067562594254a601e62885cf530d7ec00404cf62dd4705b7ac1a892ba9b
diff --git a/x11-wm/sawfish/sawfish-1.12.0-r1.ebuild b/x11-wm/sawfish/sawfish-1.12.0-r1.ebuild
index 06915f975f08..2cc5b3ad24c2 100644
--- a/x11-wm/sawfish/sawfish-1.12.0-r1.ebuild
+++ b/x11-wm/sawfish/sawfish-1.12.0-r1.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 ~sh sparc x86"
+KEYWORDS="~alpha amd64 ~ia64 ppc ~ppc64 sparc x86"
 IUSE="emacs kde nls xinerama"
 
 RDEPEND="
diff --git a/x11-wm/spectrwm/Manifest b/x11-wm/spectrwm/Manifest
index 9d474400184a..a1a0da6f7fcf 100644
--- a/x11-wm/spectrwm/Manifest
+++ b/x11-wm/spectrwm/Manifest
@@ -5,5 +5,5 @@ DIST spectrwm-3.2.0.tar.gz 150691 BLAKE2B a90fb556f0572709df51272a259724c3a497ac
 DIST spectrwm-3.3.0.tar.gz 161806 BLAKE2B 07470511486c7b5c61e65eb33e5a9ec7fbfec97390057311fab27bd5608d428b3a53c379fe6c5436000b4847769db9d175154e696b39d3175175bae173e8e68e SHA512 743affffd0437641a760ae29ccbd0084baee3354dadc48f3fc9ab70bffa2413ffe3af67f1223413aa1bbf8c679fbae1fbbdd71a840b3e44f5df83b527f63c1cc
 EBUILD spectrwm-3.1.0.ebuild 1132 BLAKE2B dacd1cfb94ef799132eef7ee5d7f0c4d521b417529403ca81c4657074df5e61f52af0bd3baee5d53a8652f8e5456fb835ae9c11320a902b99cbb4eb97e7bf06e SHA512 b31a2e6cd77ae1117929f063f8b6cc7cd3a0167189fd3fd86d95254ea91bc6173414b7354af029d2671e08b6f62c9f0cefccc509ea89108fdb562fdf906096bf
 EBUILD spectrwm-3.2.0.ebuild 1023 BLAKE2B f966d0420844ca3dee536f60a12a81677f2a9a6eb64983bf727992956490256721a374b7f144da7b54111499f7d7b9fe4668ea130e50c3cb6c71855295ef9f19 SHA512 79410cf8fc5859f0e7e5f9bfbc135cca3f69c38721c317acc582228fd9755e2667febbe9015fccb205963ed65512c86d2fb3ae05fb5fe8ffed2b67e9194861e2
-EBUILD spectrwm-3.3.0.ebuild 1085 BLAKE2B 097f81cf09d4a1e8ca5911bca2e2854af55a37714c3d43f28ad12751c18a994204652aebfb1e51bbaed180f6f877f7328f0aae4804278d7d4f314016a0f9521f SHA512 3d887d222dd6db150f84b2b2bf07fc2578ebf2f88cc60c935e42983cb18861bfbeac20481ecaba204b8f77a471f3247e772a5791e7ea78c276333e21be099fa7
+EBUILD spectrwm-3.3.0.ebuild 1128 BLAKE2B 731f6a1988fd23082740086b6d1c4600a0f9ca1486a8aaf7895b10c50be91ef034e68a747a6c0258d5b6a14155b693c24c7efe1f183d43ebfb160d48776e7737 SHA512 e5fb1c60b25d64fa499c1e0d69b12a325a28904dd8f1bb7c296b8daa131b2ddbb2b217f131e6443ef46cdcf30c00d14e60ee22c28d98a9bfea83db61384bbd38
 MISC metadata.xml 244 BLAKE2B 24ebafa89c32f799b62237b0d9442143de8ccb86c1625f2a49dd91ec9caa63cadc52000005b5b5ef148df89e907e1407330a8d8411ffb5f4facaf629a3184cb8 SHA512 d7a2290eb2970ef7fb9bea275b209c7ace388daadcf3e317b099767d72c7d9f0b894e23492f02e973d27010a7568e48549e4f502c9628efc3133012680304784
diff --git a/x11-wm/spectrwm/spectrwm-3.3.0.ebuild b/x11-wm/spectrwm/spectrwm-3.3.0.ebuild
index 6d5151356784..0f5d4b2224b5 100644
--- a/x11-wm/spectrwm/spectrwm-3.3.0.ebuild
+++ b/x11-wm/spectrwm/spectrwm-3.3.0.ebuild
@@ -17,6 +17,7 @@ RDEPEND="
 	x11-misc/dmenu
 "
 DEPEND="
+	elibc_musl? ( sys-libs/queue-standalone )
 	x11-libs/libX11
 	x11-libs/libXcursor
 	x11-libs/libXrandr
diff --git a/x11-wm/twm/Manifest b/x11-wm/twm/Manifest
index 9b123835f887..0ba9d2cfeb23 100644
--- a/x11-wm/twm/Manifest
+++ b/x11-wm/twm/Manifest
@@ -1,3 +1,3 @@
 DIST twm-1.0.10.tar.bz2 287094 BLAKE2B c84d26119c2a9ed1b6482dc35a421e3d745af506d2faf6dff1027aa84752accc32ff6fffba0e9e8468bfd583bee17c774a88960fc4c5268e82b69c4dc6ae8e81 SHA512 1280683fce7ebbf5670239cb1f3cee2b40612bd9850d98827e793cf8bf298bdb58e48387cab943ea6befc6f7b34da2567353c22b8eaeb8bcf1b9e303cd7e6a9e
-EBUILD twm-1.0.10.ebuild 443 BLAKE2B f135d56fdfa757ab910b516dfac0d00aaeea8f5d3e7206098ca60dc269fa05d125cd5e183a88e1e796691679b60fbb026e92f92fa2db7c9c624837b146dfc132 SHA512 080b2dcb9f87281fb6cfad18e87461a855abe64b1fca3e95f798efb6661066d2920a57dc57829f72f6e4c712640fef321e0cbfb1e0bed62d90eff605133f1975
+EBUILD twm-1.0.10.ebuild 440 BLAKE2B 502cc0b610b9264d479c1c9f32c77f21202e191650c38f3af04471cddb917783105e0a38ecb4997780eb9067a4a7ec1dece2341970215e7bc3d47e86f6d8f27b SHA512 b50d158ccd60a9547056324b61fb38f0b3f6085a4e533984a25395c123cc9023f01b84ff96639ca311f0ff7d5e0d34bd36a9da51f39290a2331ceaadcb9e7bc8
 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
index 47dee148edb8..b2db6ae2e2b4 100644
--- a/x11-wm/twm/twm-1.0.10.ebuild
+++ b/x11-wm/twm/twm-1.0.10.ebuild
@@ -8,7 +8,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Tab Window Manager"
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-wm/windowmaker/Manifest b/x11-wm/windowmaker/Manifest
index 448e24e99d51..07fcf1e1d0af 100644
--- a/x11-wm/windowmaker/Manifest
+++ b/x11-wm/windowmaker/Manifest
@@ -1,10 +1,10 @@
 AUX windowmaker-0.95.8-configure_default_search_paths.patch 2599 BLAKE2B 1b76e547a955e45571860e5a5d87ba6bc0de565cb38355d08019a791965170eb0b5d6f215cd1bcb673f93addfde86485847cc7af987a72bfc02324dd56142f4d SHA512 9c12516dd0a2c3e81f7236e2e0f2f8137710e7f1a54ae84d279850d65afb52cb46cada6e84a0ba1f2c92fdfa8d7a0b4630f703e5a5e24664e0fec5ee718f83ae
 AUX windowmaker-0.95.8-imagemagick7.patch 1340 BLAKE2B d3ba22b324a405cba0d0d266e2d25b0b6e41ece01cc42e18d3746c46d9e6f38f3048abe928ade603ec9f90206e19e285445e1de7775b18527602a0557d86aae1 SHA512 90316ffe66fe92f7db43afa504225bdb97ddb8ec8ff742f69760e4e233172e2b2f704449f014935f9851d6bd7ebe91cde97e5ae65dfb73284a21743a44b7492d
 AUX wmaker.desktop 206 BLAKE2B 62fe60afde032c1f37c5c818bc37a97d70605e041e539e922f18d56a7582fffd1689762f600fa3c69c5b62dd399867c8c1208d393060e734b38a84540143bf79 SHA512 d1dc99aa29047434e1265c8f93ce366b7c026f27eec8a166904fda1ab4144e0d6142807ac09ba6cbcb86480257893e5553046a0ba1a8e1d6315f23dd8468482b
-DIST WindowMaker-0.95.7.tar.gz 3238325 BLAKE2B 68a26e8b1281a4ff387fa87517efb46995e5339e2e6e7f71303d3e3e0d75316740d2458067dc4159f23bf1e1b4e1e0bfc22b1428ee4933e4d474a79a147baaf7 SHA512 9c1190503efdc58c11a90d5ba80796979cdc9f2beb69a6d233ffc8d531a54c877c5270841bf6318738069098cd488e5ab77ac19f661ac888e892bf05ac22d93f
 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.7.ebuild 2904 BLAKE2B d53fde066cf82dcbc4db2f3964c71b0e736f4d7ea2e90b3839897ba8de926343fca7849d9fc5dee3dfae46884490bed8163a784569992eeee2bd5c706f6357f2 SHA512 95dcfad3e7982dfcdeb4c37d06e55987ec190b5e986a2760344c7a887f79051910b6c339383f2eb48576b8724027f437a6f12a949bb04627e335392dc52e1f36
 EBUILD windowmaker-0.95.8-r1.ebuild 3118 BLAKE2B 926737c20e39924f58245ee7c57d10312f3b1aab784c4a70ff3e8a528bbc43fb2b1f109844a4e3c0ea47e26638d688ebbfa5cddcfa63879d9dea5a290f5ffc5e SHA512 7a3f9ff5e20a249c17213f22e11557b8118c00711bd26d50b37e36952939fd456cabb7a7fdafce300ee8f958c111ad87f077b60a733f6ca72caebdb98b23dd83
-EBUILD windowmaker-9999.ebuild 2842 BLAKE2B 894de4cc8296ff22ba90d5bf89e00edd82aa256adbabde31861d9f6d1a85c50e32d3c47485c39ff5d20ce7c55da80835fb63626850790823a4d550894f354fdc SHA512 298b72229d0a354ac9b174610add21c4624ae23ccbe9ce850519f93478489fdeb6e1cd40b2f368733c4d89fb93af91181107e554e4c2af81447fa324b5e6c65c
+EBUILD windowmaker-0.95.9.ebuild 3079 BLAKE2B 44d62a6356f6e425ca381793ef388fb951a7fcd0d033050a840e403a4d419b3e5713d756971515cf7abc4aa21fd9a4d17a2a0b197e62c1a80d142da372239a51 SHA512 71e9c3bbe2279c7e22b906948ff0b36411a64116ddc61a6330feb6efe32fcb32e6fb9711ad3aeb963ae365befae7a5bd03bf54a70704c0b6fd433433b9066cb9
+EBUILD windowmaker-9999.ebuild 2896 BLAKE2B 04ac8a74266ab5129c592d8d6c3dc38d6c7ccc44c9de34e114d1f4e58111aee1e8da8f81c3e925262aad73b9be0cefee924350becea138da270843b0cdbe39a7 SHA512 28e6eab40456ae307df2f92c08b23d6cfcf6baa1d230cc5f2c26d5db0294f48d1e500cf7955b85a9e6054fe0202a6f32688931067a9b69e2e8c99a29dc5d3428
 MISC metadata.xml 490 BLAKE2B a74e46dfe5b90558720726c3a18b9c9cf2752fb90ade60450ae568547c52b807e9dee74d1deb842c11cc3e6f564c0793adc5f8e24686893138808669f6fc9766 SHA512 ae731acb1fe00cfbda949fc9cafad9f861b83fb37103a699157256840c67e4a2cd0023114d30eab0b25f6dcb154c00e2a659a4feffaabad97e8ed7aa2a03e3ca
diff --git a/x11-wm/windowmaker/windowmaker-0.95.7.ebuild b/x11-wm/windowmaker/windowmaker-0.95.9.ebuild
index 529214e50d4c..a11fcfdcd365 100644
--- a/x11-wm/windowmaker/windowmaker-0.95.7.ebuild
+++ b/x11-wm/windowmaker/windowmaker-0.95.9.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils
+EAPI=7
+inherit autotools eutils
 
 DESCRIPTION="The fast and light GNUstep window manager"
 HOMEPAGE="http://www.windowmaker.org/"
@@ -12,7 +12,7 @@ SRC_URI="http://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
@@ -21,7 +21,7 @@ DEPEND="media-libs/fontconfig
 	x11-libs/libXt
 	x11-libs/libXv
 	gif? ( >=media-libs/giflib-4.1.0-r3 )
-	imagemagick? ( media-gfx/imagemagick )
+	imagemagick? ( >=media-gfx/imagemagick-7:0= )
 	jpeg? ( virtual/jpeg:0= )
 	png? ( media-libs/libpng:0= )
 	tiff? ( media-libs/tiff:0 )
@@ -33,15 +33,22 @@ RDEPEND="${DEPEND}
 
 S=${WORKDIR}/${P/windowm/WindowM}
 
+DOCS=( AUTHORS BUGFORM BUGS ChangeLog INSTALL INSTALL-WMAKER FAQ
+	NEWS README README.definable-cursor README.i18n TODO )
+PATCHES=( "${FILESDIR}"/${PN}-0.95.8-configure_default_search_paths.patch )
+
 src_prepare() {
 	# Fix some paths
 	for file in WindowMaker/*menu* util/wmgenmenu.c; do
 		if [[ -r $file ]] ; then
-			sed -i -e "s:/usr/local/GNUstep/Applications/WPrefs.app:${EPREFIX}/usr/bin/:g;" "$file" || die
-			sed -i -e "s:/usr/local/share/WindowMaker:${EPREFIX}/usr/share/WindowMaker:g;" "$file" || die
-			sed -i -e "s:/opt/share/WindowMaker:${EPREFIX}/usr/share/WindowMaker:g;" "$file" || die
+			sed -i -e "s|/usr/local/GNUstep/Applications/WPrefs.app|${EPREFIX}/usr/bin/|g;" "$file" || die
+			sed -i -e "s|/usr/local/share/WindowMaker|${EPREFIX}/usr/share/WindowMaker|g;" "$file" || die
+			sed -i -e "s|/opt/share/WindowMaker|${EPREFIX}/usr/share/WindowMaker|g;" "$file" || die
 		fi;
 	done;
+
+	default
+	eautoreconf
 }
 
 src_configure() {
@@ -68,7 +75,7 @@ src_configure() {
 		--localedir="${EPREFIX}"/usr/share/locale \
 		${myconf}
 
-	cd ../WindowMaker-extra-0.1
+	pushd ../WindowMaker-extra-0.1 || die
 	econf
 }
 
@@ -76,18 +83,15 @@ src_compile() {
 	emake
 
 	# WindowMaker Extra Package (themes and icons)
-	cd ../WindowMaker-extra-0.1
+	pushd ../WindowMaker-extra-0.1 || die
 	emake
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc AUTHORS BUGFORM BUGS ChangeLog INSTALL* FAQ* \
-		  README* NEWS TODO
+	default
 
 	# WindowMaker Extra
-	cd ../WindowMaker-extra-0.1
+	pushd ../WindowMaker-extra-0.1 || die
 	emake DESTDIR="${D}" install
 
 	newdoc README README.extra
diff --git a/x11-wm/windowmaker/windowmaker-9999.ebuild b/x11-wm/windowmaker/windowmaker-9999.ebuild
index 18bfa9f85a4a..7078f87e0428 100644
--- a/x11-wm/windowmaker/windowmaker-9999.ebuild
+++ b/x11-wm/windowmaker/windowmaker-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 inherit autotools eutils git-r3
 
 DESCRIPTION="The fast and light GNUstep window manager"
@@ -32,6 +32,9 @@ DEPEND="media-libs/fontconfig
 RDEPEND="${DEPEND}
 	nls? ( >=sys-devel/gettext-0.10.39 )"
 
+DOCS=( AUTHORS BUGFORM BUGS ChangeLog INSTALL INSTALL-WMAKER FAQ
+	NEWS README README.definable-cursor README.i18n TODO )
+
 src_unpack() {
 	# wm-extras
 	unpack ${A}
@@ -43,9 +46,9 @@ src_prepare() {
 	# Fix some paths
 	for file in WindowMaker/*menu* util/wmgenmenu.c; do
 		if [[ -r $file ]] ; then
-			sed -i -e "s:/usr/local/GNUstep/Applications/WPrefs.app:${EPREFIX}/usr/bin/:g;" "$file" || die
-			sed -i -e "s:/usr/local/share/WindowMaker:${EPREFIX}/usr/share/WindowMaker:g;" "$file" || die
-			sed -i -e "s:/opt/share/WindowMaker:${EPREFIX}/usr/share/WindowMaker:g;" "$file" || die
+			sed -i -e "s|/usr/local/GNUstep/Applications/WPrefs.app|${EPREFIX}/usr/bin/|g;" "$file" || die
+			sed -i -e "s|/usr/local/share/WindowMaker|${EPREFIX}/usr/share/WindowMaker|g;" "$file" || die
+			sed -i -e "s|/opt/share/WindowMaker|${EPREFIX}/usr/share/WindowMaker|g;" "$file" || die
 		fi;
 	done;
 
@@ -77,7 +80,7 @@ src_configure() {
 		--localedir="${EPREFIX}"/usr/share/locale \
 		${myconf}
 
-	cd ../WindowMaker-extra-0.1
+	pushd ../WindowMaker-extra-0.1 || die
 	econf
 }
 
@@ -85,18 +88,15 @@ src_compile() {
 	emake
 
 	# WindowMaker Extra Package (themes and icons)
-	cd ../WindowMaker-extra-0.1
+	pushd ../WindowMaker-extra-0.1 || die
 	emake
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc AUTHORS BUGFORM BUGS ChangeLog INSTALL* FAQ* \
-		  README* NEWS TODO
+	default
 
 	# WindowMaker Extra
-	cd ../WindowMaker-extra-0.1
+	pushd ../WindowMaker-extra-0.1 || die
 	emake DESTDIR="${D}" install
 
 	newdoc README README.extra
diff --git a/x11-wm/xmonad/Manifest b/x11-wm/xmonad/Manifest
index 95fed4f1ee4d..518895f4b0f9 100644
--- a/x11-wm/xmonad/Manifest
+++ b/x11-wm/xmonad/Manifest
@@ -9,10 +9,10 @@ DIST xmonad-0.11.tar.gz 59119 BLAKE2B 75ae39e2e54d4b5ed14f99d0144d4ee7741c611f18
 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 1960 BLAKE2B 48f2d4bfc2693dad6afc2fa6b0d0a7b82d411b7283719a4a73e2b6ea2eb700d138ef44cef2404b6480ae76bf9e8749e5af3dc81dcfb1eaf9958704c8b129ee16 SHA512 487e063c5207e687e0908d1eb3dbddf725eb0913a73888dd399f0b9c675bf0c5c0fdecebe946814f6fc829aa39610a7156232454be1a236d15268a64f3eab04c
-EBUILD xmonad-0.11-r3.ebuild 2210 BLAKE2B a66cf6a24510387750ba7ab8ba07f445de6d8f96b82e573ddbc60a6b3e8ac0ff821cf391b082ac6b33940a578aef66b0b8992370a6be462013a926686a4a443f SHA512 5789a85ac0d37036244a7155c5f0a637aeee0870aad3ba50e59289bfcd4cdfbffbf6279c65aa980cf5163f14faad69e196dce7215353aee3d1f4907aed493187
-EBUILD xmonad-0.11.1.ebuild 2175 BLAKE2B 4ec8bef58f913143a1fdd194603ca3bedb055be490b2bb7f44102668a4f42dbd3d34453c2b6ff6c47adefd1454ff4be57c6a4f1c8686cf9af81f09da46e1c832 SHA512 39e176298766b0603162c71bfbc1f1b35167787b817b18287f892c88b7053cfeb6455df32669e551b82661d77b7a201f9d14df0f9d2e029ce91a25fc30b224ea
-EBUILD xmonad-0.12.ebuild 2452 BLAKE2B 5ceb7fca34e1d9d92799af6e9d03084badec194cc7614e122447b8ffa07e2646dd6a3d005917c4bb7b400b1079ffc14731478915083c8d3689572c43a3f22d86 SHA512 3c9ee753b41100a56b5e36e40b579dfa5ce976574f2e5109c92ff8878b0ffee1bf1124215040a4b0f423892ec7c56ec48b532c74c02c0a1fb4f03fad09a0c93a
+EBUILD xmonad-0.11-r1.ebuild 1953 BLAKE2B 924f277e9b0d047dba9bfcddf9e05e1fba24cb78b4091e8a1b94e402bdf4f76b461a8aea09d9aeb488e9879d907e23d9fd41c56b573cc8c920c2c24caba55634 SHA512 76d6895424c26dab537e38eec2f48ae98e33df99e16e9571f842796004bd333ca2663b3d7a3f74ee53d88116e30aa194433912ee329fc363f6e32fe09c654593
+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 2445 BLAKE2B 1ea24e6192a9659f6a1129013ae6e46eb61eae1e58c968071c1d3c5f7b481510cc805154ea01d1137d8062ae8646206c8db29d1529366cdd36bba9dc6da7dc7d SHA512 cf0b018a06741267c767ee987edc91cb3e3207a128d85596c59e68b4b4df57399def7a0976d133a9d54f2e82756db565c258cb95a1093ce6f7452440fa98d91d
 EBUILD xmonad-0.13.ebuild 2187 BLAKE2B 708dc71ada76321016dd13373e08d764b4a95992c8a2c987fa30feb0110618867f8a7d3018b9feefc5bce70f25ea6374d7874bdf963984d7186d0c8ff0ea9635 SHA512 b124da54d846c95c6570069209dfbfdaa9aaf3dd0b79f4df7918bfc378e46fe0c8390b6b2997a6b36b5ff51cab0f441a03f1db5f299ba44b5f27f495b2de294c
 EBUILD xmonad-0.15.ebuild 2339 BLAKE2B 6bc74b2d2eb204f9045be0a17046eceb068aeceae8ac8598246647a95a5e81e78e930c0953ab14415732fc2078ffedccfaaf38554a7284d9b2bed90162b14488 SHA512 c6d2b3617828d854816db057a5b1d1163c7794ed8e6a154640a155c9f250814062f10a05501f34e4ea49230b77abf9b1bec2f87cf49dcf62871af50c6b445536
 MISC metadata.xml 1068 BLAKE2B 7ca1c1c62c82e0ecc3352798f8b78bf87787534ef1830bde94b08ecca74a51606c05905903c0ad4b0728282669bcfa532ef798ae2c13148fdef55b259c3168fe SHA512 96efc16a7a57b188e72f2db9fdd90c06cc6460e9a596ac68ca5a8187fd7fbb88feb9ab9ff4e9d8436df014a6c6203c459da317cda0f5ada779096ee0806da8d8
diff --git a/x11-wm/xmonad/xmonad-0.11-r1.ebuild b/x11-wm/xmonad/xmonad-0.11-r1.ebuild
index 0ac630861cc5..a45aa0b4aab7 100644
--- a/x11-wm/xmonad/xmonad-0.11-r1.ebuild
+++ b/x11-wm/xmonad/xmonad-0.11-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~ppc64 x86"
 IUSE="+default-term"
 
 RDEPEND="dev-haskell/extensible-exceptions:=[profile?]
diff --git a/x11-wm/xmonad/xmonad-0.11-r3.ebuild b/x11-wm/xmonad/xmonad-0.11-r3.ebuild
index 67cb46bdbd74..fbe3e95182a9 100644
--- a/x11-wm/xmonad/xmonad-0.11-r3.ebuild
+++ b/x11-wm/xmonad/xmonad-0.11-r3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE="+default-term no-autorepeat-keys"
 
 RDEPEND="dev-haskell/extensible-exceptions:=[profile?]
diff --git a/x11-wm/xmonad/xmonad-0.11.1.ebuild b/x11-wm/xmonad/xmonad-0.11.1.ebuild
index ff10cb0d1e5e..588cc05d6bcd 100644
--- a/x11-wm/xmonad/xmonad-0.11.1.ebuild
+++ b/x11-wm/xmonad/xmonad-0.11.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE="+default-term no-autorepeat-keys"
 
 RDEPEND="dev-haskell/extensible-exceptions:=[profile?]
diff --git a/x11-wm/xmonad/xmonad-0.12.ebuild b/x11-wm/xmonad/xmonad-0.12.ebuild
index 288a2bf6fe8c..c9bbcad8c314 100644
--- a/x11-wm/xmonad/xmonad-0.12.ebuild
+++ b/x11-wm/xmonad/xmonad-0.12.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~ppc64 x86"
 IUSE="+default-term no-autorepeat-keys"
 
 RESTRICT=test # fails test on ghc-8 (assert has different text of exception)