gentoo resync : 13.10.2019

114 files changed, 127 insertions, 127 deletions

diff --git a/x11-apps/Manifest.gz b/x11-apps/Manifest.gz
index b54d93165620..b66918c01a16 100644
--- a/x11-apps/Manifest.gz
+++ b/x11-apps/Manifest.gz
diff --git a/x11-apps/appres/Manifest b/x11-apps/appres/Manifest
index c48b6d1ea3ca..37cc26c0290a 100644
--- a/x11-apps/appres/Manifest
+++ b/x11-apps/appres/Manifest
@@ -1,5 +1,5 @@
 DIST appres-1.0.4.tar.bz2 117949 BLAKE2B a1938ffd3a3ecf279e35fd85c39f79550b9da0d2155d4ba08708fddff0b6cb9cb97a8174fcfb701ff13e929bd551405c3eaeae516d15e4d7ea31ef50aa6a5d29 SHA512 f07e672bd335308e58495685e5e7748684283aac28a96ea716edefe99ff281ec1f9b264e853ec0ce0f64cf54d9208d70dd3112a5a4219e0a38bfdc0fab8c9d98
 DIST appres-1.0.5.tar.bz2 124531 BLAKE2B 0d3e497afb3ab7d3565451c0da6594b4e608fa20e1a225162c4347d672db6a94823b5961c112b414e55c86a6b53a684709ddd109991f0545b6897bf276824da8 SHA512 70825563cd80f0f433c48ab2fdae888072939c1b22fb22340b70b9444c97916275ed92c9e5bf9a06bb76c32a5371b89ff7c0211a9a47a227c88311078c2c4137
-EBUILD appres-1.0.4.ebuild 417 BLAKE2B e77f5c45fb0444427d8794544cb9fe69cf1e82b8e66d383bf2cdbfcce8fa8b02ebec3213e7066a5f684366b02b6ebeddfe5e872aa6aff3069c5c40ad50195530 SHA512 06ab50907861b37147cfd96450152e4aef0a38f087b855c0843798e708828552ff3f9155196187f1ab204b38ec4c56a8a00b8ee934d4419abe26385e85f8cfd3
-EBUILD appres-1.0.5.ebuild 417 BLAKE2B 9d2033ad87507ad372e2b29fc21c7fa023e93b65ab32af599becc9f881d2c8a97e0d92c62bfe0e8bb69d9c6a57a77abc8ec11f5cc6fd34cefb149f77689bb639 SHA512 65ae4d2b5c655773f3f5816aa6974d9dc5acab4e64e1a68b201a35d4bbfb829d2f369e934b821c59da7057116f39f1fe251e4215acaee2a2f6cc325f138497b0
+EBUILD appres-1.0.4.ebuild 395 BLAKE2B 98cfea72a585ebb55743ada80fe185978e42667a76aa20b55b2b12e2f705abaf8d5e302657ca52a16e07fa9b61390a5bc44c271c32460e45930908746148cf40 SHA512 9e6fb7c3c4890a99cfa8c016a6e84c3b067bd0f1a10cc75e9d155778d44a447234a86ad654773d25adb114b1c730bdd8dea60eb432912c41757f97923f09ba69
+EBUILD appres-1.0.5.ebuild 395 BLAKE2B f9d189ced128a45110f937594e059007c0c5d64175aa9e2955c894c090b4c2c5d8eec400e25ede6d2ec6833930ebe4cdc66f60027e865e2eb5bfa2f317bd03ab SHA512 d1ce8c5c3932ccdbfce4f677d27206d05eba835ce53a80924a6c6825f315ae10115df13ba3c595112b03ed5eda6003e077108315b8d8459adc44ef29d0d8ed77
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/appres/appres-1.0.4.ebuild b/x11-apps/appres/appres-1.0.4.ebuild
index 5580e9322e80..9e6b8ae4430d 100644
--- a/x11-apps/appres/appres-1.0.4.ebuild
+++ b/x11-apps/appres/appres-1.0.4.ebuild
@@ -7,7 +7,7 @@ inherit xorg-2
 
 DESCRIPTION="list X application resource database"
 
-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-linux ~x86-linux ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 RDEPEND="x11-libs/libX11
 	x11-libs/libXt"
diff --git a/x11-apps/appres/appres-1.0.5.ebuild b/x11-apps/appres/appres-1.0.5.ebuild
index 0500fab48375..f08753f893a3 100644
--- a/x11-apps/appres/appres-1.0.5.ebuild
+++ b/x11-apps/appres/appres-1.0.5.ebuild
@@ -7,7 +7,7 @@ inherit xorg-2
 
 DESCRIPTION="list X application resource database"
 
-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-linux ~x86-linux ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 RDEPEND="x11-libs/libX11
 	x11-libs/libXt"
diff --git a/x11-apps/bdftopcf/Manifest b/x11-apps/bdftopcf/Manifest
index a7f3ea3aa1da..f5c2b674bce7 100644
--- a/x11-apps/bdftopcf/Manifest
+++ b/x11-apps/bdftopcf/Manifest
@@ -1,3 +1,3 @@
 DIST bdftopcf-1.1.tar.bz2 150815 BLAKE2B 2251b6daf090d61b6418bb0b76666e9dba65230c7a568bca6d3211869466921d6cb411820afd18262fb42fbc8b9d7118b3fe61b465b5bb00f8c93a17a6779df4 SHA512 7b790e8d512ca2812ac889c156ef91c48798b4744a6857e5b17e0128764b5afa8c5426fe5de05a9819d64745116718db4221b3e657e3c2633465e87179c44bec
-EBUILD bdftopcf-1.1.ebuild 422 BLAKE2B 694da0b0ec61f3bf166ff0c521616e2254b2a1fa682dd7df4770101fefd81a5aed092ff736bb22989e272f6d12ed8cd4febe95be3e40ee7c4cf40ec6a06303fa SHA512 6dba1d1a7dd53085785ba0b15b2280d21890bad5bcbf080cf4595361d1ca7f64f0f281dacf6883fb212555ec8d8e976f88da13711ca4189f566940308595ed31
+EBUILD bdftopcf-1.1.ebuild 400 BLAKE2B c1bc1c18e87357409836f697e63bc0905298634e05db069ef2f2945e411feb52183851997c54334a0d777dd4338af449bb3a93928f407c28344477b4a8bc0544 SHA512 7867670c738c9437cfec44036a39ecbbc90b98be6ad9b9d7c1c213db87221446f2239c390375289ba2eaa4b0f4c77bccca3faaf783b306ff0598dd4988a9bb44
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/bdftopcf/bdftopcf-1.1.ebuild b/x11-apps/bdftopcf/bdftopcf-1.1.ebuild
index 634a3ee0dcfa..b20e9034cdfe 100644
--- a/x11-apps/bdftopcf/bdftopcf-1.1.ebuild
+++ b/x11-apps/bdftopcf/bdftopcf-1.1.ebuild
@@ -7,7 +7,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org bdftopcf application"
 
-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-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND="
 	x11-base/xorg-proto"
diff --git a/x11-apps/bitmap/Manifest b/x11-apps/bitmap/Manifest
index f11221723835..24b0697d2025 100644
--- a/x11-apps/bitmap/Manifest
+++ b/x11-apps/bitmap/Manifest
@@ -1,3 +1,3 @@
 DIST bitmap-1.0.9.tar.bz2 181401 BLAKE2B efdf2d2905f6513ba8942d55a1aadca8f47f22736a55894deb9a4afeff132d8e410b8d84d27314253f16cb84ebb530b79c75991427365c45058e58280ede4449 SHA512 873c626c72a0f4025fe8c8aeedbf3fe4ee5657fb487ad7410406a20da518c0358041dc45c2549926cc10e1d031977073b9d1ddb32830fdce95b716a52fe44456
-EBUILD bitmap-1.0.9.ebuild 393 BLAKE2B 902cb8b61e17022a325fef0a272b6e992db13129ea8b895656ee58a5c31a208620a3d39322adcd1fe4d799ef92baa779aee4d2262720a16c62ef9ee4fde40f72 SHA512 0f96d537ccaef6d2f09b6bd77beccb7266ee6f0fb43acd6edbfca8b27cf32d6478c4cb3a8fce20bd7ba9ec9398487bf160dccff1765c38906d4847aa1abf33e6
+EBUILD bitmap-1.0.9.ebuild 371 BLAKE2B 270fced34c3d3b73733f5d6e281ef7fbea91bbc552ce99c032ffebb0c099f730650cd224b1105b1163fff1f2269317aa067946aa513473db41c9135b74edd115 SHA512 2baeab65b0daa9af9203a36727703bf6b18b5f8bac0d6ddeb552bf35cf14c803f9b48e41a537b1d8250767f2fe2b642eec65474cd8e8ea24bcd10342e886d17c
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/bitmap/bitmap-1.0.9.ebuild b/x11-apps/bitmap/bitmap-1.0.9.ebuild
index 3aa0a9002621..7d70e2038567 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"
 IUSE=""
 RDEPEND="x11-libs/libX11
 	x11-libs/libXmu
diff --git a/x11-apps/fslsfonts/Manifest b/x11-apps/fslsfonts/Manifest
index 54905c024734..c3810b7d1295 100644
--- a/x11-apps/fslsfonts/Manifest
+++ b/x11-apps/fslsfonts/Manifest
@@ -1,3 +1,3 @@
 DIST fslsfonts-1.0.5.tar.bz2 125650 BLAKE2B df08689dc452d07e895a93d5e755b3820b21c1df997b5269835ac04ac81beb09d98ebdcf7030d3e6c7ae288b3e7388b136a8b7b58f95ce3958e12923bab50620 SHA512 3a30598ace981c7396bfe44f0d8f76d40fca3f77158dceb3914a524594a12187dcad0b0f225fa81f251f0b7896bf046cec4ba610b4676da9be311eec5d8c6cc2
-EBUILD fslsfonts-1.0.5-r1.ebuild 323 BLAKE2B 681f817c9a59ab25f11be3e31bc32042aeaf200a18595de6d7f7d149b51f6923e26f2089e900e5b7c76f92881dbf57e1af97f48c3db77b1c94ae3b577424316b SHA512 8d30aceec62fc1ad7d8e737211478f0df02299df4e59bd7e93f9e0a8be24c036997348b3d3076d2467745a0e8059a4b9869cb95160e7a87683c590b69dfd6d9b
+EBUILD fslsfonts-1.0.5-r1.ebuild 313 BLAKE2B 0a80b0daa32a3e96cd66c5b8f0821f10eb160453bbd70b181165b3017c43392302e219b3baca4832b5ebeb3c3617a4df27135e42e0b471dd0471be560c9396f2 SHA512 16878edf4be9fb827b7383f79c28cebba6c3f2b18b7c75efb5cd53c7af569de1a8435be4953af0964df531abba92622423ec09b410dc5598181b6b69415cbaf0
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/fslsfonts/fslsfonts-1.0.5-r1.ebuild b/x11-apps/fslsfonts/fslsfonts-1.0.5-r1.ebuild
index a861d2c640d6..e6deac2c8d2e 100644
--- a/x11-apps/fslsfonts/fslsfonts-1.0.5-r1.ebuild
+++ b/x11-apps/fslsfonts/fslsfonts-1.0.5-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 inherit xorg-2
 
 DESCRIPTION="list fonts served by X font server"
-KEYWORDS="amd64 arm ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
+KEYWORDS="amd64 arm ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE=""
 
 RDEPEND="x11-libs/libFS"
diff --git a/x11-apps/fstobdf/Manifest b/x11-apps/fstobdf/Manifest
index 065e51f0c42c..748dafaaa35e 100644
--- a/x11-apps/fstobdf/Manifest
+++ b/x11-apps/fstobdf/Manifest
@@ -1,3 +1,3 @@
 DIST fstobdf-1.0.6.tar.bz2 127170 BLAKE2B 89ed63541386d9f46ef839fb78be1cbfae4b51d824781325e33566a027a5a44671cdae84ec6ed81eb23b6a89f6868726b35781f2626a407753129ffd4c0af86f SHA512 ec5b8f62019ba51725bb47241d4fc244412f354e7c12094ed884109a88e3db9d25d41a6142fd002e6c49877b4c7f2c5dde549682dcc05f7ce102621d2c71671f
-EBUILD fstobdf-1.0.6.ebuild 321 BLAKE2B 31279550a9a751cb7269b34d363471c78103c85599b972ddd546f5c0f4a313b78efb8ea5d306960e30522565bfb5049269625b1e0a582abc8ce51cdb3e40fa07 SHA512 865e12d6f8cb8c5913a7fef36f5b82f49a4f138d169d1cb3649c64e61f0df6856862aa9f87353a1e7337340d5b93232a72a781a7620b5f1e45bd89ec7c1cf793
+EBUILD fstobdf-1.0.6.ebuild 311 BLAKE2B a29874d96687d9a56ee5b2af24a1b33f01210bec37a925529cf7ea887d0ab816fed58d3e01f2780a10f6864a72525ef05ba42a873880e66a0e15956acb677b41 SHA512 ba0821487f49cf363a6fcb15ce566cf7df5efc6175cd75719328708ab45dcb6096edda18f6e2b102a792f3d65892fad27cbbf7773c712fc2a8ebe2bc67a40104
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/fstobdf/fstobdf-1.0.6.ebuild b/x11-apps/fstobdf/fstobdf-1.0.6.ebuild
index f5e7132fdb59..db4fffaa7a9d 100644
--- a/x11-apps/fstobdf/fstobdf-1.0.6.ebuild
+++ b/x11-apps/fstobdf/fstobdf-1.0.6.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 inherit xorg-2
 
 DESCRIPTION="generate BDF font from X font server"
-KEYWORDS="amd64 arm ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
+KEYWORDS="amd64 arm ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-apps/iceauth/Manifest b/x11-apps/iceauth/Manifest
index 58c42df6569c..4886cb088f8c 100644
--- a/x11-apps/iceauth/Manifest
+++ b/x11-apps/iceauth/Manifest
@@ -1,3 +1,3 @@
 DIST iceauth-1.0.8.tar.bz2 137905 BLAKE2B 8fb2e29e5f4fee57e5c1f86eb78ce518519f04301e8aa81778e0de6589f62f32478a7cae05db831177f4425eb388f7b666f697314d5ab967ea3e2b6ac7b47d56 SHA512 9d4520adf951b16a3e784349dbb70d5d8176b74b956f8adc63abf55d049745c113b03ccfa60a281fc39b487db3742302dc6287c9985ce83a0157bf4674df2af1
-EBUILD iceauth-1.0.8.ebuild 432 BLAKE2B 0f93e06f2247faac3890ed780b47950bd3fbee7a126ca1fb047b6246e107f7998ffadb7201727ab5e2c0fa7be42aac0313d25fa9c2a5bd5783d9e50837a77159 SHA512 e847a8a5cfb7934c0190e102608d743c03cd813c3a80c2b62d1db53f426abd62f0ca22ae08df5f725e2718aa54895efd642ec71e7bbec6f488f9c5bef7c3d858
+EBUILD iceauth-1.0.8.ebuild 410 BLAKE2B 8352229155b62a57f9e210f0d9eea0fceaaca91132ccaebff7b33106d698393d2780d6ce6dc737165efa3e04260699c695c7fc16a4ec603b7a3094ce61902485 SHA512 9f3072b45bb39722c86da7140186b584e86743adf21e6ba8337aa67fd2090cd622a47a38483b233e75c2710eec2d693b0892b42ffd88278e4f64b767d814fa47
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/iceauth/iceauth-1.0.8.ebuild b/x11-apps/iceauth/iceauth-1.0.8.ebuild
index bedfbea482a1..813c2eb79e83 100644
--- a/x11-apps/iceauth/iceauth-1.0.8.ebuild
+++ b/x11-apps/iceauth/iceauth-1.0.8.ebuild
@@ -7,7 +7,7 @@ inherit xorg-2
 
 DESCRIPTION="ICE authority file 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 ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND="x11-libs/libICE"
diff --git a/x11-apps/luit/Manifest b/x11-apps/luit/Manifest
index d07ae40c9729..ff756ff52c28 100644
--- a/x11-apps/luit/Manifest
+++ b/x11-apps/luit/Manifest
@@ -1,3 +1,3 @@
 DIST luit-20190106.tgz 190866 BLAKE2B 44098a00cade37aacdd7e67e1dae68157b652458b8a059de3dc56be9cc79ffba2ba861d403ab65de640853e0aec38c7d8d67febb5b6ae852a25430d2988c3661 SHA512 4324ff2793635e12e7fc0df2d7c5cdeb6241591105d0cfaf40a0da06a08764f08c5ef5f6fc19bc0e5d1f4b34b90e14b7aa393a0e613f5e096c6f91c90988215b
-EBUILD luit-20190106.ebuild 660 BLAKE2B af6e73c8c69e9ad4250907025a00162bde75d1555d431e6bc041c29f9247ad4c961c2acbeb90727f4a20fe5c17c1d37037f0457ccd3240472e0fa89609f9beed SHA512 580f67a726c3c6de343a6b5340ea2512f8c09908663fa6ca73a9a58dacc34c2d40f7116e6eabbf1c27ce16173b0521d876b56870386771ec88ca836cda98137d
+EBUILD luit-20190106.ebuild 638 BLAKE2B 484db71c858cd452289cea928d79ae9ff72086a8e202732cdb5859f3f3408cc37e2ce4a5148bcc0f412bdd2b6c867fc6145a264cc54361778546f945e526bd50 SHA512 b3376e5f8c94fb894f6200f25ec3f78c1595237fe909fb45afd74d784eccdcf7b1fb0402f4db21613a6eb2f29ab6cfcda920835d43db8a2716ad5c487ecf9183
 MISC metadata.xml 245 BLAKE2B 26bf988c73d073000ab8d21ea881c4088b90e7081410938828744375bfa8de31cce2c78154ccfc61105c853c1f24f4994ca4e5cbb80c4c89dfd489bbd10a09ee SHA512 ecb8a4621081ccdd43f08e4f560b0bc820c27d6a282c87e1a8f77137ec8b215188fe31f11fc6379533afee2ebe7e14d5395a45c1aab9abfe423fd832dba692a4
