13 files changed, 136 insertions, 370 deletions
diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index 73411a072c8e..d44d0d757801 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/herbstluftwm/Manifest b/x11-wm/herbstluftwm/Manifest
index 718201b51972..0e6c41d3218d 100644
--- a/x11-wm/herbstluftwm/Manifest
+++ b/x11-wm/herbstluftwm/Manifest
@@ -1,5 +1,5 @@
 AUX herbstluftwm-0.9.5-gcc15.patch 1021 BLAKE2B d8e11cf87d455ea5b1843987c987edf349c8b04041a57c1e1c440048b2a0581088ecea47653ad949ba4db370fbe5e16cc563219cfcda758f4a8b6b8ff933bfff SHA512 1b3214b7ca3c0753986b2437bff49b9c66e92c3b2c5ce6dee411970e97f5c3825d3ffa207bb747f2b151665f2d8fdb7dc746db9c58eb7562c7c216db441ca316
 DIST herbstluftwm-0.9.5.tar.gz 556773 BLAKE2B db851f02ce249be74f0104dd0b335fb1ed50b4a19e5f7de17cdc34b7eba99ac2f348c5a4a4e0afd2c68576f650029203c735ccb293a60d321769d56f746d6593 SHA512 a85fd1ab16b873f512d6965cc4a93524e3ed4a15079d0d4ee54012e217bd41db3b54729c1b30ee361c34b38799f95bc537099056ba7a5f791bf2be6724bc92c3
-EBUILD herbstluftwm-0.9.5-r2.ebuild 3182 BLAKE2B a755f00622b66009d6c953da3c09d76d8bc9bec4b16b2865e92141ab35a09ff7058d157281c818483670656197f66c1b4d672777b21f2fb0abfa5e2b02d4de20 SHA512 40956fc50ef6377b51062ce94a1c476fcf1f4a8cd1f56836bedb4736b6bd0afdcd551342d98944bead973cda77d49a5733237e9a97dbc40f87bd1a29b0373082
-EBUILD herbstluftwm-9999.ebuild 3564 BLAKE2B 2552a4c51bd03a5942c02afe7b80a93e172b3696ab9c18727bc5c2d366c220ce211cd670cfbca7434f6a6f382820efe1948445769f0ad1dc4ad7cebdc3ad75fe SHA512 3325cffdbd92cb2878ddc767631b43ff7d7a0a2281567246dc8e232b35989966c468fcd3ca311c7ada05321cd80ddc1338512c6db73cdeef8236059d4aa68981
+EBUILD herbstluftwm-0.9.5-r2.ebuild 3182 BLAKE2B 6846fc283610536fa4b55a440d99bb20dc3ad388bbaa14c26961e4886897255e8051c52f0020986d84c8fd8ec361453edf6d976264e30e771f2e6ac0afb47951 SHA512 42c6ecb445ddecf9b1cbc266b0ccf71b7ecfa8e6daa70d4499269d76b0a7fe144870316d75606b659d7553d2528d22564bf76f66ff6b16bbba9787a7a464d3a6
+EBUILD herbstluftwm-9999.ebuild 3564 BLAKE2B 3a0e2508c6da62800a393eb309a857b715a880a6a4222ffae444fbb73b5ca24d882fc11ac352ae56bde9471061b006230732b40348f37f2f9f18aa0c5f02eb8d SHA512 6c0054a8008f72f663907e9b0a44075f041ec4fd2f911f0830958c9baed017f78bda8c190df321e2732025be6c4adef5c40109c745896eacdecf239004dbe868
 MISC metadata.xml 337 BLAKE2B 7ef28bc6ce30abb6c2f44524b4dd05a479cd5ca2b98901ffe570b870d0b98f94589cd1d3f197ee7e3fd90f4c73144e1dc44996df8b1b3ec28ce6950578ada74e SHA512 6e7cb80e1870901554ac0c2a4947cceb4e6284ccc84714bb0f42dbfa69cab5b32a8bd34fd384731b9462535d7e80feef606030be3e03babc80828a980050f333
