gentoo resync : 25.09.2019

39 files changed, 22 insertions, 403 deletions

diff --git a/x11-apps/Manifest.gz b/x11-apps/Manifest.gz
index 902db6a875e6..b54d93165620 100644
--- a/x11-apps/Manifest.gz
+++ b/x11-apps/Manifest.gz
diff --git a/x11-apps/setxkbmap/Manifest b/x11-apps/setxkbmap/Manifest
index 8ad582c0bfd5..d7d715b3714a 100644
--- a/x11-apps/setxkbmap/Manifest
+++ b/x11-apps/setxkbmap/Manifest
@@ -1,5 +1,3 @@
-DIST setxkbmap-1.3.1.tar.bz2 133817 BLAKE2B f58f63623afd69275ef25cc33237176c2d1814fa124d7a5dade6ad3cf60b5ee5a8434857cfdb9b17c6f6c6cfce4dbf861a6c6bc232d9e12989acce7be285c63b SHA512 5ddc2fc40ddc5a35815606998d3f111e3c2b8d915bf609462c703f9f691a0b3a6477ee98837c0a28f11dd3f0a30f17a3bcdfa38d4ca45140e521c74d043ecdee
 DIST setxkbmap-1.3.2.tar.bz2 136253 BLAKE2B 0c7ee234ec39546812ed2cf4f57f20f8c5078a3193ad39ce948660ca870ef0b625a8bb7e90e9a9e8b567d6d023f45f62856a6e1b44d8bfd04a1c0fe1a6d9830f SHA512 bfa8015dee0d8d3fdbbd89afbd71c8606ce168d6edca8521d5ed05a00fecbea39bc4bfcce84b71458bdeb34c60bd80a5df27e0691ccee3966443ecdc937faf38
-EBUILD setxkbmap-1.3.1.ebuild 422 BLAKE2B 0b5257d56a6c9d2cf61536ba55aa345223ee873e2ae54b4366136d169ea9c75003037d2eefbb6e7af8c642e69a441681ff4942b28c296fdf655135da642275e4 SHA512 6f4491f48516345f3e5a2ee0a75c2a1e06ead4ad73b4e849acad9af27016a69951c5a28d0226612a679ce3410120fdfd5b8bd28f4f6066381639ae95504e81ad
-EBUILD setxkbmap-1.3.2.ebuild 494 BLAKE2B 43880017921f0806760758897514f862d8715f0a624ef992052661db3536dee0b039e2cdeb4d9c8a728a2125120a71c8c3f394d3ab7cae5693221acae8299a1d SHA512 80fedd797f653d60b732105b2b12b26bcf221d92fcef78d075882614ecdf7164d7cadcaa78f338f1c8be05048c74c62b8337ecd6833404b39d15ac4617df3ef1
+EBUILD setxkbmap-1.3.2.ebuild 484 BLAKE2B 8f7a2de02379e908ded62eadb6c219f5d095da6163edde932c8c43bedaa98a7793c844b489768bfe587b0ca52645ea70c033af3091e81097a662f1d5b8b5aaa0 SHA512 7ab9e7c3b02618400433f1cf31a77c800e36222b400c978bfe4ca61d4613e901e6d46aeea014bd013b1be4f8477091422618ca6daa8e31b1972a12debc423c24
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/setxkbmap/setxkbmap-1.3.1.ebuild b/x11-apps/setxkbmap/setxkbmap-1.3.1.ebuild
deleted file mode 100644
index 70b0c5b2f89e..000000000000
--- a/x11-apps/setxkbmap/setxkbmap-1.3.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="Controls the keyboard layout of 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"
-IUSE=""
-DEPEND="x11-libs/libxkbfile
-	x11-libs/libX11"
-RDEPEND="${RDEPEND}
-	x11-misc/xkeyboard-config"
diff --git a/x11-apps/setxkbmap/setxkbmap-1.3.2.ebuild b/x11-apps/setxkbmap/setxkbmap-1.3.2.ebuild
index 1309a17bb4ae..e6c5a521a64a 100644
--- a/x11-apps/setxkbmap/setxkbmap-1.3.2.ebuild
+++ b/x11-apps/setxkbmap/setxkbmap-1.3.2.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
 
 DESCRIPTION="Controls the keyboard layout of 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"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE=""
 COMMON_DEPEND="
 	x11-libs/libxkbfile
diff --git a/x11-apps/viewres/Manifest b/x11-apps/viewres/Manifest
index 280b269cefb6..a9f63b768d4e 100644
--- a/x11-apps/viewres/Manifest
+++ b/x11-apps/viewres/Manifest
@@ -1,7 +1,3 @@
-DIST viewres-1.0.4.tar.bz2 126186 BLAKE2B 355d1d7813f72cf2d8366fff83fbf8fcffe496ea70cd974b4a1257223b4cb056b98b131749db07f3092d8a11aceaffc7f31ca4bc1eab559babe0b8195a48ce1e SHA512 79edf987cb6232f604e31320fd6737325d2559dd6f0eaef667731b5790a709c81519b41ff5dc8f9aabb49a2a245b10584ed85c94c24ab82f466c776c182aa9f0
-DIST viewres-1.0.5.tar.bz2 134793 BLAKE2B 9dad0d6e21ddc8d927836d20b601d29c05eb9a0f7f7a4d95a8d6aab5304635c98849249dc4366c46a3ef10b01bd771c359cb8b0010f103fb7c98e45b7c064011 SHA512 fe573e9b5ae679b65eee95733cbea20c86c92089c3a2dadfe977bc9c54d1f58c5e5f4663e51a1cf206543a43592b3a3c266da1769279f08be85c66b0aa5b0f7f
 DIST viewres-1.0.6.tar.bz2 135200 BLAKE2B 96677c7c02e56be5da7f8f9d492f22cca5c6ea83a783725fd9fd86381b00062f3b83cbdb88c4030d9f0a52ccb8f06978232adb8e5f0002db06abcb7ff6d35ac9 SHA512 3f4cfc61608bc6c9b35ef66ceb473661ca01946d3306d54040d32803e8e0eec506a0ce37ea22bfe514544a6ba9645fd30f39b20c063aff696b3c0fda3fe95dff
