gentoo resync : 22.05.2021

13 files changed, 206 insertions, 125 deletions

diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index 8cdaaa5fd013..7c4181e088d2 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/blackbox/Manifest b/x11-wm/blackbox/Manifest
index 24677bd2e8f1..ee814891cd05 100644
--- a/x11-wm/blackbox/Manifest
+++ b/x11-wm/blackbox/Manifest
@@ -1,5 +1,4 @@
 AUX blackbox.desktop 128 BLAKE2B 3acb8eec34024ad4b5625d76f16206e40cceb11db194a084ba90b160e54824f95f228999128efe76c7c11509e89e85a2e2fa49f0f00f43777a7f65c0afe2ec01 SHA512 340bf82fdfe40fabe698b0fe9ce371395ab82a0570323663a2d1c3f26a36a2b1628dd91fe691a58d22b599f4cde060a005accc7294b9758cc4220d92f226d28d
 DIST blackbox-0.76.tar.gz 394032 BLAKE2B ffefd24277c581ca59216f53c10d5ffacd7231b33c7fd8bfd799a1f93f0b4953ab91f6c8e7061f91ca80036a8a2b8d7b118383e97b8ab58b8f4cd039155760a1 SHA512 bc97ae699820f8291399ce6f2a87ef4486fabcaeda2dc33fbeb31fc6405c01d722a52c85d8dc65ef44bb031e3dda63c326b76aa1bfca3e544bfcab0fac9d1afa
 EBUILD blackbox-0.76-r1.ebuild 1309 BLAKE2B cb145a0cbfcf13316301bd2542e540ef63cdd320c7ab9efb679d795e6ff422737078a13cf545ddb4688f4ecd1a66d761832b0c83bfc2b0d624bdee731c338331 SHA512 54fa4b041833e0643ce420832de7c6a42dc2b1a4b2addd7dfc7281b559225d1c05684fc1742d727d9dde0347c0de1cf1907de37b0ad2e10f5b3c0369e64adfeb
-EBUILD blackbox-0.76.ebuild 1163 BLAKE2B bdd113e78a785fd76f4aa1e98e0a4903053f010901cba52d53b262902842c54851178bd16fb7928abd87962e65565e47d9af493c8216d29144fbaf6e0537259f SHA512 e7b56ba2fed6111fb004f4b87cd5f9db97081a92f6487bde567b43660376157e5d497984ff35dd59e6eb16dc06ea0ec447c5c8bafaacbac5627a54c546ef656b
 MISC metadata.xml 572 BLAKE2B 3b4a1463dc3c3d78c92f1b983b66f3b7eebde350932374e9cdee846566f53c7a4bbdfb97006c8fd4bad8e945b0b4f70893853b8ae3d634c3ad3b9d6bd00e7860 SHA512 e4862cf23928cd2fe0db5b6d70caee609139cc48e1e5d2f5551142165c9c839c8c34ad3e8dbf2fb2e027ce4eef759a6d985063a3e7cc0332a72708262f1c8213
