gentoo resync : 29.06.2020

45 files changed, 39 insertions, 495 deletions

diff --git a/x11-apps/Manifest.gz b/x11-apps/Manifest.gz
index 649e4ec4cf4d..1d9a45b994b9 100644
--- a/x11-apps/Manifest.gz
+++ b/x11-apps/Manifest.gz
diff --git a/x11-apps/appres/Manifest b/x11-apps/appres/Manifest
index f091d5c10d97..3ddd6b0017b2 100644
--- a/x11-apps/appres/Manifest
+++ b/x11-apps/appres/Manifest
@@ -1,5 +1,3 @@
-DIST appres-1.0.4.tar.bz2 117949 BLAKE2B a1938ffd3a3ecf279e35fd85c39f79550b9da0d2155d4ba08708fddff0b6cb9cb97a8174fcfb701ff13e929bd551405c3eaeae516d15e4d7ea31ef50aa6a5d29 SHA512 f07e672bd335308e58495685e5e7748684283aac28a96ea716edefe99ff281ec1f9b264e853ec0ce0f64cf54d9208d70dd3112a5a4219e0a38bfdc0fab8c9d98
 DIST appres-1.0.5.tar.bz2 124531 BLAKE2B 0d3e497afb3ab7d3565451c0da6594b4e608fa20e1a225162c4347d672db6a94823b5961c112b414e55c86a6b53a684709ddd109991f0545b6897bf276824da8 SHA512 70825563cd80f0f433c48ab2fdae888072939c1b22fb22340b70b9444c97916275ed92c9e5bf9a06bb76c32a5371b89ff7c0211a9a47a227c88311078c2c4137
-EBUILD appres-1.0.4.ebuild 390 BLAKE2B 576a1f60fa4c9c68ad233423870eff850956e798cb9e2dbb5c68c563f580aac784f5b029d510ca9419eea11eb8859abdfefe225ab4b0272a0dad1a3e8de1d8c7 SHA512 889e2353bba272973ffee2af9f08dcbced890e745c7a51001bdf343ca48c7d39f11f21125917abf463aadf32f88a02df79c4e00cf59298d82624d29470a0ca90
 EBUILD appres-1.0.5.ebuild 390 BLAKE2B 576a1f60fa4c9c68ad233423870eff850956e798cb9e2dbb5c68c563f580aac784f5b029d510ca9419eea11eb8859abdfefe225ab4b0272a0dad1a3e8de1d8c7 SHA512 889e2353bba272973ffee2af9f08dcbced890e745c7a51001bdf343ca48c7d39f11f21125917abf463aadf32f88a02df79c4e00cf59298d82624d29470a0ca90
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/appres/appres-1.0.4.ebuild b/x11-apps/appres/appres-1.0.4.ebuild
deleted file mode 100644
index e852a4932817..000000000000
--- a/x11-apps/appres/appres-1.0.4.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit xorg-2
-
-DESCRIPTION="list X application resource database"
-
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE=""
-RDEPEND="x11-libs/libX11
-	x11-libs/libXt"
-DEPEND="${RDEPEND}"
diff --git a/x11-apps/editres/Manifest b/x11-apps/editres/Manifest
index 4bbf6fba63ed..30cbda289dbb 100644
--- a/x11-apps/editres/Manifest
+++ b/x11-apps/editres/Manifest
@@ -1,5 +1,3 @@
-DIST editres-1.0.6.tar.bz2 156155 BLAKE2B b36ba85cd7c58a580e682e058d81af1d0f7bef044334fb0bb799fef7778af53055b592e0c67ee1b8c116573585d7699aaf2050310994b76c9b4aef1e43d9cd47 SHA512 c070709ce926802696d43d27256cea125c04021ad7555e1ea6c90650bf9e9fdd8da7786ebc99d6cf6a2dac73db041d489d34e6b2f6ceb6b396b6e96711b1c510
 DIST editres-1.0.7.tar.bz2 166429 BLAKE2B abaa0764bfc3419e17d5cd222bbe20f5591f7bc8431444aa6739cdc067cfb81f606370df19562410aa54820a0249828ccc9d506a9607031b453a7993af634f60 SHA512 b9c928b556116bf50cf4b6ea779bdc9fedf29f5db3e6a8cc75c122578c92e1cc530a81b226ec24aad183b8ebc2de570f200314b0d9ce7883b6e3306007365b32
-EBUILD editres-1.0.6.ebuild 360 BLAKE2B 881aacc17fd0f690673511ba8a3a8ac9b9a2c0f0390600617850be576cf2244172dc745e3793f78989de6f361d94b678442b43807b2d1c92576051f78e86755b SHA512 aaa396b5816bea5057cfaeb7e502cd64527118aead063c0a976689c2903340baf1ce75728ec2432c800a60c172c4aae0796c5a8380d02d9e4b643c9b7c71592b
 EBUILD editres-1.0.7.ebuild 360 BLAKE2B 881aacc17fd0f690673511ba8a3a8ac9b9a2c0f0390600617850be576cf2244172dc745e3793f78989de6f361d94b678442b43807b2d1c92576051f78e86755b SHA512 aaa396b5816bea5057cfaeb7e502cd64527118aead063c0a976689c2903340baf1ce75728ec2432c800a60c172c4aae0796c5a8380d02d9e4b643c9b7c71592b
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/editres/editres-1.0.6.ebuild b/x11-apps/editres/editres-1.0.6.ebuild
deleted file mode 100644
index 57d3582265a7..000000000000
--- a/x11-apps/editres/editres-1.0.6.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit xorg-2
-
-DESCRIPTION="a dynamic resource editor for X Toolkit applications"
-
-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/ico/Manifest b/x11-apps/ico/Manifest
index 1ee23f579512..0b8233ca98d4 100644
--- a/x11-apps/ico/Manifest
+++ b/x11-apps/ico/Manifest
@@ -1,5 +1,3 @@
-DIST ico-1.0.4.tar.bz2 127619 BLAKE2B 8e9e161b2f0ae23acc989e7bd8ce70e953ffdb43e9d998d63993504073bc339b5dee85c0e5611e38a6c1b3b98a9a1067b0468c6dc3a1aaef26e38fac76efffa8 SHA512 f7200fc04e7d0442215a3fe1f53456fe6bcd14eb2e2fd048cbe7f5700ad28e10ea8ef72ab98d3cd232c801b037fdac5ac4367ba98484f2912de0715a23f82e5d
 DIST ico-1.0.5.tar.bz2 136727 BLAKE2B 6c6d0a3e9521d9dad9f17f20ca7e1ccb52da31b6a5c5879bbe3d63e58231956cb2ff665b109191185a9af8ee9d2b87f034d349d4d3b33d18dc7b52e0d0640972 SHA512 93a94a66d4a41b39d4b3657050e58f8269d352dae5d5916c9ecdda1cb14f23b9d159d67c50fdfa654b4b1c2ad11434bed140ace70703c82b05d3fe8686aab8f6
-EBUILD ico-1.0.4.ebuild 308 BLAKE2B 468613dc6e01745bff4fb99db8cac492ab296aa9d45044f58a0d228f691534adccd415554c47e1ff1f1822e491a640f6016c21fc1be003ddb1972cc501a237a3 SHA512 b55e76d19556566e052c1907d917c8a12fc2e7546172393fded38161046f8f199d01e81f9a58fd54f111f306db5aa22b547a843dd6b79f9e12a30f6b58bc44a9
 EBUILD ico-1.0.5.ebuild 308 BLAKE2B 468613dc6e01745bff4fb99db8cac492ab296aa9d45044f58a0d228f691534adccd415554c47e1ff1f1822e491a640f6016c21fc1be003ddb1972cc501a237a3 SHA512 b55e76d19556566e052c1907d917c8a12fc2e7546172393fded38161046f8f199d01e81f9a58fd54f111f306db5aa22b547a843dd6b79f9e12a30f6b58bc44a9
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/ico/ico-1.0.4.ebuild b/x11-apps/ico/ico-1.0.4.ebuild
deleted file mode 100644
index 0c60e859472d..000000000000
--- a/x11-apps/ico/ico-1.0.4.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit xorg-2
-
-DESCRIPTION="animate an icosahedron or other polyhedron"
-KEYWORDS="amd64 arm ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~x86-linux"
-IUSE=""
-
-RDEPEND="x11-libs/libX11"
-DEPEND="${RDEPEND}"
diff --git a/x11-apps/igt-gpu-tools/Manifest b/x11-apps/igt-gpu-tools/Manifest
index a24c13b489ca..b2d4ebb00093 100644
--- a/x11-apps/igt-gpu-tools/Manifest
+++ b/x11-apps/igt-gpu-tools/Manifest
@@ -1,6 +1,5 @@
-DIST igt-gpu-tools-1.24.tar.xz 1207436 BLAKE2B 0b04033be0195a4fee5611aeae2f47334ce1de5df65c652ebc0b36d1185286268bb426f472e3c1311ff576e8184e7a4efb95ef3181006ed8c448ea76452940d7 SHA512 22c25e27ead64f561fe8f46b132d6c7562a90d7bff09dc2618a532b16d7b8fdf54ed94d986a45655657b54219d350ce1b1e6c89da2b6073024e9bbe0973fa190
+AUX 1.25-python-3.9.patch 687 BLAKE2B b0abe02391df5bff2e1de47f1fea220a5dc3b9b9b0e8cd0bf7f17a7b96bd4879412c95daf2e824cb18a46ca95fae403050db4ec9054affe0a8bb10fb805383f5 SHA512 55aec8584771723fb96d5361f4588d2a1d9da1ed30832bf77a85862d5030e5a2c0e6149e3c899e2a536b7b1a252a6537fd91d1d0298eef3affa08696c220776f
 DIST igt-gpu-tools-1.25.tar.xz 1425652 BLAKE2B 1dd17e8542c126d356478acd07344d8732013a24fd180064d6f2277be76170924e7031fd2529b2aa054b40d5093d9cd95271e156bc6b97a75158c84de142f1ba SHA512 a24ee46092241da26fc2dac2b9b54c9f16f7a408c8740c9c7209e876929e2908a36261ba258ca4a4a4e4a21c1e9c919457bf98d514f81d8b7dbfcf5f89a74daf