diff --git a/x11-apps/luit/luit-20190106.ebuild b/x11-apps/luit/luit-20190106.ebuild
index 196b8c2d2a79..71081a26d0fd 100644
--- a/x11-apps/luit/luit-20190106.ebuild
+++ b/x11-apps/luit/luit-20190106.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://invisible-mirror.net/archives/${PN}/${P}.tgz"
 
 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-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="sys-libs/zlib
diff --git a/x11-apps/mesa-progs/Manifest b/x11-apps/mesa-progs/Manifest
index ac9c4b28b087..a6724f7c80fd 100644
--- a/x11-apps/mesa-progs/Manifest
+++ b/x11-apps/mesa-progs/Manifest
@@ -1,5 +1,5 @@
 AUX mesa-progs-8.4.0-improve-printing.patch 11963 BLAKE2B ad2dd57bf0959da6253d0e5c19523e701d03b9d4465564ff3f7e1462e2f36db0ef6eca46ad847f8f92f44fb91c46e87425d430c47c13f7efc130540071fa3ac8 SHA512 31048947ba19b03277d5dabff8bf3209274e9c95da3b33d9e27c3c1cdf71c3027cc0591ee27bdc0e8dff506da2f0601911cdf5899594674d2dd178204db3085f
 DIST mesa-demos-8.4.0.tar.bz2 10073259 BLAKE2B d251e705c6e3d2fe959161d736401fd06ba267a9c389341098373670b6f44ca7cdb451d96e94e3b22f006b696a9b19e38096423f6438544539f46beda91c03f4 SHA512 b72d03cad36e0535ff18dcfb222ec4200064b9264f6da51a6e5f03b0dd912abe188bc1d600b6698de3ce6f63b28d2ce01565886ca8e7079edc4967fbf2fb0957
-EBUILD mesa-progs-8.4.0.ebuild 1721 BLAKE2B 769531d4e0d0e3d5aaec85a212c014439b7489ac7fea01b59c072f4592ca026bb4caa1a0d20922f981c6c9f6c9e19dc96b378ceb57b4f55ff80fbf16acaeaa06 SHA512 f65cf8c754d299cff5d9b673a6205c4892434e33132d85c2b5c7d75ebece6ede1379148621b8894128beafea45dbf3797f7a9bb3952df645bca5286d58d74a60
-EBUILD mesa-progs-9999.ebuild 1673 BLAKE2B d265f6b8fd7275b51999da6c0f65e420d03702133b58f12a0d23f6b80bf9f3c1fdbc92cf2733886e299be46a46b7ab4acec8fc9261f32bb3d7c20c907c9b988d SHA512 e0b4b5ecf04a0a750524e90617b36d670a315867215e82a7d2c25e1e9c8b0e98fd5752f7915ea32c01f1b9624a82cf9cc8f90b43bb4592d3ccebe47122a4cd49
+EBUILD mesa-progs-8.4.0.ebuild 1711 BLAKE2B 21a2173aa3846f237a0ff198d1793cf5ec1cf33c5c89be85ec31225437732928121ce51382d0a7e51fe2a8c038c44f0c188cbac63bd1ad7bee61bd93ef3813f4 SHA512 e5d54ece371e42aa68693d7f19ad418e33ad001b937609264ca089d8424ad7123353e2a6c736e105c9911130bfc9df8c46e398da5e2dcde594bc4c463a58c35a
+EBUILD mesa-progs-9999.ebuild 1663 BLAKE2B ac8c8518946edf1900a2855eec8c72d23de44350c4f91366bf65338cf79d38161948bdd7068c977bfb70ca93de0c05bde2fa95eba313c53d6fe4400dc49c6731 SHA512 1fe5cb3514e1919e291cacc24e07e0c424a5bee0d3fe452e94f5f3f6f76751130c0261f682696f0070aee90ccb1c8d4d765a8fee461acbf4eac418f257ba6f3a
 MISC metadata.xml 475 BLAKE2B 4275e3d7871f0b092559ddf5c898bad781441267b093d55bdb14d7e9795ac070aa7d9a87cf7248d58b75798eb28a4413d588492bb6ab092ef79373434fb1652e SHA512 624480e9601ad6ad1cb996b25074c3e47a539113af39633de80c9eb0330322453f545ecfede9d602de7259d66047f507bf3a1cb115becb5f5e7d0613cb5bc675
diff --git a/x11-apps/mesa-progs/mesa-progs-8.4.0.ebuild b/x11-apps/mesa-progs/mesa-progs-8.4.0.ebuild
index ccb0fec4f23f..87068757de77 100644
--- a/x11-apps/mesa-progs/mesa-progs-8.4.0.ebuild
+++ b/x11-apps/mesa-progs/mesa-progs-8.4.0.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} = 9999* ]]; then
 else
 	SRC_URI="https://mesa.freedesktop.org/archive/demos/${MY_P}.tar.bz2
 		https://mesa.freedesktop.org/archive/demos/${PV}/${MY_P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux"
 	S="${WORKDIR}/${MY_P}"
 fi
 LICENSE="LGPL-2"
diff --git a/x11-apps/mesa-progs/mesa-progs-9999.ebuild b/x11-apps/mesa-progs/mesa-progs-9999.ebuild
index c0dc4af14609..1f4f84983846 100644
--- a/x11-apps/mesa-progs/mesa-progs-9999.ebuild
+++ b/x11-apps/mesa-progs/mesa-progs-9999.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} = 9999* ]]; then
 else
 	SRC_URI="https://mesa.freedesktop.org/archive/demos/${MY_P}.tar.bz2
 		https://mesa.freedesktop.org/archive/demos/${PV}/${MY_P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
 	S="${WORKDIR}/${MY_P}"
 fi
 LICENSE="LGPL-2"
diff --git a/x11-apps/mkfontdir/Manifest b/x11-apps/mkfontdir/Manifest
index bcd9b3619bec..c73e56d77aca 100644
--- a/x11-apps/mkfontdir/Manifest
+++ b/x11-apps/mkfontdir/Manifest
@@ -1,2 +1,2 @@
-EBUILD mkfontdir-1.2.0.ebuild 549 BLAKE2B 8d829cd4a4446eeb54eacb244dbd8a11e5be96f253e668089f31235e9be68f7de186351e2c235e42f068aaada8c69c0dd709e20c4855f3c7e959156149ffc9a9 SHA512 f785b70005f6f7324eafcffe1a76b64093d492927a23a8da43aa62ff45ffe8845d47390d69ab1fdb3c20576f6f5c78724c1cf10bd29d530db81f3b70099423fe
+EBUILD mkfontdir-1.2.0.ebuild 527 BLAKE2B bcb4c2df3c0c99a5a645e07a45e7d1d2cd64f5bb2907a25b0dd149223d1488ddb63fda6d8e8a928ed89dabe141c8adc215bb904036f9d760b35416bf606abbe9 SHA512 7b18cd3d851275dd9ccc69a1ef433861058c79e69e333ca6fa2278e5cf0dbd20a92318a23315e828e48e2cc2bcfd0d4b6ec3eee8917a935b57612ab232fab96b
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/mkfontdir/mkfontdir-1.2.0.ebuild b/x11-apps/mkfontdir/mkfontdir-1.2.0.ebuild
index c066a5ecd5bc..cdc1fbae85df 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-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 5f6aae8a1ae5..a612f3530a49 100644
--- a/x11-apps/mkfontscale/Manifest
+++ b/x11-apps/mkfontscale/Manifest
@@ -1,3 +1,3 @@
 DIST mkfontscale-1.2.1.tar.bz2 150808 BLAKE2B 0c2cce3a5b400f8c757a9e1f7a0c8ea85f41c7d229cc1197c68340ec9f2b0b36872a914bf04dabb584727405092b4bf9abbc465190ac1b91419d9ecb3d359b83 SHA512 4d243160e1f7f8dfa6a8f53349c1a42a55fc99426455ebdef58352c5e951fce8b4f1fbd1061a76c9a148095b002eac372db1ae5e2647d2ccb4886635b317b18c
-EBUILD mkfontscale-1.2.1.ebuild 632 BLAKE2B a9868c3b217f9c0dd14423723441617e246ba78720964602e8cb5c80fbe1280bd76960032a14d26326870b4c64994e4d0e34c32238fce9e288dd46df6969703b SHA512 3e4b976352e4db8be492fad7ac5b3718d41411301eac72d14b0485f1160000956364e32163df8605b8faf22c52be645bffbbb693cbc29b79e1f6564c1044726a
+EBUILD mkfontscale-1.2.1.ebuild 610 BLAKE2B b6197c71d5d627011f320294288b03c0ac8abddaa6575f4cb73b5d4235850de10274d2706dc98b143c6fdecd70d73fb45b41401f8c4348dd33e06c54694bf858 SHA512 79e62cbafe2e74738768538dbf1d4d071cd7b4139ae60a6789fa7aedf686351b57494a59d5008ea5c36815fe82261c1682fe291afabe548316c70898f1d583dd
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/mkfontscale/mkfontscale-1.2.1.ebuild b/x11-apps/mkfontscale/mkfontscale-1.2.1.ebuild
index 434349d1b0dd..85021d7ba3cd 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-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/x11-apps/rgb/Manifest b/x11-apps/rgb/Manifest
index 51434cac1864..69e1f1868692 100644
--- a/x11-apps/rgb/Manifest
+++ b/x11-apps/rgb/Manifest
@@ -1,5 +1,5 @@
 DIST rgb-1.0.5.tar.bz2 130900 BLAKE2B 40675dfd862757d62cc636fe2cc3cfac25a87d863ada67e76dd9516a1607e356530b2578082b9e5cdf84d97b766c558b80f8fa919c515a5eb3da2731ac07391f SHA512 2e4ad2b0f5539375986d455b47cb5f10e50841198ee242ee430e021e9ddbffec1304259c259c7a6b7e0cd4b244ecedcb5818baac35deb4447da53c2ddba3ad43
 DIST rgb-1.0.6.tar.bz2 139225 BLAKE2B 25e20d0be23a46d869869e47169d86dd50a99bc65551bf83800119c7f9cd242f41d5ecdb611467eaf9aeba909cebbfab8f578e0a5dc63380482f324124064bb4 SHA512 92c8885a0e1482065a8b86f7be890859a5eab6b9d57ff219e916cbbd10cd185deec1c5db25dae8c405a343ab0e2ddaba3ddfe0b567d06534405f102e1845654e
-EBUILD rgb-1.0.5.ebuild 448 BLAKE2B 517fe9da570465d2adf662319b71fa61ce445b712e583e1055cc19c59553d429814b6e6f30115e10fe549a0bd68c5a842f0ededbb8942507055500d237acd79f SHA512 8c80981af0096bf781a91fc764ae3f4077b7390863d24e0b9bb5de79f40c7dc33d2b9527a9718ed89f00d7fa8a705ab203903c9a385ffde38fa5f1e6015d8bee
-EBUILD rgb-1.0.6.ebuild 472 BLAKE2B ea4e35fd26cabcbb9d9dd395bbfa27bdefafa528ea4d80c1157c56f1f7d561a626777bdb7694ea3e3a580bd050d165ef99d82a01dc0011d57d56bd079464a966 SHA512 974008f679aedccfef8fb8b5b80ba15f3212ebd3c23c6c6ca6fe7fbe947a3b0ada08d34a3bc54ac7e273aea98ada08bd4288a5dd1bf6b1ad50d07d35aa1f45e4
+EBUILD rgb-1.0.5.ebuild 426 BLAKE2B 3702eb79581e552c396524fd706372827a76d5ab0664edf54e4643340fc83b2ca9765f693b60685ee3e1e6148614ad05cc3c24742668655149e140a0dab47f18 SHA512 1642aa20cb63a4e213c424ced295e9fbec7d9be5076115e2304efe1c7c7d6e3b12586ee7b3c75658930e6eae68f6e1a7d6872a0928d378d0730922f1413e96ed
+EBUILD rgb-1.0.6.ebuild 450 BLAKE2B 1ced37cad0dc5e323973b68dfdb369efe79ff385c084554760c9c177c9dcee547873063bf576c43d60d0da5dae3f278050345a3b51c3516f0b6d6d8e7909f061 SHA512 c247aadf04a4ae75d4698bec964a7020ab857e782214510e0d2e1cd4d1caa927efa4ca3188087801b679bc2ecae61ebb4810481d59c9475cc1ad55584cd99e46
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/rgb/rgb-1.0.5.ebuild b/x11-apps/rgb/rgb-1.0.5.ebuild
index 8787001e4da0..29a96b1e704a 100644
--- a/x11-apps/rgb/rgb-1.0.5.ebuild
+++ b/x11-apps/rgb/rgb-1.0.5.ebuild
@@ -7,7 +7,7 @@ inherit xorg-2
 
 DESCRIPTION="uncompile an rgb color-name database"
 
-KEYWORDS="alpha amd64 arm 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 ~x86-winnt"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/x11-apps/rgb/rgb-1.0.6.ebuild b/x11-apps/rgb/rgb-1.0.6.ebuild
index f9ebe41b77e4..da8f290fef33 100644
--- a/x11-apps/rgb/rgb-1.0.6.ebuild
+++ b/x11-apps/rgb/rgb-1.0.6.ebuild
@@ -7,7 +7,7 @@ inherit xorg-2
 
 DESCRIPTION="uncompile an rgb color-name database"
 
-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 ~x86-winnt"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/x11-apps/sessreg/Manifest b/x11-apps/sessreg/Manifest
index 3d35b0d41407..26e8e0e37c07 100644
--- a/x11-apps/sessreg/Manifest
+++ b/x11-apps/sessreg/Manifest
@@ -1,3 +1,3 @@
 DIST sessreg-1.1.2.tar.bz2 137612 BLAKE2B 0fe6484b83255bc2b917645ea841ad43b927131a8ef3fa9a47e7864984259140579c462c8d03645928ffd4667e7c46f36c5eb1aa35ce916ab65126c55f6bdde1 SHA512 7e3c2bdcadb7133aace463b58d8c6108d315ec95d2a42509073eeddc7f02644092a4b3168bd3b426c041736a016291092e0bf8368acd620dbeff96d53d12f98c
-EBUILD sessreg-1.1.2.ebuild 353 BLAKE2B 410be53e9dafada0cb6838c17f6671ee5ccb30766afeb24ac797336f155ac9e6fe86202d661312e5e8a042542e6841ec8aba76966ff4ce58f4e6a9b5f29129bb SHA512 341de8300fe9f58b8bc155032c72fe8ca73466b513ccaeb922a0d9b70494b2759eb780012040523c79939c5c25fa48eda14af4393516dc9bd7a204ca88b44015
+EBUILD sessreg-1.1.2.ebuild 331 BLAKE2B fc1cf93ac8f7e458fe17b402d16c8404b51d9732b242d4809faf20db5d5bdc0c5226f666b1031b27b9f56ea34e954cda951450b259ce49bbfd2ce4f44c15ac17 SHA512 823525581b5e7ea6871e8c4e13e5f063a541a7cb816130d59e36ecf777fa2231e1471f437accf5b2b1d3fb36055772dd810793649963822822113f0982eff03c
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/sessreg/sessreg-1.1.2.ebuild b/x11-apps/sessreg/sessreg-1.1.2.ebuild
index b81540cbe785..50231e299f06 100644
--- a/x11-apps/sessreg/sessreg-1.1.2.ebuild
+++ b/x11-apps/sessreg/sessreg-1.1.2.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
 
 DESCRIPTION="manage utmp/wtmp entries for non-init clients"
 
-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"
 IUSE=""
 
 RDEPEND=""
diff --git a/x11-apps/setxkbmap/Manifest b/x11-apps/setxkbmap/Manifest
index d7d715b3714a..9118be0404f4 100644
--- a/x11-apps/setxkbmap/Manifest
+++ b/x11-apps/setxkbmap/Manifest
@@ -1,3 +1,3 @@
 DIST setxkbmap-1.3.2.tar.bz2 136253 BLAKE2B 0c7ee234ec39546812ed2cf4f57f20f8c5078a3193ad39ce948660ca870ef0b625a8bb7e90e9a9e8b567d6d023f45f62856a6e1b44d8bfd04a1c0fe1a6d9830f SHA512 bfa8015dee0d8d3fdbbd89afbd71c8606ce168d6edca8521d5ed05a00fecbea39bc4bfcce84b71458bdeb34c60bd80a5df27e0691ccee3966443ecdc937faf38
-EBUILD setxkbmap-1.3.2.ebuild 484 BLAKE2B 8f7a2de02379e908ded62eadb6c219f5d095da6163edde932c8c43bedaa98a7793c844b489768bfe587b0ca52645ea70c033af3091e81097a662f1d5b8b5aaa0 SHA512 7ab9e7c3b02618400433f1cf31a77c800e36222b400c978bfe4ca61d4613e901e6d46aeea014bd013b1be4f8477091422618ca6daa8e31b1972a12debc423c24
+EBUILD setxkbmap-1.3.2.ebuild 462 BLAKE2B 89e4ff60321ae21ebad5e85df8817cbdfc669bf1777961ca06e00a5d10940b7f077c886f72a269d3df9fb385baf70640cb1bd89aecd40c92d8abdd3ee7610c80 SHA512 d4fdb038c6f737f2fadf37ab92a97bb740a235f61775df8df0beda9aad444eab7648e0bd292a415769c6f1e5b0fc870da69302ba3454446071ad38ffb560b737
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/setxkbmap/setxkbmap-1.3.2.ebuild b/x11-apps/setxkbmap/setxkbmap-1.3.2.ebuild
index e6c5a521a64a..69e71fc9a9d3 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-linux ~x86-linux"
 IUSE=""
 COMMON_DEPEND="
 	x11-libs/libxkbfile