diff --git a/x11-wm/herbstluftwm/herbstluftwm-0.9.5-r2.ebuild b/x11-wm/herbstluftwm/herbstluftwm-0.9.5-r2.ebuild
index 244d8babb450..08d8b91e9787 100644
--- a/x11-wm/herbstluftwm/herbstluftwm-0.9.5-r2.ebuild
+++ b/x11-wm/herbstluftwm/herbstluftwm-0.9.5-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..12} )
+PYTHON_COMPAT=( python3_{9..13} )
 DISTUTILS_USE_PEP517=setuptools
 DISTUTILS_OPTIONAL=1
 
diff --git a/x11-wm/herbstluftwm/herbstluftwm-9999.ebuild b/x11-wm/herbstluftwm/herbstluftwm-9999.ebuild
index f9a7de769844..3f57831df47d 100644
--- a/x11-wm/herbstluftwm/herbstluftwm-9999.ebuild
+++ b/x11-wm/herbstluftwm/herbstluftwm-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..12} )
+PYTHON_COMPAT=( python3_{9..13} )
 DISTUTILS_USE_PEP517=setuptools
 DISTUTILS_OPTIONAL=1
 
diff --git a/x11-wm/openbox/Manifest b/x11-wm/openbox/Manifest
index 6073b52329e3..b3190f7e61ff 100644
--- a/x11-wm/openbox/Manifest
+++ b/x11-wm/openbox/Manifest
@@ -4,6 +4,7 @@ AUX openbox-3.6.1-glib-2.76.patch 2227 BLAKE2B 5f7605d81d00e1222945467a688927a9f
 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-r10.ebuild 2868 BLAKE2B e2aa0d8d095fa77c9b04191838f92cda041a4f1636f93d9a9709091c7854710b2bd89ee26286645e55da3d309078080431d544e138dd0f053a70d50694316eed SHA512 3576c6c8ddcdf745d27ab7318d600ddbb86bbec160072e7fce0a92c2413ffd18a01f56c0ae86cd1120f6b2a2882820ae91a8f1926b2a84ce9547ebdcc45227dc
 EBUILD openbox-3.6.1-r9.ebuild 2860 BLAKE2B 9deb5bb785ee72a72f90d16114b231ef92b3ca503abbfd9456c4ec76e84a6f079ae084235e241a50a012a3633a2caf14acd36e823fae43587833786566321c84 SHA512 be6a2cf868b7e5ce864d97e4988bb1825153ce3338df745551abafbb655f97ab89de24626d71662c7c58240571ba39624519b6f13a5604b3d51a9326aff24e1b
-EBUILD openbox-9999.ebuild 2867 BLAKE2B 7e5bc7d3fa89336dc8856765373248add99034f472bea52425f1087db317443c5d4b1b6b83adb764eac2bbbe050d7b4305a04954faab5cfb81e8da46df47b12d SHA512 08d6cca668b631c8de5a31e0611288dd2135ce35a66c3239f6f51691b42a803fa374c13586780f0c10e007f4640518155bfae7190f7e43ee3c772953e9384cd9
+EBUILD openbox-9999.ebuild 2702 BLAKE2B 5f52461e79c59ad21b0bc74ee4ef906457bc87b2942e8fefd2455a641e6d29567667dadaff78b884605870f3ec3833974a98fb06a45ab9a78b68c76fc618ed2d SHA512 a9390c0e39dc905bdf5bfe85f96e6a0ddc73aa4e577b3dc6c175068e9fcefdfe127ec4550f5e356f536d765254253db1ba66959e0cefc7628935a247c98fabc9
 MISC metadata.xml 705 BLAKE2B 0df8e542b8837fb94e5f6fd289b0d5172c1d4d01bc88c550b6afd5307619a0dfdf5de2c2ba8838d63f8a8c29a378e6545a8932c77d6f0bef7cc898a4fd400206 SHA512 acf171ad8ccc7d07b533e4f5aef895b485050fa8fa39d8a6db798a15d9c5924d4f825573b77ddd8b755b8c0b34e8c3ab49cd0f56592854ae36462c3de448f4dc
