diff --git a/sys-apps/calculate-assemble/Manifest b/sys-apps/calculate-assemble/Manifest
index f64a0faa5..47970ceb0 100644
--- a/sys-apps/calculate-assemble/Manifest
+++ b/sys-apps/calculate-assemble/Manifest
@@ -17,6 +17,6 @@ EBUILD calculate-assemble-2.2.29-r7.ebuild 1277 SHA256 20405259e61050b3c92a0a4e5
 EBUILD calculate-assemble-2.2.29-r8.ebuild 1277 SHA256 20405259e61050b3c92a0a4e57b47d3037491a2d704db9f25c5783c89195a9e1 SHA512 8fb06254ec1569bd03b9efcbbb7c4c2c7b6865ef3c3b9635d687d52721c798703368f8951d90b15d2d8d0c734d45e38b751a157a29862a3812f69ffc20d5f7a8 WHIRLPOOL 6480015d2da5a7ee68ce5bba3f6575bcaaea37196e727559499f20ab4a7061ef3283199522b73afbd8b0ff714ca3d814eca240d62b8df1077bc7421a3de54ce8
 EBUILD calculate-assemble-2.2.29-r9.ebuild 688 SHA256 fbfc42238943b7f5834693757890f84ed13f1a545e085195c173c0afaf9e9170 SHA512 6aafde9f59afa4d5a4c8c29042fc66495efad11e666775f5b6f22015016b96f19706860ead5b5209a8bb7b3452cd5f30f90396beb59de48d7ab7cc0d464be40d WHIRLPOOL d79c9dfa5ca33bb7a59e7b5bdb8d355232d130d4dc869007939d3145aed115ea38b67d8951a62ffcfd3184ea13fa10a027b2843ea0b68b8b2700c87d7e037094
 EBUILD calculate-assemble-2.2.30.ebuild 566 SHA256 32a365ce380ff51d3064443252bc85455da52a55f6255816cfc511d526f8e83c SHA512 a9c8fcc6a3833255a7bcf6446d450602085cda1d3770a4a5bfcfa8a83092075e4d66a79837b3817d5d1f03492f63f917d9490a45f88119ac8fc29aae39a22db8 WHIRLPOOL 72f890ea8527d636f6f74b15155fd7cd31bca9410bcf16a7a4d960588b087ec50f9b94f5b2560fc21d5611cddb226d06da1fa4cbde6ce27a45d38a3490e0184b
-EBUILD calculate-assemble-2.2.9999.ebuild 583 SHA256 25fcb8d4bef81359d6d42bd79d9e2778cdbb614211d1c394175265aad64ac734 SHA512 5049e37158bdf3445769ee529a22227e59dd262ac4411ddea69984760820cd1ddcee8949a310c21286c5f22e0a9689355258f883cea7697708769f9406d313c5 WHIRLPOOL b2fe741e40b0e0edf15fc4b8ce15ee9bd23130ed98f33f0c9c7e9f6c542408960ba223ac1ba0f012288622748351fd6719c3fd20c9abeb30f6fbd8b22030ba30
+EBUILD calculate-assemble-2.2.9999.ebuild 572 SHA256 5bc8194c32bc4677cf79eaf6ae5f2112cafa51ae900dc3ebb6e879d9414858ea SHA512 62a111e959134709ef7529bfe87ccdfb20b103efc5305bf497ee9f427b3f956f180cd5c612641e557607606de9dbae3326c7881cc16afd9372b752ef65d63c93 WHIRLPOOL 8340a2b45b9941a61473ec4d66d944524dcf6f973ad9a03b9b92471cf5c92199949b2d707e7f738d86bbc9774eebac561df52891385e57d75aa811f47b4c5821
 MISC ChangeLog 16686 SHA256 759d02ea5f6029eab950ac93cf54a1c43dcc007a82be8e42cb82eac38369e979 SHA512 d4927fc6204a0a496248edbf3daf5b9259f0fc519a759c1dc8a6d6c2abab33074e75cd29e1696af3debaaac23548d0dc021e8d28c21d5c38cb8b2f06a973be0d WHIRLPOOL 7bd8bf84215ef77ec4035419f79d3226f3db13d6fb417e2b882bd4899bc240764ccc5a32154d8469153dc1c052936aad886a69916148bbf2bffa8d782b343401
 MISC metadata.xml 273 SHA256 4e25d45ba43b2ab7f7ae8ab4cfc05c406566cfb143a87166de77fbd8d9f8a943 SHA512 98b0d7d37e851ea86b498b2c0675bf505c75cb00d13932720475cda8a485db2325e2551954af3c534b2f9ef213f372c563d739d25d04a3da681a661c9ade6e91 WHIRLPOOL 44babe185c821b525b0dc317acb29e01223eacd5862804a64e0884502c25a541f53d322f1e63649c90285e93834b802beb21e4b34bd27be4b8d66ae6ac882c96
diff --git a/sys-apps/calculate-assemble/calculate-assemble-2.2.9999.ebuild b/sys-apps/calculate-assemble/calculate-assemble-2.2.9999.ebuild
index bb06d10b3..fcb853589 100644
--- a/sys-apps/calculate-assemble/calculate-assemble-2.2.9999.ebuild
+++ b/sys-apps/calculate-assemble/calculate-assemble-2.2.9999.ebuild
@@ -16,7 +16,7 @@ DESCRIPTION="The utilities for assembling tasks of Calculate Linux"
 HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS=""
 
 DEPEND="~sys-apps/calculate-builder-2.2.9999"
 
diff --git a/sys-apps/calculate-builder/Manifest b/sys-apps/calculate-builder/Manifest
index 3f9c6e516..29a80ce15 100644
--- a/sys-apps/calculate-builder/Manifest
+++ b/sys-apps/calculate-builder/Manifest
@@ -19,6 +19,6 @@ EBUILD calculate-builder-2.2.30-r1.ebuild 822 SHA256 b66b6d3e2420a378614b0b34ebb
 EBUILD calculate-builder-2.2.30-r2.ebuild 925 SHA256 ad177d22b5248bb08135a1d81a2d84fefa9f9ffa0f5d9dd95f8a6a131fdf7d9f SHA512 f2d60de1b1f18c30593e7d29f3e9e8d764e7caf1ce7c0cca43c9689de3eeca1e69f91bc13a719dff721f49799921e8fff7abafb24d43603c92449c672b7cac37 WHIRLPOOL 190518a53d59f2e8536e2cb8d0271e057e0ec44ddca4ca53de984bc24bfdf380a8faabe19e80c3b0f30e3b9bd50472e71c24ae53ca6daad97267b54fdfdb3319
 EBUILD calculate-builder-2.2.30-r3.ebuild 816 SHA256 7881295c0529385d11946ef1834be2ecb8c7f33fa4e490af282df6568918338c SHA512 1adbcf1f3badd0e1948357b48cf37b2313d33f6e01274cc7b9c36d36e3148b8b74672a98588728cc41b185c11dba213b287d8348cdd1b1f6c59eec2e776ad18c WHIRLPOOL f253748d6b0ba82043ad198ae27bc296b9c421173d6f4843d7ddcd7629b8921cc7d38e9e7947ffe9ed721ffe3c9bd900c1a511f417e041580643461971efab62
 EBUILD calculate-builder-2.2.30.ebuild 668 SHA256 8068e4dcd2613a52b5ad9a11e6084f519c523abafa7f6a5f214c70d3c262af4e SHA512 9eedcd56b7c4a45feff5348360c41775566b07c552190eb6ec2e9a2c14e2e0af212fe3efc66580834e5900caa9cb584550bf3234c16c183095e8c5c5d264d378 WHIRLPOOL 17a17382c23f457d2e8a0643d5e26f3dab0ac6c6b936fda71ad7fb6d5f44975984c5548ab7924d287c609a2f4f0975c5f4c2ce391c1dfa93d552650d1bfa5a43
-EBUILD calculate-builder-2.2.9999.ebuild 656 SHA256 1893dd71ba84f6b1f462a9fe597c455ebdfdfa4166efe04279e864c1d3565e25 SHA512 12237ba8b13dfefefaabe0739f4e34de2cdcd0a3941dcaccab09531236505fca9248cacd921b2b44f8640ab8322b7c62d1e348fb65b8f672aad09d46179c414f WHIRLPOOL de4e9d9ff7b30a2084dc53bf33301f947111b217bb9b5a1aad215a4dcda3b80dd6be780c94a39bbfb88666594e25ec889afb121facc39b30484fc922ccfefdfd
+EBUILD calculate-builder-2.2.9999.ebuild 645 SHA256 12bd65856844de72d88588937b6a65b39b7dec7eaba06d028e8c5a78ef6b28a5 SHA512 fc6396dad3a92a5a746f4ed32caf092ede65898e4822e52ad541faaa44467a4f81daf6f261af8eb20017c6155923e2011433e4b15071d7098392c901ae3a5078 WHIRLPOOL fd0151c3ce9fa98c5ca63470e561487c063293727006da10446c0a2ac2c65305042a5359bc0163840c1dd4502d67641453dddaf5cded552dacf6c5c97ccc7402
 MISC ChangeLog 20663 SHA256 f05f75b85860fc850514bd6bcaa1671c6de2ead417071f28ccbec647528f58a2 SHA512 2bcbfd0212333bbf8bfd1fc4de894ee50b71b0671e4769fd40a1aee4fbab0260919b447f109e3b02047835c6e0eb93c04ea6ce135836144d078c09f0c5615d95 WHIRLPOOL dbf2791d84acf8567520bfd90462650ca9c9c0da7a3515e9e5695c3a419cfd043e235d8d681704f33a0c99272e93563de0fc6426f9476f894a48d52a21409462
 MISC metadata.xml 270 SHA256 b65e150429ecbf36cf03d094f4e3e7518f536c61289cecff6b817326703d58a0 SHA512 dbfa2e214285bbe643553158f8ce084d93b34cdc10201917e001d26ca96fb76c9aaafdd7573f1827348d831dd7ddcc238fec560544b6efaca08c6eb9aa053cf3 WHIRLPOOL 42d8cc3e4ac41511cb0468bd1622001addef5263562a31c07a040cbe6f412278ee9d2124e864d987793629df5f3dd1c8b145a93715785d290ab917ccd14de9ea
diff --git a/sys-apps/calculate-builder/calculate-builder-2.2.9999.ebuild b/sys-apps/calculate-builder/calculate-builder-2.2.9999.ebuild
index 3e6f711fc..754b9f8a6 100644
--- a/sys-apps/calculate-builder/calculate-builder-2.2.9999.ebuild
+++ b/sys-apps/calculate-builder/calculate-builder-2.2.9999.ebuild
@@ -16,7 +16,7 @@ DESCRIPTION="The utilities for builder tasks of Calculate Linux"
 HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS=""
 
 DEPEND="~sys-apps/calculate-install-2.2.9999
 	!<sys-apps/calculate-1.4.0_p20100921
diff --git a/sys-apps/calculate-client/Manifest b/sys-apps/calculate-client/Manifest
index a4fe991da..9a4102d1a 100644
--- a/sys-apps/calculate-client/Manifest
+++ b/sys-apps/calculate-client/Manifest
@@ -7,11 +7,11 @@ DIST calculate-client-3.1.0_alpha3.tar.bz2 31153 SHA256 37036da06110cfa3543f6df8
 DIST calculate-client-3.1.0_alpha4.tar.bz2 31167 SHA256 b8e3f14dd658f373fe8c705702032379e3b0fb07cd7f86c0d0aed43fb1aa0929 SHA512 b62b716c3579c2e648a17c5f8f482ca17fbacce54766393c72d73549015bfbf62f27a181529fbc6e30ecfb4a2f128726415bdd56a7b732e52daaec64505974ac WHIRLPOOL 4a07c6fbb89a3ce012a1b916fe1be9faecddaabd97803b8c81a06156a8e3b01d476c1b5e037959f8e1825e41181e8e9bd44ffe98d15e4f792ef94263364cb4e3
 EBUILD calculate-client-2.2.29-r1.ebuild 1113 SHA256 65de5741e3a1f78f554d9e9c0fe2439d074ab5785bda35d945ba2a091abe6259 SHA512 ea1d92ca790c1028140a3278fa5c776f766263b94fae0a5cdcfe69254cdea8c0262ee389bbe9cf862c3a5300c558e96967532f600f93cd953ff3237556c968dd WHIRLPOOL 068968f6ae1d866eab84b9253beff543765ac5eb237a5bba7416e779f035bbed1a65682efe26c9bd34a174c7f4ba99dae34f4b011fe89d33e2f33f60c850af0b
 EBUILD calculate-client-2.2.30.ebuild 957 SHA256 bad66dbd85cb57dc9a4e9e3fb79cb3f4255db01b392fe154fb5c9b644a0735aa SHA512 6a85e6bf9c7725e33e4eb5b7964ea853bd3d14576dc750075c9517791b6bd9735771803e00ce9648174ec8a2eda72cac7f79a3b877ada099d245137699bb2442 WHIRLPOOL 10780dadc928d122d3816a1f07fdcb73dcc3df0956b7fc25d497cdb3b3d71b4fb38aab7c0c9ab32ab1834ee51e8374cf98f3f009be94b42fed42df5ab5799f9d
