gentoo resync : 04.05.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-05-04 12:02:00 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-05-04 12:02:00 +0100
commit: eab5731cdf11d4ae8cdf111461d46fd96c5bdd37 (patch)
tree: ce35c6d01b5ff5de95c3a20fef853b9a6518ad2e /x11-apps
parent: b7ebc951da8800f711142f69d9d958bde67a112d (diff)
72 files changed, 39 insertions, 945 deletions
diff --git a/x11-apps/Manifest.gz b/x11-apps/Manifest.gz
index 8daea9a216ae..175dc68ff1de 100644
--- a/x11-apps/Manifest.gz
+++ b/x11-apps/Manifest.gz
diff --git a/x11-apps/bitmap/Manifest b/x11-apps/bitmap/Manifest
index 6f30a96ef18f..f11221723835 100644
--- a/x11-apps/bitmap/Manifest
+++ b/x11-apps/bitmap/Manifest
@@ -1,7 +1,3 @@
-DIST bitmap-1.0.7.tar.bz2 169437 BLAKE2B fabe4bf29d6dd1602d5f10ee79214555b7a5449f9ac3413236d99a4d7d1b84aad775da4fc224a0db3a11b8204a4ad78fb45cf5509cff446da5851a041f0dc68e SHA512 4f445879e301910f3a9503ba1d2a88974848b35a0b66a57061d8d45a5d27441d30fe3c3cdedd9b637cef2f3f77a8b81786c2ecaff3f6884364037f1aaa69cd30
-DIST bitmap-1.0.8.tar.bz2 177558 BLAKE2B dbc2cee7729ea5007472ebb0e3c13d94ee35554223a4b480d012aeaa2fce0b0b9605c2e5f7dcd14612856bc305c635ffd68454ee065190c10dd6820a3e2f8182 SHA512 caa9f112254d59b3d0ad2d455dd8a896923250984f82135b8b7bf79a8645aff2e1a1c4cae6c8b1ba0cb2fcd89c4a6724091cb8c50b22d6524a53cca64585e303
 DIST bitmap-1.0.9.tar.bz2 181401 BLAKE2B efdf2d2905f6513ba8942d55a1aadca8f47f22736a55894deb9a4afeff132d8e410b8d84d27314253f16cb84ebb530b79c75991427365c45058e58280ede4449 SHA512 873c626c72a0f4025fe8c8aeedbf3fe4ee5657fb487ad7410406a20da518c0358041dc45c2549926cc10e1d031977073b9d1ddb32830fdce95b716a52fe44456
-EBUILD bitmap-1.0.7.ebuild 389 BLAKE2B 501ae8cdf9b2ebd71dee30a549eca1fba2b2f48ce71fba0859a240a73b6e7ef7932c7938afcd99578cb398f139e20b786bcc0ec284d1ab339344452d2eabd76d SHA512 cff57a9fc9d4dc80fd29273a090a73d40125f3df77107e473ba2269fc2e66a8d4972d761077806c1ebe674a42950024056b27c266a2fc955fa61f3c521f54724
-EBUILD bitmap-1.0.8.ebuild 396 BLAKE2B 1603e7511ea3b41f98731bb18d03d548ebd3c11926620c15d11df68730ef4fae31657046a791a6dc6702b6aac9ca07824ac425ab18c762f87590a6672fce8815 SHA512 23d61ece1d7b67bf63a1bdf14f2a67ca457c95c9754e7feb72551a23562a2cfb3fbf523b68e3d3332a5320af802dae8ab946cfc5430a6318b64c97a0e2051c65
-EBUILD bitmap-1.0.9.ebuild 395 BLAKE2B 42649f4b7ce9851daddbcc9c6a354bce708394eea765e2cd4a8b887e4475675980120cb029729b01d3e0436ed2866ff3aa9499f978e69bbac6e8834d7de2fafb SHA512 ec94a86177bca58504742f0d9014d9b94795f99e34c9392e5ac9fdb731d11320bc05c7e103bdf118f51ec0eea9cb08852ed6e658302fedd9fef52c2764845d1f
+EBUILD bitmap-1.0.9.ebuild 393 BLAKE2B 902cb8b61e17022a325fef0a272b6e992db13129ea8b895656ee58a5c31a208620a3d39322adcd1fe4d799ef92baa779aee4d2262720a16c62ef9ee4fde40f72 SHA512 0f96d537ccaef6d2f09b6bd77beccb7266ee6f0fb43acd6edbfca8b27cf32d6478c4cb3a8fce20bd7ba9ec9398487bf160dccff1765c38906d4847aa1abf33e6
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/bitmap/bitmap-1.0.7.ebuild b/x11-apps/bitmap/bitmap-1.0.7.ebuild
deleted file mode 100644
index 6dc1ef989bdc..000000000000
--- a/x11-apps/bitmap/bitmap-1.0.7.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="X.Org bitmap application"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-RDEPEND="x11-libs/libX11
-	x11-libs/libXmu
-	x11-libs/libXaw
-	x11-libs/libXt
-	x11-misc/xbitmaps"
-DEPEND="${RDEPEND}"
diff --git a/x11-apps/bitmap/bitmap-1.0.8.ebuild b/x11-apps/bitmap/bitmap-1.0.8.ebuild
deleted file mode 100644
index 6bf8a22f37c0..000000000000
--- a/x11-apps/bitmap/bitmap-1.0.8.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit xorg-2
-
-DESCRIPTION="X.Org bitmap application"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-RDEPEND="x11-libs/libX11
-	x11-libs/libXmu
-	x11-libs/libXaw
-	x11-libs/libXt
-	x11-misc/xbitmaps"
-DEPEND="${RDEPEND}"
diff --git a/x11-apps/bitmap/bitmap-1.0.9.ebuild b/x11-apps/bitmap/bitmap-1.0.9.ebuild
index 0c3509f215b7..3aa0a9002621 100644
--- a/x11-apps/bitmap/bitmap-1.0.9.ebuild
+++ b/x11-apps/bitmap/bitmap-1.0.9.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 inherit xorg-2
 
 DESCRIPTION="X.Org bitmap application"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 RDEPEND="x11-libs/libX11
 	x11-libs/libXmu
diff --git a/x11-apps/mkfontdir/Manifest b/x11-apps/mkfontdir/Manifest
index 639d94fb91ee..bcd9b3619bec 100644
--- a/x11-apps/mkfontdir/Manifest
+++ b/x11-apps/mkfontdir/Manifest
@@ -1,4 +1,2 @@
-DIST mkfontdir-1.0.7.tar.bz2 108195 BLAKE2B 72625736d0b6d4cc3e5e53ac85db238feef5adf0c3d889c058d912129d4208609a6ebcc73bf2923fa420f87b41b655bee0a9fe841d1743e0d524bee0b827432f SHA512 96d1920565514f90621e18a87fb5a2db9e052d1bffc6552d9659e065a21e252ab98b4e62013755032b98ed6d8c3381eb75c3c8e02651766ee4791ca622dcef1f
-EBUILD mkfontdir-1.0.7.ebuild 450 BLAKE2B 32a790afc843f5a45e209108399d88d670122d354d6083fd323ef27a5f8eda01e76423313ff4d40d5c0b1b78f35fd7b047a3ab3a98be12c73d4eebf819ff058e SHA512 94efba919a17fe74100209f8f0761fe33586aabe1cdc00ad379025866f44c21e889cb2302f32d263679454bba2477ffbccab3ccabc8412f47df56f5857b31e65
-EBUILD mkfontdir-1.2.0.ebuild 552 BLAKE2B 568c9ff6c5cddd6043454b28f083530ce5cccf5dfae9a4ad9b854289c28794e460194565b0adc955386de3bf6b0dbfc0cea26fc101a93268bae296be202493b4 SHA512 124ebe74339f53bf405edaee8439215b936feab8cade4f2cda8407ec80c85934fb5892329ab647614e146b9d37e6e99b03fa25c99781b0ba6b04543c1949a492
+EBUILD mkfontdir-1.2.0.ebuild 549 BLAKE2B 8d829cd4a4446eeb54eacb244dbd8a11e5be96f253e668089f31235e9be68f7de186351e2c235e42f068aaada8c69c0dd709e20c4855f3c7e959156149ffc9a9 SHA512 f785b70005f6f7324eafcffe1a76b64093d492927a23a8da43aa62ff45ffe8845d47390d69ab1fdb3c20576f6f5c78724c1cf10bd29d530db81f3b70099423fe
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/mkfontdir/mkfontdir-1.0.7.ebuild b/x11-apps/mkfontdir/mkfontdir-1.0.7.ebuild
deleted file mode 100644
index a6c25c0c28e1..000000000000
--- a/x11-apps/mkfontdir/mkfontdir-1.0.7.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit xorg-2
-
-DESCRIPTION="create an index of X font files in a directory"
-
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="x11-apps/mkfontscale"
-DEPEND="${RDEPEND}"
diff --git a/x11-apps/mkfontdir/mkfontdir-1.2.0.ebuild b/x11-apps/mkfontdir/mkfontdir-1.2.0.ebuild
index 03f0a276176d..c066a5ecd5bc 100644
--- a/x11-apps/mkfontdir/mkfontdir-1.2.0.ebuild
+++ b/x11-apps/mkfontdir/mkfontdir-1.2.0.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/mkfont
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=x11-apps/mkfontscale-1.2.0"
diff --git a/x11-apps/mkfontscale/Manifest b/x11-apps/mkfontscale/Manifest
index 11d52db903ad..5f6aae8a1ae5 100644
--- a/x11-apps/mkfontscale/Manifest
+++ b/x11-apps/mkfontscale/Manifest
@@ -1,5 +1,3 @@
-DIST mkfontscale-1.1.3.tar.bz2 144386 BLAKE2B 8cf4a61472b9357888ef355e89c3087102c4928884ecc6b5671202ad09284a2dc188b81faba6b1727b1a28ccaa6c3c36649c53659faf7a3fae4a2b32ab5a2420 SHA512 509e2f9cd55cf87cc3968c8767bf3f2386016278db8b7be75b7df34bf61f52519dd2778f3b9881ffbe30cc2fe26089c0a5b2c33af46bc7727f46dad83f030a62
 DIST mkfontscale-1.2.1.tar.bz2 150808 BLAKE2B 0c2cce3a5b400f8c757a9e1f7a0c8ea85f41c7d229cc1197c68340ec9f2b0b36872a914bf04dabb584727405092b4bf9abbc465190ac1b91419d9ecb3d359b83 SHA512 4d243160e1f7f8dfa6a8f53349c1a42a55fc99426455ebdef58352c5e951fce8b4f1fbd1061a76c9a148095b002eac372db1ae5e2647d2ccb4886635b317b18c
