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 /x11-wm
parent: 752d6256e5204b958b0ef7905675a940b5e9172f (diff)
73 files changed, 2475 insertions, 699 deletions
diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index 9d138e309e3e..8a862e9cf48b 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/awesome/Manifest b/x11-wm/awesome/Manifest
index 3ffe08191218..badfc3163455 100644
--- a/x11-wm/awesome/Manifest
+++ b/x11-wm/awesome/Manifest
@@ -9,5 +9,5 @@ AUX awesome-session 1999 BLAKE2B c7c784fba884ff0e579eb60cb049e695022be162a535065
 AUX awesome-xsession.patch 291 BLAKE2B fb8ca929487ef45cd64c44bbb3db2b7c4a1be4f5abf5f8fa7467694226bdcd1441bd5c601f0f27e7d2c8656bb4c75cb364cd6d8d641a648611ed2658b27cd389 SHA512 1d19f3ac5e9f8fd1084fd5e092d52ffbabb06fc3dc94f6f8e62834a3a03bd5bcb04adc698ac3a022c5446a07a847be35e3f3003e8bc9e7d35c6c82350517233d
 DIST awesome-4.3.tar.xz 1037816 BLAKE2B b4afc5e7bfb01ddc16b67776cc00dd7b0bcbefc9d17f9bec9c04256953858aef2bf0e4b15a525909029b7da771ade0d749758aba2878832f356d7b2c4f0363b7 SHA512 c5ef1e8dc593e7783b895d22143154aea8f211beeda24672a7ee4ed5112b4f4284043f848a151f3d3c4f569e91308670367a4353f705b20511b36495b22fa3f5
 EBUILD awesome-4.3-r101.ebuild 4020 BLAKE2B 8809ac372d62170d5241818f0348677611f9200171d8780ce70a2e93ba15b353f138241e2689700c84e3a6bccb2db488145c6babcd4cfc56677bedc421a5754d SHA512 6697c72c05b025eac8b414c4265cde57f4d4e02e01eef879e1a0e783940d8efc40d419bd129117c97e0456b5e4a5490fee8b236dbffeb3264221e472447b636e
-EBUILD awesome-9999.ebuild 4109 BLAKE2B 68938fb2b33a40a0f83b04b755c433ce1334d334f863db84b25e1ada668ac6dbf8636e3f1c9560bdd9e9fb26200f58246bb09c43d89a465b2d24602ed0bbc1b3 SHA512 a70b0a327a5a12495bcd7f75b5f7e186ba6a3583b5045c270d5951059dc65e93a72c92681637e457fcb649f4803df829236c679feb35771cbe2d0e4ae11445c9
+EBUILD awesome-9999.ebuild 4170 BLAKE2B deacb0f0d042c308cbcec7cf23320f683de9d45c4349366f2268ce2cf2513d6d801a57c38b8606466c5f42409ba9bc4aa0a1f1594fccc7f6b50f787798c7cf65 SHA512 59332979a542575dd8e2423c244a34b8095955ef8b6ae1e534eed64f8ad0bf17b8f4efe8f10dd91fd67a86c60bb7e230f317ed327c8ec321f22b8cd723342c89
 MISC metadata.xml 328 BLAKE2B 6b2d1d1ba0a2a1f8d0a752e1e0bc7ca88fc6dc15e07ce4bd6c39b35c706d9bd8aba5a667e3a8ead36a3c49306d3e8e1bd0b59b5231b74b0040e9230c5f45a781 SHA512 e409529a09805a83eb88444dcc0011e26a006b99e4d5524ebb240338921e0cf0977743f9be44dd5c8c80314e2a78729a149b90e036cf66e89f6b106a417a6db7
diff --git a/x11-wm/awesome/awesome-9999.ebuild b/x11-wm/awesome/awesome-9999.ebuild
index a85f6654445b..5e0c5ca5953e 100644
--- a/x11-wm/awesome/awesome-9999.ebuild
+++ b/x11-wm/awesome/awesome-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-LUA_COMPAT=( lua5-{1..3} luajit )
+LUA_COMPAT=( lua5-{1..4} luajit )
 
 inherit cmake desktop lua-single pax-utils
 
@@ -24,7 +24,8 @@ IUSE="dbus doc gnome test"
 
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 
-RESTRICT="test" # https://bugs.gentoo.org/654084
+# Doesn't play nicely with the sandbox + requires an active D-BUS session
+RESTRICT="test"
 
 RDEPEND="${LUA_DEPS}
 	dev-libs/glib:2
@@ -44,11 +45,6 @@ RDEPEND="${LUA_DEPS}
 	x11-libs/libxkbcommon[X]
 	x11-libs/libX11
 	dbus? ( sys-apps/dbus )"
-# ldoc is used by invoking its executable, hence no need for LUA_SINGLE_USEDEP.
-# On the other hand, it means that we should explicitly depend on a version
-# migrated to Lua eclasses so that during the upgrade from unslotted
-# to slotted dev-lang/lua, the package manager knows to emerge migrated
-# ldoc before migrated awesome.
 DEPEND="${RDEPEND}
 	x11-base/xcb-proto
 	x11-base/xorg-proto
@@ -60,11 +56,19 @@ DEPEND="${RDEPEND}
 		')
 	)"
 # graphicsmagick's 'convert -channel' has no Alpha support, bug #352282
+# ldoc is used by invoking its executable, hence no need for LUA_SINGLE_USEDEP.
+# On the other hand, it means that we should explicitly depend on a version
+# migrated to Lua eclasses so that during the upgrade from unslotted
+# to slotted dev-lang/lua, the package manager knows to emerge migrated
+# ldoc before migrated awesome.
 BDEPEND="app-text/asciidoc
 	media-gfx/imagemagick[png]
 	virtual/pkgconfig
 	doc? ( >=dev-lua/ldoc-1.4.6-r100 )
-	test? ( app-shells/zsh )"
+	test? (
+		app-shells/zsh
+		x11-apps/xeyes
+	)"
 
 # Skip installation of README.md by einstalldocs, which leads to broken symlink
 DOCS=()
diff --git a/x11-wm/blackbox/Manifest b/x11-wm/blackbox/Manifest
index a1c467ae67d8..43006330c473 100644
--- a/x11-wm/blackbox/Manifest
+++ b/x11-wm/blackbox/Manifest
@@ -1,4 +1,5 @@
+AUX blackbox-0.77-gcc12-time.patch 1096 BLAKE2B 4a2660814d6bcc06c1f49dce6c36cba9a31ad8ce79464aa37ab2954f1634d926454e682332d9e4d9a60927da77fbb60b3166d498481334cd6725100cdbf20253 SHA512 346ae37fb8a9535c4e4fab24c81b70e0be93584ab2995ed290e3e79915239b4f24d34fe67db42bb68a00651148b2e3d64c15760d2fec3867fe56e3cdff5e292b
 AUX blackbox.desktop 128 BLAKE2B 3acb8eec34024ad4b5625d76f16206e40cceb11db194a084ba90b160e54824f95f228999128efe76c7c11509e89e85a2e2fa49f0f00f43777a7f65c0afe2ec01 SHA512 340bf82fdfe40fabe698b0fe9ce371395ab82a0570323663a2d1c3f26a36a2b1628dd91fe691a58d22b599f4cde060a005accc7294b9758cc4220d92f226d28d
 DIST blackbox-0.77.tar.gz 394176 BLAKE2B c52872fd02eba6857d2a3f5a8e122a6a8a0cdaa9c2d83f5b2510f9e770e650626d07f6d2b43b18bc3d77de4bfefc9bb9fb10321de0e72d4f82e5988f3c670d59 SHA512 d1f86707d9a2acb68db6a9af947e47acfd687752d06e3e2a60932550fbfa087730e6890b6ceb086f8aa8cf04e932ed7864f92266368fc43dc70b4b58140a792d
-EBUILD blackbox-0.77.ebuild 1349 BLAKE2B 5ffe3a6e3da61b87c4c5e7b579cf4e4d51be454ba62d05dc17566a4a8d1bbdea197454b7445bff1355214fb4c03865f662090113e2b92ca1adc372f0a0fe4e61 SHA512 85a80f6e81227fdc8b183c1a313d89ddf4a08208c3714eb6bdfaae18ea6824a4b7c06754598e5b625a2c80ef58c42a91097c0c09664c7194c5c25217ecb2dacb
+EBUILD blackbox-0.77.ebuild 1405 BLAKE2B 5809b4f1a9b01efb258cdafb5a4105935b0a9aa735341761a190a1630ab4a432eca1d93d78964922608d59e7e2559132c69d21f60c4f7ad6587df4d42be8d093 SHA512 a32dd4aa1f960851c0e35aec6bb56b10a3591566cf0765f13f5d9d3ac662555df35b797d877943be4febae0b5607d1b89b74a6cd48783dd6f94d12259bd0ee80
 MISC metadata.xml 573 BLAKE2B a267119a25e9f1ea39b05b705a9b186f428b5723f7d8abf43f55561f6929d5e0c1800aed851c81c2b6ddc655974848f43fd79426fc4907a77da0fccf571c2556 SHA512 0dabe8daa4a79b684c1654722ac9d7f958d4511046a7d2a28bd2500751695621bbf4043579f08f73ad98745c921e766b0f19112995324e31e3bf9efa78df221a