-EBUILD calculate-client-2.2.9999.ebuild 892 SHA256 982e825aeaf7d4a245163ad83afb4a31df6b3d14997135d52a864316f6e983ec SHA512 239c89fa2e8d4cc98eb704029d386a57d02104e5c295f2d880bc3fa2f9e6058938e93cffe5c4b89e504cabd81cb7060200e094cf352d1e4a691096af68c2bd48 WHIRLPOOL 6c042901e51cfd881f333201c2c0d8389a381b057892d338d46f8f9ba5efa59183ab0f112be024cb39d3619085da11ff5c919cff9b6ef51e1d4ce27d518e4141
+EBUILD calculate-client-2.2.9999.ebuild 881 SHA256 153806b9d7ff06534049553f4bb0e6d956f26083b949bb3080579c98e41ee9e0 SHA512 02a5a346b1f240f7ee80249504d3b216df529c035cc95ab514d6701a9f542a4ac3b5a66b4dfd27c087261f2904756062fe80f72ce84a41165e2b604526480e4a WHIRLPOOL 7c0f21cf953a73ac1b9c369860b4a898ca762f8a6ce9314160cf301cd133695de215ea15099483c84c3f83125fb6df9a646c633140bba6f98228365eaebc1abe
 EBUILD calculate-client-3.1.0_alpha1.ebuild 790 SHA256 74307c0ef2334fc8533babe946d2113565a57e3662d1d258f07697ab65b87d58 SHA512 79a6eb25328ae9c15006ce1799e5f583d1b791b0b7562113b2f5363f5ea40ec23e71c14763f359699259399191db22ec716f767169f7e80cb4a12917d1f4caa0 WHIRLPOOL d15f0fd1fda18983cb4ec90ba1c4b4ab3e604ed1f85d5f175922f34a1501596e041d0a036af11ce674859e830fa2d2dc30cb8932ee817541b38ec9403320573e
 EBUILD calculate-client-3.1.0_alpha2.ebuild 790 SHA256 6ad13b5db533c9b3d86515d13d5e16fe352ff5ec048167dbc86431358b5cb2b2 SHA512 0bcd6d95e1bd6cb7a12149b8880c3bd6c1fa7f8c4e6ed8f2c3ebc2f10ed34f44e15d99609dc758f22c41d0096bfa403dbb1ef0810153cfef001566946457ce6d WHIRLPOOL 70585a83d4026f5c2880af51fc6cdf7107af6a45dc326bb36739d47b65a384743690770959800cbeedd442f768cf3739cf923352aae1bf7901e0ba9c1c923f3f
 EBUILD calculate-client-3.1.0_alpha3.ebuild 790 SHA256 035bc200812b9bf820a38ff45f2fc5812c33d2adbe3502a3b2347e55de8cbb5c SHA512 26a364827921fb3526ccd754a2a19ebdc3b9ae174cfc228fe1e1d1d0f1978d74b5bc7ad08880a53d4722bffc914ff55a2fb56b2559acae7df0d9a17aff20b182 WHIRLPOOL 3ef7634a7bbc752a620db1915553e939280086b602e34a28f7ec3bf8343f04db904394e946de477b5a0c527fc83bc76b8e39fc0e9cbab9cf92705966f45eb94d
 EBUILD calculate-client-3.1.0_alpha4.ebuild 790 SHA256 4f5237398763c70efc424aa481c0e692872609e0f1e68c54b623a94a6bbcc56f SHA512 f472b8b8e91062b9b577ed07711fd1c142d1a05ac9e7d6c30469753d4cce78f2321af3e56ad7123e06e369b898053c0b58bff38aa8eacfa2c61ca8eaea0f0a06 WHIRLPOOL 5577094b8c9d0dbdfbabaaba54669e9d0934558065378d37bcf99ec3ca0faaa986981793b4f8dce9935ac38643a083afd3d93c6fd55e8a1f05a1f7e2534cdcb0
-EBUILD calculate-client-3.1.9999.ebuild 890 SHA256 721634b960a4eb5340a22cdff4c2523726eddf28ca499fcb365834f7713e44e5 SHA512 e8206df4eeb87fbc4ef32434f58306d88d7ca74dcbee025fb117eef04923d652ced790d00247e0eab26a3549c2211e4ca2ed91f38dd7fe9f29ccdfae4725a7e7 WHIRLPOOL 0a8eda9a5d7117a6bcc3f324709f327620aa7cab8b31802c82a91a55f7769a042c8e1cc2959e86b60e8e6384dbec03965a1c499148496ecddd4cdf4b3a2016f4
+EBUILD calculate-client-3.1.9999.ebuild 879 SHA256 37385187f78bb708669b5cd2742173b117bb482c784f8f481ab7388554476d65 SHA512 87ebc2dfa965a9bb9d24af13a611e83e412cbabb12957bb14e2a1cd8b9f1951efbf690dcfa8f73711a02cfd0afbc9e9f37209ba9a3884b018c41b3a46e2e847b WHIRLPOOL 349da1bcb076af176079473ccb2fd1a4e3d8eb3ec2a7a6102272d1dd1073a8c181c49e02c89ede4b5cd829856f0c0f5db877b89eb0c6335ad678e58902db293b
 MISC ChangeLog 21989 SHA256 065aa2c75428e965caef0348105d8e5464d4103f5f2eb16bb626c7a9278208df SHA512 76ad69386d986e2e65448394d738b4d6abbeffb4af38f13dcfbfe8af64796c9b97eda68eb8cbf749fe7ef2711067da430af1cc1a764712e8df853451f903ab57 WHIRLPOOL 58b0a2837255a2eb67606072ac1a6a06e0db7079b563d3b4c9df45b5dbe0fad31c409800da635a337ad976b31bb08549e89063796e8217d46c83ba8b5e22e1b8
 MISC metadata.xml 310 SHA256 5023605d36dcbb5d5fe1b1ac54f7125a4087479b5168601075a8050ed51c38c2 SHA512 67a32e55e64108218d991282f1c1c9b1bad07c12a0d192db9e81df28557baeab75b8c9f5b134568c85f090470c15c727df18dff3c4deef05cc64f8f1be7d3943 WHIRLPOOL a9d79c91db4946f3abee5c6acc52d9eab183e49682a492fe7c7617a15eebee122f8c2f5a6b0834bed76c4f8bbd8bec8e58c726a93c2f4d04a00d92987d9c7227
diff --git a/sys-apps/calculate-client/calculate-client-2.2.9999.ebuild b/sys-apps/calculate-client/calculate-client-2.2.9999.ebuild
index e401d06d1..b350a1265 100644
--- a/sys-apps/calculate-client/calculate-client-2.2.9999.ebuild
+++ b/sys-apps/calculate-client/calculate-client-2.2.9999.ebuild
@@ -16,7 +16,7 @@ DESCRIPTION="The program of setting and storing the user account in the domain"
 HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS=""
 IUSE="kde xfce gnome"
 
 DEPEND="~sys-apps/calculate-desktop-2.2.9999
diff --git a/sys-apps/calculate-client/calculate-client-3.1.9999.ebuild b/sys-apps/calculate-client/calculate-client-3.1.9999.ebuild
index af37cacbe..2479e0a27 100644
--- a/sys-apps/calculate-client/calculate-client-3.1.9999.ebuild
+++ b/sys-apps/calculate-client/calculate-client-3.1.9999.ebuild
@@ -16,7 +16,7 @@ DESCRIPTION="The program of setting and storing the user account in the domain"
 HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
 LICENSE="Apache-2.0"
 SLOT="3"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS=""
 IUSE="kde xfce gnome"
 
 DEPEND="~sys-apps/calculate-desktop-3.1.9999
diff --git a/sys-apps/calculate-console-gui/Manifest b/sys-apps/calculate-console-gui/Manifest
index b01ed1aec..fee714b3c 100644
--- a/sys-apps/calculate-console-gui/Manifest
+++ b/sys-apps/calculate-console-gui/Manifest
@@ -18,6 +18,6 @@ EBUILD calculate-console-gui-3.1.0_alpha1.ebuild 619 SHA256 241cdbfa47f64983b3be
 EBUILD calculate-console-gui-3.1.0_alpha2.ebuild 619 SHA256 b42b06c624f04b5df1533fdd36765c9ad24c2efc6adaf4fa7897fb6d07689f3d SHA512 abbc6f2a089b946eb66c9781d96d869a23f4398e8f77c1f0e1e2c168fe64463afe36611061720df33b3961b5aa7d6aef2f9ebe795561d601958cdd7ef29771b4 WHIRLPOOL 942e01c8378b46dc2cdc10a07cc012d21883b3bb08a0b818bd65d7ccad80e44dae0ae45ada00c84ce3de5d13660ff4f1c379046d72cbdccfef60215108d15c20
 EBUILD calculate-console-gui-3.1.0_alpha3.ebuild 619 SHA256 bb1142913e98d18edbc9f05637d11971b0a38f42ef773fff155c02d1c2c1b597 SHA512 dfaa235b08dd79dda46b99eb577aceb7ba690ae83fca39dfae8cf3a1f2acd82e2714ae1aaa40e2dd78b1aac027c83dadb8a084251fe7632e79259a6df3035e84 WHIRLPOOL 8353050f442af774e709d5e20a58be5ca439ebacd66d13aba5706d0a6fde809a8ef440c88f5016f3b65bf0104cffc2565e376553b6496828e30177393d3a454e
 EBUILD calculate-console-gui-3.1.0_alpha4.ebuild 619 SHA256 e08223c2c353311d4c70f09861cb893fd650b0f63819bc8803c7dc5722ce7c80 SHA512 8fcfa9566da005440b4f0120783914ce53c8e1f8868dbeeb8d5982e9e9650a0b680bf574ce24636acf014ffb9529adecd9d69abee31ef5eda6ee4adba371dbe5 WHIRLPOOL 6eb2412e391d6da9b45ab763961f3fbd25f3f0adca8c1a27e43ca17e3702d6c22c3cab665b9942f6f259403140620f690c30620f49d881bc16279af5206163ad
-EBUILD calculate-console-gui-3.1.9999.ebuild 589 SHA256 aa5932f514fc89854443edf4a5a9e3e1dcb5292684b9b0ade1501056c2a1e77f SHA512 033a6d235d1330ea99a2f1ab106bc30c093563d798eea36a4f212a4cb4c97202044005f51b489e2e35d1249545fa26620e02d80bdbf414ab0fc190a1a2be1f2a WHIRLPOOL 5066d967cfd1569936fb87d259fbbad112daa7a2abb51cd8cf83d3410f3042c2e9b9c8aadf4218f5f58a1ebf7e7addc723e17e049810c7cfe212ec532277939b
+EBUILD calculate-console-gui-3.1.9999.ebuild 578 SHA256 25c597010320e393ada128672ffc1a2c2bfbf83a4293a929861f3d58902ffa7f SHA512 cfb7305902629820bf669b238090062c1dff92fe0f6d9c82f7192776961d2f937e7c042d66273ba2711a74d7e14006462d6585f65848838fb0d8d9f2be217cc3 WHIRLPOOL d42e0f6736a830bf53aafa3635192a05b3edbb4ac335bce223ecdd0f7bf75456aaade5a0f0625d247b836485418f5a9d3cfaea4c944cdcfd81645c1d4f4d4201
 MISC ChangeLog 470 SHA256 8b235f6e17c0ba8554fefe4d9272cbf6973041881d57255e1ed038190d7bc149 SHA512 6d8b7448216042425d3090693c4ed652394d9fb4b162bc2fbb6a42d29b726c683db806346018ab99c182600618c8cd5101e62d752b97664d916ceae6087ad3e9 WHIRLPOOL db05dc3ad2a014178759c8480aa2ccac0c1adeb31b54a25d3b7a09dce9a58c4a8ae59311488e50b973314b44049c8732989bb7899ce7d4f199ed22f310924b34
 MISC metadata.xml 267 SHA256 1e7bf8508278ccc123ad22917ec9d37323e7e89ac15c52a56aeb6a144070a66f SHA512 e7e050662c8fcd87684083e74d1c3d643f747fb2ce1b7dd4e0c3563c44cdcc1651cb83689b820431c95711e2ba75b6ca1832166ba43d3c0cf0fba86a23d54b55 WHIRLPOOL 9bc620181bc5e8dfdf2715e123576cf026a842620c20860d1978bcd768b946a4131f4c3f0910167cbdec7eeb375d24f6c11748e68ceb81a9798ade75f25fedf5
diff --git a/sys-apps/calculate-console-gui/calculate-console-gui-3.1.9999.ebuild b/sys-apps/calculate-console-gui/calculate-console-gui-3.1.9999.ebuild
index 9f771f6b0..5f97f9a32 100644
--- a/sys-apps/calculate-console-gui/calculate-console-gui-3.1.9999.ebuild
+++ b/sys-apps/calculate-console-gui/calculate-console-gui-3.1.9999.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Qt gui console client for WSDL Calculate 3"
 HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
 LICENSE="Apache-2.0"
 SLOT="3"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS=""
 IUSE=""
 
 DEPEND="~sys-apps/calculate-core-3.1.9999