-EBUILD mkfontscale-1.1.3.ebuild 600 BLAKE2B 1be6ee6b55382ed63fc6464fd83d3a6d90cd39c41952e0a35c2e46f3d88a41e5baed46669260bbd0084073f647ffb66ab18904dad7d1579c4f7afb035b42cb8a SHA512 222722cc686d874d3f457e6a908084fd5dfbeaff3a438f94cfc2f86b2545fec009a559fdfa68fd2ae9a86d80f13e93e980d0194cd858407f3f7ba2d49701cddd
-EBUILD mkfontscale-1.2.1.ebuild 635 BLAKE2B ddf6792dd4ead0a415a65fdf99ca93d48638e7b41c050cfd345e73a5756366580b7f5c8c5a43ad36f3964fe13d9351e5a82b30c881ee80d99cb0de9917e48e68 SHA512 52a283f1327fccbd18bd4e1911cb8a09cf3c0d181e1e989ee50bd8bdf007d9241aa5dd23d189f9df029340bde39f1468f51db982da430b170f9f73fdc2cb4372
+EBUILD mkfontscale-1.2.1.ebuild 632 BLAKE2B a9868c3b217f9c0dd14423723441617e246ba78720964602e8cb5c80fbe1280bd76960032a14d26326870b4c64994e4d0e34c32238fce9e288dd46df6969703b SHA512 3e4b976352e4db8be492fad7ac5b3718d41411301eac72d14b0485f1160000956364e32163df8605b8faf22c52be645bffbbb693cbc29b79e1f6564c1044726a
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/mkfontscale/mkfontscale-1.1.3.ebuild b/x11-apps/mkfontscale/mkfontscale-1.1.3.ebuild
deleted file mode 100644
index bb2c8a3d40b5..000000000000
--- a/x11-apps/mkfontscale/mkfontscale-1.1.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit xorg-2
-
-DESCRIPTION="create an index of scalable font files for X"
-
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="x11-libs/libfontenc
-	media-libs/freetype:2
-	sys-libs/zlib
-	app-arch/bzip2"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-	x11-misc/util-macros
-	app-arch/gzip"
-
-XORG_CONFIGURE_OPTIONS=(
-	--with-bzip2
-)
diff --git a/x11-apps/mkfontscale/mkfontscale-1.2.1.ebuild b/x11-apps/mkfontscale/mkfontscale-1.2.1.ebuild
index 69935689f2fd..434349d1b0dd 100644
--- a/x11-apps/mkfontscale/mkfontscale-1.2.1.ebuild
+++ b/x11-apps/mkfontscale/mkfontscale-1.2.1.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
 
 DESCRIPTION="create an index of scalable font files for X"
 
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/x11-apps/x11perf/Manifest b/x11-apps/x11perf/Manifest
index 84e1622dffaa..1b28084104be 100644
--- a/x11-apps/x11perf/Manifest
+++ b/x11-apps/x11perf/Manifest
@@ -1,5 +1,3 @@
-DIST x11perf-1.6.0.tar.bz2 191086 BLAKE2B accdbc4899a28a76bc1487d2f6fa04f5309337eee5e650455c9c3bd4a5187cd7ad42565bb2713c7f5974542bf8b9a2297db0ada81659479487b4a1a2e6227f25 SHA512 a9508c9dd6db2663b5bd30f5e1f5f80b1d22ce5221ae3dc292e746f8e554fda2d3130f7311f2545e20244dceb51e867fe80fec82c9ac5911dcdc90a73b231623
 DIST x11perf-1.6.1.tar.bz2 189446 BLAKE2B 2a36bea5e1c9a414d9a1ce798e4f0481aeab86522c5924fb7520c0bc917b832f3e4c63c70a5430cd3fd92cac4374691a64db4542180e0917a0617bae7f783a6f SHA512 b386151bfe3d7c04ab9953ae1882f3c5b627d6d1afb9a8cfe87c58236a88883fc11bbadb2226b9aa61df84b4fce625a1c9e3d146a124ac17e8d7d605b35d9c0b
-EBUILD x11perf-1.6.0.ebuild 418 BLAKE2B b2940ce8477cfdfd28963bb373b4801caf6fb4c7401f2f3a82618063c6430ba8f6216743385c26cbba5fb042bde5d260637ec9c5315e7ec533e2fb23f64d4116 SHA512 6e2adbd3d46ea817008f6a06367d287a6165f55fff4f98486ac471ef3b86916cff6e299b77f48a4bdf781f6a1b350deebfdd86d3019e9a9302cd6e32aafa6877
-EBUILD x11perf-1.6.1.ebuild 439 BLAKE2B a8b71d74b2b985551bd987d21d136d9423a30d9334657f1ad58de240475467aad91efaef442ed88af33d44418870e7ee177e10aa77dd53399a3a33e3dba1087f SHA512 a2e85c8c3a07f2c56a4ff4081ab17abb3b1206294e7162999994d9029e8150f6aafd17357fc6980c85fdda2f1dcdeaf132e9d70b3b4e2cabcf97ac45f1e6398d
+EBUILD x11perf-1.6.1.ebuild 437 BLAKE2B 640ecca9b6ca5d9246c15cec52683611cc8067ba29813d15de3f0780cb035afa362a6236b4f79813ad570996cf0efa95dc1ceaa077544dbe735234237155eb44 SHA512 34770c7d72e9ad48097fe7eb399837e7ed03966d5e49c4210aa4beba4dd00a2c0545580728fb4edaafc5f2d2f32bef8dae733b1e94b0dba6b3437fd59545ae42
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/x11perf/x11perf-1.6.0.ebuild b/x11-apps/x11perf/x11perf-1.6.0.ebuild
deleted file mode 100644
index 1ce4d3573d1c..000000000000
--- a/x11-apps/x11perf/x11perf-1.6.0.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit xorg-2
-
-DESCRIPTION="X rendering operation stress test utility"
-
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXmu
-	x11-libs/libXft
-	x11-libs/libXrender
-	x11-libs/libXext"
-DEPEND="${RDEPEND}"
diff --git a/x11-apps/x11perf/x11perf-1.6.1.ebuild b/x11-apps/x11perf/x11perf-1.6.1.ebuild
index 37d251071684..a07b4bca4298 100644
--- a/x11-apps/x11perf/x11perf-1.6.1.ebuild
+++ b/x11-apps/x11perf/x11perf-1.6.1.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
 
 DESCRIPTION="X rendering operation stress test utility"
 
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-apps/xcalc/Manifest b/x11-apps/xcalc/Manifest
index e5075f4ca12d..85a7498e99e8 100644
--- a/x11-apps/xcalc/Manifest
+++ b/x11-apps/xcalc/Manifest
@@ -1,7 +1,3 @@
-DIST xcalc-1.0.5.tar.bz2 135451 BLAKE2B 843aeebe244ebca36e95624c4097907517047b4589abbe6c194283fba2809720fbb415075aef19b3e745cef5ee6b3afdefa86d955df78160ec1b8cbff3b59180 SHA512 8ca9cc8fda4cc0b4578342311e3cfa7ce69084f10bec7eca4b0cf6d2ad11bb7f188d89ad15b12b17a514fb02eb9758df96d514e605aa4bfe7e23fa028591a7ea
-DIST xcalc-1.0.6.tar.bz2 142808 BLAKE2B 11dcfcb1a09284ac3ce27c147aa5544818b6149993a07386f20ead706f492696030ec567469e59b52ed71fdc67b458b7a9362ad235442a663ccf01f7b6eaf4c8 SHA512 61b921b6a3fefea20bd9e7ad0b308f589f2aeaafe9316df94cc739a005be6c180bdafc981b8957230f46c9fc1c0e266829a55b473ae26b1377c705796175c908
 DIST xcalc-1.0.7.tar.bz2 145644 BLAKE2B 54bf53e652a535db5d116f8a5193b4b165fd500d3943b83fc294ccb3df44b39b4774ab0d9f44c37ff1a915948879d815738bb9e4caf8e1ad18830cd4addc05e5 SHA512 890cb9399e3c55816318ab5f0152ddba05ee141cbae6032759a3b762742ab54df8fcf0394dacc539299f93f27cbbb17aee5cbda5dde8b169a7099f20a1a38388
-EBUILD xcalc-1.0.5.ebuild 388 BLAKE2B 0823dc4d8f8a81585a49b77a77982f10ba1b3b0aad00a378ba50821c3f6f3f6705c582f2eca7a0d2fdcfcf4e529ef2fe2b4fb0ed0750af39d483db4a5cbed4ec SHA512 798f3ca4543c26bb96eec4a325ba873249d73bbcf6e55347f7fbb974befbef208180a98c97e9b975c788cdb8e036e429f05e1182a8a04f6409c959c249e7091c
-EBUILD xcalc-1.0.6.ebuild 388 BLAKE2B 0823dc4d8f8a81585a49b77a77982f10ba1b3b0aad00a378ba50821c3f6f3f6705c582f2eca7a0d2fdcfcf4e529ef2fe2b4fb0ed0750af39d483db4a5cbed4ec SHA512 798f3ca4543c26bb96eec4a325ba873249d73bbcf6e55347f7fbb974befbef208180a98c97e9b975c788cdb8e036e429f05e1182a8a04f6409c959c249e7091c
-EBUILD xcalc-1.0.7.ebuild 387 BLAKE2B 641e7703f4f200ee2e7aa156a7de82f8103c6ae6903983e60168ef08a7e166d1de45b4ff16b3535fd659d962a228aba04a2c83b28cae9a1d50e6dfef46c22d31 SHA512 65847ad4495ca423698f30d359bd5bccfd6af15e2ba4f092ce5c83251ace3519d1d265710fd9799feb368ec4a3dbc5e996b3697836475f62d31da837fbe2a795
+EBUILD xcalc-1.0.7.ebuild 385 BLAKE2B b98e169e049a828af4a8b518acfce338d80131d0dc58671906abf9dccc742ee2a0575fe796f6bed43849d3273442d7e9bc8a4c332087318b9b617817b7f12f93 SHA512 eb3f726c638685bcf5a223a5acf880f1e8ffca74e360eca7cb44c4ab2ef723f711253259ef63f88278d82614fbce78c89699884850adce1ad2b24a3a7792f3ed
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xcalc/xcalc-1.0.5.ebuild b/x11-apps/xcalc/xcalc-1.0.5.ebuild
deleted file mode 100644
index b71000cea058..000000000000
--- a/x11-apps/xcalc/xcalc-1.0.5.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit xorg-2
-
-DESCRIPTION="scientific calculator for X"
-
-KEYWORDS="amd64 arm hppa ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="x11-libs/libXaw
-	x11-libs/libXt
-	x11-libs/libX11"
-DEPEND="${RDEPEND}"
diff --git a/x11-apps/xcalc/xcalc-1.0.6.ebuild b/x11-apps/xcalc/xcalc-1.0.6.ebuild
deleted file mode 100644
index b71000cea058..000000000000
--- a/x11-apps/xcalc/xcalc-1.0.6.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit xorg-2
-
-DESCRIPTION="scientific calculator for X"
-
-KEYWORDS="amd64 arm hppa ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="x11-libs/libXaw
-	x11-libs/libXt
-	x11-libs/libX11"
-DEPEND="${RDEPEND}"
diff --git a/x11-apps/xcalc/xcalc-1.0.7.ebuild b/x11-apps/xcalc/xcalc-1.0.7.ebuild
index e85f87bff010..cf948d997d4f 100644
--- a/x11-apps/xcalc/xcalc-1.0.7.ebuild
+++ b/x11-apps/xcalc/xcalc-1.0.7.ebuild
@@ -7,7 +7,7 @@ inherit xorg-2
 
 DESCRIPTION="scientific calculator for X"
 
-KEYWORDS="amd64 arm ~hppa ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 arm hppa ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="x11-libs/libXaw
diff --git a/x11-apps/xclock/Manifest b/x11-apps/xclock/Manifest
index 9c27960909aa..1193047b5aa7 100644
--- a/x11-apps/xclock/Manifest
+++ b/x11-apps/xclock/Manifest
@@ -1,5 +1,3 @@
-DIST xclock-1.0.7.tar.bz2 164035 BLAKE2B d52db001d577b8eb9208ada8e77784ab2a5916551216dae7e71a51381105915778c90124f35dcc83553e332cb6c6435c00041ae8dd0d2033fd70b69435ee677f SHA512 56689bdae6c83e9e1da5c4c48cf1136ca8b4f45b177f27bc1deeb24758e2c180035b639e8df72e3ebf32dc301bceb59118309fcce2ffab54e5abe9bfa645e607
 DIST xclock-1.0.8.tar.bz2 172030 BLAKE2B aced446898a2cc181a0e57260841f194f67dc0fad42fdb6371e2bdd8d11dfb0418d9cbf4e3e51a4df21f2646c74ca5ee2887bfbbc62571cbc84b551f3793396f SHA512 1272221ace3657505bae1b22f181e9ecbf1710900c89a860c8ceae47ae31ca5e75b6557c37dc0a881a0a24c9597b9a07f46200926feb1013f1e2e995111a7646