-EBUILD igt-gpu-tools-1.24.ebuild 2509 BLAKE2B e5d7344a2cc59a3fe6f6e72abe3433fdb88344faa20b00ab11e7499b5911e734a983ea6cf64637f3e3e56df57c8a9fd766eb0832854ad2f30fc34ccf873e46e0 SHA512 2d50a2db3f8dd94138b0c7479b7a6dc5839efe4ac4c5e1cf5956db79cbb721f789d660f4f6620c8c201687e25cc6309b112d9ff2b28bde69c7fe1b964ad161ff
-EBUILD igt-gpu-tools-1.25.ebuild 2412 BLAKE2B 4c39dd0e40dc0fee05a6ca778b99fd81c1841192944323b85703182d91778e9220448c6a9883a1f6ce812801c84e152cc632115be52197536cbb67bdf09b6c94 SHA512 e9f77e2cb65a3a09cf7f3e1d6b460fa24c34b16ada0c439b6d6c2b0e183055b8f13c6ef0bc7b0280186e791e6e5e33488ee222ad484db5e5c07276e0170f83fd
+EBUILD igt-gpu-tools-1.25.ebuild 2462 BLAKE2B 1e43a538ff075d43501d925d4eb5ce8ff4968ec8d1aa98cd2444fa7f68cee117239c1fe289e62587012e8ec3ebdf495d66f202c1daa89b866cb80d068008b66b SHA512 aebf56bb749808b8e76d9d4282c18606ba5a6d595473a5b7e71a03233f874807d2563006c37fea6a9d31176421cd554c5affe84a8159ea05f18d32ba8e8dcac4
 EBUILD igt-gpu-tools-9999.ebuild 2412 BLAKE2B 4c39dd0e40dc0fee05a6ca778b99fd81c1841192944323b85703182d91778e9220448c6a9883a1f6ce812801c84e152cc632115be52197536cbb67bdf09b6c94 SHA512 e9f77e2cb65a3a09cf7f3e1d6b460fa24c34b16ada0c439b6d6c2b0e183055b8f13c6ef0bc7b0280186e791e6e5e33488ee222ad484db5e5c07276e0170f83fd
 MISC metadata.xml 724 BLAKE2B 8fc5c9e95c807af441d821433a598a79aafeb8438f04f7b1d4e6399f02f30b17c11e8a047bd29d2c1e92b2b988367202d2c1617e121c4f300d5cd3d9dc6ed9f1 SHA512 98ba85c21823801e84229fa1c0435b8bfd10c40213b52e2892dcdd958f9a52cf737fe8541b10feaf8fef1c68d96f7abacf5d1e91aa773f69182800e9da52ba7a
diff --git a/x11-apps/igt-gpu-tools/files/1.25-python-3.9.patch b/x11-apps/igt-gpu-tools/files/1.25-python-3.9.patch
new file mode 100644
index 000000000000..689dca411e5b
--- /dev/null
+++ b/x11-apps/igt-gpu-tools/files/1.25-python-3.9.patch
@@ -0,0 +1,25 @@
+manual backport of upstream commit
+https://gitlab.freedesktop.org/drm/igt-gpu-tools/-/commit/201da47cb57b8fadd9bc45be16b82617b32a2c01
+
+--- a/docs/reference/igt-gpu-tools/generate_description_xml.py
++++ b/docs/reference/igt-gpu-tools/generate_description_xml.py
+@@ -4,7 +4,7 @@ import re
+ import sys
+ import os.path
+ import subprocess
+-import xml.etree.cElementTree as ET
++import xml.etree.ElementTree as ET
+ 
+ from collections import namedtuple
+ 
+--- a/lib/i915/perf-configs/perf-codegen.py
++++ b/lib/i915/perf-configs/perf-codegen.py
+@@ -26,7 +26,7 @@ import os
+ import sys
+ import textwrap
+ 
+-import xml.etree.cElementTree as et
++import xml.etree.ElementTree as et
+ 
+ import codegen
+ 
diff --git a/x11-apps/igt-gpu-tools/igt-gpu-tools-1.24.ebuild b/x11-apps/igt-gpu-tools/igt-gpu-tools-1.24.ebuild
deleted file mode 100644
index 8662c0102ba5..000000000000
--- a/x11-apps/igt-gpu-tools/igt-gpu-tools-1.24.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-EGIT_REPO_URI="https://gitlab.freedesktop.org/drm/${PN}.git"
-if [[ ${PV} = *9999* ]]; then
-	GIT_ECLASS="git-r3"
-fi
-
-inherit ${GIT_ECLASS} meson
-
-DESCRIPTION="Intel GPU userland tools"
-
-HOMEPAGE="https://01.org/linuxgraphics https://gitlab.freedesktop.org/drm/igt-gpu-tools"
-if [[ ${PV} = *9999* ]]; then
-	SRC_URI=""
-else
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://www.x.org/releases/individual/app/${P}.tar.xz"
-fi
-LICENSE="MIT"
-SLOT="0"
-IUSE="chamelium doc man overlay runner unwind valgrind video_cards_amdgpu video_cards_intel video_cards_nouveau X xv"
-REQUIRED_USE="
-	|| ( video_cards_amdgpu video_cards_intel video_cards_nouveau )
-	overlay? (
-		video_cards_intel
-		|| ( X xv )
-	)
-"
-RESTRICT="test"
-
-RDEPEND="
-	dev-libs/elfutils
-	dev-libs/glib:2
-	sys-apps/kmod:=
-	sys-libs/libunwind:=
-	sys-libs/zlib:=
-	sys-process/procps:=
-	virtual/libudev:=
-	>=x11-libs/cairo-1.12.0[X?]
-	>=x11-libs/libdrm-2.4.82[video_cards_amdgpu?,video_cards_intel?,video_cards_nouveau?]
-	>=x11-libs/libpciaccess-0.10
-	x11-libs/pixman
-	chamelium? (
-		dev-libs/xmlrpc-c[curl]
-		sci-libs/gsl
-		media-libs/alsa-lib:=
-	)
-	overlay? (
-		>=x11-libs/libXrandr-1.3
-		xv? (
-			x11-libs/libX11
-			x11-libs/libXext
-			x11-libs/libXv
-		)
-	)
-	runner? ( dev-libs/json-c:= )
-	unwind? ( sys-libs/libunwind )
-	valgrind? ( dev-util/valgrind )
-	"
-DEPEND="${RDEPEND}
-	doc? ( >=dev-util/gtk-doc-1.25-r1 )
-	man? ( dev-python/docutils )
-	overlay? (
-		>=dev-util/peg-0.1.18
-		x11-base/xorg-proto
-	)
-	video_cards_intel? (
-		sys-devel/bison
-		sys-devel/flex
-	)
-"
-
-src_prepare() {
-	sed -e "s/find_program('rst2man-3'/find_program('rst2man.py', 'rst2man-3'/" -i man/meson.build
-	default_src_prepare
-}
-
-src_configure() {
-	local gpus=""
-	use video_cards_amdgpu  && gpus+="amdgpu,"
-	use video_cards_intel   && gpus+="intel,"
-	use video_cards_nouveau && gpus+="nouveau,"
-
-	local overlay_backends=""
-	use overlay && use xv && overlay_backends+="xv,"
-	use overlay && use X && overlay_backends+="x,"
-
-	local emesonargs=(
-		$(meson_feature chamelium build_chamelium)
-		$(meson_feature doc build_docs)
-		$(meson_feature man build_man)
-		$(meson_feature overlay build_overlay)
-		$(meson_feature runner build_runner)
-		$(meson_feature doc build_tests) # Test build is required for docs
-		$(meson_feature valgrind with_valgrind)
-		$(meson_feature unwind with_libunwind)
-		-Doverlay_backends=${overlay_backends%?}
-		-Dwith_libdrm=${gpus%?}
-	)
-	meson_src_configure
-}
diff --git a/x11-apps/igt-gpu-tools/igt-gpu-tools-1.25.ebuild b/x11-apps/igt-gpu-tools/igt-gpu-tools-1.25.ebuild
index b202d340de99..6bb31b86e9f1 100644
--- a/x11-apps/igt-gpu-tools/igt-gpu-tools-1.25.ebuild
+++ b/x11-apps/igt-gpu-tools/igt-gpu-tools-1.25.ebuild
@@ -73,6 +73,8 @@ DEPEND="${RDEPEND}
 	)
 "
 