diff --git a/x11-wm/blackbox/blackbox-0.77.ebuild b/x11-wm/blackbox/blackbox-0.77.ebuild
index 815969ba46db..32b54c5b3e31 100644
--- a/x11-wm/blackbox/blackbox-0.77.ebuild
+++ b/x11-wm/blackbox/blackbox-0.77.ebuild
@@ -26,6 +26,10 @@ BDEPEND=">=sys-devel/autoconf-2.71
 
 S="${WORKDIR}"/blackboxwm-${PV}
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.77-gcc12-time.patch
+)
+
 src_prepare() {
 	sed -e '/AC_DISABLE_SHARED/d' -i configure.ac || die
 	default
diff --git a/x11-wm/blackbox/files/blackbox-0.77-gcc12-time.patch b/x11-wm/blackbox/files/blackbox-0.77-gcc12-time.patch
new file mode 100644
index 000000000000..196e3878253d
--- /dev/null
+++ b/x11-wm/blackbox/files/blackbox-0.77-gcc12-time.patch
@@ -0,0 +1,35 @@
+https://github.com/bbidulock/blackboxwm/pull/42
+
+From d3481ee7b7d104ef53ead4d35b9a9254c64bb87a Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sun, 12 Jun 2022 20:49:09 +0100
+Subject: [PATCH] Fix build with GCC 12 (missing <time.h> include)
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Fixes build failure with GCC 12:
+```
+Toolbar.cc: In member function ‘void Toolbar::reconfigure()’:
+Toolbar.cc:260:17: error: ‘time’ was not declared in this scope; did you mean ‘Time’?
+  260 |   time_t ttmp = time(NULL);
+      |                 ^~~~
+      |                 Time
+Toolbar.cc:265:21: error: ‘localtime’ was not declared in this scope; did you mean ‘clock_timer’?
+  265 |     struct tm *tt = localtime(&ttmp);
+      |                     ^~~~~~~~~
+      |                     clock_timer
+```
+
+Bug: https://bugs.gentoo.org/851603
+--- a/src/Toolbar.cc
++++ b/src/Toolbar.cc
+@@ -38,6 +38,7 @@
+ #include <X11/Xutil.h>
+ #include <sys/time.h>
+ #include <assert.h>
++#include <time.h>
+ 
+ 
+ long nextTimeout(int resolution)
+
diff --git a/x11-wm/cwm/Manifest b/x11-wm/cwm/Manifest
index 980bb3b888ed..c6b874ceed8c 100644
--- a/x11-wm/cwm/Manifest
+++ b/x11-wm/cwm/Manifest
@@ -1,4 +1,6 @@
 DIST cwm-6.7.tar.gz 53172 BLAKE2B 9e8c6503235ee71f3974a4e64cf45b80675b6ff33a68505b07f003c8d711a68a158f31147f463d5467bb4242c6321ebe0acaee63727689a136ca83c47e7592ea SHA512 5ad0fa56d9c96c36cc32e68128e58d4e3a7483f349bb26be1083c5b5c6d853ff05eec1a783b07ed928bd99a35a2e0b2d7053fc89b828aa9bdfe3589a318c4171
+DIST cwm-7.1.tar.gz 53667 BLAKE2B 6d0b64e95b78201113eb75c537d3ffdc8bd1b2a1d50f88bf9f7126dbdef372e80f36c5c1fd84b5bee29c7e9da7debc479264af34cf8c48abf1358d3d0c046919 SHA512 aa14bc7a43a522f4b83d3f9a3b8a8344c339b52aac4733f410e388df56a2dc4e86ee1ae9f05b53ff3139808f87f38a4b2da57bf0525482613d46651e8f08c718
 EBUILD cwm-6.7.ebuild 942 BLAKE2B e0208c09375fac2d729eebccd7df8ec4af507a34e6810dd45f75349c865977afe906cb166d982eae04172820b319cf8142938faefea6c813ec8be9a517757e83 SHA512 dbf3308532dbc46c1b8200e4c21a7605c2f735ba2918c2c029ad4e4df0170f222b9e86fb67b036d3c6aebef8d35bbdfdd0ec68cd6a68a086c43924dceeef4f76
-EBUILD cwm-9999.ebuild 945 BLAKE2B 3cdddaece0891f8d7904118ca3e35f02b1aaac4005daa6202a31dc32d51d15aebe6534bff91bdc7fa4f5991d3c293a37affb0c2500f4dddc1af2657acf965355 SHA512 fa2222f80c05c59a07e6ba7457164465e9107101154be05e17f1cf0bffe68586bfdde053c8aa0db4ee9cedacf743e5214051e78cfa40e8bf9bbfbd812da1621d
-MISC metadata.xml 249 BLAKE2B ac2e007c4228bbe8d3d5e17842e31f96af4e3ce4c9af4a127e1c0e5be50212c2b931d1022edd8c81f116b21a897e77a51250293830cc8146b7b808cc5e8916c7 SHA512 d471fb1fc96717d11a0b627e970be2a7a9714235412679d7299dc4dbd457f158d0862add04be2f65eeb15b100ceeb9a2f0e1fd5db59751169bbf715b7a158fac
+EBUILD cwm-7.1.ebuild 940 BLAKE2B 18151dc53a4dfbf1701323cacddfb59f446030635eca528243f6760848d4baf62a143675145f27bde7ed09874fd69bcd33266c08dcddf3337d00a8e7fe196d1d SHA512 25390c5c38125483bb442f4e8fa68be60230eb192dcfc5a02d0808601e2a31fcb9086543d5e5895c7c2844636903f7bd6e09ea4f9428e703e1f010ca82cfe13b
+EBUILD cwm-9999.ebuild 940 BLAKE2B 18151dc53a4dfbf1701323cacddfb59f446030635eca528243f6760848d4baf62a143675145f27bde7ed09874fd69bcd33266c08dcddf3337d00a8e7fe196d1d SHA512 25390c5c38125483bb442f4e8fa68be60230eb192dcfc5a02d0808601e2a31fcb9086543d5e5895c7c2844636903f7bd6e09ea4f9428e703e1f010ca82cfe13b
+MISC metadata.xml 486 BLAKE2B d84fc69bd87de18b42a364fef9c88257e4990715a4110942285d29d223c7b5219dba158fee2258c5814ee5ebfcaa5a93a80d6a8975998397bda5933c007f0d7e SHA512 342f65a74a69c04fc92fce18c2722fbb03f23bc85068d3e693a2a2dbc936e2b4cf832606cc76a2cc4d33f364c62d1978ba4aa1c9770d18a69380f56a31c47344
diff --git a/x11-wm/cwm/cwm-7.1.ebuild b/x11-wm/cwm/cwm-7.1.ebuild
new file mode 100644
index 000000000000..9aa6d59cba3a
--- /dev/null
+++ b/x11-wm/cwm/cwm-7.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop toolchain-funcs
+
+DESCRIPTION="OpenBSD fork of calmwm, a clean and lightweight window manager"
+HOMEPAGE="https://github.com/leahneukirchen/cwm
+	https://www.openbsd.org/cgi-bin/cvsweb/xenocara/app/cwm/
+"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/leahneukirchen/cwm.git"
+else
+	SRC_URI="https://github.com/leahneukirchen/cwm/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+LICENSE="ISC"
+SLOT="0"
+
+DEPEND="x11-libs/libX11
+	x11-libs/libXft
+	x11-libs/libXrandr
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	sys-devel/bison
+	virtual/pkgconfig
+"
+
+src_compile() {
+	emake CFLAGS="${CFLAGS} -D_GNU_SOURCE" CC="$(tc-getCC)" PKG_CONFIG="$(tc-getPKG_CONFIG)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX=/usr install
+	dodoc README
+	make_session_desktop ${PN} ${PN}
+}
diff --git a/x11-wm/cwm/cwm-9999.ebuild b/x11-wm/cwm/cwm-9999.ebuild
index c35cf81e9f80..9aa6d59cba3a 100644
--- a/x11-wm/cwm/cwm-9999.ebuild
+++ b/x11-wm/cwm/cwm-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit desktop toolchain-funcs
 
@@ -21,8 +21,8 @@ fi
 LICENSE="ISC"
 SLOT="0"
 
-DEPEND="x11-libs/libXft
-	x11-libs/libXinerama
+DEPEND="x11-libs/libX11
+	x11-libs/libXft
 	x11-libs/libXrandr
 "
 RDEPEND="${DEPEND}"
diff --git a/x11-wm/cwm/metadata.xml b/x11-wm/cwm/metadata.xml
index c24849391d64..ebdff070098b 100644
--- a/x11-wm/cwm/metadata.xml
+++ b/x11-wm/cwm/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person" proxied="yes">
+		<email>rndxelement@protonmail.com</email>
+		<name>Philipp Rösner</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">chneukirchen/cwm</remote-id>
 	</upstream>
diff --git a/x11-wm/fvwm3/Manifest b/x11-wm/fvwm3/Manifest
new file mode 100644
index 000000000000..4fcd657555c7
--- /dev/null
+++ b/x11-wm/fvwm3/Manifest
@@ -0,0 +1,10 @@
+AUX README.translucency 3723 BLAKE2B aae37e9dbdf8f7b730b6947d55f0e286c1269d5cacc9ce6d2481562b054c2fa9010acf6ee0d6c994ea3cee64d3df99ef6d08dfa8c6b58706bc9bb8b477095e1b SHA512 a64ef5147e52e07d4cec8a2f3ebd1340827d0139031ef7ddaf27fc144fcc58858c3ec40eee854034423f853b2c7bdd813f66236c8a9679977084f4a2176a8ffa
+AUX fvwm3-1.0.4-htmldoc.patch 2024 BLAKE2B 247d05e606e55515b800143a103e5521cf6cc1568f760bb4f703ca7b5ecfb83c305341f8bc249545830295b686c78c7241cc4167a40834aadb3b57fc27caef18 SHA512 bbe197296ffaae8af6d26a0ad92f28e3a9628a1a3653a481d8279ff0fc85922efc084696ae3e2a1527457007bfbb0e17173d942d5f08285ff48a92427f96a4a2
+AUX fvwm3-1.0.4-translucent-menus.patch 14629 BLAKE2B d9aa8b8f2fbde6bf37d39d9fa78f959405dff6518cf1819bbffc70b3d7583618638a3df77beb96925dcf4540b834ba63c2ff1e2cefce49743d73154b9fe58d74 SHA512 4519fba0386b3d1b207540c4916fd18e989189d50b3e1aaa1a02d34774c406fcd8dfa53592882694fdc2e1bb6e3d1e3cd0ada2656222df037bbcdeccf1f04fbe
+AUX fvwm3-9999-goflags.patch 224 BLAKE2B 9050c078af7506d821777de92b93bff4b4458106f7df30bf4758528ca27da8504a509329b18a0aae60195f8dd5376ccf04b8661be7a24bc4ec0871446c100291 SHA512 e81d47474c073e1c4c8e13de4888c840cf5c4ee8d98517526fbb24ab7ee13f4f1c3db1f1153eff2d59e9a446963d89687abbc2e53a4086f878b2e63f48e83e86
+AUX fvwm3-9999-htmldoc.patch 960 BLAKE2B 69e4ce716cb09dde50b168d6cd14cd7c01ea4a591fa9baa8d33311276906912e9011f3cd3c42dd30e07fe28776d7638821c17001b8e56601cd42ad1159e36c59 SHA512 07258f4ae3e2d232e1e81ea885f64b14d23ece217317f06c9dccc29b15ad356f36976e570df1420132c1ff3acb08adc668194ad6cabfb453cb01cadaf933491f
+AUX fvwm3-9999-translucent-menus.patch 14684 BLAKE2B 52915fde481c6b821b7bf9f5b90f2b7a7f0e96f46cb3f54d39304abefd3db5f2937e6b8eb16c27c4b017d8bbcf6ec1362bf0e7f842ecaa878cc97ec59e88a6ff SHA512 2c1d36e84542be65270595b8ce8e5ed624fa62594446ffe597f18ae85bbfcf3bfbf3030dc0bbcf31dbd43d01411af053a8daa86797540d5a8dcdaee4341fd2ba
+DIST fvwm3-1.0.4.tar.gz 4691719 BLAKE2B 4ce93b1a2d110b570b5fc8b253f9ff8ea1f44e5470c6e1bc136a53ebe53a23abe3d075bf351fca54ac110ea5731f9b44c59c83186d320e7509bf26e5144436ca SHA512 b72a1ebeba7c55214603fd43ea439f7283b3c79e39d2671a67b9512c67dcea111377eab2131ed0b18a72f6b772b0d048abe08f52565708367465ed9bb14e85f6
+EBUILD fvwm3-1.0.4-r2.ebuild 4354 BLAKE2B 526dec95d79529d348a3549968539a1025b4efa5aee9434526599d6446ca27fbc0cd70b789a7f74181cb9a31bc4c701632119d56c56002164992fe81d169dac1 SHA512 f12d1e1ce627e080104572fb197704b3e4b62d1ef1a715c3c35e4c189f70f167ba62a7fe702097bf2af537af1ea1c52a70a50e5ec4c3e0cbcce95d99e486fe1b
+EBUILD fvwm3-9999.ebuild 4360 BLAKE2B d3ce88da402256e299e0bee907abe9bd18cbae9002f3cf1248b0bdd94ae9b967f4b460d294b7ace29e8a224fcaafe1e5afe8a0cb477c4b8b46a2a8d13bf06a78 SHA512 3ab7e2e26d3d77286cd5678f34d94f0dc9520f5a6ac3b100d8500539199766d29e7f3ff1d1cc7dfd39716a5b41f65c221d3fa119c7a6d374919b46ca464cd4e6
+MISC metadata.xml 1166 BLAKE2B 4b0c18409516f163635b2e08d09bec54257b0ee0dc3d4f2c29a7f272f63339906115963f1724c4eaff5ca10b617297d4204fdeef01131030a89ee0165f88eda8 SHA512 d84e3990b912ac5302e5d1e5f89d068776ca4d002fdb2dd8b8d2df80f82570cd2fdf53332ae06884ce9d1df99c86f9b55d62ad81a4792d46e51688f31146bca8
diff --git a/x11-wm/fvwm3/files/README.translucency b/x11-wm/fvwm3/files/README.translucency
new file mode 100644
index 000000000000..a60b5f668acd
--- /dev/null
+++ b/x11-wm/fvwm3/files/README.translucency
@@ -0,0 +1,94 @@
+From owner-fvwm@hpc.uh.edu  Sun Aug 31 22:52:59 2003
+Received: from sina.hpc.uh.edu ([129.7.128.10] ident=lists)
+	by malifon.math.uh.edu with esmtp (Exim 3.20 #1)
+	id 19tb0F-0006NY-00; Sun, 31 Aug 2003 17:48:59 -0500
+Received: by sina.hpc.uh.edu (TLB v0.09a (1.20 tibbs 1996/10/09 22:03:07)); Sun, 31 Aug 2003 17:50:31 -0500 (CDT)
+Received: from epithumia.math.uh.edu (epithumia.math.uh.edu [129.7.128.2])
+	by sina.hpc.uh.edu (8.9.3/8.9.3) with ESMTP id RAA16575
+	for <fvwm@hpc.uh.edu>; Sun, 31 Aug 2003 17:50:24 -0500 (CDT)
+Received: from epithumia.math.uh.edu (epithumia.math.uh.edu [127.0.0.1])
+	by epithumia.math.uh.edu (8.12.8/8.12.5) with ESMTP id h7VMml6M025095
+	for <fvwm@hpc.uh.edu>; Sun, 31 Aug 2003 17:48:47 -0500
+Received: (from tibbs@localhost)
+	by epithumia.math.uh.edu (8.12.8/8.12.8/Submit) id h7VMmlVC025093
+	for fvwm@hpc.uh.edu; Sun, 31 Aug 2003 17:48:47 -0500
+Received: from util2.math.uh.edu (util2.math.uh.edu [129.7.128.23])
+	by sina.hpc.uh.edu (8.9.3/8.9.3) with ESMTP id QAA16418
+	for <fvwm@hpc.uh.edu>; Sun, 31 Aug 2003 16:02:07 -0500 (CDT)
+Received: from postfix4-2.free.fr ([213.228.0.176])
+	by util2.math.uh.edu with esmtp (Exim 4.20)
+	id 19tZIm-00079F-6t
+	for fvwm@fvwm.org; Sun, 31 Aug 2003 16:00:00 -0500
+Received: from snoopy.folie (nas-p19-3-62-147-221-172.dial.proxad.net [62.147.221.172])
+	by postfix4-2.free.fr (Postfix) with ESMTP id 59DE6C386
+	for <fvwm@fvwm.org>; Sun, 31 Aug 2003 22:59:34 +0200 (CEST)
+Received: by snoopy.folie (Postfix, from userid 501)
+	id A4D1D48784; Sun, 31 Aug 2003 22:39:19 +0200 (CEST)
+Date: Sun, 31 Aug 2003 22:39:19 +0200
+From: Olivier Chapuis <olivier.chapuis@free.fr>
+To: fvwm@fvwm.org
+Subject: Re: FVWM: Transparency/Translucency revisited...
+Message-ID: <20030831203919.GA6205@snoopy.folie>
+Mail-Followup-To: fvwm@fvwm.org
+References: <Pine.LNX.4.44.0308251817370.1980-100000@atlantis.ssw.krakow.pl>
+Mime-Version: 1.0
+Content-Type: multipart/mixed; boundary="Nq2Wo0NMKNjxTN9z"
+Content-Disposition: inline
+In-Reply-To: <Pine.LNX.4.44.0308251817370.1980-100000@atlantis.ssw.krakow.pl>
+User-Agent: Mutt/1.4i
+X-Spam-Score: -9.3 (---------)
+Sender: owner-fvwm@hpc.uh.edu
+Precedence: list
+X-Majordomo: 1.94.jlt7
+Status: RO
+Content-Length: 6519
+Lines: 122
+
+
+--Nq2Wo0NMKNjxTN9z
+Content-Type: text/plain; charset=us-ascii
+Content-Disposition: inline
+
+On Mon, Aug 25, 2003 at 09:00:32PM +0200, Dawid Kuroczko wrote:
+> Hello. :-)
+> 
+> I did manage to make pseudo-transparent menus, but now I'd like
+> to make something more "real".  What I'd like to do is to have
+> something like there is in KDE.
+> 
+> It should work like this:
+>  1. user clicks thus calling a Menu.
+>  2. current screen dump is taken (with all the windows, but
+>     without a menu just as yet).
+>  3. this screen dump is made available to Menu as
+>     root background pixmap.
+>  4. Menu is displayed with tinted real background.
+> 
+> This way it's pretty easy to make an illusion of real
+> transparency (and looks "l33t", as some may say).
+>
+
+Here a new version of the patch for current cvs/snapshot.
+This patch add a new options to Colorset: Translucent/NoTranslucent.
+These options has effects only with (non tear-off) menu.
+Also menu animation is "handled".
+
+For example with:
+
+  Colorset 5 fg yellow, bg blue, HGradient 200 lightblue darkblue, \
+	  Translucent blue 60
+  Style * MenuColorset 5, PopupOffset 0 100, AnimationOff
+
+you get translucent menus (with a 60% blue tint) and if you tear-off
+a menu the menu use the gradient.
+
+Regards, Olivier
+
+<snip patch>
+
+--
+Visit the official FVWM web page at <URL: http://www.fvwm.org/>.
+To unsubscribe from the list, send "unsubscribe fvwm" in the body of a
+message to majordomo@fvwm.org.
+To report problems, send mail to fvwm-owner@fvwm.org.
+
diff --git a/x11-wm/fvwm3/files/fvwm3-1.0.4-htmldoc.patch b/x11-wm/fvwm3/files/fvwm3-1.0.4-htmldoc.patch
new file mode 100644
index 000000000000..ef277e902faa
--- /dev/null
+++ b/x11-wm/fvwm3/files/fvwm3-1.0.4-htmldoc.patch
@@ -0,0 +1,73 @@
+This patch enables html documentation output for fvwm3 1.0.4
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -1,40 +1,59 @@
+ docdir = @FVWM_DOCDIR@
+-MODULE_ADOCS = $(wildcard fvwm3/fvwm3.adoc bin/*.adoc modules/*.adoc)
++DOC_SRC = $(wildcard fvwm3/fvwm3.adoc bin/*.adoc modules/*.adoc)
+ 
+-EXTRA_DIST = $(MODULE_ADOCS)
++EXTRA_DIST = $(DOC_SRC)
+ 
+ if FVWM_BUILD_MANDOC
+-BUILD_MANS = $(patsubst %.adoc,%, $(MODULE_ADOCS))
++BUILD_MANS = $(DOC_SRC:.adoc=.1)
++BUILD_HTML = $(DOC_SRC:.adoc=.html)
+ else
+ BUILD_MANS =
+ endif
+ 
+-all: docs
+-docs: $(BUILD_MANS)
++all: man html
++
++man: $(BUILD_MANS)
++
++html: $(BUILD_HTML)
+ 
+ clean:
+ 	rm -fr man1/
++	rm -fr html/
+ 
+ distclean-local: clean
+ 
+ if FVWM_BUILD_MANDOC
+-QUIET_ASCIIDOC = @echo '  ' DOC '    ' $@'.1';
++QUIET_ASCIIDOC = @echo '  ' DOC '    ' $@;
+ 
+-%: %.adoc
++%.1: %.adoc
+ 	$(QUIET_ASCIIDOC) \
+ 	NAME=`basename "$@" | "$(SED)" -e "${transform}"`; \
+-	$(ASCIIDOC) -b manpage $< -o "man1/$$NAME.1"
++	$(ASCIIDOC) -b manpage $^ -o "man1/$$NAME"
++
++%.html: %.adoc
++	$(QUIET_ASCIIDOC:.1=.html) \
++	NAME=`basename "$@" | "$(SED)" -e "${transform}"`; \
++	$(ASCIIDOC) -b html5 $^ -o "html/$$NAME"
+ 
+ install-data-local:
+ 	install -d -m 755 $(DESTDIR)$(mandir)/man1/
+ 	@for i in $(notdir $(BUILD_MANS)); do \
+ 		NAME=`basename "$$i" | "$(SED)" -e "${transform}"`; \
+-		install -m 644 "man1/$$NAME.1" $(DESTDIR)$(mandir)/man1/; \
++		install -m 644 "man1/$$NAME" $(DESTDIR)$(mandir)/man1/; \
++	done
++	install -d -m 755 $(DESTDIR)$(mandir)/html/
++	@for i in $(notdir $(BUILD_HTML)); do \
++		NAME=`basename "$$i" | "$(SED)" -e "${transform}"`; \
++		install -m 644 "html/$$NAME" $(DESTDIR)$(mandir)/html/; \
+ 	done
+ 
+ uninstall-local:
+ 	@for i in $(notdir $(BUILD_MANS)); do \
+ 		NAME=`basename "$$i" | "$(SED)" -e "${transform}"`; \
+-		rm -f "$(DESTDIR)$(mandir)/man1/$$NAME.1"; \
++		rm -f "$(DESTDIR)$(mandir)/man1/$$NAME"; \
++	done
++	@for i in $(notdir $(BUILD_HTML)); do \
++		NAME=`basename "$$i" | "$(SED)" -e "${transform}"`; \
++		rm -f "$(DESTDIR)$(mandir)/html/$$NAME"; \
+ 	done
+ endif
diff --git a/x11-wm/fvwm3/files/fvwm3-1.0.4-translucent-menus.patch b/x11-wm/fvwm3/files/fvwm3-1.0.4-translucent-menus.patch
new file mode 100644
index 000000000000..5ead9b09aff5
--- /dev/null
+++ b/x11-wm/fvwm3/files/fvwm3-1.0.4-translucent-menus.patch
@@ -0,0 +1,487 @@
+--- a/fvwm/colorset.c
++++ b/fvwm/colorset.c
+@@ -162,6 +162,8 @@ static char *csetopts[] =
+ 	"NoIconTint",
+ 	"IconAlpha",
+ 
++	"Translucent",
++	"NoTranslucent",
+ 	NULL
+ };
+ 
+@@ -620,6 +622,7 @@ void parse_colorset(int n, char *line)
+ 	char *fg_tint = NULL;
+ 	char *bg_tint = NULL;
+ 	char *icon_tint = NULL;
++	char *translucent_tint = NULL;
+ 	Bool have_pixels_changed = False;
+ 	Bool has_icon_pixels_changed = False;
+ 	Bool has_fg_changed = False;
+@@ -632,6 +635,7 @@ void parse_colorset(int n, char *line)
+ 	Bool has_fg_tint_changed = False;
+ 	Bool has_bg_tint_changed = False;
+ 	Bool has_icon_tint_changed = False;
++	Bool has_translucent_tint_changed = False;
+ 	Bool has_pixmap_changed = False;
+ 	Bool has_shape_changed = False;
+ 	Bool has_image_alpha_changed = False;
+@@ -758,6 +762,10 @@ void parse_colorset(int n, char *line)
+ 		case 21: /* Plain */
+ 			has_pixmap_changed = True;
+ 			free_colorset_background(cs, True);
++			cs->is_translucent = False;
++			cs->translucent_tint_percent = 0;
++			cs->color_flags &= ~TRANSLUCENT_TINT_SUPPLIED;
++			has_translucent_tint_changed = True;
+ 			break;
+ 		case 22: /* NoShape */
+ 			has_shape_changed = True;
+@@ -923,6 +931,24 @@ void parse_colorset(int n, char *line)
+ 				cs->icon_alpha_percent = tmp;
+ 			}
+ 			break;
++		case 42: /* Translucent */
++			cs->is_translucent = True;
++			parse_simple_tint(
++				cs, args, &translucent_tint,
++				TRANSLUCENT_TINT_SUPPLIED,
++				&has_translucent_tint_changed, &percent,
++				"Translucent");
++			if (has_translucent_tint_changed)
++			{
++				cs->translucent_tint_percent = percent;
++			}
++			break;
++		case 43: /* NoTranslucent */
++			cs->is_translucent = False;
++			cs->translucent_tint_percent = 0;
++			cs->color_flags &= ~TRANSLUCENT_TINT_SUPPLIED;
++			has_translucent_tint_changed = True;
++			break;
+ 		default:
+ 			/* test for ?Gradient */
+ 			if (option[0] && StrEquals(&option[1], "Gradient"))
+@@ -1624,6 +1650,27 @@ void parse_colorset(int n, char *line)
+ 		}
+ 	}
+ 
++	/*
++	 * ---------- change the translucent tint colour ----------
++	 */
++	if (has_translucent_tint_changed)
++	{
++		/* user specified colour */
++		if (translucent_tint != NULL)
++		{
++			PictureFreeColors(
++				dpy, Pcmap, &cs->translucent_tint, 1, 0, True);
++			cs->translucent_tint = GetColor(translucent_tint);
++		}
++		else
++		{
++			/* default */
++			PictureFreeColors(
++				dpy, Pcmap, &cs->translucent_tint, 1, 0, True);
++			cs->translucent_tint = GetColor(black);
++		}
++	}
++
+ 	/*
+ 	 * ---------- send new colorset to fvwm and clean up ----------
+ 	 */
+@@ -1720,6 +1767,7 @@ void alloc_colorset(int n)
+ 			ncs->fgsh = GetColor(white);
+ 			ncs->tint = GetColor(black);
+ 			ncs->icon_tint = GetColor(black);
++			ncs->translucent_tint = GetColor(black);
+ 			ncs->pixmap = XCreatePixmapFromBitmapData(
+ 				dpy, Scr.NoFocusWin,
+ 				&g_bits[4 * (nColorsets % 3)], 4, 4,
+@@ -1737,6 +1785,7 @@ void alloc_colorset(int n)
+ 			ncs->fgsh = GetForeShadow(ncs->fg, ncs->bg);
+ 			ncs->tint = GetColor(black);
+ 			ncs->icon_tint = GetColor(black);
++			ncs->translucent_tint = GetColor(black);
+ 		}
+ 		ncs->fg_tint = ncs->bg_tint = GetColor(black);
+ 		/* set flags for fg contrast, bg average */
+@@ -1748,6 +1797,7 @@ void alloc_colorset(int n)
+ 		ncs->icon_alpha_percent = 100;
+ 		ncs->tint_percent = 0;
+ 		ncs->icon_tint_percent = 0;
++		ncs->translucent_tint_percent = 0;
+ 		ncs->fg_tint_percent = ncs->bg_tint_percent = 0;
+ 		ncs->dither = (PictureDitherByDefault())? True:False;
+ 		nColorsets++;
+--- a/fvwm/menuroot.h
++++ b/fvwm/menuroot.h
+@@ -147,6 +147,9 @@ typedef struct MenuRootDynamic
+ 		int d_npixels;
+ 	} stored_pixels;
+ 	/* alloc pixels when dithering is used for gradients */
++	/* x,y XMapRaise */
++	int x;
++	int y;
+ } MenuRootDynamic;
+ 
+ /* access macros to dynamic menu members */
+--- a/fvwm/menus.c
++++ b/fvwm/menus.c
+@@ -75,6 +75,18 @@
+ 				 (ctx).menu_root.menu_root = (root))
+ #define SCTX_GET_MR(ctx)	((ctx).type == SCTX_MENU_ROOT ? \
+ 				 (ctx).menu_root.menu_root : NULL)
++#define MENU_IS_TRANSLUCENT(mr,cs) \
++	(!MR_IS_TEAR_OFF_MENU(mr) && CSET_IS_TRANSLUCENT(cs))
++#define MENU_IS_TRANSPARENT(mr,cs) \
++	(MENU_IS_TRANSLUCENT(mr,cs) || CSET_IS_TRANSPARENT(cs))
++#define MR_IS_TRANSLUCENT_MENU(mr)  \
++	(!MR_IS_TEAR_OFF_MENU(mr) && MR_STYLE(mr) && \
++	ST_HAS_MENU_CSET(MR_STYLE(mr)) && CSET_IS_TRANSLUCENT( \
++						ST_CSET_MENU(MR_STYLE(mr))))
++#define MR_IS_TRANSPARENT_MENU(mr) \
++	(MR_IS_TRANSLUCENT_MENU(mr) || (MR_STYLE(mr) && \
++	ST_HAS_MENU_CSET(MR_STYLE(mr)) && CSET_IS_TRANSPARENT( \
++						ST_CSET_MENU(MR_STYLE(mr)))))
+ 
+ /* ---------------------------- imports ------------------------------------ */
+ 
+@@ -218,6 +230,8 @@ typedef struct mloop_static_info_t
+ } mloop_static_info_t;
+ 
+ /* ---------------------------- forward declarations ----------------------- */
++static MenuRoot *seek_submenu_instance(
++	MenuRoot *parent_menu, MenuItem *parent_item);
+ 
+ /* ---------------------------- local variables ---------------------------- */
+ 
+@@ -379,12 +393,22 @@ static void animated_move_back(
+ 		Bool transparent_bg = False;
+ 
+ 		/* move it back */
+-		if (ST_HAS_MENU_CSET(MR_STYLE(mr)) &&
+-		    CSET_IS_TRANSPARENT(ST_CSET_MENU(MR_STYLE(mr))))
++		if (MR_IS_TRANSPARENT_MENU(mr))
+ 		{
+ 			transparent_bg = True;
+ 			get_menu_repaint_transparent_parameters(
+ 				&mrtp, mr, fw);
++			if (MR_IS_TRANSLUCENT_MENU(mr) && MR_SUBMENU_ITEM(mr))
++			{
++				MenuRoot *smr;
++				smr = seek_submenu_instance(
++					mr, MR_SUBMENU_ITEM(mr));
++				if (smr)
++				{
++					/* just unmap it here, popdown later */
++					XUnmapWindow(dpy, MR_WINDOW(smr));
++				}
++			}
+ 		}
+ 		AnimatedMoveOfWindow(
+ 			MR_WINDOW(mr), act_x, act_y, act_x - MR_XANIMATION(mr),
+@@ -1910,6 +1934,7 @@ static void make_menu_window(MenuRoot *mr, Bool is_tear_off)
+ 				/* Doh.  Use the standard display instead. */
+ 				MR_CREATE_DPY(mr) = dpy;
+ 			}
++			MR_IS_TEAR_OFF_MENU(mr) = 1;
+ 		}
+ 		else
+ 		{
+@@ -2714,7 +2739,37 @@ static void paint_menu(
+ 	}
+ 	MR_IS_PAINTED(mr) = 1;
+ 	/* paint the menu background */
+-	if (ms && ST_HAS_MENU_CSET(ms))
++	if (MR_IS_TRANSLUCENT_MENU(mr))
++	{
++		Pixmap trans = None;
++		FvwmRenderAttributes fra;
++		colorset_t *colorset = &Colorset[ST_CSET_MENU(ms)];
++
++		fra.mask = 0;
++		if (colorset->translucent_tint_percent > 0)
++		{
++			fra.mask = FRAM_HAVE_TINT;
++			fra.tint = colorset->translucent_tint;
++			fra.tint_percent = colorset->translucent_tint_percent;
++		}
++		if (MR_IS_BACKGROUND_SET(mr) == False)
++		{
++			trans = PGraphicsCreateTranslucent(
++				dpy, MR_WINDOW(mr), &fra,
++				BACK_GC(ST_MENU_INACTIVE_GCS(ms)),
++				MR_X(mr), MR_Y(mr), MR_WIDTH(mr), MR_HEIGHT(mr));
++			XMapRaised(dpy, MR_WINDOW(mr));
++			if (trans != None)
++			{
++				XSetWindowBackgroundPixmap(
++					dpy, MR_WINDOW(mr), trans);
++				MR_IS_BACKGROUND_SET(mr) = True;
++				clear_expose_menu_area(MR_WINDOW(mr), pevent);
++				XFreePixmap(dpy, trans);
++			}
++		}
++	}
++	else if (ms && ST_HAS_MENU_CSET(ms))
+ 	{
+ 		if (MR_IS_BACKGROUND_SET(mr) == False)
+ 		{
+@@ -3523,10 +3578,7 @@ static int pop_menu_up(
+ 					MR_HAS_POPPED_UP_RIGHT(mr) = 0;
+ 				}
+ 				MR_XANIMATION(parent_menu) += end_x - prev_x;
+-				if (ST_HAS_MENU_CSET(MR_STYLE(parent_menu)) &&
+-				    CSET_IS_TRANSPARENT(
+-					    ST_CSET_MENU(
+-						    MR_STYLE(parent_menu))))
++				if (MR_IS_TRANSPARENT_MENU(parent_menu))
+ 				{
+ 					transparent_bg = True;
+ 					get_menu_repaint_transparent_parameters(
+@@ -3705,10 +3757,21 @@ static int pop_menu_up(
+ 	 */
+ 
+ 	XMoveWindow(dpy, MR_WINDOW(mr), x, y);
++	MR_X(mr) = x;
++	MR_Y(mr) = y;
+ 	XSelectInput(dpy, MR_WINDOW(mr), event_mask);
+-	XMapRaised(dpy, MR_WINDOW(mr));
+-	if (popdown_window)
+-		XUnmapWindow(dpy, popdown_window);
++	if (MR_IS_TRANSLUCENT_MENU(mr))
++	{
++		if (popdown_window)
++			XUnmapWindow(dpy, popdown_window);
++		paint_menu(mr, NULL, fw);
++	}
++	else
++	{
++		XMapRaised(dpy, MR_WINDOW(mr));
++		if (popdown_window)
++			XUnmapWindow(dpy, popdown_window);
++	}
+ 	XFlush(dpy);
+ 	MR_MAPPED_COPIES(mr)++;
+ 	MST_USAGE_COUNT(mr)++;
+@@ -6277,16 +6340,122 @@ void update_transparent_menu_bg(
+ 	{
+ 		last = True;
+ 	}
+-	if (!last && CSET_IS_TRANSPARENT_PR_TINT(ST_CSET_MENU(ms)))
++	if (!last &&
++	    (CSET_IS_TRANSPARENT_PR_TINT(ST_CSET_MENU(ms)) ||
++	     MR_IS_TRANSLUCENT_MENU(mr)))
+ 	{
+ 		/* too slow ... */
+ 		return;
+ 	}
+-	SetWindowBackgroundWithOffset(
+-		dpy, MR_WINDOW(mr), step_x - current_x, step_y - current_y,
+-		MR_WIDTH(mr), MR_HEIGHT(mr),
+-		&Colorset[ST_CSET_MENU(ms)], Pdepth,
+-		FORE_GC(MST_MENU_INACTIVE_GCS(mr)), False);
++	if (MR_IS_TRANSLUCENT_MENU(mr))
++	{
++		Pixmap trans, tmp;
++		FvwmRenderAttributes fra;
++		colorset_t *colorset = &Colorset[ST_CSET_MENU(ms)];
++
++		fra.mask = 0;
++		if (colorset->translucent_tint_percent > 0)
++		{
++			fra.mask = FRAM_HAVE_TINT;
++			fra.tint = colorset->translucent_tint;
++			fra.tint_percent = colorset->translucent_tint_percent;
++		}
++		if (current_x == step_x)
++		{
++			/* Reuse the old pixmap for the part of the menu
++			 * that has not moved. (This can be extended to get
++			 * two new rectangles, one in each direction)
++			 *
++			 * It saves the unmapping of the window and makes
++			 * Things less flickering.
++			 */
++			GC my_gc;
++			unsigned long valuemask = GCSubwindowMode;
++			XGCValues values;
++			int out_y=0;
++			values.subwindow_mode = IncludeInferiors;
++			if (step_y < 0)
++			{
++				out_y = -step_y;
++			}
++			trans = XCreatePixmap(dpy, MR_WINDOW(mr), MR_WIDTH(mr),
++					      MR_HEIGHT(mr), Pdepth);
++			my_gc = fvwmlib_XCreateGC(dpy,  MR_WINDOW(mr), 0, NULL);
++			XChangeGC(dpy, my_gc, valuemask, &values);
++
++			XClearWindow(dpy, MR_WINDOW(mr));
++
++			if (current_y < step_y)
++			{
++				XCopyArea(dpy, MR_WINDOW(mr), trans, my_gc, 0,
++					  step_y-current_y, MR_WIDTH(mr),
++					  MR_HEIGHT(mr)-(step_y-current_y),
++					  0,0);
++				tmp = PGraphicsCreateTranslucent(
++					dpy, MR_WINDOW(mr), &fra,
++					BACK_GC(ST_MENU_INACTIVE_GCS(ms)),
++					current_x, current_y+MR_HEIGHT(mr),
++					MR_WIDTH(mr), step_y-current_y);
++
++				XCopyArea(dpy, tmp, trans, my_gc, 0, 0,
++					  MR_WIDTH(mr), step_y-current_y,0,
++					  MR_HEIGHT(mr)-(step_y-current_y));
++			}
++			else
++			{
++				XCopyArea(dpy, MR_WINDOW(mr), trans, my_gc, 0,
++					  0, MR_WIDTH(mr),
++					  MR_HEIGHT(mr)-(current_y-step_y), 0,
++					  current_y-step_y);
++				tmp = PGraphicsCreateTranslucent(
++					dpy, MR_WINDOW(mr), &fra,
++					BACK_GC(ST_MENU_INACTIVE_GCS(ms)),
++					current_x,step_y, MR_WIDTH(mr),
++					current_y-step_y);
++				XCopyArea(dpy, tmp, trans, my_gc, 0, 0,
++					  MR_WIDTH(mr), current_y-step_y,0,
++					  out_y);
++			}
++			MR_X(mr) = step_x;
++			MR_Y(mr) = step_y;
++			XFreePixmap(dpy, tmp);
++			XFreeGC(dpy,my_gc);
++		}
++		else
++		{
++			XUnmapWindow(dpy, MR_WINDOW(mr));
++			MR_X(mr) = step_x;
++			MR_Y(mr) = step_y;
++			trans = PGraphicsCreateTranslucent(
++				dpy, MR_WINDOW(mr), &fra,
++				BACK_GC(ST_MENU_INACTIVE_GCS(ms)),
++				step_x, step_y, MR_WIDTH(mr),
++				MR_HEIGHT(mr));
++			XMapRaised(dpy, MR_WINDOW(mr));
++		}
++		XSetWindowBackgroundPixmap(
++			dpy, MR_WINDOW(mr), trans);
++		XFreePixmap(dpy, trans);
++		if (current_x == step_x)
++		{
++			/* Redraw the border */
++			RelieveRectangle(
++				dpy, MR_WINDOW(mr), 0, 0, MR_WIDTH(mr) - 1,
++				MR_HEIGHT(mr) - 1, (Pdepth < 2) ?
++				SHADOW_GC(MST_MENU_INACTIVE_GCS(mr)) :
++				HILIGHT_GC(MST_MENU_INACTIVE_GCS(mr)),
++				SHADOW_GC(MST_MENU_INACTIVE_GCS(mr)),
++				MST_BORDER_WIDTH(mr));
++		}
++	}
++	else
++	{
++		SetWindowBackgroundWithOffset(
++			dpy, MR_WINDOW(mr), step_x - current_x,
++			step_y - current_y, MR_WIDTH(mr), MR_HEIGHT(mr),
++			&Colorset[ST_CSET_MENU(ms)], Pdepth,
++			FORE_GC(MST_MENU_INACTIVE_GCS(mr)), False);
++	}
+ }
+ 
+ 
+@@ -6327,10 +6496,7 @@ void repaint_transparent_menu(
+ 	}
+ 	if (!is_bg_set)
+ 	{
+-		SetWindowBackground(
+-			dpy, MR_WINDOW(mr), MR_WIDTH(mr), MR_HEIGHT(mr),
+-			&Colorset[ST_CSET_MENU(ms)], Pdepth,
+-			FORE_GC(MST_MENU_INACTIVE_GCS(mr)), False);
++		update_transparent_menu_bg(prtm, x, y, x, y, end_x, end_y);
+ 	}
+ 	/* redraw the background of non active item */
+ 	for (mi = MR_FIRST_ITEM(mr); mi != NULL; mi = MI_NEXT_ITEM(mi))
+@@ -6969,7 +7135,10 @@ void UpdateMenuColorset(int cset)
+ 					&Colorset[ST_CSET_MENU(ms)],
+ 					Pdepth,
+ 					FORE_GC(MST_MENU_INACTIVE_GCS(mr)),
+-					True);
++					False);
++				XClearArea(
++					dpy, MR_WINDOW(mr), 0, 0, MR_WIDTH(mr),
++					MR_HEIGHT(mr), True);
+ 			}
+ 			else if ((ST_HAS_ACTIVE_CSET(ms) &&
+ 				  ST_CSET_ACTIVE(ms) == cset) ||
+--- a/fvwm/menus.h
++++ b/fvwm/menus.h
+@@ -19,6 +19,9 @@
+ #define IS_MENU_RETURN(x) \
+   ((x)==MENU_DONE || (x)==MENU_ABORTED || (x)==MENU_SUBMENU_TORN_OFF)
+ 
++#define MR_X(m)                     ((m)->d->x)
++#define MR_Y(m)                     ((m)->d->y)
++
+ struct MenuRoot;
+ struct MenuStyle;
+ struct MenuReturn;
+--- a/libs/Colorset.h
++++ b/libs/Colorset.h
+@@ -53,6 +53,10 @@ typedef struct Colorset
+ 	Bool dither;
+ 	Bool allows_buffered_transparency;
+ 	Bool is_maybe_root_transparent;
++	/* only use by fvwm menu (non tear-off) */
++	Bool is_translucent;
++	Pixel translucent_tint;
++	unsigned int translucent_tint_percent : 7;
+ #endif
+ } colorset_t;
+ 
+@@ -80,6 +84,7 @@ typedef struct Colorset
+ #define FG_TINT_SUPPLIED  0x100
+ #define BG_TINT_SUPPLIED  0x200
+ #define ICON_TINT_SUPPLIED 0x400
++#define TRANSLUCENT_TINT_SUPPLIED 0x800
+ #endif
+ 
+ /* colorsets are stored as an array of structs to permit fast dereferencing */
+@@ -154,6 +159,10 @@ extern colorset_t *Colorset;
+ #define CSETS_IS_TRANSPARENT_PR_TINT(cset) \
+     (cset != NULL && cset->pixmap == ParentRelative && \
+      cset->tint_percent > 0)
++#define CSET_IS_TRANSLUCENT(cset) \
++	(cset >= 0 && Colorset[cset].is_translucent)
++#define CSETS_IS_TRANSLUCENT(cset) \
++	(cset && cset->is_translucent)
+ 
+ #ifndef FVWM_COLORSET_PRIVATE
+ /* Create n new colorsets, fvwm/colorset.c does its own thing (different size)
+--- a/libs/PictureGraphics.c
++++ b/libs/PictureGraphics.c
+@@ -1361,7 +1361,7 @@ void PGraphicsTintRectangle(
+ 	}
+ }
+ 
+-#if 0 /* humm... maybe useful one day with menus */
++#if 1 /* humm... maybe useful one day with menus */
+ Pixmap PGraphicsCreateTranslucent(
+ 	Display *dpy, Window win, FvwmRenderAttributes *fra, GC gc,
+ 	int x, int y, int width, int height)
+--- a/libs/PictureGraphics.h
++++ b/libs/PictureGraphics.h
+@@ -124,7 +124,9 @@ void PGraphicsTintRectangle(
+ 	Display *dpy, Window win, Pixel tint, int tint_percent,
+ 	Drawable dest, Bool dest_is_a_window, GC gc, GC mono_gc, GC alpha_gc,
+ 	int dest_x, int dest_y, int dest_w, int dest_h);
+-
++Pixmap PGraphicsCreateTranslucent(
++	Display *dpy, Window win, FvwmRenderAttributes *fra, GC gc,
++	int x, int y, int width, int height);
+ /* never used ! */
+ Pixmap PGraphicsCreateDitherPixmap(
+ 	Display *dpy, Window win, Drawable src, Pixmap mask, int depth, GC gc,
diff --git a/x11-wm/fvwm3/files/fvwm3-9999-goflags.patch b/x11-wm/fvwm3/files/fvwm3-9999-goflags.patch
new file mode 100644
index 000000000000..fa74f6fb734c
--- /dev/null
+++ b/x11-wm/fvwm3/files/fvwm3-9999-goflags.patch
@@ -0,0 +1,11 @@
+--- a/bin/FvwmPrompt/Makefile.am
++++ b/bin/FvwmPrompt/Makefile.am
+@@ -1,7 +1,7 @@
+ if FVWM_BUILD_GOLANG
+ GOCMD=go
+ GOBUILD=$(GOCMD) build
+-GOFLAGS=-ldflags="-s -w"
++GOFLAGS=
+ GOCLEAN=$(GOCMD) clean
+ BINARY_NAME=FvwmPrompt
+ 
diff --git a/x11-wm/fvwm3/files/fvwm3-9999-htmldoc.patch b/x11-wm/fvwm3/files/fvwm3-9999-htmldoc.patch
new file mode 100644
index 000000000000..abf6fadc614e
--- /dev/null
+++ b/x11-wm/fvwm3/files/fvwm3-9999-htmldoc.patch
@@ -0,0 +1,43 @@
+This patch enables html documentation in >= 1.0.5 of fvwm3
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -13,22 +13,27 @@ EXTRA_DIST = $(MODULE_ADOC)
+ nothing:
+ 
+ clean:
+-	rm -f *.1 *.ad
++	rm -f *.1 *.ad *.html
+ 
+ distclean-local: clean
+ 
+ if FVWM_BUILD_MANDOC
+-man1_MANS = $(patsubst %.adoc,%.1, $(MODULE_ADOC))
++man1_MANS = $(MODULE_ADOC:.adoc=.1)
++man1_HTML = $(MODULE_ADOC:.adoc=.html)
+ EXTRACT_SECTIONS = \
+ 	commands \
+ 	menus \
+ 	styles
+ SECTION_FILES = $(patsubst %,fvwm3_%.ad, $(EXTRACT_SECTIONS))
+ 
+-all: docs
++all: docs html
++
+ docs: $(man1_MANS)
+ $(man1_MANS): $(SECTION_FILES)
+ 
++html: $(man1_HTML)
++$(man1_HTML): $(SECTION_FILES)
++
+ %.ad: fvwm3_manpage_source.adoc
+ 	SECTION=$(patsubst fvwm3_%.ad,%,$@); \
+ 	cat "$<" | \
+@@ -38,4 +43,8 @@ $(man1_MANS): $(SECTION_FILES)
+ 
+ %.1: %.adoc
+ 	"$(ASCIIDOC)" -b manpage -a "$(patsubst %.1,%,$@)" "$<" -o "$@"
++
++%.html: %.adoc
++	"$(ASCIIDOC)" -b html5 -a "$(patsubst %.html,%,$@)" "$<" -o "$@"
++
+ endif
diff --git a/x11-wm/fvwm3/files/fvwm3-9999-translucent-menus.patch b/x11-wm/fvwm3/files/fvwm3-9999-translucent-menus.patch
new file mode 100644
index 000000000000..43b5b0a14403
--- /dev/null
+++ b/x11-wm/fvwm3/files/fvwm3-9999-translucent-menus.patch
@@ -0,0 +1,489 @@
+This patch enables some additional translucency "stuff", ported from a series of patches in 2003 (see readme)
+--- a/fvwm/colorset.c
++++ b/fvwm/colorset.c
+@@ -162,6 +162,8 @@ static char *csetopts[] =
+ 	"NoIconTint",
+ 	"IconAlpha",
+ 
++	"Translucent",
++	"NoTranslucent",
+ 	NULL
+ };
+ 
+@@ -620,6 +622,7 @@ void parse_colorset(int n, char *line)
+ 	char *fg_tint = NULL;
+ 	char *bg_tint = NULL;
+ 	char *icon_tint = NULL;
++	char *translucent_tint = NULL;
+ 	Bool have_pixels_changed = False;
+ 	Bool has_icon_pixels_changed = False;
+ 	Bool has_fg_changed = False;
+@@ -632,6 +635,7 @@ void parse_colorset(int n, char *line)
+ 	Bool has_fg_tint_changed = False;
+ 	Bool has_bg_tint_changed = False;
+ 	Bool has_icon_tint_changed = False;
++	Bool has_translucent_tint_changed = False;
+ 	Bool has_pixmap_changed = False;
+ 	Bool has_shape_changed = False;
+ 	Bool has_image_alpha_changed = False;
+@@ -758,6 +762,10 @@ void parse_colorset(int n, char *line)
+ 		case 21: /* Plain */
+ 			has_pixmap_changed = True;
+ 			free_colorset_background(cs, True);
++			cs->is_translucent = False;
++			cs->translucent_tint_percent = 0;
++			cs->color_flags &= ~TRANSLUCENT_TINT_SUPPLIED;
++			has_translucent_tint_changed = True;
+ 			break;
+ 		case 22: /* NoShape */
+ 			has_shape_changed = True;
+@@ -923,6 +931,24 @@ void parse_colorset(int n, char *line)
+ 				cs->icon_alpha_percent = tmp;
+ 			}
+ 			break;
++		case 42: /* Translucent */
++			cs->is_translucent = True;
++			parse_simple_tint(
++				cs, args, &translucent_tint,
++				TRANSLUCENT_TINT_SUPPLIED,
++				&has_translucent_tint_changed, &percent,
++				"Translucent");
++			if (has_translucent_tint_changed)
++			{
++				cs->translucent_tint_percent = percent;
++			}
++			break;
++		case 43: /* NoTranslucent */
++			cs->is_translucent = False;
++			cs->translucent_tint_percent = 0;
++			cs->color_flags &= ~TRANSLUCENT_TINT_SUPPLIED;
++			has_translucent_tint_changed = True;
++			break;
+ 		default:
+ 			/* test for ?Gradient */
+ 			if (option[0] && StrEquals(&option[1], "Gradient"))
+@@ -1624,6 +1650,27 @@ void parse_colorset(int n, char *line)
+ 		}
+ 	}
+ 
++	/*
++	 * ---------- change the translucent tint colour ----------
++	 */
++	if (has_translucent_tint_changed)
++	{
++		/* user specified colour */
++		if (translucent_tint != NULL)
++		{
++			PictureFreeColors(
++				dpy, Pcmap, &cs->translucent_tint, 1, 0, True);
++			cs->translucent_tint = GetColor(translucent_tint);
++		}
++		else
++		{
++			/* default */
++			PictureFreeColors(
++				dpy, Pcmap, &cs->translucent_tint, 1, 0, True);
++			cs->translucent_tint = GetColor(black);
++		}
++	}
++
+ 	/*
+ 	 * ---------- send new colorset to fvwm and clean up ----------
+ 	 */
+@@ -1720,6 +1767,7 @@ void alloc_colorset(int n)
+ 			ncs->fgsh = GetColor(white);
+ 			ncs->tint = GetColor(black);
+ 			ncs->icon_tint = GetColor(black);
++			ncs->translucent_tint = GetColor(black);
+ 			ncs->pixmap = XCreatePixmapFromBitmapData(
+ 				dpy, Scr.NoFocusWin,
+ 				&g_bits[4 * (nColorsets % 3)], 4, 4,
+@@ -1737,6 +1785,7 @@ void alloc_colorset(int n)
+ 			ncs->fgsh = GetForeShadow(ncs->fg, ncs->bg);
+ 			ncs->tint = GetColor(black);
+ 			ncs->icon_tint = GetColor(black);
++			ncs->translucent_tint = GetColor(black);
+ 		}
+ 		ncs->fg_tint = ncs->bg_tint = GetColor(black);
+ 		/* set flags for fg contrast, bg average */
+@@ -1748,6 +1797,7 @@ void alloc_colorset(int n)
+ 		ncs->icon_alpha_percent = 100;
+ 		ncs->tint_percent = 0;
+ 		ncs->icon_tint_percent = 0;
++		ncs->translucent_tint_percent = 0;
+ 		ncs->fg_tint_percent = ncs->bg_tint_percent = 0;
+ 		ncs->dither = (PictureDitherByDefault())? True:False;
+ 		nColorsets++;
+--- a/fvwm/menuroot.h
++++ b/fvwm/menuroot.h
+@@ -147,6 +147,9 @@ typedef struct MenuRootDynamic
+ 		int d_npixels;
+ 	} stored_pixels;
+ 	/* alloc pixels when dithering is used for gradients */
++	/* x,y XMapRaise */
++	int x;
++	int y;
+ } MenuRootDynamic;
+ 
+ /* access macros to dynamic menu members */
+--- a/fvwm/menus.c
++++ b/fvwm/menus.c
+@@ -76,6 +76,18 @@
+ 				 (ctx).menu_root.menu_root = (root))
+ #define SCTX_GET_MR(ctx)	((ctx).type == SCTX_MENU_ROOT ? \
+ 				 (ctx).menu_root.menu_root : NULL)
++#define MENU_IS_TRANSLUCENT(mr,cs) \
++	(!MR_IS_TEAR_OFF_MENU(mr) && CSET_IS_TRANSLUCENT(cs))
++#define MENU_IS_TRANSPARENT(mr,cs) \
++	(MENU_IS_TRANSLUCENT(mr,cs) || CSET_IS_TRANSPARENT(cs))
++#define MR_IS_TRANSLUCENT_MENU(mr)  \
++	(!MR_IS_TEAR_OFF_MENU(mr) && MR_STYLE(mr) && \
++	ST_HAS_MENU_CSET(MR_STYLE(mr)) && CSET_IS_TRANSLUCENT( \
++						ST_CSET_MENU(MR_STYLE(mr))))
++#define MR_IS_TRANSPARENT_MENU(mr) \
++	(MR_IS_TRANSLUCENT_MENU(mr) || (MR_STYLE(mr) && \
++	ST_HAS_MENU_CSET(MR_STYLE(mr)) && CSET_IS_TRANSPARENT( \
++						ST_CSET_MENU(MR_STYLE(mr)))))
+ 
+ /* ---------------------------- imports ------------------------------------ */
+ 
+@@ -219,6 +231,8 @@ typedef struct mloop_static_info_t
+ } mloop_static_info_t;
+ 
+ /* ---------------------------- forward declarations ----------------------- */
++static MenuRoot *seek_submenu_instance(
++	MenuRoot *parent_menu, MenuItem *parent_item);
+ 
+ /* ---------------------------- local variables ---------------------------- */
+ 
+@@ -380,12 +394,22 @@ static void animated_move_back(
+ 		Bool transparent_bg = False;
+ 
+ 		/* move it back */
+-		if (ST_HAS_MENU_CSET(MR_STYLE(mr)) &&
+-		    CSET_IS_TRANSPARENT(ST_CSET_MENU(MR_STYLE(mr))))
++		if (MR_IS_TRANSPARENT_MENU(mr))
+ 		{
+ 			transparent_bg = True;
+ 			get_menu_repaint_transparent_parameters(
+ 				&mrtp, mr, fw);
++			if (MR_IS_TRANSLUCENT_MENU(mr) && MR_SUBMENU_ITEM(mr))
++			{
++				MenuRoot *smr;
++				smr = seek_submenu_instance(
++					mr, MR_SUBMENU_ITEM(mr));
++				if (smr)
++				{
++					/* just unmap it here, popdown later */
++					XUnmapWindow(dpy, MR_WINDOW(smr));
++				}
++			}
+ 		}
+ 		end.x = start.x - MR_XANIMATION(mr);
+ 		end.y = start.y;
+@@ -1914,6 +1938,7 @@ static void make_menu_window(MenuRoot *mr, Bool is_tear_off)
+ 				/* Doh.  Use the standard display instead. */
+ 				MR_CREATE_DPY(mr) = dpy;
+ 			}
++			MR_IS_TEAR_OFF_MENU(mr) = 1;
+ 		}
+ 		else
+ 		{
+@@ -2718,7 +2743,37 @@ static void paint_menu(
+ 	}
+ 	MR_IS_PAINTED(mr) = 1;
+ 	/* paint the menu background */
+-	if (ms && ST_HAS_MENU_CSET(ms))
++	if (MR_IS_TRANSLUCENT_MENU(mr))
++	{
++		Pixmap trans = None;
++		FvwmRenderAttributes fra;
++		colorset_t *colorset = &Colorset[ST_CSET_MENU(ms)];
++
++		fra.mask = 0;
++		if (colorset->translucent_tint_percent > 0)
++		{
++			fra.mask = FRAM_HAVE_TINT;
++			fra.tint = colorset->translucent_tint;
++			fra.tint_percent = colorset->translucent_tint_percent;
++		}
++		if (MR_IS_BACKGROUND_SET(mr) == False)
++		{
++			trans = PGraphicsCreateTranslucent(
++				dpy, MR_WINDOW(mr), &fra,
++				BACK_GC(ST_MENU_INACTIVE_GCS(ms)),
++				MR_X(mr), MR_Y(mr), MR_WIDTH(mr), MR_HEIGHT(mr));
++			XMapRaised(dpy, MR_WINDOW(mr));
++			if (trans != None)
++			{
++				XSetWindowBackgroundPixmap(
++					dpy, MR_WINDOW(mr), trans);
++				MR_IS_BACKGROUND_SET(mr) = True;
++				clear_expose_menu_area(MR_WINDOW(mr), pevent);
++				XFreePixmap(dpy, trans);
++			}
++		}
++	}
++	else if (ms && ST_HAS_MENU_CSET(ms))
+ 	{
+ 		if (MR_IS_BACKGROUND_SET(mr) == False)
+ 		{
+@@ -3527,10 +3582,7 @@ static int pop_menu_up(
+ 					MR_HAS_POPPED_UP_RIGHT(mr) = 0;
+ 				}
+ 				MR_XANIMATION(parent_menu) += end_x - prev_x;
+-				if (ST_HAS_MENU_CSET(MR_STYLE(parent_menu)) &&
+-				    CSET_IS_TRANSPARENT(
+-					    ST_CSET_MENU(
+-						    MR_STYLE(parent_menu))))
++				if (MR_IS_TRANSPARENT_MENU(parent_menu))
+ 				{
+ 					transparent_bg = True;
+ 					get_menu_repaint_transparent_parameters(
+@@ -3713,10 +3765,21 @@ static int pop_menu_up(
+ 	 */
+ 
+ 	XMoveWindow(dpy, MR_WINDOW(mr), x, y);
++	MR_X(mr) = x;
++	MR_Y(mr) = y;
+ 	XSelectInput(dpy, MR_WINDOW(mr), event_mask);
+-	XMapRaised(dpy, MR_WINDOW(mr));
+-	if (popdown_window)
+-		XUnmapWindow(dpy, popdown_window);
++	if (MR_IS_TRANSLUCENT_MENU(mr))
++	{
++		if (popdown_window)
++			XUnmapWindow(dpy, popdown_window);
++		paint_menu(mr, NULL, fw);
++	}
++	else
++	{
++		XMapRaised(dpy, MR_WINDOW(mr));
++		if (popdown_window)
++			XUnmapWindow(dpy, popdown_window);
++	}
+ 	XFlush(dpy);
+ 	MR_MAPPED_COPIES(mr)++;
+ 	MST_USAGE_COUNT(mr)++;
+@@ -6286,16 +6349,122 @@ void update_transparent_menu_bg(
+ 	{
+ 		last = True;
+ 	}
+-	if (!last && CSET_IS_TRANSPARENT_PR_TINT(ST_CSET_MENU(ms)))
++	if (!last &&
++	    (CSET_IS_TRANSPARENT_PR_TINT(ST_CSET_MENU(ms)) ||
++	     MR_IS_TRANSLUCENT_MENU(mr)))
+ 	{
+ 		/* too slow ... */
+ 		return;
+ 	}
+-	SetWindowBackgroundWithOffset(
+-		dpy, MR_WINDOW(mr), step_x - current_x, step_y - current_y,
+-		MR_WIDTH(mr), MR_HEIGHT(mr),
+-		&Colorset[ST_CSET_MENU(ms)], Pdepth,
+-		FORE_GC(MST_MENU_INACTIVE_GCS(mr)), False);
++	if (MR_IS_TRANSLUCENT_MENU(mr))
++	{
++		Pixmap trans, tmp;
++		FvwmRenderAttributes fra;
++		colorset_t *colorset = &Colorset[ST_CSET_MENU(ms)];
++
++		fra.mask = 0;
++		if (colorset->translucent_tint_percent > 0)
++		{
++			fra.mask = FRAM_HAVE_TINT;
++			fra.tint = colorset->translucent_tint;
++			fra.tint_percent = colorset->translucent_tint_percent;
++		}
++		if (current_x == step_x)
++		{
++			/* Reuse the old pixmap for the part of the menu
++			 * that has not moved. (This can be extended to get
++			 * two new rectangles, one in each direction)
++			 *
++			 * It saves the unmapping of the window and makes
++			 * Things less flickering.
++			 */
++			GC my_gc;
++			unsigned long valuemask = GCSubwindowMode;
++			XGCValues values;
++			int out_y=0;
++			values.subwindow_mode = IncludeInferiors;
++			if (step_y < 0)
++			{
++				out_y = -step_y;
++			}
++			trans = XCreatePixmap(dpy, MR_WINDOW(mr), MR_WIDTH(mr),
++					      MR_HEIGHT(mr), Pdepth);
++			my_gc = fvwmlib_XCreateGC(dpy,  MR_WINDOW(mr), 0, NULL);
++			XChangeGC(dpy, my_gc, valuemask, &values);
++
++			XClearWindow(dpy, MR_WINDOW(mr));
++
++			if (current_y < step_y)
++			{
++				XCopyArea(dpy, MR_WINDOW(mr), trans, my_gc, 0,
++					  step_y-current_y, MR_WIDTH(mr),
++					  MR_HEIGHT(mr)-(step_y-current_y),
++					  0,0);
++				tmp = PGraphicsCreateTranslucent(
++					dpy, MR_WINDOW(mr), &fra,
++					BACK_GC(ST_MENU_INACTIVE_GCS(ms)),
++					current_x, current_y+MR_HEIGHT(mr),
++					MR_WIDTH(mr), step_y-current_y);
++
++				XCopyArea(dpy, tmp, trans, my_gc, 0, 0,
++					  MR_WIDTH(mr), step_y-current_y,0,
++					  MR_HEIGHT(mr)-(step_y-current_y));
++			}
++			else
++			{
++				XCopyArea(dpy, MR_WINDOW(mr), trans, my_gc, 0,
++					  0, MR_WIDTH(mr),
++					  MR_HEIGHT(mr)-(current_y-step_y), 0,
++					  current_y-step_y);
++				tmp = PGraphicsCreateTranslucent(
++					dpy, MR_WINDOW(mr), &fra,
++					BACK_GC(ST_MENU_INACTIVE_GCS(ms)),
++					current_x,step_y, MR_WIDTH(mr),
++					current_y-step_y);
++				XCopyArea(dpy, tmp, trans, my_gc, 0, 0,
++					  MR_WIDTH(mr), current_y-step_y,0,
++					  out_y);
++			}
++			MR_X(mr) = step_x;
++			MR_Y(mr) = step_y;
++			XFreePixmap(dpy, tmp);
++			XFreeGC(dpy,my_gc);
++		}
++		else
++		{
++			XUnmapWindow(dpy, MR_WINDOW(mr));
++			MR_X(mr) = step_x;
++			MR_Y(mr) = step_y;
++			trans = PGraphicsCreateTranslucent(
++				dpy, MR_WINDOW(mr), &fra,
++				BACK_GC(ST_MENU_INACTIVE_GCS(ms)),
++				step_x, step_y, MR_WIDTH(mr),
++				MR_HEIGHT(mr));
++			XMapRaised(dpy, MR_WINDOW(mr));
++		}
++		XSetWindowBackgroundPixmap(
++			dpy, MR_WINDOW(mr), trans);
++		XFreePixmap(dpy, trans);
++		if (current_x == step_x)
++		{
++			/* Redraw the border */
++			RelieveRectangle(
++				dpy, MR_WINDOW(mr), 0, 0, MR_WIDTH(mr) - 1,
++				MR_HEIGHT(mr) - 1, (Pdepth < 2) ?
++				SHADOW_GC(MST_MENU_INACTIVE_GCS(mr)) :
++				HILIGHT_GC(MST_MENU_INACTIVE_GCS(mr)),
++				SHADOW_GC(MST_MENU_INACTIVE_GCS(mr)),
++				MST_BORDER_WIDTH(mr));
++		}
++	}
++	else
++	{
++		SetWindowBackgroundWithOffset(
++			dpy, MR_WINDOW(mr), step_x - current_x,
++			step_y - current_y, MR_WIDTH(mr), MR_HEIGHT(mr),
++			&Colorset[ST_CSET_MENU(ms)], Pdepth,
++			FORE_GC(MST_MENU_INACTIVE_GCS(mr)), False);
++	}
+ }
+ 
+ 
+@@ -6336,10 +6505,7 @@ void repaint_transparent_menu(
+ 	}
+ 	if (!is_bg_set)
+ 	{
+-		SetWindowBackground(
+-			dpy, MR_WINDOW(mr), MR_WIDTH(mr), MR_HEIGHT(mr),
+-			&Colorset[ST_CSET_MENU(ms)], Pdepth,
+-			FORE_GC(MST_MENU_INACTIVE_GCS(mr)), False);
++		update_transparent_menu_bg(prtm, x, y, x, y, end_x, end_y);
+ 	}
+ 	/* redraw the background of non active item */
+ 	for (mi = MR_FIRST_ITEM(mr); mi != NULL; mi = MI_NEXT_ITEM(mi))
+@@ -6978,7 +7144,10 @@ void UpdateMenuColorset(int cset)
+ 					&Colorset[ST_CSET_MENU(ms2)],
+ 					Pdepth,
+ 					FORE_GC(MST_MENU_INACTIVE_GCS(mr)),
+-					True);
++					False);
++				XClearArea(
++					dpy, MR_WINDOW(mr), 0, 0, MR_WIDTH(mr),
++					MR_HEIGHT(mr), True);
+ 			}
+ 			else if ((ST_HAS_ACTIVE_CSET(ms2) &&
+ 				  ST_CSET_ACTIVE(ms2) == cset) ||
+--- a/fvwm/menus.h
++++ b/fvwm/menus.h
+@@ -19,6 +19,9 @@
+ #define IS_MENU_RETURN(x) \
+   ((x)==MENU_DONE || (x)==MENU_ABORTED || (x)==MENU_SUBMENU_TORN_OFF)
+ 
++#define MR_X(m)                     ((m)->d->x)
++#define MR_Y(m)                     ((m)->d->y)
++
+ struct MenuRoot;
+ struct MenuStyle;
+ struct MenuReturn;
+--- a/libs/Colorset.h
++++ b/libs/Colorset.h
+@@ -53,6 +53,10 @@ typedef struct Colorset
+ 	Bool dither;
+ 	Bool allows_buffered_transparency;
+ 	Bool is_maybe_root_transparent;
++	/* only use by fvwm menu (non tear-off) */
++	Bool is_translucent;
++	Pixel translucent_tint;
++	unsigned int translucent_tint_percent : 7;
+ #endif
+ } colorset_t;
+ 
+@@ -80,6 +84,7 @@ typedef struct Colorset
+ #define FG_TINT_SUPPLIED  0x100
+ #define BG_TINT_SUPPLIED  0x200
+ #define ICON_TINT_SUPPLIED 0x400
++#define TRANSLUCENT_TINT_SUPPLIED 0x800
+ #endif
+ 
+ /* colorsets are stored as an array of structs to permit fast dereferencing */
+@@ -155,6 +160,11 @@ extern colorset_t *Colorset;
+     (cset != NULL && cset->pixmap == ParentRelative && \
+      cset->tint_percent > 0)
+ 
++#define CSET_IS_TRANSLUCENT(cset) \
++    (cset >= 0 && Colorset[cset].is_translucent)
++#define CSETS_IS_TRANSLUCENT(cset) \
++    (cset && cset->is_translucent)
++
+ #ifndef FVWM_COLORSET_PRIVATE
+ /* Create n new colorsets, fvwm/colorset.c does its own thing (different size)
+  */
+--- a/libs/PictureGraphics.c
++++ b/libs/PictureGraphics.c
+@@ -1361,7 +1361,7 @@ void PGraphicsTintRectangle(
+ 	}
+ }
+ 
+-#if 0 /* humm... maybe useful one day with menus */
++#if 1 /* humm... maybe useful one day with menus */
+ Pixmap PGraphicsCreateTranslucent(
+ 	Display *dpy, Window win, FvwmRenderAttributes *fra, GC gc,
+ 	int x, int y, int width, int height)
+--- a/libs/PictureGraphics.h
++++ b/libs/PictureGraphics.h
+@@ -124,7 +124,9 @@ void PGraphicsTintRectangle(
+ 	Display *dpy, Window win, Pixel tint, int tint_percent,
+ 	Drawable dest, Bool dest_is_a_window, GC gc, GC mono_gc, GC alpha_gc,
+ 	int dest_x, int dest_y, int dest_w, int dest_h);
+-
++Pixmap PGraphicsCreateTranslucent(
++	Display *dpy, Window win, FvwmRenderAttributes *fra, GC gc,
++	int x, int y, int width, int height);
+ /* never used ! */
+ Pixmap PGraphicsCreateDitherPixmap(
+ 	Display *dpy, Window win, Drawable src, Pixmap mask, int depth, GC gc,
diff --git a/x11-wm/fvwm3/fvwm3-1.0.4-r2.ebuild b/x11-wm/fvwm3/fvwm3-1.0.4-r2.ebuild
new file mode 100644
index 000000000000..afd245eccd27
--- /dev/null
+++ b/x11-wm/fvwm3/fvwm3-1.0.4-r2.ebuild
@@ -0,0 +1,178 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+GO_OPTIONAL=1
+inherit autotools desktop flag-o-matic go-module python-single-r1 toolchain-funcs
+
+DESCRIPTION="A multiple large virtual desktop window manager derived from fvwm"
+HOMEPAGE="http://www.fvwm.org/"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/fvwmorg/fvwm3.git"
+	EGIT_BRANCH="master"
+else
+	SRC_URI="https://github.com/fvwmorg/fvwm3/releases/download/${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~riscv"
+fi
+
+LICENSE="GPL-2+ FVWM
+	go? ( Apache-2.0 BSD MIT )"
+SLOT="0"
+IUSE="bidi debug doc go netpbm nls perl readline rplay stroke svg tk vanilla lock"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}"
+
+DOCS=( NEWS )
+
+if [[ ${PV} == 9999 ]]; then
+	DOCS+=( dev-docs/COMMANDS dev-docs/DEVELOPERS.md dev-docs/INSTALL.md dev-docs/PARSING.md dev-docs/TODO.md dev-docs/NEW-COMMANDS.md )
+fi
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( dev-libs/libxslt
+		dev-ruby/asciidoctor )
+	app-arch/unzip
+	go? ( >=dev-lang/go-1.14 )
+"
+
+RDEPEND="${PYTHON_DEPS}
+	${COMMON_DEPEND}
+	!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
+	)"
+
+DEPEND="${COMMON_DEPEND}
+	x11-base/xorg-proto"
+
+PATCHES=(
+	"${FILESDIR}/${P}-translucent-menus.patch"
+)
+
+if [[ ${PV} == 9999 ]]; then
+	PATCHES+=(
+		"${FILESDIR}/${P}-goflags.patch"
+	)
+fi
+
+src_prepare() {
+	default
+	if use doc; then
+		eapply "${FILESDIR}/${P}-htmldoc.patch"
+	fi
+
+	eautoreconf
+}
+
+src_configure() {
+	# Non-upstream email where bugs should be sent; used in fvwm-bug.
+	export FVWM_BUGADDR="desktop-wm@nogentoo.org"
+
+	# Recommended by upstream for release. Doesn't really matter for live ebuilds.
+	append-flags -fno-strict-aliasing
+
+	# Signed chars are required.
+	for arch in arm arm64 ppc ppc64; do
+		use $arch && append-flags -fsigned-chars
+	done
+
+	local myconf=(
+		--with-imagepath=/usr/include/X11/bitmaps:/usr/include/X11/pixmaps:/usr/share/icons/fvwm
+		--enable-package-subdirs
+		$(use_enable bidi)
+		$(use_enable doc mandoc)
+		$(use_enable go golang)
+		$(use_enable nls)
+		$(use_enable nls iconv)
+		$(use_enable perl perllib)
+		$(use_with readline readline-library)
+		$(use_enable svg rsvg)
+		--enable-png
+		--enable-xft
+	)
+
+	use readline && myconf+=( --without-termcap-library )
+
+	econf ${myconf[@]}
+}
+
+src_compile() {
+	PREFIX="${EPREFIX}/usr" emake AR="$(tc-getAR)"
+	if [[ ${PV} == *9999 ]]; then
+		use doc && emake -C doc html
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${ED}" prefix="/usr" exec_prefix="/usr" datarootdir="/usr/share" install
+
+	dodir /etc/X11/Sessions
+	echo "/usr/bin/fvwm3" > "${ED}/etc/X11/Sessions/${PN}" || die
+	fperms a+x /etc/X11/Sessions/${PN} || die
+
+	python_scriptinto "/usr/bin"
+	python_doscript "${ED}/usr/bin/FvwmCommand" "${ED}/usr/bin/fvwm-menu-desktop"
+	if use doc; then
+		if [[ ${PV} == *9999 ]]; then
+			HTML_DOCS=( doc/*.html )
+		else
+			HTML_DOCS=( doc/html/*.html )
+		fi
+	fi
+	einstalldocs
+
+	make_session_desktop fvwm3 /usr/bin/fvwm3
+}
+
+pkg_postinst() {
+	if use go; then
+		ewarn "FvwmPrompt has been installed, it provides the functionality of both FvwmCommand and FvwmConsole."
+		ewarn "For compatibility with the existing fvwm2 configurations, the ebuild will install a FvwmCommand wrapper script."
+		ewarn "If you need FvwmConsole, install ${PN} with USE=\"-go\", but FvwmPrompt and FvwmCommnd will not be installed."
+	else
+		ewarn "Fvwmconsole has been installed, but FvwmCommand and FvwmPrompt are no longer included in this ebuild."
+		ewarn "If you need FvwmPrompt or FvwmCommand, install ${PN} with USE=\"go\"."
+		ewarn "In that case, FvwmPrompt will replace FvwmConsole and provide the same functionality in a more flexible way."
+	fi
+}
diff --git a/x11-wm/fvwm3/fvwm3-9999.ebuild b/x11-wm/fvwm3/fvwm3-9999.ebuild
new file mode 100644
index 000000000000..65fdb8f91459
--- /dev/null
+++ b/x11-wm/fvwm3/fvwm3-9999.ebuild
@@ -0,0 +1,178 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+GO_OPTIONAL=1
+inherit autotools desktop flag-o-matic go-module python-single-r1 toolchain-funcs
+
+DESCRIPTION="A multiple large virtual desktop window manager derived from fvwm"
+HOMEPAGE="http://www.fvwm.org/"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/fvwmorg/fvwm3.git"
+	EGIT_BRANCH="master"
+else
+	SRC_URI="https://github.com/fvwmorg/fvwm3/releases/download/${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~riscv"
+fi
+
+LICENSE="GPL-2+ FVWM
+	go? ( Apache-2.0 BSD MIT )"
+SLOT="0"
+IUSE="bidi debug doc go netpbm nls perl readline rplay stroke svg tk vanilla lock"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}"
+
+DOCS=( NEWS )
+
+if [[ ${PV} == 9999 ]]; then
+	DOCS+=( dev-docs/COMMANDS dev-docs/DEVELOPERS.md dev-docs/INSTALL.md dev-docs/PARSING.md dev-docs/TODO.md dev-docs/NEW-COMMANDS.md )
+fi
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( dev-libs/libxslt
+		dev-ruby/asciidoctor )
+	app-arch/unzip
+	go? ( >=dev-lang/go-1.14 )
+"
+
+RDEPEND="${PYTHON_DEPS}
+	${COMMON_DEPEND}
+	!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
+	)"
+
+DEPEND="${COMMON_DEPEND}
+	x11-base/xorg-proto"
+
+PATCHES=(
+	"${FILESDIR}/${P}-translucent-menus.patch"
+)
+
+if [[ ${PV} == 9999 ]]; then
+	PATCHES+=(
+		"${FILESDIR}/${P}-goflags.patch"
+	)
+fi
+
+src_prepare() {
+	default
+	if use doc; then
+		eapply "${FILESDIR}/${P}-htmldoc.patch"
+	fi
+
+	eautoreconf
+}
+
+src_configure() {
+	# Non-upstream email where bugs should be sent; used in fvwm-bug.
+	export FVWM_BUGADDR="desktop-wm@nogentoo.org"
+
+	# Recommended by upstream for release. Doesn't really matter for live ebuilds.
+	append-flags -fno-strict-aliasing
+
+	# Signed chars are required.
+	for arch in arm arm64 ppc ppc64; do
+		use $arch && append-flags -fsigned-chars
+	done
+
+	local myconf=(
+		--with-imagepath=/usr/include/X11/bitmaps:/usr/include/X11/pixmaps:/usr/share/icons/fvwm
+		--enable-package-subdirs
+		$(use_enable bidi)
+		$(use_enable doc mandoc)
+		$(use_enable go golang)
+		$(use_enable nls)
+		$(use_enable nls iconv)
+		$(use_enable perl perllib)
+		$(use_with readline readline-library)
+		$(use_enable svg rsvg)
+		--enable-png
+	)
+
+	use readline && myconf+=( --without-termcap-library )
+
+	econf ${myconf[@]}
+}
+
+src_compile() {
+	PREFIX="${EPREFIX}/usr" emake AR="$(tc-getAR)"
+	if [[ ${PV} == *9999 ]]; then
+		use doc && emake -C doc html
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${ED}" prefix="/usr" exec_prefix="/usr" datarootdir="/usr/share" install
+
+	dodir /etc/X11/Sessions
+	echo "/usr/bin/fvwm3" > "${ED}/etc/X11/Sessions/${PN}" || die
+	fperms a+x /etc/X11/Sessions/${PN} || die
+
+	python_scriptinto "/usr/bin"
+	python_doscript "${ED}/usr/bin/FvwmCommand" "${ED}/usr/bin/fvwm-menu-desktop"
+	if use doc; then
+		if [[ ${PV} == *9999 ]]; then
+			HTML_DOCS=( doc/*.html )
+		else
+			HTML_DOCS=( doc/html/*.html )
+		fi
+	fi
+	einstalldocs
+
+	make_session_desktop fvwm3 /usr/bin/fvwm3
+}
+
+pkg_postinst() {
+	if use go; then
+		ewarn "FvwmPrompt has been installed, it provides the functionality of both FvwmCommand and FvwmConsole."
+		ewarn "For compatibility with the existing fvwm2 configurations, the ebuild will install a FvwmCommand wrapper script."
+		ewarn "If you need FvwmConsole, install ${PN} with USE=\"-go\", but FvwmPrompt and FvwmCommnd will not be installed."
+	else
+		ewarn "Fvwmconsole has been installed, but FvwmCommand and FvwmPrompt are no longer included in this ebuild."
+		ewarn "If you need FvwmPrompt or FvwmCommand, install ${PN} with USE=\"go\"."
+		ewarn "In that case, FvwmPrompt will replace FvwmConsole and provide the same functionality in a more flexible way."
+	fi
+}
diff --git a/x11-wm/fvwm3/metadata.xml b/x11-wm/fvwm3/metadata.xml
new file mode 100644
index 000000000000..3711144d46ea
--- /dev/null
+++ b/x11-wm/fvwm3/metadata.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<longdescription lang="en">
+		fvwm3 is a multiple large virtual desktop window manager.
+		The successor to fvwm-2.6, Fvwm3 is intended to be extremely customizable and extendible while consuming a relatively small amount of resources.
+	</longdescription>
+	<maintainer type="person" proxied="yes">
+		<email>Matt.Jolly@footclan.ninja</email>
+		<name>Matthew Jolly</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<use>
+		<flag name="go">Enable building <pkg>dev-lang/go</pkg> code (FvwmPrompt)</flag>
+		<flag name="lock">Enable screen locking</flag>
+		<flag name="netpbm">Enable NetPBM support (used by FvwmScript-ScreenDump)</flag>
+		<flag name="rplay">Enable rplay support</flag>
+		<flag name="stroke">Mouse Gesture support</flag>
+	</use>
+	<upstream>
+		<bugs-to>https://github.com/fvwmorg/fvwm3/issues</bugs-to>
+		<changelog>https://raw.githubusercontent.com/fvwmorg/fvwm3/master/CHANGELOG.md</changelog>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-wm/herbstluftwm/Manifest b/x11-wm/herbstluftwm/Manifest
index e1cb9b62c74e..bafab0d62a2f 100644
--- a/x11-wm/herbstluftwm/Manifest
+++ b/x11-wm/herbstluftwm/Manifest
@@ -1,4 +1,4 @@
-DIST herbstluftwm-0.9.3.tar.gz 497523 BLAKE2B 1936924f86201b6ad6ec33426d366912fd72e2a5e5a4964cafcb40d76624c2a1398c9330cde472343b436d16c9299aba495e1a224c6ea8bb173bbf76b7209cb3 SHA512 73e4193a2d79c452c08b4ac1c8fea1e93b88b07baa0c9006b74a76ed84de578d3234789e3666a9299ef3942695225c9a7f85eb3698a44edb1234f6042dbea47c
-EBUILD herbstluftwm-0.9.3.ebuild 2982 BLAKE2B e9cbbe5b76e1553cdf2bd3197b93a3e7ad22612b8284c8ef20008bf9fab94f2117879f2f3c529766048f03ba0a22035750a62f5c8d78ab7b2d8e5ddb192bbcfc SHA512 107c2485d18e30abac5801a946cd565700ce90d75057a762ecb4c8a8d503b9c9f011396b6bf746ae90eb7da922ef5b043c915eea57bf348ea386b66b55c53d53
-EBUILD herbstluftwm-9999.ebuild 3262 BLAKE2B 0c6d211c2fa9d0e80b271e5107650a5176fa1bab34f1c948d25fd72f8111409c6d9c6543a1b46bb02ba103c030cc3b28edcd34d2b9e121f2b75072b534d7a7e4 SHA512 2739175752081dc17db123bd089e8f027d17ba1d1fb9a81b836d381976f07aaea194509733d766617b2dd8444992d62a065f5b83a091e0395c1b218c3afc893e
+DIST herbstluftwm-0.9.4.tar.gz 549029 BLAKE2B 23f1dbf212c4d0a64f2e2d8442ac7c2465a54a13af74de6c949c4d6eda85fd4e66b73188c526d0968372eb45691ffca43e387c8410691fd134f662e1e8c501b3 SHA512 068438d14b0addcd17a0c0bda1d33ec4aaff08a3c85698a49e9d3dd0c07f91e315f936d73c11b0c159b8735373ea1efe8a572a0976fc327f4aaa6a0f08436e9d
+EBUILD herbstluftwm-0.9.4.ebuild 2986 BLAKE2B a2eb901d21217a3960324ddd2eccfcd8e26254ca9e88ac6de266e6e97629ec2cc9f53018d0683620044d348eb348bed2cc5f0f0a4329e815f00fad8dbadab991 SHA512 b7c7900c1f84c4a2e75c61a009d8d504a5f0009b3d1b61ac3a58fd0562b3661468d266975e2fb201143dd9ba6258e11dd51af376b288598a4abfece06a2a8a79
+EBUILD herbstluftwm-9999.ebuild 3400 BLAKE2B ebc8f10a0506aa602092455f0e51b8c1ca3c2a3d4a6c585a6210ffe240b1006b0dcebff3282b8c84eef02605679c86ccfb8900aa4f2c2486a7ca95d0dd39c446 SHA512 0b1be1854a4a331ded3929d4cbb9045a8a690b9da1d916c6cd1a67d12eac9f53c4bc6ae74bbd756d6193f11ad50127362445e2cba1d79dab375ccd7cc0e5456d
 MISC metadata.xml 337 BLAKE2B 7ef28bc6ce30abb6c2f44524b4dd05a479cd5ca2b98901ffe570b870d0b98f94589cd1d3f197ee7e3fd90f4c73144e1dc44996df8b1b3ec28ce6950578ada74e SHA512 6e7cb80e1870901554ac0c2a4947cceb4e6284ccc84714bb0f42dbfa69cab5b32a8bd34fd384731b9462535d7e80feef606030be3e03babc80828a980050f333
diff --git a/x11-wm/herbstluftwm/herbstluftwm-0.9.3.ebuild b/x11-wm/herbstluftwm/herbstluftwm-0.9.4.ebuild
index fe478ccf2e52..d69cb69d2351 100644
--- a/x11-wm/herbstluftwm/herbstluftwm-0.9.3.ebuild
+++ b/x11-wm/herbstluftwm/herbstluftwm-0.9.4.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 DISTUTILS_OPTIONAL=1
 
-inherit cmake distutils-r1 toolchain-funcs
+inherit cmake distutils-r1
 
 DESCRIPTION="A manual tiling window manager for X"
 HOMEPAGE="https://herbstluftwm.org/"
@@ -26,12 +26,13 @@ RESTRICT="!test? ( test )"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 COMMON_DEPEND="
-	media-libs/freetype
 	x11-libs/libX11
 	x11-libs/libXext
+	x11-libs/libXfixes
 	x11-libs/libXft
 	x11-libs/libXinerama
 	x11-libs/libXrandr
+	x11-libs/libXrender
 "
 DEPEND="
 	${COMMON_DEPEND}
diff --git a/x11-wm/herbstluftwm/herbstluftwm-9999.ebuild b/x11-wm/herbstluftwm/herbstluftwm-9999.ebuild
index ed397f906c24..4bb6c21b60f1 100644
--- a/x11-wm/herbstluftwm/herbstluftwm-9999.ebuild
+++ b/x11-wm/herbstluftwm/herbstluftwm-9999.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 DISTUTILS_OPTIONAL=1
 
-inherit cmake distutils-r1 toolchain-funcs
+inherit cmake distutils-r1
 
 DESCRIPTION="A manual tiling window manager for X"
 HOMEPAGE="https://herbstluftwm.org/"
@@ -26,12 +26,13 @@ RESTRICT="!test? ( test )"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 COMMON_DEPEND="
-	media-libs/freetype
 	x11-libs/libX11
 	x11-libs/libXext
+	x11-libs/libXfixes
 	x11-libs/libXft
 	x11-libs/libXinerama
 	x11-libs/libXrandr
+	x11-libs/libXrender
 "
 DEPEND="
 	${COMMON_DEPEND}
@@ -70,6 +71,11 @@ src_prepare() {
 		-e '/^install.*LICENSEDIR/d' \
 		-e '/set(DOCDIR / s#.*#set(DOCDIR ${CMAKE_INSTALL_DOCDIR})#' \
 		CMakeLists.txt || die
+
+	# Do not install MAN pages, we use doman in src_install() for that.
+	sed -i '/MANDIR/d' \
+		doc/CMakeLists.txt || die
+
 	cmake_src_prepare
 
 	if use python; then
@@ -123,7 +129,7 @@ src_install() {
 			herbstluftwm-tutorial.7
 		)
 		for man_page in "${man_pages[@]}"; do
-			doman "doc/${man_page}"
+			doman "${BUILD_DIR}/doc/${man_page}"
 		done
 	fi
 }
diff --git a/x11-wm/icewm/Manifest b/x11-wm/icewm/Manifest
index 8bcde85ea453..b642671aeec6 100644
--- a/x11-wm/icewm/Manifest
+++ b/x11-wm/icewm/Manifest
@@ -5,4 +5,4 @@ DIST icewm-2.9.7.tar.lz 1764916 BLAKE2B b2b88f96bb71999c3580c7df6b3f8858aca2a49f
 EBUILD icewm-2.8.0.ebuild 2945 BLAKE2B e3eb96395c915d19bf7eca3e93b6f8bd9eb0fdd355a997b77a4892a83a980f2d36e53283626094a82cb97f07c033979a7c5154ff5a714e2751a7e1537338946a SHA512 44524828aa2f0d752ada604cb4f8fae4534d236a5d0bc836f713bf7df385795ccc9fa522690da51a5d4503671b974d8c9538afc94cb0518fc28f825a20c860b0
 EBUILD icewm-2.9.6.ebuild 2949 BLAKE2B 59c8d51cc721ac2bada2a6efd8b5c135f29b988bb833d2268a87c690299d86b7cfc6cae69749af177acb9fd3440a7ca16580ae0ae311278b8ad65c4309b44b7e SHA512 f3b80189c40aa59f9f4ad41ea5310779abbc00f214a6f7a66557c60ed3cd80d7a47db9b4987046beb1e7890600d96bec945036ea5557ba182d6f435021cf857c
 EBUILD icewm-2.9.7.ebuild 2949 BLAKE2B 59c8d51cc721ac2bada2a6efd8b5c135f29b988bb833d2268a87c690299d86b7cfc6cae69749af177acb9fd3440a7ca16580ae0ae311278b8ad65c4309b44b7e SHA512 f3b80189c40aa59f9f4ad41ea5310779abbc00f214a6f7a66557c60ed3cd80d7a47db9b4987046beb1e7890600d96bec945036ea5557ba182d6f435021cf857c
-MISC metadata.xml 748 BLAKE2B 340b1eea319761630ad5bc22dc734fbfc2492acb263f03ea267e3c37c6c2928ba23cde5ee670c9265dae8bc3f78cdacf584c32d6c65219e859cf6df3b283be4d SHA512 4ba0d01e983f7a6c16ce6da6a7f54fb962154d50db8b820855e2c0dda7609526fc1aae039b469c27eaf6bd09a71b3c951c58b2a84d8aea9ce9fce4a5eff48b46
+MISC metadata.xml 664 BLAKE2B 5a99bb11c31a4dbae2d4628fbd6278aedaa783ae65797d2a98c7f415704b23730f89e28d872f3f8f0e838ad2962dcc2e098d559b5ea68a703136a21e7f4a1cae SHA512 396201ee77abf78058b52452e3c14f985f125bb7d3bda3b09f04ad978639e5bfb8c614a0a4262a9b52f44d084cfabac3e53d2256a063dd3bc4daacc80954ce66
diff --git a/x11-wm/icewm/metadata.xml b/x11-wm/icewm/metadata.xml
index d583a957a1aa..4945b86d191f 100644
--- a/x11-wm/icewm/metadata.xml
+++ b/x11-wm/icewm/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>polynomial-c@gentoo.org</email>
-		<name>Lars Wendler</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="gdk-pixbuf">Enable gdk-pixbuf rendering</flag>
 	</use>
diff --git a/x11-wm/marco/Manifest b/x11-wm/marco/Manifest
index 7b47b2f2ee38..e4c0ba4c3f04 100644
--- a/x11-wm/marco/Manifest
+++ b/x11-wm/marco/Manifest
@@ -1,3 +1,5 @@
 DIST marco-1.24.2.tar.xz 1845356 BLAKE2B 9308e07fec5319f741f7d78007e68e916c407c515fc2076c0e26a760830d3c79edf39888f265f7edc1baf0c8dc29661fb6598be16352103455cc441bc2a1daf5 SHA512 2e699935fb72ddc34aa1f98f5771f252141245ad8fd0983aafe5ea55aeeb3f90b5d68a61c27704adf0b929565180367aae46486d45e789d7de101ec9a7bc9f96
-EBUILD marco-1.24.2.ebuild 1488 BLAKE2B 8fe9eb2628956fe81b139953720ed5b138f3dfbb7ddd2adcf63291d40ac9d8d999718834d1abe3f73eb295715f14c701d164eeb97f0dc35eade55038c03dbb38 SHA512 d7d9a4377a92558b9d9361713278685db5894a900cbcd327b7fb754a9de2097640917234b6079f94fae6323c222d5f877e176deab3811373875be2b2608fc36a
+DIST marco-1.26.0.tar.xz 1855196 BLAKE2B 1481ee365d9bd8430fc5dc11a41268613823ff44c99b0d50a747dfd4663e40f121038a32f148af546f6e500b9a905bb30f6c5c9ff19dedb56eb991e2ceefe95f SHA512 013ba12dc7f4affe24bc5763ae88e44ede3f1454e74b5a642503d3741ce935f6757eba3f9def56670414c5a9c03b38384b5b54a494f9cb8f5bfd480e43300e76
+EBUILD marco-1.24.2.ebuild 1495 BLAKE2B a6628579fdc5f31f0d472509d27a5759983031dd17edfb85fe2fb228b170b302f039f9ea6a3b621182f1175110837652a3129dba3ff47dffb60574443574e60f SHA512 274b278626227046ccc356afa086d1243b4a15459acaf24e0c166f2abf827f958459d5f5814874ae73f767d39e2a7ae3c61fdbfe243853703176c5b36f57ea86
+EBUILD marco-1.26.0.ebuild 1461 BLAKE2B fc7d4afa53f941554650c9f43a60dddaed653969c362e108cdc2475a8b0c113e774d6c350d0e9278ba1c587319d656c9a52be40ac23d2534ac0595c648c6f985 SHA512 395751a2e87778620dc5a72686971d72d20350059fc72faad5aeca3b7d65c3868d1a35ea8b5b59facea68aabe78b7edb388cb6d0430de9f29623fb28668de6f8
 MISC metadata.xml 335 BLAKE2B 6ea6ccc130219ab51421a230c3725468d1981748dff6f5b5978d7dbceb67dbe6aa81d26f77f36cea462256133109f8ea125bfed41653deac552e09855cde46af SHA512 8b165e204f4c7420fbeb618ce2b19d01ab08dde6f870155c8d03b5edb959d9ea82b15d926ae2ddfd9ca445139d06f32b370016b585a1c227808e26988794ecd8
diff --git a/x11-wm/marco/marco-1.24.2.ebuild b/x11-wm/marco/marco-1.24.2.ebuild
index 3583e642ce12..3b1150d4eb99 100644
--- a/x11-wm/marco/marco-1.24.2.ebuild
+++ b/x11-wm/marco/marco-1.24.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ MATE2_LA_PUNT="yes"
 inherit mate
 
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~loong ~riscv x86"
 fi
 
 DESCRIPTION="MATE default window manager"
diff --git a/x11-wm/marco/marco-1.26.0.ebuild b/x11-wm/marco/marco-1.26.0.ebuild
new file mode 100644
index 000000000000..2c8046f6b6e4
--- /dev/null
+++ b/x11-wm/marco/marco-1.26.0.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MATE2_LA_PUNT="yes"
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+fi
+
+DESCRIPTION="MATE default window manager"
+LICENSE="FDL-1.2+ GPL-2+ LGPL-2+ MIT"
+SLOT="0/2"
+
+IUSE="startup-notification test xinerama"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	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 )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	gnome-extra/zenity
+	>=mate-base/mate-desktop-1.20.0
+	virtual/libintl
+"
+
+BDEPEND="${COMMON_DEPEND}
+	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 )
+"
+
+src_configure() {
+	mate_src_configure \
+		--enable-compositor \
+		--enable-render \
+		--enable-shape \
+		--enable-sm \
+		--enable-xsync \
+		$(use_enable startup-notification) \
+		$(use_enable xinerama)
+}
+
+src_install() {
+	mate_src_install
+	dodoc doc/*.txt
+}
diff --git a/x11-wm/matwm2/Manifest b/x11-wm/matwm2/Manifest
index 531d1083e53d..64cedcb8e756 100644
--- a/x11-wm/matwm2/Manifest
+++ b/x11-wm/matwm2/Manifest
@@ -1,5 +1,5 @@
 AUX matwm2-0.1.2_pre3-destdir-fix.patch 1104 BLAKE2B 696ddba152f6283bf317d6edab99648d8c955e799b7eb8fd9bf46a7c5b89d018e7e11ad645e9f11b0530d51a882dd6329858da78dedef15235e52e3cda8f19b6 SHA512 339986e58e4ca608d0d481f1c820662a24a012021733c242aceaec3e82490deccf395bf3766124469983f55cb2cb3552f5a3d07e3f56a34dd93a1251d3dd29a6
 AUX matwm2.desktop 69 BLAKE2B 6eda01e92285ecb8e56e701c2d63995223274b31f140e5f30fc0b7f806bfbf0de2c7efc592e9aac2de56b2cb831deb145d4e4d424353e1515f48b98d2516dc83 SHA512 1308539065599bf807580868510ea772bc09b5e06c6cc184ece5faf100fb14cd424f47e030bc77d62525b7751c874e7313b73444b85ab07076f31bacdcf24e3e
 DIST matwm2-0.1.2_pre3.tar.gz 860231 BLAKE2B 5734798c1833a02783c9ff7ed52c2b0ef95d5c3b3edbc51a4e8440f45109b6f3e6cf85f64ce37c9dcbfff2e22843b7f57c23abcd2f5012ffa53fac0cbfbd766b SHA512 30c55c6090015432bf99853f136baebb5b4c1301d5f922dc933e0141caf18d6891a982bd89e22e065c146c0c5c570d0e8aebb7e4c708dddde9b0570b7ed5f9ba
-EBUILD matwm2-0.1.2_pre3-r1.ebuild 1392 BLAKE2B 0a9af7b79085d43f77f757232d92fb46528a3a7b75cd12edc9928fb09c4b099ebf9453f919089a26edaba604e077d0e0b12d8bb0c68fee427d381b2a3d682133 SHA512 4836810d974c4f3848c9ceaf4b219c37f11f4f54a93f3258431cd171bef2385cfb1600d5bc27242310a96d7f07861d83e6277b95f5e256482d95437e46ed776a
+EBUILD matwm2-0.1.2_pre3-r2.ebuild 1360 BLAKE2B ec613b02bcf616dd8b1e4d326117bcdbf200a8fac55960cb35cab9b7d730561368fe79b331651e4abc3cfc15f2eb05c654adc13b9f517a3611a297a64e882f5b SHA512 67c38f4f96e66f8d786876a2fff864d395ca05d37df551939b88baf3c1cca033e3eb3d91bc10294747fc177d2a290fb3deb93338b5cb7b8a2b35b2527651d686
 MISC metadata.xml 245 BLAKE2B bb1fa134a1ab0bee07b6649f4f2d45777c09e2492ead1b3afc8e39539b73704f75fe1fafb4392b7cb871a831469cc52c7f6da25b74840492df0124ffd99c8a01 SHA512 7146afd91997f6db5f7c6a33e81c9ab6305b22d00b73c60bb04597b47266887d3fee30b75541f8cb167979e7337ec805256cd4455de661ed1e9f5b79a6c08554
diff --git a/x11-wm/matwm2/matwm2-0.1.2_pre3-r1.ebuild b/x11-wm/matwm2/matwm2-0.1.2_pre3-r2.ebuild
index c6e017074c9d..468d8e602220 100644
--- a/x11-wm/matwm2/matwm2-0.1.2_pre3-r1.ebuild
+++ b/x11-wm/matwm2/matwm2-0.1.2_pre3-r2.ebuild
@@ -1,33 +1,31 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit toolchain-funcs
+EAPI=8
+
+inherit edo toolchain-funcs
 
 MY_PV="${PV//_/}"
 
 DESCRIPTION="Simple EWMH compatible window manager with titlebars and frames"
 HOMEPAGE="https://github.com/segin/matwm2"
 SRC_URI="https://github.com/segin/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_PV}/${PN}"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug xft xinerama"
-S="${WORKDIR}/${PN}-${MY_PV}/${PN}"
 
 RDEPEND="
 	x11-libs/libXext
 	x11-libs/libX11
 	xft? ( x11-libs/libXft )
-	xinerama? ( x11-libs/libXinerama )
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
+	xinerama? ( x11-libs/libXinerama )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
-PATCHES=( "${FILESDIR}/${P}-destdir-fix.patch" )
+PATCHES=( "${FILESDIR}"/${P}-destdir-fix.patch )
 
 src_prepare() {
 	default
@@ -42,24 +40,25 @@ src_configure() {
 		--prefix="${EPREFIX}/usr"
 		--mandir="${EPREFIX}/usr/share/man"
 		--cc="$(tc-getCC)"
-		$(usex debug "--enable-debug" "")
-		$(usex xft "" "--disable-xft")
-		$(usex xinerama "" "--disable-xinerama")
+		$(usev debug --enable-debug)
+		$(usev !xft --disable-xft)
+		$(usev !xinerama --disable-xinerama)
 	)
 
-	./configure "${myconfigureargs[@]}" || die
+	edo ./configure "${myconfigureargs[@]}"
 }
 
 src_install() {
 	default
 
-	docompress -x "${EPREFIX}/usr/share/doc/${PF}"/default_matwmrc
+	docompress -x /usr/share/doc/${PF}/default_matwmrc
 	dodoc default_matwmrc
 
 	insinto /usr/share/xsessions
 	doins "${FILESDIR}"/${PN}.desktop
 
-	echo ${PN} > "${T}"/${PN} || die
 	exeinto /etc/X11/Sessions
-	doexe "${T}"/${PN}
+	newexe - matwm2 <<- _EOF_
+		matwm2
+	_EOF_
 }
diff --git a/x11-wm/metacity/Manifest b/x11-wm/metacity/Manifest
index 4882646e2c87..f4118ff7c264 100644
--- a/x11-wm/metacity/Manifest
+++ b/x11-wm/metacity/Manifest
@@ -1,5 +1,3 @@
-DIST metacity-3.42.0.tar.xz 1969372 BLAKE2B 0f6e5ab3f84dcc2e9c776a2eed9725311e5395d8761f2d4bc618d92d623c761252bee62bc4e17e4bea65706e248fecfa4c8a031d2be7d2728e0e736a38f23264 SHA512 5b2f22a798e50a332384acf7bc40104c1978184cb4448dcd55d35196e4736388c1fee6e0e63962f947354a17b3bc72a635413e7285224c8b3c1872379e47f24d
 DIST metacity-3.44.0.tar.xz 1973772 BLAKE2B 24582202543d8f1c29632843615b841be1ec9b03fded4f22d92b50249d7ad9c2978f290633e5a9483f3dec0005b48d8f824e5dd1e4f6f42a52963285b8245f42 SHA512 3538a08633e13f727f8a8ff0c4dcf8cee411d3c4fa011b2391d94e47f3c27516b1fce9f742abb2d845571ae9c148097ced94b33d152919981eda4133e2eaa87e
-EBUILD metacity-3.42.0.ebuild 1289 BLAKE2B e8e88ffe427a12eea29b28f319f19ff574efb31029c728c174e188be1cf55db0e5b8ffa641fbb139264d6af4762cc53839b80564da4a3f508640f44f56e35281 SHA512 86fe377418490737f0e47ec1c5d447a7dc9f172fb5d8d2a4cd4cf67ab034430b9ac02e4f5d8177d0b052560e2252555ae793d0a129e90fb9b2ab4f171e00de4f
 EBUILD metacity-3.44.0.ebuild 1289 BLAKE2B 6f454bb3677428e6b63f868d2be60bcd7aab5c568a89592445ee11f52c87d1906c540537ec6f8cbc52f0874ac63691b35764ccd559ebd35439c2d3c8092a3a37 SHA512 a336d179dec5dadc00d749a4f0dffafc5c01c59414ed1d7c790f1157d663d18ab2484e693b69dde4ecefac743d68dc3d9718e406908ee8ecdd848728038f0692
 MISC metadata.xml 478 BLAKE2B 6b6edfb923803da21c7d6c7bb9732bc387e4f57d0682ad79a4bad3a973c8f4746ecfe3ccd376f4ae41784e019f29861b973c66cc35ba3535126de2fc6c827b98 SHA512 759912aaecef429c799aa70ec28428be7572f7eb5ddadcc3f6c0aec469d6fd9ddc3cb0d3f54585b60a2a5764bbc6b4bde5da596d9800f5989f638d60795b1533
diff --git a/x11-wm/metacity/metacity-3.42.0.ebuild b/x11-wm/metacity/metacity-3.42.0.ebuild
deleted file mode 100644
index d9b7ef4b14f5..000000000000
--- a/x11-wm/metacity/metacity-3.42.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome2
-
-DESCRIPTION="GNOME Flashback window manager"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/metacity/"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="+libcanberra vulkan xinerama"
-KEYWORDS="~amd64 ~riscv"
-
-# TODO: libgtop could be optional, but no knob
-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 )
-"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-"
-BDEPEND="
-	vulkan? ( dev-util/vulkan-headers )
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.6
-	virtual/pkgconfig
-" # autoconf-archive for eautoreconf
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		$(use_enable libcanberra canberra) \
-		$(use_enable xinerama) \
-		$(use_enable vulkan)
-}
diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest
index b648fd6f361d..64a3b7028c37 100644
--- a/x11-wm/mutter/Manifest
+++ b/x11-wm/mutter/Manifest
@@ -1,9 +1,6 @@
-AUX mutter-40.0-Disable-anonymous-file-test.patch 862 BLAKE2B bb7a0f0dfa5f0543c9187fe8c3aa8d1251fbb9c74dcf4c518a4674758a22da70a94de688f4b01d7673c679a2e96cbdfa5c33de3d009c85fecd2498061121dcf3 SHA512 d2d7ec9e1fcc3fad9dc058edf611fe16a3180a8d6694a9f3257b22eb3885dc0b311bc48054de0d183c661658e226d1b04e4ad81b1314a60a3f441a6f4c06bed8
 AUX mutter-42.0-Disable-anonymous-file-test.patch 765 BLAKE2B 7d223e0dc98963b61cb0bc26ec22775e87942f88f97af7dbcde63e0d960f5b41afc3de0b358b0c6252de90af4451d4fd6c75b7815ab573c7199b0c82cdd1eb7d SHA512 c066d1b5541078c6cc8d2788b36935b9aff0f1fbb800f39fa4674755a6842be66736c57b43d5edb00e5c18a33c1ff17d54a546134e5aae8ebd9a8967cd46b164
-DIST mutter-41.4.tar.xz 2717012 BLAKE2B 2f9d144380072427c0ee65c1e3bb26e5caca76e0656f316459a77df09f9e8bda3ea9c17c6400d04abee9c7f82b36dbd035794cf31feef7ee4574ce308d627e55 SHA512 ee3881f9047f0b9ef8598609e9ac90294cb36a7549fcc6a647a80553045ed315998d0dbac247887ae06b32126bab1525f13f7f92655b9103cac77750e347e405
-DIST mutter-42.0.tar.xz 2742212 BLAKE2B 4867d184fbf63f7624c907f941f1aa1ac8d66108554385c1500b6259958a3c2bf5dcd30cebed95cbafd4a1bbd5368b6078edec695884a0ee9eb48dbf0ad4cecf SHA512 ffcfbb1b6d3add84adf2d67d459905d164dc272289b645994288c376bc656481526d445cdfe6df027b88ab590258ee9d9d4ba251e03c6ef93d17f0758f75520d
 DIST mutter-42.1.tar.xz 2747056 BLAKE2B 7973e6178e3a61078c37c593a8ffabbd002b791b8251fdf9aa7c90b40efa76591f9946cdd31dd6f274c2a4455157c8661d63714619f3966250eeca5ddae34689 SHA512 b7c7011f1c3c4361ddfdcffc61057f8821c37cfb602d7f7ec97fdd1f0ab19dd331f396ca4f61c83253d003d1d866b0d2ff1e7f34bbc9e98b48aacb973aabd6d5
-EBUILD mutter-41.4.ebuild 4973 BLAKE2B cf7432698172a8ec8baff3d665201e3f531c888acf9cca24eee2dbb33b743f536161a9ad88c7d83a5b6564594794c4ec6c5bb4346e38344a9adac8edc69f2baf SHA512 f8566f3a13911e970ca52e5fd057a8d80b9d782d5ef5bd1a85ab310514a7afa9f6c4bb5d1c4042b421f819ef0a9e02b0d623b531fb9d76a49147f4c24f1f9532
-EBUILD mutter-42.0-r1.ebuild 5377 BLAKE2B bdd67a1ac3dfa4f2494c78848138cc10043add8e5fec79e3aa21c294475abb21660c7f672e73d6eb2de7e3cc70b0ddc9cd0a52b8281693b53514e689ede06197 SHA512 d83ec646bfbfdd02c5b462c40e9c8ed15b2f050cfd277445d38e5c9d921f34aca53f9ce5c6cd14e05a803b197532f8419fc4f0546caab06be18d555e79d0d25a
-EBUILD mutter-42.1.ebuild 5377 BLAKE2B bdd67a1ac3dfa4f2494c78848138cc10043add8e5fec79e3aa21c294475abb21660c7f672e73d6eb2de7e3cc70b0ddc9cd0a52b8281693b53514e689ede06197 SHA512 d83ec646bfbfdd02c5b462c40e9c8ed15b2f050cfd277445d38e5c9d921f34aca53f9ce5c6cd14e05a803b197532f8419fc4f0546caab06be18d555e79d0d25a
+DIST mutter-42.2.tar.xz 2747612 BLAKE2B 39d83283dc04473e47263d463849030c1076bb5b8d6fbc37f03e1936cb999ab554784f02ad9a04cdbfa2f35ad95c74c0899ee44e9710e435e66de613628cc683 SHA512 e43bdc7c9183b2578ae1f777fdf84bfde550a26bfc28fd4a1a183c7f310d852110f3dcabd50a2fabdafba4cfb8aa6577aec4c65775075f0afff7bd1bb4dde957
+EBUILD mutter-42.1.ebuild 5451 BLAKE2B 1e19e26fb5c7685eb43ca8e49ce9c470d5bf59ef55013d7b9eb34ddbfa8258b74b974fb80900238ce4ab3fa1ed1441f73457fa0b54abcf30f9d8f49de53f4296 SHA512 5f9a049dcf87d30ff0e892da6aa1621c21565b9e3dc56576463abe19a59bcc489e0fec44b5012468b6033747f9bfe58a1b1543a1b7598289b1c3d28293f5f4ec
+EBUILD mutter-42.2.ebuild 5454 BLAKE2B 5bbf7ae350497c55259f50cb4c95e9deda0bee55931ded79291c51f478750fa506f8156e5b0ccfce33cd31e9ca3107143ccece182dc20cc276a129db49ca8f8b SHA512 7a79d7302d8a15658ad5d7d3e49aa039c87356f73311390b0f926e988502e4a8809d257efedb4bac1ba19117c2ba6df7cb98b9e0e0616fbad041c3bac1c27c5a
 MISC metadata.xml 606 BLAKE2B 54a05fee61cf9a1d958a46e0cc94e1cd61e69e187f89393c483c7022d455b7248684df4f1df028f0733995dacfbdf1faab600d8c239885eb0c7ea3097326f156 SHA512 6dea733bb5da3bd2db059a467cec81f7cfc0765750cdcfa0404a72cbb168495f13d01051198206178615b1a3fa41f78dffd9f0a38f6d7579116e782d76fab899
diff --git a/x11-wm/mutter/files/mutter-40.0-Disable-anonymous-file-test.patch b/x11-wm/mutter/files/mutter-40.0-Disable-anonymous-file-test.patch
deleted file mode 100644
index 484c62c5a0c4..000000000000
--- a/x11-wm/mutter/files/mutter-40.0-Disable-anonymous-file-test.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 7353efd2f326b3f855db52ba8643ac4e793d5ffc Mon Sep 17 00:00:00 2001
-From: Matt Turner <mattst88@gmail.com>
-Date: Sun, 21 Mar 2021 18:31:22 -0400
-Subject: [PATCH] Disable anonymous-file test
-
-It attempts to open /proc/self/fd/* (an fd created by memfd_create),
-which sandbox disallows.
----
- src/tests/meson.build | 7 -------
- 1 file changed, 7 deletions(-)
-
-diff --git a/src/tests/meson.build b/src/tests/meson.build
-index 8ee409e20..50c930c2a 100644
---- a/src/tests/meson.build
-+++ b/src/tests/meson.build
-@@ -285,13 +285,6 @@ test('stage-view', stage_view_tests,
-   timeout: 60,
- )
- 
--test('anonymous-file', anonymous_file_test,
--  suite: ['core', 'mutter/unit'],
--  env: test_env,
--  is_parallel: false,
--  timeout: 60,
--)
--
- if have_native_tests
-   test('native-headless', native_headless_tests,
-     suite: ['core', 'mutter/native/headless'],
--- 
-2.26.2
-
diff --git a/x11-wm/mutter/mutter-41.4.ebuild b/x11-wm/mutter/mutter-41.4.ebuild
deleted file mode 100644
index e32a368da43b..000000000000
--- a/x11-wm/mutter/mutter-41.4.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome.org gnome2-utils meson udev xdg
-
-DESCRIPTION="GNOME compositing window manager based on Clutter"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/mutter/"
-
-LICENSE="GPL-2+"
-SLOT="0/$(($(ver_cut 1) - 32))" # 0/libmutter_api_version - ONLY gnome-shell (or anything using mutter-clutter-<api_version>.pc) should use the subslot
-
-IUSE="elogind input_devices_wacom +introspection screencast sysprof systemd test udev wayland video_cards_nvidia"
-# native backend requires gles3 for hybrid graphics blitting support, udev and a logind provider
-REQUIRED_USE="
-	wayland? ( ^^ ( elogind systemd ) udev )
-	test? ( wayland )"
-RESTRICT="!test? ( test )"
-
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-
-# gnome-settings-daemon is build checked, but used at runtime only for org.gnome.settings-daemon.peripherals.keyboard gschema
-# xorg-server is needed at build and runtime with USE=wayland for Xwayland
-# v3.32.2 has many excessive or unused *_req variables declared, thus currently the dep order ignores those and goes via dependency() call order
-DEPEND="
-	>=x11-libs/libX11-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:= )
-"
-RDEPEND="${DEPEND}
-	gnome-extra/zenity
-"
-DEPEND="${DEPEND}
-	x11-base/xorg-proto
-	sysprof? ( >=dev-util/sysprof-common-3.38.0 )
-"
-# wayland bdepend for wayland-scanner, and either libxcvt or xorg-server[xorg,-minimal] for the cvt binary
-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
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-40.0-Disable-anonymous-file-test.patch
-)
-
-src_configure() {
-	# TODO: Replicate debug vs release meson build type behaviour under our buildtype=plain
-	local emesonargs=(
-		-Dopengl=true
-		#opengl_libname
-		#gles2_libname
-		$(meson_use wayland gles2)
-		-Degl=true
-		-Dglx=true
-		$(meson_use wayland)
-		$(meson_use systemd)
-		$(meson_use wayland native_backend)
-		$(meson_use screencast remote_desktop)
-		$(meson_use udev)
-		-Dudev_dir=$(get_udevdir)
-		$(meson_use input_devices_wacom libwacom)
-		-Dpango_ft2=true
-		-Dstartup_notification=true
-		-Dsm=true
-		$(meson_use introspection)
-		$(meson_use test cogl_tests)
-		$(meson_use wayland core_tests) # core tests require wayland; overall -Dtests option is honored on top, so no extra conditional needed
-		-Dnative_tests=false
-		$(meson_use test clutter_tests)
-		$(meson_use test tests)
-		$(meson_use sysprof profiler)
-		-Dinstalled_tests=false
-		#verbose # Let upstream choose default for verbose mode
-		#xwayland_path
-		# TODO: relies on default settings, but in Gentoo we might have some more packages we want to give Xgrab access (mostly virtual managers and remote desktops)
-		#xwayland_grab_default_access_rules
-	)
-
-	if use wayland && use video_cards_nvidia; then
-		emesonargs+=(
-			-Degl_device=true
-			-Dwayland_eglstream=true
-		)
-	else
-		emesonargs+=(
-			-Degl_device=false
-			-Dwayland_eglstream=false
-		)
-	fi
-
-	meson_src_configure
-}
-
-src_test() {
-	gnome2_environment_reset # Avoid dconf that looks at XDG_DATA_DIRS, which can sandbox fail if flatpak is installed
-	glib-compile-schemas "${BUILD_DIR}"/data
-	GSETTINGS_SCHEMA_DIR="${BUILD_DIR}"/data meson_src_test --setup=CI
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/x11-wm/mutter/mutter-42.1.ebuild b/x11-wm/mutter/mutter-42.1.ebuild
index 64c4d9748678..3edf61ef69c1 100644
--- a/x11-wm/mutter/mutter-42.1.ebuild
+++ b/x11-wm/mutter/mutter-42.1.ebuild
@@ -18,7 +18,7 @@ REQUIRED_USE="
 	test? ( wayland )"
 RESTRICT="!test? ( test )"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 
 # gnome-settings-daemon is build checked, but used at runtime only for org.gnome.settings-daemon.peripherals.keyboard gschema
 # xorg-server is needed at build and runtime with USE=wayland for Xwayland
@@ -79,6 +79,9 @@ DEPEND="
 "
 RDEPEND="${DEPEND}
 	gnome-extra/zenity
+
+	!<gui-libs/gtk-4.6.4:4
+	!<x11-libs/gtk+-3.24.34:3
 "
 DEPEND="${DEPEND}
 	x11-base/xorg-proto
@@ -174,6 +177,7 @@ src_test() {
 }
 
 pkg_postinst() {
+	use udev && udev_reload
 	xdg_pkg_postinst
 	gnome2_schemas_update
 }
diff --git a/x11-wm/mutter/mutter-42.0-r1.ebuild b/x11-wm/mutter/mutter-42.2.ebuild
index 64c4d9748678..1ea322f5ea67 100644
--- a/x11-wm/mutter/mutter-42.0-r1.ebuild
+++ b/x11-wm/mutter/mutter-42.2.ebuild
@@ -79,6 +79,9 @@ DEPEND="
 "
 RDEPEND="${DEPEND}
 	gnome-extra/zenity
+
+	!<gui-libs/gtk-4.6.4:4
+	!<x11-libs/gtk+-3.24.34:3
 "
 DEPEND="${DEPEND}
 	x11-base/xorg-proto
@@ -174,6 +177,7 @@ src_test() {
 }
 
 pkg_postinst() {
+	use udev && udev_reload
 	xdg_pkg_postinst
 	gnome2_schemas_update
 }
diff --git a/x11-wm/notion/Manifest b/x11-wm/notion/Manifest
index 538f28990ee9..f0c58ae46ce3 100644
--- a/x11-wm/notion/Manifest
+++ b/x11-wm/notion/Manifest
@@ -1,7 +1,6 @@
 AUX notion 26 BLAKE2B b39f9f65f79f85b8af02c52334f71f0eb171abf2e48af8698b4eb51929a718d1aa24cce3b0c76b5d2c05843a4e6c1485b76081704004b03f0dfb92049aad252c SHA512 4d5aa2efb7ff7c9927ec6c2d8b0e5fd9ad1fcd10c7c40b20312342cb5a01ea9a835bbdfa88a054fb639f4a1a94dd4e05cb5f77a47d46ff43326086aba0cd69d8
-AUX notion-3_p2015061300-pkg-config.patch 2533 BLAKE2B 98b1c54fc92067702b77a6f4d51b87d829e124135e4004bec32ab71eaefc39c69c944810730bba8defb7e082138f12e2169cd48879177671c149a86407eef49c SHA512 7fb084b35dc274e8d943a4801f2a38d43bead5eb94d33282903416120e5116d37811b6388b61f4f402d1efeed01cf36606537cb7c0aaf8a3362e99d05c9c3fda
 AUX notion.desktop 208 BLAKE2B 7d138a583a49325901e3c1682c22dbdc1da02b4dcaa2ae6581c66e2676277de1a7b5a87e1c25465cb4ae6beebd7e93ab473e92b3ad6949ad97c833f2293e40da SHA512 3c0a0c5787d77afc94b0f0f9187be5c32374c2dbc51d2d9de3729b2c4e18572d6d8d79a554b017ba33c7276bc2aca8182f93b2d7268f92101385ab6a06f8191f
-DIST notion-3_p2015061300.tar.gz 797057 BLAKE2B 55258bb1d47a1c2506e9cb6654e5d68d69494a749174eaace2a53416ae40cac908b0398400a5a377dbb07618aa800529cbdfc0c7ef946d285681e1dfccfd9c48 SHA512 254be12a8ece555d9f6253d99891bb51214379d0c04b6bf9595b7e5bf9493cb5d2fada37438f89621e7157f9e3647e446b5e173847498ee3608081f006b86679
-EBUILD notion-3_p2015061300-r100.ebuild 2362 BLAKE2B cde9df6b82ad429e29de3c65417615d44f1237f34fb9fde8f1eb83f644f25e455bd57d17bbeb895c9cf069d6705d4051e00c1fc77f90c1eb4236e814ae53219d SHA512 93ffd486ab64078d7010b949af167b93d16ae97eea741e2ad08627a559f787d72811f1379a68689efe6f9db85578239dc0e5da23d7c949c7edf59be8dc89b9a9
-EBUILD notion-9999.ebuild 2226 BLAKE2B 37f5b955dd35f1e94d00865223e0c5beb538e5e92e7dee608d5fc20b84967bdbb9f774572933be989471ebed5a801345bff1ede813a829b906bd87d2d1d8e6a8 SHA512 b63a100f090dd2a95b754a255657aceae5fd5b8dc0d2e141fd30e9640d2ff4fea2b04860d648eb00cf893255d0bca1e1a34ed5ee10bf7661e173cebc62025979
+DIST notion-4.0.2_p20220613.tar.gz 791823 BLAKE2B 2aa50eb4f710bf289dd6edb6f4696662e8d2588b337f038845efdf79aa2e2b28a725734c829de5184def6fd5d32c51f511025dadf4ad6a689c0dc4e0b0d8e3eb SHA512 7c187571a00bdf5736032c0ff0b57a0afdb20a7b4f6e66877c84bf112922ec8f5b853165d419ecc7c18fc84a873b278c3cbdad5e7399e0312066141de1dc6673
+EBUILD notion-4.0.2_p20220613.ebuild 2123 BLAKE2B 8aca9e78756246c79bc2388bc8de7d1518a4e541eb98e9f6ffe4c2d1d7ba583af364ba97c042eb7e86c73ed9729a83a200c4531b24b055d8261ee67ec04ab2e4 SHA512 6ae643d2c54358402565a52437e1fc466f35282223058c11f3c8e3141d3e78ea876c6ed1a2dd0201d9bc6ace109cac4a0e2180af1ea3b2442a1455a900f8d960
+EBUILD notion-9999.ebuild 2046 BLAKE2B 69701c3d87c27b2b41670fbf9e1d9533db62bde2882216a5d7ddf3b13cebbbd311bb272c8a665731add1075c68fff0355dfb546c93d16b4d72ef15c496b1cfb8 SHA512 7833f2282368da0b75e2f971e5929cc0d404c239ae3cefd49738b766cab04e3046a18c4a7f0f50a3d394f33ab224dadfc386d6f83230a7a1acbc92570e3ac2d8
 MISC metadata.xml 441 BLAKE2B f1adc7889242f95216b90541c0b15e459738b2a375e1f74e19c52d9e5d2c5c7241c8eee77a89290d88619e5981adac8518477e6af2d2416c4596594d5a2bd671 SHA512 ebe72f7eeab009519f2d127028b210d9cc621ae6fcb60e09f8f07a35ff13eb6a66a514a2083490079749045332c4a9a35cef64d852c942761c065dd6547eb52e
diff --git a/x11-wm/notion/files/notion-3_p2015061300-pkg-config.patch b/x11-wm/notion/files/notion-3_p2015061300-pkg-config.patch
deleted file mode 100644
index fb718caa3158..000000000000
--- a/x11-wm/notion/files/notion-3_p2015061300-pkg-config.patch
+++ /dev/null
@@ -1,76 +0,0 @@
---- notion-3-2015061300/system-autodetect.mk
-+++ notion-3-2015061300/system-autodetect.mk
-@@ -84,8 +84,8 @@
- # SunOS/Solaris
- #X11_PREFIX ?= /usr/openwin
- 
--X11_LIBS=-L$(X11_PREFIX)/lib -lX11 -lXext
--X11_INCLUDES=-I$(X11_PREFIX)/include
-+X11_LIBS=$(shell $(PKG_CONFIG) --libs x11 xext)
-+X11_INCLUDES=$(shell $(PKG_CONFIG) --cflags-only-I x11 xext)
- 
- # XFree86 libraries up to 4.3.0 have a bug that can cause a segfault.
- # The following setting  should  work around that situation.
---- notion-3-2015061300/mod_xinerama/Makefile
-+++ notion-3-2015061300/mod_xinerama/Makefile
-@@ -9,14 +9,14 @@
- 
- ######################################
- 
--INCLUDES += $(LIBTU_INCLUDES) $(LIBEXTL_INCLUDES) $(X11_INCLUDES) -I$(TOPDIR)
--CFLAGS += $(XOPEN_SOURCE) $(C99_SOURCE)
-+INCLUDES += $(LIBTU_INCLUDES) $(LIBEXTL_INCLUDES) $(X11_INCLUDES) -I$(TOPDIR) $(shell $(PKG_CONFIG) --cflags-only-I xinerama)
-+CFLAGS += $(XOPEN_SOURCE) $(C99_SOURCE) $(shell $(PKG_CONFIG) --cflags-only-other xinerama)
- DOCS=LICENSE README
- 
- SOURCES=mod_xinerama.c
- 
- MAKE_EXPORTS=mod_xinerama
--LIBS = -L/usr/lib/x86_64-linux-gnu $(X11_LIBS) -lXinerama
-+LIBS = $(X11_LIBS) $(shell $(PKG_CONFIG) --libs xinerama)
- MODULE=mod_xinerama
- MODULE_STUB=mod_xinerama.lua
- 
-@@ -44,7 +44,7 @@
- 
- .PHONY: test
- test: $(SOURCES)
--	lua test_xinerama.lua
-+	$(LUA) test_xinerama.lua
- 
- ######################################
- 
-@@ -57,4 +57,4 @@
- ################ ls_xinerama utility ###############
- 
- ls_xinerama: ls_xinerama.c
--	$(CC) ls_xinerama.c -o ls_xinerama -Wl,--as-needed -lX11 -lXinerama
-+	$(CC) $(CFLAGS) ls_xinerama.c -o ls_xinerama $(LDFLAGS) $(LIBS)
---- notion-3-2015061300/mod_xrandr/Makefile
-+++ notion-3-2015061300/mod_xrandr/Makefile
-@@ -9,13 +9,13 @@
- 
- ######################################
- 
--INCLUDES += $(LIBTU_INCLUDES) $(LIBEXTL_INCLUDES) $(X11_INCLUDES) -I$(TOPDIR)
--CFLAGS += $(XOPEN_SOURCE) $(C99_SOURCE)
-+INCLUDES += $(LIBTU_INCLUDES) $(LIBEXTL_INCLUDES) $(X11_INCLUDES) -I$(TOPDIR) $(shell pkg-config --cflags-only-I xrandr)
-+CFLAGS += $(XOPEN_SOURCE) $(C99_SOURCE) $(shell $(PKG_CONFIG) --cflags-only-other xrandr)
- 
- SOURCES=mod_xrandr.c
- 
- MAKE_EXPORTS=mod_xrandr
--LIBS = $(X11_LIBS) -lXrandr
-+LIBS = $(X11_LIBS) $(shell $(PKG_CONFIG) --libs xrandr)
- MODULE=mod_xrandr
- MODULE_STUB=mod_xrandr.lua
- ETC=cfg_xrandr.lua
-@@ -45,7 +45,7 @@
- 
- .PHONY: test
- test: $(SOURCES)
--	for i in test_xrandr*.lua ; do echo 'Testing' $$i ; lua $$i ; done
-+	for i in test_xrandr*.lua ; do echo 'Testing' $$i ; $(LUA) $$i ; done
- 
- ######################################
- 
diff --git a/x11-wm/notion/notion-3_p2015061300-r100.ebuild b/x11-wm/notion/notion-3_p2015061300-r100.ebuild
deleted file mode 100644
index 2aee50148789..000000000000
--- a/x11-wm/notion/notion-3_p2015061300-r100.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..2} )
-
-inherit lua-single toolchain-funcs readme.gentoo-r1
-
-DESCRIPTION="Notion is a tiling, tabbed window manager for the X window system"
-HOMEPAGE="https://notionwm.net/"
-SRC_URI="https://github.com/raboof/${PN}/archive/${PV/_p/-}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls xinerama +xrandr"
-
-RDEPEND="${LUA_DEPS}
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXext
-	nls? ( sys-devel/gettext )
-	xinerama? ( x11-libs/libXinerama )
-	xrandr? ( x11-libs/libXrandr )"
-DEPEND="${RDEPEND}"
-# luac is called at build time
-BDEPEND="${LUA_DEPS}
-	virtual/pkgconfig"
-
-# mod_xrandr references mod_xinerama
-REQUIRED_USE="${LUA_REQUIRED_USE}
-	xrandr? ( xinerama )"
-
-# needs slingshot,... not in tree
-RESTRICT=test
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3_p2015061300-pkg-config.patch
-)
-
-S=${WORKDIR}/${P/_p/-}
-
-src_prepare() {
-	default
-
-	sed -e "/^CFLAGS/{s: =: +=: ; s:-Os:: ; s:-g::}" \
-		-e "/^LDFLAGS/{s: =: +=: ; s:-Wl,--as-needed::}" \
-		-i system-autodetect.mk || die
-	echo > build/lua-detect.mk
-}
-
-src_configure() {
-	{	echo "CFLAGS += -D_DEFAULT_SOURCE"
-		echo "PREFIX=${EROOT}/usr"
-		echo "DOCDIR=\$(PREFIX)/share/doc/${PF}"
-		echo "ETCDIR=${EROOT}/etc/${PN}"
-		echo "LIBDIR=\$(PREFIX)/$(get_libdir)"
-		echo "VARDIR=${EROOT}/var/cache/${PN}"
-		echo "X11_PREFIX=${EROOT}/usr"
-		echo "STRIPPROG=true"
-		echo "CC=$(tc-getCC)"
-		echo "AR=$(tc-getAR)"
-		echo "RANLIB=$(tc-getRANLIB)"
-		echo "LUA_MANUAL=1"
-		echo "LUA=${LUA}"
-		echo "LUAC=/usr/bin/luac5.1"
-		echo "LUA_LIBS=$(lua_get_LIBS)"
-		echo "LUA_INCLUDES=$(lua_get_CFLAGS)"
-		use nls || echo "DEFINES+=-DCF_NO_LOCALE -DCF_NO_GETTEXT"
-	} > system-local.mk
-
-	if ! use xinerama ; then
-		sed -e 's/mod_xinerama//g' -i modulelist.mk || die
-	fi
-
-	if ! use xrandr ; then
-		sed -e 's/mod_xrandr//g' -i modulelist.mk || die
-		sed -e '/mod_xrandr/d' \
-			-i etc/cfg_defaults.lua || die
-	fi
-}
-
-src_install() {
-	default
-
-	exeinto /etc/X11/Sessions
-	doexe "${FILESDIR}"/notion
-
-	insinto /usr/share/xsessions
-	doins "${FILESDIR}"/notion.desktop
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
-
-DOC_CONTENTS="If you want notion to have an ability to view a file based on its
-guessed MIME type you should emerge app-misc/run-mailcap."
diff --git a/x11-wm/notion/notion-4.0.2_p20220613.ebuild b/x11-wm/notion/notion-4.0.2_p20220613.ebuild
new file mode 100644
index 000000000000..6ba63e41d144
--- /dev/null
+++ b/x11-wm/notion/notion-4.0.2_p20220613.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-4 )
+
+inherit lua-single toolchain-funcs readme.gentoo-r1
+
+DESCRIPTION="Notion is a tiling, tabbed window manager for the X window system"
+HOMEPAGE="https://notionwm.net/"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/raboof/${PN}.git"
+else
+	inherit vcs-snapshot
+	COMMIT="f161c1b4dbba1ac81d8e9c3d7e5e353058a4d7d1"
+	SRC_URI="https://github.com/raboof/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="nls xinerama +xrandr"
+# needs slingshot,... not in tree
+RESTRICT="test"
+# mod_xrandr references mod_xinerama
+REQUIRED_USE="
+	${LUA_REQUIRED_USE}
+	xrandr? ( xinerama )"
+
+RDEPEND="
+	${LUA_DEPS}
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXext
+	nls? ( sys-devel/gettext )
+	xinerama? ( x11-libs/libXinerama )
+	xrandr? ( x11-libs/libXrandr )"
+DEPEND="${RDEPEND}"
+# luac is called at build time
+BDEPEND="
+	${LUA_DEPS}
+	virtual/pkgconfig"
+
+src_configure() {
+	tc-export AR CC PKG_CONFIG
+	export INSTALL_STRIP=""
+
+	cat > system-local.mk <<- _EOF_ || die
+		PREFIX=${EPREFIX}/usr
+		DOCDIR=\$(PREFIX)/share/doc/${PF}
+		ETCDIR=${EPREFIX}/etc/${PN}
+		LIBDIR=\$(PREFIX)/$(get_libdir)
+		VARDIR=${EPREFIX}/var/cache/${PN}
+		LUA_MANUAL=1
+		LUA=${LUA}
+		LUAC=${BROOT}/usr/bin/${ELUA/lua/luac}
+		LUA_LIBS=$(lua_get_LIBS)
+		LUA_INCLUDES=$(lua_get_CFLAGS)
+		$(usev !nls "DEFINES+=-DCF_NO_LOCALE -DCF_NO_GETTEXT")
+	_EOF_
+
+	if ! use xinerama ; then
+		sed -e 's/mod_xinerama//g' -i modulelist.mk || die
+	fi
+
+	if ! use xrandr ; then
+		sed -e 's/mod_xrandr//g' -i modulelist.mk || die
+		sed -e '/mod_xrandr/d' -i etc/cfg_defaults.lua || die
+	fi
+}
+
+src_install() {
+	default
+
+	exeinto /etc/X11/Sessions
+	doexe "${FILESDIR}"/notion
+
+	insinto /usr/share/xsessions
+	doins "${FILESDIR}"/notion.desktop
+
+	local DOC_CONTENTS="
+		If you want notion to have an ability to view a file based on its
+		guessed MIME type you should emerge app-misc/run-mailcap."
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/x11-wm/notion/notion-9999.ebuild b/x11-wm/notion/notion-9999.ebuild
index 56c03dbb134d..3bc5247a3ad3 100644
--- a/x11-wm/notion/notion-9999.ebuild
+++ b/x11-wm/notion/notion-9999.ebuild
@@ -1,22 +1,36 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-LUA_COMPAT=( lua5-{1..2} )
+LUA_COMPAT=( lua5-4 )
 
-inherit git-r3 lua-single toolchain-funcs readme.gentoo-r1
+inherit lua-single toolchain-funcs readme.gentoo-r1
 
 DESCRIPTION="Notion is a tiling, tabbed window manager for the X window system"
 HOMEPAGE="https://notionwm.net/"
-EGIT_REPO_URI="https://github.com/raboof/${PN}.git"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/raboof/${PN}.git"
+else
+	SRC_URI="https://github.com/raboof/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+	KEYWORDS="~amd64 ~x86"
+fi
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS=""
 IUSE="nls xinerama +xrandr"
+# needs slingshot,... not in tree
+RESTRICT="test"
+# mod_xrandr references mod_xinerama
+REQUIRED_USE="
+	${LUA_REQUIRED_USE}
+	xrandr? ( xinerama )"
 
-RDEPEND="${LUA_DEPS}
+RDEPEND="
+	${LUA_DEPS}
 	x11-libs/libSM
 	x11-libs/libX11
 	x11-libs/libXext
@@ -25,44 +39,27 @@ RDEPEND="${LUA_DEPS}
 	xrandr? ( x11-libs/libXrandr )"
 DEPEND="${RDEPEND}"
 # luac is called at build time
-BDEPEND="${LUA_DEPS}
+BDEPEND="
+	${LUA_DEPS}
 	virtual/pkgconfig"
 
-# mod_xrandr references mod_xinerama
-REQUIRED_USE="${LUA_REQUIRED_USE}
-	xrandr? ( xinerama )"
-
-# needs slingshot,... not in tree
-RESTRICT=test
-
-src_prepare() {
-	default
-
-	sed -e "/^CFLAGS/{s: =: +=: ; s:-Os:: ; s:-g::}" \
-		-e "/^LDFLAGS/{s: =: +=: ; s:-Wl,--as-needed::}" \
-		-i system-autodetect.mk || die
-	echo > build/lua-detect.mk
-}
-
 src_configure() {
-	{	echo "CFLAGS += -D_DEFAULT_SOURCE"
-		echo "PREFIX=${EROOT}/usr"
-		echo "DOCDIR=\$(PREFIX)/share/doc/${PF}"
-		echo "ETCDIR=${EROOT}/etc/${PN}"
-		echo "LIBDIR=\$(PREFIX)/$(get_libdir)"
-		echo "VARDIR=${EROOT}/var/cache/${PN}"
-		echo "X11_PREFIX=${EROOT}/usr"
-		echo "STRIPPROG=true"
-		echo "CC=$(tc-getCC)"
-		echo "AR=$(tc-getAR)"
-		echo "RANLIB=$(tc-getRANLIB)"
-		echo "LUA_MANUAL=1"
-		echo "LUA=${LUA}"
-		echo "LUAC=luac"
-		echo "LUA_LIBS=$(lua_get_LIBS)"
-		echo "LUA_INCLUDES=$(lua_get_CFLAGS)"
-		use nls || echo "DEFINES+=-DCF_NO_LOCALE -DCF_NO_GETTEXT"
-	} > system-local.mk
+	tc-export AR CC PKG_CONFIG
+	export INSTALL_STRIP=""
+
+	cat > system-local.mk <<- _EOF_ || die
+		PREFIX=${EPREFIX}/usr
+		DOCDIR=\$(PREFIX)/share/doc/${PF}
+		ETCDIR=${EPREFIX}/etc/${PN}
+		LIBDIR=\$(PREFIX)/$(get_libdir)
+		VARDIR=${EPREFIX}/var/cache/${PN}
+		LUA_MANUAL=1
+		LUA=${LUA}
+		LUAC=${BROOT}/usr/bin/${ELUA/lua/luac}
+		LUA_LIBS=$(lua_get_LIBS)
+		LUA_INCLUDES=$(lua_get_CFLAGS)
+		$(usev !nls "DEFINES+=-DCF_NO_LOCALE -DCF_NO_GETTEXT")
+	_EOF_
 
 	if ! use xinerama ; then
 		sed -e 's/mod_xinerama//g' -i modulelist.mk || die
@@ -70,8 +67,7 @@ src_configure() {
 
 	if ! use xrandr ; then
 		sed -e 's/mod_xrandr//g' -i modulelist.mk || die
-		sed -e '/mod_xrandr/d' \
-			-i etc/cfg_defaults.lua || die
+		sed -e '/mod_xrandr/d' -i etc/cfg_defaults.lua || die
 	fi
 }
 
@@ -84,12 +80,12 @@ src_install() {
 	insinto /usr/share/xsessions
 	doins "${FILESDIR}"/notion.desktop
 
+	local DOC_CONTENTS="
+		If you want notion to have an ability to view a file based on its
+		guessed MIME type you should emerge app-misc/run-mailcap."
 	readme.gentoo_create_doc
 }
 
 pkg_postinst() {
 	readme.gentoo_print_elog
 }
-
-DOC_CONTENTS="If you want notion to have an ability to view a file based on its
-guessed MIME type you should emerge app-misc/run-mailcap."
diff --git a/x11-wm/openbox/Manifest b/x11-wm/openbox/Manifest
index 564c7a96dd1c..df7a98dd02b5 100644
--- a/x11-wm/openbox/Manifest
+++ b/x11-wm/openbox/Manifest
@@ -2,6 +2,6 @@ AUX openbox-3.5.2-gnome-session.patch 574 BLAKE2B 64d1d141245172140c16e7d4bee919
 AUX openbox-3.6.1-py3-xdg.patch 4702 BLAKE2B 52e8f35626bf71a10327efe99d518994aece46561f4cb4d26d71412f8f5e1528efbd17c48b38a902053b6d3eefbaa9b79f79c06783d669b0c76cbdf256300463 SHA512 7079cf38a79e2fe7e35c07a5600de8a4678961239d3990596378239f064522204ca40522861f1d403d6e621bca92ca14b06873645ba60fda2c86a4132a9aa16a
 DIST openbox-3.6.1.tar.gz 962665 BLAKE2B 1c0288137d7b02d443c384f970cd9a3f4d5d5585989917ac6ae8cf492e045dc086650c245907e168bc7b6d0ce701339854a5d94ad510823141cc78e28c1e13c5 SHA512 5e6f4a214005bea8b26bc8959fe5bb67356a387ddd317e014f43cb5b5bf263ec617a5973e2982eb76a08dc7d3ca5ec9e72e64c9b5efd751001a8999b420b1ad0
 DIST surreal-gentoo.tar.gz 13410 BLAKE2B e7d902278004785c68a2e5aa02aa326cee1ef04fe964fce283afde00cb668b06d5d8461207ef9571aa402b960ec16bdff6bf11cf38ca9a76335ced173592ffce SHA512 dd43cb78e5e33345767edad22d0470765ac9eeae02bbad0acd8098bc096c15a166bf651493d12a5953bc043c9be92e9b160607eafb4723a6bcfc5d1d6fae235e
-EBUILD openbox-3.6.1-r3.ebuild 2728 BLAKE2B 370c1e85a2e1b9ccd5629496db9fb7f28dcc5219ea75057f5182af3bc6fcb5a52da3f16a04ad6cb6304386adbb04482eb162f613b6170ae3e9fc1572a39a6148 SHA512 06b0511b9f23ef0bb681b839e9e0f64a30148a15fb616edb858527ac69847f86a27326b8eebba8e5ec95343a2faaf3aa787e0d7700925b535b9f6ec4c54c1b91
-EBUILD openbox-9999.ebuild 2728 BLAKE2B b86b81a2a9edd9608de734809f59d56f089ce2615ce8862ffdbb188dcbfd355643476f4c1ed196f17df10a13071cd0266af7515fa743a317b9ddaa4526d1f1e3 SHA512 e086a64146ec88b8f683152a1c2b0ee3c9679c3928e38f2837a7611e87249714e5d09482b51f14a79235ee52c34bceb0650e22d2080a539d842b68aaa0d32598
+EBUILD openbox-3.6.1-r3.ebuild 2735 BLAKE2B b53ef0016ee4e9fd9ad3ad0cddb2eb6f7681d359000c2e0713cc0338d6a19132925fa6bc54d60d96688fc7f8e9e024fece6227022fa35ce68136be256394c3cb SHA512 45bd6c12107b2a7a99890a191a3dff1c2b83ba0f59ef88f7b86443148d71e5a3bf585fb9ed6d0844fe022c84a1133e65fbe3279efdf22bfd4647fe1ffdb2a8af
+EBUILD openbox-9999.ebuild 2735 BLAKE2B 348c194178b05bdd07e1f8b104aae924f3eed15d085cf9798414a1d20842683355c24db91d1fa151bf1ecabed4070becd927ba72e2b30dff0e7ce2d28931cbc0 SHA512 e652e20a88961684fc2ddc1e02d147541113ea3adb7c553a3613b8f86e89ac8ec09131f43a38d1fce7dda16ed0e2ef9c96bfdbac2eec8a3b2a77da8610e08e8c
 MISC metadata.xml 705 BLAKE2B 0df8e542b8837fb94e5f6fd289b0d5172c1d4d01bc88c550b6afd5307619a0dfdf5de2c2ba8838d63f8a8c29a378e6545a8932c77d6f0bef7cc898a4fd400206 SHA512 acf171ad8ccc7d07b533e4f5aef895b485050fa8fa39d8a6db798a15d9c5924d4f825573b77ddd8b755b8c0b34e8c3ab49cd0f56592854ae36462c3de448f4dc
diff --git a/x11-wm/openbox/openbox-3.6.1-r3.ebuild b/x11-wm/openbox/openbox-3.6.1-r3.ebuild
index c5df08cd6a6e..aa4008344737 100644
--- a/x11-wm/openbox/openbox-3.6.1-r3.ebuild
+++ b/x11-wm/openbox/openbox-3.6.1-r3.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="git://git.openbox.org/dana/openbox"
 else
 	SRC_URI="http://openbox.org/dist/openbox/${P}.tar.gz"
-	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"
 fi
 
 SRC_URI+=" branding? ( https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )"
diff --git a/x11-wm/openbox/openbox-9999.ebuild b/x11-wm/openbox/openbox-9999.ebuild
index 0b8c51f00bd1..2cbac0641c41 100644
--- a/x11-wm/openbox/openbox-9999.ebuild
+++ b/x11-wm/openbox/openbox-9999.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="git://git.openbox.org/dana/openbox"
 else
 	SRC_URI="http://openbox.org/dist/openbox/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86	~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-linux"
 fi
 
 SRC_URI+=" branding? ( https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )"
diff --git a/x11-wm/page/Manifest b/x11-wm/page/Manifest
index 8be714f7b6ca..edbbde1ee32d 100644
--- a/x11-wm/page/Manifest
+++ b/x11-wm/page/Manifest
@@ -1,5 +1,3 @@
-DIST page-1.9.8.tar.gz 162352 BLAKE2B acde0feb62d58f66708ec09545137978540fb8c5fab651961b6e87d7c9d7be3170b8e2171c80ec553a9059ae2c23869759f37953da783be3a8fb3ea471e8b15b SHA512 758b1efbecb6d0a3d6ea0f7261b1c55db0927aa46d871f1a30b77e5aa7b9819ae74ca6fb821692656f2150da758793ba5653bdd94ab92ba2b79b39e0d4a4882e
 DIST page-1.9.9-r1.tar.gz 1009216 BLAKE2B 8248705f9e5eceaeea37889a9859249d9eb236f215da804f5edad3c36007179f63f132c161c1e4a6a97df6240f87799242140c97877775ae00f2e86dd7eed69d SHA512 9e7594590b1fdeadcf59d715d30727bee9f640903a34cadd8c0d92b3e94059c183d931a7d8e96763adb74f59a94acb03f7bfbbd4f1f8b57371fe886e6a227012
-EBUILD page-1.9.8.ebuild 1348 BLAKE2B fd2f8a03df95bd652bb253568e7c0ca8348eeb834d06f223c0d6d601f67e6ada45c36ef20d33ae5b90b88494f469853d0cc9af7dd110143b29d8a207adf133c7 SHA512 cd7719566b074cf9f074ed4e94298a1ffdfc1f852a9494fd63c55077bfef9c2f41116e2209ed3b78620172a9238266c8f869ffdbf46a1755aabb8a68fa16a602
-EBUILD page-1.9.9-r3.ebuild 1341 BLAKE2B d6a18ab1c4ae879f3aac459160aa33fa09e79ecc05812b6593d9dec787f48ae47fd061ce2951b81b1daeefe642e20c0eee45d83865f04d6a138c2925fcfa6419 SHA512 e55c83ff9baec2bbe3b24aaeb553bd4f98eda6c24e92854b46af86f3dd2d585328cc7b00332492a7a392e9316436f2831090585aa2e340f8c1f2d491ae1d81d7
+EBUILD page-1.9.9-r4.ebuild 1346 BLAKE2B f2697c20c4907f72bc090e5097215ef62a2ba97f571bcaefcd8cf1177110c7a9547c3d8f624f7f67e0f438a309506d19958cea8c44e0803ac6f4c4035c3963c5 SHA512 eef1999b97739813baf743a06184f38e10318ccc6c71d65564334feeb4a8d1a321bd2b55d9481297e7cad42c35541be262cecf6421575b457cc2852de12797b6
 MISC metadata.xml 529 BLAKE2B 4c6d01f77562ee31d8bd0f72c5217036cdad2b10f1c24fe2a1d3840a68502d130979d21a8a9a4791378f4ccaffd7eb685feb0c3fb81edfd18d08be6bd8aa345d SHA512 d2989494a7f5a4a8d3c48343763098dcb9a5f7fb6754455b008e0cb982b4284d84809d7c299c2c7bcdc1ee76429286efdd03a9ecdfb0163fccaaaaa4ee2b45fc
diff --git a/x11-wm/page/page-1.9.8.ebuild b/x11-wm/page/page-1.9.8.ebuild
deleted file mode 100644
index 8fcd55186a3b..000000000000
--- a/x11-wm/page/page-1.9.8.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="A mouse friendly tiling window manager"
-HOMEPAGE="https://github.com/gschwind/page"
-SRC_URI="https://github.com/gschwind/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-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"
-
-DEPEND="${RDEPEND}
-	>=x11-base/xcb-proto-1.12-r2
-	x11-base/xorg-proto"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_install() {
-	default
-
-	# Solves file collision with dev-tcltk/tcllib, bug #574074
-	ebegin "Changing references from 'page' to 'pagewm'"
-	mv "${D}"usr/bin/page "${D}"usr/bin/pagewm || die "Could not rename binary!"
-	sed -i -e "s:/usr/bin/page:/usr/bin/pagewm:" "${D}"usr/share/applications/page.desktop || die "Could not change .desktop file!"
-	eend
-}
-
-pkg_postinst() {
-	elog "page can now be launched using \"pagewm\". To find out more about this functionality,"
-	elog "see the following bug report: https://bugs.gentoo.org/574074."
-}
diff --git a/x11-wm/page/page-1.9.9-r3.ebuild b/x11-wm/page/page-1.9.9-r4.ebuild
index a5c53381b117..f486626b160b 100644
--- a/x11-wm/page/page-1.9.9-r3.ebuild
+++ b/x11-wm/page/page-1.9.9-r4.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit autotools
 
@@ -25,7 +25,6 @@ RDEPEND="
 	>=x11-libs/cairo-1.14.6[X,xcb(+)]
 	>=x11-libs/pango-1.40.5
 	>=dev-libs/glib-2.50.3-r1:2"
-
 DEPEND="${RDEPEND}
 	>=x11-base/xcb-proto-1.12-r2
 	x11-base/xorg-proto"
@@ -40,8 +39,8 @@ src_install() {
 
 	# Solves file collision with dev-tcltk/tcllib, bug #574074
 	ebegin "Changing references from 'page' to 'pagewm'"
-	mv "${D}"usr/bin/page "${D}"usr/bin/pagewm || die "Could not rename binary!"
-	sed -i -e "s:/usr/bin/page:/usr/bin/pagewm:" "${D}"usr/share/applications/page.desktop || die "Could not change .desktop file!"
+	mv "${ED}"/usr/bin/page "${ED}"/usr/bin/pagewm || die "Could not rename binary!"
+	sed -i -e "s:/usr/bin/page:/usr/bin/pagewm:" "${ED}"/usr/share/applications/page.desktop || die "Could not change .desktop file!"
 	eend $?
 }
 
diff --git a/x11-wm/qtile/Manifest b/x11-wm/qtile/Manifest
index d8e226aab2ba..0471fa2af447 100644
--- a/x11-wm/qtile/Manifest
+++ b/x11-wm/qtile/Manifest
@@ -1,6 +1,10 @@
 AUX qtile-session 1854 BLAKE2B 260c39642f805f9b94e59ab25d9e8d6e53abcb9fbed76f33434fdd2ccd65dc24c71b7ea654ced6393404656f2f26d96dc45a2b7e580190da408a396e76af2897 SHA512 4d7418316f6baeaa28b254f341c74641004bd58444c425f626c92e44bff046ec108d128a9e91c10daae75b222c5758e8f0e8a5e3b778b2af36409f4d4b778cbe
+AUX qtile-session-r1 1860 BLAKE2B fb9345d3acc5e0fc5694065f12e2759e02aebc765925cb0ffcb1a776ec82e959503d8a8039238e4e48a5045a3118f2e37201a88d5255fd0a0782d2f8291d8a77 SHA512 41b37ba034b5dd7f3126142d2cfc5cf8986b521fc419d47e420582fc8b516df87249bd8e14c12d77691b93205ec3cd1249bfa040ef0691e0751c669f742570ee
+AUX qtile.desktop 121 BLAKE2B c8c22d15951fb0f7fb26eccf8b67d051ab0c9990f65e9924a81c2bb3399b082ce82d69a342716ab0e8bffc6316e7a2fcbb2b1303bad05ed3d10d8f7e43717457 SHA512 e2e94c60c7c7be992fcfda88e43c298aa2356c9d7553870fdcd384f464d1dd5ec28c46a171d4717ca1cd00abda160fa3b5270bf0acf9fa90b93ee2041afc6d3a
 DIST qtile-0.16.1.tar.gz 324668 BLAKE2B 1f75f5dbcab6180dcf778e28108e70b6dd01105fa275aadf4a53d96ab84f3b759cb8553bcf3de2011b0990d61adc9269663afa32b83d1aa9c052b00ef9e89358 SHA512 aea42f7f6799a88b586167a57f5b5ab6f1c5bb663dec352d15eb47ce0d37fb23c31d1631cab8178c71be5ae714ec12c35a350377383dba1749a98cd45c22515b
 DIST qtile-0.17.0.tar.gz 336235 BLAKE2B f2290ab823b31cd8ed512f076018a8df19bbfedbb7d5c6932eee7cd46c341a08af04ed0d99f4391d1b3ccc07eb33015bbf0050c1c5d749bace4fb6dcfcb71ac9 SHA512 bfe51aabef2d48693c5bb7525cf67b1bb99cf3af5a653cd81d523e5adaa4767a43e7a87db14f9b85fae3a9e414af41a2e66736556eb1552d099755ba6f39caeb
+DIST qtile-0.21.0.tar.gz 475428 BLAKE2B 8c63eb8776fb6feab30c7ee2a19e6f28df6715fc18b09c63b89de6bf2129cd3c5c516d0c9efc946f24590fa8afc6e87c704c8e3b7094d0843b5b6e34df57ca18 SHA512 b7c5fc478180413e263445316ac9560c1d22668194415c3e4edae5c672f4b317fd978083dc9a985f0d145aeaaa55ffab0017e83af963f30d8b36f9963e12b079
 EBUILD qtile-0.16.1.ebuild 1053 BLAKE2B a992609d10a060e1d08adec28af61cd3a92beff3a89b357841ec021bdb8002c923100ff4b75673104eb72a50e66778155c6f10d3cb77aed0cf7998031b7cd28b SHA512 e26c78bd68cc719e5b6bab463080a96a5be2e2b37e7a33932983f6af0231e83acf8b6a862f67f64e65b0b4fdb866cf7284ce6bc762065671b7bfa71e196a2f56
 EBUILD qtile-0.17.0-r1.ebuild 1137 BLAKE2B 1282c08507f111637e488d8159aa2100855fb153533b6937d06e5bdf598b7c4a504af53d879f47d27969b0a7235c90ae3e99bd0bbd4b1d971834d96b9b901dbd SHA512 b8c844170f2571e91e1056d61a312cdf35ddbbfbbd13ad7a6c41bf0ee3326346e407d165307eb96633867c63c396906ca101c2cb28e107948dc113134b81455e
-MISC metadata.xml 324 BLAKE2B 6daea96aa4c9f4f18abe5fe4947d9cf7c50b825846816b5a6f683e51c3bb3b3d884f4afd4e424624fe8df2de1c80b6d124dba1a4a3a53982598158347db8dde2 SHA512 589b322da542f94c942b3f4775e0fa96806ec3de47485befaba65e6c803d8004a2ba1a02f4442c3bca5d525355966de837f00af4c109600e8c56fdb53438896a
+EBUILD qtile-0.21.0-r1.ebuild 1716 BLAKE2B ee58920cc167ff9997f17fcbd30e6d3f0d516d5a49c9826dd903e82d055fb0db379cd8ab6512b9936e88bdaf911a9f097656882ea850ebfc9e9d19a0098aaa5c SHA512 147cd2dc7c9049d2e9ca7e29f5bab099287c30400b8a2de46bae0b00225a1313ea99961bf22429c97c61f08a575a378fc5db2a21c0cf3bde9c882cd6dc842443
+MISC metadata.xml 367 BLAKE2B ade5efce70fa9a9968ae51933aae07bc5c91e25b64a9c3389236cb20a9b84b74ebf3b812c015ceec8dd2866740c2d8145844a6b2bc8d3416e9cb9c3cadde7890 SHA512 eabc2f763c0cfbf034a9b9781f605333101278fbd064dbc17409408f3fe0c0fe7192e44a987400e9573c523783ddac8e38506b1c3ab64ddef24091bda1697b4e
diff --git a/x11-wm/qtile/files/qtile-session-r1 b/x11-wm/qtile/files/qtile-session-r1
new file mode 100644
index 000000000000..f16591c87044
--- /dev/null
+++ b/x11-wm/qtile/files/qtile-session-r1
@@ -0,0 +1,89 @@
+#!/bin/sh
+# qtile Xsession starter, based on Xsession from x11-apps/xinit
+
+# redirect errors to a file in user's home directory if we can
+for errfile in "$HOME/.qtile-errors" "${TMPDIR-/tmp}/qtile-$USER" "/tmp/qtile-$USER"
+do
+	if ( cp /dev/null "$errfile" 2> /dev/null )
+	then
+		chmod 600 "$errfile"
+		exec > "$errfile" 2>&1
+		break
+	fi
+done
+
+userresources=$HOME/.Xresources
+usermodmap=$HOME/.Xmodmap
+userxkbmap=$HOME/.Xkbmap
+
+sysresources=/etc/X11/Xresources
+sysmodmap=/etc/X11/Xmodmap
+sysxkbmap=/etc/X11/Xkbmap
+
+rh6sysresources=/etc/X11/xinit/Xresources
+rh6sysmodmap=/etc/X11/xinit/Xmodmap
+
+# merge in defaults
+if [ -f "$rh6sysresources" ]; then
+	xrdb -merge "$rh6sysresources"
+fi
+
+if [ -f "$sysresources" ]; then
+	xrdb -merge "$sysresources"
+fi
+
+if [ -f "$userresources" ]; then
+	xrdb -merge "$userresources"
+fi
+
+# merge in keymaps
+if [ -f "$sysxkbmap" ]; then
+	setxkbmap `cat "$sysxkbmap"`
+	XKB_IN_USE=yes
+fi
+
+if [ -f "$userxkbmap" ]; then
+	setxkbmap `cat "$userxkbmap"`
+	XKB_IN_USE=yes
+fi
+
+#
+# Eeek, this seems like too much magic here
+#
+if [ -z "$XKB_IN_USE" -a ! -L /etc/X11/X ]; then
+	if grep '^exec.*/Xsun' /etc/X11/X > /dev/null 2>&1 && [ -f /etc/X11/XF86Config ]; then
+		xkbsymbols=`sed -n -e 's/^[	   ]*XkbSymbols[   ]*"\(.*\)".*$/\1/p' /etc/X11/XF86Config /etc/X11/xorg.conf`
+		if [ -n "$xkbsymbols" ]; then
+			setxkbmap -symbols "$xkbsymbols"
+			XKB_IN_USE=yes
+		fi
+	fi
+fi
+
+# xkb and xmodmap don't play nice together
+if [ -z "$XKB_IN_USE" ]; then
+	if [ -f "$rh6sysmodmap" ]; then
+		xmodmap "$rh6sysmodmap"
+	fi
+
+	if [ -f "$sysmodmap" ]; then
+		xmodmap "$sysmodmap"
+	fi
+
+	if [ -f "$usermodmap" ]; then
+		xmodmap "$usermodmap"
+	fi
+fi
+
+unset XKB_IN_USE
+
+# run all system xinitrc shell scripts.
+if [ -d /etc/X11/xinit/xinitrc.d ]; then
+	for i in /etc/X11/xinit/xinitrc.d/* ; do
+		if [ -x "$i" ]; then
+		. "$i"
+		fi
+	done
+fi
+
+exec /usr/bin/qtile start
diff --git a/x11-wm/qtile/files/qtile.desktop b/x11-wm/qtile/files/qtile.desktop
new file mode 100644
index 000000000000..5b00f85a88c0
--- /dev/null
+++ b/x11-wm/qtile/files/qtile.desktop
@@ -0,0 +1,6 @@
+[Desktop Entry]
+Name=Qtile
+Comment=Qtile Wayland Session
+Exec=qtile start -b wayland
+Type=Application
+Keywords=wm;tiling
diff --git a/x11-wm/qtile/metadata.xml b/x11-wm/qtile/metadata.xml
index 8a26ea044dca..55e0dd4ece08 100644
--- a/x11-wm/qtile/metadata.xml
+++ b/x11-wm/qtile/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="github">qtile/qtile</remote-id>
+		<remote-id type="pypi">qtile</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/x11-wm/qtile/qtile-0.21.0-r1.ebuild b/x11-wm/qtile/qtile-0.21.0-r1.ebuild
new file mode 100644
index 000000000000..4bdd86e614c8
--- /dev/null
+++ b/x11-wm/qtile/qtile-0.21.0-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="A full-featured, hackable tiling window manager written in Python"
+HOMEPAGE="http://qtile.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~riscv ~x86"
+
+RDEPEND=">=dev-python/cairocffi-0.9.0[${PYTHON_USEDEP}]
+	>=dev-python/cffi-1.1.0[${PYTHON_USEDEP}]
+	dev-python/dbus-next[${PYTHON_USEDEP}]
+	dev-python/pygobject[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
+	>=dev-python/xcffib-0.10.1[${PYTHON_USEDEP}]
+	media-sound/pulseaudio
+	x11-libs/cairo[X,xcb(+)]
+	x11-libs/libnotify[introspection]
+	x11-libs/pango"
+BDEPEND="
+	test? (
+		media-gfx/imagemagick[X]
+		x11-base/xorg-server[xephyr]
+	)"
+
+EPYTEST_DESELECT=(
+	# Can't find built qtile like migrate
+	test/test_qtile_cmd.py::test_qtile_cmd
+	test/test_qtile_cmd.py::test_display_kb
+)
+
+EPYTEST_IGNORE=(
+	# Tries to find binary and fails; not worth running anyway?
+	test/test_migrate.py
+)
+
+distutils_enable_tests pytest
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	# Force usage of built module
+	rm -rf "${S}"/libqtile || die
+
+	epytest || die "Tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	local DOCS=( CHANGELOG README.rst )
+	distutils-r1_python_install_all
+
+	insinto /usr/share/xsessions
+	doins resources/qtile.desktop
+
+	insinto /usr/share/wayland-sessions
+	doins "${FILESDIR}"/qtile.desktop
+
+	exeinto /etc/X11/Sessions
+	newexe "${FILESDIR}"/${PN}-session-r1 ${PN}
+}
diff --git a/x11-wm/selectwm/Manifest b/x11-wm/selectwm/Manifest
index 4158098a568a..c113d6a8d13c 100644
--- a/x11-wm/selectwm/Manifest
+++ b/x11-wm/selectwm/Manifest
@@ -1,6 +1,6 @@
+AUX selectwm-0.4.1-autotools.patch 662 BLAKE2B 98c515fd9e7eae9f3882c051a20a43bf84308309ab2890279532b608fc2a4b08e37d3ce72b264911d80627a3deb778c0335775a14ac3b5f0dc93fbdd531006bf SHA512 4b6b9100728c13c538f2acc23b28d33357c68085c3f6abc03a9aa01a2fe470a063acf3a3c97ef39d9afac81c318dac9383ed500d6bf3ef26bf72ecdee31b8fb8
 AUX selectwm-0.4.1-enable-deprecated-gtk.patch 299 BLAKE2B 8cd466ad4d7effdfc68831c6891c79ac2e2e97ab274e758cc5f56c7d1f16972514c3284034985497c62e0b39cafceec1717784b1198fa4e98855c7edd994f565 SHA512 154be35f4310e46708824312c53a4d6b942d80dd570ae2bafcdb6ffdc27eebfbdf518e2afb775d1c0014c6c521e4ae7b2177f2540a41e10a88412993746f04c1
 AUX selectwm-0.4.1-glibc-2.10.patch 677 BLAKE2B 4048952ab652e87b1d2520c5e725cfead0a8e6904b75f5bbabcacc49c94eb5e51c10ce74e3a2ca568b902cffff7e9ef3239ebbd96d9f8f436143451948b6c3f4 SHA512 dd477395578142bfa89a36d3f9f8c669f2a40d4867ef8ba366333bb1c107da4d2286d7ed1e357c3b78653213de5938955f52aa6e275ebb9cf5db0acd3bdcfcf9
-AUX selectwm-0.4.1-nostrip.patch 397 BLAKE2B 457e901557d8229a7f36a7334d3b3fa94f58ff3dd73cb30102d3bae54d08939372052022635f1a262e0c0682d258d365d118c8b9e3b0bba3b30b573b75b9e720 SHA512 741872c826c8ba44da29eeb9701792beb13a0c0a45dd59162c718408a5286876686b02abe301d21d4839aaad28dd993a3c5cf66fdb0d722062fbc0df4f5374bc
 DIST selectwm-0.4.1.tar.bz2 151454 BLAKE2B 849775ff0b5f860256fde9fd69b4a309c856089a8fabe0c8e97bbcd2a010db2ed7adfdce26c88922adf668828d5ab8ef41c7e4732b184cc9ac247fde4e2bff24 SHA512 3ddc4c1560d317ecb6e8e041d63415d16d31b67b4651d9e33fbe3e76a63754b78a86d332077ec091317e985dbedd903c9fdca46eb7cb650ad693039b8f4ab1ea
-EBUILD selectwm-0.4.1-r1.ebuild 704 BLAKE2B 4c3ba1949cb189b909f19abcb72f86ae3e44afa666186ea145d534361c87cb2009ec1bc49314f16724ecf230a8bd52d3c61bba02cdd1d9beab5905c967294415 SHA512 7d39ed81e69c0593003872b7a47ace9cf263bb615446d5c642ffd3f5c20124df897b9ff3be7f52fb42364f570dde4e9748d458452bdd365187406984da3c9f48
+EBUILD selectwm-0.4.1-r2.ebuild 728 BLAKE2B 8ccaae315a2aab221a32933459d06243b488d8c473634f1e31bfbfe5c00d3097ec02a7cdf5707a0fc516aa3c26c2bef33b3e958f535007c0c629e2443dcfbc36 SHA512 46e3894e2e952e7c87371a61fca82af787ec97d452f62bbee70af1378ae35e288bd2e2d1d09328f590355ba21ece18ce420e85f22dcafea3cd3c715c1b19802f
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/x11-wm/selectwm/files/selectwm-0.4.1-autotools.patch b/x11-wm/selectwm/files/selectwm-0.4.1-autotools.patch
new file mode 100644
index 000000000000..11dbcd3b94f0
--- /dev/null
+++ b/x11-wm/selectwm/files/selectwm-0.4.1-autotools.patch
@@ -0,0 +1,26 @@
+* Respect CFLAGS, don't strip binaries
+* Don't check for configure.in (EAPI 8)
+
+http://bugs.gentoo.org/252124
+
+--- a/configure.in
++++ b/configure.in
+@@ -1,6 +1,6 @@
+ dnl Process this file with autoconf to produce a configure script.
+ 
+-AC_INIT(configure.in)
++AC_INIT
+ AM_INIT_AUTOMAKE(selectwm, 0.4.1)
+ AM_CONFIG_HEADER(config.h)
+ AM_MAINTAINER_MODE
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -10,5 +10,6 @@
+ 	modify.c modify.h \
+ 	misc.h define.h
+ 
+-LIBS = @GTK_LIBS@
+-AM_CFLAGS = -s -O2 -Wall @GTK_CFLAGS@ -DLOCALEDIR=\"$(datadir)/locale\"
++selectwm_LDADD = @GTK_LIBS@
++selectwm_CFLAGS = @GTK_CFLAGS@
++selectwm_CPPFLAGS = -DLOCALEDIR=\"$(datadir)/locale\"
diff --git a/x11-wm/selectwm/files/selectwm-0.4.1-nostrip.patch b/x11-wm/selectwm/files/selectwm-0.4.1-nostrip.patch
deleted file mode 100644
index 4287ca2d2cbb..000000000000
--- a/x11-wm/selectwm/files/selectwm-0.4.1-nostrip.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Respect CFLAGS, don't strip binaries
-
-http://bugs.gentoo.org/show_bug.cgi?id=252124
-
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -10,5 +10,6 @@
- 	modify.c modify.h \
- 	misc.h define.h
- 
--LIBS = @GTK_LIBS@
--AM_CFLAGS = -s -O2 -Wall @GTK_CFLAGS@ -DLOCALEDIR=\"$(datadir)/locale\"
-+selectwm_LDADD = @GTK_LIBS@
-+selectwm_CFLAGS = @GTK_CFLAGS@
-+selectwm_CPPFLAGS = -DLOCALEDIR=\"$(datadir)/locale\"
diff --git a/x11-wm/selectwm/selectwm-0.4.1-r1.ebuild b/x11-wm/selectwm/selectwm-0.4.1-r2.ebuild
index e06d7d38dc00..43301bdf930c 100644
--- a/x11-wm/selectwm/selectwm-0.4.1-r1.ebuild
+++ b/x11-wm/selectwm/selectwm-0.4.1-r2.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
+
 inherit autotools
 
 DESCRIPTION="window manager selector tool"
@@ -13,17 +14,16 @@ SLOT="2"
 KEYWORDS="amd64 ppc sparc x86"
 IUSE="nls"
 
-DOCS=( AUTHORS README sample.xinitrc )
-
-RDEPEND="x11-libs/gtk+:2
+RDEPEND="
+	x11-libs/gtk+:2
 	dev-libs/glib:2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
-	"${FILESDIR}/${P}-enable-deprecated-gtk.patch"
-	"${FILESDIR}/${P}-glibc-2.10.patch"
-	"${FILESDIR}/${P}-nostrip.patch"
+	"${FILESDIR}"/${P}-enable-deprecated-gtk.patch
+	"${FILESDIR}"/${P}-glibc-2.10.patch
+	"${FILESDIR}"/${P}-autotools.patch
 )
 
 src_prepare() {
@@ -36,3 +36,8 @@ src_configure() {
 		--program-suffix=2 \
 		$(use_enable nls)
 }
+
+src_install() {
+	default
+	dodoc sample.xinitrc
+}
diff --git a/x11-wm/twm/Manifest b/x11-wm/twm/Manifest
index 7d7468655f1f..0e6614905c38 100644
--- a/x11-wm/twm/Manifest
+++ b/x11-wm/twm/Manifest
@@ -1,5 +1,3 @@
-DIST twm-1.0.11.tar.xz 261176 BLAKE2B 775ee483f34b1f45e737e0f1a907c07398883bd7bb2c17f729b38a2562af1a85f27b4dfa76b5fa1f88768e01c17c8cb364baaf39d80307aee3732183c5964653 SHA512 948034bba23e6b6c4412fcd2e46bb11a9980297601218a54a5055165ab0229a44dde0d50f338b24e82d76f390597e2fa09d11ff7f3fe1b1d736b10083c7da20d
 DIST twm-1.0.12.tar.xz 262624 BLAKE2B 4bca3572dc51af6d1724aefc42f85f04cf0dcbf5514d098628b7950b59a05bd1f1f6fe51aed492777fad5b169a0d97d0c1f0567aca3e7f33c7de0037c7dbe49f SHA512 f3d68df7e06516f6b74f19181efcfd9db2479c8ea0c72c3a6ed0dc1b222405b40d81a2dea17b662955e0c1783e87d0d3eb067c3b6e7c6eed8c0d38d03d362260
-EBUILD twm-1.0.11.ebuild 561 BLAKE2B aa2e20f143ac5cafee61239be93679da4900f9f3325e7cd637830009e3f3164fa1b2f9b28ef11cf7aec621537b28990eff5b5e0d35202fab660fa2d01bd38e92 SHA512 a005868f3c14a1d7ac4e78104ab56ed93d00fa44436384f8bee6e0fea7aa1146631504093d8e7f39d5456f0dc0501cc1338414cb1927b83d26d6dd8fc7d3ccdd
-EBUILD twm-1.0.12.ebuild 572 BLAKE2B 37d0c201420c11eab1335832b7fe48198765fdea773a5313f1419699cee61d2342a5945ef43afb7dfd803a2bf7e806f00406999b33f9d1a385aeafe62f748f26 SHA512 127712bce1fef5158717593da4e28494fe60c6f19cafbb00e6e1f1a666c0236d4164f8f2556debc27158d98bbee7e1d88da1a048c1831af7a02d57c9917e1b0b
+EBUILD twm-1.0.12.ebuild 568 BLAKE2B 5ec681257bda1fb9b0edaac06f41fa11cad6f91baa362c7476fef16b966a2bba00e8eeae327fa38dee288a59aec6d2737f2930c7b360caad17f40aa292756858 SHA512 90e66923fb95dca08ef6a66e8992c0dab75911c423ceffaa714db37af3a931c83c75ec0583125033630f30ea8320c78ea386bcb320a0c6257c02aa57d45de802
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-wm/twm/twm-1.0.11.ebuild b/x11-wm/twm/twm-1.0.11.ebuild
deleted file mode 100644
index cd028be52d14..000000000000
--- a/x11-wm/twm/twm-1.0.11.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-XORG_TARBALL_SUFFIX="xz"
-inherit xorg-3
-
-DESCRIPTION="X.Org Tab Window Manager"
-
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-COMMON_DEPEND="
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXmu
-	x11-libs/libXrandr
-	x11-libs/libXt
-"
-DEPEND="${COMMON_DEPEND}
-	x11-base/xorg-proto"
-RDEPEND="${COMMON_DEPEND}
-	media-fonts/font-adobe-75dpi"
diff --git a/x11-wm/twm/twm-1.0.12.ebuild b/x11-wm/twm/twm-1.0.12.ebuild
index 1e10bc078cdf..f891b052eeaa 100644
--- a/x11-wm/twm/twm-1.0.12.ebuild
+++ b/x11-wm/twm/twm-1.0.12.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Tab Window Manager"
 
-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"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/x11-wm/windowlab/Manifest b/x11-wm/windowlab/Manifest
index 7a1ce908f021..84e265a8083e 100644
--- a/x11-wm/windowlab/Manifest
+++ b/x11-wm/windowlab/Manifest
@@ -1,5 +1,7 @@
 AUX windowlab-1.34-fixed-font.patch 385 BLAKE2B e137d399ed40bda9776316f0b2fd5be9dd8520f0b0f88e754ea3c559975a3f42763b802f78a835230fc7fc27c7b544c9838a672f98fb1b008bdecdfddefef408 SHA512 c0e860c92dce68a921880fbe042163a50ad2f1e31572acb2a93bc557405ba7323a8a5e0e5608365be0585dac1bf648958c74aa9e017b9da6c0a15ac4caaae6e4
 AUX windowlab-1.40-gentoo.diff 1621 BLAKE2B eee189cfc54178f850225c4226a1cb70d131ad9417e9f8e000a1a56aaa3ddcf35dc65f4958937a0f40e020be966776a2f61f4797fc4217e128189b3bda4eb771 SHA512 d0d06e2396f1a2f26d7c76b5ed513df2fa4d7496a898664b1fec51b33d6e3f63dd131207cd68243f9c8895d7bfa00e399b3a38ac81101e8321532f454f193ccd
+AUX windowlab-1.40-libdir.patch 579 BLAKE2B 2dfdb96da3e156df9865afff8ccdcbe3c0bb677c4c28a47579868aa787e140cb15aacff38b87a92d3f03748a7a754dc1cfe2c8bc1f57236490b244002aaf873f SHA512 3c7784bb0d75cb9e491f918fceae4123f7c5f669e78e3a626a1784b9083f542f6dacbf94908539e3da647511bf658240796794dc4df092300e1898f79fe0a8c1
 DIST windowlab-1.40.tar 174080 BLAKE2B 9091565b40e886f921f33251c293b39ad4ec544a98d91046e52fa4e1aae66141934645e724ee224750dd7c50fba5a45fe2b4482c46e860c752a10c2b00dd05a5 SHA512 abea16f4f85f846d426fecce548cef2bf867fc6545a720ec2d3a8d93eb5a4abd6942e44534bb7faef6cffe0551181764effa99d835b8f067a1510f7d50af6d3d
 EBUILD windowlab-1.40-r1.ebuild 1056 BLAKE2B cf7eca457b2b92aa2c98e75b58ef968776a04d0a20d2bf35831d34afa6957ae0b158009c6d4dff7366338e10287eacb1153e8a284485ca9e5e1cbd36026af451 SHA512 94fb9dfcb2b13c3c591036d05b6fdac34b0972cbd06fc779b8aad08e8ee2c5bd0e0e51c63e86b9f2e30337f383a379711ca8f7b3054abfae20e7adc2783d17f4
+EBUILD windowlab-1.40-r2.ebuild 1127 BLAKE2B f6227751587578f01b5f6d9dbf0532492af1afbb9913d0caee26eeb84f9ee477b6cf0407d39b958d4c3f63d15d04ac0addb4af2a6afbb1ea01ad1566df583508 SHA512 794d7dd96389921c721c969e29c3dcedef5b122ebc2c16bb787324f9ed6b0bb255ec7dc652f0280fa0556e33d77d7903b71c040800eecf94bb750683eeedb77d
 MISC metadata.xml 746 BLAKE2B 0ea6f7861ef16880dc5e900f1a5164b42c70e9d4808e5a19fecf6cf6ed45cb4a6aee10ac1e94e9a0458e46aa14705c01c505e61afb1bc1b8412d46efe11ced1b SHA512 417ec354ef36d2cf99373fb8b88ea5aecf75158c4e5135467828fe56e5763d19d37af6b9728c74a089230eb66036bcd0b8c89508ae7cbc49bc1b503f890e32c1
diff --git a/x11-wm/windowlab/files/windowlab-1.40-libdir.patch b/x11-wm/windowlab/files/windowlab-1.40-libdir.patch
new file mode 100644
index 000000000000..65c2b662dc62
--- /dev/null
+++ b/x11-wm/windowlab/files/windowlab-1.40-libdir.patch
@@ -0,0 +1,20 @@
+https://bugs.gentoo.org/732470
+--- a/Makefile
++++ b/Makefile
+@@ -51,7 +51,6 @@ BINDIR = $(DESTDIR)$(PREFIX)/bin
+ MANDIR = $(DESTDIR)$(PREFIX)$(MANBASE)/man1
+ CFGDIR = $(DESTDIR)$(SYSCONFDIR)
+ INCLUDES = -I$(XROOT)/include $(EXTRA_INC)
+-LDPATH = -L$(XROOT)/lib
+ LIBS = -lX11 $(EXTRA_LIBS)
+ 
+ PROG = windowlab
+@@ -62,7 +61,7 @@ HEADERS = windowlab.h
+ all: $(PROG)
+ 
+ $(PROG): $(OBJS)
+-	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(LDPATH) $(LIBS) -o $@
++	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(LIBS) -o $@
+ 
+ $(OBJS): %.o: %.c $(HEADERS)
+ 	$(CC) $(CFLAGS) $(DEFINES) $(INCLUDES) -c $< -o $@
diff --git a/x11-wm/windowlab/windowlab-1.40-r2.ebuild b/x11-wm/windowlab/windowlab-1.40-r2.ebuild
new file mode 100644
index 000000000000..521a807b40c7
--- /dev/null
+++ b/x11-wm/windowlab/windowlab-1.40-r2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="small and simple window manager of novel design"
+HOMEPAGE="http://www.nickgravgaard.com/windowlab/"
+SRC_URI="http://www.nickgravgaard.com/${PN}/${P}.tar"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~ppc ~x86"
+IUSE="truetype"
+
+RDEPEND="truetype? ( x11-libs/libXft )
+	x11-libs/libXext"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.34-fixed-font.patch"
+	"${FILESDIR}/${P}-gentoo.diff"
+	"${FILESDIR}/${PN}-1.40-libdir.patch"
+)
+
+src_configure() {
+	if use truetype ; then
+		export DEFINES=-DXFT
+		export EXTRA_INC=$($(tc-getPKG_CONFIG) --cflags xft)
+		export EXTRA_LIBS=$($(tc-getPKG_CONFIG) --libs xft)
+	fi
+
+	tc-export CC
+}
+
+src_install() {
+	default
+
+	exeinto /etc/X11/Sessions
+	cat <<- EOF > "${T}"/${PN}
+		#!/bin/sh
+		exec /usr/bin/${PN}
+	EOF
+	doexe "${T}"/${PN}
+}
+
+pkg_postinst() {
+	elog "${PN}'s menu config file has been changed from"
+	elog "${EROOT}/etc/X11/${PN}/menurc to ${EROOT}/etc/X11/${PN}/${PN}.menurc"
+}
diff --git a/x11-wm/windowmaker/Manifest b/x11-wm/windowmaker/Manifest
index 66ac22bf672e..d2c4d75eb38d 100644
--- a/x11-wm/windowmaker/Manifest
+++ b/x11-wm/windowmaker/Manifest
@@ -2,6 +2,6 @@ AUX windowmaker-0.95.8-configure_default_search_paths.patch 2599 BLAKE2B 1b76e54
 AUX wmaker.desktop 206 BLAKE2B 62fe60afde032c1f37c5c818bc37a97d70605e041e539e922f18d56a7582fffd1689762f600fa3c69c5b62dd399867c8c1208d393060e734b38a84540143bf79 SHA512 d1dc99aa29047434e1265c8f93ce366b7c026f27eec8a166904fda1ab4144e0d6142807ac09ba6cbcb86480257893e5553046a0ba1a8e1d6315f23dd8468482b
 DIST WindowMaker-0.95.9.tar.gz 3397167 BLAKE2B ec751fe0139b359933f4388f8dac3f2bf18db1f28fb4cb290d86db1ded9ffdab0cf51b451e28475bc51ee2735cb71c7fd2b01fa7472f5f0f4f1a1e00e1509339 SHA512 ca3ddc863f5b5b782e90f38c0019fe14d1109d6b11d0a3d5d6c728ddc1817747eea92e22e36933d445e72c70661e039ee56efa70f2654657c8980269fd5b4584
 DIST WindowMaker-extra-0.1.tar.gz 238018 BLAKE2B 865b12975d0cdefc1f05a76344b449fdcf8a2841d6a7adf1ab6435857d89cbc4fda22bb62432a1bbba921267380d00a0cded718bfbd344bbb5e6207e59b76096 SHA512 0fe9b3ffc093942db167d8a01e15c0f6741f3a40959d1434ea4f23e7b9d4a9c13935a61eabef9691e5fdfd4e407564caafce15c2d65d66499960a6764a874ab8
-EBUILD windowmaker-0.95.9-r2.ebuild 3209 BLAKE2B af3224189a16ffdb2831ae7d2f0a7dbea51ba67e5806eb97e9226f3b41719e687a968a6b97d60b3e241f2eb9db43d03201af0d62a12731ffbf639714c02e4173 SHA512 f36cdcf7474673833d8c7dedeeddb03661aea47ffdf917f2a3fef1dec7a24b9b56f033a2e101e23ba159c6ba3f49ca80da0a167f92e775f524e8059b039798e8
+EBUILD windowmaker-0.95.9-r2.ebuild 3208 BLAKE2B 797f0227c7a24bed976a34647eb9f9fb6d4c5e04a949b3e679ffdb6e745986706bf3dfa13038911f0d41726db03da8b3e4014181aea9c50b16596d94ff6c9179 SHA512 1a7854055d017319259b2abc943327d91eef369a533c192f126b7c797463c678684c50de084529da077999fe980f0f0eecd5f2511f71ab4299382cf224ecc7bf
 EBUILD windowmaker-9999.ebuild 3027 BLAKE2B cbdbe30ce0edf4c903db6d21e16deb64a27d5d6c7b67a72636e58b939e73a6f8c37da29422092d38ca349f4179f3541fb1688321d03afe04bcd35258132eed3a SHA512 550d6fe89f3c4161f9cf40f9298ad178c811d740475b74a139ddc2222c87b920c2677ef066c25c3dba43b0b40f0e8da885dfaa66dc53c69a3f2df792248d5ea4
 MISC metadata.xml 491 BLAKE2B 655e5faf398e5613ba67612a85c0a2daad2397289a3d666eb49beff9d7bba2e8247a0a39d715244380573a017a5c87b616dc5c254ced104cdc8a9418c943a900 SHA512 38638b8e8648c39b4eb0d2b7f41b388cbc18998a8a9f859638495e1f0df90763ff5eb2d9397d2222fb29f6bd8183bc5366311b539904675d10fb070477314c93
diff --git a/x11-wm/windowmaker/windowmaker-0.95.9-r2.ebuild b/x11-wm/windowmaker/windowmaker-0.95.9-r2.ebuild
index 64285cc4ed19..654235665a4f 100644
--- a/x11-wm/windowmaker/windowmaker-0.95.9-r2.ebuild
+++ b/x11-wm/windowmaker/windowmaker-0.95.9-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://windowmaker.org/pub/source/release/${P/windowm/WindowM}.tar.gz
 SLOT="0"
 LICENSE="GPL-2"
 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"
 
 DEPEND="media-libs/fontconfig
 	>=x11-libs/libXft-2.1.0
diff --git a/x11-wm/wmii/Manifest b/x11-wm/wmii/Manifest
index a2c48872c2e2..72d07373902e 100644
--- a/x11-wm/wmii/Manifest
+++ b/x11-wm/wmii/Manifest
@@ -1,4 +1,6 @@
+AUX wmii-3.9.2-libdir.patch 261 BLAKE2B b131312959eb8883ea60a64cad8f37c60b8bc5f4097ed00e74754a3443d040f2ec425a53952ad1990ed32c8b7b139e51a499244558c31e0de7fc2c7458366b7d SHA512 075f08ceb1e339c65af423b043560d84ba856133c3f750145acff6cf8d42e647a952f86826d4dbdb934c7f04e7cba9c9d767dc25768211cea5e5dc98819829a0
 AUX wmii.desktop 106 BLAKE2B b92235ce6a4f21648baf326952bf7dd0cc9f76670b97a41316d9763889c91b64defa067c0b07a93c2547e477fdac29b4f4050cc9954210b98788ea34ad3eac54 SHA512 4c2ce08f692996c20f3f8d3d7884ac82644e8d1782b3895a0e75ecfe6c8ee9faf68a7621226d3cd9fb75cee0942d46cc55373dd74832508368a7c9760a18b143
 DIST wmii+ixp-3.9.2.tbz 432032 BLAKE2B 176b0cee20de3bac6eb23584650fc9beed793cfce1b2af9d47fc7be675da094d90670e8566b1dce264a8715711aa0d3cd207d9b8ef243bd48343fd5fe3c645f7 SHA512 c75d6d3f80e2b263c8d7b9eb6d0e700a1ad642209fc0984908e9399d22372c6c0572f47ab61881d5d56c4cc4eeb2914a545f6af1bbb936b65848764577d75761
 EBUILD wmii-3.9.2-r6.ebuild 1644 BLAKE2B 8d1aadc39751bc8e85d6745e57dc8c2342d7dea5b897357ef62fbd86c3669b5c0e1cac912f90865e0339cbc2b882828a6ce83ddc2478318496788ad4fcc722e4 SHA512 ad857a5e68236dc3d8669b21d9aac5d03ca52a442044a2a1a40c16fcb4f0d03d80a15cb1e3d9596c339990e4e28190da35f3c65d1320838194f87ba0c78ee00d
+EBUILD wmii-3.9.2-r7.ebuild 1702 BLAKE2B 38225c543b840fc99c41254f279cb75710e7242e4189efe169b29d17cfb93897045ac74d4fea00f59e89cec245986afa1ac98278a86f2e8d2681f1b2b0553ac2 SHA512 72b6264ddc4257e5e188c0b4409f2589325d69a8b0d528aae016370496cc65d369264c597279814a045bb3a2309feac60ffc7a2d46664ebaa2ad037298cea9e4
 MISC metadata.xml 595 BLAKE2B 9bb2ba3899843174bf9b9d27cef59718a10e12ba096c29295473d09d564ce6f7346c62214111e9f5f50cac7da6630caf7f63d7d34305a529c8a4ece2b9c7c441 SHA512 c3c5b5e5797dfd1ddbb947f51a1b4ff5d35889fb74ea8c8532ccbfe3458a1beb5a7468701152a3c98ad2cdfb1e233a1abf5e04869becd409d660a255be790884
diff --git a/x11-wm/wmii/files/wmii-3.9.2-libdir.patch b/x11-wm/wmii/files/wmii-3.9.2-libdir.patch
new file mode 100644
index 000000000000..a1d68fac1afa
--- /dev/null
+++ b/x11-wm/wmii/files/wmii-3.9.2-libdir.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/832476
+--- a/config.mk
++++ b/config.mk
+@@ -11,7 +11,7 @@ PREFIX = /usr/local
+ 
+ # Includes and libs
+ INCLUDES = -I. -I$(ROOT)/include -I$(INCLUDE) -I/usr/include
+-LIBS = -L$(ROOT)/lib -L/usr/lib
++LIBS = -L$(LIBDIR)
+ 
+ TERMINAL = xterm
+ 
diff --git a/x11-wm/wmii/wmii-3.9.2-r7.ebuild b/x11-wm/wmii/wmii-3.9.2-r7.ebuild
new file mode 100644
index 000000000000..b4c0c4b776be
--- /dev/null
+++ b/x11-wm/wmii/wmii-3.9.2-r7.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic toolchain-funcs
+
+MY_P="wmii+ixp-${PV}"
+
+DESCRIPTION="A dynamic window manager for X11"
+HOMEPAGE="https://github.com/0intro/wmii"
+SRC_URI="https://dl.suckless.org/wmii/${MY_P}.tbz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+
+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"
+RDEPEND="${DEPEND}
+	media-fonts/font-misc-misc
+	x11-apps/xmessage
+	x11-apps/xsetroot"
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( NEWS NOTES README TODO )
+
+# Force dynamic linking, bug #273332
+MAKEOPTS="${MAKEOPTS} STATIC= -j1"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.9.2-libdir.patch
+)
+
+src_prepare() {
+	default
+
+	mywmiiconf=(
+		PREFIX=/usr
+		DOC=/usr/share/doc/${PF}
+		ETC=/etc
+		LIBDIR=/usr/$(get_libdir)
+		CC="$(tc-getCC) -c"
+		LD="$(tc-getCC)"
+		AR="$(tc-getAR) crs"
+		LIBIXP="${ESYSROOT}/usr/$(get_libdir)/libixp.so"
+	)
+
+	# Punt internal copy of sys-libs/libixp, bug #323037
+	rm include/ixp{,_srvutil}.h || die
+	sed -i -e '/libixp/d' Makefile || die
+
+	# bug #335083
+	sed -i -e "/BINSH \!=/d" mk/hdr.mk || die
+	# bug #369115
+	sed -i -e 's/-lXext/& -lXrender -lX11/' cmd/Makefile || die
+}
+
+src_compile() {
+	append-flags -I"${ESYSROOT}"/usr/include/freetype2
+	append-flags -fcommon
+
+	emake "${mywmiiconf[@]}"
+}
+
+src_install() {
+	emake "${mywmiiconf[@]}" DESTDIR="${D}" install
+
+	echo ${PN} > "${T}"/${PN} || die
+	exeinto /etc/X11/Sessions
+	doexe "${T}"/${PN}
+
+	insinto /usr/share/xsessions
+	doins "${FILESDIR}"/${PN}.desktop
+}
diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest
index a8df849fea07..1cef4e52e827 100644
--- a/x11-wm/xpra/Manifest
+++ b/x11-wm/xpra/Manifest
@@ -2,14 +2,15 @@ AUX xpra-3.0.2-ldconfig.patch 1270 BLAKE2B b4eaa81610899c16a43b43c5f11f93335ca48
 AUX xpra-3.0.2_ignore-gentoo-no-compile.patch 610 BLAKE2B 963b3b61602f6a7ad7c8247109932d0da7eeef2762eaa8a987a8f10178a13cec3255000661bc7e3344319a555c9f0ed41b6383be7728af543cb5d2e004c377b2 SHA512 ff16637dca766ba2d36351e1aeeb87f2bab02e73e8da8fdb566051727b0c6fec6df1925318eee8d1c87580196ec78f0303da56d3439b4b4bace3105a914251e8
 AUX xpra-4.2-no-service.patch 786 BLAKE2B 63a53c55335c2aefa5f1345b91dd01bf01340b06f68213f2fb796e6e33ab96bb1c80fbe6e4eedf129c5c06eba97ca080fef5c526ec95236e767bb1ad2ef2049d SHA512 f806b7f3eee1507c83b40f1463659acbcfe907a3e3b80d091d5816483718f295dce760aa3400b5a183a1605ef33092f68d634afaddfb69665f44f86bb3ff3aac
 AUX xpra-4.2-suid-warning.patch 745 BLAKE2B 58153996d70476058b8daba30e61cbe02a84f10bc61ba79bafa045c1474d8436f4aa7c7e1bfa0ffc92450effca92810016d6afeaf1261cd568b5c9dd9b41f468 SHA512 82e994786967fb258cf273ea69d579207e503af5a53466821d4c155c5c61099468db26b7c31b4e91d343eff8e60cc06a66664e6a7a7e968e8ea7f1b8f862700d
+AUX xpra-4.3-cpp.patch 1273 BLAKE2B fc7b55d69242a4aaad4692959c67c4b2219b11d6e2cee32f7c6dd23d2efcf0727f7a3299d4f94032ad561876c4148a2c10ac260f9df208fab10766462b1738d7 SHA512 e4a11ef3518037695194e0b15e79dbe4bc2cc8c70780052c5660fd621d682936367fa17a998cc307a629eee5860a8e74cbb82cbfaa46cc2d0e6ec051058a43ec
 AUX xpra-4.3-no-service.patch 779 BLAKE2B 5232b103b47601b4340d6a863d2cd3cc6641a55d6c252702034902a4d5189c7df45b7d6280ae9bf2a3dbe8c96a73847f936032cc9b58c4bdd91025974fa84005 SHA512 d5045da20f4fdcb2b434f280c42b26ee1c8c280e4037a116c3edd0990a97acc5017bf428c4c222a1c38e23a6dd5709789ac80e62187144d334068deecc99d20e
 AUX xpra-9999-xdummy.patch 614 BLAKE2B 9b502fa836caea212f90730e0238adb16c74814a55a2a5b32e062880d29b1fa05247fc3c5e8edddf0acdd1d93620dafb507ec9a14996c3aea248d204510a0e2c SHA512 71efb726f50b85890bb3508bd3943b3bb9e34a8f5d3c92c6fa4f7c2ea6b8c51551243ea0d4d52802f17e5aaed7716b9ee0b462cde1941dae9273651dcc461a9a
 DIST xpra-4.2.tar.gz 4057304 BLAKE2B 17b6a95f7ce24a311c39d09291d9570285c30f25c2d935389cb380c2fce698acd984821e69acaabd66368e76b5beddd01803a68d6a16dd930dd2fa3289532f10 SHA512 261d46c04ce70686f41873c5c0c115e462e3b2501c58ab05fb2904f4700454c5fb8124d0faf86fe5e982872f19a4b90b941f8aff4790f7206602d6030c005353
 DIST xpra-4.3.1-tests.patch 51444 BLAKE2B c645aa52bb06c3872f6c1c7aace099c10a6fd46dd4c386ec1a13f6326e3fc8860a71767510ce9b44375cc8b30cef563e4405b2834670a9d2c555d3359d16e99f SHA512 0c70c33e24980db31e904c91f987a73693bd2349958ea8392138987e1dc1852ea42a4ee7e3b238f01c92adc57dbe196e57f4c4accf27aade6c4ea55c1ff9b40c
-DIST xpra-4.3.2.tar.gz 4175968 BLAKE2B 16d42f9509c1ac3cf3f345a6cdd3711496019064c890268d1c1612e37e34ffe93016488f8a6d1bf8509da1d32500571e80bb4143a2f870f07530386515107735 SHA512 b9bc89a0d042e4ef2a416b7787bd1588a9d151d482319c637073749383e2b3f3361eb0f95c0e39ba98c9ae87ef5acb68c4980645fb9a2feea37215f88f7a8a95
 DIST xpra-4.3.3.tar.gz 4180278 BLAKE2B 2fceab6c95efd0bd0390b7965aea588f39e43f86094c1f9921e1f75022f569808e27d7d85adcccfd64ac28889d0f6d2d6afdf4365f8c919bac8b1a14f3919f23 SHA512 c470e892b4b6379b6c9447731ab174e85c26de15fdc9541a199a2f49e45d07942ae8638f8ddf040a22c73422c6e6b262a9066cd8990f182b75163f7d449d91e2
+DIST xpra-4.3.4.tar.gz 4184031 BLAKE2B e01e338398f86c80a1092ea3155126ed26eb959ca97790add4cfcdb0ec8a1c6391937ff101c889ec78bb00bbf38ac0c42c5b85d60e72804ffccbbe5f446aaa3e SHA512 93855ff248f135c70a2144a0afbc66e4830b8d214c9c2017dff1d3e3c7902dac15b1cb03670cde8018b40d5c404bd7c243625faeaba712130f5d0082f562c60c
 EBUILD xpra-4.2.ebuild 4193 BLAKE2B 1c611de33e8d7f62642d2e06f9ff0714110ef2f1bf436c48f2c9c6ce0a5be54dc5264b67e258e5d21f87393cb18b58866479a8d6f4c55617abaf61d960129862 SHA512 e0a8c60225f6e308bac0670b5b2657156b7f1bb9a04dc5b46cc6a297c68a0d92dbf844945ff376fc53cd13789efccfb474c2f2b852fb7d464c971cf6143c3c5c
-EBUILD xpra-4.3.2.ebuild 4962 BLAKE2B a40c901bd29c48209f2d998e0cb3c11c778e765bb3a9c7b639dbfb7e2eef0e7132eae29c6c8b72f902024ab96fcfd3a2766fe156de854ff9d4a87e43f7b13b9b SHA512 cac5c7ceba4a366fd156488d8f8d04df6597a55e1a30323af54ee22b8fd0acf7951881e4ebc18eb30ef3811d529fb48a5817ae4e48f59d4fe575f255c426bfe1
-EBUILD xpra-4.3.3.ebuild 5073 BLAKE2B 0acd46b89c2ca94cc701187d501baf22b08bc541e6e552080a2b5ddf9142cd6bb1d9df8cc7ccf7035c7f6c8beb5f81f1abd1ffad75d4c4d17b1843a592d908ce SHA512 dee798e4b81335b4fe90bdc2c4eb1aff2f6124ceda1f9e4bc67f2dfc868cb2d006351ae5562adb3f07dc9cf91a8b1e936745b06be85633125110bfdda561aeb2
-EBUILD xpra-9999.ebuild 5008 BLAKE2B 537e42dbc5e2bfd2fe185c7dbe8a096d59c4a63a444101f3730c77198b4dcb80d00159204dfdb0f166f9e0000d64d7bd38ed34f7fce5d765b4aff85dfd8e3d0d SHA512 795fbd85cf633adbd7ef63f363a2bb18c5c9f781581794fd89ad005e26539c378968e67dce7d339ffad3e9b8f2f4edb8073af58d876a0b432a7755fb62b8b50e
+EBUILD xpra-4.3.3.ebuild 5292 BLAKE2B 1e72840535dcad023f03c3a5df40e70a5ef9d653abd983c7244d1fa4fda1c99fe5535dc9ecec0dd711e7f945ebe01c8d3ee6ebefb652352fb86d01f392d3971d SHA512 3829633d6c0aa0b9b8e21d2faa21118baaaa06ca55903a95def3a7a7d7773ffcc79c76f8065fd6712b90578700e1062df537382d7129ad086c20c2a5b18464b0
+EBUILD xpra-4.3.4.ebuild 5213 BLAKE2B a225eeb5ef089e0a8522cfd3c58b7775e51e481cff1b0faac1a06cf35640db5f01f2168717026a7363fe5319ea3392ec0002f9ecbce253eb7bc2e80e0aa4cbfe SHA512 9c63a9e981c7cca9c194a860d17da43760eff4201d44ef525ec0f9e27800c62614366126f7c210cc8cb3827a84c8890e373132d0eddbcec81cbf5d04eecbba7b
+EBUILD xpra-9999.ebuild 5148 BLAKE2B 192a4458604d74eec4d5b9e2ca50cbfae7d97a3624bbab18c714099630a91034753bffe8c9841f2d0a794581c978e95cb3480f7a0bbe377897caec33a95a7159 SHA512 e51223bd4d28c196da186bcf201b81204224725c13d8a1d2a437ce937a061d0d5085b227d6961c2849564ac01931fdc58a60e503644c550ba8969f7070953d87
 MISC metadata.xml 1251 BLAKE2B c34d54c0b030f2b1f6feef9bfaa50718f4931488e948d0179cd1846f2e4b78932c4164f9a3b708b13cd90c71c84cdebc6af2dfa3fbb831eed3fc308c2537ff84 SHA512 465e19a532120ed42187e6e053b77fecad5cad408f4f1a57bcd237b7765bafd2fbff7a6e7e66ee4c9cbf50bd979aa989dd364a042e8ecfe5cd2180f2eeab3ba8
diff --git a/x11-wm/xpra/files/xpra-4.3-cpp.patch b/x11-wm/xpra/files/xpra-4.3-cpp.patch
new file mode 100644
index 000000000000..41f1263e3465
--- /dev/null
+++ b/x11-wm/xpra/files/xpra-4.3-cpp.patch
@@ -0,0 +1,34 @@
+From c80d18b41701082e60ce6bfa5bd6a274affaff96 Mon Sep 17 00:00:00 2001
+From: James Le Cuirot <chewi@gentoo.org>
+Date: Sun, 22 May 2022 12:00:01 +0100
+Subject: [PATCH] Most build systems respect the CPP env var instead of just
+ calling cpp
+
+---
+ setup.py | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index f84d56c6d..7f0db3b69 100755
+--- a/setup.py
++++ b/setup.py
+@@ -149,6 +149,7 @@ ARM = ARCH.startswith("arm") or ARCH.startswith("aarch")
+ print("ARCH=%s" % (ARCH,))
+ 
+ INCLUDE_DIRS = os.environ.get("INCLUDE_DIRS", os.path.join(sys.prefix, "include")).split(os.pathsep)
++CPP = os.environ.get("CPP", "cpp")
+ 
+ from xpra.platform.features import LOCAL_SERVERS_SUPPORTED, SHADOW_SUPPORTED
+ shadow_ENABLED = SHADOW_SUPPORTED and DEFAULT
+@@ -2423,7 +2424,7 @@ if v4l2_ENABLED:
+         ENABLE_DEVICE_CAPS = 0
+         if os.path.exists(videodev2_h):
+             try:
+-                with subprocess.Popen("cpp -fpreprocessed %s | grep -q device_caps" % videodev2_h,
++                with subprocess.Popen("%s -fpreprocessed %s | grep -q device_caps" % (CPP, videodev2_h),
+                                      shell=True) as proc:
+                     ENABLE_DEVICE_CAPS = proc.wait()==0
+             except OSError:
+-- 
+2.35.1
+
diff --git a/x11-wm/xpra/xpra-4.3.3.ebuild b/x11-wm/xpra/xpra-4.3.3.ebuild
index 337531a3c0f3..6edd3e2ee447 100644
--- a/x11-wm/xpra/xpra-4.3.3.ebuild
+++ b/x11-wm/xpra/xpra-4.3.3.ebuild
@@ -22,7 +22,7 @@ DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based o
 HOMEPAGE="https://xpra.org/"
 LICENSE="GPL-2 BSD"
 SLOT="0"
-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"
+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"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	|| ( client server )
@@ -99,6 +99,7 @@ RDEPEND="
 	x11-apps/xmodmap
 	ibus? ( app-i18n/ibus )
 	pinentry? ( app-crypt/pinentry )
+	udev? ( virtual/udev )
 "
 DEPEND+="
 	test? ( ${TDEPEND} )
@@ -117,6 +118,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-3.0.2_ignore-gentoo-no-compile.patch
 	"${FILESDIR}"/${PN}-4.2-suid-warning.patch
 	"${FILESDIR}"/${PN}-4.3-no-service.patch
+	"${FILESDIR}"/${PN}-4.3-cpp.patch
 	"${DISTDIR}"/${PN}-4.3.1-tests.patch
 )
 
@@ -192,12 +194,22 @@ python_install_all() {
 	distutils-r1_python_prepare_all
 
 	# Move udev dir to the right place.
-	local dir=$(get_udevdir)
-	dodir "${dir%/*}"
-	mv -vnT "${ED}"/usr/lib/udev "${ED}${dir}" || die
+	if use udev; then
+		local dir=$(get_udevdir)
+		dodir "${dir%/*}"
+		mv -vnT "${ED}"/usr/lib/udev "${ED}${dir}" || die
+	else
+		rm -vr "${ED}"/usr/lib/udev || die
+	fi
 }
 
 pkg_postinst() {
 	tmpfiles_process xpra.conf
 	xdg_pkg_postinst
+	use udev && udev_reload
+}
+
+pkg_postrm() {
+	xdg_pkg_postinst
+	use udev && udev_reload
 }
diff --git a/x11-wm/xpra/xpra-4.3.2.ebuild b/x11-wm/xpra/xpra-4.3.4.ebuild
index 071992dfdb79..a0bcf0ffcbc9 100644
--- a/x11-wm/xpra/xpra-4.3.2.ebuild
+++ b/x11-wm/xpra/xpra-4.3.4.ebuild
@@ -3,20 +3,26 @@
 
 EAPI=8
 
+if [[ ${PV} = 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/Xpra-org/xpra.git"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+		https://dev.gentoo.org/~chewi/distfiles/${PN}-4.3.1-tests.patch"
+	KEYWORDS="~amd64 ~x86"
+fi
+
 PYTHON_COMPAT=( python3_{7,8,9,10} )
 DISTUTILS_SINGLE_IMPL=yes
 DISTUTILS_USE_SETUPTOOLS=no
+
 inherit xdg xdg-utils distutils-r1 tmpfiles udev
 
 DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based on wimpiggy"
 HOMEPAGE="https://xpra.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-	https://dev.gentoo.org/~chewi/distfiles/${PN}-4.3.1-tests.patch"
-
 LICENSE="GPL-2 BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
-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"
+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"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	|| ( client server )
@@ -93,6 +99,7 @@ RDEPEND="
 	x11-apps/xmodmap
 	ibus? ( app-i18n/ibus )
 	pinentry? ( app-crypt/pinentry )
+	udev? ( virtual/udev )
 "
 DEPEND+="
 	test? ( ${TDEPEND} )
@@ -109,7 +116,6 @@ RESTRICT="!test? ( test )"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.0.2_ignore-gentoo-no-compile.patch
-	"${FILESDIR}"/${PN}-4.2-suid-warning.patch
 	"${FILESDIR}"/${PN}-4.3-no-service.patch
 	"${DISTDIR}"/${PN}-4.3.1-tests.patch
 )
@@ -186,12 +192,22 @@ python_install_all() {
 	distutils-r1_python_prepare_all
 
 	# Move udev dir to the right place.
-	local dir=$(get_udevdir)
-	dodir "${dir%/*}"
-	mv -vnT "${ED}"/usr/lib/udev "${ED}${dir}" || die
+	if use udev; then
+		local dir=$(get_udevdir)
+		dodir "${dir%/*}"
+		mv -vnT "${ED}"/usr/lib/udev "${ED}${dir}" || die
+	else
+		rm -vr "${ED}"/usr/lib/udev || die
+	fi
 }
 
 pkg_postinst() {
 	tmpfiles_process xpra.conf
 	xdg_pkg_postinst
+	use udev && udev_reload
+}
+
+pkg_postrm() {
+	xdg_pkg_postinst
+	use udev && udev_reload
 }
diff --git a/x11-wm/xpra/xpra-9999.ebuild b/x11-wm/xpra/xpra-9999.ebuild
index 59f1f56b88b3..5dea4bc89ba3 100644
--- a/x11-wm/xpra/xpra-9999.ebuild
+++ b/x11-wm/xpra/xpra-9999.ebuild
@@ -21,7 +21,7 @@ DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based o
 HOMEPAGE="https://xpra.org/"
 LICENSE="GPL-2 BSD"
 SLOT="0"
-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"
+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"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	|| ( client server )
@@ -98,6 +98,7 @@ RDEPEND="
 	x11-apps/xmodmap
 	ibus? ( app-i18n/ibus )
 	pinentry? ( app-crypt/pinentry )
+	udev? ( virtual/udev )
 "
 DEPEND+="
 	test? ( ${TDEPEND} )
@@ -114,7 +115,6 @@ RESTRICT="!test? ( test )"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.0.2_ignore-gentoo-no-compile.patch
-	"${FILESDIR}"/${PN}-4.2-suid-warning.patch
 	"${FILESDIR}"/${PN}-4.3-no-service.patch
 	"${FILESDIR}"/${PN}-9999-xdummy.patch
 )
@@ -191,12 +191,22 @@ python_install_all() {
 	distutils-r1_python_prepare_all
 
 	# Move udev dir to the right place.
-	local dir=$(get_udevdir)
-	dodir "${dir%/*}"
-	mv -vnT "${ED}"/usr/lib/udev "${ED}${dir}" || die
+	if use udev; then
+		local dir=$(get_udevdir)
+		dodir "${dir%/*}"
+		mv -vnT "${ED}"/usr/lib/udev "${ED}${dir}" || die
+	else
+		rm -vr "${ED}"/usr/lib/udev || die
+	fi
 }
 
 pkg_postinst() {
 	tmpfiles_process xpra.conf
 	xdg_pkg_postinst
+	use udev && udev_reload
+}
+
+pkg_postrm() {
+	xdg_pkg_postinst
+	use udev && udev_reload
 }
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 /x11-wm
parent	752d6256e5204b958b0ef7905675a940b5e9172f (diff)