gentoo resync : 05.12.2021

25 files changed, 64 insertions, 233 deletions

diff --git a/x11-apps/Manifest.gz b/x11-apps/Manifest.gz
index 1848ac0aacd4..77fded46ceed 100644
--- a/x11-apps/Manifest.gz
+++ b/x11-apps/Manifest.gz
diff --git a/x11-apps/bdftopcf/Manifest b/x11-apps/bdftopcf/Manifest
index 3ea20b9d30fb..edd3d9744612 100644
--- a/x11-apps/bdftopcf/Manifest
+++ b/x11-apps/bdftopcf/Manifest
@@ -1,3 +1,3 @@
 DIST bdftopcf-1.1.tar.bz2 150815 BLAKE2B 2251b6daf090d61b6418bb0b76666e9dba65230c7a568bca6d3211869466921d6cb411820afd18262fb42fbc8b9d7118b3fe61b465b5bb00f8c93a17a6779df4 SHA512 7b790e8d512ca2812ac889c156ef91c48798b4744a6857e5b17e0128764b5afa8c5426fe5de05a9819d64745116718db4221b3e657e3c2633465e87179c44bec
-EBUILD bdftopcf-1.1-r1.ebuild 384 BLAKE2B 09921ee21e06b5de506e3489ceca3ebbf747389675088360de20a4dd1c4aec846ca9598a24ff3c25dd9f7a1a3e2c28f2a9b0654d4a68be9b2105d3bcbcd6851e SHA512 8143eb9e7b402333b6ae28844e88523fc2eaf7e53cfb561f1dbeca715d7842d0c996aca0abad5982bfdae2d24ba90b031a27a30653db7a22ab4360563e0ae577
+EBUILD bdftopcf-1.1-r1.ebuild 383 BLAKE2B bf7a0685af8509ddafdadd5df9489b14041786a618f601526147aeb377e79d72443e1f4b5036a789106f4c5cc203e435f9c016a9be6842c29dc706fe6aca6664 SHA512 9149010871611e050dec9248a3501d166d76506e2d0028305b66f43563304eb7e7d950a41d13e78bd78ebbaa4e147e788ce43221ca9c0b6e44d6f075497f8f38
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-apps/bdftopcf/bdftopcf-1.1-r1.ebuild b/x11-apps/bdftopcf/bdftopcf-1.1-r1.ebuild
index 98813c66ccca..e2e52e74872d 100644
--- a/x11-apps/bdftopcf/bdftopcf-1.1-r1.ebuild
+++ b/x11-apps/bdftopcf/bdftopcf-1.1-r1.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org bdftopcf application"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND="x11-base/xorg-proto"
 RDEPEND=""
diff --git a/x11-apps/mesa-progs/Manifest b/x11-apps/mesa-progs/Manifest
index b8b0251e23c7..bba0fed2a6c4 100644
--- a/x11-apps/mesa-progs/Manifest
+++ b/x11-apps/mesa-progs/Manifest
@@ -1,5 +1,5 @@
 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
-EBUILD mesa-progs-8.4.0-r1.ebuild 1721 BLAKE2B db1205cd996f7518a80005faef5ebd5441c095cdf9d76e8e7f9416ad58730c578365596c6316d405bbad9765eff393baebb28716bfa6beb8909422aa91d0eaa7 SHA512 c475f89967cb74c8028f737f705cb2d0cafb17a364e0c3f762b88254ea850476a11ebb1258e0e508294fb218ada0d9c8e26bba8db8d893d97bdde0147d59639c
-EBUILD mesa-progs-9999.ebuild 1684 BLAKE2B 08c5ac24193a320db47534c341748629c3b3b88e9fc9533e12a7dd5c6e925a9a3ee7a567f42fcb6a8bddada0537bb70b77b17cc716b76fc5a86d568eba26fb6d SHA512 0615a6a7a9f2782c22e846908ce52acc461cc2cec811ab93e3e42c10c3ab8f8f16be1e37c3151efc1844c21fea04e48792a1b72497de703386e4c83c609ae7dd
+EBUILD mesa-progs-8.4.0-r1.ebuild 1938 BLAKE2B afb6f35321e54991b2c6dc8ff5332a039fd121004974eefc96bce976102caf5f45f6228984b3203360a4791177e741a48eb7dd37eb896679eb862ccf600dfada SHA512 56718a52c9d4de97a95312659edd4997a2f7221edf00654da1095699d1aa389f0e174e6edcb03f486e0beb914c6c893b7a12cfd62c87391e112e43a4f8964a98
+EBUILD mesa-progs-9999.ebuild 1901 BLAKE2B 5ff50ee415d4701d3696e456d6f227cc6b3153db7830d1a462c575915a57d573cda6c23e62bb418ea42d7ed004785b9435434b165a11cdbab844a08bb078a406 SHA512 754f4e34af00e3253e360c7a89b18b9d3590ab9cc66de400bde00764096853a0718fe2ef7125ac492cc31c72a6326d652e9416a91b1bc19a62212658881270e6
 MISC metadata.xml 476 BLAKE2B 2f40a2161f77a5ac55a486f6570c4fca5b85f6c28189f22c8e8a373ffb0fe69329a83babb777a53d4f73c87e3ae1ba54cd3e0fcac25b62ce19e55505ce6d602d SHA512 f6c0f2910974cfb42cf748287bed94281cc7753c2632dd4fa4dc6baa0c261d1c408f792c259c4d66251a6449698aa9dcae8690b9f5aea687f73868571d9a48a6
