16 files changed, 89 insertions, 366 deletions
diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index efd0c7d82f9a..0692037b5691 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/i3/Manifest b/x11-wm/i3/Manifest
index a1aa12539f86..8fd30ec0ef35 100644
--- a/x11-wm/i3/Manifest
+++ b/x11-wm/i3/Manifest
@@ -1,14 +1,7 @@
 AUX i3-4.16-musl-GLOB_TILDE.patch 2783 BLAKE2B 9dea47af64b78a77006d3aa641273aa7a77846d4425e1da17424528445450112ab275cdf7098ba8c2a76f1b08561b1d1a852cb9fd4ee4c61e53832ca702ad55d SHA512 fdff65255e7c9b30eefdbf032e04ba568d5b75a5b7dfc5fce1aecaac0f0d376b6bb4f87338e1eaf5f20b1c5882ebfc7349f8ab43c804349b5f5c626f9fc1d340
-AUX i3-gaps-4.19-fix-docdir.patch 508 BLAKE2B 44aa2a2a7d0b77429345c4b62be66437714851481ca968098596c28aae8769036b8238b0295f4f80ca8e6e0f2c3e25c60130f3b941cb763d2069deb07d884dfd SHA512 8169cd9fdc2a4506af3d93eda672484a43ab30cf99afcdfc10094be36e6fcccf53d416376a475a95a80d34afb6dbec32bb657a81ccc7e5244c23b34717d5201a
-DIST i3-4.18.3.tar.bz2 1218766 BLAKE2B c394bbe9882dc893107f0c948632a3a79c52db75b75b2890f6f43fa60d80ce82d1c8a8c32a8793f59d9a6f929ab038765dbe3813c3c6bc1b79bebbbbde772451 SHA512 61599b79247ec546819bab22666a78fc8dc77eecbcf6055efb6b52720290fa7f72719ac6670396a6dfb54858781e438b5207c15fdf2cf9e2424a1b84ffeb749c
-DIST i3-4.18.tar.bz2 1218591 BLAKE2B 582b7ba3a54edf8dd2657add05eb54a64b7c004761a1a248d91dfcb061cb9df215ff35301c125b11aa69b571daeacd5732b498934c1fb17f69404a101fd16ec8 SHA512 0bbfda7f4b20a92a50ffb6abbfc3f6bfe6bb4c987ad4b5b1791192eb23b8c3389cc9949a699901797370c14de1ff8e12447a3b8ce330ab7d300fafdb60a432ec
 DIST i3-4.19.1.tar.xz 1277648 BLAKE2B a4d01d10c076da092faef2111ba0fadb481257c0011419cc911be0b63c0ff78053a39ff4a2887f6344794ea895190ebf1ac3585b598dbb90ff77d4de8fad7c53 SHA512 7a73d005e4ec438a7cf92ab719e17701948c5043cc431740b16e028e9771d1478fa539aebd1a8198fff6bec664f8bcecc17c3bd1ff35d53077d50d3ad1a8f7dc
 DIST i3-4.19.2.tar.xz 1277396 BLAKE2B 28d4dba50ae30cb620dcbd759e0ba29e284071234261aca2a217b6eef9194f72eca67d3632dc1e6a9b9879925e55c18b7a42676eaed41dd1354f772e48309d45 SHA512 58f08228d842cd3c2bc417b72f6279fcd7050879e5fd4064b2cb00edaf98b6605d5b2361608f9534991a0f8357d3294e881c7e314f33dc075241cc45ca5ed94d
-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 2009 BLAKE2B 879d419a2519c1a9ed7d6450f2c61a2fd55e0092f372affcdf71a695b037086d02ba89563b2157cb10ed82b31abadc96e5b610a5a9d7b615256ca54da3e47b1f SHA512 1b102e92604ae0b0cb10dac8fba11f263915c87ca5572aa779d8c77be92e3bb2c9304229a2031a1cd32937d0bab56a1e7777ad70a3c8ac7bb42fa256ff93eb1b
-EBUILD i3-4.19.1.ebuild 1963 BLAKE2B c4c67cbfe2936a71dbe28975de1ba900e38c0b6e950c5d2651f0495ce79070ead37168b97ebee170c23f27e96e50b93311296360e4bd42f2c7dd056649b9133b SHA512 b3e605f591aaed7fe4281efe32fc4172988b225f6445537ec4512564e9eb2dee08baf365b7361bcac10f0d0614140d1e4ccb6395df51ca72ead2c014e40d0e02
+EBUILD i3-4.19.1.ebuild 1962 BLAKE2B afa9253da2dab6628674bc2d2b613a2c6a25dc9009840fda4029957c80d1fd61453a95dddcbf346bf5a457030735295b7dce72c62020efbe633087a027f2f9dc SHA512 67b9bac58c187654464633f205728e0000eba33cbdc965499ee4c689452b7ac4a559252c21fc271361c31bd9e0b486aab03f52b1d6fb8f3e35d25ea46640ab9a
 EBUILD i3-4.19.2.ebuild 1980 BLAKE2B b47551d40cc02e24a0c61ee99cf721cb3e2580806b3b4298648dbe6f03eecf043f619bde78735c4d24df29d94d8f37ac7e7cf7310187844475291514f6f2396b SHA512 d072a4304375e6cdb4ff2ba060f0c16ff9ea11d0d65ffe0c242f10c87933a869e49ded091441e8d0d6ca3cddf1f8f1ede82f61b832389d728d48820bed81a66a
 EBUILD i3-9999.ebuild 1973 BLAKE2B 6560c66a1e6b47f767f7b9b7711646aeab3603d4856dba9973751f12ba99019d4c0f5d45d6ab28a75f01652d300654847b7f6eea8be48efe797e0940adfd4697 SHA512 d240e390c4c7f949de52ac382421afd5cab2f507fbe2bec97756180424c098a2fb62190d595dc49c8a4d71e59a3b433cb8a0177086445315af7c82a5a7e10dc6
 MISC metadata.xml 467 BLAKE2B 698d3f7309aa859af72db95540288e3fb4a848094d0a09b2d1deb5589f814cadc664bc455c0815bd0ac3ded9129495d7a7df8f60de1f9a7b48541c100f645b46 SHA512 6eda0780c6b9962ae7111c8f1390705b987ceff160532353f27366e336cdb00499dec8acf91aefa87fdddf99117b1f4c942d8ba94be6d41c246d342c9f075364
