gentoo (valentine's day) resync : 14.02.2021

16 files changed, 378 insertions, 78 deletions

diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index b6d563ba8006..66bdf91555d9 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/fvwm/Manifest b/x11-wm/fvwm/Manifest
index 8886de99bb13..d2c3ee171851 100644
--- a/x11-wm/fvwm/Manifest
+++ b/x11-wm/fvwm/Manifest
@@ -5,6 +5,6 @@ AUX fvwm-2.6.5-mouse-buttons.patch 519 BLAKE2B 23b31933e9dcc456d73be15573226017f
 AUX fvwm-2.6.8-perl528.patch 515 BLAKE2B 44df7b8aef71d85c3aefefb40ab45b9e6227ef6a13aaab60cec8956db669013b4ee4dc869216972e1a443d1f69e6550e7f80dc81cdf8b7642d6c49ae46793b2a SHA512 ab35b8aef3c6d8a07f1e03290c209736ee892729d98fece3d0134fd9994f8c57bdd5703492b405a6eb52cfcd67cd9cd72c16bc25a729a46560eb6e21f2d7918f
 DIST fvwm-2.6.8.tar.gz 3915662 BLAKE2B 0b71182c5c0b5a07314fde8a673efe46712b92484e1164cd6357ad2e36e557dd822bf6c25d201092953ec10200bb0f93846af6cde0d701c65c81a4086de64652 SHA512 12e0def0a1d565c1c44356b48b4e516b7be4f51f13f91d9f8b89364ae106f6d7773e12fd17c71b6f0569c64fb3a5374c036c118cb76f739a63b1e17b5dfba287
 DIST fvwm-2.6.9.tar.gz 3942859 BLAKE2B 8faf2d420d96049ab0528a6c6a5dc6ed8ee9449f8e533b9ad9bb526faea86030684fc0aa8ed0d307cb64575457676611298adf582b1249c37a3db35a72b43bf1 SHA512 a9c2214ad19edd17da81446a6d4250284cc50b59b53c233212f2a9354c01143dbb870521392752f272f00af50bee2dd8f0b6bf6176b0d4b3075694d2a61a623e
-EBUILD fvwm-2.6.8-r2.ebuild 4105 BLAKE2B 8453a380d28fe71055c5fbfb73d0c4084409393c1be91e52ef772315389a413e902b14ee618d072449da9803b949ecc9192bb8b43dab3dc11ed0400b9a85d4bc SHA512 a783b93180542b66a5f2d394cba759f6af7fb4e51bdfb881f671aab3a9f4c62ed36fcee1e3e47d322a416d6d8153c74a888373b674599844e8dcbb425b0095b2
-EBUILD fvwm-2.6.9.ebuild 4102 BLAKE2B 875b3f30630d9fba8b1f2722f294b0dedc3fef1d1226c0f1d39027c6c1dbe7f85a4fc88fa20225050e4b1a0604ebce9a74ffcfb9c0c39e8315d2ad6deb238b9e SHA512 9d367e2b42c7db780721b21ac604058d54ad13f5f120026d7f41c2a22e9ab8248ed7468a2f7f24e9a60223bfb82c7ce640e1b0bafd5893863f16207375b13b79
+EBUILD fvwm-2.6.8-r2.ebuild 4107 BLAKE2B d068e2640a47f2e90c67eb517803a42b0fc86f7ade14a8cc9b41570e05af25d888ec3c25d66fc2a15bd5a2da2eaf3f641b927c978c06c2749dfb2676bf960985 SHA512 0a03e22394e6342a8b7bbfb76f84f150507efdb69959ecf536587b45e88d21d9acd991ce23256a442eb86fd3b09c441e8cb6d1be3d1134f80c47e43364150707
+EBUILD fvwm-2.6.9.ebuild 4104 BLAKE2B ec39f5ffa582099e828d193ef0c1ace8d855ad1fbc2ae241af9e6f383f381702fe0a4a5821034d0af4007b0d3a5130229996ca00ddae7db995dc0f17f3569ef9 SHA512 2454a4f684d60144d70d8a93109e4336a627c736dc3fe3f4e75f93353c1508117e5916be63a555465bb664430ad6720601a703b2e9ac469b9300c5105bf935c9
 MISC metadata.xml 707 BLAKE2B 6b51c0eccf9ca01664d552a5f2dca340bbabbbd4753fd2248923c3ed73df76279de6001790c188ed7ccf7c6d769648c8e271f8992492be215cd609f62aef461a SHA512 1be8383a2a6f0f4e4c4ae8728657783bbd7ed98d23bc35453eef5de18a898136ff92dc82e1acb431853f8cf42c8fea3fcb56efe5d448a6657bbe4b9258fa6086
diff --git a/x11-wm/fvwm/fvwm-2.6.8-r2.ebuild b/x11-wm/fvwm/fvwm-2.6.8-r2.ebuild
index f72e00f30238..d479aafd388b 100644
--- a/x11-wm/fvwm/fvwm-2.6.8-r2.ebuild
+++ b/x11-wm/fvwm/fvwm-2.6.8-r2.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 inherit autotools flag-o-matic desktop
 
 DESCRIPTION="An extremely powerful ICCCM-compliant multiple virtual desktop window manager"
-HOMEPAGE="http://www.fvwm.org/"
+HOMEPAGE="https://www.fvwm.org/"
 SRC_URI="https://github.com/fvwmorg/fvwm/releases/download/${PV}/${P}.tar.gz"
 
-LICENSE="GPL-2 FVWM"
+LICENSE="GPL-2+ FVWM"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="bidi debug doc netpbm nls perl png readline rplay stroke svg tk truetype +vanilla xinerama lock"
diff --git a/x11-wm/fvwm/fvwm-2.6.9.ebuild b/x11-wm/fvwm/fvwm-2.6.9.ebuild
index 521b1b6fb663..6563867b6871 100644
--- a/x11-wm/fvwm/fvwm-2.6.9.ebuild
+++ b/x11-wm/fvwm/fvwm-2.6.9.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 inherit autotools flag-o-matic desktop
 
 DESCRIPTION="An extremely powerful ICCCM-compliant multiple virtual desktop window manager"
-HOMEPAGE="http://www.fvwm.org/"
+HOMEPAGE="https://www.fvwm.org/"
 SRC_URI="https://github.com/fvwmorg/fvwm/releases/download/${PV}/${P}.tar.gz"
 
-LICENSE="GPL-2 FVWM"
+LICENSE="GPL-2+ FVWM"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ~ppc64 ~sparc x86"
 IUSE="bidi debug doc netpbm nls perl png readline rplay stroke svg tk truetype +vanilla xinerama lock"
diff --git a/x11-wm/i3-gaps/Manifest b/x11-wm/i3-gaps/Manifest
index 9e88c91c9a0c..b1d5cb1c608e 100644
--- a/x11-wm/i3-gaps/Manifest
+++ b/x11-wm/i3-gaps/Manifest
@@ -2,7 +2,9 @@ AUX i3-gaps-4.18-musl.patch 2157 BLAKE2B 4fef024279d11e996c5c204f27b5a8b9fb654b3
 AUX i3-gaps-4.18.2-drop-branch-test.patch 524 BLAKE2B 576cd7fa9a077a22c5a575da0bdff130f32013fb184b5278243c29200e61ddc00222f86ea8cff940bbf010c610afdb867fea683d665cdd19abec74d4a6c08bb9 SHA512 adc9b5d01496d6784cabd43161db89550f2cf0be962656c972f44784d3204a8047eca3bd717d80e5c84ee1b891d38fde133a73804d125efe4e7829140171f4a3
 AUX i3-gaps-4.19-fix-docdir.patch 508 BLAKE2B 44aa2a2a7d0b77429345c4b62be66437714851481ca968098596c28aae8769036b8238b0295f4f80ca8e6e0f2c3e25c60130f3b941cb763d2069deb07d884dfd SHA512 8169cd9fdc2a4506af3d93eda672484a43ab30cf99afcdfc10094be36e6fcccf53d416376a475a95a80d34afb6dbec32bb657a81ccc7e5244c23b34717d5201a
 DIST i3-gaps-4.18.2.tar.gz 3999555 BLAKE2B d825bb4acb76a7909569aa10c6cab517ff08ee4d4d29175c9a84686c83f225a8a090c26ad4bf4ef03e2062bf4d48c7e2e2bf70b49f7a67ecad386597fc1602bd SHA512 86c76340d1df40bbd7e804515ae9dda350458d22651bee508f9f141acd3f4ea4025c8f40ddf0cdfe1fc3c6b26cbf5c3900204545468776721857bb104200ee34
+DIST i3-gaps-4.19.1.tar.gz 4189285 BLAKE2B 91dcf3024cfdc01f52eefc53912d5d2264c51683ae1249761fa848593ffea94ee67d7638d07e078477074fa57158d099f668a27f88b7ad3c10e56efb464bb6d9 SHA512 200610a221655beee5c204dca1b2d8fe37c64d9054713605a403ba8973b30460bbc64f9172aa3b262f2f8b477584fca667137147ac076bb06745130f31750a9a
 DIST i3-gaps-4.19.tar.gz 4192134 BLAKE2B cc70e36fd01e777e1e4357d1799777eb42c21f1666759d8730c548773c87e4c2806ae5376703956761a8fc036c5e847a4734cddd695067f684038c1cc9a8905e SHA512 db09203256172cc4807189bbf16d793c9203c908d2e75cbb7d973d1f0338f6e3734afe68ffe1c43ef3e43e5b2c6dba1ab9135625e4d42d10a9ea6f44f673d384
 EBUILD i3-gaps-4.18.2.ebuild 2027 BLAKE2B 93bbcd939e72a2707245e74ad9874183cba84c633b5a834c84edf930cf916b81ddcdb1174204c53294bfec0bf56433d81049423ce9c1c812ca5227424952cb4d SHA512 2222ff5a4d28f6a2dc70dbbbf022c2bcb09e571c8c9681309ac04a785a6b298a57317526a4297d11ab3d79b870c903ee330f266bc083d253809b802f9f3a6791
+EBUILD i3-gaps-4.19.1.ebuild 1761 BLAKE2B 98922037f619cdc9bbfa8a7da9a8316d5ad00a06faee1711c7d60ecc9bcbdd2e0262e82fbfe2dd0ea452887caec38d48b7a718f9d859177ad374927c38d83b7b SHA512 a5ffad13f394a64e35c7e66901d3874e0a1dc75067961e830c14ddc32146764cc2489416d4f49789415090b58d99d3fd4f58422f49719bd5e5ec477cc3f05146
 EBUILD i3-gaps-4.19.ebuild 1765 BLAKE2B 4924ca2460b8c1c31e90c23513221ae7e0f900996ce0855eae842f7a8bc01cc3ff78358d36591ec16a191f63a7974897525723684206535973fd95ff64733d65 SHA512 4900cf098c796d05b42dc1222e671a9ada688ed2628aeedc4451aec139eb52150abb1e202edac5ef582f5cf554e47d210db1a3f5f104a59e2c2dc39f32d14586
 MISC metadata.xml 553 BLAKE2B a975c29cc436e391e4e85bd93b30258dfeb20cdd6f4895641cddb3b933a9674c0ddb9fc325b6b8a9f4e9ede42ebb4c7dbebd9917e14142a3a2b5054ce35d852b SHA512 2df67f18499497b55cbede5d732874cb5fbdb48c489a2e26a024e05b39a3355a0075d4c2b1fb4e42b4d12bf8ef927d9494b7b3a97d6fd52bca7bb1b17f4191bc
diff --git a/x11-wm/i3-gaps/i3-gaps-4.19.1.ebuild b/x11-wm/i3-gaps/i3-gaps-4.19.1.ebuild
new file mode 100644
index 000000000000..861470c91c03
--- /dev/null
+++ b/x11-wm/i3-gaps/i3-gaps-4.19.1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson optfeature
+
+DESCRIPTION="i3 fork with gaps and some more features"
+HOMEPAGE="https://github.com/Airblader/i3"
+SRC_URI="https://github.com/Airblader/i3/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="dev-libs/glib:2
+	dev-libs/libev
+	dev-libs/libpcre
+	dev-libs/yajl
+	x11-libs/cairo[X,xcb(+)]
+	x11-libs/libxcb[xkb]
+	x11-libs/libxkbcommon[X]
+	x11-libs/pango[X]
+	x11-libs/startup-notification
+	x11-libs/xcb-util
+	x11-libs/xcb-util-cursor
+	x11-libs/xcb-util-keysyms
+	x11-libs/xcb-util-wm
+	x11-libs/xcb-util-xrm"
+DEPEND="${COMMON_DEPEND}
+	test? (
+		dev-perl/ExtUtils-PkgConfig
+		dev-perl/IPC-Run
+		dev-perl/Inline
+		dev-perl/Inline-C
+		dev-perl/X11-XCB
+		dev-perl/XS-Object-Magic
+		x11-apps/xhost
+		x11-base/xorg-server[xephyr,xvfb]
+		x11-misc/xvfb-run
+	)"
+BDEPEND="app-text/asciidoc
+	app-text/xmlto
+	dev-lang/perl
+	virtual/pkgconfig"
+RDEPEND="${COMMON_DEPEND}
+	dev-lang/perl
+	dev-perl/AnyEvent-I3
+	dev-perl/JSON-XS
+	!x11-wm/i3"
+
+S="${WORKDIR}/i3-${PV}"
+
+DOCS=( RELEASE-NOTES-$(ver_cut 1-3) )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.18-musl.patch"
+	"${FILESDIR}/${PN}-4.19-fix-docdir.patch"
+)
+
+src_configure() {
+	local emesonargs=(
+		-Ddocdir="/usr/share/doc/${PF}"
+		-Ddocs=$(usex doc true false)
+		-Dmans=true
+	)
+
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	exeinto /etc/X11/Sessions
+	newexe - i3wm <<- EOF
+		#!/usr/bin/env sh
+		exec /usr/bin/i3
+	EOF
+}
+
+pkg_postinst() {
+	optfeature "Application launcher" x11-misc/dmenu
+	optfeature "Simple screen locker" x11-misc/i3lock
+	optfeature "Status bar generator" x11-misc/i3status
+}
diff --git a/x11-wm/i3/Manifest b/x11-wm/i3/Manifest
index 18968d3b48e9..06fbb031539c 100644
--- a/x11-wm/i3/Manifest
+++ b/x11-wm/i3/Manifest
@@ -2,9 +2,11 @@ AUX i3-4.16-musl-GLOB_TILDE.patch 2783 BLAKE2B 9dea47af64b78a77006d3aa641273aa7a
 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.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
 MISC metadata.xml 470 BLAKE2B 1c4fd7b44860934e88fb5165254fe0e8ca7e647c11af9af7d959f240e51002e6a454d9b93b30da8944891a1aa6a989f7a3e2a8af44ba41de174e78745393dd79 SHA512 52eddb56541d1172b04ca3ae646d01e52fb300dd62f5dfeaf2abe9d791965813e87b24a1477743797227bf8d407051f79076d54edb599524f89f3cfc716cc47e
