8 files changed, 6 insertions, 22 deletions
diff --git a/x11-apps/Manifest.gz b/x11-apps/Manifest.gz
index 86560d4832ac..65acadba1073 100644
--- a/x11-apps/Manifest.gz
+++ b/x11-apps/Manifest.gz
diff --git a/x11-apps/fonttosfnt/Manifest b/x11-apps/fonttosfnt/Manifest
index f96ecaf09b6a..6da2642f30ce 100644
--- a/x11-apps/fonttosfnt/Manifest
+++ b/x11-apps/fonttosfnt/Manifest
@@ -1,7 +1,5 @@
-DIST fonttosfnt-1.1.0.tar.bz2 143545 BLAKE2B fd05a19ffc50306b747bbbc6ea692b6667c7ddd185feb31a21173cbf571e5c74ded0da8af305e3744d8db57eca909d271b153bfded2182e060d922e42395942d SHA512 f4fb9814c23bfd6f83771959444d2c37eb4ba32edee43c37cf21f0181be80c6e278307641b0f4dae4ee5d10db3289e95194f99757ea4bbca343fff15498e7173
 DIST fonttosfnt-1.2.0.tar.bz2 145904 BLAKE2B b9b25076126dbd412d69f4c9698f937009f620b55a06f8c55b621add2ed6d638e0b91d3e716ed276089986c1a0140e2bf7aadef021c21ac24ac23c3347ee081c SHA512 a360bd8535beaef89afa6c0678a40f7c554e9d631e0fcb80bb1363ab72288e27a5e106521610f61c95b8101f79c7f02492a2068411b5f5b695de780d8a1c1b25
 DIST fonttosfnt-1.2.1.tar.bz2 146512 BLAKE2B 54b92f586248978f56b1b114a1ec02b19f7c871fed0c0f91c2e8064933d990f2b44f0163fa59f04f82b992a40be47e391eeeeae60a490412e361af9f10c445f9 SHA512 3d4ece61e31d4a5ed56923ecc1883e80a9308d2062d37345cb5be081bc2b004aadebf99a989601749a63e03eb641e0522d07773a57bca0b4710ed453e4f20742
-EBUILD fonttosfnt-1.1.0.ebuild 356 BLAKE2B e9d3f967a9627ddc95c971f99db33075a699b03340351821fba43022a81c0825a5831d45d1210c5c51be69ed4c5176ec193db214f50e1875d3f78b2bdbc271a5 SHA512 e43910fc1d262e11e982663ed0ae8284890f0aa3a2b441702b9263619ef575732176154860452cbd009c15330366a4ee877ea16508c2a1d5a02f5fc7dc85db23
-EBUILD fonttosfnt-1.2.0.ebuild 358 BLAKE2B c3f547e0e284a87029fddc207b80a13181074940b647a8fc6ad4108ac55bd2d6043b325b850161b4611a8d6ef477255faef84dc9ae65d0ebb0d3fb296322dc5d SHA512 9de004a4f95fc35e9043c3451eb0367c594a9c3e6b831001e562ba8bab234dad72c8fc319771aae7366eea03f37ad1fdbabc0e76ea5ca1c08f790c52f479271a
+EBUILD fonttosfnt-1.2.0.ebuild 356 BLAKE2B e9d3f967a9627ddc95c971f99db33075a699b03340351821fba43022a81c0825a5831d45d1210c5c51be69ed4c5176ec193db214f50e1875d3f78b2bdbc271a5 SHA512 e43910fc1d262e11e982663ed0ae8284890f0aa3a2b441702b9263619ef575732176154860452cbd009c15330366a4ee877ea16508c2a1d5a02f5fc7dc85db23
 EBUILD fonttosfnt-1.2.1.ebuild 362 BLAKE2B 363996341db75c2778adb14b3aa20b6d4d012d1c337abe37c43e39668d7529973f5efae274b70b668b94ae83e8ef0f96071491cb9b58097858b2bb05a86cece3 SHA512 b7a5ab5a621a374a92da2e0a838c282e2619c07ef3bb1551e856ddee91b9fbb8e2f82ee91a22c044916162a50df2e834b57f46bb4642b2a702cb91e2b95ab005
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/fonttosfnt/fonttosfnt-1.1.0.ebuild b/x11-apps/fonttosfnt/fonttosfnt-1.1.0.ebuild
deleted file mode 100644
index fe76754ea072..000000000000
--- a/x11-apps/fonttosfnt/fonttosfnt-1.1.0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit xorg-3
-
-DESCRIPTION="X.Org fonttosfnt application"
-KEYWORDS="amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
-IUSE=""
-RDEPEND="media-libs/freetype:2
-	x11-libs/libX11
-	x11-libs/libfontenc"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
diff --git a/x11-apps/fonttosfnt/fonttosfnt-1.2.0.ebuild b/x11-apps/fonttosfnt/fonttosfnt-1.2.0.ebuild
index c4ed3fc5e68e..fe76754ea072 100644
--- a/x11-apps/fonttosfnt/fonttosfnt-1.2.0.ebuild
+++ b/x11-apps/fonttosfnt/fonttosfnt-1.2.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 inherit xorg-3
 
 DESCRIPTION="X.Org fonttosfnt application"