-EBUILD xclock-1.0.7.ebuild 482 BLAKE2B 789b6460610dc48b46f004e17cef12247f6f359287862eeb37bfcb7f40b80314ff6da4fa62affac67a5f31b4384ae8b4025cdd4a8d36116811c21ec5f7e773c5 SHA512 39dc2021aca60ec45e6c4c29905f56ae206df5f1cbea8f2ac2f006522f1c397ac4273fc3950ae9b39e1bed3913d110141e93f7c7fe701a0d83df8f461f66a4aa
-EBUILD xclock-1.0.8.ebuild 485 BLAKE2B 5987274dbd48282abc93205c55bfa28760a12d9a6808c9a1b91a5a113f49a8c5b848f0c0a25a4a82f8361d004e878329566ae91995b92cae8f393dc8fd658de7 SHA512 1ff32f54e5dc0d138963ab1387d1bb83ba91c8784e6a239c226e4712870a17cffe6af7845169c71edd2c728574130eab68b442a3e55ff45d0137b850c194fc21
+EBUILD xclock-1.0.8.ebuild 482 BLAKE2B 8a74e968a1f0b8862b8a60bde09d7722e2b294e4b9c86663e8db7b43117b069e45787c29c34c10a4970580b7261b6aa0cfbd192c032f6057d7955a41c4bb71f7 SHA512 735ca867e2e1ab76979264cf59595e29d8742b72c5b2447d18b427709abacb76d16af36b5407b2b52d82fd06ee5942ccb5451161c084e179064ade6a4f0512ce
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xclock/xclock-1.0.7.ebuild b/x11-apps/xclock/xclock-1.0.7.ebuild
deleted file mode 100644
index dc6fdf0be54c..000000000000
--- a/x11-apps/xclock/xclock-1.0.7.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit xorg-2
-
-DESCRIPTION="analog / digital clock for X"
-
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-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}"
diff --git a/x11-apps/xclock/xclock-1.0.8.ebuild b/x11-apps/xclock/xclock-1.0.8.ebuild
index 2aad9dc75702..7635ebf90bb5 100644
--- a/x11-apps/xclock/xclock-1.0.8.ebuild
+++ b/x11-apps/xclock/xclock-1.0.8.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
 
 DESCRIPTION="analog / digital clock for X"
 
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-apps/xditview/Manifest b/x11-apps/xditview/Manifest
index 0de59b9b0cd2..69919ca1a9ca 100644
--- a/x11-apps/xditview/Manifest
+++ b/x11-apps/xditview/Manifest
@@ -1,7 +1,3 @@
-DIST xditview-1.0.3.tar.bz2 143012 BLAKE2B 07b52ae693625e7ba916921668067b22ac516be010fcd554fee4f23cf247ab23ff93b328473efb33545dd01454b28255b61e1b38b9318c51eceabedcd4e8561a SHA512 74b7a7a483eda731840d2150bfab75628b91407f176b6cb64b03b992c05b6ff2426837489a12b12566b05450fc446e7433a541a4d0c52e27f843bef06fc91f67
-DIST xditview-1.0.4.tar.bz2 148842 BLAKE2B 307d6c3eea0523f035e6cf3ebfbaa64645972613c8276735dd4ef0b446ed743a2ee42e6a9e63a611afc750cc9d7e3b3bb2937fc3ec3d7fcc65fdfc4177ca658d SHA512 7a0d023cd28ffc63c771814e028e79d20f8b56671a7a558c41ef062ef2d40079b5d37a5cf026b7ad3670da6866a087ae4888cea96d6d9e8a137e115174d637d2
 DIST xditview-1.0.5.tar.bz2 151313 BLAKE2B 53d96b874230dde6f4f13a7a61420e1b9da86fea18e49e7084212353d9de64aab30bda6bc790282127af961db66873d6fafec1f6c7a986776c30eaad260ad98f SHA512 e20c903f38394b496111267e142d84d11e69a3b89f91869652d1f2ee5c997a13f90bfa2966651b42cd3979a330b348a6e397cc6a74c45b1f3f91643e7c06765d
-EBUILD xditview-1.0.3.ebuild 336 BLAKE2B 154336bc4362495552cea84695f67088b9811edf6553aa5bd4909fcba98fb79ada25af1697acd80b178818b215cd321ec49d7d42017edc542a10d41e3b2cd188 SHA512 75d962edbd5ffb82571c0793f4a7a715764d05c2fa38f24297e10c7a42d7b8dff02cbcbc7ccff995413b60a927e7ea4fb456e3422c55c3bb6365cb3095d56e3f
-EBUILD xditview-1.0.4.ebuild 336 BLAKE2B 84d6536945a9c50ee1a944c355fdb9b83734a3c2fe45d189e7666148f988b44a2cd762869dabc26bd16c4ab6bd204c5e3ffa0198fb48fbc0393484608a2b4328 SHA512 ff0ad2ea95412ccf84a575978295395b0ecb9ecb1220f3c8e047a39e04477e4d4092594410cc6479147c012b2b25acec13cb4d2ff89c59f51cb209c1e8241053
-EBUILD xditview-1.0.5.ebuild 335 BLAKE2B 59c10e43e24d4386c66ed3ff274edfd9ad5902d1c8f968726d05a011c9a92291038fc00f09649bc5d104cc4ac8cdfe9168f1d96ffa62456b5aa5ad6fabd2d5e2 SHA512 bf1addc487cb29555e069c593864a00b8877cac832caa1709d8d6c20183f8c318abd3044113e539a7bcd641e1fbe86945b8e615da527449f9962ceb2a6cbedd0
+EBUILD xditview-1.0.5.ebuild 333 BLAKE2B e436f227e6014c2098826172621797239adfa1db091ec54722f6a724fd2962e948c74a53befc2135d55a5d2cc2226a0a1ed39aece0e167c68f0f8752fcb9b9f7 SHA512 877876a1e4b69b84be0b9068100dcb4456b9b0dcda1a950e47d8b0a94837c653748f3a2308f9ebf78509e51b6481c1fedd77e25a9d67120782c0662c78c86a14
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xditview/xditview-1.0.3.ebuild b/x11-apps/xditview/xditview-1.0.3.ebuild
deleted file mode 100644
index 42a91fa142de..000000000000
--- a/x11-apps/xditview/xditview-1.0.3.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="display ditroff output"
-KEYWORDS="amd64 arm hppa ~mips ppc ppc64 ~s390 ~sh sparc x86"
-IUSE=""
-
-RDEPEND="x11-libs/libXaw
-	x11-libs/libXmu
-	x11-libs/libXt
-	x11-libs/libX11"
-DEPEND="${RDEPEND}"
diff --git a/x11-apps/xditview/xditview-1.0.4.ebuild b/x11-apps/xditview/xditview-1.0.4.ebuild
deleted file mode 100644
index 42c8782a1ac6..000000000000
--- a/x11-apps/xditview/xditview-1.0.4.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit xorg-2
-
-DESCRIPTION="display ditroff output"
-KEYWORDS="amd64 arm hppa ~mips ppc ppc64 ~s390 ~sh sparc x86"
-IUSE=""
-
-RDEPEND="x11-libs/libXaw
-	x11-libs/libXmu
-	x11-libs/libXt
-	x11-libs/libX11"
-DEPEND="${RDEPEND}"
diff --git a/x11-apps/xditview/xditview-1.0.5.ebuild b/x11-apps/xditview/xditview-1.0.5.ebuild
index 01f3ccf001c6..8e1bf38f2a17 100644
--- a/x11-apps/xditview/xditview-1.0.5.ebuild
+++ b/x11-apps/xditview/xditview-1.0.5.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit xorg-3
 
 DESCRIPTION="display ditroff output"
-KEYWORDS="amd64 arm ~hppa ~mips ppc ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="amd64 arm hppa ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE=""
 
 RDEPEND="x11-libs/libXaw
diff --git a/x11-apps/xdm/Manifest b/x11-apps/xdm/Manifest
index 4817192ea96a..867ed560d6d1 100644
--- a/x11-apps/xdm/Manifest
+++ b/x11-apps/xdm/Manifest
@@ -1,12 +1,6 @@
 AUX Xsession 1521 BLAKE2B cb2090c2f2c1626df08fe45e80ab668ec9ca43f8f647f9a16d09e7cde7fa33964cbc4f51aa41a537a027749e40c69c3f8543c41924d9d05b54226a0e4400a3a1 SHA512 6cb72d93ab8004e42e9f5002f7f8bb6eb7d9833fd7d3fb0acf7b7b481ead5fb55cb1b836a1e6010fe859e9e04e14064c442e23fdde5991ffb8556ed5aa5af555
-AUX xdm-1.1.11-arc4random-include.patch 360 BLAKE2B e16532b9e360d735d63d641fcad7a4242d227a5df2715be24d2907115f88e00b0e298ad3aa465a6f4e5b931928d46cbc0ef54cc1e7ea71d23dd60995bbec201b SHA512 2da1c4972c7edcd6c3fc42f29c15ce875888cc582a18e1932a60c3d0881a5a96991129bf5bb8c6649f0731e2102c0a163928c089d7ff9fe19ef82d470f86882f
-AUX xdm-1.1.11-cve-2013-2179.patch 1519 BLAKE2B cd0329d5c97b4bd5051dcd594bf54676004c1abcedefd9c7cbdcfe500bcbcf79cf4a22e9977860b553d8d5d1e79d3514206200bf8b0b8d6e20989df7cb7ca825 SHA512 5890051b134f1ed8f68846ee47d38375fbd0b4c639b9ae834b27d5b1749456aba4e1000a16a16d387072845887685375b1d87c4ce3870cc2acda58c4f17d45ae
-AUX xdm-1.1.11-setproctitle-include.patch 849 BLAKE2B cd5749feb0d11d07208922e94cef14a7063c43b7a05a804c09f6febabfa35941914e8f8d508992f52bc7804aeee12e98525cf5f854250e30a4470ef7389c9b3b SHA512 496ad42ee35ce6d25f87b349330394f65cc8979b388759d7e03636f96bc2272068a999a9f7ac3b2e0486099b7678ef1c0e30505c3e0a08cc3041121936f1abb0
 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
-AUX xdm-consolekit.patch 5712 BLAKE2B 0526aad6742c86d878ca01204a2e6c781dc4532f7de573a67723e4ab3c7dacefe20d25766402b705c957db75fbf41d396c46442e7da500ad3ce2afb3f0facc67 SHA512 d87ec56e4b7d067709679f222d3bd9009f1496d66c3c4335458b54e2a468200e3c7ac99843330c23bad7049995c93e8f3c74f3161529c6fb488e94e9fcd4752a
-DIST xdm-1.1.11.tar.bz2 446612 BLAKE2B ce9bed568e036a882ecc56d75f7ce8646d14ae00c754d6e5542ea5b186c3ef1ce8499e2d70190b4fbc4b344e0c70fd36deab5aacc5f1f55501db709300aee520 SHA512 fe6f2b7817c0f7f07a1f5f497edcdfa15b93986fd87f314daa472dac8625327ef46ebbf40d27fe8d4a8a2f8d5af8a01c4438a29356740e0eb350f2bd0c7ec0d5
 DIST xdm-1.1.12.tar.bz2 512074 BLAKE2B a82d124f4b7ce3185d703fca3aade92e86094602aec5343566ba8c91c54b70cdedbaea2fa6fee330d7ed48d9138b04a998aa2dae06db2683bfcce6c7693edc82 SHA512 1a4be0a070ced5db8fda6fc74794c9f9ed0cb37fa440fda6a3a7652aff62dfc3d7ba68b9facf054671ebf0f4db2a0eec29d0aa3716e3407ccd5529bac3553bdb