diff --git a/sys-apps/calculate-console/Manifest b/sys-apps/calculate-console/Manifest
index 002f4d47d..cedcf12ad 100644
--- a/sys-apps/calculate-console/Manifest
+++ b/sys-apps/calculate-console/Manifest
@@ -14,6 +14,6 @@ EBUILD calculate-console-3.1.0_alpha1.ebuild 541 SHA256 8baec98be53f25d6954254f0
 EBUILD calculate-console-3.1.0_alpha2.ebuild 541 SHA256 48b7d3babfd0d7b72cd96931dbe20d91920acdf29c028b597dddb7a6f245422c SHA512 182a4c89f0a66a57e98e7a654d378475624be95a985d02a7c6ce2bfdd467d5f734b55b67e0b8e48ea0006a00dffc84a745efffe6b946f64d410549072c586284 WHIRLPOOL 7f771bce988ece2bfe9cbbcffda8a167c01d0d3358f919ff7d8ecb25f0b3327d10fb761c37fa51b63ceb6479b2228de0821878bd48bc8dee939a98db9a2be876
 EBUILD calculate-console-3.1.0_alpha3.ebuild 541 SHA256 7e55f2f73df3a386911c4be0ad6f32c45fd261752dde7220963d93bad7094276 SHA512 d30ffd120e581da8b8809032a7970d3c554ec456d05589cf69ebab6d43402402ca0a8946a53393adadb1cd6f4d5493d7496b505ebdf8e0513c5f01c75fa241da WHIRLPOOL e4d92ce3fad30d2eb666752783800f6ed9e72e88522585ccca3c4f2a9d904af86c9d830a24ae7a14d02179b9b9a19001097a41fdf015eff2ea2c449f3c6ea5fe
 EBUILD calculate-console-3.1.0_alpha4.ebuild 541 SHA256 2221e84f18a048029dee59e7e515adee8e8295b3a0b195f0d67e12960bce698f SHA512 2d99f13bd6815853be799d1fe507618dd058d40a2ee873dd937cba0e54a90df96971cf3c425367f3c53f5827cb5a1a8b0bef2327b268bb8d7840d4ee90939600 WHIRLPOOL 22d842cc6a4e3c1c6b84ddc90be12a89b53165fdd65db81da18d928e71a7e1622fd5ffc062790d168cffbaf590be18910159e715c13275357c7d6f2b0a63862b
-EBUILD calculate-console-3.1.9999.ebuild 585 SHA256 50fe18598a0fe8467181efcc7218b6610bf46358b7d3a4278a9defba202f154b SHA512 2c3a3e0c5cc902f35144b4792056dc2eb4c744777dd0d8306bbc882d0e98d8849b4c7a27bd3d470be999795c16ad9df1c124696b3612a1d76385d14ad4345fee WHIRLPOOL f61c10daef7edb966d06880902ac674b2c26830d463a725152135cf273e95efcb2974e1eec5a528a0dc58fda564a4dd7e7f3637ebda322b58a3ad999d5cd5378
+EBUILD calculate-console-3.1.9999.ebuild 574 SHA256 923cb57128c1c71981b53ff16ccfb63327d5b77c644241411a1eeb16e0ad1e06 SHA512 78abff95b05a359b36eaca9ce4c5990816909dcec58f2ae0beafcde55b2adfcced210ac5fdce47ee1b82ba3fd085640d80f42c18d2c9bbe73ad14f2e9251c0f9 WHIRLPOOL 495e1ad59d6cd502af03c3c2ccd25a319562532ee5263707f30bb0941d9b7d0bb85f6b1c2579e0fba56819de48f2fd159f8c857cfe539da823a16b1ab79f57ae
 MISC ChangeLog 458 SHA256 044e2dbed6a26e83fe125911bae84c4fd81059582accdef3cff36787aba6a680 SHA512 3e9992df75ccebd70880679e8d836efdf93b8a9566772f0dd245d41b42ea25a22d707d07c1bc48f610b185705123cf5cf4091744b0c1c8d0c98138a7973d7038 WHIRLPOOL 8ce5e05ff566734ca93bfea52c22843f589e69e6e9ac82dd17dc9d570d384a3d38beb09f15edc96ebbdd8fef1aa8f26ffe62604ca6038786d1139b2b24bd1642
 MISC metadata.xml 267 SHA256 1e7bf8508278ccc123ad22917ec9d37323e7e89ac15c52a56aeb6a144070a66f SHA512 e7e050662c8fcd87684083e74d1c3d643f747fb2ce1b7dd4e0c3563c44cdcc1651cb83689b820431c95711e2ba75b6ca1832166ba43d3c0cf0fba86a23d54b55 WHIRLPOOL 9bc620181bc5e8dfdf2715e123576cf026a842620c20860d1978bcd768b946a4131f4c3f0910167cbdec7eeb375d24f6c11748e68ceb81a9798ade75f25fedf5
diff --git a/sys-apps/calculate-console/calculate-console-3.1.9999.ebuild b/sys-apps/calculate-console/calculate-console-3.1.9999.ebuild
index a94d80486..935330347 100644
--- a/sys-apps/calculate-console/calculate-console-3.1.9999.ebuild
+++ b/sys-apps/calculate-console/calculate-console-3.1.9999.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Qt gui console client for WSDL Calculate 3"
 HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
 LICENSE="Apache-2.0"
 SLOT="3"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS=""
 IUSE=""
 
 DEPEND="~sys-apps/calculate-core-3.1.9999
diff --git a/sys-apps/calculate-core/Manifest b/sys-apps/calculate-core/Manifest
index 990f01bcc..634b4fe28 100644
--- a/sys-apps/calculate-core/Manifest
+++ b/sys-apps/calculate-core/Manifest
@@ -16,6 +16,6 @@ EBUILD calculate-core-3.1.0_alpha1.ebuild 1071 SHA256 956c34699d88aec29225177b39
 EBUILD calculate-core-3.1.0_alpha2.ebuild 1071 SHA256 a24c125108cda974f06fa21f8c580d3dfef93a54a12f028517fe21ab59c3e167 SHA512 a04b7ff21f8606508231f3820a897b5ca72efd39a02f6943ac9660abd876129b2ea2f508ce032b6d9a6475d6fc20b48b61dc8ae822eb7220c02a91356d8445e1 WHIRLPOOL fb1a673d45c0c2475cfdd3d9a097d5d1f8b2920ed800ed8b668d9a6abf48939f6ef6f37977a421014d7312826d8810bc202368651d02c07cf319170c4bf3cfe9
 EBUILD calculate-core-3.1.0_alpha3.ebuild 1071 SHA256 6734c8428dda04f9179d38fead531651c898c2749d76e8560bebdb2f9cf498e1 SHA512 4ff8a9ed062e397c3a09c7aafc3e552da2d65dbc3bab7d78df7e60fdb7ba6281311ff6ef0e43d9b651f1b302848cd9ab3d1929c38aa8ed80ffc17604a42cfa6c WHIRLPOOL ffcbd9979617edcf914b42cc889c9a4a4ae18d3ddf6c3c1be514183e620823fde2cfe99cc69729029b7faefbcd999eaad5cbea1ffbb511a1838959af0ed9ae89
 EBUILD calculate-core-3.1.0_alpha4.ebuild 1071 SHA256 62dd2c9b264611a187eae0c93268d6bb3e72f89152b4707a2a9a8f73d9569d8f SHA512 0a7c23384af0f949543b17272d1cfef245ebdefbe8241145568c670dcaa8221b71175b09544fe393032954c4b03ecffa13d172bba7639c251641303a9f413d36 WHIRLPOOL cd130ab524cc00abf6b0abddb7ba2e1a6e683e9e9f4febb3d6cbaff180577b83cc7a93fd3b16beee67a65d64695466a0e786e6b067e984d853042edca3330892
-EBUILD calculate-core-3.1.9999.ebuild 667 SHA256 48109be1cec60e6f60bb00647273c1a2a6df8711353a0849aaeb33cca225c83c SHA512 f6031a8e182360e7e1b4e73d8987d2e0c03b3ba62f35c27a7885f0313e2da3de05e8ecbac05cd0c52e938035bdc49077938d01ce56f64ddedbd9da4b43f9bbd1 WHIRLPOOL 526867668fb473714f0b17d39dc807a848134ca844b34ee9a8ab4475e2d11fae9f573b893eab7e23d0345b0a69290265426339910a2da2eede68a651877ece0f
+EBUILD calculate-core-3.1.9999.ebuild 656 SHA256 475e34d10141354a4c60e029fc1cb74b080c3a1371d9e1e44a5e2936b7130ed4 SHA512 9ba865c5effa56079a3841a96d1a4a89d4bbc27e092042aa4a87d1b4ecde9d3a690c92c73e10b330724258aaf3138d2a58d50d18d2fbea9e657c3c5d2f8395ee WHIRLPOOL 89d3bcc657324d1ffb4265eab3e28e94e3d00fb7530c6654e75b52fe002d70f72998930729cfe3320a3ff571277e6e59c649b0df2fe071bcd9b050f9d42608eb
 MISC ChangeLog 382 SHA256 ce74a6d08ec1ea80ee021f5378f705102435abfcd5304d851c3f7932a967065e SHA512 f5531edead30072e8fb8f278cad1d265762b8ecdf146b86cf514704f373f2bd8068b3ed35e68186687f83129814b73c6269024d442fb592515c72a9d0e6d3ca1 WHIRLPOOL 48571b2986c2f8797109a3a3440a43f4f87b601e8e52bd41a470bd077b37eb2b6118e6baf86179df065aa2e4a840d9501b2b2455b990a19dfaa2d4ee7784c922
 MISC metadata.xml 285 SHA256 821f48d3fa5fac7f73ca371b49cfc11485a7ef44cc856817e41cb1665d89b0c5 SHA512 337b11b6e13958ce6550ab955e1fbc0061b919db3c9cac6964d323c4ab1ce3782e9dd473a1924bcf03b5058452aae212feeeb01e5e6c7844bb88675380c87162 WHIRLPOOL b117f08043f61eb0e88d3881d54ce29e4dd565129442554ee7a30f498b7140d6008abf57be22342a6df8eaefbdc351356dd813788ae25b6274ce6f6fdef30d0f
diff --git a/sys-apps/calculate-core/calculate-core-3.1.9999.ebuild b/sys-apps/calculate-core/calculate-core-3.1.9999.ebuild
index e78ce3d38..8b265f808 100644
--- a/sys-apps/calculate-core/calculate-core-3.1.9999.ebuild
+++ b/sys-apps/calculate-core/calculate-core-3.1.9999.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="The WSDL api for Calculate 3"
 HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
 LICENSE="Apache-2.0"
 SLOT="3"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS=""
 IUSE=""
 
 DEPEND="~sys-apps/calculate-lib-3.1.9999
diff --git a/sys-apps/calculate-desktop/Manifest b/sys-apps/calculate-desktop/Manifest
index 0628f6e97..7ea090a0e 100644
--- a/sys-apps/calculate-desktop/Manifest
+++ b/sys-apps/calculate-desktop/Manifest
@@ -8,11 +8,11 @@ DIST calculate-desktop-3.1.0_alpha4.tar.bz2 13211 SHA256 d4d14835cb7df12aaf35bed
 EBUILD calculate-desktop-2.2.29-r1.ebuild 1089 SHA256 b79babc4442f34418d4b22c5ae696924a1c1f3eb5d14bd2922406439c8345a15 SHA512 e057da87fcbb1398d7f729464bf015e4d9481d7e29b4bfd2b7d2e20316423ba7adace5123ae00560e1c88a54e4a0914d52a1e88d7313cba0435fef6d619df776 WHIRLPOOL dfe3b3c374015cbce6b692809643bbe9364135261b633900c87a20b667f0a77f6a1f89084e77376442583950dd4d1d5c74f4f10df5ea63700f69f80d3d981a51
 EBUILD calculate-desktop-2.2.29-r2.ebuild 1092 SHA256 070c53727e7ce0ac4fa20948ceeca51c66376cb7bc9d24449b4cd3cc84a629ff SHA512 3415f484b3585f93ad836fd800bda337d24d680a3313398665dc92e75da76021bd75bc1b8006311c8fca64a849458aff4fa99fd25d8fca869050893404a9f2d9 WHIRLPOOL 794c417cd2dc1eac70822958b721be5240b0c5b65943f2fed10a1a9a15b12840ca02397995bdd6f005cd77de28c4af642c7b260f23cf93960bbd9b6f1d8ec72b
 EBUILD calculate-desktop-2.2.30.ebuild 955 SHA256 fe98a943af7751f32be004cf70c8f20fba3effbd493d241075e744f71b86e8de SHA512 b3d06db94b59fd0938d11b7dfcf468d7551c1a4396b1890c5dcd66581a3f1b79e2dc659dfacffeabc3e6c460b8a56ddd1b65737a6602de95e09ca19f17a5a478 WHIRLPOOL e3ff7ccb16573da9fb2c20f4dd91124d768a720fb4346964005e9c1808fecc99654352924a496e8fee6617b79895ebb09928810078f157f7aa3a9f0de015fadc