diff --git a/x11-apps/mesa-progs/mesa-progs-8.4.0-r1.ebuild b/x11-apps/mesa-progs/mesa-progs-8.4.0-r1.ebuild
index ee75c1fc23ec..cafb05dd7c1a 100644
--- a/x11-apps/mesa-progs/mesa-progs-8.4.0-r1.ebuild
+++ b/x11-apps/mesa-progs/mesa-progs-8.4.0-r1.ebuild
@@ -33,6 +33,8 @@ DEPEND="${RDEPEND}
 	media-libs/glew
 	virtual/glu
 	x11-base/xorg-proto"
+BDEPEND="sys-apps/grep
+	sys-apps/file"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-improve-printing.patch
@@ -59,10 +61,15 @@ src_compile() {
 }
 
 src_install() {
-	dobin src/xdemos/{glxgears,glxinfo}
+	local demo='src/xdemos'
 	if use egl; then
-		dobin src/egl/opengl/egl{info,gears_x11}
+		demo="${demo} src/egl/opengl"
 
-		use gles2 && dobin src/egl/opengles2/es2{_info,gears_x11}
+		use gles2 && demo="${demo} src/egl/opengles2"
 	fi
+
+	# 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
 }
diff --git a/x11-apps/mesa-progs/mesa-progs-9999.ebuild b/x11-apps/mesa-progs/mesa-progs-9999.ebuild
index 8da112519962..413b7365eaf8 100644
--- a/x11-apps/mesa-progs/mesa-progs-9999.ebuild
+++ b/x11-apps/mesa-progs/mesa-progs-9999.ebuild
@@ -32,6 +32,8 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	virtual/glu
 	x11-base/xorg-proto"
