gentoo resync : 29.12.2022

author: V3n3RiX <venerix@koprulu.sector> 2022-06-29 12:04:12 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2022-06-29 12:04:12 +0100
commit: 0f558761aa2dee1017b4751e4017205e015a9560 (patch)
tree: 037df795519468a25d9362b4e95cdaeb84eb1cf9 /metadata/md5-cache/x11-wm
parent: 752d6256e5204b958b0ef7905675a940b5e9172f (diff)
100 files changed, 345 insertions, 248 deletions
diff --git a/metadata/md5-cache/x11-wm/2bwm-0.3 b/metadata/md5-cache/x11-wm/2bwm-0.3
index 02a57c179d45..aafe9d3b2cf1 100644
--- a/metadata/md5-cache/x11-wm/2bwm-0.3
+++ b/metadata/md5-cache/x11-wm/2bwm-0.3
@@ -3,11 +3,12 @@ DEPEND=x11-libs/libxcb x11-libs/xcb-util-keysyms x11-libs/xcb-util-wm x11-libs/x
 DESCRIPTION=A fast, floating window manager
 EAPI=7
 HOMEPAGE=https://github.com/venam/2bwm
+INHERIT=savedconfig toolchain-funcs
 IUSE=savedconfig
 KEYWORDS=~amd64
 LICENSE=ISC
 RDEPEND=x11-libs/libxcb x11-libs/xcb-util-keysyms x11-libs/xcb-util-wm x11-libs/xcb-util-xrm
 SLOT=0
 SRC_URI=https://github.com/venam/2bwm/archive/v0.3.tar.gz -> 2bwm-0.3.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	portability	d33a77692bb47e8227f27e17fb9c3c05	savedconfig	7cb1bf66b4acedc4f06802a012d3b08d	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	portability	d33a77692bb47e8227f27e17fb9c3c05	savedconfig	7cb1bf66b4acedc4f06802a012d3b08d	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=4dfb268671f29e1bf75bb56d5559189a
diff --git a/metadata/md5-cache/x11-wm/2bwm-9999 b/metadata/md5-cache/x11-wm/2bwm-9999
index 9f6f2fd7757f..db423ea4ab2f 100644
--- a/metadata/md5-cache/x11-wm/2bwm-9999
+++ b/metadata/md5-cache/x11-wm/2bwm-9999
@@ -4,10 +4,11 @@ DEPEND=x11-libs/libxcb x11-libs/xcb-util-keysyms x11-libs/xcb-util-wm x11-libs/x
 DESCRIPTION=A fast, floating window manager
 EAPI=7
 HOMEPAGE=https://github.com/venam/2bwm
+INHERIT=savedconfig toolchain-funcs git-r3
 IUSE=savedconfig
 LICENSE=ISC
 PROPERTIES=live
 RDEPEND=x11-libs/libxcb x11-libs/xcb-util-keysyms x11-libs/xcb-util-wm x11-libs/xcb-util-xrm
 SLOT=0
-_eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	portability	d33a77692bb47e8227f27e17fb9c3c05	savedconfig	7cb1bf66b4acedc4f06802a012d3b08d	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4fbbbc98f236f1b43acd99476bc3cd85	portability	d33a77692bb47e8227f27e17fb9c3c05	savedconfig	7cb1bf66b4acedc4f06802a012d3b08d	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=4dfb268671f29e1bf75bb56d5559189a
diff --git a/metadata/md5-cache/x11-wm/Manifest.gz b/metadata/md5-cache/x11-wm/Manifest.gz
index a45e704e57aa..cca487dfed25 100644
--- a/metadata/md5-cache/x11-wm/Manifest.gz
+++ b/metadata/md5-cache/x11-wm/Manifest.gz
diff --git a/metadata/md5-cache/x11-wm/aewm++-1.1.5-r2 b/metadata/md5-cache/x11-wm/aewm++-1.1.5-r2
index 45312be830c6..81523d0ec4de 100644
--- a/metadata/md5-cache/x11-wm/aewm++-1.1.5-r2
+++ b/metadata/md5-cache/x11-wm/aewm++-1.1.5-r2
@@ -3,10 +3,11 @@ DEPEND=x11-libs/libX11 x11-libs/libXext x11-base/xorg-proto
 DESCRIPTION=A window manager with more modern features than aewm
 EAPI=6
 HOMEPAGE=https://github.com/frankhale/aewmpp
+INHERIT=toolchain-funcs
 KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/libXext
 SLOT=0
 SRC_URI=mirror://gentoo/aewm++-1.1.5.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=4c554bedca9e6e2be3b2599acfd85f0d
diff --git a/metadata/md5-cache/x11-wm/aewm-1.3.12-r1 b/metadata/md5-cache/x11-wm/aewm-1.3.12-r1
index b33846364c15..74b662fc1652 100644
--- a/metadata/md5-cache/x11-wm/aewm-1.3.12-r1
+++ b/metadata/md5-cache/x11-wm/aewm-1.3.12-r1
@@ -3,10 +3,11 @@ DEPEND=dev-libs/glib:2 x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs
 DESCRIPTION=A minimalistic X11 window manager
 EAPI=7
 HOMEPAGE=https://www.red-bean.com/decklin/aewm/
+INHERIT=toolchain-funcs
 KEYWORDS=amd64 ppc x86
 LICENSE=MIT 9wm
 RDEPEND=dev-libs/glib:2 x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXft
 SLOT=0
 SRC_URI=https://www.red-bean.com/decklin/aewm/aewm-1.3.12.tar.bz2
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=f2c7b2fa7af36b34a4b2340e15cf4a59
diff --git a/metadata/md5-cache/x11-wm/amiwm-0.22.01_p20200826 b/metadata/md5-cache/x11-wm/amiwm-0.22.01_p20200826
index 3f7075857deb..d4d0eed2df4a 100644
--- a/metadata/md5-cache/x11-wm/amiwm-0.22.01_p20200826
+++ b/metadata/md5-cache/x11-wm/amiwm-0.22.01_p20200826
@@ -4,10 +4,11 @@ DEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXext x11-base/xorg-proto
 DESCRIPTION=Amiga Workbench inspired window manager for Xorg
 EAPI=7
 HOMEPAGE=https://github.com/redsPL/amiwm
+INHERIT=autotools
 KEYWORDS=~amd64 ~m68k ~ppc ~x86
 LICENSE=amiwm
 RDEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXext media-fonts/font-misc-misc[nls,X] x11-apps/xrdb x11-apps/xsetroot
 SLOT=0
 SRC_URI=https://github.com/chewi/amiwm/archive/8b8c956a904fa73edb02d4dc6d45bc0358bff3b3.tar.gz -> amiwm-0.22.01_p20200826.tar.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=c1022d554fdc4ad03c78d4066cb874dc
diff --git a/metadata/md5-cache/x11-wm/awesome-4.3-r101 b/metadata/md5-cache/x11-wm/awesome-4.3-r101
index dccd646e6404..2d248d8bf9b2 100644
--- a/metadata/md5-cache/x11-wm/awesome-4.3-r101
+++ b/metadata/md5-cache/x11-wm/awesome-4.3-r101
@@ -1,4 +1,4 @@
-BDEPEND=app-text/asciidoc media-gfx/imagemagick[png] virtual/pkgconfig doc? ( >=dev-lua/ldoc-1.4.6-r100 ) test? ( app-shells/zsh ) dev-util/ninja >=dev-util/cmake-3.20.5
+BDEPEND=app-text/asciidoc media-gfx/imagemagick[png] virtual/pkgconfig doc? ( >=dev-lua/ldoc-1.4.6-r100 ) test? ( app-shells/zsh ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst prepare setup test
 DEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) dev-libs/glib:2 dev-libs/libxdg-basedir lua_single_target_luajit? ( dev-lua/lgi[lua_targets_luajit(-)] ) lua_single_target_lua5-1? ( dev-lua/lgi[lua_targets_lua5-1(-)] ) lua_single_target_lua5-3? ( dev-lua/lgi[lua_targets_lua5-3(-)] ) x11-libs/cairo[X,xcb(+)] x11-libs/gdk-pixbuf:2 x11-libs/libxcb[xkb] x11-libs/pango[introspection] x11-libs/startup-notification x11-libs/xcb-util x11-libs/xcb-util-cursor x11-libs/xcb-util-keysyms x11-libs/xcb-util-wm x11-libs/xcb-util-xrm x11-libs/libXcursor x11-libs/libxkbcommon[X] x11-libs/libX11 dbus? ( sys-apps/dbus ) x11-base/xcb-proto x11-base/xorg-proto test? ( x11-base/xorg-server[xvfb] lua_single_target_luajit? ( dev-lua/busted[lua_targets_luajit(-)] dev-lua/luacheck[lua_targets_luajit(-)] ) lua_single_target_lua5-1? ( dev-lua/busted[lua_targets_lua5-1(-)] dev-lua/luacheck[lua_targets_lua5-1(-)] ) lua_single_target_lua5-3? ( dev-lua/busted[lua_targets_lua5-3(-)] dev-lua/luacheck[lua_targets_lua5-3(-)] ) )
 DESCRIPTION=A dynamic floating and tiling window manager
@@ -13,5 +13,5 @@ REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_t
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/awesomeWM/awesome-releases/raw/master/awesome-4.3.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	pax-utils	91d47e5d20627c717aa878b9167c62a8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	pax-utils	91d47e5d20627c717aa878b9167c62a8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=d306999b048d1d6648d9bdbf0adaa4e8
diff --git a/metadata/md5-cache/x11-wm/awesome-9999 b/metadata/md5-cache/x11-wm/awesome-9999
index d80749aa71da..6a971d9b3a31 100644
--- a/metadata/md5-cache/x11-wm/awesome-9999
+++ b/metadata/md5-cache/x11-wm/awesome-9999
@@ -1,16 +1,16 @@
-BDEPEND=app-text/asciidoc media-gfx/imagemagick[png] virtual/pkgconfig doc? ( >=dev-lua/ldoc-1.4.6-r100 ) test? ( app-shells/zsh ) dev-util/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=app-text/asciidoc media-gfx/imagemagick[png] virtual/pkgconfig doc? ( >=dev-lua/ldoc-1.4.6-r100 ) test? ( app-shells/zsh x11-apps/xeyes ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) dev-libs/glib:2 dev-libs/libxdg-basedir lua_single_target_luajit? ( dev-lua/lgi[lua_targets_luajit(-)] ) lua_single_target_lua5-1? ( dev-lua/lgi[lua_targets_lua5-1(-)] ) lua_single_target_lua5-3? ( dev-lua/lgi[lua_targets_lua5-3(-)] ) x11-libs/cairo[X,xcb(+)] x11-libs/gdk-pixbuf:2 x11-libs/libxcb[xkb] x11-libs/pango[introspection] x11-libs/startup-notification x11-libs/xcb-util x11-libs/xcb-util-cursor x11-libs/xcb-util-keysyms x11-libs/xcb-util-wm x11-libs/xcb-util-xrm x11-libs/libXcursor x11-libs/libxkbcommon[X] x11-libs/libX11 dbus? ( sys-apps/dbus ) x11-base/xcb-proto x11-base/xorg-proto test? ( x11-base/xorg-server[xvfb] lua_single_target_luajit? ( dev-lua/busted[lua_targets_luajit(-)] dev-lua/luacheck[lua_targets_luajit(-)] ) lua_single_target_lua5-1? ( dev-lua/busted[lua_targets_lua5-1(-)] dev-lua/luacheck[lua_targets_lua5-1(-)] ) lua_single_target_lua5-3? ( dev-lua/busted[lua_targets_lua5-3(-)] dev-lua/luacheck[lua_targets_lua5-3(-)] ) )
+DEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) dev-libs/glib:2 dev-libs/libxdg-basedir lua_single_target_luajit? ( dev-lua/lgi[lua_targets_luajit(-)] ) lua_single_target_lua5-1? ( dev-lua/lgi[lua_targets_lua5-1(-)] ) lua_single_target_lua5-3? ( dev-lua/lgi[lua_targets_lua5-3(-)] ) lua_single_target_lua5-4? ( dev-lua/lgi[lua_targets_lua5-4(-)] ) x11-libs/cairo[X,xcb(+)] x11-libs/gdk-pixbuf:2 x11-libs/libxcb[xkb] x11-libs/pango[introspection] x11-libs/startup-notification x11-libs/xcb-util x11-libs/xcb-util-cursor x11-libs/xcb-util-keysyms x11-libs/xcb-util-wm x11-libs/xcb-util-xrm x11-libs/libXcursor x11-libs/libxkbcommon[X] x11-libs/libX11 dbus? ( sys-apps/dbus ) x11-base/xcb-proto x11-base/xorg-proto test? ( x11-base/xorg-server[xvfb] lua_single_target_luajit? ( dev-lua/busted[lua_targets_luajit(-)] dev-lua/luacheck[lua_targets_luajit(-)] ) lua_single_target_lua5-1? ( dev-lua/busted[lua_targets_lua5-1(-)] dev-lua/luacheck[lua_targets_lua5-1(-)] ) lua_single_target_lua5-3? ( dev-lua/busted[lua_targets_lua5-3(-)] dev-lua/luacheck[lua_targets_lua5-3(-)] ) lua_single_target_lua5-4? ( dev-lua/busted[lua_targets_lua5-4(-)] dev-lua/luacheck[lua_targets_lua5-4(-)] ) )
 DESCRIPTION=A dynamic floating and tiling window manager
-EAPI=7
+EAPI=8
 HOMEPAGE=https://awesomewm.org/
 INHERIT=cmake desktop lua-single pax-utils git-r3