diff --git a/x11-wm/i3/i3-4.19.1.ebuild b/x11-wm/i3/i3-4.19.1.ebuild
new file mode 100644
index 000000000000..e7b4e3a5694e
--- /dev/null
+++ b/x11-wm/i3/i3-4.19.1.ebuild
@@ -0,0 +1,104 @@
+# 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"
+)
+
+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() {
+	elog "There are several packages that you may find useful with i3 and"
+	elog "their usage is suggested by the upstream maintainers."
+	elog "Uninstalled optional dependencies:"
+	optfeature "Application launcher" x11-misc/dmenu
+	optfeature "Simple screen locker" x11-misc/i3lock
+	optfeature "Status bar generator" x11-misc/i3status
+}
diff --git a/x11-wm/icewm/Manifest b/x11-wm/icewm/Manifest
index a7f6581fd887..6828da0ee94b 100644
--- a/x11-wm/icewm/Manifest
+++ b/x11-wm/icewm/Manifest
@@ -1,11 +1,10 @@
 AUX icewm 33 BLAKE2B 5605658012ad8ed16bbd4cf0c4cb7cbe5204f73c20ef2c3d9fef1011a80b9e68863de64b45e4b043604b147c9d31f3f5d2617d067b694f5ec5329ad895472b0e SHA512 3fe619e59cc5d354242ccd85d3b1982dd7db6d0f6170f46f9d33975872f6d5a342a08d69db763162dc43681eedb96e9ba5075455bf54adf4fb86bf19887bf6e0