-EBUILD calculate-desktop-2.2.9999.ebuild 989 SHA256 193fc2e457e70d1af04afdd99cc04db1106650cd6465d161426f1d4a7b87fb77 SHA512 cc6c8865bc961bb220534ae6f3068c2db17d69cd39d35179afee9b2911e34816bd575709097bcb6446bec3c9a766572d38e841ebab6e3e7211ce4e2ea30b57bd WHIRLPOOL 0f44ab6aab974c9c6f29337066514ceb4d7289431995af25e97e1b0f2774ab5b697e9cb101538a82e8721d340ad93de7a4bea9902a80125b9cc35a98272d70e6
+EBUILD calculate-desktop-2.2.9999.ebuild 978 SHA256 e928c5b54cb7088f6aaac617b640f649607b9e586f795aba743a68b593db84ba SHA512 ccb83768438c663c10f25a921c307306abfd00a0b10965b403f19a88e1cd7dcb0952bd4f716614a794df2d452034e716407d9f26bd23b4d0d2bf89b2422d8bf7 WHIRLPOOL 82b075b6c946418b5b4bb23090eb91580c5d79912c12e3d65da879e693d26ce2ce2d95d39ba7541f39a144aa266e1c5ff4532ad41e2edc5a6262500375818ff9
 EBUILD calculate-desktop-3.1.0_alpha1.ebuild 650 SHA256 e2b555dbc115753931d47a17df89775d92093175f8090ad9fa635a00dd7a72b4 SHA512 eac7ac320c827bd85936763dba570556cd438ef1276fa75c05f924abc298a43fe8a243238b4d71acb48c4dc473955a775c8a595331f66576bf1a6d082b177513 WHIRLPOOL 61501a2eed8d6887d4bfc53235896e5f16630d050bc4c1aed7d4777b97fe0cbb48b2224600c489e37065749fa545ee6982a240f5723a4f82650c8f747e519232
 EBUILD calculate-desktop-3.1.0_alpha2.ebuild 650 SHA256 7e1436f0303b0ee3ba614167554b4d799bb2cc345363ac6a24c3d13b9afcabb7 SHA512 745f32f48e09252a76db3efb02eac83f22eaab349bad6a723e19c69259f65acb5e52c485409c6a1d4a203c1946021f7d0d64cf41c36de0bf0987d87993df1ab9 WHIRLPOOL fabcade8f0da6940f04bcc307083d64357a6dab70346ab3cb7acefb73f79b9db212c02f407af5bbf7de8038258244b4c54c89d9a7130a7567a65c22af2ff721a
 EBUILD calculate-desktop-3.1.0_alpha3.ebuild 650 SHA256 6ce37383730113df849148ecf0ebb41161800682403683839103cd250db783b3 SHA512 d7cf06d66248e81a46695ccdfa5e257faf5953c48a84d884c089512c66226d06550966c9bc3f738a2742dccdbdd1cac3c5fd0e6c90452974c634127c7264343e WHIRLPOOL 2170bf77d9c46e4203bbb43a66b968bebf36a5592106be6ddbf421b27eb0609b21a9ff813fb2783c526fe3f417392e6e76d144a4109383d33cccf01c9a324ac8
 EBUILD calculate-desktop-3.1.0_alpha4.ebuild 650 SHA256 843ac5d442386302cd31910df001dab52ac9c692e6cb89ce80fb1a5fefedb984 SHA512 7873dbad7a1fa2e932cdc75c22849140c7f0c4719500d2ff036918cbd2a10f2505da583429edf8fbd1d8c980ccf1004b0af39f93a563c070a1551d1db5e66252 WHIRLPOOL 2966436385e16c06ce838ca33b4e2965f11d06a9c81e40836f0bb9ba039bbffcd259cd91bc2852ece83037d367ada6d3067cd6e8dbcc31f656001c6dd92dc423
-EBUILD calculate-desktop-3.1.9999.ebuild 987 SHA256 6f80831c94271e95cff75bb40da2360b4d01ee47d1fb619dfa055b85585cb3c6 SHA512 70785c4dab3e409ea9cd34ed965eac38c67eb752b3c3aa21e228202a9b33e084d0a404b10eca36b89e6841e948a7499c0531651fa5ec586bee1eff5085805610 WHIRLPOOL 06c3caae97710faef15e8de313b373b6a55d1ba5345d666f0ee9990d012d681819c73d44dcb58e4fadf4f20b6aaeeaa6a3454e9820f8bbe275ac884bff00c46e
+EBUILD calculate-desktop-3.1.9999.ebuild 976 SHA256 405de66b0f54804d4bc025fe786c21ca1a040d6a25928a535efbf84cacd7f505 SHA512 69ebfdc4c04f7c236f728c9938a5538b3822369cc1e1de2593a6e83178b5441ea2e37068ffcd9cf17aa92bcf00ee133ee98da0be5a5f591d69755e1159eeadac WHIRLPOOL c61f805379983ca23af188ff60a99511251a8afb27b75d0c1f08595012a579c42c2ef36603d837865a155706780ba413f0cac74457425eea0e0a59488e3dfda2
 MISC ChangeLog 16440 SHA256 2a1c3211586d5dd10a249b61e4a8abf96a27a0c4d1706715b8a563bfa8aabf07 SHA512 962d9b69daeef659f2e1d6f2a5c974d6ed152d22fa9f0ed8c35d4c27e901f976167a2fc260a71c798be29d0161c7e90fa030957b2f74e25dcf35ecdb8fdc69e4 WHIRLPOOL df646b1f4c914fcb7142365b2110eb5112f7653cfddaf1b8a79f4a8f4ac99d50b6be59d3d593a8fb9e754ed92ebbe9a2cdebe320b0941d2ddd1bb9fba85c20b0
 MISC metadata.xml 315 SHA256 67fea0b1af7d10c0f86e72ab40f527e99c6f81f7aace4716344bdfb97c769a18 SHA512 5157eefeeaf0675ad9da609efe5a2e11b7afbc02beb1ca1eab77f6ffa76756456ea28f7467bcc01553cb629284c3c9f43ffd30427de9a0f91435a568889ea1ee WHIRLPOOL 5ca9f1c15ab70dfe224cc9ea343dfef3a1a18d7d1004d0bda340245ff7d71c71fa2ed1616e45609140d89c9cd017fef6c68c291490b39199550bc5b5b34ef6a2
diff --git a/sys-apps/calculate-desktop/calculate-desktop-2.2.9999.ebuild b/sys-apps/calculate-desktop/calculate-desktop-2.2.9999.ebuild
index 96c9febdf..ab28336c1 100644
--- a/sys-apps/calculate-desktop/calculate-desktop-2.2.9999.ebuild
+++ b/sys-apps/calculate-desktop/calculate-desktop-2.2.9999.ebuild
@@ -16,7 +16,7 @@ DESCRIPTION="The program of the desktop configuration Calculate Linux"
 HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS=""
 IUSE="kde xfce gnome"
 
 DEPEND="~sys-apps/calculate-lib-2.2.9999
diff --git a/sys-apps/calculate-desktop/calculate-desktop-3.1.9999.ebuild b/sys-apps/calculate-desktop/calculate-desktop-3.1.9999.ebuild
index 5fdf414ce..6e3471c85 100644
--- a/sys-apps/calculate-desktop/calculate-desktop-3.1.9999.ebuild
+++ b/sys-apps/calculate-desktop/calculate-desktop-3.1.9999.ebuild
@@ -16,7 +16,7 @@ DESCRIPTION="The program of the desktop configuration Calculate Linux"
 HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
 LICENSE="Apache-2.0"
 SLOT="3"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS=""
 IUSE="kde xfce gnome"
 
 DEPEND="~sys-apps/calculate-lib-3.1.9999
diff --git a/sys-apps/calculate-i18n/Manifest b/sys-apps/calculate-i18n/Manifest
index 98d5386c0..0316acd96 100644
--- a/sys-apps/calculate-i18n/Manifest
+++ b/sys-apps/calculate-i18n/Manifest
@@ -11,7 +11,7 @@ DIST calculate-i18n-3.1.0_alpha4.tar.bz2 45846 SHA256 b9668bac9e13dd0f28a6b2bce2
 EBUILD calculate-i18n-2.2.29.ebuild 767 SHA256 e611ab3d190c836638c6e58005509c0c03464bd387bd4244071ba2931ff732f5 SHA512 6777dd2819905885949c20c58b2aa5bbc0432d2f680a793f0821cc0152eab3dde85a054869d7506b994b1776b6677a6a9e1ccb910d55a8fe619623361f395c14 WHIRLPOOL 436869eca19aaa79160296d5e5a10a539d1e3e7198fd0cda2f31870f45c1f29ca7cb8502badec58e37d1ccc8be0b7ce19c32e57240c18e375cbec1b5968c182d
 EBUILD calculate-i18n-2.2.30-r1.ebuild 911 SHA256 e8b93ba79e0b90675b313969903b4ed50f099faa40271dd29a808ea811cf66b9 SHA512 7035d96915cac74838c0955e87fd2bf8eb02e793cf38a543337cb99d72954869d8156b373ead3663a80839f2aa69c76269b9365e63059c8e0b69228d4d996146 WHIRLPOOL 399a8b971be90920bf0747ac1d3907404d0e768be26dd437c4d25a917e31c1e63ab9049dadb05389985ee0d780f4924e33d1dc587c8dc9c8b3c6828405a408b2
 EBUILD calculate-i18n-2.2.30.ebuild 767 SHA256 e611ab3d190c836638c6e58005509c0c03464bd387bd4244071ba2931ff732f5 SHA512 6777dd2819905885949c20c58b2aa5bbc0432d2f680a793f0821cc0152eab3dde85a054869d7506b994b1776b6677a6a9e1ccb910d55a8fe619623361f395c14 WHIRLPOOL 436869eca19aaa79160296d5e5a10a539d1e3e7198fd0cda2f31870f45c1f29ca7cb8502badec58e37d1ccc8be0b7ce19c32e57240c18e375cbec1b5968c182d
-EBUILD calculate-i18n-2.2.9999.ebuild 781 SHA256 45157f2d8623b64f7aef2036874580387c2aff4b002f0640971958e002707aac SHA512 35a9ceecf9506dd77f11d38057952fa284136bce641284940ffb49449c00a82ee4a1b33b4bc36fbf1098d800657be44faa31810f4adbd8d669fe2e9bc84902af WHIRLPOOL b39b3fda4496edacb3feba0437affdb2ac2c97494c849ebeb4e99286657baf94842888b48a274ebb5469422f2c77f5d6988776e74cb1502ee5fa9245fc77a273
+EBUILD calculate-i18n-2.2.9999.ebuild 770 SHA256 2c38668205a788dd9d1ed413eba96a4f628a14e6f6c7a1ba8718bbcb0842a1ca SHA512 4ddb81ebd5b5c488d7eaad86172394d502e965f5348594054ba104bf706b830987e8f57b60893898e5167184eba1b0b108a683c954c8f80498665fe069504810 WHIRLPOOL 8c0063a90e103e6bf34d4be221aeb086703688830fe3179dbd177750cb179432ec2055886330f99ba8eada65abe97fc805da90ed9f257f8c87d7384611fa677d
 EBUILD calculate-i18n-3.0.0.ebuild 581 SHA256 eaa89dc472187d575564cec64cf9733a53b11fe2c3f91e9742c90f9bdb9a99dc SHA512 60ffff19e7d129d7307a1e423cb221b6e21af47719ac35188fdd9f532df74bba1d411b46000dc4d1209f6cb71e15abe54a3fa9e26b1f3cb0fb1b747dfb461f10 WHIRLPOOL 43badd845e4b3a26eb35ed7f3724feb00f3fa4d6ae2e2f6aecb042ccef8460a119c78381500d1e098356d17a68192801437fc217c570a0ddfe8a342ab399647e
 EBUILD calculate-i18n-3.0.1.ebuild 581 SHA256 6b52df942121cf4ca81bf56f3578bea37ee7265cb7ba6ea4d7ed5c4a6c6ee6fb SHA512 7a2ead727be025ffc94872ed2e613f89086089bae22e032d1fc3b5fd5b28e174991cb1d8220e0c7c7904c52d875a73d9347c293bb16ca83a30a7d861c0e9d026 WHIRLPOOL 66798c0287c9e790255230b527d8f1ca2fe0877d705895faaab3943d198496959cb5e4edc65660d1c88c129d26c63a0abba3a658dfc845ca0914765625074aaa
 EBUILD calculate-i18n-3.0.2.ebuild 581 SHA256 aaf0648cc9e26e76e7c86fa0d9ad0841e68ab092054cef0f12f7747c23f02ecd SHA512 e6eddb1a85f106bc34f4542bbd5959880e46d28f487b332e5923b5fef1808c53cf29d4f6535fc913f5105ba3bf5fba7aff2b61d7cfe9547992bcf10a7ddb06fc WHIRLPOOL c095512a012d3630b358ce9d103aa4ce69bc3b019b9ef4a3d50b7d96d3cd907214de3dbfa5f2da03f4415e2ed5b6a29d963f3feb6c4bb00d201b33e96f051218
