gentoo resync : 29.12.2022

author: V3n3RiX <venerix@koprulu.sector> 2022-06-29 12:04:12 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2022-06-29 12:04:12 +0100
commit: 0f558761aa2dee1017b4751e4017205e015a9560 (patch)
tree: 037df795519468a25d9362b4e95cdaeb84eb1cf9 /x11-misc
parent: 752d6256e5204b958b0ef7905675a940b5e9172f (diff)
119 files changed, 1238 insertions, 587 deletions
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index c79f1ceea667..0ef6180d07d1 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/alacarte/Manifest b/x11-misc/alacarte/Manifest
index b2f9f61c5285..a2719d8e467f 100644
--- a/x11-misc/alacarte/Manifest
+++ b/x11-misc/alacarte/Manifest
@@ -1,5 +1,5 @@
-DIST alacarte-3.42.0.tar.xz 203836 BLAKE2B e020529acd5b6b716c8e1b876b3edc1107cf61fbcebb648ce7f593e830f0ae7ea3445a5ccda2cd798e0441e999cff2e9e4630a7b2fe0b711adef56bf59931c25 SHA512 df56f79e0697268ceebd15614c9e6c6bbef82c10c64c90b39eac1718043edb1a1ea71d03798705d94407cf2dcc3fead6c2d08ff6c5a9ca710574eb15ffed68d1
 DIST alacarte-3.44.1.tar.xz 253364 BLAKE2B ebd542430f909291d06c1094aac52f87760547013f012167fa5616609251a6cb48b258122424a119b3ab10e6e2289d9a282dd66da3dcf5590b09d9c686a8934b SHA512 84b1cebdcbb53e2cca5a1425829b00db0b2a11e308584ea96179c2d0451d8c77fa6a995ae4671a024fab72869c7d2e9986dc310bfab38fe8b7b2f54d383501ca
-EBUILD alacarte-3.42.0.ebuild 817 BLAKE2B 2c10e517fe9fa01f04aeb8e137627ed64f078e57d878519ffb73304d23c73f2afd81768254d235743fd6536dd1d9f8fad514d55c0a6b0163507d18f94de35def SHA512 f66c007d4d4d3f9e05652b66281a0427db2cc4c914dac507583898364eda91c1a2507810aec8164769bcf003846a33758d0385c28137fa7831c5b6258e2bfe5c
-EBUILD alacarte-3.44.1.ebuild 769 BLAKE2B 0bab1c893de5a2673b16e04842ef9d4eba62f66cea2f2287605a09c2b972b24f9c305ce229da3cc9d44ce5fec4c1b2d2e45a5ba8d9213ae62e65d0d5a77c30a1 SHA512 54ab52a056000ce6d31a8f1b2c1b48ab34aa07f2338607b80ab626910c552458e5ce3a48e3d8269a300a99985fc42dfc05645773495ef7742694f0348e060aed
+DIST alacarte-3.44.2.tar.xz 253580 BLAKE2B 206eea28b50ef6d0cf228031ff72c16c6ebd130dfa623b96eb727ef62aad3db0003f3a97bc188f4b8a0e9d18cc184a9230fb332131d37afb0abe71dc3d13ee1e SHA512 b62c15ca37717e988b1d64f0ab565970ae15a4bc11a3f31da8574a0b4f10a9cf8b94d0a85be34d871c106ab34c63b2dfbf535b46eb630829e73c14023b99053e
+EBUILD alacarte-3.44.1.ebuild 767 BLAKE2B d0fcb8a65e335b244e2c523f3c15050d9de601e62622f33cbd50ab6b63834fb9a206fc60620c3c299e7be9062542dd5c52f0adac12aca318de01748d5a2795bf SHA512 a3debc82c2206b86a3a5aab6f0e72da9a1f98d95e4ae59f918662f29570c2c1018876463efb78d359279e3d374cf5bf0f76e5beea96468b9c1ebeafc56617487
+EBUILD alacarte-3.44.2.ebuild 764 BLAKE2B 608c1d4d84a6c76f4e8c4aacdef03559a26412990ac102a3c8b7dba58e632d1d86b84e099f5b578642e738d0e6a1b5e05435b9a06032e7d32c47aa86e4ba06b1 SHA512 02d631947d9f357ab20d03a23e5e620b0f4227a2fc44eb7c360b1f142cbf762dff5cc07876c83206d68b7e893cd592163dcd971a64db9df126844d2fdeb43e06
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/x11-misc/alacarte/alacarte-3.44.1.ebuild b/x11-misc/alacarte/alacarte-3.44.1.ebuild
index c78a03bfd63d..bd4396e3b88b 100644
--- a/x11-misc/alacarte/alacarte-3.44.1.ebuild
+++ b/x11-misc/alacarte/alacarte-3.44.1.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 ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/x11-misc/alacarte/alacarte-3.42.0.ebuild b/x11-misc/alacarte/alacarte-3.44.2.ebuild
index 5010be1235b6..ec98922c90ce 100644
--- a/x11-misc/alacarte/alacarte-3.42.0.ebuild
+++ b/x11-misc/alacarte/alacarte-3.44.2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
-PYTHON_COMPAT=( python3_{7..10} )
-PYTHON_REQ_USE="xml"
+EAPI=8
+PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_REQ_USE="xml(+)"
 
 inherit gnome2 python-single-r1
 
@@ -12,22 +12,20 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/alacarte"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE=""
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-COMMON_DEPEND="
+DEPEND="
 	${PYTHON_DEPS}
 	$(python_gen_cond_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]')
 	>=gnome-base/gnome-menus-3.5.3:3[introspection]
 "
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="${DEPEND}
 	x11-libs/gdk-pixbuf:2[introspection]
 	x11-libs/gtk+:3[introspection]
 "
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.40.0
-	sys-devel/gettext
+BDEPEND="
+	>=sys-devel/gettext-0.19.8
 	virtual/pkgconfig
 "
 
diff --git a/x11-misc/alock/Manifest b/x11-misc/alock/Manifest
index 9e8b90643447..b691c27c043f 100644
--- a/x11-misc/alock/Manifest
+++ b/x11-misc/alock/Manifest
@@ -1,8 +1,9 @@
 AUX check-setuid.patch 839 BLAKE2B b0e360fa73174cc022891e7c4533d72c82ea9620a076054e51a5b885db65fb0aff540b88b10bef4e653942fca3e655b938623c68bd87a4d3dbc81fc9a3c447f8 SHA512 6c86673f33420ec672f7f74c1ff2423ebd43e6a6c9b54db7509196c66387c077bf105d76027a580f60f53f6dafc31c102364b4b6568e17ac5587a8833540315e
 AUX fix-aliasing.patch 1076 BLAKE2B ecd1b2ae5fc366342fdea7197eedcbcdbafa896304ed5018383f5776c8ca0ac93b11c45775b12e3fac2d9182c5758bc92cbd0f0022bb6370a4e7ed620e9d76c4 SHA512 edcc182ddc8a78c031111b301b090b9af97b0628dd6b53b353c144183d33f276d730596b0cd3947aba89bb1163135f990dada475b09a8f8ae8453e471671848f
 AUX implicit_pointer_conversion_fix_amd64.patch 307 BLAKE2B 39ea89191e3d4633ea4b77018fed933a31d698c91af10a4044e1090592f96803bfaff72006af70de6aa235ce419b3e63a319abc849efd0400d4285cbf9c47541 SHA512 1f036dde054ab641ea4af31d621eb6b6a41371749d9d54c70908981817f6c52c8b64d8b4967b525cdad2d62b78b81224187bbc8759ef3f5621ad3874a88079d9
+AUX no-which.patch 793 BLAKE2B 2821329dbb54625b2cce87f28d4dcc4677a61d85df6958f81167dd4d892e11964f1f7e2984a5f74f7343bb4991a4a4892546606b47d953c68aa4ec2c9695113e SHA512 5ae70b285ccd46c72f065df4c54be530a56c8743ea4e8c8a7eb2da2f3cc82575a2533ea1e7587fc2d10d61c8c5552a6d8a28184ecb15474d8a87e9af25440f32
 AUX no-xf86misc.patch 3220 BLAKE2B 1588866bdb372b5bfae031569a981e1fc0be716ec2b96cc46aa4118cd8db3e500760fb90a9394abbf792872d7cf65963daaf47c46a5db87249fd172370396711 SHA512 a27a7dff601c35ad5b41170be0aa3b2453c2b46c679f76ad4ae0b229731aa0d1e13e3c3dfeffbe690e119048a51c76ae091fa3673db8ceecb2f82f81d3857488
 AUX tidy-printf.patch 801 BLAKE2B 3015b266465ac1da7127cbc2c871daa729c22ce97c8bf9e88dff5ec3228192bc81bbc0fc31239add4256b8a0d44a852eb543079fbdecb909db41ac57f43ec070 SHA512 253f731e5be75676ef56ab320ee52625bee17a0a8f2bbb025efb8b9ac8a49da7330e5123bb0070eaa9c01f3cd66fadb85ead65c75c9412e6503744705402e9c4
 DIST alock-1.0.0.tar.gz 71497 BLAKE2B e61a5fd9fb9a5bcc23a535fcc81da7ae2006300c636a6103132125e0c84c18977690e0f44f489788bf8228f0af900638066ab8706ef731fdf32604dc013684e9 SHA512 7f2515410919ef1324019cd8d218650f54537f9fddf1d74bebd255c7572eff9433ded92f2d1f4ee5f352151dd15f4a7f53f7b639f82d4e6f936f831262d508a5
-EBUILD alock-1.0.0-r1.ebuild 1632 BLAKE2B a14723ff008e1898c6e233f01868b08a40af50d5124a46ddfcf907f9a48a07e9a0f034866f3b82f17981b5880b069eeab4424e977d37999074dda85559dd20e6 SHA512 6122502715d9a16da4e771f3d8bebf53f9ab1bdbadf76db284b3968c92be09d98cbe1a11bb3393476f6e3a6a96d8171b335197820646446fb2fdb2dc168a43bc
+EBUILD alock-1.0.0-r1.ebuild 1662 BLAKE2B 8f5f1a6963452bcc4fea0f5f106e9a58f424d8758f3cf199f5cb74305c197495f4bfb763a0326ba456ceabde055696880d05cca69c7d081b50d44129ac7f3acc SHA512 e1e55fc13a03edfc8ea85df54b19f433db206704d9dc2ac4ca947432d68455d1836b12b49654d7986b6b3b039f6d77ba99968f177fbe847db707530023c37764
 MISC metadata.xml 603 BLAKE2B 7dfbc13207dc75cfc48b6344f9b8e3c1f2d68f9417522ae679392e1240153d4f2947fb68c5ba6029e0311c34d566779b6f28a13d4b569e7b1b1b052a22b0a6c0 SHA512 487f65c84c0e98140228380263f0dc25ad6fa947aa45b4c447b88a9a8e1257fddc32a7dd9c8e4db2d40c47d3f26d83c1ccaecc5b9561731178619a404bf38f96