-AUX icewm-2.1.0-appmenu_fix.patch 1200 BLAKE2B c68ccef66b08e43eb97da0624218aa36bea070c6030c8a8c1e8724fce3f12590270620b1e56d09ac01fa713f90b71e82344227fdc62941938c54a6cbc05f23f6 SHA512 7cecdcf8d55ec49ee3c3fa145dc492c6a143690abfd3677937799ef636a5f9db3d7cb65790225337895c32d7cb26c2c888052c6374831123ec56ba1f826b2309
 DIST icewm-1.9.2.tar.lz 1694602 BLAKE2B cf30a695ba48093b386aa2f3af5120e78a9fcc57da9038bcd546ade0986e1bc359a3da91d2eeeb8d3a105173f5d755223675a84b38cfc8c907269efd2561c706 SHA512 7b4f8c47c636a0113af576bc1bcd9fde111ae70eb0bcf21fb1d906ca43bea4d8b0337a728e5da35bcfeabd56c66fd0d14581d7377f063dd750fdf01362b24be2
 DIST icewm-2.0.1.tar.lz 1694439 BLAKE2B 1476f33fa7350a98b7eca8c5c265455d0a78b28bcbd35ab78969b528ae02d3c960fb73cf2b24ea999ee5e08c9f0641d3502c7d5ed8b285777162c334d645b6db SHA512 ac4126b38d592aed60d2269f58c5a1612b61e871565e3c3e51bc2b430e4da6a4708f78e86c16091fa4dfb9eefd4109ae89102ab708e3bce9a44f1e5fe1970c59