-EBUILD xdm-1.1.11-r3.ebuild 1807 BLAKE2B 1c98b7e9ea0bb96ccd82c355d3e4fb16641eadc41167fd5d559927405c95b7153f0aea14d3a906540d053c2f88d289330007bf312c1e8470fa98d04efd68c78c SHA512 7d30353885804970be0e0fd31c455d9ff52615ad1ae2611da2ab30705e048114221bf78de639bc05923ea3eeca4af251fa3b6935e7100c3a987db6e01532ab8a
-EBUILD xdm-1.1.12.ebuild 1946 BLAKE2B 1a85318bff3607d409e5a8fda600d9aa35675eb1015a0434793dba21c8deff403f611c5572d29f168995de10e3e09b4506c5511c84a265fb13018505b6652667 SHA512 2297653a7859eff7bbf26a23cba7e69dcea7a219d1e85bd69658d58f487ac831223d2ec46d76f7f6bd3e6b6904cd75ec0d600b1c425cc18f0963755ce05dbf06
-MISC metadata.xml 414 BLAKE2B 6e4d9441a5a392ed6a989fbfd08b9e664dfd6843fa6b6f4f9644b4ace383cd5ed8ea859a0f6e1d34580fd8acac06333eb566bf6460144128494a046991fe08c0 SHA512 f3acd7a9e8f8e1d93ca5c657409efbaeb5695dc81528926d9ecdc517cff8a7c2f597b9ac8b856cb81246ff39c2ceaac5bd72587db68a5d260c3117599e24c38c
+EBUILD xdm-1.1.12.ebuild 1944 BLAKE2B 8921b58a54d643fa5d2e56b755bbb0729c2850967417c8def84e96126f5009a2d2a0161da5b7e98e35e32d899a6bf79c65385c3f52ed8fa8b10d50d09f0fa485 SHA512 1ebeef52b00ed514893b3ecd6917ef528ccead49ac8e31be2f50376fee72e6e367fa070b7ee2a497f79ec8e94c38fbfbf5db18fcb965bc5a96358cacdf3cc7f0
+MISC metadata.xml 345 BLAKE2B 18769beab9cc2a2a845351093c2e356c62bff79141960846a980da0132fae2e761ef45822fcf7a5a563a794ac3449870ddba2600f3d60171e83319c1687a6dfb SHA512 114ab21e12a92854e6d676e84f439518480445aa06b7c9fa94dfba827b51732895f0b4a50c16994c87441ddefab01f2f50955767ca30305e8650df9789132c5a
diff --git a/x11-apps/xdm/files/xdm-1.1.11-arc4random-include.patch b/x11-apps/xdm/files/xdm-1.1.11-arc4random-include.patch
deleted file mode 100644
index db948094b755..000000000000
--- a/x11-apps/xdm/files/xdm-1.1.11-arc4random-include.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -ur a/xdm/genauth.c b/xdm/genauth.c
---- a/xdm/genauth.c	2011-09-25 09:35:47.000000000 +0200
-+++ b/xdm/genauth.c	2014-01-06 16:28:09.664060603 +0100
-@@ -40,6 +40,14 @@
- 
- #include <errno.h>
- 
-+#ifdef HAVE_ARC4RANDOM
-+# ifdef __linux__
-+#  include <bsd/stdlib.h>
-+# else
-+#  include <stdlib.h>
-+# endif
-+#endif
-+
- #include <time.h>
- #define Time_t time_t
- 
diff --git a/x11-apps/xdm/files/xdm-1.1.11-cve-2013-2179.patch b/x11-apps/xdm/files/xdm-1.1.11-cve-2013-2179.patch
deleted file mode 100644
index 34ae7ceb3cd6..000000000000
--- a/x11-apps/xdm/files/xdm-1.1.11-cve-2013-2179.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 8d1eb5c74413e4c9a21f689fc106949b121c0117 Mon Sep 17 00:00:00 2001
-From: mancha <mancha1@hush.com>
-Date: Wed, 22 May 2013 14:20:26 +0000
-Subject: Handle NULL returns from glibc 2.17+ crypt().
-
-Starting with glibc 2.17 (eglibc 2.17), crypt() fails with EINVAL
-(w/ NULL return) if the salt violates specifications. Additionally,
-on FIPS-140 enabled Linux systems, DES/MD5-encrypted passwords
-passed to crypt() fail with EPERM (w/ NULL return).
-
-If using glibc's crypt(), check return value to avoid a possible
-NULL pointer dereference.
-
-Reviewed-by: Matthieu Herrb <matthieu@herrb.eu>
-Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
----
-diff --git a/greeter/verify.c b/greeter/verify.c
-index db3cb7d..b009e2b 100644
---- a/greeter/verify.c
-+++ b/greeter/verify.c
-@@ -329,6 +329,7 @@ Verify (struct display *d, struct greet_info *greet, struct verify_info *verify)
- 	struct spwd	*sp;
- #  endif
- 	char		*user_pass = NULL;
-+	char		*crypted_pass = NULL;
- # endif
- # ifdef __OpenBSD__
- 	char            *s;
-@@ -464,7 +465,9 @@ Verify (struct display *d, struct greet_info *greet, struct verify_info *verify)
- #  if defined(ultrix) || defined(__ultrix__)
- 	if (authenticate_user(p, greet->password, NULL) < 0)
- #  else
--	if (strcmp (crypt (greet->password, user_pass), user_pass))
-+	crypted_pass = crypt (greet->password, user_pass);
-+	if ((crypted_pass == NULL)
-+	    || (strcmp (crypted_pass, user_pass)))
- #  endif
- 	{
- 		if(!greet->allow_null_passwd || strlen(p->pw_passwd) > 0) {
---
-cgit v0.9.0.2-2-gbebe
diff --git a/x11-apps/xdm/files/xdm-1.1.11-setproctitle-include.patch b/x11-apps/xdm/files/xdm-1.1.11-setproctitle-include.patch
deleted file mode 100644
index 0a3f32bbea02..000000000000
--- a/x11-apps/xdm/files/xdm-1.1.11-setproctitle-include.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff -ur a/xdm/choose.c b/xdm/choose.c
---- a/xdm/choose.c	2011-09-25 09:35:47.000000000 +0200
-+++ b/xdm/choose.c	2014-01-06 16:33:09.628065364 +0100
-@@ -54,6 +54,14 @@
- #  include       <tiuser.h>
- # endif
- 
-+# ifdef HAVE_SETPROCTITLE
-+#  ifdef __linux__
-+#   include <bsd/unistd.h>
-+#  else
-+#   include <unistd.h>
-+#  endif
-+# endif
-+
- # include <time.h>
- # define Time_t time_t
- 
-diff -ur a/xdm/session.c b/xdm/session.c
---- a/xdm/session.c	2011-09-25 09:35:47.000000000 +0200
-+++ b/xdm/session.c	2014-01-06 16:40:57.508072789 +0100
-@@ -54,6 +54,15 @@
- # include <usersec.h>
- #endif
- 
-+# ifdef HAVE_SETPROCTITLE
-+#  include <sys/types.h>
-+#  ifdef __linux__
-+#   include <bsd/unistd.h>
-+#  else
-+#   include <unistd.h>
-+#  endif
-+# endif
-+
- #ifndef USE_PAM        /* PAM modules should handle these */
- # ifdef SECURE_RPC
- #  include <rpc/rpc.h>
diff --git a/x11-apps/xdm/files/xdm-consolekit.patch b/x11-apps/xdm/files/xdm-consolekit.patch
deleted file mode 100644
index fbacd36fc073..000000000000
--- a/x11-apps/xdm/files/xdm-consolekit.patch
+++ /dev/null
@@ -1,230 +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
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -362,6 +362,20 @@
-
- AM_CONDITIONAL(DYNAMIC_GREETER, test x$DYNAMIC_GREETER = xyes)
-
-+# 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)
-+
- #
- #  XDM
- #
---- a/xdm/session.c
-+++ b/xdm/session.c
-@@ -66,6 +66,11 @@
- #endif
- #endif /* USE_PAM */
-
-+#ifdef USE_CONSOLEKIT
-+#include <ck-connector.h>
-+#include <dbus/dbus.h>
-+#endif
-+
- #ifdef __SCO__
- #include <prot.h>
- #endif
-@@ -472,6 +477,97 @@
-     }
- }
-
-+#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)
- {
-@@ -486,6 +580,8 @@
-     }
- #endif
-
-+    closeCKSession();
-+
-     /* make sure the server gets reset after the session is over */
-     if (d->serverPid >= 2 && d->resetSignal)
-	kill (d->serverPid, d->resetSignal);
-@@ -568,6 +664,10 @@
- #ifdef USE_PAM
-     if (pamh) pam_open_session(pamh, 0);
- #endif
-+
-+    if (!openCKSession(verify, d))
-+	return 0;
-+
-     switch (pid = fork ()) {
-     case 0:
-	CleanUpChild ();
---- a/include/dm.h
-+++ b/include/dm.h
-@@ -325,6 +325,9 @@
- extern char	*prngdSocket;
- extern int	prngdPort;
- # endif
-+#ifdef USE_CONSOLEKIT
-+extern int	use_consolekit;
-+#endif
-
- extern char	*greeterLib;
- extern char	*willing;
---- a/xdm/resource.c
-+++ b/xdm/resource.c
-@@ -68,6 +68,9 @@
- char	*prngdSocket;
- int	prngdPort;
- #endif
-+#ifdef USE_CONSOLEKIT
-+int	use_consolekit;
-+#endif
-
- char	*greeterLib;
- char	*willing;
-@@ -258,6 +261,10 @@
-				"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])
-@@ -440,7 +447,11 @@
- {"-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;
---- a/man/xdm.man
-+++ b/man/xdm.man
-@@ -51,6 +51,8 @@
- ] [
- .B \-session
- .I session_program
-+] [
-+.B \-noconsolekit
- ]
- .SH DESCRIPTION
- .I Xdm
-@@ -218,6 +220,10 @@
- .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/x11-apps/xdm/metadata.xml b/x11-apps/xdm/metadata.xml
index 27b78ed8a148..cb9dcdc919bd 100644
--- a/x11-apps/xdm/metadata.xml
+++ b/x11-apps/xdm/metadata.xml
@@ -7,6 +7,5 @@
   </maintainer>
   <use>
     <flag name="consolekit">Enable native <pkg>sys-auth/consolekit</pkg> support</flag>
-    <flag name="xdm-auth">Enable XDM-AUTHENTICATION-1 support</flag>
   </use>
 </pkgmetadata>
diff --git a/x11-apps/xdm/xdm-1.1.11-r3.ebuild b/x11-apps/xdm/xdm-1.1.11-r3.ebuild
deleted file mode 100644
index 7799fbfa3e79..000000000000
--- a/x11-apps/xdm/xdm-1.1.11-r3.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_EAUTORECONF=yes
-
-inherit multilib xorg-2 pam systemd
-
-DEFAULTVT=vt7
-
-DESCRIPTION="X.Org xdm application"
-
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
-IUSE="consolekit ipv6 pam xdm-auth"
-
-RDEPEND="x11-apps/xrdb
-	x11-libs/libXdmcp
-	x11-libs/libXaw
-	>=x11-apps/xinit-1.0.2-r3
-	x11-libs/libXinerama
-	x11-libs/libXmu
-	x11-libs/libX11
-	x11-libs/libXt
-	x11-apps/sessreg
-	x11-apps/xconsole
-	consolekit? ( sys-auth/consolekit )
-	pam? ( virtual/pam )
-	!<sys-apps/systemd-187"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-	consolekit? ( !=sys-auth/pambase-20101024-r1 )"
-
-pkg_setup() {
-	PATCHES=(
-		"${FILESDIR}"/${PN}-consolekit.patch
-		"${FILESDIR}"/${P}-cve-2013-2179.patch
-		"${FILESDIR}"/${PN}-1.1.11-arc4random-include.patch
-		"${FILESDIR}"/${PN}-1.1.11-setproctitle-include.patch
-	)
-
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable ipv6)
-		$(use_with pam)
-		"$(systemd_with_unitdir)"
-		--with-default-vt=${DEFAULTVT}
-		--with-xdmconfigdir=/etc/X11/xdm
-		$(use_with consolekit)
-	)
-}
-
-src_prepare() {
-	# fedora invented that in -187...
-	sed -i -e 's:^Alias=.*$:Alias=display-manager.service:' \
-		xdm.service.in || die
-
-	# disable XDM-AUTHENTICATION-1 wrt bug #445662.
-	# it causes issue with libreoffice and SDL games (bug #306223).
-	if use !xdm-auth; then
-		sed -i -e '/authorize/a\
-DisplayManager*authName:	MIT-MAGIC-COOKIE-1' \
-			config/xdm-config.cpp || die
-	fi
-	xorg-2_src_prepare
-}
-
-src_install() {
-	xorg-2_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.12.ebuild b/x11-apps/xdm/xdm-1.1.12.ebuild
index ba1f6a4702b2..f1cf9836300d 100644
--- a/x11-apps/xdm/xdm-1.1.12.ebuild
+++ b/x11-apps/xdm/xdm-1.1.12.ebuild
@@ -11,7 +11,7 @@ DEFAULTVT=vt7
 
 DESCRIPTION="X.Org xdm application"
 
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
 IUSE="consolekit ipv6 pam systemd truetype xinerama xpm"
 
 RDEPEND="
diff --git a/x11-apps/xev/Manifest b/x11-apps/xev/Manifest
index d42db9259423..2c3356aed5a5 100644
--- a/x11-apps/xev/Manifest
+++ b/x11-apps/xev/Manifest
@@ -1,7 +1,3 @@
-DIST xev-1.2.1.tar.bz2 125884 BLAKE2B faa41acc01b47c4b031ac0aa69154839cf43c180d90287cb929a922b2c5b8d174834f559c80cfeecc3839e4064d8e37d29c340756ce37e114f4420bf551b9e80 SHA512 6fbe8e69eeeafff4561b695293f23d9ce0f20261474f4a0f0281278b13f11e7ed9efd49f2712586f909e3e7a26b9fe39f8e98b50a2bf189d077668fc67388d19
-DIST xev-1.2.2.tar.bz2 132596 BLAKE2B 243556cda4ea52f488b60c98566fa1b84896c972eef484f9a29d8a7a3e6709a26c47f5478f7a010d430c79471f1f04d684a5b761a721013540f9f1e08d0573c9 SHA512 453fc18072e4d4fd088a1b2e918f3772aaa2c56b36c082deb41ec4d434d1579de75f447fc4e0507086c170152e02d6db8b60dc7fd87ae18a2e817448bd628fca
 DIST xev-1.2.3.tar.bz2 134866 BLAKE2B 9ff8bdb1e75754a5390115d10dd5851f71b2319ad7ff02299ff28284aa23c14cd1ad3ee9eea81718ed355fc31983e4f7ec0312b31e3f86d3691bb52ebbe0cc4e SHA512 47cc7ac096e77cfa4e687914d767263cf3e1dca5bffd0f68c7ba0fe751b248c8a16525bd2da4d6efa0ea8d637831c893d41c9687cace4aaa9c0909a45ef1943e
-EBUILD xev-1.2.1.ebuild 400 BLAKE2B f988e39967c29da855fff0c4c5c7fcdddeca88deb8c3fe0bfe762bc50db8083106eb335bbb9e5532405e0298fd1bea2f9eabbce6a57fcd6a76c8bf17d317d5f2 SHA512 b00e75fa86a063f07cdb93543e4f261620c83a6f5d9f57460fa04ac4fce4cbf941261fc8a0b320219c916742287463d50b625771f327f9301beadc9ef322ec7a
-EBUILD xev-1.2.2.ebuild 407 BLAKE2B 605deef3a200013078478f032006cff46d9f1c2e301878a1f1a6905ad0d75a44d5a157da805a4a3b74eb51a33f105f9cc3506640cb37812f7ab2f5747f40d6b7 SHA512 6a383e6d74c0fcc6fd24a23728b805897ff3809e1fcaecce20d3cd1da7ddc054ed970d1850a1e13909e0732b2662d07e1beab61acc52d11087f2c1e8ca2d46c4
-EBUILD xev-1.2.3.ebuild 406 BLAKE2B 14789d4470930ac33d8243b04595f5d5bc248217878de53e1a6658eaaf24bc3f728c4e8a28e7548fa5609b602900f2f3fb5beb51ba9c78ce24bed3d7e36ce1b1 SHA512 6d3cf4cce86cf38888ab764aeff62429f9fec84cdbbd75cd4d6bf2dd972733b9fe639e8c725540957a9de5433ceb5f3035c81de99bd6ac6a959f97aa51ba573e
+EBUILD xev-1.2.3.ebuild 404 BLAKE2B 8dd0d767b8f05a9a9aa53d435668f938db4b64cbaf65a40700e71dda5fab929e7893eb63642a67159eddefdd62a34bc7d34e3c77fc5a9da896af14a3cc6f9ae1 SHA512 1f62a72f9bcc5969edac23009be60b47b5f9bbdf708a3a36beb851d3322cb088012ee5db6185ccefe60614e3bac55d2601b96446a5ba66dc1ac53f757392e4c8
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xev/xev-1.2.1.ebuild b/x11-apps/xev/xev-1.2.1.ebuild
deleted file mode 100644
index ec3eda23d5fa..000000000000
--- a/x11-apps/xev/xev-1.2.1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit xorg-2
-
-DESCRIPTION="print contents of X events"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-winnt"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXrandr"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
diff --git a/x11-apps/xev/xev-1.2.2.ebuild b/x11-apps/xev/xev-1.2.2.ebuild
deleted file mode 100644
index 29d2b7979e0f..000000000000
--- a/x11-apps/xev/xev-1.2.2.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit xorg-2
-
-DESCRIPTION="Print contents of X events"
-
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-winnt"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXrandr"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
diff --git a/x11-apps/xev/xev-1.2.3.ebuild b/x11-apps/xev/xev-1.2.3.ebuild
index 4a3eca44a125..098fcd98f740 100644
--- a/x11-apps/xev/xev-1.2.3.ebuild
+++ b/x11-apps/xev/xev-1.2.3.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
 
 DESCRIPTION="Print contents of X events"
 
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-winnt"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-winnt"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-apps/xfd/Manifest b/x11-apps/xfd/Manifest
index 4ffa6974d116..ea876d9791d1 100644
--- a/x11-apps/xfd/Manifest
+++ b/x11-apps/xfd/Manifest
@@ -1,5 +1,3 @@
-DIST xfd-1.1.2.tar.bz2 137632 BLAKE2B dc84377efc97a3ed84447560c05d180f22631dc0e88342d5ea306a954df1557bba17ce2492a0e498e145006b68d62408b4212597a07d9ea71711057aa33e198b SHA512 3a158f697dd40c5b650b3d80ad1692d668d9d9bcf586a437fd3dcebf9e8fffb773855df290260995464d5f36cb22e768d1d71de8e61d7cca80eaa4d25c029745
 DIST xfd-1.1.3.tar.bz2 141312 BLAKE2B 742b6a1fff10593252dc27aa352ac500d9a17952e0415de80ea265322cfff7ef2c4c2435005a82c12f1b50003920322cfa27dab3af30b60575d4ae7a1b20f787 SHA512 68e2d4ce5e24215353b6f3231191d69639c4dd90a703e03ccf152bbfe4012da071c387ba289f918fb0336a3be9ee49dc05cbec7273fa85f5e476ead7e10795f0
-EBUILD xfd-1.1.2.ebuild 421 BLAKE2B db04c670b311ba6f2dbb573e0baafd06ae3bc194f10de10fb60a34289774b08cb2846b37fa07157c896ca4d390782ef5199b37c8e01a859f2b24578ea88a31e5 SHA512 6e6b30c95188d3cf25984cb7047b98430e7e37253cc47bc967f191ac8a21bb466b34f7cc5da4b8b86bcff1c7958d4e66b221c4c9b4c0e80b885c54601cb96916
-EBUILD xfd-1.1.3.ebuild 449 BLAKE2B 4c902acbb9a59a999bb239764f280174cbd91b3006d521a7cea5ff36bc624b04f2b43c4b00de2b5a6f1efc6cfe6efef22500ce66d66407182305f46fd05c505c SHA512 ee8435d5eb773beebc77e382041bf97b16c413b63b9acae58adbab8c90b183bfcdb350caa1a4266bb7fdc8f23cc554796ed8341fb81f49a8ab0312e9a30862c7
+EBUILD xfd-1.1.3.ebuild 447 BLAKE2B 573777f1ad73718bdcc73afbd5659340a4483bf0bbf4e58b5a5c2574f9b2df982094e32658c628e708f673869ac98da03ae19a3e1f803b812644ddd8cead5875 SHA512 3f09ac1316932da48928618e4e6391ebe423b0ad649f912252782873caa2f177df335e4961190152fcb6fdbf223b77f3b075e1428f6a64d94e2edeccd9e88f04
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xfd/xfd-1.1.2.ebuild b/x11-apps/xfd/xfd-1.1.2.ebuild
deleted file mode 100644
index ebe1357bd316..000000000000
--- a/x11-apps/xfd/xfd-1.1.2.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit xorg-2
-
-DESCRIPTION="X.Org xfd application"
-KEYWORDS="amd64 arm hppa ~mips ppc ppc64 ~s390 ~sh sparc x86"
-IUSE=""
-
-RDEPEND="media-libs/freetype:2
-	media-libs/fontconfig
-	x11-libs/libXft
-	x11-libs/libXt
-	x11-libs/libXmu
-	x11-libs/libXrender
-	x11-libs/libXaw"
-DEPEND="${RDEPEND}
-	sys-devel/gettext"
diff --git a/x11-apps/xfd/xfd-1.1.3.ebuild b/x11-apps/xfd/xfd-1.1.3.ebuild
index a6bd961ab4fa..b46c4eb4ced0 100644
--- a/x11-apps/xfd/xfd-1.1.3.ebuild
+++ b/x11-apps/xfd/xfd-1.1.3.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit xorg-3
 
 DESCRIPTION="X.Org xfd application"
-KEYWORDS="amd64 arm ~hppa ~mips ppc ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="amd64 arm hppa ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE=""
 
 DEPEND="media-libs/freetype:2
diff --git a/x11-apps/xhost/Manifest b/x11-apps/xhost/Manifest
index e3c36a13fb78..27af71a6e145 100644
--- a/x11-apps/xhost/Manifest
+++ b/x11-apps/xhost/Manifest
@@ -1,7 +1,3 @@
-DIST xhost-1.0.6.tar.bz2 133176 BLAKE2B 8cb649716b93d3bf020e4897f2d6f7f1a0a765c4fb8715b1c128475725bc6822cfe49aebfdc6677c1eccc8510938848dae538f7b4c90282c4b01df0af124fb62 SHA512 4e9b8b5b3a13b995e4f3596b26fa637d5892936090516eef1eb296c257358496ed5ad7b5c1e924003fcc18b6c8d4592f83e515d66a605a895f1d9fdc5d064f1a
-DIST xhost-1.0.7.tar.bz2 135767 BLAKE2B 0156640ede491a8a2f1610ca5d68d97e88fa349bcbad39a308aae46d29f7cf8f93a8fee8273ba369484efd9641653e7bcfbd8fb3ec14d9f07b20e4ffd7fd6fd2 SHA512 670a8c97291565f6c36c94e135f7bd60a572bb42b4fca9d2460823db0d0576187c64f9b876ed60d348029d3f74a732862eea4ce889a6b6b9c97665746a38b1d7
 DIST xhost-1.0.8.tar.bz2 138539 BLAKE2B f05d58444537431d9dce5e6dccc27bc8116141d66b34b6edb356dbe823898dbb2927f8ad8dc133178efc7e5b399b7b6428883ea7c665577d4b1984300474eabe SHA512 55581f9bc45a70a73b13fe718ca83c4cb0a6116d26addc0f07659ebeb5bf7d2379e84cab5a1702ae77a298a66f42ae03f41ddc7d5acd61c6f18448e58ad7cb6b
-EBUILD xhost-1.0.6.ebuild 539 BLAKE2B 5bd6f53495eb8967fa9f96cdbca7a5c505e8f35e97622227a4a982591f3e64b98f93e71337730633edb669570aa866bf325d2f55472d3d5dc0f650a39ae668e3 SHA512 3a6d8513658e09b8e97c31fd82857c1509863bb4277f8f7645997433c0c5f3a59c869957d013bba934cfb858d560571811c315a6271168196b31cf03c28d73e8
-EBUILD xhost-1.0.7.ebuild 541 BLAKE2B 19116804d6c067bb7a27327ab43aea0a3a7d1ceade0414b859e8d1230140459ced0b4e8b69eff14fcaddb65d65089ab2733b694ef721821a8b95c9b98ef820ae SHA512 7b1fff2934bf6dad0ae27a111b78aca84efad4aa1c2d02a264b66e6d076075b76d43365e8d767f20ba0d6c790864b850f1c21e2a6fe6dc512b18e7f28953c008
-EBUILD xhost-1.0.8.ebuild 544 BLAKE2B ecb19c10ae357eb4b5bbbd6b914d704ff164d980292ee4cb75803e0bc7807b685ab8cbb61d7156f453508acdc66e3f220d082d2afa35842c0416dea600f78b33 SHA512 6ba9b5b5c8520fd791cadca598f5377b2169116420074dcd762f3ce19d67255e782ff4ad50d215478468ab715dfd2ca4445cfc8beaa1114fb085fd07fca5c265
+EBUILD xhost-1.0.8.ebuild 541 BLAKE2B 82a5f2f3fe42c99ca9378e0851543f188ce9626105fcb08c04c0569e91d96d57ccfe7ef1ed6ae08ae70937cf4069ef6645b329254e1a0fd6fe4f8aa12b9b87b2 SHA512 fbf6d3f04e62b23622efbc363aa7dd3f021a8cce464821296a20ca56f29c9738c32b0cb0e04ffad58cff78cf454d10d65058c6fdd5b6f647a4fbbbb56abaa360
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xhost/xhost-1.0.6.ebuild b/x11-apps/xhost/xhost-1.0.6.ebuild
deleted file mode 100644
index 86f640969db5..000000000000
--- a/x11-apps/xhost/xhost-1.0.6.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit xorg-2
-
-DESCRIPTION="Controls host and/or user access to a running X server"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="ipv6"
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXmu
-	x11-libs/libXau"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	XORG_CONFIGURE_OPTIONS="$(use_enable ipv6)"
-}
diff --git a/x11-apps/xhost/xhost-1.0.7.ebuild b/x11-apps/xhost/xhost-1.0.7.ebuild
deleted file mode 100644
index 4c21e454f218..000000000000
--- a/x11-apps/xhost/xhost-1.0.7.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit xorg-2
-
-DESCRIPTION="Controls host and/or user access to a running X server"
-
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="ipv6"
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXmu
-	x11-libs/libXau"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	XORG_CONFIGURE_OPTIONS="$(use_enable ipv6)"
-}
diff --git a/x11-apps/xhost/xhost-1.0.8.ebuild b/x11-apps/xhost/xhost-1.0.8.ebuild
index a0dccb1f37f1..97e4b1d2eb92 100644
--- a/x11-apps/xhost/xhost-1.0.8.ebuild
+++ b/x11-apps/xhost/xhost-1.0.8.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
 
 DESCRIPTION="Controls host and/or user access to a running X server"
 
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="ipv6"
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-apps/xlogo/Manifest b/x11-apps/xlogo/Manifest
index 426ec3186bbd..10774b870aae 100644
--- a/x11-apps/xlogo/Manifest
+++ b/x11-apps/xlogo/Manifest
@@ -1,5 +1,3 @@
-DIST xlogo-1.0.4.tar.bz2 125967 BLAKE2B 721de083217e420151771fe91b6b52d0f6cbe56427859d79e6ec1d1d1c3c9fbfa1d35015ab364b8c00af66f65aa987aebebfa7fe2738e661d9fd52224906d084 SHA512 cbfcd48425e697950907ddeaec2f06e0607ebf2e93e6799bd263230f036b3021279c2f379de55fae15b403af5f18292caa79159ed544a4a3314b90c85ac9804d
 DIST xlogo-1.0.5.tar.bz2 135608 BLAKE2B eeaa9dfdca57bd5b60035dc31981f3b3e390862b5e8f695422505059f657cfe727d491c757e8ef4dba4a913179c92827741f04e3fc6765b0257d63f1382fc69f SHA512 0d78e269b0be3c5de71de7f362b896bfd9934ecd9d0361b3302399b1269e029c4a9f35418d792121a1edc34405d753f9d69c996cc3a69ac717f2b0d1f736406b