-EBUILD viewres-1.0.4.ebuild 328 BLAKE2B 17e0a21acecc14195f538a8d096538da791851d2156d472d819ad0968f9aca89d1e79f2a55189dbbc4b2924de66a786ef575f427966a0ce92954855d34dbfda4 SHA512 36eba34a20fb8ce00d385f7b5ed29127efa24fae58e6e1b0dd1e6e63515ecfb5ab100ee65ee76cc229686a45eb36032c26f6bf76a25ead78fcec743d5bd65cfd
-EBUILD viewres-1.0.5.ebuild 328 BLAKE2B 3f318add1b75044157a55f724d667646939cdb2e2b2d689cae8ff0b64e77d79a5ce21ff9803e42b3aea786ffefc3c965511d36e493502faa275c4b2c53616850 SHA512 d63ae5b6f8f4e522728fcaadb1196ce04004bee0d8643c6fcfd203f4f1b939945a383e411078fddd6b57ecb2d101c4eb155bedb6f47e9bbc3198c9d2632ab66d
-EBUILD viewres-1.0.6.ebuild 371 BLAKE2B b7dd9017d03123ec87805a76559a786a118649420b7663d77e9c41aabfe3d96ff0c4b2ed42eb740bfd8f208426a914dc8f745979eca0fe8315619e3b1905e167 SHA512 8273ab5eb56636397282be3198ff28f7273cdaa6e5f386d33aa2174e6ce326418ae3918884e69b7b595d0aadc39fda40cdf1de581a0ef4542c4b05a82622358a
+EBUILD viewres-1.0.6.ebuild 364 BLAKE2B 811edb736029418d9d11fe2f93213cdb001f403a22e0ea7e177c54dbdb60150f9e4d25bdfee3a967f60d56320470f3a9238d646fcfe82da4fad6f93810f73c67 SHA512 c7fd23af5daa86df234f5eb177a0329c7eeb9b62db671d78295a0c0c9b8e4c5ea5ee6ab12ccf516d0ade0dad7386c40a68fd14f34a8e5f5b2cf89033c07eeb25
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/viewres/viewres-1.0.4.ebuild b/x11-apps/viewres/viewres-1.0.4.ebuild
deleted file mode 100644
index 72df6e60215c..000000000000
--- a/x11-apps/viewres/viewres-1.0.4.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="graphical class browser for Xt"
-
-KEYWORDS="amd64 arm hppa ~mips ppc ppc64 ~s390 ~sh sparc x86"
-IUSE=""
-
-RDEPEND="x11-libs/libXaw
-	x11-libs/libXt
-	x11-libs/libXmu"
-DEPEND="${RDEPEND}"
diff --git a/x11-apps/viewres/viewres-1.0.5.ebuild b/x11-apps/viewres/viewres-1.0.5.ebuild
deleted file mode 100644
index 4161830948eb..000000000000
--- a/x11-apps/viewres/viewres-1.0.5.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="graphical class browser for Xt"
-
-KEYWORDS="amd64 arm hppa ~mips ppc ppc64 ~s390 ~sh sparc x86"
-IUSE=""
-
-RDEPEND="x11-libs/libXaw
-	x11-libs/libXt
-	x11-libs/libXmu"
-DEPEND="${RDEPEND}"
diff --git a/x11-apps/viewres/viewres-1.0.6.ebuild b/x11-apps/viewres/viewres-1.0.6.ebuild
index c57a6567044d..24c0ae2fd18c 100644
--- a/x11-apps/viewres/viewres-1.0.6.ebuild
+++ b/x11-apps/viewres/viewres-1.0.6.ebuild
@@ -6,7 +6,7 @@ inherit xorg-3
 
 DESCRIPTION="graphical class browser for Xt"
 
-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/xauth/Manifest b/x11-apps/xauth/Manifest
index f53246c1221a..67a36e0bf0c5 100644
--- a/x11-apps/xauth/Manifest
+++ b/x11-apps/xauth/Manifest
@@ -1,6 +1,4 @@
-DIST xauth-1.0.10.tar.bz2 162176 BLAKE2B 0a3a70360357f0f1a36a72e54b404526e62ddabbdc8b2e6ed992ceb56847fa983b9cec1ba23aab92f4b2fe0712f097a8721d7c50a4b4ead217a5704cda76ea82 SHA512 1ddcd80848c4efffc6d0a576177f92a3ce47eb871a6c7e2097d96491aec027404d437e0bd792714ef423989153a9644f5ff179bde4dfeb4b340636d642d5849f
 DIST xauth-1.1.tar.bz2 163510 BLAKE2B 0b55ee9ec35ca436c36effe2ba4eee55f76a311a5482d1d72e80e5afea30c682de3f686b2956d17278721e190dd9bec4d93db6507853841a633c931312df745d SHA512 b6ecd59a853a491ef45bf8cfbff63bed36645f81cb79ae9d18458b57f7502bccf92f0d979d3337578518646f680ad379e67b1dac15a927cbb11372733e7a3a0c
-EBUILD xauth-1.0.10.ebuild 663 BLAKE2B 6776d89fede43d9b6d57328444c4a1ba9d261f4170cf1007c6b79af501b5c67cb46a361682a6046b23ccfed496a27f34f637f60a126fe4aad545abaf89b5d97c SHA512 0fd029a3cfe03e4a08da9147e1b856bedf8407c21299339fbd151038c5de3920c1ec305dc58ff720575e5c0e3de484fd169f3c3bf811d62c4d7ea34217e8b6f7
-EBUILD xauth-1.1.ebuild 659 BLAKE2B 2aff9ff901ca6c2cff8e73acad3a4112873774b430d4c6bad930154a07fd5b8d57f2d2b2dc28e80bd12cf8a45fb8ae82b5a6480fc0fe5f5564e9a4e52f41263e SHA512 2a2a9107b480b777bacae80da61a3c5035846f681c627547f492fc9c1117c31efa0eef99b10f32d3fd8add3d06e6965af6e6a0648234d11d6d7dd45b3c693c1f
+EBUILD xauth-1.1.ebuild 648 BLAKE2B 49ee473ea3fb2e4ba9478dc2ad075d53e8381a4f0825fa313d41ba9d9604e098c3b8fe186c1ace75a1537439d086939a108340d4aea1335fadd532d59e894f3f SHA512 c0198bfd83333b4f93ca79218d31ca16ae3cf775d1edbb4a7fd3186c6b5aacca70edda625e4d2e079adaac6d45c639e7ba8b83fdc89eff1f8e543a622910407f
 EBUILD xauth-9999.ebuild 659 BLAKE2B 2aff9ff901ca6c2cff8e73acad3a4112873774b430d4c6bad930154a07fd5b8d57f2d2b2dc28e80bd12cf8a45fb8ae82b5a6480fc0fe5f5564e9a4e52f41263e SHA512 2a2a9107b480b777bacae80da61a3c5035846f681c627547f492fc9c1117c31efa0eef99b10f32d3fd8add3d06e6965af6e6a0648234d11d6d7dd45b3c693c1f
 MISC metadata.xml 234 BLAKE2B b45f6795dbd73dfcee2a68f93ec5460509b15a69401467bc8f4af9505eeb04a2aa35a2b144eb88781df4abd4e15d2b88fc728daf033c6d646762170ffb00b1a7 SHA512 fabcd59aeede4ac93d66552746edacc44fd565551aafaca67185aff7f8e6a4c0fa21f3d54e4fccd7def948ec57b90489631bd779fb992cd9322132b0a3aa503b