-DIST icewm-2.1.0.tar.lz 1696214 BLAKE2B ba91eac4ea425fc9979d1c64fbc2a4c59f1d8004138f31b1e184484cfcaaca7c1a550cd160ff3683a4f663e54efdd5f8ded001317765485259a1f19b8de794a3 SHA512 a57ebbf76640b5296c90c105bdc9b9b2cc55546d324fa18b2e7bfc6bee4442b56176bda4a584d6a73b2297203e1966d7646354bb6e0baaf64fdf0acdb357ee58
 DIST icewm-2.1.1.tar.lz 1695855 BLAKE2B 81903735a71e13953635a4d70547f2518983b5e58fd9e90124e4aecb6b9b53827d48f77bbff3cec59b929456f4c1ab14fde999bbc45f90c8916bbb1017b8eb20 SHA512 7d0acd655f505755fe0b1186b7422a254805bd1c56f00170ecac90272c31c1c0673f781e4e89e04682515b7313dd57b78797398a81edc62b86abc6991abfc45c
+DIST icewm-2.1.2.tar.lz 1694969 BLAKE2B 640af2b7afb34ebcf6fc4f1762161bd8cae124e58735ad3e5af3f8a12723ead71e491fbef9e9119792c54e4e116c7cc491847da1e103b2c46765044bfda71f2d SHA512 92c52b057c7ac1c81eb72cb01d4041715fae2b1c221ecc0e5286a9bfad87e1607a3d7c60dde125436ad32c9a72dac01ee82a3bfe4b671b2d458ba3ce4c0c5a62
 EBUILD icewm-1.9.2.ebuild 2751 BLAKE2B ffbbde71ff1e7e055de75878203dfcfe4ddf47e0883f9c51d9ed4a68d007c1d294d2bc33ce0009b0fb4b5b8c679a341aefc30252fe3fd3cc0a963574a3b31955 SHA512 42c3df4c4709f963e23264785acb1e56df30fb1b580fbdc06029e86cb7c7fe1b78b4dc46d250cae50195404ccd166582d2560940076f7823e368e36de333e333