-EBUILD xlogo-1.0.4.ebuild 456 BLAKE2B 189943d17d0717798e2548871489482f4737f3d2c555fa80c2fe7f872188b18e7d20011a022fecad0fabb45f3235b72638f7632ee27b017813799b55d4509a71 SHA512 0a5e2bc7349a76121bf014bf7cc1e2ac08882b0c85b0cac8bd312d846724ddefa75367e1e8e22957ebbf050e9ec4f3f338643e7cb91d1f490876ad5bdc74c585
-EBUILD xlogo-1.0.5.ebuild 457 BLAKE2B 32f8b2f90dfeb4ecf11dc7b07c0bd7db8d5ec878ad955f5297eed30380e4e78cf231a9e9693b3a5e0b279ed0534f0e7764ef9937079611bfc8f3b26dcfcc7fb7 SHA512 fea57d91c45d4477da4b4725897700db62845b6f0653d25ecb39ffec7810d52857a0e82b45fd7b0677dfcf0d998f413505b1f51311dfeed1a4af2b0968725049
+EBUILD xlogo-1.0.5.ebuild 454 BLAKE2B dfc1b84a5bd02c988c0f0e1fda6c8f57264326fae7d97f84f23cf6a525bd60589f5d882a0d717234ce014475e838639e8bdefc8b12753d63991c7ff72a9273d9 SHA512 c28f8919578a174b5b349191eafe0cf3415436395efb1b6ba4eea663b64232a355bfd5f2f05171f7d43be48a8d9a60aa8fab5062ab42d126f3fc0e1e2f84d113
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xlogo/xlogo-1.0.4.ebuild b/x11-apps/xlogo/xlogo-1.0.4.ebuild
deleted file mode 100644
index baef294e1870..000000000000
--- a/x11-apps/xlogo/xlogo-1.0.4.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit xorg-2
-
-DESCRIPTION="X Window System logo"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
-IUSE=""
-
-RDEPEND="x11-libs/libXrender
-	x11-libs/libXext
-	x11-libs/libXt
-	x11-libs/libXft
-	x11-libs/libXaw
-	x11-libs/libSM
-	x11-libs/libXmu
-	x11-libs/libX11"
-DEPEND="${RDEPEND}"
-
-XORG_CONFIGURE_OPTIONS="--with-render"
diff --git a/x11-apps/xlogo/xlogo-1.0.5.ebuild b/x11-apps/xlogo/xlogo-1.0.5.ebuild
index a9620d599ed2..39df5981d916 100644
--- a/x11-apps/xlogo/xlogo-1.0.5.ebuild
+++ b/x11-apps/xlogo/xlogo-1.0.5.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
 
 DESCRIPTION="X Window System logo"
 
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86"
 IUSE=""
 
 RDEPEND="x11-libs/libXrender