-IUSE=dbus doc gnome test lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3
+IUSE=dbus doc gnome test lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) dev-libs/glib:2 dev-libs/libxdg-basedir lua_single_target_luajit? ( dev-lua/lgi[lua_targets_luajit(-)] ) lua_single_target_lua5-1? ( dev-lua/lgi[lua_targets_lua5-1(-)] ) lua_single_target_lua5-3? ( dev-lua/lgi[lua_targets_lua5-3(-)] ) x11-libs/cairo[X,xcb(+)] x11-libs/gdk-pixbuf:2 x11-libs/libxcb[xkb] x11-libs/pango[introspection] x11-libs/startup-notification x11-libs/xcb-util x11-libs/xcb-util-cursor x11-libs/xcb-util-keysyms x11-libs/xcb-util-wm x11-libs/xcb-util-xrm x11-libs/libXcursor x11-libs/libxkbcommon[X] x11-libs/libX11 dbus? ( sys-apps/dbus )
-REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3 )
+RDEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) dev-libs/glib:2 dev-libs/libxdg-basedir lua_single_target_luajit? ( dev-lua/lgi[lua_targets_luajit(-)] ) lua_single_target_lua5-1? ( dev-lua/lgi[lua_targets_lua5-1(-)] ) lua_single_target_lua5-3? ( dev-lua/lgi[lua_targets_lua5-3(-)] ) lua_single_target_lua5-4? ( dev-lua/lgi[lua_targets_lua5-4(-)] ) x11-libs/cairo[X,xcb(+)] x11-libs/gdk-pixbuf:2 x11-libs/libxcb[xkb] x11-libs/pango[introspection] x11-libs/startup-notification x11-libs/xcb-util x11-libs/xcb-util-cursor x11-libs/xcb-util-keysyms x11-libs/xcb-util-wm x11-libs/xcb-util-xrm x11-libs/libXcursor x11-libs/libxkbcommon[X] x11-libs/libX11 dbus? ( sys-apps/dbus )
+REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 )
 RESTRICT=test
 SLOT=0
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	pax-utils	91d47e5d20627c717aa878b9167c62a8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=8c1d7fbed03f318ace65f9bf8dce94bd
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	desktop	22952d8f27cac191d75529d4c38e6bfa	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=0898ac5f98d28da5c2a975e89d985a32
diff --git a/metadata/md5-cache/x11-wm/blackbox-0.77 b/metadata/md5-cache/x11-wm/blackbox-0.77
index 469003f96108..6bfa32fec380 100644
--- a/metadata/md5-cache/x11-wm/blackbox-0.77
+++ b/metadata/md5-cache/x11-wm/blackbox-0.77
@@ -4,11 +4,12 @@ DEPEND=x11-libs/libXft x11-libs/libXt x11-libs/libX11 nls? ( >=sys-devel/gettext
 DESCRIPTION=A small, fast, full-featured window manager for X
 EAPI=7
 HOMEPAGE=https://github.com/bbidulock/blackboxwm
+INHERIT=autotools
 IUSE=debug nls static-libs truetype
 KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~m68k ppc ppc64 ~riscv sparc x86
 LICENSE=MIT
 RDEPEND=x11-libs/libXft x11-libs/libXt x11-libs/libX11 nls? ( >=sys-devel/gettext-0.20 ) truetype? ( media-libs/freetype )
 SLOT=0
 SRC_URI=https://github.com/bbidulock/blackboxwm/archive/0.77.tar.gz -> blackbox-0.77.tar.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=1f0ff3713158199c85e4cfaacf428de0
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=b38bb2217b854463039ec12bce2bd153
diff --git a/metadata/md5-cache/x11-wm/bspwm-0.9.10 b/metadata/md5-cache/x11-wm/bspwm-0.9.10
index 9ea8f40062e3..75cec8e883c3 100644
--- a/metadata/md5-cache/x11-wm/bspwm-0.9.10
+++ b/metadata/md5-cache/x11-wm/bspwm-0.9.10
@@ -3,11 +3,12 @@ DEPEND=x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-wm
 DESCRIPTION=Tiling window manager based on binary space partitioning
 EAPI=7
 HOMEPAGE=https://github.com/baskerville/bspwm/
+INHERIT=toolchain-funcs
 IUSE=examples
 KEYWORDS=amd64 ~riscv ~x86
 LICENSE=BSD-2
 RDEPEND=x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-wm x11-misc/sxhkd
 SLOT=0
 SRC_URI=https://github.com/baskerville/bspwm/archive/0.9.10.tar.gz -> bspwm-0.9.10.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=a7f325cc9cfe6c541b0203de6ea1d9c4
diff --git a/metadata/md5-cache/x11-wm/ctwm-4.0.3 b/metadata/md5-cache/x11-wm/ctwm-4.0.3
index cbee5003f7aa..d2ed1807db96 100644
--- a/metadata/md5-cache/x11-wm/ctwm-4.0.3
+++ b/metadata/md5-cache/x11-wm/ctwm-4.0.3
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXt jpeg? ( virtual/jpeg ) rplay? ( media-sound/rplay ) xpm? ( x11-libs/libXpm ) app-arch/xz-utils x11-base/xorg-proto
 DESCRIPTION=A clean, light window manager
@@ -12,5 +12,5 @@ RDEPEND=x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://ctwm.org/dist/ctwm-4.0.3.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=83a480adca5c5d9a0651368431b5ac2c
diff --git a/metadata/md5-cache/x11-wm/cwm-6.7 b/metadata/md5-cache/x11-wm/cwm-6.7
index 65830fe3c15c..be31455e28ee 100644
--- a/metadata/md5-cache/x11-wm/cwm-6.7
+++ b/metadata/md5-cache/x11-wm/cwm-6.7
@@ -4,10 +4,11 @@ DEPEND=x11-libs/libXft x11-libs/libXinerama x11-libs/libXrandr
 DESCRIPTION=OpenBSD fork of calmwm, a clean and lightweight window manager
 EAPI=7
 HOMEPAGE=https://github.com/leahneukirchen/cwm https://www.openbsd.org/cgi-bin/cvsweb/xenocara/app/cwm/
+INHERIT=desktop toolchain-funcs
 KEYWORDS=amd64 arm ~arm64 x86
 LICENSE=ISC
 RDEPEND=x11-libs/libXft x11-libs/libXinerama x11-libs/libXrandr
 SLOT=0
 SRC_URI=https://github.com/leahneukirchen/cwm/archive/v6.7.tar.gz -> cwm-6.7.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=8266e9a225c3538c234f0a63f8029d7a
diff --git a/metadata/md5-cache/x11-wm/cwm-7.1 b/metadata/md5-cache/x11-wm/cwm-7.1
new file mode 100644
index 000000000000..c43cc621d7bc
--- /dev/null
+++ b/metadata/md5-cache/x11-wm/cwm-7.1
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/bison virtual/pkgconfig
+DEFINED_PHASES=compile install
+DEPEND=x11-libs/libX11 x11-libs/libXft x11-libs/libXrandr
+DESCRIPTION=OpenBSD fork of calmwm, a clean and lightweight window manager
+EAPI=8
+HOMEPAGE=https://github.com/leahneukirchen/cwm https://www.openbsd.org/cgi-bin/cvsweb/xenocara/app/cwm/
+INHERIT=desktop toolchain-funcs
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=ISC
+RDEPEND=x11-libs/libX11 x11-libs/libXft x11-libs/libXrandr
+SLOT=0
+SRC_URI=https://github.com/leahneukirchen/cwm/archive/v7.1.tar.gz -> cwm-7.1.tar.gz
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=1aa70dd648b9592a684da3d1a5766831
diff --git a/metadata/md5-cache/x11-wm/cwm-9999 b/metadata/md5-cache/x11-wm/cwm-9999
index 3ceac5a94bdb..2d26264cb010 100644
--- a/metadata/md5-cache/x11-wm/cwm-9999
+++ b/metadata/md5-cache/x11-wm/cwm-9999
@@ -1,12 +1,13 @@
 BDEPEND=sys-devel/bison virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile install unpack
-DEPEND=x11-libs/libXft x11-libs/libXinerama x11-libs/libXrandr
+DEPEND=x11-libs/libX11 x11-libs/libXft x11-libs/libXrandr
 DESCRIPTION=OpenBSD fork of calmwm, a clean and lightweight window manager
-EAPI=7
+EAPI=8
 HOMEPAGE=https://github.com/leahneukirchen/cwm https://www.openbsd.org/cgi-bin/cvsweb/xenocara/app/cwm/
+INHERIT=desktop toolchain-funcs git-r3
 LICENSE=ISC
 PROPERTIES=live
-RDEPEND=x11-libs/libXft x11-libs/libXinerama x11-libs/libXrandr
+RDEPEND=x11-libs/libX11 x11-libs/libXft x11-libs/libXrandr
 SLOT=0
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=3a9fae011137eec18d59807450b0727a
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=1aa70dd648b9592a684da3d1a5766831
diff --git a/metadata/md5-cache/x11-wm/dwm-6.2 b/metadata/md5-cache/x11-wm/dwm-6.2
index a1470711f8b1..5ab9ba039910 100644
--- a/metadata/md5-cache/x11-wm/dwm-6.2
+++ b/metadata/md5-cache/x11-wm/dwm-6.2
@@ -3,11 +3,12 @@ DEPEND=media-libs/fontconfig x11-libs/libX11 x11-libs/libXft xinerama? ( x11-lib
 DESCRIPTION=a dynamic window manager for X11
 EAPI=7
 HOMEPAGE=https://dwm.suckless.org/
+INHERIT=savedconfig toolchain-funcs
 IUSE=xinerama savedconfig
 KEYWORDS=amd64 ~arm arm64 ppc ppc64 ~riscv x86
 LICENSE=MIT
 RDEPEND=media-libs/fontconfig x11-libs/libX11 x11-libs/libXft xinerama? ( x11-libs/libXinerama )
 SLOT=0
 SRC_URI=https://dl.suckless.org/dwm/dwm-6.2.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	portability	d33a77692bb47e8227f27e17fb9c3c05	savedconfig	7cb1bf66b4acedc4f06802a012d3b08d	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	portability	d33a77692bb47e8227f27e17fb9c3c05	savedconfig	7cb1bf66b4acedc4f06802a012d3b08d	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=0d47fbaf25aaeaf6fa671c56d0e1b771
diff --git a/metadata/md5-cache/x11-wm/dwm-6.3 b/metadata/md5-cache/x11-wm/dwm-6.3
index 2b04b039dfd9..f7fc9a0f3702 100644
--- a/metadata/md5-cache/x11-wm/dwm-6.3
+++ b/metadata/md5-cache/x11-wm/dwm-6.3
@@ -3,11 +3,12 @@ DEPEND=media-libs/fontconfig x11-libs/libX11 x11-libs/libXft xinerama? ( x11-lib
 DESCRIPTION=a dynamic window manager for X11
 EAPI=7
 HOMEPAGE=https://dwm.suckless.org/
+INHERIT=savedconfig toolchain-funcs
 IUSE=xinerama savedconfig
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=media-libs/fontconfig x11-libs/libX11 x11-libs/libXft xinerama? ( x11-libs/libXinerama )
 SLOT=0
 SRC_URI=https://dl.suckless.org/dwm/dwm-6.3.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	portability	d33a77692bb47e8227f27e17fb9c3c05	savedconfig	7cb1bf66b4acedc4f06802a012d3b08d	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	portability	d33a77692bb47e8227f27e17fb9c3c05	savedconfig	7cb1bf66b4acedc4f06802a012d3b08d	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=f74b36098c5074cab9b3c35b7900e231
diff --git a/metadata/md5-cache/x11-wm/dwm-9999 b/metadata/md5-cache/x11-wm/dwm-9999
index 2c946918daf5..0f485f3c8044 100644
--- a/metadata/md5-cache/x11-wm/dwm-9999
+++ b/metadata/md5-cache/x11-wm/dwm-9999
@@ -4,10 +4,11 @@ DEPEND=media-libs/fontconfig x11-libs/libX11 x11-libs/libXft xinerama? ( x11-lib
 DESCRIPTION=a dynamic window manager for X11
 EAPI=7
 HOMEPAGE=https://dwm.suckless.org/
+INHERIT=savedconfig toolchain-funcs git-r3
 IUSE=xinerama savedconfig
 LICENSE=MIT
 PROPERTIES=live
 RDEPEND=media-libs/fontconfig x11-libs/libX11 x11-libs/libXft xinerama? ( x11-libs/libXinerama )
 SLOT=0
-_eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	portability	d33a77692bb47e8227f27e17fb9c3c05	savedconfig	7cb1bf66b4acedc4f06802a012d3b08d	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4fbbbc98f236f1b43acd99476bc3cd85	portability	d33a77692bb47e8227f27e17fb9c3c05	savedconfig	7cb1bf66b4acedc4f06802a012d3b08d	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=f74b36098c5074cab9b3c35b7900e231
diff --git a/metadata/md5-cache/x11-wm/echinus-0.4.9 b/metadata/md5-cache/x11-wm/echinus-0.4.9
index c0d8b9296ef2..7d8faeaa1282 100644
--- a/metadata/md5-cache/x11-wm/echinus-0.4.9
+++ b/metadata/md5-cache/x11-wm/echinus-0.4.9
@@ -4,11 +4,12 @@ DEPEND=x11-libs/libX11 x11-libs/libXft xrandr? ( x11-libs/libXrandr )
 DESCRIPTION=A window manager for X in the spirit of dwm
 EAPI=7
 HOMEPAGE=https://plhk.ru/
+INHERIT=toolchain-funcs
 IUSE=xrandr
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXft xrandr? ( x11-libs/libXrandr )
 SLOT=0
 SRC_URI=https://plhk.ru/static/echinus/echinus-0.4.9.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=bb8d32f2055e58e50cebc043e2441d65
diff --git a/metadata/md5-cache/x11-wm/enlightenment-0.24.2-r2 b/metadata/md5-cache/x11-wm/enlightenment-0.24.2-r2
index 629d08c471f5..20516f8ec323 100644
--- a/metadata/md5-cache/x11-wm/enlightenment-0.24.2-r2
+++ b/metadata/md5-cache/x11-wm/enlightenment-0.24.2-r2
@@ -12,5 +12,5 @@ RDEPEND=>=dev-libs/efl-1.24.1[eet,fontconfig,X] virtual/udev x11-libs/libXext x1
 REQUIRED_USE=xwayland? ( wayland )
 SLOT=0.17/0.24.2
 SRC_URI=https://download.enlightenment.org/rel/apps/enlightenment/enlightenment-0.24.2.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=dd023f879ffae86eb9c50b2a3e0494f6
diff --git a/metadata/md5-cache/x11-wm/enlightenment-0.25.3 b/metadata/md5-cache/x11-wm/enlightenment-0.25.3
index fbeb4a2a5847..bce4ddb0bb2f 100644
--- a/metadata/md5-cache/x11-wm/enlightenment-0.25.3
+++ b/metadata/md5-cache/x11-wm/enlightenment-0.25.3
@@ -12,5 +12,5 @@ RDEPEND=>=dev-libs/efl-1.26.1[eet,fontconfig,X] virtual/udev x11-libs/libXext x1
 REQUIRED_USE=xwayland? ( wayland )
 SLOT=0.17/0.25.3
 SRC_URI=https://download.enlightenment.org/rel/apps/enlightenment/enlightenment-0.25.3.tar.xz
-_eclasses_=meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=cb630b34bbed865f5b0c60975f03a028
diff --git a/metadata/md5-cache/x11-wm/evilwm-1.0.1-r1 b/metadata/md5-cache/x11-wm/evilwm-1.0.1-r1
index c156a475f845..dfe62329aace 100644
--- a/metadata/md5-cache/x11-wm/evilwm-1.0.1-r1
+++ b/metadata/md5-cache/x11-wm/evilwm-1.0.1-r1
@@ -3,10 +3,11 @@ DEPEND=x11-libs/libXext x11-libs/libXrandr x11-base/xorg-proto
 DESCRIPTION=A minimalist, no frills window manager for X
 EAPI=6
 HOMEPAGE=http://www.6809.org.uk/evilwm/
+INHERIT=desktop toolchain-funcs
 KEYWORDS=~alpha amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc64-solaris
 LICENSE=MIT 9wm
 RDEPEND=x11-libs/libXext x11-libs/libXrandr
 SLOT=0
 SRC_URI=http://www.6809.org.uk/evilwm/evilwm-1.0.1.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=a4b4276521df67d34ea927691fb2bbd4
diff --git a/metadata/md5-cache/x11-wm/evilwm-1.1.1 b/metadata/md5-cache/x11-wm/evilwm-1.1.1
index 0d22abbfb44b..53956f6a58f8 100644
--- a/metadata/md5-cache/x11-wm/evilwm-1.1.1
+++ b/metadata/md5-cache/x11-wm/evilwm-1.1.1
@@ -3,10 +3,11 @@ DEPEND=x11-libs/libXext x11-libs/libXrandr x11-libs/libX11 x11-base/xorg-proto
 DESCRIPTION=A minimalist, no frills window manager for X
 EAPI=6
 HOMEPAGE=http://www.6809.org.uk/evilwm/
+INHERIT=desktop toolchain-funcs
 KEYWORDS=~alpha ~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc64-solaris
 LICENSE=MIT 9wm
 RDEPEND=x11-libs/libXext x11-libs/libXrandr x11-libs/libX11
 SLOT=0
 SRC_URI=http://www.6809.org.uk/evilwm/evilwm-1.1.1.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=86c96e8546f84c0b478191f4096c4547
diff --git a/metadata/md5-cache/x11-wm/evilwm-1.3.1 b/metadata/md5-cache/x11-wm/evilwm-1.3.1
index b20de01b8e7b..f9e0cb51f867 100644
--- a/metadata/md5-cache/x11-wm/evilwm-1.3.1
+++ b/metadata/md5-cache/x11-wm/evilwm-1.3.1
@@ -3,10 +3,11 @@ DEPEND=x11-libs/libXext x11-libs/libXrandr x11-libs/libX11 x11-base/xorg-proto
 DESCRIPTION=A minimalist, no frills window manager for X
 EAPI=8
 HOMEPAGE=http://www.6809.org.uk/evilwm/
+INHERIT=desktop toolchain-funcs
 KEYWORDS=~alpha amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc64-solaris
 LICENSE=MIT 9wm
 RDEPEND=x11-libs/libXext x11-libs/libXrandr x11-libs/libX11
 SLOT=0
 SRC_URI=http://www.6809.org.uk/evilwm/evilwm-1.3.1.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=15be19223eaf048ec386060ef209ac05
diff --git a/metadata/md5-cache/x11-wm/fluxbox-1.3.7-r4 b/metadata/md5-cache/x11-wm/fluxbox-1.3.7-r4
index 775a11571b56..e490010282bd 100644
--- a/metadata/md5-cache/x11-wm/fluxbox-1.3.7-r4
+++ b/metadata/md5-cache/x11-wm/fluxbox-1.3.7-r4
@@ -4,6 +4,7 @@ DEPEND=bidi? ( >=dev-libs/fribidi-0.19.2 ) imlib? ( >=media-libs/imlib2-1.2.0[X]
 DESCRIPTION=X11 window manager featuring tabs and an iconbar
 EAPI=7
 HOMEPAGE=http://www.fluxbox.org
+INHERIT=flag-o-matic toolchain-funcs prefix xdg
 IUSE=nls xinerama bidi +truetype +imlib +slit +systray +toolbar vim-syntax
 KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
@@ -11,5 +12,5 @@ RDEPEND=bidi? ( >=dev-libs/fribidi-0.19.2 ) imlib? ( >=media-libs/imlib2-1.2.0[X
 REQUIRED_USE=systray? ( toolbar )
 SLOT=0
 SRC_URI=mirror://sourceforge/fluxbox/fluxbox-1.3.7.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=a21bf5d68f8a4a9ccdeb297fa5770454
diff --git a/metadata/md5-cache/x11-wm/fvwm-2.6.9 b/metadata/md5-cache/x11-wm/fvwm-2.6.9
index ea7ccbdb4d01..2feefda8fb9f 100644
--- a/metadata/md5-cache/x11-wm/fvwm-2.6.9
+++ b/metadata/md5-cache/x11-wm/fvwm-2.6.9
@@ -4,11 +4,12 @@ DEPEND=sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/lib
 DESCRIPTION=An extremely powerful ICCCM-compliant multiple virtual desktop window manager
 EAPI=7
 HOMEPAGE=https://www.fvwm.org/
+INHERIT=autotools flag-o-matic desktop
 IUSE=bidi debug doc netpbm nls perl png readline rplay stroke svg tk truetype +vanilla xinerama lock
 KEYWORDS=~alpha amd64 ~arm ~ia64 ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=GPL-2+ FVWM
 RDEPEND=sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXcursor x11-libs/libXdmcp x11-libs/libXext x11-libs/libXfixes x11-libs/libXpm x11-libs/libXrandr x11-libs/libXrender virtual/libiconv bidi? ( dev-libs/fribidi ) nls? ( virtual/libintl ) png? ( media-libs/libpng:0= ) readline? ( sys-libs/ncurses:0= sys-libs/readline:0= ) stroke? ( dev-libs/libstroke ) svg? ( gnome-base/librsvg ) truetype? ( media-libs/fontconfig x11-libs/libXft ) xinerama? ( x11-libs/libXinerama ) dev-lang/perl sys-apps/debianutils perl? ( tk? ( dev-lang/tk dev-perl/Tk >=dev-perl/X11-Protocol-0.56 ) ) rplay? ( media-sound/rplay ) lock? ( x11-misc/xlockmore ) netpbm? ( media-libs/netpbm )
 SLOT=0
 SRC_URI=https://github.com/fvwmorg/fvwm/releases/download/2.6.9/fvwm-2.6.9.tar.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=1c87d9596698d48abcd9e943611e5cb6
diff --git a/metadata/md5-cache/x11-wm/fvwm3-1.0.4-r2 b/metadata/md5-cache/x11-wm/fvwm3-1.0.4-r2
new file mode 100644
index 000000000000..498fb6c54f72
--- /dev/null
+++ b/metadata/md5-cache/x11-wm/fvwm3-1.0.4-r2
@@ -0,0 +1,17 @@
+BDEPEND=virtual/pkgconfig doc? ( dev-libs/libxslt dev-ruby/asciidoctor ) app-arch/unzip go? ( >=dev-lang/go-1.14 ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=x11-base/xorg-proto
+DESCRIPTION=A multiple large virtual desktop window manager derived from fvwm
+EAPI=8
+HOMEPAGE=http://www.fvwm.org/
+INHERIT=autotools desktop flag-o-matic go-module python-single-r1 toolchain-funcs
+IUSE=bidi debug doc go netpbm nls perl readline rplay stroke svg tk vanilla lock python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~amd64 ~riscv
+LICENSE=GPL-2+ FVWM go? ( Apache-2.0 BSD MIT )
+RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) !x11-wm/fvwm dev-lang/perl dev-libs/glib:2 dev-libs/libevent:= media-libs/fontconfig media-libs/libpng:= sys-apps/debianutils sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXcursor x11-libs/libXdmcp x11-libs/libXext x11-libs/libXfixes x11-libs/libXft x11-libs/libXpm x11-libs/libXrandr x11-libs/libXrender bidi? ( dev-libs/fribidi ) lock? ( x11-misc/xlockmore ) netpbm? ( media-libs/netpbm ) perl? ( tk? ( dev-lang/tk dev-perl/Tk >=dev-perl/X11-Protocol-0.56 ) ) readline? ( sys-libs/ncurses:= sys-libs/readline:= ) rplay? ( media-sound/rplay ) stroke? ( dev-libs/libstroke ) svg? ( gnome-base/librsvg:2 x11-libs/cairo )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/fvwmorg/fvwm3/releases/download/1.0.4/fvwm3-1.0.4.tar.gz
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	desktop	22952d8f27cac191d75529d4c38e6bfa	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	go-module	a13d34fe4e2996720e1ca6c53b9ea95a	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=6d10db4fd91ebbc1a057e74ed6857d6a
diff --git a/metadata/md5-cache/x11-wm/fvwm3-9999 b/metadata/md5-cache/x11-wm/fvwm3-9999
new file mode 100644
index 000000000000..e59f0b77d181
--- /dev/null
+++ b/metadata/md5-cache/x11-wm/fvwm3-9999
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig doc? ( dev-libs/libxslt dev-ruby/asciidoctor ) app-arch/unzip go? ( >=dev-lang/go-1.14 ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile configure install postinst prepare setup unpack
+DEPEND=x11-base/xorg-proto
+DESCRIPTION=A multiple large virtual desktop window manager derived from fvwm
+EAPI=8
+HOMEPAGE=http://www.fvwm.org/
+INHERIT=autotools desktop flag-o-matic go-module python-single-r1 toolchain-funcs git-r3
+IUSE=bidi debug doc go netpbm nls perl readline rplay stroke svg tk vanilla lock python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
+LICENSE=GPL-2+ FVWM go? ( Apache-2.0 BSD MIT )
+PROPERTIES=live
+RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) !x11-wm/fvwm dev-lang/perl dev-libs/glib:2 dev-libs/libevent:= media-libs/fontconfig media-libs/libpng:= sys-apps/debianutils sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXcursor x11-libs/libXdmcp x11-libs/libXext x11-libs/libXfixes x11-libs/libXft x11-libs/libXpm x11-libs/libXrandr x11-libs/libXrender bidi? ( dev-libs/fribidi ) lock? ( x11-misc/xlockmore ) netpbm? ( media-libs/netpbm ) perl? ( tk? ( dev-lang/tk dev-perl/Tk >=dev-perl/X11-Protocol-0.56 ) ) media-libs/libpng:= readline? ( sys-libs/ncurses:= sys-libs/readline:= ) rplay? ( media-sound/rplay ) stroke? ( dev-libs/libstroke ) svg? ( gnome-base/librsvg:2 x11-libs/cairo )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
+RESTRICT=strip
+SLOT=0
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	desktop	22952d8f27cac191d75529d4c38e6bfa	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	go-module	a13d34fe4e2996720e1ca6c53b9ea95a	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=1fe5295418bade20aac58f2b16feea77
diff --git a/metadata/md5-cache/x11-wm/goomwwm-1.0.0-r1 b/metadata/md5-cache/x11-wm/goomwwm-1.0.0-r1
index 86e7fede4005..7d07a764327b 100644
--- a/metadata/md5-cache/x11-wm/goomwwm-1.0.0-r1
+++ b/metadata/md5-cache/x11-wm/goomwwm-1.0.0-r1
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libXft x11-libs/libX11 x11-libs/libXinerama
 SLOT=0
 SRC_URI=https://github.com/seanpringle/goomwwm/archive/1.0.0.tar.gz -> goomwwm-1.0.0-github.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=2331ff3109b4d2f6dcbaf84eeda74f9f
diff --git a/metadata/md5-cache/x11-wm/goomwwm-9999 b/metadata/md5-cache/x11-wm/goomwwm-9999
index 68f680bc471d..0c1d33d0c256 100644
--- a/metadata/md5-cache/x11-wm/goomwwm-9999
+++ b/metadata/md5-cache/x11-wm/goomwwm-9999
@@ -9,5 +9,5 @@ LICENSE=MIT
 PROPERTIES=live
 RDEPEND=x11-libs/libXft x11-libs/libX11 x11-libs/libXinerama
 SLOT=0
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=70ea7599c877542547eb93a34e2e6b06
diff --git a/metadata/md5-cache/x11-wm/herbstluftwm-0.9.3 b/metadata/md5-cache/x11-wm/herbstluftwm-0.9.3
deleted file mode 100644
index 11e91e87a214..000000000000
--- a/metadata/md5-cache/x11-wm/herbstluftwm-0.9.3
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) virtual/pkgconfig test? ( media-libs/freetype x11-libs/libX11 x11-libs/libXext x11-libs/libXft x11-libs/libXinerama x11-libs/libXrandr app-shells/bash python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) ) >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=media-libs/freetype x11-libs/libX11 x11-libs/libXext x11-libs/libXft x11-libs/libXinerama x11-libs/libXrandr test? ( dev-python/ewmh dev-python/python-xlib x11-apps/xsetroot x11-base/xorg-server[xephyr,xvfb] x11-misc/xdotool x11-terms/xterm )
-DESCRIPTION=A manual tiling window manager for X
-EAPI=7
-HOMEPAGE=https://herbstluftwm.org/
-INHERIT=cmake distutils-r1 toolchain-funcs
-IUSE=+doc python test test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 x86
-LICENSE=BSD-2
-RDEPEND=media-libs/freetype x11-libs/libX11 x11-libs/libXext x11-libs/libXft x11-libs/libXinerama x11-libs/libXrandr app-shells/bash python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) )
-REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://herbstluftwm.org/tarballs/herbstluftwm-0.9.3.tar.gz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=9bb475d8a0d7dddb64ed5c418a11ab49
diff --git a/metadata/md5-cache/x11-wm/herbstluftwm-0.9.4 b/metadata/md5-cache/x11-wm/herbstluftwm-0.9.4
new file mode 100644
index 000000000000..dfc7d971f843
--- /dev/null
+++ b/metadata/md5-cache/x11-wm/herbstluftwm-0.9.4
@@ -0,0 +1,17 @@
+BDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) virtual/pkgconfig test? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXft x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender app-shells/bash python? ( python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) ) >=dev-python/pytest-7.0.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXft x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender test? ( dev-python/ewmh dev-python/python-xlib x11-apps/xsetroot x11-base/xorg-server[xephyr,xvfb] x11-misc/xdotool x11-terms/xterm )
+DESCRIPTION=A manual tiling window manager for X
+EAPI=8
+HOMEPAGE=https://herbstluftwm.org/
+INHERIT=cmake distutils-r1
+IUSE=+doc python test test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=amd64 x86
+LICENSE=BSD-2
+RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXft x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender app-shells/bash python? ( python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) )
+REQUIRED_USE=python? ( || ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ) )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://herbstluftwm.org/tarballs/herbstluftwm-0.9.4.tar.gz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	distutils-r1	10a93585889c3ca7651cbcd2ee831e47	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=422e3210edfc1d58c56e14ddafcd9b19
diff --git a/metadata/md5-cache/x11-wm/herbstluftwm-9999 b/metadata/md5-cache/x11-wm/herbstluftwm-9999
index 5b8c093aec73..8103340760e9 100644
--- a/metadata/md5-cache/x11-wm/herbstluftwm-9999
+++ b/metadata/md5-cache/x11-wm/herbstluftwm-9999
@@ -1,16 +1,16 @@
-BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) virtual/pkgconfig doc? ( app-text/asciidoc ) test? ( media-libs/freetype x11-libs/libX11 x11-libs/libXext x11-libs/libXft x11-libs/libXinerama x11-libs/libXrandr app-shells/bash python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) ) >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) dev-util/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) virtual/pkgconfig doc? ( app-text/asciidoc ) test? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXft x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender app-shells/bash python? ( python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) ) >=dev-python/pytest-7.0.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=media-libs/freetype x11-libs/libX11 x11-libs/libXext x11-libs/libXft x11-libs/libXinerama x11-libs/libXrandr test? ( dev-python/ewmh dev-python/python-xlib x11-apps/xsetroot x11-base/xorg-server[xephyr,xvfb] x11-misc/xdotool x11-terms/xterm )
+DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXft x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender test? ( dev-python/ewmh dev-python/python-xlib x11-apps/xsetroot x11-base/xorg-server[xephyr,xvfb] x11-misc/xdotool x11-terms/xterm )
 DESCRIPTION=A manual tiling window manager for X