+PATCHES=( "${FILESDIR}/${PV}-python-3.9.patch" )
+
 src_prepare() {
 	sed -e "s/find_program('rst2man-3'/find_program('rst2man.py', 'rst2man-3'/" -i man/meson.build
 	default_src_prepare
diff --git a/x11-apps/rgb/Manifest b/x11-apps/rgb/Manifest
index dda4404ac4d5..4cc0ad80524f 100644
--- a/x11-apps/rgb/Manifest
+++ b/x11-apps/rgb/Manifest
@@ -1,5 +1,3 @@
-DIST rgb-1.0.5.tar.bz2 130900 BLAKE2B 40675dfd862757d62cc636fe2cc3cfac25a87d863ada67e76dd9516a1607e356530b2578082b9e5cdf84d97b766c558b80f8fa919c515a5eb3da2731ac07391f SHA512 2e4ad2b0f5539375986d455b47cb5f10e50841198ee242ee430e021e9ddbffec1304259c259c7a6b7e0cd4b244ecedcb5818baac35deb4447da53c2ddba3ad43
 DIST rgb-1.0.6.tar.bz2 139225 BLAKE2B 25e20d0be23a46d869869e47169d86dd50a99bc65551bf83800119c7f9cd242f41d5ecdb611467eaf9aeba909cebbfab8f578e0a5dc63380482f324124064bb4 SHA512 92c8885a0e1482065a8b86f7be890859a5eab6b9d57ff219e916cbbd10cd185deec1c5db25dae8c405a343ab0e2ddaba3ddfe0b567d06534405f102e1845654e
-EBUILD rgb-1.0.5.ebuild 421 BLAKE2B 3e16368b4795afacc3aad5601b562419c6eee6cd61108b872763733ee8d73549ea1a5f9386de94dbc02d5972ab360f1bce2b36042b117838a513ec2f1efd6f81 SHA512 c791de01b06a977b2dd5028f1805e22de6bde5e0d6a3031290669189503216173d7e94538ce7e5c7bdc3ad4154d2a3b21a89de713360b4d088a1bd34912a3bbb
 EBUILD rgb-1.0.6.ebuild 448 BLAKE2B 420cab1dc350afb4101f5a10a0ef0b017ea43a399bbf7f8882120ffb66073166755b9e14830b3353ad99d37900d62b3445af05d80df18d27fe361b73d583e91e SHA512 4ef1435859cd5769930ae9f01213a388054020ab1e0fb2f25c00313a3ca2c56c5f63a401f2161553534d6e195b8030366dd9cb76174f88cd087e5eeafa4499c1
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/rgb/rgb-1.0.5.ebuild b/x11-apps/rgb/rgb-1.0.5.ebuild
deleted file mode 100644
index 88f8ee04ddb2..000000000000
--- a/x11-apps/rgb/rgb-1.0.5.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit xorg-2
-
-DESCRIPTION="uncompile an rgb color-name database"
-
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE=""
-RDEPEND=""
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
diff --git a/x11-apps/showfont/Manifest b/x11-apps/showfont/Manifest
index e15c83a3eeea..559341ba8636 100644
--- a/x11-apps/showfont/Manifest
+++ b/x11-apps/showfont/Manifest
@@ -1,5 +1,3 @@
-DIST showfont-1.0.4.tar.bz2 118199 BLAKE2B 0784e5c6a4cb2fbff460058aac958a68d788dd65fd83dd00d3dd2b59220f1279c1cfec0f86fab79ede2888c49b18f3f3eb5e73f711dd0bebb5e868c623ece01b SHA512 5514aec3eca18f714b14b60a085e7f6edafa6f661567876cbcf965d67e90f031dd02d60cc71f8f1889b8e94c99a7f4f8adc8cb3acc1054a83dc8bc36656be0cb
 DIST showfont-1.0.5.tar.bz2 125618 BLAKE2B dd3f97e3f2dff934f1cff4bfda0f8a06be3b8549b8572f3a163dbc638fa753eb14b65e8b11e19a56e687a306f3602f99b91fc458c22543d5622f870e518b77cd SHA512 d90d6d99ca573f2632435ccfd46de606994e3792deb58bab6261ff950481ec71eef032b828da0ee5333d6946c5f54594dfb2dadf930825971d3f4baa5c0ff6fd
-EBUILD showfont-1.0.4.ebuild 280 BLAKE2B 5f3e0343da41c73d391f75e228bb094650cf91cdf537e1cbd8c7cddd92ed92f4d67994dfd2b25a58dc03aa8b88bbad4a0bc6e80ee6ff01399b66f792f08e8a3a SHA512 e78c4100e6bdb4e2c4950bea79e4e10b694208a9eabae9ae7bf22beb9f927a5b23deb2935fd2f270063d730663c488ca2361b97526e440a9cc6dbc2e8fb4727e
 EBUILD showfont-1.0.5.ebuild 280 BLAKE2B 5f3e0343da41c73d391f75e228bb094650cf91cdf537e1cbd8c7cddd92ed92f4d67994dfd2b25a58dc03aa8b88bbad4a0bc6e80ee6ff01399b66f792f08e8a3a SHA512 e78c4100e6bdb4e2c4950bea79e4e10b694208a9eabae9ae7bf22beb9f927a5b23deb2935fd2f270063d730663c488ca2361b97526e440a9cc6dbc2e8fb4727e
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/showfont/showfont-1.0.4.ebuild b/x11-apps/showfont/showfont-1.0.4.ebuild
deleted file mode 100644
index 08e95071467c..000000000000
--- a/x11-apps/showfont/showfont-1.0.4.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit xorg-2
-
-DESCRIPTION="font dumper for X font server"
-KEYWORDS="amd64 arm ~mips ppc ppc64 ~s390 sparc x86"
-IUSE=""
-
-RDEPEND="x11-libs/libFS"
-DEPEND="${RDEPEND}"
diff --git a/x11-apps/transset/Manifest b/x11-apps/transset/Manifest
index 8f447a33572d..8d1503efcc9a 100644
--- a/x11-apps/transset/Manifest
+++ b/x11-apps/transset/Manifest
@@ -1,5 +1,3 @@
-DIST transset-1.0.1.tar.bz2 121199 BLAKE2B 1ef56061150993bf870075c5dadf0589dc795750ce9b898a5a39a062fd14693003a4b0ab258140e87a208fb1f560742dc6217bfebaeffce98cc73d677fe015e9 SHA512 709a693cedc877f981179376105ac071ea5cf553c4388ecc7b974547050104fbc2cc64292f86f047b70acf7d85e7dca1ed7cd004b73652f4854275c8a514fd1d
 DIST transset-1.0.2.tar.bz2 127774 BLAKE2B fba4e8dc6eb3b3ea1285af9fccacc2d46cddbf17a086084c3db395bb5d78e6f13a348e2733c8b42efd2993dc053c01a4e6761c479506ba5d84a8715a956303c0 SHA512 f7a658cae70e211a0455420efbfacee0f3032821d94e7a80ec6db32ced716c1ce013f38713915505998071c312cedd1bad08575dbadfbbeb94361b048623f874
-EBUILD transset-1.0.1.ebuild 300 BLAKE2B 7eae249f4b26b9f5b2971d18644e88e46eac674049e8361a8980c28a3fc1a1a11898ad72825ec3cd93fdd0b209c139ce3a7682a2232e7d3b8bc5908b0ba44b9d SHA512 834062a86b701b476e31a9fc26bc0c935914169d99b2c191ab820860e92752ec9374b416193b0ac00acbb0893e01836d89dea0d431a8abba813809716f7c3276
 EBUILD transset-1.0.2.ebuild 300 BLAKE2B 7eae249f4b26b9f5b2971d18644e88e46eac674049e8361a8980c28a3fc1a1a11898ad72825ec3cd93fdd0b209c139ce3a7682a2232e7d3b8bc5908b0ba44b9d SHA512 834062a86b701b476e31a9fc26bc0c935914169d99b2c191ab820860e92752ec9374b416193b0ac00acbb0893e01836d89dea0d431a8abba813809716f7c3276
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/transset/transset-1.0.1.ebuild b/x11-apps/transset/transset-1.0.1.ebuild
deleted file mode 100644
index e94154a3ff15..000000000000
--- a/x11-apps/transset/transset-1.0.1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit xorg-2
-
-DESCRIPTION="An utility for setting opacity property"
-
-LICENSE="SGI-B-2.0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="x11-libs/libX11"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
diff --git a/x11-apps/xdpyinfo/Manifest b/x11-apps/xdpyinfo/Manifest
index a6c66ad7a806..d83ae36c8d61 100644
--- a/x11-apps/xdpyinfo/Manifest
+++ b/x11-apps/xdpyinfo/Manifest
@@ -1,5 +1,3 @@
-DIST xdpyinfo-1.3.1.tar.bz2 136412 BLAKE2B 6c9750a0c9690f6c5cebf3551f6ed77b4504e1ec31685c698abb5963b571d214d4647f3b1b11837e3df645becc468bd9f0275616527519693011d7e3168051a3 SHA512 1d9f5948f04bf555181f7989bd25dd4559226f757a8452493cfa7ba0ed33112502df28ea702e48c384e801360ea1b6374a1e3f626bd56b7a855016c12b7ad927
 DIST xdpyinfo-1.3.2.tar.bz2 141351 BLAKE2B b2dee4f424dee902c31430b8843c14d6836508ee0125db7de41f5e9faef1732dea571e90b37638cc90dabd3995a0ceb5e4094707138b7e066ee1ae856258503c SHA512 2c9097c13778c7a7fe5a9b3ee04b28512ff6028231eca91ecdf6104c742be470678920d37a4f540fece7e39dccbea34802271f359ab80618027b2856c8912e7d
-EBUILD xdpyinfo-1.3.1.ebuild 770 BLAKE2B c0d25e2b7713d6b2dabe70ca563c9f766ca7d3e01c3594d0b6e24f5b3b685122a1c0f9632883a78b67f22e4be36d47d169a93ebec2ee4101923aa29b6e92fc8d SHA512 3a22f19002266c5de95025ecdc1684315d7df4e7b3868c7d33e23674b7bc52f614767dd94e4dd40f5559c616a528867f84b7c8744e3c891cca178b50d684844e
 EBUILD xdpyinfo-1.3.2.ebuild 770 BLAKE2B c0d25e2b7713d6b2dabe70ca563c9f766ca7d3e01c3594d0b6e24f5b3b685122a1c0f9632883a78b67f22e4be36d47d169a93ebec2ee4101923aa29b6e92fc8d SHA512 3a22f19002266c5de95025ecdc1684315d7df4e7b3868c7d33e23674b7bc52f614767dd94e4dd40f5559c616a528867f84b7c8744e3c891cca178b50d684844e
 MISC metadata.xml 347 BLAKE2B 0496b148ad07710139de96e153b80e6035e6731a18d6e8a4dce75dd17bdfc54ad77276f1f82791393d198e96c9306f464dbce832b4d643b6285fb9a6d92e6261 SHA512 98174497a1f55be4b14d769ec110dafd63a8942eb8f51e2953237b76705128e47bd36a39b9c25985cdd99a3b431f3d5aa856fd634b2a2fbfc1a5cc13a3826fab
diff --git a/x11-apps/xdpyinfo/xdpyinfo-1.3.1.ebuild b/x11-apps/xdpyinfo/xdpyinfo-1.3.1.ebuild
deleted file mode 100644
index d69f224bd74b..000000000000
--- a/x11-apps/xdpyinfo/xdpyinfo-1.3.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit xorg-2
-
-DESCRIPTION="Display information utility for X"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~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
-"
-
-pkg_setup() {
-	XORG_CONFIGURE_OPTIONS=(
-		"--without-xf86misc"
-		$(use_with dga)
-		$(use_with dmx)
-		$(use_with xinerama)
-	)
-
-}
diff --git a/x11-apps/xdriinfo/Manifest b/x11-apps/xdriinfo/Manifest
index 40aa560def16..17b27a499e1e 100644
--- a/x11-apps/xdriinfo/Manifest
+++ b/x11-apps/xdriinfo/Manifest
@@ -1,5 +1,3 @@
-DIST xdriinfo-1.0.5.tar.bz2 121276 BLAKE2B c6db6dfd5ff0f5f6106f92ad42b37e18cc148d156a5e294c497f4ac84226114bcb7d7666196b4b1e1b4471108f839c03d4a2e1dc19080af0d60c5cfb10b55463 SHA512 6b7a3641f488d305f950c494464fd4b674ab3aaed5c7159d6d8ddad4587c18d680e5854bd80666444f1dee52eb4f46b45709a6d9c333593fe045c73e738524de
 DIST xdriinfo-1.0.6.tar.bz2 123636 BLAKE2B 43e15c6833ad84760c89abff272864e13b777c01796ba119fbc7fa7165ab05cf5a090cf736f618a25385b5d5a8cf2d679fbe2cd55119842fcf9e16fdb46dd549 SHA512 7ddd9e19abaef93e4d85004293528ec3814ef84c470d496dbb8dc8313d804bb7520406de8d33d2bc2b3af942bd0a5d5032a109b2726438a966af63ea680a102f
-EBUILD xdriinfo-1.0.5.ebuild 488 BLAKE2B 8ae51a2973054db0c3b86d6d2a3686a505b391759d34fbb342f2290d5375b303119b3bd981879994a8072d71c5bfff9a22b4a4c13c76418e6ae03f9371969be6 SHA512 228b45aef3a668d593068efea63583a1d3c9462eb46785b97bdd4de39a8e7f891fad5fc545dd8ba1b9c0b21b3257fb7d188a4ba1b29f725ead4c2b6a647616f1
 EBUILD xdriinfo-1.0.6.ebuild 487 BLAKE2B 16bcb26d0f5b423b5ecf408f0a404f3d74b80e61aa31ef9c69158cd91ede416a4b3da19c2f9e9ea3f3bebf616097eb397658b01979922f5be638c2b2f4cef66a SHA512 5ad5730a20da542453e6006fc6730465d0f69ef6d12beb6d6d7de9fa1fd469636c0d273dae84f5b18ecfe15b561984127fb2a0e02cdbc1f726091d0334b40eca
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xdriinfo/xdriinfo-1.0.5.ebuild b/x11-apps/xdriinfo/xdriinfo-1.0.5.ebuild
deleted file mode 100644
index 9fc1ba2196ef..000000000000
--- a/x11-apps/xdriinfo/xdriinfo-1.0.5.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit xorg-2 flag-o-matic multilib
-
-DESCRIPTION="query configuration information of DRI drivers"
-
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	virtual/opengl"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-pkg_setup() {
-	xorg-2_pkg_setup
-
-	append-cppflags "-I${EPREFIX}/usr/$(get_libdir)/opengl/xorg-x11/include/"
-
-}
diff --git a/x11-apps/xedit/Manifest b/x11-apps/xedit/Manifest
index e9250a08fe0b..73badcb3a3e9 100644
--- a/x11-apps/xedit/Manifest
+++ b/x11-apps/xedit/Manifest
@@ -1,5 +1,3 @@
-DIST xedit-1.2.1.tar.bz2 520614 BLAKE2B d3ffca5517472d4b5f80e6ab84cb79af216493a81d951ae30d28babcca7847ad638d179e237579a20589c96f10b0cf61be13bb7d0f40461be077ced63e37de58 SHA512 8c0675e39219ce4da02f2fc09ba39a5ff774213d155ad2dfd55e7672ab896219e815b12a4a86f3c72dfd6fd32e75bcdaaefdecab81fa5a10aebf0ed6b88e5af7
 DIST xedit-1.2.2.tar.bz2 525861 BLAKE2B 608f3f2b06d14f99a71d9eaf45114ba71271957f584c685236bd78e2f7c9a6e969ce15de72a7530a41835b951caa800a7cb0c45d71a4790aab5fe703d654e912 SHA512 24d8e23a2ad1a2e81f6606928bb032f25b70b76da83b65341367bc4111d011abe89f9e30402d057854f2ccdaa9c1ef0d7c55bf29b81ab2d050a8f448cf3eeb5d