diff --git a/x11-apps/xlsatoms/Manifest b/x11-apps/xlsatoms/Manifest
index b0b6e772ace6..53bbbbd77540 100644
--- a/x11-apps/xlsatoms/Manifest
+++ b/x11-apps/xlsatoms/Manifest
@@ -1,5 +1,3 @@
-DIST xlsatoms-1.1.2.tar.bz2 123157 BLAKE2B db6dcd01a8494411068ae43cb93c03fe03191c981d400a7f1fe2c179e7db2bc665af8989f6e4f0b136668d3f78cf491015b58d5fc3dc7707925b9688be780848 SHA512 f29001de22818792212312f1b9daee1bf7afa2ef2ae945cd8c14bdc1a7bb40064d3878c5efea60458ac0bf515ab1ece16fa90cbd2b0a879a5f07f3aa3e6a0baa
 DIST xlsatoms-1.1.3.tar.bz2 126327 BLAKE2B 7a4ca35e6968432fc99dcf665b3f63ac84e5bda8a7b061fca9df7bb12e447e83feaf4c82d80a4e469e680042d7b856708821febe44897acf5cba7777e90073c4 SHA512 c267ccfdc5a83e834bfb5c3b144e22642badcadef4eb146eeec2df6fe6f85e9379500ae4219912c70fa2e535036a1a96cf496381f5d814e79af075e03c975f30
-EBUILD xlsatoms-1.1.2.ebuild 341 BLAKE2B 920c1f44de8613ff2ae2edd650003c2869017b707739fc1ed700a8d4ba8d0f01c4fdd1cf57c9eb7e7cec9c738eef24cc79407e60794b7323e3b69cdcb3a70c62 SHA512 220d8b3c42669824e12f018beb64604b94bdde2f6bbaf5a40b23f442de7ad7427a61dc6f0305cdf6fe77fae2e0ae65428267542fdb023ba560997a05dc7a6a6a
-EBUILD xlsatoms-1.1.3.ebuild 342 BLAKE2B b5000c9be486ce16e2c590daf74880bb620bff059a9c679f339c7cdd007e2f1f15b6fd205343edf238d88f004fade4df947c7471013f8d7a55d6902567b75d28 SHA512 3be163cb6d7ac98dc526dd1a80247443ff2250062d2a1b9934b2c2fb7330a1573f79ce59505ca37c5a362358ac9baa74b0feb959582d1f1f51b7d29d07d2341d
+EBUILD xlsatoms-1.1.3.ebuild 340 BLAKE2B eab9e8af6c9e77f6343640a1da216a2ce1d01fe3768b3706bb500ab4d20d95affb75da17ee9187fed6407c5659ed9bae9061f42ae46d35f4ad6198cbf57182ce SHA512 ad1f9706e825e6dfed04ab64ae1775fe16d954b57e3042453e05a5c1416825c115db89eff5032058060e76ca434a60db4cf7a5bfd634012ede7c295dec7fe380
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xlsatoms/xlsatoms-1.1.2.ebuild b/x11-apps/xlsatoms/xlsatoms-1.1.2.ebuild
deleted file mode 100644
index b20d9f240a91..000000000000
--- a/x11-apps/xlsatoms/xlsatoms-1.1.2.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit xorg-2
-
-DESCRIPTION="list interned atoms defined on server"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-RDEPEND="x11-libs/libxcb"
-DEPEND="${RDEPEND}"
diff --git a/x11-apps/xlsatoms/xlsatoms-1.1.3.ebuild b/x11-apps/xlsatoms/xlsatoms-1.1.3.ebuild
index fde13c5622e8..edadc04a17d5 100644
--- a/x11-apps/xlsatoms/xlsatoms-1.1.3.ebuild
+++ b/x11-apps/xlsatoms/xlsatoms-1.1.3.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit xorg-3
 
 DESCRIPTION="list interned atoms defined on server"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND="x11-libs/libxcb:="
diff --git a/x11-apps/xmodmap/Manifest b/x11-apps/xmodmap/Manifest
index 2b12cd9b8eda..216cbe65887d 100644
--- a/x11-apps/xmodmap/Manifest
+++ b/x11-apps/xmodmap/Manifest
@@ -1,7 +1,3 @@
 DIST xmodmap-1.0.10.tar.bz2 145489 BLAKE2B 503e72882a1d6d5c916cb60b898156adbdccc3e90bda85b161ac7a57ee607605331be73bd779603cfab1013d065e28f3165cce2ef50d71579330ab0361078a22 SHA512 324c7dcef843186088f16b3bc47485eb3c9b4331e56ce43b692deb4bb3d4f4f27512480e91a379cceac8383df920dc5e37cd825246b50b6343291cec48134c04
-DIST xmodmap-1.0.8.tar.bz2 141026 BLAKE2B 1c2e510d7083f98a7b72d7a48a0fd74f4d660ee8966c7282f15d6e898b0b0ce6083f626915d48d345db8be385e187ff542c724f23aaf0deefbbaaae2be1f0597 SHA512 716cd1ee2cdb1db31b84c018eb223fb3eb05d499a7e76e0bdf038b58a5f71dd17631c8ce39d8108f6c47fe11fad718016f2891baa813b35a9dc607d3a3946a63
-DIST xmodmap-1.0.9.tar.bz2 142565 BLAKE2B 36fc73d518240fc37243c67ecd5101f4cd39343198c7271717eb6c491c502db6579ffd5db639b509977f2e168b4f0995b8aa7a9a821dbde5ede65199c2feb39f SHA512 6e50f2ba072ec171bd3fc34f75b21c63f9834f3c0f1608c857f80a4b2c8a9696b03dde79f8342bf67504b759297bc24a64056a625d295a4f89dd31eb938400ac
-EBUILD xmodmap-1.0.10.ebuild 431 BLAKE2B e24d43bc0b27c340e792c99aed08b064944df5dd98cc91db3585e73cbd68aa624ff6484cec835f5f3576308cd053f610bc60ab6647890eade293716b0f0da986 SHA512 e72746a48ab0535ff300b4db60ee1df7c12cae3da6fba1e9f20749c1efffda997d7766c956f0755f10dadbbaa23792fba1ffa478db4a06c9731499b24f7c089c
-EBUILD xmodmap-1.0.8.ebuild 425 BLAKE2B 3935d8125e1d80964392ac6b8dac749855aa462e51a8fe7a5dd8d9022f156e5ff8b4ca99af99055fac058c176c28ea0f689c809229392e9fd92aec8995b59073 SHA512 89f90c309ca3d06f42fffae83bcd9fb4c608c0aa1a09d29963485f7d3cb01fb72ea0489f316185ad88574a7c9048254b460ac2ba8076cb7460e17ae30e368b25
-EBUILD xmodmap-1.0.9.ebuild 432 BLAKE2B 4b25e4babdcbfac594fd041dc1acb8397327bba3eabc9f9468799a28fabb5d67571860f7aa7ecd3f062b1f7f45a4986171e3ee683cfebc74a6a6dadf7fd0db80 SHA512 309087b2637bff0e66531838bfd252b0adfd0758d9f0fda7dc8b25bf8d4202ba4ddba1580799c8f36644b526edf4c9d437e80998d38673d7cf8ea50b2afe7187
+EBUILD xmodmap-1.0.10.ebuild 429 BLAKE2B fe73dca21387529f4710ed2059102eb9acfcaade4de718f4c77487cb05ebfa4fc651abf318fa0e3df0e42890b2b5532020e4424644b6f79520ccf31230604ab5 SHA512 ee06c56142514abd28a72c40029fbad2f829709cad2905f61d35eb44a2b11c5f3836cbb163efc57c67c07938523b07a2307bfbaecad2aecdd5561796ba4991c5
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xmodmap/xmodmap-1.0.10.ebuild b/x11-apps/xmodmap/xmodmap-1.0.10.ebuild
index 07774392dc76..a21f4b61086b 100644
--- a/x11-apps/xmodmap/xmodmap-1.0.10.ebuild
+++ b/x11-apps/xmodmap/xmodmap-1.0.10.ebuild
@@ -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 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="x11-libs/libX11"
diff --git a/x11-apps/xmodmap/xmodmap-1.0.8.ebuild b/x11-apps/xmodmap/xmodmap-1.0.8.ebuild
deleted file mode 100644
index f9aef2572cef..000000000000
--- a/x11-apps/xmodmap/xmodmap-1.0.8.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit xorg-2
-
-DESCRIPTION="utility for modifying keymaps and pointer button mappings in X"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="x11-libs/libX11"
-DEPEND="${RDEPEND}"
diff --git a/x11-apps/xmodmap/xmodmap-1.0.9.ebuild b/x11-apps/xmodmap/xmodmap-1.0.9.ebuild
deleted file mode 100644
index c23eea402764..000000000000
--- a/x11-apps/xmodmap/xmodmap-1.0.9.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit xorg-2
-
-DESCRIPTION="utility for modifying keymaps and pointer button mappings in X"
-
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="x11-libs/libX11"
-DEPEND="${RDEPEND}"
diff --git a/x11-apps/xmore/Manifest b/x11-apps/xmore/Manifest
index c5eaff7e9f50..74d1b7253b93 100644
--- a/x11-apps/xmore/Manifest
+++ b/x11-apps/xmore/Manifest
@@ -1,5 +1,3 @@
-DIST xmore-1.0.2.tar.bz2 107340 BLAKE2B 35dd82edf2f00d861d4b8df4175626fe7c72f2e27b0a0621184f86bdd57d84406fbd1d4724466779e31ae58b0045bb71b669b0524d2909c9a87f28598d14ee5f SHA512 718ad254beaae57475cead3815fc7625692699c76749c64e3aeb722daf5e1cecbea9d1207e3427d6a5d0aa240a6aaf678ea1656d6731b9f47e1a8045d62c3efb
 DIST xmore-1.0.3.tar.bz2 127587 BLAKE2B f59c9b6b7a134694dc7df5540c75a4331785ef7da0c5b40618923a3d1d53a543f7a54b7b8383f2e816b4f478056f6c0b1c6a4ce212c50b4fca75a307057c3f54 SHA512 e3e44831cd87a54bb585f80ef0d87f69dc35f6c834a73241aad9f6e2b0999b53c51a0a3f915a94ae4d6dc9bdfb9f60b6576f0bdcec441443abd98efa6c51b1d3