diff --git a/x11-wm/openbox/openbox-3.6.1-r10.ebuild b/x11-wm/openbox/openbox-3.6.1-r10.ebuild
new file mode 100644
index 000000000000..cc86876183ab
--- /dev/null
+++ b/x11-wm/openbox/openbox-3.6.1-r10.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13})
+inherit autotools python-single-r1
+
+DESCRIPTION="Standards compliant, fast, light-weight, extensible window manager"
+HOMEPAGE="http://openbox.org/wiki/Main_Page"
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Mikachu/openbox.git"
+else
+	SRC_URI="http://openbox.org/dist/openbox/${P}.tar.gz"
+	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 )"
+
+LICENSE="GPL-2"
+SLOT="3"
+IUSE="branding debug imlib nls session startup-notification svg xdg"
+REQUIRED_USE="xdg? ( ${PYTHON_REQUIRED_USE} )"
+
+BDEPEND="
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+RDEPEND="
+	dev-libs/glib:2
+	>=dev-libs/libxml2-2.0
+	>=media-libs/fontconfig-2
+	x11-libs/cairo
+	x11-libs/libXau
+	x11-libs/libXcursor
+	x11-libs/libXext
+	x11-libs/libXft
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	x11-libs/libXt
+	>=x11-libs/pango-1.8[X]
+	imlib? ( media-libs/imlib2 )
+	startup-notification? ( >=x11-libs/startup-notification-0.8 )
+	svg? ( gnome-base/librsvg:2 )
+	xdg? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/pyxdg[${PYTHON_USEDEP}]
+		')
+	)
+"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.5.2-gnome-session.patch"
+	# see https://github.com/danakj/openbox/pull/35
+	"${FILESDIR}/${PN}-3.6.1-py3-xdg.patch"
+	# https://bugs.gentoo.org/827227
+	"${FILESDIR}/${PN}-3.6.1-getgrent-to-getgroups.patch"
+	# https://bugs.gentoo.org/901777
+	"${FILESDIR}/${PN}-3.6.1-glib-2.76.patch"
+)
+
+pkg_setup() {
+	use xdg && python-single-r1_pkg_setup
+}
+
+src_unpack() {
+	if [[ ${PV} == *9999* ]]; then
+		git-r3_src_unpack
+	fi
+
+	default
+}
+
+src_prepare() {
+	default
+	sed -i \
+		-e "s:-O0 -ggdb ::" \
+		-e 's/-fno-strict-aliasing//' \
+		m4/openbox.m4 || die
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-static
+		--with-x
+		$(use_enable debug)
+		$(use_enable imlib imlib2)
+		$(use_enable nls)
+		$(use_enable session session-management)
+		$(use_enable startup-notification)
+		$(use_enable svg librsvg)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	exeinto /etc/X11/Sessions
+	newexe - ${PN} <<-EOF
+	#!/bin/sh
+	openbox-session
+	EOF
+
+	emake DESTDIR="${D}" install
+	if use branding; then
+		insinto /usr/share/themes
+		doins -r "${WORKDIR}"/Surreal_Gentoo
+		# make it the default theme
+		sed -i \
+			-e "/<theme>/{n; s@<name>.*</name>@<name>Surreal_Gentoo</name>@}" \
+			"${D}"/etc/xdg/openbox/rc.xml \
+			|| die "failed to set Surreal Gentoo as the default theme"
+	fi
+	find "${ED}" -name '*.la' -delete || die
+	if use xdg ; then
+		python_fix_shebang "${ED}"/usr/libexec/openbox-xdg-autostart
+	else
+		rm "${ED}"/usr/libexec/openbox-xdg-autostart || die
+	fi
+}
diff --git a/x11-wm/openbox/openbox-9999.ebuild b/x11-wm/openbox/openbox-9999.ebuild
index aba60e39ae11..85a1cb93cc93 100644
--- a/x11-wm/openbox/openbox-9999.ebuild
+++ b/x11-wm/openbox/openbox-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..12})
+PYTHON_COMPAT=( python3_{10..13})
 inherit autotools python-single-r1
 
 DESCRIPTION="Standards compliant, fast, light-weight, extensible window manager"