-EBUILD icewm-2.0.1.ebuild 2949 BLAKE2B 7cbb263b4244bc2112c5dd6ac91a0b970d31e3ce36034a31d036e1fd77d34923da8de8bfe64ef4d212984640d932727a9b362bf7f2ff6ecea10a9ae57db15906 SHA512 96ef7961a4754b355678b222b1c99f5ea7efc2cf2ec5badf951458fadee580c26a5614dccb540b9685d118e6761cf20df14b71b7ce7ef98f84b8df8bfb596e19
-EBUILD icewm-2.1.0-r1.ebuild 3000 BLAKE2B 08a69f1874b68ed1192dbe7025c4f77f66325577350d670df66030e23f86d2b8c978e21fec1858112148c5249abdafc44d663c01a9410aae1a00ed337333012a SHA512 5240155015ce0f1fec204f6e0b724ce9de66be497dd2c8e253a7d0b33b3c5c50f0539fcece9394b24e1b9898f6051e4b052a64c681bbc5ba91d7e49b8b55ac6a
+EBUILD icewm-2.0.1.ebuild 2946 BLAKE2B 70fc1a755565ffbc82b3eca5c5ec01a84d7969a6e58fd1f47e10a4f17872af7332979a912c8b30d1e2d6295a81c132fd60dc4682f3a03ef75f04fc6a6ffe6be6 SHA512 3b7d8a7f1f044a2ee5ac8a18abdd014194f117e75ae2bbc5107165f3dc5bfd10e1d984bb1c5a245883fc11a38e1a542c70eb0c4089bff8a00f1bab140fef54c4
 EBUILD icewm-2.1.1.ebuild 2949 BLAKE2B 7cbb263b4244bc2112c5dd6ac91a0b970d31e3ce36034a31d036e1fd77d34923da8de8bfe64ef4d212984640d932727a9b362bf7f2ff6ecea10a9ae57db15906 SHA512 96ef7961a4754b355678b222b1c99f5ea7efc2cf2ec5badf951458fadee580c26a5614dccb540b9685d118e6761cf20df14b71b7ce7ef98f84b8df8bfb596e19