-EBUILD xmore-1.0.2.ebuild 332 BLAKE2B d1872b27e20c024c96152ed7db9c79d510e2dde9d33379032be35c6b32f0c8b4679a5c5f808f535aa6b2a7323a144352b9a34b6b455f97d071b5d265ccd8d3d4 SHA512 de96bd49e3ae92e68cb58835f37dd43d29811d08b4577eeaf43a9f671216d959187e96a8867516f79e3e72fd644b272a93a0088419fecf40c06487e1eb48b49d
-EBUILD xmore-1.0.3.ebuild 332 BLAKE2B 035da9a2f7e555ad5769fd8ccaf1e424fba64a07606a9625ee7b28f38ee6b5f337bae2361a7010478f93c142fc884a4ca5d0184b512c419a3d7014ddab97cbb1 SHA512 5d3edc2d01b4ddb6067ee0ab8dbf226782052f53c7a4e8aac0cff4b52998bb4836d6f8410b41cd0a24a223182f4b8605e494a48839e461dd2b848802e3904d79
+EBUILD xmore-1.0.3.ebuild 330 BLAKE2B 979f584908b7401080ba3f84b1186c87160dd22641be367284843dba66435d90dd1d6b1400365e81bf586fc028d76a44302148092d48665a54c586f702476cd8 SHA512 6ad25c4a8205a9384b4e8d37a23d52c9076fdc6f826961da16e5afada24cd863d18cf67504a38a4bd7a09e7f07839fa70bb5ffc42dc507a1757af0f94261a900
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xmore/xmore-1.0.2.ebuild b/x11-apps/xmore/xmore-1.0.2.ebuild
deleted file mode 100644
index 8029981f0895..000000000000
--- a/x11-apps/xmore/xmore-1.0.2.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit xorg-2
-
-DESCRIPTION="plain text display program for the X Window System"
-KEYWORDS="amd64 arm hppa ~mips ppc ppc64 s390 sh ~sparc x86"
-IUSE=""
-
-RDEPEND="
-	x11-libs/libXaw
-	x11-libs/libXt
-"
-DEPEND="${RDEPEND}"
diff --git a/x11-apps/xmore/xmore-1.0.3.ebuild b/x11-apps/xmore/xmore-1.0.3.ebuild
index 745fa7b15892..1e87cdf38bab 100644
--- a/x11-apps/xmore/xmore-1.0.3.ebuild
+++ b/x11-apps/xmore/xmore-1.0.3.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit xorg-3
 
 DESCRIPTION="plain text display program for the X Window System"
-KEYWORDS="amd64 arm ~hppa ~mips ppc ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="amd64 arm hppa ~mips ppc ppc64 s390 ~sh ~sparc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/x11-apps/xprop/Manifest b/x11-apps/xprop/Manifest
index f981b9f0a8a3..295235ab6ce4 100644
--- a/x11-apps/xprop/Manifest
+++ b/x11-apps/xprop/Manifest
@@ -1,7 +1,3 @@
-DIST xprop-1.2.2.tar.bz2 145556 BLAKE2B f1560f7688b4c9a5c2cc55a29aa15181f09d65883f44f63a3761988cc1b905c768a1cfebe9303b3f5e12d0c84e0e6a0ced79d69e49e2d5ab99087c16157d4c41 SHA512 934a46423d4904e57a3f5fc4ffed469f85a9bb6a3544cd2d2f80cf7ac1e6ebe1de8b3631c99a4d32c0f02992fcc940e2938832751182f0996ba3a95017794572
-DIST xprop-1.2.3.tar.bz2 149202 BLAKE2B 57c6459b873ecb91adb2bd01c350918abf95b8eb33ad1de05ded1f49350bbf3be2c46f597d9f559d473c9dd41dab2b327ca2c3e8a0fe742498e5a2c94ca1ca22 SHA512 ad7987fec11ae19b7adc3b0f683fc393e95155f3b6c753d1d8744aedcfb360452eee5735a4c380152b286905931515f3e1a28676b5531001eb8dd93b7249916a
 DIST xprop-1.2.4.tar.bz2 149930 BLAKE2B 93bd20c7c91d6abd9e2fdeca7864b9885ae7248c7ee3ef80a5efa1706bfef2220244b1443764fdbc042f66be8d589b111fd942c732922f05f4143e1c893da183 SHA512 6e770cb89ba87ae057858cc9f0f5498979e78c3ef66ce86361b7c646cc0b70c41a18d76e55ed7225fe715b22b62bc07c56272519a2631b92832e9403ce260da7
-EBUILD xprop-1.2.2.ebuild 422 BLAKE2B a8ed96999843e54ec1bd01955e07ccff6da81d607fb1b3863d402e4bbcc9912c293f4e85b9c77874729d23370c6539604d46db45252f43f55957ef80499b0314 SHA512 4b54e9d116c08282c8d08f321d2725a76b48d8afb4a38916682fcd8b2c2a3e726e6609a3e7de0546bdb9ee06fdb6bf4b4e81f2e4fa37080ffc13f4f24810de17
-EBUILD xprop-1.2.3.ebuild 422 BLAKE2B a8ed96999843e54ec1bd01955e07ccff6da81d607fb1b3863d402e4bbcc9912c293f4e85b9c77874729d23370c6539604d46db45252f43f55957ef80499b0314 SHA512 4b54e9d116c08282c8d08f321d2725a76b48d8afb4a38916682fcd8b2c2a3e726e6609a3e7de0546bdb9ee06fdb6bf4b4e81f2e4fa37080ffc13f4f24810de17
-EBUILD xprop-1.2.4.ebuild 425 BLAKE2B ff1cfd6c031e068b4789af978a248119574bb4c2eda7ebfefd546e26796fa94f1a2d6b2795f310dabebd9028700b5f21efe10f00e9fbe52a57e75f93fdcb4f00 SHA512 f264ce2fd79c922931dc2c8edc70f3d835d8afe7e5f527cce47489b43b7cbb4b64a6daa720752f60a4cb1f02f9847e13333b8c2110fc74aef2605b0aed754f28
+EBUILD xprop-1.2.4.ebuild 422 BLAKE2B f86c7ab80065afcc9184b68312c8f8d744d6188395ad2d0a80350332b45dec4ddb7e646757dc8cc29c5788a0bbdf97e24c9f78a276d5346a39269831d2fe0e83 SHA512 407ca51763006c2c61d585eafac89363f67143783bf0c9195a2eba249e9eeba6a833efd16669a0bb1700dedd1df5d866b1c7bebd5627b790c25be4f221cc496f
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xprop/xprop-1.2.2.ebuild b/x11-apps/xprop/xprop-1.2.2.ebuild
deleted file mode 100644
index 888df27777ec..000000000000
--- a/x11-apps/xprop/xprop-1.2.2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit xorg-2
-
-DESCRIPTION="property displayer for X"
-
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="x11-libs/libX11"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-"
diff --git a/x11-apps/xprop/xprop-1.2.3.ebuild b/x11-apps/xprop/xprop-1.2.3.ebuild
deleted file mode 100644
index 888df27777ec..000000000000
--- a/x11-apps/xprop/xprop-1.2.3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit xorg-2
-
-DESCRIPTION="property displayer for X"
-
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="x11-libs/libX11"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-"
diff --git a/x11-apps/xprop/xprop-1.2.4.ebuild b/x11-apps/xprop/xprop-1.2.4.ebuild
index 8cb7805b6beb..f88751889fed 100644
--- a/x11-apps/xprop/xprop-1.2.4.ebuild
+++ b/x11-apps/xprop/xprop-1.2.4.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
 
 DESCRIPTION="property displayer for X"
 
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="x11-libs/libX11"
diff --git a/x11-apps/xrdb/Manifest b/x11-apps/xrdb/Manifest
index 2f3e68370e1c..779aa593bdb3 100644
--- a/x11-apps/xrdb/Manifest
+++ b/x11-apps/xrdb/Manifest
@@ -1,7 +1,3 @@
-DIST xrdb-1.1.0.tar.bz2 138035 BLAKE2B 62cea13d943692cf8be654b53c89751925c0e1b07c84cbe954070c109a5792908bb3642b208ac2da151f8416ab645c05d3d54084424d9fc9d5aba4efc99604e6 SHA512 8e2a177653d5aa895c71ed3640e0f1dd9fe8bf5cd6f0c6ff7e372394a2a41c3aa2286905fd9c69e3d140024d235b81a1f32b5d4012b1ac5ac1ed945599dee407
-DIST xrdb-1.1.1.tar.bz2 141950 BLAKE2B bfd0e384e4bdbae3209caf4e729a8151ec174ca1a461d3dd5a357b8a383fcf7da072741e539a8830434b416c894684e20cde8bde11fb211420d5796c2c08298b SHA512 20c342004ef911fc4d3ef4ac3ac15d1c30bb946b8156f3a6916c242e470be0cb63261563462fd1e2e07b1a7cc527b8cacf5f913e31b02196629a95043cf8d13f
 DIST xrdb-1.2.0.tar.bz2 142194 BLAKE2B 2fee77b287f43125413bbbc288b1d89986a93775797c02dde564e678bec3c429bca487d752d82f8da924a95e177a46e3b4de507b7fdca56b95789e1d7ea3dae3 SHA512 14e1cdfb2152fb28f1f4641b177ab236648d7e967a95b952bf4cfce8d3e1ef085e85385354e3381aaf644462e8888a1847f755ab4016ecb4cb4a715b001dd2ef