@@ -19,6 +19,6 @@ EBUILD calculate-i18n-3.1.0_alpha1.ebuild 579 SHA256 33ce253310d67f051986d8e9341
 EBUILD calculate-i18n-3.1.0_alpha2.ebuild 579 SHA256 7848245e0e2c8dfa3de13e6e805b505e825f2de3ec84284fade24dcc3012cf80 SHA512 4ffd98ec1eb9408ec756742c744fdc3f886043f1e2ddc3f4b6f9e7f401eb51d33926e1f9a0b0364bc61f4352daef09c9280e92767c323110ef43168403f47a89 WHIRLPOOL 913ab18fe935e37bbcddffcb68f4a184b4f1b7d8b06ad24d83b24c0ccfb075d9e17f3065f2b6bead25eedb7c134e66727784cf338335c32daf394ed3879a3f76
 EBUILD calculate-i18n-3.1.0_alpha3.ebuild 579 SHA256 9d59107fb0367ef7b79269a65ef7289487e4607678cb1d4ac703eab93d562024 SHA512 c6fafb7c6136db55f9dbf6b196105b8fe972f066f5b927e4365d7e6219402430c9b69068cfaef220021eecb919efd058440101b054d91c919ed80fdb339244a2 WHIRLPOOL db392d3c7be73e61fe579cdb5fe632e02fb2e0c1c00203e9b80e459240f6d201b94456866a6b46cdc4aeaa828af1d145e6950d0e3ae42a9e32d05cd62e3d1e8b
 EBUILD calculate-i18n-3.1.0_alpha4.ebuild 579 SHA256 14b629b340ed778924966c6a6c2299a5711fd8edcefd5a016b1a5f21fae5e684 SHA512 80aecd746794607e85e128e576aa33544587a1d2ac9334b9c425b84dd73184360473d8744d64e70e94ee412fa8f83899b91b1547470fd4e17f53c2e83cef3ebb WHIRLPOOL aafc40c49b846e92a8622296049e0c8104d9dfd2c893ac4d6384a022d5b1d484cf7568655a95b5b986db78f2221cc2aa85a412174a57425da1879069b5e13813
-EBUILD calculate-i18n-3.1.9999.ebuild 594 SHA256 d6f8dd99f688b8423f8e86219b21015b0cdf7e37ae98d8987a4f8167f5657ae0 SHA512 fb3aae0cccb99771df5e219a32b6b2451d271a1dfcdee028f56e7fcb12c5cc4e8a6f222dab89ef3ac1e5d6156b2d06204d29374d699f413cf4b9d638b8d2fcab WHIRLPOOL 690062eae9e6ddb934b1b86582ece9a195a27e831e71f5cc70ed476387da89d627e07d5e12851a3ef35d3f464c7dfd2692f3e43e3ead611dfca70025fc2d0315
+EBUILD calculate-i18n-3.1.9999.ebuild 583 SHA256 aa60c513b0f672aa9618bfd8099fefaf49fa5ef9b24ee2645356da69563032fa SHA512 14b87ddb0f910e1b983ef465efdc56347abe01d4cdc11d6d81d593a2e65dcba1b79357d37952d7aa7f800fad8d30592db2e337d0fc6ca9807bdba618aff48528 WHIRLPOOL 14a1c4f1ef646aee28934e820763bd149e37860cce1ee34ac2229742980ec178fc43ba284b59a2f71a740cfa8e48ff7658a613b03eb0f84d4a10cefdd65450da
 MISC ChangeLog 6384 SHA256 effc6918170f5331b649c7c25ccbbc971a71320be1be056da843adff998c5054 SHA512 5cca782e736ad7b526e434e7f4e1a3ed32bebf98704fda17751f3a8aa8b94896a2864f12edd4aa3fafdbc567db8282efa6355b2313cc119b275b87a756991d31 WHIRLPOOL e24811fac9e15f95144c27b27ae2509effcb3359aa24a9338ec88faffbe0588049367ac3fb8e2c9d823a1e259b1cac3c8503124aa161a9be598a209adffab56e
 MISC metadata.xml 276 SHA256 a2312171d1cbfac41a263c0be692d3d12cfa3aab51979af64487824ae674bc2c SHA512 245463edebeceaa340b3e908e9d9a867be6468f00a1f1371b0c81c34e8f0adab2fa0985a2d47bcea7ae222bc481a4da934b8c1386ea664caed110058fb5cbf03 WHIRLPOOL 6b92e6af676bdd0f173df32a5751a16b88c39e8d10f16b7c8867d18a3c4cb4a44938231c315d9e76c8995cb68a8680e858bd984e6649a4470e03d594a0e23ba2
diff --git a/sys-apps/calculate-i18n/calculate-i18n-2.2.9999.ebuild b/sys-apps/calculate-i18n/calculate-i18n-2.2.9999.ebuild
index aa5f1f819..90db7aa57 100644
--- a/sys-apps/calculate-i18n/calculate-i18n-2.2.9999.ebuild
+++ b/sys-apps/calculate-i18n/calculate-i18n-2.2.9999.ebuild
@@ -16,7 +16,7 @@ DESCRIPTION="The internationalization package for calculate utilities"
 HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS=""
 
 RDEPEND=">=sys-apps/calculate-lib-2.2.19
 	!<sys-apps/calculate-install-2.2.19
diff --git a/sys-apps/calculate-i18n/calculate-i18n-3.1.9999.ebuild b/sys-apps/calculate-i18n/calculate-i18n-3.1.9999.ebuild
index 767def18d..804ca07b9 100644
--- a/sys-apps/calculate-i18n/calculate-i18n-3.1.9999.ebuild
+++ b/sys-apps/calculate-i18n/calculate-i18n-3.1.9999.ebuild
@@ -16,7 +16,7 @@ DESCRIPTION="The internationalization package for calculate utilities"
 HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
 LICENSE="Apache-2.0"
 SLOT="3"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS=""
 
 RDEPEND=">=sys-apps/calculate-lib-2.2.19"
 
diff --git a/sys-apps/calculate-install/Manifest b/sys-apps/calculate-install/Manifest
index adf8481c1..fac16a024 100644
--- a/sys-apps/calculate-install/Manifest
+++ b/sys-apps/calculate-install/Manifest
@@ -16,7 +16,7 @@ DIST calculate-install-3.1.0_alpha2.tar.bz2 74371 SHA256 48aacc07d31e28e216a298a
 DIST calculate-install-3.1.0_alpha3.tar.bz2 74421 SHA256 aeb702e877da73989a1186ab279539126b23ada46a42ef5cabc8a8dcda0006a4 SHA512 a0c49f57c0193613b136f7013f3e6fe2413562c03689d32a5b3c6cb9ca551f778577af440cb4b54e88928bf1ae6d398d74a65904010c21034b8f47d2e10f1077 WHIRLPOOL d97c60ee3de34d9accc82e0c40fa92faeeaebc8382b7be1632d956c288bd2ba8c1104baa35be300e8f1f134e74c3869c4ec7a4370a496e22f4dfc7a6145e09a5
 DIST calculate-install-3.1.0_alpha4.tar.bz2 74389 SHA256 4f6b601ecca70a4c1cc96d7e0cdd71803b49edd6a9567bc5d90333953b60c688 SHA512 ee6c07a998f2d99ea4896771126d80d21c270b2fa2b038b78c4d31ba0336a798de3b4f51a5fa847b17436eab68f649c5e8c12ef009ef4aed2f6744336b533f2d WHIRLPOOL 0b9a403016eb54b2d04c99b888ac8933a67cd4be7ef04f8f2cc82eddf53422414e68027e9ef8a1bae8d43eedbac9774f9c4b917eeb7b0451d079f63cd616aaac
 EBUILD calculate-install-2.2.29.ebuild 971 SHA256 e8d5ab28d1b5bcf9433acb8505dbb538d48148589505286074b7b45ee7377937 SHA512 13e6893e81b9319f886d51771cdff76016f9e08ded11a1f16aafcb1a577ed4fa71cc611ba9c584c01a9f562548c1791d38816d6005184ad2806d24cb456cbc92 WHIRLPOOL 764044fe4b9bec5892159c285499beb065197c44c18657dfb8225b86177266285c7834cd66d62ea0be44aef067bbda2be7cc3f12bcf694f94fe88da92c00017a
-EBUILD calculate-install-2.2.9999.ebuild 696 SHA256 333a0780c74806ee4ef32883ff1895adc24cb6e88afbae11fb3d1100b4d0a8e7 SHA512 5de03c6950bdcaa08cab905139dde4a4a9a0adfdbc33dee19cae4d595ec2ab463f5f8e4fe033708d09b960d7fbe4c046bf1aa9e362237a4130b87012be42fff1 WHIRLPOOL 0e1976c0e6b22bd9ac705155a58294ccbe246370fddc0032c0149787d12d58e345da5e60fe542a72f27534e0445c5bb84a952ceb692017ca43ae7cdf81982624
+EBUILD calculate-install-2.2.9999.ebuild 685 SHA256 5b6fe8d4f7c8109f9adcdfa6546bb253c9f04e1d10dc6b1aa6b1087c2486d096 SHA512 0b74f8bb94ba419869cc209963bc8f79cd98e4ffdd95b400f3e6c80d32da23ed314c3ec6bca6163f32e64c6dbdb1503a23e68d49c8f011c762a77b03bc94a326 WHIRLPOOL 5c9e1acddd461064c67e152429e98651298c54c8e4a7f5c9c419cda4045b6a1b5221a5bbfc3c95dd03b48f157d40e1a37e8f7e42e9aacff4575851150cbdb9a4
 EBUILD calculate-install-3.0.0-r1.ebuild 1234 SHA256 7eb9a22d9560c6f1adcfa9e93b46485b071ac27aa51a3dee15d894540ae15522 SHA512 8647a02c5915abe4f0c24c4aee792b7282a4fa93e381ed6f71eb0688209c858d495375754f83c138db92d6cebd693d485c3b126992ec3b1a7e2295a11edb1afb WHIRLPOOL fed7162b49953ae22e1d4bbe6be5de4099bafb65af7f2b84b9f35e7bdbdbe60348b1ca9ec8d77f7b0203386f0943d62dc861242a56c051f96b2d8ec84a4c6bbe
 EBUILD calculate-install-3.0.0-r2.ebuild 1364 SHA256 3504c06dc6df44d57384c5c3130e0c81d2d51fd554fbdb5fd426e436c807c6c1 SHA512 912f8f056a9c3c7cb4006522b81b3f980211be4029c8f792a96b5bcbc3477ff4d75b714a797a8c7f7501204f102bb95b9c835c57f77380fe6d8744af5c0c2e06 WHIRLPOOL e36efcea9f6fe0a345bf9341b62533c1b6046aa51142cae65fb95ea4cee9c4c29fe3a4c522b4cdf3f8d5366c4cb011fc46fdbaf25ae9c5d356be7923662c7299
 EBUILD calculate-install-3.0.0-r3.ebuild 1221 SHA256 5e808d8acf662d5f11dc92109359f10bfd9814874a2eba0e38ad0620b4231b1f SHA512 81af382126dee583415d3b0619162fd8dede9357bbdac1ddda40a6e005b72c583ddc6cfbc5670b393733a05dd3290b27d1b6b7903a2f13a179bf3f643b9e34e0 WHIRLPOOL 485940b696bdc803cbd1d9fd91bc3296dc2da466f73e62d97aa6fcebf1287b3bc50a8b2e18aad4e29593f8c1c869e67c32525885237280807df251c0976819e9
@@ -34,6 +34,6 @@ EBUILD calculate-install-3.1.0_alpha1.ebuild 903 SHA256 cbdc5c5f018359f00799dbea
 EBUILD calculate-install-3.1.0_alpha2.ebuild 903 SHA256 1f4321cc48b32978a202880e4bd5183886d4f5bdf32451d8d7bf1e1a9bbed185 SHA512 11b16c2c373cbd233dab03b5403f8ed5e5d9da9f49d6fba70980690d313dc431dbb264957441b86c84e303b46ab1dbfcc9d28f82f371df505a67f1fb5d248fc9 WHIRLPOOL 13eb782e44c0951617068a3f28706faebc0a65d89c2dddb1d20e9901fad22cba9e0327075fff7216ea3352a59c2268882da261cb755a72a29728ac058b3ec39a
 EBUILD calculate-install-3.1.0_alpha3.ebuild 903 SHA256 c352497e5b9a7fc9a4ea9ac590434bf32a98aa51c007c434d5a01f3703c3b541 SHA512 f237a2c73dedaa591cc007823f4fb939198970d5ae2816e68ff19b74d3d7e9b8ca8efbfc6e62d6ca9363bb75c5a6d8e54375d347ec5bdc0cd264ebce4d1701f4 WHIRLPOOL 783aebaf988270feaa7fc53d67b86f2c7dfaa7ce97b815b2075a5cd70f2959275c8635150c8c5af68a1e57a7063713c4e029089a627330571542817211f2f93e
 EBUILD calculate-install-3.1.0_alpha4.ebuild 903 SHA256 a0c81faeda0cde14a40592d4595e4d5d85f1d8dfd6102c666f683d73f3ac6a4c SHA512 1ff8de58851c1b4a3337fe57219769555252bc6171fa2cb62a4646bfaecf911fa0380c7ece61fd75b13b3d12fa2cdb746e5578578c2dbe01b1ce553d17ff100d WHIRLPOOL 7d63b1e92a615806173de0d45080c55f9e43681a6735502d19b239f02c72306d928bb7e1eae9f5dd2b80de88d6cf51e4338d548208baa60240c79cec175311cb