+EBUILD icewm-2.1.2.ebuild 2949 BLAKE2B 7cbb263b4244bc2112c5dd6ac91a0b970d31e3ce36034a31d036e1fd77d34923da8de8bfe64ef4d212984640d932727a9b362bf7f2ff6ecea10a9ae57db15906 SHA512 96ef7961a4754b355678b222b1c99f5ea7efc2cf2ec5badf951458fadee580c26a5614dccb540b9685d118e6761cf20df14b71b7ce7ef98f84b8df8bfb596e19
 MISC metadata.xml 747 BLAKE2B a986dc65f9b603519ef92fecc63cadd2921d6569e8735956a55ce91673426082e367664cce23c2b80cec19e0d997da357ac8f9d3d78c738ad92f42f6f426c225 SHA512 f9b84c60b780b5999c8a295b64bdf1bdb734108984e48f1271257cb35602df024a347560526de52f43ede16f67031551f4ae3f37401d3320e4dbdfb913e557fe
diff --git a/x11-wm/icewm/files/icewm-2.1.0-appmenu_fix.patch b/x11-wm/icewm/files/icewm-2.1.0-appmenu_fix.patch
deleted file mode 100644
index d159e4d38e3f..000000000000
--- a/x11-wm/icewm/files/icewm-2.1.0-appmenu_fix.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 1d28361a69d773ba0d026119ff197d38900eac0a Mon Sep 17 00:00:00 2001
-From: Bert Gijsbers <gijsbers@science.uva.nl>
-Date: Sat, 23 Jan 2021 16:02:21 +0100
-Subject: [PATCH] Don't unarm menu popup buttons for issue #527.
-
----
- src/ybutton.cc | 9 +++++++--
- 1 file changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/src/ybutton.cc b/src/ybutton.cc
-index 1c11756d..745a8f21 100644
---- a/src/ybutton.cc
-+++ b/src/ybutton.cc
-@@ -58,7 +58,7 @@ YButton::~YButton() {
-     }
-     popdown();
-     if (fPopup && fPopup->isShared() == false) {
--        delete fPopup;
-+        delete fPopup; fPopup = nullptr;
-     }
-     if (--buttonObjectCount == 0) {
-         normalButtonFont = null;
-@@ -289,8 +289,13 @@ void YButton::handleButton(const XButtonEvent &button) {
-             setSelected(false);
-         }
-     }
-+    bool unarm = fEnabled && fArmed
-+              && button.type == ButtonRelease
-+              && button.button == Button1
-+              && getClickCount() == 1
-+              && dragging();
-     YWindow::handleButton(button);
--    if (fEnabled && button.type == ButtonRelease && button.button == Button1) {
-+    if (unarm && !fPopupActive) {
-         setArmed(false, false);
-     }
- }
diff --git a/x11-wm/icewm/icewm-2.0.1.ebuild b/x11-wm/icewm/icewm-2.0.1.ebuild
index ec1d0545c005..d813efb61965 100644
--- a/x11-wm/icewm/icewm-2.0.1.ebuild
+++ b/x11-wm/icewm/icewm-2.0.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 ~sparc ~x86"
+KEYWORDS="amd64 ~ppc 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.1.0-r1.ebuild b/x11-wm/icewm/icewm-2.1.2.ebuild
index 57f469f48b79..ec1d0545c005 100644
--- a/x11-wm/icewm/icewm-2.1.0-r1.ebuild
+++ b/x11-wm/icewm/icewm-2.1.2.ebuild
@@ -81,10 +81,6 @@ BDEPEND="
 	nls? ( >=sys-devel/gettext-0.19.8 )
 "
 