-EBUILD xrdb-1.1.0.ebuild 442 BLAKE2B 0f0cbc0fcdfb83c5edcb9208ddd991b4ac56923d340ecff8b5dc46f202ed2f654502cc8ba51b966d715d4db6eea9b204f631ca7711639d15f77e5482ec7bdf1b SHA512 f084e5cd7418d130d7d48759b0eac6a41795627b8402deecdb3e581f7c6a9db0571e2a589d2a3e71543cb2f4606fe83e4488b50edef523daf1c3adb15f9abe07
-EBUILD xrdb-1.1.1.ebuild 437 BLAKE2B 971347e98a84f0e20e0b3fde0c280f6cad592d4e1e996fad97d3edd8a010e9bb2850062d00d8ecc9590ad8f5bf61e47fd916823c2d48d5152e9f6f99ab5ed863 SHA512 92df490f87c1f7bed58f1b875f78bf56f1aef670be1a07f7c6d846456301ec93bd2e751ece39197109f22848f47608b93042ea33ee3c012508186675acf0e510
-EBUILD xrdb-1.2.0.ebuild 440 BLAKE2B fcde4f0ae6869e298dd3c359fe9327dccfd84f5c228eb85ceabc80fa710a9531b7e601ab8a387c92e4b20d60c49c55fb790b29b65c8f105fa1846e9c7f3b3e5c SHA512 99b1f2d9177aa031fcee2ea5199de4ed13b53ef7ad9a53d72a585414334f86766795f7763e152bfe96f26fab6d5646f755ccff72c8ff1761f936fb7bfc4dc2da
+EBUILD xrdb-1.2.0.ebuild 437 BLAKE2B 598faf4d69eaa9239c8b999d093ec80946dc5b3e00dd28add1684e5924f9190907fceffa3905024a6de30d7f04f1936427d23386a799182e0fb7a189bb8fd38c SHA512 015aa86b81d82c11294dabd54e3bba13dd9a70da68b75ab44c0b60e33528dd93cd5375e84b149161900797d4de7efce9a8ab9e84f463ff58beb30e6ac7c16ae8
 MISC metadata.xml 317 BLAKE2B 02ff19551010134a361010ad2647deb4949c46241c2f3ff388fc8fb7aad6194a822c795f8505cb72896229f9702857b29235197675a227a1da9755d051e5930e SHA512 460dc7431825b65cf43260ca92bad810e99a9cdcc0602da758d5f23ec6faf69a3c056d2db6df266055aed47fe3a1c7063cdd2cb942e09a9b08f60ea81597bc96
diff --git a/x11-apps/xrdb/xrdb-1.1.0.ebuild b/x11-apps/xrdb/xrdb-1.1.0.ebuild
deleted file mode 100644
index 8ec7d87f62ae..000000000000
--- a/x11-apps/xrdb/xrdb-1.1.0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit xorg-2
-
-DESCRIPTION="X server resource database utility"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-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.1.1.ebuild b/x11-apps/xrdb/xrdb-1.1.1.ebuild
deleted file mode 100644
index 29a2fda567be..000000000000
--- a/x11-apps/xrdb/xrdb-1.1.1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit xorg-2
-
-DESCRIPTION="X server resource database utility"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-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.0.ebuild b/x11-apps/xrdb/xrdb-1.2.0.ebuild
index 523790c7ad69..53defb0aae29 100644
--- a/x11-apps/xrdb/xrdb-1.2.0.ebuild
+++ b/x11-apps/xrdb/xrdb-1.2.0.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 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="x11-libs/libXmu
diff --git a/x11-apps/xstdcmap/Manifest b/x11-apps/xstdcmap/Manifest
index 94837aefe6d8..58bea3153444 100644
--- a/x11-apps/xstdcmap/Manifest
+++ b/x11-apps/xstdcmap/Manifest
@@ -1,5 +1,3 @@
-DIST xstdcmap-1.0.3.tar.bz2 117491 BLAKE2B 971dc6e2e42fa7631f8cb084a6cf22dcb87e20ae23d93c1f73d92c5532878e36a4c192707ce49dbd9d6a6a95ac4c3d36911f63f3d7fc1847d503d43499736a44 SHA512 8037ddb9c6b8f3a65d35637a1fca2b1b6c7e76afce5c13b1947cf72c3ca87679aa2ed05caf308d90549432b7fe029a522a99f32701bd0087c140bf4fafdb4d49
 DIST xstdcmap-1.0.4.tar.bz2 126269 BLAKE2B 5c2fccbc374871738ae03d722a045cc3ffd6bc431774d76525653e70c5ddb9a4281b2372996ff492807f9d4aee414eac1016f2696ea4e1979407a5b7cf37e1b5 SHA512 2adbb0aec1766341e04090efa962241ff6c9e32c612851b7221cec0ee16852107d406a08ec5251070f39df882c13e3c8c9edcd88f278187a9f373e1727643a8f
-EBUILD xstdcmap-1.0.3.ebuild 308 BLAKE2B d60bf5e731858ebdfc89ad720f443d33d62537d36305ce7c3c8cf03d2072a2a653cb890de552f60842f8f8f19e81883026fa907d5613b187cf06600f489496cb SHA512 dada4e88db321dc4f7c43a6b5bbb5c946c8a86fb543a835d6648233919e74c9b10f674210a1ddce7d70ec09d0669f35845631e6f60cb167dc724d60a6dc3c9da
-EBUILD xstdcmap-1.0.4.ebuild 306 BLAKE2B eb32690a601ecda370848f7209ac68cc67c01b1f95d0846d756ca59e4dbed18299579028d07292df1cad969c9bc6c0b65aa9b45d84630cb489e5219dd6d61c03 SHA512 1b5aa20e446bb9904e0c01227a13dc60725e271689eace96704d4c6a222ca0d04db1295508a4a0540b10597be11ea01c23512bf3171a4713f9a39be32fa30770
+EBUILD xstdcmap-1.0.4.ebuild 305 BLAKE2B 16650fcf95a320783242b3472703425eec15bbfbb1a9b37234d1c5d0b7b3d71af0a39b7378dabfa9f12683f982c2cf003d2562919ee32e900da75775afd129fe SHA512 e9169bb8f273711ee4e2aebe4ead5032fe359cc03b63cabaf98df122b8413fc05f8e7813ed76e544ed8934ea7f97abc9121c791d8af9393aa35311f48338c38a
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xstdcmap/xstdcmap-1.0.3.ebuild b/x11-apps/xstdcmap/xstdcmap-1.0.3.ebuild
deleted file mode 100644
index 1609cc4d3a80..000000000000
--- a/x11-apps/xstdcmap/xstdcmap-1.0.3.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit xorg-2
-
-DESCRIPTION="X standard colormap utility"
-KEYWORDS="amd64 arm hppa ~mips ppc ppc64 ~s390 ~sh ~sparc x86"
-IUSE=""
-RDEPEND="x11-libs/libXmu
-	x11-libs/libX11"
-DEPEND="${RDEPEND}"
diff --git a/x11-apps/xstdcmap/xstdcmap-1.0.4.ebuild b/x11-apps/xstdcmap/xstdcmap-1.0.4.ebuild
index f07835db98c5..b57b833cadfc 100644
--- a/x11-apps/xstdcmap/xstdcmap-1.0.4.ebuild
+++ b/x11-apps/xstdcmap/xstdcmap-1.0.4.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit xorg-3
 
 DESCRIPTION="X standard colormap utility"
-KEYWORDS="amd64 arm ~hppa ~mips ppc ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="amd64 arm hppa ~mips ppc ppc64 ~s390 ~sh ~sparc x86"
 IUSE=""
 RDEPEND="x11-libs/libXmu
 	x11-libs/libX11"
diff --git a/x11-apps/xvinfo/Manifest b/x11-apps/xvinfo/Manifest
index bb42dd685752..a051b66deee4 100644
--- a/x11-apps/xvinfo/Manifest
+++ b/x11-apps/xvinfo/Manifest
@@ -1,7 +1,3 @@
-DIST xvinfo-1.1.2.tar.bz2 116906 BLAKE2B 11775fe342b840dec32ad48a4d47a53e897d9b4157a3a49b59768963855b2df470ba9ab098f418fa87f526c6723effc9584f993f7f2641870f7e92735dc46ad5 SHA512 0cf431afb52807f88654aaa3acbd286630461c934516ee5bbe280ec468ebfd3970b5b10f69d3a25aa36b6e0c0ac46d1c20c9606ac1de76261df80f1821362732
-DIST xvinfo-1.1.3.tar.bz2 123750 BLAKE2B 4a180335e7829ac31258f880955a36d1e6a5abccd3ce2cba1dcb8ec43aca6a5584df2fa4e345d6ce5885efc55b6c586e13a78010cd009cb01bec17dc5b8ab0a9 SHA512 df8356898390d2aec4fbd15cee1627bb86b57ff8af41a527d4f6f6703a81f399a3098da342b94af6d4cf4a817d9fda1946a206bfbe3995e87ceb9910bb8b51bc
 DIST xvinfo-1.1.4.tar.bz2 126503 BLAKE2B 54a1e08913cd51cfeaced1c704834e0348d02cfb2e606f2cbb103acfdf649595a77680364bfb5bbe684a15c743d2d18b6031e77150d0e9fb0d3405d474accc3c SHA512 85e1f936c5c826f0fdde3670bd77d5cde8641c6e8e7849e42142e91b5aa01d7e0e60d2b064eb6fef4f5666321813ca2dc9f9656756ccbe6dcda37b119ee8a63e
-EBUILD xvinfo-1.1.2.ebuild 361 BLAKE2B a53ed74eb7ec3438693f19ce2f097049b0648441fb5eab9fc5add297f8ad2b496357674095513c69985da5f79f9ebcad2e2dcd34b0627fdf9c83fbdfdf7a62ba SHA512 6cf8103a22a853ec1c65b5eeb3c2a89e98d36bb228c2b923538390a29de5961dec685b12ce1824385311e334884fff406a496d7e9eac60acfac704de2888f94e
-EBUILD xvinfo-1.1.3.ebuild 368 BLAKE2B 524114e20b3e44c1b7de12f4fbf9d8710a629c495952bfc61f67f8e97de258255edaa81fe942f3e499eeae25fd9cefabbff0379cb7e29ae8d0a8fd514ef29448 SHA512 84ec7d89440db62d346cdb880db34116b03ebe93ee4c61332ed1154dc35662a41db998829f522a3f58c0ebc74714984f9bd6c2a210e0e2d44f9ac82fe9c44413
-EBUILD xvinfo-1.1.4.ebuild 367 BLAKE2B a2563518d6aad8d6d9391b710fb0854434be07283de1bdef27e15ec6308d02ae6aba595dc90087c4093e024d226bb19839f6b1d5bf1fea981ff5c27480828737 SHA512 749823a3bf5053d3cba6661c1ffb91926220ce1e59cd10031b471ff85b9b6e826346a54bf9e5d560c9468936d6566f2c47247e7a9f88d92a861af51c33598aa6
+EBUILD xvinfo-1.1.4.ebuild 365 BLAKE2B 710924a75f0cfc9331fdca44e61cedc689bb7314f23eb6322aefa5c5e9e2e090e66db950a809c8833e9f518bc8a62842bd4a51d156575afee437b96020a5640d SHA512 2493c0284d0c4a8bee39197f3644589c2d9754cdef8d814c120cd0b5bef7cdb5499b494a769eea3e992dc88b0b7c549ac4743f5f443d6b6020d15f34728f7eed
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xvinfo/xvinfo-1.1.2.ebuild b/x11-apps/xvinfo/xvinfo-1.1.2.ebuild
deleted file mode 100644
index 0f3205f094b3..000000000000
--- a/x11-apps/xvinfo/xvinfo-1.1.2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit xorg-2
-
-DESCRIPTION="Print out X-Video extension adaptor information"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-RDEPEND="x11-libs/libXv
-	x11-libs/libX11"
-DEPEND="${RDEPEND}"
diff --git a/x11-apps/xvinfo/xvinfo-1.1.3.ebuild b/x11-apps/xvinfo/xvinfo-1.1.3.ebuild
deleted file mode 100644
index 9f52d2c7332d..000000000000
--- a/x11-apps/xvinfo/xvinfo-1.1.3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit xorg-2
-
-DESCRIPTION="Print out X-Video extension adaptor information"
-
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-RDEPEND="x11-libs/libXv
-	x11-libs/libX11"
-DEPEND="${RDEPEND}"
diff --git a/x11-apps/xvinfo/xvinfo-1.1.4.ebuild b/x11-apps/xvinfo/xvinfo-1.1.4.ebuild
index faef2db9591c..baaf44720acb 100644
--- a/x11-apps/xvinfo/xvinfo-1.1.4.ebuild
+++ b/x11-apps/xvinfo/xvinfo-1.1.4.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
 
 DESCRIPTION="Print out X-Video extension adaptor information"
 
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND="x11-libs/libXv
author	V3n3RiX <venerix@redcorelinux.org>	2019-05-04 12:02:00 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-05-04 12:02:00 +0100
commit	eab5731cdf11d4ae8cdf111461d46fd96c5bdd37 (patch)
tree	ce35c6d01b5ff5de95c3a20fef853b9a6518ad2e /x11-apps
parent	b7ebc951da8800f711142f69d9d958bde67a112d (diff)