-EBUILD xedit-1.2.1.ebuild 324 BLAKE2B 83699ba439c013e06faba5f06e033eca6087273dbb318229e5770073a46a4a55abd21d639e594d0d23471b592b25be3b27470e2656f4bb9b0c2904f3d1bed524 SHA512 d58047c0c951d451a5f4c36391d6d4fe2dc76a27f259bed693f898ce7d60cd587fd24bda0ad02d50a670e10408406f31003b8a282278a2e616e0996cdb184161
 EBUILD xedit-1.2.2.ebuild 328 BLAKE2B f9b7e390f9eff8be5f2262dfae0a2f5e26f9b121a48dad5f9f88168bcfb725b5d36d11283629b2de6b0fc1d65787242214e8ea8552295949ce048c21215141cb SHA512 eacc68fb84e56b72f33a8688a6244f1c7f900581cf090b01f14ace402208c917ae826839503ccad12f543f6b70248d44455c28ad6992e74e79ca2f85c9754d5c
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xedit/xedit-1.2.1.ebuild b/x11-apps/xedit/xedit-1.2.1.ebuild
deleted file mode 100644
index 59948aca9294..000000000000
--- a/x11-apps/xedit/xedit-1.2.1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit xorg-2
-
-DESCRIPTION="simple text editor for X"
-KEYWORDS="amd64 hppa ~mips ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND="x11-libs/libXaw
-	x11-libs/libXt
-	x11-libs/libXmu
-	x11-libs/libX11"
-DEPEND="${RDEPEND}"
diff --git a/x11-apps/xeyes/Manifest b/x11-apps/xeyes/Manifest
index 2e99665899c3..7fb4ba0d60be 100644
--- a/x11-apps/xeyes/Manifest
+++ b/x11-apps/xeyes/Manifest
@@ -1,5 +1,3 @@
-DIST xeyes-1.1.1.tar.bz2 113757 BLAKE2B eed50677718223be829fed869360dc2ed98252a2e0a335403b8e680bd5a47cb96d92a762899e46a8823a260dda4be7ae98b45208c87c80a833ab8929056df427 SHA512 3cb734239fa3180a9cc0eb2564c5a04f5e5c64ea314079c0604cebdbb821132f95a2c113dab476af8820308f0e6dbd4eac02b5da45dc2ed78a5d3ca010453618
 DIST xeyes-1.1.2.tar.bz2 133160 BLAKE2B c3f31a2df7988517e4f8903fce6b0cbfbaad01e84d89c7b9f7755eccebba95fbb8b75377644ae97f090e9f4a3a245698966e78f738275f7513f5927193b5dd19 SHA512 008d76f03ddabd3d86ad9e52a540504553b94cb7a6743b20cf08897549eb27505667365ab9af21956a1b5ec7297acca8903a326536e6195a30e643cd93297ee0