-EAPI=7
+EAPI=8
 HOMEPAGE=https://herbstluftwm.org/
-INHERIT=cmake distutils-r1 toolchain-funcs git-r3
-IUSE=+doc python test test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+INHERIT=cmake distutils-r1 git-r3
+IUSE=+doc python test test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 LICENSE=BSD-2
 PROPERTIES=live
-RDEPEND=media-libs/freetype x11-libs/libX11 x11-libs/libXext x11-libs/libXft x11-libs/libXinerama x11-libs/libXrandr app-shells/bash python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) )
-REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) ) test? ( doc )
+RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXft x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender app-shells/bash python? ( python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) )
+REQUIRED_USE=python? ( || ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ) ) test? ( doc )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=5f3b99d058178439d293ae3508bad7e0
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	distutils-r1	10a93585889c3ca7651cbcd2ee831e47	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=5dcd90446ef8888e017f5c3d171d6c29
diff --git a/metadata/md5-cache/x11-wm/i3-4.20.1 b/metadata/md5-cache/x11-wm/i3-4.20.1
index 69e5d194bfe0..d3b453c0ae5d 100644
--- a/metadata/md5-cache/x11-wm/i3-4.20.1
+++ b/metadata/md5-cache/x11-wm/i3-4.20.1
@@ -12,5 +12,5 @@ RDEPEND=dev-libs/libev dev-libs/libpcre dev-libs/yajl x11-libs/cairo[X,xcb(+)] x
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://i3wm.org/downloads/i3-4.20.1.tar.xz
-_eclasses_=meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
+_eclasses_=meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135
 _md5_=dd4c29bedfcd9585e5bf5c223dae4167
diff --git a/metadata/md5-cache/x11-wm/i3-9999 b/metadata/md5-cache/x11-wm/i3-9999
index 8e647195a0a0..af58ad6b716e 100644
--- a/metadata/md5-cache/x11-wm/i3-9999
+++ b/metadata/md5-cache/x11-wm/i3-9999
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=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 x11-misc/xkeyboard-config dev-lang/perl dev-perl/AnyEvent-I3 dev-perl/JSON-XS
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135
 _md5_=2501a5456667d4358aaa12d7c1f3a3b1
diff --git a/metadata/md5-cache/x11-wm/i3-gaps-4.19.1 b/metadata/md5-cache/x11-wm/i3-gaps-4.19.1
index d09aa50c0a6c..c61bb9319ecd 100644
--- a/metadata/md5-cache/x11-wm/i3-gaps-4.19.1
+++ b/metadata/md5-cache/x11-wm/i3-gaps-4.19.1
@@ -12,5 +12,5 @@ RDEPEND=dev-libs/glib:2 dev-libs/libev dev-libs/libpcre dev-libs/yajl x11-libs/c
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Airblader/i3/archive/4.19.1.tar.gz -> i3-gaps-4.19.1.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=5d0835d44531f5030d614eb0db9615a4
diff --git a/metadata/md5-cache/x11-wm/i3-gaps-4.20 b/metadata/md5-cache/x11-wm/i3-gaps-4.20
index 58a5e12054e8..0936ba504551 100644
--- a/metadata/md5-cache/x11-wm/i3-gaps-4.20
+++ b/metadata/md5-cache/x11-wm/i3-gaps-4.20
@@ -12,5 +12,5 @@ RDEPEND=dev-libs/glib:2 dev-libs/libev dev-libs/libpcre dev-libs/yajl:= x11-libs
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Airblader/i3/archive/4.20.tar.gz -> i3-gaps-4.20.tar.gz
-_eclasses_=meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=7ea8e8eef4f00b07f2da1342cbad4e72
diff --git a/metadata/md5-cache/x11-wm/i3-gaps-4.20.1 b/metadata/md5-cache/x11-wm/i3-gaps-4.20.1
index c3684ebcf628..152f564217ec 100644
--- a/metadata/md5-cache/x11-wm/i3-gaps-4.20.1
+++ b/metadata/md5-cache/x11-wm/i3-gaps-4.20.1
@@ -12,5 +12,5 @@ RDEPEND=dev-libs/glib:2 dev-libs/libev dev-libs/libpcre dev-libs/yajl:= x11-libs
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Airblader/i3/archive/4.20.1.tar.gz -> i3-gaps-4.20.1.tar.gz
-_eclasses_=meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=9594e7c778351af80a04927617f3688f
diff --git a/metadata/md5-cache/x11-wm/icewm-2.8.0 b/metadata/md5-cache/x11-wm/icewm-2.8.0
index 549a0debcc1d..2a7fceeffa34 100644
--- a/metadata/md5-cache/x11-wm/icewm-2.8.0
+++ b/metadata/md5-cache/x11-wm/icewm-2.8.0
@@ -4,6 +4,7 @@ DEPEND=media-libs/fontconfig x11-libs/libX11 x11-libs/libXcomposite x11-libs/lib
 DESCRIPTION=Ice Window Manager with Themes
 EAPI=8
 HOMEPAGE=https://ice-wm.org/ https://github.com/ice-wm/icewm
+INHERIT=autotools unpacker
 IUSE=+alsa ao bidi debug +gdk-pixbuf imlib nls truetype xinerama
 KEYWORDS=amd64 ppc ~ppc64 sparc x86
 LICENSE=GPL-2
@@ -12,5 +13,5 @@ REQUIRED_USE=|| ( alsa ao )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/ice-wm/icewm/releases/download/2.8.0/icewm-2.8.0.tar.lz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	unpacker	697382d119fd3d195f110b7979184285
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	unpacker	697382d119fd3d195f110b7979184285
 _md5_=e3be26b5b9ce03919c0f129cd4972f8a
diff --git a/metadata/md5-cache/x11-wm/icewm-2.9.6 b/metadata/md5-cache/x11-wm/icewm-2.9.6
index 0a8bd41e0fdf..9bab1a086c7a 100644
--- a/metadata/md5-cache/x11-wm/icewm-2.9.6
+++ b/metadata/md5-cache/x11-wm/icewm-2.9.6
@@ -4,6 +4,7 @@ DEPEND=media-libs/fontconfig x11-libs/libX11 x11-libs/libXcomposite x11-libs/lib
 DESCRIPTION=Ice Window Manager with Themes
 EAPI=8
 HOMEPAGE=https://ice-wm.org/ https://github.com/ice-wm/icewm
+INHERIT=autotools unpacker
 IUSE=+alsa ao bidi debug +gdk-pixbuf imlib nls truetype xinerama
 KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
@@ -12,5 +13,5 @@ REQUIRED_USE=|| ( alsa ao )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/ice-wm/icewm/releases/download/2.9.6/icewm-2.9.6.tar.lz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	unpacker	697382d119fd3d195f110b7979184285
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	unpacker	697382d119fd3d195f110b7979184285
 _md5_=93a3166abfbb54193ae1e1de3dbc1035
diff --git a/metadata/md5-cache/x11-wm/icewm-2.9.7 b/metadata/md5-cache/x11-wm/icewm-2.9.7
index f3ea6c1cbcb3..02407883a2c8 100644
--- a/metadata/md5-cache/x11-wm/icewm-2.9.7
+++ b/metadata/md5-cache/x11-wm/icewm-2.9.7
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( alsa ao )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/ice-wm/icewm/releases/download/2.9.7/icewm-2.9.7.tar.lz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	unpacker	697382d119fd3d195f110b7979184285
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	unpacker	697382d119fd3d195f110b7979184285
 _md5_=93a3166abfbb54193ae1e1de3dbc1035
diff --git a/metadata/md5-cache/x11-wm/larswm-7.5.3-r2 b/metadata/md5-cache/x11-wm/larswm-7.5.3-r2
index 539f924d1531..2a5d12d68d69 100644
--- a/metadata/md5-cache/x11-wm/larswm-7.5.3-r2
+++ b/metadata/md5-cache/x11-wm/larswm-7.5.3-r2
@@ -4,10 +4,11 @@ DEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libXext
 DESCRIPTION=Tiling window manager for X11, based on 9wm by David Hogan
 EAPI=7
 HOMEPAGE=http://www.fnurt.net/larswm/
+INHERIT=toolchain-funcs
 KEYWORDS=~alpha amd64 ppc ppc64 x86
 LICENSE=9wm
 RDEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libXext
 SLOT=0
 SRC_URI=http://www.fnurt.net/larswm/larswm-7.5.3.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=e0dbb8445dad737b5ac7c2a8c11fc180
diff --git a/metadata/md5-cache/x11-wm/lumina-1.6.0 b/metadata/md5-cache/x11-wm/lumina-1.6.0
index 86eaf64a7a15..99eb50daa470 100644
--- a/metadata/md5-cache/x11-wm/lumina-1.6.0
+++ b/metadata/md5-cache/x11-wm/lumina-1.6.0
@@ -11,5 +11,5 @@ LICENSE=BSD
 RDEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5[widgets] dev-qt/qtnetwork:5[ssl] dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libxcb:0 x11-libs/xcb-util x11-libs/xcb-util-image x11-libs/xcb-util-wm desktop-utils? ( app-text/poppler[qt5] ) app-admin/sysstat media-sound/alsa-utils sys-fs/inotify-tools sys-power/acpi || ( x11-apps/xbacklight sys-power/acpilight ) x11-misc/numlockx x11-wm/fluxbox
 SLOT=0
 SRC_URI=https://github.com/trueos/lumina/archive/v1.6.0.tar.gz -> lumina-1.6.0.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	plocale	7ce00136a77130df46fbbd5966f98a61	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	plocale	7ce00136a77130df46fbbd5966f98a61	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=6e14d53f8d4feb5352bd03ef77f12ca1
diff --git a/metadata/md5-cache/x11-wm/lumina-1.6.1 b/metadata/md5-cache/x11-wm/lumina-1.6.1
index eeca540a2331..1650dc22598d 100644
--- a/metadata/md5-cache/x11-wm/lumina-1.6.1
+++ b/metadata/md5-cache/x11-wm/lumina-1.6.1
@@ -11,5 +11,5 @@ LICENSE=BSD
 RDEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5[widgets] dev-qt/qtnetwork:5[ssl] dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libxcb:0 x11-libs/xcb-util x11-libs/xcb-util-image x11-libs/xcb-util-wm desktop-utils? ( app-text/poppler[qt5] ) app-admin/sysstat media-sound/alsa-utils sys-fs/inotify-tools sys-power/acpi || ( x11-apps/xbacklight sys-power/acpilight ) x11-misc/numlockx x11-wm/fluxbox
 SLOT=0
 SRC_URI=https://github.com/trueos/lumina/archive/v1.6.1.tar.gz -> lumina-1.6.1.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	plocale	7ce00136a77130df46fbbd5966f98a61	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	plocale	7ce00136a77130df46fbbd5966f98a61	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=cfe4015865351c199bea7bf82a50461f
diff --git a/metadata/md5-cache/x11-wm/lumina-1.6.2 b/metadata/md5-cache/x11-wm/lumina-1.6.2
index e54ec5a34303..7e8d4d88c434 100644
--- a/metadata/md5-cache/x11-wm/lumina-1.6.2
+++ b/metadata/md5-cache/x11-wm/lumina-1.6.2
@@ -11,5 +11,5 @@ LICENSE=BSD
 RDEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5[widgets] dev-qt/qtnetwork:5[ssl] dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libxcb:0 x11-libs/xcb-util x11-libs/xcb-util-image x11-libs/xcb-util-wm desktop-utils? ( app-text/poppler[qt5] ) app-admin/sysstat media-sound/alsa-utils sys-fs/inotify-tools sys-power/acpi || ( x11-apps/xbacklight sys-power/acpilight ) x11-misc/numlockx x11-wm/fluxbox
 SLOT=0
 SRC_URI=https://github.com/trueos/lumina/archive/v1.6.2.tar.gz -> lumina-1.6.2.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	plocale	7ce00136a77130df46fbbd5966f98a61	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	plocale	7ce00136a77130df46fbbd5966f98a61	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=d7fba52895d0eeaa5af49ab125a6a43f
diff --git a/metadata/md5-cache/x11-wm/lumina-9999 b/metadata/md5-cache/x11-wm/lumina-9999
index 3c83d6608f10..1ff7c14d4392 100644
--- a/metadata/md5-cache/x11-wm/lumina-9999
+++ b/metadata/md5-cache/x11-wm/lumina-9999
@@ -10,5 +10,5 @@ LICENSE=BSD
 PROPERTIES=live
 RDEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5[widgets] dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libxcb:0 x11-libs/xcb-util x11-libs/xcb-util-image x11-libs/xcb-util-wm app-admin/sysstat media-sound/alsa-utils sys-fs/inotify-tools sys-power/acpi || ( x11-apps/xbacklight sys-power/acpilight ) x11-misc/numlockx x11-wm/fluxbox
 SLOT=0
-_eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4fbbbc98f236f1b43acd99476bc3cd85	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=9c70b8a7acbed017c6b88cfb8649c0a1
diff --git a/metadata/md5-cache/x11-wm/lwm-1.2.4 b/metadata/md5-cache/x11-wm/lwm-1.2.4
index c2ea373751bd..8d13691e650d 100644
--- a/metadata/md5-cache/x11-wm/lwm-1.2.4
+++ b/metadata/md5-cache/x11-wm/lwm-1.2.4
@@ -3,10 +3,11 @@ DEPEND=x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-base/
 DESCRIPTION=The ultimate lightweight window manager
 EAPI=6
 HOMEPAGE=http://www.jfc.org.uk/software/lwm.html
+INHERIT=toolchain-funcs
 KEYWORDS=amd64 ppc ~sparc x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext
 SLOT=0
 SRC_URI=http://www.jfc.org.uk/files/lwm/lwm-1.2.4.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=3e14023a4abc2ac07bf4aa5e66cc1d0e
diff --git a/metadata/md5-cache/x11-wm/marco-1.24.2 b/metadata/md5-cache/x11-wm/marco-1.24.2
index ce0c2af48d9c..c44efbd2a52c 100644
--- a/metadata/md5-cache/x11-wm/marco-1.24.2
+++ b/metadata/md5-cache/x11-wm/marco-1.24.2
@@ -5,11 +5,11 @@ EAPI=6
 HOMEPAGE=https://mate-desktop.org
 INHERIT=mate
 IUSE=startup-notification test xinerama