@@ -59,10 +59,6 @@ PATCHES=(
 	"${FILESDIR}/${PN}-3.5.2-gnome-session.patch"
 	# see https://github.com/danakj/openbox/pull/35
 	"${FILESDIR}/${PN}-3.6.1-py3-xdg.patch"
-	# https://bugs.gentoo.org/827227
-	"${FILESDIR}/${PN}-3.6.1-getgrent-to-getgroups.patch"
-	# https://bugs.gentoo.org/901777
-	"${FILESDIR}/${PN}-3.6.1-glib-2.76.patch"
 )
 
 pkg_setup() {
diff --git a/x11-wm/qtile/Manifest b/x11-wm/qtile/Manifest
index f6585ddb8072..d9aaf76d5c6a 100644
--- a/x11-wm/qtile/Manifest
+++ b/x11-wm/qtile/Manifest
@@ -1,8 +1,4 @@
 AUX qtile-session-r1 1860 BLAKE2B fb9345d3acc5e0fc5694065f12e2759e02aebc765925cb0ffcb1a776ec82e959503d8a8039238e4e48a5045a3118f2e37201a88d5255fd0a0782d2f8291d8a77 SHA512 41b37ba034b5dd7f3126142d2cfc5cf8986b521fc419d47e420582fc8b516df87249bd8e14c12d77691b93205ec3cd1249bfa040ef0691e0751c669f742570ee
-DIST qtile-0.28.1.tar.gz 601217 BLAKE2B 04f24c5b628e1c3d0eca395135ef0d0093af5a57d23aea751e76197da4f148ae679a9fb650e2589e5f2e253673cab86642e3f0695ac219641c65192eb9a37274 SHA512 95b4d95206aeac4bb59d47c94eb93b55ac413681050345a0d61cdb19b71dd785bb6c13c0161757b9bfa5e8d0ce345fcf64eea04fc44b2f596a65b70f5da5d32e
-DIST qtile-0.30.0.tar.gz 617632 BLAKE2B c26d51d7e31ef058a5a08ef8ef47ccce19bc59b9337d0dc1d874b2c4047ea2e1827cc694a9199ea808d22b7845a8bb019eb85a1912ddfb00801763b43e62b0f2 SHA512 218b7ba42315884faf11460c18a9fa8f34a3284d3fd4632c24997657e7ec659e337be9b0845e00dc7d4106828d7e5efcfd401ea7d031e0725598e60ad4172147
 DIST qtile-0.31.0.tar.gz 619301 BLAKE2B 0fb4cce53f986c7c427e9044e4ca99cab33b7722f178d5c9a6082f03b0b54ddb0696bd647a4d7c0ca8b853b5f9db38391e9bba2f28b81cd803e8622b81956602 SHA512 3a85bb9133427b74e3dcedd7c2f774387dc5b698d6e69923c282b98eb21c0d13a747dd77a0b30b86b73c94d2d525d11c65692bcc8bb83895bcadf99ea6e00ed2
-EBUILD qtile-0.28.1.ebuild 2622 BLAKE2B 693eab081037d8b368495fd7959e04fba1da29a2bbdf3b1c9cc4e340a34252771bcb2626fe6fe7950b2227c7d03f22d4f3e77be74f3f755b3a038d33d39b81c7 SHA512 9c3520cf721e9a6fb940bb82b62f158a2b2c908698ae273d46b47cb03b7266706595c5c333ef9683cc0b9b197e4a4f97b573b4c6bc19a8fb49239d8f09717181
-EBUILD qtile-0.30.0.ebuild 2752 BLAKE2B d91dcdb92f695002c513177d3c8984784a24bec020e60d27a33191f98b6838aaac344d0e39ee69c17d0025e83d93578fdb001399de34622c96fa881adeede97e SHA512 143638bfa31baf05df4073635420ac9419f339b21dbc86c0b755403b474e88228a1c25ff9e839e2306e59612081058f32cfa5fffbcefbe9238f11ddf855317ff
-EBUILD qtile-0.31.0.ebuild 2759 BLAKE2B 8df90794dca02612b82210565b726a06722dafae5c98a9fb16a1eca1458b2a17ff48fd980bcc00a43eb22bc1a6aee6efdf55438fac09374229910df3eee02214 SHA512 5868491172b160be909387a2bb422c8dd561fc83392f1e845eecd20dbb4df57ee4008023cb3b4acc6f38aa66e3f1ee049a9b915c2d9d7454a1874feb46938d49
+EBUILD qtile-0.31.0.ebuild 2758 BLAKE2B 6a4f42eb2c01cb4912c4490a345e6af0565f18b7603d6006097dabe6175d5583848c1a75c5311dbedd721e5aa8611bc472294556232c52b48dc23c701f0f1eaa SHA512 5158c17dc93d8de65326c32cd60f0caedbd494d0f450c2e5983665a95ef468ea79f0242990a42a6c1138d3b5777254de9be7161c0edb0de6b9859c6fa795a8d3
 MISC metadata.xml 422 BLAKE2B 10ddda5d4485b4a3c76ff658a41e2b4ea6004413ea3d2d9d4b088a7a25de36e167ae70505c195467c2401df0396a40e2301cc29a25e7e4097ed20cc6335e8956 SHA512 5f5aeecab841345abe98b87180644e60f8e52a12fc2c354cdd3678d8ad5c8c1ba13790a1bc6fa5662587714f3af9566f6adbdbc355b18d632d0ffa3eb4e83106
diff --git a/x11-wm/qtile/qtile-0.28.1.ebuild b/x11-wm/qtile/qtile-0.28.1.ebuild
deleted file mode 100644
index 7bd2f780e08e..000000000000
--- a/x11-wm/qtile/qtile-0.28.1.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=standalone
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1 pypi virtualx
-
-DESCRIPTION="A full-featured, hackable tiling window manager written in Python"
-HOMEPAGE="
-	https://qtile.org/
-	https://github.com/qtile/qtile/
-	https://pypi.org/project/qtile/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~riscv"
-IUSE="pulseaudio wayland"
-
-RDEPEND="
-	>=dev-python/cairocffi-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/cffi-1.1.0:=[${PYTHON_USEDEP}]
-	dev-python/dbus-next[${PYTHON_USEDEP}]
-	dev-python/pygobject[${PYTHON_USEDEP}]
-	>=dev-python/xcffib-1.4.0[${PYTHON_USEDEP}]
-	x11-libs/cairo[X,xcb(+)]
-	x11-libs/libnotify[introspection]
-	x11-libs/pango
-	pulseaudio? (
-		dev-python/pulsectl-asyncio[${PYTHON_USEDEP}]
-		media-libs/libpulse
-	)
-	wayland? (
-		>=dev-python/pywayland-0.4.17[${PYTHON_USEDEP}]
-		>=dev-python/pywlroots-0.17[${PYTHON_USEDEP}]
-	)
-"
-BDEPEND="
-	dev-python/cffi[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/libcst[${PYTHON_USEDEP}]
-		media-gfx/imagemagick[X]
-		x11-base/xorg-server[xephyr,xvfb]
-	)
-	wayland? (
-		>=dev-python/pywayland-0.4.17[${PYTHON_USEDEP}]
-		>=dev-python/pywlroots-0.17[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	sed -e "s/can_import(\"wlroots.ffi_build\")/$(usex wayland True False)/" \
-		-i setup.py || die
-
-	# some tests expect bin/qtile
-	mkdir bin || die
-	cat >> bin/qtile <<-EOF || die
-		#!/bin/sh
-		exec qtile "\${@}"
-	EOF
-	chmod +x bin/qtile || die
-
-	distutils-r1_python_prepare_all
-}
-
-src_compile() {
-	local -x CFFI_TMPDIR=${T}
-	distutils-r1_src_compile
-}
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# mypy stuff
-		test/test_check.py
-		test/migrate/test_check_migrations.py
-		# TODO: this test clearly requires x11 — so why is wayland
-		# variant being run?
-		'test/backend/x11/test_window.py::test_urgent_hook_fire[wayland-2]'
-	)
-
-	# force usage of built module
-	rm -rf libqtile || die
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x TZ=UTC
-	nonfatal epytest --backend=x11 $(usev wayland '--backend=wayland') ||
-		die -n "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 resources/qtile-wayland.desktop
-
-	exeinto /etc/X11/Sessions
-	newexe "${FILESDIR}"/${PN}-session-r1 ${PN}
-}
diff --git a/x11-wm/qtile/qtile-0.30.0.ebuild b/x11-wm/qtile/qtile-0.30.0.ebuild
deleted file mode 100644
index c9d79701ae90..000000000000
--- a/x11-wm/qtile/qtile-0.30.0.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=standalone
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1 pypi virtualx
-
-DESCRIPTION="A full-featured, hackable tiling window manager written in Python"
-HOMEPAGE="
-	https://qtile.org/
-	https://github.com/qtile/qtile/
-	https://pypi.org/project/qtile/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="pulseaudio wayland"
-
-DEPEND="
-	>=dev-python/cairocffi-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/cffi-1.1.0:=[${PYTHON_USEDEP}]
-"
-RDEPEND="
-	${DEPEND}
-	dev-python/dbus-fast[${PYTHON_USEDEP}]
-	dev-python/pygobject[${PYTHON_USEDEP}]
-	>=dev-python/xcffib-1.4.0[${PYTHON_USEDEP}]
-	x11-libs/cairo[X,xcb(+)]
-	x11-libs/libnotify[introspection]
-	x11-libs/pango
-	pulseaudio? (
-		dev-python/pulsectl-asyncio[${PYTHON_USEDEP}]
-		media-libs/libpulse
-	)
-	wayland? (
-		>=dev-python/pywayland-0.4.17[${PYTHON_USEDEP}]
-		>=dev-python/pywlroots-0.17[${PYTHON_USEDEP}]
-	)
-"
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/isort[${PYTHON_USEDEP}]
-		dev-python/libcst[${PYTHON_USEDEP}]
-		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
-		media-gfx/imagemagick[X]
-		x11-base/xorg-server[xephyr,xvfb]
-	)
-	wayland? (
-		>=dev-python/pywayland-0.4.17[${PYTHON_USEDEP}]
-		>=dev-python/pywlroots-0.17[${PYTHON_USEDEP}]
-	)
-"
-
-: ${EPYTEST_TIMEOUT:=180}
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	sed -e "s/can_import(\"wlroots.ffi_build\")/$(usex wayland True False)/" \
-		-i setup.py || die
-
-	mkdir bin || die
-}
-
-src_compile() {
-	local -x CFFI_TMPDIR=${T}
-	distutils-r1_src_compile
-}
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# mypy stuff
-		test/test_check.py
-		test/migrate/test_check_migrations.py
-		# TODO: this test clearly requires x11 — so why is wayland
-		# variant being run?
-		'test/backend/x11/test_window.py::test_urgent_hook_fire[wayland-2]'
-		# TODO
-		test/test_hook.py::test_net_wm_icon_change
-	)
-
-	# force usage of built module
-	rm -rf libqtile || die
-
-	# some tests expect bin/qtile
-	ln -fs "$(type -P qtile)" bin/qtile || die
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x TZ=UTC
-	nonfatal epytest -p rerunfailures --reruns=5 \
-		--backend=x11 $(usev wayland '--backend=wayland') ||
-		die -n "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 resources/qtile-wayland.desktop
-
-	exeinto /etc/X11/Sessions
-	newexe "${FILESDIR}"/${PN}-session-r1 ${PN}
-}
diff --git a/x11-wm/qtile/qtile-0.31.0.ebuild b/x11-wm/qtile/qtile-0.31.0.ebuild
index 233b693510ae..5d34f5556981 100644
--- a/x11-wm/qtile/qtile-0.31.0.ebuild
+++ b/x11-wm/qtile/qtile-0.31.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv"
+KEYWORDS="amd64 ~riscv"
 IUSE="pulseaudio wayland"
 
 DEPEND="