diff --git a/x11-apps/xauth/xauth-1.0.10.ebuild b/x11-apps/xauth/xauth-1.0.10.ebuild
deleted file mode 100644
index 2e63754dfe7a..000000000000
--- a/x11-apps/xauth/xauth-1.0.10.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-utils xorg-2
-
-DESCRIPTION="X authority file utility"
-
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux"
-
-IUSE="ipv6 test"
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXau
-	x11-libs/libXext
-	x11-libs/libXmu"
-DEPEND="${RDEPEND}
-	test? ( dev-util/cmdtest )"
-
-src_configure() {
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable ipv6)
-	)
-	xorg-2_src_configure
-}
-
-src_test() {
-	# Address sandbox failure, bug #527574
-	addwrite /proc/self/comm
-	autotools-utils_src_test
-}
diff --git a/x11-apps/xauth/xauth-1.1.ebuild b/x11-apps/xauth/xauth-1.1.ebuild
index 057d3ed2a71e..6e6cbd340c83 100644
--- a/x11-apps/xauth/xauth-1.1.ebuild
+++ b/x11-apps/xauth/xauth-1.1.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 if [[ ${PV} == 9999* ]]; then
 	SRC_URI=""
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="X authority file utility"
diff --git a/x11-apps/xbacklight/Manifest b/x11-apps/xbacklight/Manifest
index a369abdcf242..973eeb0ec64e 100644
--- a/x11-apps/xbacklight/Manifest
+++ b/x11-apps/xbacklight/Manifest
@@ -1,7 +1,3 @@
-DIST xbacklight-1.2.1.tar.bz2 117607 BLAKE2B 286be7b9f6d0e50ba20bae86aaaa211a7d611df055e3298e8676b52c36168db67e153c13e242089db52b1c7ed2c6872dfe8dd63a7f97b81644269832276bf636 SHA512 9a0afebea2fe155ab7d1ad00ef27566daeb7dc4fd47523511f1b8e8ac30977f938a08783bc0c7443fe92ebff1c17c68c78d44db08b32768d7831128130e0637d
-DIST xbacklight-1.2.2.tar.bz2 124058 BLAKE2B 4ad7b0eaab29bada40ba6b79a538d5dbf6c584226c51004e1488733b5b33a7c3905d21cb5f275010f301241da3eb644b0e66e20a07fe271152905568008c5af7 SHA512 4dca70ef8e3494b19ea126c46395807cddc007b2b09a133810daeb77ae27fa36ac4eec7813828248fc195abe27f59700cfa58ee65ef3a020a51f73e5107678ec
 DIST xbacklight-1.2.3.tar.bz2 124611 BLAKE2B 19355773b2b2bc491cb3682d9d02fed462d30ed21742dfb9f7398ec39e85bde4fdd1b60bc8b4ac2a2d32410016186c1f1e5d45904fb19358bcc16eee69242dbf SHA512 717c87ce24634892fc4ac54fc59dcc0a5bc8f206aaf1d13410f95f7e4fe6e3dbc7ff8d951bcd8ea8c5e955357a00fea6ceadd4559e60b1a632e40f71290e12c7
-EBUILD xbacklight-1.2.1-r1.ebuild 391 BLAKE2B 6a86a10ee2660c92d9806d900f3917d4d5af23894e4f0cc1557601c6613357714217e3009cd1765fd36f18a2e7f77bcb4e267d7e517a2708b489fb370e6f192d SHA512 59a951430d29cd9babbf52e4f29da6bcde296fc6f049632e96838d325a62437b35fbac8110f611842cea3fc457964253b7f4b16d6a1961ac44054e27cb3f6386
-EBUILD xbacklight-1.2.2.ebuild 391 BLAKE2B 6db6547d52d1415f2bf6e923c138979e999c12cbd4cf9fc46fadfc42f8e716e023cd71ae5b19bc74ab90f6eedc5f3f7a0ad1cb4713ad31346ae056764dd60c32 SHA512 da962e2a5e2df95f4af8268efabf243c13e5e0506accd981e8440f00103cb25ea53540a27e96e5fbe5e442e8e418a1cfffabc4dcaedf2fda2efaf3433553196b
-EBUILD xbacklight-1.2.3.ebuild 397 BLAKE2B 24b01387619cf4b29c29e36e67affa14ad861e19c6552ee92d1d93e011f2a21bbef62c60bfef786f470e83185f26cca888b0811ff9ab4f87782b942bbc411f93 SHA512 674ced549659add030fa0eaa1a99bb3b0e29b4bbd306bb0ad0872c948980e7776ccdb25a6472afcb345e9bf0887e48323545f7945bcbe9f4c103843bc3576170
+EBUILD xbacklight-1.2.3.ebuild 388 BLAKE2B 8f12f9080103b4bfe8c6f4b06f7e9890f58e74d922d41cabfe9e030edecb9758115bd5654b266d61c03fe83013292dfed0bb53579106c63d1630bd57b5dff407 SHA512 03ed3fdedb10f22b61084dc99e41964d0ef59f8946927e9cc62e7ba46acf08e12779d74b8cd18afe6d53c9dc760e84118161ac5d15f80cb61ca3cf5b5e2dde07
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xbacklight/xbacklight-1.2.1-r1.ebuild b/x11-apps/xbacklight/xbacklight-1.2.1-r1.ebuild
deleted file mode 100644
index f16788f4e560..000000000000
--- a/x11-apps/xbacklight/xbacklight-1.2.1-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit xorg-2
-
-DESCRIPTION="Sets backlight level using the RandR 1.2 BACKLIGHT output property"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-RDEPEND="x11-libs/libxcb
-	>=x11-libs/xcb-util-0.3.8"
-DEPEND="${RDEPEND}"
diff --git a/x11-apps/xbacklight/xbacklight-1.2.2.ebuild b/x11-apps/xbacklight/xbacklight-1.2.2.ebuild
deleted file mode 100644
index 9cd8da3704a2..000000000000
--- a/x11-apps/xbacklight/xbacklight-1.2.2.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit xorg-2
-
-DESCRIPTION="Sets backlight level using the RandR 1.2 BACKLIGHT output property"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-RDEPEND="x11-libs/libxcb
-	>=x11-libs/xcb-util-0.3.8"
-DEPEND="${RDEPEND}"
diff --git a/x11-apps/xbacklight/xbacklight-1.2.3.ebuild b/x11-apps/xbacklight/xbacklight-1.2.3.ebuild
index 9808d1c4e6be..fdcb163c8a96 100644
--- a/x11-apps/xbacklight/xbacklight-1.2.3.ebuild
+++ b/x11-apps/xbacklight/xbacklight-1.2.3.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit xorg-3
 
 DESCRIPTION="Sets backlight level using the RandR 1.2 BACKLIGHT output property"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND="x11-libs/libxcb
