gentoo resync : 25.11.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-11-25 22:39:15 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-11-25 22:39:15 +0000
commit: d934827bf44b7cfcf6711964418148fa60877668 (patch)
tree: 0625f358789b5e015e49db139cc1dbc9be00428f /x11-wm
parent: 2e34d110f164bf74d55fced27fe0000201b3eec5 (diff)
76 files changed, 708 insertions, 1870 deletions
diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index 6341720f680f..9f2be3e11091 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/aewm/Manifest b/x11-wm/aewm/Manifest
index 566f10047432..69970f3f9540 100644
--- a/x11-wm/aewm/Manifest
+++ b/x11-wm/aewm/Manifest
@@ -2,6 +2,6 @@ AUX aewm-1.3.12-fno-common.patch 493 BLAKE2B b234d4e64d4f2d1287b150df3248eb4a258
 AUX aewm-1.3.12-gentoo.patch 1690 BLAKE2B f8bb7d861f3852d48c4a4919d06138baaabb053546261fbeb8d6f6e79d49f7561381cc02a614cc17998e37d40e000df1def0be71c8417194ea448797c911e6c8 SHA512 39c4d3258b29550fc99ac088c84f83af40645ebe48013f053584dd60baf99d9e58e3c3b4f221835c5ba7da27f6cc66a5d387a74928d596ba4a99a38aabaafb32
 AUX aewm-1.3.12-r1-gentoo.patch 2259 BLAKE2B 427a3286dfdf7170866a2e8b73b14259f390553fb53fc60780c6e5a8c87c224b46d6fcecda2784a17024ded5e513c1ca6be71a5aad5bd7dd6a82e783e6a4c8d6 SHA512 e3039462193018661acf9ed6532c67034a1352e381bb378a41ca3493580dfe847fa244b41389c37b3882fb5d0db4a26b9c6067b25a47134cc2d39f88b53415c9
 DIST aewm-1.3.12.tar.bz2 36677 BLAKE2B f84d272b82408600b10a3d08523219484cfbefff1ea5134284759e8743ae29918ceba842de07c640ca6fbc52c875df93f30f1692239119afcefb5a28ba3aa55e SHA512 69435edf1ba99661464221070ab6708a875056d244ee73b2eba1ed2beefba52ac2418d37e0d8b9f0c7c8a382e9d8740215b9c7098eca4f39cdf73b3c894125f1
-EBUILD aewm-1.3.12-r1.ebuild 864 BLAKE2B 8de17af2034120d176d40c118e218c3893a5a6c3358f3b359178c9bb0bad5b3b73a53f5eebe9661b061b2af62ac83616eb84d6b4fbc79a34acc487908e9d09a1 SHA512 1658eb25f7921ae01336bbb2e5bafab4e22fd01f3146a7aec2f73a95492b2fa5254e84bde4f6d50a736e46199dca3fbbba13c5d9815153fe18d21fadff1ee434
+EBUILD aewm-1.3.12-r1.ebuild 861 BLAKE2B 8d0d4d5539bdb487dfd198e665c95f547e7271be94331c6cb87166798a720a975a9aa3a3cceaee4746438790414eeedc478068354bf701d4c81109fa2166c881 SHA512 d81b797d708481bb305587cf1d49a13e58a3c660602330b625ef04178079dcda3cdf581cc0b93d7b896db97ef110f5f47dea09300ea4ed87a912812520b74fec
 EBUILD aewm-1.3.12.ebuild 951 BLAKE2B 1ff4d9bcc9a1c81ae28eb061ed0d2dd588bee2a57d69621387ead0654284c654b8d2c1dbb7b7978094c799b3263a37ca433e00e9a59e9d732950f20be88392ff SHA512 3b0e6f2b45500c6120f2a813b7e5a031464f22820a0b518c06526d39cc4a5e2a4fcd1f85b929ba57a0b5351d677dfba63fc78a7499879d754a9b0bbd0727d606
-MISC metadata.xml 559 BLAKE2B 262c00ea913f10dccedef6d9b086d19de9b2b210cba0dac9125cad36642149d76b669387682ce1fa09fd96cfc715e618e1cc9c758ab2a66838d6fcf7fdb6a182 SHA512 f9a2092397717d558532432ee9ccb9715923338145485b7655fa84b83d08c89d900c3baf16d60cf3d16e5d495d26f04d889371ab010aa3dc54bdff3d7fa04831
+MISC metadata.xml 517 BLAKE2B db81b6c45753c24205433ed2b9cf2bc9a595f806992475a1d41697b6b92d2c1d18ff8eef0fb9f882b68eb184d317839507b2f1158e5f421f3b8af65fd64291e7 SHA512 7095bff22d6bd655a93e3c1d48b8fecf8e327f1efd07638caba28163ad2a21129ed6f0e2a904113ce629ae25c2ee029d863c7e777f0457caf78f5e71c684b080
diff --git a/x11-wm/aewm/aewm-1.3.12-r1.ebuild b/x11-wm/aewm/aewm-1.3.12-r1.ebuild
index 3efbc6c7a7ed..2c9cb2c2455d 100644
--- a/x11-wm/aewm/aewm-1.3.12-r1.ebuild
+++ b/x11-wm/aewm/aewm-1.3.12-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.red-bean.com/decklin/aewm/${P}.tar.bz2"
 
 LICENSE="MIT 9wm"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 
 RDEPEND="
 	dev-libs/glib:2
diff --git a/x11-wm/aewm/metadata.xml b/x11-wm/aewm/metadata.xml
index abd9614c9fc5..0d6c64592c12 100644
--- a/x11-wm/aewm/metadata.xml
+++ b/x11-wm/aewm/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person"><email>jer@gentoo.org</email></maintainer>
+<!-- maintainer-needed -->
 	<longdescription>
 	aewm is a minimalist window manager for X11. It has no nifty features, 
 	but is light on resources and extremely simple in appearance. It should 
diff --git a/x11-wm/bspwm/Manifest b/x11-wm/bspwm/Manifest
index 0ca7f513fe3c..6add9c549b27 100644
--- a/x11-wm/bspwm/Manifest
+++ b/x11-wm/bspwm/Manifest
@@ -1,4 +1,6 @@
 AUX bspwm-session 1876 BLAKE2B 8e1a9eaf2a1721d2b6272b6f0e1f9692fbab8b94aacf2dd52db7dc4ebd97189d36f6d464e588c06084fd433f16901576ea9f682dd54858b7780a9c8732767fdd SHA512 04d89bdd5ca5a9163e576c41dee9420fff8c51ab4a53aca179060b9f6b348537ad96d4257964e7bc4422d836a21c52f82fdc30a6b7b07c229c9934d7620d90ee
+DIST bspwm-0.9.10.tar.gz 114099 BLAKE2B 0fd14d3605e05146435d408846844b7e5015290f97fdd00683eb5388b43678df42a76f1710660ee8036b7100d79a54400c13bf9450333d573a78846d2124516e SHA512 9ccb98c4e80635a781b3f889d8c3ae621c0926a79e9607268924b78bd11137caf70ee9a1edf5bc137d362d2acbe2984645f58ba31c586e6b017797758a66f9cf
 DIST bspwm-0.9.9.tar.gz 111119 BLAKE2B b4f80f090582c48ff5322bf6b03db5aee5bab1868b39ee3c4a3ca9f46f0f5d243a94bd869f2c91dcfbca22136c632b4fa0a2dee0e5fd2f27bd170b1f85c69545 SHA512 17f70e44667813fafcf0df144ed211df5a4479af6dfaf6e0a6bb7154a7380fa48d6135e8c440b6202d07012b76ac7372f73d4bf2f0c3a6716ed998d2ee4e59a2
+EBUILD bspwm-0.9.10.ebuild 935 BLAKE2B 6883ea5f42eefbab9d6f4aeb6c4bcdb289233e9fa2c44e3682b7de43173b33f1eb8d13c5e917d47cb27a0512f4a7369aaa83a556fa0a2ad39de164d3f9b40d3c SHA512 c462e370fac1f0e7ef638e6990eba31708a1f8ca0f3087adf32a48fc0ad4a89dc345f6be69e5bfeba2cb680e92895bae7d07d7d38496b502a0d8f2f358552803
 EBUILD bspwm-0.9.9.ebuild 946 BLAKE2B 7b9dc2d1d5d6642c68fc1714bcd8110c6b7c61c5f7b4a7316d2d734d5141bf37dd70857422676effdfd8434399015548f42adf0ffd8b397d64a3efd5c9b41a0f SHA512 9233892ed375cf833d2d39afaf7b9c5c5cc94a2abc1abeea73cb77cab599adc46dadbdd7f8da99862c2273236847ea218b12a4ca54a28e3ddb8538847ac9cba1
 MISC metadata.xml 327 BLAKE2B 0ac0432bb0c38fca77a88690a6d85c1ace3569fc8099ce12551fd1cb4d532b3673e3c85b2655222113c4b24f139902967bfe2ad2ba638d8dfdbe874d1c9a8ff6 SHA512 fcafc9a074be2d2a64c868494a8ddb156cbc763e6d31e6999343e72df2d101469275e39eab02fc98c3ff2118203105f9b63d18277ae70997e85e021c7126293b
diff --git a/x11-wm/bspwm/bspwm-0.9.10.ebuild b/x11-wm/bspwm/bspwm-0.9.10.ebuild
new file mode 100644
index 000000000000..3972de1a5a7f
--- /dev/null
+++ b/x11-wm/bspwm/bspwm-0.9.10.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 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 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/dwm/Manifest b/x11-wm/dwm/Manifest
index 6f9f3127e5bf..fb95c28bafa0 100644
--- a/x11-wm/dwm/Manifest
+++ b/x11-wm/dwm/Manifest
@@ -3,4 +3,4 @@ AUX dwm.desktop 118 BLAKE2B e88e7e7376dc18c82c39cf2e07867febc49e0f4749a5e50fd3bc
 DIST dwm-6.2.tar.gz 25273 BLAKE2B 2bb9e5b900a1d73f3eb94cb8454580ec98930dbacbabec1f2bbd394eb96696873434b6ddea4ac95eb9d171de2c09c5d4ca0b30649836f7e25f4769f44d25a6eb SHA512 01abcab954e5b7c20d011e6fd9c28025271fea2e85610c928812f7c6a09f99d7f9e93d11ffc2d6a7aca894b3fa7e507c6c2fe5f26ff5ddcfc650a9bbaaa41e06
 EBUILD dwm-6.2.ebuild 1082 BLAKE2B af26ecd1f549e53bb570170d7ed1d19564c017651d84a0aa09481aec41ec360ee7d6adcfc69470320578de269d6acb15bc360f61a557df26a664513e96717564 SHA512 c07e11b8cd40c564aefa8fd5f253d977b8fd1d8b8216afe02e0a63c755441bace04e5310ea116209cce8b57e85ea86af957e0c4b3d27b3c271f6fa9a9016933e
 EBUILD dwm-9999.ebuild 1051 BLAKE2B b6cb69a1d68690bc904fd8276f60e3a4384cbcb54e7e334fe4562495485a7e382e613cd0481c63634c645c89012ad5a77375b8b9a8e297627ab917493a5a5e20 SHA512 377b6dbc10ef70c55e66af4c89b304ce6f146ccc81041ab814bb30e7bacba809e24383317bf9a932cf49bae025b4951c81f8c42dbb554d8cbe7113fd79f39482
-MISC metadata.xml 464 BLAKE2B daf6e362c09f3fc174b6ea81e49096899f5de5cf070553391ead7ab1cfe2b9a40bcbe6043b49db219ffa305c32e854864c9c94ef3c340c8b59c4bc2de675ff33 SHA512 e089b8fee6ede56ac362879d23548bef3aaf5abfcd6fe12c0ad1446b59068fd63ac840154d3d007d5fb0e2a5230bbe9bb84a397c44704e5dc3087cd9b5e3025d
+MISC metadata.xml 502 BLAKE2B b05ffe00847e6d0b692d8a2767cf8da56a2b3a39a4d9fbf7a85e061a766c7c678cf23aff242d64533ee08fe92c80e23738fad353dfb811ffdf37671e5017ca5f SHA512 4759b9534c9076acafaa85ccb6b56306f616604357b55a95a7dc3bc91f4a05f65042b06069586a2febad362c9c27275faad2821cbcc9045b673ddca1f84e00d9
diff --git a/x11-wm/dwm/metadata.xml b/x11-wm/dwm/metadata.xml
index c6b034596a37..3ea00a40d519 100644
--- a/x11-wm/dwm/metadata.xml
+++ b/x11-wm/dwm/metadata.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>desktop-misc@gentoo.org</email>
-</maintainer>
-<longdescription>
-dwm is a dynamic window manager for X. It manages windows in tiling and
-floating modes. Either mode can be applied dynamically, optimizing the
-environment for the application in use and the task performed.
-</longdescription>
+	<maintainer type="person">
+		<email>gyakovlev@gentoo.org</email>
+		<name>Georgy Yakovlev</name>
+	</maintainer>
+	<longdescription>
+		dwm is a dynamic window manager for X. It manages windows in tiling and
+		floating modes. Either mode can be applied dynamically, optimizing the
+		environment for the application in use and the task performed.
+	</longdescription>
 </pkgmetadata>
diff --git a/x11-wm/e16/Manifest b/x11-wm/e16/Manifest
index 9f86c628e0e3..c913ad4a045d 100644
--- a/x11-wm/e16/Manifest
+++ b/x11-wm/e16/Manifest
@@ -1,6 +1,4 @@
 AUX e16-user-fonts.patch 412 BLAKE2B c3b7e6b0599eb511afe9c6f969f5c529313be2732e4cad2a772c9860427eaf84eb1083fb10ff28853c19a972f734f0b231e78d4862ce5246d9d3bdde6e532c96 SHA512 6fdcbe6191d93cc5c64efb6039cbe9409fd08734a4c99c29482bde06f044b1e6b88c35ef34dc65ce384ecdfb78883022a18885dde6e1bac8ca8192d5f6901c42
-DIST e16-1.0.20.tar.xz 1438516 BLAKE2B 32800ed079eb3c51c34277fa5d49ef7a892c0ccd5956f5f7eb7c34ab2e223fe7a5033b35d53402fa4a18283261a767ac692a5bfa08b46d5ea2a4e5195c656fed SHA512 798225dcfad266febe0911aeeac1a57256c45071e72ed326ae2081efdcf0d110e951f41badf5ece92dd0a40f5e342f80035e46d3c2435eb2f32a08c556893612
 DIST e16-1.0.21.tar.xz 1440484 BLAKE2B ea9521d4939400e292e9e2be6e73770a48d966702897c30babfe036a655ef3c5d9766eca3867e1a84b8fbd934a05c4a0487239a78d641c41a6e93a19feeb70a2 SHA512 0f5984d3c3594bf94338c9b53c681cd40f8cc165a18d7d9e0e6202fdf237ace52d9aac9c5ba04f052f94dfd463dcf558b8015044b4d457114c19a7a27ac23723
-EBUILD e16-1.0.20.ebuild 2934 BLAKE2B 74bb369190c166513dbb7d918ed657f840a21dd1f849b71e1d7b1bed716d9052cc921edf9b052984c42253889d222c3c8dbdd6856a08e4eec6b495bcd0f0193d SHA512 307eb6d0b721a77eb790475f1da9fbdc72829f9c0efe9bb9701b5add6842e2c869ce01a31c9bfa489805c7ba1c04626a3fe2040642e926ddcc46faad8de879ea
-EBUILD e16-1.0.21.ebuild 2934 BLAKE2B 74bb369190c166513dbb7d918ed657f840a21dd1f849b71e1d7b1bed716d9052cc921edf9b052984c42253889d222c3c8dbdd6856a08e4eec6b495bcd0f0193d SHA512 307eb6d0b721a77eb790475f1da9fbdc72829f9c0efe9bb9701b5add6842e2c869ce01a31c9bfa489805c7ba1c04626a3fe2040642e926ddcc46faad8de879ea
+EBUILD e16-1.0.21.ebuild 2948 BLAKE2B e64075e36b879a8367acdab664168ca7a75680cb62267aa71f100645c89594e6139f24f8b0fb9631b7f5a752be7dfaa547f68458177bb318c88bc31f0d95ae2b SHA512 e8f6df7bfa6f9011083a1d6d59b7ceb889ef140ec3bca7498c8193328824e250ae11e39e004c6b0a44e7e61bdcf192ac6d67ce431a74b9a5b73029870a3c2083
 MISC metadata.xml 1636 BLAKE2B 10638b577feb461fedc925dee696ba44bdd2cc3e781c37150bfb50d252777cb33bebbc16b2fbf7c27fa7cd194d1de7871d9037bef690b653c3e197e58af86f52 SHA512 06fc94f51d8ce392cd1dfb3c1ebe96167e9e792c5a707109d3a58779bbd054ea6a13b18351823875d408befb5dac1dcae85ea4bcc7a8d73c7243a72f643da955
diff --git a/x11-wm/e16/e16-1.0.20.ebuild b/x11-wm/e16/e16-1.0.20.ebuild
deleted file mode 100644
index 5d940a12f3f6..000000000000
--- a/x11-wm/e16/e16-1.0.20.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# 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"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-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"
-
-REQUIRED_USE="
-	audiofile? ( sound )
-	opengl? ( xcomposite )
-	sndfile? ( sound )
-	sound? ( ^^ ( sndfile audiofile ) )
-"
-
-BDEPEND="
-	nls? ( sys-devel/gettext )
-	virtual/pkgconfig
-"
-COMMON_DEPEND="
-	media-libs/freetype:2
-	media-libs/imlib2[X]
-	virtual/libiconv
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-misc/xbitmaps
-	dbus? ( sys-apps/dbus )
-	opengl? (
-		media-libs/glu
-		media-libs/mesa
-	)
-	pango? (
-		dev-libs/glib:2
-		x11-libs/pango[X]
-	)
-	sound? (
-		|| (
-			media-sound/apulse[sdk]
-			media-sound/pulseaudio
-		)
-		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 )
-"
-RDEPEND="${COMMON_DEPEND}
-	doc? ( app-doc/e16-docs )
-	nls? ( virtual/libintl )
-	themes? ( x11-themes/e16-themes )
-	!x11-wm/enlightenment:0
-"
-DEPEND="${COMMON_DEPEND}
-	x11-base/xorg-proto
-"
-
-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/e16-1.0.21.ebuild b/x11-wm/e16/e16-1.0.21.ebuild
index 5d940a12f3f6..891c63f37815 100644
--- a/x11-wm/e16/e16-1.0.21.ebuild
+++ b/x11-wm/e16/e16-1.0.21.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/enlightenment/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 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"
@@ -17,6 +17,7 @@ libhack modules nls opengl +pango sndfile sound +themes xcomposite
 REQUIRED_USE="
 	audiofile? ( sound )
 	opengl? ( xcomposite )
+	pango? ( xft )
 	sndfile? ( sound )
 	sound? ( ^^ ( sndfile audiofile ) )
 "
diff --git a/x11-wm/enlightenment/Manifest b/x11-wm/enlightenment/Manifest
index 7243de2e88d3..4ab87fb0e78b 100644
--- a/x11-wm/enlightenment/Manifest
+++ b/x11-wm/enlightenment/Manifest
@@ -1,5 +1,3 @@
-DIST enlightenment-0.24.1.tar.xz 28713452 BLAKE2B 1d4713a4887a687a5425888e65b358cd01fe12e42865799265f5092dc6784eb29c25b5563805d1c7be9856037b0570027c2f01a8eb848299e7729d905e291470 SHA512 3835d898f1fdb96ab6539543e9af910b4a9078372af5cfd90abb33c0d5ecb41496499629c54613e3fec4c230233b69bf1abde68f3ffba4996c69979a526da418
 DIST enlightenment-0.24.2.tar.xz 28716060 BLAKE2B 432722693beaece97eeb318a1120b6101bf76e1536347b824b00ba4378326c093f3333eefa634d7266a59c09dc4337c8bd1f9a4d89e0a4c9a223fdcacd924fa0 SHA512 5d96b17d89e822271048a0a6a8356658fd02680f54da2f15dde7c632752bbf0a396eaf23986164402e61f631e68937b3ba7c29d9dd787ddd470cff4a390abace
-EBUILD enlightenment-0.24.1.ebuild 2838 BLAKE2B 3beb5dde2734c53a3647e7b8ae7c70698030d7c933c66acf290f98037541d2b6225ab0b36e97711122440b9e22a2a1366b3853dc1fbcdfa386ff47d630298d9b SHA512 d863b7bdebe49c476368c00b9eb4022a859cdbea32873bfd692c2f2d4d9af1eb23bddc34f9262c9ff7e2f29aee47788ce5fa977fba80ffa2450f51c1fdf58f9e
-EBUILD enlightenment-0.24.2.ebuild 2845 BLAKE2B d347d2f36eda1ff9a2a5026c4db8f6e4ccd7f198dbfdcae6f73b6c2af99c96ab7d390c7bedb4af599954e4e9d69cc01e7223f96989542bfa62d4e93476a4ff52 SHA512 baf8290219fc7b560ea9c31565c3bc5ab0e5236b670dd575bbb61bdd548672f48b9b37b3d3bca7d0cdf6c31953ea949c8f8d329a905fa6dcf5ddf666670ee4a3
+EBUILD enlightenment-0.24.2-r1.ebuild 2897 BLAKE2B 26188ab06629b984c5ea2fd5ae80051355a5de10b5da127252bffe61aa5efeecc17650f45e596cea2ba33322613f91762da46a4a3778ee9807eeb70b2e760a3a SHA512 77267e1df1557baa2a757722f852062d687c76b759a1e56a312c4a574b58235ad663563f1f359b628e93769a275127a4500ff496f0894d75f456a917cd02c8dd
 MISC metadata.xml 721 BLAKE2B 85587a677b7e22cd1dbfe187c367574ccef7ad88a1bdde00acecc9fc5f62d48adb9e14c2086953287efc728cc616d6d286fde1b659a44404086fef5e6bde90b1 SHA512 6d22a2f8639b3b75fd1113c0b381edc2869d91e5d3d04d6c67c845c15fae9ba0e370918e30b45e89e91c695f873f1d0ef5966f7720ab5e9cd270c6254c792dc5
