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-apps
parent: 752d6256e5204b958b0ef7905675a940b5e9172f (diff)
72 files changed, 691 insertions, 824 deletions
diff --git a/x11-apps/Manifest.gz b/x11-apps/Manifest.gz
index b40d7614a607..a3784a95beb2 100644
--- a/x11-apps/Manifest.gz
+++ b/x11-apps/Manifest.gz
diff --git a/x11-apps/appres/Manifest b/x11-apps/appres/Manifest
index aadea5ffb317..2820ca2d7602 100644
--- a/x11-apps/appres/Manifest
+++ b/x11-apps/appres/Manifest
@@ -1,5 +1,3 @@
-DIST appres-1.0.5.tar.bz2 124531 BLAKE2B 0d3e497afb3ab7d3565451c0da6594b4e608fa20e1a225162c4347d672db6a94823b5961c112b414e55c86a6b53a684709ddd109991f0545b6897bf276824da8 SHA512 70825563cd80f0f433c48ab2fdae888072939c1b22fb22340b70b9444c97916275ed92c9e5bf9a06bb76c32a5371b89ff7c0211a9a47a227c88311078c2c4137
 DIST appres-1.0.6.tar.xz 118972 BLAKE2B 13e72b26ea51c937e988929626810421f705b7142b3379488b50989114748f5fb2a0d515978dc92c0d0634afdd2fbda1ee4e8f09a1637fc0e70320492d5a61fc SHA512 6d14f6a2ad5c83a4d42d4c51ec9a9f32652dfe7624881f1f41c0b1f4946904e7e5ca81a2fd9f4f4824488ce1bd2a4047f92320626bf33b0f1afc5e6b89d3e2b9
-EBUILD appres-1.0.5-r1.ebuild 413 BLAKE2B 9b97da7ba66d12edb008acc06bf6694c0584f066f0472e2e7c12b731b84b4c71c4f5d66d73edc3eeffb4cb45ee24abf3f8cea19a223bbcf641c52226db2db570 SHA512 9cb2203bbaf0090028f58115d73b9be7653f678c7e83667fc79434da6d38e7fe08c89b9e674b3256e52dfc4e76be02232a7b0caf56e0fa474e056f9bdceb2cb6
-EBUILD appres-1.0.6.ebuild 442 BLAKE2B e3245696a8145f690d0e70d65a702761ce7ff8de04ce7c143573c48e6263ea5501b28c5c4b1290c8558c36d79d0d66470f81dda7f7e888da8d505dd1e96c3651 SHA512 67722257a14e6be9caf400a6bebd05cc6efe1096b7e33cbe8a5bb8f2f9403f9fc58f084a4560f93f02717d4e99430332e3c3ab97e022eef113a82cab25f1b17f
+EBUILD appres-1.0.6.ebuild 438 BLAKE2B fa148ab9bb1fd86dbeb48101776862f2ad029634ab5d018ee1ce19ab7989f7ea3650b3bc4d42adfb7d37b8251da7dcc8a7fc37bb0a589df684b1ddc76638fe8c SHA512 e8bd8016ac885f35a01d694bf244234ba67f244f6aa294d7fe308389c098df83810813e68bb1a9702200693502ea97f7df99f6fddd32d55e6176c7d6913f77dc
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-apps/appres/appres-1.0.5-r1.ebuild b/x11-apps/appres/appres-1.0.5-r1.ebuild
deleted file mode 100644
index 8ecda295a8ba..000000000000
--- a/x11-apps/appres/appres-1.0.5-r1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xorg-3
-
-DESCRIPTION="list X application resource database"
-
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris ~x86-winnt"
-
-RDEPEND="
-	x11-libs/libX11
-	x11-libs/libXt"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
diff --git a/x11-apps/appres/appres-1.0.6.ebuild b/x11-apps/appres/appres-1.0.6.ebuild
index f691e9fb5d69..c6880bfd61ad 100644
--- a/x11-apps/appres/appres-1.0.6.ebuild
+++ b/x11-apps/appres/appres-1.0.6.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="list X application resource database"
 
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris ~x86-winnt"
 
 RDEPEND="
 	x11-libs/libX11
diff --git a/x11-apps/bitmap/Manifest b/x11-apps/bitmap/Manifest
index 71609422cc18..c4696ca17dd3 100644
--- a/x11-apps/bitmap/Manifest
+++ b/x11-apps/bitmap/Manifest
@@ -1,5 +1,3 @@
-DIST bitmap-1.0.9.tar.bz2 181401 BLAKE2B efdf2d2905f6513ba8942d55a1aadca8f47f22736a55894deb9a4afeff132d8e410b8d84d27314253f16cb84ebb530b79c75991427365c45058e58280ede4449 SHA512 873c626c72a0f4025fe8c8aeedbf3fe4ee5657fb487ad7410406a20da518c0358041dc45c2549926cc10e1d031977073b9d1ddb32830fdce95b716a52fe44456
 DIST bitmap-1.1.0.tar.xz 163560 BLAKE2B 411ae6d34059cef35456d7a12fbd2fba6de65d0ad551ea884463f123c0e034e89142f103793a1aa6602649b468e4d9ffc33450a67b592b9355c5878c712a4654 SHA512 3d6c94675f10772daeb71598c3e0ddcb51569b1bfc4771159e9df89599bfeb8bf49f464c24fef54d30a8f737af32136f859f844be03e088d24ed962f88381193
-EBUILD bitmap-1.0.9-r1.ebuild 392 BLAKE2B c73391d4c7f2b71c23625ca0c57a49ada0cb637b7e918fec538550927e122c193b44724b18f8cd5ecad3c70c4beeb03eb186a1ffd500c5366496fe820809821c SHA512 17623ce53d17673024f911a7fbbc65319ea23d76f93ae3cc525f66ed260eb0d6b443730999d975922ae9ad3240ec03a2c1753251bf7b5cf2ab3b5e0de9c42050
-EBUILD bitmap-1.1.0.ebuild 419 BLAKE2B eb27277134b8b1e4419f1b76b67f7f3a11409c296d43936e1b1aeae0b31b0bb0ad7d71c4f996e7fa31f37f89c4e829b0e676fdf05ab354f499b6b71a1070381f SHA512 d90e9e15aebd0ba36aa576eae5c2a47f10381a0a0805d6dec1035dc45dafbefa67771cd28c51cb4595de40148a1ae9bd90f8931300642ff4ead711a778bf6263
+EBUILD bitmap-1.1.0.ebuild 415 BLAKE2B 69c84fb8d6cb07093ee6c55ac3fdafd9222f1872e86561f31d3efad5b64173f7ccb1995d966e1889bb6211610e5fe8059fb7297e12b1b634ccf0d5db8135823e SHA512 13e64e90798e0ac07ddf82e8469f9697251460a98cff77c6bb0de641064143d4772f775256382cd0b004d45be103b7012d1801ac17217eebc04f6ec761663c2e
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-apps/bitmap/bitmap-1.0.9-r1.ebuild b/x11-apps/bitmap/bitmap-1.0.9-r1.ebuild
deleted file mode 100644
index 9b386559ea7a..000000000000
--- a/x11-apps/bitmap/bitmap-1.0.9-r1.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 xorg-3
-
-DESCRIPTION="X.Org bitmap application"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	x11-libs/libX11
-	x11-libs/libXaw
-	x11-libs/libXmu
-	x11-libs/libXt
-	x11-misc/xbitmaps"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
diff --git a/x11-apps/bitmap/bitmap-1.1.0.ebuild b/x11-apps/bitmap/bitmap-1.1.0.ebuild
index 960b250e6a91..2ba774723936 100644
--- a/x11-apps/bitmap/bitmap-1.1.0.ebuild
+++ b/x11-apps/bitmap/bitmap-1.1.0.ebuild
@@ -7,7 +7,7 @@ XORG_TARBALL_SUFFIX=xz
 inherit xorg-3
 
 DESCRIPTION="X.Org bitmap application"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	x11-libs/libX11
diff --git a/x11-apps/editres/Manifest b/x11-apps/editres/Manifest
index ec45da1dbe0a..cc04a1d8267e 100644
--- a/x11-apps/editres/Manifest
+++ b/x11-apps/editres/Manifest
@@ -1,5 +1,3 @@
-DIST editres-1.0.7.tar.bz2 166429 BLAKE2B abaa0764bfc3419e17d5cd222bbe20f5591f7bc8431444aa6739cdc067cfb81f606370df19562410aa54820a0249828ccc9d506a9607031b453a7993af634f60 SHA512 b9c928b556116bf50cf4b6ea779bdc9fedf29f5db3e6a8cc75c122578c92e1cc530a81b226ec24aad183b8ebc2de570f200314b0d9ce7883b6e3306007365b32
 DIST editres-1.0.8.tar.xz 158476 BLAKE2B d0b2ef786e68ed6cf37e06bc776f6d6a104a2da2f68dbe27457e31a11d642d3946cd86667bd3ca2ae952c4fcc7162b86a69064a7dcd00ed16bb3e1f1c29e3e54 SHA512 9a007ed7a02abf61af8b65a163a7289a1e960db390db401bdfad162aa642e0eb887ecf85be14093efd8567c68f5e01450bb8321403a203a00065fa21985c7922
-EBUILD editres-1.0.7.ebuild 355 BLAKE2B f6b8b0784e0402937766ef7e53200c17f47de72b2b7e526e351b824dd28db82a9aa63bb0c9fa05341cd8a945c25bc0d5c08d75fdab6ee253be9d479f11196c1f SHA512 aa885b00e061253d9a14efb22ecbfde541756b8c4848acc997c4b89c0a36b156bf1ec91bc08e456049887d14621cfca918b33916f9452beae14a0d7b16290abd
-EBUILD editres-1.0.8.ebuild 405 BLAKE2B 4ad9bb52e6ddc228018c22314501c38e1a5f958f32c7c08d8b0c88cb8710bf0efd449bcc98df3a600d6a3d57746226fe651f9ccd6ddcad9fec5bf3e3d62d4588 SHA512 fa78e1cbba848cda2f997c9561c16833766ae0878ee076cf817ae85d4eac80febcd9b69f4d152a1b6fa510e4f339b4a41b305f63fedad09f566da0d50bf442f3
+EBUILD editres-1.0.8.ebuild 401 BLAKE2B 7bf015239308fd681173031d09935f16dbfb46e1655aae6381321567aa5e3ea04d1c854ee944c72a5a84dfa60d1039a5734ef8dcb953e7ef7c21fa9bf2269e1f SHA512 30abec4f0a835fb1668f500ee8587828714e9c6811f316016e5d1dd024db72aa0312907d0b6d496264197421adb28ac76a856f4975475bd30dbb890290e77ec5
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-apps/editres/editres-1.0.7.ebuild b/x11-apps/editres/editres-1.0.7.ebuild
deleted file mode 100644
index 3d918065d7f9..000000000000
--- a/x11-apps/editres/editres-1.0.7.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xorg-3
-
-DESCRIPTION="a dynamic resource editor for X Toolkit applications"
-
-KEYWORDS="amd64 arm ~hppa ~mips ppc ppc64 ~s390 sparc x86"
-
-RDEPEND="
-	x11-libs/libX11
-	x11-libs/libXt
-	x11-libs/libXmu
-	x11-libs/libXaw"
-DEPEND="${RDEPEND}"
diff --git a/x11-apps/editres/editres-1.0.8.ebuild b/x11-apps/editres/editres-1.0.8.ebuild
index d9f5ea912f7a..d42db008450f 100644
--- a/x11-apps/editres/editres-1.0.8.ebuild
+++ b/x11-apps/editres/editres-1.0.8.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="a dynamic resource editor for X Toolkit applications"
 
-KEYWORDS="amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
+KEYWORDS="amd64 arm ~hppa ~mips ppc ppc64 ~s390 sparc x86"
 
 RDEPEND="
 	x11-libs/libX11
diff --git a/x11-apps/fonttosfnt/Manifest b/x11-apps/fonttosfnt/Manifest
index adc05d32d15c..ad06fca74616 100644
--- a/x11-apps/fonttosfnt/Manifest
+++ b/x11-apps/fonttosfnt/Manifest
@@ -1,3 +1,3 @@
 DIST fonttosfnt-1.2.2.tar.bz2 146855 BLAKE2B 167db11bd49675d411ec06f5581edd7a87d0518755aba05b330db8d24ec1b5f142228c3b3a0be6a740fee8835a25523cd9fc4d7b8e915cc9d51fb95786254770 SHA512 ceac6ccb064043d46f9f16f31fb89c6cbf7f026d049f7b5325d6af97e809b4cd068e6149413bb328c0af601a98b5070e21d469888a6853f6cabecd5b46f60240
-EBUILD fonttosfnt-1.2.2.ebuild 356 BLAKE2B d3046317971c869dbdaa434699dbade16acffdca3cb4d94361824ac058eb915a2c4a9495bbe10b77542b81e48dba5e3a9c9c4e7dc0e6ad6e9d6f2f58f94d852f SHA512 71f9dd2dede55007f4f5bd2c815fda111f479ef360e9d4826a50258aabf12bae5709870270e3b7962f5416ed7cddf549fbfe9b39f5cd619884331c68533f8567
+EBUILD fonttosfnt-1.2.2.ebuild 363 BLAKE2B 1cc400ca963a7c9f5af45cb7e350821b7f72d45c887c5a29b6b1357f94836e0b06235fb5c914d2776ac215ad8708989fc142fc03ac827bde7e7725ace019f743 SHA512 9011ffb60cd5369544a212f3f6e67d7bb4438ce27673d99b592deefb670c66140c52eeb1edd13aaac9bbb481d378c1ce3ce2ce1dcaeda77ba4eb0d1b85e34c26
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-apps/fonttosfnt/fonttosfnt-1.2.2.ebuild b/x11-apps/fonttosfnt/fonttosfnt-1.2.2.ebuild
index d0b9c33d84ff..4dd4d9591d65 100644
--- a/x11-apps/fonttosfnt/fonttosfnt-1.2.2.ebuild
+++ b/x11-apps/fonttosfnt/fonttosfnt-1.2.2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 inherit xorg-3
 
 DESCRIPTION="X.Org fonttosfnt application"
-KEYWORDS="amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE=""
 RDEPEND="media-libs/freetype:2
 	x11-libs/libX11
diff --git a/x11-apps/iceauth/Manifest b/x11-apps/iceauth/Manifest
index 6e017c2d6d38..9c7fe4594e22 100644
--- a/x11-apps/iceauth/Manifest
+++ b/x11-apps/iceauth/Manifest
@@ -1,5 +1,3 @@
-DIST iceauth-1.0.8.tar.bz2 137905 BLAKE2B 8fb2e29e5f4fee57e5c1f86eb78ce518519f04301e8aa81778e0de6589f62f32478a7cae05db831177f4425eb388f7b666f697314d5ab967ea3e2b6ac7b47d56 SHA512 9d4520adf951b16a3e784349dbb70d5d8176b74b956f8adc63abf55d049745c113b03ccfa60a281fc39b487db3742302dc6287c9985ce83a0157bf4674df2af1
 DIST iceauth-1.0.9.tar.xz 130724 BLAKE2B 39848a28a289f38b43184bc579d8263509dc71bf78ed0a0282e8c22a9f5f468606308ca7785481ce7ff1b683d7854b15cbbadc6ff7c9d0c4d9ff4beef9598211 SHA512 16b2f58008587cf1544037ca8b1c76dbb75eb043b3048b3064e66ba6b147962233f1453c2cf18bfb136dd6dd21d3e27b5219e17e1ab7b81dbe93fb6aff801a72
-EBUILD iceauth-1.0.8-r1.ebuild 403 BLAKE2B 677bf97945d3263c31c94f9a31e19c07221557186b8971f41a18f9ad1b153326bb478160e4db4de979655b78c6bdefef8b08101b7eeeb58ed8ea20a4a37ade1f SHA512 5d78923f8be6b93eaa6c9a04b3ec16bda340c10eec32ce7033bfe5e6a3b612f28fd5c30e71e3465060d27cce0f61bf5b6f3a7c15f145ac225d8116d2544889ae
-EBUILD iceauth-1.0.9.ebuild 439 BLAKE2B ee9b05b42a2d4c59e3b1ffc8ff94056f19653fe9cc9403a0abee303d1e6ead6042d0c6d2eb185c012bf94a26eaaa46d5530c5c084a3905df752c48739a11395b SHA512 e0cb7acc6ca83d11ad0985d434606d344ced60d805b9842fe8edd51dd005b0af9df9308f86475ae050f64f1001eec8b0d2185c899e2fcf72cd35d62f23382d86
+EBUILD iceauth-1.0.9.ebuild 435 BLAKE2B ea8b492c1379e4b4d70602eb3c1eb7a1ce0cce8ce55cde7c3cc55cca5793e6595582b3db8ead9ae97ac5ab79d21585d368e01c252f7db75b632837df6fd584d6 SHA512 6a5b15846f4e4b4e6cbb135dcc9652f3e2485f3ae049739f1c47a465bea0bf533554e0d24d0261ca46b2f879f97c0c625b7ad4f8692b0f115cf23b5d815c9d63
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-apps/iceauth/iceauth-1.0.8-r1.ebuild b/x11-apps/iceauth/iceauth-1.0.8-r1.ebuild
deleted file mode 100644
index db01a5f7392a..000000000000
--- a/x11-apps/iceauth/iceauth-1.0.8-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xorg-3
-
-DESCRIPTION="ICE authority file utility"
-
-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 ~x86-winnt"
-
-RDEPEND="x11-libs/libICE"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
diff --git a/x11-apps/iceauth/iceauth-1.0.9.ebuild b/x11-apps/iceauth/iceauth-1.0.9.ebuild
index 368a6062c857..4927c97ed480 100644
--- a/x11-apps/iceauth/iceauth-1.0.9.ebuild
+++ b/x11-apps/iceauth/iceauth-1.0.9.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="ICE authority file utility"
 