-KEYWORDS="amd64 arm ~arm64 ~ia64 ~mips ~ppc ppc64 ~s390 sparc ~x86"
+KEYWORDS="amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 IUSE=""
 RDEPEND="media-libs/freetype:2
 	x11-libs/libX11
diff --git a/x11-apps/xkbcomp/Manifest b/x11-apps/xkbcomp/Manifest
index cf3560647b7e..8962d212fb0e 100644
--- a/x11-apps/xkbcomp/Manifest
+++ b/x11-apps/xkbcomp/Manifest
@@ -1,5 +1,5 @@
 DIST xkbcomp-1.4.3.tar.bz2 245658 BLAKE2B 306e30789bdbf6b5863252aa1f73c96f88c4086989eb5529dbde1e3f1f9e11200f67ad6446dfe912129acc1071074d2addf776a97d9d42a840eb62320ae47cf2 SHA512 827713c0413aecdcad2b61edb7b8c7c7a002e18505b9041f570e2f680907193cb5ff8a5b424695e21110b2d06c145cbf0e397e52347421ee946f06e2a51f135d
 DIST xkbcomp-1.4.4.tar.bz2 251224 BLAKE2B 965a6ad91029ff4934af443a5845386045a66796cfdb6181cd94bfc1e3ee746700b22e5db56d22cc95255d0dca4f5894cf9afd40cc6675308a4425d947c5ed61 SHA512 971eb06277a49083b42154472596f1452fa94cdee28bad345bbcd85b028441bfd975763c20ed92aa69d6605b3fb23d27fee89df91501963b77c863667bae41c4
 EBUILD xkbcomp-1.4.3.ebuild 437 BLAKE2B adbd8305a8a9fe9313df18434435448b9bfc13c2c5f476c72bd1f56a6449999da8d6b606393ec1e52efd7c1303bee726529ad220e5e76bf1ce66ec987b252acd SHA512 7f450334e8d2f02c55767ceb6b83fdfc4dc1c67e2efa3c76dad98ab04c4d0be689a3b95700c23d5ef6eb2b42c8b6faaab6208a3b2765a90fc871d8d66c75c93f
-EBUILD xkbcomp-1.4.4.ebuild 447 BLAKE2B 3e993ba729e821e1c3344409296aca37818140d5beb7ea92f6f820ca05016d262e42e7b7b482a6f445d8d3eb2bf49a8a09d358942613874813229980d478d19e SHA512 8d9d6e4dd3569c99e5662fd30294cd70be0d4ba85cb31859e88096f7aad6bf999d14f22710a02eda71333d95d21e045dea5a49675f0b19447bf4c4a5fbd94dcf
+EBUILD xkbcomp-1.4.4.ebuild 445 BLAKE2B 15173c25a13b750e2c752dc5eab6c19c5f3e70a2aee6850c7edf062c6b674d01f8fdd5cfd4e273fdb349146df16250feebcfd2dd36ff1f44e96e1ded466b1cb1 SHA512 6b09efb1d6821dcfc04b833293f8f4159899399b4f4ac62e491fabb393b8aafcda77a96ca6e4233b1e8d0d4b51f5b23a1c661fbafd8b28938bda8bd1a4d2ebf1
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xkbcomp/xkbcomp-1.4.4.ebuild b/x11-apps/xkbcomp/xkbcomp-1.4.4.ebuild
index b0133ae55bb2..11b612ac19fa 100644
--- a/x11-apps/xkbcomp/xkbcomp-1.4.4.ebuild
+++ b/x11-apps/xkbcomp/xkbcomp-1.4.4.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit xorg-3
 
 DESCRIPTION="XKB keyboard description compiler"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 DEPEND="
 	>=x11-libs/libX11-1.6.9
