gentoo resync : 28.04.2021

67 files changed, 398 insertions, 865 deletions

diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index 46bb15d07c0a..a98b734514cf 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/blackbox/Manifest b/x11-wm/blackbox/Manifest
index b8453d9180e9..8c12d60c7240 100644
--- a/x11-wm/blackbox/Manifest
+++ b/x11-wm/blackbox/Manifest
@@ -1,4 +1,5 @@
 AUX blackbox.desktop 128 BLAKE2B 3acb8eec34024ad4b5625d76f16206e40cceb11db194a084ba90b160e54824f95f228999128efe76c7c11509e89e85a2e2fa49f0f00f43777a7f65c0afe2ec01 SHA512 340bf82fdfe40fabe698b0fe9ce371395ab82a0570323663a2d1c3f26a36a2b1628dd91fe691a58d22b599f4cde060a005accc7294b9758cc4220d92f226d28d
 DIST blackbox-0.76.tar.gz 394032 BLAKE2B ffefd24277c581ca59216f53c10d5ffacd7231b33c7fd8bfd799a1f93f0b4953ab91f6c8e7061f91ca80036a8a2b8d7b118383e97b8ab58b8f4cd039155760a1 SHA512 bc97ae699820f8291399ce6f2a87ef4486fabcaeda2dc33fbeb31fc6405c01d722a52c85d8dc65ef44bb031e3dda63c326b76aa1bfca3e544bfcab0fac9d1afa
+EBUILD blackbox-0.76-r1.ebuild 1315 BLAKE2B fcd0aafe7b2bbd3059e2cdfb91ac43cd119d5a4f19ba227e984a3542230fa98656ab004be2d5f3fcd95a1c276f91b8ed22c4579f01119a83048b439ee5de4f68 SHA512 997329b4af80e62f83d91cd2a9efedd8c63f8fd149dbb8e472cad53484356fe6e051c35856623625de3458054e5dda1846fc637378ceb0520286c3ea6f7c698f
 EBUILD blackbox-0.76.ebuild 1163 BLAKE2B bdd113e78a785fd76f4aa1e98e0a4903053f010901cba52d53b262902842c54851178bd16fb7928abd87962e65565e47d9af493c8216d29144fbaf6e0537259f SHA512 e7b56ba2fed6111fb004f4b87cd5f9db97081a92f6487bde567b43660376157e5d497984ff35dd59e6eb16dc06ea0ec447c5c8bafaacbac5627a54c546ef656b
 MISC metadata.xml 572 BLAKE2B 3b4a1463dc3c3d78c92f1b983b66f3b7eebde350932374e9cdee846566f53c7a4bbdfb97006c8fd4bad8e945b0b4f70893853b8ae3d634c3ad3b9d6bd00e7860 SHA512 e4862cf23928cd2fe0db5b6d70caee609139cc48e1e5d2f5551142165c9c839c8c34ad3e8dbf2fb2e027ce4eef759a6d985063a3e7cc0332a72708262f1c8213
diff --git a/x11-wm/blackbox/blackbox-0.76-r1.ebuild b/x11-wm/blackbox/blackbox-0.76-r1.ebuild
new file mode 100644
index 000000000000..f758db45f9e9
--- /dev/null
+++ b/x11-wm/blackbox/blackbox-0.76-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="A small, fast, full-featured window manager for X"
+HOMEPAGE="https://github.com/bbidulock/blackboxwm"
+SRC_URI="https://github.com/bbidulock/blackboxwm/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug nls static-libs truetype"
+
+RDEPEND="x11-libs/libXft
+	x11-libs/libXt
+	x11-libs/libX11
+	nls? ( >=sys-devel/gettext-0.20 )
+	truetype? ( media-libs/freetype )"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}"/blackboxwm-${PV}
+
+src_prepare() {
+	sed -e '/AC_DISABLE_SHARED/d' -i configure.ac || die
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--sysconfdir=/etc/X11/${PN} \
+		$(use_enable debug) \
+		$(use_enable nls) \
+		$(use_enable truetype xft)
+}
+
+src_install() {
+	dodir /etc/X11/Sessions
+	echo "/usr/bin/blackbox" > "${D}/etc/X11/Sessions/${PN}"
+	fperms a+x /etc/X11/Sessions/${PN}
+
+	insinto /usr/share/xsessions
+	doins "${FILESDIR}/${PN}.desktop"
+
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS ChangeLog* COMPLIANCE README* TODO
+
+	find "${D}" -name '*.la' -delete || die
+	use static-libs || rm "${D}"/usr/$(get_libdir)/libbt.a || die
+}
diff --git a/x11-wm/ctwm/Manifest b/x11-wm/ctwm/Manifest
index bad4c1449ed0..6f84ddb8147b 100644
--- a/x11-wm/ctwm/Manifest
+++ b/x11-wm/ctwm/Manifest
@@ -1,5 +1,5 @@
 DIST ctwm-4.0.2.tar.xz 672608 BLAKE2B b4dc26b9d6ba5aba0a5f1f71363c25065aec0d4d4be7b9772f51117460062f5d7ea17d338e1ad9a89cf1213ca2125a1d203417bdc3f6c95a9b9969477b443a40 SHA512 445151f12084acd44bcf8a7d895e29363411a1a663b93e098fa9db5b96ae5cb43921eaf0695026aff2196117b810b96712a60570f57d6dabbee7fba34d5bd57f
 DIST ctwm-4.0.3.tar.xz 683684 BLAKE2B d16a47a5cd91ab5305da3c02f874d5ad1c71e2c8a3664cd33d5fa0781f4fdc2613407f5b43b4da16bcf89e323eb34b0888c5dbd02598746195991e7870aba0ef SHA512 f9bb2f8f28a050cce0fc2f1f4e00e79acd7c54055016d8483e045d8f5fa9829f8f5d92bb53f0c1d9500f97d6f52cd827ddd15515c84451ea03551025a8ab831d
-EBUILD ctwm-4.0.2.ebuild 873 BLAKE2B 785289d97ae9b6391de850941e238b4d2bdb0f42533274b9b69efb81deb94b2042315fca1b18b9ed0f446611a3f7441bf9e4760fb241dcc06541ab5210545e53 SHA512 1be2be0f710a150245d913dc535b3dedf94d4d1fb4d13a1da94cd6a78ba33717c561ba7a71d66ecbfb2e74519dedfcc86fb30562d073440686b1fc4c53a7e17f
+EBUILD ctwm-4.0.2.ebuild 866 BLAKE2B 9f99f0b22eb8ed4b850539a4c68acb7f0dde58751d5966999a50f4c24e1286106e2c8101160481bbc50dc622e3069eeff6012de263608a930b2ec370e0223552 SHA512 8912b11b2c0e233e295ff59127e40d6fcedad4f0fc94cacf2753cc7fa7beb4c98d37d7cf5185f433d21ad88399af7c024faef03360ef02ba1a39777be3b02422
 EBUILD ctwm-4.0.3.ebuild 1272 BLAKE2B 66d9661d555c10fc92d1eb8b6f5fe42604f91b31d1476853a0d3f5ba802bec3587da528eebf351719dee5c08985ed453fe4e11a97e2105337e599c26cae41c2c SHA512 cc6980e656939ae0bb49d24d1dde39ce54fa2f63eaf3d96aebbf111238746a879af3f9fcb4d4718b74b2e72d88bd5cbf3997f3eb51172ddf8f4d127d6af164fb
 MISC metadata.xml 856 BLAKE2B 426cfc4d6e71b0e227ae36597f0a80bc69c20a423952287cb8013b7444aaa699efd5782a6a7ec05703cad50a2c1f19520b6211cd60c896af06382e84a01ca258 SHA512 53fcd34f01714d98356b63928c76c5f115cb2ee5002c80e38ce103377ea15029b2b92ab157bb58de98047b650206a3468bcd891038c7067c40d48646140750ec
diff --git a/x11-wm/ctwm/ctwm-4.0.2.ebuild b/x11-wm/ctwm/ctwm-4.0.2.ebuild
index 883e461c3da8..47c1a4e0d2f3 100644
--- a/x11-wm/ctwm/ctwm-4.0.2.ebuild
+++ b/x11-wm/ctwm/ctwm-4.0.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit cmake-utils eutils flag-o-matic toolchain-funcs
+inherit cmake-utils flag-o-matic toolchain-funcs
 
 DESCRIPTION="A clean, light window manager"
 HOMEPAGE="http://ctwm.org/"
diff --git a/x11-wm/cwm/Manifest b/x11-wm/cwm/Manifest
index 466260a8df14..75f8de17ccf6 100644
--- a/x11-wm/cwm/Manifest
+++ b/x11-wm/cwm/Manifest
@@ -1,7 +1,7 @@
-AUX cwm-Makefile.patch 596 BLAKE2B 561277a5a4da0a2b06c01c14cd0c8baf4dfcffe3ccd9a7f5e5009c2a6820145e124bc7d1eb4cee9826281cce1433a21f74b5799f8f2e3c4287b918d60603b8d4 SHA512 544ea3805211679f565dcdff42f1b438452e304701c9138e5c15b19374150c1e63e8d83eb64c0519b5c6664d7d7d70657c0b15516b770605115021b77b592308
+AUX cwm-Makefile.patch 533 BLAKE2B a3c1ee8f9edead265663d4ea189cb78836902baf99725416d45c8760f4fe1aa6a9c294ae65d9e42901e520c93fffef568b6d55d6fb827229adbcc02f3e298f37 SHA512 3583a13c36877344d90d791f02cf3cd72c5a7ce7f7fa9adce7b135ab798a4052245f9fced0abd02b66462f0df1a4aed6d9e709c552204f13cbd57dd57a6847e7
 DIST cwm-6.6.tar.gz 53062 BLAKE2B 3da762f0c1a48c83c773a1f355cc970c5e4f6100e7294a00f44c6b5b7e1ffe954fde0e3d106991b05cd1f8c898fe055b5305b0bd7bf533df5868d32adbae2c5f SHA512 ff94fd1b7d263f9de538e5b338db58a08e1bec3e4233b84ab0a3ac94c47a45e10b2c772f93b897e70baf9a3c04e1a6fa04604ac71655acb7ebd1d10edb381042
 DIST cwm-6.7.tar.gz 53172 BLAKE2B 9e8c6503235ee71f3974a4e64cf45b80675b6ff33a68505b07f003c8d711a68a158f31147f463d5467bb4242c6321ebe0acaee63727689a136ca83c47e7592ea SHA512 5ad0fa56d9c96c36cc32e68128e58d4e3a7483f349bb26be1083c5b5c6d853ff05eec1a783b07ed928bd99a35a2e0b2d7053fc89b828aa9bdfe3589a318c4171
 EBUILD cwm-6.6.ebuild 991 BLAKE2B 15c37babefff6ae195f523fad27d2c60955b3c2dbf9f2ca55c2b7829557d882cec5b14ffc9b6f1e08df584b4f0fd623d95690040074cffd2d633308056e231be SHA512 73dbeafd62bd02c8dc0e43b48954a88e0255066bc677fe5ae752274a5c0a4fc16fa566edaf2ab7e3b5e411328ab570a95c7ba4d1e1521e0afddf2a1375bcc0b7
-EBUILD cwm-6.7.ebuild 945 BLAKE2B 3cdddaece0891f8d7904118ca3e35f02b1aaac4005daa6202a31dc32d51d15aebe6534bff91bdc7fa4f5991d3c293a37affb0c2500f4dddc1af2657acf965355 SHA512 fa2222f80c05c59a07e6ba7457164465e9107101154be05e17f1cf0bffe68586bfdde053c8aa0db4ee9cedacf743e5214051e78cfa40e8bf9bbfbd812da1621d
+EBUILD cwm-6.7.ebuild 942 BLAKE2B e0208c09375fac2d729eebccd7df8ec4af507a34e6810dd45f75349c865977afe906cb166d982eae04172820b319cf8142938faefea6c813ec8be9a517757e83 SHA512 dbf3308532dbc46c1b8200e4c21a7605c2f735ba2918c2c029ad4e4df0170f222b9e86fb67b036d3c6aebef8d35bbdfdd0ec68cd6a68a086c43924dceeef4f76
 EBUILD cwm-9999.ebuild 945 BLAKE2B 3cdddaece0891f8d7904118ca3e35f02b1aaac4005daa6202a31dc32d51d15aebe6534bff91bdc7fa4f5991d3c293a37affb0c2500f4dddc1af2657acf965355 SHA512 fa2222f80c05c59a07e6ba7457164465e9107101154be05e17f1cf0bffe68586bfdde053c8aa0db4ee9cedacf743e5214051e78cfa40e8bf9bbfbd812da1621d
 MISC metadata.xml 470 BLAKE2B df4d7653307ae78a918255ac3a879949523fb158091e8dfdb326d08a051988cea45e66e836b855d69e009c1659d5961de480a74aebbbfec34c2b789a9414e95b SHA512 b3780375c576da8b92393ead07dd3d72dec00f144e45d3efcd95b271f3da84f33ea254c6d620fceae55fbfc448ec7297539065428846e198901908845b744485
diff --git a/x11-wm/cwm/cwm-6.7.ebuild b/x11-wm/cwm/cwm-6.7.ebuild
index c35cf81e9f80..6d0daf817557 100644
--- a/x11-wm/cwm/cwm-6.7.ebuild
+++ b/x11-wm/cwm/cwm-6.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/leahneukirchen/cwm.git"
 else
 	SRC_URI="https://github.com/leahneukirchen/cwm/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 arm ~arm64 x86"
 fi
 
 LICENSE="ISC"
diff --git a/x11-wm/cwm/files/cwm-Makefile.patch b/x11-wm/cwm/files/cwm-Makefile.patch
index 56755fe19067..fc26a3808876 100644
--- a/x11-wm/cwm/files/cwm-Makefile.patch
+++ b/x11-wm/cwm/files/cwm-Makefile.patch
@@ -1,5 +1,3 @@
-diff --git a/Makefile b/Makefile
-index 74d0d0d..802cd33 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -13,12 +13,14 @@ OBJS=		calmwm.o screen.o xmalloc.o client.o menu.o \
diff --git a/x11-wm/echinus/Manifest b/x11-wm/echinus/Manifest
index c3fd0e787658..8f4c50bbddf1 100644
--- a/x11-wm/echinus/Manifest
+++ b/x11-wm/echinus/Manifest
@@ -1,5 +1,5 @@
-AUX echinus-0.4.9-gentoo.diff 2214 BLAKE2B 60dd119006f6e4ccd67cce54a108f684818ad66949916bdd23e83825b486b6c828c5cb626f91ef837306d72a2936afc86ddc4c60116891586d6e6547c402869f SHA512 be8e619129ff6ddbb2020e6a96c0689955fc68a7b0f6871fc08d0c3da96ddae09e439114ebc0de85411c9f86af643d2c332ff8a2e6113cca97b395876c1a5d71
+AUX echinus-0.4.9-gentoo.diff 2226 BLAKE2B 953db1df1500e94f8671a17ca92f8cab2e0b8daf08f90ada0cb32d5d4d6d74d6ab4154e45384d256493d6a458c9f3bc0dc74472c6980c4d887700f8f57941510 SHA512 81eda95535a8c5b70fc64a728b331fbb0e1c419244c90b914131de4a98da55e8c9143552f877b394ce2fe9739d48e2e3e31541f37b68819e936e127e871616a7
 AUX echinus.desktop 100 BLAKE2B 5f9dab316e812c5ae2293525e4731c66dd45f92b8d727abd2698a99debc8f91b809e6b445d057744d1872a9823abdb3e53b888a31c174fddc6019daa49264447 SHA512 df3450598a78a6484323735ee95b8c03e0b8bed40335e495a6c41dafabbccdb1e52987c383093576bfb05fa017c2bf474ec53fff30975ebd07fe6ea08196e566
 DIST echinus-0.4.9.tar.gz 32934 BLAKE2B 50fff8a78b65f6fa2f8506016dc4556e656ba2e2c6096cb7e7d175607cf63ab145081d000b5dc795108b6b8573c18318925bb3830ecea5658125fb66a301963b SHA512 a735291129bc287c6ed8c0f5d98c3d81db6da19d903a5fd5b44af5ec55d0b90dc7a559fc0cbd3e0dcced4a25783307adbd777a0c79fbd91ed78e9867544c47bf
-EBUILD echinus-0.4.9.ebuild 1511 BLAKE2B 34f64bdf118c3aa899d0fe255aa759dbacd9c3abe8f6d2670c3387ae47675e52dbcfb5efba0706834a4beebe9f69cfcef4da64fddf6cdc4bf02383af8afbcf04 SHA512 d673c4dea76b8b63ff68cd9552132974b9d232a3d87a07400412f74f8fef382bc2c687f53aba9d6fa0bdb7e639f91a4a0661be02bcdbc32e9f94288f68708831
+EBUILD echinus-0.4.9.ebuild 1523 BLAKE2B 87aac145a0568f1f97ae2c1e987a078165387105ea97dc2641300af9c4d4307e4711c1ea84f5a3c7cabfcc5b59273f08b8601f8a82f57d0264081bdc11cb5121 SHA512 38d7e3964f57143c70cdf01d8303a3889b6e5940eaba169a24b52a6a75fd5f9acc10a9e837eafb956135276252c2b91da7a9a27b73d753f17ab5c5b1b0f0b767
 MISC metadata.xml 253 BLAKE2B c4c0d013c216042f0b28f5c862217d07832125864810826e75650ff3237cdad06fc84cd90c0901228036a8e5b84c60a69fc1c51feecfb536b8acd74041416d9d SHA512 120e3b08d73b91ae3fcf18fb497938d5225851b757de10c859f2fbc7d3cbfd7f66e74bdaaa6d8f189c06706ae6643236c7223002242747e7dd204e36d740d132