-EBUILD calculate-install-3.1.9999.ebuild 694 SHA256 dd5ae62a1dcee911b0c61265d9202bb0596929538a0ad918f7e08759dee7dd8c SHA512 096bdea2ba70699cbe936717f7479f618571cfec537a26500fb656aa066c1a4c2e28bfb1d644eaaf3686ef68c60da20321f575778840036dd55d86b71437248c WHIRLPOOL 288ee6a24a5825e3c6c1c0d2cf968608fdd846f7bed48fd7c0a74eb450459bda628e97c7127fc6be4d833fc65a4e26d95d7f4d7735f8c1cb0656fbd7bfefee95
+EBUILD calculate-install-3.1.9999.ebuild 683 SHA256 e97dd6f046d54a16eee281fa35790c92507b150bc940f3c2b36117e6f44f0a8d SHA512 c1179c500dcaa48506f6334e9e2ccc3cc70d712b2899d7e1d9265bc202f088ab71baa1aaea462deee56fdd5244bee4ab9b9a9da72f25ec511d4f2fa0c3c35f43 WHIRLPOOL 010d35b929fce496b5f16228688e23a95c9c87ebed0d290eeb454e5c1432b55b3b276dfb5786a27222543446a1090ce2f133d80373649fe72341b508d1e16a78
 MISC ChangeLog 33978 SHA256 a1cc544f9763b08b3647d90fac1ec53748016bb23260181315896c8c02431443 SHA512 11a09ba60fbc727bd47b57653b4bb0937d98774eb9ca95680a5b55997c7e22db3976cbd0878d908fa0200e04b6cc9eb0ae9ac6f1623235490e2e46e54cc1f7f4 WHIRLPOOL 50352c2950f301cbb5116b8c9972e592767dcb03bd71d081c75de5e69b2a920331abec4756658faf64e291bf6f4f41df67b8d62946683629a2c99b48274eb2f3
 MISC metadata.xml 464 SHA256 0e3ea52c58e77580b778f7efb9f476811c168febe02e656961c71a455e4f4d7d SHA512 dd79935fabf9b629ee0913eae0cec88b0d6e46fc58e9b430e07e2a60f2e0ce66e8c257a3da33e17663a778d2a18b3a12f96f18cbc6e009f071788ed9353e4a29 WHIRLPOOL 8f72663b95c36637d15d40e0c56e5fd9e7e06e073993d202d788df1704bb979e794cde966428675f158786e273ba5677151d15d8e40a4715f769172a8ebf3e1e
diff --git a/sys-apps/calculate-install/calculate-install-2.2.9999.ebuild b/sys-apps/calculate-install/calculate-install-2.2.9999.ebuild
index 5c88df364..32abaeb7a 100644
--- a/sys-apps/calculate-install/calculate-install-2.2.9999.ebuild
+++ b/sys-apps/calculate-install/calculate-install-2.2.9999.ebuild
@@ -15,7 +15,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=""
 IUSE="minimal"
 
 DEPEND="~sys-apps/calculate-lib-2.2.9999
diff --git a/sys-apps/calculate-install/calculate-install-3.1.9999.ebuild b/sys-apps/calculate-install/calculate-install-3.1.9999.ebuild
index ae42c0194..690d2eb07 100644
--- a/sys-apps/calculate-install/calculate-install-3.1.9999.ebuild
+++ b/sys-apps/calculate-install/calculate-install-3.1.9999.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="The program of installation Calculate Linux"
 HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
 LICENSE="Apache-2.0"
 SLOT="3"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS=""
 IUSE="minimal"
 
 DEPEND="~sys-apps/calculate-lib-3.1.9999
diff --git a/sys-apps/calculate-lib/Manifest b/sys-apps/calculate-lib/Manifest
index c37c96237..f40b63c8f 100644
--- a/sys-apps/calculate-lib/Manifest
+++ b/sys-apps/calculate-lib/Manifest
@@ -21,13 +21,13 @@ DIST calculate-lib-3.1.0_alpha2.tar.bz2 115728 SHA256 8fa4e23fb56dcc6ddfa902a8bb
 DIST calculate-lib-3.1.0_alpha3.tar.bz2 115722 SHA256 1e490bff72316a6cbff719763f5a38fd6918d14495f9acad6774fbe0cd96b307 SHA512 a75f7b085b9a0ca6e094137fc95122db6b3129bb1aeebcfff76d24f45453ade433c9d01886b9372a46efaf22dbe33adc65a7f35a932c0b897eac6d73907d5447 WHIRLPOOL 2b8f89e5383ce2749d78391c4b55ea97be25fcf1b6606fd20ef0108ae4f313345d38c4cdef0c215b1264dcde3dd1e961368cd5ca57755fc7e936e82b00d93634
 DIST calculate-lib-3.1.0_alpha4.tar.bz2 115693 SHA256 d7b40b116295ddc32748b4d40fab003d1a3a4e08c34ee11becbad21eb56d0dad SHA512 9e93812714d00117aed18b17674ad1cfb41f1178a9678a48c0fdc167f65abbc7a5fe3a99f58078da8b7c652ab8fc02305073d5fc665722a942bd71b4150dbcca WHIRLPOOL a27ef17c5bda98f680b4f016a813fd6321c313687362f4f293e8d7fb204a22120e12f4d916515674c089593cabeed8f9257bf736bef381dbe2e0329cfa30afcd
 EBUILD calculate-lib-2.1.11-r2.ebuild 893 SHA256 820abeeb7e79e713724cd5278fc17e94c0bd400a8af645b7d2f8808c887ea529 SHA512 e3ea1e8e9b5745ef3e0af4ae9409dbe81651670193d966bf5541bed6665eb0a563f27fe1afb85cb9c8b6ff8470cbcbd9a375d56230fc47dbf78fa26782cfdf76 WHIRLPOOL 99e46f926162086f607398a97be668f0a242b5571adc38624d5706907e9c14608e1fa70291cd6250f312a2a5b428f4f89aca81f6d0531d4150f2381ef857e051
-EBUILD calculate-lib-2.1.9999.ebuild 566 SHA256 77ae492c11f6eaca2e9c605621ccd46d08e3f928744de7f9a8f95937cc9005fc SHA512 6f8679554eb97ca128e382a92963ff15c2d8de3adef9082e83f38566ef1222c5f448bdedba3d41ad86699facef94e8065d0ad4e7a5cee827d6c743c070d417a6 WHIRLPOOL b19291a0da554fd6607df8afc81957ab979ff57789426e529318f16d8fc3b39a0be99427b7dd347100dd76339a3b833d0a86e19b27b15e4f4149aff3dcac9f3a
+EBUILD calculate-lib-2.1.9999.ebuild 555 SHA256 99ff8819b9aa2b46bab952f03b7c5bd8a9b8cb42453747cab6df775c004cd787 SHA512 c6f2c7b60c48e87d7e9f71945f0ed748805828988648fbe72b470e118fa652ad18e1d4798e3b749136f07b30f3c0951be4da191b7aab7ad6e2e2d074799c5f46 WHIRLPOOL 57ff64beb5eff94fab2cd3fd28f1ec84c72fb4aaea9077dce38819ec320d68b3e4c820c05705bdea7afaf751511fbaa03c4fa56f54654d687cd029883054148f
 EBUILD calculate-lib-2.2.29-r2.ebuild 907 SHA256 2a6717b1e0fc15152866d44556eac6df94683c8226d972f97a69e07ebcefffd5 SHA512 0fdb0d3df3d719a508504696b24132ac1761ce12d273c25c490578969cff3f9f5ae6c6aa7b9ddda6032e45dee356ddc495751dcc67214060831311f5bd781b8f WHIRLPOOL 7d2c5f47e2c79d1ebca3d889035fee3f8f5c90b178c5853a8f38e8b0b00373c38ef7e7bfd24f00e27e38f46fb2804aee1b415f385e19f458d6c2a75eb505a0fc
 EBUILD calculate-lib-2.2.29-r3.ebuild 1030 SHA256 0e813a86861e724c1e710270c466376c51568927339774afed43a61c32529fa1 SHA512 90362c4fd9d2b859ca643da31da1364cc9196561cf937a4122c366bdd772c9dc8fc11bcc4d6938402837a9628ef384c9bed35a61fa716e62bcd0d2860b0a5454 WHIRLPOOL 24ea15b2c2d60a1980e434f87ace4fa54adfa671717022211171efab473da2ad165d78513fb3840fde515d3d41ab1f57058ba3716442df1f1243791273502516
 EBUILD calculate-lib-2.2.29-r4.ebuild 1030 SHA256 0e813a86861e724c1e710270c466376c51568927339774afed43a61c32529fa1 SHA512 90362c4fd9d2b859ca643da31da1364cc9196561cf937a4122c366bdd772c9dc8fc11bcc4d6938402837a9628ef384c9bed35a61fa716e62bcd0d2860b0a5454 WHIRLPOOL 24ea15b2c2d60a1980e434f87ace4fa54adfa671717022211171efab473da2ad165d78513fb3840fde515d3d41ab1f57058ba3716442df1f1243791273502516
 EBUILD calculate-lib-2.2.29-r5.ebuild 1122 SHA256 701f542b61d2cff60c28278a74513ce48abb2fa4986faf156c7e5d2613009389 SHA512 53667242c1413ac8d3dd695282e0fff31ec9c71bccbef3557033efd3242f07e3577fd5c74e46aeb4cb8e1074eefaa2b4e4684603183309c608effe3d3119f9e8 WHIRLPOOL 0642f2b4ff65f2d2a759fce7471ea68543fe6f978f3d06f32741a6f2fb7742b1a449a45a3fb7bba1b7eb4dfc2381d7bfee352f6e653a9ad87d49d6d2ec6a18b8
 EBUILD calculate-lib-2.2.30.ebuild 770 SHA256 889273e755e58ef53871f85e3bcc7df2ef472953db98d757e5d92534273bf11a SHA512 9cd46d5c8a784304c8297460eb48406ee5712e2d11118e9d283895ed0996d897f1b5b32eb7907eba3347a43c6eaf5fae1c50cd98c146f6c6edec06cd31b7861d WHIRLPOOL ee1c5e7d3e8546599f08cd834a316a62e3d9e5eef2209da24dd44676fdcaac9eb02d83be37db5d8275f5dbd7f464f40ba91790b2d6c85ae34a659369eb7162ff
-EBUILD calculate-lib-2.2.9999.ebuild 741 SHA256 49daa77ce88484438f3afbd1af7d3391589bdc9eed1e42dd61e123e9ee51260f SHA512 0ff0d6757afd4375888e956ac5195139ee59b889c87dc513ebb7fce9f28010e238a2b8d7e41cdc089cefb4860d971a262a369a615255645cd6746fa48fb5a9a2 WHIRLPOOL e50ed9e774f4c614c91497c1ca53a915f109cc587fe2244eb620afbddbdd70c57fb565a8a3fd60c3b392374c6349d6561f9ceb715808c07384cfda8eda9b8653
+EBUILD calculate-lib-2.2.9999.ebuild 730 SHA256 ce7f2300859687d4f6c50948438bee8a8cb407fd7de56c5c48e0aba846ee6774 SHA512 789179018d82ef7c9a5428de20f529e6071380174d1e417c3a4463859d4b9ceca2a2d4ae078dbe309b976541cfba81a30348a77b6b37089b9597b862d4a45fd8 WHIRLPOOL 380084a24bf396c79fd198e1ad51d2457dcbcc5d3b59420f3794d067949cf7951766a880639bd54399f371ed0961163a03f8ea8a5e2483e512243d57408251be
 EBUILD calculate-lib-3.0.0-r1.ebuild 797 SHA256 b4c446e6824ca8426cf3b94bd174f04310a50374923f697884db80e5b7ca5e17 SHA512 249e11041e4da9ec988dd409d94d711d3a9b3ec8dea81f979484747817ad381faae7c1febe0fbdaacedfc8f2d50da1226837f0c4942e59896bf1c10c1184356a WHIRLPOOL d7531ac8823c7563520ba2293b155c5e526f88b8262f624ec8378661e4ce669db78ee1d3c5fd6297213a43930927b0364a95d4f9c28fea0940141b4e93d55826
 EBUILD calculate-lib-3.0.0-r2.ebuild 876 SHA256 4223d10b987a9e9881ab7abbec85e5e783ac14f722111b3d7acea54c529bf2fd SHA512 427de25237b2615c576d8e2280b4195b78f2842427bd73552cd6af7a84854370f15d640cce016e084343472acd61408f96fda0e7855ec1de3c74d6433f381d34 WHIRLPOOL 2ebac0c80133df53779812c45ecaf1396b92710192c29a5295d95af5844f3df655c452d8a09a916855c52952fd31bbc28203fbc9a7439ba7c9a74d9797311ba7
 EBUILD calculate-lib-3.0.0-r3.ebuild 998 SHA256 14bffde5023e6f02b30652af6089fe6e66b105e8776b021ca6cad76bc035d542 SHA512 85a5a1197d9c09247ecb6cd832578a492d9d08c969781ba460b225b51d2a90dae494f903bdb0d39c5208bec4c346fc4b921ca55a457220751180ea7d377522fb WHIRLPOOL 14dbc41434bac12688e8669097a65639761944b29368af4c289c671e230166238ff3125c11502d54f0c89e37b99ad33499cb05e2cdb7b4bd11d5db968ea3031f