-KEYWORDS=amd64 ~arm ~arm64 ~riscv x86
+KEYWORDS=amd64 ~arm ~arm64 ~loong ~riscv x86
 LICENSE=FDL-1.2+ GPL-2+ LGPL-2+ MIT
 RDEPEND=dev-libs/atk >=dev-libs/glib-2.58:2 >=gnome-base/libgtop-2:2= media-libs/libcanberra[gtk3] x11-libs/cairo >=x11-libs/pango-1.2[X] x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.22:3 x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libXcomposite-0.3 x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXpresent x11-libs/libXrandr x11-libs/libXrender >=x11-libs/startup-notification-0.7 xinerama? ( x11-libs/libXinerama ) !!x11-wm/mate-window-manager gnome-extra/zenity >=mate-base/mate-desktop-1.20.0 virtual/libintl
 RESTRICT=!test? ( test )
 SLOT=0/2
 SRC_URI=https://pub.mate-desktop.org/releases/1.24/marco-1.24.2.tar.xz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	mate	e29617c33d6e271931938d0073817dde	mate-desktop.org	0da897c64adb500292c6b9db3e424496	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=6a11c196ec4e6596774078e20f24a0d5
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	desktop	22952d8f27cac191d75529d4c38e6bfa	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	mate	e29617c33d6e271931938d0073817dde	mate-desktop.org	0da897c64adb500292c6b9db3e424496	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=92a755d9bfd09515261d6ae513601040
diff --git a/metadata/md5-cache/x11-wm/marco-1.26.0 b/metadata/md5-cache/x11-wm/marco-1.26.0
new file mode 100644
index 000000000000..1e1693647cf8
--- /dev/null
+++ b/metadata/md5-cache/x11-wm/marco-1.26.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-libs/atk >=dev-libs/glib-2.58:2 >=gnome-base/libgtop-2:2= media-libs/libcanberra[gtk3] x11-libs/cairo >=x11-libs/pango-1.2[X] x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.22:3 x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libXcomposite-0.3 x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXpresent x11-libs/libXrandr x11-libs/libXrender >=x11-libs/startup-notification-0.7 xinerama? ( x11-libs/libXinerama ) app-text/yelp-tools >=sys-devel/gettext-0.19.8 >=sys-devel/libtool-2.0.0 virtual/pkgconfig x11-base/xorg-proto test? ( app-text/docbook-xml-dtd:4.5 ) xinerama? ( x11-base/xorg-proto ) >=app-portage/elt-patches-20170815 app-arch/xz-utils sys-devel/gnuconfig || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info >=mate-base/mate-common-1.26
+DESCRIPTION=MATE default window manager
+EAPI=7
+HOMEPAGE=https://mate-desktop.org
+INHERIT=mate
+IUSE=startup-notification test xinerama
+KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+LICENSE=FDL-1.2+ GPL-2+ LGPL-2+ MIT
+RDEPEND=dev-libs/atk >=dev-libs/glib-2.58:2 >=gnome-base/libgtop-2:2= media-libs/libcanberra[gtk3] x11-libs/cairo >=x11-libs/pango-1.2[X] x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.22:3 x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libXcomposite-0.3 x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXpresent x11-libs/libXrandr x11-libs/libXrender >=x11-libs/startup-notification-0.7 xinerama? ( x11-libs/libXinerama ) gnome-extra/zenity >=mate-base/mate-desktop-1.20.0 virtual/libintl
+RESTRICT=!test? ( test )
+SLOT=0/2
+SRC_URI=https://pub.mate-desktop.org/releases/1.26/marco-1.26.0.tar.xz
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	mate	e29617c33d6e271931938d0073817dde	mate-desktop.org	0da897c64adb500292c6b9db3e424496	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=20e0eb75421b6cd2ff5d6a2243a351a0
diff --git a/metadata/md5-cache/x11-wm/matwm2-0.1.2_pre3-r1 b/metadata/md5-cache/x11-wm/matwm2-0.1.2_pre3-r2
index b70bce5121bc..0c7e85e750c9 100644
--- a/metadata/md5-cache/x11-wm/matwm2-0.1.2_pre3-r1
+++ b/metadata/md5-cache/x11-wm/matwm2-0.1.2_pre3-r2
@@ -1,13 +1,15 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=configure install prepare
-DEPEND=x11-libs/libXext x11-libs/libX11 xft? ( x11-libs/libXft ) xinerama? ( x11-libs/libXinerama ) virtual/pkgconfig
+DEPEND=x11-libs/libXext x11-libs/libX11 xft? ( x11-libs/libXft ) xinerama? ( x11-libs/libXinerama )
 DESCRIPTION=Simple EWMH compatible window manager with titlebars and frames
-EAPI=6
+EAPI=8
 HOMEPAGE=https://github.com/segin/matwm2
+INHERIT=edo toolchain-funcs
 IUSE=debug xft xinerama
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=x11-libs/libXext x11-libs/libX11 xft? ( x11-libs/libXft ) xinerama? ( x11-libs/libXinerama )
 SLOT=0
 SRC_URI=https://github.com/segin/matwm2/archive/0.1.2pre3.tar.gz -> matwm2-0.1.2_pre3.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=bb7645f716c4651bda79beea7ac6c34d
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=4fbc49857dc688884f4bfa8050ab42de
diff --git a/metadata/md5-cache/x11-wm/metacity-3.42.0 b/metadata/md5-cache/x11-wm/metacity-3.42.0
deleted file mode 100644
index 46d497ada90f..000000000000
--- a/metadata/md5-cache/x11-wm/metacity-3.42.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=vulkan? ( dev-util/vulkan-headers ) dev-util/glib-utils >=sys-devel/gettext-0.19.6 virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.67.3:2 >=x11-libs/gtk+-3.24.6:3[X] >=x11-libs/pango-1.2.0 >=x11-libs/libXcomposite-0.3 >=gnome-base/gsettings-desktop-schemas-3.3.0 x11-libs/libXfixes x11-libs/libXrender x11-libs/libXdamage x11-libs/libXres x11-libs/libXpresent libcanberra? ( media-libs/libcanberra[gtk3] ) >=x11-libs/startup-notification-0.7 x11-libs/libXcursor gnome-base/libgtop:2= x11-libs/libX11 xinerama? ( x11-libs/libXinerama ) x11-libs/libXrandr x11-libs/libXext x11-libs/libICE x11-libs/libSM gnome-extra/zenity vulkan? ( media-libs/vulkan-loader ) x11-base/xorg-proto dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=GNOME Flashback window manager
-EAPI=7
-HOMEPAGE=https://gitlab.gnome.org/GNOME/metacity/
-IUSE=+libcanberra vulkan xinerama
-KEYWORDS=~amd64 ~riscv
-LICENSE=GPL-2+
-RDEPEND=>=dev-libs/glib-2.67.3:2 >=x11-libs/gtk+-3.24.6:3[X] >=x11-libs/pango-1.2.0 >=x11-libs/libXcomposite-0.3 >=gnome-base/gsettings-desktop-schemas-3.3.0 x11-libs/libXfixes x11-libs/libXrender x11-libs/libXdamage x11-libs/libXres x11-libs/libXpresent libcanberra? ( media-libs/libcanberra[gtk3] ) >=x11-libs/startup-notification-0.7 x11-libs/libXcursor gnome-base/libgtop:2= x11-libs/libX11 xinerama? ( x11-libs/libXinerama ) x11-libs/libXrandr x11-libs/libXext x11-libs/libICE x11-libs/libSM gnome-extra/zenity vulkan? ( media-libs/vulkan-loader )
-SLOT=0
-SRC_URI=mirror://gnome/sources/metacity/3.42/metacity-3.42.0.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=17917f201bb0b9aac2141ed637c3281d
diff --git a/metadata/md5-cache/x11-wm/metacity-3.44.0 b/metadata/md5-cache/x11-wm/metacity-3.44.0
index 57d09f8ef5ea..d2f8cc60fc1a 100644
--- a/metadata/md5-cache/x11-wm/metacity-3.44.0
+++ b/metadata/md5-cache/x11-wm/metacity-3.44.0
@@ -4,11 +4,12 @@ DEPEND=>=dev-libs/glib-2.67.3:2 >=x11-libs/gtk+-3.24.6:3[X] >=x11-libs/pango-1.2
 DESCRIPTION=GNOME Flashback window manager
 EAPI=8
 HOMEPAGE=https://gitlab.gnome.org/GNOME/metacity/
+INHERIT=gnome2
 IUSE=+libcanberra vulkan xinerama
 KEYWORDS=~amd64 ~riscv
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.67.3:2 >=x11-libs/gtk+-3.24.6:3[X] >=x11-libs/pango-1.2.0 >=x11-libs/libXcomposite-0.3 >=gnome-base/gsettings-desktop-schemas-3.3.0 x11-libs/libXfixes x11-libs/libXrender x11-libs/libXdamage x11-libs/libXres x11-libs/libXpresent libcanberra? ( media-libs/libcanberra[gtk3] ) >=x11-libs/startup-notification-0.7 x11-libs/libXcursor gnome-base/libgtop:2= x11-libs/libX11 xinerama? ( x11-libs/libXinerama ) x11-libs/libXrandr x11-libs/libXext x11-libs/libICE x11-libs/libSM gnome-extra/zenity vulkan? ( media-libs/vulkan-loader )
 SLOT=0
 SRC_URI=mirror://gnome/sources/metacity/3.44/metacity-3.44.0.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=d348195c12b78339b9b65da8c9218071
diff --git a/metadata/md5-cache/x11-wm/muffin-5.2.0 b/metadata/md5-cache/x11-wm/muffin-5.2.0
index 02bca9aabba6..e10bd3b83330 100644
--- a/metadata/md5-cache/x11-wm/muffin-5.2.0
+++ b/metadata/md5-cache/x11-wm/muffin-5.2.0
@@ -12,5 +12,5 @@ RDEPEND=>=dev-libs/glib-2.37.3:2[dbus] >=dev-libs/json-glib-1.0 >=gnome-extra/ci
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/linuxmint/muffin/archive/5.2.0.tar.gz -> muffin-5.2.0.tar.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=680351314a560e698fc40b9c6f3e8113
diff --git a/metadata/md5-cache/x11-wm/musca-0.9.24_p20100226-r4 b/metadata/md5-cache/x11-wm/musca-0.9.24_p20100226-r4
index af9d41198026..ae976178f35e 100644
--- a/metadata/md5-cache/x11-wm/musca-0.9.24_p20100226-r4
+++ b/metadata/md5-cache/x11-wm/musca-0.9.24_p20100226-r4
@@ -4,11 +4,12 @@ DEPEND=x11-libs/libX11
 DESCRIPTION=A simple dynamic window manager, with features nicked from ratpoison and dwm
 EAPI=7
 HOMEPAGE=https://launchpad.net/musca
+INHERIT=savedconfig toolchain-funcs
 IUSE=apis xlisten savedconfig
 KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=x11-libs/libX11 >=x11-misc/dmenu-4.4 apis? ( x11-misc/xbindkeys )
 SLOT=0
 SRC_URI=mirror://gentoo/musca-0.9.24_p20100226.tgz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	portability	d33a77692bb47e8227f27e17fb9c3c05	savedconfig	7cb1bf66b4acedc4f06802a012d3b08d	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	portability	d33a77692bb47e8227f27e17fb9c3c05	savedconfig	7cb1bf66b4acedc4f06802a012d3b08d	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=e4a702d9e6695aca9171440a411997cb
diff --git a/metadata/md5-cache/x11-wm/mutter-41.4 b/metadata/md5-cache/x11-wm/mutter-41.4
deleted file mode 100644
index 3dddb18a47c7..000000000000
--- a/metadata/md5-cache/x11-wm/mutter-41.4
+++ /dev/null
@@ -1,17 +0,0 @@
-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 x11-misc/xvfb-run ) wayland? ( >=sys-kernel/linux-headers-4.4 x11-libs/libxcvt ) app-arch/xz-utils >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=x11-libs/libX11-1.7.0 >=media-libs/graphene-1.10.2[introspection?] >=x11-libs/gtk+-3.19.8:3[X,introspection?] x11-libs/gdk-pixbuf:2 >=x11-libs/pango-1.46[introspection?] >=dev-libs/fribidi-1.0.0 >=x11-libs/cairo-1.14[X] >=gnome-base/gsettings-desktop-schemas-40.0[introspection?] >=dev-libs/glib-2.69.0: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.40.1:4 ) systemd? ( sys-apps/systemd ) wayland? ( >=dev-libs/wayland-protocols-1.21 >=dev-libs/wayland-1.18.0 x11-libs/libdrm:= >=media-libs/mesa-17.3[egl(+),gbm(+),wayland,gles2] >=dev-libs/libinput-1.18.0 elogind? ( sys-auth/elogind ) x11-base/xwayland video_cards_nvidia? ( gui-libs/egl-wayland ) ) udev? ( >=dev-libs/libgudev-232:= >=virtual/libudev-232-r1:= ) x11-libs/libSM input_devices_wacom? ( >=dev-libs/libwacom-0.13 ) >=x11-libs/startup-notification-0.7 screencast? ( >=media-video/pipewire-0.3.21:= ) introspection? ( >=dev-libs/gobject-introspection-1.54:= ) x11-base/xorg-proto sysprof? ( >=dev-util/sysprof-common-3.38.0 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=GNOME compositing window manager based on Clutter
-EAPI=7
-HOMEPAGE=https://gitlab.gnome.org/GNOME/mutter/
-INHERIT=gnome.org gnome2-utils meson udev xdg
-IUSE=elogind input_devices_wacom +introspection screencast sysprof systemd test udev wayland video_cards_nvidia
-KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
-LICENSE=GPL-2+
-RDEPEND=>=x11-libs/libX11-1.7.0 >=media-libs/graphene-1.10.2[introspection?] >=x11-libs/gtk+-3.19.8:3[X,introspection?] x11-libs/gdk-pixbuf:2 >=x11-libs/pango-1.46[introspection?] >=dev-libs/fribidi-1.0.0 >=x11-libs/cairo-1.14[X] >=gnome-base/gsettings-desktop-schemas-40.0[introspection?] >=dev-libs/glib-2.69.0: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.40.1:4 ) systemd? ( sys-apps/systemd ) wayland? ( >=dev-libs/wayland-protocols-1.21 >=dev-libs/wayland-1.18.0 x11-libs/libdrm:= >=media-libs/mesa-17.3[egl(+),gbm(+),wayland,gles2] >=dev-libs/libinput-1.18.0 elogind? ( sys-auth/elogind ) x11-base/xwayland video_cards_nvidia? ( gui-libs/egl-wayland ) ) udev? ( >=dev-libs/libgudev-232:= >=virtual/libudev-232-r1:= ) x11-libs/libSM input_devices_wacom? ( >=dev-libs/libwacom-0.13 ) >=x11-libs/startup-notification-0.7 screencast? ( >=media-video/pipewire-0.3.21:= ) introspection? ( >=dev-libs/gobject-introspection-1.54:= ) gnome-extra/zenity
-REQUIRED_USE=wayland? ( ^^ ( elogind systemd ) udev ) test? ( wayland )
-RESTRICT=!test? ( test )
-SLOT=0/9
-SRC_URI=mirror://gnome/sources/mutter/41/mutter-41.4.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	udev	2d229ad4bfa09058e0184b1ca900db32	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=1a667feec642968a8b1fc1119e43524d
diff --git a/metadata/md5-cache/x11-wm/mutter-42.1 b/metadata/md5-cache/x11-wm/mutter-42.1
index 6cf71d162271..4670a15f70c0 100644
--- a/metadata/md5-cache/x11-wm/mutter-42.1
+++ b/metadata/md5-cache/x11-wm/mutter-42.1
@@ -6,12 +6,12 @@ EAPI=7
 HOMEPAGE=https://gitlab.gnome.org/GNOME/mutter/
 INHERIT=gnome.org gnome2-utils meson python-any-r1 udev xdg
 IUSE=doc elogind gnome input_devices_wacom +introspection screencast sysprof systemd test udev wayland video_cards_nvidia
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
 LICENSE=GPL-2+
-RDEPEND=>=x11-libs/libX11-1.7.0 >=media-libs/graphene-1.10.2[introspection?] >=x11-libs/gtk+-3.19.8:3[X,introspection?] x11-libs/gdk-pixbuf:2 >=x11-libs/pango-1.46[introspection?] >=dev-libs/fribidi-1.0.0 >=x11-libs/cairo-1.14[X] >=gnome-base/gsettings-desktop-schemas-42.0[introspection?] >=dev-libs/glib-2.69.0:2 gnome-base/gnome-settings-daemon >=dev-libs/json-glib-0.12.0[introspection?] >=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 gnome? ( gnome-base/gnome-desktop:3= ) media-libs/mesa[X(+),egl(+)] sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 ) systemd? ( sys-apps/systemd ) wayland? ( >=dev-libs/wayland-protocols-1.21 >=dev-libs/wayland-1.18.0 x11-libs/libdrm:= >=media-libs/mesa-17.3[egl(+),gbm(+),wayland,gles2] >=dev-libs/libinput-1.18.0 elogind? ( sys-auth/elogind ) x11-base/xwayland video_cards_nvidia? ( gui-libs/egl-wayland ) ) udev? ( >=dev-libs/libgudev-232:= >=virtual/libudev-232-r1:= ) x11-libs/libSM input_devices_wacom? ( >=dev-libs/libwacom-0.13 ) >=x11-libs/startup-notification-0.7 screencast? ( >=media-video/pipewire-0.3.21:= ) introspection? ( >=dev-libs/gobject-introspection-1.54:= ) doc? ( >=dev-util/gi-docgen-2021.1 ) gnome-extra/zenity
+RDEPEND=>=x11-libs/libX11-1.7.0 >=media-libs/graphene-1.10.2[introspection?] >=x11-libs/gtk+-3.19.8:3[X,introspection?] x11-libs/gdk-pixbuf:2 >=x11-libs/pango-1.46[introspection?] >=dev-libs/fribidi-1.0.0 >=x11-libs/cairo-1.14[X] >=gnome-base/gsettings-desktop-schemas-42.0[introspection?] >=dev-libs/glib-2.69.0:2 gnome-base/gnome-settings-daemon >=dev-libs/json-glib-0.12.0[introspection?] >=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 gnome? ( gnome-base/gnome-desktop:3= ) media-libs/mesa[X(+),egl(+)] sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 ) systemd? ( sys-apps/systemd ) wayland? ( >=dev-libs/wayland-protocols-1.21 >=dev-libs/wayland-1.18.0 x11-libs/libdrm:= >=media-libs/mesa-17.3[egl(+),gbm(+),wayland,gles2] >=dev-libs/libinput-1.18.0 elogind? ( sys-auth/elogind ) x11-base/xwayland video_cards_nvidia? ( gui-libs/egl-wayland ) ) udev? ( >=dev-libs/libgudev-232:= >=virtual/libudev-232-r1:= ) x11-libs/libSM input_devices_wacom? ( >=dev-libs/libwacom-0.13 ) >=x11-libs/startup-notification-0.7 screencast? ( >=media-video/pipewire-0.3.21:= ) introspection? ( >=dev-libs/gobject-introspection-1.54:= ) doc? ( >=dev-util/gi-docgen-2021.1 ) gnome-extra/zenity !<gui-libs/gtk-4.6.4:4 !<x11-libs/gtk+-3.24.34:3
 REQUIRED_USE=wayland? ( ^^ ( elogind systemd ) udev ) test? ( wayland )
 RESTRICT=!test? ( test )
 SLOT=0/10
 SRC_URI=mirror://gnome/sources/mutter/42/mutter-42.1.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	udev	2d229ad4bfa09058e0184b1ca900db32	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=5980faf3d9a92bf1c15a40c5b985b86d
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	udev	f3a0a3964e2028a140c181f00eea9712	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=4a9bf844c30520ccecf8074fb3fef68c
diff --git a/metadata/md5-cache/x11-wm/mutter-42.0-r1 b/metadata/md5-cache/x11-wm/mutter-42.2
index 6fec96501dad..85859f0460fc 100644
--- a/metadata/md5-cache/x11-wm/mutter-42.0-r1
+++ b/metadata/md5-cache/x11-wm/mutter-42.2
@@ -8,10 +8,10 @@ INHERIT=gnome.org gnome2-utils meson python-any-r1 udev xdg
 IUSE=doc elogind gnome input_devices_wacom +introspection screencast sysprof systemd test udev wayland video_cards_nvidia
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=GPL-2+
-RDEPEND=>=x11-libs/libX11-1.7.0 >=media-libs/graphene-1.10.2[introspection?] >=x11-libs/gtk+-3.19.8:3[X,introspection?] x11-libs/gdk-pixbuf:2 >=x11-libs/pango-1.46[introspection?] >=dev-libs/fribidi-1.0.0 >=x11-libs/cairo-1.14[X] >=gnome-base/gsettings-desktop-schemas-42.0[introspection?] >=dev-libs/glib-2.69.0:2 gnome-base/gnome-settings-daemon >=dev-libs/json-glib-0.12.0[introspection?] >=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 gnome? ( gnome-base/gnome-desktop:3= ) media-libs/mesa[X(+),egl(+)] sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 ) systemd? ( sys-apps/systemd ) wayland? ( >=dev-libs/wayland-protocols-1.21 >=dev-libs/wayland-1.18.0 x11-libs/libdrm:= >=media-libs/mesa-17.3[egl(+),gbm(+),wayland,gles2] >=dev-libs/libinput-1.18.0 elogind? ( sys-auth/elogind ) x11-base/xwayland video_cards_nvidia? ( gui-libs/egl-wayland ) ) udev? ( >=dev-libs/libgudev-232:= >=virtual/libudev-232-r1:= ) x11-libs/libSM input_devices_wacom? ( >=dev-libs/libwacom-0.13 ) >=x11-libs/startup-notification-0.7 screencast? ( >=media-video/pipewire-0.3.21:= ) introspection? ( >=dev-libs/gobject-introspection-1.54:= ) doc? ( >=dev-util/gi-docgen-2021.1 ) gnome-extra/zenity
+RDEPEND=>=x11-libs/libX11-1.7.0 >=media-libs/graphene-1.10.2[introspection?] >=x11-libs/gtk+-3.19.8:3[X,introspection?] x11-libs/gdk-pixbuf:2 >=x11-libs/pango-1.46[introspection?] >=dev-libs/fribidi-1.0.0 >=x11-libs/cairo-1.14[X] >=gnome-base/gsettings-desktop-schemas-42.0[introspection?] >=dev-libs/glib-2.69.0:2 gnome-base/gnome-settings-daemon >=dev-libs/json-glib-0.12.0[introspection?] >=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 gnome? ( gnome-base/gnome-desktop:3= ) media-libs/mesa[X(+),egl(+)] sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 ) systemd? ( sys-apps/systemd ) wayland? ( >=dev-libs/wayland-protocols-1.21 >=dev-libs/wayland-1.18.0 x11-libs/libdrm:= >=media-libs/mesa-17.3[egl(+),gbm(+),wayland,gles2] >=dev-libs/libinput-1.18.0 elogind? ( sys-auth/elogind ) x11-base/xwayland video_cards_nvidia? ( gui-libs/egl-wayland ) ) udev? ( >=dev-libs/libgudev-232:= >=virtual/libudev-232-r1:= ) x11-libs/libSM input_devices_wacom? ( >=dev-libs/libwacom-0.13 ) >=x11-libs/startup-notification-0.7 screencast? ( >=media-video/pipewire-0.3.21:= ) introspection? ( >=dev-libs/gobject-introspection-1.54:= ) doc? ( >=dev-util/gi-docgen-2021.1 ) gnome-extra/zenity !<gui-libs/gtk-4.6.4:4 !<x11-libs/gtk+-3.24.34:3
 REQUIRED_USE=wayland? ( ^^ ( elogind systemd ) udev ) test? ( wayland )
 RESTRICT=!test? ( test )
 SLOT=0/10
