gentoo resync : 19.03.2019

21 files changed, 420 insertions, 74 deletions

diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index 5f6c0beade3c..03e21e7850a8 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/bspwm/Manifest b/x11-wm/bspwm/Manifest
index 6df8a0ed8068..e2c81140f7aa 100644
--- a/x11-wm/bspwm/Manifest
+++ b/x11-wm/bspwm/Manifest
@@ -1,8 +1,6 @@
 AUX bspwm-session 1876 BLAKE2B 8e1a9eaf2a1721d2b6272b6f0e1f9692fbab8b94aacf2dd52db7dc4ebd97189d36f6d464e588c06084fd433f16901576ea9f682dd54858b7780a9c8732767fdd SHA512 04d89bdd5ca5a9163e576c41dee9420fff8c51ab4a53aca179060b9f6b348537ad96d4257964e7bc4422d836a21c52f82fdc30a6b7b07c229c9934d7620d90ee
-DIST bspwm-0.9.2.tar.gz 92558 BLAKE2B 1b9606ce7c0390537c093749f6fdba3c87108da9a5e3471a82bf205b9dd1c50ad31aba6cedc2fbc58cc9788f181a6aea232e02d2c1b4e9811a13a4205da9941a SHA512 fe46d74ecc1ab29caa038d8bb54e13cde8a40e28a014f8b313222db6e8a3323d3ec2103f4ff78008bb0252fa2d560424788ea3be66faaf38a2b8aa3b46b09e2c
-DIST bspwm-0.9.3.tar.gz 95779 BLAKE2B d066e20fe3037f0a542857dd3743046d9d228bd487e6f276c50aecd44113bd0a8297900c102e1d05e6cd20ac5bd1540ad000003e49a1f5b9bc1e72f1aab4f0a9 SHA512 015ed79af4b31c5fbd10bdf3d6945e3e2575ef3d1ab48dc7ddeb52e99cd6e121991a320515ad05b42b001b524c7ebe38b5d2b2aae0078c6601a36653718ab508
 DIST bspwm-0.9.5.tar.gz 106893 BLAKE2B 6059fd31cb4d4ee262f5a60bac9d21efb61b55e2f47785310e5101abb77023307ff0b9e858701f9558e1e8980905bf323fb310e426c714cf05f09251947c19a3 SHA512 7f50caca3b049f7401f4db8c9d1a9a2d098a3d67a3f8fe87d433c14ad1d0443be9ed4296163628fd7180614d340b672350e02538f36d0e812418aafaef16ba09
-EBUILD bspwm-0.9.2.ebuild 956 BLAKE2B bf31f196d642cf81215163826af0c9eed8f1bd81ea3ebca7abc8c7ec3700ae5f33f57d79f7eeb22e5735487d2fc8fc73b2bfabc6896f336c9c2ebb4e384675c9 SHA512 3f4d71a7d882a57d13bc5d1d06610bcdfc2562d836cbf536af650eefdd923e9cf17d089704836b5873d690af4b414d8b484161744a42c9717a034fde7da433c4
-EBUILD bspwm-0.9.3.ebuild 956 BLAKE2B bf31f196d642cf81215163826af0c9eed8f1bd81ea3ebca7abc8c7ec3700ae5f33f57d79f7eeb22e5735487d2fc8fc73b2bfabc6896f336c9c2ebb4e384675c9 SHA512 3f4d71a7d882a57d13bc5d1d06610bcdfc2562d836cbf536af650eefdd923e9cf17d089704836b5873d690af4b414d8b484161744a42c9717a034fde7da433c4
+DIST bspwm-0.9.7.tar.gz 110956 BLAKE2B 75fb711d9c2fa519ff88faea20b1e74f562c1fa207dfe18990d6131b859ad06c15c92f2352e9e045d8b634fd8f15c3758501044107be6aa4d09bba5c3ab4ee2f SHA512 57115cd3ea9eea7a50a3dc26497354355c86b6dd86136c1899cc58bbefa228104eb292bdecf5f9eac5203d3eb326457e35dc9bedc5f18ec3e3c178dd3ca9926a
 EBUILD bspwm-0.9.5.ebuild 956 BLAKE2B b3f3a540952e78128abffcf7e58185e5816706918027e98fc204490388fb6418ef24ee575c5246140e11c608ef364e6c9a0827effa3a7eb8c859337efafdfbe1 SHA512 962e64f7418f45264cc295cc08dc59d21f9d87b05a4c0ef4d17d6d7c8475fea32af1c83a04060b9befb66feaa5a72f12a9ec0e09690bd84e0f5a416a5242db11
+EBUILD bspwm-0.9.7.ebuild 953 BLAKE2B f2a039d7f2eb2d7e5f15bb3bcaef272f7651541800d0424fe9807b2e7614be0d5ceceb6e70e8106cee176b4c97a98a8436508e66f6f5a438e42127eedd94a58c SHA512 916613740a14267e5f94101268ca447bac8c8c25c298ca78b9429fb4dab8adc0d8541a181680b5e8d55e7c4aa8f6568baa23967d81f460092e2bd9967886b961
 MISC metadata.xml 328 BLAKE2B 1c5c86ed67692883d5ed15aad9fb2c773ebe1aab0419c49328630b37577fbf40e7c2cbbecd39551fd702b38fdbfa8c937d78abf6ab4eaf467649ee0af3f52cd3 SHA512 8dccf071f4e82f331d91713b0062c56161b945202da88386c1c21d7f4bb8363ad4b8c164542ad9b68c89b2eb408b8d67a88a322554ccdcc99ccdc046448eba8b