diff --git a/x11-apps/smproxy/Manifest b/x11-apps/smproxy/Manifest
index 3a97394f3c95..5b228665a117 100644
--- a/x11-apps/smproxy/Manifest
+++ b/x11-apps/smproxy/Manifest
@@ -1,3 +1,3 @@
 DIST smproxy-1.0.6.tar.bz2 132046 BLAKE2B b1eeba52730da79ed9f374636631c0400df997b2c5ab5ce18f1644ea6de7c55ba2914978d0b8b88f0cc455a0b5a65513fd7e29d2a374e7464fed14e007f8cf96 SHA512 4945c92c0f07c5dba5698889f415e78ce406939f4a36eb977309488c27385ce4ce04235c4e850a90a451fea8d7885ded7c6b18db71335c7731b38aaeefa9fcb7
-EBUILD smproxy-1.0.6.ebuild 341 BLAKE2B a3cb56b2dfb45b1d0d7ecbddd6cae18cea207e9b3945f840ad34c945812c7d99ccb5eb6f9c508c2903d8a2b7ade81756726303f9f4bb55c5d8d1e4fb2dc55521 SHA512 4e5ea3632faad5fdbdfd9301e35d6fface36ae0b851c814a76661d59490522b865be062556bd6d0019e0b8ea222ca4c541ba04ca5aef6a9571af59722267b664
+EBUILD smproxy-1.0.6.ebuild 319 BLAKE2B 0f7a7e0b9f95c3a0f46096b5c31586c7a847ee8346f532d74dce4d25d573f8d613f35641865868a61781ed979a36e2eddb50164df3bda5c4c5cc3981c1081e86 SHA512 9f83037100a9c525c82b35f1f553b027721535226b86ebe276dc89aa574d04c78029dbfc3754ae50acb3d4d730631786ec9b1dc789adefb7b66d8342472e5187
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/smproxy/smproxy-1.0.6.ebuild b/x11-apps/smproxy/smproxy-1.0.6.ebuild
index 08594c147b0c..cf339de6507b 100644
--- a/x11-apps/smproxy/smproxy-1.0.6.ebuild
+++ b/x11-apps/smproxy/smproxy-1.0.6.ebuild
@@ -6,7 +6,7 @@ inherit xorg-2
 
 DESCRIPTION="Session Manager Proxy"
 
-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"
 IUSE=""
 
 RDEPEND="x11-libs/libXt
diff --git a/x11-apps/x11perf/Manifest b/x11-apps/x11perf/Manifest
index 1b28084104be..537754ca5fb9 100644
--- a/x11-apps/x11perf/Manifest
+++ b/x11-apps/x11perf/Manifest
@@ -1,3 +1,3 @@
 DIST x11perf-1.6.1.tar.bz2 189446 BLAKE2B 2a36bea5e1c9a414d9a1ce798e4f0481aeab86522c5924fb7520c0bc917b832f3e4c63c70a5430cd3fd92cac4374691a64db4542180e0917a0617bae7f783a6f SHA512 b386151bfe3d7c04ab9953ae1882f3c5b627d6d1afb9a8cfe87c58236a88883fc11bbadb2226b9aa61df84b4fce625a1c9e3d146a124ac17e8d7d605b35d9c0b
-EBUILD x11perf-1.6.1.ebuild 437 BLAKE2B 640ecca9b6ca5d9246c15cec52683611cc8067ba29813d15de3f0780cb035afa362a6236b4f79813ad570996cf0efa95dc1ceaa077544dbe735234237155eb44 SHA512 34770c7d72e9ad48097fe7eb399837e7ed03966d5e49c4210aa4beba4dd00a2c0545580728fb4edaafc5f2d2f32bef8dae733b1e94b0dba6b3437fd59545ae42
+EBUILD x11perf-1.6.1.ebuild 415 BLAKE2B ef12ae23c6064a3162aae81e14c97c7abc97c9ee39f55bc1dd05563fd7fab4d7f04f1120ffe6d315ae2acd389e96cd34ce0bae673380d4f30ec6967f695838b2 SHA512 43ad3f0640ae34f2c9aaeb9c22158c9ee280a72395025d19c8605ef73a768770ab67a0f10d8c157e7675c3ef781898fe2b1f9cbd01686eb096be5217820ef678
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/x11perf/x11perf-1.6.1.ebuild b/x11-apps/x11perf/x11perf-1.6.1.ebuild
index a07b4bca4298..e77d601cadc1 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"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-apps/xauth/Manifest b/x11-apps/xauth/Manifest
index 67a36e0bf0c5..a78863631f77 100644
--- a/x11-apps/xauth/Manifest
+++ b/x11-apps/xauth/Manifest
@@ -1,4 +1,4 @@
 DIST xauth-1.1.tar.bz2 163510 BLAKE2B 0b55ee9ec35ca436c36effe2ba4eee55f76a311a5482d1d72e80e5afea30c682de3f686b2956d17278721e190dd9bec4d93db6507853841a633c931312df745d SHA512 b6ecd59a853a491ef45bf8cfbff63bed36645f81cb79ae9d18458b57f7502bccf92f0d979d3337578518646f680ad379e67b1dac15a927cbb11372733e7a3a0c
-EBUILD xauth-1.1.ebuild 648 BLAKE2B 49ee473ea3fb2e4ba9478dc2ad075d53e8381a4f0825fa313d41ba9d9604e098c3b8fe186c1ace75a1537439d086939a108340d4aea1335fadd532d59e894f3f SHA512 c0198bfd83333b4f93ca79218d31ca16ae3cf775d1edbb4a7fd3186c6b5aacca70edda625e4d2e079adaac6d45c639e7ba8b83fdc89eff1f8e543a622910407f
-EBUILD xauth-9999.ebuild 659 BLAKE2B 2aff9ff901ca6c2cff8e73acad3a4112873774b430d4c6bad930154a07fd5b8d57f2d2b2dc28e80bd12cf8a45fb8ae82b5a6480fc0fe5f5564e9a4e52f41263e SHA512 2a2a9107b480b777bacae80da61a3c5035846f681c627547f492fc9c1117c31efa0eef99b10f32d3fd8add3d06e6965af6e6a0648234d11d6d7dd45b3c693c1f
+EBUILD xauth-1.1.ebuild 636 BLAKE2B a93386ee3bbeec4919e13e9deef75ca9eefdddd7fbe46f29862d6061a95acfbe55e971e14b04ca836ffcd7b3646fdb350c876af727780f02ef4c16d5a177892e SHA512 a49c497a50e0095675ff71be0ee8fc1dc1936d46ab6bd15c4fd6cf77748ed5945f896094385b0dea3a89b23ac402f1477d6b1afd07d6f85843dc539c20a339e2
+EBUILD xauth-9999.ebuild 647 BLAKE2B 1ae6fe53bbc178cc3b0f68c6fc09254d31ca6dc5b2c52a352706672bd6440e76c2dc81a324d839a02caf8ffc9417a17482e57f28870e545b7af5962e49d0c417 SHA512 24fc76446d153e66c1fd78d5b2289887e7ff53517ee66abf4133fde3ae6db4237160660aa162c6ea1d52d382acf52afd1d90edc62340b9f9d0c7e7b7d89fd849
 MISC metadata.xml 234 BLAKE2B b45f6795dbd73dfcee2a68f93ec5460509b15a69401467bc8f4af9505eeb04a2aa35a2b144eb88781df4abd4e15d2b88fc728daf033c6d646762170ffb00b1a7 SHA512 fabcd59aeede4ac93d66552746edacc44fd565551aafaca67185aff7f8e6a4c0fa21f3d54e4fccd7def948ec57b90489631bd779fb992cd9322132b0a3aa503b
diff --git a/x11-apps/xauth/xauth-1.1.ebuild b/x11-apps/xauth/xauth-1.1.ebuild
index 6e6cbd340c83..b6b6953692df 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-linux ~x86-linux"
 fi
 
 DESCRIPTION="X authority file utility"
diff --git a/x11-apps/xauth/xauth-9999.ebuild b/x11-apps/xauth/xauth-9999.ebuild
index 057d3ed2a71e..0661ce38f6fa 100644
--- a/x11-apps/xauth/xauth-9999.ebuild
+++ b/x11-apps/xauth/xauth-9999.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-linux ~x86-linux"
 fi
 
 DESCRIPTION="X authority file utility"
diff --git a/x11-apps/xbacklight/Manifest b/x11-apps/xbacklight/Manifest
index 973eeb0ec64e..1ac99ac9f46a 100644
--- a/x11-apps/xbacklight/Manifest
+++ b/x11-apps/xbacklight/Manifest
@@ -1,3 +1,3 @@
 DIST xbacklight-1.2.3.tar.bz2 124611 BLAKE2B 19355773b2b2bc491cb3682d9d02fed462d30ed21742dfb9f7398ec39e85bde4fdd1b60bc8b4ac2a2d32410016186c1f1e5d45904fb19358bcc16eee69242dbf SHA512 717c87ce24634892fc4ac54fc59dcc0a5bc8f206aaf1d13410f95f7e4fe6e3dbc7ff8d951bcd8ea8c5e955357a00fea6ceadd4559e60b1a632e40f71290e12c7
-EBUILD xbacklight-1.2.3.ebuild 388 BLAKE2B 8f12f9080103b4bfe8c6f4b06f7e9890f58e74d922d41cabfe9e030edecb9758115bd5654b266d61c03fe83013292dfed0bb53579106c63d1630bd57b5dff407 SHA512 03ed3fdedb10f22b61084dc99e41964d0ef59f8946927e9cc62e7ba46acf08e12779d74b8cd18afe6d53c9dc760e84118161ac5d15f80cb61ca3cf5b5e2dde07
+EBUILD xbacklight-1.2.3.ebuild 366 BLAKE2B 677cb30964c5baa6c55e418f8749d77ed818389f9522ae574a29b22be30b3df635080c9e9391540c38b419b4aabd17359f987902617749e13b17bbf537e2da41 SHA512 aaac04aa8e6a03e90f3167caa51dabc9ff02b1ccb827f82f017f4d8cf5145ac6557e037a6fb6bcfaa08694c47b99ed643ffac52b406053aaca8cb6393b674e5b
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xbacklight/xbacklight-1.2.3.ebuild b/x11-apps/xbacklight/xbacklight-1.2.3.ebuild
index fdcb163c8a96..98da6896cd48 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"
 IUSE=""
 
 RDEPEND="x11-libs/libxcb
diff --git a/x11-apps/xclock/Manifest b/x11-apps/xclock/Manifest
index de9cb65de9a3..b8fcdd659ab2 100644
--- a/x11-apps/xclock/Manifest
+++ b/x11-apps/xclock/Manifest
@@ -1,3 +1,3 @@
 DIST xclock-1.0.9.tar.bz2 175372 BLAKE2B 6e19535a357f1ed162de1ae5c403cfde6be03a3be6bebd8b338472473c8da71e00a3e6c52e7b43315735bc41345490a6dacf1b934458d4c11fec09072e2f9b00 SHA512 fcbac0b4ab1cea4ae0751ce1c0c6302048e5d98d459873c7580e4ca786ec49fa27f73e5831bdfe135abb5cfeabe886456276e9d01351ea7905c606f40f84522d
-EBUILD xclock-1.0.9.ebuild 503 BLAKE2B 35e749d14372266c140ccafa1ee88a19267ce43f6d3165f4efaf757822072b4e90e7e15c49be63c71696f3b30004f9f4131402db51c4f8a46b0746829e02326a SHA512 0e6b4f414fdd6a140619be85cea547b959a2deb4c14ed0d490b700c69eeb522be7365c400f4350331f76fdcccb870d5951513ed505f15b1e8114c7f8dac70642
+EBUILD xclock-1.0.9.ebuild 481 BLAKE2B 2e5fd56081cb9847c077f8d8997ff8da870a9a684e27fec844f310435e35dbf77931043d69e9cccb11cdd95e663e0462c52cd302adecf008997052f228771e57 SHA512 eb40650fc84f3ac7238f420e85bd85493e3d9d47fb2d31d4e7fd1c9da14c1798cf415d88e8d58f3a602236c31350dcd4ce38bcc19517b9ba6ce1f18264500df8
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xclock/xclock-1.0.9.ebuild b/x11-apps/xclock/xclock-1.0.9.ebuild
index 6c4e1aac1fc6..aaab16b9086f 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-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-apps/xcmsdb/Manifest b/x11-apps/xcmsdb/Manifest
index 44e7a8e29ab4..131e76ecbbdf 100644
--- a/x11-apps/xcmsdb/Manifest
+++ b/x11-apps/xcmsdb/Manifest
@@ -1,3 +1,3 @@
 DIST xcmsdb-1.0.5.tar.bz2 145419 BLAKE2B 41269ca270e4b11838f54669900a074dfbbc7339af84db8638498e220eb7abac2fe055ca003dba326babf368d26137eabc0f0bae9f69233d9c91f7e727c3ba30 SHA512 e47bfce87d7531e7809c300e01120c3e8d6001130d9a6c9f6de5bc19651d8712d273a6f54452223bd8c4bff4612b5ecae8db45eddb022da945ed6e14c9c84ae4
-EBUILD xcmsdb-1.0.5.ebuild 371 BLAKE2B 1b7011eb8a63ad44876e396507bf0d490d8f0c4f2bcc011dd5fdff2f44ea5e33f74fb6f378b09dde5ca8668d92da8e058f99dc83bf1594fda86dadac13393b1e SHA512 2128d5e1f203a7275aa1c23803b6ba3de13dc7abae716ccca7da57da0d2f38b75ba9a9afea4feaf4121bb430a1f0f14a5eabfda142b261678bc480cdcf58f238
+EBUILD xcmsdb-1.0.5.ebuild 349 BLAKE2B 2ccb372d62549b11ac7ff0e4cc1b52700aaa2dde68d01086fefd523b50514c0dac45790c086d1add70204582006bf92d67c1b197e7ce0e6577df0039a2bf6dbf SHA512 383ab4054b7772ecf924c8cc07895ff2f0ba1322c177c49e19146fa692af55cfa7ff0222ead19e4c94f70399215ee4b02684d5f4d7692f9635d61c1e42ff11a0
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xcmsdb/xcmsdb-1.0.5.ebuild b/x11-apps/xcmsdb/xcmsdb-1.0.5.ebuild
index a12268d39b20..1a501d081f64 100644
--- a/x11-apps/xcmsdb/xcmsdb-1.0.5.ebuild
+++ b/x11-apps/xcmsdb/xcmsdb-1.0.5.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 inherit xorg-2
 
 DESCRIPTION="Device Color Characterization utility for X Color Management System"
-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"
 IUSE=""
 
 RDEPEND="x11-libs/libX11"
diff --git a/x11-apps/xconsole/Manifest b/x11-apps/xconsole/Manifest
index d04058f63c31..7ef891ecea63 100644
--- a/x11-apps/xconsole/Manifest
+++ b/x11-apps/xconsole/Manifest
@@ -1,3 +1,3 @@
 DIST xconsole-1.0.7.tar.bz2 134832 BLAKE2B 20f9729d0aad2aceb1c7197b2ae45f65088dc39fb5980eb41a39935fb180ee7181c560ef180b0413b28adf36882a13fbdbd454d8b6dbb0cc06f69632f903b546 SHA512 89f391058ea99904587bd1dac9e31fa3ff06cf63b899abe6c06e4897bbc9919500dd4773873b1a452de4f54cc6999bd496022b6d8df9d4147804448abbdca2f9
-EBUILD xconsole-1.0.7.ebuild 379 BLAKE2B eb1c0d5b8e16a65cf49e38d71fda804d3d2355fc16ef412a16839f8e9aef58449db83780e2613bfe5ccaeefd79cbfc3a68e2769fa4e75535cb11765dec11c77b SHA512 cf8503622080ce051d32267a2075c1fe008dc12c143b14ca7e364e9a843b585cd4c5b4c324d3553474a817f376cf9818ae109bfb61350a0baca7fbad46174258
+EBUILD xconsole-1.0.7.ebuild 369 BLAKE2B fd4009f36f09cc88c0fd95301ab6c533d3b840d29b5df1a62aa0ed5f3e72e315952d9bddaef56663ced10d90b2727c1d769e70e4176a93254378766a5a629f78 SHA512 3200b20a8b92ab3047ffa099590b9327c3527e945826b757d6630c5d326dd9a01a2a88dc2a192ffd884dde94e4ee9de0fcba603dc0bc4beaf1f94553dd897bf6
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xconsole/xconsole-1.0.7.ebuild b/x11-apps/xconsole/xconsole-1.0.7.ebuild
index 7c43b2c2694b..804fca6ca1ac 100644
--- a/x11-apps/xconsole/xconsole-1.0.7.ebuild
+++ b/x11-apps/xconsole/xconsole-1.0.7.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 inherit xorg-2
 
 DESCRIPTION="monitor system console messages with X"
-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"
 IUSE=""
 RDEPEND="x11-libs/libXaw
 	x11-libs/libXmu
