diff --git a/sys-apps/calculate-install/Manifest b/sys-apps/calculate-install/Manifest
index cd4d2ed17..ff83b7dd8 100644
--- a/sys-apps/calculate-install/Manifest
+++ b/sys-apps/calculate-install/Manifest
@@ -1,6 +1,6 @@
 AUX calculate-install-2.2.18-fix_unit_size.patch 1300 RMD160 071651b55f9c3d75184f94a5b7fc09a0b0477393 SHA1 95c2e4879da53679746640145bf4050ff8af278c SHA256 5f677fb05e9e9bee8bc84a6360da681f1d8d17d0a8945f431967d23edbd4dcb4
 DIST calculate-install-2.2.18.tar.bz2 75850 RMD160 56b1058d1977957cc6ceb8322a049af4dbb8f0cc SHA1 4e990cf5bd6310942b54995293f1f7ea82726aa9 SHA256 2a1b9c3fa93a958f19f05af51f80adf25f5ee0867452fac0304ec721de19cd97
-EBUILD calculate-install-2.2.18-r1.ebuild 894 RMD160 c47d7b943517a6cc976c7541e451ae2d7fdbe307 SHA1 d50f45d6f81436f1bf4e42eb65947ebdabefc0cf SHA256 73483141b3700352c0bc1eefbecd80f4eb030e4bd3908f352de0c9ced1f4329c
+EBUILD calculate-install-2.2.18-r1.ebuild 896 RMD160 ee093622c27d416e091dbe7d79f4937dec59b9ef SHA1 725ebcabb3fc63fde3a6e804d3912caacd121fa7 SHA256 9d08644a337cafe7a5744e4ffdf7f8ff549c785bf03acd33349c441aedb72de2
 EBUILD calculate-install-2.2.18.ebuild 718 RMD160 6036a151e5e5f44dc88f05943483889aac3db500 SHA1 733eb52ed024192f39a93961b2af8b4f4d8b9ed7 SHA256 a10787adc974dd82ca0272b461ad9b593cd441f821fb1696b57d2b97e3f4297f
 EBUILD calculate-install-2.2.9999.ebuild 595 RMD160 8f9b9a14fed39ded9c2a9d9343aa4e892d620172 SHA1 09aff28bdaa486868e2caddc7911732a905336ee SHA256 534e6c6e465177e269ce7beed96dab08a124878591088c1bf38095e855ca1180
 MISC ChangeLog 22740 RMD160 9c41b93974e4acbf44e1b82144cb84c427102007 SHA1 a69b3b6b5f15635d300a5e1eed8b7fb16c2668a6 SHA256 5c13696d6aa8bd886d01a624d6ccd2a6a58697caa233e50abc0e107428409aed
diff --git a/sys-apps/calculate-install/calculate-install-2.2.18-r1.ebuild b/sys-apps/calculate-install/calculate-install-2.2.18-r1.ebuild
index 5116fd596..deedc32bb 100644
--- a/sys-apps/calculate-install/calculate-install-2.2.18-r1.ebuild
+++ b/sys-apps/calculate-install/calculate-install-2.2.18-r1.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="The program of installation Calculate Linux"
 HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="minimal"
 
 DEPEND="~sys-apps/calculate-templates-2.2.18
diff --git a/sys-apps/calculate-lib/Manifest b/sys-apps/calculate-lib/Manifest
index 8b67381ba..f7e7b5aa0 100644
--- a/sys-apps/calculate-lib/Manifest
+++ b/sys-apps/calculate-lib/Manifest
@@ -5,7 +5,7 @@ DIST calculate-lib-2.2.18.tar.bz2 111559 RMD160 294326d180c3de46ef1f5c56d4da1031
 EBUILD calculate-lib-2.1.11.ebuild 585 RMD160 742e544ac2f98074ac2cf29227c931e213cff023 SHA1 64e098b169359f3106c0e360261cb5fbb99602f4 SHA256 501467786f3943c8fcf47b787b9582c8aa4f8dfec9e664d784f098b6a3702ba7
 EBUILD calculate-lib-2.1.8-r1.ebuild 730 RMD160 a207fbb024eaedeff679eb052b6ca04f289f914f SHA1 68c72562dc796958dd83dc4c59b2444678180b52 SHA256 b6a343b0f4d9e557ca42f5505c56c2373c04d1fa98191cf03b15cd0cdd0bb603
 EBUILD calculate-lib-2.1.8-r2.ebuild 810 RMD160 ff412a1e0f7ea1ec3493738e23e3e7ec9334d49d SHA1 251a1fa961d07ef51c1c29ff930f73839b838bc8 SHA256 9cb04ff79362d497c9ac6a52353933683201337cb50104ab7a0b70ba6fdb04c1
