gentoo resync : 25.04.2020

28 files changed, 247 insertions, 214 deletions

diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index 6ec20c357d8a..203eec4ab183 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/cwm/Manifest b/x11-wm/cwm/Manifest
index 4db7e1ad373e..e0509a090fb2 100644
--- a/x11-wm/cwm/Manifest
+++ b/x11-wm/cwm/Manifest
@@ -1,5 +1,8 @@
+AUX cwm-Makefile.patch 596 BLAKE2B 561277a5a4da0a2b06c01c14cd0c8baf4dfcffe3ccd9a7f5e5009c2a6820145e124bc7d1eb4cee9826281cce1433a21f74b5799f8f2e3c4287b918d60603b8d4 SHA512 544ea3805211679f565dcdff42f1b438452e304701c9138e5c15b19374150c1e63e8d83eb64c0519b5c6664d7d7d70657c0b15516b770605115021b77b592308
 DIST cwm-5.6-chneukirchen.tar.gz 50799 BLAKE2B 4d9341e89b21187044bbcbc658dea2eac6f6c1c87f25e1b0b81871a9f8b95af7354c8b486bd77f201acba430e019a5c784591cfc5efb281fd40d6670749958ad SHA512 0bb5f9c69e1ed30ef38ced70008baa347032a0c31ee2d4a88e3b45092969a5427ef160577da4891aba3181067235b244f11fc796815f41448930b438099b5bfc
 DIST cwm-5.6-xmw.tar.gz 53738 BLAKE2B 9c36c42fc35a8206035ed59fb8fe2e8eb13effcdb43d488bcc99c2d0f48476e206e46fd52c0928afdb51d55c68d9be03a186aaf4c49d03bcdf8754df0c5d81db SHA512 cf0174523838dba5997206be904ab667efc5ff7e413e98bb81cc3a69d40a79b54e21405787e088486feb8790d1094a2d3cce0be08d7ee36a2b9b0dadd78466c7
+DIST cwm-6.6.tar.gz 53062 BLAKE2B 3da762f0c1a48c83c773a1f355cc970c5e4f6100e7294a00f44c6b5b7e1ffe954fde0e3d106991b05cd1f8c898fe055b5305b0bd7bf533df5868d32adbae2c5f SHA512 ff94fd1b7d263f9de538e5b338db58a08e1bec3e4233b84ab0a3ac94c47a45e10b2c772f93b897e70baf9a3c04e1a6fa04604ac71655acb7ebd1d10edb381042
 EBUILD cwm-5.6.ebuild 1004 BLAKE2B 27ef899c7d0fb99f273a31a0cfa0f5429bbd0b24c692af1e15fa5cd5c22f347d65e93120b1564ed6b9fc0d563801340f6dfaa7d2559dac5693c791a0beca2f2c SHA512 bcfcb3689de10912b31c88601185bb23e1f99305cf0c6a79d3ea02760b5ea0b8f213f63b6b84b1e3471049b9b3a7fb3df374580883e972e3fde69921dcd92493
-EBUILD cwm-9999.ebuild 870 BLAKE2B 17a5b61890a88ff72178add1339caa550254dd1266069c239ae5200d47ba7b5d21cc03f7187f1ae3f89454e131286e3a7658f4fd0480413ebfd77011dd3a1b3f SHA512 6ac0ce705cef59471a0d4066b9af783df6e2a4caa335c1634ee61d687d4616629cdb1504ab3d22c793b4276a4d8a27f1c0b086cd71e74725978555a20eee8bd0
-MISC metadata.xml 248 BLAKE2B 86a7b2f7d520b71d9bbed3427dc2c32a5ede55db3ee30766436b19c61a8507efc10d0de50bf84f16bc8cf73dd5b2c0cb31ac17221303dff9bd08ce8fb0e23666 SHA512 07df1249bbdd7c937f1b711b88f3d26f9de18c594692b6446022ea4562570abaa08ed2c83d31d8730707036704fa7decc5b382ec8586adaabd7f1205be4433f8
+EBUILD cwm-6.6.ebuild 1007 BLAKE2B 8dd3cce566d8a43b65af117948475389caa6df4844a430ca8df071efed0061351cb2c27c60efafcf6f880f5f07a05ef3855260d50417a2f7a057656b2aecebcd SHA512 5c16be2f52bf886e11cfe126b6f4435c19af503d2bbff53e609bbf72e01d2d6a596221b74dc130663ecb8734d56c2db443f8c885be4627c7476e9afaf2cbb2d0
+EBUILD cwm-9999.ebuild 958 BLAKE2B 592d23a69e9ad7bc664354df19000a726dd64f93452c1f4e4fa4a8439de8050c12cee941ea91fb82a831af1fb97cd0b52bf80312dd71649c473fea6479c36b49 SHA512 0cd8900c7f3d23733752d348e67882bc26bcbaf25c89742c7279a410369ea15ca76186cff91d3a7a6d1c7df8bd7421f23a9c506f3f9d909a1ac51a971c70eb7f
+MISC metadata.xml 440 BLAKE2B a1ed14101aa667304e039f287fcec44a7f125585b20af9b1e9c35d68520f567d7eb4306ceabc888dbf25c3effffed13fbadf0a2703ed7cee1424b7a5225a3157 SHA512 97dace19645fdebf1f37d8023d689eb6b8bd5747f0c88d1c5cae410862d5123a46bfc112f8d77c6259144138381a866509986ae774dc058e422c11fd2d6c5478
diff --git a/x11-wm/cwm/cwm-6.6.ebuild b/x11-wm/cwm/cwm-6.6.ebuild
new file mode 100644
index 000000000000..083e7d8776c3
--- /dev/null
+++ b/x11-wm/cwm/cwm-6.6.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop toolchain-funcs
+
+DESCRIPTION="OpenBSD fork of calmwm, a clean and lightweight window manager"
+HOMEPAGE="https://www.openbsd.org/cgi-bin/cvsweb/xenocara/app/cwm/
+	https://github.com/chneukirchen/cwm"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/leahneukirchen/${PN}.git"
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/leahneukirchen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+LICENSE="ISC"
+SLOT="0"
+
+RDEPEND="x11-libs/libXft
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+"
+DEPEND="${RDEPEND}"
+BDEPEND="sys-devel/bison
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-Makefile.patch"
+)
+
+src_compile() {
+	emake CFLAGS="${CFLAGS} -D_GNU_SOURCE" CC="$(tc-getCC)" PKG_CONFIG="$(tc-getPKG_CONFIG)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX=/usr install
+	dodoc README
+	make_session_desktop ${PN} ${PN}
+}
diff --git a/x11-wm/cwm/cwm-9999.ebuild b/x11-wm/cwm/cwm-9999.ebuild
index 8e881833ac13..23dab4acd436 100644
--- a/x11-wm/cwm/cwm-9999.ebuild
+++ b/x11-wm/cwm/cwm-9999.ebuild
@@ -1,37 +1,37 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit eutils toolchain-funcs git-r3
+inherit desktop toolchain-funcs
 
 DESCRIPTION="OpenBSD fork of calmwm, a clean and lightweight window manager"
 HOMEPAGE="https://www.openbsd.org/cgi-bin/cvsweb/xenocara/app/cwm/
 	https://github.com/chneukirchen/cwm"