+BDEPEND="sys-apps/grep
+	sys-apps/file"
 
 src_prepare() {
 	default
@@ -55,10 +57,15 @@ src_compile() {
 }
 
 src_install() {
-	dobin src/xdemos/{glxgears,glxinfo}
+	local demo='src/xdemos'
 	if use egl; then
-		dobin src/egl/opengl/egl{info,gears_x11}
+		demo="${demo} src/egl/opengl"
 
-		use gles2 && dobin src/egl/opengles2/es2{_info,gears_x11}
+		use gles2 && demo="${demo} src/egl/opengles2"
 	fi
+
+	# 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
 }
diff --git a/x11-apps/xauth/Manifest b/x11-apps/xauth/Manifest
index a6b87e938842..0d2660fbbbf4 100644
--- a/x11-apps/xauth/Manifest
+++ b/x11-apps/xauth/Manifest
@@ -1,4 +1,6 @@
+DIST xauth-1.1.1.tar.bz2 167315 BLAKE2B fbe36f867031c734e3a8ae9719145caa16828d4df156503c299812fb63f86462561ffea945f12fabc5e036cc63664ee1d8b5b37630dee8d4af6f2473aa5fcd1a SHA512 998c3158378fff50d368959c29335173b8d98e02591cb3d7b2f9534b5a44b19deb4cb7da9bf291ca5a37f69f833d72839b2c6611723306d10c1b4968ae4d4120
 DIST xauth-1.1.tar.bz2 163510 BLAKE2B 0b55ee9ec35ca436c36effe2ba4eee55f76a311a5482d1d72e80e5afea30c682de3f686b2956d17278721e190dd9bec4d93db6507853841a633c931312df745d SHA512 b6ecd59a853a491ef45bf8cfbff63bed36645f81cb79ae9d18458b57f7502bccf92f0d979d3337578518646f680ad379e67b1dac15a927cbb11372733e7a3a0c
+EBUILD xauth-1.1.1.ebuild 635 BLAKE2B 8bf03a2ff6503852c9f81af4feadc4b9ed7a46e3a9363e61e701d51fbdf426e9ca6a94847d195cbc0146423fdba6982336549ecc029c488ec028d11a7059d255 SHA512 d1de6872825855f2f20c1636bd1950570ff512d3031544c5f6e36813cbd565308aa7f29efc69f1e1bca1336060f597503defc5b89450a66b9f6e127a07d238dc
 EBUILD xauth-1.1.ebuild 627 BLAKE2B 7d6d0ad8ef506881f5d368011b0c939ab9ae92e11bbab3e33cfcfab9dd06c30a55a98a23d05eed8a27249180890d46f60f828b8e829074df58145904a997e958 SHA512 82ffff2b0decc8424c060e35a99bf0775e5680b1e563315c625670a72b044ea544d41e91ac7c47e12424b04ea29fbb9d3860cd94effbe0bb184090cf9784da4a
 EBUILD xauth-9999.ebuild 628 BLAKE2B 077a7198ef7ee9d3a4e391a2eb88a53cc6a38c2ac9a978acdd30207bb55be0d07459133aaf35a5396c81e92e48ebca42f73382f6a34d487dbd2d66e0510ff2f2 SHA512 ccf6679fcfcaa00f2620890f6a297bb81ec099c1d2cc4bba6b6ee95c2885e088733dc8b17e6ad142e14cd4786ab7bda02d8f038b471d2f5a88bd9b20f4d6c347
 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
new file mode 100644
index 000000000000..3805e3986bdf
--- /dev/null
+++ b/x11-apps/xauth/xauth-1.1.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 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/xeyes/Manifest b/x11-apps/xeyes/Manifest
index 449fc02a6968..136b96060e5a 100644
--- a/x11-apps/xeyes/Manifest
+++ b/x11-apps/xeyes/Manifest
@@ -1,5 +1,3 @@
-DIST xeyes-1.1.2.tar.bz2 133160 BLAKE2B c3f31a2df7988517e4f8903fce6b0cbfbaad01e84d89c7b9f7755eccebba95fbb8b75377644ae97f090e9f4a3a245698966e78f738275f7513f5927193b5dd19 SHA512 008d76f03ddabd3d86ad9e52a540504553b94cb7a6743b20cf08897549eb27505667365ab9af21956a1b5ec7297acca8903a326536e6195a30e643cd93297ee0
 DIST xeyes-1.2.0.tar.bz2 139218 BLAKE2B 0869cff711a58e937ebaf0ca5095654657f0782e7acac3553ef48469cd780c0fd1707df3aa60ed047cae44009b524cbb86eea1836c08fbbc4a1cc31fb99cbda7 SHA512 2d1614614b3ba3d1ebaa0e9801a2e159389b94aaacafb962d326b7e6dc712c1eb2c12a50ceb10b3135cf0eee6ae86bbf84e73098deb08e73792f14a60616b4d8
-EBUILD xeyes-1.1.2.ebuild 458 BLAKE2B 1da942e5c3fd0d300826043cb13ec2763672b8c8eb50fc2b13fc2c4e4cff888c6cdd0d51cabf8c8400a84a2851bb3a4edbff284ab27a2c8771e92c9d5bbd978b SHA512 c18c7606a4e7ed92e7cfd0af9533f49dec1690cf598a5d18b1a890939f5767c4e18692020a4655c2ec93ddb824af4407fe79c9b33e390f7c5d2d13810099f189
-EBUILD xeyes-1.2.0.ebuild 538 BLAKE2B e1902f59b5dc693ae6aa9624dbe58efe620c67810f1dbc37910b55aca744ef978d7b858fafc8190c699b899b9d49a065738e4cbe27d8c7edcac7c5e4c44cf132 SHA512 01343a5ddc7cf13f8b934ccb88599fc12a396cffe5ab0bc77bd663b13a63f06772ebd10fedb0115ccd65fb701af1d10e51d5ceba0aebdc200e5a81c65e95173d
+EBUILD xeyes-1.2.0.ebuild 533 BLAKE2B 9173314d3564d73a9dcb10b6f49bb2f7da0419be5bb3c9ae95c000fd92e15bf51fd21c931589cad720250c0688370ee7d375063e72fe3888fbae17ab193ca3a3 SHA512 05b782124d6e7d4cc46abd777943fb8b28a4a04f441e597992a1ee5b03477e6e18ba54884a560b8a89001de315800af656e00697bcd8b87344bf9cc8dcdda899
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-apps/xeyes/xeyes-1.1.2.ebuild b/x11-apps/xeyes/xeyes-1.1.2.ebuild
deleted file mode 100644
index 1f6d5e4e9507..000000000000
--- a/x11-apps/xeyes/xeyes-1.1.2.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xorg-3
-
-DESCRIPTION="X.Org xeyes application"
-
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc64-solaris"
-
-RDEPEND="
-	x11-libs/libX11
-	x11-libs/libXt
-	x11-libs/libXext
-	x11-libs/libXmu
-	x11-libs/libXrender"
-DEPEND="${RDEPEND}"
-
-XORG_CONFIGURE_OPTIONS=( --with-xrender )
diff --git a/x11-apps/xeyes/xeyes-1.2.0.ebuild b/x11-apps/xeyes/xeyes-1.2.0.ebuild
index 2dd7c0f91700..7d39db9e5baa 100644
--- a/x11-apps/xeyes/xeyes-1.2.0.ebuild
+++ b/x11-apps/xeyes/xeyes-1.2.0.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org xeyes application"
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~sparc64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc64-solaris"
 
 RDEPEND="
 	>=x11-libs/libXi-1.7
diff --git a/x11-apps/xinit/Manifest b/x11-apps/xinit/Manifest
index c5aa6f955904..302c75881860 100644
--- a/x11-apps/xinit/Manifest
+++ b/x11-apps/xinit/Manifest
@@ -9,5 +9,4 @@ AUX xinit-1.4.1-move-serverauthfile-into-tmp.patch 745 BLAKE2B 6a964926b4f5eda56
 AUX xserverrc.2 143 BLAKE2B b33fac4b5ba731c79167d21a07840c46abfbb33e8fbb80aa1c3f23a8717f836819da3a947b72bd99c7a14516534e9771033bcd1e26d167f2f7083be20eae3b2f SHA512 61afea54f66b9f397860e467cf87a41e1d9f97d7194930bccc254e44dd4178bca7b402bff7aa2a1d6f44a91680f3f1ee10a5b57e527aaff80438623edc1b07c5
 DIST xinit-1.4.1.tar.bz2 176206 BLAKE2B 1c20f34db344eb967ac230a0cd61ad07d0089668aea32973e9b8b9749e5260ad5d93a7f6642a4f2c8d6b01870696e4e1e422790c2954320039aa85e6dba8870a SHA512 6cbc5d025a891c419f3f4493381b2fca57a67d78df866d2f16a83426f86bad6eca7f240fac12b25cbcc63df0fec41f625407184e044898602d66483715315340
 EBUILD xinit-1.4.1-r1.ebuild 2222 BLAKE2B 9d2de8c2cc28ae0ce63e04f2193b85d9fb869c175cffa763aa69dd3da7836ee0adbc4dd4766b84f3832f47ee674de4e20ad26403167ef9710260de988700a1f6 SHA512 e65dad03d0a22e96c8e89da61f2456810b95701597e18243c37011f3b9763fde1cfc2ea40904e499725b43db966be4abbc227c11979bda03fa7c08f4fc899f4f
-EBUILD xinit-1.4.1.ebuild 2248 BLAKE2B a916c68369a08bbe98c1b613cadbf0c4fab34efe309dfe98c4af095a535b58cec2ea7750c689b0e7bd388464554fa6a3df92215101809369b064d2fa55311e35 SHA512 7b96b8a0e25ee71e19e7f9f5cc59867cdfd400b8766092f7d23b9849554263c15ed2652910d4374b4b6f972e0a2c3cc9ff55b6e93221ea7cf6628a5819e08915
 MISC metadata.xml 478 BLAKE2B 8d4b9cf42e324361c939511f2daddbbf96ea4bd29fa070a6fb31517ea8acadf1c138c1c933a36bae84b57a74417ca1e5c5b5bad8a69d8157137977ee9f5ad710 SHA512 98c8beb233f55b54787e2a52d8868016c785f3378e9b9abff51bb593944c14bdc63966f1ab5bdf9f98cd33cdb38bb6b42a58224423196ab39f46c26a0e42996e
diff --git a/x11-apps/xinit/xinit-1.4.1.ebuild b/x11-apps/xinit/xinit-1.4.1.ebuild
deleted file mode 100644
index f347aebee1ec..000000000000
--- a/x11-apps/xinit/xinit-1.4.1.ebuild
+++ /dev/null
@@ -1,75 +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 Window System initializer"
-
-LICENSE="${LICENSE} GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm-linux ~x86-linux"
-IUSE="twm"
-
-RDEPEND="
-	x11-apps/xauth
-	x11-libs/libX11
-"
-DEPEND="${RDEPEND}"
-PDEPEND="x11-apps/xrdb
-	twm? (
-		x11-apps/xclock
-		x11-apps/xsm
-		x11-terms/xterm
-		x11-wm/twm
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.3.3-gentoo-customizations.patch"
-	"${FILESDIR}/${PN}-1.4.0-startx-current-vt.patch"
-	"${FILESDIR}/${PN}-1.4.1-move-serverauthfile-into-tmp.patch"
-)
-
-XORG_CONFIGURE_OPTIONS=(
-	--with-xinitdir="${EPREFIX}"/etc/X11/xinit
-)
-
-src_install() {
-	xorg-3_src_install
-
-	exeinto /etc/X11
-	doexe "${FILESDIR}"/chooser.sh "${FILESDIR}"/startDM.sh
-	exeinto /etc/X11/Sessions
-	doexe "${FILESDIR}"/Xsession
-	exeinto /etc/X11/xinit
-	newexe "${FILESDIR}"/xserverrc.2 xserverrc
-	exeinto /etc/X11/xinit/xinitrc.d/
-	doexe "${FILESDIR}"/00-xhost
-
-	insinto /usr/share/xsessions
-	doins "${FILESDIR}"/Xsession.desktop
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		ewarn "If you use startx to start X instead of a login manager like gdm/kdm,"
-		ewarn "you can set the XSESSION variable to anything in /etc/X11/Sessions/ or"
-		ewarn "any executable. When you run startx, it will run this as the login session."
-		ewarn "You can set this in a file in /etc/env.d/ for the entire system,"
-		ewarn "or set it per-user in ~/.bash_profile (or similar for other shells)."
-		ewarn "Here's an example of setting it for the whole system:"
-		ewarn "    echo XSESSION=\"Gnome\" > /etc/env.d/90xsession"
-		ewarn "    env-update && source /etc/profile"
-	fi
-
-	for v in ${REPLACING_VERSIONS}; do
-		if ver_test "$v" "-lt" "1.4.1"; then
-			ewarn "Starting with ${CATEGORY}/${PN}-1.4.1 serverauth files are no longer kept in the"
-			ewarn "home directory but rather are created in \$TMPDIR (typically /tmp).  The change"
-			ewarn "is transparent for most of users, however those that use runtime temporary"
-			ewarn "directories cleaning tools, like app-admin/tmpreaper, may need to adjust them"
-			ewarn "not to remove the 'serverauth.*' files."
-		fi
-	done
-}
diff --git a/x11-apps/xrdb/Manifest b/x11-apps/xrdb/Manifest
index 235167c80266..26e4202e498f 100644
--- a/x11-apps/xrdb/Manifest
+++ b/x11-apps/xrdb/Manifest
@@ -1,5 +1,3 @@
-DIST xrdb-1.2.0.tar.bz2 142194 BLAKE2B 2fee77b287f43125413bbbc288b1d89986a93775797c02dde564e678bec3c429bca487d752d82f8da924a95e177a46e3b4de507b7fdca56b95789e1d7ea3dae3 SHA512 14e1cdfb2152fb28f1f4641b177ab236648d7e967a95b952bf4cfce8d3e1ef085e85385354e3381aaf644462e8888a1847f755ab4016ecb4cb4a715b001dd2ef
 DIST xrdb-1.2.1.tar.bz2 143216 BLAKE2B eaec55ec825b324cc2a8a617554e5f41d40b8bfb081a66d54168ed1e3f31df11d554f734e77fe49618039ec895c10229f1ab23bef41cf5f2c39a6246946ec5f0 SHA512 d88135cdfea8536523dfb986249ee42761d5363c936352f12f55b4d0c849f21236f7d74d39869c5ec5b549019d6ed89d9096cde4b3c2b4816c2778a8e370b5c9
-EBUILD xrdb-1.2.0.ebuild 410 BLAKE2B 01c6bf85eb123abb827ae2dd913d14f11d793c0ca75ac49f5ffaad0aededd08902bab25500bee290c2551c3fa949c6593861d96b58f75f88863ca8a9d4f0edbb SHA512 4a9b499e9d8452f1045f3a25a5f58951f58b7615ead5ef6945a0e599c12fd16f20283deae979ad44cf688ce0dcb19c5459647f5189e6cc3432bd304d2de112d4
-EBUILD xrdb-1.2.1.ebuild 407 BLAKE2B fc928e2bca0e60e94f0ac13e06bb633d5929e06e553218d655fc2d6d1417b359f35e835240e053bd47e2bf738e72bddbc461bfa74be85ec58a82ac86e121b50e SHA512 b56ae0fe60c85fd9f6daaaf5a1a743c7f737aa9eaeacf2af875108c6ee390298c5024441c789cde8f7c410634a28aa95e4ddce900b664889c72162e997f397a2
+EBUILD xrdb-1.2.1.ebuild 402 BLAKE2B f9f3f11e7f086eeeb9ecb2d1fa5dc7ac9a6609d642c1ca4590097a67666badd5fe12903c91d1cd44ba0d34dd0f9c6594bf3a112fc7656b1229bb4c216f8d86db SHA512 82a8abc4ae69e4bd320518ef0d5fd01b5c899056421634d68ce605da6cc04761de4b3bb6f93f56667cd2df0113ef833301663dc9608d6b0ea3d6884d8b80993d
 MISC metadata.xml 318 BLAKE2B 882fa76d73d73f50c201b2d062a2b24a292eee6f3d502ca8ad4cf11300bc8d21ecd2527155c20c946d0cad99ff82b2f03dd866018f6af6423acd45e7ab8cff13 SHA512 6f1da4a9a8ad494b67d4cf1c1fbf03316ef0f96415725b37c37cd57eb295917db360a62a3685ab1ddc8b18a16d917216e824ca2ed66843ce8af701b006259215
diff --git a/x11-apps/xrdb/xrdb-1.2.0.ebuild b/x11-apps/xrdb/xrdb-1.2.0.ebuild
deleted file mode 100644
index f5b175ce2b6a..000000000000
--- a/x11-apps/xrdb/xrdb-1.2.0.ebuild
+++ /dev/null
@@ -1,14 +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 server resource database utility"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="x11-libs/libXmu
-	x11-libs/libX11"
-DEPEND="${RDEPEND}"
diff --git a/x11-apps/xrdb/xrdb-1.2.1.ebuild b/x11-apps/xrdb/xrdb-1.2.1.ebuild
index 74a5854277ab..c4e45f1b4abd 100644
--- a/x11-apps/xrdb/xrdb-1.2.1.ebuild
+++ b/x11-apps/xrdb/xrdb-1.2.1.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit xorg-3
 
 DESCRIPTION="X server resource database utility"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="x11-libs/libXmu
 	x11-libs/libX11"
diff --git a/x11-apps/xrestop/Manifest b/x11-apps/xrestop/Manifest
index 460c1f6b5eb3..d17478646f71 100644
--- a/x11-apps/xrestop/Manifest
+++ b/x11-apps/xrestop/Manifest
@@ -1,6 +1,4 @@
 AUX xrestop-0.4-tinfo.patch 291 BLAKE2B b96d892c87a8133987baa94e5cb4917bc5d743c24ec11a2ec67afafc7206654b88c17f54377f2d1bf0c9fb92df8de16c99e4d0f9a15ff80a9417da2de31bc6fa SHA512 21993ada033d4ec744b55faa71afd736a99423f12071a64e1445958de979631ce42a908e14ef194e819de98766c92a2c2470b2c88d172879ec5fc4c20212566f
-DIST xrestop-0.4.tar.gz 92308 BLAKE2B 5bfe6e9ccd49038e7884be8379e79f3de2bc960588dc21fbbe40d2acb89c6505efd78a9415e0ba8feb24986f11f066ce641b9c933f241776bbc1b3e59fd520f0 SHA512 eb7bf2f3ab7b73708c96d56fd466cb362d711242dd46992fa3e693af2d26995e9baa91075eb445ef227e1342deec5e0e22b37139e80399e4051c9f5cad8fd9b6
 DIST xrestop-0.5.tar.bz2 135537 BLAKE2B cbb58870ff16148a34468231478c723fc41932c1e17156304a1885b52c17d870339c88bc4acde16d28cdd22cb227c2190b6b33bd472b047a82261924e681c889 SHA512 f50e1fcba2fdb6167f93b9edae721556bc411232a9d7cc1df853e588cd92608c9ca652bee1aaf5cfe3750d6c60db6c6cd1c6797e282841cc535051e78b2c4c1d
-EBUILD xrestop-0.4.ebuild 675 BLAKE2B aebbfd7d106196078ef2a4538e519ed5a34ea1e6653a64ffbe4e81a46dae9c1b73b192e49996bfc962819bcf2f4c6e649967325f4ee5c7ba22703743da146a81 SHA512 db62ccd4b3af85a582f3b6c9851ee2fb762a5ed5a6f74feac39e42a8638ceb4f5a057161aff96757e95af00dec57b049450f769bea54c436755084a426a63319
-EBUILD xrestop-0.5.ebuild 595 BLAKE2B 8e30e43e1aebfe1250fe0369ab2f470a6ce8c90388417f1486f602a7b97c726fcec104f404c599cd8d9711dc73f1f2ad23ed323bdd2726ad94df5519983de6b6 SHA512 4f9252923eb2f7fa9c5ccd39b0ff191f73522636afdd80aac6987dbd02dc73244aa13275973af7694d6f6932e998306522c6424968ccbcc7f29c39592d13ec26
+EBUILD xrestop-0.5.ebuild 593 BLAKE2B f1a76d65b471b96a5f5884a72b593baced76cc4ccaa5f38824810b7565d4126a594ded9300d742649109aceb1393be50e3be25bfec0008bbf8722caccbcee533 SHA512 62d6f731fdaabcd41ecee86ce17927521d33cb340b21645139311f7f342b1ef6940a02970ecab5073de9f95c93939bc745b3ed8c20a26039fe63aba6bde1acb7
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-apps/xrestop/xrestop-0.4.ebuild b/x11-apps/xrestop/xrestop-0.4.ebuild
deleted file mode 100644
index 42d0def453a2..000000000000
--- a/x11-apps/xrestop/xrestop-0.4.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 autotools
-
-DESCRIPTION="'Top' like statistics of X11 client's server side resource usage"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/xrestop"
-SRC_URI="http://projects.o-hand.com/sources/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ppc ~ppc64 sparc x86"
-
-RDEPEND="
-	x11-libs/libX11
-	x11-libs/libXres
-	x11-libs/libXt
-"
-DEPEND="
-	${RDEPEND}
-	x11-base/xorg-proto
-"
-BDEPEND="virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog NEWS README )
-
-PATCHES=(
-	"${FILESDIR}"/${P}-tinfo.patch
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
diff --git a/x11-apps/xrestop/xrestop-0.5.ebuild b/x11-apps/xrestop/xrestop-0.5.ebuild
index 95e2ca8dce98..7c812b8ad115 100644
--- a/x11-apps/xrestop/xrestop-0.5.ebuild
+++ b/x11-apps/xrestop/xrestop-0.5.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.freedesktop.org/wiki/Software/xrestop"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ppc ~ppc64 sparc x86"
 
 RDEPEND="
 	sys-libs/ncurses:=
diff --git a/x11-apps/xwarppointer/Manifest b/x11-apps/xwarppointer/Manifest
deleted file mode 100644
index 0f291f1b21a4..000000000000
--- a/x11-apps/xwarppointer/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST xwarppointer-1.tar.gz 2338 BLAKE2B c197338566900c9b259cf09aa493f2a112011d58d461e4f6a99a5dfe1a0d21f8371a23ee71cfd084acb41aeaa6345afea02cbe1a359eba25a61b451e1d9aebc1 SHA512 630b64076b6ebab26eeb278c5f222777a8ca150d4fdcdb78c6749800d4d02fc3c43305fe3e3cf9f640e5e5535f7e10899aa2ed31e8c23245bc6f215d0d25a38c
-EBUILD xwarppointer-1-r2.ebuild 722 BLAKE2B 4b92d6d4446248789212812b9248f62223364832f9f82da3bb59d6b00601127e246e9f4530d3f7b1260d4a75575e242541b50d23d11b0873d1b1d92b9a5cf2f3 SHA512 be10c79fb48be7608d00d9d6af1b9139b40d72ed2f1fb6047a8f0e682b63a1f71eb3de9fbe34147a92aa5387addbeb85b5e3a247e1b2a277c3cd7ed5538a65ce
-MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/x11-apps/xwarppointer/metadata.xml b/x11-apps/xwarppointer/metadata.xml
deleted file mode 100644
index 85e4ed814fa2..000000000000
--- a/x11-apps/xwarppointer/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/x11-apps/xwarppointer/xwarppointer-1-r2.ebuild b/x11-apps/xwarppointer/xwarppointer-1-r2.ebuild
deleted file mode 100644
index cbb17d8c7f71..000000000000
--- a/x11-apps/xwarppointer/xwarppointer-1-r2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit toolchain-funcs
-
-DESCRIPTION="Program to move the mouse cursor"
-HOMEPAGE="http://www.ishiboo.com/~nirva/Projects/xwarppointer/"
-SRC_URI="http://www.ishiboo.com/~nirva/Projects/xwarppointer/${PN}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-
-DEPEND="x11-libs/libX11"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	sed -i Makefile \
-		-e 's|^X11HOME=.*|X11HOME=/usr/X11R6|' \
-		-e 's|^CFLAGS=|CFLAGS+=|' \
-		-e 's| -o | $(LDFLAGS)&|' \
-		|| die 'setting X11HOME failed'
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
-
-src_install() {
-	dobin "${PN}"
-	dodoc README
-}
diff --git a/x11-apps/xwd/Manifest b/x11-apps/xwd/Manifest
index 7fc47912aa15..6db9b865d4da 100644
--- a/x11-apps/xwd/Manifest
+++ b/x11-apps/xwd/Manifest
@@ -1,5 +1,3 @@
-DIST xwd-1.0.7.tar.bz2 148026 BLAKE2B 9088105a07db38418352cccafaee4ecc084940e031416358291e6b5a6f47b2c8972928f0eb3479db4ff93b3a54a24ea4231f4d8196464f14ac4d7a1b5bb7ecce SHA512 6fdb0a115ae505169bbc7fcc45580daf26bced2e26e0bf9a877636016038931a8386e8edcbe015f4024be508d0461906adef4834cf22a445e3c282f0b8fad17e
 DIST xwd-1.0.8.tar.bz2 151153 BLAKE2B 9db972c3f484abde7f6925da6b9e567548e9ceab8f3484ca8f5649e1505ef72652d03f738b2e2edd3179a9561b9dca76bf13d26b025523d22f9f2d98ebf1b8c7 SHA512 d2aaf42c60d20c4b09f4947d3702058dbfad4633b2c5c8ea62e8897fc9ced1ab3417ce99255a223286d21a731f543019470737e3074f1bc68033b4eb47bc773e
-EBUILD xwd-1.0.7-r1.ebuild 356 BLAKE2B b446baf4809f0923da62d9f09aa04713f93255df57d9c64ff3977d0ab9da2b1666f31956aa42c44b9f6a36df1744a6a06790162aef014ad5e483daa2b8cead88 SHA512 26a1a196451d1d24f2c73794e6b8ee47727256a663c1cb832f27a5811f5c8ca3d460a2216591865ee3dcc11da6104c78b3d4667b30c92f84dbb4d1443684059c
-EBUILD xwd-1.0.8.ebuild 368 BLAKE2B bcb4b19918a6a2da4065bd47dd2c0cb55e8766c91b26a8f375e5bb5e9bca8558a9696ea67294eb2d13d368b6c5bcc445d73b9161d24ae574af25995be0695cb4 SHA512 12baa36853acfbd7f05daa0516fb555a960f4e8d070ee8fd9df1c981a22e66d9324796ef75d8497b583310029e5cdbab72cc0e7620d1e29579e98e28471faab8
+EBUILD xwd-1.0.8.ebuild 363 BLAKE2B b586d888aac98822ba0a86f7436cba4eb18d23ca75883aa01c3b0be523f2c891e39e8ac53e57cbd60cc45e5b208d12620a73ffba7881b6803c116498377512ef SHA512 84cd11d4c905727962dbaa925a75c453e94886aea1dd2c93a79613a63b576767642109da7f37b4dc68b3c3ebd23e8f980559e16a5835c54e0e4f6deb7d9104af
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-apps/xwd/xwd-1.0.7-r1.ebuild b/x11-apps/xwd/xwd-1.0.7-r1.ebuild
deleted file mode 100644
index 2635cd4950c7..000000000000
--- a/x11-apps/xwd/xwd-1.0.7-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="dump an image of an X window"
-
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
-
-RDEPEND="x11-libs/libX11"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-	x11-libs/libXt
-	x11-libs/libxkbfile"
diff --git a/x11-apps/xwd/xwd-1.0.8.ebuild b/x11-apps/xwd/xwd-1.0.8.ebuild
index ffde41a88947..6f97eaf105d8 100644
--- a/x11-apps/xwd/xwd-1.0.8.ebuild
+++ b/x11-apps/xwd/xwd-1.0.8.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
 
 DESCRIPTION="dump an image of an X window"
 
-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"
 DEPEND="${RDEPEND}