gentoo resync : 11.07.2019

15 files changed, 160 insertions, 150 deletions

diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index 9a173f24c824..08b2c7e2e1d9 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/bspwm/Manifest b/x11-wm/bspwm/Manifest
index e2c81140f7aa..7d71858bb4de 100644
--- a/x11-wm/bspwm/Manifest
+++ b/x11-wm/bspwm/Manifest
@@ -2,5 +2,6 @@ AUX bspwm-session 1876 BLAKE2B 8e1a9eaf2a1721d2b6272b6f0e1f9692fbab8b94aacf2dd52
 DIST bspwm-0.9.5.tar.gz 106893 BLAKE2B 6059fd31cb4d4ee262f5a60bac9d21efb61b55e2f47785310e5101abb77023307ff0b9e858701f9558e1e8980905bf323fb310e426c714cf05f09251947c19a3 SHA512 7f50caca3b049f7401f4db8c9d1a9a2d098a3d67a3f8fe87d433c14ad1d0443be9ed4296163628fd7180614d340b672350e02538f36d0e812418aafaef16ba09
 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-r1.ebuild 947 BLAKE2B 6056a3e0a90d66d4e9a33d2e52eda3f106deba13ab40acc6598981e6822938e694321fe1cc9fd70eb2d7ba9744b96b9f6fabbbaefdf25979dc27c46d1c4cafbd SHA512 20a3df368a673ed89a8acd7906777d154ef73767cb76a729967e2e9839ec5374407094fc6be9b6dfbf7e825c84d5289ec2f81d35be5422e2de9bb24c4a79b785
 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.7-r1.ebuild b/x11-wm/bspwm/bspwm-0.9.7-r1.ebuild
new file mode 100644
index 000000000000..484d61f26f28
--- /dev/null
+++ b/x11-wm/bspwm/bspwm-0.9.7-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+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 DOCPREFIX="/usr/share/doc/${PF}" install
+
+	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/lumina/Manifest b/x11-wm/lumina/Manifest
index e39970cd087b..69a252dd3770 100644
--- a/x11-wm/lumina/Manifest
+++ b/x11-wm/lumina/Manifest
@@ -1,11 +1,12 @@
 AUX 1.2.0-desktop-files.patch 1001 BLAKE2B eee93a9f1d3466dcdb4d9d411b9e5b5b5a882dba2d4ccadb8ad90d82b66ee3a2d02fb02dbdd6b156fb9768c6d8d8b772b075ffc2b12e630e204e55632e99f931 SHA512 419fdd6c26f05daa4dacee5d0f21a51ffc465d443ba47e374c431c722dab98b8686453c692b0d8e579c5a5f43b18d92c0f7345845901e1d86ad36c70e1546b4d
 AUX 1.3.0-OS-detect.patch 408 BLAKE2B d12dff0ac02af8542367ead135f9205e4e310acc3f4afcf222bb4fb0ba1eb395f2acc3fa7c7ae53ed5962da125458e0447996a96af600fa283ff4fa9485f1037 SHA512 ecfe35648ee83635dfe1a18cd27071ef5b707a5246e0978f31e2cd5ac71e1a55ac7598988a435f8f26cbc39f5b47c20335bb956b2cc2993239ea5e76f09a039b
 AUX 1.4.0-poppler.patch 511 BLAKE2B a81c3086043dadfa62cc493a37ca22044a74d2e4966ea880f0dad96f3d0940445e9cfb575a6cc8525aa22f6c313fdea11d3c39ee00905a50f349bc69fc472d5e SHA512 fe765f11ecb7dc99d421d8e4b6fb3fc18279755fbc7ef41517d315e2ca3fa703ab7826f6ce2de62198354379c66d02e1dd4240f33d9f621fa1e9837fc2222b60