diff --git a/x11-wm/windowmaker/Manifest b/x11-wm/windowmaker/Manifest
index 72cb844368ef..065b4f71e602 100644
--- a/x11-wm/windowmaker/Manifest
+++ b/x11-wm/windowmaker/Manifest
@@ -1,9 +1,7 @@
 AUX windowmaker-0.95.8-configure_default_search_paths.patch 2599 BLAKE2B 1b76e547a955e45571860e5a5d87ba6bc0de565cb38355d08019a791965170eb0b5d6f215cd1bcb673f93addfde86485847cc7af987a72bfc02324dd56142f4d SHA512 9c12516dd0a2c3e81f7236e2e0f2f8137710e7f1a54ae84d279850d65afb52cb46cada6e84a0ba1f2c92fdfa8d7a0b4630f703e5a5e24664e0fec5ee718f83ae
 AUX wmaker.desktop 206 BLAKE2B 62fe60afde032c1f37c5c818bc37a97d70605e041e539e922f18d56a7582fffd1689762f600fa3c69c5b62dd399867c8c1208d393060e734b38a84540143bf79 SHA512 d1dc99aa29047434e1265c8f93ce366b7c026f27eec8a166904fda1ab4144e0d6142807ac09ba6cbcb86480257893e5553046a0ba1a8e1d6315f23dd8468482b
