gentoo resync : 19.11.2017

author: V3n3RiX <venerix@redcorelinux.org> 2017-11-19 10:19:50 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2017-11-19 10:19:50 +0000
commit: 20d8e9cfb95a9f054d654ab6405e848807186aa0 (patch)
tree: 8a308cb480d00fd37d0189950e04f7d59004954f /games-puzzle
parent: a5956e0a0daddcad648e0d8d8e5cb3e49e09bda7 (diff)
195 files changed, 196 insertions, 196 deletions
diff --git a/games-puzzle/4stattack/4stattack-2.1.4.ebuild b/games-puzzle/4stattack/4stattack-2.1.4.ebuild
index 1d178a21445b..a076f4776e58 100644
--- a/games-puzzle/4stattack/4stattack-2.1.4.ebuild
+++ b/games-puzzle/4stattack/4stattack-2.1.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/forcedattack/4stAttack-${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 hppa x86"
+KEYWORDS="~amd64 ~hppa ~x86"
 IUSE=""
 
 DEPEND=""
diff --git a/games-puzzle/4stattack/Manifest b/games-puzzle/4stattack/Manifest
index bfaab763a2a3..fcef399d9a31 100644
--- a/games-puzzle/4stattack/Manifest
+++ b/games-puzzle/4stattack/Manifest
@@ -1,6 +1,6 @@
 AUX 4stattack-2.1.4-gentoo.diff 509 SHA256 bcb638ed992288e844db9f4e5fadb9196f20c8e8ae2c1695defc8fdc8fb4cb13 SHA512 f370ae8ce74ffe54f028c8646ea8dce87ae4fc5f4eb7ca8343f5441d3dbc80a487c2dd63ba75d363778b450ab47f432aeddcb93e0b6fc895f54a5fa12380f8c9 WHIRLPOOL 843e8528c2ace6fd6d8b1e13ba12978ec25e4b8d37cc9bd861af7dd8ad4e911c7ead8968384af983291d2e8d3b888b90f274521a6747f1cbaeadf5ac3f391d66
 DIST 4stAttack-2.1.4.tar.gz 1828247 SHA256 196c553fd3dbda8b2c2a07a9b0cbacf4f067712498f909d2823161e7d0b289e6 SHA512 4819c0915bfe47bb965ea39d49fa007fb18cfa965b15e5e72a4b0ac3be8a03c616d9438c8dedd960ee257e44b48f98f75ced6bed5bfc77f3366328c797b30f3c WHIRLPOOL 439d05b5208821d18b6976f055de32521283ee737832bf80c4eeea1f62bb334cc72b43b360b09f9cb0da42e8310e54e078ff097432e24ebd3c5ae74ddad1ac99
-EBUILD 4stattack-2.1.4.ebuild 977 SHA256 5bd909d5d2a7eef79b7c8a91cd2cd39ff550a7f0c76ae4f3b97323912bb0238d SHA512 bfadd95adbcc5df82a9be407a67270ef5e1c96b422600bf1cc0dbb7e588702b58999f042f101f2f00412f4f3048e1b27da3f2ec7792b3ca9a4997a855566e9bb WHIRLPOOL edbce27a065fd47747d3e73a58a8fd3eaa3f722798a2f04fe82975fa7bae796a513b915d9403b7e861fbffa793cc8f9091f1467b8b49d5994a168d94d221ba0c
+EBUILD 4stattack-2.1.4.ebuild 980 SHA256 e7d7816bca0e77f201f00a96717328f1cafef6f2bfcf728233a5e8919004945b SHA512 926fc12f8827c18f0c6dd338c7ad16d9a508b768c37396a3b9380f113da41b574013018c11e25a055d502202e39b8e5acf1eb5e4f0659996b02a196f87cfa65d WHIRLPOOL 61fe135bcd3d274f3e12e41749903c794d350cfadfb1af1815f96a015e5f7fb71ab7374a2922ab7f5445de745eaaa56d62844c2b7e8f26fddad07d70960aa071
 MISC ChangeLog 2473 SHA256 5f601186dbff149c0796c741abf62650cdc0d587f5a3585f07fd1412b1df40fc SHA512 93557c8c415308991b16bced627edcc9fe3bec560e1954d53a69660fae075c13e89fa595d26c64b4e62b11ab2f884f460931ebd6dc90374a532648161937609f WHIRLPOOL c688a33dc1bb7e5e70ebba35b14349eaadd39937cdd8a349d549ea247c53c7bdd694d10e19923589d43a5379304acd56303a8132a84ade4381f8f897da02563a
 MISC ChangeLog-2015 1136 SHA256 138d03dc1effbc0097d346b4e0ab1184e74eb4d6ea973e27b1948ba569536dac SHA512 f4d7aee0f5809b9bdf0703218931d1a1fb2e4293f7037bcd8d81ce5707620a13278c676f3c6f3f657b58adfe74984000f8af23b471974497378b3e12e2b27161 WHIRLPOOL e5efbc07f5f612b984faa54a0fa426afd326e47f099626e620bd59809723a6d98b7bb4194fd1c7c338f317d4ad9aa39d460951ac14c1e7c068acaaa70cd6483b
 MISC metadata.xml 335 SHA256 6b27e995020286e65b53e3e658a177319795cb722a728b803851d3ec906dc90f SHA512 eff7c6df19ba9adc535fcc0e33216dcbdad8a04a8a09544263c120ee6185842709c0d08065b64d89be09c37afa270f6736216e78ef779e3a13ac8b82ca0fa299 WHIRLPOOL 5a552342baf34092cabac72f382b3eab3e9da0266d983212da1cf5918c9a585b688004cb0735e68568e150780091af642aab72dfa2ad39a03eacff980337574d
diff --git a/games-puzzle/amoebax/Manifest b/games-puzzle/amoebax/Manifest
index f4fa5a1e9bdc..eb75f6253671 100644
--- a/games-puzzle/amoebax/Manifest
+++ b/games-puzzle/amoebax/Manifest
@@ -1,7 +1,7 @@
 AUX amoebax-0.2.1-aclocal.patch 1532 SHA256 b5051ab9986c4abbcb7ae2b2072bb87651f7380670837a4f7cc7f646a34bc1f1 SHA512 d2bf1de8c773074eb7b69c188b3a8e242bc03bd6d80d770a1db8cd4fd5ac2cdd5bc96e807713211b19efd839df0344c8318f259cc2f95be3abd55a1523bb54f5 WHIRLPOOL ace2532f47ef8df73879187f501276cae7a6fde44adfc08bc969dd67c370d6e6949ff81485e81231e9a40594968bf2e29c3fe4e241b34de30de5a24c79490f17
 AUX amoebax-0.2.1-compile.patch 223 SHA256 4b5e2efb22f27a2b3aecf9b22f007690f0c654d1195b7d3b7e6c06190f34c79e SHA512 90fccf04bf3567c5f5773870c447e331b15a0d275a95eddca3c911fffbd7fe580aa1441a009bf0667fb2279e56e9d2c425c3070c24692dc4acc7f719ab052c72 WHIRLPOOL 90e93e9407e54a6cee9437dd74071326cc8e16d43fca24aa5a5c26f9823b4b9704e86bb3149eb55be3e89aaecf001504df6b1bf89c36ec4c8fc6df6991c0abfa
 DIST amoebax-0.2.1.tar.bz2 10645579 SHA256 709c7e657b328a6f7d331298c6264f172528489d28cab107c40c483c392340b2 SHA512 f8cd20cb35e2456487f55ebc89411ebd47b25cf549d35c36041a27e1d96ef30702151f303dbb457afbf8583f67c53143c30becdea00a26fddad20555e0c7d181 WHIRLPOOL eafcdf27b852b226db86f162b14665d5d6f5bc5e539b1c5cefe698380fbf6fe378cdf86de2e023f51cda5e3846a134b21b509180ac257d85b446bfb33d4f6104
-EBUILD amoebax-0.2.1.ebuild 981 SHA256 b0eaa32389a907f162c2a4a39de865c5f1d95fd887e435d2c2dcc2706e91c472 SHA512 6158b11f96f047c93c01733c4288362006db835c185aca261baba9b0a3fe736dc162052c3daa102345c917872901ed8bef7c0cdaa89dc1166793919d64414fe0 WHIRLPOOL 113bdc83be1cfbd7a0bc9ad3226403b0fa3225283aad42e1fc716e0787ab8775911619c40587a77fb61ae09f489f34cbdaaede1dff143cf20ad42245aed0a415
+EBUILD amoebax-0.2.1.ebuild 983 SHA256 40abe1d70a2707318f440cb4a1af2f2e9c28853e3db8707aba68a477590ab70f SHA512 468fabe4342c3550545aec163b4de716777dbbb5e353cb79beb06d3287c65d16772edfc29465589961c4c846941aa55f1a422442507155fd6280b93bb7b16a45 WHIRLPOOL f4cfafdec159d54bf8a4f8f4f9364f94dca0786d2dd522b0a7fbae35053cdb1cd69cf221ca53dfad8f30acf74149f84f12285b37e8c9d598a7fff6d14f6126d1
 MISC ChangeLog 2505 SHA256 4bf7a5349b20913a57a5761aea5d252d00d4fd8bb7cb7166aa79f212fc6fd015 SHA512 325d023aedc8edda66006908e2d5d8d6586db8eda36318057d001e1f95a16b1f59b5a44711101a0b90d564506fff38a158f847f60eacb26cf9110c87020f47f0 WHIRLPOOL f3d49e12d2f45e474f7a9d0e8026c755d156831ed3e7a9380354afb36d987545fafe196f14084d6094a6ba8ab36c6ddc6f7cd7dc0b4ee154f5d1831588893681
 MISC ChangeLog-2015 2132 SHA256 97931be59e0bd42815932dd9be8a5114f199e1cd805977d84df2704271c5da29 SHA512 147604123575fc7751368f5308ca3a0aeaa9a29036d9c1be43b6f14da3d8d2b829342f9b9f74440d8febffb0bf1994d9bd22ffc171462a0fc8139f77503945c8 WHIRLPOOL 032ea3f582e1c2f4306b168e8bd450c3be5ad02b3b2fd3265e99845c3a62401f7204ca77ecba6ceb5f89e356eda6d5440eb58ed64a9430a32fb0a9e50a30a464
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-puzzle/amoebax/amoebax-0.2.1.ebuild b/games-puzzle/amoebax/amoebax-0.2.1.ebuild
index 2d9537adeacb..687f1d8f9057 100644
--- a/games-puzzle/amoebax/amoebax-0.2.1.ebuild
+++ b/games-puzzle/amoebax/amoebax-0.2.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.emma-soft.com/games/amoebax/download/${P}.tar.bz2"
 
 LICENSE="FreeArt GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="media-libs/libsdl[sound,joystick,video]
diff --git a/games-puzzle/anagramarama/Manifest b/games-puzzle/anagramarama/Manifest
index e54d6dfe275b..960b5aaf7ff2 100644
--- a/games-puzzle/anagramarama/Manifest
+++ b/games-puzzle/anagramarama/Manifest
@@ -1,6 +1,6 @@
 AUX anagramarama-0.2-gentoo.patch 914 SHA256 f3c885f5925f6a949f5716aac6485933a82a8480f672d9e0349f9f21f415a3fe SHA512 8047ae5593d242d4755ade02ed792dcebdde7f36df30edf56155fcc14c65cec6d8a55ebe1ef7e7d012f58faf692515bf3d8fb609b07501dd77d2db28e0b317f7 WHIRLPOOL a9495674ea44ed0875bcb31d388c3e54229fbc0504c02a84f25eb1bf9e56aad4dc0ef06f912d0b355d5c78911831a4a94bb9a40b25e8fbbde31af7e493516802
 DIST anagramarama-0.2.tar.gz 861484 SHA256 3ebb57468025e38c205d6f34f1f1647b593b371beda8032e69ba94aca516bccf SHA512 7cdafaf489100c184a71859f50b64fe8534210d953c4144d822727815ae2f7dd12302447b159039d95c9b3097711ab14931538789ac81c01233cc2c767291603 WHIRLPOOL 8e1f44ca5ff854c90dd5aec0341b11ef3395be87bfaef39b6a0e7fde1462c508056bdb3d47cd647445a5678a0755f4dc22514e79ab6dd6cd27b8671ab1cf6535
-EBUILD anagramarama-0.2.ebuild 983 SHA256 917985e8f9875bded6b4eec4846f247317e888b681f57a38e599304eb3df86d2 SHA512 c6f10416aab933ffedf3a0b047ce5d9f84867dcce1715b7456837004217ef576a49211422dde5dfaff4bad9296b3835ad658c0ddcab273a75a91399081986b3f WHIRLPOOL d12bd609f44c199e2c9159d6e4b9c29c843e0b2478f9c365842540ab8b73c3a7de3ddb276ab066ad9f85b9e594abf1aa3fb85fda827970233e573efc1fe501f7
+EBUILD anagramarama-0.2.ebuild 985 SHA256 d05dd462674cae055e778623eed25388ee6062c12240ae112d610159d062f451 SHA512 ac7fdfc5a854611976f68768e235b007f6f684b07f06b39359e38c9b67659134b2a4e9e02307cfb15da90e2dfc7faefd135ca132111be4bff2aacd4d5adaaba8 WHIRLPOOL d53d70c7f893498d5dd9f9316eae562189f770af4cfd6b8743700a0a15c8789b85870472129a24fc376af4ee92a35a49bccdd766b0145c9cbeefa16b59577cc7
 MISC ChangeLog 2480 SHA256 9000939fc3ccb54e5b69d29a64b97f83b1e963651c0435498a6ce90a132cb9aa SHA512 c44d804024e72f2b3710caebcde74835223200feaaf4bbe7a6e3299aadcc79673d7b15e81eabbcf38382128512331bcf366f517e50b4e2a503e3e2c6937da2bb WHIRLPOOL 689540bd52c03f2498af512e70c4817c6a2e54b29ef2e663b756c05ac20e1e448f381892c50219d24442603bf783d1d3447b5b6a51e1e62e525d7cb082bcc920
 MISC ChangeLog-2015 1372 SHA256 7b7188bd51ca5dea6ea78da8a9d4cfc841e59b9d809056663da8d6e5531baed8 SHA512 af470f02adca8cfd3912014a0002d7245d8d9d90f8c5692f2740f14476c8cd2db2619f76f519d4bdea38c26d0e9b88bc0e5f0b11f1ab3a6fc4849aafd86cf849 WHIRLPOOL b6ce3c1cef86607ae72e2154e31cf041e08a02cfa3a5b1f3f8af96b4892e91c549c8e39c3197a23749df692c988848c105af56a6048f8757d0b407b8e47a39f9
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-puzzle/anagramarama/anagramarama-0.2.ebuild b/games-puzzle/anagramarama/anagramarama-0.2.ebuild
index 06434cfe81a2..5dc26f04662d 100644
--- a/games-puzzle/anagramarama/anagramarama-0.2.ebuild
+++ b/games-puzzle/anagramarama/anagramarama-0.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.omega.clara.net/anagramarama/dist/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND=">=media-libs/libsdl-1.2
diff --git a/games-puzzle/angrydd/Manifest b/games-puzzle/angrydd/Manifest
index 391ae057f4ac..43efe26cfcb6 100644
--- a/games-puzzle/angrydd/Manifest
+++ b/games-puzzle/angrydd/Manifest
@@ -1,5 +1,5 @@
 DIST angrydd-1.0.1.tar.gz 5331883 SHA256 e4950cf9c059302632f88340aad23f389e335b21e266672b8ac5ae0f9fab30ee SHA512 e0901833febcabb6622bb85405189bfaf3c917c3254ce282045d58e8e5b5c6c6565ca0e7c56fe2819e0d3f344df3bb285cca54c360b467d284739673d1aa74f0 WHIRLPOOL 50014010a387098feb2a077e981313fc89d7742aad9bf17d11f07ddfef0b14cf749c1e1bdb30214a8d71f045513742251d54478dd18544e2ed70b1216d033cf1
-EBUILD angrydd-1.0.1-r1.ebuild 1109 SHA256 b6705f5048793a2148d742127d61df6d1d633adeb5ee460bd2f4924c4621dc67 SHA512 edec757668361b4d60f1c7f34792beee93ba4337b57aee296dc0fe2c69671f79a4de9fa36d4867a74bab25d0cb7b44f078c474e2debd248ec7ccb381f6c30a12 WHIRLPOOL 469029affafe71ed42e795a5876ac4dad440dad7740d344f9956401341636ebb1cde9b8aefd40181ce0823c2ed30bc05128883dc971be7aa731b8e7628ba327a
+EBUILD angrydd-1.0.1-r1.ebuild 1111 SHA256 7f63f112299636ba68158826154d7ba20096f4423a9d955058dcdb2d32541883 SHA512 d3a0585c6445b16815eae8b05fd39f2cc54581de1763cf95a975bb93c2ee49814e9c4ea1e74821abc060fcd8c8d47f769cb6cd95203625bdb68bd2615c955999 WHIRLPOOL 7ab2103237e2341de00743832d72d1551524593f263ebce23aa251f78dc376af8dc1a998136adb30de49dfffbb004764313f9854fc3517289f91d194726070c0
 MISC ChangeLog 2437 SHA256 d44c703bd13b1c4fc1d23e1d95952739010c851cb92adef96556b0cf1640a33e SHA512 7c00471f853cc219221923335127f78a3eef7e28a7017626baca91a1ee0ddbd12420aff91fc22cb268ac2779b65ad3a9d37821455ca59d34fb5d8450a287d77c WHIRLPOOL 12f55403d201511f6536ca27f610b52d147db10c7a9fc0c4007975abfae49b828018137ca66a18fd40d72e30a55d2d8ada56adf3223eb2c88513236bd1c06d7f
 MISC ChangeLog-2015 1610 SHA256 6057b767ec23bde3d6ee893dd1d3a2e503edfcc3dc8ce9f3f57f46cc5e8d609a SHA512 142536b05d6804b4b68c4f73ad9f1fa9bafde313c75823b160e1d5398fd71c118802ee1ee197034fd1de1c1031eca976b832fe4996b5e84a64f43ed429f89fa7 WHIRLPOOL d96093df8e2ac713292bab5f191471da4c82de527b91650755cabb36f70bdce05b04b5a713060af05a02167b44ea6270cd11f3f039a548e7debf49d3f0979441
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-puzzle/angrydd/angrydd-1.0.1-r1.ebuild b/games-puzzle/angrydd/angrydd-1.0.1-r1.ebuild
index 7438662e6bfb..6e2173c76467 100644
--- a/games-puzzle/angrydd/angrydd-1.0.1-r1.ebuild
+++ b/games-puzzle/angrydd/angrydd-1.0.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.sacredchao.net/~piman/angrydd/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="dev-python/pygame[${PYTHON_USEDEP}]
diff --git a/games-puzzle/arrows/Manifest b/games-puzzle/arrows/Manifest
index aee25e1a48e5..c0d2330dee9f 100644
--- a/games-puzzle/arrows/Manifest
+++ b/games-puzzle/arrows/Manifest
@@ -1,5 +1,5 @@
 DIST arrows-0.6.tar.gz 53374 SHA256 a8d18e1798d23c26e4d0330db745356d01cc4a3231b669643e08e426eb842d3f SHA512 f6c55d616283ad25d9d830440deaa11de81bccfc2d8eabe627104626ea111d986e522f73d61e5aed58476cc34a3e2b3fe2a20ab1538b7ecef04ecb941f34d83e WHIRLPOOL 0b4ed8bff7d64c4001e6a1f122ddb3ffeed47c4595fb7bd8604c0648b23fd687653862009b2f8439ec667aeeb7232f9f1de2211a7da3edc1de6ed34b059bf03f
-EBUILD arrows-0.6.ebuild 928 SHA256 8073b16db80ca6ddce69f833c0178f760c9bae9b68dcb0d51fead7e6a2e3ed61 SHA512 e21f14e9f1530e48f9c5117b8771813ee2eaff6885ee23da20b95e2bcccc253580d4d0121e557430b9d9838159a4c18a79ad1408b1c6f66b334a2f62e97c4bc3 WHIRLPOOL 8e40628f6bee892694916153ab7bd75cee5aa3ca4a3d42da51de0059577572f6717e00ef93ea6fa6b0c5826a3a3cf3676c824cb25a097de47d6cd30bb3beda0c
+EBUILD arrows-0.6.ebuild 930 SHA256 c39b795456c97879ddbea4cd94a1d5182c8f001004927edd774d37c279a678f2 SHA512 e35045325188f8019c696414f65f98d541c8ac47692f791e82b5895180ce1b9016f661e8d179938919e957b22d3f5e38c35d4931b1f572d784aaf938de4663f2 WHIRLPOOL 73b2dd8f6e07a5e4ba17332b25d0891993f93700ae00f8a59ac95b5ec4cb31b75dd4511f85eef6152320028c5ea0ba1ff800821decc6cd6848931247902850bb
 MISC ChangeLog 2424 SHA256 cb49dd2a097fe5e43eea245e75104a452ef0163d4099c11601c51d4ccff833f2 SHA512 42e7c81fce360a646aa71edf85ffb46d5ce6178fdd1693634a783d320a896d813f541833081ea21672f219e55b5421c285475626789aa5e06f299cdc1775e51d WHIRLPOOL 03806217bba14449e7103e624fde5abef1e305ad4aa518fb7bebf55c169b8b05ac3586616889fdbf2b38751edfe1e42f1d145c400de0b4f8580a66c43ea5750e
 MISC ChangeLog-2015 1342 SHA256 000438deb2d84777045c99f712429e8231a4c0dbdc94d6564ab5432023613a80 SHA512 2a4f7582e868f99cb6e1e8b5cd5ec676c9f870a469929eb0dc1f20fb030f576bf6d008bbb3a0dabac2aaf65bbbc1e53f5b1bc9f12e2caf3a958fd1e078188bc8 WHIRLPOOL 72de62e2e3bb36079c12d361d9c23ae625f5ce638a65d142694d611f6a7e4e8c6a50d8b401e47c6a08cae9cc997e8e185adfd26e5385874904f8f425eeca751d
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-puzzle/arrows/arrows-0.6.ebuild b/games-puzzle/arrows/arrows-0.6.ebuild
index 1ca985a2b41c..33023848a4c7 100644
--- a/games-puzzle/arrows/arrows-0.6.ebuild
+++ b/games-puzzle/arrows/arrows-0.6.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://noreason.ca/data/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=x11-libs/gtk+-2.4:2"
diff --git a/games-puzzle/atomix/Manifest b/games-puzzle/atomix/Manifest
index 752a9c223c6c..127da4dc7dd6 100644
--- a/games-puzzle/atomix/Manifest
+++ b/games-puzzle/atomix/Manifest
@@ -2,7 +2,7 @@ DIST atomix-3.18.0.tar.xz 262624 SHA256 3751cb2810bb993fd71d2a8441c4e08dccd36042
 DIST atomix-3.20.0.tar.xz 573180 SHA256 d7ffb2ddc8efd4af11986296b051be0af5bfe2226dac2b890290d3b285dd707f SHA512 883622952916e339710f31b89266afa14fee2b305bb4e68539bbce0cbf518490c60178d71fc1192ca07e35222ff6669afac8b824af8fb80d5f6b63f0b4fb5076 WHIRLPOOL 710b03090d356f2c19083d727812b5e66a49c02e1ae9f6f606c12afd99ca69f51381815654f13e7b2a9da504267263270b1329477b70c2dc9f59b1cebdc6be5c
 DIST atomix-3.22.0.tar.xz 551424 SHA256 95caf79181381ecc1725fc76b937a2440640739bb4cfbaff91db79e714e7427f SHA512 111c1d1cbd4e07ef7fdfa6d6431b2b7f460dfcceabd1460675640c3965e7f40fb145c921d27e0f3c06605e943190fd36af6d6d462533dca207b8d29487470212 WHIRLPOOL 50fbf803b878c720fe5d975b88b1c1d853a2e24028f6c373259fe7f69b1db59e99580f3f42b0af81a477bb3e2cc46e0bed558f9a08efaa9d0870f57bc37cd062
 EBUILD atomix-3.18.0-r1.ebuild 580 SHA256 87a40ba27849aa675b0a42d224d96bc8f137389dd72c32b46a28feac505a003c SHA512 dd906bc9373f8d2b01dff383866772b5715457556a35cebc7ac10817b6a99695978fc5dd2892b7294a1104d91a7d16ddc94d9cfd3b80523d79e48c99ad53a6e6 WHIRLPOOL 06dd7234ec11aafe925dff9a9a87175c63a3a3aecb783afd1b31e97ee8f3fae480bb5a6fcc2aaa4fbe4e596349df36f9743f880977ea4c40c11069b187945edc
-EBUILD atomix-3.18.0.ebuild 583 SHA256 2030c2c7826a4dd3be49dfd4d754038bfcc9ce141b3c2e82eeba5ba89c2ed442 SHA512 cf6ea801f6c751dbfe575f887e26433cfee37a2214f51ca41716a520c0a4a42151a8b040e0e405aaaeac3e3654c562cfb22ca1710c82ef0e2af811cff667d8c3 WHIRLPOOL bcf126aa7a181a683e4752dab36d3b3e7f868fa2fb383251e87e5949da6daa9b80c9c92d13c2738dc241710ac71f3a95eccd67ca93abb06950d52f0009e81d55
+EBUILD atomix-3.18.0.ebuild 585 SHA256 3609f86a6e7c0233ad07a5bdc83e464124ceb1407dcc6f4364177faac3dc5833 SHA512 eeb32aa372c52ce98b3d19dd6dad33fb369436d46cb31744f25e63959b901faaff55492f7a9d206be9032e11ffacd99eddc7a03e3f7bfa1df5f810abb3f43b0c WHIRLPOOL cb82c9175857ea7520517f8124e3dd5a01cb7f1f000fbbc7ce2c0544df34d42a48b222ca323991173313177cf8f6833be24777ae8568cff6b9d9bea184a132f5
 EBUILD atomix-3.20.0.ebuild 558 SHA256 2534911a3e5a1b8a53a2016c427c9592687bb690b3912704d68f629c101f193e SHA512 69749bfd47b87b0ec9a3ecc73e0d47f2e1b0464bbf9dd7d59c173b96285df62080ae4acb257f2c513fbb2a0704214d08f8e7a326754025a60980f9fb852dcfdd WHIRLPOOL 489f2aed198f8244e9519a6b5e3977f074cfc71a965f231d2ecde6126c57d247b248029277d242ca9bc2b36500c162cfd6ffafead3b1553dbba6d1c15030a95b
 EBUILD atomix-3.22.0.ebuild 535 SHA256 17d8f099b921bec128100dcfd3efc1e0174bd5ffe3fb1e91e5f22ba4e2397c37 SHA512 7551095fc1489cfdef0b86d4bb8e29e36bfe2f8439ec27bcb75acf5ed2245d9bc44bc913d817a861f43db5b215bcaaafb7f1e1659384ed1e213af07f52373acb WHIRLPOOL 3cb7702798112d5b58982860e311fc9dbed22a94c0bb71e4940e5d9b76018d3557a1ef72477d9bcdf312e734ecf8042730a7677cacc0dabf7a9a01001969546b
 MISC ChangeLog 4764 SHA256 338f33230517b1f89d8d748fb18183cbc141537d5da7499939bc4cdfc3ced941 SHA512 de65aed759b150e7b7d74fa82829b47859db0b1be6d620e8d78371651cdff6fd63d801306ac999c9ab8398a951dca9dec6bda2558c1f18ebf4db0f26388451c6 WHIRLPOOL 2523b8716f5c3a2e005ff58b05939d070a05f4383d1d061f21a36db96ad3166afa60e65bbcfe37c0a94636cc7b4d6925e4de94cf4aac88af0df6bc0220024349
diff --git a/games-puzzle/atomix/atomix-3.18.0.ebuild b/games-puzzle/atomix/atomix-3.18.0.ebuild
index acdfbc769ddf..c3a9cbc8b2fd 100644
--- a/games-puzzle/atomix/atomix-3.18.0.ebuild
+++ b/games-puzzle/atomix/atomix-3.18.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="http://ftp.gnome.org/pub/GNOME/sources/atomix/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/games-puzzle/bastet/Manifest b/games-puzzle/bastet/Manifest
index a6c8ffafabe9..ea709e290443 100644
--- a/games-puzzle/bastet/Manifest
+++ b/games-puzzle/bastet/Manifest
@@ -1,6 +1,6 @@
 AUX bastet-0.43-gentoo.patch 474 SHA256 a9bac74bfabf05c186676a7ef4520fc4cf80a9814ef806b82464bea5642cbe65 SHA512 8d381ecb59f141cfc16f64ec21eac18d91ece99e01e2ae327117545c8ea354e6e50a17cf966e43dc7bb5fe7ec6b1b3008fcf385098a222791cb15ec67bab400b WHIRLPOOL dd6f5f40e51bdca007c81fb52534cc8883f85d1ce0b63fb6157e5e79d3ae25f060f264d9b916493dbc1b6984d41a4a0d42c40d34fde248138320a811df5c053d
 DIST bastet-0.43.tgz 29115 SHA256 e208c68684cc9b818a08b0d3f5f1e7ef381b1e4d8bc801a90b5ff6a8f00d8168 SHA512 a3683c2cea4df592d9cef2be1b0006acc2b6eddbe6b64aba1c21e81ba39df9bcff6494e0949b67a84f3d1a0fa6837f0d1b7cebb2eb8a551b54392e4a45f2e172 WHIRLPOOL 80e2039599598da1b97af9502f6230e043b5a13c8daad1d48adad69b0ce81c8a8283ea678b0ebffd134cea0d4821dcaf3735a36b0d251d955452855928020147
-EBUILD bastet-0.43.ebuild 730 SHA256 e4389f4acead2cff8aed3ef22c20a2b769f59605cdfcdcf6cc41fcf8f78dae30 SHA512 2d9b15f90356ea4706f966a7f4617c87c9dfc2b87ed23fc62d78446f320880baf9291ca5183b3a9550ea4d1b4e622e5cfb961ee6a8d5403efc08d73a051a339c WHIRLPOOL 058fcb4a1032837e5e7de582cc72d6b90ed8f9a11f16e9ea1d7fca816451292f9fdefd29a5f7eca5b5f39771ef61ac25ff778c40be6ffe7fd1adfc5d9aa84377
+EBUILD bastet-0.43.ebuild 732 SHA256 ec456291d68157901c99e9b70c7b40b1136c8e76c3551bd765dc3a7660e483ab SHA512 900f6161e7232a30624cc82eba64f534a4e8fa67111019f16abd515be3e962c54835da90163f0ff599faaf4149ea5ee3065a4d0ee0373168542a7cab7f8a889a WHIRLPOOL 58b7839f0b0eecf6c9946571ec65758c37e7cefa4a77d7cbc28b811cc5cb068f5b6e5c2273eeaa0242b89a3f5841a8154bef2059408fa6be27cf49d9d93e62a8
 MISC ChangeLog 2600 SHA256 c874abd610c2d03c33ee63dbb9663fc26eb67daaabbc6694c3d43133d34c2c56 SHA512 89ec685afe75fba90db52c976158f7b9dd1c79f0ae4aecbfb8abded1f084e3a845a8c265271391ca41820411760d4b368eed51dce30d850d9447e8b6d055e967 WHIRLPOOL 73576ad9095f190d4f4b8e483523431cd99b46c115503ed9af2ca808358a9216412b1c0400e6977e0a3aadc1709205cc0b97d09b738c2b84f320d473c837356f
 MISC ChangeLog-2015 1617 SHA256 d40d000e41c3a751cb62dafc4ce2f642d2ba48f2d172a27f6d7942e2dc59be81 SHA512 e68f5a635bdf71cfdc3a1fe435e0322cf957f1cc99da1800907c76861135d8aba3b90f7a07c6ba659706154b3181ecc013ef7300469525ebee2d3792f2e75cf3 WHIRLPOOL db069a62177ace4c46fac316e1e76a05e5326c2c808b9575affbed48a0385cb3fe168eafb9cfa1074ec8e99c6627835829608557b11543e358013b56187b6479
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-puzzle/bastet/bastet-0.43.ebuild b/games-puzzle/bastet/bastet-0.43.ebuild
index 653e57aecb6a..c395170fbcbe 100644
--- a/games-puzzle/bastet/bastet-0.43.ebuild
+++ b/games-puzzle/bastet/bastet-0.43.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://fph.altervista.org/prog/files/${P}.tgz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
 DEPEND="sys-libs/ncurses:0
diff --git a/games-puzzle/biniax2/Manifest b/games-puzzle/biniax2/Manifest
index 5a0108b61a0c..c674f8c9d592 100644
--- a/games-puzzle/biniax2/Manifest
+++ b/games-puzzle/biniax2/Manifest
@@ -2,7 +2,7 @@ AUX biniax2-1.30-build.patch 525 SHA256 1a83cc66417f5c0f1b80da6a747ea700469170b9
 AUX biniax2-1.30-dotfiles.patch 1356 SHA256 b613328a03a54b32c1a00401e94f6f17ecc7a3a332ec370f404a25157671f57a SHA512 9d5b53be3b267897aa1a49bc45bced24e7a0e998adf9a48934da5223cd763a3c1b3a7fc7d68771ff0ef0648f6cca17adc915f33d9f15309356db8f31d4be1f15 WHIRLPOOL c262c28b398c1ea5a6623a1a3038445a28aaffee922eda9b7fb89092c288685a3d48568e502e6cec1ac300d427583c7e3604f58cfd5024296e5894bed78ebc2a
 AUX biniax2.xpm 1292 SHA256 0851b1dbd8e0dbcbaa9bb248b7f6e9490391f491f590686382e27500648ba7ec SHA512 5a53233b27f5e8dd792cd697d8233c8d34adaf00dda51944caad186deb50311e55bd76916f4aa6e352973fe14855d34a27bcf9a91a8f6a56238f5fe18f5d3b58 WHIRLPOOL f8f60e8531290e05fb04204dcaaac54a757201240434f686ef73d2aa5272a2fd1045f88e765712bb7124b3d001111956f612dc27eeb1ae12811078e4d5d31114
 DIST biniax2-1.30-fullsrc.tar.gz 3072220 SHA256 2c09f6f0a5fe453a409d990d72a964636ee91ca91daac99f0db861b8f42531bf SHA512 180564b24051b629c29bc6245664a36b7ff9881ac5003b03b91eeebff86c89b9507c028c1155387c42debaa51482d8f1e2b08e9e9236b77da1c3f286b78be8b5 WHIRLPOOL 7016364f493791f11a28b30a870bf3b60e6271018564e057ef41b8706e3a60ffb1396f48b337c7ccb0fa3777cf3702ad4a400fffca466c7dc590ca9ab5f180bf
-EBUILD biniax2-1.30.ebuild 827 SHA256 0bf331e1104d392a0238a2c7920518a920db98b92d633f25141d489cd24c4937 SHA512 b9079dade54191d745a44c4d61b81e1295375b672af14efec25f0106a498f911df781e86689331944020714c5e2dc2900f80f55506487ae322c30c9932c7554a WHIRLPOOL d108af71f1f295a7f0124372a094d13c22a3d29ce542bf7900aefd1148ccda5f27ecb265d0b8a4a797960eba7d2f2b4f1f0063cbb0e9c2c467cbcb31b487e51a
+EBUILD biniax2-1.30.ebuild 829 SHA256 54753a8493659948a9e32f72896cf819cb9ebffd53dd0746af5b6b432e50aefb SHA512 40c01797d058800cd82be4a013f599b32d2bd352b3d387b3d38c0bc9e6d4d3a19a522f47b018deee21a25c7420f29d02ef3d82f2e266d4d0a00caba2946982fc WHIRLPOOL 610c25e7221ebbbbbea3e25670eca756e2b7728330e855c020c6bcf61f49359c5c44d87f27f1888c0fce6de89ccc72c9af89405778fb3b46a686054aa71fcd71
 MISC ChangeLog 2520 SHA256 8642d19601a904122e295a97aec6a729aa7ca2bc299366eb6f4db9691985f210 SHA512 638c21400db57d6eed86298686f1aeb1ec8f257590563711f55510235cf68441f38848ae21e3addcf8eaffa9e352de86184c897ee87ef181679efbc2e9a844e7 WHIRLPOOL c0a34fd66fa6789fa641128d2ad20cfba93ddf09354625fe541f64496b0f3c72c17a0ac8f37b39d6ab4a18e9cbe8b897f85fe94c025bdc498615e4c86d9b4206
 MISC ChangeLog-2015 818 SHA256 9cbcb38502b4980cba507b7ee18d514a047f9de873b95b8356713bbddaf869d3 SHA512 4a083dc457a5d88ceee5bc53e00b31360edb81c24323ddddbc13238b92f1e43951e2f39d763db96df5fd53921e1e5ca9975a6accfe944deb9da083dd026ba1f4 WHIRLPOOL b5d476e50b36371a5b57ef7f950de178b762057246913e8fabcaddca08883e1634541b37b764587c03e1f5b47b02a3ecc0995f62925c4011cc56ebf43cd3ba3e
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-puzzle/biniax2/biniax2-1.30.ebuild b/games-puzzle/biniax2/biniax2-1.30.ebuild
index 52ea37ca80a8..8c89af60317a 100644
--- a/games-puzzle/biniax2/biniax2-1.30.ebuild
+++ b/games-puzzle/biniax2/biniax2-1.30.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://mordred.dir.bg/biniax/${P}-fullsrc.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="media-libs/libsdl
diff --git a/games-puzzle/braincurses/Manifest b/games-puzzle/braincurses/Manifest
index cb3e94060885..ed9bb2461197 100644
--- a/games-puzzle/braincurses/Manifest
+++ b/games-puzzle/braincurses/Manifest
@@ -1,7 +1,7 @@
 AUX braincurses-0.5b-as-needed.patch 692 SHA256 4d6009661e02f2826fe6f408a82063ac3193f3841e3c1d19de5d72ef78e35323 SHA512 d4067011081e587ccc07baf6dd6597bfbdd8d118e14b0a1b8c83d8384332132edd21d079a2f60ea1003f588a88191662f6445e047bb9121141b2b83856051855 WHIRLPOOL 032254ac7f9295ffe6d5d55c955cb15a87e3853129332688cf242577f19f5864ab131876ddc06bfe2336fc90e92719f5c75ad053b0f1690aed1f766e2f454957
 AUX braincurses-0.5b-gcc43.patch 188 SHA256 eeadca86a1cc9512f1fef8af180ea30cde7e08b36e925beefee9904457091932 SHA512 212165591b422cde8c9aebbe7fb14b34903e7fff0a6fee4310c953b11154ae1900d8444fbbc6f37c2accff4023f5fca87a50121d9abe51b7d634001d1301758f WHIRLPOOL 5faa0290c3edb98ae04801bdf77d7f146fb9710d6d1425ec79c6a0f7bc72707124628fe61ee5972189b6be6f3a71d4ca9cec3ede9d16ca0c974e3876bc5c6e48
 DIST braincurses-0.5b.tar.gz 18487 SHA256 c9adc662a30fdc51b36467e536ff5222b769ec73b35c7bddbd0ed4772c05f332 SHA512 7f90da3a5c480e0bf736dd4a53efc08abeb85969e727882e3d06f888b2a4b6002f9fd9bc1554ac2256c9821dea5fabf2638eba4a672046a09c1adb8690803a0e WHIRLPOOL 97829b1602e353714ec085a9ea635557c01911c935e0b6a13728d633026958ee9dd2e3903ca801cb2e24297c4702a325ace1d32908873cec985882a61edcb332
-EBUILD braincurses-0.5b.ebuild 693 SHA256 6a5d5bf2de1c4d20a211393626cd35b7f4f5501d6f22f7d652c4f23bae954406 SHA512 d27d4c60cc1e235ecc5455406550693c18d86c7a759fb84b3a85dac3ad44e7d3dfd263298dd11cdacaf7e1e21ab3832211fac21c961422d60815ffc760cd384f WHIRLPOOL d3873168843392e27fefd1859b5ff13f36addec8ad69e7ec9e3a487bd7f892213012abaf3ab15cedea8cfd0a627b764c10817caeccdfbf1be785fe64110b4788
+EBUILD braincurses-0.5b.ebuild 696 SHA256 70e169397ab80d02fc5948373f6e1e04721c280379a83d8c4d22584d59ce46b2 SHA512 7cc5412df00b8e9c5b57d28613d8d817900cb9e9322a30ef870ac7ad31e32be758534cee1f08aacb80a9695c1150978d71811a2ec7253809798cb9ec25209aac WHIRLPOOL 33b6f9b01a6f90703ba919050a7f32079b8623cf505ac712ac8a17245dd93263707be988bc1a75d71c6683216f5506d4023e3ff0ecc90c2c89ec8f0b877d17c8
 MISC ChangeLog 2521 SHA256 5885b9b01fb6df0d388e094e3c26f6fb25d517a4c0ed11ac9892f95123909974 SHA512 b255c68933ddd1a42ebb35652c3308360a817979010f838b1626807d78a02a834929ce0124a21426d03ba6dd81fb0a775e51b595827e506ea34784e1a1053159 WHIRLPOOL 046aed39ec6c64df15550a2a9d5c655330172195f873d8c2940754c3a688bacabe35f5e3e77b745dd6f5a71d39dde15fc8aa9d584e3386b9ed9cd77d807067a9
 MISC ChangeLog-2015 1559 SHA256 5847788f0446ada25e8780b8ac9ad6aaa6aa900c25e2c1719848f185596fd632 SHA512 a369e0ba4159c1e77bc98c9455b84c9e37c4c1b3d2acce0a60cbeece32443c2fcd8a2bf8f11669a4791a5d90bfd9887bab0509f843b262ca98c5131389e488a6 WHIRLPOOL 6d76642f975241aeb5ddc6f61bdd065ada4fb068e346ad92bb1f8d825b17638039fb712fcb9d87369d291deacf436d6aec779f731a1249e27a3534c44eeda74c
 MISC metadata.xml 388 SHA256 10c4634c4dec94df7cd2f22ecbfbb20307f5e47bde4de1325e7db4f4674f5c5f SHA512 22fb2671d0f2029bea4e513d469b2d9940fef9a5ed6a6d9b47dfc80aae50b41bae3d89a620ff4be028ab46ab2dcca801a4653e95feca142c3b2921d436e2e6c0 WHIRLPOOL a7482848f1fc69f8b9dc331d778099b1a183341bd5a5dc9a526f51598690beed92cf9942e0bcbeb1a1803b73ece7df59de33246a074d1647e474b2b68f73e887
diff --git a/games-puzzle/braincurses/braincurses-0.5b.ebuild b/games-puzzle/braincurses/braincurses-0.5b.ebuild
index cc858a722222..b29db61b473d 100644
--- a/games-puzzle/braincurses/braincurses-0.5b.ebuild
+++ b/games-puzzle/braincurses/braincurses-0.5b.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/braincurses/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
 DEPEND=""
diff --git a/games-puzzle/brainparty/Manifest b/games-puzzle/brainparty/Manifest
index d7c1e1bd80ce..fda9d7e0c543 100644
--- a/games-puzzle/brainparty/Manifest
+++ b/games-puzzle/brainparty/Manifest
@@ -3,7 +3,7 @@ AUX brainparty-0.61-gnu_cxx-hash.patch 219 SHA256 20a8a1eaa0e1ceec7f930e311a47f0
 AUX brainparty-0.61-savegame.patch 674 SHA256 2089b4008aa43715d2c80f6edc1c444b71a4ebd8d92563f7566f8735197cc9c2 SHA512 9e158b97ff15cfb4b6b8e4f6eb8006335841c48ff94b5da8bbb0cba03868b8ead92d2520bc8adae887d4baabac93c8104e44b46d87b6c4258792ab64376ce34a WHIRLPOOL 77ca0f82e5c31a6ab89a8acdd596e6799f1df9ccdd47d23d9f85315f549cc50c22a23355feb6323cb95cf01a680dcb75ab564bcb4a17a3800f72d906492ab285
 DIST brainparty0.61.tar.gz 40676905 SHA256 6930b563b45f935451b28fa3ed5d33619e766885f82656a3eb48c6d30671a625 SHA512 bc8578a551ce4b7f40e212d9ab9910b2435b88d8b7b7e90a1c088e37d5f26b5c6126fcb9ffee7e39981eff34c13144c8f3204e020532b5abf1c4815cc8074eb9 WHIRLPOOL b8c9065af334a7f404faab934922841adf860fbc36734ae44ba582e7c30f218236c2f266347f1de596e0036f5139e16c5e4702899b83025e5f60fcc1fc36d258
 EBUILD brainparty-0.61-r1.ebuild 1223 SHA256 12f262e877de02783577ef8b439e3576be8766d33ddd1c2c4a1d20b58b6da5a8 SHA512 2dd1e3071749fe87480d37c3d4e8eebf0c24479cdbb624c28e0960b9dfd08eb830c5fe5dc25f3d987a02adbc141c2b3cc75fdc785ee40c734ca4bdb56dc99e4b WHIRLPOOL 8b9ece5c6a7f2abe385e3b793d964af526c80f205cd3a1f80abcb55f31990971f21ee173ee6cc1ea29110301c05fef2308cc534a411b36b6d0da3c851b5abac8
-EBUILD brainparty-0.61.ebuild 1245 SHA256 eef571a8a9d075e91bbe454d992991681c46a5748ee74a3cb1d2c17b4472043c SHA512 c4f408a03597aca4f101d267371c8f52f0800c9775c69cd6d7ffbd46982dbc8d74630176154ce6a3bef165cbde491cbdc6eec581cddeb11adad41c01ef517d4b WHIRLPOOL a42106f576805cb840e8a6265b9ebe0d9b3e459b46e2ced312af415da9a70cf1bc04843eb732c40b1bc9a78cc39bb8f3b75812da6fcc916c34e7fb549dda2553
+EBUILD brainparty-0.61.ebuild 1247 SHA256 123be035b350d306dc6558dfe9a1f9c58bc6311e1605e28c4faf263c9ed927a2 SHA512 8a695ce2365021b6e7f7e4f24b84a569f8fd141b22c3556427dee810bb769bcd17ea7f0a5a6dd3e6d53237dae466fa0f6c0c5fcd7588651a6ba1a8b67a68ad18 WHIRLPOOL a2eb116912273a6642b17768522005e415507e25b479b400ddab56229701ff44bcfab7e38b822ef77b0f04ef83a2a891f4ae63db6a7e48aa1b592ba81baee484
 MISC ChangeLog 2693 SHA256 0a2441a78488de08a152d4758e62cd20d83e812fb1c818d4806c370eb1d9839c SHA512 8709bf36507fda49fcdffaa7064792ff87e996968300dfe6f6b246213e5074779380a3c35e85c0b5e7f95c2badf113e86f31e7e0e3ee5db4d0e8addc8c2fee3c WHIRLPOOL 957de024837ee9e3f0f7eb7ccbfa07d6dac8820bd1770a494866a199099689c317089aed7b4a7a2b331d3405def7e1aa54a3ad6c00cf1cfccddd4d89cf2e9d88
 MISC ChangeLog-2015 1762 SHA256 d2f0d2a4d4f7d4c6c0c548b91cdccd045237e6bda2aa430bc6247a47299fc1fa SHA512 335b136afc6ce2050dabf5d6b5acefbb7c2ce5445d74b25302bf5bcc75e3689fc5abbfa8569c34b200bd034d944e92ff64b36abffcb0ce1e463d39669b36423e WHIRLPOOL 73bdccd8339697968a9b926179f8c753fb88b443bcd9ff0232120ea5b799f49c997798ea3e2033e63b967c2e7eba91c43a1aef85dc3f498ed96efe4509102d98
 MISC metadata.xml 331 SHA256 54bd97abffd0c0bf57efcd700c020b48bfc26e5d0488d7cf57e99aa002ec6e6e SHA512 bcea1853cf01102eb88c58723e585f81c55b4208be24b46bc421b62afa84405539116b33289e94c7b1da5c259ca91d0fc6553e6441e59ec5d41326525742a404 WHIRLPOOL d8f36508134f6376b6dbf4b6de2ce9b972b6d4781231f99c1c73a09f3a616d5535ad91e554bb45732262da57ed812017c75557f486807b618c33b955270b1ccb
diff --git a/games-puzzle/brainparty/brainparty-0.61.ebuild b/games-puzzle/brainparty/brainparty-0.61.ebuild
index 9cc441ad80e8..ec75d548eb03 100644
--- a/games-puzzle/brainparty/brainparty-0.61.ebuild
+++ b/games-puzzle/brainparty/brainparty-0.61.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://launchpad.net/brainparty/trunk/${PV}/+download/${PN}${PV}.tar.g
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="media-libs/libsdl[sound,opengl,video]
diff --git a/games-puzzle/brainworkshop/Manifest b/games-puzzle/brainworkshop/Manifest
index eb6098a2e310..1dc674033757 100644
--- a/games-puzzle/brainworkshop/Manifest
+++ b/games-puzzle/brainworkshop/Manifest
@@ -1,6 +1,6 @@
 AUX brainworkshop-4.8.4-fix-paths.patch 473 SHA256 a3ce16df2aad55cf1f1aa1137e7e921a2edf2f99da65929feea158f1f544ea0d SHA512 858e837e001db04efd9a3c420860821e02ca9b7ef7197a8fe69221d0135f11a05cb6f2f9b4c19cd9eeec84c84ec5842c7e8126f08dc94f9ff79569f580f9d515 WHIRLPOOL cd2bb0e53bb65a6fc5b525413ee980df61095a009cfcbab8f8232e963bd900f89988049e39f893e75384ce0760c64ef85777ed5abcf7aa6647ede5df0bd839cf
 DIST brainworkshop-4.8.4.zip 9373980 SHA256 bb1f259eda90e945a803524eedbc0087283e3fb9ae2ab4c16ded88c8c4e95b15 SHA512 d3819036fef98fab9a89637ba01b2d844146babc7cb34b6ec6f4a589c18a7532fd23cf083c867ea1c917df9d7a6507ab51a5942e745d3ab9d01d938812486936 WHIRLPOOL 4faf02832dc3af0f7c5fd0103996a884921433d2f3ff37d77d6c2510d7f6f3ab274dbe08c89f26e360725cb0ea3c52312cd23a813b680d330274579135fee2ef
-EBUILD brainworkshop-4.8.4.ebuild 1236 SHA256 c8d616d12e12403f7b4d96a7555ae7a0faaca65dad359df7ddc2920af5cba904 SHA512 83664a08873f28a7734ef7ff3b44894a1e67e825a5ebb2e0f7b757f6cb276946fb8fb076af97005550b31d4c9449f04a4e11a8ec054689653bdf0acddf12a35e WHIRLPOOL 6b59387f17f62a50572aca3c1ae191938361ef3805dd464fc14fabe5a8a800345811327e840b28174d44bb50f60ab670b6498dedee3a49279002d5882923ef07
+EBUILD brainworkshop-4.8.4.ebuild 1238 SHA256 c54ee0cee58612e85858ffa96372bbefddd45bd62d0b92c8ca2b1dd280cf0b85 SHA512 2a0b06c445c5da235da3da51672b2377c0a94b58ff1d7b2299f7763d8ed3f498a6593747b2203f8757319e27ad5230fd56670b11c0070fe013c68074e4ec1d05 WHIRLPOOL cbcb064676fdc2bd44f44a41db040c8305cb47a8a9b8b2260282b7fef252392384f34d72a8c21c47d2930b6d490d766db3a48f4cec57591d880ee010ef866cbd
 MISC ChangeLog 2495 SHA256 76a99e27fcb2be37ca88790070a44cb19dff9a72a3a82ac874c12cea852444a3 SHA512 6b82ca74ae8fa4dd223618aca23efc865e7d3ceb1a06406306e91b758cab38696d5a0cb0bf03e871ac60cf4200c3c5d28b953247b58335b6db299120c5e1ef5e WHIRLPOOL 9a6eceb9e15418f1c1e7247751f4703a21077f6b70a65f5053af4e0127bc4f11fcdc0779e4416ea5567132e74b8a590c214e9789c3f2429d37e436be9a77e3b9
 MISC ChangeLog-2015 1497 SHA256 cf420a81bd19aafdd4c995d87eb0c72bdb18b9e1aa518c19e0813ee143983a90 SHA512 8c68d50b2b3b6b7256e25dd8562a076c29f39b01bb471955dd6e853b6bddde56774da68cde0efcacd7bfca97c640d5bac65dc5e45a004e594ef5f5647d3c4d79 WHIRLPOOL b3a2995f93369714bfc108e73842cd0a9d6d3f8a54a81b2de99c9a429814fb081da0bfd888f7b703eb4fd75407094e56c4dccbbb9e627886b79e562bcc5b3d51
 MISC metadata.xml 336 SHA256 b4af94107008cd60e2e9eecb63dd72921f5b13cf12dc4f9f1724ba4db79d173f SHA512 75e98aaef9436c2e488b304a19cfcaa1659748c97209ad217708046516aa4a76d9ac18c3c4762db08c496efe21a7ed5006bd4b2100989adb2b7fa0b9a8372b12 WHIRLPOOL 1ef539604e64cf0ec6bdfc2740a74805c0d503eae1b05883bcb29629d2ec9bd85282ab2d68a70cc9054c107c3cfcbf4efc5ea84271998046329d429fc08b25f6
diff --git a/games-puzzle/brainworkshop/brainworkshop-4.8.4.ebuild b/games-puzzle/brainworkshop/brainworkshop-4.8.4.ebuild
index 89dc8c4dc3fe..e454d7dd3448 100644
--- a/games-puzzle/brainworkshop/brainworkshop-4.8.4.ebuild
+++ b/games-puzzle/brainworkshop/brainworkshop-4.8.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/brainworkshop/${P}.zip"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/games-puzzle/bubble-chains/Manifest b/games-puzzle/bubble-chains/Manifest
index 226650e158c1..b51a5ecdb596 100644
--- a/games-puzzle/bubble-chains/Manifest
+++ b/games-puzzle/bubble-chains/Manifest
@@ -1,5 +1,5 @@
 DIST chains-0.1.1-src.7z 3282431 SHA256 c1c487c51e8cba1640a49497debe5962f692e17df1272994c5dfaee9d6eb304f SHA512 2557974ccfa474329924684d859abae8555bdf7fc8e3264883ed0802255bd29ae486b8150b5ffd2d1b4176d0b8d98aec35f7717da4a6606a6c21026a41f1297c WHIRLPOOL bed7a7d1a64447715d47da432ee495fa5ae4d17ed99376182188398f6c846fa38c5666eac722fd60e7003d77660708809763f5f3466abefccee0b739e74bd69d
-EBUILD bubble-chains-0.1.1.ebuild 1014 SHA256 ae0b5381b9e4f48d4708df818513bae7242c70d5ad12d68242490fed66eee77b SHA512 54e92d2fcfb901c4d6493b986a0d0c7e594e7bf88535d1e3ed0767484db399b9342862902e243e07db5ccf87c5249c78ef2e630c589a0aa265c2f340c36358b2 WHIRLPOOL 985173e0e73c759edadabf4611997662f3f43523b2b762f675adc107a43c32dcb51de4226c14d46088cefd82a0d29aefda1ae98f4036f5a8796292dad3b43bce
+EBUILD bubble-chains-0.1.1.ebuild 1016 SHA256 a04fbb7a0a62685c844c7b21827bc207484700251299937bd6f792f94e2d8d9a SHA512 bcb8c77eac54f8d8a1124f6c4891a23616df5db92251cdfcc2ae8f25b5795c7b86fd0cd594cbb95214ad5beaad5fe421a0821109b33d40946076821f3b4f46f4 WHIRLPOOL 3c62508d8d4ba2d01667bcd431067f7b0957c5b347dde80d1ee345f7b1dfb7f226a80e26aa1468d64ee9f4e801a1480109e67698ef90310b5359ec93f5156350
 MISC ChangeLog 2449 SHA256 2ab3d342d8730370e23f682a66b7860b1132dd9887a5efa63c75da3fea629bf0 SHA512 a6aa90d73dac5660038ee731a349a0a860d27d5f8f843de563f510cdd9f2185ca08717fac2941c61e1480a00753c663450addcb5301bbf8595c789eb340494ec WHIRLPOOL 7e6ee23d3cc7a984a59f0d0d1530ed2781e26eff73ace73993445f25e63340e38f57f4b1d9dabfbe897e6a7b43bd1a7eb589407ba5effc649ea74ca2dea2bcce
 MISC ChangeLog-2015 1555 SHA256 5eace605900735e4d01d983c981e22a62c7f4aa70f69fdc2cc439529cf1aafda SHA512 83e43efc032676962b0f7c976d42dab496f9779b8695f7d3291cdcea617999b3992b4d633b78ecff8afd3919fa9a672fce5bf70701d001bb259e2f8a057b76a4 WHIRLPOOL 95ce8e4cde5c66c6e96f50b3bea961f37c74c0257cb05333bb8b6ee08b6420f62e775181a2c8b5e320995a482058674de804ca84769f0e9cdcef7d4a87fecd07
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-puzzle/bubble-chains/bubble-chains-0.1.1.ebuild b/games-puzzle/bubble-chains/bubble-chains-0.1.1.ebuild
index 5b992e8b9f2f..71eb17a7bb69 100644
--- a/games-puzzle/bubble-chains/bubble-chains-0.1.1.ebuild
+++ b/games-puzzle/bubble-chains/bubble-chains-0.1.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://${PN}.sintegrial.com/files/${MY_P}.7z"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="x11-libs/libXrandr
diff --git a/games-puzzle/colorcode/Manifest b/games-puzzle/colorcode/Manifest
index 1ad19db1e058..266d3c371090 100644
--- a/games-puzzle/colorcode/Manifest
+++ b/games-puzzle/colorcode/Manifest
@@ -1,5 +1,5 @@
 DIST ColorCode-0.8.5.tar.gz 233676 SHA256 7c128db12af6ab11439eb710091b4a448100553a4d11d3a7c8dafdfbc57c1a85 SHA512 55f935944a91441ae09b1636fe85c8174de53ba10e04df0d9cef6c4f2441879735230ac0fe313b91cf9870777df24bc95d975767f27940156b5698716b78b507 WHIRLPOOL 6186208821b412c648218254e0b32801e564cb7ba0de1feafa50a9e95c74d8d8ed09531543a6d6cf55807163b676a69650f246522d09097eb962d052ba960ff1
-EBUILD colorcode-0.8.5.ebuild 681 SHA256 b8f47ddbde4cf8cedee83f9d1142f6dfb04bee2b42f6ee56087a8fa332e3e2a5 SHA512 ab637d8268c9692e1b01f47665dab06e7e903adb860d6afa9e30e6f7328f7019b6aad55b7917163a3a3b548e5c5220fa25492f74fa2e0916113bf1fa1a25da76 WHIRLPOOL 00c7a9b39294e2fb08a94963c59fa8de999031285fc1cac162d2d60d95d8670d96fb8daeb7f371e1f2cbdf21538bf5104673405ea1ab23fb602c647f58ea8407
+EBUILD colorcode-0.8.5.ebuild 683 SHA256 00f6f97e1203bcf3abde43508c860891bda762b88a7ce4fbc76a7ac069a5e8a4 SHA512 c886978d4d3981dc6a0302b6a06a5b1d5bda2e254f1507a6840b975c980d7f4cbcd7b58b202b69f45763322c8e0f052cbda2ef9d59184f69d12fabe9fd5d8565 WHIRLPOOL 6cc090aea3fc022dcd74c99188e73e160cddeaa2305aab8258982d03c6c83237eb827f30b6daa072383a3bac41e0a00dbfeea589d66873972672d1db6071feef
 MISC ChangeLog 2602 SHA256 68dd91f493f3ae113bd243a60651d26a11287f90fa45b51a85d46c581e0e9869 SHA512 f0f98023fa26bea87eb235f21fce831e38ea4a4dd3d8652699f84672f2ab974d8d65253ece038e0e4abdebc511fe6f5a73239de63ae66c7d5eb6d0f7f9c5d306 WHIRLPOOL 5b649a07db16bcc039e49c6712ed00a3f04112eaee4185ac625e56161123640a45db9dd8758eb1995627a0d63ac0fd4ff706887e30f1448f556c6de6c90e4ebd
 MISC ChangeLog-2015 1663 SHA256 eebd354eca09922b3432b6e7723ba10e1154c44e60b9fe7cc415eb7d8b730c31 SHA512 379f5c36199de6b90fdfa9abd0315b5fb47dc2d579eb0c5a58aeba26df3745cdb98c01bdb18950ef06cb5800e8f1c3da4e8753f9c1d1d6ccd6083d05ce84f403 WHIRLPOOL 3969869463d0e01ceeb99f7c6d4dbeb2ed7681925a48fdbbd40e8145d0bfe0ce44ac46d45dda5c2f1b0f3b24882197c6219ed73997d9b0959ef0a27e761eb880
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-puzzle/colorcode/colorcode-0.8.5.ebuild b/games-puzzle/colorcode/colorcode-0.8.5.ebuild
index bbe2bfc80290..c304b720483c 100644
--- a/games-puzzle/colorcode/colorcode-0.8.5.ebuild
+++ b/games-puzzle/colorcode/colorcode-0.8.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://${PN}.laebisch.com/download/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/games-puzzle/concentration/Manifest b/games-puzzle/concentration/Manifest
index fefe7b7ed475..2040d8027a14 100644
--- a/games-puzzle/concentration/Manifest
+++ b/games-puzzle/concentration/Manifest
@@ -1,6 +1,6 @@
 AUX concentration-1.2-gentoo.patch 4615 SHA256 98cd9a33692785945515630738d4b3aa15bc1a3a9b0218778b32cddbcdbbe343 SHA512 a513b43e96e6d401ea705fc9ebcfb868c4680af117551b166c20900417e977a588ab12d19ee6d7e4f58cfea1dc3799845581fb122470093b6fdba187d73689c4 WHIRLPOOL be2ec66d8f76ebe2aaa2f5a0088873d2068b2c08b8f8ba949b5ba6bfbe4707a10737915868ce697670650e870d38c12c4ad635480a272b34f116d84c0cbee02e
 DIST concentration-1.2.tar.gz 1044563 SHA256 f247fa694c03bc0a2be91bf85fed8c0f44447d0e7216b2d22259713453596ce8 SHA512 afa9007cfaaa9a1cedcbfc490cb63d93d8ed1e91230ee714cece481ed3a39b73c82ec4cda65b29a27e9e71a7d2215be7f476e3217b487af54716eb4d692ca005 WHIRLPOOL 469e38d5b485ddd2938acc66f57a4b259828d2e5baf13827b45b1c11dbfaaa36cc4a2f1b5e8e7d17088246469cfffa461296b650730e6e3b71d55195b808e1bf
-EBUILD concentration-1.2-r1.ebuild 680 SHA256 489150388fd98ed571faf30c058cf499f756e55cf8a95a0c3cc63683b0b2aeb4 SHA512 05ccef7ddbdbadca1aca8727f517258409473ffd734155bfbb56fe25026f98cc01dc848c0de754f55b276334d46f6ce19fe5fff9ea5fc0da17fbe90240efc5ef WHIRLPOOL f6f9922e5c9d6fa6606ac4411dd90205e7fba5ca8adf16bc8921c3ae95ffab92d7427c8f472f8b5a11d5afb15a7cdf19b66f93dce83f8faff97fc4e366a09938
+EBUILD concentration-1.2-r1.ebuild 682 SHA256 159b8655d0ea670a1f31eb708680d83cdc0b7194a1092d56e24c149f1f6c869a SHA512 be7e02a4b6ddef1ac92c8e148fd9422553725da53a077a00863e4dd12cf425a337654bfcf766d9ce5621072f7b4b1632aae644762c5b097acb8fcaffd581bdca WHIRLPOOL f34049334359b987d33549011dceb2f8598f7b3381a4eefb1e1ea48a0c98c893d52d57c770e8f665af230ce4af1def26ec1d6e82ae6017cd2689df14df1b8488
 MISC ChangeLog 2492 SHA256 b12902e8b80291a9a6897729cae3b1c2f692c82617501644d8219c153a767473 SHA512 25bbd8923a3e6b07efd80789c45fa3d134b719092ae772415093e4eac8cc98938b4ae481ab23bcf7729d0de7eadecc1cc31462b283738844861b1013eb53a642 WHIRLPOOL 1075cfd035edc98c8651199da1199ae2b169dcc5c6e65528e92d25ab014f06b40049ec21757862003434cdbd6dbc84875a56c70c8b17718f873836a5048a92ca
 MISC ChangeLog-2015 2118 SHA256 1ebc37f26976be4eff930a7f8e79734f911b24911b131f891ac3e63bb96bbf01 SHA512 e25363d8f3b2d8c9876b8b0310fb9383b2d58a50486059f51da62a657fd87211e506793ae8d815f0542acf2ea00e662d2c427899ee851925627af37ee24240dc WHIRLPOOL 275861f6fd9e2fe84256678ff30d53d0cba9ae821d7e55b3bbc3521123dbd163d3a8c25ce3734fa7874e0bf16d926a2ab6ca96464b7fa4621b48e3573fc41888
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-puzzle/concentration/concentration-1.2-r1.ebuild b/games-puzzle/concentration/concentration-1.2-r1.ebuild
index 533a80a7169e..1aa804b6b341 100644
--- a/games-puzzle/concentration/concentration-1.2-r1.ebuild
+++ b/games-puzzle/concentration/concentration-1.2-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="media-libs/libsdl[sound,video]
diff --git a/games-puzzle/connectagram/Manifest b/games-puzzle/connectagram/Manifest
index 7130a66d4eaa..f18733c6ea6f 100644
--- a/games-puzzle/connectagram/Manifest
+++ b/games-puzzle/connectagram/Manifest
@@ -1,6 +1,6 @@
 AUX connectagram-1.2.1-gentoo.patch 2551 SHA256 7f3a31432ff51b7a02a2308bb4405a1d7de2030999a9a7e173c3837556920c73 SHA512 a95856c1f76670d1ea1e86a34f8d05ed7621479d6268068df46c7b3882dff633e7a8236f01c9ad3215d0f6e89a5702d2ece106be3db971431b129752be272804 WHIRLPOOL 9a65158ad0a1105158b140257bc863e180ae68ae50c80c473ff83904da28a03ba988cd6bcd6d65c07994a2399ee7314a90b9d427670f55ff96ee49b911bb19dc
 DIST connectagram-1.2.1-src.tar.bz2 1632426 SHA256 0a559243a8d970bb79c6791214be879269fc073b5eaec6aa55fb60be82f140bb SHA512 0266af5680e7f76d517f60934afc6115c1118832fef237803b1b3d8c0fb785e5c312d585b099f24f4c476f124ca9722868a159dc4d1a9a8a695e9cdfa4f9c1c6 WHIRLPOOL 3862fee2f4a87c6d7a78bbbaa64713b640df2c0020dfb542eb5655b77c687ca105380ac96c29dc18a324ad90f8942d503044b25971d64c7862925290eccafdca
-EBUILD connectagram-1.2.1.ebuild 1021 SHA256 4070a3c457a4c2c4f7f04043f72f217f929ff50df6f1911130a1d23ed67cabae SHA512 7f2a2a663b1f86a8b9f7f11d95545b4cae8d8d05547facc0f673e7b86383e81413934b1087a310b7d4c47b2733d2db0c7edb1135a450f3b2f92f20dcb11745e4 WHIRLPOOL a77db7d5a1cdcf63872594fee3829da34b5461a694e8d772201c312521943a65304e28f4fb173485bd13d794a431f67c83cb461dd4c7cde2ada429a2eb59e586
+EBUILD connectagram-1.2.1.ebuild 1023 SHA256 b1e132b58d0a8120c11b3f4a38a90186735da0c6b92a2eb03cb16909fcd17717 SHA512 1313ce1ee24855360c9315cce257dddc7c72489f2694dbca8f03e3a89dbace79880cd6954a38bc01c08f03d8f1b65f27cde7a999928e7534533800760f48a851 WHIRLPOOL bb825b7730b1f90591dc767b60ca26c577d0763317eeff39311cd452fa5312cb68b25e674bb7d729280615a43cb2a58d30a506234cbec7e86c244990c3c8d70e
 MISC ChangeLog 3037 SHA256 cd37c1b84359cba541a4d5322e73d1c8d060d14d6ee64d71713b9d112ee25271 SHA512 858f88f719555dfd7e0a6e6e9f9ec3a924106d0a9a91f31b025eeb438efec71bfcf2f65101291162082889e69c5114219d47bc5968b10f798a2061a43454f52b WHIRLPOOL 01790bf7193de2c7af2bd94f7b07c7f2595a1152508db3db125bf082f107c983d1902aed93fed580422d85b9b6d0d7ca0daa7fb290d04f03a01cc2b50d293a67
 MISC ChangeLog-2015 2416 SHA256 62f4fde034f3cbe7b3f2441f780ec2c6a20c380562e0dadc94466a2c23f7b9ed SHA512 9667cba5c5ce02959c8d269c2beb7a20d84069f38aeff2e0fd9379a9aa62940457ca35c1a15cb735b2798dd63049f259dfd229a9edcc92b92e3746170b2181cb WHIRLPOOL 2019a56e7338f579a123d8b8b522e28ddc078cdab69a6deb7e7715e563ce88198833c165d4474a359a9472ef5d6fe09c3d0d5c3bc5b4f97cb8cc83106a6e705e
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-puzzle/connectagram/connectagram-1.2.1.ebuild b/games-puzzle/connectagram/connectagram-1.2.1.ebuild
index b573fb649921..a3cf9d1c896b 100644
--- a/games-puzzle/connectagram/connectagram-1.2.1.ebuild
+++ b/games-puzzle/connectagram/connectagram-1.2.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://gottcode.org/${PN}/${P}-src.tar.bz2"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-qt/qtcore-5.2:5
diff --git a/games-puzzle/construo/Manifest b/games-puzzle/construo/Manifest
index 9f3755e758bd..c54b0e57a6f9 100644
--- a/games-puzzle/construo/Manifest
+++ b/games-puzzle/construo/Manifest
@@ -1,7 +1,7 @@
 AUX construo-0.2.2-gcc43.patch 1785 SHA256 9c3c660ed4cbf2c5acaacd6d63f48aa08eeac025fc31b41118aef8fd1e9f1c65 SHA512 25b226897804de23fa45f89a2b94bc86f69766916180f61d6c59e7a47c69b6b574fe649a9d6e37d8488600747210e06adde7a5fed26b4fea4663e32e46d13d42 WHIRLPOOL d4dcaafce4adda37fce9952128af9e707b2caefbb72669c93a7242618edf79dfb8218e7a3a371120053218dc411b409f3021439db3bfbf7eacea0f4d9a3b7cb5
 AUX construo-0.2.2-lGLU.patch 425 SHA256 5ba7f84ed62f373b5c607b49c88f3e5a8ac36fe74997bb834d4069107a6bac9d SHA512 a450d5dee7f71d649b2d7d853875576701311de7c6dee2f21217d07dce59f19226dabe3be99d85f74454a690ce409cf7450c8f1cbe942f7388cfde2be5a05208 WHIRLPOOL 97c0892eaa786dea0d22652fac90bb4f0588f2269d325bb8bdfe5972db355f9379af19f86c078afddecdde808cdbad2e200671b8cffd1ec70ec9cecf8813fddc
 DIST construo-0.2.2.tar.gz 442626 SHA256 93b1dc5c26aab42d886f102e501189982c28d390f8b573f8f4a42bad640ec630 SHA512 b73854a64aedcb9ddcd8f2c3e809f975ef3d2f63bdefd2e126c808a4154d7ff3d402457f9da5f866e6b9d74c6010ffc58d44b04277976fe1a9aeabc20ea786a9 WHIRLPOOL 1b2ac0f7fcdb186deff55d958786a854bf196547f37e46eb9fb0aeeda037096db022cd6e36b9378e661a965e06ce79546389e72edff0623ad8a497526d5bfc61
-EBUILD construo-0.2.2.ebuild 819 SHA256 1d104b2ddcab4971e66f3f64e4e6a0c2ed79a4961feb73a2d5b843e98cd79f6c SHA512 84c9242622d1ebf38614b36e454388b363acd7f050893b0a2803b0027a68e2ba01452f97e9eeab78e088d127677de67db4b44b3cffbb31a34884c93e9a53e9a3 WHIRLPOOL 26a46450e75db1bce3008cc589a89f612801846e80a2b6af8051a981d7214a890ca3d94c4dd52d50fab219aea2e0564f0e527ec0f45bb318d22271fe657ea70a
+EBUILD construo-0.2.2.ebuild 821 SHA256 819a7305c067b136f12cc01f217980483abcbe5f7845e77dd2f49d9d80a2f9e7 SHA512 70f125e1ce726ec0e78f304956d947dbed0931057871cf11d7e5337434063ab31c454946f3efb1f156098a76b4fc96ffcfbaa1a0e9d53cf4074ae373c030373a WHIRLPOOL 0264cf6a0a124572ce44e7fee4b596adebd4d83d36058a7454cdba2ce24acb5fdeb27637833a39c9c66fc8059e12957b27c66e715b5d35d04d531850fff1b6c7
 MISC ChangeLog 2641 SHA256 9cbce31ee5c89c9eaf8dfeb81a133a5fb9dc9b480cf490da96ddbcf6249a0e1d SHA512 ffeed6dcd18d6b8350e0aa34186b88937f1f4698145241516077d1a7c8d6c1615bbd1759ce39fd3e4d27159cc0d02fdc831971b1d530249d1de57d8b142e4811 WHIRLPOOL ca8e30d65228b754ed1c4b40ac5804682f4865bd7a9f9b6643be00fdd175d25ccab41b6b39162e231a8dd36ef6e664bb641f3f7d1140f4ff2acf6f33a9c528fe
 MISC ChangeLog-2015 1982 SHA256 0fc29bd5ed538749830e12e39b0fa52aed197e350929fa70b6f205ed16d84b86 SHA512 bee84002dc55cbdc8857ce3889c8b80483833f2071d883e43861b5d2d89adeaf52dfaf70dcdffc6df78fdbf02317eedeeea47f7a0f5473d11dd11763ef01c618 WHIRLPOOL 4956b54b3b4ce5e1d0c61992fc170a8ef1ab4814de7f61b1bb4e532d38be79aa9b59d3124188a6e2d6b05712d838a05086ee5f1b89eb8add5d3859ad34adb3e3
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-puzzle/construo/construo-0.2.2.ebuild b/games-puzzle/construo/construo-0.2.2.ebuild
index f5c416209446..d74b179844e6 100644
--- a/games-puzzle/construo/construo-0.2.2.ebuild
+++ b/games-puzzle/construo/construo-0.2.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://freesoftware.fsf.org/download/construo/construo.pkg/${PV}/${P}.t
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="virtual/opengl
diff --git a/games-puzzle/cutemaze/Manifest b/games-puzzle/cutemaze/Manifest
index 8e5fb55fda6b..e8bad3bb40f3 100644
--- a/games-puzzle/cutemaze/Manifest
+++ b/games-puzzle/cutemaze/Manifest
@@ -1,5 +1,5 @@
 DIST cutemaze-1.2.0-src.tar.bz2 800890 SHA256 d23a0d11a237f53d6b8da9234b5b475bbca8d67abbdd124cfa7c0cb4da70349b SHA512 1628f0be74730260fc31898bcc42bd55515046e9ac6a22bb90cdfa1d728f829920bbe6e2360f3daa418ab789efe36891c1c95e399d636ecc4411969bb09f0a89 WHIRLPOOL 9ac56a136859e3852736ab8e467f1468514c91d1958661464f6cbd3fee904b2640387b3e77b999605a786917a454c8ecf5ae51a27057c6d7356be9e1d0978b11
-EBUILD cutemaze-1.2.0.ebuild 693 SHA256 2648b482d519c626957a35490b1b439deba56da8fd70e996bbfdef8756e47655 SHA512 1ce594ee9c63d7d6cb9b7e67c10d409a8c855dad80efd9884020c5f04d8c328a69ce1bedaa3675b6c00b88aa9654bc2305d78e67826e1b4305ed061e4f0de0a7 WHIRLPOOL fb668d852b65a25218f44956585ee1c1c646e820d4d8cf67910d238d528f38c28eeeeb12399a4ceb8d80491b5e44d74c64b526091d2fc52c60f3aa86c196d6d4
+EBUILD cutemaze-1.2.0.ebuild 695 SHA256 369780e707c58a989493b664e09591ea6ffbdd07e36402f742165686e3ee9b85 SHA512 30b8eba77e91bfcc50adca8c4079ba15c501520a45ea2d6916bad0c201f3dde947054a9a287f280c69666c491e2a78910609acfbc4fedf3f2e130059131805c8 WHIRLPOOL cb6a316191e6650f401cee77f9f754f00a7bc98fad39929fa9d91eaa88bbcd81b14ed7deed602548fddaf196cd166bd63afce664a0d19b11c9870c128d36f5c5
 MISC ChangeLog 2597 SHA256 342a238052a3471e9c5b9c1e819c612321f4e688787b137ee52e8d8d02bf671e SHA512 0d6fbd4906ec57461b20bf63f5cd8383cffda8fa865abc731bc29c477f65092c10f0bc564a40ec85673852ea4af9da1346b743a49afc123a1abba57c7ffafc62 WHIRLPOOL 9033c84b11f8f4fdadc0e7f96ebeaf6b059800044a8a84f01af8c3c35b5637f05b5230b02bf75c340b203e685a8aa60f19b7ea3a0e42c1c4f64ea0189d2be559
 MISC ChangeLog-2015 1180 SHA256 af99388d63d953db0aa98892e2894255f40d043f83844af9bfb7f40f2dff779c SHA512 aacd1f8511f6150ace8e8e8d2a35ded7c377082a061478b9531a0c1d135ed9dcf97f6e1623e61946fcf079017627f4845d96ee7f9ca8c02ac2f7a49a6c877ae7 WHIRLPOOL 43691d1c32a159d765948cc94be59fe93aec61fbe35e7ac25eb3955d6f9fd7ae82ec33b0b4dfbec3e74858be016093e3d9c1ee7b91e1baf7b5cfc1e2dc842ba6
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-puzzle/cutemaze/cutemaze-1.2.0.ebuild b/games-puzzle/cutemaze/cutemaze-1.2.0.ebuild
index 67b7329e92c7..668129d73bab 100644
--- a/games-puzzle/cutemaze/cutemaze-1.2.0.ebuild
+++ b/games-puzzle/cutemaze/cutemaze-1.2.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://gottcode.org/${PN}/${P}-src.tar.bz2"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/games-puzzle/cuyo/Manifest b/games-puzzle/cuyo/Manifest
index d15c145a7cff..5de3b85d8d56 100644
--- a/games-puzzle/cuyo/Manifest
+++ b/games-puzzle/cuyo/Manifest
@@ -2,7 +2,7 @@ AUX cuyo-2.1.1-gcc44.patch 161 SHA256 3a21073002a39d615bf25cb6e3db942a8a20461c5c
 AUX cuyo-2.1.1-gcc6.patch 1024 SHA256 d82b5573c0f5a31fe7e3ed18a5272972ff99cec90e493a86aa5d3feb345af8cf SHA512 ae8733da8afceee4e54ac8cac5a11d20a1adce494d76cdfaa821ffeba64886d9b0c9680fdab013c67e641bac9c96ba3dc23d1ecb86d1b59ca3f354692d218d2c WHIRLPOOL ac51c83a9569edf63875c011a38c7d91c8e53590891119cf1e284028bf2cc5e637de10cbe3ffd886dd765f8920e72d895abe04c4dfab0b288cebe15544c45631
 AUX cuyo-2.1.1-gentoo.patch 851 SHA256 45d50bf95e8cdec4d18c91b359c3796f55c667acb4a7e32062721d1fbcd369d9 SHA512 c96c855c4650f50d6ed1c38d7105047f386c1828592389ce482cecefeb46bae224ee46f6f07dc63bbed67d81e4beadd5868962ad52dcca8fd9f99f3ea0899f8a WHIRLPOOL 9bdc53e27d453a62171dae2440614bca0068877e83c8ba6c852b4d546cae5871d25398be003193165ed9a16b278b37b7666fdc86146ff3a210f8cfa2c1d61bb1
 DIST cuyo-2.~-1.1.tar.gz 3005426 SHA256 7157aa70ae731c17e765fba11736866f2020826ad6187d8df6c55039d4481de6 SHA512 a29c6ffc7e63b74dd93e8aeeace78bdbc50398771922aaf06a43256c883f9eff23e10fa91e4964b716cd209551cef771cf00108fb7977ce13a463da542322787 WHIRLPOOL ef2817feecbe9c785e8d6438aca123247857c8f9845421a5aef89375b0f9c15a050d0e6f16791cab408f8e87a9640ef0cbc77c9cc89f03c5e788d3851b07af2d
-EBUILD cuyo-2.1.1.ebuild 1020 SHA256 2cb82ef349f0fbe9f311cce488f50c57057b13b02bc7679b504dbdd66452f63c SHA512 7355f8a2d02fc623cf98ed6d9715d0d2cec8d0ec65cd4032025797a322bd47b4c5214d7dc60a8418724cff34d79cfefaf613e8e4ce9c9b299154d52246dee357 WHIRLPOOL 326eba4f308068704ac03950ea8410ea7bb3df29420bfd8aac0515e1c4f1cddd10dce6e2c0f2ddb7abbd24cf8375e4087e14f603ddaa9c4286cda26106f63b8a
+EBUILD cuyo-2.1.1.ebuild 1022 SHA256 061c654d279e15ce8c63c4b21cfc978d578b2e6069c92d59ec239aded9b33acb SHA512 86e60646a246caf007efd78d56ca2d3b7c294d35cb5868a138138bac14e32be0c83f8197465f740153fc33fbf2bc3bd69b02cdbc05803025a51ab3cff7014026 WHIRLPOOL bf9b52fcbc4f93ad7d02e07a775fd2d4bbb1085936e71977e934173a8462d3a250be8de3a70d57168019748fc092efb6a030df76e8c30a03c24fe59a0bf36fac
 MISC ChangeLog 2590 SHA256 21db33e2010da0f8a8bf7243f22ab755fe1d2c13777c9d50ec00a3ea2cc75097 SHA512 f0ae31c0d60d04489c57922a9e0bdbc403eefc6d65d03b898fc53077b8475db6be3abf1dd7650cfc250a4470f9fe6aad8b941ed7135756d599f3bc154e6455de WHIRLPOOL 40c55c2150ad40f2d32adc64865a27b86847bec0d5a25499d7ab19f7bd07dc5f2cc16e566f82a1e6f5747d5d7d358e5398fc833cfc307c2e5639eaa22dd832a4
 MISC ChangeLog-2015 4290 SHA256 99cd3692bc98f9e733b5ed98bb560934f39ac8bf62d43e33adfeb04172120512 SHA512 0ba86da5a8df6a3c76e8ff8308938d6bc51c5f9d5a484148e41532a06fd1987eb4700a0844d386cbcd7c532275de20cc110a84084409d81552d51b8315184abc WHIRLPOOL 7428314a4a47578d30ef2bd178d88823a3d7af8ad737093a1fc8dc0d0d818082fe6a6c8c45d1065ff9a045d8040d836ec5f76f2d2653b1efe58fd29a604a7b3a
 MISC metadata.xml 324 SHA256 91faf30ccb6aa1bf17c8a7ea4e5a3da60ce16063decf75c4fe09ce1798414e3a SHA512 3392ab16d9e90d0dd6dba06994ba2096940075961de7e6fed43d70946e82916af7b40e95bd27e25d5eba9d9eb46afe61fe4200147385cc93211ab14c0e6b13ce WHIRLPOOL d2049847162d169be79625b96f16b0c5c194bb4b887c7978f0ff2db5ded8c06b1d3b75e3d313ae3e28ddc183c409325ff5e7632fa8be555eeda6a44db4c2a995
diff --git a/games-puzzle/cuyo/cuyo-2.1.1.ebuild b/games-puzzle/cuyo/cuyo-2.1.1.ebuild
index 8acab44bef37..3469a41670fb 100644
--- a/games-puzzle/cuyo/cuyo-2.1.1.ebuild
+++ b/games-puzzle/cuyo/cuyo-2.1.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://savannah.nongnu.org/download/cuyo/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="+music"
 
 DEPEND="sys-libs/zlib
diff --git a/games-puzzle/einstein/Manifest b/games-puzzle/einstein/Manifest
index ab56ff35582d..85498eea38b5 100644
--- a/games-puzzle/einstein/Manifest
+++ b/games-puzzle/einstein/Manifest
@@ -3,7 +3,7 @@ AUX einstein-2.0-as-needed.patch 310 SHA256 fcaa3b3f47425fb7c4342043a1b572d91426
 AUX einstein-2.0-gcc43.patch 391 SHA256 9c648dfd740cbdcf855cf4df978934a65feb192eb67ca4d6692999104f4d9c59 SHA512 40900fc551f794b58bd3458a5289c2adfbf439a6bfcb477ce777531545e69056747e856dbe24a181c7748e583fadab14ab622e5d044a0836115dd9ee15a40e98 WHIRLPOOL fdfc124b2ed6b09664a5ed26d3f24a6a374867009f2dc4beac8b4f7ece3db12ff82f4f665753cb0546a2ba9bf58101c070fc4dc3aca2a34dace2cec56569f666
 DIST einstein-2.0-src.tar.gz 722301 SHA256 0f2d1c7d46d36f27a856b98cd4bbb95813970c8e803444772be7bd9bec45a548 SHA512 45599546f2f7fce32f7441cfdae88b72297f4a506d9eb98a64c3b24ec2e2fd86a63d59961a21e017df6a7a676d864ad12598d735f9049adf43cddd91d661f619 WHIRLPOOL aa0327d50a87a3e73e5812585cc6fd505eebda91eedbe43b83210a9e574c20be90c026a1d660d634a8a617b650c43a61e7df91c606780e5e5d7a6b2a1765ece1
 DIST einstein.png 932 SHA256 87416ad30823294a55be626adf3bbf3d32f98cf7c8d7e9e65470d78ed37a66a5 SHA512 9e19d351e915509a11d7275ef0ea7e246d0d334933ec4b48ea0f56aa552ac69041a5c2a64075b02ec3601b1c2b8307cef314c9427ab7615b16e689faaa074283 WHIRLPOOL 6a83e7e0de616f843a67a828a2b9fdeb47bfb134f5759dc2b04605b4eb89bba18183a3be2f5e92075c88fedb875f80e948dcc906572ba8c3513ff0455501f098
-EBUILD einstein-2.0.ebuild 1033 SHA256 634a0c64c860d2e0baaacabfbf424223b72b745c632b9933ce319d762f64f14d SHA512 cb9bb2c0af7e2d8ce75c62f4621a3bddf4c441327216d05fd844ed4978c696476ae6933ba41b09aa5826e4e67cc096c0033096f23c6c9e10034f00aa7d8f4f1e WHIRLPOOL f6a01de0ecf3ba42935104431341b0fdf374011d554edbad1395ade8c97c845d5b65fff4a37912988b552f3cfef27fbf4e677430114e8a155253929f1267e0d2
+EBUILD einstein-2.0.ebuild 1035 SHA256 1058ebff001405be1c616dd76ce7f18ded9d2ecce77b4ca2526160b6d8bdf52c SHA512 d8ee94e45def134377571f16a55aa4cac09b4ad4f9fd72cbf9892817d62f8700f911371c7b87d471d35594e9a4f7af7110df3dcdfdcaa3c15cb30d4f9485fdac WHIRLPOOL 79168d5343f38098fb772b0e78c99b6534604bcfd120b96f2b57d0d5ffa77244ba03a3023f91114bfcafb555f3e5a0496ffc2d9a8c209724a35fcb1dd6672c77
 MISC ChangeLog 2535 SHA256 18ba83e9359f88afecc92d1733fdea4cd5667b3effa8a91d667b35550b229b64 SHA512 f24caef9a87012afafee1050b900b27822471518217246b0645bc2f3a5c7eaeeba4f3c4856ba96332affb1766c72850cf4186a50d7b261115a57f39e41b0cb88 WHIRLPOOL b85f1db603658a8a51032ea1ed7bee2ca5847a16f7236e18e8efd8089a7f86af7eb58d7edc3b221ec381e44e30830198b9073f6227a7f1bbf6b81245707cc0bb
 MISC ChangeLog-2015 1978 SHA256 8778052c248527d1ec418011da678e05124f1969bd02a4176206f3115b0005b3 SHA512 ceef27c381c7d8e395698cae62c3f9c0f45aad45c9baa97f811b27c2ebc1f8cfbe8702aca6bc8cdb0b69cd85b6ee81941e936f87e969294206d2a54cdbb763e5 WHIRLPOOL 31b88b212c6c4604682b8ac784677391003ea399bce98437bf7c44b124d0c5e64924359fb19d3bcc2fa35b9adaf15a7a5023ff1c0bb7658a33a1ee2e0676595f
 MISC metadata.xml 334 SHA256 8882951d9dcd15084ee03dcad1fdc2a2f713852b76d0c641c058895751b6a65f SHA512 defe221da415005e05b0b8d58edd84050a565b3249bfd0eae9875f92a67ee0faf320f86cd2b6f703add270f86edfc187e8597fb659b4499e092825b82cd91f64 WHIRLPOOL c4e31db62dae69b83a826a1ff14df949b64d41e7efcc9ddf0136bbde1fc7df3337282b9926e2effdae1a570240ee374274ad282031b9588499621be1faeb25a0
diff --git a/games-puzzle/einstein/einstein-2.0.ebuild b/games-puzzle/einstein/einstein-2.0.ebuild
index 62c0a767bab7..a689cf7dc9f5 100644
--- a/games-puzzle/einstein/einstein-2.0.ebuild
+++ b/games-puzzle/einstein/einstein-2.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}-src.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="media-libs/libsdl[sound,video]
diff --git a/games-puzzle/enigma/Manifest b/games-puzzle/enigma/Manifest
index c4a37168601e..7facef189077 100644
--- a/games-puzzle/enigma/Manifest
+++ b/games-puzzle/enigma/Manifest
@@ -1,7 +1,7 @@
 AUX enigma-1.21-build.patch 3543 SHA256 adf8008b557e08d37cb5dc898284f1c2ea714fe87d0644bf9cbe43841cde7a79 SHA512 accfb31abaadbee476961f38cc2f76a1fceac4befbf4721d4e08061a3509d05f2e534b4f8f69f1765e082a4ed4f70ccbba0c73c4479a49ee1cfde4c1ae1cdcc4 WHIRLPOOL 787501c1e36ed53026dff7d4eafc4d805e3d649681f80e224c99cc8ed304b8caa6b8dc6896f0eb313f5b569ed35a35dde09fb63a98c5e58c9e608dfc95451032
 AUX enigma-1.21-gcc6.patch 927 SHA256 c2cd9035630ff3deab2880a4f4da0417acf5f7fba6190663658d7aad5c2834c7 SHA512 d0eb1f356370431e3b3b96c7fa3a56ca52ed15fa94286d1b5075ba8a4b4b349deb676479bd8e045a7463f65a3885c44aab90166549850e19c510d606aed2e746 WHIRLPOOL 47a27ed65bb67441b0a4cab48292611d904d64db4394fa7d4dbed823f5b4b0c6ea5f0681136e0da933a71fa7dceca855f3b9785bbc4ffebc40ec716462d54332
 DIST enigma-1.21.tar.gz 56409951 SHA256 d872cf067d8eb560d3bb1cb17245814bc56ac3953ae1f12e2229c8eb6f82ce01 SHA512 0cca56a193f0f416e0fde02caf2e30b61eef506b6c62e151ff575f5c130f1e2e778d77149007b114ebaeec3a3e793434328555cb5190954a0ae13ed6cee229f0 WHIRLPOOL 9583eaacd75c7a3cf5af172d1209771b599e6f8b0fed2b7ea6b0a76ccc2743615d47ac3199f56dd1e39203afc09a43d9aa5d8d879e38502b47d4b77274217b87
-EBUILD enigma-1.21-r2.ebuild 1574 SHA256 fb9fa956c80b2193a81646cbf3f74e1f175a7c4f0d93a2c1c54e8d03a782f01e SHA512 f9f3511bc0c5ba153cd7acb1f2c377593ae0ff226a51596cd1524ed7f929c79db7ecd0e10fae0284ef7d30276aa8d1ef4a5d369e253af89dc492a40d1d36bfbf WHIRLPOOL 201c149772ebc1c1ce96e2b227e7fe3854ad0e729c4b9e0e0ec7468da87d55b6f9e83b771d586e52ee702a2f01378782a27619102e71850efc6557b367605ed9
+EBUILD enigma-1.21-r2.ebuild 1576 SHA256 fb350f2142c585ac2f1df1305ce593b0c2058ab75cd8828db8c3f86bd1e81b56 SHA512 94bb0f9654e601b7357fb994fe36f8c066b98fe95ca00bdf8b3fc39e2ba9f49e8143611ea95bbf93fdd650c7909c3845cc219162997b791e8eef0cbdf2792679 WHIRLPOOL 266445ae4181648847aa58f0aab65e51095a04a18549d6b4a59e2b94015336032d0ba3651ddf6959fc774aa563398492ed076b5a08e195c4857c17c591e78746
 MISC ChangeLog 3633 SHA256 4dcd978ecbac1f541a0f04b60ab92d6ee8aaac4aa998ecade0c46adbed6be914 SHA512 486e91fdff9771ce579059fe468373ebb718c1f1e55375bcee0a0d59ce7364804af6f9c4a59fcdb3f3c8e879fa3cee68948dfc6b434a669a0e1174063ecd5854 WHIRLPOOL 79bb0a69ef79ff9e6b356ed90979640ac1bb7bcd28c88cfdcf117727ddbbb64ed67696d8033a61148727fabbe955456dc544a6570fe16eb01f725a9ef2911bbe
 MISC ChangeLog-2015 9534 SHA256 4c13145d776aed3c7e02154ac308b2ba2c60046bdea119d09712832223ba94a0 SHA512 b7004988b8d7078d41f5c73c06b4f05897c2fb95dd4554246b7055d2de55a1433ad6ba4ca7cfd049255b791392f7fb8ad55f68ba07f37db46eb7ea4d5471e33a WHIRLPOOL e82d7c5be79228310917c44e694fbf1abcc6a1c9ee3ea09386c19e304af4af70ade29ac29e0ce15ab77e563e0f4f187147635dc255fcb752e4e726c3f2fc3b92
 MISC metadata.xml 334 SHA256 05d32a23437f8d95de3119c2a6fb88c1f47f6cb4d3250894675a3546cc9c4e52 SHA512 885fc4263252767f8861f2d45dc11a319cb5b0a7a9eccdf073a0433ba4908d97f7a590a96ae542372e53f16780a41cee4ee80556c0cedffbf34f6e4bcadeacc6 WHIRLPOOL 633153ac122624f8251884971bd1b633a84331d49fc3e94138944fa493f8026068666a7843d1dc3bc58f894d3afc57ce0addc6181f64db4c65f7e64a5f4a5ec9
diff --git a/games-puzzle/enigma/enigma-1.21-r2.ebuild b/games-puzzle/enigma/enigma-1.21-r2.ebuild
index af0c5543f041..c9b2e6c38ed0 100644
--- a/games-puzzle/enigma/enigma-1.21-r2.ebuild
+++ b/games-puzzle/enigma/enigma-1.21-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/enigma-game/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="nls"
 
 COMMON_DEPS="media-libs/sdl-ttf
diff --git a/games-puzzle/ensemblist/Manifest b/games-puzzle/ensemblist/Manifest
index 2198646cd696..6682bd9da3fc 100644
--- a/games-puzzle/ensemblist/Manifest
+++ b/games-puzzle/ensemblist/Manifest
@@ -1,6 +1,6 @@
 AUX ensemblist-040126-build.patch 1610 SHA256 47f29cc749d3240fdee845391bba58e4fecb6025499594cd1da08999cd3758ac SHA512 19e9e9625786d43053a72ba633aaa08d18b7a91fe5995cb583b6830605f0ec2b37b8c002d7853db520fc7ccfc4bbe8699184d2ac69f62be51d4801b438ea6ce5 WHIRLPOOL cc690f57cf4ca7ce69743867a46f0a732094d0db5aba6d573806e7210a354ff5641ab2955377cc8113be714d4d1b9cc778cedeefd58fc90aa7e9c3c17ae9cb31
 DIST ensemblist-040126.tar.gz 1312095 SHA256 6cfd48b3f62a0853a08609a85841bea400a9fe0eb9d3b8bdf0f62dd5a8aa36be SHA512 59202fe3c6168cfd60a7204f64dba5ab9fec2aa80e32be2f649862cf60dd27df0a51f4359161f8ca1ab3cf541fb1ea127f4f83b2213c4cb40bf6a574c14c8052 WHIRLPOOL 8d1d55658d87da267ee054a9aca1aa7520ecd882d89856347dfb6843d7130ba8ff31e0881567696fa425415e2020ae5f832789410f490e79a12dec78a5f06e27
-EBUILD ensemblist-040126.ebuild 858 SHA256 076ec31d846b6e9d672f414f93dcad0901d43f0e8f5235b217a1e8b662ddb03a SHA512 3b8812fec8510019b5ea0657ef4361ed64acf541284517e67d02fc50ef99fbadd3f7337c61c5ff923c29d4f36a040db25989bf89f62d7cc8125d6e0ea18251ba WHIRLPOOL a20a5886f8f55befa4146a0050132e045b7daa306e4dbd755bdf3a7ed907dd7ed5c72406510afa43d776fa2b2c8e23f9d5687f954da847a001553ecc17dc376e
+EBUILD ensemblist-040126.ebuild 859 SHA256 1b94e7b093f1156b4850ffde6ba009f4adf8afc5c4e0d49e611ef1650958ca95 SHA512 18e85ad3e9adb8b8793b83c30dfb791cc3a5c2e135bafb0183e9205195a662c62f81f28f991ecd36d66f55a15ad6770306be931163739279470e9def0886440d WHIRLPOOL c9f14633b46bf27e5aa1974c206d1beb166b2b31b42167810d88440f72f46d6095e54efc4cc7fe98c3d33be4bffea65d84f6acf65248ce1cef3460b006a7a19c
 MISC ChangeLog 2725 SHA256 52b85044f9a9d7df5f2b0429a296222d1e76a5248864f5ec95a2fd602e12988b SHA512 20acec4aae371f0e2d95a2d3cea9ab5cf87a517f8323c86e110740d0865b8f2c7821777506b3ac4a6f1ed2b1f70dd3c3ac8355f9f52be4aeab7f5becaf13b50c WHIRLPOOL bf946d4c9c5ae60cf6953d912b093f3e7636636ca9dc97594633b5f2e79fe1a8b4bac491ec2cbba1cb22ebda9c2da09a03d2ebe7d95ce47d54e1cd6f2bdcd960
 MISC ChangeLog-2015 1924 SHA256 b687a8636e53e89a272840d9304517288119083f8d681de4d9bffce56659e892 SHA512 b229413b0aaaa5af95752a55b46856c7984210a5e4f55ffdcd09f6ce9f71c073ce9eebe3a5479bda02d2e5343d9988ba94329f31e0ddfbd52ff59b2ba597cddd WHIRLPOOL d505fc127eef9b4e2889e7b2912649e67f5b468b9e4edc908b980a3862c20fb485d47b69e5538f19088b1e47b69a60feeb2cf1459f9ee861ba3433cab846abc7
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-puzzle/ensemblist/ensemblist-040126.ebuild b/games-puzzle/ensemblist/ensemblist-040126.ebuild
index 02d3e0595c1f..559fa92b6034 100644
--- a/games-puzzle/ensemblist/ensemblist-040126.ebuild
+++ b/games-puzzle/ensemblist/ensemblist-040126.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://savannah.nongnu.org/download/ensemblist/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="~x86"
 IUSE=""
 
 DEPEND="media-libs/freeglut
diff --git a/games-puzzle/fbg/Manifest b/games-puzzle/fbg/Manifest
index 66c86b26489b..610eb17ad50d 100644
--- a/games-puzzle/fbg/Manifest
+++ b/games-puzzle/fbg/Manifest
@@ -1,5 +1,5 @@
 DIST fbg-0.9.tar.gz 1127384 SHA256 189b86f00345fb6cbfdf0c8d55c495960d373b653972fad5fad2f47ba46274e5 SHA512 8aede56515da472509068037bd295d7a37f365dd54ea8332c02409e84bf685b76f1733b93b90fa49ca58e9094a4506137c6459d4761a929cfa2e60bb0907a353 WHIRLPOOL 4df0aa39485f5533407f8b2388cce42081acb5b75f00b6b4e5fc49a0e84ff35abcec705d566cf99ac5c083f6453f65d5dee2e1f1b05680cc00acc0b068628b99
-EBUILD fbg-0.9-r1.ebuild 820 SHA256 ebbe3f9869864b3a83aed6b5e2bd996f94034b24862ba44a289a3fa236c2529b SHA512 0a0a06fc6c70ab721d55aacd7273600362404a182122a4c6982795ce308aea14f9caa4dadc10c5aabda1169830d89ded32058d339d15618f1f81f3d76a59ddf5 WHIRLPOOL 4899e8b728d1e3034f1f08c0f0b3db0d9db74024940c9dbe5fb50e6ef159636451d398eb29888f147ee796115eeae65cf4985b73a3b3575b6ee878e35de217ce
+EBUILD fbg-0.9-r1.ebuild 822 SHA256 5b0a81cc47277b7d13d4eb3eb8b317129d355e25551387c2cff5082b8570ae9e SHA512 9808c33e1e774510299f5da527473be44898aabe696fdb1c6f78e204eace6dfdd6aecc149c9af846fdcdb189ef821b596c37e2bd0de5f8ae07a0fb930f081c5d WHIRLPOOL 58702634266bd309c9d598232b2dc00fbc9eb44959fd8b6ffacc19ebac48654df78f8107695e20397b2c8b039310ab39d3e6b17c4155ba9d5a87bde2b0ec1572
 MISC ChangeLog 2565 SHA256 da7bac4941182a470d366b0ca4c34ee76bd74e42b674753bca6ca011df36b629 SHA512 ba1e206cf25d2b678befb917ff97c5987012fef1fad2e6b3b3ba3328e1c6f3aabdf79947d699c7aadb099e596c64a5aefaf7d025149012178a0ad51f3d11d9ba WHIRLPOOL e4d9753e108c109294bd221973047217f814020b0799f601a7208cbb12b7850a8848c73ef9a30ea367084f48570ce9ed72de709e664e455820b4811cda5e0a74
 MISC ChangeLog-2015 1095 SHA256 aafa898d64786e0c18a21009cbd2dba621dbb2e88f0705f12ac520388a8dc50b SHA512 759a0ae267d7dfcc12ec5c14c1df4f60b90a23f458c1cbb61ab40c741a0f06f9bdbe1aa8ff536780b856097a5d22cfec0d7d54b8f3b68a3dacb7b488c37de690 WHIRLPOOL f87cfc2816e99859e26218621f3ceb224bd40feb54039322c82af8af8c8bad9e95bea594b3fc6bf59d0c17cfb35cda40ac1b0118ab19e473cd8c3a0589257542
 MISC metadata.xml 326 SHA256 d127f0b43fbdc0ed033458e669067fdbcbb21fcba523e10f97329117f62f128f SHA512 530accf52134a0d9947a35e2499225d8557410008a5df1b8bb2189eabe7c8cda7787a5ce05ec4efe5af67a9a2e1aae30008c18bf97f2c46a9608d3625bdc5ea2 WHIRLPOOL a9729ff7ce193610f3fdf76f2cd8f0c786a9fe11f89645f63db6443b8c2dc5650019d20852a0441ea3b6b5898d3254d15da87635050597b15053c01e7cf3d1ad
diff --git a/games-puzzle/fbg/fbg-0.9-r1.ebuild b/games-puzzle/fbg/fbg-0.9-r1.ebuild
index 6e6611bb6d6a..e516d714b0d6 100644
--- a/games-puzzle/fbg/fbg-0.9-r1.ebuild
+++ b/games-puzzle/fbg/fbg-0.9-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/fbg/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="virtual/opengl
diff --git a/games-puzzle/fish-fillets/Manifest b/games-puzzle/fish-fillets/Manifest
index 2526a4130c85..0f73cb65a1a8 100644
--- a/games-puzzle/fish-fillets/Manifest
+++ b/games-puzzle/fish-fillets/Manifest
@@ -1,6 +1,6 @@
 DIST fillets-ng-1.0.1.tar.gz 380290 SHA256 329a4d9515d60bebdb657d070824933b993b85864b9d3e302e6361accab992da SHA512 fe4a5186f94e953cbc85fe8b0ce804c881c96feda385cfc36e1840e448cf094c3d815fdbe32976a6697a855038951f97a384c277a1c52a048520e8da71136718 WHIRLPOOL ca70ee8e420ebb85f87ba4033eaf0738d9c29f87b347def51f5b53898b05eabdff0593f181e0a6cb7fc5e95159d8d69d040272d2c66c0be2ee1b5cab470a32a1
 DIST fillets-ng-data-1.0.0.tar.gz 146418413 SHA256 ad475a60cc96e8f5f55a7b264c390264898f1891b6ff096cc617e24d75dffd45 SHA512 61c7fe3980510a7dbd85f4c246e7e42a0f79d8e2aacd96a0c7a14189c5dee92292efb030ac92299474162995039073288283fee0f352cf08be6975a2c86703e7 WHIRLPOOL d80bbb54a465f40fb045930d767ac61e4cc5100fcd15b2fa3a4bd358b181c587bdc740851064bbd95140a4dd4f222ab9f1b4964ef089a41a523d9da1de5b25fd
-EBUILD fish-fillets-1.0.1.ebuild 1265 SHA256 e6d44611ebec18d1b50cdfb92130d517c72a6ba369d9b0f8e10f1378579dca1c SHA512 877ed543a7da2060b20bc1f1b6e1755d09d94754a62e12f73841dfb2eb09d68796c4c2d9247e87f016ff27046d542e222980b90010798a6978868d2147b70bca WHIRLPOOL a45b63b294092d600c9228b894308220d7ec19ff155014ab25e431ee59d155093caaeeaa414646844f397b01675623a20088a676fa488111b8275cee731aec96
+EBUILD fish-fillets-1.0.1.ebuild 1267 SHA256 e70ef9b935087b9e2e5593164bbd39f93d92b21b5179401994414b81a1ee697a SHA512 b6b97f23b9d5ecdc5b3d9ccc8b26513727977657874364bb77bdb49866416c1794c67b1bec4c360bd38c59cb861fd8925ee0e8e1aceb7a9a2f269e36cdf20556 WHIRLPOOL bc77d0c117b818945a521173c5d41347c8fe2dcd138938f6747d7282f770e26a55101958a56563998f3fb79d883ee31e3479b3f663294db26558d665d64b0d41
 MISC ChangeLog 2598 SHA256 f6aeb138077c32fd353053bf61e6a916e35568b67b52b2212e99ff3d3d64d028 SHA512 18afdd11f17c60a939c9697b0426ed04d912f1657c4585bd698739a5726e9a8474323aac4d8f83ac06d64646b46c29f9ca90f325d8ee0862f8ea12bbd67748c3 WHIRLPOOL 9705064120807dcf36bf4d5783d959e245ce6fab26a12762417deb4c357ef97d3f5827d3e179bb8a26583e0d058abed3bc6650729a3354ad6659db4149cf54f8
 MISC ChangeLog-2015 8403 SHA256 f98c9527a6fe3014e91358ff741d6e7f64971764be46d4d78928f87fd1cfef5a SHA512 40f6ac310293a85ab229ba738844b4560b82833e53667f67a7e16dcd9acd6a8e1cf0ae44d4e5405717a30cdc2d0a8238d5691ce9a63e15012712fe4279cd18ce WHIRLPOOL f11b93f3b9ed2b1ddbf1ad46989d14c1d067df34ee42ecbe61284ccefc629aafa19421f30d939d4fbcb05ba99be5afe242d2724252b622d170b5dc9c36c8311e
 MISC metadata.xml 330 SHA256 4978a38a4ec8b9e611557bdae7101012a8a0a04f831afdfe758e98c8008766de SHA512 dbe794bba7ca2d4414f5ea3b4ef5b8958268abf2f8bd45705300baddcca5cbb485ddc24b3328e25568b9aa741c50251417ee4100f3f118827fcc5c1a285dba66 WHIRLPOOL a26c96a58e20cdd84c605774adb3a9b22c4ff0830b96c926e37f45ccfad51b4d45f34793460e8b599e6abdf3a3cff2d264ad68e4bf6e43e7aa5ee4014e0dc037
diff --git a/games-puzzle/fish-fillets/fish-fillets-1.0.1.ebuild b/games-puzzle/fish-fillets/fish-fillets-1.0.1.ebuild
index a196f095993c..fec0213902dd 100644
--- a/games-puzzle/fish-fillets/fish-fillets-1.0.1.ebuild
+++ b/games-puzzle/fish-fillets/fish-fillets-1.0.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/fillets/fillets-ng-${PV}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=media-libs/libsdl-1.2[sound,video]
diff --git a/games-puzzle/flobopuyo/Manifest b/games-puzzle/flobopuyo/Manifest
index 0d87f30146ef..fe6ad8fede74 100644
--- a/games-puzzle/flobopuyo/Manifest
+++ b/games-puzzle/flobopuyo/Manifest
@@ -3,7 +3,7 @@ AUX flobopuyo-0.20-gcc41.patch 447 SHA256 a3cbc69a50dcdbe810353afbba1eaab3dc4434
 AUX flobopuyo-0.20-libs.patch 4683 SHA256 f8d09ce0a31e801cd52454bc4d7f78efd14a2d9caa327d8d2d74e77c01090e44 SHA512 5d68b1be731762057435e0a2201aa68ea1050b9260b54d80a0e0e43abc2a3571e8fe39029f018bdec951feabcd96e53cd577628104f6b552d46635dfb5c8cc2b WHIRLPOOL c50f5f4be2302a605028c14549fae895f74064ae5f6e9dc370c1cb5009dd8f177f0b65145694af01beece8365a0862658ad38fb3ff532f1600cda661c9049e01
 DIST flobopuyo-0.20.tgz 2949750 SHA256 be4c32e7fbeaae44278a920b7482fd8805dc142abd4384ee0c080c11d12fad31 SHA512 8ec7e690e53cfc171959663ef07912f2b23ae1842b72faa0125de8d6d2ad93672b9b4d68593b1f49f97c53a13409aca7bc5a598858fc7cff4698a4064ec95276 WHIRLPOOL 073c2a72ad2a8ad91d1be75431d8cb0d374fc31cc22ecc2a310e63a71218244be74c39b9eb9d1a4f997062080757e79ab17cc0b59a087306d28245a83592edce
 DIST flobopuyo.png 25038 SHA256 d0ed25d8396e58be484d68e00c4c3828aa26f01566089c8a3b53772dff00f2b3 SHA512 6eca6fd1559d8ecb62b19be9fcaef2af1edb727154dd4e10f9f0f9ef9863d99c9445689bd64724cb5da0b251384efc491acfa40bf5105fa9bdcecad3f809ceb6 WHIRLPOOL 8e81689a9890b1a44c106e1f137ae880c65c709e02f26e6503bf9dff8c2b87a1fca328b80842b9b6bbce1d08d7bc1ddf361e8523ed7265c93468bfede4982316
-EBUILD flobopuyo-0.20-r1.ebuild 1126 SHA256 5a89ff788fdde7ec7e656d859dbfdcf74a12e7080daa320ada718888013c47e1 SHA512 e0c364962a962b38bd3e8d042dcc605228398c0f4d73ba75af4c1ecb576614b0ad4c51b3ac26bdaa384301289215556f24bd3be64dadf240aba99765453175b6 WHIRLPOOL 32b2b44c7ce98b9b91fbf3b690f322e18e4c9129c6138c517e18e11f11d42671924f06fc57643b81d468c6dff92755ef230cab7ed267ab844400868add484906
+EBUILD flobopuyo-0.20-r1.ebuild 1128 SHA256 cf180c36b45db3dc1bf5c4fc344b526e28cffaf3ec5fd2549b8fbc01d69288bc SHA512 668e70b009c44aea27dd88575e9e1af2d9bc79ea30b4105e31bf4dec3679037312eb222fe786b07694792939f634e2efc82bc36d853050da664cc0f8adf66a1e WHIRLPOOL 9f36666eda3510da71d2ad8ee531b2b6bc3b5f77b74a60ebec2543bf772c686826882a5468d012dcc68dd98b4f25bcfba7476926b06416374eb0ef885f05cdca
 MISC ChangeLog 2546 SHA256 78fde3618676897b353f2e2c0301acca9ff6c5eedc2aacfc0c293c9c609a8385 SHA512 5eff75f4cc820dcbf94880d5f9c9aa965131931350dd101a2f8906068d1f78747794f5b712b9969cfcc1f60f766d888c7cbf127a0853c3ddcc91ee38accc541c WHIRLPOOL 56d98c24e875a2f26a959cc2b7837434311be7e393350721b93b3532ebf8048c767288f26f921f8ae41f2a7e2d018e28615e0f416bb6802e27163e857e5dab14
 MISC ChangeLog-2015 2820 SHA256 4542deaa03d5a4e4e32cb2ade09b2a8cc4471b7bfb7cc9d65deb52391a86177b SHA512 c3f65f059d65d36fcc4334cc30efa3a66d2551456c2009292998da1da26cd4b1282b82c26e6fc6e2c0fd29d06e7200f742aa625eb612895ade59fd4c66658f22 WHIRLPOOL f2bcb7432ce7c1be846111a597a477cc9068483275986d76a835129f875ad253e0cd2819d71bd58f81bf95aca3774d37da6cf2bb70878ee56d3722c5d2375f70
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-puzzle/flobopuyo/flobopuyo-0.20-r1.ebuild b/games-puzzle/flobopuyo/flobopuyo-0.20-r1.ebuild
index cfaf261a7bec..93dbd923bb86 100644
--- a/games-puzzle/flobopuyo/flobopuyo-0.20-r1.ebuild
+++ b/games-puzzle/flobopuyo/flobopuyo-0.20-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.ios-software.com/flobopuyo/${P}.tgz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
 IUSE="opengl"
 
 DEPEND="media-libs/libsdl
diff --git a/games-puzzle/freesweep/Manifest b/games-puzzle/freesweep/Manifest
index c1742a7e7410..24f07b6f6e62 100644
--- a/games-puzzle/freesweep/Manifest
+++ b/games-puzzle/freesweep/Manifest
@@ -1,5 +1,5 @@
 DIST freesweep-0.92.tar.gz 87353 SHA256 519c7405c131bd62db7534855fbb92b9cfcf511ded2bf4d2b94f1abaf86aa698 SHA512 9f7f33ba5fab62d1ea3a6a57b9a60323281c91255218afb51251c4e20500c123769f003ae1a3622205be34fa7cfe11b691e58ad8787782da4d0a7045d4f41122 WHIRLPOOL 7056a37755cb94b168e2e879925bcf436ea9431bed8580f4d0ed54a909329ff88c824fdcb01e5799f1a5d253b4ae42cc9e537adb8355a38e668ad1b72e8160fb
-EBUILD freesweep-0.92.ebuild 584 SHA256 6c6a07b4bbe57de64b0b60a661f8c83f4cb0eedf915c8ee31caf2465958664f9 SHA512 0e837a3225d03e95e3c8745b03746aca29544eca0a832753c5d9463a0ea03413ecbeea12b3771cc0d5a7fc540ce65930e19ac2d7a1de7fa9e5602218dfed68f0 WHIRLPOOL 0f143dbe007d64098369d87c32165b35c47d3ace9ce62b79857a7acbee7441eb35109781bd623f51e9829de4527d0dded06126d38cc4b3356f04b1efff36a480
+EBUILD freesweep-0.92.ebuild 586 SHA256 726d42499af8d0463aa351e73a537b6e96d2802a16254e2107948d39acc8bf66 SHA512 ff6959030c2a75aea65504b782afb4ee4fbdc5f0ab3769991068f21b2adb597950ec5561d828fbddda428ba639193e8027bc87426196016c2815ac2ee1828407 WHIRLPOOL b8fb33cd9c4e7fad15e562591a716b5a5634a59c6987d71c39a9026d52e6ca4df7bd6cb489aa25825de63aa7042c3e949e755747edba460288ac79ac96138bdc
 MISC ChangeLog 2585 SHA256 2aad6e3a340d8a722b68461d43bb3597be5c124eb80cf82bea782d9eebb9ca91 SHA512 a664f911beaf46050880adb9ef6cd7bcd36e396933c20e8df7601ee9c7936311dc3c56535c253d6695f5a0ef8f3187e178f3aa52f0b806f8c10b5ab63fc8ebf6 WHIRLPOOL 7c097d5361e3b2964cc050ec89bcb19299bd3b056ee3a460213d60f3b978ab3fc0bb6a1227255c02e86679c4672c5a3352d23c3b58c7d66ebc5ec66bc605b803
 MISC ChangeLog-2015 1050 SHA256 697c764381ca0720f586a861c482244c12e25dbb350faff14738c73c171262cb SHA512 08d91189292735fef19dee81c6bf5bd774a444455f5e25c3c80f26524e6ce9bb051e593edd3f27adbb6212e977a6e2d9e79f34b1edc9a9e03bd09bb1c1a80b36 WHIRLPOOL 41af33846b57c08f6b917c5dec49ebc02a5467eb81e1efb6e3df37d03a50987ffc04e3fe2af435f40c3e4767edb7deaf98db14d8d3274a8e46dbafa1b385710a
 MISC metadata.xml 330 SHA256 133e10680fb3de375e58f36efcd0c445200a7568a0c9ee0e02c28071e4e9ce35 SHA512 4df540d39a83e0bfc22135a1463f8bce474615410c58d5fab2e323c82c5e9b3d732428417da18a76c09bd4ca41e1f04b8d141e29743690eb38b4142ce3920a37 WHIRLPOOL e3768f80f0089695dc69c052f153435ae9b1de16c55705851760019b7d2822e2376ee29c724aa37b2598318952db79ae5948394e41c0d9f6b76bde4aa561db8f
diff --git a/games-puzzle/freesweep/freesweep-0.92.ebuild b/games-puzzle/freesweep/freesweep-0.92.ebuild
index b9a78ed5c061..711e5c61c6fa 100644
--- a/games-puzzle/freesweep/freesweep-0.92.ebuild
+++ b/games-puzzle/freesweep/freesweep-0.92.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.upl.cs.wisc.edu/~hartmann/sweep/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86 ~ppc-macos"
+KEYWORDS="~amd64 ~x86 ~ppc-macos"
 
 RDEPEND="sys-libs/ncurses:0"
 DEPEND="${RDEPEND}
diff --git a/games-puzzle/galaxis/Manifest b/games-puzzle/galaxis/Manifest
index 1da35991012d..9e5059eff44a 100644
--- a/games-puzzle/galaxis/Manifest
+++ b/games-puzzle/galaxis/Manifest
@@ -1,6 +1,6 @@
 AUX galaxis-1.8-gentoo.patch 1412 SHA256 714f17088cc59720236652f94114ca05068dc0cd01664e91f7ab4b0238ab6904 SHA512 110c500bdd46e7ea5fdd90bf93468e7560f9de7735b2f7b89f74ddd273d5d9afc1983891106103632429b73f3af16c667d7133987218ca7c5a7f5cceb1106301 WHIRLPOOL 7a03b9ec91a5c8f9ae424cdb89e3f81ddb5e64fd1e0f521607ca18e3c7d94991a13d59133e8f38a84810e0d594d5e90c0117cb20cf93f888c223cb36dd981c9f
 DIST galaxis-1.8.tar.gz 8962 SHA256 bc36c7e5b1e1d96e5a8c6cdb117b3891833a99e99df709c5531c7d44009a8adc SHA512 9d4c7447827fea333ddec8a289d5d6415777379c7aab53fc2088418051f3a38c8abeceff2e8ba0472f792fac457345f2307b3f51c8366aa0b9affa37c3eee05f WHIRLPOOL 719323349e747473501fb4bd737cb7db8b719dd22e5dfc3d0f7acb9402618064206311101a466fa37037381781094b8c90348171e6b8d2f04b04539e96af72b0
-EBUILD galaxis-1.8.ebuild 596 SHA256 6ac2ef05e62c43c706d2dfdfef75e2d3bc6d57f14fb0a7d48cbffb607154769a SHA512 f987b1cfc754267eebebc4bfa366734219108f0aa112eed58ef6689c835eb018a0dd9105e0d548f7b612f6b1239ed1a9f649732522b78f99a9d744c8a56a41f0 WHIRLPOOL ff321a8456b20932dc9081f432414efa784272201b000d795c4b279cd0b32818598821795fbf7e524e87f23bb66aca353c918981a67587bbf18432c83c98ae34
+EBUILD galaxis-1.8.ebuild 598 SHA256 e3db5515d6fd2b11a502baf4aa0978482d076e771b6de42ad1d9b8c3ded09066 SHA512 e364f0f16f05a6fe042ff8af600b25823985dd3e3065fd852c261a498fa47cd2727c841417adc48ede895c471645b921eccd33ea946aad8560f19b9db6410029 WHIRLPOOL 62c7aa92f095a426178bc4abf25c99ff8c144e91fe3996e593af4ead3a8d236c330414ccc8b079a9da23772b021ee6d88ee7e0e60a4b38564a8a26d6e45cc4ad
 MISC ChangeLog 2798 SHA256 a1ad0904bce4a6822efa0157aa0a85f03c2ec93167ee8538ac952065520fc66e SHA512 f4e58eb273b981048863961e0a0360f9546a056718a436bdef08069561691e0258265424f5b7bbc52b02bd60b977258cbefb22a55448b199488f5d57895aadf1 WHIRLPOOL 7cd0a48442e575c5891e4e418bfcc630c4a3effd46c864fa5b5091825ab040af68269e10182cda2d63865317b8662874aaffd2c0a006d8ef86a8f66a3cae4b1a
 MISC ChangeLog-2015 1775 SHA256 e97bc01a1cf2478a981da61a1d71898fbda82f76e1dd66a3f90c1f30f076144a SHA512 eb28f6c8a5046299d2e7a6a37bc2ff14c5ed5a112301d99178d27caa9be61c8374425125e794720fda6a697d13f02ba2cad6656699e9321ad90e94d30111d267 WHIRLPOOL 5fa8404982c60d436e8ca37addcf86651a709ce143744735060ad3c2798eb77eab5afadc7f6cb47d6137de31b65b914ffea88ab220b1e9412294357bf66f101e
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-puzzle/galaxis/galaxis-1.8.ebuild b/games-puzzle/galaxis/galaxis-1.8.ebuild
index 5496729a8f13..12bd540ec67d 100644
--- a/games-puzzle/galaxis/galaxis-1.8.ebuild
+++ b/games-puzzle/galaxis/galaxis-1.8.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.catb.org/~esr/galaxis/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
 DEPEND=">=sys-libs/ncurses-5.3:0"
diff --git a/games-puzzle/gemdropx/Manifest b/games-puzzle/gemdropx/Manifest
index 459ae29c2292..6c58a2d8f334 100644
--- a/games-puzzle/gemdropx/Manifest
+++ b/games-puzzle/gemdropx/Manifest
@@ -1,5 +1,5 @@
 DIST gemdropx-0.9.tar.gz 903036 SHA256 e50495d292a1d456c28044efbf07c16d8865f8d95e1caba86f4c5b2e3fb1d28f SHA512 f99292f44575cb86c50e29f220d5fd358b3e6dd379148dcd764eac5bca5edcc49f88e119f9bebddb14017403985378f1bc07633c987556a9264f36ce20cc6fb2 WHIRLPOOL 05d0ce2cecbcbdac76dd4f60637ef875f647ec6387f0cac19ad4c099d396e019dda269ce344185ed1963f69eb08a3555050a287c01abe180d8b9b5386a0e86c7
-EBUILD gemdropx-0.9-r1.ebuild 972 SHA256 6c33cd0378ab26816174e245d41d8fc2fce93c3df64225b433e045c5bbc6aa1a SHA512 5679d97a383359d499f85b13ed424272a61771b93dc2938fc278402c0f863f57a85b483dbe5622b1bcc7c30d58cb97d7a31828858595f3c2172348ee084843b2 WHIRLPOOL 704b00c8411bc068ab73db39aa8f88d1268b3d67b5e43eb23fb2d4b7f34ed66623f1455a37bc70580c2ecc551bb6212dea2b2fb679ebd6116520cf29a7ef48c3
+EBUILD gemdropx-0.9-r1.ebuild 974 SHA256 ecfd879b3b1f52ad8237be3ec424fefd291a868554dfe3047ffec0ab715d1f11 SHA512 6d13589496d95a1b7048dbcae43cf569580ae7233d156568be013cfe1588dae2ba694a00a500f877934d98a047d051e415e83d7c6a7f74fb93cbbd90abc8c81f WHIRLPOOL 6a3b86205bbcac081b7040b142ffa55c1dde6dd436e3dca65873da68ca4422f37e6f2e58ec7db7553bf0008fc9dc85ff9bb36c029d0c9831e413d671224bfe50
 MISC ChangeLog 2436 SHA256 c142c767f49f9b7c2af22b79e5938ead828e499385ad8c60502013b071ed1c07 SHA512 85fe4b87b433011fccb22c904f38c51dbeb08ac61a7bc970696ec86059845c48ee19bba0c676d8329e5af47f7628b28c54771c841b2081a43e26d46ffcd31afa WHIRLPOOL d44d02c6f1c0d8a9fed0819e72705a49fe154dc53c14e6a84044339d0916914c6ef42cb2a705f2ded19858f730f5f07e6a533d7b2f773c7195cf9cb4c3ae31db
 MISC ChangeLog-2015 1381 SHA256 3c15dfe4882855bdae3872f6066c5e1002270f93189f74074ebce606e21c2a0e SHA512 3aea71b4022fa36d61b91ce996372537cf865a0fe0c1a1e4122d34b45b975542d79a5538203f1114206cb468248c9b563365f9d8b6f8acb01b5c84d6fd6153cc WHIRLPOOL 8af76167435afe32064aa51f90dd80306373cf7f70e54c69b488d9961cd54a5b0b3a8b3ef3fa7c6d2bea252c409e70f460bfccacd2f38f5eed46bd5de4b9a035
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-puzzle/gemdropx/gemdropx-0.9-r1.ebuild b/games-puzzle/gemdropx/gemdropx-0.9-r1.ebuild
index d25caa2d89f9..b7e04a7574c1 100644
--- a/games-puzzle/gemdropx/gemdropx-0.9-r1.ebuild
+++ b/games-puzzle/gemdropx/gemdropx-0.9-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.sonic.net/pub/users/nbs/unix/x/gemdropx/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND=">=media-libs/libsdl-1.2.3-r1[joystick,video]
diff --git a/games-puzzle/gfifteen/Manifest b/games-puzzle/gfifteen/Manifest
index bb20beaea61e..ccc26e4dd5dd 100644
--- a/games-puzzle/gfifteen/Manifest
+++ b/games-puzzle/gfifteen/Manifest
@@ -1,5 +1,5 @@
 DIST gfifteen-1.0.3.tar.gz 525454 SHA256 049eec9eec2f857823f185a72c831d9bd8a1368a9965bd04796e1fe0553f5e6f SHA512 a3699a2484ec3334ec9489c6ae6d8b332e41a769c72ea2971684197f8eb9e6c30431232f3423aaa85ded0fa57410929d432b2efe4370409bdcc63f2fb0b31ae4 WHIRLPOOL 9dadd31972efd3bbf474c582aea4129dfe7105d10f5df2f93614df1b5e552a6754aea2cedfb3f8c2e05e2c0c97c75a78ce24b262f800da884d4bcdce0cc3eeb2
-EBUILD gfifteen-1.0.3.ebuild 918 SHA256 d491cd1c2bf302c00698103e8224e161263e2ae036a7d163a7e853c15074000a SHA512 f8041ca4d7ef322ea88de3e0480c77cfab09f1ff1ad7f108d812447b97a94882f9937bcfb9c2a030ee5287f907dd4460981eef8d00802e545dc27703a4de6dcc WHIRLPOOL 3e435f37a54f94d222695d1a4be8115bb4f51f1234d09eb6bd7506e7eaaf516c64a2e4a95062bc4d3ab4e86f6bd2ab064ff8b60914d9e8dc57ba3987bbf56fb9
+EBUILD gfifteen-1.0.3.ebuild 920 SHA256 ce734c869d3fd5ab92142d715f56af9b25a6639b439e6b86483b518c8ea540a7 SHA512 4f5d5c60421ba8db25d7cf977d52cf7f11fc6a754fb27f1ce4cd0a6f0b0b419cdb905885019beee3509c2fa9f72b9a6725f55bc552a437f390bde24427809910 WHIRLPOOL 8fcca5d9e85925407dd86ec51ea5f15708d44dd1fbf8404bddfddb03526c7e65ca10a7c860b4ad98892d4f12214a24aead89b9e151563850051c24227b2761a7
 MISC ChangeLog 2434 SHA256 ee1de3d29f195a91643c4b93d8e3fc65f1b7945d6b184fe5a41fe45c4f7beff1 SHA512 3de1b37d61d48cc56073328186c1ccf220832b2afec539c45005cd73ec3b3bb58deac69d345ec32d4383b5f5d6b96e676d9e3873cf7448aadd4778879aacbdbe WHIRLPOOL 7f893513891dd2f2e9b66668966e8172ef77cab49e1c0494a912ff020a8629d29e055b63ad446dc356f181b603a2a7640b6cb4d240052b4265d3c14c7922344e
 MISC ChangeLog-2015 1719 SHA256 b2d2a09996a0ca3c83d18fe48156803d87e1cb38ddae9acac9dc2fe58426edbb SHA512 670e2483d7a86e0448359bd3a555c1ae4606c621c3c61253a21f962918b03bad56df63f0ac072bb31aa69d4fcddf4c480bdb0356691159d1c23ac021c6a901cf WHIRLPOOL 517efdb098fb23c3fd8c3db9259a899affd7f20c288aa9f8f4560fc0965ee3399cfdabdcc01ccf0d3d1b1bea6705f64c9164423cc70aa970204acd5beac8a566
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-puzzle/gfifteen/gfifteen-1.0.3.ebuild b/games-puzzle/gfifteen/gfifteen-1.0.3.ebuild
index 69d83dc728f1..25f254cd5548 100644
--- a/games-puzzle/gfifteen/gfifteen-1.0.3.ebuild
+++ b/games-puzzle/gfifteen/gfifteen-1.0.3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://frigidcode.com/code/gfifteen/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="x11-libs/gtk+:3"
diff --git a/games-puzzle/glightoff/Manifest b/games-puzzle/glightoff/Manifest
index dd73eed72408..ef6ab8eca110 100644
--- a/games-puzzle/glightoff/Manifest
+++ b/games-puzzle/glightoff/Manifest
@@ -1,6 +1,6 @@
 AUX glightoff-1.0.0-desktop.patch 402 SHA256 3be9bfabb64ecbecc52bbe7f1a3fb93b2844882451fd176916fa9e9c5492ea7f SHA512 4571865a471d210b5218775a09076bdc4003880e6683a245efeeba47a7e128822c11c6b1198fdfae21460900dce5fd747166c30f75c75d0322b1e8a68f7daa27 WHIRLPOOL e1bc378fdd69cd9b78c67fe82f598956488e7f202e7ba39f57d532cf8b6eeeecb440eb611a3ca2405f60b301ff0ad824e2d590a8d64deb8259a03824e6e5d2da
 DIST glightoff-1.0.0.tar.gz 349274 SHA256 14dd3174e75c175b437cd5a6c8a9eddc29865b62c588463892031cd0a355938a SHA512 b3be7f65bfbb6b3affbddd20a12321ee401defb2bc0b64e58b5aed05d319e6ac51100cfa8dfb4beddb3c919deb9ee6931235dbc4183c12d3e501da5eb748ae94 WHIRLPOOL ce5506248de6f0174eb3b9bc3549a762ab48a6973a4068752d59056c1ff48329551a81fd8460a8eb263401b3e8fd6b3986d8ba2a4d1f12ffb167aa4a0152f1b8
-EBUILD glightoff-1.0.0-r1.ebuild 701 SHA256 bee3072bf087135751e2a38772dff3ad951d22f6e296a1a5d2a7705d05da8b46 SHA512 f7c13782892c531450cea695d331c0560efa579e7f9ce92f18c4ad3af1cc46c01b19d1030be394392de98c8f7dffbb85bd6523aa0c2f0f60c065883895052717 WHIRLPOOL 1782346357f16645d8cdee3cccf976e9bef39366aa1318da6b5505095983a1a30610993f7c527f54624a68397b612b6293828ad9f76be0ab56e4958ec9248a07
+EBUILD glightoff-1.0.0-r1.ebuild 703 SHA256 82ed748a96ac07952dab526902298829ed3e44f9b8b3d2e37eba244ebc5c35a2 SHA512 2ea4bc1971fe1352c5c3e94a8150e20000ac5a8ffec0e295f3f39a645416c340d6470c2ebfc4499f218e47a0661d66d5092a51e223d4b61015416aa7084b3433 WHIRLPOOL e34806f13b9a2a95841ed282dfd9a39ebe8cf60e462c27ae3d1a767ae8cd7ef87172022cb4cd5e8df9a4df39459dc44da347b93a9c8df2fcf5cf3dd3c7cff8d4
 MISC ChangeLog 2483 SHA256 ad929ed1007d81f706042ff705107eaf9b63b7d07bf733105259d33c51d69ac9 SHA512 2a99bc80d6d2ef37fae6a7f70882dd833a4a442d759ca58a75492bab6ff506a2cb0feb0994a6af0cc96b07451a47e2ea28ec21bb4f31633acf682c779f91bbae WHIRLPOOL 7fe75d7a4dbdc46f2b59d4cf0ab56f1a2a85d8b50b53d3256bb06e0291084be864fc88cece18ad210422b8f555c6e3b7c4f9f764aa46dea8223db170938b5384
 MISC ChangeLog-2015 1374 SHA256 d625dd54dc7581fda235786094428f6c48a0cfd004e2d9a44135db3d9f5cbb3c SHA512 c26ab3d4ab48260a013ca0e5ccb4479fe888225e9daad40770d6591d0e22a824f82108f4a85e397d8663a60f6b3f1fa845676cf6a2dc25b74351eccfdfd15f43 WHIRLPOOL 93b96df0dea7dbb2cd7aa170c723fb247db10c5068b12ed861056362831609aa6a517023bcf5b7c9e8a3066ca3b06136376ddf04ed0bc948433632ea951cd980
 MISC metadata.xml 332 SHA256 12440935be6018ab806e3abd3b55539f3035fd0231322682aefd618663731b05 SHA512 83debe37911969e2b45ad0ca5ff90684a7d7e3dc3fd4bb504aa537c3c7823b68131f8e919075c9e5806d6b29a8874086f3c69fbfbb1335898d241d8b46f70e70 WHIRLPOOL a534e85705b2498a360d8ff26ac3176fa6a7937b97551ba6a4c3e0e78680050eca83d1dccfb6271c6f5f8e979b4f4ef8a5ccf0af7aae4df3153c0f0d49de78bb
diff --git a/games-puzzle/glightoff/glightoff-1.0.0-r1.ebuild b/games-puzzle/glightoff/glightoff-1.0.0-r1.ebuild
index 6eaba0d97d5f..5a209fa62cf1 100644
--- a/games-puzzle/glightoff/glightoff-1.0.0-r1.ebuild
+++ b/games-puzzle/glightoff/glightoff-1.0.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/games-puzzle/gnudoku/Manifest b/games-puzzle/gnudoku/Manifest
index 62b357db204d..cf16b816fd6c 100644
--- a/games-puzzle/gnudoku/Manifest
+++ b/games-puzzle/gnudoku/Manifest
@@ -1,6 +1,6 @@
 AUX gnudoku-0.93-gcc43.patch 321 SHA256 bc2b171a50e22f913c78c9c5e957bd66eafa93d756c759b371189a8abc22276e SHA512 2d4286187e8f5314a19263073cc3b9bd1e5eb68b243d4d7695ef37fee7004a95111ec3420c434d4791b8d6d0a8facb36f02c2dd6ea2f6d012ffbb17816572e04 WHIRLPOOL 56fa981e1bc5a27bf563f57f692d9270cc2bb7ac05092bd0446498df7f5b9f805275a508e9bb1f436ec62b0c314b44a2d4299dacf477717b60cf8f65579de7f2
 DIST GNUDoku-0.93.tar.gz 26212 SHA256 409b18d525c37660a117d786fe537672c7f58b7f01e2c37dbc1cdf339661075d SHA512 124bde796149136320758de5088f7d177ec8a4ffe03190f22bd8b228c00d1adb790450c760110e14d1cc9bf70f7dd54477405582c313c91e8da97d39c8fc55a6 WHIRLPOOL 828632a90600ed64bed9fc8972b0826f3effda4975758c16023907b3cb47ccc4e55b848643675bd3528808b753e5442385bcd6421c21579bcc32ca254055e55f
-EBUILD gnudoku-0.93.ebuild 878 SHA256 c58b8ddfc20285ae2b95b9599aed9a8486e429246d4e953bb2a5e09bc315edbd SHA512 378fd74930ac8e399e479a1d30dfb205adab6b5ebd7b2ba94e9ab1ac4b21df2c3bd19c7d2994390115975dfe39183b188aad376b87e28e7af16a00668862ad92 WHIRLPOOL e11e7389a727452693b9f4b89fe7191671f7c6b1ab52de8399a93e8a98cea9495d62a61e814dade1a47e283dfe4b660fb7e50031ca4171571d6d84ef1fa953e0
+EBUILD gnudoku-0.93.ebuild 880 SHA256 9303cfa88e3a86bf8e607e124f3eff7fd0f056a81d939aefc3d634a872c5a9d6 SHA512 5aea5cb10eb9d6c35b67c5892245e2318016b5c26113ae305539e12b71c9d9bdedded97cb9a99f1dac1bfdfca0b50d952a0fe37e5565b211c4f48e7d50c9a477 WHIRLPOOL 759c22b60f0ff75b4c0d09bb4a54dc1ac75578af9b88b886c0618e160c5eeefd8f5087cafc6e30b50ee968342acfaea840ac9125996f74abdc3b8f3c6c519ffb
 MISC ChangeLog 2609 SHA256 2963c3c824f1e732eb6798981a0d3f11bdd3cb03dc7eede1aa7c08e3395ae894 SHA512 0b66fab564f99544380c8123981535a4b2221457072fcf7b186adacbefe439f8823d27042b22547454fb3714c623fe9eda9c08aa4161819a007d8f13bbf90c25 WHIRLPOOL 6133ee55146d0c8fabda4e74f167280b65d2ebdc575e60cb4082c1202e7dbfe7ee55ea756ed0d05ca5f737db97978f87cbc6c6a087232d4d1397e4726f430f64
 MISC ChangeLog-2015 1826 SHA256 7ec726a2a86b8ce92f194e002512669299931a72542ab7a4adae3961aac9e886 SHA512 c6c034310047e58a2d12d00de76f3de32f4666b8a4b579d24151e1992a5d2168cfd3f15a676a84a4aab4db8cf91d57b4d50d835166982cd0f94d2370f1c6ce43 WHIRLPOOL d38e881bde3a838a44bfeae89dab600cbe55808c865aaa6135091c845f9946d94aea032ed61b2873baecfb3d924c47c51e274fc59bab2114d4eb313651af2092
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-puzzle/gnudoku/gnudoku-0.93.ebuild b/games-puzzle/gnudoku/gnudoku-0.93.ebuild
index 6e17e6575db7..b4bbd4305682 100644
--- a/games-puzzle/gnudoku/gnudoku-0.93.ebuild
+++ b/games-puzzle/gnudoku/gnudoku-0.93.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.icculus.org/~jcspray/GNUDoku/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 RESTRICT="test"
 
diff --git a/games-puzzle/gnurobbo/Manifest b/games-puzzle/gnurobbo/Manifest
index b9257c6f7660..e6c1265d783f 100644
--- a/games-puzzle/gnurobbo/Manifest
+++ b/games-puzzle/gnurobbo/Manifest
@@ -1,6 +1,6 @@
 AUX gnurobbo-0.66-underlink.patch 854 SHA256 7cafac863a650c0f76aff1912ad4011f99b81ac9a1178db7fe5eac5a4d76862f SHA512 ceb1b173aec2302de8639cd150cae038e14454bf82cdd2389c2c6a183c17e74090c1e1af9023a54d8d53e233ddb996b1ecb73403caba2962508e2f791012b355 WHIRLPOOL 8f6db34683019f938448256368a4ff9c3c706393749979bea38d99717e2a509315920d528c30f3947cf8882de116ea30c206a630a42017c573259f16f91019f2
 DIST gnurobbo-0.66-source.tar.gz 1765034 SHA256 54d2418f49e52b8f49631eb93af7789074b628d308a6d26b00cc795ad0b04d89 SHA512 5f217ba87e8d1c56d9630cca44bde8d405c93929ebb1722c80955fceedec93a5e02ab3dbafd557c3cbedd63a97a73abe6e8aeff115931844a11f6cc1dd00533c WHIRLPOOL f51fd6d27b73dea701d7f3e1b520012f7dafbb40003550c67e34e6c6c46ecf7e910bfb1648b86c9d471d908168a97dded4b042f76f046484eb0d685a651c4e28
-EBUILD gnurobbo-0.66.ebuild 960 SHA256 508b47ff0211ad303cd8c76e1307dcea59268fb5f0b5ad09325da3553e6667d3 SHA512 aabf823f9d9621a4143c5da601f5d7a997a624f0a142f26f6eba0a6e2a167a3b4e0857f4474b03a1f45963d8170e9cadfd265ad352e4ca0ea23ba32cc89803e2 WHIRLPOOL a0ab75dd33c06d8b4d4572a383415242eed82fc808ab2b39dbd4f3059b9240e348bedb06c2ec106b68e3ac6900e1d6e42e148fa65d97210e1d34d761e2a6e666
+EBUILD gnurobbo-0.66.ebuild 962 SHA256 90830586d965e43aa1836492b3d54cae21776919ae0cfd99ea30daa58343fcac SHA512 64cf6fb4fab1e171dbb9024148df1eb2ea64eb3634482e6c11a07a7093ec4c92457f201d9baf47296da1c7c6c7d75cc590d7d5bb95c5b12b6a6e3d409071e3d6 WHIRLPOOL bfb093f232ea13ba5dc0b3c983003f79449b35fbefc0fa3327a819f30d24646fb3bd2e1fbaab264b61d003639ece3e46d4f6dfedd20115f714295dfd04846d43
 MISC ChangeLog 2613 SHA256 4bd50143fe9a0c22061470ed465c436ba18b03d8a5ce58a74e84a9d20cba7112 SHA512 188cf857718f6d4c566b1c9839863c8e26deb81dbd48575d20992867b426c3852c0f1594b751294792eb83e2c726fd7c89468936dc3ae375a8fafdbff2934628 WHIRLPOOL 7ea1a85df22275f5090ffcb93622b07cbbbb628574fca3e3fe0496568ae20f52b630aa60b82aad7586c5ade1911d41f0f00ad0d487ef2de492c8c6eb7f960a30
 MISC ChangeLog-2015 3134 SHA256 e3e34a73730fcec3ec4053cc0c0128e3f2726e7590e334538eff87b40a2e5f69 SHA512 1f8bbd1937f369b1af9d9d8522813cc8df37d45101a4ffa702c8cc63bc1b13c9a9c8b342c7d56955bba688e34cf65ea288f424c7868b2234bb10815d28218785 WHIRLPOOL 717646db750a452c78c2afb33bd51d47592ea1257609eb0be12499fd60cf1172ad4fae38919aed269ce25b99f04c747b3409cacfc041cbc780e8295c8454c93d
 MISC metadata.xml 331 SHA256 be132af6d6e2a7649e1dfeb0f13db56252471044a91634957d3889bae2119ead SHA512 56663c15b5d9135317f5cfdef851959613abd44ced462fc3429540a76be55970f831bfc284d2fe06ace79ea98586109bc64489ba9d12fab9a0909186f40365da WHIRLPOOL ea9df6d2cff93ac79b85296bb31a71c966f0760a36d41f208d32b7ee9bf78b9973d9aa1f24131ab8fd42b7eaa58277d0654cc66d75cc5e6cebbe45b8c4b31f10
diff --git a/games-puzzle/gnurobbo/gnurobbo-0.66.ebuild b/games-puzzle/gnurobbo/gnurobbo-0.66.ebuild
index 5f2da4041d8c..b3b59d5f3fc6 100644
--- a/games-puzzle/gnurobbo/gnurobbo-0.66.ebuild
+++ b/games-puzzle/gnurobbo/gnurobbo-0.66.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/gnurobbo/${P}-source.tar.gz"
 
 LICENSE="GPL-2 BitstreamVera"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="media-libs/libsdl[sound,video,joystick]
diff --git a/games-puzzle/gottet/Manifest b/games-puzzle/gottet/Manifest
index 12a4821f2aef..be91a925a5a3 100644
--- a/games-puzzle/gottet/Manifest
+++ b/games-puzzle/gottet/Manifest
@@ -1,5 +1,5 @@
 DIST gottet-1.1.3-src.tar.bz2 395302 SHA256 ff8111c9760091980d12bc116ff75599d231437fea6a9313e7ab1bd0b2a15e1b SHA512 9fc468ca16a37eee29d2c172e8e98501c85dc20bee4e9daac2704a0eedb691d8df24905f2696a9331628bf9c91692da0fbbf86e3f80b6d65d4100aed2e4007a6 WHIRLPOOL 5ff45e2ee1a5017c71cb33af2b52bbf267a04a861735a286ee6b92082fb9a6739fc22ecb405e944dfebd74348dff890f5cf652fe3ae37037499d8dacc5858057
-EBUILD gottet-1.1.3.ebuild 642 SHA256 0ef363a5ec71315d03cedbabbfe2b71894c8f3003a9ffbb41ce29e6f3b4ecc13 SHA512 184b85a1f6a1c083008db196567b2a7ea1ea7f726291733c12ebf077ce110a938cf88c61bf1b3127d4964bf175bab1e608b04728527a1f3348dcbf8b719727e3 WHIRLPOOL 5566e4fed9eb19fc85685292bad95f4922d5a2ac58e69f3575ad3db3bcbdcbde19f1183ceac3850ae60b73ea3ab435a5244542f279c7a23c02b864566aefbd0b
+EBUILD gottet-1.1.3.ebuild 644 SHA256 7c34ad1c99dbd433533055b050cc7f2e1fe8dbe27afcaf8ef0aeeb76e3e37dba SHA512 c71ff8b7a68fe47e50134ce78fb4b7d1a8af217255ca732062b4e1519be66a7090d6794f2d3dd88d34af853c7c4978f2e7d14e3055815b4ca5844ca9832b2934 WHIRLPOOL 39c82377c3083a55bbfcd80e07740ff41e85dbd3f5e6f6d28f102d7dbd19a967d5b455e9375a4f52b6ca2157e325c13af00c35a9de12935a233ee8bb6b4c6d0e
 MISC ChangeLog 2619 SHA256 ce8b32f17eee09bfb498c0e1ee0791d9862450b7a4ee04418bff141bd97c939e SHA512 8a3c96bb76680492b72aaf09a382b917e7ec06a3e75fa78897172d7443c2b7d92392ad58044960bce3d4cd4af6ff21d7e4e386d3616cd35d2bb3ad3f17730839 WHIRLPOOL eb93ce510cba1322db60aa860dcea7917bb7458b1d2d784f776ae5f64fdcab9dafa8c4c301b8710c6ead2b0de64d52dbfeac7e597205c4fed0f71adbdd663beb
 MISC ChangeLog-2015 1897 SHA256 6ba51b4d0d7ff24588eef9342e26a59d08079a28794374b64c9574ba7c8ec8cf SHA512 2eb5e416539a126a3046018e47b6600ab6923910c4d07508d7e3cc33c98d3425c3bbe77794804375810a15d6ad2ebd4d03386b67d14eebbd83236822d778be21 WHIRLPOOL 61787bb9240a5b86bc89bace92eb040512393720203402e00bd8a839124016b18836cb01f81fc9eaa2e07ceba3ef74f5e20cdc5b3faddfe0e48ba7b62bf59bb1
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-puzzle/gottet/gottet-1.1.3.ebuild b/games-puzzle/gottet/gottet-1.1.3.ebuild
index 3a021646c64c..0d7f78f4b41d 100644
--- a/games-puzzle/gottet/gottet-1.1.3.ebuild
+++ b/games-puzzle/gottet/gottet-1.1.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gottcode.org/${PN}/${P}-src.tar.bz2"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/games-puzzle/greedy/Manifest b/games-puzzle/greedy/Manifest
index e77ee1c4a2dc..1330789182b9 100644
--- a/games-puzzle/greedy/Manifest
+++ b/games-puzzle/greedy/Manifest
@@ -1,5 +1,5 @@
 DIST greedy-0.2.0.tar.gz 13152 SHA256 31929c41e6871698fbe2d259419fe2f31e8d4530568ccbc45a03783de970f321 SHA512 07376d003193244d336909f6336d68c4ce0f1e15388f28cc8e50121856b1f341f46f2aeba6e09118063b27d572916b4f596b75354543df3a72930a44b6b6f8ac WHIRLPOOL 68cf565dd509f37ba3a8f07c00e03813a8f3fa575a88f70a6e6d97777acfcae8cd4f7cdc6d965bfc35d9871e3d8893d519afdc0203f8914518552c467362ef3f
-EBUILD greedy-0.2.0-r1.ebuild 894 SHA256 b47ac4c418b8fdc382d4065af1eb18a6fa8bff734e89d467e44c00eeec7b6f40 SHA512 0862163bf20fb7b72f9900ee16da1f1b6bbd9c0e32f2fc78a82b3e3bdf9c0afa98d1e52d6b0753db42188b6896a462c10a7850c3f7bdf3c8af16b887d3d4fcb1 WHIRLPOOL 6bd112c4f248762902e035d87dac7cd6949bf00099638e62c8802a12ecbbb5b7dff2e855bc51ef65edbb6c19756bb9d571907411af3f9a3ddaafe0001ec4ab72
+EBUILD greedy-0.2.0-r1.ebuild 896 SHA256 e60c669e95d0b51aad23becc96e99a8653396d30cad081ca380b9e2c5af212c0 SHA512 548171eafbf6a19ca223d98387e82935898142a5ef453c382c3731994d3fc5734772ef9435b33cb429a95e95f252907878fe15a541611e5342119ee1f8af708b WHIRLPOOL 1eed8164ae280b13aa6b596799922f3bd41a4e1e3263727ae692abb73901bce0ac4251d041c287603daa39a2ca305de8e9e83779a19ef8ca779e5836db8d2eb1
 MISC ChangeLog 2585 SHA256 8ca005d8c81f61cb808f22d0da36c34ae740fea827fe57201a56c95ffc7b6bf9 SHA512 390087b9574ea8f7be52e6721e32566f4b17bc37a221c8e42dd0e789970ad8f7a262b9f96722d4731844243e4ecea713ed3513fc4f5770002ee76aad057564b7 WHIRLPOOL f070e0cd276d477ffa3e509505c57ba15b6caca90cf953c0ed36a685c800c2dddaeb05848cb90b00f2da2386285c9a2ff7a02e4d6cba06d33fa48877f4924f33
 MISC ChangeLog-2015 1731 SHA256 2ca09ecde81f35e78c0d28d0f3ac01fb28014e89f180cd0e66fef5d1e182336c SHA512 d75fb338cef31143283856154b7107dc26daa63ca5100987c3aa0060cad1e805bd367cfa1f4585c269045efc3b5661ed6a451cc961832cb4c8c68c6c49e8e942 WHIRLPOOL 51bffbc1752b6e5c9691ebcd00734cdf2f6a3bcb84b67c09f90ab52df2c76a3b8df1c42c2767b440e9f70259cf66254d3e9b8a11c4ad902e1a24f0e819249a94
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-puzzle/greedy/greedy-0.2.0-r1.ebuild b/games-puzzle/greedy/greedy-0.2.0-r1.ebuild
index c3d6eaec2d2f..dffb899aebff 100644
--- a/games-puzzle/greedy/greedy-0.2.0-r1.ebuild
+++ b/games-puzzle/greedy/greedy-0.2.0-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.kotinet.com/juhamattin/linux/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND="sys-libs/ncurses:0"
diff --git a/games-puzzle/groundhog/Manifest b/games-puzzle/groundhog/Manifest
index 23d6063cd4f5..40433c853a60 100644
--- a/games-puzzle/groundhog/Manifest
+++ b/games-puzzle/groundhog/Manifest
@@ -1,7 +1,7 @@
 AUX groundhog-1.4-flags.patch 604 SHA256 e7776b4e875d3ab6c6bd501462b3f02756ef6a7bb291978517900bab1105cd34 SHA512 d81fbb87f1732673e0c2b3053c6a8d6f47c27a12a0f0b8349da20d43cf78ceeed2f4aa1a87803216dfcd0c71f77f615c3f9bba7516a69a43f3ec6f11be53c071 WHIRLPOOL c0b8f1b0677e0f59d724895f11482dc24de60f9e71ff90226a49d14a6500abdf6c326d069abdd483edf94977cd370e7b1b5d9fdcf05026c3a3b6c73c7e579037
 DIST groundhog-1.4.tar.gz 221871 SHA256 75567245a041a70f1ecb29503a424889136fcde81123234aedf5fb3ef9fad549 SHA512 9d1cf9073658cd325c4dceb6009825f50d8d4c55d0cca1b762cfdd066663257958d92e0e67ad49593add5821ce202e19c1106793ae8c77e4776c3b2e1fdc093c WHIRLPOOL 819caecd374d8e813e513f6d51e1cb170c480fee2f28203b0b239e2c0ba76c213cdb583fef1bd431cc28d8e3693a4ec79f748ab860f6e131383f8319b05c177f
 DIST groundhog_1.4-9.diff.gz 8613 SHA256 0303ee125dac6118a7bc76d9eba9eb18ac9996549bd8f427ab634f594aa88154 SHA512 ddbb7c8b51fe63a1d318e080133737a851276ab55324875e5d68650d2399ac141667c62ab79ee41ababd2b5426e7bee5f158e7aa4edfe8ee82c6c3b6fb8179b8 WHIRLPOOL 01b46cc9a98725e76c59cbec46c8a451cacd5bf0facaaceb85c09ae5ab33414c2db810646a3c73a62aac28bf319a5304eb8e9c9ceca2f823d07f7bce04e6cf91
-EBUILD groundhog-1.4.ebuild 1127 SHA256 09112af340fb862b394da606d2a575fd12b783ba0887b85f100e890ca497a230 SHA512 e9da68e34ba2e44a1b9c23d872bb2ea5d89796d3203c1a23a43f2c958e9da70550f63a7d07235f947f2551bab2e599c072556945784a157de43a69399feb8bb2 WHIRLPOOL c6f8445fd58fb77e8b690dbdb532e2913a838530e0ade6a9225a180a7e58f301a287e2ebe917d0429e52035f8d7450eee9bb02913587d4fa159814d6ceac97dd
+EBUILD groundhog-1.4.ebuild 1129 SHA256 a09048c1dbc4aaeaddf3622fc167c639153a4f8743e49b01d94d6aebba33967f SHA512 a07900afb4988863719ba5c568991b40b6efc78a029175f25a9b320c1cfcdd3326bc3511b978194802bc171708d46fab31209817b5a4ad49c15ee2caae6fd8bd WHIRLPOOL 4231bd42cdcb191b08e7a0ce3f7dbcd9f82d7706278058230b9686a706853099934e36dfa14fbace404049957037f574677acf937760e0361129c645f26c3389
 MISC ChangeLog 2467 SHA256 9122de78ebd1242bc18ebf6f3cad756bd36632e61d360aeefa3853b84994cbb0 SHA512 a44f26cb284cd78d9244fe083b269b0a3c9e211c82740b060a735821f3ab360179ee872ec582842dc7c616cab50991053a34e801bc3278eebbe77c9078770e39 WHIRLPOOL 99aaac86ecf5910752a4435e1a35260a19826ad788db86f9c96750021ba0d7781be4291c484f627103e137cc49bbba89a221b461c4132694d83c05956f9ca934
 MISC ChangeLog-2015 2098 SHA256 11e159bc481b3a0a6fb9df27674e4ac5db14366150c7ecda205fc4a80a06269e SHA512 6c7d42e060a2b90038406081b5652f6a4778ad6aff077c0038d055bcfcb19572c5b14de5ddb47bf854f1717921f2c980c06975946c72da21169877aca28833b2 WHIRLPOOL 94c069129d96aa388a032cdc61584948759697ba128b87be5776a100b27902ddab529aa2e17b7e2a95955b75ecabf6a13b1461f305bd930af39fae7c7c39fb74
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-puzzle/groundhog/groundhog-1.4.ebuild b/games-puzzle/groundhog/groundhog-1.4.ebuild
index 80751062f67e..0682e563376e 100644
--- a/games-puzzle/groundhog/groundhog-1.4.ebuild
+++ b/games-puzzle/groundhog/groundhog-1.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://home-2.consunet.nl/~cb007736/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="nls"
 
 RDEPEND="x11-libs/gtk+:2
diff --git a/games-puzzle/gtetrinet/Manifest b/games-puzzle/gtetrinet/Manifest
index c895598d6225..b35f0615a957 100644
--- a/games-puzzle/gtetrinet/Manifest
+++ b/games-puzzle/gtetrinet/Manifest
@@ -3,7 +3,7 @@ AUX gtetrinet-0.7.11-format-security.patch 681 SHA256 4c1f81cbbf85f829198a591650
 AUX gtetrinet-0.7.11-noesd.patch 4007 SHA256 ee0b877775bbf10463cd31c39e1f18fac5600a4a595d5e93b7bf6b269d1a744e SHA512 7674d4d54e4c4b0172e14c02036e88d08f8ebb7745ca7c34fff60dd1b2a46f54568fd89c77c19df12bce74296919bd5c6a7bd48a5ca4a427c6cc04d90384bfcc WHIRLPOOL f77818146e41f55e9831c960a5530b57070cc4101485ab762f36ce13a0af898b5cfa2c3d04865b82251fb255c3aaaeca9b5a15458996afdd018ecc55f52d3cbb
 DIST gtetrinet-0.7.11.tar.bz2 416744 SHA256 cea27a5f65cc4384e9130cf345421ef677418be4ebdab14d82b9049dd162ddc0 SHA512 5de7df7647ed9f7c0b6aba4eac976c625b7632eb5ab8034b11ef09aeb4582f90b4f9fc1791dc5371e1067d59c90b792a70276c69b75ebd6dc8c74c96c47c7130 WHIRLPOOL bb05ae48330a6a17209e13857d63f7f8711683df1ded9959b27bfcd3393859d4276f458462ac4b4e1663ac3a19f9e8299a53f0100b44909e5757881bd6ca1e02
 DIST gtetrinet-gentoo-theme-0.1.tbz2 88240 SHA256 33037370a0cab1ac395716f8b33ead7f2360cac0bd25b869cff3ab5d28b6a323 SHA512 6834ed4d70d94d94c201c5fa76d670ed21e4451ad18b1f41292c69e8ba18f56198898bb9d0c90343e28fa05a53e2e92536aa07fad747d4321d2e67c638d7ab8d WHIRLPOOL 9f1a0c0e4e7ea394209638e05640460be14533eb9d6db6962f9c10f2776af5c01d1b5486ac51792f0fc70e2b21bace691c6f1cf83d9b22c2117c1148e3218e8d
-EBUILD gtetrinet-0.7.11-r3.ebuild 1231 SHA256 3c78d3d6eef809b12b3353cfbf800bbc298b19ab9a6e8e0b4c9948420329f86c SHA512 1dbc192438ddb2fdd588904d76e8cac3e5ef08e2becb6433c464e51ed514d51fe8a48de31123e080a23dda495e2191746c56fced0d6032f3f8943c30857e0940 WHIRLPOOL 71d49a16c3500186b0d00ebfc547821ad029e0fa07fa7bc0e409eb235d50578d2b1263f537a44fe73b3893d6a1a9b53f9446493ddf2c97b7cead77386b576f33
+EBUILD gtetrinet-0.7.11-r3.ebuild 1233 SHA256 ba9c4f54e0ffeb94739234c5a8bafc91c86063817ede524239ec25cab0081eb6 SHA512 7613d3054033d08043be560a025509e79bd51fcbd6d86d359f732963744eb6a755c749dd1e3d12f9bde6789a84efeb24b65b83de3ebf194ac13b7dbc0ba997d2 WHIRLPOOL 609b3d2c1fe5c3299a155a3df044d4c4aa022aa38b3c7ce0c0ff1b3f2b386b99c804485f9383d6b6d6cffe63174f439e9c9b4c3ea1fa3c2bbda9be04f717a6cc
 MISC ChangeLog 3124 SHA256 191a617634874b803178ffe621d2a243fbd042f8a40fad28d75cfcd270a0483c SHA512 270d5a43695c9928bf3d68746776c9a978c8399133ebd31f469bac0c7f7b548d797de067ccc08b3ea5f6622c9970ca5428caf6c9623f3bb8c2824dc5a61876a3 WHIRLPOOL da45646e72464a58f3e9b40bcde2cf9977abbb02c3192da545c40c96deb8a01dc50c55db6293cc113e97f6c172a9c90418e31af7cc1afccf6e1373a0134fc2e9
 MISC ChangeLog-2015 6983 SHA256 bfaf90cd3d0b3c6327c4cd09e32e3df9aa8869558cd6f23afe40e944c2c12a55 SHA512 8b3f2de703be4009f435dde21a573a0590ae89c4b341d36437eb484c945bc2e8f4899cd539131a032385273a587da2d1093a525aac7e4c2f23ced38ce5a36505 WHIRLPOOL 1428276a5773a6c896763c4d20f5c69bc10e3a8353270ada39ab8204f03fdd2e8128992b4878996c8d5395f071b28112de666784cf5fe8a0daeeb5d4548b531e
 MISC metadata.xml 923 SHA256 b671380bb669b5c6052b9e406449ece66c8ed743664b2ba833e996d90b462b78 SHA512 81b70c3f4973cd7664a064df27fbcfb8af1f2aa748b269c68d62d3def6f2aee829a0c965b6b93aca51176f60fc34cb170cc20984d5b3b2e1beeb26206fee4e9b WHIRLPOOL 4c5a8596a2a8e15ffdb8c832c22f54f46d6fa829d64251bd1110a6455053eb2d2fb546818ff2748e4f6e587c430253d3627a7a41a4a116b5c0e2bb7916e4df1d
diff --git a/games-puzzle/gtetrinet/gtetrinet-0.7.11-r3.ebuild b/games-puzzle/gtetrinet/gtetrinet-0.7.11-r3.ebuild
index 31961715876d..44052954303d 100644
--- a/games-puzzle/gtetrinet/gtetrinet-0.7.11-r3.ebuild
+++ b/games-puzzle/gtetrinet/gtetrinet-0.7.11-r3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="${SRC_URI}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="nls ipv6"
 
 RDEPEND="
diff --git a/games-puzzle/gtkballs/Manifest b/games-puzzle/gtkballs/Manifest
index e7521c0559ca..8c192df15653 100644
--- a/games-puzzle/gtkballs/Manifest
+++ b/games-puzzle/gtkballs/Manifest
@@ -1,5 +1,5 @@
 DIST gtkballs-3.1.5.tar.gz 1176977 SHA256 75fa007b39668b7f454a6cbab62d55a8e63d234480d3503f87f965ff564de2c8 SHA512 a22352a19368c3b957e6fbd21aea0b4636efd3042f4e6b1c44a40f946643eb89873b182fe35a8888111ca42277e69fccfe2e2b683e804358ad36f4feca235e8a WHIRLPOOL 21bac73591f2dbeca1c7f6aa1fb2c0637c9e6a7158ee580759484fbca7e30bb3bb9213b6b44ee3a2e8a90dfe38533f5e51011ef430ed6185775825dff892df61
-EBUILD gtkballs-3.1.5-r1.ebuild 832 SHA256 1b60da7480fe6ade15514456f7bb1dfd03c55a071d91aa1f5133c00defdf0dd0 SHA512 7376fc296a6e5b8a13538932eb724515500182884d76fb4125c97620a760d47bbf390f1371360639ff818e51b2cec9d767050dc462a47c3d533b378a30ad1c73 WHIRLPOOL b46471776bbfbce5256b3b9137683f3c6063c120deaacb84fd7bcacef17f0f7572ead5b20d616fb83d922ad91963080d0dad87da24703484962d8bb2b1bb87f6
+EBUILD gtkballs-3.1.5-r1.ebuild 834 SHA256 a522b1f42b93b42f4b14d55b64f5cc36e8ab257943e7ad2afa3b8c70aabddf7e SHA512 8cf3d902a6661a01728e9601943df2de21f29d98e365124926f143f43aff44f43fee54c9affbafa78d881eb0877806be20c8a6ee9831add0f1d40419b53223a0 WHIRLPOOL ef07fcc0cd79bf7e1b86cf6db3401d7a541bc34009d31c479385db14c5b13afe5a851ff81c1e0d24758157f0271cb132795b3eab0c23d30b1c1721e63f31b8b1
 MISC ChangeLog 2440 SHA256 17573eceacb5cdd7629318d4b159c21c95ada6679a6cf7ae31013635e5dbc607 SHA512 0b7bf06742e35f2293b492800db38a522c19a4f919ccb2a02ef9e0917e8f14356e9d7453bd32769dd08e425274a673192811ad554786a5ec018cb49030eca5b5 WHIRLPOOL e92418be4986702d224727d928c6b5d0f77a24b21216b8c9ea3a3df38c15f4c2297f33dc205587ef497557d279fad0dff44f1d119af2ca1e098ca957baceb2bb
 MISC ChangeLog-2015 2138 SHA256 181654e57f14f84ab8b92d3c6654a52f3c658091df2dc332536eca3d027a260e SHA512 e3a4325182751682d2ab7de66ab96f14d82b1faf71badcdad8e54b6496171f9a50bbfb1384cb19dd4ba624b4f4f2b16ca245e4439fa5478d622a619cf3542ba6 WHIRLPOOL ad7746472a44cf30388c77d14d5a01a1b5b11fb76aa380e5e0529cd28705fc847782eade428e108c6d791d81d17942457536e2b22e8746bc710e2c2f91945e1b
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-puzzle/gtkballs/gtkballs-3.1.5-r1.ebuild b/games-puzzle/gtkballs/gtkballs-3.1.5-r1.ebuild
index b1205f49d813..8e7c4cdd73d8 100644
--- a/games-puzzle/gtkballs/gtkballs-3.1.5-r1.ebuild
+++ b/games-puzzle/gtkballs/gtkballs-3.1.5-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://gtkballs.antex.ru/dist/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="nls"
 
 RDEPEND="x11-libs/gtk+:2
diff --git a/games-puzzle/gweled/Manifest b/games-puzzle/gweled/Manifest
index 5c33c074e016..9caa46c54946 100644
--- a/games-puzzle/gweled/Manifest
+++ b/games-puzzle/gweled/Manifest
@@ -1,6 +1,6 @@
 AUX gweled-0.9.1-gentoo.patch 356 SHA256 d5fbfcf638cb5486d80b9ce8408a3e9c94c5bcba67552b81cb871796471e61f2 SHA512 9191f8f520afd9126c42f86472b868536c0bcad0f227e161e38a76a511dc0f59e60b81a54f7462d2bafbe174007f27aaba60b4f9559bdf82f4f638130c222d07 WHIRLPOOL a6f99f6307ac5192b131291447a013d5b7c5a05fe6aa1f4ad3c3229e76d281e3a8894377afb552b0d2979461f8ce9ffc0fe029001d06c1ea73ba960733070056
 DIST gweled-0.9.1.tar.gz 403252 SHA256 f6064989040949659f5a970cf3a9dd280615df7ad67c014ac37e1466ce91055d SHA512 12ac6f0033e9af037febca3ecc86f7531491498a38cdc36d7baf113fecece75da4a5b83f6c6e8f4fc6beebb24d479eac10087baa9effec4966cfcfb6c42df75a WHIRLPOOL 26f42dcea3527b56e67da3092997fba39cb0e18d6c987d7948d97540b8e360782b91785215fa730ce616f39612c8ae76441202f973b0c684267f1d484a9b2ce0
-EBUILD gweled-0.9.1-r1.ebuild 741 SHA256 2cd3e2dadc3c678ff6f2aee45b916b04ba35f5c9c259df0dde4c9747d21743a4 SHA512 2344d1e74be7a0ff67f054d047120a2389a0effae868651d3ec705b86d1b68b9975202b3da773e7bdf62d67c7502e01221131dc61e68641b23db5d96809593bd WHIRLPOOL 16d2032763bc22e9b1d6993681cd6e188d85d6a7e97c8f355754890a492e2564d1125b37f241fb26e2459ff910337477dc7666670f260536cd7556b74db1553a
+EBUILD gweled-0.9.1-r1.ebuild 743 SHA256 999e1e65c4760fa1d877a3a84fcb077932efc577ebc92bf306e12e8786b70a84 SHA512 a161550c8a6c5a5e39b34ce1c5ebb19e20d201152fa2cf9187b987020a53f311f9792eaaec2ff108a0857558e316b4f90cfd3c4600808e2aad7f2da3c4e077d0 WHIRLPOOL 9e79a88d27b72f14a975e2c430070c018820f55c6a668952b53e8504b179dd027bdd589b9db3bbf2484baa5310569b0cba2ad6687a40482e3fb5d308cb579602
 MISC ChangeLog 2646 SHA256 f835a1c90704ad83428e039c987f97141af7b1204b65a2f933bed020a85830fd SHA512 1b58ee3c9af6645dadd96d2424078dc449d3fb3ba45077c1e379ba8ddc792a42442edd8e747c7e769a8740f9981cd475319d32fecd0662b22ebb7e8c4eb3b045 WHIRLPOOL ae450559999a424bac330748dedca95cb8010c376e4c9572d69167fad0088f92ded20c5a29455b334039dacf896dbca9446ca46bbeae7c1aa70acb928735decc
 MISC ChangeLog-2015 3285 SHA256 40e3fb4d6baad8f2ea9e47a80ba343f3e7ef1e106f1721753e9f131152a66a10 SHA512 227d88a4053c3172acce2b6f70c03fe891a65db4ad0741f971168f9eaeebcb8aed2350952c2a76198ca5e58671eaab02291c66fe7c0050c77f58d67f474a211c WHIRLPOOL d454c49477a8762c5580ff944e4f2d6543dd14e085957dd982414fc92d88db38ee0bc3b1018ab008857cc10ef75d50e4cfbe1a0c4e5c35a4f4ed5f80d8a18f74
 MISC metadata.xml 327 SHA256 0c5d97e0eff68c8caeb632cd7aecdfe752ec08324108bdca3b8e039fd35d1660 SHA512 cc3134245580e54c44dffa610e7910e4081dd175125bd4fad074eeeb119715f24698417dcc0683ae32e943d28cb79c5b82239648d1f70a00857fdba04b6804c4 WHIRLPOOL 4dd1fa7187baa321c7525cb0bcb09f52e3b73e0f5417b856e9eef8cac86c495f565eb96c0096526bbb72d7ff750acbb49db17db0da2a2abf9d695bd8855a31a8
diff --git a/games-puzzle/gweled/gweled-0.9.1-r1.ebuild b/games-puzzle/gweled/gweled-0.9.1-r1.ebuild
index 6c7f5048c702..514d95cea835 100644
--- a/games-puzzle/gweled/gweled-0.9.1-r1.ebuild
+++ b/games-puzzle/gweled/gweled-0.9.1-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://launchpad.net/gweled/trunk/${PV}/+download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="x11-libs/gtk+:2
diff --git a/games-puzzle/hangman/Manifest b/games-puzzle/hangman/Manifest
index 12d013ad056e..9488e396206c 100644
--- a/games-puzzle/hangman/Manifest
+++ b/games-puzzle/hangman/Manifest
@@ -1,5 +1,5 @@
 DIST hangman-0.9.2.tar.gz 1023712 SHA256 5fa60699112895848b390b98f84ebb3dc4abaca431fd5c0cb25bf4d09824da2d SHA512 cbf940310b4821cf4de27a99a5228bccf42093a65ca83b0a2582556865ee5cea5a4ee2ebe08d2e02ac93f0cfc8d190b1f5427adbd74e7ddb57b90cee84f85d65 WHIRLPOOL 4e32b02a85fc0d93dc514818e6832ec4a6101a45e18b10875d97ab477ee5dd166d8d143c555e890266bde95dee53d0dd067a35a1fc577014aa52be0b1ae86670
-EBUILD hangman-0.9.2.ebuild 745 SHA256 baabfb5f8a3d36ca9c26b093e9009b090ad3bacedfcf3635ea8b84de341601f1 SHA512 c3415bab65872a3b27f3801db8ab8ae9e18ec3e8c9f037bb0728f62c46a7ed944bc4a40b921dc02527ba68eb602f2af78c0bb1bffb8367d6c0703a4aba52bad7 WHIRLPOOL 9b3a37515dee61c11090d4292fd8370bc6acc5989ccd05b4f5886d365a202907cd05395249deb21db5cf5418b72c9b37445579a29a3007d4b767992ef590daa3
+EBUILD hangman-0.9.2.ebuild 747 SHA256 325da2438f5d387d55380fe01acbe820eafa40df97840c0e646dedda2f046040 SHA512 01537c2a67b744caade5b893b553507b083f81cf6bc9b8c398a3bc5d49c022e529ffb8ae3108379f0ed10fb5dd03775a6c2e33e04ba297d5fbe2d5bc54004bab WHIRLPOOL fc81d7cd0fd877664d3d1792f972c8469654af2e1da7d093d16c87e7df3319239b6653da3f475f0e8bf256d64024592325f09d8f92c0b5b922665a46ad87d77d
 MISC ChangeLog 2431 SHA256 96b0bb3a237ef51f4ed602ea029a6a1bc40eaae13d8223c0ce0c55bfd673c1c1 SHA512 9d0060f067700c84cc280c970358834891bdd00be46932d1650c86812cc54c1ffccc64dc86fd1f83a4f9cb89ae5eb7e2f7a7acda7142ae828d54d05d582c6eaf WHIRLPOOL 2486b7def1794ae9e6dd573e26b0d368cac6946db38b37f4faa0603bffc02543966ccc8b3263dd8e1eec18a85bc5cc3faac073e6bf3e9985c70f39cc06a2bb76
 MISC ChangeLog-2015 1266 SHA256 be633c49819edc66bb9b82a7b7553cbc4aaadc1bd00931290a5b6e84d26d8011 SHA512 7bf91a4c3d5347e5b13a3939fd2eaa135e0d9fe1bde77e5a0c2b22c64622a9f0dadd0d03b74fb4bea824793ad909ffd28b464d26c2d7bbe5758cab8f9b3f6016 WHIRLPOOL 6a735d13e65acc23be0ff1f8094b99ceb3d592b9096cae390d8d52e71039d2821465904fa6d3c8ba93758e31d6ad61f1855e3406e201e4073efada0d2fdb9bdd
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-puzzle/hangman/hangman-0.9.2.ebuild b/games-puzzle/hangman/hangman-0.9.2.ebuild
index 9c6bf0d7696d..468a996b6fa2 100644
--- a/games-puzzle/hangman/hangman-0.9.2.ebuild
+++ b/games-puzzle/hangman/hangman-0.9.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.shiftygames.com/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="!games-misc/bsd-games
diff --git a/games-puzzle/hexalate/Manifest b/games-puzzle/hexalate/Manifest
index 7a26fa19355f..65b8cbb41710 100644
--- a/games-puzzle/hexalate/Manifest
+++ b/games-puzzle/hexalate/Manifest
@@ -1,5 +1,5 @@
 DIST hexalate-1.1.0-src.tar.bz2 662438 SHA256 74a8f23b7164981dbe968daa004781646c9063f1e80b234b19166570da22349c SHA512 2f8775c9cb85ff78fb84109f78079013fa172a6b37b309e1cac033be4eb1c248a005a2e899eb785fbe1f89fd87a2035dae3e7016a26af6f3e82a7174dc010a64 WHIRLPOOL 758451c2e20a1f539f622b1638414127512650c5e1adf0314566c435be7385e19427b344cd68128d1e1e357c7e095b2d0f92a909bc122629edd473860b3dac1a
-EBUILD hexalate-1.1.0.ebuild 638 SHA256 d358b30c6f8a66abfac03a96430fa7391b22ded071959b17925fb78a471f6124 SHA512 67fe37320b6a07ea7f11f750d5e4789971d7e21ce55169e70eabc5283a3143fc15c310b91d0da4fc33d94123257fb24b2319d7d4351f1fdb1fa3768ee5b24c76 WHIRLPOOL 309ab3482f0f1b9ae414b59c47ba037fe018d56fc5fb59273edce38c801a11377913a4c022664255744dc14ddef0708fbb7fff22002787202760d990e60548d0
+EBUILD hexalate-1.1.0.ebuild 640 SHA256 63733c8438d8e86ee37c14e93e83d8616ae0008596f6c0367e20809c8abde295 SHA512 939df479bda5548a1d668bdfd85b810f5204599149de74366ab71c34f4fbd2eb0372c3ac71b6f4c02dfdf045bd501abcea2575e04cb5e9f9cb1a2062729b1340 WHIRLPOOL 443ee3abf135af9ede05242cd78d92e0262c8dff46e18ca7a3d4a50dfef0dcb121a81441d1e570e4c60c861873ca5024f396f2cd29dfaa10b03f9497fea1e1c6
 MISC ChangeLog 2633 SHA256 973a588afbac99980c5e24d1dd08d5edfd9e2c2eb130fac0b919e8691c3d3734 SHA512 1144fd9abfefae12866e3ccfc4a7664848d410025a4017fae00b8e3d9f0efe19aa5e61dba3683e6e487f15289b6cbef4df5508fe9983550cceb8dc9bbec873d7 WHIRLPOOL 3bb0b1bd4d55ec2597b58076a1af223212fa8d98be50617116dfb9ade384b61e4578120f86be25d2709b57907f7d8e8c970528537f36097cd7ce4e62e5da8084
 MISC ChangeLog-2015 1233 SHA256 e2c31ffe304016d54d67976b0b222e91cd3bfff7e9ff4d52671944c99f7f5d3d SHA512 b470c6440ee72e14ba7b2434312c2a22d18896d7fc7537c7bebba195012d5908927fecda840acf3adc11e1de1ed913bb2196c0e2674495ded8c371bbc704a32b WHIRLPOOL 4c7a266ff75cdb62ba516aeabc6f522e62881e5262173aad8cac9eb5e07a29fec39d5a37c6b09bf557dca8ab130fe3aa1e428d790d02ad60816e4238e0325b04
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-puzzle/hexalate/hexalate-1.1.0.ebuild b/games-puzzle/hexalate/hexalate-1.1.0.ebuild
index c63526bdb569..60757fbc4815 100644
--- a/games-puzzle/hexalate/hexalate-1.1.0.ebuild
+++ b/games-puzzle/hexalate/hexalate-1.1.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gottcode.org/${PN}/${P}-src.tar.bz2"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/games-puzzle/hexamine/Manifest b/games-puzzle/hexamine/Manifest
index b919034f39fd..25181c71d34a 100644
--- a/games-puzzle/hexamine/Manifest
+++ b/games-puzzle/hexamine/Manifest
@@ -1,5 +1,5 @@
 DIST hexamine-0.2.1.tar.gz 130603 SHA256 8d8b1dfe32474def6ee9840f19a1b6aecfe23f3ad802e4658350d8cf00926405 SHA512 eaf7c110f1c2434c2ea7bc01cc13266ed8e91cbbf0fff4ee8d8a78c549f9fd3f8d877210f574ba1cefad5a6ea230f376aab7d9ced6a4e2f477b6be776332a640 WHIRLPOOL 3b79aba9bce6213d479d62ac0e2a7527c14ec198298c1c830be9d9e5906183c87216ea55d21d503dc51ae456b2728e0a603f5b0d49b2727103b821848d6b591f
-EBUILD hexamine-0.2.1.ebuild 866 SHA256 210ac6a2faff34665cb159cc4622f21d733d7ca95ded0b3fc1db95ba1397103b SHA512 7a94d3d6644381e366f82917ea734d4d90a5abdfad51ed398d40a289a769c2bfd354bcefe5f2b960492e80df432270be6c391a8cfb900b9117a243f0bcd363b9 WHIRLPOOL e512de576b7c65ec5239cb15c44941de7d29e6c33a9f629f565690a2ebab0becf8f03473e610a3a0fced1e8958fb8f19c4aed8806b8310b5a7d9b81349334fd6
+EBUILD hexamine-0.2.1.ebuild 868 SHA256 c32addf117d266661b49dfab7adc072c06a0bb034adccf7c9278ee17406a991f SHA512 a9cf88b36adcc4c56986e48b0a999147ce34c8ed8bf31ee1f5bc3ccf8963e509f55b5e5284111789503870db56a7866fe49198addc0104a222e9c6935258a425 WHIRLPOOL cd1aa313e70aae8dc6fe4979ffa2440269aef87765847187053aac14ac89eb1ad217834bd20683a4eb0da546f75248d1986da9aff8cce3c5804f4cc8653a2aa3
 MISC ChangeLog 2547 SHA256 812d6aa301566b705b486a917862751398c029aeb525bc9e5769ced64efdb5a7 SHA512 40ee168c80390c71413e7748391ad2c702511e95bb90673600f957eb8aa7a632f298910bc76e11f27b74bc66f8cb878b7ad8a4faf2df29671d0d023bff776fdd WHIRLPOOL caf5c1304d7a10d382e59b5ce1db8aaf46befbddf28db78ed2c56b33cc2d1d64c664d108c30837153dff3b2f6fe9afb4fa38ffd7b6cc910a9c4c288a5f105095
 MISC ChangeLog-2015 1052 SHA256 da077c5494af1366d76ec5b9617ad50c3a229acf0caa97665c2b8aa634ae2e7a SHA512 39285d057878da107eb27a9cb76bbc904033144f4d91a9559cce5ca0e2304ac713f61227ec90609b7629d019e9c869ff7143bf7fa233bacdbf45361c96606a29 WHIRLPOOL 74f59d043cf512f86c3c9b7b37a5472e2d83e1b78ad299ee3a6c84f815c14d535a03df9fedf3ba4e00151510f60d7f9468ea2597531897569a4e7d87e193f4e7
 MISC metadata.xml 331 SHA256 b64de6433a31b2fd6f6a891685115709bb150e152f40bf1e06edd5569bab007c SHA512 452f03abf92762a26c6492a3823b4fb3957abd627ec039daa73bb90c14079b71f0b79ce5af0548e3290c74275f5bf02ff264655cff6bb72a607e258a32e36bde WHIRLPOOL 630233cad1e214062665b7d3b60f44266f57cbcf2ee2e584c5612a395f74719fd9fc56af8422c3be6c8c4fd5cfeec51d701353dfede6ec3be5316022a8cb9e9e
diff --git a/games-puzzle/hexamine/hexamine-0.2.1.ebuild b/games-puzzle/hexamine/hexamine-0.2.1.ebuild
index e80eb0a10503..0551f1e713ad 100644
--- a/games-puzzle/hexamine/hexamine-0.2.1.ebuild
+++ b/games-puzzle/hexamine/hexamine-0.2.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/hexamine/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="dev-python/pygame
diff --git a/games-puzzle/hoh-bin/Manifest b/games-puzzle/hoh-bin/Manifest
index 3a08d5263ca3..286f8751dec5 100644
--- a/games-puzzle/hoh-bin/Manifest
+++ b/games-puzzle/hoh-bin/Manifest
@@ -1,5 +1,5 @@
 DIST hohlin-101.tar.bz2 14808528 SHA256 72e0e14f28a1245b34455d6c9c1b4715d297e165f6cdf3aa8fc525429b9839ee SHA512 38f5815d9b2356c5d566d8b5b4730e1ed24192dfb5c3fcae9096b4a2c6110de60245b13da6bffc359032165d7fc0681a6adfa3503005c9281807c4734d519c0b WHIRLPOOL 32e0d466c214d9f0d3b97fb1ec8a66bc0d6b499b143743009d7280e1384492539d14e3f7f7d8e1c029bbdd7cb5e515d63368d2c1ad0b3fe79d9e727a2160c32a
-EBUILD hoh-bin-1.01.ebuild 1081 SHA256 4567d6f6925db9f2ee9cd73060b5c48faf310331994613d1a6ea62a9bfc2e10a SHA512 e5da6292a78366e5316170076af5167ec13d46dfb1637ce752a5ddd7d8a2e3baaa662116dab55ae51033cc88b2faf356bcfa4fa540c69eea1d15f546d77510c5 WHIRLPOOL c09597cccfa8eea2ba9de03a7df9f2ea4b54097cedb08aef280a5fddd72860de2a5e82596b2f8913e5d87c1618bf7cf921a95f13577defec9697f70d29b34b5f
+EBUILD hoh-bin-1.01.ebuild 1083 SHA256 679cc110bffde6272036c5642c839b63a4c19308db6644bcdf346290956e87df SHA512 a4bcd813fdfb8b9322e359389b7b1958c889881df7be9e4736e0f556ddb21ef7db664800bc9fbfc17cb7e37a1394eeac99d48f121b95f9e4397dafd0bc4f4e5b WHIRLPOOL df5b4480e68de5f83dcceab492a7c173efb66012261f870a20600cdd4e9f8cd92527b63da35efd82a901df29599aafec2d7e6dbac6bfedea6eebb7e4193dde75
 MISC ChangeLog 2429 SHA256 6c0050d613e87d04349229c391398b4fea24128a1788e3a5dbfb01a086bb1ab2 SHA512 cf5d28e9ddd64236eebcc62b7f61297e2d8b4b79273e3a99f6bfab60637cf997e509a5b43c759b42b95c39ec964cd17f90d1db54833c9447498f0a46ec72e3e5 WHIRLPOOL 2c903d7f6ae92f60fdb3a0f8e009b2386053b30db7af81beee6d05e5b39e65fe25138f9053e68bcc509ddf18926a1dc3bed2404381ea31f7c9bef84f6908cf12
 MISC ChangeLog-2015 1901 SHA256 709035550474e9db88ba96e7cc9a88ad19622f826a7b10f883a2afe8d9b70656 SHA512 abafcc601a34f2c115b4cb929f6a13f8ca9a31f99ebd47216dd5a85ec9704350256f473923e124d5bd00ad5d6d09724e682af70393f46941f20af6e319b751ac WHIRLPOOL 7286685fb66f6beb54cb9a60efe8a5cfdbcee857862c4e4e09e56aeb638a5fa96cbc21985d0c0b31c9abcbfbd8a486b209a5b1f2c2c881f7b1451708dda36955
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-puzzle/hoh-bin/hoh-bin-1.01.ebuild b/games-puzzle/hoh-bin/hoh-bin-1.01.ebuild
index c19c360f68af..ad681b47a18e 100644
--- a/games-puzzle/hoh-bin/hoh-bin-1.01.ebuild
+++ b/games-puzzle/hoh-bin/hoh-bin-1.01.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://retrospec.sgn.net/download.php?id=63\&path=games/hoh/bin/hohlin-
 
 LICENSE="free-noncomm"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 RESTRICT="strip"
 
diff --git a/games-puzzle/icebreaker/Manifest b/games-puzzle/icebreaker/Manifest
index 0a02c9fab003..7a6771a6c65a 100644
--- a/games-puzzle/icebreaker/Manifest
+++ b/games-puzzle/icebreaker/Manifest
@@ -3,7 +3,7 @@ AUX icebreaker-1.9.6-ldflags.patch 870 SHA256 4601d7005773a4800d1ee37e3557ea51ec
 AUX icebreaker-1.9.6-ovfl.patch 695 SHA256 9d592c931bbcc7fd6a8d2df0db935950d87d419bff6564d58613b8f60e892598 SHA512 0875ed515da7f03e49bb7ccaf58c7dfcbd03574c2742e54da248423c0c8bd4257f2d7ce9f2fd3aac6d00336fd23bdb131fdb1a9398e31600f6bddbd23e513c1e WHIRLPOOL eb693f78e947ba2f4ff78fc87508ecc5164115e7198241bee064c22e9519dfa16686598cc0516f18c28db1d6a1f6991463010bd3b9bcf6b667942bf3f913cc93
 AUX icebreaker-1.9.6-parallell-install.patch 1183 SHA256 af211ff2b611b34dcdcb6b9b961b95b0c94fa82cfe98e4b03831c460316709ce SHA512 7eeaa07111ee6443f9ebcb3b0bd55dccb1ed6ca3137df2b5c407dcc696c5946bc7643847d0d347761e4e8311871788cf9120a615da715e602f27af077858cfc7 WHIRLPOOL 0f90e6b9f14345d2ce8e3913adeb4216c79cfa43805a94371ea40cdfbd13912f0ae19049040f49eb82673883dfefa1a4366b21eb086a894d209a1a9c66e1ba74
 DIST icebreaker-1.9.6.tgz 137333 SHA256 e80f3a0c918beeff528ec7e61c04a17019c2afff85f018a04f715f2b401931dc SHA512 c3b085dc42d33757011d6d526016477312c5e1cbab4c5584c1e271a1e43b40d61ad1e7f0c96c8f41348550b2e198b3ee7bca65fbef90125dbfa32544cbdf357b WHIRLPOOL 3616e2cd757c6efc7831dfcbd36cbd1a0ec7b5b1f32022ad7c721e39adde41985c40b7a6529acc60de9b5d8f92d802fe579f5a395d9b1402f6c653929be65698
-EBUILD icebreaker-1.9.6.ebuild 1075 SHA256 3379ccc012dc7c84fb9d6e0d5a54fdb86d7dfd9d7195e6d46b4df05ea1e2b6c0 SHA512 a58ac0714fbd985c65eb2998b7bdb7c1c32857a997ffba4a2e4e3f5c26fc176f6f19f9e57e0199099c714eb684268bd0f3cd2f2fe4a1523f70dddfbc1ce43e02 WHIRLPOOL d72eda1476d8242be16f479615732d0b2b2e371677cc58bad9ed724f544529167da57cf7fec45a224f6757b182c607c1f13f8573ad67ba800742a48ce0537946
+EBUILD icebreaker-1.9.6.ebuild 1077 SHA256 b97ad5b9827942571a66d0cd26384132ff2e713da1f02f6e40520867049a0f5b SHA512 8a6562e7f03886ee3a364c48679a01c930f63d35527c41ad847875bc9d008b9bef6d709622339572fe921d9e81bf6190b18318f6941de1e07ee41415e91df9da WHIRLPOOL d63ad41c8a8b807e874de607c0c8df5d055fdcb1c9b79eed04d5019d061f0e2715cd8087a5577ba95164168110e077257eb742e6bb7513bfccb3f3294ade89b0
 MISC ChangeLog 2766 SHA256 29ac7e7f547dbc5fac8300bc6330e312dda58f64082edcc7f8d892eace13f6b3 SHA512 408795b28a8163eba3367891894f1fd9a5574a9a796ae86114a091157187aee3d2a87a1ed10f1c7e350d30df6a4b838a882979262dc335b9d6169810bf50dd80 WHIRLPOOL aeed03c4bc485a197a84ebceaa98d0a6c2addc4746b8ab9433757f317516aa7d7a26550454735329911b31a3b1d7d4cceec4778744a692692f5b4aefd3c3c7b4
 MISC ChangeLog-2015 3764 SHA256 23fab1127c3fc8c285ca0d1fc269adbd38484594d9ceb7bdddb6b181dfe6e18e SHA512 7c351d9717502652f221fc25f9939ae07d1d57f8c400eb2e7c32e1fddaef89845cb9cb0ec3d234f37c3bd869cf463a96c9851b4965eb91ab7a97f018a8bb4357 WHIRLPOOL 1d023ff1ace9fe47b7909c21b549f27578f9588a06c39324fd87ec55e305d82dcb48185ad4d2acf51e6c6093fcffc8697fec776ad39592ab214b8c53f51774f7
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-puzzle/icebreaker/icebreaker-1.9.6.ebuild b/games-puzzle/icebreaker/icebreaker-1.9.6.ebuild
index 5ea007c9d862..449e0864f626 100644
--- a/games-puzzle/icebreaker/icebreaker-1.9.6.ebuild
+++ b/games-puzzle/icebreaker/icebreaker-1.9.6.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.mattdm.org/${PN}/1.9.x/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="media-libs/libsdl[video]
diff --git a/games-puzzle/jag/Manifest b/games-puzzle/jag/Manifest
index c5d8b75f5a17..cbdae2a14ca6 100644
--- a/games-puzzle/jag/Manifest
+++ b/games-puzzle/jag/Manifest
@@ -1,6 +1,6 @@
 DIST jag-0.3.2-data.zip 6237911 SHA256 d331b8b1ec20068de0f35d7747b3e4eb4567f505568c3d8621884d2ca46b6d22 SHA512 fd8d625d47c12779baf9158475d378a8a09d8c96e48ebf8f8b23e3967db8fe38fada33625ac155550ec72f96e259b229311652e09001bb146a326ee202f2e32f WHIRLPOOL d4dd8734a1ea61a1a59514208493c07ae8c7cb9a1d2242ff571221e9d547d8a7e8cbe451dc4f1a9b441a5e213e69e892c1d2fa84532759bc0e7c5736ba36087a
 DIST jag-0.3.2-src.zip 995053 SHA256 0b1fc46373d7b70bdd359ca93e553bc244a49721fa1a18d5225c5e887b54ca44 SHA512 96379500aabb282324c7308304359412faa503ca2a62a22951313b612f7d065378ba3fa880ff0b2cb42ebd92ddbce22f8e3c088fc6a5361462beaf8b21aed8dc WHIRLPOOL cbf45eacd3b97f2808cc74ca32479ef9c08e2662552ab21ad3dfa54538a7bd723e636ad3e6189da0278a18e4765142f0319ca94be40d3a7bbae3859e67b20385
-EBUILD jag-0.3.2.ebuild 1289 SHA256 e444c9d7b2a4ecb8f57751d30edbba09ed82bf22065e88cca03046941e6b7ca6 SHA512 520178ccf37ffb8abe4b6eecae9d3210d89a39159fad13d64c34c6f130d3a6dd346cd660d28a43c96725a32ed7f2617d0b8c3a1297d1b168e46b107b0ae09975 WHIRLPOOL 339c0a8571dd05388f408a5766ca1458022711d826d2c99a539fa8888b5b8cdc6d4a16aac889dcf510381f2adb1d9fd829347a98e521899127e656a882985823
+EBUILD jag-0.3.2.ebuild 1291 SHA256 76463298713f021d70060ba01774cf4536228308a46841e1e1d29022ac983215 SHA512 ce4309c4d2961e760a59a2a98e7cf489b40626910a850c6d562fe6c573f14ddbc3eefad2f93fe85f63d5bce564faf1782292746fd42efee59bb1fa04648711a6 WHIRLPOOL 18de9c5088815dd715791909535a54526fdfbe01ef0ecb831f0412c621dde91f37bedf1438c42201d6c4b7157ceb23c21d177853c4cc078e1114ed25dec36bc5
 MISC ChangeLog 2419 SHA256 c389cf01d368654cda06631448b5eca465a1979932cd1e4e84606c0b5126e8f8 SHA512 edd14799fdd7cfebd33751520b32697870482004261e276cdf3da408d11f3293710962a8204dcaf08787b6a72f1c208e61aa092c63bdb249e761556cfebd40b1 WHIRLPOOL 63293e3dae8982b9d64d3cfbce84214f10daa9dd8c5e015c7dd841b1e5ffa6e879e54cc4aecf50456ecce01452ea836443350e098c58a8e05db4606832947d35
 MISC ChangeLog-2015 2685 SHA256 0440d80bdae295d820d78583ac51719f03f86b1e5ea9830ab84efa1444a8575a SHA512 0dd28199333b287a3396547af0216090a1985f41b119713dd0e7d246fe7f9909a5fce4d7bea99109324b9766d395320ebf0bb1b621a273ad70bcecf1eaa309c6 WHIRLPOOL 4bb52b4be932ab448567b1153b9b244aaf4a493a1ea588e87b561fc66383b82fd33d71cc4b338f2c7738d8e27d1a2c1913d5dd78e32c6a74c6e3737d18ed8bab
 MISC metadata.xml 326 SHA256 857a436178a07cd5a6d34991dd030476296132554f609c589e2845d4baf5ebaa SHA512 ab91fc711c2b092c6d15e4bdb2ef60ce1b842f0000cf31c05eb2668706a11f3018aa91475504c15ddbaa2612a316c9caf5d0f237f451bdb5a8411aaeae023d21 WHIRLPOOL 59a0b60c3d80350425233681ed3bb047b6935470fa923b62a5847e8e9e7f194e529ea37a8c1971a4eb702e2cd6234d0e6a19929b39f8c26fc6dd62907e67c272
diff --git a/games-puzzle/jag/jag-0.3.2.ebuild b/games-puzzle/jag/jag-0.3.2.ebuild
index 83cb6b370c23..e4eff536e414 100644
--- a/games-puzzle/jag/jag-0.3.2.ebuild
+++ b/games-puzzle/jag/jag-0.3.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://jag.xlabsoft.com/files/${P}-src.zip
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="editor"
 
 RDEPEND="dev-qt/qtcore:4
diff --git a/games-puzzle/jools/Manifest b/games-puzzle/jools/Manifest
index 827abb7c5f8b..c73910120c55 100644
--- a/games-puzzle/jools/Manifest
+++ b/games-puzzle/jools/Manifest
@@ -1,6 +1,6 @@
 DIST jools-0.20.tar.gz 1710143 SHA256 50f5c23491e45b4658baecdb774ba071000f4c9a1164b77c95cbfe711f3e36c8 SHA512 11eadceb8208a72846a9e16a2dae0a1b1d7f8995d5ff2487ee03dd62811f3a232c0d08dc044c351f44c120e6e75eba11df1a727a9d5c6c57ce5e2ef8ee4d0986 WHIRLPOOL 7c84e67e4c1b1ced837f8295bd8333bf511f526494d0cf1d9f75f97bc675955aa91aa5f49ef452fc45e5f596fc22d904b90113409f66877c0f2140f730ff2fd1
 DIST jools-musicpack-1.0.tar.gz 4447501 SHA256 baf3bd24a65508868b13b6224a0661dc4b8616eb8d70fab04a9e732d32983c84 SHA512 1773beb8cd7df756cb4f7ba55729a6dfa995ca860f3381e2fed3884f42227d19955e13f8be9b2f6f64d4d86e452be9fe876963e24c85cd2c3cc42df62804b9c2 WHIRLPOOL 0b3cfc8c115919c375132150a5bb5fd861d592f8ae6de75e9fe00b835ebdbcd4988a8187499bc50049931b2a2651113f24de84ff240082961197a6dd9328cdae
-EBUILD jools-0.20-r2.ebuild 1307 SHA256 c61b1b4907c361e2661cac42acd5989bedfc1d821ecad537ff95b4dcd4cab6e8 SHA512 47fd33bf95c2d7e5f259e300e07de49e0b0fe507c5d1986ad93b8e3dfc7005366462900a3a92f9178bda901f8a21c118ef0804cb8f1bc28514d57c86ab3f3fb0 WHIRLPOOL 86835a7a3827fdb68c5d2f023c92808123cb75b1e7dce4fcfcfe97b74e002a45d77911f8ac158e069c9ad4527d2aac9a655605155f6e6fb06fc545bbc4c026e0
+EBUILD jools-0.20-r2.ebuild 1309 SHA256 7aaaf106da6b3346ae39288e9f51ceacb2efae8ba40e3233f7a1e63dda7eadf4 SHA512 fcfb7e222c21234dca729ee5db4693178864bca6dda053acc214833ad229e5c1159d94cf24f2180269f29815fe563ccb6d5f51738df9c8984967131c9f6f9e01 WHIRLPOOL 0b51926df2cfcb6aaedcd5baecdf28ac312561ede272592853414784b28bbd2148c150271e99509df41ff3e087b4b4c9fb252784281ca195be282abcad859324
 MISC ChangeLog 2429 SHA256 c7579692656a32c6a630e670dc57a6447e538c8834ca6cf1c72b1187b40d6ca2 SHA512 669aec22bd9eb9f73556cf6b21c0dc418074831bc576cad108b1db3a1389ac41e3d60b3bc341f0d94062abd49521092ff69a2879df1cc440e10131e726d84f81 WHIRLPOOL b6d225d763e1bce0d1d6b65c6a4abb04044ff8c066e61523add99d9bbcfb8c99668260e55c3db34561289cff1848f3cf7eec8f7a7d84529b86202b6ef9117a51
 MISC ChangeLog-2015 2111 SHA256 75b74131f2bc96247612ea1a93215ad8cce614ebf397cdfc3a221d31ae105d7d SHA512 a840de08cef12de2418bfadf1a42946a07bb8565f8f3648e9a6920e545f8e8fde15c39d6b2014dc9b634a08fc9bd491a182b1cd40a36032414870d6dd22c40e9 WHIRLPOOL df43bf4696bf65ef651e7b8e01065d1a51dc927ed3f825d96ab694f79f90b1b1a60d3a18b878a587c09caa012102302d46fae70c3da5a0f29f710466c7d45ae8
 MISC metadata.xml 671 SHA256 0a738f5b0d9a72535ea635741fd0b98a43c6a294e292e3e9f338e10d338e99a7 SHA512 928c0217e8ef9222cee84694ef0da21cb7fa50bc190361979c4eb44e01081b49e805e441128baddfb13269b7a8f02f991cc4cb08b253cc1a475859d393f786c6 WHIRLPOOL 0a6c60530906d20c2bf0cd25ee3568424f9019cd5fd8e98b86bc757e9ea7d9eec850575e2ee11a358f3bfc7ab9d3ebb9aa444dcf53ca43042d8ca5fe3efae6ab
diff --git a/games-puzzle/jools/jools-0.20-r2.ebuild b/games-puzzle/jools/jools-0.20-r2.ebuild
index f761986f112a..21bb3113dafd 100644
--- a/games-puzzle/jools/jools-0.20-r2.ebuild
+++ b/games-puzzle/jools/jools-0.20-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://pessimization.com/software/jools/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="dev-python/pygame[${PYTHON_USEDEP}]
diff --git a/games-puzzle/larry/Manifest b/games-puzzle/larry/Manifest
index 870dd69fedee..1c335703f99a 100644
--- a/games-puzzle/larry/Manifest
+++ b/games-puzzle/larry/Manifest
@@ -1,6 +1,6 @@
 AUX larry-wrapper 131 SHA256 623e7c97bed6c2ece047fa57d120c4542acb9cb50f7d914ab158de6f3b3a0dcd SHA512 d7260aea5f34994355453d40cde2a2e71610517abdc2a6b76a2f78ed8cc0a0ad06a8eed4e5a1419ae7daf36f6fbcb0252d999f6f0625ca3b9ae7a234e43afa0c WHIRLPOOL 617ab745fea053ab31cf4c5d9248138f02d84a10dcf839fa6ec8b344da4e2efcf60354db00128159e1d070f10af8240196f5263ed4ec0a58c37d7cd4d2f81b7f
 DIST LarryReloadedLinux.tar.gz 767543995 SHA256 8fe697796e8a62f52105490da6768c35a3d5f76a5aafe02a9d10fb387186e703 SHA512 81ad52ba562eb890d2f001c3e4174222b183064103da3c4f2ddcb4cbf3ad432892b35aeb6b4e253ffc972431f6c673c149bb4a80d742a05c20bec803feaaa23a WHIRLPOOL 9d75e5b28091a12e064247ea71cc6d3ddb5132c974b65f7cd2ddcd167e3a24bbf30024b0d7777b4f7770c2199e28e5959cc033b7a052fbb14ea422c43cbfb142
-EBUILD larry-1-r1.ebuild 1325 SHA256 5d47fdc56b692652064455650995ce5fa9849b3fdce9499d2672bad546812864 SHA512 fb11a7d6d28764a21eb34f8359c76d6b4e45f4d9c9b2bde0e614897ed546dedd439d105484a382333ff42dff46decdf1a44fd2f363e26906234c7e6595a84982 WHIRLPOOL 21cd2b430655678a64d239f8d4da19a927996167fd3be5f3d86c4f248a8e84246c2f4bdfb79c5a20eaab6ab1abe59863ee123dfb6d7e03287cd9534d30098c56
+EBUILD larry-1-r1.ebuild 1327 SHA256 6c2148d46cb1fa00112e8ab3e51e044b211a5fe31ebce40ad33079da752f1024 SHA512 6567765a4504c642f04330a3cd66b71eae8374ef0effe5fa7ab314d0f4e0147148c720a6261428cfa9ee093eaf5483a842efd9b8098cd841410ab22452dc76bf WHIRLPOOL 2bc95229e2e374c49337c755a81186f7b91b8a1229c96484967c85b0169d7332a8bd49a889c02e903249113b87cb968852d24e5ce86a2d87586c72f1c4df06b3
 MISC ChangeLog 2445 SHA256 aaa2aa0e37b8ff2e407ad3cac868fa6a40676692935af116bc6b8affe6d8d59c SHA512 8078c45b9dc907f05fead9d9c35f0c97a4cb89d7c683ad29f6d00f5b4cdde02acd29e257d5402845e83f5abb4874b58be2985c4b69f32e3d24a046e3bf322471 WHIRLPOOL 13cc47e523ab5f0bbdc58e8e82a7456922a21336c61d46e3854813307e30827a133171fbbbb3c3c3e9dd7de5cad60cd84fd6645df38a68b6f8ba7b71facb167a
 MISC ChangeLog-2015 980 SHA256 2970edd41cee7862e1b7c12020d331c520868b2b2c7b2f224bc0822f90fd61d1 SHA512 f0d2f444128980bf1a10998e071be97b6b110c1572ee77fa2be35ca8cc9816812c328533a47c344233b20e84d970c07805882233813d614b38e7cad30478d35c WHIRLPOOL ae814f0fd74cfe54d635e99d74a534ad7de9df6b13ec27d8b699abdc3e4a943a8dc73e281a26462e4989ca4f51da4877e8db8195ad6df1710f732101d72acbc7
 MISC metadata.xml 253 SHA256 2c95b2eb99144a3b66de17be35eebcf65e5a152a2ec2f176165bb9cd78e5394e SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254 WHIRLPOOL fd044f0a960e57257f4a15ab16f066bbfe9983e60cd5fc072e631efc7027306c612a01d7fbbf57eb08d957487a7ce1961250194653d6ed87ee23f20d631ef854
diff --git a/games-puzzle/larry/larry-1-r1.ebuild b/games-puzzle/larry/larry-1-r1.ebuild
index 95bdd1f2aed5..ce80803c9680 100644
--- a/games-puzzle/larry/larry-1-r1.ebuild
+++ b/games-puzzle/larry/larry-1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="LarryReloadedLinux.tar.gz"
 
 LICENSE="all-rights-reserved"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 RESTRICT="bindist fetch splitdebug"
 
diff --git a/games-puzzle/lmarbles/Manifest b/games-puzzle/lmarbles/Manifest
index f6f9c6f54bb6..e0270a61139d 100644
--- a/games-puzzle/lmarbles/Manifest
+++ b/games-puzzle/lmarbles/Manifest
@@ -1,6 +1,6 @@
 AUX lmarbles-1.0.8-gentoo.patch 560 SHA256 931ff466ea38c8042e1ab4f11cc5d17904f34c5ed8271b25fcb591792001b20d SHA512 158a253d346fc5bec9eb8ecdd8541df04fdd9946bc2f59d7404e5ae08415a161079f38697ecfde2b22065708c8704b2fd9232f13872c394ab8274063166d0d41 WHIRLPOOL 8e91c32a7d1af293f4ed214d5430ee69a3fb227e785c93b217cd9d3f2596616a0ef85b389a37f5b278b1c9fbcc564fad89384c0323e7ce7c9ad3eaf7ce200b6c
 DIST lmarbles-1.0.8.tar.gz 914238 SHA256 0e5a16a0116d325589b28f3555ced6a0b486f0fd7632cd3d98bee5cddf213e83 SHA512 d765b669a1b0039a0af8b28ede8209e9736c2f967b21d9f8372d1fc5475d49a766bef297615bff090532ade41fe44e084a458227b443566a54afebc3e989b57a WHIRLPOOL 030942eb4d8dc0c4002fcf597832c27457f1debdd059b299bc9fc41a74896eea0a066d8062c4e344cf327637796be5e77e43363170a6e7a8d33a429cffdcaf1f
-EBUILD lmarbles-1.0.8.ebuild 712 SHA256 85330663527f7538ec42f040641f0dc770edc812c34b23713915db8f570d81fd SHA512 41b15cd9deaa81f3e61829c29cf9101d73f4fe2fdf2336e4ceaca7138dcb55b4ea86c1af7d4ad2120a5a7c860c8c10be09ca8a0bd65cbd81d80e3e05251498f2 WHIRLPOOL 798aaf0d98db98b59888c7d25d26271403f1e78e5be2ca7f656bbe5a218a78e7eb909e6751018573b801dbe294d7c9dd7b1903ea98d30e3ebeb3e4f6b5108c1f
+EBUILD lmarbles-1.0.8.ebuild 714 SHA256 176acf9f2a6350c7072a6de4045f40aea3c2d70e3f52f423818eab535b9c9e7b SHA512 172643957b074d7b285b69c2e477493584e9fb2b57542f02a2d0accd32083c596dd746031b8b78302dec1d266c7bc799973c52f775a230e7fa7099d417bf1d7c WHIRLPOOL f22f5058bf18acb1903fe2f1363e59a4b213b5aae24047995dc04c110e000721308377574b739e729b6fb7b45c166571ed71e1b0197e53a0071dc7a8ccfb335a
 MISC ChangeLog 2470 SHA256 d0e6dbae996a4ec24da23f04b8ca121af06a35ee97625deab3cd4422aa6a579d SHA512 ae5ca0353214b78dcc0ad1626ca7686eb6cae8d1a733602739aa77d44950cfac4b972fc8154257d2b03b12a3e353b5053fa558cc73abf5b0aa125a919105a0ed WHIRLPOOL 1e285ac0cdf4f668e0c75b85d52c68569ee48a39d8f2613ef68320cb8cdba541a9fa56b94294a57f5839dfbc7a597f15ce1b9bb89fea15b36e6a75b43fcca9b5
 MISC ChangeLog-2015 1419 SHA256 5ccf26ef058ae3cbe157d33963f6872ca4ce25a5dd964c4f702c45c0975ccb6d SHA512 415f6620dbc545061515451f3dcb74cd8751018f717933b1ae7ddf97a64f71f514de54fd81abca35d10d81c6a0e90dc047beacb527982e8c29ff12c8fa4ca63f WHIRLPOOL 5179b4afe9f52403c44965640992c789b5d4988bf1ae1544ca8b93942a8b9902556d47e3902a6fef8a5146cec30d9ea357ad46f13d16e56db66bfec02415b7ae
 MISC metadata.xml 329 SHA256 677366ad46dc60999490d23fa85e7d6f2e04596caac98deb8a04d1dc224c7932 SHA512 2439299362958450ac88f39ba8332cb84d42694d471f79cf8a6b9d38ecc96fa629b91530dee7c50aa23fab5e5a0155cb92cb3a8131a1b69e9375f114da86b463 WHIRLPOOL 65e6d198fb2ebd6dfc0038bc37d6f11c5ae44e60f5db9b641d40bf2248abf21e7e6e7bacc2109a42c16be0e092ba37708baa53b8c166efff2fff4db8e878f105
diff --git a/games-puzzle/lmarbles/lmarbles-1.0.8.ebuild b/games-puzzle/lmarbles/lmarbles-1.0.8.ebuild
index b17c5eb51462..59381278471a 100644
--- a/games-puzzle/lmarbles/lmarbles-1.0.8.ebuild
+++ b/games-puzzle/lmarbles/lmarbles-1.0.8.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/lgames/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="media-libs/libsdl[video]
diff --git a/games-puzzle/lpairs/Manifest b/games-puzzle/lpairs/Manifest
index 87428fed0789..c6f76a54ed33 100644
--- a/games-puzzle/lpairs/Manifest
+++ b/games-puzzle/lpairs/Manifest
@@ -1,5 +1,5 @@
 DIST lpairs-1.0.4.tar.gz 536625 SHA256 350237a51a5de6b2a557af687b4f16678056a0e8d8d96d7e395f6629481462c5 SHA512 637f9782c1c1faee3fe0d02adeeb7ea70704f1b625922e1ba086cd03e9a6cf1d61a082eff4753a2ec8be5fc7041bd029f193adf847a39e773e4eedd9eafb2b97 WHIRLPOOL 36d57eb4100a03fdd73e770759330799a55973860b7213f8b4f1847d546e54197071dc064171c9f15c936d71c83b35aa9ae49c5b68ad019741d8964be1735a47
-EBUILD lpairs-1.0.4.ebuild 968 SHA256 eefd0e31ca00dfa5e7642db4785bcc34ae37365121f17fa9fff5c54254c2e7fc SHA512 4f9db43853960336fd9c966b178a0d718dbb9bb8f83149f7cce3e64053206d3690ded31ac83d34add56a4e8800f74c388c400f1291fc742ee4bbb223effcbb9c WHIRLPOOL a2c80340403f9c6776b730af10ff31e8bfc09e88bd5408942973fa0cc50d63f8b3c145a30e8f949089f570e4d38cf7bb92f4ac84190d9cce9c037abbeb1747a7
+EBUILD lpairs-1.0.4.ebuild 970 SHA256 92485494e2abdde4116ed7f5f89b61c2721038d72df1e12c88c5f8333f6574fb SHA512 06aaa08867747febf449a5b660af6742a0ef7c2691fec15f277bf4e80ef96211ec8b6f3d579168c50199d295bbf1963f3d7eabce72cb34ad8776f1ed1bddd0c5 WHIRLPOOL 739299532620231a0dc3ad6eb73588bf37e23f1ca8a4a34b1ff29c80dbbbfdf234bd09c14c7e8bb4290e0b7bf07df274004ed6b9ae53f97e354cbcda42596971
 MISC ChangeLog 2622 SHA256 7e42af1ff9d18f9615d8b8efa6f6df2f3ff0925789c30e94d43f46b0966f4108 SHA512 7e65a13be928fb5a9c9679243823133b1d518e774e40e9b6d6542d53c4291afe566c77ee184e3daded7ddd71fb70c3b2aef2c974cc4e19f0c0e0390dc880b3c7 WHIRLPOOL 54e7beb2d7f285ff59448a92efaf31abd21e727826b3a5e1a5457c594b1b665a14786f260d31878e6dae317aa27ad0210a7f2f4de3b44118b4dc8cfe7ce836d1
 MISC ChangeLog-2015 2215 SHA256 000d152036684d073691ad594cb7802038cdee2a34839fe6e794849f13b4a589 SHA512 5b4c4be2a8cc916e9dd3e7723d142fe3f766836df833aae3c090708bf9d1343a0c62837a0df11838f1cb37f8175af30080d034ede8778508694c12d1fa85c4a0 WHIRLPOOL 2d2566340b4ce3f0af3983b2c8d109125da7019cd2cdc7f4c22861d9c6a41789e082bebbc209a126ffcaabcc82576844e63d172f3542a6c260eb9999a6b3361b
 MISC metadata.xml 329 SHA256 677366ad46dc60999490d23fa85e7d6f2e04596caac98deb8a04d1dc224c7932 SHA512 2439299362958450ac88f39ba8332cb84d42694d471f79cf8a6b9d38ecc96fa629b91530dee7c50aa23fab5e5a0155cb92cb3a8131a1b69e9375f114da86b463 WHIRLPOOL 65e6d198fb2ebd6dfc0038bc37d6f11c5ae44e60f5db9b641d40bf2248abf21e7e6e7bacc2109a42c16be0e092ba37708baa53b8c166efff2fff4db8e878f105
diff --git a/games-puzzle/lpairs/lpairs-1.0.4.ebuild b/games-puzzle/lpairs/lpairs-1.0.4.ebuild
index f5169a3488fc..054dd29a9f4a 100644
--- a/games-puzzle/lpairs/lpairs-1.0.4.ebuild
+++ b/games-puzzle/lpairs/lpairs-1.0.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/lgames/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="nls sound"
 
 RDEPEND="media-libs/libsdl[sound?,video]
diff --git a/games-puzzle/ltris/Manifest b/games-puzzle/ltris/Manifest
index a380fe753bff..57012c669a0c 100644
--- a/games-puzzle/ltris/Manifest
+++ b/games-puzzle/ltris/Manifest
@@ -1,6 +1,6 @@
 AUX ltris-1.0.19-gentoo.patch 1769 SHA256 0dcab40caeb7b039728c54a5c1f2c9605be9fa4d17f4a35637d173bcf7cf9594 SHA512 c0040258b95252efba67cc9da7e598ee2c2cb92b97702b14487d6b0c796bf25022af05350459540a95caf84249b95245d80d5da4be09bff6670f15ca754505a6 WHIRLPOOL 680d5e23a8f0cd5d35780eb1cefc60b831c7707ca32c79964dfb97f878474d037d1bbd1cbee9e4f199f1b964c68509107044476bb2bf2656cd7e7462f559165c
 DIST ltris-1.0.19.tar.gz 883543 SHA256 8f6a9e7719d22004aee153db29ffd9ca41c7a6cd87fc791591994eecc2e625a1 SHA512 ab43b3d8f04ab40016be5b5c414f8679bee4f5f344ef9cab52c3628d48017458b84b0fbc0bcaecdfab43853a1ef628ee1cabf3a1373ea108650d4e76015881c5 WHIRLPOOL 9f9b12b5374a686affdf0243cad0220332150655202835f4a254a6febfcd3aab76d8f2331f832e8e891d4616f55190bb0b77f713dfe7ec96cf4df6a56084c003
-EBUILD ltris-1.0.19.ebuild 832 SHA256 fb6cbff8a8bec15a4e5132c95f51f5332ac097ea16f3c1d112de5f48c8f3ceba SHA512 4b16808c1ffe0ea654ee35d48d27b4bdb290ce4d04adc5555b85ada2724b347bb4ff7681edc015f77f505dd7fd71279c28e4a5eac1f3b1b8ebb5a8ea9c667896 WHIRLPOOL 7c4d4b109ef644e6cd1bbe8b92511630a088d2aa2e24814a0cb5c2fccbfaba5b41f29472aea7b7f0fcc92e7396e34ddbc574ecbc0656afe462f4eca10af5f13d
+EBUILD ltris-1.0.19.ebuild 834 SHA256 5b6374a3f77dc21a7455ba6e16ba56193e854a55e14bbe15ff25a267f0bec58c SHA512 e689ea089f26eb86a5633651e8f73f740d569dfe25540e39f6f1a005fe545231548d95b0de0df3d78a6ec12c72f3058872fc681ba00dcc5ec4966249d0439b0e WHIRLPOOL 38cfab805e7fbdf662e289a46283820034a6e4a14f1df8719f10e9677ce06b11abc58deb4ed01a0af73c2e097b2759a4864d02e49788ff6a39ac9462a920488b
 MISC ChangeLog 2605 SHA256 6b078c4ce72f1d9013ec2c20b35b751df0f264b7011f29a4f370010fd1698df9 SHA512 3c802c0de3b3e80769366395e9f3f96ba8352e7f38a4f3597793e8d2cd5698ea3687926715c133aa6cac2c99a67fdf6a59e89ea7c6b620e135af11a098454363 WHIRLPOOL 98d038618eb71fb1858f2a27baa20e302f8818d774f393c410cd8bed264bc8ddb0b97561fd5215c9ff7f6f8b3ebada6c071f72dbe1d938f0fe643497eb9dd777
 MISC ChangeLog-2015 7407 SHA256 4ee71f6f936da5b184d5b7232b233b42e2a600e3c03bfe7a82a940c6a728ebdb SHA512 f8b584b96d1ee2e82257389587403b2bf9fd43d8f5ec9d102cdea399240ac5b2cc66c3ba88e1667cb2aa1a2e40631eeca5e6a179ca9c784425f446eaeb0ad50a WHIRLPOOL 90fd7d8410750f74729b97c9824ea42e0ad31b5cc92b1484f7d20db5fbea3bebf381be3993dd17b5c2d313d3098a9bb9345121e7a5530f3bd1b5f455bcaa21f2
 MISC metadata.xml 329 SHA256 677366ad46dc60999490d23fa85e7d6f2e04596caac98deb8a04d1dc224c7932 SHA512 2439299362958450ac88f39ba8332cb84d42694d471f79cf8a6b9d38ecc96fa629b91530dee7c50aa23fab5e5a0155cb92cb3a8131a1b69e9375f114da86b463 WHIRLPOOL 65e6d198fb2ebd6dfc0038bc37d6f11c5ae44e60f5db9b641d40bf2248abf21e7e6e7bacc2109a42c16be0e092ba37708baa53b8c166efff2fff4db8e878f105
diff --git a/games-puzzle/ltris/ltris-1.0.19.ebuild b/games-puzzle/ltris/ltris-1.0.19.ebuild
index c25d935e5457..439782b6b496 100644
--- a/games-puzzle/ltris/ltris-1.0.19.ebuild
+++ b/games-puzzle/ltris/ltris-1.0.19.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/lgames/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="nls"
 
 RDEPEND="media-libs/libsdl[video]
diff --git a/games-puzzle/magiccube4d/Manifest b/games-puzzle/magiccube4d/Manifest
index 7aea3a6fb38d..1db22c9c0bc2 100644
--- a/games-puzzle/magiccube4d/Manifest
+++ b/games-puzzle/magiccube4d/Manifest
@@ -3,7 +3,7 @@ AUX magiccube4d-2.2-gcc41.patch 877 SHA256 b69cc3f95795e5c7c6885bf69ffa384695fe0
 AUX magiccube4d-2.2-ldflags.patch 497 SHA256 8dd2cb5db7b8ff9156f72bfba490474cea980b45df5ebb203b481bb114da0545 SHA512 d1dd876b8fd4a1db40cc534f828370fce679e2db666409af9923cf6e37ff08c42def867b06cf712a2d4ac4b269a0e4a4f07f6abfd797b85680d902f1f4a67e2c WHIRLPOOL 267940c444d27f53418132690c3bf0603bb9135d86bc6c88a01a7729fe876c5fa86ea2c5a93af5e76f2e36c53aa028beb00d6172e0ea20e38f8e54d69b3e090e
 AUX magiccube4d-EventHandler.patch 425 SHA256 6bfdc4a34d560624da46f437f66f857c259dc8cf945feb0d989f4fc3a145a98b SHA512 940ef99a94c1cea687196d918597785d813df30c6e15217a5a02a97cbb8b94ea67a60ed612a5974a8e2635f5b562c34acaee316d1790297166bf70112ee5db70 WHIRLPOOL a48f42e4eed583a9d952a90db74f99964eb90f64288032bfecf5338436560c764c6c0fc4b5a495e2bd2ff196c6cb284eb2d5131157005dc920a7dccded5a23eb
 DIST mc4d-src-2_2.tgz 144645 SHA256 79c7b62bbe7a132a2eacf58f92f80113ea63171d3eea59755bc828a1aa9daa44 SHA512 19491460bada93b4ee2010004128279cb88ab866a5a8c791080d59fa86e5bacf966d7dab0c9b3074e94b77611ae341480d19b384079e83df549ef25e592b12a6 WHIRLPOOL 9413fc099375eaf1c5bfdba15e9836125c37275cf0be47560b8d4b99c7a3008393787e2037d91b8b4f8075cf7c3c408a84c111f43d3378f2bd780e8ee35137dc
-EBUILD magiccube4d-2.2.ebuild 877 SHA256 ae4a46bd28bf25b3dde93ee3c39f8c0552b944e2e380d1e411ba1709481daea0 SHA512 b4efd153f71082fbae9a968da5c0d8daf8c9bb9dc8c45fb6219564573336fccd3d70f69d344b0003802a74a4e45aed158eeeb90353ed90f8aed2235d25dcc6c3 WHIRLPOOL 3bc6126e827914f10eb07988618e75e2aaacaf5b4f7e8d11a2e0b32498d370d50973a1d1dd60cc07a85cb3a1b24dd133b4d9dc8d65deb0c51d59b1fbb265e2de
+EBUILD magiccube4d-2.2.ebuild 879 SHA256 da80c36411879d726b6763dad214b2af14f46728ba902f9a11ee4a80cbbc35e4 SHA512 074a222750241fa6f5ebbb80bae93e4329e45c99caea926522877c1499d7b0cb2572f80f3808f3a23125be9422c3f05d24d9aff0ecfc22724b056f3f3f45dd1a WHIRLPOOL a5f0f3a558bcbdd085e58b7549a7436ccb913c69e6ffe7aac891dfce0a0854300371bc10e9ec5e2fe56a31d4781fbb8076b4b8d207236a5d962560add780d6d0
 MISC ChangeLog 2596 SHA256 b72abd6f114e1aae290cfb11d794c1d808a09101dce31ee68e8fc1eb91a17899 SHA512 42a6e9a0e6dabd1f4d5ba6fb305005f55acc5b305ab696e14834f4e7f4637a2c8296ee4d96444c97408e4726940a5e4907232b0544da0791f6d50bdd00b3681a WHIRLPOOL 0933b4a61cb36b354645b586c0ab7b397926af837142bf962a462cdf65d6eb4ec5570a1e0c8125c1eb5b478a20a8bd4fa7701c9e1a593d1016cd013e4ec7dde5
 MISC ChangeLog-2015 1656 SHA256 56d437ee66c10c088a3399aaa95a63feeb87c240334acd25e56e481cf09337d7 SHA512 42b09e20effc30a4e995a734b7273231a3eae9ac4296c42c2a417086d4eb76c6b420e2295720aecb29d7f2d848ab95f904d2814ecf1342a3e4c4a94c68a559b7 WHIRLPOOL a8e5de679aace948d22f48fc912a14ac60c041fdb1ea37c78674c3bb8079972e42042cdfddfac22fd600ae0b1c3ae75e668c8c1e33ac4ffe3512fd40ad5760fc
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-puzzle/magiccube4d/magiccube4d-2.2.ebuild b/games-puzzle/magiccube4d/magiccube4d-2.2.ebuild
index 0c262918fd47..7d4287d447bd 100644
--- a/games-puzzle/magiccube4d/magiccube4d-2.2.ebuild
+++ b/games-puzzle/magiccube4d/magiccube4d-2.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.superliminal.com/cube/mc4d-src-${MY_PV}.tgz"
 
 LICENSE="free-noncomm"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="x11-libs/libXaw"
diff --git a/games-puzzle/meandmyshadow/Manifest b/games-puzzle/meandmyshadow/Manifest
index 03e5acfedfcc..37b10eff559c 100644
--- a/games-puzzle/meandmyshadow/Manifest
+++ b/games-puzzle/meandmyshadow/Manifest
@@ -1,6 +1,6 @@
 AUX meandmyshadow-0.4-cmake.patch 513 SHA256 a06b3ad0726ab6b9d6635e3aedadf98922f84d694903fcb4aa9eb0d07052dc54 SHA512 e81037c98f55bebe587f878ff1f5f57c6c5558f8305f5e2cd50db0bbb5634bde418c5254f43051b07b0017b380b2144103eae8ae4fcdc3c780ce2b3134e3f538 WHIRLPOOL 77c7dae2a3049c8a3051e70264ed0f9280f127f38c0b449e0ef481d4df5ee45937cb0955843ba6f43f2f112727ac978e3ac498c29dd0522d9631ae597d3654a6
 DIST meandmyshadow-0.4-src.tar.gz 16962805 SHA256 cd20a7637499f70ac9ed0ff16a506cd6a21557c4b3643b7891fa8a25863eebb6 SHA512 945f096fdc2df58b29f91314cd88953d897bbdbd094d8092d6712d33f7dbacadd298ca797e678ebad08ca579ed67a7b9d664e1fa202753e687a021935032a92b WHIRLPOOL 5dbcaf0d3bfc9cd20b9c6d2f226035ac445b536bd4d0117966c53921d357c34816520bd80b3fefb4cb110861fab065554f9b49c689e25a8c0bb5d66a1af4968b
-EBUILD meandmyshadow-0.4.ebuild 1439 SHA256 52f6be4783ad53f246c715bb203b3c886775ebb91753e11a47c6240e46cda3b7 SHA512 025f666b1abe91fd0a18546f86e9a52ae97ddc6b7c11a384915e277c3dbb8c442dea35317e72c06e9d8bd1ea128d5a91d1c01e09e74059fadf6525d4b4c8c5e4 WHIRLPOOL 256395450fbd5de192fc379763908f53f180accad0c406f086fa93f58a4669b199e66005387faa090119a05d5b51444efe8f131e0782a7aa3b122a0e0144e3c1
+EBUILD meandmyshadow-0.4.ebuild 1441 SHA256 fcf0401c167cdcd2c729d8840be97de8d17a01d8dd962053218300ec9dbfc91e SHA512 07c4c69ce6549dcb5bcd45f9f308e4b64fceaa3c7924fc2bd20b5b526db6ed4dfa9a08094aeefbd3221e759e4c1738342275b1d413ac2058bdf79f6b753ee426 WHIRLPOOL 51691856c5a14a6e9df6ba1e96b94e3162b8619066016597b04dd45c0715d23adc05df55e3ec65fa8948f3a0b39ebe23a49a060d38146ee11f4893f63627f0d9
 MISC ChangeLog 2791 SHA256 9e91ef36b1db41db7bf00e701b31d6e38be75f0f3ad3f193c7cedd2d52332fbe SHA512 cb839c3a7261270ab8297e38e7a745ddb7d8521b80d646061464eca2e07a806a356f400d25457d32c4c1de17707dbd51b78de6cce67ffc6d0f17b73bb4f65300 WHIRLPOOL cf76cb6c0405841bfddfd8a8748827a09fb31d30c8e2a9b330049f052e23d832614dddc894638f91579298dcb561a5c49a7d0217189520bca055e37f7f69aacd
 MISC ChangeLog-2015 1998 SHA256 918a7fb3180b6f6df165ed63f80f5101609e0f9fe7904d04a98093b42ee2ab01 SHA512 8d0b4c67291a96e4dd7f0567a01990f2dd24a1ecb4aec034a0d25532256f029de7f8f92a97e7803cda3bdf48681d77be44389fb38bf39e7ad9166ed5a2e2f3c5 WHIRLPOOL 801f720b1fed0ff4ce81638e8e5fed33e83f71d546a90c45d0315714572b794edbeaaab49ed0ec0bf767fef38a32feb4f1a2c762514648030da3c2d84b81204b
 MISC metadata.xml 336 SHA256 3eac6880ae520a95a12cd275731bd66f6c31f29e0ac54dda1a14f8a0fe4b30f8 SHA512 8641b7544c71bf31e801587fb889e92e248b4c3500be88ae976423e39d93a6d870b18f05d7af9ce0e0c1d5e2ec081501cecb070cbf2a1452724cc20851617a55 WHIRLPOOL 0177aec10492b5b1f459b5296bac2a6389af7ae728bb44c7a1c79e729ae968803b2b204a03a0f6619c22fec40241a165c000ea909d81473d5394f8cbcff9f66c
diff --git a/games-puzzle/meandmyshadow/meandmyshadow-0.4.ebuild b/games-puzzle/meandmyshadow/meandmyshadow-0.4.ebuild
index a8c524a6b377..fc86ad6a5122 100644
--- a/games-puzzle/meandmyshadow/meandmyshadow-0.4.ebuild
+++ b/games-puzzle/meandmyshadow/meandmyshadow-0.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/meandmyshadow/${PV}/${P}-src.tar.gz"
 
 LICENSE="GPL-3 OFL-1.1 CC-BY-SA-2.5"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="opengl"
 
 DEPEND="media-libs/libsdl[sound,video,X]
diff --git a/games-puzzle/mindless/Manifest b/games-puzzle/mindless/Manifest
index 7823b8dbfe5f..d94cf300c649 100644
--- a/games-puzzle/mindless/Manifest
+++ b/games-puzzle/mindless/Manifest
@@ -1,6 +1,6 @@
 DIST OracleAll_050523.txt 1280717 SHA256 8c0384da067477f216af77ade0ff2680e9315072406c340700c3993d3786e34c SHA512 d2d46e330a697974bc6c69b8616bdd08c959d1b20840468ccb20ca22a105d7cfac01dd0262113804fb84e790cb1f8ad439c1aa3c17927551617ec2f6de5b83e5 WHIRLPOOL edfb8bcaf6923953358b24be12afff981bdb2c2a72c9d86455bf8d121dcdc5c2180959eb2f09eb9e6c30227dc898adeacfb7421e6199bfd2cf22c3118b16726c
 DIST mindless-1.6.tar.gz 85620 SHA256 1f3c413f6ef96ce380392a39151b5761a8c2a67249402bf02fc582f3d7837eff SHA512 bcb47311aebc127e30e10931e489cbbdb80845c6d95008834abab7ecbb7565eb61a38f47e68d24db5ed9da2cb3467fdaccccd05c6eaaca403afaf41cc76a991f WHIRLPOOL efccab674ce10c885be0dfdfc2c2060c85b7ffa691c46a22bd3acab20357cf39a8ee3a0eb8bacda39d51945269ac000d888e2222c3d8a1ce5f06710d334a8bb8
-EBUILD mindless-1.6.ebuild 1244 SHA256 c9759a99bcb7adce5248a6052d11c4044e6ff411f31bf8e516d65b960d974327 SHA512 facd8b97f05fa3e9e7d499bb5f4882b91e1873cdf18db9d8b73b830e4dcf02759f0a089aa21524c55cc3068f93758bc4c7fd2cba9d79e1a6435d88e2fa444ba2 WHIRLPOOL f83d99b858e7c318d38b82491264925b47b9f06feb55c1d7fd20af182e7484838f23a768f0dde364275daec1b161ee811644234557495eb660824a05b26e59da
+EBUILD mindless-1.6.ebuild 1246 SHA256 91cc76722dfc3da24890f2dae45d28535b1ed53b07dbcbc39a2c21c09a900c0e SHA512 a07c04a1f819b3ba7a55161d6a5c255e913cc3f28e39a89e322a55a0ff39c29f1fe3015e36575a396273528b556ccd41519e92f8b1e57c8b5d5ebf41d67a263d WHIRLPOOL 6614fd57a66962c8e1da7ce1a309ca4cc490b48f8ae832c6029542b4f1dd1e409ebaf09a7460199aef1a54a184dacf122bca410fdd56fc668ec72d6c0860c6b8
 MISC ChangeLog 2430 SHA256 f6ea8e48828bdaf60c0a5ba2f3f5202fd68af28133c2b1f9034fc9117e006fd0 SHA512 a29641ccdf75a512271fa027addca40ff3a20f8e1dcebffc4ceadff21d7acc5595ef50418bc2c08cf0cd79fc7ccddcb5a03ca349fe6697f92612fe60b6feb698 WHIRLPOOL cdaf9dc125d5516815e83e0231038b1135af594cf8b2b317139d696fa65d6bbe19773249e250f107735454a286474875d32de07960cb849e883f9f6aa15dea5f
 MISC ChangeLog-2015 2231 SHA256 053ba2e7b3cae67e28b08c93e8632211cc023ac3802aaf2665712bb78a4720c7 SHA512 24e02dd38d2452532993e7f4288ed0c0e22ac50a3c3b6cd42310b8296f894f74896befd2d8631ba42def061d7ad47202b219027e560e8780f47cac304dda5b74 WHIRLPOOL dbe4c8fc79e2f9c346bf9bf67aa6ad7bc4f88986c251ffb5959dff47574487994e6efe4c3b2680589a876795630858d07005df236e50924a73c78b61232f194a
 MISC metadata.xml 331 SHA256 306fcba21a4799778bc4e48de004cb744f77227cea61165c8f6817a5ae7843f8 SHA512 bae00e9836e3224a3f2c4fc7c6be572153b8693f42de869c4670edc2c5b8f103182a5f7c97ab2abd7744a29b0ed30f2c5dc56c7c661bdc28f14aaa5355eb5b5a WHIRLPOOL 7af33c829a986310937764cafec29b26f18e11d79d583ceac7a4cb3d9eb6e84957a9e1659c30c4a024e0ef8af37aebbd7cdcd54f077459e252463ee3483dd400
diff --git a/games-puzzle/mindless/mindless-1.6.ebuild b/games-puzzle/mindless/mindless-1.6.ebuild
index cb080963b9e2..6e89425c8079 100644
--- a/games-puzzle/mindless/mindless-1.6.ebuild
+++ b/games-puzzle/mindless/mindless-1.6.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/mindless/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 RESTRICT="mirror" # for the card database
 
diff --git a/games-puzzle/mirrormagic/Manifest b/games-puzzle/mirrormagic/Manifest
index 3c7882873bcf..149bcfda65f5 100644
--- a/games-puzzle/mirrormagic/Manifest
+++ b/games-puzzle/mirrormagic/Manifest
@@ -5,7 +5,7 @@ AUX mirrormagic-2.0.2-gcc5.patch 14581 SHA256 b0f9337010bf1a6492861c280a3164f3d0
 AUX mirrormagic-2.0.2-parallel.patch 234 SHA256 c73979621d6cccd67eb30581bce06a8ac2fd53547c9ff85fb8e1b9a32a9779a7 SHA512 34317534acb00fe9947eb53d3c16373866f4ecfd913489b4b9da6e9714ce4b04b0b3ce2680b03ea2fb22913147ac154b4eb0d83f46e76a9bc45c6aaac439c250 WHIRLPOOL 5a30e36a9d091a1a3c16a0a1f227ccd686eca88c8c29de4e0ab1bb173a491427e8f20a3020de2b7f463e32e63800651aa4807022a51f557af79f50abc03054d0
 AUX mirrormagic.xpm 6347 SHA256 3c9f65ca677859140d34427d46ff9213c9f928f30157d028be2f590659671f5b SHA512 5040a6232ba047fe0038276bf574ca22b5270827c21e9dbba0f130f0b25c2157be611cca1e662af2ff8cc43ab78f69a925b6687fcaedc4778672ebfedfe00227 WHIRLPOOL ac0a5eb66869ac94691f783ef7a5ea9b39f5667773394eb2aba9d5d70e0c23a84bec34d18c886c2e7117ae9d00aa0f10dceb70ac9b67cefd2e42289fa87a21c1
 DIST mirrormagic-2.0.2.tar.gz 1168098 SHA256 79b3f13d493523438eeb988beffc272c804bc7a4361b83167a082c77e74b3ce2 SHA512 cd49b1325485b68f2b59341e91f0564693dd12117aa3d6b5078c0a7f0e074114196870af11f0a154a0934cfce7106ba9685d886611f2efeff665ea030d705e03 WHIRLPOOL ac282f63b001b3c7d2d42fe99679fbbfb90659f522900329cff21e2a728896b9c5740b3ebd9888bb203ef1fdf5962d9d5f8977e5f6553a76738a429167efaa03
-EBUILD mirrormagic-2.0.2-r1.ebuild 1293 SHA256 2a7ff2f81010b576d72915129c5c1644dee7fff5e97a5da2f9b5db7c69a1d119 SHA512 134b25e92fd9d566da636f2c9676ed3134746a3174d7502b9037f5a4830f518e019da2facda5d60fef3972894e8b6f43443a9de2299fe503bd5463413325f06b WHIRLPOOL 270399a1123289a02b214ed0a59a707da201a11c4b18cae2a299f766ab8b5dbf62ec0fad1d9c2b487539cc567492efae630bdbb08662b39c1c996f3c35448937
+EBUILD mirrormagic-2.0.2-r1.ebuild 1295 SHA256 cdc7a8a0fd8470ced5c3937e02f4296b1a26e5dd7bd1ac09c19feed1f64f6100 SHA512 ac95c497b62d1ec484df42697581a50935ecd54c15eddd35484545651a2f6da6d71bede26055ec83b22fd90f22e369857c67047f5d7a9e52757c9b4844dd9370 WHIRLPOOL 4b246bfaede7cd92ceaf60b645144c6840a07d9cd2e5f551f52a1b337bb17433d3b66f974f48f3f1cf5be353e5ac9925abef9da1b6e229609e24e61180785cc5
 MISC ChangeLog 2932 SHA256 e86bbf7279c41314ddf0520513c968300138a9b2aa95e3cea5e25fbe599e7cc6 SHA512 1896507848f110041e31d251847bef2ac8388a665de50612afaab4631281bd626ef8582f1ca45890757f00dd03f79a8e3f09efb1e73536faa3a1f7cf10ab2ce7 WHIRLPOOL 71a5c3d5692edb599618c181b0e6e7d3c7d4b8e899510287a9cf56ace08a736c2461f34dda96487bb2850d814a43ea49acd46b76bedc2dc087790ce5cb482a30
 MISC ChangeLog-2015 2255 SHA256 bf67501e867c6c49bdc90940f3837ca4dbb3a2e588d440926174365aaac3ac36 SHA512 4842295ec97c2b8534a07f5b2730be02f3251ac18006c57c1e519474bbcc6528f0011792db8b2948fabcb95e08abfb8381fe18d6bb983d331da30a03f4190074 WHIRLPOOL 0e63e1862b60543a5f625d6d1e49daa11fea19854a01936bb747c3e2269f1f54541a9dcdf457fd5bf868bdba4179a90b71a734b385d0d209ea8ca0afe3378cd7
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-puzzle/mirrormagic/mirrormagic-2.0.2-r1.ebuild b/games-puzzle/mirrormagic/mirrormagic-2.0.2-r1.ebuild
index acc743eb9cbd..88a24e7a64e5 100644
--- a/games-puzzle/mirrormagic/mirrormagic-2.0.2-r1.ebuild
+++ b/games-puzzle/mirrormagic/mirrormagic-2.0.2-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.artsoft.org/RELEASES/unix/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="sdl"
 
 RDEPEND="!sdl? ( x11-libs/libX11 )
diff --git a/games-puzzle/monsterz/Manifest b/games-puzzle/monsterz/Manifest
index 24aac6263bdf..62d602c8072f 100644
--- a/games-puzzle/monsterz/Manifest
+++ b/games-puzzle/monsterz/Manifest
@@ -2,7 +2,7 @@ AUX monsterz-0.7.1-64bit.patch 1093 SHA256 36a9a26de082b5a182a40cfc9af2a4e270ca3
 AUX monsterz-0.7.1-blit.patch 1294 SHA256 1d1e5d017dba6a2527be70338a2d1eeb771462506572c857eab04e138aaa8d9d SHA512 aa7e63d7a67afea475f1c26976da46828232075231f939d4e478f1975bd192de8ee7b848a914567f915ef3c1394a11acb183a84b548732ed55389d3cd764614f WHIRLPOOL 123c2c31cb4ed3d4314b9da35a01579b9101483b715a7e78dacf1aff90a090c099c03f5e5055cef20adf18635c9e0d1ed6ff1b5c166b1254d3a43ade5fdef785
 AUX monsterz-0.7.1-gentoo.patch 966 SHA256 76186ed8433d817de4876cb62da3e67bf8e18f2eeefcd68e427ae2254af37a1e SHA512 69cea5fef337a6a2f8105dfc1cf6e308569852ead7701b6898582c51b5a740ff80f9900956e3fa0325a37fd963e62acc62a4c385b7669b4cf634a90136a484a7 WHIRLPOOL 5d5f43b1e981086e9cd106c22ed19f58cbb4359236e4d318007e01345c8988a1d2ea0151213227943210edd86f981c8dd0dbd6876905eb7d4cf47d58bdb806f1
 DIST monsterz-0.7.1.tar.gz 1879537 SHA256 50828b8fa26d107bcc2bd134328f83c905b9f5e124846bdf239daf0eed34973d SHA512 62de125251a74e7ff237c90ad88e10a4953b8841251dfec45cc6b77f416677ef6d68cf4308c3190f65896b5bb1312934abd5e438f0341f08c02884585f0e4787 WHIRLPOOL d2aa08ae267f0ba7c57e62a25d54a670934498048d3cf4420e558564c1e1132e687051bfbc4175bd667d2f21411641ccc28820fbbab5d6f1348152cef4749585
-EBUILD monsterz-0.7.1-r3.ebuild 1144 SHA256 6ad4b39b216a527d8e127cc020ee871bcf48b753e4da4ea9183e424c4b379721 SHA512 d33fc5c7e0ff03d45d98893cf4159d40e620e59f560130ffa55eab69c580db9d7587c00a66fd4505f9c5a2f97da46644e85188e35f6bb693cd6015287811dc5c WHIRLPOOL d2c0e9f81a7b4c12fdb0872ba86aefe4c575f21fe5e005a72bdd54f2ac3777a5dca3c98528e456db5df46ee8797575ef90496defda19d6d3eca4c5a7529d1061
+EBUILD monsterz-0.7.1-r3.ebuild 1147 SHA256 0e1cc204aaeced8338c9cb461fae5e0c147b74fe60b0da6a8bef346cbd22f0e5 SHA512 1f576538e17b39eb9bb35cf026bf2534bce1f1cdcd66e1b83fb2b2d4b9cec2fa0ab49521ba1a3a97c2e1d07bbd5fd02aaaaea0a3135c2e19e7160146c4d8a0d0 WHIRLPOOL 753ca9968c536ac2eaf2d50422955d0d01be03af01ed2a768666d9e286c3d43c579d5083a00796079d26a558d58ddf1f7236fd80b0071743cb456c8c9005a4c4
 MISC ChangeLog 2549 SHA256 c0e7fbe4785c9f8eac566ab930200f367664a0205e7694f74c51e7edd344edca SHA512 d67674d9bbb971be76840fec101d862b1bbd70b9dc4e30b3274de4beea6a3a81be372d00dedffaa91cbb45e8767b6928e48c2a9b2844f36db0823500693137b3 WHIRLPOOL 565292785dc361ed8c964f24b634889ac7a35e6e4fbb1f7b09133fc3e087b34268377484b5590295b9aef1881c558ff7445b5ddbc70b2764cd4dd1d1d0198a3c
 MISC ChangeLog-2015 4963 SHA256 6e658e8973eff5d979313288f53c9cb9c79b41bdd005cc5ae31375f88eb9a3dc SHA512 4c368b60feac27afdfaa1bf76f7d13d51928d4342df747d363b2ddc3a0c81798375a8fa0410e359073bb85e78458c1cab6fd84217bce1d8a09e9d1fc63cc303b WHIRLPOOL e4d72dd88cc7f4c991eeb12dbf717ffb0bf1fc62d865dddecaecec32d106f55811b53be4c9a447e44807e414984efc7083f3d125fc7aa46bb3caf9c119b966cd
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-puzzle/monsterz/monsterz-0.7.1-r3.ebuild b/games-puzzle/monsterz/monsterz-0.7.1-r3.ebuild
index 7086b507fb09..e8e78eba8638 100644
--- a/games-puzzle/monsterz/monsterz-0.7.1-r3.ebuild
+++ b/games-puzzle/monsterz/monsterz-0.7.1-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://sam.zoy.org/projects/monsterz/${P}.tar.gz"
 
 LICENSE="GPL-1+ LGPL-2+ WTFPL-2"
 SLOT="0"
-KEYWORDS="amd64 hppa x86"
+KEYWORDS="~amd64 ~hppa ~x86"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/games-puzzle/mures/Manifest b/games-puzzle/mures/Manifest
index c42676e7a657..4251764a972b 100644
--- a/games-puzzle/mures/Manifest
+++ b/games-puzzle/mures/Manifest
@@ -1,7 +1,7 @@
 AUX mures-0.5-save.patch 646 SHA256 0de9e69d4c9b314305d0d347308cfc042bdd28c0ebf631e5577bbc6c4cf49e9d SHA512 2b3717c107fc82010ca9a894d68895d438bbd3e36c6d192a49a2f802f7b42abc717b07d278167176813965bcfbaf1ecab99e7edc30abaf1536f9c6e52e18c0b0 WHIRLPOOL 7373733d04b9c403a8fbf70c4769ac94aac2c8f914be19c4326b0df92be86adf15e9496ecffe5cf426ac6bad5a5df40f99d4d3951bb05e077da16be44ef903b8
 AUX mures-0.5-underlink.patch 296 SHA256 f0179bbd48009ab2c3157fbabd29ee46404cfcd83a44d344ba67607890484105 SHA512 51e32719135883847b326b6c5f3f0954e1df0c3f4d84cfc1e28a6e82974d25c7d44ba552796ee01cf99db7291c2d6c849a777cd03099802618ed56142eea57ab WHIRLPOOL 793d88c8560062c903f618897d1878ccc0490736b7fee34eeaf45a92d53ae9b3b6a3a656c9a15672b16ad8b22931ce6ebd6e5bf7d964cfcab8231988925c7e23
 DIST mures-0.5.tar.gz 638528 SHA256 84da71b52b6fc16587fae776f0ede1cf20ab08ea2f3ce1aaa220ed187cd757e2 SHA512 907b22adffcc0457d866da27bd11d61663c6a1eed1c0aa4b437f8e341065df86f2ab06851619e2fa4088aa0b2becaf9376bad693c83345f8d1ee862c31740eff WHIRLPOOL 6cf0cf6fe3ce2c8919a1ed719c9e05fbd89a7331d78670880b079b4fc6311cc6a56986c0cf73295b23ca443f4cfba162495fce1e11f10bc47ad2f5d421e1e655
-EBUILD mures-0.5.ebuild 2011 SHA256 730841cc8905d467d2c03d38d22fbbed025b26712d0c3bb3a2c533a66dfcc1a0 SHA512 e1ed181aebc68c9dc023671b2b9d52596a056c846426ce2497100019bbe8debc1d24c77e46edae3e649e259ead3c8d5b04ee98bec9863581b8322232aa4cd061 WHIRLPOOL 42817a8b4ad4465fc374bfc23fdab42fdcf934a08b5afae779b80b55dd28293ecb93845af5eb2729db4935b44ca68bb379841f5e35a5359558d26d09b0f344fc
+EBUILD mures-0.5.ebuild 2013 SHA256 0e74faa43aeaec8c19e2c1e7433751d471afb56fa5f301bc3d5b235738608ea1 SHA512 5f8ea616c486f9e155bf4be92bf4d941d0662f552079116a230d82e19ca6116720267b5b3e48988d1778b2d90a399963294e65ee21a455670f80cd402f3d8437 WHIRLPOOL 1fdd77c0230e55d8155890e591b18c171ebcbc7bb1fcd133dd3f1ee6a461a059c79b311babe55d044b07ce3206b12f2e35c010a74e9bb5dd9ae02bf0eae6415e
 MISC ChangeLog 2486 SHA256 c6b24cc145cce4fa34f7ada16ace7934d2e78f473b3ecac0873c8180654496fa SHA512 0a5dd3dc022e5d4d8b7b6a0368d2757664601459438580a5cad4eb93fa01f61e48c91ce55797301e20774de38c9a6250bd8c8bdfbab34c20090da6326dbc2f7d WHIRLPOOL 8f4be4ccd309f6e103aad363bcd8063ec28d091d3c5215bccc7f8e32e58f0dbee1e37498cf65173716afcb4e034729b3fdd44d2986ab7ea454af277977a6bd41
 MISC ChangeLog-2015 1351 SHA256 871881e370aea53db606637e68c5d2394df1a36ff66ab38bcc0180ba99671155 SHA512 4cc47da82702bb12d1f5626bb82c8ba0ce85c7ab1080009b988b64fe63e31b1839eaf32ff8e6282534fe081d47c25c54b1b44cfc77fd422adc513c8bf02f933f WHIRLPOOL 10df811514c63554f06cce27a91a574b1219ac90d38651612fe29fd64c25a03be335634a3689c9b42bc8295b145de4005b6cfc3f3fc2e6a15426602a04dc4550
 MISC metadata.xml 328 SHA256 41d652b703a88faa606a6da9fe126de96818a50679bb3096dbc262fa58a54f37 SHA512 f6818639d9ff510efe1dc98505eb03086d46024def2a1b5fef5273181e6eef91135ef4e7902613776da51a951c50373b5cc80848a9887d3919f7adfd9ef40f18 WHIRLPOOL 27a1bec96524e96801ed490ae720c48152af74fd891ec4b58b8dfd424c0b7866678908ae798d6fdd44c96ac57d4f11ccb474655b91bad83b8dddc1107b7d3827
diff --git a/games-puzzle/mures/mures-0.5.ebuild b/games-puzzle/mures/mures-0.5.ebuild
index 7cf4abc7896d..783959263d8a 100644
--- a/games-puzzle/mures/mures-0.5.ebuild
+++ b/games-puzzle/mures/mures-0.5.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/mures/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="opengl"
 
 DEPEND="media-libs/libsdl
diff --git a/games-puzzle/neverball/Manifest b/games-puzzle/neverball/Manifest
index 240bd0f7e718..b276931a23fd 100644
--- a/games-puzzle/neverball/Manifest
+++ b/games-puzzle/neverball/Manifest
@@ -1,5 +1,5 @@
 DIST neverball-1.6.0.tar.gz 37772911 SHA256 73fe63cca4f96e2d355480d03bc0b2904e83a0abdf65fe8c52db5cc3cca88fa0 SHA512 174d05308aee3a5e693782c54dd389439752b3597f28193771041d30f6c4236a5d055b2fcca9460b1005e9f000ddb3cbc01b86ea15c2abbf6e5a7996e836f787 WHIRLPOOL 017ac177b3557e0473d94288c0645ce7e6ddf15cdfbddb6798b22a6341d9864532d0d2263ed785bbed8c1bf5c9e4acbc6e31effdcc06b299a8fcf7c1fa60e514
-EBUILD neverball-1.6.0.ebuild 2198 SHA256 5d77b6b1645d9821d7f63bf60d0161338a1652b160d3f162c8ff11f290072e21 SHA512 0f1cea3ac0592124b8aed9b57a0be4cee91ae913b4f83667644f5aecc1383fb8bb5be30679df2317d566ae5a80ffd893942a04eb5fe824e6d75a84034b8c679c WHIRLPOOL b4373711e0166c8eb422690d19830c4ca58aeef6d05f8b24d31ac5b282a228e4e2fa99b886420002c0e6f6b49acefcd4dc19a84a14a4b7536b87745e5fa0f612
+EBUILD neverball-1.6.0.ebuild 2200 SHA256 6436a874e67c330cb821b061a369b6aa0abc9d4f0b98ea7a789cbd1002521f20 SHA512 cac7383500db0a1957f15453abd1adb7c5ea8c7dea153096d75bcbe99ca90aad1fde088054cce22a2e9f523800f4788a1fb927b0c810e91421236b436d78e251 WHIRLPOOL 11cc95a6d42f1907c706193cf812bae3eb04f34a447198b294e92323fc4b464fafc226f55eafb50477fbc7a87f61d32a152c387447e17ff81c917c38c5febeef
 MISC ChangeLog 3016 SHA256 adb56f99fe650ff6fb384119c56d8e2d934e6b530e190f34c0e6980fe5e972f7 SHA512 78d99b215a8a399a607f2ce4c00ceb79b1c4580358c4d7e4821dd40733b0ca20f4fac1eeb85d6744d736a0833e1f909e2804931d805c342254555ef5b1a560a1 WHIRLPOOL 6e2aa35351210300c94f9a6eda51a7d615de4febd6b65cf98e86cb0ece73ae9718558de6a88bc00cac189c06abc46bf40a3e9970e1a00c6b4d7f67c6ac86a9dc
 MISC ChangeLog-2015 7164 SHA256 ff836d6145c26263e2c17e4f3647551a8a323d45d6520ceb771d6ac1e3729b33 SHA512 9fee0cbafa69edf7c03eca31abdb8970fcde2740ad29df60f9defc4ea2680bd4716053a5cff06cf9a217760202f26c94dc2e57e5f9ca7025af4c3de088b58c8d WHIRLPOOL 4edb5ac9159788c977d7999727a9bfd85efdf1dd5fcc69d718eedbc3e258869becacb8cf7f6ab706ad1522f65d2379af05308f82c7c79c036225af08122c58d3
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-puzzle/neverball/neverball-1.6.0.ebuild b/games-puzzle/neverball/neverball-1.6.0.ebuild
index 4466cbdedcf4..28d7120de14b 100644
--- a/games-puzzle/neverball/neverball-1.6.0.ebuild
+++ b/games-puzzle/neverball/neverball-1.6.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://neverball.org/${P}.tar.gz"
 
 LICENSE="GPL-2+ IJG"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="nls"
 RESTRICT="test"
 
diff --git a/games-puzzle/ngstar/Manifest b/games-puzzle/ngstar/Manifest
index de64c1268b69..8a6771e8c18b 100644
--- a/games-puzzle/ngstar/Manifest
+++ b/games-puzzle/ngstar/Manifest
@@ -3,7 +3,7 @@ AUX ngstar-2.1.8-gcc47.patch 315 SHA256 8925d058dbc27ecb86321b99f95121642125ad8a
 AUX ngstar-2.1.8-gentoo-path.patch 534 SHA256 32d0998b7f9416995a30c8b448040d3427c1e59ce66c9d25495ac3d909e8f45a SHA512 bca1216cb11122c19dc183b788215c50d9426e58e69bb20ebc5085121cdfe83af8d8e504440c7eacee4a82c4f5b7ef9a7c77fa783084b0f77bd1759cb45a51d7 WHIRLPOOL e882dfba9c46dd8f698af78adb447d4b993d58ad788696770d55d26c4bda228c8c7e2d733941c01a330fb3d99983226be6f54d7add1899a826e914de9f3ae0d2
 AUX ngstar-2.1.8-ldflags.patch 1031 SHA256 9fd44a56733b4fd2a113bf2338b3768882393a78c613c1ede92165676f79edaa SHA512 54e08e2e6c2171624c4d0e19df0a3f1b27e65f7dc8a079689db38283098ee3d9c8baf9ec1cbe7c64c0691f6a9bfd789e0845fc8043386e3cfcb98e051e81643b WHIRLPOOL 27cd5290ca592a7c44d49debf9666072ed164101dc2c6bace5062841bbde3a989213d3d52f897b6050457c90d26590a8ddd261e996ff38985e8768bea5554b71
 DIST ngstar-2.1.8-src.tar.bz2 45851 SHA256 c8a2cf84d2a4bb40280d4ce307ceaed8f97d2183f79f7a82b38b78aaedb73fb3 SHA512 c96031148720b5dcc004a5de68137bbbdd5af9c6f0b33ff8bcee3180cbf4732a4d6a92737ef99754d512bb61454bc0a17487efba4cdb00339d23e38edfe3cb28 WHIRLPOOL 05b6492a324e49c210174864b73194cef1ef3deb405d04d1c9352ae3cb3bb539e3c2b5c4d11f09f2ea32ffe37a542aaf2438185f6df1330af88de0b122d6e5aa
-EBUILD ngstar-2.1.8-r2.ebuild 895 SHA256 11d8ef4d7ce00a9d4da7f0356e716dbc796674582150ee1d36f76c57ad0c4ace SHA512 69570eb6dccf38854e3b318ed797cb49c226e4f0fa71ec899c49b810e54200bc9a491a4bf077fa2547fa793293b4409ecd47d979d4d2fde6810ea30fa344daca WHIRLPOOL 8f8763848cc93b0a978f9b0ae2fd9774fc3336343e622bd16d3aa196cc9f5cb53c08f1c1cae6cfc1de4440b04ec4583527b28df513c3a753527e5205ba477905
+EBUILD ngstar-2.1.8-r2.ebuild 897 SHA256 2071c63e41159afcc8f01ad674016f174f510e9ab33a68229842fc902a6410dd SHA512 fdc5d8aa0fec5eb39debcd1e456ff7454b68f951eaecf0d2c583ca33e41b4d6c6fe866830c7dcea7c3f515ec8655185277a8397a8d341b2e5e8a27cdf2cebd22 WHIRLPOOL e18328585df8d52c13a3bc308ded1b41503c07b242aa02328d3b2de9e33c9d61f88fccd4c4fad58f4a17702f89825ff5923bf43ed171a09c6e343cd684db4c01
 MISC ChangeLog 2729 SHA256 cf59b46f072c9e176cb7e412081cf5ee039d5c92d1d71dbf8da55766994658ea SHA512 2cd9a37ac23ed7603430571b491e9d0f12dc84ec9187ad6c163ad31b7af5dc0f300ee1b640cccbd3c03ffdd65eb1fc9ee9cfb270eafe7c734d9458bd9de536c4 WHIRLPOOL d87bc4b77ec551798cfdc4282e6a72fd0196907a3e2a420005807b8f3d6c649648539e9fe208a485d4e16fe43296c074c75995bcc804be2a2484961b57800ed7
 MISC ChangeLog-2015 2044 SHA256 bd1d407674c4972fb63eb519d5be199377c0c18caa1e3cb009dbbb9afce1f665 SHA512 7eea9da024287fe14629944f95c5ba6be33f9995c3f92b6c05aea14fc10334a3104d493e09f074aa7329f64338a5c897217d8fb2cdae772753359278ddc99ea4 WHIRLPOOL a6ee80066a0d78065c181401f806d6d58adea823f42ef4605f5a6afacbd4f9850863292c9e65b463331ea99c0938f7635c3f1edb0edeec97c661bb68482c4d4a
 MISC metadata.xml 612 SHA256 ffc9c874a3fd37639c0455297d7ca585fb69eec94649075e4a99336737dd64e8 SHA512 414db07af3e63e2bfabcc81bdb7df2b91cf449f568c1d301c62a5c4b2950fad627c94f786abb902df84e6568016062ae18d76008136144fe92007100efbaff92 WHIRLPOOL baa65dc864e20e6fdf826139f64f3a6b4ef9d0ca0cea9204afa5cae2b3c38c90309fec493e7368465c2213ff8262587d6fb20c50892ac1301c175af535b35b4e
diff --git a/games-puzzle/ngstar/ngstar-2.1.8-r2.ebuild b/games-puzzle/ngstar/ngstar-2.1.8-r2.ebuild
index 0176fcfa2eab..c22226a39d5a 100644
--- a/games-puzzle/ngstar/ngstar-2.1.8-r2.ebuild
+++ b/games-puzzle/ngstar/ngstar-2.1.8-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo//${P}-src.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="sys-libs/ncurses:0
diff --git a/games-puzzle/nightsky/Manifest b/games-puzzle/nightsky/Manifest
index 9fe58c174324..f5dbd1e12a72 100644
--- a/games-puzzle/nightsky/Manifest
+++ b/games-puzzle/nightsky/Manifest
@@ -1,6 +1,6 @@
 AUX nightsky-wrapper 540 SHA256 562fa782edad4859cb70316a642bfd009a51eda0f47e529a9360fb4f2710d3b2 SHA512 6ecb52d390757bb6b1ffcd7b06c1a154d5a3253822e989d7b9276ede8627d241b203afb88afff731f33967a3e380d1fcaf3feeef61713485848f654df3855248 WHIRLPOOL ca6e962c2870650aa979476ad5934d3cfffef87107583f5ab49651253e4e430a4571c0d095af76b8f344707c8f71ae85d77da59e30f3f59b131c50d2b9dac58f
 DIST nightskyhd-linux-1324519044.tar.gz 123971537 SHA256 def2b3b42239f9e786472a88d85ae739790f6675b8eadffe9941350d2100e9d0 SHA512 a1d4ec588fa67c3dfbefe563d37df7bd93ce6a7580e7fcedda6567f6f05f362fc478fbd6ac921854fa5fe26270a037c49f9bce2df5527a6490ff0984b9bb671e WHIRLPOOL b7aeef90eadaa47498da4d3cefd10c3f0c5ec8262ea9cf0125280aed6848ae5c8f05e591ccdedfa9a11f161f4abbb5ee03844ddee1a1c252cb61d53c5103cd0c
-EBUILD nightsky-20111222.ebuild 1876 SHA256 6993c227b04a35bd248f02cfa359cb55db3ed6f63a4b3077651a523debaa0cee SHA512 d07cb62c379d63bcfb1229fa3c4d86beecde97af0e3e73e20fde05fcbeb2006498cd870dfda7a5a96eaa11cc3f9e4ed8b47d07bd40b4eee6b53083bc66e85e4c WHIRLPOOL 3972391bafb44a3c33deffdfd6be3a4bbd074d14bb2d6ec10885e7bcd66fec145d3ea03dc25e15f7d7af012c72616eca1e3625e26020fb1d12944ee1dd475b7f
+EBUILD nightsky-20111222.ebuild 1878 SHA256 6e8d8b18228853e8d8604e5373ed4f38337c90abd7c3e2a93396847c290cb47a SHA512 47f922164e5b28a0f344153c6835cf07442221383d0735dba964f0d47812816f590695bb596f757d4ab2d2f0ea276eeadcf787759ad1b47b981fee2441847337 WHIRLPOOL 7429cb2d36c3b01efb6956cdee6c93a20cbc2d3bec05e54f6f4bdcdeabbfdcc0f628b4054584dc683aeaf4789a85693edcbb3124788e3c2a1894279d408b726c
 MISC ChangeLog 2858 SHA256 47abec92964ac39f71fa7096f63fc0f7139f206f6db090b9ecb8ea3000439e75 SHA512 e491f3140053cba0ace803d952351bb95a9ad66b2adf9b02e79ba0127692b2c43d1d1e688002c7964d987dc93f84004237a18e822794261b341ced8f1bf4e9e5 WHIRLPOOL db78572cf3952668d85048b029e8f02ba71e76378bf17d755998f747d04c8d74a6335fca5eebd2c3c2e509814923093963225b4548a2f27bba40643db081e7f5
 MISC ChangeLog-2015 1025 SHA256 52bcae76e6e9f5b546713c40588b7fdbd46ae663d2d9e5c69e497de320fcb4ed SHA512 beb6107066216ce257908f65dcadbcd702fcbd043d21099828744eb15f214f0ba6ba0ea3fdff9a98c89b37f08d63a4e0c459e1e75fa692e0aee24a1c77875511 WHIRLPOOL 86207bdb93f2861de616205786aa7e926815e99b4bc91cdad46160c11003d86117d071e83f45060df7e20f464bdb080f73b709823a2b5a970a277dc53ed26835
 MISC metadata.xml 355 SHA256 3fe59ecadf91cdd661b063661864ef57eb3df8d59bd55a2eb9e61dc1a75e5bd8 SHA512 78f8cc8f1f1be915da206e4b8be196a21b58a6f209023594755e481136a1b86ee31c8d0dfedd516d756a47db624e89728875b073b71c3b08ac94a5cde8ff3b83 WHIRLPOOL adc2ef67e7870008ce851a78268832c5ff50649850b2614fb66edd3a16ccbad441306f00c44000385a742552b91b4a805408b19aad2ef3b7dda9e86532703dba
diff --git a/games-puzzle/nightsky/nightsky-20111222.ebuild b/games-puzzle/nightsky/nightsky-20111222.ebuild
index e662c94e7dab..aebfa6393e06 100644
--- a/games-puzzle/nightsky/nightsky-20111222.ebuild
+++ b/games-puzzle/nightsky/nightsky-20111222.ebuild
@@ -11,7 +11,7 @@ SRC_URI="nightskyhd-linux-1324519044.tar.gz"
 
 LICENSE="all-rights-reserved"
 SLOT="0"
-KEYWORDS="-* amd64 x86"
+KEYWORDS="-* ~amd64 ~x86"
 IUSE="bundled-libs"
 RESTRICT="bindist fetch splitdebug"
 
diff --git a/games-puzzle/pathological/Manifest b/games-puzzle/pathological/Manifest
index 00b3b0729c4d..3c18eb1939bd 100644
--- a/games-puzzle/pathological/Manifest
+++ b/games-puzzle/pathological/Manifest
@@ -1,7 +1,7 @@
 AUX pathological-1.1.3-build.patch 527 SHA256 93d4c806d11896a46d31b71fc81799141084cdde1323cc933c748b80f6ac4a3f SHA512 d18b8e55d3f40fa69d0a551749b1242ba055ba8eb5bde517d7df8a46414d81232836bf232b28e77b1dcab8f0d049b3ee46ef666621674ac1be68e343e53f1c34 WHIRLPOOL 09787923fdbe184610a2e5c5d5d3b7208af93a0a080e7e95dc4763b5849df8326dc5bfed2a61d77133ebfcd05ac4219e2166cda7cd7c4c73f1ed068e7261b1c5
 AUX pathological-1.1.3-music-py.patch 475 SHA256 35938ac1f96dad12c74fd57e0002fcf523fe573b269e03992d3ae006880819c0 SHA512 4a96a35d299f10ba90ff979ec77c7b117228d6e593be0b5858233fd44a0c746ad3abd52fe2751496e2ace813afc95ae7ee76c2e3d940678236de973cdae7aa87 WHIRLPOOL e12596733e095da808572b3b558dcf09798e347a8ad2399385c5107c8475bd745c216332c44a2e49c30348806a7b258cb77fa5168f9f025ec17b5734a5305129
 DIST pathological-1.1.3.tar.gz 6995274 SHA256 813ef0812ba6b3218b35c2ddea423c9c6ee912925824497f52d5310bc76f85de SHA512 a64e0ca9a3bf86ade4a1abdd4f471c341838f690b2471f21c488471b7800da55f89f42c62a51c9be380cb9f265432db904a5de6f6bb3a9a7dde835da94baf566 WHIRLPOOL 65f2f62c4d9991c3d0e69a9408e17e8c80a06575f38233ca4697054272b17bd3056cf681d40318786b6546ab7a43c34ce3d60bdaae08570457332bdaa0bee8da
-EBUILD pathological-1.1.3-r3.ebuild 1963 SHA256 1631d00c28307968d51bf0a19ec8703c54ee6bcff95fc0c2421b11ed2fb65d8d SHA512 5ad4674b54dd249ec76f31d401efff322142ec51332a9bdfed7b1c9f84541165b0d86db53dc6daf2072e32477eea2ebb17ded296b8ce9eca9ce0ef0486875f5a WHIRLPOOL d97faa949e654e281ff6eeb9978de6fa448e1a1adf80f1cc84dec913623cd11b7b61338a6d4479d42faaa370143e6a44f7a7be483b0e9d212104274c636d43b1
+EBUILD pathological-1.1.3-r3.ebuild 1965 SHA256 9f4993286cee5e8ca519e59beac6dc66a84856de9324188b772d85c77a3ec9e2 SHA512 bc36d2f3f012273c2c3cdc9f74c656bfe40d51c568a3e916fd35b31d45a428717ffa9c7b6fe99de08940d66cd112912781cbaa15cb4967c822be996ccdb9801f WHIRLPOOL 49814a8385a3675e3b3a5f76e7d2a47a740bee6fae7f11767b46d5830c8817452dbedebe9ee4864000ebf4b18f87ad95ced1ffbf255a97a040d295022d4bd84a
 MISC ChangeLog 2537 SHA256 05ef96a2d3a7b9a9fe9fbc911bf862017e4fc856ac70f380939719aa4aaf0d93 SHA512 bd69067fc2fbe7418efc22856b4ced0b5a81ad417f9873c069238272510d725f91acda9679652c9f465b66846b8d32004ed49ddf6e97d569bbd4446cd45749b8 WHIRLPOOL d69887f810570dff847304083775c0c6921734744e712553784fb356eb4fe278f2e2e40d9b5f97550a18f997652d83a4a331a1a0f40d08936a5365b7d305cb00
 MISC ChangeLog-2015 4243 SHA256 582f476b394542c8141780114e50ab2db1d3645736cce46f886c093d6130300e SHA512 477ed28d698517d74cb8c1ad0ffb8efb075fe9b9160bcbd05bc8c0da921051f5415477367f8ba5eaed0de1006f2c3d41cb365c4890f8330e43c2853aee521a7d WHIRLPOOL f8dd62879600e90eb9db75714b2951c25454baea9b008f53960a7d676fe4cd5851731e555bf2333c84687a0526e783b72f121dba94aa58bcb565cf82bd8692ea
 MISC metadata.xml 416 SHA256 9d7278eea88916ea41d783dd828e9813e9bf616fa1e9efd0f71a004f51849af1 SHA512 4928d2fce7738795beccf39352732b0a94838c436cc26816dfde9b27f64378788a2ef74cb054219fb0e0cc20fd93f43621227f851262775dfb8b255dc4ca15e5 WHIRLPOOL d7276f5045b55f0f0b70dcc9fff68f40ee1abd3ddc7cc33dc1ecb33c60e4cb27a23cc02b93e4506c9ed5f105a7f98faab0b387a6debdc2b607bc79ba38b990af
diff --git a/games-puzzle/pathological/pathological-1.1.3-r3.ebuild b/games-puzzle/pathological/pathological-1.1.3-r3.ebuild
index 7d829c07ed80..88e3d609d04c 100644
--- a/games-puzzle/pathological/pathological-1.1.3-r3.ebuild
+++ b/games-puzzle/pathological/pathological-1.1.3-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/games-puzzle/pauker/Manifest b/games-puzzle/pauker/Manifest
index 86525583cc07..f06842f68adc 100644
--- a/games-puzzle/pauker/Manifest
+++ b/games-puzzle/pauker/Manifest
@@ -1,6 +1,6 @@
 AUX pauker_bundledjars.patch 899 SHA256 4853a7e49a247d700fcac224363acf859b185fe64633b3c06fa9d66b0709e2bf SHA512 ed7d47165871488233bcf032bf7e93f7988a231251fa93dbf173774dcaecee1adb735930fbface4009a72912db3f811a09cb9e49a038e7c01fda9a44e8515a22 WHIRLPOOL f107f86dfec77e6e5d3a95c25cb935f670d4a6ffcd1f7a562955977c46931e3cb0011fe3ec2c686510c2816f1f61661da6f266fcd2b26716bed26f3a122175da
 DIST pauker-1.8.src.jar 33886665 SHA256 061be727408413696d148285d268a2cb37262a19d6d8a26b67d2233507545e05 SHA512 2d329571e857a05116ba499c4bd82669f0c99a748ca375ab06e701492a814b97fcc09bbf0ae4f48c52b05c67768a14d70a4217fee9680762424c96ab7f4341ae WHIRLPOOL fc3e6cbcc0164656337002e89f880b4f1f075892f62ef561deb25671b764f25872e438d54cf72e1ff701e0b8c9ceab621027d9b360eed65f2d3d23682f8d20e5
-EBUILD pauker-1.8.ebuild 1795 SHA256 4f4c1fcd1dbe4e8ecdbbf3cdc0c31a6ce8412ffbcde2c6e16b2294a540a6349c SHA512 38e837383660a0d9977c961038c9cac6e899ad2a745de76b43a33e80fc285733b47658a4ad0337cf9b1e8d32117f5bcb0dd3a9fa73caa94222f168f4187fd08b WHIRLPOOL c407cc7025fa6179aa4ecc8471f8f5528a880b28a588ea81de2d9a5bed90331699d6fd085b884ec22c1a98cc4027a8514d64fe9952eea35f549cd3f83207ad1f
+EBUILD pauker-1.8.ebuild 1797 SHA256 b1958387ab0cff8e2f395aaea89e636e43d0528b8541473ebd8464e5c767cbeb SHA512 0717fe0cafc2f525d313be07a44ad046ad19806a1b60b6af9c7a9d1ba9852e5f835149732fbc5d224c06c00ad0cfe6b00b870dba4dfcae228c370bc20d747ce1 WHIRLPOOL 8011abf8412df54b450cd487d6915b4deb6825ec329f7220f28ed77c8dd982b6451018ae8038e822edde73dcc58b1d8b93f79c038254b3e667b5f26131e9b317
 MISC ChangeLog 2592 SHA256 241454489906740e9c504c4acd88c536892ce97610970599501a0322b426a0a4 SHA512 98e64259f264f4ddfad99c9cc47e011c7d95bfb9623d3910976f165df946149d428a1f0285e3f03fc89896c6fae38f66f19c7c55a18affa3508dd6bca86226a5 WHIRLPOOL d3c7abfdac0f4d324b3ead29aa17fc518b14bb5768936ce463948a9c70cebc6f3581682d9d89f552363bd1ea41f487ffe3ca51567b532286e0c5bff1440abfad
 MISC ChangeLog-2015 3508 SHA256 5e476baedf48acf04a891c34f26fcc0a0ce61b9134b3896c3a9767a902f40365 SHA512 f6b35674e7cbda89d45b26862a9aff0de72db9ea634b4982c7d3ec1b9fab82f8c6834874b9ed88b2f55c3257268d2adfeac317542c371877d58a39b87ea2ba59 WHIRLPOOL 133e1ed54df9ec80a5424943e536a7548159ae2f17c4b9bdd9510d0787c570725c1459ee6f60c0dcfdebb8edb48ae2a241f9c28f288d4ef287726147f85c748b
 MISC metadata.xml 329 SHA256 776e4f9a0f7d33ac9de6b94fcac85404006c13026008a9d22849d3447f2d9419 SHA512 392a3af58bf88c1cfa5ad5f3a240b7c16d2cf4a469700d3e7628917923606b69d3aa65c01d258e17d1ad362fa4f64c424e75a73f849f4fd438f97ba951df8203 WHIRLPOOL c48818675b419f91fd5a76416cc528f761f7bd9ddbdebd0208bdb85e6a3efaba5da1f64bc365e947889454f11ecef2ff07e1fa44effcfb1bdfed6881f8086172
diff --git a/games-puzzle/pauker/pauker-1.8.ebuild b/games-puzzle/pauker/pauker-1.8.ebuild
index 8a9d34a94d32..af0161d502ee 100644
--- a/games-puzzle/pauker/pauker-1.8.ebuild
+++ b/games-puzzle/pauker/pauker-1.8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/pauker/${P}.src.jar"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 COMMON_DEP="dev-java/browserlauncher2:1.0
diff --git a/games-puzzle/penguzzle/Manifest b/games-puzzle/penguzzle/Manifest
index 11e8e9ae5c45..9cae0e830d20 100644
--- a/games-puzzle/penguzzle/Manifest
+++ b/games-puzzle/penguzzle/Manifest
@@ -1,6 +1,6 @@
 AUX penguzzle-1.0-tclx.patch 157 SHA256 c0daf589d7e6c7b8e079cb3d6002312f6717ad6ebe4fe154c61505e7ec730025 SHA512 137e0707ef1e285433b78586af18a34133d29f3b202046e1843910562d9d9d68eb7ec2019c8c1e973ed52c091da05902ef48ab3864da0e513034465941605874 WHIRLPOOL e8122e9ce31b05ce06c5aea3a6f5886a5a238d905bec5a3b2ab96d11afb9176b016438f349f563440e991df740a0c25470871b56dacc067aca94de6521ce63af
 DIST penguzzle.zip 21542 SHA256 f3c2a4bc94fcd3d00cd8be9bf748bd3b0aa6d4251e64620fe92524e65fb951cd SHA512 fc6c57ac851df7fac7d91f90ec53fa543470e9721589966023028743951090994c372ff4538092c29aee12afc28809ad6e20a6b78ae9759bad2b41fed330b743 WHIRLPOOL 5c5e4b5a0c3f8640ee196eef73a84d8b7d472458e78f1bed3b09427cbd82cf3d3792b2b11219ff8e55f57638147f1e36ff2fcb939565d24b278ac711080d1a21
-EBUILD penguzzle-1.0-r1.ebuild 907 SHA256 f96adc41bdbce4d95f88be994404ab6e78541adc9e5647d95cbefa158cd7c3bd SHA512 99601c4e5315bed8d331601d5b34c7403548f33cfd077b9582b743d505ce86f60bdec299c26d91c07f222909beac44f04be8e974d44ddd2657ff94a4676ee365 WHIRLPOOL 0c7a5ea18906d1fdcbbc7c3497243805195b6e72163a59f51361316ce4b7287b61ccd9900a45008530b279892027b30d42c4276e4645e01f78bdfea2b4d9bf54
+EBUILD penguzzle-1.0-r1.ebuild 909 SHA256 3f3f573b5731d5dc8b846f3eaab6a5be5ce697e0022147ceb72abab6b961a3d3 SHA512 68e2590e7c6651425d42c4ea38cc4d233413137c35cc0922eb036fd5826d65402baf5ee91c8852ff73a2c2fe3a98e258f8226833731d45ed606800d6e3df2161 WHIRLPOOL 0ea96cb3238d1a25f0bd4150428dece591a4cfc7623bd5b9cf9e490d0f410304f634dc2f48bcc8e6156ed893a5844a45f1251f68a4a90769b862a4f53852d945
 MISC ChangeLog 2472 SHA256 966662aafdffab72a58f6c10b8d3aa4762cdd5bf8bd3a51629a0a3d750da4b56 SHA512 fe842300f1b8e801da5201f02094c0111cbad3d0481723917adf050d9b64982549f2b69cd9a3dd8662ff57c8e2f431118c4e2c31f6d21d6a86b1b8260145ab0f WHIRLPOOL df10532bdd702a7b28bd8739b72089fc60cb46b40d409d49e5a69c1004c1bb1593bd37fdfbfcdbb48c413ed584d28b5b894074dcb060b27ca550fbec0ea122a8
 MISC ChangeLog-2015 915 SHA256 b51cf9b6ee0bcf0bc6f60e76bbefa89c69a16cc44a0aa0b2c8402939ebd0fcf0 SHA512 85c5d38d9e2dd04bb0a888db5325fab2bad19566a2f226e339e5fecff8293dc4d96be2c72d0b5c9ab94769f07ba72738c9716059f139d2b071a464de10d31bea WHIRLPOOL 553d6e3372b5907037f7e6b9aa9cf59aa6cf8921dfbd9659674017b23f9f77b64dfd0d2fc090950260b79663c25a635a10acd5fd4d6dc578a87cfb6b7d827a36
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-puzzle/penguzzle/penguzzle-1.0-r1.ebuild b/games-puzzle/penguzzle/penguzzle-1.0-r1.ebuild
index c8b350a1c9fd..7dfc3716a0cd 100644
--- a/games-puzzle/penguzzle/penguzzle-1.0-r1.ebuild
+++ b/games-puzzle/penguzzle/penguzzle-1.0-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.naskita.com/linux/${PN}/${PN}.zip"
 
 LICENSE="penguzzle"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="dev-lang/tk
diff --git a/games-puzzle/picpuz/Manifest b/games-puzzle/picpuz/Manifest
index 1412b13a92d3..b788696d2eea 100644
--- a/games-puzzle/picpuz/Manifest
+++ b/games-puzzle/picpuz/Manifest
@@ -1,7 +1,7 @@
 AUX picpuz-2.5-build.patch 5499 SHA256 25784542c35c1a0847db8b293190c03e66198af1389bf8f397abcaeedc3733c0 SHA512 49486aa996419da06fa7a14ac61c89930c1ca79f97615253bc1c4a96c7bc0af405d52661e1dd4b5186cf00877cde5b698070bbb9229d50e27a1a981de03d2f11 WHIRLPOOL 3d176a4a51e0a41ddb655bcd8d55bff9f7868f8a268e1cbb827f72bc9f4f79e5dc21b04e6dcaed7f0bfdb4b035667678bc25c588aa4200a29ad2d2ee58e415b1
 AUX picpuz-2.5-pthread-underlinking.patch 842 SHA256 ec3252815f421a0bb60b680479d2da68f5672abb1b556dcf577bbac4da2e7306 SHA512 12c5d7e46d9db2312b24524c33877d9fcf2c6f94bf822d03bd24f021d91496b1759af078582311663e28c98405d274ee30179140b92e44b9ddaca4b40a05e658 WHIRLPOOL 498f3775367ddc1afd4a8838ce5cea0a0d7c6f1a1a44836ffc42cbfa093c08b0d985defae9807e0b6161878fb45ba3882f89e6398e649085bb34512c780e2602
 DIST picpuz-2.5.tar.gz 267452 SHA256 3caf92b00dd4739f68c557d5c952216fef01ca5de3c83e453ef177648bdf70f0 SHA512 598507b29b1218f05ca8a0d1a5788607cd3db899cad83ce84606d268d513c75b863986d518f0ec134cac0a5879515a13cb794f87a59bf55b48217fc6b1f5c386 WHIRLPOOL 0496c45d377a6fda3ce795a85fa640c06bf51c7308c164b3e08d76c125727d468eb4836657f11a3435341defd58eea03dee5d7c9b7386d2ede9974227dd2c614
-EBUILD picpuz-2.5.ebuild 1131 SHA256 7e1292d917683cd73839f4af32338620a2789de6639fa0b307c32dc247c2b379 SHA512 f93e0f923ee4a2b61ecd4f50ce7b50297f3b8dbbe31633723e181c8143a89b2cd371af2baafeb64b2ec4c06b1c0c15b90a4beaa887f75eae200a4203b6e2a4f9 WHIRLPOOL fb133e3bc9d1a9b8dc0b6a888b530b8bb879939095adbb05960b46795465f309665d67c802dca08d3fba5125de94e84342d319543bdf87ecbc01659f00d2c2f5
+EBUILD picpuz-2.5.ebuild 1133 SHA256 01770b97e84c08aea8f5b48172a5861dea083183792e4a3005595792bca84f8d SHA512 ec7e3694901170877d62b12d451263ecbbbb4a5c045cb4c4ff8f2e57505aaf349875eba2be1b5125365bf0a1f24989a372866eb976cd82026e3279dd54b3fc0c WHIRLPOOL d0db5c7f6d67fb2eb3d893436bb5ab704b593201f9613d4aeeac6280c97388d13f502f9f1e752a291d08a751061fa4b5fab3d884be5992682252b41b0c587b5d
 MISC ChangeLog 2764 SHA256 c785baecbf05885ee318954eb8b77ac4545025cec0e2e35e02b7712a8b18472b SHA512 cb1ab7a554312e404d7b1f95f8f28466a3817d3aa45bb723d9df64d9448a8fea82cfcb45378d29848e66b11c2bdac08ffaefeb3715f8f845f454420ab3de6174 WHIRLPOOL e52001587c8742796cde31283db85974c26f947a12595c9e065bb571611e49f4d7920f93bbf826cdafbd1aa4a17e7d2926bbc616b50be12fae814f5ec7e11186
 MISC ChangeLog-2015 2624 SHA256 419ce8429ee961570e7cf498d8f84ecd28430e5bf36e317f561d5051d4a5b255 SHA512 34737da00137d86970fcd0eba441999762bdcd6ebda49c2125d526c11cc7c7443d09212505e548a1cee6ff94a038f30193d6250bc53b1a3c0b062c44d430652b WHIRLPOOL dc6f318d6402a9154584c3e7e000c19ed1514fe56ae3e0ad1e7abbda783539021b0ec4ee57f5e4f92e1013326d82aebadc6c10c58a07034508b49033ffc2391a
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-puzzle/picpuz/picpuz-2.5.ebuild b/games-puzzle/picpuz/picpuz-2.5.ebuild
index 3a4fe2400ea9..5d20e42bd953 100644
--- a/games-puzzle/picpuz/picpuz-2.5.ebuild
+++ b/games-puzzle/picpuz/picpuz-2.5.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://kornelix.squarespace.com/storage/downloads/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="x11-libs/gtk+:3"
diff --git a/games-puzzle/pingus/Manifest b/games-puzzle/pingus/Manifest
index 368fe9751d41..7ef97a17d8da 100644
--- a/games-puzzle/pingus/Manifest
+++ b/games-puzzle/pingus/Manifest
@@ -2,7 +2,7 @@ AUX pingus-0.7.6-echo-e.patch 489 SHA256 34884a3794a5cc781468ec4bba06e2086c1e249
 AUX pingus-0.7.6-gcc47.patch 1242 SHA256 918dcd8a1c2850af5a6b390d92fc0f4f8670a2e002fc15d01d171bbb97c095e5 SHA512 998aa2c9547fe82775442b8f234d07724642e342d7ccea724726c9210559b1cc8ea5e19d51c7d0bbf61b523cb83fa198596b25e6c6e1ce9882d75d73b9d67f68 WHIRLPOOL ccff5e8ee90a744c15852821a7ca62ea0603ac8fdb81069bb6936254c7d4aaf2b81b4432609c160ebc23ba6e08e5452c90054d092c7a3a6464ff18fc50aeab1e
 AUX pingus-0.7.6-noopengl.patch 388 SHA256 7b21454857240c46ee94e06cd18e80c6ffc390256764dde50d42c699fc942914 SHA512 431226d068ffdadf33cd1b73c86e2e2e43de3def166c42cd0592b58e0025f842f579bafa4532f45acf05f4490189d26c679a4b0bcf4f16818aea307b2efe5eb2 WHIRLPOOL 8b54118d4d226ebead2ffe3ffde119f3bd51b8b5e4b692ebac9d9934f880752825b5883b5a9ad34d1c29879883050204fb651891ba181be6b85c7440c90f7f9a
 DIST pingus-0.7.6.tar.bz2 12622268 SHA256 759c1253075d1e72691bc1e770b24cdd51917041fd1857c1daf85b65a6686460 SHA512 6c8c2ace1a9229b4e3b506aee76aa94c0dd906a64fa2c817902c2cd3854df390cf675c8c6ddd3ba1926a467348b2103818bd44bc095378cc7bf3f2ff7af27188 WHIRLPOOL 2c4bafef86c40fec3fcfc9ff4b298e72919c8309d475aa4aeb4d368927ac611801f416375108091d9f40bdb2703633765125f6f7ea361186f637e2d5234e53e2
-EBUILD pingus-0.7.6.ebuild 1224 SHA256 961e457619f09a5e12504cad7bfa0eaedd318ca1ef75ae8079544562e4b89849 SHA512 5d3e931d35cf7543ef31162dcf542a824713d2769a33c25c852303c7981fc72adadc8dee59b5754c420e809167dd824cca52c287424b733c9102782a0b10b6b4 WHIRLPOOL 904f60f8e31e511296418dab3b226fbda4dea779bfe4d92cf7c69c3d5b8d68b276c4c9ac6f891d3cab5a64f01762c9e3f95100ff8add1da1f73a946da1b104da
+EBUILD pingus-0.7.6.ebuild 1226 SHA256 b31f745898e37322f7aea723c56f2ba658844876b0380b141bf22b24030badf2 SHA512 8546fc592c8dc7462b64535b70572ff45e828efb6e05b5dac4c059921c0428c998feba6a80e0788925e957a557c2beadfbbae6908379eacd145286d2a731606c WHIRLPOOL 980937c4cdae286c2472a95ffcf4f7ae75777d48d96c66952af267cc6fc81b70f1caf130f39109e75e702832cefe66aa7038030fe1f5b0cc9cba9591609f6c8d
 MISC ChangeLog 2918 SHA256 da688e2d4929d2490ca4b1ce9c7c802ffffb1df5525f8ccc4db855a1a396d3ef SHA512 1d8e96c37fa51da6c7cb4eeabfd17c9e878685794a00fd13af6e0d68008d51b9746ff99f1646782ff1cd113e47da35d91e4355cf1140b39f3ef1acc3bcd33f9b WHIRLPOOL b9e43ea6992775cfd61cacbb5601d2f1f7747965706c7331a287065683deff285a6db992f469a5ec975c00a669ea610a254b073a727f6006ddeb33a4b2fd4cb2
 MISC ChangeLog-2015 7063 SHA256 d666f020e7dab1ec0d244e955f440ddfe1ff9a083611b40529d6f4a7563da3b0 SHA512 8758bb56b513263ca5ba787864e9437cd52d151e4a31eb7579a3eeb264776000e7e0790b9566501735f12ebbde9b0ba0540921c572a343d00ed13e27279c6953 WHIRLPOOL 3ab528c0623ceb154d6a2db414f5d00b4c52e7eb78f32a2514957a83074a586d2691561f36de68eb30d44f1298cb10ab43a9e5498baf3e3313ec068c3d492114
 MISC metadata.xml 1283 SHA256 a31c693f896436f5aae0751bb3b7e6ed5d671b14f9b730395227ffb9f1e599b0 SHA512 04c0f4cb00f8b50e5f589d6bfa48389fb7fb2ff0ac2343c625f98383ec41ea77d63dbdc14d12325f3837e4961c544503f1a76a4298fa061458a71b1e198c8219 WHIRLPOOL f613897df74d069739f56e09509883c2bfe40b66bd1e6d91c553cd6be149c83628248abf9377c981cc638b4c6b568e7598f9c34f987c79d86bbc66d01718d85f
diff --git a/games-puzzle/pingus/pingus-0.7.6.ebuild b/games-puzzle/pingus/pingus-0.7.6.ebuild
index 7ae79d15e5a0..f5f3d77af9fe 100644
--- a/games-puzzle/pingus/pingus-0.7.6.ebuild
+++ b/games-puzzle/pingus/pingus-0.7.6.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://pingus.googlecode.com/files/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="opengl music"
 
 RDEPEND="media-libs/libsdl[joystick,opengl?,video]
diff --git a/games-puzzle/pipepanic/Manifest b/games-puzzle/pipepanic/Manifest
index d80db8b30e29..862a1b817ed2 100644
--- a/games-puzzle/pipepanic/Manifest
+++ b/games-puzzle/pipepanic/Manifest
@@ -1,6 +1,6 @@
 AUX pipepanic-0.1.3-gentoo.patch 584 SHA256 e71d9c290a37bdeba2f64d2f371e68ff0c944ec65453e2cd6571ea7807df47b1 SHA512 0fef3b79063bcae38412679ce5644d8d119ba3a86b8a752234d97b7009044373f6cda8e983b53864f266e5c00203fb278c61fa44af432014b1aba5a402d41bab WHIRLPOOL 3664c501a42521c612b80d1159bd888848530ba9ad795084f848e37aeabc47294e054d4a56db25d6b3a6a3de90c67a554037418b95b2c158f05d8506b5a5e24e
 DIST pipepanic-0.1.3-source.tar.gz 232200 SHA256 4b02249c92228b03f4cc3c1d999cacf3fe52c16df53c6bf76fc6c1e2caa74318 SHA512 468f3194976c7030c2fa3d8f30eaa13cc25e0b04feeb48a5d1267d119eb991618bad14ddba0a8268e6b92f38f2a17bc5b119728b222b0ee50494807832ad2ab7 WHIRLPOOL bdbef665dcee14b1360d1726701986991f8adbfe4da1a4f429af725bfa74232efc9736ced944ecbd7a6b216a7af39d698a591fa48d2d279875f953f024020af4
-EBUILD pipepanic-0.1.3.ebuild 913 SHA256 0060554d94e3e571edad7620be61dbc37aa19f3ab17307881c9e2ee1638ab638 SHA512 3b46becea6efd4b420d850f38e091d9d2f6c6d77ff1da87b7ffb585ae56523f26104ffc97c47c7b394d03306b192d7336c2ad1b34441eeeadc87af89f4963ccb WHIRLPOOL d1ecd88bc81f87198cc3f1c1b3630adc67d63b1e8ee05d8d1ebb6053c7318498eff7c264cee914b9ddea8f4e7c899f2b602caf5c504f87609b971ea6adafe910
+EBUILD pipepanic-0.1.3.ebuild 915 SHA256 a03798ada3e911d328dec586b348d2b0ffd3a4619974d225bb367b9715ba1e04 SHA512 2a0c227ed5cf835fecc4ac3fd88e166c0a9c854f386be6263882c3b27fc5680c0f2a9337b8fdc7466b9c9286645f18ed50e91a886071e89c1065240f9e1138e4 WHIRLPOOL 8609aa18fdf282452a1e59d353544aea0cfdc56296195c6ed943abb8e843e4554bbbd3d4580aba5a9f550013d9163cf8da968721624015b185efb818f446310d
 MISC ChangeLog 2474 SHA256 ee30a0f098153ea0085493f31e23baf06bcf4455475281a980e779806a6243ef SHA512 ad20898d1d5c796cdfc8c405d80ac34d0ef9e05180e02f70dd47f821ef054b730a9644f00e5fcd18ba416285b4da9d6b420d2f1fd26d02829a62f4aad083b66a WHIRLPOOL f2bd50502b00b5268994dbf6f242e58116c92e4a7d61894fb6aff274347256e0255f82f15cbc723553449c729f0d5957dac78644616d3305bc5a8a2eb78b4403
 MISC ChangeLog-2015 917 SHA256 0f1bae5351a165a42d67bec088d9efed6c66c465dc2a792ad0ed46cd5ed52392 SHA512 78d77afc48121a31bfc7e4d8e818d778f06bae9a72b83246d098da0c2a0966f74a3ec656eb23c72fa93cf7d62e8eb88aa01d8801f8a63d05e83048990feb193c WHIRLPOOL a176c9b76721bd094f699ca371f018542b1b03e728a69de37394432e8b3aee645b56c818e68a563ed2020ee161ec0b8a599638170e29da8e8f14b2d2776f0031
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-puzzle/pipepanic/pipepanic-0.1.3.ebuild b/games-puzzle/pipepanic/pipepanic-0.1.3.ebuild
index 30c1bebabaee..0ccc9171bcdf 100644
--- a/games-puzzle/pipepanic/pipepanic-0.1.3.ebuild
+++ b/games-puzzle/pipepanic/pipepanic-0.1.3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.users.waitrose.com/~thunor/pipepanic/dload/${P}-source.tar.g
 
 LICENSE="GPL-2 FreeArt"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="media-libs/libsdl[video]"
diff --git a/games-puzzle/pipewalker/Manifest b/games-puzzle/pipewalker/Manifest
index e424d2bea11e..277228e25304 100644
--- a/games-puzzle/pipewalker/Manifest
+++ b/games-puzzle/pipewalker/Manifest
@@ -1,5 +1,5 @@
 DIST pipewalker-0.9.4.tar.gz 948399 SHA256 d6d7717f1f333847cc4a2e9d83e97b971b3bfb539d99d4ae30a5140de6e386f4 SHA512 f4930739732164153663d11036eb2ac09447766779bc80bff4d355fe1bb764d617510ecf8d804f1ce0d81f58204b4e4049fb76246bc4e599c06c492b9c771951 WHIRLPOOL 4bc9d4368829ed58704a7b31bb0d25f7e3414d61ff5431fef252f2b7b9cab8c9c1341d41dc3dcb998d13d9740c4ff5877201462b5914818eda8bada1bc59c77c
-EBUILD pipewalker-0.9.4.ebuild 733 SHA256 66ea94de2dae6e0cce158fb073f4920c2af5e3a14fc2158d4f57514f6e213c1c SHA512 d4d266091d99af555ba6c1343e045a319021eb14690f0be092e0e477605fbb80475a17fb9ea367195c67050caad6a5c73efcd8d7c0c0994bac0a94ee7997aab9 WHIRLPOOL dd3bc698f4e3cf059b40d350784c0e219f76617bea4d3a09bf66c4d1038345de1020189123b595f6108ac8bff2dfecb1fe093c7c76d3882bd7c44faccdfdb822
+EBUILD pipewalker-0.9.4.ebuild 735 SHA256 7b19b12ae3dfd976fbfd70b17ffb5306b28a31ea522ce2c8e60106f54f960fbc SHA512 b063b396d050f75719d28355b560d1b0592d133dbbe98c78fc0b10abba98228df91a025ffe5c0e77b97316a71cdecf75f6e1382984162712828e83141e7956d1 WHIRLPOOL 94dbdee39fcd4facf1fafc69d00fda935d63a5a7d4acd5f6258ae137fe6809569f8ad5b2f72c6f3bd83bf2f8c50f82244f72f6b8f580ff7a4aca5a84d566c4a1
 MISC ChangeLog 2440 SHA256 7c5a3d6fccf84ae9a7a3ed4b14fd2e1321b27f8a7c66765608c3d19e530b699c SHA512 a301cec099284e504aaf4a531770c0a78b78d9b4f6846b328e9591c5f7fd2825f2b74901ec0f898ab813f42c94e62710d34f144e902f03ef6c21756e259b07ca WHIRLPOOL 6450d4165e947555f142864a503986361d667f5d226e3c9cfeb7aed3f3d4daf7a4e1d80b6360adda2bf36cad32e2a2ccd6ef2d6dca4bb4851d08a2de1b6da600
 MISC ChangeLog-2015 2270 SHA256 a64f14f4a1b9695f84b7f858d97b00f1a7098216181c107540fce5a1051fb4fb SHA512 b8ed542c70263d79c3d5f124c6bd77202076c2f8ed3d05afb4a47b4b1e5d9430a194caeff26c7bc839701058a9798c41fa4dd607abdab8058fc1c71739cfda98 WHIRLPOOL 9c487804c0f21348452e5d34b9a6b8de2e1d44649f34e714002353f080bd248608f60a01cb68d13dfd0c8c346da07f685a572bec123f1e6bafd51ee60ce3ec8b
 MISC metadata.xml 333 SHA256 8e4d2dfcbad9f1e55650f1151f86a240a3a5af09197926036103ea8bbe517b98 SHA512 51d60e626855010c46bc4d9022cb7b84965eac827ec82fe2cf02db6e9f7706f9f81cb2af66fe4e4bab64963cc64b7d5d6009aa38a850ec87322fb07ac1c7f0dd WHIRLPOOL b6e895dd2b2679acc0f5d6bccf0cec217a2509f277899f4f01e50d3379e8cec5226a02f72af4517994eb5f524f145d51a051c31fe694774287614d3bc1140ac7
diff --git a/games-puzzle/pipewalker/pipewalker-0.9.4.ebuild b/games-puzzle/pipewalker/pipewalker-0.9.4.ebuild
index 391fd745aa3c..f0b06ab7c7b5 100644
--- a/games-puzzle/pipewalker/pipewalker-0.9.4.ebuild
+++ b/games-puzzle/pipewalker/pipewalker-0.9.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/pipewalker/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="media-libs/libsdl[opengl,video]
diff --git a/games-puzzle/quadra/Manifest b/games-puzzle/quadra/Manifest
index 4154b85b3035..34ce6e0d5e71 100644
--- a/games-puzzle/quadra/Manifest
+++ b/games-puzzle/quadra/Manifest
@@ -1,6 +1,6 @@
 AUX quadra-1.2.0-format.patch 487 SHA256 bddea260dea75143a6a9df43a520113035ca5fc11feb7ad82e35f47b46ac60ea SHA512 5445fa32a10a8cd96da756727087c7f6dcdca3a92f662764ffe790caaf498a055c02e4858c3bdcd56f1ebd57b958eec0e347f7919ca7724f2f6f12c37249c2df WHIRLPOOL 14ba03798f5cef684efc44c924898222f9c35fcba44f7d5b6ce93fc83d2f9eb5c7759c884489309151a7bb683607230dea2703bd931b402c253888c22103bd27
 DIST quadra-1.2.0.tar.gz 5103875 SHA256 0312d826668ccb71d60a1d7229ca644c547a04d12d1b738dbeac7ee68e5fb643 SHA512 1c3e1020a584fa83595b7b183d5346f8e357ddef6b29c0b4a3797e2ace50c6e9ff14f132b8299ca582db739f4d699fa8ab94be93ef86e5a01389f958ce91e837 WHIRLPOOL 62759ce2f916a219458fce8609f2137e836b5865e005058d70d74d4af35893f50dfdf5a481ce92f917e6bfd19b1149fbfc4b9c7704664f1b65b3887276bbdf19
-EBUILD quadra-1.2.0.ebuild 915 SHA256 99f058eae843a541b1cb1b511079e75debd8cefd9ab139542cf72535ea5062d8 SHA512 355ad768ca54ade26c1532a95923a9af5ae096c0ed148c25cd3a966f6b01e57d648c7a548170d95a2e2ae60acbb1607de61bd2624ac7b68a7947a1c4bf966c41 WHIRLPOOL 4f93cc29019f874ae054e10d12577cde557328c61ec8cca76652b13124371db0ecff5e38481ca0e4417201decec327464efb2c69a5266815c2f876f059fc356a
+EBUILD quadra-1.2.0.ebuild 917 SHA256 f23e8e6f9015936b80c81b831f11de63f073412a6e68fea7d90aef29398de143 SHA512 00f5b130eb8a988f6628c6775179b269fbb03fcec9e5f6073213f26172832a4e38827dcabf12a80f391881af2b14d1031934c3b22c1597895c0efeea840384ec WHIRLPOOL 7258a0656f75383070cf5c831a175c1ebb4a49ec26fc2669aacfd2f1f217fe4e529552c033ff0f061b976bdbc3f4dceca771851b1a8d8d91dd0095e54eaeab60
 MISC ChangeLog 2933 SHA256 f1e1e5359b0c60beb7c12a16bee1f8ebaa93f626c46e162a72bd7d71eb4438c5 SHA512 8fbdc720f60e547fce60201dbd635f44ac0369932dbb88df4430f45fcb424089c223de2c37baeef3d7ad48890a7c0977205e4ca186ba763f911d748470b0f119 WHIRLPOOL 27e8bd3f193843e7183c12036c506c44082f0fbd35d2dfbdae4e28bd5c336504e28a9cabc9e578f13cccb0f15d4e8290d8bd35de569f7861051d63349cad9644
 MISC ChangeLog-2015 3441 SHA256 24a74097b2bbfe5bda61b3cfa5becd728fca3d71fa4518cf2f87681ff3200946 SHA512 fa7493d3c6cb14c2c13913e72ec3f0e8f39289f6780e9e843f78fc45dcd61514598492b38b7bde9503f3635c8fe026e0f39d5cce362ece5c829331c253b9e35d WHIRLPOOL 85c05f7b4ddd6d955b0156cfabe41a9e61aa17e315ccaa37b76313141b8580db6432fea6c9c9bc1019531fc22cb16d5f180a5a6b6bcd040e561dfc1ca75cfac1
 MISC metadata.xml 329 SHA256 3b90ab4903cb64b29408e1c85dd0bc297440494099e1441f90d31ecaec3b774b SHA512 81750413c002a39166c0802840aac367a3b07f61a1c711bb68fdea6f8dff71f4689c24ccf75c61336f03ddea9993c45c5b869d2f3467540f4695a35da9a6438f WHIRLPOOL fc59181764f7ffd4d998a221be040a325492dab4e04ae1a0d3778781a1342c33c98e886b66505ba3880a6161c8536992d5eaa9bfbbb2829f63821ccfe231ee06
diff --git a/games-puzzle/quadra/quadra-1.2.0.ebuild b/games-puzzle/quadra/quadra-1.2.0.ebuild
index f1633a7eb7ae..6d62e04484e2 100644
--- a/games-puzzle/quadra/quadra-1.2.0.ebuild
+++ b/games-puzzle/quadra/quadra-1.2.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://quadra.googlecode.com/files/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/games-puzzle/rezerwar/Manifest b/games-puzzle/rezerwar/Manifest
index 43cd766c446b..37aa14a27336 100644
--- a/games-puzzle/rezerwar/Manifest
+++ b/games-puzzle/rezerwar/Manifest
@@ -1,5 +1,5 @@
 DIST rezerwar-0.4.2.tar.gz 4332498 SHA256 a93ca501803c2fdac0fb695d9a1eeed45807307316d28d3eb8abac8849fcaf02 SHA512 0ab1b00d982a96f2fd1346ff822efc68ae0e6c14a4d190ba0e8720fb119d7750851803c1387e83b93eee9cd43e332631360a67534495c20969366c885e2297ee WHIRLPOOL ee784734ac0e63de75a2e390396aaf2601285aeaf817da94b3e38056e8d7f93c13e6e6ad436ab50c703cb3da0baf9166ccec6e5ee4722b30a5694befc473a6e0
-EBUILD rezerwar-0.4.2.ebuild 1096 SHA256 2fb58e11280f7bb3292c616a4fbd9acf2a8ce296fb77fbd59f6937ec9733ae5c SHA512 2196703634bd545e96406a5e2b568aa3893ae3057e95803d07726d4fab50b1f9a78725fa9eb4641a3ff2d67700a6ac40b399a89cce7c346613034e46a430c5d5 WHIRLPOOL a0a4bd9cef28107df1716d03bc0f17ab3e762daef077e49392544c0c3001db162af9806c50f597891d9c789ac279330539c7c30b405bc35883c7e875e720fbae
+EBUILD rezerwar-0.4.2.ebuild 1098 SHA256 9cda5f1416169dbf5d459f45bb3c5afeaedb8d4656d8eb0a17a81e5f3a16884b SHA512 fac9f93ae7474cee8dac73ae943cf3260334c3f0f49403c170a7b201c55693551a9d4a013ad6cb95ddfd1f3898b183f239b8851c888d97177da69607a67f7aa3 WHIRLPOOL 9f6b4c6afd1f5194dbcdfe3f2991a38d85d606ce6f20dcafc277f75674e3f396c3003ebf9a1c15d86213f06588c39ac7022002e9c10cd1599da222e7887ad526
 MISC ChangeLog 2434 SHA256 41088a24b169a63b6a750b1ff1cfedd10ff5a71583275d9de4b8604d0ba38a61 SHA512 40ca5e4bcbe57f144e1e7337f7b3b86e2f41d00813671c989653bd2ca30916dd2c3817f79b4db5c96bc4d3e23d46836f337ed7ba716bb3b318d225b81c3882f2 WHIRLPOOL 43b80d34c6cc4e9af27d5692bb6138791e445586a36efe43d8aaa24e62563bea0553ec8e1689c8d2501dc64123f4f5f0e5d0250201b7ebf52d45a593dc68ef69
 MISC ChangeLog-2015 1171 SHA256 00198b90bfd3e387248e9979fc55ab290e5f6270c52d607d09c295cd56088a40 SHA512 3a54a7b698f215a800f045a02353d7139011d413390cdc5b455bfeb9b204d768bb2e89c4ca611472173b269e6e9aad41c0c286385e66c3b39c04fdeea2c0c5d2 WHIRLPOOL 14af53fd427d2104e45462f247458ca80c21cd4ebe57398ebfbdf1f3ef1fc1b2eb524509ced9e4aecebd5e43a8f259f3282f533c10a293d0559fbbe3f14a039a
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-puzzle/rezerwar/rezerwar-0.4.2.ebuild b/games-puzzle/rezerwar/rezerwar-0.4.2.ebuild
index ca6c981355e6..ec7c6c3447a8 100644
--- a/games-puzzle/rezerwar/rezerwar-0.4.2.ebuild
+++ b/games-puzzle/rezerwar/rezerwar-0.4.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://tamentis.com/projects/rezerwar/files/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="media-libs/libsdl[sound,joystick,video]
diff --git a/games-puzzle/scramble/Manifest b/games-puzzle/scramble/Manifest
index 1375c3c957b0..aa534585bbbb 100644
--- a/games-puzzle/scramble/Manifest
+++ b/games-puzzle/scramble/Manifest
@@ -1,5 +1,5 @@
 DIST scramble-0.9.5.tar.gz 552301 SHA256 9f0d27c65962f333f2a54294d1b42150aed0302fc12548a89c44d9f721d5d56f SHA512 ff361cefe842d6b2019a78571182fe35fc77a1332d6365211af7cf292da8532023bd565b7eed8b44545716474d441b0793253e856a1cad937f62396a5a29bd2b WHIRLPOOL 6361eed7868d79ed556cec368c439a534e08d3a4fd9ab4edd97a4af515f9fe1d2bcb92d8c972e0395755b33a5ca432e820a6a1e960f0003db237f97f4fdda81d
-EBUILD scramble-0.9.5.ebuild 764 SHA256 4fade3f172cf3db09addbfb1480afd34bbccb756d00afe93a09a9520688502f0 SHA512 9e2625bad8d58ad5cfdf2b1f2374f5050846bb2f355dde6692db23ba28f1fffcd245ca803bce49db3ca7b729b76ccabc99658ae47cf65fa583cb77ef118c3507 WHIRLPOOL e4b8243dcacb3361074ae05c51c345892fe20817af88b795e30efb7e582fcb035302bb4e425275a3184316140217d82b9a121303697853a4db41a983daa7c379
+EBUILD scramble-0.9.5.ebuild 766 SHA256 21c021aa727bae57d6f0645017cd6c6e91a7d70fd856bf793bc27ef36c581fbb SHA512 06243a3b7d5bcb249d44b51c4752a18f56b73b9887cf7f1d63c776c7b6e45d51340c4b03ad7e4f4c2a8b8a3944f7ab66c25f8e60a66415239751946dc5b059b9 WHIRLPOOL 56203fc442131414d39b18b4d215b94a41c0ea50bcd3be73b2524f2c643a0718827676067d78a79105e60f8920a01d8c54539a5f9572be9aa93c86b19c9cd6ee
 MISC ChangeLog 2588 SHA256 371f63c75ade5555a3695336d697f09a71526515fc5122102cfed78d00fffc92 SHA512 aade350c3b3a75ffd54dff11d1a7938e511f8603306c62ef150ed134fcbb81a4b57bf90f96ae7f72ec742c02fb7e6c20c9d7ac26756a83c3b9232158c86ccca6 WHIRLPOOL 690232263ae1b5db782a8d833d0e8cd9ea8ae5fcf8134fdda472cf333cae33d83657695ff5e27b573d6d6f5ff600a013e6463fc47af024bc6d2b5436df2ba524
 MISC ChangeLog-2015 1492 SHA256 eca78e9c6d689f9e04e8502dc250b9b28efec400d82f10c77428b72d7815f43c SHA512 baba9dd6cfc40944a0e7a5b6d29850d082011bc039b920bbb60293122bf5e6f016ea167bb5ce8362cbaa1cc9c6e3160d84d99eca7791f5ca58ab1608f6e7ee52 WHIRLPOOL b0a2a0714bb3fc890eb4c456e6d26d8cac5ee09c54307ea5f39169c0ad80a37792337c8a56864e344122d008aeba76560495e6a6b8c69057980173932953780e
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-puzzle/scramble/scramble-0.9.5.ebuild b/games-puzzle/scramble/scramble-0.9.5.ebuild
index eb727787db44..04c3496512b2 100644
--- a/games-puzzle/scramble/scramble-0.9.5.ebuild
+++ b/games-puzzle/scramble/scramble-0.9.5.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.shiftygames.com/scramble/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND=">=media-libs/libsdl-1.2[sound,video]
diff --git a/games-puzzle/sdl-jewels/Manifest b/games-puzzle/sdl-jewels/Manifest
index 6ff29422b257..f62d33393d79 100644
--- a/games-puzzle/sdl-jewels/Manifest
+++ b/games-puzzle/sdl-jewels/Manifest
@@ -1,6 +1,6 @@
 AUX sdl-jewels-1.1.1-Makefile.patch 488 SHA256 8a5f03da4997d663b488818896b500f8351ddb285d038c198feb6851c83b44d8 SHA512 9d83dea588f699ef09f89ed320bece1bb001ee0a1bfa4d3e4d4b8c679af9b2028d535469c078f387564b37a16ee0e76f3e9cf20a4248784bf322ac902aa03f26 WHIRLPOOL 98e8f77ccbd9741bb9bfe28d31ac3fa2af4e6c4234724e350acb25e26dd0e6a21b426c4ef8f6d94d187b585f46fa8c8bbdc507fe70263605ad32dacb29a354b9
 DIST SDL_jewels-1.1.1.tgz 195366 SHA256 c9a40b7e18fabb03e4065e656bc2c30f595103bf20dc74a10847c3f3aa138ee7 SHA512 720f1d89384bf267e8f5441efd70fcf94bfc89ddbd0ff90b1dafc6381e83e005281fcde256ee4cd0645f2832cf9c22aed487c105d7d9cf39711c5752e12763c4 WHIRLPOOL 8ce6f3409a50a2ff673e545f1333f7f12d6b37bd6020f22d004072d0266be3936e98e0212925457f5ede4adb7e0f2346bc5c8a00b3c8e74b3f4b61cb397f78f1
-EBUILD sdl-jewels-1.1.1.ebuild 995 SHA256 02535733d49befe47f4e7d204e941135c65a4577d6360c45ab4afb55ede47aa9 SHA512 377e48fe2e33dffe630e227efce8fc168f6112c46eb2fe7a4638de3317e24124e3d257a1863d49379d3ed6a0851b5ab408d875619d6e8e700013d781e76dcbfb WHIRLPOOL dc81bc1f48527c9507439f32108a1a53ade0d50a001ec2ba8ac5b4615ef7aceb4cc7003e61a1c4369eac39fdfa835083bc0a2b693adf30dcc3712db8f11b31b8
+EBUILD sdl-jewels-1.1.1.ebuild 997 SHA256 e59ba9e846ee2f8ccb3bc72b2b5fd839191cfda5c4b1f3e3616a0de24b392033 SHA512 4433153a1565f29ddbb9400772961960c44dc622bba03eaea69fb48c1b7d790a6c31f404b7e854441e568c2f804bcedc1635169709128827f5eaf10635f96c2f WHIRLPOOL e41ba09181dc93c69e28b92959ca8682212b7b36c2c21ea8354e689142ef853188a5c8058c43b8e6fa3eb1bce171de1dc87d13fd1869aa8b7dabecced7cf56d2
 MISC ChangeLog 2482 SHA256 ccde2f4a0c17d8ce1faf8250acefe0d46b34dc59717d35bbe9a6b6b43727aa0d SHA512 aca28ca6e9ec7e53f94ba0b132c0eb74fd5c113ed1ac8408dd7e09aef2dbc1949b0a9db4e9ab54e9328d98e6e6b2c9f9b0e15d48ca17516e77ffce80e2397abf WHIRLPOOL 1799858812dab939b8ac800a54dc7eef651f44d853275606aa70dfdb8e700756b112819ed40e2a8c345f3765cb6faf6b878ce4010699d53472ca887ff2e67239
 MISC ChangeLog-2015 758 SHA256 ad30ef6fe26b8700beedbb1a8dc58f4bfdf40f2c4c06f5816997e099b64ecdf3 SHA512 c3de28c806595017f73bec6e7e08be1f68159e8828718b1949889c48ade0373d4a09002d174e8249b33b64f0c32913a83a7c17f971ef515f640f4dccab7fc0cc WHIRLPOOL b3a09cb46cecacf36634d9f6e29ef2eef4a17461e4db1869e4cc006fe44deacc9009b66d1d0f3d627466d489e7128a3eae57255ecc7ac14c9daf6fb0658b4b99
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-puzzle/sdl-jewels/sdl-jewels-1.1.1.ebuild b/games-puzzle/sdl-jewels/sdl-jewels-1.1.1.ebuild
index eae86f8bc780..98377fdd0a72 100644
--- a/games-puzzle/sdl-jewels/sdl-jewels-1.1.1.ebuild
+++ b/games-puzzle/sdl-jewels/sdl-jewels-1.1.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.linuxmotors.com/gljewel/downloads/SDL_jewels-${PV}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 RESTRICT="test"
 
diff --git a/games-puzzle/seatris/Manifest b/games-puzzle/seatris/Manifest
index 481683cd13c6..625dd915c334 100644
--- a/games-puzzle/seatris/Manifest
+++ b/games-puzzle/seatris/Manifest
@@ -1,6 +1,6 @@
 AUX seatris-0.0.14-as-needed.patch 215 SHA256 9f4960b8b16b0449de238b5b0acc7e5d054613818d370d323e7ff31f6c5375d7 SHA512 587f8f4f555b6a97d38a0c7bb8069674e6612ff5e3027b7c7327a02178aabdc20a6d32f63b7a667eac31480e435f575844afdd79523707d0fcf586417d8fd38b WHIRLPOOL 76be32daf1705d14f46bf9598b3652820c87918aa881eb6116d271b1d9e6f265a40ff835b3243935c7c0c1d10cc4ea0e23422b1ae07d68190d27140e428a36fe
 DIST seatris-0.0.14.tar.gz 53056 SHA256 797ec1403dec2e6c790ec77d41bc5201055cfbef4d9ad7054270845c909d0a2e SHA512 105722ddbeaa8ae3863331126cf816e7d590ebe4ca244b32d3275071c2537c2865183a90f60f8dbf46cfacbcee4e811b653ff9cc6d2eae51c9ed6efa9263fac2 WHIRLPOOL 97a509c9a2c5cc6595e647029a69ad59bf20df255a958ce777a3598dcaeb7055a98cf8b2897d08ac0230bb71ff80684d45bcb9367c67699fd66157f809f28964
-EBUILD seatris-0.0.14.ebuild 913 SHA256 2ac281576580edfade01c9aa973290e35a59a396e6b3c3c23a928d8ca6d68df6 SHA512 aad1634574da19ff91150c361e19137b403068a12de83666a441bccd0500b576f8e835c39db65a7cdbc1fe7f95a021557d2ab2f0bb08278420154ba5de02672a WHIRLPOOL 9817cff056f224cdb1be2934c7894ee48ca066a32420c18774e338c2d21f4102dd336da2e1b1368b4d4188cc972658f792426a4e388ccde47e361d98c28933d2
+EBUILD seatris-0.0.14.ebuild 916 SHA256 8bbe6fb1b5457d81fdae7e96a1daec1f7798e2356c0816bae03cd4f0ed7ce1f7 SHA512 a4fd27855ebd40034b4d7878dd953019148d6c5ed7b1403c4a75b2ead6c8840b0776ab2bf340348268ee1dc9eb440841acf77f237728d5c41e89976e3347378f WHIRLPOOL c84181d05a940c0bd4b771afd7ec1cd96d7018f87efcc0d68a9b6e08ffc4db3306666b4ce63c45aa2173597ded54d83936c90bd1503fdd79c0f7f281721f1aa9
 MISC ChangeLog 2474 SHA256 b1452e51c556840d25c440d074f1d2ef3aff817ea315de7ce33e790c64309ef2 SHA512 b32aa964a508fe7a9e9c768c48ffa412e1e58bab6dffd4d3277c1be5283c13fa186989c095ce160a20324a10d8223db097fe41ac1a9dadb634caf8b228aaa409 WHIRLPOOL 6a90fd41ee2017e9c0ae751b44cd7309d063e0499f743a7b18c90c4408005487ec44359206ede42dacb92bdef4f71cd39b59a6c030f7e2621a4ba1482ca90e06
 MISC ChangeLog-2015 1517 SHA256 5d252e735a61d682b18c8b8d61d256c2b133c923d8bd4f83ba14d806cc229e6c SHA512 c7959042386b6ba4d87c2837fc0845c78c7f8283a15238c01a3088444e4d1e2c2fe7f8df2ecd39529150b0f3144afaafef08ab24c89feb25a383db50d698beab WHIRLPOOL e1fb0a9be172016c9f349cf4a7a641dca36f5ae1161ddd06389bd32f5ab7a56d9e7d976b92105a0081c57e570e997e6b08a78d9229009eb749beecc3b2c3c672
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-puzzle/seatris/seatris-0.0.14.ebuild b/games-puzzle/seatris/seatris-0.0.14.ebuild
index 19c5e07f0822..30d84fd4afed 100644
--- a/games-puzzle/seatris/seatris-0.0.14.ebuild
+++ b/games-puzzle/seatris/seatris-0.0.14.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.earth.li/projectpurple/files/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 
 RDEPEND="sys-libs/ncurses"
 DEPEND="${DEPEND}
diff --git a/games-puzzle/sgt-puzzles/Manifest b/games-puzzle/sgt-puzzles/Manifest
index e396f28d586c..dd0449e360a0 100644
--- a/games-puzzle/sgt-puzzles/Manifest
+++ b/games-puzzle/sgt-puzzles/Manifest
@@ -5,7 +5,7 @@ DIST puzzles-20170314.eedea41.tar.gz 2897824 SHA256 57c156fa7de2605a4ae0f18e54ce
 DIST puzzles-20170514.7bdfda8.tar.gz 2910137 SHA256 fa7e0e7d2f4bf43d4d5d91e0836ad87a133657a99f00ec5ee77504cd8bafda58 SHA512 b0acbc1cf3e2986c6c3a58a126ff4e9e8751e93ee9a4771e2fd8af6c98c01bbbe01db8ccc526fdbac1ee8bf9a4391c9b90d66e19458fdc53858a6a3724c02a4b WHIRLPOOL bae1cd85b3d4973db5e8610cb9b023a39fe5ee11386723e44d4ef7464615f9373d5b10f2d8cf325257709b3184ee40453b0262e22e427a8353f0e9c1c74adc51
 DIST puzzles-20171029.69773d8.tar.gz 2923623 SHA256 c075f5b1063a8881ad5efb393595912fdf9f7f016b5fce6082d14b0190522f54 SHA512 ca9885bcadd0bb979167f2f0b6129a17aeab6d7fd31eeabc9d29ab526a5a137b03f1f4aea7a268109c5aee1a522d514bf522ad25673705f50addd685401d7fb8 WHIRLPOOL 4d214667bcfef5f43c62efbe8787e3ce879a780b9886ea3fd7920202d2ee0bbd98622463ffd0d8392248a256198e8f67f674aacacebdec83eae34004f2f688bb
 DIST sgt-puzzles-icons-20160315.tar.xz 715536 SHA256 9ddc1b6d02b3c3358a9bc6b17c7070650f794cf5f650f25b2ac7e5def6674447 SHA512 2fe2c02984eb8c36ac6fb4195be7895b336b84f40ce8baeb23dc8a32aca9937ccf1d33050b4da3cfba3c87e124ecbdd940ee4e990b37eabe8e2af897c2e23b57 WHIRLPOOL 17bdadc9519320bc88af27f2db7a9c243f04d80e524db51ad9398831185e2c66f2430006c324fa7d5b70ce156cb9df93d9405216053b32101b5f56035a60f6ac
-EBUILD sgt-puzzles-20170314.ebuild 2429 SHA256 2164350c2ec01e3d857f943edaddfd8d5ecc9857befb5b83cd2357e538fe488b SHA512 1109541b041b76adb5ced751bbce4e47e1f331a5929d768a8db682cadc8d32d4a2af30afe542b19c2e36e72bdc64483f3829d210d1760977728ef1ba378461cc WHIRLPOOL 741b5bc6535cc26f4b0d556ccd05f625eb9ca7093418a2c8c4d4402dfef77be15ed0dcdfde3f238d989b364506e104b7a82107eb8048fc2ccb1be8ffdf0dc209
+EBUILD sgt-puzzles-20170314.ebuild 2431 SHA256 72f036720c8f1b4a71d2e9ffca198b5bc65f2a7b6590e3b1e60bd206c2311813 SHA512 5eff2127f6f2937175f78b247f057157cfaca6c6ea3af5c20d7304724b52244942c17a7c0ac6a0055573f320dba1898141170935ab15d9bf74724a7664540436 WHIRLPOOL 99be93bf09238a02b5b2b8ca4b5b4a10476b58bd3f9d5aba094a2113f261cff25114dfd12ba328d158f2764f9f0d3f007a8843c204824375ddba4d9367e105df
 EBUILD sgt-puzzles-20170514.ebuild 2431 SHA256 f9e4c4215d7debb60b58e73ea54b6489c1f17f676bf8e9fbfcc0f9645c0aa94d SHA512 aa5ff7bbb5865ffe9fef85bc08d20f81fc15b501464043b97e7e5fd3157f2faf0d3f0911f80c763f2007aec21d335a5fbc87140ccb00634152c2f88f22e1345d WHIRLPOOL 4928ee21f72596e8bfb24e63964d897c226a58224af5a205364d3b197fdb394608df81e0b152299105240b582c15d33ee09bf6ff43516997fe0aaf5e1f2ce301
 EBUILD sgt-puzzles-20171029.ebuild 2431 SHA256 e40686f060df96c4a19e27fcaa2bf98468404411420440cae64cb67eb58fb58f SHA512 eb4a16ae029e5b738735ad1286fed227f32eec32d99fd2cc4ae728798d48bd329d635004d5a2733280f761c012d46ca70072e2a0dc01b6b742650510a306c2c2 WHIRLPOOL 57cbb0d90b2b28e6f744f5302cae7b4be8612c97576cfe0f8bca268597214ff9cff9e88c89849b00531ea45d1873d65f20f1af62088745375d388a06136558fb
 EBUILD sgt-puzzles-99999999.ebuild 2431 SHA256 e40686f060df96c4a19e27fcaa2bf98468404411420440cae64cb67eb58fb58f SHA512 eb4a16ae029e5b738735ad1286fed227f32eec32d99fd2cc4ae728798d48bd329d635004d5a2733280f761c012d46ca70072e2a0dc01b6b742650510a306c2c2 WHIRLPOOL 57cbb0d90b2b28e6f744f5302cae7b4be8612c97576cfe0f8bca268597214ff9cff9e88c89849b00531ea45d1873d65f20f1af62088745375d388a06136558fb
diff --git a/games-puzzle/sgt-puzzles/sgt-puzzles-20170314.ebuild b/games-puzzle/sgt-puzzles/sgt-puzzles-20170314.ebuild
index ccbdc036d624..a042e7b60279 100644
--- a/games-puzzle/sgt-puzzles/sgt-puzzles-20170314.ebuild
+++ b/games-puzzle/sgt-puzzles/sgt-puzzles-20170314.ebuild
@@ -15,7 +15,7 @@ else
 	MAGIC=eedea41
 	SRC_URI="https://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${PV}.${MAGIC}.tar.gz"
 	S=${WORKDIR}/puzzles-${PV}.${MAGIC}
-	KEYWORDS="amd64 x86"
+	KEYWORDS="~amd64 ~x86"
 fi
 
 DESCRIPTION="Simon Tatham's Portable Puzzle Collection"
diff --git a/games-puzzle/shaaft/Manifest b/games-puzzle/shaaft/Manifest
index 2fe0592ae6ca..8edeb1d75215 100644
--- a/games-puzzle/shaaft/Manifest
+++ b/games-puzzle/shaaft/Manifest
@@ -3,7 +3,7 @@ AUX shaaft-0.5.0-gcc41.patch 205 SHA256 5da9ee61cc79e217bd037e73aa4583c3dbd85c4e
 AUX shaaft-0.5.0-gcc43.patch 428 SHA256 923bbf44762997fa9cef7b42c93bac31da05ae622eb8f3f12abad4f11d7a7549 SHA512 4286064e5c194c74248cc9fe9b4bb85819b740e744ca9e275278c2b17d438d5623e0a68618e9377639d03df0864b317862e9aa1f200cfa6c737f4046795871a9 WHIRLPOOL 4a6af3023bda7e1190deea4de7f31ad3f7e5e8852c72a9b84f54f4079f1f4e4d9aa4d7bfceca33017090654b74de4058f68cbfc652de6bef6846aa5caa52bba8
 AUX shaaft-0.5.0-libpng15.patch 472 SHA256 0e38ad14f625ce89f1a7b8d17b169e7ae3f92f46b89127e95d3cdfaa39c5b71e SHA512 80e202e16b7823c4579761a14e865a12b7e5be7073b545a86b28dca4b565b5b95fe1e38156c839ca02167c63fc1acc1fe0dcfac7b145d9464a34b535031c3e6a WHIRLPOOL 60567228aad625e050ef052a990d87d09cf86264d5aaf893d73d2f281df35aab997e45ce8a87eb9a10bfc38136c64d5f89d4a0059af821c15c2821b9d9239870
 DIST Shaaft-0.5.0.tar.bz2 512996 SHA256 db8040c4fee36da9ec9653fd6c04ffb21112c4c9c2297ee66f08b94efa61dc80 SHA512 8fce8f1b8e2cfd78832a5f328d95c186bbd1c96a66685e87f993879e96564d8c9051576c3c822d7dbdb59141d71726ced08a07390b298c3d26969f2b59dceedf WHIRLPOOL 135128793b9f99c917af5de5dd24662ff1970550a68a140869c94c71278e7ad9fc38c8b0e9108078b0bb02a41ee46e3d26a810ec6fc9e06075874a39cbb1f2ce
-EBUILD shaaft-0.5.0.ebuild 1144 SHA256 70d9ad9aeba6c52a567774328138f44ccf45f57f749bdc7228d1a2ad13047d77 SHA512 5b755ba1c6b1eb4247904fc5f7e142ebd7712978f33783c59c40c7bbe6e249ecf021f88b83d542217489823171781c8cbb1519886ec1c3753786936cc5e139db WHIRLPOOL 2eee2250bb0ae0b9f9da9e028e29eb5afeb18370c99fd15b3302f738866eb30275ca8f103dce2d78007b3b3f7b69dd3dcdcc74b03864a6249cdfe4c9d7a10e74
+EBUILD shaaft-0.5.0.ebuild 1146 SHA256 3a75146db173b5ad8cf82bea7a1966ba2c923c720019ad1341ef135e1e593750 SHA512 e312da43d4919cf0364e67535ec0f89bd06c77de2af2529158a0d78076c212e7dd9f84a04714dde99244563bd7688311517ddc1b8e338f70426d4d886a5cd7b4 WHIRLPOOL 0b7290b5cc8e1b7ab17bf6da78deaf4ea27b0e5271b0c1104a3299d00e562d1f5816eaadcc5d680e080a4ec46fdb913fbee2a8bc566e848086e4f173875c855a
 MISC ChangeLog 2793 SHA256 d54448237f8503bd3d21ae7baac6be49c4588c065ec2d30691ba3d5fe32d4ea0 SHA512 4f614dcd12b127635150bde14e99a46e3676eacae5fcaac86e2d67738cb7c03b614ad2938b68aab22682b5ee80ff802711c7071510c9ed5f0b5c6b9e3e7e0364 WHIRLPOOL b09d231d98a349fcf9f1829bec74a25b8dad3e7a2795c7edaa80614d423a321f976612d21161e41af8ca669029b2bc0aa07434ecd6819448a2edcb768c87a8ad
 MISC ChangeLog-2015 2273 SHA256 1579c87fafc16f7ec9eb0b1bd2822cad628e573a1a1933fb81dc0ab261db528c SHA512 b6f7d60dbe7be63fbc133eaf3287b9285835a8fd4cb7527324eba48f26204fb2229531be407c8fcfa5131a89a8e92883a06428ca08c1e4aa619b68a33c767233 WHIRLPOOL b0b153eca93ad05291e9e15ee6cbb8ac01139bbc7961220a6964194d781a9c0baeef6d46915a3a4e47c3ae77db9c82f8f5d25c132db6938b537252ee5ec79e4d
 MISC metadata.xml 335 SHA256 dc0cbba662f09469700f64a8581a639de8aa689458ae2b80e5428763d0f2f36c SHA512 ef6dcb84323c49c9a21a59eea375bd3c1419ba2c7490f3e20e9daeab88942b4574d3d8668c465e2b2fc4221dff97695ba122d6790ebade3202f873f890fef9e4 WHIRLPOOL 861f0725885ada70e5a9237167168f938a6f8c72e193fe4d8745bab87c1e0e91d7fac4d5e773d8ba2699332cdc423835c9bca9961cac56aea3cfd118e3dd46c1
diff --git a/games-puzzle/shaaft/shaaft-0.5.0.ebuild b/games-puzzle/shaaft/shaaft-0.5.0.ebuild
index ac936664c2bb..04d75ab84441 100644
--- a/games-puzzle/shaaft/shaaft-0.5.0.ebuild
+++ b/games-puzzle/shaaft/shaaft-0.5.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/criticalmass/${P/s/S}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="virtual/opengl
diff --git a/games-puzzle/skoosh/Manifest b/games-puzzle/skoosh/Manifest
index e1c9457351e5..d70c9d0130ce 100644
--- a/games-puzzle/skoosh/Manifest
+++ b/games-puzzle/skoosh/Manifest
@@ -1,6 +1,6 @@
 AUX skoosh-2.5.0-desktop.patch 476 SHA256 fba74612b0404c2ae07780ba6c8b2b5d2df3d37b5afd47ca5a135209db6895e9 SHA512 0cded581a8a24902771ef49674171d1522ed50eabff20d48b65892e09671d5a25e41b046f45a7ac80e0a23fb13a638293d5f6073d99f4a5f3473c3b882b860ac WHIRLPOOL bb142c698317b9c368b1ba12d3434c7e169608b02867ede308b0514a60e4575c7a64f76f05c64328868587b46a3ee9dcf2ec03452cb9db338b2ed60b3162230d
 DIST skoosh-2.5.0.tar.gz 209945 SHA256 827a6c365bc1771f3ef7ad390cceec76427113f4b33979c9a6dc2286fe1d916a SHA512 e67f0036f09890af62bcfe0fe895d899a76efb2901c5fbdd9fb97951553a4b9f35dfddd0a3e24937b53a1c8d3686caee8b83d35e0327d4bbdaeb4c1e0ab58736 WHIRLPOOL a4fe55be01326410dfd6492a29e1d98d22aa95edcc9b5cfb14466d60b98deff72332bda4a8d3e157ef73910837e545147731793dd03e936632b6a270fd3e5aaf
-EBUILD skoosh-2.5.0-r1.ebuild 867 SHA256 228034525ccc3baab38aa51a417389389d6efe9a384d1cf80be83893c9ceb365 SHA512 df51b97dd7f4a1f3c4e774e4c9940c64a56d5e277ba64151eb55a0fc40a3820fef4be6bda5a13fa98a80daefd6f7ab9cba4baebaf0032888bac2e53b5226540a WHIRLPOOL 7188f558b3b0cdfcb93f1e00e052fe448521dd5a35cf1bdb5cbacdcfd0e92016f12f720453535e3fa3b0c0a2d3379fe2cd81c41a0b6c6261287d254bb6b814ba
+EBUILD skoosh-2.5.0-r1.ebuild 869 SHA256 5bb0d3aa225fa9307de9de55d2360c7577359eb0f648801b697ed62af296f342 SHA512 4fefa0bab3c67fa6e83804937ea2d0ce06b524e5fbef561386cb693f25df6d6fe6c3e23266876ee2466309cb748dd3ab06279cf393ac3c807d4e3a0baeb7ca1f WHIRLPOOL 4e17143a81c2a1f041f9ae2b27bd26cc5df6b6a3793358deb2351bbdc79ffbdb170db2e796432ca5de1c9858b0b6666e13699edf95e1b9c4b21c29880ad01fbb
 MISC ChangeLog 2469 SHA256 a5a7ba8838ba343f759137743fcc2d1545004ad24bc9b13a0dba939d9c948a9e SHA512 c4baf99d56e7b1d70ae4897d2b134f94848afa3b14f17fce8a813d356e3be00717e6e505d6461124e48623d7f4e32e95cae0c79506784da95791593a0380f346 WHIRLPOOL c009de2140152e1de739e515abab643b3d52a5af5526ce831db65d1ff51f3948c865f39c8f1f026cbffbd82df1b5412b264a7bfd1dc8dd505ce7777b64f7a856
 MISC ChangeLog-2015 1782 SHA256 c92691511e3d6fa991910270fe063056b16e1bb6d3dc459bd06a67cb493ccc96 SHA512 32a390cfd450709b77178425c7492603dfc2f66a5b525da322301ab0bd7e3c90b9885bb65a6636476eaee74fc2389daa72a9e69978b7727a0a65c703d8bf8089 WHIRLPOOL 7cbf83d80da1081661a6e920ca4775ae2f19402376bf30bf4613c1d29050808451bef9470d0ce5cad9cf779dd1ec579448c38f2a4b93e96fd5b684c7ea9ee56b
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-puzzle/skoosh/skoosh-2.5.0-r1.ebuild b/games-puzzle/skoosh/skoosh-2.5.0-r1.ebuild
index 7c253aa83442..04f48cd4ecca 100644
--- a/games-puzzle/skoosh/skoosh-2.5.0-r1.ebuild
+++ b/games-puzzle/skoosh/skoosh-2.5.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://homepages.ihug.co.nz/~trmusson/stuff/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="nls"
 
 RDEPEND="
diff --git a/games-puzzle/splice/Manifest b/games-puzzle/splice/Manifest
index 5020ad0eb2e6..f927c55746c5 100644
--- a/games-puzzle/splice/Manifest
+++ b/games-puzzle/splice/Manifest
@@ -1,5 +1,5 @@
 DIST splice-linux-1353389454.tar.gz 305838859 SHA256 5016610688f06fcc478b8669a0537614478e68077e044f21530066649830d331 SHA512 67a83a30bdb8ff0eecf9097bb4615053fcdb073daada4a24b61ae239ed56b7d2192247e80989c67554dcfcc1069c2105a6083f9fafffa4bbd66bbf29edad6a44 WHIRLPOOL 9139a3077c78331989128bfe6771c8bfe8c7f8af57712139df8ffd60d295a7bed8dd9dca0a09a35f96cb70407505f7d7b8137caa619f99d226735e37477fc1d6
-EBUILD splice-20121120.ebuild 1293 SHA256 8d8cb74fd03d32c8a34b00ba07a872d38cd1393609f8fa94edd57f183f94059f SHA512 728c0fea17faa50ef402482d5bd53305212ccf7b7e415fe335ef7793fa24b1787d3a1df51e8dbfca69f648d943c530a027ed374c4be3e7e3a873d4e5694e1eef WHIRLPOOL d4f6a50ccb2931c3916aa756f2b6535cb6a068473b13f32cc6ed087f523ed7ea51214eaa47cab16cd4d6977379f53263937148a55b66a5c831328a31861399c6
+EBUILD splice-20121120.ebuild 1295 SHA256 f671e99aaf7cd75d2794fa7ef40da9779628bb6ccff5afdf74255a8829ec34cf SHA512 4b3e62b2bfed9a7c5a33df7594a7dcb8558c1b255fe03b33bae9175e896281539e414d13747965569eb48298f42a4c1fbe9b06b7ff4e79b69e0698790690f0cc WHIRLPOOL aecb254ba8f9a7b65c9b24be8e953cf973218fca7f45d4f0e08413931304ad4c85cccc7bffbac27c3a644799f922d898b62b66a2fe1db714695c95e69a400a94
 MISC ChangeLog 2827 SHA256 d59847cf0af7d492a9f7f3a45a436ac603b3818e8cecbc6bf467c4cf5536fe91 SHA512 6d0c3089e1772bdbee72623589631445f09ab3075a8aff10bd0aed854fc914f2908a88c498e67eb3f29b37212a1c34fd87eed2b10cf69a54dddb1e8241fa58bf WHIRLPOOL 27c7adb68a9e3efbbc670931add6d725460f4f5905730d853b650f25ddb76652b2a197b32f25742ad9b45f77b524815d2c5885a44c37002b248bf436d40a616e
 MISC ChangeLog-2015 970 SHA256 3ef444eed7ec36a820ab2eb26fc0c0a9ed4d2d0990d2c9d2be008b22a65ff3a9 SHA512 031c24ffc29bce46241891f3a8bc91c8b708df9aeed5f3fdf7551533f91c205659ce8f70b37c3be908c70a4ba30986a8ad6a24377e17262caea69089f5d4f464 WHIRLPOOL 35ff905081e006e8cc44896ed303b2df53cfe0700d56352c27dff83f64be5bc0720a1ba6e2f2a1fb52cd9fa1d262c356f1a2082241c4b2484de10f010065b0de
 MISC metadata.xml 253 SHA256 2c95b2eb99144a3b66de17be35eebcf65e5a152a2ec2f176165bb9cd78e5394e SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254 WHIRLPOOL fd044f0a960e57257f4a15ab16f066bbfe9983e60cd5fc072e631efc7027306c612a01d7fbbf57eb08d957487a7ce1961250194653d6ed87ee23f20d631ef854
diff --git a/games-puzzle/splice/splice-20121120.ebuild b/games-puzzle/splice/splice-20121120.ebuild
index bdd0623bddff..cd9f3346db97 100644
--- a/games-puzzle/splice/splice-20121120.ebuild
+++ b/games-puzzle/splice/splice-20121120.ebuild
@@ -14,7 +14,7 @@ SRC_URI="splice-linux-1353389454.tar.gz"
 
 LICENSE="all-rights-reserved"
 SLOT="0"
-KEYWORDS="-* amd64 x86"
+KEYWORDS="-* ~amd64 ~x86"
 IUSE=""
 RESTRICT="bindist fetch splitdebug"
 
diff --git a/games-puzzle/tanglet/Manifest b/games-puzzle/tanglet/Manifest
index fd33972c2213..1b80ebff53da 100644
--- a/games-puzzle/tanglet/Manifest
+++ b/games-puzzle/tanglet/Manifest
@@ -1,6 +1,6 @@
 AUX tanglet-1.3.1-datadir.patch 732 SHA256 58136f0cc97f0cd16c43443c15ec6cc268f6a9eb50c1e7bb3c8e39fd5f7c1f19 SHA512 35442f4b9bfe344c7168048ccd7d0742319b6ab3078d9df13fe66455d45b31a5bb01f7e4ad05b4ba25c83046bfe1428f6a2271231130c433ceac1b18fd405414 WHIRLPOOL c083764d1401ee11b18f70e8d464980b99dfbb1c544eb15ea2220509de61c1e9e0046d0b9337efd8d47b8642348a071f2ac8da33563d53038d73bb7611365f54
 DIST tanglet-1.3.1-src.tar.bz2 8461603 SHA256 d0eab174eaa8cdd5f3499ae275db4cd720172ef28346273db7f5988f2304e0d8 SHA512 b939ca45f26baf8e7e32da8775e673707472e5cd07d344642eeb15986ff99319e0ab1bacf78e2ea49f004ec67a6d081a91c939cf7c75228a195654d429235625 WHIRLPOOL e2ee97327b95b502b603c953c4b42636fd060f8476bd0787f4d7527c9ebf04774868bd0f923f5b7e89e24e4123143b87e8d9859087685fd62d83c46da26b145d
-EBUILD tanglet-1.3.1.ebuild 1353 SHA256 9721ed650788454f3a45c874f77de364d31e10079a0c2f712c652f8dfde86df4 SHA512 6e3bdfb1745810164a792655e7a3a4c3c2e79c70c8e6bc204686d0742134281fd9e1d7c72f24afd6caf15d74feffdd06756e40201bdfc8e750d0875699229180 WHIRLPOOL 1d33977b58a4cb2b48e21142df240e87a70ecafcbc8e44ede97ec064f6f0b3810f9b850f5d090deda63fd6dc1793dbbec697140d8c6b64b3e2d1bdf21b8b5695
+EBUILD tanglet-1.3.1.ebuild 1355 SHA256 38d531f5614b628a828a5500cf2440222cf6ced3db797efa2bb5983c4c58f966 SHA512 37ec6c8bcbf789f32a62eef3db041fde244fa9a8075271b70c74700e97a969416b0e69f6d9fae285df39687e09caa0db928e25417c5e80a47efa59e96b9361d4 WHIRLPOOL 9ac05828f4033b624be0f4caf440a00ef5c4c6f84b09dbac1e4929a69dd1e250da57d3d2cf130f8592f5370f2aaa1eed22438b431bedddc73a80706728773919
 MISC ChangeLog 3343 SHA256 3759baa380e377f070793a54d2815995c835415a0d9f2cc2a6443646bb603f62 SHA512 f17241c3d96301c17d3425dafe84c72ebc017650fea4732a996a17ea5fa9654969eed4df65eed598d6f96cfc0e3c664fcf9d0dcf7d6e0b3afd8cf6a529150a87 WHIRLPOOL 757011db35fd4ea174e6dc4057f2fa99998db8b94333423e1fa337b4dbcbbde614edd715b72c14367be8ef0197fe1e8bee79dcc9e8321f6242e50b58fd397c5c
 MISC ChangeLog-2015 3214 SHA256 2d56ffb1c8514c72c98f34b6cb92a918855c96e6ad42fa425ab34512cad24a3b SHA512 9416bf6d6de6b55f69b8da5531f847eec9857caf7e4396b5955561179bb318b6bcb771f9dc5413bcea3eb770d1dc87ecd25848e2c411236152526fb6966f3062 WHIRLPOOL 44228d4067c9b7bd315d31b9041223b71cd83d36f3e7056f0b00764753e58de87b82e97f594484612402e67caa3ddcf69d9dcb4f5c682db19fcda2958f17482d
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-puzzle/tanglet/tanglet-1.3.1.ebuild b/games-puzzle/tanglet/tanglet-1.3.1.ebuild
index 93d45133ff1d..b640740df693 100644
--- a/games-puzzle/tanglet/tanglet-1.3.1.ebuild
+++ b/games-puzzle/tanglet/tanglet-1.3.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://gottcode.org/${PN}/${P}-src.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="sys-libs/zlib
diff --git a/games-puzzle/tetrinet/Manifest b/games-puzzle/tetrinet/Manifest
index b3613fdeff9a..46c678d36d4b 100644
--- a/games-puzzle/tetrinet/Manifest
+++ b/games-puzzle/tetrinet/Manifest
@@ -1,7 +1,7 @@
 AUX tetrinet-0.11-build.patch 2331 SHA256 1ebadb8011e4ad3015b994f8de1da656b8f7d1669437efbd0d0bb3b5b7843070 SHA512 e56a43ef53d9df84c4ba49b39ba2d77f99de1b616f9e81e105d4c49553b909f418f74cb13d431dbd658c41c99388321e0806dbeb63294817ec85f7148f2d2ae0 WHIRLPOOL 7f1518db81e8e677b1739524b944569a59f1bfd7e139847077305cfa0c1c69ad732c86f41b9c3aed0e14d2d105856de8ece48fb2685d914dd99199970cd26c93
 AUX tetrinet-0.11-no-ipv6.patch 185 SHA256 ad1d66cb1289030900cdf54f9706ed5078be4552ed5e4092248f3e309bcb1874 SHA512 1851623b20e2685548650d54f290a49f9572b65a2293848c0d83a6fdc1c1256ebcdd0f737b2f32f7fb4bd921aa69c17e7120cfc8acb1d8c5a97342741964890f WHIRLPOOL 340f01e3a0d88d417b0d06400a465fa1e3e7b72af84d7b0bc60292e86a65c1ade406bfc9fb1b22d11781df8d72d00b524f8059de4ec560e0813fa99537d72c2b
 DIST tetrinet-0.11.tar.bz2 38607 SHA256 a7a32da072d0a7bb9f1a61ced5641336924c314692ed8ac3394147f3716b972c SHA512 8123a8c50a3c1b6326d3209272a60c8050afd2a9eb455814fd676d8c4de922f8b81a88df9e4825d1ff5e0c8b8a7ac46ebe9ce68994587f829e047a3d889880fa WHIRLPOOL c0331f1fb42560a46711c6545f0df4b2bdca7bc1694a0c3ff0f1fc14f4cd483dc13b993b8488909eff9ddc94cc7b8c7ed93da64227bfe70dd6da1afeefb2fea1
-EBUILD tetrinet-0.11.ebuild 718 SHA256 cd59794a586613df12ba8a4fd669e54047b24a7c436d655c037f1ac690cff93e SHA512 4281aa1d2eddefab7e099c73c182226dba945137e0367b8e0f5f37a8c68dedf332c30f767ac5f056c420cfb7d563545d4db470fd6b32277ee6974cde6594ccaa WHIRLPOOL b890f97fbfd7bad9398681b757ae3cd60d6fc8e50a775dd851946519ea43efdc5445c8e4fe34721dd23d4656ebb3120e246c9fefe6b0feda7a46409077ef9d07
+EBUILD tetrinet-0.11.ebuild 720 SHA256 0c6f81b4cd5a1e6281edf7eed2599cb432e4557df831a7e7c1d70d5018bcf3aa SHA512 2bacb1d79759bbb46252b9b2383f7c6f301c14b6d2740749fb33a2a1dc25155957ab48a88487332530a50853fbce750ad782863251a9b177e4e4377181c2d53c WHIRLPOOL dce1a9adb796b3585dff44bdbaace257b0d69aef8b243da10fad28728f5991dbbed76d04a826c7579d3aecff5cfaa95a7d67e8d0a40c16bfe8d067de05a05b7d
 MISC ChangeLog 2659 SHA256 80eadb880a143b1efe1e2810b4fc38874e15780bba89a7361f7e2efffc1b3cca SHA512 3e1a09ee4129ed6a64f1d7d4e587f69d520406d520cd3f77f939eef9c82d912b9f5d20f073ad2a949ca12840df34d264dbbe616224ede11bdfb2a5ac53b54b04 WHIRLPOOL 013ee5d4f37bbdbf110a815ea04b3e0cd1b11157ea5d9aae6588ebd42734242c756f41d0547e1445ff140db6ddd5ec36e1b9e5407da62865572283f195239ed5
 MISC ChangeLog-2015 1760 SHA256 6f8f782cdd478a6bb40a3100b4eb766fe4e711dbf25fb45cfa583dcbf0e5e768 SHA512 cb6a28d72f0d3287c52dfa03a6686c3ddd5f6be3e1deb8c5160af7a3743a70bca6deff1b6d6f8d14238240e9a897e880ceff6c14e8ba42f0c2270dd830cd5e77 WHIRLPOOL f21fcd3a852c955bfe29cc7abfc4132ce030fe8abdf6f75f32d4dedc245b28bdceb1d1e1846c84bbd40fb9fe87b7dc3b4b87de1a6358c33df99e02b9fd44b930
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-puzzle/tetrinet/tetrinet-0.11.ebuild b/games-puzzle/tetrinet/tetrinet-0.11.ebuild
index 8dbd03ce0c4d..684b07a7833d 100644
--- a/games-puzzle/tetrinet/tetrinet-0.11.ebuild
+++ b/games-puzzle/tetrinet/tetrinet-0.11.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://tetrinet.or.cz/download/${P}.tar.bz2"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="ipv6"
 
 RDEPEND=">=sys-libs/ncurses-5:0"
diff --git a/games-puzzle/textmaze/Manifest b/games-puzzle/textmaze/Manifest
index a7c3f3a75fae..65cf7b723f43 100644
--- a/games-puzzle/textmaze/Manifest
+++ b/games-puzzle/textmaze/Manifest
@@ -1,5 +1,5 @@
 DIST textmaze_v1.2.tar.gz 15827 SHA256 8dbd57584a57855bf052a47d366402cbd6257a546a5ae8e1166bdd91d0a6c0ad SHA512 f6a2733049ea461f15b40eec4a414356dbfe252d859d132278d9ea8a4efcdc6753a28817529b429bad662a2042f2f7cd5cb1f2383d9ddbf773c76b80ea2af7d9 WHIRLPOOL 697b12ca5d710c35b02efba0a6764c75b259c97470695e1dca1aa6ca6a26d52e67281e4124be22f27ea27ff0ae6ede6aab44f9933d33b14b42ac8ed596b88131
-EBUILD textmaze-1.2.ebuild 609 SHA256 83253c42db34c1fc1fda2347a6c6670ccd325f3a30bf32ed7c3fee588670539d SHA512 79444ff0afb68feb7c0c966be3379d1c676ecaa44b71c6ede53c09ba9f651c34e8558376dfdc24236e5e2e2f720902222fc900fda3cb025aba75fc5213f59f10 WHIRLPOOL accacefa128ac7ea2b29c3a2cac14a85ab60d3d8e9e5326cf4175d0fd29e47fcdad3771df1536fe4c755d96af40cbf0624d625ca9de7ef647bd5229b0c1aed01
+EBUILD textmaze-1.2.ebuild 611 SHA256 3e7393762a0a9880203afe2e7d292047202ce91c193ce802d10cb07e1d18a58a SHA512 bd68d5089f2de2908082b58f0959d63e7a957e30f70c91248e93d8e9dc7ec791244336455ea9e1b840af3881532ce805c3f1aa97e300e3dd225cfffceafa8ab8 WHIRLPOOL b3eff2d7387339c27b4492a35dc5438f397ce6cd8ffc586324a3f0f640626c181ffd4a32db9b11ea6981534edfb439b7202889601961e5844f1a63e2dc64929b
 MISC ChangeLog 2430 SHA256 30e48a698879e43e1c36aa7ac1caf90fdf922936ccc1619441d9af55934198a3 SHA512 157c1e583b0543ab2bbd95ed9f4f172f838d927b132ae417c819a245f954c679e75907e2c9d8a2ab9b3888ff6e150981a9085f2eb7f5723cc08d03027ecca6f5 WHIRLPOOL 15d205271f2b37c3811a261e073bb6a2f6d2487dea6db761edb7aa366ed235939004ce0494b4c9e67b5f9c84154436ab250e93e7e2d06b86153e50e941b6447f
 MISC ChangeLog-2015 1141 SHA256 cdeab9ac54adc4e917ecd039259b350a44af2ed24492bc1787a7405a00330024 SHA512 bc38d4965836e8fa6b3f825d6883fb9654d0af3332dfcebfdde4b094079df70ab860209c91dc085062d4858e31eb7650650afb113db89edaa8e2368612f9726c WHIRLPOOL ee90baaf73a689e20d93e80a8a35e0bd210d92ec706fdd44d0884d942285a3e4f97d513f22e431414c8c3c89f891710722ba3429242aaec2acc97f00cdbaaaa1
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-puzzle/textmaze/textmaze-1.2.ebuild b/games-puzzle/textmaze/textmaze-1.2.ebuild
index 46d3ca9b22ea..27d3c275cccc 100644
--- a/games-puzzle/textmaze/textmaze-1.2.ebuild
+++ b/games-puzzle/textmaze/textmaze-1.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.robobunny.com/projects/${PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="dev-perl/Curses"
diff --git a/games-puzzle/tint/Manifest b/games-puzzle/tint/Manifest
index 02390394ba15..3725ca5e5672 100644
--- a/games-puzzle/tint/Manifest
+++ b/games-puzzle/tint/Manifest
@@ -1,6 +1,6 @@
 AUX tint-0.03b-ovflfix.patch 1021 SHA256 1eba68c1f76105f2ef7ec6eb43729df7800242501868b06b1f713f6796a5b19e SHA512 da4d5871b46c57ee5e37f0a4b6e779c33bf7b5c45dcba281b84ccad308195d9b2498489ee22f105e6eef00274cf60757855ab9aa91a146f19159713971b828bf WHIRLPOOL c45dc9a14c1c9fb9e2c1676b3ce3cfe11d20a02fc008ff4cb2b4f0d7e2afe8097397717bbf68fbf135e70bc48325d43aa045b58a4d36acc2b630d4d654daf922
 DIST tint_0.03b.tar.gz 16909 SHA256 f43fc82c5d16954a85ef532b0771599902cea86d8d9eea044e5b7454db91419c SHA512 f442122248987a4f2843e0abe3ed4b3fcecbb6024aad2b486087468c84d80f94310dcf4a37a3d93a647d0abe9aaf10e7d957c88ec6314c25a9fd90d4dfc16ec1 WHIRLPOOL 0828a78940d54070d7d5199d49a13dd61132c06e2ed54645a9d278cc9bc78ef7cbcfe26d0a700ebd500d3828ea6376b4170fb63593fca2b8c537d603127d18eb
-EBUILD tint-0.03b.ebuild 826 SHA256 cefdc15672d9deeb45a7e362581c3ad9eb10e915af14c623fcb6cfa913804590 SHA512 579d89cd830dc8d1ae15ddef46d39f9014f71f85290a39a1d024a1423b8f96e64e697563f0e696e10b8f80670245676a3a6a2dc935f88f1728e4ca35867cbb1e WHIRLPOOL ab9935572c1421c4008cddfac92328908bd31494c9868815e26779507ae85a3089d5e559dba70f4068c7b9e8a0a44ae4017e159a61842f055d592b36a6e28914
+EBUILD tint-0.03b.ebuild 829 SHA256 5222b4a6eb6757566c74cf6f8b23a02a4abb59390be81467faa193cdef6d2526 SHA512 e1f6d4c5131d30bbf85f50ecd5e4bd65dc7ae299150bb28c65d432129f7a8fe70b5ecc35242888df6aec4943f3f2ad86fdfa8ae5cb582bd13b57c3d8abcb9e89 WHIRLPOOL b9a62c852932e7e75d6abef34cd90642ff366cb2d0674af85b166dddf0af2e0fb6d0a59482f93695b5344d9aa71c72b3000c52ed5056fbca0f54fceb30a94136
 MISC ChangeLog 2595 SHA256 6c89ad6e32b42a64bdefab806d876e24fdf1d2815e3c61eecf24853767ec1830 SHA512 d83b2280fc94864134e8a9654cb0445d0e2f46147a6ecd3c1e9a1e1014cc0460bbea007f3fd44814408f78288ee38986f1bc65083fb07911e60881341d92c3bb WHIRLPOOL a22535bca4b3ba2999bf475f86599dda415be5fc51f90e6b1980a5415e07e402000623c018193787f0d3d6f362bc5a9f40710b3ddd3c3f6657549dce6f41db2f
 MISC ChangeLog-2015 2117 SHA256 9a928cbd6f494efaaa59fa9d3934b6e64cf0ea2a45615c4334bf51563bc4103d SHA512 2e28a01871276681d2529c6a31f031045016a7c089697d9c531150b712e6d2c8b71ff67e98a0e7754203042b28f4258734a52f9c02c2bed37e3e2b6226d6cf69 WHIRLPOOL d61cae28d33db7f9eb2e381dcddc0b4050a63720cd40e0314a32be78a6b5c70bf19a30acdb2b8477e201599535c8e81c0883f94841ab7cfaa3333cc199e79ed1
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-puzzle/tint/tint-0.03b.ebuild b/games-puzzle/tint/tint-0.03b.ebuild
index 779ef88c96d3..da85ff697b2b 100644
--- a/games-puzzle/tint/tint-0.03b.ebuild
+++ b/games-puzzle/tint/tint-0.03b.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://oasis.frogfoot.net/code/tint/download/${PV}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND=">=sys-libs/ncurses-5.4-r1:0"
diff --git a/games-puzzle/tiny-and-big/Manifest b/games-puzzle/tiny-and-big/Manifest
index f2e6fd2f7077..c2549800919a 100644
--- a/games-puzzle/tiny-and-big/Manifest
+++ b/games-puzzle/tiny-and-big/Manifest
@@ -1,5 +1,5 @@
 DIST tinyandbig_grandpasleftovers-retail-linux-1.4.1_1370968537.tar.bz2 1170058011 SHA256 6ff9053399145996da000991a3ac723523d5b6224c9b74ec59b4deb2de38846f SHA512 3dbf6ebbe6047f5258f482e776809c6817df8d14cfc20014fb6e4a6accc3db3e93051270ce29371bc0ef56d380bd382dbf8eb75b592c3f0097ca3546d889193e WHIRLPOOL 910ebeb6df0b6c9ad5289f6c40bf27135207a57e27b6dfd3352968ba6078155ee1d806b750fa428f1e97d7b9e6e8a9081934cedcf36f7d62aae35afe5300c0db
-EBUILD tiny-and-big-1.4.1.ebuild 1387 SHA256 74547909d081af1517426ea22c1f27c426154a260a38f3316cd0d2e7f144dd32 SHA512 24d307990b77584534529d3adca9c3537026dda64c498784e4ccfd069371eeb9628a98e5cf77180013fd0f44c78b9678cbd0340ac270987e33abf6d307feb34b WHIRLPOOL 1db3c69e16b7dd8459a30c26ab3c621213793c97d25254895e91101e15d7684ef9e8b724543623ae6bd650d4a6ee2ce144709f2abf612537dece131c416ab04a
+EBUILD tiny-and-big-1.4.1.ebuild 1389 SHA256 c691bd5e8e4953a76a94b46507e26725bb9ab2b20180653633a86b3214d68d0d SHA512 3f18ac776c1e8ee9bb34dd6da4d9122b1e433e104430105de5c301d6a90fb5406e6111969e76d7a656c8e17079892bf6724e93d68ef358c3a24ae51f8339695f WHIRLPOOL ae11d855bfd3c19e0f40f99bd9a655476b8fa42c7841b2d84ed9d3130e94fcc91ad9fe6e40d00a6281abe87ed5920dc45c95ce79cf5f528f6949214ca0bfe576
 MISC ChangeLog 2839 SHA256 e090c8d044b25e4fb203c44024eabe1a01876cb7135886de66d046f71dfc5032 SHA512 854aa998d824c7acd01660eb64ef384b7df622c8a1f10cae99f615bad5f9b6f837d89c1d042f8777171d29fc5db3e89e92f6fe3edeacd195132092412bcb250e WHIRLPOOL 34aad0c580554bec415d598689798af6b9d0a2811be1d7458db819210d0dec38cc332a172d1939686f6c008c17e807eb32a6ea7352ebe4313e522420f8f6ed21
 MISC ChangeLog-2015 680 SHA256 c4bfe15deea366db52d59ff2a1b67fe43843494f2899b81b7af88115a529f41c SHA512 e36e34f12a75e936a20902d2720fe1c0d8984a6990e5858719749a95099579b56d10fbd8c79935b56ff6c4ee2b273b5ae1dbfe880981a2d80b6e1b5b51f42049 WHIRLPOOL 636dbdeeb695132cfc145040addf841272800ce8a2421e3eafd1b4630176f5551944574d47bc9c0ec5648dc37a8d19f7676f3b8f3162241b590656ad960dc82c
 MISC metadata.xml 355 SHA256 3fe59ecadf91cdd661b063661864ef57eb3df8d59bd55a2eb9e61dc1a75e5bd8 SHA512 78f8cc8f1f1be915da206e4b8be196a21b58a6f209023594755e481136a1b86ee31c8d0dfedd516d756a47db624e89728875b073b71c3b08ac94a5cde8ff3b83 WHIRLPOOL adc2ef67e7870008ce851a78268832c5ff50649850b2614fb66edd3a16ccbad441306f00c44000385a742552b91b4a805408b19aad2ef3b7dda9e86532703dba
diff --git a/games-puzzle/tiny-and-big/tiny-and-big-1.4.1.ebuild b/games-puzzle/tiny-and-big/tiny-and-big-1.4.1.ebuild
index e73c0193d97a..aea1846bd3c1 100644
--- a/games-puzzle/tiny-and-big/tiny-and-big-1.4.1.ebuild
+++ b/games-puzzle/tiny-and-big/tiny-and-big-1.4.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="tinyandbig_grandpasleftovers-retail-linux-${PV}_1370968537.tar.bz2"
 
 LICENSE="all-rights-reserved"
 SLOT="0"
-KEYWORDS="-* amd64 x86"
+KEYWORDS="-* ~amd64 ~x86"
 IUSE="bundled-libs"
 RESTRICT="bindist fetch bundled-libs? ( splitdebug )"
 
diff --git a/games-puzzle/tod/Manifest b/games-puzzle/tod/Manifest
index 60cf0b9f381d..12c32f9b2750 100644
--- a/games-puzzle/tod/Manifest
+++ b/games-puzzle/tod/Manifest
@@ -1,6 +1,6 @@
 AUX tod-0-makefile.patch 332 SHA256 9a926f5d94960da1a74abaefb456b2222f5389cae01c52787c7205450a712585 SHA512 2490154631db2fc66bdd6ea9dfd8e584625b2b416395450b2e054d13d9ea5b327cbed4fcc66e6586f4746a21429ed709f05cfb8c7c6a5e171c1a001663a4d245 WHIRLPOOL 0801224837d052da795dff62f45e5d69df99da752d0c27d80643e6e45dd628d413bfd97ddf94f80082dd389492cc3975e01e53dfdf3700d481ec8d0fc809665c
 DIST wintod.zip 115653 SHA256 92265cd3266f5deecca8aba1f00bd68af2e758e9b00cd97f92ff487d05524686 SHA512 8cc203d9745cc4855c58c2f9119d06a1f02e1ecb9c1cc2c1dc1f1c77e5aa0553925bdcba3d744db462bbc77f3637a42e35a579a8807c8098aa2fde7452cc30cc WHIRLPOOL 4a3c2dd4d7a787d7b22c74ddf8db331a776677c2b32546d6f237df0bf46970404018edb6d1beb9865db2f1e6d91e6648a421e10ebd58d9f3c8466abcc88c2f83
-EBUILD tod-0.ebuild 751 SHA256 ca32f8a3fe6e61e5b13b434e65982eb82aea55b6faad3923747cee9d2890a09e SHA512 47d9f0d570173159f14118683878c9bedf54d0d11ea6309b9ca4c8ffe33b5f6a8dbbc0d1d7ee81f5b2ccae7482661c22eecbef94ad70d10925f00cff97b998fe WHIRLPOOL bb6c2555dc82afa461a1430cc44530ba5a3f7fa7d6e3acea26dc407d112f770bcf6e515974572e3b3fc166334f48a44760ec0225e75a53f6dc1c5126eb9d53aa
+EBUILD tod-0.ebuild 753 SHA256 e2772a5343fb3084771a5f0273f2dabb13f5467ae962271fe49ea893bc02ce72 SHA512 df4285be40ce2b90b8baf1fe73bc45f846aed9013c22053877bd325020b8bfa4fd35efe24d391eb4106736786eb415fc6fea56fb552fcbc56f9b3e1dd6cfdf95 WHIRLPOOL a167fbffee7a8d407592cd460ac42be3680c8a8205d9c794390a3c83a3fc72dd5991e61f2b5a9fec9a0e69e4c4db9d8e0fc9aeca3567d64f6c9515cfe0fbdbdc
 MISC ChangeLog 2440 SHA256 32f800c5c4e84b66db52139fecf648f6337094b0d3a4099818d8b5ab4be8e4c2 SHA512 a0c9cef87024d7bff04db44f8fcfe22739d52af7f3550de46bc2728ea6a71e3bcbf0fd53ab324d5650e7c97d9f6ffc4f40b29cc94b9cdf5ee081fbb3004d4aa0 WHIRLPOOL 23297938aac7121d1dd712d23e5d919ee53a16cff88ecd59b16db85dfb46daa3dcb0eeb54b51e69315ebf3e6a70dde5e48e05b35c6dc7f2ca2fe74f45f3ebfe0
 MISC ChangeLog-2015 944 SHA256 2a468e79481f9898310141bfcb9cafcc53e3d2c7215dd5786aea7d86f64f7301 SHA512 79bb009bd21cd0563de5246912690b727ff16e2e6eeb7a2b30a34e9ae551ffa3de9b12dbf873f12aa7f58511664386d387a7911452cbf7b8a9d5ccaa22474f1a WHIRLPOOL 47b89dca709a566cf29890a042e5b66db03e8c28e177da1e78bb6dd9cae33327f98cf08c17026014e326fd922af4ff752343d6079efa069d9c425daea73bc23c
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-puzzle/tod/tod-0.ebuild b/games-puzzle/tod/tod-0.ebuild
index 17121aad8296..eeb59a66aa22 100644
--- a/games-puzzle/tod/tod-0.ebuild
+++ b/games-puzzle/tod/tod-0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.pineight.com/pc/win${PN}.zip"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="media-libs/allegro:0[X]"
diff --git a/games-puzzle/tong/Manifest b/games-puzzle/tong/Manifest
index bfb4be9e8b8b..9e8834547481 100644
--- a/games-puzzle/tong/Manifest
+++ b/games-puzzle/tong/Manifest
@@ -2,7 +2,7 @@ AUX tong-1.2-datadir.patch 1105 SHA256 2948094ac5ad181594ae80e66c459fc5c860c66e7
 AUX tong-1.2-fps.patch 553 SHA256 a5ee4809b73f965275dd1dd8ae7ed96fc1e7bd9dfb19f86b8be1d0a271657eb0 SHA512 789be3f3742d12166e58717dec9890f9051a86ae6aca072046c6874397f6cbb0d604fc4127228ac258dceab2425777207777167e6ec3c28baa0b39324f931692 WHIRLPOOL cb94826525fdea39e40863d18a599fe88889b34cb35b364c57441d771663b8bc7c23681a5b14abbf0804e449d281ac031e9c74db94a80a15504dfbe07725e4cf
 AUX tong-1.2-makefile.patch 897 SHA256 5b358ac7c923e32cca6ed7b8541fd267b866827ff869dd61b3210b6c6b1234ea SHA512 c342f686a57def0f07dd51aa7c180108624463db5ef1defc4ac4636df74a9b754dccf5c39615f0cf2a30caf77fd20b07a8d89d337a8e19cf148ae47d44fb0731 WHIRLPOOL 7acab9df0da31ae5715fcaa783f437b98a27844e12f48a5c311550cfc0d6ee3726ae49ed5fa559712bf0db38af8bc88ca1789b296d928b6a30e8c08345351d1c
 DIST tong-1.2.tar.gz 88028070 SHA256 7514bf0c1c1a9a8d6985d0fbe83486b83f665d9a202beed2ae91e3f45e90942b SHA512 0544f489141bba37985f1ef3c316208e3e6dacdea8f8b79f37997a9489ff5c1710fd1426e02489f8adb33bf9a1511bb9a0250122fa2054ef4a6ef203c8881261 WHIRLPOOL 107d3009c2e70e78ef81781b388e329f3c45aac8e09470e5c362b3d8b152ad7b6a2d119490a2e2bc29899bb4a8ab36f9d9e86245c46257c260c6b2f65769ab16
-EBUILD tong-1.2.ebuild 1041 SHA256 2036d02ee219c9432f311e2deef4235e0d6e0b164a436f7909316a0cdb2a2559 SHA512 1579c5b1f8c0da548fe50f3ee46846b888e2e13239776b0ac27984db7681aaaf12d415524f958ff10d790eddf9b8adf23e65e2d13caf4517f6ad80413993a937 WHIRLPOOL d6a2b3d8154dd45ae2e6e706efba857edd60532339899837cb126748423729240c18cde77482b917b844143cdf21a010de117a6052dc0142ef922b084c203e82
+EBUILD tong-1.2.ebuild 1043 SHA256 a7059f30ea2287d1bf8a66ad494fd823dadaf1ed670a0b3a7cbf7a7b85d87723 SHA512 1498fd416fb64ebae386cfab8b558328009d34369e8728b5f2f27cfbadfbaab082eaff061c9c07bc7d74c9e72ce6f2e521298e36304de021b2dfcb5418b7d6a1 WHIRLPOOL e9c155fef28af137afa5eec6631660ac135d8efeb8a1358be7e32c0583e8e74bb19ee66a134c13dfd702a3f9684a022fce357780745b9bb5e5208a0f44733169
 MISC ChangeLog 2510 SHA256 6ec5d392f7040623d99fa71e3a97370ea08dbdc2ccfd4c4a7a13b1e5878085b5 SHA512 6b145482a2a7fbb78a463a34d1be7f4afb5ea81601d5c4be6e3c27392a13b8575835eec1e0169f5fbc6289b16e30e4be17282c032af26e54c3e5451627ca36ea WHIRLPOOL fc22c31e5b90d29a40bb131332d304f4f0e973e1f5f28124f2e8f8ad8807000add55ce0b35525902458acdbdc988bc066d417a035aa7525d2332f7f4cf75007c
 MISC ChangeLog-2015 2004 SHA256 357ca53f619007e19fa63e9f66e720ad0c5f8f8125434d94da50dbd8c563835b SHA512 e60558c5b71bf643a7b7331973f99a714f052ebf3aa001557f865d3c4771a94d9808935df97f6b2c0ca81c98622f7fa9575a19a4ad82d42dbdbb7ca712126a19 WHIRLPOOL 89160d9b5a83c52044cf500d9802b0007b4a801cf4ca2b92f16ddb1240b457526821197417756256a8805fea1b554ac693810e60dd21a30ba2f987a4b66d4dfc
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-puzzle/tong/tong-1.2.ebuild b/games-puzzle/tong/tong-1.2.ebuild
index 9df9c40eef39..9ca7ebcb55be 100644
--- a/games-puzzle/tong/tong-1.2.ebuild
+++ b/games-puzzle/tong/tong-1.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.nongnu.org/tong/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="media-libs/libsdl[sound,joystick,video]
diff --git a/games-puzzle/toppler/Manifest b/games-puzzle/toppler/Manifest
index 88b83fa18ac4..ab5257ab1d58 100644
--- a/games-puzzle/toppler/Manifest
+++ b/games-puzzle/toppler/Manifest
@@ -1,6 +1,6 @@
 AUX toppler-1.1.6-gentoo.patch 2004 SHA256 2111ae6bee070a8bc903249a544102d0fb24d8665b2440e2740f37d69deee555 SHA512 0fc2d8eb7200c0c4e4986e0f53298d8a7b49f8be0d46bf2dc370e145a4ff39f7342874b5d80a18f703f7d134fd59274a72679afa7317f94609469042942dbfb4 WHIRLPOOL f4d7109dd51c1194a1b85688354a7a982be2b5429158e497b38973c7053bad050f3174e543eafea99b0b3bd717a32116848207457d57e293a9187257f46eea79
 DIST toppler-1.1.6.tar.gz 2117137 SHA256 7dbc2905389c2adba0f8c459f3319cf04045ba53ed407e273a50a3a67564cc45 SHA512 e0f6b7b72e38ba3402ba3608116fb51bf36cad129fb5591db62489829f4ed1ec49a4a3b7b1db4aaa34cd1561ee5228d91577f550aad2d55520ccefdff9bda9e9 WHIRLPOOL 06c8dedb4f93289e067514c7592d4e002ac1b315fa5d52769fe05de0f9e31b2a14a4b9ab543736d9b580d6af79af4a09f64a1946a14f4f5bed9538b24b7285ff
-EBUILD toppler-1.1.6.ebuild 635 SHA256 d8be2828e895e53718910095212775bfef3aaa9047febe6e03e5bc75974d3e81 SHA512 cccc37b3f4c063ee01876812dad8dfc607d9edc6c83206a0d0ae9631a868a7668caa9cdda928b8f3fc2371a1f0bdf402b41e367322e78926c1a33a3bbd1c2947 WHIRLPOOL c1da916104e6ef1d89066b91af884446281d03417b116d36076eec1fd3c37b2011cc7c2057196437b56efaac27d4d5ec15f41429e112aff97545acdb0c67254f
+EBUILD toppler-1.1.6.ebuild 637 SHA256 d4a1b9f431de5d9653bddd0bfa5d75a3cf059685dee13d3f9d7aba837b50d224 SHA512 432ae9a7bf3238a8369fb9e8d4f34bd2218634a8baee4b2bf01d72f1e2a58146aa2336116f8885ed2b2f37578705e1ef943b1cd4fe60300d051cc75b9baec2fa WHIRLPOOL be8b25932a2f514fea08cc010466bf49ff29dd0021b5082530dba71f1600a6325e9f3a97d379c46065a81a789eebc454963b04339ffa80da94931e0974bdb551
 MISC ChangeLog 2466 SHA256 130dbd3dbb5901f018c660265b9f284f6954a03aa5f25d83f0386e8dee874536 SHA512 1fc81192183298504c70b8860fa805cc5b7eb8e618ca2c0eb81a5c426b2f2b59d18fb2f19147f68fff29af4c58347f48d0643c29646014c78632d110587350c9 WHIRLPOOL 03c034fd3e37e72b18d2d59fbca53767000df864406619f37210698f60865f2fe36fac8345c3ad212ccbb859dd17d307279a59b6ee7cbee7af8a4be714786aa4
 MISC ChangeLog-2015 4124 SHA256 79fd2e66ece546fa054756c6fb830ed8ec6cbd685db225d22e2641fa97a41c92 SHA512 10ec446e70f4232fede6835eb383555e6b0ae8349c382efff4ced826a39c693c24629006a37909ebc2baf962d0375d35f7138645eaaa834188fd01e68197acf5 WHIRLPOOL c6a0bdf9f4d39b6a4e70c9945a3d1375cc0aef8775d85397a1f60f2e48d86d0b65e8c4661ff057b345026b6559033412ad16e70bfb04720f095c174157dbdaa3
 MISC metadata.xml 330 SHA256 e9751d2289b54dc200dd43f080a375dc9dacbcd09797f65097ef9c87d46b9d41 SHA512 68e3d67a21f67e1c0ede15141c8002156029bed457e521cdb532ae6524dff1e2bfe00b205a515ff816d61b953aca3c0ed5c9400a9a69cb44a859bd59c2394a62 WHIRLPOOL a958addbf0a07151d97bd06dab5a044314fababe31f148f94f649a2fe57b080df91f436aa960db80b5160496728d61ba32bafa0cc0d6db1d198f7a5092d95134
diff --git a/games-puzzle/toppler/toppler-1.1.6.ebuild b/games-puzzle/toppler/toppler-1.1.6.ebuild
index 7b0f24837021..311b799d69ce 100644
--- a/games-puzzle/toppler/toppler-1.1.6.ebuild
+++ b/games-puzzle/toppler/toppler-1.1.6.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/toppler/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="nls"
 
 RDEPEND="media-libs/libsdl[video]
diff --git a/games-puzzle/torrent/Manifest b/games-puzzle/torrent/Manifest
index bab02eb018af..4a10a76ee96c 100644
--- a/games-puzzle/torrent/Manifest
+++ b/games-puzzle/torrent/Manifest
@@ -1,5 +1,5 @@
 DIST torrent-0.8.2.tar.gz 555686 SHA256 93890ed9287061f6b8d63993962c188013388fe7cf4d3d334ca7e72cc3209a67 SHA512 da7fbb21252a76fcd41c0b22ae4c0835e2fcabc4da5ce60ad04880c3fb633b6aaa951532ac0ce69d93f03b7608e4b110a23ed6f9f8839d053cd4a0d9500d1692 WHIRLPOOL b2a360bc6a20d8de67cbeec9808c914f4b1120b029e5367658ebf9ee46195fa63c9ca70fa41f5ec4adf3da744175aa31ea720564a5ed4ccb01e464ab274fc423
-EBUILD torrent-0.8.2.ebuild 717 SHA256 6e67fa6033c843c6bacbd1b45080292ae90404937da502a8b4890c6bc39a76f9 SHA512 d23b090b3aaf70e0a2c2d91ce849a7edd78bcb72a1814967cbf039e2334b8cb1239062b0692dd286cd793bd61e2b394b82a6e7b15487f758174178e90f1f55b4 WHIRLPOOL 71b13ec2a2280a4eadbfd7e684894de8d9683210ee512837ebf0035b2daa721b47feb46c0bbad229550c9e281c6bfae99dfd0bd043de8fc92b8a4f49326a0a73
+EBUILD torrent-0.8.2.ebuild 719 SHA256 b38b08cde87335f28a8e00a49c9acc25c0bbbe4bd1e583603c92937ab4d569af SHA512 8910394121b1d6fef2cb7a6e7d06a8e0e8d6a35fce38487c5b060f9058d7c64bf7024ffe2d959f23465681c9968fa4b0d65395bbf0118e55d4521db063850226 WHIRLPOOL c52213bae2f22248de1de5964b1e6519727093573ebecb3c2306ce98f26d863da6b8378027393bd4d7f90fa6989cfb58a44e38942d8eba479ff9f01239ae037d
 MISC ChangeLog 2431 SHA256 1f658bf2e36f42716d45748c393fa69aa40fd127a7bbb38d261512a045d28086 SHA512 a7243e57dcf201a3db91a732240ced07937b59321d5d7af3c9d610ce6b7e503fd1b5f330baed332024f9fcb375e45d3cdc1d0531e42dd7c64b550af5de9ea752 WHIRLPOOL 72fa86b1b6e89353451e8b6d08352ec50ff8cdc59bad3ece577b3ea4faa3ac1428cf3946c12e4785d3fce84d4d6e0fbf44204466a78d385839490422694f182e
 MISC ChangeLog-2015 1063 SHA256 bbb3de4bc3f58117769bb11f53e2043f43e3d46bddf073f388ce35a65074828a SHA512 7f7038dbb8ded68f4cd73b18e8ac9ba49b221e73ec922730a42c08813ea47a3c8369bf00873c8db4416d0872442a61825d68ccefdeaf811321be48b64eb2c462 WHIRLPOOL efc6b90549faa141b0cb0a7b045317a5fea61db0a507953640b3307e770ec816948d69a76f3e4c4d1eb221570e2df3b594d257e48c72a4187e4cd9bc23a93fbe
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-puzzle/torrent/torrent-0.8.2.ebuild b/games-puzzle/torrent/torrent-0.8.2.ebuild
index ca645a95b595..c6b01b28bac8 100644
--- a/games-puzzle/torrent/torrent-0.8.2.ebuild
+++ b/games-puzzle/torrent/torrent-0.8.2.ebuild
@@ -8,7 +8,7 @@ DESCRIPTION="Match rising tiles to score as many points as possible before the t
 HOMEPAGE="http://www.shiftygames.com/torrent/torrent.html"
 SRC_URI="http://www.shiftygames.com/torrent/${P}.tar.gz"
 
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
diff --git a/games-puzzle/triptych-demo/Manifest b/games-puzzle/triptych-demo/Manifest
index 4dba88586e5a..03198a1a14cb 100644
--- a/games-puzzle/triptych-demo/Manifest
+++ b/games-puzzle/triptych-demo/Manifest
@@ -1,5 +1,5 @@
 DIST triptych.tar.gz 1748316 SHA256 2d583edc1b974fc346087ab73adb24d476cee040fb59912e28fbf7a8467db5a8 SHA512 614de78c9f90dd2145ff3dfa6f7a799a069c5add80bc8b0494a752346a163ab0eff7b707292b815adbffa34e4fec446035cfb65df4dd6cf284f270bb732b6daa WHIRLPOOL 53fb746b02c91a4434042a21b5b36f27b17528ac51ea9a3dcf4339cdf75c3ff93db2ffe71fb0c3123e3fbe9720264a18e183558cfda14c0320440e010c21b78d
-EBUILD triptych-demo-0.ebuild 1085 SHA256 9d614a368e0f67b136e6751827822db8305356561ada06750f3bf9352937c323 SHA512 c2442ed3b689a6ff24b5a219bcb4e51b78cffe3eae6ac18cee6b3fa1ae79757360a25ad2e62d4d63c3b7033de2c0fa5108dd6990b28a08d20bf10b1dfa4a0a97 WHIRLPOOL a87d5a36a41646bdb5d5103dc46f96f52b2497a0c126141e1676ef9426106a1808cedf4e19efbd055749eb0125d76d02c45d7420276fbd0514e67f5dc841ef81
+EBUILD triptych-demo-0.ebuild 1086 SHA256 bc90c0b57877dd5abc4d533c2b2cac4094d9eae155c619d6e8f10be78f9dabc4 SHA512 b66e1813a177c3268da4f60f392d22ee5048ec947e7035597a717655cd41b098bb08182345c749608a3c42d67680757ae53ec3a67b100d5aea59575a2e1bf602 WHIRLPOOL b8398f2a450d9cb76f72817c74ba1419c72843ea2e2797cd560b9501df1fcf90cdcd9f1a895fcf908efff12c13612f235c9e92d927f926808b70358ee590cf19
 MISC ChangeLog 2441 SHA256 3b58955d69eb4cf175278fb4980f5fa90794ae2971baeb4e45d5c21424b68b19 SHA512 d45f6169cb677f105f5cf59a3a567380250fefb772b73f5dad3660fb758c8fc07c55efa08cb6c2e00295b898c864b841d3dc2f75d29565c8689373c5abbbcf8b WHIRLPOOL a216df9719fd1c540b421a90af9eb49ae91a08bc35d48e7d388a149d0a1660a66ca0ec9cc0a68f83389a6e9d95334921278bd625d29ecee9675fb6f74d325b0b
 MISC ChangeLog-2015 1482 SHA256 3ec6cc72f131261bfc7b39332283e6e570c6435a8110819bf0e0fa96a6b09976 SHA512 a7b031d9ce847c239b22a65f484a64334a4a81a340aa3a4306df0a2ef94ffe1f04f05b34c9ab2c3a3aecfc219913e688e675ae925d871029da6ed0bb4392598f WHIRLPOOL a8902444dc60eb72426362479afaeca372aa97c298e9c833a515aa049d6b50480a1b246b8eb8de403163cf4b7206c772db6cac9bf60de852b700a8f0cb29a344
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-puzzle/triptych-demo/triptych-demo-0.ebuild b/games-puzzle/triptych-demo/triptych-demo-0.ebuild
index 7f9c192fd0ef..fcf9d969a487 100644
--- a/games-puzzle/triptych-demo/triptych-demo-0.ebuild
+++ b/games-puzzle/triptych-demo/triptych-demo-0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://s159260531.onlinehome.us/demos/triptych.tar.gz"
 
 LICENSE="all-rights-reserved"
 SLOT="0"
-KEYWORDS="-* x86"
+KEYWORDS="-* ~x86"
 IUSE=""
 RESTRICT="mirror bindist strip"
 
diff --git a/games-puzzle/twindistress/Manifest b/games-puzzle/twindistress/Manifest
index 5d54e1b0c148..c50cc6850b20 100644
--- a/games-puzzle/twindistress/Manifest
+++ b/games-puzzle/twindistress/Manifest
@@ -1,7 +1,7 @@
 AUX twindistress-1.1.0-ldflags.patch 372 SHA256 73760cc2d2e0b4a1d9ca3d763d2485e7127386d7139a06413f50012bea951f2f SHA512 5c19ffcfe2e9a451e95ac4d03da20cf54bf46ddc7bd369cc9e6c49a3215f8c39f50632d9e60167389859156c4df35ed7b813e1beb7a884c8ec0198f56a8d9f56 WHIRLPOOL 957c90d6202138accbf05056ea6eef217125db981f5c5e03ddcc8511cfb8a9ef40fb699ed82c71b40c8e15490bff68521275a702c08d8862470c93a82dd0324e
 AUX twindistress-1.1.0-warnings.patch 3342 SHA256 d94d8af1faa83596c43873388846632207a5daaf7b9c28695bf39b44d1c2d884 SHA512 20bb973c6dea47436333f9449c7b924c38744e74b8eed6646062e4a48c74156cba8fd17150f5a4f8dc19de68ee1c394eee8aa0f2f867a72bddbbb32278e9c304 WHIRLPOOL 9b36aae6a0fbc75e2429705405560b01e979cf57b01b7abb95fe713cf7de6e043740ece5bc0d053ab9f14a38e4e0308def4bca780ccd203f06411636ed90733e
 DIST twind-1.1.0.tar.gz 2837845 SHA256 392a09e92862cf8a89a9b8c6f5ed7255c15c7f058a89d889c32f59ed8da73382 SHA512 f1b3be3e5706ce244dd291b6fba2160605593e51b60344521025daf882509e164aa5c201c8d696e56a64d6f3525d16ecd3fd78cc1b86f39f401d4137b615fe8f WHIRLPOOL bd6c54f7d558d7a099c26aaa420908b2cbaecec7244f7e4ed2e3b1703ce7f433af88e70201a856e55e2d9c8644298c4ae7adae91b467f50507e7cf61a9be4a71
-EBUILD twindistress-1.1.0.ebuild 1377 SHA256 adfe889aa53740c342e028f10da200466004e25d3c7335adcb54b2c92ea322c5 SHA512 9782bf13433dbb7bd6a63636597dfb7f95e89cae6b8fe89e4a0f69194583060fafd32f67198da90640373cf3bde17728eeadef1716567d500ec8ed7e93a14412 WHIRLPOOL 4d6575148a1b9b2831a952e229b5f75440011d1d8d50005c81a3d8e8124d8d97d01a25c7db9acb8e84e5cc40ee38c8f6600a5ff49c9bca02781ab5e6b5a3bc49
+EBUILD twindistress-1.1.0.ebuild 1379 SHA256 77b35108c6730b0267b75cc55ec51846eef292bb03a74327d43a2efcb9f84f29 SHA512 48ceef2f202934a39dd5920f5e20dd0db6b538a69173a07641a55e3102bdde4cf4ad0732344dec423efea875b650ff82f181d260da34def12d9798902dd1b215 WHIRLPOOL df8ea4b52efba9ac6ded6e22cb24f3f9e9fac35c057d098d50f5c9813a6e640d842776c243efeb7b077bb8d2a5d9781538e559eccbe22aac37c03218c9fe7053
 MISC ChangeLog 2533 SHA256 0092fb247ee961bfedef1b9ea742bc68370c054d3c09410e5491374ab87906cb SHA512 c16222d71cc516989091ec9045d6b3b982d8a1bcfe3bf8c7de723a79e37c1b606adb27072ddcb8b6b5c710c77f00ee0f809583107ae428c541cdef9daf949fa6 WHIRLPOOL 2f7c027e461c4222d5fece2b7c02278b44b7254711072ff9d43ddaf135e3ae05ec5198909b9c378d85124e624087e39eaeb17098a275124cc845dee73dd0b89f
 MISC ChangeLog-2015 1732 SHA256 fd7c12f0101cb58f5013c3f84d86211ea0495a77f2589eaf32859dbe2d82a32a SHA512 f77cf9e4aab58d7a4be644e8bdcbb5e6b546cbdbb838d36112ff77a13ad8602cbd429ae97d114ec2ab02ecdce5d9fe17eb0268ceeea16d70e00de7bd77ae704b WHIRLPOOL 04ee12615247c5011969de687d929bc23932de898fb9b9254fa90fc244a4981ab4625307b690f87f0ff07cd88d5f8c41b776f869ee897412addd6abbd8c895e6
 MISC metadata.xml 328 SHA256 f552c99d117a6809ea57c4cbae16b96cadee1aea4e9471185e731b21f0e85b0d SHA512 a7244b86047c6854bbec72296e625cc10aefa30a2e901dbc2f15083ab1532dc7b3e5fe91ae344fe8b4f0d1019b6f4c91def98cbeffb8fe4a044cc34cd9b03e38 WHIRLPOOL d0f74d1c10226c6968dc52d2ebf4fb8cfff12650be2bd84307ae0814f3d181cb5efb27e78ec05c6991c25998a53f5e2a81ff71c23c2d57e4976d008cfe5cd416
diff --git a/games-puzzle/twindistress/twindistress-1.1.0.ebuild b/games-puzzle/twindistress/twindistress-1.1.0.ebuild
index ef170aadb82c..cdc296985750 100644
--- a/games-puzzle/twindistress/twindistress-1.1.0.ebuild
+++ b/games-puzzle/twindistress/twindistress-1.1.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/twind/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="media-libs/libsdl[video]
diff --git a/games-puzzle/wakkabox/Manifest b/games-puzzle/wakkabox/Manifest
index 93275537e1c9..c2ea772caf9b 100644
--- a/games-puzzle/wakkabox/Manifest
+++ b/games-puzzle/wakkabox/Manifest
@@ -1,6 +1,6 @@
 AUX wakkabox-1.1.0-gentoo.patch 1756 SHA256 cda9c29af872b28c08e669ce97335398ada99d3175be1630d8def7f162aa48a1 SHA512 63bc980bc88fcaefbea76e93ccd6e8c4628a005a0b3166c78f90a905892c64de52b75b99bd05d715f86d5b2db0f3500aa95b2a5003e59549957115d1832c9ff9 WHIRLPOOL 43491e1302cd5979fb8854dfab9d8f943ba531295e4b949135b2fc300cdfeb4491b4c4b00044579022bce3d8b9dad939a5f678b8361a1842cf43e7df2689724a
 DIST wakkabox-1.1.0.tar.gz 158231 SHA256 21c94bf994ffb3e4567538f6982091f3fc63e032cab08df37ac17547f47b5f8e SHA512 a97fcf382c3703fa59d6c2159397cb795b698d2a28253a7e60690b24b3d72b4950b9a7c569600bac0dc637b9d9a52577a45944036518cf5e79c601b377a092be WHIRLPOOL 4e76b1ad49bf437be90db864ebb1334e56f09d1014a7ec8997f4c181cbaacdc466c079cf2988aac282ef1d357d16977a32625b99a3fdc12b994a995436d273a8
-EBUILD wakkabox-1.1.0.ebuild 518 SHA256 c6e65e110a07b3c5044b3aaf11d9a303cc02c5d3cc3456c1c58f5a61f6666738 SHA512 f6cf252d85030139b3e499da1b3251b84e923018886cca24f2e7c0a2c57ae7b0eefeba84f798f14b1a4fe19a2253b97c51698a35ea64ef71a87abf8f05de8537 WHIRLPOOL 6eed61b891d8a0048d583afa9511279edfc14bef4571c7925fb313d9a0392bb8018d14c7e5908fa491dc5715b2a1cdf8c4dbbe1c3d190b0fd519dafc9008794c
+EBUILD wakkabox-1.1.0.ebuild 519 SHA256 12b008a37c718e81aceceb6b29a0822b1a273834504d606d30a76e3bcdd8fd1f SHA512 b81c994e305e6b39eb0a7c66713f250d4873e927130f0d6021f5ce2c5d2afa4cf838f94169ec4e604ecf790ef5548b8b30af7eaf5c2723c820db49778f3e90a2 WHIRLPOOL 4fb3cff7d18a295415b7342b769f3643ae8bb8dd534dbd18fd7a587d6a63c422d6181f335643c10ec0a86c988e36523deea07d1b16808abe6e1f3ee2780d447e
 MISC ChangeLog 2470 SHA256 17eb0d4cb871b015385efc96591a0d496392255825cea4703b32c788586e8732 SHA512 a42d74125f560aa37ff7a49ccc5541b39ad8c72f397c27dd318f68c1388a5d25dd6bae343fa83b16bdaac29d477d7dc22fbaecc8d4da31ec5a2a870dd1d2bbed WHIRLPOOL e7accc3d70a2d495fff9210956584e6f21ed5e7bdae4691c0347d598561dda470a436c911f61b59718a5436d6f62372a00ff3ef0a6a8f6fe45ee3793a3be7bf6
 MISC ChangeLog-2015 850 SHA256 a2254baf0b43508a2988101a22a8d852e6f7b980eb1b5f23d3c15bc2442ed25e SHA512 bf866248a098dc35f2407dd9071d0706ec3d24b4bc78005ef5174c85daf6191c4ede583758af17a15ab4ab3223688a7ff831b4f4e0c6f809b904b333fa7b27ec WHIRLPOOL 41537a023d4a2a8e17e670bc23e59accbc686e5beda46554a3c6fe4dd499bb17fd426ca04e75c3ee5b9b38f13853271e08487f67ca9f0f1e67f83d5823bf9f8c
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-puzzle/wakkabox/wakkabox-1.1.0.ebuild b/games-puzzle/wakkabox/wakkabox-1.1.0.ebuild
index c3536395bdbf..44b16ff42ace 100644
--- a/games-puzzle/wakkabox/wakkabox-1.1.0.ebuild
+++ b/games-puzzle/wakkabox/wakkabox-1.1.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://kenn.frap.net/wakkabox/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="~x86"
 IUSE=""
 
 DEPEND=">=media-libs/libsdl-1.0.1"
diff --git a/games-puzzle/wizznic/Manifest b/games-puzzle/wizznic/Manifest
index 60e81cb16ea7..ecc7e91fd085 100644
--- a/games-puzzle/wizznic/Manifest
+++ b/games-puzzle/wizznic/Manifest
@@ -1,7 +1,7 @@
 DIST Wizznic_src_build_306.tar.bz2 37019286 SHA256 864b51e20f97b918950d20631c8498e44ea55b8a79a64041ae60b73fa9a5926d SHA512 499b43bf8d1fe4b187e0a3c1f186fbd629ae7a7b3fa993d581b4db2a7f5025d44381f001fe5f3ca769d882040c4ae07d30f53025f119502cfa6f5a97e109ae54 WHIRLPOOL 6fd49bb67dd76a3ac7f8528a98961f1723fd097e9d8bb327edba34d921a711841f5a40c1788ddfc8e3db1ece1c1e0054054002deb462abb80c1e226055dac7f4
 DIST Wizznic_src_build_369.tar.bz2 38118227 SHA256 8eac5fbdfdeae70f22cde84eea4c57ab9576e99db3d38b75aae795d32f64dee5 SHA512 61c6ced873403bbd14e8c376321ae0c92a7333bb59409615de1e1305da3e4b3cb023af36e002d732877fd1371a322796df3e4050e5afe699e03f01039d7f7ead WHIRLPOOL f9a40898a8c830fa55b1fb278baa0d9dcf874427ea2b7216d0ec10e4334936c979cafd61f6e4551d351c4f97803f0ce47ecbf2b061e641c2cb1142ddec956f84
-EBUILD wizznic-306.ebuild 1253 SHA256 97fd272e219c3f31c42e15f019c6d3c8499d763305d98179f397a3cf8b94cd7d SHA512 cadc2203a619225c8a3775bb981eb5835267264f1f2cbff3209a944febfc9f774d0f1d531f12a06111b2d15688c7529c013e4544670293082f0b55c13a0bc1f1 WHIRLPOOL 0a81b82647efdace507021d0b401fb9caf5cf8202de235964cd0f1db84dbb0f27db0e3ba4152b940638e2ebadbfda7a52897ca5e8bdffcc950e8bbffbc4d87c6
-EBUILD wizznic-369.ebuild 1059 SHA256 40c82ecb3ffd836cc9b0240fcc6744010867a0a5277a054d41a53e7aa8e27e8b SHA512 dbd4a14335810f91bb87fb025ef32696d3a375f70723bb2f3001c1f3435aac4d9ffa7a4cfa0b2a87a06488084e57b717914979869b870f64a18131c0608ab345 WHIRLPOOL 3c2ce72ed6525fe9ef920e7f4f0395a2844f5cd50084a48d04d74fc540d50729f43ef2d798eaea174ff0dd773147b44efc9d17f3c4fd4e9ac6b73a44de04fca3
+EBUILD wizznic-306.ebuild 1255 SHA256 150eab02051410977a985cc4177727a913a2d6e567857856fe8a2502aa448952 SHA512 0f6e4c2e2ae1a2e027d0bae365594b7944c53e00069d1e87fb5e67ea73bf24a6e1e496c1096bd80ebac37e714c406981a7baa92ec407efb9ae9aea0b8cb6a8e8 WHIRLPOOL c93b960647d68d793d865223f930025b6f9b9c2ed936c3cd34d4a3255c44f7c0b41d16e267a9132488c9191d78c2ca21beec99aff6fc12fb5742351cbc8ad5b9
+EBUILD wizznic-369.ebuild 1061 SHA256 09e5288c2fab6f1361fcb6459f64817efbee8a4788a3eff98c7594f0098262fe SHA512 cfeffc87dd67ab7b241fc2f57e80d81ba9f06484ce22011ea702e67de21490cf4f3155de00c84097adeb17856e15f4c3f15b0a876986cfa1a0de9e1ca4713eba WHIRLPOOL 8e772147361b1e0cedc9d990422c365b76a0c3c2c2b3f365933f0ae554b012b45040befcd5b5e6c4e8d8f0f17d942747d3efbc0a4539398110bc9c9d02e914e8
 MISC ChangeLog 3342 SHA256 87af3dd51543fe20f600a6eabdaa1f80862c3ab0f9c8766f69203b7e007f380e SHA512 836ffd628849be40b26222ed92460eb38ce568b3426ede8efb34547f31d9f5c84369968f02c1d6b1fd1cb12db0d81da4e41ad9168dac13a93ec21e026c97f689 WHIRLPOOL fe09d7f81fc73d2e999df91fa96dd2b9cc14ccf53397de99c0c21f7a1e97b0e6b66523745ed1f09185bae9d539a7aab067df198d2c4c869111d860ff14e1cd7c
 MISC ChangeLog-2015 1146 SHA256 999c47f9915d54607224a90c2ada0923babfd442a295cc8c80b076c3739dc68c SHA512 98a8eb34b37cb2065af04366f12b3db98bb34fa804a5979793ce543d3cbbcc88d7988c7924826ad81206e320b2df30ebf15882d96f3b63e635cb3269d98195bd WHIRLPOOL c0aa456403146e91709c79278485c984bf59f5c8404c885a74b530707941aa3c0cddcf1bcdd9efcba8df3f826554d358e613a00135a9236f5d226be9d9c2d759
 MISC metadata.xml 330 SHA256 d073bfd6110fe37f30fe2f9dad7bf7e30ffc609c5f412f4f8ec0cabbbb3ce69f SHA512 3cce7ff11dff9f3552a3e073a0ceb96d1032e9c87347554fb74b2a313a2f0a24774fe94debd1caef26cc0d57e051ff0fd616203f0e0bdae425bc1af834010580 WHIRLPOOL 96ebc9df66a20b98d5a56a3d97d3decfbb7ebd903780631e88dafaf45ed0be843754de7c3a93c78791afbc2d96012f5d46be360d54f34177237e9cc9a6ce0da2
diff --git a/games-puzzle/wizznic/wizznic-306.ebuild b/games-puzzle/wizznic/wizznic-306.ebuild
index fbf0c09b3450..13480d8831b5 100644
--- a/games-puzzle/wizznic/wizznic-306.ebuild
+++ b/games-puzzle/wizznic/wizznic-306.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/wizznic/Wizznic_src_build_${PV}.tar.bz2"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="media-libs/libsdl[sound,joystick,opengl,video]
diff --git a/games-puzzle/wizznic/wizznic-369.ebuild b/games-puzzle/wizznic/wizznic-369.ebuild
index be178a846336..1b4906e0f35c 100644
--- a/games-puzzle/wizznic/wizznic-369.ebuild
+++ b/games-puzzle/wizznic/wizznic-369.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/wizznic/Wizznic_src_build_${PV}.tar.bz2"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="media-libs/libsdl[sound,joystick,opengl,video]
diff --git a/games-puzzle/wmpuzzle/Manifest b/games-puzzle/wmpuzzle/Manifest
index 16ce8031cf2f..e0e0c81c3337 100644
--- a/games-puzzle/wmpuzzle/Manifest
+++ b/games-puzzle/wmpuzzle/Manifest
@@ -1,5 +1,5 @@
 DIST wmpuzzle-0.5.2.tar.gz 87373 SHA256 b48b9ddb0b0bb85fd9fa3aef859984bce77b5f5faa6dad9366d00c1862a74b9b SHA512 7d171d307e3829005dff4d718161655785e87129b07917d494bb498eff904adafc7c6f83e71f996759ee9e365fe70c67858a5ec9d2647fe573e0a1505126f6c0 WHIRLPOOL 8d91e237b85ccc46ca27308f7c4e69b1cc00d9602d7e679fe6340d7442dc4c7a47c8b2bef07ae1ccc4c0998fdee0b54d55ccfa9c9dfe85eb55ec3a7a5ba93508
-EBUILD wmpuzzle-0.5.2.ebuild 842 SHA256 170f0ea598e6398094991decd4ccfdcbe138b28a3a7d39bea82589c3a2a47202 SHA512 f2a1c0a9753987fe760dcdae460592db17e8971b1aca61a049e643420af4b2d166a56cb421b95b37b19cc3e71c2324fe84e70dfb5f695d6c20d198a79fba6250 WHIRLPOOL 8adbc307253f6470834a006c0af825fb1f67914a1641f66d5d34eba3721be72156102633bc85aaddb1a8341ec9787925a1b9573c981c9132141fe8af341a96ea
+EBUILD wmpuzzle-0.5.2.ebuild 844 SHA256 623f0d2fae082b35c298f9df4acdabb9b617ef262d5cad949125dbcb67fdad13 SHA512 9fb015d8eac531faafbe0dfee1e45132b562af836d374bac345071eedf030c1ccd784fc552be62a208221555f8e39a6169d444d68d88e8f94168b8428c9f5229 WHIRLPOOL 1e830985aa36a89bf27dd132c5cb14d437a1321b7ecf57e4378dd427d906eded70344a46709e8dcae74ca467b2069c965e1bcd288bc310572ba412533c11d66b
 MISC ChangeLog 2892 SHA256 1edefcd1cd3171598971f91d03b27cf3374849113ecad2e4aa2887f337785049 SHA512 8a9ee3250af5fff9146717345b5c67c662e753fffc117ccc5797a17ae946856cf6480f7165c21ab5de1cfcba91de468f786eb5a1b6a39e74b2499e7d1540da9d WHIRLPOOL eaa54bdb7c8bd4181f1450594307f1714143d1ac8fb42aa41583d710374decca89c54c08006827d7d40ab91f97b28a4bc63676260f52a013459e312931000f2d
 MISC ChangeLog-2015 1928 SHA256 781b496ffe9ced9cf5570aff0dedbf8b87d0398ea859636e16f55f02c9924a4d SHA512 cd05d5ba44d732ea32a53e190bd7e673ab9a7343e62b67554e17c1cdcdc4df02709a06c9cb781d6b47b1cb6bd29d947bf662d3a8db6d53cc9ea46807d1121b33 WHIRLPOOL 98f86aa53673800d155ed44df961d84ea20ce8a4d3489494b0bf7d8b67eec202888bad833af8a9503044111f66c05289a3232432eb0b23eec1dc4edfda60859f
 MISC metadata.xml 441 SHA256 97f91267f9174e32d56739d20af74905f113165e36dfcf9dc427ba1ff9cb4d32 SHA512 12d6a5472ef0f13f5703f22b584bdb75364db3018f0d280b18d2813f741d2820aa1daf3dec24e64e88c1df27822695680a269169ef682ebd95af26d130401714 WHIRLPOOL 8f32c1a7c535e0150adc73cdb76b2f31ef548bab100c5e8e1fc8c2cc0c8fe4f97083e0b9a6cb18148a75113f8892a02bc3f57a8d95a4737791f0bc4b9972eb28
diff --git a/games-puzzle/wmpuzzle/wmpuzzle-0.5.2.ebuild b/games-puzzle/wmpuzzle/wmpuzzle-0.5.2.ebuild
index ce0f7e1d992e..9d414ea4500b 100644
--- a/games-puzzle/wmpuzzle/wmpuzzle-0.5.2.ebuild
+++ b/games-puzzle/wmpuzzle/wmpuzzle-0.5.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://people.debian.org/~godisch/wmpuzzle/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/games-puzzle/world-of-goo-demo/Manifest b/games-puzzle/world-of-goo-demo/Manifest
index a99edb2b0be7..c8862ae0ae01 100644
--- a/games-puzzle/world-of-goo-demo/Manifest
+++ b/games-puzzle/world-of-goo-demo/Manifest
@@ -1,5 +1,5 @@
 DIST WorldOfGooDemo.1.41.tar.gz 34729052 SHA256 3177b5561c843182613621a3b69800e431d9e1c8cc36fbf42192edc9428fac59 SHA512 5dcaf7cdacedf0df92133284c4781e1d4ad14abbeddd623a35e59129fc5c1cbb3782d570ac83bc6201f3212c15195e5ca637400839e87fe95edddc5ca671077a WHIRLPOOL 519c60c1715ec7a69c03381383ad30f5a73cc6b7de28d9b6e1a76f6119232fcd1dc46432b51cba285a3f7f1f0abc93bbd6029d2b8f9c5e14cf22bd27d613a238
-EBUILD world-of-goo-demo-1.41-r1.ebuild 1400 SHA256 0007b1d8ab0f4caaccd460f77eb997bc38746fb99cc4e88e066c89875a1bc9c5 SHA512 224cd922ebd377cbce60ca8d01ec24e9af75e8d102660e9d0f5f61bce8f91e3dc7949e71cd7b0b24da7bc4b6b7dd3594262edab87b142eae5353062fa00717d9 WHIRLPOOL 163662474c29906afb3dff481fd669bc6473340c7ee1d1383ca7e8a9cdf30927bb94ee291293737c0653d261d1138539eba092272bc9ba2b965fafef23ed12e5
+EBUILD world-of-goo-demo-1.41-r1.ebuild 1402 SHA256 3584f7cd366baa13e6276f603f27fa8ec4d541c2ddea82e1fefd179865897a23 SHA512 da8df2898b27c6a7575270da59c28cec6b35f807d61984f53a9879c4c1dca47dfb3b4ff5507f42571610bf61cd2b026f95173b89982b8d3bc82bfc9b46bb4231 WHIRLPOOL a7a158edd56370fc5382c31fbcab3920380e202e3eb30c67b2a944b5e3966b390d32402ffe819aca6c9c8397d08d3df543e2202d03677e95d6c998f678fa3bbc
 MISC ChangeLog 2465 SHA256 c182fcfdedce5be7678c0415685fe4e0009d2b12b1922fc547be556031e10e51 SHA512 3d0e946bfe9e1a66a21455f8cf705c46630428efbca9aabd358406cbd313435ac3eeadce00421240edd5c91f3182d3e1890384198053df77598313f3c9f48983 WHIRLPOOL 7a49a1f994679bb07fabb4d80bcbb174c532461f28d12d8bb9c1be504a466b93eda040d530bfa48b80d24cf23e0b287e20d8cb835f80e2807caec4673ab2613a
 MISC ChangeLog-2015 1462 SHA256 826e11a62f82a3dfeee35b32a27f1852300ed6c267fc9c95b5ed6e3bdf049f2d SHA512 fb24477c2387b43e5e11e5c7abf99613095eef723fac26799403240752b4c2e949c6741f104a37a698a1264ec5215143d7c1aa0f630239d20ba938d90e52ad85 WHIRLPOOL 84c3b9a199c91af82860374614e8e09abbb0c1b6fc7a66d78340e0fb64eb5045bb217ce86abc811a841f7baacd510fa217fadaa1dd476e21cdf26dbc04ef317b
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-puzzle/world-of-goo-demo/world-of-goo-demo-1.41-r1.ebuild b/games-puzzle/world-of-goo-demo/world-of-goo-demo-1.41-r1.ebuild
index cabfdd297efe..1d4185bd9b4e 100644
--- a/games-puzzle/world-of-goo-demo/world-of-goo-demo-1.41-r1.ebuild
+++ b/games-puzzle/world-of-goo-demo/world-of-goo-demo-1.41-r1.ebuild
@@ -17,7 +17,7 @@ fi
 
 LICENSE="2dboy-EULA"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 RESTRICT="fetch strip"
 
diff --git a/games-puzzle/world-of-goo/Manifest b/games-puzzle/world-of-goo/Manifest
index 63743cc74970..b97ed24bc1d1 100644
--- a/games-puzzle/world-of-goo/Manifest
+++ b/games-puzzle/world-of-goo/Manifest
@@ -1,5 +1,5 @@
 DIST WorldOfGooSetup.1.41.tar.gz 66428181 SHA256 675a8a11bed6c9d810cd222bac5e9834f82acc31c2afc6990da40b45ba564566 SHA512 278dfb983cf9cf4de87f13d94f5e75b3830af07523e2ddc7a443d5afb6fead130ed50440357554986b5b0d99c17651f77ae11298f51f9f1072ebd40287cad396 WHIRLPOOL 784192ec8161faad3bfab8f0e94bb77b8b900922b7df90b10c887e9fc111e895b859a9dd111cc170523de0a32c0d0fae9e4418c7b27d68f08425939d6bb2da4f
-EBUILD world-of-goo-1.41-r1.ebuild 1433 SHA256 87e10dd7136a66294d24cc210fde3507747a8df18e9e06b62f07906311b0d5fe SHA512 b6c5ae27ef2c5ab528eaa5720b0c6b4cdf1bf7281ed2bab2787d3c7384a19bc48d3ac85e9f2cc3ce08833cbca7c282d5732d8c2dbe032e0b924ef7097a9734e4 WHIRLPOOL 634b104ec00dd9e1d065098de7d018208c8edec371c64f9ddc6118072e6521fabfec59143c02069441c0a3cb99ad8049b0be8a3aa594f938d985308c2cb05fc9
+EBUILD world-of-goo-1.41-r1.ebuild 1435 SHA256 de61aad8aef5f940aa25a715cbcf686fc8e16056576a33eabfccc00c4d52f102 SHA512 56212dbeac141cc805bae061f6f62e43b7d3770bbe4a9a53c73bb80b8f43b06b193680bc3b5a1e576b7574d5e64852db38a69e1080269e7dea09b003189f4f86 WHIRLPOOL 27e4accd6ff64957ca8c9078ec88e644cdf39b96cadf499551b856ae362419e1d324794fa236bda2c52c331df097bf78bbed087d9b543c0dcf046c67280f489a
 MISC ChangeLog 2450 SHA256 ebf11107a4516675b4e0c3c721e9c735e9f238d1c7b87c7feb17a741c1c41218 SHA512 2dae11a8b7839f7f10cf79b2d681191d071a7587f2cc045365ee4ed2b1cedf99470c823b36bee808ddd73211e692fcb31152a4b509429db58689cfa460aa0bc1 WHIRLPOOL 13fda1a00d7c62cee0b9d0fde288f0c54a2f4f02f93403119daf3bc32be2db526a619f0cc405dabef7d9c1a208dda5f0ef29405cc9a2200d2a3c38cfac55c369
 MISC ChangeLog-2015 1702 SHA256 0c41c19375984cf6014d90235771854519bae9b8d7024a1a8ac62e1721a46179 SHA512 a0e067cc3b4c5a84b21ff0520b6ca6bcc717f574c161829721f090b6579ca17b08de9b3ce12b3c70fbc1892c1d4a646816302dedeb076629fe5b493a53612d99 WHIRLPOOL 040daf0666ab95af289ffdfc568963f795e2dc2d03bba2c00da2b4a5e81127b9f518fd2cbcfa36d3fe493fbeaab5e8ee49ae2e78d72e73024c7552f9377c8aae
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-puzzle/world-of-goo/world-of-goo-1.41-r1.ebuild b/games-puzzle/world-of-goo/world-of-goo-1.41-r1.ebuild
index cb73e6244b4d..b941fe96f8d3 100644
--- a/games-puzzle/world-of-goo/world-of-goo-1.41-r1.ebuild
+++ b/games-puzzle/world-of-goo/world-of-goo-1.41-r1.ebuild
@@ -17,7 +17,7 @@ fi
 
 LICENSE="2dboy-EULA"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 RESTRICT="fetch strip"
 
diff --git a/games-puzzle/xblockout/Manifest b/games-puzzle/xblockout/Manifest
index cddaf2edda78..1075128ca69d 100644
--- a/games-puzzle/xblockout/Manifest
+++ b/games-puzzle/xblockout/Manifest
@@ -1,6 +1,6 @@
 AUX xblockout-1.1.6-font.patch 1531 SHA256 fd1707ce1775804469fec94d71ec97263686324164f50be7aeb3f88e1402e9be SHA512 adfc6ad87048c4c021e8989886011c8dfa8736778ac12fefacbbffc114272f4a5ee60a997f35d817d22bbd9eb348c7e40701bd25bc1cf0d5924add71fc77e450 WHIRLPOOL 8add3633f33d6d38c59a7449984509e5bed151d65d3ce6ebe7199c7ffabadc157ca2f77e6bbad0628621f47b8768cdc7900f399b1fa38d60973acaf5f395c758
 DIST xbl-1.1.6.tar.gz 136504 SHA256 85f456b6aca15f1642bbd233872250918432f0b5252d4b0d681bc2394fda5f84 SHA512 96bf0460863698136a61b43260feed0e90e7ca5b6613d54c8ca98f51557a3d235597eeab46141cd6771aa0bf4fe019c5e4291dd826338e186cc905e3837531e0 WHIRLPOOL 94f3bd29f13d2e0774e491f0624b7b5d912e37c071fb9490d2b5a5320990731193cd78235aa49e860c2e7b976ced5223c5875a82baaaa846492154ebc5fe2a20
-EBUILD xblockout-1.1.6.ebuild 1127 SHA256 67befca1509eb057617397d8f36ef2c69d618f3cd01004524fae9be0216c8afe SHA512 c774a1d3856738ce485fcef51030e929130786160501d6531560247b04d09534d8b6303d3dd8cf0bdc041013a128f1622a35aa270f7b49734ec2b86d56c35901 WHIRLPOOL deb80537bf610ee411cbd127136fa3ec4239ca4a149fc2e53a593e1fe0199167546d28bec6ceab011953a0df09e444cf7eef11eeb390022ad7d76a07f0d3eb3a
+EBUILD xblockout-1.1.6.ebuild 1129 SHA256 bfe3461a6148455a0dbe3a6b9422575d2b12f29a9749b2377ef77a35d86f99cb SHA512 e808fb73d89f1aa8be9e132211bb227db372952c982b63331f65faaf32632fd3a6f792292fb957cd2951b2e4104ea5e8cc1c7eb88fbac743331727ae2ae80ab9 WHIRLPOOL ac3ef43a84bbf67ea45b9c1beda7e77025938fcd8115bcee8319ebf19833cd6d4663a6e4017b3367c1b8d82038f610ed4fc05ad7cbe85e7e7bd9313adf8e8470
 MISC ChangeLog 2472 SHA256 ad5c0bcbe77fcbd148500e62bfa2904c80e59f6167e8339c3c41e70c6087e55d SHA512 b3c466264db87d78432e3c81a87e65ba427b299a6450381f9371f272834b211c24f4cb8e9c1d045a8da9d870f7dac76cb10f7de57d76294bfdd07c27c1ed4f73 WHIRLPOOL 2c482fbf317c1c183435198ba06405e7e3ae59b26b7991424186ea5ac9171b609dde609f1ce8ddc137d0455077a1df991d52b9dcab3d3b62d291a5a0c3ac0165
 MISC ChangeLog-2015 3968 SHA256 7937ed3af3207bff5dadb8ede1d2f4b2f2db2eff19446e6040112afc4db824ea SHA512 43d1a3dd58347b04b1451311d4336ee675251a1ddbcca2d7040ba2e551b92b90f3fb02eaf395465166dac1ac2ad010946f2c108ad24acff9be207e7e5305b5e7 WHIRLPOOL 05156cc50bbb0dd26b9d9824f817817626022380b795b7ffe9470a40bc7b939582dbc140aa6e31c47e8c28e4db85ed98348b789f6b32b74165cc5dc4c3a467fa
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-puzzle/xblockout/xblockout-1.1.6.ebuild b/games-puzzle/xblockout/xblockout-1.1.6.ebuild
index a2d04f528c41..bbb076fd9603 100644
--- a/games-puzzle/xblockout/xblockout-1.1.6.ebuild
+++ b/games-puzzle/xblockout/xblockout-1.1.6.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://perso.univ-lyon1.fr/thierry.excoffier/XBL/xbl-${PV}.tar.gz"
 
 LICENSE="GPL-1"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/games-puzzle/xbomb/Manifest b/games-puzzle/xbomb/Manifest
index 3560e39803d3..49a5076ff7c7 100644
--- a/games-puzzle/xbomb/Manifest
+++ b/games-puzzle/xbomb/Manifest
@@ -1,7 +1,7 @@
 AUX xbomb-2.2b-DESTDIR.patch 871 SHA256 228e6a4dd935a7176a2e03b03dc6275e4563bad8a2569c85b5fc4f9988eae823 SHA512 98135eb5927b4bd92bc1a6ac6fb86bf8c1f7387949c1ac419e3f78cc84184e1c8b2b8b6fb5d23089b6fdd8a7a8dca05733821180d1316d30edc53f487a16e4c8 WHIRLPOOL 24ed49a723778743e2ba6ba396f7e61218aab10191bfd9eda6a9ef084f770f4d7c2cc9efbd26e767657ddf74e55819e57b53112c87475a3f88cf88a701f867ae
 AUX xbomb-2.2b-ldflags.patch 177 SHA256 1425280668b2ac8a779b2334d7edfe0828ffba6c49204235019174e9d0d0c3e2 SHA512 21c7d9c57ec972ae49dd20a94041378a53dcd310685c8c3755571243d51b0b0e1664b30c0ce9013ad289d8589e7e219bafdcbcc31503ccc25052f2c3dbc2df82 WHIRLPOOL d94f7ff90a96609267c6bfd75d21288a4dd232b99a232b06c386ee5912afbcaf5c31808f7dec895feeb0e7a12dfd184a248ff42bbabcac9883363a0456dbf148
 DIST xbomb-2.2b.tgz 24774 SHA256 350d8443c0f6339ef463effbb17c9347f669b8641a159a2447706324b87c2219 SHA512 7315cc08bff1ef14cc376ea3ad4913c4286e2e33e92ca1d924e4703fba2f58e5aa9df0db760cd0d9a83f2f1730cc65281403f5b198f32a30d0c5e736add8c2e1 WHIRLPOOL 0db3088207bb14548d300b3c19aa5310b71f81d05068de8070bd1195524849cdf47ea82f585b2461db0259a543d323d6a15f93be1dcf43c482fb84b90c2c1059
-EBUILD xbomb-2.2b.ebuild 998 SHA256 533e62e030b6398d7cfee72b7c090b6039cfc7f7c6992e8dd31908643f86f05c SHA512 658bca020e53bcaa332b10611354a5a28ba73c60069571b49559030c19536cdba60fb11af206a2a9e2f0b1f9e996c3d47fa1346625ae90917cd7c536c646c610 WHIRLPOOL 95813b82ab0d81997ee87be1a2b0f84218bfb54b6a1b57c75f3ad23ddd7610feb926693d68e8c6a1bc276f864f6e9d0383975ef3c8eba9923db61b5f1b8a8eba
+EBUILD xbomb-2.2b.ebuild 1001 SHA256 9a59c3923597744022b48f2256dfa5a59cf0c38ff32cfdead83da690cef4fdad SHA512 05d114f256b1a641714848d96df47faeaa64396e670a95d376ca32eea4b0c2f59d6246454a23bf301aa010938bde8af758fe3c90a3f6b2ee4a354bd72fe65e6a WHIRLPOOL 89108cb5274878066dcff2ccf281886183f460fee2d4b3aa13078c710d3641c2f1c74bc219b8ac92981f42334fb3dedfafa623e4619d5576d21c9b7dbb68bfa4
 MISC ChangeLog 3964 SHA256 b1b4aa5fb08a44b8e0f2b4e9331081b8b204341e1155cde768afcf2854a38680 SHA512 c04a2187d47c342fd7e5318945c105cdd086a633bb9c037c484196d1ba676c15905acae7c6d580d3c28e556c733f9acee5bfb27e00be5aa2c5f649e3ce298bb7 WHIRLPOOL 0599f59318a20c11672d60d860a13dba3f4ff82063a35e3784930a8b044d9311d443171853d7999fc9d14a4e0de3bbddb6364b1703c0a606878af5d49ea68090
 MISC ChangeLog-2015 2702 SHA256 1004d43d4f5dd50ad47531f0d69fdca7e0f2626f59dcd50489499dad0e5736ed SHA512 7a9caac8aab6c3969e72e7a399edf7f6b8235694e030f4a2e09e09a2540a70b67931fb88ece04b7db98eec8656112ebfb5eb9d3241373c32ee8ad8a7ca50cc8b WHIRLPOOL 2965be4a4084e41e2b2ee1e3b736bf334935f939976a5724fa77b3b0c20f9788a1184057839838f419d65f1c1e78c1bdb0dd2c669c4de680d70cd94a4a18913a
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-puzzle/xbomb/xbomb-2.2b.ebuild b/games-puzzle/xbomb/xbomb-2.2b.ebuild
index 9391ceb6455b..488c4de4bd50 100644
--- a/games-puzzle/xbomb/xbomb-2.2b.ebuild
+++ b/games-puzzle/xbomb/xbomb-2.2b.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.gedanken.org.uk/software/xbomb/download/${P}.tgz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
 DEPEND="x11-libs/libXaw"
diff --git a/games-puzzle/xlogical/Manifest b/games-puzzle/xlogical/Manifest
index 15941215d094..3d7e823f2598 100644
--- a/games-puzzle/xlogical/Manifest
+++ b/games-puzzle/xlogical/Manifest
@@ -2,7 +2,7 @@ AUX xlogical-1.0.7-gcc41.patch 1121 SHA256 d70f35be5bbf65e7511d239d2449e332c71f9
 AUX xlogical-1.0.7-gcc43.patch 915 SHA256 fd8394829ba2a3726b25f0bb5d651e3920e5c945f023fca57d2044227e4e8ec7 SHA512 59cc10ec999aff4c8f5630e534ea834ff9a8b2d27e45752abdc46df812841e40de27ca406a45278f28a3a609c021c7753a6980edfaffd3c79b1bb7cf97336209 WHIRLPOOL 334e58b6503a20a71e0fe4b792b56af84ea0279081286e966f609a74d213536495b56b7264a2ea1fc96e89d991b663a1333feb637e802be6b28eb307516c530f
 DIST xlogical-1.0-7.tar.bz2 1853575 SHA256 166d227770dcb7d94138f844a8a81380eff3fac7f564274bb2c66ae974e8e7ca SHA512 b47aadff91a7d3057fe8657bdda5c16a910f84f6d324bee82f1beba55de7faf6a599231c8d53ed68cc30f9edfe18f57f31dfc9fe06b8e03fa6120905f37c290d WHIRLPOOL 97c4b236156257a368b7687731da147f17643ca99c729e520e18fde3837c943e990009c7fe951cb1f7739bcfe6587162b0edd7a8773f1c1af7da0cc699788c96
 DIST xlogical_gfx.zip 347801 SHA256 1d6f97ad3cbcb7b78d3e3594643195d6457ab7ca613ccabd6256a5fe13a98f49 SHA512 14322ae1c8fb7f50513ef47e05372c5dc1ec1b658b33c53477e6b05bbee1de0250b21127891f205d16adc386e7ce37c4b834a62794ee105754b97e49eb5d2a42 WHIRLPOOL 5b33c7603b709c97975d28b264417e1645eeebfb9112d4ec6a84c689fd4bff0ade77188896615b77ec8ab764f61ca1e01ef6075acb25d82a114af32638ad1a6c
-EBUILD xlogical-1.0.7.ebuild 1456 SHA256 b3f110b34ea58a1642aab61933b1a74d955ebbfdd2657ed2e28757009b7ebf77 SHA512 0a9b9481d89a3b07c91e7a80a5be0f6d6fc6bab46ae3a9e352dbfd3dc071efe3155a1afdcdd9e2115d7884f35d6fe3e455984237ba6bbd9ef23d98bf4bd9531a WHIRLPOOL 63b51b2c3bbd5ba30983a296e7ae5abfd2edf4bbb79a179a01f94ddfe41048cd240d55b3382888342b80f648a8bb618f0a14030f27cc07cf376775f60377a913
+EBUILD xlogical-1.0.7.ebuild 1458 SHA256 0dbf32fdbe6b12784b9da48437180f48513b3461ffeb71fbfc8009f52bfa8165 SHA512 9ab4b8547c0afc8264c875906b8d6db776691534fe3ba49770ee5d86083885f1fc55737a25eb6f4e86b58cca8e6f910edc7b0b01c062f21e104ee91d28034d11 WHIRLPOOL db0d8fb69eb7ee8a376522296130ec758f0d9109bdeab50504a504fdb2dcd50e5b0ecc42044709a3d03d4c1df185296392b9022397ce6d50b35e73a4636168bb
 MISC ChangeLog 2506 SHA256 a36ee3654168108bc387135ad5d27e0bc1450dfbc7bd1e39f480ca072683b30e SHA512 8273ec16fb68ecfed1708630cb569c8b6b51b36bdb315459095d27f79a2744caedfcde772931de452ef54d6f4143fea56d7419c73644728fab2b1c1457d8b1ae WHIRLPOOL 0663b7f5cfe18b2927e477bcaa9718df6073196937be5b89f903681088e5426a10b8c043fd1f68b6d9d7667c6c7f4cffb3698645eb69d3aaa1fa04206fc053fa
 MISC ChangeLog-2015 1211 SHA256 974fb49de8186eee2619cc42a8a0f897e0ad85e745b305ed34e04cd21d36151a SHA512 a494f13f92602d71f5a71d3379aff5113439521b93828f342b4d8b783650ce91298864eca868f2981cdb0ef0835bf9468efb63545714b9502a32080e0e1892fb WHIRLPOOL 734d55753686394b67ed85cdbb897fd0b515f16197751209723f0c15de62dfaed0187d6fa77ae107a9cb220cbe3b1c6c49db0d725c2b41cf307e1ea9a639bb36
 MISC metadata.xml 554 SHA256 a0164879d498bd0bea60303800f83319f068f3dda286fc48f7c2e96ba3bafac5 SHA512 538cff1d408baf95b2d172490a3a038a8fd79edef5b8c1b64e3c495307b632870548dc0f33b6ed6bc77599d20e883a73a2c2d658b6ca85e131e404bc72e018ee WHIRLPOOL dd60778808e9e8c08932e5bf0efd38abfeb77e0739e013387e6583559f7a37cbbfc4dc4bbc38ead2cd134845efca6982b909d533c4c99a7a908fb55128430339
diff --git a/games-puzzle/xlogical/xlogical-1.0.7.ebuild b/games-puzzle/xlogical/xlogical-1.0.7.ebuild
index b458c13e81eb..ea6857857a7d 100644
--- a/games-puzzle/xlogical/xlogical-1.0.7.ebuild
+++ b/games-puzzle/xlogical/xlogical-1.0.7.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://changeling.ixionstudios.com/xlogical/downloads/${MY_P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="alt_gfx"
 
 RDEPEND="media-libs/libsdl[sound,video]
diff --git a/games-puzzle/xpired/Manifest b/games-puzzle/xpired/Manifest
index 5b2426645c5d..32e9a8aad599 100644
--- a/games-puzzle/xpired/Manifest
+++ b/games-puzzle/xpired/Manifest
@@ -1,6 +1,6 @@
 AUX xpired-1.22-ldflags.patch 868 SHA256 3c528e9d093c547bf68e77e6d9b9e881deaf4dd6a9c87318ee13c59f60ffc3b7 SHA512 81987d60466c459a98ac03b8f4bdf8da7c6004a716a83051b58ec35657ab3a93672305ff9a8edcf9e056784919c9ea235f81c71176bf6d4b75d5dabc72b1b7f9 WHIRLPOOL 18cfafd2ef2c82601fe02e5aa5fcd1482edf9b64f874982fd71e3b0ec46a65fa49d9841b64f38571c6089bdc83b98df200ed74c8218a3c4ffc74ef6420fc59eb
 DIST xpired-1.22-linux_source.tar.gz 478593 SHA256 7a2c0dd8bab0dc2b937684bbb3d213754921bf2d6bd891d9be00bf2db7bbb505 SHA512 08e506e6206be9346bde083a9cdd25a890c0100826a7fb2b515b60180cfd0b885712261db2e7a5d589078c0b74f2b9ad659b39d9378cb3dc92af111ab499ee10 WHIRLPOOL 166f0149290c7bcd3ae24d26152f502b157a84439c79fbcd4a34e425b857dc8965584e60c455de2b387427e3f89c841f5a52c7f1ae20ee02bc9d5c0e17d77e2a
-EBUILD xpired-1.22.ebuild 903 SHA256 6b32417350307665c3cbdec4969ffb83bf1e0d9f67f492a7b84b7af216fbd014 SHA512 7aef2e27472755ddfa6db55df90463491ae534083c2e7b33041b420b00da6da8971b6255ec7a94963da9dd7cdec5313b050d3529e5e02e726106df034951c476 WHIRLPOOL c4c3eb6bb71a29abcefc8737b97c5e1fb5c4e812f24fef98b8eadbb1217648977d140ea39b1d22fc9137219a50f01e7e5fb2c8ec24574b27d741e97d56585ab8
+EBUILD xpired-1.22.ebuild 905 SHA256 55703e024412ce2bb8530f9e8ab5b0ce69e4759d53e1dbbfc94221e21588eba1 SHA512 cf66cd05421aaaf834c84027b1a71688a3e306e6db828a707bec280bd26b19ffe45f70c759ba5336b7db4a9c2b63180136365966c128b5802c9832f908a00d34 WHIRLPOOL 36a3767238d27431c5af8f890358f6a94952c2fe984ded5d9221f7e8c508041817b33c31603daf78989d0caa05cb7aea2078da6bbf74bf8f15a389bbfd9631c8
 MISC ChangeLog 2601 SHA256 bdae208eefd5c99d9153bdc9dd43a300a2b7091108ec016ecd0f431864b69ea0 SHA512 4e23ad772b12098081fb40cfb993263d87d7e552091986b795c982961c2a6962fef8f4f872ddd8de4893f3a6a50f14032fe1526ef7ac897d77dade40e7e9dca7 WHIRLPOOL 0d8433a442beb2733360935befb50ad89bdf8ec7f0c8d7d6f597d8bde29366b3baa115d7118447ceb1f34540bd3c573f07ca33ae523548dac842eaa00cc5d885
 MISC ChangeLog-2015 1183 SHA256 a500a4815c36ece446aaf434f0699eb6dab4820a02198d73646cc6950cf9aab3 SHA512 c9487c851413b30dcd33731774fcfa80badcee1f63964eef75d7c4be01606da47896f6f5bb9d5845625861468117b55a406c09f87f24a61db3a440042c0ab672 WHIRLPOOL dbc9fe869b821fe22eecd8d9aca268e0ff9d4965748ffda414f746559a81b45a386c56cc236593df28ba49bb5a0dc694cd07e18c52a7135367b8d8cf9c15e5ed
 MISC metadata.xml 329 SHA256 86295dabf74c46cea61d7093559673174b610573f965541f23c7ff8d2e007a08 SHA512 457c612953cc30db620e0315c75ecb20619ee537692e0a871d0c60e8cedaa547bc9e50eb922bf995eb68bde526c641e901d3bfc9d88a097263f5bd90c68f257e WHIRLPOOL 343ea7d76a599f99ad0c932dfbdb8a13b89899dd014f840fc1c717b2aebfc0576e838c300def03a60425ce1345119780e2c05fd783fed083f0162a1978907f93
diff --git a/games-puzzle/xpired/xpired-1.22.ebuild b/games-puzzle/xpired/xpired-1.22.ebuild
index 2c1622689198..8c27e559e753 100644
--- a/games-puzzle/xpired/xpired-1.22.ebuild
+++ b/games-puzzle/xpired/xpired-1.22.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/xpired/${P}-linux_source.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="media-libs/sdl-gfx
diff --git a/games-puzzle/xtris/Manifest b/games-puzzle/xtris/Manifest
index fdde33c3b54f..bea4fd07da61 100644
--- a/games-puzzle/xtris/Manifest
+++ b/games-puzzle/xtris/Manifest
@@ -1,6 +1,6 @@
 AUX xtris.xpm 1403 SHA256 60dc5ec114d394f6c9e7b69e93fad11213100148aa02ee51f7ba91f8f7500749 SHA512 1956a02d844b517df41a5cc82e236a04ec9609849c4d7b097af5bbb4b03c1e16bc8d6f0491c6cb1c8920bec578beab07381b15cee468079c5e474c80c07d30a3 WHIRLPOOL 6fa31269796c17ee7c61bf589b7733f19592adba71a5cb2cd321003ce3d75c54b38670c9584334acff35c1eee6add6295617179583cfd964870e601cf5ee9bed
 DIST xtris-1.15.tar.gz 52130 SHA256 5791b30795382a18536201c95c686f62ade6975fc4e63c651bff36226c933d68 SHA512 a5d5c32a7e1650561464f0fda08c7040ca0061e59b374359894e7f181a2e9dfece7f6bee6ed82295779f3e4ac8e7a607c668c31eeb017d6b641c1fe09dea4791 WHIRLPOOL 2a183a7eadc062fe658ca45b414067b117476386c47d3b9b4791fc32e0c35ada8ea2aa9dfb3928155c08ab29e1eaea86193c457d65b8248a7849fce45cda15fa
-EBUILD xtris-1.15.ebuild 781 SHA256 ddb665e45de00081388a4b377895bf35768e3f70e2cd5fcea9e56552c4ce1dd1 SHA512 f34f8de227a2ec80fcc6ba619c51c3b8fef62099f5939a6042479c3a80e65183346116a94d476c6e17dd5c24fb3c005e3c5ceda572f9ac384729f0bfc636b5a6 WHIRLPOOL 52a73859179aa966d2be469fe60ca065788695a5a88025ad3b433ce308dace6f41476e27c55f5953bb0dbed0e61cb9889488bad8fb738f73e19cd4e77706c79c
+EBUILD xtris-1.15.ebuild 783 SHA256 2b1bdc4cdb5bebab8006c85e26fe8f069c28e94cd405bde21dbd1c3dcd963929 SHA512 0c452297111a2096e38b22f1c07205da81d26e3419c2ab6448f4d1d62bc0fc6cb5cfab2b1a57c87a2c90b7eb987da13fe3640a09951e83f5d820350c25244537 WHIRLPOOL 251a3cd4513499c49530a33796d34af9fc89d3dfac75e9b77e0ee56a434024ce9a34bfd1425426559f5a031a16c2cbb121fafce076244eb98ac1f89716f76cc3
 MISC ChangeLog 2441 SHA256 c684576b74f2e5d05d24f0d43a04154c495e18b1bdd29897c9f530a5cf9cdbfd SHA512 a3584c25bf1eee8196362aaee6ef7ea15d2b07be9362346df30f6692ff8e891ef95d20cf99484349fbee7dbf9cb60e6004dc774ab227caf3b8f691c67f103cbb WHIRLPOOL 1adaba7936c704de62fb9a2a0cb3e60e85e841247337d69a3e654f733a47db90104ca001a5f136d09c59a2a2b6265d89a28d432a01439849cd16a16634156c5b
 MISC ChangeLog-2015 1198 SHA256 e8ed319fc807e6f0a52e00bf155bb370829dbe814070779ec80943da7eb5181e SHA512 e25ec0ddd596d9801d5fc7161b5c608e66b6aad4f5b82116fc54131ebdb5de9ecceb07dde5264b1d2f3a0075aa52e27a99eb0c207f1086ad961b54cd2821c794 WHIRLPOOL 2e5eadb3a3e13c8db9b8bb3bc6dfc668f7079277e24e3dcb2efc7e95aeb4afd8f2ea3d9277359c63322fed7e725abe34dd1caede543cd1fd8522ca9b1d079c5c
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-puzzle/xtris/xtris-1.15.ebuild b/games-puzzle/xtris/xtris-1.15.ebuild
index 6d07bb9f00ff..cec22aef2e45 100644
--- a/games-puzzle/xtris/xtris-1.15.ebuild
+++ b/games-puzzle/xtris/xtris-1.15.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.iagora.com/~espel/xtris/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="x11-libs/libX11"
diff --git a/games-puzzle/xwelltris/Manifest b/games-puzzle/xwelltris/Manifest
index e3064b47e750..accf7539fee3 100644
--- a/games-puzzle/xwelltris/Manifest
+++ b/games-puzzle/xwelltris/Manifest
@@ -1,5 +1,5 @@
 DIST xwelltris-1.0.1.src.tar.gz 422822 SHA256 c7b6321a9a6e735d4e57ec350adc7a6eabf76b8e9fb9d4cf9d91243da2adb38b SHA512 6b1080c6e6d1b579c441d1f42bb6454dafed62a63790d5798e83cf137db7ff2ddc07db7e89b34402a5249770697cc3f8ad5e6222266142c7b43f6936828f2536 WHIRLPOOL 88e968bcafb8742e17d61532d564a9497cdfc5fc1ade1baa6015ef0c0a19f73cb4c281f03f355e34640033f9e45e142f37103316fcc16bbbf85bf02ab7722b2a
-EBUILD xwelltris-1.0.1.ebuild 972 SHA256 2983e494c4502e1fe4c7243cb2a4a10a75921e28bbb97cfb5c90bc6ca1e7c907 SHA512 6cafbc1d5f8d67b07bfe1a06fdf095008e53dd609b903fd9fdf7b7207afc46752bbdb086a30211ce3128615fb7f63578c4c1444d4ca044ff7364f5fab355e071 WHIRLPOOL c950edbec04b567ef50627bd1bec5a0f3d1a83cd9fd8f62d477e0dee5cec42a8ab3055813da7be46b7590f9aa0e7fabb37cf64aabd1bae2af00cbf0b8ac3adbd
+EBUILD xwelltris-1.0.1.ebuild 974 SHA256 d409b5364c444e1127f79544e006032c088407966cd684d0a0b819c397958ed6 SHA512 cfc4027ef6409246fcf2d477e6a0653f470c24cb74f2409cf3c43470eabc91f1db4e5f1a711538814a04a2587eabd92f3ad8590c922b622987596640dc975e52 WHIRLPOOL 85f0de7d46921571757878e04dcec9de55b806664a947cd2a65a05a20a745e5dc152ccd442f36cdc3d50f421d3e0b99032605a7aa17b6c6d998cbe893fc13444
 MISC ChangeLog 2566 SHA256 9a99992cc564fe8d20bdc8a7c726d3e595b22e87d93fc716852518f86478133a SHA512 0651554bcf038045b0fef7ffa664393cc25f237c87424be55fa61a570f0320dc6e24af6c8d874dd22ca6e7180b2f79f1926f8bf99f860710782ef989e943bf34 WHIRLPOOL 768bfb8a51c9448d67210dc01295fccfd3565be8837afa5af133bed8e4a5996a6d61f0ea730ad4497d518a95154e27bbfcedf725c60f71d4a8905e8c50c84706
 MISC ChangeLog-2015 1662 SHA256 57ab26345078db79c7e65805b852502b2839073ec51691b7a9150c2dd46c902f SHA512 32bd966ceaaeef1c7eac6546921bc5ce7bd14bb89eaecc68517235a71c14533e4c3be1fafc05bf16c3e03b93dbcd45632c786003e28a6bf9e3b7f363828cb5f1 WHIRLPOOL 74f262f8c89d61c01793ef2a4d36611c8da590c49b712ca07db5962aa7cf032c57c958a76174437214f02c1d9a3e401151fa440ab7e37a906f9c1f426979323a
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-puzzle/xwelltris/xwelltris-1.0.1.ebuild b/games-puzzle/xwelltris/xwelltris-1.0.1.ebuild
index 356cf57dc20d..eb2e02cbf21d 100644
--- a/games-puzzle/xwelltris/xwelltris-1.0.1.ebuild
+++ b/games-puzzle/xwelltris/xwelltris-1.0.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://xnc.jinr.ru/xwelltris/src/${P}.src.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="media-libs/libsdl[video]
diff --git a/games-puzzle/xye/Manifest b/games-puzzle/xye/Manifest
index c2895b62cd08..43aeb6e2a92d 100644
--- a/games-puzzle/xye/Manifest
+++ b/games-puzzle/xye/Manifest
@@ -2,7 +2,7 @@ AUX xye-0.12.2-fix-buildsystem.patch 1020 SHA256 652f7abe2a0bedc46507758a3c3855f
 AUX xye-0.12.2-fix-c++14.patch 502 SHA256 789cc5ccaa00f37c30680af5e4e3a604f2a47d27b2522eed8ad4b80af39bfa43 SHA512 c9dcc309b5e451f1608174de4f6016d006879d2267627eebe8ff524af293137af90f4761c8eacbc5ebd9ee633cc7d087e23eb3e7c4970f5484e065dfa8dff3af WHIRLPOOL 3727592b8148c52f3d9def2cf3cfe1bca728f3e46515c02cad5c872ee24cfbc2779e3ac86490e005a8f794dbecfa6912aac8e7312f91143cf1bc951616bbb365
 AUX xye-0.12.2-fix-desktop-file.patch 414 SHA256 e162becad7f3069f564b687b200eb4c2af59a02a232bf7577098b8012dd4eeda SHA512 c798ed5da4e45b0a8d5aaa4dd77fe09d9cb08837a33b44a5c69f89e4d2456fb5964c4fc5646a83fd6166d315200924944ab6dd7eea3f983e4be403a8f14f8c9e WHIRLPOOL b0bb683976a00445eec9da104431beac60559c45e778f1300c6879e9eee691e4d0866fa5f508c76e0ce53d1fdf1974b9453ebda8d5f782aae4b7afa623f0e940
 DIST xye-0.12.2.tar.gz 2860290 SHA256 5d7c04f37d6b4a1821594512c7ddbc8189f968e08ecfd5af55231302f2f917d8 SHA512 a31d922e0a0660d269d30430fbaf1d00924b0271db697f3cbc89b78815e597e11743bd9018fbf3f2f9e7561ad3469e9cca28687efaae7fc6dcba40ada2b5effa WHIRLPOOL 0f4d9105435adab0055cdd8966aa542fd0a231203562bd96ff8b2dff275675233ec1ca541f93e23787d8bf610cb29430f0b97e9f447ba63a695127e670788fc4
-EBUILD xye-0.12.2.ebuild 930 SHA256 4dd3b2f323a5bb9c27938bd56e6d3fef61b5fc8794073d914eb50477a12ea5b2 SHA512 4a2bd11babc7dd881deb73cf57281cc4f295045a04db215ecdec6e161488e6b04a6870c33408b7956e309fef6d0e021ad27a423c185d5bf6daf29504835e03bb WHIRLPOOL e634019c03e114c6d97dfb6c52b23879e6c4d31363c1b652e36cec5d3bbb2dabf41e5ba3006943d75baa3998090ca9fe4c80855a99598ca80d2dfc39833675d7
+EBUILD xye-0.12.2.ebuild 932 SHA256 f4b936629e3accda5f38831f904f870383b2a9c3953ed767d84ca5b7e03e2fab SHA512 9b0c88bc789e73608ff3fb297c04a83cb1eca221130a3ca53148f170b187ac7f87b86181233535e8955ef0f944b5db5e7660f424d501ff608328fe83ba3322d7 WHIRLPOOL 970c0f0f2c82cd51b5e089ac9ff4da9b4ebf548f822ed8e156da5f392ab8b6e3c81253ddc12713e5dc3f05f9e5e2f21e48079d5185cf92679aecb295f0064b2c
 MISC ChangeLog 2452 SHA256 6129fafde2a5a784a71f43c9248348e5e0f752a25f4994cec91e31e958b6f1dc SHA512 820077e28129d6d33512820f5008cdabd51eb05f65ae120b70a55cf31e64a54ed87cc7665f0a6cb0c6c92b9c09c157d46de1abbb2c105ce03575aedc7959243e WHIRLPOOL 55860f300f7c4aec059c1e0d75389186a28fa28f17123a58fb6cb9bfa38296b2611a7bd8c0a67b92ce7c3dbfd46e785229c4a474aa5ecb6b465a646ec512294e
 MISC ChangeLog-2015 4570 SHA256 01644f568ac3088a9fc233580181c836ad2421f957d7c4c183516b99902705a8 SHA512 0027114a3fb8e9b84a09c3a262ae2114a06b944a4fb9431e0b62d56c2bfee7a54e76dfad53cbcf556d4fb36357d031affa9328384ba2252a161760fe53113bcc WHIRLPOOL 08f80c6c933d0e5ab624d9d00b2ae6c82845acc67d4bb9c174e4981756c7095ae5cae1784ef375664826e69559677c0554c6a3da22673ed6783261d5b5024985
 MISC metadata.xml 326 SHA256 53ad2c31ad316390c07baeb517007dcfa8597da35603dcdfd2785469c988f9e9 SHA512 05084d9dcce50a1d4302a83cb89abd67519143384ff6c1ca3f84e10db468483cf90e4d10c240dc58f47b10df747725c86514db303efaeca048d44a3085bb7fe6 WHIRLPOOL fcd494aa6b0a57bd7ba0b8a7600523c782219fced3817d0a69d5a6d0dcf607647329c69bb507e96c78841fc55aad4865963fdfe76f1de3d5682bec9fd72ba17c
diff --git a/games-puzzle/xye/xye-0.12.2.ebuild b/games-puzzle/xye/xye-0.12.2.ebuild
index 826aa6152c33..ed474f123243 100644
--- a/games-puzzle/xye/xye-0.12.2.ebuild
+++ b/games-puzzle/xye/xye-0.12.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/xye/${P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/games-puzzle/zaz/Manifest b/games-puzzle/zaz/Manifest
index 0b8159d01be7..0b0504a621a0 100644
--- a/games-puzzle/zaz/Manifest
+++ b/games-puzzle/zaz/Manifest
@@ -1,6 +1,6 @@
 AUX zaz-1.0.0-build.patch 402 SHA256 c7ea6c23d84938c82444705c1e9b99b9d3bbd66b8f1be02f91f2b8d1d74279ad SHA512 4c7b8659407295b1a2003ecfe74f57dad73964666920a1f25fab87518fc6fb4f74285f051bf5df81c205faea5054908fb6da8e427d79ed4cd91f82212be2daa6 WHIRLPOOL b59b7ac671303acc55ef46396640ff447d6e81094e25bb99f9e6296766909eff6ab8a0289817ae220fe563cd0b387dfcfcd80a0407a896b837c39bb28fa6d92a
 DIST zaz-1.0.0.tar.bz2 25170073 SHA256 e332cc1a6559e18a2b632940c53d20e2f2d2b583ba9dc1fd02a586437f9f0397 SHA512 8383732aefb1f83623af35c85fc90e0468ca15e2ffb5577d22a5a1b1c60154d3829c58c04bba675c49a7e4b4d14b6fec920c67c6a820a927d2ab5f80b5d694cb WHIRLPOOL 09e596a903a35378068005123388c6fcd981133ce27823d424574f1a35a8d243e79f05edf76ebf42d8bf7e93155c43af71c5f81554c92b6cf75fceb04ee31bea
-EBUILD zaz-1.0.0.ebuild 1184 SHA256 c118f2376dc7560459e9edae3e92f4b087891381fba5f28c7707ddd783eb1780 SHA512 f448499510c16a228a9c6a7f9326df0e30cc2b5ef4c25da85fc71a5a54ec74563a7c9fdff8d5c922f91ccef03812b7a6439bf04b44759ea1d8f3611adad1ed23 WHIRLPOOL 03a9f8183d9894b1b76df977066afe0813340265b828fbca94341dd1b9fc45c2838cf394fc24e45401bba3e383c115defbd9b5de47232136c6bb2246e4d5a7e4
+EBUILD zaz-1.0.0.ebuild 1186 SHA256 b34eec753c59f920056369b1f4debdf43ae8578abeb9c9986f36c81a74b668e0 SHA512 2ed3e2667b7783a41db0582665aa78ad237bcc8a2e04badddac13c8591608f839c045aeee44299291bdab4685c4cb98dd401a98e59465453859010154d57c1e0 WHIRLPOOL 8396afe7534e7cec4b883cdb3ddbf6f35aa03d72e14a9d13d38485fbd2a40c9505999071802466807e21179fd4dfff9f9838ec4eb928b8d34959808ac3d508ef
 MISC ChangeLog 2557 SHA256 c377472a9a03f7793a4be5645c2e13c9d8a33ad78057159876d4e8455bfd4740 SHA512 7e6a9ebfeed649d973c2d75353e85439faec89d4fc3d2b7bb99351204799be8cb8ed019701b724a1ebec174fc95ff4e99ea4e899dd9bd8ad0149d6ec9801efa3 WHIRLPOOL 70b36042d00de10304f20edde81a71f26f407b35ceacb2ef93a9584182e4af0c4e02fb65acbbbe891cd3f5ea193874463f8a40ed9cccb13bf3cec94f20c7ae09
 MISC ChangeLog-2015 2606 SHA256 013b787b620817815e8b9a0b030a4272e837eb55b91b18fb9db3c22f25042a1a SHA512 291d16a9b9e71729f92aa43a2dca9f757e3c83dedcce0ae20e4c3c090b5c5e8fefaa478a81b0539c120e95ddd71c8c30c20b9c747eb65fe9898ea2bc7ad2f1fe WHIRLPOOL c2c8ea1921e811d9dd0c934158bfe1915376817aebffc1fd4b6b13689ef31d30da7710efae5be6d2c27281b2d6e152b14ce8d27db948f434d33653f4a50defb3
 MISC metadata.xml 326 SHA256 f9fc7ae8b18d27dec7fb93743a5c848875036ace1037517b329dc3ed6b8a1e9c SHA512 c96c9c7a3ff21d49bcaf2418c5c21e2f83070d2d148d8a8faaeb790ca3dbc522ecab9d28a1df884e5e47543fb8067ce538e6ba62c04da8f43e6f6241cb0134ba WHIRLPOOL 2adacbc16e8fdd1732b4dbc06b86a665e4e7ba6b0ea63d54c17f7cddf6deeb7efc8f5347a6c3d0c5edc47c6a035aa63dd58dd2c253f2e749ab3e8fe841e05837
diff --git a/games-puzzle/zaz/zaz-1.0.0.ebuild b/games-puzzle/zaz/zaz-1.0.0.ebuild
index b5d985d25b3f..002808730c0e 100644
--- a/games-puzzle/zaz/zaz-1.0.0.ebuild
+++ b/games-puzzle/zaz/zaz-1.0.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/zaz/${P}.tar.bz2"
 
 LICENSE="GPL-3 GPL-3+ CC-BY-SA-3.0 OFL"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="nls"
 
 RDEPEND="virtual/opengl
author	V3n3RiX <venerix@redcorelinux.org>	2017-11-19 10:19:50 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2017-11-19 10:19:50 +0000
commit	20d8e9cfb95a9f054d654ab6405e848807186aa0 (patch)
tree	8a308cb480d00fd37d0189950e04f7d59004954f /games-puzzle
parent	a5956e0a0daddcad648e0d8d8e5cb3e49e09bda7 (diff)