-EBUILD xeyes-1.1.1.ebuild 452 BLAKE2B e99e2740d8dfd5f30393a263c09e5a59701d7aec3a5400edb3dd225413bc6ab591058bee228bff9757ad1f376468cf9a20b4fc61f94af0bcce1cb412e6ef5650 SHA512 bc8e8fa591327740bd354cbd8230aaaaab198b3cb58cba65a1c33e4e7027876d19d62b62875b38605ad2b630e0ff34ae2b72c45e4220813cf3c823066f815ef8
 EBUILD xeyes-1.1.2.ebuild 451 BLAKE2B fb2fa73ff85c4e02bddd8133922afe8c9dbf917946ef275fd61ec2af820d42b2e13fde5c52a48ebc87b01178e91e7f637e084d28b4b154ef757d815e762e8394 SHA512 4b76f8871c1384647fd7b758f310c7e8aab5b8f3d32a1a2fae87ae99d9ea42bca8cdedf7acfce497e6927fa4759af845eec670edc4e639c5ddbdefdc2538bc2b
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xeyes/xeyes-1.1.1.ebuild b/x11-apps/xeyes/xeyes-1.1.1.ebuild
deleted file mode 100644
index acf3b255cb6e..000000000000
--- a/x11-apps/xeyes/xeyes-1.1.1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit xorg-2
-
-DESCRIPTION="X.Org xeyes application"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~sparc64-solaris"
-IUSE=""
-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/xfontsel/Manifest b/x11-apps/xfontsel/Manifest
index f5dba55711fe..8011ec411022 100644
--- a/x11-apps/xfontsel/Manifest
+++ b/x11-apps/xfontsel/Manifest
@@ -1,5 +1,3 @@
-DIST xfontsel-1.0.5.tar.bz2 139801 BLAKE2B dc3c9f8b893434923f414a9bb2a8608cba1eafc7ad915cbd6231763892608cebcba8147a02250719ed4fb5881389467ab375a7777f904248047d369533949713 SHA512 df7a49286b94f64c610ab990d66376dedc12e3e8fa1d803641f466c3f6ebfdd06e81e4c7be39f8e6234928305f397d877579c39cf24c319dd5deead56f2578a4
 DIST xfontsel-1.0.6.tar.bz2 146469 BLAKE2B 9773430e51e63d23086403f91fd78f6ed2e7f3abf144fda5bba171d05145026d233474e9d055b31bd498a861994c4f59af52a8101fc1e10b891ea879cb2f0bb9 SHA512 2f6bc51549a302404cdaf9a5a825add383953fcbb2a0c7076691cefd4dd7e4a3c772c047be74101c8486f75d03ce0bd3e65ede14e91732cf2a932810441c9099
-EBUILD xfontsel-1.0.5.ebuild 408 BLAKE2B edb05263c134839517f8e8225152f11cacbd43f31b6d44139416f102355d574afba703d31b7fb96f8af39910ee80d8f0786f8143d1fcbfd82276710566cbb4ed SHA512 738c3a9496e1b461ffef774c8ce2117abd2f685cc6246108af56aa9ee05bbf1aa543b21e77589a2417435a605c6879642d7c64ea37179beb8bc77dfe7b214dc2
 EBUILD xfontsel-1.0.6.ebuild 408 BLAKE2B edb05263c134839517f8e8225152f11cacbd43f31b6d44139416f102355d574afba703d31b7fb96f8af39910ee80d8f0786f8143d1fcbfd82276710566cbb4ed SHA512 738c3a9496e1b461ffef774c8ce2117abd2f685cc6246108af56aa9ee05bbf1aa543b21e77589a2417435a605c6879642d7c64ea37179beb8bc77dfe7b214dc2
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xfontsel/xfontsel-1.0.5.ebuild b/x11-apps/xfontsel/xfontsel-1.0.5.ebuild
deleted file mode 100644
index 0b56c5402146..000000000000
--- a/x11-apps/xfontsel/xfontsel-1.0.5.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit xorg-2
-
-DESCRIPTION="point and click selection of X11 font names"
-
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~x64-macos"
-IUSE=""
-
-RDEPEND="x11-libs/libXaw
-	x11-libs/libXmu
-	x11-libs/libXt
-	x11-libs/libX11"
-DEPEND="${RDEPEND}"
diff --git a/x11-apps/xgc/Manifest b/x11-apps/xgc/Manifest
index d504ce11fca3..87ba25d1af53 100644
--- a/x11-apps/xgc/Manifest
+++ b/x11-apps/xgc/Manifest
@@ -1,5 +1,3 @@
-DIST xgc-1.0.4.tar.bz2 180138 BLAKE2B 97082987e557963e714b5ec96c3d1106e9ecdc7d832f948c8205965363968b6db9de81229b126cb6f9098dd9ee0c00b353022410b88fb73cce8d382ddafc15d8 SHA512 c2156eb1c6dcc838d9b21ac9e45b188a92dadc991875c3c9497a18bae36212c01cf4c2c6df04830664da4e010880d2d84663e00aaa5e17082211ba969d480390
 DIST xgc-1.0.5.tar.bz2 188307 BLAKE2B 8e3906ee07898c1382c692d3ccb7541de40be55dbc88c0ed40ab3e78a638c6e475bf38f3a34d626507d34270208cc59cb7bdf727869c9907a00fca6280b5b39e SHA512 5943d13b9e0ed5e1b66d26eaa4b39d16d71f0df23e3ea93bfc397b6303516b161c2b60b24679ed75b640bf2493e66682d35efc7cedd41c5b57caa65f309a8314