-DIST WindowMaker-0.95.9.tar.gz 3397167 BLAKE2B ec751fe0139b359933f4388f8dac3f2bf18db1f28fb4cb290d86db1ded9ffdab0cf51b451e28475bc51ee2735cb71c7fd2b01fa7472f5f0f4f1a1e00e1509339 SHA512 ca3ddc863f5b5b782e90f38c0019fe14d1109d6b11d0a3d5d6c728ddc1817747eea92e22e36933d445e72c70661e039ee56efa70f2654657c8980269fd5b4584
 DIST WindowMaker-0.96.0.tar.gz 3443048 BLAKE2B 75fd73cfcf7a57f68120bdc1ac50781bb460da54641b5f42e369008b9066b9183cb7ef60f436627edf8c241ea24ca5c44ef894c1ff0cae64f3a5b2d24df8db93 SHA512 cca1796722803922aa28ea20534f10566b594b7a69eba8c1da6bd1305654583f39ef67f10fd6a550730714e728d876f807aee50968e9392190bb9dc7ffe8409a
 DIST WindowMaker-extra-0.1.tar.gz 238018 BLAKE2B 865b12975d0cdefc1f05a76344b449fdcf8a2841d6a7adf1ab6435857d89cbc4fda22bb62432a1bbba921267380d00a0cded718bfbd344bbb5e6207e59b76096 SHA512 0fe9b3ffc093942db167d8a01e15c0f6741f3a40959d1434ea4f23e7b9d4a9c13935a61eabef9691e5fdfd4e407564caafce15c2d65d66499960a6764a874ab8