diff --git a/x11-apps/xbiff/Manifest b/x11-apps/xbiff/Manifest
index e0a2e124a571..198b11e8409b 100644
--- a/x11-apps/xbiff/Manifest
+++ b/x11-apps/xbiff/Manifest
@@ -1,5 +1,3 @@
-DIST xbiff-1.0.3.tar.bz2 116043 BLAKE2B 9ed9c77e8017e36170087a5d45bc1b68383b9cb0b32c8a951050ee00bf6ccbffc868626e8c362fec5ed28c6c4a5a06010d9a975b45b51300bfbc27a9112edfc8 SHA512 e9fa72817cae5fd6c052a4a59fcd6c696ae9d3f5fd8eecb0e9b0d8994258201cf5f4ae99845dd03e3da56e378eb214658e4450c9291a29399d9ece8af3b9f9e9
 DIST xbiff-1.0.4.tar.bz2 133455 BLAKE2B ce79afefbd394b32fd543b64e966276cddc551bfacdf25e80a3463e65eb538469e252d105aeddb60a16227c30a5abfa996af89718d77e075f85b70d71e45710f SHA512 0fb920a08640ec59f23d8a8a47bd244565dfbaff7a21c38a8a2abe1edb5eacabc970b5dbdc409163fc444fde5b75a2dc4e0114312938efec5b77228f3bf785ac
-EBUILD xbiff-1.0.3.ebuild 352 BLAKE2B 61a8f2b1e6372a40adc9937cde744df9b31a6d764ffe265ed08b3b00dd03cb7662e164f4ded0d8be745a7f2be00cd27a020cffc3e629f43f44aeb342e3b63e94 SHA512 f3589db90e311ab020cda6858b6e258ae26fbb4779dd5dee1cee054c386e9c272a9075369eef8c4de3e251269eb5ccc07663b10a58e4c955d63e08a9c5a3a7b4
-EBUILD xbiff-1.0.4.ebuild 379 BLAKE2B 967754b73f8c54637e4673b40955c50023f32db32f6adcad6b79f4eb95afd9f8489c3d6047a74ad6d5d59bd02bfe602d7fd1ac0a3a6bde9bb82e139b43eec990 SHA512 9defd3bdeeb03d3e4d9b0c4c2fed276622c32d77e1049dee9b36a30ea3ab800ef7ffb89edb7f78750682eefa2d9bcd70e5b98a3036ce2748ea7348fca84951fa
+EBUILD xbiff-1.0.4.ebuild 371 BLAKE2B 2606386f5514d2b3420d8aef51ec0f123c53572d87510db62eeceb4192f6ca7d4c9549f83ce24106a3129d5debcad42ed48c68e4ae1d281eb1d1a62d34a7a217 SHA512 51f6f0b8cef8b354c2d73bca94e067eef81aa3ce97f90f8cbcabdc2a0433f0c86cffe264ef241a523daefe0f306ff1333ef4c6f8120104780e358f500ff72873
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xbiff/xbiff-1.0.3.ebuild b/x11-apps/xbiff/xbiff-1.0.3.ebuild
deleted file mode 100644
index cad12b2223e5..000000000000
--- a/x11-apps/xbiff/xbiff-1.0.3.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit xorg-2
-
-DESCRIPTION="mailbox flag for X"
-
-KEYWORDS="amd64 arm hppa ~mips ppc ppc64 s390 sh sparc x86"
-IUSE=""
-
-RDEPEND="x11-libs/libXaw
-	x11-libs/libXmu
-	x11-libs/libX11
-	x11-misc/xbitmaps
-	x11-libs/libXext"
-DEPEND="${RDEPEND}"
diff --git a/x11-apps/xbiff/xbiff-1.0.4.ebuild b/x11-apps/xbiff/xbiff-1.0.4.ebuild
index 11f26b5a5b5a..1af59d9a8791 100644
--- a/x11-apps/xbiff/xbiff-1.0.4.ebuild
+++ b/x11-apps/xbiff/xbiff-1.0.4.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
 
 DESCRIPTION="mailbox flag for X"
 
-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/xclock/Manifest b/x11-apps/xclock/Manifest
index c95745a228dc..de9cb65de9a3 100644
--- a/x11-apps/xclock/Manifest
+++ b/x11-apps/xclock/Manifest
@@ -1,5 +1,3 @@
-DIST xclock-1.0.8.tar.bz2 172030 BLAKE2B aced446898a2cc181a0e57260841f194f67dc0fad42fdb6371e2bdd8d11dfb0418d9cbf4e3e51a4df21f2646c74ca5ee2887bfbbc62571cbc84b551f3793396f SHA512 1272221ace3657505bae1b22f181e9ecbf1710900c89a860c8ceae47ae31ca5e75b6557c37dc0a881a0a24c9597b9a07f46200926feb1013f1e2e995111a7646
 DIST xclock-1.0.9.tar.bz2 175372 BLAKE2B 6e19535a357f1ed162de1ae5c403cfde6be03a3be6bebd8b338472473c8da71e00a3e6c52e7b43315735bc41345490a6dacf1b934458d4c11fec09072e2f9b00 SHA512 fcbac0b4ab1cea4ae0751ce1c0c6302048e5d98d459873c7580e4ca786ec49fa27f73e5831bdfe135abb5cfeabe886456276e9d01351ea7905c606f40f84522d