@@ -43,6 +43,6 @@ EBUILD calculate-lib-3.1.0_alpha1.ebuild 681 SHA256 6a6332013e5a56db775c6490b63b
 EBUILD calculate-lib-3.1.0_alpha2.ebuild 681 SHA256 6a6332013e5a56db775c6490b63b60f959528660b0982e6a414f1614c0b0ffa5 SHA512 19a71823543fe843a05a548207509ee4dcffa784c61e23c56cf17d2c651effbfc63914beb03f0977b804c5cc647407eecdcbdaed4d7478783bec46eee72a50fb WHIRLPOOL 5ffd414c804671057fe2a7a2176999eee0a75574a5043332d3c01f08b93635773800e6b5d9901993e4fbf7f95d175659d621be9231d08f8bdada2654e45f8e1d
 EBUILD calculate-lib-3.1.0_alpha3.ebuild 681 SHA256 6a6332013e5a56db775c6490b63b60f959528660b0982e6a414f1614c0b0ffa5 SHA512 19a71823543fe843a05a548207509ee4dcffa784c61e23c56cf17d2c651effbfc63914beb03f0977b804c5cc647407eecdcbdaed4d7478783bec46eee72a50fb WHIRLPOOL 5ffd414c804671057fe2a7a2176999eee0a75574a5043332d3c01f08b93635773800e6b5d9901993e4fbf7f95d175659d621be9231d08f8bdada2654e45f8e1d
 EBUILD calculate-lib-3.1.0_alpha4.ebuild 681 SHA256 6a6332013e5a56db775c6490b63b60f959528660b0982e6a414f1614c0b0ffa5 SHA512 19a71823543fe843a05a548207509ee4dcffa784c61e23c56cf17d2c651effbfc63914beb03f0977b804c5cc647407eecdcbdaed4d7478783bec46eee72a50fb WHIRLPOOL 5ffd414c804671057fe2a7a2176999eee0a75574a5043332d3c01f08b93635773800e6b5d9901993e4fbf7f95d175659d621be9231d08f8bdada2654e45f8e1d
-EBUILD calculate-lib-3.1.9999.ebuild 719 SHA256 5de5bc693735cbf24c7ceeb9882ed338c9cb186b5ea6be18e279d2102ec4dac3 SHA512 896352c27de758e598940c4d447d162911aba3c5e5650a447b10a5b96fc16615917caba5113aba4a3cd8b2e71c382d4089ebe568567c35c9068f116dee236262 WHIRLPOOL 1d78117009ec3c84d1e93a2f8f2df2c313c6b178832135fe5353e04ddc141e72185962ac29ded1eefd058eefbb20e0f81305eb659dfaafcda45f1614b40da63f
+EBUILD calculate-lib-3.1.9999.ebuild 708 SHA256 a1d64b7f014831bf6b0a38928d53cb55758b7a12e5f3e98fffd28025ffacbce1 SHA512 3873859a791941d421e2338b437521955da383ce986408f1a951305e2dd75a1a4f771c9ec2caa096c5c8ea6a1776d6d0ed99e025ffa786ba029cafdbadfa439b WHIRLPOOL 5ac1a10b53f810ab527a0ebe52bc87e8397e61375cf6e0acbed89d8f6b8385e72bf234e0fdce479c3a3f1652bb6e520710ce9356750a97d644c0db0a33f6facb
 MISC ChangeLog 29851 SHA256 16ca15c794bce78eefc487ed372c3d4960078fbd4c5fe4524211688d0146ef97 SHA512 be6bdf290f391529dce0deb67bf9d367e42e407601dd581f7c08d082399b5860cff2a76d4d64dd876154d51e84f34499db06c715145ac64f78d168aae7e78dbf WHIRLPOOL 2561ccd1eefe3423d97c67aff5c0fe6c8ca624e527fb885b042c8e812194bb1635d7e7d7d86c534562eb780c6b9144d92e24893f2d0696cf8a34a6a912a45788
 MISC metadata.xml 303 SHA256 181519d9679fd9aee9a7a9806733a50728d3da0b1e0ad54f31499200f7f5c6ec SHA512 41ee4564dbc1cc726a3aa9e49c403f639ed5a9317ee3e5e6bc1ef20bea2dfb7468b3fec57b14c377309f0a0784c552819b615e9bd75a0a23274e493d192e6f8b WHIRLPOOL 4dc60b993c26cc33eebb8b316d8943db7339a66cbcb4e21e0badd3cf22295d458d2c5ac6ace923e0721820536d5ec425f9bf7dd51e722be3f495e021b2dc3fd4
diff --git a/sys-apps/calculate-lib/calculate-lib-2.1.9999.ebuild b/sys-apps/calculate-lib/calculate-lib-2.1.9999.ebuild
index 57522a1f7..a97d71258 100644
--- a/sys-apps/calculate-lib/calculate-lib-2.1.9999.ebuild
+++ b/sys-apps/calculate-lib/calculate-lib-2.1.9999.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="The library for Calculate 2"
 HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS=""
 IUSE=""
 
 DEPEND=">=dev-python/python-ldap-2.0[ssl]
diff --git a/sys-apps/calculate-lib/calculate-lib-2.2.9999.ebuild b/sys-apps/calculate-lib/calculate-lib-2.2.9999.ebuild
index 41c460b22..eb0dbddd9 100644
--- a/sys-apps/calculate-lib/calculate-lib-2.2.9999.ebuild
+++ b/sys-apps/calculate-lib/calculate-lib-2.2.9999.ebuild
@@ -15,7 +15,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=""
 IUSE="minimal"
 
 DEPEND="~sys-apps/calculate-templates-2.2.9999
diff --git a/sys-apps/calculate-lib/calculate-lib-3.1.9999.ebuild b/sys-apps/calculate-lib/calculate-lib-3.1.9999.ebuild
index 1f4cd65be..bd72e3aba 100644
--- a/sys-apps/calculate-lib/calculate-lib-3.1.9999.ebuild
+++ b/sys-apps/calculate-lib/calculate-lib-3.1.9999.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="The library for Calculate 2"
 HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
 LICENSE="Apache-2.0"
 SLOT="3"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS=""
 IUSE="minimal"
 
 DEPEND="!<sys-apps/calculate-lib-2.1.8-r1
diff --git a/sys-apps/calculate-server/Manifest b/sys-apps/calculate-server/Manifest
index 6c49a59fa..ffa46cffa 100644
--- a/sys-apps/calculate-server/Manifest
+++ b/sys-apps/calculate-server/Manifest
@@ -14,6 +14,6 @@ EBUILD calculate-server-2.1.16-r2.ebuild 5592 SHA256 ac68c2877e4493204f66a4e530d
 EBUILD calculate-server-2.1.16-r3.ebuild 5670 SHA256 d13a40c9d5d1f167742894896c13018b78e15eca2704b55825f4bfd41e553128 SHA512 1a9de72fa82d752fc71793591855b06ca39a132ff0083b1a94399b5da4079a9b923b3046886c75b50d9877fa3c7de4f70a0a7bbe897b8379d9925172019a9014 WHIRLPOOL a4573862f46398a14d9eaed2df564c5072991faebecd685bded025bf70d7beea0b8bff269631e7b53d9460c9541a715a30249cd8af7ab652d5a5cd69d7cad81a
 EBUILD calculate-server-2.1.16-r4.ebuild 5760 SHA256 6cc92c9dc6bf948263ad1f6dce0dd8ffa21b7bb44bdfcadee0778cb5630b8c2b SHA512 0809903be948527b23cc7c53d37a4fca6996928f862185f334d54704b9545f1406efffcd16d9544f9195d8760d2133088ec45f809041a70c87d1c45becf47414 WHIRLPOOL 3cefd9ef1dd6a99f315d4e099c8cc1ce16a80f3895b0a155640bfd8c1eb9ce19b773e9dc57f9e9d5ce1b4b114bdf33fc55ec9737a4b531562368c4f534f30501
 EBUILD calculate-server-2.1.16.ebuild 5385 SHA256 e8725df59a5a7fe7ec2e855a6e3c7fff2e72b1182ec06173afb462dec035ba7f SHA512 f41e66d7300fb014acd763aeae9551979236aeece5552bcab764fd066c35ddc0b3076617f9c94e58c4383f1376c7ad52246cecb135615436196f03bde60c696b WHIRLPOOL d216abfbcb42554ace72180b914cb3f21d21449d0b3761e4b819ddacf12aeecfbe1eee7a99da277f12eb66515db2d538946cdf1f90e542c33764d93c1c7d5ba3
-EBUILD calculate-server-2.1.9999.ebuild 1122 SHA256 e2c8e01cbf08f07e29007346f6b69b2452715ec381aeec954e88d44a282ae1ae SHA512 7c8eefbfc1825606664d80b015b6796c18ec694c400900532078cbe50bf7922dc5aa4c9301af58b1c3b0a6d9ff00da71fd2671dadbef970394ca85212acbcc25 WHIRLPOOL 0f83a53ce05e3240f4f8faa117ab7f4b7273cfe3baaf803a39a50ed426c96629759c6d9392c04a5fee67c9c49457d1e95ae179e74733b5efedb32c1d9b834353
+EBUILD calculate-server-2.1.9999.ebuild 1111 SHA256 32d0430c1e06acb1b9928ab30a69acddd19d1c8f28429a86bb48221ad23b8be4 SHA512 2cfb577b876c441361fb141412599daf80518787f08216d146c8729735cb76304819bab63a52da84410820e4451d0f20b2a4081e95b07efa804c02249208acf8 WHIRLPOOL 3f2db351e0c3aa7c57c9205baafc41ed686aa5cbc8015274670da75dc51f9dea17a2a15ec3e4a0f944b5f2bd709408501df1f89ef62787619bed20a4fb234d6b
 MISC ChangeLog 8940 SHA256 d17edb3f2a5ed7acf057ddb04e31045bae2e8b46e26704d1ebbb08df079d23bd SHA512 e79568d5acf396c56cbf5726812c327d7849d1b5d566dffc1a8b588a79fb9dcd994e1fdb5a152fc96ee53ca468eadeeefe7236baaad7262005b8deb7a2b89a6f WHIRLPOOL b0bbaadc2a2d20c2d6290feb7d50015385e283c97bd5c657cb434e55bdbfd5adefcb0a580dbd450a232677eb280a1ef14aa9b67c1d7b6c41e55caeb50bfeb631
 MISC metadata.xml 286 SHA256 aab7ddde310df96da76277d5ae340a4b0926bec3b354bfb2fea3288081036d74 SHA512 0e77fc33cffd206b5321472357e4059880cebd77ab409c63cce32d7555e207b88097920a4d9fb4b6e970aef156dc49a501def814e58545f3c82061c3db44f020 WHIRLPOOL 7ae18294b0f64491a7d6fc48ce681a3f0ff1611c1827d492352f823da3a6d9cbfaf935bc19ecfaee2086f7b767b042e5fd6373ff4db7fad8b94aee1b6e022a67
diff --git a/sys-apps/calculate-server/calculate-server-2.1.9999.ebuild b/sys-apps/calculate-server/calculate-server-2.1.9999.ebuild
index 74251f918..885667a68 100644
--- a/sys-apps/calculate-server/calculate-server-2.1.9999.ebuild
+++ b/sys-apps/calculate-server/calculate-server-2.1.9999.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="The program for configuring services Linux"
 HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS=""
 
 IUSE=""
 