-EBUILD calculate-lib-2.2.18-r1.ebuild 769 RMD160 8b8c1c6bda1c1d25f347c4014ae31aee8fe0e94b SHA1 12caf99631a4c04d67b22d6f63625cfffcebb088 SHA256 f941bbcbfa40ecc01274c8b456a4d9f24cce87230adcc6cad2679b4732a346cf
+EBUILD calculate-lib-2.2.18-r1.ebuild 771 RMD160 eda4eab869e40a9c4d1dbdbdfcb0e7946d2d836f SHA1 ba562876a59cb4f5d6bb0c8465e5d24c78b52619 SHA256 e80632e105470436a3262d8c79815d5e10c7e3a46d4b50b0f8b6c90a070c4350
 EBUILD calculate-lib-2.2.18.ebuild 639 RMD160 d2dda2492b257947c88e37acdfdcffd30266ef29 SHA1 c0fee75613aa560848d32f7314737bc094d0dceb SHA256 bafff10516a4b7557c379e20592026a684be9b34dd38b381e136bd457c2c1dc0
 EBUILD calculate-lib-2.2.9999.ebuild 726 RMD160 6dce718f317825c712f7c9595a3e712ef6222cf9 SHA1 42e1607a36e826310ef5ed317d717c5aa8acc2bf SHA256 dce73aafa346ea1fd88b6e99d8f6184a562de56e3eb871c1b5849890b13c34c2
 EBUILD calculate-lib-9999.ebuild 476 RMD160 3df165f011b324fa8dc37d0443e941263943dd61 SHA1 069ab864dc83f32c69c4349d807d25e1196756ee SHA256 07a628ede4f47849908dd543f879ab8b40a5ca887b892fa0f5cf6c1ef2a24cab
diff --git a/sys-apps/calculate-lib/calculate-lib-2.2.18-r1.ebuild b/sys-apps/calculate-lib/calculate-lib-2.2.18-r1.ebuild
index 02bc7f88b..a69bdceda 100644
--- a/sys-apps/calculate-lib/calculate-lib-2.2.18-r1.ebuild
+++ b/sys-apps/calculate-lib/calculate-lib-2.2.18-r1.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="The library for Calculate 2"
 HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
 LICENSE="Apache-2.0"
 SLOT="2.2"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="minimal"
 DEPEND="!<sys-apps/calculate-lib-2.1.8-r1
 	!=sys-apps/calculate-lib-2.1.9
diff --git a/sys-apps/calculate-utilities/Manifest b/sys-apps/calculate-utilities/Manifest
index b345823ec..6487b61e0 100644
--- a/sys-apps/calculate-utilities/Manifest
+++ b/sys-apps/calculate-utilities/Manifest
@@ -1,4 +1,4 @@
-EBUILD calculate-utilities-2.2.18-r1.ebuild 835 RMD160 b37ced6e49f1b113fe7b32add8e8fffefb77060d SHA1 0392744179f892fd30f9e5e4d8dfe581d6209b91 SHA256 6b5e45a41f835fbfd93188e596ca92c01df408343ad7581b8c09f09675d40689
+EBUILD calculate-utilities-2.2.18-r1.ebuild 837 RMD160 6d67af30f0ef3ca5a5be4a8f42024475105b3614 SHA1 512d8584bf37d465375aeddac2025651c2128d6b SHA256 6f23d0c91d558e4a2ab68f9a2cff12cfcae68c0b72e89c906326bd366cc88862
 EBUILD calculate-utilities-2.2.18.ebuild 829 RMD160 e73b8763bd13098473327959bc435ff52d470836 SHA1 b394d0126e846d4780a77f2f89429f6bf8734a27 SHA256 550f341dc60ca43b23100152a58c30178cb1c88456d007bb1439fb4cb949fcd1
 EBUILD calculate-utilities-2.2.9999.ebuild 840 RMD160 0c7324a9ed480118ac19f62b162c9ee62c25f964 SHA1 7dadab1430ed147334ed7e9b4fcc86dc99e25d56 SHA256 f3ee28f9f765e7302c83eb4a15a09bdf066f09e6b40e34f6d52157a946df5e66
 MISC ChangeLog 15520 RMD160 4fd913a3b0c46a64984403142ad6b6bc52660e73 SHA1 4a31ac486e6b040e62f0ba1a07a059d767b5b7ec SHA256 8a2f7f174ddc71d728fa92d4cb77c5ca3107082a2e419ea62452656d7479aa8e
diff --git a/sys-apps/calculate-utilities/calculate-utilities-2.2.18-r1.ebuild b/sys-apps/calculate-utilities/calculate-utilities-2.2.18-r1.ebuild
index 8ed6c840a..91317721e 100644
--- a/sys-apps/calculate-utilities/calculate-utilities-2.2.18-r1.ebuild
+++ b/sys-apps/calculate-utilities/calculate-utilities-2.2.18-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="
 cl_assemble
 cl_builder