-EBUILD xclock-1.0.8.ebuild 482 BLAKE2B 8a74e968a1f0b8862b8a60bde09d7722e2b294e4b9c86663e8db7b43117b069e45787c29c34c10a4970580b7261b6aa0cfbd192c032f6057d7955a41c4bb71f7 SHA512 735ca867e2e1ab76979264cf59595e29d8742b72c5b2447d18b427709abacb76d16af36b5407b2b52d82fd06ee5942ccb5451161c084e179064ade6a4f0512ce
-EBUILD xclock-1.0.9.ebuild 514 BLAKE2B a4967984408eb917a9ab113053071ea68ba52206a75844489341afc344987e3d2b3fb15606902c13642e2987cb1075d2b182344b03de49f0557b80b42dc43b0b SHA512 d4dbc09ef16fdde35edb6aefc16859d9022a20dec72f4821c648fa6df05bd05cc386ebdff5510f013b3162487ffd147499c71bcc1c8f32245cf3cff29ca21183
+EBUILD xclock-1.0.9.ebuild 503 BLAKE2B 35e749d14372266c140ccafa1ee88a19267ce43f6d3165f4efaf757822072b4e90e7e15c49be63c71696f3b30004f9f4131402db51c4f8a46b0746829e02326a SHA512 0e6b4f414fdd6a140619be85cea547b959a2deb4c14ed0d490b700c69eeb522be7365c400f4350331f76fdcccb870d5951513ed505f15b1e8114c7f8dac70642
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xclock/xclock-1.0.8.ebuild b/x11-apps/xclock/xclock-1.0.8.ebuild
deleted file mode 100644
index 7635ebf90bb5..000000000000
--- a/x11-apps/xclock/xclock-1.0.8.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xorg-3
-
-DESCRIPTION="analog / digital clock for X"
-
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~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.9.ebuild b/x11-apps/xclock/xclock-1.0.9.ebuild
index fc3b9ac18cc5..6c4e1aac1fc6 100644
--- a/x11-apps/xclock/xclock-1.0.9.ebuild
+++ b/x11-apps/xclock/xclock-1.0.9.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/xinput/Manifest b/x11-apps/xinput/Manifest
index efc214bb4f80..b568ae634129 100644
--- a/x11-apps/xinput/Manifest
+++ b/x11-apps/xinput/Manifest
@@ -1,7 +1,3 @@
-DIST xinput-1.6.1.tar.bz2 152587 BLAKE2B 7c60a40d35b1eed9da72524d4415c9cfe4a0a0a9a5152b46123972cfdb9a3874f5e333d4ae43dae3a11e1af970d8ba309467f0457221072c2acd0d6530d40266 SHA512 b7770152837ee1f1d44e2737c0955d021441c4a8896edd63a6de896624315f1dc8c0391ce3ef23551ff584b0ed549103ae436bbfcab26f97cfc9f6dfb156f22a
-DIST xinput-1.6.2.tar.bz2 158061 BLAKE2B ed9c8ab412979353ecd6a63575b57238ce37fe76da7b0104fce0576b6736a7a521998225ec4c39e117b97d420f4d0c63662c019011b4e54400b7475ed44ec6e3 SHA512 dbef3a87dd47bb8c593f1305bea7978697a12434a4992584e4124d745bb366812366b44fc205159137a3db6f7b8338effd1b90641a194497b19159b9fd91939e
 DIST xinput-1.6.3.tar.bz2 162556 BLAKE2B be5e16301c6a48999ccce5ec3062afb195eb1a6357f09aea41e88a4ea43c4497b8377a3da8d5c80b059afb9998370a7a53561a92c04ff8f56fa5749d577b0144 SHA512 cb2fef866ac5a71dbca3e23b4ecadaca38e65dc1b30f8bb024bad92486554fafc472706619a1af04c746a4f53ce6aea827d694b9f4f0c7d0d46bb1da81984076
-EBUILD xinput-1.6.1.ebuild 444 BLAKE2B 5a3273613af4369bedbe08537adc991826dbc23abb4aeb710642356cac135057c3f7e87c0b9f4e96e751888e2beb83ab122ab60d6d291c1fc8382f59c8378e99 SHA512 e3a6345718f64f2a8424609a8060dc5b5d9569f629039af811e08297a22fa5fa57795a34ee16cb4248c9801d7ac913689c6cbc275139ce5649453ec900a37c32
-EBUILD xinput-1.6.2.ebuild 451 BLAKE2B 9d2eec956143579a5a8f62b396b26e75fafdb05294835aacb44d0da6c67b26af4771f8855765bcdb9a10da824d5edcd4f697a623499755d552876bc6bb1c6ddd SHA512 69292f98d2f26dcc4440b7165b173a066843e26528fcac3d6ecf70f2d6dc3368863e4d0d1a4ae68caa03617ed3394cb06132c0d553d7e556872e55839b461778
-EBUILD xinput-1.6.3.ebuild 458 BLAKE2B 7fe40f6c70132ffd4f1da73acdfc73da9bdc5c7001d9da795fd669397984a244ec3f1d330967bb0f7dc1989f220c993f8684dc9cda87540f9c851f57bc6a0769 SHA512 d66173cfe3c69436ae1ac1fc3c8f3b31b4f381fa30a9b9434ecc68db6809d39558e1e7fb31bf415906f89f1d76121871c0bcc842cdedc40f4f6211ace9dc4784
+EBUILD xinput-1.6.3.ebuild 449 BLAKE2B bb26c5fa5887549c4dd9f2cb973b7a33eb4a5cea84e9a1fdb2a437660d511952a3b2f6f03184613707b5179607aa871eafc54bbe676c0c0495c9b68c9f14f2fd SHA512 03beb819edcd50acf307e466115b08c562dcd9403ced186451d0312ff0c3c1d6d43565100474ee6b3803533c5f14a9956c15a0002df2dbccecbf7fc78e3bf2aa
 MISC metadata.xml 315 BLAKE2B 29713769214403192ffd5937d2585eb204044d95976ff4836b1cd94406420c6c15d1df6efe7da1dd1afd7f3e950e025994dfd13e4e8fc70cd521e24ca63cbdbd SHA512 d2d36e4e38b384daa8555a0824dc7fcd364b9a61350a31a7c25f7d24e42901e0386606a8410800e7ca6efac8b49c11b805b76bd27f1510f3dd89ba91a0856400
diff --git a/x11-apps/xinput/xinput-1.6.1.ebuild b/x11-apps/xinput/xinput-1.6.1.ebuild
deleted file mode 100644
index 3b30c64ba019..000000000000
--- a/x11-apps/xinput/xinput-1.6.1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit xorg-2
-
-DESCRIPTION="Utility to set XInput device parameters"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=x11-libs/libX11-1.3
-	x11-libs/libXext
-	>=x11-libs/libXi-1.5.99.1
-	x11-libs/libXinerama
-	x11-libs/libXrandr"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
diff --git a/x11-apps/xinput/xinput-1.6.2.ebuild b/x11-apps/xinput/xinput-1.6.2.ebuild
deleted file mode 100644
index 4e7ffe27b9ae..000000000000
--- a/x11-apps/xinput/xinput-1.6.2.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit xorg-2
-
-DESCRIPTION="Utility to set XInput device parameters"
-
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=x11-libs/libX11-1.3
-	x11-libs/libXext
-	>=x11-libs/libXi-1.5.99.1
-	x11-libs/libXinerama
-	x11-libs/libXrandr"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
diff --git a/x11-apps/xinput/xinput-1.6.3.ebuild b/x11-apps/xinput/xinput-1.6.3.ebuild
index 18120e2eb327..7e8a35fd7137 100644
--- a/x11-apps/xinput/xinput-1.6.3.ebuild
+++ b/x11-apps/xinput/xinput-1.6.3.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
 
 DESCRIPTION="Utility to set XInput device parameters"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=x11-libs/libX11-1.3