-PATCHES=(
-	"${FILESDIR}/${P}-appmenu_fix.patch"
-)
-
 pkg_pretend() {
 	if use gdk-pixbuf && use imlib ; then
 		einfo 'Confilcting USE flags have been enabled:'
diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest
index e0f4e1bb6d9c..59052ebdcd45 100644
--- a/x11-wm/mutter/Manifest
+++ b/x11-wm/mutter/Manifest
@@ -2,8 +2,10 @@ AUX 3.34.6-tests-dontreq-gdkwayland.patch 1730 BLAKE2B d796a4dc91d756ac4af24c411
 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
 EBUILD mutter-3.36.7-r1.ebuild 4750 BLAKE2B 542b9eeba156e95133e9605d68e9e5d52b5686a71ce30610ddc034287009253019297e775e8f024c6b221794b8b6d250de0e9fc0407ad75700e1ed5ec5cc34e4 SHA512 7cf8215658d9201fec39ac6154c70155b7e58e1fdd8eb251c76dffe127fdabea05ca5a9aa4d6380b2eb3d4a7104bd9d65b4f64b2791f53ce23662a54036cb225
 EBUILD mutter-3.38.2.ebuild 4588 BLAKE2B cc0e0069a256f02f368730958bcbedf398bff20dee6107e79e0accc191195b75ee0ae2f07d9b64bf9653eb9c4a7ed3f99913fbb26bde8089cd76549e7483ae7e SHA512 1f328c1a55625cc4db3a1435574dc0cae1c86337b4dd5cb01f7bc3bac64766d0dd1ee5fe57e3603aec39de787d5f60e2447df3eaaa4919ddf268c24240d79204
+EBUILD mutter-3.38.3-r1.ebuild 4731 BLAKE2B 9e0e098bd740df49f289d8a80727a3fd6c43348251f42bf7e739015a1859af8a4d8fcd1f3f52919afb6fdbb24ad94a68be8b9dd096f8d36d566d9670959f9d64 SHA512 5a0a233c85225e0937c52b01b07cf528fa8f8bce218a854d0f24d784265f0ae14c79ed2d5c5cf4e67d4e86e3d3eccd7cdad967481fdfb597b5a4ecaaf86dbbea
 EBUILD mutter-3.38.3.ebuild 4588 BLAKE2B cc0e0069a256f02f368730958bcbedf398bff20dee6107e79e0accc191195b75ee0ae2f07d9b64bf9653eb9c4a7ed3f99913fbb26bde8089cd76549e7483ae7e SHA512 1f328c1a55625cc4db3a1435574dc0cae1c86337b4dd5cb01f7bc3bac64766d0dd1ee5fe57e3603aec39de787d5f60e2447df3eaaa4919ddf268c24240d79204
 MISC metadata.xml 605 BLAKE2B 5dc68fbf8b85c2bf75ea435abe116a9ed7072ec40a45bda28de9cb277a03e5c363487f1c3aa5c60cab5f710e06f15d966790684cac1573676af635e59b3cdfbd SHA512 440e7a33404e218da15c127614d843edcd42c469aced4609c2e7d7d8ec1281c9eceb64aebe406a75e9ba0a05b6be18bbb721257e140f6d334aff6143b1233fb8
diff --git a/x11-wm/mutter/mutter-3.38.3-r1.ebuild b/x11-wm/mutter/mutter-3.38.3-r1.ebuild
new file mode 100644
index 000000000000..9afc0daacf0a
--- /dev/null
+++ b/x11-wm/mutter/mutter-3.38.3-r1.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome.org gnome2-utils meson virtualx xdg
+
+DESCRIPTION="GNOME 3 compositing window manager based on Clutter"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/mutter/"
+SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${PF}-patchset.tar.xz"
+
+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 )
+"
+
+PATCHES=(
+	# origin/gnome-3-38@d881fcdece608
+	"${WORKDIR}"/patches
+)
+
+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/wmii/Manifest b/x11-wm/wmii/Manifest
index aab0fd0276e9..eeea6fa43557 100644
--- a/x11-wm/wmii/Manifest
+++ b/x11-wm/wmii/Manifest
@@ -1,4 +1,4 @@
 AUX wmii.desktop 106 BLAKE2B b92235ce6a4f21648baf326952bf7dd0cc9f76670b97a41316d9763889c91b64defa067c0b07a93c2547e477fdac29b4f4050cc9954210b98788ea34ad3eac54 SHA512 4c2ce08f692996c20f3f8d3d7884ac82644e8d1782b3895a0e75ecfe6c8ee9faf68a7621226d3cd9fb75cee0942d46cc55373dd74832508368a7c9760a18b143
 DIST wmii+ixp-3.9.2.tbz 432032 BLAKE2B 176b0cee20de3bac6eb23584650fc9beed793cfce1b2af9d47fc7be675da094d90670e8566b1dce264a8715711aa0d3cd207d9b8ef243bd48343fd5fe3c645f7 SHA512 c75d6d3f80e2b263c8d7b9eb6d0e700a1ad642209fc0984908e9399d22372c6c0572f47ab61881d5d56c4cc4eeb2914a545f6af1bbb936b65848764577d75761