diff --git a/x11-wm/blackbox/blackbox-0.76.ebuild b/x11-wm/blackbox/blackbox-0.76.ebuild
deleted file mode 100644
index 14ccc52ea527..000000000000
--- a/x11-wm/blackbox/blackbox-0.76.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="A small, fast, full-featured window manager for X"
-HOMEPAGE="https://github.com/bbidulock/blackboxwm"
-SRC_URI="https://github.com/bbidulock/blackboxwm/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86"
-IUSE="nls truetype debug"
-
-RDEPEND="x11-libs/libXft
-	x11-libs/libXt
-	nls? ( >=sys-devel/gettext-0.20 )
-	truetype? ( media-libs/freetype )"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-BDEPEND="virtual/pkgconfig"
-
-S="${WORKDIR}"/blackboxwm-${PV}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--sysconfdir=/etc/X11/${PN} \
-		$(use_enable debug) \
-		$(use_enable nls) \
-		$(use_enable truetype xft)
-}
-
-src_install() {
-	dodir /etc/X11/Sessions
-	echo "/usr/bin/blackbox" > "${D}/etc/X11/Sessions/${PN}"
-	fperms a+x /etc/X11/Sessions/${PN}
-
-	insinto /usr/share/xsessions
-	doins "${FILESDIR}/${PN}.desktop"
-
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS ChangeLog* COMPLIANCE README* TODO
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/x11-wm/ctwm/Manifest b/x11-wm/ctwm/Manifest
index a9298c50c59c..cc4dd579362b 100644
--- a/x11-wm/ctwm/Manifest
+++ b/x11-wm/ctwm/Manifest
@@ -1,5 +1,5 @@
 DIST ctwm-4.0.2.tar.xz 672608 BLAKE2B b4dc26b9d6ba5aba0a5f1f71363c25065aec0d4d4be7b9772f51117460062f5d7ea17d338e1ad9a89cf1213ca2125a1d203417bdc3f6c95a9b9969477b443a40 SHA512 445151f12084acd44bcf8a7d895e29363411a1a663b93e098fa9db5b96ae5cb43921eaf0695026aff2196117b810b96712a60570f57d6dabbee7fba34d5bd57f
 DIST ctwm-4.0.3.tar.xz 683684 BLAKE2B d16a47a5cd91ab5305da3c02f874d5ad1c71e2c8a3664cd33d5fa0781f4fdc2613407f5b43b4da16bcf89e323eb34b0888c5dbd02598746195991e7870aba0ef SHA512 f9bb2f8f28a050cce0fc2f1f4e00e79acd7c54055016d8483e045d8f5fa9829f8f5d92bb53f0c1d9500f97d6f52cd827ddd15515c84451ea03551025a8ab831d
 EBUILD ctwm-4.0.2.ebuild 866 BLAKE2B 9f99f0b22eb8ed4b850539a4c68acb7f0dde58751d5966999a50f4c24e1286106e2c8101160481bbc50dc622e3069eeff6012de263608a930b2ec370e0223552 SHA512 8912b11b2c0e233e295ff59127e40d6fcedad4f0fc94cacf2753cc7fa7beb4c98d37d7cf5185f433d21ad88399af7c024faef03360ef02ba1a39777be3b02422
-EBUILD ctwm-4.0.3.ebuild 1271 BLAKE2B 0570ebd3e0bc7794a2fffac00ae9d68ee93ff720522f69e6a76e1aae01eafbb08c9857924e1d6076ae1ff82fc64ef263f08614201d8283e52106440434a3d2ff SHA512 0566ee9ff2ed368c86e3c6a16f21c7cf41187d25d0ea8a88c4c7df075de0b1e7a7c6d8ecdb33ad6dfec4686f256efda743989ecc1340b0ef06b017a29918d6fc
+EBUILD ctwm-4.0.3.ebuild 1270 BLAKE2B 732d501719539fc113467ef780b5fbbcd782caa38dec716f8dd49486dcf9150182814c636465b8872b070d2fb3dead4571f9e7877ae984c7c1eaf84eb9a04332 SHA512 47174eda91abc199eb3bc7758d42713db68bdfe7a7629763d0582bb02f8291c51abcc959af81f14952eb6158275e7fc41f0971c41c9af3f1310f99b79f04ab3d
 MISC metadata.xml 856 BLAKE2B 426cfc4d6e71b0e227ae36597f0a80bc69c20a423952287cb8013b7444aaa699efd5782a6a7ec05703cad50a2c1f19520b6211cd60c896af06382e84a01ca258 SHA512 53fcd34f01714d98356b63928c76c5f115cb2ee5002c80e38ce103377ea15029b2b92ab157bb58de98047b650206a3468bcd891038c7067c40d48646140750ec
diff --git a/x11-wm/ctwm/ctwm-4.0.3.ebuild b/x11-wm/ctwm/ctwm-4.0.3.ebuild
index 5b1573d82a08..86968cd029ff 100644
--- a/x11-wm/ctwm/ctwm-4.0.3.ebuild
+++ b/x11-wm/ctwm/ctwm-4.0.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://ctwm.org/dist/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="jpeg rplay test xpm"
 RESTRICT="!test? ( test )"
 
diff --git a/x11-wm/i3-gaps/Manifest b/x11-wm/i3-gaps/Manifest
index 5f4fc634e0a0..d3a62cfd4cc4 100644
--- a/x11-wm/i3-gaps/Manifest
+++ b/x11-wm/i3-gaps/Manifest
@@ -5,6 +5,6 @@ DIST i3-gaps-4.18.2.tar.gz 3999555 BLAKE2B d825bb4acb76a7909569aa10c6cab517ff08e
 DIST i3-gaps-4.19.1.tar.gz 4189285 BLAKE2B 91dcf3024cfdc01f52eefc53912d5d2264c51683ae1249761fa848593ffea94ee67d7638d07e078477074fa57158d099f668a27f88b7ad3c10e56efb464bb6d9 SHA512 200610a221655beee5c204dca1b2d8fe37c64d9054713605a403ba8973b30460bbc64f9172aa3b262f2f8b477584fca667137147ac076bb06745130f31750a9a
 DIST i3-gaps-4.19.tar.gz 4192134 BLAKE2B cc70e36fd01e777e1e4357d1799777eb42c21f1666759d8730c548773c87e4c2806ae5376703956761a8fc036c5e847a4734cddd695067f684038c1cc9a8905e SHA512 db09203256172cc4807189bbf16d793c9203c908d2e75cbb7d973d1f0338f6e3734afe68ffe1c43ef3e43e5b2c6dba1ab9135625e4d42d10a9ea6f44f673d384
 EBUILD i3-gaps-4.18.2.ebuild 2027 BLAKE2B 93bbcd939e72a2707245e74ad9874183cba84c633b5a834c84edf930cf916b81ddcdb1174204c53294bfec0bf56433d81049423ce9c1c812ca5227424952cb4d SHA512 2222ff5a4d28f6a2dc70dbbbf022c2bcb09e571c8c9681309ac04a785a6b298a57317526a4297d11ab3d79b870c903ee330f266bc083d253809b802f9f3a6791
-EBUILD i3-gaps-4.19.1.ebuild 1761 BLAKE2B 98922037f619cdc9bbfa8a7da9a8316d5ad00a06faee1711c7d60ecc9bcbdd2e0262e82fbfe2dd0ea452887caec38d48b7a718f9d859177ad374927c38d83b7b SHA512 a5ffad13f394a64e35c7e66901d3874e0a1dc75067961e830c14ddc32146764cc2489416d4f49789415090b58d99d3fd4f58422f49719bd5e5ec477cc3f05146
+EBUILD i3-gaps-4.19.1.ebuild 1759 BLAKE2B 3740e7f2cb3aa3a493d1228b2d2caac92041ed60e5fc794362dd12ceb8f0b6b35d8c9646d903969b0361e37d4a5daac268ac599805584358c96d9fcf2c5a0c18 SHA512 028600856d08230b544e47574ceda85f3069c8e544f724d0ebae4f46abad8d4294dc6ab990d6b12ddcc6876c2911c766468a26d458a077cef670c03187825289
 EBUILD i3-gaps-4.19.ebuild 1765 BLAKE2B 4924ca2460b8c1c31e90c23513221ae7e0f900996ce0855eae842f7a8bc01cc3ff78358d36591ec16a191f63a7974897525723684206535973fd95ff64733d65 SHA512 4900cf098c796d05b42dc1222e671a9ada688ed2628aeedc4451aec139eb52150abb1e202edac5ef582f5cf554e47d210db1a3f5f104a59e2c2dc39f32d14586
 MISC metadata.xml 430 BLAKE2B 2d41057b2583b01bd9dffcfd36d73821f582cc3f93595d9db0f0f076a1e4f108acbaec2448e327412e54426472d81cebd5cdbea665b37c42e135c7b09f243105 SHA512 a902d2dd794bac1a42a3a07886ca016593b5201988b0d01983da6e2d612d0a5ac298b631cf5e7ba1adf71bbbb529b7bddfd0474029da6046d94d4d34ad020790
diff --git a/x11-wm/i3-gaps/i3-gaps-4.19.1.ebuild b/x11-wm/i3-gaps/i3-gaps-4.19.1.ebuild
index 861470c91c03..2ad2ea50b59d 100644
--- a/x11-wm/i3-gaps/i3-gaps-4.19.1.ebuild
+++ b/x11-wm/i3-gaps/i3-gaps-4.19.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Airblader/i3/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest
index 5ed6fce31903..8c2aad99cc03 100644
--- a/x11-wm/mutter/Manifest
+++ b/x11-wm/mutter/Manifest
@@ -5,8 +5,10 @@ DIST mutter-3.36.7.tar.xz 2689176 BLAKE2B a3849b254dbe2029736ef760fe4225e63bf1d8
 DIST mutter-3.38.4-r1-patchset.tar.xz 8188 BLAKE2B b9765fbb3514c5b6e0015b98bcb78381db8e5ea991fbb51e5df3e507fe1771e7bf8be8c927dc38fd05281c1019a91e71241f7c7492618cff685bd2a6c57e8b89 SHA512 a1b7e86991d42479b8791f6afe1866b8066bcfa1455907a1628a8a2ee6d231e2ca4d19170be3eb6850e9e2ae844e0ab296d4c914065ba0b3348be650395e1e6c
 DIST mutter-3.38.4.tar.xz 2623788 BLAKE2B 27ca701459b3b70c790c8fec02b5e34eebecf5b4bd11a706a25eea19af0ee5be278835d6f789c4f77df6ec2ab23ae58bb491a0591d1ff51c9dae4690b9dde73f SHA512 a80728a5bd99e727717cb49f0fbfa0db0bb02b64d7e287b4b7e5e848774ea2191db57f8c70d4b1852db201384ac413daa7108472610e8f8986d13744d800fe11
 DIST mutter-40.0.tar.xz 2678364 BLAKE2B 3016216c396e5362a3c92dae44911ab67be6ad38b551ffef772f840fc1202ccd59a6800fe76526bab7ba1adf645a243bc000301ff6b331c949f660380143bcff SHA512 af4fd21e5ea7e2cf1004d6912771279cebb2fc60f51f5c7371fd5f6fefbfbd7e36841de98757b8f116b0d2006c1151ccf74ed03ee62836cf59d2a86eaf48084d
+DIST mutter-40.1.tar.xz 2680816 BLAKE2B 924fd977e1c6669abd5adea1855c3a0a4027ae7e96ab3c6ccbe3d54da5f431e386f9c2f8f060dc9cd066c7414a2bb90a05760fa3413c6805cd8b73cb5d3aed90 SHA512 c2b6603e1d55492916f742f9cb8e15588cb30e78c37de987404ac40d3befa65e417184305ad87fdffc41052a094790f9e324a1ea7482e5de4f0439dceefed118
 EBUILD mutter-3.36.7-r1.ebuild 4749 BLAKE2B 69075255e249f22d91a87e440d986cfbd125c91bc878f715a1430d90996bf4183c2281c88b935ca44b8940ddf4f7850f5a42d7550f138ddead7eb6ddd62a4a8e SHA512 c2a5b423e410bb6a8a9304acea03fbefba0ce3385d3dabb8adc46baa63d9daef02a59b051a371b62acdc6acfed3c443a8cc229928a2305a11766005ded637c2a
 EBUILD mutter-3.38.4-r1.ebuild 4739 BLAKE2B c39939561c7ddadef9efe20907e90cc6619c1db5574053064a1b269ef102da613e7f5acc542e15f9ad8274f41241edeb28e7986b6974fd4dcd19273748870330 SHA512 880a8e30fb0919f59f4f3d1ed635dfcfcdb6398b4601409fc03011fc823e6a7834de5e465817c838ef9cd1bfc72752de9f02005b92d8c90a98e180e61b5e9182
 EBUILD mutter-3.38.4.ebuild 4593 BLAKE2B 24c84b5c9810bed46bc79b8e09a695fc2683accf68e21fc206d95e1cf622a53b63c6fe7cc98adad79d6acd17c490264799fe09ac360e410dc82c81573acf7fc4 SHA512 4ea41a5242f3b1fef6a3e627817c056e7c0e6f24492c5fd349557707be33bc6f4490ea403f107d4a0d8a66691b57c0fe25873dcb5acbd418d51df664345c3fe2
 EBUILD mutter-40.0.ebuild 4689 BLAKE2B 39dbbbb9776b7491b11235f1aa295a39ea0280343788ea6757fc203d0ae4e58a91038f40b6fad13369fbdd7303ce0998396a0a3a7ce05b1a74f370348fed0695 SHA512 e6ae741da776e3d9031dfac35f46c510cb897709b6834a6f8a3a685659200dbcc69e41b74c701109fa3fc1b173a31d95df295ea9907dd29846c507fda3c0e054
+EBUILD mutter-40.1.ebuild 4728 BLAKE2B 9007dfc0acbab709de95bf9a44a49d9bf63480753ce346d39f1e535816caeabba29971caebe8e393465decea9ebb849707602c8bf1ef95a22b8171e1b623a74f SHA512 c6af41bce5ed74fe402462930ee56fb72057f9594ac74a773080d46dfa9e1e644ff057182aef513cdb11fe30cca4b77f63a2c89e6533b1402efafedda2b784fb
 MISC metadata.xml 605 BLAKE2B 5dc68fbf8b85c2bf75ea435abe116a9ed7072ec40a45bda28de9cb277a03e5c363487f1c3aa5c60cab5f710e06f15d966790684cac1573676af635e59b3cdfbd SHA512 440e7a33404e218da15c127614d843edcd42c469aced4609c2e7d7d8ec1281c9eceb64aebe406a75e9ba0a05b6be18bbb721257e140f6d334aff6143b1233fb8
diff --git a/x11-wm/mutter/mutter-40.1.ebuild b/x11-wm/mutter/mutter-40.1.ebuild
new file mode 100644
index 000000000000..4546dbe42de1
--- /dev/null
+++ b/x11-wm/mutter/mutter-40.1.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome.org gnome2-utils meson udev virtualx xdg
+
+DESCRIPTION="GNOME 3 compositing window manager based on Clutter"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/mutter/"
+
+LICENSE="GPL-2+"
+SLOT="0/8" # 0/libmutter_api_version - ONLY gnome-shell (or anything using mutter-clutter-<api_version>.pc) should use the subslot
+
+IUSE="elogind input_devices_wacom +introspection screencast sysprof systemd test udev wayland"
+# native backend requires gles3 for hybrid graphics blitting support, udev and a logind provider
+REQUIRED_USE="
+	wayland? ( ^^ ( elogind systemd ) udev )
+	test? ( wayland )"
+RESTRICT="!test? ( test )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+# gnome-settings-daemon is build checked, but used at runtime only for org.gnome.settings-daemon.peripherals.keyboard gschema
+# xorg-server is needed at build and runtime with USE=wayland for Xwayland
+# v3.32.2 has many excessive or unused *_req variables declared, thus currently the dep order ignores those and goes via dependency() call order
+DEPEND="
+	>=x11-libs/libX11-1.7.0
+	>=media-libs/graphene-1.10.2[introspection?]
+	>=x11-libs/gtk+-3.19.8:3[X,introspection?]
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/pango-1.46[introspection?]
+	>=dev-libs/fribidi-1.0.0
+	>=x11-libs/cairo-1.14[X]
+	>=gnome-base/gsettings-desktop-schemas-40.0[introspection?]
+	>=dev-libs/glib-2.67.3:2
+	gnome-base/gnome-settings-daemon
+	>=dev-libs/json-glib-0.12.0[introspection?]
+	gnome-base/gnome-desktop:3=
+	>=x11-libs/libXcomposite-0.4
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	>=x11-libs/libXfixes-3
+	>=x11-libs/libXi-1.7.4
+	x11-libs/libXtst
+	x11-libs/libxkbfile
+	x11-misc/xkeyboard-config
+	>=x11-libs/libxkbcommon-0.4.3[X]
+	x11-libs/libXrender
+	>=x11-libs/libXrandr-1.5.0
+	x11-libs/libxcb
+	x11-libs/libXinerama
+	x11-libs/libXau
+	x11-libs/libICE
+	>=dev-libs/atk-2.5.3[introspection?]
+	>=media-libs/libcanberra-0.26
+	sys-apps/dbus
+	media-libs/mesa[X(+),egl]
+	sysprof? ( >=dev-util/sysprof-capture-3.38.0:4 )
+	wayland? (
+		>=dev-libs/wayland-protocols-1.19
+		>=dev-libs/wayland-1.18.0
+		x11-libs/libdrm:=
+		>=media-libs/mesa-17.3[egl,gbm,wayland,gles2]
+		>=dev-libs/libinput-1.15.0
+		systemd? ( sys-apps/systemd )
+		elogind? ( sys-auth/elogind )
+		x11-base/xorg-server[wayland]
+	)
+	udev? ( >=dev-libs/libgudev-232:=
+		>=virtual/libudev-232-r1:= )
+	x11-libs/libSM
+	input_devices_wacom? ( >=dev-libs/libwacom-0.13 )
+	>=x11-libs/startup-notification-0.7
+	screencast? ( >=media-video/pipewire-0.3.21:0/0.3 )
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+RDEPEND="${DEPEND}
+	gnome-extra/zenity
+"
+DEPEND="${DEPEND}
+	x11-base/xorg-proto
+	sysprof? ( >=dev-util/sysprof-common-3.38.0 )
+"
+# wayland bdepend for wayland-scanner, xorg-server for cvt utility
+BDEPEND="
+	dev-libs/wayland
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	test? ( app-text/docbook-xml-dtd:4.5 )
+	wayland? ( >=sys-kernel/linux-headers-4.4
+		x11-base/xorg-server )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-40.0-Disable-anonymous-file-test.patch
+)
+
+src_configure() {
+	# TODO: Replicate debug vs release meson build type behaviour under our buildtype=plain
+	local emesonargs=(
+		-Dopengl=true
+		#opengl_libname
+		#gles2_libname
+		$(meson_use wayland gles2)
+		-Degl=true
+		-Dglx=true
+		$(meson_use wayland)
+		$(meson_use wayland native_backend)
+		$(meson_use screencast remote_desktop)
+		-Degl_device=false # This should be dependent on wayland,video_drivers_nvidia, once eglstream support is there
+		-Dwayland_eglstream=false # requires packages egl-wayland for wayland-eglstream-protocols.pc
+		$(meson_use udev)
+		-Dudev_dir=$(get_udevdir)
+		$(meson_use input_devices_wacom libwacom)
+		-Dpango_ft2=true
+		-Dstartup_notification=true
+		-Dsm=true
+		$(meson_use introspection)
+		$(meson_use test cogl_tests)
+		$(meson_use wayland core_tests) # core tests require wayland; overall -Dtests option is honored on top, so no extra conditional needed
+		-Dnative_tests=false
+		$(meson_use test clutter_tests)
+		$(meson_use test tests)
+		$(meson_use sysprof profiler)
+		-Dinstalled_tests=false
+		#verbose # Let upstream choose default for verbose mode
+		#xwayland_path
+		# TODO: relies on default settings, but in Gentoo we might have some more packages we want to give Xgrab access (mostly virtual managers and remote desktops)
+		#xwayland_grab_default_access_rules
+	)
+	meson_src_configure
+}
+
+src_test() {
+	glib-compile-schemas "${BUILD_DIR}"/data
+	GSETTINGS_SCHEMA_DIR="${BUILD_DIR}"/data virtx meson_src_test
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/x11-wm/qtile/Manifest b/x11-wm/qtile/Manifest
index 480e417dd0f3..92edd6c957ae 100644
--- a/x11-wm/qtile/Manifest
+++ b/x11-wm/qtile/Manifest
@@ -1,6 +1,6 @@
 AUX qtile-session 1854 BLAKE2B 260c39642f805f9b94e59ab25d9e8d6e53abcb9fbed76f33434fdd2ccd65dc24c71b7ea654ced6393404656f2f26d96dc45a2b7e580190da408a396e76af2897 SHA512 4d7418316f6baeaa28b254f341c74641004bd58444c425f626c92e44bff046ec108d128a9e91c10daae75b222c5758e8f0e8a5e3b778b2af36409f4d4b778cbe
-DIST qtile-0.15.1.tar.gz 522233 BLAKE2B cb5c35ab6b2e22d36c2ef69a3d6367033440a25a1c06dad5c4d455b67aa1ddf2c639451e051abcd40b5a76e93250a54271408bbe09008b44a5ebf0a520b3eb2e SHA512 57dfeeea212346c14b922303b5d2fd950292383a1da3be6bf5ca0880bedaa3adb7ffc121df617cf763fcd1208c44e34a7ba128a1f2a6e8d3042dd6906ece7e20
 DIST qtile-0.16.1.tar.gz 324668 BLAKE2B 1f75f5dbcab6180dcf778e28108e70b6dd01105fa275aadf4a53d96ab84f3b759cb8553bcf3de2011b0990d61adc9269663afa32b83d1aa9c052b00ef9e89358 SHA512 aea42f7f6799a88b586167a57f5b5ab6f1c5bb663dec352d15eb47ce0d37fb23c31d1631cab8178c71be5ae714ec12c35a350377383dba1749a98cd45c22515b
-EBUILD qtile-0.15.1.ebuild 1523 BLAKE2B a365fa9d927e72c0356b3982d455b0cd2aa98c5afa3c5e8f653220d5f761025f8675f72a8d54e8562b721eaddf908b8f07a52d07fd4d5ec03376b8c3a8048e0a SHA512 5ea08eaa0a396ac9157d1e0ba592290e3348264bf61dda1c2f33d2484a02bb14d555fc27e18542d13c40b4b652b69a520b75c4b651f0efa450c8eb8122c18771
-EBUILD qtile-0.16.1.ebuild 1054 BLAKE2B a742ac4720950a0006ecc72ce4b0be81339062e842c87375632c778c4cf5e3713d363f3db61454ee0eb097b033a7785c1057ce67dc6ca648267acd5eb288a2a8 SHA512 2c70f99244911102f5a82344a47ff51b789546f30f1264be661441b1a8bc4e85842a0da20db9a41fcdae3277e64d3e5cf95b1754ba58ffa09a2c9100794a78d6
+DIST qtile-0.17.0.tar.gz 336235 BLAKE2B f2290ab823b31cd8ed512f076018a8df19bbfedbb7d5c6932eee7cd46c341a08af04ed0d99f4391d1b3ccc07eb33015bbf0050c1c5d749bace4fb6dcfcb71ac9 SHA512 bfe51aabef2d48693c5bb7525cf67b1bb99cf3af5a653cd81d523e5adaa4767a43e7a87db14f9b85fae3a9e414af41a2e66736556eb1552d099755ba6f39caeb
+EBUILD qtile-0.16.1.ebuild 1053 BLAKE2B a992609d10a060e1d08adec28af61cd3a92beff3a89b357841ec021bdb8002c923100ff4b75673104eb72a50e66778155c6f10d3cb77aed0cf7998031b7cd28b SHA512 e26c78bd68cc719e5b6bab463080a96a5be2e2b37e7a33932983f6af0231e83acf8b6a862f67f64e65b0b4fdb866cf7284ce6bc762065671b7bfa71e196a2f56
+EBUILD qtile-0.17.0.ebuild 1056 BLAKE2B ff0aff4c6b1464c82e792b82fe3179c680071d030ef90f1da38b1dd6bca956edb46736fff9db53d17fce5e7114a12eef073e5aafe35a4df92ecf8dc2c8047708 SHA512 833007b0276392279dd57250ed43b155424dbc9c4e2acfe34ba1bb774004776146feb6ed1e7471e4dc4b9701b65d29de95a17bee4179656cd7c7376e94782fc3
 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
deleted file mode 100644
index afcf3b32b6e2..000000000000
--- a/x11-wm/qtile/qtile-0.15.1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# 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-0.16.1.ebuild b/x11-wm/qtile/qtile-0.16.1.ebuild
index 87156d77f39d..4107f72cb523 100644
--- a/x11-wm/qtile/qtile-0.16.1.ebuild
+++ b/x11-wm/qtile/qtile-0.16.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 RESTRICT="test"
 
diff --git a/x11-wm/qtile/qtile-0.17.0.ebuild b/x11-wm/qtile/qtile-0.17.0.ebuild
new file mode 100644
index 000000000000..184c59885109
--- /dev/null
+++ b/x11-wm/qtile/qtile-0.17.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit distutils-r1
+
+DESCRIPTION="A full-featured, hackable tiling window manager written in Python"
+HOMEPAGE="http://qtile.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RESTRICT="test"
+
+# requires internet and specific
+# pulseaudio settings
+
+RDEPEND="
+	x11-libs/cairo[X,xcb(+)]
+	x11-libs/pango
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${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}]
+	media-sound/pulseaudio
+"
+
+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}
+}