diff --git a/x11-apps/xinput_calibrator/Manifest b/x11-apps/xinput_calibrator/Manifest
index 2a4a8f6fc57d..08775f62d0a1 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 720 BLAKE2B f436a1998daafe55b55253193535f0733e2bacaae9a7eb840111b9285f4d227c8daa4d577334e2d8592e2f8db3c74141d1f6e91d43b0f9fb1179e5e83b459339 SHA512 ba481779b5fb68fc88331af01fceb4017ef4716bb6f99a1f319bbc8d4bdd6d08b8d96279fff7657026f7bda1802d0ec8d723e94348b6b62986a3535854f68ec5
+EBUILD xinput_calibrator-0.7.5-r1.ebuild 733 BLAKE2B 843320ced66cf3883d4eaca06b851a144936ad9f0b8381c7c78cd46ce8ed18ebc59aeaccd4e421cc7a964134081640ec09d29300120d7599f18d9cac8a66a037 SHA512 00a9130509313ecc73171f18ef6aec5ec5ddef785794e644b44c66d5d8b9d4d9391759f938530d6f7a9fadc7e9c481e7b85546db289716d527551e109bea1810
 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-r1.ebuild
index d4b7027c807f..a2641d8d82db 100644
--- a/x11-apps/xinput_calibrator/xinput_calibrator-0.7.5-r1.ebuild
+++ b/x11-apps/xinput_calibrator/xinput_calibrator-0.7.5-r1.ebuild
@@ -6,7 +6,7 @@ inherit autotools-utils flag-o-matic
 
 DESCRIPTION="A generic touchscreen calibration program for X.Org"
 HOMEPAGE="https://www.freedesktop.org/wiki/Software/xinput_calibrator"
-SRC_URI="mirror://github/tias/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/downloads/tias/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/x11-apps/xman/Manifest b/x11-apps/xman/Manifest
index 7ba80f1059ff..a1f5de6e3111 100644
--- a/x11-apps/xman/Manifest
+++ b/x11-apps/xman/Manifest
@@ -1,6 +1,3 @@
-AUX xman-1.1.3-mandb-2.7.patch 1843 BLAKE2B 471ec7f63c69e4bb4febbe49bbde9164b579371168caa763a6af58d71c65e248e6d58531d7dc1d50cd0d3240b881b2cd94fb22e1aeb6a0978a1c1578024b034a SHA512 74d4467ea8a2904cc4adfa02a92d57020ec045bc72ca1571451511080227a9031c0e5fb0d7b97c8a6625755f611a4bf4a352a751f420da18985a86289d0a0f5f
-DIST xman-1.1.4.tar.bz2 188259 BLAKE2B 3be982bfc9cad53b47dfe87e85d2fdafca4d0e9336c05eaf80665a79a1c420941226da9a3acfbdf7eb7c9d299085d78cb392d67c6859e28f07a304c6f935931b SHA512 785e973eb15b0300de08aace24f3604dfee61421c7f64ea4cde2e280480bf5d3ad797ab8208668dc023a375494f8db7534fbcaa1c1ef16e79464fdd017b5da68
 DIST xman-1.1.5.tar.bz2 193676 BLAKE2B b49e78b0127844e2ee8c0343392af940e592ee6958b4f1af217696da9ab1cd880331dec2af2f7eb5084cf44d40a041c730f571e5fb476e74924552e1316614ae SHA512 f6b2be424a79f298bf1a81edce4172572195c9efc9454e5b7b7046f344ed08154c77ccaa763ccdf3f1a30b64aa4802783bf813ee637437ccb1fba434fc5d4400
-EBUILD xman-1.1.4-r1.ebuild 435 BLAKE2B d16cfc7ddcba89dc732158918b8c10108f2b43a68bbd745040587204f1930b305a6695f3fc20b1ef6dc4eab5b20e0bf5b95231a7977ea27ece64ba21b4c56b3b SHA512 8dd3c27aea8b18973a8b595e0f004497d55f23241e0f4c1f1b728c71b33d95009bbca969e0539c3e600c9fdfe23d104e80a523a78745c8326ba489823eeeb228
-EBUILD xman-1.1.5.ebuild 387 BLAKE2B ec60dac4eaea49c45e47607269d67709342b71d4e9701b65e22634a596e242c0464bda62f5286c15e346b311cf6ce86d95e97eeff92adb3920e53b2384edfa6a SHA512 06240cf317a47ff3cfa22f27f3896e2feeca550d148476d27ff1343a8c392bae4aa37d5b65841888fb757e5f8e601a76727bebef006cbae60420f6f15faebed7
+EBUILD xman-1.1.5.ebuild 378 BLAKE2B ef1754258c86c0d1475954decfcc3ab9e7d85c09df4adeb9bc882d7d07791d8e9a05e7981504dd6398c7660316045dbe76d1209fb51371c285b658749e3e0d68 SHA512 af1561cfb362fdeb463222cec0a3cd6fe3f5510ee31808d7e6047aca521ca371fb63a534e5930bbb1e7b4f37ebc302267e810172c7af8270944a95f47ee55ce2
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xman/files/xman-1.1.3-mandb-2.7.patch b/x11-apps/xman/files/xman-1.1.3-mandb-2.7.patch
deleted file mode 100644
index f42ce577c2be..000000000000
--- a/x11-apps/xman/files/xman-1.1.3-mandb-2.7.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 438763b6e231410b95b5e352feb65c63cd54de6a Mon Sep 17 00:00:00 2001
-From: Julien Cristau <jcristau@debian.org>
-Date: Fri, 7 Nov 2014 16:19:57 +0000
-Subject: [PATCH] If we have man-db, don't try and emulate man's pipeline
-
-Just let man itself do the formatting / zsoelim / ... dance.
-
-Debian bug#764792 <https://bugs.debian.org/764792>
-
-Signed-off-by: Julien Cristau <jcristau@debian.org>
----
- xman/configure.ac | 5 +++++
- xman/misc.c       | 8 ++++++++
- 2 files changed, 13 insertions(+)
-
-diff --git a/xman/configure.ac b/xman/configure.ac
-index 9a80cbb..8bb44f2 100644
---- a/xman/configure.ac
-+++ b/xman/configure.ac
-@@ -44,6 +44,11 @@ if test "x$GROFF" = "xfound" ; then
-    AC_DEFINE([HAS_GROFF], 1, [Define to 1 if you have the groff package.])
- fi
- 
-+AC_CHECK_PROG([MANDB], [mandb], [yes], [no])
-+if test x"$MANDB" = xyes; then
-+	AC_DEFINE([HAVE_MANDB], 1, [Define if the man implementation is man-db])
-+fi
-+
- AC_CHECK_FUNCS([mkstemp])
- 
- AC_ARG_WITH(helpdir,
-diff --git a/xman/misc.c b/xman/misc.c
-index 06891cd..da8744a 100644
---- a/xman/misc.c
-+++ b/xman/misc.c
-@@ -661,6 +661,13 @@ static Boolean
- ConstructCommand(char *cmdbuf, const char *path,
-                  const char *filename, const char *tempfile)
- {
-+#ifdef HAVE_MANDB
-+    int used = snprintf(cmdbuf, BUFSIZ, "man -l %s > %s 2>/dev/null",
-+                        filename, tempfile);
-+    if (used >= BUFSIZ - 1)
-+	return FALSE;
-+    return TRUE;
-+#else
-     /* The original code did the following to produce a command line:
-      *   sprintf(cmdbuf,"cd %s ; %s %s %s > %s %s", path, TBL,
-      *      filename, FORMAT, man_globals->tempfile, "2> /dev/null");
-@@ -783,6 +790,7 @@ ConstructCommand(char *cmdbuf, const char *path,
-         return (FALSE);
- 
-     return (TRUE);
-+#endif /* man-db */
- }
- #endif                          /* HANDLE_ROFFSEQ */
- 
--- 
-2.1.1
-
diff --git a/x11-apps/xman/xman-1.1.4-r1.ebuild b/x11-apps/xman/xman-1.1.4-r1.ebuild
deleted file mode 100644
index e4fd534b0ac9..000000000000
--- a/x11-apps/xman/xman-1.1.4-r1.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
-XORG_EAUTORECONF=yes
-inherit xorg-2
-
-DESCRIPTION="Manual page display program for the X Window System"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
-IUSE=""
-
-DEPEND="x11-libs/libXaw
-	x11-libs/libXt
-	x11-libs/libXmu"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.1.3-mandb-2.7.patch
-)
diff --git a/x11-apps/xman/xman-1.1.5.ebuild b/x11-apps/xman/xman-1.1.5.ebuild
index 699bcab04ade..1187ae3c09ca 100644
--- a/x11-apps/xman/xman-1.1.5.ebuild
+++ b/x11-apps/xman/xman-1.1.5.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
 
 DESCRIPTION="Manual page display program for the X Window System"
 