diff --git a/x11-wm/echinus/echinus-0.4.9.ebuild b/x11-wm/echinus/echinus-0.4.9.ebuild
index 214543732284..551dcde04be1 100644
--- a/x11-wm/echinus/echinus-0.4.9.ebuild
+++ b/x11-wm/echinus/echinus-0.4.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -27,7 +27,7 @@ src_configure() {
 	use xrandr && export MULTIHEAD=1
 	sed -i -e "s|/usr/lib|/usr/$(get_libdir)|g" config.mk || die
 
-	tc-export CC
+	tc-export CC PKG_CONFIG
 }
 
 src_install() {
@@ -50,6 +50,7 @@ pkg_postinst() {
 		elog "to launch dmenu_run. Check echinus documentation for details."
 		elog ""
 	fi
+
 	elog "A standard config file with its pixmaps has been installed to:"
 	elog "${EROOT}/usr/share/${PN}/examples"
 	elog "Copy this folder to ~/.${PN}/ and modify the echinusrc as you wish."
diff --git a/x11-wm/echinus/files/echinus-0.4.9-gentoo.diff b/x11-wm/echinus/files/echinus-0.4.9-gentoo.diff
index 2bada877b17a..5c013c7166ff 100644
--- a/x11-wm/echinus/files/echinus-0.4.9-gentoo.diff
+++ b/x11-wm/echinus/files/echinus-0.4.9-gentoo.diff
@@ -21,8 +21,8 @@
 -LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 `pkg-config --libs xft`
 -
 -DEFS = -DVERSION=\"${VERSION}\" -DSYSCONFPATH=\"${CONF}\"
-+CFLAGS += -I. -I/usr/include `pkg-config --cflags x11 xft`
-+LIBS 	 += -L/usr/lib -lc `pkg-config --libs x11 xft`
++CFLAGS += -I. -I/usr/include `${PKG_CONFIG} --cflags x11 xft`
++LIBS 	 += -L/usr/lib -lc `${PKG_CONFIG} --libs x11 xft`
 +CPPFLAGS += -DVERSION=\"${VERSION}\" -DSYSCONFPATH=\"${CONF}\"
  
  # flags
@@ -42,8 +42,8 @@
 -
 +ifdef MULTIHEAD
 +CPPFLAGS += -DXRANDR=1
-+LIBS += `pkg-config --libs xrandr`
-+CCFLAGS += `pkg-config --libs xrandr`
++LIBS += `${PKG_CONFIG} --libs xrandr`
++CCFLAGS += `${PKG_CONFIG} --libs xrandr`
 +endif
  # Solaris
  #CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\"
diff --git a/x11-wm/enlightenment/Manifest b/x11-wm/enlightenment/Manifest
index 5c0777d1fdde..4dcea66d8237 100644
--- a/x11-wm/enlightenment/Manifest
+++ b/x11-wm/enlightenment/Manifest
@@ -1,3 +1,3 @@
 DIST enlightenment-0.24.2.tar.xz 28716060 BLAKE2B 432722693beaece97eeb318a1120b6101bf76e1536347b824b00ba4378326c093f3333eefa634d7266a59c09dc4337c8bd1f9a4d89e0a4c9a223fdcacd924fa0 SHA512 5d96b17d89e822271048a0a6a8356658fd02680f54da2f15dde7c632752bbf0a396eaf23986164402e61f631e68937b3ba7c29d9dd787ddd470cff4a390abace
-EBUILD enlightenment-0.24.2-r1.ebuild 2964 BLAKE2B ad45c058b9ffa1c47a0d8d61ad51afe5b92e18a57dc73eb86be0192e5c20bd7afa1ba9df6558bcdb6b2c557c11b1999887f635ea3df2bb7b63dcbce9a253fc6a SHA512 8e3901feb2d1bc66fbdacfec215e0986675d8ef12e4cf9e021b92be21d0b03e36236b0674a50544d685a37c57dd08986a7b12bb0202c5925498d84714166a3ca
+EBUILD enlightenment-0.24.2-r1.ebuild 2982 BLAKE2B 4e5ddbbcd92bf0e4ab29e8337b8a0686f33a0ca060b1ff7be3a191a5331e2c11b327c2ede50e697d923ad194c91a205f32abd611b70e98f708cc0b926021f293 SHA512 3e30b91593ded6cf418c53e82c440966add60b0a5a751dc7061968f18a387112161933f1f3099e765e7f0fd2407fc6f4cb0380c4590d5a31633b5f1d7a5e4186
 MISC metadata.xml 721 BLAKE2B 85587a677b7e22cd1dbfe187c367574ccef7ad88a1bdde00acecc9fc5f62d48adb9e14c2086953287efc728cc616d6d286fde1b659a44404086fef5e6bde90b1 SHA512 6d22a2f8639b3b75fd1113c0b381edc2869d91e5d3d04d6c67c845c15fae9ba0e370918e30b45e89e91c695f873f1d0ef5966f7720ab5e9cd270c6254c792dc5
diff --git a/x11-wm/enlightenment/enlightenment-0.24.2-r1.ebuild b/x11-wm/enlightenment/enlightenment-0.24.2-r1.ebuild
index 6651273cf861..1d2cd069eae8 100644
--- a/x11-wm/enlightenment/enlightenment-0.24.2-r1.ebuild
+++ b/x11-wm/enlightenment/enlightenment-0.24.2-r1.ebuild
@@ -97,7 +97,7 @@ pkg_postinst() {
 	xdg_icon_cache_update
 	xdg_mimeinfo_database_update
 
-	elog "Additional programs to complete full EFL suite: "
+	optfeature_header "Additional programs to complement the full EFL suite:"
 	optfeature "efl-based pinentry interface" app-crypt/pinentry[efl]
 	optfeature "better monitor backlight and brightness controls" app-misc/ddcutil
 	optfeature "office file thumbnails" app-office/libreoffice app-office/libreoffice-bin
diff --git a/x11-wm/herbstluftwm/Manifest b/x11-wm/herbstluftwm/Manifest
index dc7bfe8c8a16..8560c845901c 100644
--- a/x11-wm/herbstluftwm/Manifest
+++ b/x11-wm/herbstluftwm/Manifest
@@ -1,6 +1,8 @@
 DIST herbstluftwm-0.7.2.tar.gz 245506 BLAKE2B 72d0bb2a77e519161d193ac7b2b9f1f878ccb6cfe4914b6c75d060e2daa0bec4203ee4ebf203b9fa1dfb844d71d50aa7c03257c78aa22e906bf42519d1e592af SHA512 abb49bbc3de9a0ef619ce7063c1cea0d0d25ab2195c53dc0d33e061ad24060da4bbe9b99b9b9126028cdf68b462d4fcc8d1534431e4892d571ff897a68d2113c
 DIST herbstluftwm-0.9.1.tar.gz 432926 BLAKE2B 38f8626f3f8957cae32d71202b03515c26a4e174ce550ed6b31e7e024c3a3095374ad68f5aecc55c608c0a8565063ff39f85596444884557f38ff39043bd1d7d SHA512 c69cc5a77e98e2e0a1c84938394fe97cd985bfedb8bb1e2dceddb0268f30597cdf9b30048aa3618c20ec549f2113b7a6bbbb94f2fbcc578b8f0117bdd8cac85d
+DIST herbstluftwm-0.9.2.tar.gz 448757 BLAKE2B f969e4a02aad11c5bd75ac261c7dd8c9448234a050f82f0cdd9bc29c998c4f6bb496f6e32d20016b06849218952c6a2f993f46aa94c29d011f4ff6865a2197bc SHA512 5426b4d1810f01cf043cf43644d4c65692a5aa207893be484c86eb0eeb96ca6259c86b843146a9eebdf4de988f2d2ed742674907be47262c6029d8aa7ab2265c
 EBUILD herbstluftwm-0.7.2-r1.ebuild 1534 BLAKE2B a88a23d3cdcaf5761198b31112ebeeac213f5e576e3d5e566121713875e1e9b8a78d9c7e63659da6144b6733905f0b2def82761dff36e29400b899670d3c2aec SHA512 8bf19a5fc434271eeafc58a168dd852a8962cd9c8c35ecd2779eb2f195d4fae3942ff7884c96c8177592d4374e4b3bcd63a5c33bee46e73ff5b08b5dd20f0e9f
 EBUILD herbstluftwm-0.9.1.ebuild 1055 BLAKE2B b3d76f81274b4019a10bfee919de68c5c52f391025514dbe0c6ffcadf84e50db7a5173e15d553c86dfd206b594483da32f383b866b81bbd14e58757536f5a769 SHA512 db8fb6e23a86b722c3ea779cffe2a13167330e8be46fc07e770d87361ba76ce4b51c4773966a8730da2f2182eb60605daf5a7a79c82056f872ba1012e97c4e97
+EBUILD herbstluftwm-0.9.2.ebuild 1735 BLAKE2B a5e0199e4253a12cd99788cbd8c5ad26bd2270c0b454e688d3c4e758d18bf693d132f9214d5d13a0f9d88d06976696800724d6327c447073f8be958077ee7cf9 SHA512 c5124e231d7eecf9d0f00260164c61e2469854e93b38d2285e987686ff37806435adac9894abffd5376e9a37e2ec50472385a2ecf2e6093c94060e61cd21b740
 EBUILD herbstluftwm-9999.ebuild 1044 BLAKE2B e65193b1bd6c7b42ba0976b298dd8e2df2bbdf18fb5a623224a2184c897e70db2a14124729fa81753f6fd73105f3dc65711305a94d2de04d5140a127da08744d SHA512 94d9732c9805962a2144d9fa1ac9b4f136f7960cca790b3059a6aa2f76e157eba13ed291d113429e942e1858e8a90e40da76883b9ed5b964ee304e78f0b4e9a8
 MISC metadata.xml 565 BLAKE2B 8a6246f89ec1a463c527d2daff5dc31ec574d6d41bc026255fe4a09e4fc5f1d7136df89364ed3bb6bf46a3848ad19f3737261481f4c217c2bf6004e0ad5072f9 SHA512 08a447578d4b0d98efc301024b182e4f1407040b4c37de73fab0e65990e834a38b3ea7dc17f15e96ea8bde5336d45d30d881f9169ccd461763d7d4fd8d098e99
diff --git a/x11-wm/herbstluftwm/herbstluftwm-0.9.2.ebuild b/x11-wm/herbstluftwm/herbstluftwm-0.9.2.ebuild
new file mode 100644
index 000000000000..31f1710a7b3e
--- /dev/null
+++ b/x11-wm/herbstluftwm/herbstluftwm-0.9.2.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_OPTIONAL=1
+
+inherit cmake distutils-r1 toolchain-funcs
+
+DESCRIPTION="A manual tiling window manager for X"
+HOMEPAGE="https://herbstluftwm.org/"
+
+if [[ "${PV}" == "9999" ]] || [[ -n "${EGIT_COMMIT_ID}" ]]; then
+	EGIT_REPO_URI="https://github.com/herbstluftwm/herbstluftwm"
+	inherit git-r3
+else
+	SRC_URI="https://herbstluftwm.org/tarballs/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="doc examples python"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+DEPEND="
+	media-libs/freetype
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXft
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+"
+RDEPEND="
+	${DEPEND}
+	app-shells/bash
+	python? ( ${PYTHON_DEPS} )
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+	doc? ( app-text/asciidoc )
+"
+
+src_prepare() {
+	sed -i \
+		-e '/^install.*LICENSEDIR/d' \
+		-e '/set(DOCDIR / s#.*#set(DOCDIR ${CMAKE_INSTALL_DOCDIR})#' \
+		CMakeLists.txt || die
+	cmake_src_prepare
+
+	if use python; then
+		pushd "${S}"/python > /dev/null || die
+		distutils-r1_src_prepare
+		popd > /dev/null || die
+	fi
+}
+
+src_configure() {
+	# Ensure that 'python3' is in PATH. #765118
+	python_setup
+
+	mycmakeargs=(
+		-DWITH_DOCUMENTATION=$(usex doc)
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+
+	if use python; then
+		pushd python > /dev/null || die
+		distutils-r1_src_compile
+		popd >/dev/null || die
+	fi
+}
+
+src_install() {
+	cmake_src_install
+
+	if ! use examples; then
+		rm -r "${ED}"/usr/share/doc/${PF}/examples || die
+	fi
+
+	if use python; then
+		pushd python > /dev/null || die
+		distutils-r1_src_install
+		popd > /dev/null || die
+	fi
+
+}
diff --git a/x11-wm/i3/Manifest b/x11-wm/i3/Manifest
index 6c40eeb43df5..c40865863239 100644
--- a/x11-wm/i3/Manifest
+++ b/x11-wm/i3/Manifest
@@ -6,7 +6,7 @@ DIST i3-4.19.1.tar.xz 1277648 BLAKE2B a4d01d10c076da092faef2111ba0fadb481257c001
 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-4.19-r1.ebuild 2110 BLAKE2B 0078d8bb0fcb1e78bef247c29ef90f66474fb7d822efb5fca002827bb1d71de2a375a38671df84e3525bef8a73a0283c4b5b26f774379dae35cce2ea2c5b02d7 SHA512 97c3107d63ba0876bc830aba788317144ca32b4400efae541316db3ffad6fd2718762dd7abc733e9b45a4935654951b41c69399d7633b953da42a065149b66ae
-EBUILD i3-4.19.1.ebuild 2065 BLAKE2B 0f9ce66d98a51afeb39aa25a3a83a4eeaeccb6f1c80d9964c5ddda090c2a7be6883abd012e2b5cfdf78940acd77210648d1a90d50c6f909d0fd8d4e45ae19ebf SHA512 ef7fdd8536f8218806a9a23f17612e7f349f4fa325b8150fc8ac96dac2c5e1419f007b5d55491fc076fbe94cf0c10a36d8ce864b2088ccf19e60288c88a21db0
-EBUILD i3-9999.ebuild 2065 BLAKE2B 0f9ce66d98a51afeb39aa25a3a83a4eeaeccb6f1c80d9964c5ddda090c2a7be6883abd012e2b5cfdf78940acd77210648d1a90d50c6f909d0fd8d4e45ae19ebf SHA512 ef7fdd8536f8218806a9a23f17612e7f349f4fa325b8150fc8ac96dac2c5e1419f007b5d55491fc076fbe94cf0c10a36d8ce864b2088ccf19e60288c88a21db0
+EBUILD i3-4.19-r1.ebuild 2009 BLAKE2B 879d419a2519c1a9ed7d6450f2c61a2fd55e0092f372affcdf71a695b037086d02ba89563b2157cb10ed82b31abadc96e5b610a5a9d7b615256ca54da3e47b1f SHA512 1b102e92604ae0b0cb10dac8fba11f263915c87ca5572aa779d8c77be92e3bb2c9304229a2031a1cd32937d0bab56a1e7777ad70a3c8ac7bb42fa256ff93eb1b
+EBUILD i3-4.19.1.ebuild 1964 BLAKE2B 0efd370883036b7cd359cf3fe4d98d96943d04a649d43aa826bca482def052b6ad9721b6b21ab561599dd97817ba8feebd2551bca690fde5117b762978e4d014 SHA512 350da5c0f9cb8b490567d6aeeb0b013376e667164df060fb012b563e77b6ccca2e623b0e3cf4e72bf1b1e1c48a577f74e2f0952ddfa11b8a78f260b7bd38a9c0
+EBUILD i3-9999.ebuild 1964 BLAKE2B 0efd370883036b7cd359cf3fe4d98d96943d04a649d43aa826bca482def052b6ad9721b6b21ab561599dd97817ba8feebd2551bca690fde5117b762978e4d014 SHA512 350da5c0f9cb8b490567d6aeeb0b013376e667164df060fb012b563e77b6ccca2e623b0e3cf4e72bf1b1e1c48a577f74e2f0952ddfa11b8a78f260b7bd38a9c0
 MISC metadata.xml 484 BLAKE2B 596d482da71281b74bc30b3c9045f9a4cfce10e14ad5ac0fe3d81aa6868f0029098f60820ec1bfdeddd95648e2ea2d2f9caa0a231e597a97af389f874d9cb7da SHA512 d0ce95d82fcbce30709dce848d254b5d7b0aa55f333c3b51e974bc17b6ce1957a6a841415d06b8bd5ce8796a0ebe57a877230fa1b0a9b3158ad13666590cf930
diff --git a/x11-wm/i3/i3-4.19-r1.ebuild b/x11-wm/i3/i3-4.19-r1.ebuild
index 8641db1eba86..3b3b04623bc8 100644
--- a/x11-wm/i3/i3-4.19-r1.ebuild
+++ b/x11-wm/i3/i3-4.19-r1.ebuild
@@ -96,10 +96,8 @@ 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
+	optfeature_header "There are several packages that may be useful with i3:"
+	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-4.19.1.ebuild b/x11-wm/i3/i3-4.19.1.ebuild
index e7b4e3a5694e..99bd3b7ad0b6 100644
--- a/x11-wm/i3/i3-4.19.1.ebuild
+++ b/x11-wm/i3/i3-4.19.1.ebuild
@@ -95,10 +95,8 @@ 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
+	optfeature_header "There are several packages that may be useful with i3:"
+	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 e7b4e3a5694e..99bd3b7ad0b6 100644
--- a/x11-wm/i3/i3-9999.ebuild
+++ b/x11-wm/i3/i3-9999.ebuild
@@ -95,10 +95,8 @@ 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
+	optfeature_header "There are several packages that may be useful with i3:"
+	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 0f1e6f6687c4..a7d42da9ede3 100644
--- a/x11-wm/icewm/Manifest
+++ b/x11-wm/icewm/Manifest
@@ -1,10 +1,8 @@
 AUX icewm 33 BLAKE2B 5605658012ad8ed16bbd4cf0c4cb7cbe5204f73c20ef2c3d9fef1011a80b9e68863de64b45e4b043604b147c9d31f3f5d2617d067b694f5ec5329ad895472b0e SHA512 3fe619e59cc5d354242ccd85d3b1982dd7db6d0f6170f46f9d33975872f6d5a342a08d69db763162dc43681eedb96e9ba5075455bf54adf4fb86bf19887bf6e0
-DIST icewm-2.0.1.tar.lz 1694439 BLAKE2B 1476f33fa7350a98b7eca8c5c265455d0a78b28bcbd35ab78969b528ae02d3c960fb73cf2b24ea999ee5e08c9f0641d3502c7d5ed8b285777162c334d645b6db SHA512 ac4126b38d592aed60d2269f58c5a1612b61e871565e3c3e51bc2b430e4da6a4708f78e86c16091fa4dfb9eefd4109ae89102ab708e3bce9a44f1e5fe1970c59
-DIST icewm-2.1.2.tar.lz 1694969 BLAKE2B 640af2b7afb34ebcf6fc4f1762161bd8cae124e58735ad3e5af3f8a12723ead71e491fbef9e9119792c54e4e116c7cc491847da1e103b2c46765044bfda71f2d SHA512 92c52b057c7ac1c81eb72cb01d4041715fae2b1c221ecc0e5286a9bfad87e1607a3d7c60dde125436ad32c9a72dac01ee82a3bfe4b671b2d458ba3ce4c0c5a62
-DIST icewm-2.2.0.tar.lz 1697312 BLAKE2B c030b7675a645b91ad3e2476735acc0c2cd4425227d96b99ffc81d57e859f8c6ece029b892f32bff2fbba0683f3e279fd73446e935d5c76a1c472376897810ba SHA512 c0d84bba176f30e7a5a1d8272e306279dfc2e7c130461d72b45fe55c691a6d262484dd4c7b818ac7ec55db878cad3c84bba33d6e451355036fa4e7ba89ee1fdb
 DIST icewm-2.2.1.tar.lz 1697220 BLAKE2B a1c236c5aa3f2b958f3ad53c6d757abbce344da3c1c9c8f49bd4c986c68aef7421e799100dfabcb03e612d4c6a44af6a063080730b054e96ee054c85c21d5d1e SHA512 700122ace9a120300a06f17f334b76c12395154693583587527254903f53d12feb6e991754fc714960cc78b0d7809202879e43f2508f4d7ffa3fc7af84e628d6
-EBUILD icewm-2.0.1.ebuild 2945 BLAKE2B 8d84aab27149ed83bdea11800913905561fcda897aea287243faa7164df8462ece8f17e1ca4b7f94b4fd345932ef01e006174b39afae850ec533b772535f5b80 SHA512 7398ea8cf49d6c8fcacf40fb49f6489e0ba0f6015c96306e8873bac68063f46c52f44ba19d279f5abc60fd1f354f03778a54a41cb1f409a7038cc9c3178fa58d
-EBUILD icewm-2.1.2.ebuild 2952 BLAKE2B b0d75ba7ec27295593caa2bb47d51c518b35a81e95a53210b424f7632d197bb2cb6116feeee53f56348409589a13c2c288f01ddd76a98549643d051da89bfdee SHA512 016db15eb35afcc81a5312690790d43de8d6f936f99de63fc1efe6974adaf0f8a074bfb6e53711af9a561490686786e2e5b860d7f4fc678058eba44347f8c440
-EBUILD icewm-2.2.0.ebuild 2956 BLAKE2B a29971bc37782d51dd81352475005d0860682ce1fa18ce04d9f69d67bdc1cefaf667a6179d58c63a6d39cb44f0971bd41ae54694896c37b0a3183a6a4fc360b4 SHA512 07b44baf1a7f48d9da2b8abdae82b3dda800662ce912f6f69cf1e7ea665407931aeb77b9f04e902b8862fc43790c4981bb1c57cd04c112cbed49991385a58174
-EBUILD icewm-2.2.1.ebuild 2956 BLAKE2B a29971bc37782d51dd81352475005d0860682ce1fa18ce04d9f69d67bdc1cefaf667a6179d58c63a6d39cb44f0971bd41ae54694896c37b0a3183a6a4fc360b4 SHA512 07b44baf1a7f48d9da2b8abdae82b3dda800662ce912f6f69cf1e7ea665407931aeb77b9f04e902b8862fc43790c4981bb1c57cd04c112cbed49991385a58174
+DIST icewm-2.3.2.tar.lz 1699944 BLAKE2B 4be59088ea1aaa4dce7a284efc766b082eb0a8f923a4a915de9d9d658a7eda4ccbaeb3c746918218058f062ba92ce29f715b8e9a42f6351e96cfb0df4261254f SHA512 1288f02aca7210051603a77f37126cda3750f8eeeef848ea3acf28ffbc82b1ea69b69a9b68df9750c58c067e5029093cb20f77c631521c568fb7f45a83dd320d
+DIST icewm-2.3.3.tar.lz 1704180 BLAKE2B d9aa332b8fd1de0731d27eaa9e894258616f02093af1e4b9f67caf6361665c4e38fe8a6312cad85af59f0de1b23e8c20eb684cc1901860222db3c2cf1ba0eced SHA512 1ec96357d961bfa922f54390e8aa980b0e4326edf8091b4db37756d08c9931c2f41a1dc657131a32435847cb5cfe95f6d2fff03cbb9b78f90e3e04a1b22012d8
+EBUILD icewm-2.2.1.ebuild 2952 BLAKE2B b0d75ba7ec27295593caa2bb47d51c518b35a81e95a53210b424f7632d197bb2cb6116feeee53f56348409589a13c2c288f01ddd76a98549643d051da89bfdee SHA512 016db15eb35afcc81a5312690790d43de8d6f936f99de63fc1efe6974adaf0f8a074bfb6e53711af9a561490686786e2e5b860d7f4fc678058eba44347f8c440
+EBUILD icewm-2.3.2.ebuild 2956 BLAKE2B a29971bc37782d51dd81352475005d0860682ce1fa18ce04d9f69d67bdc1cefaf667a6179d58c63a6d39cb44f0971bd41ae54694896c37b0a3183a6a4fc360b4 SHA512 07b44baf1a7f48d9da2b8abdae82b3dda800662ce912f6f69cf1e7ea665407931aeb77b9f04e902b8862fc43790c4981bb1c57cd04c112cbed49991385a58174
+EBUILD icewm-2.3.3.ebuild 2956 BLAKE2B a29971bc37782d51dd81352475005d0860682ce1fa18ce04d9f69d67bdc1cefaf667a6179d58c63a6d39cb44f0971bd41ae54694896c37b0a3183a6a4fc360b4 SHA512 07b44baf1a7f48d9da2b8abdae82b3dda800662ce912f6f69cf1e7ea665407931aeb77b9f04e902b8862fc43790c4981bb1c57cd04c112cbed49991385a58174
 MISC metadata.xml 747 BLAKE2B a986dc65f9b603519ef92fecc63cadd2921d6569e8735956a55ce91673426082e367664cce23c2b80cec19e0d997da357ac8f9d3d78c738ad92f42f6f426c225 SHA512 f9b84c60b780b5999c8a295b64bdf1bdb734108984e48f1271257cb35602df024a347560526de52f43ede16f67031551f4ae3f37401d3320e4dbdfb913e557fe
diff --git a/x11-wm/icewm/icewm-2.1.2.ebuild b/x11-wm/icewm/icewm-2.1.2.ebuild
deleted file mode 100644
index 6215cdd777d4..000000000000
--- a/x11-wm/icewm/icewm-2.1.2.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools unpacker
-
-DESCRIPTION="Ice Window Manager with Themes"
-HOMEPAGE="https://ice-wm.org/ https://github.com/ice-wm/icewm"
-LICENSE="GPL-2"
-SRC_URI="https://github.com/ice-wm/icewm/releases/download/${PV}/${P}.tar.lz"
-
-SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 sparc x86"
-IUSE="+alsa ao bidi debug +gdk-pixbuf imlib nls truetype uclibc xinerama"
-
-# Tests broken in all versions, patches welcome, bug #323907, #389533
-RESTRICT="test"
-
-REQUIRED_USE="|| ( alsa ao )"
-#?? ( gdk-pixbuf imlib )
-
-#fix for icewm preversion package names
-S="${WORKDIR}/${P/_}"
-
-# These are the core dependencies of icewm.
-# Look into configure.ac and search for PKG_CHECK_MODULES([CORE]
-CORE_DEPEND="
-	media-libs/fontconfig
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrender
-"
-
-RDEPEND="
-	${CORE_DEPEND}
-	dev-libs/glib:2
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libXft
-	x11-libs/libXpm
-	x11-libs/libXrandr
-	alsa? (
-		media-libs/alsa-lib
-		media-libs/libsndfile[alsa]
-	)
-	ao? (
-		media-libs/libao
-		media-libs/libsndfile
-	)
-	bidi? ( dev-libs/fribidi )
-	gdk-pixbuf? (
-		x11-libs/gdk-pixbuf-xlib
-		>=x11-libs/gdk-pixbuf-2.42.0:2
-	)
-	!gdk-pixbuf? (
-		imlib? (
-			gnome-base/librsvg:2
-			media-libs/imlib2
-		)
-		!imlib? (
-			media-libs/libpng:0=
-			virtual/jpeg
-		)
-	)
-	xinerama? ( x11-libs/libXinerama )
-"
-DEPEND="
-	${RDEPEND}
-	$(unpacker_src_uri_depends)
-	x11-base/xorg-proto
-	gdk-pixbuf? ( gnome-base/librsvg:2 )
-"
-
-BDEPEND="
-	app-text/asciidoc
-	virtual/pkgconfig
-	nls? ( >=sys-devel/gettext-0.19.8 )
-"
-
-pkg_pretend() {
-	if use gdk-pixbuf && use imlib ; then
-		einfo 'Confilcting USE flags have been enabled:'
-		einfo '"gdk-pixbuf" and "imlib" exclude each other!'
-		einfo 'Using "gdk-pixbuf".'
-	fi
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local icesound
-	if use alsa && use ao ; then
-		icesound="alsa,ao"
-	elif use alsa ; then
-		icesound="alsa"
-	elif use ao ; then
-		icesound="ao"
-	fi
-
-	local myconf=(
-		--enable-logevents
-		--enable-xrandr
-		--with-cfgdir="${EPREFIX}"/etc/icewm
-		--with-docdir="${EPREFIX}"/usr/share/doc/${PF}/html
-		--with-icesound="${icesound}"
-		--with-libdir="${EPREFIX}"/usr/share/icewm
-		$(use_enable bidi fribidi)
-		$(use_enable debug)
-		$(use_enable debug logevents)
-		$(use_enable gdk-pixbuf)
-		$(use_enable imlib imlib2)
-		$(use_enable nls i18n)
-		$(use_enable nls)
-		$(use_enable xinerama)
-	)
-	if use truetype ; then
-		myconf+=(
-			--enable-shape
-		)
-	else
-		myconf+=(
-			--disable-xfreetype
-			--enable-corefonts
-		)
-	fi
-
-	econf "${myconf[@]}"
-
-	sed \
-		-e "s:/icewm-\$(VERSION)::" \
-		-e "s:ungif:gif:" \
-		-i src/Makefile || die
-}
-
-src_install() {
-	local DOCS=( AUTHORS ChangeLog NEWS README.md TODO VERSION )
-
-	default
-
-	docinto html
-	dodoc doc/icewm.html
-	dodoc man/*.html
-
-	exeinto /etc/X11/Sessions
-	doexe "${FILESDIR}/icewm"
-}
diff --git a/x11-wm/icewm/icewm-2.2.1.ebuild b/x11-wm/icewm/icewm-2.2.1.ebuild
index 7b0d626e90a0..6215cdd777d4 100644
--- a/x11-wm/icewm/icewm-2.2.1.ebuild
+++ b/x11-wm/icewm/icewm-2.2.1.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 ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ppc ~ppc64 sparc x86"
 IUSE="+alsa ao bidi debug +gdk-pixbuf imlib nls truetype uclibc xinerama"
 
 # Tests broken in all versions, patches welcome, bug #323907, #389533
diff --git a/x11-wm/icewm/icewm-2.2.0.ebuild b/x11-wm/icewm/icewm-2.3.2.ebuild
index 7b0d626e90a0..7b0d626e90a0 100644
--- a/x11-wm/icewm/icewm-2.2.0.ebuild
+++ b/x11-wm/icewm/icewm-2.3.2.ebuild
diff --git a/x11-wm/icewm/icewm-2.0.1.ebuild b/x11-wm/icewm/icewm-2.3.3.ebuild
index 4b6ac26b71f4..7b0d626e90a0 100644
--- a/x11-wm/icewm/icewm-2.0.1.ebuild
+++ b/x11-wm/icewm/icewm-2.3.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 ~ppc64 ~sparc ~x86"
 IUSE="+alsa ao bidi debug +gdk-pixbuf imlib nls truetype uclibc xinerama"
 
 # Tests broken in all versions, patches welcome, bug #323907, #389533
diff --git a/x11-wm/jwm/Manifest b/x11-wm/jwm/Manifest
index ea387e11a4da..87b5f46b5568 100644
--- a/x11-wm/jwm/Manifest
+++ b/x11-wm/jwm/Manifest
@@ -1,6 +1,4 @@
 AUX jwm.desktop 166 BLAKE2B 5c6adbd815e6f4f4261c8c0a8d642b749cc47703aa7ec5a79ac86a0c9aba0adf2e0865cd0b2f115146867909e880067e5157905452f08275ebd6a168088d0413 SHA512 42135a9b282467edec1a61de0180a97b7a0f5bbbb8fe4a5d88dd418dcb5edf32c1c15efee3d8cf96eadf7468dd4d44c679690ec2ff2a89381bb0e0dc9664a43b
-DIST jwm-2.3.2.tar.xz 325648 BLAKE2B 93654116b0dedff4ad03c7981a9978530a1989edf4766591f083c3b10fefb128acc85e93b888a7700cb59e0bd85e1e7f7e118a22327f79ddcc1d380887764028 SHA512 34b9d482815e8b269203e1f5bf02d3e13f3186153755c9e74094e4a8af376f35b8bef4553056e83c20ba0c532e6d2606633d71272e186fe45dfed9e4ea836a27
 DIST jwm-2.3.7.tar.xz 350332 BLAKE2B 479d853ae9b1dd2d1a39c9e823f39cd7671b477f6e9878bc6652072bce1ce364f8c392663dc1187a4a4970918c0f68cd506654f6dfe6c91cc5f1f2f275a2021b SHA512 dab0241518e52aa2e3e1ef3f67b6965ceb683bdb0224de7d3a653d76440606d70e86e35047eda40ea53a80aa227408be77739ad7c53d51f53026e3d113ab7efc
-EBUILD jwm-2.3.2.ebuild 1414 BLAKE2B 138b7134ca5e1a280df2f53be75f6e2929d5a105a6ee0c8f3d6936257d06759c0649cb78c2514abbdd0135b187819d4e2f3b4ebed683a82a552af6556f9f67cf SHA512 10bc3b2dd084436fc0e03b388269f905f995e358d5fe3811257154b10feb04987782f3720e3eaae15f95c80bf599a625361e50563ce2774d814d88f7b91f457a
-EBUILD jwm-2.3.7.ebuild 1822 BLAKE2B 9622c3e7cd73aa5d0a4c664fd9c38d96ac20319dc22e437bffc20be8613efc71f0ac4b758f24e8ebb522013610566b889d9df5fa32173a12bbd9ba4aa5cd0e16 SHA512 1830ce3972fe1454cf999633f01550a3aa412c63a1eb5039467c4d7a0dcef317da47eaa7b166ffc7fe0c9ba192d7ebab51213513df68d4f1bd2d2d89083dfe17
+EBUILD jwm-2.3.7.ebuild 1817 BLAKE2B afebe64049c60725c05a91f9a8c0113aaf1472914bd95553ce8ca0e330b9fc6f4dae9ea35617fae47c293b7911500a0f65337ad80fd02140b344b6af5397d39e SHA512 68a7c5e782bcd2e57235485ed57955fd5fddf97bb60dd74a1b15b4241d9e3ec2e7c07ac2d85381b80c90b562ad97d6ff6f133ab58fb77c8a2f6ad01f18d33a7c
 MISC metadata.xml 973 BLAKE2B 396dc5d70f98f46e0a2698b893b127cad189762b28a1be2272b560ea4bd174a637cb4a9a01783a69c14797605d74442d221a55d3b5ca4128f343d7e602333096 SHA512 11ce10dace193af664e4939f506adc8311db83c7caa00959ebc7b57ed3084cd1e6ca8dcd8ff141e9ddbb823c485d45696ca3653d2ba9e252401704077dd932f0
diff --git a/x11-wm/jwm/jwm-2.3.2.ebuild b/x11-wm/jwm/jwm-2.3.2.ebuild
deleted file mode 100644
index 7f6d666ef0c8..000000000000
--- a/x11-wm/jwm/jwm-2.3.2.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils
-
-DESCRIPTION="Very fast and lightweight still powerful window manager for X"
-HOMEPAGE="http://joewing.net/projects/jwm/"
-SRC_URI="http://joewing.net/programs/jwm/releases/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ppc x86"
-IUSE="bidi debug jpeg png truetype xinerama xpm"
-
-RDEPEND="xpm? ( x11-libs/libXpm )
-	xinerama? ( x11-libs/libXinerama )
-	x11-libs/libXext
-	x11-libs/libXrender
-	x11-libs/libXau
-	x11-libs/libXdmcp
-	truetype? ( x11-libs/libXft )
-	png? ( media-libs/libpng:0= )
-	jpeg? ( virtual/jpeg:0= )
-	bidi? ( dev-libs/fribidi )
-	dev-libs/expat"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-src_configure() {
-	econf \
-		$(use_enable debug) \
-		$(use_enable jpeg) \
-		$(use_enable png) \
-		$(use_enable truetype xft) \
-		$(use_enable xinerama) \
-		$(use_enable xpm) \
-		$(use_enable bidi fribidi) \
-		--enable-shape \
-		--enable-xrender
-}
-
-src_install() {
-	dodir /etc
-	dodir /usr/bin
-	dodir /usr/share/man
-
-	default
-
-	make_wrapper "${PN}" "/usr/bin/${PN}" "" "" "/etc/X11/Sessions"
-
-	dodoc README.md example.jwmrc ChangeLog
-}
-
-pkg_postinst() {
-	einfo "JWM can be configured system-wide with ${EROOT}/etc/system.jwmrc"
-	einfo "or per-user by creating a configuration file in ~/.jwmrc"
-	einfo
-	einfo "An example file can be found in ${EROOT}/usr/share/doc/${PF}/"
-}
diff --git a/x11-wm/jwm/jwm-2.3.7.ebuild b/x11-wm/jwm/jwm-2.3.7.ebuild
index ca8612d564d2..de3b5aa2c7f5 100644
--- a/x11-wm/jwm/jwm-2.3.7.ebuild
+++ b/x11-wm/jwm/jwm-2.3.7.ebuild
@@ -1,16 +1,17 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit eutils
+
+inherit wrapper
 
 DESCRIPTION="Very fast and lightweight still powerful window manager for X"
 HOMEPAGE="http://joewing.net/projects/jwm/"
 SRC_URI="http://joewing.net/projects/${PN}/releases/${P}.tar.xz"
 
-LICENSE="GPL-2"
+LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86"
+KEYWORDS="amd64 ~hppa ~ppc x86"
 IUSE="bidi cairo debug iconv jpeg nls png truetype xinerama xpm"
 
 RDEPEND="dev-libs/expat
diff --git a/x11-wm/larswm/Manifest b/x11-wm/larswm/Manifest
index 0c0a718ca0bf..cad1ab47b624 100644
--- a/x11-wm/larswm/Manifest
+++ b/x11-wm/larswm/Manifest
@@ -1,4 +1,4 @@
 AUX larswm.desktop 125 BLAKE2B 15556dde41d8bbec4649e946a0cc8113fda06d667bb0c85691964af2513e32a36da0e0ce5bf979c212f295e4305b3fae202f62f883c459b297516facc66547db SHA512 033ca80e83d928eca524c0a5473f2776f363ff301442a7a7c3f34bb99bc61af8a524f6bf39ee1d6282ce5f732bd1fd7b0b242ad4909063496c4c6965becd7b43
 DIST larswm-7.5.3.tar.gz 84505 BLAKE2B 4548f8d757b8dc86f8bf545bc45b09f8b934792fea2a9a49d905669b767b453d007b29923fc0d7c9b4bd744f8c77e72652388bb66f51658846699d6b517f40d5 SHA512 7c99aadcc419f695b55bf0ea2f9833757c06f6ba0f00ae58e1db6e38df70bf944bac44834418bb52188d844722a7ac3c49388280c649ede073a74c21572cf3d4
-EBUILD larswm-7.5.3-r2.ebuild 1048 BLAKE2B eca1290c40955d9a48a3930a6db8f811ed4044e29ac83f627ca121584a2ab3dc1d6a109aef1c7288ea49fe74a843f426b4f1e3178fff584d4ab11dee785ee33c SHA512 8ded3cb3179994b6efa2d8437dc48c5d22e4b716ae1c4c30bee862453c56ca75757be1ca0b6ab23225ba3cac7ea468a4e5f60eca21d3c4fb6b36b7f93f6c0030
+EBUILD larswm-7.5.3-r2.ebuild 1155 BLAKE2B f03453338d0ec127e23546f0197bfc19bd569c8193e486ec5532ac4cd4a1e60f666fe38ea583895e934ddee3903a992d7e047bf884db8e89abfc099f6ae27eba SHA512 364edef63bffb19b49b989f1894219871c9773baea8e4f727b125948eee5f95ea72bf79422b637b04884ab93743dd4971e5a753134af4fb244c6449cbb1dd107
 MISC metadata.xml 605 BLAKE2B a55956469773e235d3c3bae88bcc826689fcc80aad5b1cfbf36908875253a0ce4728cd1a8692bd91c551e1cc1c2c5aa293a5339beb27799c5fa8d5fcf94438c8 SHA512 5c777d2c54e8cbe89c8644cd68697e1da2049c75a450cd6be085fba62bab7d56a8b4a28850330599684dfe9c9725977d14f8de1e52e624911d5c5c7088acb29d
diff --git a/x11-wm/larswm/larswm-7.5.3-r2.ebuild b/x11-wm/larswm/larswm-7.5.3-r2.ebuild
index 532c9a439f77..6506e3b2921d 100644
--- a/x11-wm/larswm/larswm-7.5.3-r2.ebuild
+++ b/x11-wm/larswm/larswm-7.5.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,20 +17,22 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXmu
 	x11-libs/libXt
 	x11-libs/libXext"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	x11-base/xorg-proto
-	x11-misc/imake
+	>=x11-misc/imake-1.0.8-r1
 	x11-misc/gccmakedep
 	app-text/rman"
 
 src_configure() {
-	xmkmf -a || die
+	CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \
+		IMAKECPP="${IMAKECPP:-$(tc-getCPP)}" xmkmf -a || die
 }
 
 src_compile() {
 	emake \
-		CC=$(tc-getCC) \
-		CCOPTIONS="${CFLAGS}" \
+		CC="$(tc-getCC)" \
+		CDEBUGFLAGS="${CFLAGS}" \
 		EXTRA_LDOPTIONS="${LDFLAGS}"
 }
 
diff --git a/x11-wm/lwm/Manifest b/x11-wm/lwm/Manifest
index c9ee96bcf8d2..e47ed993aec1 100644
--- a/x11-wm/lwm/Manifest
+++ b/x11-wm/lwm/Manifest
@@ -1,3 +1,3 @@
 DIST lwm-1.2.4.tar.gz 47519 BLAKE2B 209cc24e938978489ba33f940dfc2166880d9c150863f8e1982d5ad21f53a76e95fd71ca461e81a7fdb025c0a957ac2c4623e751de250beec1a2a74e570b9687 SHA512 bb4e394c43020b48dedf8c98702b68be7a580f9851d298ba2c6f0aacbd21719d8c772712e56cbbcc400e81a45ad7f4f29cb6e5f17d6dad76aef65029daf812c5
-EBUILD lwm-1.2.4.ebuild 836 BLAKE2B b199ba3cdc0c8db6ab8419eb2ba91718222bf924180216746c4fcdb8d00d13d44c94753b760e789d938a51cd1178134c1da1e6a4f8bce40b6837a5773fff9776 SHA512 178b7b33b82726d6d9c5e5b360deec0381a62c03d4937472a4c2c0477c90f448633cd2c051af650148a2e26435f65be82e23d7ff954b5ae4ea9474564503a0ba
+EBUILD lwm-1.2.4.ebuild 946 BLAKE2B 5bc9942f84987d838d3c52d4588facf0289452bd9e84aef938d76018bfc958e34c7e412e979649624bb102251d3975afaeb726373e574305aacaa12a4e179408 SHA512 c2ed1a5e6502e86f25490b9441f2af8e37914fbc482a7ce35b8e99dbad4ac4046f2f5a2586a883c3ab5b739c5bb4ba3965e59aabb579e51c1d6f6e0daab54813
 MISC metadata.xml 355 BLAKE2B 503762328f2c0793a7febe15e4d4ba88a21a6f577ba817df1a5a4ceb53b6969b4e448b98d3ce5665c91a0abfc06deb8bba59323d6dded0e8050a0bf7eee0dd8d SHA512 9bb07654a69afd045464b0ff8190523a21716d53ad309cc87165c82b699ef7db8cb10caf27a6ccf549cb408f7d1af3f263c5a1e57520856dbcf1f3138807f94f
diff --git a/x11-wm/lwm/lwm-1.2.4.ebuild b/x11-wm/lwm/lwm-1.2.4.ebuild
index 563b885460e9..c42e35e0988d 100644
--- a/x11-wm/lwm/lwm-1.2.4.ebuild
+++ b/x11-wm/lwm/lwm-1.2.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -23,7 +23,7 @@ RDEPEND="
 DEPEND="
 	${RDEPEND}
 	x11-base/xorg-proto
-	x11-misc/imake
+	>=x11-misc/imake-1.0.8-r1
 "
 
 DOCS=( AUTHORS BUGS ChangeLog )
@@ -31,7 +31,11 @@ DOCS=( AUTHORS BUGS ChangeLog )
 src_prepare() {
 	default
 	sed -i -e "s#(SMLIB)#& -lICE#g" Imakefile || die #370127
-	xmkmf || die
+}
+
+src_configure() {
+	CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \
+		IMAKECPP="${IMAKECPP:-$(tc-getCPP)}" xmkmf || die
 }
 
 src_compile() {
diff --git a/x11-wm/muffin/Manifest b/x11-wm/muffin/Manifest
index 67df17a99496..61da8190558a 100644
--- a/x11-wm/muffin/Manifest
+++ b/x11-wm/muffin/Manifest
@@ -1,6 +1,6 @@
-AUX muffin-4.8.1-slibtool.patch 6241 BLAKE2B be4f0ed369f5f500201d4ae22238f67deff1e1e14cc4725c408253c3ce120dfe02b5f9c30ca6505cc3c6611af88daa3a74f6606f74923cb3c00c92ffd89d700e SHA512 85b986cfcdd0daa06cc5ee95cf23c6f0b2957080dc726fec840581227d154583f5a928157554830dad3c80cd87a82d1312d72c650c7764a1fe3e93fd5d37c9a4
+AUX muffin-4.8.1-slibtool.patch 6242 BLAKE2B 487b87b47378cb827eaa85b0dbaa533bf6e79eaf712939aa694a8d42b54bb100b9e99b5b4d5fdce828a6e735af0a79fd99946a5c7a29ac5ab4ef1cea685efdee SHA512 8734ffc295042fc988a6668f12bc7f13a3de6783eff23418dd6dfd07f5f8a38697fa82e23b7e0703cbb4e20c78fa3e5b63e2943b272f5b50a487d6aba7252cdb
 DIST muffin-4.6.3.tar.gz 5196072 BLAKE2B 1b8c0eeab13c35fc0b66898328f378331cb2bfc78b27a48a8f9e22c842df1a223613f27f5b29fe28c1edaaeb59972262024ed656dfabafa6c9454c4c4c0a74b9 SHA512 c07d83656d3a9164ad488b500f98acb88e0c8e2374af858776ff27dbe90880db4310405505d79539222ba3b4ddedb22934ef3e0f1f6198dc7b36986b784b48f5
 DIST muffin-4.8.1.tar.gz 5195618 BLAKE2B 33dbbf7231b8f8d5c7df23d6cf8ddb29a86caca7b8c3b4af1231c98e114ee797d1c6bc866574348fcabaa65a93ff95c80366329bd5a41a46a74ba53ba81ce545 SHA512 61b621c7a4e25fc8ac69f2f5182e2caf52dfcfd456154f3b91ebb8b126319e704acd927ab5abe9e19ff057f38002a3b7e322e8d411db21e0fee7ec19d7928d31
-EBUILD muffin-4.6.3.ebuild 2204 BLAKE2B a5c62fdb96cce1b9b3ba424c801caab4cec0fbc70abf42c8f425e56a6afc5fd27ddf9834a74b75d9ccfc908728b202da318afe6434f62ff2fbc873972bd3028d SHA512 1a3af4ecd5b38aba64ab9f7d802e615d8c8080b59577e51b9c1197d4863f257133a90af97f7bc1308d1d7958fa3ca365366201dd8e9c2036c676d6d8e32aee36
+EBUILD muffin-4.6.3.ebuild 2198 BLAKE2B c49204763bc3fa56f272b40a249f314107f45dd225835499d5109fd00e6c424b78648205cc647eafe8d36e882b871540af40fd49fc5083d94358bb1302bcbe18 SHA512 45e4ced1cc68aca4d183cf7374bef34bcf2c009fd4907f3015f20cfbc22c322299ad3e215ecd8b35ed6371e7e16a5a3d4e09b9c1f390a712c840c86174aeba5f
 EBUILD muffin-4.8.1.ebuild 2393 BLAKE2B a133ddfaf9af27c6c5dac92cc6b5664214cbe75c2299f724a6eeccc178391d0469664f5c2d54d955003f01e2f8139d6e56d256786bfd1ebcf794e3e4be2968e8 SHA512 c810f6f0aeacccb32f2b5d4e1dc512a455191832e2b4a19a4b693c71c7144f8608f71a088ce7a22ae5143c026ccbb8ad6c798697fe51563457b787f884e8611f
 MISC metadata.xml 485 BLAKE2B 9c98a549cc02d9f3406afb6677215d183d8b8a78bfaaf322d1094d976352bc7f7bc361d3dbdb2ec935cecf991bec6b43cc869e4a6f61b88913c7643aa2d3d6fd SHA512 901c002088995674a0b3ef67d2558ea63bc1989c6ee459bb0bc074edd7a3e20d09284f8e76d87a4609bda6342586a1022e16caa61fbe5d4db8ba0024922c8998
diff --git a/x11-wm/muffin/files/muffin-4.8.1-slibtool.patch b/x11-wm/muffin/files/muffin-4.8.1-slibtool.patch
index 65f70b22023d..4d0d5827a62a 100644
--- a/x11-wm/muffin/files/muffin-4.8.1-slibtool.patch
+++ b/x11-wm/muffin/files/muffin-4.8.1-slibtool.patch
@@ -4,7 +4,7 @@ https://bugs.gentoo.org/767139
 From c10ab2d741cf4bbeff8f40f6859c9381606dbf26 Mon Sep 17 00:00:00 2001
 From: orbea <orbea@riseup.net>
 Date: Mon, 25 Jan 2021 22:30:35 -0800
-Subject: [PATCH 1/2] build: Add missing libtool depedencies.
+Subject: [PATCH 1/2] build: Add missing libtool dependencies.
 
 This fixes the build with slibtool.
 ---
diff --git a/x11-wm/muffin/muffin-4.6.3.ebuild b/x11-wm/muffin/muffin-4.6.3.ebuild
index 2b397f1eaebc..33f724dea90a 100644
--- a/x11-wm/muffin/muffin-4.6.3.ebuild
+++ b/x11-wm/muffin/muffin-4.6.3.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit autotools eutils gnome2-utils xdg-utils
+
+inherit autotools gnome2-utils xdg-utils
 
 DESCRIPTION="Compositing window manager forked from Mutter for use with Cinnamon"
 HOMEPAGE="https://projects.linuxmint.com/cinnamon/"
diff --git a/x11-wm/musca/Manifest b/x11-wm/musca/Manifest
index f6a38c4a7453..9d24a6df9563 100644
--- a/x11-wm/musca/Manifest
+++ b/x11-wm/musca/Manifest
@@ -1,9 +1,9 @@
-AUX musca-0.9.24-make.patch 711 BLAKE2B dac301663bc603fc3ec41c0b94321bdd234e58c4404ee0ee7d0c53c1844a310bfd5752e1f2b423e9a1e13173144252d3c0c91a37fa0bf19a2a00ffbb7eab80c0 SHA512 e31f4eb6b79e4137e366943c804aeaf7d571f005cf81332611126b94a82a3dd93651631670f7d0b6620e8f41047250c0c2c1955e86d9d48193ba3acd99e1c54c
+AUX musca-0.9.24-make.patch 645 BLAKE2B a8babf4eea096e4e912ebc5812f42d596d1ec83ee2fc7623e824462e25c36e6d34cca8ce37eb2fd8ad662761d635a01f09b6770a297125da969d32120a665023 SHA512 bd204a297450774068d70828a4aec3bfd0e3cd2fa6a7f418b0584eed28acf4df9c9e353ece690bd7d6a0d93ef76733697b76a49ccf3cff693466a4b7e8cbfa64
 AUX musca-0.9.24_p20100226-dmenu-4.4.patch 1421 BLAKE2B 5931e45032d32df872b25bbb34d874cc533574f5192c2e9d7baefc1ce86fed9da7a0c22afa3cb0ccbb8babb2f4712e3738ffb99dc8f9f99cb75f139ea69994ef SHA512 9aee1756cd0ff7094a26aa3ab0e2440728b973a72234c3532f733afc57763678cfcfb6a07ec2ae386f2b70d2313d62437cf889d561bbf321f96fe979181541b3
 AUX musca-0.9.24_p20100226-fix-cycle.patch 408 BLAKE2B c973711d377919a5c30101274efa64603a90a1a9043502fa4b05c37648eb64b6876e1a19f57a9345b3ef53c30a8d7ccef1b3ace5ce0e5d8b3f322059b3774b4e SHA512 873f3907bcc31aa29e8af92ec5a20996e6efa5e879eb2d1b6f5bccc562d3816b83475f650f07b7834e9392b32f15644b298056a03a570c6f768224d3bd5f4449
 AUX musca-0.9.24_p20100226-fix-pad.patch 818 BLAKE2B b89d6eea59c6c172832750e9d42fe40524e4b38191839675ddbe1dfd7e46a682c4e9929b5a4b63c1d77b9697fd8bf3dcdeb6e049f197d0b29ea8e01339374197 SHA512 9552c301a2f228fc4147bfc27ab28bd0d17c7cd308f20ff432c37a041b91fd62a166eca2085c36693249ac6d19225717c898c13e7ed176adb9000c37cd8bd0e5
 AUX musca-0.9.24_p20100226-null.patch 4271 BLAKE2B 52ec8124f563fbe0e3b281e36cabc4b59ed0a8091af40dee2eddc49b2d2cd1233a2c8bf6da5feb3e3251a4df4a5ead0922b6af66cbb96cdfb01ee9b287ed9797 SHA512 76bf5d67eee6a5045d1781b818333ef36bac87276bb6050b794502abc4aa77a930092f62ec07622ee18f6bb270924ec40813ee70d25ea8e5d3cf1458a39569a5
 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
+EBUILD musca-0.9.24_p20100226-r4.ebuild 1261 BLAKE2B 4f800920fbcdf9941ec1ea6788520e9bbaea4f8b28d6e265e1c415ac7274aee937e3b7541ae24827651de35c6f67ea44de125ceb826c0d5a9fbfde9f48f84dd5 SHA512 1c5de8b829bf50cacff27d93d9123ecbe421c00df4321a68fe1943f3b7aa690dd11ed7c718d445cad303ab268ef9cf713517473faac36e63ba76020539624a44
 MISC metadata.xml 409 BLAKE2B c5e59355e2728621e203702348d6c3efdaa4db731fe866890949a23414f530fc0b91806c32df30647674ad6d632fc048398095935fcfdd43a7368148741bec53 SHA512 db328cb55227ee361966123fd7e9e6d3c967e34543147a680e5a944d3d699df377560a26b09898d52e3bfed68ee6cf59761adf7cb858d6c7a01fe7b5c7011be4
diff --git a/x11-wm/musca/files/musca-0.9.24-make.patch b/x11-wm/musca/files/musca-0.9.24-make.patch
index 0f28c5653c7b..d6677b9929b7 100644
--- a/x11-wm/musca/files/musca-0.9.24-make.patch
+++ b/x11-wm/musca/files/musca-0.9.24-make.patch
@@ -1,10 +1,10 @@
---- a/Makefile	2009-11-03 03:20:21.000000000 +0100
-+++ b/Makefile	2009-12-27 19:12:02.461539607 +0100
+--- a/Makefile
++++ b/Makefile
 @@ -1,9 +1,12 @@
 -CFLAGS?=-Wall -g
 +CFLAGS ?= -Wall -g
-+INCLUDES = $(shell pkg-config --cflags x11)
-+LIBS = $(shell pkg-config --libs x11) -lm
++INCLUDES = $(shell ${PKG_CONFIG} --cflags x11)
++LIBS = $(shell ${PKG_CONFIG} --libs x11) -lm
 +BIN_DIST = musca apis xlisten
  
 -all:
diff --git a/x11-wm/musca/musca-0.9.24_p20100226-r4.ebuild b/x11-wm/musca/musca-0.9.24_p20100226-r4.ebuild
index 3b59bc329b78..59b442b1ea7f 100644
--- a/x11-wm/musca/musca-0.9.24_p20100226-r4.ebuild
+++ b/x11-wm/musca/musca-0.9.24_p20100226-r4.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit savedconfig toolchain-funcs
 
 DESCRIPTION="A simple dynamic window manager, with features nicked from ratpoison and dwm"
@@ -21,6 +22,8 @@ RDEPEND="
 	>=x11-misc/dmenu-4.4
 	apis? ( x11-misc/xbindkeys )
 "
+BDEPEND="virtual/pkgconfig"
+
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.9.24-make.patch
 	"${FILESDIR}"/${PN}-0.9.24_p20100226-dmenu-4.4.patch
@@ -46,7 +49,7 @@ src_prepare() {
 		fi
 	done
 
-	tc-export CC
+	tc-export CC PKG_CONFIG
 }
 
 src_install() {
diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest
index e4a5bcab8463..5ed6fce31903 100644
--- a/x11-wm/mutter/Manifest
+++ b/x11-wm/mutter/Manifest
@@ -1,13 +1,12 @@
 AUX 3.34.6-tests-dontreq-gdkwayland.patch 1730 BLAKE2B d796a4dc91d756ac4af24c411e9f6ef33fcd02443585a3662bf58f04498305aa6b458ab0ace5191a97d9c66ba81cec9ee75099d7e77436eb39c3bec33bb68e26 SHA512 841f59c00f061302f411ce5ed5c25ef041f13a57d44da011815cfb2c1f80cccea1963675dc023d82aac4824b620861876ca628b6165db74b150564222b786b22
+AUX mutter-40.0-Disable-anonymous-file-test.patch 862 BLAKE2B bb7a0f0dfa5f0543c9187fe8c3aa8d1251fbb9c74dcf4c518a4674758a22da70a94de688f4b01d7673c679a2e96cbdfa5c33de3d009c85fecd2498061121dcf3 SHA512 d2d7ec9e1fcc3fad9dc058edf611fe16a3180a8d6694a9f3257b22eb3885dc0b311bc48054de0d183c661658e226d1b04e4ad81b1314a60a3f441a6f4c06bed8
 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.2.tar.xz 2621648 BLAKE2B 93ddeaa8b1c09ac0cd711513cb755eb94b72c1c44a751e2c6656dd3415fcb278d22e92577400df9443ece0e3dd1bc77adc88d1a24d59bb911ce8114e53340cae SHA512 8bd826fdb643bc966f6b7c38ed12cec9806440bf9cf4792cb90aa62dd96d2fd1018be39148ebd4432ba799cfdd30ed5c3952620ca13b9fac933fb0a477c9937a
-DIST mutter-3.38.3-r1-patchset.tar.xz 6576 BLAKE2B 9bda2b0891df1a945d9bd0fd2867f1b4895bb9a29dbae14511192afd5b3a6776d41105924c904d47745bd2bd088136109db4df82b3a17c08040ceb40611e8dc1 SHA512 86763c6c652807a2389b373e94fed99e4557d7be89aeb269836855e9ec251944f5c3a0d4219f31a49c7cfe9ecde7972b3e1b7ad9f231d16999eaa36cee2aef41
-DIST mutter-3.38.3.tar.xz 2622808 BLAKE2B 3ee6442c03a3ca5bbaecd32ac451e9c2ba91258af0425745ea871aca2a95218d8afcff8b2e5845e5ab8a4ff2c0308a0bcc0561922b4675ad68b700c04dd3028d SHA512 686027d097ffff439e5a21f7bc748251da8b2f7fdccb2c17599fd6a141b0fda04fe7a19cbb3be2b3e668075fff562bcdae68a61ffb049d103b5b05f2443a5315
+DIST mutter-3.38.4-r1-patchset.tar.xz 8188 BLAKE2B b9765fbb3514c5b6e0015b98bcb78381db8e5ea991fbb51e5df3e507fe1771e7bf8be8c927dc38fd05281c1019a91e71241f7c7492618cff685bd2a6c57e8b89 SHA512 a1b7e86991d42479b8791f6afe1866b8066bcfa1455907a1628a8a2ee6d231e2ca4d19170be3eb6850e9e2ae844e0ab296d4c914065ba0b3348be650395e1e6c
 DIST mutter-3.38.4.tar.xz 2623788 BLAKE2B 27ca701459b3b70c790c8fec02b5e34eebecf5b4bd11a706a25eea19af0ee5be278835d6f789c4f77df6ec2ab23ae58bb491a0591d1ff51c9dae4690b9dde73f SHA512 a80728a5bd99e727717cb49f0fbfa0db0bb02b64d7e287b4b7e5e848774ea2191db57f8c70d4b1852db201384ac413daa7108472610e8f8986d13744d800fe11
+DIST mutter-40.0.tar.xz 2678364 BLAKE2B 3016216c396e5362a3c92dae44911ab67be6ad38b551ffef772f840fc1202ccd59a6800fe76526bab7ba1adf645a243bc000301ff6b331c949f660380143bcff SHA512 af4fd21e5ea7e2cf1004d6912771279cebb2fc60f51f5c7371fd5f6fefbfbd7e36841de98757b8f116b0d2006c1151ccf74ed03ee62836cf59d2a86eaf48084d
 EBUILD mutter-3.36.7-r1.ebuild 4749 BLAKE2B 69075255e249f22d91a87e440d986cfbd125c91bc878f715a1430d90996bf4183c2281c88b935ca44b8940ddf4f7850f5a42d7550f138ddead7eb6ddd62a4a8e SHA512 c2a5b423e410bb6a8a9304acea03fbefba0ce3385d3dabb8adc46baa63d9daef02a59b051a371b62acdc6acfed3c443a8cc229928a2305a11766005ded637c2a
-EBUILD mutter-3.38.2.ebuild 4588 BLAKE2B cc0e0069a256f02f368730958bcbedf398bff20dee6107e79e0accc191195b75ee0ae2f07d9b64bf9653eb9c4a7ed3f99913fbb26bde8089cd76549e7483ae7e SHA512 1f328c1a55625cc4db3a1435574dc0cae1c86337b4dd5cb01f7bc3bac64766d0dd1ee5fe57e3603aec39de787d5f60e2447df3eaaa4919ddf268c24240d79204
-EBUILD mutter-3.38.3-r1.ebuild 4730 BLAKE2B ff3c0e3f00b0116e0389eb73655d30ae114e83c4ee58e23a8e32019c941499e86f6e7a5b732228b110b313433ef6ae78dc46ea12ccebdc6a71a86c2e043ebaa8 SHA512 e46b8f6781fbdb3b8e6fb6c8311ad1b592fe1e4a88763132730b76044a73862e796963f81e36c603bbb975640413fe9352c89f012ab5bb0ad1999f0c4563c2f5
-EBUILD mutter-3.38.3.ebuild 4588 BLAKE2B cc0e0069a256f02f368730958bcbedf398bff20dee6107e79e0accc191195b75ee0ae2f07d9b64bf9653eb9c4a7ed3f99913fbb26bde8089cd76549e7483ae7e SHA512 1f328c1a55625cc4db3a1435574dc0cae1c86337b4dd5cb01f7bc3bac64766d0dd1ee5fe57e3603aec39de787d5f60e2447df3eaaa4919ddf268c24240d79204
-EBUILD mutter-3.38.4.ebuild 4588 BLAKE2B 6e773e36bf90233efb404dd8dd3fc94116fd78da2efab46a5ca4d482c4c7d8adb1b4fd4288caf5f2a41b7da904c44ea09c5ba657f8049a587b2ca55996cf6c88 SHA512 39aa63a1bddd233ea9adebb8276ad8f97c168406243780b722a4f2c6b14bcd14ecab019ac67a62aca32aa2b81c3de5a79ae9f7e2a2c85fd51096efd44e1488a1
+EBUILD mutter-3.38.4-r1.ebuild 4739 BLAKE2B c39939561c7ddadef9efe20907e90cc6619c1db5574053064a1b269ef102da613e7f5acc542e15f9ad8274f41241edeb28e7986b6974fd4dcd19273748870330 SHA512 880a8e30fb0919f59f4f3d1ed635dfcfcdb6398b4601409fc03011fc823e6a7834de5e465817c838ef9cd1bfc72752de9f02005b92d8c90a98e180e61b5e9182
+EBUILD mutter-3.38.4.ebuild 4593 BLAKE2B 24c84b5c9810bed46bc79b8e09a695fc2683accf68e21fc206d95e1cf622a53b63c6fe7cc98adad79d6acd17c490264799fe09ac360e410dc82c81573acf7fc4 SHA512 4ea41a5242f3b1fef6a3e627817c056e7c0e6f24492c5fd349557707be33bc6f4490ea403f107d4a0d8a66691b57c0fe25873dcb5acbd418d51df664345c3fe2
+EBUILD mutter-40.0.ebuild 4689 BLAKE2B 39dbbbb9776b7491b11235f1aa295a39ea0280343788ea6757fc203d0ae4e58a91038f40b6fad13369fbdd7303ce0998396a0a3a7ce05b1a74f370348fed0695 SHA512 e6ae741da776e3d9031dfac35f46c510cb897709b6834a6f8a3a685659200dbcc69e41b74c701109fa3fc1b173a31d95df295ea9907dd29846c507fda3c0e054
 MISC metadata.xml 605 BLAKE2B 5dc68fbf8b85c2bf75ea435abe116a9ed7072ec40a45bda28de9cb277a03e5c363487f1c3aa5c60cab5f710e06f15d966790684cac1573676af635e59b3cdfbd SHA512 440e7a33404e218da15c127614d843edcd42c469aced4609c2e7d7d8ec1281c9eceb64aebe406a75e9ba0a05b6be18bbb721257e140f6d334aff6143b1233fb8
diff --git a/x11-wm/mutter/files/mutter-40.0-Disable-anonymous-file-test.patch b/x11-wm/mutter/files/mutter-40.0-Disable-anonymous-file-test.patch
new file mode 100644
index 000000000000..484c62c5a0c4
--- /dev/null
+++ b/x11-wm/mutter/files/mutter-40.0-Disable-anonymous-file-test.patch
@@ -0,0 +1,32 @@
+From 7353efd2f326b3f855db52ba8643ac4e793d5ffc Mon Sep 17 00:00:00 2001
+From: Matt Turner <mattst88@gmail.com>
+Date: Sun, 21 Mar 2021 18:31:22 -0400
+Subject: [PATCH] Disable anonymous-file test
+
+It attempts to open /proc/self/fd/* (an fd created by memfd_create),
+which sandbox disallows.
+---
+ src/tests/meson.build | 7 -------
+ 1 file changed, 7 deletions(-)
+
+diff --git a/src/tests/meson.build b/src/tests/meson.build
+index 8ee409e20..50c930c2a 100644
+--- a/src/tests/meson.build
++++ b/src/tests/meson.build
+@@ -285,13 +285,6 @@ test('stage-view', stage_view_tests,
+   timeout: 60,
+ )
+ 
+-test('anonymous-file', anonymous_file_test,
+-  suite: ['core', 'mutter/unit'],
+-  env: test_env,
+-  is_parallel: false,
+-  timeout: 60,
+-)
+-
+ if have_native_tests
+   test('native-headless', native_headless_tests,
+     suite: ['core', 'mutter/native/headless'],
+-- 
+2.26.2
+
diff --git a/x11-wm/mutter/mutter-3.38.2.ebuild b/x11-wm/mutter/mutter-3.38.2.ebuild
deleted file mode 100644
index 9c81a28880df..000000000000
--- a/x11-wm/mutter/mutter-3.38.2.ebuild
+++ /dev/null
@@ -1,143 +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/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
-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.37.2[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]
-	sysprof? ( >=dev-util/sysprof-capture-3.38.0:4 )
-	wayland? (
-		>=dev-libs/wayland-protocols-1.19
-		>=dev-libs/wayland-1.18.0
-		x11-libs/libdrm:=
-		>=media-libs/mesa-17.3[egl,gbm,wayland,gles2]
-		>=dev-libs/libinput-1.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
-	screencast? ( >=media-video/pipewire-0.3.0:0/0.3 )
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-"
-RDEPEND="${DEPEND}
-	gnome-extra/zenity
-"
-DEPEND="${DEPEND}
-	x11-base/xorg-proto
-	sysprof? ( >=dev-util/sysprof-common-3.38.0 )
-"
-# wayland bdepend for wayland-scanner, xorg-server for cvt utility
-BDEPEND="
-	dev-libs/wayland
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	test? ( app-text/docbook-xml-dtd:4.5 )
-	wayland? ( >=sys-kernel/linux-headers-4.4
-		x11-base/xorg-server )
-"
-
-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.38.3-r1.ebuild b/x11-wm/mutter/mutter-3.38.4-r1.ebuild
index 944cb09a481d..4a385513c5a3 100644
--- a/x11-wm/mutter/mutter-3.38.3-r1.ebuild
+++ b/x11-wm/mutter/mutter-3.38.4-r1.ebuild
@@ -18,13 +18,13 @@ REQUIRED_USE="
 	test? ( wayland )"
 RESTRICT="!test? ( test )"
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 # gnome-settings-daemon is build checked, but used at runtime only for org.gnome.settings-daemon.peripherals.keyboard gschema
 # xorg-server is needed at build and runtime with USE=wayland for Xwayland
 # 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/libX11-1.7.0
 	>=media-libs/graphene-1.9.3[introspection?]
 	>=x11-libs/gtk+-3.19.8:3[X,introspection?]
 	x11-libs/gdk-pixbuf:2
@@ -95,7 +95,7 @@ BDEPEND="
 "
 
 PATCHES=(
-	# origin/gnome-3-38@d881fcdece608
+	# origin/gnome-3-38@8c43a8ce6494b
 	"${WORKDIR}"/patches
 )
 
diff --git a/x11-wm/mutter/mutter-3.38.4.ebuild b/x11-wm/mutter/mutter-3.38.4.ebuild
index 37c6c25aa950..a72e4c75b10b 100644
--- a/x11-wm/mutter/mutter-3.38.4.ebuild
+++ b/x11-wm/mutter/mutter-3.38.4.ebuild
@@ -17,13 +17,13 @@ REQUIRED_USE="
 	test? ( wayland )"
 RESTRICT="!test? ( test )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 # gnome-settings-daemon is build checked, but used at runtime only for org.gnome.settings-daemon.peripherals.keyboard gschema
 # xorg-server is needed at build and runtime with USE=wayland for Xwayland
 # 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/libX11-1.7.0
 	>=media-libs/graphene-1.9.3[introspection?]
 	>=x11-libs/gtk+-3.19.8:3[X,introspection?]
 	x11-libs/gdk-pixbuf:2
diff --git a/x11-wm/mutter/mutter-3.38.3.ebuild b/x11-wm/mutter/mutter-40.0.ebuild
index 9c81a28880df..31b0288d695a 100644
--- a/x11-wm/mutter/mutter-3.38.3.ebuild
+++ b/x11-wm/mutter/mutter-40.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,7 +8,7 @@ DESCRIPTION="GNOME 3 compositing window manager based on Clutter"
 HOMEPAGE="https://gitlab.gnome.org/GNOME/mutter/"
 
 LICENSE="GPL-2+"
-SLOT="0/7" # 0/libmutter_api_version - ONLY gnome-shell (or anything using mutter-clutter-<api_version>.pc) should use the subslot
+SLOT="0/8" # 0/libmutter_api_version - ONLY gnome-shell (or anything using mutter-clutter-<api_version>.pc) should use the subslot
 
 IUSE="elogind input_devices_wacom +introspection screencast sysprof systemd test udev wayland"
 # native backend requires gles3 for hybrid graphics blitting support, udev and a logind provider
@@ -23,15 +23,15 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 # 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/libX11-1.7.0
+	>=media-libs/graphene-1.10.2[introspection?]
 	>=x11-libs/gtk+-3.19.8:3[X,introspection?]
 	x11-libs/gdk-pixbuf:2
-	>=x11-libs/pango-1.30[introspection?]
+	>=x11-libs/pango-1.46[introspection?]
 	>=dev-libs/fribidi-1.0.0
 	>=x11-libs/cairo-1.14[X]
-	>=gnome-base/gsettings-desktop-schemas-3.37.2[introspection?]
-	>=dev-libs/glib-2.61.1:2
+	>=gnome-base/gsettings-desktop-schemas-40.0[introspection?]
+	>=dev-libs/glib-2.67.3:2
 	gnome-base/gnome-settings-daemon
 	>=dev-libs/json-glib-0.12.0[introspection?]
 	gnome-base/gnome-desktop:3=
@@ -61,7 +61,7 @@ DEPEND="
 		>=dev-libs/wayland-1.18.0
 		x11-libs/libdrm:=
 		>=media-libs/mesa-17.3[egl,gbm,wayland,gles2]
-		>=dev-libs/libinput-1.7
+		>=dev-libs/libinput-1.15.0
 		systemd? ( sys-apps/systemd )
 		elogind? ( sys-auth/elogind )
 		x11-base/xorg-server[wayland]
@@ -71,7 +71,7 @@ DEPEND="
 	x11-libs/libSM
 	input_devices_wacom? ( >=dev-libs/libwacom-0.13 )
 	>=x11-libs/startup-notification-0.7
-	screencast? ( >=media-video/pipewire-0.3.0:0/0.3 )
+	screencast? ( >=media-video/pipewire-0.3.21:0/0.3 )
 	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
 "
 RDEPEND="${DEPEND}
@@ -93,6 +93,10 @@ BDEPEND="
 		x11-base/xorg-server )
 "
 
+PATCHES=(
+	"${FILESDIR}"/${P}-Disable-anonymous-file-test.patch
+)
+
 src_configure() {
 	# TODO: Replicate debug vs release meson build type behaviour under our buildtype=plain
 	local emesonargs=(
@@ -115,6 +119,7 @@ src_configure() {
 		$(meson_use introspection)
 		$(meson_use test cogl_tests)
 		$(meson_use wayland core_tests) # core tests require wayland; overall -Dtests option is honored on top, so no extra conditional needed
+		-Dnative_tests=false
 		$(meson_use test clutter_tests)
 		$(meson_use test tests)
 		$(meson_use sysprof profiler)
diff --git a/x11-wm/sawfish/Manifest b/x11-wm/sawfish/Manifest
index 8aa0095377ec..809fc9ab3fda 100644
--- a/x11-wm/sawfish/Manifest
+++ b/x11-wm/sawfish/Manifest
@@ -2,5 +2,5 @@ AUX 50sawfish-gentoo.el 366 BLAKE2B 5d068cfae8fd522037656d009a2007188ab272d4ea0c
 AUX sawfish-1.12.0-desktop.patch 839 BLAKE2B cbc68895b979d5d0eb794f95a6e002f4807cd7712be992bdfe7d20bfc5fe6bfcf8a1c0407f8a1394ad2bfed8fe5663745edd761a7d41c0ced226f400c414a7d1 SHA512 ab96ea42c01e1fb2bde192f55273fc647a6fd9904c6bcd05303eea03dc306dde90c152ab7dfea003a50441dcd344f37478e184d9a9c1124961b96556e3aab40d
 AUX sawfish-1.12.0-fno-common.patch 987 BLAKE2B 9f5a94a226453b831efab89b46dc0022585712af26153ba87187da629ffb662f89eeee9529322ab810809fa352bba0eaca314e1cfef507d8735086075b9c29bd SHA512 89d2f547b6fe100815763c4b1ab9fcb2cb67613c35bdda6de7d6be297c2871909c70c6d352debea04fa4627aca6e195ea44a1d402a4cd01137d80ff96b5040be
 DIST sawfish_1.12.90.tar.xz 2602372 BLAKE2B 180d3ed1081fffa0fe6c60c15b96a4b530be1349e162d0b6e7553e753e0462aea89caf7bfe379b1993f883e544e27bb553d259d0348fcceb53619dc54536cc47 SHA512 444cdc21b368d9ffb89e1ccd0377d9ce9d9b42f9bd93aa85ca29763781f90cb393a0c9c8da47ff0a161bf5e3881e6d6895a7c5749761ccc7b4b5a1ed8438c93d
-EBUILD sawfish-1.12.90-r1.ebuild 2240 BLAKE2B 3db5195071521570c91ccf44ab00d39989692861f193530c9b7242610d3ff98beec964105df4b47155adad1b13d972ca68189076ba901b177ec163ea162b0c27 SHA512 d5bac3996e9bfa0cac5b4c295036d9ed76b5a195b6030a457915b43da2e6cbaa1edbc9e84f8106318575c0083bf6e68f076e8fc017a217075c65a8a8c14c6f24
+EBUILD sawfish-1.12.90-r2.ebuild 2332 BLAKE2B 9d25104045ca942117465d061344e4fa8e448cefd76708743f10f128601fd18a2a40559763e1e760b930ede4d653a50ca9ed26f2832f4201c47983cbf2f59a80 SHA512 3eb3a49d6a6552ee0e32e3a6e6109d7e7a7faa8ac48b70dbd20a5fdf926a479d71a94652ae7d6e545dcacd6719b10a4c1c7b42a72fb3a8abaaad08db7a9e36b0
 MISC metadata.xml 435 BLAKE2B de60328aaf226209271f875971dc4061e350c1bb882980522aa5335addcb0cd8721624bdd8a378927212db79056307795368becbafa6024486e95a87fb267b9f SHA512 ecc1b031b97b12870bd327a10d2b1247e2d3a739cc93e23ce7833d88ebaf0c287de650eb903a2133bd3c9bf0520388216635e551303eb68909ca26827f478044
diff --git a/x11-wm/sawfish/sawfish-1.12.90-r1.ebuild b/x11-wm/sawfish/sawfish-1.12.90-r2.ebuild
index 7b796ede0e0c..bf4276d85148 100644
--- a/x11-wm/sawfish/sawfish-1.12.90-r1.ebuild
+++ b/x11-wm/sawfish/sawfish-1.12.90-r2.ebuild
@@ -1,14 +1,15 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 MY_P="${P/-/_}"
-inherit autotools elisp-common eutils xdg-utils
+inherit autotools elisp-common l10n xdg-utils
 
 DESCRIPTION="Extensible window manager using a Lisp-based scripting language"
 HOMEPAGE="https://sawfish.fandom.com/wiki/Main_Page"
 SRC_URI="https://download.tuxfamily.org/sawfish/${MY_P}.tar.xz"
+S="${WORKDIR}"/${MY_P}
 
 LICENSE="GPL-2 Artistic-2"
 SLOT="0"
@@ -16,13 +17,18 @@ KEYWORDS="~alpha amd64 ~ia64 ppc ~ppc64 sparc x86"
 IUSE="emacs kde nls xinerama"
 
 RDEPEND="
-	emacs? ( >=app-editors/emacs-23.1:* )
 	>=dev-libs/librep-0.92.1
 	>=x11-libs/rep-gtk-0.90.7
 	x11-libs/gdk-pixbuf-xlib
 	>=x11-libs/gdk-pixbuf-2.42.0:2
 	>=x11-libs/gtk+-2.24.0:2
+	x11-libs/libICE
+	x11-libs/libXext
+	x11-libs/libXft
+	x11-libs/libXrender
 	x11-libs/libXtst
+	x11-libs/pango[X]
+	emacs? ( >=app-editors/emacs-23.1:* )
 	kde? ( kde-frameworks/kdelibs4support )
 	nls? ( sys-devel/gettext )
 	xinerama? ( x11-libs/libXinerama )
@@ -31,7 +37,7 @@ DEPEND="
 	${RDEPEND}
 	virtual/pkgconfig
 "
-S="${WORKDIR}/${MY_P}"
+
 PATCHES=(
 	# From Fedora
 	"${FILESDIR}"/${PN}-1.12.0-desktop.patch
@@ -79,9 +85,8 @@ src_compile() {
 src_install() {
 	default
 
-	find "${D}" -name '*.la' -delete || die
-
-	find "${D}/usr/share/man" -name '*.gz' -exec gunzip {} \; || die
+	find "${ED}" -name '*.la' -delete || die
+	find "${ED}/usr/share/man" -name '*.gz' -exec gunzip {} \; || die
 
 	if use emacs; then
 		elisp-install ${PN} sawfish.{el,elc}
diff --git a/x11-wm/spectrwm/Manifest b/x11-wm/spectrwm/Manifest
index 39d0f5b10292..ed54dbbfc45f 100644
--- a/x11-wm/spectrwm/Manifest
+++ b/x11-wm/spectrwm/Manifest
@@ -1,8 +1,5 @@
-AUX spectrwm-3.1.0-Makefile.patch 977 BLAKE2B 1f76bc331ee1d048387ab82900b44339e092986a793f5d03fa317f4247987ebb8ede090c0b157ae508d2a3ed05a374a9d06910e99fa9c5dd6df2169c54cfc3b3 SHA512 5d2be769544e4446e4e6780793bd61fe88a63c26b865d79e19892aca4734e600f16d55184b2e35d3f8e0d8456ac0c5c229854fcd607bd32c036a4397150ce118
 AUX spectrwm-3.4.0-gentoo.patch 1134 BLAKE2B 01f472388c38b276fc91747cb1e06bf4709b1a53caacd1e16f3ef7d0817eb3d127aac76c665e92d05c41c9f01ce8b79525dd0bacbeecdd5d36c1d012bcdcb1c5 SHA512 9c8450fcdd198dd0ef88d13c38edb0cc48c7324cc8a3b3e2c331d9ca5608cfa9fa041b9cae466429e8b77fcb9eb28a29d484590106ea604f27163d07ee428508
 AUX spectrwm-3.4.1-musl.patch 259 BLAKE2B 61dde875af4c9fb8be72a098debe0ac00174ee4bf15c727778d37f80f844a60834959c8ab6f2f15200e4fb5968528f06c03a18fa4d89d074ffe1f32eb7fbfd8c SHA512 5780b9fa2504b3fe0d426bc373d9e43babc642af402035bcdf453b71766adac9d9e903226a63ccac1edc4f90d44c61723f80ceb2fb0c8743702cc1b14da0491b
-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 1164 BLAKE2B fcbd535dd17560efb09016fc30ff0ef4a2b4375a24412ecfa118fa734c06a163dfa90c9c201ef778dc96482093e6534169bad2518ca1e1904eadbdfe03abd4d8 SHA512 2bf7269931f1cf435f6794333396c71a1c1c9a15f08c2c3d304fd0a138b0ed85b35671b7304179147c148bbc0fcd90eaee4eedc6c84b1a999d120aa136611740
+EBUILD spectrwm-3.4.1.ebuild 1178 BLAKE2B 320c66c5585f60206318568ff6b5b43878cf0b940ec5ad250bf43aeee4d222cdef06f24075b8461f1ae7e05b65de01f85f75928f3cd023ec41adfe17871d6fa8 SHA512 a4a74677a018f361a14cbef154b480f6135903efda8009754753412493a1df2d989ff4a4b98a678fd9d0dc36e3323403ad74345d7c301e92d891ef0f9255d593
 MISC metadata.xml 244 BLAKE2B 24ebafa89c32f799b62237b0d9442143de8ccb86c1625f2a49dd91ec9caa63cadc52000005b5b5ef148df89e907e1407330a8d8411ffb5f4facaf629a3184cb8 SHA512 d7a2290eb2970ef7fb9bea275b209c7ace388daadcf3e317b099767d72c7d9f0b894e23492f02e973d27010a7568e48549e4f502c9628efc3133012680304784
diff --git a/x11-wm/spectrwm/files/spectrwm-3.1.0-Makefile.patch b/x11-wm/spectrwm/files/spectrwm-3.1.0-Makefile.patch
deleted file mode 100644
index c1162fb73610..000000000000
--- a/x11-wm/spectrwm/files/spectrwm-3.1.0-Makefile.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -9,16 +9,16 @@
- LIBVERSION      = $(shell .  $(CURDIR)/../lib/shlib_version; echo $$major.$$minor)
- LIBMAJORVERSION = $(shell .  $(CURDIR)/../lib/shlib_version; echo $$major)
- 
--MAINT_CFLAGS   = -std=c99 -Wmissing-prototypes -Wall -Wextra -Wshadow -Wno-uninitialized -g
--MAINT_LDFLAGS  = -Wl,--as-needed
-+MAINT_CFLAGS   = -std=c99 -Wmissing-prototypes -Wall -Wextra -Wshadow -Wno-uninitialized
-+MAINT_LDFLAGS  =
- MAINT_CPPFLAGS = -I. -D_GNU_SOURCE -DSWM_LIB=\"$(LIBDIR)/libswmhack.so.$(LIBVERSION)\"
- 
- ifneq ("${BUILDVERSION}", "")
- MAINT_CPPFLAGS += -DSPECTRWM_BUILDSTR=\"$(BUILDVERSION)\"
- endif
- 
--BIN_CFLAGS   = -fPIE
--BIN_LDFLAGS  = -fPIE -pie
-+BIN_CFLAGS   =
-+BIN_LDFLAGS  =
- BIN_CPPFLAGS = $(shell pkg-config --cflags x11 x11-xcb xcb-icccm xcb-keysyms xcb-randr xcb-util xcb-xtest xcursor xft)
- BIN_LDLIBS   = $(shell pkg-config --libs   x11 x11-xcb xcb-icccm xcb-keysyms xcb-randr xcb-util xcb-xtest xcursor xft)
- LIB_CFLAGS   = -fPIC
diff --git a/x11-wm/spectrwm/spectrwm-3.1.0.ebuild b/x11-wm/spectrwm/spectrwm-3.1.0.ebuild
deleted file mode 100644
index f6038f78ba8c..000000000000
--- a/x11-wm/spectrwm/spectrwm-3.1.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils multilib toolchain-funcs vcs-snapshot
-
-DESCRIPTION="Small dynamic tiling window manager for X11"
-HOMEPAGE="https://github.com/conformal/spectrwm"
-SRC_URI="https://github.com/conformal/${PN}/archive/SPECTRWM_${PV//./_}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="x11-misc/dmenu"
-DEPEND="${DEPEND}
-	x11-libs/libX11
-	x11-libs/libXcursor
-	x11-libs/libXrandr
-	x11-libs/libXtst
-	x11-libs/xcb-util
-	!x11-wm/scrotwm"
-
-S=${WORKDIR}/${P}/linux
-
-PATCHES=( "${FILESDIR}"/${P}-Makefile.patch )
-
-src_prepare() {
-	default
-	tc-export CC
-}
-
-src_compile() {
-	emake PREFIX="${EROOT}usr" LIBDIR="${EROOT}usr/$(get_libdir)"
-}
-
-src_install() {
-	emake PREFIX="${EROOT}usr" LIBDIR="${EROOT}usr/$(get_libdir)" DESTDIR="${D}" install
-
-	cd "${WORKDIR}"/${P} || die
-
-	insinto /etc
-	doins ${PN}.conf
-	dodoc ${PN}_*.conf {initscreen,screenshot}.sh
-
-	make_session_desktop ${PN} ${PN}
-
-	elog "Example keyboard config and helpful scripts can be found"
-	elog "in ${ROOT}usr/share/doc/${PF}"
-}
diff --git a/x11-wm/spectrwm/spectrwm-3.4.1.ebuild b/x11-wm/spectrwm/spectrwm-3.4.1.ebuild
index 9f77e6443e36..3836663ba0ba 100644
--- a/x11-wm/spectrwm/spectrwm-3.4.1.ebuild
+++ b/x11-wm/spectrwm/spectrwm-3.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,11 +13,11 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 
 RDEPEND="
-	!x11-wm/scrotwm
 	x11-misc/dmenu
 "
 DEPEND="
 	elibc_musl? ( sys-libs/queue-standalone )
+	virtual/pkgconfig
 	x11-libs/libX11
 	x11-libs/libXcursor
 	x11-libs/libXrandr
@@ -37,12 +37,12 @@ src_prepare() {
 
 src_compile() {
 	tc-export CC PKG_CONFIG
-	emake -C linux PREFIX="${EROOT}/usr" LIBDIR="${EROOT}/usr/$(get_libdir)"
+	emake -C linux PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)"
 }
 
 src_install() {
-	emake -C linux PREFIX="${EROOT}/usr" LIBDIR="${EROOT}/usr/$(get_libdir)" \
-		SYSCONFDIR="${EROOT}/etc" DOCDIR="${EROOT}/usr/share/doc/${P}" \
+	emake -C linux PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+		SYSCONFDIR="${EPREFIX}/etc" DOCDIR="${EPREFIX}/usr/share/doc/${P}" \
 		DESTDIR="${D}" install
 
 	dodoc README.md ${PN}_*.conf {initscreen,screenshot}.sh
diff --git a/x11-wm/stumpwm/Manifest b/x11-wm/stumpwm/Manifest
index 01b690b5d4a1..84e26d34d699 100644
--- a/x11-wm/stumpwm/Manifest
+++ b/x11-wm/stumpwm/Manifest
@@ -1,5 +1,5 @@
 AUX 70stumpwm-gentoo.el 84 BLAKE2B 12ce0e9a1b53a1c1c84a9f350484b9620a2db9a30eaefb11bb409b89aae7f1226173930c52d018ec8a845c8e6ff69efd5570a369444537d070d21427a6960c09 SHA512 2e67f51dd6840f850aa1c0e3f2e8c2453203603f174f3ce97feacd2658cf6168bf557eb6ee83499b8c60fb107fdd527caccdda7ab5692646a33f96ad1350bcd1
 AUX README.Gentoo 1894 BLAKE2B 23dd829621f92b2e5ab22bd3d54d9338d1034bd55d4adcfde24f6c0a780e41dddd747ee2baecdfd9b03a54de7e4acf08d903205dcdc68851afea5317401681aa SHA512 c187fcc12bbb4c10718e708a4b17a9adc89f1268270f231e8b5feeea881149482d8b70ac0f5eb78b7e0b93700d6cd5133bf7d844f97736bee793405de9a25a09
 DIST stumpwm-18.05.tar.gz 199467 BLAKE2B d532a531b7ceec7a80be66563dc2f36a6f1957d1e0f014ccf61cac1edf23073370dbe7cf3d7004f6dab144a88a4b54360e82ce7b13bdbc40cba59adfcb8e8af1 SHA512 a28c0af3a82670c0f31a5839227301672cc0706c47fb353355f90f791944556fb6125f3fa4d8547e6fbcf4817cdac5b0fe47de2dbae3a304d631a895af6ddb35
-EBUILD stumpwm-18.05.ebuild 1646 BLAKE2B 6cce435c613b5c8ea8f4e48631765f383c54a5ab19d09802cec5a31cd8e8223f0549029f2f8b044b5a033c6b4bd39af69bec2dd86cf666bb37713c9f9c016231 SHA512 4972f9f062a9a2fd5a19d9b4a0a05dee91bc96ddd39d638946486d4a5b218a65da2b4bcd6526b00b4b3ccd32a8b39d6ab2696dcce107d4446ccb54fe3c9295b2
+EBUILD stumpwm-18.05.ebuild 1642 BLAKE2B cdcc1351f61073361f605547dd8afba1f005bd12a94fb9f3bb5771e629b97733b721d5b7afd8551ce30a3241856ddc962e4e074e99405d2579ef3c05dcd97faf SHA512 9265dc1219083e49e66de97221c38255f7aaa0ec5b81f8fad342dae24c94369ecbd682cc027f473b773bf41dcf8ca67b165a96f0f6bc177b61948e7d88815ebb
 MISC metadata.xml 2220 BLAKE2B f41cb5a9738d00631d9fa733f705d8717db4c75640914d7e5b115fa18a6bf1869c7019e79d8330f2cf4d514ed7c48eda7b2bf5f8f9a22a11fff9022c9b7cf927 SHA512 457b833b3e03bac4189c980e12de25289c1f8c6b26cffdd40e09c410554f5d48aa06ea559cf9cf86c0d00014c50c06af902802303736fed7ac086244266ed0bb
diff --git a/x11-wm/stumpwm/stumpwm-18.05.ebuild b/x11-wm/stumpwm/stumpwm-18.05.ebuild
index 328b8223f97b..5f820c4dd92a 100644
--- a/x11-wm/stumpwm/stumpwm-18.05.ebuild
+++ b/x11-wm/stumpwm/stumpwm-18.05.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit common-lisp-3 autotools elisp-common xdg-utils versionator
+inherit common-lisp-3 autotools desktop elisp-common xdg-utils
 
 DESCRIPTION="Stumpwm is a Window Manager written entirely in Common Lisp."
 HOMEPAGE="https://stumpwm.github.io/"
diff --git a/x11-wm/twm/Manifest b/x11-wm/twm/Manifest
index 1412562065fd..8d1910804feb 100644
--- a/x11-wm/twm/Manifest
+++ b/x11-wm/twm/Manifest
@@ -1,3 +1,3 @@
 DIST twm-1.0.11.tar.xz 261176 BLAKE2B 775ee483f34b1f45e737e0f1a907c07398883bd7bb2c17f729b38a2562af1a85f27b4dfa76b5fa1f88768e01c17c8cb364baaf39d80307aee3732183c5964653 SHA512 948034bba23e6b6c4412fcd2e46bb11a9980297601218a54a5055165ab0229a44dde0d50f338b24e82d76f390597e2fa09d11ff7f3fe1b1d736b10083c7da20d
-EBUILD twm-1.0.11.ebuild 554 BLAKE2B f1cb6bd929ffc6e6399bedc81526a34f41fc55001853dfbc9a69d481022cdf77908b6af33ba18629b13c2e5e82cc890eb92117ee520dcc6878b82f8f4c44c76a SHA512 15ac9e7cd230eee4234884e7efee453db031291bc9f6c4d0f3075fb31ec93df9e75f12a18935d3555a1d829999edd466468b141bf48847dcd4569974539b3ab2
+EBUILD twm-1.0.11.ebuild 555 BLAKE2B 54b57bbe809b9c7e0a761791e54d580ab9253064d34eebfa1abdb35b84904c45b5f114e3b7380e799ab53b2394425024fee8d348ba3bfbfea4deca32a696969b SHA512 002c88e3d74eeba6e25ee41cadbe35a58d2edd9901c9f42f2bd34e2d79906f7a85374efa1f2c59e8ac95300b4a963f8ace2115e3c318c7fa70f09fa63b0a8f2a
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-wm/twm/twm-1.0.11.ebuild b/x11-wm/twm/twm-1.0.11.ebuild
index 0f75a088df07..16a3075a4b48 100644
--- a/x11-wm/twm/twm-1.0.11.ebuild
+++ b/x11-wm/twm/twm-1.0.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Tab Window Manager"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/x11-wm/vtwm/Manifest b/x11-wm/vtwm/Manifest
index 8ec90267077b..e04973ba81b4 100644
--- a/x11-wm/vtwm/Manifest
+++ b/x11-wm/vtwm/Manifest
@@ -1,5 +1,5 @@
 AUX vtwm-5.4.7-NO_SOUND_SUPPORT.patch 835 BLAKE2B e1b3dca9ee345f6d76c39de7eba9321f36a75236b14133f7bf4e0019a939020b6daca7e22320e25a15779ed6ca97b679d0331946a05ef05e843a6e074dc48a39 SHA512 74ed936d5fd2a6276a7be921551f7e55c5e62e8cff9c8aa0176b27497965295a8ffbc09b83a7002465eb0c59645e29168955a002cf215eb0c0cb7936731b0340
 AUX vtwm-5.4.7-do-not-rm.patch 1039 BLAKE2B ae8b28056e353f2b36e61935c32ef58e74cf806905d37f4663aaa262c9ffbb6ed4ef1efe2fc56f2753002d6d154985be2734b7948206723c314ae4eaacd4bc3e SHA512 f10762468cbcdeffbae4d3d2135c094b054e687caaf991caff90dc85e33d27e69664b978e75deda2ba66b18c537c21670005f02ee8a4558ad83c08f401533d86
 DIST vtwm-5.4.7.tar.gz 1021160 BLAKE2B a669e21d2fad5a93036c866053fb73db25f3ab1e877256650d4cc295db3861bd6ff90517e00d7042b00621c05d1947b9747380eac72fec85cfc1d68c8a6b59bb SHA512 abd9a1b1d077232eef7f39521823446f2674d69a071333209a808ff651dfa83a7f6fa00dab06356897d9e7a88fd6616e5920af030e24541bd4703b3351628728
-EBUILD vtwm-5.4.7-r2.ebuild 1496 BLAKE2B 087062768d2a22620ea5c6d88833c5cc260ddb1e360f9c5c2db79308a6b408e46de1398455d97b7befaf325ea9e17860fc09d487cebceb17641837a562e5f378 SHA512 214b2cdbd0ee51a5319f3abb49f3f58198b22f2a17da600ac7ffc0aa300459d6c4d7c9aca82b98a6362c276007fb71b00580371fafeef81649962f519ceff781
+EBUILD vtwm-5.4.7-r2.ebuild 1592 BLAKE2B 8277c1f1bfc019ceac15d2597236031849cac9ff5497848f7338ff4b1a6e0f4157bf33e0f1fd929763665dd2a54ccb4b3fb71eeb7c461ff93f1f262c7085bd1a SHA512 bf0c6d473c98e67082acf5dc9ae9bb7bcde715943c3254c479894eb61000ad04e02b21d4d3119f67b008772b6e95a709533e0943ace3cb000c5ed081fb25f8ab
 MISC metadata.xml 636 BLAKE2B c49eb363f70a7d86906e229d5b9275ad5192068b61f3d4aa46a0c6711e4e3b46e27099ce1bb53e57b9476cda6bbf67fac55cb7eb6c70b37aa35bf08081f7a397 SHA512 5b71984f85b57680ea4d9432ee9aac7c4ed9d0df7082425fb650099338dad971985a56f8278ebb6c2eebe45d58272753682ffdbb9dfebeb54d6fd5d9539b77a4
diff --git a/x11-wm/vtwm/vtwm-5.4.7-r2.ebuild b/x11-wm/vtwm/vtwm-5.4.7-r2.ebuild
index e2c87e29d8c8..67ac8de4a833 100644
--- a/x11-wm/vtwm/vtwm-5.4.7-r2.ebuild
+++ b/x11-wm/vtwm/vtwm-5.4.7-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -20,12 +20,13 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXpm
 	rplay? ( media-sound/rplay )"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	app-text/rman
 	sys-devel/bison
 	sys-devel/flex
 	x11-base/xorg-proto
-	x11-misc/imake"
+	>=x11-misc/imake-1.0.8-r1"
 
 src_prepare() {
 	eapply "${FILESDIR}"/${P}-do-not-rm.patch
@@ -45,14 +46,14 @@ src_prepare() {
 }
 
 src_configure() {
-	xmkmf || die "xmkmf failed"
-	emake depend
+	CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \
+		IMAKECPP="${IMAKECPP:-$(tc-getCPP)}" xmkmf -a || die "xmkmf failed"
 }
 
 src_compile() {
 	emake \
-		CC=$(tc-getCC) \
-		CCOPTIONS="${CFLAGS}" \
+		CC="$(tc-getCC)" \
+		CDEBUGFLAGS="${CFLAGS}" \
 		EXTRA_LDOPTIONS="${LDFLAGS}"
 }
 
diff --git a/x11-wm/windowlab/Manifest b/x11-wm/windowlab/Manifest
index 1cde9354ac84..a8ea0b4d4396 100644
--- a/x11-wm/windowlab/Manifest
+++ b/x11-wm/windowlab/Manifest
@@ -1,5 +1,5 @@
 AUX windowlab-1.34-fixed-font.patch 385 BLAKE2B e137d399ed40bda9776316f0b2fd5be9dd8520f0b0f88e754ea3c559975a3f42763b802f78a835230fc7fc27c7b544c9838a672f98fb1b008bdecdfddefef408 SHA512 c0e860c92dce68a921880fbe042163a50ad2f1e31572acb2a93bc557405ba7323a8a5e0e5608365be0585dac1bf648958c74aa9e017b9da6c0a15ac4caaae6e4
 AUX windowlab-1.40-gentoo.diff 1621 BLAKE2B eee189cfc54178f850225c4226a1cb70d131ad9417e9f8e000a1a56aaa3ddcf35dc65f4958937a0f40e020be966776a2f61f4797fc4217e128189b3bda4eb771 SHA512 d0d06e2396f1a2f26d7c76b5ed513df2fa4d7496a898664b1fec51b33d6e3f63dd131207cd68243f9c8895d7bfa00e399b3a38ac81101e8321532f454f193ccd
 DIST windowlab-1.40.tar 174080 BLAKE2B 9091565b40e886f921f33251c293b39ad4ec544a98d91046e52fa4e1aae66141934645e724ee224750dd7c50fba5a45fe2b4482c46e860c752a10c2b00dd05a5 SHA512 abea16f4f85f846d426fecce548cef2bf867fc6545a720ec2d3a8d93eb5a4abd6942e44534bb7faef6cffe0551181764effa99d835b8f067a1510f7d50af6d3d
-EBUILD windowlab-1.40-r1.ebuild 1041 BLAKE2B 3f16c903b12d09c09486cf88ec7c24b21db7a067d56687c5fe834779b9d36a14ee04da9878d5a0eda2644ccaa611d37d8deab2420ff2949bd578ae6779fd308c SHA512 6b19bd349436325f5c51d5df20f8c707853cf412fe57f9b5bff3a2864f55c93515ea3ee69e9f03da7963dcbb837f1429e68160b1c9a5be2f38afbfbaa9536172
+EBUILD windowlab-1.40-r1.ebuild 1056 BLAKE2B cf7eca457b2b92aa2c98e75b58ef968776a04d0a20d2bf35831d34afa6957ae0b158009c6d4dff7366338e10287eacb1153e8a284485ca9e5e1cbd36026af451 SHA512 94fb9dfcb2b13c3c591036d05b6fdac34b0972cbd06fc779b8aad08e8ee2c5bd0e0e51c63e86b9f2e30337f383a379711ca8f7b3054abfae20e7adc2783d17f4
 MISC metadata.xml 745 BLAKE2B 13d53f322a8928c1d1b9bbdab5454a351fe29d744127939e2f34de40be078c9a0fb2c04e9dd1f59a6482b4ad45a6216f62733fe87be852846f3ec6760f941ea7 SHA512 ce0e891248ce741753ca470dab5e537d46a361836814608a6253bcd81f56c2b7a7627bda7236e006bea279d28ade0aa6980f71678ad8ca1751769e7b61e46729
diff --git a/x11-wm/windowlab/windowlab-1.40-r1.ebuild b/x11-wm/windowlab/windowlab-1.40-r1.ebuild
index 9d51612cab05..b8af8cf8cf79 100644
--- a/x11-wm/windowlab/windowlab-1.40-r1.ebuild
+++ b/x11-wm/windowlab/windowlab-1.40-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -26,8 +26,8 @@ PATCHES=( "${FILESDIR}/${PN}-1.34-fixed-font.patch"
 pkg_setup() {
 	if use truetype ; then
 		export DEFINES=-DXFT
-		export EXTRA_INC=$(pkg-config --cflags xft)
-		export EXTRA_LIBS=$(pkg-config --libs xft)
+		export EXTRA_INC=$($(tc-getPKG_CONFIG) --cflags xft)
+		export EXTRA_LIBS=$($(tc-getPKG_CONFIG) --libs xft)
 	fi
 	tc-export CC
 }
diff --git a/x11-wm/wm2/Manifest b/x11-wm/wm2/Manifest
index 1acf673b650e..e61c1a889b0a 100644
--- a/x11-wm/wm2/Manifest
+++ b/x11-wm/wm2/Manifest
@@ -1,4 +1,4 @@
-AUX wm2-4-gentoo.patch 4265 BLAKE2B d4ab8f91b01dd3fa0b0b7499adeebca04950131ace81f3d19cd3ac0e5c3392ecd4398139b4edb53b1d66e9e37bef0d3130df12873dea064db8c2e41eb4b442d2 SHA512 f3772d107c29e4c3a3f14459e80e130122d9be9cf7a1edcff507d1ed53efa67c42e9ba63ea08d1d846bc864507f48231a2c9e903bf9d46b085a75a478efa87df
+AUX wm2-4-gentoo.patch 3114 BLAKE2B 6d01272e41172ee6b1033477e85853a65b6bf0b007bd9d1e798876ee04415d11238a9be333e3790abfe3894dbaa7eaf37972da28a76a6fe7124d316c139ce227 SHA512 c314a789ea09f20ec31b3dd13bd01ee6106e707f2ce90c3f4ed0cc991ca3dc5dd78bc654c4a3cd1f406f750a4711adc7f59fc920bedbcae0c6984b34acda2a23
 DIST wm2-4.tar.gz 32807 BLAKE2B 38598a8c47e3f8512ff75f79534ef97d9d54a47d243e2eeab15b84cfdaa412b25693843ae6266cbcaf4ce299a9e05f35d3a236fdde315a43df372984421515e9 SHA512 9151267e5a6bf39587b15dc3e55b4acc05aa1b14a7a9bcb4e1ed25d474af8b0e7699343117f184c745645deb404d6f6e230809b88d9b7bb5c1f67ba0fbde72e9
-EBUILD wm2-4-r1.ebuild 1384 BLAKE2B a2ebe33e6021899c6b432167a8d30e513c8c34df15618bc66c63ed3f9a723b6c871c85e97ed02797c3754f25bb0721313acb11ca427081cd672d105b03f1604c SHA512 9645791d5f7e1aec9b1b46daca632493b08fb1fe2e757bd4181150af7346930f72b0a6ec48b546a88b457b3ba1a850ca5e071d80c059e471c4da8f148a39df07
+EBUILD wm2-4-r1.ebuild 1414 BLAKE2B f58eee1ded3c6a857a20d49d51d33ce2d92a4afc8a18b0eb6fc0aaa172e72cb49ecf6e5b2d1151d310ac53d446fe48c8fdc8f831f907aa306db9ae4dec922ab4 SHA512 7d60cceb3a9fc686499a1aaa8ccae1f43c5626a2a1a9c43dc800ea1c2ce87629e724a47507598f1017f7148d206a555aa7b61b090700bea92b11eac7d3093ace
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/x11-wm/wm2/files/wm2-4-gentoo.patch b/x11-wm/wm2/files/wm2-4-gentoo.patch
index 88c78080c542..f8ff09c07780 100644
--- a/x11-wm/wm2/files/wm2-4-gentoo.patch
+++ b/x11-wm/wm2/files/wm2-4-gentoo.patch
@@ -1,6 +1,5 @@
-diff -ur wm2-4/Border.C wm2-4.new/Border.C
---- wm2-4/Border.C	1997-03-21 12:12:30.000000000 +0100
-+++ wm2-4.new/Border.C	2007-06-30 16:56:10.000000000 +0200
+--- a/Border.C
++++ b/Border.C
 @@ -183,7 +183,7 @@
  
      if (m_label) free(m_label);
@@ -10,9 +9,8 @@ diff -ur wm2-4/Border.C wm2-4.new/Border.C
  
      int len = strlen(m_label);
      m_tabHeight = XRotTextWidth(m_tabFont, m_label, len) + 6 + m_tabWidth;
-diff -ur wm2-4/Buttons.C wm2-4.new/Buttons.C
---- wm2-4/Buttons.C	1997-03-21 12:12:30.000000000 +0100
-+++ wm2-4.new/Buttons.C	2007-06-30 16:56:10.000000000 +0200
+--- a/Buttons.C
++++ b/Buttons.C
 @@ -139,7 +139,11 @@
  		       (allowExit && ((n) > clients.count())) ? "[Exit wm2]" \
  		       : clients.item((n)-1)->label())
@@ -25,9 +23,8 @@ diff -ur wm2-4/Buttons.C wm2-4.new/Buttons.C
  	clients.append(m_hiddenClients.item(i));
      }
      int nh = clients.count() + 1;
-diff -ur wm2-4/Client.C wm2-4.new/Client.C
---- wm2-4/Client.C	1997-03-21 12:12:30.000000000 +0100
-+++ wm2-4.new/Client.C	2007-06-30 16:56:10.000000000 +0200
+--- a/Client.C
++++ b/Client.C
 @@ -4,7 +4,7 @@
  
  #include <X11/Xutil.h>
@@ -55,9 +52,8 @@ diff -ur wm2-4/Client.C wm2-4.new/Client.C
  }
  
  
-diff -ur wm2-4/Client.h wm2-4.new/Client.h
---- wm2-4/Client.h	1997-03-21 12:12:30.000000000 +0100
-+++ wm2-4.new/Client.h	2007-06-30 16:56:10.000000000 +0200
+--- a/Client.h
++++ b/Client.h
 @@ -2,6 +2,8 @@
  #ifndef _CLIENT_H_
  #define _CLIENT_H_
@@ -76,9 +72,8 @@ diff -ur wm2-4/Client.h wm2-4.new/Client.h
      int getIntegerProperty(Atom);
  
      // accessors 
-diff -ur wm2-4/Config.h wm2-4.new/Config.h
---- wm2-4/Config.h	1997-03-21 12:12:30.000000000 +0100
-+++ wm2-4.new/Config.h	2007-06-30 16:56:10.000000000 +0200
+--- a/Config.h
++++ b/Config.h
 @@ -39,6 +39,9 @@
  
  #define CONFIG_FRAME_THICKNESS    7
@@ -94,9 +89,8 @@ diff -ur wm2-4/Config.h wm2-4.new/Config.h
  
  #endif
 -
-diff -ur wm2-4/General.h wm2-4.new/General.h
---- wm2-4/General.h	1997-03-21 12:12:30.000000000 +0100
-+++ wm2-4.new/General.h	2007-06-30 16:56:10.000000000 +0200
+--- a/General.h
++++ b/General.h
 @@ -32,7 +32,7 @@
  #define NewString(x) (strcpy((char *)malloc(strlen(x)+1),(x)))
  
@@ -106,9 +100,8 @@ diff -ur wm2-4/General.h wm2-4.new/General.h
  #endif
  
  #define signal(x,y)     \
-diff -ur wm2-4/Makefile wm2-4.new/Makefile
---- wm2-4/Makefile	1997-03-21 12:12:30.000000000 +0100
-+++ wm2-4.new/Makefile	2007-06-30 16:56:10.000000000 +0200
+--- a/Makefile
++++ b/Makefile
 @@ -1,8 +1,8 @@
  
 -LIBS	=  -L/usr/X11/lib -lXext -lX11 -lXmu -lm
@@ -120,9 +113,8 @@ diff -ur wm2-4/Makefile wm2-4.new/Makefile
  CFLAGS	= -O2
  OBJECTS	= Border.o Buttons.o Client.o Events.o Main.o Manager.o Rotated.o
  
-diff -ur wm2-4/Manager.C wm2-4.new/Manager.C
---- wm2-4/Manager.C	1997-03-21 12:12:30.000000000 +0100
-+++ wm2-4.new/Manager.C	2007-06-30 16:56:10.000000000 +0200
+--- a/Manager.C
++++ b/Manager.C
 @@ -368,7 +368,7 @@
      return m_currentTime;
  }
@@ -132,9 +124,8 @@ diff -ur wm2-4/Manager.C wm2-4.new/Manager.C
  {
      m_signalled = True;
  }
-diff -ur wm2-4/Manager.h wm2-4.new/Manager.h
---- wm2-4/Manager.h	1997-03-21 12:12:30.000000000 +0100
-+++ wm2-4.new/Manager.h	2007-06-30 16:56:10.000000000 +0200
+--- a/Manager.h
++++ b/Manager.h
 @@ -85,7 +85,7 @@
  
      static Boolean m_initialising;
diff --git a/x11-wm/wm2/wm2-4-r1.ebuild b/x11-wm/wm2/wm2-4-r1.ebuild
index dff832f2a2ec..423d2be09b8c 100644
--- a/x11-wm/wm2/wm2-4-r1.ebuild
+++ b/x11-wm/wm2/wm2-4-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils toolchain-funcs
+EAPI=7
+
+inherit toolchain-funcs
 
 DESCRIPTION="Small, unconfigurable window manager"
 HOMEPAGE="http://www.all-day-breakfast.com/wm2/"
@@ -11,22 +12,26 @@ SRC_URI="http://www.all-day-breakfast.com/wm2/${P}.tar.gz"
 SLOT="0"
 LICENSE="wm2 HPND"
 KEYWORDS="amd64 ppc x86"
-IUSE=""
 
 RDEPEND="x11-libs/libXmu"
 DEPEND="${RDEPEND}
 	x11-base/xorg-proto"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-gentoo.patch
+)
+
 src_prepare() {
-	epatch "${FILESDIR}/${P}-gentoo.patch"
+	default
+
 	sed -e "s/CFLAGS/CXXFLAGS/" \
 		-e "s/\$(CCC) -o/\$(CCC) \$(LDFLAGS) -o/" \
 		-i Makefile || die #334681
 
 	sed 's/^#//' Config.h > wm2.conf
-	if [ -e "/etc/wm2.conf" ]; then
-		echo "#undef _CONFIG_H_" >> Config.h
-		awk '/^[^/]/{print "#" $0}' /etc/wm2.conf >> Config.h
+	if [[ -e "${EPREFIX}"/etc/wm2.conf ]] ; then
+		echo "#undef _CONFIG_H_" >> Config.h || die
+		awk '/^[^/]/{print "#" $0}' "${EPREFIX}"/etc/wm2.conf >> Config.h || die
 	fi
 }
 
@@ -39,18 +44,17 @@ src_compile() {
 
 src_install() {
 	dobin wm2
+
 	insinto /etc
 	doins wm2.conf
 	dodoc README
 }
 
 pkg_postinst() {
-	echo
 	elog "wm2 is unconfigurable after you have installed. If you want to"
 	elog "change settings of wm2, please have a look at /etc/wm2.conf"
 	elog "and rewrite it, then emerge wm2 again (wm2 ebuild uses settings"
 	elog "from that file automatically). If you think wm2 lacks some important"
 	elog "features that you want to use (such as background pixmaps),"
 	elog "consider using wmx, written by the same author."
-	echo
 }
diff --git a/x11-wm/xoat/Manifest b/x11-wm/xoat/Manifest
index 47163060e09f..ad0935b9dfcf 100644
--- a/x11-wm/xoat/Manifest
+++ b/x11-wm/xoat/Manifest
@@ -1,2 +1,2 @@
-EBUILD xoat-9999.ebuild 872 BLAKE2B b532ceab8336c8fdcf1b2146186e5c17a0ee6ca69e796bf95c82596029f707659ccd4337e826e83cf3df461966f6af6076f5b6ed82c211516ad2a99ede8b71f1 SHA512 699f4cb3dce846d331bcbe0281862b56cbf4a010f71a8e2682971f324858af967ddf3fc7c81b2351ccb900e15f79795616c30cb4a85cdd905ecf3e2772578356
+EBUILD xoat-9999.ebuild 876 BLAKE2B bf56745670cce7761b321586c36829b0b6e57c91a54d3613c6705f72681e6041f686ea76b88321f4d9c42edcee9bada458671d4fb1973b62885867985497bfdb SHA512 751dd83e50e6998561c22bf949cfa8dd8058e4cb0010e900a365d5fc61386c6e84bc9ec04b1e8f2d82018ec77c1ee97697dace73e8f4e2708266cc4c51e4960e
 MISC metadata.xml 248 BLAKE2B 0018deaef88f2739f30278c7b7658c96bb4bfff7a49442c9012295f853de442a3b3ce549dbcc935b9c9f82562a768f9c4d6b12c8f4042482ba4deeb544cf6dd5 SHA512 d42c4dd1579bce7f4c3c4f9295d8249f3b05ae42bb2b72a961282f2e405085c2492591e9306fc7ec84179824d58579376f5d7639105caca2a647724db6ecf379
diff --git a/x11-wm/xoat/xoat-9999.ebuild b/x11-wm/xoat/xoat-9999.ebuild
index 914c769f41f6..31b9838afc84 100644
--- a/x11-wm/xoat/xoat-9999.ebuild
+++ b/x11-wm/xoat/xoat-9999.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit flag-o-matic git-r3 savedconfig toolchain-funcs
+
+inherit git-r3 savedconfig toolchain-funcs
 
 DESCRIPTION="X Obstinate Asymmetric Tiler"
 HOMEPAGE="https://github.com/seanpringle/xoat"
@@ -10,7 +11,6 @@ EGIT_REPO_URI="https://github.com/seanpringle/xoat"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS=""
 
 DEPEND="
 	x11-libs/libX11
@@ -21,6 +21,7 @@ RDEPEND="
 	${DEPEND}
 	!savedconfig? ( x11-misc/dmenu )
 "
+BDEPEND="virtual/pkgconfig"
 
 src_prepare() {
 	default
diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest
index 7acd97682fee..7843c8bac8d4 100644
--- a/x11-wm/xpra/Manifest
+++ b/x11-wm/xpra/Manifest
@@ -2,11 +2,10 @@ AUX xpra-2.0-suid-warning.patch 617 BLAKE2B dc7f1ba0ec9e30e260601f1151edb4385561
 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
-AUX xpra-4.0.6-r28363.patch 10454 BLAKE2B 8385dc347edf9e3464784cf0d9bb8450696b66bb66af3b14e3a3440fb2b6ffea9f1d7c640f1973e8d37084eced58daad451162ac2b6798a7b5e7fb8f6f89b430 SHA512 a75534371a391fe1fbf6cd327e0df9eeb1fc7b65376de734f523984ea124ad95c7782af380735b95500cc63002e065c9684bb92095c5850f2cf42e7b15d661f8
 DIST xpra-3.0.5.tar.xz 2752016 BLAKE2B a36d6a4ebb0b14665014da92d510c0d5f978c96db653709ddc09a1015426d6ac6f71f9a221db68ee1114c95eeaca6600f9e49102ce9f936d9b0ee298ac432647 SHA512 3dbc122ebc8c4aa67154acfe92668ac364d8469022b03e28946d763e4d396f8c707690b2a4dbf07b55545259a53b46c9dd94e6e40131289ccc3dce6a88107681
-DIST xpra-4.0.6.tar.xz 2797752 BLAKE2B 3f2d4108fec1f1b5c0cd38a26f1a2c41af253fd234427e8e54104ff3742b9f7ae3e1863db837addd76acc6856b6f3cfcbde97edc2bc75314b215d4ca46a816f8 SHA512 e3dc66040898ed40ef12b8cdb89e5f42c2f36edc071afb435334389e727f376ddc116dbee47018468bff24f2cdd7be35750b58bc108ba73c5558bd9eccbd04ea
-DIST xpra-4.1.1.tar.xz 2674236 BLAKE2B 388306b33d99e97e07eb4a0f14ad33a08f9b367fa8e8b6d0553b0815ceb1b99540d027d2bdf8b6ef0a8ad3dda5a92861acf6c429034b7dd7e061eaefe86ade89 SHA512 b6312fb40849446ad88181664256610fcc673c5263449f610dd3fe40d0f331b1493efdee0560b78ef217ebc168d81a020b3bc97d369f9c1810a73e62e8e02873
-EBUILD xpra-3.0.5-r2.ebuild 3841 BLAKE2B 387b36e4114eb489815bc6c09cd2ec7f9cb560d9c37e50aaadb567d5a8b9917c68f7b6db086a01d9efe719b955791c6ac70b8b913e5c86d25bff4d6da3d8679f SHA512 6fd77a9190d67a7c77b329d929890716d6b5814470383eea1dbf816fe190b8570997833bde5741d766745e54bd7e5e4f6f746609a69d0cc69c23f0f27907959c
-EBUILD xpra-4.0.6_p28363.ebuild 3903 BLAKE2B 21eed5f246a785f88fc1a00f77fa707c522de1f2c8a52fb5e9343aecfdff2c2fe726ad5f778dcb79dc1c6237ec3e2fa35ad0647a2b034bb6434d8a10dc15ccd2 SHA512 6d1ff46e3625937d9b71f7ea8f15f41c84e66f9014712f622bd259cb9026fe314e57b454aabdc8df3ec0cea78606f05e54d5f9883d49ff3d793ec62182b16962
-EBUILD xpra-4.1.1.ebuild 3905 BLAKE2B 7eb6ec4ef2ead2166f938dc90f1ab1720da1b4e21f2b91e8775f8113ff3acc773a06c1d60d0e1391e3360dc658a9691506255ca11abbcbe05d68c10f21910eb0 SHA512 6ffba9a2cfbdee776711f44a688c2aebe0167aad65932d1644147bb4c62422e4486b0076145a06cbb065e9a4994201bb75eea41ca254421e22d514dc6f12d26f
+DIST xpra-4.1.2.tar.xz 2676588 BLAKE2B db3694fdd9f7e20ba93099ecde50d712de41bb64a2d317b9f10e349b7f501015d083c212250206c0f3e25e154311a096ce4c17972131af68584be666bbf7e067 SHA512 860533c4173b92ee110e65849110870a3b129b993d8a2a2308142474164e4f1c45984669e7e3963540290192310de5d2de0e0713b80f4cb8c6ae7f9c3bb0814e
+DIST xpra-4.1.3.tar.gz 3850971 BLAKE2B b5f5a0546c785762974f27650408cb83fdfa2ac8a5b5dd8c6b08a9978ff17a0dfc85f95fde405689a19517ef66bcc7aefc1dad71acc2dda7883ed38d3c22b91c SHA512 e401793ae9a4539d39bc161be4d34af2dca81c78f189664d8ebdefff99d413d364d4ceb37dd776b027b206119da81957ef7436a727c00d3ad5895a3c90742e39
+EBUILD xpra-3.0.5-r2.ebuild 3834 BLAKE2B 774548ad7f6e2f9f1cf4751d8ef1119e7fb93ac3d1fb9a1d89367e6ec8a20430fd3787a8681b7abd72a2da4e7b05c4f078f92a7a13fcf96b8e448449aa490254 SHA512 f019c875c6e5feffb6ff09d4ef2c3c9cfeb360c98e03a59863e5c3e0b43c4e143d24434559659f5e85577e2e80a332e7fd7889a48041c32b8e97f810c50be598
+EBUILD xpra-4.1.2.ebuild 4103 BLAKE2B e1247052d7953d0a350f40930332d75238087efebc72a2d447bf4b5925db8a30212540f67404b010139b10c61b1a55160ddd0bff9e4dca7736fdd2ec32258af9 SHA512 769b995d24eeb348286993b1eff2c4d2c4caab0456300eb4ace5e7e962825143d3ef4d95d5446b8f8409497a3c491202f246cb631b50639f98e26a28bcf100ea
+EBUILD xpra-4.1.3.ebuild 4103 BLAKE2B d279ddb09bcb0c784d98387b7e4ef61b73a550b865085f9d24f1863902759cff57f573df5fcb1b8e2c0f1e2e93f09b9e49ec95b323157f3d965e41e40e5e0257 SHA512 27330d1b6a9e95ab2c93bf6620fe357b863d3a1493ea129c6d3154ccd953ed4379f4b21fb8858177d040f5bb01bfa205e2aa49d41c72c5a327453be4c0a1d982
 MISC metadata.xml 1090 BLAKE2B 51b66f86c4858f3c6081e03ee5444b0fd84de0db0355e7538a507ae6290b82f09407acef6e335ac7c5d7dfa2801da5e6b0f0b904daea6fd5c34f19d17492007a SHA512 99dde78c6a33dbbb890b071165c9e0ca57ea3d7a6866abfccda2d976006dcf17b531b2dd464a2c0e312c181d1a3561ba61316a8c5c9c27976281965673aca55d
diff --git a/x11-wm/xpra/files/xpra-4.0.6-r28363.patch b/x11-wm/xpra/files/xpra-4.0.6-r28363.patch
deleted file mode 100644
index 5187b700c0df..000000000000
--- a/x11-wm/xpra/files/xpra-4.0.6-r28363.patch
+++ /dev/null
@@ -1,238 +0,0 @@
-Index: selinux/xpra_socketactivation/xpra_socketactivation.te
-===================================================================
---- a/selinux/xpra_socketactivation/xpra_socketactivation.te	(revision 28285)
-+++ b/selinux/xpra_socketactivation/xpra_socketactivation.te	(revision 28363)
-@@ -27,6 +27,7 @@
- 	type unconfined_t;
- 	type bin_t;
- 	type avahi_t;
-+	type config_home_t;
- 
- 	attribute can_read_shadow_passwords;
- }
-@@ -55,6 +56,9 @@
- allow xpra_t xpra_conf_t:dir { getattr open read search };
- files_search_etc(xpra_t)
- 
-+allow xpra_t config_home_t:dir { getattr search };
-+allow xpra_t config_home_t:file { getattr ioctl open read };
-+
- type xpra_socket_t;
- files_type(xpra_socket_t)
- 
-Index: setup.py
-===================================================================
---- a/setup.py	(revision 28285)
-+++ b/setup.py	(revision 28363)
-@@ -1533,8 +1533,9 @@
-                     for k,v in subs.items():
-                         data = data.replace(k, v)
-                 with open(dst_file, "wb") as f:
--                    return f.write(data)
-+                    f.write(data)
-                 if chmod:
-+                    print("chmod(%s, %s)" % (dst_file, oct(chmod)))
-                     os.chmod(dst_file, chmod)
- 
-             if printing_ENABLED and POSIX:
-Index: unittests/unit/net/crypto_test.py
-===================================================================
---- a/unittests/unit/net/crypto_test.py	(revision 28285)
-+++ b/unittests/unit/net/crypto_test.py	(revision 28363)
-@@ -88,7 +88,7 @@
-         start = monotonic_time()
-         self.do_test_backend(data, enc_iterations, dec_iterations)
-         end = monotonic_time()
--        elapsed = end-start
-+        elapsed = max(0.0001, end-start)
-         speed = (asize*16) * (enc_iterations + dec_iterations) / elapsed
-         iter_time = elapsed*1000/(enc_iterations + dec_iterations)
-         print("%10iKB: %5.1fms: %16iMB/s" % (asize*16//1024, iter_time, speed//1024//1024))
-Index: win32/MINGW_BUILD.sh
-===================================================================
---- a/win32/MINGW_BUILD.sh	(revision 28285)
-+++ b/win32/MINGW_BUILD.sh	(revision 28363)
-@@ -286,6 +286,8 @@
- #why is it shipping those files??
- find lib/ -name "*dll.a" -exec rm {} \;
- #only keep the actual loaders, not all the other crap cx_Freeze put there:
-+#but keep librsvg
-+mv lib/gdk-pixbuf-2.0/2.10.0/loaders/librsvg* ./
- mkdir lib/gdk-pixbuf-2.0/2.10.0/loaders.tmp
- mv lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-*.dll lib/gdk-pixbuf-2.0/2.10.0/loaders.tmp/
- rm -fr lib/gdk-pixbuf-2.0/2.10.0/loaders
-@@ -326,6 +328,9 @@
- #and keep pdfium:
- mv lib/*pdfium*.dll ./
- pushd lib > /dev/null
-+#cx_Freeze forgets these two!?
-+cp $MINGW_PREFIX/bin/libatk-*dll ./
-+cp $MINGW_PREFIX/bin/libgtk-*dll ./
- #remove all the pointless duplication:
- for x in `ls *dll`; do
- 	find ./ -mindepth 2 -name "${x}" -exec rm {} \;
-Index: xpra/client/gtk_base/gtk_client_window_base.py
-===================================================================
---- a/xpra/client/gtk_base/gtk_client_window_base.py	(revision 28285)
-+++ b/xpra/client/gtk_base/gtk_client_window_base.py	(revision 28363)
-@@ -1806,10 +1806,16 @@
- 
-     def _set_backing_size(self, ww, wh):
-         b = self._backing
-+        bw = self._client.cx(ww)
-+        bh = self._client.cy(wh)
-+        if max(ww, wh)>=32000 or min(ww, wh)<0:
-+            raise Exception("invalid window size %ix%i" % (ww, wh))
-+        if max(bw, bh)>=32000:
-+            raise Exception("invalid window backing size %ix%i" % (bw, bh))
-         if b:
--            b.init(ww, wh, self._client.cx(ww), self._client.cy(wh))
-+            b.init(ww, wh, bw, bh)
-         else:
--            self.new_backing(self._client.cx(ww), self._client.cy(wh))
-+            self.new_backing(bw, bh)
- 
-     def resize(self, w, h, resize_counter=0):
-         ww, wh = self.get_size()
-Index: xpra/net/file_transfer.py
-===================================================================
---- a/xpra/net/file_transfer.py	(revision 28285)
-+++ b/xpra/net/file_transfer.py	(revision 28363)
-@@ -580,6 +580,10 @@
- 
-     def _process_open_url(self, packet):
-         url, send_id = packet[1:3]
-+        try:
-+            url = strtobytes(url).decode("utf8")
-+        except UnicodeDecodeError:
-+            url = bytestostr(url)
-         if not self.open_url:
-             filelog.warn("Warning: received a request to open URL '%s'", url)
-             filelog.warn(" but opening of URLs is disabled")
-@@ -670,12 +674,12 @@
-         filelog("process send-data-request: send_id=%s, url=%s, printit=%s, openit=%s", s(send_id), url, printit, openit)
-         def cb_answer(accept):
-             filelog("accept%s=%s", (url, printit, openit), accept)
-+            self.send("send-data-response", send_id, accept)
-         #filenames and url are always sent encoded as utf8:
-         try:
-             url = strtobytes(url).decode("utf8")
-         except:
-             url = bytestostr(url)
--            self.send("send-data-response", send_id, accept)
-         if dtype==b"file":
-             if not self.file_transfer:
-                 cb_answer(False)
-Index: xpra/net/socket_util.py
-===================================================================
---- a/xpra/net/socket_util.py	(revision 28285)
-+++ b/xpra/net/socket_util.py	(revision 28363)
-@@ -622,7 +622,7 @@
-             log.info(" %s does not exist", dirname)
-         #only show extra information if the socket permissions
-         #would have been accessible by the group:
--        if POSIX and (sperms & 0o40):
-+        elif POSIX and (sperms & 0o40):
-             uid = getuid()
-             username = get_username_for_uid(uid)
-             groups = get_groups(username)
-Index: xpra/platform/xposix/paths.py
-===================================================================
---- a/xpra/platform/xposix/paths.py	(revision 28285)
-+++ b/xpra/platform/xposix/paths.py	(revision 28363)
-@@ -102,12 +102,12 @@
- 
- def do_get_user_conf_dirs(uid):
-     #per-user configuration location:
--    #(but never use /root/.xpra)
-+    #(but never use /root/.xpra or /root/.config/xpra)
-     if uid is None:
-         uid = os.getuid()
-     dirs = []
--    dirs += [os.path.join(os.environ.get("XDG_CONFIG_HOME", "~/.config"), "xpra")]
-     if uid>0:
-+        dirs += [os.path.join(os.environ.get("XDG_CONFIG_HOME", "~/.config"), "xpra")]
-         dirs.append("~/.xpra")
-     return dirs
- 
-Index: xpra/platform/xposix/sd_listen.pyx
-===================================================================
---- a/xpra/platform/xposix/sd_listen.pyx	(revision 28285)
-+++ b/xpra/platform/xposix/sd_listen.pyx	(revision 28363)
-@@ -52,7 +52,7 @@
-     return sockets
- 
- def get_sd_socket_type(fd):
--    from xpra.net.common import TCP_SOCKTYPES
-+    from xpra.net.bytestreams import TCP_SOCKTYPES
-     socktype = os.environ.get("XPRA_SD%i_SOCKET_TYPE" % fd)
-     if not socktype:
-         socktype = os.environ.get("XPRA_SD_SOCKET_TYPE", "tcp")
-Index: xpra/server/mixins/audio_server.py
-===================================================================
---- a/xpra/server/mixins/audio_server.py	(revision 28285)
-+++ b/xpra/server/mixins/audio_server.py	(revision 28363)
-@@ -121,7 +121,7 @@
-             from xpra.platform.xposix.paths import _get_xpra_runtime_dir, get_runtime_dir
-             rd = osexpand(get_runtime_dir())
-             if not os.path.exists(rd) or not os.path.isdir(rd):
--                log.warn("Warning: the runtime directory '%s' does not exist,")
-+                log.warn("Warning: the runtime directory '%s' does not exist,", rd)
-                 log.warn(" cannot start a private pulseaudio server")
-             else:
-                 xpra_rd = _get_xpra_runtime_dir()
-Index: xpra/server/window/motion.pyx
-===================================================================
---- a/xpra/server/window/motion.pyx	(revision 28285)
-+++ b/xpra/server/window/motion.pyx	(revision 28363)
-@@ -79,7 +79,7 @@
-         for i,v in enumerate(arr):
-             self.a2[i] = <uint64_t> abs(v)
- 
--    def update(self, pixels, int16_t x, int16_t y, uint16_t width, uint16_t height, uint16_t rowstride, uint8_t bpp=4):
-+    def update(self, pixels, int16_t x, int16_t y, uint16_t width, uint16_t height, uint32_t rowstride, uint8_t bpp=4):
-         """
-             Add a new image to compare with,
-             checksum its rows into a2,
-Index: xpra/server/window/window_video_source.py
-===================================================================
---- a/xpra/server/window/window_video_source.py	(revision 28285)
-+++ b/xpra/server/window/window_video_source.py	(revision 28363)
-@@ -1785,6 +1785,13 @@
-             scrolllog("no scrolling: detection has already been used on this image")
-             #we've already checked
-             return False
-+        x = image.get_target_x()
-+        y = image.get_target_y()
-+        w = image.get_width()
-+        h = image.get_height()
-+        if w>=32000 or h>=32000:
-+            scrolllog("no scrolling: the image is too large, %ix%i", w, h)
-+            return False
-         #don't download the pixels if we have a GPU buffer,
-         #since that means we're likely to be able to compress on the GPU too with NVENC:
-         if not image.has_pixels():
-@@ -1792,10 +1799,6 @@
-         if self.content_type=="video" or not self.non_video_encodings:
-             scrolllog("no scrolling: content is video")
-             return False
--        x = image.get_target_x()
--        y = image.get_target_y()
--        w = image.get_width()
--        h = image.get_height()
-         if w<MIN_SCROLL_IMAGE_SIZE or h<MIN_SCROLL_IMAGE_SIZE:
-             scrolllog("no scrolling: image size %ix%i is too small, minimum is %ix%i",
-                       w, h, MIN_SCROLL_IMAGE_SIZE, MIN_SCROLL_IMAGE_SIZE)
-Index: xpra/x11/x11_server_core.py
-===================================================================
---- a/xpra/x11/x11_server_core.py	(revision 28285)
-+++ b/xpra/x11/x11_server_core.py	(revision 28363)
-@@ -687,7 +687,7 @@
-                 #we can use XRRSetScreenSize:
-                 try:
-                     with xsync:
--                        RandR.xrr_set_screen_size(w, h, self.xdpi or self.dpi, self.ydpi or self.dpi)
-+                        RandR.xrr_set_screen_size(w, h, self.xdpi or self.dpi or 96, self.ydpi or self.dpi or 96)
-                 except XError:
-                     screenlog("XRRSetScreenSize failed", exc_info=True)
-             screenlog("calling RandR.get_screen_size()")
diff --git a/x11-wm/xpra/xpra-3.0.5-r2.ebuild b/x11-wm/xpra/xpra-3.0.5-r2.ebuild
index dcc8cb7aa4f3..1371e2b78d86 100644
--- a/x11-wm/xpra/xpra-3.0.5-r2.ebuild
+++ b/x11-wm/xpra/xpra-3.0.5-r2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 PYTHON_COMPAT=( python3_{7,8,9} )
 DISTUTILS_USE_SETUPTOOLS=no
-inherit xdg distutils-r1 eutils flag-o-matic user tmpfiles prefix
+inherit xdg distutils-r1 flag-o-matic user tmpfiles prefix
 
 DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based on wimpiggy"
 HOMEPAGE="http://xpra.org/ http://xpra.org/src/"
diff --git a/x11-wm/xpra/xpra-4.1.1.ebuild b/x11-wm/xpra/xpra-4.1.2.ebuild
index 65e293302714..cde55d551959 100644
--- a/x11-wm/xpra/xpra-4.1.1.ebuild
+++ b/x11-wm/xpra/xpra-4.1.2.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 PYTHON_COMPAT=( python3_{7,8,9} )
 DISTUTILS_SINGLE_IMPL=yes
 DISTUTILS_USE_SETUPTOOLS=no
-inherit xdg distutils-r1 tmpfiles prefix
+inherit xdg distutils-r1 tmpfiles prefix udev
 
 DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based on wimpiggy"
 HOMEPAGE="https://xpra.org/"
@@ -157,3 +157,12 @@ python_configure_all() {
 
 	export XPRA_SOCKET_DIRS="${EPREFIX}/run/xpra"
 }
+
+python_install_all() {
+	distutils-r1_python_prepare_all
+
+	# Move udev dir to the right place.
+	local dir=$(get_udevdir)
+	dodir "${dir%/*}"
+	mv -vnT "${ED}"/usr/lib/udev "${ED}${dir}" || die
+}
diff --git a/x11-wm/xpra/xpra-4.0.6_p28363.ebuild b/x11-wm/xpra/xpra-4.1.3.ebuild
index 5a306498e828..db407cd0db72 100644
--- a/x11-wm/xpra/xpra-4.0.6_p28363.ebuild
+++ b/x11-wm/xpra/xpra-4.1.3.ebuild
@@ -6,17 +6,16 @@ EAPI=7
 PYTHON_COMPAT=( python3_{7,8,9} )
 DISTUTILS_SINGLE_IMPL=yes
 DISTUTILS_USE_SETUPTOOLS=no
-inherit xdg distutils-r1 tmpfiles prefix
+inherit xdg distutils-r1 tmpfiles prefix udev
 
-MY_P="${PN}-${PV%_p*}"
 DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based on wimpiggy"
 HOMEPAGE="https://xpra.org/"
-SRC_URI="https://xpra.org/src/${MY_P}.tar.xz"
+SRC_URI="https://xpra.org/src/${P}.tar.gz"
 
 LICENSE="GPL-2 BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="brotli +client +clipboard csc cups dbus ffmpeg jpeg +lz4 lzo minimal opengl pillow pulseaudio server sound test vpx webcam webp"
+IUSE="brotli +client +clipboard csc cups dbus doc ffmpeg jpeg +lz4 lzo minimal opengl pillow pulseaudio server sound test vpx webcam webp"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	|| ( client server )
@@ -86,6 +85,7 @@ BDEPEND="
 	$(python_gen_cond_dep '
 		>=dev-python/cython-0.16[${PYTHON_USEDEP}]
 	')
+	doc? ( app-text/pandoc )
 "
 
 RESTRICT="!test? ( test )"
@@ -94,11 +94,8 @@ 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
-	"${FILESDIR}"/${PN}-4.0.6-r28363.patch
 )
 
-S="${WORKDIR}/${MY_P}"
-
 pkg_postinst() {
 	tmpfiles_process /usr/lib/tmpfiles.d/xpra.conf
 
@@ -110,6 +107,9 @@ python_prepare_all() {
 	hprefixify tmpfiles.d/xpra.conf xpra/server/server_util.py \
 		xpra/platform{/xposix,}/paths.py xpra/scripts/server.py
 
+	sed -r -e "/\bdoc_dir =/s:/${PN}\":/${PF}/html\":" \
+		-i setup.py || die
+
 	if use minimal; then
 		sed -r -e 's/^(pam|scripts|xdg_open)_ENABLED.*/\1_ENABLED=False/' \
 			-i setup.py || die
@@ -134,16 +134,15 @@ python_configure_all() {
 		$(use_with cups printing)
 		--without-debug
 		$(use_with dbus)
+		$(use_with doc docs)
 		$(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)
@@ -158,3 +157,12 @@ python_configure_all() {
 
 	export XPRA_SOCKET_DIRS="${EPREFIX}/run/xpra"
 }
+
+python_install_all() {
+	distutils-r1_python_prepare_all
+
+	# Move udev dir to the right place.
+	local dir=$(get_udevdir)
+	dodir "${dir%/*}"
+	mv -vnT "${ED}"/usr/lib/udev "${ED}${dir}" || die
+}