-EBUILD xgc-1.0.4.ebuild 288 BLAKE2B 9e538dbafd2e5305fc7fe7b2fb036f34c8f29e0a5440a8d49e66250acf8d69b5648fc38602961da63b5ee16cac93aea3f5b68d9b62f083f3e93161f1566aa05e SHA512 f5790d680dbbad3c26604959c70eda871b90ebd1db17ed3ba28a1a96f635a28546b99beb09f84128c870e81418504b30d526fd36773ef2b8a7b21b570c1a8255
 EBUILD xgc-1.0.5.ebuild 288 BLAKE2B 9e538dbafd2e5305fc7fe7b2fb036f34c8f29e0a5440a8d49e66250acf8d69b5648fc38602961da63b5ee16cac93aea3f5b68d9b62f083f3e93161f1566aa05e SHA512 f5790d680dbbad3c26604959c70eda871b90ebd1db17ed3ba28a1a96f635a28546b99beb09f84128c870e81418504b30d526fd36773ef2b8a7b21b570c1a8255
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xgc/xgc-1.0.4.ebuild b/x11-apps/xgc/xgc-1.0.4.ebuild
deleted file mode 100644
index b9a84142818a..000000000000
--- a/x11-apps/xgc/xgc-1.0.4.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit xorg-2
-
-DESCRIPTION="X graphics demo"
-KEYWORDS="amd64 arm hppa ~mips ppc ppc64 ~s390 sparc x86"
-IUSE=""
-
-RDEPEND="x11-libs/libXaw
-	x11-libs/libXt"
-DEPEND="${RDEPEND}"
diff --git a/x11-apps/xinput_calibrator/Manifest b/x11-apps/xinput_calibrator/Manifest
index 08775f62d0a1..e5bc4baa31ae 100644
--- a/x11-apps/xinput_calibrator/Manifest
+++ b/x11-apps/xinput_calibrator/Manifest
@@ -1,3 +1,3 @@
 DIST xinput_calibrator-0.7.5.tar.gz 355313 BLAKE2B 72c6b2f1b2cf4d5baaba27827e870adb52c4a51004a9a3f51376c5e30560b26abe6e83a94ae2e308a01dca3204a1938d888d40cad793cce50c1d9acea9f507b3 SHA512 dc022f4de6d7b57912373a571ef0598c7b9d91cdbc3f63bb2b32c6149e43f67eaf820dc0289349d527314381d5195cf8891f6bcb9847110662dd75875f76b9de
-EBUILD xinput_calibrator-0.7.5-r1.ebuild 733 BLAKE2B 843320ced66cf3883d4eaca06b851a144936ad9f0b8381c7c78cd46ce8ed18ebc59aeaccd4e421cc7a964134081640ec09d29300120d7599f18d9cac8a66a037 SHA512 00a9130509313ecc73171f18ef6aec5ec5ddef785794e644b44c66d5d8b9d4d9391759f938530d6f7a9fadc7e9c481e7b85546db289716d527551e109bea1810
+EBUILD xinput_calibrator-0.7.5-r2.ebuild 638 BLAKE2B fb71f6c2669d13d8d99bf53889d258da5a5df152ae6a44ea5db998ebe33331f3b7fdf9bd12986ad6d0499ca33761e74007e0da9e27219f81eaa68a31f244e316 SHA512 c80d656103dc1db39d04c04ebbfbcadde634a720c3f44db836f2cd592029521970e2c6864de96a292a3b5bba7922d2f436cf4bf6221861694a7e3788551e8d65
 MISC metadata.xml 234 BLAKE2B b45f6795dbd73dfcee2a68f93ec5460509b15a69401467bc8f4af9505eeb04a2aa35a2b144eb88781df4abd4e15d2b88fc728daf033c6d646762170ffb00b1a7 SHA512 fabcd59aeede4ac93d66552746edacc44fd565551aafaca67185aff7f8e6a4c0fa21f3d54e4fccd7def948ec57b90489631bd779fb992cd9322132b0a3aa503b
diff --git a/x11-apps/xinput_calibrator/xinput_calibrator-0.7.5-r1.ebuild b/x11-apps/xinput_calibrator/xinput_calibrator-0.7.5-r2.ebuild
index a2641d8d82db..7a3d3101534e 100644
--- a/x11-apps/xinput_calibrator/xinput_calibrator-0.7.5-r1.ebuild
+++ b/x11-apps/xinput_calibrator/xinput_calibrator-0.7.5-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit autotools-utils flag-o-matic
+EAPI=7
+inherit flag-o-matic
 
 DESCRIPTION="A generic touchscreen calibration program for X.Org"
 HOMEPAGE="https://www.freedesktop.org/wiki/Software/xinput_calibrator"
@@ -10,22 +10,21 @@ SRC_URI="https://github.com/downloads/tias/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 x86"
-IUSE="gtk"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
 
 RDEPEND="x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXi
-	x11-libs/libXrandr
-	gtk? ( dev-cpp/gtkmm:2.4 )"
+	x11-libs/libXrandr"
 DEPEND="${RDEPEND}
 	x11-base/xorg-proto"
 
 src_configure() {
 	append-cxxflags -std=c++11 #566594
 
-	local myeconfargs=(
-		--with-gui=$(use gtk && echo "gtkmm" || echo "x11")
+	local myconf=(
+		--with-gui=x11
 	)
-	autotools-utils_src_configure
+	econf "${myconf[@]}"
 }
diff --git a/x11-apps/xkill/Manifest b/x11-apps/xkill/Manifest
index 4575ed871e5f..14ad5eebe144 100644
--- a/x11-apps/xkill/Manifest
+++ b/x11-apps/xkill/Manifest
@@ -1,5 +1,3 @@
-DIST xkill-1.0.4.tar.bz2 124828 BLAKE2B 4d7484a6e044f2a93d7d54f25619c08f657cc34955cd399e927442d8e8d79f3ad983020f75a3edb57e91371f4693909fae28b1ebf8f1e78189868c79c3ac5e87 SHA512 14d1fc0eff96a62d66307f09efc599639ee70be4bf580e2857569326881bfdcae7a8a21640509875218dd2b88575b4801ab0c43c4295550dc71141a579483545
 DIST xkill-1.0.5.tar.bz2 128146 BLAKE2B a01b954872eaad2aefe11335df2c85972abb8d36ae0c00fbca02b5af2d7df57934e3ddc47455f88927a90b0bff5ed707ca6dddbbf5478c89b193c98a86cc0562 SHA512 4603a1794f114f5cea2c885020c9d073c8421d1e785c99ff6b936ae97139c8dac8020a187b5bbd0fa6d56ed6fab879441b42ba900cc5f2f5a534dafdc86b9249
-EBUILD xkill-1.0.4.ebuild 361 BLAKE2B c8514bf71107186edbb6fd362e2eacafe43c88df1cfb5cce48967857906031962eb6e921974e59a4190ac74ec2df6a6b86ae53b5fed8169bde2ea5dcdcc1314d SHA512 7e5fd914df7b5ccda284bd836a947a648f7fc30aea92c9a24df6803701b86b0d8f5bc8a8d7efd54629d2ed32fee0f9d6a64237143ea9bde3bca178e59e85b3bd
 EBUILD xkill-1.0.5.ebuild 361 BLAKE2B c8514bf71107186edbb6fd362e2eacafe43c88df1cfb5cce48967857906031962eb6e921974e59a4190ac74ec2df6a6b86ae53b5fed8169bde2ea5dcdcc1314d SHA512 7e5fd914df7b5ccda284bd836a947a648f7fc30aea92c9a24df6803701b86b0d8f5bc8a8d7efd54629d2ed32fee0f9d6a64237143ea9bde3bca178e59e85b3bd
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xkill/xkill-1.0.4.ebuild b/x11-apps/xkill/xkill-1.0.4.ebuild
deleted file mode 100644
index 73e70b238b47..000000000000
--- a/x11-apps/xkill/xkill-1.0.4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit xorg-2
-
-DESCRIPTION="kill a client by its X resource"
-
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-winnt"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXmu"
-DEPEND="${RDEPEND}"
diff --git a/x11-apps/xmessage/Manifest b/x11-apps/xmessage/Manifest
index dfe8102ba6ac..67a78e2f7272 100644
--- a/x11-apps/xmessage/Manifest
+++ b/x11-apps/xmessage/Manifest
@@ -1,5 +1,3 @@
-DIST xmessage-1.0.4.tar.bz2 125011 BLAKE2B 4b1134ac3dcb6a696ba75dddb3fcd348222763c375067279e4d6af41c3c2c855249cd76b888693a5c0136144071acb628c0e3a653ce0afed70d0e6910d055a4f SHA512 a087fb09595bf0b188a4525b45e9b607acd063cceae36c69c78a48674fb7eca1c82d5c2d2770c7f4425b499e4c002bfc0e377935308c218a330a2b4994b94ebd
 DIST xmessage-1.0.5.tar.bz2 133393 BLAKE2B afa42e20ba995fa1086cd3cee5b90be8564c521f7bc12b544a787cc753782e1cfdbc5a94f5925f5bae1b630b7ac08fcaeee59e319f680d3be29c46d5421aa048 SHA512 a8423c3986b1576fa67800c315a605a527bb9a8f594ac269a736ae7b91eed0d4d83deb89148197dc3cd3f0e51894146958ce2979f78e97dcdb99c5326e34dabe
-EBUILD xmessage-1.0.4.ebuild 467 BLAKE2B 7e2319114b6f99b51b2722f41ef1a3d974093b5cdb0e2fd535c554275f1ad49fece8bcede6bf6104b1baef84ee7ba45ce81e83d8492743333ff4f42dbc4015f5 SHA512 cb3a3a18e82937ffe15afb001b9d458cee3e45b1a7553d38d9140dc550265af85f3c3e70dd7ce8ec27da776c6b2d1f01349951b08484fd71a45e6184893288f0
 EBUILD xmessage-1.0.5.ebuild 465 BLAKE2B d1a59adab2833e5f41f30199f6248803c1afa2cd92e8450670be1793ff91615eab4fec15c513fb4b4c116b0c115c8334ebf59d562f5754525d493d9bbf2daf38 SHA512 3bfe38dfb10ec1a58565fe93bbaeecd67f56bf99479612e77b946b8021e0d106455e09c4d23d7779ee29b6347f894fe7e7d1628767be32a9d48c66f4ac9f4e4a
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xmessage/xmessage-1.0.4.ebuild b/x11-apps/xmessage/xmessage-1.0.4.ebuild
deleted file mode 100644
index aeffb7fd02d3..000000000000
--- a/x11-apps/xmessage/xmessage-1.0.4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit xorg-2
-
-DESCRIPTION="display a message or query in a window (X-based /bin/echo)"
-
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="x11-libs/libXaw
-	x11-libs/libXt"
-DEPEND="${RDEPEND}"
diff --git a/x11-apps/xrefresh/Manifest b/x11-apps/xrefresh/Manifest
index 839a595842a6..a49bf4412820 100644
--- a/x11-apps/xrefresh/Manifest
+++ b/x11-apps/xrefresh/Manifest
@@ -1,5 +1,3 @@
-DIST xrefresh-1.0.5.tar.bz2 120757 BLAKE2B 5c29df155649998cc18e607267f140e59fc50df063d1ba26440103c71c998050f4a0e940ef87a78ceeb3f350e9340fea3813c204548d5f506cb8c014be9362e0 SHA512 287d167cd167aa35cfc89364bf4e74313137ce47978419446c60cb915188c34051f95d4900d0d5dcf692173f31e00e2699d70e54b79f0b21a59b4694be744014
 DIST xrefresh-1.0.6.tar.bz2 127494 BLAKE2B 587f5756bbd3095e77494288d4b9cca99992b342bb718e5cadefdfbf018710ce0f216f43b68814d0d0a681c87d855be4ecf199a314361278c3bfdd81e6073f69 SHA512 361e97fecfc2706d5eeab69df0d4dd4baa55b6783cfddabf51d8561b7c930d71ce6c217e0512c6564208d69b04f89c69ea8c0bfb2e4f6cc25b062b55e4db3674
-EBUILD xrefresh-1.0.5.ebuild 311 BLAKE2B 45cf2d160fecc68de4a809e919064626840e1d1d5b91e8ee3c7245421c17be4193c3e499a2ba9ca797cf36ae76589295d591cddb7422cd12c6b812df2b85f878 SHA512 86af2598d1b33cb66210bb0389aeedfae44c5f7e241bfb791c32ef47574ed7d875e95b915f36737ac5a9254c2545e355d0ab0a4acdf410da03e315fef6aaf635
 EBUILD xrefresh-1.0.6.ebuild 311 BLAKE2B 45cf2d160fecc68de4a809e919064626840e1d1d5b91e8ee3c7245421c17be4193c3e499a2ba9ca797cf36ae76589295d591cddb7422cd12c6b812df2b85f878 SHA512 86af2598d1b33cb66210bb0389aeedfae44c5f7e241bfb791c32ef47574ed7d875e95b915f36737ac5a9254c2545e355d0ab0a4acdf410da03e315fef6aaf635
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xrefresh/xrefresh-1.0.5.ebuild b/x11-apps/xrefresh/xrefresh-1.0.5.ebuild
deleted file mode 100644
index 50dafaff47e6..000000000000
--- a/x11-apps/xrefresh/xrefresh-1.0.5.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit xorg-2
-
-DESCRIPTION="refresh all or part of an X screen"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
-IUSE=""
-
-RDEPEND="x11-libs/libX11"
-DEPEND="${RDEPEND}"
diff --git a/x11-apps/xset/Manifest b/x11-apps/xset/Manifest
index 17c57e307758..261514186ad0 100644
--- a/x11-apps/xset/Manifest
+++ b/x11-apps/xset/Manifest
@@ -1,5 +1,3 @@
-DIST xset-1.2.3.tar.bz2 142286 BLAKE2B 83ba3d7ccc259ae7b244049e558af6db9428b897b340537b75b6c534c7e8a11f36709237982ffe1ab5b523cef5834467bdc85c94fbe07c64d6eab6eef2c930b2 SHA512 7b2cf4b06b93aec9f6f868be3f0932a5d6e62968485f7eb742a9b775059aa2a49c9170404e0597fd41a5730c0bf321e371ee6b23bbcde3be054f768ab8d3d92a
 DIST xset-1.2.4.tar.bz2 145546 BLAKE2B df4ae52046af7f632e2f60386bd3b8d90b27db3e53ceb68f1056c9c5df2ee9c6d83d109a444eb99ddc031e35b91db0249ee56eba3180bc9a8a002935db213605 SHA512 f24714c9a82081a09d3054bbad98553de9366992f22eaf3e2bcadbb58fad1d3dad2547fef6fa9898d8a9df064573c29df9d82a5c801fa92248604c95f65dc83d
-EBUILD xset-1.2.3.ebuild 481 BLAKE2B 77a6667b5a60dc600a0b8020a1a81054588a0ba0c9abb8a1f8794855d50c146adf9527912bf22ac23158bfcd17e0078a9827132c4b05bcb4ce4668d9ae464635 SHA512 4feed7e94b16ac0847dfd2560ce9b4f65f151b82bbfdb79f4f6a5d2788dab4cf4cb4bd2e5fdcdf7783d3bec12d9a9c4525862efe0a2c51f0a83a17525eefd698
 EBUILD xset-1.2.4.ebuild 480 BLAKE2B ad32f3f8d9dabb9ff8df650df24a515c0738dad789ffebb85803bf64850ba4774a0120eda3d89ebda7aad64ea20d9b937be25fa0a8f7ea3c76bf2355d01655a3 SHA512 f5047ae36a8ca04fc6d9c446ef8b004eaf032703f5aba18cd6c4d13f665d3e588e6a4dae2c5dadcf735e79b7f82f4e5044126dd6a6481d043599c06a20ff6f75
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xset/xset-1.2.3.ebuild b/x11-apps/xset/xset-1.2.3.ebuild
deleted file mode 100644
index eeed78e4c258..000000000000
--- a/x11-apps/xset/xset-1.2.3.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit xorg-2
-
-DESCRIPTION="X.Org xset application"
-
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="
-	x11-libs/libX11
-	x11-libs/libXmu
-	x11-libs/libXext"
-DEPEND="${RDEPEND}"
-
-XORG_CONFIGURE_OPTIONS=(
-	--without-xf86misc
-	--without-fontcache
-)
diff --git a/x11-apps/xsetroot/Manifest b/x11-apps/xsetroot/Manifest
index f20e75852f59..312611e4b616 100644
--- a/x11-apps/xsetroot/Manifest
+++ b/x11-apps/xsetroot/Manifest
@@ -1,5 +1,3 @@
-DIST xsetroot-1.1.1.tar.bz2 119977 BLAKE2B 7589dc6014c2f905dce4bc72c4a98096eba38354975c307408e1aeb06e27cafcf64ecda7f8e3a470ac25e41108b3aac688fa9d365a3ab41908a52d8044142712 SHA512 04834a8ca658a4aabe03e62588353102e8019d424e25fab450d48e6fc4ac358df5bb98a850c82c61e2495faabfe54f3d92d9563e77c83ace7fd69c278edbbd64
 DIST xsetroot-1.1.2.tar.bz2 129091 BLAKE2B 0bd0615f64c636eaad7ed1b83d49208e9065edf7583bcd7e5d4c5d2f1a1eca4c7692209a540cab823c35497696176f4925afecaaf843610f6e9485cd3724f1cb SHA512 0b9df1b72305e5c24f1e1664578aa4411a5ffcdc5d318458117594e641f01c34700205b0d16c08abf4a8106d36128ccdbe1ea1f1035fce9018d6b52801a8b72b
-EBUILD xsetroot-1.1.1.ebuild 384 BLAKE2B 763932128c9c3842e531a9f45e7c89c894acb5afbc5a211c7daaff5f258a92cf52fb9276245574e955af7ed856ced35fb7fe69922da4e066a2baf066e0788f3f SHA512 2f4cbd0535c35b04592688d4e714cdd0b391efafe637258a068b79945b21f2c803964c1b051fc1034ffb7635b2a999ee04ac734cff04da4996becbe3042c6402
 EBUILD xsetroot-1.1.2.ebuild 383 BLAKE2B 95775973ad5582592f6b97f221035905501faa09b906b65e4601837616a3b47bab7b4a3ebc5971cacaee9e2a13b1015724963378b296b7f099ed4b6c0e4fd19c SHA512 bac08c9f5ca3e31211ed7465c028fe1af3819bc4e4fc21006204a83f2476b38e2680a8d1fe239c640aa1c3e163523ac21bfe0caffc8a5c790c018cb6ce3834fb
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xsetroot/xsetroot-1.1.1.ebuild b/x11-apps/xsetroot/xsetroot-1.1.1.ebuild
deleted file mode 100644
index 485282c50133..000000000000
--- a/x11-apps/xsetroot/xsetroot-1.1.1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit xorg-2
-
-DESCRIPTION="X.Org xsetroot application"
-
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-RDEPEND="x11-libs/libXmu
-	x11-libs/libX11
-	x11-misc/xbitmaps
-	x11-libs/libXcursor"
-DEPEND="${RDEPEND}"
diff --git a/x11-apps/xsm/Manifest b/x11-apps/xsm/Manifest
index 1deb543afa38..b056583a6f56 100644
--- a/x11-apps/xsm/Manifest
+++ b/x11-apps/xsm/Manifest
@@ -1,5 +1,3 @@
-DIST xsm-1.0.3.tar.bz2 161012 BLAKE2B 2628e4234b5fed58ebefb35f454c36e268c75cafa784ed709833d5979ee4484ada8f315d75b6204e64a0efd0f1fd7a14662afb430c0e84bc81a40eefda9380cf SHA512 930a12272011ddd7c60e62b32b485c383292163f8aed6086c756f71cece62d0c316d89a6056751818b3b0ee26f68cca6e0fc914cd58d9b20da0a3b7ccf2145f0
 DIST xsm-1.0.4.tar.bz2 170933 BLAKE2B 05cf4614440f36da6ed1e8e0949ef6955da03d1fe0cc2d0323150b34ea01c293301aa49006a93fe7c44c842db41fb6b66a2f4a4051ddf2258143e54a6e99b390 SHA512 d4e4da7c309a4eae126d2b58a13684f4dbc06b09f76dde9c89c707375df2843614f3d83bc44f9cd02f239200db3397abd86796dca0dbafc69f60482b0af5a176
-EBUILD xsm-1.0.3.ebuild 821 BLAKE2B 4160b60d92cf42db9b26bb82aac3c0c222e9706c0b0e9139d93f64797b6348ce5f8b88f29c65cf197583d215fa9a5b4e07148effffbd493e161501d987648c07 SHA512 28e16468be7bd7795edcfbea7c876982c3a0c5ffe1ecee8b71b50ba63dfd2d7dbdd3bf4ca24a65472863d8f3f55cd53a3e146b9c763d930835d3d42901bf3cae
 EBUILD xsm-1.0.4.ebuild 819 BLAKE2B 26991d3f723feb4c99e2be8b30f25ca766317d3861697fdcde15c55f1e65192ef922a88640477ec1d59b82c964e6f06768437fc32c97da5551fd1001c1232672 SHA512 e51bac35c0f0eac4e80f7ee7a83f9418b4713d459660722785cf9ccecb24c0c53d16fce3d76e576e7faf77c6fdd372ef2fb1acfcdb16d09745e5d33d5576047e
 MISC metadata.xml 333 BLAKE2B 0b142d7cf4b255c50a9e616434af7ff1db6a2aa0d3467f43d3e22ce6ce55a1bae7ab18eaf092bd5ca002464dc046bc2de62b3738425cdecf4ad15727b20f2d18 SHA512 5496dab87579d1d5c218ddd1ef1e8b63e73ed8d0e695d3be9577d862fc03a775b9cd3dc82abd356c1ef124522f4ed07a5f289e5e3355bb76c2d8746e6cf5a7c2
diff --git a/x11-apps/xsm/xsm-1.0.3.ebuild b/x11-apps/xsm/xsm-1.0.3.ebuild
deleted file mode 100644
index ac51d3e44362..000000000000
--- a/x11-apps/xsm/xsm-1.0.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit xorg-2
-
-DESCRIPTION="X Session Manager"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="rsh"
-RDEPEND="x11-libs/libXaw
-	x11-libs/libX11
-	x11-libs/libXt
-	x11-libs/libICE
-	x11-libs/libSM
-	rsh? ( net-misc/netkit-rsh )"
-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-2_pkg_setup
-}
-
-src_configure() {
-	XORG_CONFIGURE_OPTIONS="$(use_with rsh rsh /usr/bin/rsh)"
-	xorg-2_src_configure
-}
diff --git a/x11-apps/xwd/Manifest b/x11-apps/xwd/Manifest
index a6a566f19c03..29f5d34b4f73 100644
--- a/x11-apps/xwd/Manifest
+++ b/x11-apps/xwd/Manifest
@@ -1,5 +1,3 @@
-DIST xwd-1.0.6.tar.bz2 144548 BLAKE2B 56560a36931d15f6f59d6c6548325e559534cee10cb13b07722bce5b47d7d2360244b29e88a66a58ffffd2209336f0ffb14cbabb0369c144ceeeabb4eb184b06 SHA512 8fb86cbe163631fdb3f49ad6bb648ea599d7c5f9b11aba7e88afb86daed34cab88dcba057e0c5ca3e4e5904598b279f5a68ad43a64dd1053d647aa78523a806f
 DIST xwd-1.0.7.tar.bz2 148026 BLAKE2B 9088105a07db38418352cccafaee4ecc084940e031416358291e6b5a6f47b2c8972928f0eb3479db4ff93b3a54a24ea4231f4d8196464f14ac4d7a1b5bb7ecce SHA512 6fdb0a115ae505169bbc7fcc45580daf26bced2e26e0bf9a877636016038931a8386e8edcbe015f4024be508d0461906adef4834cf22a445e3c282f0b8fad17e