-SRC_URI=mirror://gnome/sources/mutter/42/mutter-42.0.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	udev	2d229ad4bfa09058e0184b1ca900db32	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=5980faf3d9a92bf1c15a40c5b985b86d
+SRC_URI=mirror://gnome/sources/mutter/42/mutter-42.2.tar.xz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	udev	f3a0a3964e2028a140c181f00eea9712	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=1d0b80336d2fb622abe1f572d99ff515
diff --git a/metadata/md5-cache/x11-wm/notion-3_p2015061300-r100 b/metadata/md5-cache/x11-wm/notion-3_p2015061300-r100
deleted file mode 100644
index d04009b2ecd6..000000000000
--- a/metadata/md5-cache/x11-wm/notion-3_p2015061300-r100
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) virtual/pkgconfig
-DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) x11-libs/libSM x11-libs/libX11 x11-libs/libXext nls? ( sys-devel/gettext ) xinerama? ( x11-libs/libXinerama ) xrandr? ( x11-libs/libXrandr )
-DESCRIPTION=Notion is a tiling, tabbed window manager for the X window system
-EAPI=7
-HOMEPAGE=https://notionwm.net/
-IUSE=nls xinerama +xrandr +lua_single_target_lua5-1
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) x11-libs/libSM x11-libs/libX11 x11-libs/libXext nls? ( sys-devel/gettext ) xinerama? ( x11-libs/libXinerama ) xrandr? ( x11-libs/libXrandr )
-REQUIRED_USE=^^ ( lua_single_target_lua5-1 ) xrandr? ( xinerama )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/raboof/notion/archive/3-2015061300.tar.gz -> notion-3_p2015061300.tar.gz
-_eclasses_=lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=72c4d9ecc074c3c5564901e84e43cb47
diff --git a/metadata/md5-cache/x11-wm/notion-4.0.2_p20220613 b/metadata/md5-cache/x11-wm/notion-4.0.2_p20220613
new file mode 100644
index 000000000000..e3ac4822aa7a
--- /dev/null
+++ b/metadata/md5-cache/x11-wm/notion-4.0.2_p20220613
@@ -0,0 +1,17 @@
+BDEPEND=lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) virtual/pkgconfig
+DEFINED_PHASES=configure install postinst setup unpack
+DEPEND=lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) x11-libs/libSM x11-libs/libX11 x11-libs/libXext nls? ( sys-devel/gettext ) xinerama? ( x11-libs/libXinerama ) xrandr? ( x11-libs/libXrandr )
+DESCRIPTION=Notion is a tiling, tabbed window manager for the X window system
+EAPI=8
+HOMEPAGE=https://notionwm.net/
+INHERIT=lua-single toolchain-funcs readme.gentoo-r1 vcs-snapshot
+IUSE=nls xinerama +xrandr +lua_single_target_lua5-4
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) x11-libs/libSM x11-libs/libX11 x11-libs/libXext nls? ( sys-devel/gettext ) xinerama? ( x11-libs/libXinerama ) xrandr? ( x11-libs/libXrandr )
+REQUIRED_USE=^^ ( lua_single_target_lua5-4 ) xrandr? ( xinerama )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/raboof/notion/archive/f161c1b4dbba1ac81d8e9c3d7e5e353058a4d7d1.tar.gz -> notion-4.0.2_p20220613.tar.gz
+_eclasses_=lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	4fbbbc98f236f1b43acd99476bc3cd85	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-snapshot	19dc666868420457132a7514d4621476
+_md5_=ed2ce1bad68e325f0f4ec97662bb1d62
diff --git a/metadata/md5-cache/x11-wm/notion-9999 b/metadata/md5-cache/x11-wm/notion-9999
index cbe23d50089b..78f6ad49b966 100644
--- a/metadata/md5-cache/x11-wm/notion-9999
+++ b/metadata/md5-cache/x11-wm/notion-9999
@@ -1,15 +1,16 @@
-BDEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=configure install postinst prepare setup unpack
-DEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) x11-libs/libSM x11-libs/libX11 x11-libs/libXext nls? ( sys-devel/gettext ) xinerama? ( x11-libs/libXinerama ) xrandr? ( x11-libs/libXrandr )
+BDEPEND=lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=configure install postinst setup unpack
+DEPEND=lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) x11-libs/libSM x11-libs/libX11 x11-libs/libXext nls? ( sys-devel/gettext ) xinerama? ( x11-libs/libXinerama ) xrandr? ( x11-libs/libXrandr )
 DESCRIPTION=Notion is a tiling, tabbed window manager for the X window system
-EAPI=7
+EAPI=8
 HOMEPAGE=https://notionwm.net/
-IUSE=nls xinerama +xrandr +lua_single_target_lua5-1
+INHERIT=lua-single toolchain-funcs readme.gentoo-r1 git-r3
+IUSE=nls xinerama +xrandr +lua_single_target_lua5-4
 LICENSE=LGPL-2.1
 PROPERTIES=live
-RDEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) x11-libs/libSM x11-libs/libX11 x11-libs/libXext nls? ( sys-devel/gettext ) xinerama? ( x11-libs/libXinerama ) xrandr? ( x11-libs/libXrandr )
-REQUIRED_USE=^^ ( lua_single_target_lua5-1 ) xrandr? ( xinerama )
+RDEPEND=lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) x11-libs/libSM x11-libs/libX11 x11-libs/libXext nls? ( sys-devel/gettext ) xinerama? ( x11-libs/libXinerama ) xrandr? ( x11-libs/libXrandr )
+REQUIRED_USE=^^ ( lua_single_target_lua5-4 ) xrandr? ( xinerama )
 RESTRICT=test
 SLOT=0
