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-fps
parent: a5956e0a0daddcad648e0d8d8e5cb3e49e09bda7 (diff)
234 files changed, 236 insertions, 236 deletions
diff --git a/games-fps/aaquake2/Manifest b/games-fps/aaquake2/Manifest
index eda9bc360d7d..7df3a3c83934 100644
--- a/games-fps/aaquake2/Manifest
+++ b/games-fps/aaquake2/Manifest
@@ -4,7 +4,7 @@ AUX aaquake2-0.1-glibc.patch 338 SHA256 68f6ac5ec933fa6a0bf88c6460627d65a5420436
 AUX aaquake2-0.1-ldflags.patch 3564 SHA256 26534690b339a0d064c80089f83e35af19767ce0ab66b81678c4f59827027871 SHA512 4ef54ac768e76e4abc917f9c6ddbde426bbd8c71510ce398bbebaf1a5969ee59ca642dedea32b3150a58c2550b14b0a8953123017bf101ec3fac09f90e92ad72 WHIRLPOOL de135c52107455be7cf1c9a441aca8e3bca2889e11fbc6453e8177cb5df683d99ee7933ad17acd5780ecd2d342b64dc6ee1b00a1bacbe2b43336eb6905fee642
 DIST q2source-3.21.zip 1477764 SHA256 c9200316de189638d0d997a0092f36b85f2c3f9e4ebe30f4b1c356745ad676ca SHA512 eb3fcf3327272b7472a044336be4d73111f5b9f50b4916609996ecb690555654990c1f86e63cd6e7d4a30844e66d3eca2e428e29a598bce52e953c326caf9752 WHIRLPOOL 7b372c99d97e4bf807b07d93726cba748116e21c9e5f3348e0571632742a2574cc395e762e7e30a529fe5d45a82e3f047605cc4d788fb1e67d0ee9a615d8af34
 DIST quake2-ref_softaa-0.1.tar.gz 12931 SHA256 e848919804e65c99dc900b640e5d5c6f018d2181908a48bb1b0330efa90d3a6a SHA512 d5f7e46485084217f5cb8fdcfa360106eafbfac9dad03e4853367e9cf6857a9789ec4d37d3bca656730282649b3e33b0ab04d4c0a73de36f794d98f3c048401c WHIRLPOOL 568c28704c9577d9b789b6fff32baf05ceaab692c65ebd84a2200222d98178e53909375a859dac35d60e37664e9450252c8d9d8d286252836b49663b12ab8f74
-EBUILD aaquake2-0.1.ebuild 1463 SHA256 2ba115f7e33e4c7870a7bd10b008e173c393b043881198d96e777ac92f9c2991 SHA512 f06bb2580e7029c435f43c7e25f86234871be6a750f6cb47ef1b7aa2eccff0a66b0f68d02efbf1b2c4adf02dcb111c833dca39f44db16e7217e29989d1fec94f WHIRLPOOL df539f5626c79a5079e9df83c854f3e8cf0cac221b1030868439bf898f7b6a27831464c46cd0d8de636bcf3bea9ba537f3e401bcf8cdf651bcb13edcb80d6c68
+EBUILD aaquake2-0.1.ebuild 1464 SHA256 1ce912972cdebb7afffdcc5fcd4861345bb17b536907727bfd17c1c1e3080094 SHA512 0367992b1d5d4513b837bf0567154c917871fb6eaf0950357caa0877ca721adc5e317038494bdb08b91433799bd027a168b6577e0f8d9fc41c50a659e31dcfbe WHIRLPOOL b751684a78d44c86399fcb661810db141085ccb57a4cfa8a8adc3886168b6cb99468366427022e6709eac44e77eccee317db134898c16d794949299fde24746b
 MISC ChangeLog 2557 SHA256 c48e8f3f28ac17db8d705a137bfe93a6e48749f12f3c95c3f51848a03bc8c3eb SHA512 567b5e4fa9951159ab0d3395fb67848b15d6e8114d350e94ff81f9c2339829237c3cbb30db266043533a64c71c9f5abfaa76c32c413b810c311770e3f2796d20 WHIRLPOOL 2a64d20b320066a773640f362f955a73a9712202d369c891f2b4f5706cf719f04e6140805a32f92d0a43682b3e668c91ce8720ec70d91aa5733ede26d79a2334
 MISC ChangeLog-2015 1503 SHA256 ac4bfdd59ee9f5414be669656d766621a1e2e9e63d9140e56d0d2bf05ef10962 SHA512 2bf681c4835a7cd031ac8d51e3ae1b2337bb7b6e1554a77c6ece821b5527e76ecb4581bf6e5abdc9f72aa386c1f0472ea39e5e6dd57e5b937defe84b45729be3 WHIRLPOOL 92e56b14d7b95f03f3d8e01d0cb86c4fae1686e01e6cf7567eb7347d7dc995f1983eb6a8eb59ead6be1c03ca2cb62a0312563ae53e596ce7494353a91494e329
 MISC metadata.xml 627 SHA256 994fe8da648aa2676bead29f8842f4cd4d68dc8cb8e9b3dbbbbd71ede4be0f4a SHA512 f212c3b4649df80d15c769067fe816d491201fc3d9193f5a54bad860aa19aab23cd5d6f82be7985ffe9493079de3c56348052657ac55bbbe8e298392887fabc1 WHIRLPOOL c261ecc0fb612faeb11e91cd2d42deddafd062c93fc07bd25b53fa600d92938c7f4443bce82edc7ca8706f23a60a04247c2f535d8d061bf35a4e97836e9bf020
diff --git a/games-fps/aaquake2/aaquake2-0.1.ebuild b/games-fps/aaquake2/aaquake2-0.1.ebuild
index 302eb4ad067f..a7aa57c721bd 100644
--- a/games-fps/aaquake2/aaquake2-0.1.ebuild
+++ b/games-fps/aaquake2/aaquake2-0.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://idsoftware/source/q2source-3.21.zip
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="~x86"
 IUSE=""
 
 RDEPEND="media-libs/aalib"
diff --git a/games-fps/aaut/Manifest b/games-fps/aaut/Manifest
index e3ff9d761037..62e106980c50 100644
--- a/games-fps/aaut/Manifest
+++ b/games-fps/aaut/Manifest
@@ -1,5 +1,5 @@
 AUX aaut 130 SHA256 a9b10b01c808a2cd17d87a2202f4ac2a9ba4efc56aca6c6fb158c4acbd27d5d4 SHA512 95ca9e718dafed4190b733cec3f2409cfeea251965084a79a8c22ffb4aca4e017867e062679403e9f21c0c975b02005808c25e829d07bc228b68c7ccedf9f7ae WHIRLPOOL 8fb006e1fefd0efc9a9bec0b300421ae24503c579c69e1ab9589f89c28f4bb2254b30503bfbe94efea7451bc78fe4db5146703783ecb47a09173a6660b415652
-EBUILD aaut-1.ebuild 435 SHA256 a477c495f0ec9d2609965fc7fd5d7c2c4915fd55efb6d0265d37e4bd8b9653fc SHA512 6b423580f585102d49f1e82e46f065b0aaff648a418c7dad8e0ac367ba243c53dfe4f09c2b8f16b3503ee79ad0a807bfdd46d997161d59e783cca5ca2d96bfca WHIRLPOOL d95b35e3ab0fe82b84f40d6775abce0b88debc24371d2afbe8a5cd72162a0cf2fcdc9f20dabcdb5ca8d223e460bca23b84ff292c9d47ebbe77665748fad54086
+EBUILD aaut-1.ebuild 436 SHA256 5f48aa69015c16abfec65dba2d5fe982133cfa51d020fa62ceaab4352201a4f3 SHA512 9c25a5044e965eb24a98138eed18685f8f66263f097cd55cf9834cb386581d54ee43883c7889b9e9a4323ee7a553fc12471fda179d881932606abb198184c77c WHIRLPOOL 18c7bb33dcd7ec29a65a719cb1e7c6839e040efa2744deba8b82511b167ecd30d74834e46b5f11cd1d9169bbe3496fc5445f024b14c04b2e5065c787b4a9e87d
 MISC ChangeLog 2539 SHA256 36e2b632b0e84718424ee2da8633dcc4dfd4f54cadb2c849d8a6c43f9aac5166 SHA512 d684fc76f19f5095f4e416ffa28944596d4f81de236ba1f32d1d4390a05310929f959f4996611724f87f06bfb68eccb82af33dd5e7dbc3ff3ecc1a80b6286a4f WHIRLPOOL b0bfb3f048517b8009cc0cbbb328a390b5905dbf7ecf8514c6d19f66ffb534e1ea211c769363486c3e260c377b3a22645b2066bb6cb1ee6696ccf812f4006af2
 MISC ChangeLog-2015 428 SHA256 914de4a5b9988140adc6dc1ed34874abe6ffeb25bebd6dce81944564877eed1e SHA512 3ec4fa0ed70da22c0dd7bc5b522f5958b1b024b46642e8705180ca8dccb26ea838cd12131d09ca1f492d46959b12e57f8a701f0ad6ca82d66d9b599451541b4f WHIRLPOOL bf4378de925f53262a7dd2caf9212fd3ec0e5cba896991b6225df753834d2534ca10417430a5d6e3b81b08b540a72f559f67a628e017d1689964a42b26de4331
 MISC metadata.xml 473 SHA256 2a01297e93b836934c531eeaa72366c3235dd72ef642e141edd63235e48e89fb SHA512 5ecddbe93ff1401fdce2a74fa0b7f44a3e0475eeb21b2563578bc3a96559e87911d88f45f2bb9c085ec2c6ff778a5067557416a3e5bb94f398d1fb86061af56c WHIRLPOOL c0cef912a0d74adfa02ea7330d6ce9161f43661dba163a311cd71cae69af7acec5a7645142f4e6b5079169b3131e1a1e18e307680fd82793c21fb7e08873d6e8
diff --git a/games-fps/aaut/aaut-1.ebuild b/games-fps/aaut/aaut-1.ebuild
index e2824ffb32d8..acde5a8582fb 100644
--- a/games-fps/aaut/aaut-1.ebuild
+++ b/games-fps/aaut/aaut-1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="http://icculus.org/~chunky/ut/aaut/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="~x86"
 IUSE=""
 
 RDEPEND="|| (
diff --git a/games-fps/alephone-infinity/Manifest b/games-fps/alephone-infinity/Manifest
index 34b9aaec6cd8..477314f736b6 100644
--- a/games-fps/alephone-infinity/Manifest
+++ b/games-fps/alephone-infinity/Manifest
@@ -1,6 +1,6 @@
 DIST MarathonInfinity.zip 30109883 SHA256 e8294df4dcd81b11d74ceedd6d13580ea13ca62d3952eb535b009387a9a4b90a SHA512 1f347615b96d2c07914cda78bdc6971311f3933af78debfcd9fa87a0a3048220726a082602b7a76f516f7b3dd3240d1ea843794ab34e4e9e7733342d9d9fe5b1 WHIRLPOOL a8fefe0dc8c625fcb2fba9da65148d622513189bbb62ae27545b27f39d610f96045498aeabe1a2b35487524e078041e14a17089dda488280fc038a6191ce0710
 DIST alephone-infinity.png 19193 SHA256 cb2e18364347b5e4e256401f2fd9b35b92ed3763375f2f4ea2c190915a7df5c0 SHA512 ad5c683aae4ee0afa306aaf33c9ad93a2eee59a4283166aada58a48a8dbbe8de62c8af0b04b143366448ef101ba8b2530cbc8bc5b3e1de62c5177775fae6bfd3 WHIRLPOOL b1179b771dc2b43823a648eb44b8197c3d777976820cc6650a7be7e8e415bfdff77b76a5331f9f56e8e49b7efd5df335b98f72e2e0645beb0c317e12706640c5
-EBUILD alephone-infinity-20080622.ebuild 939 SHA256 1fa1a8eb8ab47e0ec28bb6525a2ab332d654796720c35c07cdaee0cff01e4c85 SHA512 bb5c35b17f4d5c2f6d953c0e91bda5ddad0a11929808b1c87fd592cdd44097062d6406743b9e36782c18cb183c55e0b2f22646b72a625e5e4bc0b77a846ae76e WHIRLPOOL 096666c3420fd9bdcddbdedcb2a8defb22ffcead45a1dce7bfa09d9f6140d39095042f15806efa44013766b9269bf13416cf3361b5def8f2a2e2d40abef09ece
+EBUILD alephone-infinity-20080622.ebuild 941 SHA256 a7052fe4de5bb14919896638318fad4f46541acd790ba0b050c3ff4730acb7a7 SHA512 6aab1ea5d96340a521cc2b9278f0d22c3da868c9d0731ae80064f1d6c36ff0064f45321f90de48451168ed32475e3f40847fec86b685255a082e6e4ea43ff0ff WHIRLPOOL ec0cc24eb84393c02c17e8110dfb2cc080679e2554663f935e5d0b0392e5aebae91e37289fa4d7b7afd6d474f10ff720e947d48107071fbebd708780ef5a95a7
 MISC ChangeLog 2464 SHA256 c24bc5529da766baac0a397db3328ef12bb8f9e8736c389da6d7be2f7ef5efb4 SHA512 b4c2f15742e99db6388b7cc5b8f86d80855de0f5e8fd7281f925515625dcd504674a1c54de7a92b7c1638c81c22c044b59715dcf0bf9a343629730d86a769651 WHIRLPOOL 0de8f3acd31e4b48e45d2a10130f7ca126b928411522198fdc5466bafe1355b9c2de6f179dc01a541e264bbc3e045f0a84a0023069299d4942f1b80ba65ff84a
 MISC ChangeLog-2015 1534 SHA256 a68a115dad5e297377f4d6da6c39510180e5156c8abe5df22eb0d565692be483 SHA512 0a09d7a9710335aa1225e1549733030ecbece90f019a6d521eb0c053dc58d95c955906eed687bbdcd2756608f63df98637565b2a0d19d8f458341a68391f6c5d WHIRLPOOL 62d1772b26bc2878cc300df03e6ac42b8fdf1225e90539a2148158d68c898e0bccd8c56668a286373148f24f78f5917cdec56f4ca6ae4ba5036e0322a3750344
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-fps/alephone-infinity/alephone-infinity-20080622.ebuild b/games-fps/alephone-infinity/alephone-infinity-20080622.ebuild
index 2d624e7e9fe8..46cd7a3b526d 100644
--- a/games-fps/alephone-infinity/alephone-infinity-20080622.ebuild
+++ b/games-fps/alephone-infinity/alephone-infinity-20080622.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://files3.bungie.org/trilogy/MarathonInfinity.zip
 
 LICENSE="bungie-marathon"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 RESTRICT="mirror"
 
diff --git a/games-fps/alephone/Manifest b/games-fps/alephone/Manifest
index cf895eb311a6..155d3c14ecd6 100644
--- a/games-fps/alephone/Manifest
+++ b/games-fps/alephone/Manifest
@@ -1,7 +1,7 @@
 AUX alephone.sh 442 SHA256 03d4eaec18bed5fd909604ff7efbcf4ba737a2cc76ca80161bdcb4bdf527d8b9 SHA512 e6bda9a286cfbc2971af2ac4fc3a119e680ca8fe987ab4a1599a23de766b09702fe2a2c7713598918884a998636f58fd15da083c4b5130e1ae85e09720b2d0f1 WHIRLPOOL b793d2144a6d1f12a93d33f500d60d77e92f97aae93fb37e4def83fefaf39b19cfde449aab67c28d8a9311ec91dc4dbc76ba825a7c782db6b7430bcc75213f20
 DIST AlephOne-20150620.tar.bz2 5031898 SHA256 c0f360dfb74a6264f95d375103a74000930cf0439ffb0464f915f5379443e133 SHA512 fb47969137b791f83b111171d7b92b3708597db294ce19fb682ce28c49edcd4cb84a6ce4dcceb6630812a8c676dfe7f39f3fb4642f40ef7086a0d6c6fdeba8df WHIRLPOOL a00150e8c28763d7d01a5d805e449247dc9ff612eb0e9f0aa2d10e7fcf17654342fa31eb5a2eeb3bc756c80cce84dd9664179977900d635e67401036c71a7c10
 EBUILD alephone-20150620-r1.ebuild 2126 SHA256 1d83a338a13df1059ce65854edfd52ce50ab27f543debf9368b63f0af2d6a854 SHA512 0836de5d9303996e619669e23b819ca4698796e1730d0697efc642784b3f70894f94dc9049945391ae0852d6fe0e44ed3a2835ed9f4ea95da02b5a462e6e60ee WHIRLPOOL 36f5b6ce510b4dd69e000d0ad9f646d7eed287d022e31a3b0046b97f38f4374d719c4b80a70d35854a20f35b6c708459895cdd653e2d1089b45817eb27e5d736
-EBUILD alephone-20150620.ebuild 2170 SHA256 884c3067ce970534c01854b2f3ea4e81a8efcf2e3fda410889c66d66a638c7d6 SHA512 f9b78c8c13a1f640a5969099e5a94567b1a69c8b62147a7e3b1102c0fa7623c0d4644558f9c5933030a0dd9f9efa8841f9f40092579f79d82ccbc081f6132175 WHIRLPOOL ebe3df6ffac59156773f952340d9f151c85c8109d643b37d870285800c16b672246df24459a7387bda4797741b48d83779a9dfb33cd087cd2f814141aac4663a
+EBUILD alephone-20150620.ebuild 2172 SHA256 5006015bba3722ede739962799aeb3cfd140b98ca36e7b5ddf9e1c5a541fde8c SHA512 db12cd8fa0f636d1fc3ad9cf088407f4ee68df804bd2d57fe4a2070395d50feccfad6d463bb6b927edf67876445332dd49cd8cb7fc45bb4f98470885e0ad091f WHIRLPOOL 6854c3e0beaa5cf8131c1e1c2d91d26db668c1ac295515b06ee48e147b1260588018c070925fba0a5d57b905355c3ad8765290d5d825bb8611561ed57f78b184
 MISC ChangeLog 3942 SHA256 554ac0e7a269ba051aac5a8b6c205dd1405840e58d9ce92b7bec8c633c1b5eec SHA512 4ba20e445df8f04bd61300c4c57d29f5a8967ae25eb03cc120ce2abe2c25910e299f293ca3d0c3635f0095d3cc9e59250b3003d8712e83cbce4dd8a801d70f79 WHIRLPOOL d3581d3602a5ce73b7f58fc61810f216906971b61a28322a369e7147882b72d8ded49befeace14af5c675aaa6bf78ab26034502c01dc9a21a35fd98b23b5457c
 MISC ChangeLog-2015 6249 SHA256 51a39595099270ea5e09f30336dc1673802d710f08aaa9286add57a3adac4504 SHA512 051d4470be1d6f16d2a0293d81b0d0f5f1d8c97a9063aa3954a248625aac0df60449f1ddcaa017a4af3d3067b18bebf090ed4fb7fd0fc0917495c21a1b77d362 WHIRLPOOL 3e9d2d030c321b2c767b82b7a5e5d718061f696082835e9a99e8e0912e23a3d24139c9cf382536d0c1adfba717a6111e6fd5335434080625cf59da91023103ff
 MISC metadata.xml 398 SHA256 c175daac46eddc675bf22bc5d71f7c01b54e112d2f0dc6b328d186dacb50bd33 SHA512 2c4d493556b9b5407016ff655d093dc22fc1462a6d92c21c6e37bd4ba6566b64cbf848668fa1db1442f8f712dca592c38779641e3c522b23c44056405061fbe9 WHIRLPOOL 972aa8140e09bbbc331906c4fe5195d1489e5a8962b827104ccc6c1c10ae9054d7a34d299058ccc28f5aeca69b02931d6027ee7a1113506c9774ff2725f67f68
diff --git a/games-fps/alephone/alephone-20150620.ebuild b/games-fps/alephone/alephone-20150620.ebuild
index c7b76c3a9b97..9dd8d699b34c 100644
--- a/games-fps/alephone/alephone-20150620.ebuild
+++ b/games-fps/alephone/alephone-20150620.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Aleph-One-Marathon/alephone/releases/download/releas
 
 LICENSE="GPL-3+ BitstreamVera OFL-1.1"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE="alsa curl ffmpeg mad mpeg sndfile speex vorbis"
 
 RDEPEND="media-libs/sdl-net
diff --git a/games-fps/alienarena/Manifest b/games-fps/alienarena/Manifest
index 49a2ff999183..e1fab588c6e7 100644
--- a/games-fps/alienarena/Manifest
+++ b/games-fps/alienarena/Manifest
@@ -1,6 +1,6 @@
 AUX alienarena-20130827-format.patch 396 SHA256 5445b99187d5689ddaf8a03151e368f276da7f3883dae78911c9d2c204e203b7 SHA512 3ce9e89be705d52efcefc5af79c0d61bc2d19b5ed2f4074494560ead4293749e14bb74e9575f328e133c7db4e038630bf607f17edc9243d34a4cfab74bdd1873 WHIRLPOOL 83997e37eaa13f270a476e1fc7a048ec3afc66d933278d0c3bc0687e2f16e48892e3c45e85c847e35422890f9e448f74382bd957cc42cc2413f245db957f482c
 DIST alienarena-7.66-linux20130827.tar.gz 617636649 SHA256 29086098eacb18319e6dcc9156355c44db4b1aa8a4f7b0bb63e6856d8128b012 SHA512 6b86387b12fc82c01cf7945df5da7beb1a60e42a492b70096c64ace254d6300107a4b40762d20969eefbfe11c7365fbb3a5603b71f288e2330410feef48141a3 WHIRLPOOL 986774a9eb97c6ee0b325cc23801a5320c541ea201b51bf90aa8e13a37c03c24251f8d9f2f1efb2c33a8ff3257926265d440200984087264fee666691f1ee55b
-EBUILD alienarena-20130827.ebuild 1577 SHA256 8e3a40a3b00fa8ed6bb78c6ec52384ae1ff08240bc14c45d6a66c5b818e74f98 SHA512 2215be7235e71d5943e51abb69c57dbc59b4536cb72771d3e2fc00daf0d9db679a27bcad2f02f04d817cb1406ce2131221078226c47f7a8737d6a3ac30406862 WHIRLPOOL bccb33dd392f52100064f82ac09929ae3283575d2563b519bad8220023be9d1dba97fae31002a208a9d2f738915c7c37852b7386a0af0220a9fb1f84b45c82d5
+EBUILD alienarena-20130827.ebuild 1579 SHA256 8266b83a0f8a5db8dde701561377f92c1ce7971e92bf02105301b1442f950364 SHA512 67b39eb6ca8119f321084e16b5b231cb74ad70556976674beaab85fa38c18dccb9ce28a8af39dcbbe50573388c3ce1c7dc14a7cd2204279cc95265b10c798e54 WHIRLPOOL e630b926a1a3663864b3b373856e691a8ed643edea4c5338106d2124457269f5cd4ce40608b33aa78b37f235f4cb1c05f9c6775e1e30dc8bd84d25b630f503fe
 MISC ChangeLog 4090 SHA256 1f77af104e4e3b941a2acfe612cf6da3948075c70353e2fcfef70127b7d65c04 SHA512 2df86b920c7425862146c77264d4426aa7d8f603206c1cadf8b24847fb21c53cd6f0416025df92be6774634661030e84c7e8daf2a84c2260bc5203053c0dc05a WHIRLPOOL fb615952bef9ae194baa1f8244ce218b8fa73992a0f660a84a473fc86e76205905a343b2da1c069fc6ffbde25bc768178bf14f7742c1065d6db3968363d9850d
 MISC ChangeLog-2015 6835 SHA256 5a51503acc4a6c6d9335b2bc42dcafb8d2b088d84f0047ac7915c81f5ed42f93 SHA512 6e0b613752c27fa6f088aba42b32f06c2ab73946dba5c9d5920fd2b22bc636bb1aeabf211e9f0d0024d46db787b5bb19499213b1c64c3badb5236bbc88bad06d WHIRLPOOL 71548c624bcef0add47c2fad2c0140c3f3e661549ff99044ac8fdf47d679df240a03b95928194599be4d319a344a6c843e2acef9deabcfd849b42d879aaf9406
 MISC metadata.xml 386 SHA256 2077fbde61c29b307685ee2e3b127866b6a9c20cd71fe058fa3640bb5e615964 SHA512 dc9f5c2111b899663002e5024c9a32f96786d56418c67515a1e8c31f5aaa1aa2d8424c3005d180936a82e74010eb47eebdaac4d1f0abb7a4727908510f939e9a WHIRLPOOL 0e7a23aac7c07d646a77a8e613ecf5493ebf12d022a7d7c2b74a7e7566ae93b57cb14eee458c9c807e05bb5e397952cbe7a152efd327b7402da52b00964b56fb
diff --git a/games-fps/alienarena/alienarena-20130827.ebuild b/games-fps/alienarena/alienarena-20130827.ebuild
index 4406027c14aa..8072a2ce4f47 100644
--- a/games-fps/alienarena/alienarena-20130827.ebuild
+++ b/games-fps/alienarena/alienarena-20130827.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://icculus.org/alienarena/Files/${MY_PN}-linux${PV}.tar.gz
 
 LICENSE="GPL-2 free-noncomm"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="dedicated +dga +vidmode +zlib"
 
 UIRDEPEND="virtual/jpeg:0
diff --git a/games-fps/avp/Manifest b/games-fps/avp/Manifest
index 53183f1776ba..1becddca3d60 100644
--- a/games-fps/avp/Manifest
+++ b/games-fps/avp/Manifest
@@ -1,6 +1,6 @@
 DIST avp-20150214.tar.gz 1718303 SHA256 3cfed951482deae709a7e0743ebba9e3ef27aeec2d68d0588e6361b6368a4a85 SHA512 c485a55ff455498bcf82bc17f2056d35d4c646bdf7809f4c326fc7063a9ce5db9e4893af67dff3f6bedb7d5f96e82f792d7f516044fdbab638113091a5505158 WHIRLPOOL 5fd6ee1d893c0feddab44fd84fb7d3bcd231bd337e28bf2089a2120b367bdc5f22bf9ddad5cb0b911065944266fe7d7efb207e64d34b7ba0090c252e74e8efd3
 EBUILD avp-20150214-r1.ebuild 853 SHA256 ebe35758e0816118cb13f5d3e807efc0318e4be5933701d6790619813a0d1718 SHA512 a4a61535565aca35c1460cd01730331862c2fe0395876961e7844995a2a5953ed8d86ff8b359b38558e824e3c05397dae505f8747f73ffaf1a121347c26812ea WHIRLPOOL e0b432789c261cce1042d61c58e2dd629200a0d53b3cf97be668b3114aea333925ca5b04978edd49d170f5c6ae28f3449edcdc39f8a7e01b61ecaf998be074dc
-EBUILD avp-20150214.ebuild 1014 SHA256 f782481f6722fe2ed9ada2f8acd8a42adc7a2f191c6f9042c889599ef1db91e3 SHA512 7dfe2b66ea8ec9ebab2ca09a6fc3c7529b16ca4df64dcec5796adfee6c9ce0ad1ab3970e83a77f460a2f269c0069c7ea50c8f882b4fdb42a52510cb34e82ae05 WHIRLPOOL bcc2741db78e996b85b3fa8d9564b966d41a9c98873ca9d69e6d2e724e87f121dd24820c217e0eb5eb422ffcfa547c072c86098bdc2fdf1d0bc17d93debdffdd
+EBUILD avp-20150214.ebuild 1016 SHA256 5290228a19e1ea3c022ef6d6946642ab1efe7c13699f6678015e97a314607d7c SHA512 7e16af803dbc3d0309a7d476dc4238fab5f151d6a9daf243e88256eb2f9de37fd4969416b822768dc354dae31b6fc642cdee038dc2b3bf312c07b1d1b723f45c WHIRLPOOL 2b625691327b810c3cd3ecd11cb853f97085ce1d5e936950278f4f2610daf0b0f2987072ed16d6837e9c0f70d1b666bc95d776717c3853c7d4ae3fe6071eebc5
 MISC ChangeLog 2422 SHA256 f4b75b2e24ec3b41a61f91c8a448979e18fe27450e25443b75229d9ef7a70269 SHA512 6197f1590f4067316712715a8c67d727017f2bad894c66ae115af7ad62280b47a369b61d16bb85fdd0b71ca1a715e8a6dd14a5574ef5d72509edfcb063acf568 WHIRLPOOL 2c0958bfae209eb460a63396467a5ecddd66400672f6ab85ac0b1f45fa7bfefe9d1806fb28538565b54ae090d5af6006ceeaf4fd91e3abae689c7a44a2440c5a
 MISC ChangeLog-2015 4550 SHA256 45f32538c2036b2ff4a79149fec3469ec003eab2feb865aa7f66f4a9c1ceaab7 SHA512 52d290ee5329465c6cafd5260610360079f60dbb1d5d5aa1a9cebee13e5f0b1947378108dda109b6fcaf87485612f5ab5e313c9ca2c8d3c751ca65efdcfc71e3 WHIRLPOOL 30cdb15462f79eb63e153d5f56e42683e313d422340ff28fcd3613aa7fe5cdc339d67e9a6c7e2b67f8c162f58c9384ba138a21f9f2de8a8334b092e87876272c
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-fps/avp/avp-20150214.ebuild b/games-fps/avp/avp-20150214.ebuild
index e65a4044530a..83482ba83d8b 100644
--- a/games-fps/avp/avp-20150214.ebuild
+++ b/games-fps/avp/avp-20150214.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.icculus.org/avp/files/${P}.tar.gz"
 
 LICENSE="AvP"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="media-libs/openal
diff --git a/games-fps/blackshades/Manifest b/games-fps/blackshades/Manifest
index 2290a4ac7371..dd0919eecd37 100644
--- a/games-fps/blackshades/Manifest
+++ b/games-fps/blackshades/Manifest
@@ -2,7 +2,7 @@ AUX blackshades-datadir.patch 249 SHA256 8dd140b4c33a764edc44e77b4613cec798f173c
 DIST Textures.tar.bz2 340110 SHA256 084f4592e1c83a0ae79a14823f59fe210dc6ae83ff35111972d3b0239b276607 SHA512 42a2a28072972b0919a67a17ab06cf74d6bb611cbf91ff017d72726fa2d01b3c5dec905c6760a199b710eabfff8d980867269d6ad3476096beab5c4edb2cae10 WHIRLPOOL 7e182176a216939fd553f305b3cb49e1c1bc384a157571c0385a0d9a74a2ea19bbaca618e6ad8f0591940f564bd0f43b408ad75657ff2e0cf73ac6b14348b52b
 DIST blackshades-20070723.tar.bz2 761669 SHA256 2fbd1ed3778a834010fe4de94063149b60461d6e9d155b281747c2e14fc30056 SHA512 9477c59d685227650980c16aeb59f567764bc983c01da4e256b2ec582b5a063ef89222eb4ab0d42552bf6a4ffd95ba270229800decc9ba7a9b289f093c5b9c61 WHIRLPOOL 2eed49d46090509c4ddd1638b6066c7017453beae646d8dd7e42d6f54d8f8195b0a7f07b7ec22164f952acc0902e2a4c0dcb915dae8cd3e46567a14e68a92f02
 EBUILD blackshades-20070723-r1.ebuild 1266 SHA256 b31ef2f6f2ae2d3f93ee05b5dccfad8d53644b4ee0c7fd1932f99814fecc8178 SHA512 f6b39d40ece5a33caa9c95bedd97dc9060cb3f624f23472730e53129c5ebbca675e5edff0f93f5b675c2170645303755cf9aaf6e5ad02dc843f6175f7ddd5b76 WHIRLPOOL 70a071e860b9d711a76a7bbc5ffaa57a8e277f2088d38bd80ff25682b57a3061279d8bbdcdbe5c13e017be7a23b01bda4e7d98531dcadbf82fb09fbb8320679b
-EBUILD blackshades-20070723.ebuild 1272 SHA256 4056b48181b83bb0034b81a4236bea5362e6b8fdc01aae82242ea133db47a0e9 SHA512 02132285aa7b9187ca7ee845a9687d537fd6a27a66e5e2fc78ce96640684480b444613940d75499c72262829e17a764cb68ab70e6a9131b274468dd7ed2f0ce5 WHIRLPOOL fffe48c1cbeef4618e03f804ca2169c9afae68382e0a3e776862f83b294a4a81cea65a34a5d36f07839ed4a6b549a8143bf4c416a999c61bfc3e776094c6e983
+EBUILD blackshades-20070723.ebuild 1274 SHA256 0524d85f702d2c0e1f893506f10cde7fe137f73b934651db9d750a1d6f5dbc37 SHA512 e3f51e66e9bfa6a405d68f70f3322921c539af718f78a90316a1baec3462a3fed8548ec856070d406218ce92226c2d4f75ca2ce4483223b9318bfeceebcea772 WHIRLPOOL e1474d7bc0bc26a1fae2798517ebd4fe4a1cd5d2e44c9ef815032f64b7cbc1e4a0e87bcebfb37e53c5e49e7a89af7a80283640c8380aac437e67d5c32ac50404
 MISC ChangeLog 2746 SHA256 16e3fe9f29fb173e635cc724c832b2851ac111f41c6f9b4d38c2bddbfc5af896 SHA512 807a8e4c05002d8e9c7e5cec7aa5a5f77205abd06a0915bf16350f78ce58543a9f015f265259251e57eaf6b76910502f18d0d038342eaaf5102ac443aedd1ac4 WHIRLPOOL 7c88c79235d4e6526f8670f630e1cb63c3963b973c8066c3a31a5f7116e4b4aa08b337cc46cf0aa2fc17dce399cb5954a95eb1066af0c1e5a65c3622c32a7b9d
 MISC ChangeLog-2015 3340 SHA256 8cb22dc09d00e5fe0b0dde6a0cabd801011021ef9715d458b1da8cca269e8724 SHA512 2bd47eb813ff2fd03d530eebf36345ff3e307a1de43c5c357db68eb77d374428f7e5511763bf9193dd850297966cf8a0b27f09798a81ebd94b24e6d2d37f2395 WHIRLPOOL 335ae943f943e9025c68144eebf6650100f43bf863a26e7754d362a493b6fb3420c74aad7cb2ff41fbe420939400462e4e5c9dec1c29bea0aad347ae8fe2f3ca
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-fps/blackshades/blackshades-20070723.ebuild b/games-fps/blackshades/blackshades-20070723.ebuild
index 7e976e731790..81b5623a319b 100644
--- a/games-fps/blackshades/blackshades-20070723.ebuild
+++ b/games-fps/blackshades/blackshades-20070723.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://filesingularity.timedoctor.org/Textures.tar.bz2
 
 LICENSE="blackshades"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="virtual/opengl
diff --git a/games-fps/darkplaces/Manifest b/games-fps/darkplaces/Manifest
index 2edfdda6515b..2d9c3ce8629f 100644
--- a/games-fps/darkplaces/Manifest
+++ b/games-fps/darkplaces/Manifest
@@ -1,7 +1,7 @@
 DIST darkplacesengine20140513.zip 28113487 SHA256 69e5a50991884196e403bd6aab4a33bba553a934a167be366672ab4e223b06c9 SHA512 45864b590057c6de0ea978b3cc967feb879b87b2d376f3b4d8525e037b10ca1fc68599c152506494bb06669c6c2304e0aa0ee1b28f7a0d589d10c23f7285052c WHIRLPOOL 0fca6d87c9d3482112992965b70f829dfd6ecd926d940ad66f5f75aec4438c2b5b33fb6ac51f69c5199f06d53fbc16f1c8d0780db40b8cbd71c7ceb0e67a4048
 DIST fuhquake-lits.rar 8388829 SHA256 066fd58e2a6d157a1aa7925334d7e3e6cffa7f5c556e707bc31da8bfecea873c SHA512 6e59f5e08a6c401b329b86b0cd677a04b1a5aee11f24973c77c9e7ea50cab9dedf4fc15c4f3d6b73bdc87bacdc9612a3c244d0a4ceceef943abb6e256ac23925 WHIRLPOOL d398b57c03d02c8180f8ca93f6964ac2118ef50cace3ecbc9da9113b1e91ed3a7b7e5473ebb9ad2f5198828eb8565c7c0470aea2095152b2898335562bef821d
 DIST id1.pk3 350470 SHA256 f1ee6e144d1942ebf91a8c71d0333eac94c73efae35377fbe7ae43e0e4ab37dc SHA512 d4d7233bc1e5049e89d09448818219b0ce7941fecde5381cd95933e4c96ebc9b4e34ff7eae5eb5d0d1e3cc2ceb4f5254f4d600aded7dda373713149817621331 WHIRLPOOL 30fe7e6d6ac6408c54e704586d4f4e15d139c0330e4f3e758651bfc2e6582eadae08c590e87264cfb26faae56a7033b383d51f93bf54ddfce7db38e47d569280
-EBUILD darkplaces-20140513.ebuild 4441 SHA256 e5c8ed4ad3f2388080db604b9eb31cdf665e1d230a11cf4e43f9c4920a582b55 SHA512 534a1d198c5d3f55751b20ab1de1ab1dbb904ca8ad085b414e8fcc8024d6b53bb1a3239f237c050061f292348d51f281390f7579e36eb3dc3e6cce1fd48ef95e WHIRLPOOL 59afa401cd14860389eeb684132dc6e9a3720097bd39e7c61c09a96bf12c6b2e9772c638a58de475503071a77becc2caf0bc3bdf7e4ad59fdb55301062fda1f8
+EBUILD darkplaces-20140513.ebuild 4443 SHA256 c2b576e85d944798e65be464c0745b88a501b88e4400dbba46ef59f23eb68c29 SHA512 86f0c103972d42ad24f8213cbb73c5237a32f58e06c75bd966822d6ef2aeb1a41d6a9b6c83369b9e340d16041ecd8b8415836c1ced37b2c0ac1620cb1c52e4b2 WHIRLPOOL 85051c80f7b6ec269fd5cbbb1ff1fb9a0dc45c8269033106ec240ea52fbf4b7a35ada5237fd536b6a69c52d6414a62ad709689ea85e4dc74dea355099a554b2f
 MISC ChangeLog 3430 SHA256 12c35a6c2efb9902b8ffe4a47a431a3e7d94311d9a7ef14771c63a1ed5fba0b2 SHA512 322d9ac63a1d7ca2280ea20e5e72b032fef052cb721bb1190f2b2bd5811e9725b6b32f17474473c28886e82fa6e55b80800bd838922e1a0ce4bf2dd58afc3666 WHIRLPOOL 1c9d1f7a42127027dd60a9add7e0230e920415845b9bac50a2e912027f0f669c85e2d06118fe901f952ced808b663a7df68dfa08e5ca0b5f9ee16f12f57bb65a
 MISC ChangeLog-2015 3307 SHA256 79bcd4fe4c3d8659f5f887a9a16dde6fc601984f7a36f144f0e31ec42b3dafd9 SHA512 4aea1945eadacb9aca9c4af918171c1703ecb553dba0a0ab39c8e44a9af718623dd4fe16edff17af382929220e942d4b8f03500d24496716b60dbfd749791471 WHIRLPOOL c6b8cd293cc7f96259518ac1bd994ea1314987ed5f5ee4df9f1f7452236630b9182fec89e822fed490f8646345c1c46721e1aa9b5fff97f498a90991a508c6e6
 MISC metadata.xml 567 SHA256 1ac394967e8eae3810269c61595c8d3d5466b4088f245f7f0543189fe63bf4b9 SHA512 719f0053b4390b1dccb63e70bddb518f9aad79c8b240dd37ed16b1680a1053a51e309632893c87c51d6057e2602bc6a3fbe8c7d11330da76d5646b3c8c542bbd WHIRLPOOL dfa0530ade2a873d6992b65de47fc03b45d4c72594c29965e13ee110e153a8f407775798496e09d1dd285018fd4c756e96077f9c1124b3ea20ac47a170019d9a
diff --git a/games-fps/darkplaces/darkplaces-20140513.ebuild b/games-fps/darkplaces/darkplaces-20140513.ebuild
index b203f597fc6a..1e154b7074f7 100644
--- a/games-fps/darkplaces/darkplaces-20140513.ebuild
+++ b/games-fps/darkplaces/darkplaces-20140513.ebuild
@@ -21,7 +21,7 @@ SRC_URI="http://icculus.org/twilight/${PN}/files/${MY_ENGINE}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="alsa cdinstall cdsound debug dedicated demo lights opengl oss sdl textures"
 
 UIRDEPEND="virtual/jpeg:0
diff --git a/games-fps/doom-data/Manifest b/games-fps/doom-data/Manifest
index 5bcf817a901d..020342df0a5e 100644
--- a/games-fps/doom-data/Manifest
+++ b/games-fps/doom-data/Manifest
@@ -1,5 +1,5 @@
 DIST doom1.wad.bz2 1689021 SHA256 77009084330d2d14540ffd78b05deef4cb5cb4058cb50cf17316fede43d4dcae SHA512 f3aa78fd1e36d2dbd176c8c5284f8cee4f39d8e34df5386fd668565e752410e2b776413c78c1e7a3571695a1668f1e4820338ebc9a2b1a0ed1a81896260534fe WHIRLPOOL 801adc114c3d2c0029e80608641e7d4e2330334305b38fc05ba1bc4caf2db188635c862d2a743b54ce8b908b541e012743242d7b91d45d4ef2a6b514c5e338a5
-EBUILD doom-data-1-r1.ebuild 993 SHA256 87b04b49457f9b27b30e8f6a7e912daf47efc0aa173468c36f064dd579afef3f SHA512 5faae3ef52e52f990a6ece6ae9c9398c892b09b7a2393fc1af6d774721b921f82848083a8bd765614aaf8de44c4ca2f437a2af2ec9dace6f9c2896abe67a2363 WHIRLPOOL c6b3b439eca41d1d4214a3aa8aaeeb186fed1752a805f9f2e48c7c97fde1c83e3f7989bb5d8fa7bce1a4a85157da5b73e91db52b977fa3d46f77d37c0f02f96d
+EBUILD doom-data-1-r1.ebuild 996 SHA256 b0d89e379e0f0a026cc64e71f45ac7f73189ab669cea60f34a602cd0e65ec046 SHA512 5aa0e13fcdfa73e97022eade058cda05e88ff6c6a230a0c5b3ac3cafbfb8ed5f652228c82579afa1a708d3b82070602a5671bf0ce88ee42a6a82bf9643ec97f2 WHIRLPOOL d7b786220623641f1f6a84ce54a7b6018b2d6d1a88ef9e107973ad6a4ee655e60dedb39a3a2626e62ba83e66f8ab2983d189a6cdcac299039e34ed3b7ab97b7b
 MISC ChangeLog 2432 SHA256 f71abbad29efda9ee17378d57af2e44cdef89d919f42a34ad922bd2902f60949 SHA512 f7c20c665e648bab97f2993b113fa54cf4cb199e947aa35a42daf3afc70ffd346c238901d8e2f8bbfb25c1dc61834c051b52ebf9255bf357ca10f3e33be8dec2 WHIRLPOOL 42d324f79af7209053ffa03333d5f868a8874e5fcdb79b2e85e67153b26634d7862b43441282d76d539ebcea8eb1f2f4f6c0bd776b0124b15f7d064a0cfcf56e
 MISC ChangeLog-2015 1308 SHA256 e3e70d1cb31f16055ded36c20b6a691152903f87f0f4189b8417e506225e77ed SHA512 d735fbb2082f058996d19e46c92d324061dded569e02d1ec1496e3e3e28353a26a0959e5c71c0a716b8044ed74cbc3d7b568f3bdbcdcfd481c78df78d0a35fd9 WHIRLPOOL f938d9b47b9b3870aab229f8f5e01acea227d9ffd753f331f3a23a4fe6fca88772654ff463d67dafedf86e003c250a56cd2499e2bd961b17ea1af4707cec1563
 MISC metadata.xml 347 SHA256 b9a6d614beaffc89acbc06243fc729e0ed1edfbd8ac161bcdc9f94f12af7332c SHA512 2cf8dbebdc411b37294374d196748fa23a741e5ae37946d87b74fabba84dc67811db3f5e215b82be1ec0e8543ea4e0b5e3a5e46412dffb576b3492ebb79edd3a WHIRLPOOL 9cc4a72e3dd0222090c3d5fdba5b0b4705fd6f5752be902c769b6de9a5b7467a75839b2bdeea42acbf9e315a7c8b3dd3f900536c46c7b1b2ce7a259b248a4c9f
diff --git a/games-fps/doom-data/doom-data-1-r1.ebuild b/games-fps/doom-data/doom-data-1-r1.ebuild
index eed178d54e5c..0161c5e20196 100644
--- a/games-fps/doom-data/doom-data-1-r1.ebuild
+++ b/games-fps/doom-data/doom-data-1-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gentoo/doom1.wad.bz2"
 
 LICENSE="freedist"
 SLOT="0"
-KEYWORDS="amd64 arm x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE="doomsday"
 
 DEPEND="doomsday? ( games-fps/doomsday )
diff --git a/games-fps/doom3-cdoom/Manifest b/games-fps/doom3-cdoom/Manifest
index 2f22aeacc12c..ef1994fa6280 100644
--- a/games-fps/doom3-cdoom/Manifest
+++ b/games-fps/doom3-cdoom/Manifest
@@ -1,5 +1,5 @@
 DIST classic_doom_3_131.zip 212329377 SHA256 32ed98f373573906d5f5082ad9a09ae0d65e4ae7c47e42cee8468b95e4ce8171 SHA512 6e997b6d3c35296b1d0c9ece288cc9d8d8dee1dcc42b38e068e7c101c79ab01475093777bfcd6ffeab1943fef3bc1f62e5917288c4a28789448454db9e656e51 WHIRLPOOL dd6740d9315c3f94ff05519a6661fe154239207ff016c7510427a89deed5a49840b6b1be70411931ae03fef9900c64bb478d1a1f7425855c4dac3ab6289c9b92
-EBUILD doom3-cdoom-1.3.1.ebuild 640 SHA256 1ebb4ced97394a0e4b270d9b718260cfb301f5a04f22d57c43e060ed1f8fddbf SHA512 a381cab6315eba692c420494cf4b2becf7961348e64152c552fe101ba1efa800c9009cc4c52e2caa8a75c3575bd0ce9d40dd0b08eea6ab3e8e6a59d7bffff3e6 WHIRLPOOL 5f6a69050c2c296dac73ce4c7861742a9f0ba959e60973e3f5c740db31f00984027e384d7c8a1021f7eb15e9d8fe9087c7120d1e698315caa865c225592c055c
+EBUILD doom3-cdoom-1.3.1.ebuild 642 SHA256 b528c9bfa1b96eed10a353c622700c7d6680077337e1afdc46f5f2e257f9da3c SHA512 55cd50bad742401c644476569a04a16ba7ca3ddeba99cd7c45d0f4fbcac898a4f716621ac569c819aad1df4963898172977fb877995d526141c34e1989376763 WHIRLPOOL 3fc95bce068c0c35d7e70504c088b65f939257a3c1319b41e16331d63e7dfb0a87a32a566f4c02560a2e26024b48b35c0fc371bf808b68201d1458ad0ea496da
 MISC ChangeLog 2568 SHA256 77d66402bd0587605a8ae8025e3e7405d8eb0741a4561d056c5b43e788fc718f SHA512 d27dc2f4b4a54c5c78ef4b1754a920057a1b9f307d500a6e037d7222cbdb2b1b5a5a98802b74c88ee0c268efbf78f472343f27e3e2309a02038098e0b051cf7d WHIRLPOOL 4e26c7fe3c63ce0643b325c7b55ea9d86814fa7e7056ed9948b46bb18715f263328ccd6925a102a2467530184b679c53be230d6b52659a0bede0c8ffd7e4b073
 MISC ChangeLog-2015 1597 SHA256 9dbcafb13535a145ab0d1186fc290dcafe9445f0ace5a06fe30d2e895e5f3c9b SHA512 823001793d04cc3598e8e2e68b0dd85766e3d3e6417616ecfe5111f7ba8eae3c527f28d4b1177b1497cada6b7d96e5208b0f75b7329300d0082286dc676132a8 WHIRLPOOL 19c1bc4047c3c9d7a58d5fa58b2e6e013074662dc0da0e6d0def715c7ded6f0eaa1d8ae5664c810bdbb70fc3863cc41918bf1c65a10dab61c63f77c1705881a0
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-fps/doom3-cdoom/doom3-cdoom-1.3.1.ebuild b/games-fps/doom3-cdoom/doom3-cdoom-1.3.1.ebuild
index fa3ecba51d47..06268279c5eb 100644
--- a/games-fps/doom3-cdoom/doom3-cdoom-1.3.1.ebuild
+++ b/games-fps/doom3-cdoom/doom3-cdoom-1.3.1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.moddb.com/mods/classic-doom-3"
 SRC_URI="classic_doom_3_${PV//.}.zip"
 
 LICENSE="GameFront"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="dedicated opengl"
 RESTRICT="fetch bindist"
 
diff --git a/games-fps/doom3-chextrek/Manifest b/games-fps/doom3-chextrek/Manifest
index 43a6535f0b48..17d0b623500a 100644
--- a/games-fps/doom3-chextrek/Manifest
+++ b/games-fps/doom3-chextrek/Manifest
@@ -1,5 +1,5 @@
 DIST chextrek_beta_052.zip 97683796 SHA256 ddaecd0d9868a38455682c6fd870aac4724c53d8ac84cc93b9d8405fe7d72396 SHA512 b8dcb80bb4d945c42acd446f7e9f07e1f4d3c0048b386709577b77233f7a971b6be6a9e1be7cd17d7d8491cd558f73ee82b94785de122bf781078f6705d04457 WHIRLPOOL a20f7576d28345e512fa8c455b9f4709f8927be7a9cbf16a266757902b304bf4aa70b5db83d72453687c53aadcf9a4c1e179e6440875728ef30a83a6a9e0f0b5
-EBUILD doom3-chextrek-0.52.ebuild 769 SHA256 b9ec49f54a3efbda7e9c95e81c8bfc5c96b3706712c750d124781ceb5434e4cd SHA512 5574f8a64d6eeee71efc228ec2f799c5175d897c0a25939f058ffd1b103bc7853181ca7ba5c2c278453683e0eb69d79788e3a72d01c877b465be05583fd7d629 WHIRLPOOL 5bd1686bb26b29dddd4560ff96f96f620dc671fc957695b1223b9e3cc425defa509090e6559d5412954d21c4247f81e2a9ae860be621fcab79a2967b04a899de
+EBUILD doom3-chextrek-0.52.ebuild 771 SHA256 a4a0dd70580eae4371d2a7f8697609027e81360af80450d9c76efc11b624ede6 SHA512 0957231db9c3e7211975c760ee839077fd4d59e83001c60305571692bcc8bfb4d87e48bbacebbe54751a6bc6db99474e073cf0ec49661c9348e564d0cbfa3b56 WHIRLPOOL d9c4d75680377dcc6bba4faa5fefc0a961861b2193faf6ee3f4f70ef8980cbdd9cbc21e25a01e0227a536b3574f15f79f38dee6d08e6afa573100635a9a7b4e4
 MISC ChangeLog 2707 SHA256 63927ec5beca3e08f593aaff6454ce50ee9a3ae92394b372c635f275a8e45820 SHA512 190b18b13417ca68f8675271cd51a1c03dcafa7c69bdee3e39879c1908e41661697413b2db710d8b186e4713b5695d7c35309bd28709e6fdec74f218a5eb5ead WHIRLPOOL 3dd62e60e78587debaa6b978a0ee3775daeb886c6115ed246abeecb7c48965f038b25f3ece09ad957c99169cda8c91eb998be54e8611b413d27929a1156820ec
 MISC ChangeLog-2015 2073 SHA256 7508443f5bd03cca860269f5c5967bcdf284babbaa587cd636ef1bd11152e61a SHA512 7637e3888efbf1739011b671f31f7c09f9eeae54b94dc0c385c55239cd3cb0d41fffcf8eaf81746029a2edd239996a58fedfb8a864332285599956d9fb3ace81 WHIRLPOOL ba8da96e99d1a439ae09b9a176324bed66e5a8a84bc9d105e8ba0af6d7e04dbf760a1fe8871d990f31a35c7f74b92c800c11f9e1249c067cde50d93cbb0ed978
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-fps/doom3-chextrek/doom3-chextrek-0.52.ebuild b/games-fps/doom3-chextrek/doom3-chextrek-0.52.ebuild
index c986239abed2..959c85e21958 100644
--- a/games-fps/doom3-chextrek/doom3-chextrek-0.52.ebuild
+++ b/games-fps/doom3-chextrek/doom3-chextrek-0.52.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.moddb.com/mods/chex-trek-beyond-the-quest"
 SRC_URI="chextrek_beta_${PV/.}.zip"
 
 LICENSE="GameFront"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="dedicated opengl"
 RESTRICT="fetch bindist"
 
diff --git a/games-fps/doom3-data/Manifest b/games-fps/doom3-data/Manifest
index 302fac69b348..07d3c70131fd 100644
--- a/games-fps/doom3-data/Manifest
+++ b/games-fps/doom3-data/Manifest
@@ -1,4 +1,4 @@
-EBUILD doom3-data-1.1.1282-r1.ebuild 975 SHA256 699db9531a60ad88bfe8a17da87784caf3d69b22cfec2ddef0d8c3510af131d4 SHA512 bc32de0a0710196ed8a1b3b6b262a6a0c076ebefd8978c4cdb6a01a77653007e7a5e5f01bc405eceed704e90cf44e7cd0044ce556a4856fc3a8e70e0cc29e176 WHIRLPOOL 92de7245dfdcd175f5e94270f31646f5223f98808c813e99d79b55e6599f28c7e93cb4f3dce4855aa8ab5349c2ffb91ebb5115d42fa539f1bd02682e949f76cf
+EBUILD doom3-data-1.1.1282-r1.ebuild 977 SHA256 5df710734eadb871e6efd6f0be45408dcb264da8240fa502613e409fbd2edf97 SHA512 6aed225b474521b5619b08ea6ab0524f1a674abefb6c52967b16ed6b27ccd72b0f2243503088ced9f850d6274cb049a618428fe84689cdc97d2710af51ec5d06 WHIRLPOOL cebb96eb74f7feac274dfb658f1e9728916ea906d7fe4379f69cc6cca67ca371c904d94fbe451d7eb43bd7cb312498b30308669c6f6240aa078897a93b564f58
 MISC ChangeLog 2582 SHA256 4d5f86da25b078f0d7f0c76e4fcc676a595e7ac147c5c7b3179e27093c9fdbfd SHA512 1b5589db859c51d4dd6d8724f20e743825c8e3fff70aa943a0eee9524e6b0a2595e3a623d85a18b930fa36024e60c5bc1c071a17030bb2f92517931f1cbcda7c WHIRLPOOL 152adb4eb27b233cf5370153d7d6787acd65b08f34bebba1344c9b24149fc942dfae64bc908bdefb3d42ea67dbb1a64830148b4800e1b01bfa981939f45331de
 MISC ChangeLog-2015 2571 SHA256 204a7ab698d13a1166e46fe055bc36bbce4f3b582246033d488ff8672f8eb306 SHA512 28884c3b1646b15cdc5e3e7dcee6fcd47fe47dd9578619b713a62a1affab3ce83dc6a62fd6624f5af7b19a8fe1fbe6fa5ab2f5ad283f2309b5a19cd1875b3b5b WHIRLPOOL 20c665a238fd431d29eb578e2e01ad304b07bb02cb076d28fd0992c5813256e4e7433b0c201c75c92b4968ab3f7b68ff01db4ab3c047b332621126246936eaf0
 MISC metadata.xml 591 SHA256 9032753ca53c3d9390e077cfe04e35027d699eda2f86c8deb63f08416660e51b SHA512 c3c4b6bece181e97442362164c3a87f2c3c8bbaf378ea3f629497983c2a57077d92c9caf84fd7104c47430329e6789539bbb58bab92e6a6aecd47e93c04fd4f2 WHIRLPOOL 9e7f225165cb6504dec0d38bd1e0e5253cf33315c6fe498ae5369c85f7d33905a56c631dd44bf216a91dc261b9e07adc7295d1fbb71ba7e14dbc2b37d27a9cae
diff --git a/games-fps/doom3-data/doom3-data-1.1.1282-r1.ebuild b/games-fps/doom3-data/doom3-data-1.1.1282-r1.ebuild
index 922b0a5fedc7..cdb2aea6ab45 100644
--- a/games-fps/doom3-data/doom3-data-1.1.1282-r1.ebuild
+++ b/games-fps/doom3-data/doom3-data-1.1.1282-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE="DOOM3"
 SLOT="0"
-KEYWORDS="-* amd64 x86"
+KEYWORDS="-* ~amd64 ~x86"
 IUSE=""
 
 RDEPEND="games-fps/doom3"
diff --git a/games-fps/doom3-ducttape/Manifest b/games-fps/doom3-ducttape/Manifest
index 4cfe195e9ee8..6474401183ff 100644
--- a/games-fps/doom3-ducttape/Manifest
+++ b/games-fps/doom3-ducttape/Manifest
@@ -1,5 +1,5 @@
 DIST ducttape0007.zip 66501 SHA256 5a23113075cbb7b9219b8506bf657ba4c887657fa877dc496454d47fd43ba3fd SHA512 90c2a271881b3cc7823be5f01b0809d99aabb6f8a88c9a3806d6b4adc0f86a9a0f63cd34498fcd99ff1eb25de4271aac5912495a469bbb72d4b9ae7b90f003a2 WHIRLPOOL 24db1d3b874dca8b8a2144e295b5c7d8f27955274877a461552aea9e9b0753c5afdb0e405c98b20cc32d28086d304f172558a2e45de7d33fbbe7caf51b5a8894
-EBUILD doom3-ducttape-0007.ebuild 750 SHA256 281b3bf6bab739a5878db6c374b970e79e82b07139a103abbdadcd2ea4eadc60 SHA512 baee65cb335d6ff569ee0be173a7f43ffa8946be40ee0f79ebd3eadfd6ca71a2260e0a11c4b6aa5f89e09859b80a25f07ff8c871d4e03fe31702fca365bf53f6 WHIRLPOOL ec97ee29b149c86af52d7c7dac09eeab05332cf24554698909e55c1e8cae1a2700946a7a64a1d7895fc41f311a8d4d028b0a7e6d17338c992c4e0a350e6d21f6
+EBUILD doom3-ducttape-0007.ebuild 752 SHA256 88a0a9dc9e0a09ad05159ec1876ecbccee0992093a980dc8722f3dab2705d510 SHA512 99386e825eaf510f6b604e1b681c9fdbee1202187c1db250c4253877c338aaa14d203a4fa8cfb931c71d0071fea12554c4a853975f27a06f66a8d734d8f1176b WHIRLPOOL 0b3734815d3651e860e6c1edad0df6f77d6e5aeb55ede9bd6c085e2bd2814a9be550ec1e34b5bc703d4ac491ff869e64a7f4b2177b420827daa81dca58bb4c57
 MISC ChangeLog 3044 SHA256 ba9f034df02b408d96c07c425e1b005c8806ef13627beea43f8a4f9d7567060c SHA512 b7d3a71416258225cdbff3e7b7ba08eea81dbc1a19c5bd10fa8afa5e28468315db6a338c618e04afe2f71e5c321a88ba512d6b66e7503793891913768df11d84 WHIRLPOOL bb5bacd8a51041d4b466a5e6130666dfd7726033bbf9ce3d905b443dee8180f1621da413619a39732d67586898b0a33ba94b731ba5a55ce3275838581c6ce225
 MISC ChangeLog-2015 1475 SHA256 8f0439b535e316ebe2d82e5feba8a700bd3d771ffd78e3b8c1c44268ad635664 SHA512 17bf63a8ea14966bba46a09bd93418455a1ab4c79d709758dd5b70d427e7caef778e5b3ce9446eafe596a1b7295b59bb41aa5e1f22f42ddafbf775426cca12a4 WHIRLPOOL cd69c757fc08aaba80674f9ead4c83b882e83cc7d2bde92701031885ae5961b2bc46cc542de2dad6391cdd062ec9b0d9d3495ec11a7dda9559b60d2492f9e9d1
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-fps/doom3-ducttape/doom3-ducttape-0007.ebuild b/games-fps/doom3-ducttape/doom3-ducttape-0007.ebuild
index b27109952b19..4553ae0e3326 100644
--- a/games-fps/doom3-ducttape/doom3-ducttape-0007.ebuild
+++ b/games-fps/doom3-ducttape/doom3-ducttape-0007.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://ducttape.glenmurphy.com/"
 SRC_URI="http://ducttape.glenmurphy.com/ducttape${PV}.zip"
 
 LICENSE="freedist"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="dedicated opengl"
 
 src_unpack() {
diff --git a/games-fps/doom3-eventhorizon/Manifest b/games-fps/doom3-eventhorizon/Manifest
index 0fecb7d7cfe6..92d4f31e0e9f 100644
--- a/games-fps/doom3-eventhorizon/Manifest
+++ b/games-fps/doom3-eventhorizon/Manifest
@@ -1,5 +1,5 @@
 DIST event_horizon_xv_1.3.zip 108659988 SHA256 3d653c61801348f8e58c80fcf1c29411987a311e64df23d873f40ededd242fac SHA512 af8d406b8b87ba22a43558cec034b5810bcee2a7dbb4bf87fd879d25f67b247e0d751443b4fcfe0a1b5072376f3941dd8e59d6d10e9ae9304c05b7ef6ae31944 WHIRLPOOL ff0fa512dac755ec7769d2b6e1ed495c59d0cf497d2ec61c4e04bfd3dc39a84017f7281d9d2c062b6078277584bd353a0251b046c7481cce9e93b74fc2c03441
-EBUILD doom3-eventhorizon-1.3.ebuild 649 SHA256 a1571f29331da3944ac71e7b14f392a8e8f9e9bee2be4b7ec3b0b6fd31d5fb36 SHA512 1ad57ff00539f6649e1a054e882b88aa7dc9f14b83df3044e7a18a1bc6feb6999f7fd4522431a7bc85d9d74020867035da7c3672982dc202805a1c2457f68bec WHIRLPOOL 4a60160da182e0b5e0ed171177f4ad01b6aef355f8a2e023c469dedcfceab4d13a5d4f7105543cca9a1fe9f8eac713d5d201b85464bdef5b91c74ab34c95f4c0
+EBUILD doom3-eventhorizon-1.3.ebuild 651 SHA256 435895964ce2b4b64a3fb08f6bce0b3b6d99f0a183f40350a6f64b28e93113d4 SHA512 42655f46815d4922bb050f918678e089a4784ab1ddd7694960dad51d01af95144e041f1500837581d77db84f53a5303d05cd6acf0796be6095cb91c218f6df5f WHIRLPOOL 57d1d17f00ebf7ffc82917c3132380f316a44f99b769bea0d35db87d0258d114b0ab4abd0be7c8c1dd3aa5e875344f34be979594cef998f8300724d2e133e7fa
 MISC ChangeLog 2590 SHA256 1abfe3fc2ce27e9c6a3ca7d8f5b8c4886659f9869a7842989af999e16c014dce SHA512 41a8fca09ae2b6ce71e4e1c58966724307e039de67ba9cde80f8d12d18d8a460c09a7a2c40ed020cf5eb64de17d0a3cfa41a56ff6eb8b736f216704bce2f09ec WHIRLPOOL faef67fbb5f305c1bfeddaef0a03974f354d89e20144fabb5e74cdd0bdfd86f0d2b9bc83240a2a6e24658a206f1aefd94abc7843c073a65c52fdec3c4514b6b8
 MISC ChangeLog-2015 1131 SHA256 052a1e0ce0be3100ce388218b39cdcae1779b2bbae0f5f50b64f5c467d49459b SHA512 ac76f2e788fe0bf8ae5498bc5af352e7aac3ea65cb2f6027a90bc105e3ca01e5802d8fb6192679b8ecabeba3ff0428efd8667f87922724dd00139b87f5ba4a01 WHIRLPOOL 758bac1da8cec8f5037279d38aa6e31c81d0e78c17c89ab8feff1e70bb2cdca9216e95ee94a340f8af39a1a2add88feeb26ae3bce2b5bd9a42a1502de87cead7
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-fps/doom3-eventhorizon/doom3-eventhorizon-1.3.ebuild b/games-fps/doom3-eventhorizon/doom3-eventhorizon-1.3.ebuild
index e87f1150f6e6..add575517592 100644
--- a/games-fps/doom3-eventhorizon/doom3-eventhorizon-1.3.ebuild
+++ b/games-fps/doom3-eventhorizon/doom3-eventhorizon-1.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.gamefront.com/files/10716974"
 SRC_URI="event_horizon_xv_${PV}.zip"
 
 LICENSE="all-rights-reserved"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="dedicated opengl"
 RESTRICT="fetch mirror"
 
diff --git a/games-fps/doom3-hellcampaign/Manifest b/games-fps/doom3-hellcampaign/Manifest
index 1a8e1dc6f7de..e19320633adf 100644
--- a/games-fps/doom3-hellcampaign/Manifest
+++ b/games-fps/doom3-hellcampaign/Manifest
@@ -1,6 +1,6 @@
 DIST hardcorehellcampaign_patch.zip 532844 SHA256 98d0619e0dcd8f12bbb596c635831a37b396cab5fd49e004e95f6b8d0deefd92 SHA512 643d883c1e114af49dc573c90c19b6793cfb6f399a0050bd0c084aa56773c1a72b54cd22ec147f1981cfd1400a3253be44fc0add7b8bb1d5add8fe8163a781a0 WHIRLPOOL 7a2dcadc9b190151814b6c596e7dc85c4ae0c3b9160f066c3ec56b1541a3dcc1223b1efe6093942fafa4a940f182bbeb8b13dc3811da3c7f2664b33b8aa9ab78
 DIST sp_hc_final.zip 113992555 SHA256 3b0c4b19139f5c3341a09d4169760f1eac1029e87587a44651cde4a4bc46bcd4 SHA512 3af8466822882fda9094fd64ec50bbe7afa0e70e8e6dafa649f7798a14da37cfa1f725b855980e16cbe3cc48799363784f762782612617fdcd008b9490f07f2e WHIRLPOOL cc5b0b9e4a1d737d01ae8bcdfe031033709d7783e2bfff44e3d6fc0280ce4c417ae63508e5c02b706790f4a8fdcfb29e4c9b5ea02230362fd2c5605fbeb3d6b3
-EBUILD doom3-hellcampaign-1-r1.ebuild 1111 SHA256 46321c209214601ca940e51ea2b49e89397d64e263d5049b63bd043fc2669377 SHA512 0969549b57823edf05615f5d0b35379f88491a7f8ffc81ecfa20475df545ddee4971214257aa3eb023d76722392110418655d9ddbb1e0dbce610b9e71c08307f WHIRLPOOL 583875e6ea529d61f655b9dfdceeee667ed4c56c6468b7ebd5ed0cb34c0419a621e82bbd5bd18a6f64f944dcef65c81c5514cb07dab0a92a62c0f58ef1517a5e
+EBUILD doom3-hellcampaign-1-r1.ebuild 1113 SHA256 68ebe6fd87f58a86958048fe839f0b3f87787c5ce388ea70c9071358210221b7 SHA512 d2657eb1428d642b36b65dc996e6a988133e8cee1fc0ee0413d4f4833ff12ba24584a814742bb90404ac075c6b86875ef0ccfad93851a144246083afdcf520ef WHIRLPOOL 1a86c5de37fde7e56d3bd114d811abc2d6bd07cdf0aedaef474771b93bcf80ac77c19d0dc41d0de1c86f63a4e75d913b5a0ec01e48e0f3c43079fa92085d8bab
 MISC ChangeLog 2593 SHA256 1b1097cebe3a5ce9f197e4c6a3e97c020fd3c854ab17eeced07324bb24632c0d SHA512 03ea53ae126cfe0cf2ac8b82676154faa6f53d00273587c7d75e0721413c3c60c07a73ba2c95a45706209d5043178fdefe3056285d385940087de32c0350f808 WHIRLPOOL d0af7c69526068c42a44e0b09fa46ccfc91a4776ea9aaed7de4a237af4ae2e29d9108bb5798f7ea90e420cb930e52eca3dc055ebd3f2992db09974a9d148d38c
 MISC ChangeLog-2015 1534 SHA256 9c141f5f4aa8207bc5eb73a1d39acf2c2758583e48b0997a5ef12a5f2a7066dd SHA512 24431405204e7ec5fe8ac667f14d97a6df828f4a29d2c27f74e7f6bdb028d10e43e77befc078dcd45b9c559051a651b636a785d380c594f7fae33e623d069d91 WHIRLPOOL da33336198abff5cd28663221a272e8a27688d9d5919bc8b85b2fd1c51163ab11cbc4605f328771db6a7c5cb9119da9fb87bd2a729cb8620150f9f5327605912
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-fps/doom3-hellcampaign/doom3-hellcampaign-1-r1.ebuild b/games-fps/doom3-hellcampaign/doom3-hellcampaign-1-r1.ebuild
index 8e39f9e2fa7b..80c4babebdec 100644
--- a/games-fps/doom3-hellcampaign/doom3-hellcampaign-1-r1.ebuild
+++ b/games-fps/doom3-hellcampaign/doom3-hellcampaign-1-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="sp_hc_final.zip
 	hardcorehellcampaign_patch.zip"
 
 LICENSE="GameFront"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="dedicated opengl"
 RESTRICT="fetch bindist"
 
diff --git a/games-fps/doom3-inhell/Manifest b/games-fps/doom3-inhell/Manifest
index b3f0132c40e1..4e552db73f24 100644
--- a/games-fps/doom3-inhell/Manifest
+++ b/games-fps/doom3-inhell/Manifest
@@ -1,5 +1,5 @@
 DIST in_hell_v11.zip 356652597 SHA256 47437c4335b77e89705617841d3af9479ab4dbef124a4590c3a7ed9e92934cbe SHA512 6d97856f518161a445eb1b01eef9a987b9e0675729734539b57c56ff798cb257a6e337cd19c3b37dbea5bf5b22ae6694957a08e3fe8bc3207ea1b7982e3f8624 WHIRLPOOL c3fde484f74bc8c7470a1211168603f9cac5359e7e031202af76732872ff315a8086082862074d3f7c0c65fec225836fd656149e75dbe2e49cc2b84d6da2cd4d
-EBUILD doom3-inhell-1.1-r1.ebuild 580 SHA256 82c68ffe2eb4fb17cc38fc017c91c5795a8a364a1ec63d753db47e78aeaa986b SHA512 9b25b1bea694a2c728bfd5c0d062e0fa973570ebfa3391df4e188217263dd35bc215edd72907a94b45ddc6c81c818c90b7d0c1f000ac747556a2708330935ece WHIRLPOOL af1251575a294e0b81327cdf7e5ab4c5d754088aab31a58c75153187b796448901ed5c949ad7459ab5ec9e9a946d1a53494d1e7eb3cbac788959d6fc6155735f
+EBUILD doom3-inhell-1.1-r1.ebuild 582 SHA256 3a8e4bec2f54fe60b285da00ef87cc3c77672a43251ac51c7c171e5a459a782c SHA512 2d68bd3abca0b55390497f72b05c436335442aad7a5da056bd6aa205d52a9a928ab187c79909840c65c2aabdd0c56249e088c090620d414ff4911a91f1cb97f0 WHIRLPOOL 498cc0eaa561beac164a197d774b28e799f62a4aff92fdee5cbdc2784ca30314b1f2aab9a50169c122483ed583221c3b47ec2a4815c82e0ffda90959cc8ce244
 MISC ChangeLog 2575 SHA256 c52ca36157196cb9693ce68c8984668f2fd7d3ce649ccf5d4a3523a80bb705f1 SHA512 ea73546fcce2ed26f6e95e1c271e724c9af60b8e628c69e70f9961605522cc23fdcbee904571a124c804715801db4fdadb6d2ddd44d53c18c64fc8786b72f42f WHIRLPOOL 26dab85b7bdbd8baf55d2c2986d74cc7b7d67de4725567c42cb65cc8074a2dd575787bd4ba32a6452e1718d5e75f430656aa386013670f9ec0af0ea14aaddb67
 MISC ChangeLog-2015 1393 SHA256 cb07363452ac6e87e3e996fbcbb6b9cf0f57f34060341b061c99cdec4b03e7b7 SHA512 5883296cde6a787eb5e87e5bcf02e9e54cc18f500b54cd138b0e7167a49171a6fc0b3124dbbca6de8dfb69a9884158d40df769305b88149a6cddf7af880be798 WHIRLPOOL 674056a0b37affa29bbf2a19607759ffe54aa751d44a0d33fe77ae16cdb16b8785e83289dd01c087443a6c2cabc04257645fb70ec6a52f528e3f4b45ed3a8510
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-fps/doom3-inhell/doom3-inhell-1.1-r1.ebuild b/games-fps/doom3-inhell/doom3-inhell-1.1-r1.ebuild
index aa3b9d99ee33..bdd54df23fba 100644
--- a/games-fps/doom3-inhell/doom3-inhell-1.1-r1.ebuild
+++ b/games-fps/doom3-inhell/doom3-inhell-1.1-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.doomerland.de.vu/"
 SRC_URI="in_hell_v${PV/.}.zip"
 
 LICENSE="GameFront"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="dedicated opengl"
 RESTRICT="fetch bindist"
 
diff --git a/games-fps/doom3-lms/Manifest b/games-fps/doom3-lms/Manifest
index 8b7c0eb6b175..c807368a2f7a 100644
--- a/games-fps/doom3-lms/Manifest
+++ b/games-fps/doom3-lms/Manifest
@@ -1,5 +1,5 @@
 DIST LastManStandingCoop4Multiplatform.zip 309768743 SHA256 3e88196efc60a9046b9518a249c99021aca1c6341c654129a772b1f28f04c37e SHA512 f3d6fb1beab25dafc51a59153edb4cbb173ea4cdfd924b8f9610873bc1326efc2d85d62a23c6523b4a61319718a35ed44fecdf59bc8346fb1abb159ac93e6b15 WHIRLPOOL f9a2f06ac687df06782b0bb8ec54f2042ed5fc5051a2fa4fa893b57ba221c05b5f95f99eaad9bdcc0efca71b6ec38ba7c8d9919fd0cd3c207be55f29e85d7625
-EBUILD doom3-lms-4.ebuild 668 SHA256 0c3420c6867a774444c6fca136ad70faf4c075d2302843134d089a4cefcd0abc SHA512 2e1d84abda3c95507b6021ae56c9fce31f4074c72f62ee997d6a66ef17a2231cbf049336d45cd4a687c0f2d3d647fc86d37c71da1d8dc0bf58b7db0c75663e5a WHIRLPOOL b7af43080b6596ea8a89fbb7e3d7496d6fb535f4c521115fd6f74a507c557479dcc435de064759051576505eb150475a6ed5433794cb2d6e2e6877d55fb8df26
+EBUILD doom3-lms-4.ebuild 670 SHA256 f397c19c087844f5dd3548696ce252a2ebc8c0576d7cbe5d59869887b09f2792 SHA512 a241854f4cb5d0453620bf1ab26cdc1dcb0f2f1d832e84e57fc26cd1221322540587b27d4b7ebd37f0333a18dfb775ece489388fc371ec84125d1e528896ac17 WHIRLPOOL c9252ce31ef923e4d9b7d88dc569aec3c9269f24e76cc2fc3144a6c329fe2bddc315e38531482a4fcf9dd8d74b61a6bf39eee531203a427a56908e19d1893509
 MISC ChangeLog 2572 SHA256 cd18f13b12c7f3140e3b743725d90c767d7bfb9bea07724306dc9c65ec7ec8c4 SHA512 89b70b9b0d8e483633296d4cb221e0e10f261e83cbf86566b363c74b621c04179daf6f69e964138309f0d4c4f3c5a5eab0bafff2d338f9f49336545ba38e1894 WHIRLPOOL 1b131f8a368aefd2c2598f858f4a0134f969973a458a1c00f6d6eb7a005c44b54515d4adcb35b71fd8b045f27a0a28bfb8162e4c774a540ffe41adf09ba0e1b4
 MISC ChangeLog-2015 1752 SHA256 5606c2490ece2d7bce80d1233a268058e416ba89c0241899d19e7e716bd5414e SHA512 18634e347224be966e7c86c304da6ce75197f392e3b9f26d3f90ade99080b3f0bd2beb91528e7ead87c54fc4a6e2b3ee73093adf2fed341e753b3c5fd6e40ca5 WHIRLPOOL 9cc3915a9d268e366c65719afc49550f5d39a43ed19b35b17789b3876cb1173d6e2adc579dfd3ff1e8c64e0cba9fe25b41bbc4434ac3ee1d938ccef3272b6261
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-fps/doom3-lms/doom3-lms-4.ebuild b/games-fps/doom3-lms/doom3-lms-4.ebuild
index 96e4e6f85b4d..1abc7dc0026b 100644
--- a/games-fps/doom3-lms/doom3-lms-4.ebuild
+++ b/games-fps/doom3-lms/doom3-lms-4.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://doom3coop.com/"
 SRC_URI="LastManStandingCoop4Multiplatform.zip"
 
 LICENSE="GameFront"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="dedicated opengl"
 RESTRICT="fetch bindist"
 
diff --git a/games-fps/doom3-mitm/Manifest b/games-fps/doom3-mitm/Manifest
index 90da70722c0d..a8e6acade888 100644
--- a/games-fps/doom3-mitm/Manifest
+++ b/games-fps/doom3-mitm/Manifest
@@ -1,5 +1,5 @@
 DIST MakeItToMorning1-6.zip 184131772 SHA256 d9757e51f6d474fe992b19008d2723253f27496baea6729576e460c3c31b0e64 SHA512 5c8b58b51fb4308366db74705c6f1c5ed7a99f41992000c0ceb3b57fe1d61cb617cc03725ab213d6d7cfbad76104efebe647e50d5ad78e5b0ec480ed840118ea WHIRLPOOL 24317336168b2bc3d05582ed745858597f4248fc3261f102de8ca539641574221cd39850ef83f0ee422038ed43422801cf87c80330c1d85d35432bf23e2ebdf1
-EBUILD doom3-mitm-20070129.ebuild 1063 SHA256 cbe4b766692b44ec6716e6deb41bdf993234d622a8271a5db9acd23dbec51d02 SHA512 0d666464b32a6cf1596e0fea15202e8e5fa2632fe988ca6dd9310c39eed705474b3430646f20b6bd6aaafbca9776bd0303eec08a90f73218ae5bc2c2845eef4d WHIRLPOOL 6c1b760962e49c3c1d5fdbabf290dd060ed3fe3616c3488383e30d149ce86abc1b232b901e7b859927af42855de52cc749ec64e0bba188200c1364af65225f4e
+EBUILD doom3-mitm-20070129.ebuild 1065 SHA256 55927c39528db6a233b15d7ae1d2cb230a79a30ff60ebe133070acca6b787f63 SHA512 35d412afae56a9b8fd4413a2fcd6fb1e6d648aac7f341344d5a2b32428719fffb58232e3910a0b0555c00a8ef32199ce395f8f803474ae3375a5a94b7dfaf11f WHIRLPOOL cc15ef8b11d2b310851cf1e4282abb025e53fa2df24c238d4fe4c952c19a90aea0b13e20337dd701ad12cc77273b03c3d1e921f9145b5a647e6a44857d8a280e
 MISC ChangeLog 2734 SHA256 68e403a1d234a5c3c229d02cc26f9c7963f856b1130e10601738513043540ac2 SHA512 185b648453b88889613395406aba64b5eed0bee9fa270bfd2df7b023524684a6cd557fb22bd336217479d0098a19562e4621448a201bf97c971fea95f71ae60c WHIRLPOOL 398b3771c4b110b3c6b8b70f092bdacd8c01984f54ee430b8ce94204ef8f99ad5e612b6e9bc42ddbf48fe9bdf0b609a10051becd0896d1d64f9f4284f8ed1550
 MISC ChangeLog-2015 1344 SHA256 07bbc669cea7fe9b735de73ddb5c502798b6ac981bd1218815e70f236a2b1dc8 SHA512 42608a46ca8add35d2e8b2b78813ee244b1b34b1dab749694e941b79f8b14f93391907701ae6a648b25d2e1c4c0c4402a5cd6c05d38352e3bf0c5a4886405d9c WHIRLPOOL 0ae5d00fd656e712bcad8a131753b5aa1a1286246c1946a26845540d02a17a5e4a5b078f35f3c3a09434b41162bf30946cbef93e3c197e13b9894978e585fee0
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-fps/doom3-mitm/doom3-mitm-20070129.ebuild b/games-fps/doom3-mitm/doom3-mitm-20070129.ebuild
index 08253af74d75..7b38c2520cbd 100644
--- a/games-fps/doom3-mitm/doom3-mitm-20070129.ebuild
+++ b/games-fps/doom3-mitm/doom3-mitm-20070129.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.jimwilkie.co.uk/mitm/"
 SRC_URI="MakeItToMorning1-6.zip"
 
 LICENSE="all-rights-reserved"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 RESTRICT="fetch"
 
diff --git a/games-fps/doom3-roe/Manifest b/games-fps/doom3-roe/Manifest
index bf2e271af639..ee2ec2b6671f 100644
--- a/games-fps/doom3-roe/Manifest
+++ b/games-fps/doom3-roe/Manifest
@@ -1,4 +1,4 @@
-EBUILD doom3-roe-1.ebuild 1123 SHA256 d04b475779f6fa7aaf8e453448abeaa4b439f53ce49a90420a95129717567bad SHA512 dc3dd6476b864084559eb1afc7f3e87fabddf1da91081eb39e71018ade0bdb943060e218efeb8d87835cc296ed9f88c5bf665c396adb1d7ffe7fc83127e6ecd8 WHIRLPOOL cfca0ef0182a059984f4e4d4bc1e25836f9e739db94ebc544f49c0a06a0b8b8082b928c8c6719d3ff731c59737a3cc0888fab5f39c8f32dfb14682e549b733f5
+EBUILD doom3-roe-1.ebuild 1125 SHA256 e227150f83784d14c747ea1474f7b8cdf8cc58cfdbe46bd21ff1535d5ead33ac SHA512 6298e6825517288bd5bc745c342d4c87e39aedfa7f25875aca52f7ce174bbeec3feba66888e59aead072bcf4e1f8952befcdde192f7ec35a7971fabc3aa5acfc WHIRLPOOL dc14090577ec51ba1c53f04237a50f663826e6ee1016dfca5d36f178c85bf4b00d3258b08b40b6e3b0c6c2e7318ec2c8523c2be37cbdc97ebfb80a0b62dc68f4
 MISC ChangeLog 2546 SHA256 b48a01ca65a3025fd661e898cc1925a054ed6fe964e0da5889d48aa9fb65538e SHA512 c6296a94336cb11867fd20657ebba4b53f6ca9300f9c71c6820ccfe5fdd14cf2511441d4f9f94e81f7f9cdeb934bbebfd4c8b4ef1d4b7088c628e7d7f3ef98f9 WHIRLPOOL 3dfc13e8d4ba47a80dd0eba667a75c06b4700f85d87d4eefd951b69ff149e94ffe82aabd466c11051866965d31e407e52eeb19fce5f5906e8eb776d8958d6bd0
 MISC ChangeLog-2015 2140 SHA256 f40fcd6c504f48304fa8d8bfb439bd0e6f4da78d2e7c048a3db1992e3931dd52 SHA512 50c2cbda79e20e95da246d966aabe601d734c7ecd8b522eafa18e45139c80d4ce323662079f9f21d60e736913966eb15ce632b050a3749c55a55d68e9b1fa00b WHIRLPOOL 784c71a9af240ebca684fcce278ff3f83842a63d3f386ee32caab1c3a60c85ba904e83dbe2d72cf4bf5b5033e49e307d300dced0eb0f3242709907c604fb2726
 MISC metadata.xml 708 SHA256 ecc6e5b9d45bdfacb786e6fa2070eebf1d780cc6704799c85545373f4c57580d SHA512 b6e3b1a4256c90d51a69f0c74f6a4e991f62af0721fce6c4e2ba884c08f92f7083c4b9ab1ea736f39f5886a2b246e11ababb6c0906151fe50fa0a0adaa8c01bf WHIRLPOOL 63a087d7f1c61c2bb11c3c90676c117a6d61b703f4dbd3ff78f0bcefceebf2823e2a4d4099595dcbc40901d94a2e3cba3a710b6bd64a59207c0987cfe3964f46
diff --git a/games-fps/doom3-roe/doom3-roe-1.ebuild b/games-fps/doom3-roe/doom3-roe-1.ebuild
index 3519afb5a081..1c8c05a0b84d 100644
--- a/games-fps/doom3-roe/doom3-roe-1.ebuild
+++ b/games-fps/doom3-roe/doom3-roe-1.ebuild
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE="DOOM3"
 SLOT="0"
-KEYWORDS="-* amd64 x86"
+KEYWORDS="-* ~amd64 ~x86"
 IUSE=""
 RESTRICT="strip"
 
diff --git a/games-fps/doomsday-resources/Manifest b/games-fps/doomsday-resources/Manifest
index 7a5034e29c64..750774eff5e0 100644
--- a/games-fps/doomsday-resources/Manifest
+++ b/games-fps/doomsday-resources/Manifest
@@ -1,6 +1,6 @@
 DIST jdoom-details.zip 1379495 SHA256 6c822f6a97eddb928d0c8b32f0c84eb5a0051207af0f820d309d94a8caa06556 SHA512 94f0c29940795368e9ffdb9fad57f0de65a936a90ad6256effe6fbaa72d1ddf45a016bb72431d1603ade84c01036f84b7dc3e739d04e6c33a41bdf50a9b45dce WHIRLPOOL 1fdf4158580e1c6c4ccdeb02c11ded119085872512e892e1a14b38b63f909e9247b74dc593d28bf9ee4e3fe81ac2fc8524c5ccc8604196df5fb96eb5f2844aa7
 DIST jdoom-resource-pack-1.01.zip 23114845 SHA256 6797f3b3ccfbb4871027e8bd86153ad5b1d4d87c801a94effc962dabba5a09ac SHA512 ec40f3920338040803b7cb3029e6b52352179fe63a1c56bb74ff398e9eca0ae4c7c058213c812644add70b833c26f9a69844c2ae068cdf7d4c7a4f6c9e277636 WHIRLPOOL 309b2c39e9308bc3ba25b32414fc295a7293e7444bf81c33146a6a78568fc983eb00791cc61cd2111bb8981eb4d79127541ffe4e7372af75a3428556e8b1d26c
-EBUILD doomsday-resources-1.01-r1.ebuild 906 SHA256 1451c382e8966fc68a4e1d8b9584471dadeaef4c4b382fbd07f4f77ee3c332f4 SHA512 a07ec1361f5b72a21da68de7465bcc85271cf0d36f95fd614c278f7b145d682bb6adb6b318020433c5e2a583c69eb8839f81a50f61326b1e80922ea8733a7f9a WHIRLPOOL 121e531a55a55d6a6492a8b8bd7f84ee3bd781156ccf82aed4763b56ad246aa4d7a379c1a23a17be18e14123456e98316ea3f2e87871400114240f986b251653
+EBUILD doomsday-resources-1.01-r1.ebuild 908 SHA256 e7eae0752728cf52cd72db49fee14e132d9777b4bfe75d8db3a4a1b7b22a8066 SHA512 01156b4e436b42966dd7b55cf8a7b1b8d58bd258ce499a06f75161f44133935250e983369ce88657a1cdc2359efa94293eed10f062d4551c4c0651144357a2dc WHIRLPOOL d57832e639e2413f040dab2f178037fa0729473988b46ecf3c1ec4e19d8b9f5e15fc0e518e657077aee05f7a847bd57c7608afdf7cc92b93bfae22a9a884b94f
 MISC ChangeLog 2465 SHA256 fcb9fec5d80c395bf5de10e9066d8d2f4d768991fef2cdb1abe9418b0f0a3a47 SHA512 201a8e790b01220e0fac7c14a4159e12a0e050da17c3af2c2e23136400c6b197e4e215052a8c5ff1bc4af3ffadf166a17ab59b34c6d0026fba16772643935b7c WHIRLPOOL 9604cb7435200c1a41d8afe03bef11d7334e03003ebfde4cd63955fadd5101c76712aec91d3f5e03ebd2b3bd938377b9390782c1856c95f8e435841f5b77ba23
 MISC ChangeLog-2015 1545 SHA256 ec7d73c95cdf1868071b0d0e33826d34954c7bc6a64180c65861027f2277a6d0 SHA512 b45632acafea26310e5fd8082b9423b10f970860cb08977352e083d3671c9d0a1888e57055179eff8cee2b4bc4fed79dbbca3f3dbf35bd8d89e9bef9a58eb05b WHIRLPOOL 0544c892aaa476915c267ee505d8453c517781b0ee2bfeddca429c0410bf7cb7cbbe623989639677a38cc96996d17834b4c40e36bf8dbab34b291489e01491d8
 MISC metadata.xml 327 SHA256 a6b341a5fa2a3886baa0827edde92485a66cf0291040872877d1486c57fb0e03 SHA512 a28389106aa0322f671b0c09000457a24d4ccfe12e18385e9c6e10bfe5043e46318d6eefd264102f6ed65fe4f9a1511da0ba24baa0841a5072e17011520f6028 WHIRLPOOL 421c32d2acc904bd38b70e4b76fb368ede208566c0ae5c8999377cc415847091dd7bb9f2a93fc858a9d1b3946a184ee1d0fe98a17474da0f4513fdb4f93cb055
diff --git a/games-fps/doomsday-resources/doomsday-resources-1.01-r1.ebuild b/games-fps/doomsday-resources/doomsday-resources-1.01-r1.ebuild
index 08af23f98d6e..62564bfa4001 100644
--- a/games-fps/doomsday-resources/doomsday-resources-1.01-r1.ebuild
+++ b/games-fps/doomsday-resources/doomsday-resources-1.01-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/deng/jdoom-resource-pack-${PV}.zip
 
 LICENSE="free-noncomm"		#505636
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=games-fps/doomsday-1.9.8"
diff --git a/games-fps/doomsday/Manifest b/games-fps/doomsday/Manifest
index 472c2a1c0b8f..a0767fcbf470 100644
--- a/games-fps/doomsday/Manifest
+++ b/games-fps/doomsday/Manifest
@@ -1,5 +1,5 @@
 DIST doomsday-stable-1.15.8.tar.gz 52054238 SHA256 4c7b1dfdb7f0a44257f47322fe58fd1befba8dac10f44594e1be5dac582f43bf SHA512 6d1b86c6e364cbd043b0714eb351113c8bbaf98daddde1bf615fe663c15a763e26d3e478d1adeb6d8a75ed4c89a5a19f3a891e12ea5937ff2fc54b84118f642c WHIRLPOOL 0f660a430c4b036c92d02f5f84be16fb658b4963bcd694ca2cc92476218afcea367c7ff9d159b9cb63d753d5d10b443dbfdc0684c2c28ce78217d92764f7bdb5
-EBUILD doomsday-1.15.8.ebuild 4862 SHA256 a711450eca199db7102be43a8ba883a6b7e04531d2de51782beb0ca361ec7a6d SHA512 7585416acb559eedd75e3f7e654c0c0bb59c537c0daeeceaa998b553d0e3e9965468525cb56b0690f09220cfbc21d14cc1a33ff38cb59cdf72f3d873d4185b07 WHIRLPOOL aaab5eefb6a7009e77bbe3e7bc8bf1d464df0d81504d7c8e3b28ffda1f47da9f57bf684f7ac844d8a3c1f086737c7028c469a5798d85380055ad42e972405d2c
+EBUILD doomsday-1.15.8.ebuild 4864 SHA256 b76c3ab598d61328e1e77cd711808d2914aff866789ef9149c40cda2fd15f23a SHA512 56378761047cf905131482931c37b6aa91b3dfe445d7ee5e379f3776003fe297c607cbbd4d2f3085bddcc592871d33c92c04500b4c9c4120d7acdf22dff0ef25 WHIRLPOOL b87877b234fabca077e60b96d6b32b759bfd90c5fa6d7779b3bf448781a3ab3fb6a000123c7bfd8bb2535522b9effc868d1df5f45713991aeea0cbb2c4d8450e
 MISC ChangeLog 4759 SHA256 affeb5b1694b7653f06707555f9181a961edce6cef39e023aa152da89a9a7b29 SHA512 00aed2ce77889ea77a32a8cead755293909e61860c92c2758b3cba80b4dd4e0b9f6a491e42a2ffe3d9f8591d6ddb5e143075f38beb6af12c070054e17ee8164b WHIRLPOOL c483faef51d46b3acc0b3339895e4255af158ff5e271eaaa427496b8c381035c0b2810f9220c951764947425517823ca9fb2f8a3efc230e465a430753764d03a
 MISC ChangeLog-2015 10345 SHA256 fee336cbc34007b5f5f01485ea26c571f3ca604a8495446a2aeb864adb45e8fe SHA512 68e298af9a7faeea543e3afa3fde53431d40c78a35235569db230cb8b439b7d5bd4725f5f3ebadae383e7dd79727f7c988e0dcb68a6971f32f806c3610135dad WHIRLPOOL 5ac1e5cc2b39c1f170dd5235ba3aa12d3c9fd80c9fd88062425ab653a00519bbe57610251a51409ac2393990379927019ea3b847dda95257353ab21d9ec81803
 MISC metadata.xml 1055 SHA256 6b38dd8426490b850e7b8284a7a58344b0496618c9831fca9431765bc2b8902c SHA512 d7dac2852e2f256b2509a73c87f1f3320e8b19f80e859b2d20cb9a9fc24ac16f96ba792ca09773a7dad0aea9b4245bddce27579dfe3c0076371bf4c7d0392f2d WHIRLPOOL 631bd8a270fa7e65dadbb083e1f4c796b44f79eb56611aea229b9747def83df1d8691688693091dc0428fcef9d0364e9189c194c7267a50b6056368f0629c0de
diff --git a/games-fps/doomsday/doomsday-1.15.8.ebuild b/games-fps/doomsday/doomsday-1.15.8.ebuild
index abe5ae54c3ee..c2cadea8b251 100644
--- a/games-fps/doomsday/doomsday-1.15.8.ebuild
+++ b/games-fps/doomsday/doomsday-1.15.8.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/deng/Doomsday%20Engine/${PV}/${PN}-stable-${PV}.ta
 
 LICENSE="GPL-3+ LGPL-3+"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="dedicated fluidsynth openal snowberry +doom demo freedoom heretic hexen resources tools"
 # we need python at build time, so
 # snowberry? ( ${PYTHON_REQUIRED_USE} )
diff --git a/games-fps/duke3d-data/Manifest b/games-fps/duke3d-data/Manifest
index 61bbc326a10e..56b474e89927 100644
--- a/games-fps/duke3d-data/Manifest
+++ b/games-fps/duke3d-data/Manifest
@@ -1,5 +1,5 @@
 DIST gog_duke_nukem_3d_atomic_edition_2.0.0.8.sh 31823668 SHA256 7c70e60c621a13bdc2cd34048022df638ad478cae646f338021f7deea411f63b SHA512 9c74299ac2db58aed4eb50367e15124bea6073cdba6ba5f403032a292d141ba734943af4c15e776cc0a4087a6f92c85d2413a1a525660b75aa0da457b2fac378 WHIRLPOOL dde14e901711b17c87d5edc92587ef4c999c1ffdcf9c67f5527c92b65cd1d23774149dee12c7e9055a476d0b266acbb23519602e32a80a99f47dc3f9d751b44d
-EBUILD duke3d-data-1.0-r3.ebuild 1816 SHA256 2440fdad909241d0d84818e0b65ae54bc3f1f2dddf731fa1620ca85e40a73f35 SHA512 7bc135f0d018732e0ad82ea5241957f60559f11f2229c2e3a407386a739c8e8541b56ded2dfb636864397c3b1b366f01579feb42e76db3d90cc27450d0f95f3e WHIRLPOOL 5da5835a429810d814032701f30333a943c4ddf7ed1826f6788bdcc779bc2561244b37b0078e325dd1a17242732a29acc4d4799efdcaf4afcc16fa5b9a58c525
+EBUILD duke3d-data-1.0-r3.ebuild 1819 SHA256 888820958cfa528c19810b3f62e4ba89fe2a2dd7d628809dc722f11a1ea33da8 SHA512 47bc8097c39e47ad09c7f841e363a8b7ec8be5e08b9fb6725115bebf8586b5e6aa1781138b8498b40181fa9a6e7b08058976367ddc707cfd8b08a65d3efabefb WHIRLPOOL cff5722cb30c8cbcacf55969e6ae4bee99e3226f0b609edf70d58efce0378e59a1b1337eced7527f35cf4c9227448e00e44681b0b0d0ec3cd1842ebcfa3a7a2b
 MISC ChangeLog 4363 SHA256 dd51f74a4cb745e4c8d66e31e5f39f2f4a2676f5e64f2542e7176d412aa5106f SHA512 edb3ef955647865d2f361ecf7aac58aca8c0c4477f57c031da80da7afd20e926edd84e74f3f8e84026227488bd2a47d767319b0e67434309ea995dfad679568c WHIRLPOOL 5e994002eb0480448a3e7458eae9ddcf9b3c65e73a9b32212092ca34caa1fcc5a0f0bc2560ef31e3df8de9ee3dcd796570fd3c26f3dd75ef50d2b7a3f4a01c60
 MISC ChangeLog-2015 2075 SHA256 90687a044769b7db8b13e8b3cd73bfbed7a100c7f35791890f4013d1f98918fe SHA512 9499b5f6065cec60aa361b2a56c9b07aaea18d6f43e21d5bca64fa14b7334b3c1e50f1f8deb6dd76e86a7f7c210bd5255ea663d0062593aba44c0ea1ba21b0ab WHIRLPOOL 3ae7cf92728f3a5074ee286a921ab545f1ad1e781d57a4422c36d6154ce3631b327dccec16adae486828aedd23a8e66856a1d2033f025bde3771a6cc4968fe96
 MISC metadata.xml 339 SHA256 9e0fd943ea43528e6edcd16bff8b3294b6d7b1595bb52b379ed0542fe1264d34 SHA512 f5cfb8b76fafaea5c08660ecb9ed1a3d25efc85898b37a249c945547c4c4fc40335ec19711025955e12f6e3922f418f81e42c5dcc9a7f8ad82d3cc9dabbe50ef WHIRLPOOL 80d3bb172fb369f2e3b0e67c19a1f5723da60ea8dac3e436c4c1dfe5dee9e1a6f521cb3af4a8c1fc18c91cf43bd55ab8b083832f00f36400d33f2ad2a7a8c30e
diff --git a/games-fps/duke3d-data/duke3d-data-1.0-r3.ebuild b/games-fps/duke3d-data/duke3d-data-1.0-r3.ebuild
index cd74a277bde9..ad7eb38e4f0e 100644
--- a/games-fps/duke3d-data/duke3d-data-1.0-r3.ebuild
+++ b/games-fps/duke3d-data/duke3d-data-1.0-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="gog? ( ${GOG_FILE} )"
 
 LICENSE="DUKE3D gog? ( GOG-EULA )"
 SLOT="0"
-KEYWORDS="amd64 hppa x86"
+KEYWORDS="~amd64 ~hppa ~x86"
 IUSE="gog"
 REQUIRED_USE="^^ ( cdinstall gog )"
 RESTRICT="mirror bindist gog? ( fetch )"
diff --git a/games-fps/duke3d-demodata/Manifest b/games-fps/duke3d-demodata/Manifest
index d7ae9ffaf9ef..22e878f32af4 100644
--- a/games-fps/duke3d-demodata/Manifest
+++ b/games-fps/duke3d-demodata/Manifest
@@ -1,5 +1,5 @@
 DIST 3dduke13.zip 5924374 SHA256 c67efd179022bc6d9bde54f404c707cbcbdc15423c20be72e277bc2bdddf3d0e SHA512 eb92daa88b4e7cfeebe1fb3d2c021e0a4a66262d0d6e76b5e27fe3cedd382e381d23b392a6d9adb42a418b9318e011c2d8adfbdc77d7c5371e61d8c091c7eb65 WHIRLPOOL 9f3b9620d042a0209c707e83822fa1acff370504c76a558a6c36452b7f7c701e8289f8b389146cdd6899f47783c318a81792a7702f68d1ca62b31fc2c6844921
-EBUILD duke3d-demodata-1.3.ebuild 1134 SHA256 15580ea1834c39c9d997c0fcb35b7f291385ceb4261981bd47e8ce70ed324bcf SHA512 7a19dcb79570563547475a2b5c135a37fe5cd7101175539d38926ed3b73beb6dd410fa1023b1c75c4ece257180e2e6278559fe8ddc1b2d09d64d142df31fc240 WHIRLPOOL fb3b3a1fb4b86e2aedeca97bbda2e2ba5724977280f332a17fce9f5b59c63d6b35edc2adb9995d6352340db020cd331bdfc469ddd5f27a04631c57d7d87b301a
+EBUILD duke3d-demodata-1.3.ebuild 1136 SHA256 b2f12d9f787e4c4a2becd7dd9ab0aad55288f837eaeec781368109eeab1465ea SHA512 1c234c8c8759d68b5b0b81afae55add183754c8237b84fc935a22e6c847e17c4692940f1e7dae21e9c108b542a24d3c735a51e18579c8376b2473867b0aeec03 WHIRLPOOL 18f1422a132dc805e8df914f15fd488ee930d13f2901f8e3beef52de6b4aa5ec7cdc14e3eb0cfaabee37d1f7c8d35a0dc2a491fb7c6cac60424cd3702daa925d
 MISC ChangeLog 2841 SHA256 dd1d7d6cffa55f1a2c84f2e55c09e006510e6f63ab5ffab4bcbcf066f692b91d SHA512 2c6d1f63e34f2183aaa3f18615a110713c567d7659c611179cc09ad3873ea01d71a24c5284ce708ed87aca6f54eac9bfd9ad7627176dd4497ddfc9483bb7cae2 WHIRLPOOL c7738291224f455c9ec38a5e5ccfd52098a05f5c231c5c960c98fa4ac5eb656d0bcc080dca570dc9968e01e6c001b8b30fd2711672442a37978f9c5ec252997f
 MISC ChangeLog-2015 552 SHA256 b86a48e26045d60e89f8f53deb19a25f65b60c481360c7e40348789eb14ab88e SHA512 44b25d6a2c72f871f6d8eafc494e38c3142af7e069f6306f49ab951587ca47615219824eb705f9e168349b0ce8bf62be8cd5612259122010f0c6626424268363 WHIRLPOOL edbaee24469b853ec32bd1878b72b09f136c7352fa953ed82fdd95a569af079af39f5cf2b644599303504cdb5eb04190349ba6baf154464d215e5378ce9bc3ae
 MISC metadata.xml 253 SHA256 2c95b2eb99144a3b66de17be35eebcf65e5a152a2ec2f176165bb9cd78e5394e SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254 WHIRLPOOL fd044f0a960e57257f4a15ab16f066bbfe9983e60cd5fc072e631efc7027306c612a01d7fbbf57eb08d957487a7ce1961250194653d6ed87ee23f20d631ef854
diff --git a/games-fps/duke3d-demodata/duke3d-demodata-1.3.ebuild b/games-fps/duke3d-demodata/duke3d-demodata-1.3.ebuild
index 5374a6dda788..dbe45f7cb3f2 100644
--- a/games-fps/duke3d-demodata/duke3d-demodata-1.3.ebuild
+++ b/games-fps/duke3d-demodata/duke3d-demodata-1.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.3drealms.com/share/3dduke13.zip"
 
 LICENSE="DUKE3D"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="app-arch/unzip"
diff --git a/games-fps/duke3d/Manifest b/games-fps/duke3d/Manifest
index 2ca2f91911de..71f99761b8da 100644
--- a/games-fps/duke3d/Manifest
+++ b/games-fps/duke3d/Manifest
@@ -10,7 +10,7 @@ AUX duke3d.cfg 4314 SHA256 0ad9477e6185f0d812d726943beacdc7f7581f66c86640f44ee8e
 AUX network.cfg 398 SHA256 fe5806712207d39812906034b76191effc96d7c6efa9c8bd9081e18fab76d7b5 SHA512 89a5261453c5ad14caed7e768ef6a337f601afd2e02809987708cfad9f356847a3249ab7b1fb6f0e084874100afc1494d62e4d898f4433c1f4f763a1e822f26b WHIRLPOOL aad04fdd9e18f7f93a06a377b034ac07ea3df04a8269e50cd99e74fdefab4c24e6a866d4c77e8946903e90d2bd10edb8c868e135cd80e9c73e317667298a8703
 DIST 3dduke13.zip 5924374 SHA256 c67efd179022bc6d9bde54f404c707cbcbdc15423c20be72e277bc2bdddf3d0e SHA512 eb92daa88b4e7cfeebe1fb3d2c021e0a4a66262d0d6e76b5e27fe3cedd382e381d23b392a6d9adb42a418b9318e011c2d8adfbdc77d7c5371e61d8c091c7eb65 WHIRLPOOL 9f3b9620d042a0209c707e83822fa1acff370504c76a558a6c36452b7f7c701e8289f8b389146cdd6899f47783c318a81792a7702f68d1ca62b31fc2c6844921
 DIST duke3d-20040817.tar.bz2 1509273 SHA256 c0dd72030f9c5b84aea3e4989831311c94ef21641d6a1fdb0f557d04076f641f SHA512 a08aa07153458501fb01878769af9797460525015b34d743250e3f04f15ee2dcfbb4110c94c83912ba2435e6d6c48127e2d36c0dc29833e0f6f95e3b925b571c WHIRLPOOL b0e27cae348601980e18f95a6507bc3080a51fe4f70919127eefd9cc90185dcd4cb287e970c2fa1ecc4a6b04422804748a071006e1b4551cde73e4cd18abe40a
-EBUILD duke3d-20040817-r2.ebuild 2808 SHA256 bd4082df1c89b29386cdc4e38e83c9b2de545c8d96eecb859e8722f4d2735c51 SHA512 65be36db5d302c0cbc1289080a3e681d337e250a5fb3ad09b94680baed6ecd305b54a54dd5fba51dc3a50db4b001f74c952c7d985389ffb52d2eb0c762710f4d WHIRLPOOL 912dd841920fa4561949d7ffd66acf27dbd187d4d850883be8661eebc60540d48815b6a6c8c5edc4b4ad6b595866584c9982f2e6468fd51db6f0111c0e756e26
+EBUILD duke3d-20040817-r2.ebuild 2810 SHA256 300c5de28142cf3f2bede28c46e99eb46736eb667577967f7d28e86a8413455c SHA512 bc8336762f214e334cf78da61ac077f2760bdeab4e6162184b2fbc90e8f24377c45fead7b82ec13a08755521edc1e32c019aa9b59a5b39020c992bf075e6849c WHIRLPOOL b703d0aca3cd9a7a69454dc64853ad47b41f50794ac644fbd43a4661e8c9f6e17d571ca4ef1575db58df22490c6cad1d567ee0c3a629442aec34901e9bfea4ed
 MISC ChangeLog 3474 SHA256 ba713a18a5b4e59b7e3d09269ead951074b7a1eaf577047be1c9de7141f87182 SHA512 9dffd886b948e2332da6d9aa4dde238c7100e4b3996807cb27115480d3ed683d895867d43014e3ae3ebe729dda5a90cf3c5e40dd11e6649cf86c69ca98f4fb56 WHIRLPOOL c2e4dfff6f41ff875bbed0f9070d80e9c28e3e3aa869a8dbf8f5b04e12b4cf266ff994a503af9e716ec89408553ba39869e02c0c09e0efda9fc6d1e5c6b949f8
 MISC ChangeLog-2015 5805 SHA256 01a5375f1a44877093dda0a43789bb1b8e53b64f442a30d90b981bf34f04606c SHA512 4d66f0eae271f72773b81b71711b8f7ada33e7ef2b4160757d29cf66503e1e06132b9603ca9dc88fa61323d97ad4ebdf494b62a1ec2e775d9aead3d74e458d0f WHIRLPOOL 3f8fcc6f6e231f60528e9f07cb7afeac5260950a124ad58008aaa1d85dc80c2a87b2c4b94db628cdfb3a56d24f9ab9e347860e6feef2a61b8c47a56cf27f3914
 MISC metadata.xml 2851 SHA256 2ab2e90d4887e107ee7b3d34356d6e5c5b11cf3fc4cff78348cec4083706f477 SHA512 ae872ac33570fc2f067e50a29e4a9c8d51477d64cbf2596889421a09a07b78e9041d8c60abf33cdaa4f16a6079fc49bd4307493620ea8d47c74b37b4cc697d04 WHIRLPOOL 9a357e3ad3b4dd1ea5600b3e72967896f81e50bdf0ea1b33fd22a75038104fde024d9af7156bca5893bd647dc9835583fe673a455283168cdded811f4b4f460e
diff --git a/games-fps/duke3d/duke3d-20040817-r2.ebuild b/games-fps/duke3d/duke3d-20040817-r2.ebuild
index 01ee62481cdd..e75632b67acc 100644
--- a/games-fps/duke3d/duke3d-20040817-r2.ebuild
+++ b/games-fps/duke3d/duke3d-20040817-r2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="hppa x86"
+KEYWORDS="~hppa ~x86"
 IUSE="demo pic perl opengl"
 
 RDEPEND="media-libs/libsdl
diff --git a/games-fps/eduke32/Manifest b/games-fps/eduke32/Manifest
index 52fa4373c4c9..2e0534fedcd9 100644
--- a/games-fps/eduke32/Manifest
+++ b/games-fps/eduke32/Manifest
@@ -5,7 +5,7 @@ DIST duke3d_musopl_2.0.zip 266444907 SHA256 4f0afc46bfb5f38b1a1417a6145c0c548355
 DIST duke3d_xxx_1.33.zip 26586453 SHA256 c31713e6400a175a1bfa3bd369d132f8a8abce8915c113549f98262b9a84b534 SHA512 4783d159610fc178e748446b7a5f9c13d90e1aca3cef34deb82e99655b7f4a254f1130e16dbcfad9013b95bc07161d5c5dccfcc552fbb7a88404b4b9cedbadbf WHIRLPOOL 1e7c8a06fd8ff558a8f5a5cc37093fe055555bdfd296194935c986978b4630c225a1f5da7d54e274bd8a5258a4b518ffc2456c79f515185bfb6e403488cad125
 DIST eduke32-icons.tar 102400 SHA256 efce5cddd9a55f07824f5739831b79cff2ea6e508f0b17b996316533af925842 SHA512 797f76cfc0e253ce3364e80f70b616fc004811c08519020727871addc90c7780b475ee7769398e13859f93893ccbb916bd4229a39f4c119169a69231e6fd411c WHIRLPOOL 9815abce63dcf8e865c61610f1b04915ced9b29c65cd831022f5b6f261bd55efc700b6fd5ee2741332023b85682b08d3a327998c57be33846dffdcb60eb1339b
 DIST eduke32_src_20131119-4169.tar.xz 12228040 SHA256 1aaeadb7b8ac68d6a7e3b0cc568875df6a2b319cc7626c6a4d38cb69fa5f162e SHA512 6ab7babc18c80e111603b9b731f37963f3bfe2ee753a2e383d58a21e77ad5a561cf95f5392adcf76259e6ded2dcd5eb5d0fc484edf65ec6887a746c4f422f292 WHIRLPOOL 576e0f0e73b383fe221ef5db8b54889bf3e8271e361a0af41fd1a914d8a9be3711a9b536d668790013f8fcd0ea3c11b31b47bf333e685bbf853f48152e2fc194
-EBUILD eduke32-20131119.4169.ebuild 6365 SHA256 c521c6531a48dd25bbe19b3a8482dcda50280197c107e2e1fdec3e86edcd6c53 SHA512 104199879c1a2294afc422032257dc09a3233eb19fa8cc70972ada75f1f9f0cd372740670c20a8dafded7f5c9fd4de755c7b39f0f2c3624ebc4e95c8ff5e48fe WHIRLPOOL 739019fcf20d4b8e131c966dcb7a0d39d906e7eb04e22ba3623561550f2a2c31eed78c93f65adf31525451be2fece6decad4a86ab8090c7c9f003719e2d6712b
+EBUILD eduke32-20131119.4169.ebuild 6367 SHA256 4978bb4e4f070e73e27cb1ade85c8d9f8bc8203534cb03598b48cc12237d843c SHA512 1649360dd83cd3dc36744d868dddb5b6a8963d358dcf98a0d8d55df8a31365530896606b69b79ae9d370645fe108f5889e91a3995d9431cc1c5a28d1f7ee8309 WHIRLPOOL 8751eee76f80bfb7dd51819054fbc82d8bc5b86553802650e71818358a3ca1dd70c5284459e0888667b90fc67b95bd030d04bdb8cba2c458885b70dd84160eba
 MISC ChangeLog 2910 SHA256 6674f8c6bd2002698884f76fda8f030b451daebd88df5e52389f26d3f355f034 SHA512 5f4b8f6a83137997a860e94e66a77bf1cce3d4988efadb545bd87193c8018749e03396d4d325b81c639aa5c032e5645e3628cf8abfb04ec7070930ed9180202d WHIRLPOOL 99d8c132530b96d61726d81be3452315373b8e4b698a147248cb1e5fd1cdbd1736b7a7cdd982c8771960d3357b48ed816599cb50ac3a3d4d8a6aa0d4a51011c7
 MISC ChangeLog-2015 2540 SHA256 532544bca48d70a84fc23f55e7530d97caeee36d1a270ccc53cf89f51c1280d6 SHA512 cfbdaada15d3ae4a94af4b794feddc351c007068f41490be7cfdfba66f20ccfcee940eb4187a8a363b4413d9060b7ebff9cdd224e6609f22e44285f1758332ac WHIRLPOOL 3a22af3c7ad97c734367fcd1a55936f03f72cd26e239560998d04ea62eefdc8fb9463c6190ad035990dababafeab750f8015d1a691103b0cb94d2fc65aa1af8c
 MISC metadata.xml 1019 SHA256 065eb1ab3f8cbceb5307a3ee2537d14b101bedcd70bcea18850ac481204da66d SHA512 7ccc4e4e8280f550d73d63def883319f452ba18205aa9af98ce26544143409d3b9a7ebadb71a3263c31b28c49e18d6c955fd583f57a0fcf34acc933a7af4836a WHIRLPOOL 0a130467954f3cfafde4a5ac1a52cebf0698dd6367361c0c2968448041ff3e39ac6e0d76660ea47a4648137533eda669c1b9ef4353a350c40f8854da1ee402e8
diff --git a/games-fps/eduke32/eduke32-20131119.4169.ebuild b/games-fps/eduke32/eduke32-20131119.4169.ebuild
index 92044333b4de..a5884e14d059 100644
--- a/games-fps/eduke32/eduke32-20131119.4169.ebuild
+++ b/games-fps/eduke32/eduke32-20131119.4169.ebuild
@@ -32,7 +32,7 @@ SRC_URI="http://dukeworld.duke4.net/eduke32/synthesis/${MY_PV}-${MY_BUILD}/${PN}
 
 LICENSE="GPL-2 BUILDLIC textures? ( hrp_art )"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="cdinstall debug demo gtk offensive +opengl opl-musicpack +png samples sc55-musicpack +server textures tools +vpx"
 REQUIRED_USE="?? ( opl-musicpack sc55-musicpack )"
 
diff --git a/games-fps/enemy-territory-etpro/Manifest b/games-fps/enemy-territory-etpro/Manifest
index 64f5634f3d0f..8981015d6289 100644
--- a/games-fps/enemy-territory-etpro/Manifest
+++ b/games-fps/enemy-territory-etpro/Manifest
@@ -1,5 +1,5 @@
 DIST etpro-3_2_6.zip 3698539 SHA256 6778194ef4bcf81f0e976341dbc4c574d3d6372063375755c302c0c433fb4179 SHA512 366da5b7aaaa4b88da050aca95342425cba855182c59bf2fbe104252cc2241f79be629ae5dc15f9c396284910eb63721db01fc0aa02303cc51015d36263db9de WHIRLPOOL 1a773a6d3a89fa758006b7effa9b361f629bfa0921fedae46123229f394ff63c41d54825874b82490af8280ab2d348e814dfa10d825581e932d045f8e8f18bf5
-EBUILD enemy-territory-etpro-3.2.6-r1.ebuild 535 SHA256 239d30ce89392f170048451f5922e1308bbd63b93a23a57f8531db92b362ece8 SHA512 1ce93ef43a5bbb31ae048845364d6eb5026403e23be220f1aac56c7c7575894ba47b67d143e486291d8ad997a4b959150f89d55b77f982089c59355673fffbcb WHIRLPOOL 64253d659ab49b819d5efd08839b20ed6c6ec6edaa920c7cde1ffb6e846a656b79ab95bbcb4373ff2ad8c30961d9f9435aadbec3e2d062f3d20c1385728f5e10
+EBUILD enemy-territory-etpro-3.2.6-r1.ebuild 537 SHA256 10b6d07a3bc532c8e6dbbff79da4e8448d1d5cb06788d86fce959db32f412c0c SHA512 52ef43888d08678aab3a6caed4a080272b786d804cf10ecf266d0d969cb5845c0024cbe8d507df77598719f5ba5374ab04dce7878069fdc379ce3a4f78efabf9 WHIRLPOOL c3e92cf6cb9ec3980949e21377e6dc4128c89a72b55714a5bb5a3e2f07dd6cba242c6af66d5c1c8c3617adc498198bd5ee0e6657561e3797499f5b03ee439f81
 MISC ChangeLog 2814 SHA256 07b4de17363e1b5d53052eba214584affd68f3f6ac4e79a29ff5c15383d6da23 SHA512 a2dece4350661d213b2d704ae35ed75d9d88dc19fa2b8b18a1fb0200eeaad86a5e7be5dcf7b301b4f22dfe61f7b12d6c2dd5f48c9a2f705df7a3e597d4a051f5 WHIRLPOOL b0a3edeec5e70894da8f886409525f6a8d98733fcc2a05fed2d4f9475c74f5c45682e5dacbaf753f8405295a654af39cbd25c8b7562fe6aac62a9aa369bfaefe
 MISC ChangeLog-2015 3069 SHA256 3f51a5efa19aea186a17692e6f595a338f810c5b82cd4b843967cdb7c7de4f65 SHA512 29a3694e6008ade18f6f464c89452abe59e966516dfaf887452160d6e5359e0c1287b9af8d2cdcca596c21fd8ada422fa1c8b072920f88b3ead62ac8eefc7b6c WHIRLPOOL 016750c7c4fcba1d5d602a7274d66f725a800701fa4a8d310c507f7a36ae3744dac5b3986f31b23abdc7e378158f71f68eb9a4e97f36c94f8e321bbd1ddbbaf5
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-fps/enemy-territory-etpro/enemy-territory-etpro-3.2.6-r1.ebuild b/games-fps/enemy-territory-etpro/enemy-territory-etpro-3.2.6-r1.ebuild
index 2ffe2cd61eb4..d86355ef1353 100644
--- a/games-fps/enemy-territory-etpro/enemy-territory-etpro-3.2.6-r1.ebuild
+++ b/games-fps/enemy-territory-etpro/enemy-territory-etpro-3.2.6-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://bani.anime.net/etpro/etpro-${PV//./_}.zip
 	http://www.enemyterritory.sk/files/etpro-${PV//./_}.zip"
 
 LICENSE="all-rights-reserved"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="dedicated opengl"
 
 QA_PREBUILT="${INS_DIR:1}/${MOD_DIR}/*so"
diff --git a/games-fps/enemy-territory-truecombat/Manifest b/games-fps/enemy-territory-truecombat/Manifest
index 7fef54429ef6..ab52a85d9414 100644
--- a/games-fps/enemy-territory-truecombat/Manifest
+++ b/games-fps/enemy-territory-truecombat/Manifest
@@ -1,6 +1,6 @@
 DIST tce049b_all_os_fixed.zip 6795533 SHA256 b7eec5ba59e969c39525272236095f1e4635c9301bae716a8a4a39bc65163c3d SHA512 8814f193437551c29edf88087229ee813317df10e264c3a0200942ef7c1e876aacff4d985d28bd59d1b3bd9589c86ad034d59a8f434cb443a31e07db9b0562da WHIRLPOOL 4e3919f6a326ef00d17f9217818760a7442371c02c6a58656a97fb239e825a445f9bcdea47af25c2c0a784d0762d77129352273daffce385b669d8898a89f700
 DIST tcetest049.zip 472749193 SHA256 73d0fff098bfef196d6efc4bb2f0635ab8da2ebe19b5ead5801b1664d3b4b4d4 SHA512 9c5dfaad2f427b4fdc3fa0d5ed7b88e68776167049e0fa75e72a84a6735ff1e97926dfd0d5c290351ac0eb3123018afc1f478d8c0506b4c8ddfa39cc22474985 WHIRLPOOL d01945afba803459d78002835267a64d4043a168c5da3b64999574954b9fd678354b67c9ebcb5ce0f84631b4b7de1425cb868f244d63ff72f2d22635db96abee
-EBUILD enemy-territory-truecombat-0.49b.ebuild 842 SHA256 0a38b64f65aa7362266ba339dde32d50b1db9a27dc3ff8ba0d3f160f843a2908 SHA512 0d16749eada0c6b65c907ba7419ff38890b258a13ff0ed701a0a172dacdddc89e1aa4c0f9a07964211a49dabf4d83fd048bb2e2bdc1aeb3547be8e604874a15b WHIRLPOOL ab812869e395b55b6b988fee3dd713182823976d4e35b569252266e3619d033e0220bc350e461daa92c339f6d842a9c98783e3fed0743b4545e927f2b4744437
+EBUILD enemy-territory-truecombat-0.49b.ebuild 844 SHA256 5af08ec63e663911c7d55a4ec769eedd72a5830e2cd4fb3525ed0c9b79222a4f SHA512 b8311768259dd3f2eda7096947ec3cc4443ceb78b85e03cd2474e7fdad0864be63348c24737be27e07306b1556e92a187139cf1c4dadc13d85426639031cc14a WHIRLPOOL 3686a054bc58a7c68f93cbf04513cbea1dc6e8cb0b1a6227ee9eafe842dc66519c6a02534ee21377c905d42fb46e351e7d27cad544946418f04065b7de6b00f3
 MISC ChangeLog 2659 SHA256 0446d4fb1e09120c6b116c1f11b411dd85dc3a30aac0f5fa733b161cb05d08f0 SHA512 4db1a523b29cab99936afadac22e1085a3234bddbe84d997f0b211597177a015f1cc194d7746d99e0ae58a96251b90ac3867c892a0b4584178de6bfaf0fb8317 WHIRLPOOL 022268d8d2042f4a346a952756e7397df70f77547d90700336868b6ce7ad14c3f62f3e1f2d3d201d97a02686b9f3a2ad9ceeac4f8f94530a89ea76c61f66a2ab
 MISC ChangeLog-2015 3231 SHA256 2f09576d379a4a2908b9047dade15a53ba455b13c85d9a2dcf7f1e15ede4461b SHA512 af4e09fa2e910d4909b551bc1f1ef0aeb55e544f7d2a1eee92c1f1643f9a4e2c2ec7a1045199ef06916221d1128b79bb753fd1becaa154ecfd4d93dea176fbc6 WHIRLPOOL 6562a3fdcdc1c1f332ac1090840a89793e4bd05096a7598411e90629af3e2c734d966e8170c21d8894670c902b38c9f3a762133edc7b761de866cda4bdfc14af
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-fps/enemy-territory-truecombat/enemy-territory-truecombat-0.49b.ebuild b/games-fps/enemy-territory-truecombat/enemy-territory-truecombat-0.49b.ebuild
index 6d4d7c38c4ec..ec5f4920f712 100644
--- a/games-fps/enemy-territory-truecombat/enemy-territory-truecombat-0.49b.ebuild
+++ b/games-fps/enemy-territory-truecombat/enemy-territory-truecombat-0.49b.ebuild
@@ -18,7 +18,7 @@ SRC_URI="http://dragons-perch.net/tce/tcetest049.zip
 	http://dragons-perch.net/tce/tce${MY_PV}_all_os_fixed.zip"
 
 LICENSE="freedist"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="dedicated opengl"
 
 RDEPEND="~virtual/libstdc++-3.3"
diff --git a/games-fps/enemy-territory/Manifest b/games-fps/enemy-territory/Manifest
index 299be72c81c5..e5d32ba99a13 100644
--- a/games-fps/enemy-territory/Manifest
+++ b/games-fps/enemy-territory/Manifest
@@ -1,7 +1,7 @@
 DIST ET-2.60b.zip 4143401 SHA256 6fb77e1ed0314b2da5c2a28807392ac638204faec8ef86361893937f182b22f8 SHA512 f86d0d172a170cd894f1c60a817d2159768bf7d03cb0146f3470edd54828096a62e890c24bac80a5851adc9356cb2716d5f0c756fab063a9c0eb561b72825b84 WHIRLPOOL 6e4718051b77201b5bdb87efebd492db46ca83cca380b7f4bac2833d3f95700a39801cfcd5b025ed2b4c51d6b3140b7a2021ba8e1056bf4d100e67204768170b
 DIST enemy-territory-all-0.1.tar.bz2 876 SHA256 8c3466db348eccd34bd108db57bc6fb656a7dcbacd190cc331fd8caf74c7cb64 SHA512 7e00ac4a30ebbbc5db646e0edf6683d8e4d99756c1010922ccfd16a3dc27c0a5b23a91c9f3adb3e120bfcd5f9a3302a466a86888ff1496dda29a3b09e87eacb2 WHIRLPOOL 1dec8052196a04a3cf834636bab54a15a0eceee2eb52df888a533fe4f78a3f774eb122d6b14d65738b9084b7d543d26ab3d9ef14cafd63a1ba68e50e60d63307
 DIST et-linux-2.60.x86.run 270965248 SHA256 41cbbc1afb8438bc8fc74a64a171685550888856005111cbf9af5255f659ae36 SHA512 7321a3d831dd375c49aff81f30098c5201880e9fc783a25dd7dee3bd2211372e0e07a482e6c78982bc1f27d62bceb769dffc30f820c3144b4a64268fd9ef5cfe WHIRLPOOL 43e4cdced441add2524e07412d06a5530627922b14549f847567b9e558eb7652f7a7c8b6dac26b5ed6c18f55597a8cf898c950026dcd0577731d86257ae59162
-EBUILD enemy-territory-2.60b-r1.ebuild 3268 SHA256 30972bbec68092a05eb129309b28c31430687b72f7d4dc0fdcc512edec6297b6 SHA512 b4f5f7d0b34006b37300406dafc5a2274f5005b9d2d599b4706d8bcf55b439e4c189067f4f54e0705259817b101244d833f31ad2c9b53806e5f7c0585963a2a9 WHIRLPOOL feada902bc99730d2619dcb47d475e79b51000539cfe02c29ccaa38f76e192a7ce805223e44bdaa713e82fc8b14a7ffcf9cc8ad49cb7315e22dfb6f68fed279a
+EBUILD enemy-territory-2.60b-r1.ebuild 3270 SHA256 430ebdef706e955ea12c4881f7b77b6df36761ae43070267322e1010dbac664c SHA512 1916e4eac3058a7df30bf99255cfced33a1f57a25d9978e4d53d15417b98fd3aeb53ca21ce5a5eaa69e2b602d2b58ebe70471f63ab66cecf6c00cb242cc7f981 WHIRLPOOL 6b3202de206a6656e96ca71c35b1b91073155d94dcf5d7bb1b51d03467360fed67630ca579a5408436225a9a0851dbf5dd9195263fb17d2dc4d4efe4ceb37eab
 MISC ChangeLog 2705 SHA256 692a000982d8d8135c296cfa92defb6f95557537bec9b85c5b1a0ef0039750b3 SHA512 f56957620706f609ef18184689119a0bf4ade7e175690264712b5625ae0b94586faf3aff6c279a0d0bb447116005c0897ac1b2d63bc4e30dda0dc624687d16c8 WHIRLPOOL 8161e4c9dca074d4669631ee2b2147749dd6f3176cbfe6095eba7d5e98e73805aba1b74c36488e17e6b70c727b64bc8f6f27ad9a0265ff38afccb12ccaee9e6b
 MISC ChangeLog-2015 9132 SHA256 3751e677a0f08b9da4c560499b02eba8f0ffe2a070bffad9f7f39ec476e1f2c4 SHA512 85118986d3aff13377a12506a8e8f51585c0175771e5d680653c93a508534ecd93e3a035f42f6846551d36707600a7bd209e32e99577cc09947a1b711f359ae0 WHIRLPOOL fd2702c5f4fb40ee9394520f3154b072f48b22d671ea7260f4fd446113983a9a3b9493bb2bfec5f31af2d04cf3132ad478740f15d66d0df86dba94fd7b923567
 MISC metadata.xml 1044 SHA256 e35f8a9f18d8b1915bb9d5b809c8beb318a6193e0a682d9635a604276d723bc1 SHA512 8ec59ef948ae9471580cb39a80bb99fc1b524c45ad60f031560fde9f2358998335e414ba09fa49c9909a005da424db84543a0b39a8b68479c097d392c2ce9bb9 WHIRLPOOL 47dddf0082ae80b261615aaf072c63759cb4ad74a09e31318070ae0dd1e28fa7edd40d90ca60c49aa8898e30503e2b0aeda4236e9acaaeb86844d4e8b7d48471
diff --git a/games-fps/enemy-territory/enemy-territory-2.60b-r1.ebuild b/games-fps/enemy-territory/enemy-territory-2.60b-r1.ebuild
index 62ea2448f19e..0f2d212e0452 100644
--- a/games-fps/enemy-territory/enemy-territory-2.60b-r1.ebuild
+++ b/games-fps/enemy-territory/enemy-territory-2.60b-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://3dgamers/wolfensteinet/et-linux-2.60.x86.run
 
 LICENSE="RTCW-ETEULA"
 SLOT="0"
-KEYWORDS="-* amd64 x86"
+KEYWORDS="-* ~amd64 ~x86"
 IUSE="dedicated"
 RESTRICT="mirror strip"
 
diff --git a/games-fps/etqw-bin/Manifest b/games-fps/etqw-bin/Manifest
index c6eb0557343f..69bdb166a598 100644
--- a/games-fps/etqw-bin/Manifest
+++ b/games-fps/etqw-bin/Manifest
@@ -1,5 +1,5 @@
 DIST ETQW-client-1.5-full.x86.run 556383725 SHA256 827395c5ad7bff36a8456f7f210ab43b8cc2b0d18e9f366d15ff4f11eacfc4c5 SHA512 32bb3d7ef47790ac6b790a5a5d61592c3504d034372254102985e58dee25b5d200e507330226bf8458c628154c246b2abcb08bf550fa044189c4c8de813af0c2 WHIRLPOOL 9b6dbdb642241972c75ec854c0e51bdb2f0f1b74b9f56a2259b2864b83f74385f33a283b59d20f4a8a744d0158a5471bbb8459bd18aa510b7197bb284ab0cdf2
-EBUILD etqw-bin-1.5-r1.ebuild 2010 SHA256 d431607f4a4c11534a0d3cf6c052d91227c59410cc656df5efec2ff3c30be5c5 SHA512 da319b9dd9b95f85c7b6d8816869fb5e211092494231719f1a147a0d5a29303c2d3b5928a09c5e62b04b653546c219d409566d299b9bbb1fe7a2f05876142906 WHIRLPOOL a146c50ac671156f2f42a24daac147070e50f36d2a1e642305a4112f07b674c655e80e5671fd0ddc0ffa60a048fd01a619953eec3e2ba5f8f704c129fb77f614
+EBUILD etqw-bin-1.5-r1.ebuild 2012 SHA256 3e33871e25d4e01d064803e1d5c307bbdd543655aa4ee7730f6b4290882a79de SHA512 6314fd268f98d28fce833aa8c3cba5be60ad8d50372a810cfbf3f29bf04903569ca82016b2ff8e7bd063a123c90b09442287afce1fac20c036f94f73562f54a6 WHIRLPOOL 4822519d3db668eb0d4b285c4b0e889ea712379e399c5f66b23f5fdd0789ee40ebcc6627ec84efaad77e8a097f1e4276ad510a6fd5dcdc751726287483d8f1aa
 MISC ChangeLog 2557 SHA256 ebd217f8b3104e371231d6bb43581db21b8a80298d558319d83905f30af1b2c9 SHA512 0f752b85e10dfa0620e2203d47a84c79c448a621fd1e4adcce711ed794fbe542fdb290760a9584d02a19b934b8e4972816a14567fd81c3b000613e16b60cdaab WHIRLPOOL 04d018447f0f0e364130b37915604b868ea9d0f9b24d28d0e8eeb8393b658c8b10652c325f3f9a4da1ea1fa4b31abaea3e76e27c2e4fe4717163a8326412c693
 MISC ChangeLog-2015 1540 SHA256 ffd3639ffcf79b0fb440f599ef0b6b6a082a27a39af7d50b758feda283609f05 SHA512 593514fa92e8c6243de8077dab948aa169e00cb0433a76089f67b673d89d39d81c3463ad078144b7e4f1801b7f9135f3a4eea4ff013af8b5d835d18930b77de8 WHIRLPOOL dc9a7f4d97d335ef03cbdad77af3f421ee7f2572c77ed41b07e1b2f32156fd35e3ac2692ce8a0f4dca42c400f9cc772ff3923b40899068883ae9ea45b0e6e5ad
 MISC metadata.xml 252 SHA256 0dd0e558bb7ccc4f24cb9c9c43790c108e559f3462861b2ff6eb267a345beaab SHA512 90798aff93ec7e3881b882e7b10bb1680e8cb7d82b0ef4280e562ab0c9e8a2daba8afe57333dc64697322267a4b651c00ee9b4fdeb56278ff70c073da7b91638 WHIRLPOOL c6c72f145f4ccc4863ad4c1a236eac601fb00f0e9550568f98d5e6f5eeb16f361b4c18eac8d80a1534e398fac595a6819a86297164be0818d04de6d643f01d7c
diff --git a/games-fps/etqw-bin/etqw-bin-1.5-r1.ebuild b/games-fps/etqw-bin/etqw-bin-1.5-r1.ebuild
index 9312c3b33f71..8270e50c21ee 100644
--- a/games-fps/etqw-bin/etqw-bin-1.5-r1.ebuild
+++ b/games-fps/etqw-bin/etqw-bin-1.5-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.i3d.net/Games/Enemy%20Territory%20Quake%20Wars/Patches/ETQW-c
 
 LICENSE="ETQW"
 SLOT="0"
-KEYWORDS="-* amd64 x86"
+KEYWORDS="-* ~amd64 ~x86"
 IUSE="cdinstall"
 RESTRICT="strip"
 
diff --git a/games-fps/etqw-data/Manifest b/games-fps/etqw-data/Manifest
index 68fc46d1e755..f601f1c15a50 100644
--- a/games-fps/etqw-data/Manifest
+++ b/games-fps/etqw-data/Manifest
@@ -1,4 +1,4 @@
-EBUILD etqw-data-1.0.ebuild 1291 SHA256 a0a7740a355910f34d953fd23abc25b35c10033c8887a7944d2256de9786cb4a SHA512 ec6be32bcc747def75b89d5400a679e1fed2f3b0b9b81da1acd78a8079c60414f448afd7e0a583c3735035d3754352f7d892b972f4ed4c9b64da41fbf40b4dad WHIRLPOOL 05a4ce4065beb53bc73b6f10bd0dabcefa1d604e84c1062aa7194b19b4d1cad52d22a4e07c753228923edb5da4507e58f377803157052edc4c00384a6446c5f3
+EBUILD etqw-data-1.0.ebuild 1293 SHA256 3295a056d1e8b45b80a4d7ce5efc00064ec750eb09a904319aee752f0de97823 SHA512 03b52c62f3b7944027e40e665ece3d9e0703cc7091443e80ce37759df8077a4d24a4da9d25d6386eb6319f237356a008334fc7d5edcd9e8a4ab4aaa682e0ecc3 WHIRLPOOL cb0fe0c1c436af2b8385619245fb3f12d544e86cebd836eedf378fffee7b3364e5a4f93e13ab0b91a67a118d3d1dd89b8de33ebe4a484c6bf31ba8cb07c663e2
 MISC ChangeLog 2554 SHA256 ed30f566258b7d7263b9ccc03cd9d81d06efea2c360d8bb191c45db191c5e621 SHA512 2d6d227308e4eccc9759c7a48d51b7a85db5564c574688977261b05281040d4fda7f8c41fa15503a5eca2a99e138cb2da8d46c96b10f18810d50bdc0283b1d79 WHIRLPOOL 7e4d188b4c2e6ec9f7c0b7d4ee4bfb90d03197187278f518114a278fc18cc42b5759a64086729a953cd83b44baecacfa4736085de0d43293cda011f848765759
 MISC ChangeLog-2015 955 SHA256 edfa95275508132dfb28af3db623fa738b8d1b920b2f493de009004e90ac8de2 SHA512 85d5324009aff61399cb495eaf52d21b34c20cbf3c84c2d4a0f6718b2d576949225e53656ddf4fa070c23ceb05b4f17ff7146a72718114bfa29458921370d192 WHIRLPOOL 1a70e6af4d05cfe2796b6fbec1ed946a64c9a18e1914c501f5472a885bd53e10f51dfc01f7cca09cd898b2ad1ae0811a1257017cf7a244991a73d5e08ea793eb
 MISC metadata.xml 252 SHA256 0dd0e558bb7ccc4f24cb9c9c43790c108e559f3462861b2ff6eb267a345beaab SHA512 90798aff93ec7e3881b882e7b10bb1680e8cb7d82b0ef4280e562ab0c9e8a2daba8afe57333dc64697322267a4b651c00ee9b4fdeb56278ff70c073da7b91638 WHIRLPOOL c6c72f145f4ccc4863ad4c1a236eac601fb00f0e9550568f98d5e6f5eeb16f361b4c18eac8d80a1534e398fac595a6819a86297164be0818d04de6d643f01d7c
diff --git a/games-fps/etqw-data/etqw-data-1.0.ebuild b/games-fps/etqw-data/etqw-data-1.0.ebuild
index fc2868595b43..37737ed0d091 100644
--- a/games-fps/etqw-data/etqw-data-1.0.ebuild
+++ b/games-fps/etqw-data/etqw-data-1.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI=""
 
 LICENSE="ETQW"
 SLOT="0"
-KEYWORDS="-* amd64 x86"
+KEYWORDS="-* ~amd64 ~x86"
 IUSE="videos"
 
 S=${WORKDIR}
diff --git a/games-fps/freedoom/Manifest b/games-fps/freedoom/Manifest
index 68bb4e4812eb..cc9793672183 100644
--- a/games-fps/freedoom/Manifest
+++ b/games-fps/freedoom/Manifest
@@ -3,8 +3,8 @@ DIST freedm-0.7.zip 4777958 SHA256 379e29e4ee2355d150fba04507c14544bc8af4cc5449a
 DIST freedoom-0.10.1.zip 18496121 SHA256 7d20c4b458b6966a58f8f1d9d67db67999364a66e67616e2c320d01b396338da SHA512 a98d400267801dfdf67aa035def6d62fffff1c3a2d1aebd482929274e1f86e05e79c9cbe528a80d5c87df7306364ca74a3b03674273a0079bad724e7b23e38eb WHIRLPOOL f7c926c80603c5631b00497195c4cf8e16d01bbefab4af48957d39683047259b50246381ce486c27fdae46ea52100c8dc03df9a86680562fec1cbb60501657b7
 DIST freedoom-demo-0.7.zip 2800744 SHA256 4caf386adbf217e3c96d1d8f18cbdf5335caf7c1e88d64cdc44065aa92785286 SHA512 5a101da1c473f0bec899db03ec8c8afce5c95a6c0e041dbfebe95a370e7d64746c3f1ff0304535b58ac766518e282899887f6bad415e3519dd811fc39a0c89d8 WHIRLPOOL de48bb1c19a557ef1a4bde2839a5f9c95d10a0c4364bb88f363cc0b4ab09033a19d4ee656e190a2b31d3e1edb194f24a8e80db3284a4692e3b16c442ddc95050
 DIST freedoom-iwad-0.7.zip 9697891 SHA256 f8f75fd1909801fe42de0e74db9adcfd33f753374e4923bd93e3d9a9b802ab1f SHA512 7363517097be2bb584a8481b3c658dc046dc35f8508cbd79af602e3d15b1f570537fbf1b620684e2931d644670fbb453064ab5699f542888a29cc1b4ca295b7a WHIRLPOOL b55fd43624f21a2f2c16c8f1e56ccd6e5d5c324c381a30a258bfa36c50f17e5b905fd552598cf2ae3f83bede5a0697f02959e1533e5bd5d2e62ed2b2b467c211
-EBUILD freedoom-0.10.1.ebuild 1102 SHA256 98ed44fcb8a44435265fb1df0c507717168cf7026222d045ac215174a2a11dba SHA512 99e0508878d31f488bd5f26a36e0da2c0947073e4440d543b680e77c02c54e3f3a050bbac0885425b9452528d37cac34e94f48314a71635d3aa5dcf8bc58b1e5 WHIRLPOOL e67e0510e0d78a78ccdf6be4dd2931c06531e612f2c47480dde55658d6af4bc2465d4890e63beda46cb31ee8ec2f6e83f143b78987aeb5ce370e54e06066b47f
-EBUILD freedoom-0.7.ebuild 1206 SHA256 ded6aee660084f7287d090e278d57061a099651d3acdf4e06af38e0d9f8f64fa SHA512 78291387646d965dac8e74d43a1891bd7d6300b927af1a7f2790895ba181cec37f28057c72ca73505e47ed788517ca629826514c738dcecae9343dcc02a6092c WHIRLPOOL bab6b99e7dabe8d6b0130b99cf47a0da44a21997895e464ff8e81e9227400c7230e0980ceeb40991d50c93e53351898a8978038ac4450b12d11bba961045581e
+EBUILD freedoom-0.10.1.ebuild 1104 SHA256 52b6c51a64eb36ed8e61e0318b4b08c767204b5353db9636aec75bcbb5d98bd4 SHA512 c7e6fb5e7b1fc77d0404093945f34467befd45295c9a4948c60ae7497c1d326276574e904673338ce160bc475c903307d6dfc205eaa8eb4b78aa8d72a062d362 WHIRLPOOL 14e0977c9fb8919e8a6fa5e8a64051166f9f09a300f337d918812b9eedc3778f9897a6460bc0eb1a01d2d020df5b4230741af1b7d5b2b7df64fbf802065abb01
+EBUILD freedoom-0.7.ebuild 1209 SHA256 d7c8c01937651d4debc5dbf614579c2f0cb90a6df538c401db148335e3e8358a SHA512 d51c34f5a589a5cfacfb5c80e73c1c62b7be865ad085aa7af2acd8dfbeaf0dc751489ac644988219034c45a65ec8271340166bf057abb0db8f7d6d0e297dacfa WHIRLPOOL d5cd581ae0aac48d9ec3628543a5a6b6cc2f5855d07f99100bbe45c1a0b83bfa41a614dabe9cafabc5cce98cc6546bcc23b8c46df8360791f5f1a4e22776e91f
 MISC ChangeLog 3303 SHA256 c16aaca4788bdf803da995eaa5372169d8aad9594eb171aaccbacf104b5f1e20 SHA512 78660fab19ed8f7010ef661dce09ceaba7945f201a477e50a9a4d628ba3e5b1972773326cd80821e52ad9a9517e5d19117f0a4af356638f04048795f4803030b WHIRLPOOL a912e00a856dc5221679be4081df39531f8d169a0a60c8487dbd5b616990ae69c6e55297574b8e6e4d99b7b7784823e327492009988e9ad3154c302af1277c81
 MISC ChangeLog-2015 2710 SHA256 002ef6afb4d2e6c87767564d8e6816aefe78bd4e798d99b8ac1143f1681abd00 SHA512 d0a345af7768590efa01cca4b422e6f0513896a8d7b72dd12bfba2a40d223a94fcb5bdc2b5cc0ce71ba6d7b963b64d370eb5335de0e8b68576d28c767c39919b WHIRLPOOL aaf1a9a412e40744bf94734a55f482de342ca30b780e7b58109395578c4b3951453e5865996f9a27373c67d09d37d75c9c23f1d123d9857cc6c4ba0700bf41bb
 MISC metadata.xml 345 SHA256 6f03e652bd09387ca7fd719691a46adbcfead2a49b5653c7adbac64f577f5bcc SHA512 d830ba46200839ec37d298883c566cc63eafbc45ad6683ef028d4168e0bd4aa245fb13d4c5e84eb5113ee37db85d018f8ef7222da00682524157ff5d29a6da6b WHIRLPOOL 239e76433e601ec9d9a70d6184f4d78518885a5f81d839b94d93138d1f3da42adee445459b967ec766d71d6c4e9cc8cfe60d98b016dcfd012707120025518b2b
diff --git a/games-fps/freedoom/freedoom-0.10.1.ebuild b/games-fps/freedoom/freedoom-0.10.1.ebuild
index 48aaf46cff14..4fdffa8813eb 100644
--- a/games-fps/freedoom/freedoom-0.10.1.ebuild
+++ b/games-fps/freedoom/freedoom-0.10.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/freedoom/freedoom/releases/download/v${PV}/freedoom-
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE=""
 
 DEPEND="app-arch/unzip"
diff --git a/games-fps/freedoom/freedoom-0.7.ebuild b/games-fps/freedoom/freedoom-0.7.ebuild
index 33ff0b3f0ea3..5f2da28d90c6 100644
--- a/games-fps/freedoom/freedoom-0.7.ebuild
+++ b/games-fps/freedoom/freedoom-0.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://nongnu/freedoom/freedoom-iwad/shareware/freedoom-demo-${PV}.zi
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE=""
 
 DEPEND="app-arch/unzip"
diff --git a/games-fps/glxquake-bin/Manifest b/games-fps/glxquake-bin/Manifest
index 7b0fa283ef51..b3e2e7ff32f0 100644
--- a/games-fps/glxquake-bin/Manifest
+++ b/games-fps/glxquake-bin/Manifest
@@ -1,5 +1,5 @@
 DIST glxquake.tar.gz 164094 SHA256 975d8a59fa280dab7528d5afe3cdab217e0c09423f407dbe609478efb871f9d5 SHA512 0adb92dbdc8b3130bef7e46ad95a7efa6ddb3723e3e8891cacc3c2e46bccacb6235f688e12b8a1f35099615b6683b1409b2e380fd4278e0827897b2e0c8f3090 WHIRLPOOL 8c78befb5d03ce3c180dc4c9031c69be23c0f87c566a35892683454c101c4631feb74fc63538c16b4eba027fbe26dbbd89e5f13dbbb9a86fd597c9daac6bd1b8
-EBUILD glxquake-bin-0-r2.ebuild 1154 SHA256 500f14451895fd00ab85a662606bad5cfaf1b3a595d86a126cf3467999e23a5e SHA512 1cf70a31c64566006a956a8087aace6ac5563de66dcb60b0a6319e7f8581a220790377d8d57c7e83b56787f99ee0de1367f392d5ce35b20e5564ad71d945b2a0 WHIRLPOOL bdf93cdbf8c711dbe10bb3960abcf5e9607a077dbf496baab80fb572aab4f0987cc1fea6fbd77d9bc0f9ea2294ee157ddbe24d62408178fdfc7c447da6f1901e
+EBUILD glxquake-bin-0-r2.ebuild 1156 SHA256 fbcffd473f84676985e11e926af6063bbc687eb2acaedc172ada5a2a5dedda74 SHA512 038f27822d1690a4ea98075a06f7d2914d60767ee501caf5526f1909d2917afb4cd415d8b7a1301d0da13623ee56a48c6403541e5c11737af0ce6b39a484821c WHIRLPOOL f626906bb26c0fbf437524fdfa7dae7145897948f47a1c64330faa9ad3447909cd71c0fae65ac68f037f34249e4c945f93a925e7be39825f7650408b83b14c3b
 MISC ChangeLog 2441 SHA256 5e942719b46f217f3dbb302b7c4c62a0508fb8e28c47cbf9a04af3b174d0143e SHA512 314b94f93a55f47bef4f2b4ec38183f1000db4e92cc18bd108257213399c4d610c78dccff9653b217f489519567ade26b5ae3845080c637dea36af86bd1cf3f6 WHIRLPOOL 3869289405d67f1161a03579677c22cc6d346ef1c2cd6690949a80dbb3ab172cb485271e552a9d7f39b2c148eb79b72faf589069e2a98532dafa922f85f0b5d5
 MISC ChangeLog-2015 2057 SHA256 ed84cafa3625fc811c0733e3c3039b0d8a215f5aad00a73ec1d6c123b247d9da SHA512 7a72fab2f6db3fe004c8c61a0ecf8a6dac0ca568c3e7a21dc75f7b147e4e50113b5a00ba63759315b50dc8341eea3a2dfe635a2c0d10593c4d3ca1204d5d2cef WHIRLPOOL 93366eeb87eae9b608512af6ae4754c69582f0251795bb54a7cbfb5dae1e2f5cfd4d362d3a68c2f9d296829c9a9229917567c801030b09bd6355e0c5a1786b45
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-fps/glxquake-bin/glxquake-bin-0-r2.ebuild b/games-fps/glxquake-bin/glxquake-bin-0-r2.ebuild
index 5b7ec6390df8..16ffdde57574 100644
--- a/games-fps/glxquake-bin/glxquake-bin-0-r2.ebuild
+++ b/games-fps/glxquake-bin/glxquake-bin-0-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.wh-hms.uni-ulm.de/~mfcn/shared/glxquake/glxquake.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* amd64 x86"
+KEYWORDS="-* ~amd64 ~x86"
 RESTRICT="strip"
 IUSE=""
 
diff --git a/games-fps/industri/Manifest b/games-fps/industri/Manifest
index ce4559d49dee..5fc6dd5662a2 100644
--- a/games-fps/industri/Manifest
+++ b/games-fps/industri/Manifest
@@ -4,7 +4,7 @@ AUX industri-1.01-ldflags.patch 840 SHA256 a637626ff4d60619d9dc4751af0ce35dcecbc
 AUX industri.pretty 42 SHA256 127a00f5ce37b1502a09d049d9ad32e468c398ba0a98fbf66142d1408c382ba3 SHA512 4cd0732b3a9cc3a48a759b68b03c249c854ce90234984ca770f8e3fc61e7bd01651012d64320d9114eb4567ccab254b183af15bdce51dee25a71c35613013df1 WHIRLPOOL 26d52e207a2bc52febf5c8b722e97da7d287492f97025150e4e1db5ca0e84d76d4aa947d57ecf8eb978ae7d67ce905ba428f264d2dc14364f67275d9352c4483
 DIST industri-1.00.zip 30339989 SHA256 6c0761c6eacb501fffe37f9be4b9e2ae62074f8714c4ef36251241aba6b90652 SHA512 e0eea9d881819fbcc039d91ed613bb4603e76302c892ed315bf1535b023173b742f4b881dc345f9eaca255a5531e3afc5584c2da948a9c6127c9a815a6bfcae9 WHIRLPOOL ccdff4e5323bfb0cc94fe8809c7170b2b5f2153084536709114f39ddc4f2b3246a22b9022da3ac9630332987692711304e65c56eeba4632cbfa52f68c26824a8
 DIST industri_BIN-1.01-src.tar.gz 1086838 SHA256 b702b819c0b99cc9a7f8e9ec89c9a58812212826f592e3594904b4cd3cdd09f8 SHA512 023dfcc72faa685a042afcf66b21e040b21c881f3d936af9e4da3e7836320a262c014296ab6fa564d93038c34a106f70f7cc8dd760c6b79e11689df92bff3625 WHIRLPOOL a02883991ceb2980ea1f509202987dd9c3c0d674c03b4d687d0ab3780b0ec58aabf60684fd9b63004b8d0683fe849b06ec2d81a1aa59753041350b89dbd74894
-EBUILD industri-1.01.ebuild 1906 SHA256 73f625c63e255a408d31c74d0ba24099fd2151267335de1294f92d0dac70d385 SHA512 56527881b478f50b7102c0794e136699cdf7d1c13c9e9cd18f0d1f68ed81990eff46bddb2cdbc462b4adc0ddd143f8f0f4b23c3aee75ecfd63331cd9dfac5712 WHIRLPOOL d9226b0ff8fd7ae75823b05cba5b918669a1f57272633430d527f4ab97974b40d6ed7065df22c161117867b22517b964ccdc96c1d53f01db56b377008a8e0302
+EBUILD industri-1.01.ebuild 1907 SHA256 7863d43863b2c2345ea2148fe9927e87436ccf391399b1dd4c7bd4d6fce1e955 SHA512 77baac93c436a97aaa914d8600a9fbc941bccbebf99c0319603514dda4849a38d1cf184070467b347295e19f73ff320220a621fe2ce4137cae15cc1a9ad9002a WHIRLPOOL 13aebdda0da15a1e35ac55e3557b95420c8edfe05a4dc805a8860c29b385c28057de4c0d5f49b60dea6a413a2897d5181956e6fcb6fdc5addf504a961c12cba4
 MISC ChangeLog 3016 SHA256 d86280042e94b1aaa9ce895142e6bf7650cfbc91e2cb67d4e52e8347806fa560 SHA512 f61e08c584a57dc52c63ba4a9de9280c2450789db8b13944283588d55c408ab477d57ed21a460f5372f25a277e1d52b6d851761c9bddf8e6c998d80a0a3c4c38 WHIRLPOOL a0ba2304daea77a2e48ef8acb3219f51d768521326e06042670fda9af5853e91fe2006bc7f6d00bf7ff6f0e9e1494eda7ce15803181af19f6af3afdd22d388ca
 MISC ChangeLog-2015 1764 SHA256 91b8a3e9e94bfa43053ff687686e0fe7f3256d7b025728e89ee6362df7fa0d7f SHA512 0e8cf9d55c35765c6078d5d89689889c84ab0a33865dc2b595e170da1947f483e9a6f50ea411194b158fb466e877d3c04bde57ec616001cb50a981ed52b5ca06 WHIRLPOOL 5742f3bd93bff3a144a6515ba7e8effe7fe99f532a6b78347a81782873ef4bea81619766e7ddf81c354bed8db005f797192c2e0998624eb592016d89c7b05d26
 MISC metadata.xml 753 SHA256 5b0cdf5b998b1ccca847cac4c6efc167f7d12b9e386d2ab452de3e1a679fee8d SHA512 fe652528480dd111ae034805ffe48a75682fef68562e8ad55218f0b41b3ab05fd99d1b33b0959a09ed3fad97fe66d8171efd8e79f5472956aa42ac3263e6f9b0 WHIRLPOOL 56094ca7a7467efe2b31a4dde900e2cf0c83d37c861fc4f9c3363e3dd644663a4e05079c775f5e62318a6d5be8a6ca60a06a5979f5e18b6c9f7976a04628e585
diff --git a/games-fps/industri/industri-1.01.ebuild b/games-fps/industri/industri-1.01.ebuild
index afffb89d9410..40e991008542 100644
--- a/games-fps/industri/industri-1.01.ebuild
+++ b/games-fps/industri/industri-1.01.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/industri/industri_BIN-${PV}-src.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="~x86"
 IUSE="cdinstall"
 
 RDEPEND="virtual/opengl
diff --git a/games-fps/legends/Manifest b/games-fps/legends/Manifest
index b2cbcdfc47c1..645e00cafb31 100644
--- a/games-fps/legends/Manifest
+++ b/games-fps/legends/Manifest
@@ -1,6 +1,6 @@
 DIST legends.png 5092 SHA256 f4ac0db949c2f0a373f331a7a7528ef17c674a226c2366a5a443b5b5a44b6ce2 SHA512 7b9f336335dc69e2fbc24286b2076a228739ab4abf1b77d977321d9dccfb453897bdbd51388e3ed54369ba39b7faa92e458700928d8bf5ccc0f3639f8737489a WHIRLPOOL 19fc961afd861b7921847dfa9e7f7159227e37ff8a50c2edae9770d1fe5967652714ab94d549551349d91326ba3da94c766c715b3182926f33a6a25029fbe1b7
 DIST legends_linux-0.4.1.43.run 123964866 SHA256 cd4852b52f6d17afb22e1ee3592af450da712d060d8315faad23cfc7cf570ea4 SHA512 17b1caa3aa6124f2389e2220ced82c41c4523897bde2f8211d219dc9ef8620583c4ae68999b0761155e3d45cb1ad9679cd65ba50c8440dd1848ef3b1a7a590d2 WHIRLPOOL 2d51695cd5fac8422b5a14d7e836f7b3abbf9358e2e7349da1a3750d4a63c961f5b6d54f38331b9e4710f95baf8e9e4f52aef122398e25f979527e52ffef1fff
-EBUILD legends-0.4.1.43-r1.ebuild 1917 SHA256 38f13546b1b3e4141ef0ce1d59c26fadf7c541c55e725204d33c925a0a974314 SHA512 08d84baf943e93947cb47d1f57e128952401197caf8b73dbfa7f25d2872146050081d7502e1e821c6f5ed65530d5d258ec8bebb65672288b9f9fb0e947724c45 WHIRLPOOL 3b45a30316f71100685d9255a6afad82f9c3e6953ef7f718bf839df0ee264c0afdf11f988d2b18e03d48affdd9c543c39556f2c2345a05d1798a4b6d747d620b
+EBUILD legends-0.4.1.43-r1.ebuild 1919 SHA256 185475025f452ea61f80c14f5798bc44e6fb93a501aedbf38623fc3537f01aea SHA512 02c59a2b290098397bac117a5c356571f8ccfa336aaea6495feb700e3aae59bdf8d2c21b46e0b63e7f5e9baf73e16e0cb0f97ff8573ffad2eafaab433c2bb36f WHIRLPOOL 4c48c8aff305892985a0f14c22bb56878aadae8a66faaf27c4a033ddce1acd96f546c0f156002545c9503d85d7f037ead3b9793266e6483a9d9cc797062c95bc
 EBUILD legends-0.4.1.43-r2.ebuild 1856 SHA256 22d2ed8a09d48ad60c409bc95650dd9939242d78d37a8eb9d13712c48b34ad44 SHA512 f0c2de1529d004821b6b308553b1845908ce04e6ae85c2da00f788b935e91cde46bceeb22585064f3a1bd7c7238082f2eb9bb7a14d6324694774c175c6df28e6 WHIRLPOOL 7836c3bbb7b80e817c8a0d708fdd028aca996e458c83f06fc27d9055f96323f266cdfbd11a670e6e7d0542315b76af6c58b3ed063f8fadfe1f9a83f3f6f74da3
 MISC ChangeLog 2476 SHA256 4dd4bc2e92730b1607184496aa74012c02262f4ce94c8247bd8e08e4b961238d SHA512 6e817cb73d3897b6c441d533590f4dfff4ca83d596cff7712a4c5155b477cda1b250d2c26c376453eadbabd0fe27fc66e46f1b88d832d364f1389e022fb8d728 WHIRLPOOL 19036eb4e6a3624c95a7759efe2fe2377ddc1c508fc79844155f564eefd1d4a21f33293ae47fc6ec412a6d97de9ff8540e6e10fa364db8602de3c009ad95ebbf
 MISC ChangeLog-2015 4771 SHA256 a9f623f3e38fb8f14ffc0b90671855dcd3d80c5c0f901df1121d95249b796f5e SHA512 b0d4ce3d52bf0ab644850caaa1673d32086a88694e5e539f4ee9e645316ee5f7b71a4038fca875a07242502211c839fa9d3a0adbef0b9b46104229bf8f1a94f5 WHIRLPOOL f30d584c71eaabcd6e7e78aa1936958adba1f9f3da77f7db5fbeea0501657b3b93acd1b301955296446d12a3f6a3aa2c5cf7a80475319edc9ece7ba079ea5c0c
diff --git a/games-fps/legends/legends-0.4.1.43-r1.ebuild b/games-fps/legends/legends-0.4.1.43-r1.ebuild
index 2cff4a3ec2fa..d1ebb6eda69f 100644
--- a/games-fps/legends/legends-0.4.1.43-r1.ebuild
+++ b/games-fps/legends/legends-0.4.1.43-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://legendsthegame.net/files/${MY_P}.run
 
 LICENSE="Legends LGPL-2.1+"
 SLOT="0"
-KEYWORDS="-* amd64 x86"
+KEYWORDS="-* ~amd64 ~x86"
 IUSE="+dedicated"
 RESTRICT="strip"
 
diff --git a/games-fps/lsdldoom/Manifest b/games-fps/lsdldoom/Manifest
index 6521da93ae7a..b5a89d2d939d 100644
--- a/games-fps/lsdldoom/Manifest
+++ b/games-fps/lsdldoom/Manifest
@@ -1,6 +1,6 @@
 AUX lsdldoom-1.5-paths.patch 2315 SHA256 1802d087e060618d9b99ac2d23a501b831631c90d20e6950710e286e7859fcd6 SHA512 c1222ed33816ddd4aa9101ca55a8d70f9913320736f6b50a80e95ff6ee721fd794509aeb2196e8480ea469d7ed45686402f32df6592fa75bf4c55d296592564d WHIRLPOOL ab03f210d8a425953836e553004249789e864b400c2910341d9031c824eeeafdfb44ad631fda2a6fd24c90dc0dd03fd2b3df80fdd17c959e6631ec1199157b40
 DIST lsdldoom-1.5.tar.gz 1227060 SHA256 2e780775a1f31e3ee30e3d02b7f6b35409ec986fbfec07139b19ab48bdcf3ed8 SHA512 49d68040c312e8a27b452eb54acb1a4197dee157678de9e902cc2f17a38e621c5980eadf9c78e1945b9d5fb863dd1bdbdcd08c1c5e50971ee73857b7b3e47e33 WHIRLPOOL c36dfef22ee496652c5fd92d3a47b69e10eafa8c621984968881579e1c9e3db8bc9840e86bbb1e8c790d0f242c318787729b21627e431b3b8761a7ca269d653f
-EBUILD lsdldoom-1.5.ebuild 812 SHA256 9aaf4a63e2056cc7c2802531a6ecd732c7d9d78f0d22c609ede572d27b38b8d4 SHA512 da1076bf23a700ceb75c7462e0de7649f37aaea8ecbb2b3b0757641e6e1688aefe0425ce5c3e7d7e777ce26f5fc1df706e982d7ed67e8f3e524efee6551a5a7c WHIRLPOOL c7d6cddbcb3e14a8ad8c1bef2302cba37f1b6e2c22ee554e4658b440c6a96b1bed5b75be5c22d68e3d0c1288dfff5eb160eadc0349f6b8d5d60313319f0f063a
+EBUILD lsdldoom-1.5.ebuild 814 SHA256 06f51c5d508801c290384ebf62d427d30c38aa5fd152ad453652b138d248c0fd SHA512 82a3ee2ad9258b70c96479930109242560fac734b1a10706c503ea155d31bc87020b81d260dc2db07914e0b840c68493671b8c78f8d6587ad1065649c54ed1fd WHIRLPOOL 071d6377a09059d16a9f15eee9f89d812d7b4408d9314a110435b400a13240c225cee1ad12c08b77993a324441bf7011d766fbe79175bf79f22ce6e0dd5d84b4
 MISC ChangeLog 3486 SHA256 e1d6bb98c9ba3d2323cd82b3d45b8138a9c7cb30ff941e04ef2934148fe75496 SHA512 a875b8e4a702d1f5c0a2f5e341ff20bfe885a29aac8dc37be88e8e8037fe374f101df1f166673f7469082619a72f9eb0dc4a02932de841b1e64e7a7bd5269cbc WHIRLPOOL 696869d21976440920fb419a650a4a7716b24860075ed0d319f80ba8c52e7637100b4875ffdc63568d1702758a5d4cfec1fa5861ff75f688b681c47c2232d7dc
 MISC ChangeLog-2015 2915 SHA256 d089c36d5b17e2666d3238993f7cca67dab9876b2a88dfc90b17d6752b8abcff SHA512 6bf9895a6ec98f5517b8444d046facde84c7845df46ab4bb8c826532df3f2375daecf34979fdbe8511dc27c591adf61b7f0016524211e918942b268d476484a4 WHIRLPOOL 43cf0622556518f1bc067b64acb86e029a756f38147e8711a18599654201eb6c2077799de421436c696e1429a7194abb03a7c354af39da171b433d62936ea50d
 MISC metadata.xml 486 SHA256 8316dbfed18d058ff83ff1bcf4bfae8e1563f4a7b8affceeb441ff25b16348be SHA512 7f58f30b49baa935063333338a91229452f799321774779ac67d965b5ccbeb40825fa97cffe2932d625219142767184e516159343b84f598559673f30ed2c1a1 WHIRLPOOL ec0fcd22c0f55b18b190d5a5bc7d157bd3ead44993c57290dc91c095eb43772771a09a9e754a380281f4e320ec2ab6c6d44f490dba9a50254f5fefa5dd8f1610
diff --git a/games-fps/lsdldoom/lsdldoom-1.5.ebuild b/games-fps/lsdldoom/lsdldoom-1.5.ebuild
index 8856b85ae3a8..805a8dfc2d87 100644
--- a/games-fps/lsdldoom/lsdldoom-1.5.ebuild
+++ b/games-fps/lsdldoom/lsdldoom-1.5.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://jesshaas.com/lsdldoom/src/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="arm x86"
+KEYWORDS="~arm ~x86"
 IUSE="+net +shareware freedoom"
 
 DEPEND="media-libs/libsdl[video]
diff --git a/games-fps/nexuiz/Manifest b/games-fps/nexuiz/Manifest
index 5d8893033ba3..8cab4cadbe8c 100644
--- a/games-fps/nexuiz/Manifest
+++ b/games-fps/nexuiz/Manifest
@@ -2,7 +2,7 @@ AUX nexuiz-2.5.2-libpng-1.4.patch 1607 SHA256 9b5113290e3dda77711ac430ff1bcbefcd
 DIST nexmappack_r2.zip 113533483 SHA256 15088c7632e0b4f487c789fba4296f44ef5a5d83b51adcb9e603e289e5b8241e SHA512 f7e2dd60530b58f3fc505cdf0d605208b6905136586107210031233cb870b1892bae59efc4fb38403a4f0fc5301321297d03107b38daa501cb90e5669455eac0 WHIRLPOOL 5385fc2fe5afc4d4c2c3404311ef00c25bdc6cfd0bb3846cfdf0dee79c8205ed5861c5b6b1095d1db2938e3fc726178084ad9b52eb73989d199fb136d8be6a82
 DIST nexuiz-252.zip 931253731 SHA256 a5e27ebcc9775c4a490d0d3536c32e4a8f8f96b038c0b6a78d1823c37a962000 SHA512 da661eb2ff1764fed1d5f5547b89e4f9aa47613d41a3999c0202d8858ec2b882e4ef0ec182a81d1bdb25dff2ef65aad6af132009884e3557206941a736c2a68c WHIRLPOOL e3d08e4936a1fec97e024d0273162e15fbd4c68b13939f82c59ed2b5f613fa6f683423c753fd11d23c9be39f1bc620f2c0013456762773663a283078687eb21d
 EBUILD nexuiz-2.5.2-r1.ebuild 2602 SHA256 a64a7e3be38fcc906970bb0399c3cd32f9720d9f10b558cda19a7461129c7bdf SHA512 fcaffaf301f44fc71fcad15ff890969c35c34c15125d5529f071957b8f1b6296235631ff4136acc592688c7f7741889d25b77bdce4de95226685bf364c4f9926 WHIRLPOOL 7bbf4e1f64010d2383e96ee1107e391847b3d0378777c20b2a29597cfaca70172099b778bbe2cd16e3918810a871968e067dd53b8a15d76ce76bfff35dcf6463
-EBUILD nexuiz-2.5.2.ebuild 2654 SHA256 6ff5d31c31b591c8b6223a4c58f5508e2b1df251fd0ceec23dd8ce37cb07fb92 SHA512 733ef71580ed445dd8d7f93bbf80dcb1277bcb5e669aab97811dca24a9fcc0a62455abd5b97e0f4eda24618ea6ceb2e590f33e3642c21b3e627b2a0c029cf352 WHIRLPOOL d9eea9a6ed820722e21fec983fa5e72cd341339b577b225f884fa2303bd60f123447df1b35270ecd8d23aba301b8546714dbc0f04904e668891fdf20352f4847
+EBUILD nexuiz-2.5.2.ebuild 2656 SHA256 4d6e873ec72d8059ecd946fb2b01dcb982622498a7da0317649f9aa598255baf SHA512 35882652f8cfc9f1693c191826a46494ccabf3a32733d71359399a3fcaee5c8c365cb00beeac29a49ffa48a371f5f6ceb7c7e388e3ff4be8b3e8677e1ba27470 WHIRLPOOL 2964775c6fe74b1a0c922b5ec466d11fbd63ffd833c7e5ad3472d15d144737e205aa7e41a08147f5f2abf41f14f8eb486e50d2f67eacfc9a27880ab8bd28c037
 MISC ChangeLog 2756 SHA256 5ef9341b60bfc4a7176f568ae43926bee689cb91d339dbd6fa744b1659f88c1e SHA512 13d2433b7cce0f53c62ac61bfd4a540919b1817ae4b2721e14a56442ab83b907b4ac9b6e2a34c29aec00d17de1cb19ced871ecbecc55b91249dd58cb4326d02f WHIRLPOOL 4c082b5dc34a7e1b860492808615e4459dab8ac088f4a95bb683477976c826cce7f3c51a3f35679927b7bfca82eeefb60596760aeb58cc29b92bec609c762f42
 MISC ChangeLog-2015 5825 SHA256 dac674708aa7a6cb99b589943fbc61d00c06a7e792e20fbe58b9c0cbb27c2de5 SHA512 79b0561d00c6b7d2051bd32898809cb61b9c66633dd1312d7c1ddaafd0c00e53c224fcd8f2ea957bca58ce9ef3c7e4977c160b3cc057c946324459d22a3dd804 WHIRLPOOL 1e41a802a064beb3631bc2e099cb4b7f0d337752bf3d9b61d7efd681bb3564a77ed29f099b9175d384261333ac0f111b6feabee1a9937dd2439890c588b318a7
 MISC metadata.xml 416 SHA256 bede1a0efa2589f88b8fdf09915e74e708149168d7ebfd01f53bb6a176ac88aa SHA512 f07e139d436fba2f1ef78c41788f8e860258755de93cb8bb1b7f4315b6f9efa140013584f627cbb4cd1d46bb3071021f8d3cef2084e46a81fdd52d9d277ede34 WHIRLPOOL d68c5bfa37070b9f13c11fbe12b8c158205aa8b83e445296f60502ecccbc6198302e578be0a578000ef51a03eb5bcd3736a975778c42f17c84cfbd45492c4735
diff --git a/games-fps/nexuiz/nexuiz-2.5.2.ebuild b/games-fps/nexuiz/nexuiz-2.5.2.ebuild
index 868069a68567..b6c6bc30b09a 100644
--- a/games-fps/nexuiz/nexuiz-2.5.2.ebuild
+++ b/games-fps/nexuiz/nexuiz-2.5.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="alsa dedicated maps opengl sdl"
 
 # no headers for libpng needed
diff --git a/games-fps/openarena/Manifest b/games-fps/openarena/Manifest
index 32ef25967598..70305397db23 100644
--- a/games-fps/openarena/Manifest
+++ b/games-fps/openarena/Manifest
@@ -2,7 +2,7 @@ AUX openarena-0.8.8-makefile.patch 763 SHA256 c91a6de3154d9b86da367fe4cc5f7ce079
 AUX openarena-0.8.8-unbundling.patch 3054 SHA256 272266dc3ec9d7fa08aaa946b30b6a923a3500c66d0aa3c4d2ef1a805effba03 SHA512 85a7300e78f741d0bcb4c949e17ffac13790bbdf0942fc739fa357ac5cec7a27c67393bb42342981a78fbb12141e3a9e1ffead352db6073bdf63b4135f4dbb43 WHIRLPOOL 3fbc17715d13f9d69f45392f128e068ae4a70281648bb5ebb4d21caf2775315c6429d8d429c163b8c543dc4f8fbf5e57ec30f23e7d38728b18c5eed5a72d6e5d
 DIST openarena-0.8.8.zip 425189255 SHA256 5a8faf7f5b51f351b0a1618c06b6b98a5f1a6758f1d39818de2c87df2a0bac4a SHA512 9fa4dabe8a3428dc3cbec97f3b4d20c04569c14cdd00b60e6391c6dd61e310f246ff5ec97e7549821b3d6f5f94b140eb5411a2ddd83dafcad66937b7f78ea8dd WHIRLPOOL d9121b2e936063d02da7ed4de79f8d0da3fd3c9b196d3fbce9091be0d14c9f745317c833eed7ce9c0691cd8627396f0d3580eb244b7229500b44a03583612e4f
 DIST openarena-engine-source-0.8.8.tar.bz2 3777830 SHA256 95aa500cb7e42e57fb1f6db7b97a254168f4fa2e3676d6cdc33180b69fde0e77 SHA512 d4ba3655fae500cf5b7475c83d39c81b6abc759da15cfb4ea9e1dc0f47ffb11c1bbbc2b6f85d613ab1d729978eda93d4d7677c9a45a33853e363c820d8b81c43 WHIRLPOOL 6093e6d209983a268d21ea487f99ab065f1b050a3af43fead3461e24dc629be8b84be56644a4ca5a35512015f187eb9880f1228b0d501de091c482e141086f2b
-EBUILD openarena-0.8.8.ebuild 1778 SHA256 0ded964818bde0b816873876f42c162f46d1e1d4bd876463653a46e4e775fe60 SHA512 2552764c8e8c93e524553a7b1696d64e528e1835a9b4f9f59daebc2e0a0375a281aac0e1eb1459cefd76ab8f8f63e65d46353515f6ae21fd451093347dff03f4 WHIRLPOOL 03409f0b95a05e41c09825d4e0bc7bca94a23ef9b05b1811f36d4c140689d53455be6ca81a67c65c5405414f1d1465a1f5aea1f525fab846a1ef82a429362e39
+EBUILD openarena-0.8.8.ebuild 1780 SHA256 b951fc3656d68df1f7b6b7dcf9adda7a96e28d68cbbea9af2e5dae13139615a4 SHA512 18f2830e7e7f0f53ce5afb51189fbec3baf686cf876617d318de3e66d993dd041f80ceb2b5a060567814c4011b32ed9585e6538e5b363be4f21dc5b1dd917313 WHIRLPOOL e6394be898dc59c58ab3b6e59cc174d825bd7fded80d4ff54343a198a2638d2eab087de6fa7b1c38defb3badd180786b18a202744761cc4db9cd5c3915997bce
 MISC ChangeLog 2991 SHA256 aa7d973b4807787f91517c8dd983d71179acf9d6a41ad2e4610357e0aef64bf9 SHA512 c84b74ef53d6610c6c6c0017b881a09a69421fb3419ac774dc9f95a779f73679354264b54ac0701002c9279840e778cf65a80c5fb1c455f89e0cf462ed605a80 WHIRLPOOL b6c4c271c9d48de0d3e6c2f06e10a5015560427f0b0f767902c78a8243ef15e373b3f4ff32a2132b9db2ce5cf9e6e5a0f0432ff925d3338e8d5ca7429cfd7774
 MISC ChangeLog-2015 4717 SHA256 7a04ba779b704e76ff8978302d9c0e6287e9997a6608760ac2aa7c79a8ea0477 SHA512 e43c71ff2c0b2e7248cc6508992b40748f5486e65f65a7dce7cf20f10eb9cf23082d67e3c32b124f7ee46b37445ba36a5fb0f78dfe7703b0c466cafe8c2e084a WHIRLPOOL e1ebc98ea28e07844d22cd25bcefb3925ef48c31bfbbdabfb6baf3aafd5af8b3d651e7649473ad55ddb43336216a5d58306834dfd0cacf79dc8416043e7a9567
 MISC metadata.xml 329 SHA256 2e1e2962e1f543f1a712c643e6dd221b885dd6141504c2d0d10b68f8bec8b64b SHA512 40e88c8cec824e6c3d815516c018292ec64e5b968ede35a4c3c235331cfb32370ceffa954f01ceedffbf64e182f4e6c753a5fe45ce2ed627b6383dfc6b0d39f7 WHIRLPOOL b3823a9d657134041ece2550afe7d9cc222dd102f1f441fb1cf44eab44f0724ba9580f432b6fcef05be1b24cbc2c351fba9c3aecb04179c86f0a800e7ce037f2
diff --git a/games-fps/openarena/openarena-0.8.8.ebuild b/games-fps/openarena/openarena-0.8.8.ebuild
index 023db096e5ad..f35c2fbe563e 100644
--- a/games-fps/openarena/openarena-0.8.8.ebuild
+++ b/games-fps/openarena/openarena-0.8.8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/oarena/${P}.zip
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="+curl +openal +vorbis"
 
 RDEPEND="virtual/opengl
diff --git a/games-fps/postal2/Manifest b/games-fps/postal2/Manifest
index 25c6476fb928..724dce50117d 100644
--- a/games-fps/postal2/Manifest
+++ b/games-fps/postal2/Manifest
@@ -1,6 +1,6 @@
 DIST postal2-1409.1.run 4816304 SHA256 7c34530f84acfcb120710660ae56264fdab28d74eb0dd0a351bef37f87e2b1b1 SHA512 5ff4880435394c552e7c1f33baf8dfdb71eb56fe5e3067eeb746826a25e585d3901292618668de50dc8bf641b2628a26a82cdf5b642e33f4113b55d72df9c4fe WHIRLPOOL 90ff13f14d93ed539596bd21170397b55bf688719ac58d33168f27b7bdc7d1b7f6a45835b050608efc4e5cf8483e2a5b5894ff750449fa66206ce36f037a993e
 DIST postal2-1409.2.run 5645624 SHA256 5b7456200d5777b350e2a1b01eefd8f74df9c5d880acd18eeab3af731d719fe7 SHA512 9fafcfec30d99e30b879318a96f484d3723853a213606f58b02a37631b4393ab4925022fcef3f84c95907269c6675090100358c16cec8b779140bf83fe7cb660 WHIRLPOOL 658936af2e3cbd7d90734749187c36b05e16cefbcb73dc12526c4ceb9d3a34197b362186d3d06436ffb63e2019329631a2e6de13fb8a8518bf4a43f06872e7c7
-EBUILD postal2-1409.2-r2.ebuild 1664 SHA256 e13686a6d09e0d1fb4bf4253ab2569b951bea599ccbd6c259d5a42cc9dc12de2 SHA512 a523a007bc590db606607aa6521e902efed3a04bda4c060e92dad230d2890d69ef037f2227b8364e9931e9bdc0ba0d268f4a50f2545ca3c6cad19f363fae225a WHIRLPOOL 09cb570731f7c7dfb56dd7a7971c3871bc4bf3bf1aabacc0f443cbdd6fb7761722ec216eef7da64f87451dae3cf7edc033595dfc7e3109f53f6e3938980092c8
+EBUILD postal2-1409.2-r2.ebuild 1666 SHA256 6da50c9f7673a3affbdbd683b442fa6e92a66eff70fc18160abaf8241a64850f SHA512 b73dbcc452265a2143fa42b768229e88e2e23ea36b2071241d64ec56362571d0c78cb95ec7e8e00f230305a3448c87a4ea4aee718e9a24d8b8c4ddff61a3d03d WHIRLPOOL 73ae7c30bb1ed4fa96344913f317be64c7e26d5603ba8fff98de81d44187b44e8a213534156a13acbcb88caa9ec35f376bed684ffcbbacb1024788a03a511ed1
 MISC ChangeLog 2560 SHA256 31335d9f7fd7376f5552e72f9c388f5cac8560c4c7985c9284248ea5a979f4ff SHA512 a9a37e0e4f92a16d01d4da1d663f24fae0ff727e4595b214cc02b686b5a703080dd9802257f2ef5e71738f4b9329c1d4ea72b4a4657b0b776d9039c68b50116c WHIRLPOOL cfe779acda5bf046b7183873d61451cb02ce57c426f4ec1a61ddd7a1030e90c50e15ddeed9a3991bb44a7010ea2e0c2e2b1b3a3b508488ce86f9cb091a9e87c0
 MISC ChangeLog-2015 2695 SHA256 b9bde186ac38f50c05416517928699e52f0258159c4f1f56668cf9ea6637247f SHA512 8f7f3ffb80f6401a2e401685dee78a7b9473d6fc5435cd2bf4b8c42d30e14ba2869c0db336a77896605d364df0d51ccbc3e715fc366503c3b32333758a321edc WHIRLPOOL 14d109109c4a3f9b3a9cf92f23f4fd4f2f460669bab210f11a9245d3103f09fad5659db31f2214bbe24197228b2a9a36c4aec390b14ee64d1e3a89ee0ccc9731
 MISC metadata.xml 252 SHA256 0dd0e558bb7ccc4f24cb9c9c43790c108e559f3462861b2ff6eb267a345beaab SHA512 90798aff93ec7e3881b882e7b10bb1680e8cb7d82b0ef4280e562ab0c9e8a2daba8afe57333dc64697322267a4b651c00ee9b4fdeb56278ff70c073da7b91638 WHIRLPOOL c6c72f145f4ccc4863ad4c1a236eac601fb00f0e9550568f98d5e6f5eeb16f361b4c18eac8d80a1534e398fac595a6819a86297164be0818d04de6d643f01d7c
diff --git a/games-fps/postal2/postal2-1409.2-r2.ebuild b/games-fps/postal2/postal2-1409.2-r2.ebuild
index ac2313659529..f0ee7ff50e1c 100644
--- a/games-fps/postal2/postal2-1409.2-r2.ebuild
+++ b/games-fps/postal2/postal2-1409.2-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://updatefiles.linuxgamepublishing.com/${PN}/${P/%?/1}.run
 
 LICENSE="postal2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 RESTRICT="strip"
 
diff --git a/games-fps/postal2mp-demo/Manifest b/games-fps/postal2mp-demo/Manifest
index a8acf47bc0cd..2de0ba7ab16d 100644
--- a/games-fps/postal2mp-demo/Manifest
+++ b/games-fps/postal2mp-demo/Manifest
@@ -1,5 +1,5 @@
 DIST Postal2STP-FreeMP-linux.tar.bz2 591082047 SHA256 9869c6ffc220e58cb51eb04c5dbbc480d5025cfd33b83bf4f3eb8ac340d6c1e2 SHA512 92580c2ce0593f37890013a5b2e5c1d420b57ae4e90569725446dbb2c939d1dd29b6df566783f020419dd8c4b1301213d1e8d9d581c95efd3f5950e8e54b46d1 WHIRLPOOL 7f2093be5a3214bd8fa527cac37addc7e8ed5e9d8645b3d47cbab65116850c786042479d034f4d59ec198641ff3e1e3a734aa5ffb37de579f30257e273fa6bea
-EBUILD postal2mp-demo-1409.ebuild 1460 SHA256 8696adc8e9bea645b343adeb319feb7872ac8d328d911d1c7e2fa580f41934ea SHA512 af37620e4989c5f2c6d5a207c3a682ffc3a4efc190f31622e820d238ca2e5bc2c0e94fffad4a9ce54909445f9fb9a51dd0db7894937ab74c08164b1ea2fcfba6 WHIRLPOOL 434387c3caf70209c8504a79bc14e15a36dc4f4f8c1b05db9bec28c63320a9b01a2ecb57a904ef566b9b1da0041662a1bec0116a52da65397d38acc76cabde82
+EBUILD postal2mp-demo-1409.ebuild 1462 SHA256 100e0a2e916422cbe06070105e76959f61df39497ca838d7ddb01e8b62546cb6 SHA512 652979dbb2d4b43a807b18cb1321f20285d390c02f99ed7e7690b3586200a61690d817ce4bf4da961f4880df05c635bb67d5b497b2fd5c12d328290706c542d4 WHIRLPOOL d6db60e61ae167c62cb15c26176e343995a418264f9b72ca6235f6d09501ad913da24a4ad3f468106875b0523a2e8fef55daed8aae105495e59659bbba7946b7
 MISC ChangeLog 2447 SHA256 cc918437f7b7562388d836a73a3eb5e231836dbf5750021adb5b5d2d944d8030 SHA512 b9608bf300257e09c7b34f93deaca35483bdfccf23fb37d6213a78ada5e43f4e5e96d45b8eb9cfa8df9d21098ea2cb9eee3202442ee6fb706956a7aac638e758 WHIRLPOOL 3ef89b33c37be974b2f598af7b70bef50deabd0326682a003bf97aefea42699862c4e685bb3ed1dacf8c52f4a03558508d7e771341fc99d424939c61579c02e5
 MISC ChangeLog-2015 5421 SHA256 04db351fba2588c792d70655767352e0a2306fe31cda337ffdba2713fa6dd3e0 SHA512 3ba58e709233b95681fd11eb4661b6bffd5b562526d38641be9278eed7f2e143fcfafb69bd0c0c2692d153b666cf5b6192fe6e497fb2a71f35de78c918b999a7 WHIRLPOOL ba316e3b5c07379880fd86da23c85d4b8a7d22a471fbe619b37e8d9e09db5f54397be18d8b046052d5727b0ed1d2f7262ecf69315f64c3a96d855cc8e112b0bd
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-fps/postal2mp-demo/postal2mp-demo-1409.ebuild b/games-fps/postal2mp-demo/postal2mp-demo-1409.ebuild
index c803d36bfff5..d01d21b14e0b 100644
--- a/games-fps/postal2mp-demo/postal2mp-demo-1409.ebuild
+++ b/games-fps/postal2mp-demo/postal2mp-demo-1409.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://treefort.icculus.org/postal2/Postal2STP-FreeMP-linux.tar.bz2
 
 LICENSE="postal2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 RESTRICT="mirror strip"
 
diff --git a/games-fps/prboom/Manifest b/games-fps/prboom/Manifest
index 989f1a27c9a5..60b3bb7ad525 100644
--- a/games-fps/prboom/Manifest
+++ b/games-fps/prboom/Manifest
@@ -3,7 +3,7 @@ AUX prboom-2.5.0-nvidia-test.c 90 SHA256 5df0930928328c700cafba8ac3367dc799118dd
 AUX prboom-2.5.0-nvidia.patch 1734 SHA256 db77ce8107f97f2886d89c53777b2f9c7ef5e2559dcdd4ea455f3cf0ae2491fe SHA512 d3048ea2f500c6bbfb1e24c75fdc05dbe0f6fbf8d8e71a37aec0f30c6c6ca97a9bc193dee60de3083df15320660908f97bb90fde795cb1d07e3877d27d4a55ea WHIRLPOOL 0b632aa835adf0818fb58ee0c59f6c9196dfab5757bdfca3849c6939ff1116c4f30352bc3417571b5a758836ead94b87f40dbd844c6430796cae33d5e1bceba4
 DIST prboom-2.5.0.tar.gz 1049505 SHA256 226c1c470f8cc983327536404f405a1d026cf0a5188c694a1243cc8630014bae SHA512 9e25b55047c66931ea010751fb64484e466395b04dfb738ed9dc515bd8b78e1124a337da33bf7be6e97280016ed1f01c852d8bc12704bdb82074488d7b5d2894 WHIRLPOOL 1aa458514266c107a5c4883b970cdaac157ded0ef4348e6666647e9426a8f28c4c98ff32de93be20c3d0dc3dd740d725e3c4bd9c767bb0aa3c3f7752a719a5a8
 DIST prboom.png 4254 SHA256 ed79c4712b57b0c5e8ef975412e22d6936fa4b62657707e8f1cda63302008542 SHA512 72631d253c6754484ab1c96c953ed37a734197fa851dc88156fd3d4fb8396a77347805233481470b936a504d08e06d994de1eba613e6bf70a89db8fc7ee9b1ac WHIRLPOOL b7e91c2b43ea57951dfcf0ed2b9916c8053d75d0119965079c2806ba1d9a9c13e36506dd65cd82e01e1e2f64b276dbe0bac2c2eaf2a3f80a26ab777feeeca75e
-EBUILD prboom-2.5.0.ebuild 2025 SHA256 981d6e54455ebbb53e5914b31667b9937bdbcabbb59c135624f47cd256d51cd4 SHA512 2b1b9c8c29f32e160d309a173126097d249ae5e7291e82837e5516cf2d8f42a94ad070c7d429165c8864f46e4a7b5301efff6ef8d47dfbad13f7ee238a0b4af1 WHIRLPOOL 380816b61c1e6a3d802e27e999bca79f3c279054b02f3d127c87d6037427ec8767d9cea09c965ffc2169af5174eb655d719f4a551686132f190f91912b56d8f6
+EBUILD prboom-2.5.0.ebuild 2028 SHA256 d2fbbbc3b3883906a918a105d53d457528a0469c97cc896f71ce70e700fba882 SHA512 9d1155c0a336c4158f1385f9701b4a8bb400e20204f1643d5b87b8c41ced040a45dccec5b639c1e6052245a7f2981a672320cd3d9d4462cb49d7471ff22fa070 WHIRLPOOL c8609644a1f4dde6119ca449878fdf61f7ac6a265ef23eb43471ebbae3e1fb7388b6540d1fe70aabd9c1ca3a5e2e6f7f399b68a839fef95c2eabba119708d073
 MISC ChangeLog 2532 SHA256 05770314a56b52b01d7fc5474be8b216f854f27f84960a5ff34ebf7582e901f4 SHA512 2cc645e76276719167ceb865ac67262b260eefb26f7740a84d8ef9324591d11c0c8a90d59b70e25062cc532c924ab4451f51a066c8e27713126244ef135501d0 WHIRLPOOL 4f750d13de0e95eda899db60d5c5f9db9a697b3a90d927a7af001eb0e4073be4add5deff2bb826a6d99185794c9ad7ff750aa33f4d9651eadf6ec405d0c40376
 MISC ChangeLog-2015 6279 SHA256 0718b023775f26384cdd28f9fb784025e035f890f16b5c4e0c10f9edf632d89d SHA512 981a43e56318c71e0dbdb139b7e6023cdd7026a08370eedcd53e69c7306e08796890f8de1fcb3d683e1964839df9fa3435a0ae9489111c0a08d6f337a89de623 WHIRLPOOL 75a54f9c52d420cf8a931b00413826a17d5e81600b35e703979d48e1cf5f48788368e826349a333f8e55eb4ad0de8760f2706446e088658fa1851a2f45acfa27
 MISC metadata.xml 329 SHA256 2bb374403dd9f5f2cd3d6f26409054f84bf31f384444bcfebfaf46153bd88580 SHA512 a1c50442cb2fb1e0b536fd7b2402f74f4edf3a8edb0ff45ea6873cf24402fd5c37535006604e98b3c0073f9788763efaff2e51a91cd44b7fc37343549be87e80 WHIRLPOOL d7522131155f7bfe619d69c936e18996d28a66b2846f4e6943f5bf05aff1a6a23ae960293080f495a3e8abd62657727054cb1ff308415583fd9977874d0cd54d
diff --git a/games-fps/prboom/prboom-2.5.0.ebuild b/games-fps/prboom/prboom-2.5.0.ebuild
index c5e44d420eef..89b2de060de4 100644
--- a/games-fps/prboom/prboom-2.5.0.ebuild
+++ b/games-fps/prboom/prboom-2.5.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE=""
 
 DEPEND="media-libs/libsdl[joystick,video]
diff --git a/games-fps/quake1-data/Manifest b/games-fps/quake1-data/Manifest
index e14a179b614a..76d626014356 100644
--- a/games-fps/quake1-data/Manifest
+++ b/games-fps/quake1-data/Manifest
@@ -1,4 +1,4 @@
-EBUILD quake1-data-2.40.ebuild 1558 SHA256 86f8911557682904ff3da69e53b7a08593cc97f4c6276b0d4b979f0d590bfa1f SHA512 0b60f932f0062c343647363277967e7acc0c7c81f67bc6ab8b281a19ab7230be04db4a33cd4afabed9c121a4c718dbb0becbe0e997c60f9b92de8f0c5548da66 WHIRLPOOL 31ea4238eb15b958cfd049462fd67cb85e1c2f0a42ee08f366671f2cc34e8a1617560fbd197ed78b409683b2907e85f7a8500106c125ce072d2c7b87bc1fc12d
+EBUILD quake1-data-2.40.ebuild 1560 SHA256 72f508979840ac13e25d700252936c7b2245d4856db1cdc18f4b85460ac62ef4 SHA512 2c707806c09b87ce4211fc88b270688256fe5fdc697d3ea11b4d77b9b0ac636124f987c5fa9def893559b979eb6b9609cb1dc85a12424d22a88ffd1cdc4a3f3d WHIRLPOOL ba2c8107401768ac1adac795913afa0c334fa64bbdf169bb24a0f27d959c991f4239a6e5648a919fa51db0c2088c32141394d0eca06c43150ebdca85f7cfe297
 MISC ChangeLog 2737 SHA256 4e897d49f8257836f3ca8a1bf5fc7c9e6d5cacabd47986d41f0f378c45a7f4c9 SHA512 97ff9010a30dc037c46f7f4d2a1c1620c512724fc258f347c6e200e359838f5a52bc2974c70e89ef2b95a47ff507536359b568ec5fe2c251fb70b41dc76a5857 WHIRLPOOL 5da6fb14afee3aa31f5ae645f05e013a07a563b1665bd5fb0b280c4df30859b012119ad19d69f917cccb9e53d8f943ecd5e89cf66bac762925f90ad3c0084e7a
 MISC ChangeLog-2015 1946 SHA256 0cdcb47f1b235aa3fcaf99cfb73951230b56f3793beccaf712c661f792545445 SHA512 6ee4e4916cd9cac7ea92daaf34a0873f69861314a1d58063c4f6a12ddbc71dd3b218884d1ffe8ccd612c277b75545b3a601b1c1d8603939f63bfda5133fe439c WHIRLPOOL b8afe7c441f3f70cd43ac6b8e2a335d7f56f668ea1ccca09d2f5ce3d99f9cc65c877a5cba3fc2279e4ea97cb4e396b6d40947a252169e08e35a825fa325826c1
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-fps/quake1-data/quake1-data-2.40.ebuild b/games-fps/quake1-data/quake1-data-2.40.ebuild
index bb3a40e46345..b5b088ccdbbb 100644
--- a/games-fps/quake1-data/quake1-data-2.40.ebuild
+++ b/games-fps/quake1-data/quake1-data-2.40.ebuild
@@ -15,7 +15,7 @@ SRC_URI=""
 
 LICENSE="all-rights-reserved"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="app-arch/lha"
diff --git a/games-fps/quake1-demodata/Manifest b/games-fps/quake1-demodata/Manifest
index a07fea8f03cf..969166e32325 100644
--- a/games-fps/quake1-demodata/Manifest
+++ b/games-fps/quake1-demodata/Manifest
@@ -1,5 +1,5 @@
 DIST quake106.zip 9094045 SHA256 ec6c9d34b1ae0252ac0066045b6611a7919c2a0d78a3a66d9387a8f597553239 SHA512 8960c48d9c3c8bb142fd812968d29f05304384bd559b5cdb1d2cb8b6faac84d30ebf9cdf5e5e4eb3739907d9b599ca2ba34035647c58a8ed1874bdc7f0b75e1d WHIRLPOOL ff39f8931b6e551761c75f2552e568e0d3e71a8926cc43479323e2cb2ca7773f049a34f6628a8e42739f6a5fa0f64053bef1ac63ade761d549ab6b1b78f8954e
-EBUILD quake1-demodata-1.06.ebuild 1645 SHA256 2ef7ade54eb9750490b4dc89e2e9706ff1ba4e67e32acf8e0168eb1b9c50c3e1 SHA512 52e54bb3e1552fe9bfae6f50d57bc989b3af525ab74632867c2989b39f41a2884cfbdd623965b9a1a3e10014f091af743484c5c2f77295b0dd6a9ec53ea07a52 WHIRLPOOL 2338bc52d71d8ec9499c3357b426ea0d9a1fab07b80992a0909c9fdd1b238487c6edc713d141e5729bcfec901795d066d9f91e6aae49f008e4ae026c94ce4697
+EBUILD quake1-demodata-1.06.ebuild 1647 SHA256 8a1559d05fb618ca24510d82a86b222121ecf1f66976c86f0cfb1ac778ba6dd6 SHA512 b85ed0b2ec082b795a742cbad4b53a66e45c60f8fde5e30d389f05067b5144dde89ef9f483ee48875aa334ca126cb1040397640a65fb8f86eb229ca5b809b705 WHIRLPOOL 3685e6696aaa1e71db7b4d6684b2d630cb409abd181e4a78161649c0e8b74b188f9e9cdf91cdd088a353b7a5bfaa96f0c6225a4309f7c4af35ba0c942bef72a8
 MISC ChangeLog 2450 SHA256 efdb8792a8b8571a80df9e5f97296c12737d0f6fef978bdab2327fae6a31e26e SHA512 21bfda360bd908f773fa444134d5fe0e9236e571faae690ed4fc17c83be4ccbc5a28402d5bf8be6fc6b32266bf44791e24833b53f95a060b23e61842f60ad98a WHIRLPOOL 4c235046814d18615e32ca0ec3d160cf1da3854b5286a375bab71cbded01be5ffe80a753bbcdc0d9d1acc110ca250102a7fb266b7e92dc4dfeb28b7d04afbf0f
 MISC ChangeLog-2015 1699 SHA256 3f6c4593382fa1e5ba02fb1efdb08d5d2d3845f80695fdf195af76e8a4045363 SHA512 05374565dd09cd2f4cad62907bd64f0775d48c3d5d27eed1fced5912d735bf391ff37f2fc07a5701b460a87d1135e8477dfdbf5319f2928ea2dfd7756bf4659a WHIRLPOOL 0e9bdee91218f9e7a84b50804930e9bb0d32ba3163342adbf255f3dca203584b607c2fb2a4ba10a590421f39f2375bf1312d3561536214d4d25c2c2ff32a6260
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-fps/quake1-demodata/quake1-demodata-1.06.ebuild b/games-fps/quake1-demodata/quake1-demodata-1.06.ebuild
index d1348f05b8ab..82589d35c576 100644
--- a/games-fps/quake1-demodata/quake1-demodata-1.06.ebuild
+++ b/games-fps/quake1-demodata/quake1-demodata-1.06.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://idsoftware/${MY_PN}/${MY_PN}${MY_PV}.zip"
 # See licinfo.txt
 LICENSE="quake1-demodata"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="symlink"
 
 RDEPEND=""
diff --git a/games-fps/quake1-killer/Manifest b/games-fps/quake1-killer/Manifest
index debc8abc883e..8cdd8cb7ba55 100644
--- a/games-fps/quake1-killer/Manifest
+++ b/games-fps/quake1-killer/Manifest
@@ -1,5 +1,5 @@
 DIST kqp220z.zip 2952348 SHA256 be8a4f5471cbc68ace0c954012795a38b12ba21613418e111271049767ae1972 SHA512 8149795435cf72c4358dc35cce473482b718b67cc799ce4739d975cf5fe3e856735cbcd1f40c7b6a345aee8bf830147ecb37e312b1cb141b40c14cc95fd0f56e WHIRLPOOL 2d2b3356d73af0bcdba08f879f09538ea06772fcae3050342c6a57d5c007e8a371b1c7b373bc9aaf05d6a1a6ba6148497f12e4fd4bb361dcab7f05b28a1427d0
-EBUILD quake1-killer-2.2z.ebuild 643 SHA256 577ecb3f8e9e3bc11e7df3d4c0206696d48664889752e63c9ac8d786fb2e370c SHA512 a88dc4638e64b5d820984bb5b11b92159ad08ea17011bda5bb72034df9a4ae25a24e52105dfe7f545ddc2fac66c3f618476404fa5a9f9b044db6e4facc7a6bbf WHIRLPOOL 70892597a41eeb18c23459838cc722e9152cb984de52dea269516c5abc858d8d49fe7751c1aff74d38fcebfd86160e3a2f071747239be8fdd564de0e7e456db9
+EBUILD quake1-killer-2.2z.ebuild 645 SHA256 835d7060f0348c15e6063bf02bae63e72fcbdbf55b26b183427d3db35cb67147 SHA512 943fb4989c13cf6e1accc9a3b60cc434078cb14bd0ab91cf402d4a465bffab5694b957a692b6da3830868c7ca6bef64faca800963203008625cbadcae947d97a WHIRLPOOL 506bfa7b59dc17efd2333b2f94233556d9a81402c65e1eb56027f81c0e04946291ff5e95b42febaaf72a85ef64a50c355c4cb116be03fdf1b5e512d33adeae97
 MISC ChangeLog 2444 SHA256 8e814a45f64f25981107a5d06836c7b2e4ea561da5fb3f56a2104f0581adfb88 SHA512 1a9ff378e4f23501b106e413941bff019019387102b66dee78a6ae1f0abc9374497db0c98575deeab416cec34c0b0988853bab3f23a220cd61142aa48a34161b WHIRLPOOL ef6046aded5bd842bd3fbc356622bca3e74b008f2da8dfca4cc67a6232f52edf76fd289d9dbc1209319014e078d6009c17aa73bffafd0fc271da236f49dff531
 MISC ChangeLog-2015 892 SHA256 393d8b9852de585712ff6a5a7a92e213dc0617ecbcf9b913cd379369297021b6 SHA512 6488bdd7c9fe9f817c71263d1ca00a1544a176399cad2c3b51bfd2ad3f9abb84c1ef2cf524998f01c719fa8425420dfad722f6d52c7ac3673636fd432ffc10b2 WHIRLPOOL 3b0ed56f483b6d692402778409cab1f983421dd4e845827bd090cff6bc0a3273f3294f793d36716728b6c56377b922f60a96fc7881616fbde3863b97b55ad952
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-fps/quake1-killer/quake1-killer-2.2z.ebuild b/games-fps/quake1-killer/quake1-killer-2.2z.ebuild
index 67957bae46cc..a496cf4feff7 100644
--- a/games-fps/quake1-killer/quake1-killer-2.2z.ebuild
+++ b/games-fps/quake1-killer/quake1-killer-2.2z.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.gamers.org/pub/idgames2/quakec/compilations/kqp220z.zip
 
 LICENSE="quake1-killer"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/games-fps/quake1-rally/Manifest b/games-fps/quake1-rally/Manifest
index ad98c84d5700..333321da0ae6 100644
--- a/games-fps/quake1-rally/Manifest
+++ b/games-fps/quake1-rally/Manifest
@@ -1,6 +1,6 @@
 DIST qr12.zip 9885866 SHA256 a4f269389472256fd54236de4bae2443abf1bd3214d2dec7719c2cd79dc083bb SHA512 a49b00e67b95c06b4898ad8e1f9e0a718c025736e7d68d3aa8e6ff9cf3062ea8a0cd0ea0deee5c2af8e3e30652c4420cd4b030b3bd8f1dd4ace9236bfaaf5e5a WHIRLPOOL ab2d44654a66cc408f9881cb573a86384fc0163c6d21e507a626bbd536a5d222fd08384c22259664b870f11eb604d9cd134c1061de8de8bcc95c03de7ecb3dab
 DIST qrlo1.zip 4086037 SHA256 0b575ac4871ea14926ebfb376675917e4c3c654ac00bb7f49a2277d6e8f1a0a5 SHA512 94af61a0f6978c39425cbc414e094417deef99f109aac2905877b3723873657c3ef7d7ae7d3b247144d68eabbfb79750a654e627ac039d315ff0f2fd323f395d WHIRLPOOL 7f01deb7dbcac519c4d481d38e45b5215eb4ed1f83ebc25c7cd316354e53ddbe5015ee41d70a57f7ded4c01667e930272f4790f5ad7f5eb422aa4dbae622fa0b
-EBUILD quake1-rally-1.2.ebuild 926 SHA256 4fea157b849652dd436d91a65a1ca7b15f263205d94d57ce54658564717ce5d9 SHA512 09dda216f97212ea3d86274e4f2c4af8f8e19ed9d6a208966195d8f88f072ab470e633e9390f731997dc73ccd427c83b79e4c1f7d770d9014e15b7a2202743f9 WHIRLPOOL 73fe51dc274bc61e95ce844ccf236b530ef30d0993bd5b1d85a1432c17b73c956936f48d96689735e832c69a5c85d64941c3e276ff99c35ecb262ae42a658892
+EBUILD quake1-rally-1.2.ebuild 928 SHA256 f5917246e44a87187d4c8cef1e359287ce29f7fcf631ab9d201720520d76130f SHA512 06ed8284a1be2e296ae176eb0799687664b464de165ba5e86b703319901dcd6e2b9eff57aabbe37fd2052471acd53af24ce3cd517df23bca12a3a0098c2a98af WHIRLPOOL 473bd7f6cf0877ecf6f37d3ab30d491298989b78e01de6becd58532b3e5689468ce2b7821b143437a91404a96164b6c1e1ee7339322f023f08a6908f442633f0
 MISC ChangeLog 2439 SHA256 0813a3aa6b2013de826b8fad41641c871cf19ee63210dbfc93fbb86c4608b202 SHA512 9416aa22e6830946e3e50423a7fa20cf82d7bd0a400168e21a272e1e2ef8c14938c55957b8e496e0c581de2318de1b402e8fd9c1eb55eb16d2419275b0d4534e WHIRLPOOL c4686aac0b2eb1024156db80b2bee672e0ab932ef8a909773a0e3faac781896731b7591093eafee1862018d003e4e49b552fd9d196b0324bc9c33fe95f0c6687
 MISC ChangeLog-2015 892 SHA256 c6a3a44a556c83a714354786d5f5a72d5b987733d36895257c0be45000d50a91 SHA512 db812155b15aaf3a1e3447fda1f560e9a53dc4a2057c02a1ac79547421146ae0a765bc84aebf61363571022ed41276f9c7d86d7ce5e291d57814b1778293b871 WHIRLPOOL c0c1203b8bf8a3e986d59863b4cacdbef970831a20fe3ddfd628a3d85afbf004483b6fb126c8d6664ce9efd327c6c86feca60a84d4be04dca66745bee180e723
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-fps/quake1-rally/quake1-rally-1.2.ebuild b/games-fps/quake1-rally/quake1-rally-1.2.ebuild
index 315426ed3f7d..d35159fa497a 100644
--- a/games-fps/quake1-rally/quake1-rally-1.2.ebuild
+++ b/games-fps/quake1-rally/quake1-rally-1.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://ehall.freeshell.org/quake/qr12.zip
 
 LICENSE="all-rights-reserved"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 RESTRICT="mirror bindist"
 
diff --git a/games-fps/quake1-teamfortress/Manifest b/games-fps/quake1-teamfortress/Manifest
index 3af2ec08e456..be8fd0a35c9e 100644
--- a/games-fps/quake1-teamfortress/Manifest
+++ b/games-fps/quake1-teamfortress/Manifest
@@ -1,6 +1,6 @@
 DIST tf28.zip 4204316 SHA256 56a6767b7944f2ce54423f18f1cd59239ae37a7c7456f684227d6f5310c76291 SHA512 2b158982fbf501712fa31fae7b8d34ce4adf41c7ada7c32549bc94ea7370f56b7ebb03f08f70c38c4e53a4ba49a95cbd23acda39eddc4a360d236cc0129a3262 WHIRLPOOL aeeb5b1c8389b334cd630813e8969ab6a7af74ef13556e5667b65407479e03368649bf6300497a8963c30ed5b7d4fdb675d315749824a0fc21bd23f996402135
 DIST tf29qw.zip 626175 SHA256 85b24b677bbe3c6848949a90b06c5470dee40dab6db5f16c69472ba9d3194e4d SHA512 77ea488e5d9fcd3ad91317f2a35bd9e19ca38712cf9bf248bcfa88d1a5a66577ccc504476ecfb5d06bb7a28cd93ce92d3728f4be825c93567c8c2b61cb80c08d WHIRLPOOL f8acc7a45b991c3e15d2b2e1f667c9732f6ae239583bc823f2b1a3dddf6ce27e748991288a2618129f709e0a942d2030af2ccb4f598c0039223e1f4b96b6234c
-EBUILD quake1-teamfortress-2.9.ebuild 854 SHA256 a460bac431ad54914447aa31f828cbdccb6af0d414fdb1bf41ea0bcdacb11188 SHA512 2854c0bdf6f00737c4b01093a5849f98256b320b670df4d45deade869c808ad797562d7da89e8c565b472dee3062e128599db059d3994c5c065ee2478f682dbb WHIRLPOOL 6a088b88a79a5a19ab7108342cd6c85d176bda28e9990a7ef9a0cddf097c5062861a5d05004787029dc954ce3c4480037df6268e48ca33a44a95a1ed76832e61
+EBUILD quake1-teamfortress-2.9.ebuild 856 SHA256 c64082c7351a977e0c8456c1f09739f0c5eecd3a7c30f8c4ce512956d2b52660 SHA512 9d8cbfcff9153bc57b00eb8c4404f0244b343f02d4ad1ea992230e427d39cd659264c308f3ca5e741dd0f76e1efc62f7ad1e8acd664f82e4b9fc0e271f26f88f WHIRLPOOL 959206fee4993da33ae4de153c3c66d7cb87a2a26594a39c933f167685dfd7340f025f537da6df5f8bab6e7db9de246785ce4206e1737aa5877c79c43e2ed02d
 MISC ChangeLog 2460 SHA256 901eb7a9bba364d52001a68c9e09220abf12dc786cf6d3c51954ae01c49d84dd SHA512 45951763434c93f2599fa15a41b9213c44a846afc2722567862fbf926424fc3805a9e2aaf863c96ce5429e3a5b06269db0ddeca43be6e94d93b8a309c54d7ba3 WHIRLPOOL b18aedfea93feb656efe1ceff05737a2f144dd223678cfaf11a124c596a1994c4ce23953a773d059f5148f1b8b296a7820e2aa61ca693fe98ecd6a504849ebe8
 MISC ChangeLog-2015 813 SHA256 1ec219b5fd31274b9410b16f909959c13df8581449c3d4f84a69549413c467fd SHA512 24fe8853890448491e0d66b3c6296690125b5c1d9c78c047cf78d850b0358fb247ae589ed85a89bc035347418c7eb6bd46e55e69e3dae9be86d7debd83cad8de WHIRLPOOL 7f95d4851a38d36185deeabfa70c38ee6515f1c0eb67dd7d0bda9233e42d77304e1bc4c9e4037c8c278ff5c1bbbbd4f75751a3809fae3476f78ff1f3fd3a4228
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-fps/quake1-teamfortress/quake1-teamfortress-2.9.ebuild b/games-fps/quake1-teamfortress/quake1-teamfortress-2.9.ebuild
index 9e659763e5a9..f712f354b145 100644
--- a/games-fps/quake1-teamfortress/quake1-teamfortress-2.9.ebuild
+++ b/games-fps/quake1-teamfortress/quake1-teamfortress-2.9.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo/tf28.zip
 
 LICENSE="quake1-teamfortress"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/games-fps/quake1-textures/Manifest b/games-fps/quake1-textures/Manifest
index 6c8c8bf92910..dfd184424507 100644
--- a/games-fps/quake1-textures/Manifest
+++ b/games-fps/quake1-textures/Manifest
@@ -1,6 +1,6 @@
 DIST SKINSbmodels-48files-4-23-05.zip 12627945 SHA256 85a450b23eeb44539a3cf1a4c9feb1aeb56a14ec4b89d01dba5d237b8987c284 SHA512 dcd39b7d8544d4c381b2917820e1cec193f4279eca1c2d1b260cfc0d019a224bef84b4cd6a19da37331913533541d90ac72ac119592eb95cc82c9e2bac8ab37e WHIRLPOOL c739d092d62aab173c4c9e75a32ca36a58baf81ed0c22f53c109171240d1acedb12d5af848fc21c4b2adf7f177ce426d90e029a4e4ffb09c1b6ffcf88caff871
 DIST textures-486files-8-20-05.rar 207799283 SHA256 e368e0e12cf09d128eaac78e455cc4e280a38a641e8400d3c939f9889df8a1b1 SHA512 3809bea3ff1d7bc7acff51d8f19890677a563778cfb418d3f6ae940ceffa8953a1cf10dd7cc3a5d30715e6d2e79331ec88dd72f1ba22ebec0d179a01ad0eda2a WHIRLPOOL 8eee01a75c6d8b8b31b3ad8ac6f1c4ef819ccb1cef131e529d240d4ffb42e29dc638f23a32bab565a26e5c0c0860f3f847f7c95434edabb0c799b571415672c1
-EBUILD quake1-textures-20050820.ebuild 1011 SHA256 3e7593a78309a5da8fc61e3f65490c01e8258c48f10015270dc28d9f3f057290 SHA512 67d1454953f2df1d1fbed61775268abf96079a018d234653d8197dc626684dae377d1c0812417216ea7b97d70be236cdca41914cd5820113c8083e2a1b8ac2a0 WHIRLPOOL 57067a57e42754deeb1573f78b61d859f90c97b5fdc3e464112abd89aa9fd507bc01c2d74a94eb56aa1363389a9f12bcd46172b430be7fd486c5b5f038ed4770
+EBUILD quake1-textures-20050820.ebuild 1013 SHA256 5eb1faa6573b848407ab464deba90d7c8f5d6ac5a3d01486fbabec0d77d551c5 SHA512 1e67c033e17c8c1de371d74c3e786569e211b1ff5433b7e44d572477cc5f42767e4629ce28dfabb4406670dabfe61c2e117ed40c8fc0388e73cf1062e2edda76 WHIRLPOOL 84ffd6ae8660bdf151d01975123d2d7d65e384176fafdabb61f9c35be74fceb207569c4fba7add8b36b7de74fba63a405200406e9622502b5a20be8054cf4cd7
 MISC ChangeLog 2458 SHA256 30245fae8f1d4479399f5bfc4ba2cd5b1e446d1440f7f23d6fd0dbdfcd1e67e9 SHA512 912b4cee4bf02be72f4270f959cc5e9fa6a95c67d5f963c0ce674af0a60a7ceb9140b6d7cc65d2487c7482ba80be63f58828c5fdd674631dba1ea58d969879eb WHIRLPOOL eea206dd54a093cbe1ea456dd8237a9c21e421a0744ab931219be997c668783403b8578da4ad6cd2f9267d9a89651006f822f3d38616d0bfcf3870428397edf9
 MISC ChangeLog-2015 1919 SHA256 b6884312c3742964c680e7c3b97728132b2a5d912e3994785a6667a1ef9dd18c SHA512 365772bb86466db2931f0bdc510cbae49750e549dbd6de2e2ecf07ed6cfb0ab3b5120107375b5ce5a676465df44d5e46dd8f47a445a96d5c17dc04dfccbc7fe6 WHIRLPOOL 9418c1a4c8c1b8e3c09ca4b83f68ff4dc1bea40a87b96ae17d8ccb38b83d6614178f00f1ac94950c05a10c5bbb849b0091d2bb5bbcd54e47e9bee0a87d0ad3ef
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-fps/quake1-textures/quake1-textures-20050820.ebuild b/games-fps/quake1-textures/quake1-textures-20050820.ebuild
index b96d164e0011..b030e4a20742 100644
--- a/games-fps/quake1-textures/quake1-textures-20050820.ebuild
+++ b/games-fps/quake1-textures/quake1-textures-20050820.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://facelift.quakedev.com/download/${MY_SKINS}
 
 LICENSE="quake1-textures"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/games-fps/quake2-data/Manifest b/games-fps/quake2-data/Manifest
index 880ebc972f92..1118b818ead0 100644
--- a/games-fps/quake2-data/Manifest
+++ b/games-fps/quake2-data/Manifest
@@ -1,5 +1,5 @@
 DIST q2-3.20-x86-full-ctf.exe 19267584 SHA256 f82197c8c8089202a4b3a85d8833b0c2e827a709d205c760369407c212488baa SHA512 056a56f218f3fd7a3c5270665990bb347ce3e6f4aa8afa3b65a5d291d3b0cd149e3b58ed0cd136bd3edecb3c080f790f9dac68c63d19f095818720f0537b5bad WHIRLPOOL fbff168a81452635c1e0c593298885929c30c74b426e6b602242d24b2ae2299d6ebaeb46587c97599c92e5f5540481944cbe94f91a01e2a102596e62d4c55756
-EBUILD quake2-data-3.20.ebuild 2459 SHA256 1dc2a2b4ab82b308a3a63c4986e5ced219cb2b332faba8ad3805bc0a2a934fdc SHA512 31322198a9b59c87debf55afc0260eb3f216dbe0b7f7f8baf762dec3fb5537c5aa81158966fcd09e0c65478cb96fb8093fd99a3cb653102366335134a4f0b1d4 WHIRLPOOL d5bc06c295dc67f79479404ea2c99f67a82b8c2679ffc014559a380755821a627f32852a05d2ed0744f87c07a13e2f4848c8d3ac29eaf7e0ad2fbb2d66a5980d
+EBUILD quake2-data-3.20.ebuild 2461 SHA256 0aebae41287d2fd79a6356d48c978f057c475a87873cb2501544b17ed8fa68f9 SHA512 1c1bb1b8b8de1e0e66c9dc8ab3c1ab64660956f0707431fa8463b4c1f42d526f481d2850dd6509d970b7ca3eb62a347ff3cbc870bab4229cc296d2785e300637 WHIRLPOOL 26704b9f57edacaa8d4027e62898abd5afa18bbcf111e46224e1902a9ae3bf8986e987d6a1977227ccfb484c7bc09371579f1f73a2eee1127bfb556a7c76afd2
 MISC ChangeLog 2565 SHA256 bfa46200467039c8fa9355a612d597e4065255b72375fdbb4fd163877fdcaa39 SHA512 e139add5a06f6469fa599fc376c6f4bdd6e15a90d4776c581c27a458bde9137f4bcfc2f764d572aa1a1f125af5900b935988c02c9f957e6b1b8020a7e8e5b1e4 WHIRLPOOL d621967b97d807d494e2264cd56db324cc1f23e44780c9d3de2036c2e0493d62794f3002960d8186f2a89f3bbd773d32deaee6963b7528d6e037774a3faef346
 MISC ChangeLog-2015 2487 SHA256 8e19e55388ce063d120b7e504717bb43119bc037465c44a8001794234008c177 SHA512 ad88d2ac941dbedd50baae2921cca88c6f059ffdefdf50ff838b950e3e48b98f25dde219b49cc10da953923f25f714ab5722aa8f325c9a674dd70bffc525860e WHIRLPOOL 722db1ae5333b1e9514796066ba2feff776a61e4248aa33461f4364f85b886b059d218385194c671ae98ade9d454d7252096d4df87fd7b3ef5fd15b4cde47bb1
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-fps/quake2-data/quake2-data-3.20.ebuild b/games-fps/quake2-data/quake2-data-3.20.ebuild
index 08ed81faab7d..0a8b671417b7 100644
--- a/games-fps/quake2-data/quake2-data-3.20.ebuild
+++ b/games-fps/quake2-data/quake2-data-3.20.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://idsoftware/quake2/q2-${PV}-x86-full-ctf.exe"
 
 LICENSE="Q2EULA"
 SLOT="0"
-KEYWORDS="~alpha amd64 x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~x86 ~x86-fbsd"
 IUSE="videos"
 
 DEPEND="app-arch/unzip"
diff --git a/games-fps/quake2-demodata/Manifest b/games-fps/quake2-demodata/Manifest
index 5c4fc38a1288..8a716a5d9102 100644
--- a/games-fps/quake2-demodata/Manifest
+++ b/games-fps/quake2-demodata/Manifest
@@ -1,5 +1,5 @@
 DIST q2-314-demo-x86.exe 39015499 SHA256 7ace5a43983f10d6bdc9d9b6e17a1032ba6223118d389bd170df89b945a04a1e SHA512 9aa5123807a64a6e3e3b113b582efd353f176f093fd0aae6bd01d9cff397374c06948a7147f59748b3aa6f4251769e409fae838157edb66429c9d41381b3df86 WHIRLPOOL 8924090d8fa357dd0a4b5634336976baf3b4afaf59c12a5bb50298b328b974c697dfd11c56d4034afb36d4c16b151b361271252e029111ee10943630b758d522
-EBUILD quake2-demodata-3.14.ebuild 1309 SHA256 9744202352d4ba5c00631fa3f32db4a34edd8b91a5d6e185e148c6708f953d58 SHA512 c030b37bf75908f22fd94a9acfb31a6604ddbd0a90290b7c1e23587ff15932fe22a2b2fc157eab6f4af673066b44b048a94aa421764392b904a2c2e057f1f0bc WHIRLPOOL 2d8276fe6b23595468ecfdab2ff56d0ae1d48518ad05ca505bf73049b3ebc3c755cef6d537875a511a99ed524f3df7236e21fa0b41a613fa60253de237f6302c
+EBUILD quake2-demodata-3.14.ebuild 1311 SHA256 8204e6abd3a9336fec03ccdd49e3353137ae9c8915f99d156d94a8a8cad78655 SHA512 d48575fc5ccb69c2fdf9a901da5fd0060802b50e6d2cd73915574609108950da4ad6b22d04a9101f4e0b366f3a7d27f68b27a8550f1d1369417e561a182c5623 WHIRLPOOL e815e7c6210034d566ea4e5cbee6a06402479fb9b9a93b81dd2616d8d04f2ee91c85aca7fecaa2e9bbd179c90d3176def3d36f3d7b8fc2075b362086f990832d
 MISC ChangeLog 2802 SHA256 bb49ecd3ff8572d80b1cfc08888a5bca5fae463c60e3b27124e69c50d21b526d SHA512 646971f8ea3f137c51e3014e2038fe562f2977d1fab43d311dbcd8109937cef8cf97636974993ae57a3e9291fd5859ea71a7b453d6319c145bf0c45759fa87f0 WHIRLPOOL 4489b3f7fe797d232f20ae57eae53d40fb19b018c9e435459eded821b39f88ff5eac69cb959ab00d19b5455776f1a09fc8fd16d17b0bb67a93c81a4364b09160
 MISC ChangeLog-2015 1405 SHA256 776bad4aa72cb3f1b7d7421a2b0942afbb68f18e0f1118250a20fdef8353310f SHA512 372d482c89a233ed4ee0c938e09aa00c5fab25384c751f37c5e82d9ba70ac2fe20a58c2f21e4d1f490652d4cacb755f577c554ce175106c61b31b61a4e9060ca WHIRLPOOL 907c95088761578de6753c86556db2792d2df577a4daf7887e40c1bf8edc0e9637ac31ec54ad36a701801d5d6d28268f9db565df76cc49d575a021dacece9228
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-fps/quake2-demodata/quake2-demodata-3.14.ebuild b/games-fps/quake2-demodata/quake2-demodata-3.14.ebuild
index da3488c25043..03f9521ff9f0 100644
--- a/games-fps/quake2-demodata/quake2-demodata-3.14.ebuild
+++ b/games-fps/quake2-demodata/quake2-demodata-3.14.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://idsoftware/${MY_PN}/${FILE}"
 # See license.txt - it's a bit different to Q2EULA in Portage
 LICENSE="quake2-demodata"
 SLOT="0"
-KEYWORDS="~alpha amd64 x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~x86 ~x86-fbsd"
 IUSE="symlink"
 
 RDEPEND=""
diff --git a/games-fps/quake2-icculus/Manifest b/games-fps/quake2-icculus/Manifest
index ecd90f64597f..9dcbe29bc2fb 100644
--- a/games-fps/quake2-icculus/Manifest
+++ b/games-fps/quake2-icculus/Manifest
@@ -16,7 +16,7 @@ DIST maxpak.pak 3282742 SHA256 653569fe880f1ed5f7529483ac961b22078482e6ff0e83f4d
 DIST quake2-r0.16.1.tar.gz 1525384 SHA256 49f4d3d53772b6ffd7733506f5d121c7893bfd8884133bfc36a28039c0744642 SHA512 63e8fa10446698b1f1cbd20b4bbfeec75d7620cb6454bb90b853cd2a3d6cd9040041a164666a5e015c3a8289423127f9164b500f57793505f6e4671dec932cf2 WHIRLPOOL 017d0c6add0302fa2f74bc4b2603fff36589417ac7fd150429f8e83be846bef53695ac4edaa22ec5a8b38cf2aaf73ea733e1e142d8e8a0cc778826753dc96b14
 DIST roguesrc320.shar.Z 626769 SHA256 ceefb2fd748961cb0bc3244220f3eb09d8f7b8ca2eb32cdf9b284727a2fdc919 SHA512 330db4966b758b8e363eb8d699b30ce5ec7d9fa581936288e7267000d0815996388adebc0206a8903734cdc1c5658616b15518a2bf888ad9e6059f8155960141 WHIRLPOOL 84430a1596179086cc440196974f83e13edff52378c8418d84e46bcd78f5e6856aa1a8b6a9e1a9e5496c1845ca19b3af6be346661580601e6581920529109dbd
 DIST xatrixsrc320.shar.Z 455917 SHA256 94bf596cd85d38ea294b99ccb0ebb5e4b9776cca335001b3803e2d8407395589 SHA512 6723440d3cfdaf7f9b260d5777d9823937a4c3ee800c8c204e8a5c3d29f2b37f6bdc7c0786025a19d040b5692aa54b99b9db2dc121bc0ca2b53c8763b4ab4dfa WHIRLPOOL d5254a11f49ecd0cc341d6b51cc31bd6d43597e0341df09662849e235a07452eef80fc881983ed34bcfd47fca575e8592aa306f53a3b82d1464167b16cee4fed
-EBUILD quake2-icculus-0.16.1-r1.ebuild 5276 SHA256 a7877dc25580ebcebbb8bc4c2b2159ecee6ec1d0105d28a1d5e2febdad9ae6bd SHA512 22ee401b15e2b00d11a5928bc2fa3c2ae736172112dab4f44a4405def49c89bf55f4d6e2a96ec27dd7e354bd4929aae7afde7194dfa3b80415ab66ede7b423b3 WHIRLPOOL c8560ae3dfdac5746b4586989252f6901a233e643913df6a21837d323d6c04fca33ac9c25d90297f51fad2de5c6d50da4ccb14b7acf1caf289aa1bca8d5a7a48
+EBUILD quake2-icculus-0.16.1-r1.ebuild 5277 SHA256 c65a43576efbde10e45f5cd048f25dca76a8325930a255d51264fae6b0c6592e SHA512 aca471d402cac1e1d5dda6ad32590c4c627753c100cdfbbe26bc98cf589fe3804563ef7dbdfb38bf939421e156a2192ea5956a4c33ec4a0be590179f58654042 WHIRLPOOL 9f84a4903838c8b2da2571a3bb4049e614242c38c8ba1181d9a7b43c64a289b6eb274f0f16058d384bc45415c496c4fb8eef75cab18b38f7a1b9e47aeb0f07a1
 MISC ChangeLog 3027 SHA256 7170affc3be054748121067ea715373bc889c824f209201899ca3d7adcdc9d04 SHA512 111d8dcfc17c5acb05a4c7fd7d4223b310b37ba02132bec8e6f1967ca4e89c7630fe282be7a36d7b8fd23d31861c1dcd9eaf6218b63276527fba931830b084b7 WHIRLPOOL 23d0b219476dae4ef99cceec67259c74bb0e102eeb19c319790a59e2d2a63101fc67529e0a4b7c26e886e4547ccecdca23b77b60e25494dc1a1dab6a4c89b118
 MISC ChangeLog-2015 9286 SHA256 f117d03093ad70310b2abacdcb3c04c98ae0233ff5369bf84b610714d900973d SHA512 5d22192ebbbda8888cc809f5beeac494c911bd9d0e4f20f8c7d06ff9ff45a513be29687f17f6d0046bf9aabb08b610e6060ff567c46ca6dd578802ca8b5b6c17 WHIRLPOOL 728243e35cb2fb89803691637ccd9f066a30dc2d8236126909df7b3711e96f60419262ea61349ceb9fbca1ef30c2af12fd768bf1d3817b55efae0409f2068d04
 MISC metadata.xml 612 SHA256 ae7296fad2e85f7e73f1884bc4ce9a23a366c87324309dbb50a37cc0d6c90cf6 SHA512 0c143ca3470f6b33b35d660e3ad55678356e7139cab94589d18947617988f63f8c69485167d9d8c3e21ef231b0521f993a5063df26ae3e5e5cf4c64bee30d45b WHIRLPOOL 0d84ccc23144f737ed934d3f98a357b9e03c1a9b6c594197430bd476a85f459f8ef8f2b3caee2f3df1bc30577ed16283168604f3a33e99bda28130bdd4619759
diff --git a/games-fps/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild b/games-fps/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild
index 04bd7037c7f1..7d8220b1af0f 100644
--- a/games-fps/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild
+++ b/games-fps/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://icculus.org/quake2/files/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
 IUSE="aalib alsa cdinstall dedicated demo ipv6 joystick opengl qmax rogue sdl X xatrix"
 
 UIDEPEND="aalib? ( media-libs/aalib )
diff --git a/games-fps/quake3-alliance/Manifest b/games-fps/quake3-alliance/Manifest
index 8c32704fd6e1..76cdeb89a8c3 100644
--- a/games-fps/quake3-alliance/Manifest
+++ b/games-fps/quake3-alliance/Manifest
@@ -1,6 +1,6 @@
 DIST alliance30-33.zip 1995207 SHA256 0040a15623226325f561a5dae0b41c18dc65bc7bddad208a30ee7bb5ba848f87 SHA512 e5cebec74e5c61d983453217b0a26f3111a23b76f9e20a5840231d45ca7323105dca983ee33e2d185902a353b5b882ddc488888a62b7ee38a000371e3f5dde61 WHIRLPOOL 8607c1111d10147a5e1886de54a955cebe0edf8382595952a0a035bd31fb6d93aeb2f5163eb01594baf642c2d4298d3f2ab61489b32899e28e787a6e2f466c1c
 DIST alliance30.zip 60476973 SHA256 a4ae3923883312e6ded35fa32a5e1e44510ee8897aacf7f4bb1ea41c90b21e60 SHA512 c48a5d78a85d667e0fd1d6ed321f716f932195fb48a479bc5405df50a50a4cd67e7d35b5a61080255e56b16eaa19acd7f394ed8fce320716d1a6c3f1be41107d WHIRLPOOL 793d57427dd03bbbca03fa7423953678a68c0119c156cd0ca603357c51dba60838fc83becd920ab8cde2707c9f150c41f2f1f2cf3c958c0b7bca6163cbc95f54
-EBUILD quake3-alliance-3.3-r1.ebuild 629 SHA256 84b0935558014d5d7b099efac63861c96e05db075a6fb1d19c25662969b44484 SHA512 6fb9b1ebd408cbfa2e3ace1a29aff0458ddf660a8e4b2054ff4f8d5f3c064c86b00d16a52108a2af27a1a6be011daee44b60f7e3af3199d812824d7a31c887ff WHIRLPOOL 4b1e58e577269b5f1f385419bbf185cab44e8ecdf2026f125d441cbc81ecc689c522dba5f1ba6f7b6c026424fa9d5b364cdcb227b296a393923602bfbcb02d67
+EBUILD quake3-alliance-3.3-r1.ebuild 631 SHA256 5587e4f607e68729dfd17505b5f551eda59b23a1a39b68c7f3e15d13aa5ed25a SHA512 73d1a5eee90304cdb96dc44a01d8eea237147a077827dfc2df4bc553ddb90da93b6da6a2cc916f2a0f96853a2c6d94e64f399a3f2d21fbdf6a58d9fbb94b153e WHIRLPOOL 8b7e2e0323faa444e454f76f3af8d078ed8e42cf6c10af91ae305a93096328367f814f45cfe3d7bc78cbd4d232ac70d1a5f9311ebe347fec00c1cc26fe24af06
 MISC ChangeLog 2587 SHA256 5d22cd2f45ebe7ee4ab4df61792004e9999f4385cc4c69650c86b6b2037cd38c SHA512 761bc8cc0dcc02bb9ab5d9632210d58e433955f8623d6dea00641544ebb116b34e19a743fb6e82b9d8d1e8fc324f82062420b94dbd030dbf1bf5a0c8540d349c WHIRLPOOL fef03ca38148eaf5a7223ef832469fb10279bfd6660bf0f8f171945cf7584313fa90acf0f703bfca0fc2ccb02834b13283f5f5d3f8ef00066a9e62449417365f
 MISC ChangeLog-2015 871 SHA256 492cea15fef9720c515676cf0895b34d184568fc5195582a679ab78503e6a7df SHA512 d8a34ecc7c9cb9dbfe61e7c1b5642bc51928c2ecbb8a0b4ee7dd67987ff606b5b15894c9090b9bf94066f20b45471dfb2c0530cabe5fbfb82b0bf1d0ae64d5f5 WHIRLPOOL b71fe895559e7e111f247f659ff4d1b9a784d08d57a8fcc4000490078d74738fb0881e00b2c2b3e20aa0a6170c70e220920a4bcee8fb9b9290d5d560dc20c342
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-fps/quake3-alliance/quake3-alliance-3.3-r1.ebuild b/games-fps/quake3-alliance/quake3-alliance-3.3-r1.ebuild
index 2ba01e103168..730bbf5f5b7f 100644
--- a/games-fps/quake3-alliance/quake3-alliance-3.3-r1.ebuild
+++ b/games-fps/quake3-alliance/quake3-alliance-3.3-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://quakeunity/modifications/alliance/alliance30.zip
 	http://www.superkeff.net/mods/mods/alliance/alliance30-33.zip"
 
 LICENSE="freedist"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="dedicated opengl"
 
 src_prepare() {
diff --git a/games-fps/quake3-alternatefire/Manifest b/games-fps/quake3-alternatefire/Manifest
index 432a97dbabbd..7c5ae3384c5c 100644
--- a/games-fps/quake3-alternatefire/Manifest
+++ b/games-fps/quake3-alternatefire/Manifest
@@ -1,6 +1,6 @@
 AUX server.cfg 3645 SHA256 f0001c007ad99f63a9e2fe36c6003a3fd5b062d4436553cc80736268d0a8c9eb SHA512 a7b4d64adad075ba7ee7af3461ef36216fd374d852267ba712882549d44c137f7638ac100c31081528e6b384865cba6fcdeeccdb22bb0133bcac869e60c30e6f WHIRLPOOL 5200132ebb9c0e6a697bd26c8b6154f4cc6449ec41067fcb124581eb5025c5cf340fc201648bd5b4c1b2f0177401af33e1b1fbed10c32f8e5b88ce12bab9591f
 DIST alternatefire-2.0.zip 2015159 SHA256 8964bc680b713753b103d54211af46895990d6d10243102a2a13b01eaa678cbe SHA512 178c5470037e711c58cb09854d7e607166253a6f613c29f23fbbcd46cdff8786dfd53770dfc9d518d75d9a3e42b0745bfaa742a09bad0493dbd335d1bb3fcbf2 WHIRLPOOL 65b2c2ef01eb398a431932bd6a0e123c1349b42b889d5c4240e6db8c1fc4fed34ddeb9f60c1ea6b1408069e1845af37ebbd0c64c5c827467a8f34a6ed5b91494
-EBUILD quake3-alternatefire-2.0-r1.ebuild 448 SHA256 1e36b85fdc4f9e3947ee15c972e3b3bbda4b7af71cc3a3f7262e79eb698b5c0c SHA512 5a82bf24d9b17e13aabd02e480166679fb142f9803146065db22635272f01c064de50e3c5e2e75fd33168acc3c4aa9c7d60bc9e203f2787595420104469eb493 WHIRLPOOL 418caf009ef51355bf6551e9bf43c02d556908c706bdd4ee966a7f0b239a814e012f61a4ca77fd358b12048d4433bedbf4aff25003e626d0356bbf31cf8e845a
+EBUILD quake3-alternatefire-2.0-r1.ebuild 450 SHA256 af97cbd023b646a84c2a10fc13da58e872b51b786dd93e42690976d01011beb1 SHA512 6a1639946e6e0df8183844780bddc641a87cb9d9d980382f3f7c4b785cfdc3b36ad9a1e916adbbe6e74ec6de406c5c248692a7975685bc758f9976440f6405bd WHIRLPOOL 5292f316d2505d34a849736b152d940d4ac1e2e79dd966bba796deb043432fc1d22e84edbc10580593cfa45b2bcdae9b681f2e021417cca7b17731c6d0e731d4
 MISC ChangeLog 2626 SHA256 313ce8022688d8cf9f59aa41a05edb58c84e061ada4104f1c4aa6b135bf5640a SHA512 dcafd9b30a47ec54806e2cb31a4b872ffb9d554b9351efe47f6f638c19bf65c0a3bb9779257ebc9c839324e433de189637e09e2ad723df63f73a6a034b887503 WHIRLPOOL 809de2db8e6a732c5d584938465e783195bab31de3c4e67e875bce6289136338ae7456490d5e58986b9906443f1a798664e96ac29d5f38400971870e3bca6be6
 MISC ChangeLog-2015 1063 SHA256 72347237a08f2d67771cd082a70e619e4b625426f48246702dd2434920ee7566 SHA512 aacd257404fc29968d228b0d223f03ad540b44ad99cb3e251b0e948fd7081130f5bd261cf46c4c3623756da08e2163fc92b80d65723580f5104f7966e090f165 WHIRLPOOL 3f019a88e5669210aeb9d4189e671bde46e104a4bedcf8cb3186706a0cb43249a65b83cd346ed465b5b230501709f29f1953fde137798455a1cebde5a31eb46c
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-fps/quake3-alternatefire/quake3-alternatefire-2.0-r1.ebuild b/games-fps/quake3-alternatefire/quake3-alternatefire-2.0-r1.ebuild
index d5e4e58ddcc5..d0d7066df6a7 100644
--- a/games-fps/quake3-alternatefire/quake3-alternatefire-2.0-r1.ebuild
+++ b/games-fps/quake3-alternatefire/quake3-alternatefire-2.0-r1.ebuild
@@ -13,5 +13,5 @@ SRC_URI="mirror://quakeunity/modifications/alternatefire/alternatefire-${PV}.zip
 
 LICENSE="freedist"
 
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="dedicated opengl"
diff --git a/games-fps/quake3-bfp/Manifest b/games-fps/quake3-bfp/Manifest
index a5ac1916a06c..727909e45a67 100644
--- a/games-fps/quake3-bfp/Manifest
+++ b/games-fps/quake3-bfp/Manifest
@@ -1,5 +1,5 @@
 DIST bidforpower1-2.zip 129645741 SHA256 e8d5f4ec8453a7b0e0cd430e38ff5fb2cc37eb16c17f7e5eb6515429903b3a7b SHA512 9559af36f6efa46e7d20e4a4dc1293ddf8e5bf310672eebdc3f04536e926c05ce699819adaba2c9a29794815a7b766ed9f70b4d83121196f675cb0d221e77b18 WHIRLPOOL 7f274d038cd4c47a6ae74bb219acb9b288b21e00874b7cd6f2e6e561bb3ee11db62bb9aa1a3fc8f9f06c0b0facae7a278a23e665f7bbd333f41da391847a99b8
-EBUILD quake3-bfp-1.2-r1.ebuild 462 SHA256 3a64df63f1edc1e2dd70932eec70eaf1ac6a59650fccb0a38028b5ed92202aaf SHA512 215fbd7775a9c6228aa3fee157ca4318e7c3c9deb87ce57fbde51f14caf96589cc4ce2bff069faa785d137890eef8c128830d16411f627da8baf5d6a7cf7e1f4 WHIRLPOOL 8416df10efe9322882abaf5f28b24650305d7ebc9bfa23445135c2096c2c9f9adcc6908c05fa6469e70230f0b24465d3933a4d128c3cdc63c23e503f751826c4
+EBUILD quake3-bfp-1.2-r1.ebuild 464 SHA256 25491381a7807a8f55a4a0c42aab8acbcd70e2603b31017d25c522ff0431e342 SHA512 97aed7a123ff90f8907f827c4b08dbc3ec3997b59e3f3189ac502ed4cabcc75b16faca291b3266bf64c13944ef1c63fc3f15003985a551c151b8fd68266cd619 WHIRLPOOL 42a6e9d29de3f4194fa291ac87e583bfa099a2efb72157d6826f13fab9e55c2ad349174b9d652f317885fcfae7ec0153b83909b6d171bbcab05a5627c4db7cac
 MISC ChangeLog 2567 SHA256 97343d116c1684527724ee206f5444c9e5173ac74f8581081fa7e7c78f8e9be8 SHA512 415237773d608fe2664f5da97232126e301e96f52919f669487f48a4129c45cc8172112b1408b1c7bc4003efd728ae178b57e3507d4f5736c826801c1eede3ac WHIRLPOOL d11c74e3febc5fd65c83da5e939e9cd67abad5f91259c60955115da1fedfc8fe4d2802d0f5795fd43a47337f76379ecd8954967b90071a49a8d10542a12a031d
 MISC ChangeLog-2015 1134 SHA256 8d0ec54c5f784a2ae179e20c2a1610446e3a8793fa603bd9d61f8080ee3029b3 SHA512 4915462a198529c9ed0656f9872cb16743ab55198eb0ee5447b23637e7298e14b51e384728cced4ad33dca14a6e8591e379b8c2c06f0015e33e3bec404b57476 WHIRLPOOL e3435e318fbd57ac9fcd80f6f2a3f1f51944469166d71893ec537680c0d8d474755e594f17658fa7b7e4720540dd988de2de97eb67fe7ef13361f3e4ea403cd0
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-fps/quake3-bfp/quake3-bfp-1.2-r1.ebuild b/games-fps/quake3-bfp/quake3-bfp-1.2-r1.ebuild
index 59e6be36e675..cc5bc4ee8dde 100644
--- a/games-fps/quake3-bfp/quake3-bfp-1.2-r1.ebuild
+++ b/games-fps/quake3-bfp/quake3-bfp-1.2-r1.ebuild
@@ -13,5 +13,5 @@ HOMEPAGE="http://www.moddb.com/mods/bid-for-power"
 SRC_URI="mirror://quakeunity/modifications/bidforpower/bidforpower${PV/./-}.zip"
 
 LICENSE="freedist"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="dedicated opengl"
diff --git a/games-fps/quake3-bin/Manifest b/games-fps/quake3-bin/Manifest
index 969f5dfc8cfa..7db51f793409 100644
--- a/games-fps/quake3-bin/Manifest
+++ b/games-fps/quake3-bin/Manifest
@@ -2,7 +2,7 @@ AUX q3ded.conf.d 193 SHA256 c82bbfa756be743c60c60caf7939cd72d4107e076145132649d2
 AUX q3ded.rc 742 SHA256 469f43ef952f3cf17cf4f2b6806bf5dddcc3b248361136a780aff1c5e14dc853 SHA512 930b278c0f9ea227b1d64a8167aee72d58ff4f564e46846d4028de8128e66651c47dd52eca12c21e34e3bdbe43a44ae3a6dde6993b556aaf933dad596e027396 WHIRLPOOL a7654f63311cacb1aeb7b320e85e5defb38c22ccef9ca56de5aaec56c4db3d30df5ad751c4fa64af9b04d76b0fa97b474bd6a6cf48342a8f54f00f0bc684d0b9
 DIST linuxq3apoint-1.32b-3.x86.run 30923961 SHA256 c36132c5556b35e01950f1e9c646235033a5130f87ad776ba2bc7becf4f4f186 SHA512 64cff7f8b689e6c801cd68b0f44406a60bd45f83b2544debb8bf1ef7480a1407184a67d2bdafe66e803c0c030b8df6766ce24e48c9e7c610ecf152ed326b7d78 WHIRLPOOL ad1250dbf53e0d5b03b753752e9fc66f361fe2473fc3bd74285a1357e3c1f9fded64806a46766f1bd666b567b8d0fc55a8780633f60af2554abaad9231873cf3
 DIST quake3-1.32c.zip 3056760 SHA256 643ac677892fb58689a86d71f08d6678393efe2939b82c436a5c92368eebb849 SHA512 8bc68d4a1e015e5d5abb88bee1e52cb6375c005d707147869d16383bdbfd37f092a75e8fb3f8678120621433d98de40dcda9dbdbd255a92399caec2c545ff689 WHIRLPOOL 8b55046d002a577087309961074f5b05997d512e6dd666335a38026f006481497a6bb94e5ee9869b0ecdf7767cc26be5f949e157c06e2e477143819d29347f42
-EBUILD quake3-bin-1.32c-r2.ebuild 2997 SHA256 646fc2ae1fa243e6a3c81e61c583351eb6815e22cc4f8b949191097dd86ab0f8 SHA512 2fb9d0d3f8a7ebee6e280daf877f524139b5ab1293bf2c5e02fd4ae5ba49f72537b08502e7abba1ce1f002bfb74130ed6e316033df65f9015ac63347dee5970b WHIRLPOOL c8d05e85bfe017cfd52690342862a31dcb46116b24ca819f34883e4d75438b0ef99420dd5f1e3628628917a037b5aeaffce84a2f3275a05316603a54694d394c
+EBUILD quake3-bin-1.32c-r2.ebuild 2999 SHA256 812faf385c3056fc2fdd2666c6899ce485ee7d08f65df26b3e48dcd08c60e300 SHA512 64fcd21454b0967b31bdd8481bba00f46429806b4f8a0010e75a8f9c4576d3fd6e5b4ffdee505ede74e4d0db75e402b2bbcebb34605beb1a803334b6ceb03dc1 WHIRLPOOL cbe523daa3e2115bdbe58b52e37a11942be280180ed3634a31860f6bdbf90bea86c7d74c40ad2c89a2c20c306b53a5df21dd2f462eb739de1ae81ef16c176f1d
 MISC ChangeLog 2606 SHA256 7cc610a364a146bc3cd6eadc5ef940112359942a264166ddf723b45beda8bf93 SHA512 c88b0ff5f4c2567684e1a129e5cc776adb160624dd4a7102669e823022fba63c6e148bf1831e4517e52d7c18952a2a129689763dafea660676c4a419ab436beb WHIRLPOOL 7a52335f604abfcfde922baf030d7524b048e1f7511a243702e83abd9ae203f4ada07a127476e54908bb9d9eb4b9be1cc5b5bfc0a6354ce9e0bd7f0b21cf6868
 MISC ChangeLog-2015 11169 SHA256 13878c74fb61bd9b671853b5fb3e91133c58e8259ccc86a6da394cd170867a09 SHA512 7324b2b695b790d9324df098f2153aa1568eb8ed9f9105a957a331740c0860500cf05edb5d793f4c04d0615cfeff6507800bc6d1a943a5d26f5cc437e2c5788a WHIRLPOOL a3ef8c193d90b756f77f4f6ae8a9506e68fb80611185d6a724796c5f7cd641925475d767b1062d37e4ff66b06c8b81403f669d31993902707210a932e404645c
 MISC metadata.xml 1151 SHA256 1b905f9e8fd920f177bc74e98bdd8ddeaaf83e53f08578e05be9715132abf51e SHA512 3a76be6152f7b32374df36281551036dcf9a98531347b24250c83dd12ad7c267cb0271c8ad747f312e2cdec2a4ff1c8f66b9ee9898fc58f7b9c78092cbc99ecd WHIRLPOOL dd48a20adb9c09586777668038600df6611292f174aeb60699db602064c1ef84e831b3f4ac55ab777b2fdc06556437e2993b1141a2cc55912e69a17047fcf72c
diff --git a/games-fps/quake3-bin/quake3-bin-1.32c-r2.ebuild b/games-fps/quake3-bin/quake3-bin-1.32c-r2.ebuild
index debf5443b976..e8b0f6c18faf 100644
--- a/games-fps/quake3-bin/quake3-bin-1.32c-r2.ebuild
+++ b/games-fps/quake3-bin/quake3-bin-1.32c-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://idsoftware/quake3/linux/linuxq3apoint-1.32b-3.x86.run
 
 LICENSE="Q3AEULA GPL-2" #gpl for init script bug #425942
 SLOT="0"
-KEYWORDS="-* amd64 x86"
+KEYWORDS="-* ~amd64 ~x86"
 IUSE="cdinstall dedicated teamarena"
 RESTRICT="strip"
 
diff --git a/games-fps/quake3-cpma/Manifest b/games-fps/quake3-cpma/Manifest
index c03f7e01313a..637c3bb3be2f 100644
--- a/games-fps/quake3-cpma/Manifest
+++ b/games-fps/quake3-cpma/Manifest
@@ -1,7 +1,7 @@
 AUX server.cfg 2977 SHA256 31a094ad43054ff6e924b50b2457e9a65ddcf86dde5dc2e839e0922ac7ef7cf4 SHA512 bf380b227eb2c1fcb0365bf930d6c89410942ecc1dec42d1cff1017d9bf3a1164126cb4a22e94b2f3baa3874a520650702b2013fb9b41e7be91151d543106045 WHIRLPOOL 90aa539df5e97437adff8458d751fc9b68146490fbc56dacbae96930281e89d7cd7afe98b34813d4efe69d7ca1450401b6c101b41a7576b8d725d28fd1512290
 DIST cpma-mappack-full.zip 122543145 SHA256 5db933fc92c41f2e0941ab65725586d4d0c30fe84727427bb6b265e4d941a226 SHA512 bbc1ddd378f76ece224403ac7e1aeb1de2fec2756f438be07fb8f018e5e8cc6679cbf574eac51ce75daa0ee53b8b095ce5b46dffbd120df5450039ce754b9b37 WHIRLPOOL 332dba5fa7f26346e1fc5475b124022b9c3753dcf1ab7414ef9797871538877603267238aa3d0ad48715adb8631c036a5c35f2c5a76d1faea67cf21fe027d476
 DIST cpma148-nomaps.zip 8045352 SHA256 1f0aafcaa48a16880ab4541aaa8b9d017c6c0b90c8fc0b4de871f976c05598d5 SHA512 6908065a98922774f3b80924a7286fe9008dea0e6e5e7d808e07d9d474bebf30c3e4ca2cd2587c93903095213fbaaff4154d309fd0ca002e80e871c99631c120 WHIRLPOOL de057e185d06778c5795070ea6f3139703df5c9550c7f3db7900d2bebe6b558a6e13982f8e0802d26e5ef2d27bf29654566f9f13af9cddd5d30642ff3b64433b
-EBUILD quake3-cpma-1.48.ebuild 633 SHA256 a2904d774285eab550fadbdb685785aaeefced991df12b9524ac2dff6387101c SHA512 54fa811d0c7be9a24ddba8244b9c7d9968549d7686227fca3aa11a7b7a35b7f6ec05fc525b9afbf2e2cd83a3059f0af12045ada0c150335b2f8195ffece66186 WHIRLPOOL aecaa2db4ec00eb9748527361191a847622e33d3e9da023e301add840930c4a256d7e950bf19bc8a0a0bc9a71589a44f26e3e53ed5b89bb66196bdd057a86912
+EBUILD quake3-cpma-1.48.ebuild 635 SHA256 0f0896bf4bfe25fac0411adb30b7da94533e178dd3eb80deda77bedb198e028a SHA512 17457bec277ab1626e28f929719748e8ddb6e8e561c8d1a48b2827f55f3db3165447ce2abf19f792e4fa8f27223ad74d8790053481b9ca7901a222b1586893dd WHIRLPOOL e20bdf06e1896abe1371a3c84649c46c5539e52fba92b67fd9729f2fdf550ebd197120b2a2ad80e582d1b24d42314cb42b9cd4d8e0df776c6eedae98215bf23b
 MISC ChangeLog 2629 SHA256 b7ff02e5929c96ed873c36d0716af65b0f64232f67599cd89ac137cb7a505885 SHA512 75637e86cdbb8d9d36c9eabceb68d0939e5554692290dada3347caa204ed7eebc375e6f52c9c256a942776447b93d516ed6dff28112fe633adcb6dc044d1c157 WHIRLPOOL 39f3f84ecd225040cec0d56f616db508dcf6a11c5a662ff21026878565a40eeb162f1177f6ecd405d50f240830ded7191775f3ab24e5b49d45acb6d48cded888
 MISC ChangeLog-2015 4100 SHA256 d84afe5b742ede807b5f262dd3d8ee5f256190a01bad5a0d311ad33033e02bc5 SHA512 e83be9b7ab0d2d58c7ca5b139b94cd09250f7674a1dae2daded09a9c01020d9d0e9d97f4cbef708f7c788f8084a3bc6e402dabafd13e162cc1dd4ec5f9f84227 WHIRLPOOL 17fc72e4b357b86ba7b6126b7850febbbf630f8c4e7c2c736165b37432fea6aba36ababd2db4c23d7a505901c1337a8699b528a7eee5a4a674f855c7add40606
 MISC metadata.xml 2140 SHA256 4543eeccb0b76e9a6dccef48765c6d98c0080d8a0c55f000e764f47e797ba304 SHA512 3ee4c8bb057183cc7aa852ce76fb793c9372ecfac8569eb9b8361e1c18d659f907424098733f3fe3ad24eb141ea97e354a6a8d813c0f5fb3e6f2de70bcefcebf WHIRLPOOL dff441cd07c2acb631ea71e2040c1455387dec0633a607601c6ffce30260262325932fd80b9520f71cc15cbfe8bd731b0614be16c8747a5aef9e946277b63b7b
diff --git a/games-fps/quake3-cpma/quake3-cpma-1.48.ebuild b/games-fps/quake3-cpma/quake3-cpma-1.48.ebuild
index 78808886c95f..91092175ebe1 100644
--- a/games-fps/quake3-cpma/quake3-cpma-1.48.ebuild
+++ b/games-fps/quake3-cpma/quake3-cpma-1.48.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://packages.vstone.eu/quake3/install/cpma${PV//.}-nomaps.zip
 	http://packages.vstone.eu/quake3/install/cpma-mappack-full.zip"
 
 LICENSE="all-rights-reserved"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="dedicated opengl"
 
 src_prepare() {
diff --git a/games-fps/quake3-data/Manifest b/games-fps/quake3-data/Manifest
index 17022667bebc..8065372e9044 100644
--- a/games-fps/quake3-data/Manifest
+++ b/games-fps/quake3-data/Manifest
@@ -1,5 +1,5 @@
 DIST linuxq3apoint-1.32b-3.x86.run 30923961 SHA256 c36132c5556b35e01950f1e9c646235033a5130f87ad776ba2bc7becf4f4f186 SHA512 64cff7f8b689e6c801cd68b0f44406a60bd45f83b2544debb8bf1ef7480a1407184a67d2bdafe66e803c0c030b8df6766ce24e48c9e7c610ecf152ed326b7d78 WHIRLPOOL ad1250dbf53e0d5b03b753752e9fc66f361fe2473fc3bd74285a1357e3c1f9fded64806a46766f1bd666b567b8d0fc55a8780633f60af2554abaad9231873cf3
-EBUILD quake3-data-1.32b.ebuild 1165 SHA256 608950a81972fbedd67d78f9cc2b6256a54059292242ea458ad15b85cad0c797 SHA512 7a9e01e1bc9ae4ecfa83cdea4e7af0b5b3efe27366e133631b97f2f22bca6e4d9545a13d9fd63de78adab4bfa83b2dc891a0e1a6030b7572dbdae7c9d5739d5f WHIRLPOOL 4ad55decadfcd937392bff2c84d5648eda085c5f4209499f2a9a79e3956c4bf21addefef09ce691bceb035f3c997c9d0d635957151d993c4d41a65b91da0e5e8
+EBUILD quake3-data-1.32b.ebuild 1167 SHA256 3fd00cacc4cc487baa2e5d2a2dc6fb609d8729c482d988f505f2d6522f4e1b37 SHA512 57bede2c620392fa1407e768c63e0fa9f8733ecdc1a63612b8854d458e4cb40745e546391ac661c65fb6a40f16b9bec076972f84f7646f463e7de2199918a7c8 WHIRLPOOL 4bf551633670bebb51b8033e76cc3f260fada70965fb3a48ecb489582615c49b12920181b3d8551760b8776cc897d161e6de8759ea6f596a4c568f70edc43a7f
 MISC ChangeLog 2440 SHA256 90787f2e8a41aa4ae431d38c2124c1b48355207682458cbf56667c63de868f5d SHA512 9a8f4f035832b1f5a4cff89b96d263e6ca6a5626b3c52b9eb188ab997297d8bad9d434c36370772c95ab1a7517188e49c588a277cd702ce4bac68dba25b844f3 WHIRLPOOL f87c5e90de185d0a241cf0371d8cf7282f51aba47b1e32c5d73d23b9f42782ef850c53bacdda57db87f0a4f9b485e3c7c8aabccd9ef7c56e36f1c4977f7c71e4
 MISC ChangeLog-2015 2366 SHA256 5c9670bff5c6f0eca9302ef02b1143eda1490849a326a5457a12ca7176a66872 SHA512 a2483887a252632051bda66137fac8dd3e70cbbf0e8a4ffe6fd0391fece8e99e9a2ff913775145ce9e65704836260a0122262df2fc5c1389be20aa091fce8ebb WHIRLPOOL ff3cc582d6e77afd7e60a4e78709852bffa4a5995ec3964208937ec79dd2dd2fdcf887a12239f6663ca44393c65ef8a05e33dd3c616d7e7fb42be02d18d49508
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-fps/quake3-data/quake3-data-1.32b.ebuild b/games-fps/quake3-data/quake3-data-1.32b.ebuild
index c6fdf94e9c8e..bc98a7d7c2e5 100644
--- a/games-fps/quake3-data/quake3-data-1.32b.ebuild
+++ b/games-fps/quake3-data/quake3-data-1.32b.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://idsoftware/quake3/linux/linuxq3apoint-${PV}-3.x86.run"
 
 LICENSE="Q3AEULA"
 SLOT="0"
-KEYWORDS="~alpha amd64 x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~x86 ~x86-fbsd"
 IUSE=""
 
 S=${WORKDIR}
diff --git a/games-fps/quake3-defrag/Manifest b/games-fps/quake3-defrag/Manifest
index 82e263602b0b..562bd87e0c69 100644
--- a/games-fps/quake3-defrag/Manifest
+++ b/games-fps/quake3-defrag/Manifest
@@ -11,7 +11,7 @@ DIST defragpak7.zip 10915548 SHA256 30b18b716c03f562251e4f63b2194ab20289e7aa7f9e
 DIST defragpak8.zip 11972907 SHA256 94ebe9210133af7f7645011a0983e66df53604f9f1cc38431ad4786271892b61 SHA512 f6dc7646b87f5a9ceface82f479064b49d2c6f785d9f0fc7228bc6b4e399d90cf72d6fdde71246fe5bc75da0385734cc76e6ac66d9760f9b85b90359d815b080 WHIRLPOOL bf852151480f0037f1d9960cbb8eb732352d58e0226a7079836acbb646a6645fe7b279797b0d422e686272e22076cec729a2095a7ca271e2ed9ba7c41fdb3426
 DIST defragpak9.zip 8531944 SHA256 b6863f6f45fe144881cd929c063d8be747c0d637747c00d740f70ef4304d6f92 SHA512 8c03a2a5d8553792bbd2557c8a19a66e7a2301d87c2e0f8e695700c26ff32a1d83ebfd47e18060fc9ca6d6acb5772566b659ce0567d36da99add65d5faabdaa0 WHIRLPOOL 5f4d237c5ac57f0a1fedf69d05229e849da2b8c5e6f87372402e46dc894e1d69510b44f21022e3cf221592445fd3e1bcb9032083aeda7b4f35374b2a535c55ab
 DIST df-extras002.zip 6538951 SHA256 5af99333250c96fed4f3f7654a032e2e6a5cf8db5642ad8e152daf8bda37228c SHA512 ec4fcc2f42f2c130babd5712a548eea836307b102d29d5cf4402924f4ffdbd8dd9d6872b6d2be0c277a19cf7babd4ea163733895902946d09df1a9e94372dd48 WHIRLPOOL 03e679aac8e3d213f571ab4b83a8614fc6e4d2ef4ad15fc33c5b8adc2bd2b670f75b4a0bcc63d61e2a5b07d289c5b5746157e0e71a65c70b5a43e1662cdafb5f
-EBUILD quake3-defrag-1.91.21.ebuild 1394 SHA256 ed14bd689944c71974517a4f1ee91e296fb835af713bac8d8763f75e75ebf5ec SHA512 420a551d667e61f26cc417a610a90e26119dc65d8db4ecef8e2d4628f1647107ff5ea72584466d8231b483334799b0eb7e39df5b97d3e5944f211d47ba6082e5 WHIRLPOOL cb308864dca40202196663a73841fcb4df113984746b0edfbc85ab6056504167a7ce745dd3d33ccfeb36bd7957cfd8949f19e18e6db0bce31a4556ebebbeec39
+EBUILD quake3-defrag-1.91.21.ebuild 1396 SHA256 9c75ee8af71a178d7097bd13d6215fd1497a7bcc18c43135a10a5ff334a308cc SHA512 4961f526e5f051b1d749d7749b5dcb25f1d8906ac17b73f00a1b7f537bbc76f4a115f1e3ddadf60242dcae00e66590cc8d5d01ab36ba796df928aa80c054dc28 WHIRLPOOL 7df65cfd48601b163b4d1c38405c132bb2a92c823f45898d9ff2a73a3435f049990d094420dbfbe599dc3472de12abca6357fa7cd9d79080a537142826e75d92
 MISC ChangeLog 3294 SHA256 85981bba5f15df982c013a76bf21a7b4f1567196ec8fb1124c9848512943ab73 SHA512 218e5ad100236ded995301627865d94967febab92da45e95e9b1c4da94440bc0069de7914a1e1508fd7ac40836f301fc7325b24920b9ab2b7182e73faba8d86b WHIRLPOOL 13dad738ae6aa492f447a1a5abffd4aa3c2b07076580640dcbacc0c22e4ba4ac70af703e310950eed4b5603beea28d90293cf1a71ff065d206a10345edf9ab73
 MISC ChangeLog-2015 2185 SHA256 81f577b50b7efaf7ab5120d2b37ebcbbb19f9d82f9a90b73e617c57d973d0f54 SHA512 f7c576f6b15fa669f7eb88edb64387e538b1923e3feb4b5af443617df46c19ad0287da27241387be8c2e9d10b98f10f00fc0b1e5aab9a16803dd755bf48b5412 WHIRLPOOL faece3980967016a5b42bc7937327893626eec19ad2d8be5699a2fa5005fe99f986367a17f1f260c5ee9f7c6fd1a0075a635142f7fb2fba0712a5ebc1f590dae
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-fps/quake3-defrag/quake3-defrag-1.91.21.ebuild b/games-fps/quake3-defrag/quake3-defrag-1.91.21.ebuild
index 55e6be2cf652..aeac35425a75 100644
--- a/games-fps/quake3-defrag/quake3-defrag-1.91.21.ebuild
+++ b/games-fps/quake3-defrag/quake3-defrag-1.91.21.ebuild
@@ -24,7 +24,7 @@ SRC_URI="http://q3defrag.org/files/defrag/defrag_${PV}.zip
 	http://www.german-defrag.de/files/defrag/defragpak11.zip"
 
 LICENSE="freedist"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="dedicated opengl"
 
 src_unpack() {
diff --git a/games-fps/quake3-demo/Manifest b/games-fps/quake3-demo/Manifest
index f27e2a3b8363..099508127d1f 100644
--- a/games-fps/quake3-demo/Manifest
+++ b/games-fps/quake3-demo/Manifest
@@ -1,5 +1,5 @@
 DIST linuxq3ademo-1.11-6.x86.gz.sh 49289300 SHA256 64dee3f69b6e792d1da4fe0ac98fedc7eb1e37ea1027fb609a9fadd06150a4ec SHA512 aa74f8e1e8b5036fd68761e5f38cbc3d771e9bd0d5c3cc1f5d89d7eba8fd4fda8108dfd4f31d2b846114e4ec89f6aa15849b95232e0570181a104563ec0faeb5 WHIRLPOOL 558a84cf97c142befa4585eeeeca609f3b5c1880f6fda32a79de415d28779cbe2f69e9c901f4a7d8e0f60acd6279a7a9be69834cb6acded7d31ad630ffd3847f
-EBUILD quake3-demo-1.11-r1.ebuild 1453 SHA256 50ffaf708a24fa71253ae8b1392c2d117e9c6f93f05755adcef153e2b05881a7 SHA512 48798ebeadf0a3d36a68b5cbc4e3292a22d712aa9716d584fe5923f66d4da0c3935eb5bce65736bb288d50d5df5050490d72fa2601b75270e1ebca9f685a102e WHIRLPOOL f523d0100edfe1c5524f6404bd9267299812108363364d161d901ad7f118159338afbc1032f866837b4e2fe280bd74ece647a3a093091f59a5de31120ebad59c
+EBUILD quake3-demo-1.11-r1.ebuild 1455 SHA256 1b9d267b8885d41d5f2c97809beb54ece2f6a5f91479d40e66558038710ebeb5 SHA512 4d5c7679d46c0684d360fde55f8c6d306a7c3325320e088fc55b07b9121e55ba25406d6772e0bb7df8241c2f767433e08a0783a692a750476760c31a539f979e WHIRLPOOL e3f473e5150e5223313adbf667536b049ca007f729ecbe20b0817ee6765c50ebb2187f5ed2e2412f51356e058f4a4917881c0ef04ef5017e067005d2865b1b41
 MISC ChangeLog 2837 SHA256 f96edc413e410b582e9ad5b9108b0df31a5701f663a7ffd7ebd597651854881d SHA512 b09ce7c4beadc56c6864394fa76f91251cff672015855a82412d284ebc28bb7c8e0474c47e36d240fe677ecf214afea5c45810be012c841c25caaadd22e5d252 WHIRLPOOL 7d441c6366b346859f7a405a18275f548c52464c9fdd75ddfca28e334429a487388b9c7757ac4c2190fc92595ed0ece9776f75fcb9bbb4012941e8de1a8cd3fd
 MISC ChangeLog-2015 4301 SHA256 0b97e49b0313b9c397991f988f1d07a30fdc6dc004086ce8299b0c0188520bc2 SHA512 c9f5f97c221b8e4fefe4b4deb7e82c2d80ff79496983ed4c7d7048dd1f7ae01e665accc36f165068c19e7f7bbbe2fcddf93f2469bb835767bf6305f16d4348a6 WHIRLPOOL e048282563bffb87467f2b878c96e7ee44b989bd6821b8ce1b5d3e84ec14e2de12b52b89fa7e5bb80eaa8993b156985df2e33be5ad712a814246d7430f23d687
 MISC metadata.xml 332 SHA256 da68f23825dc9c6ebdddc17710e42f23203493f3508417a94f14a2d3c9bdf52d SHA512 0852d9f223e893d40f4376708c32ceb59b5df65c5cb345a3ba81700ec4198c6bb7396be42910aa3c406df40b8bc4d97d777624ced523cd8de56f4dd406a89d01 WHIRLPOOL 7f8f2bdac24594f369e64984e99223f891badf773f254d2aaa5cace605a1c09f6e440eb26d76b35a42889f7ff0893144f460f1b5ad6b94335b77cc200e0b78e4
diff --git a/games-fps/quake3-demo/quake3-demo-1.11-r1.ebuild b/games-fps/quake3-demo/quake3-demo-1.11-r1.ebuild
index 6096e3f9f8ce..6d37eb990467 100644
--- a/games-fps/quake3-demo/quake3-demo-1.11-r1.ebuild
+++ b/games-fps/quake3-demo/quake3-demo-1.11-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://idsoftware/quake3/linux/linuxq3ademo-${PV}-6.x86.gz.sh
 
 LICENSE="Q3AEULA"
 SLOT="0"
-KEYWORDS="-* amd64 x86"
+KEYWORDS="-* ~amd64 ~x86"
 IUSE="dedicated"
 RESTRICT="strip"
 
diff --git a/games-fps/quake3-excessiveplus/Manifest b/games-fps/quake3-excessiveplus/Manifest
index 47e7766ed5e8..ab36aee72e85 100644
--- a/games-fps/quake3-excessiveplus/Manifest
+++ b/games-fps/quake3-excessiveplus/Manifest
@@ -1,5 +1,5 @@
 DIST xp-2.3.zip 17266975 SHA256 213adbd718be00c49a6cdc539b0372f99703042d7afa3a6c31740a3bc7e06820 SHA512 80a8663c8d42139661ccd5333f9c543854ad82ae38f7838139c78413f7fa3e163c27a66aed4014e56ca756cabf2fd835179cba2336ada7158fdbde1e2841535b WHIRLPOOL 3c1df12ddf96fc439998089595fdcfecf25c65e3e12f2da7270f4e5a016229e9da66beb246d2515d63fd0c73b36ff7b6e3178be7a2a6b7e1fc96ac896a7be481
-EBUILD quake3-excessiveplus-2.3.ebuild 515 SHA256 28ba2ba132ff955f0a4dbf46e948d22abb73db3c4275832301304d58bbb6ed67 SHA512 b38031ab8d01c2033fb97c946e541801ef679872d182380395da930c796385f2d0fc143d2aba8dac40a079c14b16687958b4dd9afa133be7bcdb5ec15ffb1a01 WHIRLPOOL 151af46f7088b1c660985152cdec77277f1a17eb898bee767c67b4621838a65946b8ba3e5eb032d1a55f889104e0a62293b688baf3cb0768e7177eb1e0e72de6
+EBUILD quake3-excessiveplus-2.3.ebuild 517 SHA256 cd290ef60ce505b3687cb981351803b58b8e1b298f987a55f95ddfa2c3bf9915 SHA512 26acedb248045291ed82c8cf8b0df6ff2d313ba8cfe8e059328b71b1475eb2ca19d21e8a98d512cbcb227a32ef82e2f3254be7440d467bc582b4a83aff9a3baa WHIRLPOOL 04a0bef18c3ea17f4c802d25e7485a272f375ad46a7d534412251f184bea472d7210158631a502b8277bf81a46cf3c81b55f5fb9a3ae68088e2ea5db107bc8a9
 MISC ChangeLog 3412 SHA256 e50fb73e8b0cc6453576833948d2c3b9ecbccf16a81c2c20456537d49134cfbd SHA512 9f8134c1641baf57c3ff417efc8c562de7242ab347374c382b4d46b53eff8fca78d55e9afbd1e5e1bed7f69e07f7f1f0b425f2ba4c27fbf62cae2445d5981deb WHIRLPOOL fd0640a5cc89a31931c6d2fe2fb409c83c564faf2008eeaccff96943fe209a79986a56dfc95aee72e2eced07be1a4190ed814567befbab6367970a36dc07774d
 MISC ChangeLog-2015 1046 SHA256 c9adb6c59dfb7a4858c0f062841dead975442d94967c577bfbe937508f146bb2 SHA512 28aa5b1fa0528d0d91347747c56338cf7aebe997e77384ce33bf303cf947d88d8544621ba20aa0ad54f79e56f19b9a482e25cd539649994f71137ff45866947c WHIRLPOOL 0dc79b2292849ec1f2887b7678880b5a11e4d9c987a604a7096e0a94dacc2ed017dde0df943e9e9dc01de67747d7216fbc78bbc3d8f61ee50cf60ca7651555a9
 MISC metadata.xml 800 SHA256 6bf74be58c5519f4bcb9969e80c8b741b3efee10dc325f35878c871d0cc82592 SHA512 4320259a818af53b8d6034ec82e6a329113365e0ca7e0465897fc8cef064089154e37db00a92b8c1ffbc53307f9ea6033ec002923e0b53b29672f1ee531b085f WHIRLPOOL 6981058cef8f093184afd3ba192d3e0ff37a6813928deb8a4871929e672bc3dd90896502aff9f0f30f70d79f5dd73c13f1ac2685b31f6a8c0e7d5c0a7b919308
diff --git a/games-fps/quake3-excessiveplus/quake3-excessiveplus-2.3.ebuild b/games-fps/quake3-excessiveplus/quake3-excessiveplus-2.3.ebuild
index 4ebf2a5101a2..735d31c171cb 100644
--- a/games-fps/quake3-excessiveplus/quake3-excessiveplus-2.3.ebuild
+++ b/games-fps/quake3-excessiveplus/quake3-excessiveplus-2.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.excessiveplus.net/"
 SRC_URI="http://www.excessiveplus.net/files/release/xp-${PV}.zip"
 
 LICENSE="all-rights-reserved"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="dedicated opengl"
 
 src_prepare() {
diff --git a/games-fps/quake3-lrctf/Manifest b/games-fps/quake3-lrctf/Manifest
index c79cb3e1346e..f51ce1f8fb7e 100644
--- a/games-fps/quake3-lrctf/Manifest
+++ b/games-fps/quake3-lrctf/Manifest
@@ -1,5 +1,5 @@
 DIST LRCTF_Q3A_v1.1_full.zip 340050745 SHA256 aabdb9b41c63d1d8978b29e7821011e0fea9e4d52568cad1ae4f8e06638c3c0d SHA512 0e397d8044427e0dfe1bc3dfd288b7b3988e9705018c5005c87feef68b065826a7117962c0172ebed48ba1bd63b67e4264c8282a8495d6074a0e26224f2ef533 WHIRLPOOL 12016f49830ffbe4a72e7979741d6610d7f5dd2b6e9e6a9fb7f83fdde73507afa37efdd848425d216ea3aa3a71ed18dae2984fdb5a0f99b6fece0cf2a2abea4e
-EBUILD quake3-lrctf-1.1.ebuild 404 SHA256 977eca5b0b185f3ca79c48b13f351c8024231a1414f6d533bc1e2255388ce3bc SHA512 ddcc209eaa7dcd0bd1fb514b3f88359ce8d3e8b0a7b3acd1574071a0e84e4f4afd663abeba932a0fcf547d759d04679ca99fac111bba7bcde3bd6dfcee0354d9 WHIRLPOOL 388ba7c2807f15c8be41a0de3475feec8cf5d21736322ea4ad4322e07375ec5ceeb854d0f69dfc20fbeb0c3772ac53f53be104efa3534eaa805cc8b57e652a00
+EBUILD quake3-lrctf-1.1.ebuild 406 SHA256 4e0caad89029795b47ae254512b7c2c5eae61354cb01c058093db280bfd1cbf6 SHA512 584fb48b061ffa8c27f08322d348b83ee10e5a5f8fdd289e6d221d62b97058edba1acdccda4622f4a5d6735f17e0d7b044614da51984a248478be72b28dfe7ee WHIRLPOOL 1ddbfebb492c6a220b385c3153edfacb5c26b6f711bc34cb16f1f5437368897844ad87820961edb01804bf853ff7b38c5c0c53b1dbd02de94a13be190c4c3982
 MISC ChangeLog 3034 SHA256 3b95851b7127477096ca09cbf7deb3d55b8075ec629c18eccbe630ab456864df SHA512 f0df4c11aaba021c2a4766591001386c427891a3b5f6c3d7d0d2704253d445795a5834b3c6072e71ef3f4b03cb55e64b75f15497cbc10da00917b4897fe4279b WHIRLPOOL ca2118ff0a824d48215648ed6174f1874ce8342eae2c294fb61f5e22d6aeb3f08d8365976ed97679f7c9ea9cf69420430acda345cade29ff1aa7150c9210a792
 MISC ChangeLog-2015 920 SHA256 92677fb3704e20781e55737809522d6ec2e690a0db106f77c2cf5808b6b64c3c SHA512 a1faf2ad31dc1da4a0129351deff616b64b5d12c5378c5f6571d6567936c344c1bf0e69b57aa945a3d38988a736527d3dadb315a8e8b0b168636845fffc3b8ec WHIRLPOOL c624e5a76661cb91af67ac9d38321c688029be9a7a0ac3c06eeedeb25b7e5f74ab81ce999f86dd240e2f7bb6171baaf8db353f62b0ce224d1a28ae88ece43db9
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-fps/quake3-lrctf/quake3-lrctf-1.1.ebuild b/games-fps/quake3-lrctf/quake3-lrctf-1.1.ebuild
index d2d64197a680..8ac9cdec512a 100644
--- a/games-fps/quake3-lrctf/quake3-lrctf-1.1.ebuild
+++ b/games-fps/quake3-lrctf/quake3-lrctf-1.1.ebuild
@@ -12,5 +12,5 @@ HOMEPAGE="http://www.lrctf.com/"
 SRC_URI="http://lrctf.com/release/LRCTF_Q3A_v${PV}_full.zip"
 
 LICENSE="LRCTF"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="dedicated opengl"
diff --git a/games-fps/quake3-matrix/Manifest b/games-fps/quake3-matrix/Manifest
index f4e82c1b300a..e63e4d07b482 100644
--- a/games-fps/quake3-matrix/Manifest
+++ b/games-fps/quake3-matrix/Manifest
@@ -1,5 +1,5 @@
 DIST matrix24.zip 21191819 SHA256 5c748941c857bdeaa7daa9ffd1ef5aebb6113a4c89709d6132c3a6eb4188abcd SHA512 f19b7d9d6b54eee23480a4217e6c47fdca184fcd7653a04a147ad6a2af6151420381adb340db37f445e3a23d8c0f045c760c7f10218d6c2622f9cb74acd792db WHIRLPOOL f0748dd347b1c4d5b59a4df00ee863bc0eecc223872eaf6448af241907b122bc07bac2fcdae1031ec25fcaea0b13d549709fa004e267a63c371487498f3f606c
-EBUILD quake3-matrix-2.4_beta-r1.ebuild 462 SHA256 bde8561f69a2bb87880a2b7b7860433355daf0414a45773978a0a901dba1e404 SHA512 003c35ec8415fd11a815540444c5fa0a36c5fec540d6a7b9aba93429f6ec512b4ee9c2019717f1bd14adb803ba2764445e0271fb273d7916ce35269b1aee0021 WHIRLPOOL 4fa5589a0e6ad5c087d477f1b4b8c4b2cbad4f1c65c9a41adf89af3695e445ba05f2a4f5bfcfee20388edd18c11b10bf39b9a20da8e54120f9cf2643ce08081c
+EBUILD quake3-matrix-2.4_beta-r1.ebuild 464 SHA256 45317a9b2a1fc9cc5fea09dd9b9435052a2233d1f3acacedcf5137c991eef693 SHA512 41b1ac01469c1f1531768d00bf5bdac3fc7e04f6f92dccbeac97e9dfca67e62585fb6540933d9de7bd4028925a4c037924f4a92e1e26b2c22bea90aeb2806c75 WHIRLPOOL a457827d56a26347ec0df2e94b1f4788cdd686e10bb065cb139936d314b98882688375de03de47e20694d2edbc7ae0a086940d27b6cf4bbac54b31d84438bf63
 MISC ChangeLog 2594 SHA256 217d387e0ba0cec691eccebe5bdc65e6cf94cc76d4a76e221e9c0102441e6907 SHA512 88f1fb1b6709cfea33e2ffcb30379f9522961bd373413bbb13334c1f46ebf9a35a6250b6a0b9692be7350a60be01c046036cd36dda148805e369cdf3b712dafe WHIRLPOOL 9e0c007a4e8656cc0a3e1b81a5e22d29aaa3ed0b8e8788f479d1d29f3ab263cf0180a27d590d8c917169c4da6366eb44709c2ffba184432b5368f09334d02ff7
 MISC ChangeLog-2015 1092 SHA256 0e1d717ebc2867e9f43904723adad207500f72a33a26b51953d2499243a038b3 SHA512 acd74ea4b10d871425f2c4857d174434f7f6a83f0803f178d1f4e9a1488890f152ef3647c4fd4e69ecc2d91b7ba9e6e1c80d9e18974627a2995f7f41176a0178 WHIRLPOOL f2a0804b875a1c342bf7bb39a1e829a66ca857d8cacd98a1247c5f0ca54e9fd945aad6e86b3f45e87c7648b45c1881d3377d2fd394ff3333f08bb1d4e584d457
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-fps/quake3-matrix/quake3-matrix-2.4_beta-r1.ebuild b/games-fps/quake3-matrix/quake3-matrix-2.4_beta-r1.ebuild
index 2a5f1e35177a..2a05080d57fe 100644
--- a/games-fps/quake3-matrix/quake3-matrix-2.4_beta-r1.ebuild
+++ b/games-fps/quake3-matrix/quake3-matrix-2.4_beta-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.moddb.com/mods/matrix-quake-3"
 SRC_URI="mirror://quakeunity/modifications/matrix24.zip"
 
 LICENSE="freedist"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="dedicated opengl"
 
 src_unpack() {
diff --git a/games-fps/quake3-nsco/Manifest b/games-fps/quake3-nsco/Manifest
index d9b8c9896de5..ffa5bd0db721 100644
--- a/games-fps/quake3-nsco/Manifest
+++ b/games-fps/quake3-nsco/Manifest
@@ -1,7 +1,7 @@
 AUX server.cfg 3518 SHA256 528f7f5f2bdc8544ab9e5dbe2271e787cf8623b163e363b2fed1ce68b3e5c073 SHA512 2e7719a5805e92b9dad5ed38f7865abc1c7cb31390fe5240edf1e5a421529d49eb5811b753ec60cb6bb9c8e6e3ce2053004225d661f5a671e3d84820230148cc WHIRLPOOL f0bcf6160a94714af5914dd66fd7b9b9d8266ad78c05bf9d84c95d21e19f1c6612edb133af163841b7f154ce94b7f792ad9ab59acdb6a88c1fbcce1a1de7152b
 DIST nsco_beta19.zip 314224296 SHA256 0789515b88e8dc499ed97bee3a7df1a4be3657c8f30c519b3687560094988572 SHA512 bf125ab25e841536686e0a4d7de98b62b35f1034e9120daf86a1c2536b189252f22ab0b4105337e311758103cce7a9e1f371d5ba4f859dacbf2d7b41e48952c5 WHIRLPOOL a70b8aa6e86366c3369d06a4b6120a5924bbe8ef21a06efc83c2dfaa9743d86a2cfaf51ae5215042d66dca8f7e7d7c90b28def64431b002be1181a7c3e78b639
 DIST nsco_beta193upd.zip 55808681 SHA256 6d6102c5946f79d4e6174480d8d42b9a95463131e5e26e7c187e8bb21a535004 SHA512 8233a54b65ba29babab47056468fb112cac6a687db151d416dbabb754fe03006db4f0d0bb403e0e44f03d2b6e99428d67aed0fa27d4473331035dea5bc3563eb WHIRLPOOL bdc35b8dd4dfbd3cdb9bf9723eb31cf6904e6b1a42338645c3f40f77ab53f7fa36ada4de4ad57cfc3aaece731c1061ed45ad6674bce940ab7752d28b560f85aa
-EBUILD quake3-nsco-1.93-r1.ebuild 565 SHA256 d6f4eb9983d310cc78a664c432c00908eaec19ec15d1abf939d7f62895b612f2 SHA512 71ede45a67543ee4053fecd9a02d64f45f43227f66a4d496955a5890661cb90f5bed0ee6b6a4fdeb556b7001b78a32649cb20ee2189d0e91d87290f5233b9c26 WHIRLPOOL 77b8018468625e617af4b0af7b967b33a47c9d8598ea58ca999c04648d53cba36e41c55f7b14a4d5073abe7e644eb2b78077bc5876fad2496173c5ffb0a0a9a6
+EBUILD quake3-nsco-1.93-r1.ebuild 567 SHA256 a87fd517c405e6d1a3212a367a6ea493bec0217132e0e4666e28e4a1917571fd SHA512 366db429bce4b8dd2706967c5f85821cb7af30e8d878b210647d86abd23ada1069bf8bd75737aa8cfb254e83967501badf8ee0f7c7bf942278a677891457f56e WHIRLPOOL ebdfdc16ff28e36f3f5b2946b28b66e0cac00d0633bd8c7e3940f2dd8af96a6bc5b1aa83c7aa5a467146985db1774f0894aee444bf4dfd2f43616e53e143ef5f
 MISC ChangeLog 3031 SHA256 48a5d1d44a981c2ff23280aa938c186919f29eef7265a2380c252b2a725575ae SHA512 d75325bdad5ce5631470f0242bf04af88a54780c7be880835c3023d565d3eacd8942fab6899cd4366dbb96f0850a834eb23a78177056e3627f7d90846bb16c3d WHIRLPOOL 66dd5f11037959b5bd42889496a066b42ff3c9055c4ea6d30f4146a269110268dae0253f5b5c88c1f3511652f22a1709ca5616ed14b72dc1d2b66f50162153e7
 MISC ChangeLog-2015 1659 SHA256 25961030c8be4b07eab92b072ca64b6a989b8441f12f56f67c0c3a532db3a8b5 SHA512 bffd5d7495f6e0a5a80625ae54a03d3fbdfcb62c99e7db27e03769706fc7cf766270d617390b8155205d54462e99ad578574e74450404bcdb4f9c69578ead3c6 WHIRLPOOL 1841bf9b63f9072e0fcd30105be00d0709867c55d3381f452416901127a4592b3c7f9b1c6ef185477194d5270183ad2a715090a72347981abcb16275c6a35645
 MISC metadata.xml 1006 SHA256 2aaf102cab2adac6542487f88738e9b86e519e99c71558bdc4a8f95a6e4ebb9b SHA512 8937940f78ff4174f570be92d750fc19d7ac8035acd1523044c818244414a11e08a61a5b7ff0559b40b7b3ba7d8ac7bf5034e337f410bee5b211f49a3a50c6f7 WHIRLPOOL e8c327a4ace5c9b3d7e76d18a0e5327b6d7e9e7f8a6e575e841f57be7218fc4669ad23a4d15d1dbc9d3b08dc2492adac55cab5027f180f4d55a95339e9bc3787
diff --git a/games-fps/quake3-nsco/quake3-nsco-1.93-r1.ebuild b/games-fps/quake3-nsco/quake3-nsco-1.93-r1.ebuild
index 51e7235fb159..0d80eb2dfe04 100644
--- a/games-fps/quake3-nsco/quake3-nsco-1.93-r1.ebuild
+++ b/games-fps/quake3-nsco/quake3-nsco-1.93-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://quakeunity/modifications/navyseals/nsco_beta19.zip
 	mirror://quakeunity/modifications/navyseals/nsco_beta193upd.zip"
 
 LICENSE="freedist"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="dedicated opengl"
 RESTRICT="strip mirror"
 
diff --git a/games-fps/quake3-osp/Manifest b/games-fps/quake3-osp/Manifest
index 761174db489f..8e9c120e1b82 100644
--- a/games-fps/quake3-osp/Manifest
+++ b/games-fps/quake3-osp/Manifest
@@ -1,6 +1,6 @@
 AUX server.cfg 5532 SHA256 30cfb69cb20a65c77a8b1eba8798bd9f59802f538658d93afa4e47fe61b1b786 SHA512 31fd512e9a614950292a7d80b376ec6dbd673773ff973af96ac806360cccf5835d1985d978b078e3d68f632f8ecbb3dfb86d90aa27e2529e58c4682ac89e908e WHIRLPOOL a6eda43d2a78b1909b4b5104cbbaa2d584928504f0b60c3e690e89332af36d4345444c7784f592570a122587ea364ad8000666d2ff5035c32ba3366d39d2532c
 DIST osp-Quake3-1.03a_full.zip 55882759 SHA256 af9a184134733fc24c308b4f8790932d30dc70b6c8a36e050223ba16ba2ac2b3 SHA512 9a9bc76ca2e582432e0f8ff6a3fe0bd2e0b0767a1f52bdea8debc7bc9053dc78951335da085b88e0f3690f1f7fda25a628cff9bace7f683f543c5eff90307e19 WHIRLPOOL ac7ceca6af156b51441907b7ede73f6c24dbf1cfc2966fa73825dfa83f12f3e1701da46064037128622a9bc3959f42b18f1e356d43ea66b5d6505b5a353f4b1d
-EBUILD quake3-osp-1.03a-r1.ebuild 489 SHA256 7c5d05d9b3668f15352dae0ee6f14326ed7fdbaf77ed0b6662e65d710d9a5d67 SHA512 67c34573bd64c4dc01b5d70615ce6111c8249dc0439f0f28eb9f17a2c092d2e3728ebd68e82271763f17d9c57298d4c32224f063ded938f7ec80a83b4550571f WHIRLPOOL 1737fe34cfb0fecf7a5d58ef3baf5d8ae4a2b70e9e187c4f4e264bb83df8c20af403c9f3bce7d00fafb4cc3e0c4f072e4fca3e239ccd1ae2f97edcbd6ca151f6
+EBUILD quake3-osp-1.03a-r1.ebuild 491 SHA256 3d0d73ab6f24f55cdc1079efbd9e4c632b2a62363b4d52772c605d8762bfc4bb SHA512 c91bb86ab60d9f7341086dfb3c521f406787f1101c61c85965035e932d1f59edf31244a85c3ba60f3f259ea87cda57317eab164133c31337e39cb701ec021b7c WHIRLPOOL deb9a7672e48354bbe481981fadddc3ae488d90078cc94f8561458984836569f827da602759d72aebea3af80e69f6bd382ab2aeec5ee9750225339036038b55d
 MISC ChangeLog 2592 SHA256 6fa99e5b2a6c4b2b1a9b8f224e9aa0af342adc11ab6f86fae1381f7dae1c5e1f SHA512 fedf73d4e5741ede03520e3c86b3655310676b884015fdb1e551c6d9e5b802d3799185f5651cf40ef4653ddedb47489b14307fef82ab046bd90f0ac3b3f6e441 WHIRLPOOL c86ac4e1bf5b85464a0dafd447ec3f9c2d4761964d12a0f77d91d9f47f636a9fd83ee03f96cbd7214832e0f1d8eb548fffd2e98e73a15372648a5e2a074b8c60
 MISC ChangeLog-2015 1627 SHA256 dbda413e8b7ad16f1776855d1f7168bcb000ee7e0c0569da4bc6b20a68d96199 SHA512 c82f4c5faea6720bf2603b8501902ec9dc49f7c3e29c61d974f07160e768baf570a37c3903e90ddb3705c76a92726d339d02209ae0b4885c2e552efcf1832435 WHIRLPOOL 0db04a249ef91f78c50f38a48f2b2e8b1364e565afbd1969f5593487101b1915cda0c535bb3d5d500baf0d79970e73da2757bd63bd5719aae2a1e6232bca982a
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-fps/quake3-osp/quake3-osp-1.03a-r1.ebuild b/games-fps/quake3-osp/quake3-osp-1.03a-r1.ebuild
index f6497aa5beb6..f7620d7bea89 100644
--- a/games-fps/quake3-osp/quake3-osp-1.03a-r1.ebuild
+++ b/games-fps/quake3-osp/quake3-osp-1.03a-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.orangesmoothie.org/"
 SRC_URI="http://osp.dget.cc/orangesmoothie/downloads/osp-Quake3-${PV}_full.zip"
 
 LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="dedicated opengl"
 
 src_prepare() {
diff --git a/games-fps/quake3-ra3/Manifest b/games-fps/quake3-ra3/Manifest
index f8525c6829ed..62baa32b68dd 100644
--- a/games-fps/quake3-ra3/Manifest
+++ b/games-fps/quake3-ra3/Manifest
@@ -1,5 +1,5 @@
 DIST ra3176.zip 138018848 SHA256 c8da0edc55961e328dcc35e8d7b317b639b07129897cd39080151475cb7da34a SHA512 64240dcb1460465eac5279162ed04b97f20bbf10437b1519b1da22c73368c9af0e57191b884fb2712cddd8e0086816a871ad0657dfdb73ab70940ec8f37daff9 WHIRLPOOL 3612c2c051f64c7914875cd4f015de82f1c1a5007590fea067d084c980f1a8a145216d3012f780fcf1627736b792aa47aec017937af4045f2212cbaf5d44f85e
-EBUILD quake3-ra3-1.76-r1.ebuild 448 SHA256 d836581361b99f0914618e1f938ec4ec3738b696a3e4d947e24afcd69b999531 SHA512 d7d20a5c3e27248e66680dcec37992f3e147899b6041005952f4aec3cfba69fa537f629f322a37d3d29c5221d85443dc400ec5482998ce3160104b34a224346f WHIRLPOOL 374e7bd0b2bb2e4374a91f2bc041934d48ef6ae22f3681e4a7832742656c282acfe91459fa95e16eb0063b73fb3e3aecc0315901968a04a97dd003a51d6e1e31
+EBUILD quake3-ra3-1.76-r1.ebuild 450 SHA256 8d83a3e96f1812ceef4364db7fbc2b0cc13e849bf7f4d0113f07530d22701b26 SHA512 e11de73b773e1698df917c54b9706d65080461d4c52da4677d3e68b8ec2baf64a05bdaa5e48784f83981b61deb4aeeb5494e360aa08aeccfc285763056796f6c WHIRLPOOL 8a4a6ecb93a9f748240279b6c3288a838827a392e78ea2694286bb46cd9621543c4e2050decb556b867330a48e67a478ec129ee957ab8aa7b96284869e44782e
 MISC ChangeLog 2570 SHA256 77697e2ea33eab8b85a3f5cd4097cb889409f58c50accb0e1e7b80f068bc23bb SHA512 76afdb4e58d714df7ebc53f38acaf5a59691d6a2f18a03a6db1fc9c3d2549147f8e62eb5ac650e2e8a49e37e56f7460c293b53a24e1cb30cd32b312c874b3681 WHIRLPOOL 84d445e29b414f454e007db82c5db61be84ede89adf8c6962538a1cfc5cbbfc86339516795673b78b7242fb699c01549f53e48873ba2cf946557305312299acd
 MISC ChangeLog-2015 1240 SHA256 0b670b3389ac063c449ec526b5b90017fc58fe7f88aaaa1ffc422f1d59aa0c7f SHA512 d009943d789e810add0e06406b9b3b3d8d9ece8796c53b80f6b1cea558a74b8ec8623d6f3a4ce5baabf1c8653a5575debc1487223c78813b0b701d97e29c3a18 WHIRLPOOL dc7dbe222c596d8046c2fefa254c04f51de26be2fef9248fea0a68b286dd56da9caa2419c0c80d9b0f95404678a54b5847524394da2343c2be7f522edc681056
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-fps/quake3-ra3/quake3-ra3-1.76-r1.ebuild b/games-fps/quake3-ra3/quake3-ra3-1.76-r1.ebuild
index 4375d81c406f..b3664702039c 100644
--- a/games-fps/quake3-ra3/quake3-ra3-1.76-r1.ebuild
+++ b/games-fps/quake3-ra3/quake3-ra3-1.76-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.moddb.com/mods/rocket-arena-3"
 SRC_URI="mirror://quakeunity/modifications/rocketarena3/ra3${PV/.}.zip"
 
 LICENSE="freedist"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="dedicated opengl"
 
 QA_PREBUILT="${INS_DIR:1}/${MOD_DIR}/*so"
diff --git a/games-fps/quake3-reaction/Manifest b/games-fps/quake3-reaction/Manifest
index 6990790b9ad1..d55e301aa5e5 100644
--- a/games-fps/quake3-reaction/Manifest
+++ b/games-fps/quake3-reaction/Manifest
@@ -1,6 +1,6 @@
 DIST ReactionQuake3-v3.1-Full.zip 327488276 SHA256 ea5bbab6600a0e7244dffb2cf87a9ba51ca3f4da4e3b41152ca67ee2f63a66bc SHA512 78d141a09d73daedcbaf2c3ec24a7c017592f556610011e8143ebc7c16e24f24bc8575b59ac43f46119beb0eb5d1744e6f21854e19fc5e8ee65a3f6124f2d5e4 WHIRLPOOL 69bc7ff3f7199604f83f4089fb4df0d1dc0d60396ca3859f85282eb9161e6f16eaf4cec2b22c6e2ae42c6a2d20048220d67a25c373bf71ed054f781e59fbf47d
 DIST ReactionQuake3-v3.2-Update.zip 182810088 SHA256 a97c96904e75c7e62503c7fa29c670694d93de9ec846dae334345dc8e936740d SHA512 80d798d4153fe6072e297caad8999c95b3132ac8026f2b2b8c684a63be0cbb66d7c812bd68f9c8c28b297a93664b19962c1bae4741b3bba225099e6db87ae2d5 WHIRLPOOL 4fe6be3a0ab66897df58e88916a8a7dfe50b7d1abf52fdd66004abc30e58f3d36d16ad3401836de75e640748fda2a9416a42a44ad47a1e4a1a210363450b5014
-EBUILD quake3-reaction-3.2.ebuild 534 SHA256 d7d58deaf51b93ca120397d4277727ee26c9e1744113b4442b2c01b5947c1a20 SHA512 f783d4f4fa80fe2152dd6d0f52c3ec6beef62b91c4cd2cf7248d7ad0d187d23cceced5ce4785aca8cd6b84ca0c9075024875cc7b25894fc0ec4f45e5dac1eeba WHIRLPOOL a5907ee57bfb9757b7600a8501ea409ae22aeeb83dc4f13fd93053dd519d0780ff85b2871fdb79fb88d1dbfa7afbf4728db0f3041830551d894be159d7db0d1b
+EBUILD quake3-reaction-3.2.ebuild 536 SHA256 9c679aa044087afb188e7df57d604fe6e3b92b9d104c51a9e2f54a7549eb9be5 SHA512 fbdeb31441d455c9274642f27170e8129d2b132da8e4d63bc8026e5ecdd27cf86915548df78f148bc05c5db38c80e16cd9996229618d38b7ebed07f5b003f427 WHIRLPOOL 4e1a495991b44e7aa6abdd11b4630a2efd3c90144f848be5f40600ef961afbb4d4fe0c2c9ff43e2536a81a868cc86fce41ee59e6f98a79bea407cbcee332ea37
 MISC ChangeLog 3052 SHA256 6d3d9e8acecda35a36d1d6fa42042fb6ea8efabb9fec742659078e9a0dcab8ca SHA512 0a50cf84ffa858a70376bf647f1a95f94864a1acf4f351b377b6fe3082f1e91cd0c70c7b0677c04156a256aac5f6ef6a65a696f7d9bea70f78db0a4aa15adf14 WHIRLPOOL 743c615ebbf5d6816b1cdab4f6b6c92bab700af72e4900d902d2a096c4c3ddb90961a6d25e7a93b974f7a3b082fe16600c9646012876b920312213254a2199b1
 MISC ChangeLog-2015 852 SHA256 6a476d19c06f68e86f4f66abec29ffda40fbfcf3af921245d272d048785d3bf6 SHA512 679c212941da87f9013b5636baf97049ffb6c594bd522f43d5689cfe1c159038c3c1475b9cabf9e43586d966e35c9f17fd03c6a2bb70f5ec95226a284796f539 WHIRLPOOL 88fa8abe0611ce813ca2e1788adb396680e2143e45c4756befbf0dcd76223bbaae18e13ae7a9629cb6eae48821d64c5ea512c7eaafef34fcb50009603e1e0f3a
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-fps/quake3-reaction/quake3-reaction-3.2.ebuild b/games-fps/quake3-reaction/quake3-reaction-3.2.ebuild
index f46a287fbdb6..e5ca16d89d4f 100644
--- a/games-fps/quake3-reaction/quake3-reaction-3.2.ebuild
+++ b/games-fps/quake3-reaction/quake3-reaction-3.2.ebuild
@@ -16,5 +16,5 @@ SRC_URI="
 	"
 
 LICENSE="all-rights-reserved"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="dedicated opengl"
diff --git a/games-fps/quake3-ruinhunters/Manifest b/games-fps/quake3-ruinhunters/Manifest
index e13468253cc9..f84bf64d8368 100644
--- a/games-fps/quake3-ruinhunters/Manifest
+++ b/games-fps/quake3-ruinhunters/Manifest
@@ -1,6 +1,6 @@
 DIST ruin_hunters_v10.zip 67679542 SHA256 f6abf15178def1f4d0bf7e532b53bb34fcf960aba429b5e79aace5351ee98265 SHA512 9eabab8460c2ddffeb7cc48eea272028a9623f9df3078c328599f83e2827e73e8578d7846d51026d426007d9579bb34ebe9321e27548fe245840063efbcb8d54 WHIRLPOOL b603e252fae8d3820053ab2dafae796f8db05e6775d18821fa37dc2dd9f0309fcfd6f300e3843333547acc8a3ee9f3597d532308a6b98ef29596e07315577012
 DIST ruin_hunters_v10a_patch.zip 7186582 SHA256 b3253f2b6b6b16f0cf6d4508eb7f7b64ce96894c86d365d061e013809b5f2560 SHA512 898e5fe7c16fdeb030b6fd1873171c9f37eedbcf55162963a1f2ea7ac281ad0021116f705964cfd20aa08a462270bddbb2a4a071331641eab11b8e3dc60abc45 WHIRLPOOL d0ce0c2f9ddc951315f243b149608713ddda1a682461c4acefcd1207c75431fd6b61facbb784d9d2817255fe77959f9da9109efc7b832c041040e183e7c168eb
-EBUILD quake3-ruinhunters-1.0a-r1.ebuild 550 SHA256 ffeb7da7608dc367bc3a976dc76e083bdccc9aeefef386fb6e33ce4d84424a00 SHA512 78772d7faba868711708b9aa052d43c87e9e1b69c011ff3417961e5298b7f8667447d61bb0179204498ef269e330db54b7dad46fa66488d4fdc181bbb643db81 WHIRLPOOL dc55ab5ca8e7361d29baa8b164021b9b90ac41bf72063f5af7bcd8a715a3c10da01eae6d640cedff986a58a02e975d30cf5b727054c6f990d46ed153189328f8
+EBUILD quake3-ruinhunters-1.0a-r1.ebuild 552 SHA256 f681db160f36dfe96712a823b13d9e73e64fadd2e116c305122be91804af43ce SHA512 ef6cbc86ce4d031dd364b871e8ff5a95a099cfe5d9392896b55407eaeac53acbd26f22c77cc2b4f256b101cf6ca03a95f103e765cf43d5e85fa924ad10003842 WHIRLPOOL 7b4c41f4166362c36583f6d846be144da28e939fff43eedf0c1c3e4e046373b35798d695c6e67fea1c8990b91003f1817fd6feee9bfe7a554ea9845007a583e0
 MISC ChangeLog 2602 SHA256 e3be818111c20c0530a52f37083523ae8b84e98cc8088e1e3de328690c05522b SHA512 c2527957b285c59485c38581cf183d62fc3c533696f32ecc4ea8b4ee369193afe1aa364ee6d78fd25d1167ad3cbee2d793c224e05f02562bbb6a3803b853e57e WHIRLPOOL 2b4f31e6d1e49bc1f0de892a9111a7669a3a989157f1750efa21ac7c68d87059af917910d318d48fe73a6b76b870d1f13f888e5e4e6eae19fdef8219b968b3bc
 MISC ChangeLog-2015 1243 SHA256 e05f15649b9c2f9069e06c204b793670365419989d7fae7747eb91f08845391d SHA512 8bb3bb493b0ba868b5e45e670cf929a5c1730c4f22bc890d6b83b2dde21b97328cc23d2a91f4e033ff9183913dfc5412aa9bbb2b3d9f30e467ac30f0873ae28d WHIRLPOOL 6c1d5d0497941a8015e95e586af475f6414d17fb74a9285d001b9a84698a855b22851dfceec9e2d9ad51664369e5ea559b9fb4eac0532e1dc6bb4172a5d637d8
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-fps/quake3-ruinhunters/quake3-ruinhunters-1.0a-r1.ebuild b/games-fps/quake3-ruinhunters/quake3-ruinhunters-1.0a-r1.ebuild
index 8f70b9b2feac..4964206061fb 100644
--- a/games-fps/quake3-ruinhunters/quake3-ruinhunters-1.0a-r1.ebuild
+++ b/games-fps/quake3-ruinhunters/quake3-ruinhunters-1.0a-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 	mirror://quakeunity/modifications/ruinhunters/ruin_hunters_v10a_patch.zip"
 
 LICENSE="freedist"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="dedicated opengl"
 
 src_prepare() {
diff --git a/games-fps/quake3-teamarena/Manifest b/games-fps/quake3-teamarena/Manifest
index e0dc902b1175..f7e6a33be845 100644
--- a/games-fps/quake3-teamarena/Manifest
+++ b/games-fps/quake3-teamarena/Manifest
@@ -1,5 +1,5 @@
 DIST linuxq3apoint-1.32b-3.x86.run 30923961 SHA256 c36132c5556b35e01950f1e9c646235033a5130f87ad776ba2bc7becf4f4f186 SHA512 64cff7f8b689e6c801cd68b0f44406a60bd45f83b2544debb8bf1ef7480a1407184a67d2bdafe66e803c0c030b8df6766ce24e48c9e7c610ecf152ed326b7d78 WHIRLPOOL ad1250dbf53e0d5b03b753752e9fc66f361fe2473fc3bd74285a1357e3c1f9fded64806a46766f1bd666b567b8d0fc55a8780633f60af2554abaad9231873cf3
-EBUILD quake3-teamarena-1.32b.ebuild 1253 SHA256 b35c8c531f32bbf599cdd83a38ea5b651cae04b41ba18935576a86e552d51a31 SHA512 e270ca93e1a1f201f5fca9732ad9c699680721ba1c6d4161a4eb81d1177987b0966dfa9a74609dd856f29297e0cca409687c2f215706964ba309db0e351c98a7 WHIRLPOOL e8eb7a3b81d170f338c8a43c083cbfd96235fe940c3be0541891ee8b4d76e9abeb1f91cc1e34507ca4a990299112c710cadbd2f7e0bc15932ae55d58371a0f6e
+EBUILD quake3-teamarena-1.32b.ebuild 1255 SHA256 1c2b4ead46724601e6411d599ee60a29f29680cb49e2656eb110575441b4ca97 SHA512 c76967bc10833d858cb954dcc2e6f89ec35616b13edd38af4076a5c549df3ef2c6b6e6238635011a5781f53e06c9a4f00d4d2323167cd2351a84d5da114c884d WHIRLPOOL 419fa84644c700cdabff50638ba4a3dbea32660862b1075862e7850eb3fa468f62f2698d877e5d830e20ebd739ee7af115a7440dcaf9c37bfd7086b92ef20599
 MISC ChangeLog 2455 SHA256 76eb66f2463c3f0dff2241d06377114623728fd8b9508608a7db4fa07db5e0f2 SHA512 d59b5205314ebb46b8f0c3bee8891ff7e3ca76b435c64d89ec36006bf43effb0ba430f58383054a335c983b5709c6ba3df0b21fa7ad29f3499325d6c8aa4a1ac WHIRLPOOL 2f8f7911c5331a8388c6f25dc9d82e217fc4a3a3c9747866184b0b42cfbaa3db7eaecfd34b7505cadbb8856daa18d96d82c58c493155e98dc35a09171d51673c
 MISC ChangeLog-2015 1849 SHA256 826bcbed02bd6d619e072251371d4ac0f1838d56cbf344fe625dccb7d7b3c540 SHA512 c8c98b8365f32ebe6dbb13eea2247d7a261d746c96e02996cfa3465220187e4b7210e32f45c3cbc4c79f332203887cc6fef5eea809fd9c4e3f57a38633f33149 WHIRLPOOL ac9cb7a4f0453255ca7ed3ebdc1ef1afa4d19522b08102e5954622412685234b1345840eaad7c838c5e27ce913c460004cdf6ad047cb617007efd24538928204
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-fps/quake3-teamarena/quake3-teamarena-1.32b.ebuild b/games-fps/quake3-teamarena/quake3-teamarena-1.32b.ebuild
index e367be487f0a..738b50da2116 100644
--- a/games-fps/quake3-teamarena/quake3-teamarena-1.32b.ebuild
+++ b/games-fps/quake3-teamarena/quake3-teamarena-1.32b.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://idsoftware/quake3/linux/linuxq3apoint-${PV}-3.x86.run"
 
 LICENSE="Q3AEULA"
 SLOT="0"
-KEYWORDS="amd64 x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND="|| (
diff --git a/games-fps/quake3-threewave/Manifest b/games-fps/quake3-threewave/Manifest
index 0cb103197556..5ce181662173 100644
--- a/games-fps/quake3-threewave/Manifest
+++ b/games-fps/quake3-threewave/Manifest
@@ -1,6 +1,6 @@
 DIST threewave_16_full.zip 187896825 SHA256 c3cb1412cafc61a475ad2f1e93ecf47d7e2f979d973ce82b4a50da3101eca27d SHA512 06d7ce75453f79dc2621086cac816a5bb81cc3c1dcc96015c4f7e18f07144c2cca384d437edda51e431c11854977b5d6197a70be06e1660da9a0c3ab67dae6af WHIRLPOOL 7fbf291d2d4a192f57172438708752499c67fffbce39ff050e63c508b1d9b6620815d4ec5d768d2aa04736b6ce48fc0de687ed3a04cae6f9711ad1e61ea20e3c
 DIST threewave_17_update.zip 6139861 SHA256 0fff6a66822c422cb9f6cca0139fa11048fef414c7dd839c50fbcbda80a44433 SHA512 b2c98112d3c671fb08db154079cf2a085536dd121600301884779030722a18301e73a5d41321dff98508659feda689c8af08be1b05420527c395bb036a627962 WHIRLPOOL 1e4622855f3cc911c57feaa06f0e77216ac96f9ab6007c67c864e62d70a92cb97a43e0d23d51edc4120a1df9f059c345647153add002b2661993b4bc3f38af22
-EBUILD quake3-threewave-1.7-r1.ebuild 525 SHA256 255c4cee027e18b6d5a1eabdce6c9fee007f87ccc02df274dd5cbb1bb532554c SHA512 a2e7030ba449bdd542cb1b5201a27cbc1df16faaad956ce4d1dc6f493b91e04ad68d9f8dc26c774149370698806f9eec551f395a3b99371cac3a39946129fc61 WHIRLPOOL 8ab710b858444169b4ca15d7c7aae11564c2dd01e7818e0db5e17d79d2da4ae0abb296bac4f01671a0b0afc7cad11797b61c8894baff7642ebafb98bfe8a7d5e
+EBUILD quake3-threewave-1.7-r1.ebuild 527 SHA256 dcde36b074aafa517e1d0fa2622c5329bac4f6ec7a6f6826049b9685fd6d3d89 SHA512 adc06794df2d9cf38f96392494dfd1726d30ad9a7ea67f2f94aaa4b006a7fa574075166aa544e259ea0251fc807039443d948664048c3c0f7521875bb66e6eb8 WHIRLPOOL cf487f524e60a16147b5c9120dcc1f8d45c4631d260f80aeb96cde31504bc152a49d24ab2788aae7df0d65ab32eac8b508cf0a2564cb03f38892c09b71e30624
 MISC ChangeLog 2591 SHA256 54e0fcb6faa8d7a06cffa1701633616dd002e932c94ae3cd154a5122e59ec908 SHA512 c72abf8316883a03f2c318e6cb99f8ee0abe63adaf7bb53c2aa5e938a8c356b89910ca63e87609d4a244bbede750da3d3f9e40d78f3951445ff5ba34fb707764 WHIRLPOOL 651a4e9a628d887de87f6b00ecd14877e351f53a54c50344cf442074dce778c5704964f68d6afa72a46cf24cf4e091f32ab65d299117318ddf3a57dd7096c588
 MISC ChangeLog-2015 1033 SHA256 65266df533e5b0d3a6c54804ebf6614920281f5167078cfd402a05f023749124 SHA512 ccd414df668ddd8bafb1897843d30141ac939d7f7891d59d511be7af0be412b6247f7616e96b25dc62b5930fa26b08be5d3164ba4bf713a52795d44631b041f3 WHIRLPOOL 9587a5acceaafc0d9387235bc3b33d019da4445390ad13b541b1cc0462b012daeec8343de7daea1ef45cf1464a001f80a28b26b5ad55ce7900de565a908f5adf
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-fps/quake3-threewave/quake3-threewave-1.7-r1.ebuild b/games-fps/quake3-threewave/quake3-threewave-1.7-r1.ebuild
index 7c39ce1c556d..c5ea539aae0b 100644
--- a/games-fps/quake3-threewave/quake3-threewave-1.7-r1.ebuild
+++ b/games-fps/quake3-threewave/quake3-threewave-1.7-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://quakeunity/modifications/threewavectf/threewave_16_full.zip
 	mirror://quakeunity/modifications/threewavectf/threewave_17_update.zip"
 
 LICENSE="freedist"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="dedicated opengl"
 
 src_unpack() {
diff --git a/games-fps/quake3/Manifest b/games-fps/quake3/Manifest
index 0e0eb2e62eea..f159d2fec95c 100644
--- a/games-fps/quake3/Manifest
+++ b/games-fps/quake3/Manifest
@@ -1,6 +1,6 @@
 AUX quake3-1.36-bots.patch 499 SHA256 b3510423a8486df90853bc1321dcec9dfdcdb1b2b3870495bca49bd8c5635e66 SHA512 75d0659a07902cd78153792353796e77ce1baf7545da370d88f37accca090bee9b94d7447bfa0d284fb98769c94ee434cf7baa6fe9f457018d00dd6431eecba0 WHIRLPOOL 0f4424c90d424354a364a6979057c72c99595285007c166dd4bdce687e2eb653255caab4b60f0178c576fbd0d022342c67cae28c1ba8a15b8b579f2276b05dd6
 DIST ioquake3-1.36.tar.bz2 3503058 SHA256 79b10b92e9e586748a67089ac871646fe8144004d3ab4a55158348bc38d74821 SHA512 fdd8e0ab56966cdc614eff45ab478b87255cfb1b50ba10b3141bcfcc569fc620d281de93333d39119b2d7b43aac3900ecf826a0459fc89bb2f57e30ae2425645 WHIRLPOOL 5468b57504af5c33c7e8150aaaa27082654fe751f24679f81efe8441b1aab1b63e2013adc758d45799ea9a8e12eb9c39c27506a309f36762fbd07f0c3c4a5b26
-EBUILD quake3-1.36-r1.ebuild 3011 SHA256 919be4f2abf6286881675100d00c80481bba8afbee69e6e224e4745e1e87ca29 SHA512 bbf0be1c600f9335e5d6b979916e4adfc4a3d1a9f2fdcdaaa3b5de738e62e0b1302f15871f40d2a58dfebc6e8edf91e732a84bb97fe6869cad20f652eef8e821 WHIRLPOOL a93995b7044fd6d1c879ad4e06e3e190b5859e9ea1ffc6111befad0d346bf8f6eecf92aadcab49ca6adeec987c827aa2faf72945135c30257ba9a0ac7bb3d672
+EBUILD quake3-1.36-r1.ebuild 3013 SHA256 c5a581971932da5bb45d2246a71fe576092f10344cfe8930b07f2fc9d0d1b15a SHA512 b20cd53c7dacab10a6948ef1f88dd0c3218d6b156b3b81e4f33a6700abc22e7ee5bf6e4a751ab1bf70f93c3d1fe398600f14cfeb754389cf342ab29600b83179 WHIRLPOOL 9eceddfab9f3aff6d42301fcde5dbce3ae6a56f6e7d2d4e9884afe448f780df3d7624f1a916117bf464c5f580a1c610317905e3058245a9fd68a53a7850d0203
 EBUILD quake3-9999.ebuild 3537 SHA256 4f85654a40d2dc216505ee610cbb2224ae209668176aaf79b8c0185225b72a9c SHA512 aebd3073b92f3d8878697cca0c7183f7f4f5eca8b9e111dbe80649648d2db951dfd2071247aaaf7912822643d5f6a4649cd5f3d0515989f5f2475bc821368ca9 WHIRLPOOL 79f06a0a0d91988b1c9a0aa131922cb8d960ba44adbd9d55c1187ce18236abfc45c18b923d53f0e3f47ddc8f2bbd8fb48642b820f46b5927470519b8ddb5d474
 MISC ChangeLog 3116 SHA256 5d25264298fffe197437fcbba923e67de7143f992a0a105ed66716868af5b350 SHA512 26c1b8d6d230966c80e8a5f59a5c54e44f87ced4ffd969ec18fdc312d64a4a3eb2ec4ccc6bcaacab2302f738a34f936b910eb6e200c1bc5db5473ed1702f43f1 WHIRLPOOL cca03ac8d29b80ba1dc10e03467ab01d364abb87c667c443ab25b276c8afe5f4215913316631559b95b9de9a4df4bf5183b45c0cfba4ea0eb0be72034cf1f553
 MISC ChangeLog-2015 7761 SHA256 e434e15cc83158f67ec4277467f3da83f71305b86e82152217d4a6d3cbb9039f SHA512 6f00b261dd9807e1119c604fb4101924c3f28c2588e155fa00232e3d6d4f5b4a9cb73b445ef48e22cc151c0c20e9d617d06b041a610308384eb3322078ab9436 WHIRLPOOL b5ac094adb87bf8a56af2b8fc7f9dae20afe24ccbe861fa692b23f095c2d5e3dd8808f7d18e487ed0cb1dafc0b22120f26cc0958f5e2a823082d1e6e9e3bf068
diff --git a/games-fps/quake3/quake3-1.36-r1.ebuild b/games-fps/quake3/quake3-1.36-r1.ebuild
index 0f1ede92b5d7..d2ce233ab185 100644
--- a/games-fps/quake3/quake3-1.36-r1.ebuild
+++ b/games-fps/quake3/quake3-1.36-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://ioquake3.org/files/${MY_PV}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
 # "smp" is omitted, because currently it does not work.
 IUSE="dedicated opengl teamarena +openal curl vorbis voice mumble"
 
diff --git a/games-fps/quake4-bin/Manifest b/games-fps/quake4-bin/Manifest
index 331c6efbb2be..3798bd737ac7 100644
--- a/games-fps/quake4-bin/Manifest
+++ b/games-fps/quake4-bin/Manifest
@@ -1,5 +1,5 @@
 DIST quake4-linux-1.4.2.x86.run 287552973 SHA256 9203b387b1a4075a1b9ad1eb7be32b49a88141a448d9330d9cbe1f40a145bd6a SHA512 a6a390a8f46c7e696fe865d0688c9a95eb0d9e32ad62ecb796dcc03618994ec065e8c74358518221cb6c8771d2414ed7e144c77a1a8ecd4ae9ce6406459c5f36 WHIRLPOOL 14064a8553a3e4b4defb74e450beaade3b687c7b102ad71881c0fa86f5e3f0e848f2b6e6c896a1c6e8bc3faadc8969535e30dfb315e9009ae902c64de1bbed9a
-EBUILD quake4-bin-1.4.2-r1.ebuild 4012 SHA256 9a076e1e1e7f5de4c405604a2fd943777a0ad7481ff3eb75a3b2a08b1c315b7a SHA512 e1c9ccbee99071028b83db5796e45fb5dda7a563aa991781ba85c461b89781e956f380f8da70dcf60b337ce66d714259c3b9118767fa6f71b564851252e7c04a WHIRLPOOL c79a9bfdc53c72e4d3ee130f556baeeea33668e65909aa3f3440cb10724f111f60582290801727db5cdfbb8e3d740b5fa2bd978a02788a7b73a1e888947f40b5
+EBUILD quake4-bin-1.4.2-r1.ebuild 4014 SHA256 487139645486242e21ffdca139ece12dcd0171c9bd8d64492f20ef3bc531b09e SHA512 ebccf6fc69382f4b0d1ec2d039db72a623a25845defd73c272211225f0b64e868664378a001aa96cfaf72508ac6dbe8f0e8af5334b8f7607d989f7fef8bf1a6a WHIRLPOOL 113aec4716b1ebe46ccae60abd9ebbbd00b7dc201302fc0f57bd9c4f3a929001b56398ec8358032fac9092490a61fadde75417de3ac05909c6cacf6e33fd923d
 MISC ChangeLog 2585 SHA256 9a17df6fbb5896aa1a0231e78c8c1dcfde48d700a90b24b81008daaca5d93a49 SHA512 68e8f0e96b6031ccc33ae922b8ab17ff9c6bf9ed258644ffc75039dd51d43c4e782fc55dc8b749c0c1a75046fa08cc9b535e900556c419ff4d36053924d1f7c2 WHIRLPOOL 464fe5de52fe7a062c6e198e24a517f6cdaaedb3eafacc89524c206b7359b9f769f17194bf67ade5b1bfbf9aa4e984ca8e0777037c966a3be7e6edfbf7c73eb4
 MISC ChangeLog-2015 7151 SHA256 a87f931f1337fd433bb59a75203af7b18bab92fe3abfe8e296b6cf2ee3feba77 SHA512 840e85247ed177a062571ffa2205c9430af65d5e749fc82f0072514046aff21adbd5691e6356397f45b2700e9672da5a87a73308e59b8d162abf0429bc557566 WHIRLPOOL cc434d33f2ef7d0ee8350e86eb46a399c8344f75821bb121e093d7621dacb3ce891087f62dd27fe0586af54958cbcff109fb591692feca5bf2062e23890290b5
 MISC metadata.xml 1137 SHA256 5986bf72fc86948c8b4f17b25aae8913350391768b1bcc43c916414690eab496 SHA512 1ede51f4fcebc6a451ab4790e5d26fd07f464461d15b31c065eb02a77bdc114ba4ec35fb0ca380d980c416007e4671532b053477709fd7d28210b64423132d31 WHIRLPOOL 8502586683556faed16f29c9ac748d3125dfde05586875dffbfb25a86a98e9a8ddf1103b9a1a722f93daf9eab5b5d8d2279de96be97b48f9be2e8ed97ee5c7de
diff --git a/games-fps/quake4-bin/quake4-bin-1.4.2-r1.ebuild b/games-fps/quake4-bin/quake4-bin-1.4.2-r1.ebuild
index 46165b2bef2b..dc0663f1a30f 100644
--- a/games-fps/quake4-bin/quake4-bin-1.4.2-r1.ebuild
+++ b/games-fps/quake4-bin/quake4-bin-1.4.2-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://idsoftware/quake4/linux/quake4-linux-${PV}.x86.run"
 
 LICENSE="QUAKE4"
 SLOT="0"
-KEYWORDS="-* amd64 x86"
+KEYWORDS="-* ~amd64 ~x86"
 IUSE="cdinstall dedicated l10n_cs l10n_fr l10n_it l10n_pl l10n_ru"
 RESTRICT="strip"
 
diff --git a/games-fps/quake4-data/Manifest b/games-fps/quake4-data/Manifest
index cd545ef1dd19..003c5e88d9d4 100644
--- a/games-fps/quake4-data/Manifest
+++ b/games-fps/quake4-data/Manifest
@@ -1,4 +1,4 @@
-EBUILD quake4-data-1.0.2147.12.ebuild 1359 SHA256 67e2d968429b048fa5a1c0259e7be8a6ca756eeec2c68e672585fda034fa7e61 SHA512 d0ea5733dbc6c695ccde764f9d5765f397af538b1792eff5edd742483704c3e8791cef5468ff772001bf9fb227235aaaf3d3dea1d47420669e54b75f242f7216 WHIRLPOOL 3f4da930786c42972224fb0e48d5c68767f88c0b50bd44e353ca56780d199b16d90a25373e72dede33b451c256258f06a5025a0d29f4f4db14a0351329aed53f
+EBUILD quake4-data-1.0.2147.12.ebuild 1361 SHA256 e930515013bfd6a20de9cc354f04cc21802b4c4c47d62e955876a96368f67226 SHA512 cd704c1ee316a4388582743f5b04efd3114f65acd11692654f9657616b2ad380668c83f1e7b01ba70dfb9718f237750074ec10d9cc25e686b3365ef32f38563e WHIRLPOOL bea8d9ccae42a88940147c77e34c516926c58344b04cb69a630090645eb058fb638c288ae27b2877f70f10f47d7e9cc4ac1d5f3a53cff35dab5ef93d22fd46a8
 MISC ChangeLog 2586 SHA256 c3668dd855b537cbf9860b05a2907851beafcb3e43353a113e9805af4c417510 SHA512 a0361dafb47b650659d16ed921c8ba2504b8143a7f190bcb159c310038da7d46b9e0ca723518c89999431717c174cb9bad0e07dd1627afad78b2e9bebe5529de WHIRLPOOL 9d4a52c79e97c12646c5d8cfe95b78d655e94b6366870571eb6916b890b51040e6f28f764dceb7aee6bf2d8bc32011366bdcdb26756855589dc3e1c4749a3366
 MISC ChangeLog-2015 2259 SHA256 fba801f2735bc85e51fd493e4c52cb692ae2a689b3c99f6d719da2c9476cacf7 SHA512 bcbc829644cd3b35018668081ae02d61e212baa7b4d00ea823247e15f449f17b264b028716d95043ce46afe9c4520067ca7558c4e23ce99e9ef67d31898ebfa9 WHIRLPOOL 559f6a1cd28dee6720f1dc4cfbb9024bb0d7ca83a36d644a28798e5c902d967e1246ad4c9fe98fdfd384d2ec9742bf509535de7b2999461e8eadbabeeff6c461
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-fps/quake4-data/quake4-data-1.0.2147.12.ebuild b/games-fps/quake4-data/quake4-data-1.0.2147.12.ebuild
index 62cfd11dd1de..a4675a6b575f 100644
--- a/games-fps/quake4-data/quake4-data-1.0.2147.12.ebuild
+++ b/games-fps/quake4-data/quake4-data-1.0.2147.12.ebuild
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE="QUAKE4"
 SLOT="0"
-KEYWORDS="-* amd64 x86"
+KEYWORDS="-* ~amd64 ~x86"
 IUSE=""
 RESTRICT="strip"
 
diff --git a/games-fps/quakeforge/Manifest b/games-fps/quakeforge/Manifest
index 5881f93e4cf6..7054e393fff0 100644
--- a/games-fps/quakeforge/Manifest
+++ b/games-fps/quakeforge/Manifest
@@ -1,7 +1,7 @@
 AUX quakeforge-0.7.2-gentoo.patch 1365 SHA256 5e75db76535d7024eeccc97727f2544eacf26f9e8b57710d9474d53c54d2ffac SHA512 521ba870e7b04e98c4d5507f661b0bfe7f18dc3901b671aed8c03c7691466e4e67f382d0fe05545eabff3ae684b8ed39e6681b4179348682f9adeb3eab177d9d WHIRLPOOL dadddeb012345bfb693111ba7a3a3d9ea2490e56da0452c19b8175a59c29ab99c55f67f509ddb912cce4f97e240684fd6114d4562563624eba7efb8b516d87b1
 DIST quakeforge-0.7.2.tar.bz2 2887823 SHA256 1ddc8c963b23bd648d94af48062ab0448345761defeceaef7c62be55c4a28d7a SHA512 d296e10b86466aee0a4be527a5fea7a44bae60ebef52ad86381744dc96e2bed2ad14d3b790b4514a5c59ac897662e91b80a9d49c822910930742a1d2b8a2ec55 WHIRLPOOL 11a4465435f42ba866806d4d4ede34a4a4e6b42b9e4fd6696c10e55bba4182762dc890ddff463bd9ad00b937d36dbde269886683f6f85b639a0ea6a30f5f6e4a
 EBUILD quakeforge-0.7.2-r1.ebuild 3110 SHA256 7838b3f7603f8551ed8d6efc834b86df239c41ad648d30df14ca280eb8a903ed SHA512 c0031fac48ad0a1307264b2d077db618636fd247af4cc8efb2ae9e54bc6c99a6514cd15b4f8889286a4956cf56703111d1eda87d082dfc3b2c6213b8f1412716 WHIRLPOOL 521dd1b7912d33f5af4925d84f217222b29b4baf5836faf20ec0e311e2edbb5589ac76ad079f332a1d7e3fc05b92cb1dd9d121399f7b554b9befb4961461c493
-EBUILD quakeforge-0.7.2.ebuild 3231 SHA256 f267e2a276d8875d07d0b864044299586c2ea9898591855526fb076c8cbe6ef0 SHA512 98d045eaa7c8e034c25e9bf12437363cf7047cadc72ef68f10639923c7fb3419855a902442fe1aff941cf73135514b341728b7b410b24567d0469c12e8d82ba6 WHIRLPOOL fa5a27189ac79f387d6edf0dcfaf736372835100294b3f1e04acf60819d6a05378cda78f1f987bbd4d5e30bb6ab2c8802ad09b666ee185a87d1a4b93b0a58b94
+EBUILD quakeforge-0.7.2.ebuild 3233 SHA256 7d0f9e7132b9d4f180232aee6d61d237714790906308cb87a5af5c0153329127 SHA512 baefafe143cc5a30725a490beb379719fc5b8790f60631e266b9e8e0d544e8f60eb3542dd13b6c970281cc35a5621d2aa70c28df96387afac8c5303b3b71b6a6 WHIRLPOOL cb97a0cb7dab95772fd4686de21a79448b34b8f564e7d7cb58ac79f4240c7d88e6760b273cfff5d96a6b3be370eda6e0a9fcc28adabedb4df5d584c6c77b3c8a
 MISC ChangeLog 4916 SHA256 703bbb3d5459b971bc12adb326942d8c30ac958368beff39eb63da3b782b41d5 SHA512 416c585469b1fe5a0f3b18c35ebbd7cd28b733b738ee304e692d7a0a99d501a706b67d86327a597bffa1c0785c98b04593f78ee5e8bec24d2ec420cc5c761b75 WHIRLPOOL ca7b04a5a595c7ebca98368bfced0c7681c0d072c4b72da32089a3773f478d47e824a54d89ac414793b095bb71b48cd215f796037e8f95fe9162feba2958bcd8
 MISC ChangeLog-2015 5958 SHA256 91d9f87647bee453d50e07025ef37d11e152c05798cb8a31f514c519378101c7 SHA512 221fbe30cc7ca379b10489c0b5c037b36b5e6de060fcdb25dcc066ca325e76a8e1b1c6ee37f1c140484b14863ed43bd2986e1320827c276929866cfabfe25dca WHIRLPOOL 1811889c543eb739bd23cf75150733fe5e255d97ec29cc4947b56c6c1c5ab513d9d5aca8e7b10f51730cda519ce041ead8efb451771577b72863b656921a5dae
 MISC metadata.xml 1685 SHA256 a569d9c0dd74cdb413004537009cb80acca1f02c2d7a4bd5503f8633cb77d300 SHA512 caf9d7549c8e5d801f8d626b8a4c2528735a13fa2c721f4b9d5c9ae74ae15ee55c22f165d3027fcfed8309d6bf1face5dea9ebbb1b8624d679658c6768d77bc0 WHIRLPOOL 554e35537f36da34ff67544fe744069fc3ae850daa5ef9ae40acc550a74381c6af7fbb281778c55d2b72dede1418d21fd723c7dcfe5f563859a180017b56a5ab
diff --git a/games-fps/quakeforge/quakeforge-0.7.2.ebuild b/games-fps/quakeforge/quakeforge-0.7.2.ebuild
index 383ba93f8e94..1b72873e44ff 100644
--- a/games-fps/quakeforge/quakeforge-0.7.2.ebuild
+++ b/games-fps/quakeforge/quakeforge-0.7.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/quake/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="cdinstall debug fbcon flac sdl X ncurses png vorbis zlib ipv6 xv dga alsa oss xdg wildmidi"
 RESTRICT="userpriv"
 
diff --git a/games-fps/red-blue-quake2/Manifest b/games-fps/red-blue-quake2/Manifest
index 1b0ad649981f..961151346ab8 100644
--- a/games-fps/red-blue-quake2/Manifest
+++ b/games-fps/red-blue-quake2/Manifest
@@ -3,7 +3,7 @@ AUX red-blue-quake2-0.1-gcc41.patch 895 SHA256 38417bf227a473c8d0553f9aa14c3468d
 AUX red-blue-quake2-0.1-ldflags.patch 3382 SHA256 83ff9c4b5e609ecbd81c05d9bd781833da4337d704df5797fe2b80754eeebe96 SHA512 a49ab8462322740fcfef70c6bff16df9b164cfa0cace00bdf366e10db1d0fc13770d97f9aa8dcf1f92d1555d7d978ce7f947d58bc3d030fd2c1be0983e74470a WHIRLPOOL adee56412f439e140fd09a4bdd2468dc0a5075379bb00030006b26b00af48979948b375dcabfd0d5c31feca662aa4408a90cab78a4bbd901e989fa4989141843
 DIST q2source-3.21.zip 1477764 SHA256 c9200316de189638d0d997a0092f36b85f2c3f9e4ebe30f4b1c356745ad676ca SHA512 eb3fcf3327272b7472a044336be4d73111f5b9f50b4916609996ecb690555654990c1f86e63cd6e7d4a30844e66d3eca2e428e29a598bce52e953c326caf9752 WHIRLPOOL 7b372c99d97e4bf807b07d93726cba748116e21c9e5f3348e0571632742a2574cc395e762e7e30a529fe5d45a82e3f047605cc4d788fb1e67d0ee9a615d8af34
 DIST red-blue-quake2-0.1.tar.gz 34874 SHA256 65a0f2552f537e494f05f573e54faff7cf08d22276307e6c69eb314c2f3dac17 SHA512 4123fb1cceb788068c5cd525e3e03cce8a993ecdd0d86c3c154426689a7893b6d33cddeafbb53761a27473a050829545e7fc802f1236f4dc60161103ad259da5 WHIRLPOOL 6726177a08f7bf6dca239cb117a49cfbf3f54cb9a85849f055297e111193dcc0eab27973db3f62a3263bf4aeb083ed6c6864b120b145640e028f635224800548
-EBUILD red-blue-quake2-0.1.ebuild 1311 SHA256 5db397625ac2fd6272cc82c0bef00e74b8165c4f54b7ed0a98015e3c9ba9754a SHA512 9ab80dc705773d81734a9c626a75ed44c083dc61d145d85c0f10b630c159f4e4d2c9ae4ab2d9e53690a4f07e501da454b7cab77af201b106c9bee3e13960ac6a WHIRLPOOL bf52d69a945bd793bab062b2ab33770e6c01b11fbafa99a1b4d617198e3871a9d52fc3cc23a2496c62bb52f22b7799f49da66f1fc61c9b3c8647c700e01aac51
+EBUILD red-blue-quake2-0.1.ebuild 1312 SHA256 61860a3d0e23a78714381a3bb519b2a9bfae4054e9b91f083b8174110b64eecd SHA512 9fcad9bd411b84283f8df97d8c870742300b70be528ad2cf04f1a1efb060531ee4960fecdebe8d380992244c6afb6371efaba3b9df708d79bc4da5fd48a1c325 WHIRLPOOL 47fc1539719341117c41e9d3c28477fdfa2bde975378a2345abb68f6c5a485a6b6d918fe66f1fea4403a4b9c0d717a70a5f0babf3f86814cb7c3b8e7d811e245
 MISC ChangeLog 3033 SHA256 5954fa55a87583a89855fb243f29a7147a87f1aa7a886bfc50cac80459941ce7 SHA512 f869cdf6469087c3eb587b73b869e115993456b206fd7132dc757998233bc1277683a38454cf122ed7eef8396d6c7aa39b916036fd212284f252ef1edd23f119 WHIRLPOOL e43ed80e07344bee1749f128b9d2661f83c4c2ce063eb147806cd284c808baaae9bb970c4dedf01e29a786a7ab075a73df15f55102a3b71e361e644784bba1b2
 MISC ChangeLog-2015 1321 SHA256 8bfefd370018d03342c8c55a5cedea782066439a8a99af3983ed5e9f045d35cf SHA512 12962fe50236ac1c719446b83abf7e14d085bf826bfdaf734b828a8afd5d32b78d7e3d1414f31bd86ab741e91e780cd098587931a1fac4675d512c9815ffa7c0 WHIRLPOOL 62b2efffb4ed1f8c5c48c50df634b8272ef7f4f7189cbaf2c60932e0693b240caf99d71ebe7bba18a2c628c4b8adc2932ac09185ec55d7070e0ed64fb87e28db
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-fps/red-blue-quake2/red-blue-quake2-0.1.ebuild b/games-fps/red-blue-quake2/red-blue-quake2-0.1.ebuild
index 5b4150c6250e..678376ddc67f 100644
--- a/games-fps/red-blue-quake2/red-blue-quake2-0.1.ebuild
+++ b/games-fps/red-blue-quake2/red-blue-quake2-0.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://idsoftware/source/q2source-3.21.zip
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="~x86"
 IUSE=""
 
 RDEPEND="x11-libs/libX11"
diff --git a/games-fps/rott/Manifest b/games-fps/rott/Manifest
index 088ab34f5ad2..05d8da7704dd 100644
--- a/games-fps/rott/Manifest
+++ b/games-fps/rott/Manifest
@@ -1,7 +1,7 @@
 DIST rott-1.1.2.tar.gz 749079 SHA256 102516e8c312f6b0bbf6c623e1f01cbfbbc314ace8adfe1f201d47b15bd927ff SHA512 809a9064fe31c63afccb9a6397ac2c9d4172cdd802b055697cf3b0090ee6a78c9e40b52a4a8df25196489d9a0259304c91e2f84f95413a293bc66192502cf200 WHIRLPOOL dc7808f0da85cfd1e240cbae20ddbbc1f564b5f294e42176a9c38795d3d34d2168476c5d415cce819afe67c3fa1da15812106969d463fc505bfc503c27b76580
 DIST swdata.zip 2889672 SHA256 e226d4958ce1294886b32faf782d9db3d3e66f875d9addd62982e2c8d104fd6b SHA512 99373097356afa583021367b2e0ec6ec745941890e4f17f4e07206c66dd370dfa9e928bc0bd6ab9809d8c72646dcc609e3c19f688d2b89a886f215a153b6dd0d WHIRLPOOL 571d2a5c5f9c45def28f8950d6eaadf5110dbfb0b027951a6a56c1acefe799a7356bc2b436dbe7c9f47d868bdf6b03196fbc69591a66d11c2fb36ab1695125cd
 EBUILD rott-1.1.2-r1.ebuild 1088 SHA256 06614940362cb3d40e5a84980cc40b38b7da4bc6bee1dc19480884fbd955c37c SHA512 0ecd207fb8ec9ecb103611623bdc918e68a499fa58636bc2c9e5719351a4f9efb4ea843da0096fec8abc4d4492339a55210e1d3f4b3d324c152d27a5a446e182 WHIRLPOOL 80c6912b8406e240b19354a66463cc6afafaaa32dc5c4df256e3227634f91ec154da9df3a8700f3bd432934ce41c10ff6b63a886a7d4210a9e364340b9d691cd
-EBUILD rott-1.1.2.ebuild 1142 SHA256 99eb7df52a7d5030e54f24eee092510def54005bc3a5b7e4468b9125ff9adcb9 SHA512 e15e52ae36620d6030c3a8d9874053f7229b9369042e5744bfb8eb2c517bdc785668ecec4401c21a71fb72c48df7973c2945a692a836688dbb063083eaec393a WHIRLPOOL b32fcda97d8b0a57736cbf74664724ff9b7976ec8c5666515749721259972e3173a99f29386b8a647de8ae5b11fbb180799197a218b23be47bc0820ac94c1bd5
+EBUILD rott-1.1.2.ebuild 1144 SHA256 03a0da0329e32ddb599e7a93ab35a9a0034633f42bbfca1caa84438db0e45b1d SHA512 16aff116e64b8d53cc437c6e974334ca489217729011241d26b047fe72009fc62f46382c7471221d529067032db7d94479bdbfcb93c8f4f8caca3639d6441a6e WHIRLPOOL 5455521ca6acddf7b2f3d41ccfdbb66bb273098114ef4119b430e94452a9f51a4b71c1e338b0f0a376a398277d578bacc32ce3853fab0a9791d0df745a4b18bd
 MISC ChangeLog 3240 SHA256 79f5d91a351bea5ed6b891bb5b20e21f1158008b806c595c32e94a8af8da0be4 SHA512 ea3f852e56c9b3fe40fcd976420c257611b5b954da866c5b6178983afdc5a5ccdc01e34144c46b35e9c681c846ee13c8e633ca6e2f0f2e896a177b9f022decf7 WHIRLPOOL ca5644b33db019667a0c4d4a431fed79cbc69c371bdc9bafdce92492a069358e27769608375f012af1b2f972f411a47e8389c8907d7e1d472c8c6130b33119d9
 MISC ChangeLog-2015 1641 SHA256 8bfe816882c3eba29b5503175f1abc99a920be63d968a684a9b874bfef2047c2 SHA512 96ec1a46c631170594241bab8aa4ed10e3ca7a8f060d57b7368cd9c597b21fee09f83249cbb497341c48a34f44473b9f28a0a3adc9419db25803d537435d5fa3 WHIRLPOOL 48a4013d5260657ec8abab818fdb9f27334cfc97cc49fa69769953e0c09cc7351a4b1bf333093342b2062d56bb01e7c410032b3e26b165142b8f94f7ee04867a
 MISC metadata.xml 1095 SHA256 20429219a554c914f09621d815ade69d8d44effb2a9791dbf6afda22ea30255f SHA512 6e2d291f04b343b366ad9b7e5c18ae7cce327dd27cfdb496247a0228d2cf160d8d42f803f21aed07181dc1395ad8db9431270abd174dfc3c3d46a951294a3325 WHIRLPOOL d77c47f104c52de7319a4ea7312c3d2697112f2af7d979b65e251b0fb98c6158d81fd8935b45f202cf46438107d2ffda066b768a9e6405a072d761974212a4a1
diff --git a/games-fps/rott/rott-1.1.2.ebuild b/games-fps/rott/rott-1.1.2.ebuild
index 89a28ab64800..69fec0a0f435 100644
--- a/games-fps/rott/rott-1.1.2.ebuild
+++ b/games-fps/rott/rott-1.1.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.icculus.org/rott/releases/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="demo"
 
 RDEPEND="media-libs/libsdl[sound,joystick,video]
diff --git a/games-fps/rtcwmp-demo/Manifest b/games-fps/rtcwmp-demo/Manifest
index 46924108bc59..2c88c224d4d6 100644
--- a/games-fps/rtcwmp-demo/Manifest
+++ b/games-fps/rtcwmp-demo/Manifest
@@ -1,6 +1,6 @@
 AUX rtcwmp-demo-ded.rc 488 SHA256 38e0b1bef0c3209a15b447555fdc1fc8a7e183fcbaed4606edfb45237ba1fa26 SHA512 e05da90a615a505fc921caf080e32895dcfd828ca584cbd9bdab3e927eb174c3c9c6cfbed3a5fe0bc3b93851eb2085b1dfc49073ce1858c7954ad1a0c8fa456a WHIRLPOOL 34b996534fdb5a6f5a03b532d9d15fceba388b847d001fb4c4100489361910d87fba40b7085dd8f120875bfe12ffb13945f55b1c223f032787eab0af1e6da47a
 DIST wolfmpdemo-linux-1.1-MP.x86.run 69650634 SHA256 44638cf2d98db4ac583aa4878645e171a7c4b462b44961629aeb8d8d78188da8 SHA512 2e497ca8cb0552dfbc90bfd10544b44f0dca2b7dc74ad6428041fd9885926a03cfdae72d6e5ccbd61b0d0c5b051355c567a9101746838110ebeb0f3fdcaf3ad5 WHIRLPOOL 6087920c0d63f5060292adcb575fafb1113b82e9e8e1a557cf740c649dad7b54ae4fae44ce698ccdcfafa4749964ad174cd3731634235fa0f27ece375a67a5ca
-EBUILD rtcwmp-demo-1.1-r1.ebuild 1823 SHA256 d8f1f908b54ed9f5d1fe622222f641e9d5c305432fb18d2da608b003234e7430 SHA512 1968c303e02b815977fbc877fa39e0403cb551e9ac7b2c23ac36482af7ef3950a83691f9c757fbeea5ec8a90a0e15a6f438c0d71ffe587a9ccfb44eb3db108cb WHIRLPOOL 089075cda01edd216f3ef4bcc3bd1d40a2f5cd14238a61d36f7ee5594c708c991841a128dfb36d139d2b0e75e12daa60c2ea7a134e535d3b861a729bde64854c
+EBUILD rtcwmp-demo-1.1-r1.ebuild 1825 SHA256 b624561ab1826df59ddb411b6bf858f30f91bd540a2c915ae7cceca9f990f6ed SHA512 fca1d07ebf8d2ef586ea0114a16e787846590d56f3cf83735c8c097b8182ca53da599eb07e1d092a2a69c1697cb15e8c9bc410a791eb01c627caa8e69f86f72b WHIRLPOOL 945ccf7034f2557e89d62ac09f134931ab1661fb91d62f865fc25d03886677975966c7a64e1bdfc7ce1ff916f776c52b394ed60743732f493a829d10d3139a7b
 EBUILD rtcwmp-demo-1.1-r2.ebuild 1709 SHA256 ca1378201d9f1b2ee6f2f23a25f8898f68d905e4f093084671ac224539906306 SHA512 c148774dc69368f518e6ca0c26c2d14b0ac040b38c0e8d4b1accadde4f2f461319a746e3b143539043a29edaebde11fe38a772f555bd709ef7ea11019dbffecb WHIRLPOOL 72f1c74f39c0e690a27be8b008eab732a173f76763593b207d060f48c60fcaed2ad5eece665f09dac649890d77b332b1134c095d6129e68539c82796630683d2
 MISC ChangeLog 2606 SHA256 d4f7e0587703819ceb71b51943e5f50fbae94e018d5547dd6898ad6be05d9469 SHA512 79e5d58ce9942eb840a20b23844bea95d3a4173934cbf5901beec7e9896f19f6f7694e5d8e4fdad700272cc04a6c3efbd987b5c55a903dc7477a83c7bd9cb9bd WHIRLPOOL f612955f8a704c1ac606d7844569fafe18b3ee8c804000b8317a556b6e3e5f67c6211883884fa44072f87decc6b4cb06063fef7e90208995e03f108cfbbe62ca
 MISC ChangeLog-2015 2785 SHA256 b3680d58adf95d5365f31eb967df34e167d921b47f49525a7c5d03af37c314dc SHA512 9b3a57e64b1a7a80fa3f37b856cdb76b9f26dbd3debe24ebc8af74331284e03a7c12ef87daec6be97a972293a3223e29354120d726da6a37fee7e5af38b68aed WHIRLPOOL 8f61dc34afbc37b9b5acc7fae80431fd00397c6bba6a1ea2af4a72eeb435470b7c182a5df69f4bf8fee85f56633e2a805b052594c4692eeddb35b647732a7472
diff --git a/games-fps/rtcwmp-demo/rtcwmp-demo-1.1-r1.ebuild b/games-fps/rtcwmp-demo/rtcwmp-demo-1.1-r1.ebuild
index ea27e64a53f7..0f2f14c65092 100644
--- a/games-fps/rtcwmp-demo/rtcwmp-demo-1.1-r1.ebuild
+++ b/games-fps/rtcwmp-demo/rtcwmp-demo-1.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://idsoftware/wolf/linux/old/${MY_P}
 
 LICENSE="RTCW GPL-2" # gpl for init script bug #425946
 SLOT="0"
-KEYWORDS="-* amd64 x86"
+KEYWORDS="-* ~amd64 ~x86"
 IUSE="dedicated"
 RESTRICT="strip mirror"
 
diff --git a/games-fps/rtcwsp-demo/Manifest b/games-fps/rtcwsp-demo/Manifest
index b41a1ac53e7b..5db4d5df314b 100644
--- a/games-fps/rtcwsp-demo/Manifest
+++ b/games-fps/rtcwsp-demo/Manifest
@@ -1,5 +1,5 @@
 DIST wolfspdemo-linux-1.1b.x86.run 117813349 SHA256 dbff5ea928802b1bddfd4c171bf08ed4294b2da0273e1cf0802fdcedc40c23c3 SHA512 3fc540c8721780747e14fe66d634c1347ab0cbc09eb795edfad0802663caa63393ac5a224792fd3e423e725b66cc2738877324c86a08698e0d7b6f2f804b7392 WHIRLPOOL e0c47261056d9e78a42183b02b4910f3a12870095bdb83510b535c3dd82414a4c6e16126047ba967e4adfaf1887fbf2b81a5d9473adf547e2d800972f6af20b8
-EBUILD rtcwsp-demo-1.1b-r1.ebuild 1345 SHA256 001cce0b7898565cc78defebdff3baad448cc7abc28823e2aad77394c20376af SHA512 be841030075e145672a1e63df567aace5270e4b970bd4ef8904e5b6038e33fdee37202f938b096f2e530450e373b36deb01323d4a798f4b17085ef07d3b6a172 WHIRLPOOL 5f0efd8bc1ad48bc13a9ed61b48a0891aeac4883cdd85285729cbdd906bce0dfaa2157f5a9bfcad4f4c6d37c377001c3644f51016ededaa6e95b8644ddd16ee0
+EBUILD rtcwsp-demo-1.1b-r1.ebuild 1347 SHA256 ef3fd14a93d7ba2bfdfb6dd99cbe2162822651cc7832c58fa8f5f5872a797ca5 SHA512 d1a4268b484545849d1e36f287227e6129c6351ef6fdf4736ebe48600265c761e9fa6ac1ba97132717d025a2fd8acaae5fe493b133b61f72a4c5ff7df7848e6b WHIRLPOOL 9441b3ae7426424249bd4507331c961278c3ee3b02e2aaa3476e74422bd1235dd489779308eaf31ccc76f8f83c0b1af0ecc699d1747d640b2f734aafaa51da77
 EBUILD rtcwsp-demo-1.1b-r2.ebuild 1280 SHA256 5483aa20b8befcea560308a81c7c33d85d2b5c05fdba9025145878e33708b553 SHA512 8001a2b85c4eb0680a2b95b9cb466b61b4a8b686578858e961824eeb20f13f3292ab81643f39efced444297724e9bbd58de7bed6512a08a79e70ffbd878ca5d4 WHIRLPOOL bb763bb9ff1e2ec33e46b495691daeb0faf5bc50ee170cb49929678275d8a344fbc0c66198085b331f22c9e637fc446c17218fd604fb46e867911080ff3d62c9
 MISC ChangeLog 2444 SHA256 4f0b44cd422581da64e8785693d9d7276ad8a810cbd662669b758c22563d1530 SHA512 1ea4d27b1f43c2b65e38e466960167e31be5722cda012c92c84f7ec3f959937c629b05849be2aed447c8209ea42f2d2c2a60e1a9b74d719d37949ecc7ab48c38 WHIRLPOOL 1e0d216a4f28ac2e3ef79b89ef10aa262a1fadf845e88231eb9df5b7132253abc3045e27a844bfeccb201c017b57d1150f949b6b3716e0a17911ca799949daa7
 MISC ChangeLog-2015 2361 SHA256 da9150ac13a584aff4d4aa2d14932405da969f0c273d99f7b806596c3fd502e6 SHA512 5039efdfeb446bd52604fa49229d4f5de44d85aeb291f1cc84ee3c43d0130648460a315aba1cc09eba4775e671cac465c431245345278fa2a2f7a8f28542121f WHIRLPOOL 3ce7114a9ac7b6e504906ba66815d95edabeab7039f8b99f77be80ddd2aa3eceeaf02fd06aa2f7fda8ed952681234ca7352f57b97ba43c17ba71b113d15501e0
diff --git a/games-fps/rtcwsp-demo/rtcwsp-demo-1.1b-r1.ebuild b/games-fps/rtcwsp-demo/rtcwsp-demo-1.1b-r1.ebuild
index 642b5c127a6f..1899f46a66e0 100644
--- a/games-fps/rtcwsp-demo/rtcwsp-demo-1.1b-r1.ebuild
+++ b/games-fps/rtcwsp-demo/rtcwsp-demo-1.1b-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://idsoftware/wolf/linux/old/${MY_P}
 
 LICENSE="RTCW"
 SLOT="0"
-KEYWORDS="-* amd64 x86"
+KEYWORDS="-* ~amd64 ~x86"
 IUSE=""
 RESTRICT="strip mirror"
 
diff --git a/games-fps/sauerbraten/Manifest b/games-fps/sauerbraten/Manifest
index 2c474609adfc..c2d8e946b0c2 100644
--- a/games-fps/sauerbraten/Manifest
+++ b/games-fps/sauerbraten/Manifest
@@ -3,7 +3,7 @@ AUX sauerbraten-2013.02.03-system-enet.patch 1880 SHA256 3dddd4fca0c0176121b72d1
 AUX sauerbraten.conf 605 SHA256 6e0694718370b126034bc569229d91b63cbfbd87f86af0a03d20e08833069811 SHA512 685b7358ad7267b1b19ac00f879a82205f346b32fda8cb460c4f8c50e9f20263c102b0fca62ab437dabe67ebbdd281f130f28f3b8ef2bcf064ae45fbd23cce67 WHIRLPOOL c1f4de209300898333856a027e5587a2b1d5f978b653f8085b47b40f72ef533462e5810d79757675742998206c9db445ca94d904aea3563807d3300b872a47b1
 AUX sauerbraten.init 1951 SHA256 7dca7e0580c19180d6d6ef9e3f86aa991ac29da28e16412b866da74d2bf26dda SHA512 9a96557cb2822f30693900b1dc9ecad9f1eab9e8a3d75432667bfba784ee86754649cf08ccab5f9cbff6be7ab584f3325b9c40c947005cdee425716a888d5c40 WHIRLPOOL 0e55a53a41db5e3bdfba9b2f779950d15f0dc58576ca1cc3061243773b5a5f3eefdf3c25982c72a0b23f4c38871cfbaa31ceb63f3a2c02c234bad414ab9e701c
 DIST sauerbraten_2013_02_03_collect_edition_linux.tar.bz2 589941180 SHA256 45c20521e3e56374490b2d9112a211538e801cf0161197f35476b30b7b58a78e SHA512 7864e346cc2bc86d78973db1b341fd8256cc2e1953be51263ef91a5374f9ec00276ba2940850e6d5bba7a57c71190b670dc7ba97021be2935c31f8694fed4897 WHIRLPOOL 47a21e233dc90b5284027dbe47d13e891a434e0e550c6102a456e6300e6d5f9daba23c27fc100428161641ba276fa13faac12b935ac590a108c516b9b7987f4e
-EBUILD sauerbraten-2013.02.03.ebuild 3216 SHA256 95ccb8dc7801bedcce3f7f38bc30d33625025a84c7c8b28db47156dfe1820464 SHA512 76c29d5964008d484bdd95d0ac491cca082eab0b20efa4bf16321db39eb29b3e96ffc648538d5ae2fe578a51ca712932caff391c9c2c7209d7438a10a62279af WHIRLPOOL a0b53781127f74739883faad347f5aac131cad90def53900f24cac3dad60c81180438bd85261cd0c76fb4172c968f80a84c036f31fd20c59bf88b0b7539c044d
+EBUILD sauerbraten-2013.02.03.ebuild 3218 SHA256 4a98b022c72c5a001a36aa9f49747e465b82e61d5220af3d1226fa8696532212 SHA512 07327b2343018faae1ecb59643b71f993f89caf05185d7c25c426c329f2a8632efe1d2ab16697a291c2f96c98384507a198d2abc2200bdd7241d0eeacdd964e9 WHIRLPOOL 38a389bb7a928d32368fd902646fc6d530abe621deb6b4e59281b553b07f2085bbd4dcc5336c4146df5d41e5ae97bdee1dd58c5339093bbede88a78c03737bd1
 MISC ChangeLog 4033 SHA256 a4f4cad0ef43d79487afa1861cf46e3bdeeb9761f98009b3b9dc69bd90f0fbd1 SHA512 f67b1bb752aab87c2849e70d1089ddc711f43ca00359be9c61237235c61e7e2560ff291b4fd894c628ff02b5fe4e6af4cad76f1e434cfd07bb44a0d8d035458b WHIRLPOOL 1493ee19bd32f5772370609915549fa680e4be8b8aa8d7547afbaef3b4aff23c324968f3680589cd16187ea84481cb4939ae5c4ee06ea0e866bc3d3bb3af9d18
 MISC ChangeLog-2015 3701 SHA256 fb5f3f405ccc81fb6293c4c761fc2e63415563cb341f598faa0e45e9eefb090b SHA512 8e8bae3bde223491da99f6992903ca0a74879adadb9f0cd1caf7f90464ce7ab622785848fee5c832e8b8b50da142b6cebd03df6b65b1b0ef2a0462782ee109e6 WHIRLPOOL 357d0d5b4821d9e014253918a997f18124a67f7cf67abd740c8926895553f609956d13c93f1499b7b3739e3d028040695047e965f0c26912b492d59b31ef6e10
 MISC metadata.xml 401 SHA256 eab42e84d9b6ed8e8af05cf41638db192c0a0d7d0c08133173883bdb49f0e3cb SHA512 1087c8ed886c5066a8bd600cbc9878e6bf21c41f163939daf22c503ce1e9095aff13b8986959aadaaaaf04cd2f314bb664042829deb30196b88a8c2608ce8266 WHIRLPOOL ab1e976065985111279db54e01a3e0629644c41b394dd21db496abc8b01b772af0c1c524f963ab0a765b847f9d06a6498ef3f65c57aebeb750c5c71effdb39ab
diff --git a/games-fps/sauerbraten/sauerbraten-2013.02.03.ebuild b/games-fps/sauerbraten/sauerbraten-2013.02.03.ebuild
index 2954fb16c859..edfb69774e32 100644
--- a/games-fps/sauerbraten/sauerbraten-2013.02.03.ebuild
+++ b/games-fps/sauerbraten/sauerbraten-2013.02.03.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/sauerbraten/sauerbraten/2013_02_03/sauerbraten_${P
 
 LICENSE="ZLIB freedist"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="debug dedicated server"
 
 RDEPEND="
diff --git a/games-fps/soldieroffortune-demo/Manifest b/games-fps/soldieroffortune-demo/Manifest
index 1fc72a319a5f..704bfc763128 100644
--- a/games-fps/soldieroffortune-demo/Manifest
+++ b/games-fps/soldieroffortune-demo/Manifest
@@ -1,5 +1,5 @@
 DIST sof-demo.run 92496052 SHA256 30f671a7e53c9005fea8ef5760e4174e7f7a31114ed5bfd6c8525ceb1bb6d929 SHA512 d285cffe5ed9017409737120d63f1bb14a4ae2f54a83bc2b4d838e82440f43fe430ea63b7765496121633e6fbf40053fe2c5bbda37e48e6da8b18aaa2ff540a6 WHIRLPOOL f1744b789eb7818753e4287e60ec2ad0359697f622fb8a043a4d4ab8cec64f2f77150a81865d87b769ed4650e0bb1588a8364aa471f7b6a0881d8d958442309e
-EBUILD soldieroffortune-demo-0.57-r1.ebuild 1682 SHA256 68dd9b778864cbca33073906f4dbf1de255b2757eda1299bbc2cb9e99249ce8a SHA512 68d582c629baf7ee1b2033edad9e6852a57dbda9a7863cfc143e89cf113120a7617b2311d3d90094b9dec695dbf2ddba60893c0a7aa3bc087b0c70a3fd1ef37e WHIRLPOOL 607c8efea9eb206a3e54a12a39aebdd14e0598f2a0f63174e2c521f0733d5c089567881f55d00d0356f2d15d27d44b38f05be1c7a060efef99166e35f1cad1f3
+EBUILD soldieroffortune-demo-0.57-r1.ebuild 1684 SHA256 e0373b177c288cb5b4e55d703937585a50826535d281725af90bb7ced2d539c4 SHA512 3103f38c6ccb19bc47f5a0b5cf0d75cd587ba5cec16ba82b4b8e25ef87b506cb8d4ec6bc11af07bf21661175b61c08a0d19ca6c3546ac464a49bc185b496dc58 WHIRLPOOL d97933b96754474d0870795541a3a962038eb7e36f5440a7d99f5083a27006573bca425353a4d36b403eb5bdc42a35472d2685eab41a14dd97447f84f5ea23be
 MISC ChangeLog 3130 SHA256 4726d709deb35ad09c34a58b4ff8d5c90f1f77669f32ccefce9e7cfe1843f899 SHA512 66ac8da788ce172d773b6cd593fc59d2110fd3aa5e3b8a34afdf8d84826acbf8e0ca91ccefaccc4abc0da6290fe6d4e994f08dd3e5f34970e8b852994832b636 WHIRLPOOL 73933801f8c0fd277d6121e640cd2ad191e9c87b05f6568ba72e6dfec40f1eab97fafcf60aa2b806b0ddad01b41d32a70c4053f88835dc9a5f772c1c8352b869
 MISC ChangeLog-2015 2282 SHA256 3ff55be5a999672944ba4918969fa9b146a8af6b9c740ee8ed7f1b6ac799849f SHA512 91469e848b138bc960177d6a679fa1449d8356800fe75011470dba9f11bde0eb05128f4eaa898c081fd5f4726698a58efeb80dc6aca7135ec447ba7136660c41 WHIRLPOOL 694cfa35df853a3b3528026a14c9b7f0ee0de3804a7e6de50196e3e7db93f1667e8f7c58557838d9a60c056634b4429939d94eac0a31da9cbabe5c8a8cbc4b83
 MISC metadata.xml 766 SHA256 a6a7ee31c28d7dd8562f0cc333692e03e6687177ad0b443b15704fd31164175b SHA512 6033ad956b8814ed58beb37af9f197abd0f9ea3c3e52ece7cca26c2f300035870952f4f9ed6e717c977b7224fc043e8836b1463e9c899dc5026006778e7c410a WHIRLPOOL ff479727bc6b0ca43dd54de2e1c80d0118c9390edb3d0c9a94c87e00fa8ce85ba23005d4b9abad9f10c1b3c24f76c0652592f3813843f5640d2c6a5362d69b42
diff --git a/games-fps/soldieroffortune-demo/soldieroffortune-demo-0.57-r1.ebuild b/games-fps/soldieroffortune-demo/soldieroffortune-demo-0.57-r1.ebuild
index 5a3b9c6f4cb7..91362dc07442 100644
--- a/games-fps/soldieroffortune-demo/soldieroffortune-demo-0.57-r1.ebuild
+++ b/games-fps/soldieroffortune-demo/soldieroffortune-demo-0.57-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://lokigames/loki_demos/${MY_PN}.run"
 
 LICENSE="LOKI-EULA"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 RESTRICT="strip"
 
diff --git a/games-fps/soldieroffortune/Manifest b/games-fps/soldieroffortune/Manifest
index d2e32d09b229..648ec55f2ef0 100644
--- a/games-fps/soldieroffortune/Manifest
+++ b/games-fps/soldieroffortune/Manifest
@@ -1,5 +1,5 @@
 DIST sof-1.06a-cdrom-x86.run 22928437 SHA256 44546073f26a610ec554f3d197e157a6691c0891651689308e62feccc01a1c16 SHA512 91ef3953bd6b6630ab602f64d15a3056f85d90139b18aa3eb9a9a0a75db2ece61ef683ddf1d03b63f0dfc902d7a27914ae673398713941f281e96555d9645078 WHIRLPOOL 986d4f7a5115203fec37ebb187c80e27ff4f986b19157afd42179af9f032b20bf305352cc4a3efe38a0b181ac8d3dcb8c98399fdf3b370b076cbe7615c4cd4d0
-EBUILD soldieroffortune-1.06a-r1.ebuild 2096 SHA256 0b17df8cb3528fc69d868a86d931ed0739fbe2624a65a290716e91b07e1563f8 SHA512 d00e133d64a8ae9ab0ba0cea2b3dddb0628ed73391873fadaa75e45b034d4b551cd82d6f8c9df87896ee7cc8ee195cb974de16f6141558c0ba306602e7421a90 WHIRLPOOL 57db3614a88ff03e0a1427defdd199f0de327e06ae1e458e3fa6454b8b1dc84cf02d0ac8312cd5f844cea3de03b8d5ed5dc87018ed1cd2743237f62f0c6558b2
+EBUILD soldieroffortune-1.06a-r1.ebuild 2098 SHA256 c1ed5ca6daa799c42dfd7a794a60dbb1964a947dcfa7906d833da17869582ba9 SHA512 afe8941cdab0a3235f95e99a570f58944123c0b49cddc466ab857f0455c1bdf1b01e36d04ea83d51fcb3649cafc80d3312e2db07356066d26f910912843b7f06 WHIRLPOOL 6ed9b223719b82c3df770206b9a41d21aa3afe6e330e3c1bd778b94423ce28da3e11a91c02b266ba87e1a5fd6f6e853de1b2a23980930b0f1d713d620877820b
 MISC ChangeLog 2461 SHA256 8bc5d76a4a60a0f0b47277f8ca88a9ebdfaa06979a16cfbf22e5402c43509de0 SHA512 ea53ae96f76cc00970f232d06bd2ceef6866ac558f92347e5bc3d197712723f57d486a5d8fe54f376168b3669b1c71ced2c7d2ac992b7f929cc72b331f120b46 WHIRLPOOL e6a899aaf91beaafbc968702825df8fb436c369ce8eddf71b82837e8e14f954bed364d90fc87b4646a0c627290e7105f8296513bec09525cfcdf2dde02013e0c
 MISC ChangeLog-2015 5218 SHA256 6d2d42985633af1817bbc80c9741f18fb6c25af8f3e0901620cc0570ce532362 SHA512 fc1d9324a1d7a51c5cc6f00c5fe32223bcf37c8db8ca404d6136a48aeb5ceb47a389539dd3d492feedb55021fb5389e4f5db8a90c9d36fe9f06c7c90f4a01572 WHIRLPOOL f788e55f5226de717e2f6f9a7f1ed73bf64c4d91c14306a015771c16418d3c3dbabd5e9685bc59cd819d3b5fd310d41d9d03b578f9a88003584deb8bde9a7d5d
 MISC metadata.xml 963 SHA256 fcfade382c4b7cdfa9787d6cfaea456cad37a96cd56549350ab89320c6a794f5 SHA512 59c285b27116238b779238f0179124a2ef1eefca76ae20a84f65ea8850548228dd540ba90b856dafccdd489f911beabb7b2b0a1fa4630562c995f845421f4895 WHIRLPOOL 63992b2bb84392f3218f45a6c52f99b9ce80b83e5897295e001d68858fcebd377a4b8785730b0c4120002a1ff8f2f441862e1622fc3c90667984f0170a7a37c2
diff --git a/games-fps/soldieroffortune/soldieroffortune-1.06a-r1.ebuild b/games-fps/soldieroffortune/soldieroffortune-1.06a-r1.ebuild
index 2d9af482ccd5..a9cfb2fbe14c 100644
--- a/games-fps/soldieroffortune/soldieroffortune-1.06a-r1.ebuild
+++ b/games-fps/soldieroffortune/soldieroffortune-1.06a-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://lokigames/sof/sof-${PV}-cdrom-x86.run"
 
 LICENSE="LOKI-EULA"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 RESTRICT="strip"
 IUSE=""
 
diff --git a/games-fps/tenebrae/Manifest b/games-fps/tenebrae/Manifest
index 4dc733d89b44..36d173e522ec 100644
--- a/games-fps/tenebrae/Manifest
+++ b/games-fps/tenebrae/Manifest
@@ -4,7 +4,7 @@ AUX tenebrae-1.04-redef.patch 393 SHA256 bc1fe7532cafae22c4ec145a5303e81097528e1
 DIST tenebrae-1.04.tbz2 625988 SHA256 61277ecb41dc7c4adbfbad81cd5bfd69e3d63a8e7b41a4860bd879011a735f6c SHA512 f74d1dcaf5b29fcc047f93e4c99c8b5264751c5687370ba4605cad76f85fe346e0e17a6546b8766acedabf23fed69d6894dda6499c854ef0736dddeddc89e18e WHIRLPOOL e9624209ed20f7e8efe2abcac759abf19c269bd60abc92f32e34e601fb2ebc50a061055c2a023a48661f9a551c6645ef0ca244a0d98ff8361c338b88177ca092
 DIST tenebraedata.zip 3989498 SHA256 35db2e1dfe917ec5e62d8ad50fb5ccc73418a7dc3ef1e16cba9eb01f1e1177b8 SHA512 c69e8e18ab0c7d10b5e1c9ad3b396b0906302e6d75c0969d8c2b513df0a11b410de86736a67632378bf28d564c04c3e937f164cb3850742e183616ddc8ac4742 WHIRLPOOL a14167d2268b8def364cabd79b0b338092ec53aba57fc30c4143287edb5e2682ad4d36f3b2eabda1797dd408887c16abd1331144c5e8151b05abef80f18d459b
 EBUILD tenebrae-1.04-r1.ebuild 1555 SHA256 eb201e4fe328e9519b152e2a32593de802515b072b7d7d99177634a02a4c6866 SHA512 569fce0fce35a24dfef7692b70405d4c602d5e9d15797d0cd331e90099b5610ab19653a9ef95fc9b277f86be76ef9f14cbde2cb8804b370a1c7b31a6c0764160 WHIRLPOOL bdea8f396941e5f8acce5ad3d55a3fdceb5777efc6f493d4944dfcd299fa938cfa911f89378753b730e38692b26f3e9bf39c7b451df36d5ed9a5bbc2585afc22
-EBUILD tenebrae-1.04.ebuild 1482 SHA256 bc9fbe6b72550acfb604febc90ceb7ce3a26d3b99e7da6c38c53cc56db46b5d7 SHA512 9fec7dcbc8b7d1ad9dc843da45b16a997a22e08ed578f83952b4c293cd8feb465111e987a7cf60fd1d1169f35a6ff1158babc2af231c3d8f3196ee377cbb279b WHIRLPOOL 90218402236bc1a604fd57bc195dcf980881082258212bced3372928c43334267ab51f0fd3bf313f08906b64a61e2de82c93f2bbc33d025d739255a52d3a7505
+EBUILD tenebrae-1.04.ebuild 1483 SHA256 0a6cb3e387539cf651be96f0f7b1029277d77b2c0f608314e3b650b9df567357 SHA512 06026b844d766541ded5514c1fcebbf788f8351019cf0ec15cf714c583d131b6485310bb76608e18aa3e0fa211d6075a237ad0661a287a4ef788de5af66a968c WHIRLPOOL f1e57464b4226a548dee3fa089f5df96eb50d70bcb2558321e123ef76544bd534f4d2258fdf8dcb7f9e134a6cba0845f80398f07a22d8e5eb95aab54582a9631
 MISC ChangeLog 2657 SHA256 197a2d42f6ff63dec61c9643ad78c23eada61a7f892c12efed18bdb92f0e99c5 SHA512 87ad1b24209577d22daf179ddd2863b4156ace68efee7511db08cb22ddb688238a3e5c4be95c9cd45bdee97e3e1cc62e6eef1e51ae4b1c529b1a355444ddae97 WHIRLPOOL 4f0ca5a0aed1173f94302301b97794689106154b9e84bf0c5ca23587b3b8f7a9a8b422202b73da4251f9ec2af9e6ae9316145b1d301b9bed698d70176a7d9e90
 MISC ChangeLog-2015 1571 SHA256 982c98922fd91a3c4c9053c7034db45d1c06be6fc93f6a19bae98bf3d8ea0a1f SHA512 f066b86ed44fcca29b33d6e25015dcaed624ece49de322e2d2338c4c974bb1e6dc73a0ec92f044b89f1153e4992144a2fc90db9c5904a6ac90ad80029eb3101a WHIRLPOOL a6ca207dafc46e6c61cccf14819892b06dfaea67f5115630092e1de782b1c009f6186fd82ded7f48b49ff89307abbeb8ee78a63474ea500d3ef450ee90ae2ae4
 MISC metadata.xml 709 SHA256 b77e4028c023cafd13a72064ba79afa016b5b0a43e889eec56d85a814a7bc6bf SHA512 15881aa13e08c8803a638ff40c022871116ffdd6de8141b149433d09c98055163f0661aa299ad041215612fe2ea149a5e04e44dbb1afb1de18a53cadcd196107 WHIRLPOOL 727a0ee13c4da242575787fe181b7d9a97fd44f4ef9a55878d48ab399261d834a2daa2394a682536897a3f1fc5d01f329494c61b0faa0fee66b6b5d5bd73fdd2
diff --git a/games-fps/tenebrae/tenebrae-1.04.ebuild b/games-fps/tenebrae/tenebrae-1.04.ebuild
index 7e023b4d833a..f01beaf82a8b 100644
--- a/games-fps/tenebrae/tenebrae-1.04.ebuild
+++ b/games-fps/tenebrae/tenebrae-1.04.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/tenebrae/tenebraedata.zip
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="~x86"
 IUSE=""
 
 RDEPEND="virtual/opengl
diff --git a/games-fps/transfusion-bin/Manifest b/games-fps/transfusion-bin/Manifest
index a001bb00ccac..31c4a4db9b3a 100644
--- a/games-fps/transfusion-bin/Manifest
+++ b/games-fps/transfusion-bin/Manifest
@@ -2,7 +2,7 @@ AUX transfusion 65 SHA256 9c1d118cd93e8e085b8cce7bbacd2c11a396abc4112cbf18f9a11f
 DIST transfusion-1.0-linux.i386.zip 40532193 SHA256 fda279d7bcf6531cbbabcc94177a8b0db96b465579acdc8f0412cac8a088987b SHA512 cd4372e09ac6e3e4f1e2fe99afb18b1c5981c56dac84edd4d440be8914322984a377d4622e2b45719fead86d1b1c7f3ab74580430eba8b69bbe01702c8dbcafb WHIRLPOOL 5b8d59148e618448c2a6df05d3a0e9427763cdfb72b3ba9fde92b6fd07be0ea17e6d25eb151e5a7514ed5dabc14c8554d7bc7527b37fa8390f000f077bf310b6
 DIST transfusion-patch-1.01-linux.i386.zip 8790776 SHA256 929a74df264d199ce9b17458b7c741be2c98388581202661cee25893f4b4a1fb SHA512 b5d6b446be580ab09a79bdb651436de242603a7f215e85ab61ecc45d02739ca285a9a0bfaaf95c08df77f79928a42a27cace76a1695300d80172e2f4e9a488cf WHIRLPOOL a2410b270f5c9936d31e1947e691ea05f836309a427ae3c1bc314b95c415b00ecc6292b0a0b75931c551480256c54b65fc1a9e451f400a5cae6083681f2de586
 DIST transfusion.png 2102 SHA256 7fbc033eb4dd16fd7886bc817450ebe57b27a6ef9587f41b12b8df89c18bd7f5 SHA512 902c630c5f0956678a905760674be7c8bd0a4d72e217ca8cddd56681d0b1161051602bd7bf6e24cc25b6d99cf7c0e5a9802f8230eec7c6a9831aecd700838363 WHIRLPOOL 24faf08828ebf607c1d2f945c802c08981612d6561de6b78f2933cec91369078cff6abd1ba9c809f217e94f14893624491781d827143bce24b12d34ff287de8b
-EBUILD transfusion-bin-1.01.ebuild 1155 SHA256 fe1aabb8d665969504fe7974c120c39660d8fe1ea903b290af9199b8284f5bb0 SHA512 eab802d917021a2cd1471b22b0bb23573789023e2e1910dd1f6a91bfe2299ee865a82fc0c2c9072b969266415d5131188d1106b8d4945853d19beee56fe0e9ca WHIRLPOOL f4a904aa8c83b1646b1938e703b67b544829ec042ab37b05b5fb4f29dab029655e2450078d9f0f6393e883c6e3e205a0d29d6c7245c71a28eee9a5af99524307
+EBUILD transfusion-bin-1.01.ebuild 1156 SHA256 5ac36cb9719b10981ec0a05b7018385ad15916b3b7570d3e5f6cb254aa6aec4d SHA512 76f6e2da2f9c62e048b966ec2ffb9b4d829595e09a531e6301d04341b9eef076aacf3d9fe975060ab7edd42418cab915f3c44122aa7ad5f98dcbc267a0dd91d7 WHIRLPOOL aab197cf004846491ee520f0b1c5b3f95c3b9f1df7d64e8f0d2f5affbb444178da07d83ba096c3ffa332443e2029566454e776c3ae1d61ecf28bff9e32231130
 MISC ChangeLog 2607 SHA256 a7b128f60fea103c13ae7ba668106c0b444e5e7e0d435c80d8ee702f977d1161 SHA512 f4e25505fdeb8623db02dac755b1950dbe329e610f0b3baa9c402c1dfea2ec7e1198d8e5794f6fe735ba226a0647f64cee61ef788f4b2fe5fe3bd1760853c99d WHIRLPOOL 2b4f6b2a481b2acf9deec74b8e3ae5cff79da037356bc566ff2a3b48bdd3f36fb48109c01aa85aa2c6f24630f45bd335d01512952577958e630eac466b447a21
 MISC ChangeLog-2015 1542 SHA256 5bfb01bdf90f3bc4b29cd949ac05b4968530d38816eafb8868d15af17ff70c95 SHA512 ee0703ec1ffc21dda613fa55320997cb99c4557ffc85279a27cab36dc11678997f369f6d24176663e2526f030819f9c8f4949b150f6ec3ad6bd4188ee69cf981 WHIRLPOOL 5c0e8132323149e8e84867c334f4addc924b0a70cc9f9a6705ba789458777e399abec66eae0611bab7eac5b35f47328a703c121469953af5dc665ec36a070860
 MISC metadata.xml 328 SHA256 a1056480eb547d355e8712ad98615f8c0f4aaa43d9aaa944dfaa9463d4896724 SHA512 85e11b06989c540831ee3981820d63507c3a233014e73cb577089d599019de54db3bd52f4304623a5b81ae8dfacd7a6b9f59098865da0aff418cc79a46009f8d WHIRLPOOL 3df81c47a1bee6bd44f7b8a92fa912379414f5647f7b23283fe2d4cd6dc1ee5d28ced2b13cb78a68b7c53a7b1816957f1f97d24f25d3e06b9dd9528710619cf2
diff --git a/games-fps/transfusion-bin/transfusion-bin-1.01.ebuild b/games-fps/transfusion-bin/transfusion-bin-1.01.ebuild
index 3395261e4df0..9836fd5cf2a1 100644
--- a/games-fps/transfusion-bin/transfusion-bin-1.01.ebuild
+++ b/games-fps/transfusion-bin/transfusion-bin-1.01.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/blood/${MY_PN}-1.0-linux.i386.zip
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* x86"
+KEYWORDS="-* ~x86"
 IUSE=""
 RESTRICT="strip"
 
diff --git a/games-fps/tribes2/Manifest b/games-fps/tribes2/Manifest
index 2e340dd6e330..3173d6266331 100644
--- a/games-fps/tribes2/Manifest
+++ b/games-fps/tribes2/Manifest
@@ -1,5 +1,5 @@
 DIST tribes2-25034-cdrom-x86.run 95560158 SHA256 78d690881465e9222cdbf32b0b3b608db5bf31a7f029e494552fad0cb26c969b SHA512 a3d2800af06d8659193ed1da4b9042af0924e1a0ade8a410aec31d66591efa2d2773aa12b33f7234975efee083974a77434bb1c0124bd57bfcc3be4898c46ad8 WHIRLPOOL 89e88e85342e2e5dcbdcbb59725d15ab776374a1a0c0144620a80bdba41be7b0dae1f0bbfc114ba3d04802e812266c2195fbcbe7ac60dc268743ba6cda1911ac
-EBUILD tribes2-25034.ebuild 2121 SHA256 0a95da13ff6e30e00c7f55742b7e90c91b301e6fe21dc5a90bdc3066c4fe89f0 SHA512 39920a42eb1da55cc7a37e17cb44e5b91f7542ef83e78452e3721b8166d7a559030dc53efc77e1da8050a8363c80baf6667d9960cc786072e60282ae1cd5304a WHIRLPOOL c808c7111175d317b1e2c27b90fdb554a0ce5bb9f7e94c2ff3dc9514e563fc9f4af37a782ebc9d08722d85dd938c41436746c50bf192afefb3dff4a024707c5f
+EBUILD tribes2-25034.ebuild 2122 SHA256 0c39207aacd5201e321a5b84ed2cecfea4718e1d4bfec3e7c68efe3aaa847928 SHA512 acfc53599d9754d526975641040b6cb520ffd7e2435eb0637df4a319d35db1900d76f4bc6c103f4e2dfeae8e67488bc0944384fa605978f51c4932f253d564db WHIRLPOOL 078d345385c2fbeda315cd7db43de5e1fe1a0cdb581f206a1279cba15be52525857c28591d13d71c15b6354f71d4334511a7c288178f773d48be64954c270093
 MISC ChangeLog 2556 SHA256 9f622d1820f8de60c059b7153c9d0656709a629779b6bacc97f2b645825adfcc SHA512 3c4ab3b0a59b18d0fb1dda9999f76a8fbf2a02e56d62273cbfe5a6fc984380a4523cab26eef0022fa42e6dea7a082c35e9b1602f9abf453ca7f37ae58beeb03a WHIRLPOOL 89e9eca75d2320a67d6de13eaea5e34a152431e8c771c7e566267b4205006d6a67d436b51690b5a00109c3b527c5a75ffe22f50e14baad6e7e9df010dced9cc1
 MISC ChangeLog-2015 3247 SHA256 0b1d1f3372eab2da74a1a5d338e4c9fe2ac952c117af5bf4c51c48d707a478d8 SHA512 757c4ef6524ddc04106051c3aa125d62e53ee2abb10a9b5c4c82c0e9915d8b8fe62fa5d7076edd0559ac7a8c0ed776fdf60857ebb4dc01f7f8bcbb3a5a402371 WHIRLPOOL ee527bd64fe2dc8964c06a93f88af491d781a3755f9ad672940934ee2c3483003a5f7708733aa12a2b8aec2b589a31bf713f1373a4b751a59945f1aaf889e3e6
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-fps/tribes2/tribes2-25034.ebuild b/games-fps/tribes2/tribes2-25034.ebuild
index e387698b404a..817ede1c3913 100644
--- a/games-fps/tribes2/tribes2-25034.ebuild
+++ b/games-fps/tribes2/tribes2-25034.ebuild
@@ -14,7 +14,7 @@ SLOT="0"
 # This package is broken and doesn't patch right on AMD64.  I've not taken the
 # time to try to figure it out but this definitely needs to stay -amd64 until
 # someone does fix the patching.
-KEYWORDS="-amd64 x86"
+KEYWORDS="-amd64 ~x86"
 IUSE=""
 RESTRICT="mirror strip"
 
diff --git a/games-fps/turtlearena/Manifest b/games-fps/turtlearena/Manifest
index b2002cab2670..e7a8e2ada6e9 100644
--- a/games-fps/turtlearena/Manifest
+++ b/games-fps/turtlearena/Manifest
@@ -3,7 +3,7 @@ AUX turtlearena-0.6.1-freetype.patch 451 SHA256 8377f998dffea20b457f90c1271ad1af
 DIST turtlearena-0.6.1-0-src.tar.bz2 33355448 SHA256 82a16aabab30b2f77e7541ec9bf0d946207b82cce49d2ef5c1d4e9b11e287c98 SHA512 aa11f66a9ec584226267d34ecd637245a068c3c13ffc49fe0ff1ca16699b3eebf6435255ad68b953fbf02f25c807833830eb76497d53bcff977814e87b804edf WHIRLPOOL 89505581cb80e744657d83e81009461131c9bb898994c51e66b3ebe442de691d871fcb5aa63042d662a537d43dac920831291861db803d01b19067cfd0aaf595
 DIST turtlearena-0.6.1-0.zip 73713016 SHA256 99dfc41e1f00c860f8f0ceb222128cc9c363f20e7bd9e830e47c4c0aceed2a09 SHA512 83c96e572687bbdc6183393d21435806b1032295156c1905d82b300bcb6e00a34cd247731f6958e65f085c4c022fc52195313bc0f44edc7a726f04367483a378 WHIRLPOOL 666582948843469cb051dcec3e3404707b7ee9a8a047bf73b6f2948a0ca4da2ab6446ea228927f8173d6fda0ca8d051738fe58f45824056dcd0a5a4336682268
 EBUILD turtlearena-0.6.1-r1.ebuild 3148 SHA256 6677131334040d25ef411c055ee1020343b8415044b02a09559ff0d8abced676 SHA512 b535dcd923c9e7dc7f03626157284dec5b636429d460f5d1b9e9da5b04db14424eccb28591400e316f1131886bd7baae1710daa8d74254c28324afe837bff068 WHIRLPOOL e831946afb7f29db87bc95389bd7d6c76c91fe351b44903ef7648b18446b51f1b2f2ce196051505627f03ff987b7fe9425136afc8b64b90a1a6ae06ab99257d8
-EBUILD turtlearena-0.6.1.ebuild 3219 SHA256 4c9a5bb8c1bc868f61e1909b8231fef8118cfecf3f514956763cfca4766f81f7 SHA512 349a0caf99ba99cac955c66dc66282bfd003c47307f63e3a33c364184397307101fb6d2aeb8ef5bf730014f5919d1d49b8dcc9ebd505bf3172cf4189f86ca5f4 WHIRLPOOL 3807dd8dbe7c2adfb226677fdbf70870b5cb61fa73be5fc8bf24366e69a2bf264c257b0de3347b56678227243b38d50e6f0e55ac3bf4563372243452267a3b82
+EBUILD turtlearena-0.6.1.ebuild 3221 SHA256 7783ae0ba3822bb7c6877b3add206154ab79fdb340673bab8ea79cfdc2e9dfdb SHA512 a571a0851b3f814ae42c097a48aa471d9f67dc4eeff94ed118df5ca91b425f3d010a1952e04d8234a45925e94179caeb507867d16013e6745793ddaabe0a7333 WHIRLPOOL 88ec0f3526add2b3b653843614563d3e46afa027a8a9960061846dc1d18c75e1e1a54622ae4ec86ea0478513f26b895fcfc8b07e3cf7741f45cb660a0bcc0a5a
 MISC ChangeLog 2690 SHA256 5fa640334f197fb11b3e8504edf2d19650273a55653f52d747a04d16d865fe6e SHA512 b3b2ff1b3f6191485b9cb4e4ef4f72007676b6a6197bc6b992585a52ae7a3458c3254350e4f4aa1e43f899b2a074d3c185aaef84cb962ebe148671408ee4be00 WHIRLPOOL a70c806cd0887779366d88c55c6708c24724a75e0bfb06e8ac987ad9a7f52c33dfe17778e88e6a6035b83d2fb7f6867290806d4a06efaba6519c0c17138d8fe3
 MISC ChangeLog-2015 1304 SHA256 d8a4349d55050c26a4845f9491d23a711ebe31cd92440f610672525ddd5d11b1 SHA512 ddb972aec4ac8829769f4392b4f72b11addeca2c9f7af764182576dea0fbb41a835bd5221748ca98bb57ee004b4247d3535588e250e1335cab524913cce070c5 WHIRLPOOL 8b13009c4ce955a809db8aa4526d9d3f44b3abc89b0498a2206dd7c15d46bfb62e57739c3130e5cccdafe0cf156b801c9470c75e5a3000fce6cc74dfb40d5ab0
 MISC metadata.xml 460 SHA256 4fac00d01f36f3a1aa13d9a602309b37d8087b1643bbf25b155de40ee6154e75 SHA512 1a1feb77e6c9418a8ad82c3ab7b2c57be704c19d27b2062ddcdc6c4c6ac176466f62d27bfbcb8599ae648715e11d0fd9d54a46ccfad545668e81460db1aedb73 WHIRLPOOL a537821497b0fcd79e59993b995c3f452f672a63b428fd5aef55addc9020c75c47b37f55e38fcff579f35ef48dfcde539f92b9a65c340f229bffe0b173a0acec
diff --git a/games-fps/turtlearena/turtlearena-0.6.1.ebuild b/games-fps/turtlearena/turtlearena-0.6.1.ebuild
index 66eade36d51c..be8e13d5e5d6 100644
--- a/games-fps/turtlearena/turtlearena-0.6.1.ebuild
+++ b/games-fps/turtlearena/turtlearena-0.6.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://turtlearena.googlecode.com/files/${MY_P}-0-src.tar.bz2
 
 LICENSE="GPL-2+ CC-BY-SA-3.0 mplus-fonts lcc"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="+curl debug dedicated mumble openal server theora voice vorbis"
 
 RDEPEND="
diff --git a/games-fps/unreal-tournament-bonuspacks/Manifest b/games-fps/unreal-tournament-bonuspacks/Manifest
index d9fa7141eb90..a4b9c7ebb237 100644
--- a/games-fps/unreal-tournament-bonuspacks/Manifest
+++ b/games-fps/unreal-tournament-bonuspacks/Manifest
@@ -1,5 +1,5 @@
 DIST UTBonusPack4.zip 14916708 SHA256 57a107d69322b8978df2fa1a942397a16bd878d82f4cda25da22a9af7b65d2a4 SHA512 4abc29b108926aebce872a0c8257f97604265cdc837b2e46443ee8cf98adfcba69b6b7ab2bd2379723c11301ef2bf60298ab075a6befe5eeed6d8526f3f653b0 WHIRLPOOL 3eb562f3fc04a63fd1b7b7649af9324bf643d5c48d412387ad6b63c205a3b9a9b8d34dd4c3e6fd3e551f96a8410b8d671e58879a5b2a5d6597a8b41b1f8539dc
-EBUILD unreal-tournament-bonuspacks-436.ebuild 1133 SHA256 81c003f1d03413ae52815515302a4a4269d8cf925975e23fb32bb0bfb904d43a SHA512 781604250ef21021686d2fbe2030cd56c7661fd925948ec5cf125417e7ed66c53a62da57d323734b79e8f700a736ef13a3f25bf9d556b94fbabde0732158004f WHIRLPOOL c8b93e0dd82ac33e708d969dbaaef4da82a1c419ade500a9fb0d0e8060ff6c20579a8a8794c4c69ad5f5d3715f652df0786845a298992318361208bfb938cd8a
+EBUILD unreal-tournament-bonuspacks-436.ebuild 1135 SHA256 8b62d739bf5647e64fb0e3d5b88d10fdbff91e4b47dd9f833cf04b5e7c420493 SHA512 8a85c38456b6298bb5d19a21247c1c15b3caf4b09bbf892612f688d2e7e48b3ef5c802386507300e6b78101d81178aece8610fc9df37e5aa3d3416038fa291b7 WHIRLPOOL e73e032c56c51b9b52172483ae4f4207e5a038da0966898cd3b7233e9009eb6b3cb18685e01a1f974185c061b70e28f39b9fc7d04a5e30e4aa512675059a645c
 MISC ChangeLog 2630 SHA256 af02f4e7ba98f2db86641403dc7739e6a9437d1fbe0b3c46803a537aa16dfbd9 SHA512 f6514b9c86a5b0c74fb87e56843b61f652613ac0990320eee96f8c500a5ba3406b286028911e71f5265206bbb753618d38b16067956db07d3caae4332da63c28 WHIRLPOOL 46ff7bc3d54a93fc746df67ef6c17ef3ef558b27e331aba5f1be69110273275119414310bf32f6180dc88d0dab06dd2ea02226a11a19d5c79f115486c28a8e0e
 MISC ChangeLog-2015 1141 SHA256 1c01b3c8c48354c8d88859b37db4999db20764043c5606386903757a9e012eec SHA512 904e413b89db11690972d49c265df2134be419b06c810c01ca57eafafcac7598362e36befcb4bb6707ff7deda2d7495d94c27cd3c19db15293dce214373b2b54 WHIRLPOOL 76c0f01fccf4d54276e517e2cf0ebcdfcbb44310a84020d264b377043c00b39dd9909eb66e8ebde1eb7433e5a1fb394d49ec923bc64b3f3cf4fbdc32ce53c882
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-fps/unreal-tournament-bonuspacks/unreal-tournament-bonuspacks-436.ebuild b/games-fps/unreal-tournament-bonuspacks/unreal-tournament-bonuspacks-436.ebuild
index cbb7e58f90d5..bbc8edb8a3fe 100644
--- a/games-fps/unreal-tournament-bonuspacks/unreal-tournament-bonuspacks-436.ebuild
+++ b/games-fps/unreal-tournament-bonuspacks/unreal-tournament-bonuspacks-436.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://www.ut-files.com/Patches/utbonuspack4.zip -> UTBonusPack4.zip"
 
 LICENSE="all-rights-reserved"
 SLOT="0"
-KEYWORDS="-* amd64 x86"
+KEYWORDS="-* ~amd64 ~x86"
 IUSE=""
 RESTRICT="mirror bindist"
 
diff --git a/games-fps/unreal-tournament-goty/Manifest b/games-fps/unreal-tournament-goty/Manifest
index 18b62f7b2817..10c6b453b61e 100644
--- a/games-fps/unreal-tournament-goty/Manifest
+++ b/games-fps/unreal-tournament-goty/Manifest
@@ -1,8 +1,8 @@
 DIST IpDrv-436-Linux-08-20-02.zip 105435 SHA256 a7fb348dd04bd2057f307c5d95c2904a8b9c790d5b80648507549900dc4c76ef SHA512 5f10152b87cf702225fe50d213f3fbd4865cb2f190e0c2c87c996420c115e5f84de7748af635705b8a2ea789bfeaaab4b927364563a4b83f973dcb5af866ccd7 WHIRLPOOL d6be1afe7aa828607c09479a7bc230f61ef34f586eea0d250e06b9f64d613edd250b2ee5d44bf45509d98a51cf2e454c6b4285f1f9db85bba21cc4e51b292d61
 DIST UTPGPatch451.tar.bz2 3064473 SHA256 31a07fb289841ceba36ca707fafd8180f48e462a53a62a2b34d5bc0f61c2481d SHA512 d11ecb3e60e8bba0288be0a4860acb563c277e75ce30a749de04673219d484b7a8c7e6207bc582872df33db684658dc1a15235b9d79ceb98fcd2ad1410982423 WHIRLPOOL 22de40b50f6302f6a1ff5080f823e3e5e14057bc7729fb809b42981bbd188e47a138058740d4df251c8b7dafd4c74121d7d0d08c85a2746c40e3fd432bd087e3
 DIST ut-install-436-GOTY.run 6340417 SHA256 1626fc3c56ae5c9261b1e1f62fc5a893a83ec4727e2b0be81916b3d9ae90bfc4 SHA512 daa2da9f21f1b6e057e19d72d9c1b2446a250b30eb80b24d6a059a5d1eec24a9326d4e6af0401ba4ade3610fbf3a44c1fe44c26b7ae0eb4b7301a20f9574859c WHIRLPOOL 9d6b3799972d54e3cccff5f7d64ab1cc0954ab0e6472245b2416c09b6629eb17b54c7562a81dd06f49f01b314e677b05295e4ab3c78a662a72295a78ef166206
-EBUILD unreal-tournament-goty-436.ebuild 4913 SHA256 f8051eb9e6c57a4d39536a7e376d02d61a587b5231ff163c0b775eb6d0489063 SHA512 ced09fb3ad0c2218f02dde910d343e57abd2f344fe2d72aa6d2203dc5c9daa89fe46fdbd8c273b7fea9355e6123d19139e0bb7b73d481312d3b480d4db8589b2 WHIRLPOOL 96cb9ed1b785f1a088ce031f669d3eb813a4af9191ac2ace3031d1f7645c9f61bdadd3b05ab7511e2b42872fabb9bf43a768008c63a7c975442645179d4c40f1
-EBUILD unreal-tournament-goty-451.ebuild 5058 SHA256 5a17486c69e46cb50526aaa6ae9677369bdced761e2ad380c9a88b69df5562dd SHA512 95eae5a92e6bfdc669b7ff4c9da812711cafe23e8dfce69b98131fd322ed2bfc0c30b806ef751f21b357efe5943f7db33cb11d9db36e40cde4c45f2b79a24755 WHIRLPOOL bb8cc80a24ada857cdf11246c72662f0341d0490bbb9ba46d2c1f805da116d06011777e140ba14284b3fdf6ce8f523ef76594cc30fa984f145a44f71f035e336
+EBUILD unreal-tournament-goty-436.ebuild 4914 SHA256 1940adbf094a02df083d9f178aa0ac4eb7f9a9b14e512dcc18f73ccec1cfdc41 SHA512 ec0bdd97f2f44f0b8df70c155b55c86fc3cb7872921200feb9c085c553efa275516dd41003efbb37d1615b9573c19261ff4941fc1970f920fd024a90ccac48d6 WHIRLPOOL 84197f06d6de3686d7f311b5319bab8b4ff2a6d4d5dd65f0a9f53f2c30d66fd950fbf3b43fcd32e7941d6ed8022689cbd3d682fb3b52a44e8adcf974ea8801df
+EBUILD unreal-tournament-goty-451.ebuild 5059 SHA256 9e84bc0ce4f9f34fe0cb0eba40c67d645bbb440879ad2d7a8d205b53491e2d6e SHA512 bcb67d66e53d2244c24b6e0b1bc367115f0c6ac11ba941a6c7d7911f12ee1d1c4c8fe1f6d2e96988fbf0da52c8117d2c9f4660723a37f3511dc91eca793340e0 WHIRLPOOL 374aba71ea1ceec4031f0da442664f5194041ac91374df92fdb46c9f8ec38dcbbcc30e2c4a7ca48c50340272aecfa35c6f5b3a61d959be18b3c262696ee4906c
 MISC ChangeLog 2547 SHA256 72919106e24d8dd077a5040dcff8bd5a46d4afc4f47de0ba1e2a7e396a94d8ee SHA512 28a3efe97ddfc93bf4785e9b0f4404e6d020268eb4c680a54bed391cdeb03188ab073c32992569ae37c14875365e8d1e0bddf138b0a8c03cb9b2fb8c35ce8998 WHIRLPOOL ff020192e2d9db2b6177b6dbaebeaab91e843ff1daee5a65a9949a2e945cc2bdd8827732cf18eda32be13513467cd05e480c42f0756fdd8c3c7047e2c25515d5
 MISC ChangeLog-2015 3214 SHA256 33fbe31c027b82554b5742b5e1c0bf27387313eccb2afdbf15f34eeecd7cfed9 SHA512 3e66950e9f2a97e58f8afeaef3e1f7b47aaadf206d4ae4a0c2cd7dd5e575ee32631abf0687fc548d04dd8b9a76d09888e74056fc02a923bc704ca6e77cdcd166 WHIRLPOOL 728307f510cc9c406c20bf26c923b56f035fd089cb6b06bef5e12fe3a1fc17709dd3a54fcd12902ae54993111589c1e9cc86b65b12f963b77ecbd110fa0fbc52
 MISC metadata.xml 1819 SHA256 a5714d2efde5df6c93310fda8419e55870943fe0993b1b6cbbf33fc43953e8f0 SHA512 1b0ef3a5b454e9d78939570afcc70138d7fff459a4c106d6e1aaf6b1e0dcc691701745724427b98164563530e2605766a9eb79d6b0f631c448cce478b2672ef2 WHIRLPOOL 0f09509fe738c9550bc34889597d55d6d8c4a4aaca1597fe9e6ce60240412b2f2cca83a58ef76cafd0aecf825e399d3abfc671e11c5f88afdeb5c3d2852cb608
diff --git a/games-fps/unreal-tournament-goty/unreal-tournament-goty-436.ebuild b/games-fps/unreal-tournament-goty/unreal-tournament-goty-436.ebuild
index 5bf39103557a..c45cae2d9541 100644
--- a/games-fps/unreal-tournament-goty/unreal-tournament-goty-436.ebuild
+++ b/games-fps/unreal-tournament-goty/unreal-tournament-goty-436.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.ut-files.com/Patches/ut-install-${PV}-GOTY.run
 
 LICENSE="all-rights-reserved"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="~x86"
 IUSE="3dfx S3TC nls opengl"
 RESTRICT="mirror bindist"
 
diff --git a/games-fps/unreal-tournament-goty/unreal-tournament-goty-451.ebuild b/games-fps/unreal-tournament-goty/unreal-tournament-goty-451.ebuild
index 9856c273bd53..f61422fa334b 100644
--- a/games-fps/unreal-tournament-goty/unreal-tournament-goty-451.ebuild
+++ b/games-fps/unreal-tournament-goty/unreal-tournament-goty-451.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.ut-files.com/Patches/ut-install-436-GOTY.run
 
 LICENSE="all-rights-reserved"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="3dfx S3TC nls opengl"
 RESTRICT="mirror bindist"
 
diff --git a/games-fps/unreal-tournament-strikeforce/Manifest b/games-fps/unreal-tournament-strikeforce/Manifest
index 13d22a0564cd..6061e9b3b20e 100644
--- a/games-fps/unreal-tournament-strikeforce/Manifest
+++ b/games-fps/unreal-tournament-strikeforce/Manifest
@@ -1,7 +1,7 @@
 DIST sf180lnx.zip 11965 SHA256 23afb7b4b97a01b977b071c62f55b186b056d3cf5a35e65565baf3645d759003 SHA512 e64644f470f2506df05159c03f27f3e1df9dc5cf547a7e2415ee8005fadcc1124c02f4e932de7c92b2781511ed8d44f5b8a314a8c246d57da750e30e57fcdfad WHIRLPOOL af9c6b85a85c164c2210f6b7bba53d7679d41ccf03b39f130523090616eebd514507bdaf5633e1a17f17d01943f12112f25f808d360de2946fe4ee410c85100b
 DIST sf_180_server_files.tar.gz 396772949 SHA256 0e0d48b2c5d5c1346c9975795dbe6a14a884a60e2110c47724e62a81842ad101 SHA512 74850d42be59f9d974cf5f89bb85385ff204a0635e0f71315c59cae3fc0eb8032d69797aedc380427ad21e7cdda809a326587ccf3835f9abaaf14b92a3c0dabe WHIRLPOOL c352f1aca86fda5a32bff432ff8d03ed80d97f86dfa956e5afe9a149433d77f22c2bf83ae6e315687e382283037b288d320d88e75be3022d5e7eee661c60e3da
 DIST unreal-tournament-strikeforce-1.81.tar.bz2 42039142 SHA256 f221018f1191ce2e7e45c14148ad19c136bd6c660d999aee4c5fcfe9cc4979ae SHA512 ec5a755e2771f879553970d565391268c152aa3fe14cefccfea8582108dd87687176712e548bd3457328e2bc9f831714a41fb4834abdad2b04d83db0b3fc64a2 WHIRLPOOL b9ca6aec27f15655bdb60304c7767096d4ef6c81ea8f8421e1f05e0f8f4c5d92bd58fe70f9328495e43c54cb8299292b8e9b004e37836e2ca125acac5a960dcc
-EBUILD unreal-tournament-strikeforce-1.81.ebuild 1169 SHA256 696cb8833b34fb50f52473a1020df52a43ecc0236a36615d69dafb996cbf6123 SHA512 1e7e842f218b7ea58069342bb12e8531adc822dfcde01289b6760685e3c8492dc12e1b87c9d7f10209fc8f58fd34ff1be7a14b962602ca66d303e6d577a5e114 WHIRLPOOL c6fc6291322d165716b8ac142f4e377c38df535b1de14c88e16c3e2e2586595d389c246f2cc4a360731f9cd9ad0ae35f90d7f1dabacece10a06344cf8c7fe8d5
+EBUILD unreal-tournament-strikeforce-1.81.ebuild 1170 SHA256 1ba8c9bbcfd75d418f9e8ad00d2061b3aef1f3669040b29dc2347e01eaa8d0ac SHA512 58b65b4c33cc9c60de34c9d5b7fdc88d8dcd0a28521b7e515a244e75c6822826eaadf15a73fca402c2cef7bdbda93f8e1dbfafc935df86c0b0281ab42acb2283 WHIRLPOOL 3dfea3d2abc2f887d8929c29db1e946b68d653b4873473a1b1fb6ca0745ce262fd31e40519a30e3067a3a4fb48f284c14528f6808367368e504aba41edb7defa
 MISC ChangeLog 2637 SHA256 217caa3971c0547eef93d786077fe894a68d7c79d764d95c88242afd82de59fb SHA512 008919077d2637c4a5d59594e9943cbdd9073a83517f5217d9b8421fffcb346b07fbfc21275e7963e030939f1c7acbcbec128c29bc00405d38362b27cd826928 WHIRLPOOL bb73ac9a60ede678c62f29eb6b0e5fb9cdd7a9149c07df815fd29483399d7eecdd1cf2c2b408b532fb4998eadf6480e5ccf72b6213582baf0ee19416c4129999
 MISC ChangeLog-2015 1008 SHA256 f5c0a7f71732d05a0a51e2607b17d991baf7cec0573be164a798725e6877ab57 SHA512 6b3904248a9578087a25bfcef0acccdc522f74601cf2ac8d2a49994d58b4bfba1a9458d80dffb43e7e469766308401f0cc41eda7c94b2b1f42a8ca9c1e854be7 WHIRLPOOL 549dbeabc6704ece2786048c13bda752625fa22e6d63c5eeebb77507698573c744e7e295e34123f7a567fcfa74ce0350b2b6774ddc75ca258fdc76365d3e5b79
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-fps/unreal-tournament-strikeforce/unreal-tournament-strikeforce-1.81.ebuild b/games-fps/unreal-tournament-strikeforce/unreal-tournament-strikeforce-1.81.ebuild
index 8f3c6baa0b06..34337e207484 100644
--- a/games-fps/unreal-tournament-strikeforce/unreal-tournament-strikeforce-1.81.ebuild
+++ b/games-fps/unreal-tournament-strikeforce/unreal-tournament-strikeforce-1.81.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://gentoo/sf_180_server_files.tar.gz
 
 LICENSE="unreal-tournament-strikeforce"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="~x86"
 IUSE=""
 RESTRICT="bindist"
 
diff --git a/games-fps/unreal-tournament/Manifest b/games-fps/unreal-tournament/Manifest
index 21b62b786f3b..86844b4adf23 100644
--- a/games-fps/unreal-tournament/Manifest
+++ b/games-fps/unreal-tournament/Manifest
@@ -1,6 +1,6 @@
 DIST UTPGPatch451.tar.bz2 3064473 SHA256 31a07fb289841ceba36ca707fafd8180f48e462a53a62a2b34d5bc0f61c2481d SHA512 d11ecb3e60e8bba0288be0a4860acb563c277e75ce30a749de04673219d484b7a8c7e6207bc582872df33db684658dc1a15235b9d79ceb98fcd2ad1410982423 WHIRLPOOL 22de40b50f6302f6a1ff5080f823e3e5e14057bc7729fb809b42981bbd188e47a138058740d4df251c8b7dafd4c74121d7d0d08c85a2746c40e3fd432bd087e3
 DIST ut-install-436.run 6225010 SHA256 4008c7501a530c1fb5b8143b8e92baee59ef769c0bffa26c09e9bbb2673bc377 SHA512 cfdeb9f345daef4b81acadfa24d711477ba208dffd50716087d034df2dc1eb0ac5bb03570f4f1701b3c4d46b8f954e6d23dde36fc20dafdc114e68730a1fc932 WHIRLPOOL a203436b225747ed06af76e100f07d0a0580df11a4c3a01a431b3e2a48e660717743960cd814ffd2ed5d13624aa1ce7a111c4aa76122593e57469df59e2da26a
-EBUILD unreal-tournament-451.ebuild 3675 SHA256 5a16ebf10a962c149a7eeb104249f70520cc575092f342af8ad560a6d6b35d1d SHA512 b2bd54996fbdc7b04161a5dd250f61d14d81e843635f29ac16149a25d43de6b2378ecf844b07ae93c6347bec2a848c2cfc5605cc72902af956e45acb766bfb74 WHIRLPOOL a5b2e02b214621af75e34e188ebb7ea202bbd848a1b7e668281b0f0c825bc9497f2f2df56a7cb7cb19247ffa44ee2c65df6002db0c4caf9f1414277081d972b6
+EBUILD unreal-tournament-451.ebuild 3677 SHA256 5d4305cf788ad4589a9a16937c4464c89428f063f06318d6188dc698368a71af SHA512 c359b3a8219463a984a534b0458ab27cb0f81ba4d27819c8a71f0bacea81b9b3bf566a718f7b0feefb8ab159b9f5a3b0e979e54bfb8158b2ae6ce6e1063a9cb8 WHIRLPOOL 7495059463b4d08d15c4afd87bd353ec611cb217d07e6932b8897f60d1aec6ba3bd092f3f51334726f01a8f01a3d2d8d198b448436a5607dd2f7047a2d51d06f
 MISC ChangeLog 2454 SHA256 93babd157e172fbc94099c3b7690d3c9d226ecd2e46707aea0c05f50ed40e234 SHA512 45500046a9ebdaf940dda0b2e742cb0f38de783f670a882e4ada39fa71ea701e92c057c7395292a91680c3edd1b38ba296b57bf3b8ae5c111cd07685ee065ad5 WHIRLPOOL 7aabccf57cb74d70e7fe31578972e526bd8edf88b66ccc9a0c4548e673c47de1131d5215850c69c357a4bdfca1feeb2197055deecb3df6fb350687bf4392bf93
 MISC ChangeLog-2015 4374 SHA256 57921ecbfbccab0b52baee430aa790384bc2a03e27d525546b212d32fb551f3e SHA512 47bb5f1a44a21da5d3ace44b1c50a054aa0e450df0ac477376aaf4c6008970335345ea902a184958f26cd0ea09f6e673999e89c8e40cbb130674335f5890b0e3 WHIRLPOOL 54246b2dcc1ae5cb03ada36a082e501d5e233b222a5f7cf65ecef3647663e8cdfbbf1881828b9f01e5a16c3c15a7ad009c61d66026e2098973e747eb90e69d50
 MISC metadata.xml 1671 SHA256 f703736c23e3aa817cb4c6cc831e3bd86d9eacfa6646cef752d84f5f04fcbd7c SHA512 8d6811a4c9dd449129d0fa7cb15b5f1d09ee336dc6f3dabbb2091d9d3d09ed841d47d3457d6a891aadecaac44ceb74da0351312f63817a3d1b51347984ac2067 WHIRLPOOL e6c5166326aa0198e0bc92563a0ef1cacf2df4e85734591d8a1f3c771967e470f9d0ee384040f88ced9f999398059a1f37971de0c2e5cf64b0c034b60c64c59f
diff --git a/games-fps/unreal-tournament/unreal-tournament-451.ebuild b/games-fps/unreal-tournament/unreal-tournament-451.ebuild
index 03ab6d2ed3b5..d5b0e7f88342 100644
--- a/games-fps/unreal-tournament/unreal-tournament-451.ebuild
+++ b/games-fps/unreal-tournament/unreal-tournament-451.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.ut-files.com/Patches/ut-install-436.run
 
 LICENSE="all-rights-reserved"
 SLOT="0"
-KEYWORDS="-* amd64 x86"
+KEYWORDS="-* ~amd64 ~x86"
 IUSE="3dfx opengl"
 RESTRICT="mirror bindist"
 
diff --git a/games-fps/urbanterror-data/Manifest b/games-fps/urbanterror-data/Manifest
index a7963dafac6f..63ee8207b4c8 100644
--- a/games-fps/urbanterror-data/Manifest
+++ b/games-fps/urbanterror-data/Manifest
@@ -3,5 +3,5 @@ DIST urbanterror-data-4.3.1-to-4.3.2.zip 15305498 SHA256 519d212c8766470c2970c75
 DIST urbanterror-data-4.3.2.zip 1491207564 SHA256 60360806aea9bd383d8a95b8586fe8d8690626b130e907f8727845fd192531bc SHA512 397aa5ba7f869049844d52a9dec234d020b856e16ba3ff295d97775e4e1d48730aecfba3992baf7d55c643c0073ceda32ada18d1473dadd55f561f27a8b9c4ed WHIRLPOOL 52782d0d6668589c5353a7e73ae6dd4ec02a02361532c36889a4b5f3c53d740bece8d9f421c6faeb9c720e6b68dbbccf1758cb39f7b82239a6517c7b0451c4a2
 DIST urbanterror-data.svg 1592 SHA256 0d7eb12a8fe8380e0d89199621414dd56ecdfe8a8b99eec5b95d925294521de9 SHA512 ff789b35d9b1a2282485495b0d1918c7169906aeac094e7a33c7d77cd51d4787733400e1b9851ce19b38e886508d5fdd09f6cfc96b37a5b41bd0cf403e456b98 WHIRLPOOL 281413cfeb881466c2d8b882d0aa4dcf19013630a462775345c69e78a0cb86c7efed14f5d22b453c89648da682ab5e98e3579a1c975994a8e90b9fb22c37892c
 EBUILD urbanterror-data-4.3.2-r1.ebuild 1540 SHA256 73142d0ffe172e775c2302300e16cbedf5e5bc274ae36e2a81a1e378f33e1f1f SHA512 a5214d28d4a42e1d8b36821a6d87145b79b76d7173ce9d6ca42ecef842350c28e49519259bd4330227f2c027a3fd621ddd4f8410434e1c0b18b9781d15526b23 WHIRLPOOL c8307ea51e9d967d6163d04576f9d1e144d52ed68408fa8ca0402609994271de9f10a623fd5fd0cd3c4037fa3b02a255f76d9063fcdea2361e8b87de4c54abb7
-EBUILD urbanterror-data-4.3.2.ebuild 1680 SHA256 c30707c69cf47e04a40949943f3711f51403415cab1298e8c20fa92542165dac SHA512 b1b81929f5f15d656a9cb2fb893bc0e0c6829f8c86db3b7a334dc08333db3734d2f2f387b10dee2041db4702198a72244e5ddf1cc2d25e9ee739361816860b55 WHIRLPOOL a1cda9d80cdc82edabb5b0da0c94ad77eaad2bbdbb5860eaabb27e8af74e045f374890aa9750904868e9aacc12634d31e86679eba66beee34db12a26ee9ed853
+EBUILD urbanterror-data-4.3.2.ebuild 1682 SHA256 5317662f385cc56d3e9c01a2b55c07792d51c3fd77061c5feaf23aca7cfc5d06 SHA512 5fdd4614928c214b35091a0aebf9f7e73128027ed1bcde5dfdaeda983b7170c13a8e61c33dc4dfd4def89a32680301678ee4a7a5c74651787c66daa8c976e08d WHIRLPOOL 3baeda563df39e1649a58e071fc3ca2200cdbccfc45d408c1077e7e8299e0d5093ceebe5c11f68b0d11720163cf1543d4a6e0a04ca3f98a86d39f0193fead924
 MISC metadata.xml 480 SHA256 9fb4f31068fea54f64850dda92ba1449f1a3642e1e043beb539cda147c7b1d8b SHA512 94c46a1dffab072012fbdda9831db4ed465561866d5f3c7ba01045ef6424780f690bfdf381dd32664f1237b65828fefa1199cae98c5fd23757ceda76142ef5a9 WHIRLPOOL 1121503a218c09c15dbdfc214260af31b594893a8ed57a5338ec1cf114fbbacc7a5e53e758c47626b240e8ce710512eb4a5c587256f2b2ab1d822f8fdfee840c
diff --git a/games-fps/urbanterror-data/urbanterror-data-4.3.2.ebuild b/games-fps/urbanterror-data/urbanterror-data-4.3.2.ebuild
index f59bac91531f..5b0059e6f3ce 100644
--- a/games-fps/urbanterror-data/urbanterror-data-4.3.2.ebuild
+++ b/games-fps/urbanterror-data/urbanterror-data-4.3.2.ebuild
@@ -26,7 +26,7 @@ unset MY_CTR
 
 LICENSE="Q3AEULA-20000111 urbanterror-4.2-maps"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 DEPEND="app-arch/unzip"
 
 S="${WORKDIR}/${MY_PN}43"
diff --git a/games-fps/urbanterror/Manifest b/games-fps/urbanterror/Manifest
index 02cd0352d3af..c1e6ccf14568 100644
--- a/games-fps/urbanterror/Manifest
+++ b/games-fps/urbanterror/Manifest
@@ -3,7 +3,7 @@ DIST urbanterror-4.3.2_p20170426.tar.gz 10058308 SHA256 8009516332e1f77eae3681b4
 DIST urbanterror-4.3.2_p20170713.tar.gz 9984763 SHA256 cf1784a3bd00451fe1bda3267235ea3eee93da65880f15fd13c07681952b4859 SHA512 09fd2232c3cbdde001b8d037f2667a55a584378615f2da10c6815797748028f36b75c899ca4fd1d7d97a33f4b3ddbaa4d271b36b5eabf3bf9e81852ef15864a4 WHIRLPOOL 2bed79adc1dc338d74212263105c03bad51391f8c9e9e543ad54f6d6006cea4a8ebfc0e601400338b941d799dc0f642f71478dc68ad84a50718043f06f042290
 DIST urbanterror-4.3.2_p20170915.tar.gz 10061394 SHA256 fe37df609d763247a0bfaa7dedb33ca45a8aa523467b16f1a585ca8a08b03078 SHA512 d22bc3a0d8d191f797f5b1e7a0671424ca6dafbe5a3bd7fbfcd0e7249b9b4b6e790a64cdf7c93690d032b38f92aee703e9e302701084703d7a79d8f60cc2433e WHIRLPOOL 912201a55822dcf8423f77023f01882339739984dc9e9bdb5dca55763271c56158b47fd137da83d6e56c7625e49df8b5fc5299af646e91104e1f53cad9a50fcb
 DIST urbanterror-4.3.2_p20171016.tar.gz 10061989 SHA256 a345cae14ce1f445ef1ed9d883f4f06e0365fdfa05c50d2f34bfcdb89744e405 SHA512 b35bd08f6058d73eecd48304609f7064637e9f1fcad7b22a93a9fdb43f003b93c3c52f3e9a7fc4c468d70fed4ba687bcdcfa0c8749252a12d2eab1cf3ab956ea WHIRLPOOL d4a519b1c9a7e63a98e9901c815e73f1c467412f6ad6757dafd6c4afb013bd9c3d4da3155cdc91c728113078e466d39fa68c1bb404e8019ad75984bf683370ff
-EBUILD urbanterror-4.3.2_p20170426.ebuild 3969 SHA256 79c983e8d6ad44095d13ca8e059a581a71073895ce88672eb1a9b76421f11394 SHA512 ba6670fe91361a1017192bca67d6235c982b878916af4191392607f46367671b802d88befe8118042bc4798920db37d2be920c05f0aaca00c764b19d23c57adf WHIRLPOOL 68892849966d590a6f8869331e4fd764d077720168dba93f18c7b7dc00ce9ebcda4ef7580344e12c0702e72fe5d6469a0450348585b89f7345514298afa8d7ae
+EBUILD urbanterror-4.3.2_p20170426.ebuild 3971 SHA256 b308a14721219d65a1889f6f49a62918ae94db37503b8963be2d8bffc6b19dcf SHA512 93988dfd26880e999b8d2eb34f7cf8961d363f7aa13e3e75fe8e8a40290dc8d5f774b0c3e34ccd4f3b1028a2499b46989417818b7df7a869156a1561a94e50c5 WHIRLPOOL ab2b0d80e85a1b6ec08cb742e2952e5faebebb3432906d22c713d6cad47fe79ae51b2fc0d92e73ded41672d6d27c04b3856e182867ef1305e21efcdfed99399f
 EBUILD urbanterror-4.3.2_p20170713.ebuild 4004 SHA256 11a126c91c5bf155777ce5faaf9364b78ff964e6ea235c8d0bfdc3aa6ee5edb0 SHA512 def80468298e611f7a46bf453582b50f43748da4244d4ae62faeddb26809c6d8f18ad2afa9a0513e1ea3d87b8576df700d092e0412417cf99d63bb63a06df482 WHIRLPOOL e0f0e1f886992640385322e9bf29e8b8c0696a85eaf61d2c47c995a819b7ce95c17169acc5231a0ef8be83b67f70e5f642af11e954de9156fa8b609ab24e0bfc
 EBUILD urbanterror-4.3.2_p20170915.ebuild 4004 SHA256 7a1f1f1996b676412b226eb6f87bdd4d112c40300ed5537b795ba280286412c3 SHA512 73cbfce8f97dcbeaa621a6eca247a3aa496e0221c94dbf718f3a1af550dd9c346842e21fe2690d1ceb4a53dc0c7a70603907558c3c6c43b89f7b81dfc1e6bf8c WHIRLPOOL aec2645cbe2f72ea02ecaad009af408573ca92e1f835c9c6391f5e0e21283e4c882cbed85d95f6654c47d84daccb256362de26ce5f4b09795a3ec5291bc4bd23
 EBUILD urbanterror-4.3.2_p20171016.ebuild 3973 SHA256 ba6f66296fcf8507ce4da49b1ae380f9cb7320d485cfec95de838b704a7cceed SHA512 66f70132d2a855435e49d3db858b39b3dfffea3bf4fdd99849930724a3e9a9031583cda2fa08b4e51e7161fa9b0ecee43cb512920b448aa8ce72834eb4651b05 WHIRLPOOL 927ed2f2f7f8cda4236c33ad0a6f3a212227271ad80bf526bec601c5275071f2c48413b9ecefa16199c1d11090cb61acc3dd5acbe752d4eb97d8b302653ae8d9
diff --git a/games-fps/urbanterror/urbanterror-4.3.2_p20170426.ebuild b/games-fps/urbanterror/urbanterror-4.3.2_p20170426.ebuild
index eaf4a41e7db6..522657485a43 100644
--- a/games-fps/urbanterror/urbanterror-4.3.2_p20170426.ebuild
+++ b/games-fps/urbanterror/urbanterror-4.3.2_p20170426.ebuild
@@ -15,7 +15,7 @@ else
 	COMMIT_ID="60b17a27ecaa30bffc44114cb94df82af7febfdd"
 	SRC_URI="https://github.com/mickael9/ioq3/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/ioq3-${COMMIT_ID}"
-	KEYWORDS="amd64 x86"
+	KEYWORDS="~amd64 ~x86"
 
 fi
 
diff --git a/games-fps/ut2003-bonuspack-cm/Manifest b/games-fps/ut2003-bonuspack-cm/Manifest
index bb402135dc83..002f3d00f0e9 100644
--- a/games-fps/ut2003-bonuspack-cm/Manifest
+++ b/games-fps/ut2003-bonuspack-cm/Manifest
@@ -1,5 +1,5 @@
 DIST cbp2003.zip 149198671 SHA256 fae9e78492cbf24102bba076225463b3bb8cd124a18e47162d429f77101836ba SHA512 92e136c03f1385a28163718cc6ef1c36e46fbad14c74d0f266dfe3d9f4a5093e1bd02dde54e68f70539ba2c4ee163b1e886529f7e734059a85223ab6f853a474 WHIRLPOOL f5ef466296413cc298d4a5b78826dba0b776f72476378dc449cc0a7f2b3d6e0224f2f7ae4f342a56189c1f7623f2e63633636162e56d0ca707face5d80796487
-EBUILD ut2003-bonuspack-cm-1.ebuild 797 SHA256 d764924da2ed76f6a94df8c01db4e36f54c7de2727b56cff5ff2d10f468ed6a6 SHA512 78ac1588641c944eefcbb39cf359fea787829acbd84ba75ad1ab9f76ac42838b6c93ce6aa499f40c326d24e517172b23fea85b401ed1e933e3ef3334abbd6292 WHIRLPOOL b099ca371edeb4a679c599ea2713e7f33edfa6720f490cb2f998ae6afffefb2d176426ef21be908d92fb3ad971f16f278024456ec0253a96056829f673d380d2
+EBUILD ut2003-bonuspack-cm-1.ebuild 798 SHA256 755fe9b64274e76ccb6f04db3dc5112838c73d47c54d6a4c7c87a3d97c5bf472 SHA512 be23becd978fee13ff5845670e2f60f6d17902a2aa2eaad4e6bc60ffdfef28aff8d52f6a6ec19a73ed6d32107899212d4a41fe0d576e28da88fe2a9b8375d144 WHIRLPOOL 96a20c6b50ed4c723c12c9acc307a16968db8780bba33462418f32299563da498b0cc3ed90c54c46149d38d3ed2f3ae27e8f2213eb13635cffc60d6baa572310
 MISC ChangeLog 2588 SHA256 12101d7608c91265ee2e6e7d60259e5f43d6e6d918ad0f41a0eda7b40081b015 SHA512 52755f47c16a83ebaa08b668aeed52d4f79f953b929442950b8882c4f5f52d5dd93e649cddd095f1978e86dfff2304352ad90bc393b1cfc45748e921ac810ca6 WHIRLPOOL 399f654be755ee4c198e298162ca6b2f2f4e2356c2a02ad65dab92750c35dc060bfc684fb4717ee213248848f0282a06668213a6acce209e283a5b41dafbf422
 MISC ChangeLog-2015 1088 SHA256 da1e249ae3cdb84d7d5c4d2f3e8c761e60027576a0d4765bcf85904fdae125a1 SHA512 4562d9d02b4973420190372a4164300d18101a8338195c7eceae760cd75c73e0b5e72d862008f666fb9d86dabbda55b447305126be8c333eb00eda500acd700c WHIRLPOOL 5c17d634addd56f1acafe86fdaa07f3afd897dadf9b15af10ec5258d898ba66db0ea0939019a43e222db9653c13c6a99a42b1a1cf38793c36b1ddd40d8260f89
 MISC metadata.xml 771 SHA256 ba25f4169d4a689de3925a408b36b9d36c0f51673d3d23892f754aaa3a630dc4 SHA512 d30d55503e3b3897d2a5093c06a39f684bdf0879214931a360a87637cd62ae1ca019577f42275bf2b4ba28649ab2989b0a2e184998497ddc5ffddbb6ba35ef5e WHIRLPOOL c648bd9951f1f578cd893012dc4ba2165f3ee02bb654eeb1c6858b130a91e49e2719ebe0b912a7715901ce4d4575accfcc84641cf0662eadd56f97ec70a37be2
diff --git a/games-fps/ut2003-bonuspack-cm/ut2003-bonuspack-cm-1.ebuild b/games-fps/ut2003-bonuspack-cm/ut2003-bonuspack-cm-1.ebuild
index 938b6bcdc0a6..14ac3f422cdd 100644
--- a/games-fps/ut2003-bonuspack-cm/ut2003-bonuspack-cm-1.ebuild
+++ b/games-fps/ut2003-bonuspack-cm/ut2003-bonuspack-cm-1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://ut.rushbase.net/beyondunreal/mods/cbp2003.zip"
 
 LICENSE="ut2003"
 SLOT="1"
-KEYWORDS="x86"
+KEYWORDS="~x86"
 RESTRICT="mirror strip"
 
 RDEPEND="games-fps/ut2003"
diff --git a/games-fps/ut2003-bonuspack-de/Manifest b/games-fps/ut2003-bonuspack-de/Manifest
index 7e61a8d27c01..4169a83a6396 100644
--- a/games-fps/ut2003-bonuspack-de/Manifest
+++ b/games-fps/ut2003-bonuspack-de/Manifest
@@ -1,5 +1,5 @@
 DIST debonus.ut2mod.zip 74977458 SHA256 0c1d7c4816245c75d5236d5ca20c4fdc106a150688498bfe98feb5f5d1593348 SHA512 2c70d39eea1ea647d2fbee21dda5b00057b7feb1607a89d86982ac43e6063820aa70c633fbc21c768d1491fec909a06634e0e883aa771be2607b51ab193f0935 WHIRLPOOL 4c0a1d48856d04f5a9f0ae2868af58ba95d481054ceebebc1e3f596fe1634ab2b8cff3e1504bb2a9fe5c0086a160b5432d254cd7d79dac5288c18b90fe8e1a10
-EBUILD ut2003-bonuspack-de-1.ebuild 742 SHA256 a60429c005cd33c2b9589231b3b57ce2c0fb28b26578741c6aad62eee3a2d185 SHA512 0c275d389b944905f1491133400ebe108918eb7f38e13926dd3dd75984ab214f01c3d5c5be1b5161455c1927660f0a699c7bb005b348c0df435835fdc11fe1ad WHIRLPOOL aef1dd4de6eb1a78812e6c9bb494911312868038d7166849b851b1a080576d070def0ade278a1f60b0b82d639600b88797b36269f4eecc213c00e9ed4ef35201
+EBUILD ut2003-bonuspack-de-1.ebuild 743 SHA256 a2f98182584d8477284a672cd164ba0849a1921fd2ff80a7f8bac6c2cbd93205 SHA512 234de1016a276ae2f95bf8d0528f2a2306278c3a662e9c512c3c06d04691337f6ff231866e48270e39f2950bc0b0306b7e13a69e29164c6065c710a6afc08a34 WHIRLPOOL 70d34910ef1fbd18a66538250535098f8bcc36b33bd73cd450921a89f2f4f7260e01bd1b0f5df4c352978ab19707030f44759e03b13bcbf2c7c179fa03effc6f
 MISC ChangeLog 2588 SHA256 cb359f73148f6c0d3aa3d2e81023b029f80c277ad0c94225d7d610118fac8fe5 SHA512 13824bc4cbe9b7cb04abaca87be161b846a287c524b28f1c4ed8da444f0b0214caf863e573b16d52f32f53259f3fa85ba6326f10ac92a3ba60448bbf38915d10 WHIRLPOOL bdeba8482a8d8438d215c764f3d48d96f74f94030dc4836cdf49d7cdd972a8732261969c92222a7a3d0f60b099df83e3cd0d5e6322700640ed8fa38ddf43a07e
 MISC ChangeLog-2015 1177 SHA256 a9f241934b8061e113c93ce690d58f15072980e21fc5c67c05861378bc388c73 SHA512 ab3e480ecb324c636c316a2137c134a58c986b2d360922573ee2bbd20d71626406fa9550ba47f9a06302aae22f9606f9f2183ec909adfe2302d5188f0373df9d WHIRLPOOL d4dbc4b153d893014e4939a7e25844512455febe92afba772505fd4d43da55a345c86bf1f3edbc8b4c1a2066f622be6c7d6d27aaf84df9492c6b7defeddb780f
 MISC metadata.xml 771 SHA256 ba25f4169d4a689de3925a408b36b9d36c0f51673d3d23892f754aaa3a630dc4 SHA512 d30d55503e3b3897d2a5093c06a39f684bdf0879214931a360a87637cd62ae1ca019577f42275bf2b4ba28649ab2989b0a2e184998497ddc5ffddbb6ba35ef5e WHIRLPOOL c648bd9951f1f578cd893012dc4ba2165f3ee02bb654eeb1c6858b130a91e49e2719ebe0b912a7715901ce4d4575accfcc84641cf0662eadd56f97ec70a37be2
diff --git a/games-fps/ut2003-bonuspack-de/ut2003-bonuspack-de-1.ebuild b/games-fps/ut2003-bonuspack-de/ut2003-bonuspack-de-1.ebuild
index 1676ed619995..8483dfeb4837 100644
--- a/games-fps/ut2003-bonuspack-de/ut2003-bonuspack-de-1.ebuild
+++ b/games-fps/ut2003-bonuspack-de/ut2003-bonuspack-de-1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://ftp.student.utwente.nl/pub/games/UT2003/BonusPack/${MY_P}"
 
 LICENSE="ut2003"
 SLOT="1"
-KEYWORDS="x86"
+KEYWORDS="~x86"
 IUSE=""
 RESTRICT="mirror strip"
 
diff --git a/games-fps/ut2003-bonuspack-epic/Manifest b/games-fps/ut2003-bonuspack-epic/Manifest
index d7a6096ecefd..0c422479f84a 100644
--- a/games-fps/ut2003-bonuspack-epic/Manifest
+++ b/games-fps/ut2003-bonuspack-epic/Manifest
@@ -1,6 +1,6 @@
 AUX epic-installer 925 SHA256 8d72b3bf41010b0f6e37057dc5f5d3b0dfb1c675ac5375e8f1ffff68c7fb2983 SHA512 0e49953e28c1be196c67d5d29a5f6ac0f636f1315a18bf883c35c8236b74f4a5aea45693fba013578592bb0601a9eaa734446cfd533af70db9a24371162c2524 WHIRLPOOL 09fa7c10589e1fa2231a3f21b70cf0766afbbf16a2d957443f68f1ce6afe785d926fedb9317a43bb8225cb945db4e94e91f57207444d4cf04128c85c2f836ebb
 DIST UT2003-epicbonuspackone.exe 156913152 SHA256 034a1641c447e2d933ae89e02fecdd2c0358d041dcf3f7996663aaf6901cee21 SHA512 26fa06637c6a99704d11b58f5fe54454f8018c6f07b06b6a9a2075d17b9a9fb7d7155298de5502cefa0f07995f4513ce9531863cef8c344996b5e6dd5fbd339d WHIRLPOOL 681311f3515b0d3e266159d5ceeb76120567e1f90bef2e1da124aa8b54865caee5d86ae3ff5a2272f29922bf66378bb9f22c65eaf80fa1d414d34b9e899d0acb
-EBUILD ut2003-bonuspack-epic-1.ebuild 2502 SHA256 c946f541bf068de88888e793297ab4372442aad2c1c5a5f52e14c8a65d26c47b SHA512 cd4b9b2abdfab58a17818afb41b272a75dfc6d329c9a4f303226d76834875f835485ac13cb97318e2f1646e97ac3adaa754ca5779a98f9ca33e0c0f68cb20585 WHIRLPOOL 99ab989b9567f79c89daa174291304f0adf494a7cd50e787e660ede71821e94ecc84763045db3e92724a71fab89b10482f3e49b1ff7f31ae2e83acece089e33f
+EBUILD ut2003-bonuspack-epic-1.ebuild 2503 SHA256 6519255ae91ab78570921820b2e16c9c211228a3ba63c137261493752353d0ac SHA512 d4bdb95876ef4fbee27ab1c9e895596039e7a5c70a9c5e78033aef03cc2a34c3b6d57502452686fb9490ad3dd19f94b7561986100d812714d92b670803d9a427 WHIRLPOOL 2ad9ae0a216c5deea5bf81a1c160e28ae8dcdb020d92415d424be7bb32bedc1fd0459480b290b334e7477f6972cd327c3d4805f8473dd97a1a24d336b0037fea
 MISC ChangeLog 2619 SHA256 f534eca6e322f76a8155798eea74842ce3fc2c3a62930ddf37c5cec28c044f5a SHA512 09c612efd4c2890a9e1d1bd51f51f98220d9db302a24f833d517c3f5752d0b7460d0592eae5558b49b04744b52c33a591e3e54b02b20dabe2cd671f4374f1f2d WHIRLPOOL 4bffbaa40dbd85a78f4803ff1e465b6249e90f4b035307729caf24bcb14e1ea56c764c1b5b7e19b453d7b49673bd118dc780e2ed9d1664006f1957fe2c91b303
 MISC ChangeLog-2015 2659 SHA256 58f38f5a101b2039d3f91125c6a7fb773e04c465cec0f6457215558efa949c4e SHA512 e27d692a634280f74b49f2371a5d5d3cf592a4832d64ac7206b3ad1af1b29bf54753e2e2b0fd5429dadb5c1c90d72d9782f6469eb32101bdcef4141c34d16b1a WHIRLPOOL 06fdd61fac3fd6a4f97b7bda58260a3b268b6b7fbb428cce041e336ae5fdbe6dd5509e7e1fb0bd005984e1b8c9130be909156010ec9ba93735a76b84cdcaa574
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-fps/ut2003-bonuspack-epic/ut2003-bonuspack-epic-1.ebuild b/games-fps/ut2003-bonuspack-epic/ut2003-bonuspack-epic-1.ebuild
index 08c1832a65fa..2309f8e07526 100644
--- a/games-fps/ut2003-bonuspack-epic/ut2003-bonuspack-epic-1.ebuild
+++ b/games-fps/ut2003-bonuspack-epic/ut2003-bonuspack-epic-1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://ftp.student.utwente.nl/pub/games/UT2003/BonusPack/UT2003-epicbon
 
 LICENSE="ut2003"
 SLOT="1"
-KEYWORDS="x86"
+KEYWORDS="~x86"
 IUSE=""
 RESTRICT="strip"
 
diff --git a/games-fps/ut2003-data/Manifest b/games-fps/ut2003-data/Manifest
index b1e34b2613f4..8c1b46dbe800 100644
--- a/games-fps/ut2003-data/Manifest
+++ b/games-fps/ut2003-data/Manifest
@@ -1,5 +1,5 @@
 DIST UT2003CrashFix.zip 2764 SHA256 df1a6fdf81f388486b20abf301ef86fb72b0b12d96bec789d7cb7103da579813 SHA512 24fdaac873b08a0860c23f66b9bd93922fc4f64486adbe9bfefeb340f9d9374778b5e7bacd0e12cc79d819fb340e007ab2a7f1f45c9e4f27ab3ab6b11033d444 WHIRLPOOL ddea25bf472d5ca7f9c9dca1346820045504c10be90e914cd0c000a04c48ad4765e4b283a35cd91c2cb9f4cd8e1d2cabac660c2bfeccff05ecc42b1379242ff5
-EBUILD ut2003-data-2107.ebuild 4050 SHA256 d6f823d5adfeca909866273af888433604eb97844ba248f9c02468ec39aeee0f SHA512 d1676f33a12c61d5b8dd6e5385f4e2170c4436d7574cc3255f3daa89706c2826b18df46cd69d813efa6b29776628d3cbf56e169ea11d984f06bd8aa3e0d59de7 WHIRLPOOL fe1f0f40e9660aaf8326057ba517d559cf3aabe16bcdf419ae9a85c284e06de582a4799285926f2ce1347251c20145e2d61e7ac905cffc7af2e8ed38e8c0be3a
+EBUILD ut2003-data-2107.ebuild 4052 SHA256 659c76324aa1980ee5a6286f06180779a01049ba66e43e208a51876415a46049 SHA512 73f888fc9ab672688acc1c7f927166079db0e054a0ffc4764ed7074a918717dea2d93a375cbdf771bae6f3e57bacc84f3ad9d0df875a1985376f5896e1b85e16 WHIRLPOOL e33896816a82ded2d1f322fa62344a7eb61733e99782ce76cdd29bed7fd8e0da567f2570841353168ba6cae79044b4e1fcb31f4708c9704d83a1fbda7ab83bfb
 MISC ChangeLog 2565 SHA256 321f4635abc16706ce7980193268092920c91b26a3a43912bbba1bbc0f726bea SHA512 62608251dc6b5a8b2ced46b1d07bfa06c76c7beae7c244c5df8c837b19d60ef2694eac8bf7d2152992e34c2f27988354ef36a73f6c697482f76846022960eeee WHIRLPOOL 8b7ed92d84c71d9342aa8c252549a60b9146834597608bc515f04252aa226e60d0bfda4f978962b557acaad733f3c3ebec132ebe0ba0367c1080a07a95694c92
 MISC ChangeLog-2015 1972 SHA256 32cb2b25e7f0c3539eb02732e925a76ac126f78ed136fa37ad7f7756b34b857b SHA512 88c7548a6fc0c7b28643b34fd5c25cbde87022ebceee0a5d0e5e214bff2be173c92f56c17bf5326819b7e204cf7796c72e146f29188d070a2aae2fc5883cd3f0 WHIRLPOOL 6f9ef08322765a34d551860bc6864d0e23232e85ea2d725a7086138ed6e608a2f14a591928e6d504605a841b0c2df8ca0bfb37e86bb1b2712d0f5f272a55d71f
 MISC metadata.xml 771 SHA256 ba25f4169d4a689de3925a408b36b9d36c0f51673d3d23892f754aaa3a630dc4 SHA512 d30d55503e3b3897d2a5093c06a39f684bdf0879214931a360a87637cd62ae1ca019577f42275bf2b4ba28649ab2989b0a2e184998497ddc5ffddbb6ba35ef5e WHIRLPOOL c648bd9951f1f578cd893012dc4ba2165f3ee02bb654eeb1c6858b130a91e49e2719ebe0b912a7715901ce4d4575accfcc84641cf0662eadd56f97ec70a37be2
diff --git a/games-fps/ut2003-data/ut2003-data-2107.ebuild b/games-fps/ut2003-data/ut2003-data-2107.ebuild
index f10d61c8f455..ccd587855cef 100644
--- a/games-fps/ut2003-data/ut2003-data-2107.ebuild
+++ b/games-fps/ut2003-data/ut2003-data-2107.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://download.factoryunreal.com/mirror/UT2003CrashFix.zip"
 
 LICENSE="ut2003"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 RESTRICT="strip"
 
diff --git a/games-fps/ut2003-demo/Manifest b/games-fps/ut2003-demo/Manifest
index 9d883d2b5074..b7c924e57602 100644
--- a/games-fps/ut2003-demo/Manifest
+++ b/games-fps/ut2003-demo/Manifest
@@ -5,7 +5,7 @@ AUX ut2003-demo 692 SHA256 a40b124f93f8f47c5823ddec5234eef4c249e7f488a69fbb0f094
 DIST UT2003CrashFix.zip 2764 SHA256 df1a6fdf81f388486b20abf301ef86fb72b0b12d96bec789d7cb7103da579813 SHA512 24fdaac873b08a0860c23f66b9bd93922fc4f64486adbe9bfefeb340f9d9374778b5e7bacd0e12cc79d819fb340e007ab2a7f1f45c9e4f27ab3ab6b11033d444 WHIRLPOOL ddea25bf472d5ca7f9c9dca1346820045504c10be90e914cd0c000a04c48ad4765e4b283a35cd91c2cb9f4cd8e1d2cabac660c2bfeccff05ecc42b1379242ff5
 DIST ut2003-demo-misc.tar.bz2 31851 SHA256 215a82cc4768c93a979771b1abf6250bcbe36be466d119df41acd041ac189ced SHA512 9a1e154aac7a8ccd043135e2a617a19203f6942e8e152d06ec8ed1e6877118cfb3ddbeab7ec2617670e26f13c0e394b8b8dbc747688b8b0b244a8c404f33d7f0 WHIRLPOOL 5597c0c4444de2e50cf87c23cbe4c863258da761645d41f4693a7aa774bb68cb8f8a4bf5c8b3b4e8a670f7c8ce616728d1223dd18b20c59fde60462e413db9f0
 DIST ut2003demo-lnx-2206.sh.bin 137253079 SHA256 e7664d20d6364e4f151199e3f7e111888abeb63e1d93146c88d932c6a2b94173 SHA512 8018d58999010c17198185838e42f7cbda0f55476f1e6065b4b2957db3652fe9c1af39ba65451565f54d41507413f4e0b1edf2678c9cc7c221f2ca278ec655be WHIRLPOOL b4bd520a60385d803d7d44247a48ca80a1116d9a3b9ea9f1dcdf2d1114bcc42e8705f00e228fe50fedc95d1d1c130ceaceb0c54210f51fb03da0672d13c35758
-EBUILD ut2003-demo-2206-r3.ebuild 3568 SHA256 243604a648006096b2f929672c23cb455a5f3eb6e3c8da7fe072fe6e4dc2533f SHA512 e07a649350199173ee334772c5b207fa2dc574697badda53325c15dbd8d65e8f9c68d85a6445efe223be17bd3189ab62311e00ce04ab4054fc26a55afde3f355 WHIRLPOOL 80e99be1a63ab9e761cee7571f857d51f32ec35ab3dcee7e416a4ce342a4cd658ad4a42c9d78087b74a8534a718409fb341ab4259cc76b12e819c84a0aace885
+EBUILD ut2003-demo-2206-r3.ebuild 3570 SHA256 ef2ae433859b9172aa423b087e3b047a9aa5198e4dd4764708422ddfa210fcff SHA512 7e943f445417022ac7744333288cdf8a811dbeb7ec1567092ad4da9fd6c4a6573e9d111bdfe2e0760715afdc1e83d574a7349ebe46213849337efad38f646cbf WHIRLPOOL 7d839955c9dd1e1988d93a94b9a47e817fcad01e1d26fcb6fb45e401f17fdb8f8fdf949b53c02186e26ea567a396a481ddf40e24cec5787f7b3b51855a1f3fca
 MISC ChangeLog 2697 SHA256 4466808a76fffbf7a5e9da2d6cc6e57f7a36a3e272214009c5f149d7e2dcad2e SHA512 27289ca1d4f863db1b33e0372f0891da6a4551f0e7cdc93c313ae9f0436e7e0733b61e6b131716ca554bc159660c5992184cfd3fa171152b9aad8aa576008d70 WHIRLPOOL 77d67632a77f8bbbbd8970bdabbec80f530b08ea3800c2ede0f72a6aa96dd5f6eb84aadeafd860f1669a443e853ca472a5f145534715b54235ec037d0d7f8c3c
 MISC ChangeLog-2015 8266 SHA256 46607ae6eaf0b9f71b7570b485c665c82c20efa9f46088a012ede6b1752b8b26 SHA512 afadb78533216d83cd594550682ad6ea8b7f01d8d3c50086498236d92150944b58fe2fd76887868f7c4fa380cd68eb0c49641f5f13c8c44b2255f09bb3fd57ed WHIRLPOOL fdc23004daa4a9db1e320d26d141ed022f01f2e046e1fd81b606c96d6a1b28ed8f33c553ddb1f3ffb41a68cc867931b263758b136d3f2f34aa1c1a58210d46aa
 MISC metadata.xml 602 SHA256 c52b70e89f22a8b58585903312f0b2d5385f9ee6bf9dc7485c717d1c5880f868 SHA512 2c956bf66965f83b68bb0c04d79d479ae76af9b7781bca93a1ff7898f02838ee0c1cc72290943be9902dee38096f2b119f95f21e5bed781e8c04f331a60adac2 WHIRLPOOL f36c50bdc2c37b8ea081262b10198a9c9b9b08901fc57f8f592718b2925fce3f4dd0e145a844ab9ed79beed27168b73c6c4c89f8c1a169b1e9d1ef9d4c1ccf7d
diff --git a/games-fps/ut2003-demo/ut2003-demo-2206-r3.ebuild b/games-fps/ut2003-demo/ut2003-demo-2206-r3.ebuild
index 912bd67da1ec..317f0d5235e7 100644
--- a/games-fps/ut2003-demo/ut2003-demo-2206-r3.ebuild
+++ b/games-fps/ut2003-demo/ut2003-demo-2206-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://unreal.epicgames.com/linux/ut2003/ut2003demo-lnx-${PV}.sh.bin
 
 LICENSE="ut2003-demo"
 SLOT="0"
-KEYWORDS="-* amd64 x86"
+KEYWORDS="-* ~amd64 ~x86"
 IUSE=""
 RESTRICT="strip"
 
diff --git a/games-fps/ut2003/Manifest b/games-fps/ut2003/Manifest
index 6cf4f48daa00..e3e7a9caf7db 100644
--- a/games-fps/ut2003/Manifest
+++ b/games-fps/ut2003/Manifest
@@ -1,5 +1,5 @@
 DIST ut2003lnx_patch2225.tar.tar 10039316 SHA256 0c2d851e39b4491698f6fb3aefb9bf83340de85085f3b670d93a8cba29aefec3 SHA512 3c44b6254b2b778bf2aca826c710f51db4ec0687c21f1c98e1070f3a9ad7e1a809e741a5b94e20a44c56c60a8b1e4a049788ff5f2a4d581c4eedf3dbbc0da86d WHIRLPOOL dcdd705e9a69612d4672b38a00080063fca7a80123f7152fee8490018c080e0dbdbf7a74acf316f194d182acda2e6f092d1edcab56f4bc073df1f99e9b4832b0
-EBUILD ut2003-2225-r4.ebuild 2641 SHA256 557940d8ef87b7456837864de0321192b0bda0726db0e0cc158a66a72360ff8f SHA512 9cd02098000bdff8fb443808e71f3b027eb36e9c7060b95e733711938d1b22d7bbd66f12b98cddc47aa44e8f6516c8653ccc774a0bca6609e98533c272d5d268 WHIRLPOOL 4f2ad9da2bb4e25715e1bfc80b06053ef7e41477eede1cfb4fc6ce10c80ac2dbeaeb1e7fedf2153174938ba9c556d77ba25f421493c801b57950c67e867cea67
+EBUILD ut2003-2225-r4.ebuild 2643 SHA256 8228a2210acf29a6be7b575822af963d56b29a4cbb0be4c712fbacddc0f3806d SHA512 103316444d7a041f3f6d042c4741853fe6de5d28f37f56755615b057ca8d57102ecb9d6e7f5fda597b2772cd59c63c1c2bd1d3b7f1d89cd7f9744d7c249455e3 WHIRLPOOL 298d8663a0e9002553ae54d9ae28717ed2dbac1ca54aa19a5b0dcaf4a66cdff4d1e33adc64f0aa1aed1192c9d9f7b9e75ff627f25a064ac49838aeefb1a235c9
 MISC ChangeLog 2429 SHA256 0f43328b344043fcaa4dc98f2ba16dc167f272a419ac02627b7187b1e5ead272 SHA512 1b8c2e51656658642944710ff91b42219abbc016632643a0066caeae1db1859c1b2372d17800b3ef4a3c9142c7b876c497725ce761bcdaf4a1e690674570dd7b WHIRLPOOL ba73c129f1e51cdd1f3b4cf1e920385cbc62b4dd0cd1aaa67abf371c97b9dcbd067dfd7e99d686ae09a8072203b2feb55526b87e26ee052db14f05fccd285326
 MISC ChangeLog-2015 8090 SHA256 e58c097222b6b8b41f49d789a9a225ef48f9cff3a4f4896a14a42b590fbc4469 SHA512 b9f6baa63a0187dd9f3a085b417497f1a962d55a8380b089d70c6d5ec1af62af98d17d5241b439008da36c21d19c1750a39b1e146061f1ad474303f4abca8c54 WHIRLPOOL e671af55da3e4003ecc4153e3ff4cb22e38134fbee42a891eda32a8369b22e39fe929d62be8e2adc4e32b6622c0c7fdad24e5e7ac64f7595fed4384d2b9ddfc7
 MISC metadata.xml 771 SHA256 ba25f4169d4a689de3925a408b36b9d36c0f51673d3d23892f754aaa3a630dc4 SHA512 d30d55503e3b3897d2a5093c06a39f684bdf0879214931a360a87637cd62ae1ca019577f42275bf2b4ba28649ab2989b0a2e184998497ddc5ffddbb6ba35ef5e WHIRLPOOL c648bd9951f1f578cd893012dc4ba2165f3ee02bb654eeb1c6858b130a91e49e2719ebe0b912a7715901ce4d4575accfcc84641cf0662eadd56f97ec70a37be2
diff --git a/games-fps/ut2003/ut2003-2225-r4.ebuild b/games-fps/ut2003/ut2003-2225-r4.ebuild
index bb23d7e85c24..9c9c1483ac4e 100644
--- a/games-fps/ut2003/ut2003-2225-r4.ebuild
+++ b/games-fps/ut2003/ut2003-2225-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.infogrames.net/misc/ut2003/ut2003lnx_patch2225.tar.tar"
 
 LICENSE="ut2003"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="dedicated"
 RESTRICT="strip"
 
diff --git a/games-fps/ut2004-action/Manifest b/games-fps/ut2004-action/Manifest
index d39b0d65abfb..661719d67329 100644
--- a/games-fps/ut2004-action/Manifest
+++ b/games-fps/ut2004-action/Manifest
@@ -1,5 +1,5 @@
 DIST aut-r1-msuc.zip 323878282 SHA256 8ebd6746e3db888085a02cdee4524a2221d7dd6ba38c53bcf439db25c921f75f SHA512 50aafff330839c9b8fe8be2e6a98d9532f8429e2a8f258a9a6dabd39f555a9ce11f9178592575996ebce2629ff5c7f3046777bc1605f21c2bbefb80e11ca4f65 WHIRLPOOL 91779065372716cf076f4b2c5a3a77cbaec366f48fb1fc5319a2f3827ceeed4f5d668f40c6fb75b8ae60fa2b7076758c995ff82fb698e13894d546525bc15838
-EBUILD ut2004-action-1.ebuild 533 SHA256 92b5997121a5e8ca46bf4ee3f274d85adffd3aefcfff45ddf169f2705c1766e9 SHA512 3666189ee30c0cc7fa206e2b1a539ee28cd0dae2b6238a159a1014d899b8e976226e527e42b58d6710a4b7dbeb95f5b9f3fc444210041769fc313eada1fd8f72 WHIRLPOOL b0ee7d330bc4a89851056c358fd7da2ae96e263f4875265e6241f2698dcb90393915893354c1fdc985e682accab9d755ee515b413d838247171ee53917fdb43c
+EBUILD ut2004-action-1.ebuild 535 SHA256 b444fb6f002b7bbf04796f47ad6deef43b624054b036c538a4d49933a08abcbd SHA512 10fbf2eb7b8d0d1cb1b0521032ec4dba3e9a6c904aeed75b6d042af1e0bba0a268a49a99d4f3ce995d27fbd1e350be86f3ee7fcdfa38640f4d83be0f66c5119a WHIRLPOOL 9b7dc49dc5df5a6d60e4d6d11a6e6e40696eb45f2e87d917ec6365d9bc3996778bd49a3a93230e2f84edc41d8681f1c96b4f2ef111d1401c652c3c9a875ce9b3
 MISC ChangeLog 2704 SHA256 4fbcde68cb2c24042ea7076db4dd8d10cc18696313cbceb2f0415c8a40c53f0a SHA512 90a96541f8a3a9592ac487255d787aa57aea244c818eb24400b8ef81b5357f8c9162e221aefd08ae9eea01276d40d56b8023544d36763ca020674bb4fc4877fa WHIRLPOOL e74a0840b1e1c2ae8b4d83314b286073449d8ad1864198e7bcee0e4cb388e291a2dd32365730b6de13f918a94647ae12bac1fc32e4a151d7e1ac242b11c82b7f
 MISC ChangeLog-2015 714 SHA256 850bcefee2a224c0c3903a6a69af0fc439bf0632dc1d0a836c3ef65fb9827d06 SHA512 e6ebd9f71fa866459920fbe325a45b3fb69c67408ec82d97d53dcc67b8f9ec25806b6f3f05af58e6bcf48be9e63967d90810a70e3e2438eb2292dcefea360272 WHIRLPOOL 5091dc4b2323bf3bee64178c4b9f9aa59c00711fd5ed024a7e466438c08dbe8c99e44b075f4afb448ac91317afb86e8a29cf78d3ff526aea9d36aae7a37840f0
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-fps/ut2004-action/ut2004-action-1.ebuild b/games-fps/ut2004-action/ut2004-action-1.ebuild
index ec8aee3b309d..e498223b9d78 100644
--- a/games-fps/ut2004-action/ut2004-action-1.ebuild
+++ b/games-fps/ut2004-action/ut2004-action-1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.moddb.com/mods/action-unreal-tournament/addons/action-unrea
 SRC_URI="https://ut.rushbase.net/beyondunreal/mods/aut-r1-msuc.zip"
 
 LICENSE="freedist"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="dedicated opengl"
 
 src_unpack() {
diff --git a/games-fps/ut2004-airbuccaneers/Manifest b/games-fps/ut2004-airbuccaneers/Manifest
index e828a6763f99..59e308ce65c7 100644
--- a/games-fps/ut2004-airbuccaneers/Manifest
+++ b/games-fps/ut2004-airbuccaneers/Manifest
@@ -1,5 +1,5 @@
 DIST airbuccaneers_mod_1_6_zipinstall_with_info.zip 255641963 SHA256 0b08c7018b35173b4d9be80bf2b9d0945cdf8316aac7286643d6e5ccfb700b88 SHA512 6c91919538b1d74157bf5586b66effcd3aabd397dc698384673425a53227c68b1ec0c4a07c342e399136673dc106b11727103ca6a06dff117d93b73645bd981b WHIRLPOOL c5bcb3f8c9dc7ad183f62e7c567f3753326db67b2f8a56e82dfb8edc8a2f22dcb10b3a8231bf052dff0e26b1c0e0cdf982dbd03fd5c614732ee83e233002d2c4
-EBUILD ut2004-airbuccaneers-1.6-r2.ebuild 503 SHA256 38d36acddf27785f1acfb0ee252c01d04c1bd3054d1e7730bafc796192da2362 SHA512 8ab52fa430b0bf7577d8e65aedfaf72d54eb221b37fd71f1f433b844beeab09da40eec006f2c57c3443156dbe6cfa13e998f730c8233cea6516d14afc3d3d16b WHIRLPOOL 55833ec8195771e279bd24767e3365409769b49aec7dacb2afd6cfd3db99502b3edb4e84dc0a201ffa3c60569e738613f65e0461a25b0cb8703a2e5d846c9341
+EBUILD ut2004-airbuccaneers-1.6-r2.ebuild 505 SHA256 fd8bedb998b00861028796b4e912f74d8bcbc7db526e42924bc20bccb43efcdc SHA512 bee4df2d19965b8c9e80cc1b788e0f08daa67554b06de6e001d5806b0f31a841df93cc830032909f792bec44300a02091ea5764cc91e314ea0559131d6792ccc WHIRLPOOL aa27dc79966ac01f50a62156342221b85361c2d2bd0e592aeaaefb4af32fa29ca471c1387ed9abe1401655c45c804fd323dba27f38e0927f1703ee968ea11c41
 MISC ChangeLog 2661 SHA256 30267d5d5dd93e20c30682012b5b222c6c55624731aff38ba91e9422dadf0965 SHA512 87a9a267553cf94ffdc69bab3ec2aa6d4b2a9c8bf579f71a78eb11573efb8f39e9daffcca053c58218c944460d9fcdaab553b71e24aec113cd6828a3f785d536 WHIRLPOOL f4e97e5c016568e6ee0e1558e684c15007b6edf8656be427088425b374874f0183bce0b53f1a3d79f33a8ba31b5e1e79d6ec5074f85cc60d9959293d958c3697
 MISC ChangeLog-2015 1724 SHA256 ada8b1e803db5c9a7ad87e2aad0697e6a61e1a01831b981dfa56cef9268f5887 SHA512 41f5c74c9fdaf800406ef7e02d0c9a9318b7be5abe1f2584058172acb8a12486d1f888e2b476ad85258e4e7cd9a7ca01312270cbd7b4feee32a0aaba774c3e98 WHIRLPOOL 85051cafd0ad7826dc694c0dc0a53479b26f577204041e59ad4e09512eb0d48d28e79e961fe3839a66ec1f9515688bcc135f1ef0b52664d4a688b97480a325eb
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-fps/ut2004-airbuccaneers/ut2004-airbuccaneers-1.6-r2.ebuild b/games-fps/ut2004-airbuccaneers/ut2004-airbuccaneers-1.6-r2.ebuild
index 315244a7176b..e8d587664787 100644
--- a/games-fps/ut2004-airbuccaneers/ut2004-airbuccaneers-1.6-r2.ebuild
+++ b/games-fps/ut2004-airbuccaneers/ut2004-airbuccaneers-1.6-r2.ebuild
@@ -14,5 +14,5 @@ HOMEPAGE="http://www.ludocraft.com/entertainment/airbuccaneers-mod/"
 SRC_URI="http://bin.ludocraft.com/files/airbuccaneers_mod_1_6_zipinstall_with_info.zip"
 
 LICENSE="freedist"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="dedicated opengl"
diff --git a/games-fps/ut2004-bonuspack-cbp1/Manifest b/games-fps/ut2004-bonuspack-cbp1/Manifest
index a88cfaaa0a22..7c5ba6e8b89d 100644
--- a/games-fps/ut2004-bonuspack-cbp1/Manifest
+++ b/games-fps/ut2004-bonuspack-cbp1/Manifest
@@ -1,5 +1,5 @@
 DIST cbp1.zip 144163647 SHA256 c952dbd5a0fbe986b77bd56a57218733ff26ce8f5d074feb557a69c44ec1e863 SHA512 e2ead75796fd68b3f0d6ea50b4ed9988fef043730c6b81487d34c45aa26f63cac7b6a43991b673fbd6315f1496d2eecc52a5845c12f244411cd71fedab93c6fd WHIRLPOOL 9ee46970dc69b32b77ccc8707d1b2879aaa49ee98edf5b64f26097353eaa878e49bd4daa54aafe8a89b6034e8a73e63d1508482d9dd9632295eb65acb0cd0d26
-EBUILD ut2004-bonuspack-cbp1-1-r2.ebuild 482 SHA256 34a185091cd6096c28850af4d5de575972a9b9039d425c3b0adbb5d491dfdcbb SHA512 bbe1ef2b49dfa461c319becc01da7d5a77c386dedfb21a52a212e15d67d59cc1089f67a27c338af90427bae881a4453dbedb1962c434072d017b079d4a5fbaf6 WHIRLPOOL 031f386d4f0ef958bcecde6d7d04672a8108202dc2ce609358dda24375c622557d9d75cdc5c2083ed6f30d8a13e4428dad3406bdd57497da885955d58617f08d
+EBUILD ut2004-bonuspack-cbp1-1-r2.ebuild 484 SHA256 5ee17b82acf23fbc94ee5a057435abab264f20214271243d6561f8c3fce4df27 SHA512 a245474d745cb3bef421e8a06266598c3e493f294d41088f1c185e568f5edd69170709f8bc1a744e866a09e2500d6fb127cb766460faf6e5489ba63833e01cfe WHIRLPOOL b0bb1dd0df768da2fa1835675cc0e6b9a10f1b286f5dd17b5bd5435d3b229ce680a0cc4753421f8a978cf9d8cf89bfda9b6f941890cd169a879cca816935c661
 MISC ChangeLog 2605 SHA256 c649fd9169c5cff5bbd6322a0298df78b3fa7886bdaeb9355e2b316a319ea789 SHA512 20440ae86a76080e6697efb4195435ae593d764ae5ba69bb392f9c363c6e97b973d1dee67e864bae410a4499476040a3f772aca19e9bedef6a4dd8078291d9ea WHIRLPOOL a3b421022b03519be82165fda0de844a33bf5258b8da4f8eef0a672fe97bb4a016bcacb3971098705581a25a89e5426373e4bad8b111c2ea11a06d784641a59a
 MISC ChangeLog-2015 1705 SHA256 7e4ca3fd41ffc5689e0216e347aff81e939222706ff972c4f018a62a215aff21 SHA512 58e30ec9d9910da9a8a87a1ad8ed45b2cebe72f05020f2ed66a6e3dff50676955592bcc4a6a581fbcb77e3ce656258ab00f4eae373732635e18156bc7b05942a WHIRLPOOL cd3cbc3edd24472abff9b19a5389e321d597e7150fac3e561dcd89b4b1adc8bb94b935cf88f486084f57e536832379bd2a7344c48a67be3c6a0e0ff130fd08fc
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-fps/ut2004-bonuspack-cbp1/ut2004-bonuspack-cbp1-1-r2.ebuild b/games-fps/ut2004-bonuspack-cbp1/ut2004-bonuspack-cbp1-1-r2.ebuild
index 3eaec6c13088..2752d506b044 100644
--- a/games-fps/ut2004-bonuspack-cbp1/ut2004-bonuspack-cbp1-1-r2.ebuild
+++ b/games-fps/ut2004-bonuspack-cbp1/ut2004-bonuspack-cbp1-1-r2.ebuild
@@ -13,5 +13,5 @@ SRC_URI="http://downloads.unrealadmin.org/UT2004/BonusPack/cbp1.zip
 	http://files.volved.com/qsr/ut2004_map_packs/cbp1.zip"
 
 LICENSE="freedist"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
diff --git a/games-fps/ut2004-bonuspack-cbp2/Manifest b/games-fps/ut2004-bonuspack-cbp2/Manifest
index 0792f8f0778a..4f4599672421 100644
--- a/games-fps/ut2004-bonuspack-cbp2/Manifest
+++ b/games-fps/ut2004-bonuspack-cbp2/Manifest
@@ -1,6 +1,6 @@
 DIST cbp2-volume1_zip.zip 203766207 SHA256 94e21360d2f87489822468b6e037931ec0a2d9d3653259d90a58cabaacc3370d SHA512 9e425985640f9fcf9c1696d75e0794b31110715ba3bf664087ede1f1925a68e76e4ee87d248b245429702c2bffc1fb16362fcc43f795681efcc5880a2a7c3213 WHIRLPOOL 7214e089c76a19f14c88e763434e5505f6a71180a9293600f200e521daeb4a209c0fe032d2a2e616152e758bfb7223012c680873cb40a66c3528a2d0aa673ecf
 DIST cbp2-volume2_zip.zip 200444127 SHA256 62af666645205c256caf539646483fcaad24af91cb5cfb283fc9e6b48f18c79f SHA512 52982b302bb2d8f0839392f8bad05935bb8c5cae9e98528dfada7fa80f595050829ff6872b834197486c3401256f60c6c023133f6446299cbd72e1fd7ec3c8f4 WHIRLPOOL 878c75ab02c21042c3d76be46fae7caf01cd9f226703d0335fdf3f96e5c175e0904828a5d7a0a6f7418b3e03dfee6f964c40261b928d2ab1616d784831df2ce0
-EBUILD ut2004-bonuspack-cbp2-1-r2.ebuild 862 SHA256 93152cc54ca9064d64707abf110a84118840a322a9e3176b0db2dd8befb11ef0 SHA512 0236c834db5751b0fca9b758348dff0568925ae55db42a525735c2503b028a1c0dd2283d44db6b8f1880a3ba849d87efc4b8bc73dd1d8d33d6aa7e512ec1b06d WHIRLPOOL 3e9d7bc73c9d403ee2a9523d22b5f12f349189bb58911c42583cda2facdaec02628736a6bb0984b4da277bd970a5fc99aeef44bdf2f8fb28e9b548987a81d5da
+EBUILD ut2004-bonuspack-cbp2-1-r2.ebuild 864 SHA256 ac2ee3a5f7d727338f156591e0b01a22161501cbe4bbc3cf2016c0fe287a3de5 SHA512 653f305c8a8754815afab9834328847b7991fe414fdacc78075f93cf79f9ae8bfdc34c1c14083895bd1e9d0db0020a31e6478fc30f9e6dd0308db27bbaafea93 WHIRLPOOL 536af1b7d080911b35b525098dd34deab5bccd6dcbdd8b9dd2ed01b6cdf72db9b2e01f31f51979f5c2679017958964e796ed37128ef066073cda31c8451fcaf2
 MISC ChangeLog 2662 SHA256 cb8554f40e2fb6b3fae70ec466f9665cd1df5d69477f00397f7c7195c966822a SHA512 d87868a731ec2d0339e442fc85cf54bb3037093f5f788100e724a061dbed1f1c68d15926ba2892f7eba372518f3243ec39b5c30b4719c2b6d8b672ea49f9198d WHIRLPOOL 2b061e5b6de322bfa23b11e67718578065769539c755c0ccc945fc1e1ecda77bcca0fb583a1417aaad073092bed07bb880d3516d2e9d5eb4d000fd512c373215
 MISC ChangeLog-2015 1924 SHA256 36ac6ee54bccb39fcd4a2b8d2ef72e26c14ee2b5b6a79dd527eecbd5121b28cb SHA512 1fa9c6a8f554cc11e38c58085be441ceb866192ec2132a3fd546112d59ad684b4e175fa2bb25871702eba79c79a951997717eb5382ee11dcf2c0867efb9c4d2b WHIRLPOOL 286245124445a92eeba49003384ed4871f4b74dcee078dcc27b5ea03708d7ed31037641aae120e72eb96af8ed06795a7d3315010b7990528f6e7b6ec19e3d5c9
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-fps/ut2004-bonuspack-cbp2/ut2004-bonuspack-cbp2-1-r2.ebuild b/games-fps/ut2004-bonuspack-cbp2/ut2004-bonuspack-cbp2-1-r2.ebuild
index cce8b1905ea3..c5fc28cbe82a 100644
--- a/games-fps/ut2004-bonuspack-cbp2/ut2004-bonuspack-cbp2-1-r2.ebuild
+++ b/games-fps/ut2004-bonuspack-cbp2/ut2004-bonuspack-cbp2-1-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://ut.rushbase.net/beyondunreal/official/ut2004/cbp2-volume1_zip.z
 	https://ut.rushbase.net/beyondunreal/official/ut2004/cbp2-volume2_zip.zip"
 
 LICENSE="freedist"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="games-fps/ut2004-bonuspack-cbp1
diff --git a/games-fps/ut2004-bonuspack-ece/Manifest b/games-fps/ut2004-bonuspack-ece/Manifest
index 775b038dc297..3b5bcfbed167 100644
--- a/games-fps/ut2004-bonuspack-ece/Manifest
+++ b/games-fps/ut2004-bonuspack-ece/Manifest
@@ -1,6 +1,6 @@
 DIST UT2004-ONSBonusMapPack.zip 11018471 SHA256 b1c6e1fbf417381180fe02a81eb0cab752e6baa6b814c42fc7f69da11b02dd05 SHA512 8193375b89cd6fbc8b00de195797099c128fcf5cb73757bbc57d3c5350c497a878eaf0200f2e0711bf062e25c5d170e05b055c63f85b908b18dcc89572d71fd2 WHIRLPOOL 5600b1420124034983258b0843561164996e8c427ecfd04c6552f92585c09b0eb1be73360151ae0c9950cb28df7018d0287bfac86bae014c48e537a1135be42a
 DIST ut2004megapack-linux.tar.bz2 203124107 SHA256 b9122c8c405945d29c3cdf61f57fe4d21e886b79ea9caa0d8e0ca2e520aa472c SHA512 4ae5eec0622c2bd96dfc162541bc0771399b012fb00f022282bc8c34600cb8e9bb7c18a52dd55fbef6f16fedaf225e301c46077a6accd001f4c77ddad89ed17b WHIRLPOOL c7b995764c3b6e88673eba29ef77172441ca353eef0c3eaeea950bf52007a6656c87a19f2cbb074c70780cfa1f36cac8cf556327930445f6495d415d9fc26425
-EBUILD ut2004-bonuspack-ece-1-r3.ebuild 1752 SHA256 c37ce6f39a17519192e7e0d83e37c1c7d13e67b7207fdacb9023fe382ef4f0e0 SHA512 ffcae5076ead2b9803681abfd03fe8e4c9cf4ed7bb8c9d6dff4cde626c92de5c08f745e0d4f69ae1f51db905c79f56243a57b094f3a772eef6f6df160b7f474e WHIRLPOOL 193a8447b40487f995f25afc0029307dc01442efacfe049ac05aed70057bca688fda3f1ad6df0c2192fc8ef6f0180275275a6b8d30a5c966555a7d254ca374f3
+EBUILD ut2004-bonuspack-ece-1-r3.ebuild 1754 SHA256 e72936ed63f5767b870fe81a9300d821d7d73e76410749a67b33faca29d3dd3f SHA512 4136dd65c99555dd1bb859e79d4000db11d22e47f7d0846fff15b696a7e282b840dac973352815e85c4c14a4ca43d3cbae0e1eddc21f842cb25d67d960329fa6 WHIRLPOOL 016822c70f8f18c9a803a03d1bd030d73966f5f5242fd419245cd06e9ad660279c52f12a2923d02262d6ba1f2bd94fae2b8369c71eda3e85cc4bccb3870c3513
 MISC ChangeLog 2632 SHA256 2daa5c4d492c55f46febe9652f50487c17957b656e673b8ed12137ccd13cc8a8 SHA512 b17219edeb123a99a1ee153a9ad3273516ea10f1f85cad591e2776394c94cd49dd7136416d1985539b8bca7eed6932e4f305c6d5d3826eb20e2867d18f64a9cd WHIRLPOOL 158c1ca9cac3b6620030870a593e5d8ac39bf0923bc690e574e7e0676b58ddbf69ac480ca11d970f6da92d9b4260f9ef52fd61b49c60e133d1f0fcb576ddb5eb
 MISC ChangeLog-2015 3279 SHA256 1e947de7409ca71a3193e2bb0c6398ee6b388ec96926aa1077069553b8696613 SHA512 b911f28fc1bff5ca4de474cda393f49ef03de750a8905e89d3b6e66625050db02650f0d322fe10dbedac185b126d1b028d16e9dddb6752db986d3f6d57b49dfd WHIRLPOOL 02abbe1b052732215feb63f240a698da07006d5779c8bbc7dc1e0b4aec2a2fdf2e073e6c2a7a6ff81d9ae0027362efe20c43dead969094a4ed075cd96d14d48f
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-fps/ut2004-bonuspack-ece/ut2004-bonuspack-ece-1-r3.ebuild b/games-fps/ut2004-bonuspack-ece/ut2004-bonuspack-ece-1-r3.ebuild
index 58563c8924d3..e5ebe2ab3b90 100644
--- a/games-fps/ut2004-bonuspack-ece/ut2004-bonuspack-ece-1-r3.ebuild
+++ b/games-fps/ut2004-bonuspack-ece/ut2004-bonuspack-ece-1-r3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://ut2004.ut-files.com/BonusPacks/${MY_P}
 	http://unrealmassdestruction.com/downloads/ut2k4/essentials/UT2004-ONSBonusMapPack.zip"
 
 LICENSE="ut2003"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 src_unpack() {
diff --git a/games-fps/ut2004-bonuspack-mega/Manifest b/games-fps/ut2004-bonuspack-mega/Manifest
index a15e80bda62d..cb77413b1d3c 100644
--- a/games-fps/ut2004-bonuspack-mega/Manifest
+++ b/games-fps/ut2004-bonuspack-mega/Manifest
@@ -1,5 +1,5 @@
 DIST ut2004megapack-linux.tar.bz2 203124107 SHA256 b9122c8c405945d29c3cdf61f57fe4d21e886b79ea9caa0d8e0ca2e520aa472c SHA512 4ae5eec0622c2bd96dfc162541bc0771399b012fb00f022282bc8c34600cb8e9bb7c18a52dd55fbef6f16fedaf225e301c46077a6accd001f4c77ddad89ed17b WHIRLPOOL c7b995764c3b6e88673eba29ef77172441ca353eef0c3eaeea950bf52007a6656c87a19f2cbb074c70780cfa1f36cac8cf556327930445f6495d415d9fc26425
-EBUILD ut2004-bonuspack-mega-1-r2.ebuild 1154 SHA256 48da361ec44dc5eaaf8b457fd9a84fa779c713cc0f922289fff3e3900518ca37 SHA512 0cb7a1e9d6fed056ee4066b42384c85f4a042382119c581a928631a2abd5c67cd0be9b835b1a0859a2a6a191d230351188819e13c6fe059023ba5650b5ad9732 WHIRLPOOL c4eef5e5a12ebb4c96fbdb92d1c8c140d30ee517cdce8c2374c0cf01d589cae793705b1cd47995252c8d637d85f7a7d51c6e24855c1984d370b8369073f89819
+EBUILD ut2004-bonuspack-mega-1-r2.ebuild 1156 SHA256 c4fb616649b75d19e5df90278a5a52723672e829c39bd723116977cb637d8442 SHA512 6aeb92058fe6a534f1ab5c688f4c8e3c14baa166dad5356944fe4cb39e29e4bedd4792799e040eacad9dffae4d6e7c5919452fbaa0b5c6cbc91a72c6030861d5 WHIRLPOOL baf39d746f60bf1339b02f0600868dbda69f809069bcc2a12c4bd560a60d1c7cb8a57584a341249990e91d4883478acadab56c7476588b1451b9d9cb6d6bd611
 MISC ChangeLog 2605 SHA256 53c3998adb6f9ebbb8f603428f15527d5fa7f350199e197296411994c3f37964 SHA512 936be2465427d5ba3814b97d84135dfeb17846702bcf35f0126d67f2ca0df8d40d7b9e4a56a000fddbd0e33e4e4ee219585650ab4f87092b733ba32eebbafa6e WHIRLPOOL 294acc550a1521f0570429e79fbe72b83bb60dbc9fa560e44b360f1fae94a5dc27d01b71ce0f938136fa51a58d68e220050b6c25a9d6aaee07676f7c1e506f11
 MISC ChangeLog-2015 2517 SHA256 2d74c8a8f0d656036b20e98ba5603b202196a028acf1fef3c3dd077369a0f925 SHA512 31821f044b6bc4bada1697a4e18ee200de8ad5e86d8567ec0e622d11f1e03d9e3906f35d6bb69ad70455838bc887b620e7e9854aceca911301078e6029bc370f WHIRLPOOL a57cf45e95641f1bc04cf1e2a53b3b07f4eebf027488b5408e443cf1647d661832376666d2dfe50fdae49f180cc16af32c9bc94a7337b2fe6871123342edfcab
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-fps/ut2004-bonuspack-mega/ut2004-bonuspack-mega-1-r2.ebuild b/games-fps/ut2004-bonuspack-mega/ut2004-bonuspack-mega-1-r2.ebuild
index ec2133acbd5a..807f91c6bf04 100644
--- a/games-fps/ut2004-bonuspack-mega/ut2004-bonuspack-mega-1-r2.ebuild
+++ b/games-fps/ut2004-bonuspack-mega/ut2004-bonuspack-mega-1-r2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.unrealtournament2004.com/"
 SRC_URI="http://ut2004.ut-files.com/BonusPacks/${MY_P}"
 
 LICENSE="ut2003"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 src_prepare() {
diff --git a/games-fps/ut2004-cor/Manifest b/games-fps/ut2004-cor/Manifest
index c8b0a5cf33b7..eb96165d40ae 100644
--- a/games-fps/ut2004-cor/Manifest
+++ b/games-fps/ut2004-cor/Manifest
@@ -1,6 +1,6 @@
 DIST cor_beta_v1.0.zip 278979612 SHA256 bde2f6acf241ff94ce59cfa87271c71168cd82c00b55ac9de1c6f2317690f4e1 SHA512 04a8db1b31478785052d162e2007eb336d1d99c76f96098163c71616d3951e4e3c7b95c1b29a05e9acf2e0554c5bd20e5e2df10b93325b0e2cabf3a5a60640a6 WHIRLPOOL 66de704405e17cf4394a66a77941537141092b8c0478227276f5e9cf56cae6b5af3e66cc750002f725dca04c3327b83cd8d5839696f924ec1c0961566eb00676
 DIST cor_patch_b1_to_b101.zip 20386490 SHA256 78034844cda02f96faf178fac8ed05c64aaaa7390d67877aed334f320b9ff903 SHA512 7b7243727a0e4570545f9d3f93a141b61da5e4cbe458894602925733396b3f9037c7a9a21a1ee9c9638181b4c321a9030a29837e1e808826a70bb52f54e2d6a6 WHIRLPOOL d672a928a14b70f0f6ebd6955b8f92868aa9b250a5835ea2401ef09f187e3be919ad0fa3416370eba74722c50d0421c2cff5fe3f86b2d523f48182f2bf666cac
-EBUILD ut2004-cor-1.01-r1.ebuild 557 SHA256 0e954df981c7025665f004d1de19602625eb6ef5bfdb34f81c0d74c5de08d776 SHA512 9aeeede3e172854aa1a39d0e22ecef8fc89416d44e182c8a0f54d93bb10b3c185456c2af15cdb8795d5a2b88879e767039503857d500564176bec9d2dca78981 WHIRLPOOL c531e77e22d7f32780f4d672c253587a943e9d63a2e2dd81e429e6d52d5785fda648c75dcf5b793380de79ebe65142c17df48757316465053571f4d4c6d43831
+EBUILD ut2004-cor-1.01-r1.ebuild 559 SHA256 7b4082bd7509610dfa99697fe6e41af247486bb92a9b18e2db3c4028b71fc711 SHA512 9f41c6b5e7ebb5fb95e53bf1d2cfc269907cfed0444caf04c7aebd1efa9066df2a49a6265d0b1bf17aa90ad860f86710962fe6af79d78cfa5415252855f29cef WHIRLPOOL f83e4e146a8d198f3b866f3c65634f5b2f22fd75b12674e33ef2ded22faa2a161bf4539c239007c0496e303c6c608486cde697badbba887f20c0b1c01a828adb
 MISC ChangeLog 2717 SHA256 79a332c3bac094c3e7d5eaa3cea1560c77041a32369b0c25ba2bafca95ef4310 SHA512 08797b93edcb7da409b410102fb5e4bf3692b98ecc7b7c81a1b2f7b33216041c52edb43743ce538d0743974bd8115979347bceeace3c8aa24d21be528f3e9528 WHIRLPOOL 965c13aeb97f064e50b3197ec45047907cc990325db7439a699a14c5affd66efe765274c65a6b7754ca56207b5666f71777912a1f5b56f41dacaa6a808f83e47
 MISC ChangeLog-2015 787 SHA256 7f355ac0ea1b55a0fa03323c46142a0f78737caf5aa6dd457e1b288976250e30 SHA512 cfb7fe641187b7093da4b011944a4fe61f61b10a6c5def21d61a4f4d130651ddcb2e2dcbd44c8676cbd7546750c4a6ad70baf30c16629fc41cfc1cf50d2bea1b WHIRLPOOL 1ab8346af7ad8cbc8f40a65cda5922c24bdade731e9f0f90f5bb0de8ac53773ba59f3dc58768e9e38492e59d2ae5d97da670fc94f8c6f87d81c692103a8fcf12
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-fps/ut2004-cor/ut2004-cor-1.01-r1.ebuild b/games-fps/ut2004-cor/ut2004-cor-1.01-r1.ebuild
index 5c8c4887a8c9..35d2fd655966 100644
--- a/games-fps/ut2004-cor/ut2004-cor-1.01-r1.ebuild
+++ b/games-fps/ut2004-cor/ut2004-cor-1.01-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://ut.rushbase.net/beyondunreal/mods/cor_beta_v1.0.zip
 	https://ut.rushbase.net/beyondunreal/mods/cor_patch_b1_to_b101.zip"
 
 LICENSE="freedist"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="dedicated opengl"
 
 src_prepare() {
diff --git a/games-fps/ut2004-crossfire/Manifest b/games-fps/ut2004-crossfire/Manifest
index f33de54c81d5..97e16d386508 100644
--- a/games-fps/ut2004-crossfire/Manifest
+++ b/games-fps/ut2004-crossfire/Manifest
@@ -1,5 +1,5 @@
 DIST TOCrossfire_beta_1.95_full.zip 1243833907 SHA256 67d9ec864d0ff2303edb003a6eeebf015143d61999640074c4bd5b205f216d3c SHA512 a02c8221f7687e4a2276f6da9f9fc480b0c8aaf3f98517134614079699a0ecda088e781d5d0251b7da8588493afa394acc5eed99f40034d3555feeef6e175bbe WHIRLPOOL 70a154ba253cb983bf0e4558c833abfcaca624124a2a1d7edff962f3fc3e9dceb09f66cfca54cbe72d287ae77ce7f493e88b71fe6dfcbba8f0b53232920697ef
-EBUILD ut2004-crossfire-1.95.ebuild 697 SHA256 e1d2d97c4d963497839c7d719767801ccb683c02294c77af6c0cffa41b904aa7 SHA512 fe1aa6534db54ddc0b6dbda7fc3d12d65ad5ed4cdb07e3ede2482a263cd3c0b106a001c8118bf78e4518c2981d7b1c235fa109d37354007c7131d99f7bc7b49a WHIRLPOOL 5f7d40a0ff64bc44bee7d3a8b69dbccb91837263233ccf53c57863a14ff05b40910edc9f82f0f7652c6307b752d4e6fbab5e06fa3dabe97dd32d54dbac05ccc7
+EBUILD ut2004-crossfire-1.95.ebuild 699 SHA256 ea3aacadadca9fa4227b8990e3e3e2e2b031b24a889c0f6ae703e8a490037141 SHA512 b1912616eb0e3feec1db88dc4d7a7b72d9dfcab6d91c9e880c7fa090f4eec6faa360e449f8d761edecc296c213ed0d034ede98493e256ff1d1b9fb4535081806 WHIRLPOOL 199b5d06da8c0d6ca7d6d8cb6c61ce9461a3dce0cde46a300b11eebaddda69677b6be1e8a1d84a5524df473d3f5736bae7781da97cbd28fb4ad068505035556d
 MISC ChangeLog 2735 SHA256 2ded46601115bf7d82822946d5a3b1981d13d628efef87c6bc499c6738429a45 SHA512 39173ad9dda8c0c2a2e8df7c07e9ce28aed3c200303c7e16ea1bb70aee6fdc72610f8e34dd6dccf82054a6f71947f6d55600d85f0a8018de8fe6fac10563fcd5 WHIRLPOOL 7bfe9f03da26562ce70099537ce3b1b5d333fe756779adeab654d30a29c6bcfc13c84f0f718f3ba0c6404a5f51f7b9efc9b4b96f822a389bb0c553d936c2ac31
 MISC ChangeLog-2015 1421 SHA256 87dc8f343c4fa1e108af36702de07d2990e7e8c34cc20f4e537205517c597837 SHA512 a408118ec9bd09ced6a8af5888de1ad556cb95809fb921d1a02edb6f24bd10f225ca558e7db37a59e368788b3f9d7b15299163a8c94a19956d9fb921d7539378 WHIRLPOOL 756921701c51381cf7c20b4ae1f0da9cc5dc37df119e4f210d45aeb3723c54d14ed0d398cd1a8efc8b6145c39205455b9defaee69557f490bcdce3b6d712d894
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-fps/ut2004-crossfire/ut2004-crossfire-1.95.ebuild b/games-fps/ut2004-crossfire/ut2004-crossfire-1.95.ebuild
index 9cb62e7a45b3..52d8a5e9ed13 100644
--- a/games-fps/ut2004-crossfire/ut2004-crossfire-1.95.ebuild
+++ b/games-fps/ut2004-crossfire/ut2004-crossfire-1.95.ebuild
@@ -15,7 +15,7 @@ SRC_URI="ftp://files.tnc-clan.de/TOCrossfire/client/TOCrossfire_beta_${PV}_full.
 
 # See Help/EULA.txt
 LICENSE="free-noncomm"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="dedicated opengl"
 
 src_unpack() {
diff --git a/games-fps/ut2004-data/Manifest b/games-fps/ut2004-data/Manifest
index 31bed4f30757..4838bc67b1b5 100644
--- a/games-fps/ut2004-data/Manifest
+++ b/games-fps/ut2004-data/Manifest
@@ -1,4 +1,4 @@
-EBUILD ut2004-data-3186-r4.ebuild 12491 SHA256 3a841528a235a67c1708c46a920a06058fd22ccccca85d195d8f2c929b2a8576 SHA512 0e5e892b1d3d307c68ebedcc8b1ec8cbe23bbd6938fdbd5793765c870a2e6d1d80afba336795915c37f12386a0161bbd0f3d2aa5c82bb1637d2f5bc32eef1794 WHIRLPOOL 73e6bd282062e95926d61807bfef280806ad96c5000932fd9f3c6a44e6ef2d667165303c3e1b4150ac29198c25f45fd5c41600f90e74646048f5bb8e36050906
+EBUILD ut2004-data-3186-r4.ebuild 12493 SHA256 acbc7f7e4f31b0d11370ec2d840ef775234ce7718438b87daf517dfa0d158642 SHA512 68b5d2a24c5818235edc984c60de39a3a9b17bab304d1ecb601eab6db170f119c9a300756900700cde88c1e17ed103879d2db8982dfa2ec3ae0d83ea3e9a069e WHIRLPOOL e8049357f9d689515c9f4138db998992de43969b275808ac2de0c387cde55f80970a9dad7e3db54a848ec9e7cb5c7fb8307256c87ef86a9785c2e0d8aab2dbfc
 MISC ChangeLog 2574 SHA256 cb8b9fc9c4b4c169907d8b38ae67a217a6da95e6f7c19ef991c2cc73fdd48d1c SHA512 84280094bca1760f9e63ab70728c17477ea158cbcd44ff65b7919aee1ce988851160ffba3083241d122fd049d0fab81d8ed4778c6f66c404419f99600aea079d WHIRLPOOL 3b43744494996ee8a6a7f8108bc5b03b12eab1a44485b3eecba02f0c4318bcde1cf08f1c6fdf20a8446c1268908dbfcb6262e7a6349e6727159e6100908c5bd7
 MISC ChangeLog-2015 5221 SHA256 1ea1368c4ce0070157e97a99a027e3dffcf88b4b1ab42a1b65a82c64a4eefd31 SHA512 ac9f807322bde63c8ce388cf362668ede65f719d30c51473b6c6009c4464f38b965c5622131cc63e78af00b1ccda3d2252d250adec3bd9072682b4fa08d66c5d WHIRLPOOL dc11551f1e590f0d54c2e2736f2602be9376c885119d407ec9d3285717409317bdcc532f777d765f75df1d78cda872fcd5eb72592536bfafa460ae54a48c2d2f
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-fps/ut2004-data/ut2004-data-3186-r4.ebuild b/games-fps/ut2004-data/ut2004-data-3186-r4.ebuild
index d8cf9883ed62..7c761a8f9873 100644
--- a/games-fps/ut2004-data/ut2004-data-3186-r4.ebuild
+++ b/games-fps/ut2004-data/ut2004-data-3186-r4.ebuild
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE="ut2003"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="games-util/uz2unpack
diff --git a/games-fps/ut2004-deathball/Manifest b/games-fps/ut2004-deathball/Manifest
index a8b85a5001b0..0329cb24e65a 100644
--- a/games-fps/ut2004-deathball/Manifest
+++ b/games-fps/ut2004-deathball/Manifest
@@ -1,5 +1,5 @@
 DIST deathball24w.zip 79276308 SHA256 564a7d93f0eec438f1f7f5da873805429e4a2827eb67a33f506e7313be763343 SHA512 b310c38dcc5889fc3f56861fe8d05e53c4b399b33e318614bfeb86b899051c8870b23bc39a82eda7eb7d469d7d2d32c361df922bcba18f01d03aa66239b133bc WHIRLPOOL f6d208f166a6ac47b25d09429a11fb3e79255fef313bda78018995c6999982e677e3de81e40e017f7571da51afc4e94b8bfd2d18cd57215de1bbefd2fc153682
-EBUILD ut2004-deathball-2.4w.ebuild 526 SHA256 89d99012485c6c495fe331597202027eed9ed758c71142e902646c19321059b1 SHA512 142ababf9d69ab1c60843ceca9266ae791f611eac18a0a6d0a2f745e58d8234384265ef989f799c1c1982765d56549bbe709306ba46404b59c1302dd66e76182 WHIRLPOOL d8166f8cedc031462d88905c7994e14ba941beef3af32af77b6f7b478bee7e483c31f39f72335a51086a751f9a8a568bf2ed7147913fd42fbfe04a9c5c1caf68
+EBUILD ut2004-deathball-2.4w.ebuild 528 SHA256 9bd2c7274eb9aa87cac67c5a9de81dbc403b83a724a79c9adee913af1adf8218 SHA512 f2f455aeb238441e1387d12f275b5b5bca24118cc698946fb7888796b75acd42d1e4b4128f34719d2e444a03048fac3f025a8027c68478eb940ed9a05e07d0fe WHIRLPOOL 407392ac2d7edfe0f2339538146aa0f3f864bc0cdae266f329911112115d67adccea07c15087184c9f55cd6be086a6992ed0a7bda76957ac49cf49bc0c3981fb
 MISC ChangeLog 2585 SHA256 de9bc23352526457c27bf745b80d3fd58323202aa4ab17d835218bd825a1e58b SHA512 f6ff8d98fbfc96d7bc32163f788d842b70be9303ddc26bdd4dd1d52c4a4abf351f0041a63d28b055a0a13708e424694ed642a913c0b8bf5a11a6587606f1bb5a WHIRLPOOL 0e5a8f3ced53778be00b0bde86a1b7773b6147cce935d2b6ee98d13dbc93e7a81db6160e25907bf54b41d0e88c1ae447c21b8b2c006d5b40d5a854fa8985d051
 MISC ChangeLog-2015 1385 SHA256 3ba8e0615dd3d069a3ae11f490b6faaa52d93b969a87ebef67bd6f7dd397476b SHA512 9fb31a928020b70583f37e8892ad338d61b557e93c0a6930680df323b039b856deaf2ddcb42867490ba5098c41a5e3062cd573ac138b5dd7be45fde2ccb2bf24 WHIRLPOOL a251c00a33532e8c2bcf5c5a82deb1d94d1eb1b3f7bea34a5c94388672e0bc9b8b5394f1fad3ecc25b0c3e01717ab309fdbd65e6acdc9d4616a4fc17130f6dd2
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-fps/ut2004-deathball/ut2004-deathball-2.4w.ebuild b/games-fps/ut2004-deathball/ut2004-deathball-2.4w.ebuild
index ea47ebeb0f73..bd51db1c6c89 100644
--- a/games-fps/ut2004-deathball/ut2004-deathball-2.4w.ebuild
+++ b/games-fps/ut2004-deathball/ut2004-deathball-2.4w.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.deathball.net/"
 SRC_URI="http://www.deathball.net/downloads/deathball${PV/.}.zip"
 
 LICENSE="freedist"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="dedicated opengl"
 
 src_prepare() {
diff --git a/games-fps/ut2004-demo/Manifest b/games-fps/ut2004-demo/Manifest
index 3502632504e2..c399a82e9440 100644
--- a/games-fps/ut2004-demo/Manifest
+++ b/games-fps/ut2004-demo/Manifest
@@ -1,5 +1,5 @@
 DIST ut2004-lnx-demo3334.run 288950743 SHA256 c7065a758e91fdf5cf79cb8f9646e4360928ba9de4460ab7011c08e22a240cf3 SHA512 4cdd61901f4c082d1e02caf301a24f1e18e89f4efc9fbce0e4496178916b6c14245131b62f27deb17f1763cd4b8bf68ee60cc7af5ece5fa2b39d1bf349361da0 WHIRLPOOL 07749d100e601967ed581725290f67479252a4a5393b43d44037513776306432d20e1ed7cc05fa747be90cd04065eb3ba6484095d630c9ceea599d8f83b429a9
-EBUILD ut2004-demo-3334.ebuild 1863 SHA256 9d21c4c91b2837f47eda03295c564c80e7d19c9e12ae734597a1749faf69e3a5 SHA512 433b9091774ebf0f7d3b14c33baede935cbd184fc846d9e23267335c2723ea5728e51dfe0703b9ed448e5155fc6618c7933927a4a212abc441f05a7b7ccbff82 WHIRLPOOL 37b2172ea231d28da1cc3f650596ec3ecfd8f89684597bc29c734be0100cc5cda2e19ca81f3fc799854f4cde400df5b41d847f21268cf32279fc2198eb4498b3
+EBUILD ut2004-demo-3334.ebuild 1865 SHA256 3a2ac2d64bdd66c27ae31fd399a4275c83bde14fbe343ef0c673997d4ea9b077 SHA512 859a82c7cb969396640f35824cd0fe3a7ad6c0a172e1ce68a60230e57599b174838c773a71f756374ffdf551617945999744f7e4f4ec7bb06ea5529b492dfded WHIRLPOOL f294cfea216974887430433d2cb77c8cebb7ba06a8fa994751df29b3376203dbbb319a73980d19943df1d402003d296b6d345dddb5f501152081201d2c56ec61
 MISC ChangeLog 2438 SHA256 f6727e8ed846787f249e8e35fa863b8939d11e39bb595bcead197d4d2a27653d SHA512 15dc07e0d973a022e225b7218bdbe077df7cf922a8b670cf876011989955e87e10d8d6e1e0886f6ee8d16e209e8853db2a30444ec1ebc11b0a890a87306eabd0 WHIRLPOOL aab30fc790a33b57207c4c4346798a019175dbec7382082b1a34c91fad14a856c7d735a5237a93f425bc29cce3c0a9c6f9dca74cfcfc968ae86e7c69e613e354
 MISC ChangeLog-2015 5831 SHA256 b31af3f9c125e940f4523b6b5e7fa06b2c1db5d378e61be3f3b46cdc233cc02e SHA512 6a48bb73e0f58b8cbcb63dd121d66ee786576d06cb4704a29ad2c045c41e1f59d2c5003045cf43c8ce946249b04a043229d4bf7cea45a188a9768627648e8910 WHIRLPOOL 8d49f123795a84021c9b4f49a0076551562e838c8bd9b09a04f2d00920295a3428ac0f651a08119148b78307522e862bdfcf30f5021fbc8e2739f35329b4af2e
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-fps/ut2004-demo/ut2004-demo-3334.ebuild b/games-fps/ut2004-demo/ut2004-demo-3334.ebuild
index c9f009b33945..53cca08e3d83 100644
--- a/games-fps/ut2004-demo/ut2004-demo-3334.ebuild
+++ b/games-fps/ut2004-demo/ut2004-demo-3334.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${MY_P}"
 
 LICENSE="ut2003-demo"
 SLOT="0"
-KEYWORDS="-* amd64 x86"
+KEYWORDS="-* ~amd64 ~x86"
 RESTRICT="strip"
 IUSE=""
 
diff --git a/games-fps/ut2004-fragops/Manifest b/games-fps/ut2004-fragops/Manifest
index 088360751127..2bd103d7020e 100644
--- a/games-fps/ut2004-fragops/Manifest
+++ b/games-fps/ut2004-fragops/Manifest
@@ -1,5 +1,5 @@
 DIST fragops_v220_fulllmw.zip 554114758 SHA256 5daa8d8cee9e9ec11e4a960a811928a61bd6ef6f61717d2bb24863ba729a6f0f SHA512 f2a0b1a8e035e038a5241053c30761f725003aba8c45c862348ab8a8895c2db056bab45e2a1791080dcf54234923d736bd7d7361bb38bb2b67ebf5e077fc83e5 WHIRLPOOL b7e97860441f6f4eeb469034a5dd644dc253da5aa593d4e2e08f2e31f5e4a18aa5343307d31300191f92d2a87bdba84b5daf59d0ca7f78ef05c382e8344c0df6
-EBUILD ut2004-fragops-2.20.ebuild 475 SHA256 345eebad5af03fb9b982cd6eafaad43f8b4bcd0c416546cb95c774fc0ebbcb03 SHA512 7796fa349c1cbf8098b3e2c20112270e4531154144f803906925b6fe8d91045575fdfa4960f9bedc4ad3646f2c937aaed467cf684b6cc18ae3ec1cfb646d666a WHIRLPOOL e763efb6611e2771521f85a730aef6d3e28fcd136ec3747a38bb8fe01855eb2898acf588c706d907a8f6a9429a7a6258dfb29d971e492046f272a87614962074
+EBUILD ut2004-fragops-2.20.ebuild 477 SHA256 6414da4d5f650811db2d9f313fd9580aeaf2a6af087fbb75a361968527d96015 SHA512 a45637b50e2d6dc585d86e1a8d644fb0c8fb63a0fa30e877da8a8a9604f0a462d753228a13871f1a5ac7452a4ab0d5df008966baac6425524e52a21bf855e615 WHIRLPOOL 2e525eaf9b41591f3d6118a730a8e5c715b6d8757d01d590149b055f9a2a54c81f3515d355555be6a7831334c01bce23ac7d591abe03325ed73583caf6780964
 MISC ChangeLog 2577 SHA256 37445506a3b9947100689dfcc6262e2bdafcf21751dd68099095ed22a2d26fae SHA512 30810cce3777c3d6a2fc2912e234590c1b89c1e0839d80b738c711decdda3811e90c5be4af70dd7cbcbea849c390952e2f01adc491cf2e68332c82e52caa961f WHIRLPOOL db3d0634e929c1cf019a4d2a9d72d2769b5896c1e5f7353c2ccbbb4293a3790b23468ed1301f85b47502de4753a9081ba5c38daa41aa2c8680373d5e5cff514d
 MISC ChangeLog-2015 1887 SHA256 dd8b2df7cdec52e4a16dca86f53654f8c4fe936e423501daa5ebf28c84b1cdcd SHA512 f5a4d26460753518b62f8ef14e34da41efa05cbefe12f51c4d1c7457efd377ac09b58367ede753fd77cfc6f4c89cd7446c6e26c3f224c62e768b45ef4f6da4ba WHIRLPOOL e9f95a2f81745992c04db100e95579ab43ec0b868fc68170775a6ca808a3906fc787098286e1e62d8d46e61c5745002df518849e3ee5083b9994b25f1fcb928f
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-fps/ut2004-fragops/ut2004-fragops-2.20.ebuild b/games-fps/ut2004-fragops/ut2004-fragops-2.20.ebuild
index ba9677650097..5a03592d0ac3 100644
--- a/games-fps/ut2004-fragops/ut2004-fragops-2.20.ebuild
+++ b/games-fps/ut2004-fragops/ut2004-fragops-2.20.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.moddb.com/mods/fragops"
 SRC_URI="https://ut.rushbase.net/beyondunreal/mods/fragops_v220_fulllmw.zip"
 
 LICENSE="freedist"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="dedicated opengl"
 
 src_prepare() {
diff --git a/games-fps/ut2004-hamsterbash/Manifest b/games-fps/ut2004-hamsterbash/Manifest
index 1aab10bb2281..aec9d7a2f6c9 100644
--- a/games-fps/ut2004-hamsterbash/Manifest
+++ b/games-fps/ut2004-hamsterbash/Manifest
@@ -1,5 +1,5 @@
 DIST HamsterBashFinal.zip 98608028 SHA256 104a2c09dd5c698877301f3f899dbb6a1b092e31b1c8112ad119824468ca8d9b SHA512 641a642ce08d5188045f9d015a92f0846ac22c65b7b047bb0096f216d7cb9d0a8074e5e11b01fc187b56fbdf2d5cbc0e5cd56c2eb3f40f744fbeadf291e08573 WHIRLPOOL a3d4e08875cd8e9d1b8a9b4301bf1ae980851414cfdfa61b1f965ca41feba170e4b7ace326c7542f38e22981bb365fd1c3c932c176c77b691509b01edcd2e797
-EBUILD ut2004-hamsterbash-1.ebuild 598 SHA256 f9b91ec70bc243101a6314b8938df1b412db06655cf859ba9d6ee9caedbef7a5 SHA512 940b29c913890ce61a665c04195fe2bca945d22cb633b6a8d4941d6326370041eefc1645512fc3f4766b35a3ccefe349d0c7ce06baf64f7393c9d00e435699c6 WHIRLPOOL 03814f1c6db9de193df0de8d47e011d93e1435d12a4d34cfcf2b42136424214dfb6d2e2704903cd29b1fbe8a913e3e493776a3ac15ecfaa05bd5cf99aa254818
+EBUILD ut2004-hamsterbash-1.ebuild 600 SHA256 33ea80333ece512521199322465c442148ca327f55aaa23450addb647426c193 SHA512 cd358ff930a5d194f8a5f2f35480d0dd7fdb14404ca98345a3f0e48d43c6c9b7172ebb48abcfe2e3c2cabc4325ccb6679a39d6599ace770b6e913b49448d4d25 WHIRLPOOL 7aeddbb9cc55a84ec37e12031b6beafefcf536f87916f8352e6291eab7ece923d398e15f56b50d92718f75133a6a3e53abf3a23291194d2804d1dae23b99f100
 MISC ChangeLog 3073 SHA256 24951f31d4533bbec76bbc71dbb608410be59d745ebb6e9e97d8817cf4764c31 SHA512 b0cdeaf1c9d6d49b18badc4857ddf58bf78c8885dd4a64cc3e6241954f00293799e6fb309e60b5ad7e8721e831a50857700d3baa4c28b2675f8d0a26e98f4cc3 WHIRLPOOL 99f41e8cda070922d55e759eed1c229d2441f9e957f5572a60a739bc00f0302b9ef72d1b306a3ab8f1127f009e65eeb9eb65e2cdb79b58f3f3025f85df7f1afd
 MISC ChangeLog-2015 869 SHA256 0036467e31bfa225baa799f633d3dae7dd0439953f95c7b4ee7265e6885435ed SHA512 37ac456143a015ea7fc8ee6a67648484921b6b62c07acb6f9599b316cae60fa7593ebfe4af87ff1f80733fb1326d6ab70cb4a95881314a7be1ac28aedaa8a611 WHIRLPOOL c6091995c4f938d35e693b5bca63c0cf2a42a1d31a497e963e5274b475f7e762c9b69ce33230ba92b4450ed19fc2373896f98373d2a7d4a05193cc75b4b3efef
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-fps/ut2004-hamsterbash/ut2004-hamsterbash-1.ebuild b/games-fps/ut2004-hamsterbash/ut2004-hamsterbash-1.ebuild
index 83f0d55acbfb..4d51041af583 100644
--- a/games-fps/ut2004-hamsterbash/ut2004-hamsterbash-1.ebuild
+++ b/games-fps/ut2004-hamsterbash/ut2004-hamsterbash-1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.moddb.com/mods/hamsterbash"
 SRC_URI="HamsterBashFinal.zip"
 
 LICENSE="freedist"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="dedicated opengl"
 RESTRICT="fetch"
 
diff --git a/games-fps/ut2004-muralis/Manifest b/games-fps/ut2004-muralis/Manifest
index 9df54614505c..3786e32fe17b 100644
--- a/games-fps/ut2004-muralis/Manifest
+++ b/games-fps/ut2004-muralis/Manifest
@@ -1,5 +1,5 @@
 DIST muralis-v1.15-zip.zip 62575050 SHA256 99d3d86585511cf0b9a37fb3b475a6685d1a4a414684def9e82befdc793fd77f SHA512 b50477e3ef221241a430f95a390e34d5ffee3ea460e62bafa30b534d6499ef1a616d8ca35f77179e8f7a50b5e69f82441cb9779d38e71388c2868add45822330 WHIRLPOOL 73d5ce13cda9095548745d3a766058d24192b062399db588bfabd7b2696a7bb6ac697193458370ef081714f083196e1110b43b7ecd535d9c7bbd9bfbc4597777
-EBUILD ut2004-muralis-1.15.ebuild 486 SHA256 f3fb6634e6447fc451f2c9901f413baa12416d2a9695552c1476e185fcb0ef38 SHA512 1c8ce30c93e5027dbde9f037a3cd3c8ab75f739f14b8fc09984096b5aa17fd5ac590105c41901d6b89b00f8461bb41f1b8a319e72fa97424bd353caae8ce019e WHIRLPOOL 42941ff899282a7114374a3705daa32947c15cbb23206460f389a7e7fa4c46b1ac41e85568b03f680b66584e87a7b8530275841faf5eb315261cce198da2a068
+EBUILD ut2004-muralis-1.15.ebuild 488 SHA256 cd96c69c59efbe75d439df3f0206e2064a41dc46bbd3eb2c4f5a692bdb710b07 SHA512 b2cf0c62a86efbec4e3d5769aa8e3d996a4a4523db8076ee544b5ec803ec06edca364b309d499df171dbf89f2b4c05c5948c0f31af1e2afa052d8c3f5932aa3f WHIRLPOOL dd3c95f926ab86e7e7270f518011931148de347b4dc6782086a49155be168d5442a7acf361cceb1fed930c0ae5cc87fec4e20091d5cfa46297921ddcf113462e
 MISC ChangeLog 2577 SHA256 95b9326700985e6fb3810348f057d6ed94379a4f705619b2e40fc7d1f3dd543f SHA512 eed4938844ffac34063b514fc8929930aed6a609612edef4d37341445df3f4211401b6f247fb2fbdfaea1d63bd4b141c735e049ff60bd712f42885c21c211735 WHIRLPOOL 03547f64ddb6202e358007bacdfb3acc94688a31d5bbd4e057066411a036fc5fd29a93dcb47f9c4fdab070b50a1192242f4f37ece11d57ab7ff6271922e65d46
 MISC ChangeLog-2015 985 SHA256 7039f75de0b3d41a2e98ee3b7c14041e63b918770f774981e1c1f3243e288140 SHA512 962ca00cde8bf27e50c34991f0904e54dbb4e22ea1632cf4897eb6414e069bc587c929854dea6c7ddad12dd382596e4bcbf95eaad3737c605c76dcd325831937 WHIRLPOOL 932f20825d78348d0dff1f3a866d0f4595e9952d263f6f2ff0163a6e9603b6862e5b29f8371cb0963aa702de43a7a0474fd92e5d6d141592a0519e480aa64e6d
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-fps/ut2004-muralis/ut2004-muralis-1.15.ebuild b/games-fps/ut2004-muralis/ut2004-muralis-1.15.ebuild
index e74ac3fd04f9..5421b560b22e 100644
--- a/games-fps/ut2004-muralis/ut2004-muralis-1.15.ebuild
+++ b/games-fps/ut2004-muralis/ut2004-muralis-1.15.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.moddb.com/mods/muralis"
 SRC_URI="https://ut.rushbase.net/beyondunreal/mods/muralis-v${PV}-zip.zip"
 
 LICENSE="freedist"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="dedicated opengl"
 
 src_prepare() {
diff --git a/games-fps/ut2004-strikeforce/Manifest b/games-fps/ut2004-strikeforce/Manifest
index abf020254d8d..b235a8733cfd 100644
--- a/games-fps/ut2004-strikeforce/Manifest
+++ b/games-fps/ut2004-strikeforce/Manifest
@@ -1,5 +1,5 @@
 DIST strikeforce-ce-v4.1.zip 452020366 SHA256 cdd171a5d22ea17536e74c9fbf8430498098987a320e2e6247a27abfa327178e SHA512 758de1fa2a39b822114b7f224668acdbeffba6d62cc1b1a31104fcac4f84b6859cfa9a024d4d682682cf4f52de7118c1cbaa080a4887c6d882c0c7fb78ef3b49 WHIRLPOOL d52cbd78186afe46765bf11027bcf660fe11caf6304553a97c2c75e336f04201fe0579316bb93934bf149ee5cfdb157cc04210022a1834496542881f699fb233
-EBUILD ut2004-strikeforce-4.1.ebuild 474 SHA256 3923356a21a7956c964540c32e28b309248c45208f54b308a26aa3534a2106cb SHA512 cbd27b5923c869e2da2eb370637f0543e25dab2cbd0ef0029c6311e83948125e9e501013043df1fadff4d8bfe3239c317f5a25f487b39760d750856e96c5054d WHIRLPOOL f9047af8806fb473e87fe55d2cb64ba3c5cd9aca3d028fb9f2fc81e40a710e20bdfa53cfdb87856d924ea67d18b4c4ea2f56e01b97844084c4a72998538c049c
+EBUILD ut2004-strikeforce-4.1.ebuild 476 SHA256 622f2beb480c435c06e352cc34ff6c10b3cdbea4293a5312f096cfb4e1540ef1 SHA512 b3cd74810c9148bc28ad141c0fcce86308046388b48c57cb47a2112260bc2290da469b92d8229dc0b5fb35f1c2255637f51cb06c015fc2e61a373da408a6b244 WHIRLPOOL bfc8433abbc50364463d524e68ea24eaa5d6ac585683978ef40547e0ec7d2bfafd668bfb54ec82b057f1ade0dfd624967d6f6d9df55198ca9c400be447d08c6e
 MISC ChangeLog 2590 SHA256 f7e00ade2ece2a608f3c8156e85d663b71446799979047646098c54fc1529a0b SHA512 57322b0b490eea695a4a759dbc2ae1d97a14467762ffa6864ffe87b668af2dcef43f56bec301daa858175b0c7db66b9429a71a6bf3b93ef10c9677262d3ddb80 WHIRLPOOL 522f8711038b7f49a207e55f498c7ce493d122f04ec237f61c91128c8d6562acfecd5123c486645427d22565ca1f4f7918510d736ea94e6a4f8b18806b91ea92
 MISC ChangeLog-2015 1440 SHA256 cc447f07cab5c3e579d1a99afdc37572c08736ce787e0b987e5848712a9dbfe4 SHA512 9fa9db86e272b0534b491b92b97c44ec3178391bbbce97dcce1845afdae8de355fda58ae883a4088c9d9040663b516c4864ce67d272454fd6c4617dd6d5a4651 WHIRLPOOL d684bf72e7ca2299086444c46e920a37c7d532e2444f2fa1b47c2236462cf7d60b5ba095b1a882f7fc4c8e8aac1310c5143a73d6777918ec3cb8782141694791
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-fps/ut2004-strikeforce/ut2004-strikeforce-4.1.ebuild b/games-fps/ut2004-strikeforce/ut2004-strikeforce-4.1.ebuild
index f0db68c41f69..a5b1fc4d134b 100644
--- a/games-fps/ut2004-strikeforce/ut2004-strikeforce-4.1.ebuild
+++ b/games-fps/ut2004-strikeforce/ut2004-strikeforce-4.1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.moddb.com/mods/strike-force-2004"
 SRC_URI="https://ut.rushbase.net/beyondunreal/mods/strikeforce-ce-v${PV}.zip"
 
 LICENSE="freedist"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="dedicated opengl"
 
 src_prepare() {
diff --git a/games-fps/ut2004-troopers/Manifest b/games-fps/ut2004-troopers/Manifest
index 18a7c1769506..c21b5e9a83bf 100644
--- a/games-fps/ut2004-troopers/Manifest
+++ b/games-fps/ut2004-troopers/Manifest
@@ -1,5 +1,5 @@
 DIST troopersversion60zip.zip 447383148 SHA256 350156938b62c311873087fcf438b4e0ac9bc50171ba657f0f9193037d5e45d4 SHA512 2eec66a55b0733f2f5ee65e8a4deb329a50bcd47aa6fdcb7252a88c01e4e8db563b568d3176233a51711240e7b4dfebe0d8a8712d624915a872e8bfeb321cda4 WHIRLPOOL 94d306026a47f6e9170664b901af29d5be64bea3df69ce8c54c0e125828bb7eacf64f706d3d159c4a27f6b861be3cea1b2dd975b8ff52466e33ad8950bd93bd0
-EBUILD ut2004-troopers-6.0.ebuild 582 SHA256 cda471a0089b6998bdc1b8a8bf4ca16155dd46762905fc365d08e8f3edf385ac SHA512 a51f1bb7ae85bf8d2537ded96ad1684e8ccc84bb550874d2ba055278d1aa8c711c3236b3127d08b7081b0df88e3a78ca759234275cef07c3be57720ae4033ddf WHIRLPOOL 1fc1074be844be9663e28a5280d14cc65ff57cdf9379e3043784fc253b9d5c9b9c891053cef2a47248ff7d4a53da78e2052ec1b070e5b71bdd7d2008ad25e230
+EBUILD ut2004-troopers-6.0.ebuild 584 SHA256 2af88c4a24569209ca22dd54695543e9d8d60aa71077a5058e57b8acb3898022 SHA512 ca2355cacedf5910d569c022d640161643826f35b8d8e31ae2c0570dfebd27d531df5787b1f83bcb49915d3d2e3ebc7e2584132b4f7503d9727d5465cca75bf5 WHIRLPOOL d5cd55496be4f75ebfd8af8c275b7e3942a83c43884b2c399feeb76e8a62a878c8bb1a659afe5b9831fe49d384abb4fb91063a4f840c2970d56be0a73a6eeb17
 MISC ChangeLog 2578 SHA256 4a7ad41519dade1c3aaf734035d4992d2c393c8ca5fc218160703b31a25629b1 SHA512 ad2a42117380eb2e88ab68796cb4975725541d4cb069a6b9fc050e0e619b17e56a9d1b3f4e31d4201363a19d7b65b47cc0e19bcc6ebb1889b5fd8bd3498cc866 WHIRLPOOL 4286fe3bd3f9dd5a0b5551e8bd179beffbb3e9f0e62a22451f4f3eb234f0605c2cbe95fe6f90d07ee1da34a3afcb315b603fbab5cab95bf3f0b491769631380f
 MISC ChangeLog-2015 987 SHA256 5d197b7357c1981e60caffa26f5c220cb0fdb1c1aa5fcd84d6959f726b6d46f1 SHA512 39d5902291ddbc67ab867df031188a5493c82600613d659b8d3da73afb90a603491c6d7d2ac798238495e77163293d9547aeadbbb022883e624902645b389924 WHIRLPOOL e688c0b0ee369d1a3d6b417bd694654a0a8a0dfbf2d161edc001bc95f7e0c56a1c6200b5855ea5534356848e5c1f903bf1e9926d315fc12439b1cc2dc4c623b4
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-fps/ut2004-troopers/ut2004-troopers-6.0.ebuild b/games-fps/ut2004-troopers/ut2004-troopers-6.0.ebuild
index 70a6ee5a11c3..96e978ee4f1b 100644
--- a/games-fps/ut2004-troopers/ut2004-troopers-6.0.ebuild
+++ b/games-fps/ut2004-troopers/ut2004-troopers-6.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.moddb.com/mods/troopers-dawn-of-destiny/"
 SRC_URI="troopersversion${PV/.}zip.zip"
 
 LICENSE="freedist"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="dedicated opengl"
 RESTRICT="fetch"
 
diff --git a/games-fps/ut2004-unwheel/Manifest b/games-fps/ut2004-unwheel/Manifest
index 9d7998358d3a..7ad467d665f1 100644
--- a/games-fps/ut2004-unwheel/Manifest
+++ b/games-fps/ut2004-unwheel/Manifest
@@ -1,6 +1,6 @@
 DIST unwheel_r5.zip 596390232 SHA256 30473f57f9da9b1f1da27f44c181f2e284bb22141163847100ce3ac446fa264d SHA512 4cf319b1e20c9faa5e248e3a39a015b9a37d6defe4a8f31d634931a426dec957a1330d559d45333fda9a2451f9f3a0f7161d94c101d46950f6921fcfc0d87ee3 WHIRLPOOL 248fb9c8bea19b258f027720459b96da6018b603f4aaae1f2cd3496dd04a909d16d261a58a3cdfa7e167ab0dc958d6815435b8896c52c5ee3e09054c9eeac800
 DIST unwheelcbpvol1.zip 138178365 SHA256 dadc3538071b9853b11202ac1cdb7769bbbacde4ae03f78919b469dab997f2b5 SHA512 0cb1c3a64d8cd4448ebdfde175a25afa253336102831fa8a2abc113064cca4a0afbe90e806b4c1d1fa898142496070349566e2bcf5aad42ba12dec2c947e6fcc WHIRLPOOL 4f3bf78642e05c0c8143cd88a9dad2e74c96c4625f7ba20158913eff1c8d950cda5a903ef1a83328a0178b567da2d4e47ca0c345a63f7b78b4b3962ad1b43beb
-EBUILD ut2004-unwheel-0_beta5.ebuild 681 SHA256 a4a6a3a685fb1041675b8c858e395e3219b5fecd361011d3bfa1a0bfb52be794 SHA512 8ea19f4841beafa66a762e67a51023dac8d6ee5437fe28132d79b6314818332c645b6a8ed79055233ce58f3135379e21c2b5f209634066fb96c87f80bf4b4213 WHIRLPOOL 04a2e84b32ff2b541320248f80f2a62f34d9283d836e65f41f2923fc0576b1eb85106b88e93b9c0bc98748fe05722d1ddb01a8991c2c8d9124d325ddc6942c4e
+EBUILD ut2004-unwheel-0_beta5.ebuild 683 SHA256 5752c3629f322e699f95b6504aecee898332bb5a0726bade8236e3bbd436eee1 SHA512 eebf817d5c1a42a175d51322262327849f76e038881dc0bbe44c86bd3d4d2fc7af38e631fd71f2110fa0b0c853c603cd8bfc2e0bdedf600b6a790430fb2873d5 WHIRLPOOL cff98a58e9008c029cab3b4ff06e1df3c7f21055e5127fb552b2a34d59cae2afa3e401fae7094d0cf74b1d74a5cd728f45dd1139d871f3ab1fe5739ff0ed23cb
 MISC ChangeLog 2586 SHA256 4005bce743452243ffbaabca6f835edcdbc5f3455235a2411839422ab54ceb3e SHA512 69ab0e63ec3b018b5e1486a0e4528eb78071da39c1b93cf335f5e46372e24e0a5203797c9b162b9be22ffa8a8a537a4ec5579ed3b81f4c859350f6bae4d4f6f1 WHIRLPOOL bc9019fea9da56545ee66c2047e33ead852470b4463a8ca1f6886bd342f75ecc0e190ff286d746b418a52a2294da91c0b3d5f612ea70c500624ecc2798a55df0
 MISC ChangeLog-2015 1160 SHA256 eeada0733499faf863fd00ed6240ec81283689f5088c80f87b3e15b2d28a7b64 SHA512 dd8833c9bd1d1617c7577020899de24a3adb258d41c9fe9e891bf2d7b34380de304d59cebae318ee647085883da84264a65f75790d8eee74e8807eb63839c965 WHIRLPOOL 5b00bf4ef5ee246402656e09725c349c324ab01d8fa6ae296f23f690379a881928e5d729101dca621465304c166820d1da383f616d4f83261bd3cf90c70121df
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-fps/ut2004-unwheel/ut2004-unwheel-0_beta5.ebuild b/games-fps/ut2004-unwheel/ut2004-unwheel-0_beta5.ebuild
index 0e44cbece4c6..4c2ed07a2bd9 100644
--- a/games-fps/ut2004-unwheel/ut2004-unwheel-0_beta5.ebuild
+++ b/games-fps/ut2004-unwheel/ut2004-unwheel-0_beta5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="unwheel_r5.zip
 	unwheelcbpvol1.zip"
 
 LICENSE="GameFront"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="dedicated opengl"
 RESTRICT="fetch bindist"
 
diff --git a/games-fps/ut2004/Manifest b/games-fps/ut2004/Manifest
index 9335f82b4908..ef8cd03862eb 100644
--- a/games-fps/ut2004/Manifest
+++ b/games-fps/ut2004/Manifest
@@ -1,6 +1,6 @@
 DIST ut2004-lnxpatch3369-2.tar.bz2 22465217 SHA256 438b9b13a367d46f23cce12b065382a55afa2fc68add1f1dd3db03b015f60bb3 SHA512 0d6f26d5a811efd64be8c304e928e03f546d9a8eaba6b074843e2b7e76e0670b39df95200a2fe2040d72bbd204c7157ed0115649a5c85396a76d9e0b7ec284b1 WHIRLPOOL 2e04124aa7eb4e2689b048aceeb8c085a5756bad4c0f084da764055ea7a403623107bc6bb29d00b9b93b45675f4475e145edb4e6a3faf208d9fe36f4a65c9e78
 DIST ut2004-v3369-3-linux-dedicated.7z 5013927 SHA256 799f00deccb7ee1e3db3963deeb50a41b05a262e6f7363654c4f0438e06d7192 SHA512 3b2a7b64934a3647c02c9fec48565c5c2c35370d635b2af4059eb76587bfa13f46e6a4e14fdb0494ba7a4182497ed5963601986f4fcfa318e69a8a8a8c0178cf WHIRLPOOL ef459d7c053ac70be6313c65edaff095053cab840588d5762834b4402e299d8782401ebf1341ff61a150efed8420bf377b7a7ba10dbed6608d86791e2569e733
-EBUILD ut2004-3369.3-r1.ebuild 3955 SHA256 056e77760016d958082c1d1e1c1b4b01326cfbc82acfb92bca16705fc340fd46 SHA512 da1447c2dc7e299486c0d70e60f99cb10dc8f2cf9073a9e1f0d34054c83cb4cd2bd755b4b2042be5d8d61d7ce42d5a60971471ed236549f975e486bb2237ca07 WHIRLPOOL cfeba8b6117694f03210f21adadbfb1f247e8abb7812ae760ebdf93f62eafbc7f725c44ba8a09ea5e1aad00a36f11d0d7eff055d32c2916075f8049cce03a532
+EBUILD ut2004-3369.3-r1.ebuild 3957 SHA256 5893a27d321c653e1b9548b1507cda4d777bbe94178ff76552d1eeb786bc6498 SHA512 7818fbfad3797d977a586036eb607c12db4ed7c500571c49c3c2c847eae5c54c124bed7f4c05bc6478eb145dea6fb551f31bf97e7d6cf014f9047a2e8e067398 WHIRLPOOL f9a90f4b1798a158477feacdec0afc706d39c2aace6e2445663391a04fe18e08c2579ded7b04b6de604066d7281ea32f554c99bac3dedb2ace7b52ccc8bd00ac
 MISC ChangeLog 2433 SHA256 c85ba7456e44510477b701fcaae6a89fb4fd3963093ce5d5f4fe3745975f4f8e SHA512 0a40c716357dbbbe76f3b6cad0ee9758b995b26d13e90c75ae0f2ff1d9b9943c806252e7baff354ca5fc57f4e387ef593c309a8fd8b06827c363341c5599bdf3 WHIRLPOOL d4daefe9e1184991da0a5c531625eaa16c1af4141331e3fde436d32a6087b21ac18ed27b0ba31a16014258de30646ee12c1981694598a4594c9643c9336e389e
 MISC ChangeLog-2015 12206 SHA256 fc72c6d60c632dea85bfac3e1adb31728a1373189b413a26b2484ab7145ed821 SHA512 88334672a33ba8e8aae167cc82c954018e4bb0afc1efa8daa1302430a03b2120e68d7ef04ca5b0a1a2289fb53ceaba1d76c7dd78b9c230a4ee112565be2ee9a8 WHIRLPOOL 9f8bd763460ba10a86d2553c1014fc4190d791a56e351e2171125b2e62edc71b4603f4ccded8b11986782dc1b103218cddc1e89ea635bc9c7df13a8521ddcdb1
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-fps/ut2004/ut2004-3369.3-r1.ebuild b/games-fps/ut2004/ut2004-3369.3-r1.ebuild
index e86886c0dc68..7d02f16bfb4f 100644
--- a/games-fps/ut2004/ut2004-3369.3-r1.ebuild
+++ b/games-fps/ut2004/ut2004-3369.3-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="ut2003"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="dedicated opengl"
 RESTRICT="mirror strip"
 
diff --git a/games-fps/warsow-community-map-pack/Manifest b/games-fps/warsow-community-map-pack/Manifest
index c2cb0e8c5b0a..9b8573e62b9f 100644
--- a/games-fps/warsow-community-map-pack/Manifest
+++ b/games-fps/warsow-community-map-pack/Manifest
@@ -1,4 +1,4 @@
 DIST warsow_comunity_map_pack_01.zip 130057143 SHA256 58b84b10d5fbaa22e29d59194b8c5ebbc633356fbc6545a715e44a73bdd3c7e7 SHA512 47ea38467f6b88f4a8ceb0e38e2c12b62df46cbb62d1aebf7b824e71d80de1d65b81874960834055995c50f95de5f75f91b33fbf6985ee3121d823c8a5ca8dd7 WHIRLPOOL 145d66911009f1520460354f2ce6990f83a7a913aceb9aecc835bb36d770df7aba70ff1caec6af38e13074e1f7944b98477bd6e27e821e70cba6ba06ee348b6f
-EBUILD warsow-community-map-pack-01.ebuild 604 SHA256 9dd8b033d0f41cbf55be9f08a757f973d4db3c2deb68f7b9388a8a0f8c32a984 SHA512 68953cae50b3eb7edec9cf7687eddabd279a26a09a0b24b4d8c3859bc783c358c42afd98de4a4801ee66080b6b56d132daf2ca69acc63af7c38992d587950dd1 WHIRLPOOL 9df2cc227781c7edda6aafa3eb014f30190ebebd36fc9fd68e43e53469b99689dcba00cbadbd2a4179595e954293b55d9058c52c3ea5e0ee485cc947b385201e
+EBUILD warsow-community-map-pack-01.ebuild 606 SHA256 4600fe4d7d21f00094c2b39458599b88ddc0944d5b5de7d19676c80b3ce47805 SHA512 fe3c5616631cb37bd554324e2ed1ec319592adfd21bf522d76a57f4a587414365da534e1f89118e1001bc2c9b25da1c255f3ee4314248eedf24cfb862b2bfa06 WHIRLPOOL fe9bf11de561fa01f86b18515e80bc77659fbc3777f13d222f0211a3c2e448364299f67e1b1b766d82eb9d498349baab41156540aaee3d7671c146538f2e6cfc
 MISC ChangeLog 938 SHA256 8f800b5cdfb69a48d0a4d13fb0aa943df99e2b9b7909c7823f401f1986812d65 SHA512 d9819861a89cb86817272bc6f3a776213fa65814d2a8037723aff4989d54ad2a86fee71f58abca7c9012dabb4a992d5b9c2b568b5b49cd238d54d141499798ac WHIRLPOOL 0ab640fcdef32df4980b45f2acc59be54657266652b2b375d7613a2c96774e0513e1b42a86934230d1657708fef5aa02ac22966e6caacfc8dea53a09954662e8
 MISC metadata.xml 255 SHA256 07f4d71c37c1ce9a2e11d5810356303c668af7c9e94350056bd11fc6e214da9e SHA512 6d6ccdbd1026538693165380acda44c0e9496b703a8817c82629277d62948b7c29170398c8825e37ec70e19226cbdd9c41de573d6fc6286aaf786d241995307f WHIRLPOOL bfaedb87d06ad6e145cf480e79b593ade39d42648ba3732cc2b403b428f91a325546831bca7106d8c89cc9fca0b80ae4317e179b3822687843c5f2ead52b0cb7
diff --git a/games-fps/warsow-community-map-pack/warsow-community-map-pack-01.ebuild b/games-fps/warsow-community-map-pack/warsow-community-map-pack-01.ebuild
index a881bbb8f18f..a283a3db5f79 100644
--- a/games-fps/warsow-community-map-pack/warsow-community-map-pack-01.ebuild
+++ b/games-fps/warsow-community-map-pack/warsow-community-map-pack-01.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://update.warsow.net/mirror/${MY_P}.zip"
 
 LICENSE="freedist"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND=""
diff --git a/games-fps/wolfgl/Manifest b/games-fps/wolfgl/Manifest
index 4684492ee503..5b9026cc0638 100644
--- a/games-fps/wolfgl/Manifest
+++ b/games-fps/wolfgl/Manifest
@@ -6,7 +6,7 @@ AUX wolfgl-0.93-as-needed.patch 397 SHA256 f0d231b53b178b3f18e9dc98f532458756a48
 DIST sdmdata.zip 557147 SHA256 054590923cd35ce7c0bfae98c23be81ab70c28e11fd0e562b5253523fcd7b91f SHA512 cf6eae7027acbe6e3da6985639eb36def04254790f6449f5353ffe5edd13a73c01b0a35ef9873f2e97d09ec59e632337c5b3a1a26185befdf4dfa5a161267076 WHIRLPOOL 97db17b11b4e4a7baf430ea7d37f6bb279e90ea1d61441b59d1ddb8b691dfd07f8efe2399615a669422a8b6cd28f1e35d3ac29d906d1dd602d977387e140a0fd
 DIST wolfdata.zip 564771 SHA256 a32ee97c515b6e182597a06f2326d15cc4c343ddc70558ce5fe76c870b7a0027 SHA512 2b14c477e54d14fc543e146fa699f55dabb003bd3bac1e89422a49391cf8f29b5db6967b09c08a82c612f73fe71d624902c180d81481ad42f011f51448652a43 WHIRLPOOL c2de54265c392f24cdcfa818868b6450510cdaa5b7e214afa3832063346010535c65577464e5e77b8564bd44ea0b02066b47f0f051fd09737254fa8aa6d2e830
 DIST wolfgl-0.93.tbz2 146132 SHA256 137b311edabc7bdde462cfb51bcfd468e35398828d33f0d99fcc024ceece3739 SHA512 834dda2eb4e099d70fad52e40760886208c5ca60e687024f1fe51088b94c8cdea7c058d326daa61966946bb70feeee97d0b7fb7c284e98fdec0eb8c503de7e30 WHIRLPOOL 8c856ad5985fb626395e5f5ff6a05db2fe8de5dfc0357fe75c65c5be41bbd6e8cde9d8543cb1679e9e7078493e8b1502078c6b0e0dd315e749145382529f8cdc
-EBUILD wolfgl-0.93-r1.ebuild 1549 SHA256 d0488d0a1789987e943d111cf9c087a7ff01d0b43037840fafa7100ab913d985 SHA512 3fe9bbeac6fa0b6ffdfbad3b2fd93d1e1b7ded93227d9fa24302d2db603f6c1486eb23749af627c7cd541b052f21891be2abac98d405534e5bf8b921f2917bbc WHIRLPOOL 6b3b68abeff58eab1914708d8ab9838e418b717270aad9fece926bf504505792a7c663ceaac93abc50b56c524a46a92e1df0ab19f3571dc5df0c37b14f92672e
+EBUILD wolfgl-0.93-r1.ebuild 1550 SHA256 f6bebeb3b484420195a31a5f0e1e6d82a2c6c7536249d58141b3858ec210ba61 SHA512 5807598b8b2fa7aef267b793ed9686e986d4fb6c3f99fd6407f58e8d537c1656b65a3b435922bd5a73b2fb05b0c686b9431365e1f83475df81d7f494d973b741 WHIRLPOOL 396d652859a959103316b3b1e719ee4809f321b2025d9205a2e9f351d08c0f21ce0ff009b71c1d5f7c8d872d3ee318dd9871b7a8cc0d7faa38200aa482939f3b
 EBUILD wolfgl-0.93-r2.ebuild 1407 SHA256 427177b0a32154ae77a31c1ac2b659b2acef527e19786488735d6f4fdf5c5836 SHA512 6dc9970ba56f226c2e83069f95c57658544f6e4641a65b039d9a9f5cc3c41112d0691bde1c5004107c56e837f827b0fe45fd557d66f3cd522abae45c225833e7 WHIRLPOOL 29f0f8df0b75dea5e1502b5b8ab10a62749f89e3a23bb03d5e356e68962150e4c9fe013a436811eb05d95e68ca5f0bdc021304b8cab53dd769ec23062fc26883
 MISC ChangeLog 2573 SHA256 036c1032641294a85d87ed9c206a443b2a9f2eb2a2f607e9bb0a191e3b4a8652 SHA512 14e3e50ede283f2a27ebf6368b101fe3822127b796f4f71f5bee375e81254f99763904319c24dd26081a9a69ab4403ab07600a0a100009447e9ee8017f600e1c WHIRLPOOL 88873d769f25e5d9d5b07d75b5dafa1893e53fdb92f4100c41a3f74bb370f01a24a18d31138ec74e519a67d483650828a224f8af01b6ca8be2fb72f7c174a290
 MISC ChangeLog-2015 1662 SHA256 a66b80e277c933f9fbe0e0fe1e9c983617aae4aec9654e334599bbfece1e061b SHA512 498351dc6f537d333963f78cb7842fd2bb33ad7da0774e2dea0ebe8de9bfeced1ef1d5ad1d81d868e1551206a0486c25a040113a1efb3576a8e155f2d9c8dc23 WHIRLPOOL f676c6df9443d3ec1c6f5564cf876b114ba0efc19beb7cf0463e97f47c2d1571a71407cdf14522f17d5d1ecf00d6d2be9adaf431df9593f16ec616bbdb1e7216
diff --git a/games-fps/wolfgl/wolfgl-0.93-r1.ebuild b/games-fps/wolfgl/wolfgl-0.93-r1.ebuild
index abda49629276..915e9356fb81 100644
--- a/games-fps/wolfgl/wolfgl-0.93-r1.ebuild
+++ b/games-fps/wolfgl/wolfgl-0.93-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://gentoo/${P}.tbz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="~x86"
 IUSE=""
 
 RDEPEND="virtual/opengl"
diff --git a/games-fps/worldofpadman/Manifest b/games-fps/worldofpadman/Manifest
index fef593eff836..b0eea60a290c 100644
--- a/games-fps/worldofpadman/Manifest
+++ b/games-fps/worldofpadman/Manifest
@@ -1,7 +1,7 @@
 AUX worldofpadman-1.6-gentoo.patch 2102 SHA256 4755298fa34f296d6fdc9334d875b582463ca4e5ae74c65c69e2bbdfb07a463f SHA512 d124b17972f0837c0ded524c0077bf2c58cf5d6d6254c69069d07e3616096ed7bf9e67ea9e6e658c1e706df28403375693858131eb09e30877d1132bec48efd7 WHIRLPOOL 706419680cce86ade743d9f96095bf7525a2e286de87c741d7135eeeec3d4240ab8c2b8cc6ab6ba9435813bf1c0e1d83dab8912c1081ad6adbc0e1328beae796
 DIST wop-1.5-unified.zip 947290087 SHA256 82af4a8b93cac1a6fa8deb2607e9b0a15255f8386b0c8cb21d6e532ac6c601f5 SHA512 fea0207efadf15afab7001227e27126aef4a673bd478dccb513c3011d0811074b2788083862f07e2f02f1a80ccb57a45ff64de8de155d8f8f7f1ab53ecf2402b WHIRLPOOL 9e39698f19f987fcae0957bd4bac53742fb6d88aa81e87750238871987f14c9202ab38918d30d0f4a420427cf719398182d4af74330f9bbd731530c54285f83b
 DIST wop-1.5.x-to-1.6-patch-unified.zip 122204892 SHA256 fe120218823825d742c506b2f448e15bf6ca756b99bc1d11d12749191e12c4c7 SHA512 a45018bd79e9e23c57bcaf692fa14c323671103558caad6acb794c2990cc5fe9cc8bdbe6a6c8254c4560d81eb59f5e3b9a6800a61b21a15870c4439f7179d936 WHIRLPOOL 61ff77e5168ec609f3fb498b7dffdf9138a14f6ea63e5537ffb583e17edb67cbab4c56d788bcfc994a2f3a11c517c10fa90c12cc0fc80571bd2702ce896597cc
-EBUILD worldofpadman-1.6.ebuild 2128 SHA256 3eb25f284236e996f94e5c7f945d5069cd9397eb67efc0dee57e9f7772ba35c9 SHA512 28e7bb1bae039a122a62b276e3a41d721847970062dd3032cef1cbb9cdaf668c3773b19dc4bf01c1e9da7054fb674997ae9ca51a65e10d5f7340aefcd747f7e9 WHIRLPOOL 8a86816c55841d05d0f77999cf03797fe72f47bc2322f3e4210cb762c8e976f7760dd5e41b1841f55b9af16968699c39fccf3abff5e4f67e8444821261ae91d9
+EBUILD worldofpadman-1.6.ebuild 2130 SHA256 ed4114732389112f8abc978a5e513232196a262c2a270c2160b4588d0cd38841 SHA512 83a80680c74376a4aedf3dda3beaf7c5f96564f6ad5622bc7726089f1df8f0cfb295c68dc3681789ad8e075ea25e4d553506df4923dcd37a546adb7e6a574991 WHIRLPOOL fc0bcb39df5f3223f6d75f57311e642d01280e3f0d5df8c9b04cfe15d5932820b5d7be785ddeeeb831f03a967304ea97b93aa7d54445368060ee5dfd12e600e9
 MISC ChangeLog 2641 SHA256 14d10f44bc4f32712a17b3992586903eaa484748512069c020b49755f63c6f38 SHA512 a8be34f769ba64d43185f4bbc5807deb76f1226eac27ca31af2798057b115637d7b090e576dbcc4ccb2f5f7f6dd71c052e26775edac10d2c5af48866e5f7c57a WHIRLPOOL 3cf4643dba2ba7bac2d66a6335eaaf73e1ea263d401fb60ec134e30af668b4551bc29a929f8148d81c0b9bf63071495c0ec553d3d9edec6613037e447e73e363
 MISC ChangeLog-2015 2605 SHA256 7b365d1d59978e58508004f918691adcd003f320f8ce017d998309c715ce87be SHA512 eb04008ade9a747bc75fe50a0ddd75f9c038e52378844ed5c3b0639cc2edd13afcb3de584baca5c26a66dbd4dfbb396a55c5d44db544e4261667f6bfa8a08683 WHIRLPOOL e3318a42b2163be4ea8cf6c0ac94d6e3ecc9a34897c69c58565450cf88fcb37ba7a3b1a40a393c2ccdf527d4fafc9391c7679bad0e7e710207854c0172ac546b
 MISC metadata.xml 421 SHA256 f1c33ba119cc06b5d003f569ca808bf8fa76a61f662ab2e7e504ce56d8b83e0b SHA512 2716235255bd6e00d84c6f11f784850959fd50a6542fd98d9c7815d0c7a6f5a201807b02f1cd7d1ace59f1f19f40cb97aa01b9d649bb198678ac60f84d81eb1e WHIRLPOOL 15ae8e5d0efbfc3a57b70b849543d905b3cf6d0165b70496ae560efa547ae1521cc61a024fa1e87d8dfcc6c72b5ef266455604c0edf2d90e2d8933cca5f67e62
diff --git a/games-fps/worldofpadman/worldofpadman-1.6.ebuild b/games-fps/worldofpadman/worldofpadman-1.6.ebuild
index fb2f804a8cf6..0599fd617591 100644
--- a/games-fps/worldofpadman/worldofpadman-1.6.ebuild
+++ b/games-fps/worldofpadman/worldofpadman-1.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/wop-1.5-unified.zip
 
 LICENSE="GPL-2 worldofpadman"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="+curl dedicated maps +openal +theora +vorbis"
 
 RDEPEND="sys-libs/zlib
diff --git a/games-fps/xonotic/Manifest b/games-fps/xonotic/Manifest
index bf3a4c9780e5..f6ad34c738f1 100644
--- a/games-fps/xonotic/Manifest
+++ b/games-fps/xonotic/Manifest
@@ -1,6 +1,6 @@
 DIST xonotic-0.8.1.zip 984854761 SHA256 be8bcc41e2993a2f26d4d04c65a7eab810443bd98b11b45e482ffdbbf284c46f SHA512 adfce546257bdc7cfebe94f53eaa9cc9b19eaa546c6405e31ed6af080e3948732c960a024126202e5853cb98b955daadeeb5a96c602a6d4d83e284d3540214a4 WHIRLPOOL 4359263c98352a8b5d169147d9bfecb4258628f212d9a965f0d1577d0a8b2469648ae1ce21d8dc0ff622d20e126ea52e1464363f69fcf514991aefad71c1bee7
 DIST xonotic-0.8.2.zip 991045679 SHA256 a22f7230f486c5825b55cfdadd73399c9b0fae98c9e081dd8ac76eca08359ad5 SHA512 0787fcf326827ae0292e5917c7ff2c7fd79947209d4b62e7f83b8b828bec15b575da304e0631f9f163c9b0bd93bed13616e142398ff08cbdaaea890a939dfca5 WHIRLPOOL aff99ae1e995265c832747923afb5ee1048719d4410cc6b55ec773e51dc0920acffe627541209b5450f572e78ef7c74c8822ae2f6ebec2a8888f80dbfd34afba
-EBUILD xonotic-0.8.1.ebuild 2611 SHA256 05a75b914ed994c68de1bea496c260f98389834878f1ac44978bd365a31dc4e4 SHA512 01b8a6629b97a1d503e3d964efb258e486b83ba6681f34f10b866dc4f4676a862fa86847f5b9d760c72e33730a23c8c87b2a51ee37688b0bac56604ab809d4b4 WHIRLPOOL f1b051b33fa25eb0af2054c490c71683cc619d148509fbe76ea2e298327c73f0fac2debdff8d8e1ee595406550a8ac6365b691a3ff8a3904dfbfdd0870b3e406
+EBUILD xonotic-0.8.1.ebuild 2613 SHA256 ebc54a5c0fceb5df29cc92f589679452e1a76147102047fcd83942c0ea22df85 SHA512 6cf1f27215f87342f6a10c260a524ea2c7e53269a7075358382e9085bc5506e40f958418ebffbe7484fabdaae322e85cc8ce51948cfe67a8a78f1ed537750fe8 WHIRLPOOL 6545a1f8c2ce8d508418a2581efd5e9415fde9423cde666f62e6779cd2991e9770342d04f44302d656c69c949be51ec2f521a02890df50fce80f67efc2d9d30d
 EBUILD xonotic-0.8.2.ebuild 2517 SHA256 d0b0cb88087a76af7f6831828c2fd78edcc4d9543613c382e53a1cbc718999b2 SHA512 c4a5d77d19c1570e4c6dd84100f2a2878ce09d7a747a5ec0741c3098c1b05307db94e92d918824a2f1a7cd4bceae6250e71020d672b7b1b79894459eaf2a57af WHIRLPOOL 6d3755844de6a612663b5427d501fe72ea1a2151b376e4cc2fff12909ebe9631c960a0f86bd6f1be5c8699c02c350c06261ab69060ed213b1236a2c85631a57c
 MISC ChangeLog 3559 SHA256 a3f6bf6a67cd14bd44a8f6630d6274753688ae179ad0065a229da5c914b39501 SHA512 823c9fb0f94061069fe930af6467f34096abd20ead67f1ad84e99704e7f0a0ae431bcae8b2f1d1d603cb059e57207dda5e5d49693309fd46e08ee995e9a0764f WHIRLPOOL b892e178e7a32443a4eae79b010ff0bfc34023954b6012a50cc1344d67a1fd098b1e6f683237bdbb295457af1b6b9e6d14b35476bf7e382f70a53ccd0582263d
 MISC ChangeLog-2015 2859 SHA256 7497734bdb9dc8a74a42a005519657592a6ee497cf772d170cd2b477d33a9260 SHA512 a704340d1c547a0c6d1cd4f06a571cc61c1f8359b657a7209af15b5f167bc430e7813ddc22e93b738051d912def1ba7a916e14adbf8b2dbab2139a285537c86e WHIRLPOOL 59f317633034918ea46fc1a91b2758c6c6e143d2f6eed88350d65a84642ff22e1e85edc2661061a7b75e84a27a80698788219fe75cdc0fe7672d2eb57efced71
diff --git a/games-fps/xonotic/xonotic-0.8.1.ebuild b/games-fps/xonotic/xonotic-0.8.1.ebuild
index cddaab04527e..d8977b5a0e32 100644
--- a/games-fps/xonotic/xonotic-0.8.1.ebuild
+++ b/games-fps/xonotic/xonotic-0.8.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://dl.xonotic.org/${P}.zip"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="alsa debug dedicated doc ode sdl"
 
 UIRDEPEND="
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-fps
parent	a5956e0a0daddcad648e0d8d8e5cb3e49e09bda7 (diff)