-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 ~x86-winnt"
+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 ~x86-winnt"
 
 RDEPEND="x11-libs/libICE"
 DEPEND="${RDEPEND}
diff --git a/x11-apps/igt-gpu-tools/Manifest b/x11-apps/igt-gpu-tools/Manifest
index 4bb5d25ef0dc..5cddb62060fb 100644
--- a/x11-apps/igt-gpu-tools/Manifest
+++ b/x11-apps/igt-gpu-tools/Manifest
@@ -1,5 +1,5 @@
 AUX igt-gpu-tools-1.26-lib-meson-build-Fix-underscorify-call.patch 1215 BLAKE2B 217ce5b204a3db597e7423fdeb99220a76f943e04feeed5dd35db2333188c88f397d05a0ba87791a0e01a098ee1040712e72848b87db5a32d5c94b3e1458f09c SHA512 f843466a5a48229a420ef2df665bf97ad3af120bb50d1de9cab8ad5390f5d2a80df1346f59b90c8e6fc6a211271e56e5dee67c09c42901b1eeb7370d7feff7ca
 DIST igt-gpu-tools-1.26.tar.xz 1573468 BLAKE2B 31fa9cd61fd9a120c72e78cb5ecbc686477ae82572c702bdd6bbc11ba49dc052b7cf52fa486b93e51c87389d73f892577c1d22ebe71d6f50b1565f32355021d1 SHA512 6eb67f68da1c79fac61e5abd57433ef51dbeb2b6f0923dc84aefb81d7059fbc94378fadcd7321a8f059edd9bac640032bf53c3aa058cf570fe5c31924396af8f
-EBUILD igt-gpu-tools-1.26-r1.ebuild 2588 BLAKE2B ac2c38858bb311e105ec9670938f4a24c5617426885137a0e3ab24e81ede4e45a2c17ba0e069e6b929fdd974aed7443dfdc25bb9765b8f473d9beff8a97ca596 SHA512 57fc8b22920155e9df9cc47961b1ab9c9df05f5225285da80acea4882dcd91f25e00a9b6e8eb5a15e268ff1d62a9c130464278badf95e4d6604a5ce96089af4e
-EBUILD igt-gpu-tools-9999.ebuild 2489 BLAKE2B 768e86dede939ecb1abd954a655789461d26904f7b2df19d12b86a8ccf521bca715fc253e69dfb5d198a11d3a993d6ef27d9ed96ed3910f21a15f8fdbfdbe1e0 SHA512 e6f345dc0b5b59dc853442167ee166747857c6395221105bffd784f395c20b9ead84f65452efd1f79fa29b4f663b0757ec47916a92e52ab97e9985b664aa7919
+EBUILD igt-gpu-tools-1.26-r2.ebuild 2568 BLAKE2B f4015c9e3eda65cdd3a207217722885f128187e4cd5fb266c635ec86f5b291c4c92cb5879a56bf4f6cd4c8dfdb8fb491c8684f523692043c1348667119663679 SHA512 d0474ff326e39c7d38e2594463204280dc93a667bb090b973d79b5799705c3616a8c06a68bb6c0f0d6086bc9888cbd8a9fec0b5f1498b6837c96799393b5ef5a
+EBUILD igt-gpu-tools-9999.ebuild 2469 BLAKE2B d0429ed068366f81159c777caa968439f8ffa3d2e959972b78000e86824d00eb9d4874de6b3be362c12ac5080640bc90731c39d00d0cd16bb6528849e3886334 SHA512 f3d964179851f12b3c3d77bb06ecc38fed0f3a539937609e2e38980f701c18e685df70620e693c2155a30078d6826ff877496112ce20fc15ea84199f7bb86462
 MISC metadata.xml 672 BLAKE2B 00c8c12ec3f3edb3aa57947b00ffd68dcc3f13901e2fb090e217cc954557d1e13802f71dec233d07501ea88e24a5fa9c84e669b0bb5f5d36d4649ea99727991b SHA512 24f16d407f48f21d85cbf38337573fb711ded60283b6766de02923ebe5f4e86e6ff044629518bfaba64a9f66c87c6597233a7227145f7a827934c72754224fb8
diff --git a/x11-apps/igt-gpu-tools/igt-gpu-tools-1.26-r1.ebuild b/x11-apps/igt-gpu-tools/igt-gpu-tools-1.26-r2.ebuild
index 17c026cd7d0e..1f77ad260810 100644
--- a/x11-apps/igt-gpu-tools/igt-gpu-tools-1.26-r1.ebuild
+++ b/x11-apps/igt-gpu-tools/igt-gpu-tools-1.26-r2.ebuild
@@ -36,7 +36,6 @@ RDEPEND="
 	dev-libs/elfutils
 	dev-libs/glib:2
 	sys-apps/kmod:=
-	sys-libs/libunwind:=
 	sys-libs/zlib:=
 	sys-process/procps:=
 	virtual/libudev:=
@@ -58,7 +57,7 @@ RDEPEND="
 		)
 	)
 	runner? ( dev-libs/json-c:= )
-	unwind? ( sys-libs/libunwind )
+	unwind? ( sys-libs/libunwind:= )
 	valgrind? ( dev-util/valgrind )
 	"
 DEPEND="${RDEPEND}
diff --git a/x11-apps/igt-gpu-tools/igt-gpu-tools-9999.ebuild b/x11-apps/igt-gpu-tools/igt-gpu-tools-9999.ebuild
index e165a87a6c39..94cc65a0d5ce 100644
--- a/x11-apps/igt-gpu-tools/igt-gpu-tools-9999.ebuild
+++ b/x11-apps/igt-gpu-tools/igt-gpu-tools-9999.ebuild
@@ -36,7 +36,6 @@ RDEPEND="
 	dev-libs/elfutils
 	dev-libs/glib:2
 	sys-apps/kmod:=
-	sys-libs/libunwind:=
 	sys-libs/zlib:=
 	sys-process/procps:=
 	virtual/libudev:=
@@ -58,7 +57,7 @@ RDEPEND="
 		)
 	)
 	runner? ( dev-libs/json-c:= )
-	unwind? ( sys-libs/libunwind )
+	unwind? ( sys-libs/libunwind:= )
 	valgrind? ( dev-util/valgrind )
 	"
 DEPEND="${RDEPEND}
diff --git a/x11-apps/listres/Manifest b/x11-apps/listres/Manifest
index fda19c7755b6..13764e90af74 100644
--- a/x11-apps/listres/Manifest
+++ b/x11-apps/listres/Manifest
@@ -1,5 +1,3 @@
-DIST listres-1.0.4.tar.bz2 125472 BLAKE2B 99865e682eb2894b7af1a84a6fd29bf16f0345b8660bbb61060dbb7927bf376591c7403356b97cff13ff3392321d52f34388f49fd2aac6dab52592317818010c SHA512 925bceab6ff96fcf91f58ba2f858905d6e2eff7074ba29cfc02def7c19fb493545837884f1070dc004422451f749cd459000c01e8c9bb51a7cce7f7ab4067b8a
 DIST listres-1.0.5.tar.xz 119596 BLAKE2B 849b41415eaf7d5251d8fb1cee061e8272e8abd4df986b28737d0a215953be692fe3b0c008a0bf7c831c5c6664ab1402c5034b2685cd3d799bae77a0296b0f8e SHA512 caa3626773031fbf6d8bcc1f697afe6add64fe4a8d1d766c42d5c2346050869dd23a26a1718411134ab05c75835facf0786cab5595721a16df423cdc54dd813d
-EBUILD listres-1.0.4.ebuild 332 BLAKE2B a2746bb241e17a6fd1ab82157b97db3f849944f86f8773d05e3953d193b8edb6d6c8ceae7b51cdfc7c5cbf05be8ae8426a38980fec90ed6f2c3b6f08e8fe52c6 SHA512 c5ef9cc66fa2628c9c07556e6b3ca52e777e2deb0797669809e455796964c9192d26ae135aeb25df21ea962578578755add27b6d5a8687f516efeba26f833354
-EBUILD listres-1.0.5.ebuild 375 BLAKE2B 3c483d1b52609620e2335676f7268802e77b8f16e969733c4b9e12cc6cd44d0f93144262da8aac7c8a0c661353e5b5d9604112608a5f932c6dd6b0b35e1aa06f SHA512 3e7d8b8f6fda18529fd7512078f969c16f04845a419841c8b38a9466518baf9a2fb7c66d9a4faa235190cc1d60c3d16556e90bdedef943589376e984777a5bbc
+EBUILD listres-1.0.5.ebuild 371 BLAKE2B 829bd7e06c2f9bf7875b50f3bec21686df179004fef9dd934963af03e3f4405b0bf20fe2603d4330ae1763911f6079a6296886c1841dea8d34cc5bda405583cc SHA512 14543c8990bdf548f291348d7d5eb4869e50b0acf55dfaec72140d1054809f5d1ddabbea85e6fceed532ae990969219c7f5e78d6e7b9045b02b5aabc2d139d12
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-apps/listres/listres-1.0.4.ebuild b/x11-apps/listres/listres-1.0.4.ebuild
deleted file mode 100644
index 892b157132fc..000000000000
--- a/x11-apps/listres/listres-1.0.4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xorg-3
-
-DESCRIPTION="list resources in widgets"
-KEYWORDS="amd64 arm ~hppa ~mips ppc ppc64 ~s390 sparc x86"
-IUSE=""
-RDEPEND="x11-libs/libX11
-	x11-libs/libXt
-	x11-libs/libXmu
-	x11-libs/libXaw"
-DEPEND="${RDEPEND}"
diff --git a/x11-apps/listres/listres-1.0.5.ebuild b/x11-apps/listres/listres-1.0.5.ebuild
index 16bf176aa7aa..e464f772e14e 100644
--- a/x11-apps/listres/listres-1.0.5.ebuild
+++ b/x11-apps/listres/listres-1.0.5.ebuild
@@ -7,7 +7,7 @@ XORG_TARBALL_SUFFIX="xz"
 inherit xorg-3
 
 DESCRIPTION="list resources in widgets"
-KEYWORDS="amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
+KEYWORDS="amd64 arm ~hppa ~mips ppc ppc64 ~s390 sparc x86"
 
 RDEPEND="x11-libs/libX11
 	x11-libs/libXt
diff --git a/x11-apps/mesa-progs/Manifest b/x11-apps/mesa-progs/Manifest
index cb3d3d5773a7..e9e33e908912 100644
--- a/x11-apps/mesa-progs/Manifest
+++ b/x11-apps/mesa-progs/Manifest
@@ -1,5 +1,9 @@
+AUX 8.5.0-Disable-things-we-don-t-want.patch 5868 BLAKE2B ed8b2e78ce7e05076a74f7ec415afa315db6d6e197936f03a2cb2a322d9ea33e2cdbb15431cc67d26c40ae07045d941fcad357a61eee56e1c26b6b21d1ad0e59 SHA512 8546b12244339fecbf49ce6d1e32701eefaf915d482adecc58c1190cdcf9a918ea7a135988381173c4742bb3b1ba78fcb96285ce6056744f0ed0cb4395855945
+AUX 9999-Disable-things-we-don-t-want.patch 5920 BLAKE2B 91a2a1e986d351d1224c28cc03af4128cce698609a0544e28559539ffc166787010a18423ce47e8cf574ddbfedf755e833d32cbe1f76f7d72bac504882f079fc SHA512 1b7a0ed30b2deb472c47408cc51a5733404c655653dfd7e25c15fc17e0f4da04012506c4b1de3fead689fe7315ad202ed55fb5b4ec884a4d0946c5c895377564
 AUX mesa-progs-8.4.0-improve-printing.patch 11963 BLAKE2B ad2dd57bf0959da6253d0e5c19523e701d03b9d4465564ff3f7e1462e2f36db0ef6eca46ad847f8f92f44fb91c46e87425d430c47c13f7efc130540071fa3ac8 SHA512 31048947ba19b03277d5dabff8bf3209274e9c95da3b33d9e27c3c1cdf71c3027cc0591ee27bdc0e8dff506da2f0601911cdf5899594674d2dd178204db3085f
 DIST mesa-demos-8.4.0.tar.bz2 10073259 BLAKE2B d251e705c6e3d2fe959161d736401fd06ba267a9c389341098373670b6f44ca7cdb451d96e94e3b22f006b696a9b19e38096423f6438544539f46beda91c03f4 SHA512 b72d03cad36e0535ff18dcfb222ec4200064b9264f6da51a6e5f03b0dd912abe188bc1d600b6698de3ce6f63b28d2ce01565886ca8e7079edc4967fbf2fb0957
+DIST mesa-demos-8.5.0.tar.bz2 10367517 BLAKE2B 60e9edfcfe6d28f73964b81ae4e016fdbeb45d9d6d91de71bf736c86fa6181749f2e12729c8c716f6e6f5d4e39075de131877d1f09c3e511a4338b0f44ddb6a6 SHA512 df6a7f09638ca389d6e8bc569e599dcc59c9aa280bcfb95976d83e5cd3edfe74bb3a31f0953956dc16faa540ee5b09990e3377e1341d836fc527e50ace6e60b8
 EBUILD mesa-progs-8.4.0-r1.ebuild 1913 BLAKE2B 835635568c965741f3ad48e4921011ac4aabd0b5032a05ee7e53894942dccac78f9bdb5767b9ce09182b0f7819899f4163c55b6d91b1a69c15d2bdb700462584 SHA512 0bba7f77b310f3a0511acb711aeec47b69ffe29b35bc35e374dc918247820121ba17dd2bc3d7ede88cc2cb0c744a653284aa9e3d0a691157326a46b8ba051aa7
-EBUILD mesa-progs-9999.ebuild 1876 BLAKE2B a9072b8eb308a99945813384d671f87f06a2d61dc6bf0795fb8c54230856bab5ca545a454fdb16334c0fe19a9e5c4b3ce0dfce225d256bb23588d9328d55bacc SHA512 92a4f6e7e976c0a99ad1870a44659c2aff9f20bdf70d48dded22bf2b28343814d11fbd60cfbfae95c651bfdd1dc2f07cd4d6da517aba90fb97e74a2c3ab15500
+EBUILD mesa-progs-8.5.0.ebuild 1803 BLAKE2B c543e47eed51edabec98ce14490901003738fc853a8ef83d85023cf3e95b76ff698cae0b677b271f8a47ac3ed1aaced2bb33d887d87ee3a3cd5907bfbf703d91 SHA512 a48d3c9a8ee6b0efab638120b447df5b35eae83336c132347fa1439a1fd0a1fab2e7914a112809b83ad83f7b867a11ddb0a4bb51fe067d71e93a65d170b0531d
+EBUILD mesa-progs-9999.ebuild 1802 BLAKE2B e000a568251ea02ac0abdbdc8102f05b7eee49633699c07dde71d6783d29b656fbda85b80aa60456692dbdb262a077636cc2d95ac80457c14f5ddb60844ed4b4 SHA512 4ce30ae2375e523dcf5ce89340bbd6ed7dd440d590ea8608b4bf5692e2108bda2afbe2730edffebe2a7c33c9befa995d53294ddbf1e5268fbc2a42b131f59a03
 MISC metadata.xml 476 BLAKE2B 2f40a2161f77a5ac55a486f6570c4fca5b85f6c28189f22c8e8a373ffb0fe69329a83babb777a53d4f73c87e3ae1ba54cd3e0fcac25b62ce19e55505ce6d602d SHA512 f6c0f2910974cfb42cf748287bed94281cc7753c2632dd4fa4dc6baa0c261d1c408f792c259c4d66251a6449698aa9dcae8690b9f5aea687f73868571d9a48a6