-_eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=14f6b62be50d3d5389ff773075dba54d
+_eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	4fbbbc98f236f1b43acd99476bc3cd85	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=f1d3814769d3736473e562d46a388c75
diff --git a/metadata/md5-cache/x11-wm/openbox-3.6.1-r3 b/metadata/md5-cache/x11-wm/openbox-3.6.1-r3
index 78fa40538586..e59625015d2c 100644
--- a/metadata/md5-cache/x11-wm/openbox-3.6.1-r3
+++ b/metadata/md5-cache/x11-wm/openbox-3.6.1-r3
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=http://openbox.org/wiki/Main_Page
 INHERIT=autotools python-single-r1
 IUSE=branding debug imlib nls session startup-notification svg xdg python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv sparc x86 ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv sparc x86 ~x86-linux
 LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 >=dev-libs/libxml2-2.0 >=media-libs/fontconfig-2 x11-libs/cairo x11-libs/libXau x11-libs/libXcursor x11-libs/libXext x11-libs/libXft x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXt >=x11-libs/pango-1.8[X] imlib? ( media-libs/imlib2 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) svg? ( gnome-base/librsvg:2 ) xdg? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_single_target_python3_8? ( dev-python/pyxdg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyxdg[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyxdg[python_targets_python3_10(-)] ) )
 REQUIRED_USE=xdg? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
 SLOT=3
 SRC_URI=http://openbox.org/dist/openbox/openbox-3.6.1.tar.gz branding? ( https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=4341bbb605f7cbcdf0b871f76fae4ea1
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=7e153024be753eda21b3a83c60df7546
diff --git a/metadata/md5-cache/x11-wm/openbox-9999 b/metadata/md5-cache/x11-wm/openbox-9999
index d4a461fe2004..169cca5ad1dc 100644
--- a/metadata/md5-cache/x11-wm/openbox-9999
+++ b/metadata/md5-cache/x11-wm/openbox-9999
@@ -12,5 +12,5 @@ RDEPEND=dev-libs/glib:2 >=dev-libs/libxml2-2.0 >=media-libs/fontconfig-2 x11-lib
 REQUIRED_USE=xdg? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
 SLOT=3
 SRC_URI=branding? ( https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=62ba66c0fba8182b2c861741ecd1474d
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=b2a843798440073fe32211a32998bb41
diff --git a/metadata/md5-cache/x11-wm/page-1.9.8 b/metadata/md5-cache/x11-wm/page-1.9.8
deleted file mode 100644
index acbecf8e5463..000000000000
--- a/metadata/md5-cache/x11-wm/page-1.9.8
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst prepare
-DEPEND=>=x11-libs/libxcb-1.11[xkb] >=x11-libs/xcb-util-0.4.0 >=x11-libs/libXfixes-5.0.3 >=x11-libs/libXdamage-1.1.4-r1 >=x11-libs/libXrandr-1.5.1 >=x11-libs/libXcomposite-0.4.4-r1 >=x11-libs/libXrender-0.9.10 >=x11-libs/libXext-1.3.3 >=x11-libs/cairo-1.14.6[X,xcb(+)] >=x11-libs/pango-1.40.5 >=dev-libs/glib-2.50.3-r1:2 >=x11-base/xcb-proto-1.12-r2 x11-base/xorg-proto sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
-DESCRIPTION=A mouse friendly tiling window manager
-EAPI=6
-HOMEPAGE=https://github.com/gschwind/page
-INHERIT=autotools
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=>=x11-libs/libxcb-1.11[xkb] >=x11-libs/xcb-util-0.4.0 >=x11-libs/libXfixes-5.0.3 >=x11-libs/libXdamage-1.1.4-r1 >=x11-libs/libXrandr-1.5.1 >=x11-libs/libXcomposite-0.4.4-r1 >=x11-libs/libXrender-0.9.10 >=x11-libs/libXext-1.3.3 >=x11-libs/cairo-1.14.6[X,xcb(+)] >=x11-libs/pango-1.40.5 >=dev-libs/glib-2.50.3-r1:2
-SLOT=0
-SRC_URI=https://github.com/gschwind/page/archive/v1.9.8.tar.gz -> page-1.9.8.tar.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=ecc5f71841eb3d8e71557df21018f11d
diff --git a/metadata/md5-cache/x11-wm/page-1.9.9-r3 b/metadata/md5-cache/x11-wm/page-1.9.9-r4
index 7acdc44f3f5e..f78289e2e04d 100644
--- a/metadata/md5-cache/x11-wm/page-1.9.9-r3
+++ b/metadata/md5-cache/x11-wm/page-1.9.9-r4
@@ -1,7 +1,8 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
 DEFINED_PHASES=install postinst prepare
-DEPEND=>=x11-libs/libxcb-1.11[xkb] >=x11-libs/xcb-util-0.4.0 >=x11-libs/libXfixes-5.0.3 >=x11-libs/libXdamage-1.1.4-r1 >=x11-libs/libXrandr-1.5.1 >=x11-libs/libXcomposite-0.4.4-r1 >=x11-libs/libXrender-0.9.10 >=x11-libs/libXext-1.3.3 >=x11-libs/cairo-1.14.6[X,xcb(+)] >=x11-libs/pango-1.40.5 >=dev-libs/glib-2.50.3-r1:2 >=x11-base/xcb-proto-1.12-r2 x11-base/xorg-proto sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+DEPEND=>=x11-libs/libxcb-1.11[xkb] >=x11-libs/xcb-util-0.4.0 >=x11-libs/libXfixes-5.0.3 >=x11-libs/libXdamage-1.1.4-r1 >=x11-libs/libXrandr-1.5.1 >=x11-libs/libXcomposite-0.4.4-r1 >=x11-libs/libXrender-0.9.10 >=x11-libs/libXext-1.3.3 >=x11-libs/cairo-1.14.6[X,xcb(+)] >=x11-libs/pango-1.40.5 >=dev-libs/glib-2.50.3-r1:2 >=x11-base/xcb-proto-1.12-r2 x11-base/xorg-proto
 DESCRIPTION=A mouse friendly tiling window manager
-EAPI=6
+EAPI=8
 HOMEPAGE=https://www.hzog.net/index.php/Main_Page
 INHERIT=autotools
 KEYWORDS=~amd64 ~riscv ~x86
@@ -9,5 +10,5 @@ LICENSE=GPL-3
 RDEPEND=>=x11-libs/libxcb-1.11[xkb] >=x11-libs/xcb-util-0.4.0 >=x11-libs/libXfixes-5.0.3 >=x11-libs/libXdamage-1.1.4-r1 >=x11-libs/libXrandr-1.5.1 >=x11-libs/libXcomposite-0.4.4-r1 >=x11-libs/libXrender-0.9.10 >=x11-libs/libXext-1.3.3 >=x11-libs/cairo-1.14.6[X,xcb(+)] >=x11-libs/pango-1.40.5 >=dev-libs/glib-2.50.3-r1:2
 SLOT=0
 SRC_URI=http://www.hzog.net/pub/page-1.9.9-r1.tar.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=4237cad1857572525d1a2ae52dd8b509
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=9d7c4edcf4a55be407cc2a13ad2803a6
diff --git a/metadata/md5-cache/x11-wm/pekwm-0.1.18 b/metadata/md5-cache/x11-wm/pekwm-0.1.18
index b45488e3327b..dfa9ad526a8d 100644
--- a/metadata/md5-cache/x11-wm/pekwm-0.1.18
+++ b/metadata/md5-cache/x11-wm/pekwm-0.1.18
@@ -4,11 +4,12 @@ DEPEND=media-libs/libpng:0= virtual/jpeg:0 x11-libs/libXpm x11-libs/libXrandr x1
 DESCRIPTION=A lightweight window manager initially based on aewm++
 EAPI=8
 HOMEPAGE=https://www.pekwm.se/ https://github.com/pekdon/pekwm
+INHERIT=autotools desktop
 IUSE=contrib debug themes truetype xinerama
 KEYWORDS=amd64 ~mips ppc x86
 LICENSE=GPL-2
 RDEPEND=media-libs/libpng:0= virtual/jpeg:0 x11-libs/libXpm x11-libs/libXrandr x11-libs/libXrender truetype? ( x11-libs/libXft ) xinerama? ( x11-libs/libXinerama )
 SLOT=0
 SRC_URI=https://github.com/pekdon/pekwm/archive/release-0.1.18.tar.gz -> pekwm-0.1.18.tar.gz themes? ( https://dev.gentoo.org/~jsmolic/distfiles/pekwm-themes.tar.bz2 )
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	desktop	c0d27bf73aa08ca05b663dbd31fbef28	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	desktop	22952d8f27cac191d75529d4c38e6bfa	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=8c70b0ebb85cde315b7d0abab7991fd8
diff --git a/metadata/md5-cache/x11-wm/pekwm-0.2.1 b/metadata/md5-cache/x11-wm/pekwm-0.2.1
index c1d7cfa4cc32..aa0940151e23 100644
--- a/metadata/md5-cache/x11-wm/pekwm-0.2.1
+++ b/metadata/md5-cache/x11-wm/pekwm-0.2.1
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5
+BDEPEND=virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst prepare test
 DEPEND=x11-libs/libX11 x11-libs/libXext jpeg? ( virtual/jpeg:0 ) png? ( media-libs/libpng:0 ) truetype? ( x11-libs/libXft ) xinerama? ( x11-libs/libXinerama ) xpm? ( x11-libs/libXpm )
 DESCRIPTION=A lightweight window manager initially based on aewm++
@@ -11,5 +11,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/libXext jpeg? ( virtual/jpeg:0 ) png? ( media-libs/libpng:0 ) truetype? ( x11-libs/libXft ) xinerama? ( x11-libs/libXinerama ) xpm? ( x11-libs/libXpm )
 SLOT=0
 SRC_URI=https://github.com/pekdon/pekwm/releases/download/release-0.2.1/pekwm-0.2.1.tar.gz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	desktop	c0d27bf73aa08ca05b663dbd31fbef28	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	d524f291c80f9d21ad80fe978e3ca760	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	desktop	22952d8f27cac191d75529d4c38e6bfa	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	d524f291c80f9d21ad80fe978e3ca760	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=d24ecac655a6f74da59fac346fdeceae
diff --git a/metadata/md5-cache/x11-wm/qtile-0.16.1 b/metadata/md5-cache/x11-wm/qtile-0.16.1
index 67e074ded975..5e1fb852d253 100644
--- a/metadata/md5-cache/x11-wm/qtile-0.16.1
+++ b/metadata/md5-cache/x11-wm/qtile-0.16.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/q/qtile/qtile-0.16.1.tar.gz
-_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=bcab154e0f4e87ae4f9573b6aa9cec57
diff --git a/metadata/md5-cache/x11-wm/qtile-0.17.0-r1 b/metadata/md5-cache/x11-wm/qtile-0.17.0-r1
index ab8f1009b158..22a66de457c8 100644
--- a/metadata/md5-cache/x11-wm/qtile-0.17.0-r1
+++ b/metadata/md5-cache/x11-wm/qtile-0.17.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/q/qtile/qtile-0.17.0.tar.gz
-_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=5fb19c038467c9adf974000e5e560e6c
diff --git a/metadata/md5-cache/x11-wm/qtile-0.21.0-r1 b/metadata/md5-cache/x11-wm/qtile-0.21.0-r1
new file mode 100644
index 000000000000..95f948c4c8c0
--- /dev/null
+++ b/metadata/md5-cache/x11-wm/qtile-0.21.0-r1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( media-gfx/imagemagick[X] x11-base/xorg-server[xephyr] ) test? ( >=dev-python/cairocffi-0.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cffi-1.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/dbus-next[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pygobject[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/six-1.4.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/xcffib-0.10.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] media-sound/pulseaudio x11-libs/cairo[X,xcb(+)] x11-libs/libnotify[introspection] x11-libs/pango >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A full-featured, hackable tiling window manager written in Python
+EAPI=8
+HOMEPAGE=http://qtile.org/
+INHERIT=distutils-r1 virtualx
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 test
+KEYWORDS=amd64 ~riscv ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/cairocffi-0.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cffi-1.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/dbus-next[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pygobject[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/six-1.4.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/xcffib-0.10.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] media-sound/pulseaudio x11-libs/cairo[X,xcb(+)] x11-libs/libnotify[introspection] x11-libs/pango python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/q/qtile/qtile-0.21.0.tar.gz
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135
+_md5_=ba2dff25c93ffa7cb6a9ee36827d4a83
diff --git a/metadata/md5-cache/x11-wm/ratpoison-1.4.9-r2 b/metadata/md5-cache/x11-wm/ratpoison-1.4.9-r2
index 8597067c662a..54d4a9aeb9e1 100644
--- a/metadata/md5-cache/x11-wm/ratpoison-1.4.9-r2
+++ b/metadata/md5-cache/x11-wm/ratpoison-1.4.9-r2
@@ -3,11 +3,12 @@ DEPEND=emacs? ( >=app-editors/emacs-23.1:* ) history? ( sys-libs/readline:= ) xf
 DESCRIPTION=window manager without mouse dependency
 EAPI=6
 HOMEPAGE=http://www.nongnu.org/ratpoison/
+INHERIT=elisp-common toolchain-funcs
 IUSE=debug emacs +history sloppy +xft +xrandr
 KEYWORDS=amd64 ~hppa ppc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=emacs? ( >=app-editors/emacs-23.1:* ) history? ( sys-libs/readline:= ) xft? ( x11-libs/libXft ) xrandr? ( x11-libs/libXrandr ) dev-perl/Pod-Parser x11-libs/libX11 x11-libs/libXtst
 SLOT=0
 SRC_URI=http://download.savannah.gnu.org/releases/ratpoison/ratpoison-1.4.9.tar.xz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	elisp-common	e7aaa047873789f549ea3df2f04b2145	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	elisp-common	e7aaa047873789f549ea3df2f04b2145	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=a851fe855d5c6640d700103d8ffa463a
diff --git a/metadata/md5-cache/x11-wm/ratpoison-9999 b/metadata/md5-cache/x11-wm/ratpoison-9999
index 952c3439c58b..3a027fb5f809 100644
--- a/metadata/md5-cache/x11-wm/ratpoison-9999
+++ b/metadata/md5-cache/x11-wm/ratpoison-9999
@@ -4,10 +4,11 @@ DEPEND=emacs? ( >=app-editors/emacs-23.1:* ) history? ( sys-libs/readline:= ) xf
 DESCRIPTION=window manager without mouse dependency
 EAPI=7
 HOMEPAGE=https://www.nongnu.org/ratpoison/
+INHERIT=autotools elisp-common git-r3 toolchain-funcs
 IUSE=debug emacs +history sloppy +xft +xrandr
 LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=emacs? ( >=app-editors/emacs-23.1:* ) history? ( sys-libs/readline:= ) xft? ( x11-libs/libXft ) xrandr? ( x11-libs/libXrandr ) dev-perl/Pod-Parser x11-libs/libX11 x11-libs/libXtst
 SLOT=0
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	elisp-common	e7aaa047873789f549ea3df2f04b2145	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	elisp-common	e7aaa047873789f549ea3df2f04b2145	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=7c417b5cfeb38de16b221e5427c0e14e
diff --git a/metadata/md5-cache/x11-wm/sawfish-1.12.90-r2 b/metadata/md5-cache/x11-wm/sawfish-1.12.90-r2
index e9bc8a07a529..054553ff2d65 100644
--- a/metadata/md5-cache/x11-wm/sawfish-1.12.90-r2
+++ b/metadata/md5-cache/x11-wm/sawfish-1.12.90-r2
@@ -10,5 +10,5 @@ LICENSE=GPL-2 Artistic-2
 RDEPEND=>=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 )
 SLOT=0
 SRC_URI=https://download.tuxfamily.org/sawfish/sawfish_1.12.90.tar.xz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	e7aaa047873789f549ea3df2f04b2145	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	desktop	22952d8f27cac191d75529d4c38e6bfa	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	e7aaa047873789f549ea3df2f04b2145	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=94d95bab4aabefb6eabda87a6cef2f85
diff --git a/metadata/md5-cache/x11-wm/selectwm-0.4.1-r1 b/metadata/md5-cache/x11-wm/selectwm-0.4.1-r1
deleted file mode 100644
index 9386daddaf3d..000000000000
--- a/metadata/md5-cache/x11-wm/selectwm-0.4.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure prepare
-DEPEND=x11-libs/gtk+:2 dev-libs/glib:2 virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
-DESCRIPTION=window manager selector tool
-EAPI=6
-HOMEPAGE=https://ordiluc.net/selectwm
-INHERIT=autotools
-IUSE=nls
-KEYWORDS=amd64 ppc sparc x86
-LICENSE=GPL-2+
-RDEPEND=x11-libs/gtk+:2 dev-libs/glib:2
-SLOT=2
-SRC_URI=https://ordiluc.net/selectwm/selectwm-0.4.1.tar.bz2
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=26843df353d207a09279d92c688ab1d2
diff --git a/metadata/md5-cache/x11-wm/selectwm-0.4.1-r2 b/metadata/md5-cache/x11-wm/selectwm-0.4.1-r2
new file mode 100644
index 000000000000..46a72dd2f7d2
--- /dev/null
+++ b/metadata/md5-cache/x11-wm/selectwm-0.4.1-r2
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare
+DEPEND=x11-libs/gtk+:2 dev-libs/glib:2
+DESCRIPTION=window manager selector tool
+EAPI=8
+HOMEPAGE=https://ordiluc.net/selectwm
+INHERIT=autotools
+IUSE=nls
+KEYWORDS=amd64 ppc sparc x86
+LICENSE=GPL-2+
+RDEPEND=x11-libs/gtk+:2 dev-libs/glib:2
+SLOT=2
+SRC_URI=https://ordiluc.net/selectwm/selectwm-0.4.1.tar.bz2
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=01b614db57e7412d547ce55231417536
diff --git a/metadata/md5-cache/x11-wm/sithwm-1.2.3 b/metadata/md5-cache/x11-wm/sithwm-1.2.3
index cc220bf715b9..a8dff0b2e482 100644
--- a/metadata/md5-cache/x11-wm/sithwm-1.2.3
+++ b/metadata/md5-cache/x11-wm/sithwm-1.2.3
@@ -3,10 +3,11 @@ DEPEND=x11-libs/libX11
 DESCRIPTION=Minimalist Window Manager for X
 EAPI=7
 HOMEPAGE=https://sithwm.darkside.no/
+INHERIT=toolchain-funcs
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+ MIT 9wm
 RDEPEND=x11-libs/libX11
 SLOT=0
 SRC_URI=https://sithwm.darkside.no/sn/sithwm-1.2.3.tgz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=3e710039a20d970934819700c014b07c
diff --git a/metadata/md5-cache/x11-wm/spectrwm-3.4.1 b/metadata/md5-cache/x11-wm/spectrwm-3.4.1
index 686c4667bb3f..88bfbf73c4bc 100644
--- a/metadata/md5-cache/x11-wm/spectrwm-3.4.1
+++ b/metadata/md5-cache/x11-wm/spectrwm-3.4.1
@@ -3,10 +3,11 @@ DEPEND=elibc_musl? ( sys-libs/queue-standalone ) virtual/pkgconfig x11-libs/libX
 DESCRIPTION=Small dynamic tiling window manager for X11
 EAPI=7
 HOMEPAGE=https://github.com/conformal/spectrwm
+INHERIT=toolchain-funcs
 KEYWORDS=amd64 x86
 LICENSE=ISC
 RDEPEND=x11-misc/dmenu
 SLOT=0
 SRC_URI=https://github.com/conformal/spectrwm/archive/SPECTRWM_3_4_1.tar.gz -> spectrwm-3.4.1.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=7bf9697de5664f5f76d2121a255a5fc2
diff --git a/metadata/md5-cache/x11-wm/stumpwm-18.05 b/metadata/md5-cache/x11-wm/stumpwm-18.05
index e834f362733c..b846ffeb1a7c 100644
--- a/metadata/md5-cache/x11-wm/stumpwm-18.05
+++ b/metadata/md5-cache/x11-wm/stumpwm-18.05
@@ -12,5 +12,5 @@ RDEPEND=dev-lisp/alexandria dev-lisp/cl-ppcre dev-lisp/clx >=dev-lisp/sbcl-1.3.0
 RESTRICT=strip mirror
 SLOT=0
 SRC_URI=https://github.com/stumpwm/stumpwm/archive/18.05.tar.gz -> stumpwm-18.05.tar.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	common-lisp-3	747af8b5a3e934f3087352abaaaa4518	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	e7aaa047873789f549ea3df2f04b2145	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	common-lisp-3	747af8b5a3e934f3087352abaaaa4518	desktop	22952d8f27cac191d75529d4c38e6bfa	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	e7aaa047873789f549ea3df2f04b2145	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=e2c849f502e85d1cbedbf65c3b17a593
diff --git a/metadata/md5-cache/x11-wm/stumpwm-contrib-20180128 b/metadata/md5-cache/x11-wm/stumpwm-contrib-20180128
index d4f55bbca7ae..16d40c17c6c6 100644
--- a/metadata/md5-cache/x11-wm/stumpwm-contrib-20180128
+++ b/metadata/md5-cache/x11-wm/stumpwm-contrib-20180128
@@ -9,5 +9,5 @@ PDEPEND=virtual/commonlisp
 RDEPEND=>=x11-wm/stumpwm-1.0.0
 SLOT=0
 SRC_URI=mirror://gentoo/stumpwm-contrib-20180128.tar.bz2
-_eclasses_=common-lisp-3	747af8b5a3e934f3087352abaaaa4518	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=common-lisp-3	747af8b5a3e934f3087352abaaaa4518	desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=ed6a1fa23edcf54207cd7277c6db24af
diff --git a/metadata/md5-cache/x11-wm/stumpwm-contrib-99999999 b/metadata/md5-cache/x11-wm/stumpwm-contrib-99999999
index 53a6d04e4787..fe69108410cf 100644
--- a/metadata/md5-cache/x11-wm/stumpwm-contrib-99999999
+++ b/metadata/md5-cache/x11-wm/stumpwm-contrib-99999999
@@ -9,5 +9,5 @@ PDEPEND=virtual/commonlisp
 PROPERTIES=live
 RDEPEND=>=x11-wm/stumpwm-0.9.9
 SLOT=0
-_eclasses_=common-lisp-3	747af8b5a3e934f3087352abaaaa4518	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=common-lisp-3	747af8b5a3e934f3087352abaaaa4518	desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=010d2fa79fa911f7edfb7b9fc13889a6
diff --git a/metadata/md5-cache/x11-wm/subtle-0.11.3244-r1 b/metadata/md5-cache/x11-wm/subtle-0.11.3244-r1
index 447195af641c..6660861e8ba5 100644
--- a/metadata/md5-cache/x11-wm/subtle-0.11.3244-r1
+++ b/metadata/md5-cache/x11-wm/subtle-0.11.3244-r1
@@ -4,6 +4,7 @@ DEPEND=x11-libs/libX11 xft? ( x11-libs/libXft ) xinerama? ( x11-libs/libXinerama
 DESCRIPTION=A manual tiling window manager
 EAPI=7
 HOMEPAGE=https://subforge.org/projects/subtle/wiki
+INHERIT=ruby-ng toolchain-funcs
 IUSE=debug doc +xft xinerama xpm +xrandr +xtest test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
@@ -12,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~radhermit/dist/subtle-0.11.3244.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	ruby-ng	e4c8836049bf65af19ab322fe5a81005	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=49a1326fcd33328d94a226525b20afa0
diff --git a/metadata/md5-cache/x11-wm/treewm-0.4.5-r2 b/metadata/md5-cache/x11-wm/treewm-0.4.5-r2
index cd10ad50ad01..8e5bb4c6705a 100644
--- a/metadata/md5-cache/x11-wm/treewm-0.4.5-r2
+++ b/metadata/md5-cache/x11-wm/treewm-0.4.5-r2
@@ -3,10 +3,11 @@ DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm x11-libs/libXpm x11-
 DESCRIPTION=WindowManager that arranges the windows in a tree (not in a list)
 EAPI=7
 HOMEPAGE=http://treewm.sourceforge.net/
+INHERIT=toolchain-funcs
 KEYWORDS=~amd64 ppc sparc x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm x11-libs/libXpm
 SLOT=0
 SRC_URI=mirror://sourceforge/treewm/treewm-0.4.5.tar.bz2
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=3c7f66775fe3d687209f5a612bec33a6
diff --git a/metadata/md5-cache/x11-wm/twm-1.0.11 b/metadata/md5-cache/x11-wm/twm-1.0.11
deleted file mode 100644
index c0518bb3adc4..000000000000
--- a/metadata/md5-cache/x11-wm/twm-1.0.11
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare unpack
-DEPEND=x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXrandr x11-libs/libXt x11-base/xorg-proto
-DESCRIPTION=X.Org Tab Window Manager
-EAPI=7
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/twm
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXrandr x11-libs/libXt media-fonts/font-adobe-75dpi
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/app/twm-1.0.11.tar.xz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xorg-3	833caab4719b3738365b4707c7ffa5c6
-_md5_=a32abbe9ebec6f44e48d3af551991960
diff --git a/metadata/md5-cache/x11-wm/twm-1.0.12 b/metadata/md5-cache/x11-wm/twm-1.0.12
index bfced4989aa1..2151c0677c65 100644
--- a/metadata/md5-cache/x11-wm/twm-1.0.12
+++ b/metadata/md5-cache/x11-wm/twm-1.0.12
@@ -5,10 +5,10 @@ DESCRIPTION=X.Org Tab Window Manager
 EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/twm
 INHERIT=xorg-3
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXrandr x11-libs/libXt media-fonts/font-adobe-75dpi
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/twm-1.0.12.tar.xz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xorg-3	833caab4719b3738365b4707c7ffa5c6
-_md5_=acd5bd04b7e9f34e16b1e3d407dd5e33
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xorg-3	d2463997f7fda5cfc20b4c390039a361
+_md5_=77a5cfd069af562e6503103896d07630
diff --git a/metadata/md5-cache/x11-wm/vtwm-5.4.7-r2 b/metadata/md5-cache/x11-wm/vtwm-5.4.7-r2
index de5d56a7563b..869872e3f4c6 100644
--- a/metadata/md5-cache/x11-wm/vtwm-5.4.7-r2
+++ b/metadata/md5-cache/x11-wm/vtwm-5.4.7-r2
@@ -4,11 +4,12 @@ DEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libXext x11-libs/
 DESCRIPTION=TWM descendant that implements a Virtual Desktop
 EAPI=7
 HOMEPAGE=http://www.vtwm.org/
+INHERIT=toolchain-funcs
 IUSE=rplay
 KEYWORDS=~alpha ~amd64 ppc sparc x86
 LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libXext x11-libs/libXpm rplay? ( media-sound/rplay )
 SLOT=0
 SRC_URI=http://www.vtwm.org/downloads/vtwm-5.4.7.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=9d014b897e13f2944f09ee2334ec03aa
diff --git a/metadata/md5-cache/x11-wm/windowlab-1.40-r1 b/metadata/md5-cache/x11-wm/windowlab-1.40-r1
index e62404f1c34d..5a5dca34010d 100644
--- a/metadata/md5-cache/x11-wm/windowlab-1.40-r1
+++ b/metadata/md5-cache/x11-wm/windowlab-1.40-r1
@@ -3,11 +3,12 @@ DEPEND=truetype? ( x11-libs/libXft ) x11-libs/libXext virtual/pkgconfig x11-base
 DESCRIPTION=small and simple window manager of novel design
 EAPI=6
 HOMEPAGE=http://www.nickgravgaard.com/windowlab/
+INHERIT=toolchain-funcs
 IUSE=truetype
 KEYWORDS=amd64 ~mips ppc x86
 LICENSE=GPL-2
 RDEPEND=truetype? ( x11-libs/libXft ) x11-libs/libXext
 SLOT=0
 SRC_URI=http://www.nickgravgaard.com/windowlab/windowlab-1.40.tar
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=3dc3e5c99555070b14594201fc517dec
diff --git a/metadata/md5-cache/x11-wm/windowlab-1.40-r2 b/metadata/md5-cache/x11-wm/windowlab-1.40-r2
new file mode 100644
index 000000000000..92463c6a3f25
--- /dev/null
+++ b/metadata/md5-cache/x11-wm/windowlab-1.40-r2
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install postinst
+DEPEND=truetype? ( x11-libs/libXft ) x11-libs/libXext x11-base/xorg-proto
+DESCRIPTION=small and simple window manager of novel design
+EAPI=8
+HOMEPAGE=http://www.nickgravgaard.com/windowlab/
+INHERIT=toolchain-funcs
+IUSE=truetype
+KEYWORDS=~amd64 ~mips ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=truetype? ( x11-libs/libXft ) x11-libs/libXext
+SLOT=0
+SRC_URI=http://www.nickgravgaard.com/windowlab/windowlab-1.40.tar
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=b40f257c5f2d01ccc022c1a8b7493959
diff --git a/metadata/md5-cache/x11-wm/windowmaker-0.95.9-r2 b/metadata/md5-cache/x11-wm/windowmaker-0.95.9-r2
index 046fdd00ecd6..5cb91b7fa83c 100644
--- a/metadata/md5-cache/x11-wm/windowmaker-0.95.9-r2
+++ b/metadata/md5-cache/x11-wm/windowmaker-0.95.9-r2
@@ -4,11 +4,12 @@ DEPEND=media-libs/fontconfig >=x11-libs/libXft-2.1.0 x11-libs/libXmu x11-libs/li
 DESCRIPTION=The fast and light GNUstep window manager
 EAPI=7
 HOMEPAGE=https://www.windowmaker.org/
+INHERIT=autotools desktop eutils
 IUSE=gif imagemagick jpeg modelock nls png tiff webp xinerama +xpm xrandr
-KEYWORDS=~alpha amd64 arm ~hppa ~mips ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~hppa ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=media-libs/fontconfig >=x11-libs/libXft-2.1.0 x11-libs/libXmu x11-libs/libXpm x11-libs/libXt x11-libs/libXv gif? ( >=media-libs/giflib-4.1.0-r3 ) imagemagick? ( >=media-gfx/imagemagick-7:0= ) jpeg? ( virtual/jpeg:0= ) nls? ( virtual/libintl ) png? ( media-libs/libpng:0= ) tiff? ( media-libs/tiff:0 ) webp? ( media-libs/libwebp ) xinerama? ( x11-libs/libXinerama ) xrandr? ( x11-libs/libXrandr )
 SLOT=0
 SRC_URI=https://windowmaker.org/pub/source/release/WindowMaker-0.95.9.tar.gz https://www.windowmaker.org/pub/source/release/WindowMaker-extra-0.1.tar.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=07519f20f65756dfaf8f3805cc36baeb
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=52e29c85f3bc1a43c808e5fe486788a8
diff --git a/metadata/md5-cache/x11-wm/windowmaker-9999 b/metadata/md5-cache/x11-wm/windowmaker-9999
index bfd507ff493b..6132ed3e6fac 100644
--- a/metadata/md5-cache/x11-wm/windowmaker-9999
+++ b/metadata/md5-cache/x11-wm/windowmaker-9999
@@ -4,11 +4,12 @@ DEPEND=media-libs/fontconfig >=x11-libs/libXft-2.1.0 x11-libs/libXmu x11-libs/li
 DESCRIPTION=The fast and light GNUstep window manager
 EAPI=7
 HOMEPAGE=https://www.windowmaker.org/
+INHERIT=autotools desktop git-r3
 IUSE=gif imagemagick jpeg modelock nls png tiff webp xinerama +xpm xrandr
 LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=media-libs/fontconfig >=x11-libs/libXft-2.1.0 x11-libs/libXmu x11-libs/libXpm x11-libs/libXt x11-libs/libXv gif? ( >=media-libs/giflib-4.1.0-r3 ) imagemagick? ( >=media-gfx/imagemagick-7:0= ) jpeg? ( virtual/jpeg:0= ) nls? ( virtual/libintl ) png? ( media-libs/libpng:0= ) tiff? ( media-libs/tiff:0 ) webp? ( media-libs/libwebp ) xinerama? ( x11-libs/libXinerama ) xrandr? ( x11-libs/libXrandr )
 SLOT=0
 SRC_URI=https://www.windowmaker.org/pub/source/release/WindowMaker-extra-0.1.tar.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	desktop	c0d27bf73aa08ca05b663dbd31fbef28	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	desktop	22952d8f27cac191d75529d4c38e6bfa	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=2f8eaf940168d86573f92785099b6ace
diff --git a/metadata/md5-cache/x11-wm/wm2-4-r1 b/metadata/md5-cache/x11-wm/wm2-4-r1
index ca8a5e995ae6..3d31064b68be 100644
--- a/metadata/md5-cache/x11-wm/wm2-4-r1
+++ b/metadata/md5-cache/x11-wm/wm2-4-r1
@@ -3,10 +3,11 @@ DEPEND=x11-libs/libXmu x11-base/xorg-proto
 DESCRIPTION=Small, unconfigurable window manager
 EAPI=7
 HOMEPAGE=http://www.all-day-breakfast.com/wm2/
+INHERIT=toolchain-funcs
 KEYWORDS=amd64 ppc x86
 LICENSE=wm2 HPND
 RDEPEND=x11-libs/libXmu
 SLOT=0
 SRC_URI=http://www.all-day-breakfast.com/wm2/wm2-4.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=8c48a7d132d49ef6745380ac80413d1d
diff --git a/metadata/md5-cache/x11-wm/wmfs-20180520 b/metadata/md5-cache/x11-wm/wmfs-20180520
index 2425707639f1..8788be4545cb 100644
--- a/metadata/md5-cache/x11-wm/wmfs-20180520
+++ b/metadata/md5-cache/x11-wm/wmfs-20180520
@@ -4,11 +4,12 @@ DEPEND=media-libs/freetype media-libs/imlib2[X] x11-libs/libX11 x11-libs/libXft
 DESCRIPTION=Window Manager From Scratch, A tiling window manager highly configurable
 EAPI=7
 HOMEPAGE=https://github.com/xorg62/wmfs
+INHERIT=toolchain-funcs
 IUSE=+imlib2 +xinerama
 KEYWORDS=~amd64
 LICENSE=BSD
 RDEPEND=media-libs/freetype media-libs/imlib2[X] x11-libs/libX11 x11-libs/libXft x11-libs/libXinerama x11-libs/libXrandr
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jsmolic/distfiles/wmfs-20180520.tar.xz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=025536a283089b1bfb8bd8991cee6600
diff --git a/metadata/md5-cache/x11-wm/wmfs-99999999 b/metadata/md5-cache/x11-wm/wmfs-99999999
index 94a4733b0415..9bde8e322185 100644
--- a/metadata/md5-cache/x11-wm/wmfs-99999999
+++ b/metadata/md5-cache/x11-wm/wmfs-99999999
@@ -4,10 +4,11 @@ DEPEND=media-libs/freetype media-libs/imlib2[X] x11-libs/libX11 x11-libs/libXft
 DESCRIPTION=Window Manager From Scratch, A tiling window manager highly configurable
 EAPI=7
 HOMEPAGE=https://github.com/xorg62/wmfs
+INHERIT=git-r3 toolchain-funcs
 IUSE=+imlib2 +xinerama
 LICENSE=BSD
 PROPERTIES=live
 RDEPEND=media-libs/freetype media-libs/imlib2[X] x11-libs/libX11 x11-libs/libXft x11-libs/libXinerama x11-libs/libXrandr
 SLOT=0
-_eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=c1d8368617b966e8e6dbe9cfc5ce128a
diff --git a/metadata/md5-cache/x11-wm/wmii-3.9.2-r6 b/metadata/md5-cache/x11-wm/wmii-3.9.2-r6
index 014961bca200..398c6d627643 100644
--- a/metadata/md5-cache/x11-wm/wmii-3.9.2-r6
+++ b/metadata/md5-cache/x11-wm/wmii-3.9.2-r6
@@ -4,10 +4,11 @@ DEPEND=media-libs/freetype >=sys-libs/libixp-0.5_p20110208-r3 x11-libs/libXext x
 DESCRIPTION=A dynamic window manager for X11
 EAPI=7
 HOMEPAGE=https://github.com/0intro/wmii
+INHERIT=flag-o-matic multilib toolchain-funcs
 KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=media-libs/freetype >=sys-libs/libixp-0.5_p20110208-r3 x11-libs/libXext x11-libs/libXft x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender x11-libs/libX11 media-fonts/font-misc-misc x11-apps/xmessage x11-apps/xsetroot
 SLOT=0
 SRC_URI=http://dl.suckless.org/wmii/wmii+ixp-3.9.2.tbz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=7187d2d9fc7bfd1558d90d8d5e36ff17
diff --git a/metadata/md5-cache/x11-wm/wmii-3.9.2-r7 b/metadata/md5-cache/x11-wm/wmii-3.9.2-r7
new file mode 100644
index 000000000000..e9e4d8468246
--- /dev/null
+++ b/metadata/md5-cache/x11-wm/wmii-3.9.2-r7
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile install prepare
+DEPEND=media-libs/freetype >=sys-libs/libixp-0.5_p20110208-r3 x11-libs/libXext x11-libs/libXft x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender x11-libs/libX11
+DESCRIPTION=A dynamic window manager for X11
+EAPI=8
+HOMEPAGE=https://github.com/0intro/wmii
+INHERIT=flag-o-matic toolchain-funcs
+KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=media-libs/freetype >=sys-libs/libixp-0.5_p20110208-r3 x11-libs/libXext x11-libs/libXft x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender x11-libs/libX11 media-fonts/font-misc-misc x11-apps/xmessage x11-apps/xsetroot
+SLOT=0
+SRC_URI=https://dl.suckless.org/wmii/wmii+ixp-3.9.2.tbz
+_eclasses_=flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=6ec238a2defa7e5e1515702d2ee2941e
diff --git a/metadata/md5-cache/x11-wm/xmonad-0.15 b/metadata/md5-cache/x11-wm/xmonad-0.15
index 784acb34a76b..e7d0be85c597 100644
--- a/metadata/md5-cache/x11-wm/xmonad-0.15
+++ b/metadata/md5-cache/x11-wm/xmonad-0.15
@@ -11,5 +11,5 @@ RDEPEND=dev-haskell/data-default:=[profile?] dev-haskell/extensible-exceptions:=
 RESTRICT=!test? ( test )
 SLOT=0/0.15
 SRC_URI=https://hackage.haskell.org/package/xmonad-0.15/xmonad-0.15.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	ebeaf198ca6bf70c43b10488b7cdcdcf	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	81cdafdd21e27dfc13f0f7b4947fa145	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=6fc8c2c92ee8804f2052153b8ad31a2c
diff --git a/metadata/md5-cache/x11-wm/xmonad-0.15-r1 b/metadata/md5-cache/x11-wm/xmonad-0.15-r1
index 5cfb0cdbf23c..d0d9b8904bcc 100644
--- a/metadata/md5-cache/x11-wm/xmonad-0.15-r1
+++ b/metadata/md5-cache/x11-wm/xmonad-0.15-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-haskell/data-default:=[profile?] dev-haskell/extensible-exceptions:=
 RESTRICT=!test? ( test )
 SLOT=0/0.15
 SRC_URI=https://hackage.haskell.org/package/xmonad-0.15/xmonad-0.15.tar.gz https://patch-diff.githubusercontent.com/raw/xmonad/xmonad/pull/259.patch -> xmonad-259.patch
-_eclasses_=ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	ebeaf198ca6bf70c43b10488b7cdcdcf	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	81cdafdd21e27dfc13f0f7b4947fa145	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=b993a80eff8858aff675e2572db3f4c4
diff --git a/metadata/md5-cache/x11-wm/xmonad-contrib-0.16 b/metadata/md5-cache/x11-wm/xmonad-contrib-0.16
index c9984db9f0d2..ffc36c0227f1 100644
--- a/metadata/md5-cache/x11-wm/xmonad-contrib-0.16
+++ b/metadata/md5-cache/x11-wm/xmonad-contrib-0.16
@@ -10,5 +10,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/extensible-exceptions:=[profile?] >=dev-haskell/mtl-1:=[profile?] <dev-haskell/mtl-3:=[profile?] dev-haskell/old-locale:=[profile?] dev-haskell/old-time:=[profile?] dev-haskell/random:=[profile?] dev-haskell/semigroups:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-haskell/x11-1.6.1:=[profile?] <dev-haskell/x11-1.10:=[profile?] >=dev-lang/ghc-8.0.1:= >=x11-wm/xmonad-0.15:=[profile?] <x11-wm/xmonad-0.16:=[profile?] xft? ( >=dev-haskell/x11-xft-0.2:=[profile?] )
 SLOT=0/0.16
 SRC_URI=https://hackage.haskell.org/package/xmonad-contrib-0.16/xmonad-contrib-0.16.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	ebeaf198ca6bf70c43b10488b7cdcdcf	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	81cdafdd21e27dfc13f0f7b4947fa145	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=8c21bc5d1e74bc834c79eed11cb8f0d8
diff --git a/metadata/md5-cache/x11-wm/xoat-9999 b/metadata/md5-cache/x11-wm/xoat-9999
index 9d991cf5ed8e..3dd1fdc74cdb 100644
--- a/metadata/md5-cache/x11-wm/xoat-9999
+++ b/metadata/md5-cache/x11-wm/xoat-9999
@@ -4,10 +4,11 @@ DEPEND=x11-libs/libX11 x11-libs/libXft x11-libs/libXinerama
 DESCRIPTION=X Obstinate Asymmetric Tiler
 EAPI=7
 HOMEPAGE=https://github.com/seanpringle/xoat
+INHERIT=git-r3 savedconfig toolchain-funcs
 IUSE=savedconfig
 LICENSE=MIT
 PROPERTIES=live
 RDEPEND=x11-libs/libX11 x11-libs/libXft x11-libs/libXinerama !savedconfig? ( x11-misc/dmenu )
 SLOT=0
-_eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	portability	d33a77692bb47e8227f27e17fb9c3c05	savedconfig	7cb1bf66b4acedc4f06802a012d3b08d	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4fbbbc98f236f1b43acd99476bc3cd85	portability	d33a77692bb47e8227f27e17fb9c3c05	savedconfig	7cb1bf66b4acedc4f06802a012d3b08d	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=e1d927fa9d1edc75a70f7d20c3b8feac
diff --git a/metadata/md5-cache/x11-wm/xpra-4.2 b/metadata/md5-cache/x11-wm/xpra-4.2
index cb9764344471..e4301e3f4a82 100644
--- a/metadata/md5-cache/x11-wm/xpra-4.2
+++ b/metadata/md5-cache/x11-wm/xpra-4.2
@@ -13,5 +13,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://xpra.org/src/xpra-4.2.tar.gz
-_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	udev	2d229ad4bfa09058e0184b1ca900db32	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	udev	f3a0a3964e2028a140c181f00eea9712	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=57061f01c1d20b69f08d97ea60ad069d
diff --git a/metadata/md5-cache/x11-wm/xpra-4.3.3 b/metadata/md5-cache/x11-wm/xpra-4.3.3
index b4da571b0ac3..e7aa5868ee9c 100644
--- a/metadata/md5-cache/x11-wm/xpra-4.3.3
+++ b/metadata/md5-cache/x11-wm/xpra-4.3.3
@@ -5,13 +5,13 @@ DESCRIPTION=X Persistent Remote Apps (xpra) and Partitioning WM (parti) based on
 EAPI=8
 HOMEPAGE=https://xpra.org/
 INHERIT=xdg xdg-utils distutils-r1 tmpfiles udev
-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 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+IUSE=brotli +client +clipboard csc cups dbus doc ffmpeg jpeg html ibus +lz4 lzo minimal opengl pillow pinentry pulseaudio +server sound systemd test udev vpx webcam webp xdg xinerama python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2 BSD
-RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-),cairo] opengl? ( dev-python/pyopengl[python_targets_python3_8(-)] ) sound? ( dev-python/gst-python:1.0[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( dev-python/pygobject:3[python_targets_python3_9(-),cairo] opengl? ( dev-python/pyopengl[python_targets_python3_9(-)] ) sound? ( dev-python/gst-python:1.0[python_targets_python3_9(-)] ) ) python_single_target_python3_10? ( dev-python/pygobject:3[python_targets_python3_10(-),cairo] opengl? ( dev-python/pyopengl[python_targets_python3_10(-)] ) sound? ( dev-python/gst-python:1.0[python_targets_python3_10(-)] ) ) x11-libs/gtk+:3[introspection] x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXres x11-libs/libXtst x11-libs/libxkbfile brotli? ( app-arch/brotli ) csc? ( >=media-video/ffmpeg-1.2.2:0= ) ffmpeg? ( >=media-video/ffmpeg-3.2.2:0=[x264,x265] ) jpeg? ( media-libs/libjpeg-turbo ) pulseaudio? ( media-sound/pulseaudio media-plugins/gst-plugins-pulse:1.0 ) sound? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) vpx? ( media-libs/libvpx media-video/ffmpeg ) webp? ( media-libs/libwebp ) python_single_target_python3_8? ( dev-python/netifaces[python_targets_python3_8(-)] dev-python/pillow[jpeg?,python_targets_python3_8(-)] dev-python/rencode[python_targets_python3_8(-)] dbus? ( dev-python/dbus-python[python_targets_python3_8(-)] ) xdg? ( dev-python/pyxdg[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( dev-python/netifaces[python_targets_python3_9(-)] dev-python/pillow[jpeg?,python_targets_python3_9(-)] dev-python/rencode[python_targets_python3_9(-)] dbus? ( dev-python/dbus-python[python_targets_python3_9(-)] ) xdg? ( dev-python/pyxdg[python_targets_python3_9(-)] ) ) python_single_target_python3_10? ( dev-python/netifaces[python_targets_python3_10(-)] dev-python/pillow[jpeg?,python_targets_python3_10(-)] dev-python/rencode[python_targets_python3_10(-)] dbus? ( dev-python/dbus-python[python_targets_python3_10(-)] ) xdg? ( dev-python/pyxdg[python_targets_python3_10(-)] ) ) html? ( www-apps/xpra-html5 ) server? ( x11-base/xorg-server[-minimal,xvfb] x11-drivers/xf86-input-void ) xinerama? ( x11-libs/libfakeXinerama ) python_single_target_python3_8? ( cups? ( dev-python/pycups[python_targets_python3_8(-)] ) lz4? ( dev-python/lz4[python_targets_python3_8(-)] ) lzo? ( >=dev-python/python-lzo-0.7.0[python_targets_python3_8(-)] ) opengl? ( client? ( dev-python/pyopengl_accelerate[python_targets_python3_8(-)] ) ) webcam? ( dev-python/numpy[python_targets_python3_8(-)] dev-python/pyinotify[python_targets_python3_8(-)] media-libs/opencv[python_targets_python3_8(-),python] ) ) python_single_target_python3_9? ( cups? ( dev-python/pycups[python_targets_python3_9(-)] ) lz4? ( dev-python/lz4[python_targets_python3_9(-)] ) lzo? ( >=dev-python/python-lzo-0.7.0[python_targets_python3_9(-)] ) opengl? ( client? ( dev-python/pyopengl_accelerate[python_targets_python3_9(-)] ) ) webcam? ( dev-python/numpy[python_targets_python3_9(-)] dev-python/pyinotify[python_targets_python3_9(-)] media-libs/opencv[python_targets_python3_9(-),python] ) ) python_single_target_python3_10? ( cups? ( dev-python/pycups[python_targets_python3_10(-)] ) lz4? ( dev-python/lz4[python_targets_python3_10(-)] ) lzo? ( >=dev-python/python-lzo-0.7.0[python_targets_python3_10(-)] ) opengl? ( client? ( dev-python/pyopengl_accelerate[python_targets_python3_10(-)] ) ) webcam? ( dev-python/numpy[python_targets_python3_10(-)] dev-python/pyinotify[python_targets_python3_10(-)] media-libs/opencv[python_targets_python3_10(-),python] ) ) acct-group/xpra virtual/ssh x11-apps/xauth x11-apps/xmodmap ibus? ( app-i18n/ibus ) pinentry? ( app-crypt/pinentry ) python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) virtual/tmpfiles
+RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-),cairo] opengl? ( dev-python/pyopengl[python_targets_python3_8(-)] ) sound? ( dev-python/gst-python:1.0[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( dev-python/pygobject:3[python_targets_python3_9(-),cairo] opengl? ( dev-python/pyopengl[python_targets_python3_9(-)] ) sound? ( dev-python/gst-python:1.0[python_targets_python3_9(-)] ) ) python_single_target_python3_10? ( dev-python/pygobject:3[python_targets_python3_10(-),cairo] opengl? ( dev-python/pyopengl[python_targets_python3_10(-)] ) sound? ( dev-python/gst-python:1.0[python_targets_python3_10(-)] ) ) x11-libs/gtk+:3[introspection] x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXres x11-libs/libXtst x11-libs/libxkbfile brotli? ( app-arch/brotli ) csc? ( >=media-video/ffmpeg-1.2.2:0= ) ffmpeg? ( >=media-video/ffmpeg-3.2.2:0=[x264,x265] ) jpeg? ( media-libs/libjpeg-turbo ) pulseaudio? ( media-sound/pulseaudio media-plugins/gst-plugins-pulse:1.0 ) sound? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) vpx? ( media-libs/libvpx media-video/ffmpeg ) webp? ( media-libs/libwebp ) python_single_target_python3_8? ( dev-python/netifaces[python_targets_python3_8(-)] dev-python/pillow[jpeg?,python_targets_python3_8(-)] dev-python/rencode[python_targets_python3_8(-)] dbus? ( dev-python/dbus-python[python_targets_python3_8(-)] ) xdg? ( dev-python/pyxdg[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( dev-python/netifaces[python_targets_python3_9(-)] dev-python/pillow[jpeg?,python_targets_python3_9(-)] dev-python/rencode[python_targets_python3_9(-)] dbus? ( dev-python/dbus-python[python_targets_python3_9(-)] ) xdg? ( dev-python/pyxdg[python_targets_python3_9(-)] ) ) python_single_target_python3_10? ( dev-python/netifaces[python_targets_python3_10(-)] dev-python/pillow[jpeg?,python_targets_python3_10(-)] dev-python/rencode[python_targets_python3_10(-)] dbus? ( dev-python/dbus-python[python_targets_python3_10(-)] ) xdg? ( dev-python/pyxdg[python_targets_python3_10(-)] ) ) html? ( www-apps/xpra-html5 ) server? ( x11-base/xorg-server[-minimal,xvfb] x11-drivers/xf86-input-void ) xinerama? ( x11-libs/libfakeXinerama ) python_single_target_python3_8? ( cups? ( dev-python/pycups[python_targets_python3_8(-)] ) lz4? ( dev-python/lz4[python_targets_python3_8(-)] ) lzo? ( >=dev-python/python-lzo-0.7.0[python_targets_python3_8(-)] ) opengl? ( client? ( dev-python/pyopengl_accelerate[python_targets_python3_8(-)] ) ) webcam? ( dev-python/numpy[python_targets_python3_8(-)] dev-python/pyinotify[python_targets_python3_8(-)] media-libs/opencv[python_targets_python3_8(-),python] ) ) python_single_target_python3_9? ( cups? ( dev-python/pycups[python_targets_python3_9(-)] ) lz4? ( dev-python/lz4[python_targets_python3_9(-)] ) lzo? ( >=dev-python/python-lzo-0.7.0[python_targets_python3_9(-)] ) opengl? ( client? ( dev-python/pyopengl_accelerate[python_targets_python3_9(-)] ) ) webcam? ( dev-python/numpy[python_targets_python3_9(-)] dev-python/pyinotify[python_targets_python3_9(-)] media-libs/opencv[python_targets_python3_9(-),python] ) ) python_single_target_python3_10? ( cups? ( dev-python/pycups[python_targets_python3_10(-)] ) lz4? ( dev-python/lz4[python_targets_python3_10(-)] ) lzo? ( >=dev-python/python-lzo-0.7.0[python_targets_python3_10(-)] ) opengl? ( client? ( dev-python/pyopengl_accelerate[python_targets_python3_10(-)] ) ) webcam? ( dev-python/numpy[python_targets_python3_10(-)] dev-python/pyinotify[python_targets_python3_10(-)] media-libs/opencv[python_targets_python3_10(-),python] ) ) acct-group/xpra virtual/ssh x11-apps/xauth x11-apps/xmodmap ibus? ( app-i18n/ibus ) pinentry? ( app-crypt/pinentry ) udev? ( virtual/udev ) python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) virtual/tmpfiles
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) || ( client server ) cups? ( dbus ) opengl? ( client ) test? ( client clipboard dbus html server sound xdg xinerama ) ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/x/xpra/xpra-4.3.3.tar.gz https://dev.gentoo.org/~chewi/distfiles/xpra-4.3.1-tests.patch
-_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	udev	2d229ad4bfa09058e0184b1ca900db32	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=52d87889f9315488b223f5de63cba125
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	udev	f3a0a3964e2028a140c181f00eea9712	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=5e96ef2a2a1a71f6e1550d02c338b881
diff --git a/metadata/md5-cache/x11-wm/xpra-4.3.2 b/metadata/md5-cache/x11-wm/xpra-4.3.4
index 3780076c0bd0..b2538ad2ebda 100644
--- a/metadata/md5-cache/x11-wm/xpra-4.3.2
+++ b/metadata/md5-cache/x11-wm/xpra-4.3.4
@@ -5,13 +5,13 @@ DESCRIPTION=X Persistent Remote Apps (xpra) and Partitioning WM (parti) based on
 EAPI=8
 HOMEPAGE=https://xpra.org/
 INHERIT=xdg xdg-utils distutils-r1 tmpfiles udev
-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 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+IUSE=brotli +client +clipboard csc cups dbus doc ffmpeg jpeg html ibus +lz4 lzo minimal opengl pillow pinentry pulseaudio +server sound systemd test udev vpx webcam webp xdg xinerama python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2 BSD
-RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-),cairo] opengl? ( dev-python/pyopengl[python_targets_python3_8(-)] ) sound? ( dev-python/gst-python:1.0[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( dev-python/pygobject:3[python_targets_python3_9(-),cairo] opengl? ( dev-python/pyopengl[python_targets_python3_9(-)] ) sound? ( dev-python/gst-python:1.0[python_targets_python3_9(-)] ) ) python_single_target_python3_10? ( dev-python/pygobject:3[python_targets_python3_10(-),cairo] opengl? ( dev-python/pyopengl[python_targets_python3_10(-)] ) sound? ( dev-python/gst-python:1.0[python_targets_python3_10(-)] ) ) x11-libs/gtk+:3[introspection] x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXres x11-libs/libXtst x11-libs/libxkbfile brotli? ( app-arch/brotli ) csc? ( >=media-video/ffmpeg-1.2.2:0= ) ffmpeg? ( >=media-video/ffmpeg-3.2.2:0=[x264,x265] ) jpeg? ( media-libs/libjpeg-turbo ) pulseaudio? ( media-sound/pulseaudio media-plugins/gst-plugins-pulse:1.0 ) sound? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) vpx? ( media-libs/libvpx media-video/ffmpeg ) webp? ( media-libs/libwebp ) python_single_target_python3_8? ( dev-python/netifaces[python_targets_python3_8(-)] dev-python/pillow[jpeg?,python_targets_python3_8(-)] dev-python/rencode[python_targets_python3_8(-)] dbus? ( dev-python/dbus-python[python_targets_python3_8(-)] ) xdg? ( dev-python/pyxdg[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( dev-python/netifaces[python_targets_python3_9(-)] dev-python/pillow[jpeg?,python_targets_python3_9(-)] dev-python/rencode[python_targets_python3_9(-)] dbus? ( dev-python/dbus-python[python_targets_python3_9(-)] ) xdg? ( dev-python/pyxdg[python_targets_python3_9(-)] ) ) python_single_target_python3_10? ( dev-python/netifaces[python_targets_python3_10(-)] dev-python/pillow[jpeg?,python_targets_python3_10(-)] dev-python/rencode[python_targets_python3_10(-)] dbus? ( dev-python/dbus-python[python_targets_python3_10(-)] ) xdg? ( dev-python/pyxdg[python_targets_python3_10(-)] ) ) html? ( www-apps/xpra-html5 ) server? ( x11-base/xorg-server[-minimal,xvfb] x11-drivers/xf86-input-void ) xinerama? ( x11-libs/libfakeXinerama ) python_single_target_python3_8? ( cups? ( dev-python/pycups[python_targets_python3_8(-)] ) lz4? ( dev-python/lz4[python_targets_python3_8(-)] ) lzo? ( >=dev-python/python-lzo-0.7.0[python_targets_python3_8(-)] ) opengl? ( client? ( dev-python/pyopengl_accelerate[python_targets_python3_8(-)] ) ) webcam? ( dev-python/numpy[python_targets_python3_8(-)] dev-python/pyinotify[python_targets_python3_8(-)] media-libs/opencv[python_targets_python3_8(-),python] ) ) python_single_target_python3_9? ( cups? ( dev-python/pycups[python_targets_python3_9(-)] ) lz4? ( dev-python/lz4[python_targets_python3_9(-)] ) lzo? ( >=dev-python/python-lzo-0.7.0[python_targets_python3_9(-)] ) opengl? ( client? ( dev-python/pyopengl_accelerate[python_targets_python3_9(-)] ) ) webcam? ( dev-python/numpy[python_targets_python3_9(-)] dev-python/pyinotify[python_targets_python3_9(-)] media-libs/opencv[python_targets_python3_9(-),python] ) ) python_single_target_python3_10? ( cups? ( dev-python/pycups[python_targets_python3_10(-)] ) lz4? ( dev-python/lz4[python_targets_python3_10(-)] ) lzo? ( >=dev-python/python-lzo-0.7.0[python_targets_python3_10(-)] ) opengl? ( client? ( dev-python/pyopengl_accelerate[python_targets_python3_10(-)] ) ) webcam? ( dev-python/numpy[python_targets_python3_10(-)] dev-python/pyinotify[python_targets_python3_10(-)] media-libs/opencv[python_targets_python3_10(-),python] ) ) acct-group/xpra virtual/ssh x11-apps/xauth x11-apps/xmodmap ibus? ( app-i18n/ibus ) pinentry? ( app-crypt/pinentry ) python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) virtual/tmpfiles
+RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-),cairo] opengl? ( dev-python/pyopengl[python_targets_python3_8(-)] ) sound? ( dev-python/gst-python:1.0[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( dev-python/pygobject:3[python_targets_python3_9(-),cairo] opengl? ( dev-python/pyopengl[python_targets_python3_9(-)] ) sound? ( dev-python/gst-python:1.0[python_targets_python3_9(-)] ) ) python_single_target_python3_10? ( dev-python/pygobject:3[python_targets_python3_10(-),cairo] opengl? ( dev-python/pyopengl[python_targets_python3_10(-)] ) sound? ( dev-python/gst-python:1.0[python_targets_python3_10(-)] ) ) x11-libs/gtk+:3[introspection] x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXres x11-libs/libXtst x11-libs/libxkbfile brotli? ( app-arch/brotli ) csc? ( >=media-video/ffmpeg-1.2.2:0= ) ffmpeg? ( >=media-video/ffmpeg-3.2.2:0=[x264,x265] ) jpeg? ( media-libs/libjpeg-turbo ) pulseaudio? ( media-sound/pulseaudio media-plugins/gst-plugins-pulse:1.0 ) sound? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) vpx? ( media-libs/libvpx media-video/ffmpeg ) webp? ( media-libs/libwebp ) python_single_target_python3_8? ( dev-python/netifaces[python_targets_python3_8(-)] dev-python/pillow[jpeg?,python_targets_python3_8(-)] dev-python/rencode[python_targets_python3_8(-)] dbus? ( dev-python/dbus-python[python_targets_python3_8(-)] ) xdg? ( dev-python/pyxdg[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( dev-python/netifaces[python_targets_python3_9(-)] dev-python/pillow[jpeg?,python_targets_python3_9(-)] dev-python/rencode[python_targets_python3_9(-)] dbus? ( dev-python/dbus-python[python_targets_python3_9(-)] ) xdg? ( dev-python/pyxdg[python_targets_python3_9(-)] ) ) python_single_target_python3_10? ( dev-python/netifaces[python_targets_python3_10(-)] dev-python/pillow[jpeg?,python_targets_python3_10(-)] dev-python/rencode[python_targets_python3_10(-)] dbus? ( dev-python/dbus-python[python_targets_python3_10(-)] ) xdg? ( dev-python/pyxdg[python_targets_python3_10(-)] ) ) html? ( www-apps/xpra-html5 ) server? ( x11-base/xorg-server[-minimal,xvfb] x11-drivers/xf86-input-void ) xinerama? ( x11-libs/libfakeXinerama ) python_single_target_python3_8? ( cups? ( dev-python/pycups[python_targets_python3_8(-)] ) lz4? ( dev-python/lz4[python_targets_python3_8(-)] ) lzo? ( >=dev-python/python-lzo-0.7.0[python_targets_python3_8(-)] ) opengl? ( client? ( dev-python/pyopengl_accelerate[python_targets_python3_8(-)] ) ) webcam? ( dev-python/numpy[python_targets_python3_8(-)] dev-python/pyinotify[python_targets_python3_8(-)] media-libs/opencv[python_targets_python3_8(-),python] ) ) python_single_target_python3_9? ( cups? ( dev-python/pycups[python_targets_python3_9(-)] ) lz4? ( dev-python/lz4[python_targets_python3_9(-)] ) lzo? ( >=dev-python/python-lzo-0.7.0[python_targets_python3_9(-)] ) opengl? ( client? ( dev-python/pyopengl_accelerate[python_targets_python3_9(-)] ) ) webcam? ( dev-python/numpy[python_targets_python3_9(-)] dev-python/pyinotify[python_targets_python3_9(-)] media-libs/opencv[python_targets_python3_9(-),python] ) ) python_single_target_python3_10? ( cups? ( dev-python/pycups[python_targets_python3_10(-)] ) lz4? ( dev-python/lz4[python_targets_python3_10(-)] ) lzo? ( >=dev-python/python-lzo-0.7.0[python_targets_python3_10(-)] ) opengl? ( client? ( dev-python/pyopengl_accelerate[python_targets_python3_10(-)] ) ) webcam? ( dev-python/numpy[python_targets_python3_10(-)] dev-python/pyinotify[python_targets_python3_10(-)] media-libs/opencv[python_targets_python3_10(-),python] ) ) acct-group/xpra virtual/ssh x11-apps/xauth x11-apps/xmodmap ibus? ( app-i18n/ibus ) pinentry? ( app-crypt/pinentry ) udev? ( virtual/udev ) python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) virtual/tmpfiles
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) || ( client server ) cups? ( dbus ) opengl? ( client ) test? ( client clipboard dbus html server sound xdg xinerama ) ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/x/xpra/xpra-4.3.2.tar.gz https://dev.gentoo.org/~chewi/distfiles/xpra-4.3.1-tests.patch
-_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	udev	2d229ad4bfa09058e0184b1ca900db32	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=e62466c1a91526442f8ee1b647ffc97e
+SRC_URI=mirror://pypi/x/xpra/xpra-4.3.4.tar.gz https://dev.gentoo.org/~chewi/distfiles/xpra-4.3.1-tests.patch
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	udev	f3a0a3964e2028a140c181f00eea9712	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=8fe94c25caab2f52dec2c8f89685ab77
diff --git a/metadata/md5-cache/x11-wm/xpra-9999 b/metadata/md5-cache/x11-wm/xpra-9999
index bbb1da9daa94..6e70bc609d06 100644
--- a/metadata/md5-cache/x11-wm/xpra-9999
+++ b/metadata/md5-cache/x11-wm/xpra-9999
@@ -5,12 +5,12 @@ DESCRIPTION=X Persistent Remote Apps (xpra) and Partitioning WM (parti) based on
 EAPI=8
 HOMEPAGE=https://xpra.org/
 INHERIT=git-r3 xdg xdg-utils distutils-r1 tmpfiles udev
-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 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+IUSE=brotli +client +clipboard csc cups dbus doc ffmpeg jpeg html ibus +lz4 lzo minimal opengl pillow pinentry pulseaudio +server sound systemd test udev vpx webcam webp xdg xinerama python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 LICENSE=GPL-2 BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-),cairo] opengl? ( dev-python/pyopengl[python_targets_python3_8(-)] ) sound? ( dev-python/gst-python:1.0[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( dev-python/pygobject:3[python_targets_python3_9(-),cairo] opengl? ( dev-python/pyopengl[python_targets_python3_9(-)] ) sound? ( dev-python/gst-python:1.0[python_targets_python3_9(-)] ) ) python_single_target_python3_10? ( dev-python/pygobject:3[python_targets_python3_10(-),cairo] opengl? ( dev-python/pyopengl[python_targets_python3_10(-)] ) sound? ( dev-python/gst-python:1.0[python_targets_python3_10(-)] ) ) x11-libs/gtk+:3[introspection] x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXres x11-libs/libXtst x11-libs/libxkbfile brotli? ( app-arch/brotli ) csc? ( >=media-video/ffmpeg-1.2.2:0= ) ffmpeg? ( >=media-video/ffmpeg-3.2.2:0=[x264,x265] ) jpeg? ( media-libs/libjpeg-turbo ) pulseaudio? ( media-sound/pulseaudio media-plugins/gst-plugins-pulse:1.0 ) sound? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) vpx? ( media-libs/libvpx media-video/ffmpeg ) webp? ( media-libs/libwebp ) python_single_target_python3_8? ( dev-python/netifaces[python_targets_python3_8(-)] dev-python/pillow[jpeg?,python_targets_python3_8(-)] dev-python/rencode[python_targets_python3_8(-)] dbus? ( dev-python/dbus-python[python_targets_python3_8(-)] ) xdg? ( dev-python/pyxdg[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( dev-python/netifaces[python_targets_python3_9(-)] dev-python/pillow[jpeg?,python_targets_python3_9(-)] dev-python/rencode[python_targets_python3_9(-)] dbus? ( dev-python/dbus-python[python_targets_python3_9(-)] ) xdg? ( dev-python/pyxdg[python_targets_python3_9(-)] ) ) python_single_target_python3_10? ( dev-python/netifaces[python_targets_python3_10(-)] dev-python/pillow[jpeg?,python_targets_python3_10(-)] dev-python/rencode[python_targets_python3_10(-)] dbus? ( dev-python/dbus-python[python_targets_python3_10(-)] ) xdg? ( dev-python/pyxdg[python_targets_python3_10(-)] ) ) html? ( www-apps/xpra-html5 ) server? ( x11-base/xorg-server[-minimal,xvfb] x11-drivers/xf86-input-void ) xinerama? ( x11-libs/libfakeXinerama ) python_single_target_python3_8? ( cups? ( dev-python/pycups[python_targets_python3_8(-)] ) lz4? ( dev-python/lz4[python_targets_python3_8(-)] ) lzo? ( >=dev-python/python-lzo-0.7.0[python_targets_python3_8(-)] ) opengl? ( client? ( dev-python/pyopengl_accelerate[python_targets_python3_8(-)] ) ) webcam? ( dev-python/numpy[python_targets_python3_8(-)] dev-python/pyinotify[python_targets_python3_8(-)] media-libs/opencv[python_targets_python3_8(-),python] ) ) python_single_target_python3_9? ( cups? ( dev-python/pycups[python_targets_python3_9(-)] ) lz4? ( dev-python/lz4[python_targets_python3_9(-)] ) lzo? ( >=dev-python/python-lzo-0.7.0[python_targets_python3_9(-)] ) opengl? ( client? ( dev-python/pyopengl_accelerate[python_targets_python3_9(-)] ) ) webcam? ( dev-python/numpy[python_targets_python3_9(-)] dev-python/pyinotify[python_targets_python3_9(-)] media-libs/opencv[python_targets_python3_9(-),python] ) ) python_single_target_python3_10? ( cups? ( dev-python/pycups[python_targets_python3_10(-)] ) lz4? ( dev-python/lz4[python_targets_python3_10(-)] ) lzo? ( >=dev-python/python-lzo-0.7.0[python_targets_python3_10(-)] ) opengl? ( client? ( dev-python/pyopengl_accelerate[python_targets_python3_10(-)] ) ) webcam? ( dev-python/numpy[python_targets_python3_10(-)] dev-python/pyinotify[python_targets_python3_10(-)] media-libs/opencv[python_targets_python3_10(-),python] ) ) acct-group/xpra virtual/ssh x11-apps/xauth x11-apps/xmodmap ibus? ( app-i18n/ibus ) pinentry? ( app-crypt/pinentry ) python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) virtual/tmpfiles
+RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-),cairo] opengl? ( dev-python/pyopengl[python_targets_python3_8(-)] ) sound? ( dev-python/gst-python:1.0[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( dev-python/pygobject:3[python_targets_python3_9(-),cairo] opengl? ( dev-python/pyopengl[python_targets_python3_9(-)] ) sound? ( dev-python/gst-python:1.0[python_targets_python3_9(-)] ) ) python_single_target_python3_10? ( dev-python/pygobject:3[python_targets_python3_10(-),cairo] opengl? ( dev-python/pyopengl[python_targets_python3_10(-)] ) sound? ( dev-python/gst-python:1.0[python_targets_python3_10(-)] ) ) x11-libs/gtk+:3[introspection] x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXres x11-libs/libXtst x11-libs/libxkbfile brotli? ( app-arch/brotli ) csc? ( >=media-video/ffmpeg-1.2.2:0= ) ffmpeg? ( >=media-video/ffmpeg-3.2.2:0=[x264,x265] ) jpeg? ( media-libs/libjpeg-turbo ) pulseaudio? ( media-sound/pulseaudio media-plugins/gst-plugins-pulse:1.0 ) sound? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) vpx? ( media-libs/libvpx media-video/ffmpeg ) webp? ( media-libs/libwebp ) python_single_target_python3_8? ( dev-python/netifaces[python_targets_python3_8(-)] dev-python/pillow[jpeg?,python_targets_python3_8(-)] dev-python/rencode[python_targets_python3_8(-)] dbus? ( dev-python/dbus-python[python_targets_python3_8(-)] ) xdg? ( dev-python/pyxdg[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( dev-python/netifaces[python_targets_python3_9(-)] dev-python/pillow[jpeg?,python_targets_python3_9(-)] dev-python/rencode[python_targets_python3_9(-)] dbus? ( dev-python/dbus-python[python_targets_python3_9(-)] ) xdg? ( dev-python/pyxdg[python_targets_python3_9(-)] ) ) python_single_target_python3_10? ( dev-python/netifaces[python_targets_python3_10(-)] dev-python/pillow[jpeg?,python_targets_python3_10(-)] dev-python/rencode[python_targets_python3_10(-)] dbus? ( dev-python/dbus-python[python_targets_python3_10(-)] ) xdg? ( dev-python/pyxdg[python_targets_python3_10(-)] ) ) html? ( www-apps/xpra-html5 ) server? ( x11-base/xorg-server[-minimal,xvfb] x11-drivers/xf86-input-void ) xinerama? ( x11-libs/libfakeXinerama ) python_single_target_python3_8? ( cups? ( dev-python/pycups[python_targets_python3_8(-)] ) lz4? ( dev-python/lz4[python_targets_python3_8(-)] ) lzo? ( >=dev-python/python-lzo-0.7.0[python_targets_python3_8(-)] ) opengl? ( client? ( dev-python/pyopengl_accelerate[python_targets_python3_8(-)] ) ) webcam? ( dev-python/numpy[python_targets_python3_8(-)] dev-python/pyinotify[python_targets_python3_8(-)] media-libs/opencv[python_targets_python3_8(-),python] ) ) python_single_target_python3_9? ( cups? ( dev-python/pycups[python_targets_python3_9(-)] ) lz4? ( dev-python/lz4[python_targets_python3_9(-)] ) lzo? ( >=dev-python/python-lzo-0.7.0[python_targets_python3_9(-)] ) opengl? ( client? ( dev-python/pyopengl_accelerate[python_targets_python3_9(-)] ) ) webcam? ( dev-python/numpy[python_targets_python3_9(-)] dev-python/pyinotify[python_targets_python3_9(-)] media-libs/opencv[python_targets_python3_9(-),python] ) ) python_single_target_python3_10? ( cups? ( dev-python/pycups[python_targets_python3_10(-)] ) lz4? ( dev-python/lz4[python_targets_python3_10(-)] ) lzo? ( >=dev-python/python-lzo-0.7.0[python_targets_python3_10(-)] ) opengl? ( client? ( dev-python/pyopengl_accelerate[python_targets_python3_10(-)] ) ) webcam? ( dev-python/numpy[python_targets_python3_10(-)] dev-python/pyinotify[python_targets_python3_10(-)] media-libs/opencv[python_targets_python3_10(-),python] ) ) acct-group/xpra virtual/ssh x11-apps/xauth x11-apps/xmodmap ibus? ( app-i18n/ibus ) pinentry? ( app-crypt/pinentry ) udev? ( virtual/udev ) python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) virtual/tmpfiles
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) || ( client server ) cups? ( dbus ) opengl? ( client ) test? ( client clipboard dbus html server sound xdg xinerama ) ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	udev	2d229ad4bfa09058e0184b1ca900db32	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=505b1706434860b196a393ce6865cf3e
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	udev	f3a0a3964e2028a140c181f00eea9712	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=cefa3e0e05378d1930ae400a1f7a4d69
author	V3n3RiX <venerix@koprulu.sector>	2022-06-29 12:04:12 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2022-06-29 12:04:12 +0100
commit	0f558761aa2dee1017b4751e4017205e015a9560 (patch)
tree	037df795519468a25d9362b4e95cdaeb84eb1cf9 /metadata/md5-cache/x11-wm
parent	752d6256e5204b958b0ef7905675a940b5e9172f (diff)