diff --git a/x11-misc/alock/alock-1.0.0-r1.ebuild b/x11-misc/alock/alock-1.0.0-r1.ebuild
index 33a86aadaf0a..476253fafdaa 100644
--- a/x11-misc/alock/alock-1.0.0-r1.ebuild
+++ b/x11-misc/alock/alock-1.0.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -33,6 +33,7 @@ PATCHES=(
 	"${FILESDIR}"/tidy-printf.patch
 	"${FILESDIR}"/fix-aliasing.patch
 	"${FILESDIR}"/no-xf86misc.patch
+	"${FILESDIR}"/no-which.patch
 )
 
 src_configure() {
diff --git a/x11-misc/alock/files/no-which.patch b/x11-misc/alock/files/no-which.patch
new file mode 100644
index 000000000000..1764be32c82d
--- /dev/null
+++ b/x11-misc/alock/files/no-which.patch
@@ -0,0 +1,30 @@
+https://bugs.gentoo.org/844886
+--- a/configure
++++ b/configure
+@@ -26,7 +26,7 @@ msg_chkfor() {
+ check_docs() {
+ 
+     msg_chkfor "asciidoc"
+-    if which asciidoc 1> /dev/null 2>&3
++    if command -v asciidoc 1> /dev/null 2>&3
+     then
+         echo "ok."
+         echo "#_______________________" >&4
+@@ -40,7 +40,7 @@ check_docs() {
+ check_tools() {
+ 
+     msg_chkfor "compiler $CC"
+-    if which "$CC" 1> /dev/null 2>&3
++    if command -v "$CC" 1> /dev/null 2>&3
+     then
+         echo "ok."
+         echo "---------------------------------" 1>&3
+@@ -56,7 +56,7 @@ check_tools() {
+ check_imlib2() {
+ 
+     msg_chkfor "imlib2-config"
+-    if which imlib2-config 1> /dev/null 2>&3
++    if command -v imlib2-config 1> /dev/null 2>&3
+     then
+         echo "ok."
+         cat << EOF > tmp.c
diff --git a/x11-misc/appmenu-gtk-module/Manifest b/x11-misc/appmenu-gtk-module/Manifest
index feb38b16f116..82f430ec69a3 100644
--- a/x11-misc/appmenu-gtk-module/Manifest
+++ b/x11-misc/appmenu-gtk-module/Manifest
@@ -1,4 +1,4 @@
 AUX appmenu-gtk-module 239 BLAKE2B c5f055154136c6ba862ce9f74edf898fd9baa5b699fe149fd29b125bd42cee94174e7f8f8bf7a40ee63e880f38a161a652e45c171dae399e8cd2b76e4a94e2f5 SHA512 daf70376ebcd1b67eec093c8b905b6d085d4206958573ce7aa8709c053928a78a7b8d06b6fdba9a221731d89e3fe6720394d1e8cee208adfaaf298825a9cc04e
 DIST appmenu-gtk-module-0.7.3.tar.xz 48460 BLAKE2B b7008aa618e643a95445aad25bc19eed5b887810891318a891f088284f8f128e6392671226742a8b0c70699a9455739ee61ed56aec32129532ba53dc69809913 SHA512 d7df7e3cea3ccb66d013b23ae8796b8cbb0e0787f37f54078715c4863797c28d44ff38d7ac965b6eb0fd5cb327c1a4b891c74c66ba95b9b9a06e2c06ba5b2ad8
-EBUILD appmenu-gtk-module-0.7.3-r2.ebuild 1067 BLAKE2B b8aedba26db9fa86379cb428b0fba2ea1f1fe0bc3b90e5979f1b419d5c9f926b2d55f516ecee1b8a5aaea7874e17628fec6a6dd2a42d2d627a0c2e0043dbdf4c SHA512 4248369662470e1d4b544e071b0cd3d6b27f71c68b141f4c0ea254945b60ef58afdb7a7ed84533344a785b9fe4b9d1e414fabe2f9c70da4c9c51de88f3a1b29e
+EBUILD appmenu-gtk-module-0.7.3-r2.ebuild 1074 BLAKE2B a7fd1ab2a33821a93feb0549636c3a2811b919eec34739ee92de29ba11fee82d531c8fd5345d5eb92f0b5116bb856ec4338636aa6461861ac879fcbbd4a0a7ad SHA512 3f5037160d95fb49c361719134279bcc409dd755c9ffee333d6287c3285b4fbe508690992fc311d0cdd9a5c398511555548144c84685786964fe2ff0e2495366
 MISC metadata.xml 331 BLAKE2B 7f59ec698ab53fd473b6b86beda723e6eee1ff024f29b16495102e7367091b6a38e1bcbb29a8b608480ec2230bf7a05dcd90a72982bd86daee7db531a97fe0db SHA512 bc0358ff8ff0a28a2a16f861df6d2f122396c655b07e7f61bf7b64dcf71f65c02f412fd4d24d14fc267b03f7065fcc6eb549147cdb99388f59f3d61c2290d924
diff --git a/x11-misc/appmenu-gtk-module/appmenu-gtk-module-0.7.3-r2.ebuild b/x11-misc/appmenu-gtk-module/appmenu-gtk-module-0.7.3-r2.ebuild
index a9248abf20d5..46a05319bac6 100644
--- a/x11-misc/appmenu-gtk-module/appmenu-gtk-module-0.7.3-r2.ebuild
+++ b/x11-misc/appmenu-gtk-module/appmenu-gtk-module-0.7.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://gitlab.com/vala-panel-project/vala-panel-appmenu/uploads/570a2d
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
 IUSE="wayland"
 
 RDEPEND="
diff --git a/x11-misc/arandr/Manifest b/x11-misc/arandr/Manifest
index 43b38bf29186..47f728827d06 100644
--- a/x11-misc/arandr/Manifest
+++ b/x11-misc/arandr/Manifest
@@ -1,4 +1,4 @@
 AUX arandr-0.1.10-manpages.patch 1193 BLAKE2B 59816489bc196d73f32e810db5f6b661e38edc5838d925f1866e3ad0786b3db6986623eb617864a39e038829991fee3f7e865dfbc07a868526973ba09d00232f SHA512 926ae7720aec2d4ca35c4ad085e6b8e1b03d3aa87102efd8a122241ed6790a192d30629a576a028d73ac344423019f36f309f42afffb88bdf96adbc2b233e48f
 DIST arandr-0.1.10.tar.gz 100203 BLAKE2B b5754dda4c4f9c5e957a9fc75b7236480417b899c2705bc5aee514899c664d39b5902921c69ac425aff99f3a6ea512bfc0c2c0259519c1a6e0fc553f6e367cc2 SHA512 12c2fe5b36f8d8e688d990e352c1cfa3e8512c0b647b78a8af93f9472704e4867fac4c56c207465fb7b420c9022dc545dea8ad8a29af3037758ab4587dcd38ba
-EBUILD arandr-0.1.10-r2.ebuild 632 BLAKE2B 2a1fca5fd800d10bcfe8cc31ecb6a23f4d9b1208ad47088b30f449f72016103a2458aeb9feb7ed49cefa74c49c4eb458bd49dc3ba2a789e555ce78285dfd1e5f SHA512 8b60d598b1b3978e0db754bd12e6ffb7c1ac141bc5860d857c628120ece3df48919f70138f5e6343787403665829e620611d00bc333346808077a52bb2c30290
+EBUILD arandr-0.1.10-r2.ebuild 639 BLAKE2B 5b8e48ca6f2b3aa96dc6151bf9214a5d76b9b3c5abd40047e33f8f6818ccd90eb4f24f4a1311505af6ec5c2394bbdaf5e2ad71ace17b2daff282693e884f5809 SHA512 f4814b9594e3f23ae1277e72787f0c57c9b5efcc24a2cc51234040c6d131e55e24f37201288adcc01b488bc059a8b2c7f167a6217cdaafb55dade214a23d156a
 MISC metadata.xml 532 BLAKE2B c9c58abd579ff5e6ea71091dc54421fe90d75f14b0c4b31f712188f19fbc9b9216e4d581436f30b06066a7090a85cf2bceb0cbbaff2f1c5d43959833695973a7 SHA512 ee39d9e3a39864becd4e72bd72fc7691735d098d769e0715ae0a097aaaf0812fb06e1589f37166e34d6badb67c9041282270374426f0805f3c88c86bc265a26a
diff --git a/x11-misc/arandr/arandr-0.1.10-r2.ebuild b/x11-misc/arandr/arandr-0.1.10-r2.ebuild
index 38050789d83c..503f283eceda 100644
--- a/x11-misc/arandr/arandr-0.1.10-r2.ebuild
+++ b/x11-misc/arandr/arandr-0.1.10-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://christian.amsuess.com/tools/arandr/files/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 x86"
+KEYWORDS="amd64 arm arm64 ~ppc64 x86"
 
 RDEPEND="
 	dev-python/pygobject:3=[${PYTHON_USEDEP},cairo]
diff --git a/x11-misc/autorandr/Manifest b/x11-misc/autorandr/Manifest
index a52f9afd6aef..82422064085d 100644
--- a/x11-misc/autorandr/Manifest
+++ b/x11-misc/autorandr/Manifest
@@ -1,6 +1,4 @@
-DIST autorandr-1.11.tar.gz 48791 BLAKE2B 57203b15eebdecab943c706745701e8569eb0a66dab69ae4429abfa863da736a5ed8b5333f6d948bcf8cae30f48c68eb1b35f2e84080526c1507ab78dba02efb SHA512 93de0461653aa5145956a8aafdc9fb257491495ca335e4213e7b6f1f313ebfd2332c38615ac648204494026439d77861a7eefd97e80cd49a5fe3d9b75db54ec1
 DIST autorandr-1.12.1.tar.gz 45550 BLAKE2B 5b434325d13c00c3fa70b5d09edb540cdcf3bb921307c60f2c616231e7a87ea85f60e39500ed8116f28619139f71ecc4a8fa153ffadc6b8d74df570736a0d815 SHA512 a7e095eb96e7e0d3a5b3b2122d68a3d3a5121d8be7a86ddd9f837ad42b7a53ed5ee45151f23861c5b900e214a4dfc0c575f45fe70c8c5587562a4035458137a0
-EBUILD autorandr-1.11-r1.ebuild 1318 BLAKE2B 8c375a0062db9b50ec9cded08dd8907aa63506d8e5ec8afe11e5ce7424438af5c0a6142bbc152dfa974244f4581dce2a49ee7b26fb7d3c07047119d82ddee82f SHA512 16b383f2d553ec9bfa5f81e17492704c69317bb149f34d0a7208b6a5a8c3b0b71c5aa79131c0634e433274fa72a9dc18526ff600d6193924e0425358035840dd
-EBUILD autorandr-1.12.1.ebuild 1318 BLAKE2B 8c375a0062db9b50ec9cded08dd8907aa63506d8e5ec8afe11e5ce7424438af5c0a6142bbc152dfa974244f4581dce2a49ee7b26fb7d3c07047119d82ddee82f SHA512 16b383f2d553ec9bfa5f81e17492704c69317bb149f34d0a7208b6a5a8c3b0b71c5aa79131c0634e433274fa72a9dc18526ff600d6193924e0425358035840dd
-EBUILD autorandr-9999.ebuild 1318 BLAKE2B 8c375a0062db9b50ec9cded08dd8907aa63506d8e5ec8afe11e5ce7424438af5c0a6142bbc152dfa974244f4581dce2a49ee7b26fb7d3c07047119d82ddee82f SHA512 16b383f2d553ec9bfa5f81e17492704c69317bb149f34d0a7208b6a5a8c3b0b71c5aa79131c0634e433274fa72a9dc18526ff600d6193924e0425358035840dd
-MISC metadata.xml 307 BLAKE2B a93fcb4a81c57533d307a64180bd1735528c6e83a661aed8bb9a2b1cec3f3f3036376fea26e4fb5396e1d1e1e40dc1c4f5b480b6b3c5c258fca98550f118b814 SHA512 5f177c265f6aa97946a0bfac6c170933c8fd2ce4ac230624c679dfca0ad11f04a4405923a65dd8ac2dd2a65d64ef16c3b2d68cfef432a31176e5df40c40af834
+EBUILD autorandr-1.12.1.ebuild 1316 BLAKE2B 5c13c316e1a1878f7507178c15dea312af45867841bc70baa26f0ea5aab8f9e98a99e9953a85aacff68a075abacf914c9e8009726cc4890a733086ada9c2a74f SHA512 5b6f8d86a28c19763d690abfc65787e3a1b7fac32be2a5689e29fd2ef92928865771e12163f242e25be9297eaaba238d7fa6d13420ca645933a9ed0eb7905a83
+EBUILD autorandr-9999.ebuild 1318 BLAKE2B 5892e8c61fe2ff231f20937d9bd31004eb2710043fc48a077214b07d7f68716409b7049113ecbd6a444f6b694d40265179f87312fc2e7e60afd90aa7753c02a2 SHA512 d4339f7ee1675fb0a539cbae61126c7f4fcb40014abacf08db1d58b37992a2250709fe041f6a620758bfb0abee6ea95b95321dc2de96840ff8546080051a586e
+MISC metadata.xml 355 BLAKE2B 51f7f0670462cbded6b65379488447fca9862fd75ecc262e3a627c268d184abae82feb8a3835486d2c39d18ad0882db6f1f6c9ff9df4fac19457b4ec3a1f6621 SHA512 a9e16f58beeda5d64b48240ef23dfe4349d8c962e08df19cd3fa60846891719fceba2f69b3affba64b8d6f8c2ec96b1dc544a4ada52efd53e6d15b1aa1734677
diff --git a/x11-misc/autorandr/autorandr-1.11-r1.ebuild b/x11-misc/autorandr/autorandr-1.11-r1.ebuild
deleted file mode 100644
index 392d59491a57..000000000000
--- a/x11-misc/autorandr/autorandr-1.11-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-
-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 udev"
-
-RDEPEND="
-	x11-apps/xrandr
-	launcher? ( x11-libs/libxcb )
-	udev? ( virtual/udev )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="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
-		systemd
-		$(usev launcher)
-		$(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
-}
diff --git a/x11-misc/autorandr/autorandr-1.12.1.ebuild b/x11-misc/autorandr/autorandr-1.12.1.ebuild
index 392d59491a57..2235547cc76e 100644
--- a/x11-misc/autorandr/autorandr-1.12.1.ebuild
+++ b/x11-misc/autorandr/autorandr-1.12.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit bash-completion-r1 distutils-r1 systemd udev
 
@@ -12,7 +12,7 @@ if [[ "${PV}" = "9999" ]] ; then
 	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"
+	KEYWORDS="amd64 x86"
 fi
 
 DESCRIPTION="Automatically select a display configuration based on connected devices"
diff --git a/x11-misc/autorandr/autorandr-9999.ebuild b/x11-misc/autorandr/autorandr-9999.ebuild
index 392d59491a57..4433c9b58d70 100644
--- a/x11-misc/autorandr/autorandr-9999.ebuild
+++ b/x11-misc/autorandr/autorandr-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit bash-completion-r1 distutils-r1 systemd udev
 
diff --git a/x11-misc/autorandr/metadata.xml b/x11-misc/autorandr/metadata.xml
index d6dccfce2d68..fa31b93bb669 100644
--- a/x11-misc/autorandr/metadata.xml
+++ b/x11-misc/autorandr/metadata.xml
@@ -6,6 +6,6 @@
 	<name>Florian Schmaus</name>
 </maintainer>
 <use>
-	<flag name="launcher">Install the launcher</flag>
+	<flag name="launcher">Install the launcher, i.e., an alternative to the udev/systemd hooks</flag>
 </use>
 </pkgmetadata>
diff --git a/x11-misc/bbppp/Manifest b/x11-misc/bbppp/Manifest
index 186ac8c22dad..30a6bb673192 100644
--- a/x11-misc/bbppp/Manifest
+++ b/x11-misc/bbppp/Manifest
@@ -2,5 +2,5 @@ AUX bbppp-0.2.5-gcc3-multiline.patch 2759 BLAKE2B 883dc1f412f6b3c7bd33b95d27dd79
 AUX bbppp-0.2.5-overflows.patch 453 BLAKE2B 45dcee17e6d725b3ba2e2197a75139d5b8dd86ae7b706f88069eda2ef1cf29236fc878a8de363904e88d4269302f9f9c6c49bf0ac2de607df3feeb53656a5420 SHA512 044755d73415d171ec2e0c61fe0affea912ab40dedd567f3e4f29938ca97825c1ab36be9bea50dc7c40227a06e5e2ea2541d0cdf71e5dc8013fef38a6db920eb
 AUX bbppp-asneeded.patch 1062 BLAKE2B 73be09e58f573c58e2cc0afe2c316e737af0ac4a0308975f955002a3b70bb1fd68641725b62a68ca6fc7e8d8a6a1fc23446a5a7bb5b3d19721ac73ceff996091 SHA512 892a7f18ce55c099b86fbb129eee9a0750852d5f152d0619a3e79bf70f9e9a1524c52d9aec53bbb0b65999bd6248cc4eee4b341f5ad0d8f636a7dfacb3fef993
 DIST bbppp-0.2.5.tar.gz 83421 BLAKE2B 3fe18ce71617b792f9430b2bbe123af78b498be9a663fc782246550ed936b81278d27f06b9b454bc47ff6db193fa2a949e97f0fd970532399c3f0b0f335beda1 SHA512 55d1e4d1a2c97ac5a5d34a48cd877891d8d6acf32083d7bfa90e4941cfbc18a91d056a0ec6b7a96182f72be440f6609caf3bc82c9071c6d0bcfbe95577f04930
-EBUILD bbppp-0.2.5-r1.ebuild 1015 BLAKE2B aaf3d1fc51511463cf22c3dfd405997ddb4f0169156bfc8f647ae34aaf4491df960f177300bd838c44cd598ee2974afdddf29d641c93b820134dd060cf5804c8 SHA512 d5fa3b2042fb1a6e202c58aaefc3b4ac20394c243a4c8e54d382a44de9901483113d860aa8b3789c538d4a77ee518f662873a04d6abe4696504426ca7f3713fa
+EBUILD bbppp-0.2.5-r1.ebuild 1090 BLAKE2B 3f9468b361d2cce3100c3f5b7c7afca190581b38d84c59efad34ef79826935d280493e93f60a02818f82df20ca4061c834c4ee019a297696679484cadd47fe81 SHA512 14ecacfed44170d4482a4e5e1b3e54901d9207fe94011c16fe0ea55103194078ff1409305bbf5e6806850e97db9e2999feede738252ff3e24da600776b2912c8
 MISC metadata.xml 322 BLAKE2B 281372f32e95085fb9b3eda84565f4654b4004111fd38ff5345dd1bba3ea5342971b22fb4825a0222c671a6d4056ee0ae9ceab1d3550ebfcd8e08e4cdadd9319 SHA512 5668d105c8615a718c20ea503868087062882f519e98452f45e69ea3cd840b17b19dfc2540f8b808e92288cdbeba73a8070bdb7d10cd70a1c27525d5865754d7
diff --git a/x11-misc/bbppp/bbppp-0.2.5-r1.ebuild b/x11-misc/bbppp/bbppp-0.2.5-r1.ebuild
index a8e1a0cdbba4..5ae4a57762d3 100644
--- a/x11-misc/bbppp/bbppp-0.2.5-r1.ebuild
+++ b/x11-misc/bbppp/bbppp-0.2.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,8 +13,10 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
 
-DEPEND="x11-libs/libX11"
-RDEPEND="${DEPEND}
+COMMON_DEPEND="x11-libs/libX11"
+DEPEND="${COMMON_DEPEND}
+	elibc_musl? ( net-libs/ppp-defs )"
+RDEPEND="${COMMON_DEPEND}
 	media-fonts/font-adobe-100dpi"
 
 PATCHES=(
diff --git a/x11-misc/cbatticon/Manifest b/x11-misc/cbatticon/Manifest
index f7bec4c109cd..60ab50cb273f 100644
--- a/x11-misc/cbatticon/Manifest
+++ b/x11-misc/cbatticon/Manifest
@@ -1,3 +1,5 @@
 DIST cbatticon-1.6.12.tar.gz 34670 BLAKE2B cfae33c7e5393626a4e17d649bb7e242d35cfe7f79fda1b85e058a93a6b1c6da61ed9ff4463a44b5d6efa17d78f960021671d6bde1581af3e3eae70f369b6d52 SHA512 4946bf8a0514c0d595dd335a1388fd0e2c1cbb4d4e7fa774ab58bca4914d635d23cf32d7299dc9cad0f4dc7a37d88b875d9432234bfea0251f699d7776e5b019
+DIST cbatticon-1.6.13.tar.gz 35330 BLAKE2B b4079be2158d1f776a0af086b2bf03b22d43b28ae4b92564af715d05def4b59bddce39b6ad235789114214256609b60b6708571b80be215197cb33610fc43ce7 SHA512 5f232dd96501e71c80fbdd1d722a8cedcdb12204655965b65e551aa8ab2bb10b8227c110aa5cc13070b03ad97e46ce907b9086cf808f7e79374f245f58b43a59
 EBUILD cbatticon-1.6.12.ebuild 919 BLAKE2B 0d7dee6c60c4e65013543bda36a041ae47f715802d29940ca6a83ce23710566f204eff86a414b631d9b3ebaba930885bee70155499c20d4e02e584e3cab56630 SHA512 4f7281ef2dff00519b386062b8a47a10923fcb1590e6fb3a5b8f21f72bf228c7f0b4f919d96b5e515768e4fa566d70e3eb23d1943471563b2653851d8a9d77fd
+EBUILD cbatticon-1.6.13.ebuild 920 BLAKE2B a4f9782978285a34fce6260fccedf089af7f34de790790eafbde24b1fbf38097c0e6ffb3a426a3606adf2ebbb5ba1c9a3002a79a52f400d1977d153aab21c574 SHA512 1edcef69dad8251ba25c026e72d0f3e1e6cbce2e961f01006081d5d1dee2d3d49b81875868ba97c986ac29c671b64ca7d0765ef36fd3ce450c91048198f1b099
 MISC metadata.xml 325 BLAKE2B bd1eee6610c7863dfb492da2f16af43ea5ad15e92dd80ab968339ebe25554b7be7783cb282fc16522ebdff1594869efd47d5bdf737aa355f559cf218784ae327 SHA512 16771648d8e8318b78412c7a14b733ed185761fc0ed804e3739ba39bc67848a2f8a64b52229670263ca26fdeb8bbe2a7ca09fbb136304dbbc7b94abe7f43530b
diff --git a/x11-misc/cbatticon/cbatticon-1.6.13.ebuild b/x11-misc/cbatticon/cbatticon-1.6.13.ebuild
new file mode 100644
index 000000000000..aec71acea6c9
--- /dev/null
+++ b/x11-misc/cbatticon/cbatticon-1.6.13.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit strip-linguas toolchain-funcs
+
+DESCRIPTION="A lightweight and fast battery icon that sits in your system tray"
+HOMEPAGE="https://github.com/valr/cbatticon"
+SRC_URI="https://github.com/valr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+IUSE="libnotify"
+
+RDEPEND="dev-libs/glib:2
+	x11-libs/gtk+:3
+	libnotify? ( x11-libs/libnotify )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( Changelog README )
+
+src_prepare() {
+	default
+
+	strip-linguas -i .
+}
+
+src_compile() {
+	tc-export CC
+	emake \
+		$(usex libnotify WITH_NOTIFY=1 WITH_NOTIFY=0) \
+		V=1 \
+		VERSION="${PF}" \
+		WITH_GTK3=1
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		DOCDIR="/usr/share/doc/${PF}" \
+		LANGUAGES="${LINGUAS}" \
+		V=1 VERSION="${PF}" \
+		install
+
+	einstalldocs
+}
diff --git a/x11-misc/colord/Manifest b/x11-misc/colord/Manifest
index a481db35f3cd..b1cf22802897 100644
--- a/x11-misc/colord/Manifest
+++ b/x11-misc/colord/Manifest
@@ -1,3 +1,3 @@
 DIST colord-1.4.6.tar.xz 1872528 BLAKE2B bf87ed1abe0a827ad81b5467847975d70e4cb83c1973fac3bcb1650875b7a0b375d48633bb1b01c7da1e8acd62cc4cf19f0efe9722e12bde3d8ec4833800ef2c SHA512 d55d3322199d0bfee74eee9e183c9246ec33e755f0144d96087acb3c43ab5a3d872086fcef9f29cdd2295be71daac703cdf90ad10bf183622fdd84347e7af123
-EBUILD colord-1.4.6.ebuild 3372 BLAKE2B 99ea22a56a05cc74df31fa9ab5d5a2ae96e64a1d02a9e222881b26526ebef7ea99e46fc28bbfdd64faef061acc68abff65e67ac76d95916ea7c84bb8d6a93b3b SHA512 f11cc6d4df3be39cf0ace0ffb2a6ec9b15d09f81df13161af1a4276a9a560106dcff0872d41df6cd1101d2377d6d3298d9cbf1b2c07bcebb41f76a9bc65e9735
+EBUILD colord-1.4.6.ebuild 3428 BLAKE2B 196073c29858e89849df51ace37c45c9bb5345f89731e86f3110efdb4ae485a2ba52d153d288e0abefa6eceff6091d5123e723a793f1a621f3587e9010d48f20 SHA512 c351ad27e2efbb8e7bcdc54aa482d58ad2aabdb4a2cfee7c7dfb6227c887c6d382fb73195442c2369e92f842e85431f332aba9c1fa00d899392e3c8f8041b87e
 MISC metadata.xml 459 BLAKE2B 6d8217206edfdae4ed92783b04004d62c6eed7c8d684ad6b921d44c8830fee2aeb5480de68fbbe78535e4825333b1c312bb70196e18102e62d696e26597e8441 SHA512 4f255205fc902918b48a3c653e5c732a117df2e5a8f7ce6e4a7517b03694e14882e484440fce98e9c4cc13aa62739e01666d969e19947a5ae6e3b37130260508
diff --git a/x11-misc/colord/colord-1.4.6.ebuild b/x11-misc/colord/colord-1.4.6.ebuild
index e549989e284e..6b1521b25a0a 100644
--- a/x11-misc/colord/colord-1.4.6.ebuild
+++ b/x11-misc/colord/colord-1.4.6.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 VALA_USE_DEPEND="vapigen"
 
-inherit bash-completion-r1 meson-multilib tmpfiles vala
+inherit bash-completion-r1 meson-multilib tmpfiles udev vala
 
 DESCRIPTION="System service to accurately color manage input and output devices"
 HOMEPAGE="https://www.freedesktop.org/software/colord/"
@@ -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 ~mips ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~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
@@ -114,5 +114,10 @@ multilib_src_install_all() {
 }
 
 pkg_postinst() {
+	udev_reload
 	tmpfiles_process colord.conf
 }
+
+pkg_postrm() {
+	udev_reload
+}
diff --git a/x11-misc/compose-tables/Manifest b/x11-misc/compose-tables/Manifest
index 39fef7e46d6f..aecf0793e1ad 100644
--- a/x11-misc/compose-tables/Manifest
+++ b/x11-misc/compose-tables/Manifest
@@ -1,9 +1,5 @@
-DIST libX11-1.7.3.tar.xz 1861304 BLAKE2B e0f647ef55567b1d7eff74bc053b8e73f8c696be6f233c2ff6f64dee65c1b40b746683ea7a6fafb4304eba4dec43301b4b3506e2ec6fac1d4c89d664b516bbdd SHA512 abc70837d19f7e104a5db1e6d2cfa1256625332c0b53fec44a0a39916a60a430bb53fd436207892aabe4199ac7a0f9287a06588fcd27e0eed54d45d67bbe1294
-DIST libX11-1.7.4.tar.xz 1872992 BLAKE2B 6a25e5008ead53be5af7411f51711789eb410473f9aefc49fb4d0bf7227b89c5fd71f0f61fef9bc3f83e585e4815644f42884d5e5cf0bdcdd120abe6fe8a741b SHA512 8bfaaf9fc3081c47152d533d30cdc0b2521bfeb088ff813b041c08ffd518c80ba3725bb68cac7c21b521a4bace546f99424700fe21955b498015d14c2f7f9a57
 DIST libX11-1.7.5.tar.xz 1853152 BLAKE2B 95ceccbfd37d8a749a533bdc03feba94236a47185a2cd7ad6592c534c17636906b735aa5800d810d13d3e342e3dbe281bb1f1f3ecab9d07e6a6a50f33beef8af SHA512 ef33e2f631226cab27657f46e1fd4cfc928f62f928d8297474e7b993017c8f92b60272eed6515990cdf3a9d34581837b7a3896e584f3546dd26f3790034df347
-DIST libX11-1.8.tar.xz 1782508 BLAKE2B 15a41cbcdb54d68cd54b6fa4147d55d277a6c091af7d38341ec261b42c547acf981270ceebec5abb3fcc15da5c1e05b7908114e157555f8184234922e3c05fde SHA512 64899ba9efbda00211daf08534a2a98eba86bb377980d21ce319106075cd36b511b17245d02e8ebd1045e7c2147f2c005004bcf579121138be7a7b879eeca83b
-EBUILD compose-tables-1.7.3.ebuild 943 BLAKE2B 859cec003f23b043e2271eab3aa31a01ee8ff66a7a78749ced99ff98d09eeb085497fe799138d5efa2a30f83f1097305a90ffa7caccf47bffbdfed72faa29e48 SHA512 2355bba44c7af1937aea4cc68248a96e38f9fd6188d85da7a755e344f4e3add63ae19db03409703b103ebb5045401b621a4258866ead6c79fbd1fb78f9e1e9a4
-EBUILD compose-tables-1.7.4.ebuild 951 BLAKE2B 450f86acb64044d49f6fd21d92a70a3997fd5fe96105aa2676de65737086d982f9a139764e6cbe32e9e0379ae5deca0a17f6e455c5129ed2db6b1c3756ee71ee SHA512 da3d0b1217ef9a2d7f786e99001de745659d5aba01cd9e4d316116972d411abedabf006f1020437b6657c188162088d5b4f02a2c1074e1c736b3fd51bb25c610
-EBUILD compose-tables-1.7.5.ebuild 947 BLAKE2B ba3b25accc28f59ccf7bf28547cf7442072f0590fdc6a768becadddf3f2141e67a91d5f547b6a70d53807f64b2c97dcc9a1761ac8e45111a7506bd88224d3eb9 SHA512 701264462fc7e27c62dcaf4502a82db1e12a5f859b0b281405b3ff17f14242f59416872c019b9f351f78da5fef61aec98c17844f8a59f9356a3aeadb5955453e
-EBUILD compose-tables-1.8.ebuild 958 BLAKE2B 10ca97660777f3ccce45c6f669885e43d970267cce91174caf69a7629e4af791b8a5b6bd311c98786542548eae52655319e2cca7a54788d14b9b53bb49f37fb5 SHA512 d2266d1488116a1d916b967b77676fe40f1ac619e469554075fbb0349b30aab0d98c431626d738ac48fa2771ac45b1fb881cde7a4d1708d0a1e1d36a688b24b5
+DIST libX11-1.8.1.tar.xz 1818460 BLAKE2B 7602b4d8c65ea3160f81096b4e022b5462e49d96b36dee70fe06e972329dc9d70bbd462e2079da03ba5647d7a72bf03e29aab23c60bcc206c95d770655622226 SHA512 2e36d2c47519e0cb2697f588c0ccdf73fbe75c2163f0855c78f7052dc9e920bca081f9d5e39c707a14067f101faef74fc758c8862eeba675b1535b43119d533a
+EBUILD compose-tables-1.7.5.ebuild 943 BLAKE2B 859cec003f23b043e2271eab3aa31a01ee8ff66a7a78749ced99ff98d09eeb085497fe799138d5efa2a30f83f1097305a90ffa7caccf47bffbdfed72faa29e48 SHA512 2355bba44c7af1937aea4cc68248a96e38f9fd6188d85da7a755e344f4e3add63ae19db03409703b103ebb5045401b621a4258866ead6c79fbd1fb78f9e1e9a4
+EBUILD compose-tables-1.8.1.ebuild 958 BLAKE2B 10ca97660777f3ccce45c6f669885e43d970267cce91174caf69a7629e4af791b8a5b6bd311c98786542548eae52655319e2cca7a54788d14b9b53bb49f37fb5 SHA512 d2266d1488116a1d916b967b77676fe40f1ac619e469554075fbb0349b30aab0d98c431626d738ac48fa2771ac45b1fb881cde7a4d1708d0a1e1d36a688b24b5
 MISC metadata.xml 312 BLAKE2B 297d68d5585ee7fe053a0b9d1e4758d1c8538fbfa6037cddfefa84f5b757c1c768d4ab072f6198e19c1b9bf4d21120440db61e5a9690cc6cfd387ee9d2add736 SHA512 4b5fc7ba8a7c24241e7ab5dd68677ccba15f5e89a76482679f18139faea4ff1555759066041afbf51c65d1870ec0d999a772c340f1e934a6aba0135b8da28d18
diff --git a/x11-misc/compose-tables/compose-tables-1.7.3.ebuild b/x11-misc/compose-tables/compose-tables-1.7.3.ebuild
deleted file mode 100644
index 884e98ec6339..000000000000
--- a/x11-misc/compose-tables/compose-tables-1.7.3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~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="!<x11-libs/libX11-1.7.0"
-
-XORG_CONFIGURE_OPTIONS=(
-	--without-xmlto
-	--without-fop
-	--disable-specs
-	--disable-xkb
-)
-
-src_compile() {
-	emake -C nls
-}
-
-src_test() {
-	:;
-}
-
-src_install() {
-	emake DESTDIR="${D}" -C nls install
-}
diff --git a/x11-misc/compose-tables/compose-tables-1.7.4.ebuild b/x11-misc/compose-tables/compose-tables-1.7.4.ebuild
deleted file mode 100644
index 4cdfc490b634..000000000000
--- a/x11-misc/compose-tables/compose-tables-1.7.4.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~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="!<x11-libs/libX11-1.7.0"
-
-XORG_CONFIGURE_OPTIONS=(
-	--without-xmlto
-	--without-fop
-	--disable-specs
-	--disable-xkb
-)
-
-src_compile() {
-	emake -C nls
-}
-
-src_test() {
-	:;
-}
-
-src_install() {
-	emake DESTDIR="${D}" -C nls install
-}
diff --git a/x11-misc/compose-tables/compose-tables-1.7.5.ebuild b/x11-misc/compose-tables/compose-tables-1.7.5.ebuild
index 681b98026ecb..884e98ec6339 100644
--- a/x11-misc/compose-tables/compose-tables-1.7.5.ebuild
+++ b/x11-misc/compose-tables/compose-tables-1.7.5.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 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 # Only needed by configure
 DEPEND="
diff --git a/x11-misc/compose-tables/compose-tables-1.8.ebuild b/x11-misc/compose-tables/compose-tables-1.8.1.ebuild
index 64f043d5d3e9..64f043d5d3e9 100644
--- a/x11-misc/compose-tables/compose-tables-1.8.ebuild
+++ b/x11-misc/compose-tables/compose-tables-1.8.1.ebuild
diff --git a/x11-misc/dunst/Manifest b/x11-misc/dunst/Manifest
index 921c2f9b0d5b..b69bd969cb03 100644
--- a/x11-misc/dunst/Manifest
+++ b/x11-misc/dunst/Manifest
@@ -1,4 +1,6 @@
 DIST dunst-1.8.1.tar.gz 4603941 BLAKE2B c694503087425a69eecd40e4e50c5cfe5e5d3e9525d259b04dacd7e2bc05ff188aad14a331c41e6ecdd91b7c43d87d5902662b8a510675f3450da7097b7da1e9 SHA512 bd8605844eacb24ec1beafbd62be1defa8ff9f6fc2e93a4746acaba483e86d0fa3937045c20dbba71c46310102d8878c8ec987a3081328b02a09d7f9fde974d9
+DIST dunst-1.9.0.tar.gz 4609222 BLAKE2B 4879122e342c1e518bca079bacd4ae769fd7da41db681230613c61531e62df94223757372c428c06710afd843200dcb78883d352f4e25098f0672b5c89ab0d87 SHA512 e43c960561d1f804c1d8f73f9376b33f61bf1ba5c5d0579c9875ef96da6522e214d5b74166ca3375dff1b4b0291b611b2d9ac1fb41fa8722db04c21e898824d1
 EBUILD dunst-1.8.1.ebuild 1593 BLAKE2B 74799c0e1bc5b2744fceeb7abb7cdd3c184676645d25efadc95a0ab2b2160322bc678aa379deeda7e3db96a1a128762a108a69e2f327e38a9592a0c547b2cb06 SHA512 3a86fa252c453dff714be3982a9d73386dd2b0e7caf08a06d8ec48b97a598562aacb77b76da23477e06fdedc0e36a4f0a6bc0263e32e01da2a4353da83fb4dd0
+EBUILD dunst-1.9.0.ebuild 1595 BLAKE2B 639d95fa131b6765873682fb4df0200ac07b6b96843470dd1f3924e7d8429ae33c70bbda3cfa5adaaa0776ab6d480af5306c4e2627ac31af5814c6be612d13ba SHA512 7572b08204d70de4128b1fda07bae60dfe1378f26e203527392e2ff1cb834aa5f1535eb6bc26dfc9600b0402c8106bcd8f69be8b7b6e9d889d35644211b8fb2c
 EBUILD dunst-9999.ebuild 1443 BLAKE2B e9ff7f69d40187ee07c60fcd8f5933e2b9e725f5976c08db922c7a91c2de6517e418786a89cdb70d342ec75c059d1865296905ed3eb01118740e3ccac8656593 SHA512 f4e7347f08df22c12aadbbf6288577627208905d3f58119fd3af31dc6e03e8d89bced59b0d2e893f972e96302601117142c02f542fe0a9ade529128474c0789d
 MISC metadata.xml 335 BLAKE2B a51f44edaf12235d9edf8f84d2df6d1a94ddd894075d708f0dfd4b3d289b0225797083cfe7c02a92688d23bb47daadcdd9751c6b740ca1cf0d69b9c1ab957b8e SHA512 7010391e438ab56478c3f2c0bd92afcbe9dcedb55ec89ee3af75c89365811af2b7f198bc64adae95de5fadd6603792d1d3fd60b46840d564a920c571d3c67e20
diff --git a/x11-misc/dunst/dunst-1.9.0.ebuild b/x11-misc/dunst/dunst-1.9.0.ebuild
new file mode 100644
index 000000000000..e3f5d7b97fd2
--- /dev/null
+++ b/x11-misc/dunst/dunst-1.9.0.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd toolchain-funcs
+
+DESCRIPTION="Lightweight replacement for common notification daemons"
+HOMEPAGE="https://dunst-project.org/ https://github.com/dunst-project/dunst"
+SRC_URI="https://github.com/dunst-project/dunst/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="wayland"
+
+DEPEND="
+	dev-libs/glib:2
+	sys-apps/dbus
+	x11-libs/cairo[X,glib]
+	x11-libs/gdk-pixbuf:2
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXScrnSaver
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	x11-libs/libnotify
+	x11-libs/pango[X]
+	x11-misc/xdg-utils
+	wayland? ( dev-libs/wayland )
+"
+
+RDEPEND="${DEPEND}"
+
+BDEPEND="
+	dev-lang/perl
+	virtual/pkgconfig
+	wayland? ( dev-libs/wayland-protocols )
+"
+
+src_prepare() {
+	default
+
+	# Respect users CFLAGS
+	sed -e 's/-Os//' -i config.mk || die
+
+	# Use correct path for dbus and system unit
+	sed -e "s|##PREFIX##|${EPREFIX}/usr|" -i dunst.systemd.service.in || die
+	sed -e "s|##PREFIX##|${EPREFIX}/usr|" -i org.knopwob.dunst.service.in || die
+}
+
+src_configure() {
+	tc-export CC PKG_CONFIG
+
+	default
+}
+
+src_compile() {
+	local myemakeargs=(
+		SYSCONFDIR="${EPREFIX}/etc/xdg"
+		SYSTEMD="0"
+		WAYLAND="$(usex wayland 1 0)"
+	)
+
+	emake "${myemakeargs[@]}"
+}
+
+src_install() {
+	local myemakeargs=(
+		PREFIX="${ED}/usr"
+		SYSCONFDIR="${ED}/etc/xdg"
+		SYSTEMD="0"
+		WAYLAND="$(usex wayland 1 0)"
+	)
+
+	emake "${myemakeargs[@]}" install
+
+	systemd_newuserunit dunst.systemd.service.in dunst.service
+}
diff --git a/x11-misc/i3lock/Manifest b/x11-misc/i3lock/Manifest
index 2422dfcfb0d2..5e21ce737381 100644
--- a/x11-misc/i3lock/Manifest
+++ b/x11-misc/i3lock/Manifest
@@ -1,3 +1,7 @@
 DIST i3lock-2.13.tar.bz2 149332 BLAKE2B 4b285fb3a27463f0d538d291134942a19933394c4c2d0acf27dfe5624a854cef0f29c5fc2e4ce4398c85ac0e6b774521c7daa65abedc0d38b0fd4897b2e6db88 SHA512 3a9bed3d14a2d59e641b3603448bb46d769104995b1c0239eca87d582e80e64dd8905b8e455bd5b0e635d4b37d7a87208d8de37253e9af799c65f4f8d396789d
+DIST i3lock-2.14.1.tar.xz 28756 BLAKE2B b38a3fafeebb5f8cebb643baeb875922659b556a5f919c2a837923e45e8f91a5f3ce297a424414ec9f05255e5888b91723617d837e5ffdbdf81aded42edc34cb SHA512 63b6bd73f66654fe52639434f7d3da64006144ec2ed685ba8683186730d4cc2c10d5aa66174f965030030243f59afaf6def3ff732f710ae441410218f84d6deb
+DIST i3lock-2.14.tar.xz 28648 BLAKE2B ef315c4d1175a692b8ea2ac1a6a9cefdaa642fc28cfcc28cbf0c637f9d0cf0ea47738447cf0d90c3c2f869819c178a416aabc44dbfe93ab938e48da2a0143d0a SHA512 85f755333739e61a8ac90447410c48cf54345740bb6c6977efa88500e2b66dfd7fe3338e4fe38f817773219e5994ef6375010fdb3cf711e2ad42045874e39e20
 EBUILD i3lock-2.13.ebuild 700 BLAKE2B 084d7874c12f5e311f7c02089aa59ce8126385a96c6afb77969f3bae51c99881d638cac22656bb1b6b12c6cf6fdd04a697da547471d7656f1a198de732024b2f SHA512 2efbdcf1fa1fbe01d78d18b2c55ef1afe4ba8f87393905837bbf45837036d7747b1630dd6a827fbba3a641c72fb09ca4574ca491b7d92b0a93f9f945d9af7bee
-MISC metadata.xml 354 BLAKE2B 7ac8f18c5369a061aa50ea7bb68419d3567f56c0880d4d9325325bff00f17c7b10bd304e8b79b481aa8bef4b3c7ab631b3d789191fe036fe6eeb65f39be5845b SHA512 a847af326d7e82d2d75859f10b9b4fd172a89f8edd425710aed88a430b2896ad53ff4a3f3283603dfeeb77f33e7d8138e8b0b0819c3e0bda6ae4b28a16681cdb
+EBUILD i3lock-2.14.1.ebuild 604 BLAKE2B 96124d476d035d0b81f73415d633e686a9d8101a5d7c11e8b29b18a212b3bb90aed079f6eb3f825c4b4d5b842b1771d5aa8ec0aaad188d935dc00f20ee38dfba SHA512 5909dcb00321b3ec34a6051cca6a1a933bd55122aaa6cd1f50b9e04334ae97ff5a1b91441b6195774939245461a51fd89042d56f144e7aaf4f54519897d5964d
+EBUILD i3lock-2.14.ebuild 602 BLAKE2B 28aca33b836be07f9178389adf70478cc1a696488e146e7fcd22312d7c12d07e5ad1bdc9cebb21e49bb769a87e4de5b484ef704de93fab1fb4f7d93f0e66fcf0 SHA512 03d5d8c8fb82bf4c56f277f63e8524eb8ca84c5986f4287aac14d2b11601d5dbbb43a82bd8f735f1be4a49b4184052b3f98aa7d0c7035313d0adf47c5e15f8eb
+MISC metadata.xml 428 BLAKE2B f85198563990c2c04b6dc2f8144e52641757c14808ad0c17fc622d3a0d5788bd0f4faf15aec0439eb74b549e369664b50074c9d6611f4f425b2050d1dad16281 SHA512 e96eb498c24e7a52823e03e688b5c9f2796618edb5a8f4e4cbd1883ab804ec6a3eca98d0adb62d466f56206e6342652acf26a0fe43c1ee3a227632c2592001fc
diff --git a/x11-misc/i3lock/i3lock-2.14.1.ebuild b/x11-misc/i3lock/i3lock-2.14.1.ebuild
new file mode 100644
index 000000000000..ac578fdbe9af
--- /dev/null
+++ b/x11-misc/i3lock/i3lock-2.14.1.ebuild
@@ -0,0 +1,31 @@
+# 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[xkb]
+	x11-libs/libxkbcommon[X]
+	x11-libs/xcb-util
+	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.14.ebuild b/x11-misc/i3lock/i3lock-2.14.ebuild
new file mode 100644
index 000000000000..29d754d62271
--- /dev/null
+++ b/x11-misc/i3lock/i3lock-2.14.ebuild
@@ -0,0 +1,30 @@
+# 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[xkb]
+	x11-libs/libxkbcommon[X]
+	x11-libs/xcb-util
+	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/metadata.xml b/x11-misc/i3lock/metadata.xml
index 249bd3e01081..808603e364cb 100644
--- a/x11-misc/i3lock/metadata.xml
+++ b/x11-misc/i3lock/metadata.xml
@@ -9,4 +9,7 @@
 		<email>marecki@gentoo.org</email>
 		<name>Marek Szuba</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">i3/i3lock</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-misc/i855crt/Manifest b/x11-misc/i855crt/Manifest
deleted file mode 100644
index 23bcf8de6072..000000000000
--- a/x11-misc/i855crt/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX i855crt-0.4-makefile.patch 351 BLAKE2B ef060908432899a333a29fe12d393d3d2d99d76d0619b071c0457b592c17edc0bf9af6f6994bfbcd73fdfd4bacd580387be1483e7a851ec88a38df532babb3b2 SHA512 41a96234b1864d04089c64a7859ec25f1388af519e107c5760954366d497a13dc6d623c5d26e870d52bcc8748e23b760662101a4205b2489aa002f25306155ac
-AUX i855crt-i915support.diff 2128 BLAKE2B 1fc795cafb494e084d2233bdebe74cb1881a9d14e2c78662a6ec4d7e24554734938a8f58cc723e2bbd4f70b5e2aa7080b13b7a2806291f9b5e934fbb5e3d9ea5 SHA512 96049b926a2007915bdaf71ba2252bb6556711d66b45eac69ee3223557e892ba8d742b520406a6f7fd20f3091f194015aec59613624abc1efaee5caad090caf4
-DIST i855crt-0.4.tar.gz 65209 BLAKE2B a7c8e041cb66cd711e1cdf7ac1ee0d6d218377b5c1183c11c658d3345de814a21b9eab0c4579c56db316a3b5fb3e430774174100f989c921e86650bc59adc1ee SHA512 8bd6d05334bcbe75f85c128ffe1179368fcf94bb0ba07c2ea7ce9b6ed38252ffc5dcd7a3208f6524be064bea595abda5a29f6a2960ad9f2f7b6f6ba528c36290
-EBUILD i855crt-0.4-r1.ebuild 719 BLAKE2B 47c38eb6e2af17e18d18c0c8432632abc63af1667f0dc86c9fe0c91d49adfa9936a92515465454baade689e8860611c5d1d56d9129ca631a4353ababfc03f34d SHA512 69dd89bc2b25da213a1fb33d0e19d99cf4b2e6ca28d64de321bce4dafdfd1fd77359e067211aca9fdd0c13458bda6be00ddc0a6cf668d0090e3c1d72607ee3bc
-MISC metadata.xml 413 BLAKE2B b34faa9cdea56299f3d481918b962a88ee55375bf847b06e37c0a3bffc7c60e0882e3140752a1af66044d04d36991ab23c780d2f7b5950f9f4101f78deda9bdc SHA512 2aae00f05bb0d6f6f78543ee549e282f07d1740b526a8855eead0c9afc393bb76b09b553c0ab5b8108b4b2059938073a595323666c73586a50e14e4955bdbe7c
diff --git a/x11-misc/i855crt/files/i855crt-0.4-makefile.patch b/x11-misc/i855crt/files/i855crt-0.4-makefile.patch
deleted file mode 100644
index e7deffb4d30a..000000000000
--- a/x11-misc/i855crt/files/i855crt-0.4-makefile.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -1,11 +1,6 @@
--i855crt: i855crt.o vmodes.o
--	gcc $(LDFLAGS) -o i855crt i855crt.o vmodes.o -L /usr/X11R6/lib -lXext -lXv
-+LDLIBS = -lXv -lX11
- 
--i855crt.o: i855crt.c i855crt.h vmodes.h hw.h
--	gcc $(CFLAGS) -c i855crt.c
--
--vmodes.o: vmodes.c vmodes.h
--	gcc $(CFLAGS) -c vmodes.c
-+i855crt: vmodes.o
- 
- clean:
- 	rm *.o -f
diff --git a/x11-misc/i855crt/files/i855crt-i915support.diff b/x11-misc/i855crt/files/i855crt-i915support.diff
deleted file mode 100644
index 5aea3a7dd96c..000000000000
--- a/x11-misc/i855crt/files/i855crt-i915support.diff
+++ /dev/null
@@ -1,70 +0,0 @@
---- a/dumpreg.c
-+++ b/dumpreg.c
-@@ -36,10 +36,11 @@
- 		(p = strstr(*buff_ptr, I810_DC100STR_1)) != NULL ||
- 		(p = strstr(*buff_ptr, I810_DC100STR_2)) != NULL ||
- 		(p = strstr(*buff_ptr, I810_IGSTR)) != NULL ||
--		(p = strstr(*buff_ptr, I810_CFCSTR)) != NULL;
-+		(p = strstr(*buff_ptr, I810_CFCSTR)) != NULL ||
- 		(p = strstr(*buff_ptr, I830STR)) != NULL ||
- 		(p = strstr(*buff_ptr, I845STR)) != NULL ||
--		(p = strstr(*buff_ptr, I865STR)) != NULL ;
-+		(p = strstr(*buff_ptr, I865STR)) != NULL ||
-+		(p = strstr(*buff_ptr, I915STR)) != NULL ;
- 	
- 		if(i)
- 		{
-@@ -89,7 +90,7 @@
- 	chip = i810_chip(&buff, &len, pci_f);
- 	if (chip == NULL) 
- 	{
--		fprintf(stderr, "No know videocard has been found.\n");
-+		fprintf(stderr, "No known videocard has been found.\n");
- 		exit(1);
- 	}
- 	pclose(pci_f);
---- a/i855crt.c
-+++ b/i855crt.c
-@@ -254,14 +254,15 @@
- 		(p = strstr(*buff_ptr, I810_DC100STR_1)) != NULL ||
- 		(p = strstr(*buff_ptr, I810_DC100STR_2)) != NULL ||
- 		(p = strstr(*buff_ptr, I810_IGSTR)) != NULL ||
--		(p = strstr(*buff_ptr, I810_CFCSTR)) != NULL;
-+		(p = strstr(*buff_ptr, I810_CFCSTR)) != NULL ||
- 		(p = strstr(*buff_ptr, I830STR)) != NULL ||
- 		(p = strstr(*buff_ptr, I845STR)) != NULL ||
--		(p = strstr(*buff_ptr, I865STR)) != NULL ;
-+		(p = strstr(*buff_ptr, I865STR)) != NULL ||
-+		(p = strstr(*buff_ptr, I915STR)) != NULL ;
- 	
- 		if(i)
- 		{
--			fprintf(stderr,"This driver is untested with your videocard !\n");  
-+			fprintf(stderr,"This driver is untested with your video card !\n");  
- 			return p;
- 		}
- 		
-@@ -493,7 +494,7 @@
- 	chip = i810_chip(&buff, &len, pci_f);
- 	if (chip == NULL) 
- 	{
--		fprintf(stderr, "No know videocard has been found.\n");
-+		fprintf(stderr, "No known videocard has been found.\n");
- 		exit(1);
- 	}
- 	pclose(pci_f);
---- a/i855crt.h
-+++ b/i855crt.h
-@@ -1,3 +1,4 @@
-+
- /* 
- * This is part of the source for i855crt driver
- * copyright(c) Merello Andrea 2004
-@@ -45,6 +46,7 @@
- #define I845STR			"8086:2562"
- #define I855STR			"8086:3582"
- #define I865STR			"8086:2572"
-+#define I915STR			"8086:2592"
- #define MEMSTR			"Memory at"
- #define NONPRSTR		"32-bit, non-prefetchable"
- 
diff --git a/x11-misc/i855crt/i855crt-0.4-r1.ebuild b/x11-misc/i855crt/i855crt-0.4-r1.ebuild
deleted file mode 100644
index 25df8327c91c..000000000000
--- a/x11-misc/i855crt/i855crt-0.4-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Intel Montara 855GM CRT out auxiliary driver"
-HOMEPAGE="http://i855crt.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-
-RDEPEND="
-	x11-libs/libX11
-	x11-libs/libXv"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-i915support.diff
-	"${FILESDIR}"/${PN}-0.4-makefile.patch
-)
-
-src_prepare() {
-	default
-
-	# upstream ships it with the binary, we want to make sure we compile it
-	emake clean
-}
-
-src_configure() {
-	tc-export CC
-}
-
-src_install() {
-	dobin i855crt
-	insinto /etc
-	doins i855crt.conf
-	einstalldocs
-}
diff --git a/x11-misc/i855crt/metadata.xml b/x11-misc/i855crt/metadata.xml
deleted file mode 100644
index 5e2d40ca2392..000000000000
--- a/x11-misc/i855crt/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-	<longdescription lang="en">
-i855crt is a tool to send the output of a i855-based graphic card to the
-external VGA, primarily used for presentations.
-</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">i855crt</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/x11-misc/icon-naming-utils/Manifest b/x11-misc/icon-naming-utils/Manifest
index a62bd3e91412..7825cf1e0833 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-r1.ebuild 556 BLAKE2B 1e93053e660eabf7fdec42aa26ca02474c87539430fccff7c1532749c924ad6bbda7c0e1565d5a4e6fee86a78bd8789c9169c1e0624d7a75b5fcda0004c43d76 SHA512 a6714ee91542825f68b4cc7fb0d484e20172e49c0d4ef8e1778af2ae6d21e4d47517e2f41577e3a1df5c3876505079478267e6ba5a2296f84b2379e427140ae5
+EBUILD icon-naming-utils-0.8.90-r1.ebuild 563 BLAKE2B 8d4a188b54dc1f2b106a0b67edc4a5203811ee8ef87b292dfa4dba7ba24188c48780fd17e214a83b7da65cb9b3a4fc8c768f40c8a58baf6b5ecd500998461f3e SHA512 d8cca4af1cb6a7c5046c79a20164e10c2c960944aa9800b8517477deb5daf6d42e1ccb8b355bb0380308c05921646c7a59f10693de824e37cb34ec799dc5fa29
 MISC metadata.xml 229 BLAKE2B 35bd897953d3051382021de0742162ed1a166c98224fec04fc54dc467dfe5492289b1da910ae9213259b20a0bd5bbffc041624ccb3aacc23b56de2c397861d7d SHA512 7340f6b8c0a938920b7940a288c212e868ae0d8cb18b97c028e6e959f72f94e35f37a2d864bb662fc1d01b43bd7b72efdcbcc5d48e700aaf8c845eb6b9d67fed
diff --git a/x11-misc/icon-naming-utils/icon-naming-utils-0.8.90-r1.ebuild b/x11-misc/icon-naming-utils/icon-naming-utils-0.8.90-r1.ebuild
index c9422f549daf..95e306517e7a 100644
--- a/x11-misc/icon-naming-utils/icon-naming-utils-0.8.90-r1.ebuild
+++ b/x11-misc/icon-naming-utils/icon-naming-utils-0.8.90-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=dev-perl/XML-Simple-2
diff --git a/x11-misc/imake/Manifest b/x11-misc/imake/Manifest
index 39cbf6abbdf4..d0644bb0882b 100644
--- a/x11-misc/imake/Manifest
+++ b/x11-misc/imake/Manifest
@@ -3,6 +3,5 @@ AUX imake-1.0.8-no-get-gcc.patch 860 BLAKE2B 712c3c150ddcc57fea50d8eda31933c0cb0
 AUX imake-1.0.8-respect-LD.patch 379 BLAKE2B 1b031fc8cbc884cd975b338f57ef9de554a67a426a77a0c4733f5b7bed990b7a2e5e59e524ea907c7b215b2232cf9674dddfa29974a90768487ddfa97399ac21 SHA512 1e5034209290387b3e0320f85eab876a5ed571896072c3da940e6fa13eb4a2ecb6b325104125738ae3502f420b5aaf00797ca9b71a832dcfda72a911df5e5029
 AUX imake-1.0.8-xmkmf-pass-cc-ld.patch 461 BLAKE2B 643264da121725cd2424e3e6d3dc7af05d9068ada3a53ca5b92f6af7beb17caf7eb7de5bc4187a7ebdfed508f242d13bcba9876533d2d7cc52dbd0f9c80ab701 SHA512 c73feb329adcda1f08051965a0ce0ba6031a8b8aceef19d10d11e475a603337da661ff4af72620924e1efb76ed9347fc0535b31ac3e98707aee298a36e715bdf
 DIST imake-1.0.8.tar.bz2 159398 BLAKE2B 2ea03a06daab883a35ac4ef5c5598db89c84b2bbc41105902f64ffaf66a2e5cebaa28bef0ee7d258eb7279eaa95671b8798701423cafffe87d8feced5bc1b63d SHA512 5352b0148664506c8eb7ba80f95fced146d150398673547ba0b2c7c966a382bc21de43dfb8e0d74e38a0a563f16ddbec48bf8c8e6daa1a0899a95403579d7728
-EBUILD imake-1.0.8-r1.ebuild 669 BLAKE2B fffeced6a323ac87f412a39b1da3b3f26790c5586ed263b654eb988e1d9744e3a6040dbf7db58790ce63c4511fe1fdf1b200e6ff6cb6d1c5681864c63ad24922 SHA512 4cd1af98bbdd444b4e7edad26221691641fb84c68d3574c871efeb997d52863155611d313aee6cacc3da7c34adacda434d04a89ccb7c1f9866529fce79f2c323
-EBUILD imake-1.0.8.ebuild 508 BLAKE2B 10f2fc16413dc09c3ad1022bee49e7ee54c0186836a821bd279520d70877fe37bd27b5cecc8591c346437b9934e45aea3fa272689e0aee99cb6aab33e6952dca SHA512 f37a1fae560be0236d4919d0ed7cd83a2a93504de77d266d732d89382d28f5f2dce6c526ddc1a5dbfda3b9603b0e4101db136de5e7bc18b8e3ed3fb74a7f9266
+EBUILD imake-1.0.8-r1.ebuild 676 BLAKE2B 9b48c875622fcb42052cc9b24e2b83f9ca52ba51013388b49666bf96cdce506417bff63b7254750e2815ce40c3e71f184ccf05b904db508b5eeba76c617abeeb SHA512 97a9f6a495354e3a32ecad68b7b3a6004e847d9152255a495bdcaaff42d18c98e4ea1ab27a3f68a359c177464f2f60184518d27b6413d94a04823c866ac9be7d
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-misc/imake/imake-1.0.8-r1.ebuild b/x11-misc/imake/imake-1.0.8-r1.ebuild
index 830b9e883a5b..b121c1a2505f 100644
--- a/x11-misc/imake/imake-1.0.8-r1.ebuild
+++ b/x11-misc/imake/imake-1.0.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,7 +6,7 @@ EAPI=7
 inherit toolchain-funcs xorg-3
 
 DESCRIPTION="C preprocessor interface to the make utility"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="x11-misc/xorg-cf-files"
 BDEPEND="x11-base/xorg-proto"
diff --git a/x11-misc/imake/imake-1.0.8.ebuild b/x11-misc/imake/imake-1.0.8.ebuild
deleted file mode 100644
index 0a444446e083..000000000000
--- a/x11-misc/imake/imake-1.0.8.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs xorg-3
-
-DESCRIPTION="C preprocessor interface to the make utility"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="x11-misc/xorg-cf-files"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-src_configure() {
-	econf CPP="$(tc-getPROG CPP cpp)"
-}
diff --git a/x11-misc/libinput-gestures/Manifest b/x11-misc/libinput-gestures/Manifest
index f99a599f3a26..f9ed620836e8 100644
--- a/x11-misc/libinput-gestures/Manifest
+++ b/x11-misc/libinput-gestures/Manifest
@@ -1,4 +1,7 @@
+AUX libinput-gestures-2.73-python-39-tests.patch 369 BLAKE2B c3157b64059679bf1e6f8e7ff24aef39032272f42d8f45d521c60c112afa33ed600fd05ee9dc6c06c7cc1c0c038ebd2991973df67c06bd7a88ea1cc7d269777c SHA512 ef0b9a72bcc298ca3a15d122a29ea8229efe338741a41d5bbd1d84680b893edf60a5605b9e777952be29198ce44629619cdbc9cf37fc8a41f9763a098f6679c9
 DIST libinput-gestures-2.56.tar.gz 26293 BLAKE2B b48a33c13efc63545bcb5ae722066493bd6aba083a07b1ebbf10eea69afa2a8f9d80a92b60dda3e8472a55851b70e84cf7c10e0bf3428c2278dd3ef5b6f65d0d SHA512 f215444dbe7e70ae137404beb25d5a60c5a618fb2d3d20eb9b4cf3f94cbc93a7e42a5fa82efdea082e2fa229c95d86c02df91c59f4a51c067e47ccf5dcf79fa7
+DIST libinput-gestures-2.73.tar.gz 28771 BLAKE2B 9f3c546b637b0038431517e2df5e3dfba4fbb7db708f108dd7a979e6674b2bdd44b2b877b5e200c05373a57bfeffefadfde59bc6c403f7188e349c2e051d8683 SHA512 8e46931c76541eb836b1bd79295f05fdc0e22091d1693eac1cc9c16407830806f9e56819e5fb8ba3eed7a26664946010d24d62d99131bcf71b1d8a3682f34ec6
 EBUILD libinput-gestures-2.56.ebuild 1274 BLAKE2B bf578943d51a96ab2acaa5fb1090e985345e51d4218c7d96718c5f589d785d5d94149f598f59f48f5065dad3a0650d5c41773d137eb3cbd0cab93596ad709ef1 SHA512 9b2d1c6fe8441430ce1cbcb7a22d22e74d0b3fee24162a18a844c3cdb751a2b18d5f13e25832d36d95268406cc0253f6d4433ec396921318885b800e2fef72a8
+EBUILD libinput-gestures-2.73.ebuild 1478 BLAKE2B f8a56533e6b8d4699f00b6ecf61f59587e81ace7545a10d2ee679754abe4b849efd6cae9ac5db0d2e3f9b0e8018273f006bca1e28f685007f19704992112a6ca SHA512 750fb0f3eca2c27966b6227e51875cd84afa2684e17ead551b2d8ca82a4c0601870e66c4baea838a9eb6904ad6a86880d00d4dc3d7d7dafb4678584ca73296b7
 EBUILD libinput-gestures-9999.ebuild 1274 BLAKE2B bf578943d51a96ab2acaa5fb1090e985345e51d4218c7d96718c5f589d785d5d94149f598f59f48f5065dad3a0650d5c41773d137eb3cbd0cab93596ad709ef1 SHA512 9b2d1c6fe8441430ce1cbcb7a22d22e74d0b3fee24162a18a844c3cdb751a2b18d5f13e25832d36d95268406cc0253f6d4433ec396921318885b800e2fef72a8
 MISC metadata.xml 856 BLAKE2B 92642eca2e06d1564b21c0ceebf435180829cdbc23937c815e55cb5cc71ca8514c5862704f04744a865dba3741102fa58b855487c441fb1e73b2d82ef023c197 SHA512 0038eb454c3f8f263acb75ea2b2840abc0cbb7174496b0832acbdc210b3182c14e0088b6eb3f5591e95b32ab837c6c98111c21494bb6d074418a9d493afc5875
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
new file mode 100644
index 000000000000..4d14f13f2b8d
--- /dev/null
+++ b/x11-misc/libinput-gestures/files/libinput-gestures-2.73-python-39-tests.patch
@@ -0,0 +1,13 @@
+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
new file mode 100644
index 000000000000..0335db2c4cf6
--- /dev/null
+++ b/x11-misc/libinput-gestures/libinput-gestures-2.73.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..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/lightdm-gtk-greeter/Manifest b/x11-misc/lightdm-gtk-greeter/Manifest
index aae344dadadb..5d46fba36a41 100644
--- a/x11-misc/lightdm-gtk-greeter/Manifest
+++ b/x11-misc/lightdm-gtk-greeter/Manifest
@@ -3,4 +3,4 @@ DIST lightdm-gtk-greeter-2.0.7.tar.gz 580726 BLAKE2B 1cb2a92a9bda0e28b718cf033ad
 DIST lightdm-gtk-greeter-2.0.8.tar.gz 583426 BLAKE2B ae06ebbc07efe5c0131c07b293671f24683699eb84f12222de8165428e935b98bbf9d1e107eaeca8f10e725a6a11c97d4f4c3d415ada0b0876b0b0a99f21d1ee SHA512 59cad69fd7f17b6a416944804be80f306ed51ee0c55826975c8564f432e8098043b677f6452e9afa290c6ef37ebdc632cd8b79e7a0a712a3407ddbf9f200b0db
 EBUILD lightdm-gtk-greeter-2.0.7-r1.ebuild 2078 BLAKE2B 5e4252ccc3d0fb4102a0f8741a051845cb9953b15004feeee6d62e22a6a385e3ee996da2ce4825e68312fa0bcb58be704e257643601bf9350e00d5d19b7689ef SHA512 8cb1c44379697de9f7328abb26ed83e18b3591dbc52eecd4f74ded1569f4daf44320d9d40dbe0cad547c4e9cccfdf5eecd9cbd7d79292172d02cb70426c989f6
 EBUILD lightdm-gtk-greeter-2.0.8.ebuild 2041 BLAKE2B 4b84db8a1c6edb6f1817b538b6ab847ecd3707281342c18fca289c64da86ba6cc05f71b3a80603d869aa330ac27d99cd48c4d70efd5f931fde259fa6f29bbacf SHA512 69f09610fcdc05feea59a2aa7a3e077c152943562d23cdccef991c60c1ba6f8df69298c2846ad6ba90f13b7b30ed9561bbda28fc1789aff74613e28d374fbaeb
-MISC metadata.xml 339 BLAKE2B 63990f6700e33a368327f6a3a57f39d21ee0423bbd8de4fcb3c5448804efce44c574dce94b71b08011434f02be917280e704b06b8a5dbeb7e4d39f5a8d21be6c SHA512 95f8a64b17ecdbd67629357b8bb387e11cc5ce6555095cc6681f7aa558dd5947dcf4b66a8bbd9ddcbb8973c75b163e7465d8d529b3ecb14c91e2c40df167101c
+MISC metadata.xml 255 BLAKE2B 91a1a039093410e3c236d602235372a2b32c591de8141640c0abc2082e6da3a9a39c514d7847ce17e181eae16a391d19b96e02c3941452a656ca4db893cdd98a SHA512 1ddf701539414534140fbffa9ab1aeaacfd466357ab70d1db32218264a5c59c9a0f372f5c175fb3f739c9fe1704f6ebf6da748c68f45d53278ddf2b664b79e30
diff --git a/x11-misc/lightdm-gtk-greeter/metadata.xml b/x11-misc/lightdm-gtk-greeter/metadata.xml
index d096279e93ef..9893b601af6f 100644
--- a/x11-misc/lightdm-gtk-greeter/metadata.xml
+++ b/x11-misc/lightdm-gtk-greeter/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>polynomial-c@gentoo.org</email>
-		<name>Lars Wendler</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="launchpad">lightdm-gtk-greeter</remote-id>
 	</upstream>
diff --git a/x11-misc/lightdm/Manifest b/x11-misc/lightdm/Manifest
index 3e7aeefac168..24a79aea5a6f 100644
--- a/x11-misc/lightdm/Manifest
+++ b/x11-misc/lightdm/Manifest
@@ -4,5 +4,5 @@ AUX lightdm-autologin 157 BLAKE2B 54ce42f09f88c793e90f5f21743e17a0184227b83c1119
 AUX lightdm.service 279 BLAKE2B 92a9602d1d1c10fedfabd58b0794a68a278939d905f4d790ea9c2a0632abe8238a6187b3e01b4296a1187349864b30291853889ceaa519f5a12a98b2aecbb1ea SHA512 5b60788e35ebd7918b21ab52dc3f5cc29dd3aa45ddf6cfe75a72d1c541620f0438378a9bd681e2c151a465cf981e803b399f61b48ff5d0f2e1a3cc950c30d23a
 DIST introspection-20110205.m4.tar.bz2 1220 BLAKE2B 01483c1a7b73568e01cc4d84b43c4cd946aaaac0b5fa13aa27805fa17297112bfaabb1c5a34bd83d2ecdef2033b622dbd5e63914baacb8f6edf488a7396d26d9 SHA512 5c49239935b93d86cce68b577b43d1a56d8749ab5747029bfcfa67339697134be24ef29ba6c3d133b8c03e867864637c8eb61491a4b7f6bb1e56386ed66cb9be
 DIST lightdm-1.30.0.tar.xz 509220 BLAKE2B 5b6fcc6b955d7a7eb3a810a7e28707a812810d7f2568d6985a4411b1bf6f06b35ff721bd8a9388a85a4e4a64a39f5e30e86a9dbaa6d344e898ae49e9f39785ff SHA512 bca25a0aa73caf7d51e5882889a1707d2527470a170658c1be98ecfb96c8f85fd616494fc5bed658e744f91b9f8b0a98d2a0cf42f9c030242ae470c8a27145ce
-EBUILD lightdm-1.30.0-r2.ebuild 4221 BLAKE2B 8a05099fede3ac9c02c47e22098959f22d2e5c8b264d440db985254a904eb64a4c949528fab3a0f331ad296f8cde949ac96c2eb17011eaf3cb7b2dd124a28b68 SHA512 852bf5029560db55d865e6992aae0d6ae23ac024a31a48638e385aaab9d970552c24019263b9238f1f2f392ae881fff3594674bfe92da863ab161570e157bae5
-MISC metadata.xml 463 BLAKE2B c15b210b5f35e4a206cea23ea6d2298dfe64e0ed8df7fdbab7db6499c3bf7c53ca11649ea0b46d638c53cfee7df254f0e9f12fc19e3ffee0ce95d97ebadf90cf SHA512 55fc5b894ba08617ae7968aaa1e9b8266bcecfaf7762a45e621a55944ac90f4523b77e420dbd7d06906d5085a8dedca6c73259f867036d59d68a0ef50f4cbb82
+EBUILD lightdm-1.30.0-r3.ebuild 4025 BLAKE2B b89c9ee87e4341ec91b392ad69cbec6be7ff561717952eacd5df3d0b1616bf1f711a81a7be2a53d2aa7db2595e05b67224b50acd67f2da39a072e795589a5775 SHA512 79385ec2c8c8052e728b2d2bd719e616202f4825765895baf8d8f6665fd72d538b54a3813e20c4fb558dc5596bfdd53631ec205248eef6038635289673900002
+MISC metadata.xml 379 BLAKE2B 5315c5fb7759be3ff41cc5cc6e285234e541cd4d419dc9feb46645e6571738f1e832237caeb7cea8eee91bcfd4e96e48bede1811855a82bfc37bd4ba21d0c17f SHA512 f91ef372c03842650704f7911bae2d7de9e322468ade243950b1195eb559d4ebfe71d5d14e3032f19a167505c3ef5cf96a765faa4a06f3c1d00bd7a65f3c7272
diff --git a/x11-misc/lightdm/lightdm-1.30.0-r2.ebuild b/x11-misc/lightdm/lightdm-1.30.0-r3.ebuild
index bd8fd0cb9b0a..5f13b6bcc1a0 100644
--- a/x11-misc/lightdm/lightdm-1.30.0-r2.ebuild
+++ b/x11-misc/lightdm/lightdm-1.30.0-r3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit autotools pam qmake-utils readme.gentoo-r1 systemd user vala xdg-utils
+inherit autotools pam qmake-utils readme.gentoo-r1 systemd vala xdg-utils
 
 DESCRIPTION="A lightweight display manager"
 HOMEPAGE="https://github.com/CanonicalLtd/lightdm"
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/CanonicalLtd/lightdm/releases/download/${PV}/${P}.ta
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ppc ppc64 ~riscv x86"
-IUSE="audit +gnome +gtk +introspection non_root qt5 vala"
+IUSE="audit +gnome +gtk +introspection non-root qt5 vala"
 
 COMMON_DEPEND="
 	>=dev-libs/glib-2.44.0:2
@@ -31,6 +31,9 @@ COMMON_DEPEND="
 	)
 "
 RDEPEND="${COMMON_DEPEND}
+	acct-group/lightdm
+	acct-group/video
+	acct-user/lightdm
 	>=sys-auth/pambase-20101024-r2"
 DEPEND="${COMMON_DEPEND}
 	gnome? ( gnome-base/gnome-common )
@@ -50,12 +53,6 @@ REQUIRED_USE="vala? ( introspection )"
 
 pkg_setup() {
 	export LIGHTDM_USER=${LIGHTDM_USER:-lightdm}
-	if use non_root ; then
-		enewgroup ${LIGHTDM_USER}
-		enewgroup video # Just in case it hasn't been created yet
-		enewuser ${LIGHTDM_USER} -1 -1 /var/lib/${LIGHTDM_USER} ${LIGHTDM_USER},video
-		esethome ${LIGHTDM_USER} /var/lib/${LIGHTDM_USER}
-	fi
 }
 
 src_prepare() {
@@ -92,7 +89,7 @@ src_configure() {
 	local _greeter _session _user
 	_greeter=${LIGHTDM_GREETER:=lightdm-gtk-greeter}
 	_session=${LIGHTDM_SESSION:=gnome}
-	_user="$(usex non_root "${LIGHTDM_USER}" root)"
+	_user="$(usex non-root "${LIGHTDM_USER}" root)"
 	# Let user know how lightdm is configured
 	einfo "Gentoo configuration"
 	einfo "Default greeter: ${_greeter}"
diff --git a/x11-misc/lightdm/metadata.xml b/x11-misc/lightdm/metadata.xml
index eb41c0a7d705..642cb44f22b2 100644
--- a/x11-misc/lightdm/metadata.xml
+++ b/x11-misc/lightdm/metadata.xml
@@ -1,13 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>polynomial-c@gentoo.org</email>
-		<name>Lars Wendler</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="gtk">Pull in the gtk+ greeter</flag>
-		<flag name="non_root">Use non-root user by default</flag>
+		<flag name="non-root">Use non-root user by default</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">CanonicalLtd/lightdm</remote-id>
diff --git a/x11-misc/makedepend/Manifest b/x11-misc/makedepend/Manifest
index b6c89262d6f7..cbb168d62967 100644
--- a/x11-misc/makedepend/Manifest
+++ b/x11-misc/makedepend/Manifest
@@ -1,3 +1,3 @@
 DIST makedepend-1.0.6.tar.bz2 147616 BLAKE2B 6e9538e435d602ab3bcfb35a5398d6f11a23e4c9fa19bb2e3f651967d3fb1945557af2a5d84fae3e46112aae9ec411894cf8605e4856a46b120b660ff4b95ea4 SHA512 eb0e8ee8ab7515806d7d98a060cdcd392ec38e4225e5e05db26daa6651f185d0b764aab403edeea904d4d23211b1f7db20daeee6eafce8abe65225784ed0aa42
-EBUILD makedepend-1.0.6.ebuild 396 BLAKE2B 24199bb7b4b1ccf11fc4306399817e836b064174db8b90556f5c80e70a3bba892c0c707b593fb1f2f4a5aaa329595a77c8ea76d6e0009bf2214f72d29ebfa912 SHA512 8d3411f9713b42e92546eee157c7b8ac5472d1aba6a43382053a6766a76d11eff9f70b172533dd9797aaed9fac2be290b168b12e0de53f787c10e9ffec5b8d80
+EBUILD makedepend-1.0.6.ebuild 403 BLAKE2B 74a1bbc478bd21b67b23cd250d6537aff7be94916f1249fe8da5f37afa5a6e66858a0d60ec4b122affa349ee66e13ff78619ee42ce658593d8ea8ca6110b6afb SHA512 6486ab09ad4a850802bbe4f3dc61ebdd92c462098e43d6cb67a2a830d42a11cf23b3f01794a0900450479da210bc96cd18920abbd609cf8e406a06c3c7a3816f
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-misc/makedepend/makedepend-1.0.6.ebuild b/x11-misc/makedepend/makedepend-1.0.6.ebuild
index 6b6e9c2882e9..ab0b176326a8 100644
--- a/x11-misc/makedepend/makedepend-1.0.6.ebuild
+++ b/x11-misc/makedepend/makedepend-1.0.6.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 inherit xorg-3
 
 DESCRIPTION="create dependencies in makefiles"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=""
diff --git a/x11-misc/mate-notification-daemon/Manifest b/x11-misc/mate-notification-daemon/Manifest
index 67b65fb89542..dfaf90c584cc 100644
--- a/x11-misc/mate-notification-daemon/Manifest
+++ b/x11-misc/mate-notification-daemon/Manifest
@@ -1,4 +1,4 @@
 AUX org.freedesktop.Notifications.service 94 BLAKE2B 1a97aac2db9c803c9e4babf9067283b564a1eecb1d251aee3a5e66b8a4f63d2554e3e09ea06749383ce3d5b8e77c8cc3bd87ae2dde48ae8feb4886ecaf7a3c27 SHA512 0575cbfc094455c0a2f04faa534a5e0d9cc41e6d9566ab9bcb0fcbce99e142213ded786ad00c36dc434ae1b9208d34d234a341dfc86adb72925dad0ee2b25f97
 DIST mate-notification-daemon-1.24.2.tar.xz 396156 BLAKE2B 64bbada24bc53f296076ff80b364e156fecfe28f4b1d8b77a0f05910939ccc2378e0635861442cc5cff8c95db5ccda55484de8aaf3315e28eb8df75c1a4bc20d SHA512 be9db249bec6dc2206d69998b972f06ab4e2ee5c30b5bcf44c43b508954a9984a37bc9a2fe9989aec55969492256ed742fb2a9618b751e47ff43b66c383c1bd4
-EBUILD mate-notification-daemon-1.24.2.ebuild 999 BLAKE2B f13e99f367d74a4e4960161cdca6912cc598db283f61e71d74c16dc81d7c64ac112e649e242c0235618c0528e127982b402050421b11e5a99f00e3ae00e446cc SHA512 4c1233930436c1221893234651763a45c495ff02427db7e70ebd7f44ae0b0f28637489ed050b98f19deb34f435a0f078abac5ec56c3c13a69421d24e79a8e0b4
+EBUILD mate-notification-daemon-1.24.2.ebuild 1006 BLAKE2B 315c7f21e75b86bc4632ec922d721bd4e78bf2146316cf7047a8334245589705b6f023543490e8141f6f292006e3f37cfbf693592730f344369906c7e3e103c6 SHA512 ba1f70af4c38f6abee3c14db72889ca206bceaabbb7ac3824b9848d15bad54d4d6f40cfb227e073f83a6d660770f9bbdc51fe164c321dc1a0fd96a878e0231d2
 MISC metadata.xml 354 BLAKE2B 1a12ca172c08806c1c9d2bbd6b2342fcbfde32b800af7bac33746f0611bb6c4376d558ad8b4a69008cc8ce78207246778d894e3454b52c1483606aa4a93dc05d SHA512 fc721d4464481caf4112d0d09f3a3243f31ce2cf97430c7d638728d8461f60e5070591f9698983b06b78c748bca563fa0ece998032a724cf8257bf72213ca492
diff --git a/x11-misc/mate-notification-daemon/mate-notification-daemon-1.24.2.ebuild b/x11-misc/mate-notification-daemon/mate-notification-daemon-1.24.2.ebuild
index 0cfababe83cf..1c0ecf0f1800 100644
--- a/x11-misc/mate-notification-daemon/mate-notification-daemon-1.24.2.ebuild
+++ b/x11-misc/mate-notification-daemon/mate-notification-daemon-1.24.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ MATE_LA_PUNT="yes"
 inherit mate
 
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~loong ~riscv x86"
 fi
 
 DESCRIPTION="MATE Notification daemon"
diff --git a/x11-misc/mozo/Manifest b/x11-misc/mozo/Manifest
index 2bdf6044cae5..c2bb3cb8ddca 100644
--- a/x11-misc/mozo/Manifest
+++ b/x11-misc/mozo/Manifest
@@ -1,5 +1,5 @@
 DIST mozo-1.24.0.tar.xz 228180 BLAKE2B 6eb880b82dcb608f84efd8df74e77812f9da68dfa877ec896c6f04fa18088e8e4a82641c715e3620201dbb8a1bea8bb4ded09dd72f50770edae09c1326cbf453 SHA512 e0d217d2e7bb7d2c8df777e51bfb20e8bf4fa1bee0f9f3a9348ec1c8501b386a4afbd8848735ecfa61a0f9576382d784d3ef5b884a2a34af6ba33d3a126fe193
 DIST mozo-1.24.1.tar.xz 231032 BLAKE2B 27938aca9810943d19074cc5761ac58bb1dc2c1918b2fefea983f7a1b8788cb555311555515bb4387944c7b48a309de4a80da9003d212ca68ea257fa9ab06c8d SHA512 04b7e93e7302b46a3959f78655de4a6f8b17896be2c506c0e8a9041a9a2d5247e8c2ac00b5c8f86616f6c39a533584923feacfe4b81ae58d41080632af2a24bd
 EBUILD mozo-1.24.0-r1.ebuild 1307 BLAKE2B acf75c22dbb51658cd2b55181fa06fc06fd8f036c07fab1cf650493421bc75ec38a8c0a4a3b012550e930fd60852767fa082b6606a5404ce986bcecfe32c9295 SHA512 8fdf294cf0e25176495868fec89c4d4b97a0cea9ee8d87281563c6e83aae51cc98c261f31b8c2381cff560b9d7de002a5eb011fca1192b863790d6b977d2f9bc
-EBUILD mozo-1.24.1.ebuild 1329 BLAKE2B b79acb8cbe29e6db46fc3df72775a744e43e5fc13fc5e6ff3bcb2f926d527b4624f894471d5ca9a72abb94b648319ddc86cb31828af5491fa608fd32c3c70adc SHA512 8b7a52bdb0015ea9eadb6d7eda0c7e5b089328d669916adfe9e4e457a911f146c64a11459b60cf3c77aa026495c7a514027f008bf802eb797149e531d34c0fef
+EBUILD mozo-1.24.1.ebuild 1336 BLAKE2B ba95912d03cc6a9e9ea90342e47b2ed5a4fca3d89d8d670b5a2bab504af15669beb4be13c6c53999b1c197d5172263dcce86c233828496b56537a99626c06157 SHA512 f6e66b623c9447304615f532e5cdbaef7492562fb390316a572355cf79e4878dc626014da31420017258a139a2848e16c189f3d9d0590a41aab57af84ce81257
 MISC metadata.xml 334 BLAKE2B 2d3b282a39f97386fb0986f460903c132a59464c1f408bcf1e081198aa07ff38cdd50fe460d2bb20a2dd17ccd6a6d7e49b31d5615b892591466a019001bd5727 SHA512 d04ccb64388d150947f281085fe3c70e5285d56518eb6359bb81d533fbaf2a44aee23e2d3f04896bbe15df07a5260a688949ed8505b9c87a857fc0882a425d74
diff --git a/x11-misc/mozo/mozo-1.24.1.ebuild b/x11-misc/mozo/mozo-1.24.1.ebuild
index a480aef67ab1..eb4001283a50 100644
--- a/x11-misc/mozo/mozo-1.24.1.ebuild
+++ b/x11-misc/mozo/mozo-1.24.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="xml"
 inherit mate python-r1
 
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
 fi
 
 DESCRIPTION="Mozo menu editor for MATE"
diff --git a/x11-misc/obconf-qt/Manifest b/x11-misc/obconf-qt/Manifest
index 614e322f9205..e5cb688c9b27 100644
--- a/x11-misc/obconf-qt/Manifest
+++ b/x11-misc/obconf-qt/Manifest
@@ -1,3 +1,5 @@
 DIST obconf-qt-0.16.0.tar.xz 101588 BLAKE2B 94407df40878c64a40343ad2a8fdbebc78a99beaf017485fda52d6043f2597467c67da465dd191a78ba7c084f1072152d4033f7b5b41f257946941efda37a9e3 SHA512 ab0ddc013ca877f2434da956c314b248f6a7ef5ced1e5c605de0652d0b8c5c0e84f1e6fdf8b21c6f3d450d57a1413d625d0a31b84cac2c9062dc0f101d8e57ab
+DIST obconf-qt-0.16.2.tar.xz 111080 BLAKE2B 1ea6d4f5afb3e34db288bb1cfeb0c76345704b592230ebbaaff464206b13b9dfde7ff0ae07dd164e1d925e93e51a9a9bd6c571f55b81f3bbfc1537bfa620f521 SHA512 bd91a5669f07471966d296b91d78e2a40e2e3640405de2179513457088eb7d6cb063dbfaff623db6f404985734e986b52c1e3155a050f374b7afa58f7d720c0d
 EBUILD obconf-qt-0.16.0.ebuild 913 BLAKE2B dcdee80f21be6bb89d153fba1413fe68b5ee81fae861c6ee9f072e2780dcefe59fc39cb62e98fa366050b467a00bbde7322507f1df766e4f1f30aa3fc140315b SHA512 340a790c07b20dd43e8230be514a49a563a732b98eac8383ed1779c62b39b8e6bc14585ca674dfa757bcf6041a59f785728493e9680d8c86874592d1e097ff37
+EBUILD obconf-qt-0.16.2.ebuild 901 BLAKE2B e7a5c0069a25e1dfd1089fd0b9b058348db5ace312e77e51c8c12dd0a195eeb096c41f30bc637f7021d27cf275b084e433af495455ea070fd10e4a854e26360f SHA512 2a91fd3f40e75f9a32c328feaeafb46c64d4492a0d252ec439c85ac582fc1e063e4142bb477404b0d87147526e9267cd9d9b4f7502080c45d4c54133cade6103
 MISC metadata.xml 316 BLAKE2B 9b71d1001cc8a66e8da08dc913fb593c581ff9946c5dc84cf451bba57d7f65e2ea5ada3a39af35618cbe6345293e158be54c771e41adff450ca09fdcec1355b6 SHA512 323aa61ec8010f32da3af2debc2684810e82b97816f1e7d11b3a0d8dffd164196f3cec1e56cbb6ed638913a5223354b42ab038a120110c21e9ffc2fb36cd47f5
diff --git a/x11-misc/obconf-qt/obconf-qt-0.16.2.ebuild b/x11-misc/obconf-qt/obconf-qt-0.16.2.ebuild
new file mode 100644
index 000000000000..304842737a29
--- /dev/null
+++ b/x11-misc/obconf-qt/obconf-qt-0.16.2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake xdg-utils
+
+DESCRIPTION="Qt GUI Openbox Configuration Tool"
+HOMEPAGE="https://lxqt.github.io/"
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-r3
+	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 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+fi
+
+LICENSE="GPL-2 GPL-2+"
+SLOT="0"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+	>=dev-util/lxqt-build-tools-0.8.0
+	sys-apps/sed
+	virtual/pkgconfig
+"
+RDEPEND="
+	dev-libs/glib:2
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	x11-libs/libX11
+	x11-wm/openbox:3
+"
+DEPEND="${RDEPEND}"
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/x11-misc/pcmanfm-qt/Manifest b/x11-misc/pcmanfm-qt/Manifest
index bd92e1d70b22..c85ecc06f086 100644
--- a/x11-misc/pcmanfm-qt/Manifest
+++ b/x11-misc/pcmanfm-qt/Manifest
@@ -1,5 +1,7 @@
 DIST pcmanfm-qt-0.17.0.tar.xz 296000 BLAKE2B bfe6a7ed701d375030c8a20fca3a9b1076810c426388e03644bca0a0482f5b86ac784e197463c7316514e78fe72ab360c73df75cb1ee16dc22a2fe313d4f9d01 SHA512 6de9083b90a2d06db892941e50dc9817e1ab8cf5bab80e331cd083c4756b7ede1207ca35fc1fc43b81b52651acb57dfd85953ab8f8deef2a2c0d362374726daa
 DIST pcmanfm-qt-1.0.0.tar.xz 317624 BLAKE2B fc66a21b9cc4c0dc9cb9b06ef757faa0a268c5e1c4dfa5765128b1701a051178a3f76d3132293fa7479eee7aad1398f863742489fd5aa64a1dc31c558a195463 SHA512 66f8badf47f32482f880009e24b506ad409ac4a939d4cbc0b6b9adf29874a6d76e5c154e5611329007485fe9c34985be7f67a1ec769ea0e0a107d16d48f2fd7f
+DIST pcmanfm-qt-1.1.0.tar.xz 331652 BLAKE2B 055660b841feb1cced2ec8c67493e0db9656825c4925e5699c27904ed1c7c6483bc1fbba98838c39a2e55fb4b8cb0a67bb2e8eee58fab6224448ad9300dad0b6 SHA512 b453b56bd10a94b6c4cbf6e999a470208c7817384f3868ef230a65d39ff3b1e2b2e6db8c08ca894c4e226288efd38dbdddeb1294fa4f8507836cf84594b956ef
 EBUILD pcmanfm-qt-0.17.0-r1.ebuild 1120 BLAKE2B af25db71e7dc32d0c5c4a28c5f61081da34ba78ffe239399763acb1e51b3d929d34ccdecbeaa10ea8b3c92483e0940f73b0f3bc287a5233bd93ed9603d8638b8 SHA512 9bf9a8113e78b2774561971c680ff94a8cd6733928b98840beb84bccf25156c6bfafee37bce3bf7555923453c933037269e4396aed3be879262aede5b4a27c94
 EBUILD pcmanfm-qt-1.0.0.ebuild 1184 BLAKE2B 06935e907fc1bb7bba8eebb64f710ad331a94e6eb7fff2b151434d8635208a308442778d04d9df48475b196e5676a172477820949c7286bc3abdbeaea863fedc SHA512 6a804a2d1f69bc11e377a51a22831cb7ed12dafa4f700e527ec65dbea2df03c60d9b4a67288510b43c2efc39376c9c5c90108ce2e91b85c6a37c302e6dd09772
+EBUILD pcmanfm-qt-1.1.0.ebuild 1194 BLAKE2B 290531c2a11fe587bb2159a3eca42e89aa07c13db09cfd98f964e71546ed86cc479c00bf6fc0f7b7e1fa7289ce0a555f750f0e4d534b15fca0e484f3572e70c7 SHA512 1052f3dd636b4893b0a6c1e7a4763490b1fba4c3b00b7023129dfe4951d69b00cefe495175e9ccc809ae602a356a710dfeefad99c422aecd4fefdfc7e63a8228
 MISC metadata.xml 317 BLAKE2B 2d1773f0bd25bbd367f590a419615c5016ad850906f9a5858a6091109c359e9c677e2c58de2df9515dff7c1e2e659fd80e10b3e7ea605b5035c939790aadc4d6 SHA512 e91c385569fd6309b842e62b0303d4dc5ddb8721e39c9f1d22956c340c776edc940b727312f3307d8bbb6d5fd3459e410568c3170adc94bebc53e2811146fa7f
diff --git a/x11-misc/pcmanfm-qt/pcmanfm-qt-1.1.0.ebuild b/x11-misc/pcmanfm-qt/pcmanfm-qt-1.1.0.ebuild
new file mode 100644
index 000000000000..4f99a625adb9
--- /dev/null
+++ b/x11-misc/pcmanfm-qt/pcmanfm-qt-1.1.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PV="$(ver_cut 1-2)"
+
+inherit cmake optfeature xdg-utils
+
+DESCRIPTION="Qt GUI Tabbed Filemanager"
+HOMEPAGE="https://lxqt-project.org/"
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+	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 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+fi
+
+LICENSE="GPL-2 GPL-2+ LGPL-2.1+"
+SLOT="0"
+
+BDEPEND="
+	>=dev-qt/linguist-tools-5.15:5
+	>=dev-util/lxqt-build-tools-0.11.0
+"
+DEPEND="
+	dev-libs/glib:2
+	>=dev-qt/qtcore-5.15:5
+	>=dev-qt/qtdbus-5.15:5
+	>=dev-qt/qtgui-5.15:5
+	>=dev-qt/qtwidgets-5.15:5
+	>=dev-qt/qtx11extras-5.15:5
+	sys-apps/util-linux
+	virtual/freedesktop-icon-theme
+	=x11-libs/libfm-qt-${MY_PV}*:=
+	x11-libs/libxcb:=
+	x11-misc/xdg-utils
+"
+RDEPEND="${DEPEND}
+	>=lxde-base/lxmenu-data-0.1.5
+"
+
+pkg_postinst() {
+	xdg_desktop_database_update
+
+	optfeature "mount password storing" gnome-base/gnome-keyring
+	! has_version lxqt-base/lxqt-meta && optfeature "trash functionality" gnome-base/gvfs
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/x11-misc/pcmanfm/Manifest b/x11-misc/pcmanfm/Manifest
index 70b4f09500c1..53d5ec03d26e 100644
--- a/x11-misc/pcmanfm/Manifest
+++ b/x11-misc/pcmanfm/Manifest
@@ -1,3 +1,3 @@
 DIST pcmanfm-1.3.2.tar.xz 424236 BLAKE2B 7d13383cd2b61905bdf14b4b4df8c3d8043a340b597f4d43e40148f61451f82ad3ca36c4c199d81a41dc7e07dde6ed5832aeff985112fae352bc49e873bb67a0 SHA512 bcca1af20500e7a84ebfe5f1efd5a1a2945d32ad3ea5fa945ad908794c56614bd85921fac1e7a3b2fc5ef82267d5d3ffc5ad7065e9878a920dd578cb830776c9
-EBUILD pcmanfm-1.3.2-r1.ebuild 1186 BLAKE2B f778a3d528700b1ef9726da094c0bc73de722b72e2958971ed7b8cd0500439813b0cfa21e195c37f46faf8d9a9042779bbfdbb9a208cf3a9b2a06ec426ff996e SHA512 cf3eb25101ba8791c7daf5e9dc9df5b0ccbe09de3454e94309c7d2a3686186dbccae9dc43cb9e9d4878dc209eadb06e1133b727bc8f961ec3c093bf1ce825e66
+EBUILD pcmanfm-1.3.2-r1.ebuild 1193 BLAKE2B 7c1caf0a589220c475c65585673942ea1b4bfbba51af7569cf4b1aadf77a3fc3bdf32aec47832f11a4446324346102c0a1f74f86a167d1e65740e80bf848a1f0 SHA512 baf499e72c7abe894a77543599b5eef9fab00b716a4c14223c9b91ca358b878a2d38d781b384606f9f12b7d9293f28004ab804f46169525e1211c680527fdd62
 MISC metadata.xml 250 BLAKE2B bd1126fade83da0e648521af7389f595f18d6ef48a1374da6f44b0e941731da517eb60142b7247a813295d8bccdd08a1d8a3005fb833e3bb8cebdbfa95f9171a SHA512 786fe26cb0f4eb45c5309a32675da7b94837add83f2295145469c5d1e584361fb6a5d5d56f8a46546110d33c3a05eb4fefb982a8a9f1ab858506ef0a42ecfd0e
diff --git a/x11-misc/pcmanfm/pcmanfm-1.3.2-r1.ebuild b/x11-misc/pcmanfm/pcmanfm-1.3.2-r1.ebuild
index 1ddb63ffbf8e..bdf7b0c31bc6 100644
--- a/x11-misc/pcmanfm/pcmanfm-1.3.2-r1.ebuild
+++ b/x11-misc/pcmanfm/pcmanfm-1.3.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~riscv ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~riscv ~x86"
 IUSE="debug"
 
 RDEPEND="
diff --git a/x11-misc/peksystray/Manifest b/x11-misc/peksystray/Manifest
index ff551bf32f29..35010070209e 100644
--- a/x11-misc/peksystray/Manifest
+++ b/x11-misc/peksystray/Manifest
@@ -1,4 +1,4 @@
 AUX peksystray-0.4.0-asneeded.patch 798 BLAKE2B fa17b9f091ccb94dc11c6086bc1bf648b08b4da3e192fa1998f09375e747cab854f25b72614998ec5289e2992ae1dcbd06dc47ffce5acb299bb4106dab35863e SHA512 d3f4c392d38b2e0f143d7e7dfa7a12ecb82e8d93f6651e254ee17d078487f6d95316f88d66a125ffc25abd2574a053f9a2b0e946bbba7f8a7d5b12903dbc8f21
 DIST peksystray-0.4.0.tar.bz2 73810 BLAKE2B 4ac452f14acff5afb8e14fc07a18d5efe6b68696c7063d8cd337c14b9bc0cdcb573ff830f9cc7e3b7057154a3e2a179da26977696101fbb56750320a3913b3d3 SHA512 9dc5d1df630b7447575011e971a9657a5987bdd6098c81444b7579c46bfd7747f4df18fa00376e70b046c52ae7ca95d6cb66ce8a57070795f2f8d497fa025341
 EBUILD peksystray-0.4.0.ebuild 548 BLAKE2B a8201e131aa174c0e96396d4cf7c5b34548ff97452d1d4cb3face3e6b53e709c6cdda2f87ad5892649bc9d1abc67becc40ad776d4c64c1d925d680064ac74bb1 SHA512 a9b852334d16abc9e563a24333bf61908714fad0bf303af6809145fe2a8f665fe1e2302c781b89bfb61bcdd9c9df56727997cb5684196ee628d32bc19fcade14
-MISC metadata.xml 301 BLAKE2B 95cf59d5606f96ca223a2a4a4e8e8dfc05eeb618cd24357b40fb01bd8806ad38928c4cee2093f403386f9ce695064363dd2495d0dc2f930ffde209d2397d7a9b SHA512 7f68421bf2fe6209d63c364a772ae1f30d40607a4ef328b2cb2cdeceb2a5896d510dad37c56ca559cdfdebf7d89dbb9cfd831f6cc402d7d5e96bce5eb57179fa
+MISC metadata.xml 248 BLAKE2B 31a7f14c543cda37426827bf2a5f0a05686a290ed39b16298143613e4d9683aa9f271ca1d8292cf9a428b515f082eb5005635776caed179cc92c15130ddfe6ae SHA512 fa6ca4ad39fb5a5fe147af685d9a457b5a2cee0debe0d8426ffdbd2a4e4b32776479008e06bff5888ddfcaa466c339284b9665bcaee9d8385f39da2a8149b39b
diff --git a/x11-misc/peksystray/metadata.xml b/x11-misc/peksystray/metadata.xml
index 20fad93206f2..786486b128da 100644
--- a/x11-misc/peksystray/metadata.xml
+++ b/x11-misc/peksystray/metadata.xml
@@ -4,6 +4,5 @@
 	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">peksystray</remote-id>
-		<remote-id type="freshmeat">peksystray</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/x11-misc/picom/Manifest b/x11-misc/picom/Manifest
index 769e4139b5a7..92780cee0664 100644
--- a/x11-misc/picom/Manifest
+++ b/x11-misc/picom/Manifest
@@ -2,6 +2,6 @@ DIST picom-8.2.tar.gz 242653 BLAKE2B 1c76ad4b3152d47155f957f8f1e75447ec8e30d05bc
 DIST picom-9.1.tar.gz 263924 BLAKE2B 093f2fe12f3388b7979379d2e2b695a779cc9ebf95cbfa5b4f39c4fcc7cd6fc82be662bb9b0355fbadca66c0b0d7ac0d1e463272b0dbe4bbcca985691b6255e9 SHA512 375dc245be1c0f277bc0ddfc6e6480255efba06ce49f953c5314b7ba9795d1f50c5de907762208becc13c5210f24ac5b2241e2eb5e0e10dc5e5b96081cc821df
 EBUILD picom-8.2-r2.ebuild 1578 BLAKE2B 48e668b21513720af93703cce7049d30d26346dded57115f9e8322dfc38e54f479d21e1a811eb2d447abeb6c60a2a7932a9971843af4bee3c2cdb6ae740660e2 SHA512 559063fce7ff4a4a7c4dd07d2f604df379ff7d7a9cad58d99ab988df96723678d68bfee40ec7ecd800544f783779d7fda9cf2387655d3bfb2b16e8e5a13522c9
 EBUILD picom-8.2-r3.ebuild 1580 BLAKE2B c7eb545bb9480b317e9c7fbd814b04f3a1a0b790b39c9b3c122e45fb7f61cf96d1838a7394a46a7fc438f58d72b4554bd14b170ee6c069a0c64bea98dd7e05d1 SHA512 c8bffdafb439c86939e7c383db127fb0342503bf26ac7db4031f18b5bb3d33234070ece4823270c07065a45d53c009f853a2268f226f50524cf06fbdba996b97
-EBUILD picom-9.1.ebuild 1580 BLAKE2B c7eb545bb9480b317e9c7fbd814b04f3a1a0b790b39c9b3c122e45fb7f61cf96d1838a7394a46a7fc438f58d72b4554bd14b170ee6c069a0c64bea98dd7e05d1 SHA512 c8bffdafb439c86939e7c383db127fb0342503bf26ac7db4031f18b5bb3d33234070ece4823270c07065a45d53c009f853a2268f226f50524cf06fbdba996b97
+EBUILD picom-9.1.ebuild 1578 BLAKE2B cff5ca1dce8f47a2e779185787d2c2bb7f4590b28ae7f437bd681597011ee4e086d48c379b6e90660096d3fad839d71093b0275aff7d6389c5c09d287cbca238 SHA512 a5b105b3fdcdcbf577a636de521da593fea2afbce704e505c76d396aaa8ffa9ae52893b521926660c31c25fd3ac169e86b5d1fc49a33753d6081bedb3f025cff
 EBUILD picom-9999.ebuild 1516 BLAKE2B c49029f5ace598cd2aa75269d2cc5b78e1046c6a1500345c38da551c52d9064b768fd52112803ed4518f546abf5233ba6424f7b2cba553eb935d77a33356bece SHA512 e1a4b2da744aa2ae3d7b60c85232dd2f97f2ec0dff119f4cf95dcf65465b58aa1a037ef214cd386b5a2281ae7bb5856393b90a9bede24e7ec71ecbd732649050
 MISC metadata.xml 678 BLAKE2B a2e430318134d3080d018d14913dce148151db13f6e59ed2c8b3c4b10c07e0fc16c2b7e9fbd95c0e849739753b1b3572c1d96418fd19955b2c6def2c655444da SHA512 7a172584db948430c11f8b682a918bb0d49d454ab835592047aafa9cf06f418fe0e3bfb2704f6a5ba45998a64096085dc23a2c0379c6f582a63d36f9ebb8e1b7
diff --git a/x11-misc/picom/picom-9.1.ebuild b/x11-misc/picom/picom-9.1.ebuild
index c26adc87f474..0e86323b3f70 100644
--- a/x11-misc/picom/picom-9.1.ebuild
+++ b/x11-misc/picom/picom-9.1.ebuild
@@ -12,7 +12,7 @@ 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"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
 IUSE="+config-file dbus +doc +drm opengl pcre test"
 
 REQUIRED_USE="test? ( dbus )" # avoid "DBus support not compiled in!"
diff --git a/x11-misc/piedock/Manifest b/x11-misc/piedock/Manifest
index 26557ed7b4dd..db2a58f5985e 100644
--- a/x11-misc/piedock/Manifest
+++ b/x11-misc/piedock/Manifest
@@ -1,5 +1,6 @@
 AUX piedock-1.6.1-signals.patch 173 BLAKE2B 396549f932aa01f54e6c72fa653a5758351118858fda7ca28de7e354e5430c402f93497e30267cf44c4cda059af489d097b6ce44f7f747f09ec873b3528ef31f SHA512 c98aa7e22ce78fc60d778861e5bef12545553723c28bfa599b6a2d8b30c572b8d480f167b8730d84dad9c06c16cfb45f9e69665187f3e5c66053a0d4b35684fe
 AUX piedock-1.6.9-freetype_pkgconfig.patch 1233 BLAKE2B 41b39f3014e0e6adf8ab8d95ef2d01ef296660859576b5e7563be33f438fb469ec4e5b32f51e2f03cf58e034eea210987dc4374b55f5e936039f8c7dfd8fe301 SHA512 63ccd116bfae7ebb1456b304ce1258850e4669a9a71f55a83625f7867e22e92892f8deb9ce81204137dc98326c6ff3faf252e126596eab2ec16c44c3b202ce31
+AUX piedock-1.6.9-gcc12-time.patch 970 BLAKE2B 743a8019e3c8f8ff0ff1081ede0f621a3eba20d602e493dd2917340527f07468f38a5812f76666b409b5081c54d32d74559a4d51379bd0c075f02985aebee6d8 SHA512 33f988c092527632e25b828120894b267e3e97ca964a54cb6b5f449a00348d265d9f0623c09a184622dae901a0bb7230ff53298f0207cd6b3eb298a57a1544b2
 DIST piedock-1.6.9.tar.gz 290491 BLAKE2B 492c56d106616323a7f661e3c5d016755bdb421668bfe5251811df62ab1243838380395888c3e874c211069c30fdc7ea9141c245e907fa4c2eeea6d0a583329e SHA512 1244cc26d47c39c27c583f24aedf3dcdf0d879003f96a7cb1b512255384f0d81bf7c07dafa1b21ae1e6762bb7b41158cd20740b12b83f2d49daf7f24fbc96b69
-EBUILD piedock-1.6.9.ebuild 1093 BLAKE2B f6698110529ebdcbc14d8c5c934269981058da8a52222a14d8b76f06b4e06c37093ba3c2c6239bf742e24a7c762d6ed90e2c2a358b4d923aa28563828e4c161f SHA512 7d8f656c9c25eb31663bc27556fa7dfaf5d0f8757a21699b9bc5be9d3b98131a925e0254efca4d3bff3bdd19ac779988e088dbaae8a4eda60c1503c9faf7bf72
+EBUILD piedock-1.6.9.ebuild 1137 BLAKE2B afff90c5b6f449fcf1f7a7170f15dae7205682af754f1251682cba43faacc0c39959288e83bcf929d8f62027e34a0ba1d2a7f9d4fb7a9e111d812f0905a1d339 SHA512 7542dcb1b69037b08e7614004fd6e26064e8d6548532f14a1ccdd52afe67b586f9072f0463804d3829e5f836c5f690736280cb461d639c3260001879fc659a32
 MISC metadata.xml 252 BLAKE2B 6eb8265a9dc05bf95f1fddec065820b158737d586f35030b6f7a26497479669fc08ce2baa6acfc865c7384a7f8738d58fd6ca8054758e9ab66b1b41b6258bb22 SHA512 6e99925075149e08a1f884567523641cf43b066a269499557c86801a1de792eeb4cb4b6af7362d5d00820234bfde4a3d6a64d168899f0a4a06a1b1246a68aa5f
diff --git a/x11-misc/piedock/files/piedock-1.6.9-gcc12-time.patch b/x11-misc/piedock/files/piedock-1.6.9-gcc12-time.patch
new file mode 100644
index 000000000000..5b8a2ea9feb9
--- /dev/null
+++ b/x11-misc/piedock/files/piedock-1.6.9-gcc12-time.patch
@@ -0,0 +1,31 @@
+https://github.com/markusfisch/PieDock/pull/19
+
+From c57d9fad9726086dafbc05abb243c14dcd1bab23 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sun, 12 Jun 2022 11:08:19 +0100
+Subject: [PATCH] Fix build with GCC 12 (missing <time.h> include)
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Fixes the following build failure w/ GCC 12:
+```
+WindowManager.cpp: In static member function ‘static void PieDock::WindowManager::activate(Display*, Window)’:
+WindowManager.cpp:83:29: error: ‘time’ was not declared in this scope; did you mean ‘Time’?
+   83 |         for (time_t start = time(0) + 2;
+      |                             ^~~~
+      |                             Time
+```
+
+Bug: https://bugs.gentoo.org/851516
+--- a/src/WindowManager.cpp
++++ b/src/WindowManager.cpp
+@@ -10,6 +10,7 @@
+ 
+ #include <stdint.h>
+ #include <string.h>
++#include <time.h>
+ #include <unistd.h>
+ 
+ using namespace PieDock;
+
diff --git a/x11-misc/piedock/piedock-1.6.9.ebuild b/x11-misc/piedock/piedock-1.6.9.ebuild
index 2f6dc152253d..cd38c36006d0 100644
--- a/x11-misc/piedock/piedock-1.6.9.ebuild
+++ b/x11-misc/piedock/piedock-1.6.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -39,6 +39,7 @@ DOCS=( res/${PN}rc.sample AUTHORS ChangeLog NEWS )
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.6.1-signals.patch
 	"${FILESDIR}"/${PN}-1.6.9-freetype_pkgconfig.patch
+	"${FILESDIR}"/${PN}-1.6.9-gcc12-time.patch
 )
 
 src_prepare() {
diff --git a/x11-misc/py3status/Manifest b/x11-misc/py3status/Manifest
index 1082a171f6cf..1a63eddccc93 100644
--- a/x11-misc/py3status/Manifest
+++ b/x11-misc/py3status/Manifest
@@ -1,3 +1,3 @@
-DIST py3status-3.44.tar.gz 413211 BLAKE2B 0287f84de34e6674987d898a3ba288e348c897b5489f9fad74d092a70963e31403f0237a2547750c97a915e4f3703c5bf327babcdb3aafc3a03bfb0280b90e5c SHA512 f135c5793759350ec4c58af8b80e56e3c25359675da7ccd8e6c1da994f67df13259a3d4f2b9d9047b9fcb0bf14f08526630a60f0f148bf364ce874fc13fb162a
-EBUILD py3status-3.44.ebuild 886 BLAKE2B 06c4c89fde351654e7c7bf9b50662356e226a67933e302d9a2013216ee6717e923c134d7cc7a618bf96b21d4ee7200f4ad156fdb78286088017e8c316ff1ae3d SHA512 9d4d945ca504187f5634b5cfd76d3348fd758eef6b5436acb5b161797df21a99eb9e9d250445fbf15dfc735bcf17072ec1bf4dcf5cad5e69644087dc78d21e4c
+DIST py3status-3.45.tar.gz 415867 BLAKE2B 4484f8b9e4a8dbe19427d4083679bf23a961908fe63c4c58f3bba14b77d3584cd0e8e237290907f2679573713a5964818e98ee4addfa59157989624d9411f310 SHA512 e121a60cd2c57e1e3525e15fc165d44cd18ea6e2bd3aa704ea826ea0297ee66385b8ca3b88aadff89b7dd77771dca895fc51efce241880e99b8510a162a7334e
+EBUILD py3status-3.45.ebuild 886 BLAKE2B 06c4c89fde351654e7c7bf9b50662356e226a67933e302d9a2013216ee6717e923c134d7cc7a618bf96b21d4ee7200f4ad156fdb78286088017e8c316ff1ae3d SHA512 9d4d945ca504187f5634b5cfd76d3348fd758eef6b5436acb5b161797df21a99eb9e9d250445fbf15dfc735bcf17072ec1bf4dcf5cad5e69644087dc78d21e4c
 MISC metadata.xml 758 BLAKE2B 640668524d2db72abf19e3acddfb502b8adbf71e397a1b37f6179ecce65abd361ee81a3821448561ed350d5f62c711c726dd8ff8e03d8980215934de2ce73b9c SHA512 cb0875ce9a6477d4c1a1b67ea25e67d0cc397d81c4021301e5f52e9a50b782cc44958060aebfe1bd03ca087d4e5d29a0b7dcc826eedf2694c238a2f211912460
diff --git a/x11-misc/py3status/py3status-3.44.ebuild b/x11-misc/py3status/py3status-3.45.ebuild
index feeede8caa44..feeede8caa44 100644
--- a/x11-misc/py3status/py3status-3.44.ebuild
+++ b/x11-misc/py3status/py3status-3.45.ebuild
diff --git a/x11-misc/qps/Manifest b/x11-misc/qps/Manifest
index ec9dc975cc31..11746c267ae8 100644
--- a/x11-misc/qps/Manifest
+++ b/x11-misc/qps/Manifest
@@ -1,5 +1,7 @@
 DIST qps-2.3.0.tar.xz 212660 BLAKE2B d52521f11775fe3d169b81851dc78b9e62641bef9d35d3a6b90b440fd6509e228ffe4ad5f51130e901c90710eab525f459c1b384cb01ba23f123841c3b3702c6 SHA512 1b884088fbdfeeaf4814453df4f7a345ebbb1825da0c09e768a655e8266f2089e7c2b9cca5f8d84dc0316a97d884a91ca5b8d9c2336a195c14432302db71171a
 DIST qps-2.4.0.tar.xz 226424 BLAKE2B e06816bc5f716be51fae5e9bedc9cc2b0261a6fdd7ca345676d29b613984d1e3fef34f64e0f11bc522afb823f53ac3f1a96e8e840676fd5e87199f2f4b28f3cc SHA512 ee71ca88ba21644d0a144730b7e36131890c0626ffea6b2082bc3d8a2f7f6230335632a7dbb95aa0ae4068f278cca58c628c72fe74dda2a7c8a8021b0ff87825
+DIST qps-2.5.0.tar.xz 289796 BLAKE2B 9af9127d45eb3340177e7ed39242332d976f52c91de415da645baddd60583d010c4b7576efd0bf37f76459ce1487ec422601deb9f9baa2cfd6bb669baf7974d7 SHA512 58e8473eb9266a102e5df68025a2beb496a32e6c5cac54232242253abaede5adbf693a8b9f089693990687b53e20c1e23cc800b7928fe68e18f05e3b3d344dca
 EBUILD qps-2.3.0.ebuild 743 BLAKE2B 3d68cddbecd38205861d87d58e76f46a209843491c11c3f5a0f262f445fd8a4968893466d2b3495ad13315e5a999552a33ba6baf6de8a0b83106774e810e6d4c SHA512 187ffee19381f2ce96de81c58945ebc4737cc789eccfa6d91a76d4047da96163ca6bfc30157e7cae56f1443a62e00e133df3592492a799c4c3d32ca1bb29a763
 EBUILD qps-2.4.0-r1.ebuild 784 BLAKE2B ab38240a6611c8f8171398b40c076417e4dbbfd4b272eab633d10ef499df6d9d42e31b4763b4307b9fc30bc7bc30f896e59a547739d08de0608b320ef8c043ab SHA512 3f753de9623f20793c6175301e6ccac02fc6d5f72a33cd9191d8b694518412f5928f60749f0b8eee3d109ac252798fd6b20257655e9760de152ad6216b4a2bd2
+EBUILD qps-2.5.0.ebuild 736 BLAKE2B a670272a3e893af2b6de8ee17b32ff7e149c3edc16a7156a61285fa1c7c2f0ceaac581a62778e28dd7d90708675ab584d02a11d3183e158398d4f0255aa11c76 SHA512 2b6f12572b9e73327d01e9d6b80733291e2d7e303231f972b111cd6d984ff715069d2a1f720017e08ab67c2ea19e4d60fcb3d2b60198f589a9428bdb62f7564b
 MISC metadata.xml 321 BLAKE2B 43225270596add6ade36ef9b48fa3d7f246c17269300d836108939a534776e4fa8892ddc4da14b4a0c223eb85b153b76a0c5f1043743317d505bb83f97c05200 SHA512 1c71a1e2169606e6935523e2ebee5479fe43f5fb9135c4ce43b4094a17fe298568dc95b1df74382eb1355628f2a65ccd9e58f2426987deffc3128ff4137fceda
diff --git a/x11-misc/qps/qps-2.5.0.ebuild b/x11-misc/qps/qps-2.5.0.ebuild
new file mode 100644
index 000000000000..1876e762c8f6
--- /dev/null
+++ b/x11-misc/qps/qps-2.5.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake xdg-utils
+
+DESCRIPTION="Qt GUI Process Manager"
+HOMEPAGE="https://lxqt-project.org/"
+SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2 GPL-2+ LGPL-2.1+ QPL-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+BDEPEND="
+	>=dev-qt/linguist-tools-5.15:5
+	>=dev-util/lxqt-build-tools-0.11.0
+"
+DEPEND="
+	>=dev-qt/qtcore-5.15:5
+	>=dev-qt/qtgui-5.15:5
+	>=dev-qt/qtwidgets-5.15:5
+	>=lxqt-base/liblxqt-1.1:=
+"
+RDEPEND="${DEPEND}"
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/x11-misc/redshift/Manifest b/x11-misc/redshift/Manifest
index a0e9d39eb635..ce96fb992edc 100644
--- a/x11-misc/redshift/Manifest
+++ b/x11-misc/redshift/Manifest
@@ -2,4 +2,5 @@ DIST redshift-1.12.tar.gz 659019 BLAKE2B 09339a57fee192e3428ba4387cbea498f2f9f97
 EBUILD redshift-1.12-r3.ebuild 1955 BLAKE2B 9d6cbed8b116f5173c284fa6a58bb616ff00ac9af35c15945bf0615b2aeb90ee8084bb240e6a9ebe8c5cb79f846c58aeae35ed86cfd9bc7a3130f6ff3a437a9c SHA512 01007093bc7e4a841bb3eb66975c51d6f4e2a1b5ad664acf1885d26aa4914d8d4633f10e2d8cb051b1ebd07add545db4fa817d409b6761b6903d7c87af43f487
 EBUILD redshift-1.12-r4.ebuild 2032 BLAKE2B 6b3d47a74a0a93c8086b1db87a561467bcd238dd7af2e5551ce1576fb9e8758966694584590211ac377051b6b64c21f3221996a880902553b81cb7b3fa51c0d6 SHA512 b63ea2755fed84e4d5612ba13a36812e4b13b313cffbfa4a023a90158a9c6a04f009c0d70804380481b1fce805ce9809fc0a809f24fcff90245e6bd6de3f2d51
 EBUILD redshift-1.12-r5.ebuild 2120 BLAKE2B 4b91aa73653fe5d2ac649e6a5a42d41c2e7e000d93a17b5b258dcff858714498bc552c2460f76dce8c8babedfac880dfe4ae88278f525ef0cfaa8e3f9c3f5c6b SHA512 3ab83b5e769d8f89b86b898f7f1c71435da91a9927fb2b2ac3664a2a9e2a7f613ef1c5a7306e0ee27a749b495d166dadf82d46d7ee216ff87d69bab6c23dfb6f
+EBUILD redshift-1.12-r6.ebuild 2068 BLAKE2B b41852d9f1f2c7ecf9aefefb639a6015f59359cda19a8de920cce72def7df0d2911c81acd48978b5ae48108aad4e08af203a5cc912c39bbc3cb471855d5d7872 SHA512 6018aa1673c9cb12c0e99892b0f1f1c04eb12b22172ac83d187620f6fe8dcc558f42d3292a35bccbe799ab1669d27b0a9b3cd394e8b7942d27f5a6932e7882bc
 MISC metadata.xml 522 BLAKE2B db9be8da0b96a5f7d742baadda739df011a5f055a944d41b67b3ba3137b7e92acead9b0afd72410a4c4f203fedf300f49a052c809577351b3b107f447dbf4c6b SHA512 c5732a20ce965daea3c663ba00d2fd9ea484cade35c22011a9e4f051ce202a0da560c428c8775b5eefaa726c92f6f31014cc47780b4ba329db81c1dd7defbbbc
diff --git a/x11-misc/redshift/redshift-1.12-r6.ebuild b/x11-misc/redshift/redshift-1.12-r6.ebuild
new file mode 100644
index 000000000000..997257dbf0c1
--- /dev/null
+++ b/x11-misc/redshift/redshift-1.12-r6.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit flag-o-matic systemd autotools xdg-utils python-r1
+
+DESCRIPTION="A screen color temperature adjusting software"
+HOMEPAGE="http://jonls.dk/redshift/"
+SRC_URI="https://github.com/jonls/redshift/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
+IUSE="appindicator geoclue gtk nls"
+
+COMMON_DEPEND=">=x11-libs/libX11-1.4
+	x11-libs/libXxf86vm
+	x11-libs/libxcb
+	x11-libs/libdrm
+	appindicator? ( dev-libs/libappindicator:3[introspection] )
+	geoclue? ( app-misc/geoclue:2.0 dev-libs/glib:2 )
+	gtk? ( ${PYTHON_DEPS} )"
+RDEPEND="${COMMON_DEPEND}
+	gtk? ( dev-python/pygobject[${PYTHON_USEDEP}]
+		x11-libs/gtk+:3[introspection]
+		dev-python/pyxdg[${PYTHON_USEDEP}] )"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/intltool-0.50
+	nls? ( sys-devel/gettext )
+"
+REQUIRED_USE="gtk? ( ${PYTHON_REQUIRED_USE} )"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	use gtk && python_setup
+
+	# Fix compile for Clang (bug #732438)
+	append-cflags -fPIE
+
+	econf \
+		$(use_enable nls) \
+		--enable-drm \
+		--enable-randr \
+		--enable-vidmode \
+		--disable-wingdi \
+		\
+		--disable-corelocation \
+		$(use_enable geoclue geoclue2) \
+		\
+		$(use_enable gtk gui) \
+		--with-systemduserunitdir="$(systemd_get_userunitdir)" \
+		--enable-apparmor \
+		--disable-quartz \
+		--disable-ubuntu
+}
+
+_impl_specific_src_install() {
+	emake DESTDIR="${D}" pythondir="$(python_get_sitedir)" \
+			-C src/redshift-gtk install
+}
+
+src_install() {
+	emake DESTDIR="${D}" UPDATE_ICON_CACHE=/bin/true install
+
+	if use gtk; then
+		python_foreach_impl _impl_specific_src_install
+		python_replicate_script "${D}"/usr/bin/redshift-gtk
+		dosym redshift-gtk /usr/bin/gtk-redshift
+
+		python_foreach_impl python_optimize
+
+		# https://bugs.gentoo.org/784281
+		mv "${D}"/usr/share/{appdata,metainfo}/ || die
+	fi
+}
+
+pkg_postinst() {
+	use gtk && xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	use gtk && xdg_icon_cache_update
+}
diff --git a/x11-misc/screengrab/Manifest b/x11-misc/screengrab/Manifest
index 2aaf7aa8de22..33c718b83108 100644
--- a/x11-misc/screengrab/Manifest
+++ b/x11-misc/screengrab/Manifest
@@ -1,5 +1,7 @@
 DIST screengrab-2.2.0.tar.xz 136940 BLAKE2B 2263e0a887dc87ec708d96ca1cd9bce2aaa134fab9751341e1c96cd4a8b59132ca6a00719cf97dd218cc48ceb1abe5d943bad5fc80dd095c263fc84dabf3468a SHA512 14add5567abcbc03bd5e3e0e017129863ccd69aab83a1dfb3f8e6059af97fa4fff164e42fb3d0b4e8968d661b51b21def7d9c12ca68692a11288c99cdb16237d
 DIST screengrab-2.3.0.tar.xz 142160 BLAKE2B 2d375cc9dcaeb921530570efc91d29a178cc7c1f1099d0ee7d76622fb08ea77de3cc7adebb807fcf9f56818ccc6caec28a13a6da89c7f11d63d73da3539f3d60 SHA512 3898504bdf6d61d47236953e25693e9950dcc953abe85ba9b74484b55ce8af77b5f6a76f39906b2c4c0e8f4985ae6cb24679ec5e7d167b2d32638cdd7324f175
+DIST screengrab-2.4.0.tar.xz 336400 BLAKE2B f60bc298dba5a2f4153804c3d37b263f1191c7d4bc3099def037dc7dcedaf5c59bf2b67d2649f279f870d030260272e906d8d23f7eb0b4e49fa340054824ae90 SHA512 88aec38b957256f93bebf13facf33135a5a80ed879325342d19d3b102e7103fd23f1f7b3c1702c4bff01898e2b3029b07e50e4fde0de9e206a74484e4aa395ee
 EBUILD screengrab-2.2.0.ebuild 816 BLAKE2B 40d3399e49f88f0b91ff20f0d1e3848981f3eb9ad791afc9ea47f7269cff8ebc5d0df1cd0d2aac0866274c77103bf88034ca8b735ed520fb7b26cc2f6200030a SHA512 e8bfd0f40ebc3b7ae84acc2105b15055a46b6ce7ea86f23578b262f60cf28b6a215d366d4b5d7961034150df32eda3fd5e7c6a79e9133f3306b5efaf81426c19
 EBUILD screengrab-2.3.0.ebuild 839 BLAKE2B 38dd2fda1b3b287f1eadb23d07030d0bf4685dafb9c8d1171af0e3e159eed58efa58a1f742100cae16999407ed290e7c46e4fdc2a327084fb5c9fd160d78c63b SHA512 9b7a83fd38bd87fcb2e0dde4bb8f77723f11079d109034c51382687ddfb0887de139254c8a8accea53ede551f933807f7b7575f751b429f08fc9930182b3abb8
+EBUILD screengrab-2.4.0.ebuild 842 BLAKE2B 87ad568583c147a93075881890cd1fb733a9b58f5d997dc2229ca1cb8f4090ace6b9e46d61306cf0d55f59c97ba054961724b477bdfd539b48583f8b4d829e1d SHA512 e251cebba3b6026a9f70d4b32414527290bbc9daa8cd8df0f72a697d2f67f29c3703ca1e8e5de9d35fd373378b58d6a848bbb58304bfa8cfae4eedbf26bf9a14
 MISC metadata.xml 440 BLAKE2B e33e9796c3474c8000b9f0967ba894b57a5673f357e4f21306b09df9b90978502684b7b9108b453ab7d72c7e0bad03d32b8d49ab2a0cd79f7013653da3031703 SHA512 d9eae91b233db76cdccdc530e30ef4bf435e2651e46e3c5dc7f30f2a92622aa203ef25b37b7d49f41d41bbb859309b8612c4f43dd35b8898fb90e12c742c1a6f
diff --git a/x11-misc/screengrab/screengrab-2.4.0.ebuild b/x11-misc/screengrab/screengrab-2.4.0.ebuild
new file mode 100644
index 000000000000..a510fdb00b0a
--- /dev/null
+++ b/x11-misc/screengrab/screengrab-2.4.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake xdg-utils
+
+DESCRIPTION="Qt GUI Screenshot Utility"
+HOMEPAGE="https://lxqt.github.io/"
+SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2 GPL-2+ LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+IUSE=""
+
+BDEPEND="dev-qt/linguist-tools:5"
+DEPEND="
+	>=dev-libs/libqtxdg-3.9.0
+	>=dev-qt/qtcore-5.15:5
+	>=dev-qt/qtdbus-5.15:5
+	>=dev-qt/qtgui-5.15:5
+	>=dev-qt/qtnetwork-5.15:5
+	>=dev-qt/qtwidgets-5.15:5
+	>=dev-qt/qtx11extras-5.15:5
+	kde-frameworks/kwindowsystem:5[X]
+	x11-libs/libX11
+	x11-libs/libxcb:=
+"
+RDEPEND="${DEPEND}"
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/x11-misc/sddm/Manifest b/x11-misc/sddm/Manifest
index ad4044dfd4d2..f22adf457151 100644
--- a/x11-misc/sddm/Manifest
+++ b/x11-misc/sddm/Manifest
@@ -9,5 +9,5 @@ AUX sddm-0.18.1-respect-user-flags.patch 774 BLAKE2B 050d261762b872a475ce9f250b4
 AUX sddm-0.18.1-revert-honor-PAM-supplemental-groups.patch 3616 BLAKE2B 71a4c6f592214160ff993e86582bf5f550be204193668f5bab7786db88ae9a1a09ee268beb3e3157c1b033e765053ba415f3d291f299b09606aa566c9c197370 SHA512 b33b26517173262194bdc98e63b84fbb1f03005abc3c079332dd9b275167d8ddc680ba5c2a9968be5c54963b64f291aab65ad9f04b9f3f69299d030753cd90f5
 AUX sddm.tmpfiles 31 BLAKE2B 51d22f1d6e25aed3df726c0c315e83193bf28b5e9cafb681b648e6788ad8e9ddd8610ef5c305627373e32465ac104b33d71c333153217f8f8f560ace9ddca45a SHA512 bb5ecdcc6cfcc6b1056a7b10b8a6f323a3e12ea5496a26d80f199a275402fd99ed0fa810fad6687407605964f980784c24082686e177063113a358e1d4220136
 DIST sddm-0.18.1.tar.xz 3402972 BLAKE2B 99ab43d374e9a3d318f692a6d496d8a6d68927af3c8e8fc2208d7355ec90649a14758b39f5733dd32f942ed569de88085576d4f5f8666f4f97079e0fb6dcb99e SHA512 ff0637600cda2f4da1f643f047f8ee822bd9651ae4ccbb614b9804175c97360ada7af93e07a7b63832f014ef6e7d1b5380ab2b8959f8024ea520fa5ff17efd60
-EBUILD sddm-0.18.1-r6.ebuild 3626 BLAKE2B 028f76769c5a84c4603cc021482a85b993c09da2ca2468835ad69cc38cb5b2423417b35016167f7b112dc38f1349f53845cdc5e81d38c37f3932b9cd49d9f6a9 SHA512 9dccbb59e43544bc6e0be17815016a381191bab856a938e3a3d38281e1c8ac9291ad69b11071124250fd86c4a7d20ffe63dbec53b07bca7ea9cdf1a05ebb2ca8
+EBUILD sddm-0.18.1-r6.ebuild 3633 BLAKE2B 0affec98b1374d883ded0c9061cb75bf5418bf7f3a261d940fd9724c97f64062fb8fec77d6011f0185dbafa076e0c2630439328e7a8b3454f516886ad9ab0c90 SHA512 bff069801e117b1657384792a5afc0a799b4d17e3b74d48201c2f0df7bf5ed8830a905f3af0728c9208d6e563e55ec9463062216382014e4ecaee626cd051fbb
 MISC metadata.xml 661 BLAKE2B d27eefaf2d3fac197ca5e20199cd80631d099517fb58f4a734ddf0a477ab4a8ffdd49d470139cdd4b7f82a7323b150c30febcd6f498ac818df85d7fb11c19457 SHA512 040bfc5d725a1b78d2ff01c9f9c0222c77c03fd0e341543733d5523b013b726e6ce950b13d01877abe211d89920f378248b82c6ec3076a82437c343c93338bdd
diff --git a/x11-misc/sddm/sddm-0.18.1-r6.ebuild b/x11-misc/sddm/sddm-0.18.1-r6.ebuild
index 2eef0e695021..c2cc2cb95d77 100644
--- a/x11-misc/sddm/sddm-0.18.1-r6.ebuild
+++ b/x11-misc/sddm/sddm-0.18.1-r6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
 IUSE="+elogind +pam systemd test"
 
 REQUIRED_USE="?? ( elogind systemd )"
diff --git a/x11-misc/sunflower/Manifest b/x11-misc/sunflower/Manifest
index f9e07d7a07bc..45bec97fe99d 100644
--- a/x11-misc/sunflower/Manifest
+++ b/x11-misc/sunflower/Manifest
@@ -1,3 +1,3 @@
 DIST sunflower-0.4_p20200716.tar.xz 830248 BLAKE2B 673b320bf08c0e0600fae06a531f75403b0e76bd8a267918986da84537a5213f0a1d99c9de74820f15652b80959e9029566f4611138893f08919f389a66a8032 SHA512 0e30bbadb3d60a64e2a2b629104c2a3ad88d997d581c1c76ef593afa1d3c48aafd185b4cd36da25bed5c3e9b9d1389f0709aaa40e796e883dccfe71b214620ed
-EBUILD sunflower-0.4_p20200716-r1.ebuild 626 BLAKE2B 1b1d20279d2a414d9bfca29ae4e6521e6bab6b30cfa8d154b4f2cb9227df1a0b829b8b7b21e80b0b2480cabfb16c6a52015c46583fe85655ff59639f01b5ef1e SHA512 cab7653d51ed7f0859316644fcd872d73607bb7a62c60cddc4711c3eaab72c7551718480366d4edba79ba96e9feafbb820e31c2037f6e86713ff6faf1d39b45a
+EBUILD sunflower-0.4_p20200716-r2.ebuild 650 BLAKE2B 0bb84a53cf0ec3ce8749d838e9f4c9800a07d70a9f0c3add2627f42bf8f0743c8b2d9632e830299fc844fe812eb39dbb0fcc1bd841a03077ef97d1b95064a54b SHA512 d242c043717253a1e026d7563d7c299183607be0ae34fab182c8f7365964866dfe770e105f48e9a23125c44c95e682e395fb4798939e27d13e818eeff5955374
 MISC metadata.xml 392 BLAKE2B 498b8cd3367b270a4cbe2df3dba2610f063e5bd3535aca45aa5a629cac2f6d9749b6abbeb07649508b6ebba42febda98741d806f591c40923bd1067ad4f14836 SHA512 42df4158ccd4ca4fe77ebbd6aacd59391363dc4c0cd9a2c379ae582ae9c70e5d65468cbc1e1141dcba16fb55a0859ea8d1f0856573ba51b53001a495cd9e1149
diff --git a/x11-misc/sunflower/sunflower-0.4_p20200716-r1.ebuild b/x11-misc/sunflower/sunflower-0.4_p20200716-r2.ebuild
index 957034424c2b..40f32e2ea597 100644
--- a/x11-misc/sunflower/sunflower-0.4_p20200716-r1.ebuild
+++ b/x11-misc/sunflower/sunflower-0.4_p20200716-r2.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="sqlite"
 inherit distutils-r1 xdg
 
 DESCRIPTION="Small and highly customizable twin-panel file manager with plugin-support"
diff --git a/x11-misc/tdrop/Manifest b/x11-misc/tdrop/Manifest
index f91265c0fdd2..ca5218c06726 100644
--- a/x11-misc/tdrop/Manifest
+++ b/x11-misc/tdrop/Manifest
@@ -1,6 +1,6 @@
-DIST tdrop-0.3.0.tar.gz 19495 BLAKE2B 5f72090e6ccacaa4f708715cb1a2eb43bb8acec79f43301da67dbe0a8d81637806603d06b9ad0b2815e8aea1f481271f5b8f8adddba60079ad48ec621f8e8e8f SHA512 3e1c30e42ce96570fabd43b89fd9f17a23d74c4943ef9ab5d1edb4967ffa6c4c0259df4449ef2a18b396d1057f4a19a413fec817ff708d3e41906695cebb67ca
 DIST tdrop-0.4.0.tar.gz 21550 BLAKE2B 673ad98aa294410b4547fce842d191fd3c5512cca79361cae35fcb646afd328615daab1fa112bcba9e28cdea6bbeb2ca696bcc78d54c0302d32a91324a8a16d9 SHA512 679fed509e29752ebe3df378e68d9701c9edb53c9162854a8cb623f2da53499b933dad59fa6fc865ac44c67544cd6bcb779316ee4312e87c39559ade1ab313d8
-EBUILD tdrop-0.3.0.ebuild 651 BLAKE2B c7843a495947365d6b79c223f564144f02aece7c935ef112df23d43d9a7e4c9f388f96dbc430e3483d0a865663343de835f14cceb5d4fc8443421e526cdbd8f1 SHA512 e4765fe0fc68f0050b154b247643265552745e2662717cea86cbbace80487c6cbf7bf47105dc796a4d5f00b6e5dad510ad0d3cd46a0a0b83efa40bcf85bd3026
+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-9999.ebuild 656 BLAKE2B e3f23ec203d5229d468cfaacda7fce752a5e7c8361e259339f0df2298ddf9de10010484fd0adf639d2a4365537ba7648cfeac32fa9433c073339e4e2eaea7f2d SHA512 e0536af8897c34b2716a31516b18a1d3534593019035d30105db04fc733ccdf8de48feb5e1cdaca169d4dadc602c3c89801c45edf8d7b1051c92d82dc0c660ad
-MISC metadata.xml 329 BLAKE2B 7b2e0e3ac8c6eb908bea631cf649d18c56c31da21d87c4b6b71e387c013493e5a1389e158fa82351e6e01b9caf5138699b52e2ace858779d084d1d7b2d7c4ba8 SHA512 883f3d9d5ec5dd74fac009b3b6b39f7068a744f712f3a1ebad4be145c63b4836f2bc39294f1bf2e63c4f6f51b7dd4f9dd2d0dce1ca6f4d2b549a7fd970f6f55f
+EBUILD tdrop-0.5.0.ebuild 760 BLAKE2B b2443c37a1aa20a96aa734ce420ff3de6520a702fdc91cbb0b141cfd9ab0c2bec09173044c1c9768279c8e229dab1e032ee8e9dc6e6be23a81a02aac24e67038 SHA512 569adf5b922f416c0f888ec05abeb0e9197467cd7e8c57edad966b9a34c098f2eb5716fd4dcebd28e4646a133a8ab747bb435128e022376dc0ff294b5564547c
+EBUILD tdrop-9999.ebuild 760 BLAKE2B b2443c37a1aa20a96aa734ce420ff3de6520a702fdc91cbb0b141cfd9ab0c2bec09173044c1c9768279c8e229dab1e032ee8e9dc6e6be23a81a02aac24e67038 SHA512 569adf5b922f416c0f888ec05abeb0e9197467cd7e8c57edad966b9a34c098f2eb5716fd4dcebd28e4646a133a8ab747bb435128e022376dc0ff294b5564547c
+MISC metadata.xml 414 BLAKE2B 978c573653dc96352bcc84bbd765ea30a93368f49cbf1364df987c3a9f01e2c7433bd86ab7ea2ddbed818078a6fddb2020cef32f94961addfa86f91119ef8091 SHA512 64525fad7a397c5c70ae2c9ed147aef73dfee016c39ab3e53f0cf149a2f0dff9a08d8d733ac87434d805b1cc18d6b6aa5fc1341cf9e319c828a6be21a75d9499
diff --git a/x11-misc/tdrop/metadata.xml b/x11-misc/tdrop/metadata.xml
index 361ed25e685b..00bdb75dd304 100644
--- a/x11-misc/tdrop/metadata.xml
+++ b/x11-misc/tdrop/metadata.xml
@@ -6,6 +6,7 @@
 		<name>Georgy Yakovlev</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">octuid/tdrop</remote-id>
+		<remote-id type="github">noctuid/tdrop</remote-id>
+		<changelog>https://github.com/noctuid/tdrop/blob/master/Changelog.org</changelog>
 	</upstream>
 </pkgmetadata>
diff --git a/x11-misc/tdrop/tdrop-0.3.0.ebuild b/x11-misc/tdrop/tdrop-0.5.0.ebuild
index 1031384a291e..252c3456998e 100644
--- a/x11-misc/tdrop/tdrop-0.3.0.ebuild
+++ b/x11-misc/tdrop/tdrop-0.5.0.ebuild
@@ -1,7 +1,9 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
+
+inherit optfeature
 
 DESCRIPTION="WM-Independent Dropdown Creator"
 HOMEPAGE="https://github.com/noctuid/tdrop"
@@ -20,6 +22,7 @@ IUSE=""
 
 RDEPEND="
 	app-shells/bash
+	sys-apps/gawk
 	sys-process/procps
 	x11-apps/xprop
 	x11-apps/xrandr
@@ -36,3 +39,7 @@ src_install() {
 	doman tdrop.1
 	dodoc README.org
 }
+
+pkg_postinst() {
+	optfeature "tmux session support" app-misc/tmux
+}
diff --git a/x11-misc/tdrop/tdrop-9999.ebuild b/x11-misc/tdrop/tdrop-9999.ebuild
index 695b437b87d3..252c3456998e 100644
--- a/x11-misc/tdrop/tdrop-9999.ebuild
+++ b/x11-misc/tdrop/tdrop-9999.ebuild
@@ -1,7 +1,9 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
+
+inherit optfeature
 
 DESCRIPTION="WM-Independent Dropdown Creator"
 HOMEPAGE="https://github.com/noctuid/tdrop"
@@ -20,6 +22,7 @@ IUSE=""
 
 RDEPEND="
 	app-shells/bash
+	sys-apps/gawk
 	sys-process/procps
 	x11-apps/xprop
 	x11-apps/xrandr
@@ -36,3 +39,7 @@ src_install() {
 	doman tdrop.1
 	dodoc README.org
 }
+
+pkg_postinst() {
+	optfeature "tmux session support" app-misc/tmux
+}
diff --git a/x11-misc/util-macros/Manifest b/x11-misc/util-macros/Manifest
index 670fe79a9103..cd03a5fbbbc4 100644
--- a/x11-misc/util-macros/Manifest
+++ b/x11-misc/util-macros/Manifest
@@ -1,6 +1,3 @@
-AUX util-macros-1.19.2-CPP.patch 1103 BLAKE2B 19ea2f1ca56daa27a8949566337305b383f3e1481e9a2bd8046a05188eff00a8a89dcefc30598ceb2a0641c99bf1c6bf13bbcf55e894767cc77e9b897154c47d SHA512 572f64b4a1fc2989f1fbe969c070f19312c90d7f5c4d3fd98bd749f8024a2e21a1a43ae2520e2bbbe7c9b74f76b55615e3618ca7f700837d6d8fbd574775cf26
-DIST util-macros-1.19.2.tar.bz2 84139 BLAKE2B 94eeeca771042671c6915c562e055c8b965f874c3a5aa1c8107abe38ca984ee32293f68a51ca73d65ac82d245dec6e02ddd62939ab14aee12b4b6fbf350b8c39 SHA512 3f51504b27f0478c136126f15110cf3cdbba218c4d74a8e974cca1381c6e8364609bd0c444f2fb19aa86a7f4e848dfce4f4da940463b224036f75a60b3d88619
 DIST util-macros-1.19.3.tar.bz2 84690 BLAKE2B 95f6bd6cca47111f973eef60915ab0b0a1c6a6b15facb08da138df100c27caacce28866c5ac05aae79116fe3bafa15f454ea6cb9997069f0b5fab7968777d383 SHA512 b9c7398a912c688a782eab5b1e0f6da2df11a430775c5c98fc3269f73a665de6eeb60d300a849e38d345714a6e51f74e9334cb6039767304cca4b93d823a53a2
-EBUILD util-macros-1.19.2-r2.ebuild 741 BLAKE2B 1673e1903448a8a5e2a2d3dc767f06a231c703c04234b0f31389f0baf683b12e9fbf3de7d938261c87f845578828985b1e2ebc57079ee13697f58c7b3efcaadb SHA512 32f89da45bcc1ab722ce415dee6bd0bc595d971aa13ab6da568d684e4c72ecf346093d4683d300c97b6ae8b48cfbe93ffea9e8494ecdbbc2dddf325fb92cf7fa
 EBUILD util-macros-1.19.3.ebuild 710 BLAKE2B 76fe57383e1f5eb715092ac442c54b38dd038037adcb8a2c2c67be1f53c07deb66341352e56c4b670e9e1ce974d0c883ad8b0e1088a4a99801587155fba43e48 SHA512 52484762335a47dae0561001f8745a6cee5205b348eab602af51acfeb57e4ed8458222eea1853a6ea6651191e8b1282759d8649f3f89f988c160f4c0a8a6739f
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-misc/util-macros/files/util-macros-1.19.2-CPP.patch b/x11-misc/util-macros/files/util-macros-1.19.2-CPP.patch
deleted file mode 100644
index e6cbee98d11c..000000000000
--- a/x11-misc/util-macros/files/util-macros-1.19.2-CPP.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-https://bugs.gentoo.org/726130
-
-From bd66ce3ba4a9d1d1490cb5775a2fdd0b408879b6 Mon Sep 17 00:00:00 2001
-From: Marvin Schmidt <marv@exherbo.org>
-Date: Fri, 27 May 2016 15:13:56 +0200
-Subject: [PATCH util/macros] XORG_PROG_RAWCPP: Use AC_PATH_TOOL to find
- preprocessor
-
-On some distributions tools like cpp are prefixed with the host-triple,
-to check for this prefixed version first AC_PATH_TOOL should be used. If
-no prefixed cpp, it will fallback to the unprefixed name.
-
-https://bugs.freedesktop.org/show_bug.cgi?id=96257
-
-Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
----
- xorg-macros.m4.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/xorg-macros.m4.in
-+++ b/xorg-macros.m4.in
-@@ -57,7 +57,7 @@ m4_undefine([maj_needed])
- # such as man pages and config files
- AC_DEFUN([XORG_PROG_RAWCPP],[
- AC_REQUIRE([AC_PROG_CPP])
--AC_PATH_PROGS(RAWCPP, [cpp], [${CPP}],
-+AC_PATH_TOOL(RAWCPP, [cpp], [${CPP}],
-    [$PATH:/bin:/usr/bin:/usr/lib:/usr/libexec:/usr/ccs/lib:/usr/ccs/lbin:/lib])
- 
- # Check for flag to avoid builtin definitions - assumes unix is predefined,
--- 
-2.27.0
-
diff --git a/x11-misc/util-macros/util-macros-1.19.2-r2.ebuild b/x11-misc/util-macros/util-macros-1.19.2-r2.ebuild
deleted file mode 100644
index 933fe66464b7..000000000000
--- a/x11-misc/util-macros/util-macros-1.19.2-r2.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="X.Org autotools utility macros"
-HOMEPAGE="https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/util/macros"
-SRC_URI="https://www.x.org/releases/individual/util/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-CPP.patch
-)
-
-# there is nothing to compile for this package, all its contents are produced by
-# configure. the only make job that matters is make install
-src_compile() { true; }
diff --git a/x11-misc/virtualgl/Manifest b/x11-misc/virtualgl/Manifest
index 76ad8e9343a5..e60fdbacb6a4 100644
--- a/x11-misc/virtualgl/Manifest
+++ b/x11-misc/virtualgl/Manifest
@@ -2,8 +2,8 @@ AUX vgl-helper.sh 881 BLAKE2B 5373592a2fb784e38c1542aadb4f150937a69f51284bf21337
 AUX vgl.confd-r2 629 BLAKE2B 9794409221cc6a95b2f7a48e02063d3c6bcfd66c6b3e1929073947b3794ab1f9e69c76be47b9d06fa4ec9404e3ec4b4f7cc3f0395fc3d09684f346304db6202f SHA512 bab0ad095a2f075a1923f1b58531101bce634c89b30e77c239ee224b58eac3083c7eba4d21bd997a4dc8b6e4cfb0be7b013732bdf37a27a16a3301a098d60c29
 AUX vgl.initd-r4 865 BLAKE2B 40e417f0dce3f2cf65c4154b40fdc4b8a1ded87e96f5c7ed047eb5a8870c547aceaed12b9a0324e3eacfe03e46194da61af179cc6dc2a77a6fdcf30d8d92a874 SHA512 42f79d94fb6e69cab90e1630168d9daf3a8062bb85515c46551960c22d6ed38b6e5ef40e4db310c377adb8d7c3ef09840a81cdb25a15032a977e15253315b2e7
 AUX vgl.service 254 BLAKE2B 0a0e73228821019a764b1bc3ff61a752b15001018f704739d86eebbf326ee3a0612475cf7a0c360993e1a27c87815626290dfe4d85fc7e1aaa3897ce41f787c2 SHA512 18615552301c52c272bc47f942c47121100c175651b3957ddf996ca40e755d96dd51194ecb599c92e62fbdba3b9245e999ef488c889833009f8eba1c038c38f9
-DIST VirtualGL-2.6.5.tar.gz 1201656 BLAKE2B 4dc38a144e197ea7578dd29eea5eb69fb3e96a75c2729605f6678fbc96f3cf039c2e1780aa69ca8836771f72731cd8cdd795237d69d4b591e330124496aecc1c SHA512 0ab9e744e400d323bc16f6e2cf310905361745ea4da9e9e9a41cbeb45b1d661eebd38a0fad8ae5df4664d02b341de44c5730af8437e6ef49c7351b4afb953532
+DIST VirtualGL-3.0.1.tar.gz 1217488 BLAKE2B 7ed73406361a5032806a6d9196328b48e23caf4dea668f6cbbf2ebcee3a0e76925141a826072f3b317327c71773683df65d5ecb16ffd92a1c5ddb088a63a3f6f SHA512 d953b9c31ec3608a05da0069d83e7115a42e2c98bf169dcf97bf2d271cf7a5673e32d66247f0184aa40741597ca0732edb5f7992a82c5bc48bac25f1cb1889ef
 DIST VirtualGL-3.0.tar.gz 1244024 BLAKE2B f540a90cd84efa0bee5ad124cb2ded8c1b863be8b719581c5daf67afcec7ef5ef2c78720962a4d3159de91e9cba068cea18a278a3c4f7eb65c98b4f13792044c SHA512 9d2f56d44dba936f653ecf0350c581298c4c51d6deb114570df32c044991a61313d59fb140517864e760bc6f7fd93bd27ffd35e2ff8a024243472a822d5cfd98
-EBUILD virtualgl-2.6.5-r4.ebuild 2775 BLAKE2B cf683d976c8aec5e293a10d2484ccc213d19a587673b79c6b431bc4313d32c6ee883890b6be5fa94227d9768595f3fd55c5984ce6fd892b66e84898f97a10aff SHA512 dc246bc99ac9e489749631feb76a4ed1e9317c147e2c9ef4c389d278753cbc0fc40dc82a59937849272cdd9377e2b46fa101942de42d3d6bb740d9c324e1cf1d
 EBUILD virtualgl-3.0-r1.ebuild 2881 BLAKE2B 69136dc5f076bba86dd959469b2e34f907a3e0e06abf54fe405ecd5d6c00cba771cee919f32fc1e4deaef344c932116ea635630f96adaf27a60b72e1dc961b39 SHA512 529dad8bd5d70fa7d485cc96a199dfabed5da192aa43b116c47e4389e65f9c5c6b45ebcf7ed3a773960b5caaf8c98dc7eb58eb7fe598c7edffd508d1bf510688
+EBUILD virtualgl-3.0.1.ebuild 2883 BLAKE2B 0702f26b525231c9b2ddf32f9f3e5f5e4568d05b403f31f9dc39f34e5b297b58d9744050ef808660607f167430c2d3ef9e920cf0c2bb9fb50f430dfc4b39d75d SHA512 094555bbe345a3000bd1f36a130f6e905a1ac36fd5c438a8e653de1e0d9085022a0d531fc61513ee8801c85952bd0854bb420c3fed30ad3cbd484a318af31918
 MISC metadata.xml 873 BLAKE2B 8c64dca85cfcbfc919216df48b3da7c87d886fa6d04f37ead9fd80a2df831e0b4a65093330259a3fc401ab671f00c3fe96e93e3e2eb992d63bbc2c45166ee970 SHA512 1ee403bfbdf56a977461695d3a787c5c7e12e6c0fa5b09c6aa6e65834190cf22349f9484f1469e8e177b10bba8ca2313012de95039ac3891a36e3cb04d37fe84
diff --git a/x11-misc/virtualgl/virtualgl-2.6.5-r4.ebuild b/x11-misc/virtualgl/virtualgl-3.0.1.ebuild
index 367b55b3cc79..bdd5c8a49e50 100644
--- a/x11-misc/virtualgl/virtualgl-2.6.5-r4.ebuild
+++ b/x11-misc/virtualgl/virtualgl-3.0.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-
+EAPI=8
 CMAKE_ECLASS=cmake
+
 inherit cmake-multilib flag-o-matic systemd
 
 if [[ ${PV} == *9999 ]] ; then
@@ -14,7 +14,7 @@ else
 	MY_P="${MY_PN}-${PV}"
 	S="${WORKDIR}/${MY_P}"
 	SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${MY_P}.tar.gz"
-	KEYWORDS="amd64 x86"
+	KEYWORDS="~amd64 ~x86"
 fi
 
 DESCRIPTION="Run OpenGL applications remotely with full 3D hardware acceleration"
@@ -93,7 +93,9 @@ src_install() {
 	systemd_dounit "${FILESDIR}/vgl.service"
 
 	# Rename glxinfo to vglxinfo to avoid conflict with x11-apps/mesa-progs
+	# and eglinfo to veglinto because of conflict with mesa-progs[egl]
 	mv "${D}"/usr/bin/{,v}glxinfo || die
+	mv "${D}"/usr/bin/{,v}eglinfo || die
 
 	# Remove license files, bug 536284
 	rm "${D}"/usr/share/doc/${PF}/{LGPL.txt*,LICENSE*} || die
diff --git a/x11-misc/xdg-user-dirs-gtk/Manifest b/x11-misc/xdg-user-dirs-gtk/Manifest
index eb85e4a3b05b..84c14ad897e0 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.10.tar.xz 116528 BLAKE2B f86237859636046ecc72bdd62ee5c6a3726ad701aabe04f14bff6541554d3e9de82265cb95b353714adba5d6c8742f94150df9b6f3e4043db9e6885e61e569c1 SHA512 c3ef070244cd1c87312c2c2602dbe7bc3dd26eed632b0d8d779580d7ee6259efdda453ab7bdf4415cc72fad7a74d9dd36476189fe446d5627e4db75d905302f5
-EBUILD xdg-user-dirs-gtk-0.10-r1.ebuild 1412 BLAKE2B ada5a15d2002e597bd1facb8ea3371756937076dcbde2ee4142afee7b3b2640ef38fd67b6b44a9b49d9d8f23cc84b7ba9e899cd1f1942c54ee0954fd18fc4361 SHA512 02711888950754713e7db8a2258fb41eb40951d084110e62da3cd4b58cb93dd2a481f24d6c1d7d25ae56760e505b236cb40722830c76424795950be399e8c55b
+EBUILD xdg-user-dirs-gtk-0.10-r1.ebuild 1419 BLAKE2B 631002f8419c360e2cedbe7c74a3ee4ed0531fa6a2b3752b0125b4261292fa2996b9c5b3b8c41403e3999173803da8938ac8f326a6a4f32209941b0de6cf1bfd SHA512 f70a410d149e5f941325fdf94fcc9d5f8d46995bf8fd02259efd7a45e6c1e567370aab7ebdd35ee2b67f2e0506296c6655b76a5bc512868b59df69944c002f1c
 MISC metadata.xml 233 BLAKE2B 0287c5840d68d6fa00f870fb7024dee6332bef9f8f8608afa0b5b2bfe15f1fefe5dc8a2de31964f4c7b0fb2787a58a3798884fd75e0314e61cf84079475c9a39 SHA512 534aef7349f0f6243a01e578013481c76b2516382638feec7705502de825d73ea54a3ae890e7171e6238a3bf0ecc5c88c9bc48890f4116a257031bae022c7202
diff --git a/x11-misc/xdg-user-dirs-gtk/xdg-user-dirs-gtk-0.10-r1.ebuild b/x11-misc/xdg-user-dirs-gtk/xdg-user-dirs-gtk-0.10-r1.ebuild
index ec91e0237789..a51c28446720 100644
--- a/x11-misc/xdg-user-dirs-gtk/xdg-user-dirs-gtk-0.10-r1.ebuild
+++ b/x11-misc/xdg-user-dirs-gtk/xdg-user-dirs-gtk-0.10-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 
 RDEPEND="
 	dev-libs/glib
diff --git a/x11-misc/xdg-user-dirs/Manifest b/x11-misc/xdg-user-dirs/Manifest
index b5c7b23ed2db..d79042dcb0b9 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 298 BLAKE2B 5028bfcafccc0310c192894cbeee12627b5b599cc5b612b6a38dcec45e36b9aa1f4ab2cdc31f29899b278088e61776bff51b5216adbf6c2497370c7966b17a50 SHA512 227b134d0782067f8c8688832036da8cb1afbcda247349db3502867e3f1b1eaa09885f2419762712ab9ce82655d4bb9a7ec17f63afdb9f00be5efcfd895ca7d4
 DIST xdg-user-dirs-0.17.tar.gz 257291 BLAKE2B 75b44a841b7961977824581dbbc760282fa3a5eed0a5496746ff6e09cabe4dec022d0f6fb129a877d8310c1fb214035f1e917c0e327dd5267bb83c47bbe00d5f SHA512 a02cc251f2d0a8bd0dad498901c8c6fbe8dae0e0e156abcaf27b1ded376a1ed369c2e59201d56ab4e38c9d521026fa39199177f3868c30e5c50cc03665dc335f
-EBUILD xdg-user-dirs-0.17.ebuild 959 BLAKE2B a2891ed6d584c034386474759409011b7ad972a1d7dbb6a3ce2c70fb2d879b8e901c74aab8c42009d186256cbfb9d698b3a068468aedfaa21ab0d7605c516e31 SHA512 2af410af516bb11a63f9f9cb564b19e288f6d2b0facab713b3e87affece3827af2f09a5345986b2ddc694171d5fff4adfcdd4e8f2787844dbfcfc804769fe071
+EBUILD xdg-user-dirs-0.17.ebuild 966 BLAKE2B 4c2a2064a9ec902948dca2eddc6aef1b5031c00e3d1dbe4435b8506843835f5ffe8410514e6ce0baac618d4e3dac548cef436fad2da1915af9468b3fe1d04781 SHA512 4d116bc4e801c09894a0590a2edf03219f9826c9927a2a23a7db074f48973e574a769ede4e69cb54001d534a70f8e1dd2d73a165109086b5e0dbe27216f6c077
 MISC metadata.xml 233 BLAKE2B 0287c5840d68d6fa00f870fb7024dee6332bef9f8f8608afa0b5b2bfe15f1fefe5dc8a2de31964f4c7b0fb2787a58a3798884fd75e0314e61cf84079475c9a39 SHA512 534aef7349f0f6243a01e578013481c76b2516382638feec7705502de825d73ea54a3ae890e7171e6238a3bf0ecc5c88c9bc48890f4116a257031bae022c7202
diff --git a/x11-misc/xdg-user-dirs/xdg-user-dirs-0.17.ebuild b/x11-misc/xdg-user-dirs/xdg-user-dirs-0.17.ebuild
index e525ff3239ec..4496577b85ac 100644
--- a/x11-misc/xdg-user-dirs/xdg-user-dirs-0.17.ebuild
+++ b/x11-misc/xdg-user-dirs/xdg-user-dirs-0.17.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 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="gtk"
 
 RDEPEND=""
diff --git a/x11-misc/xdg-utils/Manifest b/x11-misc/xdg-utils/Manifest
index 0bbd3560148b..e44bfe24ab3e 100644
--- a/x11-misc/xdg-utils/Manifest
+++ b/x11-misc/xdg-utils/Manifest
@@ -1,3 +1,6 @@
+DIST xdg-utils-1.1.3_p20200220-no-which.patch.xz 5576 BLAKE2B cf8c3111689c355add2a0c16a887fd463dc2d00c267cac0561d4598430f043d19fea376859aa4ff521273ff788b4e8afdea5ef6e7b0ba51ffded23be2ad61335 SHA512 c30e512e8caae3f4d2282592722bc24e08cb33f5ec01d5504d2e49833c1598fe27807c095dc2226efca57dcbef4d2883fd9bfa46fb8eeee93c53f9880c050b51
 DIST xdg-utils-1.1.3_p20200220.tar.bz2 287080 BLAKE2B eb9067527d5073f290d10ad36bcda24d4b813f3c98776b57955a7f254956795c26f1536c858ac104259f68f755746976d2cfc3aeccb9b9b35eaca5ea5eb89806 SHA512 8445109e87fb9e92edeebbf6b07a41b79344bc5016eb7224f5f2b7e599c6d075363337c81dd2ddf8f3007c633debba7f814631188c02db3ae002f622b4c323ec
+DIST xdg-utils-1.1.3_p20210805.tar.bz2 287544 BLAKE2B ec3755e5e6f596c5787324ab254ba14938f35dda6df5a4ef88fb582c5df7704e706dee2f4362cc0597164cf2aeab5cf8f5f6db1b9d374355723e3d738e101264 SHA512 ec51e98e4c73ad7cb3c77051617a939c7956c7da6bcbbcda4e54121af247ce6978c8638c80bc644a49cfca14b18f06cb25747719bc20c97f7e60b9b4f3597a71
 EBUILD xdg-utils-1.1.3_p20200220-r5.ebuild 2066 BLAKE2B f149d99306cf8df43776894b72b06b7173149f45abb0cb38a77e85dd08a63e445647d6532c2066bc9c760882891ca49af1b54fda97e79b1c949a80d264f8ab16 SHA512 22a6f7cb86e056f2dd0887b67562b1f849f9eed71cca16d67edb9a9e436a2941cdf8147d17ba9e536f5bac640a7759928acb08746d8f0e3d2b1c572b7565833a
+EBUILD xdg-utils-1.1.3_p20210805.ebuild 2308 BLAKE2B 2dc95e5fc672dff85186cc26f0d1e08a0788f5c654f5f855740470eba322168ba6d908b5d3f6be79a1cf48a8998bf87d081825756c949c5bb1fb8a1c69c2ef1e SHA512 360208d597743117bce649395eda1b113e3846afb6a86987a10cba0d1abd976eaaf755cf7acd9baa1433f8578bf2533faf3908fa9a28265566a7dad7b6b472bd
 MISC metadata.xml 229 BLAKE2B 35bd897953d3051382021de0742162ed1a166c98224fec04fc54dc467dfe5492289b1da910ae9213259b20a0bd5bbffc041624ccb3aacc23b56de2c397861d7d SHA512 7340f6b8c0a938920b7940a288c212e868ae0d8cb18b97c028e6e959f72f94e35f37a2d864bb662fc1d01b43bd7b72efdcbcc5d48e700aaf8c845eb6b9d67fed
diff --git a/x11-misc/xdg-utils/xdg-utils-1.1.3_p20210805.ebuild b/x11-misc/xdg-utils/xdg-utils-1.1.3_p20210805.ebuild
new file mode 100644
index 000000000000..db26c50443bd
--- /dev/null
+++ b/x11-misc/xdg-utils/xdg-utils-1.1.3_p20210805.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2022 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"
+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
+	x11-apps/xprop
+	x11-apps/xset
+"
+BDEPEND="
+	>=app-text/xmlto-0.0.28-r3[text(+)]
+	virtual/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
+)
+
+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/xfe/Manifest b/x11-misc/xfe/Manifest
index d83abecc43cd..27f1fab0d0ae 100644
--- a/x11-misc/xfe/Manifest
+++ b/x11-misc/xfe/Manifest
@@ -1,3 +1,5 @@
 DIST xfe-1.43.2.tar.gz 2834576 BLAKE2B 5ac7ebf229febb75a99e4829a38a3675d6674ec6eced13dc5be70d2b68ce88f6394621dffec2d8359e72da7eace582883b72491e90597ab4a8925685cb577fcb SHA512 ad7b450d0828747f801219c23824b0751fc2a7f0eea791369c4adb3090ffe1279056fa8804ef97b25a2f810e00d37357efc962dc9d4087c3d7cc5f8ffb37d51d
+DIST xfe-1.44.tar.xz 1444296 BLAKE2B 3ace2689adc2a4e2b24e44f8f416cad5e4904d38d2be7e275256714a707995368450e63c4cf2eee3f870be51c42f295a938ea6ecd159dd1a996aad53b5d119b3 SHA512 d02f0db46c5ca6e26cff447d7f11bbc5f03a9d28b8d492a783bb47f67431a022785d6f3b25013f82a6121a8675f86caf1a9154a7faa8186e05cf4de0bd2f1749
 EBUILD xfe-1.43.2.ebuild 1484 BLAKE2B 96a66f0334851a54b2dab16517567b15a058b5ad91e992dd8c02b429dc02cfc2d9e80a051c16ef38f40430c16a1af36cc0d40be69440c03a5193e4bc7fef3f01 SHA512 1bdd40f8fbb7d5b39f049394c1dae1d541df5016215a9ccb03c92bafb7c5544759ce76ebe39b8f4b27963e63a591fb97737f9c14c8757c30ae6cc1f183a60ccf
+EBUILD xfe-1.44.ebuild 1565 BLAKE2B de193e16ac944ef5fdbd780eca6d2f768c81346509e44ea65c9a444846818f67bc422f90ec4ce8cbe4b62159d4c73e6c151b950224628ce68b5374c13009e0b6 SHA512 542624c24fc0f8ad4b0dc2026dfff7f01436fe057bb3da747fbf8d2c5c9c2c0ee25c08a0360718ee84d1febfb853ab2cd274aaffdfd7d16a7e32a5f97dd7ce52
 MISC metadata.xml 240 BLAKE2B 92d4660766b1bb154a620ee57ef972fc2aca12436eb5e12f5880166a4303653c370318b65a0b39f86a13994d6f70eaab5c77b5d7b9b00df19fe2da15d29c3054 SHA512 9bd9123eda33c274644858aea8568a9dfcff772f9ebb95acf39b662ba39f0b1febfed0c56e1ab8d17650f192946449ac47338c78bc059202133b600800e375ee
diff --git a/x11-misc/xfe/xfe-1.44.ebuild b/x11-misc/xfe/xfe-1.44.ebuild
new file mode 100644
index 000000000000..e113262eb229
--- /dev/null
+++ b/x11-misc/xfe/xfe-1.44.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PLOCALES="
+	bs ca cs da de el es_AR es_CO es fr hu it ja nl no pl pt_BR pt_PT ru sv tr
+	zh_CN zh_TW
+"
+inherit plocale xdg-utils
+
+DESCRIPTION="MS-Explorer-like minimalist file manager for X"
+HOMEPAGE="http://roland65.free.fr/xfe/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug nls startup-notification"
+
+RDEPEND="
+	x11-libs/fox:1.6[png,truetype]
+	media-libs/fontconfig
+	x11-libs/libXrandr
+	x11-libs/libX11
+	x11-libs/libXft
+	startup-notification? (
+		x11-libs/libxcb:=
+		x11-libs/startup-notification
+		x11-libs/xcb-util
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/intltool
+	virtual/pkgconfig
+	nls? (
+		sys-devel/gettext
+	)
+"
+
+DOCS=( AUTHORS BUGS ChangeLog README TODO )
+
+src_prepare() {
+	default
+
+	cat >po/POTFILES.skip || die <<-EOF
+	src/icons.cpp
+	xfe.desktop.in.in
+	xfi.desktop.in.in
+	xfp.desktop.in.in
+	xfv.desktop.in.in
+	xfw.desktop.in.in
+	EOF
+
+	# malformed LINGUAS file
+	# recent intltool expects newline for every linguas
+	sed -i \
+		-e '/^#/!s:\s\s*:\n:g' \
+		po/LINGUAS || die
+
+	# remove not selected locales
+	rm_locale() { sed -i -e "/${1}/d" po/LINGUAS || die ;}
+	plocale_for_each_disabled_locale rm_locale
+}
+
+src_configure() {
+	econf \
+		$(use_enable debug) \
+		$(use_enable nls) \
+		$(use_enable startup-notification sn) \
+		--enable-minimalflags
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/x11-misc/xkeyboard-config/Manifest b/x11-misc/xkeyboard-config/Manifest
index d9dc884619ea..4112886389ee 100644
--- a/x11-misc/xkeyboard-config/Manifest
+++ b/x11-misc/xkeyboard-config/Manifest
@@ -1,6 +1,4 @@
-DIST xkeyboard-config-2.34.tar.bz2 1763558 BLAKE2B 4417ab66f476de9914113296437b6a1b558c57561169353f533695bbe95831e73045c87bb3a072d1e3c103d2f69aedc3a73e5290c90ecaa8a131419d0d8ca3aa SHA512 cf3bdb658349b2db9db44ea1a0f7060b890b95520319101d83ba5aefeb0b1e2fd578b6f72a90758438f04bffbe7536cf112b76297fd47c95e02029fd203c51fb
-DIST xkeyboard-config-2.35.1.tar.xz 873196 BLAKE2B 22a57cf8858f85dedb78c6fb8d29914e3ba07fc1bafacce40ea1aca485d5db510140af3a5df286ccf3247e8e2715820ea6b6ef412d808b448236f04325eefb8f SHA512 0c62246aa45c9cb883979cc32ba01a6ebf1c3e40673603ddd304a46f1583b997b17ade708849102285f01fe0caafb35abf9c7686ef8be49f4f2b521e03418f94
-EBUILD xkeyboard-config-2.34.ebuild 1032 BLAKE2B 41a3ecfdaf5cf06466f10357f308fe12fd78054558b71763b5c2e720f7e47816d1f71e19d153865e52aa95039d96236af5c424dd88dea42b58218e7a4ff6f20c SHA512 680e6caf58081372230c19aacdca0e5b4e06d309ecfc6d0c791532519cf04a04630d391a353c694ed7b2db389929a8556f9ab18b8a09a4d70a34d457b8d2a802
-EBUILD xkeyboard-config-2.35.1.ebuild 1034 BLAKE2B 4392fe7ebfb849a6e841619ff626e2276aff9e8b42ba8b632dd551df3013622c29a6930ed51a44eae9a677003155a556272397bff92b1c029078fa092be90ada SHA512 19e1322d4b47f0b11cbc08bd2342a5de06ff747d1d3eb6ee98eb2020259e42d8e6984d227a0137a1bdadc7c5bf17ef39d9f522ab733f2070d95450db6de0d102
-EBUILD xkeyboard-config-9999.ebuild 1038 BLAKE2B bfbfcf9d6007d88400383cd60939d3e5cff03f69dd6979174ea2476688ac8a28b6ddeccdd5b2573194da1c95ebfbfd6fe5b06ebf352685b7037a3a1fda835dc0 SHA512 d291d500994eb2a0d95e4c1bccd9e5714dc83e8327f3addc181b83f940cadd9a2fd000f027912215957bf62cf282b4c4f7edf7933704f9447a47a372c1f00168
+DIST xkeyboard-config-2.36.tar.xz 880776 BLAKE2B 3ce6d9e5a1e763beb15614cd1b559ff6d56c2f6438b1c0680755a029ac90e48de4a939b1bcc0054a510cc0e08f6ffa6db98fecd4bf11e01510b151aa664425c3 SHA512 a81054ff6b7928a445a913b80fad995056559feff7bc1f4926657f171a102108b6e22958dc6c814ae2a25445f65c94485f13399628016f1358cf3840e235e3de
+EBUILD xkeyboard-config-2.36.ebuild 1030 BLAKE2B a0bcd6d3b409bfeeb9b987d57e7edd9dbc131ff7cd78cd2741def7c6a70581ea5fbafca2954d85779ece93731573e00dd259d46332b6b8def5f58d424696a6a5 SHA512 77b303d931dca500ae748271ebef479a793392d85da59c9fd5b565d74ce59a2d798ddf1a16d5ecd0e3c6678604b1b1760f91dd1c82a9f1b4ea5fcc57c4e65945
+EBUILD xkeyboard-config-9999.ebuild 1038 BLAKE2B 8ddae88b4c7009cb60dec8707cbe239054a49bd713079aaf28b1c10b31f8458b9dea63415dcf197008f3827a203ca9489117d474c9dc7e48061584ae0f2415b7 SHA512 38ff78bfc51cd3f8bfe2a0cfb6262f2f46a12f17868ac5b3cb6fb0cabe44e6b0ac562ea7cb39a208f743f24f5a7da67f43b98fb822020eb6371c0682e2373eaa
 MISC metadata.xml 338 BLAKE2B 0abfc9e29fc629961ecbcc525a18185afd4b08cee4b68d35d1e2f863b898b1881b68e53f26079d1dfacbcd1f6961433dddf316435f421ec9f8b7a2e669c89eab SHA512 d1df4e20e9260892555393fddfeac0c9190c13cbf2a654ece211faab0c180ecdf592939992d5abf20a432a68a1ac0400e9e65241a9d3c7a04093c11b13123d75
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.34.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.34.ebuild
deleted file mode 100644
index d4fd5d0d6e36..000000000000
--- a/x11-misc/xkeyboard-config/xkeyboard-config-2.34.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-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"
-
-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.bz2"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-lang/perl
-	dev-libs/libxslt
-	sys-devel/gettext
-"
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dxkb-base="${EPREFIX}/usr/share/X11/xkb"
-		-Dcompat-rules=true
-	)
-	meson_src_configure
-}
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.35.1.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.36.ebuild
index 61ee79dadc75..fa640550337b 100644
--- a/x11-misc/xkeyboard-config/xkeyboard-config-2.35.1.ebuild
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.36.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 inherit meson python-any-r1
 
 DESCRIPTION="X keyboard configuration database"
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]]; then
 	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 ~sparc-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 fi
 
 LICENSE="MIT"
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild
index 5220bb275be6..007071e3699d 100644
--- a/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 inherit meson python-any-r1
 
 DESCRIPTION="X keyboard configuration database"
diff --git a/x11-misc/xorg-cf-files/Manifest b/x11-misc/xorg-cf-files/Manifest
index e5a2c4941e3d..d65977cbd5c4 100644
--- a/x11-misc/xorg-cf-files/Manifest
+++ b/x11-misc/xorg-cf-files/Manifest
@@ -1,5 +1,5 @@
 AUX xorg-cf-files-1.0.7-linux-riscv.patch 1936 BLAKE2B 5c518c78519552a2cdbfb067b02130e583e40dd39bc7c2ad7591f4900e7423f50f7c99a6ec47dbe7a44d31bf7c36b5f550f97d2c484ba8e8ea9f7883a6125b2e SHA512 876ee2c392b8ac6ace459779d4620e6d66c6701065c09604c619686b67fee757faf4b6d2299712f330d8f1bb78be7429250b7f3c08df7513b4a22c8749360781
 DIST xorg-cf-files-1.0.6-solaris-prefix.patch.bz2 4364 BLAKE2B 219911bf7fb6907762b70062c43842f116bb0c8ff033569d3a033918b004d89514eda43d1f478c7f0dc1b18adb17f5792990cc8d15cb9770b57e555c0b362f10 SHA512 159d55da274decdac934cded63f33164f5866dc81e853b1a205abdbe56fba4099ab4278e2fb5ff855c0b76784ba2b3fa89e6db2b4fdc9647111698e2c77da4a3
 DIST xorg-cf-files-1.0.7.tar.bz2 345575 BLAKE2B 62ca33673b65cccb4c33c9bc138fac768862d3fd2a8e35d875b4a7af7938df3a2d1437bcb9661c8b84c69a73f60e5ae4a2bf58a003987dcd9293a3a948c97531 SHA512 0dd73b9db9fc16bddc94ef23f11434be6ea2f8e0c7bc5ef3c3bfe6749e13843f88d397eed9f980bbbe9e74147172326bd3c3ccb7adedc9150302756e4b07191e
-EBUILD xorg-cf-files-1.0.7-r1.ebuild 1997 BLAKE2B e0c65969ed946cab88b086b2bab177283aebbdd0b674499195f64f19c285084cac5d5f5ef9caa2d04182adb4b4ff71e4d912726924a2148c5979a13bcae28706 SHA512 701bb63cb65e4c9ee8a529e4a5b3389ab90fe22e8d0bfae0a3aea958216df32f23372a72e24a51cd8114ae6e1f53596321a26666bb15259d1f11747de0c61798
+EBUILD xorg-cf-files-1.0.7-r1.ebuild 2004 BLAKE2B 1a0f5259763e1ccc38882b12924b8142fe007479f6bc46def7c7394096893740ce23a32a4cbfd891f06eb12c34dcc743a154dae2853b21e632b69be72488b7c6 SHA512 f350610b4819fce39c94ade96e140406fde15467bfd80afaa73dc5fb27f7efd9d767050741a3eda0557f7bbddaa45f39dd6e638e2db875db151de47db389ea74
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.7-r1.ebuild b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.7-r1.ebuild
index b562cc67023d..4d120a0e40a1 100644
--- a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.7-r1.ebuild
+++ b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -10,7 +10,7 @@ SRC_URI="https://www.x.org/releases/individual/util/${P}.tar.bz2
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 BDEPEND="
 	virtual/pkgconfig
diff --git a/x11-misc/xosview/Manifest b/x11-misc/xosview/Manifest
index 0b73219109b2..7dcb0ec39bda 100644
--- a/x11-misc/xosview/Manifest
+++ b/x11-misc/xosview/Manifest
@@ -4,4 +4,4 @@ DIST xosview-1.23.tar.gz 146299 BLAKE2B ba336ac152ac6c44bd51c84c160d7c1b565fe23c
 EBUILD xosview-1.20-r1.ebuild 1199 BLAKE2B ac32bb78ba75f80e44e1f4274da49e3823aa76d86ab36626bfbb6894f4aed4100c9cccaec494884f0230410d5274db90af18fada6675c8a62d0c58945cff30fb SHA512 6495b16378dddf4a39ba53bf5d781d464ee32e5dcdbcdb1b9ae5e49d22e4841ed7414ccb85037a5292caf7d04bd24b3137f9b2947fea8861e722c6539466d0fe
 EBUILD xosview-1.22.ebuild 1197 BLAKE2B 286bcd6eb9c228503ef7c1a55c88d4ddc5eddd82dc5e7121e0b3de69eeb2a7e79ae4940bc6812ca45965453890e10ac9d23555a586a761718da215fa0cc6cb54 SHA512 adc133196baa2f683241501e5f06e5a20574d36c6d783b7e20cbb58d3f334a08050ededaeffdf46118fc6e70d09daf242eebf30814fb6c749d8e94d3b39e69fd
 EBUILD xosview-1.23.ebuild 1197 BLAKE2B 286bcd6eb9c228503ef7c1a55c88d4ddc5eddd82dc5e7121e0b3de69eeb2a7e79ae4940bc6812ca45965453890e10ac9d23555a586a761718da215fa0cc6cb54 SHA512 adc133196baa2f683241501e5f06e5a20574d36c6d783b7e20cbb58d3f334a08050ededaeffdf46118fc6e70d09daf242eebf30814fb6c749d8e94d3b39e69fd
-MISC metadata.xml 403 BLAKE2B a6a541349a26b907d76516f72ce5f71373caee4d980f4d5af5ec2cf183ce1fdf4e3dc6d8c53993a3a7cec56b1a24ecee59e440cda4ca3e2f08c19f1ae7a9ab84 SHA512 58e4a99c01cbda4eaa9f5621ab37ef49c89f9e31f025cdc3b394eab00fe877f36499f9be679308eaf4d09769d60d28f0f3c8e26db40996bac617e164eec7f443
+MISC metadata.xml 249 BLAKE2B 58924466b9656749c775c049b6c77ccc3d5ca59321a8e7a84ddb0938461a1872bd765d9f3a6e8b411f0ca5d41fff2d6bccac7790c5f24b5c4d87fc7d265bdf2d SHA512 72ac1d9053c79e5dd2db9d1cc8c1c7934d9ab62560d26c568daac2270ee405187d8af73c8940edf4228dddd228b2c127b5a49e436fb9029814a0e7af5573a7f9
diff --git a/x11-misc/xosview/metadata.xml b/x11-misc/xosview/metadata.xml
index 9ebce3d95d23..b23487decfd8 100644
--- a/x11-misc/xosview/metadata.xml
+++ b/x11-misc/xosview/metadata.xml
@@ -4,8 +4,4 @@
         <maintainer type="person">
                 <email>dilfridge@gentoo.org</email>
         </maintainer>
-        <maintainer type="person">
-                <email>polynomial-c@gentoo.org</email>
-                <name>Lars Wendler</name>
-        </maintainer>
 </pkgmetadata>
diff --git a/x11-misc/xpad/Manifest b/x11-misc/xpad/Manifest
index 3f1e4af49717..e09e894738a7 100644
--- a/x11-misc/xpad/Manifest
+++ b/x11-misc/xpad/Manifest
@@ -1,5 +1,7 @@
 DIST xpad-5.4.0.tar.bz2 163394 BLAKE2B 478e96b6c09748f4643d287887f8432642f42e6786e6473832328f7d1202a1a23d96f2a06859e8da096b0e6c420df06269b6c2459e67cbceb29b9f569d565931 SHA512 a20b1d16d0d9e4cb0b88c969165eb9514b69a0eaef91eca8a3fb4da08ea8a2db32891de3c8a2a4a97db21bf78f515c7b6f798c59ba155f480f866334fca7986f
 DIST xpad-5.7.0.tar.bz2 162675 BLAKE2B 2166816696d2e00a261fcc8e9483841be7803121dc3669ab35fdd014728f16a47860448dd6b754836a3dfcd0fbbd1805b87e470f96c0b692fbe3a588c81ee35f SHA512 ab9319473cbec9a7022e520e2284853270fccca88ad19e8cb52024ce79a2dd8049251009a22b97e2387de12b9e75576e50d4d17a7236cb8e0eb4c840c3400ef3
+DIST xpad-5.8.0.tar.bz2 162732 BLAKE2B 6165e59b2d05e640f820f1f52811f214909f445adee4bfeb595fc3913493d15f4a25556b5edb006163a0c123b9953934c77cb519d0dd9f567170a0282637b43a SHA512 868dc820a172fc31f79fab5ee842e4f7e5646ae0239101bb442fc9a4a79b2c76052a70b635a9fa39fae22838df698a4a398188bc44dada63db16a756330c3cbd
 EBUILD xpad-5.4.0.ebuild 694 BLAKE2B 1ad02a6f235dd20b901970bd3fa5c79ac1be011297d8338c956fd7c3894f9f8cb3ed748e9e1aa81bc01196688610ac8bdcf2cdc19d61506e37ef7b6fd078b9a9 SHA512 fb723683e307f951ef6c68fae4e7b5d915178413c71dca5ac04cfd2e54a656bed9898c46627714193db650e2adb4a5f283d6818dae17a60937438bf5c7a87422
-EBUILD xpad-5.7.0.ebuild 777 BLAKE2B cefb36ffc216f7d2fedd67152aeb53e52901d21836b0f0487300e42643656c584800aa84dabc5ec9fde6d56d75952d32fafce1008d6f618a27a337d1f07daeac SHA512 6359dfb048c411a02af48db086d81bea6733f7d453e9d46db08b72ba1e9844639724bd22b870342ac126bccfb5c825620eb9df00f5c420970f207f0dc80982ef
+EBUILD xpad-5.7.0.ebuild 774 BLAKE2B ad187ebb20a5d275e90f55792ee916e07587e347b3d6d75388b7a43c7be3db831fd73ad07156d5b383ca5056332a623efea84f7a3494a7a581ce12f83a417e94 SHA512 4c2b4caf068bc3b07ed63b300b0482b6f3e734428d245c835101baa41f66d0064808fca7842bdc6b792a058e02f2bb7e47cd569aaf8870351b7522eba641018d
+EBUILD xpad-5.8.0.ebuild 777 BLAKE2B cefb36ffc216f7d2fedd67152aeb53e52901d21836b0f0487300e42643656c584800aa84dabc5ec9fde6d56d75952d32fafce1008d6f618a27a337d1f07daeac SHA512 6359dfb048c411a02af48db086d81bea6733f7d453e9d46db08b72ba1e9844639724bd22b870342ac126bccfb5c825620eb9df00f5c420970f207f0dc80982ef
 MISC metadata.xml 553 BLAKE2B a46c921ebebf55ac68b39fd00a78cb79038c3c78977f5b1967eb7f8b3f9745a1879bf1703cd2e71abe0f9eda83b4847089da3ecd9ed0c3d8864ff37af15f4866 SHA512 a99de9e46f399383bbe225e2ef1518327e4219e2877eb3a2b56e83e9aa6f79ad18e6e999b642e24212653bb0ad3ae44c47b7bce820562746b8f55859193f9f0c
diff --git a/x11-misc/xpad/xpad-5.7.0.ebuild b/x11-misc/xpad/xpad-5.7.0.ebuild
index 91cad0d91599..2df4a07a8d04 100644
--- a/x11-misc/xpad/xpad-5.7.0.ebuild
+++ b/x11-misc/xpad/xpad-5.7.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
+KEYWORDS="amd64 ~arm ppc x86"
 
 RDEPEND="
 	app-accessibility/at-spi2-atk
diff --git a/x11-misc/xpad/xpad-5.8.0.ebuild b/x11-misc/xpad/xpad-5.8.0.ebuild
new file mode 100644
index 000000000000..91cad0d91599
--- /dev/null
+++ b/x11-misc/xpad/xpad-5.8.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools xdg-utils
+
+DESCRIPTION="A sticky note application for GTK"
+HOMEPAGE="https://launchpad.net/xpad"
+SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+
+RDEPEND="
+	app-accessibility/at-spi2-atk
+	dev-libs/atk
+	>=dev-libs/glib-2.58:2
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:3[X]
+	x11-libs/gtksourceview:4
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/pango
+"
+DEPEND="${RDEPEND}"
+BDEPEND=">=dev-util/intltool-0.31
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index 21844056bb04..74ee7d217f77 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -11,7 +11,9 @@ AUX xscreensaver-6.03-without-gl-configure.patch 541 BLAKE2B 42818f7ad82513cde53
 DIST xscreensaver-6.01.tar.gz 27820165 BLAKE2B b2c90b47fb65db79d2473c1e396717156e414a0200672971adadf5729056ad9210822955a71f1a098e2142c00c5e60b24aababf9431903f96ff76e8c2d474052 SHA512 3a6e875196e1340909b2a379c25e758fef490d3d10154aef3096ec1be50fabe0d852de806d45a067eefd061381c8541acd7902d28be3bac15b76bd9d4bf0c02a
 DIST xscreensaver-6.02.tar.gz 22672643 BLAKE2B 2d931fe93230e8c7344abd9180e26ab8775f82604e6f4804c82821c486203be567708cf50f7a11276a6b39df493fe5652b4198765ecb3bc5afc8cbc5a01d4801 SHA512 2291ec6ca2d2a24dae975f7f3a8e1733c06f289eb74955db5b3344c7ddcc1d72f82d380df984ef9199f2ed7ab8a7bc920da57d98f589ae5fd1cee082755ba1ff
 DIST xscreensaver-6.03.tar.gz 25703584 BLAKE2B 1276e469e8f4116fac5d434aeacbc16ff8243b56095d39ff4fcbb390abad935e70d308d2a3ecfebaa453f2dd19944ecc2edb18a229248c02f2e3997f30436bce SHA512 4aa30824c972a73dc09aeba478cad074f273839a4c7641cddd292da38fc75db10a3f6243cbe8619c5e39cad54c27d33e1e271dfed167458faa7747fb0a090630
+DIST xscreensaver-6.04.tar.gz 26112437 BLAKE2B 42411d5f63a99d4aaccbc3bc34f8c31a1f25f1806eaf513a1ba59c2f24722e27fa2a7b1970c82a591502627224c4b4269176bda3475aba58bb945d5cd9a9464b SHA512 7e8f01853b3d9252ce0120894db7dd4fa3cd19114602a09aa770ec750e2f3742585ca4daf19b009e97386f8c0e3cc89330fe760148c6388f41de8cc1f48f8071
 EBUILD xscreensaver-6.01-r4.ebuild 5884 BLAKE2B e6e2b8f44c38c9c22181262b227bccc4fe16339c283de394de919670010ed1b0690681da990792162760ff93ff5090f9ffb2a01547c9abe25686d5726586ace9 SHA512 ded2ad6cf75c380f343b33d64ac2f3540b55fb3a91f640dd49d6f2cabae4634b17c124637e38a6ebd6425f1aeaf54092eb75f3787fbdf7f690e211f4960f3900
 EBUILD xscreensaver-6.02-r1.ebuild 6208 BLAKE2B 73c3fe81451df69263624479a6729da783a89618ebbcac9199bc6623ff56b3a7ada878d21185052d45dd3512618e3603a8d4acd2c2be45e1d8432a76acbfa5bf SHA512 15f08b0b0a41363b6f20206741eaf1dcb6d320f6f84df3a6d6ef76bf91e80607043481ef4b2a31e9a6018724213d3fde17a658c9843663ad09ace60a52969e7a
 EBUILD xscreensaver-6.03.ebuild 6519 BLAKE2B 3714eb6a47f0f4673b5e1e01169d36f50df8a8374f68b080bde5916dcc448100beac6cd09e203d1c42e88bd0f6cc7da574f3f5b9d4b243e5078ed156ecd719b0 SHA512 dacfd2604e1774cd53870c7af26db910f123449c360351e43ae6d2b0eabf64d5001e011c72a5362f9c61312d7bf44fe4cc679eed29e84e9c492b9a74fd483beb
+EBUILD xscreensaver-6.04.ebuild 6531 BLAKE2B 4b47d5e87f477c20a53b79b2ec3fd3f99ad4d9f68a9e68d86b19a352af59381e219bea56e60d5a64d215f71af53034bbc5ca36ce90700e5734a45e3939713559 SHA512 686a2c7183cf0b2e2de2b7a91fa0278a3b7e15144f024bc8f8f4f34efa24d8a6c92a626ddcba36c93cda3207051ac616f39912ea9dc200927a99913612f9f296
 MISC metadata.xml 1125 BLAKE2B a1ac7ece845498dceb98238023472300253798ca00e14a278479e0fad6d91dd37e8cbe205f59ba3080b4cd942bb503a8f3c20ec4513d9b88b397f23b7eaf91a1 SHA512 045d8161087ba016fbfc0bf3ba82b3018e93f0be9467e44b9707818084adb110fce2c94f59f2623a2c4ec3ecadb99a91ebb7f1beb31c16565582da37bb6d582c
diff --git a/x11-misc/xscreensaver/xscreensaver-6.04.ebuild b/x11-misc/xscreensaver/xscreensaver-6.04.ebuild
new file mode 100644
index 000000000000..630db4ff3676
--- /dev/null
+++ b/x11-misc/xscreensaver/xscreensaver-6.04.ebuild
@@ -0,0 +1,247 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic font optfeature pam strip-linguas
+
+DESCRIPTION="Modular screen saver and locker for the X Window System"
+HOMEPAGE="https://www.jwz.org/xscreensaver/"
+SRC_URI="https://www.jwz.org/xscreensaver/${P}.tar.gz"
+
+# Font license mapping for folder ./hacks/fonts/ as following:
+#   clacon.ttf       -- MIT
+#   gallant12x22.ttf -- unclear, hence dropped
+#   luximr.ttf       -- bh-luxi (package media-fonts/font-bh-ttf)
+#   OCRAStd.otf      -- unclear, hence dropped
+#   SpecialElite.ttf -- Apache-2.0
+LICENSE="BSD fonts? ( MIT Apache-2.0 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="elogind fonts +gdk-pixbuf gdm gles glx +gtk jpeg +locking new-login offensive opengl pam +perl +png selinux suid systemd +xft xinerama"
+REQUIRED_USE="
+	gdk-pixbuf? ( gtk )
+	gles? ( !glx opengl )
+	glx? ( opengl )
+	gtk? ( png )
+	opengl? ( png )
+	?? ( elogind systemd )
+"
+
+COMMON_DEPEND="
+	dev-libs/libxml2
+	x11-apps/appres
+	x11-apps/xwininfo
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXt
+	x11-libs/libXxf86vm
+	elogind? ( sys-auth/elogind )
+	gdk-pixbuf? (
+		x11-libs/gdk-pixbuf-xlib
+		>=x11-libs/gdk-pixbuf-2.42.0:2
+	)
+	gtk? ( x11-libs/gtk+:2 )
+	jpeg? ( media-libs/libjpeg-turbo:= )
+	locking? ( virtual/libcrypt:= )
+	new-login? (
+		gdm? ( gnome-base/gdm )
+		!gdm? ( || ( x11-misc/lightdm lxde-base/lxdm ) )
+	)
+	opengl? (
+		virtual/glu
+		virtual/opengl
+	)
+	pam? ( sys-libs/pam )
+	png? ( media-libs/libpng:= )
+	systemd? ( >=sys-apps/systemd-221 )
+	xft? ( x11-libs/libXft )
+	xinerama? ( x11-libs/libXinerama )
+"
+# For USE="perl" see output of `qlist xscreensaver | grep bin | xargs grep '::'`
+RDEPEND="
+	${COMMON_DEPEND}
+	media-gfx/fbida
+	perl? (
+		dev-lang/perl
+		dev-perl/libwww-perl
+		virtual/perl-Digest-MD5
+	)
+	selinux? ( sec-policy/selinux-xscreensaver )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	x11-base/xorg-proto
+"
+BDEPEND="
+	dev-util/intltool
+	sys-devel/bc
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.01-interix.patch
+	"${FILESDIR}"/${PN}-5.31-pragma.patch
+	"${FILESDIR}"/${PN}-6.01-gentoo.patch
+	"${FILESDIR}"/${PN}-5.45-gcc.patch
+	"${FILESDIR}"/${PN}-6.01-configure.ac-sandbox.patch
+	"${FILESDIR}"/${PN}-6.01-without-gl-makefile.patch
+	"${FILESDIR}"/${PN}-6.01-non-gtk-install.patch
+	"${FILESDIR}"/${PN}-6.01-gtk-detection.patch
+	"${FILESDIR}"/${PN}-6.01-configure-install_sh.patch
+	"${FILESDIR}"/${PN}-6.03-without-gl-configure.patch
+)
+
+DOCS=( README{,.hacking} )
+
+src_prepare() {
+	default
+
+	sed -i configure.ac -e '/^ALL_LINGUAS=/d' || die
+	strip-linguas -i po/
+	export ALL_LINGUAS="${LINGUAS}"
+
+	if use new-login && ! use gdm; then #392967
+		sed -i \
+			-e "/default_l.*1/s:gdmflexiserver -ls:${EPREFIX}/usr/libexec/lightdm/&:" \
+			configure{,.ac} || die
+	fi
+
+	# We are patching driver/XScreenSaver.ad.in, so let's delete the
+	# header generated from it so that it gets back in sync during build:
+	rm driver/XScreenSaver_ad.h || die
+
+	if ! use offensive; then
+		sed -i \
+			-e '/boobies/d;/boobs/d;/cock/d;/pussy/d;/viagra/d;/vibrator/d' \
+			hacks/barcode.c || die
+		sed -i \
+			-e 's|erect penis|shuffle board|g' \
+			-e 's|flaccid penis|flaccid anchor|g' \
+			-e 's|vagina|engagement ring|g' \
+			-e 's|Penis|Shuttle|g' \
+			hacks/glx/glsnake.c || die
+		sed -i \
+			's| Stay.*fucking mask\.$||' \
+			hacks/glx/covid19.man \
+			hacks/config/covid19.xml || die
+	fi
+
+	config_rpath_update "${S}"/config.rpath
+
+	# Must be eauto*re*conf, to force the rebuild
+	eautoreconf
+}
+
+src_configure() {
+	if use ppc || use ppc64; then
+		filter-flags -maltivec -mabi=altivec
+		append-flags -U__VEC__
+	fi
+
+	unset BC_ENV_ARGS #24568
+
+	# Works similarly to -Werror,
+	# https://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html#index-Wimplicit-function-declaration
+	filter-flags -pedantic-errors
+
+	# /proc/interrupts won't always have the keyboard bits needed
+	# Not clear this does anything in 6.03+(?) but let's keep it for now in case.
+	# (See also: configure argument)
+	export ac_cv_have_proc_interrupts=yes
+
+	# WARNING: This is NOT a normal autoconf script
+	# Some of the --with options are NOT standard, and expect "--with-X=no" rather than "--without-X"
+	ECONF_OPTS=(
+		$(use_enable locking)
+		$(use_with elogind)
+		$(use_with gdk-pixbuf pixbuf)
+		$(use_with gles)
+		$(use_with glx)
+		$(use_with gtk)
+		$(use_with new-login login-manager)
+		$(use_with opengl gl)
+		$(use_with pam)
+		$(use_with suid setuid-hacks)
+		$(use_with systemd)
+		$(use_with xinerama xinerama-ext)
+		--with-jpeg=$(usex jpeg yes no)
+		--with-png=$(usex png yes no)
+		--with-xft=$(usex xft yes no)
+		--with-app-defaults="${EPREFIX}"/usr/share/X11/app-defaults
+		--with-configdir="${EPREFIX}"/usr/share/${PN}/config
+		--with-dpms-ext
+		--with-hackdir="${EPREFIX}"/usr/$(get_libdir)/misc/${PN}
+		--with-proc-interrupts
+		--with-randr-ext
+		--with-text-file="${EPREFIX}"/etc/gentoo-release
+		--with-xdbe-ext
+		--with-xf86gamma-ext
+		--with-xf86vmode-ext
+		--with-xinput-ext
+		--with-xkb-ext
+		--with-xshm-ext
+		--without-gle
+		--without-kerberos
+		--without-motif
+		--with-proc-oom
+		--x-includes="${EPREFIX}"/usr/include
+		--x-libraries="${EPREFIX}"/usr/$(get_libdir)
+	)
+	# WARNING: This is NOT a normal autoconf script
+	econf "${ECONF_OPTS[@]}"
+}
+
+src_compile() {
+	# stock target is "default", which is broken in some releases.
+	emake all
+}
+
+src_install() {
+	use pam && dodir /etc/pam.d/
+	emake install_prefix="${D}" DESTDIR="${D}" install
+
+	if use fonts; then
+		# Do not install fonts with unclear licensing
+		rm -v "${ED}${FONTDIR}"/{gallant12x22.ttf,OCRAStd.otf} || die
+
+		# Do not duplicate font Luxi Mono (of package media-fonts/font-bh-ttf)
+		rm -v "${ED}${FONTDIR}"/luximr.ttf || die
+
+		font_xfont_config
+	else
+		rm -v "${ED}${FONTDIR}"/*.{ttf,otf} || die
+		rmdir -v "${ED}${FONTDIR}" || die #812473
+	fi
+
+	einstalldocs
+
+	if use pam; then
+		fperms 755 /usr/bin/${PN}
+		pamd_mimic_system ${PN} auth
+	fi
+
+	# bugs #809599, #828869
+	if ! use gtk; then
+		rm "${ED}/usr/bin/xscreensaver-demo" || die
+	fi
+}
+
+pkg_postinst() {
+	use fonts && font_pkg_postinst
+
+	# bug #811885
+	if ! use glx && use opengl; then
+		elog "Enable USE='glx' if OpenGL screensavers are crashing."
+	fi
+
+	optfeature 'Bitmap fonts 75dpi' media-fonts/font-adobe-75dpi
+	optfeature 'Bitmap fonts 100dpi' media-fonts/font-adobe-100dpi
+	optfeature 'Truetype font Luxi Mono' media-fonts/font-bh-ttf
+}
+
+pkg_postrm() {
+	use fonts && font_pkg_postrm
+}
diff --git a/x11-misc/xsettingsd/Manifest b/x11-misc/xsettingsd/Manifest
index 2e94e774ac81..239d217e56b8 100644
--- a/x11-misc/xsettingsd/Manifest
+++ b/x11-misc/xsettingsd/Manifest
@@ -1,3 +1,3 @@
 DIST xsettingsd-1.0.2.tar.gz 22481 BLAKE2B 1f7e8112b8910ea20492109ebc2df90d7113804653d5758bbac2b52116e737505026ddd0e17b5444951ad83606ba41495ce8e165bbe04573c740cc3faee75c1b SHA512 da2a82d0b3f5061a1fad7632d800539f4e81bd3f8631dd724705d0601556c044c62da7469a974cbe8f6d8e070247493ac5776bac966cf36f1fae825562457baa
-EBUILD xsettingsd-1.0.2.ebuild 688 BLAKE2B 4cfbd3514a04fc314025596f43910a0875716c92d702b56369c789b209620426b52bff473f3cb25f875506acfa697596a6f8020760aa98b5f19056a784f2512d SHA512 b59fbc612c9d990236c2bb5e63f24d38a07de8b59c30afb4be7c96976503e093b1c468fdfde6a81f04b8bc870df238a3d7149be6d0d71ae72439344ac9f84401
+EBUILD xsettingsd-1.0.2.ebuild 695 BLAKE2B a3cb03cf53a8655f56daf4c369f9872a0d41649134b5523487ba67ec970cf11854e6bf4884285fc235df1f1dab157f9d735de6005a588bb116e0dd6b855f7954 SHA512 5a62c6206a473f02adad68e61a181cd2eb9c9d86592318b66b80cbe07b35d8766b272ea521ad7a9993fb817a90f4b6d45417bda945d1e559d26c7a01d1bea0db
 MISC metadata.xml 331 BLAKE2B 7f59ec698ab53fd473b6b86beda723e6eee1ff024f29b16495102e7367091b6a38e1bcbb29a8b608480ec2230bf7a05dcd90a72982bd86daee7db531a97fe0db SHA512 bc0358ff8ff0a28a2a16f861df6d2f122396c655b07e7f61bf7b64dcf71f65c02f412fd4d24d14fc267b03f7065fcc6eb549147cdb99388f59f3d61c2290d924
diff --git a/x11-misc/xsettingsd/xsettingsd-1.0.2.ebuild b/x11-misc/xsettingsd/xsettingsd-1.0.2.ebuild
index f4f0fe86e402..9a57075caf2d 100644
--- a/x11-misc/xsettingsd/xsettingsd-1.0.2.ebuild
+++ b/x11-misc/xsettingsd/xsettingsd-1.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/derat/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
 IUSE="test"
 
 RESTRICT="!test? ( test )"
diff --git a/x11-misc/xystray/Manifest b/x11-misc/xystray/Manifest
index 5279ffb6f70e..4cfe478ece8e 100644
--- a/x11-misc/xystray/Manifest
+++ b/x11-misc/xystray/Manifest
@@ -1,5 +1,4 @@
 AUX xystray-1.0-ldflags.patch 316 BLAKE2B bd0239d319aeda5e8c61925378f2a536138cd5257a70a131b6aca45b224b2e554eac0e1e212ecacf3001f2860e9e188e551cbabef4f960f595c34c8640e46c2d SHA512 f452a0a0db60bc4c9c1a67790dd817a979bf09ee7db8e424d2d58bec83d2b56d23ee67e62f8604a82820a54e3c57fecd35ffc1202c2a89b2cb23cc904df730b4
 DIST xystray-1.0.tar.gz 18225 BLAKE2B bc115aa93448a2d6e0c0ec7f57643aa2444557090e1a7de3e3d2b6fe4c3c12045f31dbb09e6cdcb7afb95488c9fd5537a35a4ae82579017f0645d2a46e697acc SHA512 50f3700e497dae875f659d55e2d5c469e977ab513c35f82516f2c139e2813f126bcc7658d76b55346480c0ca7d65a67b74b289cdae775bd13c0dc9da31a9a92c
-EBUILD xystray-1.0-r1.ebuild 533 BLAKE2B 657366d25f72ec1187ea40d0f908b7864d48acb308364b11fd2540a7bc2711b8af70992a44e355c4f127664e3446ba6d67e55a413776c057c631845ba5e1d641 SHA512 cf09011982605f8b8c688b52a1a6885991d0e16a48c9ba1c027169e20fc5e28fc6669c9fd0820d42fedf274f7a331165a190d4c0a994d514ca65c42ec18b9af4
-EBUILD xystray-1.0.ebuild 563 BLAKE2B 5b97ca54ca36f9d362b201844c40ced58a197661e476df8b37ea5ddbdcae0d05b1e991ef6be5bb9debdf076e967713d08e03337ee332aae209d28c31d8882c88 SHA512 844a17b4072343e4b3c25829c2f297e0d5a27f20910c0e35d604383530df38a16ce30bbf0729e34f2b53459c75fbd487a57b5e2517aa1aa178935ccdc9528531
+EBUILD xystray-1.0-r1.ebuild 532 BLAKE2B 85bc7d6bdf48b33d73109818fe9ce6459c311a0415c7f6fdb9be747531756dc3c4702ef17840fc2cface5499078c759142a1b9b302af2f0ce8bee388993aa426 SHA512 af102c26640f4316bb16ea67baeaa7012b77db2090cef1675cd75eecbb0f8535f9093a8e774970e195df2a6bf6a3c5b0acb2d2b0eac55306da82784254e572e0
 MISC metadata.xml 327 BLAKE2B 30be53395c1b7571fec966d0e939d4118ba8bb64845500ea83525bea82ebc4d489f79798034c95484b99cf9332880a56ab424514e025b8ebec8f1fe81eb61c47 SHA512 f4eb05df5b3560e7b6745d4d58bab8c8ed1a768cc6161cea117ae59f3f4668d4661487af1fe5798c2e5762d234d6392605073ef363cbe6fda8a06974b08c9c29
diff --git a/x11-misc/xystray/xystray-1.0-r1.ebuild b/x11-misc/xystray/xystray-1.0-r1.ebuild
index 97ff3ff73bdb..0479175fa362 100644
--- a/x11-misc/xystray/xystray-1.0-r1.ebuild
+++ b/x11-misc/xystray/xystray-1.0-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/steelman/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND="x11-libs/libX11
 	x11-libs/libXt"
diff --git a/x11-misc/xystray/xystray-1.0.ebuild b/x11-misc/xystray/xystray-1.0.ebuild
deleted file mode 100644
index d640d249dafd..000000000000
--- a/x11-misc/xystray/xystray-1.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A simple implementation of freedesktop.org notification area for X"
-HOMEPAGE="https://steelman.github.com/xystray/"
-SRC_URI="https://github.com/steelman/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-CDEPEND="
-	x11-libs/libX11
-	x11-libs/libXt"
-DEPEND="${CDEPEND}
-	x11-libs/libXaw"
-RDEPEND="${CDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-ldflags.patch"
-)
-
-src_install() {
-	dobin xystray
-}
diff --git a/x11-misc/zim/Manifest b/x11-misc/zim/Manifest
index ab0ec7d6f149..be8e48999950 100644
--- a/x11-misc/zim/Manifest
+++ b/x11-misc/zim/Manifest
@@ -8,5 +8,5 @@ EBUILD zim-0.73.5.ebuild 1820 BLAKE2B eeb3f5184d8e68aa56f461979e48fc11bb96979aff
 EBUILD zim-0.74.0.ebuild 1822 BLAKE2B e07614d05c5b81cd4aab38029af5e07675e7a44579b78e27eaf683856e84760603050446535d53262fde93566f24e84822aac9456b0c0a1ec9275650b25ce9b7 SHA512 c8ccbf826b541d23125a2f37c3524257514ddc8c00413586ac43aaf3679e1392baffe48a1346ccab6cad9765ce973d9b10ac7b9fe2f2a5287ff7a9ae93cd4b19
 EBUILD zim-0.74.1.ebuild 1822 BLAKE2B e07614d05c5b81cd4aab38029af5e07675e7a44579b78e27eaf683856e84760603050446535d53262fde93566f24e84822aac9456b0c0a1ec9275650b25ce9b7 SHA512 c8ccbf826b541d23125a2f37c3524257514ddc8c00413586ac43aaf3679e1392baffe48a1346ccab6cad9765ce973d9b10ac7b9fe2f2a5287ff7a9ae93cd4b19
 EBUILD zim-0.74.2.ebuild 1822 BLAKE2B e07614d05c5b81cd4aab38029af5e07675e7a44579b78e27eaf683856e84760603050446535d53262fde93566f24e84822aac9456b0c0a1ec9275650b25ce9b7 SHA512 c8ccbf826b541d23125a2f37c3524257514ddc8c00413586ac43aaf3679e1392baffe48a1346ccab6cad9765ce973d9b10ac7b9fe2f2a5287ff7a9ae93cd4b19
-EBUILD zim-0.74.3.ebuild 1825 BLAKE2B a6d6c0a54fa22ac74d6a0c7eb6a2259706eb8dbe92dc5fbe63760122954ddb513f5f5a290235c2f24ad875ab279c8270f94ed47931dee15c8254a9fc47a5ac63 SHA512 88fa247f89b2857302f9fea0752c0f327f537d2521b7751678e498b077fabc4a4370fdad55f3d16464a1871eb36f18716b5fe73807a3e3d215025d11dee43bd2
+EBUILD zim-0.74.3.ebuild 1823 BLAKE2B 27fa3c392a5b6f0e8c38d566c2694d7b628acc2d0aca9bc384b3170dc2f65670fb8a961fc0943658303e1c05c9f0e8c7b0c2c21ff8cf38a679b1ad2a1b0dbb89 SHA512 0dd65dccb7dbe718b731d993129839a1a668715c0d466879582f12c4eaeaaf7e53d3a080500e2e15fd086cf0408c770f5e2d88994159f662e2dcec86dbbb4d63
 MISC metadata.xml 805 BLAKE2B 15e1443ba8c937c389eff2a4771ea9ae5c6cd52127fe991e02776bbf17cb18cafab377fcea5572779fa0784344b385d57b2fe19c8ba15c568ea6048bd9ea7a29 SHA512 2489ccdc635377d0e8029e60365a8b72fad3efeff99de9d191bf5e1143f32402ea08a188271cf5c31ff7570c81b9a21a9bca54c59fd50984062e91f6ae54225e
diff --git a/x11-misc/zim/zim-0.74.3.ebuild b/x11-misc/zim/zim-0.74.3.ebuild
index fafc803ef254..04a70d299eff 100644
--- a/x11-misc/zim/zim-0.74.3.ebuild
+++ b/x11-misc/zim/zim-0.74.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/${PN}-desktop-wiki/${PN}-desktop-wiki/archive/${PV/_
 
 LICENSE="BSD GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 RESTRICT="test"
 
 RDEPEND="
author	V3n3RiX <venerix@koprulu.sector>	2022-06-29 12:04:12 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2022-06-29 12:04:12 +0100
commit	0f558761aa2dee1017b4751e4017205e015a9560 (patch)
tree	037df795519468a25d9362b4e95cdaeb84eb1cf9 /x11-misc
parent	752d6256e5204b958b0ef7905675a940b5e9172f (diff)