diff --git a/sys-apps/calculate-templates/Manifest b/sys-apps/calculate-templates/Manifest
index e66a3a0f2..8509e61ba 100644
--- a/sys-apps/calculate-templates/Manifest
+++ b/sys-apps/calculate-templates/Manifest
@@ -1,3 +1,3 @@
-EBUILD calculate-templates-2.2.9999.ebuild 588 SHA256 2cbfb74187bc5d197ea7d2187d570b8e1981eba5f724623d44f461435a25d5a6 SHA512 2ef5c96f588e6bcd668912bc4cae25f0e5cf49e52cab821ddd3c79947f6130890e559c6813d79b22adc954f23424d5c80b5cc50ca8f521fa595008a16b535650 WHIRLPOOL e22c87cb356e156269eb6dff88212013dbee51033bdfe278ee0d2ae4f390e1bb06da8981d5d4de8f437fcf6efe331fe2246b6b11a54090a0fa4b753cc4c41d4d
+EBUILD calculate-templates-2.2.9999.ebuild 577 SHA256 7ba6ef86a66938d649837519106de8682f7a6eda1e5298191db4a37ed71c108d SHA512 575a5503d029e68cce587274d199763735c16def5a9fa83ec268078b3f87bedc060a1fd53504c1ec10ea58ade41a5a05f7c9b4528235b08a5cfa878f758b54eb WHIRLPOOL e8b8b5678d22b29ccff5c982cd4472750e594f3c34d0f0f47f746c80f7b3c1568e78ff1f949c21e06d1f6f49fd5f18bc8774399bca7f7aa76ed7ccd5fb41434d
 MISC ChangeLog 39824 SHA256 0ed65457950639a1f5b080a79ea8931d092ba1f062b91fba0ead923bcdc76b9f SHA512 a439dac679281120376f1e550ee1021dbe057d8524535b45f13e19f3b2c0582b2fefb712bced7c9f724f3060b1e2c02d4feddef617438e4d364b4054ea476876 WHIRLPOOL bc7410ac9cbeecf99800a13ba9e77dc8f3ec559b8f545e266101f40e732807fabeb627039e80a1837f57ad590cf4e08ba06d45cb7a95193f3a068a52ff871451
 MISC metadata.xml 338 SHA256 175d9ae86b71b291a519414e816b05290d0e4be74726cc8d5449a500c51a3b2d SHA512 d4807f7495de3adf6283016f144d0ab94505767a777797d6ca0908bf5b8eeff61a7dfb6ec25cdacd9770a51ff9b5738c8605461239136f2da76715185e765f5c WHIRLPOOL ef20a3b1bcb04ed814060fb732703fab5df370aec7c28fb088631799356bd8cf56cf7d3f0d01aae7dc09e913bd9fdfaf40ede410ef9d4554831785fa30b73b12
diff --git a/sys-apps/calculate-templates/calculate-templates-2.2.9999.ebuild b/sys-apps/calculate-templates/calculate-templates-2.2.9999.ebuild
index 48244ae35..4245c4400 100644
--- a/sys-apps/calculate-templates/calculate-templates-2.2.9999.ebuild
+++ b/sys-apps/calculate-templates/calculate-templates-2.2.9999.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Templates for calculate utilities 2.2"
 HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS=""
 
 DEPEND="!=sys-apps/calculate-lib-2.2.0.0_rc1"
 
diff --git a/sys-apps/calculate-utilities/Manifest b/sys-apps/calculate-utilities/Manifest
index facfcf6e5..604e4660d 100644
--- a/sys-apps/calculate-utilities/Manifest
+++ b/sys-apps/calculate-utilities/Manifest
@@ -48,5 +48,5 @@ EBUILD calculate-utilities-3.1.0_alpha1.ebuild 763 SHA256 efaeaf827536c7e0b59670
 EBUILD calculate-utilities-3.1.0_alpha2.ebuild 763 SHA256 942873232ce007b62d6dd264f7591c326d5c06ca198619198178d6899f9d285d SHA512 ae28527a419faa39eff49b87758e9b78d048f5a14b43837e4f9a981d1f4423d5b7c8339773cb197f204cf404aef7fdd8e5ea0f43c329281afc8ec238bb26078a WHIRLPOOL a82e3ab1c850beac3fc4eb3a567e440b7928665611f77129cb9aa8640a297e340fccd3dcff4d38406ef442bd51ca3c851d750e166dde9f6c564174932abb1c10
 EBUILD calculate-utilities-3.1.0_alpha3.ebuild 763 SHA256 ad6a855a9253dfacf1a1ea9e6a59acd34f6f4a6715f73f3c6f0c96d6069b3129 SHA512 4200227595e5a5de3dd523ddfd3dbe29c344fd305dcff1fe323235a5e2e63c11d72d58a987800f7c97a493dd25b8495efdfa53f18071052b27216a600942e88d WHIRLPOOL 8d9d4f774ff009d8ae76a1ba6d2f6203e50dbbb96b9204f3c03a0421c74add1978ca5b889b4e6433ad87d6f09a289b46c15effef433be1fb8d3db2c0bf5d92a4
 EBUILD calculate-utilities-3.1.0_alpha4.ebuild 763 SHA256 f176e46a501eb49fa74dc3c5a19cbaf00b4eacc5064cfbb57b48684f77ca5d96 SHA512 b7900ee79b18708d12d76c6be3876df04fff35d1ea78b8d4744b86be7bde708ebd4bc5b680b904fd602994322b43e932697e5c7ed4e351179c85d5f051332d5f WHIRLPOOL a6f1ad8eafbbc4472b38aefa6c560e5fb1ede9acb5b9ad6f4ff9a334fd1e660878db37204b7d668f008a1f84e3a95161608c5f5a360b84ff1e49ff8971e1f6dd
-EBUILD calculate-utilities-3.1.9999.ebuild 811 SHA256 1586a3173e7328fe7d1cfa27ca7c780fc7d5d266d45000a319ce83485e255451 SHA512 dc00ba4a97bfc0f6736fb03fd55b8718afa5e25fa60c4ea05cf38eae68307fa904e73d7ff9fa101b7c05cbf080c769b49ec59b73dab5702d3e5159fe24bc395f WHIRLPOOL 59b99fc9f209cd9fe251892e4430f9eb8beeed55b3b91e4c5328dbb82bd561105a788b5f7af6f12c4e39584402b01a04ca27577cbdbfc6b0f2c89aebd63b18d1
+EBUILD calculate-utilities-3.1.9999.ebuild 800 SHA256 9de4807341cb552ef8d4f702e9c4a0ca10c52c9d532cc2eb741cea29b92f09b5 SHA512 b35ed4d49c4943a5ad375e646bece419271900c50301153408b30dede0fe834e098baaa42a21c130730c0bc32ba09decc588277da6782d2010c18c9d8df679ae WHIRLPOOL 78e2c5ee8ef8356c4fc0275f920177778925278cad78585ed37c08048241f775030e59a0ced0696fba6379741fe865dc339d190c46b5f2173097328a73c64a24
 MISC ChangeLog 38731 SHA256 7e70a0bc1f3b34c0011f3874773a698a4bb96eb6d3dad10903575156bb8578bc SHA512 2de466ea990b9eac702b81fd097c3f5d06d1f4db1a4bd1d1b7380b45e551f6fd62c16564ecfc810246157d3ef1113ae373041580e70981d44752e50ed6134bc0 WHIRLPOOL 5ca0cee1ad0e9419f91ec11a9629b9a29db9fcbed4f5ae0aef1f8a2170ff58112c8580d61884c56ee410a0abc201fa8f4419cea35077fc8bb84e733f6fa6f4db
diff --git a/sys-apps/calculate-utilities/calculate-utilities-3.1.9999.ebuild b/sys-apps/calculate-utilities/calculate-utilities-3.1.9999.ebuild
index 891987bca..1bc5ef093 100644
--- a/sys-apps/calculate-utilities/calculate-utilities-3.1.9999.ebuild
+++ b/sys-apps/calculate-utilities/calculate-utilities-3.1.9999.ebuild
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE="Apache-2.0"
 SLOT="3"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS=""
 IUSE="cl_console_gui
 cl_client
 cl_console
diff --git a/sys-apps/calculate/Manifest b/sys-apps/calculate/Manifest
index 05f8d4524..eb6f0ec13 100644
--- a/sys-apps/calculate/Manifest
+++ b/sys-apps/calculate/Manifest
@@ -3,6 +3,6 @@ AUX calculate-1.3.12-netup-fix.patch 401 SHA256 de02eb8f8401ab7b90a7bff48373969a
 DIST calculate-1.3.12.tar.bz2 170338 SHA256 34d073fcb977bfdc8e8e38354a5171a9db9dcb65ec00ade10bba7ae302968d8f SHA512 f20a33d6f3cf1f283200abc56f1b83cc42c3fd1accc1fbe011d7e8a617fc77fa70c37faf8a43eb4f9000c48e7c07079e72046dab499a9d6451f54371d3b79567 WHIRLPOOL ed81a7249865f409b4b3d150d1f52f1df2a8fb52f2f02ece9d1c58ce9bdb2aeb7f083051c2f7bacbbfb0aa492566e38c3d37d9dc19b76eef5bbda9a8a199b429
 EBUILD calculate-1.3.12-r4.ebuild 1936 SHA256 87b3de209970619837a443a3d098c1a2e447609a16b0b7bd926de1ddbe4cc529 SHA512 55aedb4e3d25cf81ae0cc0611780a589c1606f7a04b7c35205c33d6797bd6d52917e2460f33647c85829db265a63576a4942c491d377c6f2da5dd827432aca2f WHIRLPOOL 9320cf8ec6a7cad60c355954e6d1a12c2dfc62d3c85f748f7001e0ae25bb7e39d375c317467cc177e5a17671723d74df70633f5e033b2d0d4091faeeb7862cb9
 EBUILD calculate-1.4.0_p20100930-r3.ebuild 1620 SHA256 85e0a611b4a9ff378bcd293b4a0bd4e6d7a7edd8b50f37c741f7b68269cd4bf4 SHA512 df0d90587bfb5542513596b35a7fadaa94a53bd1c8ca6806dc9f2528405471d4905d97cc24423dcca14cb4acfef4e0fc6de248e6f7db38332479c3958dcfce17 WHIRLPOOL 1a9948816337eed289e8dc5a2aae51788fcf4a0e508500533d380d16a8f6513776686a34e41cbfd3e0ebef51c0bc5d787bb4446b5076e8788f63e3ff76a442e5
-EBUILD calculate-9999.ebuild 1608 SHA256 afe34d2c8d77d28e2f12eee48d2f9e65284bfe9bc42494e4ecf2cfb128e79d22 SHA512 20c32f620aae004732b43cecc93f07c76183941c09304292e4b6a4eb2f97b2c42fa36d34823adcb8b81ad652e4752b08b50b59563339e52a185d5549abfe5a5d WHIRLPOOL 9df00ba7461852462a59f8e8dd50a7e8f0c0a05c41f13f6f5f3edcb098977a1a3c062483efd751322f8e24f111d8b93ae0fa7ef16f3acf8c72562064704860ab
+EBUILD calculate-9999.ebuild 1597 SHA256 454a574f6a7c04fbd7531cde560529e8a23ce612bf183f0734b8c961d21f00c7 SHA512 6d1ef0b2ad0e2f46c77d9b5d54cb5697a254418f22c164bd61962720c70147a11ebd00256ff6f1858a7a1aefe33cc33b6f04a538d26c1114fc0d8f9c330e91da WHIRLPOOL a2393d810491c5d0f9c97fcc5aa23755e12729e01c5932a8a062a80ece0d522134273fada3e8608922e4f7c21ae1570be438b8215e23d5e1c65fd5a756d87c86
 MISC ChangeLog 4990 SHA256 0387c41ff32ffd87b023f1857592eb2058f21ca756bf294fe0a93316809edb71 SHA512 4b774ed707279d3eb47dcaeceffaa855fdefd46ee3d8ed342c7532e0be8cec463446c88b0d09ef8b513537bee33e606ee36ac028d1c5c14afca6b6a1f12387c1 WHIRLPOOL 2030672acaf3c883821a89a8b347a6dba658401a4730740aecd00b0b784d676dceb34666b8da6655c08efb9e90a071ff309dc402ac9839c51bc1e3f0ceedf247
 MISC metadata.xml 301 SHA256 074eff7c846f7fc8f0e74e0d992bdda9432164f28c0f3cf8991a1e59aac38700 SHA512 019c0b2a04ac887a7455036811c4e40e41278993cba36c1359dbeed416ace845a10e511b208999bf39ad2309aca378ac015234d18a4c3b69308aa50ba9324662 WHIRLPOOL c14d235b35ccdbb72be1703c8a4e0b01325ef9d8b1025cedbee93bb32b3d37938d9c01b8e498363e459d90d0c7e2c84ee908f53b459f24ffb3a16bfa0201748a
diff --git a/sys-apps/calculate/calculate-9999.ebuild b/sys-apps/calculate/calculate-9999.ebuild
index b33171290..8bfb42826 100644
--- a/sys-apps/calculate/calculate-9999.ebuild
+++ b/sys-apps/calculate/calculate-9999.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.calculate-linux.org/main/ru/calculate"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS=""
 IUSE=""
 DEPEND="app-arch/p7zip
 	app-cdr/cdrkit