+AUX lumina-session 2011 BLAKE2B bec6e1161c89ef0ae5f6506d57b6deff09f907b2c16b0d3404eb61369f1c3fa6f19400557f18dc3081e19652badae541d9f84be8717851b5a583392caaef303f SHA512 79e06e1761b079c96984c84f225e23a545d012ad94148080c3659c85f75b322dd050fc4b1908f72de1cdd22bab6b62e0d1de4f8c77f29073e88488671b0836db
 DIST lumina-1.3.0_p1.tar.gz 86451718 BLAKE2B 7834fad1541144524fc44d5e2cc1af21e82878c05f0cc2da4cf90f8f7e51614f535bab1bcb81c6d5929e14b2fa7ba7df8e66e53a9a81b55c973511f3b3e7cc17 SHA512 93fb195f26984a2ba6e62dbe1ea619e4ab8e936d1cf1d335db8a7e51058c9be8d3e389146259f8229fb5dc6477610dcc2e1278c4e2a348f27904a318ba095707
 DIST lumina-1.4.0_p1.tar.gz 22489599 BLAKE2B 0c183763dae0ca046fa5d1cebc184a7ba5987113a12f72285e5dabfe25ca763683a23cb76889673ac3c2817feb2233e8b7da9fefed41040f91b0bb01d8ce03ae SHA512 340079832f4f6c9c9c70f11d7743b7c7db6772897f6411a966bf2bd77124bab1fbac8f5751164fb8a08a12c4443f515aaee76b117b4f959263eeaa98dbcbe41e
 DIST lumina-1.5.0.tar.gz 20657364 BLAKE2B 62b064e1be3ce69c078e68524e011a8ce4d61c680a4732da7992a7b72833363fceb0a0895a228ec9de7921d989253c70c518810b91c23226aded1f54b23b1aea SHA512 37106d71a9ba7188c4ded0614d2d4424f732519e11288ae312dfcd9a0b5b26dd31dfa812e74a96c0e3e0fb99fae4dc00806fd7a24183746688c72d997054af7d
 EBUILD lumina-1.3.0_p1.ebuild 1462 BLAKE2B d81c811e31ddd93b1740d6c11d715692af499d0c69617520f42f59647962d8d73cf111b4a68bb5e2bb294f75eeaad9c70118d81392f14013e8c9055d759c913b SHA512 0b582f54b18b3e19b78cf1dcff0aea0f6e053cce9b9ac68f1d77c43a8f90fff6de76c3496ff66d07c08ee575f4ead473b9c77e8ac83b329f587590acf0db887a
 EBUILD lumina-1.4.0_p1-r1.ebuild 2158 BLAKE2B ce102e9cf2a5dc026ae83205dedc31cfd3295de9c38bb88f899fd09e509067711620a5643fc7b5ff571547a9c8b134f3cdb5db3ae365af174cd8db774e71ad16 SHA512 5087d59aaa8be0b47672b5f66db4db3d068f47021e8a41e65d63f73fcc1192d93cb7fe36d48fb5b7dd7f02fa889832055a26c50ac7a78e3c3fef0e7c336b2bca
-EBUILD lumina-1.5.0.ebuild 2101 BLAKE2B c64d5c3be0b7ca8da681dcb97442b47fab3a61c3fd1acdb24dc97b75481c522e06361b9b8fbbf090540bee25a73d2d5ad6c1af88163b617b35c586382c93c9a2 SHA512 4480ebe543376e93ac646c4e69b07204190b3ed4f4c0e9d69f4f408f4ec22559228e020e97320a1b3b164c0cab055f99c5be2947b238424355816128dde66475
+EBUILD lumina-1.5.0-r1.ebuild 2415 BLAKE2B d07c5626412b5d838ed9cd9a81183b0b956e26ca854edeab173ad45355ffa08ef9698d38a70a15ced20b2c94b62c8b787ea741ccc9a5986c14a88dba03a69b35 SHA512 225155444c476e88ad1fb86bdcb23e0c2f1adde2948ff0b27b87fdea7393f049d1bed96ed0d885742a8c5c2820fe3c3e8ce4b09c308457f8fd1a6c55184865b6
 EBUILD lumina-9999.ebuild 1389 BLAKE2B ca047edaeac6f78d28e2862fba0001b93f327ceca3831c07cfd90bfb7c25a16c9fe10cf5471831d3a32500435d5a57394be8077519a75d371ebb602f6002e01a SHA512 86335a3461b6a7f4685589740f49c7d3bff78a5f09101bb506e2c480851ed1c1dd6985bf5840156229db5257c1285b9406729eb2078d66e779e0ae788752b79c
 MISC metadata.xml 1981 BLAKE2B 260d71ea029aa07a26cc0af9d937c51253029b0bc4c70f11d4330da3a10d371be15959c93f4b1af1436b7a3c5a8a1ecb2a8f3cdea2078133384bcec3015f9940 SHA512 a55aba75dcdfc78363be5a59ebbcb7760fb1370685d7a893b976aba9497094f9674e7493ed0df3899ad917165967c3a58984bc04f3651b46416fa91fcb29de6c