-EBUILD xwd-1.0.6.ebuild 438 BLAKE2B ee537e795d13cc8b49464a555ea4f81169848fc1cc9b0777949ea0d8a630001e45eac206343b3ab2a19d8a169f80de765332d69549103b38704deaef8b1626bd SHA512 eb338d80b5aa7a5b1fc80b9398d096e260f67ad5a3ffda75318e0c45c65e4a80b4ad6eb4d204a9c3f5b9a422c325a6e3ac75ab31a729e43146647a3b6feac950
 EBUILD xwd-1.0.7.ebuild 438 BLAKE2B ee537e795d13cc8b49464a555ea4f81169848fc1cc9b0777949ea0d8a630001e45eac206343b3ab2a19d8a169f80de765332d69549103b38704deaef8b1626bd SHA512 eb338d80b5aa7a5b1fc80b9398d096e260f67ad5a3ffda75318e0c45c65e4a80b4ad6eb4d204a9c3f5b9a422c325a6e3ac75ab31a729e43146647a3b6feac950
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xwd/xwd-1.0.6.ebuild b/x11-apps/xwd/xwd-1.0.6.ebuild
deleted file mode 100644
index 8cadf6a8f429..000000000000
--- a/x11-apps/xwd/xwd-1.0.6.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit xorg-2
-
-DESCRIPTION="dump an image of an X window"
-
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
-IUSE=""
-
-# libXt dependency is not in configure.ac, bug #408629, upstream #47462."
-RDEPEND="x11-libs/libX11"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-	x11-libs/libXt
-	x11-libs/libxkbfile"