gentoo resync : 27.10.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-10-27 12:48:57 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-10-27 12:48:57 +0100
commit: 70b82ae359a5538711e103b0e8dfb92654296644 (patch)
tree: 8412b84ff9ce02a22be5251052b00feefe1d5b70 /app-xemacs
parent: 64e107b9b6058580ff0432107eb37cefb0b2a7d8 (diff)
260 files changed, 258 insertions, 285 deletions
diff --git a/app-xemacs/Manifest.gz b/app-xemacs/Manifest.gz
index 6a872093dacc..d1bf842edeaa 100644
--- a/app-xemacs/Manifest.gz
+++ b/app-xemacs/Manifest.gz
diff --git a/app-xemacs/ada/Manifest b/app-xemacs/ada/Manifest
index 2954c172bff3..4a6381613f25 100644
--- a/app-xemacs/ada/Manifest
+++ b/app-xemacs/ada/Manifest
@@ -1,5 +1,5 @@
 DIST ada-1.14-pkg.tar.gz 55836 BLAKE2B d61de679848b2cda840ee24fc930495b3b16c664a63d8e5d960cc891c3b327417657b143b18052f33b530aa82971154737c66d71876ca872e7ec0973fdff0834 SHA512 9925cd30f9d67b72086114b1cc723ab131541f694eda77a6094a7d5b5d20b340ef9e285930e793b61c87bd8f732acc37a80ffe3fe0836ee01beca36b303bb1e3
 DIST ada-1.16-pkg.tar.gz 55782 BLAKE2B a5f7e7856a6fb990090fb8bd4295f58f4e8c2bb9b292e4922560c393189c6c8f92e075573aa2c3b2077b0f3c32dc077441cb3839312aba9e290a34991cdc0c0a SHA512 e6e461de26895ba3b3b3666d22af8fa5cec50cc9249dec6f79e433500a7b63f848c94943aeaa4c75ea2b305bf6e235ee62fb0e52fcdfd29410a51a803d8232d0
 EBUILD ada-1.14.ebuild 289 BLAKE2B ae9f8bc7c3eda10bb98c873e005ed15718e9c6c58ef337021928ddb135b18a4932c384cf4a30029ded2f798c417f73bb59418a22b2820ce2fec3116e37c789a5 SHA512 b0ad5a01215f3b04111441bb5f68341b53444dca3db55c9d90abc96669c318744f5a9d3c7c73482d5658effa36b37255cb2bac2e3d4b65eeaa74478683ac0f6a
-EBUILD ada-1.16.ebuild 291 BLAKE2B 04197addc267a2ee22fdbc635df26f5da9b21e133e64962c8e47d794e3f65f26bf90eaba0787228d70fe31037ae6413eb5d31f90a359822cdc7765dd033244dc SHA512 7b837a57d30e0efd3a3649aa4c65c05215e6c6547ac1ec4fc03e53364db3c4853e057b35c38456f3d52b0b3b6c1ce7605a39b6189ca254d9f450204bfff5ae65
+EBUILD ada-1.16.ebuild 290 BLAKE2B 1f27e8d9ca979fc762e3a2b4f2a391e9cfe14181d59125b0764bf6d4d868fe102bc5352bb1664431d31a8899231cad7a3427f1fd80d87afd3a878046b03eaf61 SHA512 56dfce8626119db55760fcf0c26788918a82ffc457dda7856bccfaf596653a57de01ed7327f7a47fa2f9e457f6c6347182af7f5b3021a2599057b636c81f8cf8
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/ada/ada-1.16.ebuild b/app-xemacs/ada/ada-1.16.ebuild
index 5ad4db62d96d..66a19d9d2282 100644
--- a/app-xemacs/ada/ada-1.16.ebuild
+++ b/app-xemacs/ada/ada-1.16.ebuild
@@ -9,6 +9,6 @@ XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 "
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/apel/Manifest b/app-xemacs/apel/Manifest
index 044f9539cd6b..61a7a52e4c4d 100644
--- a/app-xemacs/apel/Manifest
+++ b/app-xemacs/apel/Manifest
@@ -3,5 +3,5 @@ DIST apel-1.34-pkg.tar.gz 124989 BLAKE2B c8504878f8c0df2e41bfd81db76136f280f2230
 DIST apel-1.36-pkg.tar.gz 124997 BLAKE2B 53e44f513d1e5d2513e2bf91a2585928d3150bc3509ce6d25475173c80273bf117fc19f003eb22b9cdc8e0fd9ad7faf368bc63736987a5e3b4baddfff0635500 SHA512 5fadf5892084eef5fb83c71340a927bdd70b031b9b6352c58ee567089c0d169bfa073cbf6409ed3fc46da262e540eee8c26611fd28a4cbbfcd943145936006bd
 EBUILD apel-1.32.ebuild 350 BLAKE2B f3399ca9a30c0c1beffd6f006df029e9eac4b0022c41bc3bab808d2ecce6b209bb5edab13b1f4a5658be0f22cb527e4652f6355fdf7f3963a4c1e5d67881b0a7 SHA512 14efacecac1dc5e4d3a80f8cf95cc4bbe852fa77109c04766ed21c3228c08140865183c580d3354dad6b4cfa73bac831edbf4bfefae19aff508ec9fd0de0e2d2
 EBUILD apel-1.34.ebuild 369 BLAKE2B dfc2c9583af55508ab5a9eb6b795a908f244fe5fce1418fc68ae7891100f0e1d372327523eeff2a3d16887a50a003180a0fbc91fe450ab20c1db98be60c95323 SHA512 7e779f36da5fae86d9539a9b0d3f0cacb4c137485ffd2449a5aa1125a6974ce5f41a1914b0b95a06eb134150eb4f0da8c5df927804e3a643096da25f9d9896fe
-EBUILD apel-1.36.ebuild 372 BLAKE2B cc98d444c3c14a0c9afa72de8ad2d600dcad0db81a1a147012f0a8155db06d1dcf0253465daa396f8e5e45271af501af25539ad374e66ee7ab6f704e507ef4ef SHA512 af5d9a0fbb2d76349aa43e316cc4eedda7ef4a02322e89a9eac98c8d5a6dae04c7ed0330342475b10a2ef1641f2c8821b6efeaa6c47c74000b1e534aa1b38a87
+EBUILD apel-1.36.ebuild 371 BLAKE2B 0810ccaba413d7f797482c79b6a74b3ced5f752c269aeec197371717137f5885add4fd33eee077c4d221e478fd7b24338cce7b6cf1f47d3e42fc45759577e93f SHA512 274fb0b0dcb34b9c214a005d804bdc4c6f04826774322eec86a8786eac1eea004c1ffb4d762aad3d49c6f40c776c97103704b9c59872065f8a5ad07c8c2abf62
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/apel/apel-1.36.ebuild b/app-xemacs/apel/apel-1.36.ebuild
index 5c6722ab5e11..34931628fd44 100644
--- a/app-xemacs/apel/apel-1.36.ebuild
+++ b/app-xemacs/apel/apel-1.36.ebuild
@@ -10,6 +10,6 @@ XEMACS_PKG_CAT="standard"
 RDEPEND="app-xemacs/fsf-compat
 app-xemacs/xemacs-base
 "
-KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
 
 inherit xemacs-packages
diff --git a/app-xemacs/auctex/Manifest b/app-xemacs/auctex/Manifest
index f2193f5ef211..5fdfbb59b512 100644
--- a/app-xemacs/auctex/Manifest
+++ b/app-xemacs/auctex/Manifest
@@ -3,5 +3,5 @@ DIST auctex-1.51-pkg.tar.gz 1002835 BLAKE2B 8f71cb30bb78108d59e5ba76dbf0763c7811
 DIST auctex-1.58-pkg.tar.gz 1364246 BLAKE2B f0b906d676b3f75f9878a3fb5b0fb64299ad50d5055a986e1e4d3bcef19eab73412b0b217e167a876420d8dab3fc5a764fe9deb103790d28d8cf9f364cbfa51c SHA512 2a41c1a03c428958d2a572172680541c966ba2257f2f5601b18a5a44c95df7d0363240dd2060ca7d415513d1ebd7259446d9eccdd94eeca3fa656eb1d8a46ac5
 EBUILD auctex-1.47.ebuild 292 BLAKE2B 2e29d4192244b8e9acf8a2aaf2f6feba800f8bb3dadf451c4512f4c1cabbe3ed2088f1952222694ce34082757291189abce25d3d48c6bf01273285a2e61d7bba SHA512 bde4d8faed0b97e2c0268bb7f2447d00f9cd7993b7233fd466f8bcb88ca4d44fb3629e2fce2e61497ace48eaf55549aa4c4b9f35ed508954acc8c5a9c1f54222
 EBUILD auctex-1.51.ebuild 375 BLAKE2B 8aca3df5b55f813d6391d49c346f61eec994d3c06857ae9f757abc6859aa6601765303521175a205a7a8f2901c272e6e16a4182c392976c967a9b2a9ba8c5c0b SHA512 ba3330224ecab23f9322ea446613040e1b50c2d1059233558a2f250e0b5ebd20ea45dbfaaf5412271a35cba9bdd4e53d88b5d65a577220b616aa50d3b4dfa849
-EBUILD auctex-1.58.ebuild 402 BLAKE2B cbfc3cee83ed4eb9f8b7e949139fd3e391422b2b0bdf4c01ae94bb07e31dc780c0a0bbcf326baed254311a6abbeaedd41b7c51f5067fd90a19493c73c258100f SHA512 cfd77ce33af5eef790e4c1a0edbbd1b49815d9a9fef0fb6b081a1debfb167f621fc640c2fddeb36b5067a4b5137dd8483953eb6a6907154603b7c10ab5e2fa98
+EBUILD auctex-1.58.ebuild 401 BLAKE2B e7bb7bb90113430d23bba894c89b1aa19beafe7726a27beb64270dab97b092bd8fd075a83c0c5bc11fd28bb7f443418e79801f5646739aee91dfeb4a08de9e0c SHA512 4a7d790b2d8808b1a8f91f50b22be87e573f0cd6b60d6b96a035316a39aafbc54cff76be2568b5e7bced9a1f8ffda25f90a8afb517ef002c9d1bdd225494f01f
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/auctex/auctex-1.58.ebuild b/app-xemacs/auctex/auctex-1.58.ebuild
index 8296465bd655..cee205904cc3 100644
--- a/app-xemacs/auctex/auctex-1.58.ebuild
+++ b/app-xemacs/auctex/auctex-1.58.ebuild
@@ -14,6 +14,6 @@ app-xemacs/mail-lib
 app-xemacs/edit-utils
 app-xemacs/xemacs-ispell
 "
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/bbdb/Manifest b/app-xemacs/bbdb/Manifest
index 319393b89ceb..4c05bc24809b 100644
--- a/app-xemacs/bbdb/Manifest
+++ b/app-xemacs/bbdb/Manifest
@@ -1,5 +1,5 @@
 DIST bbdb-1.32-pkg.tar.gz 380002 BLAKE2B d4ba20cdcbb63cbe3aae65cf7c7dc69ef1dea7c888a841a697a77ca63bf6af58caab38efcda5993e6b029e8536cbe47312670498c0f0496dc2422138d8c8d6eb SHA512 238ab158f3a3606bfb753aa02aa6556170df61bfa523cada8570feb97d43cdee481264c2faef30eb2a9c6e345dc1e3f5fbdbe1e44272a2a57115733cc4e2e28c
 DIST bbdb-1.34-pkg.tar.gz 379894 BLAKE2B 5d6eba9c0594a4edc61d626245a0827f2886cf588de9c7fca9748af88cd3ac9740c9552f817f3f882129dbfa5daed9d5c7f00698aa14e63852daf2b81f5a1236 SHA512 2f92a7dca882083631bf0c4dcbad3e29cdd2920b48aebb19a6f83e21ccfefbd8534278579248d74f1f152613fa601af22f8d30236ed0fcae83c3e3eed0ccd4e3
 EBUILD bbdb-1.32.ebuild 591 BLAKE2B 27024b60588a9967300e660fa43b6bf5ebd5b880201a22efc2e778c7e02394f19cf6500bf06ef8126071856e02c84967e86ad9c22ec12e9849e716c0b6d22e0b SHA512 b303cc3a8b3ba132400a01651497e9d40685cefc503642ef22a86cf4856791e7a1256ef9d53b7842483549ec7f766115b4acab841d9e79010e48145e2eee494b
-EBUILD bbdb-1.34.ebuild 593 BLAKE2B 54cfde8e27de8e2877518b05365a0adcfb35ce8c6951962ad969bd5746f6283d726aada3bd2008f75c93656fde87f6e2c39a8ceb67594e3234d05c5d8bd3a8a9 SHA512 4580a71eb25897a8eaed543d2956621fa030338744a8ba749dab423576762f4a1f867e66f116c2d96660d705d9999ec853ed8c837d99a9966d1e3e0c87183447
+EBUILD bbdb-1.34.ebuild 592 BLAKE2B 0bf5a67a78a1b27ea110af55b9be89da401eda7f3d12db7e000f3abe79e0d24c9dbd3bf51973fda3453aa3a102339d7e06e77d2696625e37ca426049814fa751 SHA512 e812fe5ba66d769a7d0bd6a425f6163439b2a89ffafab3787a8ff24e33ed2fbda703ef953c82013b9bc943a909f9facfe16d56892c49386d4325bdd36d2e2942
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/bbdb/bbdb-1.34.ebuild b/app-xemacs/bbdb/bbdb-1.34.ebuild
index c9cb958214dd..ac9c22820965 100644
--- a/app-xemacs/bbdb/bbdb-1.34.ebuild
+++ b/app-xemacs/bbdb/bbdb-1.34.ebuild
@@ -25,6 +25,6 @@ app-xemacs/net-utils
 app-xemacs/os-utils
 app-xemacs/ecrypto
 "
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/build/Manifest b/app-xemacs/build/Manifest
index 027cae815177..84efe4e96013 100644
--- a/app-xemacs/build/Manifest
+++ b/app-xemacs/build/Manifest
@@ -3,5 +3,5 @@ DIST build-1.15-pkg.tar.gz 49849 BLAKE2B a41e3441a9e1734bfd5caf1b999644fe0ff36c5
 DIST build-1.18-pkg.tar.gz 50029 BLAKE2B a23fbd5f7d42c964673e0cf07559f5bcc5ad426001656c9d824f7390258cd1f40082b5674a30dedd4759cd49bde803d2074b67974b15be0cb38c030b9c397e57 SHA512 f4a189b65abd6a6373f0596d39ce061c4e1d371ae9bfee5daa70a60ee48cf99e9ed032bf9f70a4af90507239ee425c4dce7906f2dda98079da833b9b86a0cae7
 EBUILD build-1.14.ebuild 381 BLAKE2B 9cbc4568a8504108d2f378d7cc978d51c233de603c3e51bbc64fd673f8340555621f68ccab80b6bf7822d11f77ac6fcbf1bcac097b7f9e78c9f5f186e19278d1 SHA512 5e1e85a9f50ff96f7b189028be475d4614eb4a946878ff41f67b6d88d047ce532238b0d68f4f97219d2a4579cff9b8e0bdfcd20afd9b0096c8f73f202e585aa8
 EBUILD build-1.15.ebuild 381 BLAKE2B 9cbc4568a8504108d2f378d7cc978d51c233de603c3e51bbc64fd673f8340555621f68ccab80b6bf7822d11f77ac6fcbf1bcac097b7f9e78c9f5f186e19278d1 SHA512 5e1e85a9f50ff96f7b189028be475d4614eb4a946878ff41f67b6d88d047ce532238b0d68f4f97219d2a4579cff9b8e0bdfcd20afd9b0096c8f73f202e585aa8
-EBUILD build-1.18.ebuild 383 BLAKE2B a45c48bb09da4ff470b2fd3b8542c561dc557148508d7dc9d3c06b43627f31350398b78d6f8147453512e92ed7ddddfba7460f4b75c55c6a2115ec1eb9957238 SHA512 f916583f1c60a1b8a070201cca7e57d1dc02e683595041393768e6e5356e5a6b3045d5f22b7c9f238c3989d949759fb49782a775025919b05ac55fc2e19619f7
+EBUILD build-1.18.ebuild 382 BLAKE2B 42c1872f1f3fda01c4d67c1e9123e820077943fa40751aedb5d9e15aa6977563eece57600c435f2c6f7a10e9b3b6a240178751c57f64c079797ebaad75e0f580 SHA512 17632c713c8c1b41783f60a0bc72b07554f3cf267195b7ac3758c084716b48c14cf20fa904651efe59c92653027a25cb861a0828151314799d4eb2ed20ed8bd0
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/build/build-1.18.ebuild b/app-xemacs/build/build-1.18.ebuild
index 3054e6c56f7d..db8ea99aa208 100644
--- a/app-xemacs/build/build-1.18.ebuild
+++ b/app-xemacs/build/build-1.18.ebuild
@@ -13,6 +13,6 @@ app-xemacs/dired
 app-xemacs/w3
 app-xemacs/prog-modes
 "
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/c-support/Manifest b/app-xemacs/c-support/Manifest
index 5488e7b79128..e45ca1af8c7e 100644
--- a/app-xemacs/c-support/Manifest
+++ b/app-xemacs/c-support/Manifest
@@ -1,5 +1,5 @@
 DIST c-support-1.22-pkg.tar.gz 78027 BLAKE2B 6431841a5bde016211016723b633b6aa1c7c10e62f0a846d52b4b77053226392e4ed4170384144235ca48f5dde5d47312c34085069ef682bb0b199f7d926c289 SHA512 38ca69f114541a9886ac547701d3d2bae90707307e73ca9ef2b2867500c0ea1b16f9a1fe3bc69b039dafe9cfabafadab46c11d156873c3105c77026655ae00a4
 DIST c-support-1.24-pkg.tar.gz 77955 BLAKE2B 1e55fabfe0888fd84d416b3433e64ee45c597b38942048eca1d082afa1dc59ed3714c0be499e6b960c39c30dbd595fbe493167515f3a0968da74ada51650ab79 SHA512 dec220ef2b354da746b0552e37bada1b73f07f14b96996e2ad98cb089a105afbf95003f5d4f51a1ba09498d26fc9c65241835c2a40c19d1bd0c50ff9333216b9
 EBUILD c-support-1.22.ebuild 332 BLAKE2B f56f4a9911061bd91b8810eed68d2783443f320fa1073afd880b1386ee5dee1c1bae7401313369225253702f75977811b20afadbde73fd1f353fea8580c55d33 SHA512 98947148b5001de432f5449493beabc08af814d76097b7313e6d88cfa5762872afba17f4b3bb80437344b2e3dfad46bae6267e0befae072f9cdd04cc55a9c38b
-EBUILD c-support-1.24.ebuild 334 BLAKE2B 5d9ced878f9dff4127968a57a243355c8155fb5145b98a064536d2546e0db2a75091b87be3b5b4993e1c4f93ed684c24e23029e8186cf9de2e25e315d559e4a8 SHA512 f3aa4c63ee5f4b69bd88a7ca54ac011c40df5461376fd3b462c19e2ee4fba0c25cffe38951b7d916bf702c8c6102da8ea8574debaf811cd6517cdf1aad8dbfbe
+EBUILD c-support-1.24.ebuild 333 BLAKE2B a5fd47131063aef8d7ea22af75e07d5731d431283dcc71d7d9720bfdf2841e2a62f7857387f031ec97ea0c429e706224917c968d21a9775f9b7ae94c75ab39d7 SHA512 beb15d43b4a670fd434b1038de175081d42dc463622deee3dddbc9ce15723f758d105279bbe1716c328e62f8c1c3f127fcea16744241ec3a99223de2fdcdb60b
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/c-support/c-support-1.24.ebuild b/app-xemacs/c-support/c-support-1.24.ebuild
index 4f7fe38422d5..5cdf07bc4734 100644
--- a/app-xemacs/c-support/c-support-1.24.ebuild
+++ b/app-xemacs/c-support/c-support-1.24.ebuild
@@ -10,6 +10,6 @@ XEMACS_PKG_CAT="standard"
 RDEPEND="app-xemacs/cc-mode
 app-xemacs/xemacs-base
 "
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/calc/Manifest b/app-xemacs/calc/Manifest
index f39753132b4e..f3f91ca8312b 100644
--- a/app-xemacs/calc/Manifest
+++ b/app-xemacs/calc/Manifest
@@ -1,5 +1,5 @@
 DIST calc-1.26-pkg.tar.gz 1600637 BLAKE2B 5ded27390d06e9e5ade53e6b33ad9583233ebae64f2600e9cb3c8717bac7e372bad4e45c2fad45f15090bfaa7e661f98a84414e297765dae0578a58f06b49394 SHA512 f727675754980f448d9607fd45b561642104888042fae35f64e20130e0ee7c9dae8cb24b07d871281e3e995b97addf268e6d2db390d900f4826c85c89c30845b
 DIST calc-1.28-pkg.tar.gz 1607492 BLAKE2B 34204674fd925dae07e0eb13c8303c38947dbe2bc7e7117b8cda96cbf3d100cf2ef12f94420e50e5dbbc925aa2a35383ab444734756f94e4920988750d999bd0 SHA512 829577c6cd1029e07ba1b813755bcf6b19d14be5e75e4d10c8e8dfca4dd250b66c76ce4cb63965274e2ba3235488d42112c295791c5dbc4ffd26faa855e70d90
 EBUILD calc-1.26.ebuild 285 BLAKE2B 5a6e6082e435507994fa305ea86f0ac5a670c871f35b8f8138b577e774e4ec269eaea1b3e79d4532804cdfa47ab47cc37440a9909a6ba64400d540559a9f1f1a SHA512 205ceae6b656f1a4278cb3ce52c6f56c888d772768965813bcf24e6b774aae717b57e6dbdac4d50a02bedda361be9ec82a34581b3c17be7c74318bad3bb8eb06
-EBUILD calc-1.28.ebuild 287 BLAKE2B aa145435f2626e62dc2e347e401d37c8fb8db36a2a4e7cadeacb473d5d25e2b56d63f94bd7fa38f75026cf63bb18305261ac62f99ca4facc34c82cd12bf7f316 SHA512 6947f2d16cf77fa2a53e2d711580b02c63b31f0fbd9fd433a73e5c605ca57bdf4086eb8c56a4f8b03903a28a1b01bf083767d838545d4e67d0e85092afe67f8e
+EBUILD calc-1.28.ebuild 286 BLAKE2B 55d871827575ead2e4e89a657bc22f47669462f3d531e29fa7186f57ac31a47037a7027e3257d3feb01f00840e4414753cc59bd36ae01bcb64d6370175314aac SHA512 17845586643b8ab90eba4a60110c614eca8daa680cf4f48ff359dbf5b7477f6da6a32286927beb0d07d61770b5a3535663281a52575d9ecec046ca220a2ef0bf
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/calc/calc-1.28.ebuild b/app-xemacs/calc/calc-1.28.ebuild
index 3f94d53e5c48..12120f4afa31 100644
--- a/app-xemacs/calc/calc-1.28.ebuild
+++ b/app-xemacs/calc/calc-1.28.ebuild
@@ -9,6 +9,6 @@ XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 "
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/calendar/Manifest b/app-xemacs/calendar/Manifest
index 045a3c261fd8..be31ce1ae4f0 100644
--- a/app-xemacs/calendar/Manifest
+++ b/app-xemacs/calendar/Manifest
@@ -3,5 +3,5 @@ DIST calendar-1.38-pkg.tar.gz 411386 BLAKE2B be833c4f81a9d2e79e06768836fe1e58601
 DIST calendar-1.42-pkg.tar.gz 409513 BLAKE2B 81f59fa4743682beed93be1eadf211ef8f096720bc44ee47d80142ec037029942e2cb02166b15318dbba300eedaa551c1426fbf3e454c3de119f5c2e41a8d4d8 SHA512 75e0eeaab3c818d28d4b0da798c961108457d7b2ffb9c671589194473ff3d3f967e52b956601acd42d53ef584d72cac08d4de47a9aa3ea3720211bfde201c8f2
 EBUILD calendar-1.32.ebuild 295 BLAKE2B 7b3ad75b0119b31f8531a1dbd36166253231fcea2352ad1802e75381bda52f263f11a3fbbd36a63cf557cc6629438a65211ffb5674e12b509e733dddb915f2cb SHA512 c57e15c7bfd9d85693440be694a0eea8a243643884ac3a222c44a0c0680fe772e11c3e010889032685e4d757da4c4ca02150788e3b667abf2aea66ca16717680
 EBUILD calendar-1.38.ebuild 295 BLAKE2B 7b3ad75b0119b31f8531a1dbd36166253231fcea2352ad1802e75381bda52f263f11a3fbbd36a63cf557cc6629438a65211ffb5674e12b509e733dddb915f2cb SHA512 c57e15c7bfd9d85693440be694a0eea8a243643884ac3a222c44a0c0680fe772e11c3e010889032685e4d757da4c4ca02150788e3b667abf2aea66ca16717680
-EBUILD calendar-1.42.ebuild 319 BLAKE2B fd4f516b9970ed99b203fcb61cddc0cdd825ef53527698cf09b37aa98bcd0b05421db30e8e76e76a1516450f561b3845a8c70e73fb4a2545650cbbf9ed9fd158 SHA512 b18df8b493ff67aa22770b5c78acaac4e066f015c2c06cc03e60858868dba84356bbab5a0e0b9e2e311b0c86a379f1cfe42295673bf52ddc8aada2cad9b82d30
+EBUILD calendar-1.42.ebuild 318 BLAKE2B afba74d0defff01f55fc9995526ac73c7e9aaec8b290452f9b5ae0c070498f368154c2bb4ecc34eb71dc562ec4bae489a3e911f9f2688dd15f2382fd64102d3c SHA512 2859317fcd62d307730f55a1b67df99ac2ef4fda47cb3460fa51df4c8338a70fbe77828a8ced12be9e6062b1bd29f8f92f1701d2d3647222c0b47f409a2f2b7c
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/calendar/calendar-1.42.ebuild b/app-xemacs/calendar/calendar-1.42.ebuild
index ead7639c6320..f204b9c9c2a1 100644
--- a/app-xemacs/calendar/calendar-1.42.ebuild
+++ b/app-xemacs/calendar/calendar-1.42.ebuild
@@ -10,6 +10,6 @@ XEMACS_PKG_CAT="standard"
 RDEPEND="app-xemacs/xemacs-base
 app-xemacs/fsf-compat
 "
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/cc-mode/Manifest b/app-xemacs/cc-mode/Manifest
index 923f48315deb..c5c7b2de1866 100644
--- a/app-xemacs/cc-mode/Manifest
+++ b/app-xemacs/cc-mode/Manifest
@@ -1,5 +1,5 @@
 DIST cc-mode-1.45-pkg.tar.gz 524116 BLAKE2B ba250dd9f9fd97c7659768f23c215a31e1b0b9fc7e60824328048bf3624a88577586e3cb06bd9e12a667b30a6dd68d097d6c448a571498b6d88dc73afae65268 SHA512 1b584685e2d6878d29e07e0618ac1e3a8306be8e5f8e39f9ccecc9458d155967844a0544f87d9f25518d52f322dfc7433e5578f84e46423f14ffa8f901537d3c
 DIST cc-mode-1.99-pkg.tar.gz 815847 BLAKE2B d08ec17fb5c73b69cfd55de96a9cb65be48c3868f665187b5319fd4dbbe52112a8280c72ef5a565f4eb9529073c12a1351b8c76bdb30c26e9788c1f20361b239 SHA512 6e50b6bfcdfddac5e07b76e2fa8f5ece4db4279f1442a14ba6f7788ff187f4bed7d3b3c900c8403d9c0232768cc000f5ba63df87969d34fb6d35d6e5577fc835
 EBUILD cc-mode-1.45.ebuild 321 BLAKE2B 272310ee0f6cefc78870047275d0754875ce86a7b7acd1e59d6f5b42015e8b053107f08c4292337b5e98f38ec69915f3d30bd864f1fe507489259a002fff1c45 SHA512 6258db422c3eeb8fb1b0ed1a8f389fa7a78f25f70339ac3e074f77770a7b34bcb573fc800f6911439bd05910fcec55161568956a6c7f7251b2a9f73f4ff28888
-EBUILD cc-mode-1.99.ebuild 323 BLAKE2B 8b489aa7b66bf2be024f524ac4c156bc83f10fb7d9148a8fe28ded5c101c76ecd291730f466b20264b5d29ca9f0c6e91f28fd2d5e13290956217a4de49769e5c SHA512 d6f9910591ae58db85fd4c1332f8e12c3d84d9cd591864a458089b1cfd0929b72fec062d96d9b4530e77b5be6b61c1c42275406c52731bfd335ce011e9400e39
+EBUILD cc-mode-1.99.ebuild 322 BLAKE2B f59b991babe56ba05d1e5fac14ac298aa981d28de1eb14f53d446556cbf5306aa972d2e90f1ec1b00e450031558ae9bc13f71a8fe7b730a9653e24ef95e3dae5 SHA512 b7e1d22db4f26c387898fb1767342aa09da64257b5388f2c851ba3394836c41dcbbb85fd30262441b1c399a9a4f4bc0698acbb490b364a9128a8659a81f7228b
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/cc-mode/cc-mode-1.99.ebuild b/app-xemacs/cc-mode/cc-mode-1.99.ebuild
index 176e415f3407..a9d15712a567 100644
--- a/app-xemacs/cc-mode/cc-mode-1.99.ebuild
+++ b/app-xemacs/cc-mode/cc-mode-1.99.ebuild
@@ -10,6 +10,6 @@ XEMACS_PKG_CAT="standard"
 RDEPEND="app-xemacs/xemacs-base
 app-xemacs/mail-lib
 "
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/cedet-common/Manifest b/app-xemacs/cedet-common/Manifest
index 719ab0063339..b550e601b26a 100644
--- a/app-xemacs/cedet-common/Manifest
+++ b/app-xemacs/cedet-common/Manifest
@@ -1,5 +1,5 @@
 DIST cedet-common-1.01-pkg.tar.gz 73671 BLAKE2B ced597935ef483ee6d92a1245d255200a767b0663b7c90d0adefadecf5b42bc4734597cefcb35268ef6eda5bc1887ea7a9110fc894e72b6fcefd7ea8d1ddb2a7 SHA512 53ee8486ff02ff5dccfd9974b3f7bfc710befee95ad3db1bcfe5e67c5dcf740440f060770a080264f0b0f09013867ee7d66a83d7b3919c7e598ef3207340d9d8
 DIST cedet-common-1.03-pkg.tar.gz 73644 BLAKE2B 314d24fe951fcf7922a1e0c84dc96744d0b515a1ab27de4c23217b60936e746ac6ec78d6a526af8e1658d6c9b8494f77ea4dbb4135e5c3164e8f3a7f32bf36d8 SHA512 25263858e8cadb5bcc2e822021a0b7d76e61442d9de7670dc4f5b73c3cc752f36a43622ced8f4d9d9a594a2c5b9c6cfca052dfd3d60c639dc1854908cd6fbb0d
 EBUILD cedet-common-1.01.ebuild 334 BLAKE2B 9421490190b86b51504c88456ec14a0c28d9e914ed81bd8637d606a963a42118cb01369b69533b64a5aecc9eb96bcbad9e4ea3e6ee888a31d369255608eec787 SHA512 9dcb4c490deaba76e2cf4277b5293d2a433bf2419d287c6d8d6ead0b2f1d75447c8e00c9a5ac77ed438c2f46f2aaa89e50b75fe42a262f2da12a9cba5e6b8012
-EBUILD cedet-common-1.03.ebuild 335 BLAKE2B 45928a4818dad212150501a6619d03a66ee9430fdfc1e59c8ab3d5b537e78477150ffcb1722a749b1fe3c9797d8ad27f311b09ea1e8843506a44d07a93d1ae1d SHA512 1e7d23ef87412379f63ac4df5fdb584f42772dd9bde8bd78df978c2735e81232269c0477e9a4f153c78f9326956708691e91c4d4b695d848e3cb2c8b6373bc2f
+EBUILD cedet-common-1.03.ebuild 334 BLAKE2B 38c36b75295c1681dbd15bc8162123f001fb16b6a9d4c58fedcafb579bf57e019211460c36693358af80fcaba5a437338187c63ff785975c99889d50d47e5cdf SHA512 c7ea963d615cca31c248e7ba1ad047a385c986cd84d142a64f08f6ab0c6f8ce33114dc5c172bc3321648f57cc993df0b8e1ab596dca81f705bc16e5d5f20170d
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/cedet-common/cedet-common-1.03.ebuild b/app-xemacs/cedet-common/cedet-common-1.03.ebuild
index 68de4283e5ac..389a7f52c3d6 100644
--- a/app-xemacs/cedet-common/cedet-common-1.03.ebuild
+++ b/app-xemacs/cedet-common/cedet-common-1.03.ebuild
@@ -10,6 +10,6 @@ XEMACS_PKG_CAT="standard"
 RDEPEND="app-xemacs/xemacs-base
 app-xemacs/edebug
 "
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/clearcase/Manifest b/app-xemacs/clearcase/Manifest
index 697f0576216d..6fd4a608d5b7 100644
--- a/app-xemacs/clearcase/Manifest
+++ b/app-xemacs/clearcase/Manifest
@@ -1,5 +1,5 @@
 DIST clearcase-1.10-pkg.tar.gz 105865 BLAKE2B 42738b8614b4feae38fb45d4839219a523052bb330a78ca7f4c271b0163c89934c4e18b7329d970270880ae197a6ba1aec6e5713aebe073007cf079635ebfdd7 SHA512 a2e909efcc372e40f05af9a588eb8e6222c64947ca61460e137f516c43294120727527e98af72bbd9c4c3782d62cc9ff8fe06743d4dc498e0c12721f229d9a1a
 DIST clearcase-1.12-pkg.tar.gz 105934 BLAKE2B 313bb0079d2f8683cda9c68493f286adcb867e8feaa13134eec5b75b37d98778ea2a170685e359ec94b48f2be3832d0b15efbd26b2023b5b204592b9e78b479f SHA512 e5c284800ef5c42a367739fc71209acbc8d4a59a60851ac089693da1bf11458cda81f0cf46c05cb415337248dc9b448b82a230a5645ce414e54d61e197a3244b
 EBUILD clearcase-1.10.ebuild 383 BLAKE2B 1b165afb612e0667fac81e8cdad379001cdc947090f2b00d9ef5119eec21e8d3f6ba258d26e4a06fa86a0613fbc7a9db3ffa6d5058b0c697179178b6752716e3 SHA512 9f0e776e38f66968d5d8a76a58b90f334dd781e696c769c55c84b35fad23768e90243a848245425f1743b7eee620cd0451116b3146f6d0fe7bf3c4c710afef87
-EBUILD clearcase-1.12.ebuild 385 BLAKE2B cf858be00a08f9bcc19d8ebbb4603bc3907e50a2aa6bf71ffbe234781f7a9c910a61ee8ead6baa528060860d01ded325d1245bfacc6a30c0b8ebf4bd7d4b9b61 SHA512 83df7868610d665fe2067ea9b5d0ec49b7dc2f469253e0fe2efc05f373eee5f2893a9e69ce89470efc387696469ed59268e5fd6c00207761294e98ceaf87b2e6
+EBUILD clearcase-1.12.ebuild 384 BLAKE2B e68a21fc2b4edaf9dbee06978cb1b79670c10e9529aabf0dd85b674c0d46451e92e0eb7155d67b2eceaeaf57b4b76383e4090116c40c132521acb7b52cb809d2 SHA512 0c0dc0c80adc68d83d4f8c7d6695c8b0c749e2abed82a945033fef1f919bd3d7ed8d48f3f27b49389f61ed0057dd8ced901c391c6835f9c5cee9379fc1d50386
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/clearcase/clearcase-1.12.ebuild b/app-xemacs/clearcase/clearcase-1.12.ebuild
index ef2e24e63929..c6027c31c322 100644
--- a/app-xemacs/clearcase/clearcase-1.12.ebuild
+++ b/app-xemacs/clearcase/clearcase-1.12.ebuild
@@ -12,6 +12,6 @@ app-xemacs/mail-lib
 app-xemacs/xemacs-base
 app-xemacs/sh-script
 "
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/cogre/Manifest b/app-xemacs/cogre/Manifest
index 61472066db48..3f055d1ee4f4 100644
--- a/app-xemacs/cogre/Manifest
+++ b/app-xemacs/cogre/Manifest
@@ -1,5 +1,5 @@
 DIST cogre-1.02-pkg.tar.gz 47588 BLAKE2B 6ce7f40e5aafa2aeaedbb5f17b4624decd0c87ec4fb38f186e0419c5496109d0b6fc267d6f484eb84fdd22f5f59c70451241e92c7bf7dc26c956e3ae6a95e7b7 SHA512 a3256df974d92440cb63b612e30807088450854cb157e1ba01e0362c36262fcdef11d5f1240796091ee2a6869f4dec06e9ab55dabd55ada5d2c7e7410e0e537c
 DIST cogre-1.04-pkg.tar.gz 47657 BLAKE2B fc211320bcfeb6aeb1b59e4ab1a68eec77752504106657229392c6d717427811f3afb81ae5911143a1db8c63fa3366f1fb4edcd7be6a785d54560bd484f655f3 SHA512 63db2e7a2942993661c729624d60938610117e3cfacc0734735958a6f9a5857cc881e65df6958638b56024a6cb5683031b7468d236311227cfec7013e54fe137
 EBUILD cogre-1.02.ebuild 391 BLAKE2B 2a4bec232569d440b4296f9cac9bb489252338c304372a4491e62f0cda85b23b67d5c2571a55457ad339dec3bd66f0ed144df0a198c531e90525c12f7664af30 SHA512 afe60bf332bf39afbfc06d93466b20c78977ee9159d9125fcbec543a0c6fea4a4b6cea5648b487c5e4c83b78cc50bbe5c82256ef44f66a7543199f1f4ea68207
-EBUILD cogre-1.04.ebuild 393 BLAKE2B cf7c835d86be2c06dadcbac122d5cdb47a5a0b141691e4a8f09010a14e0a13c7310d00b1dda7825b5f0ae4d1333d73380e29e573939a0fbd0343533a38f2ed82 SHA512 7b79ab9f565f34a6d7f802e8556b032518ac167eb44d427e4b0c495a78210d8b4d77248d1a2a752cd10ea9456209720830f3c53e99c3408e221b34f3743c38e7
+EBUILD cogre-1.04.ebuild 392 BLAKE2B 7576ba21ba57c7d0f9ac99f60e5d16e67fa3167b15a69396c60a7483e2f1eedffaa9abaaf54b13ffb6178e6cd55403a13095e7bc0442c9352035f382c0f089d2 SHA512 a9308eead285faef365c6c96f7689349c8bb32872118ab08dc7b5b0351f5aed8992f35f292bcbfa74e9c07729aec9177800c7b53d26bb639f4c7b5cac0b17f96
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/cogre/cogre-1.04.ebuild b/app-xemacs/cogre/cogre-1.04.ebuild
index b465590782be..1e424709f39d 100644
--- a/app-xemacs/cogre/cogre-1.04.ebuild
+++ b/app-xemacs/cogre/cogre-1.04.ebuild
@@ -15,6 +15,6 @@ app-xemacs/cedet-common
 app-xemacs/eieio
 app-xemacs/semantic
 "
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/cookie/Manifest b/app-xemacs/cookie/Manifest
index cfa56ed4d7b6..603d14f473df 100644
--- a/app-xemacs/cookie/Manifest
+++ b/app-xemacs/cookie/Manifest
@@ -1,5 +1,5 @@
 DIST cookie-1.15-pkg.tar.gz 35035 BLAKE2B 4cd1408781337b8f124a5106a0a1c5d0f47860c3300f5451a031ec0403e6434a13973d93906e6585318b757fbd670aa7dd7a239445f6882f2574f92e48bff66b SHA512 0fdbc6f1db7f0fceaa35aaf8ab148875f4b391a3a2accab41c02267ad385fff4e54538e5335b2acca3e2d2550a9b2b00e78ae1e0b1bb997617ab439db9c89ece
 DIST cookie-1.17-pkg.tar.gz 35032 BLAKE2B 9df6bc6fe8d3c14c62130aa87766b809700d10749a5f5127f8c378a6b2010f5f1dfcf174f2467fcda42acf120e076681e84559bb26c4d94337d2f0d0d7560764 SHA512 f6bacd78ee83ea78a91a16a77491ed763e46098a9a8b922aa6dca1150179272a6624563e802d0cdce09a317f2a70b6a4ddb07359e18d2d25726aa25b2d9c2d90
 EBUILD cookie-1.15.ebuild 297 BLAKE2B 873f4dc5ecbd0f43121a8628d21412c3947081f5808c2be386ffcd601b26881f5d0bd6cb8e42adb6d78c6bf42dbae48b455debcfedbbf339bf1cc938cec4ddd6 SHA512 1db90f0fe72a5730e0a0bbe9d65c5608580a181776cea9721bce4d342b056c84f8df34106f4d1f69bc7d8916ec1dd278ef0f4cb03b0ce6f46b06eb7a0f78dc8c
-EBUILD cookie-1.17.ebuild 299 BLAKE2B d9646a3c02fd15cddfb79d0990b51433b171474ed82e117e154ea848e7cf40a451c6d86fc6f4b0935a07b5ac9dfb97c43b3b396fe94a82bc5ae83c3e4d4fb947 SHA512 28b95076b48fc334230c567eb1d039771767da8b444b7d703213b3ba7ed4054c5c6de7a762273fabca608fc71a192811cba6f06c9b239dab894e0255f8af0a66
+EBUILD cookie-1.17.ebuild 298 BLAKE2B 6df1ef7ba54822cbd5183903223d936f51fafdc16f3106d383a0ae4778eb4768b989a3699beebb69c19fecea99da79a4d689756010d9c92047fb9ebd2a731403 SHA512 98fab411c5ed8a34c2bb2f348fabeb4912ed88523c1ba3e9975bdc07cc65d3fa7d20ed477f3851ff8edfaade6c7857297bf8827399c289326bdd63e0523eafeb
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/cookie/cookie-1.17.ebuild b/app-xemacs/cookie/cookie-1.17.ebuild
index 0d462887e91d..ef229e24adf4 100644
--- a/app-xemacs/cookie/cookie-1.17.ebuild
+++ b/app-xemacs/cookie/cookie-1.17.ebuild
@@ -9,6 +9,6 @@ XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 "
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/crisp/Manifest b/app-xemacs/crisp/Manifest
index 8360b410cee8..82066bffd745 100644
--- a/app-xemacs/crisp/Manifest
+++ b/app-xemacs/crisp/Manifest
@@ -1,5 +1,5 @@
 DIST crisp-1.15-pkg.tar.gz 10436 BLAKE2B df57ef3f1eb7cc235f21bf40c8770cecf3ea139833cb1f27b3c25649721734fe88eb9af88a7da2e19cc98d869816087c52464e13dc254d6c1693e05089ed8083 SHA512 815d86bfc854e78c35fc8468f4e9aa3de05f9b029f4ec9e344880d398ae4b5a2bf8cc3391b0f6b8030090fcb4966dbc3871518410c99cd265c751b40c0e2b42f
 DIST crisp-1.17-pkg.tar.gz 10489 BLAKE2B 5929ef5e5d91a5516a4ab56e61106def470cbe0c3d0075b9bd4f030a1c9afdc1e8bd92b3c6620dafec51a43d8ece08889674acb421d63834825b01d8de24e33a SHA512 9cd9da5166e5651b719ff3d7f499e7b92311fe6bf6df072ccfafce85d6cdd54ad24295fdc1165304db79625f159db5078a2e5f51290f269a87db38493f7f4458
 EBUILD crisp-1.15.ebuild 256 BLAKE2B faeb0c7773bfd4b7116335608f3a4d4f896ca377bbb1948e83adabf4385d875e4eb1e1fd916ab5ce64e2b35159272a3a4afec369ab3005a094250b8915a0c4b1 SHA512 13ab4764960d884e7e5643d4866573a26c4eb6e0b70e1ee2dea178f5be3610181572fc64b854e1c30d8d76b68d8a8f9b53da5f8f4768a5d6d037f85d635f876f
-EBUILD crisp-1.17.ebuild 258 BLAKE2B aaa3059779033eac5038f3dd07de861a90b112ddb7e6b709367c96e50a1f6a08b47f13ad998304dbee34f25faa94b0efb0f78afc6744895f4aeb04bcc8706e33 SHA512 c17cbb8d225549b5a9c8652c8abdbc9cb39e429919d5482e9c73381d7e32f113405daeea017825b0c5d70ddda1fbeac7c28cec50409c8f95072ca59a490ac5b0
+EBUILD crisp-1.17.ebuild 257 BLAKE2B 2500dca1a56998a5e35ff6aedc05e47df62afe34e563989571ff1ec5650051c65f9667460dbd76aa4abc78fe17e3a732c034198eded210a3ee574447a4cd866b SHA512 b3f8ce856b57883ea5441f733a985279febc32f9e58e54d19450896ed25575e28ad3c9702d1811b067de8713aa93979378956e4402dccb37bd458020ae76bfc5
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/crisp/crisp-1.17.ebuild b/app-xemacs/crisp/crisp-1.17.ebuild
index eb581fb3a9f9..8a6841f13f4d 100644
--- a/app-xemacs/crisp/crisp-1.17.ebuild
+++ b/app-xemacs/crisp/crisp-1.17.ebuild
@@ -7,6 +7,6 @@ SLOT="0"
 DESCRIPTION="Crisp/Brief emulation"
 XEMACS_PKG_CAT="standard"
 
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/debug/Manifest b/app-xemacs/debug/Manifest
index 78581e052384..eefd1f543da3 100644
--- a/app-xemacs/debug/Manifest
+++ b/app-xemacs/debug/Manifest
@@ -1,5 +1,5 @@
 DIST debug-1.18-pkg.tar.gz 107997 BLAKE2B 06873ef6d3886c8b5e9659084bb3a50db955e27ab5104d0f29271ebcfa2e5c298c1bee59f46dac0d4d10f8c0dd89c4b0c99e23bef2c449da697d22641d15bb6f SHA512 0bbd5496636bf6b850d44f953865ca7c23bb5f5040be0d8f6ec385a590ffaa6d5e325b24aac7f07b0b6c8ba0abf3fc3b7214f06a09d20eabc6bdf940237106a1
 DIST debug-1.20-pkg.tar.gz 107953 BLAKE2B 90af70a49f6d62224248a73907dec986ba9671a99782aa84cdf9024426f192fca74781ced10f539da9c3115586cc1fe6ecfbe91fef536228d259280c251fb6f3 SHA512 3985447986f5129a8789d1f9058a662cef5dbbe0e9d565f00973e79a6d32139581fef777f0e6d683ad5338896cc679bea3ffaf18d51976a5a2e27ba5484cd9c9
 EBUILD debug-1.18.ebuild 324 BLAKE2B 0510a2ad345b7ef9fa8cb575ce5c9b8ec7004bb3f434bebde260cafd696c02dfdcc0bf112b088338f53e1f90ea75f488a8cfc28eae882f5bec6bec44e37cb41d SHA512 68846bd7418cf47cc8367f6bc6f2176aebd8cf8ef387f28cb4d9201f48916bf5d853c69693bd7b1536cc713af92fe656b7670e4ac2af1173abe77788b00dcad1
-EBUILD debug-1.20.ebuild 327 BLAKE2B f244650a628293353307a55acb340bbff44743eaddc684193ec184e54ee3208053efd0582066c0484560cfbf11f04b889a3df5c8525d4ba750bb6651cb81709b SHA512 68b6d69f05225ff318764eaef43b6d35b895d0971f99b7d12fb6240735680f9d48835aa46fdd61f3a756d2d1de4ca211079a33b1eaf65704607ac2d476fefdbc
+EBUILD debug-1.20.ebuild 326 BLAKE2B a5c7380f1d1f3b6a8cc6105ecc831ae492cedad8628b4f91af5f8eae20c2ded411a5b5d9738c99a8cb718896a80b7c220434f7da461cbeefbf5a7415ca973c98 SHA512 a90968b23752164cbd4cb4aa1f655b03d3bc4e1399f379d3c160930a8730a0b5c0a280c1e44aa5fea3a72475a67ed9c2da72b2d1db9fca344ec068a15ed37d5b
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/debug/debug-1.20.ebuild b/app-xemacs/debug/debug-1.20.ebuild
index 1b39a5b6302d..683579dae6ea 100644
--- a/app-xemacs/debug/debug-1.20.ebuild
+++ b/app-xemacs/debug/debug-1.20.ebuild
@@ -9,6 +9,6 @@ XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 "
-KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
 
 inherit xemacs-packages
diff --git a/app-xemacs/dictionary/Manifest b/app-xemacs/dictionary/Manifest
index ef5a93f71e21..492b4ccd55c4 100644
--- a/app-xemacs/dictionary/Manifest
+++ b/app-xemacs/dictionary/Manifest
@@ -1,5 +1,5 @@
 DIST dictionary-1.16-pkg.tar.gz 40085 BLAKE2B 413d5b82704eed5f96b99ffaedecdb149e8e562fa7e1a559cb396076d1ddae758fb634e00326f3f8682f7a1199905e3be7b0f271903f52faa532dbf31b8367fe SHA512 8dc0c0809d713f9eda280b110dbffa6f237c50ebb2e6c93f571efb3d22c1875ee5359fa91bc3faa58b3b0f431e75b84527262defb8aff5174a400be61f1a80dd
 DIST dictionary-1.18-pkg.tar.gz 40135 BLAKE2B 1fab7942a70e622613a5e126d2e48403d6b0d5594aca00e4cff9ac56db03aa2379a9742301a5a959e54ba8ca29780bd138d871577e31dc72805a6ccdabc4b44a SHA512 bdcdf63eb60dfe1a296b22b7493d842cbb3ae210dfc4cbcf7602fd00e7791736690961bb339293e1fdcee2bb527b87c003acd0dc640dce0c4dd5208c03fb1386
 EBUILD dictionary-1.16.ebuild 308 BLAKE2B 5552a050c03fd5b7d6ca8abda40d138604017a2da9147191003aaff3b30ac2e646615d53974388eefb854601575f53a79331f2e1c9d6bcddef1c9ccc3fa7d18d SHA512 08d737064247aa16149c95a719d75ccdbb249255cd57a464e3305e2ed1acb8dd31ae280d80264b7f16ec07a4783283885c7e201af558f61f08e26a17d72e39a0
-EBUILD dictionary-1.18.ebuild 310 BLAKE2B a8d67cf121919a4133acee8154c79db20c4f4c56208af77243b3580d11ec55c44e6be0b7958440f3ddd94d8fd5a74de1890b98e63bfa3c72880f9194d94eed31 SHA512 871499a6630e561afcd965106c0608d91679ad4ffdbea89d6ff449724697a86537fec933eee57aa7a75b47ea1e5b2c10c5e735c925768dcbe865582e40090070
+EBUILD dictionary-1.18.ebuild 309 BLAKE2B 0a17de45b3a8b1183ab12fc5b37bd3dabad42ec959a2aa369cce87ac33d8405426fb83c86883247674352dabe0ebba0df90c66a9033bb07982b82ca1df1958e8 SHA512 8252214824a442c3b564c370ff72169454ae46c6b873d5644065993907318e40af5ff3aab43717e96e4e86b4227033dcbc07b3f02a2bf6e8b52979c5156f3cf4
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/dictionary/dictionary-1.18.ebuild b/app-xemacs/dictionary/dictionary-1.18.ebuild
index 11c886f89191..925f818a7faa 100644
--- a/app-xemacs/dictionary/dictionary-1.18.ebuild
+++ b/app-xemacs/dictionary/dictionary-1.18.ebuild
@@ -9,6 +9,6 @@ XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 "
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/dired/Manifest b/app-xemacs/dired/Manifest
index 6ca82872c11d..40ec97bb4e8a 100644
--- a/app-xemacs/dired/Manifest
+++ b/app-xemacs/dired/Manifest
@@ -5,5 +5,5 @@ DIST dired-1.22-pkg.tar.gz 203803 BLAKE2B 24a8980ecea5c3f1630f70cece6f84a25cf394
 EBUILD dired-1.17.ebuild 310 BLAKE2B 810c6bc627cbd3b2c412a49181e5b1d7645133b83e166830f96a9456d67cfffae4ebfecdf01e7fd87546d70d489d65546e3cd7c9b4bfb0c1f73eb9ed318e9679 SHA512 a53e403a8c7c9eddd7f47e8695d366080e24fca28b7bd7fe7287d6f15c3d5511d345837cf386f5dd5d6f65dbbf2b5a6291d377996a4af6f32fd4baf867bc4d29
 EBUILD dired-1.19.ebuild 316 BLAKE2B 92244d2f28d006695cab4528a4b683baf80832aa6bdee43a3328702302f36ca4b9afc91edd79243faabae57a54089116410abf23662ea40511e7f1fff68a3061 SHA512 44a64f869617cb770abd7a9dc6bb1b6edd878abb896932282ab2234f78a51b7ab10aff5e9f43984bd47d75ba38b632fcaf2101b8eb85165c616a7f2ba396eab7
 EBUILD dired-1.20.ebuild 310 BLAKE2B 810c6bc627cbd3b2c412a49181e5b1d7645133b83e166830f96a9456d67cfffae4ebfecdf01e7fd87546d70d489d65546e3cd7c9b4bfb0c1f73eb9ed318e9679 SHA512 a53e403a8c7c9eddd7f47e8695d366080e24fca28b7bd7fe7287d6f15c3d5511d345837cf386f5dd5d6f65dbbf2b5a6291d377996a4af6f32fd4baf867bc4d29
-EBUILD dired-1.22.ebuild 312 BLAKE2B 99e87f2a400b0115b3d31eff22c6368d8378d50d444001c77b3fa49f90978b465bd6c0d1329fabe630fe7fc040b49447e14b3412ee4a333f697f302af487d1e3 SHA512 dcd46c79d417f62320997a21cec5be49b04dd4e8f1092f1bdca26d41f5e707ef4c359d30f980d6e46779d64d5dfcaf0e4a2496a30063f6a29218ef4202c90648
+EBUILD dired-1.22.ebuild 311 BLAKE2B 384da966daecd389b0e81b3d5aa117e20add054bdd0affd3f969e4efe00e74222c2828e2f264c22b3f2a01f459d3fccfc489250a13836f1fdcc94f872600e312 SHA512 d939ee05ce7286eafa644675156802735a6010fdfb12b17cd1af9338a4d17a287859e67a4ae12f2571c6902c5896cfd6b963509627af2c2485544920d4b1d67b
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/dired/dired-1.22.ebuild b/app-xemacs/dired/dired-1.22.ebuild
index 2f9bb3ca8a79..e4a8b318ddf1 100644
--- a/app-xemacs/dired/dired-1.22.ebuild
+++ b/app-xemacs/dired/dired-1.22.ebuild
@@ -10,6 +10,6 @@ XEMACS_PKG_CAT="standard"
 RDEPEND="app-xemacs/xemacs-base
 app-xemacs/prog-modes
 "
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/docbookide/Manifest b/app-xemacs/docbookide/Manifest
index e296e7138c61..c8ab2669b438 100644
--- a/app-xemacs/docbookide/Manifest
+++ b/app-xemacs/docbookide/Manifest
@@ -1,5 +1,5 @@
 DIST docbookide-0.08-pkg.tar.gz 32061 BLAKE2B 051331b77ed2d68feaadd163134b7c39e1c57e87b3ff925ba2c2c353d470f94f575c4977ee18e84acf9e84de5440ebf32a31f507d99b110dbc1bf271069d1164 SHA512 a5de9193285bf185ab808c9aef3f483f81493a0f30327a923ed898700a5a7dcc489e4b6f9fc7767cadae481b62faa5f18e956955575543a037aba1a4059a42b0
 DIST docbookide-0.10-pkg.tar.gz 32361 BLAKE2B 88aa1d4cc69d632fa11f856a49b30e94decbe2b96c53312963b2b40fc965f45e40b0f3b550442ee51d90845d19eabb62aa47fa4b94a530498aa8470dc9deb9df SHA512 831bee6d1214b027ae4b6c95c5166af63181966d42487881986f8b66db125cc54d34770c2a1cfece630257645380a3f926f2d197f20f4c32c6d42fdf56081f88
 EBUILD docbookide-0.08.ebuild 337 BLAKE2B b8e9e3f4d2b49a5cae2bd38d6b7449ccdfcd6fb8efae5117961f513f507c9ac409414637aa1e6efda9dc0f9c5b0e8108bb52aaa4394b937fcd3ea2f07425bbd3 SHA512 ab270110ac5c740f24fec0657a54f6ef1002370a444d436fb7185396dfdea7ae7e929e3c6e57f606c21e98cf6d00b368ef63187a5f0dc0ef406179e05ea5445c
-EBUILD docbookide-0.10.ebuild 339 BLAKE2B 5ce4fd405e512888d559fe168290c359193438c5901011c5d2e0c4b17ad0deb4896a28ead8ff9d64f764b46896ab182d4c054c80248abb5627ed12eeeb65df8d SHA512 ab93ea45c3070cbff450e76b993a1d7356fc903cc439f4c5af7cdad8cb1d4b3e07834737eb11a2f296e8051105ae497a367565d701dae19feb0aa3efd4663b87
+EBUILD docbookide-0.10.ebuild 338 BLAKE2B 363e02e2b73052da6ac870bde5de32149939cee9f191733c6d7dec27d791d563d0291914f6aad877d9fda8a366fe9d7d3720488cf81d92524221509cb585d60d SHA512 10a9fc006b37ac23c9335dd36e991da7a67bb17853b0aeab3cce95f6f70e0204ccdb4352a479e4bc5bc44c6ef2246eae8f60cd8510acbd3751435d3ee952a277
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/docbookide/docbookide-0.10.ebuild b/app-xemacs/docbookide/docbookide-0.10.ebuild
index 06610ca1ff71..f87d53c07f24 100644
--- a/app-xemacs/docbookide/docbookide-0.10.ebuild
+++ b/app-xemacs/docbookide/docbookide-0.10.ebuild
@@ -11,6 +11,6 @@ RDEPEND="app-xemacs/xemacs-base
 app-xemacs/xemacs-ispell
 app-xemacs/mail-lib
 "
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/easypg/Manifest b/app-xemacs/easypg/Manifest
index 70206984cf0d..b9d94e4ec089 100644
--- a/app-xemacs/easypg/Manifest
+++ b/app-xemacs/easypg/Manifest
@@ -3,5 +3,5 @@ DIST easypg-1.03-pkg.tar.gz 78192 BLAKE2B 5369dbf4f5da0c25c9a2e451dd775a0dc4e6bb
 DIST easypg-1.05-pkg.tar.gz 78239 BLAKE2B 9ffa9b61b4089111d36119d0a011fbaf4b26c5715c383c65600499ca1d06f7f0030ee6d1fd4c746239757745058032aaad562bdeb5ac2ee0a8997ca4167e0f31 SHA512 be7f6770a6f343375ddc9aa54025985382ca41a598c935bceee6055d0bbddb7780f820e4124a5b634cb2c61585c6bcc4b9e3859a62a57f55538bc17c76a6e4ee
 EBUILD easypg-1.02.ebuild 308 BLAKE2B 37bc16f8b21c0c835269baccb6cf9b705111a27b5fd06c8b3133e34ca0351fee642df8001f619fd9370d1377afec87d86fdd50a4d91f7d4ab32bfbf6e5a32047 SHA512 a3cb0980b83c149a7abb9953e6c79cb815ba0d24e1a6e30183f30f7ed9a0d710e0a60daed9ce682acb3995c0f7cbdf6492abccc6c074dc624d259ccd2e41979d
 EBUILD easypg-1.03-r1.ebuild 333 BLAKE2B 7d63e60278a4231fe3d99c1f4c1181db5ca87311f7e23ff42c7337f49afa020a3832ab469c591a33d9a58572be74efce7b91d27d48b4d911b737fd73f36378d8 SHA512 86cb1e51e54120d923f1bf0c079cb07662b633e6bf8e492eb2f16f626bf63c7bf6b41bcfdb297c8aeaf142d7e01c41e7de857f6f4001c0a16d0819bc8f5acaf8
-EBUILD easypg-1.05.ebuild 335 BLAKE2B 9b48e647a1df25d927622f9abcc86fd1b0ea5cb3d79b913ae84c6bb59071b8aa9eebe0bb87b1fcb0db5015fa2c862829a0198c0d6c1d14942801788958054af3 SHA512 31f4174b05a090d13367fbe5328155d867b87ee07d960d95ad825b2b771da9fac2f605972a9daf0e4651e0f1b20ed3928b63642737bb30b5fd6cac56bd3cc5fc
+EBUILD easypg-1.05.ebuild 334 BLAKE2B 40ad59981acc4a127cfbdd46134718a4582e68fb669c09c6fe2639e60ce3688bc32d23cd755467710961ff5941ecb2a9b1067726400cb8412ccd0837aca68edc SHA512 73249fa8704fc9efcddd5609c1839a9f5cb5212cfb28ffe0ee584e47556da1c6dd919962f6ddd8c07c6ca353b6c239a0e2648e77d1c212c2c68d91a1403c263e
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/easypg/easypg-1.05.ebuild b/app-xemacs/easypg/easypg-1.05.ebuild
index 9fb349b757c6..f9b934da1b3d 100644
--- a/app-xemacs/easypg/easypg-1.05.ebuild
+++ b/app-xemacs/easypg/easypg-1.05.ebuild
@@ -10,7 +10,7 @@ inherit xemacs-packages
 SLOT="0"
 DESCRIPTION="GnuPG interface for Emacs"
 
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="app-xemacs/xemacs-base
 app-xemacs/dired
diff --git a/app-xemacs/ebuild-mode/Manifest b/app-xemacs/ebuild-mode/Manifest
index eb1c826acbea..1941aa28bc3c 100644
--- a/app-xemacs/ebuild-mode/Manifest
+++ b/app-xemacs/ebuild-mode/Manifest
@@ -1,7 +1,5 @@
-DIST ebuild-mode-1.44.tar.xz 34468 BLAKE2B 05c420979c2e4e145ab6230e9218d2ace8250abcc07e819610e9ac1fbb86147a641b88e69328ff624f9787b87cef56f9fe02a1205a02d01a0157b0293656647e SHA512 4d9b01939af089794255faf747264f948b8b2df47936e364ccfa23da493a33f56fbce1277526089e60b716e38e248b12fac39eca0d59d4974e2e70236ffbcd44
 DIST ebuild-mode-1.45.tar.xz 34520 BLAKE2B 15246a7b0a85d05270e3c4db8dc30c7e7ea704fa62644c11320fad8f25dcae8c17dbae86be5245b6ed9dd7650f247616c7a1fbd07536386ef2841b2351287f7a SHA512 b5842696bd548c11bf6164694c9d0bbd3cbfaa77b8f34cf27544033f39986610a6ec2e030c72da68f7645e851e6e377eb557d3eb721b8ad1b6b920dc8bf80750
 DIST ebuild-mode-1.46.tar.xz 34928 BLAKE2B ee2686f3862fc7aa5f820311a6e45d62b153426134422c56a2a6222795163f454291da5510e86c52edee1b22b7bec641ceb132147b29243ee647774a8e91342b SHA512 e7a81c9a3692db1c6db41e138b382e3027094529d4ad3244ecde5a245340f911f8a63ce8ce8bbd7910116c704bcf8fcce90142b8863ecc1b543760ef1411833e
-EBUILD ebuild-mode-1.44.ebuild 700 BLAKE2B 4dc3faff0aee440a99182fdcbbe7cc3e6bab2a848f18fcf4c7e8acad56ae3378b8eee6f75e78ee2003a003e0a46242125aad4d2522443630998617cffafe97e2 SHA512 21592fe4040e72f6c2c0c701c2c02abdc6db9ef8f2a86172810a3e8d46b83f426ea66b8625840f1affd54f2249271922f65e019a3312d629721e8bfc1b4cc614
 EBUILD ebuild-mode-1.45.ebuild 700 BLAKE2B 4dc3faff0aee440a99182fdcbbe7cc3e6bab2a848f18fcf4c7e8acad56ae3378b8eee6f75e78ee2003a003e0a46242125aad4d2522443630998617cffafe97e2 SHA512 21592fe4040e72f6c2c0c701c2c02abdc6db9ef8f2a86172810a3e8d46b83f426ea66b8625840f1affd54f2249271922f65e019a3312d629721e8bfc1b4cc614
-EBUILD ebuild-mode-1.46.ebuild 700 BLAKE2B 4ddf0411db1f65b44af962409ff7a675be7832a1fc8b6a7dae5dffde88a24b72d5e4130d74c7af913e2ac8393fed4a2fdbaee54f8628f7fb122fe38ec27ecca6 SHA512 ecaddee0593c0e205dccec7cfd9fa93c4e833e5b8860e4a16a06857889ac36bf3d7e2f87d4b95157ce1760832e1a89fcb9234c5a51682c8d07e63dcbc3d59f38
+EBUILD ebuild-mode-1.46.ebuild 699 BLAKE2B e3decd3de5a74e39a9078aace34dca4e5893915b9f7bfb3d4de8dee035f14c9365b39b75362cc12013516b56e51c38655847a316c4581157fd9f228c6e48f38c SHA512 283d3ff4967bfdb1dc7986f1f7e0c10510ca90ea5771c9a283e745fe66b37dbfcc3b66b548b7024a09d328e3119ec4790115a77830f674703205cf424c7018a8
 MISC metadata.xml 417 BLAKE2B d442b7726c175c95922475904d9dbb6260ecf53140bf041121fed80c3183142bdf7bcc88f7f87eeeab0dd91a81eacf507e2c4ea8cc8f86dbf6b60c52fcec868d SHA512 459969f9a78209b1058fb5fed220192bddd532c9dabc8e5d340c040bef0e454f08fe3896b33bcddaa011fd4639351f6f6a33ba6669895e99e001810324c101ad
diff --git a/app-xemacs/ebuild-mode/ebuild-mode-1.44.ebuild b/app-xemacs/ebuild-mode/ebuild-mode-1.44.ebuild
deleted file mode 100644
index 4256bc8371ed..000000000000
--- a/app-xemacs/ebuild-mode/ebuild-mode-1.44.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xemacs-elisp
-
-DESCRIPTION="Emacs modes for editing ebuilds and other Gentoo specific files"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Emacs"
-SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 hppa x86"
-
-RDEPEND=">=app-editors/xemacs-21.4.20-r5
-	app-xemacs/sh-script"
-DEPEND="${RDEPEND}"
-
-src_compile() {
-	${XEMACS_BATCH_CLEAN} -eval "(add-to-list 'load-path \".\")" \
-		-f batch-byte-compile ebuild-mode.el gentoo-newsitem-mode.el || die
-	xemacs-elisp-make-autoload-file \
-		ebuild-mode.el gentoo-newsitem-mode.el || die
-}
diff --git a/app-xemacs/ebuild-mode/ebuild-mode-1.46.ebuild b/app-xemacs/ebuild-mode/ebuild-mode-1.46.ebuild
index 9ccef95dcba9..67133f3e6f60 100644
--- a/app-xemacs/ebuild-mode/ebuild-mode-1.46.ebuild
+++ b/app-xemacs/ebuild-mode/ebuild-mode-1.46.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
+KEYWORDS="~amd64 ~hppa x86"
 
 RDEPEND=">=app-editors/xemacs-21.4.20-r5
 	app-xemacs/sh-script"
diff --git a/app-xemacs/ecb/Manifest b/app-xemacs/ecb/Manifest
index d88310b3dd50..5b492049bfcc 100644
--- a/app-xemacs/ecb/Manifest
+++ b/app-xemacs/ecb/Manifest
@@ -1,5 +1,5 @@
 DIST ecb-1.22-pkg.tar.gz 887270 BLAKE2B 3185c440a06e90f0bfdf2314a8689eb992f568109a98aedf95f65438fee40e2d665cf5b30a175bc6f0cb02591b80439db072fae452a707e93537c2a0b630e650 SHA512 13c1254cd39f346b9165ea9b0eb3195372da54a5d6afce83a86b2c6b2e7673b0d614526f14330a2483a6eed45ce04b8d72ad119e02db2d3aaeff0fd9fd234b41
 DIST ecb-1.25-pkg.tar.gz 872399 BLAKE2B 513181b108efa75b0d54ed2f568d586db6bd944a453ac2334a6b43ce83d8331b53dd34a68029869a1b7cc1e4f0218277c5966e8d49a4bd87a065719bc3dac58c SHA512 bfcb9e9d7fc55b9eb281f991ee57ef7059b7ecc6cf9b7a3c9693d40afbec36fc90789cfe2c3b007aab737db341154ac5cee73ea5056fc435ff6b0d86941ca8ba
 EBUILD ecb-1.22.ebuild 510 BLAKE2B c3a0acfa9a498f9fdc9273fc6af2335bd1b4fa5fa89a465cf4079d31ead20bcfd8c35853caae3b36db850aeca3084458d5275505287a30cac69716a1b007c922 SHA512 9fd65cd1eeda1e0679ab33ad540cfef18a728b1289642dc9311484942a363ad4cb9c700be0d13a9892aa9becd8368a706da9fa1df50175b43906a96abde36aeb
-EBUILD ecb-1.25.ebuild 556 BLAKE2B 4704140633980da64d1bfa3a4ae5d8e99fe957a625e5c2c21e7990d84c3d9a7f18a6c46dd86eb4dd75e913398b669097bd7b439cd5e7f57fae45c411bb2f6220 SHA512 b366a962d6a615acd9b605450cff393f0be96144dd218c5650a7c1ffb28d8a556e987bc34a536b86f8cf31af1742d99204dae4000c3d32cac7bc0a6274bdf8f1
+EBUILD ecb-1.25.ebuild 555 BLAKE2B eabbdf3ec9800d617d438b38a2a49076cf199e737d652cafeafca783f46c88e10c2aaec20dfdd87e15ec00f81cf68fb63a5df755755fb359adc9fbae7ad1dee2 SHA512 52ef7f460f2aa1ba91cdc676b47f3a32592134b4bccff5d9482693054b1cbc3cdbbf19175afa2e247694a1224949b027197effdc94c58068837a728447ca327b
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/ecb/ecb-1.25.ebuild b/app-xemacs/ecb/ecb-1.25.ebuild
index b6d9a9d0bc4b..a3d355184718 100644
--- a/app-xemacs/ecb/ecb-1.25.ebuild
+++ b/app-xemacs/ecb/ecb-1.25.ebuild
@@ -22,6 +22,6 @@ app-xemacs/speedbar
 app-xemacs/c-support
 app-xemacs/os-utils
 "
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/ecrypto/Manifest b/app-xemacs/ecrypto/Manifest
index faafcf571f03..89859c8311bd 100644
--- a/app-xemacs/ecrypto/Manifest
+++ b/app-xemacs/ecrypto/Manifest
@@ -3,5 +3,5 @@ DIST ecrypto-0.21-pkg.tar.gz 76396 BLAKE2B b5f730a90370968ab5596a5b0ec8ee72ec93e
 DIST ecrypto-0.23-pkg.tar.gz 76345 BLAKE2B c6d28f0d9b7b733fd5a976ebb14cfc846ed8bbe563d75f75103c0f05ae8b6830927d8cdef6c7f225d37fbf536687c54a0dfece04796714c39ee488fc5397bce9 SHA512 a273f687eb89360c521d478fc6f1d7bfde0bb0537c95eb05d5ffde2a20024e99cdd44ab8ec253093ab941322c1c7574bef474e8659d94c480079e3f58cdbdcbe
 EBUILD ecrypto-0.20.ebuild 303 BLAKE2B 1bb6a31fc02fd4b846009e4df9c00c3d2d7a9436dbbada3ec210dbada7de27510ce3c38138d488943c241f09771e8caeed6f1a4976c6b29d1f7be689ab07da42 SHA512 4d7ca5139b9dddb25f809c2ca54fca91f65574b2e9e722a8544bf2d5ee916c62ea54e9fd9340d39f6e3ce73a02cd281690dfa402693ee48e50f51383aa82cf50
 EBUILD ecrypto-0.21.ebuild 303 BLAKE2B 1bb6a31fc02fd4b846009e4df9c00c3d2d7a9436dbbada3ec210dbada7de27510ce3c38138d488943c241f09771e8caeed6f1a4976c6b29d1f7be689ab07da42 SHA512 4d7ca5139b9dddb25f809c2ca54fca91f65574b2e9e722a8544bf2d5ee916c62ea54e9fd9340d39f6e3ce73a02cd281690dfa402693ee48e50f51383aa82cf50
-EBUILD ecrypto-0.23.ebuild 305 BLAKE2B 0015b9c2936b7f6c6f74615214cf3cf60ec588bf4273379d3d6e3f0f51923bd795f6f3cbbc63f7f53127fc07f95dda4059a0b4410f738e75cfa684b261ac2fab SHA512 0e4e018b10ee7574853a07fc81dea26f328b42f2aa544aed6d9d9f68a397054f067e94bc3572be50ab01ef1b07fb045c3745fab6b9e0fd645fa7360e87ca6598
+EBUILD ecrypto-0.23.ebuild 304 BLAKE2B b12178a005541ec19eb6e6b25a9f14310033e3312fbc4d808ee050bc8d7ef6ca925df3df5da68b37995ef1fc5b6036d0d23a5de0dea7db54f21a2aa32ea512a7 SHA512 46264bd80299d6b335e3c8082721efcf378972974012546e12794c571470d42cc6fa9c07518df2f0e2e0ff233436da9216b6cf26de65a778bdd9f2afbb8188d5
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/ecrypto/ecrypto-0.23.ebuild b/app-xemacs/ecrypto/ecrypto-0.23.ebuild
index 956dfc74704a..b6a38d1c5b41 100644
--- a/app-xemacs/ecrypto/ecrypto-0.23.ebuild
+++ b/app-xemacs/ecrypto/ecrypto-0.23.ebuild
@@ -9,6 +9,6 @@ XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 "
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/ede/Manifest b/app-xemacs/ede/Manifest
index f5e52faa0b73..2affce2654d6 100644
--- a/app-xemacs/ede/Manifest
+++ b/app-xemacs/ede/Manifest
@@ -1,5 +1,5 @@
 DIST ede-1.03-pkg.tar.gz 124600 BLAKE2B bcd1bdc260b401c2eac620e176d54707ea8ec014205d9d04e9f207629b4c22e311db1215450c2e9f66e6f7ebbd742c1bfe51bd1ccf0412fcfcb37cad7b865035 SHA512 9ac35acf8df8fd6b649720602772404a808556b105dc438bbc495af3ce3323afd0c3ebd05cec4ee5b12199342d836fcc6873146cf06525e12de8277248968de2
 DIST ede-1.07-pkg.tar.gz 126684 BLAKE2B a32e7d043c20e2beae05c9494f855163586f0aa85362dde5287dc9e5433e4241a5bdf57d411eed2016c46a7403c4fa1a03b41e9abb8441fe7c4dcd37f860a0a9 SHA512 e4e9be6c93ff31e8be63d7c5b4f091f6108746b993905d4b2bfe93a957099dbc0ee27651a403aaa7ac07d4e3f66eee40dbce96668a8e00873911c2cd133fa2c0
 EBUILD ede-1.03-r1.ebuild 265 BLAKE2B cf67717e68b750aa98140631e314272db29e45fb68cfde0dcf6538cedd46861c44de5f2f7359cb1fac3a78fc96063d43d0d5169868b5056db087c412d2fec3a0 SHA512 bd219459daab5dc639f9f0684d38d60e243f6262bdca1002ad6b77cf60bd93e2d3966a48ac5f011346913ae7d47ecdc2be58251bf6157909afbb0d902515df00
-EBUILD ede-1.07.ebuild 267 BLAKE2B 01d3e01ab63d4a3acb23d1aafd21079c606ad2e7734c0658d9256a63e41f5b03353b4d170535520f8bbf479b867f4b26d8fa50d64441ecc521510167d4c924a7 SHA512 09ad3261e56765587a25bc71f646acc7472ebc2d92ce2640044652019ae3d943a4b807c981006077a227402bc172bbdf1a8638d0d9fabff8bc5588068d2ba5cd
+EBUILD ede-1.07.ebuild 266 BLAKE2B 6518c55d2b4ec2b3f7d5e46900f37728c2683d238d7474d8c59bf7d950735fe69810ccb8671e2fd64448e3f586b2872d175c744088dad7b375b7d2b1195b1fa5 SHA512 688dae0087baef292183aad4b268471fe896cac5b7e4e22b821ec82aa41b962e887abe0fde967762941bf2987a9023327f5dbb0ff45cf74b3c504a892ee11b2b
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/ede/ede-1.07.ebuild b/app-xemacs/ede/ede-1.07.ebuild
index 537531b89253..c6d8e2f660d8 100644
--- a/app-xemacs/ede/ede-1.07.ebuild
+++ b/app-xemacs/ede/ede-1.07.ebuild
@@ -10,4 +10,4 @@ inherit xemacs-packages
 SLOT="0"
 DESCRIPTION="Emacs Development Environment"
 
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
diff --git a/app-xemacs/edebug/Manifest b/app-xemacs/edebug/Manifest
index e17143fc01a9..65ae75bc1e68 100644
--- a/app-xemacs/edebug/Manifest
+++ b/app-xemacs/edebug/Manifest
@@ -1,5 +1,5 @@
 DIST edebug-1.22-pkg.tar.gz 115557 BLAKE2B ce828bf916a02d15a699cbf0e1da97b3f2492595685bcd40c038dfdb3de2bc93cb1ef62a1ba280642384363a8c7fc7a23aa35073036d7e13aaa43597015a94e3 SHA512 5f4d86d770d68ab2199cb781da4f3b67dbda979396349212d851890bd257a85195fc5a8e0fa4ab337335887b3c2ff27e46002758926828093b6dce25f8796ada
 DIST edebug-1.24-pkg.tar.gz 115557 BLAKE2B 8112dcaf87747389c8311cbc47416b84eecda1b3393964444e342d97ec3ac3dd27330c16334c5ef435a314343a993c42892f50631149621cb94bcf2c2ce332cb SHA512 6af78de22e6ab18cf84602c4f19e0c6c8e91bf996e7c9faf97470246ec25df203cccff43b4172689ab1bfc3a7fd888f06e5306f6f5d3118d2cbfe453efa37b22
 EBUILD edebug-1.22.ebuild 315 BLAKE2B a0be97e8648ef463df346b2a4c0c256d07f58c766e326f7005e76b427fd2fd225f3a7b1ae912186ef0c7b0aca9752f600da9bafe04d844790a29b17e0d0d1d18 SHA512 634585da96e8e8e248aa3da87dcb0e27118bec28631e358e1bcd59b579a77b27517abf4c01a94f9f5a4de8e8d3bd0430243e100dcd9778f9e8bac9a135a13253
-EBUILD edebug-1.24.ebuild 317 BLAKE2B d60970e47500f9dddc12292b34de0b992d5906c561dbcbd6c77a78c36fca502a73c0ac10a863b4dcbf02abcdfb8f4ea5a0b4801d7b4391a3a6764a7675b528fd SHA512 8d1701dd8f23ad3a4cf059fd6e3a239aec6d4d06cf6b99fcfeec62557e638a55abb9d57c19f8649c1127507bc223a9c0c24dd6ff0f2742ba3c7a6744f1cdf043
+EBUILD edebug-1.24.ebuild 316 BLAKE2B e479692b55061903a76b2e1d79904bb966a11e820e94e3202bcf76881eae7db8003135ce3095583f1316df5790e54f0e18bb904a00678d290c270291dfcbc0b9 SHA512 afe5e9049ba4ddf50459530f391ae2d551c603c52174b77eb38090e65f8d5ae873cc025db201a3f5cdfdeb11c0f516f8b6218aacaf619a4c59808d6ed7f6270d
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/edebug/edebug-1.24.ebuild b/app-xemacs/edebug/edebug-1.24.ebuild
index c1e75a70d976..5e63b1ef9f96 100644
--- a/app-xemacs/edebug/edebug-1.24.ebuild
+++ b/app-xemacs/edebug/edebug-1.24.ebuild
@@ -10,6 +10,6 @@ XEMACS_PKG_CAT="standard"
 RDEPEND="app-xemacs/xemacs-base
 app-xemacs/xemacs-devel
 "
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/edict/Manifest b/app-xemacs/edict/Manifest
index 74bad0763f47..ddfa18b57f5e 100644
--- a/app-xemacs/edict/Manifest
+++ b/app-xemacs/edict/Manifest
@@ -3,5 +3,5 @@ DIST edict-1.17-pkg.tar.gz 96241 BLAKE2B 7f353921e15a4334d5ba62048ed755b35e49253
 DIST edict-1.19-pkg.tar.gz 96228 BLAKE2B 32654036721787e8f3617303b61b26532d2e2ef56861c6d97e7f25a28953f95c275edb6c8778263a3209a22ebd2b22fed333740feaaa101169fba915a35f8e8d SHA512 2ce2028108a4d8923b3d9d82b8afffb228d103bab2d21c8a18649861a8e2281d3e68dda7990ac2d28d31171426344a0d7ab3a329f6f9d4a71b0300d368c4d36f
 EBUILD edict-1.16.ebuild 333 BLAKE2B 301fa1a83f3971b1cb8f33fce17ea6af0460e3f8f8a187646f558ad1c57d09e6ea5fa849bbe40862bb2e46b243b58c9bb75c4a7dd79e3455c17874055b7ce8ae SHA512 6e9b305a54d92abb478cd03a35540a3f4e61131cd1158b65e35cdcdb3d91ee80482fc71f218fcb84bab798b30a6bf45b65f1dbe927c80c872795a1b8e5933a2a
 EBUILD edict-1.17.ebuild 333 BLAKE2B 301fa1a83f3971b1cb8f33fce17ea6af0460e3f8f8a187646f558ad1c57d09e6ea5fa849bbe40862bb2e46b243b58c9bb75c4a7dd79e3455c17874055b7ce8ae SHA512 6e9b305a54d92abb478cd03a35540a3f4e61131cd1158b65e35cdcdb3d91ee80482fc71f218fcb84bab798b30a6bf45b65f1dbe927c80c872795a1b8e5933a2a
-EBUILD edict-1.19.ebuild 335 BLAKE2B a297cf06f25965ba96e4e8368d0df694e871aadb1e9ba4bebaa27145a3bf970405f3671d4f6420991a8467e2447c1e0dbd900ccdf31a393e2966f74485dc1e0f SHA512 520f1eaa96bf742174c316242b3a4d0e497394e1e5fd9ef5950371ab018d169251d6fa72059ca54a4d5b88bacf04e354ec097b54dfcca8f1ce278b1b280cf0c4
+EBUILD edict-1.19.ebuild 334 BLAKE2B 41f4703cbc1ba7c29462847fce6fd9a1e7b7fae4991f9dcb7ec0552e028e2a2f418c5b6e329e217fc8b1c157145813fc66e18f965339a3a52825bde8fa13925c SHA512 3ff9b91d83e4c40ca5ac7844e80eeba3e228e5bf6190d8e81c8e4bc437be8d9095e4bca85cfe4894419611b6c4488e34efd24c375caf5397109fba63a1527f69
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/edict/edict-1.19.ebuild b/app-xemacs/edict/edict-1.19.ebuild
index 3a1513d2dee7..50bdee1c53c6 100644
--- a/app-xemacs/edict/edict-1.19.ebuild
+++ b/app-xemacs/edict/edict-1.19.ebuild
@@ -10,6 +10,6 @@ XEMACS_PKG_CAT="mule"
 RDEPEND="app-xemacs/mule-base
 app-xemacs/xemacs-base
 "
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/ediff/Manifest b/app-xemacs/ediff/Manifest
index e0dbb77e54ba..51fd846fa426 100644
--- a/app-xemacs/ediff/Manifest
+++ b/app-xemacs/ediff/Manifest
@@ -5,5 +5,5 @@ DIST ediff-1.84-pkg.tar.gz 321644 BLAKE2B 8d328b8d85103c6485af311b93265c0c48336f
 EBUILD ediff-1.68.ebuild 385 BLAKE2B a998fe0983e857e0f1fbd201256f9e63de9598e6e395ea3b92d1562fa1203f7f0e0502bef66a3e87c83dc23278c3faeb719af38ba486d38a775f615d4ce5e1b8 SHA512 597a0fa865c3b9839a312f1d2f4408acb9a5a4934fc22705a66f0d80a4a0e4c7bbd9661f997e09e7a9ede77aad96879efd2fc17092bd657c6470752148b5cf0e
 EBUILD ediff-1.77.ebuild 438 BLAKE2B 3c83c1884e1f6aa76fdb6dc5560fef1f9f0edd923981ab5e5fbe2be61388da3f7334b204adaf6e7a7f8f77ee67d1ac546fd89543cc86f9b20711eeff317b36f4 SHA512 51fbeca99179ded5f0ddb65d892a123e1f484d7198d75025e0d287aa8f3049737e05bd2a5286ad87631db771baa5151ccf38879f4c8174b36fd4cab0bc836b1f
 EBUILD ediff-1.81.ebuild 432 BLAKE2B 6ad5637e1cc80d5582b24abe17ee0618942aebdcc130970bf476b781c2420c78e9928ac2f1494ded56bf46b60b3a6ea56017b3d9f39cf9c5013e02119489d4bb SHA512 8c809b38b935fe38076c8aabe089b4a712705a1538f7519662dd0a159f862f9df10e57b143da39beddc00a4b8058dadb4760a23e571d2bfc674a1c6f04af1648
-EBUILD ediff-1.84.ebuild 455 BLAKE2B 78baeae8d8b00ca1a822b161ea9ee7e88e9cb8f9c18b63d975e5d0892cd60630b6c4dc0ca4fc0da8b232db322f4c84931c5dc4267a7848907d3d045af4c69411 SHA512 dc08d9ac42d6cd41c1a1032378929c8f254ac9dd6b265a1da0a152330f6a22d6ab0b518fcc8dc96805875c7b7aacf355593d2588e099b8a30ce3c6133312ef20
+EBUILD ediff-1.84.ebuild 454 BLAKE2B 98728d2e5de121829b14b2597b9919a4e87a7400b3389838fe1c556d0ec59a30ad7d4b2a96a8816d907e0db968799cc93c4cd09649bf7fbbe9a2d9e14ae519ac SHA512 2749a6bfb8860e3b5e38a5693768ba5f6d7603b87f88a5da85ebf1b23b5ee6bd9ad0a8f02e72c0dce1a1ae01c483ad2646da9a7185bd9e6918e6b6cf3ba8b566
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/ediff/ediff-1.84.ebuild b/app-xemacs/ediff/ediff-1.84.ebuild
index 779fdd2c2d2c..181a6472bd4b 100644
--- a/app-xemacs/ediff/ediff-1.84.ebuild
+++ b/app-xemacs/ediff/ediff-1.84.ebuild
@@ -18,6 +18,6 @@ app-xemacs/tramp
 app-xemacs/vc
 app-xemacs/sh-script
 "
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/edit-utils/Manifest b/app-xemacs/edit-utils/Manifest
index 37b0dcb0a009..e1498e1397a8 100644
--- a/app-xemacs/edit-utils/Manifest
+++ b/app-xemacs/edit-utils/Manifest
@@ -5,5 +5,5 @@ DIST edit-utils-2.58-pkg.tar.gz 1159051 BLAKE2B 4eb07e163863724431e2b2692014db84
 EBUILD edit-utils-2.39.ebuild 407 BLAKE2B aedfec505d2c7e91591c2a83a9b0f1b997ffb3dee4336b5b9d21f22f003c14ec2e0ea537bf49353518b27daa7313739730ee8484b4c1a865ee2efe0283a5a792 SHA512 4f9a5e69aadf5b843a2aac32ac472d716d7b6a1d009e5a07deec5a25330950798dafe9a5e53baadb4655f7cd0fabed1b581059d9607798daf96e9778a29fc541
 EBUILD edit-utils-2.43.ebuild 407 BLAKE2B aedfec505d2c7e91591c2a83a9b0f1b997ffb3dee4336b5b9d21f22f003c14ec2e0ea537bf49353518b27daa7313739730ee8484b4c1a865ee2efe0283a5a792 SHA512 4f9a5e69aadf5b843a2aac32ac472d716d7b6a1d009e5a07deec5a25330950798dafe9a5e53baadb4655f7cd0fabed1b581059d9607798daf96e9778a29fc541
 EBUILD edit-utils-2.44.ebuild 441 BLAKE2B 80e3e76d4377de7a1fcc9feb131c8c1b747c8821dad6f3677b031df875251ccc19429e77ab4cc897f9c7c0ca47f8369f80483d26893509ae5c0f71f9e8364e7f SHA512 b0e5deb82a3725758175ef0348229d59a9e647a6efd40dbf689baa842aedb9f3521cd6ca18b013ceade9f709e65abf826abe9c7e322b8ca7aad40a10c79a5b1a
-EBUILD edit-utils-2.58.ebuild 409 BLAKE2B c5fa41591f154281819f490c589a7864f871599964348b5b406496e1f8d966eb9881e4f236319358b799b11de00265ff51348303b88552c6f2867ebb8355e17c SHA512 d1e042f5063b3565e5ae17fd778fdc6d7fe1cde0c2edf769f474756aa78a2c836c1cafefb2c8292d7a2e44a2fc929ebd199a0841c89586cf7eb639a552ae8b4a
+EBUILD edit-utils-2.58.ebuild 408 BLAKE2B 552500ee1f9e371cb4157c4963a27d0d1d18857ee475d9cdaf34acbe1915bb0665fdcbe8fb6d2b0b339f831afdc7b422a4490590bd7c4814eafe74bf088d2ef3 SHA512 06db502374068796dc0f18690d64826bd3951e984d35efb3a218074550806ed93d0fba7283d7d65b28b55e6038df0971757e7c64ebfa4eecb11f03c26dd39257
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/edit-utils/edit-utils-2.58.ebuild b/app-xemacs/edit-utils/edit-utils-2.58.ebuild
index 6419a8deac6c..c1a6583efcc6 100644
--- a/app-xemacs/edit-utils/edit-utils-2.58.ebuild
+++ b/app-xemacs/edit-utils/edit-utils-2.58.ebuild
@@ -13,6 +13,6 @@ app-xemacs/fsf-compat
 app-xemacs/dired
 app-xemacs/mail-lib
 "
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/edt/Manifest b/app-xemacs/edt/Manifest
index 3f1b982b87f2..19a774fa03af 100644
--- a/app-xemacs/edt/Manifest
+++ b/app-xemacs/edt/Manifest
@@ -3,5 +3,5 @@ DIST edt-1.14-pkg.tar.gz 62824 BLAKE2B 9ab1cc9e55364b901ee51d16b97ea8a72a935e10d
 DIST edt-1.16-pkg.tar.gz 62865 BLAKE2B 22f62a7ab87a723339693fcd6351263b1347b464db1f2f15ad79543505faf837154d95efa03f9401a03d7838452cab72484251c80a517cb3337ea8e3bf2f595b SHA512 46a0452b11119d926a3d612acdbefec37731ac60a86b207e125c7ca6dcd962b419173d4a5cb96117a8f0afb29b9c8173a5bbdc69e8d8ae09276829a6dc44c931
 EBUILD edt-1.13.ebuild 291 BLAKE2B ab72441b0d2df38f5d9f0e01746eb1763b45467a2abb31b79940d51897423ba8fcc14917464dc6df765b56722446dd15d8b040288490ddb56f13ba480b951072 SHA512 cc3e85fa76a2a37c1d49c042cf364cfbfa32a642693e4e2f41c40ede0e9656cfbb08785a4d2d68b31fa1e9cae93cb491b1dff2d4c3e8a7f8a1f7be53828922d4
 EBUILD edt-1.14.ebuild 291 BLAKE2B ab72441b0d2df38f5d9f0e01746eb1763b45467a2abb31b79940d51897423ba8fcc14917464dc6df765b56722446dd15d8b040288490ddb56f13ba480b951072 SHA512 cc3e85fa76a2a37c1d49c042cf364cfbfa32a642693e4e2f41c40ede0e9656cfbb08785a4d2d68b31fa1e9cae93cb491b1dff2d4c3e8a7f8a1f7be53828922d4
-EBUILD edt-1.16.ebuild 293 BLAKE2B 7730a2259252f68fc6f4b694bae2a5f8e3787b8f65f9a59813bb9bec2eb730da0ea9fce48664027d12069018ea498d311c8ba7fedc83a9c44f223710148ce668 SHA512 c151314d12f723ce1ca7a18f5a277bc91d10fcb1d9462af6bdfa15921e4802ee3930278101f9e84a9f44bef4a090c06b59759dd21203e79d2f979723bfab5f11
+EBUILD edt-1.16.ebuild 292 BLAKE2B 4e56b930e6b1dda6e2ae8aefbfd2627b223acd7af083f698fd1f015571309b8fc887ec25d491c9a2b86ec6d7b155477c8f08afe718517ae363f3f48d4a117974 SHA512 418244e39a2baeb62ef84e9efcd268155b53c0ddead2c27f85ba53f59ee79e8b951e90b10e71cf1247d425cc4068de241e04d4441d1450ee0a577f3b6a35916c
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/edt/edt-1.16.ebuild b/app-xemacs/edt/edt-1.16.ebuild
index e404b602f3b4..60ec98b86735 100644
--- a/app-xemacs/edt/edt-1.16.ebuild
+++ b/app-xemacs/edt/edt-1.16.ebuild
@@ -9,6 +9,6 @@ XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 "
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/efs/Manifest b/app-xemacs/efs/Manifest
index 1fae5559e4d0..552be75f9d4e 100644
--- a/app-xemacs/efs/Manifest
+++ b/app-xemacs/efs/Manifest
@@ -3,5 +3,5 @@ DIST efs-1.34-pkg.tar.gz 376920 BLAKE2B c441fb03cebb97f845d3767001312a99d505c3fb
 DIST efs-1.37-pkg.tar.gz 377188 BLAKE2B 88c4d38e174cb1afe56db3148348e3b33a985692160e28ffa1db39b7da521ee2057bb709608c8c692c512b9acc9663bcf13105cc5e7ed531c4f9d5dedbad1873 SHA512 f66dce45470654dc4d47fecec10648db2e2940972f4f03540e4006e585f88379da90b6ef3fd6ecbff6517226b596520e129389a06df42a4bffb1b0b2d01b3676
 EBUILD efs-1.33.ebuild 339 BLAKE2B 72c5fa6594de3a7d8e9c4fa08b6cc990a44ad800b30701c712664747e8ea7682be7a56758e867cf9208d00d396b704272e1c85fec88e7bf3bc8b788a035524e9 SHA512 ee1fc143c69873f6a42f212ef5175f3f7deed704d335bba06e47a623663bf77e790e4f75628b8f0d98d954f70f0c11a750e2b4f416719210423260a93c52c3d5
 EBUILD efs-1.34.ebuild 339 BLAKE2B 72c5fa6594de3a7d8e9c4fa08b6cc990a44ad800b30701c712664747e8ea7682be7a56758e867cf9208d00d396b704272e1c85fec88e7bf3bc8b788a035524e9 SHA512 ee1fc143c69873f6a42f212ef5175f3f7deed704d335bba06e47a623663bf77e790e4f75628b8f0d98d954f70f0c11a750e2b4f416719210423260a93c52c3d5
-EBUILD efs-1.37.ebuild 341 BLAKE2B 9bc5e17224d05879ea54e9aff6d8c57e2bcfe60c2101d16488f247d662c47a9d7a034ba635894e0f05c88da8bb929fe5061c2baaad4958042209c0be53240d31 SHA512 4ccf4cf1351bf2f664db88d83b21497d6a42d5c261df3a35188d717a8ba61c83a15de5ccd2e197ce225f15bd85b685c75efd9e506748e97c37023d8daef66823
+EBUILD efs-1.37.ebuild 340 BLAKE2B 640f7eda47e3eea0d0c9452ef601974bf62b04d66b42b795cd08d508292285562f0fed394cabb0bb9d80214b1bd88abff9c934773d31452acc8b53433af87444 SHA512 31d8f68e40090766cd23ef47de507129e0fe80a025b351500f7c191ac76e4c825dad06a1af6f29e0b00fb5d30fc912c341a3b8dad9fa50816f7a25054b7849c9
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/efs/efs-1.37.ebuild b/app-xemacs/efs/efs-1.37.ebuild
index acdb2fda56a5..1284a2d3cc10 100644
--- a/app-xemacs/efs/efs-1.37.ebuild
+++ b/app-xemacs/efs/efs-1.37.ebuild
@@ -10,6 +10,6 @@ XEMACS_PKG_CAT="standard"
 RDEPEND="app-xemacs/xemacs-base
 app-xemacs/dired
 "
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/egg-its/Manifest b/app-xemacs/egg-its/Manifest
index 0f58fe624f62..4f037fafad76 100644
--- a/app-xemacs/egg-its/Manifest
+++ b/app-xemacs/egg-its/Manifest
@@ -1,5 +1,5 @@
 DIST egg-its-1.27-pkg.tar.gz 261339 BLAKE2B 8e0fb9cf66d373ccdee6d54c0eb0d996d5ebc03a5d85e1ae8c43b66ae53b7a9ee97a90526b70d52232397ef2982baefc3d4bb327bdebe60aa79bb77ffe4a785a SHA512 f5a2a9412175cc4a825de907f566df0228a1838b082a20f9f11164fb76b7f87db2f4f4e337a8d58f7e0479ffb498c32ac0a7413a70f047a10ecc631edebd4ded
 DIST egg-its-1.29-pkg.tar.gz 261073 BLAKE2B cc5c515f4ae3918954ad4fedb21b5262b29fe3cbfcb43faabbefb7882f16583b53b8a68cc943af77471fc4431898db6de1dd38f1146150050f5d422308ef241f SHA512 9457e69c652f13309616ffaa97bfbe64bb0699c958442a0b0bd5f9f215951688a77d7d689567b1fb09d74229460c2a7687b661bcd21a68646a01283929ef764f
 EBUILD egg-its-1.27.ebuild 367 BLAKE2B 81b1e1de789b402d9544ac847d41e2113093d0d99eef4eb3bd518cc433175fca8624032c0c4de64ca900161e6634a305fc79a6a427d7cc0847864d2ccc654412 SHA512 d91736ff1edda687e5e810b80b54157e7dcc2bdb4d2259a921acbe0e0c22cc349882012bfa43abbcae830fdbca4039560bc73317959d17c046d03cf7e23ff983
-EBUILD egg-its-1.29.ebuild 369 BLAKE2B bd68daadc6f49636e82613e1c19f9dafde50cb9464fcad6b00687d3fc5399648f8a4889272035faa48abf475539369c8306b856590fdaf8eea0417f68e6cecb8 SHA512 6f1afa24c5a73eebcd1b41482cbd9fc48a2d2e1cfabefd9d0754f950fe332165aa83f52282b68f9e34874a0f4b2cd3d44eb61a1c6f9dc4ba075508f9c64851e8
+EBUILD egg-its-1.29.ebuild 368 BLAKE2B 30909f67267c62a3f2a7d13fdc20a1f949f90763471893c4223ad41ad1a6e7ecfa491ba7b55026b22dbdca25c94f21437eeb7720434f74a3bf8e9147c38c92e6 SHA512 e1a950e0b5d967eab379819281ca424eea0b50bc0f4ef4c6aebd25835e7f4f8809bbf37606839abf2b9d396101d1d92513406ff1604922d408f9c5bc79bfd3f6
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/egg-its/egg-its-1.29.ebuild b/app-xemacs/egg-its/egg-its-1.29.ebuild
index 706ca8f28925..f57e0b661c31 100644
--- a/app-xemacs/egg-its/egg-its-1.29.ebuild
+++ b/app-xemacs/egg-its/egg-its-1.29.ebuild
@@ -12,6 +12,6 @@ app-xemacs/mule-base
 app-xemacs/fsf-compat
 app-xemacs/xemacs-base
 "
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/eieio/Manifest b/app-xemacs/eieio/Manifest
index e2afae4d6974..a813b94dac14 100644
--- a/app-xemacs/eieio/Manifest
+++ b/app-xemacs/eieio/Manifest
@@ -3,5 +3,5 @@ DIST eieio-1.07-pkg.tar.gz 177923 BLAKE2B efc84c48fac4bd76ca4c843a4bff97dc10f21f
 DIST eieio-1.10-pkg.tar.gz 179945 BLAKE2B 5bca0fb3ac1a94adc73dc7d0233645308aee5bd12923cb390c648a1334cb2b69488b8593781936ccea8719dc1e9a53526b1b348e1b9ca42681531f409029a48c SHA512 deb5de328e40a7c2fed189c89a3e3ab5cd5a26cd7243398c34bf2ed6bc1ebe7e72ecc23a2aef9d967a2477ecc4c797486e477a50e1cc78cd506c1e3170a85512
 EBUILD eieio-1.05.ebuild 359 BLAKE2B f729edffdcc0e421a9e41163f7b50d45ac4403ddd8422764a798d2adfdc4f190d517d455d53d0896cc1a638b196424d5f7dd388b4585ea3d944a550104d26c2f SHA512 82eca548ab6da03bd4c878d1838be7f743304d2e4f7a0753c8349ed0d62c6d789dda3e5ee04fdc55add8a8d5d5780357e9531d3ed1075ccc1147695b8f572897
 EBUILD eieio-1.07.ebuild 383 BLAKE2B b1ca1c4c03e64069624236871a2a92ab66a7d5dda5cb8da8db95f41c9f67b24e5fd812bf42631f4eab156f307a94a219883ca1a5ca6d625ed6b72a44dc19f069 SHA512 aeb650bc7784ca50eee5aa336e8a7c756823444734e6b835171752d2118054afcac403ee06d3520bc0eea9fbb6c154d2158b3db74438b0686a0369ab42c56484
-EBUILD eieio-1.10.ebuild 385 BLAKE2B 9f074a23e6e755ec60577aeea4500628bab7800ce403ccbd98a8cd14630b67a18f13cff767e9fb01aee855e33db9da06177829ffd1ec269d0e57c8ce1802d134 SHA512 dab99b0ce0e8d7c4a315ab99170379687d5fc8843f729c4373ac1f27be3d43b62355edabf6ec1f5913720ee92ceaf9cd7221d2cc1c8d48a4c0877091803e9e2c
+EBUILD eieio-1.10.ebuild 384 BLAKE2B 022c6ff2b80dc5d023f7742866ff3182799ead585e21fd8ea524dcc87e76f4a222cdf52912aaad33a4875b57325a1723999fa1c456a03f76cf4d20c0b4b153c9 SHA512 5a06c2374f760c41cce3d450a1d00f8bed1face81205eb89ac35a09cbd31ae2aa1028794612de4d02136ad73b84941aef730a3f52d2d0e5ecf947e724778e33b
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/eieio/eieio-1.10.ebuild b/app-xemacs/eieio/eieio-1.10.ebuild
index 041b0b40b3ba..f9bb9b8304af 100644
--- a/app-xemacs/eieio/eieio-1.10.ebuild
+++ b/app-xemacs/eieio/eieio-1.10.ebuild
@@ -12,6 +12,6 @@ app-xemacs/edebug
 app-xemacs/cedet-common
 app-xemacs/speedbar
 "
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/elib/Manifest b/app-xemacs/elib/Manifest
index a8016873e186..6b1d07273623 100644
--- a/app-xemacs/elib/Manifest
+++ b/app-xemacs/elib/Manifest
@@ -3,5 +3,5 @@ DIST elib-1.13-pkg.tar.gz 80235 BLAKE2B b81ca5b529a808ee5a9c7f514cf53dfa1c5d5ad4
 DIST elib-1.15-pkg.tar.gz 80288 BLAKE2B b336e467ef1b586bfcdec74f7c7766f16623ad223ced12c66b4a38282683e7a9ce7b8eb70b0b263be5e2cc42468c7cab622e8c2ce843680c28751c6202966e82 SHA512 16594062b094330a6cecfb9de8698c4f6608ed9276f8e4600658a9026ace1b3185fb9d23ec70fe4474093c8e95d67255d5a8741f0d84a906b415704e6fdc78ce
 EBUILD elib-1.11.ebuild 283 BLAKE2B a205ba055bbf7f1ad6dfc1823c1d741544be4c7ff625baba798f2fea584c8c85c12955aad5a52c95718ea196909662eea4092f523ec6341b9e87675e15393ea4 SHA512 d96460e055259058fd0a23bd4b376bb4893c72481816b94d7dc5f9fe0af93c5831ac0515e9ab4d2051e1de78ffa0419126f1d47f986566993db909491750d442
 EBUILD elib-1.13.ebuild 306 BLAKE2B 373ce3a3e0f5e3ec81fb8284846bcf76426e80d3d845dbb4bce43bccb1d825062f343a8c5c6937704a45171e34b9feada73c4ed4cfeab99b17aeebe4f41a99b8 SHA512 b50fce9a1fb7f93bd421f4ab471c75e7bc6d28ed2589832de7289a8a026ac8e52e198df61a9e71db0f7517a08823934e57a12008f4571e84a57a15bcab2cd68b
-EBUILD elib-1.15.ebuild 308 BLAKE2B 7faa0b0241bf217b03fb1d057fd39fbe944ca22e432e8364c24dfc78924ce2858d4a5122aa5bd2221a09153778988df5038249179f7d209701f067cb412313f8 SHA512 905e3aa2237f81b912e56a61ecc74348445879b7563f49efe6a99191bdc760cf02f3065027ca49de3211456bcac14b153d677fae7ff7b7204e7728326eaddfe0
+EBUILD elib-1.15.ebuild 307 BLAKE2B aa9ea01e82142ff1879dd4cc47012bd8ac7779ffed3a6fcd3b2537c296e774b99f9a22878b4703a378b799265dc6ebebfac80997718a9e20030b93301d26655d SHA512 3ae490085e8e9c4d8af2ce8c596b2dfb397fb7df8e2fcad47cde695f5568f4f427aa96874e8d915b8428a13a2abfc37cfa676a895917e872c18f2dc53a580f6a
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/elib/elib-1.15.ebuild b/app-xemacs/elib/elib-1.15.ebuild
index c33d000ca984..b5217c8ee5a3 100644
--- a/app-xemacs/elib/elib-1.15.ebuild
+++ b/app-xemacs/elib/elib-1.15.ebuild
@@ -9,6 +9,6 @@ XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 "
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/emerge/Manifest b/app-xemacs/emerge/Manifest
index 36c80e3428a8..125aa46a2376 100644
--- a/app-xemacs/emerge/Manifest
+++ b/app-xemacs/emerge/Manifest
@@ -1,5 +1,5 @@
 DIST emerge-1.11-pkg.tar.gz 61367 BLAKE2B 4b97e5118c34d89f7387e29c7e19337a0adc89c1588d35f338f910ea8d5f3003e358613850acf3124911e88aee31f387a7853ad51cf9a0f90d5b13608c81fcaa SHA512 c72569dc28b5db4c1e6b5b35107dcb4e1772de7a7b42898895c538f0ec127e28104b0ea0612d01138c1ff715285f06b9cd642609272ed40360f9b97e5e8dc784
 DIST emerge-1.13-pkg.tar.gz 61362 BLAKE2B 23269f38554fe99532389831ed3f9ad310ebe78d8edb3475096170a8062671e609bfe2ec45e2b27bf6f90d0e90db1592be360c4600828f3f2c8fb9e71d07769b SHA512 4fe0545d6bf67bdd7456e19fbaefb741c20a0119e1bf780e9d43163970c1d2d76ab0a79bdadf24b38643423773db89d37e6cdeb131fb96154ed5df91cc7e55d8
 EBUILD emerge-1.11.ebuild 267 BLAKE2B ba7597ef6e34d05c73157cf08dc17180e3983a65299474a736b64ea661d247a570243aa801484b65b5a1dff4dbeffe95890cc99a6e7eb447aed9b0342bc3cb58 SHA512 0dd6c2772e8523e1b192d7c978921636d2590160744a3297375402230aca5964983272558e140914b72769c6f903d1804dc9f0397eccf1d30208913f9a12a701
-EBUILD emerge-1.13.ebuild 269 BLAKE2B e57a80607da281fec25d217381ed1cb6feaed2b3fd44bb34cece811dace068ddb486d2972b90c53e2b5672f36c73a2b4d95a465cca0e7d4a9536d5d61a92fa75 SHA512 facd0d5a6d5a607a7d2ac40d34c687e83e415548c0d2703f0418c29c4bf438e8065112f176283ded59e43f656634f55ee04db516fd3f96dafec496d4dfb1f229
+EBUILD emerge-1.13.ebuild 268 BLAKE2B 1f42ddafb5e689c9c607119115e1c41372bd603f61d22e2ab81497c1af420b34f33ba394e0b0190b70f65c73b5bf140869f314ae37582218db32bec71319d96b SHA512 984ab5395f808f957c26de016375a4cb5f33516368feb0bd5664060fc3eb267edb7cc5c67a261472f316aab3b5a6ac562813fc76c9569d40269cb5c28bec49a3
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/emerge/emerge-1.13.ebuild b/app-xemacs/emerge/emerge-1.13.ebuild
index 01e369b6d845..7a5bc78de12e 100644
--- a/app-xemacs/emerge/emerge-1.13.ebuild
+++ b/app-xemacs/emerge/emerge-1.13.ebuild
@@ -7,6 +7,6 @@ SLOT="0"
 DESCRIPTION="Another interface over GNU patch"
 XEMACS_PKG_CAT="standard"
 
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/erc/Manifest b/app-xemacs/erc/Manifest
index 528900e1ab4b..38665181f00f 100644
--- a/app-xemacs/erc/Manifest
+++ b/app-xemacs/erc/Manifest
@@ -3,5 +3,5 @@ DIST erc-0.23-pkg.tar.gz 517288 BLAKE2B ce5a5f41b70b25d8e4a123d3a7a8d32815f3059d
 DIST erc-0.26-pkg.tar.gz 517470 BLAKE2B 49bbe65ed658310397e4407f50b32b768c67723256123920f924d8cfe7b496b8185cc94753a7e5a778b928466ed8599b21d2cfbcfa063851f4eb424f75a066df SHA512 d1a9300dba716d9d569708977864cefeca225d22980df80617428c76c940a54c726cc99699e19a7fc966831042e5358c10744b4ffa7c8093e0b5feee4c070d1c
 EBUILD erc-0.21.ebuild 294 BLAKE2B f30a951ef4c633ba500c110bd98dadb6867541f824327c0f1e0bcd508862e1968fa49a2f6e5cdc504b89848225fd98179e6820d1e5e15513e308eaa116d16901 SHA512 34b4588e22b92c8084b7599be8cde4a922bc5d6fa9fffc4dd4b80c199df5725b91febf843f06785a234175740fdd94295c02634424c9b63f5105552fc74b635f
 EBUILD erc-0.23.ebuild 441 BLAKE2B 924b1fc3eb823cde51b49e123803bf21fc6de40a7f996ea8717eeb426df8f2de4353761f7a7548b720217fe6f840cc62785941c77ff56fa17dd4afd36cde97f4 SHA512 4f59427469e9838c343733050b90f4fc0f9798e24b2900dc5f9b0bd958a9b8254825dd9e8136ac41deed1daa2454c4f16b9310902cdd3ab6873771663835a343
-EBUILD erc-0.26.ebuild 443 BLAKE2B 3d363f017936de1531d524de0d51072d03cca7b82e6b228e99193d068cc1ba4fdf40537c0110334f6e0ffb4506ef4f965fcd0c3588dd2257ef17e2dfb01b5bf1 SHA512 d1a94c22c917c5e1d4c44c5477098daeda94d121c0bbcb9664806c4bdac0beeb8bb2bc1272e9f198e8e09c65c19039b2215b5448ec5b2c2bd9dacda95940e020
+EBUILD erc-0.26.ebuild 442 BLAKE2B 8d6845c2323d842fa41af1b0bfb64ab55cfe738edb2be2b6a18ebeabd6d6e5ffdf0146831fcf8391b53a673939e53e337060aabd6137ea4820b8152d6beb409c SHA512 1503c4666cdd1b475175a8be00d9cb9f24cca3025e8acb69836acc5cfea9052367d93abc4b6eafd4179cfa02275d64c20fac67cccecd53d2295075c67b2dddde
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/erc/erc-0.26.ebuild b/app-xemacs/erc/erc-0.26.ebuild
index c6f78f5a1756..20d3e2c90fe3 100644
--- a/app-xemacs/erc/erc-0.26.ebuild
+++ b/app-xemacs/erc/erc-0.26.ebuild
@@ -7,7 +7,7 @@ SLOT="0"
 DESCRIPTION="ERC - The Emacs IRC Client"
 XEMACS_PKG_CAT="standard"
 
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 
 inherit xemacs-packages
 
diff --git a/app-xemacs/escreen/Manifest b/app-xemacs/escreen/Manifest
index 610a109890a0..2bb10d1ee080 100644
--- a/app-xemacs/escreen/Manifest
+++ b/app-xemacs/escreen/Manifest
@@ -1,5 +1,5 @@
 DIST escreen-1.01-pkg.tar.gz 14639 BLAKE2B 4686dfecc40c7f90b4351de0b3ab20b5c5fcbc77760de7d5e0e115ddfbf792b5f7238df5272b33c3f98e7fd5ef4ecc8b79b08723217a4dad7e0c65bc0f4e8eed SHA512 3fb4d47ed6ae6173a530ea31b7ae759a34e2257e85e3f512c841234f7eba9780cd160e4ed600dd5f1871a022d4b2b28dd3dcdff788f679a07c05745914a04a89
 DIST escreen-1.03-pkg.tar.gz 14702 BLAKE2B 1057fcb27b555f4ebc173570df8b8b1f44a0e91fbd7e01b6196c963a3f76ed8f8c0889223b089482658269afd728e84aacc46cdb6ea56b50bf354dfa95afadb6 SHA512 7645fc60611162d60f8c7d0d81727c3c273d7b8883a0613d83cb98ae44a01ba62d575f67a657ce8d1c67afe7f6a8b7e925790c3e4429a715db3aff297eaeeaf4
 EBUILD escreen-1.01.ebuild 333 BLAKE2B 64ca5c9e2edf1c377694c819687d19e7f40b96580b7df4a06a980592343988e1ac005bc03474f9e0937de8873fa22152dcc42a5f7b9f881201af6f7d3b246a6a SHA512 92d3ef0a0c22ff6bcd90af185acc7679fbfc5d9fc0ad9d5d75b29261d6686cbe2bd939f534c4366fb6d7a53e3f01c07c17abb9a4888b5731d4053ad3fc1647f9
-EBUILD escreen-1.03.ebuild 335 BLAKE2B 0c4387a85df257b29553ad45043465367690e7f64fafa28f0cca0f800150c62a6f697ed4481baa0942ef6d94bf7e61d1185f8a82b298200deb0f2bae46caa410 SHA512 514bebe4d5e51ccc3037ed0473a028560ba16c05221ad261f76729b4c0205d082b2e96981b3fd7fc1e22d16b79e4e3df427bf39038f7e1fbe1d21ae4cc1f05c0
+EBUILD escreen-1.03.ebuild 334 BLAKE2B 51771ad1906c5317135da17cb51d90688a2af9d118f62946854dd28c4c17d62c1ff902750b4f45b0a9fa445272cea7840f271a3cfdb071a9f8f1c49bac3ae40b SHA512 4e3821eeb99dd3365f9ffb2c7a737e0d7e04b1ba6826e6c899f46613e9276c98cce99b0cdaf49fd1184d5ceb41d702a952ddd327a92903da7a2496365a49e4d4
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/escreen/escreen-1.03.ebuild b/app-xemacs/escreen/escreen-1.03.ebuild
index 68aca7b761c6..c371a2fbfdcd 100644
--- a/app-xemacs/escreen/escreen-1.03.ebuild
+++ b/app-xemacs/escreen/escreen-1.03.ebuild
@@ -9,6 +9,6 @@ XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 "
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/eshell/Manifest b/app-xemacs/eshell/Manifest
index fbff872b1b61..3c49a7912321 100644
--- a/app-xemacs/eshell/Manifest
+++ b/app-xemacs/eshell/Manifest
@@ -3,5 +3,5 @@ DIST eshell-1.18-pkg.tar.gz 238988 BLAKE2B d595f9c36ca5cd50ac46efabc813575b6f841
 DIST eshell-1.21-pkg.tar.gz 239308 BLAKE2B a20c3cfdb64f0b604f4aa0af44279598f0564bc623ce75303df7133b560846d4e79286914e8b5f06941503563cab6204962ba9c1be7f54290d1af3afbb023ef3 SHA512 d7724d43b2451e237f7a9f281f3aebb15266a1f58fe0e5a5f4c8104a6d85163d61877cdeee57ee7ace2d824ffe2d131624e4bfe3854ddd4581ba7b92cad076e3
 EBUILD eshell-1.10.ebuild 341 BLAKE2B 7f27a6f3a5ea11d21b9c760e50440395d866d90f20dbb7238fee97c948bd31579c77b09d2fa94d448d00a674b83fc511ebe1a12e6428ec374dcb83690bb783e9 SHA512 e560058fa946c52bb0bb913df5c379e505803de138e580dcec9a4608ed928e150623aac687d9648a8fa503ec61fe0c5121da21a5ad27f3cf10165d94313bf699
 EBUILD eshell-1.18.ebuild 341 BLAKE2B 7f27a6f3a5ea11d21b9c760e50440395d866d90f20dbb7238fee97c948bd31579c77b09d2fa94d448d00a674b83fc511ebe1a12e6428ec374dcb83690bb783e9 SHA512 e560058fa946c52bb0bb913df5c379e505803de138e580dcec9a4608ed928e150623aac687d9648a8fa503ec61fe0c5121da21a5ad27f3cf10165d94313bf699
-EBUILD eshell-1.21.ebuild 343 BLAKE2B e5c616d953d5deda8f561e373234ff564f9f51e7eeafefdfe4c71a8769e39051f4ddd2ca74d2fd3e9e35c72234ea839674024b068b070ea918578d5916f99057 SHA512 febda2b35e529ba4a7335bffd66eef79058ecd005302704756746dbd1a134f5ed9b9f58a9793a35bcee72bae103cfabe18c6121bdab0fb8f98eb78703b3ec67a
+EBUILD eshell-1.21.ebuild 342 BLAKE2B ed250f5f7f15b7e0cf2815a855008d8714e62674d1a634850f3bee2a360c60eae95c47b2a304e9d4240545b4dace8443d54aeeb6be72caea1abb0ef2280cd502 SHA512 4b70e0865d27c44e01603ba99bb64d9b67e9cfb1dc32cb2021eb816a33cf65ffb74c18a1b3653bb274ede86d41a4c75ac73843549f27ba6bec30fa3e81396c7b
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/eshell/eshell-1.21.ebuild b/app-xemacs/eshell/eshell-1.21.ebuild
index e30337307be5..5fa401bf5e17 100644
--- a/app-xemacs/eshell/eshell-1.21.ebuild
+++ b/app-xemacs/eshell/eshell-1.21.ebuild
@@ -10,6 +10,6 @@ XEMACS_PKG_CAT="standard"
 RDEPEND="app-xemacs/xemacs-base
 app-xemacs/xemacs-eterm
 "
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/eudc/Manifest b/app-xemacs/eudc/Manifest
index 552e61b4ec25..69c86e547055 100644
--- a/app-xemacs/eudc/Manifest
+++ b/app-xemacs/eudc/Manifest
@@ -3,5 +3,5 @@ DIST eudc-1.40-pkg.tar.gz 79675 BLAKE2B e3bac796fb0b7d496d6a3066795c5e89372b22a4
 DIST eudc-1.43-pkg.tar.gz 79973 BLAKE2B 86c53b32707c715f7501d5467c8c6e80a5829a5c36baf57ee6ec23766a5ab5882731eacf258489fa8c1120ab1e593e8fbfc66e33b1cb758ac3a9743f85536e2c SHA512 2a4b4c46c4e164fcac083dc75c8c2f2b8eafc0882d966c5e7fea8cc899a13f0c89f8d7b8562a79f972482dc569d48e8004a121a02a7a0b430a1da0800009635d
 EBUILD eudc-1.39.ebuild 497 BLAKE2B 150cf7ceef45c7ccd78135e1a74e7d4ebc0688a68a56a23d70e2a2a2d212c13ea974af8fabdd2422bbf6db8a4d012e1cf597b2e14c1aa7c18e2bd8ff609b76c0 SHA512 43551a8ce3825c90b283b33c16f122586a535a586593032433d5f48de29fef99ef4f88cd75607e6eb6bde8e6bb90f3ee3f7fc331c2b1e9a2a0e623db168125b5
 EBUILD eudc-1.40.ebuild 516 BLAKE2B 3e8c871295d0e3551df0bf557228f857550d769d9e3be6ccdeee7cab01dc8285d553e2d4a7a7323f319dd41e5d25bd9ebb584f7ef74faa4da2028eb66409369e SHA512 6961c39d98abed22ec1a266098f27ed5d3119e1d37d8d8c8a1c307938965a566efa549e46ae579a3b09bc015aad02a5ba98635e50fe468cfd5ba2d8b9ffbe66d
-EBUILD eudc-1.43.ebuild 518 BLAKE2B 04cbe21f75b96170b07ede9d4ec8b17a18d1858373dd42811c840c6b925a33a4da86f84ffd81edf2b31096682cb8c0a8286641786290c157470cdaa4dd1521e3 SHA512 5b099e26e75024971439883345e397e7d233451a0750b837b07a3cd634114e9c665fca4df36e219a5b5c825f96171b1e9d1a5f9eb22e98010bcc06021d7a43dd
+EBUILD eudc-1.43.ebuild 517 BLAKE2B 964e57f795e5314d970196d5e80d22a0a565f354e1cf297c1f219ded05fdc592ad8d77ae5b01f3fbc7d031584af55f28246f8a518305b97931112b050f821f8e SHA512 589791b5dc2ad4864841811b6a32b4aaa871776344bffe607c9b8131472fab7105246ef80f0f8637db4b3b3a0f9ff497a6d4eb0b9529cb567c1d9246046dbb78
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/eudc/eudc-1.43.ebuild b/app-xemacs/eudc/eudc-1.43.ebuild
index 46699ec18da7..20c9a1b71855 100644
--- a/app-xemacs/eudc/eudc-1.43.ebuild
+++ b/app-xemacs/eudc/eudc-1.43.ebuild
@@ -20,6 +20,6 @@ app-xemacs/sh-script
 app-xemacs/net-utils
 app-xemacs/ecrypto
 "
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/footnote/Manifest b/app-xemacs/footnote/Manifest
index d2b62e8778b8..81caf16bc8e0 100644
--- a/app-xemacs/footnote/Manifest
+++ b/app-xemacs/footnote/Manifest
@@ -1,5 +1,5 @@
 DIST footnote-1.16-pkg.tar.gz 22152 BLAKE2B 4ff8d3df1d76fcf23ec5191516bfeb7be4dbdf11a428d387a5c4a722b8c9b7cf34680548a8e7be2fa39b8dc83f623c96328c974ea4f3d940879b57ae03fde259 SHA512 4eba15270fd4529c3a8b5e8f488cd9dc294dab2f4b968490e8bbfc09e81bc4abd4f9c95b38a295a8f5899f4df55b7dab18e8979130cd8b24a533fbc609f0bf92
 DIST footnote-1.18-pkg.tar.gz 22196 BLAKE2B a6e99875cda4cf8bba7d27c2fad3d0bc61fcca09d6a79cc30b4e83004fa3dce704201e818ab6b0df96b5359425691f02ee5be92b347c41df6e842a6de6c44437 SHA512 222f2aafa6b0e56fdeacacc36a3dffec6ee6de103ae100f8900e00bfbf866d9bc1c3b6f00999c4d9a3c657bea6282a8b3fd89cac10856491745cab182a86e2c9
 EBUILD footnote-1.16.ebuild 329 BLAKE2B 9daee3d0d1ca6c262183c9da21aadc479ddcdd8709503a4715dda3647ef982b95afe4eaaf37768a87cbe7171f2e4c757ac5235760418132fb941e64c80219396 SHA512 fd0fd82f2658b716f42eefca9d3ab9b4ce67c7280704d3dc5915a731c031b9d2133454b5bb974b626918c2141aa06218e09d7494549ecaa0f7969bdc023dc760
-EBUILD footnote-1.18.ebuild 331 BLAKE2B 883c779eadb9aafbba500515c47e4a1b46da15c2878b52bc0b6023473a266426228cbb84e4762cbf36cd4bd6fc2b610fc2c3a178bfd1879ba5d58454147cd72c SHA512 5285fcd4232b656977f02af58fb23db73db2b9e12a4b4d6709a1a531eba5390aa070262c8c8c0317e2af9d10126a1ac330b360d20178c00485ea5b160a1ce0a5
+EBUILD footnote-1.18.ebuild 330 BLAKE2B cb6a523d30c741bf04e701c549b1012eb9dc85afa18c7a13ed03ef24976cd3059dccd4cad0b4a3ec65ea9e065e25a76f8b8d3b1e9684eebde6b8737eca41dc68 SHA512 030648f46398ff44610c23f2220794cd675e2e44a8d9eee7623812f0476a986a642da2178db524972a47047e7daad5e1f3a1300d3ec67bad0808f64353ee7b43
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/footnote/footnote-1.18.ebuild b/app-xemacs/footnote/footnote-1.18.ebuild
index 9cd2a7b8c35d..6970c68c0a6d 100644
--- a/app-xemacs/footnote/footnote-1.18.ebuild
+++ b/app-xemacs/footnote/footnote-1.18.ebuild
@@ -10,6 +10,6 @@ XEMACS_PKG_CAT="standard"
 RDEPEND="app-xemacs/mail-lib
 app-xemacs/xemacs-base
 "
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/forms/Manifest b/app-xemacs/forms/Manifest
index ac3214a360a1..4f087cff9291 100644
--- a/app-xemacs/forms/Manifest
+++ b/app-xemacs/forms/Manifest
@@ -1,5 +1,5 @@
 DIST forms-1.15-pkg.tar.gz 48747 BLAKE2B a7695c1d07fc33cf6ccf7f0a3e7bd1039da1f662d589fea02716c9dcccf1441c7acc6bfdf344f6f0dd55965d45fd55633af3f369d57cb18bab3c62f3f95417c8 SHA512 eec09fe907c6b2ec94132ccc508d70903b27fb74cd02ae58a60d2196b80ea62111b0849db0c220e205d9e58394e588913b42dcf350d83cbe17cd9fbdd8ac6a62
 DIST forms-1.17-pkg.tar.gz 49071 BLAKE2B f0ef7c71819f5d4c036025d8acd7e9da369143500850f7c094729a0d98a5ff3d7fa8f39b2783f3338a9ce81f2036ad2161edecfd3a35966284f39ce5bf44ac55 SHA512 7ef9eade79bf53b1c2e3c1f86d9e3e70225f0041c7b41db844ec55bbfaded100edf9b432813ae5dc6a0f8237faa6e3ba7c58acaa26ec73438a45cd2ba326a249
 EBUILD forms-1.15.ebuild 287 BLAKE2B c028df35aff20fa2b4bbd1819bde15713aee1f89d290ebc17a46f368bc8844b3d8f0a0a3102efb3cf940290db342cfb3ba7720ab0719c8640c857728c76882c3 SHA512 2db088448bc5d2ad894543b4d46dfa3261b5a403f0ff13ddfa0fb2b3a2cec527ce05882daa35e4ed3bf3813f091b10440d04c978719aef83559764e234001918
-EBUILD forms-1.17.ebuild 289 BLAKE2B 364a81760a58ff09b73b95d65bfe2944dfaed6cd9f4d68e5ec2358707f769ebb6b13682cdc655c79d51557312bb42d12f3730d4f3278e9f59f98eee016e22e68 SHA512 fefea61463f20b838ac5ac1bddeb5c6b148c8c7b7296ebb11414c9eff1848b32f566bdca3d41a965a8a1ae7c1e71142f2f14c425cbf729c54ab15dce6e1fbd2e
+EBUILD forms-1.17.ebuild 288 BLAKE2B e301f7ec440d7c58506fc209402bef8ff6fbfbeb6b950e2b5588f4f980213684faaa63518b4f85111600ce8cbf1a2e3c92520ea031b338a4868bb8ea4a4872f8 SHA512 60a3a8e5d9964eed9eae429df3d0be1e97c9e1601a99ea000350d05222636440668d89507834fe4fabe4a649f4dd0a79259e4f163fcbeda8ea3c459b2b895195
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/forms/forms-1.17.ebuild b/app-xemacs/forms/forms-1.17.ebuild
index c9e5fb1473c2..9e1fa09f2775 100644
--- a/app-xemacs/forms/forms-1.17.ebuild
+++ b/app-xemacs/forms/forms-1.17.ebuild
@@ -7,6 +7,6 @@ SLOT="0"
 DESCRIPTION="Forms editing support (obsolete, use Widget instead)"
 XEMACS_PKG_CAT="standard"
 
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/fortran-modes/Manifest b/app-xemacs/fortran-modes/Manifest
index 065eef7c31a7..8f13b474b53c 100644
--- a/app-xemacs/fortran-modes/Manifest
+++ b/app-xemacs/fortran-modes/Manifest
@@ -1,5 +1,5 @@
 DIST fortran-modes-1.05-pkg.tar.gz 70602 BLAKE2B da1e620e74b497290bf655fcbf9d45b5510193388557e33abc769d874ef2d75786cb91ea9964f0019a40b19de968690f396523144f49c7bd79be783111830d8c SHA512 c3eac57a6d84605fde545951d423855cca8a40dd02dc24d0e005e165ab4e52f2f76f7347ddf33e4e85d25717689b85c578ce1e2b3b738df8a080b56057747b27
 DIST fortran-modes-1.07-pkg.tar.gz 70601 BLAKE2B 637c183415e196090acdaeaf73a1dbc35ba0aa089ed66ffb1cf69240c5bbce84dc30b7563665a0f7cb0615c16590f11ed5b167d25d71cbc50eb750d682e2d1f3 SHA512 760d60adacec1f9c1ee591193ced65560968363e7a3d148530a493ce04a4efca4c7a15e6058f30b744d7de7763968064b4f4a7b0a831542fbd2bf4d22d2adb38
 EBUILD fortran-modes-1.05.ebuild 284 BLAKE2B 83041f886a60ad6a9081ed68860f79d512e48f4e907899815cf144c5107ecf2761a5f8c39e2220c1132ace9bcfac55ba04aa9f32875bf5176e89689d74fcb99e SHA512 26b1f0c7e0f6bbe5af0b4541b6a7d3df343eb886f6715802dc3f48c268de614f05a91d7db33d983a11dab80682261452c5a9571554f468ad9a4c964daa57f357
-EBUILD fortran-modes-1.07.ebuild 286 BLAKE2B b41bfb6e35bf402f91a8f9f55dcc7e49790f50a1325ed1db4dbe99f610c209eaa366ccb96e7b82413e4b800eb2d383004571264eddb8f7095a76911cbc1193c1 SHA512 0d53cabacb19876fb77ffb5f5fb78501ba048548a3bbdbcaebc5aa6ffd0ba0b00a149ada1245438dd47b9814d9097fc16c7432aa0c0878b047174f9a0f80a5b1
+EBUILD fortran-modes-1.07.ebuild 285 BLAKE2B f3ca6ac9bb8dfb6884426a46abb44dd7bb2827d1326148932074c687f73a0b87cc2e93736a664c4622dc375a7ac675f82f5bec2112137ccfde3cbb255337f38b SHA512 30d44db858eb92f45ac00d339b1b4fcd0c37152aac9200b1efa525623b261e356892e70e6be827943473bedf28b2601cb0f8d62696e1cec13e1747a4849588dd
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/fortran-modes/fortran-modes-1.07.ebuild b/app-xemacs/fortran-modes/fortran-modes-1.07.ebuild
index 7c3c500d2b2e..48cccc898581 100644
--- a/app-xemacs/fortran-modes/fortran-modes-1.07.ebuild
+++ b/app-xemacs/fortran-modes/fortran-modes-1.07.ebuild
@@ -9,6 +9,6 @@ XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 "
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/frame-icon/Manifest b/app-xemacs/frame-icon/Manifest
index 7458577af167..30fa1591ca97 100644
--- a/app-xemacs/frame-icon/Manifest
+++ b/app-xemacs/frame-icon/Manifest
@@ -1,5 +1,5 @@
 DIST frame-icon-1.11-pkg.tar.gz 33800 BLAKE2B 93c404c9dfc894634e1b463d54eb53812de102e20f0d622dec9dcd5b37006bc92f5f4c1a2d47c5e1e1bc2344a49819bb6839a5c3d41df68546d6027abf6f5f8f SHA512 30e4de2e4bdac71483d39f3893b4ccd5d1ec37bc8b522a621af35f569e00c69bf02312c1039a52bfae759da2eaa748d26356a2b7db8c6b4dc8ce2ceb494d7d82
 DIST frame-icon-1.13-pkg.tar.gz 33818 BLAKE2B 73f88b6a41c42a5376d68820245b341d9ff290f62b6cfb6b40201c90523d80386b07613a824e35c898456cdd8bcebeb82973eb98724c64e702b5ebdec4aa7ed9 SHA512 45e37a4dd59f6e7bdac12558079a4b7c0cd552053950fbc5b67b32b00c3631580d3645bfc2d662a91b3da7410754d89f402ed1faa02eecefcc1691460aea95a2
 EBUILD frame-icon-1.11.ebuild 289 BLAKE2B c013e5b9b897cacf48e0959b4df9baefd4d3a1b4618f7fe7cb819966a8d6ece07c05be2d9119e55ca8a3497735247a055dfe765121a8438676091378eb59b925 SHA512 f20f4b8028d1bcd20358894440fab60020d4df29e2b83796c87180c2a56d2462cc21214026aca21272cfffa3a2fb1f58d88198929fdd9a58e30779d0fba47878
-EBUILD frame-icon-1.13.ebuild 291 BLAKE2B 7dc4e08f5f3c6adcc3d7a8f2da9a03d449271f6ed2ded9a4cbf4866590a00f728175f0014f9b0d7405b6fa1dd0cff4672d35ef9856ed215cdeb12585cc08f5f4 SHA512 922e52c11980c6d976b764cfaf613f3a41875722537ffc50833483db69c229f4d2b85e127883c3b4b5962b20b10a1cf70e3cd328226524ffa7c6fbf8e30d46a9
+EBUILD frame-icon-1.13.ebuild 290 BLAKE2B edca981f8a3da8f91e57906effdbabacfb67bf06e59d625cdee45a32edf783df1b58211ee080acf9683aad6aa50d7694b8c05f2f2801d37fc200164a25a347d8 SHA512 a8d66dc66d2d13932f99f6614bf610b55aa0dd3fc6209642e06e87b2b45580d3c851910e74538b985aa12c76a48ccf1ba908d0e16e287b99eb552951cbacc1b5
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/frame-icon/frame-icon-1.13.ebuild b/app-xemacs/frame-icon/frame-icon-1.13.ebuild
index c40b4980c099..0d8c9592a73a 100644
--- a/app-xemacs/frame-icon/frame-icon-1.13.ebuild
+++ b/app-xemacs/frame-icon/frame-icon-1.13.ebuild
@@ -7,6 +7,6 @@ SLOT="0"
 DESCRIPTION="Set up mode-specific icons for each frame under XEmacs"
 XEMACS_PKG_CAT="standard"
 
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/fsf-compat/Manifest b/app-xemacs/fsf-compat/Manifest
index 4f9a6d32feb4..1fe0f5aecec3 100644
--- a/app-xemacs/fsf-compat/Manifest
+++ b/app-xemacs/fsf-compat/Manifest
@@ -3,5 +3,5 @@ DIST fsf-compat-1.19-pkg.tar.gz 20477 BLAKE2B d231757c8498693b1f08d164f1b93a8935
 DIST fsf-compat-1.24-pkg.tar.gz 30304 BLAKE2B e54d2484b0dd7e42543e7e629bf403e042e3966e3776e9a108a19b34db4ce634a2e9d99122225d005e09bf2a35411d95f613b1aaac2f57755e8af685084872b0 SHA512 b16e4ac297bbc6fecd278bb7e26842f92cba279c0edf7ddf880c43470e586232d30e84d923f52f5bf13904fb7ce3fb3193f48ecc3d5709fe6613bf6dec681f2d
 EBUILD fsf-compat-1.15.ebuild 303 BLAKE2B a07a401564e467a1f06d33f03a9f928ba148dbb919945a4bb34e90f7ad897fdd5ddee3fc3210478c65851a4bf10a6688ff4441b8f9c4f9b0c48db15a442cf83d SHA512 5595cee32937d00e83c396cac4490bc29edc9c92c4ff8da0dbd2e6197f547cd29b79a15cd7f748255898a7c8d141f70c36f014861d9c8ee1def032ec13f4d678
 EBUILD fsf-compat-1.19.ebuild 323 BLAKE2B ee930e5f0ee164c76dc73615f6abb37aa99e0dc80d583c7ef430f22bb7b1031daa11c2948047652809433b99d8f6cbc526539085fd2563b30ed47738671fd1fa SHA512 842d13d504dd7ed2a5bfd70d92c171ab371b3e0cf50c5010b94208876aea2e52a2f8b7044d982de613764daea68ebeffa93173b84e0d567df1784e715e4d0ded
-EBUILD fsf-compat-1.24.ebuild 326 BLAKE2B 0cfcd528ce35e1ae69e2c29fa9539ddc66fb3138e5d22b2a895b8b77b4af8b3886fbd6ad5fb522e7307c2f2e7debfdd4b40097e57324b6666050397bd71044c9 SHA512 386685fe11686e54f204789bdefe1f236bb6f63405285e618f8038ef17118c86c90ffdcca86719758a44735adb01a8fbc4252ad4174ba4ef3cda662e2a26f3db
+EBUILD fsf-compat-1.24.ebuild 325 BLAKE2B 022feec61945024cc3915549947a2c238e695f0584686f3a43fbbda8cf52e806cbc6dc68fb8b5a50511b2133b372498b7261495138149a6b095a0646f0a34f89 SHA512 2ddac1904762fe2ad5d445d2d0a2313d836afca27991763c7d3369e839de49fb6913fb5833029feb48f4a85eb882a1b3ead2900cfc3bee07f3ceb03a0e6011b6
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/fsf-compat/fsf-compat-1.24.ebuild b/app-xemacs/fsf-compat/fsf-compat-1.24.ebuild
index f6d9f9cc03fa..3d310d149b5f 100644
--- a/app-xemacs/fsf-compat/fsf-compat-1.24.ebuild
+++ b/app-xemacs/fsf-compat/fsf-compat-1.24.ebuild
@@ -7,7 +7,7 @@ SLOT="0"
 DESCRIPTION="FSF Emacs compatibility files"
 XEMACS_PKG_CAT="standard"
 
-KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
 
 inherit xemacs-packages
 
diff --git a/app-xemacs/games/Manifest b/app-xemacs/games/Manifest
index bf2e56511d2a..504c2e1243e3 100644
--- a/app-xemacs/games/Manifest
+++ b/app-xemacs/games/Manifest
@@ -1,5 +1,5 @@
 DIST games-1.20-pkg.tar.gz 84330 BLAKE2B c2f7fbd059de6e9da0670ed77fc86d8ada289f9841885038ed81bcf7db2825cf2006fc12f12dd308287a4bcea4d06ee98bb60ec0a0d4d4867356f1e48c446544 SHA512 dbee4a0da7a7ef1ddffcec72caa1af09aaa449c3d1f662c217bbd53ce0a7651c0ba3b31a3af750cba79454455c5325c5a9d81bcbae80610f356656b998b2f649
 DIST games-1.23-pkg.tar.gz 84601 BLAKE2B 05af9e6ef9425712324947369bc84cf8dfd5996293777255f4ff8b06990057eef91bf71d504243e11688098b2ea6f3942819ca0a3aa9762e1d94b5c7066b8605 SHA512 0aad12664b89c27bb809d02514cc406165c9d9c938c0cd910ff31380f30898faaf4e38a0cbebd5d9a744321ae4c726f30ad4a920185e7d78b654329adf533a0f
 EBUILD games-1.20.ebuild 295 BLAKE2B 59842188c0f5ee629d8582f2fd14224fac8b3861e59465670775d91dd56f856dad7225ac2b72750193ffe01726b331866d9df5b72cca3524a76883f198c5d2ea SHA512 db45b744179f294aed00fec0a6905e3cef91301254d10d60106a9f6a3b94e66d82acffdbfca9838ed8c2b91f5222959a2f955496bbbd8d80bc4e709390801b89
-EBUILD games-1.23.ebuild 297 BLAKE2B 47e924a3acac09316b856b2fb6805cad8eb6e6dfa910b81f6a755cfea51b99fd304f56da9fa63e8dcc9b03b193395884f6a2cdf19ba44f6fec30c0628f0fa0d4 SHA512 1da3f19546c0e095bf49ccacfe8ed8f3673c2decde2ba3041d9e5cfa1f39bd330fcd7096a14346e76be877f2129fc5d79f7b3b2741fa597bb4abbeb849d961a7
+EBUILD games-1.23.ebuild 296 BLAKE2B 598179a572f84f73f5d1d39c51079f5f2d86a1d53f723e10d12cf144a57c18ad705b45204474372d245103427faf280a103812fcbb0cf57b57a1a26390f6e67c SHA512 a74f495f20c45985f06b65f5efbeb9180c961dd9cc7e4443e1d668863386ad888a6983af473f48a5176fe53758e5b785c8fa67de8935342b0978ff323e8039bb
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/games/games-1.23.ebuild b/app-xemacs/games/games-1.23.ebuild
index c382b325a7a7..798cfa1badeb 100644
--- a/app-xemacs/games/games-1.23.ebuild
+++ b/app-xemacs/games/games-1.23.ebuild
@@ -9,6 +9,6 @@ XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 "
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/general-docs/Manifest b/app-xemacs/general-docs/Manifest
index ff8768a9fa7c..bc0911cd7168 100644
--- a/app-xemacs/general-docs/Manifest
+++ b/app-xemacs/general-docs/Manifest
@@ -3,5 +3,5 @@ DIST general-docs-1.06-pkg.tar.gz 146305 BLAKE2B 5341120385d4c6c9d631f604e8ad71a
 DIST general-docs-1.10-pkg.tar.gz 150069 BLAKE2B 12bc9cdb095685d954500373dcbf5b9000cbea49bda67dc81945ade24896a66ff3ec7b9d73a840706f48570b30da2dd10874bb15bc732a6cd11de5bfa56f64aa SHA512 f94798e437d5278c31e0cf18e22f22c88cc0c8eca1febf23f6c1e5dbe8856955c9334334c70832d6ce25db535704e56355536cb402c7c587a2bfee450c1485b9
 EBUILD general-docs-1.04.ebuild 274 BLAKE2B fbd4894c2845c46ed8defacad92d94666c4bb4b3ea5e703ccda285f6b9d680b56c6a9efc0ce1ab116adf104ec2ad077335273ce70764db6f346e75246b8f53cf SHA512 e0df4685f897bcb3a8515c711f1de6c6eb5084626483ffdfff62335a2aa72455fa6f40158ba32d08e4de2756b17915d2e93ab447522fa5fe92a73cabf6bdf2ca
 EBUILD general-docs-1.06.ebuild 274 BLAKE2B fbd4894c2845c46ed8defacad92d94666c4bb4b3ea5e703ccda285f6b9d680b56c6a9efc0ce1ab116adf104ec2ad077335273ce70764db6f346e75246b8f53cf SHA512 e0df4685f897bcb3a8515c711f1de6c6eb5084626483ffdfff62335a2aa72455fa6f40158ba32d08e4de2756b17915d2e93ab447522fa5fe92a73cabf6bdf2ca
-EBUILD general-docs-1.10.ebuild 276 BLAKE2B 374df4861206eb4c542a7bd04cb2045d9afc57e60f3fe4f873117df334a42a39ee5e733b56fbe134abf66e648aa4aa6441d12fcd901eedf2a1be98043b043e90 SHA512 991084f9cbb5d31e118b1bcb6066b8a03e17535c70ed08a6ea4a620b9d7f4da7ac6f9133d2e6dccdf7185ae31704ffeef9ab5cfa90bc79acd5ed411db37a0cf3
+EBUILD general-docs-1.10.ebuild 275 BLAKE2B 7aff45ee4e2e4500c03bf660c93a59fdc478874ba9e2a4bef6a425b3e33da6dea635d6a807686e1e1978d29de158cdb24958e9eec70618513a9ff05d9dc54b52 SHA512 ac22bfb904cb9d71687e208ed37fdf993236cf0458d9b92660f08821ef77da1ad179a304093cf35133a7f46ea94886d2daf50e84f2b1c3d7de1401e70da73110
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/general-docs/general-docs-1.10.ebuild b/app-xemacs/general-docs/general-docs-1.10.ebuild
index e9dff7f9acb0..c8f9d5bf57bb 100644
--- a/app-xemacs/general-docs/general-docs-1.10.ebuild
+++ b/app-xemacs/general-docs/general-docs-1.10.ebuild
@@ -8,6 +8,6 @@ DESCRIPTION="General XEmacs documentation"
 XEMACS_PKG_CAT="standard"
 
 RDEPEND=""
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/gnats/Manifest b/app-xemacs/gnats/Manifest
index 4e8c2e786093..6954d45a516f 100644
--- a/app-xemacs/gnats/Manifest
+++ b/app-xemacs/gnats/Manifest
@@ -1,5 +1,5 @@
 DIST gnats-1.17-pkg.tar.gz 188959 BLAKE2B fd32eea586b1610abba78a51383d86714091a3656dabeeb871bb56eb5b85e7f9ff52dfba87da76bdf3abd15c1e66f98c03d807b26071879f64b33b3fac048b4e SHA512 b8d5a0faeb55c46b7a4f2d42d7b347304bff7a94f8487df72fac0a1aa4e388f188abb351de8764fac1c2381b01b3ac21abb1682878d4e998b5e141e4c443d29b
 DIST gnats-1.19-pkg.tar.gz 190492 BLAKE2B a0ee4d1c7014dde6ece2f8e7919832a36ebdfa556083af37561404cd002239ff25d2c7074ac1498f2e388e133040445745620513955f5c4f345b213232c91219 SHA512 116375ab1830fff3ecb889a5236c1915a69b4d2e08daa95885aaa22c4980ee27d4e5ea41c3e5d2a9bad507acf3d668752b068c8e3ae9281e4a129f297fb0a9c1
 EBUILD gnats-1.17.ebuild 307 BLAKE2B 3381b54e8e014eca3ba5acfae67eae56bfcc4c149f89c5ba807324d2c428f9f6005918504772cc6ac4436992a004ae411315570b625bdf4fd2798a3d99997474 SHA512 66844e8572299bb04788add7b30dc670aeba48b08f39d915c6f542bdcf73d645861e83025325f60a2846500523683dc83cef111d5a26697c2f57c47f6a68e766
-EBUILD gnats-1.19.ebuild 309 BLAKE2B 138aa07c0085c653d4f68a63f73c2f492050c88b6e9331805ee7fd5e73b982e3914e7c7aefe60b068e65508678e093127e5cbc2761a52ce423f7c0a86f229f28 SHA512 86f99cbf1fa1e70932bc3998b1a835ddd5b0177e48745f65fffc12862d7c16775e5b0305b4919a3369998237c08bf562e4c993c690501e1c838510d7d0f1b191
+EBUILD gnats-1.19.ebuild 308 BLAKE2B bd5f5a8a23fcbd8207dc96dfc7882d8b3c01eea44c59a64dcd39630ba8b3dec98493d35632e2a75dbb8837de566be110785df04af9c4778323d9a04fec2f32f0 SHA512 2baf3475d394de1ec605f05172256a25bac0cfb412c2f31a86baf498efd8195a06a355ee61cfe9c4a91b5332f9ba7a196d62e0dedc5e204d424958d0c0d07a6f
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/gnats/gnats-1.19.ebuild b/app-xemacs/gnats/gnats-1.19.ebuild
index 68194980919c..060149dc1b14 100644
--- a/app-xemacs/gnats/gnats-1.19.ebuild
+++ b/app-xemacs/gnats/gnats-1.19.ebuild
@@ -10,6 +10,6 @@ XEMACS_PKG_CAT="standard"
 RDEPEND="app-xemacs/mail-lib
 app-xemacs/xemacs-base
 "
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/gnus/Manifest b/app-xemacs/gnus/Manifest
index 7cf2de9a0b17..dfb9789683fe 100644
--- a/app-xemacs/gnus/Manifest
+++ b/app-xemacs/gnus/Manifest
@@ -1,5 +1,5 @@
 DIST gnus-1.99-pkg.tar.gz 3636886 BLAKE2B 5345498a95388998c5cefe65c20991ae34386e582e291c45d51194e509670ec395b2d4ad164ca219e4892a7377030bd769b2e76e3f624b6751d60f2a5161bb5d SHA512 f938e77d2a93e29b7eb89db5b67d717a55ff36e827b7ba3ea1d114f59eda763e06933b645fe42d51a53c483f1e6fe74c669d595af36aa97b30cb97f5ca39db79
 DIST gnus-2.04-pkg.tar.gz 3628467 BLAKE2B 1b6f6ffd4693065a666353e87cf5ec4ae5f897470fe1423f43c5f3ec99c827f6c9074c70f4add6cbf7462491ee0a50b8faf0b9f6e1d4cab16d23e64e20d07975 SHA512 d7bce3b6ff62ca901e9dabf59a5bf2044ec569ab1dd84898f11cb966dc97bc35b1842b61c62ad024e200db4bd1df9f7d17fd642c251e42931603b0eb286356e2
 EBUILD gnus-1.99.ebuild 592 BLAKE2B a33dab6e121bc96858b04426178c27e7437abb7d4f815d336936304b1135a11ec23d58fe2ea75eb4398038b9535df90855df85ae12db6613e795d25a27cf78c5 SHA512 6ce4a4b61e34ee5679dad6232f7edd48fa927016a25d9d2572a7caceb0e5a27368cbb038d4432b6c277d8b70e9d2642b0b00460cee7b38645b3e2a878db1c55a
-EBUILD gnus-2.04.ebuild 566 BLAKE2B f098aa1ae0357ec330ebe3ed3f39b2e968c1deebd61dde3a9ab3f36eabb35234fdaaaa142ece2e22a5f578132c23be3fa704a98c0610b99479463b9a4ac2674d SHA512 3ca85f66d9db166b332c2d93ce550082f0b076702d5e2d1801afb5879eaefbc316a027da04806090957d6796b3b502b9c0073600535c606b703a866ed886041c
+EBUILD gnus-2.04.ebuild 565 BLAKE2B 3839b1a8135a823ef6ffdbb933f97a85ee7680f7fa684ed2002eacdcbd880cae26ac0a401c499baa93126773c42b8486c99a46459ce2ebfe93c9700bf2ed99d5 SHA512 33a02c6721b75edceb062894702a4f1fb1bd6e649cdad01b12263dccd8f39324998e68c2b514bc562f947280d5342c0e03a9e6e6b304eeedaec408e09559082f
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/gnus/gnus-2.04.ebuild b/app-xemacs/gnus/gnus-2.04.ebuild
index 7fc88af633f5..de5132f6f163 100644
--- a/app-xemacs/gnus/gnus-2.04.ebuild
+++ b/app-xemacs/gnus/gnus-2.04.ebuild
@@ -23,6 +23,6 @@ app-xemacs/mailcrypt
 app-xemacs/ecrypto
 app-xemacs/sasl
 "
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/haskell-mode/Manifest b/app-xemacs/haskell-mode/Manifest
index 0aee3c512c06..b053fe2777ee 100644
--- a/app-xemacs/haskell-mode/Manifest
+++ b/app-xemacs/haskell-mode/Manifest
@@ -1,5 +1,5 @@
 DIST haskell-mode-1.11-pkg.tar.gz 110350 BLAKE2B 05acfe43c5fbf87dd97543d300c41695ee1383267dc0e88aa2b0ae9e2b84b179127500b5d292280099b77597fb93bee4504544979956a814d081b99bb0b88861 SHA512 719b65cbf70680be25912a972fc1c4ce4609bd93f6decac6904b8d8b6266d466c577eb1a60d179f4d356af96f755f24b2802a2803be27e01be0132a22c75abb0
 DIST haskell-mode-1.14-pkg.tar.gz 110367 BLAKE2B e59067f89993eeaa79f07110afdee88405a8b0c4ada8d817bb3e0dfa83baba1b8d1e5c1e7ce676cdc37aff02827746a29d1c2c4408d301a88e192dcecf13b509 SHA512 d3bbb6989182f8c2a432fac8d33c5a0deaf7e043a7b91f85a1016584beee5d45d5b480c1c810bbb8c78c56af61cec52ee3ef4e0467a098e080af5d1dfbd71442
 EBUILD haskell-mode-1.11.ebuild 351 BLAKE2B 0cda6ba6e4757ed8177c1ac9a2dfb506c9920e412f4effb6e9fef182cd1f80053b9eb2f8c03356ae9700bda8dfaff663d6917c69ecd30e984cf9f5d64a69cfb4 SHA512 fe9451a575cdb9d511d1602ea9e806abeada74fd7c0ee3739f2d62671a3c9b25d881e710968f7a8776e34f0ce3646b3ca430715755b32d99c6659136b67dff9a
-EBUILD haskell-mode-1.14.ebuild 353 BLAKE2B 2eaee2a9505b45044381eed2e47d0779c593c2a4eddfabe74a80553bddb8060d6383d29a8817e285b89a43093c4ee134245e24480fbd85d344a1f121e30f87fd SHA512 4bfdcbb2b750ee22ad52cc5dde85203cead3c59cb6959590c724bef2adea657c4414491ccddfd31faaf7fde97dd8390a25f176a9079618c71563c9a3cb3458f5
+EBUILD haskell-mode-1.14.ebuild 352 BLAKE2B a3579c5199fb80060d7a10f5cacfddb06f1616e9f7d0e1accb069f7c77e3b4faa9d2851cbfe87532e1aa2567bd4f43f54262b51b1db363cf8d8f436898265816 SHA512 17451fff4dee27369eacd4270ac3f6e24c89548df03c7236899db5c9e1fd84cf43d641be5e56393b82a3428955d2a3b37feb67f7e60e41d967baf59c011dc430
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/haskell-mode/haskell-mode-1.14.ebuild b/app-xemacs/haskell-mode/haskell-mode-1.14.ebuild
index 6f7d94d63b5a..b31614dea847 100644
--- a/app-xemacs/haskell-mode/haskell-mode-1.14.ebuild
+++ b/app-xemacs/haskell-mode/haskell-mode-1.14.ebuild
@@ -12,6 +12,6 @@ app-xemacs/mail-lib
 app-xemacs/xemacs-base
 app-xemacs/edit-utils
 "
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/hm-html-menus/Manifest b/app-xemacs/hm-html-menus/Manifest
index a43ae7681ccc..4217373aaa60 100644
--- a/app-xemacs/hm-html-menus/Manifest
+++ b/app-xemacs/hm-html-menus/Manifest
@@ -3,5 +3,5 @@ DIST hm--html-menus-1.24-pkg.tar.gz 179443 BLAKE2B 91c8d753f7687b12f0d0b95393a21
 DIST hm--html-menus-1.26-pkg.tar.gz 179409 BLAKE2B 483ec82621700591f47128f9268b0c839d9094cff1044ac00deea0c4d1629bd7a6d4a66d7bd4db7e3ef54a73e89574ec23a1568a204b05713ffedf083396dfe9 SHA512 943c3e5667ad1f2caf6d66ef046e744c90cd1a2b7f06dcbf1e935cda984b62365b34b74e66f014c79e1a1bc0b97b183f85846d59a9f3da1aa400cb3d39949ce1
 EBUILD hm-html-menus-1.23.ebuild 371 BLAKE2B 2fadac69b5ff520a92308a1c12da9a7747794ace73cee3fce249a2e8ae0a2ee656eba445c5cd9b9192f38465ef66f1c5ec4feb30b7814b2bc8e380478aa4de7b SHA512 f1f7b1a5064a5a89ec3630e716e4eebe7b98aa5f47fe61b71ade2f31dac9ceeade33b307d3c68a245c0fcd1c61e510ca04fc4e8677122fb7c57d59acfbb43504
 EBUILD hm-html-menus-1.24.ebuild 371 BLAKE2B 2fadac69b5ff520a92308a1c12da9a7747794ace73cee3fce249a2e8ae0a2ee656eba445c5cd9b9192f38465ef66f1c5ec4feb30b7814b2bc8e380478aa4de7b SHA512 f1f7b1a5064a5a89ec3630e716e4eebe7b98aa5f47fe61b71ade2f31dac9ceeade33b307d3c68a245c0fcd1c61e510ca04fc4e8677122fb7c57d59acfbb43504
-EBUILD hm-html-menus-1.26.ebuild 384 BLAKE2B e0c1416753db06762072473cbd063566ebe639d6f48c297b5deaf825bf7d64d5ff3081bb3410cc7085ff93efb5e7a39b11b0bdaa62fe38bf3a9d433896fc9302 SHA512 d0bf0c3e519a933c741c6aee82045530144806a90398c91d4887d4d3da3234aad72f20ffacd52fa1494c51743764e0433a06ddc41cbc09e67cdb6bd152d9a4cd
+EBUILD hm-html-menus-1.26.ebuild 383 BLAKE2B 7c6c45df8ef9139babdfa991a3610868ac3095e0765ec38bd5b5e9e6a375cd6e402403d12c22757d0503a84445d3b9517b076ca1325f59fc4c19eed1aa7f5760 SHA512 4df915f765e4e990004304ea2d38077ac74f58d77c72b23909807a52da529c91db27d3c3a43d9f8d4b4b360f2afb005e70fe57eecbd965bab8b435487070cfad
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/hm-html-menus/hm-html-menus-1.26.ebuild b/app-xemacs/hm-html-menus/hm-html-menus-1.26.ebuild
index 0ca21c255db3..8c27a4cdf8c5 100644
--- a/app-xemacs/hm-html-menus/hm-html-menus-1.26.ebuild
+++ b/app-xemacs/hm-html-menus/hm-html-menus-1.26.ebuild
@@ -11,6 +11,6 @@ XEMACS_PKG_CAT="standard"
 RDEPEND="app-xemacs/dired
 app-xemacs/xemacs-base
 "
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/hyperbole/Manifest b/app-xemacs/hyperbole/Manifest
index dbb8f7d10cc0..3bf9ea116eb6 100644
--- a/app-xemacs/hyperbole/Manifest
+++ b/app-xemacs/hyperbole/Manifest
@@ -3,5 +3,5 @@ DIST hyperbole-1.17-pkg.tar.gz 555380 BLAKE2B 35deb594f6fc9c335d8e5f35dce0eb0581
 DIST hyperbole-1.22-pkg.tar.gz 555128 BLAKE2B 1774c3ebf35ed0806308bbb8138e9ee45ad8b0efece0d718ab1226429f6dab34f7e4582178bdd1403b47f965b5272950131238b443f645dd22fea7ca4c3ddfd6 SHA512 726a1fa769df822e077d649d7d24664b1293d7402afde832616d5fe9d1bc5cbb2db205cf78844559cf189ddbfba5c05140df300a9a2d7c1f95994c5cf476cae6
 EBUILD hyperbole-1.16.ebuild 502 BLAKE2B 3a2a834d0687fccbada5ee62f5ca7096cf1704f43fb4989dfe518ebe9e6053120193d639a336e6270cd39019fcc3b4357bf6655c38758924531b54bd9a1b7e17 SHA512 062def13e38f0fb8d218daebfe77a34b28a7d756ff0ce58b2264522754a1a73dd3efc1a06d87c875c73e189ee598b169ac4dfcaf927e61eddb80d43cc7a9a695
 EBUILD hyperbole-1.17.ebuild 521 BLAKE2B d214dc01766e8e333ba5c09828ab57b3f034c6b27f4d4d5d1ad60b5c5a98b8d76ad60bec383bcb11be2824d90a6b0a13dadd1c399f7a3f32f01c33eb506c0ee8 SHA512 9abc7535a5cf8690f99b99e91e96f216551fa3cdbda337584e559833a3ba122ae65415cf7a3af30b0a7ab3f48db6d3f9687c2e5559998199b57bf1c79f1c49d9
-EBUILD hyperbole-1.22.ebuild 523 BLAKE2B ee8a5e1d518fd8124505a88f2f257b1ce75310da0a6f22d8c706e68996a348ade68b5b0195d256d7c561cd0e6c201df135f3e2871bf9dff19fce31326d2b9c53 SHA512 93ffce618f615c48487a280548bd1cb5f040797a566996f441140c7b05cecd74d81e68b0c8f1ebc841db1861e5cf377d0ed6944fa11b765c63478e2211bfd22f
+EBUILD hyperbole-1.22.ebuild 522 BLAKE2B 0384f1843b42885232391522de5723c32971bd5f6bb69b03832cf864d9fa6666c8c85b3be2ee4dffb52878c591d6e9d7ba4ace92b64fa32e2da6eb91a28732bc SHA512 bc96fda6b3be292530641d24f8ba8772968caa3f1239c8b21ed7719c3b06de325cf99ea8bc4ab70312765facade5d73d076eed299cc86ba216eb821fc5c28321
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/hyperbole/hyperbole-1.22.ebuild b/app-xemacs/hyperbole/hyperbole-1.22.ebuild
index 612cbe152214..8721caa27612 100644
--- a/app-xemacs/hyperbole/hyperbole-1.22.ebuild
+++ b/app-xemacs/hyperbole/hyperbole-1.22.ebuild
@@ -21,6 +21,6 @@ app-xemacs/sh-script
 app-xemacs/net-utils
 app-xemacs/ecrypto
 "
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/ibuffer/Manifest b/app-xemacs/ibuffer/Manifest
index 8b3be242b323..453a368c23ee 100644
--- a/app-xemacs/ibuffer/Manifest
+++ b/app-xemacs/ibuffer/Manifest
@@ -3,5 +3,5 @@ DIST ibuffer-1.10-pkg.tar.gz 87849 BLAKE2B 54e5b403d50691cc3a0989f1aad9c043d815a
 DIST ibuffer-1.12-pkg.tar.gz 87663 BLAKE2B 895d5622534c6e25f6f3a4e1ec352fe481d965514eb75d41200dcf72cc0506239785b1f2f1fd4ffc73bc4de70e7c031564849490042f9f589fd313d842c071a3 SHA512 3ae3f79cddcb2c45ec485d8e0debf8b835c64fa0b4f4fa06a98ae682153d5983fe156982c784d26188a47f9a89cc9a370b88ded703b9672bd8f76fba41c7d3c9
 EBUILD ibuffer-1.09.ebuild 305 BLAKE2B 3f7976a9174ed8f44e221acf252d53648724a3baa7224ae407d60678887936767b6f0850f59e13c436a3b5a28d2c494985cc229c1b40b04e4e8b28c24a03cbe1 SHA512 30849094610ace97ace1846593ca3474b069ca93af9bb7ab557847c970eb6fe3e34feaa4f04f136f7f81160c79466b8d6c8234b7a3c8b4233c58e926747c88a0
 EBUILD ibuffer-1.10.ebuild 305 BLAKE2B 3f7976a9174ed8f44e221acf252d53648724a3baa7224ae407d60678887936767b6f0850f59e13c436a3b5a28d2c494985cc229c1b40b04e4e8b28c24a03cbe1 SHA512 30849094610ace97ace1846593ca3474b069ca93af9bb7ab557847c970eb6fe3e34feaa4f04f136f7f81160c79466b8d6c8234b7a3c8b4233c58e926747c88a0
-EBUILD ibuffer-1.12.ebuild 307 BLAKE2B 1628c3c7bf21b127305ee9ae60f3fdc1dcbb9940e2285c8f893638e1dbb2d2ad6ff7812e542302cfaaaf1c5ee6ef9c4e2fdbdf104765a1f51288df52f16e1d57 SHA512 99c0114ef2799a077b4612fa6897e6f6eab036d5c3aeecd18948cb63b8a57630349f930da27e3bcacac05c06acf6ce1ff14a6ce9ebc9636c6412977a68efeae4
+EBUILD ibuffer-1.12.ebuild 306 BLAKE2B 5998c8033f22271dc2245420118472c040dbbee30a16677b1d47ac88ec7aaff96b841c09f21fff235a57dd104a472dad102d69943e447d3d269acd58307c70f7 SHA512 bd45cdb3ca11f7fd38ddfd19c5add7deed53974b37670f1f30df1c6c0bbaa4a1490105010c14ee6f55a281d6e5b8f1bdb1e07b6aac7583071d5cd330b98b6475
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/ibuffer/ibuffer-1.12.ebuild b/app-xemacs/ibuffer/ibuffer-1.12.ebuild
index 3861e51ad4e2..7efc6a98c730 100644
--- a/app-xemacs/ibuffer/ibuffer-1.12.ebuild
+++ b/app-xemacs/ibuffer/ibuffer-1.12.ebuild
@@ -9,6 +9,6 @@ XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 "
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/idlwave/Manifest b/app-xemacs/idlwave/Manifest
index e018861afbe8..717f2255aa54 100644
--- a/app-xemacs/idlwave/Manifest
+++ b/app-xemacs/idlwave/Manifest
@@ -1,5 +1,5 @@
 DIST idlwave-1.32-pkg.tar.gz 520863 BLAKE2B 1156dcb89c9900ade58f35de3fae1e6cad96fa7dcbfeda30a9097108614bb5d1f8e8e618112dd47320700d36165ee11abee86e41d8a0cf944a8c32c9c3f5904b SHA512 deebd2e3f49e8a0cf057735a6639f890da5282edbb67cc35bb653456d488e9d0c9f5c69a73a70023f276d7c8df974d9b9a3400c2a7ef1e0bbc4c07c416353995
 DIST idlwave-1.34-pkg.tar.gz 522052 BLAKE2B 3ceacc3d56ee54a678dbb4db84691eba451e382e1c0492efb13ad02a60efd9c046616dac8be838f82d4de2cb77dbba2ad1b9438af502d3133794f839bc1d9dce SHA512 ed4904fbd6f37dcce063c5507b2258d64e0909419ddf1f8dfa0b4526a99412a422b819560c502f92033071025d871b4f6f63ac18c7dce9970ad2fb54622d4bea
 EBUILD idlwave-1.32.ebuild 367 BLAKE2B 6600e69e872355459727faecc6deb2b1e5f963d06902c6eabd9d24fc3b04d284a718036069ee10caf18c3619c78acb5bb4acb34d897ea221f8c50aaf6051c52c SHA512 c0d78740b99435445102d796eeb49c537e3fa575e82c7a04e9650a2a2641609cc3d061d81f4f5667dbfc6880733ff87d7771d3822377fb34424d49e0f8038d95
-EBUILD idlwave-1.34.ebuild 369 BLAKE2B a8a6c18ca861217c5ad356a983c2cb02bb18ed87a153127bc21ca034f81527c10de0afeb09296951faba38f4a99fa428a2535c5cfaa67cc96701e410808eecf3 SHA512 fd654fedc274d1b05c5c095f5ee72647a8fd3d5f1268523285f666194e0682a6e08eef4648113a6bb6ac54cb702c72c9578ebd2594437a9d3066d127d4c70f74
+EBUILD idlwave-1.34.ebuild 368 BLAKE2B 5be3b0e10aa27a94f7c1d43d7554f57f126735bd6db409c8df70f4ffa92824bc28017d35b7795648eee6b4eeab02f7ea4955503af7848155822f6accf284adea SHA512 d76fa837de7e1a8d07ab8229b27e5590cb97cfbcaf22f0b6f8d7978547ad3510cd25cbdc1d3ac715c29a48cd945030e0ae4e9c3a6021a014f27eac03a05b9eb9
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/idlwave/idlwave-1.34.ebuild b/app-xemacs/idlwave/idlwave-1.34.ebuild
index db6d0f184554..19cd93ba36d3 100644
--- a/app-xemacs/idlwave/idlwave-1.34.ebuild
+++ b/app-xemacs/idlwave/idlwave-1.34.ebuild
@@ -11,6 +11,6 @@ RDEPEND="app-xemacs/fsf-compat
 app-xemacs/xemacs-base
 app-xemacs/mail-lib
 "
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/igrep/Manifest b/app-xemacs/igrep/Manifest
index b51d40b6ae98..87b00eefbd15 100644
--- a/app-xemacs/igrep/Manifest
+++ b/app-xemacs/igrep/Manifest
@@ -3,5 +3,5 @@ DIST igrep-1.16-pkg.tar.gz 21993 BLAKE2B 688a1dd31421a07558da5d567d31d2ba14bc847
 DIST igrep-1.18-pkg.tar.gz 22032 BLAKE2B 57d8cfec4b210e52368bc5879f015323ad494ec6503f8ecd568f0ac3e12c7cdda40c08e1fd63ab006570342cc629e527c906ecf274e441d72b7134bb20e32c32 SHA512 c2e4420b43c00f38a368016ec46c2f8d24580c7d2d36d269be942d81af07b8997d402185d08a81acd863fda0716b4c0ae17dde812ea440b06672885638ce6f2e
 EBUILD igrep-1.14.ebuild 328 BLAKE2B d1415e7ed5ef3611c1203f3d2acd513ed0957a8eaa4bacf69cc7872cb84572cedadc163e8a4bdaca06b8550f38976b5d63acdbe14a06eb4b9e52b86d870cfaf4 SHA512 c4fab805232e04b45435ab7cb89b006a5f5d83268c91df659234ecddc6bc3c54e5aff219588940ddf1136d0f701398c399fda995da4f992d9c602aba8e871678
 EBUILD igrep-1.16.ebuild 328 BLAKE2B d1415e7ed5ef3611c1203f3d2acd513ed0957a8eaa4bacf69cc7872cb84572cedadc163e8a4bdaca06b8550f38976b5d63acdbe14a06eb4b9e52b86d870cfaf4 SHA512 c4fab805232e04b45435ab7cb89b006a5f5d83268c91df659234ecddc6bc3c54e5aff219588940ddf1136d0f701398c399fda995da4f992d9c602aba8e871678
-EBUILD igrep-1.18.ebuild 330 BLAKE2B 35dfe8c0b9c847997aee12fb78075b0a6e7374dac322574aca7069c0f7f31c036d37c48f7de1a3ded255dfa9f07be859b7e9a0d74015b36200524cbce994d3f0 SHA512 aac8ca8bd1efd0f241427f673891564b11c56a2230e3d229d2936e7a48c192a110794ff9e2fde855abfe44f8226d77d29c2d0b86e33ac598cf3aa70635451420
+EBUILD igrep-1.18.ebuild 329 BLAKE2B 556b9b55e0e2f81cbe82d96a200b594c15d3bc49d42ecd9de73f7b266b75d21a66514193ab233b3e0a511d182765fc26f09cd3b0e6a765c1cf8aff4d10b52e1f SHA512 b3abff9221590fe16cd774bcfeb44b447c0e82dc5d393b4658935d906083a7b1963d5ff163c285b28aaf17bf546fd9fe36e8cf4022fbf87d5be10c00a8a43006
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/igrep/igrep-1.18.ebuild b/app-xemacs/igrep/igrep-1.18.ebuild
index 796a92305bef..9590bc2a8eb6 100644
--- a/app-xemacs/igrep/igrep-1.18.ebuild
+++ b/app-xemacs/igrep/igrep-1.18.ebuild
@@ -11,6 +11,6 @@ RDEPEND="app-xemacs/dired
 app-xemacs/xemacs-base
 app-xemacs/efs
 "
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/ilisp/Manifest b/app-xemacs/ilisp/Manifest
index 31e8c4cfb8e3..db5e6179876b 100644
--- a/app-xemacs/ilisp/Manifest
+++ b/app-xemacs/ilisp/Manifest
@@ -3,5 +3,5 @@ DIST ilisp-1.36-pkg.tar.gz 347911 BLAKE2B 4e8783055d06b4824c806c80d79dacb4bad806
 DIST ilisp-1.38-pkg.tar.gz 347693 BLAKE2B 41e83efd134dd013aed6da858db1df6276483f613e920127db9fd289ef3bb27e7d59a2e99ce39e4a6e57f9a76f12e178daa5787f133e2cd3de9a592444578d80 SHA512 157cdaf3a4bfec9602c8a63cf573a40d50d5d88d5c620e1f23e41ef7c272bbeaaf4937361ab412a4e79ad9d60fe0a2d8c99362d086e4ad7b60cf0c122f9b82e0
 EBUILD ilisp-1.34.ebuild 383 BLAKE2B da09175af93d253484b6a8ddce7d24b4dc031be3e835e676ea0df55d06d6d043f5d1213f3da587deddc8d8f2d76c0315760c1fd64861050ab8ccef7c56a077e7 SHA512 d125ed711d37d7cb56c7b27a3c387e8d29aefc8e580a879b45d035f91f0493d17356ff7505e9a5ea53e643b57d841a255e5c71e48a0aabdb46879893e4045ccc
 EBUILD ilisp-1.36.ebuild 383 BLAKE2B da09175af93d253484b6a8ddce7d24b4dc031be3e835e676ea0df55d06d6d043f5d1213f3da587deddc8d8f2d76c0315760c1fd64861050ab8ccef7c56a077e7 SHA512 d125ed711d37d7cb56c7b27a3c387e8d29aefc8e580a879b45d035f91f0493d17356ff7505e9a5ea53e643b57d841a255e5c71e48a0aabdb46879893e4045ccc
-EBUILD ilisp-1.38.ebuild 385 BLAKE2B 84bf154fecf992c5a00a2e51f0a371d82154e6edf63951b1e03ecb13936a1af2c35925384e2b2404ae62b16ce6a0f08e343b9a394a1b632a3cb650a4dd1838a9 SHA512 51733d85a02b1452c4cef94a75668d061095318ede32fec9c014ec33975ac0925bf2971f320fe8d5638fccf1180e4a9e1c2f4c69ce2be78ce6013081779fac82
+EBUILD ilisp-1.38.ebuild 384 BLAKE2B e6ff9a653368074dc78ad9d9555ee045934e001c4399299c6fcafc9411101650d7096b1447cf2d43a42b47abd15249052e068a8db9d0abcbf6ba63c1b20be50c SHA512 3ee6a4299a7f3359ca42256f65cffd2f849beb68c45656726cb7822bfcd49698961f5a33cc3b32103fe0af1d987b5061cb7071ca7e0ab1d464863169780c2a81
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/ilisp/ilisp-1.38.ebuild b/app-xemacs/ilisp/ilisp-1.38.ebuild
index d47230fe62dc..0c2d231cfd30 100644
--- a/app-xemacs/ilisp/ilisp-1.38.ebuild
+++ b/app-xemacs/ilisp/ilisp-1.38.ebuild
@@ -13,6 +13,6 @@ app-xemacs/fsf-compat
 app-xemacs/xemacs-eterm
 app-xemacs/sh-script
 "
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/jde/Manifest b/app-xemacs/jde/Manifest
index 4e589d8cde21..932f36a1dd47 100644
--- a/app-xemacs/jde/Manifest
+++ b/app-xemacs/jde/Manifest
@@ -3,5 +3,5 @@ DIST jde-1.52-pkg.tar.gz 3767445 BLAKE2B fddef76a453d594d896480089b45bb8472c7253
 DIST jde-1.54-pkg.tar.gz 3767364 BLAKE2B 1f4eaa30c72676aa71098780fdae0bd4a2bea0f24be1970a735875319faa32fe6a11ce4eaa306f3e185da2ebd4d270fdb9b2fc5681345380b541407162b982b1 SHA512 f35e8a13dc9c329f50ee3ec94551fee12317c8615e45c00b2699dd40a77f925268819c1d92223b0d2328f08e0bde537daf658f42922b7e1f23d6be670d96ded7
 EBUILD jde-1.51.ebuild 554 BLAKE2B 9db7ba09f5fc0cee20f736c5fed6ba355725642188d24a8bc995fdd3435da3e3089d8f63a8700d5fb253ae7f4a1d863034def37d3e0f86d2b75e05aa42ad3141 SHA512 8f15d2b66ecf31479091cbde1294530fba41ec7f9dda9ec9149f297499aaaacde39cf61a4a23c597476f70bf7b8e9be920a2ab32503ac0197deddc4ab87042ce
 EBUILD jde-1.52.ebuild 598 BLAKE2B 53cf0c7d90cfefab084869edf67a605e8ff6e8964d9ff85cfa7ddbb79c33dc679610cd5888ad7e41b6bf9ae39057f62452b1b8044ac73a011a430736a07f918b SHA512 484eab8b5aba4b467a8c512ce69352da3f34f5bf3703ad02bd6e90cd6ac4bd6d2da2a7093e02cf9d87472fa1cbc4bb31868217de25043eb6d69513f890d5a083
-EBUILD jde-1.54.ebuild 600 BLAKE2B 4dc0d288f6b5afefeea65069e3215f1f42d04d6b461074d1bb235360d28f0ba472d62ce4eb5e3b4421e97bb564b4778d4ae6d5d24278181cacb8caba9f3a817d SHA512 25c45dc41cc29ef116d09cc6406550dcb4999c23434a484d1343ceb3cd5c300f3b3a29214733c7d737c0d4cd9437d0885b56712942bf2e7dfc065f3281651dd5
+EBUILD jde-1.54.ebuild 599 BLAKE2B 75f0dc751188d9b5e0168113ccdeeeb9560e60fb0677fb19a1480e82223544dc7be66c4c6ba4b517feee067a124603de2324d81bb80fe75cf7755b8b4a5fe80f SHA512 b0d7150ccd20bcea05516715955b5542244a799af299193ce2abad08009791b3640c84d8aea99d9e93033eb2f8f56590af36f9a301e2db703f9d963b1ed6fb0e
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/jde/jde-1.54.ebuild b/app-xemacs/jde/jde-1.54.ebuild
index 6a1bb1d47b66..e408678a6a6c 100644
--- a/app-xemacs/jde/jde-1.54.ebuild
+++ b/app-xemacs/jde/jde-1.54.ebuild
@@ -23,6 +23,6 @@ app-xemacs/sh-script
 app-xemacs/fsf-compat
 app-xemacs/os-utils
 "
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/latin-euro-standards/Manifest b/app-xemacs/latin-euro-standards/Manifest
index b2400c88c428..647f096b3f5e 100644
--- a/app-xemacs/latin-euro-standards/Manifest
+++ b/app-xemacs/latin-euro-standards/Manifest
@@ -3,5 +3,5 @@ DIST latin-euro-standards-1.09-pkg.tar.gz 14360 BLAKE2B 00ce57c201c0e815f30eb284
 DIST latin-euro-standards-1.11-pkg.tar.gz 14443 BLAKE2B 19c7675b682ad3d68325eddd6f0ff9c831347ecb27e8db98c1deb55eef4f866d60369f433b2a8577297117d338c936f6938a451bf5fcf79d3914a5fb74acc8e5 SHA512 ab7f05609ead5176a9effcad7aad29cf5e86a7954c8dc64e99cc4901f8551262a7e770888dce3855ef66349b85980c29eda895e7a619ea87fa239dbd420e2695
 EBUILD latin-euro-standards-1.07.ebuild 332 BLAKE2B 84f5d202ba77612ef8c94bbbcf6c5c06207218b93e5842bcf87d471d2978796e07a4ed8f30df8c9f932d75c9b3e5f1b6e1b96922193987cbe1fed175f41bb825 SHA512 c83f14c7b7e5667b6a2937904e9acc2473eb5e2ce00300251b70771c237968f60b2f3ae74c88bf4e8153cf19da4993f00aabdb5a1f2b61a9d176ad28c2c5709a
 EBUILD latin-euro-standards-1.09.ebuild 332 BLAKE2B 84f5d202ba77612ef8c94bbbcf6c5c06207218b93e5842bcf87d471d2978796e07a4ed8f30df8c9f932d75c9b3e5f1b6e1b96922193987cbe1fed175f41bb825 SHA512 c83f14c7b7e5667b6a2937904e9acc2473eb5e2ce00300251b70771c237968f60b2f3ae74c88bf4e8153cf19da4993f00aabdb5a1f2b61a9d176ad28c2c5709a
-EBUILD latin-euro-standards-1.11.ebuild 334 BLAKE2B 44e5214a5cf8428f282fc8d0a5e82ba7e53c9d907434007720f479be54397145dad14ab07a9ba91301a5d79275ef196a257e04d0679ab9dcb16b9385a2ce93c0 SHA512 7bd6a3023ea9406f45904c93008bf845703371308aa4a8f07c68d8422b9f0d86622a2f6c3be87c0af8f680b2b2a4da642e330fb59f1efc4ab12725a7e2969038
+EBUILD latin-euro-standards-1.11.ebuild 333 BLAKE2B 3de9c475a75b49e507ff25c8afb5500bdb08d33c52608a00589f73647fb3361cc08fcb27910ed574a60cc85f0944c0dae10ab4e7c080a8bfad7d4eb2308f793c SHA512 8fbb5bc6dbfb7c77fb9366705695d24c3956e21f651329cfa5785ee8af493e9e59c7d7622bda69209a22195b9b6d89827d1a32f24d658bfbafb610c5e2eaa3a5
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/latin-euro-standards/latin-euro-standards-1.11.ebuild b/app-xemacs/latin-euro-standards/latin-euro-standards-1.11.ebuild
index 1a1ffdb04c83..13c4ad044502 100644
--- a/app-xemacs/latin-euro-standards/latin-euro-standards-1.11.ebuild
+++ b/app-xemacs/latin-euro-standards/latin-euro-standards-1.11.ebuild
@@ -9,6 +9,6 @@ XEMACS_PKG_CAT="mule"
 
 RDEPEND="app-xemacs/mule-base
 "
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/latin-unity/Manifest b/app-xemacs/latin-unity/Manifest
index dd893e3e8fbb..3da3ad69aaee 100644
--- a/app-xemacs/latin-unity/Manifest
+++ b/app-xemacs/latin-unity/Manifest
@@ -1,5 +1,5 @@
 DIST latin-unity-1.20-pkg.tar.gz 106399 BLAKE2B 3e5270865879a49f0ecd2eace7635df32219834240ed84e1a1953d2ad5c943fbff96b2e6efb3bd79ea1053adcd4a0daa1de9a62320eea313d43b1cbf0dd6e994 SHA512 9e2634c69ba1382113811e31b9bb2a4d3aa5780fb5d98b0bcb3e8c3ae813ff881ae13032318e14000f9ecb2c68d4490cb168ea8b10a373889962ba7c920569d1
 DIST latin-unity-1.23-pkg.tar.gz 106169 BLAKE2B 4b3e3a72a9589a0afd4f5c6c03af269599300f785ae4f7bcf35aac0fd7b24c0d191f225501468f90a5ca9d422b3453d289ef8306fee4e8e24a53f2190dca5a83 SHA512 5fd5b05f0528a83eda423233a6312f7b81f8b9d77987193d2425c9308dbcec391edccc8c16ec1de3d95cacaba809c3e8ba8f170d32c772225ffc780ee5389553
 EBUILD latin-unity-1.20.ebuild 429 BLAKE2B a65a1e7c7f27a5de4cb4380309dbe4d68023dabbb3a33ab015662198b2ab7e8e0d3fffda0345554cac9d0c34ed5115ab90fce9cb18ac50d7ca346086b99c57d6 SHA512 e60863ceb4ae8457331cca30bdfad2fcd76c74586a7cf1e37241a2469f44e8532b84bd7de4ddbf12ae73641a3dd8bae350334b5588ff42ca68b209432ce7bc6f
-EBUILD latin-unity-1.23.ebuild 431 BLAKE2B bd303424f8c2416253c615bbbf8e60a0040229e1a57313e2675d0676147ac00b64756afcd8ad7ff58ffc84e7b7054a9a3c76cee91adf0d79493e2386007d77ca SHA512 688fbaa1037ba8525972d62071e7a9b52eb2cd1b64009808c9ca761260a90825996372e2a772ea7cfecdcb34df49d1f26e0ad91d62dad3d98175c453debb86b3
+EBUILD latin-unity-1.23.ebuild 430 BLAKE2B 62dffd8056a8bc64cc3710268077a3988acdf37398ef1f016a2d3181fa649164d946b515342f680a205c0749ae5549e409aed072431bc8722a67ae69fba1fbc3 SHA512 cb5e8019d0ee7d74a405998e0c46e51c5fbfbf8ed748c49b2e9f30f5d87e7d94aca70a483f461384705f7788edfd484bd376dc0eff7460fa166f64a5bd4d11d1
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/latin-unity/latin-unity-1.23.ebuild b/app-xemacs/latin-unity/latin-unity-1.23.ebuild
index 7e58d2265941..55bc93ad716c 100644
--- a/app-xemacs/latin-unity/latin-unity-1.23.ebuild
+++ b/app-xemacs/latin-unity/latin-unity-1.23.ebuild
@@ -14,6 +14,6 @@ app-xemacs/leim
 app-xemacs/fsf-compat
 app-xemacs/dired
 "
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/leim/Manifest b/app-xemacs/leim/Manifest
index 1e5910a2bf86..ed754e57ea72 100644
--- a/app-xemacs/leim/Manifest
+++ b/app-xemacs/leim/Manifest
@@ -3,5 +3,5 @@ DIST leim-1.31-pkg.tar.gz 1804784 BLAKE2B e18e999335494795f1821e8a6d6e762c1a5db7
 DIST leim-1.39-pkg.tar.gz 1810480 BLAKE2B 1e8be69ef59a89a6498fb51cbf261cdde90c2bcbbb515831dfcb7ec487f3e14842ac8ce2b5949bbb5197632a7d52f69500fb0bc81bb5814ba4f35c693bf870e1 SHA512 d695f725733cb4455e75a4c9b511abdb6c78a9208f5b04dd5ec8641ee8f899a269b72ef8820f3dd780f71bec67979640fb3968f54f4c304b2decaa0e442f4197
 EBUILD leim-1.24.ebuild 371 BLAKE2B 935252ec222ad5b8886938e3370b6176746b52a1ae477e0d277b0841f5f78619ac42d8edc1f0c5481f40daff8ada714d3051916de263b8e1b7356dd8d7e746c8 SHA512 dec3bf581588f9b6165cb8e7d017cdb00c8e391523479b3b86fffeaf50e272cd2a889a72fa525b252b33421e5ce2c90e62a12938746b75136a84756b8a5066a8
 EBUILD leim-1.31.ebuild 403 BLAKE2B fb221bb173a7f7b9ee5bb61d4214ed35dd0447072b9183364ede7e7b3852bbb8a2e6823c3b75837cf421b6b3e90b5e07730972094ab5625eeac72b7abeed2ff6 SHA512 4ffbc77bda44e9fecd2bfcd881d98a8e29798c75f1edfd3180375441b83cd51678f12c2664c2d25f03c63ac13809a6ff4c746faeb9c6a34c9ef021fd0a6fe958
-EBUILD leim-1.39.ebuild 405 BLAKE2B 9c0edfad5146b22db341bf17cab8b66f82f9653f8c8ff327820a25870b0c83589eae84671f3d650df93f8d015f90f303d7e43261152355678ca1b4d07d3869e6 SHA512 144803f9fb15d9c64c24445ef9987860a5a1e081cbb9fb59266b1216978396b707941d7ab512cb9acbf36a3d7cbe6a5ed5fb87d3dcce52d5a241b693aff1f88b
+EBUILD leim-1.39.ebuild 404 BLAKE2B d431cd4666b8ade79a804b0993d35a9c72ed4ef7de059d91b6cedb6b0f1fc02376f7df49b4ad0edf7075491ce17ffd9e229b1d92f81ce7e8e8abf399d56b776c SHA512 adbf35f8fd2a782a238ef29538cfe9f00ca5811d3463393b3ab74c0bf0eee5a1ca8459b2a3a8d63cba5e3ec037df27b320a3da07521dc1f41c29cf62ad04ad05
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/leim/leim-1.39.ebuild b/app-xemacs/leim/leim-1.39.ebuild
index aae8e80bf9ae..787f571800c2 100644
--- a/app-xemacs/leim/leim-1.39.ebuild
+++ b/app-xemacs/leim/leim-1.39.ebuild
@@ -12,6 +12,6 @@ app-xemacs/fsf-compat
 app-xemacs/xemacs-base
 app-xemacs/latin-euro-standards
 "
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/locale/Manifest b/app-xemacs/locale/Manifest
index b186d4941273..19677cdf86b5 100644
--- a/app-xemacs/locale/Manifest
+++ b/app-xemacs/locale/Manifest
@@ -3,5 +3,5 @@ DIST locale-1.28-pkg.tar.gz 74931 BLAKE2B fa303cf6cacfada89cdc364fb9a6ab76b93b74
 DIST locale-1.30-pkg.tar.gz 74944 BLAKE2B 6a02a2a3f4d82509b05596ba0e19273994c0eb5adce028a812a2d6b82a716a19b0c21470c02f787b948c468ec37f0e4f3b363f9ae47741f9683d205aa2f3c5f7 SHA512 5e0bcef0b51cd10b69bf50589cb8bc85bfd0758b19ed2b63fb324ed867c2bdafa573e19a94916f6cd2025820fc71e806e12428039efa20c89ea9695011602251
 EBUILD locale-1.24.ebuild 316 BLAKE2B 3e3de5ff8d132f0b1f675e55e868731eb9d8a315b6faae3857e1f2fe8de4de702eb275cc7536e8d146d7b4284363ad133bdcfce622ee39477efcd526c35e9721 SHA512 d1b11430bc6977e58df971166bc1bf339ae40708c09d7cb2ada6fd52adfdddca53824bc5331a422a58a5b7b47fd03ae1b6267e798b74000b9817d94cf0051f86
 EBUILD locale-1.28.ebuild 316 BLAKE2B 3e3de5ff8d132f0b1f675e55e868731eb9d8a315b6faae3857e1f2fe8de4de702eb275cc7536e8d146d7b4284363ad133bdcfce622ee39477efcd526c35e9721 SHA512 d1b11430bc6977e58df971166bc1bf339ae40708c09d7cb2ada6fd52adfdddca53824bc5331a422a58a5b7b47fd03ae1b6267e798b74000b9817d94cf0051f86
-EBUILD locale-1.30.ebuild 318 BLAKE2B 78ff22240233a87cd70ed777eb6a0340f783936e12c01917f45d4970b91c32644c49db05fcc8f03af80bab73ee91713a28ef15913e8d5bba066c275ecbfe533c SHA512 3b5774302e7c66e5b8d531303dbf6d157c4f6e2b9d24121fcaa9ce1412a986ed033ffd7e697ca1702b83aaa782a1c36c6f7fe6f0681922106981a6e50004b7f5
+EBUILD locale-1.30.ebuild 317 BLAKE2B 7f06852b9ff0e9c5dece0d2de21232df177a8326b69edd96ab50282b78ce81b9f61652e96044b64495aca9b6fa9324a942096765ace3c0c4addbfa9fc765ef03 SHA512 4db4bcb976e1f290318dc0ed694dbb277f4caa41b2bcb8aa76387b4d619457e8351c806f04f2900cbf64ebb0ba9caf2ff44f3b08f471a662e9140a1643ad4faa
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/locale/locale-1.30.ebuild b/app-xemacs/locale/locale-1.30.ebuild
index bae27172946f..7826975d0457 100644
--- a/app-xemacs/locale/locale-1.30.ebuild
+++ b/app-xemacs/locale/locale-1.30.ebuild
@@ -9,6 +9,6 @@ XEMACS_PKG_CAT="mule"
 
 RDEPEND="app-xemacs/mule-base
 "
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/lookup/Manifest b/app-xemacs/lookup/Manifest
index 6511c2a4202f..a17f47b8f72c 100644
--- a/app-xemacs/lookup/Manifest
+++ b/app-xemacs/lookup/Manifest
@@ -1,5 +1,5 @@
 DIST lookup-1.15-pkg.tar.gz 225952 BLAKE2B 6894dabb547accf5732859a30d6589c3a283c2bd3e45eaa6b25831a997999a619754db7b2baee9c4b87a399e2d7d2dc73ba0245b4878d03d59f5a8f3155c18f0 SHA512 06d23009bb75475b7df36274ea67046938e328077185a9567a232f4b901f948fd4e36ec39fefacaaf4e1761d800e8803f9aa45dba93d00ccf71710673db28f01
 DIST lookup-1.17-pkg.tar.gz 226372 BLAKE2B 368f6b1cc4665cfa3cd47c8f207a71360380bd1e799f9167d74ef447a626e67a7a2887d80d7cf82c45e9fe8966d13123e921421bf69fbcad91f5203b99f7e59d SHA512 d3fe152db2e8acc81747c02264bca4c3a89cc5b3ad10779c4b7eac8eab1eff755a1c899ecdc4ed7eb6375f1fbba4ce469ce702108f39f8b492fc5b6841a2f604
 EBUILD lookup-1.15.ebuild 305 BLAKE2B b7caedc0da9d8adf0fcb1c6a21edde4e5d64e93ff130b8c5dbf97fd0e778ddec12b6224bcba6537d8778da8991ee988b0537fe17f329d44ecae7a047c05a4856 SHA512 58e7afe381c2fa9c3b002661158e5c81a37b7311c32260cce9659e9016167e77f390278f8db96bb0b89220f58c5d708694c1b583d31d0a90de2cfeea69a20af4
-EBUILD lookup-1.17.ebuild 307 BLAKE2B 0158ea5b354db74904674b49ccabe455b8fd84009221ee164c4264d78cf1b1ef7a07155a4ed03c1966f9834290e000a188559b452f301812ce80ab83e24d77e7 SHA512 cc81cd14c2f24a7176e17b5d504e94d3b76ddefe02f43c3b1d4eb675f3f46315d658cb581fed9ca43792fda215cbb9deca2bd4504fc6997326b4618e7ce1f1fc
+EBUILD lookup-1.17.ebuild 306 BLAKE2B 4a904bb7ed9959fee56fd6b45c9d9671baaf2be38306d81f43817f6278ef9cac85cef51c6194b28e91b67a653b9890f29fc741aba8daa95a5d47dc99a56dc11d SHA512 a325a0fd682ec719c27a168e96c6546e85fd12a7b0a5c943a74a98d6f74900e84594602252ca3780462577c01614e37646afb0786601c99f51051326150c496b
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/lookup/lookup-1.17.ebuild b/app-xemacs/lookup/lookup-1.17.ebuild
index c255ff1550b2..368930f056d7 100644
--- a/app-xemacs/lookup/lookup-1.17.ebuild
+++ b/app-xemacs/lookup/lookup-1.17.ebuild
@@ -10,6 +10,6 @@ XEMACS_PKG_CAT="mule"
 RDEPEND="app-xemacs/mule-base
 app-xemacs/cookie
 "
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/mail-lib/Manifest b/app-xemacs/mail-lib/Manifest
index 643efcb42bc1..a0174b2f42ac 100644
--- a/app-xemacs/mail-lib/Manifest
+++ b/app-xemacs/mail-lib/Manifest
@@ -1,5 +1,5 @@
 DIST mail-lib-1.83-pkg.tar.gz 211862 BLAKE2B d84e39e45b8193bbb05a6d724d6b8672aae2daf506fef5ae99a71c4d122834d5259e82e83e05aa5480c1327c523c19f58f70e921eb44a6a90f84ad4c3aac36d1 SHA512 09149c96e3716c2df054654a6111cd45f0bc86c47ea5a8c699e8c7822052c68885a01392e07611ad7b5f721679aa1a9c5da0694d1a0aef6af3a51b4290c31162
 DIST mail-lib-1.84-pkg.tar.gz 245832 BLAKE2B 500f1f63a23b200a3636792886ffb61e7dcb22c03f6a2237f3f5789cb1798eac5abb52f24b54f31e0678af375f6d569c675ceca3385cc502e5bc1014e758ea70 SHA512 43c43715b1950fb665feceacf8422e26e8a7739ce2491bb9fb80bbda27c70f9452a3c146de3c54ed14f38e6b56176610fc301bdeff4cdbc8de83828f96d87269
 EBUILD mail-lib-1.83.ebuild 433 BLAKE2B 0def14b49f44b85d5b256161ebe0f2eb9800655b935d79e6524b04703d7e1632a702a794fbc6687829ba76142266f22157b26f1187ab87a340c09ba2703c0819 SHA512 17e0c51e0e2b68d0aa75bf7335392ec989e570b4c07c9d5621a93ccaba192413ae9264496551a8839ece75ecc12aa952e94043df037bf9f6c0feb048d42b2ae9
-EBUILD mail-lib-1.84.ebuild 407 BLAKE2B 7d339e490a9a3a5ad29cd4512a18e36c212df5a08aef5adfc80deabc45ca88b8ab23a5452be9efc588865f1a319a2cae7c9691feee19d1d8697bd4af9d8e122e SHA512 c4fa7fccef5d851ce881b0f7168b1c0fd361a38941f081456c88a82fe69b20fdca3f76e88e65b3c795828398ed342973055d81dab15de3279320c1b1f7634b13
+EBUILD mail-lib-1.84.ebuild 406 BLAKE2B ff87df4bcb99991bb84d3ed5b0cce72722575adb9c51eae852524d4b30a7fe903b90b89699a5c34974acf924e02033aff7026f4df4c80907d814bfbfbcbf8185 SHA512 1c47488204b94956c9c2f1bd96d75de1600379e1e10ff62c681a2df795f3797483832db33e4a41fd895384bf76cfc903f656790a37566d3e19268a25c17fc154
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/mail-lib/mail-lib-1.84.ebuild b/app-xemacs/mail-lib/mail-lib-1.84.ebuild
index 051ef5c91e3b..70b15a9b0506 100644
--- a/app-xemacs/mail-lib/mail-lib-1.84.ebuild
+++ b/app-xemacs/mail-lib/mail-lib-1.84.ebuild
@@ -13,6 +13,6 @@ app-xemacs/fsf-compat
 app-xemacs/sh-script
 app-xemacs/ecrypto
 "
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/mailcrypt/Manifest b/app-xemacs/mailcrypt/Manifest
index c729aa6b8aab..81b7b932d7ad 100644
--- a/app-xemacs/mailcrypt/Manifest
+++ b/app-xemacs/mailcrypt/Manifest
@@ -1,5 +1,5 @@
 DIST mailcrypt-2.14-pkg.tar.gz 154180 BLAKE2B a5db41632b13930cadac65921026a5c5c2d393313d94c6c851e2691eb964eb6f70a25909f71dd7748f537f1dee037e6d3a45b9a7a7d031100e2018e9b2fd0759 SHA512 61e252f67f8848d54bd372341545d88d9f2150f671dd8cf371fa7650c9183eb7e4d8f3e661255110ae1a47df152060d81143f83a2f2fbc942aa6a83d36f09e9e
 DIST mailcrypt-2.16-pkg.tar.gz 154238 BLAKE2B 8d8837510d2b59ffaec0035f2d7bb124ee80d69c6b87c27a4ab5a36033560be685a90b6ef2acd0035d4b74e6ff3d1bb9aa9424e8ff5fc05908c3d39a8bc468e3 SHA512 93248f811bc40b42786021452406df113b5e872ad4e6a0fa72bc4055276a22e8a80439e01d3c2e51b506083193ee1031ee6ac1d11ddfb653d4fbb85d06c5c920
 EBUILD mailcrypt-2.14.ebuild 433 BLAKE2B 82af54a90bf6f7b049b4ab45c95cca132e41a933c67e431313139ce472196e845e75190dcd80b514876910b3e450e628772a375feca5987590dfd21e786c8ffd SHA512 dce3acb3daf5278f47248c34eb8c1abc9981f60276c055a0c3be73f807b576c65826b752d663dfc48ceca00e78c20048fcbfd5e5937b5ed5c14d6938806476d8
-EBUILD mailcrypt-2.16.ebuild 435 BLAKE2B bf3abe87bdc53d3a2791a52b1f079a041209b157ad6204fb528ba4774969654fa2dc87720b4f6b8c02b7ac6c2a206ce832afec9af4d36d1e81dda62aaf3db44f SHA512 98d776127b7b205254f1df8826ec1d31d6a1c73f237928936d52c1bf67f35a0ec02f5988c954d7ab66fadb53125ac9aa7ca5966cb51268b84688f006b3a44a15
+EBUILD mailcrypt-2.16.ebuild 434 BLAKE2B 2a7085c25fc5afd8ddd6fca1ee9c1f74816d15cae07ee0a2b7af93195b555e09818aee1cb17035da6b0059c24afd913c6cd830458ea4c0fd55937757dd0f1265 SHA512 0e3fce853319cbd3b2ea08a04058a15ca5a5aa00b70a53ed39b263a375aed6b4685c1647b4130d1bc082e75474d03b46f26ddd3c915b0399c7176038e507d2d5
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/mailcrypt/mailcrypt-2.16.ebuild b/app-xemacs/mailcrypt/mailcrypt-2.16.ebuild
index a4f888e43fe1..2fe0cd8c7bc5 100644
--- a/app-xemacs/mailcrypt/mailcrypt-2.16.ebuild
+++ b/app-xemacs/mailcrypt/mailcrypt-2.16.ebuild
@@ -16,6 +16,6 @@ app-xemacs/mh-e
 app-xemacs/rmail
 app-xemacs/vm
 "
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/mew/Manifest b/app-xemacs/mew/Manifest
index 3cc143696165..3402ee1d94b1 100644
--- a/app-xemacs/mew/Manifest
+++ b/app-xemacs/mew/Manifest
@@ -1,5 +1,5 @@
 DIST mew-1.19-pkg.tar.gz 745714 BLAKE2B b2f4a6889cb1e9aed82ce7a75c6861fe4e07a924f3adf32c9592800b6ba03f9960d65da579be2e5ed8343d2d70928336720d2f8f3578752df4cb9504a1231374 SHA512 9168cae8ad96d1050eecfffa46b4c15d65fef1908407f339757a5c9af21d2ef7b53a74cc6b805f0e6bed264fbcce81656117c44382b5884c2f772503cb5f1180
 DIST mew-1.22-pkg.tar.gz 745952 BLAKE2B 565409c958817abdef57bd6a1dc51efeaee2278699edfc2b60a751ce080742aaff1aaea310e61bcf1dc5b974cfb48e7cc6a111d26f025a8c7b45d649fa823a4c SHA512 84d87a78dac1ab0cae7cec9c93b4d64676298d9dbbfe20fa04fa052c132b1a0032e7422451f898cb7d11902e5680f520f0d7cf201ec7ab130c03d0e1b6f97b7e
 EBUILD mew-1.19.ebuild 367 BLAKE2B aade4c862b37c1f8ea44124bd2cec853d505b4e9d545c39967e17863a517de436086815168573d88cb6469c9ddb87a890765415799cd24b738b55e9132db01de SHA512 896042b88e4ff26008db92a281d0876ad20d4cd51f5a9fcbfa9d314e463bae0908b9f3e845e42b9fd3e9e126b2e013210fd78883f25d1e98bc9b14e932e4b17f
-EBUILD mew-1.22.ebuild 369 BLAKE2B c22951e0e610105b5433e17ba37512e514869bf79291f25e7e60a240101ca79fd5e52838e0f503800d24d5853c68298fba41744262e00f77ed6f8151071dbd0c SHA512 d1a65347c2b3c2e640a0848ceb8cd5bff5c699a1f88f1f0dcaaa0da667a4eececebcced88cd9d9a25d0f9713fa0846b483e593f126ddce1660ea2e14933f7070
+EBUILD mew-1.22.ebuild 368 BLAKE2B 9fc98e7d943a0f2ec8c2f088d56e38cecb5cac0782431c1639e4e59b45b588bdbd7a63294b2c050cdbaabebc0eada8b4db50884e8c1a342c0d30516087b33448 SHA512 c6c6c16579d0816883a156580db10f944151c83b8c208e30ba6caaab26f3dd43f8e48305c52bdca4ff768e27870b8a9acc2c80c53883b457fdb54013b2cd7f5b
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/mew/mew-1.22.ebuild b/app-xemacs/mew/mew-1.22.ebuild
index e0a7e82cfd58..8bc6a4ed7469 100644
--- a/app-xemacs/mew/mew-1.22.ebuild
+++ b/app-xemacs/mew/mew-1.22.ebuild
@@ -13,6 +13,6 @@ app-xemacs/mail-lib
 app-xemacs/xemacs-base
 app-xemacs/fsf-compat
 "
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/mh-e/Manifest b/app-xemacs/mh-e/Manifest
index 970a08a9ad44..2afcdb3041d1 100644
--- a/app-xemacs/mh-e/Manifest
+++ b/app-xemacs/mh-e/Manifest
@@ -3,5 +3,5 @@ DIST mh-e-1.32-pkg.tar.gz 580383 BLAKE2B 596c7111ae90fc19c00a30e7291a364e7695f68
 DIST mh-e-1.35-pkg.tar.gz 580631 BLAKE2B 7695d790f5ddf924e323270525b2d357f731a7589c0276c1121fc6ac1c2657bf45c86b7cc4e143b1aebc3f20147998d8e5f238a014a35e7d6566b3f45c1a3d37 SHA512 183d710cb725da65c40810833782bbf32f6f1815896261a4a4bd077a7fbb8fd260f38fd6eefc6e84ab46d98219c0214c8b43af36680f7940fb27f59e461de508
 EBUILD mh-e-1.29.ebuild 547 BLAKE2B 69de56b5e084fad9945de6a755c2b61dd42d5c34cf04a08649404f5e8a409c083d14242de46f7435aa0ec368bd7bb2b0e3c2a5465bb325aa4220415748454d83 SHA512 26f0e197a3b3eb5ef7ae8871d2a6633901bde888dc1b91482b8d6419592d02c611bf81945b2feabade17fd85569e8cb418424255736e2e871ef1957ff3d53e85
 EBUILD mh-e-1.32.ebuild 571 BLAKE2B 5a761d3ab3125b1292f4a18efec826cae640d6b80c4257dee0f4598c57bd98810dcd5e04dc330f264562f2c8a8008f78f318eefaffba3f892346cae346e2fa8c SHA512 3972481a9db695cff16abc41478eb994ac2823b75ea7a80e769ea622e91bda482a030e8169c2b8e52c3679646e95af47868c734af887a4acef6d7b36fdad85b6
-EBUILD mh-e-1.35.ebuild 573 BLAKE2B e5649a65cf1a3cb2a65274a1d05582be6a70105e9b443ff57343209b379727a179c40a15d05336aa6e8c810e9e8a112ff1811b320cf682f480e9eb18df9c136a SHA512 4a3209a92b10fbebf139a6880155c1e39ee8e91ede124255d993cf54c6d224f95bfe8c745c7b878ba4ba881e617ae826675b9e39f7f601f663e942450f50faaf
+EBUILD mh-e-1.35.ebuild 572 BLAKE2B 4bcb22e968bcd8d826c7091e6228cb10d04c83c72c810ac64f77d11ea2916e52a2413cefb8ce2aaf1637f13ed452b8c4b19dbb0f95983c98a027f807bff2a51c SHA512 b67fe6ec8a2abbc16f23b83590a2cf332f05f7125c2e9ac9d5fe0f7421d8544fa8a021f229a4ce63db584e5d31d34a9e9ef915ab00c4cbc7ab10da0454008df3
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/mh-e/mh-e-1.35.ebuild b/app-xemacs/mh-e/mh-e-1.35.ebuild
index 3ad785d5d825..92ae76075a0a 100644
--- a/app-xemacs/mh-e/mh-e-1.35.ebuild
+++ b/app-xemacs/mh-e/mh-e-1.35.ebuild
@@ -23,6 +23,6 @@ app-xemacs/ecrypto
 app-xemacs/cedet-common
 app-xemacs/speedbar
 "
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/mine/Manifest b/app-xemacs/mine/Manifest
index 43d674bec85b..ebba1c410ba6 100644
--- a/app-xemacs/mine/Manifest
+++ b/app-xemacs/mine/Manifest
@@ -1,5 +1,5 @@
 DIST mine-1.16-pkg.tar.gz 67161 BLAKE2B f25b20f0e9f956c8dc31f26395435ec5d0f6f6d38e1becd4618f5a210fd4b11f2888e05ff35452b68d809770a63678ed2c419762d89f7c837be2219de71b4dd9 SHA512 5d319b2ac1e2b5a8cdc753cafe8bd2af54a44aa97443eb0c34ea5f58e3c173801e83bf6b22cbb3b5f1fcbb0e6894586a03085eac81f6d9d43236b70134b35a84
 DIST mine-1.18-pkg.tar.gz 67077 BLAKE2B e434a63c837d53a74c7dd7176fc5b7a32fcdbb337d6896141c6e99058dd83c8ac46da3aedb3946d7f20718f3a08f183bc9817ccfb69d89b966b67a8118851194 SHA512 04bdcbd98716849e4a7bef5590375a245842cd397aae2ea188bca82cbf8bd45d13f120b1a54fdeda69ec7a6847dee1e1a8b1dcd6fa9d05136786c77a1932f2e2
 EBUILD mine-1.16.ebuild 282 BLAKE2B 967dcf0c1861722391c5889c1138a6340fb0d5a98b75b59f695e411e368bf768bb62e512a7335328156dc898c58c794f067b73c0843e5522a8d8475726c16aa4 SHA512 ffb6f1003d3e42beb0f768bcb738333631f114de72fdbac405b55e392b6688ddd72cbdbc9bddf784351c2e670dda6066e619534bd7f87664904522897bf944d5
-EBUILD mine-1.18.ebuild 284 BLAKE2B acb647009134ea701eede93d92683f36eafad00fae8086031cdb8916abe5b7d16ec29492cd80cd5c6d53cf122fd087023682d6b5474aea15caa7ce9530c28fd5 SHA512 5a227996b3db35d15d47085af73f8316c76db26ed19e4928ea30bf9e762508938b1ff73d1fa6e2e42da6a46dd4c4d26fc148d6dd345cc378048bc01c6f1b845d
+EBUILD mine-1.18.ebuild 283 BLAKE2B 28f98c7f29884790b827e73d328f6a585ac8328eca6c50b95212a5b3f1025027e7bbcbdd883ff51864b2fdfa1cb471b059f377867f22f4c5af3a49acc21d225d SHA512 8ea65bd7c36a465d64a783a18006cc8a77113340d149dce4a3a2e022f77129c2ecc1aa19e57a171eabb40974527aa74eab1cd737628d6fbc263d3b826334fb98
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/mine/mine-1.18.ebuild b/app-xemacs/mine/mine-1.18.ebuild
index 08ff0b37ae47..3d269e068cdd 100644
--- a/app-xemacs/mine/mine-1.18.ebuild
+++ b/app-xemacs/mine/mine-1.18.ebuild
@@ -9,6 +9,6 @@ XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 "
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/misc-games/Manifest b/app-xemacs/misc-games/Manifest
index 8cbd285dad92..0502a3b893cd 100644
--- a/app-xemacs/misc-games/Manifest
+++ b/app-xemacs/misc-games/Manifest
@@ -3,5 +3,5 @@ DIST misc-games-1.22-pkg.tar.gz 170609 BLAKE2B 336bc894d513b9750be7ff26ba6139a0c
 DIST misc-games-1.25-pkg.tar.gz 170962 BLAKE2B 52ed8c629d0cca552d9a41f3ee122bcc206a693f9a1f57480e9c3bddebc4de1844e497f07be699d4074c1957285bc23416a7719cf8495b85c5a9d6fd3a93460f SHA512 168f0bb82cd1e6a37ba852930a1efe00000f46f91c2545c3c88cf639c2b7d60be1c572f3698bf2a0f1dbb5f04934fe38c27a0fef9f63b0568e484770e202316b
 EBUILD misc-games-1.19.ebuild 300 BLAKE2B fe9b575c4c686ab76f48360b9feffe2fde6f08b620ef62eb91e01fd8ec70752c48720b7e7a2b9ea121d4e17d6ac37ca927989a057d65c1363e151cdad0a2f591 SHA512 f1461522342a03cd2a94150810f6beeb6b6bdec8235910443e1c50a4e3ed9b1ad677bc958d0d05c6c3b6c90fd84df9cfe33c625404b64320695c7b7df69348ff
 EBUILD misc-games-1.22.ebuild 300 BLAKE2B fe9b575c4c686ab76f48360b9feffe2fde6f08b620ef62eb91e01fd8ec70752c48720b7e7a2b9ea121d4e17d6ac37ca927989a057d65c1363e151cdad0a2f591 SHA512 f1461522342a03cd2a94150810f6beeb6b6bdec8235910443e1c50a4e3ed9b1ad677bc958d0d05c6c3b6c90fd84df9cfe33c625404b64320695c7b7df69348ff
-EBUILD misc-games-1.25.ebuild 302 BLAKE2B b6cfb771d7e1b61432023c00481db990fd069ba22a8cfb0736f934401c8f3890718751eaaa40485177e33a9506bec0291e23b5b94d653bdd9be75a603addc56e SHA512 67a7d68d9886783b1aa49e49493de5e636de57bf2e30b8dda10279909e861944e49b80cf3024f6dfe4a45c18650af80c0f9380764b251e12463d6470d4006975
+EBUILD misc-games-1.25.ebuild 301 BLAKE2B 2963420525a46946615a97a6e543bcfb3182b2591650599b11ba776cecc67230b3dc434c54c4f9aae1ce92342d6a644fd8021d83fae97bcd579d048fd3520e6f SHA512 eba708c71bc5ac487d422648d508bf7a07bb18c93dc337c44fc2376f0c5f0eef330b4ea581742245b359ddd3b832b3aea64555c1276559c701be8f133e90de5d
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/misc-games/misc-games-1.25.ebuild b/app-xemacs/misc-games/misc-games-1.25.ebuild
index 136977649704..5a14e7b01bae 100644
--- a/app-xemacs/misc-games/misc-games-1.25.ebuild
+++ b/app-xemacs/misc-games/misc-games-1.25.ebuild
@@ -9,6 +9,6 @@ XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 "
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/mmm-mode/Manifest b/app-xemacs/mmm-mode/Manifest
index 5479537bc355..cbc5d3fe4eac 100644
--- a/app-xemacs/mmm-mode/Manifest
+++ b/app-xemacs/mmm-mode/Manifest
@@ -3,5 +3,5 @@ DIST mmm-mode-1.05-pkg.tar.gz 205381 BLAKE2B 532d29da7ec761e1c79d0b5e77c7f95694f
 DIST mmm-mode-1.08-pkg.tar.gz 205604 BLAKE2B afb2b9c3f43fd3256ca2de0c32d3356a206a6f883303698cad719f8fd287366ce2fd91a275922fcd6d61e31cccba93b0f0c836a3ff468ca2e28aa2e18ad45e7f SHA512 d26b2d4762e363d34a0fdac19841640351532f3c28772eefa7dda3a24decfa8035f7e156fa3c8c49ede54291a4bda31ee707467757c704a76803718e7d463853
 EBUILD mmm-mode-1.02.ebuild 330 BLAKE2B df0c0818cad922be1e926bd3eeffae9fc1e92c40f2a7a50c965ddf1cbb715b426adbdbc86ead7248a2c4e1a7cbe9fb35605bb0f901194872f1ece2f64e930edb SHA512 156aaa9be31317d78c7fc7e21d18f0f490ab6b135067f475439344222fa3a59ac4c3858124b94e6c697baca92cb812dd63fdf461c66ebe5cdd6f5d7d70fe9f02
 EBUILD mmm-mode-1.05.ebuild 330 BLAKE2B df0c0818cad922be1e926bd3eeffae9fc1e92c40f2a7a50c965ddf1cbb715b426adbdbc86ead7248a2c4e1a7cbe9fb35605bb0f901194872f1ece2f64e930edb SHA512 156aaa9be31317d78c7fc7e21d18f0f490ab6b135067f475439344222fa3a59ac4c3858124b94e6c697baca92cb812dd63fdf461c66ebe5cdd6f5d7d70fe9f02
-EBUILD mmm-mode-1.08.ebuild 332 BLAKE2B 438d63c2f15613bfefd81aad13033b0ca6719555cd03d6e85e048227a9f82f55efd3d0f18e5c8d053ab8f7d8d0531734fee3ebcd8012ceb2f72051d1c30b82bf SHA512 98729b5d776a93f03e18ae32ffffad334900a1c3c34340d1d55e634dadbdc080b815d917baeb1ab8a1fd0372fe4fb1f30ef4caf4c831e8e7af394282a9804f0e
+EBUILD mmm-mode-1.08.ebuild 331 BLAKE2B a3f1adce68141e7216442dd37f0270346e55af5d4eace1e80c349a6976ee3175a4e98b7d421be0a970756c96f1f0a29072eee8e8bdc849a935f96d28a8035b77 SHA512 84f7d8cba8e622d9425fc3d06cddf9499782387e4df8a599d95036b5de4c5aa3442f5353c1243f46c7ed1d67b53ce4c4cb11e2ad364dc9e11897940699fa7d62
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/mmm-mode/mmm-mode-1.08.ebuild b/app-xemacs/mmm-mode/mmm-mode-1.08.ebuild
index b0742a7baeab..cb93feb0262c 100644
--- a/app-xemacs/mmm-mode/mmm-mode-1.08.ebuild
+++ b/app-xemacs/mmm-mode/mmm-mode-1.08.ebuild
@@ -10,6 +10,6 @@ XEMACS_PKG_CAT="standard"
 RDEPEND="app-xemacs/xemacs-base
 app-xemacs/fsf-compat
 "
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/mule-base/Manifest b/app-xemacs/mule-base/Manifest
index 58fb3fce636c..2c3c8b981c69 100644
--- a/app-xemacs/mule-base/Manifest
+++ b/app-xemacs/mule-base/Manifest
@@ -3,5 +3,5 @@ DIST mule-base-1.56-pkg.tar.gz 445956 BLAKE2B 2d016323649ea702b7826091ed4af3513e
 DIST mule-base-1.60-pkg.tar.gz 430782 BLAKE2B 0dbc7905c4a294a56bb663ba368ca2bd27e5d052f712c7a5ebebd94d11ac14b2c983abdbf871c04cb14f544d299a9b2570191a17fed7b95f62d38060644c6df3 SHA512 02517a71b5b81c91b6d7e96536e05d42135d67d1168220828a9af5de9f6ff021b1397722d5f437411de258e82809f1c2f33fa524ddf73193171ed7d0ba80e65f
 EBUILD mule-base-1.49-r1.ebuild 365 BLAKE2B 47ec7ff233c20eb12895f03fe5ecbc8a7e5ec4a1a9a59cbe7f8981e79d4ad788a05d0daff60c5276f1ebc49e2c4051696ac617894f386ef199dec03816fae276 SHA512 2b68a7ff6d556c99ccaf3b98cd9f47488c9fbb30e383c2a8a31984aa6db776506d14effdda7002e804cb53a7c133a37125a8a5b6916ffb409835ed6034155996
 EBUILD mule-base-1.56.ebuild 384 BLAKE2B ff76bce98dba48c97c0d3058ad79556a3b70f91cd0fdc0e99115ef0efccf3c96772bfba039414db3d39c811ade905fe3d2bfc0a81550d7916423def99f1aba11 SHA512 57650e041aaa8d337193a779481ca00963a2d1839aa244f2d0eab9c485bbe4f0a2708b943717e310498292521ff130d336dc38db8c18f2837c516f2e65ce2235
-EBUILD mule-base-1.60.ebuild 387 BLAKE2B f0a0334499ee462e125dd5ba114555fab737530f099eec97f8f67ae18ca6ed8b66a3adc5a60dfc84f51d2f9fddd9234053de34e09ce441c06203f6ac2155430f SHA512 68bccf8763b0bbea1579552dc676d644b68a0c3c03696937f94991488b71197ecad545d5b72ea4ccb73cd3ce86a0e3f984ffcbee48a356fc4e8032f65acfd19e
+EBUILD mule-base-1.60.ebuild 386 BLAKE2B c652ac3c70f9f34a7c284a6610a4bec12b624aec5cc3aaac3e30cfcac276abbd58fcfc78ca1f31ab3dc05bf9d589d782db853d8f64f708dc1b1a82f277a07073 SHA512 09524e7de649f96adb794b501d928317b304bdeb39ce535f4289a97b512042ebd16f6dee430496a7d77737ad7dfb0c752694518246133229f11499374d81f5b3
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/mule-base/mule-base-1.60.ebuild b/app-xemacs/mule-base/mule-base-1.60.ebuild
index 12d97c3bb7e4..2c942cb59b4a 100644
--- a/app-xemacs/mule-base/mule-base-1.60.ebuild
+++ b/app-xemacs/mule-base/mule-base-1.60.ebuild
@@ -11,6 +11,6 @@ RDEPEND="app-xemacs/fsf-compat
 app-xemacs/xemacs-base
 app-xemacs/apel
 "
-KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
 
 inherit xemacs-packages
diff --git a/app-xemacs/mule-ucs/Manifest b/app-xemacs/mule-ucs/Manifest
index a348d97c0058..84c169f5ba31 100644
--- a/app-xemacs/mule-ucs/Manifest
+++ b/app-xemacs/mule-ucs/Manifest
@@ -3,5 +3,5 @@ DIST mule-ucs-1.18-pkg.tar.gz 1301082 BLAKE2B 57cb01431e8210d4ace63150b260600c14
 DIST mule-ucs-1.21-pkg.tar.gz 1300901 BLAKE2B 6d68a19b13e5b9d72101849080e4bbed932bad2d8399a5e7c8cd9217ec06ef15711f69d243bd8ed94aa7ffec74c84a22c85b743025f65bc2797be2d079062897 SHA512 8bfc6aaf064355c22b6d9e2b9d62e95faf31571fd99b7d4a7fd28b69bd99b87fa6e76ac9833712c5593dbbaf1981083e545f24e1cc704568ac6a6078fc88d677
 EBUILD mule-ucs-1.14.ebuild 355 BLAKE2B c7968bd3fa66cff036951c565393d4897b8757512a26c82c38bef7cb6d6e13f057024cfb0ebaf5b39d06b93f3207dfde1db29493d21e2d39b9ddae95a4094f27 SHA512 1fe7754b528250fa45ff60685234f050f9f793b8bcae4aeec7f63352c941f55df61f4c04c29f617e4a4c20770d31677fa5fce37008eadaab6448777975611b1a
 EBUILD mule-ucs-1.18.ebuild 355 BLAKE2B c7968bd3fa66cff036951c565393d4897b8757512a26c82c38bef7cb6d6e13f057024cfb0ebaf5b39d06b93f3207dfde1db29493d21e2d39b9ddae95a4094f27 SHA512 1fe7754b528250fa45ff60685234f050f9f793b8bcae4aeec7f63352c941f55df61f4c04c29f617e4a4c20770d31677fa5fce37008eadaab6448777975611b1a
-EBUILD mule-ucs-1.21.ebuild 357 BLAKE2B cc32de90759342bf338c61bd9af390312911af599abf76b61434f292befcd1d57d92a56223ccb6f1b106ad43bc19793060d733693700048b98efa179248d1b82 SHA512 6cd8651330fb7dc391e58d64204950ac499c1af2fbdd76ad3292acd4633626dc5b5090822b4076f4924bb3af04bea641b6fe0d727ea05b0e9b75cf8fa64d1ea6
+EBUILD mule-ucs-1.21.ebuild 356 BLAKE2B 5d35b7b571ec4d2af3593278b8352df15bf5b54d07f524fe358db5c64bd5d981de199b5ba20a08a3be46a84fdacc69b591b8ce5cc069a64c3e3f29edca5b045d SHA512 7c3b2041c85e364afd833a43b37e76e01625e759dcb4d359a6e11ae6a27cda906d736c6e38c4477a656aac0d511ac4f3a41cf5b28f8601e7294ff8217cd754ea
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/mule-ucs/mule-ucs-1.21.ebuild b/app-xemacs/mule-ucs/mule-ucs-1.21.ebuild
index 4177cbde12b9..a1cbba6b5ab5 100644
--- a/app-xemacs/mule-ucs/mule-ucs-1.21.ebuild
+++ b/app-xemacs/mule-ucs/mule-ucs-1.21.ebuild
@@ -10,6 +10,6 @@ XEMACS_PKG_CAT="mule"
 RDEPEND="app-xemacs/mule-base
 app-xemacs/latin-euro-standards
 "
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/net-utils/Manifest b/app-xemacs/net-utils/Manifest
index da9c58f24045..06788f3ba758 100644
--- a/app-xemacs/net-utils/Manifest
+++ b/app-xemacs/net-utils/Manifest
@@ -3,5 +3,5 @@ DIST net-utils-1.56-pkg.tar.gz 157356 BLAKE2B ace09a691e7722872deb666cc5c360ca78
 DIST net-utils-1.61-pkg.tar.gz 159809 BLAKE2B 60e89819bad3e1a9359457df2df5a96140e5ce1a09d7419daba5077d92bbfd7741436d2e3927a95e066ec032f1cca35e3e5acf38879b6da041ce248448ee0754 SHA512 37ba2c2273994da03b09bace22b5babdafa4fb61e09b1277ac06f68a406110d440f452a120ef0b675574f443904f243dbe7bdd4bca38a29525b5cf8ad6a91c69
 EBUILD net-utils-1.52.ebuild 370 BLAKE2B 70c4fd8e27740c4ca241293df98f548b02ad29993aafe0d6c3f3deb55e854cbe53999aaaee132c81b257afd86bb8182466b6d86a4825049b2161719203c55ec7 SHA512 0dbd4112ce8dc2cd933b9ad8f16dfabb75291c6dc36b6ac95191e62c87832c8161487027fc9eb8c8e1e53dbed0fa73883065b8730e1b8e87372e974bb3a43273
 EBUILD net-utils-1.56.ebuild 370 BLAKE2B 70c4fd8e27740c4ca241293df98f548b02ad29993aafe0d6c3f3deb55e854cbe53999aaaee132c81b257afd86bb8182466b6d86a4825049b2161719203c55ec7 SHA512 0dbd4112ce8dc2cd933b9ad8f16dfabb75291c6dc36b6ac95191e62c87832c8161487027fc9eb8c8e1e53dbed0fa73883065b8730e1b8e87372e974bb3a43273
-EBUILD net-utils-1.61.ebuild 372 BLAKE2B 9a4159c9639f69f9a713b1746c60573b206cce1f1297674471919ac28da20100f16cbc2eeff59b5c8f1c5561bd938f7d9e8d7c2173b9d8ca8ecfc80288b14c93 SHA512 1d58386c390a5838e696e7aac5a8f3dfd2315dcd6cdb4bc73c889b921ac4106ecf409f11509af56661d97981d051b2f9057f3277fd4b46273899c76b43872a7f
+EBUILD net-utils-1.61.ebuild 371 BLAKE2B e490fabccec679f2006955c14bf94e3072aff6c9a33d1904d651fcf5e84d8f9b2d4d5ed1452122d0d3bb0c2e28189d85a4f6d1a3072e16648b33ad08d8204554 SHA512 6344d590946b05949da1c3d15577701c6af19d720c7389f8c10bf5f78cb1c582cb3aa61477d4754465066593b395b0e65f58e6d84247d835fa11f8cea3766f4c
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/net-utils/net-utils-1.61.ebuild b/app-xemacs/net-utils/net-utils-1.61.ebuild
index b92c31cfd9ae..29a5258b54a2 100644
--- a/app-xemacs/net-utils/net-utils-1.61.ebuild
+++ b/app-xemacs/net-utils/net-utils-1.61.ebuild
@@ -13,6 +13,6 @@ app-xemacs/bbdb
 app-xemacs/xemacs-base
 app-xemacs/efs
 "
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/ocaml/Manifest b/app-xemacs/ocaml/Manifest
index d2a71ad89fe2..abe743fcd1c5 100644
--- a/app-xemacs/ocaml/Manifest
+++ b/app-xemacs/ocaml/Manifest
@@ -1,5 +1,5 @@
 DIST ocaml-0.06-pkg.tar.gz 65300 BLAKE2B 74e672bbc94e735faf9fdae81f9a961f4b6f0b9f35b008ffc70ef978bc2b269215a1d7ab51fb585fd49281628c3bc85d362d3de60abb3fb8557a78a249ee89c7 SHA512 ab21c0c4bc6cf204c4e2b9b9e1d153a4ddc2de941032946fb460e480d7396c17c563b2234ebd5aec0ff1e833ec578470366204b959f621e1da1d0cace2eea7f2
 DIST ocaml-0.10-pkg.tar.gz 65370 BLAKE2B a33a6ce62d26f81ad5c742410bcc94ec6ad5f7948fd47cf765b48ddd6ad3f7ae5829083217f9fefd464343be7a38fbb4ea814b23ffdeaa97c86576472d390521 SHA512 8da59f782ac2d713b63912d33f26d17921112e8d79fd101e59a20712cdf5250c290472671d9c96c3fce750058cc195773900991a26690de0df6d4fef6263d47d
 EBUILD ocaml-0.06.ebuild 345 BLAKE2B 3b7fc238c0c74cd8343939149652770157e4a889d346d8a84648f4fce72d38424e77e8e883aab7a453b30bb1e37e33edb2194f7780ab507d4cfb3f7c929befdb SHA512 8424ad9fb150522940328ff22f8433f4ad7387c4f7f2e279e50681232e6428976796eb809e287893b12f9ded88f8ccf0c2e01827f857baa216171d636d07e0e1
-EBUILD ocaml-0.10.ebuild 348 BLAKE2B 1f3fb59db4a2c71c5f9804a18fa5048332eac5986cb443b5a039feef3236ee6a205ccf7cff8f95b48dc89389ca99d1c4c1a945b0f0041d981538596d089acd57 SHA512 c14abdf319583e228b64250d6ffe60170b290417cee0a57260543d29afd60d450c9c63afb62f72dcbdbbb9bc5ee4eca045a4a8a890ce9e72746a2b190469e089
+EBUILD ocaml-0.10.ebuild 347 BLAKE2B d767325e75676eeac2e29d92dfb2883487c32ede425c8b6dc668e9dbbc4d3e4148f434403e2c3ba4770bc675c3f7132d9446e99d239821dc6f926b361663a7a6 SHA512 800d826926f56d3bd3953d4da9fd41faf2020ee975727a994fd19b04bf2efa763cd27fc7b92b321105adf0e95cce3ed1ceafd04c95e6f7ccb737325e1513e95e
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/ocaml/ocaml-0.10.ebuild b/app-xemacs/ocaml/ocaml-0.10.ebuild
index 8d628ad51ded..b6e233d263db 100644
--- a/app-xemacs/ocaml/ocaml-0.10.ebuild
+++ b/app-xemacs/ocaml/ocaml-0.10.ebuild
@@ -10,6 +10,6 @@ XEMACS_PKG_CAT="standard"
 RDEPEND="app-xemacs/xemacs-base
 app-xemacs/fsf-compat
 "
-KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
 
 inherit xemacs-packages
diff --git a/app-xemacs/oo-browser/Manifest b/app-xemacs/oo-browser/Manifest
index 140e65ec4167..a3c0d6d15d48 100644
--- a/app-xemacs/oo-browser/Manifest
+++ b/app-xemacs/oo-browser/Manifest
@@ -3,5 +3,5 @@ DIST oo-browser-1.05-pkg.tar.gz 517598 BLAKE2B 6c09fbbdfce6f733e03b5f716076a30ff
 DIST oo-browser-1.07-pkg.tar.gz 516920 BLAKE2B 5a4ca2993f6fa8fe15fc72e05509b5af9ea0811077826fa3c67a4b123dcfaaf8ee54e7d8650bde4a8bd8812791859a2598dbe53a9e5126098bf388aec9a77c9a SHA512 6b871c64289eafe9cd41e0754253e28da0e73364686bc0ead3c50cc00b977ffee9b1988c4c6cdae685592d66d781979820342aaee729842a5df99c7170ac3287
 EBUILD oo-browser-1.04.ebuild 337 BLAKE2B 9533173f8aee6f5f7a3644f258f92f23fe06562643b2da4cc65e51c37fff9178b3c7a0a25b980d335dd280d1d9742db2b9aaac83c4cf462a69cc1473ed7e0cae SHA512 b652095556046c63e0b0935f9f1e8376dcc1de71757285526fd8c37d40feca6934e13c72e6c80c9a470d7f38ef66d2fe8ec1a30d182a3a6b248411b5b2597ce2
 EBUILD oo-browser-1.05.ebuild 374 BLAKE2B 8d8c854a46601df84e8410fc233e30e41bc75ea00f871fb467d7c2f78d94484c9f16cd3063b9e29609866ed300facd32779a7610830c695d9a44e9a861e55a65 SHA512 3574b7ca0abbf200e00223cc50a881bf7210480238bba0e62ddc62c59764b7250492d3c00a930f48edb403d4a30547c809bc31263a337ba6c2f92fe2bbd1c1c5
-EBUILD oo-browser-1.07.ebuild 376 BLAKE2B 2ecc599f594d05441ab322c7b0a7e43c1f4296c09fcb08cecb9e323999e08d526ac2e143d200ac62d1e93caf260d09eae68c235a5738c24387543a0df4641b12 SHA512 21f8f596376f69a8433e3cc7ecbcce61eb3851b5872b41d915a6b963c8fa3f47021d356dd22f366e88e915904cb1974e71b3b49104a46f4e9dcac84e07a8ec7e
+EBUILD oo-browser-1.07.ebuild 375 BLAKE2B 28a805c55dfa2257e48547d7455852ebf812d869fc307fabfc1cf6813df7b5cb3f2ed8f2d8b0464cebf785f87bf4dd852b8c385620c1f15b618083a7af620184 SHA512 76159a7721a6f0d52c6d74d55fbf4ed53077ca83f8519da3d6ab5d4d85164292b1a7af25af701df313215704c4ce162253081b3f7ac75d73686b5e57a2c7cbf1
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/oo-browser/oo-browser-1.07.ebuild b/app-xemacs/oo-browser/oo-browser-1.07.ebuild
index e004dd5d74c3..297c954d913a 100644
--- a/app-xemacs/oo-browser/oo-browser-1.07.ebuild
+++ b/app-xemacs/oo-browser/oo-browser-1.07.ebuild
@@ -12,6 +12,6 @@ app-xemacs/hyperbole
 app-xemacs/gnus
 app-xemacs/sh-script
 "
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/os-utils/Manifest b/app-xemacs/os-utils/Manifest
index e490df145629..a1681c9e5c80 100644
--- a/app-xemacs/os-utils/Manifest
+++ b/app-xemacs/os-utils/Manifest
@@ -3,5 +3,5 @@ DIST os-utils-1.41-pkg.tar.gz 232353 BLAKE2B 3212b72124c72b7c172c4767ea82aa7e072
 DIST os-utils-1.44-pkg.tar.gz 232382 BLAKE2B 6430e217638405aada6231b0253e2bac313181c3d8f3fae92cf3d541b427fc29031d475853448fd45cdeb4a8dfc3e8c27c87c381d5155b220a6115e85d4a23e2 SHA512 7245cde56f27fe677182ea3607fb069071b9139be224f02597407709b5b23aedd3e9272ba1ef5feb631fe919175d0b174a6d09fb1f7edcffeffe4b1e6a0ae299
 EBUILD os-utils-1.39.ebuild 296 BLAKE2B 531dcdd8ca70350ef0768d106d7391c78cf3ee9d97bfaa633d39f2ec258dd155326d35f2f6a01739128da3c763e9e2382d6208a98c694e648a120008a59e91ad SHA512 8b6ecca67c66de7cdbe3fcce27fc4ca9ac19e8a1c4d52cc2099d2c97ebbd8a80326313ed50f55b733503e3aa7af79bad97b1c46197de91af553341467c206f79
 EBUILD os-utils-1.41.ebuild 296 BLAKE2B 531dcdd8ca70350ef0768d106d7391c78cf3ee9d97bfaa633d39f2ec258dd155326d35f2f6a01739128da3c763e9e2382d6208a98c694e648a120008a59e91ad SHA512 8b6ecca67c66de7cdbe3fcce27fc4ca9ac19e8a1c4d52cc2099d2c97ebbd8a80326313ed50f55b733503e3aa7af79bad97b1c46197de91af553341467c206f79
-EBUILD os-utils-1.44.ebuild 298 BLAKE2B 8721f94dc18da2364fb4dcbcc2c4443494341bc51861f587600032be54bac816c90cbab9b9f304c61af03cdcec14284649322bf334d12e84cce67c4e96374a49 SHA512 0f9f50a9b4e6a6909e0ac466225ecf9182d39e047bf5c008f9d353a0f172ca964af8ea3b1b0b90ada422955a76a161abb03f8ea8273807efe9709bfbbe6c68ed
+EBUILD os-utils-1.44.ebuild 297 BLAKE2B cc98cbdd7e6c725aa1b43cbc84843a946ddfceb1ea4f46d4f8c6123b78d4e984b9d4e587c753e3b9fc96954575e2b53ed8a0b0300af95590c026356faeeb4fc4 SHA512 37fd9d5ed5ead27bb1d6e5087051860c0b7e5357305d3dcf21826933461158a9ea03782da68d0a562414e11f3976bdb764c17ef12697f382c6ab795bae0787e8
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/os-utils/os-utils-1.44.ebuild b/app-xemacs/os-utils/os-utils-1.44.ebuild
index 4922ca42749b..57828eaa710d 100644
--- a/app-xemacs/os-utils/os-utils-1.44.ebuild
+++ b/app-xemacs/os-utils/os-utils-1.44.ebuild
@@ -9,6 +9,6 @@ XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 "
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/pc/Manifest b/app-xemacs/pc/Manifest
index 28e43c247d72..e82e67ff4d3c 100644
--- a/app-xemacs/pc/Manifest
+++ b/app-xemacs/pc/Manifest
@@ -1,5 +1,5 @@
 DIST pc-1.28-pkg.tar.gz 17720 BLAKE2B 06856dbe980ca7313a83d87d87c6d42f0a9a42c9d03e05e0f080abf3e9634e5d763003ed9acf5fedb5e541bbf8f47e0c236728f154cb8565e70b18947795e886 SHA512 cd296e2ce019b54de33560622622cf955937b85205850f7e31218c8de03a05d0516176bc2c8775c2649d271678f18fed3591d2fac572cc78fd11d9d05a43e922
 DIST pc-1.30-pkg.tar.gz 17760 BLAKE2B bdf924d66b596fbd0f2770241713593e63576a229759b5cef10a5493b4f799fd60dd914320a4fcd6d0e444be842bae20a82334d3b223b6a95137a6d9e5e37e74 SHA512 6a64b7b330e4bf73563490de443db8525ea6d15158b78e8561e22609f24909cf2a7e83453024d985a4ef1dc0c00f69c69c7f31ac010c806b6e61811d0a15526c
 EBUILD pc-1.28.ebuild 297 BLAKE2B 34bb55d4d8dd732074d130d5ea1fe24c9c39115e1347d32263e782479aced9da68f817be4945bf733818717a7b672e6aa652f6c5463af53f322fc628d3a58963 SHA512 4412224247e1af153b265f701cfc7ee7b8391be49016f77e90bab17d353b3e80df1e1f01f6b58124d49cf3f0b71e493cb732c75db24d92aeb7ff528bab46ec35
-EBUILD pc-1.30.ebuild 299 BLAKE2B b517fb1a53fea006a3de1bee172b0b9a7a47b3697094a9943b133901719ead6de59b4357b2e370ead64353ae0720a506b1751d8f9cb58ea4b9148434e4206495 SHA512 35967b3604be5c304b132d03f6f8120149ff968c6c6ceab70191771cbd6166f653df3d53024653a791211ca3ca547c8d3201df5283d8f67e69562991bd6b5ca7
+EBUILD pc-1.30.ebuild 298 BLAKE2B 52a58d9a8d5d96bce34c78f5ccec0d5509b96c99eef0d4b704581f09386f50ea54a56a8a61c6619a25612375702707efcefc8b91fc2eafe36074ab18a437405c SHA512 1233e8fdd9611d8f5957cf6c23f294b3b76f06893ae0f5c33515c0d5e0a959300458dfd3447e29916ecc29eecf56595e1d807ca575683c8a69d6f326a2e91301
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/pc/pc-1.30.ebuild b/app-xemacs/pc/pc-1.30.ebuild
index a795a34426a3..0d7193f96f50 100644
--- a/app-xemacs/pc/pc-1.30.ebuild
+++ b/app-xemacs/pc/pc-1.30.ebuild
@@ -9,6 +9,6 @@ XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 "
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/pcl-cvs/Manifest b/app-xemacs/pcl-cvs/Manifest
index a1a0090b9c26..5adc106ca2af 100644
--- a/app-xemacs/pcl-cvs/Manifest
+++ b/app-xemacs/pcl-cvs/Manifest
@@ -3,5 +3,5 @@ DIST pcl-cvs-1.70-pkg.tar.gz 162044 BLAKE2B 24ca04714035d00d77ca82f7a9722043be75
 DIST pcl-cvs-1.73-pkg.tar.gz 162031 BLAKE2B bdfc2c967e5b91c3e0fa3ff655ecc0a0d15b6ffd03b3b91c70d2873a21fd340428c43f18bda8e62bfda1bfbf4bbcc4518247ec7f9b26fc55f819c4f847877124 SHA512 c381f47521dbf2d811efe314b666eeed66cad3ea4e0c7d7f9ed5d1cc6e273e25b48904c3733f824428e03d9fe46d2952ba46cc3959270e0e4523929fd89f8cf7
 EBUILD pcl-cvs-1.67.ebuild 427 BLAKE2B 6471b996d4f840b495144dd49102a0c448f7491dac4414de19753f04ec1aa2b7ca8bb5a37ac22f995f193e2bb76b3c2f5a997a5e46be7b005c81785f592ae62e SHA512 15481d4e8a118bd85bd4c12bb1ee4d6769fd70b246eabda632d1a65b4c152cdcadf7f3718d2063bd2ee1e2185e069421290e236a739abb9eb04938e5abac1f17
 EBUILD pcl-cvs-1.70.ebuild 460 BLAKE2B b272935971477e384e31f645b9a5366e6228b25d72a35335aa598458ffa7795b251a73bb4953cd9ded0d3cb9a21b6cbd1884a84d460ea3e4f0c01ccf7994dbd3 SHA512 3585dfbe0d38c210a370ba06bdf9f3b988d0f6e2168c296169fae772a298512dcbb3573028b5ab6d339bea78c7df40db7e8d26de871847eb05a608c8d7cb8913
-EBUILD pcl-cvs-1.73.ebuild 483 BLAKE2B 15853e6f0bb2cebe1613e3a7d54262efe10f289c7ed953c9992989d2b0b21dacc3fe98d2839b987b23aad8f16db1a9dcffce0fd1ce0b7f61df1b98d721d1ce3c SHA512 d20b4824231cc1de1a82da28bce24affce5396e759c28109035725cafc0ea5e245117b2107aa8c57674b6f467dbf4ffb818cd0faa0f7af1a224fa25a2454c80d
+EBUILD pcl-cvs-1.73.ebuild 482 BLAKE2B d7d146099bd9d6a7480698a06594e480713b2ac3ac9cb039d0ac1b2dc434b40c0635b664638fda1bfaf492855ce87e27a20ef98ea65c12726f0d2c9b5635f854 SHA512 3dc6764b1d0960712b57cc84652b901c2a12624bce8c6d5b5a9ca4c14230fc447c8c84030b74b319bb7d8a1b88d7631ce830c53d0e26e56e474fd0f1d4b80709
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/pcl-cvs/pcl-cvs-1.73.ebuild b/app-xemacs/pcl-cvs/pcl-cvs-1.73.ebuild
index 5027e6814a77..d4e10e830b37 100644
--- a/app-xemacs/pcl-cvs/pcl-cvs-1.73.ebuild
+++ b/app-xemacs/pcl-cvs/pcl-cvs-1.73.ebuild
@@ -20,6 +20,6 @@ app-xemacs/tramp
 app-xemacs/gnus
 app-xemacs/sh-script
 "
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/pcomplete/Manifest b/app-xemacs/pcomplete/Manifest
index 4337c9151484..1ba150666551 100644
--- a/app-xemacs/pcomplete/Manifest
+++ b/app-xemacs/pcomplete/Manifest
@@ -3,5 +3,5 @@ DIST pcomplete-1.06-pkg.tar.gz 37844 BLAKE2B 5440edafa50d7b83111fff29603611a437f
 DIST pcomplete-1.08-pkg.tar.gz 37882 BLAKE2B 6cb4d719d006e928ec99164da9997b375782c3ad0e91b926b838a3ac3ddff97bdb697387ce5e2c4fe0ac6675cbc2549094c52f8bc4fdc5a5f8cbe20ac5e479c2 SHA512 aa1525020655f5224fa59cbc3e311947cc8bb54ae1d53be4c08478f622ee116dd90afadbb8de30b44f91dc36f86a96e6315fbfe47856759db5f4fd0eca405931
 EBUILD pcomplete-1.04.ebuild 322 BLAKE2B 2f97c636e4494a2fa3b5f2d327e9c30b3bf8c0d0d50f43515e149a7d90fa5cd6e57277eee8d77446d63faf22add2ae3aff142a89831b6eb1f1586356eb2a897e SHA512 cb196f3abbaaa11baa7bc9e0188353d99cc8fe6936f9ede3387f4b0b0bd58f686e1fe4fe4b90ce509c8ac891204659ef0907fd176b8b00f6ef15ffd13b086793
 EBUILD pcomplete-1.06.ebuild 322 BLAKE2B 2f97c636e4494a2fa3b5f2d327e9c30b3bf8c0d0d50f43515e149a7d90fa5cd6e57277eee8d77446d63faf22add2ae3aff142a89831b6eb1f1586356eb2a897e SHA512 cb196f3abbaaa11baa7bc9e0188353d99cc8fe6936f9ede3387f4b0b0bd58f686e1fe4fe4b90ce509c8ac891204659ef0907fd176b8b00f6ef15ffd13b086793
-EBUILD pcomplete-1.08.ebuild 324 BLAKE2B 7a9339148dea8ce55a1fbece0a1567606017e27b51217a0d1db914b76cceb20e7a83b75bfe5559ec9f83f6d2f064740af8612f6d7be6affd243c0fb31a77fa72 SHA512 c87b077c738a9b1c0d2a168304e3d641f20c830103ee5d7c0294a63e8ac1e07da4f8d018a5a9bd865385710066b9c217faae14c80029b62f731206c69904eff9
+EBUILD pcomplete-1.08.ebuild 323 BLAKE2B 3193742c5a64b8825f96c45bb64aa94dc9494c174a5d702d86469c5181a5948b7ebb4700aa732514e760ee1a2c6f177cf66221c629adebd0649b24864762c6bd SHA512 504827044abd89f58a2c6e2a758c85637b1ea2e7b67054b71961840a1767671e2fad5a5776955d4062801d1b753ae26ed17d6c8a2aab1e2d872a55927ff5ee20
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/pcomplete/pcomplete-1.08.ebuild b/app-xemacs/pcomplete/pcomplete-1.08.ebuild
index a6d2699f1b1b..b2f5c5a42c86 100644
--- a/app-xemacs/pcomplete/pcomplete-1.08.ebuild
+++ b/app-xemacs/pcomplete/pcomplete-1.08.ebuild
@@ -10,6 +10,6 @@ XEMACS_PKG_CAT="standard"
 RDEPEND="app-xemacs/sh-script
 app-xemacs/xemacs-base
 "
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/perl-modes/Manifest b/app-xemacs/perl-modes/Manifest
index 829004e6790a..12359af37809 100644
--- a/app-xemacs/perl-modes/Manifest
+++ b/app-xemacs/perl-modes/Manifest
@@ -3,5 +3,5 @@ DIST perl-modes-1.14-pkg.tar.gz 204091 BLAKE2B d002ac798b306594250d1cc0e5451ad9e
 DIST perl-modes-1.16-pkg.tar.gz 204219 BLAKE2B 4b482b467023ca6ef81b21f4f23410547aca4c7679c90753f19a36dc64031f26ec2f14b3ac0173b03a595b76635cd764b9e55e2ffd1097feb51f5c39dc128b11 SHA512 f6b521fc336a93c8caf8e96293e338d1901838d86f8ef29141e240a0396a1182594ffdb9955d5eae1f113c0edd22e922e11cda6f174865c2a731dfaf9a78522b
 EBUILD perl-modes-1.09.ebuild 370 BLAKE2B 5d175889f7c830ef95cbed315b6d722eec2833646dafa9812aa55be51c2aaae01cf18f706bff3de37f7dcf8c338089c87e475200b97a64975dda33593c1c1bd7 SHA512 7ac38b042394eb3ce7093b27e3632f4122c5a1049b20fd6367ab8d26dde457fc97fe47a5aa789132342149b3068cb5bea5a2a426b67a3ac5f1f056d6c5af7e2a
 EBUILD perl-modes-1.14.ebuild 370 BLAKE2B 5d175889f7c830ef95cbed315b6d722eec2833646dafa9812aa55be51c2aaae01cf18f706bff3de37f7dcf8c338089c87e475200b97a64975dda33593c1c1bd7 SHA512 7ac38b042394eb3ce7093b27e3632f4122c5a1049b20fd6367ab8d26dde457fc97fe47a5aa789132342149b3068cb5bea5a2a426b67a3ac5f1f056d6c5af7e2a
-EBUILD perl-modes-1.16.ebuild 372 BLAKE2B 5f625c607c4b36c8562236182232cbf0d299928d3dc80612fe371de5886ec6fd888028194e7785c8053ce14af34b2513877a292d754183212151802e62df1b0c SHA512 78e1afed83bd2a019f8c7692eac7cc9d8500484bfd72c1112a423edf377473adcfb5b60787cd5969994041468769f5f04ca8eaea697109a2c071f7df04b26dcd
+EBUILD perl-modes-1.16.ebuild 371 BLAKE2B c5ac51447c16b02f5f5788c5e09e07b17ad3c5a2ed57a1e1ff95ae6c4c2acc399b6d864bdf4f61f70258703c72287bec33678caf68f305ffbbc10ac483a9858b SHA512 816fcb0ac678009f86e5ad93666858e78d13c7029805e6a5eff86d3a7c65fd2edce0d6aa38300a3dfbf2febd77bfca171e76c75a50c6bc105c21df92a91c0eb7
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/perl-modes/perl-modes-1.16.ebuild b/app-xemacs/perl-modes/perl-modes-1.16.ebuild
index 4402ccf33eb1..f06bf6dcfd3d 100644
--- a/app-xemacs/perl-modes/perl-modes-1.16.ebuild
+++ b/app-xemacs/perl-modes/perl-modes-1.16.ebuild
@@ -13,6 +13,6 @@ app-xemacs/ps-print
 app-xemacs/edit-utils
 app-xemacs/fsf-compat
 "
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/pgg/Manifest b/app-xemacs/pgg/Manifest
index d2951e66d4fc..75462bbdf467 100644
--- a/app-xemacs/pgg/Manifest
+++ b/app-xemacs/pgg/Manifest
@@ -3,5 +3,5 @@ DIST pgg-1.07-pkg.tar.gz 34293 BLAKE2B 1b45e947de61678a2b85a3a7dac0c34d605becb8c
 DIST pgg-1.10-pkg.tar.gz 34644 BLAKE2B b7aeb3749c5867c8b785ad1c0b31636e3df4105b5c80815678fbc87e38269e8af526ae8fdd0bfb1188845bf40017304a3f9b40d270aad65cd69cbd0ddb4a78b6 SHA512 cb8971c3eecd3e1284fb9720184252a7df92d7a0bd789b1a5f8aa708690e653db30c418f6a2ed4a947a847961e474073d0a5489244f9daf74dc61b70ee06468a
 EBUILD pgg-1.06.ebuild 374 BLAKE2B e5779e34b897793e0d152e60cefa278445497d06590302b785abe9993b41a12b71f155732859d4a75380b86488753c3f8953a95686cb8b788c7a911b322040b0 SHA512 94e09e75a96f7c19ba8ea952cdf8f5277198f48d3dbf8154cbf6e5dc3c04b9f44bf6984e8f0fdae5d07b81b27503ac5467b61b64e839d6e3e04c62bfec05634e
 EBUILD pgg-1.07.ebuild 374 BLAKE2B e5779e34b897793e0d152e60cefa278445497d06590302b785abe9993b41a12b71f155732859d4a75380b86488753c3f8953a95686cb8b788c7a911b322040b0 SHA512 94e09e75a96f7c19ba8ea952cdf8f5277198f48d3dbf8154cbf6e5dc3c04b9f44bf6984e8f0fdae5d07b81b27503ac5467b61b64e839d6e3e04c62bfec05634e
-EBUILD pgg-1.10.ebuild 376 BLAKE2B f540949dac7bf14e539e05c125ce384ed3014c504ead19c09661499eca651b7e41813dc3586926f25859d1f4c25dc887acdc19ebf55a88748aeb3975a1d5dbbc SHA512 35adf237c38314f10597a177bc03307af8c69124d3c892298e79fa89ae1e5dd6e7dfbe40c7c77ec7021e0218ebe7496e5d0e0539d7977ef6b57c00f0525e0db7
+EBUILD pgg-1.10.ebuild 375 BLAKE2B 9ba382195c5b0ee58c5271cb104cc4a21912243e27dbaf9655b58ebb86b44bbab0e4aa38a58ef9431a66fabb2f0ad2beb2b8ed8e6fb115c1ac68ebdd68fb5398 SHA512 fc177fa641738b13a3d3a65e22ab1ceed34c2fdf15315cda816bba5e52ce9298875a1f9cc2899db9c699a591d7576af90b9604e81a69fa2ec7c4c87cdcf9a9e3
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/pgg/pgg-1.10.ebuild b/app-xemacs/pgg/pgg-1.10.ebuild
index 884cb68021dd..b390642709df 100644
--- a/app-xemacs/pgg/pgg-1.10.ebuild
+++ b/app-xemacs/pgg/pgg-1.10.ebuild
@@ -12,6 +12,6 @@ app-xemacs/fsf-compat
 app-xemacs/edebug
 app-xemacs/ecrypto
 "
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/prog-modes/Manifest b/app-xemacs/prog-modes/Manifest
index 126068e98acb..4ee4f707704d 100644
--- a/app-xemacs/prog-modes/Manifest
+++ b/app-xemacs/prog-modes/Manifest
@@ -3,5 +3,5 @@ DIST prog-modes-2.20-pkg.tar.gz 821805 BLAKE2B 73b69223d9c51338e4e9fa4cac4db8016
 DIST prog-modes-2.33-pkg.tar.gz 874585 BLAKE2B c29525ecad896041368bed7fb647110428c968fbd77b13b0322a59eb1fe2e73e7000e6e119b2658ca82bd01b6014aece2b588f807f80ecd926e755e28f09ed5c SHA512 e2c7cba8916b41c1c3e932c4daddb57ce330f242c6ef189916608b0f682122f066f18706e05b8a1b68ad5b993bd873e47fee558c540b7f6a58bdffa68544e880
 EBUILD prog-modes-2.10.ebuild 556 BLAKE2B e7f96eb6fe7aaea8fdcf26922b6894bc438d9dd2c0760590b9d9c04ff745cdc2ae42603eff98d58f5f7eb7e29dc7000777ef9de138015b337fdbf214207bd089 SHA512 3a15ce421ca023b453cd18747c2310c0ce0a9a4795418b3571ef39146cd3f25de132eab973a8874fd484fc5a37f129709067ff81735e176585250a78eed4af81
 EBUILD prog-modes-2.20.ebuild 580 BLAKE2B f4d5f26fc0406941cdf7fb40c7409b5790f4f8a60ab83b8b909a8b9ed4d54629e3306ec125f0b7228ee6af184e8fb363ed91976e8f23ee5df6d1e52e219495e5 SHA512 c1293f75c0ea4a5653707bc84229da4c55b5b7327fbad4015a66e292a96057034e24fc55198defea0b5b692bd92543194e3f7740a49aa220821730fc88a11b6c
-EBUILD prog-modes-2.33.ebuild 612 BLAKE2B 842dd862028f846ba19decd3f02039d4bc471edcd470184546b8fb2d4667732d4add7ded3e890b926519a556fdb7d11c562e4c60934a69f8438184d323744053 SHA512 6ceaa89c4077068eecf90b9c0425e8112c18289648e290842569c97a82523f7ce714fe928d2a0f9d6e212934ce7f73e31183f4e50e5b09b0628bde6aa6aabf58
+EBUILD prog-modes-2.33.ebuild 611 BLAKE2B 4fb40c0c5ebbd4442a16a839694a6b84bdc6c59780a0a112cfa501190290e8f1a4f00b2e4c4f9a6f9808760dd280042dc565e6927aaff861ceedb6b0c706f9dc SHA512 5658239476bed105e1d5e51efffec29a317420b41759cec59d261bcb9c837e1dd84209846f7d2fc61662de8cadcf53d11b6147de73bf2a889b4a7c2cec3e4ab9
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/prog-modes/prog-modes-2.33.ebuild b/app-xemacs/prog-modes/prog-modes-2.33.ebuild
index a0e7bd789f37..718698f9064a 100644
--- a/app-xemacs/prog-modes/prog-modes-2.33.ebuild
+++ b/app-xemacs/prog-modes/prog-modes-2.33.ebuild
@@ -25,6 +25,6 @@ app-xemacs/cedet-common
 app-xemacs/w3
 app-xemacs/gnus
 "
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/ps-print/Manifest b/app-xemacs/ps-print/Manifest
index 165d7ae68bdf..579e4216c2e3 100644
--- a/app-xemacs/ps-print/Manifest
+++ b/app-xemacs/ps-print/Manifest
@@ -3,5 +3,5 @@ DIST ps-print-1.12-pkg.tar.gz 156197 BLAKE2B 0eab7740f3b0fec7573b9da4583060ac051
 DIST ps-print-1.14-pkg.tar.gz 156374 BLAKE2B 9e2fc8b75c23d4a9768210a82b42a8ee77f2f7541c46af037172a96213ab3d800a3e8b4fdc6964e3aa6bbe1276a4bc09759edd6301932505a9c4d737a8f3d527 SHA512 9dd2208bcd2963f83e4b895ff01ca95e66031ca4003535a672a14a735b892c0522810dd7f0ed5bceefe10a6becab0f0cafb19b09d1dbd6656ce6cc99b7dd4023
 EBUILD ps-print-1.11.ebuild 300 BLAKE2B f57881f2e2d073169b1e3792a2758880aaffed732bf5da42900cf8a6bde75e7a0d3e9e0d42133f90a3d1545753391c1c8496de89541b99f3120297a0f9bd9bd2 SHA512 4a201a26a0b68c9b8c0526340e607f21f03fd1d6c1d4675d8a28fed379bd7e4484eccba8e7bb33353823ce00ea86d66dee19d50143c63867fcc22b437ab4b4bf
 EBUILD ps-print-1.12.ebuild 323 BLAKE2B 28b576c2966035a1f9c22a6c42940d58df5a43b18a3a1d47e5ba31e5ec422f5a011c4c44b11454a2591f5dfd095990b0ff48d219bf1a31a8edfd5bb2f1147a74 SHA512 74ce8d396ef0534c37f5b71969785c2c74789c1692b5c6a0d0b68f2b580ea67b665002f2b14fecfce340eae97225544f583d1a1db2b3e6070cb95d61591ce714
-EBUILD ps-print-1.14.ebuild 325 BLAKE2B 07ee42859253fe87c16c767c79dac4c463a6905b9756c4a93deba369ce58c16e5c57823093c5d793fe041b97e503e4185aaddb88b0a0fb88efc42f7199f5f513 SHA512 4d2aa9e184c1b46586861c86ba7cdbb04dcaa3969e5c6038fa5e0ef9644ae33e6262ce456a8951931b636c8a594918cc7ce5360369a05d66f9bcb2e0ac622140
+EBUILD ps-print-1.14.ebuild 324 BLAKE2B 74e34995b870461e50b3aa10f1a8f941ef2bf97b4a1080d3a9be4655be2f957d505f9e9f009fe12deee13a19c1118ec777321723f5be76bbb167e5cabcecc550 SHA512 81b928ff09a8769db3f216931124880c32c30562e7df8a2ead375ee797ad9fbaad916bf316699378f5225cd45d984a34e1c4a34abb61bdffc0b886e8a011f56b
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/ps-print/ps-print-1.14.ebuild b/app-xemacs/ps-print/ps-print-1.14.ebuild
index ac4a873bfdaa..3ed11d2e29f3 100644
--- a/app-xemacs/ps-print/ps-print-1.14.ebuild
+++ b/app-xemacs/ps-print/ps-print-1.14.ebuild
@@ -10,6 +10,6 @@ XEMACS_PKG_CAT="standard"
 RDEPEND="app-xemacs/text-modes
 app-xemacs/xemacs-base
 "
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/psgml-dtds/Manifest b/app-xemacs/psgml-dtds/Manifest
index fc806e55b934..565b82b60778 100644
--- a/app-xemacs/psgml-dtds/Manifest
+++ b/app-xemacs/psgml-dtds/Manifest
@@ -1,5 +1,5 @@
 DIST psgml-dtds-1.03-pkg.tar.gz 367476 BLAKE2B c7b06622895757b1ea73102a1bdf39be6f456c0e276b3d633c6f5c295b09249796429104499358c12da1204c9d95f93bac66c12311e38325f69a03fec81828f5 SHA512 947e3acd754ca9e730b7c3f7e45fb4cf94044dc61874bf37f77da2f11fec9649c4468f73e00db03c92f41fa460f896cdd610088c5ce21a64954584e7ed2bfecb
 DIST psgml-dtds-1.05-pkg.tar.gz 367368 BLAKE2B fe845e58c281909e43c2c7f9372f6b55da4133835df08dddd7f91881a48e73f4afd329ef02a445206c41466b5368c5fa8571a1e3d95a799ce6902245c12731e7 SHA512 700f1db7dff467987ddd9dabca48479f231c81486ea72129db5bf24f0583c0ae197fcf0477c7092e89c0edd7a0465f4e7c736bb95647a254d56dad9aa0935eb0
 EBUILD psgml-dtds-1.03.ebuild 434 BLAKE2B 6aa90d20a62d0493dcee9c6e315c6785391deaab0c7e62a02faa04b728ad6c5ce8b30844a7bdf09233537b49458ae0b7bc6d9bef10b5a73a0faecfcf3415bcec SHA512 d13484e8c37de95926aeeda05cb9eb5c23355f528ac16d8cfbddffddfa8ce256d916da5136545090127f267c0077c1316b9a07fe43d90b9a8a7a701c47f35edc
-EBUILD psgml-dtds-1.05.ebuild 436 BLAKE2B 3484dc24d42313eb06c7cd36492bdb7536c4b0ceb17223cda900e6bbd9644b86418e3c9268d92b79125ee7c865868315de388fe883c03fa73f3724bb064c9792 SHA512 2bb970b7fe264334c2103de7420a67fc2aa4c6d8bc0c49ef7c5f107e2c301f956f722dcf6ff4de153ae0cbbd68bd7d932e0e12b28e7a68bca1f0c27a18eb4747
+EBUILD psgml-dtds-1.05.ebuild 435 BLAKE2B 9e48e6f1cbd32082f223b4ad4cf4a720c0d6b348831d294d037c7442646bcb7b28f6edeb49fffe2380cb8b785f500b92c316eb8f5c208dfc56970ccfbad8fa22 SHA512 feeda3a60d198af216104d89157292c52c86c15c68a54cdf84c1f6acdcbea24c437989078d1fb5935979818a76dc730156ad4b9a978d366506411322316ec549
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/psgml-dtds/psgml-dtds-1.05.ebuild b/app-xemacs/psgml-dtds/psgml-dtds-1.05.ebuild
index f41408741b68..c0e5d32e1623 100644
--- a/app-xemacs/psgml-dtds/psgml-dtds-1.05.ebuild
+++ b/app-xemacs/psgml-dtds/psgml-dtds-1.05.ebuild
@@ -15,6 +15,6 @@ app-xemacs/fsf-compat
 app-xemacs/xemacs-eterm
 app-xemacs/sh-script
 "
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/psgml/Manifest b/app-xemacs/psgml/Manifest
index 0994bd09f378..ea8fad27479f 100644
--- a/app-xemacs/psgml/Manifest
+++ b/app-xemacs/psgml/Manifest
@@ -3,5 +3,5 @@ DIST psgml-1.45-pkg.tar.gz 307383 BLAKE2B 0d19188b0d21204a1045e792ec53596664a440
 DIST psgml-1.50-pkg.tar.gz 307252 BLAKE2B f846105420b201bcc17c06781f0746dd9f30824c066c2689d40902353c8a158867088ee4a4152128c1a3ecfab3e834c8069ed0d972c19f9140f362b9c585957b SHA512 92c598586e761bae229f0496ee07790809f9b98901465d078c7ec43750cb473b1b9c32edae1ef9c61f4f4847a9dd84bd8c4d7854a51784f1c91bf3e77fd2a079
 EBUILD psgml-1.44.ebuild 467 BLAKE2B c267c4d39f68c2771faef3c391d77d52f0ce8da25bfef9cd787ce9f4a7eafbd63e08dc65100a1170458b4a49da02e7a3f98ba291e3339e3ef0819f2180e79045 SHA512 a228a9bfa5ce457b906b1173e69aa02ce24b1c6b44b842ea536ac0ceabeb389187d88f6caf37ce220189a1a468164816175ca2f808912f740d1f32bd386c73eb
 EBUILD psgml-1.45.ebuild 467 BLAKE2B c267c4d39f68c2771faef3c391d77d52f0ce8da25bfef9cd787ce9f4a7eafbd63e08dc65100a1170458b4a49da02e7a3f98ba291e3339e3ef0819f2180e79045 SHA512 a228a9bfa5ce457b906b1173e69aa02ce24b1c6b44b842ea536ac0ceabeb389187d88f6caf37ce220189a1a468164816175ca2f808912f740d1f32bd386c73eb
-EBUILD psgml-1.50.ebuild 469 BLAKE2B 7d7fe58a98853e78d89dcabcfb080aef0938ad70a0e70719b78d0b370c057597b88dd9d9a995fbf1924fd77dfcb075c7c7fde6d2e8f34b8841069b0b7bdd02ac SHA512 e2d1b8c9aa1f1943b27a571ae832c22136b590dd03438476b8623455f1d0cb3589289fd24da59bce793e91b4917252c7c0453fe3a217b51d417ebdb1a0ceae2e
+EBUILD psgml-1.50.ebuild 468 BLAKE2B 650f93ef427e197f3ad4f1575e42bcc972c090a534704cf35fe3c1103bab8dde9944408bc449d1e9e5a84c62d2e416e6185f241508598ff806a4bba290c3bd5e SHA512 4a2214ca60254eaece7d9364a57faf30c98753e3d3fdc3aed51aef25ac87a22d2728b31ef66bc6b686eac4d9ea7c537f432cbeeaa3092c4311756b9a6ab1b3a2
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/psgml/psgml-1.50.ebuild b/app-xemacs/psgml/psgml-1.50.ebuild
index 75365178d064..64203fab5ff0 100644
--- a/app-xemacs/psgml/psgml-1.50.ebuild
+++ b/app-xemacs/psgml/psgml-1.50.ebuild
@@ -17,6 +17,6 @@ app-xemacs/xemacs-eterm
 app-xemacs/sh-script
 app-xemacs/ps-print
 "
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/python-modes/Manifest b/app-xemacs/python-modes/Manifest
index b226df4f72b7..89706509d1ed 100644
--- a/app-xemacs/python-modes/Manifest
+++ b/app-xemacs/python-modes/Manifest
@@ -3,5 +3,5 @@ DIST python-modes-1.14-pkg.tar.gz 97116 BLAKE2B 04f2121b03e45a01b1f7c727c4aa48fd
 DIST python-modes-1.16-pkg.tar.gz 97206 BLAKE2B 7390c84148dbd7280cb9472a960bfd720accf135fac0817c76373d9e66c76f3293b1552915fe81cc4f0cb7dfdce78cd958e7ed90a5e24c5e3f71388f2b4e9ec7 SHA512 f0faebd8c179138078f82ad7d8dce72547d890ab84111ddcbaa2270aa2464923e88feb898b9a9f0277432c62e98289390642edb635e6f8f692ee4000a8fab34a
 EBUILD python-modes-1.08.ebuild 347 BLAKE2B 3fe68ce644e1886986c91839ce575648bb1087582af60e8f5520557f9f6de21717431d8199d6a4ca6de08c1d1329e437c8d7108af0965367c7de726eae49c781 SHA512 b5bf404617837a7d3a6a72b973a26ba8a3a6d654a548921899bcfe893091d128be32200992205e0b8cfdea421249d2275810215f8b584a6245d70c85cc245622
 EBUILD python-modes-1.14.ebuild 369 BLAKE2B 61cf037f731310539e18025ab486f2a5aacb7165df14b181ef458790b52b5bf12a51a2ccf0ec19cd395b9a3319255cfa4cf387e142d515119dd58045fceba7cd SHA512 274e4f25096f013a062b88921db9f35d6291e7d77c95379d3ade04627610dd7210d64bcb7119db88f344888d310b31a5fb2c03662d84e3ab52446cc708bbe6ac
-EBUILD python-modes-1.16.ebuild 371 BLAKE2B acd1c60549b97cc85bd22ca23c446742b95f046186bf959b224145b98130c9f8da5cac8652246fe4337ac7a09b61ed228a7bc3b75c6edcb3364cc612b0f5d699 SHA512 59fabf195e82a815886e34605f6f194f214605283f0659365daa29968fd55ea88e41396f535e458706b6ae577ebdc5002bee0bd4be766538e970b7e6b755e809
+EBUILD python-modes-1.16.ebuild 370 BLAKE2B d74a458172c0de317754ee314fac25b14dcdd60b7250bc559718cf76b25fd1bdbe78817cc57a7d7c30eabf089cc23111d23b717fbbe9fb3cabf358d5006f0f9f SHA512 a974c7dd683507f88d351541c2ec46dcce585aa34c9d3840b1c6da9d3f74c4c60a06e31050ed204eaeae672c4939ac4a3a1ba3834b3eb4bc085524ab01684291
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/python-modes/python-modes-1.16.ebuild b/app-xemacs/python-modes/python-modes-1.16.ebuild
index 318fcc766308..583d7eda282f 100644
--- a/app-xemacs/python-modes/python-modes-1.16.ebuild
+++ b/app-xemacs/python-modes/python-modes-1.16.ebuild
@@ -13,6 +13,6 @@ app-xemacs/edit-utils
 app-xemacs/fsf-compat
 app-xemacs/text-modes
 "
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/re-builder/Manifest b/app-xemacs/re-builder/Manifest
index 7afc357c3059..dc19a823d0c4 100644
--- a/app-xemacs/re-builder/Manifest
+++ b/app-xemacs/re-builder/Manifest
@@ -1,5 +1,5 @@
 DIST re-builder-1.05-pkg.tar.gz 20729 BLAKE2B bc4e7124bb08ba52662702bb29192a243c4ce48572b9530ddd5e5809aef7dfc47d8cc547b9aebe233425e1091371420bc1626f6c7a97f4b10e359862b61ecb0e SHA512 13c7dd7152089a21b4d3c1310df56c4cd16c5fda39766feb3eb1e33037245a466ad055d7f4b57b98b9bce484e9ae3325a346a0c5fd139114df7219a406d1d47b
 DIST re-builder-1.07-pkg.tar.gz 20781 BLAKE2B 08c9c9453811595b6dc531869fb41649dc096a54054e0ce516936438f05c64331a5b12a58d12ff7ef4a01cc99917674c32c02ca4f05510d83d0a28875a974ffe SHA512 0abd642f14c1433f122777c6e1b0939f55d3ef8b22baf3bef2d446f56067afc90aace0b09747ef5b667e39c31606b67b0f18b8490d659db64b3fd2ecbe501799
 EBUILD re-builder-1.05.ebuild 298 BLAKE2B da1bb15705616435ff5d1cbbad0548ed502c702ae6078428258d7cc54b181a801a350d273fd61e096dd1d946d5cf103e64536ed44ee3a28c2684d09091e7ed36 SHA512 c07a0c4cb4845bd5d8243d6ff1b1d9d48830fa4ac99c48260682e544dab4506f96dc6756e1a6abab05aa3d6530c0293ff0e69bf18d244b69be18419cef9b0b0c
-EBUILD re-builder-1.07.ebuild 300 BLAKE2B 4e8bbea9d3c66236390c113fc8d20a2a8fbf3bca67cdd017fced18ccf5b5f6e3de9e64869c2ed1da2ba6c5f16bb4fd3758de471a094817e7c6f95c41e5f7bcf1 SHA512 9384271101425ff28e7f6025a9eadddc583e5ccda0a4bc6b7fb9887885b3764a95b127b17681daf59b6d80f7c4e531624ea500dea2315a024674910ed1e87549
+EBUILD re-builder-1.07.ebuild 299 BLAKE2B 5ab5843ada2c85ee28530733391271aef2c96e88f953ca4a2a2833453d93626ec88b34bb97c397a89db1e44bdfc90cc0359abbf58013a6ecff54f51ea16c2f10 SHA512 484a3664796959cda272bb9e185891df808db7cfeb2968a1ee5d3402b185e69a6fec20427ca331186350d2692f336adc866707ed2ef8d134510c8d8c46cf4332
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/re-builder/re-builder-1.07.ebuild b/app-xemacs/re-builder/re-builder-1.07.ebuild
index 77ff2871cf2b..9307618ba63e 100644
--- a/app-xemacs/re-builder/re-builder-1.07.ebuild
+++ b/app-xemacs/re-builder/re-builder-1.07.ebuild
@@ -8,6 +8,6 @@ DESCRIPTION="Interactive development tool for regular expressions"
 XEMACS_PKG_CAT="standard"
 
 RDEPEND=""
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/reftex/Manifest b/app-xemacs/reftex/Manifest
index a73f50fe08f8..60f975c73652 100644
--- a/app-xemacs/reftex/Manifest
+++ b/app-xemacs/reftex/Manifest
@@ -1,5 +1,5 @@
 DIST reftex-1.34-pkg.tar.gz 352338 BLAKE2B 1f6b5afbed3b6c6de1637f8628724fc270132fd795a2d752a6e8d7c771501aabde48fbcabbc7a45ed89fb04eb1bb17b87f8478e34de0919d6a15f5b336de4ee3 SHA512 89e5b73b3dde0ae9271a9e9e5d6195f856ddf1a45db894d8b3796cdfe68bf278aa9a24bd5656f9158d629fe286082ee91b678c48a277394cd155bd7b3365b8ab
 DIST reftex-1.36-pkg.tar.gz 353645 BLAKE2B 8a5df96299474ff67663b6b0b5dccf693c192da5fce9be28244309c76557084d4166c09a0433ad8c63e1a7eeae0b86ad3e12a1354418abf45584d801ef584e42 SHA512 bf5ad1c89d2d0a7c171580668426e3a90f03354dbc297cd765bb4704b3ddbb3b2f5fdaf8349c616a95e3344997912e0dfafafc84c628831e96117e57393b0c69
 EBUILD reftex-1.34.ebuild 322 BLAKE2B 837a957989776f57de0e076b7dccf21e8cd09d8bc8f4d9b12cc26440748d3fcdf9c973400b5cbcb1e2766cc5408dc3165b49481f19836c83a8f02690373c2506 SHA512 04eeb8794a29ef8679d7b51cdb472feee5e5d4a6145e654a93dc3d70a2193a5cc1de17214be342636e62818a1b0a0f74df0ab23bdd6b02482857926eaef5c9ce
-EBUILD reftex-1.36.ebuild 324 BLAKE2B 6ef72ef8f183cc98edd636867cc12f91b374d0f0e72f9f5e7057ab0b1afea64fbd032f1baa8e366d54eb0b11a0f66daac8e730f9ae6d416faaecd5811137e4c5 SHA512 3110769630933e9f47f2a66467d653fe8a73c419c4bb1beec0468adcc4901b39a8e8bb4c2b06f66f14958f40f16cc02cf511d9e06cf36b408c93efb8b4cee550
+EBUILD reftex-1.36.ebuild 323 BLAKE2B 738d2e3124edea8442e291d48888c0e33197bc0f06f8b5b82ade9c351b28fee01421e541059a230145b5f2cb747d0b5607c3f38642795094f60612acf503c87b SHA512 a313379d14eb26cdeb637394a63932bdb572493767b9c11cebb3906d13615aa741fc5eac0a41f98a5046d1bba3c04647a1df37507cd3b8573d7cc2b9861fa0d9
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/reftex/reftex-1.36.ebuild b/app-xemacs/reftex/reftex-1.36.ebuild
index fc4b9157e96e..d6c4581b64f2 100644
--- a/app-xemacs/reftex/reftex-1.36.ebuild
+++ b/app-xemacs/reftex/reftex-1.36.ebuild
@@ -9,6 +9,6 @@ XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 "
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/riece/Manifest b/app-xemacs/riece/Manifest
index 5c2b2456a5b2..45c81bb61a3b 100644
--- a/app-xemacs/riece/Manifest
+++ b/app-xemacs/riece/Manifest
@@ -1,5 +1,5 @@
 DIST riece-1.23-pkg.tar.gz 221779 BLAKE2B 27ca4a644fd332c6c1e06ef4886c2f2fe744d50b4e15d701e35948c9e7682ce5e505ea92e32c8d5b8c71f521cb40a91b78f0044930c1e21e1e1f93769052e592 SHA512 ead33eb49e46b47b769dc8940774f1d9e3855e2ec91c9434a80c80da4ad7783e6c04f4c25ab5b71cfb1364f96c5eec03224758cee3b68ba16530d76b310c0b74
 DIST riece-1.26-pkg.tar.gz 221484 BLAKE2B ec568695ba9951212db742e2c25be26b7af44d0b11d000dd849e9b40abf63c47a44c1afeae6f9964f5080758261cbcc32b36be5c8efdfece7931ada1c0ca0fc3 SHA512 0e15ae4f941f25878c0875b31cfad9ac9221c82eb8c893101512ea0395bc177538602e8b475610f7738f81fb83ebdb9887a7a7caf1cb44943b499bef8df7b66a
 EBUILD riece-1.23.ebuild 325 BLAKE2B d9db7c46e0770b2ee4013cfcf4fcccf5aac72d97aebd1c2f1eabac37bbdd97bb6b0de44862950ceb06b12404b233d239283da984df2973f045b09f596e68c4da SHA512 0ca5fe759207c2d04747d44e84b86fd5a3785dfa72f77d082831ffeef933838fc8543f44fa6965b2f9f2b1df1827043bd84507039e853f14a45d34cf6c94ee5d
-EBUILD riece-1.26.ebuild 327 BLAKE2B 560cce42018c6f52b3af031dab66a940ecb4ced0c4d55656325097055eae2208cdcdc2832ee732e6c67b7dde8ca4d237fb7ee41046d2fc91e8e6d46bbff54e55 SHA512 71baa2b885ebe3331665b53d1146d70ccbe4f7d06955cb1691d1191e0fce38edfe73ae4650409ade75f725d8131fbb88b181655e139d4cc4968e64a603f7cd04
+EBUILD riece-1.26.ebuild 326 BLAKE2B 44d2587787154fff54270f4dbc621868ef73e9eb8797b8ad793fb126ea09013d5931f9553dc2adc2c31eb118ae84de459e95548769ea103b86dd3782d17151aa SHA512 cfd58c7cf1a50b9f78424b167f9246f7da2b5b214366f78419478992eec7935595377969f25d522c3a9a50fdb6576341dbe9f8b6868baf6813770c63793145d7
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/riece/riece-1.26.ebuild b/app-xemacs/riece/riece-1.26.ebuild
index 60ac432a8b45..7cb735a17b7e 100644
--- a/app-xemacs/riece/riece-1.26.ebuild
+++ b/app-xemacs/riece/riece-1.26.ebuild
@@ -11,6 +11,6 @@ RDEPEND="app-xemacs/xemacs-base
 app-xemacs/mail-lib
 app-xemacs/bbdb
 "
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/rmail/Manifest b/app-xemacs/rmail/Manifest
index c52a545ea38b..61d970f45a49 100644
--- a/app-xemacs/rmail/Manifest
+++ b/app-xemacs/rmail/Manifest
@@ -1,5 +1,5 @@
 DIST rmail-1.14-pkg.tar.gz 96995 BLAKE2B 4d34d4a8ae5945232ce48405aed8c48d08a7db851a9505a53d4e2a699400a3bd95e405e86512522d64aabe1fd173ea0e2997a6f69df43c9c541bfd23605ba2e7 SHA512 a0e6c4279da4d70595c5bf1b90ee2047ccf181904f753f50211e2761fcb2d86a04267423e2076b276f5ea87fe5ab044c86c026c9e389cf38232518e288f60063
 DIST rmail-1.16-pkg.tar.gz 96986 BLAKE2B 3e7b56be235df5004d9b5b3f20b88894c75234d51cfdae2fcedbe499a306c75c176bc9832a833412590f50f7a6bf56cb1788efdf86ded3548da35d3ab9c204b3 SHA512 b06e1fa812c16d0dc7e54d89b115c14d6c96c31b9141a6f27c24dc3688f61ce76531844183d690224307de247326f95730e49d62de8a7f7b95d714ff0822545f
 EBUILD rmail-1.14.ebuild 343 BLAKE2B c4b4456de80ff3b18432e6e42b04a13c71fa86b92c8da5da2a013f1d5d14e7cb22912acb31378146b2bb1178ef73d7656a4d2669617c956403487e1de3bbddaf SHA512 aa0db8e997f57f1d501872e3adc502dc5e873674dc03546c67fcecd12a97a31932d9ea96bce359c5f3ca1edeaf6d6368a7827a63e391db7e871e73be437689a6
-EBUILD rmail-1.16.ebuild 345 BLAKE2B 7033fe7726d2b5f47a4affa86543331938dd67ba3c5ee4e65ca9233e312b88122a07a6d25afeac86f245903b92e36764c500c9c51dbb00abeb74f889c926a0e8 SHA512 13af258532c4b3bc87c410acca114e6c85e571af828915ed8609cf3247a01566687df03ff8358cbe5b015852ed01b8138d7764a1eb82684136b73007f3d6bfe7
+EBUILD rmail-1.16.ebuild 344 BLAKE2B 799e538be73f7e3a7605dfcce55a0f5588f47567267af28de0b8b59a34a530d513120acd4d210fc1d29b52fe81c2509453569a9d22c880639ededfe4b2f4738e SHA512 3806c2e33281ca492fe63ba067979e554303baa2f94b46f927909438b868964b5b5bcbe5fcaca763fb03a321b0dcbf8a013832b3a5fd5760604759e3e404f21c
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/rmail/rmail-1.16.ebuild b/app-xemacs/rmail/rmail-1.16.ebuild
index c2cb879afe53..6d79edc899db 100644
--- a/app-xemacs/rmail/rmail-1.16.ebuild
+++ b/app-xemacs/rmail/rmail-1.16.ebuild
@@ -12,6 +12,6 @@ app-xemacs/apel
 app-xemacs/mail-lib
 app-xemacs/xemacs-base
 "
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/ruby-modes/Manifest b/app-xemacs/ruby-modes/Manifest
index eb260f62fffa..8fdcf820b1fd 100644
--- a/app-xemacs/ruby-modes/Manifest
+++ b/app-xemacs/ruby-modes/Manifest
@@ -3,5 +3,5 @@ DIST ruby-modes-1.04-pkg.tar.gz 31720 BLAKE2B 914d61671d48f5ba32269dc1ac68a3888c
 DIST ruby-modes-1.07-pkg.tar.gz 31834 BLAKE2B 9b6fe228b9dcc88391fb88a55a60b8f5134f027d92f7e7c686dc5200b4d1d7188461f2cb5b90bd1f0839c7c3e6d1a0086a1b526e32c9ea54c97d1421ef318d43 SHA512 a6bc6481e2730396d898d3facb5ad65b3a859e66125242352c0a81621429b073c225d8b5e88a5e9e9b5f777afe567f247dae396aeac49663d86d70e4e7181bdc
 EBUILD ruby-modes-1.02.ebuild 303 BLAKE2B cc14942542aa0853b9e82e61ae9c7c8d9daaed20528f446ed7d66bde7ad4730abdbe675a0f360fa838f21c7c1206e7c406bc7063b0a15dd3a1a2e87555127877 SHA512 8543c9a085d4a41282ad84a1f27b8025ba0f04d6f5f9b3e8bbfcb62d18899d49f1a5b62df4f3c9b61106f3419cd6cca9a00015dd467595d5b44e75069421f8a0
 EBUILD ruby-modes-1.04.ebuild 322 BLAKE2B 4f0de3607b3d98789cf2b2c78a3669b03de1e2adb06c7756868f0757fe470175d1d3337c85e03e1bbe510e4c18088f49ebc65d2a80c8bf4a2d9c4dca612ade96 SHA512 1f572d9f257061d519bc87e2808c00ac2dd8daedc399c0f6b7454d17337b4bd747d9d15e27cc33a5a97b154f0cf9d6b0a4d0bad8b2935204f2558e81cb20b821
-EBUILD ruby-modes-1.07.ebuild 325 BLAKE2B 4c450b7220cde0acfda6b503f3424c116dabfed68845909e7f53eca39fb526157cd2b568ff42d41b615bbbcb9c35abf8bd4c017264910df9c6081f396c766d48 SHA512 281a65936cef81aa2ba918e26a48b49778407e87e920502b114a6d1ae6c11e4901f9073ac051b9e055f7eecd3e6812c0a610609e1f8476eba56c04f8f6b6d65c
+EBUILD ruby-modes-1.07.ebuild 324 BLAKE2B c488c8720d4845bb739bff774ee40930190a3af6b252a124aa1cd256feeeb875e19005fa8f70b257b072e66ae1a5d7091e77ce7282b11517f3873c3e6f8a732e SHA512 8870180d1f37e4a9d6df61094da58cf91e86858fdb299c1f5fe13c0ff8f4c6c72a5d2dc60a4ca1f3b23dad856d132ccac64e5c5b8407aaaaa9c3e41b3d46f913
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/ruby-modes/ruby-modes-1.07.ebuild b/app-xemacs/ruby-modes/ruby-modes-1.07.ebuild
index 3be8fab5d4c7..158d4a0a3fd3 100644
--- a/app-xemacs/ruby-modes/ruby-modes-1.07.ebuild
+++ b/app-xemacs/ruby-modes/ruby-modes-1.07.ebuild
@@ -10,6 +10,6 @@ XEMACS_PKG_CAT="standard"
 RDEPEND="app-xemacs/xemacs-base
 app-xemacs/debug
 "
-KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
 
 inherit xemacs-packages
diff --git a/app-xemacs/sasl/Manifest b/app-xemacs/sasl/Manifest
index 36aa4dcfbab5..8fceb80f02b1 100644
--- a/app-xemacs/sasl/Manifest
+++ b/app-xemacs/sasl/Manifest
@@ -1,5 +1,5 @@
 DIST sasl-1.16-pkg.tar.gz 27864 BLAKE2B 0db7238e14ed56beec938885d881375a7e8635bfd369cee52db9daa70e27401237ee313b841f6898732121beaa4bd445945468175f94dfc17efbe7a1f391fff2 SHA512 dcc0a8c14b1f7f687f7abe9409f69c9501f0f8b5ae89d12bcfe9193922c196635e01bf5a0efd7af148e89daaee5a341d84e1d3f597f4904b1e7e3bad4b8e16df
 DIST sasl-1.18-pkg.tar.gz 27944 BLAKE2B d724598af6a93d9fc33f6eb2d0daea293e27ab12850c1f87c3450f51fb6f7f20fe68e390ffb49feb14e7254fb4c9aabf3af6e1f7ed2cac055f31c98734a0b3ac SHA512 cbfcbf123ed1b6da27d23a0a0caadf0d085168ac6d33529f4bbcffe9ca319e8d8021b528368eeed1c905bb7d6a93bca5506a3e004ef185f7c341f6bcd1e1cec0
 EBUILD sasl-1.16.ebuild 320 BLAKE2B 60e2b0a255792042ccc9af2ed696885c0fe72c0073656bf1bc187f2bdf8e21f7b0d73352850061b927f74393f6c942c68a5563aa1204b9afe247ca5c57354f7f SHA512 4c9d6e9b15802298e380f877bf74bcd905e404c2c3fd37518feff7d21778f2fed5e3b0cb246f3f0106c90d22d45a74c6498b00b18b5449beebed7903d50004eb
-EBUILD sasl-1.18.ebuild 322 BLAKE2B dd38ad8ec4ac175b1f137bcaccbb9cc59160c2e0e81bfefb471e007de7eefc05f13bcadab2b6b44d12228ab4bb633960401b57984c46e94ff33a0784ce501454 SHA512 bf8f112f4d59aa08bf12c10163dddfa506855d88375a311eb0274bc94f9364ff73d507172c59808c9b6b4b667cb832c740b8774444b1b5caf237bc64ac85cbc1
+EBUILD sasl-1.18.ebuild 321 BLAKE2B 4809e1f4c1f611a058a0025f133930f028370acca91acad029af79309783bc5f15d601edc7cb0355201685e14209d33cfab137b4df210eed975f82d914b890d2 SHA512 c887eb9209d32b66fdd2c269369e1c355fc306cd81a21cc7bf0c9e6ead1457598e9d6c103f029d30ae53376bbc9d8934b2f96f766e3cab90f35536849565ada5
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/sasl/sasl-1.18.ebuild b/app-xemacs/sasl/sasl-1.18.ebuild
index 2b87de2a4434..8d85f6d0ceb5 100644
--- a/app-xemacs/sasl/sasl-1.18.ebuild
+++ b/app-xemacs/sasl/sasl-1.18.ebuild
@@ -9,6 +9,6 @@ XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/ecrypto
 "
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/scheme/Manifest b/app-xemacs/scheme/Manifest
index 71d12850d799..1e0b7522522e 100644
--- a/app-xemacs/scheme/Manifest
+++ b/app-xemacs/scheme/Manifest
@@ -3,5 +3,5 @@ DIST scheme-1.18-pkg.tar.gz 38398 BLAKE2B ae9846c8c60d644560644535e9a3570e86db0e
 DIST scheme-1.22-pkg.tar.gz 38550 BLAKE2B 243c74fda930330bb6385a346496bd94cbd8a09ba968bbbf94b9c4355d9924e10e5b708c4cc03056714a3e52c0317ddafa83d55aecefd64b47b07ef2bda9d8ee SHA512 f74d7c405047f86125b042a2054ec5522cec9c1bd6f9686e984d3eef674afdb9971400932c0794323a59eedb51a6d5f81839bed6ce37e7ae5b14d149de6233eb
 EBUILD scheme-1.15.ebuild 306 BLAKE2B 937237c94e1a76ebaeb7c6fc604fd87fe0b782da88882dc1dad483389f86a104c32c367a737d45eeaf2dc3a47b5b3bf010bb3f0cca0967b2a35717898eca9df7 SHA512 6713c036d2e8ed929044ae8b2aabdec8cf4145915299c09c2a9881cbdeacf4a8f0c1c8e4d4c255660699eb94713696f11678dd369d71081816ae2bdfa8389096
 EBUILD scheme-1.18.ebuild 306 BLAKE2B 937237c94e1a76ebaeb7c6fc604fd87fe0b782da88882dc1dad483389f86a104c32c367a737d45eeaf2dc3a47b5b3bf010bb3f0cca0967b2a35717898eca9df7 SHA512 6713c036d2e8ed929044ae8b2aabdec8cf4145915299c09c2a9881cbdeacf4a8f0c1c8e4d4c255660699eb94713696f11678dd369d71081816ae2bdfa8389096
-EBUILD scheme-1.22.ebuild 308 BLAKE2B eb42e98d77b0a1b601828f78b95084e3b2c8fba0e92dbe623a4f46a0b7d53f51ffa141ce2d72885c318cb71c1cfb99b97231c4dbf34103ecf668b90d0cb14fec SHA512 be52146276e0e14400603ef9ef67bac4f7407feb9698133862413f0af031e257cc4a236759b36c332647b0f19e636ce387b189f0cfb258b341c98da2de483e26
+EBUILD scheme-1.22.ebuild 307 BLAKE2B a43fb1ef88ea41a0b07280cff4ff8342459b4a72c0d0668ea6887bc94fe399495a208ac3ca2f29bbea21d030e9458841847af9d97995844030ccac57fcac0ef4 SHA512 754d11ab535fb738e04a1e899b9ddd5d847abff53740c2d6f470028647121421683c577ecdcb6fe5f267adc198ba1904329c02ce9b46a9b931899c6997db5424
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/scheme/scheme-1.22.ebuild b/app-xemacs/scheme/scheme-1.22.ebuild
index 97eebf0d4205..2ad605c14bcd 100644
--- a/app-xemacs/scheme/scheme-1.22.ebuild
+++ b/app-xemacs/scheme/scheme-1.22.ebuild
@@ -9,6 +9,6 @@ XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 "
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/semantic/Manifest b/app-xemacs/semantic/Manifest
index 9c1bca23f975..33934d24c0b9 100644
--- a/app-xemacs/semantic/Manifest
+++ b/app-xemacs/semantic/Manifest
@@ -3,5 +3,5 @@ DIST semantic-1.21-pkg.tar.gz 1367279 BLAKE2B c4c4d0fc81039455e511ccf9b8439cafc4
 DIST semantic-1.23-pkg.tar.gz 1368143 BLAKE2B a08c133146bd09587172f00a6fb17b6fc5e83f61ce06411fa316ac8727fa1c943e6b049d565e25762a14d948748529e25e76e2cf8e23e73f9fb33a145847a246 SHA512 9b95bd29083a6ead42255a51c46b2f8ca7c8a176044374764b2769e63167913e650ffb2007f17954394b8d2388e1e3fe410906aea826359ecb5982573b6952ab
 EBUILD semantic-1.20.ebuild 488 BLAKE2B 3c9d67b129c5c1d202ee650f3beb5e09e9f8592362107b6c3607dc9c51dee87cadb1e80f2a9355a4f4729f5a07186b4ea32b6ba49b2e6d20c8426d9a611e8d03 SHA512 449eac40a5a46c5bfc6e80cb5d7e726da370cbf7d1ea93f774755e57a7955a5dafa4127c24bf775739ff4b1852984baba8e49c3b6de684934269f1b192798f75
 EBUILD semantic-1.21.ebuild 543 BLAKE2B 9146f0ad986a9ea4b264e13890aa9909274fdc92824d50d11f341edb03c461fa0f7735ff726c5926d34e9b6f38dffceb7cc7c71c5cc3019f3e81ac506538a14e SHA512 a877ba4c411bbb0a500eac0672cbd4f2a1a1297a58235d6e9303570e32c18594ba1431fc954aef78fe8264b6eeb90f354588f1af7842663bcb8c89d519b8e342
-EBUILD semantic-1.23.ebuild 545 BLAKE2B d1d10bdb1c8a56351f69064d18c70942ae44ab229042816845744463a75fcef7eb5af468693849dcb1170f44aec5d428a978e4ce2ddccf329a83b02a56d56111 SHA512 e1f397bc86b55cdc4b5c4cef5229fc392e3509a90664e3b8b7d9ad839a8babf57dd8bb35918cfc3344f63b45ac39c3d2e5de8f9ffcc2b873d580364a5dcb44e1
+EBUILD semantic-1.23.ebuild 544 BLAKE2B 9ae56e0df5f5795dfc5ea3c8b9125d54552329713dc0d0a1cb24274342e9cb41d367e788824c103ef80a44fbb7ae896dadd428f00bc560e1de685a048fe2c121 SHA512 77168511e4c65b5479eb8fc7d0c6352436815bc30eda330cd5b1ed5246b1d256bce96b9ed4f8e50a4560fe3e2f4f85046a0f527c9fc23b387490fb633543388f
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/semantic/semantic-1.23.ebuild b/app-xemacs/semantic/semantic-1.23.ebuild
index fde1045ef79e..1facb1d1d567 100644
--- a/app-xemacs/semantic/semantic-1.23.ebuild
+++ b/app-xemacs/semantic/semantic-1.23.ebuild
@@ -20,6 +20,6 @@ app-xemacs/cc-mode
 app-xemacs/edebug
 app-xemacs/sgml
 "
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/sgml/Manifest b/app-xemacs/sgml/Manifest
index 9b39b15e8115..104661d58193 100644
--- a/app-xemacs/sgml/Manifest
+++ b/app-xemacs/sgml/Manifest
@@ -1,5 +1,5 @@
 DIST sgml-1.11-pkg.tar.gz 27506 BLAKE2B e12c4efdbdc8d66fe381bcd650462bb0b07bc9b13a7a9fa7ee51a9b850b904b737788a888ca0f4c91265e1be83d6343143c3fc97b8aaa1bccf5cd78c0e3ab0b5 SHA512 cd3e8d8694e77aad00d60f9331e60769cd6308715c698ed9d260b6d31838ba1f2e76fa0d90b430dad010b886576f8263d8223ca73ffda7d3654adcbc0d15b7d6
 DIST sgml-1.13-pkg.tar.gz 27499 BLAKE2B 7fab47838b14899e4c018a929d87f1b29abd0b155432c8484689ffb5d2fe4b61a6333364d19a4195daa39be43acc4a56362cb9ebdb8e4811237b834e37c2321d SHA512 5b33ac176bc39b181b8bcdc10d1d165ba239bc3535f461e08cfd56b44c782ad8d56f882903a2e9e0ef76544371992b95ceba654846535cdb85c1361a84333ab5
 EBUILD sgml-1.11.ebuild 295 BLAKE2B 3336901ea6db34402ad0f1ab6174dcf70d8e7a3090726331ed635d05075ff7f44fa0877a4503a477e8369c63cf1133706a627d32c2a1e6f203298b42ae42daba SHA512 8ed65cef663a3e4e95e5ee221cac87e14d4249e703c3fe27f1f5335002a67f5ef7a8001e53536f4102529dee6a2014c4aa67b24200eb0e8bb788f36d2fd38b1d
-EBUILD sgml-1.13.ebuild 297 BLAKE2B 45003fd0d66a38b588fcf7273c715a0e2da5eacb8e20d9d40716537fc1a5c9be3dfd98230cb3427f48eb56332bbb86491d661ba7501e59a5ac53df9bee60e09a SHA512 bd0e32f1e2bd2568c5375bea17785cfe70fc05f6edfeaa0ce4ba8db5021c941ed9600c83c4da650d67b896f27763860fa1a82cebc5246111fc6c37d86f9723e4
+EBUILD sgml-1.13.ebuild 296 BLAKE2B 75bb26eca69a43e88d6a8759cc708d54e40fe10a8ffa6ab5c357ba201844c810d9e79c91cd6d280818373f6bc2754ca08a6ca90916b777f027e9b2e8d2bae905 SHA512 43d5b49d05560a9b971b9988f08ac582fbf111771a1b165f6ae1915a9ed8aa93c61ddb6c066d2dd98bc3b5147ea9f37732f989d36a2e34fd5e346a4e6d835ee5
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/sgml/sgml-1.13.ebuild b/app-xemacs/sgml/sgml-1.13.ebuild
index 305aedf6c858..b0d2679d8925 100644
--- a/app-xemacs/sgml/sgml-1.13.ebuild
+++ b/app-xemacs/sgml/sgml-1.13.ebuild
@@ -9,6 +9,6 @@ XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 "
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/sh-script/Manifest b/app-xemacs/sh-script/Manifest
index e03f302465a3..9b91a0e42845 100644
--- a/app-xemacs/sh-script/Manifest
+++ b/app-xemacs/sh-script/Manifest
@@ -3,5 +3,5 @@ DIST sh-script-1.24-pkg.tar.gz 70667 BLAKE2B aa1290823da1d23a1eea030ae68fa5d1458
 DIST sh-script-1.26-pkg.tar.gz 70687 BLAKE2B 59c9f37a7e90cddc5968aea984348e8cfa366f51b59d5ba23be27d5f5b37bc02d9da879b011619cd8595613d1f5a760b9b325570ec95c45c5122aa9c622b1d34 SHA512 fed9b6796cb22838e40d400b8f21ce275540c8e9ae7b779b8cd214a2f16887fb6fe9bea985898fd4e8d0410d60dd20796690dca5d0a0cc019a26f757517711d8
 EBUILD sh-script-1.22.ebuild 302 BLAKE2B 3ca1b4fda2b78792a2e792dedffa954c365ce59c3bd87ca6ba432bd58271eca8b8452c59beffb37f874c5bf16772a9c397c9f5493191fda99a275a0629190544 SHA512 67921ac348d705374c0333bd40e7e3bbd0e335dd6794756283dd9f2ede1b86098d06b1c50fcf484435a3353c396debbd4c528581e366750d83f7ef6f42d7a4d9
 EBUILD sh-script-1.24.ebuild 307 BLAKE2B 5dc98cf4cbc2929080098fdbfaba1b863696273d39b3e847ad41cf42553537f93ff785a877e8d6b837d65c6a5e724e33a19a958a55bf0250693d6bda55151de8 SHA512 6b2470c568159de4c31824810917ad6f3fefffbf2d865528b8fe27269cb063b67d4e57b30351294272bd68fbaabc42a0f0ff797cc72b0f50184658a088ab1f3a
-EBUILD sh-script-1.26.ebuild 310 BLAKE2B 759a12fe8d6562f7f2177012a58edd0e9143c4f4e7b550dbb2b40d23964e4b6897f7d473b5a640d58de0c7cc8e5c90a4a99554c01a07db57e1781a8bd8584d11 SHA512 cfad9b948cfb05af7da74f76c79f5ad2b084891ed16185bdb6806675022a7d60ef1ccf0f22c06f55cfaa5ab539894fbdac69752b9b4cdd4e993df835e968c44e
+EBUILD sh-script-1.26.ebuild 309 BLAKE2B 6539b3c586ef7a20c04a2c5d064d8d8e5e9718d299d3174f0b59c2a590044f26b8cbfd344a49436c55d4830bfd28a06e532b998a7bae53e115c1567f832f7a06 SHA512 a71d6f4bf1cf01fbf9780d0b3940aee63c20a2e55f2f37bc8498f29d4d74336dff2ae75962da0a74b15808c97acb75b33f24274d875503448cc4de08682974eb
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/sh-script/sh-script-1.26.ebuild b/app-xemacs/sh-script/sh-script-1.26.ebuild
index abca1f4be92e..809dc99683cb 100644
--- a/app-xemacs/sh-script/sh-script-1.26.ebuild
+++ b/app-xemacs/sh-script/sh-script-1.26.ebuild
@@ -9,6 +9,6 @@ XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 "
-KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 ~sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/sieve/Manifest b/app-xemacs/sieve/Manifest
index b8df726f738c..54b7718ce4a5 100644
--- a/app-xemacs/sieve/Manifest
+++ b/app-xemacs/sieve/Manifest
@@ -1,5 +1,5 @@
 DIST sieve-1.18-pkg.tar.gz 27387 BLAKE2B f619083c07840e0386a47708f79ce1e1bb0f3693b3e675b6945b0cd5cf63ae3c1bddd974e10607f4ddaaf1954b69c26ff29eb4f4d5f294b9bf81907fe236fc1e SHA512 cd870e7cc302524818ffb081422d5009e046da11b4228baecf43b0b872719f223ecd3ddc9fcaf86f474620cbeb0d6d672a505c1a7151772e07149369102a3a13
 DIST sieve-1.20-pkg.tar.gz 27640 BLAKE2B 7cd851e6b8fcd86bda0fa435c32946ffa667eb7ae5a27cb16df6f619a6990cc10578e90b950bd4586fa0281ce1b6ec9396fd55c4ea8beaea08fa9c2d355914da SHA512 14d2fdd89b58a53ecdf99487d5acd0b18d5d0505c3c07ce24054c636aa52a2b868fe20bb77dcd613b32634025c9eccb220716f2ba10ed95fa460e53bc74c95a7
 EBUILD sieve-1.18.ebuild 400 BLAKE2B 806587a682c9daf2215a36b54790fcaf9be98208ba62afca30fa9a61d7a2a619ae1c21c9285f678d6d9612b0176a1fc4a4a1c7a00bae1ac9f3b539a3ede07c7e SHA512 a58efe0f829430abc9489471296d0bc7a49f05d5a892d9c9ba803645cdcd8eaa7ad33b2c952536daeff4e5dfaf0167f9e8e6861b103d48e1007d5aef432d9cf4
-EBUILD sieve-1.20.ebuild 402 BLAKE2B 61f71380fa47b9b20e39e187eb4aae3161aa01a3ea2a98f4ddf9dd8fcbb7e42d455333640ad47e7e0463a2aa9b212f01dd5914465242e555ee0e7842e66ec070 SHA512 34408a6279a7c0bfd7a3ca1788a1f4342ada8b698b0d655b9dd578e28c8497c9c4490b0db11e70e1a83a94b469608971985725c76e03e901f39e1dbcfdd3af24
+EBUILD sieve-1.20.ebuild 401 BLAKE2B e334958831ca4a6d8aff888ae9fee04de197509d66dcf002cc317997f226ee37a996664c2a42b62ab3c4965c2465be65fb7f41f8c5b9275f9cbb9eee49376f05 SHA512 f0fcb95ab20fc1352019604ca2a007946d21ba6fdb62f30c201a9f4967b0efc4129f139d0b5f36ea5449d9b183877b3f6fd7db5633daa1fe4a9e764f4c90e5c6
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/sieve/sieve-1.20.ebuild b/app-xemacs/sieve/sieve-1.20.ebuild
index f69cb1930090..a09f0aa12196 100644
--- a/app-xemacs/sieve/sieve-1.20.ebuild
+++ b/app-xemacs/sieve/sieve-1.20.ebuild
@@ -14,6 +14,6 @@ app-xemacs/sasl
 app-xemacs/ecrypto
 app-xemacs/sh-script
 "
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/skk/Manifest b/app-xemacs/skk/Manifest
index 443097bb667d..24c702954de0 100644
--- a/app-xemacs/skk/Manifest
+++ b/app-xemacs/skk/Manifest
@@ -3,5 +3,5 @@ DIST skk-1.24-pkg.tar.gz 1464019 BLAKE2B 28dcaa38a64f4d795494e0e5e37c94125a05bb7
 DIST skk-1.27-pkg.tar.gz 1506880 BLAKE2B c7b7fae367bb787f20d0c18769a8dfd26de6f74e7c93a9dc58e81c3fb16a6df30569204d30944718ce0262d91a59441a61592aed24a4bf8f2946ace6ff64154b SHA512 d8effc3e2b3c2c277c8388c3813379a0826eb7993287889f0ddab3b9edf08b415ca209ee2da3b948a3b803a0be0d12e46801978faf9dbd7f07edff9bddd84280
 EBUILD skk-1.23.ebuild 370 BLAKE2B 63e99b4755a3cc4235ceec41b43b960ebfc10e4c7c8e6d1948ea4d69c565788c29f0a65ae2a2fa06680930325d17ff4126d4a42d6ed0790807c68ba65ff913da SHA512 aefa13013d6237d48716cc4f37ff8686c07896030ba65d668e296d5babc52f019c4ec2c288274b6bae21605224fb4279cc6b4dec540e992a3dba60cc1721707a
 EBUILD skk-1.24.ebuild 371 BLAKE2B e26ffc0df314cda2249a6d72ab70c6d9ca0e9d726adba73d7dc07942206ab14672672ac16afd94e964a08b90e8d2b07074c7b3fadcd63492cb95874ec5200f7b SHA512 ea4ad2e797b4f998be8ef918aef72b80a9f9de0e9c98320cb4c80437c4bc909d1836f62a93ab45d158af5e337ba4ab90b72c07d008c998ea0126c3bff6c6b21d
-EBUILD skk-1.27.ebuild 373 BLAKE2B 0182b733bc65bde6c5acc2bebbc17f57f5262f17dfcc42c4da302cb908722a428b073434f50532e5f6882b23cc6e55c03d7c145e9da4aabdcc319ec0c508b59d SHA512 fbcd127cb51ab43fbfa4cf353b0ff78a35be0ddccf941d49df774d2f09490700dbb47bcb3854dade3358b88c976d1a9ca07a1e8aa1a3de565926220f6b2bde5a
+EBUILD skk-1.27.ebuild 372 BLAKE2B 2ad36b3c6553729f6beb6a5f6d998e595b0f5ad8df34a71c9affddf4f0f843797db9cacd32a67f20b2ac58d2523fa085ab24dcea7c6d2cfeb958222866fb7c65 SHA512 ecd92e3a8eea51f18eb9ca54fa131fcaa57a871cfa2c69a35095d180d081aeb2866a953e665456d5bbad6915a4a4a6f9ab86df74395b3abef7629eba33a313eb
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/skk/skk-1.27.ebuild b/app-xemacs/skk/skk-1.27.ebuild
index 7fc9e54bfbff..5596b93dfe19 100644
--- a/app-xemacs/skk/skk-1.27.ebuild
+++ b/app-xemacs/skk/skk-1.27.ebuild
@@ -13,6 +13,6 @@ app-xemacs/elib
 app-xemacs/xemacs-base
 app-xemacs/apel
 "
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/slider/Manifest b/app-xemacs/slider/Manifest
index 0d33e0db1690..963f771291ed 100644
--- a/app-xemacs/slider/Manifest
+++ b/app-xemacs/slider/Manifest
@@ -3,5 +3,5 @@ DIST slider-1.16-pkg.tar.gz 12857 BLAKE2B 6713ee639d6ebb6d21de13b59a34cf651543f3
 DIST slider-1.18-pkg.tar.gz 12903 BLAKE2B da1a3935f4265d0f14c8554729f853c2a542b929f2f95e69b2833c0c8e10fcae05c28b699e5da32169cfe0f60cfdb9d0baf9c9dbf9676a9f47b55d1256b7f783 SHA512 966bfe8104d9f1f697319e04b9716a263e8476afb884941af2f50198a734057121cec8ccaf11227d7bffc3b7025db32208387d0a2fcda4b4fed36bf4a6dc0990
 EBUILD slider-1.15.ebuild 254 BLAKE2B 9ba61d026d196eb152ff34e078458382b8dd2893e8caacda42b2c6595caa347137493ac0c128d59cce66e2d89f5fadcc75631ac23762791c0791c7609688f3f0 SHA512 b1fe14a11e8d05c5c43f240c069eccdab2f024e949c1439ff27d02386f3b845913003f2fae18f29f5212c0e9b98365822efacfed8cd106d52b2eef796d6fa800
 EBUILD slider-1.16.ebuild 254 BLAKE2B 9ba61d026d196eb152ff34e078458382b8dd2893e8caacda42b2c6595caa347137493ac0c128d59cce66e2d89f5fadcc75631ac23762791c0791c7609688f3f0 SHA512 b1fe14a11e8d05c5c43f240c069eccdab2f024e949c1439ff27d02386f3b845913003f2fae18f29f5212c0e9b98365822efacfed8cd106d52b2eef796d6fa800
-EBUILD slider-1.18.ebuild 256 BLAKE2B 418b709c3cdc58dfc9efc9a6ad600fb189e00b1048db660295aa9b61737cbe0c940c971957f7e2d2cc49fe172fd88b0cb683cd5fdb8571dbd549d71d8d657d81 SHA512 0fef0c40cfc1fcc039fb9696fa815eb53e777a99a7ee7b2eb7aa6c1723ba1bcbbf2c8dc3c40c76b5ba9f6eddff1b4a64854744eaaf41cd4ce168c0922335bf9b
+EBUILD slider-1.18.ebuild 255 BLAKE2B 6c1819d35009efae6633bde40fda1f337238ae2e5729dc607a153c71088151fc3041cc1fbe87472fae3efbf096f5ffbc9af28f5622c518e8865dd4d61041f568 SHA512 a7d0bf01d3fa1ad064369e2475522424c071ba5cae9fbfa906291310fc83d1cf732c378dcc0e15d7a2ea9b10ac4aa8e540c1444352592fe7861aae3dd63e59a8
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/slider/slider-1.18.ebuild b/app-xemacs/slider/slider-1.18.ebuild
index a7cd5fbb393c..d200e395af1c 100644
--- a/app-xemacs/slider/slider-1.18.ebuild
+++ b/app-xemacs/slider/slider-1.18.ebuild
@@ -7,6 +7,6 @@ SLOT="0"
 DESCRIPTION="User interface tool"
 XEMACS_PKG_CAT="standard"
 
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/sml-mode/Manifest b/app-xemacs/sml-mode/Manifest
index 8440ad113efd..3c8773974584 100644
--- a/app-xemacs/sml-mode/Manifest
+++ b/app-xemacs/sml-mode/Manifest
@@ -1,5 +1,5 @@
 DIST sml-mode-0.12-pkg.tar.gz 82366 BLAKE2B 61ebbe1dc2b075a65dbe6f6d852dbbd698017414c741b9a551afe3b80f3c8d6dafa96793dcdfa22a76a89f6fdf982acf8daff9d3c033cdd0542f3f92f941ce93 SHA512 7c059c485577516a13d4b58c594fc78eaea1779714d6cdf98a1ef57edd9b1e0442e854b421a8d9e9fa32cd2d8a060cc02b7e4743d3494a1f7271ac06fb092a9f
 DIST sml-mode-0.14-pkg.tar.gz 82549 BLAKE2B 79fbda68892b492c5d6839e0a380f5359776497eea32b99a9c77e663c6a0126dd3374f196fab712707b07f9ee7e36dd294343e273e08688b2ff655bdf876930f SHA512 fa15d961f67a71f545f0a417ecb67a12a518f89fd296cb8af7982e46fbc56dab0e352ea045d946ef477ccb0956845b4cebc09794a103c66b48c162355fe66961
 EBUILD sml-mode-0.12.ebuild 328 BLAKE2B d32c2512182ff911bc454d85ffd6d429628dcc6e05e8f5b28f9f147a4b43235c6a5ab32ce713a63b19b9ddc2ba167533acff4877c27eb041a8498e482fddcbc7 SHA512 1b09f2028d37b3d8f56b6768634d3c98ab781a561b3fd187e741a8ae4fc4d7effbd5e78390d236a8ee027995ad6a6314d2b58c536e8d2e104c9f2024ca1993a1
-EBUILD sml-mode-0.14.ebuild 330 BLAKE2B 8ccdbbe2fc104c58774d73b1073b8d6f8e8f8bcb1bb89f785faa9adf456bd0d4a2b018bf26ef7b413593e4b95090297be4663ed75dba8bc03bbdfc20453b62c8 SHA512 935af3da3a00f4b74975f5ec25361af35afc067f72c7967e1e539358785689f1653b898d8b3d9a0fff73effcd271070085b62dbee4e14df52927c3632530a2ee
+EBUILD sml-mode-0.14.ebuild 329 BLAKE2B f8043f1ab4e59527332ae1e695aa1a3c79affb304d3758ca133da08fffd2f42f64a4a3d961ca703b5081378a9c45ceff3c968e57f97afe7cd7132d660e3b06a2 SHA512 4292c3628b852aa6f5fa01b7c7e7b6984bc047995f2857f168df25a62323274a18ff864b7b0c104131b9e9c74739160d1407fb87fbad7dd26c937d5d3243905f
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/sml-mode/sml-mode-0.14.ebuild b/app-xemacs/sml-mode/sml-mode-0.14.ebuild
index 62f9ba3c48db..3b31c9e82691 100644
--- a/app-xemacs/sml-mode/sml-mode-0.14.ebuild
+++ b/app-xemacs/sml-mode/sml-mode-0.14.ebuild
@@ -11,6 +11,6 @@ RDEPEND="app-xemacs/xemacs-base
 app-xemacs/edebug
 app-xemacs/fsf-compat
 "
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/sounds-au/Manifest b/app-xemacs/sounds-au/Manifest
index 603c4370c602..7a8224201814 100644
--- a/app-xemacs/sounds-au/Manifest
+++ b/app-xemacs/sounds-au/Manifest
@@ -1,5 +1,5 @@
 DIST sounds-au-1.12-pkg.tar.gz 126817 BLAKE2B d7942cb4d249ab8e147658bdccec4a837ee7834576d10fd71f7c070e3c4b23bc2df6233d707607e91172ebed3c4fd09f3aa1dccf25841ae106306764303892bf SHA512 fd7022f1a7c23b041416cb1c0eb0532fdc5dd492b37c4e1438d9d1f24ebbc7544488bcafd1eecb36b9183bdbe7494b5fe0ad6bf8b2762a573094675d80c5b5ae
 DIST sounds-au-1.14-pkg.tar.gz 126825 BLAKE2B 5834bb6d029961cfbcaa55aeffae3dd85b92c0668000a3f783ac58f3048a19f607b08a7f8e6aff6be0db3d22c78dcf34dbc401644782104add7a8a1fd23275df SHA512 ba4208f0f0d5e4b4237b8e1fcac22d53c634717ec84205345294aa5b0e51939445da39167e9edd6af365becef6164488501d679d89b858bdca4816845543730b
 EBUILD sounds-au-1.12.ebuild 268 BLAKE2B e2a19d6b3b1c219ece8e8bd7c8acbf012a58fe97be26287484cbb44269fdc27764dbe10c5545a847298b7112f928ea613357d9036cad8141ae56f1c60f634d42 SHA512 ca12bd90c7b5eccef24fa8f79e523de64f41abdf593cfa62a24288bfbf56d6365a54b7a3490b697469f32c426a457e32e7598493f4827554e34f0a6bec2784ce
-EBUILD sounds-au-1.14.ebuild 270 BLAKE2B 1ce2e52bc4e73ea3bb2afae34f5f681f3d1954f95a7a4d0c7b575e1da146ac6fc2c5a2b1d08dc487acdee678460ebb59d620ac88db8c26bb397121070d89275e SHA512 3eb567a32b94618df0c606c7a676ff932611d3640277fc2836dfce1c7de58e399112832385b0a5680580bba6565d8b0a98b321aae01b3d7bfa5a8da3c7d16451
+EBUILD sounds-au-1.14.ebuild 269 BLAKE2B 9ad819cc3a45b4ffc8a965a412ba6e1a293acbb4b3a5474249693147c466933a12150211901afaab8bf205608f9fe1735368ed1468a7ec0d45d6f083ed363062 SHA512 20086d686c95bc29f542c89e070b3deb6347ede627bf66fd19e84efb55bdc92934b843f8a06efa382628ff3a1041911896f661c66b40da9e5b1c63c78011bc83
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/sounds-au/sounds-au-1.14.ebuild b/app-xemacs/sounds-au/sounds-au-1.14.ebuild
index 037eceab1b49..aff7909c7e7d 100644
--- a/app-xemacs/sounds-au/sounds-au-1.14.ebuild
+++ b/app-xemacs/sounds-au/sounds-au-1.14.ebuild
@@ -8,6 +8,6 @@ DESCRIPTION="XEmacs Sun sound files"
 XEMACS_PKG_CAT="standard"
 
 RDEPEND=""
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/sounds-wav/Manifest b/app-xemacs/sounds-wav/Manifest
index 21bd8132ce33..5ceca96dafd7 100644
--- a/app-xemacs/sounds-wav/Manifest
+++ b/app-xemacs/sounds-wav/Manifest
@@ -1,5 +1,5 @@
 DIST sounds-wav-1.12-pkg.tar.gz 149624 BLAKE2B 3ee397582fba2258d32351875aff4747ca799468c39d3c47411970feed6d0f352c2b572869e7cbcb456eec153036825061c0fae40c916bc0dfb79f06ee57813d SHA512 28a996d2339de6a69efdb95b42e6ca407a6fb53f1fc4af5ba8ef6a95ce7210e804d52c6e4ef85c3383324ff1125620ce45156a0c3581091836c9e21852cc5f95
 DIST sounds-wav-1.14-pkg.tar.gz 149635 BLAKE2B 7d7430b8db6a9ca42e2906d7a83b4f4b2f2cc59dd92bce8e9689dc07d5353fb629f1da038ebe2e9661c7849cb53514dd879959da415d9c26d1467fa3ca6fe6df SHA512 cb44e4e1e1ec3e9afabae575d31e53ff03eba7d6fe00e8ae5bf17841861da1c9810106a4efd414ad4e2a55d99338a82b807f7d8fb5ee8946c7b2f81d903d8aa7
 EBUILD sounds-wav-1.12.ebuild 263 BLAKE2B 67222c096b92658dcc2a63cfbaac0045d0740ac5fb095c13d2ef245d69134ba2f90fcabee68abbb74efdeed23fb272d37e4a55112c10aaee5871ece794284b14 SHA512 526448d98906c0a44e0a289503c603cb0ec61dff94124ef4d9c84ed10cd3a9fa1f391b2fdd90a8421dff695b0b325c53ec80f1ceb4292a3ebfe239fd7cce3ea7
-EBUILD sounds-wav-1.14.ebuild 265 BLAKE2B a58739c486483659914bda13830bdc3c6ca371b8368b49d2349c510ea674b49219ccef89827fe5d764fba475e7d7d93af7986e59fe1b0830fd422eb45f3c42c5 SHA512 b4d05689f5444ac0780de462035e17be4e1e678846f8552992bb2463d9bee8f1cc87db9ac1132b2ccda78d79434c68fe33e2f5baf5894468449b118f4f0df5b2
+EBUILD sounds-wav-1.14.ebuild 264 BLAKE2B 17426941384f9381cd6f67aa66425de583cda476b60239abd07130c9a5e0e91ac961bb308530c4b162f6fe073510eb64aefb083fe2dafc1ef5ba66dc735a6bb9 SHA512 6b705f7b2fec9b53f1487dc8d9a8fc06332ea4d25c8bb8bc0c97d6deb0e0403c8f9af0f4ae7e744054505b1cc1aa2fbf85b88b35754eb071e03580405faf98cd
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/sounds-wav/sounds-wav-1.14.ebuild b/app-xemacs/sounds-wav/sounds-wav-1.14.ebuild
index 67f920628e57..55dcc659a786 100644
--- a/app-xemacs/sounds-wav/sounds-wav-1.14.ebuild
+++ b/app-xemacs/sounds-wav/sounds-wav-1.14.ebuild
@@ -7,6 +7,6 @@ SLOT="0"
 DESCRIPTION="XEmacs Microsoft sound files"
 XEMACS_PKG_CAT="standard"
 
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/speedbar/Manifest b/app-xemacs/speedbar/Manifest
index 40dec8b9f965..586833832ce0 100644
--- a/app-xemacs/speedbar/Manifest
+++ b/app-xemacs/speedbar/Manifest
@@ -3,5 +3,5 @@ DIST speedbar-1.29-pkg.tar.gz 153300 BLAKE2B 33b1674d9ad53b31f5fb8fc558f1f47b842
 DIST speedbar-1.32-pkg.tar.gz 153333 BLAKE2B eec9effa69362256aea02781ec8d8e842f562b53810d368d3f45948d383dcc0760ebe236d3ad71863b96eb84064d58fdbc6aecc08e3f046d475a7e7ebdb5c5ac SHA512 75bb0c779ce01986dc87feacc669445fcbbada9b9af1785f8fd49eed4f1f0e5795bd0ad3053cc7a2b4897f2d7109f11f4f56bc5b007298350fe88fad17e38ee3
 EBUILD speedbar-1.28.ebuild 339 BLAKE2B 9fbb402b642b13c1fbf5c0a6e9a5cea0724000dbbc5fe484c94c4359a47091959fe2cc70422143d09ae7c4da2c03cf743cf28ecded85d24729e01faa92f9653c SHA512 9fb5f072b88c4e56a672f9d1acbc4dc693a65565e56d6c9d4e969cc65c56495cc80731d3732ae99eb5f2bb5432706b2a19c9173bd6a9808d0dbbf6d85aeafed7
 EBUILD speedbar-1.29.ebuild 363 BLAKE2B 6876d3c6fbb14c8aa84715f9528c5779c9518ad349742d28c5ab979f31108e0d4f0ce839e8acc1c80a75ef6dd7544762a7dacb997fcc6bbdc3c4df2945ed9dbc SHA512 7fbe9b9bef27e7a47337171a722ee8a908ced2401d916cd2cd4c3ea3dbe38a9708f6cf6129f7408f7298526a0414c54e6a15453bf52b033471be0ee8bb725c4b
-EBUILD speedbar-1.32.ebuild 365 BLAKE2B b372155e1a569d1ea117d485b8583e5c89875fc1a3a92dbf7a73b3c4d5ac81b1e68fc672fd1d9c6bb7f69cdfbab18c7891914a1f2c2c959cfbb6bb65b9c7122c SHA512 10996e9a01153c50b9607f176a5394873a5d7abc96468731c4b1cac575d97e042081511df3ecc74267a95eb9149fa9b72a372b757ae1dcdd1e69b4a6a331c588
+EBUILD speedbar-1.32.ebuild 364 BLAKE2B 517e68cbcce8c113a1512fb7353644e3cd3d1c9b41bfa548eb69646dab98fc64a09b5407fd5ad8ee1c302312a4975773e9cba33647e185d7736c830d58f40ea9 SHA512 8ae17c897d3b5492188ce9d2c8f30c52c197b742f4ee16446e819fd964ef96a9ded5e35b2e92f085e0c05b13dcd5b293229afabdcb0c27631a339edaa203f173
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/speedbar/speedbar-1.32.ebuild b/app-xemacs/speedbar/speedbar-1.32.ebuild
index d45eae9f0912..5e428298f97c 100644
--- a/app-xemacs/speedbar/speedbar-1.32.ebuild
+++ b/app-xemacs/speedbar/speedbar-1.32.ebuild
@@ -11,6 +11,6 @@ RDEPEND="app-xemacs/xemacs-base
 app-xemacs/edebug
 app-xemacs/cedet-common
 "
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/strokes/Manifest b/app-xemacs/strokes/Manifest
index 33d2732e5289..793c47258faa 100644
--- a/app-xemacs/strokes/Manifest
+++ b/app-xemacs/strokes/Manifest
@@ -1,5 +1,5 @@
 DIST strokes-1.10-pkg.tar.gz 43728 BLAKE2B 525fc8fabcbd23eb62730b2a31a962bb406712931867fcdc115c9fa96db7d5c4d9968063eadd9ec17208f54085023bce1467231a2f67c0e9839cb77d57df5640 SHA512 dc4c2e49cf5778122056cf10a20faea646598a4dbe24497b0feeaa341a6a05d845d1baf9dbd89afce1025e604f2b48b0e95abd7c5c0e749b3fb4aa0a524d924c
 DIST strokes-1.12-pkg.tar.gz 43759 BLAKE2B 5d0a4e4545b4a1d50b13b7ef91f5b165094ece75c4ea5ea3c8c596cbd4753541e96367a859f89a766f25838b34a52e6677caf1456db35ad7dcbbdba3ccc22863 SHA512 6e4e94397d25cbaf1cba77589f64096cbf239de14ae2f29f6ac4ef876d4a44304d6fadf5c045bb5c08e5cba5f50480018dc6f4c1849a4e08a93c6eea648fdc44
 EBUILD strokes-1.10.ebuild 358 BLAKE2B 224846835cd791058f90ddcb0cc89e12ad3d03328d56c784ce9927b5a7416933683bd8e2ccccba9da771ca1f3ff7e6d11ae75b9bd492a5255a7abd5ad5b81f1c SHA512 98f92d630ad338739532ae4ce33f4fb0f7102b838f3b8283ba5a797c5ac9b868ed7ce8c3fa25fb52295acf947578e55491b4c7ba1bfe1f98138c2b0863515307
-EBUILD strokes-1.12.ebuild 360 BLAKE2B 23cac28c5af6b7335cb83c598c8febcd0eef83840b8434ca19d78b25b997d63548f796bea47d8877d689021af8353687e6e23138095209d499f3712ba68a28a7 SHA512 fbe7d4ab07a6e11a0fed38c2f30bb780bddb307ae159ead2d2173a1448013d93f4d6cda26eee8a7f443aa21fa5d9443bb9c72cd349543697da29d41be9c8f918
+EBUILD strokes-1.12.ebuild 359 BLAKE2B 72fa9da99a551c756f4520906aebf676a28078a83b4b8473f7f550b92ae1a3bac2e52fa781b29fdb73374ce159d136c6212e3ec04008b7355829469476104fc3 SHA512 ce6c4aba57eac684526275a32d33bf3e726e20febf83669dafdfc365812b689425b6343af3a6329869996de009632dceadd95fe3355e0bdd476352995aeb97a7
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/strokes/strokes-1.12.ebuild b/app-xemacs/strokes/strokes-1.12.ebuild
index 1598501efb5e..9deed2c5a1b9 100644
--- a/app-xemacs/strokes/strokes-1.12.ebuild
+++ b/app-xemacs/strokes/strokes-1.12.ebuild
@@ -12,6 +12,6 @@ app-xemacs/edit-utils
 app-xemacs/mail-lib
 app-xemacs/xemacs-base
 "
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/sun/Manifest b/app-xemacs/sun/Manifest
index 84c91cedaf5b..e0b67f4ee57f 100644
--- a/app-xemacs/sun/Manifest
+++ b/app-xemacs/sun/Manifest
@@ -1,5 +1,5 @@
 DIST Sun-1.16-pkg.tar.gz 64431 BLAKE2B 8511f5a999f4b9f595d788fffa67458d81a9e7168613b5ff245555731af5c5276c94908598d3a469593752570ad929920ee9f86e1f81047aadec6f6fe0994b58 SHA512 1e03553132adedf2d93e80094a6934919489360391d927614dccb85abe3e6a36e930312ee8ee9c70a0608d2041fc8161dfa54649b0822236ca9532e0d26c8c2c
 DIST Sun-1.19-pkg.tar.gz 64355 BLAKE2B eeb935eaf699d45214592a2e9930c1f055e3857113d4bdec0f7b3520e6e92a116e3634163982f6f7f66a529e049118224195d97f889c448fc9944f20baea6619 SHA512 89059893e721d1f8fc3445183e4184f55b30f09277321b0a495b48c6cdafdc5d6f41df0b0f3d740a8331d6844d63ab56b807277b94e55ff1510efcee70873fa5
 EBUILD sun-1.16.ebuild 392 BLAKE2B 4879a79ac8378ee64b36223fdb115ee8bc4bcb4dfb43d9d9b775dfef63126bcfdfcaaf16e6fcbcc24094079d17e1e3a667ec2db320234097647b737a88863908 SHA512 ddab4ae951d4bb17393f4d5381f0439e952e48f0553b44d160f9a9a14169531a28b661c31be395c0b16d24e9ef6a6fe9a3c54c3c1cfd75c40ad93cff2b145ed0
-EBUILD sun-1.19.ebuild 405 BLAKE2B 9b198dad92b7812574440867608b16965706befa902917bf0c305920a0585f6759110e70a48d8281ca1c898c9ac71f8ac55742092ba6f8611c1d0471c59120e0 SHA512 debddb1efc4e3fcabae0b4774372abd6efd76f9d55f8c8c6287663c78b745fec6655c19620aeda2937c2185fb6d362f6d2dbfdaa5048fb50396c25e7b2a22665
+EBUILD sun-1.19.ebuild 404 BLAKE2B 6a9ffb032bee3872a385ebdce1eff8bb4db2cb0ca39e576e4203ac4090517bed86dbeea443d4b33ff043ad83dae7c613895134f27e3119a5035a17e646247490 SHA512 689afe42b135d28e9096cf9fe1204cb13863a2202943ad34a6f57d8c32b2bf0954c8dfc28010016afddb9e5c9e00e31e92495bf260c16cda861b8a72d87170f2
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/sun/sun-1.19.ebuild b/app-xemacs/sun/sun-1.19.ebuild
index 7c4a3e6d0370..fd57a67cdaef 100644
--- a/app-xemacs/sun/sun-1.19.ebuild
+++ b/app-xemacs/sun/sun-1.19.ebuild
@@ -13,6 +13,6 @@ SRC_URI="http://ftp.xemacs.org/pub/xemacs/packages/${MY_PN}-${PV}-pkg.tar.gz"
 RDEPEND="app-xemacs/cc-mode
 app-xemacs/xemacs-base
 "
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/supercite/Manifest b/app-xemacs/supercite/Manifest
index 0d7cfb3b44fd..db8b8842f6bc 100644
--- a/app-xemacs/supercite/Manifest
+++ b/app-xemacs/supercite/Manifest
@@ -1,5 +1,5 @@
 DIST supercite-1.21-pkg.tar.gz 100802 BLAKE2B 6810ba1eb207914193f22d10ec30788e87f6d59f8fbe7bb87db46b71dca668b243a1b23f33e662f248873d6770382ced1b3c8a35662725c5f36a0f1265d77183 SHA512 6b1875e6b6913af7d5a6f32888472e75702e570067460a52f93e8d6d761d05c5cd5b373bca60c86c9d4d5edb8e6d8d0b6cb363c5645d527cd81c06e4a178487c
 DIST supercite-1.23-pkg.tar.gz 101982 BLAKE2B e4873e5ca9345239b3986080c32c4f2e36d3fb5eb723c99b2f630a47a2a2362b24d8cdfeddf35c9b89711806a1da4bfa30131341b5b1167ada2a0f1ec9aa4377 SHA512 7a8d79c12bd4c8a4aa8b9cc272edd97016262c42551d302f7c3268467c7475d3a807f15f9fcef775926a03688f6dc0ab65b90233ba16250ebbae928e21f12838
 EBUILD supercite-1.21.ebuild 336 BLAKE2B 4437af6cc778633e7857933a48f2a2a1e42e05670ebc51d73641303e55f27b9bd888b92a3c0e8b8bb83d528cce1a009190e1b4b7f96fe38e766cca936302298d SHA512 6af5509cc7507094eb4ea55aa4a33bd0d2615b1c60fd9ee8e80ca03e1564a905fbcfd9504326859b9eebd6d23db05cd4417f0a6c378c713fcc11e2dd7f0434f6
-EBUILD supercite-1.23.ebuild 338 BLAKE2B e125affa2e3e2439f3d3bd0c0b8bbfcec1c1d15708adf4b4d18b78f7192459c3098ee757805dd3185df0e011b4d158ef84f59823baee3696e4915f2e7d3bb644 SHA512 9b7d5a35b6f7b82b1daa19377157189be7aaff3ecb70b2137e081a29189ef5f661b2b076022698e3e217e3360d5197beff176b3005b7556a4a3a24fa7733934c
+EBUILD supercite-1.23.ebuild 337 BLAKE2B dc7c682835841ff837ec577646f6136174f670b3f01560193ffde0f606e54ea997888a0ad62553d5f5c0799a2bdcb1cd847cdb70d5c046e2186da699dc8ba7dd SHA512 6b700d1fc80ddde777d114a272372afc7ef32d7d98533c7430d5a562eac8a3a80e5e61d2ff7d510550ff148f217ac4a1565fcf785f7ba6f2763a178208aa64c4
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/supercite/supercite-1.23.ebuild b/app-xemacs/supercite/supercite-1.23.ebuild
index 4d6192a4c94c..bacdf565ae88 100644
--- a/app-xemacs/supercite/supercite-1.23.ebuild
+++ b/app-xemacs/supercite/supercite-1.23.ebuild
@@ -10,6 +10,6 @@ XEMACS_PKG_CAT="standard"
 RDEPEND="app-xemacs/mail-lib
 app-xemacs/xemacs-base
 "
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/texinfo/Manifest b/app-xemacs/texinfo/Manifest
index 4bacc5b8b470..6efcf0708db5 100644
--- a/app-xemacs/texinfo/Manifest
+++ b/app-xemacs/texinfo/Manifest
@@ -1,5 +1,5 @@
 DIST texinfo-1.30-pkg.tar.gz 145763 BLAKE2B f4bdd2381fb2efa5e6d318431e8a8a56911b2f84b161f96610e2e43a8e49c9ba15c63915f3219b4b47901834c3cf51aaa4fbc1b51ce18ae0d574bf99baafcae6 SHA512 dadcbb0a2dbbdc311d19a4e796ac574f18234938ddeb16da1ac8b9e150459536bac46b00b1609b8cd837ef980cc5b13f77b8321edfb347614340d1db0f3f78c0
 DIST texinfo-1.32-pkg.tar.gz 145642 BLAKE2B 75372484fccb2f8de979a29c506e1e4479ce5371bc4a8c3c06de6b407c1bab132cb156281e458966e673d505ba2f7547e767aadc124df14299fedf1f7145970f SHA512 026d5749acfb4f34bbc6bdb8471419fc48ae537051808d73bc04d6a11cae404b5e877305b5b02e1eabb79292f1cb73795c7521e384350948937d9cc7033bda66
 EBUILD texinfo-1.30.ebuild 318 BLAKE2B eefca977c12b4e5b3d6f3eba40645592a7c3306f4d4a358f2e304b1108d0a3ac51ae06bbc1cd3556581b7128520d3295c9f524837502e77842061b06c5d4caef SHA512 4be597af3575b397b4245e0f5b5b87f65ed2987f2521b0930d0343c0da1aad4ccb135340e6a24d120fad78a6ef993d324d84d2d695735f166e13d20804fc0fad
-EBUILD texinfo-1.32.ebuild 321 BLAKE2B 6f3a61906dfdc9ed771cebf7f0ae7d48bee764fc51100614a1d4dbc2fa6ea8977a64f868884e63daac7bbe072c4a8c64e2945dd7e3fa994325bf42ec15a1cd19 SHA512 15f02d64c806aa6006bc1c8d0ef0317154a6382c2965b5960722bad233925f912094adf2ee9243e9bf57e4d9f5a52dfb98ff65dd55aecbb9ebde314b6be188fb
+EBUILD texinfo-1.32.ebuild 320 BLAKE2B e7f5c80649b57df351ae83a0fa806c15c0b08a1e4636cf3727a273812e4844397c779c7571030029a6d7a229af1753829732e91aacd4ffed47c15cac69026ba9 SHA512 42fd8db32d185a724293d1e8b725ea8191c224ed20911d7130e59a3df925bdf0954b88a81c70ec31bf1fb2679f8f3a8e2b2403dec3a40735577a11f05042e5db
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/texinfo/texinfo-1.32.ebuild b/app-xemacs/texinfo/texinfo-1.32.ebuild
index eb1421851f6e..1d6d56378321 100644
--- a/app-xemacs/texinfo/texinfo-1.32.ebuild
+++ b/app-xemacs/texinfo/texinfo-1.32.ebuild
@@ -10,6 +10,6 @@ XEMACS_PKG_CAT="standard"
 RDEPEND="app-xemacs/text-modes
 app-xemacs/xemacs-base
 "
-KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 ~sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/text-modes/Manifest b/app-xemacs/text-modes/Manifest
index ce8dd9ea9631..4973f6038041 100644
--- a/app-xemacs/text-modes/Manifest
+++ b/app-xemacs/text-modes/Manifest
@@ -3,5 +3,5 @@ DIST text-modes-1.98-pkg.tar.gz 450607 BLAKE2B f4e3c2eaba1c8a1a6e751de1a483e1991
 DIST text-modes-2.06-pkg.tar.gz 542495 BLAKE2B 0a63c323d923344e01f3dfa5aaa9d4e17b91d8d3988ce0125056e6c48c8a48e1ee57b6c8427428d32076b3444c18c89808e23c675b890b35f6db6396a566d97a SHA512 45c7386214d623803d739e2140edb237bd561416c11a5c13df547483e0ce854a330a481a84efdde3a10cd4c2ee8ca78f422f5fb6d1e6b00e264886069d549217
 EBUILD text-modes-1.92.ebuild 365 BLAKE2B cb0b4a442eb21b81889826c3568244683b4b5435d463f843d635980e4868873877794f4ad6b7fdfafd9bd15fe0fc308d05bf9adfaaff824595c3cc1362f26865 SHA512 055f0dfda57627d9ace9268542c1d18d93cf20ffb022a74cfb4edb2d25ce40b2986fb8a28d476a1b4f1da9fe7f599876dc86717b1c2db57eb361beafd4da83b8
 EBUILD text-modes-1.98.ebuild 365 BLAKE2B cb0b4a442eb21b81889826c3568244683b4b5435d463f843d635980e4868873877794f4ad6b7fdfafd9bd15fe0fc308d05bf9adfaaff824595c3cc1362f26865 SHA512 055f0dfda57627d9ace9268542c1d18d93cf20ffb022a74cfb4edb2d25ce40b2986fb8a28d476a1b4f1da9fe7f599876dc86717b1c2db57eb361beafd4da83b8
-EBUILD text-modes-2.06.ebuild 368 BLAKE2B 963ef88000f6b23ef5f94ca358bee2e8799da33bd6aacb3edfcd6a3ba0b48cb78d33601b32c0a925a0701a31510394a973308dcff3ffa6ceed92861b5d469f4b SHA512 d4cbf2368323dd11f0f23e1d4c93e6530d0a3562effed79e58660ae16e8b2e9b402f4a12fc550f57fc97e85fcf53987d44578fe40baf29223e9af1cc480699aa
+EBUILD text-modes-2.06.ebuild 367 BLAKE2B 2487a53890c52a140fc28672474712d4b14f47a80ae564ccf04bc86ab812869888b9f5b5633b48a5d5dfd8e00984b69c4d25d6a439196c9ee8a46f87cb573c67 SHA512 10aefc50db863e798b66f7e9bb65d48f2ad4cf312497e840222d2feb9351859051cfb5bbe8ca62a2cdb5d06f34b829c8a34ef204d566626551b33e168a35b847
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/text-modes/text-modes-2.06.ebuild b/app-xemacs/text-modes/text-modes-2.06.ebuild
index fe338c5ac59f..56c28c290f70 100644
--- a/app-xemacs/text-modes/text-modes-2.06.ebuild
+++ b/app-xemacs/text-modes/text-modes-2.06.ebuild
@@ -11,6 +11,6 @@ RDEPEND="app-xemacs/xemacs-ispell
 app-xemacs/fsf-compat
 app-xemacs/xemacs-base
 "
-KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 ~sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/textools/Manifest b/app-xemacs/textools/Manifest
index c1234d25c09c..909562c73fd9 100644
--- a/app-xemacs/textools/Manifest
+++ b/app-xemacs/textools/Manifest
@@ -1,5 +1,5 @@
 DIST textools-1.15-pkg.tar.gz 79966 BLAKE2B 5b2de39719f7c8e9af949365e3ac6a615253017a022e027bd288456da15fa5baba13603bb5cc2a61384dfbb4fbad18b2d8e2e96d9937a14a4f298404b0d148ae SHA512 22c987d68acc1107eca9749246014f5a6c64e7d388519e7694dfa917241537cd7e815e73e5cd36edac564a27136b273c9b0e593a78ae63f683b0d70432b46310
 DIST textools-1.17-pkg.tar.gz 79944 BLAKE2B a90bc826e95e28437d740499653c1784bd688ac3983201b6bc4edb0cbda3cea80057cacb151f82b09255e606c1f6bc8b51ad29c075b6eae5de62b007a35abd35 SHA512 b6bf2493a2c220c8572709ff2a0068d0b7b42c93288dda22ee571d8d6ff0e93bc6deb12f110d8dd0e9f5cd83499c7c5a99180063712a08a41a8677ba2810c683
 EBUILD textools-1.15.ebuild 294 BLAKE2B 80e695edb61506c09f0459319ed203345eb008604b815c02cc334c750dd476d059d473cd8889d2f5a203387994e075f7219382c108582e2add3f6e5206dc2a6c SHA512 e78032e9d788333fb29376ff425c78b0ae9246dee7bf132d8a5d1caba870e4bbc2e544f8869066684525ee40b52f70617f4b13bc3cced44730401033710269e7
-EBUILD textools-1.17.ebuild 296 BLAKE2B 9f1c3e6e1eb2363a1860baeb650d18368c5f268554cba9b14f4e4c1745e0426cb345e87f0ba9b794a671eb9624fca306e5dbc98b8846e68fe929d9c92353841b SHA512 6c95870375790ab8cfebbe2c1f11aa85e130057f4fff5403724d44cd696837de51bbce4d8a3be7d36630eeddfe7466df88af598fafc75639d1b2ef62c6805f64
+EBUILD textools-1.17.ebuild 295 BLAKE2B 428bcebcf32769f6d68f5df9e1c247027aa45283ceb63993e815233c7211a410f59b033b21b3dd1bb67d04359b7cb1271a87631166af31d5e720b2550b84d888 SHA512 a09c79dc5f53eb877ecfc6c85cfcc29c8fc9fde51e47c680fc1d150d4209b471a628eb1661329132f841c3c1bfc01124f219f066be1f8a6e1a13a9ef8724a325
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/textools/textools-1.17.ebuild b/app-xemacs/textools/textools-1.17.ebuild
index 6d7f4b2886cd..d1e67766e279 100644
--- a/app-xemacs/textools/textools-1.17.ebuild
+++ b/app-xemacs/textools/textools-1.17.ebuild
@@ -9,6 +9,6 @@ XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 "
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/time/Manifest b/app-xemacs/time/Manifest
index 76952caa2163..17b9a70d2d99 100644
--- a/app-xemacs/time/Manifest
+++ b/app-xemacs/time/Manifest
@@ -1,5 +1,5 @@
 DIST time-1.14-pkg.tar.gz 20431 BLAKE2B c0b28f83de39a82fad9965e13681e4c88c1fad59d19821f951739dc7fd915b01f3308d0b6fe6485def0e65a4396b6fb6941103863243e9848f5ec235112b7c67 SHA512 62dfea425ac0fd00d4e8003377341c03970fde921acc06f94cbe98e6c37e255462e7ba9e72d0d540c557d64559ce9d39d2f21bcb7736e0ee7939e4b41ab5c0ac
 DIST time-1.17-pkg.tar.gz 23678 BLAKE2B dadcbde74e0a007932bd63b85159dd431846428c44149544a7afc9e4039f0edda02c8d76da75636aad022afcd6491fb2d23a250213ea8f0fbd1bff10b4eca4c0 SHA512 d143cea2d2da37234b33581a1be2a90092c3e1de78e14331674e8bcacd3f38ce0d61ccff7b7c94153f6bf7daa0516eecdc493893933d68f57f6878f2c7105df8
 EBUILD time-1.14.ebuild 304 BLAKE2B ca4a708da9b787c518621da86b7d8495efb92d96bc5e4e5eb92a7dbc1a8b8a1fef14e3c665ef70ae27f493608f4488662b98f17396ab3b9dda6a71be3a56ff37 SHA512 96f1462556c3fe4997b6027508b5909635d7440cba30117828ca03b789b951f6db9f02536d000e8c2a88464b76816e78002a7e4f9f53c92bb410e22d583158d6
-EBUILD time-1.17.ebuild 306 BLAKE2B 6edc6b3e7680a48d67ce4a23be8b54fe32a8380b23adb69b51c19a80e7964cab487f916b5350f489201280464fed7b20eebeb91e2ca0b34b483884b91b04b3e0 SHA512 03c620c3d93a0883d6509d2b37f4a5bc7190d61ef1486722308309303281cf464ca0b1cd384aae53d5a807d80b859d2beef840b504e87dc2534a6489094e4278
+EBUILD time-1.17.ebuild 305 BLAKE2B cef7e7b06c3c3c5fb5cedd66d1d1293a9ca181a887aad0b8afb3b2c781ca472b31ac5d51c8db302e301024b2a2c96d3c6bf8d1caeef1992bc4e7da6644742574 SHA512 fa4ec0f31015c8b322938aa0d4da73950712eabb883236fd9fce04039191f8104fb43807dfc7cc5fc6519f85801b0d5bf375a586fd456f45e488688b72b3790c
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/time/time-1.17.ebuild b/app-xemacs/time/time-1.17.ebuild
index c1d53abab870..5f3075647fb3 100644
--- a/app-xemacs/time/time-1.17.ebuild
+++ b/app-xemacs/time/time-1.17.ebuild
@@ -9,6 +9,6 @@ XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 "
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/tm/Manifest b/app-xemacs/tm/Manifest
index a83f67a7f7ca..83d50f33d547 100644
--- a/app-xemacs/tm/Manifest
+++ b/app-xemacs/tm/Manifest
@@ -3,5 +3,5 @@ DIST tm-1.39-pkg.tar.gz 335103 BLAKE2B a1dec2205292d4ab26f8427ca69ea6decf0935b15
 DIST tm-1.42-pkg.tar.gz 333595 BLAKE2B 60cabc1903ad38d1e7dc2e9d5eb346de7b4d160cfc44f553b91e632be27e48d37476ff393eb1214e26bec2247b0dd6ddbcba24d7a57aacdc5b7f6e32ca336fab SHA512 7c5310d1c4fb1c97167c3a39ce0ea352c7828751915556a892d5363a9e428c31e4117baeceb5ba3bcbd1cc456c7d73071427b0339ce221d940c76a5622fbf6d6
 EBUILD tm-1.38.ebuild 520 BLAKE2B 14aa73a3bb89f2c63337ddeb066e8b8d4adff89b9cd962f37629ab27fcd3282dae48940b59a72d3187400c63b07747e36262977176aa7c715b0a72d894c1abb6 SHA512 818f2277133cf58ccb714937485bfefb88705342c7f4f983ac5cdf2bc77a339dbe8c2372190d49a830a1a58baa0fb82f0414179dc6e5c65b6a609dca57019ed4
 EBUILD tm-1.39.ebuild 520 BLAKE2B 14aa73a3bb89f2c63337ddeb066e8b8d4adff89b9cd962f37629ab27fcd3282dae48940b59a72d3187400c63b07747e36262977176aa7c715b0a72d894c1abb6 SHA512 818f2277133cf58ccb714937485bfefb88705342c7f4f983ac5cdf2bc77a339dbe8c2372190d49a830a1a58baa0fb82f0414179dc6e5c65b6a609dca57019ed4
-EBUILD tm-1.42.ebuild 522 BLAKE2B 8694879ea411aa7c3f6f23d4a405cc2563c40992754efc3e1c06ce25ca2e674e8dd10e87fb75a329070b99ba3df44c52cbf90b28405d79179e604f22cfc8bd1b SHA512 fb464012753c0b9e9748a0d50e5cfea82f956d51eccb5036f82c19843f2c7a611f454c41113558372aa62f3cabc1ca3a34ed4ff1a0301e30d3e1a3a346522219
+EBUILD tm-1.42.ebuild 521 BLAKE2B edee157085403008d827746163c9fa5e34daebe5ad150df63cd5755af6a7e28d04352e00ff069634278211aee63f780795cc26ae44f4a1e37dc9271a9f05e475 SHA512 ef198a183ea261a67b9d6f167adfb4617f3e68d9c305a326d8d86bebbf41ff907960cfe4314ddcc4418453a8f1b69ace573aa95fefc6f29658396032b196432a
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/tm/tm-1.42.ebuild b/app-xemacs/tm/tm-1.42.ebuild
index d7d5224d62a5..9cf194373f1d 100644
--- a/app-xemacs/tm/tm-1.42.ebuild
+++ b/app-xemacs/tm/tm-1.42.ebuild
@@ -20,6 +20,6 @@ app-xemacs/sh-script
 app-xemacs/net-utils
 app-xemacs/ecrypto
 "
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/tooltalk/Manifest b/app-xemacs/tooltalk/Manifest
index 07e79ff015d8..17d4cc27dff6 100644
--- a/app-xemacs/tooltalk/Manifest
+++ b/app-xemacs/tooltalk/Manifest
@@ -1,5 +1,5 @@
 DIST tooltalk-1.15-pkg.tar.gz 9749 BLAKE2B f483f8972c0d8514b8cb1bae0795a82eb02858a632f2929cce114a6c0c98d0a92c176556bd6d87fef926936770b7afbbaa9541e090a42af6c0a18b567279b963 SHA512 c884d357a8ba534f6a640cb9b5b0bee5138758181f53a66d8064c7cee9a7277b4e2a4c7d3d831404b4727bef724694882c1334ca7e0a39b1f934c4af966fb2aa
 DIST tooltalk-1.17-pkg.tar.gz 9760 BLAKE2B 972b905c7ea92152528a00515d055975e5e3072f373977d33f70e7d88051c0864fbf5ead6590255486e50800af03fad2161bbce474aaea89dc94acdca1aff977 SHA512 3d83e9976b1364430f86b7d582e9110f83272692710c78642a92b1a489280658163c6566df54ee0bbf0b074716511569a6e61a124edf2174aa45b9779e52ce24
 EBUILD tooltalk-1.15.ebuild 269 BLAKE2B 264ff6be8cf653405aeec8ef6b6a137e65424ac058afe8abad417634697fd85ef32031350fe2cba063dc95eddd14ebfe3834f784d38d423813042f31fd68a309 SHA512 a1595fef67b54b93e9090f9bd6d521608bf4525c1362775a6b8013b17cb4509232bd84909290f41b4eaafeadedce76d8d1b2c2823ab88344c3c4e6b947bb8313
-EBUILD tooltalk-1.17.ebuild 271 BLAKE2B a9b915574d63d4a33a07e70c9154373abccd6fdb595007b97db59b215787796376b94287698a69b7fb80c3bca1a7d4397b1b8dd6b071154161af5020b874b94e SHA512 6ae813107a8013859ea821c1a1d0edf5dd41efbc4d2b11a0838372b118dee3f5435b0fd7a907edfc19cd97c4003c45602f49b438ea825df0907ce337ba0a6bed
+EBUILD tooltalk-1.17.ebuild 270 BLAKE2B cb6d3249a8f7c95a2fe9187017320bfb50bd24cff24739bdf243ccd51c6453e6c5fbf860bd0f2d5741e3625cee48a7461dbced08fb206fbe8a2a513a90bfa029 SHA512 b98c119d92ec9cbd043446a9a05ef32dcdf19af9db21f93eeda33f5653d7a62c72656aff855d4c781a8945c83b289ffb7f2505e82e4a17fe7fab84fd9813c8a7
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/tooltalk/tooltalk-1.17.ebuild b/app-xemacs/tooltalk/tooltalk-1.17.ebuild
index 173c21170ee1..40ec153a0ddb 100644
--- a/app-xemacs/tooltalk/tooltalk-1.17.ebuild
+++ b/app-xemacs/tooltalk/tooltalk-1.17.ebuild
@@ -7,6 +7,6 @@ SLOT="0"
 DESCRIPTION="Support for building with Tooltalk"
 XEMACS_PKG_CAT="standard"
 
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/tpu/Manifest b/app-xemacs/tpu/Manifest
index d144cf1e2843..398182eae7e1 100644
--- a/app-xemacs/tpu/Manifest
+++ b/app-xemacs/tpu/Manifest
@@ -1,5 +1,5 @@
 DIST tpu-1.14-pkg.tar.gz 59529 BLAKE2B 75c562a4e83af5f077851410f0974aa09cb3f7dfdfe550e0c5904f7790694bbaa8c48798366086927fd26df6a17c4ce46fcb89664613cfcc967c6b548b43a239 SHA512 07c448f17be698ba9967762de3f3c0b94793276e72e5ad1562491bd6ad0a2fa431ccae919526e105313adc658dc22ec095ecc81433854f28bfbc422967cda82f
 DIST tpu-1.16-pkg.tar.gz 59496 BLAKE2B 782b3a50e8de9188660608a3720bed5c4b02331fd3f7ff388cf8c61304bc22ac9cba58a37698f8780b98faee1d2f0fe49b7d965d559dc4d6d9a253f7ac21d7a1 SHA512 9fe33bb1d80f453fff8261826b062b84c94a1b41daca2855ff37e2f9ef880ea576030fe1fc535c5c3255f669a411da0454711350879038e1c96072f68576d007
 EBUILD tpu-1.14.ebuild 266 BLAKE2B 2d7c545e63efafa5ed2a9b019a69b8846ba240ea8069326cf14451cfc7afdd61683011e47e2b778318ec3a70e2f56a428a0fb7bf4b7d632530ee4efd530ff193 SHA512 ca3946f3771062da50e0d89920f42098f6883dab4e99e8af547854af6347014e7c031833a9c720b8813e2736944b793bd11351011fe4efa1ec0bdcc98a116632
-EBUILD tpu-1.16.ebuild 268 BLAKE2B 51fafbe54ccf02f1a9a8fbfa71ba2e8abadc542dc45ec3e40d9d2e244d9100471bab45c42b3daa7974b12051164aadb6903ee8bca1fe30dbaca9ec9565b89101 SHA512 7c2b1a210331d1ae6a723eb0d4aee3a8dc5cc0641ed62b3fbe5b654bcf73d307d9993a73359e1311bee99888ca898f1c8f6790b350859ccb50b9520028eac5d4
+EBUILD tpu-1.16.ebuild 267 BLAKE2B 07f714307c66e4b754f254af44b909fde15cce877a10fb1c66504171a7e001e1bd5612e08c43627637879344276e3659933a95eaa71c5debb773a86b16b46e63 SHA512 7b6583daa51d62290a423613e9c90fa3b3574aba7bc4b02f20e80b7079c781be2b3cb7494533ef83f258f3a365470e5240099c9c0aea410027d21dd721ccd4d6
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/tpu/tpu-1.16.ebuild b/app-xemacs/tpu/tpu-1.16.ebuild
index 7fa114ec8f81..04bcc26fdbb0 100644
--- a/app-xemacs/tpu/tpu-1.16.ebuild
+++ b/app-xemacs/tpu/tpu-1.16.ebuild
@@ -8,6 +8,6 @@ DESCRIPTION="DEC EDIT/TPU support"
 XEMACS_PKG_CAT="standard"
 
 RDEPEND=""
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/tramp/Manifest b/app-xemacs/tramp/Manifest
index 8459e8076af2..be7b4eb83e2e 100644
--- a/app-xemacs/tramp/Manifest
+++ b/app-xemacs/tramp/Manifest
@@ -1,5 +1,5 @@
 DIST tramp-1.52-pkg.tar.gz 396316 BLAKE2B daa38f4ccd399564d84f9cd5445f4483c49a591302ddc8a881376e4d3eac506b1123040fa7395255fd5f76bc93f6ed124771d557104b4261a74100a2bc6273c9 SHA512 ce61fe02bf0803a845bf34df7d9c7c0f72a28bcc84e2ebbcd8b80b1a28a5304bcffd5756a5a61d297b537e79a7d90e60821ba857a4c06911d4c098f2694897c6
 DIST tramp-1.57-pkg.tar.gz 399264 BLAKE2B c7df03fd2cd201f5684743136ed092683b39b1a7cf0f24df998f42440e781ad4d7216f0d32aad9afae5333c94fdbcd7ce42c5e111be429494beff263c3e2538d SHA512 1e648bbbe7decdd57d63b55c3d6b6dba78bb9303d6d56e32ef36957ef377489afe94e0b40ec938f5beeff19d1517e0798d3af6729af7a97f9a83176fef7d5560
 EBUILD tramp-1.52.ebuild 466 BLAKE2B 79990a5c3370e602431de59152ceb46305f0035b5ea37c20e6961b1025dbb0281cd005034a8249d6d0a500aa5032897fa9d70a047b19c534809680b89c5f21db SHA512 629a84673ac29f86097e56acbff7e808e042ffa52be59fd997a387d9c0b55bf9a836e0c5e11d1e64300ef37a4c7e07599305452dc5b60910c9f27ad716595350
-EBUILD tramp-1.57.ebuild 440 BLAKE2B d31324896f7dac0b6c9c0c10e5374647a396006c12fae0c7ff9628eb116a40551c9adb15f8bcd40dd89842d82216ea002a9068b8ff0519096f6c89df1e0444ac SHA512 f97ace313c1c2c6b38148a2338547d8d2629cb1425c9919362db70c214353a73819675a30e3cc9285f27d51924b185a79bd1a3edb6c89caa1f6ed74de2256c24
+EBUILD tramp-1.57.ebuild 439 BLAKE2B 686f820a1b1cd948a8780d0fe4844fa449f674af29917e07a8804ba87a69ce17a49c61a1ed3f477bdc161c9c091f3a9080eb505ffe4e38701e86b856fd0d4c75 SHA512 dc7bc874dc7993ef160fa8e3ad8f13926622db655eb1de2abafe09e70b82da6b1d0c912a54f22d1dc935870a0f36e8e8a783e51f88d6ec7dfef6f131ae618d7c
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/tramp/tramp-1.57.ebuild b/app-xemacs/tramp/tramp-1.57.ebuild
index b5ac579f94ab..8109a1f991c7 100644
--- a/app-xemacs/tramp/tramp-1.57.ebuild
+++ b/app-xemacs/tramp/tramp-1.57.ebuild
@@ -17,6 +17,6 @@ app-xemacs/ediff
 app-xemacs/sh-script
 app-xemacs/edebug
 "
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/vc-cc/Manifest b/app-xemacs/vc-cc/Manifest
index 2d1a0e6c493d..0a9fca28a6a2 100644
--- a/app-xemacs/vc-cc/Manifest
+++ b/app-xemacs/vc-cc/Manifest
@@ -1,5 +1,5 @@
 DIST vc-cc-1.22-pkg.tar.gz 95028 BLAKE2B 6ba8a0475d7a65d3f52982674f0d1eeebd262c7c9bcd939a3f4278324b7457ad9169352a3974627f03a12d9baee85908e27ec77100c3303ae186f2de1fea4a9a SHA512 34aec1f857220ff35c6aa3b428605c7d42e1f10d2e6d265a815e8a1940b3cc52ef937c22c6fbabf736e3e6363023250daacb151622f3791972ecc74d7f7e876b
 DIST vc-cc-1.24-pkg.tar.gz 95024 BLAKE2B 0d9303bb80d72efa2d9850619b5f0023af6b58ffe0a1b04e1537621c343c25739e68f39a035ecd0e25890a2e12e5af9bd14d0658133e2e0f026900a758ff8218 SHA512 101eaabbf37dabbec710c20cc6aad76ce7ece962903a1284b1be72a41352ef00856bca9bcf72b9cefa520375e46f820a5c16a0067324cd79a2810d5b0b8211e9
 EBUILD vc-cc-1.22.ebuild 332 BLAKE2B 989412c4fbecf8da4bf295887f4002ee618986ed6966c9f0f59c4afc01c2bdcdd28bbe54f08e83295856fa8e80ad8482a966c65e4851aad1c36f90d15c738627 SHA512 d6c6db6fb845e6644929f284a0205456aa7c39f4789cf7550e13d3b60c327770e772ddcd222d46f03f249b54cce0e6bd041f24c9f2499e06a82ca8d2fd610a9b
-EBUILD vc-cc-1.24.ebuild 334 BLAKE2B 2cb370548d85f723fa8e81e8ae5101050024993b51485b975205ac1c0c9556ab8298a08cbadcc202097a6635cd6416b472307b45866d712a8fea3c46fd065916 SHA512 2a5ee12f643ecc898544850000b8e6b5737b4d45ec8403fd168a3aea8985c903068c1038436c35c8c208674cb88a6d45d3961f2306dfbf2c83fea2d9762bb647
+EBUILD vc-cc-1.24.ebuild 333 BLAKE2B 019f1dc21292deb6a3827aca676a032a838e74320c2edb88f7258fdb7e816ad0ccd124b4b6761acd90b027c4bba64076bee6516cc2b4afb089eb45e27476e7fe SHA512 4317ebc2274bf77dd76d3a5d9dd4f35be98a95525ecb0ee721f5afb8e48f8fc20357a4a4aa11b8bf6df85cd0c469fc6e87a408222d5285164e9186a48e2bdf46
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/vc-cc/vc-cc-1.24.ebuild b/app-xemacs/vc-cc/vc-cc-1.24.ebuild
index fa7894cc9d7e..57177057dc40 100644
--- a/app-xemacs/vc-cc/vc-cc-1.24.ebuild
+++ b/app-xemacs/vc-cc/vc-cc-1.24.ebuild
@@ -10,6 +10,6 @@ XEMACS_PKG_CAT="standard"
 RDEPEND="app-xemacs/dired
 app-xemacs/xemacs-base
 "
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/vc/Manifest b/app-xemacs/vc/Manifest
index cbc05a335467..31f753e06764 100644
--- a/app-xemacs/vc/Manifest
+++ b/app-xemacs/vc/Manifest
@@ -3,5 +3,5 @@ DIST vc-1.48-pkg.tar.gz 231122 BLAKE2B 8dd697dc7fb1d973ab1fc8f0e6a25458221fa581d
 DIST vc-1.50-pkg.tar.gz 231057 BLAKE2B 0bba6cedd270a8200eba2c09b97f0d98aa46c747a65f4cfe08f7242e95bdce74d933b39d4b9e6e109b2536ad4c3a49e00e9afc185e0afd51ab2a910137ab240b SHA512 a0da1bd44e6309079ad4c699206f4f9cd9ee050724902af8695d62610dd1a2c59e0d48964ad318e3dc68be865ecd5480138aa305c0673df68c5d2c61a3b80afe
 EBUILD vc-1.41.ebuild 355 BLAKE2B a00f65a69ec60d0b3d5116e0baa6828bb620bae59036c360e1141840e049a7ba1961ffe3eb26176dd13999864a3a183483dfb7404d087bcbb10db8ae04de1e69 SHA512 3a688175d972352fcb505b8f667bbfc1f5b2b1ff9c3032cf791a341ace81891e089dbd7272837a64dea7c78b2f39c9425136651cf3b1af2b09c8b9c178c55b3c
 EBUILD vc-1.48.ebuild 484 BLAKE2B d3c8ac311417c5820b5d30539dca4f0d3563e4eb6b0554d15bb207c9a587aee32e8af586396f540501d59d520714e338049147ca5ba560f237bd28ab38544d56 SHA512 bcf16552e9a9f91cb693005b45fd65e72cde6efac823b8ac6e0e3037b829a0154fb21ae33b040f39cce7f5d6361f3fc34859c2aa2ccee24b74ef8f1eba0b2285
-EBUILD vc-1.50.ebuild 486 BLAKE2B 989347a992352a114cfd5539c2e001c3361bf4ec0a7431b1ae4d8932b6574c92efc81e8d921e1a9445920cae3ad469d58f538df9fddc071d50c86c6d415e0acb SHA512 60a0a8aa0c388984e9dabc0f20b681b18e30cc226894f49f5ad4409cbc2a6d7d7412fa193e42a664a623f8230d3e6fb7b6a9b88064468632a3352ab24f78fe83
+EBUILD vc-1.50.ebuild 485 BLAKE2B 533e51ac6ffceaff2b1e37def1abbd36d4d2f9bbcbc1589c8afe1e7339182e29c87094195958451dd3182669b44988c23e0915950b9c98c83e1644d510f4579b SHA512 d5247527a24ab7435729aa25830a00588e08649feca1fae6168a1a674bf6b2ca7ede8d08502d29255b6233a57ecbce7a5d3d3a08aa2a33e84d1a6ad128405d56
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/vc/vc-1.50.ebuild b/app-xemacs/vc/vc-1.50.ebuild
index 9116cff0f075..94fcf89b8e75 100644
--- a/app-xemacs/vc/vc-1.50.ebuild
+++ b/app-xemacs/vc/vc-1.50.ebuild
@@ -19,6 +19,6 @@ app-xemacs/elib
 app-xemacs/edebug
 app-xemacs/gnus
 "
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/vhdl/Manifest b/app-xemacs/vhdl/Manifest
index c7292dd0dae1..6870bb1a65a2 100644
--- a/app-xemacs/vhdl/Manifest
+++ b/app-xemacs/vhdl/Manifest
@@ -1,5 +1,5 @@
 DIST vhdl-1.22-pkg.tar.gz 302693 BLAKE2B c0ae6c5b079cf8e394a6e09eccaf327eb8729521f7982797e9ffe11cb150cd309752f79635a2f88845ce0888c562aa5fe1e23f491966c205a7c98ebfd0a2a3ec SHA512 3b0d6995f69d7dee47d4d5ab108be3c58f7911b37d31b6a46242eb678623275e32c3ee55393c5671237e11f3b84a56d8f1fa3b8f6492032aeb9f590bb1ad0848
 DIST vhdl-1.24-pkg.tar.gz 302748 BLAKE2B 9c5616c4eed1e14c89bfe950d0a58c7d33189b275da9ed57953ddab4b7c326c5799c1470c2775b6e5b13dc93d0a2877250937d664eb665eec50659b555f77075 SHA512 31b9f7d2d091f6eb5e1b872f5c923db402d68655017c727faaf6b40c0eb101b103f5c1ba838e1a0f346b8a3b9f0c976000de2052a6cc1b4065a490a25290185c
 EBUILD vhdl-1.22.ebuild 388 BLAKE2B 0b09aa3c65ddf8fac6e8080cb8054f22c3ed10e2f18096b499206c799972a78eb531068942b414ca1d5ab43d09e331e607d197fe8595d2647e26276d113e2641 SHA512 82f791cf9b49ee983971758f35226312169e1aa33adf1d05ed0b5c7eb87169561f87ed21075075263e6256ef9d317493785117c26a0e82456259fce8f5663def
-EBUILD vhdl-1.24.ebuild 414 BLAKE2B f747f5c77b82deb202acf6a56a8ee1c062113957f5bdcebb5b7cdd0ce18ad1ac4e55a0ba50229bac2cdc4561a6daf8dfc1dda20c4fae489e37a1db5d52405ff9 SHA512 0d7211f415a889b0ed0491f5576428d58b26c1365a08893c7d654eb9cca746347b53a538beb5b7ad5f40eb506438d715cd240093d2917a1fcdea1d03dd070ec0
+EBUILD vhdl-1.24.ebuild 413 BLAKE2B 72061ce4fb5c3bb6ea3774b30ad98136db6964d25eca158c5a618aa8897f248566dced164a2a269ed89f240d76b618096b91d087101cdd77e474492e8554cadb SHA512 7a347a9039a4abda4c36c64080fd2466cfe63049e43eb21b5e528cf818081a326c50866204d7eedb197f21d542fcbff1febc5f8443f6598d40851c6a257ac51b
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/vhdl/vhdl-1.24.ebuild b/app-xemacs/vhdl/vhdl-1.24.ebuild
index d3f895f2f61c..120d231937aa 100644
--- a/app-xemacs/vhdl/vhdl-1.24.ebuild
+++ b/app-xemacs/vhdl/vhdl-1.24.ebuild
@@ -15,6 +15,6 @@ app-xemacs/ps-print
 app-xemacs/os-utils
 app-xemacs/cedet-common
 "
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/view-process/Manifest b/app-xemacs/view-process/Manifest
index 45859ab946c9..8f49fb7b6021 100644
--- a/app-xemacs/view-process/Manifest
+++ b/app-xemacs/view-process/Manifest
@@ -1,5 +1,5 @@
 DIST view-process-1.13-pkg.tar.gz 60814 BLAKE2B 17a6ca037baf9660aa9c01eea1b52fbf86464d5b9b17bbef3d5e7a5879e7797c2ccaac28390992a3085f43d707272407daeef3e97870be534f3b8c6b1f41a7ea SHA512 01d965b9a1646ddb340c028177487010ac5411b217ac641587d62eed8c186cb4562c7d3f70f5165891ab761df20411f819abddf55c7480cfb7e73995f0d8dfcd
 DIST view-process-1.15-pkg.tar.gz 60754 BLAKE2B 351ef7db1399db510833b6960838472507cf7516259964466a74706a04aa51327d9c4f33f5ad5e503888382d6f477cb64649c92045fb78e1f07e87eb6080bc32 SHA512 121b78ba416129175b0a047948a419f1a6ee99df8534e8b7d8215540ad56d328160dc0bd26d9a6a22c8bf855f4db2eb857c961dfdb73d63e41a614e408caafeb
 EBUILD view-process-1.13.ebuild 297 BLAKE2B 63e461e14ee5868a78eb3475168425b53e19699e7a316d35687acd7c24e14e2c6099f0501f41d375799388437af40b2bc4257513924de3753d8528d7586ceec9 SHA512 b21e00953f5aff12e9f6a59258a0e64ed8350bd0fdb3ba835b7e8a599ae4a1fb8c44dba12838c9a07ea9ca0ff277b7f7ab15ebcbf30880d84816f2a15d6f8f5d
-EBUILD view-process-1.15.ebuild 299 BLAKE2B b491ae26ff301d070d28606d0a600314b19b21a4608c78e1731aae2ddc032ffef4a6c71348a9e649dc56176aaebca2d6b9a2be942610bc973f44c81d3c6dd4be SHA512 89ddfbc5c09cd31ec099503b7f4eb2ca9c2985ddde7ac4303091c155b18b32accefb5f42503240ba1f7b755ed03c433b2b7523452088a70b9c8227d40dc1a381
+EBUILD view-process-1.15.ebuild 298 BLAKE2B 0914c158742076f5fd69fd97670f40dc44df4563a48bcec626608a03fc0c444b2a361794bcf7ad4aa048b7d42c6f5dec69e249d70a67db90d9f40d272eb0b85a SHA512 43f13b9ce17abfa59cb5766f928e8859a3e938a2e20ff7987bdf778c179bb646ac78ecce55af81d9c40e7dd0c041a464587851e917a4fe60cfa5b9c521890ce6
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/view-process/view-process-1.15.ebuild b/app-xemacs/view-process/view-process-1.15.ebuild
index 32d6a95dc7d7..3761a1c00876 100644
--- a/app-xemacs/view-process/view-process-1.15.ebuild
+++ b/app-xemacs/view-process/view-process-1.15.ebuild
@@ -9,6 +9,6 @@ XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 "
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/viper/Manifest b/app-xemacs/viper/Manifest
index 014ce95e75bb..7dbe2bf4737d 100644
--- a/app-xemacs/viper/Manifest
+++ b/app-xemacs/viper/Manifest
@@ -3,5 +3,5 @@ DIST viper-1.67-pkg.tar.gz 338588 BLAKE2B 7898bd22d5f2e1afd02d5f6b8e13338325649b
 DIST viper-1.69-pkg.tar.gz 338444 BLAKE2B a2ac50bbbb8d1c023cb6057be0437238f1c275a1297a1e729bced5a2b878e0c9bf29ef4a856b784ba2587276d78e8526d30c09b00ca4abd37191bb402a26faf5 SHA512 f2e1bb057779aeb9171b005125fff25f0672a310b6f74d8821f93c7cac97a8518657645913280c5012082700be78e38bcd313b89df6b61e596938fdc3235ffaa
 EBUILD viper-1.55.ebuild 289 BLAKE2B 24fece3f90016260ff1c5745c550d28819c835218162cbab5b358b313789c70a3f68d5c8b62beac87a1ae10d51d166dc4eea7340b985f4ea824b416c314fcba2 SHA512 bbe5b8ce69390efe80cbf60223e15515f5afab86e634100b75d140ed433db4261515037ab99cf1730dc057f61d121837b01f4b1c5687cd7848ca41970d6bec48
 EBUILD viper-1.67.ebuild 289 BLAKE2B 24fece3f90016260ff1c5745c550d28819c835218162cbab5b358b313789c70a3f68d5c8b62beac87a1ae10d51d166dc4eea7340b985f4ea824b416c314fcba2 SHA512 bbe5b8ce69390efe80cbf60223e15515f5afab86e634100b75d140ed433db4261515037ab99cf1730dc057f61d121837b01f4b1c5687cd7848ca41970d6bec48
-EBUILD viper-1.69.ebuild 291 BLAKE2B 69f38e130fc047cfce5f3db5596db9e68d3ab61ddf82dda79c561d74bd2b74e6c007a7ac8364773a6b9325bd7c9895ffa111ab08288683599b1b209721e30607 SHA512 7cf0a75456c70c5a193e3ca332220808716880caf2ebb4b40e7c6b2170928f31808a97f10e66f5fd2633eecb5283c2cb6dd3e34a0391de1fb4c4809d2ee2f786
+EBUILD viper-1.69.ebuild 290 BLAKE2B 6fc888e691abf3285755b149f3d381457c5ff1c10be9b56b7f3c77036d13be41c0eee063590210f1593d6db50d875f45f5011cc0b04035e154a00a8408789a83 SHA512 c909ecd71a2ff44fc2e0e89a396fd5da567733723f8077065d506bd3cd2858f8866a5779602a38ac55042b519bcfa3bbddd234c0e9628d28602c03f2a4c2baa1
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/viper/viper-1.69.ebuild b/app-xemacs/viper/viper-1.69.ebuild
index 7eb63e013f9d..31471c246258 100644
--- a/app-xemacs/viper/viper-1.69.ebuild
+++ b/app-xemacs/viper/viper-1.69.ebuild
@@ -9,6 +9,6 @@ XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 "
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/vm/Manifest b/app-xemacs/vm/Manifest
index 7432b353264b..e99163c0e6a1 100644
--- a/app-xemacs/vm/Manifest
+++ b/app-xemacs/vm/Manifest
@@ -3,5 +3,5 @@ DIST vm-8.08-pkg.tar.gz 825312 BLAKE2B ab6d84dfc6b830c51007dacab55b1932626c1cb2d
 DIST vm-8.11-pkg.tar.gz 956105 BLAKE2B 9ad1ade5dd6542217bc9a31eb737166836e0e8325ecf44b43e6c2f86aa95db60ed15a5688cd3a5f0c010b65726547542c63c4a498dcc65f49e1f56d901de98c0 SHA512 cf687bc55723d8e57374264346399db552d4da73f24dc5a1a227f726b5f7c27a38a8ce1344fd97b22ae37729aacb3fcc18e22df14863004fd0472eadb3efa1fa
 EBUILD vm-7.22.ebuild 304 BLAKE2B 3341d6a1b6ba2bd3cdd9da2fe1689aab9746e165fbce88f615ff590bb0941121ef92cdc3a88d906eea8b6290155e47df9dcfe9a230e6b578cc0bcd612b620eb8 SHA512 e2e03151189024a0b74c40ddca7e941c11a063d58db01e18c06ecb0aec735012988bb594d507ec527aaf0aa741edbd6e1091a6a2f971f4ee0703a2f3107535b9
 EBUILD vm-8.08.ebuild 498 BLAKE2B 79b36ebb60a644976ff1faf16d9e985da3c7fb0730f9aa99eef5062a7cdc2a6a864382e05782c91a6f44b28599a2d0a6ba35505f3a4cc31f525c8952c5db2cf0 SHA512 b241ef4f2765f5a411c58b1937f81fd8af8e55f0106cd6dfe406cb15ff56f77fb17b110e29dc9d221cd9b6c673f2fbc5ba7cee8b8294945f0c7af9aeea49043d
-EBUILD vm-8.11.ebuild 500 BLAKE2B 718e4a0298ace2b0ce1979ba8adc55e8a95c8579b0842b992cba375402944ce5484a64bb0202bdf380ba53d9731cf959d63d54cb4c951b6d01edce56bd78732b SHA512 6172234b63d8b64dc90b7112698e9918680bf83aa2d3c4b87ad065e508672b22d03ac4c67cf95efdb1e6b06d6910b100cff48c13ee518fe8f13759407a6f8e7e
+EBUILD vm-8.11.ebuild 499 BLAKE2B 54a40e71dcd2244b0cc20b642714e34ec8bdac154c259c6aa3c2b9f1d7332e290cb604b8144b35c20bcf2fa603148bf0a6c43e07a4d3b8ba546d82e8bdd9dbcd SHA512 df2d91f0138f82da9dedce14ac996f98ac59e77bbcea2126a86159fdd86bb7069eaabf93b1ba8d25038622b606044cfa8eaede1ca7baec54ee14b73a40e9105a
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/vm/vm-8.11.ebuild b/app-xemacs/vm/vm-8.11.ebuild
index f6bab0f339db..6919757108c4 100644
--- a/app-xemacs/vm/vm-8.11.ebuild
+++ b/app-xemacs/vm/vm-8.11.ebuild
@@ -20,6 +20,6 @@ app-xemacs/os-utils
 app-xemacs/bbdb
 app-xemacs/fsf-compat
 "
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/w3/Manifest b/app-xemacs/w3/Manifest
index c03620a43490..cf7328ef1714 100644
--- a/app-xemacs/w3/Manifest
+++ b/app-xemacs/w3/Manifest
@@ -3,5 +3,5 @@ DIST w3-1.35-pkg.tar.gz 696392 BLAKE2B a92f46c5cc3ec4d7bb9c250a88ba417c10fe0a398
 DIST w3-1.41-pkg.tar.gz 683044 BLAKE2B 4e00bf669ec3208771c08333e9231ad596b54727277d10b0dbad8e053dffd1269c1d8559621786b4a8e9c07f598ff564d9379212cc5a1ee8a8871e08cd17e953 SHA512 e050f51644f08f8a17976c118e4dcb1a70b1b91bf26c56d7a48a0f65e1076bbb6ba54e4c36c027ede8fade2f12542cd785dc0b876247523bb4933c4e89a6ce60
 EBUILD w3-1.33.ebuild 321 BLAKE2B 04e846928c535de69f6c95e4dd8ce9cc8fb51d7d4abfe97b623fd899c8fe034b77d063f7c5c2a3b448c4699d9f34d341b2cc60c000e2a8be3d7a5a9247879c42 SHA512 7b72dcef1ec9b7b80af26e425a68fb1bf3acaedab21b920245372a42eabd2e876008b5c43eb05fe1aa62b7ad32eab1eab27aa4ed1c976979733d45ec81996b37
 EBUILD w3-1.35.ebuild 321 BLAKE2B 04e846928c535de69f6c95e4dd8ce9cc8fb51d7d4abfe97b623fd899c8fe034b77d063f7c5c2a3b448c4699d9f34d341b2cc60c000e2a8be3d7a5a9247879c42 SHA512 7b72dcef1ec9b7b80af26e425a68fb1bf3acaedab21b920245372a42eabd2e876008b5c43eb05fe1aa62b7ad32eab1eab27aa4ed1c976979733d45ec81996b37
-EBUILD w3-1.41.ebuild 427 BLAKE2B 5e0345af8752826857a44b3382d429b723108a4e2c0e89cff1bf4b29f3c1ec5a6536521d34c1031261203780e0f2913e3b4a6883e84e6d196c2f9617bc67c160 SHA512 a058355c6cc7f335063e9ee6e07cdc37a4ebf0a5a03f2754cb578008f5581e3373e928eef6410980df5a03c6139300ca3064f94cee7acd3847e493756aa85701
+EBUILD w3-1.41.ebuild 426 BLAKE2B 42c7cfa23cc59cad46de608520647fdd3a638d6ff5e29f2f7ad6aa35ca2000d5eae75ecb55acf0a0038452a80551100d9dae31a3f8bb60de8143e54f66dc7918 SHA512 e4510ffa0db3cca065f4fac44dcba4bdf6adba52b6dd0166ef61b321174bbc1da061dcfd9a0b5d547fbe1df6e8a33247682eefed38b8782fc13d3b4609976428
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/w3/w3-1.41.ebuild b/app-xemacs/w3/w3-1.41.ebuild
index 6d9888190951..e3e793751661 100644
--- a/app-xemacs/w3/w3-1.41.ebuild
+++ b/app-xemacs/w3/w3-1.41.ebuild
@@ -16,6 +16,6 @@ app-xemacs/sh-script
 app-xemacs/fsf-compat
 app-xemacs/xemacs-eterm
 "
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/x-symbol/Manifest b/app-xemacs/x-symbol/Manifest
index 4636014705c2..4a68a3890dfd 100644
--- a/app-xemacs/x-symbol/Manifest
+++ b/app-xemacs/x-symbol/Manifest
@@ -3,5 +3,5 @@ DIST x-symbol-1.11-pkg.tar.gz 684579 BLAKE2B 46915c56133ba3232821ab75ec497b98457
 DIST x-symbol-1.16-pkg.tar.gz 683912 BLAKE2B 7fcaed893d8121cf80970e1bf1219d2a6641e44d88887929ec541a6a6dd4e6d21831f8f886a4b1e47a7e584bd70e26ccf7c143233d141c19b33a802aeda2e84a SHA512 435f8903abe7028a4ea9e95cc0d69ce7ac3db25469df00f71eba868d2d2dc8eea92fb468c056043a9fef9fa716b03466e72af704ea35bc357c29230d59c1db54
 EBUILD x-symbol-1.10.ebuild 364 BLAKE2B 6b6adf09a8d71ee9bdf6a80b702cfee67af4ce3b47201a3bbf182967fbcc668ac0043cd7a0b929cdff46b3014bb9bc6a0da03912449e54059d0b3d92b06b61b3 SHA512 bb34ecc190e6281915e82e2a5f0922646541a09dae2c6ba25695e3ee6b2d37d8d73fbec48ef62c6dea38963927756c722e62d63b463e8a84bd1f0b59761b8ebf
 EBUILD x-symbol-1.11.ebuild 364 BLAKE2B 6b6adf09a8d71ee9bdf6a80b702cfee67af4ce3b47201a3bbf182967fbcc668ac0043cd7a0b929cdff46b3014bb9bc6a0da03912449e54059d0b3d92b06b61b3 SHA512 bb34ecc190e6281915e82e2a5f0922646541a09dae2c6ba25695e3ee6b2d37d8d73fbec48ef62c6dea38963927756c722e62d63b463e8a84bd1f0b59761b8ebf
-EBUILD x-symbol-1.16.ebuild 366 BLAKE2B 7e27eacdb229e3e4c134e3c1683a464375ac8a6b8923fa1740aa42d0f7dfb05b3da2d7aff6572b19ef098f8fe0ec4381eb4dd8f9638e472aa8d2cf66404dd8a7 SHA512 d8733aabf7321d3a8db48901076e3ea23738fef5614164d13bc7194288d66e07edac73d5a596252a626d66d58551730f10fcd963759b5d3c650b7b23ea4e807e
+EBUILD x-symbol-1.16.ebuild 365 BLAKE2B b3fc39636c39b7ee111aba8d566c1d2c7d7e13feb025a9386eca4cc8e2b2c34f60a8a23dfbd26f903aa8dc7e30c0cd895b950c560ff0a369cc458f78524e1ff9 SHA512 aaa466d723ce15ac8898506856db053272e729c61ecdeeb63aafa49ead6014dd25def41bc730822c8ee3a6f833e2a8e0fa841fa51753bfcfdeaa184c7040fc66
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/x-symbol/x-symbol-1.16.ebuild b/app-xemacs/x-symbol/x-symbol-1.16.ebuild
index 2b54fee44ba0..818d5b141b54 100644
--- a/app-xemacs/x-symbol/x-symbol-1.16.ebuild
+++ b/app-xemacs/x-symbol/x-symbol-1.16.ebuild
@@ -11,6 +11,6 @@ RDEPEND="app-xemacs/xemacs-base
 app-xemacs/auctex
 app-xemacs/mail-lib
 "
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/xemacs-base/Manifest b/app-xemacs/xemacs-base/Manifest
index 3af84b91da44..c2c04e510b82 100644
--- a/app-xemacs/xemacs-base/Manifest
+++ b/app-xemacs/xemacs-base/Manifest
@@ -5,5 +5,5 @@ DIST xemacs-base-2.46-pkg.tar.gz 581493 BLAKE2B 096cd02bd906d6d382dcdc1ccf8d5ec1
 EBUILD xemacs-base-2.08.ebuild 298 BLAKE2B 2438d556418fb82a1c65e5e15b9ab7317d15252981cf6bc9030fbb0f20f801eba089387a91f6284cef1bac3b03d1a308f02ee7be4c83da093c949247e916aa72 SHA512 b8ee0b44e5f31ba74544144c91969193b4ef1b8c754575a98e1156b696ea5a442ed35e2da6e06a470ad3b1c8401a0c6b9ea01b84931cbad050ee2c1d6435dff6
 EBUILD xemacs-base-2.10-r1.ebuild 299 BLAKE2B efa783ea14cd8cd8866f142192109bc8885e2a0f465b4cb9955b5e90578aa77e43fcde7d8dcf5fc012d5c9f7e42820649f5a320853c68390248a80efa8f48db7 SHA512 e891ad50ea2d62de9ccafaf4df35fd96a6f87720549ff41ac7302a621d54a91dbee1f25748ca95c9db7e3d02685ff6bd4a6f36fdbd35cd0f92f64427e1909354
 EBUILD xemacs-base-2.27.ebuild 317 BLAKE2B cde62bbe910655f291d7420f1fa8794bc4d1570c94d26c39dbfc880a2dc3e3312c66748df7c0e454d226439238975053e067d86d770c7d0aeeb80e073cd3a363 SHA512 6dcee61615c40eed6fe952e477709739f8016a42c9002e7cc5e6f5d673369909881f54b20d67b349fc16f3fc63c9e5d3da60c93ea68a1ccc86facf9a236ed799
-EBUILD xemacs-base-2.46.ebuild 320 BLAKE2B a33f6b152e8b5f331e376b69c1aac42cd1a3cd2a5b13b0d8b9d4c022289c1c71bcc8812e5e7ef50e9e5808953a6e030f4ea81299dfab28117bfe932f5dd8d620 SHA512 898711821725a0c0f9968a14b4c4d4448c30fb6610512d3d0e68c19b503578995c885aa043e3b7f130c7fdf49b26c2bf86959e460ddb987a4aa96b07536c1214
+EBUILD xemacs-base-2.46.ebuild 319 BLAKE2B f8d1dce3cafb917604a2a66a0bf83f543eb35092275a85d7fb4d8f6228d557c40c8650cb126649b22756df9f985358e87f8bb5d1057f5fe93c495bc697d8930c SHA512 a77ce00e50a9cae615a8e10189016bb9049cae8e43c73de2b1ba967ac1cd9f4f6126aa3a06ac15dd252d7aa866bb94c08b202ab54e2af142808185bac78fa97c
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/xemacs-base/xemacs-base-2.46.ebuild b/app-xemacs/xemacs-base/xemacs-base-2.46.ebuild
index eb32fb5f7288..9b4689c82566 100644
--- a/app-xemacs/xemacs-base/xemacs-base-2.46.ebuild
+++ b/app-xemacs/xemacs-base/xemacs-base-2.46.ebuild
@@ -7,6 +7,6 @@ SLOT="0"
 DESCRIPTION="Fundamental XEmacs support, you almost certainly need this"
 XEMACS_PKG_CAT="standard"
 
-KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
 
 inherit xemacs-packages
diff --git a/app-xemacs/xemacs-devel/Manifest b/app-xemacs/xemacs-devel/Manifest
index a87c78db6085..4016e1c1f95d 100644
--- a/app-xemacs/xemacs-devel/Manifest
+++ b/app-xemacs/xemacs-devel/Manifest
@@ -3,5 +3,5 @@ DIST xemacs-devel-1.80-pkg.tar.gz 257410 BLAKE2B c678554fac620d56b687611e56ce7ca
 DIST xemacs-devel-1.84-pkg.tar.gz 257545 BLAKE2B 8fab5099be409c36b1f72daa4fbc57648fc6c40f5abfa686c029135fcbcc46cdf123ba35e11bfca1f4d1804d303005795cd6f52265dd060cd28afff1a56313c2 SHA512 eb20fe3fcca45b9feda2d70749c8a5af1936bf9a94d41b9a96ef83968b7f85ef9b9bd5121aecaafef59cccb6fb2e29a09ff0a7675a7b786909d86e59a6aa2005
 EBUILD xemacs-devel-1.75.ebuild 490 BLAKE2B a765e652abe813ccdedcda2774c88e9049b467e9e27b43a3585507c57e3f2e142d93dd57500b9a8469cc7fa7132e01173ab977e2da7d26352030be7deb793549 SHA512 f4e81cc060544a73e664e2f4e216b923e91cf7470f2a9ebb5a702f86bb49b3911347468b3f089f0a319346e6518dbe75d5ffb19a9b59ae1f94da69719d951645
 EBUILD xemacs-devel-1.80.ebuild 490 BLAKE2B a765e652abe813ccdedcda2774c88e9049b467e9e27b43a3585507c57e3f2e142d93dd57500b9a8469cc7fa7132e01173ab977e2da7d26352030be7deb793549 SHA512 f4e81cc060544a73e664e2f4e216b923e91cf7470f2a9ebb5a702f86bb49b3911347468b3f089f0a319346e6518dbe75d5ffb19a9b59ae1f94da69719d951645
-EBUILD xemacs-devel-1.84.ebuild 492 BLAKE2B 72141da67368b23ee737867a3e67e686d236e66743ee54368fafe734059f1432e57d8a5be655d8b8777fa83f52ff77520dbef5432ef102a11b90ea28dc6b7c1f SHA512 0dd0ee38cc61e903da24c9ab5203c3a1372bf278252645d7679199b13244f78e1c7fbeb3f8672731c0451dc2c77aa7c9e1b5d2e85e6c48d30823cb9295943937
+EBUILD xemacs-devel-1.84.ebuild 491 BLAKE2B c0e198d9b622be930e0ab919a23ec911b37ddc50cff0e4ae0478f6fdb367756f56a5df62a784de2429582dd85b08f58d30c86d1aaf9c851fbb977c078583986a SHA512 f3e1b42666b95347a7e10ab9d8c2c6eb2e0371721157ba4b7ba21bc039a931fe5dbb8f44b3f24a8b5d99b042967a35902202332fbf064bd322174b4aee738d09
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/xemacs-devel/xemacs-devel-1.84.ebuild b/app-xemacs/xemacs-devel/xemacs-devel-1.84.ebuild
index 06263c103a54..820b3b67241a 100644
--- a/app-xemacs/xemacs-devel/xemacs-devel-1.84.ebuild
+++ b/app-xemacs/xemacs-devel/xemacs-devel-1.84.ebuild
@@ -19,6 +19,6 @@ app-xemacs/net-utils
 app-xemacs/xemacs-eterm
 app-xemacs/ecrypto
 "
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/xemacs-eterm/Manifest b/app-xemacs/xemacs-eterm/Manifest
index cd2429e88083..02c62c321317 100644
--- a/app-xemacs/xemacs-eterm/Manifest
+++ b/app-xemacs/xemacs-eterm/Manifest
@@ -3,5 +3,5 @@ DIST eterm-1.18-pkg.tar.gz 116169 BLAKE2B 2fdfd0575c9df55eee88ac14009518106af175
 DIST eterm-1.20-pkg.tar.gz 116176 BLAKE2B 953a801d761560e0a81de726d4b83e1b00c686360ccd66b7f89af190f154d0f563060ade702b8a63dcf68f885827e54ba15121e90a204f5dd108156c4dc458e8 SHA512 67d81b39761948d548fcd4fce200376702ce1884deb817c16e2db59c7eb3b571c60663ada91082433e08b42fedf62d07e31abd0f377cc4e44352398e826c7268
 EBUILD xemacs-eterm-1.17.ebuild 376 BLAKE2B 9e23269f6bff9b1ffbfe09e97a0c7d924159d7ba6a612c6cfb07c46c284ca0fca0db6ad321019698e7cd2d507d1dde80f1f6c49af59cc318f0e62bff8ecaace3 SHA512 05a34244ebd4ab43661af61c2d5fea28aba5c6a7d0c04e1938fcd52b1917f08de31a70ab009ad30eb17194b686c2370a2047a400a859e10f2af4692cd115e9c2
 EBUILD xemacs-eterm-1.18-r1.ebuild 377 BLAKE2B e1c740afb56908be358ef05bf0a75d9e81721e2eebff99276c68e950b17e366bb3500415f9cda18333c80960981776510283e73d040c66f3d82dda517b437251 SHA512 2d7bd3d9e591c8e3c2a5042e4d0edc840ab097b167177accd72470440b771927c5f78d648131d30c17cef84defaf32fc83ab91d9ac6245e05738bc5233e738e4
-EBUILD xemacs-eterm-1.20.ebuild 391 BLAKE2B 97e0f5759cae587dd9bbb933d03680b58b6d8ed959e37487306655632d2e08d648acd244360553ec46618161fb28f085d2adf2f2a90a06df9b868fe5b405e9e9 SHA512 41771d93ce5f97882cfe04fb7070546790b319d89aad81af6688696bf64f48d97e99a093c528e89f35c4a7b39529dae866c1fd1541ebdef8346ee85dc28cc93e
+EBUILD xemacs-eterm-1.20.ebuild 390 BLAKE2B 74c540a8a5a1c0138e5be126e4fba9fffe9470b9b1a5e67107da47c4425129bd83c23d973f3551e9cfe094dcbc0a862db26945689a4cd2c215b75876de87f1c5 SHA512 7d95f936ed500f033c5f00b73469c7185e589a9251aae61b4cd4a0ea654d267d05e001254257c22338269b4f1e55e526c54eee57cfb398d4f1d8b21562bca090
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/xemacs-eterm/xemacs-eterm-1.20.ebuild b/app-xemacs/xemacs-eterm/xemacs-eterm-1.20.ebuild
index d9689cf12663..d6603400118c 100644
--- a/app-xemacs/xemacs-eterm/xemacs-eterm-1.20.ebuild
+++ b/app-xemacs/xemacs-eterm/xemacs-eterm-1.20.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Terminal emulation"
 
 SRC_URI="http://ftp.xemacs.org/pub/xemacs/packages/${MY_PN}-${PV}-pkg.tar.gz"
 
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="app-xemacs/xemacs-base
 "
diff --git a/app-xemacs/xemacs-ispell/Manifest b/app-xemacs/xemacs-ispell/Manifest
index 89368183125f..00b31bae2d19 100644
--- a/app-xemacs/xemacs-ispell/Manifest
+++ b/app-xemacs/xemacs-ispell/Manifest
@@ -1,5 +1,5 @@
 DIST ispell-1.32-pkg.tar.gz 83587 BLAKE2B 80c65a5bb22711c6690ddef1213d60b5f6cca8d5fe342267e931294a10a976c9f3a50e6ba2d539720e460a25779363c954aac37b4c413741784251849fce0785 SHA512 02108c33e5611ecd4ce6c574fcb12a93d3c8753079925c624ae3b155a6b13efaef581c468e311e7aa1f85e0a032cebf2a466ce8e5a9647be0b748251c3dfc070
 DIST ispell-1.37-pkg.tar.gz 102787 BLAKE2B c77034361f9ac9e69b51e2a17db78e675acfa5f55a25dda453d2612558ca0b4a1c2fb9b57fde17e2550a7ee4f2a8187a8983766f2e0282ce2fb793e13ab619a4 SHA512 6896c5fe7b9a10d3e11103dde8dbe7a23446c969a2af8e99815d34f621227076aa57061ebca589a3cd5decf5bf47a8c34ecafc73fe13f5310874edfbbedb8c8c
 EBUILD xemacs-ispell-1.32.ebuild 371 BLAKE2B 8952fd46aed549fb8a0f852a76fcdadf0feeb9994dc4b16e710e9b1b6356df503c7b38ddcd905602810dc5846bf398b4d804ed58dbb59951d6747269da676021 SHA512 bcdad13ea3de590438808801a454c7c948e2fe489e50431f9510682dfbae3638879951a5500ee5a58c6fbe6e84437a7c99149691f41f2d87bf82c68422ffc6d0
-EBUILD xemacs-ispell-1.37.ebuild 385 BLAKE2B b1150c757b0f464d19154f205078bf55dac67c9131c594cdf6ce4289784052122ffc8b8c67e9c631c2b02e43c1286a4f4afb5070ffa0fa470461577530e42ed7 SHA512 4612f3b614d0560e0963907f8ffdba0f9fd25cc74aa0d66e1eba0fee19d0df2ee27d0b2a0596419c595328091e5f7a5a445de1bf5820103d24cf8c8d47aea78f
+EBUILD xemacs-ispell-1.37.ebuild 384 BLAKE2B e3d45ded90e3fe6a973207c059f3fab74b788e66aef9f90b1ecd3ee24dedb8ff588d4557cbcab5053bc55efe682c8c0fa1938533f31f93906f568acde874840d SHA512 75c9c1157f082b7f267a3eec8baf65b16fadf170cde07b7002c60c263ccaf955711080ab0546a0dee38a7ee2a3c569f55b011341745b31574fb649c1fcac514f
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/xemacs-ispell/xemacs-ispell-1.37.ebuild b/app-xemacs/xemacs-ispell/xemacs-ispell-1.37.ebuild
index 8e654f12ad35..47192440f079 100644
--- a/app-xemacs/xemacs-ispell/xemacs-ispell-1.37.ebuild
+++ b/app-xemacs/xemacs-ispell/xemacs-ispell-1.37.ebuild
@@ -12,6 +12,6 @@ MY_PN=${PN/xemacs-/}
 SRC_URI="http://ftp.xemacs.org/pub/xemacs/packages/${MY_PN}-${PV}-pkg.tar.gz"
 
 RDEPEND=""
-KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 ~sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/xemacs-packages-all/Manifest b/app-xemacs/xemacs-packages-all/Manifest
index 774ce5a3f0d5..b3dafd03f5b5 100644
--- a/app-xemacs/xemacs-packages-all/Manifest
+++ b/app-xemacs/xemacs-packages-all/Manifest
@@ -1,4 +1,4 @@
 EBUILD xemacs-packages-all-2007.04.27-r1.ebuild 3677 BLAKE2B 1de81b1dcc451288572169d759f4ef117a6f74df5ce9b7ffab2d85cb7568e73cbacffb38e36f2405cba0f745511d1d268e5d9c0f3cbeb5748f0323213b453b16 SHA512 43b96eef5984f77199f6c91a2760320037564f45982f9ba25730ca176b40e01220dcefd16c1f4c6dbfcee3ecf2c6db7c4288cbb939f5be57ca0268949f80c4bb
 EBUILD xemacs-packages-all-2010.07.29.ebuild 3789 BLAKE2B d3fa5aa3ee1cc3d90eae67031bc8d4f45f3f84f7d8e9413729d96b2fa97168d2b965927073a11b1dfc22cef375bec75b5fd4bb3c97bf7d116bfbdc2fb33fa3e7 SHA512 ce4c7079aeeec6f76fabaa7a6c384fad28bb2d64e93dd8e271a882abba1149f083f014bdd5835c878ba21eb01b10a747a683b3212f8785cdea16293d627cd01d
-EBUILD xemacs-packages-all-2018.08.11.ebuild 3756 BLAKE2B d6b9229990e30c0a6ec46c1575a892e175f812920a4079fb7ba70e66af7045b769daeed31532d094d0e7f1b86a76ef253a6324cb0165d685af9f5d61fac52331 SHA512 574528368e77c0b7742f7e55eb8b4e3a70b55469434d8f15491fdf64421c56a3762072254d5409a589e36ec994f47ffef62b04c6bc40a91296c31ce4e1bff975
+EBUILD xemacs-packages-all-2018.08.11.ebuild 3755 BLAKE2B fa8d5e4a0dc1b63852348594ae718d3923c0bc5804c9b671bc83447321dc9427f86bf6490ad66ed907dbe328e695a217b608544f1b13da87bcb2ff80406ebab8 SHA512 f3f88e3fd9651813035f705f07f75ca00c90db41721ebc04a28893497b13e7c311b032b9b6175be342300020753729d66d3b84b08ef8cac8c35aa8b4784c3496
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/xemacs-packages-all/xemacs-packages-all-2018.08.11.ebuild b/app-xemacs/xemacs-packages-all/xemacs-packages-all-2018.08.11.ebuild
index aea14a7e95a0..648548cb8ad1 100644
--- a/app-xemacs/xemacs-packages-all/xemacs-packages-all-2018.08.11.ebuild
+++ b/app-xemacs/xemacs-packages-all/xemacs-packages-all-2018.08.11.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="http://www.xemacs.org/"
 
 LICENSE="metapackage"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 IUSE="mule"
 
 RDEPEND="
diff --git a/app-xemacs/xetla/Manifest b/app-xemacs/xetla/Manifest
index 7acb0c936e09..140bf0d2d72f 100644
--- a/app-xemacs/xetla/Manifest
+++ b/app-xemacs/xetla/Manifest
@@ -3,5 +3,5 @@ DIST xetla-1.02-pkg.tar.gz 294986 BLAKE2B fd586413dd9836987fb429e669bebe72117f10
 DIST xetla-1.04-pkg.tar.gz 295025 BLAKE2B 9a373e77d53f77c5d05ab2cf5d12942281c6dd32158a6e16d6e8eb0494ded373e10b27a5d48a55ffdea35676c9d7eeeb5724818eb3311114448ae76a86526766 SHA512 4d214ae76eecaf4011ca1f49b21b60786c29b6c6652d05f024f37114f7bacbf1bfdd3f48d7ab7f4d0e3e9808986aea2de9703d498acdaa676ab0344b26af5e96
 EBUILD xetla-1.01.ebuild 402 BLAKE2B f6243f0684a3ccfb6db1032203663921f94cc2848ca05a2d9ae56c15238fe3b983f187d34793b6379f76e8173b09ee4677cf76fd4bbd490ab981e17b4a851c41 SHA512 bd718a00ba5bc4280f5726a42e992ad24768415a3d5f1af6ae59ed4d9ca39634d58ce6af83b9a220423a97fd257a6449f93d3fac5802eb782df0794f6ca7ec3f
 EBUILD xetla-1.02.ebuild 517 BLAKE2B fc57a1e6e7b235a47304e9f5b2ec5a5f3a37fbac79867ac41b01520a6fa166f10b1bbfeca6dffde8ddb14df8ccb86219b299f9dd3b4787d0374979788ee25f8b SHA512 979ffcece6f518e21553fbe6389861d200c70d6757419fb3b2a681be1ee99d87c81fa296b707e90dd73db6d7b24acc95abc85723ff30bab072efaffd1ec376c8
-EBUILD xetla-1.04.ebuild 519 BLAKE2B dbc10b6f59456b8f0e2891713e4e4274151fd73648173aad2136987129a300fd088b60ff4f0c0bb2a1c5deb3796c58e873f6776c2492f02eee07ec5a5742516c SHA512 fa9f395f6954646b83cd5503338ebfbf9c51dda1bdab789af148b87a2996eda2f0b3ad975a0a66ce29a9f415076c8d191e46c8ae6fc0c31eaf24e7e124e846c9
+EBUILD xetla-1.04.ebuild 518 BLAKE2B 0ca0855cf927e733102fe7960362d9cebae3c48d10145fc5019fc1c060139ab8faab60f2edf4535119950cde6f831521ff65fb3c62b6d8c7ae06711704ab6984 SHA512 f611cae3278852dd3462053b2719dc015500d36dd8b9644ebbc71b134e7d7c35748fc21fd1868d95ab53f1cf70bbecc3c2e486785eef5f2842bea4028d4905ac
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/xetla/xetla-1.04.ebuild b/app-xemacs/xetla/xetla-1.04.ebuild
index edaf51f2a017..283867063fa6 100644
--- a/app-xemacs/xetla/xetla-1.04.ebuild
+++ b/app-xemacs/xetla/xetla-1.04.ebuild
@@ -21,6 +21,6 @@ app-xemacs/mail-lib
 app-xemacs/dired
 app-xemacs/prog-modes
 "
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/xlib/Manifest b/app-xemacs/xlib/Manifest
index d566b78fe132..19ed2903f193 100644
--- a/app-xemacs/xlib/Manifest
+++ b/app-xemacs/xlib/Manifest
@@ -1,5 +1,5 @@
 DIST xlib-1.14-pkg.tar.gz 205806 BLAKE2B 87c98668972496db0950181354633409a1416a5a20e4764913b5b0ef6c99e3fa487ec67f2b460b60eecb2358b1ba6e9bb532fbae53036ecb5d73b07eb2b483c7 SHA512 ad704e10cfbf8fb01ab56666c47b58a0acefda615dda2d63b56c2416b023737a23e7b748f752b11336e2379271e84e1731db7e72274930ff82c16ed00921a0e0
 DIST xlib-1.16-pkg.tar.gz 205431 BLAKE2B 50f5e46555710d1425873bb3c1e3215b4cbd28b49cb3a6f63e0c3a3f1b7234c613567c46041f46a015e761191d9079b7f3a8658ff7b7adf7ea3837a6059e3dd1 SHA512 ce5ab77d6ceaed84f658544d3e9e158254db26165500834c6f01e2bf341ea306b0c94b46c7361e4b7f923685d390ec40bd16ad0ab18cd7a1ff219221d9fdf4d0
 EBUILD xlib-1.14.ebuild 296 BLAKE2B d335e4b96e99ffe55ef6608c226b3b8b545442853160884d59f0f57afbe7d435fe99d3c9195e65f4ab21c10838904497f9152e53ecaa0d6d4a666aa4b215e4bd SHA512 e69d1072be5f6b4be30f783f860a7aab4f8f16cb8a3ee7a2e175b26d4361dac1ef6a0d7f3cd806d1866ebfbb6c214293e8ccd947f7ed0f39a0539aabc52de651
-EBUILD xlib-1.16.ebuild 298 BLAKE2B eff79141e2f4062dea5d38fb4acb0222f279a4b9311801df66fc20b1763e74ded0360e77e8b7769f0e4f96fa743181c775b854e90959ad66462f06a5a42acfcd SHA512 a93d584fdf9a0292684d186f81d9163e60bfa83a0eb4a9936c0743dab44f42130844bc0b7e96c78702c32b26a046dc8a5d0794f06431b806b925e082b638c5a3
+EBUILD xlib-1.16.ebuild 297 BLAKE2B b80f708f345cde9f0102bbc1436c090537b93fbaf04fcbcfb6380c2204d6fe0dd4139547cbf2a006bec648579e48bfdddeb771c56189710b2fc5cc4080f1feb4 SHA512 629746996a13722cbd930f8219eebcd4de1b936fadddfe4f96e2138464cbd161e9c0b7743e1d28754449cec48f0485cef72c41bc2c3869782b1d24e6b94fe0ad
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/xlib/xlib-1.16.ebuild b/app-xemacs/xlib/xlib-1.16.ebuild
index 4eb7e9ab98e0..4205f692b05b 100644
--- a/app-xemacs/xlib/xlib-1.16.ebuild
+++ b/app-xemacs/xlib/xlib-1.16.ebuild
@@ -9,6 +9,6 @@ XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 "
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/xslide/Manifest b/app-xemacs/xslide/Manifest
index 3ed92626bbcd..bef6cdcbc1ca 100644
--- a/app-xemacs/xslide/Manifest
+++ b/app-xemacs/xslide/Manifest
@@ -1,5 +1,5 @@
 DIST xslide-1.09-pkg.tar.gz 39199 BLAKE2B bd8cdfec35c9f7e309e51639958c15ffdbe0ed99a720f0dc3c001d1bda5904de914d075b65eb25ec0151d8b90260c2b1baadab2939f3d1c90f319461f9c2e4bf SHA512 2844b1d71b9a9938443d550e8a9dc5eb53932d92695839dd20d633dd5f0ab4448a08ff10f228d7b63380df6c367f27a236dd91e203d7cfe4b0632bb0639e6553
 DIST xslide-1.11-pkg.tar.gz 39204 BLAKE2B d333a427aff3532c6c04eb18de7d171c0f3737ee6c73f1ee33ff6967cab5e8ebbe30d12a0e12c63ceedbcf0a883cb4fb67328ccb33ef9ff99d3c880f7d0a05a0 SHA512 fb47d139bf61c632ea14aa9458c307a02cd4f2c70d69732c7d27d2247f70d338719525931d83dd9527669bd451c1eca8f92ce8a2c77f332d56ff64b979e1d513
 EBUILD xslide-1.09.ebuild 333 BLAKE2B 3384b027407bb7b2dcabb08ae56ca8ecabe21820b5d0fa3574c93bb0cda43f5fb99303608fa0487c98b6a51d53f6879e6e5a3ca43ed362b5d0f1f32d533995da SHA512 b924cb00a99f48edd86ded3234670f37fc3fc22c027edff37516dddb961ad086aff963365ade79ccc69cda6db9b8b8fe61a2986f5be320a9994de982e5d61e8c
-EBUILD xslide-1.11.ebuild 335 BLAKE2B 51caabf0a0e78bbeffb1a924431223be0730e605fb79b765b630d18d90849924c9f4157d194c89cd034a590bb66fec5ee441097f22ea219d32790c2ae2cd255c SHA512 f6ed1346dd62000e6e74b5c1c4ff5b8fb70fc26c23b02f8a63e28eb71413b6a414d8df6d0860cf6b967acb134e5565035277a056f8a78ab500d6afb170ceda34
+EBUILD xslide-1.11.ebuild 334 BLAKE2B cfec66606809966ea7139ad0870b061bc7ddc87efc79c0e069d435f47559ceaf1241312f9c5bb614cacc40a66bc15730077303cd277fb951564d0cd3f35312ab SHA512 eb49fc68fdad2cc9152dd7c3ef1ab8ced6c2c7ca5e7856bc6b6ee2477dfc4ba16b3ee4242af9767dc26d119790c5dfe764d9aea0d1db9a65f95ce6a513725a15
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/xslide/xslide-1.11.ebuild b/app-xemacs/xslide/xslide-1.11.ebuild
index 0c1d5d766e45..5e1116368060 100644
--- a/app-xemacs/xslide/xslide-1.11.ebuild
+++ b/app-xemacs/xslide/xslide-1.11.ebuild
@@ -11,6 +11,6 @@ RDEPEND="app-xemacs/xemacs-ispell
 app-xemacs/mail-lib
 app-xemacs/xemacs-base
 "
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/xslt-process/Manifest b/app-xemacs/xslt-process/Manifest
index e42be7ea8c86..a17ec80eade1 100644
--- a/app-xemacs/xslt-process/Manifest
+++ b/app-xemacs/xslt-process/Manifest
@@ -1,5 +1,5 @@
 DIST xslt-process-1.12-pkg.tar.gz 59594 BLAKE2B 3e0d23799465a61bd209435e59ae11cc6f4d9dd58ab24674dbb83bfd836949bbd2f83e9c9d8397b904813169ec7b0e0121355046230094daaf008e95b1d5ba90 SHA512 47945fc2c105e6ce54cb7bd5e1b5a437444a85b0a059ecce7ee6ebdc22b9d6140f939711a79d7b65b43b628afd7c57acc34e56e3592efc1bd0ff488810af134e
 DIST xslt-process-1.14-pkg.tar.gz 59643 BLAKE2B 12c8914ed20b92e07b1a34783fc83ff8be31ebe8fb1de05e94a89ea9c1ac245e0317a7dc2e3a5ba8c530209e913f6bec5c35276315fc10bbfa4b27f190d36648 SHA512 6f4e0d6d28e37ab798594d50336094cfe3e58a4488476585927b92ca77f7258caf9803afb8caf3083bce850fba31b8e461f346c2ad8f1aeac7fd793f055671b8
 EBUILD xslt-process-1.12.ebuild 549 BLAKE2B b6459b9635b383ef0b34bc24aeef1640f42233844c9b41bd3f40f3f10d6283f7eda03a1f33f5d07ef287658a42c6ad1c2077e0528d764ff8fe6238509e63741c SHA512 75410632b29ecda7dbe7768e68f6565e66cb2fa7d1dcbb94e5a59be9edb89d0fac28edd2b0a708fa2f494e16683e261072580cd923089c7941aace3e5a5a7b16
-EBUILD xslt-process-1.14.ebuild 595 BLAKE2B 6f7f89a4750921e4c03aed2422025979f948d8d47d9b8038e929b646b65f0367703a2cdcf180fffdc610e6a8bbdb3130a6a18d3783c4bc1804ecca67a7d9fb30 SHA512 4c17d1fd48cf746d0cf511dda3c58f92cc48d17397148005971d503623ac146bcc1ee2648b02af16f060b3570b14934f33332d7b9c6a72f34c3cdd684c382600
+EBUILD xslt-process-1.14.ebuild 594 BLAKE2B d06014d7403ae7dc9a294acc900b50211f47f59f906fb690c336f237d95427d912833703613c6feca64c96cb2209bc09bc778e1ab770486fa0f5eb287d4d4e63 SHA512 1b3a72eb1f8a4d350c07ea2904bb6e52d520a4f60ce0f91baa0e27c55489c946e1e017679660f3762d7450d453386b942375c53f35bbb077c7a2fb270adac3ab
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/xslt-process/xslt-process-1.14.ebuild b/app-xemacs/xslt-process/xslt-process-1.14.ebuild
index cbbf7fde0c3e..b80e5f6d6f52 100644
--- a/app-xemacs/xslt-process/xslt-process-1.14.ebuild
+++ b/app-xemacs/xslt-process/xslt-process-1.14.ebuild
@@ -24,6 +24,6 @@ app-xemacs/fsf-compat
 app-xemacs/xemacs-devel
 app-xemacs/os-utils
 "
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/xwem/Manifest b/app-xemacs/xwem/Manifest
index 376187d838ac..1bb190fdd500 100644
--- a/app-xemacs/xwem/Manifest
+++ b/app-xemacs/xwem/Manifest
@@ -3,5 +3,5 @@ DIST xwem-1.23-pkg.tar.gz 649490 BLAKE2B 1d31ae12ffda979da37872a1653709f80b89653
 DIST xwem-1.26-pkg.tar.gz 649043 BLAKE2B b644127e233b0c93816687d992f54a2c3cbbb822100d4e56ca088ee9d05306a1a14ff602ddfdf5ea1ed822813df4df6bd6dc802d5f27b670bae86ea61eca742a SHA512 00783faa899bd2f3da8128339c54b677843bafb30b8c1a5fca29709de31448aa29a91bf62affbbe42981a97a8ec7ab807b8ee0b64642c73e6a2fda412213eb0a
 EBUILD xwem-1.22.ebuild 457 BLAKE2B 869e50a55bc9d400af4b3d431f43d6128468e3442f4f10a15f48ee6bd01f326588f663c47e781201f62d07d7d44336b1a56c4953703deebb6733ccf3c6f5f2ed SHA512 a382b6018b4b8e7a282596f38f70c3d142502825c9000212e271971989203712be08faf86cd453bbb9d3378b3050a398e33744bfdace27fb0d60bacba8365a00
 EBUILD xwem-1.23.ebuild 457 BLAKE2B 869e50a55bc9d400af4b3d431f43d6128468e3442f4f10a15f48ee6bd01f326588f663c47e781201f62d07d7d44336b1a56c4953703deebb6733ccf3c6f5f2ed SHA512 a382b6018b4b8e7a282596f38f70c3d142502825c9000212e271971989203712be08faf86cd453bbb9d3378b3050a398e33744bfdace27fb0d60bacba8365a00
-EBUILD xwem-1.26.ebuild 459 BLAKE2B c7a8680a208ed0e330407c6beefc3113c8b7286750366d1e0354d1fe4c286137556365d7272a6ff6e08026515dc7c998d3fe77ff2e916788265c5f3bec5c636e SHA512 909d73d0a754b428301e4e39fb016f6f5f936af26a3888ce293140967174da06693ea33dab2e4a6ad3f95e722d0199171a54a0f3b803a7f788d3c69f500ce0fb
+EBUILD xwem-1.26.ebuild 458 BLAKE2B 87fb09ce23003ae41b86a87ad2d8f2b392ac757e28e2782b7558ff5ffbb84ec4f960a50504467fa5242787598073ad9a877b79961252e839c39f1d9d50b58d3c SHA512 ecc685456d67b3e205335cf69862a14ea779436f8ab7888e4ac5ddcfd274f1e7712209d2142670f981ae5c45997e8d0a8e0bb55f9cf05ae1cf443b9eb0bbfbb8
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/xwem/xwem-1.26.ebuild b/app-xemacs/xwem/xwem-1.26.ebuild
index 3d107b8b1da6..a079b5bf8948 100644
--- a/app-xemacs/xwem/xwem-1.26.ebuild
+++ b/app-xemacs/xwem/xwem-1.26.ebuild
@@ -18,6 +18,6 @@ app-xemacs/elib
 app-xemacs/ilisp
 app-xemacs/mail-lib
 "
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/zenirc/Manifest b/app-xemacs/zenirc/Manifest
index 6187c373bf65..581757fe4c64 100644
--- a/app-xemacs/zenirc/Manifest
+++ b/app-xemacs/zenirc/Manifest
@@ -1,5 +1,5 @@
 DIST zenirc-1.16-pkg.tar.gz 277377 BLAKE2B 9d4bbe33bfa82ad1eb06ffdedb73e3eb52fe43a1eeb1b2da8692b877207a8e28a43d345472f67812b8531eb0222c17f9b99a40e3ad4bcaf14820dbbd377afd63 SHA512 2fd93791a94682bd26a2133a9a10b13587aa5a5d0b9a559c9589153f3132810c86d5fd7c6b607f2b777f22edf3aa4eab61d47ca161e0c2bf8b4a6f43ced2a07c
 DIST zenirc-1.18-pkg.tar.gz 277811 BLAKE2B ab8e8ca711b04db52dc4139bd4f75cf661267d3fa629572960c07e1c0e5537e824f6179e8c3b252bd78315fdce043e97c2cd03dd7adfd014c017c18a6be47fad SHA512 f4440d02b65aff416dd8c6064e678c365cf2137e94ef2a701c4b5459612b295d35b14f93097cc896787d1d5b74e418e5326ee41eb0edfedd08e00c7e56d5546c
 EBUILD zenirc-1.16.ebuild 263 BLAKE2B 5bdcd2ebd6df48a91c82fc4f2b5b10762c02c31324f0bedf35cb2d5052b27717c515ea669c1c31e35dbb0b62be9cec59226602259485617971c031687773f6a2 SHA512 0a4ca81c63970ad7bd660875a95c1e10e5f6c1c58de441d86dbc63ab694f16115ff15ff984eccd727f2aceaed9c63f1a75ad3c2a7aadaad57a562447653ac37e
-EBUILD zenirc-1.18.ebuild 265 BLAKE2B b51b24aa280e3f26eed1c0dff74a2bfb99db31f11bdf789eb6c30833685d44442a23ebd2b5b92417182e118a0d0ce054895f62ebb9df09fa2af16c03111d8281 SHA512 38a6219802c0552c9a4a23747b4478efb5f19b9c002f65a2a13bc6da7bed3451460cdfae0a39a9827d58cdb26210366418f18a4c7d5718fc6fbadd93ac094126
+EBUILD zenirc-1.18.ebuild 264 BLAKE2B f6dc196fc63d94b9f05320bb47726e4d8556589fa6133960ead44b15bc829f076495e78b2d7fc2512e78a44231ef9df06c81ebeac9fb0a2f0f35c47aeb1ecbbf SHA512 a253c5c2bcbed37c9c94849fc03093f0ecd3bb45a500b35b5f396e26df4b7d0b70a7fa4f6f23bbacdd784f29d6109a0ffe1bf504d02be5d74d9a5077b5dcd436
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/zenirc/zenirc-1.18.ebuild b/app-xemacs/zenirc/zenirc-1.18.ebuild
index 476764dfbcc1..d6ec1af3f0c9 100644
--- a/app-xemacs/zenirc/zenirc-1.18.ebuild
+++ b/app-xemacs/zenirc/zenirc-1.18.ebuild
@@ -8,6 +8,6 @@ DESCRIPTION="ZENIRC IRC Client"
 XEMACS_PKG_CAT="standard"
 
 RDEPEND=""
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 
 inherit xemacs-packages
author	V3n3RiX <venerix@redcorelinux.org>	2018-10-27 12:48:57 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-10-27 12:48:57 +0100
commit	70b82ae359a5538711e103b0e8dfb92654296644 (patch)
tree	8412b84ff9ce02a22be5251052b00feefe1d5b70 /app-xemacs
parent	64e107b9b6058580ff0432107eb37cefb0b2a7d8 (diff)