diff --git a/x11-wm/enlightenment/enlightenment-0.24.1.ebuild b/x11-wm/enlightenment/enlightenment-0.24.1.ebuild
deleted file mode 100644
index cbc938e2391a..000000000000
--- a/x11-wm/enlightenment/enlightenment-0.24.1.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson optfeature xdg-utils
-
-DESCRIPTION="Enlightenment window manager"
-HOMEPAGE="https://www.enlightenment.org"
-SRC_URI="https://download.enlightenment.org/rel/apps/${PN}/${P}.tar.xz"
-
-LICENSE="BSD-2"
-SLOT="0.17/${PV%%_*}"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
-IUSE="acpi bluetooth connman doc geolocation nls pam policykit systemd udisks wayland wifi xwayland"
-
-REQUIRED_USE="xwayland? ( wayland )"
-
-RDEPEND=">=dev-libs/efl-1.24.1[eet,fontconfig,X]
-	virtual/udev
-	x11-libs/libXext
-	x11-libs/libxcb
-	x11-libs/xcb-util-keysyms
-	x11-misc/xkeyboard-config
-	acpi? ( sys-power/acpid )
-	bluetooth? ( net-wireless/bluez )
-	connman? ( dev-libs/efl[connman] )
-	geolocation? ( app-misc/geoclue:2.0 )
-	pam? ( sys-libs/pam )
-	policykit? ( sys-auth/polkit )
-	systemd? ( sys-apps/systemd )
-	udisks? ( sys-fs/udisks:2 )
-	wayland? (
-		>=dev-libs/efl-1.22.0[drm,wayland]
-		dev-libs/wayland
-		x11-libs/libxkbcommon
-		x11-libs/pixman
-	)
-	xwayland? (
-		dev-libs/efl[X,wayland]
-		x11-base/xorg-server[wayland]
-	)"
-BDEPEND="virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local emesonargs=(
-		-D device-udev=true
-		-D install-enlightenment-menu=true
-
-		-D install-sysactions=true
-		-D install-system=true
-		-D mount-eeze=false
-
-		-D packagekit=false
-
-		$(meson_use udisks mount-udisks)
-		$(meson_use bluetooth bluez5)
-		$(meson_use connman)
-		$(meson_use geolocation)
-		$(meson_use nls)
-		$(meson_use pam)
-		$(meson_use policykit polkit)
-		$(meson_use systemd)
-		$(meson_use wayland wl)
-		$(meson_use wifi wireless)
-		$(meson_use xwayland)
-	)
-
-	if ! use wayland; then
-		emesonargs+=(
-			-D wl-buffer=false
-			-D wl-desktop-shell=false
-			-D wl-drm=false
-			-D wl-text-input=false
-			-D wl-weekeyboard=false
-			-D wl-wl=false
-			-D wl-x11=false
-		)
-	fi
-
-	meson_src_configure
-}
-
-src_install() {
-	use doc && local HTML_DOCS=( doc/. )
-	meson_src_install
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-
-	elog "Additional programs to complete full EFL suite: "
-	optfeature "better monitor backlight and brightness controls" app-misc/ddcutil
-	optfeature "office file thumbnails" app-office/libreoffice app-office/libreoffice-bin
-	optfeature "an EFL-based IDE" dev-util/edi
-	optfeature "image viewer" media-gfx/ephoto
-	optfeature "ConnMan user interface for Enlightenment" net-misc/econnman
-	optfeature "system and process monitor" sys-process/evisum
-	optfeature "feature rich terminal emulator" x11-terms/terminology
-	optfeature "a modern flat enlightenment WM theme" x11-themes/e-flat-theme
-	optfeature "a matching GTK theme" x11-themes/e-gtk-theme
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
diff --git a/x11-wm/enlightenment/enlightenment-0.24.2.ebuild b/x11-wm/enlightenment/enlightenment-0.24.2-r1.ebuild
index 6120d4f829f3..5503d259ae4e 100644
--- a/x11-wm/enlightenment/enlightenment-0.24.2.ebuild
+++ b/x11-wm/enlightenment/enlightenment-0.24.2-r1.ebuild
@@ -31,7 +31,11 @@ RDEPEND=">=dev-libs/efl-1.24.1[eet,fontconfig,X]
 	systemd? ( sys-apps/systemd )
 	udisks? ( sys-fs/udisks:2 )
 	wayland? (
-		>=dev-libs/efl-1.22.0[drm,wayland]
+		|| (
+			dev-libs/efl[systemd]
+			dev-libs/efl[elogind]
+		)
+		dev-libs/efl[drm,wayland]
 		dev-libs/wayland
 		x11-libs/libxkbcommon
 		x11-libs/pixman
diff --git a/x11-wm/fluxbox/Manifest b/x11-wm/fluxbox/Manifest
index 20872c09e4d7..084921447f44 100644
--- a/x11-wm/fluxbox/Manifest
+++ b/x11-wm/fluxbox/Manifest
@@ -1,4 +1,5 @@
 AUX fix-hidden-toolbar.patch 5403 BLAKE2B af751babd70eae79729b942c7bb0e49e95c0b9cd74e8dba2890bd20d91714c03834286a8f6fe962e793ba5815a7ef1215c09c276cc6eb219851655f19f8402a5 SHA512 69705c1c24bb7696c59a82dc20ef5319562cfd67b4e9b6903cd5de02744c48bfce132949ed7eae4879bf89a08bebeb592d35d0ce77b24c17ad172740a15215b1
+AUX fluxbox-1.3.7-c++17.patch 899 BLAKE2B a1821355da598474bc7745dc4d96811c77580f35b95debcf37a07a4c1622e86b3bfc7105e7e50dfe22c26f6c5873531f6de2cc04f6c94f87cbf4a08da14b4e85 SHA512 6944ccd734de426c90f4374f8bb5ce64b0c8fe46076577cee80195949f364e3f59a3c72bcb4844f8766794e42c47345587da06cda68deb4e22a8715efa2364af
 AUX fluxbox.desktop 187 BLAKE2B 3486c46b9c1c2bb1526818a991202eb327b31b2ca71690d639c78d57494715d1b66a60d8903c3ecafcf84b3c1fdf44396aee5d1d534a60bf99a31e2a6f14f0e8 SHA512 217baf54698bb553dabfdc5565827eb10e897728a2ff2595f0eb03aaf049784a094c48b7e698b34ce374dd9f81036bebc77cf7136ec7aa9651eeaf8a0b751dd0
 AUX fluxbox.xsession 2004 BLAKE2B 3c242e42ff2c0a633e061def8cd339a1cc980aee20e92ea3aa2d5298bffe3b76c02987b02bf20b5faa9604841fc2b8d947c3dd7123ac5a3793c7d85a51b5cc2c SHA512 ec50e1472af22fc34d2bd7124a63246b3b3c84fd1d6b334888165c7a3e91581065603d63f5742ea555822bf16505117b4d6b5de3c583c85a9cb37befde341f72
 AUX gentoo_style_location-1.1.x.patch 735 BLAKE2B bd441ccd5c2819770543effd6fcbc1b33adf52352cfd0a4802140b32083302e665cfa9fed9c1417698f706fa36d8ae0d9b7e2fa19a983aa8f61292dbca27b9d0 SHA512 0ee58758e7a9c76b0bba1cf252250406ab3fe3a9d50a84d3a485b9fe8e86c88b52b3cc2ae3cca730644af0ff818305e5f5beddd9003abb5fcd74d6914168e220
@@ -7,5 +8,5 @@ AUX styles-menu-commonbox 127 BLAKE2B a216b4b3b94ce1710876676a75fe6657c89b68106e
 AUX styles-menu-fluxbox 117 BLAKE2B 8a72f7739a3fc80f6c5dc31204df4d930111f5279bd6eb8625cbceed770502137c87b2130fed6ce6817b59350bba4ba43127195c720a8f536bdec34eeab5c1bb SHA512 fd68d1d7ceefc70d222e92b3958fe408ebb8bef394d4601a9b8187e53a69fdd0141e83e1b982f2111b5f40c25b26abc7f00a4eb90494c07aaa2ee1e62831e622
 AUX styles-menu-user 93 BLAKE2B a2161d88f4fe85f3b95374186dbdc4c5eed480f631a3b8902545bd7cddcf9c9df74befd58747da7e9382742f7c8c5710be1aff411a83f982ee0d668fbe88a75b SHA512 c4d7ff6f0b074cbf3c0cea1548be63e65953d528cf3aa909371f3650bb1067ce0556cbf390fd7f53d2ea4e5d01c49ba241607682d06478dd41eab97d9e523094
 DIST fluxbox-1.3.7.tar.xz 786492 BLAKE2B ecf50e2eb19949b4a301366eaffc1d5199c17b116b7d19a31392eea632e6320210e1dff24b1794d3427c14206e31d9722d3c21ce24b584c61288233feb564925 SHA512 ab8adb8b5a5e396b6df814c93d7fe5aca3eaaa347ca45c1572ad7da0185dbe1e8981190af9b814112f9831b560e31ba0b7dec7e6af5e3e3e3d9d20f2bd463e01
-EBUILD fluxbox-1.3.7-r4.ebuild 3027 BLAKE2B ddc8b03283a87a3eb6fdda43f1bbf2ac78d3d484cb99787a38fe495a404011ba42d6665edee5bc3a1bcc2bdea4407f02649bb0838146a381312ef1d409a800fc SHA512 f815a98348ce4e5e6fc52b612448d23ad1d1953c92d853d241aef4ea3d2ebcc78a9bd0e21f76859f7393dafad403466e6e70068724ab575b30c1e31488b67681
+EBUILD fluxbox-1.3.7-r4.ebuild 3072 BLAKE2B ce100de155dd674c1fa6a4fd601c70255f1312571f441c24541793acc6074e4b5c8e3c8a10596db0876e8783eb9655387655413b8cceed79ecb53931d2682f67 SHA512 98ed088be26539220579a8f13405df71937a1d8b5a7e5fe330334bc08c02028fbff7ada4855bd3cc72bc208d6a65bb2babe645981609caaa7e45e9f31a968add
 MISC metadata.xml 892 BLAKE2B 83aa00ca67e0a6239d9086b9550969068155e9dee4a6dcca0340e553bd43097e9700bd68637bb0a94d0051b8b19a2a5abc2147ac16e0ae7b28836d7a9b79ae4d SHA512 fd8410c6214cf63d781b148ee2add0c46cfbd050cc22412afef43f3b2cfb6eca9a97f66518f138db0d5f695dcca522fccf44c422e481589718ab14394b8d741a
diff --git a/x11-wm/fluxbox/files/fluxbox-1.3.7-c++17.patch b/x11-wm/fluxbox/files/fluxbox-1.3.7-c++17.patch
new file mode 100644
index 000000000000..37e450b08f16
--- /dev/null
+++ b/x11-wm/fluxbox/files/fluxbox-1.3.7-c++17.patch
@@ -0,0 +1,28 @@
+http://git.fluxbox.org/fluxbox.git/patch/?id=22866c4d30f5b289c429c5ca88d800200db4fc4f
+https://bugs.gentoo.org/732782
+
+From 22866c4d30f5b289c429c5ca88d800200db4fc4f Mon Sep 17 00:00:00 2001
+From: John Sennesael <john@aminking.com>
+Date: Mon, 2 Nov 2015 15:14:32 -0600
+Subject: fixes bug #1138
+
+---
+ util/fluxbox-remote.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/util/fluxbox-remote.cc b/util/fluxbox-remote.cc
+index 59852e6..504015b 100644
+--- a/util/fluxbox-remote.cc
++++ b/util/fluxbox-remote.cc
+@@ -73,7 +73,7 @@ int main(int argc, char **argv) {
+     if (strcmp(cmd, "result") == 0) {
+         XTextProperty text_prop;
+         if (XGetTextProperty(disp, root, &text_prop, atom_result) != 0
+-            && text_prop.value > 0
++            && text_prop.value != 0
+             && text_prop.nitems > 0) {
+ 
+             printf("%s", text_prop.value);
+-- 
+cgit v0.11.2
+
diff --git a/x11-wm/fluxbox/fluxbox-1.3.7-r4.ebuild b/x11-wm/fluxbox/fluxbox-1.3.7-r4.ebuild
index 762963c89327..1acca6751070 100644
--- a/x11-wm/fluxbox/fluxbox-1.3.7-r4.ebuild
+++ b/x11-wm/fluxbox/fluxbox-1.3.7-r4.ebuild
@@ -34,6 +34,10 @@ BDEPEND="bidi? ( virtual/pkgconfig )
 DEPEND="${RDEPEND}
 	x11-base/xorg-proto"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-c++17.patch
+)
+
 src_prepare() {
 	default
 	# We need to be able to include directories rather than just plain
diff --git a/x11-wm/goomwwm/Manifest b/x11-wm/goomwwm/Manifest
index 9ebf4c229656..390c27d32ebc 100644
--- a/x11-wm/goomwwm/Manifest
+++ b/x11-wm/goomwwm/Manifest
@@ -1,6 +1,6 @@
 DIST goomwwm-1.0.0-github.tar.gz 406143 BLAKE2B 0118dfec32a3598b0a23b3421643a211386c1bc302d523a4a63a78e34ba9f0673b0bae18b27b491ab153e3e0fb8031123c56425ac007c20651fb3ec8484ab7a5 SHA512 e37d80c8ea47fe136172c392521ec8d4dab361c3469d3d1626ed7c30385513301983c0ffde39f4c2e6f2dee8709da6a34f14f7bb89776f1ccde5103ab1a26764
 DIST goomwwm-1.0.0.tar.gz 69967 BLAKE2B 562666d3a2d9121d07f00a339776f8c510f04eefae0f49f3f9475af250803194b8f4b1eb2673799f3f8b365a6623e5c1b1e49e009ed830699fca51a0846c0ffa SHA512 a2d486e7b97ef3dd0c6eb0702a21e51853ed1456aee7c1d11c90561a62218a4970a61ebb9ba7551428d72035066d7be445a952083baf9c53957e351ad8f4b5de
-EBUILD goomwwm-1.0.0-r1.ebuild 779 BLAKE2B 2cbfebf0d3b0e47e998b6aad75e19159679ba0e7218c14a3e20444597e7d412b0744ae4b49049590eded18a26332418dd9f03fa2db63df8727e6d8f3cf26fef8 SHA512 73086daaf768182e78bb525dc96275797bbed468c7794771bc0fae291488b8e136b914667ed39349561e011da6ce0802cfe7ae6296cdc14827012417e46b1694
-EBUILD goomwwm-1.0.0.ebuild 730 BLAKE2B 077ed6e144bd53b2db8970a219fcb249826bb2aea72a6083c960f1cd1d09905572bfd130928e78a38258fd4239f280ac623ec74d241db68bad0cb3d0f2f4a836 SHA512 b89d3655c8cb3d275517bf2de3323fd18e4e7b48314b84ba92a9e8435ec83438a70d837b7cfdb83a3eb0c703a9a0e42dafca52b34c91966d7faac65ff31e556f
-EBUILD goomwwm-9999.ebuild 738 BLAKE2B 360df4a4138006fef561709b1ab905a0c7915c49451359366af98a0283b8c3c06f5f349d27087970cdfce15c699178ca17a974e6b9b67c44d7f48b343cea84ff SHA512 90ff646a22fe8a2afb78bf03b9162b03cbd2405c1348df6e34d8ec5e38724aa53de17af69c0a81edbced5733fcac41a463d6c0d838e23d3ea7d5576d3c5b2897
-MISC metadata.xml 328 BLAKE2B 292932626f6db147c5fda1ac53e606d808a43956fa046e5e65e7843b82a1476f16e1582af3567962bd99b4c5ef301b8a13ef581dbfdb75d460b3e83ed6524127 SHA512 e2a9ef6e4d4867c0a8188d08300444aa9f7e126fa60b1b811ddf2096c43b847cfb4dfda36b0e5f7fe9413ec5b5ac7677f953a10d9f824dc031673a7ca25628d6
+EBUILD goomwwm-1.0.0-r1.ebuild 793 BLAKE2B 490a4295bdabbba0ccee236ce3cfb749b56cd062e7e7c3f3561d35f04d162a7ad76d5756a4987adaf6c3bc9d6279bc5e5f9a2b71a909c0db34f842e0b97b25ce SHA512 7cfc759b3603a529c5f8d155b1cc0fef0afc890952204714501234b3c0e0ce3c2d731c6d5f1376689dbe5d53722c7ce0782e537e87b5a626f4a3b161657e5c5a
+EBUILD goomwwm-1.0.0.ebuild 741 BLAKE2B 51569a0c598ce722c8dd9db2577415613a2240b91f13701c3495680122c90ffdcaa76e201c4be930673f7968aa8b26e1acef2ab0840e02004dcd984e8369f5de SHA512 05822f05bcd943d87aed6ad1a9be461fbd50836a6ec897556842aff54c1dc3e6a95f1bab1bbef1da48e20a6e59c12267e5e8764acbabc117adcc72f2143f9975
+EBUILD goomwwm-9999.ebuild 752 BLAKE2B 80c360c689a694146c97d4fe69d8aa3cb5f591650bd015f4d8b3ce7240a571d48ddb14173418c378e8183361fe56f7843d6e9dfd18f47916f2ef6d286c663e6d SHA512 1e6eb95eac110029267de0e6a1d04f724335782b5a9831482f7feb7808195d25ad182c8bc49405d66f1116bea0c1c072edee5da72f9a72b4e742483be3df8551
+MISC metadata.xml 251 BLAKE2B 6fdd68cc8939870f258fd5749d367c53b66f787e241031f8af90435dc958045b805403d2457a51c6253506a52028ed412f14a405691673edc2e0edc77af43b76 SHA512 6d3cd2984b10fdaf21af0348f49303eae89aee923d8371ce49bee8e3e27d8c3ed595d793d0bdd9adc2b1fab44873f6bebd922eeb9d48c9e6629c6c2fa6c5400e
diff --git a/x11-wm/goomwwm/goomwwm-1.0.0-r1.ebuild b/x11-wm/goomwwm/goomwwm-1.0.0-r1.ebuild
index d52133d6404a..db6647764c2d 100644
--- a/x11-wm/goomwwm/goomwwm-1.0.0-r1.ebuild
+++ b/x11-wm/goomwwm/goomwwm-1.0.0-r1.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit toolchain-funcs
+
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="Get out of my way, Window Manager!"
 HOMEPAGE="https://github.com/seanpringle/goomwwm"
diff --git a/x11-wm/goomwwm/goomwwm-1.0.0.ebuild b/x11-wm/goomwwm/goomwwm-1.0.0.ebuild
index 99f5e273752a..d76d1d60f37d 100644
--- a/x11-wm/goomwwm/goomwwm-1.0.0.ebuild
+++ b/x11-wm/goomwwm/goomwwm-1.0.0.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-inherit eutils toolchain-funcs
+
+inherit eutils flag-o-matic toolchain-funcs
 
 DESCRIPTION="Get out of my way, Window Manager!"
 HOMEPAGE="http://aerosuidae.net/goomwwm/"
diff --git a/x11-wm/goomwwm/goomwwm-9999.ebuild b/x11-wm/goomwwm/goomwwm-9999.ebuild
index c773307175d9..f1597d56c856 100644
--- a/x11-wm/goomwwm/goomwwm-9999.ebuild
+++ b/x11-wm/goomwwm/goomwwm-9999.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit git-r3 toolchain-funcs
+
+inherit flag-o-matic git-r3 toolchain-funcs
 
 DESCRIPTION="Get out of my way, Window Manager!"
 HOMEPAGE="https://github.com/seanpringle/goomwwm"
diff --git a/x11-wm/goomwwm/metadata.xml b/x11-wm/goomwwm/metadata.xml
index c4b90b2e86cb..ccf33057822c 100644
--- a/x11-wm/goomwwm/metadata.xml
+++ b/x11-wm/goomwwm/metadata.xml
@@ -1,10 +1,7 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>jer@gentoo.org</email>
-		<name>Jeroen Roovers</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">seanpringle/goomwwm</remote-id>
 	</upstream>
diff --git a/x11-wm/herbstluftwm/Manifest b/x11-wm/herbstluftwm/Manifest
index df10f60620fd..7905d623ea29 100644
--- a/x11-wm/herbstluftwm/Manifest
+++ b/x11-wm/herbstluftwm/Manifest
@@ -5,4 +5,4 @@ EBUILD herbstluftwm-0.7.2-r1.ebuild 1534 BLAKE2B a88a23d3cdcaf5761198b31112ebeea
 EBUILD herbstluftwm-0.8.2.ebuild 1110 BLAKE2B 2079a99b70b18b38e39876135b44532261bee69a94679f2e7941b5baa9cd16b871386d9160121b5faaa0aad064dc7b9d429f47cd3bf0a6f38d9a309344fc9a1d SHA512 56d405e82d5ba44aa8e33e5d3883a528cc4d7b482ed4d00d4345b6e57705f2115ba16c09c8992e7c73558dff7c79094c303c855e176ce12a8fad878fc9e8701d
 EBUILD herbstluftwm-0.8.3.ebuild 954 BLAKE2B f5cad9f6b9303e33f7c57d9551d49f371cc50acbe0489cf12131ae22beb0291a4b6de8c60995cb39f25746524335e5d250baa2ccf5bc1d7de090414c5d0f5118 SHA512 888d78e245b8183e08cd15cffe4d8af680c3facc0c8b10beeef444106761e001a8db9b7ae0950f5a862546058b8b35bcf5655ade47ce0e84623188e2945c904d
 EBUILD herbstluftwm-9999.ebuild 943 BLAKE2B ec900c2b66998af382063030ca5881673ded5492484ec3fff432472869c1366f40712e64c305de09eba20a81a048fbd720412183d62a597cf0731e51425b9afa SHA512 9b7d43645203175a1435e3a40cb8b6851cdac6d1b552d0b65bfac154fe092e7fe605ef376a57f2d9ff95e5b3bd3e6244cc9e5c58289a72472d8db5f0f675df55
-MISC metadata.xml 210 BLAKE2B bb9591af5406abbf589664053ab6e5cb38933fe6ef97c11609405392b050b26cff8e94e04e85e5798124abd46283bee67b2a74923a5041616df15aaa9cff6da9 SHA512 f7cbe57a24b67a28696f91061ad8bd61d7d4cf3d59d20c3dcc6a4921e29672d00ecf3ece70a8813399d2467ebd626f8f829300e81fc722e9aaa527e213a5fb54
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/x11-wm/herbstluftwm/metadata.xml b/x11-wm/herbstluftwm/metadata.xml
index 5ba62861f1c4..6f49eba8f496 100644
--- a/x11-wm/herbstluftwm/metadata.xml
+++ b/x11-wm/herbstluftwm/metadata.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>jer@gentoo.org</email>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/x11-wm/i3-gaps/Manifest b/x11-wm/i3-gaps/Manifest
index 8f4590475b38..9e88c91c9a0c 100644
--- a/x11-wm/i3-gaps/Manifest
+++ b/x11-wm/i3-gaps/Manifest
@@ -1,10 +1,8 @@
-AUX i3-gaps-4.16-musl.patch 2783 BLAKE2B 9dea47af64b78a77006d3aa641273aa7a77846d4425e1da17424528445450112ab275cdf7098ba8c2a76f1b08561b1d1a852cb9fd4ee4c61e53832ca702ad55d SHA512 fdff65255e7c9b30eefdbf032e04ba568d5b75a5b7dfc5fce1aecaac0f0d376b6bb4f87338e1eaf5f20b1c5882ebfc7349f8ab43c804349b5f5c626f9fc1d340
-AUX i3-gaps-4.17-musl.patch 2135 BLAKE2B 7b8609a5377cafc823798fd0d712d5d81e3de2c746f8d246907bfc791c7ec626cb26a8b3843d337c64bf0c28850703976d384e5a38303d6b5f342cad68eb6b80 SHA512 c6ae3f22d0303da5de7ca4c92734b043a76d7447559fe2ffc308a8d135076cf05ee53ef63eb28c1bd628a1edfb2d1a0ed2d090836cb5fc70f2b882ee1105dad3
 AUX i3-gaps-4.18-musl.patch 2157 BLAKE2B 4fef024279d11e996c5c204f27b5a8b9fb654b392aeef19b92d5c3f9dfb203290fad7c31c003a046ee91c1201d940f3050a950721da8f58bdfd75495cb9be05c SHA512 14f70f067679b952e1ffc1965ea460173799292a33b5df6d3b2ca2c091219d6cd1f14b2d41b187452a83923b5b34cabe218ecb6fa70702accbef7562dd01f021
-DIST i3-gaps-4.16.1.tar.gz 3983420 BLAKE2B f0d5a85b06ce33e1cc177af6da29f9cdf42ed754bb767aa9eaa5ab52f3b9f4f688d251f2a16fb222fc8cf5052e79859891c4185b1325b2ef6c1a813aa220468c SHA512 904c2f63c6a35573f13fd216625c1349ac71de70ae8f0440667c9d76048cdaf30a398ab358f2366d5f46502d87e801713b625cb509a05f39dbca1371d2b8d0e9
-DIST i3-gaps-4.17.1.tar.gz 3991747 BLAKE2B e5ff8293abf41ffbd15c35590a0594861d7c8b70c0f42886ef7f15fb34b8da57a92cf9bcae76576e7db6db9bacc2356722e5653b1cf35b8446716f8845468b4b SHA512 31e47487f6f662f27b2642925f4ddfc553f1fd075e612d0d2661db723897b12eeae0a2bcefa8a43e7f1d4c15aec2222d3a63e37c8f7e1f9fc96567faa380ebff
-DIST i3-gaps-4.18.1.tar.gz 3999609 BLAKE2B 1a7f0d83831505fb8b75c00efeff276d3a837166029ff6d63dec7aa746a0d9c31245fdcf075f27a43f8c7456f178e30c8c8ddc87e30fbc53b244cf141a41aa34 SHA512 63a37e5920b3945be58e54f86b75523499e6b3a8dd9a05a952118e5609c9bd50fedabe05160eef0ebc377020042508a552f2a32272afcf1c913efcf48ac3e460
-EBUILD i3-gaps-4.16.1-r2.ebuild 1727 BLAKE2B a6c81dd66ff5280b58960b05404cd4aa7b2d221db4546f1dfea8ad78451bc448b8d06871d226dfefb16353fcac9262aaffbcfa7edcc055d2b3716470dbfaa5c5 SHA512 8b172d622aebdf34d0cc85f68449f50d1820d0cd9506bafba2aa11d29fb7ce9206e43c55e73c9926637f77083adbe7b15133664ab3a084e2d70176c85bb7b114
-EBUILD i3-gaps-4.17.1-r1.ebuild 1736 BLAKE2B ec7b2e25a1b12dc2bfcbe24944a9ecf5147efebf281da92c852b8aaa8d47ef83554fc48fcd7dbdc4d55f7626a5c8ce0ddede14b072c928b00cc0db28b4eb249e SHA512 36fca124501a8d903b9a4e27e61d7aa49ad1dec67994279207aa879203d59754205b51ad1b9edad9e982032d228fa002e91d544ba0cbba52e047fedc6cca7f58
-EBUILD i3-gaps-4.18.1.ebuild 1736 BLAKE2B ec7b2e25a1b12dc2bfcbe24944a9ecf5147efebf281da92c852b8aaa8d47ef83554fc48fcd7dbdc4d55f7626a5c8ce0ddede14b072c928b00cc0db28b4eb249e SHA512 36fca124501a8d903b9a4e27e61d7aa49ad1dec67994279207aa879203d59754205b51ad1b9edad9e982032d228fa002e91d544ba0cbba52e047fedc6cca7f58
-MISC metadata.xml 322 BLAKE2B bdba5a4519158f97944784fc4e2813c1b8e8d4f6f90d43b3a935e8b2565ecc5d2444c4b7b4d11266263d25a76b5c2dba55ec6535fdaab03129bb022206abbce2 SHA512 d3ca96f88473d21b81c420795c6eee5dd41f43354de85fd549a9ae8127e46f10d00034730bf850ddd6df8607821d30fce17aa349b1b2575f43fd3303a2da1cf6
+AUX i3-gaps-4.18.2-drop-branch-test.patch 524 BLAKE2B 576cd7fa9a077a22c5a575da0bdff130f32013fb184b5278243c29200e61ddc00222f86ea8cff940bbf010c610afdb867fea683d665cdd19abec74d4a6c08bb9 SHA512 adc9b5d01496d6784cabd43161db89550f2cf0be962656c972f44784d3204a8047eca3bd717d80e5c84ee1b891d38fde133a73804d125efe4e7829140171f4a3
+AUX i3-gaps-4.19-fix-docdir.patch 508 BLAKE2B 44aa2a2a7d0b77429345c4b62be66437714851481ca968098596c28aae8769036b8238b0295f4f80ca8e6e0f2c3e25c60130f3b941cb763d2069deb07d884dfd SHA512 8169cd9fdc2a4506af3d93eda672484a43ab30cf99afcdfc10094be36e6fcccf53d416376a475a95a80d34afb6dbec32bb657a81ccc7e5244c23b34717d5201a
+DIST i3-gaps-4.18.2.tar.gz 3999555 BLAKE2B d825bb4acb76a7909569aa10c6cab517ff08ee4d4d29175c9a84686c83f225a8a090c26ad4bf4ef03e2062bf4d48c7e2e2bf70b49f7a67ecad386597fc1602bd SHA512 86c76340d1df40bbd7e804515ae9dda350458d22651bee508f9f141acd3f4ea4025c8f40ddf0cdfe1fc3c6b26cbf5c3900204545468776721857bb104200ee34
+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.ebuild 1765 BLAKE2B 4924ca2460b8c1c31e90c23513221ae7e0f900996ce0855eae842f7a8bc01cc3ff78358d36591ec16a191f63a7974897525723684206535973fd95ff64733d65 SHA512 4900cf098c796d05b42dc1222e671a9ada688ed2628aeedc4451aec139eb52150abb1e202edac5ef582f5cf554e47d210db1a3f5f104a59e2c2dc39f32d14586
+MISC metadata.xml 553 BLAKE2B a975c29cc436e391e4e85bd93b30258dfeb20cdd6f4895641cddb3b933a9674c0ddb9fc325b6b8a9f4e9ede42ebb4c7dbebd9917e14142a3a2b5054ce35d852b SHA512 2df67f18499497b55cbede5d732874cb5fbdb48c489a2e26a024e05b39a3355a0075d4c2b1fb4e42b4d12bf8ef927d9494b7b3a97d6fd52bca7bb1b17f4191bc
diff --git a/x11-wm/i3-gaps/files/i3-gaps-4.16-musl.patch b/x11-wm/i3-gaps/files/i3-gaps-4.16-musl.patch
deleted file mode 100644
index 1e67ec2a3c4f..000000000000
--- a/x11-wm/i3-gaps/files/i3-gaps-4.16-musl.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-From: Natanael Copa <ncopa@alpinelinux.org>
-Patch-Source: https://git.alpinelinux.org/cgit/aports/tree/community/i3wm/musl.patch
-Project-Bug-URL: https://github.com/i3/i3/issues/1859
-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=609306
-
-Musl doesn't implement GLOB_TILDE, which is used by i3 when expanding paths.
-
-This patch replaces usage of GLOB_TILDE in glob() by replacing tilde
-with the content of $HOME - if set - manually.
-
-As mentioned in the i3 bugtracker this is an issue that should be solved by musl.
-
-A patch has been sent to musl upstream, but it hasn't been merged yet:
-http://www.openwall.com/lists/musl/2017/01/17/1
----
---- a/i3bar/src/main.c
-+++ b/i3bar/src/main.c
-@@ -48,14 +48,20 @@ void debuglog(char *fmt, ...) {
-  *
-  */
- static char *expand_path(char *path) {
--    static glob_t globbuf;
--    if (glob(path, GLOB_NOCHECK | GLOB_TILDE, NULL, &globbuf) < 0) {
--        ELOG("glob() failed\n");
--        exit(EXIT_FAILURE);
-+    char *home, *expanded;
-+
-+    if (strncmp(path, "~/", 2) == 0) {
-+        home = getenv("HOME");
-+        if (home != NULL) {
-+            /* new length: sum - 1 (omit '~') + 1 (for '\0') */
-+            expanded = scalloc(strlen(home)+strlen(path), 1);
-+            strcpy(expanded, home);
-+            strcat(expanded, path+1);
-+            return expanded;
-+        }
-     }
--    char *result = sstrdup(globbuf.gl_pathc > 0 ? globbuf.gl_pathv[0] : path);
--    globfree(&globbuf);
--    return result;
-+
-+    return sstrdup(path);
- }
-
- void print_usage(char *elf_name) {
---- a/libi3/resolve_tilde.c
-+++ b/libi3/resolve_tilde.c
-@@ -19,28 +19,18 @@
-  *
-  */
- char *resolve_tilde(const char *path) {
--    static glob_t globbuf;
--    char *head, *tail, *result;
-+    char *home, *expanded;
-
--    tail = strchr(path, '/');
--    head = sstrndup(path, tail ? (size_t)(tail - path) : strlen(path));
--
--    int res = glob(head, GLOB_TILDE, NULL, &globbuf);
--    free(head);
--    /* no match, or many wildcard matches are bad */
--    if (res == GLOB_NOMATCH || globbuf.gl_pathc != 1)
--        result = sstrdup(path);
--    else if (res != 0) {
--        err(EXIT_FAILURE, "glob() failed");
--    } else {
--        head = globbuf.gl_pathv[0];
--        result = scalloc(strlen(head) + (tail ? strlen(tail) : 0) + 1, 1);
--        strcpy(result, head);
--        if (tail) {
--            strcat(result, tail);
-+    if (strncmp(path, "~/", 2) == 0) {
-+        home = getenv("HOME");
-+        if (home != NULL) {
-+            /* new length: sum - 1 (omit '~') + 1 (for '\0') */
-+            expanded = scalloc(strlen(home)+strlen(path), 1);
-+            strcpy(expanded, home);
-+            strcat(expanded, path+1);
-+            return expanded;
-         }
-     }
--    globfree(&globbuf);
-
--    return result;
-+    return sstrdup(path);
- }
diff --git a/x11-wm/i3-gaps/files/i3-gaps-4.17-musl.patch b/x11-wm/i3-gaps/files/i3-gaps-4.17-musl.patch
deleted file mode 100644
index d4f9113e6b15..000000000000
--- a/x11-wm/i3-gaps/files/i3-gaps-4.17-musl.patch
+++ /dev/null
@@ -1,71 +0,0 @@
---- a/i3bar/src/main.c
-+++ b/i3bar/src/main.c
-@@ -48,14 +48,20 @@ void debuglog(char *fmt, ...) {
-  *
-  */
- static char *expand_path(char *path) {
--    static glob_t globbuf;
--    if (glob(path, GLOB_NOCHECK | GLOB_TILDE, NULL, &globbuf) < 0) {
--        ELOG("glob() failed\n");
--        exit(EXIT_FAILURE);
-+    char *home, *expanded;
-+
-+    if (strncmp(path, "~/", 2) == 0) {
-+        home = getenv("HOME");
-+        if (home != NULL) {
-+            /* new length: sum - 1 (omit '~') + 1 (for '\0') */
-+            expanded = scalloc(strlen(home)+strlen(path), 1);
-+            strcpy(expanded, home);
-+            strcat(expanded, path+1);
-+            return expanded;
-+        }
-     }
--    char *result = sstrdup(globbuf.gl_pathc > 0 ? globbuf.gl_pathv[0] : path);
--    globfree(&globbuf);
--    return result;
-+
-+    return sstrdup(path);
- }
-
- void print_usage(char *elf_name) {
---- a/libi3/resolve_tilde.c
-+++ b/libi3/resolve_tilde.c
-@@ -19,28 +19,18 @@
-  *
-  */
- char *resolve_tilde(const char *path) {
--    static glob_t globbuf;
--    char *head, *tail, *result;
-+    char *home, *expanded;
-
--    tail = strchr(path, '/');
--    head = sstrndup(path, tail ? (size_t)(tail - path) : strlen(path));
--
--    int res = glob(head, GLOB_TILDE, NULL, &globbuf);
--    free(head);
--    /* no match, or many wildcard matches are bad */
--    if (res == GLOB_NOMATCH || globbuf.gl_pathc != 1)
--        result = sstrdup(path);
--    else if (res != 0) {
--        err(EXIT_FAILURE, "glob() failed");
--    } else {
--        head = globbuf.gl_pathv[0];
--        result = scalloc(strlen(head) + (tail ? strlen(tail) : 0) + 1, 1);
--        strcpy(result, head);
--        if (tail) {
--            strcat(result, tail);
-+    if (strncmp(path, "~/", 2) == 0) {
-+        home = getenv("HOME");
-+        if (home != NULL) {
-+            /* new length: sum - 1 (omit '~') + 1 (for '\0') */
-+            expanded = scalloc(strlen(home)+strlen(path), 1);
-+            strcpy(expanded, home);
-+            strcat(expanded, path+1);
-+            return expanded;
-         }
-     }
--    globfree(&globbuf);
-
--    return result;
-+    return sstrdup(path);
- }
diff --git a/x11-wm/i3-gaps/files/i3-gaps-4.18.2-drop-branch-test.patch b/x11-wm/i3-gaps/files/i3-gaps-4.18.2-drop-branch-test.patch
new file mode 100644
index 000000000000..f6312fd0bf8f
--- /dev/null
+++ b/x11-wm/i3-gaps/files/i3-gaps-4.18.2-drop-branch-test.patch
@@ -0,0 +1,11 @@
+diff --git a/testcases/t/193-ipc-version.t b/testcases/t/193-ipc-version.t
+index d5f4badf..1f911a63 100644
+--- a/testcases/t/193-ipc-version.t
++++ b/testcases/t/193-ipc-version.t
+@@ -32,6 +32,4 @@ cmp_ok($version->{minor}, '>', 0, 'minor version > 0');
+ 
+ is(int($version->{minor}), $version->{minor}, 'minor version is an integer');
+ is(int($version->{patch}), $version->{patch}, 'patch version is an integer');
+-like($version->{human_readable}, qr/branch/, 'human readable version contains branch name');
+-
+ done_testing;
diff --git a/x11-wm/i3-gaps/files/i3-gaps-4.19-fix-docdir.patch b/x11-wm/i3-gaps/files/i3-gaps-4.19-fix-docdir.patch
new file mode 100644
index 000000000000..6917aa091dff
--- /dev/null
+++ b/x11-wm/i3-gaps/files/i3-gaps-4.19-fix-docdir.patch
@@ -0,0 +1,22 @@
+diff --git a/meson.build b/meson.build
+index 11541e21..a6f8974e 100644
+--- a/meson.build
++++ b/meson.build
+@@ -642,7 +642,7 @@ if get_option('docs')
+       '@OUTPUT@',
+     ],
+     install: true,
+-    install_dir: join_paths(get_option('datadir'), 'doc', 'i3'),
++    install_dir: docdir,
+   )
+ 
+   custom_target(
+@@ -655,7 +655,7 @@ if get_option('docs')
+       '@OUTPUT@',
+     ],
+     install: true,
+-    install_dir: join_paths(get_option('datadir'), 'doc', 'i3'),
++    install_dir: docdir,
+   )
+ endif
+ 
diff --git a/x11-wm/i3-gaps/i3-gaps-4.16.1-r2.ebuild b/x11-wm/i3-gaps/i3-gaps-4.16.1-r2.ebuild
deleted file mode 100644
index 6c96e3a29216..000000000000
--- a/x11-wm/i3-gaps/i3-gaps-4.16.1-r2.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools out-of-source
-
-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="doc"
-
-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="
-	app-text/asciidoc
-	app-text/xmlto
-	dev-lang/perl
-	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
-	eautoreconf
-	cat <<- EOF > "${T}"/i3wm
-		#!/bin/sh
-		exec /usr/bin/i3
-	EOF
-}
-
-my_src_configure() {
-	# disable sanitizer: otherwise injects -O0 -g
-	local myeconfargs=(
-		$(use_enable doc docs)
-		--enable-debug=no
-		--enable-mans
-		--disable-sanitizers
-	)
-	econf "${myeconfargs[@]}"
-}
-
-my_src_install_all() {
-	doman "${BUILD_DIR}"/man/*.1
-	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/i3-gaps/i3-gaps-4.17.1-r1.ebuild b/x11-wm/i3-gaps/i3-gaps-4.17.1-r1.ebuild
deleted file mode 100644
index 760a674fe049..000000000000
--- a/x11-wm/i3-gaps/i3-gaps-4.17.1-r1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools out-of-source
-
-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 ~ppc64 ~x86"
-IUSE="doc"
-
-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="
-	app-text/asciidoc
-	app-text/xmlto
-	dev-lang/perl
-	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
-	eautoreconf
-	cat <<- EOF > "${T}"/i3wm
-		#!/bin/sh
-		exec /usr/bin/i3
-	EOF
-}
-
-my_src_configure() {
-	# disable sanitizer: otherwise injects -O0 -g
-	local myeconfargs=(
-		$(use_enable doc docs)
-		--enable-debug=no
-		--enable-mans
-		--disable-sanitizers
-	)
-	econf "${myeconfargs[@]}"
-}
-
-my_src_install_all() {
-	doman "${BUILD_DIR}"/man/*.1
-	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/i3-gaps/i3-gaps-4.18.1.ebuild b/x11-wm/i3-gaps/i3-gaps-4.18.2.ebuild
index 760a674fe049..61451b2c94d4 100644
--- a/x11-wm/i3-gaps/i3-gaps-4.18.1.ebuild
+++ b/x11-wm/i3-gaps/i3-gaps-4.18.2.ebuild
@@ -11,11 +11,11 @@ SRC_URI="https://github.com/Airblader/i3/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="doc"
+KEYWORDS="amd64 ~ppc64 x86"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
 
-DEPEND="
-	dev-libs/glib:2
+CDEPEND="dev-libs/glib:2
 	dev-libs/libev
 	dev-libs/libpcre
 	dev-libs/yajl
@@ -30,32 +30,43 @@ DEPEND="
 	x11-libs/xcb-util-wm
 	x11-libs/xcb-util-xrm
 "
+DEPEND="${CDEPEND}
+	test? (
+		dev-perl/ExtUtils-PkgConfig
+		dev-perl/IPC-Run
+		dev-perl/Inline
+		dev-perl/Inline-C
+		dev-perl/X11-XCB
+		dev-perl/XS-Object-Magic
+		x11-base/xorg-server[xephyr,xvfb]
+		x11-misc/xvfb-run
+	)
+"
 BDEPEND="
 	app-text/asciidoc
 	app-text/xmlto
 	dev-lang/perl
 	virtual/pkgconfig
 "
-RDEPEND="${DEPEND}
+RDEPEND="${CDEPEND}
 	dev-lang/perl
 	dev-perl/AnyEvent-I3
 	dev-perl/JSON-XS
 	!x11-wm/i3
 "
 
-S=${WORKDIR}/i3-${PV}
+S="${WORKDIR}/i3-${PV}"
 
 DOCS=( RELEASE-NOTES-$(ver_cut 1-3) )
 
-PATCHES=( "${FILESDIR}/${PN}-$(ver_cut 1-2)-musl.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-$(ver_cut 1-2)-musl.patch"
+	"${FILESDIR}/${PN}-4.18.2-drop-branch-test.patch"
+)
 
 src_prepare() {
 	default
 	eautoreconf
-	cat <<- EOF > "${T}"/i3wm
-		#!/bin/sh
-		exec /usr/bin/i3
-	EOF
 }
 
 my_src_configure() {
@@ -74,7 +85,10 @@ my_src_install_all() {
 	einstalldocs
 
 	exeinto /etc/X11/Sessions
-	doexe "${T}"/i3wm
+	newexe - i3wm <<- EOF
+		#!/usr/bin/env sh
+		exec /usr/bin/i3
+	EOF
 }
 
 pkg_postinst() {
diff --git a/x11-wm/i3-gaps/i3-gaps-4.19.ebuild b/x11-wm/i3-gaps/i3-gaps-4.19.ebuild
new file mode 100644
index 000000000000..be6619cfd961
--- /dev/null
+++ b/x11-wm/i3-gaps/i3-gaps-4.19.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson optfeature
+
+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 ~ppc64 ~x86"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+COMMON_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
+"
+DEPEND="${COMMON_DEPEND}
+	test? (
+		dev-perl/ExtUtils-PkgConfig
+		dev-perl/IPC-Run
+		dev-perl/Inline
+		dev-perl/Inline-C
+		dev-perl/X11-XCB
+		dev-perl/XS-Object-Magic
+		x11-apps/xhost
+		x11-base/xorg-server[xephyr,xvfb]
+		x11-misc/xvfb-run
+	)
+"
+BDEPEND="app-text/asciidoc
+	app-text/xmlto
+	dev-lang/perl
+	virtual/pkgconfig
+"
+RDEPEND="${COMMON_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}-4.18-musl.patch"
+	"${FILESDIR}/${PN}-4.19-fix-docdir.patch"
+)
+
+src_configure() {
+	local emesonargs=(
+		-Ddocdir="/usr/share/doc/${PF}"
+		-Ddocs=$(usex doc true false)
+		-Dmans=true
+	)
+
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	exeinto /etc/X11/Sessions
+	newexe - i3wm <<- EOF
+		#!/usr/bin/env sh
+		exec /usr/bin/i3
+	EOF
+}
+
+pkg_postinst() {
+	optfeature "Application launcher" x11-misc/dmenu
+	optfeature "Simple screen locker" x11-misc/i3lock
+	optfeature "Status bar generator" x11-misc/i3status
+}
diff --git a/x11-wm/i3-gaps/metadata.xml b/x11-wm/i3-gaps/metadata.xml
index 1a5dfaf1b54d..fbc9f7517917 100644
--- a/x11-wm/i3-gaps/metadata.xml
+++ b/x11-wm/i3-gaps/metadata.xml
@@ -5,6 +5,14 @@
 		<email>johu@gentoo.org</email>
 		<name>Johannes Huber</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>jchelmert3@posteo.net</email>
+		<name>John Helmert III</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">Airblader/i3</remote-id>
 	</upstream>
diff --git a/x11-wm/i3/Manifest b/x11-wm/i3/Manifest
index 18ddc7d9bc5b..283118e919c2 100644
--- a/x11-wm/i3/Manifest
+++ b/x11-wm/i3/Manifest
@@ -1,14 +1,10 @@
 AUX i3-4.16-musl-GLOB_TILDE.patch 2783 BLAKE2B 9dea47af64b78a77006d3aa641273aa7a77846d4425e1da17424528445450112ab275cdf7098ba8c2a76f1b08561b1d1a852cb9fd4ee4c61e53832ca702ad55d SHA512 fdff65255e7c9b30eefdbf032e04ba568d5b75a5b7dfc5fce1aecaac0f0d376b6bb4f87338e1eaf5f20b1c5882ebfc7349f8ab43c804349b5f5c626f9fc1d340
-AUX i3-musl-GLOB_TILDE.patch 2828 BLAKE2B 6ab0b8e92aacfe648891da99ad6ae7058b7abcd9bb0d54d062ccfe45d6b1b56039b38272afb725605df77eaefc0e82167588637dd60204abc1b22a59ced9e8e7 SHA512 8ccf5c558327f099ac6881bc3a5b2006aac491f21fea429a4b7184594974815836f3eea517a33b8e852ba30b913bcd3637b08ea92c0bc1f5d3d9f778c2ce087a
-DIST i3-4.14.tar.gz 3936748 BLAKE2B 42678130be56bc695e5700e978ddbd34bfdaeda7a65252a05568581d76fe613e80e710f3a507110e7988077fe62048bf984d4009e722d877b178206cef600221 SHA512 fe3db78813987a15ed93d182968bcd5139e1d03f29d3e8effd9fce59f87bc8309407af0b2fa5f1cd83b8583e50ea0ade6b8eafc5dda6dea9161832dc9cebfdfe
-DIST i3-4.17.1.tar.bz2 1218418 BLAKE2B eb798eee2b618691ceb47b72c08fe09b09e2913c17fe667fab95426069c86497bff67278bea5fc97fdf90ebdfc6574e68cad36b21036a63d053edced1edf8592 SHA512 af397dc1768ea6530e4b2ce8ef21b20ecff8ab9eebf380df224456173eea4c3bacf28b55c8efcdc70f76f0d66543c163564a94cfd66028221ace481fa3c2913f
-DIST i3-4.18.1.tar.bz2 1217703 BLAKE2B 469a6ac09004f95861655858c47d9e6b2f378152bec7b7c6e7b08f06ee387043b8e2c382f888f14daf806ae8764d934025118e997f072709eee23c5cc52de21d SHA512 b001f539b1daf78be6dd9335a7c0474d30f8d969f79d131391ebd9ca310a058a1cc1234e4a9e60552efd520fc4983571f3c0b8cbd7be978e45957daaf86b3e90
-DIST i3-4.18.2.tar.bz2 1218440 BLAKE2B 55fba66b2399730cb3bc63d76efff18a439aad755c943f06d7622bd7c4d91502b3750cff638b98ef86d6f99746bc1858ffbd9396e2d89a7220f513575879e08a SHA512 997c7cdf32f95ba25cfcd483a09f7e37e5219e4501baefa5c1865ddffd206bc9725211e4082663fab4174dc947b663ff454d343a7e30340ac3ea451f999417fc
+AUX i3-gaps-4.19-fix-docdir.patch 508 BLAKE2B 44aa2a2a7d0b77429345c4b62be66437714851481ca968098596c28aae8769036b8238b0295f4f80ca8e6e0f2c3e25c60130f3b941cb763d2069deb07d884dfd SHA512 8169cd9fdc2a4506af3d93eda672484a43ab30cf99afcdfc10094be36e6fcccf53d416376a475a95a80d34afb6dbec32bb657a81ccc7e5244c23b34717d5201a
+DIST i3-4.18.3.tar.bz2 1218766 BLAKE2B c394bbe9882dc893107f0c948632a3a79c52db75b75b2890f6f43fa60d80ce82d1c8a8c32a8793f59d9a6f929ab038765dbe3813c3c6bc1b79bebbbbde772451 SHA512 61599b79247ec546819bab22666a78fc8dc77eecbcf6055efb6b52720290fa7f72719ac6670396a6dfb54858781e438b5207c15fdf2cf9e2424a1b84ffeb749c
 DIST i3-4.18.tar.bz2 1218591 BLAKE2B 582b7ba3a54edf8dd2657add05eb54a64b7c004761a1a248d91dfcb061cb9df215ff35301c125b11aa69b571daeacd5732b498934c1fb17f69404a101fd16ec8 SHA512 0bbfda7f4b20a92a50ffb6abbfc3f6bfe6bb4c987ad4b5b1791192eb23b8c3389cc9949a699901797370c14de1ff8e12447a3b8ce330ab7d300fafdb60a432ec
-EBUILD i3-4.14-r1.ebuild 2140 BLAKE2B 941ebc7e16c4376bed180964e610ce38ff216b3d8b7c406edc07deb7b91f03390fe1dd064d3288048b1d77b47572ecc9c7d2643c868abd5c0d257b1dac89af22 SHA512 10d791310d6617ce95253d4dafc97291558e229dabea1c8ad44ecb1061d2baa9edeab2aef5c2b36ebceac85171339bddc81d33494f2fb244facc6c256cef2e6b
-EBUILD i3-4.17.1-r1.ebuild 2327 BLAKE2B 8f307ab43874156d97b3db51ac68fef7ca58f3f2381c495d815326076c1368473974143f00f0909ef66b1efb6e0ff2fda4ccfd7161d336e4d80ae6f6f9da5be0 SHA512 9405eaafba8cac4c6918cdd8343f61c558f58460c2a8dcda2321b1ad38e7318f8a7f6a51d4a3afcc450dcdc9a139d8baf158179c9bf6165c421288e1dc99b1e9
-EBUILD i3-4.18.1.ebuild 2133 BLAKE2B f5b1ca5ab47d57102c358e72d958d4b0153d24b41573067f8760f80860150567a16839b5baf9270f80c9ac2daeb751c103a893ca4c8246e7f476f401200451d9 SHA512 6006b8efd31270c81b4ab4047ef22abc15779729d71ff6a6e3ab2a82376bf84c1e19eb80a6e5d22d7f68ea03d78ca088edd9d4c35e9aa5093a39e2d689d6648a
-EBUILD i3-4.18.2.ebuild 2133 BLAKE2B f5b1ca5ab47d57102c358e72d958d4b0153d24b41573067f8760f80860150567a16839b5baf9270f80c9ac2daeb751c103a893ca4c8246e7f476f401200451d9 SHA512 6006b8efd31270c81b4ab4047ef22abc15779729d71ff6a6e3ab2a82376bf84c1e19eb80a6e5d22d7f68ea03d78ca088edd9d4c35e9aa5093a39e2d689d6648a
+DIST i3-4.19.tar.xz 1278600 BLAKE2B 3af5eac9cb618bc3b3da0bca430e1882701802f49e092d1e6fa7a35ceb3f2c0287b66eceeb0123a7dfda9976df06227bec34d7d98873aedc2292a2ba94584d84 SHA512 e9e85dfa099751e95f05e8ed5048535bc669d73c51d3bd7e83740ee79d613f981a1130c35f54fb4725b31d18bed63d6bd5efacce8e086483e28d7c778407653a
+EBUILD i3-4.18.3.ebuild 2133 BLAKE2B f5b1ca5ab47d57102c358e72d958d4b0153d24b41573067f8760f80860150567a16839b5baf9270f80c9ac2daeb751c103a893ca4c8246e7f476f401200451d9 SHA512 6006b8efd31270c81b4ab4047ef22abc15779729d71ff6a6e3ab2a82376bf84c1e19eb80a6e5d22d7f68ea03d78ca088edd9d4c35e9aa5093a39e2d689d6648a
 EBUILD i3-4.18.ebuild 2126 BLAKE2B 29048fa9165965ccd572cbacc8fdcc15697384bb75039c2c77caa3970040b31592359c1aa4b8df9242fd8c455e0b1a44d33c76422a9e603235651828cb7020d3 SHA512 527a652e1c6e05b1730a404c38a612820aebc2619ea8baf63c3403cbaaa8a4a5608ba63586c4f5ab09d7d57225727ed3f1207da317110b2b50b31b224440820c
-EBUILD i3-9999.ebuild 1817 BLAKE2B e812d4a04b34d2afb67da16370baace1a3d3376e2a15f73ff77aabbb8a061104f750abd84721266926bcd4d8f05b60d0014f38643c1a706e3ba5126ce68139f5 SHA512 0a31fd5d8ceeeda0c6f8fe06e595be9aa9f0aeca7547c9a8dc24cb2f6c0034255269d256cd88f265d77517da7df0cc8cd116b02404207cc4163df8e27132e086
+EBUILD i3-4.19-r1.ebuild 2100 BLAKE2B d6db9d136708179704ecac40c31200200661dcd85a1de8122ed87885ca07b3a3b039d394d1b0f2c541964ed58b74ee5ecb610eae868a94fa29c80a31621969e8 SHA512 73f0b934ac6aa89d6f75b1d3f4e41266b8b9170becde54015fbe513adf6a40f4787023ff9d31575edbe9f5d3a9376c5f1a62fb2620eb6e3336b4e2daa9c07a3a
+EBUILD i3-9999.ebuild 2055 BLAKE2B 65c10e891c2dd9971b25ce0e9d4c616aeb77dabca964aba24d2291c9fd57456f1dfb3ae35697e9db9685ccd025ac60e41b2ff03385f352dafa241414d0b2cfa8 SHA512 05d51b87521aeddd0468b114ee61b3d25b1953de5da2f92e548bafc9bf71226674056b5083a35b728f20c2415980a643a94ce55d97a20a8fababac468dbdd54b
 MISC metadata.xml 470 BLAKE2B 1c4fd7b44860934e88fb5165254fe0e8ca7e647c11af9af7d959f240e51002e6a454d9b93b30da8944891a1aa6a989f7a3e2a8af44ba41de174e78745393dd79 SHA512 52eddb56541d1172b04ca3ae646d01e52fb300dd62f5dfeaf2abe9d791965813e87b24a1477743797227bf8d407051f79076d54edb599524f89f3cfc716cc47e
diff --git a/x11-wm/i3/files/i3-gaps-4.19-fix-docdir.patch b/x11-wm/i3/files/i3-gaps-4.19-fix-docdir.patch
new file mode 100644
index 000000000000..6917aa091dff
--- /dev/null
+++ b/x11-wm/i3/files/i3-gaps-4.19-fix-docdir.patch
@@ -0,0 +1,22 @@
+diff --git a/meson.build b/meson.build
+index 11541e21..a6f8974e 100644
+--- a/meson.build
++++ b/meson.build
+@@ -642,7 +642,7 @@ if get_option('docs')
+       '@OUTPUT@',
+     ],
+     install: true,
+-    install_dir: join_paths(get_option('datadir'), 'doc', 'i3'),
++    install_dir: docdir,
+   )
+ 
+   custom_target(
+@@ -655,7 +655,7 @@ if get_option('docs')
+       '@OUTPUT@',
+     ],
+     install: true,
+-    install_dir: join_paths(get_option('datadir'), 'doc', 'i3'),
++    install_dir: docdir,
+   )
+ endif
+ 
diff --git a/x11-wm/i3/files/i3-musl-GLOB_TILDE.patch b/x11-wm/i3/files/i3-musl-GLOB_TILDE.patch
deleted file mode 100644
index d241a748186e..000000000000
--- a/x11-wm/i3/files/i3-musl-GLOB_TILDE.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-From: Natanael Copa <ncopa@alpinelinux.org>
-Patch-Source: https://git.alpinelinux.org/cgit/aports/tree/community/i3wm/musl.patch
-Project-Bug-URL: https://github.com/i3/i3/issues/1859
-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=609306
-
-Musl doesn't implement GLOB_TILDE, which is used by i3 when expanding paths.
-
-This patch replaces usage of GLOB_TILDE in glob() by replacing tilde
-with the content of $HOME - if set - manually.
-
-As mentioned in the i3 bugtracker this is an issue that should be solved by musl.
-
-A patch has been sent to musl upstream, but it hasn't been merged yet:
-http://www.openwall.com/lists/musl/2017/01/17/1
----
---- i3-4.11/i3bar/src/main.c
-+++ i3-4.11/i3bar/src/main.c
-@@ -45,14 +45,20 @@ void debuglog(char *fmt, ...) {
-  *
-  */
- char *expand_path(char *path) {
--    static glob_t globbuf;
--    if (glob(path, GLOB_NOCHECK | GLOB_TILDE, NULL, &globbuf) < 0) {
--        ELOG("glob() failed\n");
--        exit(EXIT_FAILURE);
-+    char *home, *expanded;
-+
-+    if (strncmp(path, "~/", 2) == 0) {
-+        home = getenv("HOME");
-+        if (home != NULL) {
-+            /* new length: sum - 1 (omit '~') + 1 (for '\0') */
-+            expanded = scalloc(strlen(home)+strlen(path), 1);
-+            strcpy(expanded, home);
-+            strcat(expanded, path+1);
-+            return expanded;
-+        }
-     }
--    char *result = sstrdup(globbuf.gl_pathc > 0 ? globbuf.gl_pathv[0] : path);
--    globfree(&globbuf);
--    return result;
-+
-+    return sstrdup(path);
- }
-
- void print_usage(char *elf_name) {
---- i3-4.11/libi3/resolve_tilde.c
-+++ i3-4.11/libi3/resolve_tilde.c
-@@ -19,27 +19,18 @@
-  *
-  */
- char *resolve_tilde(const char *path) {
--    static glob_t globbuf;
--    char *head, *tail, *result;
-+    char *home, *expanded;
-
--    tail = strchr(path, '/');
--    head = sstrndup(path, tail ? (size_t)(tail - path) : strlen(path));
--
--    int res = glob(head, GLOB_TILDE, NULL, &globbuf);
--    free(head);
--    /* no match, or many wildcard matches are bad */
--    if (res == GLOB_NOMATCH || globbuf.gl_pathc != 1)
--        result = sstrdup(path);
--    else if (res != 0) {
--        err(EXIT_FAILURE, "glob() failed");
--    } else {
--        head = globbuf.gl_pathv[0];
--        result = scalloc(strlen(head) + (tail ? strlen(tail) : 0) + 1, 1);
--        strncpy(result, head, strlen(head));
--        if (tail)
--            strncat(result, tail, strlen(tail));
-+    if (strncmp(path, "~/", 2) == 0) {
-+        home = getenv("HOME");
-+        if (home != NULL) {
-+            /* new length: sum - 1 (omit '~') + 1 (for '\0') */
-+            expanded = scalloc(strlen(home)+strlen(path), 1);
-+            strcpy(expanded, home);
-+            strcat(expanded, path+1);
-+            return expanded;
-+        }
-     }
--    globfree(&globbuf);
-
--    return result;
-+    return sstrdup(path);
- }
diff --git a/x11-wm/i3/i3-4.14-r1.ebuild b/x11-wm/i3/i3-4.14-r1.ebuild
deleted file mode 100644
index 8f1c907d1b10..000000000000
--- a/x11-wm/i3/i3-4.14-r1.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="An improved dynamic tiling window manager"
-HOMEPAGE="https://i3wm.org/"
-# iw3m.org tarball for 4.14 is broken, see https://github.com/i3/i3/issues/2905
-SRC_URI="https://github.com/i3/i3/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${P}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="doc debug test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="dev-libs/libev
-	dev-libs/libpcre
-	>=dev-libs/yajl-2.0.3
-	x11-libs/libxcb[xkb]
-	x11-libs/libxkbcommon[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
-	>=x11-libs/cairo-1.14.4[X,xcb(+)]
-	>=x11-libs/pango-1.30.0[X]"
-DEPEND="${CDEPEND}
-	app-text/asciidoc
-	doc? ( app-text/xmlto dev-lang/perl )
-	test? (
-		dev-perl/Module-Install
-	)
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	dev-lang/perl
-	dev-perl/AnyEvent-I3
-	dev-perl/JSON-XS"
-
-# Test without debug will apply optimization levels, which results
-# in type-punned pointers - which in turn causes test failures.
-REQUIRED_USE="test? ( debug )"
-
-DOCS=(
-	"RELEASE-NOTES-${PV}"
-	docs
-)
-PATCHES=(
-	"${FILESDIR}/${PN}-musl-GLOB_TILDE.patch"
-)
-
-src_test() {
-	emake -C "${CBUILD}" check
-}
-
-src_prepare() {
-	default
-
-	cat <<- EOF > "${T}"/i3wm
-		#!/bin/sh
-		exec /usr/bin/i3
-	EOF
-
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable debug)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	emake -C "${CBUILD}"
-}
-
-src_install() {
-	emake -C "${CBUILD}" DESTDIR="${D}" install
-	doman "${CBUILD}"/man/*.1
-
-	use doc && einstalldocs
-
-	exeinto /etc/X11/Sessions
-	doexe "${T}/i3wm"
-}
-
-pkg_postinst() {
-	# Only show the elog information on a new install
-	if [[ ! ${REPLACING_VERSIONS} ]]; then
-		elog "There are several packages that you may find useful with ${PN} and"
-		elog "their usage is suggested by the upstream maintainers, namely:"
-		elog "  x11-misc/dmenu"
-		elog "  x11-misc/i3status"
-		elog "  x11-misc/i3lock"
-		elog "Please refer to their description for additional info."
-	fi
-}
diff --git a/x11-wm/i3/i3-4.17.1-r1.ebuild b/x11-wm/i3/i3-4.17.1-r1.ebuild
deleted file mode 100644
index ef11b20be559..000000000000
--- a/x11-wm/i3/i3-4.17.1-r1.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools out-of-source virtualx
-
-DESCRIPTION="An improved dynamic tiling window manager"
-HOMEPAGE="https://i3wm.org/"
-SRC_URI="https://i3wm.org/downloads/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="doc debug test"
-
-CDEPEND="dev-libs/libev
-	dev-libs/libpcre
-	>=dev-libs/yajl-2.0.3
-	x11-libs/libxcb[xkb]
-	x11-libs/libxkbcommon[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
-	x11-misc/xkeyboard-config
-	>=x11-libs/cairo-1.14.4[X,xcb(+)]
-	>=x11-libs/pango-1.30.0[X]"
-DEPEND="${CDEPEND}
-	test? (
-		dev-perl/AnyEvent
-		>=dev-perl/X11-XCB-0.120.0
-		dev-perl/Inline
-		dev-perl/Inline-C
-		dev-perl/IPC-Run
-		dev-perl/ExtUtils-PkgConfig
-		dev-perl/local-lib
-		>=virtual/perl-Test-Simple-0.940.0
-		x11-base/xorg-server[xephyr]
-	)"
-RDEPEND="${CDEPEND}
-	dev-lang/perl
-	dev-perl/AnyEvent-I3
-	dev-perl/JSON-XS"
-BDEPEND="virtual/pkgconfig"
-
-# Test without debug will apply optimization levels, which results
-# in type-punned pointers - which in turn causes test failures.
-REQUIRED_USE="test? ( debug )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.16-musl-GLOB_TILDE.patch"
-)
-
-# https://github.com/i3/i3/issues/3013
-RESTRICT="test"
-
-src_prepare() {
-	default
-
-	cat <<- EOF > "${T}"/i3wm
-		#!/bin/sh
-		exec /usr/bin/i3
-	EOF
-
-	eautoreconf
-}
-
-my_src_configure() {
-	local myeconfargs=(
-		$(use_enable debug)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-my_src_test() {
-	emake \
-		test.commands_parser \
-		test.config_parser \
-		test.inject_randr15
-
-	virtx perl \
-		-I "${S}/testcases/lib" \
-		-I "${BUILD_DIR}/testcases/lib" \
-		testcases/complete-run.pl
-}
-
-my_src_install_all() {
-	doman man/*.1
-
-	einstalldocs
-	use doc && dodoc -r docs "RELEASE-NOTES-${PV}"
-
-	exeinto /etc/X11/Sessions
-	doexe "${T}/i3wm"
-}
-
-pkg_postinst() {
-	# Only show the elog information on a new install
-	if [[ ! ${REPLACING_VERSIONS} ]]; then
-		elog "There are several packages that you may find useful with ${PN} and"
-		elog "their usage is suggested by the upstream maintainers, namely:"
-		elog "  x11-misc/dmenu"
-		elog "  x11-misc/i3status"
-		elog "  x11-misc/i3lock"
-		elog "Please refer to their description for additional info."
-	fi
-}
diff --git a/x11-wm/i3/i3-4.18.2.ebuild b/x11-wm/i3/i3-4.18.2.ebuild
deleted file mode 100644
index 58a3f832182c..000000000000
--- a/x11-wm/i3/i3-4.18.2.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools out-of-source virtualx
-
-DESCRIPTION="An improved dynamic tiling window manager"
-HOMEPAGE="https://i3wm.org/"
-SRC_URI="https://i3wm.org/downloads/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="doc debug test"
-
-CDEPEND="dev-libs/libev
-	dev-libs/libpcre
-	dev-libs/yajl
-	x11-libs/libxcb[xkb]
-	x11-libs/libxkbcommon[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
-	x11-misc/xkeyboard-config
-	x11-libs/cairo[X,xcb(+)]
-	x11-libs/pango[X]"
-DEPEND="${CDEPEND}
-	test? (
-		dev-perl/AnyEvent
-		dev-perl/X11-XCB
-		dev-perl/Inline
-		dev-perl/Inline-C
-		dev-perl/IPC-Run
-		dev-perl/ExtUtils-PkgConfig
-		dev-perl/local-lib
-		virtual/perl-Test-Simple
-		x11-base/xorg-server[xephyr]
-		x11-misc/xvfb-run
-	)"
-RDEPEND="${CDEPEND}
-	dev-lang/perl
-	dev-perl/AnyEvent-I3
-	dev-perl/JSON-XS"
-BDEPEND="virtual/pkgconfig"
-
-# Test without debug will apply optimization levels, which results
-# in type-punned pointers - which in turn causes test failures.
-REQUIRED_USE="test? ( debug )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.16-musl-GLOB_TILDE.patch"
-)
-
-# https://github.com/i3/i3/issues/3013
-RESTRICT="test"
-
-src_prepare() {
-	default
-
-	cat <<- EOF > "${T}"/i3wm
-		#!/bin/sh
-		exec /usr/bin/i3
-	EOF
-
-	eautoreconf
-}
-
-my_src_configure() {
-	local myeconfargs=(
-		$(use_enable debug)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-my_src_test() {
-	emake check
-}
-
-my_src_install_all() {
-	doman man/*.1
-
-	einstalldocs
-	use doc && dodoc -r docs "RELEASE-NOTES-${PV}"
-
-	exeinto /etc/X11/Sessions
-	doexe "${T}/i3wm"
-}
-
-pkg_postinst() {
-	# Only show the elog information on a new install
-	if [[ ! ${REPLACING_VERSIONS} ]]; then
-		elog "There are several packages that you may find useful with ${PN} and"
-		elog "their usage is suggested by the upstream maintainers, namely:"
-		elog "  x11-misc/dmenu"
-		elog "  x11-misc/i3status"
-		elog "  x11-misc/i3lock"
-		elog "Please refer to their description for additional info."
-	fi
-}
diff --git a/x11-wm/i3/i3-4.18.1.ebuild b/x11-wm/i3/i3-4.18.3.ebuild
index 58a3f832182c..58a3f832182c 100644
--- a/x11-wm/i3/i3-4.18.1.ebuild
+++ b/x11-wm/i3/i3-4.18.3.ebuild
diff --git a/x11-wm/i3/i3-4.19-r1.ebuild b/x11-wm/i3/i3-4.19-r1.ebuild
new file mode 100644
index 000000000000..3ef5738daddf
--- /dev/null
+++ b/x11-wm/i3/i3-4.19-r1.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson optfeature virtualx
+if [[ "${PV}" = *9999 ]]; then
+	inherit git-r3
+fi
+
+DESCRIPTION="An improved dynamic tiling window manager"
+HOMEPAGE="https://i3wm.org/"
+if [[ "${PV}" = *9999 ]]; then
+	EGIT_REPO_URI="https://github.com/i3/i3"
+	EGIT_BRANCH="next"
+else
+	SRC_URI="https://i3wm.org/downloads/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="doc test"
+
+COMMON_DEPEND="dev-libs/libev
+	dev-libs/libpcre
+	dev-libs/yajl
+	x11-libs/libxcb[xkb]
+	x11-libs/libxkbcommon[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
+	x11-misc/xkeyboard-config
+	x11-libs/cairo[X,xcb(+)]
+	x11-libs/pango[X]"
+DEPEND="${COMMON_DEPEND}
+	test? (
+		dev-perl/AnyEvent
+		dev-perl/X11-XCB
+		dev-perl/Inline
+		dev-perl/Inline-C
+		dev-perl/IPC-Run
+		dev-perl/ExtUtils-PkgConfig
+		dev-perl/local-lib
+		virtual/perl-Test-Simple
+		x11-base/xorg-server[xephyr]
+		x11-misc/xvfb-run
+	)
+	doc? (
+		app-text/asciidoc
+		app-text/xmlto
+		dev-lang/perl
+	)"
+RDEPEND="${COMMON_DEPEND}
+	dev-lang/perl
+	dev-perl/AnyEvent-I3
+	dev-perl/JSON-XS"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.16-musl-GLOB_TILDE.patch"
+	"${FILESDIR}/i3-gaps-4.19-fix-docdir.patch"
+)
+
+src_prepare() {
+	default
+
+	cat <<- EOF > "${T}"/i3wm
+		#!/bin/sh
+		exec /usr/bin/i3
+	EOF
+}
+
+src_configure() {
+	local emesonargs=(
+		-Ddocdir="/usr/share/doc/${PF}"
+		$(meson_use doc docs)
+		$(meson_use doc mans)
+	)
+
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	exeinto /etc/X11/Sessions
+	doexe "${T}"/i3wm
+}
+
+src_test() {
+	virtx meson_src_test
+}
+
+pkg_postinst() {
+	elog "There are several packages that you may find useful with i3 and"
+	elog "their usage is suggested by the upstream maintainers."
+	elog "Uninstalled optional dependencies:"
+	optfeature "Application launcher" x11-misc/dmenu
+	optfeature "Simple screen locker" x11-misc/i3lock
+	optfeature "Status bar generator" x11-misc/i3status
+}
diff --git a/x11-wm/i3/i3-9999.ebuild b/x11-wm/i3/i3-9999.ebuild
index f87cfbc00631..e644fcb77f54 100644
--- a/x11-wm/i3/i3-9999.ebuild
+++ b/x11-wm/i3/i3-9999.ebuild
@@ -1,24 +1,30 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit autotools git-r3
+inherit meson optfeature virtualx
+if [[ "${PV}" = *9999 ]]; then
+	inherit git-r3
+fi
 
 DESCRIPTION="An improved dynamic tiling window manager"
 HOMEPAGE="https://i3wm.org/"
-SRC_URI=""
-EGIT_REPO_URI="https://github.com/i3/i3"
-EGIT_BRANCH="next"
+if [[ "${PV}" = *9999 ]]; then
+	EGIT_REPO_URI="https://github.com/i3/i3"
+	EGIT_BRANCH="next"
+else
+	SRC_URI="https://i3wm.org/downloads/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS=""
-IUSE="doc"
+IUSE="doc test"
 
-CDEPEND="dev-libs/libev
+COMMON_DEPEND="dev-libs/libev
 	dev-libs/libpcre
-	>=dev-libs/yajl-2.0.3
+	dev-libs/yajl
 	x11-libs/libxcb[xkb]
 	x11-libs/libxkbcommon[X]
 	x11-libs/startup-notification
@@ -28,15 +34,31 @@ CDEPEND="dev-libs/libev
 	x11-libs/xcb-util-wm
 	x11-libs/xcb-util-xrm
 	x11-misc/xkeyboard-config
-	>=x11-libs/cairo-1.14.4[X,xcb(+)]
-	>=x11-libs/pango-1.30.0[X]"
-DEPEND="${CDEPEND}
-	doc? ( app-text/asciidoc app-text/xmlto dev-lang/perl )
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
+	x11-libs/cairo[X,xcb(+)]
+	x11-libs/pango[X]"
+DEPEND="${COMMON_DEPEND}
+	test? (
+		dev-perl/AnyEvent
+		dev-perl/X11-XCB
+		dev-perl/Inline
+		dev-perl/Inline-C
+		dev-perl/IPC-Run
+		dev-perl/ExtUtils-PkgConfig
+		dev-perl/local-lib
+		virtual/perl-Test-Simple
+		x11-base/xorg-server[xephyr]
+		x11-misc/xvfb-run
+	)
+	doc? (
+		app-text/asciidoc
+		app-text/xmlto
+		dev-lang/perl
+	)"
+RDEPEND="${COMMON_DEPEND}
 	dev-lang/perl
 	dev-perl/AnyEvent-I3
 	dev-perl/JSON-XS"
+BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-4.16-musl-GLOB_TILDE.patch"
@@ -45,11 +67,6 @@ PATCHES=(
 src_prepare() {
 	default
 
-	if ! use doc ; then
-		sed -e '/AC_PATH_PROG(\[PATH_ASCIIDOC/d' -i configure.ac || die
-	fi
-	eautoreconf
-
 	cat <<- EOF > "${T}"/i3wm
 		#!/bin/sh
 		exec /usr/bin/i3
@@ -57,31 +74,31 @@ src_prepare() {
 }
 
 src_configure() {
-	local myeconfargs=( --enable-debug=no )  # otherwise injects -O0 -g
-	econf "${myeconfargs[@]}"
-}
+	local emesonargs=(
+		-Ddocdir="/usr/share/doc/${PF}"
+		$(meson_use doc docs)
+		$(meson_use doc mans)
+	)
 
-src_compile() {
-	emake -C "${CBUILD}"
+	meson_src_configure
 }
 
 src_install() {
-	emake -C "${CBUILD}" DESTDIR="${D}" install
-	einstalldocs
+	meson_src_install
 
 	exeinto /etc/X11/Sessions
 	doexe "${T}"/i3wm
 }
 
-pkg_postinst() {
+src_test() {
+	virtx meson_src_test
+}
 
-	# Only show the elog information on a new install
-	if [[ ! ${REPLACING_VERSIONS} ]]; then
-		elog "There are several packages that you may find useful with ${PN} and"
-		elog "their usage is suggested by the upstream maintainers, namely:"
-		elog "  x11-misc/dmenu"
-		elog "  x11-misc/i3status"
-		elog "  x11-misc/i3lock"
-		elog "Please refer to their description for additional info."
-	fi
+pkg_postinst() {
+	elog "There are several packages that you may find useful with i3 and"
+	elog "their usage is suggested by the upstream maintainers."
+	elog "Uninstalled optional dependencies:"
+	optfeature "Application launcher" x11-misc/dmenu
+	optfeature "Simple screen locker" x11-misc/i3lock
+	optfeature "Status bar generator" x11-misc/i3status
 }
diff --git a/x11-wm/icewm/Manifest b/x11-wm/icewm/Manifest
index 3321ab9a5d4b..0ab22cf5b495 100644
--- a/x11-wm/icewm/Manifest
+++ b/x11-wm/icewm/Manifest
@@ -1,8 +1,8 @@
 AUX icewm 33 BLAKE2B 5605658012ad8ed16bbd4cf0c4cb7cbe5204f73c20ef2c3d9fef1011a80b9e68863de64b45e4b043604b147c9d31f3f5d2617d067b694f5ec5329ad895472b0e SHA512 3fe619e59cc5d354242ccd85d3b1982dd7db6d0f6170f46f9d33975872f6d5a342a08d69db763162dc43681eedb96e9ba5075455bf54adf4fb86bf19887bf6e0
-DIST icewm-1.7.0.tar.lz 1668130 BLAKE2B 90739f862cf320c43dc2ddbd1a5ecdf2918e6525e45d5732b19adaaeef0f104d9a66d29acab776658f869d7149954d4b531a07e2595a4c80b4dc50dc679473f0 SHA512 1b0faed0e9ead837dcb0d3ce91ad5248d7fca5ad48455c838700c66482a3373bb4e552dbc252b93b0a5613d53e2663cea756e64b3f3fb073d9ba2797e2b69601
-DIST icewm-1.8.2.tar.lz 1686746 BLAKE2B a2dcf77284f5dc2f908ec949c6e1ea792292648fbd5cb8167216ee994706b1a208ca6fe29831f6bf98d2ec02e5e5120eca8f3a93a20a4a75d80d839210d829bd SHA512 3454b9547b7f4857957133cda4436814149bea99886cd4564f947391a1f42d474d56c7cd3208ff2471262c57f623de1ec22e30f0d9b14874f29ac3a4855b9a45
 DIST icewm-1.8.3.tar.lz 1686603 BLAKE2B 214cb3c7816ba8d94fa56fb9d4a6c630f49f23f69f99ff1ba7aff38aba6f6b7fbd623a284d4873616486d266a7ec412ba9cf4b29479c5c29f1f7ff27e15d1f48 SHA512 697395ff995b57e043774bae2cce667935879c4deab17d9a9059c1e152a90704ad3af618a2c945ac5afd561754895d4e9805f4fea77d5f1e06cf99a7dfd4c062
-EBUILD icewm-1.7.0.ebuild 2670 BLAKE2B 6fd31e08fe11f8ebb664ff0d11269df39b47433dfafc1058281af3896dcf10a81930707846efc4d2b964d881b9f6c7eef5a21548d50fba58462e101f360d6c95 SHA512 3dfb0a7502141b5916a2bb5d088bd533bc70281dc4c3171a8fbf87e65c94b7b88bf99c592ef3ec3e20994d9913226b760fb9037b2bec7b0aaabdcf679d428eab
-EBUILD icewm-1.8.2.ebuild 2674 BLAKE2B 527d266c70c5a81b2664778a828f6d73156e64a03da93d0b33499fe83f9b2036e75f19ac4f687b069f834d72d0ba8503f27692c5d9c7a4d39365433ed6fd64eb SHA512 7497f2c29f337623c803fbb30ca1df6b0019a3ca76b143d0b320ca7a923ccc84389895797a1bce5382c6d2671e3c27f7ad73a554320d8ef0495e270228f0980a
-EBUILD icewm-1.8.3.ebuild 2674 BLAKE2B 527d266c70c5a81b2664778a828f6d73156e64a03da93d0b33499fe83f9b2036e75f19ac4f687b069f834d72d0ba8503f27692c5d9c7a4d39365433ed6fd64eb SHA512 7497f2c29f337623c803fbb30ca1df6b0019a3ca76b143d0b320ca7a923ccc84389895797a1bce5382c6d2671e3c27f7ad73a554320d8ef0495e270228f0980a
+DIST icewm-1.9.1.tar.lz 1696312 BLAKE2B c2435e2dfa0c8c9ba490299a9c1545c9b45b8c8960bf1a36889c0304882619c7bcff7ab37b1573c82c92b2b0be514527b051d9651832a22c5f9b8334f5391fdc SHA512 75210466110c65f91192c89e6bdecc3a52c8abc953096789861ebdbbd779b892b708b5d1f0bcb9fcfcb59171a61171bbfc718bffaeade69ced3a978409b4ee65
+DIST icewm-1.9.2.tar.lz 1694602 BLAKE2B cf30a695ba48093b386aa2f3af5120e78a9fcc57da9038bcd546ade0986e1bc359a3da91d2eeeb8d3a105173f5d755223675a84b38cfc8c907269efd2561c706 SHA512 7b4f8c47c636a0113af576bc1bcd9fde111ae70eb0bcf21fb1d906ca43bea4d8b0337a728e5da35bcfeabd56c66fd0d14581d7377f063dd750fdf01362b24be2
+EBUILD icewm-1.8.3.ebuild 2780 BLAKE2B 247c5a39d442164e0b2ed097a9618c0db264c554dc5b9bc2e0f1f2f5eacea089e929414193a85924e081e97ff9a8dc621e1c9e37d2d753533d71835419d6da8d SHA512 2a88275a9f9b1f023f024db5cf79563d5c35c39406f3733a00ec7b5faf822520fe9b8fcb6aa2c4ea17a71c9a3b27858ae8c2ded73106444681cf4ab5ac8a5dd6
+EBUILD icewm-1.9.1.ebuild 2816 BLAKE2B 798b2d1b6ed7881a66bc1d502d7c2a69ef0f8b1cfc8cff4183b432538236541789caf8f6ee4e1c91648acf59af4abf7fb867524342ef067e08909cb8a64a65fd SHA512 ffd7a7e21470e8bea16968ed9fbbec71e988d768800e157220f63f3486a9ef7ffa706115b627ab82c69dcc5fb5adc0bf7b96d6db9ae05899914c50b8f49ae4cb
+EBUILD icewm-1.9.2.ebuild 2816 BLAKE2B 798b2d1b6ed7881a66bc1d502d7c2a69ef0f8b1cfc8cff4183b432538236541789caf8f6ee4e1c91648acf59af4abf7fb867524342ef067e08909cb8a64a65fd SHA512 ffd7a7e21470e8bea16968ed9fbbec71e988d768800e157220f63f3486a9ef7ffa706115b627ab82c69dcc5fb5adc0bf7b96d6db9ae05899914c50b8f49ae4cb
 MISC metadata.xml 747 BLAKE2B a986dc65f9b603519ef92fecc63cadd2921d6569e8735956a55ce91673426082e367664cce23c2b80cec19e0d997da357ac8f9d3d78c738ad92f42f6f426c225 SHA512 f9b84c60b780b5999c8a295b64bdf1bdb734108984e48f1271257cb35602df024a347560526de52f43ede16f67031551f4ae3f37401d3320e4dbdfb913e557fe
diff --git a/x11-wm/icewm/icewm-1.8.3.ebuild b/x11-wm/icewm/icewm-1.8.3.ebuild
index f3a5bab3c272..a9502b12ad78 100644
--- a/x11-wm/icewm/icewm-1.8.3.ebuild
+++ b/x11-wm/icewm/icewm-1.8.3.ebuild
@@ -11,7 +11,7 @@ LICENSE="GPL-2"
 SRC_URI="https://github.com/ice-wm/icewm/releases/download/${PV}/${P}.tar.lz"
 
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ppc sparc x86"
 IUSE="+alsa ao bidi debug +gdk-pixbuf nls truetype uclibc xinerama"
 
 # Tests broken in all versions, patches welcome, bug #323907, #389533
@@ -51,7 +51,13 @@ RDEPEND="
 	)
 	bidi? ( dev-libs/fribidi )
 	gdk-pixbuf? (
-		x11-libs/gdk-pixbuf:2[X]
+		|| (
+			(
+				x11-libs/gdk-pixbuf-xlib
+				>=x11-libs/gdk-pixbuf-2.42.0:2
+			)
+			<x11-libs/gdk-pixbuf-2.42.0:2[X]
+		)
 	)
 	!gdk-pixbuf? (
 		media-libs/libpng:0=
@@ -63,7 +69,6 @@ DEPEND="
 	${RDEPEND}
 	$(unpacker_src_uri_depends)
 	dev-libs/glib:2
-	gnome-base/librsvg
 	x11-base/xorg-proto
 	gdk-pixbuf? ( gnome-base/librsvg:2 )
 "
@@ -95,10 +100,10 @@ src_configure() {
 	local myconf=(
 		--enable-logevents
 		--enable-xrandr
-		--with-cfgdir=/etc/icewm
-		--with-docdir=/usr/share/doc/${PF}/html
+		--with-cfgdir="${EPREFIX}"/etc/icewm
+		--with-docdir="${EPREFIX}"/usr/share/doc/${PF}/html
 		--with-icesound="${icesound}"
-		--with-libdir=/usr/share/icewm
+		--with-libdir="${EPREFIX}"/usr/share/icewm
 		$(use_enable bidi fribidi)
 		$(use_enable debug)
 		$(use_enable gdk-pixbuf)
diff --git a/x11-wm/icewm/icewm-1.8.2.ebuild b/x11-wm/icewm/icewm-1.9.1.ebuild
index f3a5bab3c272..cd8d3315fba2 100644
--- a/x11-wm/icewm/icewm-1.8.2.ebuild
+++ b/x11-wm/icewm/icewm-1.9.1.ebuild
@@ -51,7 +51,13 @@ RDEPEND="
 	)
 	bidi? ( dev-libs/fribidi )
 	gdk-pixbuf? (
-		x11-libs/gdk-pixbuf:2[X]
+		|| (
+			(
+				x11-libs/gdk-pixbuf-xlib
+				>=x11-libs/gdk-pixbuf-2.42.0:2
+			)
+			<x11-libs/gdk-pixbuf-2.42.0:2[X]
+		)
 	)
 	!gdk-pixbuf? (
 		media-libs/libpng:0=
@@ -63,7 +69,6 @@ DEPEND="
 	${RDEPEND}
 	$(unpacker_src_uri_depends)
 	dev-libs/glib:2
-	gnome-base/librsvg
 	x11-base/xorg-proto
 	gdk-pixbuf? ( gnome-base/librsvg:2 )
 "
@@ -71,7 +76,7 @@ DEPEND="
 BDEPEND="
 	app-text/asciidoc
 	virtual/pkgconfig
-	nls? ( >=sys-devel/gettext-0.19.6 )
+	nls? ( >=sys-devel/gettext-0.19.8 )
 "
 
 src_prepare() {
@@ -95,12 +100,13 @@ src_configure() {
 	local myconf=(
 		--enable-logevents
 		--enable-xrandr
-		--with-cfgdir=/etc/icewm
-		--with-docdir=/usr/share/doc/${PF}/html
+		--with-cfgdir="${EPREFIX}"/etc/icewm
+		--with-docdir="${EPREFIX}"/usr/share/doc/${PF}/html
 		--with-icesound="${icesound}"
-		--with-libdir=/usr/share/icewm
+		--with-libdir="${EPREFIX}"/usr/share/icewm
 		$(use_enable bidi fribidi)
 		$(use_enable debug)
+		$(use_enable debug logevents)
 		$(use_enable gdk-pixbuf)
 		$(use_enable nls i18n)
 		$(use_enable nls)
diff --git a/x11-wm/icewm/icewm-1.7.0.ebuild b/x11-wm/icewm/icewm-1.9.2.ebuild
index fe0e2ed27f4e..cd8d3315fba2 100644
--- a/x11-wm/icewm/icewm-1.7.0.ebuild
+++ b/x11-wm/icewm/icewm-1.9.2.ebuild
@@ -11,7 +11,7 @@ LICENSE="GPL-2"
 SRC_URI="https://github.com/ice-wm/icewm/releases/download/${PV}/${P}.tar.lz"
 
 SLOT="0"
-KEYWORDS="amd64 ppc sparc x86"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE="+alsa ao bidi debug +gdk-pixbuf nls truetype uclibc xinerama"
 
 # Tests broken in all versions, patches welcome, bug #323907, #389533
@@ -51,7 +51,13 @@ RDEPEND="
 	)
 	bidi? ( dev-libs/fribidi )
 	gdk-pixbuf? (
-		x11-libs/gdk-pixbuf:2[X]
+		|| (
+			(
+				x11-libs/gdk-pixbuf-xlib
+				>=x11-libs/gdk-pixbuf-2.42.0:2
+			)
+			<x11-libs/gdk-pixbuf-2.42.0:2[X]
+		)
 	)
 	!gdk-pixbuf? (
 		media-libs/libpng:0=
@@ -63,7 +69,6 @@ DEPEND="
 	${RDEPEND}
 	$(unpacker_src_uri_depends)
 	dev-libs/glib:2
-	gnome-base/librsvg
 	x11-base/xorg-proto
 	gdk-pixbuf? ( gnome-base/librsvg:2 )
 "
@@ -71,7 +76,7 @@ DEPEND="
 BDEPEND="
 	app-text/asciidoc
 	virtual/pkgconfig
-	nls? ( >=sys-devel/gettext-0.19.6 )
+	nls? ( >=sys-devel/gettext-0.19.8 )
 "
 
 src_prepare() {
@@ -95,12 +100,13 @@ src_configure() {
 	local myconf=(
 		--enable-logevents
 		--enable-xrandr
-		--with-cfgdir=/etc/icewm
-		--with-docdir=/usr/share/doc/${PF}/html
+		--with-cfgdir="${EPREFIX}"/etc/icewm
+		--with-docdir="${EPREFIX}"/usr/share/doc/${PF}/html
 		--with-icesound="${icesound}"
-		--with-libdir=/usr/share/icewm
+		--with-libdir="${EPREFIX}"/usr/share/icewm
 		$(use_enable bidi fribidi)
 		$(use_enable debug)
+		$(use_enable debug logevents)
 		$(use_enable gdk-pixbuf)
 		$(use_enable nls i18n)
 		$(use_enable nls)
diff --git a/x11-wm/lumina/Manifest b/x11-wm/lumina/Manifest
index caf7083ab85d..80d30f9ed473 100644
--- a/x11-wm/lumina/Manifest
+++ b/x11-wm/lumina/Manifest
@@ -1,8 +1,6 @@
 AUX 1.2.0-desktop-files.patch 1001 BLAKE2B eee93a9f1d3466dcdb4d9d411b9e5b5b5a882dba2d4ccadb8ad90d82b66ee3a2d02fb02dbdd6b156fb9768c6d8d8b772b075ffc2b12e630e204e55632e99f931 SHA512 419fdd6c26f05daa4dacee5d0f21a51ffc465d443ba47e374c431c722dab98b8686453c692b0d8e579c5a5f43b18d92c0f7345845901e1d86ad36c70e1546b4d
 AUX lumina-session 2011 BLAKE2B bec6e1161c89ef0ae5f6506d57b6deff09f907b2c16b0d3404eb61369f1c3fa6f19400557f18dc3081e19652badae541d9f84be8717851b5a583392caaef303f SHA512 79e06e1761b079c96984c84f225e23a545d012ad94148080c3659c85f75b322dd050fc4b1908f72de1cdd22bab6b62e0d1de4f8c77f29073e88488671b0836db
-DIST lumina-1.5.0.tar.gz 20657364 BLAKE2B 62b064e1be3ce69c078e68524e011a8ce4d61c680a4732da7992a7b72833363fceb0a0895a228ec9de7921d989253c70c518810b91c23226aded1f54b23b1aea SHA512 37106d71a9ba7188c4ded0614d2d4424f732519e11288ae312dfcd9a0b5b26dd31dfa812e74a96c0e3e0fb99fae4dc00806fd7a24183746688c72d997054af7d
 DIST lumina-1.6.0.tar.gz 20662000 BLAKE2B c016f07fb86333e792d6a0a0ddaa9ea09f322d6de69d099abf9340d7db6cb9e23624b62882579ba6c13eec71fcf663f1688424fd940cd7e09e625f6fcc4b281f SHA512 e923961568ab9cc32206386066daef8cd1fd2db2d5c3e260e5c1da1dcda39a516576418f607cefbe5a1c47d8684591d0e595fb344e7d6aa2859fc3b326e73e30
-EBUILD lumina-1.5.0-r1.ebuild 2416 BLAKE2B 3ac8557090047e11dc95cb497549767d2bd9d8b222faa4ee8ee1ca978d6fefd259070347f1194f8dbea6b619fdacb14d2e4d261d2c59acf8b1f95d25db56c956 SHA512 6ffdee6ef07be2f20b50e63bf8b49ad99b0a38ec28897fafd98c0be4029c35d2187ef1f52b7e97ce45a120041742cbab65e1871e86ea825f167b93cf37d502fd
 EBUILD lumina-1.6.0.ebuild 2396 BLAKE2B 015adabd82ff9b479e7e3f69519ab4f80f58f233df88b1f0462ee9956e8af5bc34e4197b0c18237390cbcf23a4c9950d91e277263d60069a3d115c4f30324e47 SHA512 7e7244aab8a0ab934523fb5714ec67a70e66fe62c4f3cb2abfe6345af6d6697f3b91fb89dfb81706045c956cb97e8c14c3941701f07979d0db5c87e7ab399db6
 EBUILD lumina-9999.ebuild 1366 BLAKE2B 0da2fd0940f6ebdb0dcbe0424b81458f90b20fe66cfb3c65f3bc1164c45deb5293981eb30886bdcc40d56e1ffe0ffc79660c91c62531fb038c56b5fa584d45be SHA512 758c5ac50e8673155abf452dbe28ba54d5f59ff5f1b91f59dcb061d5ed1c979aab7c8101dab4b928e24ca79491c9bf5b8c27a83a7277ba9d10b7f016c8674d13
 MISC metadata.xml 1981 BLAKE2B 260d71ea029aa07a26cc0af9d937c51253029b0bc4c70f11d4330da3a10d371be15959c93f4b1af1436b7a3c5a8a1ecb2a8f3cdea2078133384bcec3015f9940 SHA512 a55aba75dcdfc78363be5a59ebbcb7760fb1370685d7a893b976aba9497094f9674e7493ed0df3899ad917165967c3a58984bc04f3651b46416fa91fcb29de6c
diff --git a/x11-wm/lumina/lumina-1.5.0-r1.ebuild b/x11-wm/lumina/lumina-1.5.0-r1.ebuild
deleted file mode 100644
index a55056735a3b..000000000000
--- a/x11-wm/lumina/lumina-1.5.0-r1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PLOCALES="af ar az bg bn bs ca cs cy da de el en_AU en_GB en_ZA es et eu fa fi fr fr_CA fur gl he hi hr hu id is it ja ka ko lt lv mk mn ms mt nb ne nl pa pl pt pt_BR ro ru sa sk sl sr sv sw ta tg th tr uk ur uz vi zh_CN zh_HK zh_TW zu"
-
-inherit qmake-utils l10n xdg-utils
-DESCRIPTION="Lumina desktop environment"
-HOMEPAGE="https://lumina-desktop.org/"
-SRC_URI="https://github.com/trueos/${PN}/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="desktop-utils"
-
-COMMON_DEPEND="dev-qt/qtcore:5
-	dev-qt/qtconcurrent:5
-	dev-qt/qtmultimedia:5[widgets]
-	dev-qt/qtsvg: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
-	x11-libs/xcb-util-wm
-	desktop-utils? ( app-text/poppler[qt5] )"
-
-DEPEND="$COMMON_DEPEND
-	dev-qt/linguist-tools:5"
-
-RDEPEND="$COMMON_DEPEND
-	sys-fs/inotify-tools
-	x11-misc/numlockx
-	x11-wm/fluxbox
-	|| ( x11-apps/xbacklight
-		sys-power/acpilight )
-	media-sound/alsa-utils
-	sys-power/acpi
-	app-admin/sysstat"
-
-S="${WORKDIR}/${P/_/-}"
-
-PATCHES=(
-	"${FILESDIR}/1.2.0-desktop-files.patch"
-)
-
-DOCS=( README.md )
-
-src_prepare() {
-	default
-
-	if use !desktop-utils ; then
-		rm -rf src-qt5/desktop-utils || die
-		sed -e "/desktop-utils/d" -i src-qt5/src-qt5.pro || die
-	fi
-
-	l10n_find_plocales_changes "${S}/src-qt5/core/${PN}-desktop/i18n" "${PN}-desktop_" '.ts'
-}
-
-src_configure() {
-	eqmake5 PREFIX="${EPREFIX}/usr" LIBPREFIX="${EPREFIX}/usr/$(get_libdir)" \
-		CONFIG+=WITH_I18N QMAKE_CFLAGS_ISYSTEM=
-}
-
-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
-
-	}
-	l10n_for_each_disabled_locale_do remove_locale
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	xdg_icon_cache_update
-}
diff --git a/x11-wm/metacity/Manifest b/x11-wm/metacity/Manifest
index 3bc92a7c5272..421d4dd788d2 100644
--- a/x11-wm/metacity/Manifest
+++ b/x11-wm/metacity/Manifest
@@ -1,5 +1,3 @@
-DIST metacity-3.34.1.tar.xz 2055708 BLAKE2B c1bac27f83d26718fa3d02f777a627324efc3e3eaffbf385a84dd97960adc30e84090f511500fe96a4fbbb373da80a38eaba4c5e14910fbcf8783857c0767ef2 SHA512 e9234ad0aee9fe27cf1c2030e31d8f2c292ae2ee2e9b8546ed86e396152faa9dc4cc67fa8321a0c3d3bf577a83bc143111c6ac225f423db243347a6a760695ee
 DIST metacity-3.36.1.tar.xz 2063452 BLAKE2B 2dd7b1c63e0b5f87ce4518d7d42d472223717012a46dd826dfda3c88f7e647809e6bf2449a28bd38573342fd5fec94e2233db958658ea4320b22c5451390e451 SHA512 98e73036cca238b713a112194b2cd7a866bcf7d08ef29fb590054b69a1bd807699317a51f9b851f9c474ae2557e27dc9fc4a52d7c436d93ad4a02babef68feeb
-EBUILD metacity-3.34.1.ebuild 1233 BLAKE2B 6849286bfcc9997d335d7e842a6b03a6150707adae71c0f224b7d4dbe2fe41d3fbf0c89d18780b4f3b36dee20c01026171caa98cae840751b30ef8fe18550a96 SHA512 3519262f4f14a86750a3f833adcb8ef88282ef797c2c2a8c47531ff507d6f81713f336e8a04eb2573b9e485db427de10d7a4469a2b4a832994b48cbcc8c4c621
 EBUILD metacity-3.36.1.ebuild 1230 BLAKE2B 5ed0a66a03c26b6dec890a10cefe295d703df73b2af5fa996d192d3f91d30f454a359886a71b329cc95f980541231ede4eb724d63dd3f828bc07f4316c9cf852 SHA512 55217e43229292e884d88d4abc6f88b7626ef41904127e0b39f77da84d44d73970f53bac28d803eff48ede7b5fa07cd8c2a06476b9aab021037e5932b4fedcf8
 MISC metadata.xml 477 BLAKE2B 592b2957c7bff2b55505a056a2eef8d8cec25eecb400b5046bfbbd84eadfc6baa1f1475fd772a568538360c6867f0b5c0934d85bc5c6fd6ad362d80bad31ea33 SHA512 e475ae41ee3fa97f037acca5634bcb8ded17e783183459aeb83b3566df36fe7d09832991e9252f59e900982bcd0c80e8987bccc2c3e042080405d5448af9423a
diff --git a/x11-wm/metacity/metacity-3.34.1.ebuild b/x11-wm/metacity/metacity-3.34.1.ebuild
deleted file mode 100644
index bc7f2172a507..000000000000
--- a/x11-wm/metacity/metacity-3.34.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="GNOME Flashback window manager"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/metacity/"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="+libcanberra vulkan xinerama"
-KEYWORDS="~amd64"
-
-# TODO: libgtop could be optional, but no knob
-RDEPEND="
-	>=dev-libs/glib-2.44.0:2
-	>=x11-libs/gtk+-3.22.0:3[X]
-	>=x11-libs/pango-1.2.0[X]
-	>=x11-libs/libXcomposite-0.3
-	>=gnome-base/gsettings-desktop-schemas-3.3.0
-	x11-libs/libXfixes
-	x11-libs/libXrender
-	x11-libs/libXdamage
-	libcanberra? ( media-libs/libcanberra[gtk3] )
-	>=x11-libs/startup-notification-0.7
-	x11-libs/libXcursor
-	gnome-base/libgtop:2=
-	x11-libs/libX11
-	xinerama? ( x11-libs/libXinerama )
-	x11-libs/libXrandr
-	x11-libs/libXext
-	x11-libs/libICE
-	x11-libs/libSM
-	gnome-extra/zenity
-	vulkan? ( media-libs/vulkan-loader )
-"
-DEPEND="${RDEPEND}
-	vulkan? ( dev-util/vulkan-headers )
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.4
-	x11-base/xorg-proto
-	virtual/pkgconfig
-" # autoconf-archive for eautoreconf
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		$(use_enable libcanberra canberra) \
-		$(use_enable xinerama) \
-		$(use_enable vulkan)
-}
diff --git a/x11-wm/musca/Manifest b/x11-wm/musca/Manifest
index 0a05039cd6d0..f6a38c4a7453 100644
--- a/x11-wm/musca/Manifest
+++ b/x11-wm/musca/Manifest
@@ -6,4 +6,4 @@ AUX musca-0.9.24_p20100226-null.patch 4271 BLAKE2B 52ec8124f563fbe0e3b281e36cabc
 AUX musca.xsession 16 BLAKE2B ce00d05a09d8611a71c4d219a48bcc3e9386deb67c5ccb7d6638fab0d41862f0a503cb0ff506b71881606abb2a36da3d0df717791ff95cb8b344370ce3c4d366 SHA512 f276046ab82ceeaebf5307ea9050d55767a55cbd1913854ef0f73bdf162d2d751537ad604fc2a99d8d9c9b89426b609f127451c7a3f6b36868c74842d28a8622
 DIST musca-0.9.24_p20100226.tgz 81490 BLAKE2B 6aa9ccdd94749df1a701d605f07c29f8dbb7cb0afb73bdb9392d35df7e518496219e972535e671dd5d6d32520fa7e1d928e91489c2a303aebfe051cdd11a5230 SHA512 9030931dbc332fce144edc6bea907d86aab1eef6b1384958a7889b533af5065a2f20b7233ea063648fff0eb468c2083a310e38586c2c4d83848c773fb1984f45
 EBUILD musca-0.9.24_p20100226-r4.ebuild 1220 BLAKE2B 1fca1b50cb9c9e918bb4033e26d48ecc382b0734fc0be211a72cc385ff9a917c771d86b3bf7cfdb3d0e4e139190ab28ea6db6ec1284fca838fa77c06499c1461 SHA512 39ae3a9813bf5fb2cbc057c520e60c8348301800df958aac9860ef3de8857095c6d36037ca82646fbfe0ce71c19f1378392329b1c25860a6c565a290a6cd09cd
-MISC metadata.xml 486 BLAKE2B 12bdde943981e2eb7a6dc26a6744d596a8fce6b8125f788e760f27d1d7f3f6d8c840b173d7cd3418371a33fe2f064421b4f66484507dff22ea4895695a89cd8f SHA512 098a06d7dff066cf54e909923066078fc8347f7402846a66c26bae0e5df4752cd5a44dec6457e977b2060be5f3068e16ad5147e151ea1b4cac23b4e9e20c136a
+MISC metadata.xml 409 BLAKE2B c5e59355e2728621e203702348d6c3efdaa4db731fe866890949a23414f530fc0b91806c32df30647674ad6d632fc048398095935fcfdd43a7368148741bec53 SHA512 db328cb55227ee361966123fd7e9e6d3c967e34543147a680e5a944d3d699df377560a26b09898d52e3bfed68ee6cf59761adf7cb858d6c7a01fe7b5c7011be4
diff --git a/x11-wm/musca/metadata.xml b/x11-wm/musca/metadata.xml
index 4b518dbe6410..e2841a52568a 100644
--- a/x11-wm/musca/metadata.xml
+++ b/x11-wm/musca/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>jer@gentoo.org</email>
-		<name>Jeroen Roovers</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="apis">Optionally install the experimental `apis' window manager</flag>
 		<flag name="xlisten">Optionally install the xlisten utility</flag>
diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest
index 41761bbb2d0c..2d0aa9e91cc8 100644
--- a/x11-wm/mutter/Manifest
+++ b/x11-wm/mutter/Manifest
@@ -1,14 +1,7 @@
-AUX 3.32-eglmesaext-include.patch 2078 BLAKE2B cea9ba1a8d2749eb3590dd17a598aace69ad96897cbc5a6c1061c4041a8fe3809ff9f5bcc99cbdc33611a3a3319cda20f74f88434e71f03f2a1cac108185f3fb SHA512 23296f0e0b6ffd4610be3f0c6e1d524d15a5d259c5607a7ded4a8c39846f555dee92e5a8bb9c766211b758f8bc7483715a9640718bb9b7daa42905d802b2ee71
-AUX 3.34.6-XInitThreads.patch 1625 BLAKE2B 5b9ff02d96643105d0b865da0821ed6d4a849c8a42d5787c0eadbee4f7943ba5028471bb8424b87ee716d7ae9581b29f6f219c65371a6307da8eb04e0a5a94a2 SHA512 b223845da63ddbba5eaffa9b2a85e1cdaaee9126707d10c902814d35596857fca733ac290b86648ec506cc7bea2432b95ed5c5ea18dd598e539fcd0670620065
 AUX 3.34.6-tests-dontreq-gdkwayland.patch 1730 BLAKE2B d796a4dc91d756ac4af24c411e9f6ef33fcd02443585a3662bf58f04498305aa6b458ab0ace5191a97d9c66ba81cec9ee75099d7e77436eb39c3bec33bb68e26 SHA512 841f59c00f061302f411ce5ed5c25ef041f13a57d44da011815cfb2c1f80cccea1963675dc023d82aac4824b620861876ca628b6165db74b150564222b786b22
-DIST mutter-3.34.6-patchset.tar.xz 4748 BLAKE2B 103f17256c7a9f347aadd58119e0e92c844bf372723e1462ea343fe9a80d7ed9dd55ad04215216dd51f97143e23b201e056f2e17a1808a22fe2d4e0f8e8da659 SHA512 79e1d72d14643ef3b6d9da0532ca636e41a110bcc7e8fe1553940ca6c1e2cf6414923a707bdde7823449ef7b0535d8c97ae0ae57a02f55e90950e8c127340ade
-DIST mutter-3.34.6.tar.xz 2805328 BLAKE2B bba0e062ab81f8e88e7e59b6dbf51226b6e2d43932c7d61aca5a3e709119f909e30acea67a5444c95205ddf929a1f5bf7785eec7aed4f2da743c19543aa79962 SHA512 dd240fdcfc8ba0c62c0ff423a40ec6e0007d154f0be39e18cea543da7ff548e10a9b712f9b2cc09c58ad342b1e7eb50fb2a8790c55d284846bb6f1a76f8c6d6b
-DIST mutter-3.36.4-patchset.tar.xz 9064 BLAKE2B 62a66010a2daf8584ae6bc79d81425e4283ebf3a97d9bbf4e52d486dc3460c9f501f1d18adcf95fc5016678b235931ed095c1edfa3f86374d826c8808927956a SHA512 fb84a44e7676f14b906c54c36696f7c4c0b154ff8e08786d87ae2320ddec2aa8f275b7d5481e434d4ea6c4a06d3221cfe53f8642bc7e98037937f3ff921b33c8
-DIST mutter-3.36.4.tar.xz 2687224 BLAKE2B edf86573bcecaff67b666205460ce8748e0e58f03a14f3f04ae01e0afed6e2909d16d4c2bc53d2e95e9ad2d5b3a8223d06245e01c7dbcc51dc6e04b463767935 SHA512 e7130e59d5539a53ac8a349a38ce1ce757c6eee2ba672fc9eab9330bde32217674a9a206bd977db03195dc42b6c327147467407dd0159c4e8585332d9c1daabb
-DIST mutter-3.36.5.tar.xz 2687916 BLAKE2B 15eedc6b1a7c5fdb3a355b8aa4b5586491d0fc50ef293b200b747e9d2a8540df9dcb5d492edb30d1a51b779bf4faceba9448535475c65864d08219eb94e71599 SHA512 cf02003578ebe4d025006b7dc8c277e5a2240373d41fd21e9e7a0ea3d7f323454925a09a5f77117e63a95d4f7663fc4ad7b6e21b042044a8a1a5238713f8d5ec
-EBUILD mutter-3.34.6-r1.ebuild 4693 BLAKE2B f5ec4765d9f830be04ff211c47bd90bcaa22b872907adefe4017f1dcb6c2ac6160c6e3d41b203c5863e5ba0fc9a21285b2ed2de66234bf1c8af73f9c6635f3fe SHA512 b0f35b7b730b90f9dd64ab2e1749904b9fd287d58ca80e1b16accdea79eff5d7fb8a369da495341bcc5c6d0d51fa1ed801fd282d84014be5722354940358701e
-EBUILD mutter-3.34.6-r2.ebuild 4758 BLAKE2B e1d099094f754a2554ef29263f6a2fe7573bcf6ea03f268a2d29b22047d4f1bc025ad1991e216da7329331de7216819afe703759670b9391c16b955a49c83a7e SHA512 06b01e1998c4c2b45ea91e4b96382ddadf28c841f0aef43becd078b239c8cc83b8543b34f452be16ed079f0ab9642979604bb2ca76ab55642e3992e1c3b83601
-EBUILD mutter-3.36.4-r1.ebuild 4772 BLAKE2B 8fbe6abab388bb25743cef1fb2cfb3f533540330a49a4ff6600e69be1ef7bbb8ff02d5978cea9891c3553ce95027bd3214a8556b1b9287c72a438cdd84ccf1ac SHA512 939bf6555a4f030feafa231c5ccdbd31cccd757f96c07a1cdf2ecf96ce9b9fee9e8c61f23934d03ff11008a710aa2c6cef15d6d2f24579170a0a891caa5e2930
-EBUILD mutter-3.36.4.ebuild 4661 BLAKE2B e0e5d0a05570c74d936cb1257f41d1a0bcca8f5cbb2a455c2cd5ab19b0773b65560a395323145afbe11814770ed4abbf7790abc7149d6142c0afe4f9d153ea91 SHA512 ce2d1390285e22b2866fd4abb2aa6b0597d40375f67d02d85548150bab0c7359b057057cfd9faeb35169d835e5b719f24987bfed0eacc0ba3924a713e6e7a228
-EBUILD mutter-3.36.5.ebuild 4631 BLAKE2B b6b3306248f3100142ee76bbdd10efde02272e782159ad8a960b71b37e13083371eca4324f14dfaf630be48f7c518dcd9da60cf994e1d29fce80dddaf8aaebcb SHA512 ccfc4e205beaa0921aecf906b50200dc3a96c92bd130a141a1556923ca53e3b284b7adb65628232262d7d5670c899f44c6565450ed2f341aab191ecb923b2f19
+DIST mutter-3.36.7-patchset.tar.xz 14232 BLAKE2B 90a289f7012e28607d487fd635b73683e657bfd8792dbf662f8822ac7f096d21add6fcd3b7092e4e82f2130226f5b1ff9afd1e026fec8333680c9b4e4712dea2 SHA512 74e3951358a02c552a45b590360b9a038283e983ff78daf433fea1589ca3e7824f21af3b786a06ba84fb400581dfc4f97f29d259afdaca2ae3e1456a49a96243
+DIST mutter-3.36.7.tar.xz 2689176 BLAKE2B a3849b254dbe2029736ef760fe4225e63bf1d87bf2856a87682574904bd047822916485a3e00d2760118132466414b68764731ea4af9add5d734fd7ce3eac730 SHA512 6061cc8a3bdefe57049f9da757b9a33321b28ff7bc9543bc1db3abd75c7261bf233180fb1e8a2f76145dd67ebda91c48981f6e844a866ef6cbb66203af4b7ef7
+DIST mutter-3.38.1.tar.xz 2618944 BLAKE2B 2b7d0baea765a2680e8610553fcf5944af275d4533af61d719ca922c21a400ce771bf7a23093e8fa224453c1fddea6f718b1cfaaac6f079c993cdca5f721bf2d SHA512 55a65d80c886b90da110de69fca8f2c92912b36d6244bd6fcb1e09507469b5d860fa888614a33170b2799574f521ee117fb289a768fa2af5059fe0da51835d31
+EBUILD mutter-3.36.7.ebuild 4703 BLAKE2B a9cd36e81ff9734a41c65dfd744680eb0c82ec59a3c6335e728b110ea79b5278b9066738c0060fad4bf13c9ea580b98baa76177ef7aff20954b43a9e86c7df43 SHA512 20a36f0091e02cacbc482c0c6848872aceef4dbe6506615493ae65794bae0524ba633c7ee1a3895f7eb866d1c8826012e88fe515003c7f8ac74bd0f5016bb1a6
+EBUILD mutter-3.38.1.ebuild 4542 BLAKE2B 527cb071edd45aa97977403e5cafb15fa2aa6d5009c3894f01e11f2e3ee4084da5d96c4f5ff08e99fb013fb8be7b2db2f2c8e64038b1973945510e90d074d45d SHA512 e69a40b16a6c999202a6372520f192b7a892fe348232f49639f732c2973297ea6ecfde5ecadf7e043e1f462eff87c753c4187d984a5ecfcca7eca7c382734674
 MISC metadata.xml 605 BLAKE2B 5dc68fbf8b85c2bf75ea435abe116a9ed7072ec40a45bda28de9cb277a03e5c363487f1c3aa5c60cab5f710e06f15d966790684cac1573676af635e59b3cdfbd SHA512 440e7a33404e218da15c127614d843edcd42c469aced4609c2e7d7d8ec1281c9eceb64aebe406a75e9ba0a05b6be18bbb721257e140f6d334aff6143b1233fb8
diff --git a/x11-wm/mutter/files/3.32-eglmesaext-include.patch b/x11-wm/mutter/files/3.32-eglmesaext-include.patch
deleted file mode 100644
index c91c56235f31..000000000000
--- a/x11-wm/mutter/files/3.32-eglmesaext-include.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From a444a4c5f58ea516ad3cd9d6ddc0056c3ca9bc90 Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
-Date: Sun, 20 Oct 2019 12:04:31 +0200
-Subject: [PATCH] EGL: Include EGL/eglmesaext.h
-
-The eglext.h shipped by libglvnd does not include the Mesa extensions,
-unlike the header shipped in Mesa.
-
-Fixes https://gitlab.gnome.org/GNOME/mutter/issues/876
----
- cogl/cogl/meson.build       | 2 +-
- src/backends/meta-egl-ext.h | 1 +
- src/backends/meta-egl.c     | 1 +
- src/backends/meta-egl.h     | 1 +
- 4 files changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/cogl/cogl/meson.build b/cogl/cogl/meson.build
-index 261955796..b0e66bff3 100644
---- a/cogl/cogl/meson.build
-+++ b/cogl/cogl/meson.build
-@@ -48,7 +48,7 @@ cogl_gl_header_h = configure_file(
- built_headers += [cogl_gl_header_h]
- 
- if have_egl
--  cogl_egl_includes_string = '#include <EGL/egl.h>\n#include <EGL/eglext.h>'
-+  cogl_egl_includes_string = '#include <EGL/egl.h>\n#include <EGL/eglext.h>\n#include <EGL/eglmesaext.h>'
- else
-   cogl_egl_includes_string = ''
- endif
-diff --git a/src/backends/meta-egl-ext.h b/src/backends/meta-egl-ext.h
-index 8705e7d5b..db0b74f76 100644
---- a/src/backends/meta-egl-ext.h
-+++ b/src/backends/meta-egl-ext.h
-@@ -29,6 +29,7 @@
- 
- #include <EGL/egl.h>
- #include <EGL/eglext.h>
-+#include <EGL/eglmesaext.h>
- 
- /*
-  * This is a little different to the tests shipped with EGL implementations,
-diff --git a/src/backends/meta-egl.c b/src/backends/meta-egl.c
-index 6554be935..fdeff4f77 100644
---- a/src/backends/meta-egl.c
-+++ b/src/backends/meta-egl.c
-@@ -27,6 +27,7 @@
- 
- #include <EGL/egl.h>
- #include <EGL/eglext.h>
-+#include <EGL/eglmesaext.h>
- #include <gio/gio.h>
- #include <glib.h>
- #include <glib-object.h>
-diff --git a/src/backends/meta-egl.h b/src/backends/meta-egl.h
-index f2a816445..4591e7d85 100644
---- a/src/backends/meta-egl.h
-+++ b/src/backends/meta-egl.h
-@@ -28,6 +28,7 @@
- 
- #include <EGL/egl.h>
- #include <EGL/eglext.h>
-+#include <EGL/eglmesaext.h>
- #include <glib-object.h>
- 
- #define META_EGL_ERROR meta_egl_error_quark ()
--- 
-2.22.0
-
diff --git a/x11-wm/mutter/files/3.34.6-XInitThreads.patch b/x11-wm/mutter/files/3.34.6-XInitThreads.patch
deleted file mode 100644
index f53f6ba93970..000000000000
--- a/x11-wm/mutter/files/3.34.6-XInitThreads.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 8b3f1117be1e90866747fa9c9e7ae1c5812ba918 Mon Sep 17 00:00:00 2001
-From: Daniel van Vugt <daniel.van.vugt@canonical.com>
-Date: Thu, 14 May 2020 18:13:56 +0800
-Subject: [PATCH] backend-x11: Reintroduce XInitThreads
-
-It was removed in 3.34 as part of 6ed5d2e2. And we thought that was the
-only thread that might exist and use X11. But the top gnome-shell crasher
-in 3.36 seems to suggest otherwise.
-
-We don't know what or where the offending thread is, but since:
-
- 1. We used XInitThreads for years already prior to 3.34; and
-
- 2. Extensions or any change to mutter/gnome-shell could conceivably use
-    threads to make X calls, directly or indirectly,
-
-it's probably a good idea to reintroduce XInitThreads. The failing assertion
-in libx11 is also accompanied by a strong hint:
-
-```
-fprintf(stderr, "[xcb] Most likely this is a multi-threaded client " \
-                "and XInitThreads has not been called\n");
-```
-
-https://bugs.launchpad.net/bugs/1877075
-
-Closes: https://gitlab.gnome.org/GNOME/mutter/-/issues/1252
-
-https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1256
-
-(cherry picked from commit 1d5f9b6917517d6e777a652cfa5e648794dc632a)
----
- src/backends/x11/meta-backend-x11.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/backends/x11/meta-backend-x11.c b/src/backends/x11/meta-backend-x11.c
-index 225d14d33..539ca5348 100644
---- a/src/backends/x11/meta-backend-x11.c
-+++ b/src/backends/x11/meta-backend-x11.c
-@@ -859,6 +859,7 @@ meta_backend_x11_class_init (MetaBackendX11Class *klass)
- static void
- meta_backend_x11_init (MetaBackendX11 *x11)
- {
-+  XInitThreads ();
- }
- 
- Display *
--- 
-2.20.1
-
diff --git a/x11-wm/mutter/mutter-3.34.6-r1.ebuild b/x11-wm/mutter/mutter-3.34.6-r1.ebuild
deleted file mode 100644
index 38632d43af67..000000000000
--- a/x11-wm/mutter/mutter-3.34.6-r1.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome.org gnome2-utils meson virtualx xdg
-
-DESCRIPTION="GNOME 3 compositing window manager based on Clutter"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/mutter/"
-
-LICENSE="GPL-2+"
-SLOT="0/5" # 0/libmutter_api_version - ONLY gnome-shell (or anything using mutter-clutter-<api_version>.pc) should use the subslot
-
-IUSE="elogind input_devices_wacom +introspection screencast +sysprof systemd test udev wayland"
-# native backend requires gles3 for hybrid graphics blitting support, udev and a logind provider
-REQUIRED_USE="
-	wayland? ( ^^ ( elogind systemd ) udev )
-	test? ( wayland )"
-RESTRICT="!test? ( test )"
-
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-# gnome-settings-daemon is build checked, but used at runtime only for org.gnome.settings-daemon.peripherals.keyboard gschema
-# xorg-server is needed at build and runtime with USE=wayland for Xwayland
-# v3.32.2 has many excessive or unused *_req variables declared, thus currently the dep order ignores those and goes via dependency() call order
-DEPEND="
-	x11-libs/libX11
-	>=x11-libs/gtk+-3.19.8:3[X,introspection?]
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/pango-1.30[introspection?]
-	>=dev-libs/fribidi-1.0.0
-	>=x11-libs/cairo-1.14[X]
-	>=gnome-base/gsettings-desktop-schemas-3.33.0[introspection?]
-	>=dev-libs/glib-2.61.1:2
-	gnome-base/gnome-settings-daemon
-	>=dev-libs/json-glib-0.12.0[introspection?]
-	gnome-base/gnome-desktop:3=
-	>=x11-libs/libXcomposite-0.4
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	>=x11-libs/libXfixes-3
-	>=x11-libs/libXi-1.7.4
-	x11-libs/libXtst
-	x11-libs/libxkbfile
-	x11-misc/xkeyboard-config
-	>=x11-libs/libxkbcommon-0.4.3[X]
-	x11-libs/libXrender
-	>=x11-libs/libXrandr-1.5.0
-	x11-libs/libxcb
-	x11-libs/libXinerama
-	x11-libs/libXau
-	x11-libs/libICE
-	>=dev-libs/atk-2.5.3[introspection?]
-	>=media-libs/libcanberra-0.26
-	media-libs/mesa[X(+),egl]
-	wayland? (
-		>=dev-libs/wayland-protocols-1.18
-		>=dev-libs/wayland-1.13.0
-		x11-libs/libdrm:=
-		>=media-libs/mesa-10.3[egl,gbm,wayland,gles2]
-		>=dev-libs/libinput-1.4
-		systemd? ( sys-apps/systemd )
-		elogind? ( sys-auth/elogind )
-		x11-base/xorg-server[wayland]
-	)
-	udev? ( >=dev-libs/libgudev-232:=
-		>=virtual/libudev-232-r1:= )
-	x11-libs/libSM
-	input_devices_wacom? ( >=dev-libs/libwacom-0.13 )
-	>=x11-libs/startup-notification-0.7
-	screencast? ( >=media-video/pipewire-0.2.2:0/0.2 )
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-"
-RDEPEND="${DEPEND}
-	gnome-extra/zenity
-"
-DEPEND="${DEPEND}
-	x11-base/xorg-proto
-	sysprof? ( >=dev-util/sysprof-capture-3.34.1-r1:3
-		<dev-util/sysprof-capture-3.35:3 )
-"
-# wayland bdepend for wayland-scanner, xorg-server for cvt utility
-BDEPEND="
-	dev-libs/wayland
-	>=dev-util/meson-0.50.0
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	test? ( app-text/docbook-xml-dtd:4.5 )
-	wayland? ( >=sys-kernel/linux-headers-4.4
-		x11-base/xorg-server )
-"
-
-PATCHES=(
-	"${FILESDIR}"/3.32-eglmesaext-include.patch
-	"${FILESDIR}"/${PV}-XInitThreads.patch
-	"${FILESDIR}"/${PV}-tests-dontreq-gdkwayland.patch
-)
-
-src_configure() {
-	# TODO: Replicate debug vs release meson build type behaviour under our buildtype=plain
-	local emesonargs=(
-		-Dopengl=true
-		#opengl_libname
-		#gles2_libname
-		$(meson_use wayland gles2)
-		-Degl=true
-		-Dglx=true
-		$(meson_use wayland)
-		$(meson_use wayland native_backend)
-		$(meson_use screencast remote_desktop)
-		-Degl_device=false # This should be dependent on wayland,video_drivers_nvidia, once eglstream support is there
-		-Dwayland_eglstream=false # requires packages egl-wayland for wayland-eglstream-protocols.pc
-		$(meson_use udev)
-		$(meson_use input_devices_wacom libwacom)
-		-Dpango_ft2=true
-		-Dstartup_notification=true
-		-Dsm=true
-		$(meson_use introspection)
-		$(meson_use test cogl_tests)
-		$(meson_use wayland core_tests) # core tests require wayland; overall -Dtests option is honored on top, so no extra conditional needed
-		$(meson_use test clutter_tests)
-		$(meson_use test tests)
-		$(meson_use sysprof profiler)
-		-Dinstalled_tests=false
-		#verbose # Let upstream choose default for verbose mode
-		#xwayland_path
-		# TODO: relies on default settings, but in Gentoo we might have some more packages we want to give Xgrab access (mostly virtual managers and remote desktops)
-		#xwayland_grab_default_access_rules
-	)
-	meson_src_configure
-}
-
-src_test() {
-	glib-compile-schemas "${BUILD_DIR}"/data
-	GSETTINGS_SCHEMA_DIR="${BUILD_DIR}"/data virtx meson_src_test
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/x11-wm/mutter/mutter-3.34.6-r2.ebuild b/x11-wm/mutter/mutter-3.34.6-r2.ebuild
deleted file mode 100644
index b1e49aa4318b..000000000000
--- a/x11-wm/mutter/mutter-3.34.6-r2.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome.org gnome2-utils meson virtualx xdg
-
-DESCRIPTION="GNOME 3 compositing window manager based on Clutter"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/mutter/"
-SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0/5" # 0/libmutter_api_version - ONLY gnome-shell (or anything using mutter-clutter-<api_version>.pc) should use the subslot
-
-IUSE="elogind input_devices_wacom +introspection +sysprof systemd test udev wayland"
-# native backend requires gles3 for hybrid graphics blitting support, udev and a logind provider
-REQUIRED_USE="
-	wayland? ( ^^ ( elogind systemd ) udev )
-	test? ( wayland )"
-RESTRICT="!test? ( test )"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-# gnome-settings-daemon is build checked, but used at runtime only for org.gnome.settings-daemon.peripherals.keyboard gschema
-# xorg-server is needed at build and runtime with USE=wayland for Xwayland
-# v3.32.2 has many excessive or unused *_req variables declared, thus currently the dep order ignores those and goes via dependency() call order
-DEPEND="
-	x11-libs/libX11
-	>=x11-libs/gtk+-3.19.8:3[X,introspection?]
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/pango-1.30[introspection?]
-	>=dev-libs/fribidi-1.0.0
-	>=x11-libs/cairo-1.14[X]
-	>=gnome-base/gsettings-desktop-schemas-3.33.0[introspection?]
-	>=dev-libs/glib-2.61.1:2
-	gnome-base/gnome-settings-daemon
-	>=dev-libs/json-glib-0.12.0[introspection?]
-	gnome-base/gnome-desktop:3=
-	>=x11-libs/libXcomposite-0.4
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	>=x11-libs/libXfixes-3
-	>=x11-libs/libXi-1.7.4
-	x11-libs/libXtst
-	x11-libs/libxkbfile
-	x11-misc/xkeyboard-config
-	>=x11-libs/libxkbcommon-0.4.3[X]
-	x11-libs/libXrender
-	>=x11-libs/libXrandr-1.5.0
-	x11-libs/libxcb
-	x11-libs/libXinerama
-	x11-libs/libXau
-	x11-libs/libICE
-	>=dev-libs/atk-2.5.3[introspection?]
-	>=media-libs/libcanberra-0.26
-	media-libs/mesa[X(+),egl]
-	wayland? (
-		>=dev-libs/wayland-protocols-1.18
-		>=dev-libs/wayland-1.13.0
-		x11-libs/libdrm:=
-		>=media-libs/mesa-10.3[egl,gbm,wayland,gles2]
-		>=dev-libs/libinput-1.4
-		systemd? ( sys-apps/systemd )
-		elogind? ( sys-auth/elogind )
-		x11-base/xorg-server[wayland]
-	)
-	udev? ( >=dev-libs/libgudev-232:=
-		>=virtual/libudev-232-r1:= )
-	x11-libs/libSM
-	input_devices_wacom? ( >=dev-libs/libwacom-0.13 )
-	>=x11-libs/startup-notification-0.7
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-"
-RDEPEND="${DEPEND}
-	gnome-extra/zenity
-"
-DEPEND="${DEPEND}
-	x11-base/xorg-proto
-	sysprof? ( >=dev-util/sysprof-capture-3.34.1-r1:3
-		<dev-util/sysprof-capture-3.35:3 )
-"
-# wayland bdepend for wayland-scanner, xorg-server for cvt utility
-BDEPEND="
-	dev-libs/wayland
-	>=dev-util/meson-0.50.0
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	test? ( app-text/docbook-xml-dtd:4.5 )
-	wayland? ( >=sys-kernel/linux-headers-4.4
-		x11-base/xorg-server )
-"
-
-PATCHES=(
-	"${WORKDIR}"/patches/
-	"${FILESDIR}"/3.32-eglmesaext-include.patch
-	"${FILESDIR}"/${PV}-tests-dontreq-gdkwayland.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)
-		-Dremote_desktop=false # not bothering with pipewire-0.2; to be reintroduced in newer mutter via pipewire-0.3
-		-Degl_device=false # This should be dependent on wayland,video_drivers_nvidia, once eglstream support is there
-		-Dwayland_eglstream=false # requires packages egl-wayland for wayland-eglstream-protocols.pc
-		$(meson_use udev)
-		$(meson_use input_devices_wacom libwacom)
-		-Dpango_ft2=true
-		-Dstartup_notification=true
-		-Dsm=true
-		$(meson_use introspection)
-		$(meson_use test cogl_tests)
-		$(meson_use wayland core_tests) # core tests require wayland; overall -Dtests option is honored on top, so no extra conditional needed
-		$(meson_use test clutter_tests)
-		$(meson_use test tests)
-		$(meson_use sysprof profiler)
-		-Dinstalled_tests=false
-		#verbose # Let upstream choose default for verbose mode
-		#xwayland_path
-		# TODO: relies on default settings, but in Gentoo we might have some more packages we want to give Xgrab access (mostly virtual managers and remote desktops)
-		#xwayland_grab_default_access_rules
-	)
-	meson_src_configure
-}
-
-src_test() {
-	glib-compile-schemas "${BUILD_DIR}"/data
-	GSETTINGS_SCHEMA_DIR="${BUILD_DIR}"/data virtx meson_src_test
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/x11-wm/mutter/mutter-3.36.4.ebuild b/x11-wm/mutter/mutter-3.36.4.ebuild
deleted file mode 100644
index e85b8ba36518..000000000000
--- a/x11-wm/mutter/mutter-3.36.4.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome.org gnome2-utils meson virtualx xdg
-
-DESCRIPTION="GNOME 3 compositing window manager based on Clutter"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/mutter/"
-
-LICENSE="GPL-2+"
-SLOT="0/6" # 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 +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
-	>=media-libs/graphene-1.9.3[introspection?]
-	>=x11-libs/gtk+-3.19.8:3[X,introspection?]
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/pango-1.30[introspection?]
-	>=dev-libs/fribidi-1.0.0
-	>=x11-libs/cairo-1.14[X]
-	>=gnome-base/gsettings-desktop-schemas-3.33.0[introspection?]
-	>=dev-libs/glib-2.61.1:2
-	gnome-base/gnome-settings-daemon
-	>=dev-libs/json-glib-0.12.0[introspection?]
-	gnome-base/gnome-desktop:3=
-	>=x11-libs/libXcomposite-0.4
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	>=x11-libs/libXfixes-3
-	>=x11-libs/libXi-1.7.4
-	x11-libs/libXtst
-	x11-libs/libxkbfile
-	x11-misc/xkeyboard-config
-	>=x11-libs/libxkbcommon-0.4.3[X]
-	x11-libs/libXrender
-	>=x11-libs/libXrandr-1.5.0
-	x11-libs/libxcb
-	x11-libs/libXinerama
-	x11-libs/libXau
-	x11-libs/libICE
-	>=dev-libs/atk-2.5.3[introspection?]
-	>=media-libs/libcanberra-0.26
-	sys-apps/dbus
-	media-libs/mesa[X(+),egl]
-	wayland? (
-		>=dev-libs/wayland-protocols-1.19
-		>=dev-libs/wayland-1.13.0
-		x11-libs/libdrm:=
-		>=media-libs/mesa-10.3[egl,gbm,wayland,gles2]
-		>=dev-libs/libinput-1.7
-		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
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-"
-RDEPEND="${DEPEND}
-	gnome-extra/zenity
-"
-DEPEND="${DEPEND}
-	x11-base/xorg-proto
-	sysprof? ( >=dev-util/sysprof-capture-3.35.2:3 )
-"
-# wayland bdepend for wayland-scanner, xorg-server for cvt utility
-BDEPEND="
-	dev-libs/wayland
-	>=dev-util/meson-0.50.0
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	test? ( app-text/docbook-xml-dtd:4.5 )
-	wayland? ( >=sys-kernel/linux-headers-4.4
-		x11-base/xorg-server )
-"
-
-PATCHES=(
-	"${FILESDIR}"/3.34.6-tests-dontreq-gdkwayland.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)
-		-Dremote_desktop=false # TODO: Re-enable with pipewire:0.3, but first get patches from gnome-3-36 for screencast on top of 3.36.4
-		-Degl_device=false # This should be dependent on wayland,video_drivers_nvidia, once eglstream support is there
-		-Dwayland_eglstream=false # requires packages egl-wayland for wayland-eglstream-protocols.pc
-		$(meson_use udev)
-		$(meson_use input_devices_wacom libwacom)
-		-Dpango_ft2=true
-		-Dstartup_notification=true
-		-Dsm=true
-		$(meson_use introspection)
-		$(meson_use test cogl_tests)
-		$(meson_use wayland core_tests) # core tests require wayland; overall -Dtests option is honored on top, so no extra conditional needed
-		$(meson_use test clutter_tests)
-		$(meson_use test tests)
-		$(meson_use sysprof profiler)
-		-Dinstalled_tests=false
-		#verbose # Let upstream choose default for verbose mode
-		#xwayland_path
-		# TODO: relies on default settings, but in Gentoo we might have some more packages we want to give Xgrab access (mostly virtual managers and remote desktops)
-		#xwayland_grab_default_access_rules
-	)
-	meson_src_configure
-}
-
-src_test() {
-	glib-compile-schemas "${BUILD_DIR}"/data
-	GSETTINGS_SCHEMA_DIR="${BUILD_DIR}"/data virtx meson_src_test
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/x11-wm/mutter/mutter-3.36.5.ebuild b/x11-wm/mutter/mutter-3.36.7.ebuild
index f3cd2c8909df..f5dc0a1d9f9b 100644
--- a/x11-wm/mutter/mutter-3.36.5.ebuild
+++ b/x11-wm/mutter/mutter-3.36.7.ebuild
@@ -6,6 +6,7 @@ inherit gnome.org gnome2-utils meson virtualx xdg
 
 DESCRIPTION="GNOME 3 compositing window manager based on Clutter"
 HOMEPAGE="https://gitlab.gnome.org/GNOME/mutter/"
+SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0/6" # 0/libmutter_api_version - ONLY gnome-shell (or anything using mutter-clutter-<api_version>.pc) should use the subslot
diff --git a/x11-wm/mutter/mutter-3.36.4-r1.ebuild b/x11-wm/mutter/mutter-3.38.1.ebuild
index 1378bd57cf53..9dd9645f751b 100644
--- a/x11-wm/mutter/mutter-3.36.4-r1.ebuild
+++ b/x11-wm/mutter/mutter-3.38.1.ebuild
@@ -6,10 +6,9 @@ inherit gnome.org gnome2-utils meson virtualx xdg
 
 DESCRIPTION="GNOME 3 compositing window manager based on Clutter"
 HOMEPAGE="https://gitlab.gnome.org/GNOME/mutter/"
-SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
 
 LICENSE="GPL-2+"
-SLOT="0/6" # 0/libmutter_api_version - ONLY gnome-shell (or anything using mutter-clutter-<api_version>.pc) should use the subslot
+SLOT="0/7" # 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
@@ -31,7 +30,7 @@ DEPEND="
 	>=x11-libs/pango-1.30[introspection?]
 	>=dev-libs/fribidi-1.0.0
 	>=x11-libs/cairo-1.14[X]
-	>=gnome-base/gsettings-desktop-schemas-3.33.0[introspection?]
+	>=gnome-base/gsettings-desktop-schemas-3.37.2[introspection?]
 	>=dev-libs/glib-2.61.1:2
 	gnome-base/gnome-settings-daemon
 	>=dev-libs/json-glib-0.12.0[introspection?]
@@ -58,9 +57,9 @@ DEPEND="
 	media-libs/mesa[X(+),egl]
 	wayland? (
 		>=dev-libs/wayland-protocols-1.19
-		>=dev-libs/wayland-1.13.0
+		>=dev-libs/wayland-1.18.0
 		x11-libs/libdrm:=
-		>=media-libs/mesa-10.3[egl,gbm,wayland,gles2]
+		>=media-libs/mesa-17.3[egl,gbm,wayland,gles2]
 		>=dev-libs/libinput-1.7
 		systemd? ( sys-apps/systemd )
 		elogind? ( sys-auth/elogind )
@@ -79,12 +78,11 @@ RDEPEND="${DEPEND}
 "
 DEPEND="${DEPEND}
 	x11-base/xorg-proto
-	sysprof? ( >=dev-util/sysprof-capture-3.35.2:3 )
+	sysprof? ( >=dev-util/sysprof-capture-3.38.0:4 )
 "
 # wayland bdepend for wayland-scanner, xorg-server for cvt utility
 BDEPEND="
 	dev-libs/wayland
-	>=dev-util/meson-0.50.0
 	dev-util/gdbus-codegen
 	dev-util/glib-utils
 	>=sys-devel/gettext-0.19.8
@@ -94,11 +92,6 @@ BDEPEND="
 		x11-base/xorg-server )
 "
 
-PATCHES=(
-	"${WORKDIR}"/patches/ # various gnome-3-36 patches for screencast
-	"${FILESDIR}"/3.34.6-tests-dontreq-gdkwayland.patch
-)
-
 src_configure() {
 	# TODO: Replicate debug vs release meson build type behaviour under our buildtype=plain
 	local emesonargs=(
diff --git a/x11-wm/pekwm/Manifest b/x11-wm/pekwm/Manifest
index 48b587f5c4da..be7ceb355046 100644
--- a/x11-wm/pekwm/Manifest
+++ b/x11-wm/pekwm/Manifest
@@ -3,4 +3,4 @@ DIST pekwm-0.1.17.tar.gz 429100 BLAKE2B 2b467539ef47f4404411f25146f9f945f9a63b7e
 DIST pekwm-themes.tar.bz2 138599 BLAKE2B b0c103d7ade6f9bb1ed19b7e12cfcf00fb48be7e1ed141a4b52aee404ebf9c7af5d29af166ff7265a720ca8d122ad7eddb6eaf42a0a8e18b6c1ff3af7b5e12d0 SHA512 c95bc980b5aeeb4f4832cb2dbbf82adf72e4a784fcd46432fd6e6a6577ef02823ec1c4b861d07747c066050fc5040aca975e2cdc78342abab99a3d486888a25d
 EBUILD pekwm-0.1.17-r1.ebuild 1695 BLAKE2B 4f9f97e2ed2bfe595283c2bd5e7dae38f620d640b6bf4e9422a5bc4434628c77a51fba7aafc82ef988551d45d948b2949d0470903fce65520c12c3d846af909c SHA512 1c0471b6b671428e1227bfbad8ebbe48a0783bcfcf4561d5c3db74dd907264bbd30eb3c3654bbd5a1bde0a520417186e3e6a1c8d5bc862c0fc691969389a7e0c
 EBUILD pekwm-0.1.17-r2.ebuild 1838 BLAKE2B 40795ce2f870024b519d76ea7989a62d805cf92b98b47a99ec3d3546fcbe756dad66f6c435e4c5adf3429a705e380c03fd34e1e037827b4ba48d1cabda106149 SHA512 2716cace727eec86daeef1b53754339cf50962421ff48b09a8c928dab4b7735cc369518a00165653f582df6410b0a55f05a0d716eda0580d0d9ad07990c9b7f3
-MISC metadata.xml 1043 BLAKE2B 0f25d178a73e10fab1bf25342cbc22c7353c7c3687e92473076a39ed37b90f96826dce5b32997976bbda17e1d13b1e706f7a42c635001807b5e63224045af73b SHA512 b49fe56ed6f19963222c1268e8ef524525767594b969e6359f3efb6aef3b3dd25ebf9e7cb31bc8150c5b3d4e282d3a814d61b657a5e79eeddeb40730fd2f9b50
+MISC metadata.xml 968 BLAKE2B 61ebb7661defcb80be3a193ea230be7d657503fe5a4885496fe58152bb63b323f6b94de08b8df52608b640ceba2155c5041a2e452558093571d0bce55b15fd8f SHA512 02042a7c09730767185d59cbd0152a0286d8c1e8c7d9bdcbbed6ed9856c576372dbd3f4375b389d32f207939bdf7a4e60db5804bad07e81d689b79668e77bcba
diff --git a/x11-wm/pekwm/metadata.xml b/x11-wm/pekwm/metadata.xml
index 5d97b5bb7def..2b003ee6b95c 100644
--- a/x11-wm/pekwm/metadata.xml
+++ b/x11-wm/pekwm/metadata.xml
@@ -2,9 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>jer@gentoo.org</email>
-	</maintainer>
-	<maintainer type="person">
 		<email>linbug+gbz@posteo.org</email>
 		<name>Andreas Schlick</name>
 	</maintainer>
diff --git a/x11-wm/ratpoison/Manifest b/x11-wm/ratpoison/Manifest
index 405a3834ae77..d508d9dc21ad 100644
--- a/x11-wm/ratpoison/Manifest
+++ b/x11-wm/ratpoison/Manifest
@@ -7,4 +7,4 @@ DIST ratpoison-1.4.9.tar.xz 315584 BLAKE2B 18cff2ed835579b606ea99defda04db6ebaed
 EBUILD ratpoison-1.4.8-r1.ebuild 1806 BLAKE2B 0f89cf825b9e89482f2f78174a48a74bb082c81dd0a0f449b0355b98037f4f3369ee9025dd864b0f87c36ca867e0fe84042a3b5c3be7de04060081341c170e7f SHA512 ea3bdca5248dc8e71841717dc7af88b8b5342278aad37e64456cdf15b8036cc782df894ec7c1d537d9805cf23bdc633a41833bc1ad10b1582a631d46164b9f77
 EBUILD ratpoison-1.4.9.ebuild 1848 BLAKE2B 435bacde6d01720216be440df1ebe9aa933e9f546a33a5c7cb72f30399b1f6e6165ff99fdc44b0321f9a93807a17cac848a7963c42b2c8080424018adb363b3f SHA512 9ccb71e717e2e43b42cbdba32f475a837928fc5b7dc4066d9ee3aad1d9b613bc84806e5e0f505824b8cb398ed9365161a690290783305497e3fb213aefcb7866
 EBUILD ratpoison-9999.ebuild 1849 BLAKE2B 980bdfe6a063c8fd949f123cadb2086684b06a708fe0aa0df8fc811121f4108ef68454f52405a0bec625c531900cd146a546104242b95240b56ddeb2df5ac1c9 SHA512 3a764c4fa0cc0e7a48d6f079c618faceb00fd0a5755e28f061811802e052683e9d4c304ae263d09af43f7d591a8d226ca0f8b5b5e26c782a8694883d908d3335
-MISC metadata.xml 1036 BLAKE2B 5982e3f331cef53bcc5b9809dab21e7d6f7cae85665c66650e2b09b66e7a7657511eada8fa450bad6b27804cf20dc56867686222e2cb35edc614ab2ff0ea83a0 SHA512 d40c0383ad7243df552727fda5979063a1138224b3eb4ed85cd730ad61af76fa688a74d023c46562856655f1d0c15af748d933f4cc8b61faa7cbc7eed6f4c149
+MISC metadata.xml 994 BLAKE2B da7a977d643d540812fffa082f5cba76cd79728302533e77627825a08fb0bace3a2b3bb917cd8b6cd3cecd2c03182b72ac902909a4c7d575f8e2ea936a510953 SHA512 f64106b49cfcfb17e08d3c897be4de0ef3df083fded72804d9b0e0f4e2eedcc2c8c679dea96c59dcb41937b547497ac1445102c0a63ef965f92b450dda0edec4
diff --git a/x11-wm/ratpoison/metadata.xml b/x11-wm/ratpoison/metadata.xml
index 00627b349571..c1ffdeb3c898 100644
--- a/x11-wm/ratpoison/metadata.xml
+++ b/x11-wm/ratpoison/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person"><email>jer@gentoo.org</email></maintainer>
+	<!-- maintainer-needed -->
 	<longdescription>
 		Ratpoison is a simple Window Manager with no fat library dependencies,
 		no fancy graphics, no window decorations, and no rodent dependence. It
diff --git a/x11-wm/spectrwm/Manifest b/x11-wm/spectrwm/Manifest
index 20b75fc68188..39d0f5b10292 100644
--- a/x11-wm/spectrwm/Manifest
+++ b/x11-wm/spectrwm/Manifest
@@ -4,5 +4,5 @@ AUX spectrwm-3.4.1-musl.patch 259 BLAKE2B 61dde875af4c9fb8be72a098debe0ac00174ee
 DIST spectrwm-3.1.0.tar.gz 147206 BLAKE2B abcce22bc7859dbcc109f02ea832d65091c842562579d47cd1dd83c5de82a015b02343972d4d85cf291b63bfbaf0e901616cca94d911014672ffc35436bdd3c1 SHA512 dd8e16361b979a55b210a88a1ae5d53e7086fd854e92320e09b6407d374580cc271c0e974e38606481ab57a504a86e16293edee967d251b043a1eb65e8c77687
 DIST spectrwm-3.4.1.tar.gz 164507 BLAKE2B 8047e639be3d4a07616f7ef3911765c5d6dd7dbd56c684453db90283faee08aac2cb9e3e20ae42f839582b67b778a4490a04fa21fc90fe489f798c40c517351e SHA512 94d468833124b51fa12b29b173126f10f27dd551d599459e4bea589721b3df6f1f0af0ea67326ed3ad462e1203d3bbcb82032ff83abfa0943ec45afd29dedaa6
 EBUILD spectrwm-3.1.0.ebuild 1132 BLAKE2B dacd1cfb94ef799132eef7ee5d7f0c4d521b417529403ca81c4657074df5e61f52af0bd3baee5d53a8652f8e5456fb835ae9c11320a902b99cbb4eb97e7bf06e SHA512 b31a2e6cd77ae1117929f063f8b6cc7cd3a0167189fd3fd86d95254ea91bc6173414b7354af029d2671e08b6f62c9f0cefccc509ea89108fdb562fdf906096bf
-EBUILD spectrwm-3.4.1.ebuild 1166 BLAKE2B d1d4b36423904d895100af64cc518e6bf2f56388f19b55c77fda2d47aa0e5c8c969a8465ec9c391ff9c11b66acb6cf8f42a0a982876d4a951d2445d9caf9e6b9 SHA512 c105ab1e5b86a214647a447e0ac58721a0ae4cb669e332e449a9d3e77c99958cdcea2b9f788291ed9cbe8760fa68bce7cafeb3233640b4e03df5152d1353fa36
+EBUILD spectrwm-3.4.1.ebuild 1164 BLAKE2B fcbd535dd17560efb09016fc30ff0ef4a2b4375a24412ecfa118fa734c06a163dfa90c9c201ef778dc96482093e6534169bad2518ca1e1904eadbdfe03abd4d8 SHA512 2bf7269931f1cf435f6794333396c71a1c1c9a15f08c2c3d304fd0a138b0ed85b35671b7304179147c148bbc0fcd90eaee4eedc6c84b1a999d120aa136611740
 MISC metadata.xml 244 BLAKE2B 24ebafa89c32f799b62237b0d9442143de8ccb86c1625f2a49dd91ec9caa63cadc52000005b5b5ef148df89e907e1407330a8d8411ffb5f4facaf629a3184cb8 SHA512 d7a2290eb2970ef7fb9bea275b209c7ace388daadcf3e317b099767d72c7d9f0b894e23492f02e973d27010a7568e48549e4f502c9628efc3133012680304784
diff --git a/x11-wm/spectrwm/spectrwm-3.4.1.ebuild b/x11-wm/spectrwm/spectrwm-3.4.1.ebuild
index d70a5915120a..9f77e6443e36 100644
--- a/x11-wm/spectrwm/spectrwm-3.4.1.ebuild
+++ b/x11-wm/spectrwm/spectrwm-3.4.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/conformal/spectrwm/archive/${PN^^}_${PV//./_}.tar.gz
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	!x11-wm/scrotwm
diff --git a/x11-wm/wmfs/Manifest b/x11-wm/wmfs/Manifest
index 9dc242b15757..3cab5b98d8e8 100644
--- a/x11-wm/wmfs/Manifest
+++ b/x11-wm/wmfs/Manifest
@@ -9,4 +9,4 @@ DIST wmfs-20180520.tar.xz 56364 BLAKE2B 23530193ba2c37ae4129fd23dda2ff8cd301b0bd
 EBUILD wmfs-201003.ebuild 968 BLAKE2B 89d8b905ba1c0a6c0016e9b0b40e0f3bd5ef538134e72b7b560dac4547a5f875081d3275604fc66a274ebb118556295433516ee884aa815fe8572cb2a766fc24 SHA512 4afaf1556dd33aa42c749a22929a815ec7970156963e39cc6e78e2d56dbbf465554889e4bb1ed1534e92ee0fbdc00803cf873408d8a014d197702c82ac803bc2
 EBUILD wmfs-20180520.ebuild 1132 BLAKE2B cb7e3aebeb66a9c09f0984f6ef7d3b1971e1365c12af12a2ba33484aa05b67bbe62f24a586b04c3d0000a69941378868c2104813ea5a43618617c1a48f4a88ba SHA512 49d7081c5c0f5cf9177b898b3eb81e9275fa06aa9a45afeb235b5c3742e92f28edbc80fca9310fc1c4172fa5ab8eac3d90b2822afb5f331e88d82b8aee380dc0
 EBUILD wmfs-99999999.ebuild 1130 BLAKE2B d0e2ae315de0ce2a810b0ff2b7bfb5dcd0ea6f2e98201ade65e7f4154c61a421a1c642c541078379ef3ff6d31ce2aa78f50423454251bba4649286b3cef38d46 SHA512 b52a4cbb7ef9268c7e3da454d08ea38df0d1f585ea94ca71f4dc7da157f19b85f50749b9ef7f71226c2ec0304c23c3de1ca8b07bbfb4961a7a85a7c517bff2ad
-MISC metadata.xml 380 BLAKE2B 318de05f3f531b8c35e71a0563525f7c8a1397e0ba4adbd086b768c93d792d8c336da47bc7582dfc7b0f4ce2917dcccb21191f46c064b02317477ef3a568ee17 SHA512 644e88ac0ca2d999cd273f807d45400a8438a9800b3b744f764c914fa41d819efd55ecaa27de6cbcf4403491f2986299fc1c032afd26fee67822cfc2c6368359
+MISC metadata.xml 336 BLAKE2B 5d66f337a18e7d54f2d7abbc8672612dab7be31e8c1a8d6a2a032a64b249f0f65545ee682b7e1e19df79e7281fdfde0f17ed413be4b87ca3fa50b6870355e600 SHA512 0e2222aeca29e5dd47fda57312c5cbd2f6f21da457a9ba41332455f4be59de94dc2f23df4795131d76a2b524997f2c127427c508321ac465990599e2342e4b08
diff --git a/x11-wm/wmfs/metadata.xml b/x11-wm/wmfs/metadata.xml
index 5938d928ad74..498c6454722c 100644
--- a/x11-wm/wmfs/metadata.xml
+++ b/x11-wm/wmfs/metadata.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>jer@gentoo.org</email>
-</maintainer>
+<!-- maintainer-needed -->
 <use>
 <flag name="imlib2">Enable image support through <pkg>media-libs/imlib2</pkg></flag>
 </use>
diff --git a/x11-wm/xoat/Manifest b/x11-wm/xoat/Manifest
index 4458d17b6fe4..47163060e09f 100644
--- a/x11-wm/xoat/Manifest
+++ b/x11-wm/xoat/Manifest
@@ -1,2 +1,2 @@
 EBUILD xoat-9999.ebuild 872 BLAKE2B b532ceab8336c8fdcf1b2146186e5c17a0ee6ca69e796bf95c82596029f707659ccd4337e826e83cf3df461966f6af6076f5b6ed82c211516ad2a99ede8b71f1 SHA512 699f4cb3dce846d331bcbe0281862b56cbf4a010f71a8e2682971f324858af967ddf3fc7c81b2351ccb900e15f79795616c30cb4a85cdd905ecf3e2772578356
-MISC metadata.xml 295 BLAKE2B 43f1fc1dcd0e05a888e3ec1d708a588b47b926b357a6c7a9f37b6b6941b3687f61d7d34808f61d90d4dd9a003da8e099ec7cc5917609a3d22768930c9d371874 SHA512 dcf39022dd854a3682c0f4bbd85c3d37ef76d374ffec74b6f3b78108e8eac4c4328937d5476958e00c74d9fd721f82c1555c079425daa9e81b5b5b5018768211
+MISC metadata.xml 248 BLAKE2B 0018deaef88f2739f30278c7b7658c96bb4bfff7a49442c9012295f853de442a3b3ce549dbcc935b9c9f82562a768f9c4d6b12c8f4042482ba4deeb544cf6dd5 SHA512 d42c4dd1579bce7f4c3c4f9295d8249f3b05ae42bb2b72a961282f2e405085c2492591e9306fc7ec84179824d58579376f5d7639105caca2a647724db6ecf379
diff --git a/x11-wm/xoat/metadata.xml b/x11-wm/xoat/metadata.xml
index cb3714e24077..8ba31104257c 100644
--- a/x11-wm/xoat/metadata.xml
+++ b/x11-wm/xoat/metadata.xml
@@ -1,9 +1,7 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>jer@gentoo.org</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">seanpringle/xoat</remote-id>
 	</upstream>
diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest
index f1073ee87915..2c14aec15a06 100644
--- a/x11-wm/xpra/Manifest
+++ b/x11-wm/xpra/Manifest
@@ -2,8 +2,11 @@ AUX xpra-2.0-suid-warning.patch 617 BLAKE2B dc7f1ba0ec9e30e260601f1151edb4385561
 AUX xpra-3.0.2-dbus.patch 1128 BLAKE2B c908950df22a16174c7885543e93277902826b8b0273472e8e70ea563d1fe24a0c9ca624e65fe1b312e27d093a7d24acda8db685cd3bdae29bd712a23b5d0d2d SHA512 c2d913ccb82cac41bd16271a878459fc4468620d9f235c2aaab3af7d327a666c8830cea43ba49da7a4faf9b609e6b3b8bbbf02f377399778af01139af4a38c88
 AUX xpra-3.0.2-ldconfig.patch 1270 BLAKE2B b4eaa81610899c16a43b43c5f11f93335ca48add1302ed2bc2d6f1d6a1df3c234a65562c42b19b7ad53b0d267d9763606d43ba3ce18cfb6d70565d2f684dbe7c SHA512 09684ac0ac9626d1a441fb17a61919b3b1685520affcc72aa59e64c24ad55ffc7712af57e2ec392710e7dc412039daa6c76456ee6d5464a3e4057fb61d9ad7b1
 AUX xpra-3.0.2_ignore-gentoo-no-compile.patch 610 BLAKE2B 963b3b61602f6a7ad7c8247109932d0da7eeef2762eaa8a987a8f10178a13cec3255000661bc7e3344319a555c9f0ed41b6383be7728af543cb5d2e004c377b2 SHA512 ff16637dca766ba2d36351e1aeeb87f2bab02e73e8da8fdb566051727b0c6fec6df1925318eee8d1c87580196ec78f0303da56d3439b4b4bace3105a914251e8
+AUX xpra-4.0.3-suid-warning.patch 731 BLAKE2B 6e576c088bc59ee7a52e15a8fbceb9117a47e4bf818b6777ffe977b5db1f9e72077ffeea07570312603f160d5556d2980914887f56d9733b1b6bf49ae385d0e4 SHA512 d3a3c2a2510159e83d6d6bda11f37b5500ce80d4bac059d3bcee8293caa93652a132d074f46a728204b012c61707994ebb87e0e02afd0c4efeab7a705ba5ea69
 DIST xpra-3.0.2.tar.xz 2749196 BLAKE2B 3c8745657a12637704fb88ac7b867ab387ef7ed2250396d9e534aecf81e40f85332a2c51ba49638834012f4a4d85c03bd7e49ee259bb2400aeb60fb06abf8b59 SHA512 115f606ff5886d99a906f318cb1a7a4a86e80ebf23e4336e67938267d92ef624de577cc8fc06c6ce541b7c44a0cef58d930b5928f32e24dfc67c72127c7b623c
 DIST xpra-3.0.5.tar.xz 2752016 BLAKE2B a36d6a4ebb0b14665014da92d510c0d5f978c96db653709ddc09a1015426d6ac6f71f9a221db68ee1114c95eeaca6600f9e49102ce9f936d9b0ee298ac432647 SHA512 3dbc122ebc8c4aa67154acfe92668ac364d8469022b03e28946d763e4d396f8c707690b2a4dbf07b55545259a53b46c9dd94e6e40131289ccc3dce6a88107681
+DIST xpra-4.0.4.tar.xz 2792512 BLAKE2B e16c47e82cf9f8712521c8f9c436b7bb819d9469fc0135ade1f2c9fc6f2a8a0fecf417caae87a1eca9c4b6daec1a82add5d6547208caee1a1d681ebc7b3d3d3b SHA512 91a90cdab775ec2501ef1601188b97ca4aa741e541f8d941add8d509767790a144b67f094177dda7539eff305710f2c834b90a93e9441437dac615677963094c
 EBUILD xpra-3.0.2-r1.ebuild 3989 BLAKE2B 32811ece71f24899d5a133946044ba54587fa2817da62205211fb4bf67184b44c51297f7c4c44853d39aee3709d1c75d07cb8376c5dcfbc3981b7e77e49dd2ce SHA512 ceb14272f61547d15def0d22c2440748ea144a832d89e7e9086d0dde8b394dc29041945c32a9a38fdca14d53a3f0545e6b74086c1ba60c771135dfcf4ecf3e9a
-EBUILD xpra-3.0.5-r1.ebuild 3644 BLAKE2B e4b7669ac886c340148316e82824fd3508d13ef7bbc2d459682be93306fbea575aa1a1eb17054a2287f6de9f67cd23ca9f78c828e5044a4c9c1db03950e2e4a4 SHA512 8567c49d536ca6d8073191b5323c1a07c4f01cda55465e8de2937b7783c549fa537265116fc3085463c979110b48b1e6e7bbbecfc7d2ac339fa37a60d8103d67
-MISC metadata.xml 1183 BLAKE2B 3401d4bc8847e1da6884abaa431cf0c64bc6cd2d1e118bde8b225f8a3670b561d9109cfa248652a71c397a9cdc8d50f6fd83a48ab41de569e03e22e63f5acd2b SHA512 5a48871a51cebe09db53997d61e49ed0828be430f34772b88fc06770bd90a935bec31e0dce7fb78756c337faf9cc1fa4896f5d6d709857fee9fde007ec0b0986
+EBUILD xpra-3.0.5-r2.ebuild 3843 BLAKE2B 9be5685148f89315a8b715034a00a4c83947ce561ea08cf43af02352aa1c6f057fe71aa4000500421a41edac3a6f190179de1d325c50e92c9a19c3752db49ce3 SHA512 15ca9c77547f7e0c0388e3217aa908e000b8a2b3c0360ec32c54c8a2d2a31344f6940c9496b66624c96a2e4328ca0fc281291452f61b6cf9c20c0d63de33d6e4
+EBUILD xpra-4.0.4.ebuild 3664 BLAKE2B ba0a5c10d9ad9333045b4b40d1e0d068386b43645b5aab3b132fe980be7fa41c3f9b20520701d01646dbd53c69c70735afd3fcf2ccef8fc50a5add38f9b4e028 SHA512 3c08b19f7ccd12ccefae3d516132fa079980e9bc18fc7f30562ce2ce9f2fbd324f4cd59638d52c76a48e8cd50d55a1e2fb40c404099f8523eaae87cefa6581cb
+MISC metadata.xml 1245 BLAKE2B afa173eb082c199aae4f79ba9687c1162678a3a80cca8b19f140a210f0d029f3fa3f857e02e6fa1daa96794b586d1e0e9c1f03cddd8a8b10987ac1a96a9f292d SHA512 bcde5f696375a6294e668adae79607c0313414906d8bd647e99a38898a48d360ccdeaf4236da2aba1486e8a3f7783b8bb92c7da5b71fc31906d7ec932820d1bd
diff --git a/x11-wm/xpra/files/xpra-4.0.3-suid-warning.patch b/x11-wm/xpra/files/xpra-4.0.3-suid-warning.patch
new file mode 100644
index 000000000000..ae590110f1c3
--- /dev/null
+++ b/x11-wm/xpra/files/xpra-4.0.3-suid-warning.patch
@@ -0,0 +1,12 @@
+diff -Nuar a/xpra/scripts/config.py b/xpra/scripts/config.py
+--- a/xpra/scripts/config.py	2020-05-10 19:00:55.000000000 +0200
++++ b/xpra/scripts/config.py	2020-06-07 18:35:49.361899872 +0200
+@@ -150,7 +150,7 @@
+             if (xorg_stat.st_mode & stat.S_ISUID)!=0:
+                 if (xorg_stat.st_mode & stat.S_IROTH)==0:
+                     if warn:
+-                        warn("%s is suid and not readable, Xdummy support unavailable" % xorg_bin)
++                        debug("%s is suid and not readable, Xdummy support unavailable" % xorg_bin)
+                     return get_Xvfb_command()
+                 debug("%s is suid and readable, using the xpra_Xdummy wrapper" % xorg_bin)
+                 use_wrapper = True
diff --git a/x11-wm/xpra/metadata.xml b/x11-wm/xpra/metadata.xml
index e1742788d2bf..349c6f4b186e 100644
--- a/x11-wm/xpra/metadata.xml
+++ b/x11-wm/xpra/metadata.xml
@@ -17,6 +17,7 @@
 	<bugs-to>https://www.xpra.org/trac/report</bugs-to>
 </upstream>
 <use>
+	<flag name="brotli">Enable brotli compression support</flag>
 	<flag name="client">Build client-side code</flag>
 	<flag name="clipboard">Enable clipboard support</flag>
 	<flag name="csc">Enable csc softscaler support</flag>
diff --git a/x11-wm/xpra/xpra-3.0.5-r1.ebuild b/x11-wm/xpra/xpra-3.0.5-r2.ebuild
index 843bae636e49..3be5dbb76552 100644
--- a/x11-wm/xpra/xpra-3.0.5-r1.ebuild
+++ b/x11-wm/xpra/xpra-3.0.5-r2.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=6
 
-# PyCObject_Check and PyCObject_AsVoidPtr vanished with python 3.3
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+DISTUTILS_USE_SETUPTOOLS=no
 inherit xdg distutils-r1 eutils flag-o-matic user tmpfiles prefix
 
 DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based on wimpiggy"
@@ -13,7 +13,7 @@ SRC_URI="http://xpra.org/src/${P}.tar.xz"
 
 LICENSE="GPL-2 BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+client +clipboard csc cups dbus ffmpeg jpeg +lz4 lzo opengl pillow pulseaudio server sound test vpx webcam webp"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
@@ -36,7 +36,10 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	ffmpeg? ( >=media-video/ffmpeg-3.2.2:0=[x264,x265] )
 	jpeg? ( media-libs/libjpeg-turbo )
 	opengl? ( dev-python/pyopengl )
-	pulseaudio? ( media-sound/pulseaudio )
+	pulseaudio? (
+		media-sound/pulseaudio
+		media-plugins/gst-plugins-pulse:1.0
+	)
 	sound? ( media-libs/gstreamer:1.0
 		media-libs/gst-plugins-base:1.0
 		dev-python/gst-python:1.0 )
@@ -74,6 +77,14 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-3.0.2-ldconfig.patch
 )
 
+src_install() {
+	distutils-r1_src_install
+
+	mkdir -p "${ED}/usr/share/metainfo" || die
+	mv "${ED}/usr/share/appdata/"* "${ED}/usr/share/metainfo/" || die
+	rmdir "${ED}/usr/share/appdata" || die
+}
+
 pkg_postinst() {
 	enewgroup ${PN}
 	tmpfiles_process /usr/lib/tmpfiles.d/xpra.conf
diff --git a/x11-wm/xpra/xpra-4.0.4.ebuild b/x11-wm/xpra/xpra-4.0.4.ebuild
new file mode 100644
index 000000000000..ff3e6b932135
--- /dev/null
+++ b/x11-wm/xpra/xpra-4.0.4.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+DISTUTILS_USE_SETUPTOOLS=no
+inherit xdg distutils-r1 eutils flag-o-matic tmpfiles prefix
+
+DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based on wimpiggy"
+HOMEPAGE="http://xpra.org/ http://xpra.org/src/"
+SRC_URI="http://xpra.org/src/${P}.tar.xz"
+
+LICENSE="GPL-2 BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="brotli +client +clipboard csc cups dbus ffmpeg jpeg +lz4 lzo opengl pillow pulseaudio server sound test vpx webcam webp"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	|| ( client server )
+	cups? ( dbus )
+	opengl? ( client )
+"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	x11-libs/gtk+:3[introspection]
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXfixes
+	x11-libs/libXrandr
+	x11-libs/libXtst
+	x11-libs/libxkbfile
+	brotli? ( app-arch/brotli )
+	csc? ( >=media-video/ffmpeg-1.2.2:0= )
+	ffmpeg? ( >=media-video/ffmpeg-3.2.2:0=[x264,x265] )
+	jpeg? ( media-libs/libjpeg-turbo )
+	opengl? ( dev-python/pyopengl )
+	pulseaudio? (
+		media-sound/pulseaudio
+		media-plugins/gst-plugins-pulse:1.0
+	)
+	sound? ( media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+		dev-python/gst-python:1.0 )
+	vpx? ( media-libs/libvpx media-video/ffmpeg )
+	webp? ( media-libs/libwebp )
+"
+RDEPEND="${COMMON_DEPEND}
+	acct-group/xpra
+	dev-python/netifaces[${PYTHON_USEDEP}]
+	dev-python/rencode[${PYTHON_USEDEP}]
+	dev-python/pillow[jpeg?,${PYTHON_USEDEP}]
+	virtual/ssh
+	x11-apps/xmodmap
+	cups? ( dev-python/pycups[${PYTHON_USEDEP}] )
+	dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
+	lz4? ( dev-python/lz4[${PYTHON_USEDEP}] )
+	lzo? ( >=dev-python/python-lzo-0.7.0[${PYTHON_USEDEP}] )
+	opengl? (
+		client? ( dev-python/pyopengl_accelerate[${PYTHON_USEDEP}] )
+	)
+	server? ( x11-base/xorg-server[-minimal,xvfb]
+		x11-drivers/xf86-input-void
+	)
+	webcam? ( dev-python/numpy[${PYTHON_USEDEP}]
+		media-libs/opencv[python]
+		dev-python/pyinotify[${PYTHON_USEDEP}] )"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+	>=dev-python/cython-0.16[${PYTHON_USEDEP}]"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.0.2_ignore-gentoo-no-compile.patch
+	"${FILESDIR}"/${PN}-3.0.2-ldconfig.patch
+	"${FILESDIR}"/${PN}-4.0.3-suid-warning.patch
+)
+
+pkg_postinst() {
+	tmpfiles_process /usr/lib/tmpfiles.d/xpra.conf
+
+	xdg_pkg_postinst
+}
+
+python_prepare_all() {
+	hprefixify -w '/os.path/' setup.py
+	hprefixify tmpfiles.d/xpra.conf xpra/server/server_util.py \
+		xpra/platform{/xposix,}/paths.py xpra/scripts/server.py
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	sed -e "/'pulseaudio'/s:DEFAULT_PULSEAUDIO:$(usex pulseaudio True False):" \
+		-i setup.py || die
+
+	mydistutilsargs=(
+		--without-PIC
+		--without-Xdummy
+		$(use_with client)
+		$(use_with clipboard)
+		$(use_with csc csc_swscale)
+		--without-csc_libyuv
+		--without-cuda_rebuild
+		--without-cuda_kernels
+		$(use_with cups printing)
+		--without-debug
+		$(use_with dbus)
+		$(use_with ffmpeg dec_avcodec2)
+		$(use_with ffmpeg enc_ffmpeg)
+		$(use_with ffmpeg enc_x264)
+		$(use_with ffmpeg enc_x265)
+		--with-gtk3
+		--without-html5
+		$(use_with jpeg jpeg_encoder)
+		$(use_with jpeg jpeg_decoder)
+		--without-mdns
+		--without-minify
+		$(use_with opengl)
+		$(use_with server shadow)
+		$(use_with server)
+		$(use_with sound)
+		--with-strict
+		$(use_with vpx)
+		--with-warn
+		$(use_with webcam)
+		$(use_with webp)
+		--with-x11
+	)
+
+	# see https://www.xpra.org/trac/ticket/1080
+	# and http://trac.cython.org/ticket/395
+	append-cflags -fno-strict-aliasing
+
+	export XPRA_SOCKET_DIRS="${EPREFIX}/run/xpra"
+}
author	V3n3RiX <venerix@redcorelinux.org>	2020-11-25 22:39:15 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-11-25 22:39:15 +0000
commit	d934827bf44b7cfcf6711964418148fa60877668 (patch)
tree	0625f358789b5e015e49db139cc1dbc9be00428f /x11-wm
parent	2e34d110f164bf74d55fced27fe0000201b3eec5 (diff)