diff --git a/x11-wm/lumina/files/lumina-session b/x11-wm/lumina/files/lumina-session
new file mode 100644
index 000000000000..9fb7a418b2af
--- /dev/null
+++ b/x11-wm/lumina/files/lumina-session
@@ -0,0 +1,90 @@
+#!/bin/sh
+# lumina Xsession starter, based on Xsession shipped by x11-apps/xinit-1.0.5-r1
+
+# redirect errors to a file in user's home directory if we can
+for errfile in "$HOME/.fluxbox-errors" "${TMPDIR-/tmp}/fluxbox-$USER" "/tmp/fluxbox-$USER"
+do
+	if ( cp /dev/null "$errfile" 2> /dev/null )
+	then
+		chmod 600 "$errfile"
+		exec > "$errfile" 2>&1
+		break
+	fi
+done
+
+userresources=$HOME/.Xresources 
+usermodmap=$HOME/.Xmodmap 
+userxkbmap=$HOME/.Xkbmap
+
+sysresources=/etc/X11/Xresources 
+sysmodmap=/etc/X11/Xmodmap 
+sysxkbmap=/etc/X11/Xkbmap
+
+rh6sysresources=/etc/X11/xinit/Xresources 
+rh6sysmodmap=/etc/X11/xinit/Xmodmap 
+
+
+# merge in defaults
+if [ -f "$rh6sysresources" ]; then
+    xrdb -merge "$rh6sysresources"
+fi
+
+if [ -f "$sysresources" ]; then
+    xrdb -merge "$sysresources"
+fi
+
+if [ -f "$userresources" ]; then
+    xrdb -merge "$userresources"
+fi
+
+# merge in keymaps
+if [ -f "$sysxkbmap" ]; then
+    setxkbmap `cat "$sysxkbmap"`
+    XKB_IN_USE=yes
+fi
+
+if [ -f "$userxkbmap" ]; then
+    setxkbmap `cat "$userxkbmap"`
+    XKB_IN_USE=yes
+fi
+
+#
+# Eeek, this seems like too much magic here
+#
+if [ -z "$XKB_IN_USE" -a ! -L /etc/X11/X ]; then
+    if grep '^exec.*/Xsun' /etc/X11/X > /dev/null 2>&1 && [ -f /etc/X11/XF86Config ]; then
+       xkbsymbols=`sed -n -e 's/^[     ]*XkbSymbols[   ]*"\(.*\)".*$/\1/p' /etc/X11/XF86Config /etc/X11/xorg.conf`
+       if [ -n "$xkbsymbols" ]; then
+           setxkbmap -symbols "$xkbsymbols"
+           XKB_IN_USE=yes
+       fi
+    fi
+fi
+
+# xkb and xmodmap don't play nice together
+if [ -z "$XKB_IN_USE" ]; then
+    if [ -f "$rh6sysmodmap" ]; then
+       xmodmap "$rh6sysmodmap"
+    fi
+
+    if [ -f "$sysmodmap" ]; then
+       xmodmap "$sysmodmap"
+    fi
+
+    if [ -f "$usermodmap" ]; then
+       xmodmap "$usermodmap"
+    fi
+fi
+
+unset XKB_IN_USE
+
+# run all system xinitrc shell scripts.
+if [ -d /etc/X11/xinit/xinitrc.d ]; then
+    for i in /etc/X11/xinit/xinitrc.d/* ; do
+        if [ -x "$i" ]; then
+	    . "$i"
+        fi
+    done
+fi
+
+exec /usr/bin/start-lumina-desktop
diff --git a/x11-wm/lumina/lumina-1.5.0.ebuild b/x11-wm/lumina/lumina-1.5.0-r1.ebuild
index 2ef931f99910..69a2ededf215 100644
--- a/x11-wm/lumina/lumina-1.5.0.ebuild
+++ b/x11-wm/lumina/lumina-1.5.0-r1.ebuild
@@ -18,12 +18,13 @@ COMMON_DEPEND="dev-qt/qtcore:5
 	dev-qt/qtconcurrent:5
 	dev-qt/qtmultimedia:5[widgets]
 	dev-qt/qtsvg:5
-	dev-qt/qtnetwork:5
+	dev-qt/qtnetwork:5[ssl]
 	dev-qt/qtwidgets:5
 	dev-qt/qtx11extras:5
 	dev-qt/qtgui:5
 	dev-qt/qtdeclarative:5
 	dev-qt/qtprintsupport:5
+	dev-qt/qtdbus:5
 	x11-libs/libxcb:0
 	x11-libs/xcb-util
 	x11-libs/xcb-util-image
@@ -70,6 +71,10 @@ src_configure(){
 src_install(){
 	emake install INSTALL_ROOT="${D}"
 	einstalldocs
+	mkdir -p "${D}"/usr/share/icons/hicolor/64x64/apps || die "cannot create the icons dir"
+	mv "${D}"/usr/share/icons/hicolor/scalable/apps/*.png "${D}"/usr/share/icons/hicolor/64x64/apps || die "cannot mv png icons"
+	exeinto /etc/X11/Sessions
+	newexe "${FILESDIR}/lumina-session" lumina ||die
 
 	remove_locale() {
 		rm -f "${ED%/}"/usr/share/${PN}-desktop/i18n/l*_${1}.qm
diff --git a/x11-wm/marco/Manifest b/x11-wm/marco/Manifest
index cffe5a080384..09204388159e 100644
--- a/x11-wm/marco/Manifest
+++ b/x11-wm/marco/Manifest
@@ -1,5 +1,3 @@
-DIST marco-1.22.0.tar.xz 1406400 BLAKE2B 4c3ebf92111e2d211f80e3cf65e9eab661a8157e51021b5178f621113d739efda45eb15af4e87479587b530c773a7f7bd4c3bf85ffb053da9bf0ee3529073dd7 SHA512 0935ca1532fde882e21ebbc67b41afe80e15e8519b413b9b8bde351196be347a8dcac2e092da818ec0bc700216e38211f192a891eafec8ac7d9bf63d3a42328d
 DIST marco-1.22.1.tar.xz 1357864 BLAKE2B 241e71795acfdcbf90070ef0d14f0cc55894a5cddbf48bd8741cf9580cfcaa035890b23a2182738875ce4d89d099a80d59aa7b1937e4a34a18a5a969830e7db9 SHA512 18093f4d419fbc90f957a04ec3e36a153b3c51a6bcdc1ac5884adcc0292f157bc5e4af51e171451a4b54b5bccffdee2e8a07ed13dafb6106773abfb06b6a8a4f
-EBUILD marco-1.22.0.ebuild 1405 BLAKE2B 32af147cdcf6b7d6d4b9cb687624f15f73255e5922e371386ff51df96e544c50bf96e396dcb0be565a3dcbc8b0426c7d01ce1b54da2fa204647f1b8c9adf5042 SHA512 f475ee831c03fa06a6c0717b065ff62e98dfacce4bbff364ce585cbd886ce04567dcf9f90598c9012f15caa198f85bc35717a7f10cd4b25c2b1796ac4b25c183
-EBUILD marco-1.22.1-r1.ebuild 1429 BLAKE2B 17fd76fc4cfcfd6570ac90667da481435a766139f8d530c23371812618129209c1436b63654f885add81f109af1b924f01db3d3528311724aa690e9e0acfa951 SHA512 279bb197b2ae0148fe335893d4ca8bdb587accf1478c374aebd37a90540dce0ec43f2351c09017dd3112c95801795e6474e5d83677c01a24effd163c747e392a
+EBUILD marco-1.22.1-r1.ebuild 1427 BLAKE2B 2d16fd758026a09c38811d70231f0da7aa3f2348fb21edb176e8aab85ca7620944b99b790adf9d02d22a9c69c4d6605a653f8fb328225e62b7e3f83a214bdea8 SHA512 cb0889144a3b534dc1cc9e3793e79f1c1752bb23e205a4161da9bd9854ca180e5cb47a6ca752f191d679013344fd18bfd0fbf3d41ddf09e9dca1412ce33f6fd2
 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
deleted file mode 100644
index 72fb645f0b0c..000000000000
--- a/x11-wm/marco/marco-1.22.0.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# 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/marco/marco-1.22.1-r1.ebuild b/x11-wm/marco/marco-1.22.1-r1.ebuild
index 2aebb9ee0bb0..daca97294de1 100644
--- a/x11-wm/marco/marco-1.22.1-r1.ebuild
+++ b/x11-wm/marco/marco-1.22.1-r1.ebuild
@@ -8,7 +8,7 @@ MATE2_LA_PUNT="yes"
 inherit mate
 
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 DESCRIPTION="MATE default window manager"
diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest
index 39e92a1040f0..fb9a37f4ccb9 100644
--- a/x11-wm/mutter/Manifest
+++ b/x11-wm/mutter/Manifest
@@ -5,9 +5,9 @@ AUX 3.28.3-no-gles2-fix.patch 1442 BLAKE2B f5cdaa84bf635d3f729f77ab0d5150a35c19f
 DIST mutter-3.26.2-patchset.tar.xz 48156 BLAKE2B 7b33495a8bb7ac69f5610e1dfcb1fef49a983403fd176b229a75bcc7691e83e76a3dd87b7663ece0fcdc4077becd3ffa5e33217584f156456813769646730bf9 SHA512 2eeb9dfe137d6ea65f957ed19aa5ef83106aa16a049531c0c41d3ab6afac6c1b345cc68f2a9a9c41658172cc0dde61b946e6bf2507979ff4155e79770adf5e90
 DIST mutter-3.26.2.tar.xz 3622904 BLAKE2B b32af24c6ffcd0e6af38ab1ff7cd0ba16ea3ceb84c62ed21d9e38fff5357eda2648050beada3fc8727474407a419a2c218331c8a87f7eb68eddf824d26ca9c51 SHA512 95885b4c053d4bc467a7c11615ee3d1a3086a674ae10e7cb9bb241f692e66dd8190508db1cdf1760bc2f19100e532e68d5e147d344e94d1430d80dd26ca0156b
 DIST mutter-3.30.2-r1-patchset.tar.xz 14096 BLAKE2B 83f2e975a4404b878e832a70fe7a84a2a39d291dc1f6191e5805633327d21fb0796b8b0172a35602bec9c7e879819ebdb189f324cba3f4a4aee232d5e439ba0a SHA512 f842920d6855803b8712e1736399805ecd3266a61dd7baba1f80383978d00533e34fd742103b578f9f2969ab2059f9e0c7b3812d2ea2283b6ffa91810bf6094f
-DIST mutter-3.30.2-r2-patchset.tar.xz 38544 BLAKE2B f4282b9220f49b38ce495939db222f1585e48b8e446d168135e643248b06c26c57c75032f130615dc6d758c44e4628c0431d88bdd2ee23eee1fb64f2929bd51f SHA512 6ceefbc4bdca9b1eb82ce1f3c0847d85922ebc86643fcde4a3bb37201ff50c1d9343ea605572d5942c984d1e87e44597a4febd058fba9fb57224dccb25a10152
+DIST mutter-3.30.2-r3-patchset.tar.xz 30208 BLAKE2B 502e9c1d005cf268548e2732d4574b0eb7491940531c77c357e73e2da23b60acfbb183f9e818edd86cf0d6abca4e43c2e687db27544bb4fe7e9a33a162df01da SHA512 22b66395ffae07b208efa3a1305c71ea2282470a08300a5c3de23a2a45f03afef7804d5943934028286406adedbb9851dc562f4e57fdff77df22591893f0908b
 DIST mutter-3.30.2.tar.xz 3725692 BLAKE2B 280b7a6319e5d4705baee965936df6f31ba8ca96ce3812cf640578c6817aaa82b6ff8fde7b2740ecd8edb6c4746f4608f997772a24d67f12fcb0c5c77fc9b29a SHA512 3890270b7eb4b8753274d30ad26693b829a69b31f36501845c59b000deb174be58b5167f6754767dba02ebc44688697fbe7344a327879a073955047b69333a2e
 EBUILD mutter-3.26.2-r1.ebuild 4036 BLAKE2B ac9aba438fa514748247827c3d6eb87b036c36528fad4818292778605de06423cbb9ef1fce00cca51c4a90581f7429079e563416ab656664e5c3a6d7a45d74ad SHA512 d4d168a12dd1fd3b3f32b036808fd55c976a9234d5f4c4d944fd6c88277d72d260c6e23dea57fd86d7e556029c6a5d6619c8af871e06f60598cbf8bc83388373
 EBUILD mutter-3.30.2-r1.ebuild 4817 BLAKE2B e2128d9fe651f03bff0153be4102245a8da5270614b9cec07528d523e0bde4d5cd86b7f3f5c79437cec0425f8414ff5c57d816f06ba0b830520aa1fee4e50daa SHA512 bd965f23aea6eee86f4e647f3a4b38fdcc54b5fd9abf2c9c6971858940ffbcc73e0244b437635a1d831bdb126e78a360c3c57da12049145b799f7f469e747268
-EBUILD mutter-3.30.2-r2.ebuild 4819 BLAKE2B 0331ce71d812745f6c67112cb52dbf81537540fbef1c4b60b98818020b6083bbe33822e6f3d50a74204bf67d6ebca516daadc998d461460427f54b84eeacc23b SHA512 21c5d1ad6d85a1676ee838562c2c989fdbc5cf5c1b957fe2d5e2e71ffd98f2c11fc1f54de6d9f0f93abffb1a2a3a759b7c8398f43c050d1ffa6f6d5df1bf57dc
+EBUILD mutter-3.30.2-r3.ebuild 4819 BLAKE2B 0331ce71d812745f6c67112cb52dbf81537540fbef1c4b60b98818020b6083bbe33822e6f3d50a74204bf67d6ebca516daadc998d461460427f54b84eeacc23b SHA512 21c5d1ad6d85a1676ee838562c2c989fdbc5cf5c1b957fe2d5e2e71ffd98f2c11fc1f54de6d9f0f93abffb1a2a3a759b7c8398f43c050d1ffa6f6d5df1bf57dc
 MISC metadata.xml 431 BLAKE2B 224bce7cb810d88b198f757a6df09da0ba641a08ec75aba918d0fe4e914a3e572e73a863d88bbbd05ab1be52f10d2b30dc20e3420a79fdaa5893b51e72aea476 SHA512 e66679d251265d2666ef26d927110d647d09dbdf4b6fd1f4f1fbac14a35074bfd77182c78e798cba7e2a4649b2a54c16431620a211f9558f922281c522944b85
diff --git a/x11-wm/mutter/mutter-3.30.2-r2.ebuild b/x11-wm/mutter/mutter-3.30.2-r3.ebuild
index 67f779d74521..67f779d74521 100644
--- a/x11-wm/mutter/mutter-3.30.2-r2.ebuild
+++ b/x11-wm/mutter/mutter-3.30.2-r3.ebuild
diff --git a/x11-wm/qtile/Manifest b/x11-wm/qtile/Manifest
index 16539ef7cbbb..0a7dc4a5a1d7 100644
--- a/x11-wm/qtile/Manifest
+++ b/x11-wm/qtile/Manifest
@@ -1,10 +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.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 1347 BLAKE2B 2ba496381dc3c2a10618fe512eb7157f4c8311aad2541e842ee4582247093fdc556b0063aacc2fcff9abadbc1f0c386ca53a68dda8ecfe6d8a7fe494de5ae64b SHA512 276345657748675f88dfd3a090e910845a4ae909644dff2b9122a3078318a300f76fba653ba37149f14fcf78838cbe61fc16273765d6e2453c4c83113a1ede1b
-EBUILD qtile-0.12.0.ebuild 1702 BLAKE2B 548703fbc6a43470b35a8622917b5d5600324ad2ff941640ef4d6523bfc297e313eab9e1b06f8931d477860fb07473f020d3dc1307459812d8984d0f068800c8 SHA512 24eedbd9999715d680cbdd59538dc4a9c3f9737449eccc1282e911142d51fc67189699ca735e524e54b553ed78a3b58ccfcaffeeed076f6e0c1ff43996fb2c10
+DIST qtile-0.14.2.tar.gz 492274 BLAKE2B b5418424a4cea6844d500ea00b4fa5c4b93d529503a3ece1f651c82cd1c63689d8ba95a706fd97e7d93cf823a6155196d724f18e47f9fe283e4df2586e55b56f SHA512 c6653e8dca24cef4b1cf48c26b2a0feb4bc125a1c966e0a3ea078fd1d1bba9c7306facf620438795aa2d2daecbd6e58bcda954753ab6b27f6c0cbead3766d8c0
 EBUILD qtile-0.13.0.ebuild 1705 BLAKE2B 9c03ba341d125c69278f790fdb0df063e3fba9f9b97462d1a549b705843a30db6fe7c65c1368dd4cf1c0a5ef1c2d4e6bcc937f96e20b2153d3555d1ab5292828 SHA512 dbc30163e830bf421681893bf725cc994c993ffb2a1f2b904ae503f445ddd73335c3266d05b7f881af60deabdb8f576108b19f50b5d47a06957deadf15e109a7
-EBUILD qtile-9999.ebuild 1705 BLAKE2B 3a9cbae556132f29ce0dd03caaccdb4c564cc1ae61115376ca3766711cc1f92d8b941fa44571fda2d7f91d37a0ca9188717394c4d0ab605e9e4419630daa553a SHA512 ee4c74b71e344af8d128244f3b1aa07aa10af2b5d98aaac15b6b8fb6fe5f6585764aa46b1416487a71584e3dd77585b2312248b11d329cc7d284984459b17570
+EBUILD qtile-0.14.2.ebuild 1699 BLAKE2B e1a8d98659a008c27d12e5aaa0f694405b8aa55168600a9fd29c4194b199675d17d479cbc66934960842aed9ad1b6559dd7aca2c7f96cb69af793f9ea357e91e SHA512 ca0926f47f84b5683fa5d56aacc944994c0f59bb5bf08f5569af99e7215fe2b5fc92248e751143ec6c8e26e3b523598527b25095ca901e66cd0f7cc7d2ca0e2f
+EBUILD qtile-9999.ebuild 1699 BLAKE2B e1a8d98659a008c27d12e5aaa0f694405b8aa55168600a9fd29c4194b199675d17d479cbc66934960842aed9ad1b6559dd7aca2c7f96cb69af793f9ea357e91e SHA512 ca0926f47f84b5683fa5d56aacc944994c0f59bb5bf08f5569af99e7215fe2b5fc92248e751143ec6c8e26e3b523598527b25095ca901e66cd0f7cc7d2ca0e2f
 MISC metadata.xml 322 BLAKE2B bdbe4a68aa5f64ac0c4a045653920863b757b661b1966cbedead7b9bc48f0436cf96e30d5e615b265daa57e21b92959f4b38a8bc16c1123c2c2af6709ff981ab SHA512 2722b020cfc1260e907fccc5055ea5556435bd603fe362fbe0ceb0b3074ee20baf6ecc04d2afd6bd9c7b949d0ce0cc06f5c9234f77963374916924d6d7249564
diff --git a/x11-wm/qtile/qtile-0.10.6.ebuild b/x11-wm/qtile/qtile-0.10.6.ebuild
deleted file mode 100644
index efb619558064..000000000000
--- a/x11-wm/qtile/qtile-0.10.6.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5} )
-
-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.3.2[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/trollius[${PYTHON_USEDEP}]' 'python2*')
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		x11-base/xorg-server[kdrive]
-	)
-"
-
-RESTRICT="test"
-
-python_test() {
-	VIRTUALX_COMMAND="nosetests" virtualmake
-}
-
-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-0.12.0.ebuild b/x11-wm/qtile/qtile-0.14.2.ebuild
index 04b9c94bf4b3..d83d014def72 100644
--- a/x11-wm/qtile/qtile-0.12.0.ebuild
+++ b/x11-wm/qtile/qtile-0.14.2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+EAPI=7
+PYTHON_COMPAT=( python3_{5,6,7} )
 
 inherit distutils-r1 virtualx
 
@@ -26,10 +26,10 @@ RDEPEND="
 	x11-libs/cairo[xcb]
 	x11-libs/pango
 	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/cairocffi-0.7[${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.5.0[${PYTHON_USEDEP}]
+	>=dev-python/xcffib-0.8.1[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep 'dev-python/trollius[${PYTHON_USEDEP}]' 'python2*')
 "
 DEPEND="${RDEPEND}
@@ -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/qtile/qtile-9999.ebuild b/x11-wm/qtile/qtile-9999.ebuild
index cc30645b5f15..d83d014def72 100644
--- a/x11-wm/qtile/qtile-9999.ebuild
+++ b/x11-wm/qtile/qtile-9999.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+EAPI=7
+PYTHON_COMPAT=( python3_{5,6,7} )
 
 inherit distutils-r1 virtualx
 
@@ -26,10 +26,10 @@ RDEPEND="
 	x11-libs/cairo[xcb]
 	x11-libs/pango
 	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/cairocffi-0.7[${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.5.0[${PYTHON_USEDEP}]
+	>=dev-python/xcffib-0.8.1[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep 'dev-python/trollius[${PYTHON_USEDEP}]' 'python2*')
 "
 DEPEND="${RDEPEND}