diff --git a/x11-wm/bspwm/bspwm-0.9.3.ebuild b/x11-wm/bspwm/bspwm-0.9.3.ebuild
deleted file mode 100644
index c8ded088233e..000000000000
--- a/x11-wm/bspwm/bspwm-0.9.3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit toolchain-funcs
-
-DESCRIPTION="Tiling window manager based on binary space partitioning"
-HOMEPAGE="https://github.com/baskerville/bspwm/"
-SRC_URI="https://github.com/baskerville/bspwm/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples"
-
-DEPEND="
-	x11-libs/libxcb
-	x11-libs/xcb-util
-	x11-libs/xcb-util-wm
-"
-RDEPEND="${DEPEND}
-	x11-misc/sxhkd
-"
-
-src_compile() {
-	emake PREFIX=/usr CC="$(tc-getCC)"
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX=/usr install
-	dodoc doc/{CONTRIBUTING,MISC,TODO}.md
-
-	exeinto /etc/X11/Sessions
-	newexe "${FILESDIR}"/${PN}-session ${PN}
-
-	insinto /usr/share/xsessions
-	doins contrib/freedesktop/bspwm.desktop
-
-	insinto /etc/xdg/sxhkd
-	doins examples/sxhkdrc
-
-	if use examples ; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/x11-wm/bspwm/bspwm-0.9.2.ebuild b/x11-wm/bspwm/bspwm-0.9.7.ebuild
index c8ded088233e..8b132d0fe0a7 100644
--- a/x11-wm/bspwm/bspwm-0.9.2.ebuild
+++ b/x11-wm/bspwm/bspwm-0.9.7.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 inherit toolchain-funcs
 
 DESCRIPTION="Tiling window manager based on binary space partitioning"
diff --git a/x11-wm/e16/Manifest b/x11-wm/e16/Manifest
new file mode 100644
index 000000000000..249d0817c5fe
--- /dev/null
+++ b/x11-wm/e16/Manifest
@@ -0,0 +1,4 @@
+AUX e16-user-fonts.patch 412 BLAKE2B c3b7e6b0599eb511afe9c6f969f5c529313be2732e4cad2a772c9860427eaf84eb1083fb10ff28853c19a972f734f0b231e78d4862ce5246d9d3bdde6e532c96 SHA512 6fdcbe6191d93cc5c64efb6039cbe9409fd08734a4c99c29482bde06f044b1e6b88c35ef34dc65ce384ecdfb78883022a18885dde6e1bac8ca8192d5f6901c42
+DIST e16-1.0.19.tar.xz 1433016 BLAKE2B 9c27dd6a8d78d2f765b495e5398041a30bf939a5d3926f9f07e022c9bbbc70716b072e40beb6592159f896cc7a15e2fd4e25c8a07db333a80fc8156a82dce357 SHA512 9dc66a4224eacde92c567f9f5b029f21543675207b782077e25f3082ef2133a547eb955fc877b01b2200d99c26148f54a6b59f1ba191163760ecf3b32d5dd374
+EBUILD e16-1.0.19.ebuild 2884 BLAKE2B 83972ec1f7ae0a8eb7d518412891124b9bcd754b650b30cc537c1320b125c3ac6ae2c84977ffc0b5d3e5be2b68e8191fa47daf8812024ded56148478e542d25e SHA512 3dc128379fddbb28909a7f66f44adc8a24cbd789e260bd02bfabf8dc9cb1010476d2b0be7eeadc5479ca539bbddd05c3d5e8188dfb3ab78783615bc76a0aa376
+MISC metadata.xml 1752 BLAKE2B 49a4d0adb7affcaf5d0f5156bc89057b701ea2ed9c469e3e3ff37720624e5d4f3740934b52537902148e7bde019c04d9b5b41ab341a24447fc3caf1394da4459 SHA512 dc40df2c5cc12d8d59d8446f3cb3195ce9f0ec988ba913f6fb6e3cac429fbe1151432226e170e260aa8e61d08cac13d7bf7f191a1fa845c101e0124df82b9ebd
diff --git a/x11-wm/e16/e16-1.0.19.ebuild b/x11-wm/e16/e16-1.0.19.ebuild
new file mode 100644
index 000000000000..f76feca9f8b2
--- /dev/null
+++ b/x11-wm/e16/e16-1.0.19.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Enlightenment Window Manager (E16)"
+HOMEPAGE="https://www.enlightenment.org https://sourceforge.net/projects/enlightenment/"
+SRC_URI="mirror://sourceforge/enlightenment/${P}.tar.xz"
+KEYWORDS="~amd64 ~x86"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="audiofile container dbus debug +dialogs doc examples gnome
+libhack modules nls opengl +pango sndfile sound +themes xcomposite
++xft xi2 xinerama xpresent +xrandr +xrender +xsm +xsync zoom"
+
+BDEPEND="
+	nls? ( sys-devel/gettext )
+	virtual/pkgconfig
+"
+CDEPEND="
+	dbus? ( sys-apps/dbus )
+	doc? ( app-doc/e16-docs )
+	nls? ( virtual/libintl )
+	opengl? ( media-libs/glu media-libs/mesa )
+	pango? ( x11-libs/pango[X] )
+	sound? (
+		|| ( media-sound/pulseaudio media-sound/apulse[sdk] )
+		sndfile? ( media-libs/libsndfile )
+		audiofile? ( media-libs/audiofile )
+	)
+	xcomposite? (
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXfixes
+	)
+	xft? ( x11-libs/libXft )
+	xinerama? ( x11-libs/libXinerama )
+	xpresent? ( x11-libs/libXpresent )
+	xrandr? ( x11-libs/libXrandr )
+	xrender? ( x11-libs/libXrender )
+	xsm? ( x11-libs/libICE x11-libs/libSM )
+	zoom? ( x11-libs/libXxf86vm )
+	=media-libs/freetype-2*
+	>=media-libs/imlib2-1.3.0[X]
+	virtual/libiconv
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-misc/xbitmaps
+"
+RDEPEND="${CDEPEND}
+	themes? ( x11-themes/e16-themes )
+	!x11-wm/enlightenment:0
+"
+DEPEND="${CDEPEND}
+	x11-base/xorg-proto
+"
+REQUIRED_USE="
+	audiofile? ( sound )
+	opengl? ( xcomposite )
+	sndfile? ( sound )
+	sound? ( ^^ ( sndfile audiofile ) )
+"
+
+PATCHES=( "${FILESDIR}/${PN}-user-fonts.patch" )
+
+src_configure() {
+	local myconf=(
+		$(use_enable container)
+		$(use_enable dbus)
+		$(use_enable debug libtrip)
+		$(use_enable dialogs)
+		$(use_enable doc docs)
+		$(use_enable libhack)
+		$(use_enable modules)
+		$(use_enable nls)
+		$(use_enable opengl glx)
+		$(use_enable pango)
+		$(use_enable sound sound pulseaudio)
+		$(use_enable xcomposite composite)
+		$(use_enable xft)
+		$(use_enable xi2)
+		$(use_enable xinerama)
+		$(use_enable xpresent)
+		$(use_enable xrandr)
+		$(use_enable xrender)
+		$(use_enable xsm sm)
+		$(use_enable xsync)
+		$(use_enable zoom)
+		$(use_with audiofile sndldr audiofile)
+		$(use_with gnome gnome gnome3)
+		$(use_with sndfile sndldr sndfile)
+		--enable-mans
+		--disable-docs
+		--disable-esdtest
+		--disable-gcc-cpp
+		--disable-hints-gnome
+		--disable-werror
+		--disable-xscrnsaver
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	docompress -x /usr/share/doc/${PF}/e16.html
+	dodoc COMPLIANCE docs/e16.html
+	use examples && dodoc -r sample-scripts
+}
+
+pkg_postinst() {
+	einfo "In order to use custom fonts, put them into ~/.e16/fonts/ and use"
+	einfo "appropriate names in ~/.e16/fonts.cfg. \"Use theme font configuration\""
+	einfo "in the Theme setting should be disabled for this to work."
+}
diff --git a/x11-wm/e16/files/e16-user-fonts.patch b/x11-wm/e16/files/e16-user-fonts.patch
new file mode 100644
index 000000000000..6a54efe0df97
--- /dev/null
+++ b/x11-wm/e16/files/e16-user-fonts.patch
@@ -0,0 +1,12 @@
+Allow users to provide custom fonts via ~/.e16/fonts/
+--- a/src/ttfont.c	2018-04-26 19:19:44.000000000 +0300
++++ b/src/ttfont.c	2019-03-06 06:04:33.489831326 +0300
+@@ -46,6 +46,8 @@
+    imlib_add_path_to_font_path(s);
+    Esnprintf(s, sizeof(s), "%s/fonts", EDirRoot());
+    imlib_add_path_to_font_path(s);
++   Esnprintf(s, sizeof(s), "%s/fonts", Mode.conf.dir);
++   imlib_add_path_to_font_path(s);
+ #endif
+ }
+ 
diff --git a/x11-wm/e16/metadata.xml b/x11-wm/e16/metadata.xml
new file mode 100644
index 000000000000..94998b76491c
--- /dev/null
+++ b/x11-wm/e16/metadata.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>bircoph@gentoo.org</email>
+    <name>Andrew Savchenko</name>
+  </maintainer>
+  <use>
+    <flag name="container">Use container window (experimental)</flag>
+    <flag name="debug">Build libtrip debugging library</flag>
+    <flag name="dialogs">Enable support for configuration dialogs</flag>
+    <flag name="libhack">Build libhack window mode helper library</flag>
+    <flag name="modules">Enable support for loadable modules</flag>
+    <flag name="pango">Enable pango font rendering using <pkg>x11-libs/pango</pkg></flag>
+    <flag name="themes">Install the official E16 themes using <pkg>x11-themes/e16-themes</pkg></flag>
+    <flag name="xi2">Enable the experimental multipointer input XInput2. This incldues the MultiPointer X feature</flag>
+    <flag name="xpresent">Enable support for the X Present extension via <pkg>x11-libs/libXpresent</pkg></flag>
+    <flag name="xrandr">Enable support for the X RandR extension via <pkg>x11-libs/libXrandr</pkg></flag>
+    <flag name="xrender">Enable transparency support using the X Render extension via <pkg>x11-libs/libXrender</pkg></flag>
+    <flag name="xsm">Enable X Session Management support using <pkg>x11-libs/libSM</pkg></flag>
+    <flag name="xsync">Enable X Sync support</flag>
+    <flag name="zoom">Support resolution change of current window (zoom) using<pkg>x11-libs/libXxf86vm</pkg> (xvidtune)</flag>
+  </use>
+  <longdescription>
+    Enlightenment DR16 (E16) is a classic lightweighth X11 window manager.
+  </longdescription>
+  <upstream>
+    <remote-id type="sourceforge">enlightenment</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/x11-wm/enlightenment/Manifest b/x11-wm/enlightenment/Manifest
index f24c65ac0bd3..645bc6083d0d 100644
--- a/x11-wm/enlightenment/Manifest
+++ b/x11-wm/enlightenment/Manifest
@@ -2,5 +2,5 @@ AUX gentoo-sysactions.conf 3056 BLAKE2B 155b0826c544a5a4829214b4b43d49e2dad455d0
 DIST enlightenment-0.22.3.tar.xz 25648576 BLAKE2B 1abb1fab18c5932b65f1183875bbe0955ce1d608758af0855c550f5581c774bd19dd0b6c8dd8c724b668ff843e1ed4928531f30b60436d9182a07a65fa2af9e3 SHA512 01a9386ee009c76c46cee7176cdeb7f4e97977bdd5014caa51cceeff228ad72f97a362d1eff7e0240e3e2df8b24a6c9d1516c8ab05bd82d288abcfde0d171abd
 DIST enlightenment-0.22.4.tar.xz 25656972 BLAKE2B 5e24e226e5f9295d27658656aefaf39cc80ad3634ba1937ef1a3c8e1adeba8cf3cbab2c43cb9e80ac298107a7a64e248ff252084b19c26a974ffff9eb9e6c3fa SHA512 9f4366bfed4d65e7baaeffd4f5b8ba6febf6f9888e6156dd3e100c9fca42c377f76f156f3dd1f6ab97745ffcb69e1e8d320937e41333797580624a9b74d298ba
 EBUILD enlightenment-0.22.3.ebuild 2761 BLAKE2B afd66034af88b166bec62657b0d5d058697178fb42f94184f6bf099526d1755ba317fd96142a9ddd7590bcc65548b30fa06e1db75828fee67583e6bfcb270612 SHA512 5a32871dfa8c5671efc1870249411ca1ecd3b61737cdf11b7f662006293456083ea95223ea2e8b5033952fa1d96494ca437f1a24c34fcfc6c8d99cc400ab275f
-EBUILD enlightenment-0.22.4.ebuild 2193 BLAKE2B fee6fa3c14c0154ba0d225e99f869973e8e7a61cc58f47bb7793e14793db5913eec30f5132d6a4183b24085b9dbe11dc60a72e7367abcf5a52b93e240ca3ca2b SHA512 5fa019773dd99989c519a374f050499e52ce2b54e4270b1b2fd693dbb051eb314df6ca8d0acc79c50c5e48ba48f4fd581979a90fd79c3b9742f1b5b92c2dafa6
+EBUILD enlightenment-0.22.4.ebuild 2188 BLAKE2B e5edf01ab49f61a0318e0669f9193482bd713e3bdae5167f73d69d1eedfd3f233dec84f02711fbc39f59d3ef592ff1c1406ea605ed2f541e55a913c35f6ff8b6 SHA512 6082de94db744272db7ea7f767b6c3ef5d4320cabdd65c724248f17ba995c4ca9d914374101b6449a201275adc20ad4d580d59f40b3bdab4e853559467869a78
 MISC metadata.xml 823 BLAKE2B b52bcbb857584b986c8b371cbc8d743cbb6510817c93bce44b46bd42025a35b7d3f98ce3e409b37f2f2da32228e8daa6baa7a8408b4a223d735113a857197351 SHA512 8a31834065385bed8e7e5ce79dbdd53e8f3a321cfd0c386bf30c4951d2212c6aaac8712f643f442ce566ad22726d157964919c570fc4b897230039558c56b1b2
diff --git a/x11-wm/enlightenment/enlightenment-0.22.4.ebuild b/x11-wm/enlightenment/enlightenment-0.22.4.ebuild
index 677da510e547..61ce22391698 100644
--- a/x11-wm/enlightenment/enlightenment-0.22.4.ebuild
+++ b/x11-wm/enlightenment/enlightenment-0.22.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="acpi bluetooth connman doc geolocation nls packagekit pam systemd udisks wayland wifi"
 
 RDEPEND="
diff --git a/x11-wm/i3-gaps/Manifest b/x11-wm/i3-gaps/Manifest
index 2ece17c76706..4fa68458bd0e 100644
--- a/x11-wm/i3-gaps/Manifest
+++ b/x11-wm/i3-gaps/Manifest
@@ -1,7 +1,9 @@
 AUX i3-gaps-4.15-musl.patch 2473 BLAKE2B acb148b7a7f14f7e75523ade9ae4374d6b18d3397f97d6b639f416f86abfd114bddd97fab19a61385fff5504bcd0f614c53175da4c30cf31e00f6b612dfb3d0d SHA512 8ce7d00371c43b93dabbe0dadf9caf7c58a68f4a0079f5a9b9552c15c55bfa0df16d7e87a281595af2ac5254632ba28ccf82a467cea16159b41490f6f2910299
 AUX i3-gaps-4.16-musl.patch 2783 BLAKE2B 9dea47af64b78a77006d3aa641273aa7a77846d4425e1da17424528445450112ab275cdf7098ba8c2a76f1b08561b1d1a852cb9fd4ee4c61e53832ca702ad55d SHA512 fdff65255e7c9b30eefdbf032e04ba568d5b75a5b7dfc5fce1aecaac0f0d376b6bb4f87338e1eaf5f20b1c5882ebfc7349f8ab43c804349b5f5c626f9fc1d340
 DIST i3-gaps-4.15.0.1.tar.gz 3965631 BLAKE2B ea65886c40f377125bafbd80e2d56c1d66a4c5c06d942d645b2cb226323a0903e98aa58b67da9c31c60240b5d99d10ecc20864aeede95a5039ea0ffdff8dcb8b SHA512 76ff860e4ca0edd0e22bdff9ae9b1bc150df2b5bc15b0d7ea7a63d373e8d156a43bd91f8a40c48b4c771603f7de7c18c6d16c53fef582e53f51c53a197fa7a0a
+DIST i3-gaps-4.16.1.tar.gz 3983420 BLAKE2B f0d5a85b06ce33e1cc177af6da29f9cdf42ed754bb767aa9eaa5ab52f3b9f4f688d251f2a16fb222fc8cf5052e79859891c4185b1325b2ef6c1a813aa220468c SHA512 904c2f63c6a35573f13fd216625c1349ac71de70ae8f0440667c9d76048cdaf30a398ab358f2366d5f46502d87e801713b625cb509a05f39dbca1371d2b8d0e9
 DIST i3-gaps-4.16.tar.gz 3985226 BLAKE2B da61ab6b476a30a4acab24590cd5ca51f0f51318988890e66530fdd76d99236378d9c678e1e37da99e22e70b0e5e0e5895b8146bd5a93b23957cb1e0178e08b1 SHA512 64a392d2b4175e063f0740ee04885156dbd2571262c22df6276e8eaac36765cd03822723208118a1998ff6cbbcd973fb7f6305df9744c477262d5d33b792ee23
 EBUILD i3-gaps-4.15.0.1.ebuild 1751 BLAKE2B bd1da83f5652b82ca30f1fe6b3eafcb582f1359d29e88066ef82469e5bb30900ecbc490f9758b1d31455aa204ed859e4e40ccf20d2f5a2b005cf45bdef90afd1 SHA512 57a83814bc1758ef00930c1fd05b1636314360a6f183238920257a1d7870c25b225f2e78477dca2fc9223dfe0b685580662326bd2ffaea8757fc730076d0eb7b
+EBUILD i3-gaps-4.16.1.ebuild 1729 BLAKE2B 917071d2786f9c1dcfb38224e54d277f30bf99d54fe456d47a78c2dfd5f291247aa7b9e4b393282e5f146df093c82483d7260ba3a8521538f27196b928a1bf55 SHA512 a50f94d689a8c336b5c59db41a80231895ec9afcef70236ac1fb8760f2805c357ea59f0a355c6a76ee527652fc5a7c00f9d3084d523d63a9a9eea91f450f454c
 EBUILD i3-gaps-4.16.ebuild 1729 BLAKE2B b2bab05e08b8585a79591731a26459b79402b8911797872fd31e1695e57db587fd3a72c3cb865c9854df8a6010f58622b23f8a457314e02e52848bbb258a90e8 SHA512 e3e8f4ac928561c434c43af45e8a1da107c370b2b6d16ce9b1bfad75dfa4030f18eb695301ea7694010ad53264741d07e399bc007631f2de73f8425c7be26d02
 MISC metadata.xml 322 BLAKE2B bdba5a4519158f97944784fc4e2813c1b8e8d4f6f90d43b3a935e8b2565ecc5d2444c4b7b4d11266263d25a76b5c2dba55ec6535fdaab03129bb022206abbce2 SHA512 d3ca96f88473d21b81c420795c6eee5dd41f43354de85fd549a9ae8127e46f10d00034730bf850ddd6df8607821d30fce17aa349b1b2575f43fd3303a2da1cf6
diff --git a/x11-wm/i3-gaps/i3-gaps-4.16.1.ebuild b/x11-wm/i3-gaps/i3-gaps-4.16.1.ebuild
new file mode 100644
index 000000000000..8ea48ba30b53
--- /dev/null
+++ b/x11-wm/i3-gaps/i3-gaps-4.16.1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="i3 fork with gaps and some more features"
+HOMEPAGE="https://github.com/Airblader/i3"
+SRC_URI="https://github.com/Airblader/i3/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	dev-libs/glib:2
+	dev-libs/libev
+	dev-libs/libpcre
+	dev-libs/yajl
+	x11-libs/cairo[X,xcb]
+	x11-libs/libxcb[xkb]
+	x11-libs/libxkbcommon[X]
+	x11-libs/pango[X]
+	x11-libs/startup-notification
+	x11-libs/xcb-util
+	x11-libs/xcb-util-cursor
+	x11-libs/xcb-util-keysyms
+	x11-libs/xcb-util-wm
+	x11-libs/xcb-util-xrm
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+RDEPEND="${DEPEND}
+	dev-lang/perl
+	dev-perl/AnyEvent-I3
+	dev-perl/JSON-XS
+	!x11-wm/i3
+"
+
+S=${WORKDIR}/i3-${PV}
+
+DOCS=( RELEASE-NOTES-$(ver_cut 1-3) )
+
+PATCHES=( "${FILESDIR}/${PN}-$(ver_cut 1-2)-musl.patch" )
+
+src_prepare() {
+	default
+	sed -e '/AC_PATH_PROG(\[PATH_ASCIIDOC/d' -i configure.ac || die
+	eautoreconf
+	cat <<- EOF > "${T}"/i3wm
+		#!/bin/sh
+		exec /usr/bin/i3
+	EOF
+}
+
+src_configure() {
+	# disable sanitizer: otherwise injects -O0 -g
+	local myeconfargs=(
+		--enable-debug=no
+		--disable-sanitizers
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	emake -C "${CBUILD}"
+}
+
+src_install() {
+	emake -C "${CBUILD}" DESTDIR="${D}" install
+	einstalldocs
+
+	exeinto /etc/X11/Sessions
+	doexe "${T}"/i3wm
+}
+
+pkg_postinst() {
+	einfo "There are several packages that you may find useful with ${PN} and"
+	einfo "their usage is suggested by the upstream maintainers, namely:"
+	einfo "  x11-misc/dmenu"
+	einfo "  x11-misc/i3lock"
+	einfo "  x11-misc/i3status"
+	einfo "Please refer to their description for additional info."
+}
diff --git a/x11-wm/marco/Manifest b/x11-wm/marco/Manifest
index 0fd04e5eceea..161a813b26a3 100644
--- a/x11-wm/marco/Manifest
+++ b/x11-wm/marco/Manifest
@@ -1,3 +1,5 @@
 DIST marco-1.18.2.tar.xz 1255492 BLAKE2B 034ad26789f894d7fa829e48ed39d11925e304dd8f6c3c74b14972a332b63782d1a8c4cb5b81b20f4d8bc12a74d053bf587ed72e3c1dca8b4fddd567dd6551ef SHA512 f18cd8d46c2ad6e6d86e6e110fb588ea8c6c301c6ffc1ee72ce80984125be5cbdeb20bf4a7fe8d1d1a60b93c7cb32de8dbd00532462c5637b747068f96e79129
+DIST marco-1.22.0.tar.xz 1406400 BLAKE2B 4c3ebf92111e2d211f80e3cf65e9eab661a8157e51021b5178f621113d739efda45eb15af4e87479587b530c773a7f7bd4c3bf85ffb053da9bf0ee3529073dd7 SHA512 0935ca1532fde882e21ebbc67b41afe80e15e8519b413b9b8bde351196be347a8dcac2e092da818ec0bc700216e38211f192a891eafec8ac7d9bf63d3a42328d
 EBUILD marco-1.18.2.ebuild 1415 BLAKE2B 66a7ff62f82a0c175317f6ad8c45a9673af56f1189a73a65ab1d9300edad4cee9913d0c3393686d2c67300f47a5c6f5d869e81040a9c216f1ac03cde8f3b2c7e SHA512 8e55470bb754512e57a949b07702381969005bd7ddeb0a5a26c654a88cb748466e04f8c2a9a37a38fce7fdc7b5697c047c4f5346b1020b4e94c6a709a553a3dd
+EBUILD marco-1.22.0.ebuild 1407 BLAKE2B 90cfc05d7e6acc2dfdbf15f719c91e9aa0a5166bb9a1215a4ac3f08ad76568036c6ec0f0f618bdde174953d545971735f81bccd518d2ce18ec573f696a5aa452 SHA512 cded5ce667a2eae6b7a51d3463272716d2a06de7aaed9a162c41b6e2f966712f2af9651270ba50dd070884158ee08a2452b7c9daad8d18c91d432c3dde837a50
 MISC metadata.xml 334 BLAKE2B 4a521e1c77d597f68a11cdaa695afcb40a5a2670a7fd643db0999362884a0bad7fb8106b7ba479a939930fbf0323c7f22186cf3fca5583210227a819631ead5d SHA512 f55f007780c371bc133eb3b8eed1bb4f930cab1e29c9ff0ab2dd99cd2e1458058dc86bf3fd70e9f4e9f1db259a7b8a5a247b04282ca08e88d767ee2f1878a451
diff --git a/x11-wm/marco/marco-1.22.0.ebuild b/x11-wm/marco/marco-1.22.0.ebuild
new file mode 100644
index 000000000000..32d7d2c46302
--- /dev/null
+++ b/x11-wm/marco/marco-1.22.0.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MATE2_LA_PUNT="yes"
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+DESCRIPTION="MATE default window manager"
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="startup-notification test xinerama"
+
+COMMON_DEPEND="
+	dev-libs/atk
+	>=dev-libs/glib-2.50:2
+	>=gnome-base/libgtop-2:2=
+	media-libs/libcanberra[gtk3]
+	x11-libs/cairo
+	>=x11-libs/pango-1.2[X]
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.22:3
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	>=x11-libs/libXcomposite-0.3
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	>=x11-libs/startup-notification-0.7
+	virtual/libintl
+	xinerama? ( x11-libs/libXinerama )
+	!!x11-wm/mate-window-manager"
+
+RDEPEND="${COMMON_DEPEND}
+	gnome-extra/zenity
+	>=mate-base/mate-desktop-1.20.0"
+
+DEPEND="${COMMON_DEPEND}
+	app-text/yelp-tools
+	>=dev-util/intltool-0.34.90
+	sys-devel/gettext:*
+	virtual/pkgconfig:*
+	x11-base/xorg-proto
+	test? ( app-text/docbook-xml-dtd:4.5 )
+	xinerama? ( x11-base/xorg-proto )"
+
+src_configure() {
+	mate_src_configure \
+		--enable-compositor \
+		--enable-render \
+		--enable-shape \
+		--enable-sm \
+		--enable-xsync \
+		$(use_enable startup-notification) \
+		$(use_enable xinerama)
+}
+
+src_install() {
+	mate_src_install
+	dodoc {,doc/}*.txt
+}
diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest
index 7d6e3456582a..c27ab3090599 100644
--- a/x11-wm/mutter/Manifest
+++ b/x11-wm/mutter/Manifest
@@ -7,8 +7,10 @@ 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.28.3-patchset.tar.xz 44308 BLAKE2B c9ecac6fc91d0f5d07be3f407332267ac6ee83d65ec7650461a990e87dd81c0b6bf37893441ebcd084730d6bbe4ecf851e5083660979aebce237d5fdd2485bb1 SHA512 3d057faf1dfbe5ea38c8207d16377c9024772fb2111f0cdc9867de63ed158534d6ae5a23413b2f258c1c85278abbf1ac0156f0322e9df717ea09ba45d5f8650f
 DIST mutter-3.28.3.tar.xz 3693812 BLAKE2B 491a4cc47d54d2a72adffd808ac64d90914f5a5bd653ba2b147993ee4a0862fbe61a666a3adf322ed4fd4af99c4cf9890b7bb19f9f0451039d1d797cfd616e3b SHA512 1230e4489693188c4d9ffe5460b235cd018b16f27741451120c3acb6027901d5286d9793cc0c9ad50a2233ff20ea91e7a47c0df611bb4479f1e33af0d185f69a
+DIST mutter-3.30.2-patchset.tar.xz 9968 BLAKE2B 7b664f35eec3cb6f298d5628bc7c0dd9697076f4fcfca431d08581d2c3054fbad952802a3279b174f207b5c6fdea2f29811352c7b2b1119e87bf689c1cbc8ce1 SHA512 949acecf66cf9060527c2a3559f831cfbe9ed68007ae2ca94df920c8691bc28d5577d15fe1bd9c2fddef978b23b29d4e6dfef16c232a96fd5006ed844321b957
+DIST mutter-3.30.2.tar.xz 3725692 BLAKE2B 280b7a6319e5d4705baee965936df6f31ba8ca96ce3812cf640578c6817aaa82b6ff8fde7b2740ecd8edb6c4746f4608f997772a24d67f12fcb0c5c77fc9b29a SHA512 3890270b7eb4b8753274d30ad26693b829a69b31f36501845c59b000deb174be58b5167f6754767dba02ebc44688697fbe7344a327879a073955047b69333a2e
 EBUILD mutter-3.24.4.ebuild 3692 BLAKE2B e548157553fa97d84821a7a3c5cda25dd85ac1b9ac7301352810228ebfc12a1a91e5c332dc153d77038dba74a0598d0409d4fa0d7d30afceb63ff1531b795a6c SHA512 91e4831d296738b21a14846e5e6d9edc30cbad82845c2e2fc7c8a5df992944e2b6168f51eeb58c12ea61d8424c7a9980dbad04b18edbfdf9d7973e32a4537440
 EBUILD mutter-3.26.2-r1.ebuild 4036 BLAKE2B ac9aba438fa514748247827c3d6eb87b036c36528fad4818292778605de06423cbb9ef1fce00cca51c4a90581f7429079e563416ab656664e5c3a6d7a45d74ad SHA512 d4d168a12dd1fd3b3f32b036808fd55c976a9234d5f4c4d944fd6c88277d72d260c6e23dea57fd86d7e556029c6a5d6619c8af871e06f60598cbf8bc83388373
 EBUILD mutter-3.28.3-r1.ebuild 5010 BLAKE2B 3166046613f77f33b0ea0513b603fef64010104cc25be310bad648baa2521b822dcba6cfb7a3d8012974f5ab433a98f260d218034ae0381d086cf93b35270375 SHA512 30527551e31751f9a1804669755551493095551ee08f72202610a2648961711835dba09143cc9de53ba1b9daca26ffde72cea59e367dab6746fad757254a41b7
-EBUILD mutter-3.28.3.ebuild 4615 BLAKE2B 22ce0c15c8e42694cabfd85052380445e1d23251601cf0bbbf4c9c31d7ee31a6d4d33956962ba56a749037fb1a81fcf4c41d5b47722086153e7b2540fcbeb192 SHA512 05c4ce08a1a09490186eaf978aeb169eed8a160a4796617d95be1603e7b56e547b9aa300e26f8bfcd6e529dd18bf450d697049e0d6ae1749bcdb5425b98b07aa
+EBUILD mutter-3.30.2.ebuild 4818 BLAKE2B 126dd5d0082b588430ab8c3a46e5c71de4f13dd44f1d8130b6c44a6f96e4da71b642209aa1323f94cab950b770a0f9ef843e81c4f3d86e9811bb56ce6927a596 SHA512 da8b9b619dd648db52e635b29dae7c20cb782b491fda438b3e05d8f620d2b32d7c0278140a023f444d5f5e20ee19dec4cd8911e4c4ae91abb4aa8f7c5cffdea9
 MISC metadata.xml 431 BLAKE2B 224bce7cb810d88b198f757a6df09da0ba641a08ec75aba918d0fe4e914a3e572e73a863d88bbbd05ab1be52f10d2b30dc20e3420a79fdaa5893b51e72aea476 SHA512 e66679d251265d2666ef26d927110d647d09dbdf4b6fd1f4f1fbac14a35074bfd77182c78e798cba7e2a4649b2a54c16431620a211f9558f922281c522944b85
diff --git a/x11-wm/mutter/mutter-3.28.3.ebuild b/x11-wm/mutter/mutter-3.30.2.ebuild
index 73226d241015..3945f9ee3d00 100644
--- a/x11-wm/mutter/mutter-3.28.3.ebuild
+++ b/x11-wm/mutter/mutter-3.30.2.ebuild
@@ -10,10 +10,12 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/mutter/"
 SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
 
 LICENSE="GPL-2+"
-SLOT="0/2" # 0/libmutter_api_version - ONLY gnome-shell (or anything using mutter-clutter-<api_version>.pc) should use the subslot
+SLOT="0/3" # 0/libmutter_api_version - ONLY gnome-shell (or anything using mutter-clutter-<api_version>.pc) should use the subslot
 
 IUSE="debug elogind gles2 input_devices_wacom +introspection systemd test udev wayland"
-REQUIRED_USE="wayland? ( ^^ ( elogind systemd ) )"
+# native backend requires gles3 for hybrid graphics blitting support and a logind provider
+REQUIRED_USE="
+	wayland? ( ^^ ( elogind systemd ) )"
 
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
@@ -33,7 +35,6 @@ RDEPEND="
 	>=x11-libs/libXcomposite-0.2
 	>=gnome-base/gsettings-desktop-schemas-3.21.4[introspection?]
 	gnome-base/gnome-desktop:3=
-	>sys-power/upower-0.99:=
 
 	x11-libs/libICE
 	x11-libs/libSM
@@ -61,8 +62,8 @@ RDEPEND="
 	wayland? (
 		>=dev-libs/libinput-1.4
 		>=dev-libs/wayland-1.13.0
-		>=dev-libs/wayland-protocols-1.12
-		>=media-libs/mesa-10.3[egl,gbm,wayland]
+		>=dev-libs/wayland-protocols-1.16
+		>=media-libs/mesa-10.3[egl,gbm,wayland,gles2]
 		systemd? ( sys-apps/systemd )
 		elogind? ( sys-auth/elogind )
 		>=virtual/libgudev-232:=
@@ -81,8 +82,10 @@ DEPEND="${RDEPEND}
 "
 
 PATCHES=(
-	# Lots of patches from gnome-3-28 branch on top of 3.28.3
+	# Some patches from gnome-3-30 branch on top of 3.30.2
 	"${WORKDIR}"/patches/
+	# Hack to not fail USE="-wayland,-gles2" builds with no mesa[gles2]
+	"${FILESDIR}"/3.28.3-no-gles2-fix.patch # requires eautoreconf
 )
 
 src_prepare() {
diff --git a/x11-wm/qtile/Manifest b/x11-wm/qtile/Manifest
index 302b2120b585..6021cb4ac9bb 100644
--- a/x11-wm/qtile/Manifest
+++ b/x11-wm/qtile/Manifest
@@ -2,7 +2,9 @@ AUX qtile-0.12.0-tests.patch 415 BLAKE2B f0701a380584a7e31b5141a8307a163ac8c5406
 AUX qtile-session 1854 BLAKE2B 260c39642f805f9b94e59ab25d9e8d6e53abcb9fbed76f33434fdd2ccd65dc24c71b7ea654ced6393404656f2f26d96dc45a2b7e580190da408a396e76af2897 SHA512 4d7418316f6baeaa28b254f341c74641004bd58444c425f626c92e44bff046ec108d128a9e91c10daae75b222c5758e8f0e8a5e3b778b2af36409f4d4b778cbe
 DIST qtile-0.10.6.tar.gz 328892 BLAKE2B 3a4887808b87b0cbe4410d2bac8af4664873d2aa9b8c782f8c026ae78ba586b6e02d9a50ee42434afa916e9fe9041a7a15a68f9026ee7d95a0edec2594515cfa SHA512 39eef26358e1220ca766b030733396206df68677e3f23d6847d375f479952a4e2d47e0c3e59fab2e5046e899bad91d107a913bb25458fb66859dec3fa8c0e956
 DIST qtile-0.12.0.tar.gz 447139 BLAKE2B c1bea9ba8b36ccf14b7e55b4a2cbc05714ecffef33d992e9bf1683e6f8c416d481cf9d141bbf0fe62df65aeb3555290647d072dd45f507b08e0d523f992a1671 SHA512 a94237c40775524e16aebdd8555d0ed0623c248b65aee32851145e8a6cc54ce4d46ee5cf4c4f583e468de4557a565c4281660219e4b2ee1b73fb483567e1a5b2
+DIST qtile-0.13.0.tar.gz 468271 BLAKE2B e5e95b5bc56a06469e903f025946e6d0ea7b36501d017dd1470950c04a3ae1b35ec56b2a3c12f52daee75ae7b009c26285f49c0fa1ec5dda4993b2cf2da8a40c SHA512 06e6b32952c77c6b44872d5a52e0d196d5bb23c38da5d8acc2bba571f4d5fbadd8a7311f47e9301fb72a45c92b0255a90911edd12442392206da311fb7ada286
 EBUILD qtile-0.10.6.ebuild 1354 BLAKE2B 1dc08d6e4baa03f5c2416eba26fe5d398cd77e6d3db0feeabbb49fae7d700e1f280e085b8ef20c5d03878bf6974a48c837464b5e52554d11f11fc1520790858d SHA512 5949738009c1fc7f7baa658d314c2cf17b43d1e4338df0772ae2c8d6d8b687a7f7b434029222eb2c675f8b32d35693521115d585d4bf146484d6f5cec7880e53
 EBUILD qtile-0.12.0.ebuild 1709 BLAKE2B 8d0b2f784803827d007513195b012dd30176fd7e7fc4c4ad544c0672233ca0e88acf6e16b03334c053ca425c3a629f602d25f619039934998a312f2ef64f7246 SHA512 f80dd9f4a4a7cf30965c5810039ad7deb31498aa6cda14e87ca2a6089b4eca369ac7bbaa13a72fd74cf9e0a50159e02ed76d616fb8703f44459c6c13e63f6b00
-EBUILD qtile-9999.ebuild 1709 BLAKE2B 8d0b2f784803827d007513195b012dd30176fd7e7fc4c4ad544c0672233ca0e88acf6e16b03334c053ca425c3a629f602d25f619039934998a312f2ef64f7246 SHA512 f80dd9f4a4a7cf30965c5810039ad7deb31498aa6cda14e87ca2a6089b4eca369ac7bbaa13a72fd74cf9e0a50159e02ed76d616fb8703f44459c6c13e63f6b00
+EBUILD qtile-0.13.0.ebuild 1709 BLAKE2B 1b7982c34b030a8613d8a1a97263c06500e628c3e7d6b5783399003feeb043e1eba078b79740aaae43f8221990efd8233a177496f2105b91a059fb8f3e650537 SHA512 cc9b8d0e2243dfe1f90068ea18c957e396b2368d8a81995d036795a95858433c4cf59a8f7fa6e3c421fbcda6dfbf92f54c089647fd154591ac315e78758b646c
+EBUILD qtile-9999.ebuild 1709 BLAKE2B 8b1e5b7ec8ae40d3302536d275c8da67109f5f8bfa74dd2f61ec344646506239feeb9a90cfd4f6499aff67ac6da0b79ef33f36714561641cd2a11f991a7dcab5 SHA512 f99fde824a15a5b2c80f22c3665d3576bad2803e04b2992ee43589556670116143fd66e4ca6dbafd791bbb0e5c90ad422800a49433d10b353c0ede775a8b13e8
 MISC metadata.xml 322 BLAKE2B bdbe4a68aa5f64ac0c4a045653920863b757b661b1966cbedead7b9bc48f0436cf96e30d5e615b265daa57e21b92959f4b38a8bc16c1123c2c2af6709ff981ab SHA512 2722b020cfc1260e907fccc5055ea5556435bd603fe362fbe0ceb0b3074ee20baf6ecc04d2afd6bd9c7b949d0ce0cc06f5c9234f77963374916924d6d7249564
diff --git a/x11-wm/qtile/qtile-0.13.0.ebuild b/x11-wm/qtile/qtile-0.13.0.ebuild
new file mode 100644
index 000000000000..a3b40e8192aa
--- /dev/null
+++ b/x11-wm/qtile/qtile-0.13.0.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
+
+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[xcb]
+	x11-libs/pango
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/cairocffi-0.7[${PYTHON_USEDEP}]
+	>=dev-python/cffi-1.1.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
+	>=dev-python/xcffib-0.5.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/trollius[${PYTHON_USEDEP}]' 'python2*')
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-cov[${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"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.12.0-tests.patch )
+
+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 5ba9a0932049..94b5c125cf7c 100644
--- a/x11-wm/qtile/qtile-9999.ebuild
+++ b/x11-wm/qtile/qtile-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
 
 inherit distutils-r1 virtualx
 
@@ -44,7 +44,7 @@ DEPEND="${RDEPEND}
 	)
 "
 
-# display retry backoff slowness and failures 
+# display retry backoff slowness and failures
 RESTRICT="test"
 
 PATCHES=( "${FILESDIR}"/${PN}-0.12.0-tests.patch )
diff --git a/x11-wm/windowmaker/Manifest b/x11-wm/windowmaker/Manifest
index f3c034c3c0af..99d25363a2ca 100644
--- a/x11-wm/windowmaker/Manifest
+++ b/x11-wm/windowmaker/Manifest
@@ -5,5 +5,5 @@ DIST WindowMaker-0.95.8.tar.gz 3253515 BLAKE2B 225dae9eb10f913931e129fdf78860123
 DIST WindowMaker-extra-0.1.tar.gz 238018 BLAKE2B 865b12975d0cdefc1f05a76344b449fdcf8a2841d6a7adf1ab6435857d89cbc4fda22bb62432a1bbba921267380d00a0cded718bfbd344bbb5e6207e59b76096 SHA512 0fe9b3ffc093942db167d8a01e15c0f6741f3a40959d1434ea4f23e7b9d4a9c13935a61eabef9691e5fdfd4e407564caafce15c2d65d66499960a6764a874ab8
 EBUILD windowmaker-0.95.7.ebuild 2928 BLAKE2B 4de4877dde6b7fbb16d8c2cbbf7285a9214f2352a200baf261eb891f1f23ecd5389b079735482448fa6c4e2804bab2139fd3ebcbf293ad88786ff30a7e0c91a0 SHA512 3b79d3e51efd6707995d4a327b3cc720f3ad668bc990e4dad801ab38f9fdc15efeb1f90819c4119e365d2a346378a009001326679e18cb78a26da11b0c08d0b4
 EBUILD windowmaker-0.95.8-r1.ebuild 3073 BLAKE2B 3a3f5e06b09699353e363e3ef4eba698a1340365039701e63985fad796d2dcf17b41ed1b085ee6bde10d6c021c46b9d80fe2ad9de3b3c60d52169ea40cc62d16 SHA512 ec185f8d7650ddaa24453acb256cc845761fc46fed32f855b12b23e27c3b59d4413e588fe5926ca0be71060157808804904c204a71932f4f68f8d7f128cb28fe
-EBUILD windowmaker-9999.ebuild 2956 BLAKE2B e427220753263ee20a1cfc6eefe114ff8f9db8f51faf7acd111c6729c246cee0c0479c94fa7a6d8e5d80a25474885e5a7c9f695269274a43210dd44523424793 SHA512 f4f33e43b2bff957a446586e650c3a0f0c86cfbb288295fe80304928404635ad83a9ab354143589081324c621bb78d864136f0fbfdc4e2d0b068f637fc03bc4d
+EBUILD windowmaker-9999.ebuild 2842 BLAKE2B 894de4cc8296ff22ba90d5bf89e00edd82aa256adbabde31861d9f6d1a85c50e32d3c47485c39ff5d20ce7c55da80835fb63626850790823a4d550894f354fdc SHA512 298b72229d0a354ac9b174610add21c4624ae23ccbe9ce850519f93478489fdeb6e1cd40b2f368733c4d89fb93af91181107e554e4c2af81447fa324b5e6c65c
 MISC metadata.xml 490 BLAKE2B a74e46dfe5b90558720726c3a18b9c9cf2752fb90ade60450ae568547c52b807e9dee74d1deb842c11cc3e6f564c0793adc5f8e24686893138808669f6fc9766 SHA512 ae731acb1fe00cfbda949fc9cafad9f861b83fb37103a699157256840c67e4a2cd0023114d30eab0b25f6dcb154c00e2a659a4feffaabad97e8ed7aa2a03e3ca
diff --git a/x11-wm/windowmaker/windowmaker-9999.ebuild b/x11-wm/windowmaker/windowmaker-9999.ebuild
index 5378b5e3d343..18bfa9f85a4a 100644
--- a/x11-wm/windowmaker/windowmaker-9999.ebuild
+++ b/x11-wm/windowmaker/windowmaker-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ inherit autotools eutils git-r3
 DESCRIPTION="The fast and light GNUstep window manager"
 HOMEPAGE="http://www.windowmaker.org/"
 SRC_URI="http://www.windowmaker.org/pub/source/release/WindowMaker-extra-0.1.tar.gz"
-EGIT_REPO_URI="git://repo.or.cz/wmaker-crm.git"
+EGIT_REPO_URI="https://repo.or.cz/wmaker-crm.git"
 EGIT_BRANCH="next"
 
 SLOT="0"
@@ -22,7 +22,7 @@ DEPEND="media-libs/fontconfig
 	x11-libs/libXt
 	x11-libs/libXv
 	gif? ( >=media-libs/giflib-4.1.0-r3 )
-	imagemagick? ( media-gfx/imagemagick:0= )
+	imagemagick? ( >=media-gfx/imagemagick-7:0= )
 	jpeg? ( virtual/jpeg:0= )
 	png? ( media-libs/libpng:0= )
 	tiff? ( media-libs/tiff:0 )
@@ -49,10 +49,6 @@ src_prepare() {
 		fi;
 	done;
 
-	if has_version '>=media-gfx/imagemagick-7.0.1.0' ; then
-		eapply "${FILESDIR}/${PN}-0.95.8-imagemagick7.patch"
-	fi
-
 	default
 	eautoreconf
 }