-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/libXaw
diff --git a/x11-apps/xrandr/Manifest b/x11-apps/xrandr/Manifest
index 3df72c6d269b..5a440c30a48a 100644
--- a/x11-apps/xrandr/Manifest
+++ b/x11-apps/xrandr/Manifest
@@ -1,7 +1,3 @@
-DIST xrandr-1.4.3.tar.bz2 169850 BLAKE2B a9a978442bf19997ca2e49fc82bdae418d096c140d8988567327422b3a754de138e9fda54e5ad7ca326563125075209522e08c941f7980aa9cc2d1bee439471d SHA512 eea2637484e744af305366606ec8fba77f54bb66bf45bd131367abb0f5ff90b858d85fbe4c17ee48f7b2f32f277d5f08b18e9cd61f147757828d415a3db9b9bc
-DIST xrandr-1.5.0.tar.bz2 182515 BLAKE2B ef33b454e9a1e678fc54dbd6c7730217a2c3e995ec3245ce01f90c27e5c2454a1bbc2cffb953420a20ec0a4b58cf5662964c998b3fb3748cb73c4b5dbb3f29f4 SHA512 11d8fb1b98fbe215555d5bb875d82f80a7fd6a61c93ebf175c226f4f747570e8d18980add54a4b88d20dc637155074b2a558b34f035d66a465f324281d65f9e4
 DIST xrandr-1.5.1.tar.xz 171200 BLAKE2B 69cc080da24b8d00fcf60e9fb2d4c03d7b80b46d18888fa726ad4ba5847fcfcea4abeefa298fb833febe0549aec0636ed9087c8ef065f5166df6bd7f270dac1a SHA512 3d0d37e974b9dffb996276ee7fd676327fd0956e5f5f572dd142a651a35d3cdfa2f6dd415cf27bf87f306981957aba4cc014c12baebefcabaa5d66b78a114922
-EBUILD xrandr-1.4.3.ebuild 506 BLAKE2B b83e42dd02df46f02698dba5d0b8a7d087e5a2b87eb1b177c6a350b696ab0d37d88f7e1f58f3dd6b20d66e52fb39c14d9e9f7c41c3ff0ed429d00f3a22daf5b5 SHA512 0c75cabf93cb74541f525da1f35352e86162ddb6bf071662296edde899c90a99929649eb551e088cff313c0b23a7958db51422be9658b900f892400c0683649a
-EBUILD xrandr-1.5.0.ebuild 506 BLAKE2B 9914ec26859a067a2edd0fe872950399fba0842529a1a8f14e53a9e96348068bca2de17603c43554bb7e7319a9862ec17f4613e0a4204e779a19b016066b0fc2 SHA512 52dc6ac00846205679ebc39a3a38f37e389723722c8db315ff3ebce1c5f49bf0a915b981e86735032844408ac94730f59bbefefd474793076998672600d51555
-EBUILD xrandr-1.5.1.ebuild 558 BLAKE2B f577dfcdd94264c649a87f1f338d22e56a8ba133461d02969a25722922d1e48421903576ba326c18357b04fb3a17368d0c8bc419a437e82a4699c3e0612439ec SHA512 67b837ed35fdf57e8a25b7dbba95c24f40f1c87c476ee099776b95ccdeee07d62ecaefea4ae2f3cc0e3f10bbe05ec13fc7f59ef771c4f142624e3ec470011057
+EBUILD xrandr-1.5.1.ebuild 549 BLAKE2B 67a31487d1b51a26ebe847cb691dfba4c69128f1a12cc4f9d30eaa82c5424167fe8614b2747adb7d274651fce7c08f90eadaa39e7a0aab19060e47bcf06d562c SHA512 5e2d35d58b64ad10443df22f3e6e084cedb78dfda824e4d9738bd2c9e1efd84b5e43d54d7f756f9d3bcf3a183bde917607c72f8dbb6283cbb13f93ca03ee0933
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xrandr/xrandr-1.4.3.ebuild b/x11-apps/xrandr/xrandr-1.4.3.ebuild
deleted file mode 100644
index 700d8c76f844..000000000000
--- a/x11-apps/xrandr/xrandr-1.4.3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit xorg-2
-
-DESCRIPTION="primitive command line interface to RandR extension"
-
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=x11-libs/libXrandr-1.4
-	x11-libs/libXrender
-	x11-libs/libX11"
-DEPEND="${RDEPEND}"
-
-src_install() {
-	xorg-2_src_install
-	rm -f "${ED}"/usr/bin/xkeystone || die
-}
diff --git a/x11-apps/xrandr/xrandr-1.5.0.ebuild b/x11-apps/xrandr/xrandr-1.5.0.ebuild
deleted file mode 100644
index c7fd9162db87..000000000000
--- a/x11-apps/xrandr/xrandr-1.5.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit xorg-2
-
-DESCRIPTION="primitive command line interface to RandR extension"
-
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=x11-libs/libXrandr-1.5
-	x11-libs/libXrender
-	x11-libs/libX11"
-DEPEND="${RDEPEND}"
-
-src_install() {
-	xorg-2_src_install
-	rm -f "${ED}"/usr/bin/xkeystone || die
-}
diff --git a/x11-apps/xrandr/xrandr-1.5.1.ebuild b/x11-apps/xrandr/xrandr-1.5.1.ebuild
index 691fe06f7697..99b7773b1e7b 100644
--- a/x11-apps/xrandr/xrandr-1.5.1.ebuild
+++ b/x11-apps/xrandr/xrandr-1.5.1.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="primitive command line interface to RandR extension"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=x11-libs/libXrandr-1.5
diff --git a/x11-apps/xwininfo/Manifest b/x11-apps/xwininfo/Manifest
index 2329d97a9e22..2ac38980dd68 100644
--- a/x11-apps/xwininfo/Manifest
+++ b/x11-apps/xwininfo/Manifest
@@ -1,7 +1,3 @@
-DIST xwininfo-1.1.3.tar.bz2 157512 BLAKE2B eba1f98cf8aa8afc68a5bc0f538e1e0588a38bd0022ba0a2bf6da7e2cbcd4459111aed37f88b8d46054f8c3e52e435d0c95a8f7c9b1247580dde812a3bd3715c SHA512 b4c3c72de157d33e309694be96dcafabb3240c1883fb3caf44843cba8b90fe09496eb4ab061eba9107115d76ca59a8ec660e11ff968e422ab35cd5e1749ca466
-DIST xwininfo-1.1.4.tar.bz2 169159 BLAKE2B 4bdf7321eba8e2cd078c3220e3135ca1b044461ab90b8daa350beed1feb53f02dd9dd4c1192be6dd6b9ef2a9dc028c4a9c464f3124590e6195aca7547ed61830 SHA512 d3ab103a0a311e08d1eabc4346750c21eb7d2fbcdc27cab0989a2624b9cd488911614fcf9832603353450114b1231a8f8262cab16e090a0d458d83ec7b6b959b
 DIST xwininfo-1.1.5.tar.bz2 172496 BLAKE2B ad657a96b74190981ecd2d946d1b81fcd0515a481f0d6d880d790b8e1eb4bf7e85bdd9a74b631acb88c2254839afde7f6ee79647af66c357c8ef4199aac51f02 SHA512 a3268bbeeeeafac94e589fdd47554a965910d40df7cc3d9c36c7c24fa4f5dd49615484d5916ccb41efca9cd4cf9d8981a4c60953b921220b3f4f57f9cce0e1a6