diff --git a/x11-apps/xprop/Manifest b/x11-apps/xprop/Manifest
index 82374d55fc30..bc5ac671b53a 100644
--- a/x11-apps/xprop/Manifest
+++ b/x11-apps/xprop/Manifest
@@ -1,5 +1,5 @@
 DIST xprop-1.2.4.tar.bz2 149930 BLAKE2B 93bd20c7c91d6abd9e2fdeca7864b9885ae7248c7ee3ef80a5efa1706bfef2220244b1443764fdbc042f66be8d589b111fd942c732922f05f4143e1c893da183 SHA512 6e770cb89ba87ae057858cc9f0f5498979e78c3ef66ce86361b7c646cc0b70c41a18d76e55ed7225fe715b22b62bc07c56272519a2631b92832e9403ce260da7
 DIST xprop-1.2.5.tar.bz2 151216 BLAKE2B c676a1a733f4f897bc207cd1d7ec1a6022d48d2bb9615072e2ce19c1fec7737a8c9bc0444c97f4972d85a8ec8bc1e990f559a0815eb3656f2378915095c1f85c SHA512 93cfa621fa76ca6e8e780a252c508380b6dc9db39b67bfca16bb9800f0d39110f5d18189409a8577ef79e98bf5eece17f5e23f2218ca72ae8bb04ee7b429d559
 EBUILD xprop-1.2.4.ebuild 397 BLAKE2B 073f70d7e383c02285af7e14d2c71d2d212d6a02f9f0e060822a40132ad93fc27c2119a9fb06d201f5d885fd4585658e21395fbb586280d5806cb23acf0c7039 SHA512 f7f3fa68a0c33093ac27e7e0ca2490ce5fde54c2bc6a2e17931555bdc482c87881795488f90d37efb4e78af06b5e9447786ee91a413bfc56463ba751cb50d104
-EBUILD xprop-1.2.5.ebuild 392 BLAKE2B b05d957f6cc7e44cca9b7ab6c7e22e1c62a5a291b3ffd480805c19fdf1bedbaf415c95904e590b9c421182d33b0fa5fdfb678b17fb4ee13d38b8f4ae06be27be SHA512 bb1389c12b5c4fc58ead930596e4079479d1b3dae32fc16fb2ce056baf920748550aa4567b34b73710f8db9e1d04b9b66203c29f6ac8e3101ef371411d994504
+EBUILD xprop-1.2.5.ebuild 390 BLAKE2B 8b43f48fb08e5d2ea624bf8ac793dfad9bbc6e880d36d122bde1d6cadeffb2d96927251ef2daf92bf8557910b5bf8cd4dc6634051e4e1531c2830ad96c9d9127 SHA512 2b05848dd0a896417cb63f2e2fcd1bc501f468f3df9d4a3ecdaecf350deb9fcdd99fb8fa2fb76e47c140aae9c16853a6201614d2de4ad6d1846105e6c91ceb7f
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xprop/xprop-1.2.5.ebuild b/x11-apps/xprop/xprop-1.2.5.ebuild
index 0ede1b0ad721..7c49ddda9e22 100644
--- a/x11-apps/xprop/xprop-1.2.5.ebuild
+++ b/x11-apps/xprop/xprop-1.2.5.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
 
 DESCRIPTION="property displayer for X"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 s390 sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="x11-libs/libX11"
 DEPEND="${RDEPEND}