diff --git a/x11-apps/xcursorgen/Manifest b/x11-apps/xcursorgen/Manifest
index 7c54fbb56685..e48ba875833c 100644
--- a/x11-apps/xcursorgen/Manifest
+++ b/x11-apps/xcursorgen/Manifest
@@ -1,3 +1,3 @@
 DIST xcursorgen-1.0.7.tar.bz2 128102 BLAKE2B d4e583e0183e23d1a127d367e520027bb36dad44306dc2848717f2d25ea3cb656a7cd95fd02a18522911a720319126eed07637e1809b868f1f85c74773a10c35 SHA512 bd13ad23691d3daa2d5dcdc5902cf62e3dcb97a0289aff362e6cd85866a1d8cafb64f98800a75bfb4cf1f3c76244ca20201847dff594543d136d0abaec7011d2
-EBUILD xcursorgen-1.0.7.ebuild 398 BLAKE2B 07118d24680c4ec043f3e521b9f006e8195cf12815a9e390786a8a0cbbd58005db877e9ece9047952530b0b7a3bc7f8769cee0023b097241a4e83e21ecf6e79e SHA512 de5cb6333c30ca4b28617ba7c02707aa1eccaccf9f4827a742b8073f5506a26e382c8711e678352dd298d23c383738c7cd1d03edd39506022c3305697b981f15
+EBUILD xcursorgen-1.0.7.ebuild 376 BLAKE2B 48c38df8579723aa700baba4726016d16579c4fe7039d32656b013c2a2127d78527978561eae1abe49887cd0318aa242f4226574c432f26b1661356d0175fb6d SHA512 cb46aec7c16279addc1329a5acc152cbc20614456601bc5dda07f57bd48e296d5b88b86e481a4f227725f6a35a119c70e6d696070bb4f08468af34c05b52b2b8
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xcursorgen/xcursorgen-1.0.7.ebuild b/x11-apps/xcursorgen/xcursorgen-1.0.7.ebuild
index 20b958c7dd87..f7b9ae3abc13 100644
--- a/x11-apps/xcursorgen/xcursorgen-1.0.7.ebuild
+++ b/x11-apps/xcursorgen/xcursorgen-1.0.7.ebuild
@@ -6,7 +6,7 @@ inherit xorg-2
 
 DESCRIPTION="create an X cursor file from a collection of PNG images"
 
-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"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-apps/xdm/Manifest b/x11-apps/xdm/Manifest
index 867ed560d6d1..00a89fafc9cf 100644
--- a/x11-apps/xdm/Manifest
+++ b/x11-apps/xdm/Manifest
@@ -2,5 +2,5 @@ AUX Xsession 1521 BLAKE2B cb2090c2f2c1626df08fe45e80ab668ec9ca43f8f647f9a16d09e7
 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
 DIST xdm-1.1.12.tar.bz2 512074 BLAKE2B a82d124f4b7ce3185d703fca3aade92e86094602aec5343566ba8c91c54b70cdedbaea2fa6fee330d7ed48d9138b04a998aa2dae06db2683bfcce6c7693edc82 SHA512 1a4be0a070ced5db8fda6fc74794c9f9ed0cb37fa440fda6a3a7652aff62dfc3d7ba68b9facf054671ebf0f4db2a0eec29d0aa3716e3407ccd5529bac3553bdb
-EBUILD xdm-1.1.12.ebuild 1944 BLAKE2B 8921b58a54d643fa5d2e56b755bbb0729c2850967417c8def84e96126f5009a2d2a0161da5b7e98e35e32d899a6bf79c65385c3f52ed8fa8b10d50d09f0fa485 SHA512 1ebeef52b00ed514893b3ecd6917ef528ccead49ac8e31be2f50376fee72e6e367fa070b7ee2a497f79ec8e94c38fbfbf5db18fcb965bc5a96358cacdf3cc7f0
+EBUILD xdm-1.1.12.ebuild 1935 BLAKE2B e0c1f8a6bf93b56a05d9126d1a23f1aa5ff627b5b5039bf655c3503656b23a8a01d3e5151cdf17686b376af626d4b042c28aa6425c9ee38ab83b6fd93a689641 SHA512 d3170141864f5f4ce47f8ec84b5f8791db2d939fcc252dc697014e43016d35b60d3738762c4509e56675082aad184332dbd2b5530b6fd0c43f20272e586934f4
 MISC metadata.xml 345 BLAKE2B 18769beab9cc2a2a845351093c2e356c62bff79141960846a980da0132fae2e761ef45822fcf7a5a563a794ac3449870ddba2600f3d60171e83319c1687a6dfb SHA512 114ab21e12a92854e6d676e84f439518480445aa06b7c9fa94dfba827b51732895f0b4a50c16994c87441ddefab01f2f50955767ca30305e8650df9789132c5a
diff --git a/x11-apps/xdm/xdm-1.1.12.ebuild b/x11-apps/xdm/xdm-1.1.12.ebuild
index f1cf9836300d..ec0a4a054edc 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"
 IUSE="consolekit ipv6 pam systemd truetype xinerama xpm"
 
 RDEPEND="
@@ -26,7 +26,7 @@ RDEPEND="
 	x11-libs/libXmu
 	x11-libs/libXt
 	consolekit? ( sys-auth/consolekit )