-EBUILD xwininfo-1.1.3.ebuild 735 BLAKE2B 25d7e78b415715c25ad7c723963e1ca45b65e13a179e2bb771516aa89449cc74b6ba9231c5b3f82274c3a7e2cf31565045188a347c0cb1daae4f26aa756499a2 SHA512 0ed87c6355c120b111322aa15c97231cb210d73255734389e9769f0c4a6efb4d15c8d03308a865e6725b6e762ceff0630026ebff9b26134c1782be7feb2d4a2b
-EBUILD xwininfo-1.1.4.ebuild 735 BLAKE2B 25d7e78b415715c25ad7c723963e1ca45b65e13a179e2bb771516aa89449cc74b6ba9231c5b3f82274c3a7e2cf31565045188a347c0cb1daae4f26aa756499a2 SHA512 0ed87c6355c120b111322aa15c97231cb210d73255734389e9769f0c4a6efb4d15c8d03308a865e6725b6e762ceff0630026ebff9b26134c1782be7feb2d4a2b
-EBUILD xwininfo-1.1.5.ebuild 448 BLAKE2B c99ba915cf5f8360aad600bff8fdf2902b9583093d43495ee96e9387ae04f530a9a25f544975cb9be0ac79653f0e5e76070370dda6f2d826866b4303fb796ca1 SHA512 71d03ae438ad0d987d2e1a8b4a7d5354037e48d56ff65874b9965ee3cd1a67f8052be236a674d62e02c4660cb613b5eb397ef032f69daa5edf3aaea3788da605
+EBUILD xwininfo-1.1.5.ebuild 439 BLAKE2B 531a547c4c2b73226bfec765bb4599d4d74c7ff630b2f2fec4f0ac175e6e958780de9fa049e9dc42ce2504194eaa791ab53ca44bec600e734217531f15a66d18 SHA512 88b14b787a0fe541419add76ecdbe37bb4e507bc5419424736fe66da428dc4e30017dfd20228d08bf969819f8b736f162daf7318ed650b593042027eedeb9f7f
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xwininfo/xwininfo-1.1.3.ebuild b/x11-apps/xwininfo/xwininfo-1.1.3.ebuild
deleted file mode 100644
index 251eb77838dc..000000000000
--- a/x11-apps/xwininfo/xwininfo-1.1.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit xorg-2 flag-o-matic
-
-DESCRIPTION="window information utility for X"
-
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE=""
-
-RDEPEND=">=x11-libs/libxcb-1.6"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-	x11-libs/libX11"
-
-pkg_setup() {
-	# interix has a _very_ old iconv in libc, however, including
-	# iconv.h redefines those symbols to libiconv_*, which then
-	# are unresolved, as the configure check is old and dumb.
-	[[ ${CHOST} == *-interix* || ${CHOST} == *-solaris* ]] &&
-		append-libs -liconv
-}
diff --git a/x11-apps/xwininfo/xwininfo-1.1.4.ebuild b/x11-apps/xwininfo/xwininfo-1.1.4.ebuild
deleted file mode 100644
index 251eb77838dc..000000000000
--- a/x11-apps/xwininfo/xwininfo-1.1.4.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit xorg-2 flag-o-matic
-
-DESCRIPTION="window information utility for X"
-
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE=""
-
-RDEPEND=">=x11-libs/libxcb-1.6"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-	x11-libs/libX11"
-
-pkg_setup() {
-	# interix has a _very_ old iconv in libc, however, including
-	# iconv.h redefines those symbols to libiconv_*, which then
-	# are unresolved, as the configure check is old and dumb.
-	[[ ${CHOST} == *-interix* || ${CHOST} == *-solaris* ]] &&
-		append-libs -liconv
-}
diff --git a/x11-apps/xwininfo/xwininfo-1.1.5.ebuild b/x11-apps/xwininfo/xwininfo-1.1.5.ebuild
index 6011d84ec039..d6059be4256c 100644
--- a/x11-apps/xwininfo/xwininfo-1.1.5.ebuild
+++ b/x11-apps/xwininfo/xwininfo-1.1.5.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
 
 DESCRIPTION="window information utility for X"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND=">=x11-libs/libxcb-1.6"