-EBUILD windowmaker-0.95.9-r4.ebuild 3185 BLAKE2B a3d347ab62825cfe5acff5b3681663f5f738e942d9bc521715f2f450ad314f8dd31e5120d5b1e37fcc9f2144712b3e0226a83817445376aeafe1a36cc1b7a40d SHA512 5b54c83d1f94ecd5155650780db37f2cb1b98a2122ffa81cb5c0f83cacf334f4cbb612c1f6c6b77a89649b51064e63cfe16ca5b122d8c46a47d8fea2a9f16031
 EBUILD windowmaker-0.96.0.ebuild 3121 BLAKE2B b8f69c511ba37164c87957e42eaa425cdf818f76ddc471accb2c483458a2fcd88e40610a53655a3fefc845f59349253d5ef6133359991e25cfa277c8004bba6e SHA512 b54010c8a2c32f27118c75f3e997a21825c029c13e44e88904125a44a86886f3ced4c2e0f7abce95c10c0ef0c21f57e79261309839a427d17c0b372c6df050d8
 EBUILD windowmaker-9999.ebuild 3039 BLAKE2B 871968913c724ddd9e58de6aa2a6c1f1df11915dd6a8501b7c8ba13d2b945105618600f0ad8a0aec40cf95a603a27357792fe4d5added8964b9540439c16ccfb SHA512 59231772170cb9cd34049199ca083d90ffbf108b80ab0fdce5468bb9235cc4edeed924a57592d2b3a08c996a055560044befaee33fd04732dce83e676e51383d
 MISC metadata.xml 575 BLAKE2B da6b670bef941ab36136768fafdf4dbbe1260ecd77e7879e0573c34ada0267f89fd6d2a321652638d8a724fc92d41d572100e1b68519ff623ffde5263c7179ba SHA512 9d8d3aff1bff83276f0dc0cb6439d4fcc53f00ff0c0b265aff75fee9238b5061738960b30aef0091b86699e53dc98996a9f86c713e144e6fc4db2909b3490a18