-	pam? ( virtual/pam )
+	pam? ( sys-libs/pam )
 	systemd? ( >=sys-apps/systemd-209 )
 	truetype? (
 		x11-libs/libXrender
diff --git a/x11-apps/xdpyinfo/Manifest b/x11-apps/xdpyinfo/Manifest
index 5131abada46f..6141ebd28031 100644
--- a/x11-apps/xdpyinfo/Manifest
+++ b/x11-apps/xdpyinfo/Manifest
@@ -1,5 +1,5 @@
 DIST xdpyinfo-1.3.1.tar.bz2 136412 BLAKE2B 6c9750a0c9690f6c5cebf3551f6ed77b4504e1ec31685c698abb5963b571d214d4647f3b1b11837e3df645becc468bd9f0275616527519693011d7e3168051a3 SHA512 1d9f5948f04bf555181f7989bd25dd4559226f757a8452493cfa7ba0ed33112502df28ea702e48c384e801360ea1b6374a1e3f626bd56b7a855016c12b7ad927
 DIST xdpyinfo-1.3.2.tar.bz2 141351 BLAKE2B b2dee4f424dee902c31430b8843c14d6836508ee0125db7de41f5e9faef1732dea571e90b37638cc90dabd3995a0ceb5e4094707138b7e066ee1ae856258503c SHA512 2c9097c13778c7a7fe5a9b3ee04b28512ff6028231eca91ecdf6104c742be470678920d37a4f540fece7e39dccbea34802271f359ab80618027b2856c8912e7d
-EBUILD xdpyinfo-1.3.1.ebuild 797 BLAKE2B 7f8a29c678ee8b9cc923a0a4317e4001570d40178627187fd0b633f2136d1a375f19156299170e6a2cbbee1f29c333baae87dbdee935a52e58ccd6508d21220b SHA512 49266b18ebcd171be8a017bb01e4f66b4c000cfaca23ec0cca1f40d63d31bc6ea5f9a18e2bcc335334fbd1c86e0492735119ea8364c660088ae6dffa0a79c44c
-EBUILD xdpyinfo-1.3.2.ebuild 797 BLAKE2B 7f8a29c678ee8b9cc923a0a4317e4001570d40178627187fd0b633f2136d1a375f19156299170e6a2cbbee1f29c333baae87dbdee935a52e58ccd6508d21220b SHA512 49266b18ebcd171be8a017bb01e4f66b4c000cfaca23ec0cca1f40d63d31bc6ea5f9a18e2bcc335334fbd1c86e0492735119ea8364c660088ae6dffa0a79c44c
+EBUILD xdpyinfo-1.3.1.ebuild 775 BLAKE2B b42cd7248d3c311907685da2e6cd872a6d7341730e7e24521b503a1207284eb7925985691a776603ec5d773db73b8e7dcb09ba08ec9ec0b2140cd00d48c52561 SHA512 2f5cd3401eddaf058506f621fd6ec2e0c6c952b50dbbb96d1d3d55f6fad849f38ad01bf9602ccb0924db63d2a22f197a1cd997695ee8ef0e7f8e3245a5784060
+EBUILD xdpyinfo-1.3.2.ebuild 775 BLAKE2B b42cd7248d3c311907685da2e6cd872a6d7341730e7e24521b503a1207284eb7925985691a776603ec5d773db73b8e7dcb09ba08ec9ec0b2140cd00d48c52561 SHA512 2f5cd3401eddaf058506f621fd6ec2e0c6c952b50dbbb96d1d3d55f6fad849f38ad01bf9602ccb0924db63d2a22f197a1cd997695ee8ef0e7f8e3245a5784060
 MISC metadata.xml 347 BLAKE2B 0496b148ad07710139de96e153b80e6035e6731a18d6e8a4dce75dd17bdfc54ad77276f1f82791393d198e96c9306f464dbce832b4d643b6285fb9a6d92e6261 SHA512 98174497a1f55be4b14d769ec110dafd63a8942eb8f51e2953237b76705128e47bd36a39b9c25985cdd99a3b431f3d5aa856fd634b2a2fbfc1a5cc13a3826fab
diff --git a/x11-apps/xdpyinfo/xdpyinfo-1.3.1.ebuild b/x11-apps/xdpyinfo/xdpyinfo-1.3.1.ebuild
index 1b65aca89d80..36586b03efe7 100644
--- a/x11-apps/xdpyinfo/xdpyinfo-1.3.1.ebuild
+++ b/x11-apps/xdpyinfo/xdpyinfo-1.3.1.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 inherit xorg-2
 
 DESCRIPTION="Display 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 ~sparc-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris ~x86-winnt"
 IUSE="dga dmx xinerama"
 
 RDEPEND="
diff --git a/x11-apps/xdpyinfo/xdpyinfo-1.3.2.ebuild b/x11-apps/xdpyinfo/xdpyinfo-1.3.2.ebuild
index 1b65aca89d80..36586b03efe7 100644
--- a/x11-apps/xdpyinfo/xdpyinfo-1.3.2.ebuild
+++ b/x11-apps/xdpyinfo/xdpyinfo-1.3.2.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 inherit xorg-2
 
 DESCRIPTION="Display 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 ~sparc-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris ~x86-winnt"
 IUSE="dga dmx xinerama"
 
 RDEPEND="
diff --git a/x11-apps/xdriinfo/Manifest b/x11-apps/xdriinfo/Manifest
index ade9f7bdfe94..97641b8f6b12 100644
--- a/x11-apps/xdriinfo/Manifest
+++ b/x11-apps/xdriinfo/Manifest
@@ -1,5 +1,5 @@
 DIST xdriinfo-1.0.5.tar.bz2 121276 BLAKE2B c6db6dfd5ff0f5f6106f92ad42b37e18cc148d156a5e294c497f4ac84226114bcb7d7666196b4b1e1b4471108f839c03d4a2e1dc19080af0d60c5cfb10b55463 SHA512 6b7a3641f488d305f950c494464fd4b674ab3aaed5c7159d6d8ddad4587c18d680e5854bd80666444f1dee52eb4f46b45709a6d9c333593fe045c73e738524de
 DIST xdriinfo-1.0.6.tar.bz2 123636 BLAKE2B 43e15c6833ad84760c89abff272864e13b777c01796ba119fbc7fa7165ab05cf5a090cf736f618a25385b5d5a8cf2d679fbe2cd55119842fcf9e16fdb46dd549 SHA512 7ddd9e19abaef93e4d85004293528ec3814ef84c470d496dbb8dc8313d804bb7520406de8d33d2bc2b3af942bd0a5d5032a109b2726438a966af63ea680a102f
-EBUILD xdriinfo-1.0.5.ebuild 515 BLAKE2B 9b5c326d81d08c406653f0f0190d9ed50fc43ead64b03a2c9095f1bc92899e6351745f7ac0ff94f7c3d0887afc8b521e3de9279fe70450431da28a43fcd7167e SHA512 ff18c90bf854b98a7551e01705a2b48129f40bc453122c4518e35651e2f050c1e9c046c4488be47cbac81fc95629459549b03260dbc299b2ddebf515ee134318
-EBUILD xdriinfo-1.0.6.ebuild 514 BLAKE2B d9f548cd809f8dbe7f63256094f1284d98222c28c71754fc0b4f8c1f258795899000c0e75fac5edb93c8f8f50e5bfeb9a371b9255257587fca51f0b3600993a3 SHA512 3f73d9af7c154e385a7b4bed0e880a84de21185db739ec8ac8d01b422d1ac84f062e2d97371435be0527c2513b5a6986b1e3780e939cb4a85df04c7894dedc80
+EBUILD xdriinfo-1.0.5.ebuild 493 BLAKE2B 119ec181ba12a98283f7045ba407c83eb9620a19f0d343965057301c2a26b8c447f06685fb041b23357da14579b76d26946aa2e8cfbaba892386fe49636ea460 SHA512 f201a631484dea570e52a3abc4d1e1bc50c1a3a16bf5ded2c2eb18e2575d6844ba088cc3d6bb5796155beec94931b53e48b0cf129f9414c6d1971397631a5948
+EBUILD xdriinfo-1.0.6.ebuild 492 BLAKE2B 919b16503be82b6efc2aaeb9dbd5b7d36325d2f6f79ce0246be1e3ad52952161364bd05ada306dcefc91fd90bdb7793ea68059bfdf492723a4dcd2faee068e1c SHA512 1f7cf6b9e6e86a7b6705ecbf4c3e10f020b47e24b50ccb135866680bb675e3630e8d71f1ed4e3b3a75c6d090558f64fe4becdedf64feb353a9a0cec28897b37a
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xdriinfo/xdriinfo-1.0.5.ebuild b/x11-apps/xdriinfo/xdriinfo-1.0.5.ebuild
index 9e95c9e43c3f..29382cf202e1 100644
--- a/x11-apps/xdriinfo/xdriinfo-1.0.5.ebuild
+++ b/x11-apps/xdriinfo/xdriinfo-1.0.5.ebuild
@@ -6,7 +6,7 @@ inherit xorg-2 flag-o-matic multilib
 
 DESCRIPTION="query configuration information of DRI drivers"
 
-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"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-apps/xdriinfo/xdriinfo-1.0.6.ebuild b/x11-apps/xdriinfo/xdriinfo-1.0.6.ebuild
index 8a64373394ae..d9f690275d5a 100644
--- a/x11-apps/xdriinfo/xdriinfo-1.0.6.ebuild
+++ b/x11-apps/xdriinfo/xdriinfo-1.0.6.ebuild
@@ -6,7 +6,7 @@ inherit xorg-2 flag-o-matic multilib
 
 DESCRIPTION="query configuration information of DRI drivers"
 
-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"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-apps/xev/Manifest b/x11-apps/xev/Manifest
index 2c3356aed5a5..746ca527a543 100644
--- a/x11-apps/xev/Manifest
+++ b/x11-apps/xev/Manifest
@@ -1,3 +1,3 @@
 DIST xev-1.2.3.tar.bz2 134866 BLAKE2B 9ff8bdb1e75754a5390115d10dd5851f71b2319ad7ff02299ff28284aa23c14cd1ad3ee9eea81718ed355fc31983e4f7ec0312b31e3f86d3691bb52ebbe0cc4e SHA512 47cc7ac096e77cfa4e687914d767263cf3e1dca5bffd0f68c7ba0fe751b248c8a16525bd2da4d6efa0ea8d637831c893d41c9687cace4aaa9c0909a45ef1943e
-EBUILD xev-1.2.3.ebuild 404 BLAKE2B 8dd0d767b8f05a9a9aa53d435668f938db4b64cbaf65a40700e71dda5fab929e7893eb63642a67159eddefdd62a34bc7d34e3c77fc5a9da896af14a3cc6f9ae1 SHA512 1f62a72f9bcc5969edac23009be60b47b5f9bbdf708a3a36beb851d3322cb088012ee5db6185ccefe60614e3bac55d2601b96446a5ba66dc1ac53f757392e4c8
+EBUILD xev-1.2.3.ebuild 382 BLAKE2B 34f0bd6e83940b08c2defc9454546a11ef073d11831d43e3156a2e04a3a2cd3a36a67bfe64c830ec8fd2de74d2a4b51b404ff3389be6d011fe124ef3d5ffc673 SHA512 95d0735dca9bbc03509f38bdd7dcc060a3b9c905c3fce311c24417ce91f5fbd065b610809cb30253d6555ff4643d2597ff3b98f9453b553f45618c549e7cec6f
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xev/xev-1.2.3.ebuild b/x11-apps/xev/xev-1.2.3.ebuild
index 098fcd98f740..920881b4fa14 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-linux ~x86-linux ~x86-winnt"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-apps/xf86dga/Manifest b/x11-apps/xf86dga/Manifest
index fddd68e89707..59635a9cb64f 100644
--- a/x11-apps/xf86dga/Manifest
+++ b/x11-apps/xf86dga/Manifest
@@ -1,3 +1,3 @@
 DIST xf86dga-1.0.3.tar.bz2 104935 BLAKE2B ec294d1d1d49b57479d52e9bee834ad15eb15758d50da3d894c5236e9d94a37e2383258e2c2456ef6a6cf9f73d1332b594fc663a48dd0241cfc02be1b9157480 SHA512 18dbf9b5bbe1bb9c993c742e04e132ee22e376148a499ee159418435477221b00904f36c1a6b1063df788079a4ff5520b4d604abcafaad3b5fd391a3b2c1ec07
-EBUILD xf86dga-1.0.3.ebuild 394 BLAKE2B 8ee07aba2441adfd7f7192951115f51c160a91af829c75b26da0b42e43240a356b63d8d849feb35f38fccf505b23601ff096db67fd7b9cfe727ad44d90ee324b SHA512 24b9ebd2b750f6fb2ce2f38087be59c30566eef0fe1c110194d4526192ff163cbb2732fb02fff2774914c3f41a392b4e3d9b286409204b658d4baaba75fa173a
+EBUILD xf86dga-1.0.3.ebuild 372 BLAKE2B 997c8b8c825b51ee4becf5c736aa3dc20359f61a8d5cd6e5dd08c0655e544ec895540b3b64cc020ae986ef98397b27ad99d32c2402a694f4b67ffb60bec4b707 SHA512 36a27f5502bcca94b3cb17dce75684b6de2b39aa06726fd0e2cef7850e17fd1bc40ab7c18a2eea0b64a6710cfbe24c2e1790c7ad7edb7dbc2132e27a10c8100a
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xf86dga/xf86dga-1.0.3.ebuild b/x11-apps/xf86dga/xf86dga-1.0.3.ebuild
index 89597872cdb6..dab85811c04a 100644
--- a/x11-apps/xf86dga/xf86dga-1.0.3.ebuild
+++ b/x11-apps/xf86dga/xf86dga-1.0.3.ebuild
@@ -7,7 +7,7 @@ inherit xorg-2
 
 DESCRIPTION="Test program for the XFree86-DGA extension"
 
-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"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-apps/xgamma/Manifest b/x11-apps/xgamma/Manifest
index 758ece35951b..0b85a658335d 100644
--- a/x11-apps/xgamma/Manifest
+++ b/x11-apps/xgamma/Manifest
@@ -1,3 +1,3 @@
 DIST xgamma-1.0.6.tar.bz2 123105 BLAKE2B fbf5496e7c91f1e96d591721bfe7a1771659e7ef408be689e205e898191e0fd6beeff9466f4eff628054aefa640e83d7a8d69de028a6a6e5716a1eee50ef0abd SHA512 2d41798e15ac8c6f6731a2da29589207d936eaee1223ce6f3ca948e67d63c5c8b955d11c7db092dcd8c66a6209bd15c1de3dc1446dad4b4277134f010c6fc47a
-EBUILD xgamma-1.0.6.ebuild 401 BLAKE2B f2e73e061952ffc82008293dfcac595f893b22fe4101d52ddf4e9000b41195cc34aa3df208fccb710276e172ca2bb43cf44596977029e87ad16a90cbf7c98906 SHA512 4efd59b90db7dec1943eaa7bca648243e2a3821980e826688c1ae87d8c10d22a334b415e33bdbad1cdd3dc18b6798ded1188e41dabd6d19ee0160560b9b4cc61
+EBUILD xgamma-1.0.6.ebuild 379 BLAKE2B e2c9eaae1389d5ade3a48b4423eac908dad4c667eedece9d59a4186d2796781b864d0d6798344a1d430dd5554069ace2be6af28f9afafcf6fee92de1e6260168 SHA512 c55ec17124b832bc18895284d3065e1d065c3f5b4a6a04b06e499a5f2cae2f68b50031a9c111809792e6c2e63726bf256e31836107eadfd2907934fc1b996a8d
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xgamma/xgamma-1.0.6.ebuild b/x11-apps/xgamma/xgamma-1.0.6.ebuild
index 54f51932cad0..370256674e0d 100644
--- a/x11-apps/xgamma/xgamma-1.0.6.ebuild
+++ b/x11-apps/xgamma/xgamma-1.0.6.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 inherit xorg-2
 
 DESCRIPTION="Alter a monitor's gamma correction through the X 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"
 IUSE=""
 
 RDEPEND="x11-libs/libXxf86vm
diff --git a/x11-apps/xhost/Manifest b/x11-apps/xhost/Manifest
index 27af71a6e145..d396e3f6db57 100644
--- a/x11-apps/xhost/Manifest
+++ b/x11-apps/xhost/Manifest
@@ -1,3 +1,3 @@
 DIST xhost-1.0.8.tar.bz2 138539 BLAKE2B f05d58444537431d9dce5e6dccc27bc8116141d66b34b6edb356dbe823898dbb2927f8ad8dc133178efc7e5b399b7b6428883ea7c665577d4b1984300474eabe SHA512 55581f9bc45a70a73b13fe718ca83c4cb0a6116d26addc0f07659ebeb5bf7d2379e84cab5a1702ae77a298a66f42ae03f41ddc7d5acd61c6f18448e58ad7cb6b
-EBUILD xhost-1.0.8.ebuild 541 BLAKE2B 82a5f2f3fe42c99ca9378e0851543f188ce9626105fcb08c04c0569e91d96d57ccfe7ef1ed6ae08ae70937cf4069ef6645b329254e1a0fd6fe4f8aa12b9b87b2 SHA512 fbf6d3f04e62b23622efbc363aa7dd3f021a8cce464821296a20ca56f29c9738c32b0cb0e04ffad58cff78cf454d10d65058c6fdd5b6f647a4fbbbb56abaa360
+EBUILD xhost-1.0.8.ebuild 519 BLAKE2B 9ac5b24573a87f42525f003bf0a984479e9649157aedfed3f9e2bd1a1ffc0cb2d63912816d4ee604283c7030d97e85054c42cf7bec43601aaaba0e4ce2fe4b9c SHA512 fc8a145e5761646f8932cf023ac5977e50ce4161f7af88aebdc86cd87ac58d70b1391cc64bb7bfc026fee454d022c6630cf3026f2794c889583f4dbd37bbab04
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xhost/xhost-1.0.8.ebuild b/x11-apps/xhost/xhost-1.0.8.ebuild
index 97e4b1d2eb92..af98cb2c3c18 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-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="ipv6"
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-apps/xinit/Manifest b/x11-apps/xinit/Manifest
index c277369168db..2c244221e3ef 100644
--- a/x11-apps/xinit/Manifest
+++ b/x11-apps/xinit/Manifest
@@ -8,5 +8,5 @@ AUX xinit-1.4.0-startx-current-vt.patch 740 BLAKE2B f5ac87b96f76bd4c845cde4844f9
 AUX xinit-1.4.1-move-serverauthfile-into-tmp.patch 745 BLAKE2B 6a964926b4f5eda566be4ff5c0f015ca2d3a9f39f16ba5af0cf3816c56cf458e616645ace1b8be9873c604322ab56b118a7a9e531533f8617cb647a57cf0cf3e SHA512 0fb93f0cebfd4091d7e58139ef375fec931392159b3b060d699d118c89d4403fd5cee82cd35582aedf7dd752aee495724119f864b17988d0dd9a5dfe76c88ce0
 AUX xserverrc.2 143 BLAKE2B b33fac4b5ba731c79167d21a07840c46abfbb33e8fbb80aa1c3f23a8717f836819da3a947b72bd99c7a14516534e9771033bcd1e26d167f2f7083be20eae3b2f SHA512 61afea54f66b9f397860e467cf87a41e1d9f97d7194930bccc254e44dd4178bca7b402bff7aa2a1d6f44a91680f3f1ee10a5b57e527aaff80438623edc1b07c5
 DIST xinit-1.4.1.tar.bz2 176206 BLAKE2B 1c20f34db344eb967ac230a0cd61ad07d0089668aea32973e9b8b9749e5260ad5d93a7f6642a4f2c8d6b01870696e4e1e422790c2954320039aa85e6dba8870a SHA512 6cbc5d025a891c419f3f4493381b2fca57a67d78df866d2f16a83426f86bad6eca7f240fac12b25cbcc63df0fec41f625407184e044898602d66483715315340
-EBUILD xinit-1.4.1.ebuild 2253 BLAKE2B e9026b79926f2a838f846ab518dd1fe13515a87ba2c383fd256fb557ed600861cb26f9f5ee932cce7d674a05c15b703b2b565144cc95aec2d95a780a855b0e2a SHA512 7ca0c6c531503061145aef9128ac4448dad378cb1dc46ad5a1d72bb2a3c6e2c7098db3fadabe0a8bcc5c1fe1553a802fa11e8e23c635ca8aaffebfdc05497ddf
+EBUILD xinit-1.4.1.ebuild 2231 BLAKE2B 8a7c24c190e9c55fac49bfe236a9c81ddbb6ba3c1db9ff0353c959f8ec06ca421b10f2110fd8aed30973a12f4161ca4f5f14b71cc0a2353dcd3a3b9af4be8dd7 SHA512 37878c2bbcc24fe2060238e6086798e20c3832673007706e510a2744e1708b3e5d92bcd6d091a4395309c120babf7cd186e52fd277e5671280f20fba27e63664
 MISC metadata.xml 477 BLAKE2B 96cb48063d5da3ee74d3c6080b849841fb1b276338db584d51bac71b5b2c3df0ecd876055a3c11e18f46c4d879a90ef91713166cae2aef65ea7725ab639b116f SHA512 c3e1095f0e3e017439777b3113d16ceccdc5ee7127da7f9e994126d6f51227a07c831e082d58c9c094aa6fed3e789458a212e27ec497fd3a14ba4cc5e4956205
diff --git a/x11-apps/xinit/xinit-1.4.1.ebuild b/x11-apps/xinit/xinit-1.4.1.ebuild
index 115cabaf2356..bcf65b128ec6 100644
--- a/x11-apps/xinit/xinit-1.4.1.ebuild
+++ b/x11-apps/xinit/xinit-1.4.1.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 DESCRIPTION="X Window System initializer"
 
 LICENSE="${LICENSE} GPL-2"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~arm-linux ~x86-linux"
 IUSE="twm"
 
 RDEPEND="
diff --git a/x11-apps/xinput/Manifest b/x11-apps/xinput/Manifest
index b568ae634129..3192e4b25bf5 100644
--- a/x11-apps/xinput/Manifest
+++ b/x11-apps/xinput/Manifest
@@ -1,3 +1,3 @@
 DIST xinput-1.6.3.tar.bz2 162556 BLAKE2B be5e16301c6a48999ccce5ec3062afb195eb1a6357f09aea41e88a4ea43c4497b8377a3da8d5c80b059afb9998370a7a53561a92c04ff8f56fa5749d577b0144 SHA512 cb2fef866ac5a71dbca3e23b4ecadaca38e65dc1b30f8bb024bad92486554fafc472706619a1af04c746a4f53ce6aea827d694b9f4f0c7d0d46bb1da81984076
-EBUILD xinput-1.6.3.ebuild 449 BLAKE2B bb26c5fa5887549c4dd9f2cb973b7a33eb4a5cea84e9a1fdb2a437660d511952a3b2f6f03184613707b5179607aa871eafc54bbe676c0c0495c9b68c9f14f2fd SHA512 03beb819edcd50acf307e466115b08c562dcd9403ced186451d0312ff0c3c1d6d43565100474ee6b3803533c5f14a9956c15a0002df2dbccecbf7fc78e3bf2aa
+EBUILD xinput-1.6.3.ebuild 427 BLAKE2B a6616ddec03a6be845176fbd082528f228f07eaf1e71c8f4ea7a699e1c8327c5f97ff1f3bd50ffa8c2bfbe5fff7640f480124fa222d83cbde3d9057952e95986 SHA512 9014e12bfc810ff63f8ebb8c77b804f3559982d5e865975c736e868b0398702e1906f4f9b18a6bc1ff43133fdea54ad9414f3f350ce5de8ca8dbc56061df5901
 MISC metadata.xml 315 BLAKE2B 29713769214403192ffd5937d2585eb204044d95976ff4836b1cd94406420c6c15d1df6efe7da1dd1afd7f3e950e025994dfd13e4e8fc70cd521e24ca63cbdbd SHA512 d2d36e4e38b384daa8555a0824dc7fcd364b9a61350a31a7c25f7d24e42901e0386606a8410800e7ca6efac8b49c11b805b76bd27f1510f3dd89ba91a0856400
diff --git a/x11-apps/xinput/xinput-1.6.3.ebuild b/x11-apps/xinput/xinput-1.6.3.ebuild
index 7e8a35fd7137..7beb299bd56d 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"
 IUSE=""
 
 RDEPEND=">=x11-libs/libX11-1.3
diff --git a/x11-apps/xkbcomp/Manifest b/x11-apps/xkbcomp/Manifest
index d721efbefe8d..afbc8f8b74d9 100644
--- a/x11-apps/xkbcomp/Manifest
+++ b/x11-apps/xkbcomp/Manifest
@@ -1,3 +1,3 @@
 DIST xkbcomp-1.4.2.tar.bz2 248399 BLAKE2B dcc09823fdf8a62451a1daf8dc56adbd1713b56ac7343b9edb8b3aef8b527ab8443a056ae6b4f8c21051ce5aa4764c9b198c9a5cd0e929f52e9a3e191b950334 SHA512 b00d1eb08c19be86044418c8ea3bfc3c3973406c481878270138a70ed9dab348acb8e4d0af8678879598ffbd7df1c640a63d0abad3d7481758be99af8dd7734e
-EBUILD xkbcomp-1.4.2.ebuild 442 BLAKE2B 52a63a76e9103a2d8622b12ab0df9bf9902575980652437364c9415b8f44d128484c6d44ecaa42692dde44a61051129e3cc88ac59fa073feaa47e213bf80bfc8 SHA512 368959b77d8ac3e869194b602676fb4009437489da108227727e0466fc986d728c0618ea6a33caebdcf848999ccb42b5acdd8a7fa0d24429c4fe4cbaca3310e2
+EBUILD xkbcomp-1.4.2.ebuild 420 BLAKE2B 72c6a4d273ae6eb294186eb423166e7ce049834b96480155d700cc156086b33736fb8b75043f4c9eb177f32df7032844c9ca74ccc78ac51726a47bbf86ed79b0 SHA512 c7bb299e79b8fe2b7cf39bce2185a809a732750574408e6b735ef1246d171e58f6be4d016fae0495e034171f7b6bba754ada4c570d8eb7412305537cb5c54508
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xkbcomp/xkbcomp-1.4.2.ebuild b/x11-apps/xkbcomp/xkbcomp-1.4.2.ebuild
index 76a42c4ba821..25b0095d0ad9 100644
--- a/x11-apps/xkbcomp/xkbcomp-1.4.2.ebuild
+++ b/x11-apps/xkbcomp/xkbcomp-1.4.2.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 inherit xorg-2
 
 DESCRIPTION="compile XKB keyboard description"
-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 ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 RDEPEND="x11-libs/libX11
 	x11-libs/libxkbfile"
diff --git a/x11-apps/xkbevd/Manifest b/x11-apps/xkbevd/Manifest
index abc7d5939d96..bcf763eca4fe 100644
--- a/x11-apps/xkbevd/Manifest
+++ b/x11-apps/xkbevd/Manifest
@@ -1,3 +1,3 @@
 DIST xkbevd-1.1.4.tar.bz2 151991 BLAKE2B 5f48968f4a45aeb5a851ba5c6c9cc6dd525d4385bda3475e1261a8419a3ea931fefff8e315309b6fcfba766ec9d95b4d64b93861f84798f5d730e2c5584c2cec SHA512 7628eddd0e1dc0c4df8e61eb3f6a6bf0e9d92a87e96bb2f5248ba5bd3d99d868885c36860b78e8ea2eaba3bb9a420067ef95c4d58c1254fa3d12fb25dd4e60e7
-EBUILD xkbevd-1.1.4.ebuild 359 BLAKE2B c5cc2639cb653db8d0d6316ff77382539e6d9d4cd78e083a8519528bc8fbb439c5e16a6185e1af7cf8391b2d7f73c8f4e1705fdec06596f4ce37ea52a0f9e547 SHA512 6769422e9b64a387e04ff5ac83b725b10321643ae3918d1443348d5578462ba368d115ce6d55a3b0b7327435926fad3d81661a23455e920e9524e98ef358e2fe
+EBUILD xkbevd-1.1.4.ebuild 337 BLAKE2B 7cabc034ad191997550ab371e6e51cd5f6a81dc4fc5d9013f8bca7647cda2b28c8a77aa96c3338086383870450c164b241d469656030dfc947e151b979ce8438 SHA512 21e1d4c8b79c8e656222ed4a6b50778c6d7f96c424adaadee0870d7d3840b5ed79cadcbc849930a966a35fc72e48d292ca42196df88db6519801649a9e29e3f3
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xkbevd/xkbevd-1.1.4.ebuild b/x11-apps/xkbevd/xkbevd-1.1.4.ebuild
index 438e537d6e59..1b5bbd39e852 100644
--- a/x11-apps/xkbevd/xkbevd-1.1.4.ebuild
+++ b/x11-apps/xkbevd/xkbevd-1.1.4.ebuild
@@ -7,7 +7,7 @@ inherit xorg-2
 
 DESCRIPTION="XKB event daemon"
 
-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"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-apps/xkbutils/Manifest b/x11-apps/xkbutils/Manifest
index e1fddaa81bc6..4866f35e37d2 100644
--- a/x11-apps/xkbutils/Manifest
+++ b/x11-apps/xkbutils/Manifest
@@ -1,3 +1,3 @@
 DIST xkbutils-1.0.4.tar.bz2 131269 BLAKE2B 20e51a33b280bf4eaf6dfb3b2986ffdb09d1bb4fe3dd3689de5256204cc0e90808367b0afc054e2b5a6746b3b125bc0d20337761e1714c069f3c300a65fddb06 SHA512 5bb6cb52ac02a4ec18332559853815585ca86e00e8c6452483af10c4db75811fe00952575dbbad5b7d03b9d6498830fb45d617b1b3c5c1cea8445f1131856a4d
-EBUILD xkbutils-1.0.4.ebuild 385 BLAKE2B 4417b476e25de14ca66833253d5eb5cdcd2a566d1897da4c56fdb4981fb318082922ed9c66aef4d71193eea753dd41de4dd441f6aeb406dabcdc9711ea68dcdd SHA512 97227d9d3dcca575bd2d8e6d4bb87cf880b913e9797729e3f6adf30a2697991c18fc96d47643fe27912f6ad97611961453432e313e7d45baf69c8f86957948c6
+EBUILD xkbutils-1.0.4.ebuild 363 BLAKE2B 2a46648f3836f2745abace373b1c01d61770e95ac2f3a406c609159d52d8166127763c91f3a2aed845a02e87b9a795069d1f16b2c57172fa9a20ce1b9fa084df SHA512 974fcfe9ea0c91508c6800727c5453f7e8162b04122e5a0929916f987d63912ddd67abbce03eaa8410600f41607fff88526f3d586734193a45ed1aecbb41d72e
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xkbutils/xkbutils-1.0.4.ebuild b/x11-apps/xkbutils/xkbutils-1.0.4.ebuild
index 8922936566fa..c66737213604 100644
--- a/x11-apps/xkbutils/xkbutils-1.0.4.ebuild
+++ b/x11-apps/xkbutils/xkbutils-1.0.4.ebuild
@@ -7,7 +7,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org xkbutils 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"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-apps/xkill/Manifest b/x11-apps/xkill/Manifest
index 69568bb94de9..32dff5dd1c88 100644
--- a/x11-apps/xkill/Manifest
+++ b/x11-apps/xkill/Manifest
@@ -1,5 +1,5 @@
 DIST xkill-1.0.4.tar.bz2 124828 BLAKE2B 4d7484a6e044f2a93d7d54f25619c08f657cc34955cd399e927442d8e8d79f3ad983020f75a3edb57e91371f4693909fae28b1ebf8f1e78189868c79c3ac5e87 SHA512 14d1fc0eff96a62d66307f09efc599639ee70be4bf580e2857569326881bfdcae7a8a21640509875218dd2b88575b4801ab0c43c4295550dc71141a579483545
 DIST xkill-1.0.5.tar.bz2 128146 BLAKE2B a01b954872eaad2aefe11335df2c85972abb8d36ae0c00fbca02b5af2d7df57934e3ddc47455f88927a90b0bff5ed707ca6dddbbf5478c89b193c98a86cc0562 SHA512 4603a1794f114f5cea2c885020c9d073c8421d1e785c99ff6b936ae97139c8dac8020a187b5bbd0fa6d56ed6fab879441b42ba900cc5f2f5a534dafdc86b9249
-EBUILD xkill-1.0.4.ebuild 388 BLAKE2B 8184d2474096889cbc9bcc5a3ad0b936a88acba8d2f2cc0b6ce796694a00a193348b59fe5f00fe2b6671d16d0e4a49e5738a3461738af2307299c6b7e6c7c90d SHA512 acb71c1ce6a9c25efae92867c70873e3a2b8b9267a914303d773a412e5a126ab29aedbcf6b75f6aa5cdf58dd2ddea5a8a3ed85c0d1cc92c409ea62cfc9e2f794
-EBUILD xkill-1.0.5.ebuild 388 BLAKE2B 021f99facab8c73a5d9f0563753fa462ab1598115570f45358c4f5978e317a57b55252fb7a6be275a862f62078a75825c5e94750f7eaa95617ee0f732f6c09a9 SHA512 7101f4a92f54f9d008e0d3c7d198faea7b5002ef52c331ed6871a23beeb66bec1f18ecf546a2a000244972468adea627c3af6dc41fd2eeb39034ce527114d641
+EBUILD xkill-1.0.4.ebuild 366 BLAKE2B 7ed36bc72ef63d98a865e5a2cd52c5fee7a24be98d24ce301693c09c7d9a675591897404ea28f3eb0288d73407f6cd4f745714c1e06a11dbe698412fae74031f SHA512 8647302a2ad30bfe2dc85c7b029ac928155eea8571979aff3b3f001a371ad381deb5d924974683982517f3e8ba937af2fbe034776519b5d75a8e903f23ecb275
+EBUILD xkill-1.0.5.ebuild 366 BLAKE2B 20016df4a53a8f0001b36e8ea33b5645815d72bdc0fa3bd1d06927604145ab363cc280e96a5d4198534fd7df2c84a15aeeea4d4869000c8ae0cf97d506e918a3 SHA512 6465ac0d40b32dbc8c7a6941a056ecc96d5fb76e81d5a2826fa9aa1019a75ffbc1fc4f17a870c2d42dd08938ae7a7ac911a907bd7ea664b10c9a5e4e822fa4ae
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xkill/xkill-1.0.4.ebuild b/x11-apps/xkill/xkill-1.0.4.ebuild
index dd50dd0f41bc..21e6ba9962db 100644
--- a/x11-apps/xkill/xkill-1.0.4.ebuild
+++ b/x11-apps/xkill/xkill-1.0.4.ebuild
@@ -7,7 +7,7 @@ inherit xorg-2
 
 DESCRIPTION="kill a client by its X resource"
 
-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-linux ~x86-linux ~x86-winnt"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-apps/xkill/xkill-1.0.5.ebuild b/x11-apps/xkill/xkill-1.0.5.ebuild
index badf428d330a..0cb327e973db 100644
--- a/x11-apps/xkill/xkill-1.0.5.ebuild
+++ b/x11-apps/xkill/xkill-1.0.5.ebuild
@@ -7,7 +7,7 @@ inherit xorg-2
 
 DESCRIPTION="kill a client by its X resource"
 
-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-linux ~x86-linux ~x86-winnt"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-apps/xlsatoms/Manifest b/x11-apps/xlsatoms/Manifest
index 53bbbbd77540..067e48fdaa65 100644
--- a/x11-apps/xlsatoms/Manifest
+++ b/x11-apps/xlsatoms/Manifest
@@ -1,3 +1,3 @@
 DIST xlsatoms-1.1.3.tar.bz2 126327 BLAKE2B 7a4ca35e6968432fc99dcf665b3f63ac84e5bda8a7b061fca9df7bb12e447e83feaf4c82d80a4e469e680042d7b856708821febe44897acf5cba7777e90073c4 SHA512 c267ccfdc5a83e834bfb5c3b144e22642badcadef4eb146eeec2df6fe6f85e9379500ae4219912c70fa2e535036a1a96cf496381f5d814e79af075e03c975f30
-EBUILD xlsatoms-1.1.3.ebuild 340 BLAKE2B eab9e8af6c9e77f6343640a1da216a2ce1d01fe3768b3706bb500ab4d20d95affb75da17ee9187fed6407c5659ed9bae9061f42ae46d35f4ad6198cbf57182ce SHA512 ad1f9706e825e6dfed04ab64ae1775fe16d954b57e3042453e05a5c1416825c115db89eff5032058060e76ca434a60db4cf7a5bfd634012ede7c295dec7fe380
+EBUILD xlsatoms-1.1.3.ebuild 318 BLAKE2B f8560829e8d67bcdc742833ed04060d8ab59faa2efd8d0c56f77d0911b5d240c7fde41e1b6cb1a8bd79f072a51d7ff5c7d9c918910a6cc71c7b1c8c4ba4d20df SHA512 61c79e519a541e347dbe62bdb618ba914a3d2b1eab7b80bb1e84c773063fe0a721ff424cdfe7b07344763d9fa2fe0660c6b21607268543908d3926cf681b2391
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xlsatoms/xlsatoms-1.1.3.ebuild b/x11-apps/xlsatoms/xlsatoms-1.1.3.ebuild
index edadc04a17d5..94b5abc32433 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"
 IUSE=""
 
 RDEPEND="x11-libs/libxcb:="
diff --git a/x11-apps/xlsclients/Manifest b/x11-apps/xlsclients/Manifest
index 81d14c5b66ed..3421fe9256a2 100644
--- a/x11-apps/xlsclients/Manifest
+++ b/x11-apps/xlsclients/Manifest
@@ -1,3 +1,3 @@
 DIST xlsclients-1.1.4.tar.bz2 130586 BLAKE2B 8e13bd29f10035a101cabe2a271fd665618dce12f7047f441bf943e8c4d2743e2385874b8e1cf42b69f6a19b7a3d5c16ec9ecff7e6cb62401888802d6946dd5e SHA512 42fd848d88d3cf31168a37fed63f9f5b60ddc4f36be2956b354e574c93129d75f29e005d6631784380bcef27860b54c64f419ca18ad77f092f4520dec47b10f4
-EBUILD xlsclients-1.1.4.ebuild 368 BLAKE2B a0dad845d6992b8094d64d6d346bec86d8db9dab2c681272d2c3d9ee553207c18b6b64817ca23e5973f977510d88b2ba6db9c18ed291fe6072a7139a220bd4a8 SHA512 7b081c2355561c4498410a86a1149a5d6b460674bdc2f5c2e8ee1d56c81ee2f2400eb85e1a424be7322af595ffaca96e2f8ea48cf1b3f3d418dd736f43ad201f
+EBUILD xlsclients-1.1.4.ebuild 346 BLAKE2B 4d1da22db60977b3e469592cfc6632040b16748e65136827dbf4010627b714277b757e69cd487cd1cb07cf02a8d4ba208e51db88a848770c29402ceb2f806943 SHA512 dd617ba7d770d2dbc0dada6b07b092826e090cafdeb1e2cbfdc1ecf702b2844e7870ff1c7927231d20b4df2b2e773348a9c42d42c238e16c585eb21e665d44a0
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xlsclients/xlsclients-1.1.4.ebuild b/x11-apps/xlsclients/xlsclients-1.1.4.ebuild
index d3359dd6ba5b..608f7e44715b 100644
--- a/x11-apps/xlsclients/xlsclients-1.1.4.ebuild
+++ b/x11-apps/xlsclients/xlsclients-1.1.4.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 inherit xorg-2
 
 DESCRIPTION="X.Org xlsclients 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"
 IUSE=""
 
 RDEPEND="
diff --git a/x11-apps/xmessage/Manifest b/x11-apps/xmessage/Manifest
index fb96af8ef577..61034c40d482 100644
--- a/x11-apps/xmessage/Manifest
+++ b/x11-apps/xmessage/Manifest
@@ -1,5 +1,5 @@
 DIST xmessage-1.0.4.tar.bz2 125011 BLAKE2B 4b1134ac3dcb6a696ba75dddb3fcd348222763c375067279e4d6af41c3c2c855249cd76b888693a5c0136144071acb628c0e3a653ce0afed70d0e6910d055a4f SHA512 a087fb09595bf0b188a4525b45e9b607acd063cceae36c69c78a48674fb7eca1c82d5c2d2770c7f4425b499e4c002bfc0e377935308c218a330a2b4994b94ebd
 DIST xmessage-1.0.5.tar.bz2 133393 BLAKE2B afa42e20ba995fa1086cd3cee5b90be8564c521f7bc12b544a787cc753782e1cfdbc5a94f5925f5bae1b630b7ac08fcaeee59e319f680d3be29c46d5421aa048 SHA512 a8423c3986b1576fa67800c315a605a527bb9a8f594ac269a736ae7b91eed0d4d83deb89148197dc3cd3f0e51894146958ce2979f78e97dcdb99c5326e34dabe
-EBUILD xmessage-1.0.4.ebuild 494 BLAKE2B 4cb86431cab9b0abfeb31521693848f4336db7635c7c19cba7802fad02f3c11c3b25fc4e642d18d61a2cb9c7db41d0eb34e5d259949ca0986bdbc71bfe0df114 SHA512 48affa08cb4259b5a015d19dbb57e4da58bd55a4cefaaca1f87ca2ae4212636195735c6c094ad9e5528d2aabbe2dc07f31972336765348a27808d6330e17ea01
-EBUILD xmessage-1.0.5.ebuild 489 BLAKE2B c075cdd01da2f62266a0d2c8a0d252790162bda517f5785e9216a262c1143f1d6d13e6720a33978f8365a27721b5bc48f178d1c3fb8443ae79bb18b8d6de4003 SHA512 915d6077173ee523583403b7da5bbb2e078ff730f775e47439cbbe803bfed8e18c8b0ff80dc6034ff17380bd9df09c394c1f59aab9a8ce3d7a5c082ff8379dc4
+EBUILD xmessage-1.0.4.ebuild 472 BLAKE2B 80e308dae2d5a00230c58e5c07fd437d6a52a94fe000db742c4ca2f504ec94a7e245cdd6620fc478a415cddef513f423eafe4e93e512d68433c335d471ca9cfe SHA512 6f0f41cb5901ab0bdf5d02297003967efdada4de194fff83648aa4ce04c1990d4ae94727d0b6d235db9402a8be5df8ffe3e0b7a354296b752ee35bd35ee3a83c
+EBUILD xmessage-1.0.5.ebuild 467 BLAKE2B e56959856323c16bd2343576a0dd2916ff6789e7aa45fcef78cd15ed0bbdc85c69f47a648eb645de9c8fe691123766e9ce845d7c262c7c6761d5963bc141934c SHA512 1a26322283a38fe52a6bc84d0c31d70f5bb9a935809d39ba3d5cf6de8ab6664f3bf70dfa7dc07d2a400e1d63c6009e02f5c636e5be6aeb27552fde48390dbf32
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xmessage/xmessage-1.0.4.ebuild b/x11-apps/xmessage/xmessage-1.0.4.ebuild
index 0bc79e26faf3..4ea3a17b484e 100644
--- a/x11-apps/xmessage/xmessage-1.0.4.ebuild
+++ b/x11-apps/xmessage/xmessage-1.0.4.ebuild
@@ -7,7 +7,7 @@ inherit xorg-2
 
 DESCRIPTION="display a message or query in a window (X-based /bin/echo)"
 
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="x11-libs/libXaw
diff --git a/x11-apps/xmessage/xmessage-1.0.5.ebuild b/x11-apps/xmessage/xmessage-1.0.5.ebuild
index fc7de8e4c7ea..172d7eb0027f 100644
--- a/x11-apps/xmessage/xmessage-1.0.5.ebuild
+++ b/x11-apps/xmessage/xmessage-1.0.5.ebuild
@@ -7,7 +7,7 @@ inherit xorg-2
 
 DESCRIPTION="display a message or query in a window (X-based /bin/echo)"
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="x11-libs/libXaw
diff --git a/x11-apps/xmodmap/Manifest b/x11-apps/xmodmap/Manifest
index 216cbe65887d..9fcd0886fdba 100644
--- a/x11-apps/xmodmap/Manifest
+++ b/x11-apps/xmodmap/Manifest
@@ -1,3 +1,3 @@
 DIST xmodmap-1.0.10.tar.bz2 145489 BLAKE2B 503e72882a1d6d5c916cb60b898156adbdccc3e90bda85b161ac7a57ee607605331be73bd779603cfab1013d065e28f3165cce2ef50d71579330ab0361078a22 SHA512 324c7dcef843186088f16b3bc47485eb3c9b4331e56ce43b692deb4bb3d4f4f27512480e91a379cceac8383df920dc5e37cd825246b50b6343291cec48134c04
-EBUILD xmodmap-1.0.10.ebuild 429 BLAKE2B fe73dca21387529f4710ed2059102eb9acfcaade4de718f4c77487cb05ebfa4fc651abf318fa0e3df0e42890b2b5532020e4424644b6f79520ccf31230604ab5 SHA512 ee06c56142514abd28a72c40029fbad2f829709cad2905f61d35eb44a2b11c5f3836cbb163efc57c67c07938523b07a2307bfbaecad2aecdd5561796ba4991c5
+EBUILD xmodmap-1.0.10.ebuild 407 BLAKE2B 060f57631705ad9b2ef1d9c021dc1d2e523bc939cebcbd54f862cb8528c65116212fb520beda3aac79c2525420a51439746725ca5d4fb7ffb5cb18a4190d8901 SHA512 34f22d83cd16ebdf3159271398435f75cccc149736e84e68de85c8c681212f12d51d9c2c154e0277123b797180656e17bc31237459bb146668adec1a54484c72
 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 a21f4b61086b..412adf5bfcfa 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-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="x11-libs/libX11"
diff --git a/x11-apps/xpr/Manifest b/x11-apps/xpr/Manifest
index baffd091a1ec..9d91162072c7 100644
--- a/x11-apps/xpr/Manifest
+++ b/x11-apps/xpr/Manifest
@@ -1,3 +1,3 @@
 DIST xpr-1.0.5.tar.bz2 150714 BLAKE2B 89d20134a3a9a12e319d343ae20c3aac71d1d2d2cbbffe1ff71375211efb3a4b22c2d99099fb1621fba838778702cca8c088181218c5d2c5fcb6af706d23b359 SHA512 d5dfb936ec4ad0067d02654dec8e862fe337ff6a2c2f974b2b3a612a829c2e728a0d51e7aba00ed2a94dc96dc50cc69f2c59f522e0635013f5f4f5bb3f4ab967
-EBUILD xpr-1.0.5.ebuild 338 BLAKE2B 79f2dacbd340edf6eb1c37de1cc99f9195f7688163a5392de1fa115877980e5a41d4adaf3131b9123a1d06a0374fd4770c58f935732ec00b1daf8d1782409974 SHA512 6e4d69ad739d5610999aa1cecef558f6151dcbc21117b908a62cb7ea4c434d0500654e8ed1f12b545bb5977b22874bc0054ecabd9273fa5ed45a2ee587127e5e
+EBUILD xpr-1.0.5.ebuild 316 BLAKE2B d4f10208e7d2d28d83bd983e5da7bedbabff9babb0906602a8d805f183e78d3fac1cbff6fe59342b2971831f046a0735cfb01303c276cf5611442b614e5f7f0b SHA512 c24387e244960131afe377c4c1323600080e9a68d3a153381283ebeaff3c01a08d7e0cc74de24bddd53b08c9aff8874a4162bda3e240722024955b919d9b4c4c
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xpr/xpr-1.0.5.ebuild b/x11-apps/xpr/xpr-1.0.5.ebuild
index 06ea06f06277..36646290f2de 100644
--- a/x11-apps/xpr/xpr-1.0.5.ebuild
+++ b/x11-apps/xpr/xpr-1.0.5.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 inherit xorg-2
 
 DESCRIPTION="X.Org xpr 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"
 IUSE=""
 RDEPEND="x11-libs/libXmu
 	x11-libs/libX11"
diff --git a/x11-apps/xprop/Manifest b/x11-apps/xprop/Manifest
index d36e9ed9a54a..b6f3ab117c2d 100644
--- a/x11-apps/xprop/Manifest
+++ b/x11-apps/xprop/Manifest
@@ -1,3 +1,3 @@
 DIST xprop-1.2.4.tar.bz2 149930 BLAKE2B 93bd20c7c91d6abd9e2fdeca7864b9885ae7248c7ee3ef80a5efa1706bfef2220244b1443764fdbc042f66be8d589b111fd942c732922f05f4143e1c893da183 SHA512 6e770cb89ba87ae057858cc9f0f5498979e78c3ef66ce86361b7c646cc0b70c41a18d76e55ed7225fe715b22b62bc07c56272519a2631b92832e9403ce260da7
-EBUILD xprop-1.2.4.ebuild 421 BLAKE2B 7b1c8c1dae7b64544a6eedd02aafbee6d6db229ca510b25125c8310c449954ea965b3659faf41561bce7ee56fa5eee625857682ebaf9c5512877b611bf7c3b2e SHA512 2932248c6f507f694fb492c1bd262f3e2b01062c3e7b6a38c0982e14183e059dd64bf735752f94c46bc86baa0dc6b84a5f171d6a61bc67a81fb7e4ad28236abe
+EBUILD xprop-1.2.4.ebuild 399 BLAKE2B f268400ec528bd376557bf957fa9b9b874cf8b3985dbd96bdb0a61a1b4d42cb35179619db31ba7458b50b678da0c7e7c0ef42ea0794659f0b1304bb44bc8e764 SHA512 c611628e56c5938aaf0feba757ddc2536efe8de56c450bcce4bd8372355d9de274e813ded62981023f5783dc006b316b0934b60bcb96d3dfd1c0ddced9b8eacc
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xprop/xprop-1.2.4.ebuild b/x11-apps/xprop/xprop-1.2.4.ebuild
index 44370615cc8b..d402e4d8c29f 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-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="x11-libs/libX11"
diff --git a/x11-apps/xrandr/Manifest b/x11-apps/xrandr/Manifest
index 5a440c30a48a..fb320c01b428 100644
--- a/x11-apps/xrandr/Manifest
+++ b/x11-apps/xrandr/Manifest
@@ -1,3 +1,3 @@
 DIST xrandr-1.5.1.tar.xz 171200 BLAKE2B 69cc080da24b8d00fcf60e9fb2d4c03d7b80b46d18888fa726ad4ba5847fcfcea4abeefa298fb833febe0549aec0636ed9087c8ef065f5166df6bd7f270dac1a SHA512 3d0d37e974b9dffb996276ee7fd676327fd0956e5f5f572dd142a651a35d3cdfa2f6dd415cf27bf87f306981957aba4cc014c12baebefcabaa5d66b78a114922
-EBUILD xrandr-1.5.1.ebuild 549 BLAKE2B 67a31487d1b51a26ebe847cb691dfba4c69128f1a12cc4f9d30eaa82c5424167fe8614b2747adb7d274651fce7c08f90eadaa39e7a0aab19060e47bcf06d562c SHA512 5e2d35d58b64ad10443df22f3e6e084cedb78dfda824e4d9738bd2c9e1efd84b5e43d54d7f756f9d3bcf3a183bde917607c72f8dbb6283cbb13f93ca03ee0933
+EBUILD xrandr-1.5.1.ebuild 527 BLAKE2B c43dc3592dca3bd4f9b41650faec0b3202285c210ee991f2ab991bd809c1db245c6f4d12ab3c58bc64636e658b07bf95338d8570dd4d077442b4c52555f06f64 SHA512 3a120af61ac022d74b96313ca40786fedfda95384d6879f75f2b0e4c385fadfd56017279407a36202d8bfa8d385cc46f79c3d379775a012bfd0e68b9ba6d0df0
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xrandr/xrandr-1.5.1.ebuild b/x11-apps/xrandr/xrandr-1.5.1.ebuild
index 99b7773b1e7b..5be407a829e5 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-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=x11-libs/libXrandr-1.5
diff --git a/x11-apps/xrdb/Manifest b/x11-apps/xrdb/Manifest
index 779aa593bdb3..8f61479b52ef 100644
--- a/x11-apps/xrdb/Manifest
+++ b/x11-apps/xrdb/Manifest
@@ -1,3 +1,3 @@
 DIST xrdb-1.2.0.tar.bz2 142194 BLAKE2B 2fee77b287f43125413bbbc288b1d89986a93775797c02dde564e678bec3c429bca487d752d82f8da924a95e177a46e3b4de507b7fdca56b95789e1d7ea3dae3 SHA512 14e1cdfb2152fb28f1f4641b177ab236648d7e967a95b952bf4cfce8d3e1ef085e85385354e3381aaf644462e8888a1847f755ab4016ecb4cb4a715b001dd2ef
-EBUILD xrdb-1.2.0.ebuild 437 BLAKE2B 598faf4d69eaa9239c8b999d093ec80946dc5b3e00dd28add1684e5924f9190907fceffa3905024a6de30d7f04f1936427d23386a799182e0fb7a189bb8fd38c SHA512 015aa86b81d82c11294dabd54e3bba13dd9a70da68b75ab44c0b60e33528dd93cd5375e84b149161900797d4de7efce9a8ab9e84f463ff58beb30e6ac7c16ae8
+EBUILD xrdb-1.2.0.ebuild 415 BLAKE2B d84d75e2aaddb3d0446ca228f52a93d64cb8fd0ac7acce83bfa99c2850b17e6856dd2e78d0292c53390abc1b3d5097c70cd65cc2383fca6c8c5c38432716882a SHA512 2f651535a79c70d2634121e10f7d1a790b2cd2d1bfcf20ec9ab285045d85cd6236997e28e4635fd7ca4a7b1537b13de6aff7dbd12060d256b8b84bed47313ce9
 MISC metadata.xml 317 BLAKE2B 02ff19551010134a361010ad2647deb4949c46241c2f3ff388fc8fb7aad6194a822c795f8505cb72896229f9702857b29235197675a227a1da9755d051e5930e SHA512 460dc7431825b65cf43260ca92bad810e99a9cdcc0602da758d5f23ec6faf69a3c056d2db6df266055aed47fe3a1c7063cdd2cb942e09a9b08f60ea81597bc96
diff --git a/x11-apps/xrdb/xrdb-1.2.0.ebuild b/x11-apps/xrdb/xrdb-1.2.0.ebuild
index 53defb0aae29..d9c5e345d502 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-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="x11-libs/libXmu
diff --git a/x11-apps/xrefresh/Manifest b/x11-apps/xrefresh/Manifest
index b8ea9abab87e..02298be50cb2 100644
--- a/x11-apps/xrefresh/Manifest
+++ b/x11-apps/xrefresh/Manifest
@@ -1,5 +1,5 @@
 DIST xrefresh-1.0.5.tar.bz2 120757 BLAKE2B 5c29df155649998cc18e607267f140e59fc50df063d1ba26440103c71c998050f4a0e940ef87a78ceeb3f350e9340fea3813c204548d5f506cb8c014be9362e0 SHA512 287d167cd167aa35cfc89364bf4e74313137ce47978419446c60cb915188c34051f95d4900d0d5dcf692173f31e00e2699d70e54b79f0b21a59b4694be744014
 DIST xrefresh-1.0.6.tar.bz2 127494 BLAKE2B 587f5756bbd3095e77494288d4b9cca99992b342bb718e5cadefdfbf018710ce0f216f43b68814d0d0a681c87d855be4ecf199a314361278c3bfdd81e6073f69 SHA512 361e97fecfc2706d5eeab69df0d4dd4baa55b6783cfddabf51d8561b7c930d71ce6c217e0512c6564208d69b04f89c69ea8c0bfb2e4f6cc25b062b55e4db3674
-EBUILD xrefresh-1.0.5.ebuild 338 BLAKE2B 9f3562b50696cb553f47a7ac5dd5c2868cb24ecb40f4f024f8f38ca76508edf0475cd16fc8af95ab2a1dac505e3b1f19c477006610a4f9847ee05a6b07df0b2c SHA512 53bb115111882bb7748513f1b72b1568a3ed9780651f15881c163310e83c91caeec3ee7f34ae4d68b852bdae2224a2634c97eb39c7e01f6e4f08a7474b7897c5
-EBUILD xrefresh-1.0.6.ebuild 338 BLAKE2B 2b2699e463ffc1892c102241058bfe6f5a1e0e0821242812fe7422f150028b748bfc822b503543f60d9a4304e4f2fd0c4e0762802e9eea5a34a8ed908ecc4c9c SHA512 b569e83ba7df4e35dd2b10b601e80862c50bae89792c4fba74ac7bbc7f5075a6417f3eec22efd6a89c0ce62d035b2773b1d9877a7ba6b2528d4c9510f26cc85e
+EBUILD xrefresh-1.0.5.ebuild 316 BLAKE2B 8d69563713abde20fac427ead0b216f821d89bea5e42ad69b06f46e539db24c4092cdcb0525797868a93a83d1372f17af44a017b9f0f682e1b55b3c635f05be9 SHA512 e12e1a0824ee20b418fac61c5b9a670d1c2bd7dd1c07b047a64325ea349f9eec35efd0b9809d3160c6945bd8db85345d06b8ddc724c36618a30d13ca023c94c1
+EBUILD xrefresh-1.0.6.ebuild 316 BLAKE2B 91aa43999868d77e7cfe05a0f2a929bf37571082f0a3ba650a9bdccf4bcf3495ab13d4415595eb4ca5c3bd8df0bd075c70b980efed1d84627cafd6b324b3ccaf SHA512 d7ba590f5a150bd725790c7a4f6024851922371a00e115d0459ee46e4d9068066669496cbbf8c87aed3b85b92d2094dc6ee518ecab5b300a80f207b55fdc4b45
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xrefresh/xrefresh-1.0.5.ebuild b/x11-apps/xrefresh/xrefresh-1.0.5.ebuild
index c342bd9478d4..46dd98d4df6c 100644
--- a/x11-apps/xrefresh/xrefresh-1.0.5.ebuild
+++ b/x11-apps/xrefresh/xrefresh-1.0.5.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 inherit xorg-2
 
 DESCRIPTION="refresh all or part of an X screen"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE=""
 
 RDEPEND="x11-libs/libX11"
diff --git a/x11-apps/xrefresh/xrefresh-1.0.6.ebuild b/x11-apps/xrefresh/xrefresh-1.0.6.ebuild
index 86999d924a4f..dd0ea70862d7 100644
--- a/x11-apps/xrefresh/xrefresh-1.0.6.ebuild
+++ b/x11-apps/xrefresh/xrefresh-1.0.6.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 inherit xorg-2
 
 DESCRIPTION="refresh all or part of an X screen"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE=""
 
 RDEPEND="x11-libs/libX11"
diff --git a/x11-apps/xset/Manifest b/x11-apps/xset/Manifest
index 5f5ea785a755..c6b26e75e632 100644
--- a/x11-apps/xset/Manifest
+++ b/x11-apps/xset/Manifest
@@ -1,5 +1,5 @@
 DIST xset-1.2.3.tar.bz2 142286 BLAKE2B 83ba3d7ccc259ae7b244049e558af6db9428b897b340537b75b6c534c7e8a11f36709237982ffe1ab5b523cef5834467bdc85c94fbe07c64d6eab6eef2c930b2 SHA512 7b2cf4b06b93aec9f6f868be3f0932a5d6e62968485f7eb742a9b775059aa2a49c9170404e0597fd41a5730c0bf321e371ee6b23bbcde3be054f768ab8d3d92a
 DIST xset-1.2.4.tar.bz2 145546 BLAKE2B df4ae52046af7f632e2f60386bd3b8d90b27db3e53ceb68f1056c9c5df2ee9c6d83d109a444eb99ddc031e35b91db0249ee56eba3180bc9a8a002935db213605 SHA512 f24714c9a82081a09d3054bbad98553de9366992f22eaf3e2bcadbb58fad1d3dad2547fef6fa9898d8a9df064573c29df9d82a5c801fa92248604c95f65dc83d
-EBUILD xset-1.2.3.ebuild 505 BLAKE2B 9ec7ee43fa84014eaaf96c10d78a24c81c5892feb263fdaba0092c8b22f5ca02091ca62ca83d257e179a124deacd93c5e2681ea7918b0f834ad6f789aa7058d8 SHA512 d78a907bded98ca32c1e7aa15b825749425ba1c37fe0f9d6d530a9ec7aa44737296a68bc4aeefb7c7c72331d92709fb5272640ec250489a545af5f96eb187a21
-EBUILD xset-1.2.4.ebuild 504 BLAKE2B 4b2e6c91b6c69938dcef040f6db6e0c2c4b570515c05f3bb4e8dcc4e71586cbef4c9062d7d41a29e73025a12a403ba7b19cf9cde90176d229904ade3c4b5d391 SHA512 1e3bf9e7b54afa83aac8dfc57bac79e38c27f7b3bac3d4b17ea30b26ae8eabf8147cfcb3ca903a083ca9af3d4daf3ee4d4a54b9f79ca359f881c7bcd9680106d
+EBUILD xset-1.2.3.ebuild 483 BLAKE2B e3d38993a6bcc112a528fd669f2674c5ecfb1a3c8a4fd96008d768e4c5177119cb84a01977859a99814039490426d929449b46212848f44eedb69feb3d2ad387 SHA512 b3086efca00a7d620a2d50b6e9ce775506c80102ed9f0ad3c3816b97e6a18402ebf49492f80d8687a67b9c4b34cbb760520443faeb17b906d288feb005a90df0
+EBUILD xset-1.2.4.ebuild 482 BLAKE2B 212f571c2ec133d1074c1c98623fc1a9d56a3cd9edb3e09b0d0171c5a293eaa09b63af64fffb364d19aad111096e07797da01eee0c1226faf1276e5d61c1b168 SHA512 56d428b08641de03dfc8f8baccd6b03507f2b4291651018b798fbc93157cee7b169e1ade6fd1ae93ce47534c3d881134b7b26844e1eb6beb260bc13cf3ff6f8a
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xset/xset-1.2.3.ebuild b/x11-apps/xset/xset-1.2.3.ebuild
index 77cdd3095334..9196ea69a47b 100644
--- a/x11-apps/xset/xset-1.2.3.ebuild
+++ b/x11-apps/xset/xset-1.2.3.ebuild
@@ -7,7 +7,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org xset application"
 
-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-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/x11-apps/xset/xset-1.2.4.ebuild b/x11-apps/xset/xset-1.2.4.ebuild
index 50f93a6de6ac..a6df0f2142a1 100644
--- a/x11-apps/xset/xset-1.2.4.ebuild
+++ b/x11-apps/xset/xset-1.2.4.ebuild
@@ -7,7 +7,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org xset application"
 
-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-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/x11-apps/xsetroot/Manifest b/x11-apps/xsetroot/Manifest
index c3578ef066cd..fc46b8710912 100644
--- a/x11-apps/xsetroot/Manifest
+++ b/x11-apps/xsetroot/Manifest
@@ -1,5 +1,5 @@
 DIST xsetroot-1.1.1.tar.bz2 119977 BLAKE2B 7589dc6014c2f905dce4bc72c4a98096eba38354975c307408e1aeb06e27cafcf64ecda7f8e3a470ac25e41108b3aac688fa9d365a3ab41908a52d8044142712 SHA512 04834a8ca658a4aabe03e62588353102e8019d424e25fab450d48e6fc4ac358df5bb98a850c82c61e2495faabfe54f3d92d9563e77c83ace7fd69c278edbbd64
 DIST xsetroot-1.1.2.tar.bz2 129091 BLAKE2B 0bd0615f64c636eaad7ed1b83d49208e9065edf7583bcd7e5d4c5d2f1a1eca4c7692209a540cab823c35497696176f4925afecaaf843610f6e9485cd3724f1cb SHA512 0b9df1b72305e5c24f1e1664578aa4411a5ffcdc5d318458117594e641f01c34700205b0d16c08abf4a8106d36128ccdbe1ea1f1035fce9018d6b52801a8b72b
-EBUILD xsetroot-1.1.1.ebuild 411 BLAKE2B 1a44a1b61d1bcc1ee9bdfad0c55ed79b90976c2d24e51a8af186557dc68f1d6213a08a9c7619bb66c5f11afcde08e9a02a845466716cbc919a95dd8a411c31a3 SHA512 2ba151cae0817c4f7fd3e5d21b099a9204117d857883b78bb3f9f5c09fb56108dd9308be60a107bf49bbc08b0eb9d69867d5b0942d9591bba35e110dd9426a3f
-EBUILD xsetroot-1.1.2.ebuild 407 BLAKE2B 4b91e2ee6bce7d80006305369bcebf6b75d8d5b3ac60d2f1115c17f4a2c4706b3dda5c44ef269c6cca4b41706fbe10931bae35a57ab8eeaee52f4124483ab3f8 SHA512 500870309f5692ca50f0531fe69b9f9984751779092a92199eafb59488539b9ade408ee301a0ea0ee3adf77594d255d1cb3f4267c50bf03936c6d34aeb548fbb
+EBUILD xsetroot-1.1.1.ebuild 389 BLAKE2B 3660a6af2de0f7788910b22e7d339a106ad51040d0f3b884fa725687bbce432bbca6f4b6b3f82de55264c5e5a0e691ee24020bac214a18f1a4c1c33af4420857 SHA512 50857c17a3b39928380dcd5d3200f373ca0699911427ee68bf06007cb46c72e7b32fe0529475241ab7d72d4867fad7287fbd08c788ed4095c98c3f0c94c329c7
+EBUILD xsetroot-1.1.2.ebuild 385 BLAKE2B 3361ab8ff3aa9e35ea55dcaf79fd5821c8466cedad7c7f0feb920431095ec743d32fa136da1abbda463db1bb572cd3b6a1ecbd4b79f686161d0c21175207adc9 SHA512 220baa93b7a6c25a7ac96510f4ca3782825167ff8b540340924230138d4e12a1b226adaf999b492417e10a5610623debf9dc24df8631a0ab6f0e4897e2066c04
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xsetroot/xsetroot-1.1.1.ebuild b/x11-apps/xsetroot/xsetroot-1.1.1.ebuild
index 47ceaa325e9e..125583efbe0a 100644
--- a/x11-apps/xsetroot/xsetroot-1.1.1.ebuild
+++ b/x11-apps/xsetroot/xsetroot-1.1.1.ebuild
@@ -7,7 +7,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org xsetroot application"
 
-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-linux ~x86-linux"
 IUSE=""
 RDEPEND="x11-libs/libXmu
 	x11-libs/libX11
diff --git a/x11-apps/xsetroot/xsetroot-1.1.2.ebuild b/x11-apps/xsetroot/xsetroot-1.1.2.ebuild
index 9a48cb5b0b62..33f5a40c8740 100644
--- a/x11-apps/xsetroot/xsetroot-1.1.2.ebuild
+++ b/x11-apps/xsetroot/xsetroot-1.1.2.ebuild
@@ -7,7 +7,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org xsetroot application"
 
-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-linux ~x86-linux"
 IUSE=""
 RDEPEND="x11-libs/libXmu
 	x11-libs/libX11
diff --git a/x11-apps/xsm/Manifest b/x11-apps/xsm/Manifest
index 4dfae0dc026a..8a0527485bc5 100644
--- a/x11-apps/xsm/Manifest
+++ b/x11-apps/xsm/Manifest
@@ -1,5 +1,5 @@
 DIST xsm-1.0.3.tar.bz2 161012 BLAKE2B 2628e4234b5fed58ebefb35f454c36e268c75cafa784ed709833d5979ee4484ada8f315d75b6204e64a0efd0f1fd7a14662afb430c0e84bc81a40eefda9380cf SHA512 930a12272011ddd7c60e62b32b485c383292163f8aed6086c756f71cece62d0c316d89a6056751818b3b0ee26f68cca6e0fc914cd58d9b20da0a3b7ccf2145f0
 DIST xsm-1.0.4.tar.bz2 170933 BLAKE2B 05cf4614440f36da6ed1e8e0949ef6955da03d1fe0cc2d0323150b34ea01c293301aa49006a93fe7c44c842db41fb6b66a2f4a4051ddf2258143e54a6e99b390 SHA512 d4e4da7c309a4eae126d2b58a13684f4dbc06b09f76dde9c89c707375df2843614f3d83bc44f9cd02f239200db3397abd86796dca0dbafc69f60482b0af5a176
-EBUILD xsm-1.0.3.ebuild 848 BLAKE2B c6834e4bae18e6c7171eb41052853f6d7d0ecb0e17ead1c4d3474c7c3a83d9ca6b2519f58dc72514d73bc258c4224a90bf0ca0721ba5db20bd9e860ad7f4c71e SHA512 fda19eab58e2a49338dbe029e492e4379016a3f165c18eb7032d5e47e24b560f913b69f9e333d58f1880d23b282ff7d4d81b7b9a6b270a3cb2dac0c4657e896c
-EBUILD xsm-1.0.4.ebuild 843 BLAKE2B f7dd323558277447160a3d23d0549313e831708f48a2e5d85e456b7df2ddf948d7609dc8141da6bc45b5dfe8673089bf3d5d588e6dd091b19d73d523122274d6 SHA512 cdd638fe20f64a021a99e929848cac5f13f3aa0a7f4b9cd0120e4823cffc9457c5280b993e445a1292ab06d7db55104543c26bbf9b15259731478bf9c6c9244f
+EBUILD xsm-1.0.3.ebuild 826 BLAKE2B 4cddccafa10e2e84c10c74c008a9121f3b2e287e87142f738f74d948ef7ae3a55efc09252722608346bdb61279bde1df89b0e355e35c993c8dc5b9580545c270 SHA512 25d473d5b8e79f2800aaadde47182cdc1856d062ef8f7d3a7ed9e70abb24fcf3757e30d98c566c04ab2a4ee04a9194321aefd9d9693c16520a1f5b6afd701b1d
+EBUILD xsm-1.0.4.ebuild 821 BLAKE2B 0f5c1fbfa98ac6ed62c5b2fb25858f7783d8545ca7d7d5a40ccd144026c777de4b6dd990e1ee31a49f4c19137327620b965aaa81df221ff383a1c3d563d9e4af SHA512 48f5f177585e433c420137d8fd8dec0727abe676052fff10e7cb254067fb649d05d5e730f2b4ae1483e99f054c14c8bc84bcb744ae13c3d229dbe2616d96cd4e
 MISC metadata.xml 333 BLAKE2B 0b142d7cf4b255c50a9e616434af7ff1db6a2aa0d3467f43d3e22ce6ce55a1bae7ab18eaf092bd5ca002464dc046bc2de62b3738425cdecf4ad15727b20f2d18 SHA512 5496dab87579d1d5c218ddd1ef1e8b63e73ed8d0e695d3be9577d862fc03a775b9cd3dc82abd356c1ef124522f4ed07a5f289e5e3355bb76c2d8746e6cf5a7c2
diff --git a/x11-apps/xsm/xsm-1.0.3.ebuild b/x11-apps/xsm/xsm-1.0.3.ebuild
index ea8dc51e0705..96e9bb1bbc4a 100644
--- a/x11-apps/xsm/xsm-1.0.3.ebuild
+++ b/x11-apps/xsm/xsm-1.0.3.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 inherit xorg-2
 
 DESCRIPTION="X Session Manager"
-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"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="rsh"
 RDEPEND="x11-libs/libXaw
 	x11-libs/libX11
diff --git a/x11-apps/xsm/xsm-1.0.4.ebuild b/x11-apps/xsm/xsm-1.0.4.ebuild
index f92c27014280..0533b84f7ae5 100644
--- a/x11-apps/xsm/xsm-1.0.4.ebuild
+++ b/x11-apps/xsm/xsm-1.0.4.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 inherit xorg-2
 
 DESCRIPTION="X Session Manager"
-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"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="rsh"
 RDEPEND="x11-libs/libXaw
 	x11-libs/libX11
diff --git a/x11-apps/xvinfo/Manifest b/x11-apps/xvinfo/Manifest
index a051b66deee4..aec3a50684c7 100644
--- a/x11-apps/xvinfo/Manifest
+++ b/x11-apps/xvinfo/Manifest
@@ -1,3 +1,3 @@
 DIST xvinfo-1.1.4.tar.bz2 126503 BLAKE2B 54a1e08913cd51cfeaced1c704834e0348d02cfb2e606f2cbb103acfdf649595a77680364bfb5bbe684a15c743d2d18b6031e77150d0e9fb0d3405d474accc3c SHA512 85e1f936c5c826f0fdde3670bd77d5cde8641c6e8e7849e42142e91b5aa01d7e0e60d2b064eb6fef4f5666321813ca2dc9f9656756ccbe6dcda37b119ee8a63e
-EBUILD xvinfo-1.1.4.ebuild 365 BLAKE2B 710924a75f0cfc9331fdca44e61cedc689bb7314f23eb6322aefa5c5e9e2e090e66db950a809c8833e9f518bc8a62842bd4a51d156575afee437b96020a5640d SHA512 2493c0284d0c4a8bee39197f3644589c2d9754cdef8d814c120cd0b5bef7cdb5499b494a769eea3e992dc88b0b7c549ac4743f5f443d6b6020d15f34728f7eed
+EBUILD xvinfo-1.1.4.ebuild 343 BLAKE2B d8c59d41554a87e508fb6de213ca6d1534a8658428d33db8a31a8b9f91f41aeab39b8777786e54e9fbc27e1b1298db738f8cded49dff09ed2fdee24d4eac0a5f SHA512 1464ce61e68fe1dff021e9ef049055f9ee305036df04f16f4fb4db2289667af151c3916a27a95a28e08fc67505990c25d3bf0c5a6fda6b7c7ebb2b49b4eba145
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xvinfo/xvinfo-1.1.4.ebuild b/x11-apps/xvinfo/xvinfo-1.1.4.ebuild
index baaf44720acb..e3586b77a609 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"
 IUSE=""
 
 RDEPEND="x11-libs/libXv
diff --git a/x11-apps/xwd/Manifest b/x11-apps/xwd/Manifest
index ff322ba1a97e..5d2384bd6a7a 100644
--- a/x11-apps/xwd/Manifest
+++ b/x11-apps/xwd/Manifest
@@ -1,5 +1,5 @@
 DIST xwd-1.0.6.tar.bz2 144548 BLAKE2B 56560a36931d15f6f59d6c6548325e559534cee10cb13b07722bce5b47d7d2360244b29e88a66a58ffffd2209336f0ffb14cbabb0369c144ceeeabb4eb184b06 SHA512 8fb86cbe163631fdb3f49ad6bb648ea599d7c5f9b11aba7e88afb86daed34cab88dcba057e0c5ca3e4e5904598b279f5a68ad43a64dd1053d647aa78523a806f
 DIST xwd-1.0.7.tar.bz2 148026 BLAKE2B 9088105a07db38418352cccafaee4ecc084940e031416358291e6b5a6f47b2c8972928f0eb3479db4ff93b3a54a24ea4231f4d8196464f14ac4d7a1b5bb7ecce SHA512 6fdb0a115ae505169bbc7fcc45580daf26bced2e26e0bf9a877636016038931a8386e8edcbe015f4024be508d0461906adef4834cf22a445e3c282f0b8fad17e
-EBUILD xwd-1.0.6.ebuild 465 BLAKE2B feffeca201137087233ddf7393331382a421140b4d6dd2cbbbf2079b1a2a63fd0c86315be5b270fd4e0fb3dee862b808a4d6954493b02b57189815aa4a576df1 SHA512 f43fb091f7427ce754f0030bd280edde9e4d19c2527b89346e99db63518f22fc263db5439b539f7e906943707e33827aaef724b08ba59d7e639ce3170d41eade
-EBUILD xwd-1.0.7.ebuild 465 BLAKE2B feffeca201137087233ddf7393331382a421140b4d6dd2cbbbf2079b1a2a63fd0c86315be5b270fd4e0fb3dee862b808a4d6954493b02b57189815aa4a576df1 SHA512 f43fb091f7427ce754f0030bd280edde9e4d19c2527b89346e99db63518f22fc263db5439b539f7e906943707e33827aaef724b08ba59d7e639ce3170d41eade
+EBUILD xwd-1.0.6.ebuild 443 BLAKE2B 2898e255b5f052ea7120f8306d0bc02a525de982406f14d6780dc44a71eab56124056eb09542aa69f6ff4d287b05407c979fc8f44e07bd1e3d6295fda32fb34d SHA512 b8831970572e30db0240011b15dff103c6c9794ba9f1fd34315817c06d00be47f8e462c5329f59690f6dc5d09ee3e059cbfc6dcef6822c76a929ee4d459bfb43
+EBUILD xwd-1.0.7.ebuild 443 BLAKE2B 2898e255b5f052ea7120f8306d0bc02a525de982406f14d6780dc44a71eab56124056eb09542aa69f6ff4d287b05407c979fc8f44e07bd1e3d6295fda32fb34d SHA512 b8831970572e30db0240011b15dff103c6c9794ba9f1fd34315817c06d00be47f8e462c5329f59690f6dc5d09ee3e059cbfc6dcef6822c76a929ee4d459bfb43
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xwd/xwd-1.0.6.ebuild b/x11-apps/xwd/xwd-1.0.6.ebuild
index cd0a83992aef..9a152d12a2e9 100644
--- a/x11-apps/xwd/xwd-1.0.6.ebuild
+++ b/x11-apps/xwd/xwd-1.0.6.ebuild
@@ -7,7 +7,7 @@ inherit xorg-2
 
 DESCRIPTION="dump an image of an X window"
 
-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"
 IUSE=""
 
 # libXt dependency is not in configure.ac, bug #408629, upstream #47462."
diff --git a/x11-apps/xwd/xwd-1.0.7.ebuild b/x11-apps/xwd/xwd-1.0.7.ebuild
index cd0a83992aef..9a152d12a2e9 100644
--- a/x11-apps/xwd/xwd-1.0.7.ebuild
+++ b/x11-apps/xwd/xwd-1.0.7.ebuild
@@ -7,7 +7,7 @@ inherit xorg-2
 
 DESCRIPTION="dump an image of an X window"
 
-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"
 IUSE=""
 
 # libXt dependency is not in configure.ac, bug #408629, upstream #47462."
diff --git a/x11-apps/xwininfo/Manifest b/x11-apps/xwininfo/Manifest
index 2ac38980dd68..a7fd242478ee 100644
--- a/x11-apps/xwininfo/Manifest
+++ b/x11-apps/xwininfo/Manifest
@@ -1,3 +1,3 @@
 DIST xwininfo-1.1.5.tar.bz2 172496 BLAKE2B ad657a96b74190981ecd2d946d1b81fcd0515a481f0d6d880d790b8e1eb4bf7e85bdd9a74b631acb88c2254839afde7f6ee79647af66c357c8ef4199aac51f02 SHA512 a3268bbeeeeafac94e589fdd47554a965910d40df7cc3d9c36c7c24fa4f5dd49615484d5916ccb41efca9cd4cf9d8981a4c60953b921220b3f4f57f9cce0e1a6
-EBUILD xwininfo-1.1.5.ebuild 439 BLAKE2B 531a547c4c2b73226bfec765bb4599d4d74c7ff630b2f2fec4f0ac175e6e958780de9fa049e9dc42ce2504194eaa791ab53ca44bec600e734217531f15a66d18 SHA512 88b14b787a0fe541419add76ecdbe37bb4e507bc5419424736fe66da428dc4e30017dfd20228d08bf969819f8b736f162daf7318ed650b593042027eedeb9f7f
+EBUILD xwininfo-1.1.5.ebuild 417 BLAKE2B 8d0b8ccbffcc8321fe9daf7c632da09ec694537111e65e442d33dae2ac3fc30241ac7aa731dff918354b456319e00760ca34ed0e26bbe5dc0faa7b1a8b4a15ad SHA512 ff4b2497d1d974cf37225493acca4dd576ab95c13db7f4dbb5addb6c82f9cf81325c002c6c49c5de7e7583b924d2eb788bcbe5d4df13507ff450c552f63862a7
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xwininfo/xwininfo-1.1.5.ebuild b/x11-apps/xwininfo/xwininfo-1.1.5.ebuild
index d6059be4256c..7afe90df48ec 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-linux ~x86-linux ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND=">=x11-libs/libxcb-1.6"
diff --git a/x11-apps/xwud/Manifest b/x11-apps/xwud/Manifest
index e4d3a8eb346b..426b8392eb2f 100644
--- a/x11-apps/xwud/Manifest
+++ b/x11-apps/xwud/Manifest
@@ -1,3 +1,3 @@
 DIST xwud-1.0.5.tar.bz2 133376 BLAKE2B 27ce8251ae2a2a87393655e1824121dd54f75839a8066405299e9052bf2c55c6946cd686f285dca1d7339029d8ca8b94e4adb3efb485b42bd347db212b12858d SHA512 27a0ce7481978ae6cd94b0d94374af72185e270d68f2496620e148bb00945427c4827138d9efc48745e6382e3da3390ed0cdff7dbd02dcf9706e8ecccae97184
-EBUILD xwud-1.0.5.ebuild 324 BLAKE2B db3bcd404f1a7278169c66d46f988aa190c4ea5d0ef6f077e9ec2d2d51cea5c8ba15ed05e818af678ce4ab42bbb67594f435c00ba7d055b24affc4140c84278f SHA512 e87e43cc386af70fe3883b1f2900233386b2eacf9ad9dbe817cafc83346fe338682c7baa847bc7647f68393246efb7000ce53b957a61fd71723c4303837042e2
+EBUILD xwud-1.0.5.ebuild 302 BLAKE2B efd8f37b7601f8b7ffedbc0c9f4a1f218d7319792a83a144819e039526c42e44deeec434fce8d060058633716b04741b40f1109d4b3bd9ca4bc0086492a95b32 SHA512 9bd7e9d7bbbade64f05d4c86ad386355df0dae84c36434bbbb9532eedbcac341c47f9425069ab093c16dcccce60bcd266edbf11f052f29cfc180400b37af0298
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xwud/xwud-1.0.5.ebuild b/x11-apps/xwud/xwud-1.0.5.ebuild
index c7fb0725264b..393970ae7ce2 100644
--- a/x11-apps/xwud/xwud-1.0.5.ebuild
+++ b/x11-apps/xwud/xwud-1.0.5.ebuild
@@ -7,7 +7,7 @@ inherit xorg-2
 
 DESCRIPTION="image displayer for X"
 
-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"
 IUSE=""
 
 RDEPEND="x11-libs/libX11"