193 files changed, 947 insertions, 2092 deletions
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 5bed2e32ec64..8defb8d5e856 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/alacarte/Manifest b/x11-misc/alacarte/Manifest
index 28a8a30c24aa..6120742eacc1 100644
--- a/x11-misc/alacarte/Manifest
+++ b/x11-misc/alacarte/Manifest
@@ -1,5 +1,5 @@
 DIST alacarte-3.50.0.tar.xz 255404 BLAKE2B c22aeb83f707e4860c9a84311da2bf87e79db8b8859b8c45d5c1d0f6ead896f15b83cd112ac248fbb83b2bf839afbc90d2a24685c767ebaaaa850dfab8b26d35 SHA512 12578c35e8e68c83b46d81edc59444a92dc672a4a91bb4b443bbc0b26d94a3badf5598602dfc62dfbbabce7e3392c081c39055a201d60d4813b23e061014ee17
 DIST alacarte-3.52.0.tar.xz 255700 BLAKE2B 8a59c5ccd1ba8ee892aee39625ecd56c4cf9500b104f943775bef613a4d8f6ef50cdce1d436a1f2c95268864ab43a72f8e182a2e15f47b3980193c887e91f8c2 SHA512 711166b1d772483be1ca3044f9402ec62dd6bb9c09b71b09944886bac91a72fe9838a60a4cf24649dce33148844b586446c17954129c6bc7aaa3096ba01e1463
-EBUILD alacarte-3.50.0.ebuild 763 BLAKE2B ddadbb3cac1e53a25aae21dcf20d7e96e15d9413d3b0952a4a6f2a27ea3d4725215356f6ebdb1cf4cc3ba7d614ec42009556ae805de82b27e8eb39ff8fa6d35b SHA512 229338f52eb2697a68f1c47c7290d66fb6a5c2cc768a94ffa9db21faf5e2fea584c02d09e66dbb70eaccd7971e64e29f14a07c2dc1d24b59825b9b44e4fba306
-EBUILD alacarte-3.52.0.ebuild 765 BLAKE2B 67ad0f6ffabb03c9bb1d195166ad958ad952e765cbc2e357b7563e171f3abb4cf138271c381ec2265f4be8c77885216589e286dc48adfd70e97019d4924842a6 SHA512 5c24956afac2f70e84d2188a65ceb621537e090f09f2b801cac4e2b5e32110a1a1b9704b0a790e1b8ff4cdb4ab30aad5888f83c2aeea367f2eedf1126d4ebc85
+EBUILD alacarte-3.50.0.ebuild 757 BLAKE2B e0b30682157fa068702c6bca5ae988dae61068c795acfd39fd8efd52a76bd241a1daf74dc8704a80910f3ee6654b4a7eb982101634333fd40b4554a4d6c26e08 SHA512 190825a6f40ffd86f28f25c0029aa327f9426ca5e8607f0f9a3fc937828213e8ebe40f44a0e29799dd3274f7de1ee2a697b2effc78a44e283aa83306529d6eb0
+EBUILD alacarte-3.52.0.ebuild 759 BLAKE2B ad9cdb2f597243644f9213756eff08cbfacfe6f46195346822a366c38ef1d426ec8d04de73206ca127cb5d0bf6e9e89c49a1a934335923907817fbfd88e0dd02 SHA512 2235f911a0307e049ac4f25d63aef583794aacdd96d885d50ba5b0dc179a269b151e6bd38e3f731551a483a181b7d13a88ad03362d134189fe9f3f7589e73db7
 MISC metadata.xml 349 BLAKE2B ae2cfe74f06d4c6aa4143f187cd3ed6934e6e131e4a997330c9d6ca11a2cd45b2835ef2b1bfab8570e5554fcce81237b025fc0683a74eaf62076e7c4f2cd2914 SHA512 7426942c020db80792d9d382763a005dc0956e6f7c02bb0e3a58e56cb69c37ce643da77524ac7273b8302bb0efb2e2c80dbb621d06809a7091395756e0f0cd06
diff --git a/x11-misc/alacarte/alacarte-3.50.0.ebuild b/x11-misc/alacarte/alacarte-3.50.0.ebuild
index 40f4d74498a9..adaff6e9295b 100644
--- a/x11-misc/alacarte/alacarte-3.50.0.ebuild
+++ b/x11-misc/alacarte/alacarte-3.50.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/alacarte"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DEPEND="
diff --git a/x11-misc/alacarte/alacarte-3.52.0.ebuild b/x11-misc/alacarte/alacarte-3.52.0.ebuild
index d6f6a3bfb344..9204609f05b5 100644
--- a/x11-misc/alacarte/alacarte-3.52.0.ebuild
+++ b/x11-misc/alacarte/alacarte-3.52.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/alacarte"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DEPEND="
diff --git a/x11-misc/appmenu-gtk-module/Manifest b/x11-misc/appmenu-gtk-module/Manifest
index 20ad692fb615..50b2bf2395f6 100644
--- a/x11-misc/appmenu-gtk-module/Manifest
+++ b/x11-misc/appmenu-gtk-module/Manifest
@@ -2,6 +2,11 @@ AUX appmenu-gtk-module 239 BLAKE2B c5f055154136c6ba862ce9f74edf898fd9baa5b699fe1
 AUX appmenu-gtk-module-0.7.6-fix-pkgconfig.patch 309 BLAKE2B 960371a9722ebd715fa16a72cab960225f99d5a68d6b1e4ae6cf8113530769497b218708c990221aa558544778315c43968819ea968ba1f29d07a97257eef07e SHA512 8a08bccf369b87f261a4edfbeb1f942c3ea9c6efda19ca0a6490f91405b920516f0d8d8fd28172b2abf4d1d9ee2e16fab4c490653545239c82f8ee1e1cb7fee9
 AUX appmenu-gtk-module-0.7.6-no-automagic-gtk.patch 951 BLAKE2B 5dd2dbfe6464bf323b4b66d9a1f87ffc8b417991991529631d03ebb9253b999718e90a28c85b6e3573c4a7e0597f05cfdfbda6c6900197266253dad86452adb5 SHA512 5d2a8bf395d8151f06f9b42d0197d3c7b606161343ae166430fefa73f5170b7a61b15d34ff7bf7d8aa6602609cb612c98eba11067aac29ce06830f9e05970e94
 AUX appmenu-gtk-module-0.7.6-no-automagic-unitdir.patch 2164 BLAKE2B f89af2da72c5f41eec2eeba1d2ea7a59e4f0b7e2aaf17c3dca07b8cd24e9a56ef8ba156abdd888a8051fc72e7369f9104389db4243132b510de0e6aaf412ef90 SHA512 63beeef3e2677a013aa46486baae8692bdc34c31ccd24f8eb2c5a18610025da5e77b50bdbbee6d8a6a34f3ee8e8595fbcc0df9ced417cd2a281b08f3947eb038
+AUX appmenu-gtk-module-24.05-fix-pkgconfig.patch 239 BLAKE2B db889c5cbf14a4bfec7a4b9f277df17c5fa852059610bb1880e94117f506787c7bba0b967c340abd545e31f99bce6d85e006c342d026af0026eb34b3f6cae754 SHA512 3fc9c9b1ea58e06c3f480daedef3e3973c660ca4a58f2ef9834851aa70161b4b0d41ab857b04b945f76d330810694458bd38fddb686a7e4a8cd19d676a2a42f6
+AUX appmenu-gtk-module-24.05-no-automagic-unitdir.patch 2164 BLAKE2B 921be10a8453a3e6ad16fd805946355c958c936ebe842b28a14086fe3368acab10e20409129bf0add083431a9c48433b21bf47894aec08409c748ba8ac242ef6 SHA512 3f95865802e7ad631c4742a2bd056c9c4202171b75a3ee0f169629f77d03a2d43e769df4a976c02aa4b174c3f3b6c48e689f1e55b31f6bf2015cae67f40dfb55
+AUX appmenu-gtk-module-r1 233 BLAKE2B b9298dae1a4e517ec50d558bbb368729e5343719333223592fd57bee810205a035c421f549ba5471b95e06b88328c7cbdb2a4dce852fd220f58f24b6a1f9a357 SHA512 b618046b2e0a5d4d806bdb9772fd486370bde2611c5810eb8f37481112566df084cf7a1e28e960ff9dcdfe098aa3834e48f93cf39584d2932c66c1577674fbcf
 DIST appmenu-gtk-module-0.7.6.tar.xz 41212 BLAKE2B 7d37107e36502e44a38a1dc4e7ab02a761ec368b791182b223a4ae2631bad2eb52d9fec913ae0274f95f15a1cfbefb47f4807f1e83e8e3985fd4af7c6f0d075b SHA512 6efad2a13a04ae0a2a5e87fdc62eb7a37c8c85051339a3774fd8b579eea97b4633b10e064325205b3f10597530bab003deae24986c3175429a899c292e8786d5
+DIST appmenu-gtk-module-24.05.tar.xz 41364 BLAKE2B 45593cad5431f1b12fd7bc710399f7be7ff381d5757672c90db42187197de67b80f4436fc402e59abfa164d6d659557fb5a57737020d4cda361a2904154e9878 SHA512 0b233e56663f1e46f35b8edda5ea551f9569f6ffc20730fc62fcc090cf14a4032d58c7b8f03f14b29e9433f8ccd9fc89e3de7be50141fba5f85f5bf219517fa7
 EBUILD appmenu-gtk-module-0.7.6.ebuild 1169 BLAKE2B c5a71fd8d5ddd40121ab65538bb20d4634aa0438ecb155e91b59184018f6486ae00ee4665a86e44559711259fbef488a275e1fd6188b06a0c8d1a76d9172add9 SHA512 32ce7a2770a393e8f5d35588db4d7721849f8c544b6a7a65c331e516e889b28e8c2c342bfe261b44ef4a58c4492d51c80dc02f55324a57faecaf98a51ab49a9f
+EBUILD appmenu-gtk-module-24.05-r2.ebuild 1946 BLAKE2B 48b628df7fa834d679ea9d9a0d399af8072f0362019be831337842a117495c07326c3c0f47f503bb2d0824acfadc17435f7a918caddee876a105612f4b5a10f2 SHA512 c28fb6da8001dea3583627d33d834c68d41ba656ba71a5bbcd657290db23778492e9e606d445d2d24f64a062e7a7c0ceef5b9b9d185010f1916f9e9b829fb9cd
 MISC metadata.xml 417 BLAKE2B 6c9ebfbe4b02203037d8e79618f6423b842a4cd8906db9b6378b1588554f1c8bcf10b5e8d809b9e59abddae4727d5e28523630484fe528b2294f685ec3c8434f SHA512 bac77b5251306f7538a406105a7abca2c98ec9021a578d40c7cb2788f66af627c01c88b79576675a9a5adf5de5d634b5f5f28c033b4c9bab9d08936976692eff
diff --git a/x11-misc/appmenu-gtk-module/appmenu-gtk-module-24.05-r2.ebuild b/x11-misc/appmenu-gtk-module/appmenu-gtk-module-24.05-r2.ebuild
new file mode 100644
index 000000000000..d4570fc72a9d
--- /dev/null
+++ b/x11-misc/appmenu-gtk-module/appmenu-gtk-module-24.05-r2.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit edo gnome2-utils flag-o-matic meson systemd virtualx
+
+DESCRIPTION="Application menu module for GTK"
+HOMEPAGE="https://gitlab.com/vala-panel-project/vala-panel-appmenu"
+SRC_URI="https://gitlab.com/vala-panel-project/vala-panel-appmenu/uploads/b5ace7bf5bd6e3ec3b20e98befb5da39/${P}.tar.xz"
+# 24.05 really is a different release to 24.02 (diffed tarballs to check),
+# but it has the wrong version in the directory name.
+S="${WORKDIR}"/${PN}-24.02
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
+IUSE="gtk2 test wayland"
+# Tests are manual and hang in the ebuild
+RESTRICT="!test? ( test ) test"
+
+RDEPEND="
+	dev-libs/glib[dbus]
+	>=x11-libs/gtk+-3.22.0:3[wayland?]
+	gtk2? ( >=x11-libs/gtk+-2.24.0:2 )
+"
+DEPEND="
+	${RDEPEND}
+	wayland? ( dev-libs/wayland )
+"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.7.6-no-automagic-gtk.patch"
+	"${FILESDIR}/${PN}-24.05-no-automagic-unitdir.patch"
+	"${FILESDIR}/${PN}-24.05-fix-pkgconfig.patch"
+)
+
+src_configure() {
+	# defang automagic dependencies, bug #785619
+	use wayland || append-cflags -DGENTOO_GTK_HIDE_WAYLAND
+
+	# outputs [ '2', '3' ] OR [ '3' ]
+	local gtks="[$(usex gtk2 " '2'," '') '3' ]"
+
+	local emesonargs=(
+		-Dgtk="${gtks}"
+		-Duserunitdir="$(systemd_get_userunitdir)"
+		$(meson_use test tests)
+	)
+
+	meson_src_configure
+}
+
+my_test() {
+	cd "${BUILD_DIR}"/tests || die
+
+	local name
+	for name in hello radio tester ; do
+		edo ./${name}
+	done
+}
+
+src_test() {
+	virtx my_test
+}
+
+src_install() {
+	meson_src_install
+
+	mv "${ED}"/usr/share/doc/appmenu-gtk-module/* "${ED}"/usr/share/doc/${PF} || die
+	rmdir "${ED}"/usr/share/doc/appmenu-gtk-module || die
+
+	rm "${ED}"/usr/share/licenses/appmenu-gtk-module/LICENSE || die
+
+	exeinto /etc/X11/xinit/xinitrc.d
+	newexe "${FILESDIR}"/${PN}-r1 85-${PN}
+}
+
+pkg_postinst() {
+	gnome2_schemas_update
+}
diff --git a/x11-misc/appmenu-gtk-module/files/appmenu-gtk-module-24.05-fix-pkgconfig.patch b/x11-misc/appmenu-gtk-module/files/appmenu-gtk-module-24.05-fix-pkgconfig.patch
new file mode 100644
index 000000000000..76455dd55655
--- /dev/null
+++ b/x11-misc/appmenu-gtk-module/files/appmenu-gtk-module-24.05-fix-pkgconfig.patch
@@ -0,0 +1,10 @@
+--- a/meson.build
++++ b/meson.build
+@@ -1,6 +1,6 @@
+ project('appmenu-gtk-module', 'c',
+ 	meson_version: '>=0.61.0',
+-	version: '24.02',
++	version: '24.05',
+ 	license: ['LGPL-3.0-or-later'],
+     default_options: [
+         'c_std=gnu11',
diff --git a/x11-misc/appmenu-gtk-module/files/appmenu-gtk-module-24.05-no-automagic-unitdir.patch b/x11-misc/appmenu-gtk-module/files/appmenu-gtk-module-24.05-no-automagic-unitdir.patch
new file mode 100644
index 000000000000..007462e767d8
--- /dev/null
+++ b/x11-misc/appmenu-gtk-module/files/appmenu-gtk-module-24.05-no-automagic-unitdir.patch
@@ -0,0 +1,56 @@
+From c60d530583a8bd07aea22c4f3f3aa8b0aaf271c1 Mon Sep 17 00:00:00 2001
+From: Georgy Yakovlev <gyakovlev@gentoo.org>
+Date: Tue, 4 Jan 2022 19:06:37 -0800
+Subject: [PATCH] appmenu-gtk-module: add userunitdir option
+
+allows setting systemd unit on systemd-less systems
+
+Signed-off-by: Georgy Yakovlev <gyakovlev@gentoo.org>
+---
+ .../appmenu-gtk-module/data/meson.build       | 19 ++++++++++++-------
+ .../appmenu-gtk-module/meson_options.txt      |  1 +
+ 2 files changed, 13 insertions(+), 7 deletions(-)
+
+diff --git a/subprojects/appmenu-gtk-module/data/meson.build b/subprojects/appmenu-gtk-module/data/meson.build
+index 8378965..d0d1717 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -2,14 +2,19 @@ install_data([
+     'org.appmenu.gtk-module.gschema.xml'
+ ], install_dir: schema_dir)
+ 
++userunitdir = get_option('userunitdir')
+ systemd = dependency('systemd', required: false)
+ 
+-if systemd.found()
++if userunitdir == ''
++  if systemd.found()
+     userunitdir = systemd.get_variable(pkgconfig:'systemduserunitdir')
+-    configure_file(
+-        input: 'appmenu-gtk-module.service.in',
+-        output: 'appmenu-gtk-module.service',
+-        install_dir: userunitdir,
+-        configuration: {'CMAKE_INSTALL_FULL_BINDIR': join_paths(prefix,get_option('bindir'))}
+-    )
++  else
++    userunitdir = '/usr/lib/systemd/user'
++  endif
+ endif
++configure_file(
++  input: 'appmenu-gtk-module.service.in',
++  output: 'appmenu-gtk-module.service',
++  install_dir: userunitdir,
++  configuration: {'CMAKE_INSTALL_FULL_BINDIR': join_paths(prefix,get_option('bindir'))}
++)
+diff --git a/subprojects/appmenu-gtk-module/meson_options.txt b/subprojects/appmenu-gtk-module/meson_options.txt
+index f93877a..ec0b3a6 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -1,3 +1,4 @@
+ option('gtk', type: 'array', choices : ['2','3'],  value: ['2','3'], description: 'Supported GTK versions')
+ option('tests', type : 'boolean', value : false, description: 'Parser tests')
+ option('gtk_doc', type: 'boolean', value: false, description: 'Build API reference')
++option('userunitdir', type: 'string', description: 'Installation path for user unit file (optional)')
+-- 
+2.34.1
+
diff --git a/x11-misc/appmenu-gtk-module/files/appmenu-gtk-module-r1 b/x11-misc/appmenu-gtk-module/files/appmenu-gtk-module-r1
new file mode 100644
index 000000000000..328f390af48b
--- /dev/null
+++ b/x11-misc/appmenu-gtk-module/files/appmenu-gtk-module-r1
@@ -0,0 +1,13 @@
+case :$GTK_MODULES: in
+	*:appmenu-gtk-module:*)
+		;;
+	*)
+		GTK_MODULES=${GTK_MODULES}${GTK_MODULES:+:}appmenu-gtk-module
+esac
+
+if [ -z "$UBUNTU_MENUPROXY" ]; then
+    UBUNTU_MENUPROXY=1
+fi
+
+export GTK_MODULES
+export UBUNTU_MENUPROXY
diff --git a/x11-misc/autorandr/Manifest b/x11-misc/autorandr/Manifest
index b379ea927c98..dc799080924c 100644
--- a/x11-misc/autorandr/Manifest
+++ b/x11-misc/autorandr/Manifest
@@ -1,6 +1,4 @@
-DIST autorandr-1.14.tar.gz 49234 BLAKE2B 3ff149d30b023bc54d83c4be1f81f67204d20d3e6a7a43e15009c1c4f1180fa920789ce84ae56f13946a9cec1f72bc7adb27be3c58ca8532235d0457b1f5aa92 SHA512 dc1ee4c28b06dde4a721fe564734e7a79c1c843986f7c84307ea60f19c2237ba53d1bcd2202e377363e7e0a5bf5dea95bea4490b3fa5ec5fa6738114646a502d
 DIST autorandr-1.15.tar.gz 49352 BLAKE2B b7200eb7a77230076f1a9f8b1a21be883ae363cc41cff7f1191e034359cc8ebb52e9dd19dd5f2e415a34b9a3a89fda3d0d43a946b2f3401de0d279fb9d5ba1a2 SHA512 2837348b755f5c4b30ad2b68e191e1969a467401cf32dda495dd19867e391f8b8b4a9c0b4958ef33f75c71aace46686995e27bab805e1e40cc4a1af44e9f0405
-EBUILD autorandr-1.14.ebuild 1508 BLAKE2B 227d2a419f76b6dab07f9820068f79462c474e51a6989804ad9248ad68acee78234c9e0567e422951dfc765c5c497561b7252b4bd9bd57183d16555b57609ffb SHA512 a9ca635ce495a10023919f016068c46798f455bb244dea53fb477d6b349166ff80ecb0e7d0da653884ea73228264076f531cc97e097c845a7698a9cc71018c23
-EBUILD autorandr-1.15.ebuild 1504 BLAKE2B 16591fcb2337e4e17984380786d85e240a8df2496f5eda31b421178a76311169d3466dbf13575dafbae8651deb1ce7e3cea9d3b47fd664e90da84d15a9a96112 SHA512 08a9145655e0044b2b0b5c0e5a2db54cab197b1489234bc157d03d2d179cbd5846438041bcad3cd775070e5e2404a88b01fbf8dab859539901b58fdf8027fae6
-EBUILD autorandr-9999.ebuild 1505 BLAKE2B bef056ebbb659c97915085e12903f92a9d9400720fa06a8b6bae8e45775886409fadecb5f353e146d03eaed02c2ba07b38dba307158528ef58fea196af9c07b2 SHA512 51fc370e0a5f36f64268a5332597fdd25b0f5c4fa2eaaebb786c60019b82dc9f7185e5e2defc1bbaa7ec92b5aad1d6edbd91b5984a1e7f467acfcc558a62e6ae
+EBUILD autorandr-1.15-r1.ebuild 1523 BLAKE2B 399040fc411bc7400ea0012f2b1687c883494de1a529457be8b3e67bf1e4ce901d412502034e61dd036886df417b8cefaf4eee37032ce8b2a313ca4114afaa21 SHA512 632ac1b280469beb292ffb34f070e91c3916541b76d6b48f549603553dbfcc22c91af944c420699f546a9e2279097c3154363fe461f88b7858c40d1d3fbbdeaf
+EBUILD autorandr-9999.ebuild 1524 BLAKE2B 7dc62273585f5e7749a2df55acf844e8b954fc3e9f95c45854d82a8b32c893b0d37bf522319ec1dac7ce8398834b7853cf35632b46e29985b9712ba88845fcdd SHA512 5f650786734286fbb215177c7d237980e49b0c39368cb1c09e0b449cff01e0d1c15d176759c750c2f2e84aea6907928ead3e4aa83107927865272daf58b5aa67
 MISC metadata.xml 450 BLAKE2B bb36360893882faa3306ce69953a4c699e613dd5608bd379c3a179cd68d79ce42171c01611fb08269b9521eca61c67825ea1d52711a0ac67fa99f919350b54bd SHA512 d676779669537dff4c0964d48996b3cdcbc1b6d7f3f00412b48614f42b86b6acdea05b646d3d9d048db6b19e0733bbc1281ed8dbea7d4ea36f19f14c5a055d29
diff --git a/x11-misc/autorandr/autorandr-1.14.ebuild b/x11-misc/autorandr/autorandr-1.14.ebuild
deleted file mode 100644
index 40586032d8fd..000000000000
--- a/x11-misc/autorandr/autorandr-1.14.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit bash-completion-r1 distutils-r1 systemd udev
-
-if [[ "${PV}" = "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/phillipberndt/${PN}.git"
-else
-	SRC_URI="https://github.com/phillipberndt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~x86"
-fi
-
-DESCRIPTION="Automatically select a display configuration based on connected devices"
-HOMEPAGE="https://github.com/phillipberndt/autorandr"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="launcher systemd udev"
-
-RDEPEND="
-	x11-apps/xrandr
-	launcher? ( x11-libs/libxcb )
-	udev? ( virtual/udev )
-"
-DEPEND="${RDEPEND}"
-# desktop-file-util: uses desktop-file-edit in Makefile
-BDEPEND="
-	dev-util/desktop-file-utils
-	virtual/pkgconfig
-"
-
-src_compile() {
-	distutils-r1_src_compile
-
-	if use launcher; then
-		emake contrib/autorandr_launcher/autorandr-launcher
-	fi
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	doman autorandr.1
-
-	local targets=(
-		autostart_config
-		bash_completion
-		$(usev launcher)
-		$(usev systemd)
-		$(usev udev)
-	)
-
-	emake DESTDIR="${D}" \
-		  BASH_COMPLETIONS_DIR="$(get_bashcompdir)" \
-		  SYSTEMD_UNIT_DIR="$(systemd_get_systemunitdir)" \
-		  UDEV_RULES_DIR="$(get_udevdir)"/rules.d \
-		  $(printf "install_%s " "${targets[@]}")
-}
-
-pkg_postinst() {
-	if use udev; then
-		udev_reload
-	fi
-}
-
-pkg_postrm() {
-	if use udev; then
-		udev_reload
-	fi
-}
diff --git a/x11-misc/autorandr/autorandr-1.15.ebuild b/x11-misc/autorandr/autorandr-1.15-r1.ebuild
index fd13373441f5..e8a9f9a8e58a 100644
--- a/x11-misc/autorandr/autorandr-1.15.ebuild
+++ b/x11-misc/autorandr/autorandr-1.15-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 
 inherit bash-completion-r1 distutils-r1 systemd udev
 
@@ -58,7 +58,7 @@ src_install() {
 
 	emake DESTDIR="${D}" \
 		  BASH_COMPLETIONS_DIR="$(get_bashcompdir)" \
-		  SYSTEMD_UNIT_DIR="$(systemd_get_systemunitdir)" \
+		  SYSTEMD_UNIT_DIR=$(usex systemd "$(systemd_get_systemunitdir)" "") \
 		  UDEV_RULES_DIR="$(get_udevdir)"/rules.d \
 		  $(printf "install_%s " "${targets[@]}")
 }
diff --git a/x11-misc/autorandr/autorandr-9999.ebuild b/x11-misc/autorandr/autorandr-9999.ebuild
index 0011c189d5ca..73aa409173d5 100644
--- a/x11-misc/autorandr/autorandr-9999.ebuild
+++ b/x11-misc/autorandr/autorandr-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 
 inherit bash-completion-r1 distutils-r1 systemd udev
 
@@ -58,7 +58,7 @@ src_install() {
 
 	emake DESTDIR="${D}" \
 		  BASH_COMPLETIONS_DIR="$(get_bashcompdir)" \
-		  SYSTEMD_UNIT_DIR="$(systemd_get_systemunitdir)" \
+		  SYSTEMD_UNIT_DIR=$(usex systemd "$(systemd_get_systemunitdir)" "") \
 		  UDEV_RULES_DIR="$(get_udevdir)"/rules.d \
 		  $(printf "install_%s " "${targets[@]}")
 }
diff --git a/x11-misc/clipmenu/Manifest b/x11-misc/clipmenu/Manifest
index 9396a39a9519..e3548d10b393 100644
--- a/x11-misc/clipmenu/Manifest
+++ b/x11-misc/clipmenu/Manifest
@@ -1,3 +1,3 @@
 DIST clipmenu-6.2.0.tar.gz 9019 BLAKE2B 2dddd900483656a38b2335f994a46302af797b0f47509b0bd2c1a302e1c27729cd80091a4c8bfd587844f7ee8c271742aea668910553d9a4c54595d18e4f1ec7 SHA512 adfd649a120264552e2c05314ae2ad039055308f77d620dbb3fc206e4244a6f1f2e5ed4a7e86fd547a78692aebaec1761528e10408d838f80def99959ef58295
-EBUILD clipmenu-6.2.0-r1.ebuild 1242 BLAKE2B 39d9c6cc107d64a23610f207d9f774a484eb97fd504cd1b79a7fe25ea83efae06bfcf47e3c9d7644f8158ea7e4191df830930485631f113b7bfc8e3e17fccdba SHA512 bb8a8274214199eeb34dcd13cd808a45d0720cff03cc7adfae4d13bd6f3f5978fcbcd5c9f78ef77d75a9d024c79e5f44a3ff910c3837eb0cb02fc760baa0c73c
-MISC metadata.xml 578 BLAKE2B e4a566dcb4257903154de0991b2186ce0674eb2d60049639dcadd0357cb62c6d352665b2065033f2b644f3ed5bfd33b88eef9e1b4933613bcf58b37f50500a06 SHA512 7285c98a640636990f263b8229cbbe72b507efedde7b3067f69e8c4012d88ee84fbd5979eaaac7eb67cb7da876dc5f1bbf8bbdfa36a84b8e8846258c0841c4ef
+EBUILD clipmenu-6.2.0-r1.ebuild 1766 BLAKE2B 6b038b078d7a5b43e878578f595faca32f0d433ca95c1d423bf64bc01983fe5debc0bbb6a8e5c67aa1bf225dd145f62db02e7b0aef7b1a9c54f03b3dd2870d6e SHA512 f69f192b9aa00cf9b058c812fae534bc5405d0ccb1b6312858242016de02e80e957884014ba928906cead38ecb31a41e2672cac85000f0825e271df08ab25286
+MISC metadata.xml 657 BLAKE2B 4e7646e67838f00c65e85cd51f62edb7816b084413d8680ca5fe5af707d5e5f712c932b43ebb5d73e852492aab7429316d1cb07a571cba2fd09b2462ea44b54d SHA512 f08514f851b354ba0e015df2e5a2e1ee9a39517ced308e0b58119b1aa10af30844041bd4f4bead460db7c9b8585630b581381c29dbc20415a371b2f695ce4fb6
diff --git a/x11-misc/clipmenu/clipmenu-6.2.0-r1.ebuild b/x11-misc/clipmenu/clipmenu-6.2.0-r1.ebuild
index a3194cfe7320..939f15accb56 100644
--- a/x11-misc/clipmenu/clipmenu-6.2.0-r1.ebuild
+++ b/x11-misc/clipmenu/clipmenu-6.2.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2020-2021 Gentoo Authors
+# Copyright 2020-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit systemd
+inherit optfeature systemd
 
 DESCRIPTION="Clipboard management"
 HOMEPAGE="https://github.com/cdown/clipmenu"
@@ -49,7 +49,20 @@ src_install() {
 }
 
 pkg_postinst() {
+	optfeature "ignoring specific windows via CM_IGNORE_WINDOW" x11-misc/xdotool
+
+	if systemd_is_booted || has_version sys-apps/systemd; then
+		einfo ""
+		einfo "Make sure to import \$DISPLAY when using the systemd unit for clipmenud"
+		einfo "without a desktop environment. Preferably check /etc/X11/xinit/xinitrc{,.d}"
+		einfo "for relevant examples, or at least include the following in your ~/.xinitrc"
+		einfo "before clipmenud:"
+		einfo ""
+		einfo "systemctl --user import-environment DISPLAY"
+	fi
+
 	if ! use dmenu && ! use fzf && ! use rofi ; then
+		ewarn ""
 		ewarn "Clipmenu has been installed without a launcher."
 		ewarn "You will need to set \$CM_LAUNCHER to a dmenu-compatible app for clipmenu to work."
 		ewarn "Please refer to the documents for more info."
diff --git a/x11-misc/clipmenu/metadata.xml b/x11-misc/clipmenu/metadata.xml
index ad77c07f77a8..40a619301ac7 100644
--- a/x11-misc/clipmenu/metadata.xml
+++ b/x11-misc/clipmenu/metadata.xml
@@ -9,6 +9,9 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">cdown/clipmenu</remote-id>
+	</upstream>
 	<use>
 		<flag name="dmenu">Use dmenu as default launcher</flag>
 		<flag name="rofi">Use rofi as default launcher</flag>
diff --git a/x11-misc/colord/Manifest b/x11-misc/colord/Manifest
index 880da29ef660..04784dc345d4 100644
--- a/x11-misc/colord/Manifest
+++ b/x11-misc/colord/Manifest
@@ -1,4 +1,4 @@
 AUX colord-1.4.7-systemd-permissions.patch 2163 BLAKE2B 72989d782458153d7bb8356d9c7c8179b61e2be31b59d73fe49d9a0c6bfcfc0d18dfe021547eea1ee2cbf54dce9d98b875a5adf9ea23ac8cc5b757d98afac16a SHA512 3aecb442c68669ad0b297d621c5ea845652b021585b3fa6554eba5ec7ad80f149a4cef5f081ae7f029819c919453e7f34e64907fb8015d023c338cc8d5896d8e
 DIST colord-1.4.7.tar.xz 1799168 BLAKE2B f4434ec817fc2afc1ade144f533d2c3b98117356677b5962ff95b566a8c66b6b8ce95ec8f76b3ae849a6468000dc08b8f8fc207c2cc9c85a966157fb1612078e SHA512 d8a23899c038af980f1b257eace68b682c3f5592d19e2ae1044da749371694052c00e58e4754ebb6ee2f7900b0ef44c01be5fcf857294813c07af94ffbf6d0be
-EBUILD colord-1.4.7-r1.ebuild 3505 BLAKE2B 668be20a1519ca1bbe5ef7ce730fb83f30f74080f34772555a63ba46f3dca409e057dfa9ac683e1711618ada23a00ae2e9fa8d6f838d33da84c17a0b882f695f SHA512 fdcf6e2fa274f5e5f12e6144e004117f44f9297ab6e9d31f6ac79eca51e7db565dea37236bbe3749a8be805b488c01d67c4f42d9d8ab8ce59b6b0c67f4896e2a
+EBUILD colord-1.4.7-r1.ebuild 3499 BLAKE2B a6b751a50d7a56cac331f24f59714619b0dafc3f9b99aebbeb36ac6acd6504b80017da55a72ddfc3147cebf985333686a2bfd7fc56e7f7c85bcd64fc9c2249b3 SHA512 d0731a1c8d747ba16d6d499fb973ba7e2473cc602ac20a08d403f1a15ffbf81a3c89a2256fbdedcb061e08a123b3255e754a758523197dda0f92eaefd4917fc0
 MISC metadata.xml 538 BLAKE2B 314dc50e426cb4abb2cab8ea3f1ca221d1543820587fac02747c198c034ff468d13273ae573f30ee852489c22ebabf80b5d62d409b32bcedf9de45e768d6600c SHA512 10e907a1f38a40acebfb32ff8ecb58b074147ce29947a31272fca5de1d8de99935fab05dffbaa271aea0b4981c36ce0c8ef19879d3796360ecdf3b2143f7dbd4
diff --git a/x11-misc/colord/colord-1.4.7-r1.ebuild b/x11-misc/colord/colord-1.4.7-r1.ebuild
index ed40a24f368b..c5617616610c 100644
--- a/x11-misc/colord/colord-1.4.7-r1.ebuild
+++ b/x11-misc/colord/colord-1.4.7-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.freedesktop.org/software/colord/releases/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0/2" # subslot = libcolord soname version
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 
 IUSE="gtk-doc argyllcms examples extra-print-profiles +introspection scanner selinux systemd test vala"
 RESTRICT="!test? ( test ) test" # Tests try to read and write files in /tmp
diff --git a/x11-misc/compose-tables/Manifest b/x11-misc/compose-tables/Manifest
index 269899d049ef..e9b60fc06842 100644
--- a/x11-misc/compose-tables/Manifest
+++ b/x11-misc/compose-tables/Manifest
@@ -1,5 +1,3 @@
 DIST libX11-1.8.10.tar.xz 1839380 BLAKE2B 72ff400e1aad5bcb04e5dd3fb43f7767fad47e38cf628382cd5ffd5a204efc4de4f626027dddbbc7e10f80f8eaee0bcdf9792d9d012256366920f7ae0cffcb15 SHA512 f801f5b77cbc55074f73dc95b29fff7b5e1b13b99641f6e397788ad9f31a29793ed4e8e5bd373122c790ef90627e8f9d6d5e271051c1767a479a85c55cd82bc1
-DIST libX11-1.8.9.tar.xz 1811900 BLAKE2B 8858157ac490d65e19500bfbb2ab773a3a30041f8a757ff22fff8fb0124044b8bb826f6dff4115230c757a175b61a3f7d596d976d98be760085749878d64f871 SHA512 737af91818537295ac86be601b1e3d7e37d150716ec549580913b7cc9a44fee7a6ce9dbc3d46167eed91f23fe857c4dd355ed8f8440fe5fbbf8e9ebe47091b96
-EBUILD compose-tables-1.8.10.ebuild 1031 BLAKE2B fa277ed390cb7854b25247c5ed95a402e9511e6e1c7575c707261e460d35e00004453d3af326a225f556a6066639f0601c6a20bc774751235d5641358219e512 SHA512 eb01330f871d2b83e346658d5cd1b587a9293bee8e0c7a216274c3465794dd214d8e81fd78f0c4af1244cf6c956ab7c95b057686b8315eb78033c145217e89ba
-EBUILD compose-tables-1.8.9.ebuild 1023 BLAKE2B d80f56618bb18a1189632e54acc9da61154accd2ee11e83ce51d4dd619589c35b13a90af3c4095eaf918f2ea4c3af3b83f78dfb3390e409d858f1a08dd604d59 SHA512 adbce76a5ccf6fa1bf06dc2711ffcd555438cec317f6d6f73df821efb4fa5962bf6e47344e67f1d2fcd3a355fc6234b9c577551a0cd49dac1c58ec514d9abc73
+EBUILD compose-tables-1.8.10.ebuild 1017 BLAKE2B d64e72d6507cb1139ad45634de8165a4cc6cc4ed8bd01eabd6d307f4ee91e6c1ed45e56e68698d66ac6e71183c4e4f1632d32d0e38631939fff5ac767dd89ed3 SHA512 59da239f50fa1c7c2679bfb4a5a19a87e744ea29629fe19b38131d5dd42d8964179adaf229f5bc2359ab0943fef219506ea1c90cf207f2dc86a5cb46e63fe2b0
 MISC metadata.xml 395 BLAKE2B 7912fcccfd8d8a4c9c1e5601783a0668679506638511ee719bf7bb95f99415fe95a417343060cf5ca3fe918ab1f9847f74861af36d3c712afa321272cd13cf66 SHA512 c2956ef519fe59d0f713732059224568b9d7c34579654b71993b02227a512c1ac3057dc7f81c6bc93834fd4fee212f1ae26f4055ea92f3eb7524da7d9e690f8f
diff --git a/x11-misc/compose-tables/compose-tables-1.8.10.ebuild b/x11-misc/compose-tables/compose-tables-1.8.10.ebuild
index ade5421accec..53c4e8c44bce 100644
--- a/x11-misc/compose-tables/compose-tables-1.8.10.ebuild
+++ b/x11-misc/compose-tables/compose-tables-1.8.10.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="X.Org Compose Key tables from libX11"
 SRC_URI="${XORG_BASE_INDIVIDUAL_URI}/lib/libX11-${PV}.tar.${XORG_TARBALL_SUFFIX}"
 S="${WORKDIR}/libX11-${PV}/"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 # Only needed by configure
 DEPEND="
diff --git a/x11-misc/compose-tables/compose-tables-1.8.9.ebuild b/x11-misc/compose-tables/compose-tables-1.8.9.ebuild
deleted file mode 100644
index 11cdbcaf86bd..000000000000
--- a/x11-misc/compose-tables/compose-tables-1.8.9.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 2020-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-XORG_MULTILIB=no
-XORG_TARBALL_SUFFIX=xz
-inherit xorg-3
-
-# Note: please bump this with x11-libs/libX11
-DESCRIPTION="X.Org Compose Key tables from libX11"
-# xorg-3.eclass would attempt to fetch a tarball with a matching name to this package
-SRC_URI="${XORG_BASE_INDIVIDUAL_URI}/lib/libX11-${PV}.tar.${XORG_TARBALL_SUFFIX}"
-S="${WORKDIR}/libX11-${PV}/"
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
-# Only needed by configure
-DEPEND="
-	x11-base/xorg-proto
-	>=x11-libs/libxcb-1.11.1
-	x11-libs/xtrans"
-# RDEPEND=""
-
-src_configure() {
-	local XORG_CONFIGURE_OPTIONS=(
-		--without-xmlto
-		--without-fop
-		--disable-specs
-		--disable-xkb
-		--with-keysymdefdir="${ESYSROOT}/usr/include/X11"
-	)
-	xorg-3_src_configure
-}
-
-src_compile() {
-	emake -C nls
-}
-
-src_test() {
-	:;
-}
-
-src_install() {
-	emake DESTDIR="${D}" -C nls install
-}
diff --git a/x11-misc/copyq/Manifest b/x11-misc/copyq/Manifest
index e2e5faf05185..82ea2c40ee91 100644
--- a/x11-misc/copyq/Manifest
+++ b/x11-misc/copyq/Manifest
@@ -2,8 +2,6 @@ AUX copyq-7.1.0-fix-gpg-2.1-support.patch 20025 BLAKE2B faab876bfd8813afea0ed2f9
 AUX copyq-7.1.0-fix-qt-6.6.0-build.patch 1671 BLAKE2B f5e563ff590ee05ae09f37887e2ce6e72000ac13f37ccfcff7a7f9cfece2d83160fa2e8c462087f2eed377601f87bb5bc8469d2ef6734e375e662838b889356c SHA512 773b31a7976358be31a09aed93d2eca12768f8c3a8541b822e833cef409f39eb26819db2fd49ce7e2eec7b8419e0ed60bbe92c25f69de2f15a9a15fd6fa812aa
 AUX copyq-7.1.0-fix-test-failure-due-to-invalid-regex.patch 3822 BLAKE2B f95dfe294136907ee0f22d8f9810989928da18642ab674da9725daa029d75adebe4b8c5fd9d71a92298bd46b464ed9b20a6a12c2689f6f96c09742c1fda5d96b SHA512 415a24815233668e51303b3188bde028f0cfcb9483f92ec143a4350d2130f2b4752f704aa5ee27997be1ce44c3dabf2a384a7fb97756367a6be1029a10e04ec0
 AUX copyq-7.1.0-support-plugin-dir-envvar-r1.patch 782 BLAKE2B 9cb80e575a08dad54c54e8144fa06f45691ed5914d42af07073e3882930a636a0ac1557563d2c559d20f73525374c79d3a2523b6d5f24807b9032f33e3f0b362 SHA512 3d03c47873a3a2940ce5a239d620a46d63bb28a3f0ff0f547af247f74365403b52e1a91b402cbb64921c31bc4d6fff2f7e725b71edd3ea298058ad3a2d514a25
-DIST copyq-7.0.0.tar.gz 3323354 BLAKE2B 3c71bf94ed97d0564f89cb0b9927024df21520cf9eb758ec8c40e8156d9796b3c6df5518b9ad223c12489fe7aca3a067f772719a3a757f9a92e9ec18fe79e38c SHA512 f0b84ddef6791e229c625dbdefab2d3aad5be10d68745addb64d6e2b1546e033f1f95fb1a1218f9fdd19b5fcdddf2d840b2480ad54e0f59a7d5741781b3a43c4
 DIST copyq-7.1.0.tar.gz 3351093 BLAKE2B 758271f6bb54760372b8b5ab84de7c91af874bd72a22c8c22d338705869eab5500fde90808b4bf1288f8bdbad11163283637b81d85c09ccf0d734286dee605b6 SHA512 4320095ab75c361cc3d553c7817951eb6e74d47223f62bf6c1722e0f0b0d3ff59a1762354cf46fe0de064d516d60a467bff9ad9143b12016fc3f9e62139d3909
-EBUILD copyq-7.0.0.ebuild 1942 BLAKE2B 04362e75f351d9ffc2477588fbe7ffa89f58d5461b3b9784b0c5c541c21f0f11687c64f7df8ffa4b5e2f9e9a696e4a8e1bbe49e5c0ba87dd8eedd1bbbe2fdb63 SHA512 7b669810c75a9317941690ab9a42462de2e4db7c7db204e0f1cef2a69fe3f5f384267e7cbb8327cdc1214feaecc98c0454da12e17bedc262cfb488e0889868ea
 EBUILD copyq-7.1.0-r1.ebuild 3630 BLAKE2B 1524647e6231a99ed85be4c954a36092a2318321938617b1a8a4f93de1cf3c3f7bdbca4541d92fb8f6c84cad125b2565105fb53c44a668b4605a4acbd4e75483 SHA512 8d86cfb0d90fb9a9facd2648bfd69786a98a260758724f192e154c1eb02389ec7685a9c8aec77283b20dd196bb724b33951d568d5c2949daadd707cd09516529
 MISC metadata.xml 429 BLAKE2B 22f09cc6c63f32d0d0bcc5dc2cf7fb8d437653e0358ba30aeb3ab79978cafd9ea971fb0f56931744146e5ab7a16401e5f366d31f91ffba52ca6c2c26c1ba5931 SHA512 32f0a4a4c0065463ae826511758b42f7a2c815a6d49657dec47560b9510f21d44fe0d6f397922998fd3ad022e9b4fa88c45babdd9aa3874d8db0cfdbab7813d8
diff --git a/x11-misc/copyq/copyq-7.0.0.ebuild b/x11-misc/copyq/copyq-7.0.0.ebuild
deleted file mode 100644
index d93363879bb5..000000000000
--- a/x11-misc/copyq/copyq-7.0.0.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake edo optfeature virtualx xdg
-
-DESCRIPTION="Clipboard manager with advanced features"
-HOMEPAGE="https://github.com/hluk/CopyQ"
-SRC_URI="https://github.com/hluk/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/CopyQ-${PV}"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug kde qt6 test"
-RESTRICT="test"
-
-RDEPEND="
-	dev-libs/wayland
-	x11-libs/libX11
-	x11-libs/libXfixes
-	x11-libs/libXtst
-	!qt6? (
-		dev-qt/qtcore:5
-		dev-qt/qtdeclarative:5
-		dev-qt/qtgui:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtsvg:5
-		dev-qt/qtwayland:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtx11extras:5
-		dev-qt/qtxml:5
-		kde? ( kde-frameworks/knotifications:5 )
-		test? ( dev-qt/qttest:5 )
-	)
-	qt6? (
-		dev-qt/qtbase:6=[X,gui,network,widgets,xml(+)]
-		dev-qt/qtdeclarative:6
-		dev-qt/qtsvg:6
-		dev-qt/qtwayland:6
-	)
-"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-"
-BDEPEND="
-	kde-frameworks/extra-cmake-modules:0
-	!qt6? (
-		dev-qt/linguist-tools:5
-		dev-qt/qtwaylandscanner:5
-	)
-	qt6? (
-		dev-qt/qttools:6[linguist]
-		dev-qt/qtwayland:6
-		dev-util/wayland-scanner
-	)
-	test? (
-		app-crypt/gnupg
-		x11-wm/icewm
-	)
-"
-
-src_configure() {
-	if use debug; then
-		# Add debug definitions
-		CMAKE_BUILD_TYPE="Debug"
-	fi
-
-	local mycmakeargs=(
-		-DPLUGIN_INSTALL_PREFIX="${EPREFIX}/usr/$(get_libdir)/${PN}/plugins"
-		-DWITH_NATIVE_NOTIFICATIONS=$(usex kde)
-		-DWITH_QT6=$(usex qt6)
-		-DWITH_TESTS=$(usex test)
-	)
-
-	cmake_src_configure
-}
-
-my_src_test() {
-	local -x COPYQ_TESTS_RERUN_FAILED=0
-	local -x COPYQ_TESTS_NO_NETWORK=1
-
-	ebegin "Starting IceWM"
-	icewm &
-	sleep 5
-	eend 0
-
-	cd "${BUILD_DIR}" || die
-	mkdir -p "${HOME}"/.gnupg || die
-
-	# ScriptError: Failed to send key presses
-	edo ./copyq tests
-}
-
-src_test() {
-	virtx my_src_test
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	optfeature "encryption support" app-crypt/gnupg
-}
diff --git a/x11-misc/devilspie2/Manifest b/x11-misc/devilspie2/Manifest
index 21a40dff36ad..02fc27815558 100644
--- a/x11-misc/devilspie2/Manifest
+++ b/x11-misc/devilspie2/Manifest
@@ -1,3 +1,5 @@
 DIST devilspie2-0.44.tar.xz 46028 BLAKE2B e9ec3115781575c331d91e982fd1c71361ea57004a1b7ff234957998d3d44fd4e9a0ca1fde9d133e9e4c2d01b6e8d192921554eae8b83acfb0e3fa44b0c9fd23 SHA512 f01f2d044a670dd9b1b97e896a3e8ebcac3e67daea9f08a14bce26fe8084b85f7fdaa0ed147aba91626200f882eddeba7e0ec18f0f565cb7557ffb2ac74a4a64
+DIST devilspie2_0.45-src.tar.gz 59202 BLAKE2B 8b8fc5c9a91f0e8c2ff8494c52f6c6e406babb86ed8985573b2509ed4d4741d81dff8bab6267508d727a2d73abd031d4d4d74e7ac1a05948e331b8712b1b390c SHA512 4dc9e8c81cf2b20e828509483243d23fbd296955050d3d4c4693754b62762d44022f4969a077bd7d75e6b0e0c89168c31c09b1dc345bf3275b444b9b6c9e0515
 EBUILD devilspie2-0.44.ebuild 1013 BLAKE2B f143a76fa037d65369c451bca3589c24640ed08562ea61837fde4f9ced87a5c237bfdd8641485c625c1333fef353860e523c1d28b9174d45819d31d4b09f73f6 SHA512 6db38664e5a44e5a4340e929c6de052f7d3cd5bb0be83ef4ea4d9290baba8e67ea5d586e9a175854f0e71142435a0c2a470f46434faddb3e836a68ad85f4b523
+EBUILD devilspie2-0.45.ebuild 999 BLAKE2B 62d5ef2bf549392f39556a79263cb8f7956741d8d431c08c76ef61dab10617f26269d639f837832eefc7caaa38ce7a7eb24be01122020ff9cad75e873bed3f55 SHA512 68d9953a58e75ec178ec6e91869ddbcffe53155a7e1478578ea1e70dcd5cd16e21855cbaf9fc7c96f0c62557fcdc569c4cadf302a5a4a2a5cdc336a235a348ff
 MISC metadata.xml 327 BLAKE2B deb8a111c8827befa1e4637d81d1605f10de1dfedbf2693a47361a5de9a01392934957906a48419acd421704db1c01029411a0f71d42c26525d5294e66a73e35 SHA512 d876e887ddd0c79605cedbad6aa23026c12a3a44a690fc5fcf84ae804fd22dffff76c1487d1a529af52db3594899f79d986aadf6fd44593a90d53db21d1c3f61
diff --git a/x11-misc/devilspie2/devilspie2-0.45.ebuild b/x11-misc/devilspie2/devilspie2-0.45.ebuild
new file mode 100644
index 000000000000..d8a404af85ca
--- /dev/null
+++ b/x11-misc/devilspie2/devilspie2-0.45.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1..4} luajit )
+inherit lua-single plocale toolchain-funcs
+
+DESCRIPTION="Window matching utility with Lua scripting"
+HOMEPAGE="https://www.nongnu.org/devilspie2/"
+SRC_URI="mirror://nongnu/${PN}/${P/-/_}-src.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+RDEPEND="
+	${LUA_DEPS}
+	dev-libs/glib:2
+	x11-libs/gtk+:3
+	x11-libs/libX11
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	x11-libs/libwnck:3
+"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto
+"
+BDEPEND="
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_compile() {
+	tc-export CC PKG_CONFIG
+
+	local PLOCALES="fi fr it ja nl pt_BR ru sv"
+
+	DEVILSPIE2_ARGS=(
+		PREFIX="${EPREFIX}"/usr
+		LANGUAGES="$(plocale_get_locales)"
+		LUA="${ELUA}"
+	)
+
+	emake "${DEVILSPIE2_ARGS[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" "${DEVILSPIE2_ARGS[@]}" install
+	einstalldocs
+
+	dodoc -r doc/examples
+}
diff --git a/x11-misc/fbdesk/Manifest b/x11-misc/fbdesk/Manifest
index 59d32557351f..d41bd7b0aadb 100644
--- a/x11-misc/fbdesk/Manifest
+++ b/x11-misc/fbdesk/Manifest
@@ -3,5 +3,5 @@ AUX fbdesk-1.4.1-gcc-4.3.patch 2703 BLAKE2B b18c8e47816715c9b48d34d2457649ca22a1
 AUX fbdesk-1.4.1-libpng14.patch 264 BLAKE2B 8a1a00adb1dda5800616f41ba1b983cfa1ac8b41177a1e26cda3cc8f98ed6d69288a923602cdde0b2cfd95d6be0d2ad03b78d26fbcee75c9e4f2f3a9394925ea SHA512 64ec6f394b63461955489ae44dd63a10a76050261ecda7e121bc62c65aa938c0db18911969520c2836d347b6bc765c3f1004085b42cea1c61900db49a0501cf2
 AUX fbdesk-1.4.1-libpng15.patch 5827 BLAKE2B 8a9b6bb10c50de3fee5f86d7a02710a8bca70cc937b29808386a4ce8a4cab9a2cd564fe1f2c6ae9850a41b4e2d5d048f1b9d7f0e97254f8c08323eacfbda2b0f SHA512 4d46b5acb6998069e9a2eac30c1765b315e2c8f03a7b52b1b99e3ebdb9fa35040ed0937347d92b7df2b7aec101e0bf7bfa38cb77ee28dcaa2f755fc6347bf25b
 DIST fbdesk-1.4.1.tar.gz 426550 BLAKE2B cb83e81c3a25df5f608cb6112552bc11f9b51539ce60b488b35f0eb618482a325e0613965393e417d85f25bbc2a4c11d1a09207b89a08fbb2140f427ee246186 SHA512 0a99ae062442f85a9d4018db0f2815c0e537488999e71aef18eb3df09526e2b9c931e5caf30bb0cf484ddce28c3fc3672773fbf576e3f932f30ee48c89b346a0
-EBUILD fbdesk-1.4.1-r1.ebuild 844 BLAKE2B 36676757dd5d35478fa7c110993d705530ea002228851b6e9e644f425edbaea555957ea6e230dc36c211ca486100536067802fe7a411858688ba9f66819a1c94 SHA512 f58b867efd8f1f26fb0149ad7b1d5290e282cdebaff08279cdfb18a56260360f83e8a636af71efd4f54d973d1af164fe1d4180fc51cfe6307abdbc707f07c672
+EBUILD fbdesk-1.4.1-r1.ebuild 838 BLAKE2B c8d74e8caa52b55990bb52ce67758fc8a0035ac2f67fe02b47a4bb8aafcb3ce5e58a326048655750e8e22d84339cbf12c8aae8f1a18d9d2485a247795b1b6102 SHA512 10d0687f3bbda4bb090acda65707ff015a771aafb41f72f085ed44d15c8fbe8bfbdda2f073942e024703667398ee7b03aae1b394173fea29a36028e3ab452e03
 MISC metadata.xml 245 BLAKE2B 2fb79cfb79567b0fc0fb236df12bf5e7d728f6e944cc0f3db5ba61504ab54511331715eae341f4a0c854110ee1a436ca3052cee52bd750383ff161c0cad31c7a SHA512 1638402d34030921162cf6c254179a7a2c6802e6cf45611d04b63856c895bf0a9eba22905bec59528ddd01a863743f1d100a8c3e7661b95e0b7bd05c4ebaf77b
diff --git a/x11-misc/fbdesk/fbdesk-1.4.1-r1.ebuild b/x11-misc/fbdesk/fbdesk-1.4.1-r1.ebuild
index 896d9f96a7f7..8a09a45d90a2 100644
--- a/x11-misc/fbdesk/fbdesk-1.4.1-r1.ebuild
+++ b/x11-misc/fbdesk/fbdesk-1.4.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~ia64 ppc sparc x86"
+KEYWORDS="amd64 ppc sparc x86"
 IUSE="debug png"
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-misc/fraqtive/Manifest b/x11-misc/fraqtive/Manifest
index 27bdcd4cf0dc..6168d65078b8 100644
--- a/x11-misc/fraqtive/Manifest
+++ b/x11-misc/fraqtive/Manifest
@@ -1,7 +1,3 @@
-AUX fraqtive-0.4.8-qt-5.15.patch 953 BLAKE2B c67c9df040d24bab183ddd92db3457c9a4df9b2c8b6825236db57e88230d0d2c2c81534619be4e6aaea06fa6fa4f3f4666e556906f9dace673bb15146783909b SHA512 b52a1313ae02b9ecda9e508de0db4024e9d6605a255a543e5d4cdf5e927199312ebe4b68ccb107f26403635537c87b871dbdac43fc37ce1b3f817734cf10f519
-AUX fraqtive-0.4.8-qt-includes.patch 438 BLAKE2B 537ab2c470dd14f977cb53278cabf5a4e05e7973b69142f17d4bec1732c588ef181697e1be2c703d273ec1a6d26a53f1374482edb5d422924042c65917d7620f SHA512 0e5ea8dce236a5cdb8086ab0671360aeb15a4d0ac9703969be28373315288d59ccd31b013f932c77bfb5a64faf917f311c30c7cd25c006f08be5a5f40f5735c4
 DIST fraqtive-0.4.8.1.tar.gz 291381 BLAKE2B a5f93d42767c35ff7e27c87e89133a1c9d045acbb8b59c87799c5b838361aaba47af6ef001914f29eb27e2830ec3bdebe36111c1ae65e1f18a219367d168397c SHA512 d08659305dcc698a1fd0a81a833e4ffb8bc6496f7a95d7908d9f64ba1b51f9585be9b51ff44a15ca3a051d478ba0e04803f16cfd9abc56f426c8aa2f3e094c80
-DIST fraqtive-0.4.8.tar.bz2 260484 BLAKE2B 0bbbd983af324c38fb73db043e808de6cbf8e3e39073163b748215a2a3a374e53e4118b7fb0993685d3eef4ef6b65afcc51c5a7d23f4ab91ffc2dfd41305171d SHA512 8b4be81dd14fe086dbcffda123395ccb30a197e7762e590bc3ab7dc1d0aafb44dc45e1445e2f83198a0c1f4b9ea0d54a7de1989c3b85c0f2e5f474a67255d942
-EBUILD fraqtive-0.4.8-r2.ebuild 1118 BLAKE2B 43f8bb04ede585675c4ba86b128bc298f058c2b08d028f4d4522a7219b183e459ceea108350a7c0c57e3059e85007a4843e506589cecc488bf9ac645ace36ad3 SHA512 a70583d535edc8b9b8c7a32eed4f96da0092bde0abf938ef7998a64c5e93aff74908ec6b29799943c9490103eda22a5cc387dc5106db60c9d7b74c4a3cef4518
 EBUILD fraqtive-0.4.8.1.ebuild 1086 BLAKE2B 5c7be861b1d6579b0e69eebd68d6c6cbe285082f54379e6b99222060cf6197d36bd59fa300d9d4382e26d2a0526eb644e8575d0be4ddac1b5d47f1492ac6ad95 SHA512 bdf03e3dd2d819572a3ef85d68d6c97834c0bf95239317540aa26710b70afd518279c8fac14838793a7c35733d40582eca0eaa7bbeb4dcf074eeea72a7efb5a8
 MISC metadata.xml 302 BLAKE2B 177decccc0170ca064fca9d7aaadb1e610646649f3e04b8a7281cb3b5e9f13a6ee356ed8a57a9c88b37f6e6922a38d0b2ef992e6aacbee00293d7ee067b9bf7b SHA512 d1bb90cc95a33f885d496ff261b6b538d3c9a5b6567e6309941ed491a9dc6d63166b46010c90f2af654821e5fe719972a3a4c0e7fece00d2c51325fd9b799082
diff --git a/x11-misc/fraqtive/files/fraqtive-0.4.8-qt-5.15.patch b/x11-misc/fraqtive/files/fraqtive-0.4.8-qt-5.15.patch
deleted file mode 100644
index 63c281757096..000000000000
--- a/x11-misc/fraqtive/files/fraqtive-0.4.8-qt-5.15.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 34963f986f64d98b6ef82757ca07159a6a059763 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Sun, 21 Jun 2020 13:21:15 +0200
-Subject: [PATCH] Fix build with Qt 5.15 (missing QPainterPath include)
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- src/datafunctions.cpp | 2 ++
- src/shadewidget.cpp   | 1 +
- 2 files changed, 3 insertions(+)
-
-diff --git a/src/datafunctions.cpp b/src/datafunctions.cpp
-index 3ec1af9..9369299 100644
---- a/src/datafunctions.cpp
-+++ b/src/datafunctions.cpp
-@@ -19,6 +19,8 @@
- #include "datafunctions.h"
- #include "fractaldata.h"
- 
-+#include <QPainterPath>
-+
- namespace DataFunctions
- {
- 
-diff --git a/src/shadewidget.cpp b/src/shadewidget.cpp
-index 1494b37..3da5c05 100644
---- a/src/shadewidget.cpp
-+++ b/src/shadewidget.cpp
-@@ -19,6 +19,7 @@
- #include "shadewidget.h"
- 
- #include <QPainter>
-+#include <QPainterPath>
- #include <QPaintEvent>
- #include <QToolTip>
- 
--- 
-2.27.0
-
diff --git a/x11-misc/fraqtive/files/fraqtive-0.4.8-qt-includes.patch b/x11-misc/fraqtive/files/fraqtive-0.4.8-qt-includes.patch
deleted file mode 100644
index de31d9c37ec2..000000000000
--- a/x11-misc/fraqtive/files/fraqtive-0.4.8-qt-includes.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Add missing Qt includes.
-
-Bug: https://bugs.gentoo.org/563574
-
---- a/src/configurationdata.cpp
-+++ b/src/configurationdata.cpp
-@@ -25,6 +25,7 @@
- #include <shlobj.h>
- #endif
- 
-+#include <QDataStream>
- #include <QDir>
- #include <cstdlib>
- 
---- a/src/fractalgenerator.h
-+++ b/src/fractalgenerator.h
-@@ -21,6 +21,7 @@
- 
- #include <QEvent>
- #include <QMutex>
-+#include <QObject>
- #include <QWaitCondition>
- 
- #include "abstractjobprovider.h"
diff --git a/x11-misc/fraqtive/fraqtive-0.4.8-r2.ebuild b/x11-misc/fraqtive/fraqtive-0.4.8-r2.ebuild
deleted file mode 100644
index afb5f4538267..000000000000
--- a/x11-misc/fraqtive/fraqtive-0.4.8-r2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit qmake-utils toolchain-funcs xdg
-
-DESCRIPTION="Open source, multi-platform generator of the Mandelbrot family fractals"
-HOMEPAGE="https://fraqtive.mimec.org/ https://github.com/mimecorg/fraqtive"
-SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cpu_flags_x86_sse2"
-
-BDEPEND="
-	virtual/pkgconfig
-"
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtopengl:5
-	dev-qt/qtxml:5
-	virtual/glu
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-qt-includes.patch"
-	"${FILESDIR}/${P}-qt-5.15.patch"
-)
-
-src_configure() {
-	tc-export PKG_CONFIG
-	sed -i -e "s|-lGLU|$( ${PKG_CONFIG} --libs glu )|g" src/src.pro || die
-	local conf="release"
-
-	if use cpu_flags_x86_sse2; then
-		conf="$conf sse2"
-	else
-		conf="$conf no-sse2"
-	fi
-
-	echo "CONFIG += $conf" > config.pri
-	echo "PREFIX = ${EPREFIX}/usr" >> config.pri
-	# Don't strip wrt #252096
-	echo "QMAKE_STRIP =" >> config.pri
-
-	eqmake5
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-}
diff --git a/x11-misc/ftmenu/Manifest b/x11-misc/ftmenu/Manifest
index e22cce1f25dd..4752a4fcc9d0 100644
--- a/x11-misc/ftmenu/Manifest
+++ b/x11-misc/ftmenu/Manifest
@@ -1,3 +1,3 @@
 DIST ftmenu-0.4.0.tar.gz 315415 BLAKE2B 4d629a517736ec4ba7cf644f1da1bf786b2f9d185163954a670f38ef9cda2cd97059f86b3d8eea9b673bc9064685be2021a2928efe2c10cb71d62a226556f722 SHA512 7b83d2b7bb186d2a78f3425f364fc34263332ce881ebbed4805767834610d3fba474b296343de9f2d01aefb10e6638ed356c617ad460746f1a60f0f85d3e6e10
-EBUILD ftmenu-0.4.0-r2.ebuild 823 BLAKE2B fd786d125735f0633b9656208fdbcc450982d703f23dd6f245a0a396b17746626f84519301e1021fc3e0463000e4f1b2afb9da6b7482315e8e5c911269f12782 SHA512 cb087cb1bb33afe82a7c99688d9eaf3ca04c2b58fcd1a71b251c2454903fd5c1fc45a7fbfc7b5324ba622fa1ac8b889e8b81cb915154c3e16a91aee5d7ba4bf0
+EBUILD ftmenu-0.4.0-r2.ebuild 822 BLAKE2B 52b34353889066f2e3b57ff6138aa789429feb18a0e4e7396facceb2021710b989d0958378d9f7965f23611d2a4277bd1561ec014d812afedca61d02438a4d59 SHA512 75586f3fa98c669c6c02cdbc8515d9c321705d4f0b8614f67146683087492028225a4daef69bc9dcace29771a218539a9e0d5932a197370c312b7a0db85474f1
 MISC metadata.xml 244 BLAKE2B 6a5951b480644e0405d6078b7364a1ad0a1bfd9a45dfcc63da96a84c90880108faf04d5e8da36af7b908196cf55846845e6ecfa129ae5b30ccf6c8ae712fe794 SHA512 aec52204e70806bf53593cc4742f021382840cd3502a5ccc61b537806893fb455683fac7e1eaa612be3e83c1fe71f6fd5303307bd065a0dbefb59148cc250daf
diff --git a/x11-misc/ftmenu/ftmenu-0.4.0-r2.ebuild b/x11-misc/ftmenu/ftmenu-0.4.0-r2.ebuild
index 00c64acedb9c..304cddfa3e88 100644
--- a/x11-misc/ftmenu/ftmenu-0.4.0-r2.ebuild
+++ b/x11-misc/ftmenu/ftmenu-0.4.0-r2.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=8
 
-DESCRIPTION="A tray menu for the Fluxbox toolbar"
-HOMEPAGE="http://ftmenu.sourceforge.net/"
+DESCRIPTION="Tray menu for the Fluxbox toolbar"
+HOMEPAGE="https://ftmenu.sourceforge.net/"
 SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
diff --git a/x11-misc/gccmakedep/Manifest b/x11-misc/gccmakedep/Manifest
index 26f42cce03ac..30c02cf22ae3 100644
--- a/x11-misc/gccmakedep/Manifest
+++ b/x11-misc/gccmakedep/Manifest
@@ -1,3 +1,3 @@
 DIST gccmakedep-1.0.4.tar.xz 102704 BLAKE2B 2efb17475bb2d4b36f5387483b189dcc62cdddc9ed66d4c737ffa4726ea94480c67e498aaf65762dac6cdeab6596c30249aeb78703dd3e6c808b78196956f79b SHA512 7665923de51256720e7ae73c09f3c8c908c5cda2e204afac60e3c1ef45c7211cee303629ab9e53171df2a37765944a8a85a654bb1b2e90df9f497dff7d9d29a8
-EBUILD gccmakedep-1.0.4.ebuild 356 BLAKE2B 123f79ce5cf54303d2a0efe56f2ed813f59aa0b53f8c5a0547e403818a41728356647abffa0878b33b9b78dec65abdd8be21c7e1b88385760e805a1bf15e2f67 SHA512 5ed372c0983445d749519763b38b480e5f48c68c671a1c6a9bdfb46ce6e65825527f5e549ca779c719d2e9764dad159b4730097d76eb32cffd40fb7e3ee9f9a0
+EBUILD gccmakedep-1.0.4.ebuild 350 BLAKE2B db789f84723d9fad417b371c4b05ef4508d80e0133c6834a6a2e01fe2e4f5eeb41fdff0270d1641902668d15c0e5d7a3760f0f0d2a609f428122a84b56b56340 SHA512 204b53d090a9d39508f01d93f99e7e916ca2b74b9914469c4c441e6f2a0b1e28b4b76fdd46ec647d1284abcf06c50dfc7955b5d5c3dd3ad64b343bfdd86510ee
 MISC metadata.xml 342 BLAKE2B 8a918dbed8adc0ca2dd4fb47840a2a13199f26ea3cacc46391974a9b797006bd710f5d4fcbc265361f3e23cb5cb8f7f9358d27549f7ff21ef0381a11f5fe2346 SHA512 ccb760eec62a031973b2e5d9a553833430d7dd51b71a91943b30ff58352a9838fa303e146150cb9e460e0121c61c3d293a1588fac5b5c610aabb5e3f091a18c5
diff --git a/x11-misc/gccmakedep/gccmakedep-1.0.4.ebuild b/x11-misc/gccmakedep/gccmakedep-1.0.4.ebuild
index 27c6ffeb9cb8..6ef363fe516d 100644
--- a/x11-misc/gccmakedep/gccmakedep-1.0.4.ebuild
+++ b/x11-misc/gccmakedep/gccmakedep-1.0.4.ebuild
@@ -7,4 +7,4 @@ inherit xorg-3
 
 DESCRIPTION="create dependencies in makefiles using 'gcc -M'"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
diff --git a/x11-misc/gigolo/Manifest b/x11-misc/gigolo/Manifest
index 5d9cbb828ac2..723734140c63 100644
--- a/x11-misc/gigolo/Manifest
+++ b/x11-misc/gigolo/Manifest
@@ -1,3 +1,3 @@
 DIST gigolo-0.5.3.tar.bz2 304664 BLAKE2B 958e2cdbd043adf1e4f166ca6435462ee2621d7f7bc4918505715bc3240f5ee2a60fb5a27f23a607a1ffd862d41123dfd5977aa87f7c4fe1c7a085d05aac3b2a SHA512 46d93d4c2654a91724208f144098f0a870465823a516339c8455345b5d32be6efe2b7fb13d3e5c89daf2cd919e07e5fcbdc8c8e93bce03c78dbe1907ea5edfcd
-EBUILD gigolo-0.5.3.ebuild 830 BLAKE2B 3a589f9ef518612719b7f54942d7d9ff61d47b7c0a4ef7683d1bc0239d0614fe133392f3d639d0d5c6b27bdf00c8dc1c69c7414d565037bdfc55aeefe3274e82 SHA512 71406150c9477cb8d2028135fa14e930f707302ffda388c7520cb7bbff51a8531469890a05c50589649f562a2b8a116d96a907de8a4200808098fba56c753917
+EBUILD gigolo-0.5.3.ebuild 824 BLAKE2B 90e60acd01281eed417f5e623773dbcdd1936a367cce21e7a4b32a12fc40b42d16f83351bb73ad0be6487f7809005bd5e19afb61b357a15e3d3cec7bcd872903 SHA512 982b39875865d59f3291fc91f69abb7fca31beac5f0c9c315b3f22d061cc73a23bca2eb49dbd07b852cb2a9a02230b91a6cf41650f53e98d84cf0c8ae039db71
 MISC metadata.xml 248 BLAKE2B 83bf47dc3dbedea8a88932e922075f0ba8fd841433c4ab750e2ab61c22e8cbfaa1acb04a903d89ef5140a75dfc4c4899354623e0160df5b7c178c190f8494515 SHA512 b5200cfe30adef8e869fada87f1b4171210b2427cd3ac12edef70948f305d5e612ca5f24d377f9823a6022c8867db635db50ddd3d6cb362d6b0137c299fe07e5
diff --git a/x11-misc/gigolo/gigolo-0.5.3.ebuild b/x11-misc/gigolo/gigolo-0.5.3.ebuild
index 294595709b70..c9f487b1e13d 100644
--- a/x11-misc/gigolo/gigolo-0.5.3.ebuild
+++ b/x11-misc/gigolo/gigolo-0.5.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ia64 ~loong ~ppc ppc64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv x86"
 
 DEPEND="
 	>=dev-libs/glib-2.38.0
diff --git a/x11-misc/gromit/Manifest b/x11-misc/gromit/Manifest
index b36bb1642d69..e5edfbe5e308 100644
--- a/x11-misc/gromit/Manifest
+++ b/x11-misc/gromit/Manifest
@@ -1,4 +1,4 @@
 AUX gromit-20041213-build.patch 949 BLAKE2B 77b65b01ba09e07e70c3a64f00970efc26952ecc229a4e0533f1d3dd1c9ae28872af35afff8b0e71429e4ebb14a51d16166fb51e3b9b43778f50864bf5425ddf SHA512 66aa7eb9d2be44dfe00847007b1282c1a8bb0d953249c83ae135a615db66b5811458bfea88f1859bc195261f40a419b016bf70fdb3953149afed66e793f4f81c
 DIST gromit-20041213.tar.gz 21970 BLAKE2B 44740d29086bb5f7cfd11a882ffb8e89cd0ea87bd91c0017376b312211b64bd999f9dc81fce358b6a1d7d311f0a34940bd81b205ee2baa54112c930309109585 SHA512 8d10953bf0500e9b411ce6d7b6c43b295ab64113e8a873438409de8a1aad19b685483045341b0af889e7c833816f035c95dda90d3c201caf7c69ea7cbad57e42
-EBUILD gromit-20041213-r2.ebuild 623 BLAKE2B 4b1317603f14136d1bae5d5c2283ea7fad6cfc2592e30e1fba52e1462a9a938bb91c6ff29753ed3171db53f6993a4bb2b00d490b5d2dcbb0f1ba8e372f0be1a2 SHA512 328b2abe98437c13958bdbb38554ea57a4e4eef3459ed34bd9b6248c815f6c18e4a1200f97471c1dfd801f0b118c8241628957fd1daa02fb91a1b41be6ad46dc
+EBUILD gromit-20041213-r2.ebuild 625 BLAKE2B 4ee15924ab5b2e2a148f9261a4153ff2018b33734bc37a6db33c915d2de36224ae971713b60dfdef07354f93f5f921672799f910fa999eeab233a45c9cb6db8a SHA512 d446c12501d317c5964f19c2afd5073d0c70805cb52851877e8caec3f8c32111b239f66b425e58c925a6d27ad17397e9fa3a20f85a3c19773e961b5037be9aee
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/x11-misc/gromit/gromit-20041213-r2.ebuild b/x11-misc/gromit/gromit-20041213-r2.ebuild
index a5597d8987db..223d417401ee 100644
--- a/x11-misc/gromit/gromit-20041213-r2.ebuild
+++ b/x11-misc/gromit/gromit-20041213-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -6,8 +6,8 @@ EAPI=8
 inherit toolchain-funcs
 
 DESCRIPTION="GRaphics Over MIscellaneous Things, a presentation helper"
-HOMEPAGE="http://www.home.unix-ag.org/simon/gromit"
-SRC_URI="http://www.home.unix-ag.org/simon/gromit/${P}.tar.gz"
+HOMEPAGE="https://www.home.unix-ag.org/simon/gromit"
+SRC_URI="https://www.home.unix-ag.org/simon/gromit/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/x11-misc/grub2-theme-preview/Manifest b/x11-misc/grub2-theme-preview/Manifest
index 1047c043eeb9..6662bcc40789 100644
--- a/x11-misc/grub2-theme-preview/Manifest
+++ b/x11-misc/grub2-theme-preview/Manifest
@@ -1,4 +1,5 @@
 DIST grub2-theme-preview-2.8.0.tar.gz 203315 BLAKE2B 1599438dd24dec2e4ea82d3a6253c3b374afebdc1cac9ab666776b7e076b45111845ccfeb683a3ca851065459c8ce6a5fa5009cc2c809a4646048cdb25c38b96 SHA512 1df944957859f87fafd8cac445191e079d6e60d6513273dacc5a18e7959b1e57045fb6ebf6acb57407dc5ab5f7cc9278f8bfc6029b11c7f42721f1a8221c4a98
-EBUILD grub2-theme-preview-2.8.0-r1.ebuild 832 BLAKE2B c1f71e5a848fdfa6fb713dbd35922a98e9f56cd5ed52cb8424bec1cd04da1215da5abf50dd6e74b8d9e4595f1deebd32bc9cfd8163ef7ba2b84b8153449e4750 SHA512 535c4ecc8ef81a78e157ba680bc636ea1a3f1dc38d6e9c22b72c58114e8ca56c4ceba70100e365dbcfb410b357a991627c5f35b7511174cd1a2a82ce82e7975d
-EBUILD grub2-theme-preview-2.8.0.ebuild 832 BLAKE2B ef404b783827d153e590ba76a9c7d164c3ce6f4f3750ae1e552a10a4d85d14b2e39dd9ac8c8da31a19a55bc74a4d5cfdd13fbc343d533af8c56d22fa444c46b0 SHA512 9167a445a8acdc1910cc682c8ef07203890da0a38e89ebe5ca9a4eff204a8739acadd9ffb2584807cbabed6bd29268653a839ea3283dfa07d963e16b37ab26b0
+EBUILD grub2-theme-preview-2.8.0-r1.ebuild 822 BLAKE2B 646645ad2b6721dc2722e552264bde84b4d85affd99261d8f1502372dcae49d5170c3994be9e226408898d165f192f6b193f96ac59f97a6a5b9790d9c99627f1 SHA512 69530c7fdce5bd70fea1552b7228c91855c66aba415c4f587b835cf415473638d9d6e445ede33a5bc64209e0ab55ae4df1c230e2f4c96ba1bb5d17b84d985c87
+EBUILD grub2-theme-preview-2.8.0-r2.ebuild 994 BLAKE2B 9b6b099082c50427b125f1b724c4782849b41a846f870fed02b79f674de30df1052cdcb4e6ba3be5cdb3fec7b98b94184cf058bd0251148558edda7fe61faa6d SHA512 11c9c434c71cf90ca683208240bacb8c528ff95d7daaaf54d5fb2cbb9496195dfdf5d51580eb3274f1060b03aee4eaa41b97fa3f67ce0e5e692c809dc1d9d9c3
+EBUILD grub2-theme-preview-2.8.0.ebuild 822 BLAKE2B a7f29233b2dff671fd2b6365472a3c18abbe27e08eb0ae79cd28939a1763d669ea4f036ee3732b1bcb6cd9d4899da92cd9c294de3b7d0b11fc239a67f8ccb0d9 SHA512 c58f97e31661a56d9ef4502d8c824115be70f5f54a4e06d8327504e4656b70d68c0c00f2a1858f9d562a21d5967b6bec7ede6ea7a12960761ba6b2a419662638
 MISC metadata.xml 343 BLAKE2B 182b8001e5b2011d194d3e7780503bbbcae133841e50bfa3baefb3849c8eabec23075ce12417022f72bf446ea2917283f4ab307aa4acfdb6a9f4f1069e8b5848 SHA512 98c787f18776b403641b87ebba496bf87e607640bc78cece91702f723e21ce3cbd45ea80b13d56876748890c822be47a804534664501d34c9e03418feacce898
diff --git a/x11-misc/grub2-theme-preview/grub2-theme-preview-2.8.0-r1.ebuild b/x11-misc/grub2-theme-preview/grub2-theme-preview-2.8.0-r1.ebuild
index 3ec8fd8085ea..4af7e9df4faf 100644
--- a/x11-misc/grub2-theme-preview/grub2-theme-preview-2.8.0-r1.ebuild
+++ b/x11-misc/grub2-theme-preview/grub2-theme-preview-2.8.0-r1.ebuild
@@ -22,7 +22,7 @@ RDEPEND="app-emulation/qemu
 	sys-fs/mtools
 	grub_platforms_efi-64? (
 		sys-boot/grub:2[grub_platforms_efi-64]
-		|| ( sys-firmware/edk2-ovmf sys-firmware/edk2-ovmf-bin )
+		|| ( sys-firmware/edk2 sys-firmware/edk2-bin )
 	)
 	!grub_platforms_efi-64? (
 		sys-boot/grub:2[grub_platforms_pc]
diff --git a/x11-misc/grub2-theme-preview/grub2-theme-preview-2.8.0-r2.ebuild b/x11-misc/grub2-theme-preview/grub2-theme-preview-2.8.0-r2.ebuild
new file mode 100644
index 000000000000..6521f7e6bfbc
--- /dev/null
+++ b/x11-misc/grub2-theme-preview/grub2-theme-preview-2.8.0-r2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+PYTHON_COMPAT=( python3_{9..12} )
+DISTUTILS_USE_PEP517=setuptools
+
+inherit distutils-r1
+
+DESCRIPTION="Preview a GRUB 2.x theme using KVM/QEMU"
+HOMEPAGE="https://github.com/hartwork/grub2-theme-preview"
+SRC_URI="https://github.com/hartwork/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="grub_platforms_efi-32 grub_platforms_efi-64"
+
+RDEPEND="app-emulation/qemu
+	dev-libs/libisoburn
+	sys-fs/mtools
+	grub_platforms_efi-64? (
+		sys-boot/grub:2[grub_platforms_efi-64]
+		|| ( sys-firmware/edk2 sys-firmware/edk2-bin )
+	)
+	grub_platforms_efi-32? (
+		sys-boot/grub:2[grub_platforms_efi-32]
+		|| ( sys-firmware/edk2 sys-firmware/edk2-bin )
+	)
+	!grub_platforms_efi-32? (
+		!grub_platforms_efi-64? (
+			sys-boot/grub:2[grub_platforms_pc]
+		)
+	)
+"
+DEPEND="test? ( dev-python/parameterized[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
diff --git a/x11-misc/grub2-theme-preview/grub2-theme-preview-2.8.0.ebuild b/x11-misc/grub2-theme-preview/grub2-theme-preview-2.8.0.ebuild
index da256c221fe2..32a64cd43390 100644
--- a/x11-misc/grub2-theme-preview/grub2-theme-preview-2.8.0.ebuild
+++ b/x11-misc/grub2-theme-preview/grub2-theme-preview-2.8.0.ebuild
@@ -22,7 +22,7 @@ RDEPEND="app-emulation/qemu
 	sys-fs/mtools
 	grub_platforms_efi-64? (
 		sys-boot/grub:2[grub_platforms_efi-64]
-		|| ( sys-firmware/edk2-ovmf sys-firmware/edk2-ovmf-bin )
+		|| ( sys-firmware/edk2 sys-firmware/edk2-bin )
 	)
 	!grub_platforms_efi-64? (
 		sys-boot/grub:2[grub_platforms_pc]
diff --git a/x11-misc/i3blocks/Manifest b/x11-misc/i3blocks/Manifest
index 6033a1101acc..2999ff920802 100644
--- a/x11-misc/i3blocks/Manifest
+++ b/x11-misc/i3blocks/Manifest
@@ -1,4 +1,4 @@
 AUX i3blocks-disable-bash-completion.patch 396 BLAKE2B 1ed07e8bc335117e4dcbf048efadea33306575f706bb88006cd5528158ff9ddcf373202fa4f5d007de69d5694c3521137d23ae108b825123f72858fa4f3d724a SHA512 b388bbaf394f791f052cfe3cda97f9c69b36fe30cee3954df27888585285abe22c6d21d8d2f611467583581d153d00f55477a3458b46d9b741662ace16a00d5c
 DIST i3blocks-1.5.tar.gz 66019 BLAKE2B 0378dac61d2f0049dffefe2a3f98512518aef311f2d9d79b72fd9882834c6a09c8954e7ca906fb96bbcc76992288fe659b4977f2cfad1234dca27ec9131ac720 SHA512 759829d59f94070251378d437891c2df05715fbd0b734c34dd41767d61957f301c6125b0058668295b8eeac29038fae6b2e8c194f903398ee736662213d1d534
-EBUILD i3blocks-1.5-r1.ebuild 633 BLAKE2B 6f8faffed53680ba459deddd5153d5acb43602c57cb6fac17400c9b2373e5b153d48e997944925c68824f9f008c4256930e09d65171b8d897dd7ec05b0d77133 SHA512 0ccd2efd114bb3be218a094170647048c417811727ccddba89e489e3bcdc82db3249a2461080133b09309d37c11a570c5e647a1e3ae8cd86e1cec0caf4987b19
+EBUILD i3blocks-1.5-r2.ebuild 633 BLAKE2B 7ddf54b465c57ab8e80c2b0ed1c52c9af897c4a9ef71910961b848af37de10356ec0db1f3c23fca47ebf6d8dc5f658512e7bb2f993c6fdbdb9bdb5c7ab4b805d SHA512 5040b9793c3bddbb76997f1cb8b91d3b6146e16468299c5234fe4ff0a4332b401ae2467cff52694b404f6ebef9a27767064cdd5d5d95bf5339b7728c1a21d8fb
 MISC metadata.xml 397 BLAKE2B e855224c65daa848cd6a630391c48c22bb063ee07240f18aa10152e9dfd42d3a1fe48dceb77a85529cfd369ef897a49440dd6f5cd956bdf6d1a6512ee05ee1e6 SHA512 f6c606e7ffdd0f8acb5a150f02c27c3ab88b93261f68c2552fd1ba12f9db811a41eb03bbdfb1a42f1fa314cbbfb97f6a18ef25c87cd88c8e81d63444741ddbda
diff --git a/x11-misc/i3blocks/i3blocks-1.5-r1.ebuild b/x11-misc/i3blocks/i3blocks-1.5-r2.ebuild
index 8bd169120d36..0891eb87cafa 100644
--- a/x11-misc/i3blocks/i3blocks-1.5-r1.ebuild
+++ b/x11-misc/i3blocks/i3blocks-1.5-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit autotools bash-completion-r1
 
diff --git a/x11-misc/i3lock/Manifest b/x11-misc/i3lock/Manifest
index 75065026e3d9..dda0de8cd4e4 100644
--- a/x11-misc/i3lock/Manifest
+++ b/x11-misc/i3lock/Manifest
@@ -1,5 +1,3 @@
-DIST i3lock-2.14.1.tar.xz 28756 BLAKE2B b38a3fafeebb5f8cebb643baeb875922659b556a5f919c2a837923e45e8f91a5f3ce297a424414ec9f05255e5888b91723617d837e5ffdbdf81aded42edc34cb SHA512 63b6bd73f66654fe52639434f7d3da64006144ec2ed685ba8683186730d4cc2c10d5aa66174f965030030243f59afaf6def3ff732f710ae441410218f84d6deb
 DIST i3lock-2.15.tar.xz 29100 BLAKE2B e84622e34a54681e162a3012c21fea4cc8b93a66e466647d65cc85f1a874d2be4d9988d54db74165b3dd1eccca1ca257a74b64ddbce08d681c9fc1c78701ee88 SHA512 6079f5233c0820c6e38f3cd8f3732d585e95e7d670408e4fb18ab580a2e1face8f3d6ea13eaaeedc8671f74def917183667e736b35306bf7c630d40625b41ac2
-EBUILD i3lock-2.14.1-r2.ebuild 622 BLAKE2B a389f2359009e3fd74fa4e7e27e8d8255453d42a4aebcd55f3d35e7c86f6d56553d2efd0037e3f7081118d041bc52bb2dc624860d7788c6b3d62f05d55e41943 SHA512 03e26fbf2f86c43c497fb8c9d086d9309c0e39fd0a5140125bbe9f7d6d9ea0cb0848f19667f5345ca33d108f3e6db29ca8805c2d1244ad61b0ca61681fc1ccac
-EBUILD i3lock-2.15.ebuild 624 BLAKE2B 3fee7e44271dd6efd685d01bac448f220830f4dd4efc858562a302210a1e20591594ffb400c914e54150768efb38b9d7f22514651824b0ee2ddf1c81cad9b2aa SHA512 2f8a6207a983021c278c00edee4849992f14b07ff30c342ec9cad8710cd21ffa7cf49d1258ecbc22cf83ca90d5af3ca996040def68b9db71d2fa6ee1706b9183
+EBUILD i3lock-2.15.ebuild 622 BLAKE2B 272bafb02f695de9b0552b33cafb8ff75abbe68c9f0e96de884d4d9fbb8d589bdd2093a71803c016ea8ec5b9edc02a9e9fb88cffb92cee0ec8b56b3785500287 SHA512 2cc03b95416973c1ced27d642f7354e11c1945960f0412e0bb9786f94428b513936b5499421fffaa35f09c797f0a63ae27ac366e2328f42e5ab58c11291101fa
 MISC metadata.xml 322 BLAKE2B 7e8f44f7030d7a62fe02239f9ee4c125c16d2a4bd7b5c5c98070f4eb726ee1009e18bd178d116bf4410f7e4fb554f08f62605632c2c8a0a6222de231bb589054 SHA512 b6e6a89127471ce1bf0f8a6c9ab2fe11eb23d4d291fb403a86057cbf4b0fed7806ee45e58a5b7d06b20ecee3431792553d16cbf789aa81001d54deb428a6cbc1
diff --git a/x11-misc/i3lock/i3lock-2.14.1-r2.ebuild b/x11-misc/i3lock/i3lock-2.14.1-r2.ebuild
deleted file mode 100644
index ce0e41df1a3b..000000000000
--- a/x11-misc/i3lock/i3lock-2.14.1-r2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson
-
-DESCRIPTION="Simple screen locker"
-HOMEPAGE="https://i3wm.org/i3lock/"
-SRC_URI="https://i3wm.org/${PN}/${P}.tar.xz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
-
-RDEPEND="
-	dev-libs/libev
-	sys-libs/pam
-	x11-libs/cairo[X,xcb(+)]
-	x11-libs/libxcb
-	x11-libs/libxkbcommon[X]
-	x11-libs/xcb-util
-	x11-libs/xcb-util-image
-	x11-libs/xcb-util-xrm"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	default
-
-	sed -i -e 's:login:system-auth:g' pam/${PN} || die
-}
diff --git a/x11-misc/i3lock/i3lock-2.15.ebuild b/x11-misc/i3lock/i3lock-2.15.ebuild
index 512d70eb36e7..a201f2e984f9 100644
--- a/x11-misc/i3lock/i3lock-2.15.ebuild
+++ b/x11-misc/i3lock/i3lock-2.15.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://i3wm.org/${PN}/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 
 RDEPEND="
 	dev-libs/libev
diff --git a/x11-misc/icon-naming-utils/Manifest b/x11-misc/icon-naming-utils/Manifest
index 89f5608d39e8..16586716bbd0 100644
--- a/x11-misc/icon-naming-utils/Manifest
+++ b/x11-misc/icon-naming-utils/Manifest
@@ -1,3 +1,3 @@
 DIST icon-naming-utils-0.8.90.tar.gz 70321 BLAKE2B e4944c6a279ffe38c8966783c799b1a84ba626a0611c3c29a7bccc982dfd45c7ae9d38d8b99f2e796466812a98a9216a440e871058b73aad537a0f2f4339d5ec SHA512 6c23f6138e053f9fc6de9d56f94b80849f29f9fde46cdf54b705720cb48b0c660f315484fb36fb9936d4ceade7768aad2d17280545a4b392aa56185c9452999d
-EBUILD icon-naming-utils-0.8.90-r2.ebuild 520 BLAKE2B 5e96ba1229ba289769859d392857845bf1ee19cacd22088452b2b91a28cb9701378103c40e265a4c2b04ee3583a375bf1b3469fce528d9ce845c87c72be91d65 SHA512 dc66b751c484d282886d3baf848406c77ef1d3cc19120e790c7d7c32f04ce0351bf280cc676a7f495ec241b8dff4b5b432d6b0e604e7cd9bae8723911ab718eb
+EBUILD icon-naming-utils-0.8.90-r2.ebuild 514 BLAKE2B 2052f2da2b5109027e76728dea2487661d1830057f7fa907ab73d267dc1bc93e43a91c125c871250c33eef94aa38f2491e51514684c95ae03e67c8ddbde9fc39 SHA512 0cfb5aea19dc2a34630a3fbe9ab2d65d967c18a65e2514b2b9902545169e3b7e4082b65b69f56e058dd68b3611fa3ac5882cc6f4f7d330458a5b9a8e73c540a6
 MISC metadata.xml 229 BLAKE2B 35bd897953d3051382021de0742162ed1a166c98224fec04fc54dc467dfe5492289b1da910ae9213259b20a0bd5bbffc041624ccb3aacc23b56de2c397861d7d SHA512 7340f6b8c0a938920b7940a288c212e868ae0d8cb18b97c028e6e959f72f94e35f37a2d864bb662fc1d01b43bd7b72efdcbcc5d48e700aaf8c845eb6b9d67fed
diff --git a/x11-misc/icon-naming-utils/icon-naming-utils-0.8.90-r2.ebuild b/x11-misc/icon-naming-utils/icon-naming-utils-0.8.90-r2.ebuild
index 4f0484191bcc..13d6c7e87405 100644
--- a/x11-misc/icon-naming-utils/icon-naming-utils-0.8.90-r2.ebuild
+++ b/x11-misc/icon-naming-utils/icon-naming-utils-0.8.90-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://tango.freedesktop.org/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
 
 RDEPEND="
 	dev-lang/perl
diff --git a/x11-misc/imake/Manifest b/x11-misc/imake/Manifest
index af57f81ff062..609b13284149 100644
--- a/x11-misc/imake/Manifest
+++ b/x11-misc/imake/Manifest
@@ -3,5 +3,5 @@ AUX imake-1.0.8-respect-LD.patch 379 BLAKE2B 1b031fc8cbc884cd975b338f57ef9de554a
 AUX imake-1.0.8-xmkmf-pass-cc-ld.patch 461 BLAKE2B 643264da121725cd2424e3e6d3dc7af05d9068ada3a53ca5b92f6af7beb17caf7eb7de5bc4187a7ebdfed508f242d13bcba9876533d2d7cc52dbd0f9c80ab701 SHA512 c73feb329adcda1f08051965a0ce0ba6031a8b8aceef19d10d11e475a603337da661ff4af72620924e1efb76ed9347fc0535b31ac3e98707aee298a36e715bdf
 AUX imake-1.0.9-no-get-gcc.patch 1048 BLAKE2B 0ff949e2e12afcb59cefc81b60e9801d14bf9b98f19ebe62b6a5ad857ea3b1e1bd3244309953eb450b7f3e29ae9663c695ff790fbaa6a8d202dc062734c21381 SHA512 67f5e4789b739c4d53d331592e83b9455a1e01ff29f9b95db04a25225f70549ced920010dd09b6f9f6e1b70017e1864f7b344fdc4fcd8962f2a9a2853e0b0644
 DIST imake-1.0.10.tar.xz 155284 BLAKE2B 85ea5d14280b0e4e3d07f806b1ebc777f1c6f431af05e94571e1d7908028f1497c4b5edb6e808c858429e98f314fe6c3cee84e265a30fce02d7ebeaa2111ab8d SHA512 ea96db27a6da13ea2d64652936e508b5e3d5d712347a2eb248376dc1f262c18720d9934b8ae69b4c0fc65b135c847be42da084fe924e4825ce1d359f4ef7e60f
-EBUILD imake-1.0.10.ebuild 699 BLAKE2B d6ed6cd017265af9bfca64c54fcc20037b38cda85c5996c80a54b8fe32b05e8ca6243ad02065ca545e91a1c7a86c93bc00f0b4ed6234a4e2a9393e49a42b63f4 SHA512 01a8721c650272fc5490f6389784d8da2cb36384b106a2e993b46c88cf6c9f2ba87d27a4883523b208248429cfb8cd0135194adc2d8bc062d8e78e1a78a776eb
+EBUILD imake-1.0.10.ebuild 693 BLAKE2B 6e4d90e276f7711aef3d389f1eb9c49b58941258720d6d1494d464e097ccb1cce6b191d96a36f204e1b9fd4add752fe1565132137e4c0c90005f4d813f0964e4 SHA512 d99d1442066e30a1e1a15ad46318c9022470cd0761be71443d51bd232f84aeeb5d202a75118b2134554bbdb0e718cdcca2da6d83528ba8d8f23195eddf87f6d8
 MISC metadata.xml 337 BLAKE2B 33b94ed7ed8c8068a9fa1e2e3a49b51760e5e19003102a8ff5b76a0f449cc77fbf2aacaa8351a39caf2ab538645eca7862a383e7e4413a59efa69dabf8950c32 SHA512 9e59ae6ff8bef63e98e08ce8eff2d35a1ed3b815b60140523f07f85ea62a3bad952deea65a822393628db1605f2a8ac5ba35c3bb277e85a3cb64dba74936f470
diff --git a/x11-misc/imake/imake-1.0.10.ebuild b/x11-misc/imake/imake-1.0.10.ebuild
index c5519695461d..7d54508637cd 100644
--- a/x11-misc/imake/imake-1.0.10.ebuild
+++ b/x11-misc/imake/imake-1.0.10.ebuild
@@ -6,7 +6,7 @@ XORG_TARBALL_SUFFIX="xz"
 inherit toolchain-funcs xorg-3
 
 DESCRIPTION="C preprocessor interface to the make utility"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="x11-misc/xorg-cf-files"
 DEPEND="x11-base/xorg-proto"
diff --git a/x11-misc/j4-dmenu-desktop/Manifest b/x11-misc/j4-dmenu-desktop/Manifest
index bef32c461d36..ddd786be369b 100644
--- a/x11-misc/j4-dmenu-desktop/Manifest
+++ b/x11-misc/j4-dmenu-desktop/Manifest
@@ -1,5 +1,3 @@
-DIST j4-dmenu-desktop-3.0.tar.gz 87265 BLAKE2B 63fb87b98e500b1adba188b0b523ef0c2449826e7fa5b5ca442c451ff5003160a9f6803cdb3c918da366447355b9312b9bf0ece4a7d2eebe427da4edf219f881 SHA512 9823428477600f3ab284dc80f6baef20b5f22b34269317f491c65e7331817f5a0115af20e05acb7f2c66f021f7c2d683c332a334f03088d867319926eaa4568a
 DIST j4-dmenu-desktop-3.1.tar.gz 108974 BLAKE2B fd0527ee27855ef453b76e52cd15402bb86b9812255edacfacd5b5486162b052eb74d41f072fcf151837698d352dfa743a6bd30cd28156f62ddafc39d2402edb SHA512 6baa4bdf0564683e09bf3dd34f619ec9dcfc840be68ec0f68b4cd643bee5acbc09ebfffaf82daced991899fb467c84ed441257915a9c6b411f317e9947471fca
-EBUILD j4-dmenu-desktop-3.0-r1.ebuild 1270 BLAKE2B fb0f5962f891e0f24f6c9beb34e59bc6d03bb1f677ee0a5d78236ca61ebfcb21f321ddbd36e6a9ea81e0242c1a5aa552da6bc5bbf56f29b1bf163b29cead31d2 SHA512 c5eef0db2ae4c9edaeedcabbc15eb8f1215b1c8efefd6dff86efcda00cd89721a787bb3bcba42c3f6b6b1212ceec139e5d1aefc9f3449966dd57f8e484b27d44
-EBUILD j4-dmenu-desktop-3.1.ebuild 1272 BLAKE2B 4173a96dcf25858ea28fd5adde961964de652fd6f8d819b26347ad1fb2a391f8b42610ecd17d95b091e94cfeec33431aa7f180aeeb46d13c884c2558ba022125 SHA512 06f6a25ce89b56c46079d984f70ce4a06a5807046aa4106bb9eb74220627a28c2808d81f1b53c00a51ecb865a88414a086bbd91eab1635328ee380c8d501b221
+EBUILD j4-dmenu-desktop-3.1.ebuild 1270 BLAKE2B fb0f5962f891e0f24f6c9beb34e59bc6d03bb1f677ee0a5d78236ca61ebfcb21f321ddbd36e6a9ea81e0242c1a5aa552da6bc5bbf56f29b1bf163b29cead31d2 SHA512 c5eef0db2ae4c9edaeedcabbc15eb8f1215b1c8efefd6dff86efcda00cd89721a787bb3bcba42c3f6b6b1212ceec139e5d1aefc9f3449966dd57f8e484b27d44
 MISC metadata.xml 720 BLAKE2B f7953adbe54ea74a53d8d24b01ab9f49ec6953730e555547de6cb19f11cf7cb359a80f517a334494007ab691942390bc8d48c27b44beed6d9e8829f120f67201 SHA512 1decbf705eafff204783071471f3fa6c99719525fd81b2eaaf0effaa41e501b81dddc2604e2069ca393933285f78f8f76686be14e6a7f0b301ebcf4fed3628e5
diff --git a/x11-misc/j4-dmenu-desktop/j4-dmenu-desktop-3.0-r1.ebuild b/x11-misc/j4-dmenu-desktop/j4-dmenu-desktop-3.0-r1.ebuild
deleted file mode 100644
index a44226418300..000000000000
--- a/x11-misc/j4-dmenu-desktop/j4-dmenu-desktop-3.0-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-MY_PV="r${PV}"
-
-DESCRIPTION="A fast desktop replacement for i3-dmenu-desktop"
-HOMEPAGE="https://github.com/enkore/j4-dmenu-desktop"
-SRC_URI="https://github.com/enkore/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+dmenu test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="test? ( dev-cpp/catch:0 )"
-DEPEND="
-	dev-libs/libfmt:=
-	dev-libs/spdlog:=
-"
-RDEPEND="
-	${DEPEND}
-	dmenu? ( x11-misc/dmenu )
-"
-
-src_prepare() {
-	cmake_src_prepare
-
-	# Respect users CFLAGS
-	sed -i -e "s/-pedantic -O2//" CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DNO_DOWNLOAD="ON"
-		-DWITH_GIT_CATCH="no"
-		-DWITH_TESTS="$(usex test)"
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	doman j4-dmenu-desktop.1
-}
-
-pkg_postinst() {
-	if ! use dmenu; then
-		elog "As you have disabled the 'dmenu' use flag,"
-		elog "x11-misc/dmenu won't be installed by default."
-		elog ""
-		elog "Since x11-misc/j4-dmenu-desktop uses x11-misc/dmenu as default,"
-		elog "you must configure your own replacement with --dmenu=<command>,"
-		elog "as otherwise it won't work."
-	fi
-}
diff --git a/x11-misc/j4-dmenu-desktop/j4-dmenu-desktop-3.1.ebuild b/x11-misc/j4-dmenu-desktop/j4-dmenu-desktop-3.1.ebuild
index e56bc1b3ab29..a44226418300 100644
--- a/x11-misc/j4-dmenu-desktop/j4-dmenu-desktop-3.1.ebuild
+++ b/x11-misc/j4-dmenu-desktop/j4-dmenu-desktop-3.1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+dmenu test"
 RESTRICT="!test? ( test )"
 
diff --git a/x11-misc/kronometer/Manifest b/x11-misc/kronometer/Manifest
index f58f2e849242..0a6db84d2d5d 100644
--- a/x11-misc/kronometer/Manifest
+++ b/x11-misc/kronometer/Manifest
@@ -1,3 +1,3 @@
-DIST kronometer-2.3.0.tar.xz 136140 BLAKE2B b5ae57711b06ff53d3d096b6ce004620951132f4ab451aeaf67ac679e5154a4942d3cb910ed1d64ac32473b7fde59da0fd3b143171bb6f81ff29b81b29eceb2d SHA512 23321db24a0850be744765dc5eb17b3848d82b20e0bcc0520b5ee9bce6537650405aafeb435248459fd924fcfcd8acc113d8ca440edadd1d7c8f86dc282dd2e2
-EBUILD kronometer-2.3.0.ebuild 848 BLAKE2B bdd603b4c82705d2ab0ce287bc45016ccf75980cb51659b434a787768e8f02e0c51256244c81524a3cba3880db0fee3d7f73da0bef77bd6895420cddd84d26f4 SHA512 cca3ea503c390a72b01fef26d422af8e915c3cb6de7b8c9c26415af8626999c0bfdc49d18a36595d76b1b062c1c67e72673eb71e7fb47b945d36039e0b9711af
-MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
+DIST kronometer-2.3.70_pre20240906-e87e16c8.tar.gz 203320 BLAKE2B 572da633cdd5ce7609e1ddb59c8677603b87951a4b766d64a56b31644bb25b957e15328cf96afc13c6032fca117b86726d523292c961a058cda706f6ae1939e5 SHA512 040ba702a4b4086f90b526922abcb54f3f00f68b130241b8ae7eb057e5f774a21c32df34d267502f904c1e6947fd6dada48de96806b1f0d357004a6b4c27db92
+EBUILD kronometer-2.3.70_pre20240906.ebuild 846 BLAKE2B 7784aaf285da39cfe583e50fd2487657bd6f0747a43ea114851096f9ef9cc30556c039827bc954d459e31117652e0c67cdad6e1d8abdfb037da568ac11c71911 SHA512 f89c4a2ac5230c9601baf3a02c508d4d67a3484171bec0d47e3a4ba02e78d666a892abc7c0bb507522776a425deea87aed26787ed1273d2ef5deeb0b10132c3b
+MISC metadata.xml 408 BLAKE2B 7922d5bb16096ef0328a9b4d15aa62b6ec4b9f7336fd6a55f820665f35e69d469aa1668ffc214736aeef8d28fa3853f076314f8e1ca6bb27c3f3535203eeb21d SHA512 39e1a30c6e45a226ac7b9a497308a6e340277955677c2321dc694cb4778e6d2f90c3e236d4aa888a39f8ee96ce7ce0117860f8b60e1f8ec993925947dfb45b44
diff --git a/x11-misc/kronometer/kronometer-2.3.0.ebuild b/x11-misc/kronometer/kronometer-2.3.0.ebuild
deleted file mode 100644
index 0c50aa9f6fd0..000000000000
--- a/x11-misc/kronometer/kronometer-2.3.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-KFMIN=5.96.0
-QTMIN=5.15.5
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Stopwatch application"
-HOMEPAGE="https://apps.kde.org/kronometer https://userbase.kde.org/Kronometer"
-SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="amd64"
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/x11-misc/kronometer/kronometer-2.3.70_pre20240906.ebuild b/x11-misc/kronometer/kronometer-2.3.70_pre20240906.ebuild
new file mode 100644
index 000000000000..fa2f93bef47b
--- /dev/null
+++ b/x11-misc/kronometer/kronometer-2.3.70_pre20240906.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_COMMIT=e87e16c8e623a8f5646f5286ac02ac9298dbb235
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
+KFMIN=6.5.0
+QTMIN=6.7.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Stopwatch application"
+HOMEPAGE="https://apps.kde.org/kronometer https://userbase.kde.org/Kronometer"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64"
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
+	>=kde-frameworks/kcolorscheme-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+"
+RDEPEND="${DEPEND}"
diff --git a/x11-misc/kronometer/metadata.xml b/x11-misc/kronometer/metadata.xml
index d925f2439758..3ab22ed86477 100644
--- a/x11-misc/kronometer/metadata.xml
+++ b/x11-misc/kronometer/metadata.xml
@@ -6,6 +6,7 @@
 		<name>Gentoo KDE Project</name>
 	</maintainer>
 	<upstream>
-		<bugs-to>https://bugs.kde.org/</bugs-to>
+		<bugs-to>https://bugs.kde.org/enter_bug.cgi?product=kronometer</bugs-to>
+		<remote-id type="kde-invent">kde/kronometer</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/x11-misc/libinput-gestures/Manifest b/x11-misc/libinput-gestures/Manifest
index 486bab2c668c..853044b9458b 100644
--- a/x11-misc/libinput-gestures/Manifest
+++ b/x11-misc/libinput-gestures/Manifest
@@ -1,7 +1,4 @@
-AUX libinput-gestures-2.73-python-39-tests.patch 369 BLAKE2B c3157b64059679bf1e6f8e7ff24aef39032272f42d8f45d521c60c112afa33ed600fd05ee9dc6c06c7cc1c0c038ebd2991973df67c06bd7a88ea1cc7d269777c SHA512 ef0b9a72bcc298ca3a15d122a29ea8229efe338741a41d5bbd1d84680b893edf60a5605b9e777952be29198ce44629619cdbc9cf37fc8a41f9763a098f6679c9
 AUX libinput-gestures-2.76-zombie.patch 712 BLAKE2B cc9b8744d651ad4afde2ceed770316eadb68ead8433b1b7779adefbad860c8a244d8c455f4442eab68ea6ae7217c8e2f3e666d56476553e9636de6adf8f5e056 SHA512 c573a53d9f0f83c2d87ad6050bfe89c64ff64e6d35a4516bd5cc61d1f89a05f0de7fd94ef2c949c77049ef2d81a472cee31eb50c52556e721851d09a8503da29
-DIST libinput-gestures-2.73.tar.gz 28771 BLAKE2B 9f3c546b637b0038431517e2df5e3dfba4fbb7db708f108dd7a979e6674b2bdd44b2b877b5e200c05373a57bfeffefadfde59bc6c403f7188e349c2e051d8683 SHA512 8e46931c76541eb836b1bd79295f05fdc0e22091d1693eac1cc9c16407830806f9e56819e5fb8ba3eed7a26664946010d24d62d99131bcf71b1d8a3682f34ec6
 DIST libinput-gestures-2.76.tar.gz 28913 BLAKE2B d1c610af1eaf48170c08bea1eb92ce3cc36efc8f8035ea5f00cdf151bfe5c8d14368e4a37f8eb9cca7e59742136ba65909c9a468ba254a78d35dcaba7500ce62 SHA512 001c6c64e9ca52b4a7453837448803c797cc746fac04ad15613aa20a6bb33c44b441c343dfa56f23fa195fc7216a6d6c00a88f13e39481a12654a3a1a6dbdd98
-EBUILD libinput-gestures-2.73.ebuild 1478 BLAKE2B f2fbfb5dbed155de1061061e04f4af8eaad92988bfbad8cba457058c0ac4c8780a19c9f547a2b4c72dbb3760203ab2f7c728f5c6e964566356e12763b1b03f24 SHA512 a682d442e50ea1c177cdc1e298fed2f8afb74b1b0be677cd10c29c2ca8b31f314786e24093b6a771088edcaf200d83fbb3d8a24533beb127a9a40963277beaf8
-EBUILD libinput-gestures-2.76.ebuild 1359 BLAKE2B 4233b25eb5a6b5cf9912a7eb25873cd969933f44ddbf51ece040c23bc80d3832714ffc2eb698c1866c4e5d96a255257ac707d2eec1e95e5bea31d7bd856d051a SHA512 2bb6b338e48e86c93d0306678b30da907a64993748aea4b71171a20a2f42ac9f8d809df44380a43fa6e81e93341793ce3e00135e41582715ffd98a654b53276c
+EBUILD libinput-gestures-2.76.ebuild 1345 BLAKE2B 6220a27fa33c4988db463104e5c656d1d09174899d86861aab9fa5f729f01645d884f10c12e98f014e26b41cdaa19689ef23be2a559f8baaf405443f65143512 SHA512 414ae743a1ea8ef0eefa5d4d79cb4f3348dc277c91fc2fb8662cba3bafe342df8790ac91d35e442de88b36dbde829aaae98a5cfa7989c69536b41f157827e6c6
 MISC metadata.xml 939 BLAKE2B e6b0177969e57bb6ffdb25d143c3dab5d70a3071fca524abc4d573f223229b06d6f65189cf5bf06921b62a934bb9dea23d80799548930c7c445ed4fc1d70032b SHA512 93c4abc3fa6caecd36ab533d7dd1489070409646375c63fb4dfc361d419e321eeade7959d6c609b611983178e0967a5fb648edfc216bad36e9dea788e7d5e01a
diff --git a/x11-misc/libinput-gestures/files/libinput-gestures-2.73-python-39-tests.patch b/x11-misc/libinput-gestures/files/libinput-gestures-2.73-python-39-tests.patch
deleted file mode 100644
index 4d14f13f2b8d..000000000000
--- a/x11-misc/libinput-gestures/files/libinput-gestures-2.73-python-39-tests.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/internal b/internal
-index 432179d..6898173 100755
---- a/internal
-+++ b/internal
-@@ -1,7 +1,7 @@
- #!/usr/bin/env python3
- 'Command line program to exercise/test/debug the _internal command.'
- # Mark Blakeney, Oct 2019
--import sys, importlib, argparse
-+import sys, importlib.util, importlib.machinery, argparse
- from pathlib import Path
- 
- CMD = '_internal'
diff --git a/x11-misc/libinput-gestures/libinput-gestures-2.73.ebuild b/x11-misc/libinput-gestures/libinput-gestures-2.73.ebuild
deleted file mode 100644
index 93c9ae3b00fb..000000000000
--- a/x11-misc/libinput-gestures/libinput-gestures-2.73.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit python-single-r1 xdg
-
-DESCRIPTION="Actions gestures on your touchpad using libinput"
-HOMEPAGE="https://github.com/bulletmark/libinput-gestures"
-if [[ ${PV} == *9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/bulletmark/${PN}.git"
-else
-	SRC_URI="https://github.com/bulletmark/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-3+"
-SLOT="0"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-# This is completely broken
-RESTRICT="test"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-libs/libinput
-	x11-misc/wmctrl
-	x11-misc/xdotool
-"
-DEPEND="
-	dev-libs/libinput
-	dev-util/desktop-file-utils
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-python-39-tests.patch"
-)
-
-src_prepare() {
-	default
-
-	# Fix docdir installation path
-	sed -i "/^DOCDIR/s@\$NAME@${PF}@" libinput-gestures-setup \
-		|| die "sed failed for libinput-gestures-setup"
-}
-
-src_test() {
-	emake test
-}
-
-src_install() {
-	default
-	# Actually respect the python target setting
-	python_doscript "${PN}"
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-
-	elog "You must be in the input group to read the touchpad device."
-
-	if ! has_version x11-libs/gtk+:3 ; then
-		elog "${PN}-setup script supports GNOME via x11-libs/gtk+:3."
-	fi
-	if ! has_version kde-plasma/kde-cli-tools:5 ; then
-		elog "${PN}-setup script supports Plasma 5 via kde-plasma/kde-cli-tools:5."
-	fi
-}
diff --git a/x11-misc/libinput-gestures/libinput-gestures-2.76.ebuild b/x11-misc/libinput-gestures/libinput-gestures-2.76.ebuild
index f6e072b536d2..2d50443a9876 100644
--- a/x11-misc/libinput-gestures/libinput-gestures-2.76.ebuild
+++ b/x11-misc/libinput-gestures/libinput-gestures-2.76.ebuild
@@ -53,7 +53,7 @@ pkg_postinst() {
 	if ! has_version x11-libs/gtk+:3 ; then
 		elog "${PN}-setup script supports GNOME via x11-libs/gtk+:3."
 	fi
-	if ! has_version kde-plasma/kde-cli-tools:5 ; then
-		elog "${PN}-setup script supports Plasma 5 via kde-plasma/kde-cli-tools:5."
+	if ! has_version kde-plasma/kdesu-gui ; then
+		elog "${PN}-setup script supports Plasma via kde-plasma/kdesu-gui."
 	fi
 }
diff --git a/x11-misc/lightdm-mini-greeter/Manifest b/x11-misc/lightdm-mini-greeter/Manifest
index f20bf4774163..56d62893ccdc 100644
--- a/x11-misc/lightdm-mini-greeter/Manifest
+++ b/x11-misc/lightdm-mini-greeter/Manifest
@@ -1,9 +1,3 @@
-DIST lightdm-mini-greeter-0.3.4.tar.gz 27327 BLAKE2B 5f16b3d785e6773c127927caccfcd53089f3f31a8f1cc4c34ab09baf3cfebf9aabff45b5c76b1efdb850cde550e9335f3b8e8cd00d623a501346b9fe4e0d8e70 SHA512 dd605aaed14ead44962ef34d1d42bb350abc25f2975b2d1ed0b58e852b8f75805015ab4908a2414ebee3339e087f7d1e757f09345affb6a69bcac250ce47914f
-DIST lightdm-mini-greeter-0.4.0.tar.gz 28761 BLAKE2B 3f35a0d6c50ef96e995b0d96a509ec0cd2feb68dc262aaf1dc353f5cac6677abd79a0f1cf4c1119f4d96c8193b5f58f5938801503979682f85037cc2d6330ce9 SHA512 c195d16f2650a1680e6fd13493c666d5bdfd2badf2dc8c3f09a4cb973eeaf1412bf7d4c9d38c28d408ad83d65f3a4bd27b2bb7071182ca108bd2bcb94164d202
-DIST lightdm-mini-greeter-0.5.0.tar.gz 32039 BLAKE2B 7fbef14d96e7ca5b80377069d8c4240142a8e6fc312ea9aa48343810375009dc416adb20f6a3bc113fcc4fb5a48d00e80dd410847c1b30b9030da2981ee19438 SHA512 4d1a34d78759562ef42237028e5de07e0d807f1effd2a65b0f7a735fe9ae78acb6fb6f51111ecf371b307e7973ec64c9dddd85013ea1ce0b2ea6376bce320c12
 DIST lightdm-mini-greeter-0.5.1.tar.gz 32132 BLAKE2B 851b4e1ee9d5205575adb2b81cbaa61eac10bd977dd8f30771a9e7f968802115ac57a09401e6931cd3292f36fdabd0333e9c0729d2246a6394fb71c61311a9dc SHA512 231845c79da5e938d4ab3045a17b9c7a7becde491ea64a19934d42495bdbafd7b329c07a72162b9b1514b7895fe59186296f8157a711a46f14b05f21c7c90eaf
-EBUILD lightdm-mini-greeter-0.3.4.ebuild 586 BLAKE2B f9a8847e8b5a2a93fefc3100dbd0f708f48fc095b2c6ccc10ca8b783348cf88ddd9f70b6e9f83df2115197e29835337f5c53971eb9cf11fe9ed9180c5737e1e2 SHA512 6e029e59fdd2e9f978bc508259aec005e86d51a7fc3392f86cef91953563e9194c2c5205a2ede04e170702a215be6811965eb375c88673dac440d454f9e34f69
-EBUILD lightdm-mini-greeter-0.4.0.ebuild 586 BLAKE2B 45bc8be020848e4319012893c3753298f50613f31af48447b4054fede4c9192b380439761bdddbc6f219ca1fbcf53d9dcf82e6b7684cdd637de7327a3b53c072 SHA512 e21a9a3a865575fde2af6facb530c00ec0cc96272d5a15819acd24e3f14838e29110bc2f2bfe5bf28055b61900ff9f8c16087883ac4a55e52bede87587e059f8
-EBUILD lightdm-mini-greeter-0.5.0.ebuild 631 BLAKE2B 46b8d2ca7baadf2f690bed6339bce6ee0daffec95a66fdee9d4c915e7e6b781a6da4adb0333069bda603f2fc6374a494d1c5a5b2bcd066874612079f0bb18ae6 SHA512 c369573bee92c4b4df5a344f44c55da95e8b51a341538d4ac87889de9744e1dff8819a7f5092f4f532e089b2dde0e1557d831424c538b9e8a8a7148c9857dfaf
 EBUILD lightdm-mini-greeter-0.5.1.ebuild 631 BLAKE2B 46b8d2ca7baadf2f690bed6339bce6ee0daffec95a66fdee9d4c915e7e6b781a6da4adb0333069bda603f2fc6374a494d1c5a5b2bcd066874612079f0bb18ae6 SHA512 c369573bee92c4b4df5a344f44c55da95e8b51a341538d4ac87889de9744e1dff8819a7f5092f4f532e089b2dde0e1557d831424c538b9e8a8a7148c9857dfaf
 MISC metadata.xml 265 BLAKE2B f0992dfff86a45a4bf2fa760bb9612db8a0cf5d1d884c00338d4f69243cb3eaf825dd04e7f6d811fbe897b86ceca362944be74a9ae800b7a7cdcf10f84d1c126 SHA512 0422ff624eba7513e3debf496fa36583daf2110e8ddc1ab2f95bea5b40de5a2e59bfba8ad6248ac495f7c9ce9f1505b255a6e9f97a0246dbbdca44c2b4facbe8
diff --git a/x11-misc/lightdm-mini-greeter/lightdm-mini-greeter-0.3.4.ebuild b/x11-misc/lightdm-mini-greeter/lightdm-mini-greeter-0.3.4.ebuild
deleted file mode 100644
index a895e39cbe5d..000000000000
--- a/x11-misc/lightdm-mini-greeter/lightdm-mini-greeter-0.3.4.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="A Minimal, Configurable, Single-User GTK3 LightDM Greeter"
-HOMEPAGE="https://github.com/prikhi/lightdm-mini-greeter"
-SRC_URI="https://github.com/prikhi/lightdm-mini-greeter/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-
-BDEPEND="virtual/pkgconfig"
-
-RDEPEND="
-	>=x11-libs/gtk+-3.14:3
-	>=x11-misc/lightdm-1.12
-"
-DEPEND="${RDEPEND}"
-
-DOCS="CHANGELOG.md README.md"
-
-src_prepare() {
-	eapply_user
-	eautoreconf
-}
diff --git a/x11-misc/lightdm-mini-greeter/lightdm-mini-greeter-0.4.0.ebuild b/x11-misc/lightdm-mini-greeter/lightdm-mini-greeter-0.4.0.ebuild
deleted file mode 100644
index c4f43941a508..000000000000
--- a/x11-misc/lightdm-mini-greeter/lightdm-mini-greeter-0.4.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="A Minimal, Configurable, Single-User GTK3 LightDM Greeter"
-HOMEPAGE="https://github.com/prikhi/lightdm-mini-greeter"
-SRC_URI="https://github.com/prikhi/lightdm-mini-greeter/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-
-BDEPEND="virtual/pkgconfig"
-
-RDEPEND="
-	>=x11-libs/gtk+-3.14:3
-	>=x11-misc/lightdm-1.12
-"
-DEPEND="${RDEPEND}"
-
-DOCS="CHANGELOG.md README.md"
-
-src_prepare() {
-	eapply_user
-	eautoreconf
-}
diff --git a/x11-misc/lightdm-mini-greeter/lightdm-mini-greeter-0.5.0.ebuild b/x11-misc/lightdm-mini-greeter/lightdm-mini-greeter-0.5.0.ebuild
deleted file mode 100644
index a8f82dec16b8..000000000000
--- a/x11-misc/lightdm-mini-greeter/lightdm-mini-greeter-0.5.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="A Minimal, Configurable, Single-User GTK3 LightDM Greeter"
-HOMEPAGE="https://github.com/prikhi/lightdm-mini-greeter"
-SRC_URI="https://github.com/prikhi/lightdm-mini-greeter/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-
-BDEPEND="virtual/pkgconfig"
-
-RDEPEND="
-	>=x11-libs/gtk+-3.14:3
-	>=x11-misc/lightdm-1.12
-"
-DEPEND="${RDEPEND}"
-
-DOCS="CHANGELOG.md README.md"
-
-src_prepare() {
-	sed -i -e 's/-Werror//' Makefile.am || die
-
-	eapply_user
-	eautoreconf
-}
diff --git a/x11-misc/makedepend/Manifest b/x11-misc/makedepend/Manifest
index bfc26e3289f3..5bdefc0e22dd 100644
--- a/x11-misc/makedepend/Manifest
+++ b/x11-misc/makedepend/Manifest
@@ -1,3 +1,3 @@
 DIST makedepend-1.0.9.tar.xz 145080 BLAKE2B 7f8b2c0a3992a7c87a37f152eb5df1e6a881c0523f4cc4e69fd0ec3aa9aee37b6a0b32c548ad246151c938596b6d4a6c32d956aa9be1ed6c81978d313644f9a3 SHA512 68d289656314dc9f12c792d0e394cfbc95404a0d01155dbcb38313d451b506da48a3d44183f568a2cbb2b1d1da9e26703a0d92f2bb658f72fc968eeb03bf2fe8
-EBUILD makedepend-1.0.9.ebuild 340 BLAKE2B 026de57416ffa3310ffd443e56698e1d9274311e0fb113dd127f5aaf68b4be8213973c10d5c766303897fabf98fd03baf376899a6fc00df3e059f4aa47cfbcfd SHA512 5bb0de1fd396a9f43863b3e599cdeb9f5d89355798cc35570e0251b9a105557aa229b24fe65586a888858055fba93edc53192074b2dbab4081daca1d84638fb7
+EBUILD makedepend-1.0.9.ebuild 334 BLAKE2B c2fbe67167c1cf5a582dfc8dcecf6454f9246ed9bd73ab3384414941f0e25706ade4060b363bf054e29beebf1ce75a0e54b16c45ca3e22233cba18367eef6dd8 SHA512 17672613ca8337850b81c32d68013c1cd2b851f9217c16f727752afff469246af8c4b345dd26882bd6a7045d1eec2c9fd26f227f6e384b3394a346d056c916ff
 MISC metadata.xml 342 BLAKE2B a49c408048104b512588271539321c424bfc08a8f54bb82437429662bf85b3f5a09e3a93e0eb1c3a980d571cb08c1fbce58ab5f97f160923ff253c0608206056 SHA512 d2bab9cef77003c68547c0ccf1a454953d0d55edea087963d67f7b6e8ecfc78b811f8f740aa1a7d6374d5a417c66963427b9fe2b1fc1b88d2d1d669eae583d3a
diff --git a/x11-misc/makedepend/makedepend-1.0.9.ebuild b/x11-misc/makedepend/makedepend-1.0.9.ebuild
index cbda29127cd3..964073a1af4e 100644
--- a/x11-misc/makedepend/makedepend-1.0.9.ebuild
+++ b/x11-misc/makedepend/makedepend-1.0.9.ebuild
@@ -7,4 +7,4 @@ XORG_TARBALL_SUFFIX="xz"
 inherit xorg-3
 
 DESCRIPTION="create dependencies in makefiles"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
diff --git a/x11-misc/mate-notification-daemon/Manifest b/x11-misc/mate-notification-daemon/Manifest
index 18c6c37872da..f52bdad23c14 100644
--- a/x11-misc/mate-notification-daemon/Manifest
+++ b/x11-misc/mate-notification-daemon/Manifest
@@ -1,8 +1,6 @@
 AUX org.freedesktop.Notifications.service 94 BLAKE2B 1a97aac2db9c803c9e4babf9067283b564a1eecb1d251aee3a5e66b8a4f63d2554e3e09ea06749383ce3d5b8e77c8cc3bd87ae2dde48ae8feb4886ecaf7a3c27 SHA512 0575cbfc094455c0a2f04faa534a5e0d9cc41e6d9566ab9bcb0fcbce99e142213ded786ad00c36dc434ae1b9208d34d234a341dfc86adb72925dad0ee2b25f97
-DIST mate-notification-daemon-1.26.0.tar.xz 421032 BLAKE2B 3f55a281cc51e63245371a1bf4ddadb2be4fa09bf16a4ffac701d4530f519a65e2ff69c7e58e6589fa923d3af86315e36d5445a6a1915a6857271933605eaaac SHA512 5249cf14ba93f2e74b9774226c5d0f5e90a517df07569e16a23af7053f5ef160afe98c8a3452baf80c243272763eee1fde0b84f434f55df1f9de26298361a1dc
-DIST mate-notification-daemon-1.26.1.tar.xz 428836 BLAKE2B 78b852f8b6f6f2cdae46831c527ccca24fddf0c12660a886e5eb1b31c1046f1fcaa64de42915038306288f6baef6071ef4347f32b5cce30e4d2488e7bdc6c6d0 SHA512 c7aaef499acb2829f9833734a57e77a11a321369cb5134a4c49bb3c1e9899951c6c3702d3aac1dff6ce1bb8e60e41fc7ac31046e3346852d2da5d4dacf849a1e
 DIST mate-notification-daemon-1.28.0.tar.xz 433572 BLAKE2B 89c386fb7707b87de61e5346ab018227864427d590e2908f0c85b8697d2d19d3528870f701adfa8f9657ea395718724d6398baf325d0b1d68284eb855f16df3f SHA512 dba0989945b81ff0fed5e77ac8ef7c96bf52ee854c9dc0f46549697e0d0537a8ff4a9491839076768443cc62140d1dfbf911aee489ab568c2975b67c52c78d2e
-EBUILD mate-notification-daemon-1.26.0-r1.ebuild 1173 BLAKE2B c83321088f9c1451085dbe52a4489708f633e883692633a98df15ffd9c2fa866aabe5edefd94235e90a8c4aebeef90528f076e96b2aa089383f7da7aec6c2ee4 SHA512 d11be27bf0cebe45922d5e9a29f189e02df02fb7efc0c34b08ce1fc549cb7c75c42c25c5d0ff98fe9718ed99b5281071e4b8893df8e0662b4b0880b574715dd2
-EBUILD mate-notification-daemon-1.26.1.ebuild 1207 BLAKE2B 03ae7c8278dcafe43fe7de6927af9cf830ab1d9918bcce927c50782ce70e5d522688b6afa344206ea4f6397f7cd44f09843d59345f2042ea4d8972757ec8dbe0 SHA512 7132a6b77ed6f9e33f5b8b5d1faad8a1bdb0022ce946faab1c1e7c47f2776cb5936678906e64819d870151bbe6c57fc277afbd7ae5a8f9ce5da81daed78c8e4d
+DIST mate-notification-daemon-1.28.1.tar.xz 433384 BLAKE2B 688ef695520eba6e7964acff31303978c99dbfc724d6931ad341c2d3608fccc95bf37893b0445897e67572e52ce2b9372b09c98ba6b1cb3d3bf3bd4648269288 SHA512 72b6b4579d0571638708c5b326cad1b0de8aa2e65b775bf687bf944bca8db74177f018fc105465877f18eeb8ee297350ce8aba74a206a24f3f6c2e42af97ace5
 EBUILD mate-notification-daemon-1.28.0.ebuild 1202 BLAKE2B 3eeb4e7e51bcf45328391d4dac333d09b4d29aa92becfee20fb1b4233bd584ee78140b34c24754c3aa9f2a5610ca89ba168f196f5c6c3a031d340eb98581e999 SHA512 29f4ec89fabe31767ea039ba6eb466160b650f99e364dd322d6198bcdf577a5f58126ed3b3039a72400ade72b192cee8a10bd9ac41d6ded7d279134df1eaab8b
-MISC metadata.xml 270 BLAKE2B f0aabf52ce6cd0597d84990d03b9f311d785821c68fbbed96a2a27227c0a0e9e591d76863e1afd153e4ba5b4edfaba3b0b33287085c4d8a4d8b9e471b4ae6db2 SHA512 ea3340fd829238d067e7d59bac716c0e0b4810d820cee869c8e67611ad0e65b05652ed07349b1fad72ef3a008e15dbadb5af76dd0e5e557a0200b5f3fa4cbc20
+EBUILD mate-notification-daemon-1.28.1.ebuild 1205 BLAKE2B fdb9f74fb292f56429668480817b7ae9d9d7572ad789a0c242bcf8a3984788cecdceb43e39b4e01732743614010465b1d2450abea038043044f8d695ded21357 SHA512 919c3e2fef8764a6fc44b30bfb812c466b4aadaa1a8fd8de30b23debd2f99f29388460133b6e34071536fd1069be3ad163bc8beea7a2307f01e6fea932686e1b
+MISC metadata.xml 492 BLAKE2B 813bf0f67b7d6c0c765b3c96a5fbcd09639008df4fc720c11a7472e3d4832a41b144cbf608ade4e522fac34b2c4ddc1db74daa7274853cb75dbd1da14b39d627 SHA512 df124e7affff689090d188be9df708c5519dd6ca1d51e5d61e2e174604600d7ddab08a4f96864d096640e67acefe38af97d5eaa38b85aa78d0603afef437d317
diff --git a/x11-misc/mate-notification-daemon/mate-notification-daemon-1.26.0-r1.ebuild b/x11-misc/mate-notification-daemon/mate-notification-daemon-1.26.0-r1.ebuild
deleted file mode 100644
index 0a02cc9cd01d..000000000000
--- a/x11-misc/mate-notification-daemon/mate-notification-daemon-1.26.0-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MATE_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~loong ~riscv x86"
-fi
-
-DESCRIPTION="MATE Notification daemon"
-LICENSE="GPL-2+ GPL-3+"
-SLOT="0"
-
-IUSE="nls X wayland"
-REQUIRED_USE="|| ( X wayland )"
-
-COMMON_DEPEND="dev-libs/atk
-	>=dev-libs/glib-2.50:2
-	>=dev-libs/libxml2-2.9.0
-	>=sys-apps/dbus-1
-	x11-libs/cairo
-	>=x11-libs/gdk-pixbuf-2.22:2
-	>=x11-libs/libnotify-0.7
-	>=x11-libs/gtk+-3.22:3
-	>=media-libs/libcanberra-0.4:0[gtk3]
-	X? (
-		x11-libs/libX11
-		>=x11-libs/libwnck-3:3
-	)
-	wayland? ( gui-libs/gtk-layer-shell )
-"
-
-RDEPEND="${COMMON_DEPEND}
-	!x11-misc/notify-osd
-	!x11-misc/qtnotifydaemon
-	!x11-misc/notification-daemon
-"
-
-DEPEND="${COMMON_DEPEND}
-	app-arch/xz-utils
-	dev-util/gdbus-codegen
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	mate-base/mate-panel
-"
-
-src_configure() {
-	mate_src_configure \
-		$(use_enable nls) \
-		$(use_enable X x11) \
-		$(use_enable wayland)
-}
-
-src_install() {
-	mate_src_install
-
-	insinto /usr/share/dbus-1/services
-	doins "${FILESDIR}/org.freedesktop.Notifications.service"
-}
diff --git a/x11-misc/mate-notification-daemon/mate-notification-daemon-1.26.1.ebuild b/x11-misc/mate-notification-daemon/mate-notification-daemon-1.28.1.ebuild
index 737071d3f840..f6253524a304 100644
--- a/x11-misc/mate-notification-daemon/mate-notification-daemon-1.26.1.ebuild
+++ b/x11-misc/mate-notification-daemon/mate-notification-daemon-1.28.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -19,8 +19,7 @@ SLOT="0"
 IUSE="nls X wayland"
 REQUIRED_USE="|| ( X wayland )"
 
-COMMON_DEPEND="
-	>=app-accessibility/at-spi2-core-2.46.0
+COMMON_DEPEND=">=app-accessibility/at-spi2-core-2.46.0
 	>=dev-libs/glib-2.50:2
 	>=dev-libs/libxml2-2.9.0
 	>=sys-apps/dbus-1
diff --git a/x11-misc/mate-notification-daemon/metadata.xml b/x11-misc/mate-notification-daemon/metadata.xml
index e215d24b5b1b..8b5f9c019d5a 100644
--- a/x11-misc/mate-notification-daemon/metadata.xml
+++ b/x11-misc/mate-notification-daemon/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">
+		<name>Oz Tiram</name>
+		<email>oz.tiram@gmail.com</email>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">mate-desktop/mate-notification-daemon</remote-id>
 	</upstream>
diff --git a/x11-misc/menumaker/Manifest b/x11-misc/menumaker/Manifest
index 26fcadb0cca4..ecc2b150b863 100644
--- a/x11-misc/menumaker/Manifest
+++ b/x11-misc/menumaker/Manifest
@@ -1,6 +1,4 @@
 AUX menumaker-0.99.12-AM_PATH_PYTHON.patch 2600 BLAKE2B bd7b4b3628c9628ca9b381f292e5919c093d492b2f87ce6ff595be15e57d4e8b92e417fcf8856ed8e7625a1eea337a361c321c0b6f87a23f462f5dc1a79d1756 SHA512 db92e8bde59afa52a3d38681deaab37642830964b717a4bb39134afc607d46f33d983f081e9b96848e63d7f7ea99a3ecdc8df7c0bc3dda5156c3e0d9f8bcaca0
-DIST menumaker-0.99.12.tar.gz 206208 BLAKE2B c909a103bd031f385a1b7c19c8f17ac97310b3f19b2cf3eeb4b77ebfa82ac388cb9d76b1c88523942ce9d20016ba86bd4fa3741b31e3f6cd9ca63e10c8cab65e SHA512 dceef85da4d68a7f13bb59e1d93a51632d4134e55c59fa9cdf4ec4497eb502959c1b65ccaa56c2410f2fc5a770a9b023ddec05e80d186c88cdc1a351e1869af6
 DIST menumaker-0.99.14.tar.gz 205664 BLAKE2B b86e46ec07ea14b695c9350e5156081db7a5ae278a7356d98ae1e1a488d83da02d3efd547f9c7d3ac5bdc894b77085434a05e27fd76c09cafc88f1cbce4c428a SHA512 81d44c1917d0fd4cd1c8b7cdd4ce12795fee7cc286959a7fc9dc6f84a096ea850a4348d98b6a7dce153c5d07fdb8b3aaf13f3476a9f34dd56646af3097d406d0
-EBUILD menumaker-0.99.12.ebuild 903 BLAKE2B 31e7c5383556f830a85d6a141fdec74d81c9f5423cf1787c268268fc21c2f09b19f2cdef667258b54ef147a8eccfb57712d717c4d1ec4f994b5b99b6b118205a SHA512 bda0e759580a40a907fe2a8c40d9db2c00009f6b658043eadf918bbce8d0097714f74e7fd21d4171428f38b5c7e71a7f787c5d6830ff916c3c79439dffc9d98b
-EBUILD menumaker-0.99.14.ebuild 918 BLAKE2B a2e4246efbc1c00bdaae2e3845280a4e2511dd11740477bfba95abf7f6ff65bb7e11bcd983e22fb13fc800ac6f0e8291fe8e07956fd7609043a5673148c310d2 SHA512 287a2fa75c7e7bbab6a5bfbdc7136ecb87855018d0c16d1039ad6cecd6b47a776fa43566e725d0c371eac1a3c7989f7e9f4b32a009511c8d4b1171481fb0128b
+EBUILD menumaker-0.99.14.ebuild 919 BLAKE2B 2eb0105c7ae8c56e872f8384ab78152eca4c72b0f16d22ae20e2998db3148005ed06b2c77ec741a20f14f901ba2d6e4a7ae3ee93b9500185e34096e69e37836e SHA512 bb3a7644b9d6507955d3bf8666ea56993d72fb6d6b6f275ffcd47a97cc13c6e89f49f56cd446783fd22fd4138f64bfa62058eb3c270bb087fd29c951b29158fc
 MISC metadata.xml 271 BLAKE2B 1dc69a9fa584e74d3e89a6d55654a9129d58355d3198465b14cc37a787edd4fc6619295e9b1c5fdb07d24d99d6f713b8e7c5a8dd812b6f9a7b0aeccaef69ea09 SHA512 959fc8f36158f77b189c8deb067ec4479dfdc929f8001b95a0a1b3d34ad8c32e11e9ae0de907437f7344d5bdff8241db36a36baa1f0045a8fc3d601d7e432cf5
diff --git a/x11-misc/menumaker/menumaker-0.99.12.ebuild b/x11-misc/menumaker/menumaker-0.99.12.ebuild
deleted file mode 100644
index 236df97b16f1..000000000000
--- a/x11-misc/menumaker/menumaker-0.99.12.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_10 )
-
-inherit autotools python-single-r1
-
-DESCRIPTION="Utility that scans through the system and generates a menu of installed programs"
-HOMEPAGE="http://menumaker.sourceforge.net/"
-SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-
-IUSE="doc"
-
-RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
-	doc? ( sys-apps/texinfo )"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-AM_PATH_PYTHON.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	ECONF_SOURCE="${S}" econf PYTHON="${EPYTHON}"
-}
-
-src_compile() {
-	default
-	use doc && emake html
-}
-
-src_install() {
-	default
-	use doc && emake DESTDIR="${D}" install-html
-	python_optimize
-	python_fix_shebang "${ED}"/usr/bin/mmaker
-}
diff --git a/x11-misc/menumaker/menumaker-0.99.14.ebuild b/x11-misc/menumaker/menumaker-0.99.14.ebuild
index cce59403426d..d8c339c659f3 100644
--- a/x11-misc/menumaker/menumaker-0.99.14.ebuild
+++ b/x11-misc/menumaker/menumaker-0.99.14.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{10..11} )
 inherit autotools python-single-r1
 
 DESCRIPTION="Utility that scans through the system and generates a menu of installed programs"
-HOMEPAGE="http://menumaker.sourceforge.net/"
+HOMEPAGE="https://menumaker.sourceforge.net/"
 SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/x11-misc/notification-daemon/Manifest b/x11-misc/notification-daemon/Manifest
index 0730c876613c..4f26acfb7e9d 100644
--- a/x11-misc/notification-daemon/Manifest
+++ b/x11-misc/notification-daemon/Manifest
@@ -1,3 +1,3 @@
 DIST notification-daemon-3.20.0.tar.xz 340752 BLAKE2B 9ded1efdb38de0097495ff570b9b91eb151e5eb030fcb9364a5ac04a4a5631c0a8483dc4068dd806d54ef0a096062ca92f9783f2030edb57f681b82015cf8584 SHA512 d9311c71a2915cb6e55bd1408e60b4d7b7fc24114410b8bd8cb358fe86c100198567099843b967f7e01ca03c91afe3f3980fb30b7f2c138bdab949e0e196a0f8
-EBUILD notification-daemon-3.20.0-r1.ebuild 843 BLAKE2B 6e3987bbd1dbd708fac6927f897047f617c9d2a2af3fde4c2aa334fec27e27b30c13754ac82e76554ccd33153ab4e1a3d5bf2c1b80e64fd4c829b0e29f68ed04 SHA512 9fdbdddb6ab0737259f29b21298e9592265d7cbb32fab58d3b83ad303676bf899578e7dc1603c5fc0b3133055bb48318ab5bc02ab5ef7bd130275cde7b618993
+EBUILD notification-daemon-3.20.0-r1.ebuild 837 BLAKE2B f7104fd6a1cd38595049cac1a6a3905567ff1fd4b776b8a55cd0b1f0c1ea72d8cf29562904e9a7d733906a0104ff71ee45dfbb6bddc52fc2d8b838b339e14019 SHA512 7b5fd3aa218682f8c6dd3e83751fb6ac65576fe150fb44e06cc9416c734ba12ee44918a71cce771126c3ee88a7ababa01f50da7afd51d2f2be02fa7f1cb4d547
 MISC metadata.xml 271 BLAKE2B 6b8f1b42c0f0856941fc57eb97168e8f7793202e26ff0c785ea4cc819ebe9d92c33a150c346204c3cefd0447dd470d817f02d4907b539782508101bef81fb9ef SHA512 593f44d05a25bcdde1b0e89f76e635d32711fc8fcda03f947a252864bf363191982b2cfb99af51c6e8674d93d695cdc8fbfe0c6df8163d3d86f970ed02620b2e
diff --git a/x11-misc/notification-daemon/notification-daemon-3.20.0-r1.ebuild b/x11-misc/notification-daemon/notification-daemon-3.20.0-r1.ebuild
index 4ab64e577887..aeab309d0a3c 100644
--- a/x11-misc/notification-daemon/notification-daemon-3.20.0-r1.ebuild
+++ b/x11-misc/notification-daemon/notification-daemon-3.20.0-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/notification-daemon/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 RDEPEND="
 	>=dev-libs/glib-2.28:2
diff --git a/x11-misc/pcmanfm-qt/Manifest b/x11-misc/pcmanfm-qt/Manifest
index c74d781842e7..7326b8689a0f 100644
--- a/x11-misc/pcmanfm-qt/Manifest
+++ b/x11-misc/pcmanfm-qt/Manifest
@@ -3,5 +3,5 @@ DIST pcmanfm-qt-1.4.1.tar.xz 390960 BLAKE2B 8a7e8dae9faefd77284a03526304e90f94fc
 DIST pcmanfm-qt-2.0.0.tar.xz 395756 BLAKE2B 75071c5f2a75e1d46749a9c289a9faf4cd341912b1d0e8d2ecafb99a23117582d7060635877fa215f2f3181dae5be0dadddb93987da57500ff5c1450e8b5961b SHA512 b4f46245d8e14874546bd95d47fdab41988a6caef3fef45509e3fd12f11d79ab71a0d44a60ca755b097caf7471bc3cd1160078f020270fd6a7cbf58283a4bda3
 EBUILD pcmanfm-qt-1.4.0.ebuild 1197 BLAKE2B 0e8683827fa03f6add30047df9b433906d39eda40256b65d69b9c83e79d1b5d6115a129a8333bebc801e49ad60f0032edbbd39567ffc837545845aaf425b943c SHA512 578c179d89a22583a8394f49a5018b03ca3f468be3bd1750b850e3378b4f1940f04ff7f986bb60b4fe40cb04b4df2ef30d8de741988c01fe39f6c2e5ac6bed3e
 EBUILD pcmanfm-qt-1.4.1-r1.ebuild 1246 BLAKE2B d246d59dc5f07566a416e4ac3ecfbe5e8e964c555bc4d9a2fe451b7eed8251cff023359d69bdafba2df43c6ce97a5f0f292db257ee8e259ead9471bc277d53dd SHA512 f6df35c985d4c7d82e8a325218066391c19ed4ab55a218fbff336a91e851c072c790d7d80a405e43b411b8b827576348dbb664526d630619dfed26cbaa86ba86
-EBUILD pcmanfm-qt-2.0.0.ebuild 1168 BLAKE2B 5f16618a83bc7fb18bdd1599bb7d238be70a4691002c0ab0cc663ee8c179027fc4aa71b8c79a55d60376a62eff0e0608d72d83e7b8371db55195a708a9ddd6eb SHA512 f8a0da9d48036d0b3830aacfdd428effae54fb44a0e93d13118b98e2ac4700201c75c6af6529cce01219b9eb8877f97ecb03706100701686c2b781a9aafae311
+EBUILD pcmanfm-qt-2.0.0.ebuild 1178 BLAKE2B c1780a60f75e663392d30d1a0fdf11578c5c4fe421c3232abcbc8cf685ffd71ea84f4f85ace50c9c80059751f4b9d77433c0011c60ca60b2b83e2e7a85c0a3a5 SHA512 fca9b3b66d3589a3263d3d4c3ab60b355e04ef7213dd103e0a79a4a80a81dfeef2da8b5f4403242e9f149c4071b067112aaff2d656412311974ee7a16ca71b75
 MISC metadata.xml 317 BLAKE2B 2d1773f0bd25bbd367f590a419615c5016ad850906f9a5858a6091109c359e9c677e2c58de2df9515dff7c1e2e659fd80e10b3e7ea605b5035c939790aadc4d6 SHA512 e91c385569fd6309b842e62b0303d4dc5ddb8721e39c9f1d22956c340c776edc940b727312f3307d8bbb6d5fd3459e410568c3170adc94bebc53e2811146fa7f
diff --git a/x11-misc/pcmanfm-qt/pcmanfm-qt-2.0.0.ebuild b/x11-misc/pcmanfm-qt/pcmanfm-qt-2.0.0.ebuild
index 68c3f864159d..c50b819774ae 100644
--- a/x11-misc/pcmanfm-qt/pcmanfm-qt-2.0.0.ebuild
+++ b/x11-misc/pcmanfm-qt/pcmanfm-qt-2.0.0.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~riscv"
+	KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 fi
 
 LICENSE="GPL-2 GPL-2+ LGPL-2.1+"
diff --git a/x11-misc/picom/Manifest b/x11-misc/picom/Manifest
index 8dccf2d69f63..dfc8e9b883dd 100644
--- a/x11-misc/picom/Manifest
+++ b/x11-misc/picom/Manifest
@@ -1,8 +1,8 @@
-DIST picom-10.2.tar.gz 287166 BLAKE2B feaa07fc5f0a53396675dfd4d8f2507caf6ce355b2db242b25b3559b287845b0505c48194e51c9c7fc6809dd10b871be6adf3e9fc87d91a41f01ccfeb87803ab SHA512 9c0351fbe8a9e76533243c8e76f8e7d10c1e49292f1c8e6c06f31fb0b512542a67970abe803d061c953546ff8d3e704488c263002a5a831f68deb010caee481d
-DIST picom-11.1.tar.gz 308617 BLAKE2B cb100ec8d7ae9a9b43d59fb6d8eaf7079f1a1ea8da6eddea4bfc67f0180d2d43da30bb63049d685da71d424cb9bc091216331d3f54678da6c6379ed4de2e6347 SHA512 94c3a17a51f4749453d7d6334f8041bd1ee9f676f94f93c9368f02783ac86650031421c3d2fdd05d177c4c8535a76a6aff2c8e3cae4ae99bff7c458bd921b536
 DIST picom-11.2.tar.gz 308679 BLAKE2B d592dce3e67bc3df68cbece00cd4446ea6214b994d9ceffdd3d43a983e4a520f7a92c9c09bec12f49f18b4e581a4122c363f8de0c156bfe2e99fa09b04ec2196 SHA512 df8fc1a593e108b37be185129ac1f3a23c2ae648a04352c45b9d5888838e5754c68f2eb684f12f1ed4d973eca0aef83a61789f028c63bc2d0f0f38902232aadc
-EBUILD picom-10.2.ebuild 1582 BLAKE2B be05958637eef0268c6285a02955204a8975727136f2085f02a78ba6b026abed970d931ad985f3a6d33ca4cefdf1e05b7594c697a26eb4098f4f36d35ba33504 SHA512 3492a5faa2f19323b592e957a3a36ad751d38e38a0317344c11b38dea8769262712281de36230b44f6a6ebf294becae564e56af896cc16a4ebe76ceb5b9e5729
-EBUILD picom-11.1.ebuild 1587 BLAKE2B 3540774ce9ccca4657d532e0ebeb499214486c23960f91844e68d263ea181622f80c25ec339a30a2bfa42ce096f1a8e20570f0267114e77af02fe5688b36b81b SHA512 661326ee9fbea475afa8c07af4953f3bf47d55b89e72458ed3d0be84297e1defc2b118cf742954ff88ad130592d67088b3287a1aad6cf93cd3900ba5b417e5a0
+DIST picom-12.2.tar.gz 673913 BLAKE2B 10b73334577481adbda571af8973dc3c166e33fa6dca3aec51263f9223b5ff28438b00090755a28f411a5df7b238c68bfadcf5c97a6f638a73d020ffa21dbcd0 SHA512 63129b5051253876aae8dd82cef78e3345b4f96554753bd1ecd7d9c31af369dc52c08226949545e39e14d35e4af4afad17a06cedc6aedff4ba52c53506605884
+DIST picom-12.3.tar.gz 673577 BLAKE2B 86d2a775ae5ef99fd1f9b9c07e803301b43898cbde8499e80d1cc6ab9f7774b417b76e6780448d53fd8585c522938dac697f811d1bd06d9d7c34dc292d0c6db3 SHA512 f158a517ad6bb6125dc718286663560d7a2297252ecaccef9f7620a1180d19f1c12e9bf7d0d91dadae458a45bbe94756a00c639395fbb8097f408b530c7066f6
 EBUILD picom-11.2.ebuild 1610 BLAKE2B b294c0f6e5d5bd0f704d250bb29dbfff86fb128ec5593fb26032d8e76a66ab16dbb9fed6b86ae50e4ea78d5b105d6984b65999f65ec1eee152d5817af1483076 SHA512 b3b4515255d9f6b79ef54615261841b9c54c46a8f137d2c601b5cfcd3ec58900a171be3bce5bab32d469c658d4e2edaed1bb28a019b96e122654abe4906c3907
-EBUILD picom-9999.ebuild 1548 BLAKE2B 131504220a29eefca9c905ceba1a3d3e728ace95443a2b353a105a59bf914d5608ac4f28fe57727fb55b683e77f20b245a9ffc40fb247ba2881904a059f48cd9 SHA512 6b8850854ae0a642624af47a124dbf1e77c0f6d4c391d10ef6eacb10f0136b6bf899d1ff0dba79781f575810e43f6a28a33ee0afd9d2d194105411d3035864d6
+EBUILD picom-12.2.ebuild 1525 BLAKE2B 8f27438179d5deb006dcbfb1be3346b65068d1b8425eec77a4b1aa3b796d874aba838ce8808b32f53d2105cfafc57c58d8c42176f6adce97b6c681a74140f5a7 SHA512 be544e11b25d7043a0eac33eb7dc7ae765e119a3170fa3760f5ab094dca8d579fc45a02989fefc570290b0540869443a2d65294959f34340dedb1da28d8f357f
+EBUILD picom-12.3.ebuild 1525 BLAKE2B 8f27438179d5deb006dcbfb1be3346b65068d1b8425eec77a4b1aa3b796d874aba838ce8808b32f53d2105cfafc57c58d8c42176f6adce97b6c681a74140f5a7 SHA512 be544e11b25d7043a0eac33eb7dc7ae765e119a3170fa3760f5ab094dca8d579fc45a02989fefc570290b0540869443a2d65294959f34340dedb1da28d8f357f
+EBUILD picom-9999.ebuild 1461 BLAKE2B c6ee87479cd06b87b953d22ad93a07857025cc886b20ccedcbf7caef974aa80ec4b167f1e718cfae8ff0b822f75bfcdf33dad4a7af0f7bb7b16e355b9d738ba8 SHA512 64f070ebfa03eb4e262997aa93cb05f87adc401a1d6784644639dd5d6b14a789e7f3dc9fdafc9e6f1e5b0f833f91fd06160b551f092ab2d033ba99d7ca45cc8d
 MISC metadata.xml 678 BLAKE2B a2e430318134d3080d018d14913dce148151db13f6e59ed2c8b3c4b10c07e0fc16c2b7e9fbd95c0e849739753b1b3572c1d96418fd19955b2c6def2c655444da SHA512 7a172584db948430c11f8b682a918bb0d49d454ab835592047aafa9cf06f418fe0e3bfb2704f6a5ba45998a64096085dc23a2c0379c6f582a63d36f9ebb8e1b7
diff --git a/x11-misc/picom/picom-11.1.ebuild b/x11-misc/picom/picom-12.2.ebuild
index e122ab5870bb..a9fd31dd11a2 100644
--- a/x11-misc/picom/picom-11.1.ebuild
+++ b/x11-misc/picom/picom-12.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..12} )
+PYTHON_COMPAT=( python3_{9..13} )
 inherit meson python-any-r1 virtualx xdg
 
 DESCRIPTION="A lightweight compositor for X11 (previously a compton fork)"
@@ -13,31 +13,31 @@ SRC_URI="https://github.com/yshui/picom/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MPL-2.0 MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="+config-file dbus +doc +drm opengl pcre test"
+IUSE="dbus +doc +drm opengl pcre test"
 
 REQUIRED_USE="test? ( dbus )" # avoid "DBus support not compiled in!"
 RESTRICT="test" # but tests require dbus_next
 
-RDEPEND="dev-libs/libev
+RDEPEND="dev-libs/libconfig:=
+	dev-libs/libev
 	dev-libs/uthash
 	x11-libs/libX11
 	x11-libs/libxcb
-	x11-libs/libXext
 	x11-libs/pixman
 	x11-libs/xcb-util
 	x11-libs/xcb-util-image
 	x11-libs/xcb-util-renderutil
-	config-file? (
-		dev-libs/libconfig:=
-	)
 	dbus? ( sys-apps/dbus )
 	drm? ( x11-libs/libdrm )
-	opengl? ( virtual/opengl )
+	opengl? (
+		media-libs/libepoxy
+		virtual/opengl
+	)
 	pcre? ( dev-libs/libpcre2:= )"
 DEPEND="${RDEPEND}
 	x11-base/xorg-proto"
 BDEPEND="virtual/pkgconfig
-	doc? ( app-text/asciidoc )
+	doc? ( dev-ruby/asciidoctor )
 	test? ( $(python_gen_any_dep 'dev-python/xcffib[${PYTHON_USEDEP}]') )
 "
 
@@ -53,7 +53,6 @@ pkg_setup() {
 
 src_configure() {
 	local emesonargs=(
-		$(meson_use config-file config_file)
 		$(meson_use dbus)
 		$(meson_use doc with_docs)
 		$(meson_use opengl)
diff --git a/x11-misc/picom/picom-10.2.ebuild b/x11-misc/picom/picom-12.3.ebuild
index 5500bc0c290b..a9fd31dd11a2 100644
--- a/x11-misc/picom/picom-10.2.ebuild
+++ b/x11-misc/picom/picom-12.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{9..13} )
 inherit meson python-any-r1 virtualx xdg
 
 DESCRIPTION="A lightweight compositor for X11 (previously a compton fork)"
@@ -12,32 +12,32 @@ SRC_URI="https://github.com/yshui/picom/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MPL-2.0 MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
-IUSE="+config-file dbus +doc +drm opengl pcre test"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="dbus +doc +drm opengl pcre test"
 
 REQUIRED_USE="test? ( dbus )" # avoid "DBus support not compiled in!"
 RESTRICT="test" # but tests require dbus_next
 
-RDEPEND="dev-libs/libev
+RDEPEND="dev-libs/libconfig:=
+	dev-libs/libev
 	dev-libs/uthash
 	x11-libs/libX11
 	x11-libs/libxcb
-	x11-libs/libXext
 	x11-libs/pixman
+	x11-libs/xcb-util
 	x11-libs/xcb-util-image
 	x11-libs/xcb-util-renderutil
-	config-file? (
-		dev-libs/libconfig:=
-	)
 	dbus? ( sys-apps/dbus )
 	drm? ( x11-libs/libdrm )
-	opengl? ( virtual/opengl )
-	pcre? ( dev-libs/libpcre )
-	!x11-misc/compton"
+	opengl? (
+		media-libs/libepoxy
+		virtual/opengl
+	)
+	pcre? ( dev-libs/libpcre2:= )"
 DEPEND="${RDEPEND}
 	x11-base/xorg-proto"
 BDEPEND="virtual/pkgconfig
-	doc? ( app-text/asciidoc )
+	doc? ( dev-ruby/asciidoctor )
 	test? ( $(python_gen_any_dep 'dev-python/xcffib[${PYTHON_USEDEP}]') )
 "
 
@@ -53,7 +53,6 @@ pkg_setup() {
 
 src_configure() {
 	local emesonargs=(
-		$(meson_use config-file config_file)
 		$(meson_use dbus)
 		$(meson_use doc with_docs)
 		$(meson_use opengl)
diff --git a/x11-misc/picom/picom-9999.ebuild b/x11-misc/picom/picom-9999.ebuild
index a5dd11d9c8ba..d6b45b376e57 100644
--- a/x11-misc/picom/picom-9999.ebuild
+++ b/x11-misc/picom/picom-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..12} )
+PYTHON_COMPAT=( python3_{9..13} )
 inherit git-r3 meson python-any-r1 virtualx xdg
 
 DESCRIPTION="A lightweight compositor for X11 (previously a compton fork)"
@@ -12,23 +12,20 @@ EGIT_REPO_URI="https://github.com/yshui/picom.git"
 
 LICENSE="MPL-2.0 MIT"
 SLOT="0"
-IUSE="+config-file dbus +doc +drm opengl pcre test"
+IUSE="dbus +doc +drm opengl pcre test"
 
 REQUIRED_USE="test? ( dbus )" # avoid "DBus support not compiled in!"
 RESTRICT="test" # but tests require dbus_next
 
-RDEPEND="dev-libs/libev
+RDEPEND="dev-libs/libconfig:=
+	dev-libs/libev
 	dev-libs/uthash
 	x11-libs/libX11
 	x11-libs/libxcb
-	x11-libs/libXext
 	x11-libs/pixman
 	x11-libs/xcb-util
 	x11-libs/xcb-util-image
 	x11-libs/xcb-util-renderutil
-	config-file? (
-		dev-libs/libconfig:=
-	)
 	dbus? ( sys-apps/dbus )
 	drm? ( x11-libs/libdrm )
 	opengl? (
@@ -39,7 +36,7 @@ RDEPEND="dev-libs/libev
 DEPEND="${RDEPEND}
 	x11-base/xorg-proto"
 BDEPEND="virtual/pkgconfig
-	doc? ( app-text/asciidoc )
+	doc? ( dev-ruby/asciidoctor )
 	test? ( $(python_gen_any_dep 'dev-python/xcffib[${PYTHON_USEDEP}]') )
 "
 
@@ -55,7 +52,6 @@ pkg_setup() {
 
 src_configure() {
 	local emesonargs=(
-		$(meson_use config-file config_file)
 		$(meson_use dbus)
 		$(meson_use doc with_docs)
 		$(meson_use opengl)
diff --git a/x11-misc/polybar/Manifest b/x11-misc/polybar/Manifest
index e8ef449a4eaa..1a58b4aed77b 100644
--- a/x11-misc/polybar/Manifest
+++ b/x11-misc/polybar/Manifest
@@ -1,4 +1,6 @@
-AUX polybar-3.6.3-fix-prefix.patch 350 BLAKE2B b5c1e349557ebf1ceb930564b5ab4f687c6f2c6d2f4adc9cff787f43a03b5e0d8d08dd0202f4b6c2c90f97e1ac9f94faa32bfea30f58d1ce05b658ef80bf02b5 SHA512 07da5e5409cee75f7bf32dfd4fafc8b9735d9f5a85e53cb1eae330030fb50c6a2c923a03c5703d923087994d2ed8665d09674c8028f1d28346a7289317f9195b
+AUX polybar-3.7.2-gcc15-cstdint-includes.patch 2184 BLAKE2B 0d906e4a01c92fc50ffd3cb887eadd1103ba0899aa6604bac0bf5d2fb0d231aadfd7bc1e5c3378accd9abccd6ace0fb15f1ace4a85155459d616de9ff64ea17d SHA512 169c9f5a602d0df718b52de4dff2b6250cf593e4acd2623dfb8e8059b45b0f483cc11a814661287362b25182268cbd6209752b74a1124cd3e3a7e23bcfd2cf27
 DIST polybar-3.7.1.tar.gz 495162 BLAKE2B 33ffb3bb3595a41cb82a5ee70c79f5a31f23b6463c156a704546c803f0f006780c59b04fe2d1479f52dd15a44534687f130dfde794ac08218df2b634b34838de SHA512 cb248fd904a89dbd88d2d1ab71aeaf31e2b5781304f126aeb489da1238681e354d5347555076e814751ef5bb6717a3a6742d1726cf4721697e75694c7643bed4
-EBUILD polybar-3.7.1-r1.ebuild 1518 BLAKE2B 1a9ff335b3e7402106b805d1b55cb99bd887de3b8f73828a768a358b8958c5749278f8c99c7d3541c3ce0039b22727cec3b21711ce5baf701c92c76659fc2937 SHA512 af8743c608403dff1ced983637d8ac294f41c8b3987a938afc1f71dc0eb6dd506fd70f62f98e804623c2c36dff609596744477e81d62c3052acf164477398d54
+DIST polybar-3.7.2.tar.gz 494383 BLAKE2B dda97c42de5f32a005ae6d4de737651278df0364187c735d7fa8a6d34e644b917ba3f32859cc19bd869c43f5d14f73ca734a4227651eb267724d808e4a766e08 SHA512 a0ee701533e101789f7eb95c71717ecf1d389a10b202d19261f9f71fee9d43fb8be17fb63e4a056c5e8bd62d2e669c95ee4d4b8c6bb06b933e1e4b26ab1a0624
+EBUILD polybar-3.7.1-r1.ebuild 1631 BLAKE2B 226f1293a5d34cf421b26d55c98916a0e7d55a609d622113a6b5363c9347852bfd778440c39a2f86d54e36d59aa721d697136c3a2f72a82b4cf97879a4f5d44d SHA512 6402c85813b18d29897076e1ad88da26b9c0465081c4b7ea1f3fca0af13971af16052dfcdd86d56cde4716e7f1989625af57fc49672b212077e6dba429eb8b5b
+EBUILD polybar-3.7.2.ebuild 1695 BLAKE2B 5666aef38ff0a9fc437bbb728560d1f2c2d999075357cfae7c5d57a7806a6174b14ade7e80e089d5d95cf2de21fe33fe80cde2656995445c29685623802994e0 SHA512 7b7e248ff90dec7c6e5e4c4ff6fd59600094cc2956200315433d0f6ce2903023d5242cedfe552c1536a0154c83d55172210c4359064fa0779312e06cf6aaace5
 MISC metadata.xml 585 BLAKE2B c792f265587effc07acc20f097adc1a1975d23ddf55ceb07b4bda02e61e1b48b1d20c5a07792ac18fa5f02949e0a88bc18fe6df2fffd9454406cda34ac33654b SHA512 c3f9080f68d989dbfd75492ec0c4870e4df9b0525a69256ac95bf55eea60022ac018cc1afe42677bc8f822beec75d137e1e7c8a876763c72664541a0a54b28f1
diff --git a/x11-misc/polybar/files/polybar-3.6.3-fix-prefix.patch b/x11-misc/polybar/files/polybar-3.6.3-fix-prefix.patch
deleted file mode 100644
index 1007d7237af7..000000000000
--- a/x11-misc/polybar/files/polybar-3.6.3-fix-prefix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f71801c8..0979f8af 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -63,7 +63,7 @@ endif()
- 
- if(BUILD_CONFIG)
-   install(FILES ${CMAKE_SOURCE_DIR}/doc/config.ini
--    DESTINATION /etc/${PROJECT_NAME}
-+    DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/${PROJECT_NAME}
-     COMPONENT config)
- endif()
- 
diff --git a/x11-misc/polybar/files/polybar-3.7.2-gcc15-cstdint-includes.patch b/x11-misc/polybar/files/polybar-3.7.2-gcc15-cstdint-includes.patch
new file mode 100644
index 000000000000..97d9a4c7720b
--- /dev/null
+++ b/x11-misc/polybar/files/polybar-3.7.2-gcc15-cstdint-includes.patch
@@ -0,0 +1,97 @@
+commit e79b671aa7bc4edbae5d8272d523caa092f7548d
+Author: John Helmert III <ajak@gentoo.org>
+Date:   Fri Aug 30 23:13:23 2024 -0700
+
+    add missing cstdint includes
+    
+    In GCC 15, cstdint is less commonly included in stdlib headers so we
+    need explicit includes: https://gcc.gnu.org/gcc-15/porting_to.html
+    
+    See-Also: https://bugs.gentoo.org/937526
+    Signed-off-by: John Helmert III <ajak@gentoo.org>
+
+diff --git a/include/ipc/decoder.hpp b/include/ipc/decoder.hpp
+index 9d1afe1c..dcdf9e1a 100644
+--- a/include/ipc/decoder.hpp
++++ b/include/ipc/decoder.hpp
+@@ -5,6 +5,8 @@
+ #include "errors.hpp"
+ #include "ipc/msg.hpp"
+ 
++#include <cstdint>
++
+ POLYBAR_NS
+ 
+ namespace ipc {
+diff --git a/include/ipc/encoder.hpp b/include/ipc/encoder.hpp
+index 1fd36f60..ebb1ea82 100644
+--- a/include/ipc/encoder.hpp
++++ b/include/ipc/encoder.hpp
+@@ -4,6 +4,8 @@
+ #include "errors.hpp"
+ #include "ipc/msg.hpp"
+ 
++#include <cstdint>
++
+ POLYBAR_NS
+ 
+ namespace ipc {
+diff --git a/include/ipc/msg.hpp b/include/ipc/msg.hpp
+index 1b37022d..a423d3bb 100644
+--- a/include/ipc/msg.hpp
++++ b/include/ipc/msg.hpp
+@@ -3,6 +3,7 @@
+ #include "common.hpp"
+ 
+ #include <array>
++#include <cstdint>
+ 
+ POLYBAR_NS
+ 
+diff --git a/include/utils/color.hpp b/include/utils/color.hpp
+index 491d48ee..9d301af7 100644
+--- a/include/utils/color.hpp
++++ b/include/utils/color.hpp
+@@ -1,6 +1,7 @@
+ #pragma once
+ 
+ #include <cstdlib>
++#include <cstdint>
+ 
+ #include "common.hpp"
+ 
+diff --git a/include/utils/string.hpp b/include/utils/string.hpp
+index 45eaec06..27e06f7a 100644
+--- a/include/utils/string.hpp
++++ b/include/utils/string.hpp
+@@ -1,5 +1,6 @@
+ #pragma once
+ 
++#include <cstdint>
+ #include <sstream>
+ 
+ #include "common.hpp"
+diff --git a/src/ipc/encoder.cpp b/src/ipc/encoder.cpp
+index 87cbd915..38da55a1 100644
+--- a/src/ipc/encoder.cpp
++++ b/src/ipc/encoder.cpp
+@@ -2,6 +2,7 @@
+ 
+ #include <cassert>
+ #include <cstring>
++#include <cstdint>
+ 
+ POLYBAR_NS
+ 
+diff --git a/src/utils/color.cpp b/src/utils/color.cpp
+index 59fa59ae..7e47dad5 100644
+--- a/src/utils/color.cpp
++++ b/src/utils/color.cpp
+@@ -1,6 +1,7 @@
+ #include "utils/color.hpp"
+ 
+ #include <algorithm>
++#include <cstdint>
+ 
+ POLYBAR_NS
+ 
diff --git a/x11-misc/polybar/polybar-3.7.1-r1.ebuild b/x11-misc/polybar/polybar-3.7.1-r1.ebuild
index 68165661b062..acdb2155246d 100644
--- a/x11-misc/polybar/polybar-3.7.1-r1.ebuild
+++ b/x11-misc/polybar/polybar-3.7.1-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{10..12} )
 
-inherit cmake python-single-r1
+inherit cmake optfeature python-single-r1
 
 DESCRIPTION="A fast and easy-to-use tool for creating status bars"
 HOMEPAGE="https://github.com/polybar/polybar"
@@ -61,3 +61,7 @@ src_configure() {
 
 	cmake_src_configure
 }
+
+pkg_postinst() {
+	optfeature "Unprivileged display backlight control via udev" sys-power/acpilight
+}
diff --git a/x11-misc/polybar/polybar-3.7.2.ebuild b/x11-misc/polybar/polybar-3.7.2.ebuild
new file mode 100644
index 000000000000..7dfd36994d4a
--- /dev/null
+++ b/x11-misc/polybar/polybar-3.7.2.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit cmake optfeature python-single-r1
+
+DESCRIPTION="A fast and easy-to-use tool for creating status bars"
+HOMEPAGE="https://github.com/polybar/polybar"
+SRC_URI="https://github.com/polybar/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+IUSE="alsa curl doc i3wm ipc mpd network pulseaudio"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep 'x11-base/xcb-proto[${PYTHON_USEDEP}]')
+	dev-libs/libuv:=
+	media-libs/fontconfig
+	media-libs/freetype
+	x11-base/xorg-proto
+	x11-libs/cairo[X,xcb(+)]
+	x11-libs/libxcb:=
+	x11-libs/xcb-util
+	x11-libs/xcb-util-cursor
+	x11-libs/xcb-util-image
+	x11-libs/xcb-util-wm
+	x11-libs/xcb-util-xrm
+	alsa? ( media-libs/alsa-lib )
+	curl? ( net-misc/curl )
+	doc? ( dev-python/sphinx )
+	i3wm? (
+		dev-libs/jsoncpp:=
+		x11-wm/i3
+	)
+	mpd? ( media-libs/libmpdclient )
+	network? ( dev-libs/libnl:3 )
+	pulseaudio? ( media-libs/libpulse )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-gcc15-cstdint-includes.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_ALSA="$(usex alsa)"
+		-DENABLE_CURL="$(usex curl)"
+		-DBUILD_DOC="$(usex doc)"
+		-DENABLE_I3="$(usex i3wm)"
+		-DBUILD_POLYBAR_MSG="$(usex ipc)"
+		-DENABLE_MPD="$(usex mpd)"
+		-DENABLE_NETWORK="$(usex network)"
+		-DENABLE_PULSEAUDIO="$(usex pulseaudio)"
+		# Bug 767949
+		-DENABLE_CCACHE="OFF"
+		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc/"
+	)
+
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	optfeature "Unprivileged display backlight control via udev" sys-power/acpilight
+}
diff --git a/x11-misc/qps/Manifest b/x11-misc/qps/Manifest
index 4e3e17bc3d5e..9f0420319f80 100644
--- a/x11-misc/qps/Manifest
+++ b/x11-misc/qps/Manifest
@@ -1,5 +1,5 @@
 DIST qps-2.8.0.tar.xz 450280 BLAKE2B 2cb5197ed9564f1b2c48cca734bfca70df9513c1e44fd46ffada374823275370afdaa43ca4a2c8572781ba255efd5b95a67ca0aad038eea2cea9acefd8fdd449 SHA512 1dc4e0018eec82a70f33604d3f5b58a20892f1d97bb0334596d9ca47bc9d4e51c5acbdc8f72289612ab12a9a180c04b87de5f91a2fc0872791f68d0e6a1a2129
 DIST qps-2.9.0.tar.xz 457488 BLAKE2B 641b084f1e6817c7a5dd95aa1a21ede11e6c3206ac3206fb2e1ebd4e4685adbc53f09fbc6ffa44297f37a70d0bf1a12758e232e00d4126ffbe7f38eed4f10f15 SHA512 d085f987ce0abbd479704270415502384a17fdce13401c8d70d0d9982b045ef50b20abc347809e3c0c425651440c2c0f8e24b7114251808011990e896e6710fd
 EBUILD qps-2.8.0.ebuild 740 BLAKE2B c5687402f6fc1c87da31a1f3fc2483d5290efc38cf3645506b413938babb64b9f0502a720489ca4322b7ee6297ee54cd60148fbf0259b5098ba6e9b7c59f6ac1 SHA512 42f8b209aadc5f77d33f4b467fb2e60fb1a4c0525907be3f3595eafd2ca5fadc00994aa5289627bcf23139a7e09c514d91c0a7ffee827b408a31086ffbdb59dc
-EBUILD qps-2.9.0.ebuild 796 BLAKE2B 952f69c4c7d2af69790dee6511a1223ea1e88683a58b312fb248a6c873769db977f6940040cf207f9215af9b81aa4f5a077561f34158338b7f05455f8277aba1 SHA512 b092c6927a7dae44856c80cce52151061858d0380488223759829430145ad7d6bae996a754eba30f06002b18b987c1a061bf2db7ace3ec6f5b68ed780580a4bc
+EBUILD qps-2.9.0.ebuild 806 BLAKE2B 59a7ca2e05e1a3ea971636ca7e5509a6be90b5d91ee1aec10b1b865da1371254b15abd4a7422403a013d9db9d4651b524f9072e9a4920e0e8f31d3381d0729d8 SHA512 191d8128a6817fddb41d4330b05861c8477b8f6365fd6e2a9754f470fe4eca6821d1035a8641685ccaba2ef299924a34151d85b52f681892e8c8eebfc7f7667d
 MISC metadata.xml 310 BLAKE2B 721b197419cc333428e003442ce2827f346f0f750b9109fe2f95f3da06a6342a5798c4d57e6ad839aa62887a7060ecba0fd1f790aea26c6cc93ee97550c4c226 SHA512 3405859e03ff8f73e27e4b7fae13e93983f0fedc4f98080008d631f8534d50fd8df770cb72cca8b7fdd7fd662fb1d09425c085f862a29eb6a32dc7d6ffc6adb5
diff --git a/x11-misc/qps/qps-2.9.0.ebuild b/x11-misc/qps/qps-2.9.0.ebuild
index 6307611cdd3e..81536e51c2ec 100644
--- a/x11-misc/qps/qps-2.9.0.ebuild
+++ b/x11-misc/qps/qps-2.9.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~riscv"
+	KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 fi
 
 LICENSE="GPL-2 GPL-2+ LGPL-2.1+ QPL-1.0"
diff --git a/x11-misc/rendercheck/Manifest b/x11-misc/rendercheck/Manifest
index 5718cc64a289..2d52a5afec56 100644
--- a/x11-misc/rendercheck/Manifest
+++ b/x11-misc/rendercheck/Manifest
@@ -1,4 +1,4 @@
 DIST rendercheck-1.6.tar.xz 23996 BLAKE2B 981095f88d70320ba22b15ceeb33182c88fb5c4ca1df323e016a6750812dc7b0154e95c76619926bfe945a80243de5ea0921e04d94b70992b8be512d70a437d3 SHA512 0cc5372a318d4a28d63d82a2efc42f15b810186ce91b226bc5b962520637b628b1ae991a9e7745f8239c4fd100bf8f8eab79bc3803a01cad6827022af49be1a3
-EBUILD rendercheck-1.6.ebuild 679 BLAKE2B 9544fbe5da94f9ee7324828a5f6e76971b65a8a5765289fa88153303c86fe56fa5a83e991ae996f266baba137ab3bbb3260f805dcf9b99c0fb8276d201430787 SHA512 809d39be4d95e28408e6c72bf4f8cba05ed645ff64d9e4eadb5e179bdc7483ce93c59d49c3afdddd4911a72424c311f61452ad2990677d368b4c1354b968571a
-EBUILD rendercheck-9999.ebuild 683 BLAKE2B 5d88cdf6ddc5eb708188e844f46ff2bd6748cd98ebfdec8451b69ee3ef7639d1da48720ed6f8c03660cc0453e751462e94769751a1f7fcb1b720857580e2332e SHA512 165c139691e023a715f03b7a7f86f0360c229cccdd66b9a1da887cc916ea8a466a2a397bb71bc13b443aa3f46d249c8e184a65f500de3ec4468d81252af379c6
+EBUILD rendercheck-1.6.ebuild 671 BLAKE2B 414a3c235218f698ffefb91bc6e973d2a7fd299754d43a508db8c0419bf93d4ef210e3c6ed470cb128f998460ffc5a8bcc14ee31a57c70ea4b4756162088172f SHA512 f2a34f1e00db8ceb9bba1fe2f2396f053eb2bcaec6c662c987f4f1a34c35f4800ec274fb92eca1b312ec8962b3efc5c02ace661d3c3e04d5b9149eb7fa0fab76
+EBUILD rendercheck-9999.ebuild 677 BLAKE2B 81900d5fbeb902f0fae17d3606d752a5f9d920201bf54f7eaa88555f645855ca28b76b02574e4dfa5a4c05f314554dc65b91b6e5c36ef10492ea2a6a31a3b355 SHA512 3369ffdb81bdb0a1fdf01e6e61166452c5535fe7f48b0738163fe0c851699d8645bd16e4b5fecef16d86f531c000c3975aeb7c664fbfa091632fb69665a4aceb
 MISC metadata.xml 343 BLAKE2B 5711a00b6084d146b6f8631927d2d3ea9c2764b3d63b6ecfe890d0fb3a25e95573d3237c8113559e0743b0c602af9d8861fdf66c41156908ab405910baa858cf SHA512 e9637d2eb5c421d3ea06f97a45e731d7717c1ee731ee325a138f1fec885addaf86405de1d212f7edbac59ab2e56fd4dc473a4cd4f6062d591f702eb0bdc9ff3f
diff --git a/x11-misc/rendercheck/rendercheck-1.6.ebuild b/x11-misc/rendercheck/rendercheck-1.6.ebuild
index 15635c0581c1..46d943b16e27 100644
--- a/x11-misc/rendercheck/rendercheck-1.6.ebuild
+++ b/x11-misc/rendercheck/rendercheck-1.6.ebuild
@@ -8,7 +8,7 @@ XORG_TARBALL_SUFFIX="xz"
 inherit xorg-3 meson
 
 if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 fi
 
 DESCRIPTION="Tests for compliance with X RENDER extension"
diff --git a/x11-misc/rendercheck/rendercheck-9999.ebuild b/x11-misc/rendercheck/rendercheck-9999.ebuild
index 89bb8e72ef8d..e42d18b33391 100644
--- a/x11-misc/rendercheck/rendercheck-9999.ebuild
+++ b/x11-misc/rendercheck/rendercheck-9999.ebuild
@@ -8,7 +8,7 @@ XORG_TARBALL_SUFFIX="xz"
 inherit xorg-3 meson
 
 if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 DESCRIPTION="Tests for compliance with X RENDER extension"
diff --git a/x11-misc/rofi-calc/Manifest b/x11-misc/rofi-calc/Manifest
index 95f95770722e..06c24f9a568e 100644
--- a/x11-misc/rofi-calc/Manifest
+++ b/x11-misc/rofi-calc/Manifest
@@ -1,8 +1,4 @@
-DIST rofi-calc-2.0.0.tar.gz 1695125 BLAKE2B d76c304724b0f3326a8bd26ab2c7eaed5f77f3b6d07ddc97570a1fb28d56504d98ac9ab66411290cb548b760bd3231a729dfc470e748a8447e323d1b290f677c SHA512 298f9983dbd140f5aee5b3799b165500eae100f3f5744ba07914b962faf01661dee0f5f4c9c12a07a4e210b6115ac6fb377d9fa9a7e64ef5a19600e9f55cd478
-DIST rofi-calc-2.2.0.tar.gz 1695821 BLAKE2B ab91e17c2baa854e76f593626b774390b5bdd57c78419c16981371f1e4be64cee0a38845dcd93998741ceeac462a1158af08519692c65a04a22418aa7026dc89 SHA512 7eedb5c7be97f42a1683cabdf0745c28d2a4f123f02e7cf2bf5a44cf851271b5bdc31f7622f4f30d086ecdcbcc7e4d62d3550b8c5b8ceebcdaca362e8d09a68d
 DIST rofi-calc-2.2.1.tar.gz 1696532 BLAKE2B 5595f81b5eebefb68b97b397f4b9571afd548d7e2a3323cd2693a2ced629f0d270afe4351fe01f43c36760b2ba2c6c5509181d262285eb6caa9f768be1b2d2cf SHA512 33c4b5ca2c13d538c902d747c65b376d00b4f6b628d5fc14b4761105537503f24bd51a5cf8f07b6ab4b28bccbf6e84c70ea3125ed7e1664eadb108e4250a42ba
-EBUILD rofi-calc-2.0.0.ebuild 557 BLAKE2B ae68586334b9114f2a89dd45fe9b5a5dccc2c572537a6a36f5f108aaede9a16d8be87c936818a85dcb9a61199f81cd9e4aa503196c4017eb65d1c158de8c6947 SHA512 7080c170c773f02b8a1c0cd1db20248b5811c0be503147e408b13d838a07e3963ff9b388dd4f927a043ce2162ce7246f30be95caa29a3b3ddad693ae88d0cd7f
-EBUILD rofi-calc-2.2.0.ebuild 557 BLAKE2B 26b07f9207d77f7ff01a2cde318d62e5d8e63175af5009eb081e9cc9724c3ac072b9bcf96d7ce5949cadfac4c1cf030c95f3a5e06637f94763fcdc88f9c18218 SHA512 944bbca58befa5a6cf23912e018a2986097f3f67da6efa4396eed32fd7068c60e89e7ced1e925343ef1524678585c5f98a05a0361dd42c116daa7aecfce1757e
 EBUILD rofi-calc-2.2.1.ebuild 549 BLAKE2B 03154203e279947c840aa1314b50ccd8412bb5fe43abe08e2ada3b04b9826816d04b22dfbe035acefa2df59408597cba158dfe9977da6b74dd2deee030f6db20 SHA512 69d31e91cf5b62db033a9bc7ef5aa22546a02c383c5b1bd19927ea071f9a6bea7662f5be015f439e0ac80df94f31d489a66ee29989f9bad1e073ff22c0a3c9fb
-EBUILD rofi-calc-9999.ebuild 537 BLAKE2B 3de16f76ff930224550bb2d1aed2eb3c1181338219ba5c9f600e69bcded74c6945e9f40db1cd14eae2be1c6931e15677f9380cf1b1d6a37ff4dd22427e6b19ba SHA512 dca03c972c70d2b5904d6d149f713332f9b3287571874af87865918cd85f382387d90777969c995ab4deff877a706e0268887dba884a41aba1d8e1004838705f
+EBUILD rofi-calc-9999.ebuild 506 BLAKE2B 06ee16a3b49f003205ef2964c80639d5b2e600bf6e6e5f992c23a489c9519d8be238997ec75acf5d5924a0656f09d5d74f78691154e3ee0b9d986ab95b7c3ff5 SHA512 30b59c6d8ec110a305e54c337ccf55fd18b81cdb03fa3f27501aa431791a57c350fd3747dd0b2d61de92605ecd9ab8f130fce8286fcc1831db1502951f4dd969
 MISC metadata.xml 267 BLAKE2B 7dd5bd0b69e7b01ffc3a7d2088a9e815eb7cd1a29779b67c76236d1cfeb3d4a6d107747af1ce010df73f21de3b2a60ac50bee767900b67e9deb0e4076891c9b5 SHA512 0c9213901130dda93d68de656cf5a9a771511307db4ebd351b6b5b56c969d7a3aee08393882a267fd06b9ee4fa16f9aa5996d117a7f9df3c7ec15983bc95a494
diff --git a/x11-misc/rofi-calc/rofi-calc-2.0.0.ebuild b/x11-misc/rofi-calc/rofi-calc-2.0.0.ebuild
deleted file mode 100644
index ce53ee1c9e75..000000000000
--- a/x11-misc/rofi-calc/rofi-calc-2.0.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Do live calculations in rofi!"
-HOMEPAGE="https://github.com/svenstaro/rofi-calc"
-SRC_URI="https://github.com/svenstaro/rofi-calc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	x11-misc/rofi
-	>=sci-libs/libqalculate-2.0
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	eautoreconf -i
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/x11-misc/rofi-calc/rofi-calc-2.2.0.ebuild b/x11-misc/rofi-calc/rofi-calc-2.2.0.ebuild
deleted file mode 100644
index 5264d2023257..000000000000
--- a/x11-misc/rofi-calc/rofi-calc-2.2.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-DESCRIPTION="Do live calculations in rofi!"
-HOMEPAGE="https://github.com/svenstaro/rofi-calc"
-SRC_URI="https://github.com/svenstaro/rofi-calc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	x11-misc/rofi
-	>=sci-libs/libqalculate-2.0
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	eautoreconf -i
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/x11-misc/rofi-calc/rofi-calc-9999.ebuild b/x11-misc/rofi-calc/rofi-calc-9999.ebuild
index ac69969f2903..3f1eac33d712 100644
--- a/x11-misc/rofi-calc/rofi-calc-9999.ebuild
+++ b/x11-misc/rofi-calc/rofi-calc-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -7,13 +7,10 @@ inherit git-r3 autotools
 
 DESCRIPTION="Do live calculations in rofi!"
 HOMEPAGE="https://github.com/svenstaro/rofi-calc"
-SRC_URI=""
 EGIT_REPO_URI="https://github.com/svenstaro/rofi-calc.git"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS=""
-IUSE=""
 
 DEPEND="
 	x11-misc/rofi
diff --git a/x11-misc/rofi-file-browser-extended/Manifest b/x11-misc/rofi-file-browser-extended/Manifest
index 5ecdc59740f4..e3d13dd941ee 100644
--- a/x11-misc/rofi-file-browser-extended/Manifest
+++ b/x11-misc/rofi-file-browser-extended/Manifest
@@ -1,4 +1,6 @@
 AUX rofi-file-browser-extended-1.3.1-fix-function-pointer-initialization.patch 1267 BLAKE2B 4d1c4613a2e90f03f0d50aae7f4b3dea211b247fa5021bb818e7b4745f2c75a7df590bc4e591b141bf696a0c14441787ba71a489715910df239f9c8ead4caec7 SHA512 3a8e92d9f519bf5cf077729b53ffef0b1b5aa2c3770c520cd7da653dd89627d2b27f4c64b8257604320c48ef446afaeba4c7e811b9c4ac16478f74e09fdc7960
+AUX rofi-file-browser-extended-1.3.1-fix-gcc14-build-fix.patch 2513 BLAKE2B bf12768e62572d6270ed7a645c2ad21fb265215134eca827b7a2a7424d0123783c148d75e842cd054399093dd2e21ce203cd9583a3bcb4b1df9b349e9853e149 SHA512 babc3ceb95fc39224115fab2ad95bbcd8a8b90db179856807a1827279262f3eb2e5e9ea00ee7de719191c0409644fd0e117e7ddebe00293a7f219bf555b6943b
 DIST rofi-file-browser-extended-1.3.1.tar.gz 27169 BLAKE2B ced5ae91a865b136bcb2182a17c7a49cbdfcc861f8d1063415691afb13f5bdf3f1c2c0fc56a21a0dec31ee656c2379e55a4f60899c59ca7e056438142675aeb2 SHA512 269e33d62e5fdf7f6c48763ae4309fac53873d53af4ebf78f731b709ac6ff41d8f8cf21de917866fe5a80f4949d70d3be6e516c3825a8768106c706438a5b3d1
 EBUILD rofi-file-browser-extended-1.3.1-r1.ebuild 1024 BLAKE2B 99b1aa10a5f9949a373d10d0e293e0d557f09d19255d8f7f73b44c293cf508d5257597f7b164e41c85782743f6b7db2fc194366ff6dca1fe4d5d6be03adc95d5 SHA512 7edfa3534bedabe669e4823e7a7f6799e8457b1504118aa5e55fd018f8f91217835065d7e1be4d8935824b581402665e591466198bd24f246600f7af0a901559
-MISC metadata.xml 247 BLAKE2B 4e1dbdae308a736b571e2a7ab4a90c650461771c024127c95a33990f3973331ba5de3cc8fe960115af9bb06f49908d258211b2a4e07c0f8d2a9536c965d836c3 SHA512 734659aca9188fe48564f64e23622ef0201931c75e1306043902fcf487a4155e8027a378872a48c7e34a903cdd0363a8e237b0965b7f532f80eaf38353940dbc
+EBUILD rofi-file-browser-extended-1.3.1-r2.ebuild 1078 BLAKE2B 5f87576db0ad8fb67c127bb1f838fec8827759a889af8dbdafa15f6beec6a187d71e51c59e8806a6183f9b205f9255d67dba1c7b12b6d212c18e8e8c792cb08d SHA512 69d9a612f76497ebcda3b52a45e435938c73a0c3118a00130762b288b8b0555c194a250c4d1098af7d4c0a8f4508ec0b819d7f976fc1d31736270bbc648ec837
+MISC metadata.xml 350 BLAKE2B 6c74d665560251ef5915628bbd229142ecfcccb702949ead8aa57c6a21ca1f123bd5c6421c9f9668c3545f9237e9cfc87089476d20dc6d5d6934408ca133cd8c SHA512 6a32847f60e1b31abadee6a5acce3bd3cb5665be8aafe3de69069cab688ac522766dae68aa37df912af57fb6105b65b04373c9ab6120cb571ef70950e326413a
diff --git a/x11-misc/rofi-file-browser-extended/files/rofi-file-browser-extended-1.3.1-fix-gcc14-build-fix.patch b/x11-misc/rofi-file-browser-extended/files/rofi-file-browser-extended-1.3.1-fix-gcc14-build-fix.patch
new file mode 100644
index 000000000000..eb1a7b3f5d6d
--- /dev/null
+++ b/x11-misc/rofi-file-browser-extended/files/rofi-file-browser-extended-1.3.1-fix-gcc14-build-fix.patch
@@ -0,0 +1,53 @@
+https://patch-diff.githubusercontent.com/raw/marvinkreis/rofi-file-browser-extended/pull/54.patch
+From: Brahmajit Das <brahmajit.xyz@gmail.com>
+Date: Tue, 30 Apr 2024 11:39:59 +0530
+Subject: [PATCH 1/1] Fix building with GCC 14 on i686
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+GCC 14 (and above) have enabled certain compiler flags such as
+Wincompatible-pointer-types that causes build time errors such as
+
+rofi-file-browser-extended-1.3.1/src/icons.c:52:57: error: passing argument 2 of ‘g_array_steal’ from incompatible pointer type [-Wincompatible-pointer-types]
+   52 |     char** icon_names_raw = g_array_steal ( icon_names, &num_icon_names );
+      |                                                         ^~~~~~~~~~~~~~~
+      |                                                         |
+      |                                                         long unsigned int *
+In file included from /usr/include/glib-2.0/glib.h:33,
+                 from /usr/include/glib-2.0/gmodule.h:30,
+                 from /var/tmp/portage/x11-misc/rofi-file-browser-extended-1.3.1-r1/work/rofi-file-browser-extended-1.3.1/src/icons.c:1:
+/usr/include/glib-2.0/glib/garray.h:86:54: note: expected ‘gsize *’ {aka ‘unsigned int *’} but argument is of type ‘long unsigned int *’
+   86 |                                    gsize            *len);
+      |                                    ~~~~~~~~~~~~~~~~~~^~~
+
+My patch attempts to fix this error and some other C99 related warnings.
+First reported on Gentoo linux, please reffer
+https://bugs.gentoo.org/928491 for more details
+
+Signed-off-by: Brahmajit Das <brahmajit.xyz@gmail.com>
+--- a/src/files.c
++++ b/src/files.c
+@@ -167,7 +167,7 @@ static bool match_glob_patterns ( const char *basename, FileBrowserFileData *fd
+ {
+     int len = strlen ( basename );
+     for ( int i = 0; i < fd->num_exclude_patterns; i++ ) {
+-        if ( g_pattern_match ( fd->exclude_patterns[i], len, basename, NULL ) ) {
++        if ( g_pattern_spec_match ( fd->exclude_patterns[i], len, basename, NULL ) ) {
+             return false;
+         }
+     }
+--- a/src/icons.c
++++ b/src/icons.c
+@@ -48,7 +48,7 @@ void request_icons_for_file ( FBFile *fbfile, int icon_size, FileBrowserIconData
+         }
+     }
+ 
+-    unsigned long num_icon_names;
++    gsize num_icon_names;
+     char** icon_names_raw = g_array_steal ( icon_names, &num_icon_names );
+ 
+     /* Create icon fetcher requests. */
+-- 
+2.45.0.rc1.218.g7b19149425.dirty
+
diff --git a/x11-misc/rofi-file-browser-extended/metadata.xml b/x11-misc/rofi-file-browser-extended/metadata.xml
index 75209e7cb520..c5b4a5fe71cc 100644
--- a/x11-misc/rofi-file-browser-extended/metadata.xml
+++ b/x11-misc/rofi-file-browser-extended/metadata.xml
@@ -5,4 +5,7 @@
 		<email>flow@gentoo.org</email>
 		<name>Florian Schmaus</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">marvinkreis/rofi-file-browser-extended</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-misc/rofi-file-browser-extended/rofi-file-browser-extended-1.3.1-r2.ebuild b/x11-misc/rofi-file-browser-extended/rofi-file-browser-extended-1.3.1-r2.ebuild
new file mode 100644
index 000000000000..4411556a8ad5
--- /dev/null
+++ b/x11-misc/rofi-file-browser-extended/rofi-file-browser-extended-1.3.1-r2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="A file browser for rofi"
+HOMEPAGE="https://github.com/marvinkreis/rofi-file-browser-extended"
+
+if [[ ${PV} == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/marvinkreis/${PN}.git"
+else
+	SRC_URI="https://github.com/marvinkreis/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+
+BDEPEND="virtual/pkgconfig"
+COMMON_DEPEND="
+	dev-libs/glib:2
+	x11-misc/rofi
+"
+DEPEND="
+	${COMMON_DEPEND}
+	x11-libs/cairo
+"
+RDEPEND="${COMMON_DEPEND}"
+
+PATCHES=(
+	# https://bugs.gentoo.org/880985 https://github.com/marvinkreis/rofi-file-browser-extended/pull/49
+	"${FILESDIR}/${PN}-1.3.1-fix-function-pointer-initialization.patch"
+	"${FILESDIR}/${PN}-1.3.1-fix-gcc14-build-fix.patch"
+)
+
+src_prepare() {
+	# Delete the lines in CMakeLists.txt that install the man page.
+	sed -i "45,56d" CMakeLists.txt || die
+	cmake_src_prepare
+}
+
+src_install() {
+	cmake_src_install
+	doman "doc/${PN}.1"
+}
diff --git a/x11-misc/rss-glx/Manifest b/x11-misc/rss-glx/Manifest
index 3dd0722f364d..f228685d97c6 100644
--- a/x11-misc/rss-glx/Manifest
+++ b/x11-misc/rss-glx/Manifest
@@ -12,5 +12,5 @@ AUX rss-glx-0.9.1-strict-aliasing.patch 823 BLAKE2B a37f58801a344f9979bbf62ed5a3
 AUX rss-glx-0.9.1-variable-mismatch.patch 5297 BLAKE2B 2567d50832085fbf7d540807b8facc633c278d52763ad38f4f76b0eaea9011189768f8577a4d63b9a3973689f75b1fee277aa957700f90b066c0df607a553f50 SHA512 f1afa532748e4eca8da143f1d5444cf4d36fc85278e126b6fad3cbcb9da1a8f3a61e5a9748dc7410d8418d51df2473e53192e961264ce471b76a0ffa4884fd48
 DIST rss-glx_0.9.1.tar.bz2 5435799 BLAKE2B d8161f06469f1160a6e80bb47a333746fac82df4d92eb9d007c7d6fe3a32e1a54a30d4675f64b100fd5509977dfbda7e8821daa462f00cbf748cc7c4bb8afa72 SHA512 3293e6446d6f85e895f1ba8fa982a1ab1873f60714e0b351458ac12117af2427b7cc931185b9485a2af6dd86ea9ea5f2fca92eaae9c0dd5290b5108bc2360961
 EBUILD rss-glx-0.9.1-r3.ebuild 4052 BLAKE2B 2b9406924ac4ce126f7bc00f6efb09cf26c42225a35f93ed512b4bbc1a0296fb4f7c96318b3adcbcc031313e5599c602d7de2a9417af0167f624e5fac73cf733 SHA512 726ec226abd352f1ba2a41d1cdf803e0610348aa76825d477832ae6f9334f1cf675d001d2be35a69f99d396f801b83fe7b003543185ff6f08c59491069bb6fe3
-EBUILD rss-glx-0.9.1-r4.ebuild 4288 BLAKE2B 4f79277087f543463867a87d9cd09458bcff74478579ea07590b69f4dfbbd0a0a5b6c41d32e3f9627201be91973e9a1b842b97d203b2160e1fec0bd7fe558836 SHA512 4bd9260e7813996008737f2e74d120b3acbd927bd46d954fefc9a94c1d265849917674ecb6320500778e9695eb46b489a1b96c21cef95c52f66f7fe1a46bb102
+EBUILD rss-glx-0.9.1-r4.ebuild 4287 BLAKE2B 1973035f0752e66a95381c2f292a0f6b921b5c0d4633d39054bf0454d895e4519807abf0ba493c0c49395ae0b9a85583a62998fb40885a83dbd4e1decd7bd030 SHA512 f07a7db2165ed927884872436788189d925f546bea86f11a757609035093f5acf171505b74a0de46de4fa6953429e922b1ea7309d3dc836a7a960adc0e7dadba
 MISC metadata.xml 566 BLAKE2B 80d4fe47508e61979af5edd605fdbfc1ded40be7bd7141f0ae5f3ac03f7834278dfb548dd8a8e5b606a8f1df025c853e7648e8f404852209ad4df602266db3b7 SHA512 c060dee409a6c2816e7548b2ba1ebaa0d055088babb89ffa8ecdacf5e9ca69e382b7eac5feaa373eb3c981817f27cc13421084bc02e5c592c2d8c44b16bdb02e
diff --git a/x11-misc/rss-glx/rss-glx-0.9.1-r4.ebuild b/x11-misc/rss-glx/rss-glx-0.9.1-r4.ebuild
index 96684b26d2af..f6fa04e71ff0 100644
--- a/x11-misc/rss-glx/rss-glx-0.9.1-r4.ebuild
+++ b/x11-misc/rss-glx/rss-glx-0.9.1-r4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://sourceforge.net/projects/rss-glx/files/rss-glx/${PV}/${PN}_${PV
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
 IUSE="+bzip2 openal quesoglc"
 
 RDEPEND="
diff --git a/x11-misc/screengrab/Manifest b/x11-misc/screengrab/Manifest
index 00ebd82cd4bc..e72c996cb4d2 100644
--- a/x11-misc/screengrab/Manifest
+++ b/x11-misc/screengrab/Manifest
@@ -1,5 +1,5 @@
 DIST screengrab-2.7.0.tar.xz 341696 BLAKE2B ad45155caa4964577626d54a067d20935c7419e4a54b725077fb5d0db21b8a7b55c6caebedf6522c74cf8026487d203f8570f57f9f9f71ad11609175b901124c SHA512 0becd8972408a788b56affc9091cdc9ce1fe79160bba27ae29c5f1bf48ed0b73bafdabf3aeaac1eafe646aeaa4e162c0302b7ba1ee4f07785010e50a7d8131a1
 DIST screengrab-2.8.0.tar.xz 345980 BLAKE2B 415a8ed9915c1605ef9f55214d60643e32f94bf9a9b833736a27ee39948865760e4e257600694c16eb8e5b5c38e73884354911808262e5a422aab83bad143c30 SHA512 e17208294a119a71e7239cb69abf77ec9d6c19b37efb0a53006f3a333a535974156211f362ebc117885cfdf7d93416d2196da9580ff4ab9cb9292228e8d8141f
 EBUILD screengrab-2.7.0.ebuild 847 BLAKE2B edde31a2947526d5dc07a2a1b9c00945920d4d9ad3cb80e33926390eb450fcef142ac089056cda6e0e7d02b9e072ae1993526ebf09f0c04c4c62fcdbd3581bc3 SHA512 a8fd0dc9be4222bc3c73ac21cd8001cd6659e51fa168ef787369584b9712f32f82524ce761bd3d7b24352aa734359420cc573afc6705381c89f3b48087973380
-EBUILD screengrab-2.8.0.ebuild 835 BLAKE2B cf74580ec87a79d99afebec2917a042b1011aeb7ac1c3e3ab1869a58b66dcd0ecee5851b4e5cadbbcf23d2f6e5993e7a34526f06ddfcf02bf84069d540275196 SHA512 f26ed16e484eaa46b193a1359dff873510f877e83aeaf26fe2777ae23fc82e217c01d4ef04d855c9dc71b4e211def1b5a2b79a0116121e30c302f077d3afd5c3
+EBUILD screengrab-2.8.0.ebuild 852 BLAKE2B 135a866b97158dda6428e25ef94a951ef15cbce80123855384652ff915809099819f90237401fc44c7c822f3a246494438ebe4637e252d879d9d38f482144002 SHA512 37ff2c7d21bf896c542c5a0359205bad762a41d935dec8a154d05010799b140f88874bf9014487066984313f2e71e63afd7580bb8178d442e526bc069c0e7e13
 MISC metadata.xml 429 BLAKE2B 318a7272dc0c351a5cc2d4f5f89875f130bed63c94caec59959001991b68435bbd142da24d2197d5b67454f4ce98e2017f277c74ebeb7dab124e0c8322860e09 SHA512 3b18aacfc6932a198a4f098b4bfa918fee10dfac34fdcb5cef2a71e4919d9381049e1e7a04884f55601886f209ca747b0c2c0da92a8640b1bfa26bf6c57a29ac
diff --git a/x11-misc/screengrab/screengrab-2.8.0.ebuild b/x11-misc/screengrab/screengrab-2.8.0.ebuild
index 6656d3c0aba2..1ce2abdb5f38 100644
--- a/x11-misc/screengrab/screengrab-2.8.0.ebuild
+++ b/x11-misc/screengrab/screengrab-2.8.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~riscv"
+	KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 fi
 
 LICENSE="GPL-2 GPL-2+ LGPL-2.1+"
diff --git a/x11-misc/sddm/Manifest b/x11-misc/sddm/Manifest
index 7c33b68be215..e76e68103027 100644
--- a/x11-misc/sddm/Manifest
+++ b/x11-misc/sddm/Manifest
@@ -4,10 +4,8 @@ AUX sddm.logrotate 59 BLAKE2B 6f4c0b92559640c78190df2074f439aabf69604e706f562a29
 DIST sddm-0.18.1-patchset.tar.xz 7860 BLAKE2B b79738c58f19ebac24dd790ba7613d85ae78bc0c5161d35249e13ddbac3acefff2753b8d92fa47a73a607b3105310ea5d05e1a5a170068030fe28420ffee88b1 SHA512 30ca961f065188d570b1498f9eea5aeafb31ab53b7e9ce41e98e26cba12f8c16a245fffb25ea4d84c6fb9037a24523cd41acc9a8b140a1420282435c9497d9b4
 DIST sddm-0.18.1.tar.xz 3402972 BLAKE2B 99ab43d374e9a3d318f692a6d496d8a6d68927af3c8e8fc2208d7355ec90649a14758b39f5733dd32f942ed569de88085576d4f5f8666f4f97079e0fb6dcb99e SHA512 ff0637600cda2f4da1f643f047f8ee822bd9651ae4ccbb614b9804175c97360ada7af93e07a7b63832f014ef6e7d1b5380ab2b8959f8024ea520fa5ff17efd60
 DIST sddm-0.21.0-pam.tar.xz 676 BLAKE2B 06a79f74a5833eca9877df4be8639311382d13061b21aa3627e6c4b07725878ded62221fca943440bacc143f6be2a23b2e0a2124012ff2c9fac82e1eded11144 SHA512 6d91eef2434346f7707122454522cf19f104994ac95d562417f6060a92b4e6c9792bebcccabac8290479200b4ba02fc4d92c6098c435c7ceda796d619d8913c2
-DIST sddm-0.21.0.tar.gz 3557266 BLAKE2B 849cb8b06b9510e5366ea28ef322c242db7d5a77d94c0a5a727f468209880a717055ad8b0c2f5a857852202a4d6bc1f68281fe0e0ab3c6a32327b5a4219af3a0 SHA512 2e8e460e7f318f20a406dcbb1a9fa1dc78b6a5b8d888bfbbaae22b9c642dbc49cf2ac682b4ea9ed847bbafa9bdc361ba08795e59cad970088b370caaaa70f458
 DIST sddm-0.21.0_p20240723.tar.gz 3557578 BLAKE2B b92feb20a39eaf34822b077fcb8b89a100ff65814f9b523b2a1a0ffd3592edf2e86fa8fbdfcd8b592756a0b4baf0b085e8c7b4ad2aaa2f08b90e25e580df9925 SHA512 1ea2f758099f86086aebf05a77b176227475c1eb9c21c77bc99b9bb5a2882ce087e020ae6a11585b793fe09a3567e0ea4d0c1632a5823b7be83e33882964de48
 EBUILD sddm-0.18.1-r8.ebuild 4014 BLAKE2B 9905d591d59827c1097c9cafa56f399d1f9099fa7a69fb3c9966d797355d2c03ed647d69e9309c369a820cfc15345e2cb4d98596507c4c1b9ffaf4c45101938b SHA512 2015d988c8b12066e7ee9e410b151a5677a8ea2663840ae04162db132ceca79f7699026bd2d8ac198996ece2499d8fb4071af0e708900525104b3c294adb5379
-EBUILD sddm-0.21.0.ebuild 4035 BLAKE2B d3259f31587e7226764e3ac25bd2f1ebd5f8a96ae497a5c12c202a06cc4be8acec675e083bd7409d0743b709c1d09d5834c7d9273b9e6ae2fa721c0b1117888b SHA512 ef4eedf18db0cd96927e93b9f56281798a933b9588f97c71c4fa149a59bd99a40df4afbeeffa1e8836cbb0ccfcab43980e92453afee0d49d197f093b651a6c67
-EBUILD sddm-0.21.0_p20240723-r10.ebuild 3903 BLAKE2B bf64698b9511ccd01ccc611aff856a978f94073b73b39cfd583e0ef7eeb7b0d18a0fcc238d734bb87c833405c56ab56fb736f03e792da685c961ea8e392e9f2d SHA512 fe271a5a01b4e2fcbfc186c08b4c95d00fc7fc3339ace23893346327ee5f0d30a4c9223ddf37b217166a1099943dc715a327a8806ceae6a96bb02e8f02b6a9bb
-EBUILD sddm-0.21.0_p20240723.ebuild 4102 BLAKE2B 77014de4ecc7b89990f130ba371a34c13d15335e253cd9551cbe58fbfacf8fd396b7270272d3121866fc8e6139a7bf0c89666f76cd846ba2fccfa9a28163839d SHA512 588dd8a4bd72aed8ef0e917331e4e681ba122a20047785537f3e68fb11412edf9717b9ea6bb09df2896bbb7412d8dd4a290195903b2c092178519ecfd4e0f02f
+EBUILD sddm-0.21.0_p20240723-r10.ebuild 3901 BLAKE2B aff7bb75ab219ebd550c17ac78411b7e112a806f55d4d453b13233d165849164345faaca82151a51152776673431b3c8a76fc18a8b90e7aae8aba52711800e77 SHA512 9b08e6f7aae0cdcbca832ae0361639899882b0495820cb5f85cbccecce41d5e4a745f6ba61cef09ab8804b9bfcf87683904909ffa5321ae66048f5d5dfe29c84
+EBUILD sddm-0.21.0_p20240723.ebuild 4099 BLAKE2B 4ac8431a00c2b590398f1f2080b522ec47e7a953d5cf8dcebbdec56cf1e60544f232fc3dfb57ae411832ed8fe388618a10a241d27e9a1c389788f25ed380f963 SHA512 e5d66592087872ad70c8a51ea6b30aff90bf4d0b9076ea94d2c1f025e40a9c12183fe999d8a89f128ce4746c2693d5554faf6f244e6510064f2f93d32560a67f
 MISC metadata.xml 722 BLAKE2B fc34c0b25b7f3e6ab876c99a30f475dc90cc4b319f497a2ba4bd2beac1dc1189d3d9611999c0c3b078254db23c4c9b2ef0416da41e706c1a1db96d5bbec28177 SHA512 c1fa48632080e295272df6e7ceb7c0a1ad64a41155c7d53d91728f072cb7abf618e7bf4d5cced2ca0b198bbbf5ed1e72c5bfc9ea9d590064e5f5494747d32b0d
diff --git a/x11-misc/sddm/sddm-0.21.0.ebuild b/x11-misc/sddm/sddm-0.21.0.ebuild
deleted file mode 100644
index ca86d169665e..000000000000
--- a/x11-misc/sddm/sddm-0.21.0.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PAM_TAR="${PN}-0.21.0-pam"
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
-fi
-
-QTMIN=5.15.12
-inherit cmake linux-info optfeature pam systemd tmpfiles
-
-DESCRIPTION="Simple Desktop Display Manager"
-HOMEPAGE="https://github.com/sddm/sddm"
-SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PAM_TAR}.tar.xz"
-
-LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain"
-SLOT="0"
-IUSE="+elogind systemd test"
-
-REQUIRED_USE="^^ ( elogind systemd )"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	acct-group/sddm
-	acct-user/sddm
-	>=dev-qt/qtcore-${QTMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	sys-libs/pam
-	x11-libs/libXau
-	x11-libs/libxcb:=
-	elogind? ( sys-auth/elogind[pam] )
-	systemd? ( sys-apps/systemd:=[pam] )
-	!systemd? ( sys-power/upower )
-"
-DEPEND="${COMMON_DEPEND}
-	test? ( >=dev-qt/qttest-${QTMIN}:5 )
-"
-RDEPEND="${COMMON_DEPEND}
-	x11-base/xorg-server
-	!systemd? ( gui-libs/display-manager-init )
-"
-BDEPEND="
-	dev-python/docutils
-	>=dev-qt/linguist-tools-${QTMIN}:5
-	kde-frameworks/extra-cmake-modules:0
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	# Downstream patches
-	"${FILESDIR}/${PN}-0.20.0-respect-user-flags.patch"
-	"${FILESDIR}/${P}-Xsession.patch" # bug 611210
-)
-
-pkg_setup() {
-	local CONFIG_CHECK="~DRM"
-	use kernel_linux && linux-info_pkg_setup
-}
-
-src_unpack() {
-	[[ ${PV} == *9999* ]] && git-r3_src_unpack
-	default
-}
-
-src_prepare() {
-	touch 01gentoo.conf || die
-
-cat <<-EOF >> 01gentoo.conf
-[General]
-# Remove qtvirtualkeyboard as InputMethod default
-InputMethod=
-EOF
-
-	cmake_src_prepare
-
-	if ! use test; then
-		sed -e "/^find_package/s/ Test//" -i CMakeLists.txt || die
-		cmake_comment_add_subdirectory test
-	fi
-
-	if use systemd; then
-		sed -e "/pam_elogind.so/s/elogind/systemd/" \
-			-i "${WORKDIR}"/${PAM_TAR}/${PN}-greeter.pam || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_MAN_PAGES=ON
-		-DBUILD_WITH_QT6=OFF # default theme (and others) not yet compatible
-		-DDBUS_CONFIG_FILENAME="org.freedesktop.sddm.conf"
-		-DINSTALL_PAM_CONFIGURATION=OFF
-		-DRUNTIME_DIR=/run/sddm
-		-DSYSTEMD_TMPFILES_DIR="/usr/lib/tmpfiles.d"
-		-DNO_SYSTEMD=$(usex !systemd)
-		-DUSE_ELOGIND=$(usex elogind)
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	insinto /etc/sddm.conf.d/
-	doins "${S}"/01gentoo.conf
-
-	# with systemd logs are sent to journald, so no point to bother in that case
-	if ! use systemd; then
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}/sddm.logrotate" sddm
-	fi
-
-	newpamd "${WORKDIR}"/${PAM_TAR}/${PN}.pam ${PN}
-	newpamd "${WORKDIR}"/${PAM_TAR}/${PN}-autologin.pam ${PN}-autologin
-	newpamd "${WORKDIR}"/${PAM_TAR}/${PN}-greeter.pam ${PN}-greeter
-}
-
-pkg_postinst() {
-	tmpfiles_process "${PN}.conf"
-
-	elog "NOTE: If SDDM startup appears to hang then entropy pool is too low."
-	elog "This can be fixed by configuring one of the following:"
-	elog "  - Enable CONFIG_RANDOM_TRUST_CPU in linux kernel"
-	elog "  - # emerge sys-apps/haveged && rc-update add haveged boot"
-	elog "  - # emerge sys-apps/rng-tools && rc-update add rngd boot"
-	elog
-	elog "SDDM example config can be shown with:"
-	elog "  ${EROOT}/usr/bin/sddm --example-config"
-	elog "Use ${EROOT}/etc/sddm.conf.d/ directory to override specific options."
-	elog
-	elog "For more information on how to configure SDDM, please visit the wiki:"
-	elog "  https://wiki.gentoo.org/wiki/SDDM"
-	if has_version x11-drivers/nvidia-drivers; then
-		elog
-		elog "  Nvidia GPU owners in particular should pay attention"
-		elog "  to the troubleshooting section."
-	fi
-
-	optfeature "Weston DisplayServer support (EXPERIMENTAL)" "dev-libs/weston[kiosk]"
-	optfeature "KWin DisplayServer support (EXPERIMENTAL)" "kde-plasma/kwin"
-
-	systemd_reenable sddm.service
-}
diff --git a/x11-misc/sddm/sddm-0.21.0_p20240723-r10.ebuild b/x11-misc/sddm/sddm-0.21.0_p20240723-r10.ebuild
index 33c2a0b2a519..7024c639d357 100644
--- a/x11-misc/sddm/sddm-0.21.0_p20240723-r10.ebuild
+++ b/x11-misc/sddm/sddm-0.21.0_p20240723-r10.ebuild
@@ -11,7 +11,7 @@ else
 	COMMIT=4ec29a8bba033d475f197693fac6cb0c383a1da2
 	SRC_URI="https://github.com/${PN}/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${PN}-${COMMIT}"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 fi
 
 QTMIN=6.7.2
diff --git a/x11-misc/sddm/sddm-0.21.0_p20240723.ebuild b/x11-misc/sddm/sddm-0.21.0_p20240723.ebuild
index 65b6f5a1fd1a..b7a18e066574 100644
--- a/x11-misc/sddm/sddm-0.21.0_p20240723.ebuild
+++ b/x11-misc/sddm/sddm-0.21.0_p20240723.ebuild
@@ -11,7 +11,7 @@ else
 	COMMIT=4ec29a8bba033d475f197693fac6cb0c383a1da2
 	SRC_URI="https://github.com/${PN}/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${PN}-${COMMIT}"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
 fi
 
 QTMIN=5.15.12
diff --git a/x11-misc/shared-mime-info/Manifest b/x11-misc/shared-mime-info/Manifest
index 387aa573cf1d..09c2054776ee 100644
--- a/x11-misc/shared-mime-info/Manifest
+++ b/x11-misc/shared-mime-info/Manifest
@@ -7,7 +7,7 @@ DIST shared-mime-info-2.3.tar.bz2 6643480 BLAKE2B 2a3adc0568d1be5a17e5a1533f3c46
 DIST shared-mime-info-2.4.tar.bz2 7096347 BLAKE2B 25ff086e4962f5ab0cb2b7155df02be4af7af63dd0267500b2b12b802680bbae04b9ed252ef5a004d0175f6b48956c5e4b9738af9ab5d2fa76a7a0b6eac067ad SHA512 712f414e80919bf2a0f5083ced44c54a350948a526850466a6e9f35365dcfd97fad8bcdbb29945de2715a8f9b70a108e931c8500209a4d6e3dddf97af02771cb
 DIST xdgmime-179296748e92bd91bf531656632a1056307fb7b7.tar.bz2 28123 BLAKE2B ea107dba0819027e4a0a486db00e76f50a4e32e8e84f366b81490e213456e2c7e1c4a92cc4f92173dd6f94f257455bdcb77e3eb7d0ce8fb699c948d2d5b01f0d SHA512 efccff2672efb3ff0e44e83cfbaf6e2b926146e4a9d6132b14e2d7a88d602af340b3948793306ce5f720ac8b09e5d37d3b356a0cc269e8240b382558c9a3cf10
 DIST xdgmime-92f6a09fda2b23c2ab95cede8eb0612ca96bd0f7.tar.gz 32703 BLAKE2B 865ff57c566b60fb2bd6cb37e259800ee72fb4b9f2d135db46e9a40206946677a7b50bfb8f13d9ce1493bac972e8a5230d7caa833733f3a8d8631e844a648436 SHA512 90abe20483d5ae2131d18740fffbc57c94470be99e9ea1b04e13bffaf3dda4aa9145cb92bb4defe0a655c0bdbd630aaa325e7a9095b9599faebb751699b9cdd8
-EBUILD shared-mime-info-2.2.ebuild 2590 BLAKE2B 53f29bbfbe47f5304f75cfd3b48b111eb95c58c02a10ee6683c678be82f89ca713242d5863f46988020e93587b060a6acdec11ff44699eb4a1df95b86b42adb2 SHA512 f47451d4bf4adb1cb5c07f4c46cdb89cc9d429f112207a8b7dc322f7631eb46957eecd79c7fe1ab49f877afffd9d558a412d6dbf220f06da8a99c9d95cd80e0c
-EBUILD shared-mime-info-2.3-r1.ebuild 2816 BLAKE2B 4af2e85d620e9b9c8ad47d29067b3ba13b14b144892567fcfa6f64d132006a4fe0f3b2a7d8864fc2d6fd3e92d5f9a5e6f69c036ae573ece37b924172804cd552 SHA512 ef79fe6edecb78b7a92449ad1e5a33cc42e7318235d66826bb1d9c7ac04e9830e290ab02914de5ad4dc1a90664581e649c82c8d193299dadfcb51050fd24d3af
-EBUILD shared-mime-info-2.4-r1.ebuild 2722 BLAKE2B 5c8d8ae98bb819d0ec4370b8999079e64bf0a1fffe3ff81902cb48a1c3f3397b59b82646684feb83511af447ef149656f9c71ee4ffa9e16fa8e9e8ffa6f64183 SHA512 c1cb7144929d24f193d54221baea1dce3852c9b902c4f10f2e5954099103c2056ea70d27b2b1ec2ad2875edf0fb238d244faefbcc361963799cf88bea293c1fa
+EBUILD shared-mime-info-2.2.ebuild 2584 BLAKE2B 1436929fecda91c089f93d03c5729af88b7eb3e57a968e4cb355ee9a42c1cbdef3873389cbb28bda580f6b4fecaf8fb3fd23308b9eb0c9e5ce9d5ba7348c25ef SHA512 d9ae19dc9a3d793526a32aaa549aa164a170d865dac5b961ca87658dd16a2012dd5901b2d48e297c43fe8473aed69f14ac6d130586ffaa0c6c72c208c209111b
+EBUILD shared-mime-info-2.3-r1.ebuild 2810 BLAKE2B 93a2494accf1c1131870a9ad3d0bf6a46f2abbe4ec24cae2c873c3ffe8c226e97e8c28d6ed1173d483af889cea2e70e8818dc9066a6c4b0136e1b0e33fa2f5ad SHA512 3906679a09de0aff850494e42f5810aade7f18854c8bc2c71c63d88571ea8067dd48332b636a42174170d8c4acb96ce15f973d85efd62e0f3619604544116811
+EBUILD shared-mime-info-2.4-r1.ebuild 2716 BLAKE2B 6b70b26bf437edc2fde5892cdf15f9d4d25e189325ebcac19ac4f6be785dde64486555d7763df37973d2dff469cf2c3ed31deb27abc23a34003f58dcc307f6a9 SHA512 2dd61dd1b45f2f243853fac0ef13f0887d8d81116c86591e165247404874eb3b0628b9dc072ff0a4a30312342713e153c4d06f51136b158e75bda1c99d5956b7
 MISC metadata.xml 326 BLAKE2B f1dab1cfd169c5cb1be051aafeff74601494801bf89257f2727ebfc7999392bfc4dbb94af165a52f045ea4b7d9b178ae8f658123f4d9ec22aae50f9e4470845e SHA512 0c0d4f09ec5bcbbc9bb592c4676761524ce38094d62a2da3dfb1618e9ef933a599770e78fe5a94e0f9c5b7b295742fb39c2484cd07f641fd041aa68fe41b38c8
diff --git a/x11-misc/shared-mime-info/shared-mime-info-2.2.ebuild b/x11-misc/shared-mime-info/shared-mime-info-2.2.ebuild
index 37199f3b2e5e..a85a462fc7dd 100644
--- a/x11-misc/shared-mime-info/shared-mime-info-2.2.ebuild
+++ b/x11-misc/shared-mime-info/shared-mime-info-2.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI+=" test? ( https://gitlab.freedesktop.org/xdg/xdgmime/-/archive/${MY_XDG
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/x11-misc/shared-mime-info/shared-mime-info-2.3-r1.ebuild b/x11-misc/shared-mime-info/shared-mime-info-2.3-r1.ebuild
index e63535b1ac2d..5cc1ae8a2b39 100644
--- a/x11-misc/shared-mime-info/shared-mime-info-2.3-r1.ebuild
+++ b/x11-misc/shared-mime-info/shared-mime-info-2.3-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI+=" test? ( https://gitlab.freedesktop.org/xdg/xdgmime/-/archive/${MY_XDG
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/x11-misc/shared-mime-info/shared-mime-info-2.4-r1.ebuild b/x11-misc/shared-mime-info/shared-mime-info-2.4-r1.ebuild
index 4416469b12f3..10149dc9a0ee 100644
--- a/x11-misc/shared-mime-info/shared-mime-info-2.4-r1.ebuild
+++ b/x11-misc/shared-mime-info/shared-mime-info-2.4-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI+=" test? ( https://gitlab.freedesktop.org/xdg/xdgmime/-/archive/${MY_XDG
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/x11-misc/slock/Manifest b/x11-misc/slock/Manifest
index a79546772566..a0b620ca1437 100644
--- a/x11-misc/slock/Manifest
+++ b/x11-misc/slock/Manifest
@@ -1,6 +1,4 @@
 AUX slock-1.4-fix-link-paths.patch 558 BLAKE2B f2ef75f836b02ec23b98fdb9f302e671ec8a284b75d83f701e14f5d44a746916b670768730759d4767c9617259b6ad1ec6aceecd851973038ffc2382edd99558 SHA512 3610b7e03e7089ffb4207b136f08ac0944d411284dbbf6614c615596451dcab11ad001c01c4f32c0f040138c99d6764428d60050da59933619a8bbf7fd2a011e
-DIST slock-1.4.tar.gz 6889 BLAKE2B 67f956fd00e7536a9db81b82e85e4128b537569d16cd25428822607a5c2f3b0310bcfec896f7e83c0091e85d21b68438f6f42da715a55cad7fac90d0d0d64b8f SHA512 ad285360dd3f16a225159abaf2f82fabf2c675bd74478cf717f68cbe5941a6c620e3c88544ce675ce3ff19af4bb0675c9405685e0f74ee4e84f7d34c61a0532f
 DIST slock-1.5.tar.gz 6898 BLAKE2B f3435311b24c20fef656589f468b4cd6bbed30568459cb1d525b7dd5b57e5759ee287787d7506ad6cb922fd092bad504f38ab8c57b41deebec4f6aa554269a41 SHA512 2402b1e49f5dbe06cca2f3a31efedce6359413b240f2b98c57147483591a873c3c5457dbf6707485167002ff6d7ee0e9005d9fa506a51bf71337624e8728bb43
-EBUILD slock-1.4-r1.ebuild 1160 BLAKE2B e7eb43a66c713c369dc7dff580fbbe44c6163690adc9e9d815e76b62b6c81460f33ee12b5dd8604f1057f48c09089d7ac4467190f0ef1a3cfc1ad0fbbcf7fa09 SHA512 fb6efd3b182237b772144f002bf8446f94a7190b5e985a58765e8cba40a72924607c4c62e51daa5e4f7a40113c3e3d7377d43afe9930e89451ed84f442c50548
-EBUILD slock-1.5.ebuild 1160 BLAKE2B 6f4806f745830923426d64d0ad0734d456b08f68d500d2e645c94ea33ec98248a68745a03531a8e3b82b16143b2e053a8e761453fff35e4e365d961f3f1da1ce SHA512 e74d0da9e1bcb6a74b37ed2fd57db56d2e99cec18a3b0dd0144b577aaf0a3711a6afd79585b6b7c7e6b783b002dc8f404bc462dd0f7f1ba3f26c384bae6d4963
+EBUILD slock-1.5.ebuild 1161 BLAKE2B 6cd83795f26a34085e838b8955530dde2d3e63d2500d30631492ce2578f9c992154a2771663054c4476a9acbfdcddd0759bc0614d9f6418f6b5802ee473a2652 SHA512 aec374902a9c758f5d92db83c7c28003c1f7507d3bcd83cbb8fa9db3ee21bab7a29a24a043cea5fc4c3cf66f2d219803e8b5f8672fa46610ffe9dc202c0abb12
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/x11-misc/slock/slock-1.4-r1.ebuild b/x11-misc/slock/slock-1.4-r1.ebuild
deleted file mode 100644
index 0f6f4a035658..000000000000
--- a/x11-misc/slock/slock-1.4-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit fcaps savedconfig toolchain-funcs
-
-DESCRIPTION="simple X display locker"
-HOMEPAGE="https://tools.suckless.org/slock"
-SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~hppa ppc64 x86"
-
-RDEPEND="
-	virtual/libcrypt:=
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrandr
-"
-DEPEND="
-	${RDEPEND}
-	x11-base/xorg-proto
-"
-
-PATCHES=(
-	"${FILESDIR}"/slock-1.4-fix-link-paths.patch
-)
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e '/^CFLAGS/{s: -Os::g; s:= :+= :g}' \
-		-e '/^CC/d' \
-		-e '/^LDFLAGS/{s:-s::g; s:= :+= :g}' \
-		config.mk || die
-	sed -i \
-		-e 's|@${CC}|$(CC)|g' \
-		Makefile || die
-
-	restore_config config.h
-
-	tc-export CC
-}
-
-src_compile() {
-	emake slock
-}
-
-src_install() {
-	dobin slock
-	save_config config.h
-}
-
-pkg_postinst() {
-	# cap_dac_read_search used to be enough for shadow access
-	# but now slock wants to write to /proc/self/oom_score_adj
-	# and for that it needs:
-	fcaps \
-		cap_dac_override,cap_setgid,cap_setuid,cap_sys_resource \
-		/usr/bin/slock
-
-	savedconfig_pkg_postinst
-}
diff --git a/x11-misc/slock/slock-1.5.ebuild b/x11-misc/slock/slock-1.5.ebuild
index 4893525a9c52..597b0cf75605 100644
--- a/x11-misc/slock/slock-1.5.ebuild
+++ b/x11-misc/slock/slock-1.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -6,7 +6,7 @@ EAPI=8
 inherit fcaps savedconfig toolchain-funcs
 
 DESCRIPTION="simple X display locker"
-HOMEPAGE="https://tools.suckless.org/slock"
+HOMEPAGE="https://tools.suckless.org/slock/"
 SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/x11-misc/slop/Manifest b/x11-misc/slop/Manifest
index db0f4b9b27ab..034461aa7769 100644
--- a/x11-misc/slop/Manifest
+++ b/x11-misc/slop/Manifest
@@ -1,4 +1,5 @@
+AUX icu-75.1-cxx17.patch 843 BLAKE2B e082ae3afed187343e1d5d15f977cf28649e3734b7dcf7192390ef8e6de2752a1af362bb0db85b374e7589fbdc332342bf3176a5aa0e735e3e4ba3be2886cb5b SHA512 3ac3a7376dcad3a789e8d2b1429f47e4c37defee62d2f29acefbc9c9e7207f5c876c51d475393670f367336092abd9df07d674cd1f500f2fe9d7ee20fd7fb90e
 AUX slop-7.5-missing-header.patch 498 BLAKE2B 62838afbf9c9cf35958481ed5635e0f623849669127c0851500900c7073384a909a24c75bea4ab002a8fa48357312814b2b1c1f2794a9c6c51499e1c8d417b51 SHA512 7d5068e076df464e8d3b773fd803f9d7f14b55d02ea0570fb7cc1ae6e439f3b5b46af40ada24eaf7c063f6bdeb27b5cd15e10de47c909a641506d2b46dce0a98
 DIST slop-7.6.tar.gz 198605 BLAKE2B fcf8b0e1212f50044aa3e3a15d208ee3fda9e1883b9601beba6b29ad574555db83f382547bbe064570765e1ed1e7c0c92bf891edadf89f006bfdf10a5b469c66 SHA512 d1abc50cad124cfb11e9b57c38c824efb2ece3dffce8e54e451ce4adc4a7ad441c6171b7df5d1c8dfa66c875a12cf07b206ba3b87229c0e5f2ddf744d7922fc3
-EBUILD slop-7.6-r1.ebuild 842 BLAKE2B 2e87541886b23319f9c71f90ad8947b9067fe64235e208a11dc14b526966f5ff6f00a8c52c41b524529242295d413a454237d4d7311c02ef7d07e9b83bbf6c8a SHA512 dadd1dfbb1931a2b6740fd5218a74ae210722350d68f8b9d2a495fc7f9d17696f5285885c3c2251ef4b8ad736c26529d2a68c92e8642c6e67185036c6db5600c
+EBUILD slop-7.6-r1.ebuild 934 BLAKE2B f4003ea2c50e40c66ce042c9b4e5fc882b4b9cad89e1524dc8daf936685eaeb322bc01cf597cf54bee18187a65465c5509a8d0aab6658de740cdc86a8510f233 SHA512 0fc2cfa40f69aafd8eb0fc3f7024f42a11808f99903cecf515403d1674f785263a980a50fbfd73641275b883bc2662eb90edc69e4e48b838ee803ab9511c9a36
 MISC metadata.xml 846 BLAKE2B 25e86b393bd7bbea549e56555d67efd140e563db17cab27d7fae925bb222051c95da4b0a03fcdf82ebeddc9139d65e62b284e55e4c6be8958ecc9fe1bb46c0ba SHA512 0e73decbb9e4f6286e34525a7ca6c4ccf35595d8e6cf0e39af303b0587816c0092a97253410536d273d044ab99e5ba35219e2b72e27fdfe12673a2a75250ad81
diff --git a/x11-misc/slop/files/icu-75.1-cxx17.patch b/x11-misc/slop/files/icu-75.1-cxx17.patch
new file mode 100644
index 000000000000..4852c83fc6e8
--- /dev/null
+++ b/x11-misc/slop/files/icu-75.1-cxx17.patch
@@ -0,0 +1,21 @@
+https://bugs.gentoo.org/933863
+https://github.com/naelstrof/slop/issues/172
+
+--- a/CMakeLists.txt	
++++ a/CMakeLists.txt	
+@@ -53,13 +53,13 @@ if ( SLOP_OPENGL )
+ endif()
+ 
+ set_property(TARGET ${LIBRARY_NAME} PROPERTY CXX_STANDARD_REQUIRED ON)
+-set_property(TARGET ${LIBRARY_NAME} PROPERTY CXX_STANDARD 11)
++set_property(TARGET ${LIBRARY_NAME} PROPERTY CXX_STANDARD 17)
+ set_property(TARGET ${LIBRARY_NAME} PROPERTY CXX_EXTENSIONS OFF)
+ 
+ add_executable(${EXECUTABLE_NAME} src/main.cpp)
+ 
+ set_property(TARGET ${EXECUTABLE_NAME} PROPERTY CXX_STANDARD_REQUIRED ON)
+-set_property(TARGET ${EXECUTABLE_NAME} PROPERTY CXX_STANDARD 11)
++set_property(TARGET ${EXECUTABLE_NAME} PROPERTY CXX_STANDARD 17)
+ set_property(TARGET ${EXECUTABLE_NAME} PROPERTY CXX_EXTENSIONS OFF)
+ 
+ set( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/modules" )
diff --git a/x11-misc/slop/slop-7.6-r1.ebuild b/x11-misc/slop/slop-7.6-r1.ebuild
index c54f3ecfd4d0..c9efba7da996 100644
--- a/x11-misc/slop/slop-7.6-r1.ebuild
+++ b/x11-misc/slop/slop-7.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -36,6 +36,11 @@ DEPEND="
 
 PATCHES=( "${FILESDIR}/${PN}"-7.5-missing-header.patch )
 
+src_prepare() {
+	use icu && eapply "${FILESDIR}/"icu-75.1-cxx17.patch
+	cmake_src_prepare
+}
+
 src_configure() {
 	local mycmakeargs=(
 		-DSLOP_OPENGL=$(usex opengl)
diff --git a/x11-misc/spacefm/Manifest b/x11-misc/spacefm/Manifest
index bacb0ed5dc3f..fb0da981a789 100644
--- a/x11-misc/spacefm/Manifest
+++ b/x11-misc/spacefm/Manifest
@@ -3,7 +3,5 @@ AUX spacefm-dash.patch 1737 BLAKE2B 8101c05d2c4f268433d92244f7a78bb7ebef17714ee2
 AUX spacefm-fno-common.patch 2316 BLAKE2B 3f91d4eb0039a3b0e4ba3fe13b9d6436bd91beca0e224af7722d3fa2002e413c6e78cdb7f2eb690e2d58dda90638d896c8f186de8de544829a5bd0ff078b7a60 SHA512 02cd669d89080b5644adfa3092c452ebd3e6a1c39610ba96f5e49e23f3b6697996aa7e35709e46e6b8eb3fc73ff026cc9cf2c7183d4d867ef52e880fc33d31c4
 AUX spacefm-gcc14-build-fix.patch 3586 BLAKE2B 3e2ff0a26fb927f2dbdd95cd25ba9f38478055f9e77552975fade7f53d359f9cc012c7f30bf38ac98255f2b077c9c4ff2eab38cc8d8082370522f33b18e0c4fe SHA512 042e9868ec850e4764cfdf0108f919b22406dd9bffbd0731dcb6a78759e1b56c0300079cd70e4491e5b1ccce1387bef407f997532c87c4f1dc6949f40db08061
 DIST spacefm-1.0.6.tar.gz 3498587 BLAKE2B fc4753ff370fa940ef5737bc7826558847dfbbbec43c1a150d887ed38655f9e45255a737f61a024318c9f37e86a15989da66c83d4dcf5a811603950009b20547 SHA512 37fc0dd31f02158502f592415b4c375ee49560af6f03d75b035d7c6c45bdc47064bba1ae8987b4cc8be2e02b3dfcdc17ec760411975e7b5f74343a2293fb2c8c
-EBUILD spacefm-1.0.6-r1.ebuild 1983 BLAKE2B d21ef66e6f1cb27179f2d783a4153c6b4fd65491f0fdc4379c0e99ab64d69b47264218779efad5fc25c37052d11a61d34643b71d7ad3a9eb3a1230d3ff61f816 SHA512 8eae7ba5c9665173c17529d9286cc5effa44294eec6622af51af7ce8421f36fe5cf0b997de57afd0e11a648d901309386cb92c29bbe8aa0ec01eb1bcdf2fdd6d
-EBUILD spacefm-1.0.6-r2.ebuild 2074 BLAKE2B ffd12edbf1484e5f9b0914ffe467366e928b15cb5261ad286fdcfb70280aa1409a9e37878826ea5f1a391cb4324eeb14a040d54543d7753e67375040cf3a4568 SHA512 2230c856408b00295e240d8aa546db3fd508cfef3abb461d99c1e0e086d78292583ffbd61c23987137d20db637cebb4553a30543299ef20f408b1f4df46e5817
-EBUILD spacefm-1.0.6-r3.ebuild 2148 BLAKE2B 3649fd95078a55f2765efdf3d8c8b424fed0f966789cfa274ad2e50a653ec3b83c72d20ae5ec21445cee19512d286a8fb0bd5b4201253a64c1d413343f0c3c78 SHA512 d792361ab3c90e40f9ecff67ab181605fa6a3ec77fac87ee6af2d3abda6bdce344585bb5c0dfb15e02989136197915e3340d1665c23679c0ff45e02dee1e6204
+EBUILD spacefm-1.0.6-r4.ebuild 2138 BLAKE2B ac779f8d8621694aa828e59133a9f3e511db5898e3c1460f6618fc73a3837e9bb8191d750aa210da6dd7b08a38fef02eacb861170616c904fc2ee706dba157f3 SHA512 668e1a197abbe4eea3b0fa0e13d4f38891c2d6a7409eb4c68acb5a958ead81bc328c72b484cff8c66ccf015ff2e1d264fe8bf8d716773e7f6ff9f57c50a92f15
 MISC metadata.xml 1074 BLAKE2B bb1ae823905cb180e7a65c7c157b97fef75c6839f38f31451876e0697de50ba77a72aed90692fc6df87ede02cd0b2c5e9b7970c01bb2bcf2c598999ea49f2671 SHA512 486c0afcc309a15ed8dff31faa40f8b2f6bfc6d6a6a414661fba7acebbd5e58548e10e5e71185e9ed2ab34f151b7237685428f42b0a48ae8b103fab174b34e88
diff --git a/x11-misc/spacefm/spacefm-1.0.6-r1.ebuild b/x11-misc/spacefm/spacefm-1.0.6-r1.ebuild
deleted file mode 100644
index 0e63a546df0d..000000000000
--- a/x11-misc/spacefm/spacefm-1.0.6-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit linux-info optfeature xdg
-
-DESCRIPTION="A multi-panel tabbed file manager"
-HOMEPAGE="https://ignorantguru.github.io/spacefm/"
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/IgnorantGuru/${PN}.git"
-	EGIT_BRANCH="next"
-	inherit git-r3
-else
-	KEYWORDS="amd64 x86"
-	SRC_URI="https://github.com/IgnorantGuru/spacefm/archive/${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-IUSE="+startup-notification +video-thumbnails"
-
-RDEPEND="dev-libs/glib:2
-	dev-util/desktop-file-utils
-	virtual/udev
-	virtual/freedesktop-icon-theme
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:3
-	x11-libs/pango
-	x11-libs/libX11
-	x11-misc/shared-mime-info
-	startup-notification? ( x11-libs/startup-notification )
-	video-thumbnails? ( media-video/ffmpegthumbnailer )"
-DEPEND="${RDEPEND}"
-BDEPEND="dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-9999-include-sysmacros.patch
-	"${FILESDIR}"/${PN}-fno-common.patch
-)
-
-src_configure() {
-	econf \
-		$(use_enable startup-notification) \
-		$(use_enable video-thumbnails) \
-		--disable-hal \
-		--enable-inotify \
-		--disable-pixmaps \
-		--with-gtk3
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	optfeature "mounting as non-root user" sys-apps/udevil sys-apps/pmount sys-fs/udisks
-	optfeature "supporting ftp/nfs/smb/ssh URLs in the path bar" sys-apps/udevil
-	optfeature "performing as root" x11-misc/ktsuss kde-plasma/kde-cli-tools[kdesu]
-	# sys-apps/util-linux is required for eject
-	optfeature "other optional dependencies" sys-apps/dbus sys-process/lsof sys-apps/util-linux
-
-	if ! has_version 'sys-fs/udisks' ; then
-		elog "When using SpaceFM without udisks, and without the udisks-daemon running,"
-		elog "you may need to enable kernel polling for device media changes to be detected."
-		elog "See /usr/share/doc/${PF}/html/spacefm-manual-en.html#devices-kernpoll"
-	fi
-}
diff --git a/x11-misc/spacefm/spacefm-1.0.6-r2.ebuild b/x11-misc/spacefm/spacefm-1.0.6-r2.ebuild
deleted file mode 100644
index c250bfeca80f..000000000000
--- a/x11-misc/spacefm/spacefm-1.0.6-r2.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools linux-info optfeature xdg
-
-DESCRIPTION="A multi-panel tabbed file manager"
-HOMEPAGE="https://ignorantguru.github.io/spacefm/"
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/IgnorantGuru/${PN}.git"
-	EGIT_BRANCH="next"
-	inherit git-r3
-else
-	KEYWORDS="amd64 x86"
-	SRC_URI="https://github.com/IgnorantGuru/spacefm/archive/${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-IUSE="+startup-notification +video-thumbnails"
-
-RDEPEND="dev-libs/glib:2
-	dev-util/desktop-file-utils
-	virtual/udev
-	virtual/freedesktop-icon-theme
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:3
-	x11-libs/pango
-	x11-libs/libX11
-	x11-misc/shared-mime-info
-	startup-notification? ( x11-libs/startup-notification )
-	video-thumbnails? ( media-video/ffmpegthumbnailer )"
-DEPEND="${RDEPEND}"
-BDEPEND="dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-9999-include-sysmacros.patch
-	"${FILESDIR}"/${PN}-fno-common.patch
-	"${FILESDIR}"/${PN}-dash.patch #891181
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable startup-notification) \
-		$(use_enable video-thumbnails) \
-		--disable-hal \
-		--enable-inotify \
-		--disable-pixmaps \
-		--with-gtk3
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	optfeature "mounting as non-root user" sys-apps/udevil sys-apps/pmount sys-fs/udisks
-	optfeature "supporting ftp/nfs/smb/ssh URLs in the path bar" sys-apps/udevil
-	optfeature "performing as root" x11-misc/ktsuss kde-plasma/kde-cli-tools[kdesu]
-	# sys-apps/util-linux is required for eject
-	optfeature "other optional dependencies" sys-apps/dbus sys-process/lsof sys-apps/util-linux
-
-	if ! has_version 'sys-fs/udisks' ; then
-		elog "When using SpaceFM without udisks, and without the udisks-daemon running,"
-		elog "you may need to enable kernel polling for device media changes to be detected."
-		elog "See /usr/share/doc/${PF}/html/spacefm-manual-en.html#devices-kernpoll"
-	fi
-}
diff --git a/x11-misc/spacefm/spacefm-1.0.6-r3.ebuild b/x11-misc/spacefm/spacefm-1.0.6-r4.ebuild
index 6b688c387c0a..186bae52f4bd 100644
--- a/x11-misc/spacefm/spacefm-1.0.6-r3.ebuild
+++ b/x11-misc/spacefm/spacefm-1.0.6-r4.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_BRANCH="next"
 	inherit git-r3
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 	SRC_URI="https://github.com/IgnorantGuru/spacefm/archive/${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
@@ -27,7 +27,7 @@ RDEPEND="dev-libs/glib:2
 	virtual/freedesktop-icon-theme
 	x11-libs/cairo
 	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:3
+	x11-libs/gtk+:3[X]
 	x11-libs/pango
 	x11-libs/libX11
 	x11-misc/shared-mime-info
@@ -66,7 +66,7 @@ pkg_postinst() {
 
 	optfeature "mounting as non-root user" sys-apps/udevil sys-apps/pmount sys-fs/udisks
 	optfeature "supporting ftp/nfs/smb/ssh URLs in the path bar" sys-apps/udevil
-	optfeature "performing as root" x11-misc/ktsuss kde-plasma/kde-cli-tools[kdesu]
+	optfeature "performing as root" x11-misc/ktsuss kde-plasma/kdesu-gui
 	# sys-apps/util-linux is required for eject
 	optfeature "other optional dependencies" sys-apps/dbus sys-process/lsof sys-apps/util-linux
 
diff --git a/x11-misc/spnavcfg/Manifest b/x11-misc/spnavcfg/Manifest
index a08c3dad8d71..ebd3c181af5a 100644
--- a/x11-misc/spnavcfg/Manifest
+++ b/x11-misc/spnavcfg/Manifest
@@ -1,8 +1,4 @@
 AUX spnavcfg-1.1-makefile.patch 723 BLAKE2B 637ebfab4b48d2cbf2b51e8b59a4c97aff359c625b634f7febf4208855da837784d576abb78332e06cc79be58ba7d8f3df58a5bf6007c7b53d9932681acf43b5 SHA512 7725dc8e91e1ff9776d03982a79dbbbb8555575bbffe3f417e0c761337a47e57f1e6ac54d2b19861256073faa8437a2384330d08a2ed1c17455ad92a14a09d46
-DIST spnavcfg-0.3.1.tar.gz 215460 BLAKE2B f2bd35022399ec085d5c8b08c7514fdac8e974b33e9923a79446fa9552827d5986abf136fdb95ed31d7dbec419eb34ce13039955c6255cff971ffedcd3cc8a02 SHA512 b5e0ef2036eebc971298d95e8a91bd89ade956933919a4a5dc062fd977ff159bba392b0092ac36142fb317a9758c26319b07680b473f9957eda0163146be5408
-DIST spnavcfg-1.0.tar.gz 496695 BLAKE2B 59d79cc1707881ba50e809c73a41cb94dbfd15e5e184114190efa2394fe4b53f25960a828611007a200687a3e9827bc4df30d3d06ca3764b23573a1f51fb2974 SHA512 271d1d66fdfb4aff9faa521c51c776dbccf77320b0783a5dbdcc4a28d4190ef3ba6c3d277d706dafc35e2e6ceed1d244d346d4a91cf8e1f5ba3141c24d065ea8
 DIST spnavcfg-1.1.tar.gz 497896 BLAKE2B 874489904970182f6f56d0a7bd63cc3847f101729b2c6866677fc0c17fab4bad42132ac0f93a39ef9a35654acde8ef6cd42a462756dd7f0c3914424a5fc54dd2 SHA512 4d5c9dc37d1906dbc99535a758554d9419e20ad773adcf2d2062795a8e194a88b68c360341a08e3ac236df08a2e389c4475f341b5bac662a4526dada0bb891a6
-EBUILD spnavcfg-0.3.1.ebuild 644 BLAKE2B ad5135af303379f1b62e654cea8dd8395d0e5d682a3ad9b2b2ed7a94f267e7728bfa992bfa1f5b7b6d2dd52ab096d76abb196636f5049018d5238aaac26201e9 SHA512 7b80cdfb43d5f51410e5c66b83e9c694dcbde9a630e4a835439855a0ae134217ae565c8a90cce9efe68d09532f9307030830ef72898f8ab1ff1783bdbb5c5469
-EBUILD spnavcfg-1.0.ebuild 857 BLAKE2B 63cf66811145d14a0c9d3a7a2157c0bf0c6dd740e603ac05bdc884ccbb306c30066d14ba619cbef193efa9f9111d02215b29d3433b09eff5b81f032cf1eab519 SHA512 419e0161efcb8421902e45ac0ee099b261a7117b451b76cc1716a8887ecfd00fd65a0c7f5bdee65ff859e0d7c7bdcea2ee2cfcb52ae802655c72540bc2aebdb3
-EBUILD spnavcfg-1.1.ebuild 1062 BLAKE2B 43b270c1cda3775df942c7ccf3addb22bdcccaf9af50451ad930db3221e97ecfa12d54cc2a247955589ebf090106ab33b2ed3a30fe9de8df241aba5c8bef5ac3 SHA512 4b2983fa34beefdecade1a9fcfa9babfa785b3b8d6be2dc0b844cf1a76b08b0062869b0a0a729e00b144c7cfe06d6eb4f8aa6da462412873203cfeb840818be5
+EBUILD spnavcfg-1.1.ebuild 1060 BLAKE2B 7f5bdac1bd8098f7c7e394e1731fa4d40173829a65cb44a8ae497a8ab9e5d3779a6fca4eb86cf680581fcd9243728a9cfd7f82f7f7a55c487dfa0a4b24dc4456 SHA512 fdb44feb1ca55c88fb8febfd8cff845157c1e0aa8d6d6f98dfa5e2c400bfe4d01a1ddd9d89b826f558beb305bc2e8d90601990ec929c4396c6f89114b80d6c9d
 MISC metadata.xml 514 BLAKE2B 50df594dc158c9d7aae74568d8eb00a1351df08aec9aee998d9c34812edcaf51e75a7e3e1e75d4fd74ba3be0249f1cd61530eb9d7b1946bee63af3959e84bef8 SHA512 5627cd947830e8c82068402f2fb9a0a65e92b141ab9f61d285e1caf37c43e3e7ab3666d05062493dd339ce5093bffb2ac5622fff702591b7b0fea15b9a061394
diff --git a/x11-misc/spnavcfg/spnavcfg-0.3.1.ebuild b/x11-misc/spnavcfg/spnavcfg-0.3.1.ebuild
deleted file mode 100644
index d4804079dfe0..000000000000
--- a/x11-misc/spnavcfg/spnavcfg-0.3.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="GTK-based GUI to configure a space navigator device"
-HOMEPAGE="http://spacenav.sourceforge.net/"
-SRC_URI="https://downloads.sourceforge.net/project/spacenav/spacenavd%20config%20gui/${PN}%20${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-COMMON_DEPEND="x11-libs/gtk+:2"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig"
-RDEPEND="${COMMON_DEPEND}
-	app-misc/spacenavd[X]"
-
-src_configure() {
-	econf --disable-debug --disable-opt
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
diff --git a/x11-misc/spnavcfg/spnavcfg-1.0.ebuild b/x11-misc/spnavcfg/spnavcfg-1.0.ebuild
deleted file mode 100644
index 9d9d3706b87d..000000000000
--- a/x11-misc/spnavcfg/spnavcfg-1.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs qmake-utils
-
-DESCRIPTION="GTK-based GUI to configure a space navigator device"
-HOMEPAGE="http://spacenav.sourceforge.net/"
-SRC_URI="https://downloads.sourceforge.net/project/spacenav/spacenavd%20config%20gui/${PN}%20${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-COMMON_DEPEND=">=dev-libs/libspnav-1[X]
-	dev-qt/qtcore
-	dev-qt/qtgui
-	dev-qt/qtwidgets
-	x11-libs/libX11"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig"
-RDEPEND="${COMMON_DEPEND}
-	>=app-misc/spacenavd-1[X]"
-
-src_configure() {
-	econf --disable-debug --disable-opt
-}
-
-src_compile() {
-	local args=(
-		CC="$(tc-getCC)"
-		MOC="$(qt5_get_bindir)/moc"
-		RCC="$(qt5_get_bindir)/rcc"
-		UIC="$(qt5_get_bindir)/uic"
-	)
-	emake "${args[@]}"
-}
diff --git a/x11-misc/spnavcfg/spnavcfg-1.1.ebuild b/x11-misc/spnavcfg/spnavcfg-1.1.ebuild
index 0cfb5b301c56..55e90acf9512 100644
--- a/x11-misc/spnavcfg/spnavcfg-1.1.ebuild
+++ b/x11-misc/spnavcfg/spnavcfg-1.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/project/spacenav/spacenavd%20config%2
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 COMMON_DEPEND=">=dev-libs/libspnav-1[X]
diff --git a/x11-misc/tdrop/Manifest b/x11-misc/tdrop/Manifest
index a17e2a106372..2904c0978ebf 100644
--- a/x11-misc/tdrop/Manifest
+++ b/x11-misc/tdrop/Manifest
@@ -1,6 +1,4 @@
-DIST tdrop-0.4.0.tar.gz 21550 BLAKE2B 673ad98aa294410b4547fce842d191fd3c5512cca79361cae35fcb646afd328615daab1fa112bcba9e28cdea6bbeb2ca696bcc78d54c0302d32a91324a8a16d9 SHA512 679fed509e29752ebe3df378e68d9701c9edb53c9162854a8cb623f2da53499b933dad59fa6fc865ac44c67544cd6bcb779316ee4312e87c39559ade1ab313d8
 DIST tdrop-0.5.0.tar.gz 24726 BLAKE2B d0043bcc28115999b89fe6d89790ea4d1d6da71dec7034a283c4f3b5b2b8f065482f8727d6e0d900f5ae00c3ea3d7a06ce03a82902286d509a8b04dd5b46025d SHA512 cfccbdb73b00ea8c1376f34debe2b7f550343100fd47e7f45a859ad692f42abbf58e26316a95813691f4bda05cce657490bfcc7b3765585d9afb396580aefce5
-EBUILD tdrop-0.4.0.ebuild 656 BLAKE2B e3f23ec203d5229d468cfaacda7fce752a5e7c8361e259339f0df2298ddf9de10010484fd0adf639d2a4365537ba7648cfeac32fa9433c073339e4e2eaea7f2d SHA512 e0536af8897c34b2716a31516b18a1d3534593019035d30105db04fc733ccdf8de48feb5e1cdaca169d4dadc602c3c89801c45edf8d7b1051c92d82dc0c660ad
 EBUILD tdrop-0.5.0.ebuild 760 BLAKE2B b2443c37a1aa20a96aa734ce420ff3de6520a702fdc91cbb0b141cfd9ab0c2bec09173044c1c9768279c8e229dab1e032ee8e9dc6e6be23a81a02aac24e67038 SHA512 569adf5b922f416c0f888ec05abeb0e9197467cd7e8c57edad966b9a34c098f2eb5716fd4dcebd28e4646a133a8ab747bb435128e022376dc0ff294b5564547c
 EBUILD tdrop-9999.ebuild 760 BLAKE2B b2443c37a1aa20a96aa734ce420ff3de6520a702fdc91cbb0b141cfd9ab0c2bec09173044c1c9768279c8e229dab1e032ee8e9dc6e6be23a81a02aac24e67038 SHA512 569adf5b922f416c0f888ec05abeb0e9197467cd7e8c57edad966b9a34c098f2eb5716fd4dcebd28e4646a133a8ab747bb435128e022376dc0ff294b5564547c
 MISC metadata.xml 330 BLAKE2B 36fd8a6d1429d8a56dcc1b40f1f95203e3d2df7ff279a87ea4b953b4747eb11884ffc2eeb413771e4e1f4dee645b67658591d4a895949776e0c06166a3d1efa7 SHA512 f1366b40ec9d6e97cd1fb935c835a5f64697fe2f5d329cf04723041cf57f6f04bacb8b5650e84760c6f42ff844d75723483625c58ea987db53506ab56b36040e
diff --git a/x11-misc/tdrop/tdrop-0.4.0.ebuild b/x11-misc/tdrop/tdrop-0.4.0.ebuild
deleted file mode 100644
index 695b437b87d3..000000000000
--- a/x11-misc/tdrop/tdrop-0.4.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="WM-Independent Dropdown Creator"
-HOMEPAGE="https://github.com/noctuid/tdrop"
-
-if [[ ${PV} == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/noctuid/tdrop"
-else
-	SRC_URI="https://github.com/noctuid/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc64"
-fi
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	app-shells/bash
-	sys-process/procps
-	x11-apps/xprop
-	x11-apps/xrandr
-	x11-apps/xwininfo
-	x11-misc/xdotool
-"
-
-src_compile() {
-	:
-}
-
-src_install() {
-	dobin tdrop
-	doman tdrop.1
-	dodoc README.org
-}
diff --git a/x11-misc/tint2/Manifest b/x11-misc/tint2/Manifest
index 8754951c91f1..ef6d554ce474 100644
--- a/x11-misc/tint2/Manifest
+++ b/x11-misc/tint2/Manifest
@@ -1,5 +1,5 @@
 DIST tint2-v17.0.2.tar.gz 553734 BLAKE2B 73cd89757963f1a3c3460a2e8e61891e77eb12b9809590dbbbc00df00d03e82d33d6175c7e3ff4623a3390e35fe1530263915b4574dedfd46d9401fbc90d769f SHA512 9bfdf9ba33183ed60b95f73e58d9c1c22af83e9973a0e07ff2825d66d19c7103364426753a07eaecd4dbca278dfc6e22737bc6ce38d9b577b65f672f146e7aa2
 DIST tint2-v17.1.3.tar.gz 573472 BLAKE2B 459833b0bde126bd99f7aa016df81ca81866d641ff8b55c54d397c7eef7f80b2bcb219d56dfdb42e10d21f09856d2d97fafe712c1b9f6002f6f0350c4dbc3685 SHA512 dfdfd011d35130955f243bf390f014fcc691448f284d635a9238616595155a3cd815aa229fd570ae58e94c58b439ae1545f7e13090e174117c50ca48679d0135
 EBUILD tint2-17.0.2.ebuild 1107 BLAKE2B 876cefcdbb54de83726dca28ab6596ee8f011f402d02676739b9a7ead2a85c9ff12980f1ed33fafc75462c4acf9180f5414fc1b158e587958b12efcc8806c8ab SHA512 1a2dc78d53a77de0ac7202dd4e038d60ecddba590f3b06bce13c4fb3ce68aa9c7e9cfe829e500f3a89827b95de9f100d3209b92262129810206da440e46678af
-EBUILD tint2-17.1.3.ebuild 1537 BLAKE2B 9fad3d0cc91c43d655e982fb8db7f10d1b5f32d50f587fa7d62dc1027f13f5fefd324f1dd3b20d95da6e97e71ce9279de57423ce7269375e62c63f8f828c0e65 SHA512 504f678687771db07d46079d3da36c5eaf79c4b7f2e165a9e32f9ad6964790f37af2d2cfc2dcd53488594b57f95ca7375c9bdc843adfe0939d3be8c57e23f4ef
+EBUILD tint2-17.1.3.ebuild 1535 BLAKE2B c2ce04d81cdfc2f49c794abddee41028a7e614f7f7a9e8c586a35a61d078f95479b59bdd8cbf6abee316b1928634ad1757c740c41f9381d8e67b19b3b601a1bd SHA512 48c3cafde92e296f0f5c802644a5aa403e87dca29cb94322e7485de9e1ea331eb229ce035cc204b2e483448501d7514d900213b6617aa992ea9ebb6226bdfa2a
 MISC metadata.xml 833 BLAKE2B 575f102728e1c5fab35e1697450104a53fe8772edd35a2c77b48d5109f6ef91eba7819474b0aabf7354b168294b162b4f45921d198d4c8d22ac4ca6308100381 SHA512 dd17f7676168ddbcb019cdde2d98fa5f19053ceb720a81b2a5c32c25fb8a175feb9d5a4ef399bd0bd8f8cd75f07c5ee44463cbaa7e40a64307419a247af502b4
diff --git a/x11-misc/tint2/tint2-17.1.3.ebuild b/x11-misc/tint2/tint2-17.1.3.ebuild
index 0c3ec79c99a1..50e0908a179b 100644
--- a/x11-misc/tint2/tint2-17.1.3.ebuild
+++ b/x11-misc/tint2/tint2-17.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ S=${WORKDIR}/${PN}-v${PV}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc x86"
 IUSE="battery debug startup-notification sanitize svg tint2conf"
 
 DEPEND="
diff --git a/x11-misc/trayer/Manifest b/x11-misc/trayer/Manifest
index 7a28ec1f9b3a..c57255a71753 100644
--- a/x11-misc/trayer/Manifest
+++ b/x11-misc/trayer/Manifest
@@ -5,6 +5,5 @@ AUX trayer-1.0-fix-incompatible-pointer-types.patch 331 BLAKE2B 35416ddcbf32588a
 AUX trayer-1.0-fno-common.patch 167 BLAKE2B 31ec6428dc5732fba6f165e71483573668dd6efa658785cbe6d1f7a52cf030ee1ce288ced90b673210b49302c57cb62471f95d3be16a41d350d3273064f64027 SHA512 9a15a1905e33676bef0eee7426a07223a8ee59089ab63888e35c8035b1c7dcdeabdffd59e9df55369b7e1475cda1b341725fc9e3dfae31dd26101fb7c922da55
 AUX trayer.1 4448 BLAKE2B 663b00da3409d8366fc110fd2f67876f9b6cba4059410ac4d280c647022fd763a6e999dd953e02fec0d7130e16c5034b0c865766c0fd6c8bfd7ddf648c6ca258 SHA512 c55299fbec8f9bfcaeb262a3d2833af4ec111354c4e18bce219568b4a788b298d3d762f657c2fcc787c6ac8959934e9d459f6a808e618cc4769e2989c59659a1
 DIST trayer-1.0-sourceforge.tar.gz 29713 BLAKE2B 6a874781979c512e4fea06b0dcef30be73821e502553ebdad38ab2e152d070f6633dd6f8059d5532a51648ea10cbdfd752a65da11d2a992687a6f3ee4d289d01 SHA512 9903a78a1c185515e87552732449937daa23187d54a3ccbf19bc9fc569d6a440600c879fe78edbea3eff6b66a1f3fc5054d474dfeaca53af3521a6f18b454049
-EBUILD trayer-1.0-r4.ebuild 1035 BLAKE2B bd09726103477c85a99d17cfcac65a00c0a139869a3fdd1178b8e662750663d329c6bc79c9f9213e59af7f391534faff42a9a7aca320c04798f5d000bd34d529 SHA512 462d5a2667996c6ee532e992d734a9c3d850fabf86be33b6f707daa450277afe42604669395f9c58a8fbe7a558e1303cb92a7014275363025f4b4319022b7484
 EBUILD trayer-1.0-r5.ebuild 1092 BLAKE2B b53467b7b57f60e5ab725916156701e1cbcb86edbcae41e3bc54116cf2cad8a8a9bb96a6a598852e48f0b4fd806dc97067ec96c0174767a646ac8271f0ed67ec SHA512 552353b8f4b61810849232aa4765b077724153f3cf9cd58e08ca88d00e36c131062e0f1ad9aaa522a9cd83446e3178b3fe01fae5f5f78c1db8e434a6b8e72a69
 MISC metadata.xml 221 BLAKE2B 2bdd4cc2d7f7a4fb627addf3608926b0ec64c4e8f5b764c625482fa803b883ccc5a4d89ce3f0190bbd5772ed719455c46ffd6c4674adcff6044642ce50d8592d SHA512 4d656cd01a75b528e757bfda686503d56ec9753562c6c52fedbd1f897285fd6cce36da0beba020875e29b8e240821456a4ebf26ccda72b8aac6456d8aa8b6a8c
diff --git a/x11-misc/trayer/trayer-1.0-r4.ebuild b/x11-misc/trayer/trayer-1.0-r4.ebuild
deleted file mode 100644
index 5afa3ceb9eee..000000000000
--- a/x11-misc/trayer/trayer-1.0-r4.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Lightweight GTK+ based systray for UNIX desktop"
-HOMEPAGE="https://sourceforge.net/projects/fvwm-crystal/"
-SRC_URI="https://sourceforge.net/projects/fvwm-crystal/files/${PN}/${PV}/${P}.tar.gz/download -> ${P}-sourceforge.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-
-RDEPEND="dev-libs/glib:2
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:2
-	x11-libs/libX11"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-dont-include-gdk-pixbuf-xlib.patch
-	"${FILESDIR}"/${P}-dont-include-libXmu.patch
-	"${FILESDIR}"/${P}-as-needed-and-pre-stripped.patch
-	"${FILESDIR}"/${P}-fno-common.patch
-)
-
-src_compile() {
-	tc-export PKG_CONFIG
-
-	emake "CC=$(tc-getCC)" CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" -C systray
-	emake "CC=$(tc-getCC)" CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}"
-}
-
-src_install() {
-	dobin trayer
-	doman "${FILESDIR}"/trayer.1
-	einstalldocs
-}
diff --git a/x11-misc/urxvt-font-size/Manifest b/x11-misc/urxvt-font-size/Manifest
index 14a7c5c67d00..80b50b819290 100644
--- a/x11-misc/urxvt-font-size/Manifest
+++ b/x11-misc/urxvt-font-size/Manifest
@@ -1,4 +1,3 @@
 DIST urxvt-font-size-1.3.tar.gz 6276 BLAKE2B 55d0585d8bd817bb39a0d4336f4627592ae7805c03484a273d4151bd81454fd740ac675649d6ed7643cb78de5d911f2aa3471426ffec8770673096a13999b810 SHA512 546c3cdc1290bac934b36acf74c6148c43385d2cfdd3141afe5a8fe369477cc219d1db5c9d98a53678de4d297fd541d49ebbd702f80f91dd41a11aeab02270e7
 EBUILD urxvt-font-size-1.3.ebuild 654 BLAKE2B 097107c8e5f3bfaf3e8dd12bff913c35a64af0065b342ded4266bfc5b49b2caabe0dcdcfffec45b73dc355cb0142b2923c84c80c33408788501c3351110eecaf SHA512 1580821889087414f3b0a33aba73c62684ae8b019893d94dbccfe08f1e9a585ff821c3c5b8075a14e80b76812e433d19a9ee1b26d253c8831456eea696fadd4d
-EBUILD urxvt-font-size-9999.ebuild 656 BLAKE2B 8fb55dcc9c37c8d770da9a4c11c9c61e95319557d3e35510534bc0a2f05115dae242313ceea4e7f47ec9debccac87641c40d6252cab1f0e8461ac8600315118b SHA512 30260f23582693d14c28d3cba38f6e0a68afbc6f0d8907d5dc1c02dc355c0bfd2e263a58f53be53d619534f8360938bd4cee3678a619a040a7dfae2f178f348d
 MISC metadata.xml 259 BLAKE2B ebdb4da0eb69daf6acc553ec4d1f17e96f0d9b9dcf0dc3c827bc58eae7254a396f1ce5631b7ad218e5479368b42c82c2447ca22afe5e68b12502ec2c32a893e0 SHA512 331676aef0863a874a2d6c4e7927e2dedba1d89c411cf05d2f2f5cc0b51aafe5a0a0f4b1381fa35f4e8a16c599650d6bf66c3c59c753ae26dbb40e116d08eb0f
diff --git a/x11-misc/urxvt-font-size/urxvt-font-size-9999.ebuild b/x11-misc/urxvt-font-size/urxvt-font-size-9999.ebuild
deleted file mode 100644
index 7ed3f5eb0668..000000000000
--- a/x11-misc/urxvt-font-size/urxvt-font-size-9999.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/majutsushi/${PN}.git"
-	inherit git-r3
-else
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/majutsushi/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-DESCRIPTION="Perl extension for rxvt-unicode to change the font size on the fly"
-HOMEPAGE="https://github.com/majutsushi/urxvt-font-size/"
-
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="
-	x11-apps/xlsfonts
-	x11-terms/rxvt-unicode[perl]
-"
-
-src_install() {
-	insinto /usr/$(get_libdir)/urxvt/perl
-	doins font-size
-	dodoc README.markdown
-}
diff --git a/x11-misc/util-macros/Manifest b/x11-misc/util-macros/Manifest
index 30e188abe5a8..7dde532b51a7 100644
--- a/x11-misc/util-macros/Manifest
+++ b/x11-misc/util-macros/Manifest
@@ -1,3 +1,3 @@
 DIST util-macros-1.20.1.tar.xz 83124 BLAKE2B f80f6dd5823bd4264b4a6d50cb01cb0fca739a4d9c164d45fa5f9367f9ab7f6181c654859a3dcbea1e666ce12a1402b984eb028b47d71ce6c7b9bc95ce61474e SHA512 5f44d73c18ff87459cd94a68a961465b3970a36f0b55be65c0ec228320a675561eb24a1b1359745124302446a1a3fadc2f50d3378f439df5bd3e866cb8015286
-EBUILD util-macros-1.20.1.ebuild 649 BLAKE2B deac528128c4c399773189e98e5cae2dd27e60d7d5642feeddd238d32437a9cc97c9a9ad70a295ffda2c4523aeff97c575ee0bde0d64bfaf5c7c57bdf6e24461 SHA512 b2ee272168c44a9a257b515183dbe43a9718ce6d889f25c2ef25859535b63f25cf0f0142c4f6692ef9d446509e3f6e55ae7ca700e7bb3afe9890974606ae22e4
+EBUILD util-macros-1.20.1.ebuild 643 BLAKE2B 94294d0303bf8bcc9791fcbc5605e2f37c4cefd287bce2d3e59021440ef30e760f6b300e467028fc29fb9fbaa8f63539c912defd32c697d6aa9ff8628a49a76c SHA512 a3ee56dcc5fa5c66f5ecf33fdd4273460977be49c2ac95e66f44f3008d07628dbd4554f679db6d96d58ca91869fbffaa74074eef91c6756e1117c72327d26828
 MISC metadata.xml 338 BLAKE2B dcc620ca4e58f9d0464530f7915fb50e995dcae1b334b7d0fb3044cbaee39592ba7d86ed925d9ff3e72f1236ef378887deb41e9102a4c3d543f43aebeaa2e105 SHA512 d3be3477539efb8765b1249e87ed842f7c1db9b10799a9569c68d6ec1bd0386ddd192556265a43eb401aeee30f52c8906c05871877814de9d9cf7c9ef5187c36
diff --git a/x11-misc/util-macros/util-macros-1.20.1.ebuild b/x11-misc/util-macros/util-macros-1.20.1.ebuild
index a8bf00a634cf..a22cab1e4e52 100644
--- a/x11-misc/util-macros/util-macros-1.20.1.ebuild
+++ b/x11-misc/util-macros/util-macros-1.20.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.x.org/releases/individual/util/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 
 # there is nothing to compile for this package, all its contents are produced by
 # configure. the only make job that matters is make install
diff --git a/x11-misc/wdm/Manifest b/x11-misc/wdm/Manifest
index 5f458b56af6c..d46174c7bc82 100644
--- a/x11-misc/wdm/Manifest
+++ b/x11-misc/wdm/Manifest
@@ -4,6 +4,5 @@ AUX wdm-1.28-remove-fakehome.patch 950 BLAKE2B 127755e61a73772d20625c32e9263f386
 AUX wdm-1.28-remove-sigsetmask.patch 407 BLAKE2B e3a968f5f5dac7776d1ba968a24686f6ac00a48388bd459ab0ff80e10aa000cdf56e799135f04b96629b5133ea228376a5b5035755de65a1e0ef699b92005f67 SHA512 6a90ea6c2e2e68ebebaa3ac661b11929014c2105c76455fbb1464831f1eb60b8bd3b9511b8ba9c7a5c871336767ba25263007746989a81aad0d0dbdccd1c62c0
 AUX wdm-1.28-terminateServer.patch 422 BLAKE2B 6d85344c1b045a8dfc206c6b0b4f5375be3d62fcb69335c628e1d63b131d62cf54784a9f84a27d49e7ed1c0aa48982bb4c5fa95249bfe6e0203991e1e6c0b381 SHA512 f00685ce1ff38f34df57864d05dd52b7148d27a81177f2c560157a470b089bd9b981ae73bcc6da8c1995822d8b74c6dffdb6166dff33adcf4cd4daa2bc9dc8cf
 DIST wdm-1.28.tar.bz2 381522 BLAKE2B 72105e949c5bc8043967f5b36838c171e32728a40d2ef5f6fe618b04337e3f37329696a7f9f1cee591bf1a037de4ca4168f270a316375e27fd7ce0c919880833 SHA512 393ace12d3975e978c05b90be691a7c27921e7e2db0bdef5f4fe06b324da56edea4936200dc123130c6de9e45af5dac6175559d641957fec104d66bad67c03a1
-EBUILD wdm-1.28-r8.ebuild 1147 BLAKE2B 1ed073d7d5bea47ad5246b9725c14c18fc600826bc850f6df5f70e04183181a1492322716d07e0c89277095a46774fd4cf0864f2d7695e6f62360f4a79fcbf53 SHA512 2d96ff6f6a9ac77e0fe434a2e9fa2651c2953675f29f9555272ffdf770935edb7d1f9f4c124c61297e416911fbc664bca20900cea638c6f2961038800036c778
 EBUILD wdm-1.28-r9.ebuild 1202 BLAKE2B 0c78a407a698bf3a3a663babaa17790565efd840b4237530c98b92118ccaf837ce427094c36f7f4f6bc3aa6105f5f5327c37eab1605846aa0154aa1f8f285754 SHA512 632a7d92c72b09f57724a81207cf2177b7e9fae2119a8ee93ccc10426c3efbd196194f1892452acb0e54e7d15b618df487e1e723028f4b23c234ffbe665ad4cf
 MISC metadata.xml 242 BLAKE2B 4c96aa6c23a9e57dd59eb10c8cb7c1d0093873d3592e2b52a47e3c500fc41f4fea8875756e0d6c63949081e30a63be7e183ece3d8e2c2c56a4c2d394021bb153 SHA512 b4f2c130f9bd93ef09f8795a089a9e101c1fc58e5e5e212cf26b0c696e50be48fa4ccc3e941fd936baa35a8042e1b78579506ce8e58e29ec0c8210d749b3b501
diff --git a/x11-misc/wdm/wdm-1.28-r8.ebuild b/x11-misc/wdm/wdm-1.28-r8.ebuild
deleted file mode 100644
index 1deebf96a564..000000000000
--- a/x11-misc/wdm/wdm-1.28-r8.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools pam toolchain-funcs
-
-DESCRIPTION="WINGs Display Manager"
-HOMEPAGE="https://github.com/voins/wdm"
-SRC_URI="http://voins.program.ru/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86"
-IUSE="pam selinux truetype"
-
-DEPEND="
-	virtual/libcrypt:=
-	>=x11-wm/windowmaker-0.70.0
-	x11-libs/libXmu
-	x11-libs/libXpm
-	x11-libs/libXt
-	pam? ( sys-libs/pam )
-	truetype? ( x11-libs/libXft )
-"
-RDEPEND="${DEPEND}
-	pam? ( >=sys-auth/pambase-20080219.1 )
-"
-BDEPEND="
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-terminateServer.patch
-	"${FILESDIR}"/${P}-remove-fakehome.patch
-	"${FILESDIR}"/${P}-pkg_config.patch
-	"${FILESDIR}"/${P}-ar.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-src_configure() {
-	tc-export AR
-	econf \
-		--with-wdmdir="${EPREFIX}"/etc/X11/wdm \
-		$(use_enable pam) \
-		$(use_enable selinux)
-}
-
-src_install() {
-	default
-
-	rm -f "${ED}"/etc/pam.d/wdm || die
-
-	if use pam; then
-		pamd_mimic system-local-login wdm auth account password session
-	fi
-}
diff --git a/x11-misc/wmctrl/Manifest b/x11-misc/wmctrl/Manifest
index eeb6b03d583f..e88aa89ae10e 100644
--- a/x11-misc/wmctrl/Manifest
+++ b/x11-misc/wmctrl/Manifest
@@ -1,4 +1,4 @@
 AUX wmctrl-1.07-64bit-xlib.patch 451 BLAKE2B 99db11eeec40f8979470b1cc56942196c98bfc068920f1016b96120b7eb722bba6196b8f98370664e847190d1e52e591c6fd3072d812aad3cb75e6df3fa480c1 SHA512 3ef0a6ae0efa9667a019777673c9c794aae23aa9f76ec63d4a54390397b2af66826feb040861f2da3dc673e67aeead6abec001e1436d8c86a4c24e7d96f87e5e
 DIST wmctrl-1.07.tar.gz 87820 BLAKE2B e1059bef92fd4cf6cca3f539c68bfe3745c95abbefecabe3b1592a7dc3c69d769551f0ea4acc1d1e0c57024ce64e3fa0f0248fcf0f5776617d1ab88d667b662a SHA512 4c77ad1e204e8d444f682ad1d05c0993bcab9097ac6d4b6a944556ab85acbe713f549dbaf443cd4d1226a162ce7d46fbd209c92652e87fc8e609feee74907daa
-EBUILD wmctrl-1.07-r3.ebuild 589 BLAKE2B 2cdb917a3aeb8b05f4e9f94530b87503a407d2d91770c0e9504589f74d762d2ba9cc67ea052ab48be6f5a957948b55976b61030030a0ece385d90dbd27ea0078 SHA512 c6f3e3636aa6e7003109c62c1c8a22f451c07a7ac79319761c30f8ee7f9f397e407249bb8066d04d4a8b85ca329c429afc0038556888d603d60b1ce48969839c
-MISC metadata.xml 246 BLAKE2B a512e6e8ffd8a998f89ea9dbf8a29dd4bb2d6db435e4ac0ef3182fc23996e04a6e87c1771975d835038ad86d6cb61e4a1aea8b80286666d64ad0b511c9d8f163 SHA512 d827f64596500d61c0f24c9d2a69fa3ca2f8b52e5f5815106d7db2837482172f0518d99677e6332a69fd4c34289ef817203a5047363ea7d2c10372b09f9e0618
+EBUILD wmctrl-1.07-r3.ebuild 596 BLAKE2B 089b08e28e4850a4a9171bdade3464980bc380773f6700b90270c1435bf60936f0eee4c432c4cbbe272892f2b9a889a74805ff26b05a3a0a2b774f32547db009 SHA512 eb55ecf9cdb28e616a942af548f7bf0276b4457efe903e6fa5237ed8e843668870f53819416e8f271acc848837f28223a91e9a094d18b737331e58cc034ddaa9
+MISC metadata.xml 330 BLAKE2B 16caf0d4a6df212989900dcc7a6b49edb6c2e006dcf5d0100798c5e0d0ccb1f7b21e9b6546c66ee0019ec2e44caaae1b8c5475c439c5ebac21a88e6c175ccf52 SHA512 eccf9c8e81050dcf3aeb4d661aaf79f83fb38483f46b637b2bb5ccd4aae0c5c1934ed0846fd4ba19217436becbf2230c01f6efd2ba7c7d78b3a1add6daae82b8
diff --git a/x11-misc/wmctrl/metadata.xml b/x11-misc/wmctrl/metadata.xml
index 06d84e396dc3..fc9da8ad6934 100644
--- a/x11-misc/wmctrl/metadata.xml
+++ b/x11-misc/wmctrl/metadata.xml
@@ -5,4 +5,7 @@
 		<email>ionen@gentoo.org</email>
 		<name>Ionen Wolkens</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">Conservatory/wmctrl</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-misc/wmctrl/wmctrl-1.07-r3.ebuild b/x11-misc/wmctrl/wmctrl-1.07-r3.ebuild
index a7bad8f520bc..00a94c207920 100644
--- a/x11-misc/wmctrl/wmctrl-1.07-r3.ebuild
+++ b/x11-misc/wmctrl/wmctrl-1.07-r3.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 DESCRIPTION="Command line tool to interact with an EWMH/NetWM compatible X Window Manager"
-HOMEPAGE="http://tripie.sweb.cz/utils/wmctrl/"
-SRC_URI="http://tripie.sweb.cz/utils/wmctrl/dist/${P}.tar.gz"
+HOMEPAGE="https://github.com/Conservatory/wmctrl/"
+SRC_URI="https://dev.gentoo.org/~ionen/distfiles/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
@@ -14,12 +14,15 @@ KEYWORDS="amd64 arm64 ppc ~ppc64 ~riscv ~sparc x86 ~x86-linux"
 RDEPEND="
 	dev-libs/glib:2
 	x11-libs/libX11
-	x11-libs/libXmu"
+	x11-libs/libXmu
+"
 DEPEND="
 	${RDEPEND}
-	x11-base/xorg-proto"
+	x11-base/xorg-proto
+"
 BDEPEND="
-	virtual/pkgconfig"
+	virtual/pkgconfig
+"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-64bit-xlib.patch
diff --git a/x11-misc/x11vnc/Manifest b/x11-misc/x11vnc/Manifest
index c2038698bd7b..5069280dc7b3 100644
--- a/x11-misc/x11vnc/Manifest
+++ b/x11-misc/x11vnc/Manifest
@@ -8,5 +8,5 @@ AUX x11vnc-0.9.16-libressl.patch 1721 BLAKE2B a2565c9b9d6cb778846197ba1258a94b57
 AUX x11vnc.conf.d 1435 BLAKE2B 8403d61a4941c56127e869d6ac90d4f85237af9af786f864d32afbedf3e736528b74c8c83fcf3491794b9e62db6ef2a354dccd61f368c8e9251f915e2bd683f8 SHA512 dedc94fab89a06ca6025b99c2c944cabe77640487c8fc761a6420e5be7062ee4c1c383f3846c17bed434ad4f3ec3b994badb493919acb99da3f61caa40c60246
 AUX x11vnc.init.d-r1 1740 BLAKE2B 85f5c40a47287eb648d49c5e6211ea950abcad1378690ee7f45313378d49f4cc826a08d15f36dc49fc76dc4cc763fd6182c4324de053c5ba40cea97001546c74 SHA512 def0edac62b35b231354fb24372b48ac346730af2e507522e7a598c9661a78252ee31dab7c3635d85ec128873d0261913a35482c8dc0be744806e8db5af222aa
 DIST x11vnc-0.9.16.tar.gz 1708009 BLAKE2B a8789f95ef421a78a83703748e1d80fd45539dff24f80493fd75e357bc22378213915853f9d114248c172cd83977880e1e4e8a3f8df0771017e9988d83b7307d SHA512 69f65ee312f8dede6051b401304987502a213c6c28c7f41e855734f11de1fae14d5d493dc9c28b2e4b7c0be55f8dbd3b35dd2610aae910183772c3e626736fec
-EBUILD x11vnc-0.9.16-r8.ebuild 2098 BLAKE2B fea0bea1f230f75a18ad7642114d0c29951e8b8c59b3f24f2511f23b08ba797a2034f74db2ac8676defe14420d86550112aa8a44f0213b45e6377146b48f2d6d SHA512 51da80501f0245065a51d08d6555b54a5eee68c278bd74400d3a79a59c3db44c0b9d6cd168c3242549f33c632f8b6248d1ea573782f3ef07f3470a02c6d276f6
+EBUILD x11vnc-0.9.16-r8.ebuild 2092 BLAKE2B f5abca4fd4139505bce8f9a1a0e404532b4a409a3bc32dae42461f4a48428bd6b566c72fa8d308db063c1b7d5d610fd29b85caaca69e38d61584236e63dba4b7 SHA512 5aae15f17c74db2b4424520e83cca270f6727c5fbf265fbb2cb326bd90ebe6d7da83793d474ceb4d18185a6dbcc07b9e93d74a0b99a4c1e76817e0f56dbf7774
 MISC metadata.xml 953 BLAKE2B 716b40da30ae65560d74a2dc7ea528180e0d8da048355dfc7557df06704ccde01cba1a3fa24a3f5f53bc6349482d430f180e0678bf6d032be8966d971a612445 SHA512 a9de2facb44bc2eeab0fda61de359b191d7c1243560a3cfa21e1566cad6c113ed126dd117befc8666d4dfa8080cb291ac9fed75b9fcc4f6986ed6bebd89ab710
diff --git a/x11-misc/x11vnc/x11vnc-0.9.16-r8.ebuild b/x11-misc/x11vnc/x11vnc-0.9.16-r8.ebuild
index 214d2bf12b72..33be9601afc3 100644
--- a/x11-misc/x11vnc/x11vnc-0.9.16-r8.ebuild
+++ b/x11-misc/x11vnc/x11vnc-0.9.16-r8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/LibVNC/x11vnc/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+-with-openssl-exception"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
 IUSE="crypt fbcon ssl +xcomposite +xdamage +xfixes xinerama +xrandr zeroconf"
 
 COMMON_DEPEND="
diff --git a/x11-misc/xbindkeys/Manifest b/x11-misc/xbindkeys/Manifest
index fa5d0f3c8ff1..ab5d361edc7a 100644
--- a/x11-misc/xbindkeys/Manifest
+++ b/x11-misc/xbindkeys/Manifest
@@ -1,3 +1,4 @@
 DIST xbindkeys-1.8.7.tar.gz 177532 BLAKE2B 9ff6c9cd10bb6f2bf96a288482edb50e6671c9e4e3b5c136bdfaa92796f9e9bcfc42ab69ca3546c3871bdcdba1e952631cbd3d288dce9738986c20680e91c316 SHA512 a6b1478e8ef4bedc686fdd15abc11a8a592ac17c69e1a5a13f60e735e9be9646faed62e980cdac4aa7bc7e3253237465de38dee98935dd3f9911d4e48209b2e9
+EBUILD xbindkeys-1.8.7-r100.ebuild 1059 BLAKE2B 906154ed8e7db1a32cb1bc5ac014f1c4869acdcc253e0ce7f5e02a14b027619460ad5473277889d798498813ef42e6c8b6b287c718c791461f48c73d07ef4bb6 SHA512 275eee63e05e880afaa5ea7ac1efd17f4f100672164124d70871bd6cf1853dbee6197f1fd7312cf428e0c222a6d677a79f1cf979eff19831e87ce499884428ec
 EBUILD xbindkeys-1.8.7-r2.ebuild 813 BLAKE2B 4edf6b5bdcc6056bdaa1d56a173a9fd406c7b6e4edd1430b84ad4d34cb92d568392bcbd6f2a9cef51b24914b42dd8af498a4c1493117e637915c2bc60ba3ef52 SHA512 93c71aa19ba60601bc0642f00b2330c8c8f862f3e04bd90d1560302e6e37df26f7d5ca68ef8edf5855786723af8421782111fbdcdd9999e0fffd0fc922843c84
 MISC metadata.xml 388 BLAKE2B 8627eaf1867246255f9cf5e886749300fe854b6fc4add00c1fb7395a41349a42aeaf9bcd1866b1ef8a6b3ecd04416cd6ebb7dcebd266ae341af4aaa144de510d SHA512 238ec6ad37a6fcb588eeb6f5f00befa9e9f483cbd012d7e98b9627a3bf3f401ea74aee560a1909458a471e6c44b3ea13eb3a7d30e5f5a1f5c5464c9775d5614d
diff --git a/x11-misc/xbindkeys/xbindkeys-1.8.7-r100.ebuild b/x11-misc/xbindkeys/xbindkeys-1.8.7-r100.ebuild
new file mode 100644
index 000000000000..37330789de12
--- /dev/null
+++ b/x11-misc/xbindkeys/xbindkeys-1.8.7-r100.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+GUILE_REQ_USE="deprecated"
+GUILE_COMPAT=( 2-2 3-0 )
+inherit autotools guile-single
+
+DESCRIPTION="Tool for launching commands on keystrokes"
+SRC_URI="https://www.nongnu.org/${PN}/${P}.tar.gz"
+HOMEPAGE="https://www.nongnu.org/xbindkeys/xbindkeys.html"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="guile tk"
+
+REQUIRED_USE="guile? ( ${GUILE_REQUIRED_USE} )"
+
+RDEPEND="
+	x11-libs/libX11
+	guile? ( ${GUILE_DEPS} )
+	tk? ( dev-lang/tk )
+"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto
+"
+
+DOCS=( AUTHORS BUGS ChangeLog README TODO xbindkeysrc )
+
+pkg_setup() {
+	use guile && guile-single_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	use guile && guile_bump_sources
+
+	# Regenerate to pick up newer versions of Guile macros
+	# bug #828532
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable guile) \
+		$(use_enable tk)
+}
+
+src_install() {
+	default
+
+	use guile && guile_unstrip_ccache
+}
diff --git a/x11-misc/xbitmaps/Manifest b/x11-misc/xbitmaps/Manifest
index 3a4408022e4a..3e25984ec882 100644
--- a/x11-misc/xbitmaps/Manifest
+++ b/x11-misc/xbitmaps/Manifest
@@ -1,3 +1,3 @@
 DIST xbitmaps-1.1.3.tar.xz 109772 BLAKE2B e5ffeed910131fafe7346bc26920dc27a9ef55b069a36cc969183cc7b02a732a781e1fd295ec2577fbb472efc566f18aa2d534e18e94d4a8abc66db0177bd26e SHA512 b9a7340385fcce2dcd0204f14a462685b14b72ff58f3ec53cd76695bef2b02af902bdac809622dcb27fd4075d5ba13587b5d059530aff502cd5288d161352814
-EBUILD xbitmaps-1.1.3.ebuild 527 BLAKE2B f74a05855a8d022139272c467c2f9badada0917313e7d14ec8cbcba409031e09c49ee5ec6d7fb0301f0bf57bb5b89bdff9a1e5058c0848b7d0cf52f6a238c90c SHA512 d5c5ab6fcf9caf4669a96ade594c623d4c7d72d65b344b8d2d3e511585f644dadaba5de8d1b45d4c14ff0f36b1abf82d687fb9fd811f15ac4584be5153411330
+EBUILD xbitmaps-1.1.3.ebuild 521 BLAKE2B cf0e0380e23ee8582fcd1aabaedefc4a6550350d9d08083890b5c9546fdc4e58e8d58ada380b94e2169abd44725b848f91e70ae87e478996f2a3849604eccd1c SHA512 94780ac1b0061ea4029e21fc091ac1502497fdc2f7bcf39ecf1c5f4b06ad5fdb6148245ccec74b2190f394fd80ae7e2e76ed4e42a3c933464e6f854d87a3a638
 MISC metadata.xml 322 BLAKE2B ebf88c647c8d6a49be6116a66d6c6b9e5a0609752c31d0ef96daedc9064b57fb25051f0e02dc171c20afe78b050d6c8f4218c2408003feff98275576a7265853 SHA512 a3e122f01de815db03f2cd96d588e0b37313e224e837356affd162825ceddcebc62c435f0d0beb378fa8eaabdf41b2a5fac6f2ad5d7105bae1a12ffe55e14712
diff --git a/x11-misc/xbitmaps/xbitmaps-1.1.3.ebuild b/x11-misc/xbitmaps/xbitmaps-1.1.3.ebuild
index d7c4977867a4..c19674962174 100644
--- a/x11-misc/xbitmaps/xbitmaps-1.1.3.ebuild
+++ b/x11-misc/xbitmaps/xbitmaps-1.1.3.ebuild
@@ -8,7 +8,7 @@ XORG_TARBALL_SUFFIX="xz"
 inherit xorg-3
 
 DESCRIPTION="X.Org bitmaps data"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 
 # there is nothing to compile for this package, all its contents are produced by
 # configure. the only make job that matters is make install
diff --git a/x11-misc/xclip/Manifest b/x11-misc/xclip/Manifest
index 35fee7117eff..90fdb92d7132 100644
--- a/x11-misc/xclip/Manifest
+++ b/x11-misc/xclip/Manifest
@@ -1,4 +1,4 @@
 DIST xclip-0.13.tar.gz 30461 BLAKE2B e5249c81aceca59f71eeee985ab4a4c9006b6afef98f3f6addd7adc590abea47d3e9df8110ccb6c0c065cf4356a2a2a0866e08604adbac75e3589bb97403aaa0 SHA512 191a86194a1503a47c6641a55855dc4aaa8c2c99d2e6f1d46e727feec85a6639041f37ec2265c05c178c0c7d791d3e88bde89223f879effa878812f078485ed2
-EBUILD xclip-0.13.ebuild 597 BLAKE2B 3feadfca0e82c88611ae8d00e81c8338d9792e870d6cf0ffac934cc0955f1439fef2875928ea0545dd67c49602b1d0698f0e6c6b107873b962e95b9be3ecd95d SHA512 007a88117c5ee9a6ba07be5e21c610e7331e3a5ea84a28c567070726935bd00929fef3ed7a579c9fdf2ffad7d28a7fdd72a4947826963255c549881e6a9920a4
+EBUILD xclip-0.13.ebuild 591 BLAKE2B 62125faf691cbc42bd7cf3dbfcbbc49d4c51dceccca4d4a49f2bb02cf9f0f91fb4a1d6bbe6c1364db486aa288205611dfce540f0105cea63b2268fb5f90a3251 SHA512 60a43d8861422ac6d49173e0c257aee9b43c594951c4e2b06b1d160ba3b1f0f7f6a342fbe5a953eb5e2fb898a34d277cdc5f8b7e05b603c41b10fdec0fd85144
 EBUILD xclip-9999.ebuild 477 BLAKE2B e5e12cb092c719988e7d0e60679f746934f1f66a2946ca5fd36a60743e42b43389381c5dc49f9004a30e0e33fffbf40e32ad67aa98c2b1f0c8059131d91a9f61 SHA512 012f545b4db4d793b4976b65fc709b6d828cb0e3ee3cd0db10efd2bc2b4e31052cef70cc77ec5ec150c1890d4e9e23c8b1442bb862e75e4fa75f10f45e4b3b24
 MISC metadata.xml 580 BLAKE2B 0e3eed2d5abd68576b907e9d9c46a400659ae0b146e59be76889a5f957582ff744729d8a40985cf6d0c9163791f13313f72dddaacc715a0bbcbc23e3e6f88ee4 SHA512 e2ae0a6070da4730eb6cdf6f27d5a40cda84adbaf46fb9aa9fce1534a6f94ecf3f1c16de900675d7149e57972da3d447c3912eb7401c27aca7f4bb1b49f41a26
diff --git a/x11-misc/xclip/xclip-0.13.ebuild b/x11-misc/xclip/xclip-0.13.ebuild
index bb2a1cfa7bad..be9107f4d409 100644
--- a/x11-misc/xclip/xclip-0.13.ebuild
+++ b/x11-misc/xclip/xclip-0.13.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/astrand/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	x11-libs/libX11
diff --git a/x11-misc/xdg-user-dirs-gtk/Manifest b/x11-misc/xdg-user-dirs-gtk/Manifest
index 8b3bc02210e3..dcfb4fabf632 100644
--- a/x11-misc/xdg-user-dirs-gtk/Manifest
+++ b/x11-misc/xdg-user-dirs-gtk/Manifest
@@ -1,3 +1,3 @@
 DIST xdg-user-dirs-gtk-0.11.tar.xz 126488 BLAKE2B 45b8c3ab0b43214a1c1b39d368a283fb566bee115549468eb85e1e9e5407025690dbe320698df107523a3ea0d7cd8d0d3ef8d2296c80c79a74863d50eb581581 SHA512 2a650c6372126f807ac90fb0508e1b11636b38b5960a3037b547e9f1bb1a6b82653f20da7d5aae1144eebec040e3af89a02fbf70c1768724019b384f6d9cf85a
-EBUILD xdg-user-dirs-gtk-0.11.ebuild 1408 BLAKE2B f06786fdda1e15ae1a5c468ab39a3cb518b5ac02365245ce4a0b6b75c03d560649ffb727c177349c1e943c2326b62c82a2a0b4f6f402711a75d1fb7911411a30 SHA512 21bda848c30d7bd079f25bc88297d85e762107aa6f3429e35a9bf236a634496c168ec38926d9660b0791ffe367b48617d994eba07d2f9abf7105ae9a1a32b387
+EBUILD xdg-user-dirs-gtk-0.11.ebuild 1402 BLAKE2B 31591b23a8c3ce0f01af5544b789907ab3a2c075dcddde8748d6c6ca67bc05ec1e8d36e96672dc4b8db3c767c87fb29d2b443b0c2915de2d0ad998cb6ee49b9a SHA512 ff4067e51021d534330809226f33f56192f5de776833d502e86dc387024c2a7497eb76deb897019a3fd06a7a7478a6d8172a9bdb712b14331f435403b556cc0d
 MISC metadata.xml 323 BLAKE2B 394573fe3d848de05e5a6bad9795f85b45ba86996f2c8ef4d02606aa5c1365ac47fd3e08caf2c62b594ae95c292af88dd84ed0b0145456907d25a4a92d329482 SHA512 fec58920d40c6b10be41b61576d147639fa1570d8c91ad9a55aee05611590ac1268d60e97a5004b22a47c0848258bd388ff916c2d5c068f5b76c1689dbd41c40
diff --git a/x11-misc/xdg-user-dirs-gtk/xdg-user-dirs-gtk-0.11.ebuild b/x11-misc/xdg-user-dirs-gtk/xdg-user-dirs-gtk-0.11.ebuild
index 60eaaae8aa09..a31eef54b13d 100644
--- a/x11-misc/xdg-user-dirs-gtk/xdg-user-dirs-gtk-0.11.ebuild
+++ b/x11-misc/xdg-user-dirs-gtk/xdg-user-dirs-gtk-0.11.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/xdg-user-dirs-gtk"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-libs/glib:2
diff --git a/x11-misc/xdg-user-dirs/Manifest b/x11-misc/xdg-user-dirs/Manifest
index 6e163e8ba41e..72ef0d4f1ab6 100644
--- a/x11-misc/xdg-user-dirs/Manifest
+++ b/x11-misc/xdg-user-dirs/Manifest
@@ -1,4 +1,4 @@
 AUX xdg-user-dirs-0.15-libiconv.patch 1120 BLAKE2B f0f5829c31eded3f3f860e005ead5302daf8f11f3a68a440a80dd136ac0da497b9321b009860838c5150968d8e4c601932e41295465ccf6b93ab9bbd27de9a8c SHA512 dbca90f745d71f7abf0c281a567e2831b6e1b028e8cf2613523724c00c683874a91b1cbac3a45ed074e404fcee805d6ba2518735a0b34929dcc7a1b869a4c37f
 DIST xdg-user-dirs-0.18.tar.gz 273556 BLAKE2B e9d05a2399040229eaed4947098bb587a3962860a0c162fd5bd939451df592130faa2fc5201440787a6a481e966f7769912b46ca1028e57a834fc7ddd950f904 SHA512 f523b2ba4f840a3c2a5730f72182fb5bb798187db769bfb7d36e9f780442813278a2c1bad656b4fb38428131241a51d07200a62b4d7b935d49a74be53f969716
-EBUILD xdg-user-dirs-0.18.ebuild 735 BLAKE2B 844be1a2624fe196796a5deadae534f28176dfa67af381183869f7db553048aebaf384ad6764bf860708cafec0576fc7829877358cb31c7dd1cafaba96bc9f8a SHA512 62951a5a494b354fc993221a8d42ecca9b1807313621932a8228b3023d34017b0113b1ba3a1062f403a23338fef1fdf477779b667b2cfc3eb6a9d2b776b2bd0c
+EBUILD xdg-user-dirs-0.18.ebuild 729 BLAKE2B cb902e7a2b9e9077cd03d6948adcbf60f0361b042d6636e394d3c722d5e2415fbfa313563bb688cb3ba0795afcba49949c55324faf84b3d11066aab7bd642d51 SHA512 7b46fbddb456e04ff6f8957e673d95ff189ff3cf487b654bc357b1a1e3899333369c16d0ee7d30a07adcb74a52455f79b71fd4558fe3cf995698620112bdb4ec
 MISC metadata.xml 323 BLAKE2B 8dc1eb4aa1970fc64d5ed22fc2e041a9c47d21b4cc12570ab2238ab0ea2349dc44925ad91be31720c7b35d9802c10e1f62d23eedc59ad9aa91c97537d2715da8 SHA512 89a366c15cd04b26e30494a05ae4ac5dba23da803c607ebea2cc1bc782e80f727c15f285a01f3e22862aa7d4ac131a39686153234d8d356438eeabaace1230f8
diff --git a/x11-misc/xdg-user-dirs/xdg-user-dirs-0.18.ebuild b/x11-misc/xdg-user-dirs/xdg-user-dirs-0.18.ebuild
index c4747adf2ade..fb39be1f1f3d 100644
--- a/x11-misc/xdg-user-dirs/xdg-user-dirs-0.18.ebuild
+++ b/x11-misc/xdg-user-dirs/xdg-user-dirs-0.18.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://user-dirs.freedesktop.org/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="gtk"
 
 BDEPEND="app-text/docbook-xml-dtd:4.3
diff --git a/x11-misc/xdg-utils/Manifest b/x11-misc/xdg-utils/Manifest
index d70e49fecda4..b7cb6d6df628 100644
--- a/x11-misc/xdg-utils/Manifest
+++ b/x11-misc/xdg-utils/Manifest
@@ -1,11 +1,6 @@
 AUX xdg-utils-1.2.1-qtpaths.patch 992 BLAKE2B 086d018f214d58cda79011310f382b032e58888e43b9e0ad2619f4aec04c4d5cd8b913c244ca549d1c90b7c57aab225b28a67c5cf6bfed7b8087be4437ff461b SHA512 9a7942e38ecad2bdbebdd558557647648c21bfec132f72bb7c3f2ae737345fb1e552e7fa6a118223da663ae4e3ac4d9776ec3f46f031ad2499141ab83db5c99a
 AUX xdg-utils-1.2.1-xdg-mime-default.patch 5034 BLAKE2B 0eb35b1abd650e442c50cfd52d8801e4fbb36813aeac67b4dcd8d1d39eba08ca02f4bf2189242b848da481ba57ebe96ad849bde8ce52ff73b015fb3be5610d93 SHA512 0e57d5cf9fa9969738c1d836c4c3b644cc6e1e80cd7486ec5ca0fdb2c86f0f5e3988c4790faf1838ad09946803347a96c0fd47373c5971c691c20d4913845ad1
-AUX xdg-utils-egrep.patch 760 BLAKE2B 641a75615aa54000acee26ad65e802245c12db388f372b1f7cfe4df29c025a8eb5e4523ef89a6e209e00c7ec0288c799f16a5d4ac04fa25da3375d2d128b1de2 SHA512 80976c70974c670432a48ab467ca68126f699816914b806a65f48b234c631cc470b7399b389a15a6181a0fbbf486692d0583f791c0592bdc70186df319075ac6
-DIST xdg-utils-1.1.3_p20200220-no-which.patch.xz 5576 BLAKE2B cf8c3111689c355add2a0c16a887fd463dc2d00c267cac0561d4598430f043d19fea376859aa4ff521273ff788b4e8afdea5ef6e7b0ba51ffded23be2ad61335 SHA512 c30e512e8caae3f4d2282592722bc24e08cb33f5ec01d5504d2e49833c1598fe27807c095dc2226efca57dcbef4d2883fd9bfa46fb8eeee93c53f9880c050b51
-DIST xdg-utils-1.1.3_p20210805.tar.bz2 287544 BLAKE2B ec3755e5e6f596c5787324ab254ba14938f35dda6df5a4ef88fb582c5df7704e706dee2f4362cc0597164cf2aeab5cf8f5f6db1b9d374355723e3d738e101264 SHA512 ec51e98e4c73ad7cb3c77051617a939c7956c7da6bcbbcda4e54121af247ce6978c8638c80bc644a49cfca14b18f06cb25747719bc20c97f7e60b9b4f3597a71
 DIST xdg-utils-v1.2.1.tar.bz2 293386 BLAKE2B 9d6ce4be8c27ad5b8d0ae55ad0d8b4457b59cb1bd260884ca5bfd2cb8ed7ed68a2f5a8db6d660ceabab59cbb9880fd4f1a26cb71a8f759ec40c2f9f95bbc8a05 SHA512 d5436449fec2f4db952239ee910bfda203955c8df8cb92379f182dc36f9c82b6ceb092ccbebfd02ed00eb7ef5f6895ef745baca67906ae7490e425db27b1dbfc
-EBUILD xdg-utils-1.1.3_p20210805-r2.ebuild 2424 BLAKE2B 44c105b594dcff348860cfdb915e1b18bfc028a9bc8a0a5c8ae33f7d9e67b6bca2b15360b908a921fc1e9629569152f6adbe81ff335f07d558b8d60b3029c7c6 SHA512 c944a53cc3a5f2c81f8e33bf39aea958ae95398f862f30a21636a1729b8bd196c0d7d4766ea25a501189edbb25fc194c75f4e62913faab8cb5d4862bb77bc865
-EBUILD xdg-utils-1.2.1-r1.ebuild 2291 BLAKE2B b475167f8817c813c3bd844d3fd8d718fcfe96b8728a776e175494850ce42c522bade72c01b18407a594bf1b8698706b14445f8cf2419fb9a0ddea06aaeb67cc SHA512 c60238c0eff9b66984548046d26ef28bbccbdcd88adbce6138021f40b5880f5761fd99e464155e526e1a1e32d2e0057090d59a0db0aaf9597145ce829db5634c
-EBUILD xdg-utils-1.2.1-r2.ebuild 2354 BLAKE2B 17d67a1157da0cf87137feea2d4a91c8e290b0e1927bb218b4b3aa5ba87a4f7effce4dc824b279c597cf78e7814d572fae6fc246cd8e702ad6acc9f2bb7a6d1a SHA512 a9f23ef113977147d37756cefbbb3987a24d285a7407314f65b352bc49df3e9d29be66695fc6706ec0d96cb0582e5000b68756f5fc5562c38defcb17affbf476
-EBUILD xdg-utils-1.2.1-r6.ebuild 2588 BLAKE2B 0d60a5a3a7330e1e0a00accc6dc310e2c06449475e4e34c2e2df97812df1d46f126c72e296025ddc8d87edeeac67aa91a34e1f3408a0e6f81bbf178fdfd74770 SHA512 71c844cb852a4c49355e09049b10fd7050769b1847ea28548d101443cb02d0d109d08201b5bdcaf5c4a36e0cae287f289154d70f2b6d5b763f57a626c804632b
+EBUILD xdg-utils-1.2.1-r1.ebuild 2285 BLAKE2B 6a79cd47dc1f2d7a1691bc28b3b883c6efef384618f012a4f1cacb66104603a61eadac9c24abae10010cfc5ced1b9ba49e062b534c77960355c4d6fd7beeff7c SHA512 fcd8973d05b92ef817a6df662194e1aad96bbdbd3818167628d6db67b8265f22cda161f64f68b1e7c93ef5ff41809240f6ec96613d97d005ec02aeaddcd0cefa
+EBUILD xdg-utils-1.2.1-r6.ebuild 2581 BLAKE2B 4ea0ac32b7fca21676bfca8d736854f0142525c57277a2b492f4b864999439616b6f47f7755583c707d8873f0c0272fa789759f5314b60e6c52cb0eca0d820d4 SHA512 e84ba1e3e68c8fd173cf0e6ba139c856920a1a898940a6d2c2efcf6bd1293b196c8973b899eb784dc8761369f819bad8007199e1c3e4cec36547094567ff3752
 MISC metadata.xml 319 BLAKE2B 4910953400fa3f3b0b72b8baba239a1e0c3466c38f84b6a60bc816620b789473179c151b1af68d0629ba7f79a1ea826b536f0f29678007bba025714ceb514061 SHA512 c07b03f20aeedd0ceaf7de137b76578142c703317d98ac7a57ae5143cab7523974a50aafa58e92c541d4a84ec0961b7de180d11d95c7da45f5698e3c19e7182d
diff --git a/x11-misc/xdg-utils/files/xdg-utils-egrep.patch b/x11-misc/xdg-utils/files/xdg-utils-egrep.patch
deleted file mode 100644
index 71608552a08b..000000000000
--- a/x11-misc/xdg-utils/files/xdg-utils-egrep.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 7538458c6c8999296a272c40bd4ec24132a51877 Mon Sep 17 00:00:00 2001
-From: E5ten <ethancsommer@gmail.com>
-Date: Thu, 16 Jan 2020 02:06:09 +0000
-Subject: [PATCH] switch from non-standard "egrep" to POSIX "grep -E"
-
----
- scripts/xdg-open.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/scripts/xdg-open.in b/scripts/xdg-open.in
-index 202f3e3..35b0522 100644
---- a/scripts/xdg-open.in
-+++ b/scripts/xdg-open.in
-@@ -72,7 +72,7 @@ get_key()
- is_file_url_or_path()
- {
-     if echo "$1" | grep -q '^file://' \
--            || ! echo "$1" | egrep -q '^[[:alpha:]][[:alpha:][:digit:]+\.\-]*:'; then
-+            || ! echo "$1" | grep -Eq '^[[:alpha:]][[:alpha:][:digit:]+\.\-]*:'; then
-         return 0
-     else
-         return 1
--- 
-GitLab
-
diff --git a/x11-misc/xdg-utils/xdg-utils-1.1.3_p20210805-r2.ebuild b/x11-misc/xdg-utils/xdg-utils-1.1.3_p20210805-r2.ebuild
deleted file mode 100644
index 852bfc0c9eea..000000000000
--- a/x11-misc/xdg-utils/xdg-utils-1.1.3_p20210805-r2.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-MY_COMMIT="1a58bc28f6844898532daf9ee1bf6da7764955a9"
-DESCRIPTION="Portland utils for cross-platform/cross-toolkit/cross-desktop interoperability"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/xdg-utils/"
-SRC_URI="https://gitlab.freedesktop.org/xdg/xdg-utils/-/archive/${MY_COMMIT}/${P}.tar.bz2"
-# https://gitlab.freedesktop.org/xdg/xdg-utils/-/merge_requests/24
-SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-1.1.3_p20200220-no-which.patch.xz"
-S="${WORKDIR}"/xdg-utils-${MY_COMMIT}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="dbus doc gnome X"
-REQUIRED_USE="gnome? ( dbus )"
-
-RDEPEND="
-	dev-util/desktop-file-utils
-	dev-perl/File-MimeInfo
-	dbus? (
-		sys-apps/dbus
-		gnome? (
-			dev-perl/Net-DBus
-			dev-perl/X11-Protocol
-		)
-	)
-	x11-misc/shared-mime-info
-	X? (
-		x11-apps/xprop
-		x11-apps/xset
-	)
-"
-BDEPEND="
-	>=app-text/xmlto-0.0.28-r3[text(+)]
-	app-alternatives/awk
-"
-
-DOCS=( ChangeLog README RELEASE_NOTES TODO )
-
-# Tests run random system programs, including interactive programs
-# that block forever
-RESTRICT="test"
-
-PATCHES=(
-	"${WORKDIR}"/${PN}-1.1.3_p20200220-no-which.patch
-	# https://gitlab.freedesktop.org/xdg/xdg-utils/-/merge_requests/21
-	"${FILESDIR}"/${PN}-egrep.patch
-)
-
-src_prepare() {
-	default
-
-	# If you choose to do git snapshot instead of patchset, you need to remember
-	# to run `autoconf` in ./ and `make scripts-clean` in ./scripts/ to refresh
-	# all the files
-	eautoreconf
-}
-
-src_configure() {
-	export ac_cv_path_XMLTO="$(type -P xmlto) --skip-validation" #502166
-	default
-	emake -C scripts scripts-clean
-}
-
-src_install() {
-	default
-
-	newdoc scripts/xsl/README README.xsl
-	use doc && dodoc -r scripts/html
-
-	# Install default XDG_DATA_DIRS, bug #264647
-	echo XDG_DATA_DIRS=\"${EPREFIX}/usr/local/share\" > 30xdg-data-local
-	echo 'COLON_SEPARATED="XDG_DATA_DIRS XDG_CONFIG_DIRS"' >> 30xdg-data-local
-	doenvd 30xdg-data-local
-
-	echo XDG_DATA_DIRS=\"${EPREFIX}/usr/share\" > 90xdg-data-base
-	echo XDG_CONFIG_DIRS=\"${EPREFIX}/etc/xdg\" >> 90xdg-data-base
-	doenvd 90xdg-data-base
-}
-
-pkg_postinst() {
-	[[ -x $(type -P gtk-update-icon-cache) ]] \
-		|| elog "Install dev-util/gtk-update-icon-cache for the gtk-update-icon-cache command."
-}
diff --git a/x11-misc/xdg-utils/xdg-utils-1.2.1-r1.ebuild b/x11-misc/xdg-utils/xdg-utils-1.2.1-r1.ebuild
index 74b50cca06a6..1a7e62b0a6c4 100644
--- a/x11-misc/xdg-utils/xdg-utils-1.2.1-r1.ebuild
+++ b/x11-misc/xdg-utils/xdg-utils-1.2.1-r1.ebuild
@@ -18,7 +18,7 @@ fi
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="dbus doc gnome X"
 REQUIRED_USE="gnome? ( dbus )"
 
diff --git a/x11-misc/xdg-utils/xdg-utils-1.2.1-r2.ebuild b/x11-misc/xdg-utils/xdg-utils-1.2.1-r2.ebuild
deleted file mode 100644
index 3f66355e2cb9..000000000000
--- a/x11-misc/xdg-utils/xdg-utils-1.2.1-r2.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-DESCRIPTION="Portland utils for cross-platform/cross-toolkit/cross-desktop interoperability"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/xdg-utils/"
-if [[ ${PV} == *_p* ]] ; then
-	MY_COMMIT="d4f00e1d803038af4f245949d8c747a384117852"
-	SRC_URI="https://gitlab.freedesktop.org/xdg/xdg-utils/-/archive/${MY_COMMIT}/${P}.tar.bz2"
-	S="${WORKDIR}"/xdg-utils-${MY_COMMIT}
-else
-	SRC_URI="https://gitlab.freedesktop.org/xdg/xdg-utils/-/archive/v${PV}/${PN}-v${PV}.tar.bz2"
-	S="${WORKDIR}"/${PN}-v${PV}
-fi
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="dbus doc gnome X"
-REQUIRED_USE="gnome? ( dbus )"
-
-RDEPEND="
-	dev-util/desktop-file-utils
-	dev-perl/File-MimeInfo
-	dbus? (
-		sys-apps/dbus
-		gnome? (
-			dev-perl/Net-DBus
-			dev-perl/X11-Protocol
-		)
-	)
-	x11-misc/shared-mime-info
-	X? (
-		x11-apps/xprop
-		x11-apps/xset
-	)
-"
-BDEPEND="
-	>=app-text/xmlto-0.0.28-r3[text(+)]
-	app-alternatives/awk
-"
-
-# Tests run random system programs, including interactive programs
-# that block forever
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-xdg-mime-default.patch
-)
-
-src_prepare() {
-	default
-
-	if [[ ${PV} == *_p* ]] ; then
-		# If you choose to do git snapshot instead of patchset, you need to remember
-		# to run `autoconf` in ./ and `make scripts-clean` in ./scripts/ to refresh
-		# all the files
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	export ac_cv_path_XMLTO="$(type -P xmlto) --skip-validation" #502166
-	default
-	emake -C scripts scripts-clean
-}
-
-src_install() {
-	default
-
-	dodoc RELEASE_NOTES
-
-	newdoc scripts/xsl/README README.xsl
-	use doc && dodoc -r scripts/html
-
-	# Install default XDG_DATA_DIRS, bug #264647
-	echo XDG_DATA_DIRS=\"${EPREFIX}/usr/local/share\" > 30xdg-data-local || die
-	echo 'COLON_SEPARATED="XDG_DATA_DIRS XDG_CONFIG_DIRS"' >> 30xdg-data-local || die
-	doenvd 30xdg-data-local
-
-	echo XDG_DATA_DIRS=\"${EPREFIX}/usr/share\" > 90xdg-data-base || die
-	echo XDG_CONFIG_DIRS=\"${EPREFIX}/etc/xdg\" >> 90xdg-data-base || die
-	doenvd 90xdg-data-base
-}
-
-pkg_postinst() {
-	[[ -x $(type -P gtk-update-icon-cache) ]] \
-		|| elog "Install dev-util/gtk-update-icon-cache for the gtk-update-icon-cache command."
-}
diff --git a/x11-misc/xdg-utils/xdg-utils-1.2.1-r6.ebuild b/x11-misc/xdg-utils/xdg-utils-1.2.1-r6.ebuild
index cda3c70809fd..fc0c96334ecd 100644
--- a/x11-misc/xdg-utils/xdg-utils-1.2.1-r6.ebuild
+++ b/x11-misc/xdg-utils/xdg-utils-1.2.1-r6.ebuild
@@ -18,7 +18,7 @@ fi
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="dbus doc gnome plasma X"
 REQUIRED_USE="gnome? ( dbus )"
 
diff --git a/x11-misc/xkeyboard-config/Manifest b/x11-misc/xkeyboard-config/Manifest
index 97a390f42f59..f17c63984198 100644
--- a/x11-misc/xkeyboard-config/Manifest
+++ b/x11-misc/xkeyboard-config/Manifest
@@ -1,6 +1,6 @@
-DIST xkeyboard-config-2.41.tar.xz 898404 BLAKE2B f608c30b31c26f2273907f45929a0fe9e44bb9513d45a791be1ff3fb8da5cd56d4fbb182540c47960f16841a30f89fdab0ad87cc41597c02bfd76643fff6857d SHA512 108c1d0a8344e15f5d92f876a1b008571f6dbe57aecf2797757accc1f3f031a07dfb4ba5028e06784620810dd835ddd5afadf68e2d73594ae96b7520b0bbde7a
 DIST xkeyboard-config-2.42.tar.xz 910192 BLAKE2B 1b49a9bdf9e6ad2c196b8c4cc93803a2b4ce804148a7eb55616672db5c4d3eb289e2de931ee8b08a2152dd542a9f2d1e00ba8cca7651d7f33b570ed4a5f4c57b SHA512 654436ae21b9deb3b193847403b652cc5c19aa665a9c9168598fc6ac7af83ac04d40684d9eb99dd4db97c21e5100cfeed06b25e2b041eb9fdf3c05ef95a891a9
-EBUILD xkeyboard-config-2.41.ebuild 1636 BLAKE2B 4967819e4ce4d77947bda3195747beb826a21cd78ecc5bb05bfcf0669d0f020ff6a879a3881d03d8dee3758b8e8b68e7b5a4c319d931d34a5fe1c849abe79e21 SHA512 968ee58b66c757c7ae0e982f0969c61f54f34a18d66e7573a9a37f89d949b2d146a7780b1a8eda724ce7278276cffc83be1b67bb7691da699d3bf749cd97a923
-EBUILD xkeyboard-config-2.42.ebuild 1593 BLAKE2B 070e56e9c30845d60d93c374aebd0ceb7edda1a56e00a21a52abf4a1f2ca0cca15e95dd0edb448f1cc88f49c73a5635b62920af20928980d4a16b28c8aa3368f SHA512 bf79c09e5c5c2ec24c93b9ad092d04d2a52b74c167073fbe7158940a656d41bc3ef8d61d5e29cf6d1d330880dd4e8b4e704b6c3b2806c827ccab25b61ef01081
-EBUILD xkeyboard-config-9999.ebuild 1600 BLAKE2B 05403c640350ec7ffe65ee81b7f4f8c1ab03a9ca046f5d042ee6d2f640afd0f8e1564aa19635db963e5746868366ddd62f2a29cffaebb1af3ab335bf7fc2cb45 SHA512 ae6ce2821c52984a313d5c2cfe721d6fdd1c83d5530ab45dafee5dbcbf4fb93f5725a8bdf07ebab4b9cf1ecaa2c54f0c7f2881d53dbfe79fe18dd123c93194ee
+DIST xkeyboard-config-2.43.tar.xz 925424 BLAKE2B 89cf4872305ce3358185ed63f0ff2f0dc90205d50d51b4b881256e0762b12a74f30d0905a75e5feff2f0fef09d94bee778a8cbe83cdf6e048653e8eb42f53087 SHA512 6daf885bf8794cf03d5b447b90ca1666f87e9c609a344e02bb90edca360eb64b24f80a92ed570aa75b4ea62245b3998f6df3757f7e02c4015cdfecee5378a0d4
+EBUILD xkeyboard-config-2.42.ebuild 1574 BLAKE2B be170bb0067f1e8a19bce450e8227c671ecd02525c41930a10b951cb696d88ec8b12709bf7687ec3d8f7dab9b18569d6a1cb9dbfb3cfe9a990fe2d915791f56f SHA512 992a19559ca2254bb7e8f4ea0ceeefbd4918d75584f74b87ee45b2add5a19765b768ff27341a4a82576296411ad233e8e7189a37f0a5a6e07b4b2a96174b9424
+EBUILD xkeyboard-config-2.43.ebuild 1582 BLAKE2B beee2bce78e8c6616cc3d8eac2fe050dd1eb243e03a24d3f3102cc00e7b2732afe7da5b54d33c7a5f8eb79a4ad445b6e89e63b12eb2746ab9587b9ae9cc95745 SHA512 0ad649e9dfa09364a57bb8f93a0bad356d3d8ab6c0aa3adf7766c8aa18907e6d43e0ff9990dbfdf7d1e967e8f299d288ea7d1f7cf564fdb206a333a0b3ff7761
+EBUILD xkeyboard-config-9999.ebuild 1582 BLAKE2B beee2bce78e8c6616cc3d8eac2fe050dd1eb243e03a24d3f3102cc00e7b2732afe7da5b54d33c7a5f8eb79a4ad445b6e89e63b12eb2746ab9587b9ae9cc95745 SHA512 0ad649e9dfa09364a57bb8f93a0bad356d3d8ab6c0aa3adf7766c8aa18907e6d43e0ff9990dbfdf7d1e967e8f299d288ea7d1f7cf564fdb206a333a0b3ff7761
 MISC metadata.xml 442 BLAKE2B 3e7e6564b3aa17ef958ae6aed94b6d28156d743ad2782b0c2c08429adff128a7a7ea549e2f5fcece91cdc0f498d341790d0694b193dae16b60a63966bbb581b8 SHA512 0c32c580abc07b3141fa3b9137eba130654e0701b4c9e49be10a801c5c068d67881a74dc0e5d45dc34e8964364e0516bbc5e1b854ae0d7d8ff12bf1ec1ec2986
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.42.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.42.ebuild
index d745fe878f9f..e62a6b47fe03 100644
--- a/x11-misc/xkeyboard-config/xkeyboard-config-2.42.ebuild
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.42.ebuild
@@ -7,14 +7,14 @@ PYTHON_COMPAT=( python3_{11..12} )
 inherit meson python-any-r1
 
 DESCRIPTION="X keyboard configuration database"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/XKeyboardConfig https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/XKeyboardConfig/ https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config"
 
 if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config.git"
 	inherit git-r3
 else
 	SRC_URI="https://www.x.org/releases/individual/data/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 fi
 
 LICENSE="MIT"
@@ -26,8 +26,8 @@ BDEPEND="
 	dev-lang/perl
 	dev-libs/libxslt
 	sys-devel/gettext
+	${PYTHON_DEPS}
 	test? (
-		${PYTHON_DEPS}
 		x11-apps/xkbcomp
 		x11-libs/libxkbcommon
 		$(python_gen_any_dep '
@@ -47,7 +47,7 @@ python_check_deps() {
 }
 
 pkg_setup() {
-	use test && python-any-r1_pkg_setup
+	python-any-r1_pkg_setup
 }
 
 src_prepare() {
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.41.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.43.ebuild
index fe824fdb32a2..d4e67dee2a23 100644
--- a/x11-misc/xkeyboard-config/xkeyboard-config-2.41.ebuild
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.43.ebuild
@@ -3,18 +3,18 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{11..13} )
 inherit meson python-any-r1
 
 DESCRIPTION="X keyboard configuration database"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/XKeyboardConfig https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/XKeyboardConfig/ https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config"
 
 if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config.git"
 	inherit git-r3
 else
 	SRC_URI="https://www.x.org/releases/individual/data/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 fi
 
 LICENSE="MIT"
@@ -22,13 +22,12 @@ SLOT="0"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-# <dev-python/pycountry-23.12.7 bug #920278
 BDEPEND="
 	dev-lang/perl
 	dev-libs/libxslt
 	sys-devel/gettext
+	${PYTHON_DEPS}
 	test? (
-		${PYTHON_DEPS}
 		x11-apps/xkbcomp
 		x11-libs/libxkbcommon
 		$(python_gen_any_dep '
@@ -48,7 +47,7 @@ python_check_deps() {
 }
 
 pkg_setup() {
-	use test && python-any-r1_pkg_setup
+	python-any-r1_pkg_setup
 }
 
 src_prepare() {
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild
index 9ae1caa1e13b..d4e67dee2a23 100644
--- a/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild
@@ -3,18 +3,18 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{11..12} )
+PYTHON_COMPAT=( python3_{11..13} )
 inherit meson python-any-r1
 
 DESCRIPTION="X keyboard configuration database"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/XKeyboardConfig https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/XKeyboardConfig/ https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config"
 
 if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config.git"
 	inherit git-r3
 else
 	SRC_URI="https://www.x.org/releases/individual/data/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 fi
 
 LICENSE="MIT"
@@ -26,8 +26,8 @@ BDEPEND="
 	dev-lang/perl
 	dev-libs/libxslt
 	sys-devel/gettext
+	${PYTHON_DEPS}
 	test? (
-		${PYTHON_DEPS}
 		x11-apps/xkbcomp
 		x11-libs/libxkbcommon
 		$(python_gen_any_dep '
@@ -47,7 +47,7 @@ python_check_deps() {
 }
 
 pkg_setup() {
-	use test && python-any-r1_pkg_setup
+	python-any-r1_pkg_setup
 }
 
 src_prepare() {
diff --git a/x11-misc/xlockmore/Manifest b/x11-misc/xlockmore/Manifest
index 81d6b2fbbaa8..2460a384e555 100644
--- a/x11-misc/xlockmore/Manifest
+++ b/x11-misc/xlockmore/Manifest
@@ -3,8 +3,6 @@ AUX xlockmore-5.47-CXX.patch 613 BLAKE2B ace9eb868bcdf4fa7fda07d5a0dfc316f992fd1
 AUX xlockmore-5.47-strip.patch 2048 BLAKE2B 0f0f00a38e1d3b5edebf40416698ad3b87323ce9167e7a3e0a44ca2fca853b16e9c1ff59ff74b0bf50b3484e25722a3ee840b312f2f249644614aef55095bfcc SHA512 2de24cbacab2a54e7a41f4604625096030763ad6212ec30b34be2c2fc4035b44f146bfb9d0a34df9c9ce4fa96a0eb1c9c7701b512a917fdf3eb56a5195c8585e
 AUX xlockmore-5.64_alpha0-LDFLAGS.patch 906 BLAKE2B 477e2fa3b3e74ef3bcb93d0f87f82f05f05dbd0b8fe395a2be3540986df74acff7650dcaaae84809f2cef9d5da7ff8360cd40e261328d2f404b58338e7353b13 SHA512 ae42b30b37eeccbf767e6e44a557611ae8bd549778b1b4671355d0cd4c3fbb195c23a6b3dfac7b4aa2563cfba86ddbafa791bc3786b9c8c1b84ae057e625e2b5
 AUX xlockmore-5.71-fix-build-for-clang16.patch 1243 BLAKE2B 23ab604a955f36464c9657a28db7f76a767838b96c4f01c4430485f020379cf83acffd89e0af69d236ce8c1d8c6b69348328ec0b1f9b669a8d2a4ebb4131670f SHA512 db5cf5dcb49cdd972ab7152f6005ad6affaec18fcc7807ccbda7a39464976d751217875ac1359750e411827f74968415e82426d9b4beb0fdf38260940439d926
-DIST xlockmore-5.69.tar.xz 2008396 BLAKE2B 69341456769f34c1ac537f382b4baf287b5da47f4620581cbea5ab92749a26467781ebb6d7f3dfa9bd1eedf92d21fb8e501715af681972f06007408a5a44f4e5 SHA512 03c5938a7442665a2743894c0daa45f3b38569f2b3c3cf395f0d0f5758f6f873e0ef703936d0846d0210babe52357a398a885f919257efe9a2038c8e06be40b9
 DIST xlockmore-5.71.tar.xz 2048496 BLAKE2B 417bd4175a483d350cfa098c8a2488f81df9758874c1b53c36a6c2ae23f3b17c942c089d8ecce432f8db244cd8c4df7e79854ff9f2156153ee838ac98f2778ad SHA512 d09cd28dbca37db5e8fa7a388f4d797369b82a856b509414dd6dca5b586506c466b0fb112947a6a0c71e8c8de7cc125ef19c0fa358edc2a521ad38c255946e58
-EBUILD xlockmore-5.69.ebuild 2493 BLAKE2B c21b74efa0d99d95bc910b0fb14ed289221aa4c2671497fc75938e0bd966aad7a2685402d92fc4301aeadd34f71bbeba5e7e559a3462c29ab589f0932f9d946f SHA512 3587c994dbcf1838a745d5e3c44e79b5fe17a71d75b28f89409c852d22feb58f7f93cc13d799681aac9bddf5d2e1d4292c2a8f4cd5b265fe7799650b327f364c
 EBUILD xlockmore-5.71.ebuild 2571 BLAKE2B 30708ee7fa50ebf772fc5c6908e3d4b33df6fe040be89868cb8b5b97ab6f631809f634112d29f8993cf644560a37b7b3e00648643d80e535c0dec82955cf3949 SHA512 1a44c7a34294e4fd2e3c7ea5c6781a3c0aa9d35d7474f0f43a9ac0db260aacc21e832f384ff220f7ec726784fc58947ee6ed4b58550e6b1f3fe2fd262d3813b8
 MISC metadata.xml 326 BLAKE2B 933c62f987014fd25320e5b9d231747e4fe9ddcf24109f34b1d5df2a186695305b4d3778d4f0b1132e73e79dc483f62bce3b08338ef69f4829998339d29d10fc SHA512 cea9a5ef5e3bbc00c784c65877a67dc10cfb2e97d6280f87defba6f3bea2afec972f1e761aac9b55acaa7e8cc8930e81ab9182d2b2b07fec01ad0ad1525c2c41
diff --git a/x11-misc/xlockmore/xlockmore-5.69.ebuild b/x11-misc/xlockmore/xlockmore-5.69.ebuild
deleted file mode 100644
index 1baf305fb5fc..000000000000
--- a/x11-misc/xlockmore/xlockmore-5.69.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools flag-o-matic pam
-
-DESCRIPTION="Just another screensaver application for X"
-HOMEPAGE="https://www.sillycycle.com/xlockmore.html"
-SRC_URI="
-	https://www.sillycycle.com/xlock/${P/_alpha/ALPHA}.tar.xz
-	https://www.sillycycle.com/xlock/recent-releases/${P/_alpha/ALPHA}.tar.xz
-"
-S="${WORKDIR}/${P/_alpha/ALPHA}"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ppc ppc64 ~riscv sparc x86"
-IUSE="crypt debug gtk imagemagick motif nas opengl pam truetype xinerama xlockrc vtlock"
-
-REQUIRED_USE="
-	|| ( crypt pam )
-	pam? ( !xlockrc )
-	xlockrc? ( !pam )
-"
-
-BDEPEND="virtual/pkgconfig"
-RDEPEND="
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXmu
-	x11-libs/libXpm
-	x11-libs/libXt
-	gtk? ( x11-libs/gtk+:2 )
-	imagemagick? ( media-gfx/imagemagick:= )
-	motif? ( >=x11-libs/motif-2.3:0 )
-	nas? ( media-libs/nas )
-	opengl? (
-		virtual/opengl
-		virtual/glu
-		truetype? ( >=media-libs/ftgl-2.1.3_rc5 )
-	)
-	pam? ( sys-libs/pam )
-	truetype? ( media-libs/freetype:2 )
-	xinerama? ( x11-libs/libXinerama )
-"
-DEPEND="
-	${RDEPEND}
-	x11-base/xorg-proto
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.46-freetype261.patch
-	"${FILESDIR}"/${PN}-5.47-CXX.patch
-	"${FILESDIR}"/${PN}-5.47-strip.patch
-	#"${FILESDIR}"/${PN}-5.64_alpha0-LDFLAGS.patch
-)
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e '/XLOCKLIBPATHS="-L/d' \
-		-e '/XMLOCKLIBPATHS="-L/d' \
-		-e 's|/lib|'"${EPREFIX}/$(get_libdir)"'|g' \
-		configure.ac || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=()
-
-	if use opengl && use truetype; then
-		append-cppflags -DFTGL213
-
-		myconf=( --with-ftgl )
-	else
-		myconf=( --without-ftgl )
-	fi
-
-	myconf+=(
-		$(use_enable pam)
-		$(use_enable xlockrc)
-		$(use_enable vtlock)
-		$(use_with crypt)
-		$(use_with debug editres)
-		$(use_with gtk gtk2)
-		$(use_with imagemagick magick)
-		$(use_with motif)
-		$(use_with nas)
-		$(use_with opengl mesa)
-		$(use_with opengl)
-		$(use_with truetype freetype)
-		$(use_with truetype ttf)
-		$(use_with xinerama)
-		--disable-mb
-		--enable-appdefaultdir=/usr/share/X11/app-defaults
-		--enable-syslog
-		--enable-vtlock
-		--without-esound
-		--without-gtk
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	local DOCS=( README docs/{3d.howto,cell_automata,HACKERS.GUIDE,Purify,Revisions,TODO} )
-	default
-
-	if use pam; then
-		pamd_mimic_system xlock auth
-		fperms 755 /usr/bin/xlock
-	else
-		fperms 4755 /usr/bin/xlock
-	fi
-
-	docinto html
-	dodoc docs/xlock.html
-}
diff --git a/x11-misc/xmobar/Manifest b/x11-misc/xmobar/Manifest
index 996a3a8e7354..1c2b5fdea081 100644
--- a/x11-misc/xmobar/Manifest
+++ b/x11-misc/xmobar/Manifest
@@ -1,5 +1,5 @@
 DIST xmobar-0.44.1.tar.gz 156756 BLAKE2B bee81627744146989b402ae04d36edb5e4a69686b546457afebad81cda96ece4ce0ace8a2855bd5136610be3fc396c2f62121ea062fffb1ad837145cf3238fdb SHA512 e04f3f9f40ffa4095df2b523916686d93d28b4cbb880f7732cf63d6f1915e721043764b9d723ed8b3c4938c3df749d0e5a9ddb9a9e64a2a015f8f0d6b3f46c97
 DIST xmobar-0.46.tar.gz 168197 BLAKE2B a1b0e94794232641574b0e6c1c55ab8c203fec800702896ab516f2df7d50ffec709385958ffd4098f79ac00a9c88c72c04088bca5f4523501cdb12cf39da8bb5 SHA512 37ebef56c3046b45ec83025ab8233827f50dcc3aa48691e06ac00c59b8bedeafd5860c94e36d54d3f499217a27a12641b0e98f6f0f248b9d56a22d1b103c50c8
-EBUILD xmobar-0.44.1.ebuild 3836 BLAKE2B a98a59e1fcc22cc6738e68a8d26fee6b9139a87ee6247092b0fd3895c1207feb4d17a4237768b3f014b78eb526db3596c29b81332d8d391c61047106dce5f0f3 SHA512 11d9c30a251b28505cec65d2fd5fa0347c1bb65d78fb5160c8845dba5e56eca10747d262dba90570eed9f6034ffd9782a767cf4463383e17319ffbdaa86f7eda
+EBUILD xmobar-0.44.1.ebuild 3837 BLAKE2B a2821b4dabc936bc39b4591d5a954e44807127956f47cce472b33620a23f3a5299e324064adb5718a34287bcd19fb2dc57c010abbaf0d9561fb30fb40cd536f0 SHA512 e43c1eb17522d6da677118c0e139f5dd689dec6293b4b7e2686044b2624dd8a22845b830cf8e3b82353deb23597e36ab93e35725ec5759325aed1c84600a2cdf
 EBUILD xmobar-0.46.ebuild 3071 BLAKE2B 55b35dcb42a5c69c3114e51acbd4eb70aeec674b3d57e020121902feb13f64d0497505b65e2b6281d60917c4e6a340290414129af43cd6639f7c302a7ecbc628 SHA512 0297464568ff928fe1979067b8844508854596d1b16e7fcc9927fad70076b35d223bd1c0b2f588d153bf1384eb91663f18b4b97ec7ab2ce1c96324081cbf9947
 MISC metadata.xml 1279 BLAKE2B 75a1903356fd93a72e1b914bbeb28ec2214e116e1b635d1d5c01112b26321501f1bdfdabb4e09f4a11f5ffeffdd4584b5025a5236642cef7adb7a2e4c66f93b7 SHA512 c2c4e873fc289d0304659d81d59e983a906a287314c662c7c892f35d2ad77d23e133abd13b03c09646b2f186dec401699d539c1e798d87d5b46c2e9e3bb8d400
diff --git a/x11-misc/xmobar/xmobar-0.44.1.ebuild b/x11-misc/xmobar/xmobar-0.44.1.ebuild
index 365e5f2504d5..d4b3ed57f85d 100644
--- a/x11-misc/xmobar/xmobar-0.44.1.ebuild
+++ b/x11-misc/xmobar/xmobar-0.44.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="alsa dbus mpd mpris +rtsopts timezone uvmeter +weather wifi xft xpm"
 
 RDEPEND=">=dev-haskell/aeson-1.4.7.1:=[profile?]
diff --git a/x11-misc/xnots/Manifest b/x11-misc/xnots/Manifest
index 69a82f7c481a..d5ea164af98b 100644
--- a/x11-misc/xnots/Manifest
+++ b/x11-misc/xnots/Manifest
@@ -1,4 +1,4 @@
 AUX xnots-0.2.1-gcc6.patch 1134 BLAKE2B f169cdd6236c4f068aa2661c3d937d5d97035572a4e09322531f3ab3eefd2b2dc8f4f7b529973c342dad8bb80817bb7c2888c038cf1f2c4faf8f4bd926d2ff6c SHA512 236afd11f535ae142f380926ce0c8c7a6ff299ae1718b3a946aedb7daf63da949cfd282d8f4c87975ac4ac77ef7493296e95e51a49e0adc796d8a39ed5dce7a6
 DIST xnots-0.2.1.tar.gz 41442 BLAKE2B 26579cfb5508ed1e956b027c769c9c0924870867428cdf5b569e571fce57777267f0523a9ceebabe7f2c705c7b6a34549a122d162cb547e44d8489708fb9e83c SHA512 bb1a334150aac932839c8d9e04d8c9f1c419f5221a218fbbe3523060fbb8d62e616f89ec06a8237fa290de37db103e98a560953ef820ef016f35dd5c844eb65c
-EBUILD xnots-0.2.1-r2.ebuild 1034 BLAKE2B 414aaaf7ab367b5141dda70d4c330639b267bdf3d7365521da9b680fdb5d945f4926d0c035e8520dc21a9e7ecb1be3a6488e01bbc5ac0e893eecf76341f325a0 SHA512 dd9683eebad634ed75f8bb01f77ee54e621444d0e2c125f39668fe3889dcf7634efa10a0af3a72a0253430eb65c6073141c580f88f7e358b5a5d02d2c20ac006
+EBUILD xnots-0.2.1-r2.ebuild 1033 BLAKE2B d36549bc1827bccaa2f89377795e805152f28e1b1a324a20853138c7d2ba1926216b234dd126df4da93905b61919616847c25d56450264e6bdd0836302eb9363 SHA512 c8bdcd7d003b788ba06e022a19305af95aaefec57c8d2de902af4d7f5d52862eeef07932bcfc644933bbbdfe8110cb8f41bbcc7da93f89f49dc3ed2f15a7f7bd
 MISC metadata.xml 302 BLAKE2B 07da1ff8e4e7a0a89bb8fbf5a81064236c722ac09b56ca856defa15fa598d09d9b4e1df4c6966ef89270c8a8c41438c007481ea701be162b35f911f9896ac940 SHA512 928cbabb45f8e6b9ba0d3da37a43d96b03a7f671502f9ea25fc912ff66cff042bd3197e0feac39bf34ceebbf39208f7e269f575a40081e00a13adf42b7227567
diff --git a/x11-misc/xnots/xnots-0.2.1-r2.ebuild b/x11-misc/xnots/xnots-0.2.1-r2.ebuild
index 295f6a4a777b..17a80c98c19b 100644
--- a/x11-misc/xnots/xnots-0.2.1-r2.ebuild
+++ b/x11-misc/xnots/xnots-0.2.1-r2.ebuild
@@ -5,8 +5,8 @@ EAPI=8
 
 inherit flag-o-matic toolchain-funcs
 
-DESCRIPTION="A desktop sticky note program for the unix geek"
-HOMEPAGE="http://xnots.sourceforge.net https://github.com/thePalindrome/xnots"
+DESCRIPTION="Desktop sticky note program for the unix geek"
+HOMEPAGE="https://xnots.sourceforge.net https://github.com/thePalindrome/xnots"
 SRC_URI="https://downloads.sourceforge.net/xnots/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/x11-misc/xorg-cf-files/Manifest b/x11-misc/xorg-cf-files/Manifest
index ee7f8b18cec2..e0d78329a16e 100644
--- a/x11-misc/xorg-cf-files/Manifest
+++ b/x11-misc/xorg-cf-files/Manifest
@@ -1,3 +1,3 @@
 DIST xorg-cf-files-1.0.8.tar.xz 290280 BLAKE2B b822839f2effa091d7e60aa82e0356dc6770116566d9c78a6c0915b8f9e89eb4a3bf78a3bd5380607b3b3e4c1670fb1c6ef0b3ac8ca342cfc1ef141a925c927d SHA512 cc633af889cd82346c3098df9185245c21aa9db7484343f8be9719f6e0b1fc0a9b09afb13b9b864668aa51944f2da797bbe896c807f629e89fc91506e6e63fb9
-EBUILD xorg-cf-files-1.0.8.ebuild 1770 BLAKE2B 17937268ec00b2cdf16b4a06e4daae13f604797198bfbd05bd8dca78c85aac03c0eb7a8504bbebe941805b74a6f67af905f9a132883cce2d4f4fdae5ecdcb799 SHA512 2b8e6b144f6f0f75ce233d8468f8933cba2d98e0349f32389d5892db137fadca047f257905bf61dcc89b6f6a34a4bf5c7593ea05aa26fa4c8dced100acf47227
+EBUILD xorg-cf-files-1.0.8.ebuild 1764 BLAKE2B 1acd01c14122ad98491cce10628daebc82984beccd885199e18cf70445cf8a6baa4153e02627da62f5def8b7bf62532694432cca1ee3a6f64c3cb7b7f4cc1b8a SHA512 b288054c21d89307355a82219c59166ff5a884c674f78d1c7324376f16388c9c9b1f97e02908fe84a776e729561f17c31e219ad657f9f39471e89d1b6a3be564
 MISC metadata.xml 334 BLAKE2B bfeac5f26d8a7b4b290924b5fcc1e4e2c7663978d74891fdfed46698b5940a42a12b7aaa03bb66d990313754aec756c67185005916bd44a802689ebc4b9452e5 SHA512 e2d7b04dda68d9435374c1726a10cf23ce02a400c71156ac84d544b908c69d40a232b0fef925f205292b74b56a84f0fd2d64b4a6e76e718546dd2a169838633a
diff --git a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.8.ebuild b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.8.ebuild
index 0e7054bcd5f2..1e872cf9397c 100644
--- a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.8.ebuild
+++ b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.8.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.x.org/releases/individual/util/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 
 BDEPEND="virtual/pkgconfig"
 
diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index ef82c2391342..b119dc9a9cf8 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -16,8 +16,8 @@ DIST xscreensaver-6.07-xscreensaver.service-start-with-no-splash.patch 834 BLAKE
 DIST xscreensaver-6.07.tar.gz 26365057 BLAKE2B b0fc24e34713dd5591cff2ff871ec05deae089d7d76fe1239dd59ec1addf97eb764a583d01685953ae6409a7193ca97bc201a20dcf86d5244cf898e4eb9b1221 SHA512 abbf75faa49bb23d35985a7bf269891d168c87fe8939ad5acf6857398dfb056815d79dcf39bba9a33808e2717a47635fa84282c03ed9efeeeb449763253179a5
 DIST xscreensaver-6.08.tar.gz 19990058 BLAKE2B 1dd13a656471335663738e677dd1b367ab1114ba91e65868ad2a1d8ebe95b16ff0311c2b69a2a5409ebdea68451d5e6cb507a66a5fb641921a469b8e69ec6b2d SHA512 a333d4921ed3a8219f3b672dd68543aea31fcd64ea6766143f1c7f6e5ed3bc7122355635d5afba1632457ad71a11cabdc7b2756431e4f1dc7e0426ae0896e6db
 DIST xscreensaver-6.09.tar.gz 22026182 BLAKE2B 34e3bf5b3affbfc6ef0aabaf9889c4b76ce27b09974d6c84a9b342b2267a3268fa1558a9bf0e0e487fce84ef218c3152fca4216268e15e40f82fef91021160da SHA512 6002c1879e3f9c509b4f6b645146978da82def0ed7b9e9c421b11dadf0116380c63403c30167fa70a289321928abe39795a96f1a796afb920bd0e3ac416d3653
-EBUILD xscreensaver-6.07-r2.ebuild 7835 BLAKE2B af291f0dc7de2ecd49b4f3cb6fdbcaeb052d6dad2a04272e683743d5531557cc5851d6a69e963e4c5d4176121822a179fae68a8dd9fb640872ed2ff8e0926cbd SHA512 d973d66276a95e78244738e35ac83100fd8fb276955f54cc2cb2189e9481afba9d4395eca11c1157e9819873859b41aa3c2d1395bbb8763d4e3b60265b594664
-EBUILD xscreensaver-6.08-r1.ebuild 7771 BLAKE2B a912dc05987f3cf5709baaf7328c6d0d5ab51859d6ec784f2caaabbcc035e2575eba3f627bae9b6e026e6055953db79f90aabfbe73e8e59a64e5defb49295da6 SHA512 a4d179cac63f4a7353dd833f5290e2a9d12b9689ad4dca68228ff33312fc953628b8b68f3b3d4c4963431b4e78e6e6471043eab63e23e76fdb8de38eb527e983
-EBUILD xscreensaver-6.08.ebuild 7835 BLAKE2B af291f0dc7de2ecd49b4f3cb6fdbcaeb052d6dad2a04272e683743d5531557cc5851d6a69e963e4c5d4176121822a179fae68a8dd9fb640872ed2ff8e0926cbd SHA512 d973d66276a95e78244738e35ac83100fd8fb276955f54cc2cb2189e9481afba9d4395eca11c1157e9819873859b41aa3c2d1395bbb8763d4e3b60265b594664
-EBUILD xscreensaver-6.09.ebuild 7773 BLAKE2B 8bdd507022bfb9361e0a16b64d54a8303a06180e9cb3fb893cf40372e16296d4a8ec4a87d207c5300b5d7a2f7448e9de6f76d20714e0580e5d39254bcb3055ae SHA512 6df5bcadccce8d0a2c52050768c522fec701e5e7439ed93f7b4d08d73f9511564d847978b751c37ad3fce77bf11df42998ac81d7c16d6186023f70d4ce3f496b
+EBUILD xscreensaver-6.07-r2.ebuild 7829 BLAKE2B dffe6479ec2824fd91916abf175d5976c1e4ac787fe739026a64a40a555755e69e804b8ebb9df71f5a99a5471e8e872f31e419ebe67bde2b6f1c90a19b214eea SHA512 51a4445ccc64292aa4ce46b34e4fe3c0d0c611c7d5d98b40dc6c1c968501ce2c0037120d130ea77af77374a3f8d2ad4453c462590a2c2e7d8b086181a4178f8e
+EBUILD xscreensaver-6.08-r1.ebuild 7765 BLAKE2B 42e776afb650cb29d4451da034f610a30dbe679eecb6fb48e0a505af483d7d9e3d4d469a52f6c177915c280d29141e8d0a31c54185d1ce8bcb0eaab27e833831 SHA512 1d272d88cae10939191f17c53f246b325dc349a262211e448bbc060c119b95696e87e9fb1f29d435342787b4c7dacce048eb51105f910605a4b642fd4c171fca
+EBUILD xscreensaver-6.08.ebuild 7829 BLAKE2B dffe6479ec2824fd91916abf175d5976c1e4ac787fe739026a64a40a555755e69e804b8ebb9df71f5a99a5471e8e872f31e419ebe67bde2b6f1c90a19b214eea SHA512 51a4445ccc64292aa4ce46b34e4fe3c0d0c611c7d5d98b40dc6c1c968501ce2c0037120d130ea77af77374a3f8d2ad4453c462590a2c2e7d8b086181a4178f8e
+EBUILD xscreensaver-6.09.ebuild 7760 BLAKE2B 87666d62b6ad76bc1b87318f6d080de105ca0d253cf17decc4c70c779d83694821744cf8e0ba2ced45ccc2296e136740a5e583c8693396253ef9e7fbf7099334 SHA512 1aebfebd707ee026ffd38121cd57ab73cd6498b749a77cd91421b47af0774dc90591e9c017b3fdc82804740efe84777f1c6b2f83698801f9c52169e5415c0291
 MISC metadata.xml 1262 BLAKE2B 3800cee01a975dc0d79d1576fbe11910ac6233eda87b285aaa612c030786ea06697383e82d88707dbcb4d26b54a7df018ffb905351dd3d9bd81eb991abbc1774 SHA512 4e7c2ee2c57e76f3fbb51329f41151f7f8a2fb8dfd25d06161a0a85a6a3bfad253233935de40eff29b1b78a52202443dc1e5c962b09f922712f8ee76f6904abc
diff --git a/x11-misc/xscreensaver/xscreensaver-6.07-r2.ebuild b/x11-misc/xscreensaver/xscreensaver-6.07-r2.ebuild
index 5c68ad4c01cd..fa0e6da22cd4 100644
--- a/x11-misc/xscreensaver/xscreensaver-6.07-r2.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-6.07-r2.ebuild
@@ -27,7 +27,7 @@ SRC_URI="
 #   SpecialElite.ttf -- Apache-2.0
 LICENSE="BSD fonts? ( MIT Apache-2.0 ) systemd? ( ISC )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 IUSE="elogind fonts gdm gles glx jpeg +locking logind-idle-hint new-login offensive pam +perl selinux suid systemd xinerama"
 REQUIRED_USE="
 	gles? ( !glx )
diff --git a/x11-misc/xscreensaver/xscreensaver-6.08-r1.ebuild b/x11-misc/xscreensaver/xscreensaver-6.08-r1.ebuild
index 27af9731dff7..45f5a50cc9a4 100644
--- a/x11-misc/xscreensaver/xscreensaver-6.08-r1.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-6.08-r1.ebuild
@@ -27,7 +27,7 @@ SRC_URI="
 #   SpecialElite.ttf -- Apache-2.0
 LICENSE="BSD fonts? ( MIT Apache-2.0 ) systemd? ( ISC )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="elogind fonts gdm gles glx jpeg +locking logind-idle-hint new-login offensive pam +perl selinux suid systemd xinerama"
 REQUIRED_USE="
 	gles? ( !glx )
diff --git a/x11-misc/xscreensaver/xscreensaver-6.08.ebuild b/x11-misc/xscreensaver/xscreensaver-6.08.ebuild
index 5c68ad4c01cd..fa0e6da22cd4 100644
--- a/x11-misc/xscreensaver/xscreensaver-6.08.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-6.08.ebuild
@@ -27,7 +27,7 @@ SRC_URI="
 #   SpecialElite.ttf -- Apache-2.0
 LICENSE="BSD fonts? ( MIT Apache-2.0 ) systemd? ( ISC )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 IUSE="elogind fonts gdm gles glx jpeg +locking logind-idle-hint new-login offensive pam +perl selinux suid systemd xinerama"
 REQUIRED_USE="
 	gles? ( !glx )
diff --git a/x11-misc/xscreensaver/xscreensaver-6.09.ebuild b/x11-misc/xscreensaver/xscreensaver-6.09.ebuild
index c2860219b766..98eed42c0d1a 100644
--- a/x11-misc/xscreensaver/xscreensaver-6.09.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-6.09.ebuild
@@ -27,7 +27,7 @@ SRC_URI="
 #   SpecialElite.ttf -- Apache-2.0
 LICENSE="BSD fonts? ( MIT Apache-2.0 ) systemd? ( ISC )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 IUSE="elogind fonts gdm gles glx jpeg +locking logind-idle-hint new-login offensive pam +perl selinux suid systemd xinerama"
 REQUIRED_USE="
 	gles? ( !glx )
diff --git a/x11-misc/xsel/Manifest b/x11-misc/xsel/Manifest
index 1770b95364a7..f001ad5a09cd 100644
--- a/x11-misc/xsel/Manifest
+++ b/x11-misc/xsel/Manifest
@@ -1,6 +1,6 @@
 AUX xsel-1.2.0-Werror.patch 398 BLAKE2B e322155e11356a890096b861513acd8c6523c85922076f8310a9fa9d7212206d677fbfaca49d455f8fa929228280a5028f77045cbbb7b18989529bd887e8853c SHA512 fb68421d5ecd58f33bde15ea770ffdf22a3f356f4b05ed9588e572fc5d9fccff267e1019b4a984e5a62497cb6b0d4927038a16777da378d63eef8135dc5c9b06
 DIST xsel-1.2.0.tar.gz 169155 BLAKE2B 59b5c2f03058be1a584f12bd5c129a008ae581545b7aed3a54240f6a0b9c29e857c7425cbf6fa6421ccd577a1907a9a6c1d7213e4ccc43309a5e8933e707847d SHA512 e28623e6cc180f2e2210c20697d21d336633f0a5272ca9b62150a1c535e8de89731acc07230a9977e391e37d3943a9d687f1f967765a15bca5092a6c6d8c4d8f
 DIST xsel-1.2.1.tar.gz 51621 BLAKE2B c9c066e4032d71c8c9e717c1251ce929590a7e3be9a156f54eb2625b3877b683e1a3f53f88c405b3f9986160ec38a3a737fe919f703ab307d1e74c97ef81c9f8 SHA512 549874679a2d2979fca851ce762870165f5cbe60ba3f15e0690080506a78ea0b2c52833bbf7868eb3988fc377a103c31c62367fb9c5d1eb606e0660985f82ca4
-EBUILD xsel-1.2.0-r2.ebuild 692 BLAKE2B b8fffcc17829eb4f5e25d5efacc6502fd0329ad03fdd04859b29b2fc99d3984bbde14e11730d59c0429fe61f1173488e7802ec5ac9d17671055b0ab18bb4659c SHA512 8c1f618220d812199eb21bc8600710a7607dfc5455c0e51e266104b672d64596bbe8158d76d04e3eaf250ef7a481e83665d5367c5cc6d7c8329590fdd52e6a40
-EBUILD xsel-1.2.1.ebuild 620 BLAKE2B b36e01dfb3d738bf90bb27f6be024d75cc96fc440605243c4bea6cc916d3e102712b5af26d55ecf628594925756ea1bafdb397d5f25d215a37afe4ad9310c805 SHA512 6113292ab3c6bf2b1a8a042f6a28a647f73a62ed19cc36a140376fe0675b12e8ceb9b7b8ee2f053b1b7c6a3eec18d6b3a11aad8b44ed9b6b915fe5f093aca195
+EBUILD xsel-1.2.0-r2.ebuild 686 BLAKE2B 0f205eec98cdb2d061f5a7e09ee1863866b0eee4e1a552c3ed3aff4a811567ce48e09a16bce50a959a60887428136ac95307c067bbd0881b2fcac66859751e04 SHA512 0aad15cff7855c739604b903dad1efdfd054b73b8045603a9d64b9ee9e05818c24b218cc6f68b3e9ed92124ac439254e7937336ecc8179e28114ee5d89513d50
+EBUILD xsel-1.2.1.ebuild 614 BLAKE2B d1ee91ce63ccdc68bc8fb939f6773a7434012fc974945a490a913557241cd66fe99959e5ea6aa587c14a2b71b051a499ceda07f2aa751445db8b7cd7c7ec7c22 SHA512 8e023476204ccfbde157cc5e01705d9459a06e7694dfd1573908f5e03cdce2a37524f0a79a3374a7b55b4d23ea6c3e863079c3af21284ed36145bfb881c4de23
 MISC metadata.xml 532 BLAKE2B 0c0aa0233f75b40faae2c19f834ca0abf179e34fbfae771f01584d950885fa7da6245311554fd2108cf7b1f6d092ae444ae314795b8c8ff39665c68ca91b6256 SHA512 d2ac7f9402680dd719e6c92455cafe09d24c98b2e7daa177bccdb594421f50dedfe5c09010d4466aa64062361d166d1dd5e1337784bf0c3fca92c28b68241731
diff --git a/x11-misc/xsel/xsel-1.2.0-r2.ebuild b/x11-misc/xsel/xsel-1.2.0-r2.ebuild
index 3f2c213b8b7e..08534e5dd72c 100644
--- a/x11-misc/xsel/xsel-1.2.0-r2.ebuild
+++ b/x11-misc/xsel/xsel-1.2.0-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.vergenet.net/~conrad/software/${PN}/download/${P}.tar.gz"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	x11-libs/libX11
diff --git a/x11-misc/xsel/xsel-1.2.1.ebuild b/x11-misc/xsel/xsel-1.2.1.ebuild
index e7570554b3ad..41d865b62466 100644
--- a/x11-misc/xsel/xsel-1.2.1.ebuild
+++ b/x11-misc/xsel/xsel-1.2.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/kfish/xsel/archive/refs/tags/${PV}.tar.gz -> ${P}.ta
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 
 DEPEND="x11-libs/libX11"
 RDEPEND="${DEPEND}"
diff --git a/x11-misc/xsetleds/Manifest b/x11-misc/xsetleds/Manifest
index 54dec80adf10..6a96b3685ee0 100644
--- a/x11-misc/xsetleds/Manifest
+++ b/x11-misc/xsetleds/Manifest
@@ -2,5 +2,5 @@ AUX xsetleds-0.1.3-assignment.patch 208 BLAKE2B a1f5d7814e17fac4ca1a3f0e02e17be0
 AUX xsetleds-0.1.3-configure-implicit-function-decl.patch 2153 BLAKE2B 4a59852792750c589422bca75a2061b7962fd0500a0af13c07a65958bddbaddc7cb1f1b2081a933881b159556ed15341b5bc8fdb7fc6cba8f75ad18b5fc0eb0d SHA512 4caef78a148a9a567a2a3a487830521e8ce5b41a8e79d58012531b345d90fb601465a7c2eaa8229f0ede4fe56d98bf9b20e24eb258ef983c57cd96aac8ba74e5
 AUX xsetleds-0.1.3-isalpha.patch 236 BLAKE2B 0a4599f5f4f0a56521967c30ceee7d79e65d7321b2f99065e42b77e94baf9cfd53611d192326a3e574c57f7de1df3a459ddd0905bb37c8013de21c65068d6ad6 SHA512 5191fc8ed447d921dfd0a47514de03e03dc744f17b22a1ac3973b1c91104c015c7881cc156c4e2e073f3ba18e17187b34b5db80359489ffc372a07c1e6bcbb10
 DIST xsetleds-0.1.3.tar.gz 221399 BLAKE2B 11311f972abc0f0c83ec47dbfe2743d4220daa4fe445c4c0f4a5d7c827d690549611bd373577882d1ac75b853e468ce36d3a6a447873a523a530676528bbd011 SHA512 7fe6baa77b4b2c8f57dfc331776bb457520facdb2f54a5c101764c590d7c5556cd00477e56d36e64cb7264a8de28698422b99ec4852798069189fbe6c1c19f72
-EBUILD xsetleds-0.1.3-r3.ebuild 761 BLAKE2B fa54de141ea7d47f2a1285ccabe76a1709a96fa6a2ce49b700f65993ead292be14fc4b3306cf551977b8934e347d83f8a183883f085d37c34ac1510b47044aad SHA512 dc3a7f22fcb5f09c17e18ff9a1d51a2d3173e44a62a68afeedcd0ad0bccb8be1005596b7fdb55327b99bac414fe1cef4e114a43d3c5d0c32e5e398e1aa745b50
+EBUILD xsetleds-0.1.3-r3.ebuild 755 BLAKE2B 369bf876f8936ed309bc266105eed910467c01e2660fa094069f40f06bc5f05b95bf2f0a2e92e6da5ba69f10aba1610b3fa814a94a341acecf8dd88d080744d7 SHA512 17ce54caaec1deb7109cea015977fecad22ee47ad280d7cb6db25a8ecdf17661fe71d2796531a454ab8e7288a18350fa3b09eff2183e9f2fee4a89746365d3b0
 MISC metadata.xml 277 BLAKE2B ebaa8353413cfc5519fce99f8627c71cf765fc6d42b42651e232274de315487c156d45dcb23a401dffb8f112600b0dadd56f93d2283ff86b4293dc5490ad4059 SHA512 c8ef9069153b124118a6be64375c6954ccc6f518a13805e4ff1c33c9cec136170132a580c4a9781930b709c93678c94d6448291625de34d18fea41bfd17f685d
diff --git a/x11-misc/xsetleds/xsetleds-0.1.3-r3.ebuild b/x11-misc/xsetleds/xsetleds-0.1.3-r3.ebuild
index 5a8da903b1c3..0dc358c6adb1 100644
--- a/x11-misc/xsetleds/xsetleds-0.1.3-r3.ebuild
+++ b/x11-misc/xsetleds/xsetleds-0.1.3-r3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ppc sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~mips ppc sparc x86"
 
 RDEPEND="
 	x11-libs/libX11
diff --git a/x11-misc/xtermcontrol/Manifest b/x11-misc/xtermcontrol/Manifest
index 24b5a689ccb7..6ea8994ba2ca 100644
--- a/x11-misc/xtermcontrol/Manifest
+++ b/x11-misc/xtermcontrol/Manifest
@@ -1,3 +1,3 @@
 DIST xtermcontrol-3.8.tar.gz 181399 BLAKE2B b65acd8ecdf6e0293fcd856cd05f7a3c2eaf868f6f7e0ea34829fbfece4e2a17c2085042e6eeb50a20504200db754badde8ffba0305358547d5f65cf18df564c SHA512 9dacddc57c31705d00f52753f906cd83ae4b7ae34ff2e712869becc452535dbce9fb3e0e9aaf689b55edd34889d9e37553e3702c26ccbd136f544016fcfedbf1
-EBUILD xtermcontrol-3.8.ebuild 364 BLAKE2B 2e8e28e4f851bb874b77844cd922755ed5937da5e0c52c8ac84da10e751469f2e3e18804596a57dd1818afdf407fe51de888e34c25ce20fdc78094ab4d779378 SHA512 b19b36dace868b3baa7f80cd5d9638581095c4746dc357ae5523c8cf884778974d402a840bd5f6387c39d7fb0022440d68c4d05191e2a88548931414032b6a7b
+EBUILD xtermcontrol-3.8.ebuild 358 BLAKE2B f7312671864c8dfbb11522904711e2b1f20a3fb3e48f05717210b6f695db5d06c5e1b94f4c571d98526143626a211678566439db048a678a14c34b0fdb1f9bbf SHA512 d31506ab08a037d86b5acc59aae4d89f2cbccec12ac6d7b8b41af84cf749cdb3c760cf23ae2543f83b7212c07dfed9ea762b151674ccecbe9c0bd0628c287372
 MISC metadata.xml 810 BLAKE2B 2ac6289d6ab1a3ce910878709f710b218b92a6e8def0bf71008a4efd754c0bb947c84bc1a749229e69fdbf4ec59934982659d496a9334b687f98f3da9586254e SHA512 77969d1aedfd453c08e18dbf1797f9868bb4e1570a71aa34197fa1d986ed96bd841a343e20955e771935779d01e6c2f19c95d8e5b43afba9c6869275eb66348c
diff --git a/x11-misc/xtermcontrol/xtermcontrol-3.8.ebuild b/x11-misc/xtermcontrol/xtermcontrol-3.8.ebuild
index 5a84b2b84a63..115c60361837 100644
--- a/x11-misc/xtermcontrol/xtermcontrol-3.8.ebuild
+++ b/x11-misc/xtermcontrol/xtermcontrol-3.8.ebuild
@@ -9,4 +9,4 @@ SRC_URI="https://www.thrysoee.dk/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ppc sparc x86"
+KEYWORDS="~alpha amd64 ppc sparc x86"
diff --git a/x11-misc/xvfb-run/Manifest b/x11-misc/xvfb-run/Manifest
index d4a7d489bf7b..19d72aeb3bdf 100644
--- a/x11-misc/xvfb-run/Manifest
+++ b/x11-misc/xvfb-run/Manifest
@@ -1,9 +1,11 @@
 DIST xorg-server_21.1.10-1.diff.gz 168382 BLAKE2B ef41295c9f45836b99aa09f2bea632ff909796538d5f6adb42db78b7b57a4ff41ad997657923820d4c703f21ab43ad2f83998391d8090b30717c600ddf7b8162 SHA512 417b5dcc167b5b066802e70754817aa0c8b22294c779084fca0ca85d0ca926b5b59b633adb2794f31715ff6c36677ea61cb4c7ebd4f32f97471d9257f327c8fb
 DIST xorg-server_21.1.11-2.diff.gz 169271 BLAKE2B 79318e2395e60c2deebaa456e5b43ae3a0f095ddd3e9ff179d9861d48166823e4ed4356ae60fafc8e7703ab10bade80d8fed773f636e0d2355f241d8e31ff809 SHA512 42a782544e674e0ae0b95093d65c0b66224ab12cdf08e47eff1f605d1f8bf149dcdc6267f29748823b529a045b6f994c6f6614ff38811fe6c25d6c7c6640cb40
 DIST xorg-server_21.1.12-1.diff.gz 169446 BLAKE2B 3e56e2dd9c660c5107c2d2ea0e5a19a9d441ea556097fdb1af954c74f2c15a184d3f70c4b3482528cfbe323b3e37751dc3b8d05055a991f9e71d388d114e639c SHA512 05bf602379d220a4ece9308d64bf1c7f2be8ba597fe8c179cea62bfbfb2c36516e4d6ef2ea4374861c9550b55bb74dfe93dcc04fdb8eea8fbd6a4831b8db3edf
+DIST xorg-server_21.1.13-2.diff.gz 178467 BLAKE2B 8368680c01bd1c3e13936d4fa12ee955fe1bf568dfff9872c01659f39565ac6fb99b3d61db34529c2afb2bb42cc9fe974ea5fa281ac7437159b9339b5c918a2a SHA512 76fc7a879a00719ce1a59ba1e3e1d10bf438b04100776c00e33372be13323ab523a245d702924e3ea2c0624e71cffba1222980a8edbeb774cdfff2bcc6cbf47b
 DIST xorg-server_21.1.7-1.diff.gz 168149 BLAKE2B 68011ab5d77efec6c42921c906ff1be4f7b3b2455025d5fb8f33270bddf02f1bd2c3fd0997b9ad356298d0ee4b8b2f1af6244b39281756259a737e3a5d7a6814 SHA512 433f8d19691f3d0f8bd04f4d8dbd201079da8503d4174d01894824b8239c032af35727e5502b4a2491d9975ba0c6ba6d55c504fbc23c0ca65cc7ba695594d143
-EBUILD xvfb-run-21.1.10.1.ebuild 782 BLAKE2B cfa2801b9ad78e8073c4306932214d130d652fbc6d1b0be7309ef00cff654401012768c11403648e6f7c193fc57ee8133970cfde078f56d3191425e7e5d36caf SHA512 15df4547d9d939e8e9f23e72433b8b7f2b228dd4148158976ae4bdf69fa270d632db084451785442a50920c20619ee44d1fae69b7025e537ef540d909047f37b
-EBUILD xvfb-run-21.1.11.2.ebuild 782 BLAKE2B 7ae6f515d19355549ce8465d4e18d8b626f473b85a891dbca4d784edd5326af7bba456ac0f16b381b5e9ea09087ca7ba08fbf281ee508e0ed5a487761c026fa8 SHA512 30124b9a48ccb2f21ee1cd5cdd1d87952b1868d4c8f6a4293282fa017af6c122f7b3db0d2e7324f23925515d459233d6633066bb38ddb3ba3f1dd7b0ee20e591
-EBUILD xvfb-run-21.1.12.1.ebuild 782 BLAKE2B 7ae6f515d19355549ce8465d4e18d8b626f473b85a891dbca4d784edd5326af7bba456ac0f16b381b5e9ea09087ca7ba08fbf281ee508e0ed5a487761c026fa8 SHA512 30124b9a48ccb2f21ee1cd5cdd1d87952b1868d4c8f6a4293282fa017af6c122f7b3db0d2e7324f23925515d459233d6633066bb38ddb3ba3f1dd7b0ee20e591
-EBUILD xvfb-run-21.1.7.1.ebuild 787 BLAKE2B 091b41135f4c717a1e7aa47f3ecfcb1e1c6172a79a87a9ec786886e6c91799bea2a373e574c9ba1b3b000b517407a112fe15fbeca1f2af0639be5d028a998a8e SHA512 4a3ddc52abd27f5e210084009afc263a1ccafcb273e30f7a23f19ebc54de4f672ea5081a47aa30813aede5218c418d7cefdae9960715ed4a410034714f561976
+EBUILD xvfb-run-21.1.10.1.ebuild 810 BLAKE2B 2edc57a26d949742f700e9df6f3b5273128ff1a7fa792c03dfa860069b3b08276390ae78606499ba1a9aada424dea819c3c2fc1c09f8a5bb177e3e95f2255728 SHA512 3fe1c3cb9387ca6d8c25f6c4c278e0a5e639e61d63cd638de40486c5fa98c15bf2172444bb638460c9435b04a8d954a748b1f69bee2158c6cc1220c7e9438b26
+EBUILD xvfb-run-21.1.11.2.ebuild 810 BLAKE2B 2edc57a26d949742f700e9df6f3b5273128ff1a7fa792c03dfa860069b3b08276390ae78606499ba1a9aada424dea819c3c2fc1c09f8a5bb177e3e95f2255728 SHA512 3fe1c3cb9387ca6d8c25f6c4c278e0a5e639e61d63cd638de40486c5fa98c15bf2172444bb638460c9435b04a8d954a748b1f69bee2158c6cc1220c7e9438b26
+EBUILD xvfb-run-21.1.12.1.ebuild 810 BLAKE2B 2edc57a26d949742f700e9df6f3b5273128ff1a7fa792c03dfa860069b3b08276390ae78606499ba1a9aada424dea819c3c2fc1c09f8a5bb177e3e95f2255728 SHA512 3fe1c3cb9387ca6d8c25f6c4c278e0a5e639e61d63cd638de40486c5fa98c15bf2172444bb638460c9435b04a8d954a748b1f69bee2158c6cc1220c7e9438b26
+EBUILD xvfb-run-21.1.13.2.ebuild 810 BLAKE2B 2edc57a26d949742f700e9df6f3b5273128ff1a7fa792c03dfa860069b3b08276390ae78606499ba1a9aada424dea819c3c2fc1c09f8a5bb177e3e95f2255728 SHA512 3fe1c3cb9387ca6d8c25f6c4c278e0a5e639e61d63cd638de40486c5fa98c15bf2172444bb638460c9435b04a8d954a748b1f69bee2158c6cc1220c7e9438b26
+EBUILD xvfb-run-21.1.7.1.ebuild 815 BLAKE2B 9672864332fd5ee2fb0e30d5406fd7851bf1d8226f54e38aa10b09b05a54391f1f01c8a65b16ed3820db676f6a27a5209bf2af75621cb9934197d1a865d6ec68 SHA512 bb189ed09c6efa2059ecfe63a8a167e2f60ef3b15d1f1ad181dc46c89efa0b826ea6102a9355128c95f087054b41f45fbebde9c49b26cefbb603486bfcfedf62
 MISC metadata.xml 250 BLAKE2B 2bc2e14adc90cf0097dec7f5c2eeeaebecbd404252555385c3455d81ea3a22eecc3dc27aa17699ab500fdfcb737f58a6cc981aeb691fe6266537c290655ca54f SHA512 913641ea55e6cbeb7ca80b13ed2161dd3d22e6d2f59408bf272c4a79e4590b4f2c726f4025d190e58617e262313fbf9ba0892b72773e4769466f812b5c009374
diff --git a/x11-misc/xvfb-run/xvfb-run-21.1.10.1.ebuild b/x11-misc/xvfb-run/xvfb-run-21.1.10.1.ebuild
index cc9e028b4a34..a022cc835edb 100644
--- a/x11-misc/xvfb-run/xvfb-run-21.1.10.1.ebuild
+++ b/x11-misc/xvfb-run/xvfb-run-21.1.10.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
 
-DEPEND="dev-util/patchutils"
+BDEPEND="dev-util/patchutils"
 RDEPEND="x11-apps/xauth
 	x11-base/xorg-server[xvfb]"
 
@@ -21,7 +21,8 @@ S="${WORKDIR}"/
 
 src_prepare() {
 	# Not in src_unpack to silence warning "'patch' call should be moved to src_prepare"
-	filterdiff --include='*xvfb-run*' ${MY_PN}_${MY_PV}.diff | patch || die
+	filterdiff --include='*xvfb-run*' ${MY_PN}_${MY_PV}.diff | patch
+	assert "filterdiff+patch failed"
 	eapply_user
 }
 
diff --git a/x11-misc/xvfb-run/xvfb-run-21.1.11.2.ebuild b/x11-misc/xvfb-run/xvfb-run-21.1.11.2.ebuild
index 1191b6b39e1c..a022cc835edb 100644
--- a/x11-misc/xvfb-run/xvfb-run-21.1.11.2.ebuild
+++ b/x11-misc/xvfb-run/xvfb-run-21.1.11.2.ebuild
@@ -13,7 +13,7 @@ LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
 
-DEPEND="dev-util/patchutils"
+BDEPEND="dev-util/patchutils"
 RDEPEND="x11-apps/xauth
 	x11-base/xorg-server[xvfb]"
 
@@ -21,7 +21,8 @@ S="${WORKDIR}"/
 
 src_prepare() {
 	# Not in src_unpack to silence warning "'patch' call should be moved to src_prepare"
-	filterdiff --include='*xvfb-run*' ${MY_PN}_${MY_PV}.diff | patch || die
+	filterdiff --include='*xvfb-run*' ${MY_PN}_${MY_PV}.diff | patch
+	assert "filterdiff+patch failed"
 	eapply_user
 }
 
diff --git a/x11-misc/xvfb-run/xvfb-run-21.1.12.1.ebuild b/x11-misc/xvfb-run/xvfb-run-21.1.12.1.ebuild
index 1191b6b39e1c..a022cc835edb 100644
--- a/x11-misc/xvfb-run/xvfb-run-21.1.12.1.ebuild
+++ b/x11-misc/xvfb-run/xvfb-run-21.1.12.1.ebuild
@@ -13,7 +13,7 @@ LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
 
-DEPEND="dev-util/patchutils"
+BDEPEND="dev-util/patchutils"
 RDEPEND="x11-apps/xauth
 	x11-base/xorg-server[xvfb]"
 
@@ -21,7 +21,8 @@ S="${WORKDIR}"/
 
 src_prepare() {
 	# Not in src_unpack to silence warning "'patch' call should be moved to src_prepare"
-	filterdiff --include='*xvfb-run*' ${MY_PN}_${MY_PV}.diff | patch || die
+	filterdiff --include='*xvfb-run*' ${MY_PN}_${MY_PV}.diff | patch
+	assert "filterdiff+patch failed"
 	eapply_user
 }
 
diff --git a/x11-misc/xvfb-run/xvfb-run-21.1.13.2.ebuild b/x11-misc/xvfb-run/xvfb-run-21.1.13.2.ebuild
new file mode 100644
index 000000000000..a022cc835edb
--- /dev/null
+++ b/x11-misc/xvfb-run/xvfb-run-21.1.13.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN=xorg-server
+MY_PV="$(ver_cut 1-3)-$(ver_cut 4)"
+DESCRIPTION="Run a command in a virtual X server environment"
+HOMEPAGE="https://packages.debian.org/sid/xvfb"
+SRC_URI="mirror://debian/pool/main/${MY_PN:0:1}/${MY_PN}/${MY_PN}_${MY_PV}.diff.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+
+BDEPEND="dev-util/patchutils"
+RDEPEND="x11-apps/xauth
+	x11-base/xorg-server[xvfb]"
+
+S="${WORKDIR}"/
+
+src_prepare() {
+	# Not in src_unpack to silence warning "'patch' call should be moved to src_prepare"
+	filterdiff --include='*xvfb-run*' ${MY_PN}_${MY_PV}.diff | patch
+	assert "filterdiff+patch failed"
+	eapply_user
+}
+
+src_install() {
+	doman ${PN}.1
+	dobin ${PN}
+}
diff --git a/x11-misc/xvfb-run/xvfb-run-21.1.7.1.ebuild b/x11-misc/xvfb-run/xvfb-run-21.1.7.1.ebuild
index b37ac978a797..4203dc8e35a4 100644
--- a/x11-misc/xvfb-run/xvfb-run-21.1.7.1.ebuild
+++ b/x11-misc/xvfb-run/xvfb-run-21.1.7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
 IUSE=""
 
-DEPEND="dev-util/patchutils"
+BDEPEND="dev-util/patchutils"
 RDEPEND="x11-apps/xauth
 	x11-base/xorg-server[xvfb]"
 
@@ -22,7 +22,8 @@ S="${WORKDIR}"/
 
 src_prepare() {
 	# Not in src_unpack to silence warning "'patch' call should be moved to src_prepare"
-	filterdiff --include='*xvfb-run*' ${MY_PN}_${MY_PV}.diff | patch || die
+	filterdiff --include='*xvfb-run*' ${MY_PN}_${MY_PV}.diff | patch
+	assert "filterdiff+patch failed"
 	eapply_user
 }
 
diff --git a/x11-misc/xwallpaper/Manifest b/x11-misc/xwallpaper/Manifest
index eb1e3911715c..13462d4f7379 100644
--- a/x11-misc/xwallpaper/Manifest
+++ b/x11-misc/xwallpaper/Manifest
@@ -1,6 +1,4 @@
-DIST xwallpaper-0.7.3.tar.xz 86388 BLAKE2B 45942dbe7e3627fbbf99ac5ab94c88ecea919e48131f268f0be10a0fba15a4feddf207c0787ac47f75bc6a5cc94f2b78d599e97950609196930a73073ae21ec1 SHA512 7fa9cc9ca2445afdfcb647724a6dc8bb3b52b9a6c91d237f6b443cf1fe6624c67d16d611bf4e435c5f3dcdae6cbf73bbde257a4e194bc127dc13dca1f8067c19
 DIST xwallpaper-0.7.4.tar.xz 86432 BLAKE2B c10a69ab5734e43e99a746872bff427797e1d8f9de06d241fa81435036527b029031bb49733cf2119e8725883f20b9253b779ef9113d32d1b4f77bd73511a76a SHA512 f6eaf41befe724ad55d14f607bdfe9d05c79139054deb6590198ce767cf42173f068459dd894b284f3e8dbc95fc482d8ed7ed1c615f7b72b249897a6a01d51ba
-EBUILD xwallpaper-0.7.3.ebuild 972 BLAKE2B 464e9e3c716845f13654c2c33d0f99500d8e380746f54258d469904006817d93549f0aeb6b4b1711ad3ecf47b6a8d66e0d97c89b5bdfdda21e57c5e5ea5f5428 SHA512 0eeda67a5eee6cb81fd7e5b886cfdddca0fae217ae60354975c34bf9041a833b097c3b270dd1f4384dac6656fd2bedd55801e61e587ed732ce9f0f64c162d1b0
 EBUILD xwallpaper-0.7.4.ebuild 972 BLAKE2B 5de8652b55c08919c42dc3dfb3831ab7de459cc1667d89c48028c9e633da85107883059c0c77f7e47294b6ed701176227c7a2444c11046ea34bfe88458c488c2 SHA512 07a232cf235fdac55620f4d8a2cda58580fcaf5d49a147a4ecb76dfde43ec11a5ea23660a123eccc5f52437b5dfa8b3c0880bb822c36c1c4c8b41c202a2c58b7
 EBUILD xwallpaper-9999.ebuild 976 BLAKE2B e8bc05e1398bca6b9dcf484551075e3dfcac7493180c59fe9cf1adfd67048af6fac554671c2c2a1925d4409d5e181050822b4d5d49b7cb2e05543881de24aed8 SHA512 5bbb213c662454b79d5c82e994d46af87249cf6cad87dacfb4e73db16d2eb96b8eb9def051c0dd86e149317fea252452b022584f05df33e5df926603044f7a92
 MISC metadata.xml 721 BLAKE2B 617ebf75fe3702201bd91b37d2f38ca80425b4b8efe548f60039996a3979a7c01606513cf7ee8560cd7172fdb6bc14d29e9e62103df2f80cb8c738abc6efebaf SHA512 3bd069e7b5b31807ff41f67dc9bd943c116a5408b61c6a0eee6bfbe41b2c712c258e393dc78c527d7990403171be0da5b6da6d35ccc5485b06bc3eae969be127
diff --git a/x11-misc/xwallpaper/xwallpaper-0.7.3.ebuild b/x11-misc/xwallpaper/xwallpaper-0.7.3.ebuild
deleted file mode 100644
index 82ae178851d7..000000000000
--- a/x11-misc/xwallpaper/xwallpaper-0.7.3.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Wallpaper setting utility for X"
-HOMEPAGE="https://github.com/stoeckmann/xwallpaper"
-
-if [[ ${PV} == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/stoeckmann/${PN}.git"
-else
-	SRC_URI="https://github.com/stoeckmann/${PN}/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 arm64 ppc64 x86"
-fi
-
-LICENSE="ISC"
-SLOT="0"
-IUSE="+jpeg +png seccomp xpm"
-
-RDEPEND="
-	x11-libs/pixman
-	x11-libs/xcb-util
-	x11-libs/xcb-util-image
-	jpeg? ( media-libs/libjpeg-turbo:= )
-	png? ( media-libs/libpng:0= )
-	seccomp? ( >=sys-libs/libseccomp-2.3.1:0= )
-	xpm? ( x11-libs/libXpm )
-"
-
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		$(use_with jpeg)
-		$(use_with png)
-		$(use_with seccomp)
-		$(use_with xpm)
-		--with-randr
-	)
-	econf "${myconf[@]}"
-}