diff --git a/x11-wm/windowmaker/windowmaker-0.95.9-r4.ebuild b/x11-wm/windowmaker/windowmaker-0.95.9-r4.ebuild
deleted file mode 100644
index a3cb69c8675c..000000000000
--- a/x11-wm/windowmaker/windowmaker-0.95.9-r4.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools desktop
-
-DESCRIPTION="The fast and light GNUstep window manager"
-HOMEPAGE="https://www.windowmaker.org/"
-SRC_URI="https://windowmaker.org/pub/source/release/${P/windowm/WindowM}.tar.gz
-	https://www.windowmaker.org/pub/source/release/WindowMaker-extra-0.1.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 ~x64-solaris"
-
-DEPEND="media-libs/fontconfig
-	>=x11-libs/libXft-2.1.0
-	x11-libs/libXmu
-	x11-libs/libXpm
-	x11-libs/libXt
-	x11-libs/libXv
-	gif? ( >=media-libs/giflib-4.1.0-r3 )
-	imagemagick? ( >=media-gfx/imagemagick-7:0= )
-	jpeg? ( media-libs/libjpeg-turbo:= )
-	nls? ( virtual/libintl )
-	png? ( media-libs/libpng:= )
-	tiff? ( media-libs/tiff:= )
-	webp? ( media-libs/libwebp:= )
-	xinerama? ( x11-libs/libXinerama )
-	xrandr? ( x11-libs/libXrandr )"
-RDEPEND="${DEPEND}"
-BDEPEND="nls? ( >=sys-devel/gettext-0.10.39 )"
-
-S=${WORKDIR}/${P/windowm/WindowM}
-
-DOCS=( AUTHORS BUGFORM BUGS ChangeLog INSTALL-WMAKER FAQ
-	NEWS README README.definable-cursor README.i18n TODO )
-PATCHES=( "${FILESDIR}"/${PN}-0.95.8-configure_default_search_paths.patch )
-
-src_prepare() {
-	# Fix some paths
-	for file in WindowMaker/*menu* util/wmgenmenu.c; do
-		if [[ -r $file ]] ; then
-			sed -i -e "s|/usr/local/GNUstep/Applications/WPrefs.app|${EPREFIX}/usr/bin/|g;" "$file" || die
-			sed -i -e "s|/usr/local/share/WindowMaker|${EPREFIX}/usr/share/WindowMaker|g;" "$file" || die
-			sed -i -e "s|/opt/share/WindowMaker|${EPREFIX}/usr/share/WindowMaker|g;" "$file" || die
-		fi
-	done
-
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local -a myeconfargs=(
-		# image format types
-		$(use_enable gif)
-		$(use_enable imagemagick magick)
-		$(use_enable jpeg)
-		$(use_enable png)
-		$(use_enable tiff)
-		$(use_enable webp)
-		$(use_enable xpm)
-
-		# optional X capabilities
-		$(use_enable modelock)
-		$(use_enable xinerama)
-		$(use_enable xrandr randr)
-	)
-
-	# NLS depends on whether LINGUAS is empty
-	if use nls; then
-		myeconfargs+=( LINGUAS="${LINGUAS:-$(cd po; x=(*.po); echo ${x[*]%.po})}" )
-	else
-		myeconfargs+=( LINGUAS= )
-	fi
-
-	econf \
-		--localedir="${EPREFIX}"/usr/share/locale \
-		--sysconfdir="${EPREFIX}"/etc/X11 \
-		--disable-static \
-		--enable-usermenu \
-		--with-{incs,libs}-from= \
-		--with-pixmapdir="${EPREFIX}"/usr/share/pixmaps \
-		--with-x \
-		"${myeconfargs[@]}"
-
-	pushd ../WindowMaker-extra-0.1 &>/dev/null || die
-	econf
-}
-
-src_compile() {
-	emake
-
-	# WindowMaker Extra Package (themes and icons)
-	emake -C ../WindowMaker-extra-0.1
-}
-
-src_install() {
-	default
-
-	# WindowMaker Extra
-	emake -C ../WindowMaker-extra-0.1 DESTDIR="${D}" install
-	newdoc ../WindowMaker-extra-0.1/README README.extra
-
-	# create wmaker session shell script
-	echo "#!/usr/bin/env bash" > wmaker
-	echo "${EPREFIX}/usr/bin/wmaker" >> wmaker
-	exeinto /etc/X11/Sessions/
-	doexe wmaker
-
-	insinto /usr/share/xsessions
-	doins "${FILESDIR}"/wmaker.desktop
-	make_desktop_entry /usr/bin/wmaker
-
-	find "${ED}" -type f -name '*.la' -delete || die
-}