-EBUILD wmii-3.9.2-r5.ebuild 1626 BLAKE2B e28350b06c1eb13953319bdb23383b73a15cd9a5ed700748158ec60d52619e127aad23bd12a0465f3686d346b6bb4e731ae7ddb96ca87c7d0c9a4b196cdb64aa SHA512 7a1294f37cf2f037f9fa3f21f68dcbbc5d9779150b62dcb8d99034142463f1a3cc9eb00c92526aa4ad1a293bf4f57b51a30e8e2298de3298af0200d997c0f817
+EBUILD wmii-3.9.2-r6.ebuild 1644 BLAKE2B 8d1aadc39751bc8e85d6745e57dc8c2342d7dea5b897357ef62fbd86c3669b5c0e1cac912f90865e0339cbc2b882828a6ce83ddc2478318496788ad4fcc722e4 SHA512 ad857a5e68236dc3d8669b21d9aac5d03ca52a442044a2a1a40c16fcb4f0d03d80a15cb1e3d9596c339990e4e28190da35f3c65d1320838194f87ba0c78ee00d
 MISC metadata.xml 594 BLAKE2B d801807fafe5de7450411e473648981388b862e019854ece2f037a92468847ea3c7117d72e1909cd6452b6f28157b10dae36454d162fd987388466558e31e5ba SHA512 edcd06fe65f52b946193e53d348431ff81917c25c6c5fb7f52be1a202a81b7b05a575449f6bc6cf288f6e2c68d4db240c262378e5133c5b1b2b091e7bdb96baa
diff --git a/x11-wm/wmii/wmii-3.9.2-r5.ebuild b/x11-wm/wmii/wmii-3.9.2-r6.ebuild
index ce878f3d1ccd..1199ba5c7cad 100644
--- a/x11-wm/wmii/wmii-3.9.2-r5.ebuild
+++ b/x11-wm/wmii/wmii-3.9.2-r6.ebuild
@@ -1,43 +1,34 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit flag-o-matic multilib toolchain-funcs
 
 MY_P="wmii+ixp-${PV}"
 
 DESCRIPTION="A dynamic window manager for X11"
-HOMEPAGE="http://wmii.suckless.org/"
+HOMEPAGE="https://github.com/0intro/wmii"
 SRC_URI="http://dl.suckless.org/wmii/${MY_P}.tbz"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE=""
 
-CDEPEND="
+DEPEND="
+	media-libs/freetype
 	>=sys-libs/libixp-0.5_p20110208-r3
-	x11-libs/libXft
 	x11-libs/libXext
+	x11-libs/libXft
+	x11-libs/libXinerama
 	x11-libs/libXrandr
 	x11-libs/libXrender
-	x11-libs/libX11
-	x11-libs/libXinerama
-	>=media-libs/freetype-2
-"
-
-RDEPEND="
-	${CDEPEND}
-	x11-apps/xmessage
-	x11-apps/xsetroot
+	x11-libs/libX11"
+RDEPEND="${DEPEND}
 	media-fonts/font-misc-misc
-"
-
-DEPEND="
-	${CDEPEND}
-	virtual/pkgconfig
-"
+	x11-apps/xmessage
+	x11-apps/xsetroot"
+BDEPEND="virtual/pkgconfig"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -61,13 +52,18 @@ src_prepare() {
 	)
 
 	# punt internal copy of sys-libs/libixp #323037
-	rm -f include/ixp{,_srvutil}.h || die
+	rm include/ixp{,_srvutil}.h || die
 	sed -i -e '/libixp/d' Makefile || die
 
 	sed -i -e "/BINSH \!=/d" mk/hdr.mk || die #335083
 	sed -i -e 's/-lXext/& -lXrender -lX11/' cmd/Makefile || die #369115
 }
 
+src_configure() {
+	append-flags -fcommon
+	default
+}
+
 src_compile() {
 	append-flags -I/usr/include/freetype2
 	emake "${mywmiiconf[@]}"
@@ -81,5 +77,5 @@ src_install() {
 	doexe "${T}/${PN}"
 
 	insinto /usr/share/xsessions
-	doins "${FILESDIR}/${PN}.desktop"
+	doins "${FILESDIR}"/${PN}.desktop
 }