-EGIT_BRANCH=linux
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/leahneukirchen/${PN}.git"
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/leahneukirchen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS=""
-IUSE="vanilla"
 
 RDEPEND="x11-libs/libXft
 	x11-libs/libXinerama
-	x11-libs/libXrandr"
-DEPEND="${RDEPEND}
+	x11-libs/libXrandr
+"
+DEPEND="${RDEPEND}"
+BDEPEND="sys-devel/bison
 	virtual/pkgconfig
-	sys-devel/bison"
-
-pkg_setup() {
-	if use vanilla ; then
-		EGIT_REPO_URI="https://github.com/chneukirchen/cwm.git"
-	else
-		EGIT_REPO_URI="https://github.com/xmw/cwm.git"
-	fi
-}
+"
 
 src_compile() {
-	emake CFLAGS="${CFLAGS} -D_GNU_SOURCE" CC="$(tc-getCC)"
+	emake CFLAGS="${CFLAGS} -D_GNU_SOURCE" CC="$(tc-getCC)" PKG_CONFIG="$(tc-getPKG_CONFIG)"
 }
 
 src_install() {
diff --git a/x11-wm/cwm/files/cwm-Makefile.patch b/x11-wm/cwm/files/cwm-Makefile.patch
new file mode 100644
index 000000000000..56755fe19067
--- /dev/null
+++ b/x11-wm/cwm/files/cwm-Makefile.patch
@@ -0,0 +1,21 @@
+diff --git a/Makefile b/Makefile
+index 74d0d0d..802cd33 100644
+--- a/Makefile
++++ b/Makefile
+@@ -13,12 +13,14 @@ OBJS=		calmwm.o screen.o xmalloc.o client.o menu.o \
+ 		search.o util.o xutil.o conf.o xevents.o group.o \
+ 		kbfunc.o strlcpy.o strlcat.o y.tab.o \
+ 		strtonum.o reallocarray.o
++		
++PKG_CONFIG?=	pkg-config
+ 
+-CPPFLAGS+=	`pkg-config --cflags x11 xft xrandr`
++CPPFLAGS+=	`${PKG_CONFIG} --cflags x11 xft xrandr`
+ 
+ CFLAGS?=	-Wall -O2 -g -D_GNU_SOURCE
+ 
+-LDFLAGS+=	`pkg-config --libs x11 xft xrandr`
++LDFLAGS+=	`${PKG_CONFIG} --libs x11 xft xrandr`
+ 
+ MANPREFIX?=	${PREFIX}/share/man
+ 
diff --git a/x11-wm/cwm/metadata.xml b/x11-wm/cwm/metadata.xml
index 9dddd6338e3d..7fd942a5adbf 100644
--- a/x11-wm/cwm/metadata.xml
+++ b/x11-wm/cwm/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>gentoo@aisha.cc</email>
+		<name>Aisha Tammy</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">chneukirchen/cwm</remote-id>
 	</upstream>
diff --git a/x11-wm/herbstluftwm/Manifest b/x11-wm/herbstluftwm/Manifest
index dff46614e8e2..2291aa3404f8 100644
--- a/x11-wm/herbstluftwm/Manifest
+++ b/x11-wm/herbstluftwm/Manifest
@@ -1,6 +1,8 @@
 DIST herbstluftwm-0.7.2.tar.gz 245506 BLAKE2B 72d0bb2a77e519161d193ac7b2b9f1f878ccb6cfe4914b6c75d060e2daa0bec4203ee4ebf203b9fa1dfb844d71d50aa7c03257c78aa22e906bf42519d1e592af SHA512 abb49bbc3de9a0ef619ce7063c1cea0d0d25ab2195c53dc0d33e061ad24060da4bbe9b99b9b9126028cdf68b462d4fcc8d1534431e4892d571ff897a68d2113c
 DIST herbstluftwm-0.8.0.tar.gz 358434 BLAKE2B 770aa66c2e8926d5f73b36ae2376e33ac92f9f72e2d45f55caa3247710f88b0eef72bed8a7242ba4ef298d9e8a7af3768114bd5149aa5596aa4682caef7e9e91 SHA512 108ef76e6f81d98742c37a1a5ecf1ce998d6fc8ee43642acb08716a5bee2e7a691f1f8defe9c81ecc8930f8b29ba7a49efe2eb00a3699c22de1a5f841266873c
+DIST herbstluftwm-0.8.1.tar.gz 369291 BLAKE2B 7f500c0d3b5b8e4c30778e8cf4af97ef3605c8cad7d3825d2edc04fc3be56f4eaa3889e505b48c9a83277b0e495a894d96b68b5b683590c0f286a8438ad4a429 SHA512 ba845e91242d08fdd264c6354651e84dba3b8941bab3756102570c82c78d5ca734694fd3fcbc9c035776133be8a98a62cc8218378ecddb22aca4cda1ae1fb5be
 EBUILD herbstluftwm-0.7.2-r1.ebuild 1534 BLAKE2B a88a23d3cdcaf5761198b31112ebeeac213f5e576e3d5e566121713875e1e9b8a78d9c7e63659da6144b6733905f0b2def82761dff36e29400b899670d3c2aec SHA512 8bf19a5fc434271eeafc58a168dd852a8962cd9c8c35ecd2779eb2f195d4fae3942ff7884c96c8177592d4374e4b3bcd63a5c33bee46e73ff5b08b5dd20f0e9f
-EBUILD herbstluftwm-0.8.0.ebuild 1191 BLAKE2B 52eb2606709ce651cca110d2c4cd31f08be1da2cba221e359308960db130e7ea55db7229c500b587b6d18d521f3d9394c719c574e02bdcba923b9e2a9df20ab8 SHA512 23a5a10bf2fbe879f443d9e86078a1e1af30217f2e92f7631d3805b1960dd201ae5decc65a0cdf4e409f107c9d249a61a63344b6b5a3f210ca334619841c0c35
-EBUILD herbstluftwm-9999.ebuild 1191 BLAKE2B 52eb2606709ce651cca110d2c4cd31f08be1da2cba221e359308960db130e7ea55db7229c500b587b6d18d521f3d9394c719c574e02bdcba923b9e2a9df20ab8 SHA512 23a5a10bf2fbe879f443d9e86078a1e1af30217f2e92f7631d3805b1960dd201ae5decc65a0cdf4e409f107c9d249a61a63344b6b5a3f210ca334619841c0c35
+EBUILD herbstluftwm-0.8.0.ebuild 1167 BLAKE2B 556d2bbadcbfb4bd0467e471e4c64ccd35fd27d448eeda3f672bdc237cec65df27823574d85066a7faee604d2801eedea790472ef8c2cb5fbce371bd235a4163 SHA512 832df6fa39018048f62294cab2e8d5f9759c013ad4d4bb0574af1c05713722e1fbdfb0fa63f48ce6cbe401fc018e1e9247f08f0a0e1c98f9d21feeb76cae8cc6
+EBUILD herbstluftwm-0.8.1.ebuild 1167 BLAKE2B 556d2bbadcbfb4bd0467e471e4c64ccd35fd27d448eeda3f672bdc237cec65df27823574d85066a7faee604d2801eedea790472ef8c2cb5fbce371bd235a4163 SHA512 832df6fa39018048f62294cab2e8d5f9759c013ad4d4bb0574af1c05713722e1fbdfb0fa63f48ce6cbe401fc018e1e9247f08f0a0e1c98f9d21feeb76cae8cc6
+EBUILD herbstluftwm-9999.ebuild 1167 BLAKE2B 556d2bbadcbfb4bd0467e471e4c64ccd35fd27d448eeda3f672bdc237cec65df27823574d85066a7faee604d2801eedea790472ef8c2cb5fbce371bd235a4163 SHA512 832df6fa39018048f62294cab2e8d5f9759c013ad4d4bb0574af1c05713722e1fbdfb0fa63f48ce6cbe401fc018e1e9247f08f0a0e1c98f9d21feeb76cae8cc6
 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
index c6dbf314e58c..30dd0c6dd266 100644
--- a/x11-wm/herbstluftwm/herbstluftwm-0.8.0.ebuild
+++ b/x11-wm/herbstluftwm/herbstluftwm-0.8.0.ebuild
@@ -22,7 +22,6 @@ SLOT="0"
 IUSE="examples xinerama zsh-completion"
 
 DEPEND="
-	>=dev-libs/glib-2.24:2
 	x11-libs/libX11
 	x11-libs/libXext
 	xinerama? ( x11-libs/libXinerama )
diff --git a/x11-wm/herbstluftwm/herbstluftwm-0.8.1.ebuild b/x11-wm/herbstluftwm/herbstluftwm-0.8.1.ebuild
new file mode 100644
index 000000000000..30dd0c6dd266
--- /dev/null
+++ b/x11-wm/herbstluftwm/herbstluftwm-0.8.1.ebuild
@@ -0,0 +1,61 @@
+# 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="
+	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 c6dbf314e58c..30dd0c6dd266 100644
--- a/x11-wm/herbstluftwm/herbstluftwm-9999.ebuild
+++ b/x11-wm/herbstluftwm/herbstluftwm-9999.ebuild
@@ -22,7 +22,6 @@ SLOT="0"
 IUSE="examples xinerama zsh-completion"
 
 DEPEND="
-	>=dev-libs/glib-2.24:2
 	x11-libs/libX11
 	x11-libs/libXext
 	xinerama? ( x11-libs/libXinerama )
diff --git a/x11-wm/muffin/Manifest b/x11-wm/muffin/Manifest
index 1ab415c75477..c36339acc6dd 100644
--- a/x11-wm/muffin/Manifest
+++ b/x11-wm/muffin/Manifest
@@ -1,9 +1,5 @@
 AUX muffin-4.0-clutter-configure.patch 456 BLAKE2B f3f855dbc5fa8cdf85c87fc1ae2dc2d88c348bc9a53872d4f953a816c78a330a036a6e6f16a409f96e096654ea220a93d95b6f7ae57a9ed81f7b4d91280f6aff SHA512 168648d3ee94d3ebecf0b85fd943885af118c0939881a18ceaf7283b59ba34eedc1fbae735f4c589e671e1f0b60fbf94ac6e1009a92d2da2a26881cda40b2e5f
 AUX muffin-4.0-cogl-configure.patch 717 BLAKE2B bf55437c4a3c5b41fe4c9dc4bb0a7e58def0cc5263826f924dd6b35f19e0fc662b9b20c80dce97b92532ab3798b54cfa4cf1851c4d44e05a099bffa5f895b44e SHA512 f8902b5e777106008f5697b9384462633aa07d70ae66eb8a7ad9bc5f1c757a14aa614711614cdd4aec969120ceaf98bec07b91a42ecba4b696ebcf9f63dcba11
-DIST muffin-3.6.0.tar.gz 2720809 BLAKE2B 9d1b92907d545990b409c15f9e9e3bf7b3871cc545d02234296efcb15f0082fc630c3a06849789c5e5aed4af9253e6893cc29feb7590aaaaaf2eb38843591c8d SHA512 d077f1310d7600754c9b4f77fc2a82377aec43f9a1cc0b95e28118764741922a58f2348418bee309d8c7fd1484b97ddc898d0105fa1a3fcd855d2fcc68f3679e
-DIST muffin-3.8.2.tar.gz 2723114 BLAKE2B f8218ac1f71ecfa5b74ca7ae8cf76d76e1207e3ce65f715643d477d2fb6429390671f3b05132a64f23a1853297f71563a62c052555f8a26d084469814972a64d SHA512 62dbfb602dd1164779e365e5e6f782431a491a254dcec8faef8a50f27f50cf7b0f8ab958b6df3b75d6b15edcd90c23a2fd6cc18cb11a2a513e669169f09cba05
 DIST muffin-4.0.3.tar.gz 5194156 BLAKE2B 8d58d37f8410ad5384c09a4edabd3ca5bd8a3a612825ded55bf625a9a8c2ba8aba295187e3eb727fc248716b3efe84e9a567a49f95635150c4bda5f309545ed2 SHA512 34a3f152d2701e06498f2de28639af656bd4efa6c7d5c56244fe9002cf769e929fc2360bd036509318fab9c4fe73c976605c3fdb444c9280f52e6db27867a14c
-EBUILD muffin-3.6.0.ebuild 2071 BLAKE2B b7320fad755139626fa8bd5537f7bd843e5197634181114e4ddd90fd95c2ae8f491eb13fd13a054dc63ded111e1198385281dbbe0197bd5af340b05eacb8abcd SHA512 546f4da140161e9d26f5bca3eb29b987af74495c778a676fc61a5df9e301f111db1118a0d5f5daf41b023adbd51de0daebd453d353c877e644ec6235d0ceb086
-EBUILD muffin-3.8.2.ebuild 2073 BLAKE2B 438bf3146521c9bf5c4b7b946451488482c9f11d1fa93813fa2cf1c8bc7881f75f3adcb2583efc8d7a09f1bba0f400b4ac746ae3eb110a63c44ca8611132997d SHA512 204c67ef33f5f5922e19e94ef5847b8d6a098fb4385bad819ba6e4fa17b38d36212fbb38d9bbb1364cddd45bf427e6e5aed85fc18236de7600c8b12f64a43ccf
 EBUILD muffin-4.0.3.ebuild 2026 BLAKE2B cc032e3a46a86e52a9b235a6df018cb50028987de9e91d40fa92fb240011eb322fa6b265dd4b79290874430d61bbcb9e0df1cb57b953557e6fd332debc4c2d90 SHA512 80d397c253b6ffe00b9420b99a650df2f6e77b1e150d083828e99b68ca8a88c8a0c30fa41ec81b3b80b04ac4e112a047c406e60ee219a79b673a5b915e3adc14
 MISC metadata.xml 333 BLAKE2B d29a873cc8702d8251ff425eca5ec16b4ea2a75f4e512c05513c3a6a61e38e0fde4450158503cdb2e71b324c86a7e66e03c1eecba8bff6a6be81244f040ceaad SHA512 42c7d8e82dd95e76e6b72973d53a0a27de2562108b5989092c34804140d336dcb20b331a4c70b1fcf6730ef5f377f366f480271597c63f7ce3e8f7aa8d359555
diff --git a/x11-wm/muffin/muffin-3.6.0.ebuild b/x11-wm/muffin/muffin-3.6.0.ebuild
deleted file mode 100644
index 7c819c0d3e1a..000000000000
--- a/x11-wm/muffin/muffin-3.6.0.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils gnome2
-
-DESCRIPTION="Compositing window manager forked from Mutter for use with Cinnamon"
-HOMEPAGE="http://developer.linuxmint.com/projects/cinnamon-projects.html"
-SRC_URI="https://github.com/linuxmint/muffin/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="+introspection test xinerama"
-RESTRICT="!test? ( test )"
-KEYWORDS="amd64 x86"
-
-COMMON_DEPEND="
-	>=x11-libs/pango-1.2[X,introspection?]
-	>=x11-libs/cairo-1.14:=[X]
-	x11-libs/gdk-pixbuf:2[introspection?]
-	>=x11-libs/gtk+-3.9.12:3[X,introspection?]
-	>=dev-libs/glib-2.37.3:2[dbus]
-	>=gnome-extra/cinnamon-desktop-2.4:0=[introspection?]
-	>=gnome-base/gsettings-desktop-schemas-3.3.0[introspection?]
-	>=media-libs/clutter-1.14.3:1.0=[X,introspection?]
-	>=media-libs/cogl-1.13.3:1.0=[introspection?]
-	>=media-libs/libcanberra-0.26[gtk3]
-	>=x11-libs/libXcomposite-0.3
-	>=x11-libs/startup-notification-0.7:=
-
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	virtual/opengl
-
-	gnome-extra/zenity
-
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
-	xinerama? ( x11-libs/libXinerama )
-"
-# needs gtk-doc, not just -am, for gtk-doc.make
-DEPEND="${COMMON_DEPEND}
-	${PYTHON_DEPS}
-	>=app-text/gnome-doc-utils-0.8
-	sys-devel/gettext
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.35
-	virtual/pkgconfig
-	x11-base/xorg-proto
-	test? ( app-text/docbook-xml-dtd:4.5 )
-"
-RDEPEND="${COMMON_DEPEND}
-	!x11-misc/expocity
-"
-
-src_prepare() {
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README* *.txt doc/*.txt"
-	gnome2_src_configure \
-		--disable-static \
-		--enable-shape \
-		--enable-sm \
-		--enable-startup-notification \
-		--enable-xsync \
-		--enable-verbose-mode \
-		--with-libcanberra \
-		$(use_enable introspection) \
-		$(use_enable xinerama)
-}
diff --git a/x11-wm/muffin/muffin-3.8.2.ebuild b/x11-wm/muffin/muffin-3.8.2.ebuild
deleted file mode 100644
index 75b55dec4d10..000000000000
--- a/x11-wm/muffin/muffin-3.8.2.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils gnome2
-
-DESCRIPTION="Compositing window manager forked from Mutter for use with Cinnamon"
-HOMEPAGE="http://developer.linuxmint.com/projects/cinnamon-projects.html"
-SRC_URI="https://github.com/linuxmint/muffin/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="+introspection test xinerama"
-RESTRICT="!test? ( test )"
-KEYWORDS="~amd64 ~x86"
-
-COMMON_DEPEND="
-	>=x11-libs/pango-1.2[X,introspection?]
-	>=x11-libs/cairo-1.14:=[X]
-	x11-libs/gdk-pixbuf:2[introspection?]
-	>=x11-libs/gtk+-3.9.12:3[X,introspection?]
-	>=dev-libs/glib-2.37.3:2[dbus]
-	>=gnome-extra/cinnamon-desktop-2.4:0=[introspection?]
-	>=gnome-base/gsettings-desktop-schemas-3.3.0[introspection?]
-	>=media-libs/clutter-1.14.3:1.0=[X,introspection?]
-	>=media-libs/cogl-1.13.3:1.0=[introspection?]
-	>=media-libs/libcanberra-0.26[gtk3]
-	>=x11-libs/libXcomposite-0.3
-	>=x11-libs/startup-notification-0.7:=
-
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	virtual/opengl
-
-	gnome-extra/zenity
-
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
-	xinerama? ( x11-libs/libXinerama )
-"
-# needs gtk-doc, not just -am, for gtk-doc.make
-DEPEND="${COMMON_DEPEND}
-	${PYTHON_DEPS}
-	>=app-text/gnome-doc-utils-0.8
-	sys-devel/gettext
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.35
-	virtual/pkgconfig
-	x11-base/xorg-proto
-	test? ( app-text/docbook-xml-dtd:4.5 )
-"
-RDEPEND="${COMMON_DEPEND}
-	!x11-misc/expocity
-"
-
-src_prepare() {
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README* *.txt doc/*.txt"
-	gnome2_src_configure \
-		--disable-static \
-		--enable-shape \
-		--enable-sm \
-		--enable-startup-notification \
-		--enable-xsync \
-		--enable-verbose-mode \
-		--with-libcanberra \
-		$(use_enable introspection) \
-		$(use_enable xinerama)
-}
diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest
index b138f0ed7bd4..5cb949c21abd 100644
--- a/x11-wm/mutter/Manifest
+++ b/x11-wm/mutter/Manifest
@@ -11,5 +11,5 @@ DIST mutter-3.34.5.tar.xz 2804640 BLAKE2B b73a34f4e064b74b321b7ac54749170663c108
 EBUILD mutter-3.26.2-r1.ebuild 4109 BLAKE2B a4073e48c06b2185bf37a22c509c1959c0855cb838151d91d9b697e4679bc7ec9438b92eaa6499ecfa0f6e389415254b64621d24efa6df9c0abc1a8711ec7c14 SHA512 05266bd54e4bc87fc0bab475354dae4670da1c1d64a6db7cfae3dace6069b78515c5a904d6542cfc471f5cc056b2204dbf95cdabbdf5d49e7854b0c98d8e3592
 EBUILD mutter-3.32.2.ebuild 4619 BLAKE2B 09a4dca8c10a02d8aa1b211ba2c453b60f75c2e307c5d261bd9ab9ad028ef7337ea83c66f6425eaf9d64415732498f781cef066b888ede050a3b42801b523fd3 SHA512 fc14e72a1e2ae68997c0c9f55265d1ebef27f4b016830e5d3902e004270eace97229f09657406e29475544d98471364485f365b5bd5abada0f12bbef388dbe04
 EBUILD mutter-3.34.4.ebuild 4721 BLAKE2B 50eef6d2ec032e2a3d1079bf08d786920643e3eee7fc4ccbf0baa6f901ea3923f9fd8e351453e02cb0378ddcc72836346dda79276d19f195a3c635d0cb65a459 SHA512 ed1cb27b361d6203d2dfe2aedc7ce3867a2bb529513e0fbd5ed51f8e0197f1a0054f60e2ad9ac565f65ca05dcc463902ac4a5700756b46d9eede8630177cb281
-EBUILD mutter-3.34.5.ebuild 4568 BLAKE2B d8cf3267696b61193efbe0189e45bf2c5e96e5d6f44e727c630a19b4b33b6796a23596b51171cb8bdbe40879d05a73f66a1438c828067086e279bc87a01e560c SHA512 b47cc0637b4a59e7a680dace7f3ca95b32c6ef9b903cfffcd34395dca037f88b859ac2905fb97d4ca6e91e4277d035d781cd257d471ccc9b25dfb9d71af15bf6
+EBUILD mutter-3.34.5.ebuild 4566 BLAKE2B a4550c12085dd8dedbe1d3652ab06475adee962d6006ded1506ff491773dacec9c50e1568e851418d2a95dbbcfbc104b50c771b1c2075190eab57c52f4fc473b SHA512 f5c4f35cbce4916d564e15d11a1a420c87cc695d24046d808e499916f01170709a546594e0ab1da2447ab1165d9bce287608644a24486897febe16135d781fda
 MISC metadata.xml 662 BLAKE2B 500aef5ca1856da7a8027c1f69c30639791430cf7e94302de37edca6b8c85aa10f244bb85dcd193c1bab65854652b1999219c35fbe8eab49c33647a3b6a0b486 SHA512 b36d65b3f0bd8bf904cc3270b963d997eebe188ee98425a2cffe9df2e15dc28106baea2d0437972c8c211045200b979cd9fb6a902527efe2f6640380bed15801
diff --git a/x11-wm/mutter/mutter-3.34.5.ebuild b/x11-wm/mutter/mutter-3.34.5.ebuild
index 4703c77a3b87..8e62caf28dab 100644
--- a/x11-wm/mutter/mutter-3.34.5.ebuild
+++ b/x11-wm/mutter/mutter-3.34.5.ebuild
@@ -17,7 +17,7 @@ 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
diff --git a/x11-wm/notion/Manifest b/x11-wm/notion/Manifest
index 5cf6187853e1..f9b5f193bf53 100644
--- a/x11-wm/notion/Manifest
+++ b/x11-wm/notion/Manifest
@@ -6,4 +6,4 @@ DIST notion-3_p2015061300.tar.gz 797057 BLAKE2B 55258bb1d47a1c2506e9cb6654e5d68d
 EBUILD notion-3_p2013030200.ebuild 2005 BLAKE2B a3e365c53bc5611e180e2f056947f492dff216498f33c0566056aac1f2bd2a6d619916651e44fbdb8c29495e9361ed6aeb19c1d7d7db934c007353d9dfdf4901 SHA512 f19a33cee33e2eec1ffed9edc384ca311b3a4bfa94e972c9a5849e24ebe57d47d8602df6dc219d47dbce56678a41cecab50d1aa04fad0074a4a94c9961b1d001
 EBUILD notion-3_p2015061300-r1.ebuild 2245 BLAKE2B 80ed23dce3e81f5351e81c3bc0337a41522bf289d521be3a77b08704b7b8b0b52695e2c021afb63e6e9073a4315845a8748f40ae75d6c00cb0d3da4bcdedbdb1 SHA512 6d5a344f95b91d562075ba29ebb79b59988f84e651190560d6e749372e2d06120c8358fe983dbce25f8cecd4cda2445ef17f997e6985069a97b320c35e68d6d1
 EBUILD notion-9999.ebuild 2201 BLAKE2B 28a6e385f9d31dd438138f303ce671ad03ce8accd79fcbef37c4bed4f5ca86e9695cdada020c7e2a76bfe59a6accfc5d037159ff9fcf1d8408cc2b5670c57d7a SHA512 90c4f1155880bd861b3bd2fd0fa3322bd2076717714776abb036710e8c0ebb9442fcb35492bcb22e4d2b2cdb66a0d5557ca2210409fc8f07757f424414aa56f4
-MISC metadata.xml 557 BLAKE2B 461084e75801f1fd947ac0c9a2a481e59e4a7885471c71d5b25562ce2883c3d668fb855de49ecc8f1e089a663f4e08ab9a47a33167b455677155d54cd1f32e92 SHA512 a26324e741b6b0f680889ac5d25c94d915ed20504175ecfe0e6de03a9037dbc7224e379ab15493e2a35b17429254da9dc8349dc155770256ba669101cadf6425
+MISC metadata.xml 440 BLAKE2B a967115c8e255bb279de1a7a231ea2c45209383ae50bb03ee5e0aeea428e71afdb32ae027286e82820ce3f67849bba51a35ad263c32961de5191d4e053af782e SHA512 e113a6d332d785d2f6fb25d55796d499ccb67978b40130b06be408ae4ba4b9551e35ee928c43c95962e202f12f11ab152073f9d5cbfc16067385c7b34e25dcba
diff --git a/x11-wm/notion/metadata.xml b/x11-wm/notion/metadata.xml
index 0705b1a8566a..4b07ef3bd581 100644
--- a/x11-wm/notion/metadata.xml
+++ b/x11-wm/notion/metadata.xml
@@ -2,12 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>moaxcp@gmail.com</email>
-		<name>John Mercier</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
+		<email>soap@gentoo.org</email>
+		<name>David Seifert</name>
 	</maintainer>
 	<use>
 		<flag name="xrandr">Add support for xrandr</flag>
diff --git a/x11-wm/qtile/Manifest b/x11-wm/qtile/Manifest
index 0c562e32e86b..95eafa930f58 100644
--- a/x11-wm/qtile/Manifest
+++ b/x11-wm/qtile/Manifest
@@ -1,6 +1,8 @@
 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
-EBUILD qtile-9999.ebuild 1578 BLAKE2B adc02800e1896fee7e0f545ff149e8073c19e6193b2643c6fc7d453043f6aa99207de0e7caf93304f1b7e84477371936cd9e46518b6f7a888246cba6192418b3 SHA512 f18c56542ecf2fb82cf495f945c613e1658b71f17418a31ec3a0f42cd5381c628e0d9e152e6566987c5db1c88e7fa266061af228102f2e9d63b96e61e47ffba8
+EBUILD qtile-0.15.1.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/qtile-0.15.1.ebuild b/x11-wm/qtile/qtile-0.15.1.ebuild
new file mode 100644
index 000000000000..dae1095c6247
--- /dev/null
+++ b/x11-wm/qtile/qtile-0.15.1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7,8} )
+
+inherit distutils-r1 virtualx
+
+if [[ ${PV} == 9999* ]] ; then
+	EGIT_REPO_URI="https://github.com/qtile/qtile.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/qtile/qtile/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="A full-featured, hackable tiling window manager written in Python"
+HOMEPAGE="http://qtile.org/"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="test"
+# docs require sphinxcontrib-blockdiag and sphinxcontrib-seqdiag
+
+RDEPEND="
+	x11-libs/cairo[X,xcb(+)]
+	x11-libs/pango
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/cairocffi-0.9.0[${PYTHON_USEDEP}]
+	>=dev-python/cffi-1.1.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
+	>=dev-python/xcffib-0.8.1[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/xvfbwrapper[${PYTHON_USEDEP}]
+		x11-base/xorg-server[xephyr]
+		x11-apps/xeyes
+		x11-apps/xcalc
+		x11-apps/xclock
+	)
+"
+
+# display retry backoff slowness and failures
+RESTRICT="test"
+
+python_test() {
+	# force usage of built module
+	rm -rf "${S}"/libqtile || die
+	PYTHONPATH="${BUILD_DIR}/lib" py.test -v "${S}"/test || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	local DOCS=( CHANGELOG README.rst )
+	distutils-r1_python_install_all
+
+	insinto /usr/share/xsessions
+	doins resources/qtile.desktop
+
+	exeinto /etc/X11/Sessions
+	newexe "${FILESDIR}"/${PN}-session ${PN}
+}
diff --git a/x11-wm/qtile/qtile-9999.ebuild b/x11-wm/qtile/qtile-9999.ebuild
index 0a9cd75b50db..1115fc9d170d 100644
--- a/x11-wm/qtile/qtile-9999.ebuild
+++ b/x11-wm/qtile/qtile-9999.ebuild
@@ -2,7 +2,8 @@
 # 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
 
diff --git a/x11-wm/xmonad-contrib/Manifest b/x11-wm/xmonad-contrib/Manifest
index 94335f331ae5..508ab86e84fc 100644
--- a/x11-wm/xmonad-contrib/Manifest
+++ b/x11-wm/xmonad-contrib/Manifest
@@ -5,9 +5,9 @@ DIST xmonad-contrib-0.11.4.tar.gz 401743 BLAKE2B f6962bcb88e88ebf620ef037c08de8c
 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 1064 BLAKE2B 95da1df944c922a3a9c59e2a3f99ec47058e58422a60ab97052472d6edf0b2baf2e76ef2369adb58e2091c305c2ac7f4d54a34307e12b03b7ab42d5b54ce7b69 SHA512 f29b06986a2192ffafda26b0b206e2ff2568d1a8ee10b07417f9cad710a185ad2369fe29f3786b1cde6adfe85ec6247e4d73269e154fc1b1a926b7a6e0a8b40c
+EBUILD xmonad-contrib-0.11.2.ebuild 1066 BLAKE2B c0626aa497fd0e5d178d24a37a36584a287a7f4cb7509f1a206b8387c65e71b936fbef0dcb093462a3840005aca2531b0e736881e0ecfba93978c589d5860ee6 SHA512 b5941ea7f9852720be3945f0ea7060a59ab1b4f180f181a9eef62ac1d0611263bcc160a466ae5ff26927037e981f4d160b07383012a9160df713bba59d32efda
 EBUILD xmonad-contrib-0.11.4.ebuild 1466 BLAKE2B e267fbbb931d6d17f0435b444d82b38e8ddc9d0269c5e46ffc4c2d4c84080d5834063fe05b6d81bf7b9b79a9cdb5416fe051a824ec00ebb963600f9036fa33cf SHA512 19e974f834153d114399cf5f3c68aba796e4dcb2bcd88878b706ca689107a750f0b188f9b54d8166dbca9c15719c7154aa54ffe95358c88eb28ef24a47ff2fd5
-EBUILD xmonad-contrib-0.12.ebuild 1100 BLAKE2B 075373304920dd1873004ec99cb229631183af624caf2854b8965707c852c5d284c1e3e638559d135938fbe1eb629d9804e476b6ff53c48a6fd26191f95e8df0 SHA512 680a8028e6bbfe44c183c0eea475c0c8273cf8aa2240198e49f08be011dcd9a62eaa16c1bc6c24505f7d2c8a31b1e183ec5537c195d82c5527337c9e29dc03ce
-EBUILD xmonad-contrib-0.13.ebuild 1093 BLAKE2B 8b8c359cd40eb78347d56ec3b723e9eca48716ff449395df8590cf1f640d478fee0c8fb98db254ad1b5377e7cf902ff7fa5b0449fa0bd1315340e212b301be89 SHA512 e2b8d87650d2869c42d9af13bcf8f899132dc6de91db18f850e02c2fa3606ccd05ce24d0389c1e9b6ae498b17efa363ae7dad39033a6eb0b9f0d48f85e406df9
+EBUILD xmonad-contrib-0.12.ebuild 1102 BLAKE2B b1ff3175e714548ad22260fdd94a32b8409528d85f01635c215c5e05a20725dfc2afbbc1d04baacc305909e2b93f6cdf8209cd8b6af1ad366ba764ebe91a774e SHA512 3251a64dffb11da9d9657d1c66fbf5beb2731568d118809193616750ac883115466d9162ef2de7991a4550a05d9ca09c7b418907355d1606f52c6bbd32cae2de
+EBUILD xmonad-contrib-0.13.ebuild 1095 BLAKE2B bee87fa09618ee835520acb1bffeb4b593d1c23b9860272831631980ada4b6d27f155100190b37477f3c72cf8b960c97b7417465475c69261efccffcb6760d37 SHA512 091f7d8d9af565b94ed21bbd8d797558c04756f6b2509343ebc86a556b752620546d4e99931eccc0679f4b2a49f15f5acd7a809007707be2183343799acf465d
 EBUILD xmonad-contrib-0.15.ebuild 1132 BLAKE2B 50ceb10dafa6d9c42a2a2e12c289ef96c000a63461674b7f0a6de43a6ba8cd19f72d3fdb0d8bcf6b6a979690bfd64851a19caed7255c5922c552a4c9555b8451 SHA512 d0e151c2905c1890239362d443aed12b477c221ed3a95fc0fcfc7361912dfd825f4758253559f576a68a8017afae86c9f6b0d62950b4d2324b2ef40a9bf79d6d
 MISC metadata.xml 708 BLAKE2B 0aae3704519ca0ffba4e25ae3236ebd02ecb6a9e7bef7d23a32107ad6e6826f09613dc6206fd1e350a8e3536061136cfdd463f7e2a80b16e7f38b30db14c4fc4 SHA512 570916b2bcf06efaeccb486d3161d0b751c675955abae7efc57d471961e2c1649075bc155e75849cd1b56c0a5917341f7ef2cbb12e81255787cfb282a6ea1fb7
diff --git a/x11-wm/xmonad-contrib/xmonad-contrib-0.11.2.ebuild b/x11-wm/xmonad-contrib/xmonad-contrib-0.11.2.ebuild
index 2a06f6468ef8..7abe17884f5c 100644
--- a/x11-wm/xmonad-contrib/xmonad-contrib-0.11.2.ebuild
+++ b/x11-wm/xmonad-contrib/xmonad-contrib-0.11.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc64 x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 # hackport-args: --always-disabled='testing'
 IUSE="+xft"
 
diff --git a/x11-wm/xmonad-contrib/xmonad-contrib-0.12.ebuild b/x11-wm/xmonad-contrib/xmonad-contrib-0.12.ebuild
index 0723bfedff2f..0edc96785bb8 100644
--- a/x11-wm/xmonad-contrib/xmonad-contrib-0.12.ebuild
+++ b/x11-wm/xmonad-contrib/xmonad-contrib-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 x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE="+xft"
 
 RDEPEND="dev-haskell/extensible-exceptions:=[profile?]
diff --git a/x11-wm/xmonad-contrib/xmonad-contrib-0.13.ebuild b/x11-wm/xmonad-contrib/xmonad-contrib-0.13.ebuild
index ca629f352f9e..f0d151ea4912 100644
--- a/x11-wm/xmonad-contrib/xmonad-contrib-0.13.ebuild
+++ b/x11-wm/xmonad-contrib/xmonad-contrib-0.13.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="+xft"
 
 RDEPEND="dev-haskell/extensible-exceptions:=[profile?]
diff --git a/x11-wm/xmonad/Manifest b/x11-wm/xmonad/Manifest
index 518895f4b0f9..0553aeda7e30 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 1953 BLAKE2B 924f277e9b0d047dba9bfcddf9e05e1fba24cb78b4091e8a1b94e402bdf4f76b461a8aea09d9aeb488e9879d907e23d9fd41c56b573cc8c920c2c24caba55634 SHA512 76d6895424c26dab537e38eec2f48ae98e33df99e16e9571f842796004bd333ca2663b3d7a3f74ee53d88116e30aa194433912ee329fc363f6e32fe09c654593
+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 2445 BLAKE2B 1ea24e6192a9659f6a1129013ae6e46eb61eae1e58c968071c1d3c5f7b481510cc805154ea01d1137d8062ae8646206c8db29d1529366cdd36bba9dc6da7dc7d SHA512 cf0b018a06741267c767ee987edc91cb3e3207a128d85596c59e68b4b4df57399def7a0976d133a9d54f2e82756db565c258cb95a1093ce6f7452440fa98d91d
-EBUILD xmonad-0.13.ebuild 2187 BLAKE2B 708dc71ada76321016dd13373e08d764b4a95992c8a2c987fa30feb0110618867f8a7d3018b9feefc5bce70f25ea6374d7874bdf963984d7186d0c8ff0ea9635 SHA512 b124da54d846c95c6570069209dfbfdaa9aaf3dd0b79f4df7918bfc378e46fe0c8390b6b2997a6b36b5ff51cab0f441a03f1db5f299ba44b5f27f495b2de294c
+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 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 a45aa0b4aab7..5e216665b0dd 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 x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE="+default-term"
 
 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 c9bbcad8c314..def284ca7ba1 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 x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE="+default-term no-autorepeat-keys"
 
 RESTRICT=test # fails test on ghc-8 (assert has different text of exception)
diff --git a/x11-wm/xmonad/xmonad-0.13.ebuild b/x11-wm/xmonad/xmonad-0.13.ebuild
index c1c6f0f9e354..80e6c99b32d2 100644
--- a/x11-wm/xmonad/xmonad-0.13.ebuild
+++ b/x11-wm/xmonad/xmonad-0.13.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="+default-term"
 
 RDEPEND="dev-haskell/data-default:=[profile?]