diff --git a/x11-apps/mesa-progs/files/8.5.0-Disable-things-we-don-t-want.patch b/x11-apps/mesa-progs/files/8.5.0-Disable-things-we-don-t-want.patch
new file mode 100644
index 000000000000..666f568e461f
--- /dev/null
+++ b/x11-apps/mesa-progs/files/8.5.0-Disable-things-we-don-t-want.patch
@@ -0,0 +1,254 @@
+From caa6f31f1032f21756ab327429702feb4381045e Mon Sep 17 00:00:00 2001
+From: Matt Turner <mattst88@gmail.com>
+Date: Mon, 30 May 2022 12:16:24 -0400
+Subject: [PATCH] Disable things we don't want
+
+---
+ meson.build                   | 11 +++--------
+ src/egl/opengl/meson.build    | 29 ----------------------------
+ src/egl/opengles2/meson.build |  5 -----
+ src/glad/meson.build          | 17 -----------------
+ src/meson.build               |  2 --
+ src/util/gl_wrap.h            |  2 --
+ src/util/meson.build          | 20 -------------------
+ src/xdemos/meson.build        | 36 -----------------------------------
+ 8 files changed, 3 insertions(+), 119 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index e1968fab..9d59c1ec 100644
+--- a/meson.build
++++ b/meson.build
+@@ -75,14 +75,7 @@ endif
+ 
+ dep_threads = dependency('threads')
+ 
+-dep_glu = dependency('glu', required : dep_x11.found())
+-if not dep_glu.found()
+-  _glu_name = 'GLU'
+-  if host_machine.system() == 'windows'
+-    _glu_name = 'glu32'
+-  endif
+-  dep_glu = cc.find_library(_glu_name, has_headers: 'GL/glu.h')
+-endif
++dep_glu = disabler()
+ 
+ # GBM is needed for EGL on KMS
+ dep_gbm = dependency('gbm', required : false, disabler : true)
+@@ -117,6 +110,8 @@ else
+   )
+ endif
+ 
++dep_glut = disabler()
++
+ if dep_glut.found() and cc.has_function('glutInitContextProfile',
+                                         include_directories: glut_incdir,
+                                         prefix : '#include <GL/freeglut.h>')
+diff --git a/src/egl/opengl/meson.build b/src/egl/opengl/meson.build
+index ba7cadc3..789b25a5 100644
+--- a/src/egl/opengl/meson.build
++++ b/src/egl/opengl/meson.build
+@@ -4,41 +4,12 @@ executable(
+   'eglgears_x11', files('eglgears.c'),
+   dependencies: [_deps, idep_eglut_x11]
+ )
+-executable(
+-  'egltri_x11', files('egltri.c'),
+-  dependencies: [_deps, idep_eglut_x11]
+-)
+-executable(
+-  'xeglgears', files('xeglgears.c'),
+-  dependencies: [_deps, dep_egl, dep_x11]
+-)
+-executable(
+-  'xeglthreads', files('xeglthreads.c'),
+-  dependencies: [_deps, dep_x11]
+-)
+-
+ executable(
+   'eglgears_wayland', files('eglgears.c'),
+   dependencies: [_deps, idep_eglut_wayland]
+ )
+-executable(
+-  'egltri_wayland', files('egltri.c'),
+-  dependencies: [_deps, idep_eglut_wayland]
+-)
+-
+-executable(
+-  'eglkms', 'eglkms.c',
+-  dependencies: [_deps, dep_drm, dep_gbm, dep_egl]
+-)
+-
+ executable(
+   'eglinfo', 'eglinfo.c',
+   dependencies: [dep_egl],
+   install: true
+ )
+-
+-executable(
+-  'peglgears', 'peglgears.c',
+-  dependencies: [dep_gl, dep_egl, dep_m, idep_util]
+-)
+-
+diff --git a/src/egl/opengles2/meson.build b/src/egl/opengles2/meson.build
+index 59f69ed7..7137a961 100644
+--- a/src/egl/opengles2/meson.build
++++ b/src/egl/opengles2/meson.build
+@@ -9,11 +9,6 @@ executable(
+   dependencies: [dep_gles2, idep_eglut_x11, dep_m],
+   install: true
+ )
+-executable(
+-  'es2tri', files('es2tri.c'),
+-  dependencies: [_deps_x11, dep_m],
+-  install: true
+-)
+ executable(
+   'es2gears_wayland', files('es2gears.c'),
+   dependencies: [dep_gles2, idep_eglut_wayland, dep_m],
+diff --git a/src/glad/meson.build b/src/glad/meson.build
+index 2d107609..23dacd45 100644
+--- a/src/glad/meson.build
++++ b/src/glad/meson.build
+@@ -19,20 +19,3 @@
+ # SOFTWARE.
+ 
+ inc_glad = include_directories('include')
+-
+-_libglad_files = files('src/glad.c')
+-if host_machine.system() == 'windows'
+-  _libglad_files += files('src/glad_wgl.c')
+-endif
+-
+-_libglad = static_library(
+-  'glad',
+-  _libglad_files,
+-  include_directories: inc_glad
+-)
+-
+-idep_glad = declare_dependency(
+-  link_with: _libglad,
+-  dependencies: dep_dl,
+-  include_directories: inc_glad,
+-)
+diff --git a/src/meson.build b/src/meson.build
+index 39cac78d..4d4abbf8 100644
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -55,5 +55,3 @@ endif
+ if host_machine.system() == 'windows'
+   subdir('wgl')
+ endif
+-
+-subdir('data')
+diff --git a/src/util/gl_wrap.h b/src/util/gl_wrap.h
+index b2ff9c8f..f482df5e 100644
+--- a/src/util/gl_wrap.h
++++ b/src/util/gl_wrap.h
+@@ -7,10 +7,8 @@
+ 
+ #ifdef __APPLE__
+ #  include <OpenGL/gl.h>
+-#  include <OpenGL/glu.h>
+ #else
+ #  include <GL/gl.h>
+-#  include <GL/glu.h>
+ #endif
+ 
+ #ifndef GLAPIENTRY
+diff --git a/src/util/meson.build b/src/util/meson.build
+index 9168aecf..066073cc 100644
+--- a/src/util/meson.build
++++ b/src/util/meson.build
+@@ -20,26 +20,6 @@
+ 
+ inc_util = include_directories('.')
+ 
+-files_libutil = files(
+-  'readtex.c',
+-  'showbuffer.c',
+-  'trackball.c',
+-)
+-
+-_deps = []
+-if dep_glut.found()
+-  files_libutil += files('shaderutil.c')
+-  _deps += dep_glut
+-endif
+-
+-_libutil = static_library(
+-  'util',
+-  files_libutil,
+-  include_directories: inc_glad,
+-  dependencies: _deps,
+-)
+-
+ idep_util = declare_dependency(
+-  link_with: _libutil,
+   include_directories: inc_util,
+ )
+diff --git a/src/xdemos/meson.build b/src/xdemos/meson.build
+index d6d5d5d5..ce26699f 100644
+--- a/src/xdemos/meson.build
++++ b/src/xdemos/meson.build
+@@ -21,25 +21,7 @@
+ glx_deps = [dep_gl, dep_x11, dep_m]
+ 
+ progs = [
+-  'glsync',
+-  'glxdemo',
+   'glxgears',
+-  'glxgears_pixmap',
+-  'glxcontexts',
+-  'glxheads',
+-  'glxpixmap',
+-  'glxpbdemo',
+-  'glxsnoop',
+-  'glxswapcontrol',
+-  'manywin',
+-  'multictx',
+-  'offset',
+-  'overlay',
+-  'shape',
+-  'sharedtex',
+-  'texture_from_pixmap',
+-  'wincopy',
+-  'xfont',
+ ]
+ foreach p : progs
+   executable(
+@@ -56,23 +38,7 @@ executable(
+   install: true
+ )
+ 
+-executable(
+-  'xrotfontdemo',
+-  files('xrotfontdemo.c', 'xuserotfont.c'),
+-  dependencies: glx_deps,
+-  install: true
+-)
+-
+-_libpbutil = static_library(
+-  'pbutil',
+-  files('pbutil.c'),
+-  dependencies: glx_deps
+-)
+-
+ pbutil_progs = [
+-  'glxgears_fbconfig',
+-  'pbinfo',
+-  'pbdemo',
+ ]
+ foreach p : pbutil_progs
+   executable(
+@@ -84,8 +50,6 @@ foreach p : pbutil_progs
+ endforeach
+ 
+ thread_progs = [
+-  'glthreads',
+-  'sharedtex_mt',
+ ]
+ foreach p : thread_progs
+   executable(
+-- 
+2.35.1
+
diff --git a/x11-apps/mesa-progs/files/9999-Disable-things-we-don-t-want.patch b/x11-apps/mesa-progs/files/9999-Disable-things-we-don-t-want.patch
new file mode 100644
index 000000000000..9d923a9cbc5c
--- /dev/null
+++ b/x11-apps/mesa-progs/files/9999-Disable-things-we-don-t-want.patch
@@ -0,0 +1,254 @@
+From caa6f31f1032f21756ab327429702feb4381045e Mon Sep 17 00:00:00 2001
+From: Matt Turner <mattst88@gmail.com>
+Date: Mon, 30 May 2022 12:16:24 -0400
+Subject: [PATCH] Disable things we don't want
+
+---
+ meson.build                   | 11 +++--------
+ src/egl/opengl/meson.build    | 29 ----------------------------
+ src/egl/opengles2/meson.build |  5 -----
+ src/glad/meson.build          | 17 -----------------
+ src/meson.build               |  2 --
+ src/util/gl_wrap.h            |  2 --
+ src/util/meson.build          | 20 -------------------
+ src/xdemos/meson.build        | 36 -----------------------------------
+ 8 files changed, 3 insertions(+), 119 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index e1968fab..9d59c1ec 100644
+--- a/meson.build
++++ b/meson.build
+@@ -75,14 +75,7 @@ endif
+ 
+ dep_threads = dependency('threads')
+ 
+-dep_glu = dependency('glu', required : dep_x11.found())
+-if not dep_glu.found()
+-  _glu_name = 'GLU'
+-  if host_machine.system() == 'windows'
+-    _glu_name = 'glu32'
+-  endif
+-  dep_glu = cc.find_library(_glu_name, has_headers: 'GL/glu.h')
+-endif
++dep_glu = disabler()
+ 
+ # GBM is needed for EGL on KMS
+ dep_gbm = dependency('gbm', required : false, disabler : true)
+@@ -117,6 +110,8 @@ else
+   )
+ endif
+ 
++dep_glut = disabler()
++
+ if dep_glut.found() and cc.has_function('glutInitContextProfile',
+                                         include_directories: glut_incdir,
+                                         prefix : '#include <GL/freeglut.h>')
+diff --git a/src/egl/opengl/meson.build b/src/egl/opengl/meson.build
+index ba7cadc3..789b25a5 100644
+--- a/src/egl/opengl/meson.build
++++ b/src/egl/opengl/meson.build
+@@ -4,41 +4,12 @@ executable(
+   'eglgears_x11', files('eglgears.c'),
+   dependencies: [_deps, idep_eglut_x11]
+ )
+-executable(
+-  'egltri_x11', files('egltri.c'),
+-  dependencies: [_deps, dep_glu, idep_eglut_x11]
+-)
+-executable(
+-  'xeglgears', files('xeglgears.c'),
+-  dependencies: [_deps, dep_glu, dep_egl, dep_x11]
+-)
+-executable(
+-  'xeglthreads', files('xeglthreads.c'),
+-  dependencies: [_deps, dep_x11]
+-)
+-
+ executable(
+   'eglgears_wayland', files('eglgears.c'),
+   dependencies: [_deps, dep_glu, idep_eglut_wayland]
+ )
+-executable(
+-  'egltri_wayland', files('egltri.c'),
+-  dependencies: [_deps, dep_glu, idep_eglut_wayland]
+-)
+-
+-executable(
+-  'eglkms', 'eglkms.c',
+-  dependencies: [_deps, dep_drm, dep_gbm, dep_egl]
+-)
+-
+ executable(
+   'eglinfo', 'eglinfo.c',
+   dependencies: [dep_egl],
+   install: true
+ )
+-
+-executable(
+-  'peglgears', 'peglgears.c',
+-  dependencies: [dep_gl, dep_glu, dep_egl, dep_m, idep_util]
+-)
+-
+diff --git a/src/egl/opengles2/meson.build b/src/egl/opengles2/meson.build
+index 59f69ed7..7137a961 100644
+--- a/src/egl/opengles2/meson.build
++++ b/src/egl/opengles2/meson.build
+@@ -9,11 +9,6 @@ executable(
+   dependencies: [dep_gles2, idep_eglut_x11, dep_m],
+   install: true
+ )
+-executable(
+-  'es2tri', files('es2tri.c'),
+-  dependencies: [_deps_x11, dep_m],
+-  install: true
+-)
+ executable(
+   'es2gears_wayland', files('es2gears.c'),
+   dependencies: [dep_gles2, idep_eglut_wayland, dep_m],
+diff --git a/src/glad/meson.build b/src/glad/meson.build
+index 2d107609..23dacd45 100644
+--- a/src/glad/meson.build
++++ b/src/glad/meson.build
+@@ -19,20 +19,3 @@
+ # SOFTWARE.
+ 
+ inc_glad = include_directories('include')
+-
+-_libglad_files = files('src/glad.c')
+-if host_machine.system() == 'windows'
+-  _libglad_files += files('src/glad_wgl.c')
+-endif
+-
+-_libglad = static_library(
+-  'glad',
+-  _libglad_files,
+-  include_directories: inc_glad
+-)
+-
+-idep_glad = declare_dependency(
+-  link_with: _libglad,
+-  dependencies: dep_dl,
+-  include_directories: inc_glad,
+-)
+diff --git a/src/meson.build b/src/meson.build
+index 39cac78d..4d4abbf8 100644
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -55,5 +55,3 @@ endif
+ if host_machine.system() == 'windows'
+   subdir('wgl')
+ endif
+-
+-subdir('data')
+diff --git a/src/util/gl_wrap.h b/src/util/gl_wrap.h
+index b2ff9c8f..f482df5e 100644
+--- a/src/util/gl_wrap.h
++++ b/src/util/gl_wrap.h
+@@ -7,10 +7,8 @@
+ 
+ #ifdef __APPLE__
+ #  include <OpenGL/gl.h>
+-#  include <OpenGL/glu.h>
+ #else
+ #  include <GL/gl.h>
+-#  include <GL/glu.h>
+ #endif
+ 
+ #ifndef GLAPIENTRY
+diff --git a/src/util/meson.build b/src/util/meson.build
+index 9168aecf..066073cc 100644
+--- a/src/util/meson.build
++++ b/src/util/meson.build
+@@ -20,26 +20,6 @@
+ 
+ inc_util = include_directories('.')
+ 
+-files_libutil = files(
+-  'readtex.c',
+-  'showbuffer.c',
+-  'trackball.c',
+-)
+-
+-_deps = [dep_glu]
+-if dep_glut.found()
+-  files_libutil += files('shaderutil.c')
+-  _deps += dep_glut
+-endif
+-
+-_libutil = static_library(
+-  'util',
+-  files_libutil,
+-  include_directories: inc_glad,
+-  dependencies: _deps,
+-)
+-
+ idep_util = declare_dependency(
+-  link_with: _libutil,
+   include_directories: inc_util,
+ )
+diff --git a/src/xdemos/meson.build b/src/xdemos/meson.build
+index d6d5d5d5..ce26699f 100644
+--- a/src/xdemos/meson.build
++++ b/src/xdemos/meson.build
+@@ -21,25 +21,7 @@
+ glx_deps = [dep_gl, dep_x11, dep_m]
+ 
+ progs = [
+-  'glsync',
+-  'glxdemo',
+   'glxgears',
+-  'glxgears_pixmap',
+-  'glxcontexts',
+-  'glxheads',
+-  'glxpixmap',
+-  'glxpbdemo',
+-  'glxsnoop',
+-  'glxswapcontrol',
+-  'manywin',
+-  'multictx',
+-  'offset',
+-  'overlay',
+-  'shape',
+-  'sharedtex',
+-  'texture_from_pixmap',
+-  'wincopy',
+-  'xfont',
+ ]
+ foreach p : progs
+   executable(
+@@ -56,23 +38,7 @@ executable(
+   install: true
+ )
+ 
+-executable(
+-  'xrotfontdemo',
+-  files('xrotfontdemo.c', 'xuserotfont.c'),
+-  dependencies: glx_deps,
+-  install: true
+-)
+-
+-_libpbutil = static_library(
+-  'pbutil',
+-  files('pbutil.c'),
+-  dependencies: glx_deps
+-)
+-
+ pbutil_progs = [
+-  'glxgears_fbconfig',
+-  'pbinfo',
+-  'pbdemo',
+ ]
+ foreach p : pbutil_progs
+   executable(
+@@ -84,8 +50,6 @@ foreach p : pbutil_progs
+ endforeach
+ 
+ thread_progs = [
+-  'glthreads',
+-  'sharedtex_mt',
+ ]
+ foreach p : thread_progs
+   executable(
+-- 
+2.35.1
+
diff --git a/x11-apps/mesa-progs/mesa-progs-8.5.0.ebuild b/x11-apps/mesa-progs/mesa-progs-8.5.0.ebuild
new file mode 100644
index 000000000000..0de99d7b802b
--- /dev/null
+++ b/x11-apps/mesa-progs/mesa-progs-8.5.0.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson-multilib
+
+MY_PN="${PN/progs/demos}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Mesa's OpenGL utility and demo programs (glxgears and glxinfo)"
+HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/ https://gitlab.freedesktop.org/mesa/demos"
+if [[ ${PV} = 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/demos.git"
+else
+	SRC_URI="https://mesa.freedesktop.org/archive/demos/${MY_P}.tar.bz2
+		https://mesa.freedesktop.org/archive/demos/${PV}/${MY_P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+	S="${WORKDIR}/${MY_P}"
+fi
+LICENSE="LGPL-2"
+SLOT="0"
+IUSE="gles2 wayland X"
+
+RDEPEND="
+	media-libs/mesa[${MULTILIB_USEDEP},egl(+),gles2?,wayland?,X?]
+	wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] )
+	X? (
+		x11-libs/libX11[${MULTILIB_USEDEP}]
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+	)
+"
+DEPEND="${RDEPEND}
+	wayland? ( >=dev-libs/wayland-protocols-1.12 )
+	X? ( x11-base/xorg-proto )
+"
+BDEPEND="
+	virtual/pkgconfig
+	wayland? ( dev-util/wayland-scanner )
+"
+
+PATCHES=(
+	"${FILESDIR}"/8.5.0-Disable-things-we-don-t-want.patch
+)
+
+pkg_setup() {
+	MULTILIB_CHOST_TOOLS+=(
+		/usr/bin/eglinfo
+	)
+
+	use X && MULTILIB_CHOST_TOOLS+=(
+		/usr/bin/glxgears
+		/usr/bin/glxinfo
+	)
+
+	use gles2 && use X && MULTILIB_CHOST_TOOLS+=(
+		/usr/bin/es2_info
+		/usr/bin/es2gears_x11
+	)
+
+	use gles2 && use wayland && MULTILIB_CHOST_TOOLS+=(
+		/usr/bin/es2gears_wayland
+	)
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Dlibdrm=disabled
+		-Degl=enabled
+		-Dgles1=disabled
+		$(meson_feature gles2)
+		-Dosmesa=disabled
+		$(meson_feature wayland)
+		$(meson_feature X x11)
+	)
+	meson_src_configure
+}
diff --git a/x11-apps/mesa-progs/mesa-progs-9999.ebuild b/x11-apps/mesa-progs/mesa-progs-9999.ebuild
index ac2f9b7db41f..cc49098d3e76 100644
--- a/x11-apps/mesa-progs/mesa-progs-9999.ebuild
+++ b/x11-apps/mesa-progs/mesa-progs-9999.ebuild
@@ -1,7 +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
+
+inherit meson-multilib
 
 MY_PN="${PN/progs/demos}"
 MY_P="${MY_PN}-${PV}"
@@ -9,10 +11,8 @@ MY_P="${MY_PN}-${PV}"
 DESCRIPTION="Mesa's OpenGL utility and demo programs (glxgears and glxinfo)"
 HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/ https://gitlab.freedesktop.org/mesa/demos"
 if [[ ${PV} = 9999* ]]; then
-	inherit autotools git-r3
+	inherit git-r3
 	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/demos.git"
-	EGIT_CHECKOUT_DIR="${S}"
-	EXPERIMENTAL="true"
 else
 	SRC_URI="https://mesa.freedesktop.org/archive/demos/${MY_P}.tar.bz2
 		https://mesa.freedesktop.org/archive/demos/${PV}/${MY_P}.tar.bz2"
@@ -21,49 +21,58 @@ else
 fi
 LICENSE="LGPL-2"
 SLOT="0"
-IUSE="egl gles2"
+IUSE="gles2 wayland X"
 
 RDEPEND="
-	media-libs/mesa[egl(+)?,gles2?]
-	virtual/opengl
-	x11-libs/libX11"
+	media-libs/mesa[${MULTILIB_USEDEP},egl(+),gles2?,wayland?,X?]
+	wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] )
+	X? (
+		x11-libs/libX11[${MULTILIB_USEDEP}]
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+	)
+"
 DEPEND="${RDEPEND}
-	virtual/glu
-	x11-base/xorg-proto"
-BDEPEND="sys-apps/grep
-	sys-apps/file"
+	wayland? ( >=dev-libs/wayland-protocols-1.12 )
+	X? ( x11-base/xorg-proto )
+"
+BDEPEND="
+	virtual/pkgconfig
+	wayland? ( dev-util/wayland-scanner )
+"
 
-src_prepare() {
-	default
-	[[ ${PV} = 9999* ]] && eautoreconf
-}
+PATCHES=(
+	"${FILESDIR}"/9999-Disable-things-we-don-t-want.patch
+)
 
-src_compile() {
-	emake -C src/glad libglad.la
-	emake -C src/xdemos glxgears glxinfo
+pkg_setup() {
+	MULTILIB_CHOST_TOOLS+=(
+		/usr/bin/eglinfo
+	)
 
-	if use egl; then
-		emake LDLIBS="-lEGL" -C src/egl/opengl/ eglinfo
-		emake -C src/egl/eglut/ libeglut_x11.la
-		emake LDLIBS="-lGL -lEGL -lX11 -lm" -C src/egl/opengl/ eglgears_x11
+	use X && MULTILIB_CHOST_TOOLS+=(
+		/usr/bin/glxgears
+		/usr/bin/glxinfo
+	)
 
-		if use gles2; then
-			emake LDLIBS="-lGLESv2 -lEGL -lX11" -C src/egl/opengles2/ es2_info
-			emake LDLIBS="-lGLESv2 -lEGL -lX11 -lm" -C src/egl/opengles2/ es2gears_x11
-		fi
-	fi
-}
+	use gles2 && use X && MULTILIB_CHOST_TOOLS+=(
+		/usr/bin/es2_info
+		/usr/bin/es2gears_x11
+	)
 
-src_install() {
-	local demo='src/xdemos'
-	if use egl; then
-		demo="${demo} src/egl/opengl"
-
-		use gles2 && demo="${demo} src/egl/opengles2"
-	fi
+	use gles2 && use wayland && MULTILIB_CHOST_TOOLS+=(
+		/usr/bin/es2gears_wayland
+	)
+}
 
-	# Ensure only the binaries are installed and not a similarly named wrapper script
-	find ${demo} -type f -print0 |
-		xargs -0 file | grep executable | grep ELF | cut -f 1 -d : |
-		xargs -I '{}' dobin '{}' || die
+multilib_src_configure() {
+	local emesonargs=(
+		-Dlibdrm=disabled
+		-Degl=enabled
+		-Dgles1=disabled
+		$(meson_feature gles2)
+		-Dosmesa=disabled
+		$(meson_feature wayland)
+		$(meson_feature X x11)
+	)
+	meson_src_configure
 }
diff --git a/x11-apps/mkfontscale/Manifest b/x11-apps/mkfontscale/Manifest
index 4511a2580fb7..05dac7b4d905 100644
--- a/x11-apps/mkfontscale/Manifest
+++ b/x11-apps/mkfontscale/Manifest
@@ -1,5 +1,3 @@
-DIST mkfontscale-1.2.1.tar.bz2 150808 BLAKE2B 0c2cce3a5b400f8c757a9e1f7a0c8ea85f41c7d229cc1197c68340ec9f2b0b36872a914bf04dabb584727405092b4bf9abbc465190ac1b91419d9ecb3d359b83 SHA512 4d243160e1f7f8dfa6a8f53349c1a42a55fc99426455ebdef58352c5e951fce8b4f1fbd1061a76c9a148095b002eac372db1ae5e2647d2ccb4886635b317b18c
 DIST mkfontscale-1.2.2.tar.xz 143436 BLAKE2B 796c6b95f4eb0959db93ccfb1ebae9c73afc618645d85b7ba382559fe4e008ece16c9d86ab32c815923cda9928f030d75c47f2dd5ee6c9857b9e861f9bab0dc9 SHA512 4c846816325347c91008d76b3a5610c1e58a8414fd55117e7ccf51310db4b20b8397ecf6c9177ff77322e27ee088bf034fd175c9210465c50b094bab8dada4b3
-EBUILD mkfontscale-1.2.1.ebuild 611 BLAKE2B c240104b6305309a7dcf3d2c5eb4377315206b3bba217322980275bcedee0f3da02ebd0ce8b603c44c3c30c6a87240971cfa346813b95a6aa3db43ab69a6745d SHA512 cf9a4488f2407b03499b56f1db528a5e69507d08a341e1710cd3a5fc2dfcb75cc05322225c33e7a87314b0469d4e6ca351b94ec0ce82fd1d4ee15b4b19ec0679
-EBUILD mkfontscale-1.2.2.ebuild 572 BLAKE2B 39d3f4b05948e2fcfc98896904b887dc2b12099ad2b78dd0186ad29d3908e4424372278510b1f1997337e27f058c16c54df1bf5cb0ad6b8137055756c0db5d62 SHA512 86ef7ab39a3289e03570c930dd4d6f4e0ca43021807b84addc9dfb181d2ce3cc816ac122797dbd82a004ca065c8f56140b75bfb188cd363a88eecb20a6f94f74
+EBUILD mkfontscale-1.2.2.ebuild 568 BLAKE2B 4d389938770f797b98ae26a21b22e98d96cbcb6d46e1d44c7d3c2fb98ae4cd500f6ff51d3f4f2a96cee0d4e7fdfabea8095a4e588f99335e08a3fd3b71745885 SHA512 0c170d405791a5229ef82ea9d1aab556a2e54b2129fa8f1595be5f7b6c1c7d35f60162e3981d8b1133dfde7b063f08316f719928eb3ce896412ff028499265d4
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-apps/mkfontscale/mkfontscale-1.2.1.ebuild b/x11-apps/mkfontscale/mkfontscale-1.2.1.ebuild
deleted file mode 100644
index 3095e7332bfb..000000000000
--- a/x11-apps/mkfontscale/mkfontscale-1.2.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xorg-3
-
-DESCRIPTION="create an index of scalable font files for X"
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-COMMON_DEPEND="
-	x11-libs/libfontenc
-	media-libs/freetype:2
-	sys-libs/zlib
-	app-arch/bzip2"
-DEPEND="${COMMON_DEPEND}
-	x11-base/xorg-proto"
-RDEPEND="${COMMON_DEPEND}
-	!<x11-apps/mkfontdir-1.2.0"
-
-XORG_CONFIGURE_OPTIONS=(
-	--with-bzip2
-)
diff --git a/x11-apps/mkfontscale/mkfontscale-1.2.2.ebuild b/x11-apps/mkfontscale/mkfontscale-1.2.2.ebuild
index 5e2b5f156352..754e9e1106ae 100644
--- a/x11-apps/mkfontscale/mkfontscale-1.2.2.ebuild
+++ b/x11-apps/mkfontscale/mkfontscale-1.2.2.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="create an index of scalable font files for X"
 
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ~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 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	x11-libs/libfontenc
diff --git a/x11-apps/radeon-profile-daemon/Manifest b/x11-apps/radeon-profile-daemon/Manifest
index ed92d9177106..8fe1445acd1f 100644
--- a/x11-apps/radeon-profile-daemon/Manifest
+++ b/x11-apps/radeon-profile-daemon/Manifest
@@ -3,4 +3,4 @@ AUX radeon-profile-daemon.initd-r2 401 BLAKE2B 4965be70c3df07bbb02710f257fa10c43
 DIST radeon-profile-daemon-20190603.tar.gz 12232 BLAKE2B 3ff02f76178c2a30c8f094a2589aaed7d9e2c8ecc4cd0c8d3b6be1e38dddad39bbb4996ef9b7f87ef999890fbdade6ba3c6bcc39de6ae84bf1c224152a8249f1 SHA512 1c58008400f5acc5bd39353c6e2c109adecc4eb2b5d7976ce240d372cc60996ee93ce50630292ce85b9a1ae92d82e6cce49fd0ccb28f574bc668d212c50a54ab
 EBUILD radeon-profile-daemon-20190603-r1.ebuild 1260 BLAKE2B eeb14f7d278d2d4628313c72e084a1469f4a90872a614855e6b630d1eb00f03f01c9750730be1a51006783ec33a2862fbbd35d7b924a24d7257e310e172a9b66 SHA512 58d65858e98719ab41f69e7bbbfb5954d438215e6f48d07051f715dd8f5cea816cb80136651fdadaba83c9da77b5afe8f5fcf08ce61d9a94a271dbbf9c6377de
 EBUILD radeon-profile-daemon-99999999.ebuild 1260 BLAKE2B eeb14f7d278d2d4628313c72e084a1469f4a90872a614855e6b630d1eb00f03f01c9750730be1a51006783ec33a2862fbbd35d7b924a24d7257e310e172a9b66 SHA512 58d65858e98719ab41f69e7bbbfb5954d438215e6f48d07051f715dd8f5cea816cb80136651fdadaba83c9da77b5afe8f5fcf08ce61d9a94a271dbbf9c6377de
-MISC metadata.xml 359 BLAKE2B f1f16085f047aac67ad1d1523954bde6a37ebd29eced04addc2b48a3ed21dcf56ea095127ff40f3b9f57b86b8ebae3417abc1b572d415cd83870feb04a2ba3fd SHA512 22ceff917259551ea05e497352027a3add16ce8b55f407c63844524ce2bdc30d513a192aa9a79a7d2d3ab6378430602b7d2af2cf236ccdd847172ac8a4d7ad6c
+MISC metadata.xml 270 BLAKE2B 04b7ca0a9452dc1d9ead1d592c10851e57dd95d713a5bf50c17a0d006987f5e501242d221a5715894072449b25ffb48c6bc5dd8ad28d578ee4badbb3ff0d1037 SHA512 3637962d999a2576a4cbe0dd81cef8315c8ea535d6704aab9352d89571fd374e254355c8fa6938eb78c8ce250416a9e49e22361c0b294be6772b9b8dc6286d46
diff --git a/x11-apps/radeon-profile-daemon/metadata.xml b/x11-apps/radeon-profile-daemon/metadata.xml
index 02ace3e05ad5..ca38506de600 100644
--- a/x11-apps/radeon-profile-daemon/metadata.xml
+++ b/x11-apps/radeon-profile-daemon/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="github">marazmista/radeon-profile-daemon</remote-id>
   </upstream>
diff --git a/x11-apps/radeon-profile/Manifest b/x11-apps/radeon-profile/Manifest
index ae3aa21c0e8d..44891bfa5d1a 100644
--- a/x11-apps/radeon-profile/Manifest
+++ b/x11-apps/radeon-profile/Manifest
@@ -4,4 +4,4 @@ DIST radeon-profile-20200824.tar.gz 395416 BLAKE2B 0f1b9ac59c1e5da97cc0446d32f1f
 EBUILD radeon-profile-20200824-r1.ebuild 1293 BLAKE2B d454aad98103b7ed8f96e092faa6104340502dfe22ecd16b23c34a6b1aad53cc1cb1ddec03ea20d8fb5f1c486874c7bb6758e397bbccc75c4a264460779c96d5 SHA512 9ec24225772aa8f17466214b3f2424818a1d222590ffd23068dc4147f792d194eed5791cdfd9a952d7b581f9eb2f72a1d2aaeb429f2e96d80b34d6e0b7f19137
 EBUILD radeon-profile-20200824.ebuild 1248 BLAKE2B ec70477c0942ac99cb44c40d0e081d60fe7e7d47af5113e2a7062cab86fdfc3edac66e4792b6abeaf17aef745d065bbe10cf8ffa398d7f75e5634c34a7952a2e SHA512 b2ca93c74ed62e3ff271040d725fd2801a3215c5e8898f6855dd3ae41d07fa69212afdc4a77bb5a236d0089d49a09d86635e16c9ab49dc347fd24f2f4832cfa0
 EBUILD radeon-profile-99999999.ebuild 1248 BLAKE2B ec70477c0942ac99cb44c40d0e081d60fe7e7d47af5113e2a7062cab86fdfc3edac66e4792b6abeaf17aef745d065bbe10cf8ffa398d7f75e5634c34a7952a2e SHA512 b2ca93c74ed62e3ff271040d725fd2801a3215c5e8898f6855dd3ae41d07fa69212afdc4a77bb5a236d0089d49a09d86635e16c9ab49dc347fd24f2f4832cfa0
-MISC metadata.xml 352 BLAKE2B 050dd75ded3a6877f6a27b8de01401c2e38fbf81651e9eeea8384cfd30ede39afeb54af7e772eea18981cbf74b7343532311ee220b6b71c6896f4b96a7b6224b SHA512 532ec85e6fe31d1901df31c41716302b3651b69944a850a3170f062134969bf03812da4df575e541641aa46269bb3c9fb28435085bf2acfed2f1c387d028bc03
+MISC metadata.xml 263 BLAKE2B 0ef114825cb727f98901f7ba9ad7766db9528c8f9946a254b1e6863b543695b29e20f4a91572c4cdc33f44577c41b57772d67aa37e911fa8e336bf0c7648131b SHA512 136f926d7c66a126786d6238216b9cfa996e8d7d07798dad88f174ddb69d0e86dba436ca5229c1289b233e469ddfe88720066e0ececdb78a81cef9f4df87a463
diff --git a/x11-apps/radeon-profile/metadata.xml b/x11-apps/radeon-profile/metadata.xml
index 0f5b3ff7d13c..f2ed2dcbb898 100644
--- a/x11-apps/radeon-profile/metadata.xml
+++ b/x11-apps/radeon-profile/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="github">marazmista/radeon-profile</remote-id>
   </upstream>
diff --git a/x11-apps/rstart/Manifest b/x11-apps/rstart/Manifest
index 34ed83f733cd..0b493d388a17 100644
--- a/x11-apps/rstart/Manifest
+++ b/x11-apps/rstart/Manifest
@@ -1,5 +1,3 @@
-DIST rstart-1.0.5.tar.bz2 144607 BLAKE2B 2048877683a5a1c1d07bb68d8814cea2a0e1755d7cea3f40b62c086a7f2e8ea2582eea81db46117f906f998bc830f50c437188131584d07fbb68730bfe2491ae SHA512 bda43dd29f95ba5ea4ab42e78069c4011afc6987d00dc580250aec8bec217fabb67577a3038607468de1739d54da596a43cea4c1f5be72e3e572ae6d5abbc09a
 DIST rstart-1.0.6.tar.xz 144888 BLAKE2B d8ea7d48af6bffcbcd5c2f4ed4c6e7678f2d0ef17b5e104731c0a84fcd36d9c877b3f856a5137d066e671d1405d9ad21497c79885f02ba332fa059c0af59c3f6 SHA512 8c0840f172c9efade4557e9a28de19e76e510bd17f1e964936a957dde5ada3d9ae8b2fa0502f61da15cdfc0c69d3308599253ee03571017086a45e4e83958e8f
-EBUILD rstart-1.0.5-r1.ebuild 273 BLAKE2B 914e1fd0ab78cb4d4099e4dc08ffba52c1c9e7e9d67dbb0a2195f9a057320779897d269071208601a66a4e6f024ff109a6a44692c1a0e84e670f0181a3535c05 SHA512 638208dd8676e8f63953578bd845bff593abad42d4169c4fdd72bcd6d04eed9b2bbdba0eaccbe4fe1344a90d4e33eb422af05c61a545797dd831857fddd762be
-EBUILD rstart-1.0.6.ebuild 292 BLAKE2B cd87a60da6127a2a650c641f49d963349d73cc863dec6a5d310aceb7a28e8d56ca40888319953ad5fea4bac6b306dc125bbc8ba4cbcfc68292c1966c3af55417 SHA512 9a608df2e7fcaa8170398c94ee576e06ff10fa7a651f67f6a7709858ed3aca76db0ca62b2b8b911ae2bea60d0e443cf73085e9686faca2920365a30f6cf1dfc0
+EBUILD rstart-1.0.6.ebuild 289 BLAKE2B f6329b7b9c6328606355985f8db700c03140917b8b271e93c9126c1f57e4d8e1a565d2685992acb2c461cd6569586385398cf36654eeb9592d95a1025c1b1963 SHA512 ced3918781a4e6be2b21c27c5aa872ad90d22d07ae64272842b2543b9211c43a5f641e68ce34ca31341a47953a4d7d3eb8cb9a31dcc65d21ebf2021a5a5aa1d8
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-apps/rstart/rstart-1.0.5-r1.ebuild b/x11-apps/rstart/rstart-1.0.5-r1.ebuild
deleted file mode 100644
index ee7cbcde71e5..000000000000
--- a/x11-apps/rstart/rstart-1.0.5-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xorg-3
-
-DESCRIPTION="X.Org rstart application"
-
-KEYWORDS="amd64 arm ~mips ppc ppc64 ~s390 ~sparc x86"
-
-DEPEND="x11-base/xorg-proto"
-RDEPEND="${DEPEND}"
diff --git a/x11-apps/rstart/rstart-1.0.6.ebuild b/x11-apps/rstart/rstart-1.0.6.ebuild
index 487081dae639..88d460806c91 100644
--- a/x11-apps/rstart/rstart-1.0.6.ebuild
+++ b/x11-apps/rstart/rstart-1.0.6.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org rstart application"
 
-KEYWORDS="amd64 ~arm ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
+KEYWORDS="amd64 arm ~mips ppc ppc64 ~s390 ~sparc x86"
 
 DEPEND="x11-base/xorg-proto"
 RDEPEND=""
diff --git a/x11-apps/setxkbmap/Manifest b/x11-apps/setxkbmap/Manifest
index 89bf74f21c4a..66e00bca4eae 100644
--- a/x11-apps/setxkbmap/Manifest
+++ b/x11-apps/setxkbmap/Manifest
@@ -1,5 +1,3 @@
-DIST setxkbmap-1.3.2.tar.bz2 136253 BLAKE2B 0c7ee234ec39546812ed2cf4f57f20f8c5078a3193ad39ce948660ca870ef0b625a8bb7e90e9a9e8b567d6d023f45f62856a6e1b44d8bfd04a1c0fe1a6d9830f SHA512 bfa8015dee0d8d3fdbbd89afbd71c8606ce168d6edca8521d5ed05a00fecbea39bc4bfcce84b71458bdeb34c60bd80a5df27e0691ccee3966443ecdc937faf38
 DIST setxkbmap-1.3.3.tar.xz 130416 BLAKE2B 34ea39054a4e03e5d33778b993afbc0356f898ed45eb9d182fc589a75c92a63275f9c49abbf18b637d83acb9a2f9609794253f3f38f814dbbea741987ddc72ba SHA512 208f07a7f7bce47b573099d4cd8c941a3a4d74b456720bc3ca1cbba298381a2ab98c7500d6e6cd6d5dd61840b7c42cf6521da754ec395f266f8158102a55ad58
-EBUILD setxkbmap-1.3.2.ebuild 468 BLAKE2B 8d6cbd7410260dfa21716e7deac5027090cbbe19a85ddc2b589bb32b38b35bad16ee27ca52d664c151025506bf5859a846be02d7c1847e647620fd2418e40e35 SHA512 5d49e5eedb3c8f021cb395c7269b73cbc69555a06e6e8f5a2c93a9b4f8f1d4d8f6ec43b576fcbdff92445ce08be1265f9960a37dd5075bd4bbf7051ce217dfbd
-EBUILD setxkbmap-1.3.3.ebuild 510 BLAKE2B 088aa4900dd3a77e9cc0b1e3bacc4060f55ff388ee18ca730eb8c4fd7869d502c320455249b40276422dabcc9ddefa9fb78957b9edbefae0ac5e5e6dff579422 SHA512 7dbbd28bfe4984e6b0cc526452a0274f531e8126afc366f5d0fa53f25b03b44a7ffe88aa91aea9dbbb8a152e6ac674251531825cb6b968a3a3452623520243cb
+EBUILD setxkbmap-1.3.3.ebuild 513 BLAKE2B 0db6457e2750c5eaeb3bf06d94cc502254bbf8037d8f58100ee9f869f91781d6272c958afdb5a948ec37b5827384514a5db68603cba507cf2596a80fbd3269f4 SHA512 6e982f0c9c1c71a2cf39ab230302427d9c3d56871cc8139d528fbba7d083cd8b9849c08c1b1a771e55460b1244a1096c045f00a2e8bf4e55a763aa00034e0079
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-apps/setxkbmap/setxkbmap-1.3.2.ebuild b/x11-apps/setxkbmap/setxkbmap-1.3.2.ebuild
deleted file mode 100644
index bcf37d4539fd..000000000000
--- a/x11-apps/setxkbmap/setxkbmap-1.3.2.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 xorg-3
-
-DESCRIPTION="Controls the keyboard layout of a running X server"
-
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-COMMON_DEPEND="
-	x11-libs/libxkbfile
-	x11-libs/libX11"
-DEPEND="${COMMON_DEPEND}
-	x11-base/xorg-proto"
-RDEPEND="${COMMON_DEPEND}
-	x11-misc/xkeyboard-config"
diff --git a/x11-apps/setxkbmap/setxkbmap-1.3.3.ebuild b/x11-apps/setxkbmap/setxkbmap-1.3.3.ebuild
index ce76340151b0..6f10074efa6c 100644
--- a/x11-apps/setxkbmap/setxkbmap-1.3.3.ebuild
+++ b/x11-apps/setxkbmap/setxkbmap-1.3.3.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="Controls the keyboard layout of a running X server"
 
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 COMMON_DEPEND="
 	x11-libs/libxkbfile
diff --git a/x11-apps/xauth/Manifest b/x11-apps/xauth/Manifest
index e23561973402..490b4bb075ee 100644
--- a/x11-apps/xauth/Manifest
+++ b/x11-apps/xauth/Manifest
@@ -1,6 +1,4 @@
-DIST xauth-1.1.1.tar.bz2 167315 BLAKE2B fbe36f867031c734e3a8ae9719145caa16828d4df156503c299812fb63f86462561ffea945f12fabc5e036cc63664ee1d8b5b37630dee8d4af6f2473aa5fcd1a SHA512 998c3158378fff50d368959c29335173b8d98e02591cb3d7b2f9534b5a44b19deb4cb7da9bf291ca5a37f69f833d72839b2c6611723306d10c1b4968ae4d4120
 DIST xauth-1.1.2.tar.xz 156960 BLAKE2B 2ba168229bdf0c1d0fdd4c352e434abfc6f527cbafce35abac8d403a0dea91f00fd858f91f177128d13a0e618d1d95061c71ef32a3e12ac91b72a257dcfcd12b SHA512 ac23fcd166b45abf7b030994ff3332c9906023dc1ddfa9b9d3000e6a914dc5e0213c4a2aa409cb3ddb93e1f9f4f6374376109241a95ef8c36af842de1f6f76e8
-EBUILD xauth-1.1.1.ebuild 627 BLAKE2B 5f961ef4642fe9a226211d3f7c6731b505a05912d23e2feef1edef821b398a9440b8a6944f1e50c45cfe81e419d4e1d47e655816574c4e03f4a8dfa9781c8f1b SHA512 dbabc69355b416ecf3791fac9c87f499588095432424e8d0bbfaca96211e8ed30cdb5c1edb22fd48db1d92fe6b53e201e0ec0643b4ff07dad6b8c3346c833256
-EBUILD xauth-1.1.2.ebuild 595 BLAKE2B b6c0b32c2fdbd61d400a93f03d5d97e7a3209045e87b74fbcf222ac07064937c1e8c895bceff8c48f91882a0b61e67d4c4cde1267ac3eddecbb21265eac93d09 SHA512 429f84dd76f335e08cb244f80998d3b34d15d38cb90965a798aeb5dabe22b510b08cee5b2767f08d6b8ad02a6f1fdd5a1b6efed5f2c0f15a43d21bc39ab5e00d
+EBUILD xauth-1.1.2.ebuild 591 BLAKE2B cd4513fcdf1e456ded9b3c4086dec2201eb0f0f5a5378bdd4cfa66c101dcadb84fec7f0abb8b6094963ff64d176cf062cd9076f846557a03ac7f9656566b8a45 SHA512 8e3e433884c6b766d18b1532081f72974d8fab4d1edfd5b145bb11824b3dba020ab32f1203adff333b16c7d76589badaab6a5723b457ecfdd6687388a1876ee3
 EBUILD xauth-9999.ebuild 599 BLAKE2B 757c7dc62ca39a50b64b5f2ffbf3bf5dcc123524d284457f62259a21fbfbd2db7eb854682cafbbb7ddf260c4254ad5c1836b2c7d9cc6eb2cbb47e626696f3d0f SHA512 8ccbfd002dd63a8d769d9d4a99e6c077bd9253e6dc8e35db34daa0dbe01350e749f12c3e46660ab9ec3b4e9db8379b5ffd238d07e3139690bb4ec640e8f8ccd7
 MISC metadata.xml 235 BLAKE2B 5ed3cd35ac32a5cdd6ac490bafdbc1cd03fc8c6bdbc8194ba7f4a34151a24c4ade7a80705d92348d6d13a9579d18b19ec40a353bf014dc02f98980bfa03d3574 SHA512 3fe78f6dd92b87b30ed02aef15ed72ec5cb62f4c6568dd9b98dcb2f11a4b9ce93955e34c62112a310b4c4a51f87e0e31e31ae5af140e1054c127d3cd344d7267
diff --git a/x11-apps/xauth/xauth-1.1.1.ebuild b/x11-apps/xauth/xauth-1.1.1.ebuild
deleted file mode 100644
index 98550907e512..000000000000
--- a/x11-apps/xauth/xauth-1.1.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xorg-3
-
-if [[ ${PV} == 9999* ]]; then
-	SRC_URI=""
-else
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux"
-fi
-
-DESCRIPTION="X authority file utility"
-IUSE="ipv6"
-RESTRICT="test" # Depends on dead cmdtest package
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXau
-	x11-libs/libXext
-	x11-libs/libXmu"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-src_configure() {
-	local XORG_CONFIGURE_OPTIONS=(
-		$(use_enable ipv6)
-	)
-	xorg-3_src_configure
-}
diff --git a/x11-apps/xauth/xauth-1.1.2.ebuild b/x11-apps/xauth/xauth-1.1.2.ebuild
index 0c046c83629c..8d85f6e27fa3 100644
--- a/x11-apps/xauth/xauth-1.1.2.ebuild
+++ b/x11-apps/xauth/xauth-1.1.2.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 if [[ ${PV} == 9999* ]]; then
 	SRC_URI=""
 else
-	KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="X authority file utility"
diff --git a/x11-apps/xcalc/Manifest b/x11-apps/xcalc/Manifest
index f2e1e182501d..7963980a0903 100644
--- a/x11-apps/xcalc/Manifest
+++ b/x11-apps/xcalc/Manifest
@@ -1,5 +1,3 @@
-DIST xcalc-1.1.0.tar.bz2 148193 BLAKE2B 8643544d7871eca1e242b643f1e80fc76b7b2f64612a75ca2ec2537194df84862d9b86be515acea5114a8f2dc6cfad7c95cf40e396a0aeb26a6951198827755d SHA512 877aab7bb08f409a21c26b841f4d91eb6993914ed0d26512e47d6b3d2b3e0b231158901415a106cfb45de43f03f253bf2a8733f986538d4ee810afe0e54f98d5
 DIST xcalc-1.1.1.tar.xz 140204 BLAKE2B b747a658b03ded2a071f0b54047f8dd4a1aecf6093af14059f2311019e6f9d3790f1190159c278fd3f9d5bf5740bbb1bfb0996540a0985728ed2966239bb4902 SHA512 a261e9798d62727f40b9aff07e68e63ba40aa7f4f9b1811d8efd8c3e73cd5912d6178c55ca3c059968191051bd20b889b06b5e92b3df70c7b5d09bd013b9ebdb
-EBUILD xcalc-1.1.0.ebuild 406 BLAKE2B 54f544bd220946bebd58be10afc930cd413db960412d9cfef28227504d29cfc7871b396f5da4305599501acb5600114b5d20bdad128b2372f09bc63754403c75 SHA512 a73d9ccf820c7c109a640379169cc5bc899c33b710b1934ee5caf880805b448c18316d419bdd37624fb5930d53de8e75ff5001de920d23453ecc09b509bca946
-EBUILD xcalc-1.1.1.ebuild 427 BLAKE2B 90ae0a15d853c446cfa2da776bd90ade557959f6e930c61b31981e5ac4006d70ac5e6ce58026e12e438d6793fdb9ec38b1c2a4ce5955a6b2595d01f2a7c8667a SHA512 9461f64ec99a9bce996d187e156f0daa09459333f8025ffe98c81dca8f417c1f2fe8a49a6a29c1be4316ea0ba68ba3701f71ab946b348b80059ea7b874692b54
+EBUILD xcalc-1.1.1.ebuild 423 BLAKE2B 850d2d18b404bbe64bc6b637fc0449f8ad9db47ba95d763502fb77f68cb1a21eb540e395e08146d8f71e4dc442568f548b5a159fd0e464f3aaf7ed4b595aef22 SHA512 558dbe40c146202bf107dad50f26d86880f4278def727da4b8bf2c14e91df32b1439c73c5d3550061ab5ec4aea91e005def3dbeb57be01509cc3963635253622
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-apps/xcalc/xcalc-1.1.0.ebuild b/x11-apps/xcalc/xcalc-1.1.0.ebuild
deleted file mode 100644
index 110fb3082444..000000000000
--- a/x11-apps/xcalc/xcalc-1.1.0.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xorg-3
-
-DESCRIPTION="scientific calculator for X"
-
-KEYWORDS="amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="x11-libs/libXaw
-	x11-libs/libXt
-	x11-libs/libX11"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
diff --git a/x11-apps/xcalc/xcalc-1.1.1.ebuild b/x11-apps/xcalc/xcalc-1.1.1.ebuild
index 9a328e28eb71..01215f168970 100644
--- a/x11-apps/xcalc/xcalc-1.1.1.ebuild
+++ b/x11-apps/xcalc/xcalc-1.1.1.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="scientific calculator for X"
 
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 
 RDEPEND="x11-libs/libXaw
 	x11-libs/libXt
diff --git a/x11-apps/xclock/Manifest b/x11-apps/xclock/Manifest
index 436f5b1cf203..3f8858f9fefb 100644
--- a/x11-apps/xclock/Manifest
+++ b/x11-apps/xclock/Manifest
@@ -1,7 +1,3 @@
-DIST xclock-1.0.9.tar.bz2 175372 BLAKE2B 6e19535a357f1ed162de1ae5c403cfde6be03a3be6bebd8b338472473c8da71e00a3e6c52e7b43315735bc41345490a6dacf1b934458d4c11fec09072e2f9b00 SHA512 fcbac0b4ab1cea4ae0751ce1c0c6302048e5d98d459873c7580e4ca786ec49fa27f73e5831bdfe135abb5cfeabe886456276e9d01351ea7905c606f40f84522d
-DIST xclock-1.1.0.tar.xz 158984 BLAKE2B 26f39053decd25d481db90f8d2d9e854a4d66170d414de6232e48359c57f1865a581740f34419c8ad986e10c6dbe4aea921d4760c9eb33ca6345255552eca3fe SHA512 9456ed43cb8afce4a1f1c4edcb87bfb86f61fb54d1892f26812ed10662c9b8f8c28854934ce4eb981090d500fec0f295ba96df9867dd1685dc5f31202729a1a0
 DIST xclock-1.1.1.tar.xz 159556 BLAKE2B 5770cc0cf9065eb83b427c63190dae070635eade9410676a343505fc7a9d94098fd8d416384383f5311453a7ec80a0b72e8cb9a86be98eb8275dfd9cc92ba478 SHA512 059ea986bc7537c2796e8855676e8357bd8a7852fbac0839b3f8a9e3ffa088de41bc4e4961973353f0a7b7293366b81bc764d74f3dc4e90e361da06185d976e7
-EBUILD xclock-1.0.9.ebuild 483 BLAKE2B 99bea3e93a63617d084c27c01273b5c426998a3ac6f04a0fba03f0adee2d178c734b1be890390025415ffc22b31f982ba370eff32cfbf907281004b149793b0f SHA512 0dd6779fd3530c68e233aae14753d6ddde1c60cdc40d765ad48e364a9b1ac71e4cf88380448dc4e771696c906b5eda6fc9f2442c811449fc7d4c507c76f6c0a5
-EBUILD xclock-1.1.0.ebuild 507 BLAKE2B 0c8bc56f7ac9ab4cd424f91a82cde1301f69cfc9e180c3845a24cefbab3155f76dcfa56fbd1416aac6add5f29fcfad50cb91798e3d873c6b0a739aadb0506000 SHA512 c5d0f7671cdcbeaae4f7fa8afad05cdbdc485e31c4647f83a12f4141226a68913b98b72ac08c950f302c67a1f7d17f3d97ba93696ec05fbf8c7e6a82a45261c9
-EBUILD xclock-1.1.1.ebuild 511 BLAKE2B 24da89fb3b14972e40844407daf416345c9a4781066c21f76ed1f4989a85fa69ed95d7f6e537c47aa1015adecbdd129d59ccc98bb7e8c3b2a8ba91b443f6d5a3 SHA512 e17c0700bc7b9373187d17e4ed7e0c739444cfa3b374a2b9909cfd3a1a01879c151c476261d415061a4981a754cff24bdbdb400bca322dd2248cfc1f34f7ca02
+EBUILD xclock-1.1.1.ebuild 507 BLAKE2B a713d405b4ed21c15a49041033e140aa69f9c8a7970fce4719e8d5733dcee0aa7a7d1b95ee1a1265cae1df5fe8f0820d7502debd764cda033d09818c1a1f2b4b SHA512 e479619651a8023ce2ec61fe475a719a101ca15dd4aff73f7d7b94328ba390ebf82952125840bdd9ac45175b89a4abaede732569e45d4b92debccfc67d631b26
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-apps/xclock/xclock-1.0.9.ebuild b/x11-apps/xclock/xclock-1.0.9.ebuild
deleted file mode 100644
index a7f8cdae5cae..000000000000
--- a/x11-apps/xclock/xclock-1.0.9.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xorg-3
-
-DESCRIPTION="analog / digital clock for X"
-
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXmu
-	x11-libs/libXrender
-	x11-libs/libXft
-	x11-libs/libxkbfile
-	x11-libs/libXaw"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
diff --git a/x11-apps/xclock/xclock-1.1.0.ebuild b/x11-apps/xclock/xclock-1.1.0.ebuild
deleted file mode 100644
index 7034dfd5e4fe..000000000000
--- a/x11-apps/xclock/xclock-1.1.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-XORG_TARBALL_SUFFIX="xz"
-inherit xorg-3
-
-DESCRIPTION="analog / digital clock for X"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXmu
-	x11-libs/libXrender
-	x11-libs/libXft
-	x11-libs/libxkbfile
-	x11-libs/libXaw"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
diff --git a/x11-apps/xclock/xclock-1.1.1.ebuild b/x11-apps/xclock/xclock-1.1.1.ebuild
index e6f9a4714485..0b2c4f840ccc 100644
--- a/x11-apps/xclock/xclock-1.1.1.ebuild
+++ b/x11-apps/xclock/xclock-1.1.1.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="analog / digital clock for X"
 
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-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"
 
 RDEPEND="x11-libs/libX11
 	x11-libs/libXmu
diff --git a/x11-apps/xdm/Manifest b/x11-apps/xdm/Manifest
index 9326d33c1071..17717d15613e 100644
--- a/x11-apps/xdm/Manifest
+++ b/x11-apps/xdm/Manifest
@@ -1,8 +1,5 @@
 AUX Xsession 1521 BLAKE2B cb2090c2f2c1626df08fe45e80ab668ec9ca43f8f647f9a16d09e7cde7fa33964cbc4f51aa41a537a027749e40c69c3f8543c41924d9d05b54226a0e4400a3a1 SHA512 6cb72d93ab8004e42e9f5002f7f8bb6eb7d9833fd7d3fb0acf7b7b481ead5fb55cb1b836a1e6010fe859e9e04e14064c442e23fdde5991ffb8556ed5aa5af555
-AUX xdm-1.1.12-consolekit.patch 7815 BLAKE2B 1ef67b15385c3cc9a74797fadc34e5701889bf669f70e9c3720a82db595472dcf8fc36011ce35cad763dc68580a7680a272c7617d9cf58db8314f788974031cd SHA512 e318ebe0e606964712db40cb70177d4aa275679ef6e2c0ca97cd5156434d037e8774bc75dad3584e8d13ad4577798fac6624bdb6359f1a57de9eb2961bfdc5f7
 AUX xdm-1.1.12-make-xinerama-optional.patch 978 BLAKE2B feb81c4815c61c62ebd25acec572de03450c4ee5fd7a634cb0444e17d35566548c0bc8dab05562264533676012410839f61b2e5cb5bc98d83bf9a36daa1b59cc SHA512 efddf2cd662cc4e1ca5cea2a9efe49b4ef8e98276f37def047091088a9deaaadc61646deeefbd8668286d08edabd245a532db84ddf938a2853bdcc1865c221c9
-DIST xdm-1.1.12.tar.bz2 512074 BLAKE2B a82d124f4b7ce3185d703fca3aade92e86094602aec5343566ba8c91c54b70cdedbaea2fa6fee330d7ed48d9138b04a998aa2dae06db2683bfcce6c7693edc82 SHA512 1a4be0a070ced5db8fda6fc74794c9f9ed0cb37fa440fda6a3a7652aff62dfc3d7ba68b9facf054671ebf0f4db2a0eec29d0aa3716e3407ccd5529bac3553bdb
 DIST xdm-1.1.13.tar.xz 418404 BLAKE2B b5e1df5e0fd284b227bac5b07114b7882c34adca8c8f7878350576f865ec0675fc7f8218b5eba24e0ca75895093f9412e838a997562ec99bc8196233354bd7eb SHA512 1c7ba51dc8c6989ff6ede3a3abd06e002903609d4ebd31f06ec39fbfee3a80a690c6180f85c3ab135a0de4623261d92a191d1ca5f733cdb3bd2e7e78977b98e5
-EBUILD xdm-1.1.12-r1.ebuild 1896 BLAKE2B 06349c1ad1581abd22fdc2ef29c1b779c172787c90e955c6f08670916bb4358a1693ea3c58618b005ffe690623222985ff1da143841836bd7d64c77e4f16a680 SHA512 e5e85ac18f7e04f9e2c68964e5bb299068aa28731f38132bf35fdd426643f7bfd5b08b1078353cc35d200c6b147b54e33aabffaa2e8e04cb4e4d59bd1644e5f1
-EBUILD xdm-1.1.13.ebuild 1870 BLAKE2B 38d89fafa2c29150faa408fe27753e7a497522b8405bac92e3ef2a501be577e98fe5906ab8c24e264c3528478c061fbaa692f6d8297c628c776d3c37373573bf SHA512 9291d53f14a5607f8772b048d62ee87ef91c6a232dd280f7bf59ca3ea3a98ff246f4f216ce4b4a844f878588de9a7fb0cf09d056e00085ddfa1600ada5dc62bf
+EBUILD xdm-1.1.13.ebuild 1866 BLAKE2B 128b28ef17de6f7b6cdf16b512d9f7f7e27e3516481e43928d921e957615d5285d4d11f51aac5164ac9485df5f64eb5d5ef9bff239dea49439397f6e04b8437a SHA512 d9d53faa7a148b69e70166fd635f6b184916f915a664d1ae055019b3a26c4140f58708a72a8f1bb6920c10e7609bebd7897ebf6c23c2c80c6295ccbb36ea0daa
 MISC metadata.xml 241 BLAKE2B 6fe56bd098998705ece21eed6d30e595c470dfde14e39c39e6413dfc3a7b5a207742d52f5c8cf7a582bdbdb651b0a8fd9729a334393386e3a1afb1587fad1531 SHA512 672a7690a5fc03c8758403450a5e320b891b58fc523fbfe258bef0b214fffee41e43df65cff1528379343a5d8b815d1bf9edb9001049748c1cf118b52450c412
diff --git a/x11-apps/xdm/files/xdm-1.1.12-consolekit.patch b/x11-apps/xdm/files/xdm-1.1.12-consolekit.patch
deleted file mode 100644
index 232d10d94db8..000000000000
--- a/x11-apps/xdm/files/xdm-1.1.12-consolekit.patch
+++ /dev/null
@@ -1,269 +0,0 @@
-http://bugs.gentoo.org/360987
-http://projects.archlinux.org/svntogit/packages.git/plain/trunk/xdm-consolekit.patch?h=packages/xorg-xdm
-http://lists.x.org/archives/xorg-devel/2011-February/019615.html
-http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=615020
----
- configure.ac   |  20 ++++++++--
- include/dm.h   |   3 ++
- man/xdm.man    |   6 +++
- xdm/resource.c |  13 ++++++-
- xdm/session.c  | 102 +++++++++++++++++++++++++++++++++++++++++++++++++
- 5 files changed, 140 insertions(+), 4 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index d110809..db973f7 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -168,15 +168,15 @@ AS_IF([test "x$with_systemdsystemunitdir" != "xno"], [
- AM_CONDITIONAL(HAVE_SYSTEMD, [test "x$with_systemdsystemunitdir" != "xno"])
- 
- # Check whether to enable systemd startup notification.
--# This requires libsystemd-daemon.
-+# This requires libsystemd.
- AC_ARG_WITH([systemd-daemon], AS_HELP_STRING([--with-systemd-daemon],
- 	[Add support for systemd startup notification (default is autodetected)]),
- 	[USE_SYSTEMD_DAEMON=$withval], [USE_SYSTEMD_DAEMON=auto])
- AS_IF([test "x$USE_SYSTEMD_DAEMON" != "xno"], [
--    PKG_CHECK_MODULES([SYSTEMD_DAEMON], [libsystemd-daemon],
-+    PKG_CHECK_MODULES([SYSTEMD_DAEMON], [libsystemd],
- 	[AC_DEFINE(USE_SYSTEMD_DAEMON,1,[Use systemd startup notification])],
- 	[AS_IF([test "x$USE_SYSTEMD_DAEMON" = "xyes"],
--	    [AC_MSG_ERROR([systemd startup notification support requested, but libsystemd-daemon not found.])]
-+	    [AC_MSG_ERROR([systemd startup notification support requested, but libsystemd not found.])]
- 	)]
-     )
- ])
-@@ -395,6 +395,20 @@ PKG_CHECK_MODULES(DMCP, xdmcp)
- PKG_CHECK_MODULES(XLIB, x11)
- PKG_CHECK_MODULES(AUTH, xau)
- 
-+# ConsoleKit support
-+AC_ARG_WITH(consolekit, AC_HELP_STRING([--with-consolekit], [Use ConsoleKit]),
-+	[USE_CONSOLEKIT=$withval], [USE_CONSOLEKIT=yes])
-+if test x"$USE_CONSOLEKIT" != xno; then
-+	PKG_CHECK_MODULES(CK_CONNECTOR, ck-connector,
-+		[USE_CONSOLEKIT=yes], [USE_CONSOLEKIT=no])
-+	if test x"$USE_CONSOLEKIT" = xyes; then
-+		AC_DEFINE([USE_CONSOLEKIT], 1, [Define to 1 to use ConsoleKit])
-+		XDM_CFLAGS="$XDM_CFLAGS $CK_CONNECTOR_CFLAGS -DUSE_CONSOLEKIT"
-+		XDM_LIBS="$XDM_LIBS $CK_CONNECTOR_LIBS"
-+	fi
-+fi
-+dnl AM_CONDITIONAL(USE_CONSOLEKIT, test$USE_CONSOLEKIT = xyes)
-+
- #
- # Greeter
- #
-diff --git a/include/dm.h b/include/dm.h
-index 9116d6f..27fdd71 100644
---- a/include/dm.h
-+++ b/include/dm.h
-@@ -327,6 +327,9 @@ extern char	*randomFile;
- extern char	*prngdSocket;
- extern int	prngdPort;
- # endif
-+#ifdef USE_CONSOLEKIT
-+extern int	use_consolekit;
-+#endif
- 
- extern char	*greeterLib;
- extern char	*willing;
-diff --git a/man/xdm.man b/man/xdm.man
-index ef57d8c..de99d25 100644
---- a/man/xdm.man
-+++ b/man/xdm.man
-@@ -48,6 +48,8 @@ xdm \- X Display Manager with support for XDMCP, host chooser
- ] [
- .B \-session
- .I session_program
-+] [
-+.B \-noconsolekit
- ]
- .SH DESCRIPTION
- .I Xdm
-@@ -215,6 +217,10 @@ indicates the program to run as the session after the user has logged in.
- .IP "\fB\-xrm\fP \fIresource_specification\fP"
- Allows an arbitrary resource to be specified, as in most
- X Toolkit applications.
-+.IP "\fB\-noconsolekit\fP"
-+Specifies ``false'' as the value for the \fBDisplayManager.consoleKit\fP
-+resource.
-+This suppresses the session management using ConsoleKit.
- .SH RESOURCES
- At many stages the actions of
- .I xdm
-diff --git a/xdm/resource.c b/xdm/resource.c
-index 316ace4..725351e 100644
---- a/xdm/resource.c
-+++ b/xdm/resource.c
-@@ -65,6 +65,9 @@ char	*randomDevice;
- char	*prngdSocket;
- int	prngdPort;
- #endif
-+#ifdef USE_CONSOLEKIT
-+int	use_consolekit;
-+#endif
- 
- char	*greeterLib;
- char	*willing;
-@@ -192,6 +195,10 @@ struct dmResources {
- 				"false"} ,
- { "willing",	"Willing",	DM_STRING,	&willing,
- 				""} ,
-+#ifdef USE_CONSOLEKIT
-+{ "consoleKit",	"ConsoleKit",	DM_BOOL,	(char **) &use_consolekit,
-+				"true"} ,
-+#endif
- };
- 
- #define NUM_DM_RESOURCES	(sizeof DmResources / sizeof DmResources[0])
-@@ -377,7 +384,11 @@ XrmOptionDescRec optionTable [] = {
- {"-debug",	"*debugLevel",		XrmoptionSepArg,	(caddr_t) NULL },
- {"-xrm",	NULL,			XrmoptionResArg,	(caddr_t) NULL },
- {"-daemon",	".daemonMode",		XrmoptionNoArg,		"true"         },
--{"-nodaemon",	".daemonMode",		XrmoptionNoArg,		"false"        }
-+{"-nodaemon",	".daemonMode",		XrmoptionNoArg,		"false"        },
-+#ifdef USE_CONSOLEKIT
-+{"-consolekit",	".consoleKit",		XrmoptionNoArg,		"true"  },
-+{"-noconsolekit", ".consoleKit",	XrmoptionNoArg,		"false" }
-+#endif
- };
- 
- static int	originalArgc;
-diff --git a/xdm/session.c b/xdm/session.c
-index 4fd7d0a..c16978d 100644
---- a/xdm/session.c
-+++ b/xdm/session.c
-@@ -73,6 +73,11 @@ extern int key_setnet(struct key_netstarg *arg);
- # endif
- #endif /* USE_PAM */
- 
-+#ifdef USE_CONSOLEKIT
-+#include <ck-connector.h>
-+#include <dbus/dbus.h>
-+#endif
-+
- #ifdef USE_SELINUX
- #include <selinux/selinux.h>
- #include <selinux/get_context_list.h>
-@@ -523,6 +528,97 @@ UnsecureDisplay (struct display *d, Display *dpy)
-     }
- }
- 
-+#ifdef USE_CONSOLEKIT
-+
-+static CkConnector *connector;
-+
-+static int openCKSession(struct verify_info *verify, struct display *d)
-+{
-+    int ret;
-+    DBusError error;
-+    char  *remote_host_name = "";
-+    dbus_bool_t is_local;
-+    char *display_name = "";
-+    char *display_device = "";
-+    char devtmp[16];
-+
-+    if (!use_consolekit)
-+	return 1;
-+
-+    is_local = d->displayType.location == Local;
-+    if (d->peerlen > 0 && d->peer)
-+	remote_host_name = d->peer;
-+    if (d->name)
-+	display_name = d->name;
-+    /* how can we get the corresponding tty at best...? */
-+    if (d->windowPath) {
-+	display_device = strchr(d->windowPath, ':');
-+	if (display_device && display_device[1])
-+	    display_device++;
-+	else
-+	    display_device = d->windowPath;
-+	snprintf(devtmp, sizeof(devtmp), "/dev/tty%s", display_device);
-+	display_device = devtmp;
-+    }
-+
-+    connector = ck_connector_new();
-+    if (!connector) {
-+	LogOutOfMem("ck_connector");
-+	return 0;
-+    }
-+
-+    dbus_error_init(&error);
-+    ret = ck_connector_open_session_with_parameters(
-+		connector, &error,
-+		"unix-user", &verify->uid,
-+		"x11-display", &display_name,
-+		"x11-display-device", &display_device,
-+		"remote-host-name", &remote_host_name,
-+		"is-local", &is_local,
-+		NULL);
-+    if (!ret) {
-+	if (dbus_error_is_set(&error)) {
-+	    LogError("Dbus error: %s\n", error.message);
-+	    dbus_error_free(&error);
-+	} else {
-+	    LogError("ConsoleKit error\n");
-+	}
-+	LogError("console-kit-daemon not running?\n");
-+	ck_connector_unref(connector);
-+	connector = NULL;
-+	return 0;
-+    }
-+
-+    verify->userEnviron = setEnv(verify->userEnviron,
-+		"XDG_SESSION_COOKIE", ck_connector_get_cookie(connector));
-+    return 1;
-+}
-+
-+static void closeCKSession(void)
-+{
-+    DBusError error;
-+
-+    if (!connector)
-+	return;
-+
-+    dbus_error_init(&error);
-+    if (!ck_connector_close_session(connector, &error)) {
-+	if (dbus_error_is_set(&error)) {
-+	    LogError("Dbus error: %s\n", error.message);
-+	    dbus_error_free(&error);
-+	} else {
-+	    LogError("ConsoleKit close error\n");
-+	}
-+	LogError("console-kit-daemon not running?\n");
-+    }
-+    ck_connector_unref(connector);
-+    connector = NULL;
-+}
-+#else
-+#define openCKSession(v,d)	1
-+#define closeCKSession()
-+#endif
-+
- void
- SessionExit (struct display *d, int status, int removeAuth)
- {
-@@ -537,6 +633,8 @@ SessionExit (struct display *d, int status, int removeAuth)
-     }
- #endif
- 
-+    closeCKSession();
-+
-     /* make sure the server gets reset after the session is over */
-     if (d->serverPid >= 2 && d->resetSignal)
- 	kill (d->serverPid, d->resetSignal);
-@@ -614,6 +712,10 @@ StartClient (
- #ifdef USE_PAM
-     if (pamh) pam_open_session(pamh, 0);
- #endif
-+
-+    if (!openCKSession(verify, d))
-+	return 0;
-+
-     switch (pid = fork ()) {
-     case 0:
- 	CleanUpChild ();
--- 
-2.19.2
-
diff --git a/x11-apps/xdm/xdm-1.1.12-r1.ebuild b/x11-apps/xdm/xdm-1.1.12-r1.ebuild
deleted file mode 100644
index cf6d38b4a06a..000000000000
--- a/x11-apps/xdm/xdm-1.1.12-r1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-XORG_EAUTORECONF=yes
-
-inherit xorg-3 pam systemd
-
-DEFAULTVT=vt7
-
-DESCRIPTION="X.Org xdm application"
-
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="ipv6 pam systemd truetype xinerama xpm"
-
-RDEPEND="
-	x11-apps/sessreg
-	x11-apps/xconsole
-	x11-apps/xinit
-	x11-apps/xrdb
-	x11-apps/xsm
-	x11-libs/libX11
-	x11-libs/libXaw
-	x11-libs/libXdmcp
-	x11-libs/libXmu
-	x11-libs/libXt
-	virtual/libcrypt:=
-	pam? ( sys-libs/pam )
-	systemd? ( >=sys-apps/systemd-209 )
-	truetype? (
-		x11-libs/libXrender
-		x11-libs/libXft
-	)
-	xinerama? ( x11-libs/libXinerama )
-	xpm? ( x11-libs/libXpm )
-	elibc_glibc? ( dev-libs/libbsd )"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-src_prepare() {
-	local PATCHES=(
-		"${FILESDIR}"/${P}-consolekit.patch # bug 747124
-		"${FILESDIR}"/${P}-make-xinerama-optional.patch
-	)
-
-	sed -i -e 's:^Alias=.*$:Alias=display-manager.service:' \
-		xdm.service.in || die
-
-	# Disable XDM-AUTHORIZATION-1 (bug #445662).
-	# it causes issue with libreoffice and SDL games (bug #306223).
-	sed -i -e '/authorize/a DisplayManager*authName:	MIT-MAGIC-COOKIE-1' \
-			config/xdm-config.in || die
-
-	xorg-3_src_prepare
-}
-
-src_configure() {
-	local XORG_CONFIGURE_OPTIONS=(
-		$(use_enable ipv6)
-		$(use_with pam)
-		$(use_with systemd systemd-daemon)
-		$(use_with truetype xft)
-		$(use_with xinerama)
-		$(use_enable xpm xpm-logos)
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-		--with-default-vt=${DEFAULTVT}
-		--with-xdmconfigdir=/etc/X11/xdm
-	)
-	xorg-3_src_configure
-}
-
-src_install() {
-	xorg-3_src_install
-
-	exeinto /usr/$(get_libdir)/X11/xdm
-	doexe "${FILESDIR}"/Xsession
-
-	use pam && pamd_mimic system-local-login xdm auth account session
-
-	# Keep /var/lib/xdm. This is where authfiles are stored. See #286350.
-	keepdir /var/lib/xdm
-}
diff --git a/x11-apps/xdm/xdm-1.1.13.ebuild b/x11-apps/xdm/xdm-1.1.13.ebuild
index ab342cc152e7..33796ac95e7b 100644
--- a/x11-apps/xdm/xdm-1.1.13.ebuild
+++ b/x11-apps/xdm/xdm-1.1.13.ebuild
@@ -11,7 +11,7 @@ DEFAULTVT=vt7
 
 DESCRIPTION="X.Org xdm application"
 
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="ipv6 pam systemd truetype xinerama xpm"
 
 RDEPEND="
diff --git a/x11-apps/xdpyinfo/Manifest b/x11-apps/xdpyinfo/Manifest
index 2b252ff39914..24b821b64df3 100644
--- a/x11-apps/xdpyinfo/Manifest
+++ b/x11-apps/xdpyinfo/Manifest
@@ -1,5 +1,3 @@
-DIST xdpyinfo-1.3.2.tar.bz2 141351 BLAKE2B b2dee4f424dee902c31430b8843c14d6836508ee0125db7de41f5e9faef1732dea571e90b37638cc90dabd3995a0ceb5e4094707138b7e066ee1ae856258503c SHA512 2c9097c13778c7a7fe5a9b3ee04b28512ff6028231eca91ecdf6104c742be470678920d37a4f540fece7e39dccbea34802271f359ab80618027b2856c8912e7d
 DIST xdpyinfo-1.3.3.tar.xz 137088 BLAKE2B 8fdf49e65ac05ab27672ef2044044353f8bbfe0c8bf6135e71b9fbd45b3cb643f5794977802cbb7a44cfe9d20905b5e74b0cc41829c9fef837f32c81bb05ea2f SHA512 47fe0821bc64145876853712ebd7c0af80111c243813615b892429021cc9a53abd38c4684551ae300cb5a4eacdd3d26e2c93e789ed91a948b20e2c37cd2d2442
-EBUILD xdpyinfo-1.3.2-r1.ebuild 807 BLAKE2B 9809040ba064c2c295f455a5a6ba350973348abcf8fd09e7f768831ffde5e182aee5e199147c968ecf2f441a252d8e17f3b4fbf65041a89be038bc6a50d75786 SHA512 3e7301b21af2bdb457c020aec37b9a9cab6cee2afd7f9dfa064cb4f95b9c9dff078d3bcdb2e81dbaa52c5c0c3783f5e92e5ce543b50c39d82cfebad85319b26a
-EBUILD xdpyinfo-1.3.3.ebuild 843 BLAKE2B 26741118e76b8b87ad4ea0dac7415cec2f213fad989759e80a4ebb13a367f58d9b699bda1dcc03aaf6192308401a814ac7fe0b2cfc79fe09066f60e9a959b709 SHA512 99882d5123748b5a92aebc1e2ae7e68144d9604751edd63557b9feee2b753da85cde9dd40067e4231824a3db4b40076188e7fc34b0156bd7717125636c8adb2c
+EBUILD xdpyinfo-1.3.3.ebuild 839 BLAKE2B 3f2f7ea5acfe02edc9afbd02adc844801fb5a03968e901d10a84d857e288af982c1bce8ec74355443a733cbd0e11917e342105da805212fbea70a3f56d1b9ece SHA512 85106268c09a3244b8e28574c99b9275a856dc066d25e3d4436efd5b5fab58937b732d964393772dd4775f11841d4cbd85749e4132c5568dd744190007012ed4
 MISC metadata.xml 348 BLAKE2B c29f79a25abe32eee42ed83aae3760812638a6696c8f27392673c9e9bb178e086b8fcc344b3db42bb9fe02ae23757ea201c8f3b5d4e03f466c6a524368df4778 SHA512 5a9e3ec8b2303c5d61cbc08cddacfe978140f9db3c5b1a2b72b896c6a61c408e6f22bcdb0a0d4e7542d946397a11878d1ca38c2e9e6cf211ad3b45eb1a45f914
diff --git a/x11-apps/xdpyinfo/xdpyinfo-1.3.2-r1.ebuild b/x11-apps/xdpyinfo/xdpyinfo-1.3.2-r1.ebuild
deleted file mode 100644
index 8d341e0d5d79..000000000000
--- a/x11-apps/xdpyinfo/xdpyinfo-1.3.2-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xorg-3
-
-DESCRIPTION="Display information utility for X"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris ~x86-winnt"
-IUSE="dga dmx xinerama"
-
-RDEPEND="
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXext
-	x11-libs/libXi
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/libXxf86vm
-	x11-libs/libxcb
-	dga? ( x11-libs/libXxf86dga )
-	dmx? ( x11-libs/libdmx )
-	xinerama? ( x11-libs/libXinerama )
-"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-"
-
-src_configure() {
-	local XORG_CONFIGURE_OPTIONS=(
-		--without-xf86misc
-		$(use_with dga)
-		$(use_with dmx)
-		$(use_with xinerama)
-	)
-	xorg-3_src_configure
-}
diff --git a/x11-apps/xdpyinfo/xdpyinfo-1.3.3.ebuild b/x11-apps/xdpyinfo/xdpyinfo-1.3.3.ebuild
index a05b200648aa..fa38684215ac 100644
--- a/x11-apps/xdpyinfo/xdpyinfo-1.3.3.ebuild
+++ b/x11-apps/xdpyinfo/xdpyinfo-1.3.3.ebuild
@@ -7,7 +7,7 @@ XORG_TARBALL_SUFFIX="xz"
 inherit xorg-3
 
 DESCRIPTION="Display information utility for X"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris ~x86-winnt"
 IUSE="dga dmx xinerama"
 
 RDEPEND="
diff --git a/x11-apps/xedit/Manifest b/x11-apps/xedit/Manifest
index 3885ee36c32c..d6215fe1c7f4 100644
--- a/x11-apps/xedit/Manifest
+++ b/x11-apps/xedit/Manifest
@@ -1,5 +1,3 @@
-DIST xedit-1.2.2.tar.bz2 525861 BLAKE2B 608f3f2b06d14f99a71d9eaf45114ba71271957f584c685236bd78e2f7c9a6e969ce15de72a7530a41835b951caa800a7cb0c45d71a4790aab5fe703d654e912 SHA512 24d8e23a2ad1a2e81f6606928bb032f25b70b76da83b65341367bc4111d011abe89f9e30402d057854f2ccdaa9c1ef0d7c55bf29b81ab2d050a8f448cf3eeb5d
 DIST xedit-1.2.3.tar.xz 480288 BLAKE2B 15dabc6952228246b2fcd67c33298ce75ebd3a943e930d3e5110c4b32a8c5b7340f5127b64d9bda9819fa3bcb4bebe870e4bcca0ecf5310f4b765f488d88c61d SHA512 1089c35ef961e53f74cc7d892960e1ee7f0da17529e3173e7f7764b0eb4ee94d1e068cb177d8502ca55c1dd6808962d4b1427e303adc7e6db80be8828557f45a
-EBUILD xedit-1.2.2.ebuild 324 BLAKE2B 0f3b2f9a67f5ea5e7ae95554ef70f6ebbe406b73f9d02075908c0017a5c8a0d781a1138edd38ae6dc23c4ed6e1032693d567d1c70db92d5be5928cddd9a27d1f SHA512 c4ad52e58106cfdde4b9a9c2565b6ce3d748efecb507882ed5c3acf7b188330f4372ebe10b7950b0a89e58f2ad86c56bd76d823e5b215c6374727b72ad407d93
-EBUILD xedit-1.2.3.ebuild 373 BLAKE2B d481d243bec9bbd02b27de54ca6d026937db4d8fe158de665a87ad91eb1ca8c612a5eebc6561f063e6fedb592574a4f4acc565fb106ae4bf02e37b03b28288de SHA512 3cc45f33498d957a4bf7e815b2c023c661a19ff712e7e55979d702fc79a9ba79d24ce0b20a8487a5af7aebeadb52ac0bf7b6b77a6bda7fd1c8e2dd481298aef1
+EBUILD xedit-1.2.3.ebuild 370 BLAKE2B dd37f13a768cb2b032fdf919f7af51f6bf833c0185d4909e6c77d28f582f5fa6a61afaf20c75aa3f3d7b9abd078808fb18fe8c3a60fee32ae50c35bf0c8f6908 SHA512 692856b43b1073c8c0a0bcc6686e65b44209733e1fad743e950b04da5ea14111899a5ef892a7c75795cc38717486d42992e582017bbc3a37ac2a9241dd48e7a5
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-apps/xedit/xedit-1.2.2.ebuild b/x11-apps/xedit/xedit-1.2.2.ebuild
deleted file mode 100644
index a91671b39076..000000000000
--- a/x11-apps/xedit/xedit-1.2.2.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xorg-3
-
-DESCRIPTION="simple text editor for X"
-
-KEYWORDS="amd64 ~arm64 ~hppa ~mips ppc ppc64 sparc x86"
-
-RDEPEND="
-	x11-libs/libXaw
-	x11-libs/libXt
-	x11-libs/libXmu
-	x11-libs/libX11"
-DEPEND="${RDEPEND}"
diff --git a/x11-apps/xedit/xedit-1.2.3.ebuild b/x11-apps/xedit/xedit-1.2.3.ebuild
index 566b105d2494..df416b4e840f 100644
--- a/x11-apps/xedit/xedit-1.2.3.ebuild
+++ b/x11-apps/xedit/xedit-1.2.3.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="simple text editor for X"
 
-KEYWORDS="amd64 ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm64 ~hppa ~mips ppc ppc64 sparc x86"
 
 RDEPEND="
 	x11-libs/libXaw
diff --git a/x11-apps/xload/Manifest b/x11-apps/xload/Manifest
index d3f2d7534079..2162f1a47fa6 100644
--- a/x11-apps/xload/Manifest
+++ b/x11-apps/xload/Manifest
@@ -1,5 +1,3 @@
-DIST xload-1.1.3.tar.bz2 140327 BLAKE2B e3e4e817b65a405b2e4733fbf736d2f2a9803436bd752d8fc14204f2c6e342dcf60c9fe69d749283ed53345020fbf7c250c91453d4b6634c41795e91e072cd46 SHA512 8dbc4f0cee7b30d7381be819152b27653d9b0049266e59bde2e2c972a88c4f2bdea766fc407bbdfef15d0aab30fedc756189a1048170a812853133a5094fe7a5
 DIST xload-1.1.4.tar.xz 133204 BLAKE2B 46002e9bb6156552c9dada2daf68723638b822df6b87433682dbdffa684bd8b344dba2d66c6d2a9bef60f148455fb64885d9a5e28b319367df3dfed267cc0841 SHA512 114babe4e5a60f4713f9e4627ee0a1bbb2f1f238cb46f24c38aecff67f25e6b0f58cbd554c71095ddc2b01398adbfa379550a34c23c413db52157648028554f2
-EBUILD xload-1.1.3.ebuild 391 BLAKE2B ba35977a69a9bb3dd66e3a7ab7d14953d793d58641921c3f1a9f862e17a882bfccf8b06aa124caa28ac466165e95dbe3489784d05d0821a1e18cb0e935568585 SHA512 5853cb89b03efcd91bb1499acc38f506f87f5d66e3c955630b1a5e77bdde95b0324982b3b0fc82798109743d62b047f587504bf33797dcec1b54f4534a3c678d
-EBUILD xload-1.1.4.ebuild 441 BLAKE2B 2cd2aad66daf8d624c3f1546f43749bfe11ad6e100a7a29c95758d0607dc34b1db56ce2dd70f41ca6a447c1f68a1861dd89006cbd125cfbac1001c4856071363 SHA512 7cd71754298c7a248fc44b8f117849d52b0bd3c72a1ff2932583070a34cdf56c0d4f6c3646854a613f6dd50db0abdda893a7d61bbc521b5cbf1ecad499510b2d
+EBUILD xload-1.1.4.ebuild 437 BLAKE2B 7412a7fd9511d4381d0d7d72b2b0e41842c5f0a4d26408be04ee48ed2230d6ec2742aa404b87db5a5c1df4c5af8f811a617b6b548a8ec06ed45025b6aa1f9760 SHA512 93841106ad716c7b42d2aad11de4a779f7041a71cd479eef7cb3b3b46e7910ff660bf3e2a7ed50717de53ad5982b090045bcef1c2604603c5502c53497de694d
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-apps/xload/xload-1.1.3.ebuild b/x11-apps/xload/xload-1.1.3.ebuild
deleted file mode 100644
index 82a498240cfe..000000000000
--- a/x11-apps/xload/xload-1.1.3.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 xorg-3
-
-DESCRIPTION="system load average display for X"
-
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	x11-libs/libXaw
-	x11-libs/libXmu
-	x11-libs/libXt
-	x11-libs/libX11"
-DEPEND="${RDEPEND}"
-BDEPEND="sys-devel/gettext"
diff --git a/x11-apps/xload/xload-1.1.4.ebuild b/x11-apps/xload/xload-1.1.4.ebuild
index ba16258302e6..868a96e6472a 100644
--- a/x11-apps/xload/xload-1.1.4.ebuild
+++ b/x11-apps/xload/xload-1.1.4.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="system load average display for X"
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	x11-libs/libXaw
diff --git a/x11-apps/xlsfonts/Manifest b/x11-apps/xlsfonts/Manifest
index cc57c6c76fc8..f83dcb1ca4ca 100644
--- a/x11-apps/xlsfonts/Manifest
+++ b/x11-apps/xlsfonts/Manifest
@@ -1,5 +1,3 @@
-DIST xlsfonts-1.0.6.tar.bz2 133500 BLAKE2B e21b5776ca02c5fe07ba80c2e845fd04d75642ed7984080df3402a478748e4bea00f93134eaf359da9d5223be6bf98224067bd3413c072c2f38bd589fdc90328 SHA512 052a3b1dec23cb20fdfacd4500cb836feb3b888bf568a548ea71deb58a4ba10a1ad5392d658e95272c6d4a1832edf1f19c3de2498b78dca82c43ee52800a30c0
 DIST xlsfonts-1.0.7.tar.xz 126888 BLAKE2B 13f2e2007c38f7d1724e6ffd0c7fe9a3b887a150f50107b892327c3620e4ffdbd4ae1191a9764cc4000d6422fe0f331dcbef11c0b50013ff2d94b699c0cba1ee SHA512 ec82be0a97500a9e64fb5a6adbbec470b249b1267c3081c2bd44cd3e7148107517d1234c1da2f81b0405230ab03ad2943ea53756c3380f4d561665b38d0cedc0
-EBUILD xlsfonts-1.0.6.ebuild 349 BLAKE2B 7a4c5121c956ab737f6544d8d75deb411a71c05fdddef22ef0a01706179dd382a3efbfb78d48778449f09cde29e615bb8baf040c95239e8729cb53dfc239dbc5 SHA512 22d2a34808c31804ad1ce453c23380644db35209609b48fdbc3f367147eb7a3814875b833d4e287fdc227d4e3b6b91c903d1d6517dbb5236bcc73301796a74fa
-EBUILD xlsfonts-1.0.7.ebuild 399 BLAKE2B 7c03eb15fbcd237d360b50526e5989a7f2e36ec46a35f43bb8fa6f40f089bded8d762c282c8a23af2fe104b53e0af40b101966f9af85e848885ce3e2b7d49fe8 SHA512 0fd9944a1196cc15083d13d73acfa22b91ef165be4bfc9d3b4672d5626af5dd850ff332111f42827d9a7b2bb6baa0c65a2c212cedad8f89c929c0638b5209abc
+EBUILD xlsfonts-1.0.7.ebuild 395 BLAKE2B 128c635e9a1abc6dfc79b76eef548e1b23bcc49fc85c5b90eb6aaad6b8696e672086b10c9777a47cca1903a71d9ef7e80d88d40bc6b7540710d8636e72277b06 SHA512 dc0dbbaaf013ab4ea0329037d6e4ce3d12a090a9529cf64a46070b081ae3f5d5abfef98e10aef01457191239f94ee476c39e5a31b861b79458367d63c2b2ce33
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-apps/xlsfonts/xlsfonts-1.0.6.ebuild b/x11-apps/xlsfonts/xlsfonts-1.0.6.ebuild
deleted file mode 100644
index 4a6bb9ed055a..000000000000
--- a/x11-apps/xlsfonts/xlsfonts-1.0.6.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xorg-3
-
-DESCRIPTION="X.Org xlsfonts application"
-
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-
-RDEPEND="x11-libs/libX11"
-DEPEND="${RDEPEND}"
diff --git a/x11-apps/xlsfonts/xlsfonts-1.0.7.ebuild b/x11-apps/xlsfonts/xlsfonts-1.0.7.ebuild
index 1aeee05aa212..0078044a27dc 100644
--- a/x11-apps/xlsfonts/xlsfonts-1.0.7.ebuild
+++ b/x11-apps/xlsfonts/xlsfonts-1.0.7.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org xlsfonts application"
 
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 
 RDEPEND="x11-libs/libX11"
 DEPEND="${RDEPEND}
diff --git a/x11-apps/xmodmap/Manifest b/x11-apps/xmodmap/Manifest
index 3a0d27ca685c..891c1dbc3df8 100644
--- a/x11-apps/xmodmap/Manifest
+++ b/x11-apps/xmodmap/Manifest
@@ -1,3 +1,3 @@
 DIST xmodmap-1.0.10.tar.bz2 145489 BLAKE2B 503e72882a1d6d5c916cb60b898156adbdccc3e90bda85b161ac7a57ee607605331be73bd779603cfab1013d065e28f3165cce2ef50d71579330ab0361078a22 SHA512 324c7dcef843186088f16b3bc47485eb3c9b4331e56ce43b692deb4bb3d4f4f27512480e91a379cceac8383df920dc5e37cd825246b50b6343291cec48134c04
-EBUILD xmodmap-1.0.10.ebuild 412 BLAKE2B fadfc512d045cb0f9189b99a6200e9df6a72660c5d41b995e7f36d8a82ed5cd63b829bde8c42be15d1104751cb0ecd556faa56b43cc859bb69b00030f51f3b6f SHA512 ac73d824e1c3443916de31771a461d8eeedc06ea7fe8f3491f1ab61f946428d94394003dc7baf6fa4476df7e1e12a6babae346daae23c38c6ac4ae5ed82dc357
+EBUILD xmodmap-1.0.10.ebuild 419 BLAKE2B 67b1ed4c7376fdc1ea97831987bdfa2d2836fd03a78aceede1071a843a202a802dfdd72ceb50bf1c889ee119952c7ebd9b90c38c58267ae92a139b0dcbfdf8e8 SHA512 301c12a54574befc3245365955bb02c7eabf6978c1912c80ccd6bb2bf933f9f76d2019c189fb9643979fb2f7caa6005c246c72d60dbca2fad80a42e2ebf89048
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-apps/xmodmap/xmodmap-1.0.10.ebuild b/x11-apps/xmodmap/xmodmap-1.0.10.ebuild
index e7b6eefeba37..99183c2a5a09 100644
--- a/x11-apps/xmodmap/xmodmap-1.0.10.ebuild
+++ b/x11-apps/xmodmap/xmodmap-1.0.10.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
@@ -7,7 +7,7 @@ inherit xorg-3
 
 DESCRIPTION="utility for modifying keymaps and pointer button mappings in X"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~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 ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="x11-libs/libX11"
diff --git a/x11-apps/xsetroot/Manifest b/x11-apps/xsetroot/Manifest
index f514ad75e3ee..a0c967392154 100644
--- a/x11-apps/xsetroot/Manifest
+++ b/x11-apps/xsetroot/Manifest
@@ -1,3 +1,3 @@
 DIST xsetroot-1.1.2.tar.bz2 129091 BLAKE2B 0bd0615f64c636eaad7ed1b83d49208e9065edf7583bcd7e5d4c5d2f1a1eca4c7692209a540cab823c35497696176f4925afecaaf843610f6e9485cd3724f1cb SHA512 0b9df1b72305e5c24f1e1664578aa4411a5ffcdc5d318458117594e641f01c34700205b0d16c08abf4a8106d36128ccdbe1ea1f1035fce9018d6b52801a8b72b
-EBUILD xsetroot-1.1.2-r1.ebuild 413 BLAKE2B 39640967a6d2497b58cdbee189bae98c722eab1e2b0f781dccb0b7d74e4ac249dfd3153ac87932104075b22af4c3bd694f648c3670aabdb8f2f956aee2f0690c SHA512 8456ddbca08590c33c3684e25192f56046892f16fca3455c0de8ef18b8d76dc59f3b4b8706d4485a7bf85ffec4d52bf38b5fadb28fc3531efd2ebe7c6ef120d3
+EBUILD xsetroot-1.1.2-r1.ebuild 420 BLAKE2B e0f7615fafa6b7a153fe6a94dd934ecce2249c67cc4271f34baaab721588aafdf1be1390b94f08ae5e645002ed8ef0e4196aed55c65b1cab3ab0b74b6067c2a9 SHA512 56c121de543e73c04717306607233a6a717970725cd6d62a9fd758528094b3b7bebe9a46e1f1491aae5dac3cacc840762cc4201a4fb1e664574527023f678d9a
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-apps/xsetroot/xsetroot-1.1.2-r1.ebuild b/x11-apps/xsetroot/xsetroot-1.1.2-r1.ebuild
index ea47994e494a..1e975ad11dd8 100644
--- a/x11-apps/xsetroot/xsetroot-1.1.2-r1.ebuild
+++ b/x11-apps/xsetroot/xsetroot-1.1.2-r1.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org xsetroot application"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	x11-libs/libX11
diff --git a/x11-apps/xsm/Manifest b/x11-apps/xsm/Manifest
index c19324e3c2e3..d100830f1d25 100644
--- a/x11-apps/xsm/Manifest
+++ b/x11-apps/xsm/Manifest
@@ -1,5 +1,3 @@
-DIST xsm-1.0.4.tar.bz2 170933 BLAKE2B 05cf4614440f36da6ed1e8e0949ef6955da03d1fe0cc2d0323150b34ea01c293301aa49006a93fe7c44c842db41fb6b66a2f4a4051ddf2258143e54a6e99b390 SHA512 d4e4da7c309a4eae126d2b58a13684f4dbc06b09f76dde9c89c707375df2843614f3d83bc44f9cd02f239200db3397abd86796dca0dbafc69f60482b0af5a176
 DIST xsm-1.0.5.tar.xz 159496 BLAKE2B 18531fd06970a244478cd674cac1d669d4fcecb4f680a656c5182927c76a111aa82b96fd96e5b887d6f8b44e7ab88292607812b7d6bbcac86d9f4448bbb4fed5 SHA512 df3777b3aab813ec8aa906f5a03f93b8ca645978970290cf7baf732e175c36c00ae19baeb45ea7404d35838c21e6f8fca28f0da3e2f398d17adac5f2acb7b351
-EBUILD xsm-1.0.4.ebuild 683 BLAKE2B 2fc21d9f48ce11f7161f9946f801cc2792d6012ac067e989fd7436388fe0c4cb8bf2e78caa2fc98007ecb44bc0d42c5a34af8d96e1b3cd5466a41f820cd63626 SHA512 baeee15e28e6ae030625b14cef85c09749647a3d71a1ac4013df4eaed504622a2750434ed73431e134eb12ded40fd6a9b4d5a7d11bd2ebd75d8496315649113a
-EBUILD xsm-1.0.5.ebuild 740 BLAKE2B 5384e34413ef8d464668eca35b70bc02e84925c164b05d2bfe1e190c44219f93487b2239bde52b48173be8703e7b2180223e0b78531b52d31757c5809d3f8ff9 SHA512 aeedb0fd984d70236b38c8c3f311e1447b514edf6a362fb019dee7b107f8a535b92aaa5a10b86910e4b49cd8d160e60297d83ef8895f97c760675da05815dfc8
+EBUILD xsm-1.0.5.ebuild 736 BLAKE2B 615d1ecd0ba4fdd756d119bb1753b4a6a83b296f8d1b705af11ae2da704098b01b2eb861ca0ea49de4b84f721b6c0b731f75f45599f645aeb1ef7682f7884403 SHA512 c32e4f0ed668dfe7081819e8687dd963f893c646f8903681a500e1922ac3f7cb51a3ca9a4618f7ac06cf78d9d51bc74cd73f5dbf74dea2a6f59d29792847a46f
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-apps/xsm/xsm-1.0.4.ebuild b/x11-apps/xsm/xsm-1.0.4.ebuild
deleted file mode 100644
index 419ed2866914..000000000000
--- a/x11-apps/xsm/xsm-1.0.4.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xorg-3
-
-DESCRIPTION="X Session Manager"
-
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-
-RDEPEND="x11-libs/libXaw
-	x11-libs/libX11
-	x11-libs/libXt
-	x11-libs/libICE
-	x11-libs/libSM"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	# (#158056) /usr/$(get_libdir)/X11/xsm could be a symlink
-	local XSMPATH="${EROOT}/usr/$(get_libdir)/X11/xsm"
-	if [[ -L ${XSMPATH} ]]; then
-		einfo "Removing symlink ${XSMPATH}"
-		rm -f ${XSMPATH} || die "failed to remove symlink ${XSMPATH}"
-	fi
-	xorg-3_pkg_setup
-}
diff --git a/x11-apps/xsm/xsm-1.0.5.ebuild b/x11-apps/xsm/xsm-1.0.5.ebuild
index a242d412ace7..4933f1c06a35 100644
--- a/x11-apps/xsm/xsm-1.0.5.ebuild
+++ b/x11-apps/xsm/xsm-1.0.5.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="X Session Manager"
 
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 RDEPEND="x11-libs/libXaw
 	x11-libs/libX11
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-apps
parent	752d6256e5204b958b0ef7905675a940b5e9172f (diff)