diff --git a/x11-wm/i3/files/i3-gaps-4.19-fix-docdir.patch b/x11-wm/i3/files/i3-gaps-4.19-fix-docdir.patch
deleted file mode 100644
index 6917aa091dff..000000000000
--- a/x11-wm/i3/files/i3-gaps-4.19-fix-docdir.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/meson.build b/meson.build
-index 11541e21..a6f8974e 100644
---- a/meson.build
-+++ b/meson.build
-@@ -642,7 +642,7 @@ if get_option('docs')
-       '@OUTPUT@',
-     ],
-     install: true,
--    install_dir: join_paths(get_option('datadir'), 'doc', 'i3'),
-+    install_dir: docdir,
-   )
- 
-   custom_target(
-@@ -655,7 +655,7 @@ if get_option('docs')
-       '@OUTPUT@',
-     ],
-     install: true,
--    install_dir: join_paths(get_option('datadir'), 'doc', 'i3'),
-+    install_dir: docdir,
-   )
- endif
- 
diff --git a/x11-wm/i3/i3-4.18.3.ebuild b/x11-wm/i3/i3-4.18.3.ebuild
deleted file mode 100644
index 58a3f832182c..000000000000
--- a/x11-wm/i3/i3-4.18.3.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools out-of-source virtualx
-
-DESCRIPTION="An improved dynamic tiling window manager"
-HOMEPAGE="https://i3wm.org/"
-SRC_URI="https://i3wm.org/downloads/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="doc debug test"
-
-CDEPEND="dev-libs/libev
-	dev-libs/libpcre
-	dev-libs/yajl
-	x11-libs/libxcb[xkb]
-	x11-libs/libxkbcommon[X]
-	x11-libs/startup-notification
-	x11-libs/xcb-util
-	x11-libs/xcb-util-cursor
-	x11-libs/xcb-util-keysyms
-	x11-libs/xcb-util-wm
-	x11-libs/xcb-util-xrm
-	x11-misc/xkeyboard-config
-	x11-libs/cairo[X,xcb(+)]
-	x11-libs/pango[X]"
-DEPEND="${CDEPEND}
-	test? (
-		dev-perl/AnyEvent
-		dev-perl/X11-XCB
-		dev-perl/Inline
-		dev-perl/Inline-C
-		dev-perl/IPC-Run
-		dev-perl/ExtUtils-PkgConfig
-		dev-perl/local-lib
-		virtual/perl-Test-Simple
-		x11-base/xorg-server[xephyr]
-		x11-misc/xvfb-run
-	)"
-RDEPEND="${CDEPEND}
-	dev-lang/perl
-	dev-perl/AnyEvent-I3
-	dev-perl/JSON-XS"
-BDEPEND="virtual/pkgconfig"
-
-# Test without debug will apply optimization levels, which results
-# in type-punned pointers - which in turn causes test failures.
-REQUIRED_USE="test? ( debug )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.16-musl-GLOB_TILDE.patch"
-)
-
-# https://github.com/i3/i3/issues/3013
-RESTRICT="test"
-
-src_prepare() {
-	default
-
-	cat <<- EOF > "${T}"/i3wm
-		#!/bin/sh
-		exec /usr/bin/i3
-	EOF
-
-	eautoreconf
-}
-
-my_src_configure() {
-	local myeconfargs=(
-		$(use_enable debug)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-my_src_test() {
-	emake check
-}
-
-my_src_install_all() {
-	doman man/*.1
-
-	einstalldocs
-	use doc && dodoc -r docs "RELEASE-NOTES-${PV}"
-
-	exeinto /etc/X11/Sessions
-	doexe "${T}/i3wm"
-}
-
-pkg_postinst() {
-	# Only show the elog information on a new install
-	if [[ ! ${REPLACING_VERSIONS} ]]; then
-		elog "There are several packages that you may find useful with ${PN} and"
-		elog "their usage is suggested by the upstream maintainers, namely:"
-		elog "  x11-misc/dmenu"
-		elog "  x11-misc/i3status"
-		elog "  x11-misc/i3lock"
-		elog "Please refer to their description for additional info."
-	fi
-}
diff --git a/x11-wm/i3/i3-4.18.ebuild b/x11-wm/i3/i3-4.18.ebuild
deleted file mode 100644
index ca0d08cf24a6..000000000000
--- a/x11-wm/i3/i3-4.18.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools out-of-source virtualx
-
-DESCRIPTION="An improved dynamic tiling window manager"
-HOMEPAGE="https://i3wm.org/"
-SRC_URI="https://i3wm.org/downloads/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="doc debug test"
-
-CDEPEND="dev-libs/libev
-	dev-libs/libpcre
-	dev-libs/yajl
-	x11-libs/libxcb[xkb]
-	x11-libs/libxkbcommon[X]
-	x11-libs/startup-notification
-	x11-libs/xcb-util
-	x11-libs/xcb-util-cursor
-	x11-libs/xcb-util-keysyms
-	x11-libs/xcb-util-wm
-	x11-libs/xcb-util-xrm
-	x11-misc/xkeyboard-config
-	x11-libs/cairo[X,xcb(+)]
-	x11-libs/pango[X]"
-DEPEND="${CDEPEND}
-	test? (
-		dev-perl/AnyEvent
-		dev-perl/X11-XCB
-		dev-perl/Inline
-		dev-perl/Inline-C
-		dev-perl/IPC-Run
-		dev-perl/ExtUtils-PkgConfig
-		dev-perl/local-lib
-		virtual/perl-Test-Simple
-		x11-base/xorg-server[xephyr]
-		x11-misc/xvfb-run
-	)"
-RDEPEND="${CDEPEND}
-	dev-lang/perl
-	dev-perl/AnyEvent-I3
-	dev-perl/JSON-XS"
-BDEPEND="virtual/pkgconfig"
-
-# Test without debug will apply optimization levels, which results
-# in type-punned pointers - which in turn causes test failures.
-REQUIRED_USE="test? ( debug )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.16-musl-GLOB_TILDE.patch"
-)
-
-# https://github.com/i3/i3/issues/3013
-RESTRICT="test"
-
-src_prepare() {
-	default
-
-	cat <<- EOF > "${T}"/i3wm
-		#!/bin/sh
-		exec /usr/bin/i3
-	EOF
-
-	eautoreconf
-}
-
-my_src_configure() {
-	local myeconfargs=(
-		$(use_enable debug)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-my_src_test() {
-	emake check
-}
-
-my_src_install_all() {
-	doman man/*.1
-
-	einstalldocs
-	use doc && dodoc -r docs "RELEASE-NOTES-${PV}"
-
-	exeinto /etc/X11/Sessions
-	doexe "${T}/i3wm"
-}
-
-pkg_postinst() {
-	# Only show the elog information on a new install
-	if [[ ! ${REPLACING_VERSIONS} ]]; then
-		elog "There are several packages that you may find useful with ${PN} and"
-		elog "their usage is suggested by the upstream maintainers, namely:"
-		elog "  x11-misc/dmenu"
-		elog "  x11-misc/i3status"
-		elog "  x11-misc/i3lock"
-		elog "Please refer to their description for additional info."
-	fi
-}
diff --git a/x11-wm/i3/i3-4.19-r1.ebuild b/x11-wm/i3/i3-4.19-r1.ebuild
deleted file mode 100644
index 3b3b04623bc8..000000000000
--- a/x11-wm/i3/i3-4.19-r1.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson optfeature virtualx
-if [[ "${PV}" = *9999 ]]; then
-	inherit git-r3
-fi
-
-DESCRIPTION="An improved dynamic tiling window manager"
-HOMEPAGE="https://i3wm.org/"
-if [[ "${PV}" = *9999 ]]; then
-	EGIT_REPO_URI="https://github.com/i3/i3"
-	EGIT_BRANCH="next"
-else
-	SRC_URI="https://i3wm.org/downloads/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="doc test"
-
-COMMON_DEPEND="dev-libs/libev
-	dev-libs/libpcre
-	dev-libs/yajl
-	x11-libs/libxcb[xkb]
-	x11-libs/libxkbcommon[X]
-	x11-libs/startup-notification
-	x11-libs/xcb-util
-	x11-libs/xcb-util-cursor
-	x11-libs/xcb-util-keysyms
-	x11-libs/xcb-util-wm
-	x11-libs/xcb-util-xrm
-	x11-misc/xkeyboard-config
-	x11-libs/cairo[X,xcb(+)]
-	x11-libs/pango[X]"
-DEPEND="${COMMON_DEPEND}
-	test? (
-		dev-perl/AnyEvent
-		dev-perl/X11-XCB
-		dev-perl/Inline
-		dev-perl/Inline-C
-		dev-perl/IPC-Run
-		dev-perl/ExtUtils-PkgConfig
-		dev-perl/local-lib
-		virtual/perl-Test-Simple
-		x11-base/xorg-server[xephyr]
-		x11-misc/xvfb-run
-	)
-	doc? (
-		app-text/asciidoc
-		app-text/xmlto
-		dev-lang/perl
-	)"
-RDEPEND="${COMMON_DEPEND}
-	dev-lang/perl
-	dev-perl/AnyEvent-I3
-	dev-perl/JSON-XS"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.16-musl-GLOB_TILDE.patch"
-	"${FILESDIR}/i3-gaps-4.19-fix-docdir.patch"
-)
-
-src_prepare() {
-	default
-
-	cat <<- EOF > "${T}"/i3wm
-		#!/bin/sh
-		exec /usr/bin/i3
-	EOF
-}
-
-src_configure() {
-	local emesonargs=(
-		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
-		$(meson_use doc docs)
-		$(meson_use doc mans)
-	)
-
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	exeinto /etc/X11/Sessions
-	doexe "${T}"/i3wm
-}
-
-src_test() {
-	virtx meson_src_test
-}
-
-pkg_postinst() {
-	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 8488d74426ae..b3fcd0ed53ef 100644
--- a/x11-wm/i3/i3-4.19.1.ebuild
+++ b/x11-wm/i3/i3-4.19.1.ebuild
@@ -15,7 +15,7 @@ if [[ "${PV}" = *9999 ]]; then
 	EGIT_BRANCH="next"
 else
 	SRC_URI="https://i3wm.org/downloads/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 LICENSE="BSD"
diff --git a/x11-wm/icewm/Manifest b/x11-wm/icewm/Manifest
index 31f385f24c3a..77d93a695f23 100644
--- a/x11-wm/icewm/Manifest
+++ b/x11-wm/icewm/Manifest
@@ -1,8 +1,8 @@
 AUX icewm 33 BLAKE2B 5605658012ad8ed16bbd4cf0c4cb7cbe5204f73c20ef2c3d9fef1011a80b9e68863de64b45e4b043604b147c9d31f3f5d2617d067b694f5ec5329ad895472b0e SHA512 3fe619e59cc5d354242ccd85d3b1982dd7db6d0f6170f46f9d33975872f6d5a342a08d69db763162dc43681eedb96e9ba5075455bf54adf4fb86bf19887bf6e0
 DIST icewm-2.5.0.tar.lz 1722504 BLAKE2B caf5d61559dd5bb25583bebeaca82e54049e2a97d8e5eeb93942908481f68614cfe55afd4041b5d60e58e732fef1694f67c5918a130bc55b252ebae67a51482a SHA512 1f59b4dbe90ca47031e5abf999cdb23a8e9ea956d5a76a0dde9b3489dec4530bf0ce72e10b337615d0bcadf04007b00a7db6f43082504bef65b109f9115d9f52
-DIST icewm-2.6.0.tar.lz 1722772 BLAKE2B 4d7055b77d88d0731517b668f525161a97b571f68cf0b2944e9b364653cb022f0b29d664ccc9539d1807005ab8954aa3ce31244911c2fafaa673ef5afeb447f1 SHA512 fe491c8c59aa530d48a20134857c787eccfeda5bd9529e063d865bd3c5f243ef41fbecba40aa06e7fa8037af89839958095debebc5d9b1acc9b5670bd0e12eb6
 DIST icewm-2.7.0.tar.lz 1738471 BLAKE2B 407f5290329de99519b806db4bbc8895623d2930f37912db701170145579a1c2819b7ae2576b0aee146e8b006a12c78f7344224dd407ed7e8a1eba1cffc43ced SHA512 829673a3f7aa26fd7f74a9a8ab220548b6bb7724026517fa7ec1d5705fca2c0aa9339078d603242dbb2209c194a7a64aebcf55454aea5f8a20c4785e63e8cc3f
+DIST icewm-2.8.0.tar.lz 1745937 BLAKE2B dc5c4c6e4b5f067881176a0f72914f971dbae3daa475ed7ca00dbf3f687aae97874a0cf2e94b0d22d45f7dc221390c0658674e9aad3ea19d21a171b6d478c4be SHA512 552d1da9ceb96c6c14a0dfd596656a56fb289716a787fb75e54b49ef6df84747a4999ce733a6ffb9ff7a1e4c0243253fc3f2fa7a2251e7f3987ab9f33c0a1b30
 EBUILD icewm-2.5.0.ebuild 2952 BLAKE2B b0d75ba7ec27295593caa2bb47d51c518b35a81e95a53210b424f7632d197bb2cb6116feeee53f56348409589a13c2c288f01ddd76a98549643d051da89bfdee SHA512 016db15eb35afcc81a5312690790d43de8d6f936f99de63fc1efe6974adaf0f8a074bfb6e53711af9a561490686786e2e5b860d7f4fc678058eba44347f8c440
-EBUILD icewm-2.6.0.ebuild 2956 BLAKE2B a29971bc37782d51dd81352475005d0860682ce1fa18ce04d9f69d67bdc1cefaf667a6179d58c63a6d39cb44f0971bd41ae54694896c37b0a3183a6a4fc360b4 SHA512 07b44baf1a7f48d9da2b8abdae82b3dda800662ce912f6f69cf1e7ea665407931aeb77b9f04e902b8862fc43790c4981bb1c57cd04c112cbed49991385a58174
-EBUILD icewm-2.7.0.ebuild 2956 BLAKE2B a29971bc37782d51dd81352475005d0860682ce1fa18ce04d9f69d67bdc1cefaf667a6179d58c63a6d39cb44f0971bd41ae54694896c37b0a3183a6a4fc360b4 SHA512 07b44baf1a7f48d9da2b8abdae82b3dda800662ce912f6f69cf1e7ea665407931aeb77b9f04e902b8862fc43790c4981bb1c57cd04c112cbed49991385a58174
+EBUILD icewm-2.7.0.ebuild 2953 BLAKE2B 5b366e518e1c58ddae0dc11dd8b2ff39fba2e636e61d2367564debac48648c4b8169e15e1e0b382f3d2ed2b3c7d310401a98a70d1d39c0fa4721ab4870f51471 SHA512 da1c72a707d80181bb567ecc33b61d426c50774d6b08fb998336d9f1917760bd53e442e61f141db63acc77327df41d6c8c719bbefe9bc00f327dcee83e1dcf4b
+EBUILD icewm-2.8.0.ebuild 2956 BLAKE2B 733dadf47f5dde98dabfce3b0e74bc5cf8912cb45bca3821651a59270b1ba3abd51b3de7cb992cf0e6b3c654badfb968e8de275bc5955f377d8b9132c77cc40e SHA512 412d620843feb1394f51611d035e86bcb21ba4e1bbd553b0e5a0c76e4dedf7f5490a9f64cb7b23d20f0526dccd508c51301b9a97df7af55894e7f0ffa6c77a04
 MISC metadata.xml 748 BLAKE2B 340b1eea319761630ad5bc22dc734fbfc2492acb263f03ea267e3c37c6c2928ba23cde5ee670c9265dae8bc3f78cdacf584c32d6c65219e859cf6df3b283be4d SHA512 4ba0d01e983f7a6c16ce6da6a7f54fb962154d50db8b820855e2c0dda7609526fc1aae039b469c27eaf6bd09a71b3c951c58b2a84d8aea9ce9fce4a5eff48b46
diff --git a/x11-wm/icewm/files/icewm b/x11-wm/icewm/files/icewm
index 90905960d1a2..90905960d1a2 100644..100755
--- a/x11-wm/icewm/files/icewm
+++ b/x11-wm/icewm/files/icewm
diff --git a/x11-wm/icewm/icewm-2.7.0.ebuild b/x11-wm/icewm/icewm-2.7.0.ebuild
index 7b0d626e90a0..08620af4ea13 100644
--- a/x11-wm/icewm/icewm-2.7.0.ebuild
+++ b/x11-wm/icewm/icewm-2.7.0.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.6.0.ebuild b/x11-wm/icewm/icewm-2.8.0.ebuild
index 7b0d626e90a0..6d9fc5f765eb 100644
--- a/x11-wm/icewm/icewm-2.6.0.ebuild
+++ b/x11-wm/icewm/icewm-2.8.0.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit autotools unpacker
 
diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest
index c9a86d8a0123..095840f74e3f 100644
--- a/x11-wm/mutter/Manifest
+++ b/x11-wm/mutter/Manifest
@@ -3,6 +3,6 @@ DIST mutter-40.3.tar.xz 2682460 BLAKE2B 41e505adc9aa6ca53d1f43d71051bc09c0f4f528
 DIST mutter-40.4.tar.xz 2682648 BLAKE2B fe3ed2edc20b4502db17bf3e6413159047eaa9812baa01b49f64ca2e3f05fe6f2e922a8e84ffd01636e8b6e5e31381653311153db5910f2dd1c84431d1892f6b SHA512 a38fe7c1ba2c65cb4510ee3ecd9b3e726cf3cb35922977e55f8b49f5ab847601277e1efaec63e7068ce0f924b38085adfe6d26b6d0af148a8f87400b31aba805
 DIST mutter-40.5.tar.xz 2682916 BLAKE2B 9ba2eeb5962a5473804fab02b1209c6044b151a1bc64b533762a27e91f6701a0ad655f582c8831cf92defc7be82e9eaa2c72b772fe7ea5e032dab5ecc96fb1b1 SHA512 ebd4f2bc4e8eef99d66305347673cbd2e38c5a058eb91eab6b932671ea7cb4a2f893dd65c4c5028ece454f8dd293898821bd125b68e304cf905ad237abff8837
 EBUILD mutter-40.3-r1.ebuild 4845 BLAKE2B a21695fee7ce8398b5ab40ae41bbf69a8bfb83fe747e0310306763d3768c0a7815d76022b00b234f2567d34ca4729e079011b4c4e09cf4025a16b69083127ce9 SHA512 936522dfc39a0f7565bb8bb0b3e24793df32275db5352620bd72eb0f50ec6623bbd257cc6e6381bf72b226b36e744abd1fc15339efdb559becb734cc3003767a
-EBUILD mutter-40.4.ebuild 4971 BLAKE2B e8cc75ad7e71f42f0f50be44c3981a9b9c97671f075e8fec8a5ed2801d51defe5cb939354cb5556a291c46a0727f3ef43de7cccd93ad28f146760d8a67ef742b SHA512 87b5871161f120e2809256289b54043ae0438c4fa9bdc99d9fc3a6ee8a35b339ea702628de934388301eb2e031f279cb8aa4f9a59aa43729afd84e46f5e04d17
+EBUILD mutter-40.4.ebuild 4970 BLAKE2B c8295fb63e9b21ccde5abdcaef8ac0c6bc914240510fc16098d61ef4ef95a27f7019e8d04d199d951d88b9d1ac4388490009652b01540b65607058d4de4bb9c1 SHA512 9ac9571c79616782c1e1d2459531298c8aef03086217e442ac5b7e9404fd46fb9fceda3749a0a96d6cd91fa3ea9b26f2b3e8cfd328f78985e2c810504a9a3ad4
 EBUILD mutter-40.5.ebuild 4971 BLAKE2B e8cc75ad7e71f42f0f50be44c3981a9b9c97671f075e8fec8a5ed2801d51defe5cb939354cb5556a291c46a0727f3ef43de7cccd93ad28f146760d8a67ef742b SHA512 87b5871161f120e2809256289b54043ae0438c4fa9bdc99d9fc3a6ee8a35b339ea702628de934388301eb2e031f279cb8aa4f9a59aa43729afd84e46f5e04d17
 MISC metadata.xml 606 BLAKE2B 54a05fee61cf9a1d958a46e0cc94e1cd61e69e187f89393c483c7022d455b7248684df4f1df028f0733995dacfbdf1faab600d8c239885eb0c7ea3097326f156 SHA512 6dea733bb5da3bd2db059a467cec81f7cfc0765750cdcfa0404a72cbb168495f13d01051198206178615b1a3fa41f78dffd9f0a38f6d7579116e782d76fab899
diff --git a/x11-wm/mutter/mutter-40.4.ebuild b/x11-wm/mutter/mutter-40.4.ebuild
index 34e1e0658349..55b294cdad69 100644
--- a/x11-wm/mutter/mutter-40.4.ebuild
+++ b/x11-wm/mutter/mutter-40.4.ebuild
@@ -17,7 +17,7 @@ REQUIRED_USE="
 	test? ( wayland )"
 RESTRICT="!test? ( test )"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~ppc64 ~riscv ~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
diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest
index 62c78c62af3a..4f233b88047b 100644
--- a/x11-wm/xpra/Manifest
+++ b/x11-wm/xpra/Manifest
@@ -5,10 +5,11 @@ AUX xpra-4.2.2-bad-tests.patch 1909 BLAKE2B 35388169dad048ec457a197e922cbe137ab9
 AUX xpra-4.2.2-dup-ip.patch 1729 BLAKE2B 389daa60daa788293ea8fb2aff27f83cf4e681d933d3d903bacc288d366525757cdcc78bedc4c6147e6efb3b315c8da9009125cdef84db943bd16a553ed5ca29 SHA512 85a5da4377a1fc6a724040ccaddecfed6d6ea319e6d06325a8b9ac25a9eb1072d8f87971bf62d9814f9a2c6ec38e2e950baca2527d08590e00dc4f09086378b5
 AUX xpra-4.2.2-ldconfig.patch 862 BLAKE2B 747f5777f5e4a3b268bbe1a1ce850838011e50eaffce96a55d9888dd8be17d739d49d4582bb5229729631f38bae5783397f0e8bcfa2ffdaacb13a555401fdc46 SHA512 9285f44207da98992524c5445a49f246916e7b774fa3a82ab50265261cccae4378fe0a2d83a414e7376f674b0189259212ab5a48d0291ca08b9f9ed8dcf23546
 AUX xpra-4.2.2-true-false-bin-path.patch 1555 BLAKE2B 90882a8071e3a9d7e4d3e1a31a66de70c7b26c069ac848dbbbf3396917797df96e1bb08aabe96007c079fce570e361cc50078ab66cba8445edebf86ce02508e1 SHA512 a1e9498942c7c8fad0740b4aeeed098bb6d2c28a15506c8044c0c7b21ebfe954ffcf2b6be1439357cdef229a047841caa5b1dfcac7fc96b083041fe5f2c997a4
-DIST xpra-4.2.1.tar.gz 3878766 BLAKE2B c537b54b8ea5cc1ad2909eeccf61eba59a518165eb72c7d4984d26f378e4babca997c2f6cf78f5ba947edbc4ad6c4085c86793aad9b01f1fca2b22b1daaabda9 SHA512 553d8c11f1a77a2a58cbad7df0d899c611e21eb01dad3516f99f1fb9cc7a4507ba7557807b62ddea7101ca01bab123962a34b9c3369db06d1bb318debd91dc55
+AUX xpra-4.2.3-dup-ip.patch 1486 BLAKE2B 2da134f53c9cf8fefd4df5e6a2edc0c7c6d8cbda4320df09cd3c3b56b3807e418b1efe22c187dc93830c15ea4fe1ddbe4e05bc5293bd4337960df086a37acd93 SHA512 8716f58fcfb423adcc6c34f712a51251717682e38c05724004ebcbcb7d0c1b2fc505d214c75c9a1eb18428205d2117cb2be9003a639b63d19ed95d131c0d86e4
 DIST xpra-4.2.2.tar.gz 3894227 BLAKE2B a25dde9c3732e31cd8127393f89f2495e01896d18d5212b141b4046c265a9ead029bed68c9610c2330ec0a885af1eeb3f92aef2c16dd102293e34ac208be605a SHA512 3f81b5a2f7abdfc14f7e48ec708524e38142b984e6539e94a27b6aef7b5a5e063ef14e6b7383a7719ecc7687c62f49eeeb5668282c337d90a79194c354dedd24
+DIST xpra-4.2.3.tar.gz 3897648 BLAKE2B e9d3b4f07f8fae88ad410201a503bc5c738daae91640843cfce2b70da03e916295709bb74ffbb5e70f8e8ba2dcc3085861bdd9b097d24096ccba332693cc076b SHA512 cebec316a0cbd673907379b54248901743a8bf6b6d25c7b36465794da4e1b19296b5fd465df8ba9d563b2a246fab572fa8db25c24c511da9ddc340a8c95557d5
 DIST xpra-4.2.tar.gz 4057304 BLAKE2B 17b6a95f7ce24a311c39d09291d9570285c30f25c2d935389cb380c2fce698acd984821e69acaabd66368e76b5beddd01803a68d6a16dd930dd2fa3289532f10 SHA512 261d46c04ce70686f41873c5c0c115e462e3b2501c58ab05fb2904f4700454c5fb8124d0faf86fe5e982872f19a4b90b941f8aff4790f7206602d6030c005353
-EBUILD xpra-4.2.1.ebuild 4153 BLAKE2B 83fabbba7623d98cd9fc4455f405eebf8d0c8d227f172ecc2e6db62f748a7c0452d37c15aefa61d29fe532afd80fe4a581c9703ba296e374654dcbeae25705b9 SHA512 7c78c3248308d8aff10618eb3dae089dea1206192e919f45a622455276b885a668ccce392cd87f1d124bc75b3a4cbd5584c839048f2112b79df7f463853d4850
 EBUILD xpra-4.2.2.ebuild 5116 BLAKE2B c6618758809c932323bbc82ce569d570596273090d1538a3091bfa6847faf465068451186018eaacaf398bf78bd040384d082a0235be76f5fbe843465d697594 SHA512 cca2d6c7de5d527ba4f68663e4fcfbe06f247f12865795c5145cae4ef9c1bf39995ffcd8e88f85de19fdb181098644ec285587ad1cd7903912d7040b122318c8
+EBUILD xpra-4.2.3.ebuild 5083 BLAKE2B 55ea7ae97a9071291189cc3930ecedc5ffe4c8c83c4de3035487fe4128f42f3ddc21781d93cdcc4b59d87a1907ebe17766caf9c9b4465bffe57dd0a5c644a2d6 SHA512 432959ac0e2ce1e430645a02c45cfd55951483cfe7e7139266e508531e9e4ab42fd48feb671b716b0bc7e57bcb722395dbd73dea97dce31b7a02b0fdf1a75d9c
 EBUILD xpra-4.2.ebuild 4151 BLAKE2B ed1a85aee717a2aca5d7c7b5f76ebba8a3514b3fd7f0261429836b363bd30d69a8312bc6e2526ce3f8bd92b8ebf3f7bb0a2047192b11527f8257595b72bb5e69 SHA512 73dc455a42f2ea0365c8344adeb39dc75976ad2e737d4e956e09bb2bcefcbeda9968bd8c203e307ce28eaa8ae6b176a3a4253e6e8a870b6922e70aa2e59ddcd4
 MISC metadata.xml 1362 BLAKE2B aedd143fbf55007c51f421515caa31daa954f6430ae0412ee33796471ac5beb1cec88b0e70f6598ab69640362804d67c75f9e04b2f43bddae5363644bcd0f547 SHA512 1a80da8c0e353a3ef671b3756b12cafa546def2935dca133bf349b8207b64a3f60d4de38b677b7c1ef2de69febe37d75e6950ee4b5873f8b466a75325e3b89d6
diff --git a/x11-wm/xpra/files/xpra-4.2.3-dup-ip.patch b/x11-wm/xpra/files/xpra-4.2.3-dup-ip.patch
new file mode 100644
index 000000000000..337527305ecc
--- /dev/null
+++ b/x11-wm/xpra/files/xpra-4.2.3-dup-ip.patch
@@ -0,0 +1,30 @@
+diff --git a/tests/unittests/unit/net/net_util_test.py b/tests/unittests/unit/net/net_util_test.py
+index 5c6e3096c..870801666 100755
+--- a/tests/unittests/unit/net/net_util_test.py
++++ b/tests/unittests/unit/net/net_util_test.py
+@@ -27,11 +27,8 @@ class TestVersionUtilModule(unittest.TestCase):
+         ifaces = get_interfaces()
+         if not ifaces:
+             return
++        ip_ifaces = defaultdict(list)
+         for iface in ifaces:
+-            ipmasks = do_get_bind_ifacemask(iface)
+-            for ip, _ in ipmasks:
+-                assert get_iface(ip)==iface, "expected interface %s for ip %s but got %s" % (
+-                    iface, ip, get_iface(ip))
+             if if_nametoindex:
+                 try:
+                     i = if_nametoindex(iface)
+@@ -41,6 +38,12 @@ class TestVersionUtilModule(unittest.TestCase):
+                     if if_indextoname:
+                         assert if_indextoname(i)==iface, "expected interface %s for index %i but got %s" % (
+                             iface, i, if_indextoname(i))
++            ipmasks = do_get_bind_ifacemask(iface)
++            for ip, _ in ipmasks:
++                ip_ifaces[ip].append(iface)
++        for ip, ifaces in ip_ifaces.items():
++            assert get_iface(ip) in ifaces, "expected interface for ip %s to be one of %s but got %s" % (
++                    ip, ifaces, get_iface(ip))
+         ia = get_interfaces_addresses()
+         assert ia
+         #for iface, address in ia.items():
diff --git a/x11-wm/xpra/xpra-4.2.1.ebuild b/x11-wm/xpra/xpra-4.2.3.ebuild
index 3cf2a6ed02a9..6280862e546a 100644
--- a/x11-wm/xpra/xpra-4.2.1.ebuild
+++ b/x11-wm/xpra/xpra-4.2.3.ebuild
@@ -6,23 +6,39 @@ EAPI=7
 PYTHON_COMPAT=( python3_{7,8,9} )
 DISTUTILS_SINGLE_IMPL=yes
 DISTUTILS_USE_SETUPTOOLS=no
-inherit xdg distutils-r1 tmpfiles prefix udev
+inherit xdg xdg-utils distutils-r1 tmpfiles udev
 
 DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based on wimpiggy"
 HOMEPAGE="https://xpra.org/"
-SRC_URI="https://xpra.org/src/${P}.tar.gz"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2 BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="brotli +client +clipboard csc cups dbus doc ffmpeg jpeg ibus +lz4 lzo minimal opengl pillow pinentry pulseaudio server sound test vpx webcam webp"
+IUSE="brotli +client +clipboard csc cups dbus doc ffmpeg jpeg html ibus +lz4 lzo minimal opengl pillow pinentry pulseaudio +server sound systemd test vpx webcam webp xdg xinerama"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	|| ( client server )
 	cups? ( dbus )
 	opengl? ( client )
+	test? ( client clipboard dbus html server sound xdg xinerama )
 "
 
+TDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/netifaces[${PYTHON_USEDEP}]
+		dev-python/pillow[jpeg?,${PYTHON_USEDEP}]
+		dev-python/rencode[${PYTHON_USEDEP}]
+		dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
+		xdg? ( dev-python/pyxdg[${PYTHON_USEDEP}] )
+	')
+	html? ( www-apps/xpra-html5 )
+	server? (
+		x11-base/xorg-server[-minimal,xvfb]
+		x11-drivers/xf86-input-void
+	)
+	xinerama? ( x11-libs/libfakeXinerama )
+"
 DEPEND="
 	${PYTHON_DEPS}
 	$(python_gen_cond_dep '
@@ -55,12 +71,9 @@ DEPEND="
 "
 RDEPEND="
 	${DEPEND}
+	${TDEPEND}
 	$(python_gen_cond_dep '
-		dev-python/netifaces[${PYTHON_USEDEP}]
-		dev-python/rencode[${PYTHON_USEDEP}]
-		dev-python/pillow[jpeg?,${PYTHON_USEDEP}]
 		cups? ( dev-python/pycups[${PYTHON_USEDEP}] )
-		dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
 		lz4? ( dev-python/lz4[${PYTHON_USEDEP}] )
 		lzo? ( >=dev-python/python-lzo-0.7.0[${PYTHON_USEDEP}] )
 		opengl? (
@@ -74,19 +87,19 @@ RDEPEND="
 	')
 	acct-group/xpra
 	virtual/ssh
+	x11-apps/xauth
 	x11-apps/xmodmap
 	ibus? ( app-i18n/ibus )
 	pinentry? ( app-crypt/pinentry )
-	server? (
-		x11-base/xorg-server[-minimal,xvfb]
-		x11-drivers/xf86-input-void
-	)
+"
+DEPEND+="
+	test? ( ${TDEPEND} )
 "
 BDEPEND="
-	virtual/pkgconfig
 	$(python_gen_cond_dep '
 		>=dev-python/cython-0.16[${PYTHON_USEDEP}]
 	')
+	virtual/pkgconfig
 	doc? ( app-text/pandoc )
 "
 
@@ -94,14 +107,18 @@ RESTRICT="!test? ( test )"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.0.2_ignore-gentoo-no-compile.patch
-	"${FILESDIR}"/${PN}-3.0.2-ldconfig.patch
 	"${FILESDIR}"/${PN}-4.2-suid-warning.patch
+	"${FILESDIR}"/${PN}-4.2.2-true-false-bin-path.patch
+	"${FILESDIR}"/${PN}-4.2.3-dup-ip.patch
+	"${FILESDIR}"/${PN}-4.2.2-bad-tests.patch
 )
 
 python_prepare_all() {
-	hprefixify -w '/os.path/' setup.py
-	hprefixify tmpfiles.d/xpra.conf xpra/server/server_util.py \
-		xpra/platform{/xposix,}/paths.py xpra/scripts/server.py
+	distutils-r1_python_prepare_all
+
+	# FIXME: There are hardcoded paths all over the place but the following
+	# double-prefixes some files under /etc. Looks tricky to fix. :(
+	#hprefixify $(find -type f \( -name "*.py" -o -name "*.conf" \))
 
 	sed -r -e "/\bdoc_dir =/s:/${PN}\":/${PF}/html\":" \
 		-i setup.py || die
@@ -111,7 +128,8 @@ python_prepare_all() {
 			-i setup.py || die
 	fi
 
-	distutils-r1_python_prepare_all
+	# Upstream says these tests are currently broken.
+	rm tests/unittests/unit/net/subprocess_wrapper_test.py tests/unittests/unit/net/protocol_test.py || die
 }
 
 python_configure_all() {
@@ -154,6 +172,18 @@ python_configure_all() {
 	export XPRA_SOCKET_DIRS="${EPREFIX}/run/xpra"
 }
 
+python_test() {
+	export XAUTHORITY=${HOME}/.Xauthority
+	touch "${XAUTHORITY}" || die
+
+	distutils_install_for_testing
+	xdg_environment_reset
+
+	PYTHONPATH=${S}/tests/unittests:${BUILD_DIR}/test/lib \
+	XPRA_SYSTEMD_RUN=$(usex systemd) XPRA_TEST_COVERAGE=0 \
+		"${PYTHON}" tests/unittests/unit/run.py || die
+}
+
 python_install_all() {
 	distutils-r1_python_prepare_all