gentoo resync : 19.11.2017

147 files changed, 150 insertions, 150 deletions

diff --git a/games-misc/OilWar/Manifest b/games-misc/OilWar/Manifest
index 24b015f25103..127b8eb176ff 100644
--- a/games-misc/OilWar/Manifest
+++ b/games-misc/OilWar/Manifest
@@ -1,6 +1,6 @@
 DIST OilWar-1.2.1.tar.gz 515013 SHA256 e16ffd11439dfc857daaa98cf8a266b24794a4fbb1e84c1558794ffb622b5c63 SHA512 303581caf1cb59a4623b136595e0c1af6f682ae4c059a8848b481b42dee622083d436edb86ca9073edcf4c573f8a73b284dddea89cb8013943ef4ec81b3e17a1 WHIRLPOOL 5447c0af48b55e939b188e6351b63b3f3050fe3f7529026604194c95c84fcb2a254e33b39b55dd44391af81c62305aeac5864204104f8612813078d31be04db1
 DIST OilWar.png 2961 SHA256 f1e77e048b979b493fb9e3c48fc6a8d643836f121775f3cc4d64321260377e1a SHA512 75bd4c18791593f0bb81b51d87f6f033e2ebebe6de3653276b14e852d3625f01a61fb34257eb3d15ebf265908563f2820793b84196138b39c9329839e8fefe2d WHIRLPOOL 9bf04463dba9e043fb3c6d0dce69cc73796bba52cb06b820a304860d13294954018f6dd290ca4d760cf834bd0fefc0bdcc78f9748e9e154d68a2e083aecd1786
-EBUILD OilWar-1.2.1-r1.ebuild 1111 SHA256 dfe2c459980f66d1df05be29b29e1e1132e06312453acee5829188c189593cce SHA512 950726f6b71b3da62f7e44de864663efff839ef62f8804fcc1c1c88a3a9a7bdd768b49741b5922008e96aabbb42dec4261c48c8ec8e4ee3379cdd8ff09edb8f9 WHIRLPOOL 251e1bbef22949e7f449fc08ffb029402710c9c4663433183dc145275ce7a7cc467307caa9ef736ee3c97c21883ea83aedc9c3b7aedd7f7e28f088daf8dc7b49
+EBUILD OilWar-1.2.1-r1.ebuild 1113 SHA256 d33c451404b75b6d7788ad9dfc438b7d733abfade22a0a51825929b1592711e7 SHA512 6e13c3fcb19a32436f5bdf7e42bda9121db6c180149fb8e639d8a6b3a8300b63bac1bb23938a37f49a595d77266026681a8a5e359624241d564ceec91260ac4c WHIRLPOOL 0850622ee45806b767c5db53a8149227958c0652b4ebd8ec85b332fa63029e9a4aa1417d1e255fb3f3049e581195f1f0ae27bd4c3b64df66e674d2fd8806592b
 EBUILD OilWar-1.2.1-r2.ebuild 1151 SHA256 2f4f243e34f80755c56800e70c0ca5dfd87b2b77c8bd43358798614cb4b91b8c SHA512 fdf072c461e7fc59b418d5db568204b3cf3fd916785734d67e0eda7a038b84c1271a6ba58029c5b50dd1abee49d1833a18d135579c09f056d394c71b07771a15 WHIRLPOOL fcf0c02e3172d967065d1bef8151bebd816a4cdc22ef427c56541c44af1d7eb6f227f5594d630fc0fb9cecaf5cccd0f7cdaa0f6e331417d689e46fddd6cb129c
 MISC ChangeLog 2682 SHA256 aa275e0a17b7be2ad8bf81f50b8fd72e7e7f260794467bf1242f8686fc9241c6 SHA512 e079f5c28746584f62e4d07e222539f2164e30e3275c02cb4c00feec0489b6c4eba3d56af72ef444954de49755aeef7e9e4e2fb0e7e73f61636b6b2f0cbce0f7 WHIRLPOOL ffb5f0af88e33053284cf0f73c8004661030923f35caccabdbec3e88f348233e58c83ea5cc90eb637bd04cf09362f7bc5db2ae9b7ac8c35a584bd11bc4f666dc
 MISC ChangeLog-2015 1314 SHA256 cf15e8325b530e989737a8a219168d7a1298560f3e486bb505639f46ad4a79c1 SHA512 ebf0d10498814a4946d218fefc1d3f745f12c0a3df3d74045419e08a26fd77b7246ea8b4759c1be4f7d7c832fbddb2b8d49d0a2b48a97048aa059ea893ddf8be WHIRLPOOL 188f3a0f61dbcc5b9e8a215bb9c227486c84a395cd85d3ba932f6f3eabd43c838e7d2752d3e97ebca1dd03990a0c0fee0f3768c5a14ee5c764af09009e27c440
diff --git a/games-misc/OilWar/OilWar-1.2.1-r1.ebuild b/games-misc/OilWar/OilWar-1.2.1-r1.ebuild
index d60a26732fec..c5356e90a69f 100644
--- a/games-misc/OilWar/OilWar-1.2.1-r1.ebuild
+++ b/games-misc/OilWar/OilWar-1.2.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="media-libs/libsdl[video]
diff --git a/games-misc/asr-manpages/Manifest b/games-misc/asr-manpages/Manifest
index 6ceae8271ccf..a499d1199b87 100644
--- a/games-misc/asr-manpages/Manifest
+++ b/games-misc/asr-manpages/Manifest
@@ -1,6 +1,6 @@
 DIST asr-manpages_1.3-6.diff.gz 3558 SHA256 7d61485f61255ce23301f17eee74f8afc302f4482b8a64bfb1342ae4d39206fb SHA512 3b9d75b36c8417e5fdef7e4f3f17321bb482dc9c0cb6ce936a6ca8e2acf5254a39281925763f125898d1888dac4de457094e0b3fdcb5fd6eac5e4c6ce803b6aa WHIRLPOOL 01d69d1f19e9edc2ee6466ed5a519648f1b30f59cfc61a5fcc8a28e8c7bf2fa28b4bd5c00cb0abf4f688dfa6a1c3bdc8ebbeeb46e972a976a75d9e8fcb671071
 DIST asr-manpages_1.3.orig.tar.gz 14711 SHA256 5c60c53eb9ebe5e6a26ca2bd1c920a2332ea2a6db3fd64b14ccc4537e955f354 SHA512 abfc6a9306c128802f0d85faeb27981199e1348d22f9d0afd8f95f59c9c9b0c5eb2c0f028ea0cb10be1fe497146223c93ae787ff90160a9e0809a1965de826af WHIRLPOOL fa9fddf52aeaa413f23074caa9de8a6a3a9aebb788b76312ebd29f43d06f10bf90ca92fd3413acc3c2026380c5a605120782514ac01ad8e1d08bccbd68f0849e
-EBUILD asr-manpages-1.3_rc6.ebuild 665 SHA256 9e83c21e0c287a0c9562570cb5b8ce7531c8bca0a9a411718b33049134fd31b2 SHA512 7119ebad0570ab8f1cedbc8a4de23ea336c238dc5d1ca37909c99b573c46c0e2417b7288d6e80ff949e521fb76cd9681456d46de58026725f74b948eddac3ed3 WHIRLPOOL d67c1f9e52acd5540051dfc1e255ceaae195280459a2246759e9c5bcc524331ebcca7e78555c39b244a378749808f7b46cc2b92314fb819ff7944988159a32e2
+EBUILD asr-manpages-1.3_rc6.ebuild 674 SHA256 0284b2955fcc2ad9356557639381a26b6dbed778fc612fc1ced51aed90fb2cfd SHA512 09a967c6d13557c032efc070a63ea5e8869bed9fe2ae89e2cffc366df4931134c4402b77ed218fa04e1d89dd28a07de1d5232a2f7d00794e924da5c05780305b WHIRLPOOL 51fbd96ad109fd9042f0e88c4b5d25d2f6a31ffa72f1a7a83f7ba990a196a7cf907963bcdb325fa9f062fdc0a892ee88db37d0b93139dd06ba21dc9e1cbf1163
 MISC ChangeLog 2448 SHA256 bc2d79e574688aa8a2a9e289fabd1e6de5d86899919bdb2e54ccc1b7a534c588 SHA512 943c45696315901b43688d872c586551ebf1de7a01016b8021604936d536f9f6d7f5dbb0af32b97b8fa639131ef62ba87a72095b578f79d28c5be4a9dca49124 WHIRLPOOL 9c8b63231ad484ee09fee7b25bbdf6969a14d8bd87dfc5055f1b5623692431c8149045598321c9a4b03571afebe6e285cca7b2a546e409d3bb83f21c76cf9c5c
 MISC ChangeLog-2015 2234 SHA256 bf13a74a4062ae934c3dea6277a51aaadce3d8415e10950ddd8e719b272ae573 SHA512 ea4b388ebe075f5726b352999698910620583488d8f758c2a364ebfe03a3f19468dd58af4e58e1fdced7fc64b24d83c884f12fb97a400a493a8adfceafd76463 WHIRLPOOL 66264bf4f10ab362d8ecd90bdb33c8030f5d91f17052260bee5b96c5e1e01e6f379f1ccc20cac1dbe161176b22ce6f8cc234c704a02b42ab2a430a0c6a3e0a4e
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-misc/asr-manpages/asr-manpages-1.3_rc6.ebuild b/games-misc/asr-manpages/asr-manpages-1.3_rc6.ebuild
index 4e73aaa62dd9..8fc9e8fae48f 100644
--- a/games-misc/asr-manpages/asr-manpages-1.3_rc6.ebuild
+++ b/games-misc/asr-manpages/asr-manpages-1.3_rc6.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://debian/pool/main/a/asr-manpages/${MY_P}.orig.tar.gz
 
 LICENSE="freedist" #465704
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa m68k ~mips ppc64 s390 sh x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86"
 IUSE=""
 
 RDEPEND="virtual/man"
diff --git a/games-misc/bsd-games/Manifest b/games-misc/bsd-games/Manifest
index b08f10987685..449f3e43146b 100644
--- a/games-misc/bsd-games/Manifest
+++ b/games-misc/bsd-games/Manifest
@@ -5,7 +5,7 @@ AUX bsd-games-2.17-headers.patch 268 SHA256 c21d06479c6758b6091b04676d636298c01d
 AUX config.params-gentoo 1204 SHA256 74737471f9fa6a3f523d8e91af65a175cccfa94ce162eb8e5ecef08372047414 SHA512 b6734409235caec3deb531bbcdb37527b3090c41b803ccc11895ea403543722437f84bdfa044c6aa70b306384ce94a40979a347e6031bc1d937841c7222d6618 WHIRLPOOL 0e4dc8250d7dc190a8eeaa7829d3386eb1c3a53018905502005058a7b947ebefa97df9fd96689d9850983a3758c8bf0b128d51ad1374116c098824b745eb7867
 DIST bsd-games-2.17.tar.gz 2563311 SHA256 066f924aef6c1c5ea946f588e36f303021f5dfc093944738f025d8edbc6fff60 SHA512 cb2ee60474f164d42e3d47700270bbeeda3c8279d64da409c9cc05e36437ef95b92d0a85543298e97604635fcf3e068f3a5cc812e90b5c61fb8d146cf35bc38f WHIRLPOOL 4a8e4bcbf040997645d1b88ef17a3f0df6414a5ad922ea68045759eeafb09ff473ad3ed1a95304a82a4eace02ebc05c1c3966bfe46a204f22e29d4d945ad2566
 DIST bsdgames_2.17-22.debian.tar.xz 32268 SHA256 dd7457368e5b4cb5b223e91a2919aefae72237fa6ab840f162a779c209163d3e SHA512 902d86557dd3813c31333fe18437d8046ae100814c9c1b340ab1f8266c817545f21e000702b1ca93babb9d632896ea5bada1e146436abfa7916b469681fceed5 WHIRLPOOL e0b7214cafecd471c059d8a097d5df4706b41c2f4dcb0658522d65f7e0ddea7bdfcfdcb86d1b0dab0703b9182d63115b246a7dc3e77a715aaf53d7d59b48e0a6
-EBUILD bsd-games-2.17-r5.ebuild 4330 SHA256 21fe938d71e285875be56b27f1ae9bf824d42848739c07cb98949e2e3b1eddd6 SHA512 4378cf8cb62d2cfb9ab67f16ea5de7454742ba16ddf17576228e4bfbb0f440724fff50b3ce8ee3098a3acab0a7729a4ce417d0af790b868de441a01f3aff99a2 WHIRLPOOL 6c303104f9e80c6101b45d1403f8cea05b1ebf9840e0d796941e0fb1aa152bfe4d310f8377a051ee03e9c30b5b988d7a88054b330f2a48af39b3a4e68421329f
+EBUILD bsd-games-2.17-r5.ebuild 4333 SHA256 2a736475ea32781dd6febf0bc10616f3c9cf85526a01d2f95bfe9a0014416906 SHA512 cd1ef22f06ffa4b454022ac65ce1b0cad748ae6dd07c5bc100eb2eb2ba8af92af5adcf76be7545c2bfc568bbd1f776c80ce4800784a6a22a04728a8b0b505e9d WHIRLPOOL 2b250073d97f54a2c6c78a0dd57a851b682152317f4dba14f59a44047c55b082930161755bb1a6606a33466e65ea5554711ba736715b6b2084aa4ec7279f13e7
 MISC ChangeLog 3121 SHA256 f7f3dae3895ead7786461033aee10887790c7139fded5d9e1e9df6bcda5174e2 SHA512 3d82a977d487b82b78f645ba159004832268c7bef7b24e2770f71100e6f6ac6501f9d662f77a44f550f671ea9c3baf2eb39cc3281715cffd214322b60a61457e WHIRLPOOL 33de7ef91a50c64d672a380e28ee5dccded7fe3e0358725bcf8e4c90f890f0e8ef7f70cd653a8a7b8d077572f308e29fba46d9c236db333bfed9fc2056b62354
 MISC ChangeLog-2015 7943 SHA256 d3a893deb9f9049dfadb56946cdebd8c579538a191c11dc3e1b339abc0575080 SHA512 67e06247efd0bc2971f0f5f4e53067adb081aa730c11ebd6d98f7de5d249f9f58ffa321bd5b1e6fa73c8988f31674479f5cd3e207567f5cc6b562ec03abe06da WHIRLPOOL 6f8431fe5de55bbadd6b121f07725f4c8de99391e28247fbb77dda05cad7277bedabde04f6ad14af6d590b8abcc9bf0ce826fcfa50daf4b852c0b7bb5aea33b0
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-misc/bsd-games/bsd-games-2.17-r5.ebuild b/games-misc/bsd-games/bsd-games-2.17-r5.ebuild
index bead3a2573b5..cefeb7976f5b 100644
--- a/games-misc/bsd-games/bsd-games-2.17-r5.ebuild
+++ b/games-misc/bsd-games/bsd-games-2.17-r5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="ftp://metalab.unc.edu/pub/Linux/games/${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 x86"
+KEYWORDS="~alpha ~amd64 ~x86"
 IUSE=""
 
 RDEPEND="!games-misc/wtf
diff --git a/games-misc/bsod/Manifest b/games-misc/bsod/Manifest
index 7d55f9998210..74e8952b0d11 100644
--- a/games-misc/bsod/Manifest
+++ b/games-misc/bsod/Manifest
@@ -1,7 +1,7 @@
 AUX bsod-0.1-Makefile.patch 464 SHA256 a7c085f258cdffd2874b0d445d1bd9cf41549f7820a715571e2f2f2e6ddf2a87 SHA512 f5cb0912a1b851a7f6bd7d4cf861b11a1832a47674d67632343474f5a7c6e5dbde7c2a1f4e217e2df293c8ea9c780d7de6aa14fa6ce5d07a2b5704d57edbe2a3 WHIRLPOOL 3dc601d2fc8bb014cbefbefc8e825b376acc0c7f0322d0533c239ea47a9fd896a86c61c4f92ab80a6d38e1ce4d6f0796c5e48adbe4752c57003c1a5f181502d4
 DIST bsod-0.1.tgz 10128 SHA256 ad6eb83637d1eb655ca7891933916266bd0624e08823490083b960ff15531c43 SHA512 2b3087ee495c83f41c2c582dc1c391ce5b73600244b6183abbcd36a3f88caf16987250d4ad23eb3a556b014669ddd84947e6cddeb8d4c89e12c9bacc545299c8 WHIRLPOOL 3317001c0502d50166aac13e252b1f0413f7af71e5cf2cd84c055629421fb9ae153016421b43477e5eb3acba3c9b3243d2a670630b1b6388d46828378e4197e5
 EBUILD bsod-0.1-r1.ebuild 611 SHA256 52993196ce0a6332878c5ef90f5952bdede6197d79b93bf8802edec3a5b9512e SHA512 61bf652f9ae8dc2b1239f34ef542fe9195581af0de37cd998b260c6db988ec730d80154c1be1fc461712d6718fb2bf00829836231ef0da49984240b83b872c2a WHIRLPOOL 1e41c18d37f13505a2baaea1dbc1527d9a1c316f69935677b318bb1df8fc9ac9720f716e2a3b1bd701ae23f222dd0d249fbfa39f055d0d0f2a2593387b9f01a8
-EBUILD bsod-0.1.ebuild 620 SHA256 db6656162baa936103e149dbf63cc297c5905ac2d4e507a375d891d46af37e4a SHA512 5da1f716d7517c5676c1f2e3ebc30e0f4984fea52bbcbce90141e43bc0b40fc58b9abfd0265dedd91e5f20d3a404f74b259a46cb531676ab451244d7a0663064 WHIRLPOOL 1528fbc7dfe7ab1676142dac3e2cb9f1e6002bbcd71756b15270810a541910f398d7578d872c802b0822067ae7df36d2267ba7620b9ca9191342b8315019670e
+EBUILD bsod-0.1.ebuild 622 SHA256 763cf25bace85a76e98416d028052d578604b089bd8b3da4c07d51934c459926 SHA512 67455807757641ab0afa03421ee189ce4023956220ff1a61839798d9e7c8316c692b44d9452139efbe3d88da9142218a86bfc7a7e6197e6a7023b22be2215936 WHIRLPOOL cade4bb9d851e4a38c8d19819e7f95014c1b5636949a9612d5eafe67ec77adc76279c2c111dd8ecd12af6eabe8fef3f662871066141a52e23ef2c49249cd9228
 MISC ChangeLog 2834 SHA256 71f4233ffeb71aa3c64424199b4eb328f90f157b1fc98c6f5218172d85730bb9 SHA512 cf7a961378b7df4ef4755f6f0841cc0caf15ce9b6e37e5b8e7749e1c4d5a445267860f377474e91309ef21a9ce042826e9446b8fb8a2ce46d4f817db60e3d48e WHIRLPOOL 7cfeabe5f20e3cb2d57aef73ba53f62c0658cc540aa328f181c3313691c51af7900161bbbbec73134a934d9d15e3c169ee8c4830492c9ac5572fe61ec12df3a0
 MISC ChangeLog-2015 875 SHA256 ad9209964db2871848fd31ab17587350e7b63f97e8bffc2dea4755b85154f3df SHA512 4436cec94ca7d9fb565cc3d224052c250c539577abb0f11635b4a861e7154f137762368766f6bae0af71d547879b84ceb6d75f5cca3e197c0950092ef0692be2 WHIRLPOOL 7f0787a02e3e527e9efb4fcfc4fe761ecb6ecab9ab2fbc772fc9086247355b07e81c1e5020ff81fa1b0b10fd6f07003c1c085e588ad2d2b1b0faf1813caf1f48
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-misc/bsod/bsod-0.1.ebuild b/games-misc/bsod/bsod-0.1.ebuild
index 5e4b5424a0cc..e8ef4f8cf1ea 100644
--- a/games-misc/bsod/bsod-0.1.ebuild
+++ b/games-misc/bsod/bsod-0.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.vanheusden.com/${PN}/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND="sys-libs/ncurses:0"
 DEPEND="
diff --git a/games-misc/c++robots/Manifest b/games-misc/c++robots/Manifest
index de9e45269e1e..528ef1334228 100644
--- a/games-misc/c++robots/Manifest
+++ b/games-misc/c++robots/Manifest
@@ -1,7 +1,7 @@
 AUX proper-coding.patch 1081 SHA256 963bfbedd0a8e9ccce996b3aa8045024f17f1d5ac3389e9f1e358064852c2132 SHA512 cb9fa8f26a9e4a0820d8810f6133d0cd9e0903bc7c01ad8ba07da2f5e40117e574406fa0b89b57c60a7ad535f8fcf1fc6f89f72d84fc524d8d8ddbe8a760305e WHIRLPOOL 32822d5f9ac5ab891566d5f39c941b8141e95f7fa9b17eaf19428376868e273b5777971c0b0de3f5f191d7c63589f4dbe547f8575c0e71d49795cf26c9cc8c3e
 DIST c++robots.tar.gz 10896 SHA256 8102fb0da308e6118676d54642cd6f652fcfa145384a7e830ca7103aaf02f3f5 SHA512 410a08c920f8e54abe74b085d67607bcc381e768c0127cf98eabab894a106d5d1466a1cac4146924b53c29ccffddd5eb77c9383c42b6fe6e48c7e89691e691f3 WHIRLPOOL 24483a323e2c7bbdc3e116635f1433ffd133e9886631373b7a660456078dde33a46c9479757cbc02d66c9aaa98811946eea5b791625fd0a340bd33ad9bdd8d04
 EBUILD c++robots-0-r1.ebuild 614 SHA256 b79d8338058166538820316ec53ecdca40171ee55e35fea541eb6e4e80fb7ae1 SHA512 6ef1085c4fc7aed24eab7a521369becbb774e07a475618c13bd8eb57bf71cf824081c0ab87775410864c5f7873190a0adf4fa15648e63f8a336c6d2ad89351c0 WHIRLPOOL 63d9d66da06ed5a8f7438e49cfa201f798d97a290451189309370650bc4332dc8b06398ca40f735628eaaf15dd16ba8dcb949b1da6e90d07ff016c6e5a730883
-EBUILD c++robots-0.ebuild 667 SHA256 d1d3f16ef6f32e58dd536947cf522ac991e0db636fd210c70dc5d9bc6c91a80a SHA512 d3773a918b2a7a017e00e10731f0b95ba3e66592fd7eb9dbf2387b7a0a1360313deb3034d67da5210c9a556068987be5054fac7a876c6830b1d4c013973a4009 WHIRLPOOL f8694a8f0f8589f0e698efc13d0514b7db21e578c4734cde8cacb03b992e0ff7ccccf3f1ab3230a5968c41dd008bb6eb1205f3ce54cc0dd4a329d973a6419a7a
+EBUILD c++robots-0.ebuild 668 SHA256 2048752a691622d77f3bd113419d529da5a171fcc71eea62e661769ef4c9ce9b SHA512 50e8097b091e2c61a532e62f1d27231e474a3b5e655f63bae7ef020d15bddadffc23ce1036693ef64070f4fb5074c5bac8086b3a12d2bbbf4f7298cb39490c00 WHIRLPOOL 9c5e390cc29c18c2ebf10651d57c109c350f020319a721343821ddc0d3aa9db8e4367d7f6f5d31e2acf36780184c8d91e5d434431248cd41da39625cb8f134a4
 MISC ChangeLog 2865 SHA256 52d7c628a7a9ea3d7f9a37720a6084fadbf82b60d867dcbe6dba5aafa1c7ed0d SHA512 3d4f42a94f74ff5f0738c77b4965ec455c97d0444710c3bee02b0785179c1328b9a8a274b155ba730a1c481f3e6ad6138e08312aeaf2b25a1c9789e22d4129de WHIRLPOOL 0818865ef4b7eb1dfed98a41fa2821648f2c75de037ecd5ad9b86951f54de6b137539a345165a2ba83274c5bfda0a9fa0815fb0efdaf279fddc43b182d5eccd2
 MISC ChangeLog-2015 1178 SHA256 8da8f59e5daa7d5bf7a67f8da1b84cd068454311d155f2e44b6d395fc09bdc2f SHA512 ade3f7be9301aaebfb77cbb18efbc55ddde117e649b2ca675ef47e1a22eadbdfd376885edc6374a458c013b5f829afecabdcdcb339c642a2faefb1629241103d WHIRLPOOL ad5d9024ea106721f6d2f8b1e83091b632574cfb50eb64abd9e78a9a83bcd98863609f58103d90c437ea19226d53038d982d962e9db087b38ceb20501817df6f
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-misc/c++robots/c++robots-0.ebuild b/games-misc/c++robots/c++robots-0.ebuild
index 689367f88d53..1c0374c26c82 100644
--- a/games-misc/c++robots/c++robots-0.ebuild
+++ b/games-misc/c++robots/c++robots-0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.gamerz.net/c++robots/c++robots.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="~x86"
 IUSE="static"
 
 S=${WORKDIR}/${PN}
diff --git a/games-misc/cowsay/Manifest b/games-misc/cowsay/Manifest
index 1d0a5e1bf065..9d33e2bd65a5 100644
--- a/games-misc/cowsay/Manifest
+++ b/games-misc/cowsay/Manifest
@@ -2,7 +2,7 @@ AUX cowsay-3.03-mech.patch 490 SHA256 e41ec32c25afd5e8ed8708cc35b228646e0d2d793f
 AUX cowsay-3.03-tongue.patch 358 SHA256 07a01f73455a00c50760cf1ef9e17a6483b0036ac23fb51d978d38deacdd0f9e SHA512 bce27566383debd01f00c40e867dff9d405304f70e72de9ca4c2611c6242da9919c5a74b6ac3d0632ad7c928ef578f8bb78d125ed6141a0adf3f7498731f8e6f WHIRLPOOL 9c4c77ded59ce3aef0f6a0dd220fd2acbe64c7c8717041275bae0fa0f76c762751f957330e8e01a8fdf822744d58296e47b066134b05c5bf1208e54addfc0396
 AUX cowsay-3.03-utf8.patch 454 SHA256 5400fd73294e86f1d58098276e57bf74e3688ce22f07f1df453dd903eda397b1 SHA512 4519c799311b5e31b3299fc66285ad0f9bfd2148dbfb34411437d37cda37d7cea8e823c8f99b0a0ef3652bb839f09d05fd5c5c727db4b091c6ed86d335ed6ece WHIRLPOOL aa3773f75cd371422be19e448ae703231f9314b7c9f22950290e4c0bde7a068c9d54cda4fd7222342ec5d1fa3274626de7bb5cb207f3911533ea9a153ac02c3c
 DIST cowsay-3.03.tar.gz 15189 SHA256 0b8672a7ac2b51183780db72618b42af8ec1ce02f6c05fe612510b650540b2af SHA512 8e91d0c929c2e0743106c08643029a943d0684343ff44ad8ff172636a8f47fd25ee8bc4d108ccfe308c756d2871b956cceef0c406800615ed0dc1e1e24648219 WHIRLPOOL 08b1f7818c073390dd4061e955888d5344b8d091b1a7ec12eeeb9d584b084e3a3e630fa03a6da3c80721f59e5d8ba10cffc677b892304fc900136fed110e7e87
-EBUILD cowsay-3.03-r2.ebuild 1133 SHA256 5d7838852f660e71aabde86fb6360f153d1c79c97e29ff33adab5ed02aba5cb8 SHA512 3946b7176986ea7340ae796e8766b0b253240791188845858e68e98c85e57b1aa1aaabfc50b1fe8d8f1b348037500e66d902b3e1ab34cc5b48af76e10ecb9484 WHIRLPOOL 0335a65d60ee237d76711acb4c0f4d38d9ec7e9f47d39d6167bc428822149e6b2c80cb536cbd6e8c73f916707ea800b10b3f7aac81da7c5fcf481b21cd7bab58
+EBUILD cowsay-3.03-r2.ebuild 1138 SHA256 ecb1d594755d509bc98f4421a331b354327f5f05e5af5748653d92a85ebf047c SHA512 a0a5ea45d203d9f9659f1b7c6b5cca6b5680dc8d8aba18448cded9f62e88bc053069da46ff2f9f4d7e0955c148415423f4bd4774532f25cda975a1441fe56a37 WHIRLPOOL 0a3a754d7498b229a02d3e7a64ff721b74b5d52141be0357f3d0fe6e8ae999dcb57b762cf4c7917965cfeee826b5407bb9712661d9174f4783732231e3c5b994
 MISC ChangeLog 2527 SHA256 7d2f369438fff601fa9e214a5b5e5b98934f024f79f24070d6c3614c903a234b SHA512 0e91b690ebf07285d00fbc9982dae6b53579a4c35ea24bfa8d5ff146812ce568a095526cebb2b29a8b6fc72db11717739f203d37288ee71250b839c47b8ead5b WHIRLPOOL 3f7c686fe936a8fad3d218a17b59b7bc150ec67a383ba3331051d96d6611763442debd697528c5b8715b0b785cf5d4404cccb9ebc3491481beba493e2559d7de
 MISC ChangeLog-2015 4541 SHA256 e2dbf5fe0b1567fc9b7674b58b2a24ce2d0759f37b92a5721cb19e6625567b64 SHA512 dd99fcaf251dab970d462542a7552c15e8120418018d2fd0362630abbda2699005d85e7787b33578cffa1de9348aca8eabd44ff8e779b9c4dc3b48834c0ab4d8 WHIRLPOOL 755b60605a5f136c3c55f972af420903350b74235ac5416ba34ac6151690aa4d8a1ac6720af79a0c6ca604dd9ade98710a90dfaa355cdfbd79c36f350db00c8c
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-misc/cowsay/cowsay-3.03-r2.ebuild b/games-misc/cowsay/cowsay-3.03-r2.ebuild
index c81db91dee61..88e195c614d6 100644
--- a/games-misc/cowsay/cowsay-3.03-r2.ebuild
+++ b/games-misc/cowsay/cowsay-3.03-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.nog.net/~tony/warez/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ~mips ppc64 x86 ~x86-fbsd ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc64 ~x86 ~x86-fbsd ~x64-solaris"
 IUSE=""
 
 RDEPEND=">=dev-lang/perl-5"
diff --git a/games-misc/dont-starve/Manifest b/games-misc/dont-starve/Manifest
index 283833ff8521..35038875595d 100644
--- a/games-misc/dont-starve/Manifest
+++ b/games-misc/dont-starve/Manifest
@@ -1,6 +1,6 @@
 DIST dontstarve_x32_july21.tar.gz 174752315 SHA256 b1eb38a7cb7179b8db7d81c5070737a4acbaf1a9473912cb1bcb5c2ec784304b SHA512 d508989e6c2fe0fceb4706250c8f222acdf5a52492fa2dafa8baab25f98a029658631789cce5164f43c6e5ed529f2cf490fea321635e4077f54f09907071e921 WHIRLPOOL 18f8ee5a44c2984db86ae60bd99fc61ad87cc99890629a36c5d15a046bbd557854c1f9591b936b8bf9fc9d2248132439b8e236ded60e359a599d8cdac0770677
 DIST dontstarve_x64_july21.tar.gz 175302157 SHA256 3a3297ca6bada9c55bafe568085e75a9790f796aa7711726346d571ac40e25e6 SHA512 ef10acd493544f064fcd12868a47e650cd09f66318d57eaa994c4866c808ede4504f9e55933be66f7fad7783e72c91043c4b884970e7b80f8ea45f814828c752 WHIRLPOOL fe19306b8e220f6680d1ffaf089eb8a643f789a0e165979cf0d1f93e111f7c1e6675ffb4340496fe5ca35c263bce5af87b467cf5c2fe35d1ad64755ae311b469
-EBUILD dont-starve-2.ebuild 1401 SHA256 8fed457e40c0515c4fc5fcfbd1fc54f7005ee29db774c906993a985fdb004b16 SHA512 013ff4da3632d4b746b13d76ee81995174f5b1e8ce2cad54b370d42675f8a881fad0f7fb8b5e3160f3afae00f295e8ee0fd3468b3cff7e8e97850e70856779db WHIRLPOOL 318c74b65c7e110f35e389825cbc79d4677f4ea17cfb1f689d228cee284f619b35c8a10fa2c2d134598f2f9c31cfb13a678774a642f14e84bb1f88346c6ce8b2
+EBUILD dont-starve-2.ebuild 1403 SHA256 5e247f7711e48b6d2621c8d0905f91e63dbba8449ae575833181ab9280023514 SHA512 c9aeedf62a214e0f3f8c002cbc23f698f8804885e300ece3a44dade933625202ef3943946b9f9a32f71b2db8b29d5ab859a7190338699118ef5d5bf3bb7c889c WHIRLPOOL b07b202463c0e76f3aeb195e069b7422fbf6509c35ce49a2c00acc62914227eba8761612696bd709de550da3f2587cddc0ebc5ea8bbb5a572ea6a1197b3bd703
 MISC ChangeLog 2433 SHA256 926fff9d507bb20a8e45a295ce5d19663ef82a79d7ed6c69eb2c309cc53cdd33 SHA512 7c779947c6d4186eb784505ce46ec3188c19e039d8e86d34f526e201321e4c5685c26a4c8a26a995b5303775428b4505a1b498a490bbb1ed7d114fd1d58c908a WHIRLPOOL db5759976ba888f74a7ec0aa40398d09b4e775df2cae85b1312a22960bbf19798d90f06b5f3595a7843d355d7f5dd5ede0a63d64221b30f86b970084e505735a
 MISC ChangeLog-2015 951 SHA256 0b59804fd04527fed4f64b5a8bd262f23f5655f322f782a488358c1cddce5b33 SHA512 fa2c8aeb11dd2e20c0e5509d6e54422430c2ff0765f23e188a20ff0b8ff1dcad86a28145a7efa0be6952f2d9d63bbe8f9911c4293998b8046f2efa3be5757430 WHIRLPOOL c61ef15604e69402df2817b2946b5590ecca6c9a92ba2038b66492158e231324da7aeb1949d0b7196e7bd25ed836dd2229c90f38d8efe778b3d95748ce929951
 MISC metadata.xml 253 SHA256 2c95b2eb99144a3b66de17be35eebcf65e5a152a2ec2f176165bb9cd78e5394e SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254 WHIRLPOOL fd044f0a960e57257f4a15ab16f066bbfe9983e60cd5fc072e631efc7027306c612a01d7fbbf57eb08d957487a7ce1961250194653d6ed87ee23f20d631ef854
diff --git a/games-misc/dont-starve/dont-starve-2.ebuild b/games-misc/dont-starve/dont-starve-2.ebuild
index 74272a3a6990..767bfa07e282 100644
--- a/games-misc/dont-starve/dont-starve-2.ebuild
+++ b/games-misc/dont-starve/dont-starve-2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="amd64? ( dontstarve_x64_july21.tar.gz )
 
 LICENSE="all-rights-reserved"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 RESTRICT="fetch bindist splitdebug"
 
diff --git a/games-misc/exult-sound/Manifest b/games-misc/exult-sound/Manifest
index f03d63198550..ae96725c3ef5 100644
--- a/games-misc/exult-sound/Manifest
+++ b/games-misc/exult-sound/Manifest
@@ -2,7 +2,7 @@ DIST U7MusicOGG_1of2.zip 12614413 SHA256 ccf748b346345986b08355ae3bf21c72e3bfffe
 DIST U7MusicOGG_2of2.zip 11382878 SHA256 58627a090f3f75cc4f5731053d5a2b02c6ba0edff1db0551bcd565d04089baaa SHA512 c3157faad5e02531732cd8e7ceb2a81cdb3a5b3eeaf48c73c0e753fc99c0ad438bc49f290d202f59851072aca50d22594f5c4782606d0f70d91d747cea9de924 WHIRLPOOL e73ea2246bb809b0d9b405de60b5cef62a206d85c8311dd3f064d7d56cef632ea07532da0c827dcf2ef908e86ffbab11821f7d1da0cf35693bfb5cd272d84b72
 DIST jmsfx.zip 4778572 SHA256 6932a70e999a203fb478edc6c009ad331709b9d1a760316244b82b60f93b41b2 SHA512 0822a8008ad3b9e2e6824dc6666968b8aa5f475b35dae31cf3d35d36422d68570cef440572bde07d4b4b580520b34581ab0700f7bded0bc66ae5d6020feb1662 WHIRLPOOL a36d1fef2e8a72c76c84b6843cc46e465d4ac192b22daeed19c8ab999f91603e16fb489e2602764b3b9c35bfc126125ca9de343a28da8043b7f9cdaeedda5ea2
 DIST jmsfxsi.zip 6194646 SHA256 be842ae046453ff969bd68516638cf9b66fc0395013c0b0350688f9dcb0e7f42 SHA512 1712d7d264f06d84ba38e864174d2e40a77a4270c94b2a5bccbf31dc41e187d6eeb013ebbfbc171bb6314df103a3ad5dd06daeb8ede0b5aead6cd1443680abdf WHIRLPOOL 3188937cfc454277152c3cb99a0435e7b709c41864a22ec649ce4b6798ce014b124c7fdafb07f489208e25497922dff3d766cffd9b1eba3703720852d3a5c28a
-EBUILD exult-sound-0.ebuild 891 SHA256 ce430cb049ce1c336e95a45c9eee5113eccec20e8aa136c4b474a638874ddbe4 SHA512 611e648cff01a24f97594ce020908d173b3a728a7b36bd6c93089f95eb060dc7a66ec7b475c9d0d160ee90915b275fb1d8e408088db680c060d72072f47b034c WHIRLPOOL 736ce14c2b0b69a2f99e441532da29711173e1824c49e85dbbf89dcd861f43297968fdf90e60b5671193d3c9b0ff870883c2cfd7a0279c8f66c57cac89856e70
+EBUILD exult-sound-0.ebuild 893 SHA256 96a84073265075211db293df35c1451f6126dee2cfefdda3a6b3ebbebe30ce93 SHA512 1593d38bdf777c50fbef3bdd43465ad16eac3b66de9e41bb3ebe9582f8ee54567d1cb012382b4d3e7be25468b2a833a509171a23dcbf0b0d2525eceb23fbeded WHIRLPOOL e79f52fc0aca8c7bf88155c4b2c48d86731a7c328aab7bdeb1cf780abd9bab633853871bdd4b16ffeb741b6347ee81b80d879610c3fac8b0f33d1d6cb35f94d0
 MISC ChangeLog 2433 SHA256 e3cec44b3cfc177af4cad4353bc760faa6a179f9cb6b5ad7fecd65fa25cf8ae3 SHA512 bdf0ec5de8dd1fb8bd702b198239df4334d8772b9b3721d807c3da558096169edca79ffa7a8d3cd310f538158699e154ef0316645c14f072caa56293a33e68e2 WHIRLPOOL 2f25097ac500966708b063ea0870805c0a50f0ad168984fcbde4e873c76edb3ec6415ee42c6ce0f7faa32b7a2b42b29fa24bddfa9970662b2c2918a910d3908f
 MISC ChangeLog-2015 724 SHA256 18983c05725588631bad70ed9f45e526b28798378a0ecd78aa1b63455f150631 SHA512 0ef94ff0eb9c4159f15b3c63d352927894d4cb5af0300f1351afbe11bd1334174bad3fc81b06d3a35eaa30b1b54f7f4c13c135024171058f5d0ac59acbc12106 WHIRLPOOL c7e5f4f651e41ab8948c214db92f2f59a07a9e4e9fdcdeb95f8af470afc61c6700b732e18a9c1c187304dcaddcc6b306c549d03d872e424fc4c5f4d05f92523d
 MISC metadata.xml 328 SHA256 c469e2687500a789f5d8ca6f3fb6c611b8f46b2a0ca6f1684af6d06aadb94df9 SHA512 bf9ebdd6a99230e6cb155d0dc42b0d94aa1d15b64afc93420210b6763a46a4c8ab3f18cbc83e54068dc7c62df73baf28ee3cbc13a34c7824a724041ac13be16e WHIRLPOOL 2655b22826ed218ef80f224e86748fe8e290b61657243c06b652f6ed055f7130f198b60bbf8ac2392a9a251191b54710d78288cd790a2511a7081c2de3226894
diff --git a/games-misc/exult-sound/exult-sound-0.ebuild b/games-misc/exult-sound/exult-sound-0.ebuild
index c4c109f56feb..da4b29d8393d 100644
--- a/games-misc/exult-sound/exult-sound-0.ebuild
+++ b/games-misc/exult-sound/exult-sound-0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/exult/U7MusicOGG_1of2.zip
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="!<games-engines/exult-9999"
diff --git a/games-misc/fortune-mod-all/Manifest b/games-misc/fortune-mod-all/Manifest
index 86ef89c588a0..40ef879015af 100644
--- a/games-misc/fortune-mod-all/Manifest
+++ b/games-misc/fortune-mod-all/Manifest
@@ -1,4 +1,4 @@
-EBUILD fortune-mod-all-1.ebuild 1614 SHA256 112518bdce062131d30e810a5def0a7523f5ac2fc07b00fd340f24bce90db255 SHA512 4a252f847ebcf2ce8b3dbec96f7c14bc46387698e89768715227d3e2ac1ff985109b69d91591d8a487221f5a3298f726c2e9fd8e7b7fc06c0280a089002f284e WHIRLPOOL bbffaea03953eac7248d0304c75630b52962274038dca460c4a77acfa63fbd8815583c90189eb9b25f2812026b3548b4806fb5250a9f098a188d84f9225490f2
+EBUILD fortune-mod-all-1.ebuild 1623 SHA256 8e6df90ad91864828ee07402305d6ab35e256fd6080a57ff0b05e2d4c8fc75b1 SHA512 70d39fabd70cb5b0f934e39ec343c2d8b53518230039b9b6f48445483acb2e5b9e81f43490f25f1317fe305f39c0bf6866dfb69b88efe47310418b897f5f0490 WHIRLPOOL f85b352361c7919fbb86a37e7dad4c91c8fe160624a5b3dcaa4df1d0d202ca4c805e60f24f7314bf65d6a8f22dbbb4ac9218019158f62fdf23a7893b8f248c9a
 MISC ChangeLog 2632 SHA256 ed34d36f41af0bf0450236dcc3122de6f4fd81324860c04b646758ebbd76070d SHA512 420ce465a10b0b51906b8dee093b59016f20b2f28d012dbd285516a983d52d41d47302651f1c640366dd2f34f46d27ddf0bed7439a2e1c399da5b7be2c5af053 WHIRLPOOL 0b15e8f1c9924db9f57924419efc499ecbd3132fcc8b974d524f5c8a095fe35b7ef7f04307aeb5843054747403ba20b5d42593da55dd6a8db49dd5fa6821d610
 MISC ChangeLog-2015 2130 SHA256 d886570f4f13ef5c5a80ae9ef62ee822ec40f7527997834ba03504d972babdca SHA512 8b192036bc244ddc740b53cd9e1e8f3b1f0c2df1ce78660f1670e8b9ae7e24eb4e0b939ffd134b09a99d4b92aeabb2f0586d58624b295802f32a9acfa4e42308 WHIRLPOOL 0a0040fb52162a7254c129215584c33f35de317cf5a8eb92591f85cde2ade2e160c0651ba8ed9a8631b78bd0f0aa25154109b036f949bfa357b1e255d343c702
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-misc/fortune-mod-all/fortune-mod-all-1.ebuild b/games-misc/fortune-mod-all/fortune-mod-all-1.ebuild
index 69011ca72694..60f96ec71b1e 100644
--- a/games-misc/fortune-mod-all/fortune-mod-all-1.ebuild
+++ b/games-misc/fortune-mod-all/fortune-mod-all-1.ebuild
@@ -7,7 +7,7 @@ HOMEPAGE="https://www.gentoo.org/"
 
 LICENSE="metapackage"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa m68k ~mips ppc64 s390 sh x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="l10n_cs l10n_de l10n_it l10n_sk offensive"
 
 RDEPEND="games-misc/fortune-mod
diff --git a/games-misc/fortune-mod-at-linux/Manifest b/games-misc/fortune-mod-at-linux/Manifest
index e04b3cc7f407..ae0916987766 100644
--- a/games-misc/fortune-mod-at-linux/Manifest
+++ b/games-misc/fortune-mod-at-linux/Manifest
@@ -1,5 +1,5 @@
 DIST fortune-mod-at.linux-20030120.tar.gz 81012 SHA256 67d686a1f16059b709c0721304512b089efcaee1450be14ebd432c69a0651c7b SHA512 804b785194db2f4727e3196d46b317d6b644bd4d05a4f3286617a2b2e3dff2c9a7c9fb88a0f2a6556d66fd0f975fee8564df236085a7864172c6a6b63c33bec4 WHIRLPOOL 3cac0ae081811b520e32d833f577ecc8cb181a1af151a10ca7855489ab1fbf0e0cde4179dbaa2823894c5ce7a278ce81cce36e95d3aac2e8d084951b1aa1cc95
-EBUILD fortune-mod-at-linux-20030120.ebuild 833 SHA256 83519466e89dfd2b1c38aa75e2dc6e6a774e06ef19ca25f99138930de37daf84 SHA512 dfa65ce45f2a96784218424a520881d57e5a3a2f8350038d78a783fd4bea97f4447ed970dcb18b3823f1a49cec74bd0f7c5538b4d4de901075ff26720fe8d28d WHIRLPOOL 64f6598a53ea38911ce85360c2e1fcf4dcece7207dd0fce3e9e8cc087bc48698114849980f725f4aa9bf17679992451cc15dd047143e075698632cc2091774e0
+EBUILD fortune-mod-at-linux-20030120.ebuild 842 SHA256 288b78eb8c9fbab73e51219f139d47ba75dbb03f1dc599ee0244392a12a2af69 SHA512 2d0ce838aa41a0be680ab3107e5ec4e17d0ba0df2dbf72eac73a95afe0f97e9c96285bbcf589caab112c1e218bad9d191cc620627635f1abd27b5792bb68c3f4 WHIRLPOOL 9bbd68b56b86a14279d7a4b0d1d9c45c58ed7b7043d88a4e7002f136919872f68a220d9aa9484463b8a59117093ab391f4c3ed1bd532e02b32452d3736e707f5
 MISC ChangeLog 2474 SHA256 536eb234c3b2ee8493d835ac2e26e653cc284e85584239af6079f5e451ae1e2b SHA512 43ae06329ed6c4b936114bb06dcb78c915c35d1f31e011f6997739a02004855fd074aabd97a5e10473899a1e19d63454eb8b7122a70b34cc994407d4db0058ad WHIRLPOOL 43cf5e9284ff066f5f7885487a7c9079189a2fd91e1f2831ca255ecb2980ae910923db29ef74edfa73acd432b78169dd75b750d4c50b995c68d7a3e5be307279
 MISC ChangeLog-2015 1973 SHA256 e821d51b2083065e47119ad2db9e8fca88377c78e1d2eb6643d28c24d886dabd SHA512 68a98ecdacd946652fa1f7446a4a1e55729f3054034693b0362a06d4094130fef8056aca491455d18896f0b8ca9274cb00b6b0764321301be0336d88ac4d306a WHIRLPOOL 3dd23e60338da01bd6387d99b7a160c18e34e0a1673e47ff50e5faf717816cdce6a07c36603fba2950d249aab1f17e3a31bdf3ac808b763c53a06935ad5d0b65
 MISC metadata.xml 338 SHA256 4d20692076279c391d84bd9fb2f5051441a2f96915c935834333dccd8e138589 SHA512 eafdde3a9e9cc33fd4dba816289aaf3dd0527f139ddc5cf76eddc13736d7f32277ceb23d86762d7ae8167f05942eb985756da89576dd87be69c7642469d2aa3f WHIRLPOOL 34be2722a38fb7fa26dbb85de90e6b36c9f621ba1e05341136252a555556c79672701c770e714d0dfbd203658799f140ce392c4a65a31183a030732b4898b9a0
diff --git a/games-misc/fortune-mod-at-linux/fortune-mod-at-linux-20030120.ebuild b/games-misc/fortune-mod-at-linux/fortune-mod-at-linux-20030120.ebuild
index 85b85377381b..aafe0ebc1cb5 100644
--- a/games-misc/fortune-mod-at-linux/fortune-mod-at-linux-20030120.ebuild
+++ b/games-misc/fortune-mod-at-linux/fortune-mod-at-linux-20030120.ebuild
@@ -8,7 +8,7 @@ SRC_URI="mirror://sourceforge/fortune-mod-fvl/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa m68k ~mips ppc64 s390 sh x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="unicode"
 
 RDEPEND="games-misc/fortune-mod"
diff --git a/games-misc/fortune-mod-bofh-excuses/Manifest b/games-misc/fortune-mod-bofh-excuses/Manifest
index 0fa69c2e4fe3..b127133c6445 100644
--- a/games-misc/fortune-mod-bofh-excuses/Manifest
+++ b/games-misc/fortune-mod-bofh-excuses/Manifest
@@ -1,5 +1,5 @@
 DIST fortune-bofh-excuses-1.2.tar.gz 12753 SHA256 37f7bc54bd591c71ff8df2233e9856f22d0b1357799fa7775aca2d96d2f8d4ba SHA512 71e9f664a1ceaf20455bc2c49e5efe0a953d188cbcd11e5a536fee73a01623659fbcc379baa4d8b7ac4a6970402c085a508f0e37b7fe182869c7ca9ffc2fce99 WHIRLPOOL 45749cede1c9ebcb2c135ba361fb43cef9cb467fafd8c40e2073858b4aaf06307c588439a16108b7ee1e7181df3ed83f7dede92cc661d64818d90acaa9a28ee4
-EBUILD fortune-mod-bofh-excuses-1.2.ebuild 628 SHA256 8d2191e865ce2f67f7d22991a3a9a0c47091e1b34ea0153a07ba5402fba66a32 SHA512 ba123d584aab124c32b90b2ecd070c02609e838c03bc946e09d96029abdf5b957a9d26230df54e53ae153635e4594f3253b427492c62d58ba81878870a1d360e WHIRLPOOL 7395a9c9f5a05985e90ec9d82f36b9b492c46035a5e19e4340eec14ccd230cac1974f9051eb6068ebc51317a1fe68e9de85578bfb75bd0365e1fd691af838dbe
+EBUILD fortune-mod-bofh-excuses-1.2.ebuild 637 SHA256 9237549287b93877dee96840121676421093aca3d11873f51c8ab16e873e53de SHA512 c70fbbd6e4a3d7bcd7b76b4b027dd69897f8cc743c81f66aa2cdea64aec254cf4dc0c39c82609f99914b72145e88e51f28147a5ea2d2828c85d4ef634b4673df WHIRLPOOL 819a03c3ea20432e968091618a14f165403895285dc3217048217f6f437ea25a7cf7e0d6b4efababbe1d90b707780f3109ef5ad8213c9b00d9efc7793bcc5811
 MISC ChangeLog 2476 SHA256 9828d4a33a19684279dd1728652d6e3503ffc74d545711cdac709b44f2664c53 SHA512 0a33fb1a4a30afd89f80621527e15ae9b5a9affa9f5b9aca0f0dcb561ae824919562ced7ab8be1d376b9e6f50c840012996f15fb356db5eee7d270d570988c50 WHIRLPOOL f3bea340bb9d28f20c2c3e60640c07aeebf430070e5d9f749c8fd2c5311779796d6d778dc84baf3387c3ec13986a32c9be1826051d5fa0c5c0387f33158d4a7a
 MISC ChangeLog-2015 1443 SHA256 43e98b1d290a495600a6c2ff0b5ac47d5130f3eeb07c3a70108ecfab2210d353 SHA512 01386b98d15cd88747d39b516e42736d3b230da39a484886166b80da7a0521eb1abeb200d4b689c500b5a1018336f095facc58cae12258e924499a9ef74490ee WHIRLPOOL da4c13b76fa03590bb4f31e0dc00a23b73aaf8b8149dc35f05deb9bb5a7b52ba84c1ac09709dc911c04c29398f2259f1ce8819d8695068a119ff310de7be0738
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-misc/fortune-mod-bofh-excuses/fortune-mod-bofh-excuses-1.2.ebuild b/games-misc/fortune-mod-bofh-excuses/fortune-mod-bofh-excuses-1.2.ebuild
index 3fea8d3b7fe9..c0c4b55593e2 100644
--- a/games-misc/fortune-mod-bofh-excuses/fortune-mod-bofh-excuses-1.2.ebuild
+++ b/games-misc/fortune-mod-bofh-excuses/fortune-mod-bofh-excuses-1.2.ebuild
@@ -7,7 +7,7 @@ SRC_URI="http://www.stlim.net/downloads/fortune-bofh-excuses-${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa m68k ~mips ppc64 s390 sh x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="games-misc/fortune-mod"
diff --git a/games-misc/fortune-mod-calvin/Manifest b/games-misc/fortune-mod-calvin/Manifest
index 27e3ef235300..6f7f8ddcebb4 100644
--- a/games-misc/fortune-mod-calvin/Manifest
+++ b/games-misc/fortune-mod-calvin/Manifest
@@ -1,5 +1,5 @@
 DIST fortune-mod-calvin-0.1.1.tar.gz 6787 SHA256 7a914611b70a191743cff22a6eef763409d77d67852ba4563e61f0d7db2c04d9 SHA512 047e9694aca702b93661ac252ca8599d6b3778116907fce93ad2b9eca79e9af497b9f2dc188223d19eff8109691cbf66248cea259786c5504446eee3cd3b8245 WHIRLPOOL aca0273b1744c7f95f99ccd0c3bca49d852cb22cc10c275d97c4002916390762f7066a00c8c8a776a76c8a8a9460d1b73e6109eaf7d50628556ce78b8b2a9c06
-EBUILD fortune-mod-calvin-0.1.1.ebuild 542 SHA256 2556f9ada0629f9a13de3a98531a4cb8b39c5a019ea527ac7a919bd172c5fa59 SHA512 e2eaee2fec9ded2b4f0c024c71ffcad2bf04b3c17349e674c0cda7d6f08d6fdaa71226cbff14a1ba0f434972d5a8f3cc311d7ced99b99d4be9637ee06a4c14aa WHIRLPOOL dd354a8bbe57950422275c93a8c90ab2c19fda29b3eafb0c9092184bce24b228811778f152afc16ac985ea9e627e5f484caac47f506d5c1e49bf44f850971417
+EBUILD fortune-mod-calvin-0.1.1.ebuild 551 SHA256 990ca7a6398d9fe84da51c45509de53f888bc5f4e2e9c97a5a202daac7e39110 SHA512 c0964dcc76622b7b8d98d35b11b41e4222b40c75921f7b2af4c8995e5e3f079c58ef998921c7921238190f38f1ded504c6d602aafc451650918b4084588a19f5 WHIRLPOOL b5c4c0dfba32eef29b16cf5b609be62ff1308c92bdf05b4b22ae098faf01cd9ae30b99d3dfd161e1e86f4242859178384fb476a2a6a702712bb9884d245ae56e
 MISC ChangeLog 2462 SHA256 41683fb35efdd07931e7acea4d26bac8dd33ff78e56e31480f414824b49120e9 SHA512 c56c561292dc0de76c931b6d52204cf3beb4b4d402f10f6dd8de3137b506b3a897e89db8c2692c1e84c79b8e3e4788eb45f993aeac040fdc43d91d9c432bb7f4 WHIRLPOOL 3d5af717fe71f5993db34c8f2b0f4ed1254c0abb47d0a1ab1a399ec4ed41066a804c4ba1faaad3511ae994d4b1a5ee78a94342225da5a3c85240f9906a60f747
 MISC ChangeLog-2015 1555 SHA256 885a862eee4668f5fa4737fef966ac0869e65f27907b89594b76f82326f411d0 SHA512 581e0ff93df4b60fc12be9ec4b48b7e76cb7b774e561dc71f2434c7ea3037cc0a4e0751b2775b60ca0ba4c080da3e1bd9c5a43a315d8374567c95e4cc5b6658b WHIRLPOOL a489234a3741a77cc129c864a1ad85cec66ceeda5512c436d6020e0ea87f4843847e944f856e2443a98d93b92e315ad4d1ab9162fae636bc3ce50a073f1d831b
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-misc/fortune-mod-calvin/fortune-mod-calvin-0.1.1.ebuild b/games-misc/fortune-mod-calvin/fortune-mod-calvin-0.1.1.ebuild
index c95de6da7c51..0f5d68d05c4d 100644
--- a/games-misc/fortune-mod-calvin/fortune-mod-calvin-0.1.1.ebuild
+++ b/games-misc/fortune-mod-calvin/fortune-mod-calvin-0.1.1.ebuild
@@ -7,7 +7,7 @@ SRC_URI="http://www.netmeister.org/apps/${P}.tar.gz"
 
 LICENSE="fairuse"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa m68k ~mips ppc64 s390 sh x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="games-misc/fortune-mod"
diff --git a/games-misc/fortune-mod-chucknorris/Manifest b/games-misc/fortune-mod-chucknorris/Manifest
index bd8380a39f0f..3558fcc9016a 100644
--- a/games-misc/fortune-mod-chucknorris/Manifest
+++ b/games-misc/fortune-mod-chucknorris/Manifest
@@ -1,5 +1,5 @@
 DIST chucknorris.tar.gz 23035 SHA256 c6407f9869e75fce90d0211045f7e485126332ab4790ecb9de4d0722218466ca SHA512 efcee2c1ce5ee747cbdf3cfb0b52958ca76309cbf509627b602cbc56403e67396c879ea46c084b3d82788404829e48990a534eda9e8f3640d39dc894318ca7c2 WHIRLPOOL 84f392df46441416a823b861cfdc08e8eef005e7b8c6460c05822d4aab778cc6177e92828983f006228b8db2444a1c05cc60d616e1dd656055c8e162b6821c87
-EBUILD fortune-mod-chucknorris-0.1.ebuild 567 SHA256 6545c53d8af031069217cc54362b2a80087829549438bd2c1af32357684e7b48 SHA512 2eded5d0c2060cca497cca23baf45321a0561fb0cfc897293c4ad8065ba5bfc6036fb0bc569892ddc8c8fe9a88a6ea09f64ebbedebc5a417e42cd76a6372a211 WHIRLPOOL b970ab103ac83e46608e09d1c0d3746609c5da811bc9e38dc1f5fd8babce35942b412a0f1fbf784aa34413655ef373db2f0c39f31ff7c970fd3bb5f541b5a5df
+EBUILD fortune-mod-chucknorris-0.1.ebuild 576 SHA256 7c99e2f3916a8933896eb89c1f3bc0dbb98050582bea94e515acb8d998bc3ae5 SHA512 a43d4fee213c214fd77d49c281634b59e11852e9c5abc6ded921e0c91571eb6c48c3db4c20bb2bf6e5061639325d7be969a0a5e875912c35745ef38dcc7aef62 WHIRLPOOL d2c2399c0f53914a4965206637f44b753193d43f3f8b0b12ae387c3e1dc076ab2e85f1ba92a88c87fc04c5a9f3c1a785d2293cb7feb9abf7fa568e051482f28d
 MISC ChangeLog 2473 SHA256 20165982eecc89a10f7e161e30c531118a1a29f2214661227f255245e213a4dd SHA512 c4068b3661c61f128309e8c913e5bcf00d0c152259e76bc9ffa4cbf5986fc477715a3ca3fd495495d51fa7e80efe82c881ded79c8a8861617c14dd3ef80752af WHIRLPOOL 3f1ebb0861f151a7636fb08eda363d6410b598aa996c23ca311af5464594d14bb7e13f8910ed1fd0904820f16927c61470369afe3f48b5217c6a513cdd12cf15
 MISC ChangeLog-2015 1310 SHA256 9820087f6bdf11ab2f8aa825f78e2c2b2c928b9381a05ef507d80ffd21426635 SHA512 ac6691b3563bca0310f1156e282d1b3e09d47bafc1a08ca7876eb0911ff93ac9022bf916d5f4bc5dd5bd654f56f09586cbe55041acf23cfc09f806422a0371af WHIRLPOOL 06e14a0d5b7016162f558c1efd91dde3ba13f30bd97c9770c84a418e80f1b4a400b3ffbbb8bf37dab538a1f83b7f622ca8d36b663c895abcd0f97b9ec5b2cb85
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-misc/fortune-mod-chucknorris/fortune-mod-chucknorris-0.1.ebuild b/games-misc/fortune-mod-chucknorris/fortune-mod-chucknorris-0.1.ebuild
index 47fdb26a6688..9b0047b41bd8 100644
--- a/games-misc/fortune-mod-chucknorris/fortune-mod-chucknorris-0.1.ebuild
+++ b/games-misc/fortune-mod-chucknorris/fortune-mod-chucknorris-0.1.ebuild
@@ -7,7 +7,7 @@ SRC_URI="http://www.k-lug.org/~kessler/chucknorris.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa m68k ~mips ppc64 s390 sh x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="games-misc/fortune-mod"
diff --git a/games-misc/fortune-mod-cs/Manifest b/games-misc/fortune-mod-cs/Manifest
index 8c56e3aada63..30b139391b43 100644
--- a/games-misc/fortune-mod-cs/Manifest
+++ b/games-misc/fortune-mod-cs/Manifest
@@ -1,5 +1,5 @@
 DIST fortune-cs-1.6.9.tar.bz2 390766 SHA256 5a73b66071635b1213e61c18f68eeca70e16aa5c18bdcfdf33f580722e46ea7d SHA512 4df546eb450edc1de6bb80f788e29fa4aad6050008c28ed12c4afd630533416f3367c09b43ae098329160a19bebfb28ec56ebb730358689d260709a27317b20c WHIRLPOOL b69dbbf4c1516584bc75a4a378f434ed2da37a4bd0a34749029297b35882a2240a6a8521dce3148d7feeda98a8620854709febce3deef7772aa59d3ed73b420a
-EBUILD fortune-mod-cs-1.6.9.ebuild 1000 SHA256 382d68a64982d0f581b7d269b4b140e8d8614882805bd7a7d0eca51599164e40 SHA512 0cc0e895aa35cd87e0f2d62d128208021af4a761688ac51b8d676da715fd4250aabf50bd19b7715d006cce0da198809c916616ea147f49e7da5d5999c56b734e WHIRLPOOL 032d80a87bcaa5dca447b29fc25bc8fe6fbadcc7d87ff4e703ab2ee98531c6e3963503b1293391a739b661ec4a8a519801ebe861c5a9602a848679f356d245a1
+EBUILD fortune-mod-cs-1.6.9.ebuild 1009 SHA256 785772fa3b9f4bf0bdd0c40a711195cb3bea4270d2e89809e4de39cb692beee4 SHA512 78a779bfc57c8c8a064331b08d4a6e423e0d12e74b363304c24526197d5c7ecac8a18e5c2305f409896616758a6dbe202d710226303c822149d704d083bc00ba WHIRLPOOL 9c9ecd26c885b843749b949768524e2a19aa8924534ce2d5df8cd631bb0ecce4fc6f779bec6e232f9d7c833bf0193d2fc21dddb0d1c081323810bb020b2297a5
 MISC ChangeLog 2450 SHA256 dd0279c5380ac96f67027582a4150536d89e253f6e5315053ebac16e4011fb7f SHA512 acde906aca082d1006050d41d9e27583c37beb49d28838a1a5cfa018c28e252d91a8df2e8ee8b83d99769d2b37fd6e8ed461b721a77030667917bdfad1e93da3 WHIRLPOOL 6293d5bde11ba32a02999edc5ccfd8e766f113177810ed3c0be477dfb2b4d52be2c967247080c752bc14a233e90fcb3041af1dbbfa472680777791401e5c6cb9
 MISC ChangeLog-2015 1343 SHA256 64a1f6ba2a57295738bfff246cb96aff732155d3fe2dd689b9af8c41960b0a93 SHA512 c8cd2f9297dabf6ae16a53a0e89c42a89948dd72bbb9bc5c3839621817c6ad67edd9ff5c18a74e5f844fe8cb3c51450c58a9a7d6f15867435ee3fa57affb5ce2 WHIRLPOOL 2dd345ccc215f00a2f08c3cd182653ff085988e8ee28a63e96e10b4e052bb2adbd3565355c43bf16e1ee62458ddfa885347f59216f1cc6ccced5b0ef9512960b
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-misc/fortune-mod-cs/fortune-mod-cs-1.6.9.ebuild b/games-misc/fortune-mod-cs/fortune-mod-cs-1.6.9.ebuild
index e74c3ce9beb3..1220f03cb666 100644
--- a/games-misc/fortune-mod-cs/fortune-mod-cs-1.6.9.ebuild
+++ b/games-misc/fortune-mod-cs/fortune-mod-cs-1.6.9.ebuild
@@ -7,7 +7,7 @@ SRC_URI="http://ftp.fi.muni.cz/pub/linux/people/zdenek_pytela/${P/-mod/}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa m68k ~mips ppc64 s390 sh x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="unicode"
 
 RDEPEND="games-misc/fortune-mod"
diff --git a/games-misc/fortune-mod-debilneho/Manifest b/games-misc/fortune-mod-debilneho/Manifest
index 91da5da021a9..17a15bff90f3 100644
--- a/games-misc/fortune-mod-debilneho/Manifest
+++ b/games-misc/fortune-mod-debilneho/Manifest
@@ -1,5 +1,5 @@
 DIST fortune-debilneho.tar.bz2 16982 SHA256 65bd5d71530447f093f5637e6baff06861621dd73ac141efbaf0e30888220ae8 SHA512 88ff97a50f512d4e0f52c93546939d1ef168e86d6e92996e6b3674ce5ef03581d20cdcea497869975c0b77a2a1936b142903c248f7c5cab69fd322f207801696 WHIRLPOOL c1e84176785eb1a4035082abdaaa4fa53c48dbe19c47e3540427b5fce7e446128fd9c34a7b516ec50f2b6c491ab63dd4907e04ac0bd023cbae8133a2ecae604c
-EBUILD fortune-mod-debilneho-0.1.ebuild 581 SHA256 748fa672bdb10353dc58bed01e09ab33b7a70f10115317aef5f5859b8e79c4d3 SHA512 514fd79b2031f7f73e36110229ed7f4d11527d77c58e9296d7bf0658c2ed68ce82bed51583a265acf6883b0c04bfd6a4fabcdf9007aa44dbee01d94e6b86db81 WHIRLPOOL 0ee01d5e2ada5ca5ca7ad1ff8d09715fd6cca330bb95479b04d071a75563485a7c45dbaaeb2e0adbab3b7731eea80bd2bf778ed28a3043295193f2f59b493e52
+EBUILD fortune-mod-debilneho-0.1.ebuild 590 SHA256 c77e3834e91eeccd931a3c4676894f34742562f99b81e827041891d156e1763d SHA512 7244cb34a64fc16919d89191f91e9fa9132e36f6c446ee689dc0cb752709911b56fc50b2140ccfe087f55c5e5d66ff5b76a2ba54300e6a4b5e80726e045bc94f WHIRLPOOL 4ab126e307c401610de0e0405b353d672648540e0bd4caba4673c64877b19b53322c0408c0a6216745ad34e2c716d50c309e90074ac994f4638bd0e80d79bea8
 MISC ChangeLog 2467 SHA256 071d31101c3aa6cf329cf1b41acdcd6192e8bd6bc4f4cc8bccc0558970e8deea SHA512 b9cdb2b3d3a8c925839862d03815231dd6cd1f4a8f38f33634ef8847ecff58ba1d5815312140a789b87564c1b67eb8038de53f002694d753abe31eec2643fd38 WHIRLPOOL ee1c826e91934a645ace4b745c4f9f63d10ae3eb717732c398409f7bd74de40a55305e5b02f5cb505c8e16f0fef3eccdaa074fdca7b2d7807242d77c95a67fad
 MISC ChangeLog-2015 1032 SHA256 c96b31ae691a10d745731a7b5f3c50ccf9a885fd1eb741cd58ac78411c207936 SHA512 91e23398bc87ec52979dc64ba43e3adc75a152774225a89442a54ab81053922d3d2f94d60e7aeadd2689908d81b0cfbecde8d498f17c4c0c87684ede9ef35384 WHIRLPOOL adccf243f22b1c3542f52555855d5a592538eee1770a6ea5e5977194466dca038018fbdb19330fd33732123dcf0a74f1dc7019b5a73f6e593649628e3cc000e7
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-misc/fortune-mod-debilneho/fortune-mod-debilneho-0.1.ebuild b/games-misc/fortune-mod-debilneho/fortune-mod-debilneho-0.1.ebuild
index 1d57a2e62a6d..643e6c1c7f1b 100644
--- a/games-misc/fortune-mod-debilneho/fortune-mod-debilneho-0.1.ebuild
+++ b/games-misc/fortune-mod-debilneho/fortune-mod-debilneho-0.1.ebuild
@@ -8,7 +8,7 @@ SRC_URI="http://megac.info/fortune-debilneho.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa m68k ~mips ppc64 s390 sh x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="games-misc/fortune-mod"
diff --git a/games-misc/fortune-mod-dubya/Manifest b/games-misc/fortune-mod-dubya/Manifest
index a87fc5845669..858e1ddf4f51 100644
--- a/games-misc/fortune-mod-dubya/Manifest
+++ b/games-misc/fortune-mod-dubya/Manifest
@@ -1,5 +1,5 @@
 DIST Dubya-20050118.tar.gz 27385 SHA256 742cd152e5eaf089383a20a4da71f1266ea6e5f451a3c7eb0ad67207d0a7116d SHA512 19609f79bc12cf74aeef51f3e16a689790ad6ab316924d5726c22e2b1cc7f5007bcaee494da7485d2c34b94ebc071cf62aa042b6156f5f957e55a5e85d1ad5b9 WHIRLPOOL 460669ddf88edffc898528ebdb946892739063ae984f0a2295118b9cf54af152ec9c4f6721236d29140537ce5193a11143c6df4d01d5d8f8d6fdc14cf0a453b8
-EBUILD fortune-mod-dubya-20050118.ebuild 557 SHA256 d30268b57a764dc0d61267e082dd0fec9a8c827596291fd6b27c72b392b54d4a SHA512 3949b3c85e44f345f9a1302ec3a3228da70fc75acad18e879453a3eb5f8a2a26673929a9ad966e8c0a5e3759b91c5433c98d118817836b18dd691ca4208850fd WHIRLPOOL 1d48a5321d0d246fbc0dcf64e059d8919800a5f37e932874d082d599b91c88f707e00ebc16dc8ada680063f60e40e356523a4c1f4b694e12c22d25bfc0480232
+EBUILD fortune-mod-dubya-20050118.ebuild 566 SHA256 158db97125fec47ea287bf297a3a4f65b84ba9d0000c908a954793f4b53180ea SHA512 36fbbfef7ee2cce088885531247db99ff9f3245776ac36640becdfb93c9ca2cf28e6371b13d295dc2ee73dec2ac72248660bbb862cb219d398cd3979b0781382 WHIRLPOOL c7ce319eaeb9bd376d1801c12357fd2660a07a875418b73357adff0c91bf89ba33458b88f32dcb56bdf0bb91f705c73486e50a3ed934d2b271c9a79045920a8e
 MISC ChangeLog 2465 SHA256 caa031c79d8d830fdcc122ea0a0282a53a216f4f520948ffb797dd08091f2c45 SHA512 8c43eb3462541ade7e94a57a83568bca636bee5e562566a54cf2553633716898bd498d4de589e5c06ce4cd5c4971fc2bd872fbad1a13e71c1a6360def89ebded WHIRLPOOL 782b0f67ac609456d60de3e346f1c582c99692854fa82eab7e0446ac80d4835f4b1b5e197f6f2bf994a0762e02bd80669363bda5b4646390f0364664df2a2910
 MISC ChangeLog-2015 2904 SHA256 84cbe328e5ba71ebea8eb7f5331381cb799e919bfaac831c453dbb4c281f9975 SHA512 8f6072072e638bd696757f1fb980aebe3be99d16ea6c824316b55e9b775645b255b3bef622fcab789a0e270cfa3a268cada78f043a0d2a44c0012927b50aa6f6 WHIRLPOOL da48f82cdd63f6af09467d1a1108bae6344ad43d2b5cda4a22d4c129e0fd87feab6ef815bd572946d2fc5d909933221796819667b8c1bcd636be34b162a81729
 MISC metadata.xml 491 SHA256 7e44737e2a1b41c6bfd9912d7f21e6a1e162e5aaea52625df6b63d1add112168 SHA512 ad3d2f216c33b6a56fad27364da03f4ab552613e79c424c0794dd49c4d950d9a50679798101938a1e3f55dee8dfc5eaff29b96b80660a70ff2eed3ebc8d6b30b WHIRLPOOL 62c77fcbe0cb077ab604cc47525318591215d51905a329b621a031a84e0e6799b234e686b937034a2eeb7a91c0d23ba07e51874ce7fd8e4bb6dacd09fbed87f3
diff --git a/games-misc/fortune-mod-dubya/fortune-mod-dubya-20050118.ebuild b/games-misc/fortune-mod-dubya/fortune-mod-dubya-20050118.ebuild
index 99fe5ed83c96..dfac38b3eb4b 100644
--- a/games-misc/fortune-mod-dubya/fortune-mod-dubya-20050118.ebuild
+++ b/games-misc/fortune-mod-dubya/fortune-mod-dubya-20050118.ebuild
@@ -7,7 +7,7 @@ SRC_URI="http://seiler.us/wiki/images/8/8c/Dubya-${PV}.tar.gz"
 
 LICENSE="fairuse"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa m68k ~mips ppc64 s390 sh x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="games-misc/fortune-mod"
diff --git a/games-misc/fortune-mod-dune/Manifest b/games-misc/fortune-mod-dune/Manifest
index 096230b7875f..7899f5f2279b 100644
--- a/games-misc/fortune-mod-dune/Manifest
+++ b/games-misc/fortune-mod-dune/Manifest
@@ -1,5 +1,5 @@
 DIST fortune-mod-dune-quotes.2.0.1.tar.gz 66579 SHA256 68b448c146f99dae6ed59dbf483d13ff71082f54851ea4e0f8e4b9e906cdcf7f SHA512 fa40ba975f8a3dd53cc5af7803fd18bc849bd7ea996c03031c3800b3dc42b33dfa540ad1826a0dc94c2284ada9ed6c1b411e314b11a94bad427e080af52b23e9 WHIRLPOOL 9cb0c49885e041d3e000985e5703581ca2c8d848ac6921b4a55ab710d12657f1aa2866a64a3312b6eb51f023e39a6ad5aa5c60f1ab80b3266d88c2fcae3cd39e
-EBUILD fortune-mod-dune-2.0.1.ebuild 554 SHA256 122c5ee31d8d0216b23cba918c28612b3c42e4cbb6b81c50de2bae84580179e0 SHA512 2577faa1b00278887f239ae496c58671d93b2970c0ce84e1c3128a925087a87bd5203a68f048f6abc6874ebed7c60543ac69bedc7a2af5d45783408be907b935 WHIRLPOOL 2f53d36708277c433b09eece77c99e8d8b9b9f9efcc965dc1b323c60872d508083625bd11317d6967efb9825ec15b1c90c5b63c201fa03d66c7c5f2c46fedecf
+EBUILD fortune-mod-dune-2.0.1.ebuild 563 SHA256 22a09d097c0b54e078b008406913d17624c660c4185d5f8b0bc135f4044731d3 SHA512 d94857b9086e20b5ce1c565af0e8166a10628c7563c3fda7738db0d10da10e21c8206f897d81a75972941f6a0700f864119fca21246aa9f13341fd98dfde1f2b WHIRLPOOL 4b0a23275ee4911175c82e4b4ab8409b30a3de5dc9b5d483777b10286666402169610e77f210a7c345353050ef21df399d44db2451d0f85ef258417661e476c6
 MISC ChangeLog 2456 SHA256 db3a994cf808939fab81d4162ad9685512020048672ea6f3204d54738af8bfbd SHA512 d69796ab301d53d854f1b08bb9d1eaee044370c0b9a6df00a5c41563396ca62355a0470e680ba2f4d98482d0cf1edbca45e25c7254733aeb2fe2376c4e17bc95 WHIRLPOOL af9d24a3d35fd12742b16d62fc3a1534f22a60f620c3f7cb49010825446689f875a2ade7b935c55ba35f587e61fd42b86fe7b904b9a0571a3234f91e0e0cc0b6
 MISC ChangeLog-2015 1260 SHA256 f7ed0dee2e385a7a33a3b9a15716d6cf162301b336e1dc1f6e62d0bf8482f11b SHA512 b747b2c1e90c2770644f9107dfad5899b2021d6c2e3dc25ad92a6f4ec19680675a4a0670fe1a7c244f39bc05a10f20ea70fda0e92ba153f7e4a9226002d72b40 WHIRLPOOL e2799750cdfc0c965395983004b5fa3811af2a51bebb9dea274d853472543033b79367fcf20c27868f7ca5df142fd4d1d9327181c74ac8a54e1e78fcf5303f0b
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-misc/fortune-mod-dune/fortune-mod-dune-2.0.1.ebuild b/games-misc/fortune-mod-dune/fortune-mod-dune-2.0.1.ebuild
index 668e82d39c44..e04c791318e2 100644
--- a/games-misc/fortune-mod-dune/fortune-mod-dune-2.0.1.ebuild
+++ b/games-misc/fortune-mod-dune/fortune-mod-dune-2.0.1.ebuild
@@ -8,7 +8,7 @@ SRC_URI="http://dune.s31.pl/${MY_P}.tar.gz"
 
 LICENSE="free-noncomm"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa m68k ~mips ppc64 s390 sh x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="games-misc/fortune-mod"
diff --git a/games-misc/fortune-mod-familyguy/Manifest b/games-misc/fortune-mod-familyguy/Manifest
index 6087d97deb53..5c587a10c900 100644
--- a/games-misc/fortune-mod-familyguy/Manifest
+++ b/games-misc/fortune-mod-familyguy/Manifest
@@ -1,5 +1,5 @@
 DIST fortune-mod-familyguy-0.2.tar.gz 65992 SHA256 c36398feb2e2ef1890754879109c5d5f1057e842f8465ceea7e3dc6daaa4d99c SHA512 81c3be499b5709588e4da6f5d53cb774d8310f8ee9e626b704009357b9d0572f052b94d48b19671a7592f9c3e46def9f1b9e01275a2d896f101ef5d7b294ed68 WHIRLPOOL 9b10ce9d6156e15b3883dbf4d6d5d8305211970a8027714020ca00c65e4503d8ec028eb51ce9ae59d14c35032f8d3309dee55e535931ff3e27d8c8a5b09562cc
-EBUILD fortune-mod-familyguy-0.2.ebuild 549 SHA256 46d01faea46dff82f932bf7d507f624578ba0c2bdd09d0ef475cab2a902b60ac SHA512 0b2a6526b2d1fdece6d35b0f8d6a8175fbaa2f6ed1846bcedf05cd95ac2c0d39e7ba1bc3926e119ac94eeebb009a17eec5b95a790f5c8658a91d5d5aa5ea16fd WHIRLPOOL a1826aaf2a8d0961134fb59ae728f0175db84fd143f1aa6e5c94d5d4cac5bc4f6b860d1f93ffdfabc4e9786d406f27931ac6c0929c82a96b0d0204e44893b2b5
+EBUILD fortune-mod-familyguy-0.2.ebuild 558 SHA256 f2e8813dda0aec0822b0698980e423f52e63628d227954336931fabb227db35d SHA512 4e45bb08a850655bcb56689c40d64546255404fb8ad1cc98a8b7bbbbc38ea7d8f1e8f52304f845d2cce2dd8897858f06bee2f4b2658c553f43f47c0caf6efebe WHIRLPOOL 89fc1826f818c70476bf9b4ee9d5b8423a1e5b999fa1bf2796b0b3d115d9337d7317db284e4edb5d253bc1163c31ac9833c64584c610909ae2ade5176fd0a931
 MISC ChangeLog 2467 SHA256 566ecba91c2add1d04bcb74c5b5da1df7a19e8b384f369163b825b219549963c SHA512 0b13ce4c46f9880eae8c1bde9d16a7b4b190d3630f6420de0c23ee5562646ed0a62091ccb8f265c41fa42c59e73165b57b500da59dedece12239562b040ac6de WHIRLPOOL 3077e1fd3b46a33061a2c898669ae9b6c062ead0e6ad3c09bd7001869328dd7be9bc5f9b6deaa0adfb4f23ccc631625885b733f6a29e9f3f7a90a69089e230f9
 MISC ChangeLog-2015 1480 SHA256 3fea887ec7037378776315a54ee4fc5993a6bd259f1027934e98c305fe8c2d01 SHA512 77dd12298e0b71a92206b81016fc221df6c4178536c130619fc82a04952b917c7914e416d867918e0a7530d301fa1d5a930aedd785cf9809e8586bc1924d54d0 WHIRLPOOL ea32bad0a328657f93efdcbcf36a11ec07445a27b20f99305a14f25c4121efdba3cdfacc81e850beae29053f45d1c938677e24efdc062a2f1cfd72825589687f
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-misc/fortune-mod-familyguy/fortune-mod-familyguy-0.2.ebuild b/games-misc/fortune-mod-familyguy/fortune-mod-familyguy-0.2.ebuild
index 0fa3aa4f9434..382fa9261d8b 100644
--- a/games-misc/fortune-mod-familyguy/fortune-mod-familyguy-0.2.ebuild
+++ b/games-misc/fortune-mod-familyguy/fortune-mod-familyguy-0.2.ebuild
@@ -7,7 +7,7 @@ SRC_URI="http://jon.oberheide.org/familyguy/${P}.tar.gz"
 
 LICENSE="fairuse"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa m68k ~mips ppc64 s390 sh x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="games-misc/fortune-mod"
diff --git a/games-misc/fortune-mod-firefly/Manifest b/games-misc/fortune-mod-firefly/Manifest
index 474592f15673..785ee25a6925 100644
--- a/games-misc/fortune-mod-firefly/Manifest
+++ b/games-misc/fortune-mod-firefly/Manifest
@@ -1,5 +1,5 @@
 DIST fortune-firefly-2.1.1.tar.bz2 36649 SHA256 5240c48393ec7d5588ea79ca3d26cc581a460e81ab0f258df25876a5ea89ad7e SHA512 17d659a215598915228a494337f2a49878d2f238e2fc709559bc3dfdf58ff15ae5bf35a2051bd3abdf6dc3608bbbba6b5619737e0cb94a0aa8905fd05e4abca0 WHIRLPOOL d1e30f39d7b67bfc2c300c95e076c2091f8b7175f80159979a7a24a1621b1fa6634ea504cfc0c5f8be41939621aace410dff20990144fe655bb3d451f17e5147
-EBUILD fortune-mod-firefly-2.1.1.ebuild 574 SHA256 580700c66b32de4b4ae9fed5009ebfc6a599162ddb06047c8f84c726ea7f37c9 SHA512 5f8d4a7b86b1834904c58d31991844f68a27b24c985be1e03df45ce56c42928891489ec87e1d82433a313aa01be49aa12d6d09facc514869828c6726e3c05228 WHIRLPOOL 0b108695ea96ae02473e9c9f4eb1ab2a0d9af1f2d996f7bfcbf71bce89207896ad88822112a227120e5d3280dac00bda1e41231fe041282f018d6c6a9326af6f
+EBUILD fortune-mod-firefly-2.1.1.ebuild 583 SHA256 a041f8a71f16962530350fb85c10a97034a02deaa1eb36d3a6343bd5545f1e24 SHA512 c0a93ab63e09ffd78173b8623675b84078adfea77e1c4465343f92e6154211f892a3b6d88b3e1bebb68b1bfd6dd80a0f51f3859bdb6bea46f7b23d4bb11960cf WHIRLPOOL 88b4516bf41e7c68d60a3a28861dc6c6ac96c02714e99a11293217d8d6d9e23b8babff9caec190159cb3ea23d21f481e1ff05d4cd38992c8e3c4386e2e905de3
 MISC ChangeLog 2465 SHA256 962336bce37145eb59e24ed251e4ef6ccbe2a7f8af0e406ca6ceed0d89836d4c SHA512 9340beb29da0b22e31c71603edd03a56ea414efcb7e6a82114e225dabcd589f1e3be35b1f5eea132c6d10509256d9ffcf0309280d15e6e193be7442deec41999 WHIRLPOOL a22299f3a5234af61ecc458aef6be266b659106ba8a6b42ac89ea958f7c50f53488bfc062dea4c6b885974d3973a97f33b6b20a8ec97aa6b2457951dd4bcb4c1
 MISC ChangeLog-2015 1923 SHA256 e2dc2989717bf3762bb8ad238f1e262d7c309ee11241dcb28d9a1a482f1b2f1b SHA512 a70302173cf089840fd29d8dbd8854ecf468d015c28f5ea8164228e5c4c4beb0a703ef0e367b8191bb440797938288215f0aa99658dc6bbb6970088e23721aee WHIRLPOOL 24c7d5c13e91151ec583c9c9e6fa525026806a29c00e0af281fa6c7ce93ea9cbdbc3be2d42f98037ef5e6a2fc56c570570d711b4700547bd768b96a747ef9400
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-misc/fortune-mod-firefly/fortune-mod-firefly-2.1.1.ebuild b/games-misc/fortune-mod-firefly/fortune-mod-firefly-2.1.1.ebuild
index b4a370e29914..b94f3f66f8a0 100644
--- a/games-misc/fortune-mod-firefly/fortune-mod-firefly-2.1.1.ebuild
+++ b/games-misc/fortune-mod-firefly/fortune-mod-firefly-2.1.1.ebuild
@@ -7,7 +7,7 @@ SRC_URI="http://www.daughtersoftiresias.org/progs/firefly/${P/mod-}.tar.bz2"
 
 LICENSE="fairuse"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa m68k ~mips ppc64 s390 sh x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="games-misc/fortune-mod"
diff --git a/games-misc/fortune-mod-flashrider/Manifest b/games-misc/fortune-mod-flashrider/Manifest
index 81fe65ba1430..87e07474e64c 100644
--- a/games-misc/fortune-mod-flashrider/Manifest
+++ b/games-misc/fortune-mod-flashrider/Manifest
@@ -1,5 +1,5 @@
 DIST fortunes-flashrider_1.10.tar.bz2 126771 SHA256 d807eae7a43b9ee4ee5ab8824d0b7eab81ae00ad9c8899f903ebf8cdb5987744 SHA512 3fdf4f19d474cd5560ec234a290a9d6a3108148a8125b93817c4e0513f884a95449588f27775cb7ba321521d19d540bd459d1bd14648206216f9beac5fe6764e WHIRLPOOL 5a1c68740d0aa539ceadd80637172ee04832f03ca1e692aa7aa9570bd3e4ada2d2252c4ec9850d8967c95e0a0c969f6c45b504daf804e40da2f1df731fa26636
-EBUILD fortune-mod-flashrider-1.10.ebuild 746 SHA256 5a5047676c5b5837b6d007785513c564cd63e3efa7f7fc23d9ae44d260c37d62 SHA512 00b4910cde4fe29f70193b1c2af848d4b9633fbf01f15d9cb9fc3e86231f37db4b630b700dc31920d0fbd0ed00b2de767c1090bc0e8e05fcf162acd99cfe5e38 WHIRLPOOL 50724ec4acda51ca17e0e4e4d00086f1986544665faf587e6485f6054e14c49ca95b8c59de8e8e7c110e617ed1259d9e3e405ff16d451e68c79eb95fd07c350c
+EBUILD fortune-mod-flashrider-1.10.ebuild 748 SHA256 61da0ec675939893eee70c9ae3b9b174374987d24f835afcd41407521cd1d2d1 SHA512 be9914e24ca9127d3f75ecab43caf7932f5066f081948ae251fc213c3aef7e6b073ce4cd4c62c830a9c878b919477770861230b5629b1e595c1c12324e94a629 WHIRLPOOL ccb70560112ca35d909550d072cd50408500677d1a7e41f8b994d782994a84d0b70666ae2070778156ac3e54fc913f5b2fd32646e9394cfc4a7ff0c0ada783f9
 MISC ChangeLog 3771 SHA256 e314217ada9a960593f388601c304889e6dc97cdb3dba4790c613e624631019a SHA512 a7b1820d417ddb487d54949a1bbdab170b77114cf4638faab6a3c4e6fbba2cf92ce8329c917d765d5b57865ded6905ecb26993a711a4909c8a165503a4f51239 WHIRLPOOL 83f39e770642bc3ca0ebde454ee810e6260728b3ed7f1debda381bc11aae3f1a82f7463743096fb3b6e061534a0409a6ab566a004873afb46ec0c915d18a3578
 MISC ChangeLog-2015 1940 SHA256 e59676fc266d015da531160e8ad549bd0a2d2e6ac2c6461180fc5ed2d17d446c SHA512 bbd8c7b0c3a633f8bd8238aa2d3ce546f3c34a6b94f2ae95ed1cd290a972b5975e275ddd0f20c738be74982063424581250a6017c0e4623d24fe03fb7b3b9fa1 WHIRLPOOL 56413ec96428cdbfdbdb5da490fae59b6c157e6c1386d0bec7b63078617b625c5ccf85c56d7cefd11fe740dfd1689a503ef2bce4a9cc6cbe74b0e0ef2e303335
 MISC metadata.xml 252 SHA256 0dd0e558bb7ccc4f24cb9c9c43790c108e559f3462861b2ff6eb267a345beaab SHA512 90798aff93ec7e3881b882e7b10bb1680e8cb7d82b0ef4280e562ab0c9e8a2daba8afe57333dc64697322267a4b651c00ee9b4fdeb56278ff70c073da7b91638 WHIRLPOOL c6c72f145f4ccc4863ad4c1a236eac601fb00f0e9550568f98d5e6f5eeb16f361b4c18eac8d80a1534e398fac595a6819a86297164be0818d04de6d643f01d7c
diff --git a/games-misc/fortune-mod-flashrider/fortune-mod-flashrider-1.10.ebuild b/games-misc/fortune-mod-flashrider/fortune-mod-flashrider-1.10.ebuild
index 82409850ec98..d4ff0f261e4b 100644
--- a/games-misc/fortune-mod-flashrider/fortune-mod-flashrider-1.10.ebuild
+++ b/games-misc/fortune-mod-flashrider/fortune-mod-flashrider-1.10.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://downloads.nanolx.org/fortunes-flashrider/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 DEPEND="games-misc/fortune-mod"
diff --git a/games-misc/fortune-mod-futurama/Manifest b/games-misc/fortune-mod-futurama/Manifest
index 01c1d9903d5a..4c6b1a9b7f43 100644
--- a/games-misc/fortune-mod-futurama/Manifest
+++ b/games-misc/fortune-mod-futurama/Manifest
@@ -1,5 +1,5 @@
 DIST fortune-mod-futurama-0.2.tar.gz 19349 SHA256 e3076fdfa7f2e198df7adff06556597b87f7f5e0ab6facf850aed48c4d0ef2d2 SHA512 a6780f46c361c31d523c8a39a47dd5d752a7cdb86d26f26bcfe89e5ee367c81af00ad4b538be5a40827a3b212214565afe5b438cb965fe87e05d9574c9483a01 WHIRLPOOL ba705d8aa8eed8ff93068ed05a63cbe0d96065f35fbddf61bd971e07ea060a6167fa08dd1dd46e886963c82bc3764efa6752b0c99d6f2adf7a69c2a829273b64
-EBUILD fortune-mod-futurama-0.2.ebuild 541 SHA256 5a79254fbef952c0aadca209b800edd90b1d04755667d35d3e706b7d6c7b22b9 SHA512 87a5adc56d2a11b6add6e9054aeff83004bdc444db755083c0a06f3484c804451cefc8789fe2e69712b5c4d4d13cfa267e1fe9f9f42805cb802a864c79f00242 WHIRLPOOL 8267a04d6c29f20edc415f13630b7ddd44891569192209fe1602b9645062555a3d3d02e4a7802b40e9821abdcdba38d3382ccfaa4d066f6dede90c8b238e5f03
+EBUILD fortune-mod-futurama-0.2.ebuild 550 SHA256 a3c3167ef6d318151368721dfbef93ba24408060748c3e60f08918851db14b61 SHA512 01fd3ee662198a233fa6c005b050b306b4f602dabf8715b55363cf269d86cc912161054e14e2ccbec2d2e32005faa5c66843dc4576911bfbd7d7f9c92c3db3fa WHIRLPOOL 837850c421714f9f0480528353ea25ea1c9c85b02326331d013760fe82312b74d8c732a57179f6abc4a80896e58ea0f0217d9f2ab54dc4342a85221b9b77e046
 MISC ChangeLog 2464 SHA256 9e9cc9aaf3c4a137db3c5163ceaefb4241a1f009c7fdd5e5a46b56f6e065ed46 SHA512 5fced4dc65949547a29925849e7bce4e29292ce34cd8bdb5e7f52e354b152cf6ce941eda8317b1970d07b6015cb3df3512377d5cff9a08dfe04a2398326e90a2 WHIRLPOOL 2656b4044575fb93338ca7a6ab9c732c8065bf817861831f50bc745b78e0a028bd7d42c78606456db35a41913d982f204f688fb78d11189a1c27357825a0762d
 MISC ChangeLog-2015 1830 SHA256 ce5f2bb6f847da8897d114762f5fa3077d7238531301bb8b1e936245c57561aa SHA512 d6048e4be03b9a909a864da8cdc33f1c2a8e96c00a156490c744eff58f0fb8a7cba2115e0ced72b5c54c100162a8cfa063b556d975cc53ccd1c4b026d189577b WHIRLPOOL 32ced7312db7a6d64547f9f4587a856a494af0f85a84684f1a6a109807e2b68819813e0be61052a8f3267002e7fe6b1482d360100c07b8157d3ef19c0c29b569
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-misc/fortune-mod-futurama/fortune-mod-futurama-0.2.ebuild b/games-misc/fortune-mod-futurama/fortune-mod-futurama-0.2.ebuild
index 8ac730841998..793134dd8d29 100644
--- a/games-misc/fortune-mod-futurama/fortune-mod-futurama-0.2.ebuild
+++ b/games-misc/fortune-mod-futurama/fortune-mod-futurama-0.2.ebuild
@@ -7,7 +7,7 @@ SRC_URI="http://www.netmeister.org/apps/${P}.tar.gz"
 
 LICENSE="fairuse"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa m68k ~mips ppc64 s390 sh x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="games-misc/fortune-mod"
diff --git a/games-misc/fortune-mod-fvl/Manifest b/games-misc/fortune-mod-fvl/Manifest
index 99015788c868..1586ba6127fa 100644
--- a/games-misc/fortune-mod-fvl/Manifest
+++ b/games-misc/fortune-mod-fvl/Manifest
@@ -1,5 +1,5 @@
 DIST fortune-mod-fvl-20030120.tar.gz 66081 SHA256 fbbfc56d33d5bb177c0d051ecdfd90736f5306a2855c02fd53fb69ed95e5ebe6 SHA512 43213abb2772f560d65f8e552a9c384f2163650cb2fa29a9203a05a0c3b36dff6645afb181e317d5e9258cf0597607bb185a8c852289a2f3cf015c6e4f946bf3 WHIRLPOOL 7d285ec71ab78f1dacabd612853e54ef8a77949df466716c60b9783c1210d87aa617e1a0e07a8510942b2360c49cfd1b216884d8aea80dcf89631fe1f1545029
-EBUILD fortune-mod-fvl-20030120.ebuild 539 SHA256 baf150b6f59a53ffdccad9a73df5ad801a0ed0e1fefb579e30ed27a3f78bb5a9 SHA512 da78352a1729b900120e9ea7dfb24dfc7daefb2a9fda2953500da7dd458ddcf11691cb80974ae84152d63b08347c72c37ec7a8d1fa67dedfe8253cd5afd4d219 WHIRLPOOL 8d955ca46e0968c53b6712eb042e9ff180a79e02db47cd4b1f66875592835367406035db46713aa7cf6da5ef32e8b359d23574aa3c579c2fd5a7f9920f3044b1
+EBUILD fortune-mod-fvl-20030120.ebuild 548 SHA256 5bd20a100eab2d86888c2c9a42d801fb311adf5e62a187194adc6286df6729f3 SHA512 9e8203005295f868de15cde7638072bacec3f7ac1f77a1dff10e79518169dc92b28b4f562c77d52ca8de57a3c36203c32e582f36efce62ad386b421afce3a259 WHIRLPOOL 3024169b609089de1b5b43dbf372f2e30eab9ea38373313d48f5cf83752e3f535b93f30f62ae6ac61822b53fe6267458caac5f58f6c1b1a248d4848058a01c87
 MISC ChangeLog 2459 SHA256 da23c7d08208c20d4d6064a2d2b65a57295bd01d64bedc9218b5fc222a7bd05a SHA512 d9e7a2e1768f79204752f3bf8006dcf017d21a702459ac6a1dd44fd95039647e5fae4b9069306f2fc1313ccb84bcdeb6cb72f766ecd6b80a5d2d512b927f4a16 WHIRLPOOL bfe0bec890940737bfb6996b4d2be4592f3a0511b451a75d5d8507881ea712195f60871a913942989e6591f55d65622035eca1203658999a13102d20269905c7
 MISC ChangeLog-2015 1850 SHA256 b8704af7a3584d7adbb33b4979431db1bb7c16c59d75618bd35fb4216404f876 SHA512 7d0d79d18e688d3ae2f6b9ff9b0318589d95b386b350b8315eee834535a5ccfc930682bea66f78650e9809bee5c829cf8eb7684699a813ee757638207d6decfc WHIRLPOOL bf621a16421cbe68a255b75038287ad731a39aa896e7f5e7aff877a08bd17cf8b20b5a645cb1b0b111d3e823f2480b9b203757dcd0088b4d196659e7f68c7db8
 MISC metadata.xml 338 SHA256 4d20692076279c391d84bd9fb2f5051441a2f96915c935834333dccd8e138589 SHA512 eafdde3a9e9cc33fd4dba816289aaf3dd0527f139ddc5cf76eddc13736d7f32277ceb23d86762d7ae8167f05942eb985756da89576dd87be69c7642469d2aa3f WHIRLPOOL 34be2722a38fb7fa26dbb85de90e6b36c9f621ba1e05341136252a555556c79672701c770e714d0dfbd203658799f140ce392c4a65a31183a030732b4898b9a0
diff --git a/games-misc/fortune-mod-fvl/fortune-mod-fvl-20030120.ebuild b/games-misc/fortune-mod-fvl/fortune-mod-fvl-20030120.ebuild
index 0eb5b57d4ad3..d3c0931121ff 100644
--- a/games-misc/fortune-mod-fvl/fortune-mod-fvl-20030120.ebuild
+++ b/games-misc/fortune-mod-fvl/fortune-mod-fvl-20030120.ebuild
@@ -7,7 +7,7 @@ SRC_URI="mirror://sourceforge/fortune-mod-fvl/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa m68k ~mips ppc64 s390 sh x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="games-misc/fortune-mod"
diff --git a/games-misc/fortune-mod-gentoo-dev/Manifest b/games-misc/fortune-mod-gentoo-dev/Manifest
index 3719fb36a48e..1e6564efb33c 100644
--- a/games-misc/fortune-mod-gentoo-dev/Manifest
+++ b/games-misc/fortune-mod-gentoo-dev/Manifest
@@ -1,7 +1,7 @@
 DIST fortune-gentoo-dev-20090306.tar.bz2 50355 SHA256 e44afa4c7e11ef854fe8e4b783eefe2caa9907c3d8e925f10de5f7cbbbb1acd5 SHA512 2a6014d1dc95cae8a50c8f502f8271a9b7bf349cb49076ac3e76f3da55f0e509caf27ee04827b1b42add1b42ae07824173495bb0dbed5421693508fff9f36acc WHIRLPOOL 1d24c583cb38549403857acbb2fe79093a177ed8d07fb171e756dff90046d12ba98db5deeb60b3cb152c2500142a9b3d157eb829d685b4c6800ed1542b70eee8
 DIST gentoo-dev-20061115.gz 39451 SHA256 b494fae306fa0c6b9783c9d8f0fc62ba35c207d3d4d1886795896d8729734d06 SHA512 7861314c04b04888db2c171047f6fd2c14fe77afe07ac5becc4675e4a13182ff2a54a0d4608f3aab5954954a500a43165972bda1434b0e7de3239769afb2d49c WHIRLPOOL 51b91cd3ccd0e4c57516481e5d4cda4689c796045bed60ff24ffb227af194343a09b56ae6b55b4a02cf0a798a37589680d555eb9b73d0cf02803223421560082
-EBUILD fortune-mod-gentoo-dev-20061115.ebuild 595 SHA256 4fb6e1dfaa462f642b3807e9d400b1e43c1455cd7f1f539e9c84f2ac6d35514b SHA512 2f609578a774bc7ac7d38066145bc1e43b66e2ee465afe2067cd8a7fa0731897f2266305b9f67bfff1bd01b3702b61331e3c8278720dddf1bff9b912cceeab0c WHIRLPOOL 435bf9117371b6352870775b89c904fa32bdc79585414d01e820423a2399c395c9082e0f0446e41f029ae004e9ac7cb1a7e7cf9db7347a502c967019576e2434
-EBUILD fortune-mod-gentoo-dev-20090306.ebuild 717 SHA256 f566464b1a28a94ec58e4405649651bd2d45f1fc6759d25b31aa967d85a91941 SHA512 86cb359d2fad2e0f533bdded74f3d1e17f5bc1611f8e8a6bd7c9848f0ad90137fdf3bca1c2d8a03234cd520b6ba30d53d802866b4a9a8f8720c0ef97f7a1eb23 WHIRLPOOL c8d076eeab3c1bc354326c6191362988fb708b3fbbe2b0ee4c19943e71d70defa4805ee9779dd5239e801b5727df3e5375d6ee027ab7bd213d7e6d206df6b406
+EBUILD fortune-mod-gentoo-dev-20061115.ebuild 604 SHA256 8288815c5cdb2ff9b1a8156365f6e20d09dcfed844a9e63396b05f49b8c82f7e SHA512 228d8e1508bfee419056703e482e2a07a099f84db76a75ca28e00194e9607538f5583d79e691b946f39372e4f2f621d2c2a372523fee63fc31612ae49ed342fa WHIRLPOOL bf500c2593302d86bd9231af9753e61989b8874348da0bbcd65b4acae326e4b62610c75dbac5a6813c87538f117860f45a3324a3225defa3d344595d70b29146
+EBUILD fortune-mod-gentoo-dev-20090306.ebuild 726 SHA256 9e49fb3e166072c49ee53ceddea73daac5ac6cdfa307ef6575b359bff488663a SHA512 e5c9e466bbbaddabddf73409aad1fc4c28565d4d9052b864f893beb480a8b61bd031ec1d36c82f88f2785d2864f84f3feb41f8d19ba3c1c954e6ffaadfef5b8c WHIRLPOOL dcb25de5cf396a5a384ae4ed0d6bd697dfd398b0fecbc051d768c7c537f43eb81367bf7f4d8fee725ba67e97ec95e7dcb6775620b0a38b91fcbc5fa46895f74a
 MISC ChangeLog 3047 SHA256 6aa8bf58d46f8139b2bbf61ce06e981b7fe86868c311b1ab6f2f88f1e1b162f7 SHA512 40f7c0d37c220de72336f19e01053890fdbff9e53e3ee39b4322e9472d4c9ac1cae4b1bb038f39337fa42b834162368227e034c02962cdd856a0e87890f16a4a WHIRLPOOL 14cde9149bbf3a4895d165190bc5c67fe2cfe8818b4f8b8d4d045db5b3978d02ef1a76407f01b4315a207a5c3fd6c47182971faeafde617d9649cf672778e0ac
 MISC ChangeLog-2015 5354 SHA256 dcf10be0056f899dad33b1076255722daaca0693b2f45a7d0cee04ab53cc123c SHA512 e4f30f0f054c9000ba16ab25ad5c2d94202f9d98110c3f8737abeb9fc50dd3849f4fc5c12671fb9b56ced65c475b0aac230b974a15425a6d13d41ea59954506e WHIRLPOOL 9132226ef3bce93090274fc43ea024b2488b111ab657b3f3ee92c0f31251ebbfbe30e04181a4249839c7b083d7cbf7ee33ec9037784c52eb158124b16ed0193e
 MISC metadata.xml 451 SHA256 096ac17595afcd98e97c2e4a34d1337be46f7cf1951fed992772426a15a93a0e SHA512 4dc5894c615627a06c494146c3263a66ac6cd1bf577bf7f9d81b2c5988ccf439ca78812146b9840a24e13b1fd9666b1bff994b7c86e73faa1d0b0f321169deef WHIRLPOOL 2275dbeb415dd798e675a424aad27bc5aa634fef09b595b0633e079ea8540d07136b97750759b075f44cb46a0dbb9deb29f5cb6722c5bb97eb67102b7fb63800
diff --git a/games-misc/fortune-mod-gentoo-dev/fortune-mod-gentoo-dev-20061115.ebuild b/games-misc/fortune-mod-gentoo-dev/fortune-mod-gentoo-dev-20061115.ebuild
index 869788b3dfd8..ffb08e2070f3 100644
--- a/games-misc/fortune-mod-gentoo-dev/fortune-mod-gentoo-dev-20061115.ebuild
+++ b/games-misc/fortune-mod-gentoo-dev/fortune-mod-gentoo-dev-20061115.ebuild
@@ -7,7 +7,7 @@ SRC_URI="http://ircd.oppresses.us/~avenj/files/gentoo-dev-${PV}.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa m68k ~mips ppc64 s390 sh x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND="games-misc/fortune-mod"
diff --git a/games-misc/fortune-mod-gentoo-dev/fortune-mod-gentoo-dev-20090306.ebuild b/games-misc/fortune-mod-gentoo-dev/fortune-mod-gentoo-dev-20090306.ebuild
index 0e4f4ac1eed4..3b875114f8e8 100644
--- a/games-misc/fortune-mod-gentoo-dev/fortune-mod-gentoo-dev-20090306.ebuild
+++ b/games-misc/fortune-mod-gentoo-dev/fortune-mod-gentoo-dev-20090306.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo/${MY_P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa m68k ~mips ppc64 s390 sh x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd"
 IUSE="offensive"
 
 RDEPEND="games-misc/fortune-mod"
diff --git a/games-misc/fortune-mod-gentoo-forums/Manifest b/games-misc/fortune-mod-gentoo-forums/Manifest
index c2a47d60976e..81888487fde0 100644
--- a/games-misc/fortune-mod-gentoo-forums/Manifest
+++ b/games-misc/fortune-mod-gentoo-forums/Manifest
@@ -1,6 +1,6 @@
 DIST gentoo-forums-20041207.gz 8809 SHA256 d6cababfefde07a250d043416488bcb4a0298c4aae1ecc4fc4f55755653c5f72 SHA512 55f1da4dd6c37778ebb46de5436a8f69475cd9a25a5bd01a325cbd825cae4bc6ecaeda94d6b38104fb71a4baa56577f12390884aac545c5d891895aa7ee1738a WHIRLPOOL fc247d7e578090ced0056018908f70ac09b70afd2992f91a2d367c2f3f290c47a3f4ce5705ca75f74572b684fd5b0c5d3fc3d3555af39d56a4f8e9e16c18043f
 DIST gentoo-forums-offensive-20041207.gz 1510 SHA256 ece84fb263655c598d90398661ce974a02fba8a8f1cde8b27873606de051a88f SHA512 244b4e7f5c5feaa217298f79d2f157999c71d89824f25d89d7a234ec72950bef93a4c0fa23ce1fb385c5c6788c62f09d6b17f454e70cba0052870f4267522dbb WHIRLPOOL 4f6e7476368a97aed8e0678480949f99d8ac0d0fe710616d5213defda6bb59a249baa0cfc812e415e680b58962ac536ffb9f910de899f1b951427bf3ed66e865
-EBUILD fortune-mod-gentoo-forums-20041207.ebuild 819 SHA256 be26a4ca06df20c7d7dedb600064d41b5a595b5229f0377f8759cb1e6984333e SHA512 7825f9b86fa1b3441d395a7a2f3c7b54276001b74e5cf7b7b2f0f96b1f200e1b774f0da5da0908c2a634f08e4d0d5aae9dd6dc7b0ec7d1f1f4d3808f9ce02841 WHIRLPOOL f968e3bb695dead371b2c667875e3c5800f3c400d828a6e3385095121b3f8c8874a8a71d960416b4dee84bc5c861f0f1abf9e774f0432bbc3297427c590d2bfa
+EBUILD fortune-mod-gentoo-forums-20041207.ebuild 828 SHA256 5693e7829275e8a1f4f347c339c4ce8b9e2ddcea9cdf2b3f68801e2d6a79a9d3 SHA512 297896961f6970f5ae55cd9cea351cd7530cfac31f80ae40785e1ce31039aa0080b4a31f4af4f24dc4faa3defb8d1d300f08602e36c93476660dad74f46e5d0b WHIRLPOOL ce6a984f2f9664bc3d0ff778be98914bef07918154acf1c6b4e3cace177cea8e1a698cfb56442f10ad8935f42ffde11be4d27bc6d13ce167a9ef7213d2a6f839
 MISC ChangeLog 2739 SHA256 3dc04322bcc4ebd7fa6725b8f5f35fbd87c02cc44ab1ac26a4b869f20d64d310 SHA512 d979e3a8fa6b514778f69a647c79d0e196b48a6fa8dcd7fb8eb61455524bc19a2d0b299eb4011b89dfdf5ed1eedf87edc9dfeb6c4757ca2f84f2b318c6509021 WHIRLPOOL b1ae0a8bd806c7f978e235a6f502de9098a5143d088002e3ecf12837d9f1b913687d1e0f596ff82f3bc1d9d954d76ad74e18e8c5752b1df4705f3a45d410afac
 MISC ChangeLog-2015 2409 SHA256 5a94692570698c187332c63f4b450bc063e62b9a98639a67a4eab60f29fc34b9 SHA512 c4efffc45096b2447f4da62a32c354e81b5e09a97d73af179c66f3e015d8d668c388f19bfe946eb05f8ac436c6bf27c9f21f2b38ba86c35dfed9728b32407e51 WHIRLPOOL bcdffdacffcd69aa5bb8e54c7c0fedf7d2dec4da78a346405fae5928cb567d38ad473ecb65ce97a6fb6d6ac5b3143913bf5eccd26b4de502eeac86f1a3a7245e
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-misc/fortune-mod-gentoo-forums/fortune-mod-gentoo-forums-20041207.ebuild b/games-misc/fortune-mod-gentoo-forums/fortune-mod-gentoo-forums-20041207.ebuild
index 3c36701f9f51..347e3bfa5814 100644
--- a/games-misc/fortune-mod-gentoo-forums/fortune-mod-gentoo-forums-20041207.ebuild
+++ b/games-misc/fortune-mod-gentoo-forums/fortune-mod-gentoo-forums-20041207.ebuild
@@ -8,7 +8,7 @@ SRC_URI="mirror://gentoo/gentoo-forums-${PV}.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa m68k ~mips ppc64 s390 sh x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="offensive"
 
 DEPEND="games-misc/fortune-mod"
diff --git a/games-misc/fortune-mod-gentoo-ru/Manifest b/games-misc/fortune-mod-gentoo-ru/Manifest
index d29de5d0f0be..a090f878b0f1 100644
--- a/games-misc/fortune-mod-gentoo-ru/Manifest
+++ b/games-misc/fortune-mod-gentoo-ru/Manifest
@@ -1,7 +1,7 @@
 DIST gentoo-ru-0.25.gz 74751 SHA256 2c73ea65ca841fd35a38a8f9aa0d890f12865dd6ae79d24c2333501c54e52cdf SHA512 b3dd8c034c05bdc3c08716a47a6cf0b494796e5dde912a88aaabd17a84c9b94ea2a1bfd586116d48c48b7dbd5624eeb54b81491834eb1e66fbbde475fd2e8c4c WHIRLPOOL 3c20b1d845115be655e9fe8abc8eb496a03661145afac268dc2b1eb5412bfdaf78c89fd6658fd5374e7f79a4ea975bb798e4e7d30086169962c7680ff900eac2
 DIST gentoo-ru-0.26.gz 77812 SHA256 1ce7e038c5a97ec226f38ded4070fa4bab363b6ff6649bf91daa3ce327cb68d9 SHA512 2f61acd370a7ddcaec80c91129cf624434611deaba6ffa6e207ec82ce960e67bcec63e583afc71187fc0876da97bbf60ab81060d8d9d30081300d93e64fe4eb4 WHIRLPOOL b84496b3235be1298a8805d3453267c376a5d3ac6f8623cbac095846e6dd7508c5a8ba4db4f33753517a2eca0c9f053d1ba0b7a271c1fc72870e5d5deb58809f
-EBUILD fortune-mod-gentoo-ru-0.25.ebuild 691 SHA256 9141a34d05f3efdb9e6d91e8521b29a56f894ef342ba02cbbd0bd9e7360a1fbb SHA512 536381a10e1a491ef5e7e3b19eb1409b26cb8ee5f7ae24809756e8880657579059bd553de5d35586587f88e92e9d40a35bfa289856c6beda259291373be28899 WHIRLPOOL d5ea7eddd326605726aa62ea72cf93885eca85f5d32a04ba16db980f2996189bb0667aead786e49a2a330b5f898ee1b2fa2fb5862c91ae74dee893ec0ac7014b
-EBUILD fortune-mod-gentoo-ru-0.26.ebuild 685 SHA256 6326a743e0b48bd0419597ea58122e1c4f617658a9927fad530738693b691e6f SHA512 0e9608fec46fbc7a4e7d151c6c061ec78c2620a462aaf81ddea55f2ccfc324e69731f05f9b85a3cf899d49a9bc3867f46d3977d603f11f600e27029181d982bb WHIRLPOOL c87c6ef9064e4a4650228e6150288a9434ea00b7df7581ce1ff811355c97dce66d7b864a9fcf6f048c8798c4d84a07deda88a864d8475bddda39faa1dcfa559a
+EBUILD fortune-mod-gentoo-ru-0.25.ebuild 693 SHA256 12dc4ca883ddc7fe0a2e0c7be30b5938102f0f55cad1af3f31f70f15cd50e84c SHA512 1b96d53eee41f3ae54244444b059a5535a9cb0be4c637d54dc5c565181ab92b05460b9a5cd4feff6c4c3ea335fc0228acd019e8e170196f1e1917515be87da68 WHIRLPOOL da3d404c89391625a96450709fd9e9d1b34227a469d37448ee360f23beb40c29795936243046d6b5fa24fec0f0d61629dea269d36893dee527787e499c58276f
+EBUILD fortune-mod-gentoo-ru-0.26.ebuild 687 SHA256 1d2b5de3fb91283bac5d2f9e19833f0b18c4a2f9960ba2b63bb6589a2f7a3428 SHA512 a1ec684eeb2d45bec822bb0ea685d6d1f93504fbf1b1d2cf2578f51f568e740463f98b9d45c3b98ad12fa2498b62e147c262d5a5d80c2e6f687427ee51ce4628 WHIRLPOOL e0e9ea528a417bb9cf961981cd8d120a773a9e1a3fa08c6a43b724cee8d6356cbaa94aa8a6994782300f9a29b00f5baa3b5ed5b0af48d38de0d0d6d02671c8b3
 EBUILD fortune-mod-gentoo-ru-9999.ebuild 644 SHA256 dbc1d823d393b57963b7f57f89eaf0a3bff585005fc306fddfa8f48a1a97c315 SHA512 6c00cd321df15fce298517e8920eb61979260b29b0a2585b1102cbd248edf2a7ce27d68a42f646bcfbb452623ee90eb5c6a431c78b6e316fd1dbaaec011e1643 WHIRLPOOL 0277410192aa653d468ae2c972e9280ad1326f70bd7e81193e4804190b9bf8d4b81e639463d71d81e046c78e1d9c0f50b9324a4ea2dc7da08b86011ae52e672d
 MISC ChangeLog 2988 SHA256 cbe4aabec3e07638ac88c0820b06efc8b61e89f5b6987957f8c79e302f466a82 SHA512 34e0da016f1eccea03777b6088e7f5456c1a2c8d7559cb311dad185c88852be12ce6bb4e1a761b5cb543df15c8f44c0aef2803fdf84aabbd8fd6cca16a2e0931 WHIRLPOOL 5f1f13fa6a55ec77d70a8adba0894bce9785efbe13a8daaac65836d47e0f391b175087a846ec8d3f0d6a7ab58e4c9f370ab11e4ba9983105c437c13f059e61c9
 MISC ChangeLog-2015 6795 SHA256 c3efbeae4dd39b04bcea5b4f4dd3640c0710c2dc6c8daeeed67c1df743945e07 SHA512 eefd0d348fdb5997f5b7f57f473fd9ab5d77872ba6f14b797acd6bcb4b849310a4f58d7cb8bec607c0ce8aa8a25e1733eb8d436e65f2d43012f2b8e1625eebad WHIRLPOOL c94353e4df3e564d25a4ed45ae0c3c86bc82b0c9c44aca0b90a7c1207814ee1806fdea65a3a3c6ba9b91e6b561f8f55fdd890c44c41a9ef246dc1d5aa0037f8a
diff --git a/games-misc/fortune-mod-gentoo-ru/fortune-mod-gentoo-ru-0.25.ebuild b/games-misc/fortune-mod-gentoo-ru/fortune-mod-gentoo-ru-0.25.ebuild
index 08a2859f46e5..feddb8333f00 100644
--- a/games-misc/fortune-mod-gentoo-ru/fortune-mod-gentoo-ru-0.25.ebuild
+++ b/games-misc/fortune-mod-gentoo-ru/fortune-mod-gentoo-ru-0.25.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://slepnoga.googlecode.com/files/gentoo-ru-${PV}.gz
 
 LICENSE="fairuse"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="games-misc/fortune-mod"
diff --git a/games-misc/fortune-mod-gentoo-ru/fortune-mod-gentoo-ru-0.26.ebuild b/games-misc/fortune-mod-gentoo-ru/fortune-mod-gentoo-ru-0.26.ebuild
index ba8aa2589f79..acbe34fb6f11 100644
--- a/games-misc/fortune-mod-gentoo-ru/fortune-mod-gentoo-ru-0.26.ebuild
+++ b/games-misc/fortune-mod-gentoo-ru/fortune-mod-gentoo-ru-0.26.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://slepnoga.googlecode.com/files/gentoo-ru-${PV}.gz
 
 LICENSE="fairuse"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="games-misc/fortune-mod"
diff --git a/games-misc/fortune-mod-hitchhiker/Manifest b/games-misc/fortune-mod-hitchhiker/Manifest
index f5464f31614f..530517fc8b51 100644
--- a/games-misc/fortune-mod-hitchhiker/Manifest
+++ b/games-misc/fortune-mod-hitchhiker/Manifest
@@ -1,5 +1,5 @@
 DIST fortune-hitchhiker.tgz 11560 SHA256 1cf64726d274e2d0e48d7dc92716c7401908f476e17f03a3420126025bafcf99 SHA512 a4f4a99c33764e6d4ec823a57f9d2d40168ddf3cb9506e85fb0f6f10b11673abd76d02e9af8a95926ba758a28fbbe895a427b40c36bd31bc43252c4e6dd610b0 WHIRLPOOL b1adf620df37771e2ce91e3bc9faf160e39f7f794b9963ca5af7e145971a7b671f7de592160a986f2904b822ba37f8acc1f8bb349b8a145ae16b02614c7f773c
-EBUILD fortune-mod-hitchhiker-0.1.ebuild 640 SHA256 cb43bb434db99f8835c0caffbc9c3c5397a3c44219a1cf6b4d5af4f80de5a53e SHA512 dca86b3bf59102e208dd168297c45da615ca3dba61986209c5c24305698f4372aa68ff7d6698fcac490a311720cec927ca1afb0fbb56f31c71a25d271c9f83ae WHIRLPOOL 99e29d56d483a8cee80f560be39c6951eac2ec5b9f32327c3218f1c5a7b5ea6fd134e017e0ad7d586d7be90b64ec930d6ff4ea44f7ecc8153a51eace6ae1846c
+EBUILD fortune-mod-hitchhiker-0.1.ebuild 649 SHA256 1df487930a02a76e40ea48458b6651f3c426b6a234a205aace13670a62c2b718 SHA512 c224f1034840e546a6851d4ffa9f55a820703cbc1f602c7a7fb316c52c8c64c3f0bbf876f675cdd665adb592ac56337f755e1e55c415f9f100ebb99245e152be WHIRLPOOL 0fda2ae9c7ec2e4d28e0142adedc9c65af9e4be832c1cbf0da14197b0f801d17cc640ae5d755fe15e7c6c08b9204078d238990f4ec3085cc0ebdad481db14783
 MISC ChangeLog 2470 SHA256 316737af3c72946fbfc858c90cb558b39802a70ce49c9c6a386b507f692f4794 SHA512 a3eb8e44d75b1a7ac06cf10f485dd6f41bf9eaf0a5fa64b3cc2cffbcc50ee35a0d814cf8c7767a8b0dc78ae93c033a6c8f458a9c24caeb29a1f276de157fa272 WHIRLPOOL 1d1ab86271aa2fc88de34807ee4d2b13ad752f1e9276ad55c8fdef50d790869ecab45af4a25afe7c5506ec37cb3703b7d1587571317eee2c21c5b9fcf667cd1e
 MISC ChangeLog-2015 1508 SHA256 20a2c3b729a2feba722230fb28527eb9140047ddc876e0c8adb4a0e5fa742a3b SHA512 e88d65d376512f334aa03330a3cefabdad89850fa7c366b33edefce46afd762d1b016cd4c03b206c32eb57522694cc7684e4f3b7ae5c01a5c5f7052e1cdf5ec3 WHIRLPOOL 4c6fa8694a6e82431d5b5e55209957531a5b19b90c5986c872153890b900cfb800758caaef9091d3444494a11041a081e2f156420fcf06d19beff9e86da4526c
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-misc/fortune-mod-hitchhiker/fortune-mod-hitchhiker-0.1.ebuild b/games-misc/fortune-mod-hitchhiker/fortune-mod-hitchhiker-0.1.ebuild
index 7206c60540ac..e753b7e0b5e8 100644
--- a/games-misc/fortune-mod-hitchhiker/fortune-mod-hitchhiker-0.1.ebuild
+++ b/games-misc/fortune-mod-hitchhiker/fortune-mod-hitchhiker-0.1.ebuild
@@ -8,7 +8,7 @@ SRC_URI="http://www.splitbrain.org/_media/projects/fortunes/${MY_P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa m68k ~mips ppc64 s390 sh x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 RESTRICT="mirror"
 
diff --git a/games-misc/fortune-mod-homer/Manifest b/games-misc/fortune-mod-homer/Manifest
index deea2f9406b7..eb5e2bba2b69 100644
--- a/games-misc/fortune-mod-homer/Manifest
+++ b/games-misc/fortune-mod-homer/Manifest
@@ -1,5 +1,5 @@
 DIST homer-quotes.tar.gz 23142 SHA256 32ba9fcd55b81c444888ff97c0556566b1a069f9d9ced1d76edbe0e1256b5c98 SHA512 babe8ce488f08bfba77dbed8e6ef28afb50952b48540c62c3b9211ff7504e3d0da0ea05a116f096aed3dbbd732afaf1ad60bb88772305dc43ecb0c2f721a7e33 WHIRLPOOL 0b956220d272965f845ca7327fe05b3bab188d099340e1521b584567a7a54f525e11c9ec30c52ca95ebd5b34a423859071ddba4aa16f3e181f9726ba57767601
-EBUILD fortune-mod-homer-0.1.ebuild 584 SHA256 60317c30fbf46cd0dee490d5eb35eb7dc1439c056b3d889a37c38f8e401a45df SHA512 fb279f40ddd4fc61505cc3ec13ce6ae00e7756b0149664f9bb5aa352743484bf56ae525fe9be792ed9249ccd61c52973598567aff2ca924ed0956c6473dedfd1 WHIRLPOOL 6472e56efe6daa6c3d2a36b3e5c5b3b572ebc5c98ab82901702676e9ce7ec57fce63f60e9ea423557af01aeb5223287ace38bb3978376d9382f4666aaee0989c
+EBUILD fortune-mod-homer-0.1.ebuild 593 SHA256 b04c780857b010d671c6b37de5a49fd4810c8e55af4dd27c33cdcbd8657082e1 SHA512 1d7503601d8eeea87fa7bb124e1ceb9877299a022dd985eee63cffdf5b237875e9468ae959ef9cb573e3acb85389b5e912f51a906ff57345227b3450869bca5b WHIRLPOOL d2968606ac24256d9d415df70e05eb5c0ac9c885aafe95527f0010fb4f84b7866895d97caa05b6bfe5475e80bf4577b5bd5b83ad2eb5335dd6c8526618efaba9
 MISC ChangeLog 2455 SHA256 c7eb411e9fb63f905bcc905096c844799b7c0cb20302832a4e0df411887bfba4 SHA512 935df4e17123038174cfaff91953b732e75f6d48238ac25826f862c4afaa0dfbf20802d8b194494cfd220089c7b85d2a0ce2c0bd0c9d31095f364fbf5a34dbf8 WHIRLPOOL d1840e85cc4876121b39da4e7fb43e520966e88e5c1c18f3a47404524656f1e53510340cde5884cda0540b1b8d2e2e50fa483382f512969e36113f77501d0c81
 MISC ChangeLog-2015 1435 SHA256 b71f46032293d118182b6ebe951bbd549cb9b32abb4f258bf3d179a8f0c6bc00 SHA512 774854562f9e70275709777baa4892406a89efac9b120a3ba4cf4775bf2a62ef76c838a6f9989d26dd18a3845796fd68f7dc3f11235bc7743330a3417acd5383 WHIRLPOOL 15c97b8e0850f571bfdee8c5b48917174cf493f3b3b4e1371143e802952ae585513a1d8a3379d5e16f378ef324c5e13cfa523bbedd3af0cb66a39ea1a50aa352
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-misc/fortune-mod-homer/fortune-mod-homer-0.1.ebuild b/games-misc/fortune-mod-homer/fortune-mod-homer-0.1.ebuild
index 1880907fc0c5..5b085cdb2893 100644
--- a/games-misc/fortune-mod-homer/fortune-mod-homer-0.1.ebuild
+++ b/games-misc/fortune-mod-homer/fortune-mod-homer-0.1.ebuild
@@ -7,7 +7,7 @@ SRC_URI="http://www.cs.indiana.edu/~crcarter/homer/homer-quotes.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa m68k ~mips ppc64 s390 sh x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="games-misc/fortune-mod"
diff --git a/games-misc/fortune-mod-humorixfortunes/Manifest b/games-misc/fortune-mod-humorixfortunes/Manifest
index 4783a71220ec..fc02582eb9a3 100644
--- a/games-misc/fortune-mod-humorixfortunes/Manifest
+++ b/games-misc/fortune-mod-humorixfortunes/Manifest
@@ -1,5 +1,5 @@
 DIST humorixfortunes-1.4.tar.gz 97053 SHA256 482ff74a98e15fbd601fa0c7773f861858ba894d5f9acb543591374f41501c51 SHA512 beac030bb3d7bbfa9286c41cd7a40fce2166fcb058443af0be7ab3f8897220ed4ed1e259fd642554f4b38554351e1bfc2e5eb660a4612cdc23269dbf40163c7c WHIRLPOOL 34510a0a962cb8378c4a1cee2a1f095485f53c9e7f5a01aeac20ed596887d52bac15d570aa7fd1c9fa9535f1e172e9c0dd4afcdb02075038c09352819dfdbc9b
-EBUILD fortune-mod-humorixfortunes-1.4-r1.ebuild 665 SHA256 eb422be6fba41fd5a17eaac3d046ddeec42058e8d08d122820679bfe845d6e36 SHA512 e98a0252f32617c2481096f2a401d53d2f83bb5b7006ff8023274aec021159276ddb62aa27d2fe3a12f19efe4629c4ae222a18c875b378112a3c6bf192e071bf WHIRLPOOL 87aa2ce91de102f2104d2d6ed210533dcd033f2cf3a9cc70bf1de6f22a2719091743e473ffe67c5f4473a9efbde3b4ab534a695e1bc89ef1b8ad1f08d92bbca0
+EBUILD fortune-mod-humorixfortunes-1.4-r1.ebuild 674 SHA256 3a9f2473468ebe7d432bd071f1795db95018af0372ad38377e4ef15350a78723 SHA512 b93cc1e144290e8416eb2ed9f720c5b0c376b364383a5db68f659377999fc4c2ada930d443867ead7788c82d8ab660118f1736643566dc5da450088e565c3cbb WHIRLPOOL f86d4e152967842d4e9d864ac9d19e8eaf39570c81bb1c1d02f238e84ee4f7de2a8d9fc50d60344f4ef9991debdd997980604c11f79547a4d3640f55b2aa4370
 MISC ChangeLog 2491 SHA256 6127b3326ab9ee23b5645053d53cf8253f384a758ef3e6cdb823d50cd757eeb8 SHA512 b77634ebf484e7b63a3b280846f9ac6e99c47f9e7668cbe5797423f8f88858e1b57a23d1b526caee8674f17cb8651dd4fee06352171dd2b9fdbaa1d4e7364b29 WHIRLPOOL 2d78a84fbd2c4e8993305c49b8d25050951f23be67fe4f95bed06d8345cc9ba7b9d0d4c2a6080acd6211d60764bb97ace4e598e1ee9d08b88d6827ca99a8a2de
 MISC ChangeLog-2015 2010 SHA256 2dd7803bde5e33f5fea34ebe4440fa2e848f8c7c9f9e3c20f208b1c67e23e24e SHA512 c43578af0bace587604dd143d6ed73e7302d094d34f845a4d8709f2cbfcf82a79271b4736417f7916a140eff67f5254f04cef03627feae1d2532507698f50318 WHIRLPOOL 2e5527d88041a9fe4249f86d6854b82ef72bf5fc857347527c9e703c997504e5e04ef9a194caea0e3d71e015c6fbc7e21fce8b20529d7acb564b9dcca7123052
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-misc/fortune-mod-humorixfortunes/fortune-mod-humorixfortunes-1.4-r1.ebuild b/games-misc/fortune-mod-humorixfortunes/fortune-mod-humorixfortunes-1.4-r1.ebuild
index 8c2beb615fbf..a0cc2416f640 100644
--- a/games-misc/fortune-mod-humorixfortunes/fortune-mod-humorixfortunes-1.4-r1.ebuild
+++ b/games-misc/fortune-mod-humorixfortunes/fortune-mod-humorixfortunes-1.4-r1.ebuild
@@ -8,7 +8,7 @@ SRC_URI="http://humorix.org/downloads/${MY_P}.tar.gz"
 
 LICENSE="freedist fairuse"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa m68k ~mips ppc64 s390 sh x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="games-misc/fortune-mod"
diff --git a/games-misc/fortune-mod-it/Manifest b/games-misc/fortune-mod-it/Manifest
index 0224bc16f887..22c4aaadbc2a 100644
--- a/games-misc/fortune-mod-it/Manifest
+++ b/games-misc/fortune-mod-it/Manifest
@@ -1,5 +1,5 @@
 DIST fortune-it-1.99.tar.gz 739886 SHA256 f282626904701671d814411665e42edcd3257df8b6f1244993cc014424fa7e6c SHA512 b4b119f5def51a31ee25c5df3e47a0b9aa45341ecb1f7048233aa1d5c1d4fc8127b9eaa29c028a9df5ad71d9868d4006e7d3a1bef776b34d337a5bca47bd5d53 WHIRLPOOL db5a8f6f070d9b0cba8873d131a9a73607523468357060f09412753cfddae24ef0dd9be037fb1e68dafdab3584e586c333c145b98ffef6311cccfb27e8b6efa7
-EBUILD fortune-mod-it-1.99.ebuild 766 SHA256 365d4c04cb9c9285fcdbc6041830a08dfad9e67413fc70cec27de0b3f4315e88 SHA512 ee9e5bd3944f528cb46fc713648ab0f68e588b073ae10cdcfb8fd6e1b28ab6b28da11fd6f2fddec2a1c2f1e37e9daacc0a47f0fc959b94bbd17a67c47fd38379 WHIRLPOOL 0b40c7d4e122e8cd639210856cf818c6c7460ac138d7f0439a9baec30a210942c3ad12eaf633aa6ddb3416a1f770f41ce330fa7c0fe7564fde0187c3070223f5
+EBUILD fortune-mod-it-1.99.ebuild 775 SHA256 aa69ec5e76769f91e4c4906fc466a3c5cd1019249535e033b87966992486b325 SHA512 967c3086b95883cdc613922393353cd18ffe392b70c4bd0855fb2bef8658fc808ebf8086ddb79065ac8ccc6db6f217dafcbd47d811ee8384586c7ba4fb636ee6 WHIRLPOOL 858ee23a997333c744ed7363309e4739839f1ea8fe5be90af90c941a02566a05f059054da1c1a262bea68f6aaf597a91f4b835a8f73cc20b0e5b299ed7f9202d
 MISC ChangeLog 2448 SHA256 69c630e99b718e234c8f40d9d173186fcc10bf2c5a2cf6f2f6ae0e5957b147dc SHA512 9f5345f8132737b806f0f50b3765dd8bbd80d75fbe873654fb8082cc70b0ef27e3a78a3d1c4a123b169dbbc9370a1c50733eb8029de7dc4f44ce16bfed5298b1 WHIRLPOOL 9d9dd6310463bf4650b2b87db100df98c9963e21dd61c4aff38108a36c71df0547a0a15a97dfe4f00c9381fd4e91fd0af260e9777ccd0d09caf482fa0cdce880
 MISC ChangeLog-2015 1270 SHA256 cdf8137c37d9fb01eae28393ef68cebae842735b17a57aca933493e5bcd2f4b6 SHA512 f54c4169f4ef887e00e4d3671b2e9151b282484f2db32e8d3784296ff0033ec0731d9af0d0f0e145e87d98cda26fb43c462b1d2f9f05cddcdab6ff210c331ada WHIRLPOOL fd0d0bfce9c0e67096b4260983fadfd3be39e4dbf7aa8eeb2bcabeda21266a5a8043a424fa7689b6670166967bf4ce5473c82f8047df6153782934e4cf383282
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-misc/fortune-mod-it/fortune-mod-it-1.99.ebuild b/games-misc/fortune-mod-it/fortune-mod-it-1.99.ebuild
index eaeb6e7745d7..b07a391496a0 100644
--- a/games-misc/fortune-mod-it/fortune-mod-it-1.99.ebuild
+++ b/games-misc/fortune-mod-it/fortune-mod-it-1.99.ebuild
@@ -7,7 +7,7 @@ SRC_URI="http://www.fortune-it.net/download/fortune-it-${PVR}.tar.gz"
 
 LICENSE="freedist"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa m68k ~mips ppc64 s390 sh x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="offensive"
 
 DEPEND="games-misc/fortune-mod"
diff --git a/games-misc/fortune-mod-kernelcookies/Manifest b/games-misc/fortune-mod-kernelcookies/Manifest
index edf4fbf305dc..34631365e97c 100644
--- a/games-misc/fortune-mod-kernelcookies/Manifest
+++ b/games-misc/fortune-mod-kernelcookies/Manifest
@@ -1,6 +1,6 @@
 AUX 9-offensive.patch 4789 SHA256 e8949338213744032d6d88e31b3989b0d518f10f4bb4b535435f400149ae6dfb SHA512 6bf0ae401b55b6e83523ad0b930ff06627499c9b45ba98687843b7d96ffea24dfe92799a581f37ed7d33efb951ab07157467f6034ad8aab9ee86df865005846c WHIRLPOOL 83800e6a5592b0656b4db5d48be5ac9df62ec114a06bd12a8ad381da946e1204924098978a3b6ee32fcbb8740c32b56ba98c14a863a763cfc7ec7739388a0d90
 DIST kernelcookies-9.tar.gz 8966 SHA256 f0e6539fdcc4992f61b01b445979860c54cb4e6e86ece9d5c47d91d2fd0ded4c SHA512 3d2601ad787928ef852af7d5833c5d32a7c7e364913d451e889eb883d4da450a989c0ff450aef4c07e3700ef3a87f535948d07789c7d2819305a6f36cded7aa3 WHIRLPOOL 82ba1e9eb04f081455e89600168816b1bc17d282eb61ac5e3867b5eade7f43959d14ff45e162d590e9fc254dc326fa5d146aa757b4ebaf09503d9c24f1fe1df4
-EBUILD fortune-mod-kernelcookies-9.ebuild 824 SHA256 b8d0fc9b16b270ab040b28708a88ead11ae72495ad6b0e56362e48713c02969c SHA512 07193bdfa0588b51e1de786a2bd4afcf6057f08baca0cce8b4316d06ce639d4194c7695a3dcc8d98ee076fd6ebae826449bd4ab04625fba154e96055b40c4325 WHIRLPOOL d08e17b93ec73e8b4030246fa0f2a5d6460c65c4cdb40ce96780be7311e35643a97ce12f5495639a672e917dc5d52528a4906f9c420b3bad64b1002891f3e90f
+EBUILD fortune-mod-kernelcookies-9.ebuild 833 SHA256 eeaaaf4b9be472f94dd3d774dac51ffcbe1c968bea6359063716d986667ff4e9 SHA512 7ba32d6f23a3efebd9afc974c16ddd149ded7d1e86623fedec2ca94d1a8b0f890276ddb3c3252e3428579c684a7ef06f625f942af02f9959c4160177ce6d2dad WHIRLPOOL a2f225ab60d5fe30b6624564d58a828d2cc126df7bf2e27dbb6713aaa9ef28a448d6809c17b52737e897d83f4cd7443284f60a9aa857b17e57e927acda2b3b58
 MISC ChangeLog 2501 SHA256 1bb62a7c4627c20a002e3b1707e553859910d0613019f3076d232e348b3564ef SHA512 49856b21b44c215b0bdbdf2418b0329efe73763d00727884641df5660fac88f36af16137fc93141eab1536f114df407cb2c440d7fe54b63acb6e3b2a3a69b16b WHIRLPOOL 620e0ec32098847fe1d764050c37edfcd23e654319ef5f3ca84a0bb174829b28eeab606ab4eca1727a78cc2a1f09081865bbbf0e667afb7e675358e69ed9134b
 MISC ChangeLog-2015 1895 SHA256 83975fa47ca84f02986655a7c96474ae63e30a93190a400fd3c82f3af4ecc673 SHA512 c42f1356e9849e44860234491cca783ab18da4c474a96f8db308d5d73951e3e01d4d635c922494b28461a26fd537bc85e801522de7a00ed460720908f42a759e WHIRLPOOL 1ea27fdbc18678d5b46067ab9a49403b3182a0eac0b3fec7b73f12414e88f3e544e256a2630e2dc5f89831603f0eed821b0a3aeb9aded941c00688c7533b91ac
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-misc/fortune-mod-kernelcookies/fortune-mod-kernelcookies-9.ebuild b/games-misc/fortune-mod-kernelcookies/fortune-mod-kernelcookies-9.ebuild
index 7f43cf165d4e..04315959a031 100644
--- a/games-misc/fortune-mod-kernelcookies/fortune-mod-kernelcookies-9.ebuild
+++ b/games-misc/fortune-mod-kernelcookies/fortune-mod-kernelcookies-9.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.schwarzvogel.de/pkgs/kernelcookies-${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa m68k ~mips ppc64 s390 sh x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="offensive"
 
 DEPEND="games-misc/fortune-mod"
diff --git a/games-misc/fortune-mod-mormon/Manifest b/games-misc/fortune-mod-mormon/Manifest
index ced91d7278db..9eefb4aeab81 100644
--- a/games-misc/fortune-mod-mormon/Manifest
+++ b/games-misc/fortune-mod-mormon/Manifest
@@ -1,5 +1,5 @@
 DIST fortune-mod-mormon-1.1.0.tar.bz2 4750745 SHA256 a8e13023fb3f9b7097f0a72d6dcb8b0b553a20b8062f069ef4fc291fff597089 SHA512 4684e63b1eb2b1fdb2fbe7241f971c9401777a8364333394db0929aca2ee57456ba30bd601df8d2a8077ad41c1aa71737e20806b79e8541d5dd942092be02d4f WHIRLPOOL 9678c4906d7f7404a5b4e16596a3d96b3a1f59658812fdef6f4a8c1daad8755b5c931749efb046ad7a624ba2eb7ca4856ee98bf00067b4d3b9e4c653039832a4
-EBUILD fortune-mod-mormon-1.1.0.ebuild 752 SHA256 6e83c1bb9259a7ae94b8f2f72550e56a71f4e52812d92dfc9ccb8c85ff73c625 SHA512 aed8057426a9e64d08bcd88d69b158bdb01cf320438c761520c18280bf99a2dde59f68901f7c15e24fb1c790756a08fbd7ed917ce6a4e9c0499a0b1444ed48fc WHIRLPOOL a09c321955e8f80c2e4b324317a2e525b997be9fe57d218dc244acad251f44f2da00923e6f8d633c7c043f58a7e491548337b58149c4733b5d5875b9cf0891b2
+EBUILD fortune-mod-mormon-1.1.0.ebuild 760 SHA256 613808fb289453b3016f03499e529d8dd6c8a5148de93e2b169c1d67b5544667 SHA512 b243af9a242b6846b407d0e7109faad19448bea47a34783f4b6da394085a511e5ed3f5118f525ffc05ed8a3a08d3dbbddbb60cb283f8ea1509d19e6d5512d204 WHIRLPOOL 742da48b74391f75aaae4ee2ece3c8e4b8d3166e6d31c746be92563b117047f3e77f71adc0e5d958b6ed466edf443bb4ad60a527fc6f05b311b9cf725233f785
 MISC ChangeLog 2462 SHA256 bf15a0f31794989758acc40a5397a8619b2442970af69834a26acb73c4f8efcf SHA512 7d279a13d16857352ee5dc4d45f5a935c483782e88625682bc33317a8fa17c11823f8f90573f6b14b952db65524364dff63dca17ab051e9897f97981a397e7a0 WHIRLPOOL 1631b37f48a4312f734ecc156001ad9438ff5b5876eb54f512e24916955f2ae0906d22559b735fffe26bfc178b6b31faf32a666d6a99a5a373aeb17c20cee4c6
 MISC ChangeLog-2015 1107 SHA256 33863488fb9053af0563a050007c55f96d52ce65937b858b119c5c3bed121658 SHA512 e944c028d9482090a9083bcfffa08f8081cf8eb5ae7aacce23c3a6a32f297acfec14f21a9c95818fe263b154a5e035a474150914646e1fbbbc11eb8226b933f2 WHIRLPOOL 7d7ecb6ce091bd457207fbfb69c332ae385ca6c718e1f4c268da9702cd4f5d7a22008a51c08ad70ccf9aff0bfbe32007fda00b86c4af03e56621cde4a1821b6e
 MISC metadata.xml 434 SHA256 652a7039d79874190913a6af7297a54548086c1949562d042c1448ad7a7d0e7e SHA512 4ac23fd0a13784c1c142bad8d7d0d32ddd8923bde4925fe1154d1622e667ed57f36dade59d3efce4a58d5db3ef17d1aa6cafbf151e840b9aef6ec22dd64c6a21 WHIRLPOOL a069dd69a55fff56433972be0ed4fe096460bcd78ef60f4a1ae7069a6c2ec03dde2e1250479406531585377099a077238cfe66e4a424aa2377c62bcf950ed256
diff --git a/games-misc/fortune-mod-mormon/fortune-mod-mormon-1.1.0.ebuild b/games-misc/fortune-mod-mormon/fortune-mod-mormon-1.1.0.ebuild
index 240d8acb4326..12e97acd49c5 100644
--- a/games-misc/fortune-mod-mormon/fortune-mod-mormon-1.1.0.ebuild
+++ b/games-misc/fortune-mod-mormon/fortune-mod-mormon-1.1.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/mormon/${P}.tar.bz2"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~mips ppc64 s390 sh x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/games-misc/fortune-mod-norbert-tretkowski/Manifest b/games-misc/fortune-mod-norbert-tretkowski/Manifest
index 3e99d07517cc..844e4c397aec 100644
--- a/games-misc/fortune-mod-norbert-tretkowski/Manifest
+++ b/games-misc/fortune-mod-norbert-tretkowski/Manifest
@@ -1,5 +1,5 @@
 DIST fortune-mod-norbert.tretkowski-20030120.tar.gz 11501 SHA256 4821ce57da57ca4bd0d15ab5f340dd374556facfc657661d044fcfd5d4b9534b SHA512 df4b846581d6dea55226d6e58235a288def209536f43766fa8b56a07e3a5affbb68e8138e2e01711878480550df322ed6999ef35a41330a58a2f516abc5db13e WHIRLPOOL 2ff48023e4c871d8d31812ce33cb3e4d65286c00011c0df54a27e98459f70c7964a93a2d6065ec5d68d1d9af1e45f30be20ab2806b1189d2999a8f0d419d34fa
-EBUILD fortune-mod-norbert-tretkowski-20030120.ebuild 630 SHA256 03d306779c6c2cc2899da228308e8ea90b95b01163b6cb5efbd1d071d95a18ca SHA512 00b2d80bc0a45fb6ae31573a4ae8757fd813357e032acde995b552f6bdc49faaeef12af0dddc30cb64188b3ebf77ac5629ad5c49a1d7754a49ddac73d6bda9bf WHIRLPOOL a9c1f331c2912219c83c6460ec7b249ed004ef556986e6c90d3e47878601a4b23856fe8331198c957e0dba2f2aa5fda5aa9b118a2bffb32917cb93a3f05f4bc7
+EBUILD fortune-mod-norbert-tretkowski-20030120.ebuild 639 SHA256 59c784709adc8bcd584240baa8b79fd2f0ce5c1edcfc078c2814b261bcc0a9e0 SHA512 553386187ce7701cfacc7a63f8fdeddaac82740576c50965eab8dc9fac59e2742e6c4b61875278238c273effb0fde0e47e1b6345dc95df439c1d2939aabce511 WHIRLPOOL e9ce1e56f8b1a802e0e0f681157f7780a15ca1cf2a0970dbe601ea0c27f65d31ba74ddbaa1d576f282b2a1ea5565796f5607e9b1155c7c00ec7595e6ce1789f5
 MISC ChangeLog 2504 SHA256 fdbae620c65c42d28e3ed01b1c17f02a74b2e8b614fe626812ae5d36c0578c10 SHA512 67128e1098654e89183bd9543d475986a1fe9d945f0272c707f267b9d07535a46e87c4ff75c27b86cf6fe5cb7d42d85dd6a5a855d773bbc02ff00ac6376c8761 WHIRLPOOL 3be474ff8bed7979797e2391c0f6a45f22df38c0e36800ab12ae771b55cd774661274540de4951af07718c57d2132a87c6b6043093896fb3f9b9463269dbdcf1
 MISC ChangeLog-2015 1604 SHA256 c94dec9d97076554e13da2ce1ec7d98c6685c2b370745e56c1f3122b8412c1e1 SHA512 374551ec721b5286af491afdb6ef35d8035571ee798bfad297dffa82edeb3032acfa366c1954694a56d9e177b059eae86cd0035c093e4765f7efda719258efc3 WHIRLPOOL fcdcd69a439ddbc12117ff66192ff33dc0b720118ee4076ee9b33d3f7b67d7aa1929cef2a568f990cf46590b02873501215a8a381053278274761285994e8a44
 MISC metadata.xml 338 SHA256 4d20692076279c391d84bd9fb2f5051441a2f96915c935834333dccd8e138589 SHA512 eafdde3a9e9cc33fd4dba816289aaf3dd0527f139ddc5cf76eddc13736d7f32277ceb23d86762d7ae8167f05942eb985756da89576dd87be69c7642469d2aa3f WHIRLPOOL 34be2722a38fb7fa26dbb85de90e6b36c9f621ba1e05341136252a555556c79672701c770e714d0dfbd203658799f140ce392c4a65a31183a030732b4898b9a0
diff --git a/games-misc/fortune-mod-norbert-tretkowski/fortune-mod-norbert-tretkowski-20030120.ebuild b/games-misc/fortune-mod-norbert-tretkowski/fortune-mod-norbert-tretkowski-20030120.ebuild
index 1025b68fa266..5d2e9d7a668f 100644
--- a/games-misc/fortune-mod-norbert-tretkowski/fortune-mod-norbert-tretkowski-20030120.ebuild
+++ b/games-misc/fortune-mod-norbert-tretkowski/fortune-mod-norbert-tretkowski-20030120.ebuild
@@ -8,7 +8,7 @@ SRC_URI="mirror://sourceforge/fortune-mod-fvl/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa m68k ~mips ppc64 s390 sh x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="games-misc/fortune-mod"
diff --git a/games-misc/fortune-mod-osfortune/Manifest b/games-misc/fortune-mod-osfortune/Manifest
index 3bba97e935c4..90552fd3c309 100644
--- a/games-misc/fortune-mod-osfortune/Manifest
+++ b/games-misc/fortune-mod-osfortune/Manifest
@@ -1,6 +1,6 @@
 AUX spelling.patch 6416 SHA256 20c67fcfddfd9747316cbac1f07e4de9384bcfc5626c56ffabc2512171b25c17 SHA512 657c015bf53105a12981308ecae9fadd9e76892d1f1010e84c48b391b2d37e180d60a0e959f5ce30969ba98fa3733e63fad5a6079950dc93fc48a45c24dede6b WHIRLPOOL bcb6b177ec92aba9cc896530f99044763100edc500b905fbd7de2ce9ca6d2cb8407df1f7c15c209543ea779f45a584ce0b7b52f58093a73f0c60cce6ba269fee
 DIST osfortune.tar.gz 3097 SHA256 a802f3f4e7983f33c47f0548fb82111bbfde97fa722ae78b4d8c0c58ac8ecdcf SHA512 e78f40bbbbe94bc70984f01bc4be9c44a15716d60a526797606a6f38fab3533a0cf428a473e479479a7db2c391e44515294519b24cdd3bda33d82c9081919d3e WHIRLPOOL 5dbf1cca2e3a2d7daf658286728705f8e32f11b40cfe89e5bd561b31dbe748575503d6c39f0b76a1c7e525cddc855ae1c76979217b6286aa597683488e2c0262
-EBUILD fortune-mod-osfortune-1.ebuild 679 SHA256 eaf6a6dd7709e2aa0b36e25ebad9872ac813cc5266b3e530e852c6dbfbee3430 SHA512 facd03417f1a7b9d8acd085688a57e61ba064c100c5f0cd2b7f0becdc6cd75d9bd022f338ef0c91bc2d9ee9e9a83aacc6238702dd10f7983b179f107f3713e71 WHIRLPOOL a1eeb2a9444e556698681ab3d2de9673347a177e3ebd4cba0c69a3a1fe8fb169679171f3aa079e411d4335b50fbe0620e6f152d09c7b0fa26abbd62573b66347
+EBUILD fortune-mod-osfortune-1.ebuild 688 SHA256 8ff1510ff32adf61af30936d3b6f1cb7cb52fe904f1b0dcc0f80ada576bd008e SHA512 e88ebd8419880e3b3cc62a6e00e93f63cadaf3b8862101a0afffe5a901cd1b4d06be868f4afa390ad7b44073b02218f0a6e153b22d0473adacee8060d8344ee7 WHIRLPOOL fa57bf43789123be22bcb2fc115d955d8b6f7e49491bb0765d88d0c2c092920020e2292d20d4ffc5e8ae7bf4b6cb217195d78efdecb27a6b718f8b094fbcaeb5
 MISC ChangeLog 2486 SHA256 d2ee0b2e53e624a28176b30fd9989464e48388486ee62f45d911240206b5cbcd SHA512 c771e2116ce0e1532eba3bf4ea9f223f1332bf6e38baa0c57d18461df534c8eeb1ed608068fa84c822cab6e37eb0f09602df89e7db95ed8e65842eed59b4e188 WHIRLPOOL f003dcebdd54d49260e3d17a7166ec3ba0d22a7206a02672e01ea97ab8c83153e75b67d254ef0cfa7283643452765f92d7a7f24c31786570006f87ae4a300a39
 MISC ChangeLog-2015 1543 SHA256 816e5d6a102105b6445df277720006bc4c487ba645977cb9f216906812b8c76b SHA512 e17fe4e2a302df0fddb7d8ed0c4e4f1eeb6460c96047878c005d130bba668dd6ba1e8e1b669a1919fd352ae2caa0c2a42245a915f628bbb4a26d6832efc87827 WHIRLPOOL f27deab31a451ff2a539215cdb1c545caa3e6e4c187d8cf9a679829f94285c476babbbdbbacb9dc2e39fcfd7d0f8756db69e0b93e23dfd69411cdbbb469a84b6
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-misc/fortune-mod-osfortune/fortune-mod-osfortune-1.ebuild b/games-misc/fortune-mod-osfortune/fortune-mod-osfortune-1.ebuild
index 1d5dec303346..03380a46e827 100644
--- a/games-misc/fortune-mod-osfortune/fortune-mod-osfortune-1.ebuild
+++ b/games-misc/fortune-mod-osfortune/fortune-mod-osfortune-1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.dibona.com/opensources/osfortune.tar.gz"
 
 LICENSE="GPL-1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa m68k ~mips ppc64 s390 sh x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 DEPEND="games-misc/fortune-mod"
diff --git a/games-misc/fortune-mod-powerpuff/Manifest b/games-misc/fortune-mod-powerpuff/Manifest
index e8d54fa7a22f..58d1a7177b4f 100644
--- a/games-misc/fortune-mod-powerpuff/Manifest
+++ b/games-misc/fortune-mod-powerpuff/Manifest
@@ -1,5 +1,5 @@
 DIST powerpuff-0.3.tar.gz 17155 SHA256 90889d5eef1ff91819da47de46d1f46243f8ab252303a1f4c4c862bb05668142 SHA512 89cf14ce07217bcff57fe5eff5b13b6df53b76ff866887032730610ac23184b4bc7d9f00572f31581347ed3827f3906b5dd885324d0e8066a5e0c8a098e53ebd WHIRLPOOL ebf8907c6fcf5b1578ca74c6e3433789bd620cfa9799b865d835e9be58609632fa236b77248527012f436c410c6ddf110cd549cde8f741e69d711506d293c5be
-EBUILD fortune-mod-powerpuff-0.3.ebuild 644 SHA256 cdf681dbb7d9aa9ff67970c4a89865fa26398e4443b2169161cf82f88aaf3978 SHA512 6d705553a1c54ba5260d3b0cde86df3cfc99a7031fa41de35ed431b79f7ab7265963b89bbda586a0115dd08004aec08ef920e185cf6d2581cee64001d6de393f WHIRLPOOL 91f3901f7416a9ace72a46bd4a80eb2abef510c0cffc7b98df140295ca882b5ce430a4dd02ef28df698945fca4e1aeed9e6a319c6242896226a1831cab4fa5ce
+EBUILD fortune-mod-powerpuff-0.3.ebuild 653 SHA256 e7f1f25243d50de69c338f2161bbd2ec255bcad10b0e92456dce9b121ffac2c0 SHA512 8987722fe97ecb6d5a452c84fcc1efe433fb2442b8d140cf9bb90938004f6348583cd1e6020de098dff3ba60af4f9e58ef84e3aed27a9e28e9b10da4187d336e WHIRLPOOL 54a5b7cf9d92d99bf2a086ee91c21f2f71473bcd2101f1a28195d6b317f1dde22e74ef877ebe9fab284e490d0cec8695d87e1bee18e460704e5e9780947c1d38
 MISC ChangeLog 2467 SHA256 595cf7faf369b3839a175bda227ef506f8d1d4839c4b7a998f18b805c3529130 SHA512 89926f5c94157e0c0cde7f859bafd1c956940acab760fbcb722e3b9d78d76670c29b95de9d26fad620760922c49a05b77cbad048d956520f447f99243fd53231 WHIRLPOOL 7c630b4c1f6d4cee3ad09e7093ff2981b631d2b628f7edf1d8d9536bb774ebe177069bd6e14b4494fc48d9e8bf9183da13065776dc3d02144ab0e9745fd72540
 MISC ChangeLog-2015 1041 SHA256 50e8b0651358c983a7e589117564d9f608315d8a7aafe9531e1ee0f1257ae66a SHA512 aec43c37589c5a0f5ba079762ae0d63c9d18a70dd17bdc77e4085c7c47a6cfde97fe49810a98306a9a1cfb5f197ad7610f9e3b646442b66470c1a2f079fe33d6 WHIRLPOOL eab1e0f0b8c10231c2021866256deb83c295270a2b3d332c469a252ec2a8d20cb951175c9d396595bdc54511ed56cfe4b2e7174901a9fecd3856432c21c0a93b
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-misc/fortune-mod-powerpuff/fortune-mod-powerpuff-0.3.ebuild b/games-misc/fortune-mod-powerpuff/fortune-mod-powerpuff-0.3.ebuild
index 865437049a51..5600d8997bc3 100644
--- a/games-misc/fortune-mod-powerpuff/fortune-mod-powerpuff-0.3.ebuild
+++ b/games-misc/fortune-mod-powerpuff/fortune-mod-powerpuff-0.3.ebuild
@@ -8,7 +8,7 @@ SRC_URI="http://eelco.is.a.rootboy.net/fortunecookies/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa m68k ~mips ppc64 s390 sh x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="games-misc/fortune-mod"
diff --git a/games-misc/fortune-mod-pqf/Manifest b/games-misc/fortune-mod-pqf/Manifest
index a37e186ded28..37c51f86f67f 100644
--- a/games-misc/fortune-mod-pqf/Manifest
+++ b/games-misc/fortune-mod-pqf/Manifest
@@ -1,5 +1,5 @@
 DIST pqf-6.0 146363 SHA256 43823e7ac07a6c75d84eee8d99b1d84d014e2faa12c1df07691ccf53d3ee8ad3 SHA512 c38be09c945c20454cd0ca4d1a4dce18b40bae1ed2c71d093c7d9e4fb2de444425d50a35c7dad5535ed38b5ea52c6c9e8f6035221c08e0485145fc169cb9186e WHIRLPOOL d0b804be7b6b18ddc37afa3cd1b6ef6a3d7dfd123827584bd893a47b804148817fc9ea78a8298ab83bd6fd1d6748e32ee60705317950a19f97f370d76439b15c
-EBUILD fortune-mod-pqf-6.0.ebuild 747 SHA256 03ebc1fdb310c45b7373a3100993217cea41643b9240f240a04cb49dc26d62e2 SHA512 d525f169018176192d07d1817f272cc60918f4b060e2f2c68456df50c478d82051fe33582cea017b2d5f3c654e36fc3a880a059747b4b87a52b8adf838214dc0 WHIRLPOOL 29267bca76928954ef6be007786e773d23734a4c6bc69d0b39bd6d79672814270255b4a304eefe8be8ecac2a2657a3f291e4ff3df5290d59f5b6414fcfdb783d
+EBUILD fortune-mod-pqf-6.0.ebuild 756 SHA256 cc2db13ea080af74b5f9d76537e3fc67d7c39b952928ac322a8998208fe1d7b4 SHA512 0d512cfe6f18da1efb2ee9585a74eca9d2a7494faee4fc1e6a6f4dd9d4aae0bdae0a3f8357654579849675b373b6be7efbc4e09d4ec7abefb186d84519e0015f WHIRLPOOL 76ece3551f0284064eee8b466190347b95c070b5b5f713dc210a491c476c265731f10781513f57aef775d41ac6d2d86daf46f74e4b66ff47a4a7bb6152fdc793
 MISC ChangeLog 2449 SHA256 fadc4d717f91a8eae5ca8b6061eb25d4d08cb23112056b6dcd0d67b25e3ac297 SHA512 f50cc4d8fc0aceb01e8e81b73aed9d9e79769d27dc358fd4766c7d9a4c082b39015a121feab9ed66c351826462b5ce9861da51c74c2061bead2816ec5fb0be3b WHIRLPOOL d38904b661e27c12ac2b76b962ccfab71f752dd8cd9fa85f65150ab0ad1519a606e0c0e108f3718864744e4d8c23241f797a93aa984f8825aa2387e4abb78027
 MISC ChangeLog-2015 1245 SHA256 b71de102fd59728f86f7bd308687d0ffd14f56086664c66b6a33eef8ea97878b SHA512 5fd8d70b8c192742fa7e68ef46f3af007c8def22f55419523f82f8e9b8a97c51301b2b25b2a76e4bc0ded1052e6874314155ac3ee499b12818d24464553783b5 WHIRLPOOL 629c22ef7281f2d3acb3e4ae0e12926ff06d931cb0a5d360923ef89aa6e7b59b2abde81241be904b3c4741ed0aa6cc30bfcb3d36bb1486e396fa672f326afb99
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-misc/fortune-mod-pqf/fortune-mod-pqf-6.0.ebuild b/games-misc/fortune-mod-pqf/fortune-mod-pqf-6.0.ebuild
index b0820c22be49..0a320edcec9b 100644
--- a/games-misc/fortune-mod-pqf/fortune-mod-pqf-6.0.ebuild
+++ b/games-misc/fortune-mod-pqf/fortune-mod-pqf-6.0.ebuild
@@ -7,7 +7,7 @@ SRC_URI="http://www.ie.lspace.org/ftp-lspace/words/pqf/pqf-${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa m68k ~mips ppc64 s390 sh x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 DEPEND="games-misc/fortune-mod"
diff --git a/games-misc/fortune-mod-rss/Manifest b/games-misc/fortune-mod-rss/Manifest
index 6d1ae8c2a8f9..4901000678f6 100644
--- a/games-misc/fortune-mod-rss/Manifest
+++ b/games-misc/fortune-mod-rss/Manifest
@@ -1,5 +1,5 @@
 DIST fortune-mod-rss-20030120.tar.gz 27294 SHA256 c139486c104103d4b5ad06163c737c055ab71fd22769bc9a5c279710dbd14171 SHA512 65e3c6afe338bab19fece7111d37eb32270a374b0e62babecb4954bb7209054a6f18886ae67f502f29d148d2ce5a60d3ef401233d91caf765a0ade0d3f5478b4 WHIRLPOOL 2b3907acdb00b3da43e29779a51b74fb6527af762c964664b3f615db82874e51ddbba0ce9e6b9354b5a47984761d3bcce9cd8aebfd96ae58883d5ddda0331b2e
-EBUILD fortune-mod-rss-20030120.ebuild 544 SHA256 69626cac66a1ffd620d34f41f113ec9148beeab5e5060a4e3fa67a600b3dba3b SHA512 8e42ae676790ad9b6da4782633eed5ed44a4536d6f27bf4468428d6994066f9a3ad8c5539ab51e568ae9c2abaf105a7e378dcd97f813244c7f586db055ff7626 WHIRLPOOL 2494619d58ada1081f9b069fad7de382bb0a475b40e621b4f33f22afd1ebe91e729af6657113553dc5e4ca2b6680f5d0b6ab39528bdbf029e98e2dd4c4f51377
+EBUILD fortune-mod-rss-20030120.ebuild 553 SHA256 1568da7be6299e476a7bdc0801f17e964467106d0c04aa2f48fdc5f0a5fbf1e4 SHA512 49a61f380a0516d960020cd57de2a5570ced9f7acfda9350f83a84fadc9377269523d51fd89ceb7aa7a6e0c75efadbf07636162a37ec1ffbd1c6b16998953924 WHIRLPOOL fd0fa9432fd1cf2c879b33ba0342bffb034c79c903ed4f787e90f8a8bffa3ccc7892f46f4740ee35bb3a3aa91048c92179f6e6457e7a64bf732f4c4a9cbae2c7
 MISC ChangeLog 2459 SHA256 fc67939cc34e2d5b6878fa4d99184b2f4c66986ed2d2015325168334b6ee0be4 SHA512 e2f6f194c5138f968fb66a0ced31bc537b2695924650bbaa794d2d9567b72f2f3765c6671318f936fe028a38a5578ec908caaa036fdeb7cd3d96802e05c6c22e WHIRLPOOL c4857fdbd433abe1f3cfe8cc7923a87b3c28ce3b9069cf9464ac25ef77b95903d45b40a620c1f1d8dc9ea21606c6035903e2c9dec35f93e85c9046471f7aa5d3
 MISC ChangeLog-2015 1422 SHA256 a0eb97f511f00f050c4920058f97226cb835290c044ea971d080790cb037e879 SHA512 3f760a9dded2313af0505954e08d848b2326342534c28078095e6f9e8d9d3e577991f737a41fbed943fea8767d54ae08f62a6e74aef6ea2c273ebb9a4cf4f1f5 WHIRLPOOL fa359bb2ac057069efca37c5bcacbaeaacf59608bc7e7cc5bd4e86007b9ab7f9394828e6189e9f5bc365fc3197d54dd3abdd165ae38e5da8d2f62d735609d002
 MISC metadata.xml 338 SHA256 4d20692076279c391d84bd9fb2f5051441a2f96915c935834333dccd8e138589 SHA512 eafdde3a9e9cc33fd4dba816289aaf3dd0527f139ddc5cf76eddc13736d7f32277ceb23d86762d7ae8167f05942eb985756da89576dd87be69c7642469d2aa3f WHIRLPOOL 34be2722a38fb7fa26dbb85de90e6b36c9f621ba1e05341136252a555556c79672701c770e714d0dfbd203658799f140ce392c4a65a31183a030732b4898b9a0
diff --git a/games-misc/fortune-mod-rss/fortune-mod-rss-20030120.ebuild b/games-misc/fortune-mod-rss/fortune-mod-rss-20030120.ebuild
index 068d9a7f58fd..950ccee21fb7 100644
--- a/games-misc/fortune-mod-rss/fortune-mod-rss-20030120.ebuild
+++ b/games-misc/fortune-mod-rss/fortune-mod-rss-20030120.ebuild
@@ -7,7 +7,7 @@ SRC_URI="mirror://sourceforge/fortune-mod-fvl/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa m68k ~mips ppc64 s390 sh x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="games-misc/fortune-mod"
diff --git a/games-misc/fortune-mod-scriptures/Manifest b/games-misc/fortune-mod-scriptures/Manifest
index 259ce61d2734..5b11519195c7 100644
--- a/games-misc/fortune-mod-scriptures/Manifest
+++ b/games-misc/fortune-mod-scriptures/Manifest
@@ -1,5 +1,5 @@
 DIST fortune-mod-scriptures-1.1.0.tar.bz2 2621853 SHA256 79923f471ec22c83894ec2b9c6bb3a1e7c2291774e68029ab1bbe909697ee3ee SHA512 dc9c98c3f7924c9a1775955a8d1f972035cea27a7505bf51aac9c1ffa323e1447287ec50472f3caca16f31f1a2d2cdc1a17b5b311eb8e5a9746124b19a1d4c67 WHIRLPOOL 7801e1328180caa78422d0e306d984aea06ca7783ce8c3ce71694cb081c0dff6074aa5f476a7e78d2bf3f331666774a62517b3f337ea672cc53181f1f85ccb7b
-EBUILD fortune-mod-scriptures-1.1.0.ebuild 560 SHA256 fda292d0eafe7dfdaf45aee57eb91cc1bac52642b8c2aec8fe50db0d9d7d7d3e SHA512 31fc5e23d63b1d1f396bd521de59fe8eb841181a8379c5e09fe91fe25a13aa0fdd43deca5a4bf4b2e3551306aa1542dc3b949fd8f506f9c9e0a888277da29767 WHIRLPOOL 7699e4d4f618353bed4a4d696c801d9e3d462e18fc9e9b2376b7e80156c15bf3b583a4592e825a2c6b07a2d5f9e1039440b2f5007a8b2f6646bf0d70d561b61a
+EBUILD fortune-mod-scriptures-1.1.0.ebuild 568 SHA256 71b45df9782791a311e2f00f96feaa595f4f1a1f92cc3b1290122541f0f66e9e SHA512 cbd7e35302acb9924c880445968cc72f9cac0a9f483cd8eb885bb423c4e2cea9383f2d14244d52415c96b8c07bc04671478ddbd457084f672e22fe0a615666e3 WHIRLPOOL 7fc87519ed4d44d0b36d5bc9b7d063503a8eb8f62adcef0698273568ce2a72a5609e1aa9d22e8f897c19d54478823c4937dc42013447eb8688370269c2715437
 MISC ChangeLog 2474 SHA256 750c81c68ba2ad36f63a50abd4f9c19e989c7052d1612776b38513b80cfb96a9 SHA512 79ea1fed6c268bf288c599ee6ded38e5bf6413d8e4efe828a3814bbeee52cdfa97bc17b8f3b5a0b1a156cee768728ec8b35a95add73beb3582f8f902ce0432dc WHIRLPOOL a34a6383832dc44bfcec71385ca020a0ec02aec506ec136c98e0353eccf53106814a84d7625d515669f19b9fd95a840aa7bfa525db343f3010a392b092787437
 MISC ChangeLog-2015 1104 SHA256 102be0c09a1c3dbb32bcc4106e503dde533d72c96012db75f30f8d0b4f3bd8ca SHA512 039e247ce65d2da36971e66042daa96bc2b5e63fbd2b293e1ca486b46eec06fcad3b2d7b269503f3b1ed36d9fec844bf673ecff38e21b67b32a0fbee088d0e1f WHIRLPOOL bbada097703d5c0955badfcf6bb70e6862ffc4bd0993df71110e5243c93728d08365bc0c495e9f4e88c827519250f01ea5e7155aa27ddc76429a0d59bb4149bf
 MISC metadata.xml 434 SHA256 652a7039d79874190913a6af7297a54548086c1949562d042c1448ad7a7d0e7e SHA512 4ac23fd0a13784c1c142bad8d7d0d32ddd8923bde4925fe1154d1622e667ed57f36dade59d3efce4a58d5db3ef17d1aa6cafbf151e840b9aef6ec22dd64c6a21 WHIRLPOOL a069dd69a55fff56433972be0ed4fe096460bcd78ef60f4a1ae7069a6c2ec03dde2e1250479406531585377099a077238cfe66e4a424aa2377c62bcf950ed256
diff --git a/games-misc/fortune-mod-scriptures/fortune-mod-scriptures-1.1.0.ebuild b/games-misc/fortune-mod-scriptures/fortune-mod-scriptures-1.1.0.ebuild
index c718e0dba047..91b61e840cd7 100644
--- a/games-misc/fortune-mod-scriptures/fortune-mod-scriptures-1.1.0.ebuild
+++ b/games-misc/fortune-mod-scriptures/fortune-mod-scriptures-1.1.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/mormon/${P}.tar.bz2"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~mips ppc64 s390 sh x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="games-misc/fortune-mod"
diff --git a/games-misc/fortune-mod-simpsons-chalkboard/Manifest b/games-misc/fortune-mod-simpsons-chalkboard/Manifest
index 114e0f23cacb..af9da06dcafe 100644
--- a/games-misc/fortune-mod-simpsons-chalkboard/Manifest
+++ b/games-misc/fortune-mod-simpsons-chalkboard/Manifest
@@ -1,5 +1,5 @@
 DIST fortune-simpsons-chalkboard.tgz 5803 SHA256 8cfa7ecec784314b90b46531943d507c8f556c96008c8dc44089f016e5504b35 SHA512 0ce3e8fea577f018d933c64aa3aaeac859ebbb9d0faba28f6c1f5f330781109ad43f4e317281d75b95f87cdb6476e6393219eff5f7ee5201219ff7e007452255 WHIRLPOOL 7331d08e1b9904c66270e875f2b5e4dbb937abec96fd0f55e5801e52500b0c4dc5c92a188ec1faf2ff7b372daf6c1ffac8c7ecea279838acb3bf9d6727b69609
-EBUILD fortune-mod-simpsons-chalkboard-0.1.ebuild 685 SHA256 90f86b076fa2447ab81cb07b8fe05cb9f79e662b158c2ef8f0d719d25c634876 SHA512 a29045d7b2616f27b7aa4d2e369de6054e42131aab7034ac4f72847544e78ce607270d0b409cbd40d4ebfd12513af83d99e7853d13036f55cdeefb79c812cd2d WHIRLPOOL 5158f24890ee3ae82e9aaaa33856c668101db600c5716acb1a68a453871f7283fb27792d3e39fe9ea8c00f31893bd0bf6f3956b79385445bcf7987656c28cb3a
+EBUILD fortune-mod-simpsons-chalkboard-0.1.ebuild 694 SHA256 179bc289f4ee356d7a1f060cb6389c14f056ec5d4d05eb6d146a64aec37ab094 SHA512 6eed00757b4b186252558931ba93442a6bb96512e57fd3e2bc0096cb142a0c0400b71f9ae7ca70c13ed3c3f388031a288abc698cb10789b0ea7217e2e7c5be49 WHIRLPOOL 0e431b8f9a9adb5a46136347d55e42c091ef4c5173b05dd13ea2c0e6cac1365257ea84b2f385ba3273039dd020bc3241f2535cd8aab195456df427aacc7a87a4
 MISC ChangeLog 2497 SHA256 b7f37d2b5eb1a7d067c26d42d96e61c12cfdd0fbfe8e8c9108854c4f5e74e552 SHA512 414937c3851dbbf85b5994ea0a89783a81815f4a50d97bd8932be7e8618604e4890317672043da01f1d012a861e2eb1adc3e6c52b1bf55a561051e87a0b011ab WHIRLPOOL 3754b92a76c214b2b35d9a67863b2380d465d25843dba98b0ddc168dab65ab327d3ae401e91f0b6d08c4f40a6c6d19981a39d71e18eda4a0dc4b4a48663f4645
 MISC ChangeLog-2015 1457 SHA256 848db2ec4fd4d8e3a80dcb087853806b745ef0fe019c8556ff39ab57d0d8510e SHA512 aedc5ee77a65f95273ee7cb281cb81350c8ff679b262473d177e2db64a36cb2007da7f6b67f6b33ccd2a95fc5808790f90e6da8d2bdcb6c3e8f9b089165ea8c1 WHIRLPOOL b855c010186ee31aa34d1b7b44134bf28056f440b43fe72a57ae3188875f239920b0c4abad9ce0b8efe0883b4b040fec782d235da456a1e171d2df38a2d11f02
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-misc/fortune-mod-simpsons-chalkboard/fortune-mod-simpsons-chalkboard-0.1.ebuild b/games-misc/fortune-mod-simpsons-chalkboard/fortune-mod-simpsons-chalkboard-0.1.ebuild
index db8cb6cf0006..75446351df91 100644
--- a/games-misc/fortune-mod-simpsons-chalkboard/fortune-mod-simpsons-chalkboard-0.1.ebuild
+++ b/games-misc/fortune-mod-simpsons-chalkboard/fortune-mod-simpsons-chalkboard-0.1.ebuild
@@ -8,7 +8,7 @@ SRC_URI="http://www.splitbrain.org/_media/projects/fortunes/${MY_P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa m68k ~mips ppc64 s390 sh x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 RESTRICT="mirror"
 
diff --git a/games-misc/fortune-mod-slackware/Manifest b/games-misc/fortune-mod-slackware/Manifest
index 08938111dca6..4d5d69362791 100644
--- a/games-misc/fortune-mod-slackware/Manifest
+++ b/games-misc/fortune-mod-slackware/Manifest
@@ -1,5 +1,5 @@
 DIST slack-fortunes-all-1.15.tgz 122880 SHA256 37dcfcf5c536b3aecc8f40363d36fec0fd188d31917980075b27d1790a6afff9 SHA512 18c756b2d81d1e2f0f031c3f799c872b5e73ccd70b6df976644fcd657bd181d794b1a977a49554fe806aa595046c10f33ebea1dc70fccf5e58b8df15f3db7c3e WHIRLPOOL 797017427f611872a39d70bebd1ebdae6f5b24933c246b17c252bd4a6ff54a63919fc798b20da087a2392a3ecb880424c1775a052ea216d67e0fa614460bfce6
-EBUILD fortune-mod-slackware-1.15.ebuild 1113 SHA256 4dfc69e0f9afe410434327dbe01bee0d745e5addacd5525f7ec26babdaddc504 SHA512 d9d2d836717794dd04256bcecbbe947b14009eb6201f36892ca9a8ab04e961bccf7c4eacd1f2521569acb990eb5a13956ca214e14868dd881574de4130315f34 WHIRLPOOL cab6d1bc66199c4a8f65131e2b5945703c5b036fa3a04f3b548e33bef235edb3c24dcdb7c099b428624ca5622c947db87c3d04544c44a8f53f9c6851c6eba51f
+EBUILD fortune-mod-slackware-1.15.ebuild 1122 SHA256 0e653c1324c3f9c6833cae2cc7ac9e21ec5bd903417790c4778939f309b924af SHA512 097feab81263645337029e40919e92b4dd34a1868b24419880cbc4e612b0e30c3444593caac4756a6828cd3c012b3b921a4b727170e5072193805612c686fc4d WHIRLPOOL e61ed1158cdf71545d37dac02af5347e3df2d849c0c62391f335f92a36c5b9f0a769d68862244b70b0ecd202b6b198b8fd59084a97d2777f10e7f38f66cf4f24
 MISC ChangeLog 2469 SHA256 a057c8d8e8e96e0eb5cbdb4037abd28a80fc6d6d2ba2a1d32368988ba8f340a3 SHA512 0a93ca4f6aaff71742543f9f15b2217194c478ddff77fd88ef58b6bd680cece060e361b0dd2f6cdeadec6ed882570b4c2bbe3d617e48962a223064187439ebe0 WHIRLPOOL a02d1aa9825ea9b3b851b4dd0171623b9893a2321cee0b50241955b8253815c690609b98dcce9f7dfeb3b635a1841e433b2abd2d4ccdc4adf647f44f56f4339d
 MISC ChangeLog-2015 2159 SHA256 db84039ce6002fcb67635055831a9a23a0b4f41403cbf07f024c98c849132fe3 SHA512 49db792cea3ec7e9e0eeefed1c08914bb2e4357db3029a002cf180e913f6594017614ff0cf07314a44ff82faa5e38da0ff70ac2bd30faba1de3ff61be0944fb0 WHIRLPOOL 19620dc6f5a83904506d8659c30b371072930f110c0d9ae19b04835aa1fdd93ac9b6e026f02027c237ceb4ecf37c25b58c87fc5a988674220a1e650bb01c3b5a
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-misc/fortune-mod-slackware/fortune-mod-slackware-1.15.ebuild b/games-misc/fortune-mod-slackware/fortune-mod-slackware-1.15.ebuild
index 571a30bbeae3..9267430dc24c 100644
--- a/games-misc/fortune-mod-slackware/fortune-mod-slackware-1.15.ebuild
+++ b/games-misc/fortune-mod-slackware/fortune-mod-slackware-1.15.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://fauxascii.com/linux/data/${MY_PN}-${PV}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa m68k ~mips ppc64 s390 sh x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="offensive"
 
 RDEPEND="games-misc/fortune-mod"
diff --git a/games-misc/fortune-mod-smac/Manifest b/games-misc/fortune-mod-smac/Manifest
index 0bf332a44419..1aeb3ae02190 100644
--- a/games-misc/fortune-mod-smac/Manifest
+++ b/games-misc/fortune-mod-smac/Manifest
@@ -1,5 +1,5 @@
 DIST fortune-mod-smac-0.1.tar.gz 22205 SHA256 a22cfbdfda9073aaa6ed68e0559f6d99447060dcab6a155f122b49400a0d2942 SHA512 cd837bc96e02f46b310ca264439e6e3753975e0613f05b41faf95fc2d9067f42b62a5af448586befd22e0b1c5e30754a4ae4bd34569c9bda434311ce82ac6697 WHIRLPOOL 300ce42b6553e22528ad8d8e6aafa2f0ef9a96cfb97d251b402e9ae6d67bb6e29caa3d578447f5e7f76dee351dae2860c287bc1ade90eade5dbd0ca4688a94e0
-EBUILD fortune-mod-smac-0.1.ebuild 550 SHA256 98d01bcf1db3b9f08fe87e335cda59155efdf4587bb48766261c0c9db7ccfe2d SHA512 845b3cc7147c0b6975ecaea5d8296c93bd4b2125a67b54011d922a2bb2989b96b3a0cf20b58d2454e68f487a89bf35e8a84425cd2368d71e28b83027929abb67 WHIRLPOOL b2aa973a44f187d31a60cc4bc2ad3aa9902ca3da6faa337770b2379bc163a96024b5989f3dbf96e0e20426426191401ea697d74fa78d97714383a95e738dcae4
+EBUILD fortune-mod-smac-0.1.ebuild 559 SHA256 17cb4398fa0d63d77863a8ae934322feeee33a6fdd0bb7bf1a33a7250935b8cc SHA512 7cd9bc834d2ca2bba89cd0aa77fd07beac0916d636ffdcdd490d5d831437388c4c94591cec9973fe747796c80e246c11c63dd6687c6acd343ff52f5236cc4f56 WHIRLPOOL 920fc8e63eb3c83711d06dacf275ce0b6eb9b4c9a594120e14cd60e1d06ac768c91cc13a09a2d8232bfbd3bf48b7a743f60c1a7adfa07b04ac70f19973cd3573
 MISC ChangeLog 2452 SHA256 08e987bfd1c2cb5a16a6c9fbfb3cbfd56648102ef6d183c4ecff0d6d25d68251 SHA512 64e4eb4d2791c402f6110c2bd5fdcf3633bb7ae169576f8c44f76e2040bcc02fd7fb0b97ba693570da75be4a0cefd67f47fe325e27322ddfcaf1e129c3b6b64d WHIRLPOOL 4c55196a168496aa2a1ad93a5c41e2d9079ff677edc41579a3c45bec419bddeeeb55f5ab5cb54d1674128f92ab12b672ce2ba3cc85e3f131d830e8c113bf2346
 MISC ChangeLog-2015 1310 SHA256 f82effb2f1fe02e9b827cbc1da82bbc711aac578f5df0b8764825e1088a69f7f SHA512 bd86428c5306c10fd4000b301598430b6b6e7412c0c9e62115461cb40b377e9452b1404a1f63ac1fc4503f319653d49a4e10cf673bf07b5ed2c2d77134f56d0f WHIRLPOOL 507acf8b55900cceb3d7e16e06db979915b240c927e3b8956529de577b42b263ab156b8327f305088564a9e3c16def9d64a5f90c3bd659145cb02e1ade4191df
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-misc/fortune-mod-smac/fortune-mod-smac-0.1.ebuild b/games-misc/fortune-mod-smac/fortune-mod-smac-0.1.ebuild
index 0d927cc43e7c..c340b98c4170 100644
--- a/games-misc/fortune-mod-smac/fortune-mod-smac-0.1.ebuild
+++ b/games-misc/fortune-mod-smac/fortune-mod-smac-0.1.ebuild
@@ -7,7 +7,7 @@ SRC_URI="http://progsoc.org/~curious/files/${P}.tar.gz"
 
 LICENSE="fairuse"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa m68k ~mips ppc64 s390 sh x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="games-misc/fortune-mod"
diff --git a/games-misc/fortune-mod-sp-fortunes/Manifest b/games-misc/fortune-mod-sp-fortunes/Manifest
index 4be4fa0546fa..37ee5bab8d40 100644
--- a/games-misc/fortune-mod-sp-fortunes/Manifest
+++ b/games-misc/fortune-mod-sp-fortunes/Manifest
@@ -1,5 +1,5 @@
 DIST SP-0.2.tar.gz 11093 SHA256 697a6d937d6674304fcb180e07c4801d2cb98d0e866c38091e10940c3a9f74d3 SHA512 846c469cc46e05a8314c92b609af3d049fe7e90c7b6c5aeb0c43c1ee12b8c8a3eab22be4aca3c79f64de53cff3d75152feb268f0e6ea80eaf8028f51827bd1d7 WHIRLPOOL d5040a16216a25bda4cbb37ab4aa51e653a4d53ecbd8ae4305b107b255ab3827386c236b43d4dcb2c5bf60eb308c20e557e1a496dbcd5d7da18fc7114b154e71
-EBUILD fortune-mod-sp-fortunes-0.2.ebuild 630 SHA256 a092421082c4d4caa45d0760e123a0f87e29f9cf198f568c0efc69c03a66143b SHA512 dce1dce824cc1b923ceab0d31ef11c52119c32c4c2cfb4fb907efcf890c4d7dda4cb79bf4a92cc5ecaca9aa618ebfdcb3b0139d5dcc2f10ef19215d99b50d8eb WHIRLPOOL 40ed60a6720f7daa2ffa7c7974b1381a04ed25034be0dcd330f4304df549256f52feb75c7acc4e07d942423303688882fb7e733e384aa37920092b7b1af39003
+EBUILD fortune-mod-sp-fortunes-0.2.ebuild 639 SHA256 77e2b13cc27d6a89f3921185e8227253e64b61de74129e7352da7054fd6b756c SHA512 23b68cad6c1e46d97941e155a6198ffdb3a9a9ba244d2a288dd9007e9408a4dda0f120485aac88aa142370e677f95f5a5e33cfc4eb6949f75cdacd99123554fb WHIRLPOOL c45430cdfff192c22acc02a0c689e950be05b4ee68f40077e1821450231afb279723333d33be24280c873d3614174438ebf4c7a380bdc4d232f80bd80565b4a6
 MISC ChangeLog 2473 SHA256 bb2735ee19040f756360b9dd4930338180c210f1b9b805372cc37b6dbc41ae7b SHA512 cb8a304b7b9f58c1fc7c014e9d06fed610558d882bdfd4d2b493788a9efe85da3aeca40f2f2234a73c68633f50c9dae42a67de4cfc6968cf62cdb9403542e67f WHIRLPOOL b8589b988b667a949f2512c85c062f9ffd5b03f36917fee752bd357d0708fa549e616901e157728b2f4aa2eab1fed56295507400bd68103c0ce007a24937b462
 MISC ChangeLog-2015 1519 SHA256 adfeaf12d12a95c342896aa73061f9d5c93ab6d6c676788fa900fbc59340b781 SHA512 0b5cc8d104be7f98fc673f6950c41c24e6f8cb44b47870ff641442f75cec836d9eeb4119281615ca5f4659263b1496c48995e29ba1d92065005f6351880dfbe5 WHIRLPOOL 682e370dba9d6c3c95eb11f84a302cb14b4bcbd921c2687fddf11b48b32e55606b324bd87e49fec320bb7b073de9d209437a626258f332bbac64564b61ae981c
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-misc/fortune-mod-sp-fortunes/fortune-mod-sp-fortunes-0.2.ebuild b/games-misc/fortune-mod-sp-fortunes/fortune-mod-sp-fortunes-0.2.ebuild
index 0a40d36ab2cb..840658b4e82b 100644
--- a/games-misc/fortune-mod-sp-fortunes/fortune-mod-sp-fortunes-0.2.ebuild
+++ b/games-misc/fortune-mod-sp-fortunes/fortune-mod-sp-fortunes-0.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://eelco.is.a.rootboy.net/fortunecookies/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa m68k ~mips ppc64 s390 sh x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="games-misc/fortune-mod"
diff --git a/games-misc/fortune-mod-starwars/Manifest b/games-misc/fortune-mod-starwars/Manifest
index de7452dcab49..2e7d007c7463 100644
--- a/games-misc/fortune-mod-starwars/Manifest
+++ b/games-misc/fortune-mod-starwars/Manifest
@@ -1,5 +1,5 @@
 DIST fortune-starwars.tgz 5547 SHA256 ccdbb357ebf547825717168261f543530ff613c232217d63ad66475e46006c78 SHA512 7c829f367b71a56f442045e63ece9b5bf774447de2535e41d6d43ace4c88a0c6e907546bcdef388110998d069b77c24bde39a97a86c89a2693bb089e65b89627 WHIRLPOOL 282490b67476238fe770465af9535a29c935ced03aa6c18efdeb1d1c2d6238a1e57f7c56e1b893b7ecfa063e76bcd8e175cb813017fe6509cedcd5a298afa638
-EBUILD fortune-mod-starwars-0.1.ebuild 666 SHA256 ade96ea256cf61f2a594232113bbafe682c787743c09a61b3fe0a676a7f7f8ce SHA512 5c4c761fa997c4dc9ca17e2d93bd455b14b13d3c97e6bded833410c752e7b5805ee9f94a638574485962ed8df6b18b0fd3d771bddc126a4fe59bc66c1a29c6d8 WHIRLPOOL 68085ec5e5918e4f19376f93576aa0a34ea6280bbd0258a8c5e48801dbff7e2d19d7de5ab0d86b2a60ce8c3ac20dad11d4d3434b03ea2bc316c8d3a2a6295f9a
+EBUILD fortune-mod-starwars-0.1.ebuild 675 SHA256 5025c02f6c843f2bcbbadbc7c10ddd787c8e8eff6cdf150e14f8fd471fd099ac SHA512 cdce18afc004c507e8dcc3c0fce205e8064253a6c1f2ceb44bce14741e74199c02743c6cbfb8e8673c4e75c280ca1b3c73cb81247ae3bca6c137847625c1a966 WHIRLPOOL 0aa529ddc15e8374a27e1ac78226e97f8765ebac313031d235a67b48362060931de039b340acf185a67fafe3fab7bfda08709018ee212bc1cfbe7a6a45d13c2c
 MISC ChangeLog 2464 SHA256 766fa318e98ff112f8fc2845d5260785a1aab95ae9f39546f93d683703ef406f SHA512 0df5168808c3d09dd48ee08d3b74332b5b454c62fce64b849e04568ef1c6591f69f0818725f5aadaef59c5f8f783c83551b6c2438f80bbc63ad97666388285d3 WHIRLPOOL 9b71cfd7aa202a67697b7cc7be9c55512b965713ec72b8d200c92cec37d857eba6756806acac7ced72c2e9865664d1c562f194cbde12ea68362098e2cc4d9fd6
 MISC ChangeLog-2015 1498 SHA256 e204ebf5027fac060d2551eeaa62e8c5121181efb26cf9d239ecc5c9e2ca1c9b SHA512 62cd6f0637122976aefb15e6c95607cb3a9d7ef74c0f1ad64b13c5bf4c5c0d54c30860109534e2aa7b2db20bebfd7ffad0fe9da3002edf6c1e60bc9981e27e42 WHIRLPOOL 325c6bc3eb4fbb0d033b9f0b7baf76875ee77941de58f269507e6da42cd69741d65ae1636b663227df47b28365cf1f491fb28f49b5743430a435026d4ac2d5ca
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-misc/fortune-mod-starwars/fortune-mod-starwars-0.1.ebuild b/games-misc/fortune-mod-starwars/fortune-mod-starwars-0.1.ebuild
index 4765401e8157..885df4c6d17d 100644
--- a/games-misc/fortune-mod-starwars/fortune-mod-starwars-0.1.ebuild
+++ b/games-misc/fortune-mod-starwars/fortune-mod-starwars-0.1.ebuild
@@ -8,7 +8,7 @@ SRC_URI="http://www.splitbrain.org/_media/projects/fortunes/${MY_P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa m68k ~mips ppc64 s390 sh x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 RESTRICT="mirror"
 
diff --git a/games-misc/fortune-mod-strangelove/Manifest b/games-misc/fortune-mod-strangelove/Manifest
index b76330034572..36709e4fcadd 100644
--- a/games-misc/fortune-mod-strangelove/Manifest
+++ b/games-misc/fortune-mod-strangelove/Manifest
@@ -1,5 +1,5 @@
 DIST Strangelove_20041203.tar.gz 2103 SHA256 171c898f12d7a0d63a269fe7c46dc9c66216a43fbacb4c481c4a6843b9c8d777 SHA512 c2e561a7556b50c6a281e3dbeb442034e61342ff1ec9d9d3ff9428b86b67d58ed378f9dd9cf7401bac70e5015a2eb2ae06e681fed323f502f6eba7ff648a5d08 WHIRLPOOL 7aa2f1afd8599bfe939ea640c54a707674ffbf028db8fe0ad63c9188a4450d2d55e40fa023ead8cb5fdb5a8a23117e2124ca40248280b537a09d28c7e18a9306
-EBUILD fortune-mod-strangelove-20041203.ebuild 596 SHA256 05435e2ec0685c4b9cb6139fb5f095473183c9276371cc96885af0f6da15b4f5 SHA512 efeca1fdbc4b431e8884e0fee31118fade72b7257a1d6e4e30ff48149bef73d4393b940f7b457305e42f36de6bb163b6cd62deea17ed3ff22405ee4911a58067 WHIRLPOOL 3621916f89f11f3bab699ed9ed68d135fbcc3fe346ebae4f6af80af93beee5eec54febfbdfddc3976caa578a835fcd02356b6fd884af2568373189d0d85e2dda
+EBUILD fortune-mod-strangelove-20041203.ebuild 605 SHA256 9966cf6118ee7ed3962461e66ba1b3cb24b2cc9380a02c6ba2290ba984039a2f SHA512 b4323fcb56ae637f2d4c7cc29fd239f4cb4d18f9bbe8e5e05401b5420a17fce0cca2a9bb0f0cd091031204105761cbff257b36d251e4bd99d86a308c095e204c WHIRLPOOL c18a13cb6e1751f1110f50532efaf8b51d6fc1989dd02951b22886348204549b837d710f3b3603d6fba286aa7bb911324efeb63126d5a96d8f1a7ce839d73cbf
 MISC ChangeLog 2483 SHA256 6e3f10e9ff86d4394d5f2b596370effcdf51d1d090652897ff18f6a77418a977 SHA512 48639a530440053176e8e96e8b2ba23a5feb0633cca840effbb53ff88a4d680a77b625f0d286b15ba4824edf54a65168347ed514dcf0c8da0680102e53dc5c20 WHIRLPOOL 7855d7c635aa968cf7c757b25e0679e98b207b6386a579a3178e597a367c90960e816c2b1bb47c6d87706f31ad49e0f83e789295c3a603fd60912d3404ea5386
 MISC ChangeLog-2015 1299 SHA256 3b6d2c8ef60bea8942c76b7fe6fbb75cc4ee22489f6654aaca1929b79fd1c84c SHA512 50a4c5c935e43e23b7f65faea20a6b0ec9a949fcab8a7bc693df1df7301c37687dffe5d0266740bf7ab3f2f1662de573cfaa38f0d3b436085c5a3e62dfaf3f48 WHIRLPOOL bb2b1426c071f046f23cc975773b709cdd83af24e7f599f4dee28c840ab53f7f2ffa4352882d918101fee6a60d8509d7b17eb4733cd15fbc02ed01ca96493a78
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-misc/fortune-mod-strangelove/fortune-mod-strangelove-20041203.ebuild b/games-misc/fortune-mod-strangelove/fortune-mod-strangelove-20041203.ebuild
index 80f288426871..844e7cec64e8 100644
--- a/games-misc/fortune-mod-strangelove/fortune-mod-strangelove-20041203.ebuild
+++ b/games-misc/fortune-mod-strangelove/fortune-mod-strangelove-20041203.ebuild
@@ -7,7 +7,7 @@ SRC_URI="http://seiler.us/wiki/images/4/48/Strangelove_${PV}.tar.gz"
 
 LICENSE="fairuse"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa m68k ~mips ppc64 s390 sh x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="games-misc/fortune-mod"
diff --git a/games-misc/fortune-mod-tao/Manifest b/games-misc/fortune-mod-tao/Manifest
index db526628e8c7..f8f15bf7ffd9 100644
--- a/games-misc/fortune-mod-tao/Manifest
+++ b/games-misc/fortune-mod-tao/Manifest
@@ -1,5 +1,5 @@
 DIST fortune-tao.tar.gz 15381 SHA256 9d22147de9422091c4bebf4997ceef6ae96c66d44fef05440df591587b2bbc0a SHA512 ec8d8b679962e9a1af4fb74600d7d7d348efcda0fd9c4f08db881835f8e1665688f77a77b0eb8231274ab5ecc93443f5348976100031d5b0c4b6245f647db0e0 WHIRLPOOL 9efe2e73b3e735485664760393fcfbef5752f30fdce35c73d5a434b0b269225830048e599f5dc2484ce46370c03dea2997f0b05b13fd987c5a4ae8e87d3dbed5
-EBUILD fortune-mod-tao-1.ebuild 591 SHA256 d72bbc6ed5572aeb7b5f1a78386a7c54b1b377cfc2c72b339d04a47d16a79c25 SHA512 b0f32acf8e6b4ff335a73a592599b2d51bac45b024393cdfb921c8cafd1d76afbe3d39aae4dcf7d1e2f6a6d02c3da90732ea5b003b0db9a3f8675f2bb4577b85 WHIRLPOOL 9d41d02f60149fa1a3480024ff0773931fc397788bcd61f3550fb53ac5eb943b0ef29445c44ffec10ed87a47f3a259ce548ca13839ed952337153b50ce72d832
+EBUILD fortune-mod-tao-1.ebuild 600 SHA256 ab177ff0e8b69925a5e0a7c95954f8b430dadab40c02c00d8658bfbe4e44e889 SHA512 9dc5e90426d292520e87f7392d0425a83bb852563d1139397675af2de0d5c4c0de90a6d9753a20778639752d51cfddce7876e4038ba96d214a5f0f3c21035bad WHIRLPOOL 6620865d4d0aed578d6611617196c20e5501efc26d08e2a2096d7dca3f2e7a451143fda9d23f6d562d3ca975ce11380b9eed1a3cfa4506bbb5b7c89777346b4b
 MISC ChangeLog 2445 SHA256 643a20ee8160bd6774a49de19ff16c9f526d1c2449d9653adc37605c61b0c386 SHA512 65dff60ac4004c0d2c5e5325f652015318f0580b30a048966238be3cbcca358f1fdda6fa36a8041b90bc3a417fd9c45d97c6dde61b4f7dfda242c65aaf51ad53 WHIRLPOOL 30ef0ba34a6b5c821da0c15e80f4bac28cf33c79570e69829d1a0aa7a3d6c0155b8178a0dfb2905f5c748d7f593c1ffcefdd46f934674606db7b7b5cd123cd66
 MISC ChangeLog-2015 1318 SHA256 5f0ece13b766237f02e2da27ef9162fc0580967d5689113a2f5560860a32ac30 SHA512 128f4877f68978dd8809675bbc7681d69f40f9c0a9102e5da42de4f9b03351cbb0d50f6adf0b6b54bc0f93b789cdb2cd9d7f32c48d32d1bc5b635b2333e6043c WHIRLPOOL 6de5bdaf04a4ec775cf064905353a51473a2654107beace3d5a18918a7c0c5a6cf162090b1b739b40b3c3fb3903de0048a57a3d52e6793c1c934b093fc0675af
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-misc/fortune-mod-tao/fortune-mod-tao-1.ebuild b/games-misc/fortune-mod-tao/fortune-mod-tao-1.ebuild
index b6d59d2a00c9..8311be7d4c7f 100644
--- a/games-misc/fortune-mod-tao/fortune-mod-tao-1.ebuild
+++ b/games-misc/fortune-mod-tao/fortune-mod-tao-1.ebuild
@@ -8,7 +8,7 @@ SRC_URI="mirror://gentoo/${MY_PN}.tar.gz"
 
 LICENSE="GPL-1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa m68k ~mips ppc64 s390 sh x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="games-misc/fortune-mod"
diff --git a/games-misc/fortune-mod-taow/Manifest b/games-misc/fortune-mod-taow/Manifest
index 43c9cf44cab5..4fd521ac3657 100644
--- a/games-misc/fortune-mod-taow/Manifest
+++ b/games-misc/fortune-mod-taow/Manifest
@@ -1,5 +1,5 @@
 DIST fortunes-taow-1.0.tar.gz 67835 SHA256 f9dcd9eb511eb9a435808476df67259447ecf7c9ab81324af9e40a34ed33a2a4 SHA512 da1577b36c121028ba2568e4e5a2da96848d70361a3803e93960b357790026a56fb545f42119d013845f6003ffb9f8421de2a1152b189ef93d3a290474259405 WHIRLPOOL d7c500ce072fa641d08be8b403514543b3e43fc24ce34a367b3c1416b5321f8e00f48f1a25351d82ed6568f5205c604dc35e414744f69bc1de4bd2cfca77bd92
-EBUILD fortune-mod-taow-1.0.ebuild 549 SHA256 45a7087bc10ef8d6174617e5aaa21900515193eefc3ee1258e786f45e6d6f73b SHA512 323a738476cf56b00bd31702784bb7673a7a15a6270d4406c90029d062f9c044c1d47fde13fcd835094cd08e6176941aa498d47510eed2d27156d899270f9c84 WHIRLPOOL 837679700410aaf5874c89d83e6dfb3b54d6475d8129e06a93e83ab021dc924db7ea4504ad82fb50c2bc5b5b5b2570cb096b1794bdf03a06d8980d7410bc0780
+EBUILD fortune-mod-taow-1.0.ebuild 551 SHA256 53959cffaad2a3a90c5d861614d1ca49ba6780ff2a21e0ca2d7955ddaadc955d SHA512 9170d33cd0832ff2794fd8adea46d50fa16f1fc5e36ba793b228d64a9913255fa222d4e17474345a26b45a2529f7eaaf5def2e5936fc27198a4b31e75349012c WHIRLPOOL c963467651f522862b61d89683c19915a77f09eba0cf03efe4913bf3d8a9f53443e32f030fd274fdfb24b677d4fb354bafd39e47466bb6a366cd6aa4c63cd50c
 MISC ChangeLog 2452 SHA256 e99f3bd71f4c0bdbc3792e5dce2b2d9014e2254b9cfd9663778d93b99d75b575 SHA512 79f2d919908299bc5f9cf58f59bc1f1ab3fae1fb625b4a680e1ae6a9f89bdad04f36b7163d26780c5873694cb35552dbbad574196a5be99971791836f033d30d WHIRLPOOL 50bdab8d67cefe9ae9a7232c1dc96f5e1596797da60fdb63ae4e2c0780c212355dec7b56d2087fa1382f145bd94058e371ad2c08523088ce4cc9dfb7a8151393
 MISC ChangeLog-2015 748 SHA256 4027073fbcd7375f8637c0e3ee2296f5524df107d14eaf7a8c29e14203b3322c SHA512 dc83d9d379cda287567a110868272195b7d3453285f36b69b0d78bbeb7be00dd7765519e7fa8018eeb77d43f84bee82fdcb59f701d78888c80ab1066dd4c51c6 WHIRLPOOL 7d38770b12a44cdc7b0bd4fb2d06a73d778e8244babfe76e11ca654a9ec00fc1e3c42a4cc7a23a94e34d5e4d0c705844b68223781b2d3be2c8cfa840cf386caf
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-misc/fortune-mod-taow/fortune-mod-taow-1.0.ebuild b/games-misc/fortune-mod-taow/fortune-mod-taow-1.0.ebuild
index 51f62d305a9c..6402491505c2 100644
--- a/games-misc/fortune-mod-taow/fortune-mod-taow-1.0.ebuild
+++ b/games-misc/fortune-mod-taow/fortune-mod-taow-1.0.ebuild
@@ -8,7 +8,7 @@ SRC_URI="http://www.de-brauwer.be/wastebasket/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="games-misc/fortune-mod"
diff --git a/games-misc/fortune-mod-thomas-ogrisegg/Manifest b/games-misc/fortune-mod-thomas-ogrisegg/Manifest
index d000fc32c701..cbbb3930624d 100644
--- a/games-misc/fortune-mod-thomas-ogrisegg/Manifest
+++ b/games-misc/fortune-mod-thomas-ogrisegg/Manifest
@@ -1,5 +1,5 @@
 DIST fortune-mod-thomas.ogrisegg-20030120.tar.gz 15662 SHA256 42df9dac0510a2d480a6d5bbea69137e927d2a4efc9f0b51a3facc1fea43bd0c SHA512 e1888b117074ae44eeb34ba499f03793d33cbcf5c2af20eec4171078485d37c06a3ccbcb80a620ea4a8e564840fe832d310ddaa8bc5a5164c8d2f870db0791b0 WHIRLPOOL d0aa31284e7542e6d2d13610771b75397b4eff09780397fd991c29791a37fd16962a1556afa1b4d586b6963a15d2c381e9306511794bc61fb24fe637e2512bc5
-EBUILD fortune-mod-thomas-ogrisegg-20030120.ebuild 618 SHA256 5952757277d278f38b500e894cd80dba6dd2d7736f38e1c2ababe4ad59babd69 SHA512 f588b55bb720ec46708707692288bedf0340e8da699ac2a09e1719dd672002e7afc9feae90feb86c870b9a2eeeb216930fbbcb70dc881957b3dc0af2cc4fb2ed WHIRLPOOL 62358712b201c33d1ce071b6fad5fb392302db50815e924c16a6baf02ca7eb2b3daae10db82c111b9724293ae6cc9408fc94d2a1884bc7a6b83913af9d3c4d0a
+EBUILD fortune-mod-thomas-ogrisegg-20030120.ebuild 627 SHA256 70c3266df899640ae6f754fcbc34955f1bf22fc63066972b5f98da08e37209d8 SHA512 dcd101e95e6b190e4c1c00470ef343086075f5a6b99f80a89e4c977c9f19623e0dd849a2b8161398ee13002286388b91666bd57d15756b5db310c8406024a573 WHIRLPOOL 44c9ce60a38f03f17b9288c5543818e46b7fd21f19303c49910d58dc4da4927c9d6696c3fd4c541487c6b86ca5e8ddb57a783f188ae5e02fb1b1bb52ab550025
 MISC ChangeLog 2495 SHA256 661adb3a2c708c3fb9cf4ba081a663a98558dd719ac7a2e24ddd52d60352d45b SHA512 1af920b6498e04a3dc608b3a20d43fc574bd363fab37152cfbf50a0f3938d081ca4019fbb8717a6b9a7c5e3d4731e7b13a0c25fd8a701ccd88d7aab0868c7067 WHIRLPOOL 633656d5d19811a141fe2695ff2a2ef9e70e34e2d9b07ae4e6769174fd500277c33040be6afa067c82289aa0ffe1e0f2d48c0dbb04ea1bdd85456060522b0c3b
 MISC ChangeLog-2015 1583 SHA256 78d7dc3feb8d01342a99977f041f1accd128d893edb10d8071041ae3297b1d7c SHA512 1eee7ca187b795c2e275e67923cb87f9cd1f6f938ef49e933ad49e025052a9c3da2a612f7b0bc7871a2c217a42140287afac597519131df0456b65124fe90a27 WHIRLPOOL c3bf0df309cbcf7210620b8ae743e25e18fecd5d302070dabb977b280a30182f879aefb8241d8336ea4e75393798561c4febb5a12bfa3222d157fd995881b949
 MISC metadata.xml 338 SHA256 4d20692076279c391d84bd9fb2f5051441a2f96915c935834333dccd8e138589 SHA512 eafdde3a9e9cc33fd4dba816289aaf3dd0527f139ddc5cf76eddc13736d7f32277ceb23d86762d7ae8167f05942eb985756da89576dd87be69c7642469d2aa3f WHIRLPOOL 34be2722a38fb7fa26dbb85de90e6b36c9f621ba1e05341136252a555556c79672701c770e714d0dfbd203658799f140ce392c4a65a31183a030732b4898b9a0
diff --git a/games-misc/fortune-mod-thomas-ogrisegg/fortune-mod-thomas-ogrisegg-20030120.ebuild b/games-misc/fortune-mod-thomas-ogrisegg/fortune-mod-thomas-ogrisegg-20030120.ebuild
index c2d542746fe4..3b755b3fa7c7 100644
--- a/games-misc/fortune-mod-thomas-ogrisegg/fortune-mod-thomas-ogrisegg-20030120.ebuild
+++ b/games-misc/fortune-mod-thomas-ogrisegg/fortune-mod-thomas-ogrisegg-20030120.ebuild
@@ -8,7 +8,7 @@ SRC_URI="mirror://sourceforge/fortune-mod-fvl/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa m68k ~mips ppc64 s390 sh x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="games-misc/fortune-mod"
diff --git a/games-misc/fortune-mod-woody-allen-it/Manifest b/games-misc/fortune-mod-woody-allen-it/Manifest
index 93ccbb027c38..4ad56c8bc598 100644
--- a/games-misc/fortune-mod-woody-allen-it/Manifest
+++ b/games-misc/fortune-mod-woody-allen-it/Manifest
@@ -1,5 +1,5 @@
 DIST fortune-mod-woody-allen-it-0.1.tgz 14246 SHA256 47a305aea6f2d256753b1fed5336d5a9f397925cc28f30fa58e28d09da5b1343 SHA512 9008be8c09671bc0e7715a18e6816a454d2f1aa6ca88aee6f596690888fb6fde1289629d3d2336df9de5fef04318ab9e86089b131f655e827905b1a1de57d8ea WHIRLPOOL 2e68e0bf34198a312b34e20e8824b13754bce6ca9f5728373af2b9fda71bf85e911e4ded02066ced3f2f85fbf7c3da6caa68211879411460a5a1015002757107
-EBUILD fortune-mod-woody-allen-it-0.1.ebuild 571 SHA256 07ec32adddf10cdf8890469200c801108e3190a5f58ea1ed319cda789ef251b3 SHA512 89ba89c957c0bac1af7f544f81387f2d6f3bfce171530eaef76dbb39c5025ed9493e47605802b9e58b94e3df162f0f6e0e52aacf94dba3d12a8d862cd36975ff WHIRLPOOL b4588e10caad870fb3a37cbbb0da03cbfe46d7daf9222bec95c064065583a32a63da507fbc0d9ee1c210e5c9732fcdf46888f3594dab01caf41eeea974e1b2c3
+EBUILD fortune-mod-woody-allen-it-0.1.ebuild 573 SHA256 15c6808052df627a377678a13306a04a631c5863e7e78d62ce5e207443f946e7 SHA512 6aef9dbb7aba7a270b5a1860b04615269ba6cac4037512442afa48d141f4ba050c6305d2a9529679eb8b46848442aa1644de81fd1eb8d01a78e94fde7724f58e WHIRLPOOL acd1460ab73dd216c67a180ca3c23db04aa31100950e9896390c3b9106ac4485186295268c5bd6d3d73bd32a06ab59fd3c05f9e72fdb0f982fd130ece768c3c1
 MISC ChangeLog 2482 SHA256 90cf4f7a4a04544bfb047a0fdb04518b05f505b761a4ebf3015d1d933e3e57b3 SHA512 036f23c1ee53205224ec63b975a8717f389e371cd4aa624d5dc0df73a8e761e4547ea5c43ecfa681f88f70f4241c9562dec7f5d197ff26d943e035329a8cc402 WHIRLPOOL d1b9f6f7e54a61297ed4fbbcf3226bcdeea3ce7abb588afa25616891fd94b9dfe49fc8fca19755631f38309d6563e6aa0f9a0800466849128eb0d28382793afc
 MISC ChangeLog-2015 1010 SHA256 80ff5423aeb3ebd34bccb92768d1ba93dbfd29ceff09dbc6caa0943521292c63 SHA512 5c9e3bb2869bf6a8bcd83f9bf9df30b66f3cecdcfe277276c62dc3031ccce77197720a8778989f103ae272661b8f8300a8b2ccfa267f1d3ee354bae7a4a09966 WHIRLPOOL adcdbc4847a9b236b1ee41e13541b665f6e790a90e78ef67c113a1e1363e445a447ded6a3fceda175504973e459dc0837aebeebe8c931ad1fac0d3bf7c7429aa
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-misc/fortune-mod-woody-allen-it/fortune-mod-woody-allen-it-0.1.ebuild b/games-misc/fortune-mod-woody-allen-it/fortune-mod-woody-allen-it-0.1.ebuild
index 095abfbcd091..ab50d4f84cc4 100644
--- a/games-misc/fortune-mod-woody-allen-it/fortune-mod-woody-allen-it-0.1.ebuild
+++ b/games-misc/fortune-mod-woody-allen-it/fortune-mod-woody-allen-it-0.1.ebuild
@@ -7,7 +7,7 @@ SRC_URI="http://utenti.lycos.it/gutter/${PN}/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="games-misc/fortune-mod"
diff --git a/games-misc/fortune-mod-zx-error/Manifest b/games-misc/fortune-mod-zx-error/Manifest
index 91c8e4869465..9c2392c08e89 100644
--- a/games-misc/fortune-mod-zx-error/Manifest
+++ b/games-misc/fortune-mod-zx-error/Manifest
@@ -1,5 +1,5 @@
 DIST fortunes-zx-error-1.0.tar.gz 1209 SHA256 eeef602d56655d4f296382159c286ab655b450fc115ad680404b299006edf871 SHA512 6412826dfafdcd79eeb2f8100c6e7a7419526af080e98af91243a786b1fc6089ef652eb0d8267eb94564dd932fcd1b5f903a4da76760f23b370e57fbc5c72f9d WHIRLPOOL 52ecde54a33aa43a407c4b392433ce5940d0b00f6b73c97a0d6db30354ef6c1f49a4efac85214170a6d52b48243827f2d41682633ceb3d673909efdb11226f14
-EBUILD fortune-mod-zx-error-1.0.ebuild 711 SHA256 a1ee067f33b1ad20ce81bf51ff09a63547cd1937479cb72dafe02749f4c593ba SHA512 efe7ed31be8ebb236b5f93d72c6b986a5ab96e3655625fb625cb2c714f648d7e9677c8c3a2eba2dfcb4550cc2c56f1a947645b080b62888c7d15cfe5ef325c80 WHIRLPOOL 2d7ca0bb849474b1aeaf89febec409661c09d8e0bc617d208006e749b9a066bba012a67509133176f3f99ba1d8facfa4f233c0aa46c7c11cc0c5ab33c1563950
+EBUILD fortune-mod-zx-error-1.0.ebuild 720 SHA256 97b5b02b2a6546fd1b69079d7fb8f3249b6909e39077a20f8e9d9cd838e7309f SHA512 d8bf51751e4490f65b8e01ac0d481c150c40a09b6da9d8934b5bd1aff3cda2be7280930c274a0b093f0a04e6f78367dbada316ec9046002560327d914bad784c WHIRLPOOL d0d7d53a77b4bd6cf7d2b3947b893d9c1305d6659ab55c2b714be194100dbe2d9890ae1310e5719153171c4127f102461e26f8351c860b1406d3d2c8cdff62e0
 MISC ChangeLog 2464 SHA256 e2d9af5d85cdd9f355dff9508a725e3eb54109f5e97d962ab7a72ddaeb94c915 SHA512 f6e72cf17bb65344f8a136f6567b520795053ed127e81b15958edeeac5067ac75c3faf3918e3fab88145549ddde4a192034cdb7d5ef168a87a2bcf5e3e8c6582 WHIRLPOOL 62ce8f1cca38413488192d6f295aea6bde192c857b7b7bb8d3cafddabcbebfcdeeea22624041f1a5a2d824b148c2a307d8a9e1e5b130a2ea4f570acb27a38a10
 MISC ChangeLog-2015 1195 SHA256 10bbe6f0f402b35e8ec514762f9385a02a0bafa81fad6cca67c2852a3c23dcff SHA512 81012b4acdbec3c78d5797e71be1a9b9127190674aef7ce363d86cec2ef07e5ebfced4f4b1bf8caf142520f518f27575f59b770b089d918d536e82ebfe3a4c91 WHIRLPOOL de2b23b1df5b83b0b1dc0c64c4f12b92e90097966f25ce9f57873b4ba396c56962dc905ccb43f89c5df56dc6b6ac68120c3ada8afad5eb1216ce893abe4d26ce
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-misc/fortune-mod-zx-error/fortune-mod-zx-error-1.0.ebuild b/games-misc/fortune-mod-zx-error/fortune-mod-zx-error-1.0.ebuild
index 42bf865d68a9..a42f1c7e58f6 100644
--- a/games-misc/fortune-mod-zx-error/fortune-mod-zx-error-1.0.ebuild
+++ b/games-misc/fortune-mod-zx-error/fortune-mod-zx-error-1.0.ebuild
@@ -8,7 +8,7 @@ SRC_URI="http://korpus.juls.savba.sk/~garabik/software/fortunes-zx-error/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa m68k ~mips ppc64 s390 sh x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="games-misc/fortune-mod"
diff --git a/games-misc/funny-manpages/Manifest b/games-misc/funny-manpages/Manifest
index d78a88a8f12f..c65935dfa07e 100644
--- a/games-misc/funny-manpages/Manifest
+++ b/games-misc/funny-manpages/Manifest
@@ -1,6 +1,6 @@
 DIST funny-manpages_1.3-5.diff.gz 2639 SHA256 aea8369726213a8294f70c0d0b1637b2cf961d6208ad52fa97daf105e9452a53 SHA512 69110989da9071321a8d8e9ea4f09bd7635704caeaccbdbf7fb2fb1abd540632f19d63d15de3232fabbc35e76dfe2eefb64ce84b6f4606d8dbe581e15f83d24c WHIRLPOOL f35a816d9ba0ebad7ac11ed78d6ddd5225d3cdc0a3b39a93235592688b95d1a52057f37cc437afe73dca9d252f027316a5f228e4f45ab8de5ef9da2a1a617412
 DIST funny-manpages_1.3.orig.tar.gz 22691 SHA256 5dcfcbb30a26585b53f27dc591b7e9cd485f738e603fa3fc9f074c55eabb6f91 SHA512 83c753540d9a9829017246f4a9de22ba09965fa5b8af8276f55ef141129876ca3e641b367ebc31ca99301f37a56132c07eee1ebc9616c954a2e84387fe62383d WHIRLPOOL 15f61ba576b7d674bfe2db6ee18f919b3b9851ded47dc8aa6ed0a710a77dbf9defd4c4da35106aa12df4b0c11382c345e3fcb9ae82d5fbe2ceac65fdad633c8c
-EBUILD funny-manpages-1.3_rc5-r1.ebuild 736 SHA256 46dff31ea89985bb6d474e8b4bf482e56a377253ecd0c4db37eaec63203e2625 SHA512 b78b818311a9e91fa58c0f78730068f2c2f0193ff6552848e70e7996070154d86c0e4aebfcb700b1c9c8ce9cb5ea05d2e47cfaa8601ee77c1c989e30840be547 WHIRLPOOL 31c0fa1e96411edab0501e5d2d363c2d99873984e99ce261a89378cc7cf6900c0e08d59f61e7fef0e31d2712a1c8421f304a3c63fc5b98768dcb263c0d845dac
+EBUILD funny-manpages-1.3_rc5-r1.ebuild 745 SHA256 dc079e7f314b7ecae6b347dd5d914609dd28f78c673bba29151a81835dba53a5 SHA512 2a66fc2d07769fa5a4377fbe25bf07093286be4fb06632a5e7a6f7fb26a28e005b4522c2516d6a0d0cb6739872360718e650eec3ded91a50c32182494b39f252 WHIRLPOOL 75bfcfb4c8a127cd5bb0fcf2ba6020eea4941b30ed8b4fe88026a63f3191db4042f18eb4b6849d9ce5274ed8bbb89af1b07ec416662bc41b4404ab6287f51700
 MISC ChangeLog 2460 SHA256 f23ca9e260da8e975065d60a1328f440b5e792cd08d817db40a12ad1d0c76cea SHA512 b956f3aac33804aaccb2c5f6bf8929ac3deba4f61fb9dde8eb1e8470d9fca9f10f1bc4b2ed279e851ce122638f2e82d4de7d0863e63fada145c44e3d49316385 WHIRLPOOL 9cd24b995bb02ceab5af54aa8d87586b9918111fd8970b8ac21b86aec9e3dc89d2c041d72a9b57bb8498af2ff1c5372adcfbc7b88f7c6f3fa7ca6023b5b7882a
 MISC ChangeLog-2015 1511 SHA256 5a1ec740f130f55a116f9d0d0733f9db5d8f9ea476af3eba7d32fddfb1d3cdec SHA512 945e6f3e1203bd78b8a0ab2a07af0cc73ea7c5f3cf9e5d922bd41f50d3bb75e9db4a316f3bc4d748a7f361cb6916d34544dbd72f4fd071c082f3771ee448afec WHIRLPOOL 42234cdf5ee3f7d9635ef9947f383116da6f543af029aa0db89ada7cbf8ec7edf32c11494ce132fd911e011e412709a3b1512818a5ce80e950c16a144c4a4bb0
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-misc/funny-manpages/funny-manpages-1.3_rc5-r1.ebuild b/games-misc/funny-manpages/funny-manpages-1.3_rc5-r1.ebuild
index 59969cfc12e2..99e6253cf923 100644
--- a/games-misc/funny-manpages/funny-manpages-1.3_rc5-r1.ebuild
+++ b/games-misc/funny-manpages/funny-manpages-1.3_rc5-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://debian/pool/main/f/funny-manpages/${MY_P}.orig.tar.gz
 
 LICENSE="freedist" #465704
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa m68k ~mips ppc64 s390 sh x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86"
 IUSE=""
 
 RDEPEND="virtual/man"
diff --git a/games-misc/gBhed/Manifest b/games-misc/gBhed/Manifest
index 7a56c4d23c3f..4141c4ab97ca 100644
--- a/games-misc/gBhed/Manifest
+++ b/games-misc/gBhed/Manifest
@@ -1,6 +1,6 @@
 DIST gBhed-0.17.tar.gz 460425 SHA256 dfbec23e210fd19b8b8128c3e2140d4360730fa3fcd5b5cc22bb9f01302019b8 SHA512 036dcdef2de70ebc0774e9907c7697d28369d71fdb763e9034efe9ab2385ac482d2f301e7291a1b4787338080943260cd22715067d10d5f8c8d3690db2f0cc27 WHIRLPOOL e09d61b56739f4710e0d8addd50f7bed7df948e346ea65fd2897f93208ad764d7946d1d174b9c82b247ba314ff8f1478545b20a35d99ad7b84a22de79f019639
 EBUILD gBhed-0.17-r1.ebuild 873 SHA256 e5cb86e32c2f052cfa1c43fecdad34a5351646242a682d2bdeab6b577a8a1ce9 SHA512 83c7f629936e8d067b920e31736162e89c2c62c51fe42b4e5b8d0e529784c4a70c7dd332ee0d074ecdb59f03efbcf8ec46c08437dbe620a3a2d8734f8443351f WHIRLPOOL 8b4e009da8f7e6f192f8ac9a224a29d511252494ac67609b714b1f638645acb424417acbce7dbeb7f200e970f125099e39571d1201cc15d2863bd6f7977dbd05
-EBUILD gBhed-0.17.ebuild 904 SHA256 05aa38efe53ab42cfb63077195798ba5c35ab0af518a73e41c1329c3c6a1dbcb SHA512 ad99e9005317eedae00452cb9791a61dba941d4864ff2cf0a901c96280c09ffacfedd8f6a52b2d829144d97ba64794e7f7d2a6e7f74a8db1081f66a14f4f0f82 WHIRLPOOL 6a6f9f3fa05600ab27cc2d53e052ff351e5310b181ec4c8c4a695337178491d418dc5020aae24adf06c269c6f2a9e17f96071233038ea4549e3f01ad2d4b69ee
+EBUILD gBhed-0.17.ebuild 906 SHA256 acb51bafc13f67e69dc027c61de1742d482bca72f13fabc6a4048b59ceb32b7f SHA512 bfcf49b9dca0b21b321c836ae17b1dfd18a7233c53840b98bef59a94de917f4210b1998fd88d8096c8619ce411e239e6b7cea4aa874a5f6d315beabfa67724e1 WHIRLPOOL e0d903f939fa6b9a034944844d97a41a97a17c25351c7ddc7dcd4a46b34b784b2346740f2ede10462babeebf88eb8914fe1e51afe5c055c2e079a78b90b20e89
 MISC ChangeLog 2791 SHA256 5767f709567d8b93479941fc045acf81465f23408825df8e5db20975e82c9226 SHA512 8ef82f691310cd3cccd572a3f60315d767706c2078c2bcc4a1be5e399cae568700293b13bed5b3b00ec40e5e5fe81b1e648a1a82e7102e644ae2733bab41dc11 WHIRLPOOL 1d3daaf1ac3c03c8c60ad0c9fb04067425e1d046bda005216ea8cf17305c111312a49da6775a06e490ae57c42e8ef77071ef80718ba7178b60e636a5f30415dc
 MISC ChangeLog-2015 1007 SHA256 d537b642fcb9ab7e71569b7146d193b3d294d981077e6403c4c89dc85bce82a2 SHA512 d7f8db8d9ff36e9343d23bc237f6a32ab8c862d54bec91e682d9a9d523a583d5cfb23c3d84e6262c4540e94b0898723989568a3493e8a1c2efcb917f65a71c20 WHIRLPOOL 3ababa688ffeb97b9499faed874dcabbd60876d7d941c95eee0fbd3e22204069d9246dcebf1100fdd8bcfa2120aff26c8a2ba431f4ad7abdca65dac79915cadb
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-misc/gBhed/gBhed-0.17.ebuild b/games-misc/gBhed/gBhed-0.17.ebuild
index 43e3fcde7569..40bcc510a867 100644
--- a/games-misc/gBhed/gBhed-0.17.ebuild
+++ b/games-misc/gBhed/gBhed-0.17.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://liquidchile.net/software/gbhed/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="gtk"
 
 DEPEND="gtk? ( x11-libs/gtk+:2 )"
diff --git a/games-misc/ggencoder/Manifest b/games-misc/ggencoder/Manifest
index eab317af2ff8..2ab01cb0e3e4 100644
--- a/games-misc/ggencoder/Manifest
+++ b/games-misc/ggencoder/Manifest
@@ -1,5 +1,5 @@
 DIST ggencoder-0.91a.tar.bz2 82184 SHA256 3c6f5546bd5c758d0a676546e1ad9a0c9d4c79ad2be54f2c00209c5f9f69b611 SHA512 496fa9f181d39e425cb3766fcf5d307c3bb55ec206f79195e8aafd9e34a313ac88b3fa2594501fd509d76dda45c47ebe2f097df2d85abf006f56c859f37510f4 WHIRLPOOL 684203d2b73c5030a1f51420105f1d9b7af2bb5e6d696725524d78e2669eb08961dfd92daeb5e837f9a6173b42407e90b463968082746a08e41a86461d86d661
-EBUILD ggencoder-0.91a.ebuild 588 SHA256 bdbada05dbc4def676612bef1a2209c6a56e433f8e748d170c3ed39e8ba81177 SHA512 65c116a76dec7ce6d8780c1482a5d789f61abb4dc1dc33c2c04a62f297f7aa4294ae32074b4b2ea7fd62c36e156b378a1852c2369dd40db18dd0672bd80dd399 WHIRLPOOL b449ee2f7f975615cd725a8e9157b33764b6422f7d8a803a79e6ec93dd1d26b781a254907bf41ac9873066d3ed8379633841e2ce61632341d839bf1293ba4986
+EBUILD ggencoder-0.91a.ebuild 590 SHA256 37c7e38112a5cdef613971d96b151a01407747597d2c7d878b85083642b1858d SHA512 82fcf063371608ca75d722bb81fab0b1e0eea2176be3ba70103318e7a090b4eff579cd1d1a322c9154830f797c0830a73722d6490e3f8894615cecd4ada45db9 WHIRLPOOL 2cd4c40002ad1a37570ea9a9da899afbb2130039f26bf79c0a339ddbda6466bfe98366489831d9bb4f670136b8b567bc3ecc6102fc715ceb2da8cbe8eefb7133
 MISC ChangeLog 2559 SHA256 cb0a1b9784f074c825872070ba524a22a72d7954de55d5b86e7b58df7271f0b6 SHA512 78c0b4c4d53856ac781b853077b0e297a2332589b581a7aa0e270ad39d510dd02b1d3238e7e03235c860f7fe6d05f30e801c85809894eab96e86784813bb82b7 WHIRLPOOL c40a95ec3f9fbd5234c659bca0380aa9bce353e6359b9698ce00034da0bffc7f5232f767a057828016f54afa11424fe3855a57f7cfc3ece012c20e64c1bccd31
 MISC ChangeLog-2015 874 SHA256 693c4cd7f63a6c441404277caa1863db9e03d5fa37a0797a82ba071bee37bb72 SHA512 82673761c7cc44d31f70b1aaff622005c3ee55a020eb8c13c975d1e8617ba1d6ebeabf0f8c80e9dd71064d8a9448afc2adf35a225646bf1f314cf5a87aaac653 WHIRLPOOL 7fcb35b34a41f1db85209d92d9d29a57240002d0382e27e79068a103dcc235f58f7011d4ed2b60f47ffff43fcd4ff2bddc669214b6ce825884d34d18ec5b0f98
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-misc/ggencoder/ggencoder-0.91a.ebuild b/games-misc/ggencoder/ggencoder-0.91a.ebuild
index bf3c5dd4464c..b0c564518876 100644
--- a/games-misc/ggencoder/ggencoder-0.91a.ebuild
+++ b/games-misc/ggencoder/ggencoder-0.91a.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://games.technoplaza.net/ggencoder/qt/history/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc"
 
 DEPEND="dev-qt/qtcore:4
diff --git a/games-misc/gtklife/Manifest b/games-misc/gtklife/Manifest
index 0b7c8e81e292..accc0c2a5289 100644
--- a/games-misc/gtklife/Manifest
+++ b/games-misc/gtklife/Manifest
@@ -1,7 +1,7 @@
 AUX gtklife-5.1-link.patch 578 SHA256 73f111a3ef7e2e18e6b3673f87628263bc540d941f3d69274aaf3b99b4501d1b SHA512 2bcfff0164f13dd236edd3d2b88c37aebd79bf6344b7f0108a51b652cf291ea67d9ef4a4b0ccb11bd97a867617b4fb45b0b4668e8014e5c53ebcb345e1937a97 WHIRLPOOL aa1b6a8ae4f767535c5a5b48ef45133dea46317a565900e61bfafaec4c5820b292a40cbb0937086081b156ae91ce4ba1877e4dda5d4057dfe5e4c1288529cf0e
 DIST gtklife-5.1.tar.gz 809542 SHA256 fcf5a6515595d1822291fd6da4fec93dcfb5162cfce48445686ba73ab4a98191 SHA512 b80a2f0fc41583c2905e84e00baf689870c22262a55af25dfc2fe9e914d214f9c01b6800125e68516b63067005d25338ee7edf0c63ee37327479411693840025 WHIRLPOOL 6553956c570bd83d4237c02055d77a82944f30c9a6760c8dd6bbaafbca97633589c94ede839ea7abb4c2e3537856c6733de4fc1f369c8bd56e40361bc6469d27
 EBUILD gtklife-5.1-r1.ebuild 781 SHA256 145ec3a10d2893d6ec9421d1fd9b4204c10036b20261ff50b75e726237d3a158 SHA512 30087cc2ca2b2133a52bbfa0592df47a16ceebdeb6380720f6c50c33209648515c441dba70cc6c22f850affff4f3a06fb7857425c360c0e600d664e41a7862b4 WHIRLPOOL d3a2b8d0de69fd580320207493a3ddc245b52cdd0fb64d61738b100d3e58bda36a8d1e8148acf9b9308b7403285c6dbbd178b3b198814ae972001f8ecd0824c9
-EBUILD gtklife-5.1.ebuild 826 SHA256 b3dd099490fe04e7076f61ee437a0c10aec9a4ff3519ea4971d4be02be1c2069 SHA512 c932c9f37dc2801994cd26d2cb45452495766727355bf1c4df54b5a3802420c356faa5685a73d2855cddb3548866261a91e7b0c5a91b17a502c9ddf4b558e9b0 WHIRLPOOL 2a0029dca8733da94ba08e47ca2b68c04a052c5626f5060fca746f5abac91330ec9129b0c788285be5f7fd4e61c0446909bb864043835b93f7fc35efedb4be55
+EBUILD gtklife-5.1.ebuild 829 SHA256 c0a21951eaba442c95cb9a6ef8974ffb81ae857da5e16a6d1596400015227c33 SHA512 dbd5465f8f6765e645a1a87bc41d9fb1f95baa119e551d9bd7ec473f1584e4bf757a08d29f2b55d430594991502832e225b102ca9e8bdbc69b3368b3b7dc369a WHIRLPOOL 297a635bf58c714c1dabfefeb0b6a8a997f5b3655f018e7da4d8f2a94e175d010474daf78440c86e6867a74f42e7fa7cfc82ca1061cace7a8528b2501a0e3979
 MISC ChangeLog 2979 SHA256 ef460e58ddf071c3f6be132304d6d44dfa90a03c3c391132bcd03eb2a6bf022f SHA512 a17bf1680ec285f41e8d242e5801803bce2d165868a315c3bc4c7ef7de0cc1715f3f5d6e073711610d7ab22a3aa5bf53f28b7dea8e06d28b23508a3525608af7 WHIRLPOOL 55fde154ec29c165bc3ef9d78a6bad0b6fed24b1666c74e55424bfdfaea56ddd59d090489576198040ce8f4818e93fbe21aad7afc314ddae57dc9c6dc9b5c5c0
 MISC ChangeLog-2015 2131 SHA256 81db1fbcb9804d19cc6e2bc82c38240a8a3e1f22c0cd3cfec9c8ecd24a9ea872 SHA512 260d19f1bc1d7d9abc79074d918d94a71898cfe1c5ff5d5be23f6dc0beaa10829d9ab2f181b9bfd000bbbd56d50f4f263182a2dafb2034ed4e12e2d4394f92a0 WHIRLPOOL 34af251401b5377bc8c874643298b345934473e1a72301d3e960517c668780728c8e0e99126503c6fadf5a8120c1e9750037bdd9fe0e858a4515966893b5be33
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-misc/gtklife/gtklife-5.1.ebuild b/games-misc/gtklife/gtklife-5.1.ebuild
index 00f859feb4d7..851a1c3da951 100644
--- a/games-misc/gtklife/gtklife-5.1.ebuild
+++ b/games-misc/gtklife/gtklife-5.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://ironphoenix.org/tril/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 hppa x86"
+KEYWORDS="~amd64 ~hppa ~x86"
 IUSE=""
 
 RDEPEND="x11-libs/gtk+:2
diff --git a/games-misc/katawa-shoujo/Manifest b/games-misc/katawa-shoujo/Manifest
index 6399f2a33852..327e32830745 100644
--- a/games-misc/katawa-shoujo/Manifest
+++ b/games-misc/katawa-shoujo/Manifest
@@ -3,7 +3,7 @@ DIST katawa-shoujo-1.3.tar.bz2 496193762 SHA256 a7fbe9330e60a5457ce504f20de35719
 DIST katawa-shoujo-256.png 59803 SHA256 8130b39af5341b0e1c85cbd6ef5be229de2877d696e5b372e1aacf176778df45 SHA512 7d920c24f4182ba72d5b3d641d7d373c166ca4c7d0b6a396f5e3b9281cb43f7e6e8e761f2f181ff061705118b3080807866fcd290d2b471e98c3a584d5fa8e0e WHIRLPOOL d2b06b26d2ea5bae5292fc5e6f3f4571fa82a4f70155e38a3c8a21778caabc37b2a13b2cb7637a0fb05a55243a63e23c96d0538bbcbc631810f15c069d26f590
 DIST katawa-shoujo-48.png 3621 SHA256 a366a52fd9dd241182d163e28a37f537fa71d5d46f1fc899da08b492c371a0fd SHA512 ad24156cf446ffe92068baaa6d512e6bab90587db5ce01b3c18e6c42bb9b8c91f7eae3e9547099d3f8f0a5d3f144676c3499c0a38d9af845abf79e153b543bef WHIRLPOOL b62253218dbb981f32007e22cdd36decac8948e4dff416ca60de3daaab8cfad9773622e194b885c0145a499008751c5a09184b7f0a0dc3b9153d751dd0d1b584
 EBUILD katawa-shoujo-1.3.1.ebuild 2048 SHA256 bc15230d8ab00a1e8765bea3ba78b6b83402f6afe12bb974803028c0bc390d8a SHA512 74ab33bbfe2e7ce3bd77aff8fafb591b8766cf299b743c83a4abc68ba8cb476ddfe2cecfe00370d3525dd9f7bf957b33e73dad5ff968ff9031b192679a5069be WHIRLPOOL 8e170cf5777bf8e64ada01c224a8ce3683c2d96c41bbd91703e204a70333e6eec57dfcefd96551308bbcf585fb9be7dd78b540e7df6fe6bf7119af17cb7f54a5
-EBUILD katawa-shoujo-1.3.ebuild 2258 SHA256 fdc409dc49238aefc51b6c45269ca1663dcee87285725d98691f4009fcdc041c SHA512 ef6b1e8c7fa05327bbc5a1c741183383dd6d2183a4ce0f3fe094e35753c52915f764f4d3b516a27518189882e690b1c00b36522e28a0a9da5a3abfa01bc77ab4 WHIRLPOOL b8b73d16905dd5bcfef930dd43fad26d70b3dcf0268ae3c016eae4bc8d8b940e7c7ec97ffa46d9bd4d448e05a6cdc8fdd9aad7c4ba922c9873e0bf38d6be8ec9
+EBUILD katawa-shoujo-1.3.ebuild 2260 SHA256 97fdbf67434ae745c8de5e3e58c66c3e14605200977b523e7bd7d7b06b97be34 SHA512 2f846e41feb95776242d24997717644b4a282fd33e8db8f73a4de59a0922a1e421c2d8b60a209d2475953cc4d42a33754c247074b281375aa256982e13fef03f WHIRLPOOL aa2a76fca4ae20885501e12d44b2aa77016ae96cfc31d833c6e4f3a251902486b3be8df83f86c020ac6e9932acc440e981bc8e330747367183f98b1e96b30801
 MISC ChangeLog 3456 SHA256 7956124169c075f5675cd0a79c6dbbbb8192174f179b66a277080aed7d67d1f0 SHA512 2bdd103c700396973250ba95a1d65e6aa0c48a8c7987a008e259a097e24f76ec8f33fe5619360d280527ca8ccd8c368a4c0daa79bd4db5a8e56fa8e706986606 WHIRLPOOL 407b6e23b8e3a081da21e161e8389f05df9bdad29c956a3a3b18ccfe304997fdb8934f7343d576970be3ddd54d66abae93049246890b3e414e25db2d75607dbb
 MISC ChangeLog-2015 2738 SHA256 81fabec165c57da11bc9999c809d8e58bf3ff13abbbbfd714cbbbc32a9d80636 SHA512 bfeffc4a355d460d1507fba804d0cb3394d7325396b9ad4ee641aa395c94837eeedbd00dd357abcdebc38b8bb1eabd0fba5efba847e35d0b4b876c3f25fa005c WHIRLPOOL ce998e9f6fb03cad299a93e6d49d24a7a4d6b9320c9bcd309c83f34f13b9d1d4bcbae9910f375337980360f468f0b832c8aa73310ef94803ed9f24939b2a1a32
 MISC metadata.xml 1441 SHA256 25623e476686e27e9444e90566700530a835b91e12dee9485bdbc534791cd675 SHA512 57b626a95cd8a7ff92de13b1c1a85124ee2e3dd0e9860a57cadc62332636ee6df7cb27c9428658b17002af70b949af64f432de82dbd838f2edb6f423039812ed WHIRLPOOL 2c33f8b98154ef10ec2f3077fa856252c615e6a53a1e010108627dac175318f93cd3c742e1e2a22e9643a05152518e636a531ecea83953c076596f7cb802bebc
diff --git a/games-misc/katawa-shoujo/katawa-shoujo-1.3.ebuild b/games-misc/katawa-shoujo/katawa-shoujo-1.3.ebuild
index 984acbf1ba20..3cd733bcd7ab 100644
--- a/games-misc/katawa-shoujo/katawa-shoujo-1.3.ebuild
+++ b/games-misc/katawa-shoujo/katawa-shoujo-1.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://dl.katawa-shoujo.com/gold_1.3/%5b4ls%5d_katawa_shoujo_1.3-%5blin
 LICENSE="CC-BY-NC-ND-3.0
 	!system-renpy? ( MIT PSF-2 LGPL-2.1 || ( FTL GPL-2+ ) IJG libpng ZLIB BZIP2 )"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc +system-renpy"
 
 RDEPEND="system-renpy? ( games-engines/renpy )"
diff --git a/games-misc/little-inferno/Manifest b/games-misc/little-inferno/Manifest
index a7e9cd95ec42..bee85f770d43 100644
--- a/games-misc/little-inferno/Manifest
+++ b/games-misc/little-inferno/Manifest
@@ -1,5 +1,5 @@
 DIST LittleInferno-20130509.sh 194304242 SHA256 3848f4037652699c162ebf3ae78f6dce81772394911483c9f1ef49cb51f6a198 SHA512 19e2e616b1b1a6e7f8974ba12756c4b54c1daa99c99056891c56f7ed578f20a15143d683960efbb69f3d680243dd219051fc0bdac60ab74dcddc1c69df7d00dd WHIRLPOOL 2a25aa0fd1103dca63fa422cc3573eefa8a7acc819735b591a44ce89c9f9581a75287dcae8dbd8d2be52c63782af97a3b36fc676ee98288d73b9d08f2b2b2ec4
-EBUILD little-inferno-20130509.ebuild 1602 SHA256 552c098004a5414cea72962824e1dd2565fc04cef58a5e430d8fa64d6d4c5822 SHA512 55d4461f4e78ed74fd219da6b971193bee112887082a13e2d79078d499f3978a6d6e3052c0a606f511a65c7f61e9f83b038114077670751b1cddb08fa20eb737 WHIRLPOOL 7e846deed075a1d7c293436416d635afc403d12cb28de769391b93ab492daab492b8e0303b66ec3604406b21ffec5118a246e0f72c5a503adb4d7bdd8c860f8a
+EBUILD little-inferno-20130509.ebuild 1604 SHA256 76eb4a6d1e7621dfadda9358bb49ee14623c2fae6919a8bea2685b6b6a438c6c SHA512 c9f2bf4c3953d10876b1cb8936e22e4b7614f10979d2955604b14d166af4defb66355f2fd2829f0c3c271678bb4e787cfbf2868805bc1b1f4a82007eba6b0725 WHIRLPOOL 35fc7580cf4d5fa37c5cd9170a91d933e950179ae3856946c1a2a99b981e7239885b28cc93babecdde62f60dd77d9a0539af38252810473ef0b1ef97ee79a753
 MISC ChangeLog 2849 SHA256 d8d80a407b252aaadf483ffe082901544ac5acf600714676c7d438908ccae798 SHA512 74ba487af135ef2217f05cf03f8f852a91a0e4c48484456f5355b4a3ecf3bd49b915cdeace66429636318c90fef0e10e6bb8c5c871d3192ca43c2c1003bf365b WHIRLPOOL eca40f32cadde0f56c11a754140e9a9edba01e1febd35eb7508812fbc0f7eaa8380e6594bd191d0d745f9a834b99e6c09766d18c67cdcc69e7f9cef745bc6cf6
 MISC ChangeLog-2015 1012 SHA256 3b06690eb2c7c2950079c2eecd52532c197f6ff4287c616c76806b94e639d942 SHA512 34bc4a477c2aade576f36a46e6b13f0b64177781ba9766209d1ed7375481af0de6d9a5d1aea210e8fe96bb59e67b4969ad998a8231e1c21a76ec5af81fbd430b WHIRLPOOL 1935cf4b4bc1632b26f3b741542b6f9ebca557f6728472561abbe57108ddb5de4ea59a4d7c9a33284aef0b0ac4b4038ee544e9adfbf1f9056939e27b81443654
 MISC metadata.xml 326 SHA256 0c50291b59a587a1ee49919fff23be8e50b5ee75a602649f6cbebdc8d0fa6fcc SHA512 87eee3f514c290aba519dad7fdb335424ebd7ed7bb1cfa8650d293136ad2a6efdb44eff2c1c48973e9a587f282a2114866d9e4d66adb857b61a085d5635ecfd2 WHIRLPOOL 4982d50602f9c8bf69b1276877f81fcec5ff4237612f205d7362ef4a8f694f16034851521a287c4c09f43573b65a72a1de11214fc9626ffbb177613df1534e39
diff --git a/games-misc/little-inferno/little-inferno-20130509.ebuild b/games-misc/little-inferno/little-inferno-20130509.ebuild
index 69641bbad2b2..8461d5670943 100644
--- a/games-misc/little-inferno/little-inferno-20130509.ebuild
+++ b/games-misc/little-inferno/little-inferno-20130509.ebuild
@@ -10,7 +10,7 @@ SRC_URI="LittleInferno-${PV}.sh"
 
 LICENSE="Gameplay-Group-EULA"
 SLOT="0"
-KEYWORDS="-* amd64 x86"
+KEYWORDS="-* ~amd64 ~x86"
 IUSE="bundled-libs"
 RESTRICT="bindist fetch bundled-libs? ( splitdebug )"
 
diff --git a/games-misc/lucidlife/Manifest b/games-misc/lucidlife/Manifest
index 9b9128109617..06d3e0b7c985 100644
--- a/games-misc/lucidlife/Manifest
+++ b/games-misc/lucidlife/Manifest
@@ -2,7 +2,7 @@ AUX lucidlife-0.9.2-gnome-vfs.patch 1549 SHA256 0c936b3543fd6d31c2eb8907fb9f89c2
 AUX lucidlife-0.9.2-underlink.patch 317 SHA256 2f8448086f0dc406a2a293b61b7f94728e751d1841af8ecd523127ac15ab2714 SHA512 ee33861f9d3f79e1d662ce5ce5c1d1a47aba87b9a45dd04c93ede13ed6d85c0a7365b0f1cca2e7fcf65960985f295ccb12197fcd44679b6196ae1cba11643592 WHIRLPOOL 41452ecea834f6af0c5cd8bac4ecae71a355aca8e39a82f7f297a1596aeb64ca8d6d01b2aea5a49e0370e3e79433acccb451abbb8d21f0503c8c82f0d9ae8afb
 DIST lucidlife-0.9.2.tar.gz 1506448 SHA256 7ef3e3a71e771642e2749ccff2adf1c88c9f1798444d6a34665ce528aef58048 SHA512 5184d6a5a2d48b38b2a72edbab6ca4f251547e5c54234792d3821482d39e5fbb2b96ab171544dc3e6843f9976c1dc40935eb3537dcf06c1cb0c717260bd04b01 WHIRLPOOL 41339dacc97fde20d7951f8e51b07b3913ec1155f4b7393b8dfc38ccf1ac58f532f54c339f05f7568bf53d88d2ca25f45611122d781615737b651124feb427b6
 EBUILD lucidlife-0.9.2-r1.ebuild 830 SHA256 3667befbf97a237af429179dc30d9c80e4d53d6d4d32dd25a0e36732bf0a4db5 SHA512 692bfa894ff1348544e9204b24c1cfb5be246f76f602bef0b6c827508588d6d05321220b0283d2e9b38c3f71f43e0f3dcc2ddaa3666568cb554ae8456a1240c1 WHIRLPOOL cdaaff6a20f71fa3df2800ad9f4b5ebf3a9ae26ed9289199c7eaf59c8f6eb24dfaec33560ad7ab31f3d6f6ff15de825fd1ea9e84991e11774e61c8da637f797d
-EBUILD lucidlife-0.9.2.ebuild 837 SHA256 fa7a6c899248f36eee2247a2e0fb2210b7c4f2df50e92673e07698614f92fe73 SHA512 d4eaaee3cac46d7e9113885c4af572b3e354c5cfb7a1fc2258700276fe880da64fc72be78339b25aa5de2dbc7d19c018c52dbdbbe7e6dcab37b3bf5094c3bc81 WHIRLPOOL 786f20c8f93d0f494e07a5b8ed90968c2580ca48e871df921a6bfc6fe02df5a1ce7cb02a5649433b11ca0c222acb6f5b87d1ba6d899daf4e49d970b422e95114
+EBUILD lucidlife-0.9.2.ebuild 839 SHA256 45f5980536f4d8a2366e86469bf2a09d1ec3431ca7f885c506005f3c02d5f941 SHA512 fa48e0ff07442e67871c6ae2619fb448ba5a74d5180661d01e65c41e8c97919866a7ab238580b5f834e17bd1bfa1fb38fc49ddb0c904392f31058dd1ebb1b29c WHIRLPOOL b3b7b818f3b37b4a3be16981ab21991e32dea62a821a4d24a52394d44f25db10cfb87b994147d7c7fe21c966e58a4d4ad0fb130754daa23908552f5e13a834ce
 MISC ChangeLog 3209 SHA256 cbeddf81934629a739c920b54506f324d1b548995cc765031e55c4634aef61b5 SHA512 abe724338fb161be4b0c5df9c3cce71ec678ee2d180dfba38a935abe6c9faf16eae1d18fd8df6f001713c33c5fd9a59f81353ae22be0007e4810b3242ab4ffd9 WHIRLPOOL 97787cb92c4a38a0b8b7a8b3db1d73ce30d9903e6f25f1a622a98c4e92b1140301abc5e9f7eae424486f6c243c2dd392c67282e982fd141db6b69305af3a0e6b
 MISC ChangeLog-2015 1409 SHA256 1db835afdcd0c8381e9e633a5a033ebd77b6a81a0d063fc244c853e04698121a SHA512 017f718ec020ea5096278cebb50ec8b6c9a809d6a5fde366aa0a8e4cc986863680820883ab2fc52d1db45fbcd1d6c7f0f0cd524723d9212b12aa2307ec7e8105 WHIRLPOOL 1cf2f4d6afd00ebebc6a94a9e44f34529ad64290d424ea9b77bf7c7e4a91ae251b494afcaa564dc08f3fe2663c81b02f7caa6bcb852f0fe4ec5b3d47c545253a
 MISC metadata.xml 345 SHA256 37472e170d1f0fa300efc06319512729d7dab9c1d53a23f95a03c954547963f7 SHA512 2efea20f36611448fa9cfb3f6137f0b78b74c5515c5dbf482e02b47c0cea22fd0e7f6da9d29a31b1a85ba827269cf7a71f5786d3ff487f48850a4c756196bc89 WHIRLPOOL 3ebdabd72bd549dde7acf0178f31ef2428f86ca92f56aaded78c4fdb487e6b6b1b82ec8f1a6c2c4e548aa6399af01d4fa676c8c1dce55755ff49d8b2a5804e01
diff --git a/games-misc/lucidlife/lucidlife-0.9.2.ebuild b/games-misc/lucidlife/lucidlife-0.9.2.ebuild
index 7e1b20dc55fb..cac06669cec1 100644
--- a/games-misc/lucidlife/lucidlife-0.9.2.ebuild
+++ b/games-misc/lucidlife/lucidlife-0.9.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="x11-libs/gtk+:2"
diff --git a/games-misc/nyancat/Manifest b/games-misc/nyancat/Manifest
index fb560909d64e..92872197936c 100644
--- a/games-misc/nyancat/Manifest
+++ b/games-misc/nyancat/Manifest
@@ -1,6 +1,6 @@
 DIST nyancat-1.2.1.tar.gz 14109 SHA256 a5bfafb6ea69917071aa05f9a52db43e47e97272eb2f4c6c827630cddb015972 SHA512 882bdcfe702d4613484b293f767a2ed74da63f222071e59f56a4246f56947882540930bcb2deae22f6e3326064f1c6f0ff7eb78ac6d7aa08125ebe64ebdf16eb WHIRLPOOL 3c263a35cee24babac92b3ed6ec33a8a4324adcec3364ffef2d0a3ac01786689a9969a21fde3ce1d278f572cd204be336d32d2411168bf6ac46ae47de20a5204
 DIST nyancat-1.5.1.tar.gz 15124 SHA256 c948c769d230b4e41385173540ae8ab1f36176de689b6e2d6ed3500e9179b50a SHA512 0a45bd0b1a9b9f85650a986c7f9f8120441f6b0bd346281fb44a5470382484738e660dffe17b95088332c50b6aed3feb4b2f949f15f37dd9c1b1885f345e157d WHIRLPOOL 79aa5ed1076f61e1689c0b9dbffda5091ee2fc21335dedd79108ea746d9763b35f1069af3961b04f091b344ef6521525e56f8cd3cbe6d6048611998df7cdaeac
-EBUILD nyancat-1.2.1.ebuild 479 SHA256 1eb412945592a19696bf88acf5ffba3745ef8778b3245eb775864bcfeabe6bca SHA512 20db0a43794b4428e8aa928cddce20a0515c04c5440ae7fef97c2617be9eab217c98ad792b77bd2ade75e0a233786eec4244aacfde052783d93e91be17e29112 WHIRLPOOL 94f2793bb054a12619cd01dd1e5c0c691512869db17eaced0d4f1d2c35ad5397e682dba54f0b6d62c9f2e6a9f70cfd373eb6f60054aabf38027bf2bdafc8f88e
+EBUILD nyancat-1.2.1.ebuild 481 SHA256 ea8cd61112cc13162ed8beb8aa5c47f92203fcface73dd2f16f2f2c9777d905f SHA512 2c3db38a3eaa6e860f72089f6b1645430d4fdd181990ba3157679231b82153bf546554db02e58caaafcd4f3d848fb3956e019921f4bd6b7e2bfd8c06384a0404 WHIRLPOOL eb14adb2750601186633225983ea92b5969842bc0737f9bda9d94f5e240050c816c26914153ca5450ba0d01c34452234be704010eba928e536fe9341b4a994fc
 EBUILD nyancat-1.5.1.ebuild 447 SHA256 7b1c0004fcf38d0f4c49c9074c9dc583fee2ae252dd3a74bdc45247641332b98 SHA512 73ea95222930083ea5c8fd04599e9482883b9e3cd450c17390b5bf3d6fda4ea34cbdaad53d24f7dc64aae22271f1b6e675ea533da4b442dfa138b02f88449df4 WHIRLPOOL ddb77875eac5ec8eb88caf7587b0e56f2abe5e1f3a85a45cab0b64f2c1277333c4862a08f429c9d567e7129572546ac08884d621bfbd963b67d6877573595727
 MISC ChangeLog 2843 SHA256 33de1fafc78b8fdf8369ef209d45615082ceadb9efa1ff27258ec1db45383dd4 SHA512 47bf498aebca69387986d1351393329cd3e420e4e00e1d75e3686ba61c6e84833294d999a5cdb54c10632b9081c2628efd6799d9eb883585ed0d4b8d27182958 WHIRLPOOL f04c520a9bd43e563279194980ac8d226c3334a4d4ec022a0f5b0ddcd0c65528e89e4430f4e445da2e443dc7535d7b3f8b2c3200dc7ffa3d29b90f015df1b4df
 MISC ChangeLog-2015 1332 SHA256 e966c6c7af7337b9787057c92bd9dc403964dd758fbf679f616f3aa4e488b04b SHA512 eaea0cc902bd7fbba381bd7cbf6da74c102c0ff33615143c10866f4bea11f63bdd624727ded295597eeca170620d92013309d40c6d3e48db38a7068dc02a1096 WHIRLPOOL 0525bbec9e4ef4e2cae9408d94f2ca0d66c7b8f789c1fa8c632f76085ff26ef24fcd8196210ba95d858533face358850bba1f5d20d52c8b252fff32d95acbccc
diff --git a/games-misc/nyancat/nyancat-1.2.1.ebuild b/games-misc/nyancat/nyancat-1.2.1.ebuild
index 3966fcba0fb2..fea71fa4716d 100644
--- a/games-misc/nyancat/nyancat-1.2.1.ebuild
+++ b/games-misc/nyancat/nyancat-1.2.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/klange/nyancat/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="UoI-NCSA"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 src_compile() {
diff --git a/games-misc/opengfx/Manifest b/games-misc/opengfx/Manifest
index 1235a3d0517c..aaadd9dd3a99 100644
--- a/games-misc/opengfx/Manifest
+++ b/games-misc/opengfx/Manifest
@@ -2,9 +2,9 @@ AUX opengfx-0.5.3-Makefile.patch 1349 SHA256 5381e3e4efdab52cd83fb2ff4f6dd87ddd2
 AUX opengfx-0.5.4-Makefile.patch 1349 SHA256 5381e3e4efdab52cd83fb2ff4f6dd87ddd288dc834786c2679c38f4e6f7e50e2 SHA512 f2cd513b6b244fcdd522e488c3becd27164f622f0bc723bd1f704ce1e76419ac628425cf3fc437beb50f851735923e85eae8a3f70e828f58edff4d632784bbf9 WHIRLPOOL 964ff2c87be1f9150fc6e9ad6dbeef76cb30c9b4bd50c59d5e461da54664e9436a25f1682a419bf7c7567b5b4f99dd162601fbcba62ae0740e887a45968b95fa
 DIST opengfx-0.5.3-source.tar.xz 9638892 SHA256 28d253ffa7a3618f7c4efb3b1076bc652204c2412d3cee57a6b9ffc13bda4014 SHA512 41b41192dcf95e2ac03e7028f55aca486c13a8709a62fe5970918494b0009ee07118e0d04d10426fea35ee82c842d28fc58f8c258df2e8ebe0b17e40c892f829 WHIRLPOOL 309c8e5ef1fb83328712c0516c55ecbc53f75117a1fc2aedbe9e61db05bf14ffe4f9fec6ff6a1f50dfc408735de3d5b754d97b026957b02271b213ffc32a9872
 DIST opengfx-0.5.4-source.tar.xz 9638204 SHA256 6b6e33dbe11b2c668c3b7ac1534b7a8eb567d702f42c99bd871c69e6682ee655 SHA512 42f8438c747b42a77cf9d86c5da60ce3ce84ed347d714c345f3871806f9e35f2ed4729b445e0ee319f3e2edd53458dfbaad5ca42e389c3a2e800bce19223cdb1 WHIRLPOOL 3cd952b9f0ddddcc61acc6077f828c40eccf87835964a9ecdf5b1e27e4e6569a13acce9224a0ba52b4ba2fca5906a3b990c24ac11bfbfeb6c3e5c1f859928184
-EBUILD opengfx-0.5.3.ebuild 866 SHA256 bc02f204031720f332807b750324ebcd07af357432a4d62379f8dfc6178b2487 SHA512 22aa2578af4d01f841794febdc81b2d60eadd3710793761b98efb2519856357256e83a5c8fe472194c0a2430f8f10b161d55c5509e096d9074fc53675bde76e1 WHIRLPOOL a13f84d6eae0930df4ec81d7ddb788054d915d2f4a1f58a201d43c1579bb62ea5c95edd3c66713a0233e8250c263dc04eaafd8cad3a572f0f5c1e2162f7c6f1a
+EBUILD opengfx-0.5.3.ebuild 868 SHA256 cf38e0efeb1c96695ca4d3a407c3d8f172e95a2babab473d453f07e6ce930be8 SHA512 5d75c5864bb34ce0b62828e263cafa2e993478aa074b99317fee99334c60ed3da8f3c2affb12a884fb256ce35b0004503f48d1f7023f3fd7b55e301f7b0b460b WHIRLPOOL 15e33c74dafce41dfd5a1c8945f1c8f8e9d47aabfc9ede41ca3eda37cda704ad65cb90292154b487f3b9f0710cec326020c54ebd5e5a009cdf09373a07e9328f
 EBUILD opengfx-0.5.4-r1.ebuild 841 SHA256 7e252d650c520af72405c54f71a720cf6435b79f521383234d2d2fede2219b26 SHA512 83f4faf5bf14dd7c7d3ffc11b9666a5dcb976f6abd2634869ad01c31b21f4ba33cf9699f5233dd4d735feb5941de1bd727858bab4ec9548bd56184013c3d9299 WHIRLPOOL 332cfbb714c83fcaf21daa86cc9c76e29a53d506bb772712aa5e3bca4461b46c5718609dfef29bcb73b627d935762191af27fc579b4bcbff6fba4bc090104dbb
-EBUILD opengfx-0.5.4.ebuild 866 SHA256 fe3da0dae16707d3900a36b2cd4a91bfd3f7e619172bf87a9e1f924ecc9ef338 SHA512 e2adb0fe8f66d1f30ef9750453243158be07d33a11687a66314ea2716fd31a74a88716a78e686d51ee2b7a1b6adbed65149501d8249397d9af5296bc2ec95948 WHIRLPOOL 5c9def801ab32586938a8d5c80d28438c732a728aa5e6a79e89a96abf17471362088d942ec01e8e07e32e49ed1a229a4dd2780a4775b5b62ef07215673b40bfe
+EBUILD opengfx-0.5.4.ebuild 868 SHA256 fb990628eee79e6ad5142945151f095db0b2b4dfbdd689d7e51fc4dffb3b05b2 SHA512 8490e85c57f8eaeb30709cffb87b81ff7a7a49ecb8d8e98988df04a0d8d5c91a0ebbe5da09b8be178439974f579a6713c1fddbfafc850f3601a6c22803b1a172 WHIRLPOOL 486b1855dc3b54cd81a8a0d4b1018d36f654e402f1421fbd4f6d10e482f4faaed741cc9ed13b74a6f1a0db36a029d9314f3be6a5214f3e5bb910a4c0cde38bd4
 MISC ChangeLog 4778 SHA256 fd4042b3ad8152d10ad8ed2d9fe3a28dccfc2c2053be2ca9a6e71e95f25b74ca SHA512 3512dcaf4eb6e814c4173ad170450864a145fd48dd3634156e2d58499e19606cb0091225ce58d93f5b5eee1474f49897b21ce37068a229dfc88e8a11c4460e79 WHIRLPOOL 4a8826212fb45fede1c2111b475d235de656dd878662d8fbc83a23d71845a55e937e09ebdacd413c98cacea91bd4ff431d3ee6ce585b4a4d9eba64aa09ba38a6
 MISC ChangeLog-2015 5707 SHA256 993297d930260af4737f770fa67ed7a45c37fe5f5bd73f7831fee8cfcb24f497 SHA512 b8eee35b16556115e86e249a6a519c06d36d95165a28f6f0e5d90c683e391223aa91796da41116ad6d2d9cbfd21c0ba690a6b70fcb67f3478db0aac778dbe26b WHIRLPOOL d04f651407388162cdf27d1ca88a516b635371b904bccaba1efbfb4db5876fc55882459963fd2fd30bce61d4a9cbbe0eee41d05b0a860271ea9cee9fdd73d556
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-misc/opengfx/opengfx-0.5.3.ebuild b/games-misc/opengfx/opengfx-0.5.3.ebuild
index e3bb8604796a..7b19973c7ae5 100644
--- a/games-misc/opengfx/opengfx-0.5.3.ebuild
+++ b/games-misc/opengfx/opengfx-0.5.3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://bundles.openttdcoop.org/opengfx/releases/${PV}/${P}-source.tar.x
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE=""
 RESTRICT="test" # nml version affects the checksums that the test uses (bug #451444)
 
diff --git a/games-misc/opengfx/opengfx-0.5.4.ebuild b/games-misc/opengfx/opengfx-0.5.4.ebuild
index 16570eeb2569..7544640c1a49 100644
--- a/games-misc/opengfx/opengfx-0.5.4.ebuild
+++ b/games-misc/opengfx/opengfx-0.5.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://bundles.openttdcoop.org/opengfx/releases/${PV}/${P}-source.tar.x
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE=""
 RESTRICT="test" # nml version affects the checksums that the test uses (bug #451444)
 
diff --git a/games-misc/openmsx/Manifest b/games-misc/openmsx/Manifest
index 8c5c7864ff24..903571e627c0 100644
--- a/games-misc/openmsx/Manifest
+++ b/games-misc/openmsx/Manifest
@@ -1,5 +1,5 @@
 DIST openmsx-0.3.1-source.tar.gz 152798 SHA256 ecb827353b727f3bd41e57d101a9c5f0438e961fee0bd3cc0e5b3ba34ec2535b SHA512 e455f99f32d1daa77157def4f109dd1456169ae2b527290035b6a52f591c13fb7464fd221e00eb46bf03f51e8d0101de08a9e47cebe2430ad05a840ab235973e WHIRLPOOL c5c04e0c5681206482a4baa4526fbcc6289e519187950639cbc3ec85f5f8744ecd5449855027b96f6178252ac38c88ba1245f39ea8d881e05fb92191b5677d9d
-EBUILD openmsx-0.3.1-r1.ebuild 759 SHA256 2f9577b3f31557da9966843b00c75785ff7e4ecccb36639700dd9f8a255c433b SHA512 ccf52142cee9f3ec217076b065b3d44e83be1a4e10c42f6544e6b6a08ac8dd9bc32287f5fe2bef413266863408e3466f178ac27c9ab80a5eef175462edc7058c WHIRLPOOL 4f7cbe0badc9218341a6b0bc5a1faf9b9ddf36a29976e40025996dfe9bb0a59ae3cc78b88d2c067e942c315c8984ec22e626aab7c643944aced07e877341616e
+EBUILD openmsx-0.3.1-r1.ebuild 761 SHA256 923a2a90576fcd93ba30b622b2763f2b4811c803ae7ce41f02d342d10a330800 SHA512 8fb6a428ab1280e850fd07357ee9bdb64bf529955bd1e1982bc1a8ee03627ee843075f3193fb56f5b046758234dbf65c9c3284ea1ea541af60549d03b02c49d0 WHIRLPOOL 1b849764e0714796c5ce48778c141a2a53f4279f17aeb6adab3b0d508367944de867bd8627ff7ae550934e563df790b58999860fdfca1e9289bd7d2e2968a597
 EBUILD openmsx-0.3.1-r2.ebuild 723 SHA256 dd597b62b474296c71c2cd3960d5194d85080a2d3d1bee68a90f781b201555ee SHA512 aeeb6215c283bac40f92cb013ce58d9a87b6ed995668ded089a8908ef257ea8958748165ce91a6de109c4580205970f259851d43a979240f2f7234570c88750a WHIRLPOOL 44597e507910ea993a71eb02947b3450293c6318d7cd771a5b14b1a5bbb01df35784611e508cb00f746eb3ba5699ff7893afe35979840c3b5a47123f921b19b5
 MISC ChangeLog 2435 SHA256 6ab5d4ef9da1f8177d6765116fc1a3c7adb122039b0b9d6bf5f19e53ad19f12c SHA512 c2e9ca978ac768bcad995cb6144d5c9c4a635f7c9f5a1080a04d4b23123b3f75751d57a70b06c795d10fdc8a9e43cca7d67a00757e0340222676114041b77283 WHIRLPOOL a1990c0177e681e15fe10cbcf84948436ddff1465b7a091866866e741285ad73a693f248b1e936b6a55ff87f141abfeb3d4216df3c5708bb6987c213c4bc2d38
 MISC ChangeLog-2015 2191 SHA256 81c94b04a81d258c1a74b4b734289ed1973dcf5bbe2f6c58774a6541c04ca2b6 SHA512 7482f795a2be2171f4aedc9a5bcf82d6cda199773d669b0eb4c61bb22746975652a1931c2ad5fa6d0a610c57720ee204b2695323e8db276dc8877c20baf3a7c6 WHIRLPOOL 3b246876cd2cff402b3fc5aa90c709990130eb9d2336d510f855f409d6faec34b728048e851b43194ee78696ff997def1785f82967ee2637513dd25a10def83a
diff --git a/games-misc/openmsx/openmsx-0.3.1-r1.ebuild b/games-misc/openmsx/openmsx-0.3.1-r1.ebuild
index c528622044f1..a4f2f948fb40 100644
--- a/games-misc/openmsx/openmsx-0.3.1-r1.ebuild
+++ b/games-misc/openmsx/openmsx-0.3.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://bundles.openttdcoop.org/openmsx/releases/${PV}/${P}-source.tar.g
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
 IUSE=""
 
 DEPEND="${PYTHON_DEPS}"
diff --git a/games-misc/opensfx/Manifest b/games-misc/opensfx/Manifest
index fd7daa2cbf82..b10075e66d10 100644
--- a/games-misc/opensfx/Manifest
+++ b/games-misc/opensfx/Manifest
@@ -1,6 +1,6 @@
 DIST opensfx-0.2.3-source.tar.gz 11364270 SHA256 e512b855cb6d271f98bb894d25916ee0ac795907b013d8748561e829c07d5d0e SHA512 7575c8febcbcabe8f9042a1a197ba76b9020e335663bf70b0aaebafe4b0758f82ff7acc624b1dfdc12d38e346f139454b78ea29e18a8bb8bd2afd3d6a209669c WHIRLPOOL d748441b86881b8b2a56002b886aa0303b000f9c0569b0f109ef1b3e64df62953b39091785cbd3945d32bfcc90f7a65d64520fa6abdbb1915102dfed93ff62de
 EBUILD opensfx-0.2.3-r1.ebuild 570 SHA256 65e34ec6a6218cebd2586f9ae2e141470be66d2344738ae5fdeae364b355c030 SHA512 5979b73fca908a83893a7db7dc02135770d706a991af335e7f4876d93b2ae6cbd00eacd948ed91d20104557e8b896f75c090c6389cb9bd8318a602cddf8c5302 WHIRLPOOL 93d026d84c83607fa02240fdafeca2881756dd84df6776bc1ee344b29c4725541863638f8afdc9204351ecc486083e6afe3c60ffc85188bed4ad002368778eba
-EBUILD opensfx-0.2.3.ebuild 596 SHA256 179e282d44700ff45aeec75077b0bfc8d7b9ca4aba8bb7241005afd11786b286 SHA512 c7900db3ac521d975314f3098e2ff7b0d9ec7c231d31f7e8cc830dead18c57b4401f75e9f92b9f61a8b953eba9a3c1187409801f67e8006aafc3cf2607139431 WHIRLPOOL 3bc83b718412eadb669a380f0cbabfcd2b9f5f2b4f09e80fd9a8c8f1aca22e349976b98c5cd16aad0794fb6c2216b3da4e2276fb9be1bf06f24f02bae748d488
+EBUILD opensfx-0.2.3.ebuild 599 SHA256 45039fca6e33cbd068be7bc3fb16ff05d5c5acc4c0c99f5cbe895392d80cca99 SHA512 593431e4cd06bc1c746e5d4b226329478086f2e8b0b3ef7bedac7104e0cbacbda494bea10f7a9c9d721fdfa2d9d9cce1748c7cb76417d759c78e7424213737ae WHIRLPOOL 78c1c1b23326b62d0ade41f8733a4828c61d8bb00a31e8bfe2302f46a41784cb315c3c3dd38ec2ef6027d14a4708e5dea2706d1753e00cd4b5eaf31f611948bd
 MISC ChangeLog 2429 SHA256 0638d44bfa3fde90ef71a3817d97934cb2dde311b2240348d2062924ed92627c SHA512 4e3c2345251b30c64717dc856a7cbdc49141c0285fa4516a9e1499a393bd241000907e2c630e734b67e25254a0d8f11f591b8542e7f8e86401b59c74c7829dd5 WHIRLPOOL 72f253d49d8dd21532131209cbdce1cf5b4c55b08839149c66ec701e12f854dbf8660cc8544390a7fa6eb5f53b3ec2871071ee0d17c1afca181763adf5cc97f2
 MISC ChangeLog-2015 1034 SHA256 e31336889bf96ca9229370e55faa5781c240c1a023e36994db297c4f8690e8e6 SHA512 b3039f94b7f8e766d3c4780a240565dcd6194c3d2255654e3f9f958c60c86eecfe4fc8e5a16dcc111ee4d374a8843082ab0755f952e877d97b719dc0129835da WHIRLPOOL 79554c13f879d502c21887c0221e95b95b332dae689356d79c118c8834cde3c7d4cb2c58d5b13c97c7a2372cf18b7e90c15c3c8df949e0f03f0a48f07fbbffec
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-misc/opensfx/opensfx-0.2.3.ebuild b/games-misc/opensfx/opensfx-0.2.3.ebuild
index ad4a74cb0a47..ebf6d240bfd8 100644
--- a/games-misc/opensfx/opensfx-0.2.3.ebuild
+++ b/games-misc/opensfx/opensfx-0.2.3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://bundles.openttdcoop.org/${PN}/releases/${P}-source.tar.gz"
 
 LICENSE="CC-Sampling-Plus-1.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc64 x86"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
 IUSE=""
 
 DEPEND="games-util/catcodec"
diff --git a/games-misc/papers-please/Manifest b/games-misc/papers-please/Manifest
index 4ae8a309faa3..63066f026102 100644
--- a/games-misc/papers-please/Manifest
+++ b/games-misc/papers-please/Manifest
@@ -1,5 +1,5 @@
 DIST papers-please_1.1.65_i386.tar.gz 31566799 SHA256 50562ad2b01cb7558147cd05de4dc37c02deb2e66fc5d3bff77994785f9551d7 SHA512 093990a61c1b61d2999e6484335f4deddfecd3d66b7a5e29555c3170e890f6049f7d42a83529dcd993439de940b5dc96b8485d30ab46995d0f6814d5282669e0 WHIRLPOOL 8da4e0d3720159637bf8248cf53c2d7e6388bb3234469da71ae22720c6c76f0ba26a5ebbd116664f217165dc3cd06dd55cf001fd8203469f285570494eea95fc
-EBUILD papers-please-1.1.65.ebuild 1411 SHA256 607d4d4b0adf5a4ea93504c49102394ab7dbd9097ec2d0e8c0ac83d93723eb98 SHA512 8a39bf4f6c49b0a6972351e0f537a67d39acc4d2585790dfc5094299bc54e27174a33fd6042aa9698f21ff85c32517b75593d76df113baa8424c8a0dd7def278 WHIRLPOOL bb49b0971275d4a96d9fd84e3fa8e82ffd1f4d0fe2e93fdd28037d512a63cea412cf3ead98522930693bc53ba8a09f2f50a786a59fca9e46f84bfea8d3ef37ed
+EBUILD papers-please-1.1.65.ebuild 1413 SHA256 a00cea825de6260b6fcdd67fb1c41fe204a91ef81dcd463256f9b3c1947aeedd SHA512 a400988a8d1c9b65d8f46ac57c38eca4c96f6ed61147af53427352111a5be2748f72c3911fd2b294b12c5ac6af9ac940cb89af126107ed8ec5f9b8395238af01 WHIRLPOOL ee3222d0089691e4be5c5ed9f3ec1e04d282e2519464830829f190662cc6f854f898bfa5091ee57950eb5cb334e14e60f03b15b8d4ccf0cc814c3ee8deb9dbf1
 MISC ChangeLog 2636 SHA256 bd706bd9b31c08aec22df268acd14c1e9a843b8c29492b25494770f7bee93478 SHA512 fb9975471a1e01c60c4a5ac1a1ff1a56ae41f3c6aff921c0faef6b55cc1541673cbcf8779df6797da31dabfdc728d6028338e6150c072ebe74e797cb130ea47a WHIRLPOOL 5b57ecf037fb6e8afb2ac36dc2a6381d6d9e8a95d5f05ef2c4320d12f1a583976b4406beb70f84c8e740ad75ed38635cfac7c13c32935afe0de215cf505aa2e6
 MISC ChangeLog-2015 1080 SHA256 24624e9566127ee133b5c319b9bb2150a652e398446f5b3023a96bf2031ea167 SHA512 b1ea5fe034451bf59471948e3dbb588e32ad07cf29b7d59fc00ddaf1475a5e14e68ff305721fdc18ff8165464af2444086acf4bff1b12323d25faf5b332ed0d6 WHIRLPOOL e522d22456d22bc304e0e3f53063e6778616ec6c2b8a52b9d5599212b8d4b4376e2a1334563beaa3b5f73bfc25afc9e80eea236bd2a07e2cee21998f4f0df117
 MISC metadata.xml 253 SHA256 2c95b2eb99144a3b66de17be35eebcf65e5a152a2ec2f176165bb9cd78e5394e SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254 WHIRLPOOL fd044f0a960e57257f4a15ab16f066bbfe9983e60cd5fc072e631efc7027306c612a01d7fbbf57eb08d957487a7ce1961250194653d6ed87ee23f20d631ef854
diff --git a/games-misc/papers-please/papers-please-1.1.65.ebuild b/games-misc/papers-please/papers-please-1.1.65.ebuild
index e0fc25621887..fc553bd4d136 100644
--- a/games-misc/papers-please/papers-please-1.1.65.ebuild
+++ b/games-misc/papers-please/papers-please-1.1.65.ebuild
@@ -11,7 +11,7 @@ SRC_URI="papers-please_${PV}_i386.tar.gz"
 
 LICENSE="PAPERS-PLEASE"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 RESTRICT="fetch bindist"
 
diff --git a/games-misc/qlife/Manifest b/games-misc/qlife/Manifest
index cfbcb1f59515..69969160893e 100644
--- a/games-misc/qlife/Manifest
+++ b/games-misc/qlife/Manifest
@@ -1,6 +1,6 @@
 DIST qlife_linux.tar.gz 66056 SHA256 73df11d20ff670d3b6f41dd3c2bff1ad44f5f1a82589998c8c71447f8b4259c0 SHA512 3cd3cddff667476bb7d89c52ed85be3a3c8a8018cce19aff2e8bd54e7a2a54d4b1453d16d693edf17545519373f96b448e468bd5ca6b675291e7b3d1ab378eaf WHIRLPOOL 58fbdbd757cd54472a4bb66e9184253fc63a032ca213c9a19d72fed05f0a82925a12e0216a7b35af16df0cd818e9e9138056a9144a98dd2c950da43572357e84
 EBUILD qlife-1.1-r1.ebuild 670 SHA256 22559ab1279bc6ca97ba632a80994744acfc69aa918c3631771a0823084cf735 SHA512 24b18d9691e309708c409dcc03b9d75551c97341b8dc046263b9f4589fa6329a9f723ea2a955bba21f739fc956c1872464a1469289e5a6c61dcf3992842e349f WHIRLPOOL 12bdfb64359912528f7bceeb1b4044b28a49e5a0b47dd671da905178f61c12364cc2242acfa9ea593f15233f8d77f8d6564b3513a2b421032bd8b75d49f7a232
-EBUILD qlife-1.1.ebuild 690 SHA256 af64c028c8c4131e064674ad9991b7d6f889e347059e5089769521183aec378c SHA512 d997ff392d7ffacfa002b47c7e89c0c3214e3e5d2ded34ec4858309ee7a3e3b60060419f333f45e5406d3a34f51e868bf8082a718f865dde1eb6e9654474dd1c WHIRLPOOL 3a941eeb8aa396bc59eefb530720eec7f3373a6f88bf5e900733b1b0ee2a479340032b825d4bbe2cf47d8987fe9b0a886e4da3d61d202f15c76d69f0439c34ba
+EBUILD qlife-1.1.ebuild 692 SHA256 e40ec775ee922163a0fbcb1439c032019f8764565e6a9e900c164a12fbb85a0f SHA512 6058781ea88749aa5a5253bb1277e4fd4fdeb0a7a1fbdfcd816a57f208671d387ef7796402859ceb103edb3db3bf397001c7d41010605b5912c4ebd1f22edbdc WHIRLPOOL 5884f20101da1373430c1e1f6de698d6fafe05544eeb3e5fc85afcb03c896e334fc5bb460ff77b89f5fe07fdfbacdf7ebc89fb4b27995e9bdae92396f52d4405
 MISC ChangeLog 2663 SHA256 a4aa7c004b1f1f943d5954862a1284907cc76e4f983a10d1bc2a04ae1a8c964a SHA512 c4253ef210d0a8a40340dd79ccb02a5f355a296fa2861907922185b76d6918aa2a4ecc78f3b69090efc24a2086b1d6e7c1e72f13e524cccc12e8e549ab028252 WHIRLPOOL 314de30565660d46675c1003afb33481c0d476307df1605764999c3ff6d1dd76d458d88ea982ced0f51b1d232017eebaf482077c72920c4fe6f975271e83757c
 MISC ChangeLog-2015 1976 SHA256 7cac53ceb766e876ed7439c8a51a2ef8e673457f78abef2bd24d052f27a48405 SHA512 f8d927c748533162e7d8a29918a4f603617500f647641d5512ccc8114e6bd9cc1e419d6ccc0cb6293b0e26733ee6aac3c19a800f5494a32f130843e8ee037d5d WHIRLPOOL 5ad6362da8dc1eb2ae4ada8e5f95ff35b42bc17bf0c05f4c6d7123bd9ee4011af4b1f73b8bed0a0b28084cf368b51317905994347faa7e80c2b57eba2cbd011f
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-misc/qlife/qlife-1.1.ebuild b/games-misc/qlife/qlife-1.1.ebuild
index 41d2c04494ea..7fec658ac345 100644
--- a/games-misc/qlife/qlife-1.1.ebuild
+++ b/games-misc/qlife/qlife-1.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://open-maker.tuxfamily.org/blog/public/${PN}_linux.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="dev-qt/qtgui:4"
diff --git a/games-misc/rfksay/Manifest b/games-misc/rfksay/Manifest
index 76f2a72c8db4..aa129b844915 100644
--- a/games-misc/rfksay/Manifest
+++ b/games-misc/rfksay/Manifest
@@ -1,6 +1,6 @@
 DIST rfksay.tar.gz 997 SHA256 8b90eca517ba8e14708c0cc3b2712c14b829042a347490f43c23537678b0a8f9 SHA512 8eb5766b8a3efc31a20a128be0ec95eba7f61599ca402dc48d7c247516ac9f221d9f72a471923da566645b53e119831e61a7caa94f7b8c17ee4af802c42f6714 WHIRLPOOL 379bc65d4fb8fbb7dbe2d7fd7e30c4d5e3322a433f02cf0eaa8053f6e0bbdacf046bb7546cffd9de5277f6f00c24d0999c94a9de04869871387197a772ec9d56
 EBUILD rfksay-0.1-r1.ebuild 497 SHA256 ea04a814f551cf5ffe9f50510d47074087fbd176682f4ddda9b003b32214a434 SHA512 c3ae1a25929700a7d5365253a6fca5d20ae84072fa8d8b33a8f9a9168bbacfb0b7dced4177b003fed186afd7575a61d07d08fb85e6e4b9199193bbe6c5574a0a WHIRLPOOL 8143a8ba5fb1058ed3cfd790d9393b2b42132d437bd76d4fb658b69ec037483ee1b4a1152c3fb47980949083ef1e284e73f376006fc21671f26a7bd448aa7462
-EBUILD rfksay-0.1.ebuild 528 SHA256 30a3667028be7d7af7654716d7e05311de78e72103556955811efad8747b0e9d SHA512 40b826de7292687bfea4bb6b76d0131f1933cdb28d201029625c33a0724d00a7cf8123b0199dcd6290de78beab059961f778f4cf824204aaa059e3832029895d WHIRLPOOL 6d6f3fd771e2436ee9d05349c19ecb5fd1777222b182d9c8cff2fa08dd5e31e7e54ad2ebd88bff15a6de5afd47a85da46ae42ad9c6eb9a4d6628649345e29e53
+EBUILD rfksay-0.1.ebuild 530 SHA256 9fc441c51f66437803751d4c16c5100b29afbaa0ae1dc8f2ff317656fdc53a50 SHA512 63f015178b0ddb2c95cb1d35bd2018f8e4dc6aaae0caf2ef48ae4ae6f7eb43dd5b7503b3640579e79c42f7641d243e5be8b20547d181a5a39b4ba67369553ff6 WHIRLPOOL 3e524f424598490987d4be63332153442034fadbff96694f97dd7b30e24043d743bdc2cd535d0713460c2af3fe099513c2d333a5e3c5ac567d4b247029b86222
 MISC ChangeLog 2668 SHA256 e1475a745b95bc0b1c5fd6e720c2fdd75a4d5c4ebe346e6dc0435bccb33336b4 SHA512 66025ff619add4518ecee446a8164be1e41fb7589b40450ab2726b635bdd63adcfa433c8680ca7f189acb474ec55dfd3741299c4a5f07daed4e25ff22f48082c WHIRLPOOL fc5344420f5b678ffc4b4ace88a6e49508276c8d60c8ddaca772b7dd67d0a8aa19952459748a6e0f8c8875da52f10cbb270ca0a9cc1e823fde17000954c01d89
 MISC ChangeLog-2015 840 SHA256 da68e8783af43a946efbba0ef01bee8badd07583832511931ac192c5af45e499 SHA512 629524e13541f9f52350971454c6574dc637170ad6491262f255167dd2679b9cda397b2bc7bd8d28ae396866fbe58f2e2ce93c03db94340445ce2663b7ef64d9 WHIRLPOOL c43a4f1f1829a7ffab6725b7eaf53ec2af5aa17d014e4ee900444b9413ec3bac617e870893f62d43324db0180b2a6af0284605839f1848cd9a02a9c1fb45dc20
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-misc/rfksay/rfksay-0.1.ebuild b/games-misc/rfksay/rfksay-0.1.ebuild
index 0ecfd8585f0d..b16ff45bc266 100644
--- a/games-misc/rfksay/rfksay-0.1.ebuild
+++ b/games-misc/rfksay/rfksay-0.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo/${PN}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="dev-lang/perl"
diff --git a/games-misc/robotfindskitten/Manifest b/games-misc/robotfindskitten/Manifest
index 10e19d72337f..db0325df2d15 100644
--- a/games-misc/robotfindskitten/Manifest
+++ b/games-misc/robotfindskitten/Manifest
@@ -1,7 +1,7 @@
 AUX robotfindskitten-2.7182818.701-gentoo.patch 872 SHA256 e7ba30416f9a14870052091adc14726d4eaa9d10fb72ee64214c8c0037f881f4 SHA512 4189fc914f7047599f45b8f6a00968159e14a8c14d3e40f62e217c30ad96db5ab38f389f7cac608db27ba8f67c9841ac8a0927e2654dba9c1e04d997936ce8c2 WHIRLPOOL 46b9c9a9d5177508ca12aa46ea3ae949b81115f60eebd628b840e656aa04362852971f331018f74c5c589648380f9965803d4d3ace25cf42d89074ca37230ac5
 DIST robotfindskitten-2.7182818.701.tar.gz 437810 SHA256 7749a370796fd23e3b306b00de5f7fb7997a35fef30e3910ff159448c932d719 SHA512 736e44a62f016fb2a0dd03e31e6f1fb7c50a9115182812518666f3e4ad69f5703d7018f28ab14e0cfdbc8741656b15fa6ee577c2a5920e0d9af9acb658ac620b WHIRLPOOL f29092a17d5e13c8d9f578e318edf5045bd478c6c4e3ae4f05258ebc4be10736b9bc71e8ab55a287e7accee6f3606a18a4d475c09dbfa59a6bb029e548225d2a
 EBUILD robotfindskitten-2.7182818.701-r1.ebuild 522 SHA256 ab5827679002b75019add7e9a948842fbe8c5c7300326559a2d4184cc2ac5292 SHA512 7a80e3531a33086aa4a0c8a68a59bcad76a8c2b767df3be94de2258c416630a9bdbf12c464629d01f958f6360ab8691579a5db139fae8cbbc8c55963ecea994a WHIRLPOOL 942f65e6fc4bbd816ad24f8d349669325c61c1ecf4d544fba9be6aebf6374662b9fcdea4a865be34c90a8533fa5c3971a694edc54c23ee68d272cc667d4273f7
-EBUILD robotfindskitten-2.7182818.701.ebuild 562 SHA256 57dbd746de7112e039d64279f275afbb777ce340a94ce436b7c31e5013f2c172 SHA512 360c927e23d69ab0551017598d9fa784b8e1f038cfd411a5e9dd5aa5e01ce8ca5ab4d1dc9941b9171ee99350c1debcef55b0a853482496cf19f7aa146360a4fd WHIRLPOOL 117c22808c104a373b8d46f5e3ecca57f5c474ac681a302a30b915b6fa751ff33f09026eea1c742fd5220710c6d846acd070bdeffcdfdddbb594fcffc0bfe5d8
+EBUILD robotfindskitten-2.7182818.701.ebuild 564 SHA256 4e457bd53eb37669df5cfa8a7f4cc4a82a9ea6565aac90b40b2aa0d8661a0b72 SHA512 727c6bb9a561e28a7db5e93667c2240d598aab624cbb58bac032c954b3fa31eb38ca1b4f8970d0bec99d0027325363227dfb09a7cd05ddb4c46b4a883c0c2943 WHIRLPOOL 56ba61f12e7fa871c88b47a770b2daade3a5ea6ce7b352929b2235cbf624e3bbbdc3d0ca25b7e04f947ecaee9e3f533d3dfff6bf6beb71b970040dd089e77955
 MISC ChangeLog 3904 SHA256 678b723a14cd0c802af55a908ecfb7621a19cfc9dfa44e464756d3a3be8dccc6 SHA512 83e371894106094ad27f3f3bacd1463ac8eec4f1995221e334e106802d7f8319eac8239bc205901223d4a06bf7b53685ef5c726cbee181b2c69f715f7974162f WHIRLPOOL b2c7b015a06c595a664b3da0aec61c4d8410a97a6abceb88bde9c5c025b6dec0dcdf8648a469f6ab5828db0a3a3472ad3685c1999b04c6281eaec7eae86cb31e
 MISC ChangeLog-2015 1833 SHA256 53c56f39066648172c8faf0e6b087da6887b81386228af36396a2dba04f7d886 SHA512 87ecd7f7d56b339f21a337bedb4bdcec58601f3b1a9c9bd8401734ed353fba5f5c42e2033aebeab2a5ebecfc0c098b0b24ef5ad56402b0aff3959fb15c46c26a WHIRLPOOL 3821ddef12cb8dc5b619a8373cdb4a81dd2bfc1fcf75e7e82753a57abd5706535dfa24e988b92deb2aac1d9b0f0e578ab5dc666d299261efba639aa9aea0bf08
 MISC metadata.xml 326 SHA256 42e6daa364eccfe0f6ae4854f27470d672cd96f610c20d3fb768c51c97c48063 SHA512 1620797c8b2a84b0711c6bda03a739a5a6b1fc5f527077224fe0f3d0e462260d3aa0d1516d11f0dc723f4ad74072cfb5e5e1550c00c4001f78e78b4e3d827080 WHIRLPOOL 30404ebb6a8aaef8ea91466c6164b1fc7b6c7cba62fc32734ac5c997f01037ee8d217af5cbe3808c5baa84654047c75cab4152a578474c39e228717ac50e462b
diff --git a/games-misc/robotfindskitten/robotfindskitten-2.7182818.701.ebuild b/games-misc/robotfindskitten/robotfindskitten-2.7182818.701.ebuild
index 77be155004e5..b20701e3d16a 100644
--- a/games-misc/robotfindskitten/robotfindskitten-2.7182818.701.ebuild
+++ b/games-misc/robotfindskitten/robotfindskitten-2.7182818.701.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/rfk/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="sys-libs/ncurses:0"
diff --git a/games-misc/sdljoytest/Manifest b/games-misc/sdljoytest/Manifest
index e10f7e03d543..76bbd2da8364 100644
--- a/games-misc/sdljoytest/Manifest
+++ b/games-misc/sdljoytest/Manifest
@@ -1,5 +1,5 @@
 DIST SDLJoytest-GL-11102003.tar.bz2 85997 SHA256 306aa4b825ad880e71aac77d410f7a040ee6c1a372eb3d1db3301a8536a3c468 SHA512 4994e878eaacacb156d4d9988d1e7864ed4e5e3d4db6bc0be8a883d7edde87d56698eb22de5d39e2110be7f960e5bf080283a7563bb2bc3f17c390181e097c6a WHIRLPOOL d029b72346c92c4502fb28d5070cb695110f84e1d5be4a12c303f6b342c948ac7adffe9c9168037efd652b92c607e2fbf438cdbc7ceb2241b926edc261d7acd3
-EBUILD sdljoytest-11102003.ebuild 870 SHA256 1950ecda68d6275a0c9d27d50e65c17be74723d78d2a6e97080daf213a874b84 SHA512 aa91e85314da778a10ef1ba44c93f74d070d37dee37add8c6941e52fc65cc7ddc43266c82af6b8e88727681664ee61dc36a999051a0e45937b2d605d457eaf82 WHIRLPOOL 501318c24837b53fc73a183c22d8bbf0d5a74293315f237a28a7508a70f0b22d1c4b460b46290fb7d2f2b769b78af7b77242fc293240aee17c133078f97da673
+EBUILD sdljoytest-11102003.ebuild 872 SHA256 7441c08ae6f0619df2141f9f213f1b615f435c8ae0227474526d6e49730af148 SHA512 4b16ec9ed12bc139dd4876459528fe8cb1c27c299315297c720015c008d9d3bcf68428b2acbb3856d13abfabb236b776247952266df682c231666274cd8322b9 WHIRLPOOL dd9099c4016bf47db2e70bdc5d3560383ec74eaf9f7307301147da8b6f48b5af44af44c55b7cb9d88c8160b9bda928fb53f044a6b8fa6df70fe04a9169847244
 MISC ChangeLog 2444 SHA256 d856941b2601642fedc6e4e8c91e28210ce86ed12f0098298c49abdd74deed45 SHA512 637d9852b31270643e36aaa2d28c8596a2625e6923dbd0a8366ffc1cbb8f2faa6918e2eb05853b4b269b974928b7234ee686bcd90fcdc50aaa77e014b1be1d9a WHIRLPOOL 940ca6b00037772b690047d8380cbafa884732ed029e5d75ebacda2151f1a14e53a1c78b5a66ff2581a57b50656894805095247bdae7158614861d2a25388323
 MISC ChangeLog-2015 1230 SHA256 f4d98c1b66d97ab8c8429dada12ad4135542446da24650fd0f67de7bedda39ba SHA512 e1080a43d67e0e5635d3f7235d0635877264d96f3709b316aab09f3556563b4034ed891833e0c74e05b9e69ae1138a806bd2bcb2201f3d1203874dddde9abe75 WHIRLPOOL 1b5a387d770ae6b24aaeb1066d7d7d61ee322ffc747147f68bfa2f34f5ad3bf619afd4724357664f1a89a269442924765b5d3256c522a40657fe2ecad69028e0
 MISC metadata.xml 333 SHA256 865df6339799c20b92951740698eb0560a9a0d412b6c52be06a736b0a1389ab7 SHA512 f3c36c935fc927fa6ccf4402f67ec8d213fd94c2bf5855b4f1e6852c3c2c32fa051998cda971050c7f2f3257dc4102369c0af8d5d386ecb2a1e4d2ab177217d9 WHIRLPOOL 153841bc84e8e33972042ccc672c631ebe81f45854fd320519e0ecee9dd2f46fd3ece9dbb2c6250c9e480a70d2c44f01bdede9a5c0673fdc2cce850bf379985b
diff --git a/games-misc/sdljoytest/sdljoytest-11102003.ebuild b/games-misc/sdljoytest/sdljoytest-11102003.ebuild
index 32e18fb1100f..905eb1487338 100644
--- a/games-misc/sdljoytest/sdljoytest-11102003.ebuild
+++ b/games-misc/sdljoytest/sdljoytest-11102003.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/sdljoytest/SDLJoytest-GL-${PV}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="media-libs/libsdl[joystick,opengl,video]
diff --git a/games-misc/sex/Manifest b/games-misc/sex/Manifest
index d4cd075cae53..b1b304e18fda 100644
--- a/games-misc/sex/Manifest
+++ b/games-misc/sex/Manifest
@@ -1,7 +1,7 @@
 DIST sex-1.0.tar.gz 4820 SHA256 0f21831cd583ed917c2fc5f17bbe4e42f1d700417260b2e5924bf86b7f06eea8 SHA512 5b4802b63d20dc6ec5ab2b95210eadac02fe2887525d1235d0426589666d7413f2631504c69852ba494129ca66620f03b31fd6bf578642e88746b8639c3bba40 WHIRLPOOL d95cb2e4f7fdbab13bc62b1310e743ad783ee3cfb014f95867deb9dd0f7a89db7afbd7da86d698fc48d09855c41293ddc1f178aa34ae3dccb99868c7740dccbb
 EBUILD sex-1.0-r1.ebuild 526 SHA256 899da3e492ab81a3075f35602ba65dbb0dc426326ad7cee894e1eba90f2cbdcf SHA512 a68f7daadb5589b616df19b36363a6ce0cbfae3c93d50902ed224ac52ca2d2019b2944eb8f25d4f008b1a2a7794010b47b92e968ad9ea68f6faada4f50e8abeb WHIRLPOOL 3d0e3b57291f638debb7c88cd6ad0bc7a373db7deb9ae0cdbe9a826f3c8ee348d160196d0d19c6fa9a5c1df7aa2877d2007e4888b68833e3721661ee3ebb8ec3
 EBUILD sex-1.0-r2.ebuild 563 SHA256 6e9ae9b9d2742705a1837263af2f9e427f882522c4027497b841e68b92106e50 SHA512 162f606884fba02a079c3b0c5361e521635b32d14145922e9b23989f04fe6ef576655da5daeec2cbaeea3bf00d4b02186907596e81feccd9a20fed27b7a79ef2 WHIRLPOOL ceb049025742280a8ed7b84515bed34a309ba9a658e3720ba0e0de086ee391ccaffbb904ecd439e3e295f04c66fc9340eab58629403a6b9f88a9beffa9778762
-EBUILD sex-1.0.ebuild 546 SHA256 d4bdfed974318648c66597fe20d8fe880053cad7f8f3e7a7a0c701e4374a4afe SHA512 fb2bc5acc567cc109a85a753b839090e123b2545e64c6544580dc35534d21c39b60e9805d394e1e704e352ebc1febf6893a14c2b9894e4dab45a703b41b8125d WHIRLPOOL 84fa4049128aa698b366faf0ccc6aaf78c2653699d82281b796e00ff298d2f0c8fcfe6a13ef9a4f4adb32e12f0725940d9f3ef9c9827ef2aecd456355cfd5c03
+EBUILD sex-1.0.ebuild 550 SHA256 68723e6499ed4578388cd761db80230fe1ab42b70dfd5b7475f1ac303e278d18 SHA512 78092cf27e1f644f65e8bf74bf54d787f33e7929351f0dc4fcc06d40e21cf09b3bf11ca4c72edfc02e12c3386bb5138ba9b44d0bedbe78fbc2d11d56e39070e7 WHIRLPOOL a7d9f9381d097679cf3435f7d678764bc264c9c86fc0ded47134675665fd6458397b68bf8371429629d0c7889d0c303ffae893d7e260c7d71aad11937ea5c5df
 MISC ChangeLog 2879 SHA256 ee8f7faafa146418b0dfb340c7635f67ecc4aa77846de57d7eb53e727148b1d6 SHA512 dea4c0d408f6f598084c564f84c0d8f075633000e3cbecdddaa501858ccb5615e1d929a8b6a0cd027448466b6638a5f1f00e37befdccc64dd94f22a08386da92 WHIRLPOOL f15655811f6c09fbce6f9a952c389a6942c2384f033d11ad2918429d68172c2af797864d4ce0b3e34ad3dc0ef2cc59e3b76847d43934b5aa33f56d599183fdf3
 MISC ChangeLog-2015 2062 SHA256 53634356708f149a6252a8588ddd1fa600827de658aebf2261b332d74a2666d0 SHA512 97845d710f25b4ef841e9621687a52667f82e249efe98aba647c373fee3fcef0ca83718269219d9f66a61ce56632fa7e5a0fbfa48084bed29efb2a4aa670d783 WHIRLPOOL d65603231acb1ea5018d24c66a5467b06b1f0c65737d0adad21208d1519bda502611a5b504b0b112d891cdcdec42adb09f2aa0e530e8bc040ee96e44fd77d765
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-misc/sex/sex-1.0.ebuild b/games-misc/sex/sex-1.0.ebuild
index 5f808d802844..40de7b2b5f8b 100644
--- a/games-misc/sex/sex-1.0.ebuild
+++ b/games-misc/sex/sex-1.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://spatula.net/software/sex/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 
 src_prepare() {
diff --git a/games-misc/typespeed/Manifest b/games-misc/typespeed/Manifest
index ba7feb6bb1f0..89b37203b293 100644
--- a/games-misc/typespeed/Manifest
+++ b/games-misc/typespeed/Manifest
@@ -1,6 +1,6 @@
 AUX typespeed-0.6.5-musl.patch 422 SHA256 23589200273d43fdef04eaa28b5fefd6bf9586406e2deea7f8c05bbe59c6799b SHA512 23b264f8b5b9d7819f313d2fca1959997a14c1ac50c03643141fbeab89c20d7be0adc3c73589e26071296fedd0c42fb6f31727c8a563556a076f1e3742801643 WHIRLPOOL 556f3b6b9ed1aa71af956d9a852cc94985055568adb13d1c4e3ee6c9fefd8a89121639be9df4e9b036d861fe0d9d24312a357a08244c3783f0c4804c1b41ba9d
 DIST typespeed-0.6.5.tar.gz 254170 SHA256 5c860385ceed8a60f13217cc0192c4c2b4705c3e80f9866f7d72ff306eb72961 SHA512 cf3a8cdeb5fb1ee81bd5cf50d6b2aca1e7331b0bfde518c38050abae35ca617fbeed5bf2a37830a7568712ab71920f60c89197317a2721ae8c89829b0eede190 WHIRLPOOL db6b279889778573e1b2ac56b0ca1532a458ab80c768e9746d39d3717a501b921b05dc999b8f9056f35b95c850bd56c5190fa08d51a1f232de61b24ef7ab2412
-EBUILD typespeed-0.6.5.ebuild 912 SHA256 c0f3486e35c7ce2555b12cc8992c8cecc46a1e17cf4c158f4906d27bc104a97c SHA512 7f3960dcec44160d0b9992adc92cd673c644ebf246c35a0afdbddd1869d4d82f4c10fba205125a29663a2940bfa1a2bc27fa4b2151a9ae0720511a12a8f6dd8c WHIRLPOOL 275b31134bb6c7e78a96c635d7ef06f1c8ecc0908d091cabedb6c633cc8e4f930ed3f50ef69b7ba59fe59b72312e480a784b8e72a011c4f4956b9790bb7dbe18
+EBUILD typespeed-0.6.5.ebuild 915 SHA256 b0d7fd8a119409496a6e1da3e92d3bc1edbeb6181dad6ae55ccce089060efe47 SHA512 6830f2cf6e794a5bf3446526900e3b7e9445a602138423afb2437402a6d4f5ce44541eff630d56266d05a013d448dc9498c0ce2a3427f39b5caf6652a240fbe4 WHIRLPOOL b3189dee9f3d340b9cb5487ded131c9f458bdc3ae317d97c39711cdf785fe171a2899a276b3cb80a3f439a137d431cb92c77ed41a8d584568b20a1ca627d8f0d
 MISC ChangeLog 2811 SHA256 851cda213cc32c0f4b9cdfb938fab865c7f1f597e9f888058b56f067dd238d78 SHA512 d3ea0a24fdcdc041149c048fc36b97eb0c53f821052d11d6c1b19f90b3e8898c341c826e8f2e7327b60cd0ad6953c1c5ab98446fff3ee233bfcffc715ef3e309 WHIRLPOOL 72124bf6e5ceba8ed8f6575a5336ff12a9d7baf2f6c6838c2fb73e2a3ffd41aeef816a71d965702accdd8e57cce867de35fb7861596ed8cd06db403278b724d0
 MISC ChangeLog-2015 3901 SHA256 de67cd2f0d63db2b3ba44bc77e183a1313bcb94018ac6bc5a3b3f91f8759f9a7 SHA512 5c58b11ee7f73dfc7712d0142da4f27dfdbf8b022e80e5e286a7df882441b31b38f02939e1d40cd11c5401bf80a8c861f0309b1be912f8b6dcc9e96e90164a7d WHIRLPOOL 59017cd6867c7a86b4874bba9056f4216e9d55f2be6a44853e85f6e051d87a5938ebfbe8267d180f4cccc48be0920ffcf3c987cff2d446824204a873ab922586
 MISC metadata.xml 332 SHA256 168ec4b416626ba7a3c605954331dfed91dff50f81a6dacccc25b76a97f14e58 SHA512 3038edc39a8e186f2d054ff72afd3f28e62e116e436bd818080e65dc8cea1a93b5e41658c86709ca70a9df91116631b90deaefb1dc5cbe77e9f6e802e9b5af1e WHIRLPOOL 4182e31555a5eea8c632327ba3df70f55514ced4434977fc2aecdb23b696d8ad091123cb5892ad11bbf31dc14d40e91451e3f35027090eac2d04f915621664c1
diff --git a/games-misc/typespeed/typespeed-0.6.5.ebuild b/games-misc/typespeed/typespeed-0.6.5.ebuild
index 6d4d167216c9..c920053621fa 100644
--- a/games-misc/typespeed/typespeed-0.6.5.ebuild
+++ b/games-misc/typespeed/typespeed-0.6.5.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~ppc64 x86"
+KEYWORDS="~alpha ~amd64 ~ppc64 ~x86"
 IUSE="nls"
 
 RDEPEND="sys-libs/ncurses:0
diff --git a/games-misc/wtf/Manifest b/games-misc/wtf/Manifest
index 455d9805c7f0..aa6f2faa0656 100644
--- a/games-misc/wtf/Manifest
+++ b/games-misc/wtf/Manifest
@@ -1,6 +1,6 @@
 AUX wtf-20090924-prefix.patch 351 SHA256 e4ff7adabed7381550d5bde7bf0c4f6e41f5885cae630ccdfb9574b141d72752 SHA512 ff8eb5bd961c0498f0371d6ba850d1d407a0e9779469838a5982bce843d40d08bd7a97b50ce013054928198da7c9fa395d9472b4c995e9454c93bced8d953a25 WHIRLPOOL 0a0db3c0c6744eb946e1f02a7669c7230d7dbe8d4e2c6a0db0c900584403206f93c3a59a59b391ffc8a2dd919b88c43c32eae37628fcac809b570d7c06c924cd
 DIST wtf-20090924.tar.bz2 9888 SHA256 2da6ed16657d78e6bd58855803de4e1b7cb2467196b2897781529c19df5d5b23 SHA512 85a7b5b7add12f775272851095f86efa2962875aa9008aec5079d3aec31a74a2d475d5c904013134b4045872fb8e301e95f3c5fa25ab8872a7d31012653bddb0 WHIRLPOOL be5647823d7d88fed827dc44d9107b20f3b3bfed4d8972b567d74b8cf01a81a47bb2e4ae3d28a22f008f466b5b764a2a5fec12b2b777b285b683d1661a8cff21
-EBUILD wtf-20090924.ebuild 758 SHA256 b22854b2d6e1a5711c6f2c7c4fbc95b33cd346dfdf730e68dbbbdee135ff248a SHA512 799c7ed5c651fb3e35874b9b2b73b359c17b59025882bbb58d2057b1319f607067e09da79a6243d59b56853c846a4c80a8764d9107f375bf59324698cce9c9e1 WHIRLPOOL c22e8ca8642e731f6d841e0a17ac75d63e47bd2df90430788a522d62b7f0bec18a6ad44996017f0f2d40252926177713b449d67df049defc46e579114c9dad99
+EBUILD wtf-20090924.ebuild 767 SHA256 0aca1d10130fa9d054c1123bdbd257b0924130eae4ed82a110d1b96bff2f151f SHA512 9ad677d5b869086aa76d1b8d530b1e8ea63595e419c378698fefe04a33e24530397f3ff563aff5028cf7cd18327e96b0054e0c113f7f635fa76a7550bbb72657 WHIRLPOOL 41a1b58b7fcfa0794a459e60d0903c8bf4121d1aa1acf13643223fe850c397a0e4dcd4c3a2b34a448b51bed2cd08a1df3b2ed1c77bef3040018fb4a32c6d904e
 MISC ChangeLog 2724 SHA256 94454de8352c60221f56149428f344c5a64bb9a2d7e970461cb4b1adfcfb3f06 SHA512 91e73720e8a7e2b3538b18d17984e922d7357452b627c2e3b10c371e30e73e9aac25d8270de93c0c28f75f7d085453cab3cb45557d99891671425922340d9a34 WHIRLPOOL 0233f17f60036059388f60ce22c9199541516fa022389e0016569b8eeaf93f8a222da4b13db4a350ff22910811aa26822d3a391e8d0957ea8b1eb2a0655e1fa3
 MISC ChangeLog-2015 5165 SHA256 ad33d32e9b2b4bdf790daa13ce827acad1e3d17c31a7f959104d215ba1c07e75 SHA512 d20209811e2fb5d0f487e92a89e8122f985ce8e19d804546949ef749f2acfc853d6a97263ad700406f894a438de183eddba089cbccd3b2bd3d142cdd3acd2bfb WHIRLPOOL 5e4861390f8fd1b4dee40d9fbb41276d1dd2ce4b69def1dab0464e4fedcc6bcbe547700d71a4ecbabff7935be359d81ec9e53b48f1bb9c2849cf586502445815
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-misc/wtf/wtf-20090924.ebuild b/games-misc/wtf/wtf-20090924.ebuild
index 4db72b43021c..ca02243d6a14 100644
--- a/games-misc/wtf/wtf-20090924.ebuild
+++ b/games-misc/wtf/wtf-20090924.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://dev.gentooexperimental.org/~darkside/distfiles/${PN}/${P}.tar.bz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa m68k ~mips ppc64 s390 sh x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="!games-misc/bsd-games"
diff --git a/games-misc/wumpus/Manifest b/games-misc/wumpus/Manifest
index a9e35b9a57ea..085f53ca804b 100644
--- a/games-misc/wumpus/Manifest
+++ b/games-misc/wumpus/Manifest
@@ -2,7 +2,7 @@ DIST wump.6 4821 SHA256 290cf47bec06550563b7aa38e98c203d4928d09104b4a852cb89d293
 DIST wump.c 22691 SHA256 6c85a36af61922d939ccd307ef22731b67c8792c91ebe0e88ca92e1d0752d057 SHA512 a914e1eb9e6204e5d763a7c32445721b849a753c3007312c7f9bbbaed9fc3f133639e7ef27a66636e9c5bc7bb13ab7a54f4f607272403014042723de38cbd878 WHIRLPOOL e1f64cf5c95342a1e090d1bc2bd4887367e2b3be6ed43ec13b460666aa9ff96a3ddf2ea4ed44c83096826e98cade1787fe0a315401b769c08b45afa03f6f0ae6
 DIST wump.info 1883 SHA256 5e67570605fccbc2af25ff8eba565bcb74a08bb01470dc4520d1368e6bc9cdc3 SHA512 faee0552c7065f6cc98db53d0ed085b7b4c6aadb5f457733e36a621f9ea1753cb627d4a3813cc9b9aaaa1cd178458fd7ceb4ef9114892e0f8faeb303cc0351d8 WHIRLPOOL b255c40d683a16356a5c9f884efafedf7d97fa708b3c76d6db4bed65588e5ee6a7cc272ef463dc54589c1c0565e8ed9bf731c10e412566c8e39393de7946e648
 EBUILD wumpus-1.4-r1.ebuild 981 SHA256 c3cdda182ed017cf5129006a9c6cdbfc7927ee9f540ebd4b82a55a45dba84416 SHA512 c0cc9ae702f9864923e692e59a74a7f0a4325d163d0d43c281ae5764c36dac1793478deb66963506effcf43364eb42586c65c491708faff34b11848dd762b76c WHIRLPOOL 51e89ec83c7bc74f80c97264584149f538383ac65309d3c716aa76fa555c589fbab07598f989e0d768db5ff9663edbfe2032878f1c118e7b9ede3e83db8ea976
-EBUILD wumpus-1.4.ebuild 1051 SHA256 4fd34f98524d171ee0cb0b21aa48ef9c6f49c18aea86836fdb612d7ea430def2 SHA512 5d0f2fb4f57206c737b09c39158febe22643caa6002c3d80e968ac33030d42c3c5b0369a9e6984fdb0e3742acf1ce72aabfa0e53bccde24040a9663b4819c8a2 WHIRLPOOL 9da14ae222fb553bbbb48fa877dfc0150d325c42563a8968c1eceaa38413a3eeaefa702ffb889298ee47b3d6d95962d9a4fc367beeb5ee8775f57f20367c80a4
+EBUILD wumpus-1.4.ebuild 1053 SHA256 461e35137ae767ac182ea1b798d9fc8b620dcc322a05b178c2bed350ea6a3e0c SHA512 ddf5cea6c6fcc48218eecc3316146a1618504eea04c2f88ea344188c7299c73f2592bbab491b043d1ca6ab078b30d3cf8a2404bd0941149b6d1aa25d64dc4d5d WHIRLPOOL 650f83187df78a23644ef4e8671d3dca9de364f16319857c02bf4b743920c2596e2a28d6ede3f5578570184fc25f231cfbe90a1f5d3d30a4b69b1fc6929560b2
 MISC ChangeLog 2668 SHA256 167cb3d2be869a56a34e6c5a629681616f06480a1d3d046521f9d7d5a4d96ab2 SHA512 6e1f7e03ec992fb8123c6ce830964d5e8aa8a8475c0b692c8146ecaae9b2a3168a3a2666a7c343b79cf04d78b78b4bfa89d91be60b3d159439616d4c6a380a7e WHIRLPOOL e9448b988d424cfbb8a03e8de1294924bede7113b739a42a3a0aaa972f0bc6272da78c3f295997c233508da679c5148940a5ef0d8904bd7a92ceec08bae9bf97
 MISC ChangeLog-2015 1722 SHA256 67045aab7fef3fa8d7989eee22e01c5e57c6e0aaddc0a4a8804c38be367b670e SHA512 8f2fd0b26eada367dfd23882cd4f2081d27ac87e7bc640120c6a2805df2491b9d98f8ef02febd49a27516b51d214bac5add4bbf501ec25e297b90d438a8afe84 WHIRLPOOL 15b1b86e1435d43a7ea92ea550ff4618ced8252068f6affc9ebb137018615c16144a23674d1a2cc3c6df657e465266000689ebf540cf0aced54234432dc33b83
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-misc/wumpus/wumpus-1.4.ebuild b/games-misc/wumpus/wumpus-1.4.ebuild
index a6243bc7b23f..3412e91d51d6 100644
--- a/games-misc/wumpus/wumpus-1.4.ebuild
+++ b/games-misc/wumpus/wumpus-1.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.netbsd.org/pub/NetBSD/NetBSD-release-1-6/src/games/wump/wump.
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="sys-apps/less"
diff --git a/games-misc/xcowsay/Manifest b/games-misc/xcowsay/Manifest
index 05a3931c9694..da185a7365d0 100644
--- a/games-misc/xcowsay/Manifest
+++ b/games-misc/xcowsay/Manifest
@@ -1,5 +1,5 @@
 DIST xcowsay-1.3.tar.gz 269836 SHA256 e055a35d7bb8bf17f07b5336bbd081a1a53f0b02f83c250b714bb6531789ebcf SHA512 b6f6493a988d8e8036ba9f2a0434627ffbd28eacd3330b256d8e6754b7be02eeb41390b28a8160091eca87d142e284adf2e2a37f22d715bca3b58ef1db8cdcf1 WHIRLPOOL 78113e50221cd469dca5aeb9a9c2ce896746a6e5682673dea6d64289129fb09ccd9ffe74dc3b5da4a8983fb65f2fc1cae33146250d4c0de90bd0023cecc9353c
-EBUILD xcowsay-1.3.ebuild 758 SHA256 4a3907142d80cc91c01b85f7a644c29785c009cb49b67ff690934b2fec4356c9 SHA512 c3f4680e43fefe7a29ca04e3ff49f4f9f5f6d2b7fb8fd071b18f796f912eb25c0a5f72e0c369ee5e048ba48eacc6185aad376539f843d458c27000974985c939 WHIRLPOOL 04f7ad77f1301912d1890d954d6135e1592b213a1a58701d75f1dedf4dd049bd230c27d02dfe4c9a349095dbea19a0546bd5600618db64b472b9f151916191c4
+EBUILD xcowsay-1.3.ebuild 760 SHA256 c87930d86f4960ed7e4ef0ed2944c7b108e9d56f35e3275dcee330061fd7b318 SHA512 f1c4f4d7402d3fc66e003bd3dcf87a3ef6c97b5899892aa501c8b021fe6afdf4ed6f7509d8df27b7a14cd46d125a7dda1946e1bd365ab5bd6306d3f8c85fc9d8 WHIRLPOOL dd9e2785d749985ac7d853f99786f056ebe679a95e5cb09cfc24eb8e766e435c434c089a685c18196696661043ab4ba08f105bac6f582f5e00294c5fa67f9565
 MISC ChangeLog 2811 SHA256 c403731fa6e17e7f5b0446f7f31105332cd28ce22fc910d4b1e364e4aaced630 SHA512 26a14fc54776e01d6e1379a909819d1e2828fbd4797415a0749086bc18a281ad3fbd0deee341e530ec502727c2f752ea68342e8b50ca8a3acaa15cef22ca55df WHIRLPOOL 0ba18058eafff3ae6c2107f4afbb165091c451606c5409836c9a0016379129d75f2b5bdf3b6138618102b0bbd92cdb6e70c348b7c53beeb8ae7204c337967342
 MISC ChangeLog-2015 1499 SHA256 705477ce4686ab7a1693b1abba8d06f2415252dce46f2fb64abaae6dfaa5a7fb SHA512 c61aa13a81ca8176add5169a6799872c0da20ad28ef9ed972f8ac230f526e8bdd7c1716a8224ceeb89ad84ba8956f694c6219f7e9859a15ed200080b541dd258 WHIRLPOOL c1bb4719fd9911bbacd41ca69b4576a81959890853c1c7953c9c49157cd2da4adfe8f727c2d7474aaabeeda2f8a260ca97c7f2b71fae2e8ee1410a55b5b73803
 MISC metadata.xml 323 SHA256 2120772d6e1426793a75c4eac4835fa7304b9e7521899681af03e2d5fc4c019d SHA512 e560764dae2cbdf7d747479e49c51cac3ccc02d5e9ed39fe726b8217a0c5f30d5e5306015758f1afb12df022e58a3902f9f007cf412af7940c8743523db088a2 WHIRLPOOL 945a894ed442cd563dc051f7bb29efb7d250dd8c899bb8f40e4cb0e1a6104e3e5d05e7451ae05c684baa5a12d1d14ee251470a7dd249dde1a63810cd24caf7b2
diff --git a/games-misc/xcowsay/xcowsay-1.3.ebuild b/games-misc/xcowsay/xcowsay-1.3.ebuild
index 84cdb4184731..2557c54c1e23 100644
--- a/games-misc/xcowsay/xcowsay-1.3.ebuild
+++ b/games-misc/xcowsay/xcowsay-1.3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.nickg.me.uk/files/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="dbus fortune"
 
 RDEPEND="dbus? ( sys-apps/dbus )
diff --git a/games-misc/xcruiser/Manifest b/games-misc/xcruiser/Manifest
index 925d645a59a4..f166f8a69174 100644
--- a/games-misc/xcruiser/Manifest
+++ b/games-misc/xcruiser/Manifest
@@ -1,5 +1,5 @@
 DIST xcruiser-0.30.tar.gz 38667 SHA256 917b68dc06389bfcdde742f0798f61cdeaea2ae3c6567960c33f7634d4861ce5 SHA512 77f1dbfd4497e30bb1ee0f41121a6f85cd1bf2b59fc542e88326bded8b806ecd7439689765a73ea88215c768a3bdca1370ae80b956de38a131b927b6af9e674b WHIRLPOOL 7dc4ad1013c629198f311857f2deecaaae178ef164d800c511d59718ab19cd137d8010c104c4ecdc94dcc4f32a2402777189384df220ada06f0b67592bcfafce
-EBUILD xcruiser-0.30.ebuild 670 SHA256 165fc50a88210cb5c08948d4f872c5ea83ae33141658be225d9e007c3437c734 SHA512 e7f856244a918421c5b2eb5a0177977b0682546350d95356e6b615d566f578623e87175e222cfaa8731aaeca5bfcf125392d5b1ac7cb78fc5456399aed04d75a WHIRLPOOL 0368a826e1dd385691bd4f6414ed67a3959adbada08b01019982ac9e31c47df9004694dcb01339d0c4a258e4386fd146bc5a5d8d4bc0834c18b2e257e79a098f
+EBUILD xcruiser-0.30.ebuild 672 SHA256 9390ac11ec25fb56dab983f4af8103dc4e78a05501e260ead0fc9170a94ddcda SHA512 f2d013f8e31fdf8bad0b053f49b3e8389459a6bec970c341fd19f9b85fd318cd2d6ef0d9143a563ea2ed8b7bbbc92a39d132e386c99d8f553f68b7de45a3c62e WHIRLPOOL 8a382af822f20f811e0ceefc4fbd3247eb5f6db5a4458364a6b4a7d5a1660a9639072b0472207ffa678f4f767cbb001b78269a1b1cc1ffe616673487f065c30c
 MISC ChangeLog 2430 SHA256 98ef1d8143674531ae0fdaa54535f47e2c7dbc5f1529f4e2c4fd3ada81ed94c9 SHA512 feec9dc943505d3945b6497e6df6d428f863664dcd2bd7b18827a34f925096e972715068d43f85db70df1adb4baef314b11ae3b5443f72c3123faccd63a787c8 WHIRLPOOL 9f56635e4dcbd90112997c7495f2b38e62a2639ebf2cf595509d71ba62c2e7489d7ececf44488522c8d3357fe3e1b4dfce81582ea172db1c4acfa112cfe122c8
 MISC ChangeLog-2015 1165 SHA256 b80ab43dc55bcfb9b5beb0901fde4efde95b8ed417b77a911497b52719207c99 SHA512 3c111ef9efc6537f6b9ed12759b2055fe6b699d0c173e8c1820dc2b33b3fe4c0834fd65becb6b7ee4816b420e757d73b1e94cbccb6157e24dba46eaa8c6a0225 WHIRLPOOL 96bc11c05be99c9980d5eb8475522f3cf9a51cc828ffbd5be2615ff33fa1115c66cac61ecd89819a5f1b11b0a2a996c88b731f590d0bff98b15c6421443abfab
 MISC metadata.xml 331 SHA256 9c21ff2df3f1724095bc2001a9e9b8603b156b90927a0babb363178aa80e6e91 SHA512 6ead6b1b6ef634bd700ce10f4e3c29c2542a5079420ec01f7f8f2d9ecccf1ec4b2cdadb11ea1a9c58e868f3c438dd5ed925da0f3b95fa986f6443c73d9f5d3f1 WHIRLPOOL a12a0dfdd5b621185821135cf9836949f98032d8454910c1f0f82f415a9d2e5473fb4228aeba6ab2ec55d9a67f2047f8f2fcadd57f9c989cf06b21f174be9407
diff --git a/games-misc/xcruiser/xcruiser-0.30.ebuild b/games-misc/xcruiser/xcruiser-0.30.ebuild
index 5a3d756f4436..39c16beb9489 100644
--- a/games-misc/xcruiser/xcruiser-0.30.ebuild
+++ b/games-misc/xcruiser/xcruiser-0.30.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 RESTRICT="test"
 
diff --git a/games-misc/xpenguins/Manifest b/games-misc/xpenguins/Manifest
index efd4d1b32deb..04336bcca736 100644
--- a/games-misc/xpenguins/Manifest
+++ b/games-misc/xpenguins/Manifest
@@ -1,6 +1,6 @@
 DIST xpenguins-2.2.tar.gz 275210 SHA256 60881bac15419aa2875fb56f0c1d8fbdb12c5083db0e1e761436178baa86117e SHA512 cb24e17a5a19df0de162b2214dec2fbfc07396cdea9d138b8426d8fc38e248b1faba65ebfb8ba74a5cf515063ba8f4032c4588586b23b5be6aa0a208cfcfebf1 WHIRLPOOL 3b1b176306109d5839cd230e00b5486ea6fa2a1466b0926ee1261dab2d30f657e07bb4cc53c747b79b2a92f935eb79ff9903db3161a2a46fbd2786da3aa3ec88
 DIST xpenguins_themes-1.0.tar.gz 215487 SHA256 d6aeee8c7b0c5a02b187cbe1d781341576d711a25f837c75e11f997a92e9a957 SHA512 577dedccfff8f4581c9285deb809d43a09631e15461783bfb5f00d2bf0e687d54f04ad3bcf1051113777d74f57c94c278b99749265a3efe8ebc6aabb1501eaf8 WHIRLPOOL 97c1df45c75aa74b77915844cfa43461b75f8e5ac5d7576076dd4477c9bdb33b03e1f8c0cd93d23375b36bb829f16002541d6223823564c1b472f97eee864bae
-EBUILD xpenguins-2.2-r1.ebuild 589 SHA256 0951d2ad66e0d075e0ea2a29c8c5bd1fc428f61c8e133d1df4d8cc388a49c1c1 SHA512 03bbfcdddf3ed574f900b80000ce169f376a91147bb030b635bfa7da741b7e7793d85a5c287306270498ddaeb06c13f1911fc910b69881b44868053df0a9cda0 WHIRLPOOL 1697f845914ae899ad93a218eb692219c32f3972b1d5f294b310f5aa5762b9b0e25980cfbff5c1fc2aa6132fac9a331865a988f0a858ba96eb6cc76eae8c73f5
+EBUILD xpenguins-2.2-r1.ebuild 592 SHA256 e842f2e8dff6773ff13fe2a78891b98b834978d36373365dd9f7b96e06c8347e SHA512 45910a9c15752bfcee44cca6007867ebdb3fa61ccf10879785a45e1664f8bb7931bde72845709ccb0b4f98b6898eeb6aa305dfa33a3bf4a0c73551d6a71cc12d WHIRLPOOL 1f2f4528dd39d8e7a5a62d70179553a82e7511e47a919b87f872741b6349513f23b424ded831cb006ad8bbfdadd374c1016342fd1fdcee0d166503ba5802f83f
 EBUILD xpenguins-2.2-r2.ebuild 556 SHA256 d099bbbfb05982c347d5b092975011ee965735e4a296e7ac03e385235638220c SHA512 ab3a3564db4de834579455083fc14206f5e7807c63ec488e4120a053ac3bb45f16a29f7031977c86fda71ab5ccaababbb5bd6755ad51c335595982f1bcb76188 WHIRLPOOL b39623536707db8bfa8abfb1600a9ff8a09f88f76cdd5e9a165796f552f86852905ca4a1dc699d545c1dc0b0b2d1c77f08544d059551b2dd58003c7ecd6f00ee
 MISC ChangeLog 2691 SHA256 b6583b48134924088560575f964f057784fa0ab8431ac7cde1998256f135c27f SHA512 fc84d3a85785d19d6032d70af9780e90b809f8e0f94d319f6ef69c55890e6b76145d49f264bdc406e3007c28277e258507139e91d4c25685f0fd3b449af09ee2 WHIRLPOOL 49b922b82b99cb8a2b907e1199d58b1b56fff85b1e25e41affeecdc43126bc5ee2d42ab8e04b07cd5e763afaec0a234b526986ebbbd6b426387c0c5e6e4133b0
 MISC ChangeLog-2015 2098 SHA256 98972ed494fc0b98ffe438066e081d77638413c825e748dcb5a65188554ea2ae SHA512 7041de5276b1f3dd2640c00e9e188db095c13b3028cb4149acd6555a1b36a8d4e489a23949059a9715611a4cf02a36d1842050137fbd254569bf08aa9f7719f7 WHIRLPOOL efc1cb47f09d9a382c947dc66a9976cd1d8e27577f971a8466349504fa8c1b06af04326d3a9bafc40dc14a3eb7431a846a21b6eb0b287f35ab3d83e290dfeec3
diff --git a/games-misc/xpenguins/xpenguins-2.2-r1.ebuild b/games-misc/xpenguins/xpenguins-2.2-r1.ebuild
index b2f8fd840c06..e2951212d85b 100644
--- a/games-misc/xpenguins/xpenguins-2.2-r1.ebuild
+++ b/games-misc/xpenguins/xpenguins-2.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://xpenguins.seul.org/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 x86"
+KEYWORDS="~alpha ~amd64 ~x86"
 IUSE=""
 
 RDEPEND="x11-libs/libXpm"
diff --git a/games-misc/yadex/Manifest b/games-misc/yadex/Manifest
index c7cfcacb2e09..b12714ea3f14 100644
--- a/games-misc/yadex/Manifest
+++ b/games-misc/yadex/Manifest
@@ -1,7 +1,7 @@
 AUX yadex-1.7.0-NULL-is-not-zero.patch 406 SHA256 08d881eef844a7a7417feffdab473b557b43c6c240905cf05ea917504213c2dc SHA512 874fb952496bf87fbe7c2d4e8a2260a0b01841c4e52c9ec40290e2dcef782bbf3618228ff2284dbd0bc4c5bdcac8ac41ebda050a310962ab905b456a4232e4de WHIRLPOOL daaa1a2924a1a5758fe398193f1b8010c9b8df37427a5c9f26104b3eac027dbc0aee0e8b226813916f164505df12f0ca9f5a1a265201ce353dca8c73c36b3586
 AUX yadex-1.7.0-elif.patch 360 SHA256 8d626434f0e978bd64f3ece36967a9c9739194759758b152eebe6568975dc66c SHA512 76020ba5b03bc188479081006f6f3a587d9d17e03a3c38e6d76d4e6571dd9625f81ef6510d58526f7ca15ce4eed2ccfae3ec8b63ff37aedccca91c3723858e70 WHIRLPOOL e2082bcdf7f8ef578d8900cce30ee6d0214ac5ba9f747589782113242437c659653cbc9c4dda8c7ab976796785c4e162a6fc2cb0cd850fe6d2926f71f8335605
 DIST yadex-1.7.0.tar.gz 551318 SHA256 316aca295b647b45d6d0d359fd7bba0448e7e114d295347add7ac0e87aa0f446 SHA512 017f0ffc21b7b49e25e81a16c5badc3159f0b34954e278d658175da51b7ecf1e15e12579a244530afb10e133c890761d78c1f1a209a800887c145c5c1af5d317 WHIRLPOOL c59b2d6127d1e536b96cfb1cf87c2b4e181ae2f0882b0593e286de0bbda273bb13cc908adfcde9e56c1ed83e25ca7ec27a27d1c670d730137b0af2923c514968
-EBUILD yadex-1.7.0.ebuild 1160 SHA256 e3f8ba1a6d72c4d20d39beb37b7112eef7a9afb32b0f356d6efb50fb975dcf8f SHA512 adac338ab19a6ca7c25c11b5677e767dc32bfd9dbf821c1305d65a30fbad3e2c9a7fabac2dfa3b263bcaaab6c445511cfeebe5b4abc624a68fd41b52ddd1f42a WHIRLPOOL 1d7649877f6474e5757ef82a90b79d57b5758a51e8d7977274436dd8cfa0c498327e4e1f488a360996df4340dc366ca34c8a2903726df04260fe61dc1e69c96f
+EBUILD yadex-1.7.0.ebuild 1161 SHA256 5490b614efc0a98c028178e071cc4dd22ad908c866438040c66acce12fe44bf3 SHA512 d50567ab5e334e11dac5b13d136b3d781490e27a0812f56cd1b7b27f004e37c0e7c63030d916fec4951e2c632f63f355b99036ef53b43c3c4099a386fbee5286 WHIRLPOOL 14b7b5032f9eb3dcbad74e8a6b2a9433c76d71b315a66fb928c90027671aea30610eff8018e5dd2b4d8d0c7f0d4b3a79bea1100daaecd86cc92b2eeee8d74a14
 MISC ChangeLog 2499 SHA256 eb53ef8ec10e2bca6e652f08c98e89b350d9fc4743db5f0f447fa788fe9a0bb3 SHA512 16335f9e9df394c82ceffbb5f30e03c483c4a7130d755ef501d9cf815618eec2be5f035cbfb50eaeb0196ddd61cf7c122d502635a40c571f9f681e131d0f6d7b WHIRLPOOL e0df343d950da45ee7ca57e94c0d6cdf94e89aa079d7a2489786afb4d9a7befdc23d3c02303a55a8ae51a16b167f408ae0fc0a60d355939f432854245af8f53a
 MISC ChangeLog-2015 1346 SHA256 03bfa4bbe9944f4b57e9636e3a52f139079a3d3650de4dab3cc681365d7a9b4b SHA512 7e0e8bba38803098c09f20db5a33445a403328dc41b719681a4d19af9e7dfc1425bcb89c7e2d8c4f6395ff41d098603b9d689ba285f5b8ae6d00af954edc8fb9 WHIRLPOOL e1c0333336fbd0c32fbe0ce0cd0a55d9beb824aaa546e4d2f618af8550c5ca40397976d3aec9606bc4e88fba1b54c3560200db8960da7bf205f97896b074b0e1
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-misc/yadex/yadex-1.7.0.ebuild b/games-misc/yadex/yadex-1.7.0.ebuild
index 9e37df3ce0d7..306f0a38eae5 100644
--- a/games-misc/yadex/yadex-1.7.0.ebuild
+++ b/games-misc/yadex/yadex-1.7.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.teaser.fr/~amajorel/yadex/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="~x86"
 IUSE=""
 RESTRICT="test"