From f22cb746c6affa12cb61d0da14f81a688caa1910 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A5=D0=B8=D1=80=D0=B5=D1=86=D0=BA=D0=B8=D0=B9=20=D0=9C?=
 =?UTF-8?q?=D0=B8=D1=85=D0=B0=D0=B8=D0=BB?= <mh@calculate.ru>
Date: Wed, 17 Oct 2012 11:46:34 +0400
Subject: [PATCH] Calculate utils 3.1.0_alpha4

---
 sys-apps/calculate-client/Manifest            |  2 +
 .../calculate-client-3.1.0_alpha4.ebuild      | 30 +++++++++++++
 sys-apps/calculate-console-gui/Manifest       |  2 +
 .../calculate-console-gui-3.1.0_alpha4.ebuild | 24 +++++++++++
 sys-apps/calculate-console/Manifest           |  2 +
 .../calculate-console-3.1.0_alpha4.ebuild     | 21 ++++++++++
 sys-apps/calculate-core/Manifest              |  2 +
 .../calculate-core-3.1.0_alpha4.ebuild        | 42 +++++++++++++++++++
 sys-apps/calculate-desktop/Manifest           |  2 +
 .../calculate-desktop-3.1.0_alpha4.ebuild     | 26 ++++++++++++
 sys-apps/calculate-i18n/Manifest              |  2 +
 .../calculate-i18n-3.1.0_alpha4.ebuild        | 23 ++++++++++
 sys-apps/calculate-install/Manifest           |  2 +
 .../calculate-install-3.1.0_alpha4.ebuild     | 37 ++++++++++++++++
 sys-apps/calculate-lib/Manifest               |  2 +
 .../calculate-lib-3.1.0_alpha4.ebuild         | 28 +++++++++++++
 sys-apps/calculate-utilities/Manifest         |  1 +
 .../calculate-utilities-3.1.0_alpha4.ebuild   | 26 ++++++++++++
 18 files changed, 274 insertions(+)
 create mode 100644 sys-apps/calculate-client/calculate-client-3.1.0_alpha4.ebuild
 create mode 100644 sys-apps/calculate-console-gui/calculate-console-gui-3.1.0_alpha4.ebuild
 create mode 100644 sys-apps/calculate-console/calculate-console-3.1.0_alpha4.ebuild
 create mode 100644 sys-apps/calculate-core/calculate-core-3.1.0_alpha4.ebuild
 create mode 100644 sys-apps/calculate-desktop/calculate-desktop-3.1.0_alpha4.ebuild
 create mode 100644 sys-apps/calculate-i18n/calculate-i18n-3.1.0_alpha4.ebuild
 create mode 100644 sys-apps/calculate-install/calculate-install-3.1.0_alpha4.ebuild
 create mode 100644 sys-apps/calculate-lib/calculate-lib-3.1.0_alpha4.ebuild
 create mode 100644 sys-apps/calculate-utilities/calculate-utilities-3.1.0_alpha4.ebuild

diff --git a/sys-apps/calculate-client/Manifest b/sys-apps/calculate-client/Manifest
index f86d06d5c..a4fe991da 100644
--- a/sys-apps/calculate-client/Manifest
+++ b/sys-apps/calculate-client/Manifest
@@ -4,12 +4,14 @@ DIST calculate-client-2.2.30.tar.bz2 32544 SHA256 7ead15dd4c3aa896970b798249f524
 DIST calculate-client-3.1.0_alpha1.tar.bz2 31130 SHA256 4505af9f8089343b52cc924c7d9b1ec5032aad9a0da45349b41ac9ca6bd05d8a SHA512 9605fea6fe9e49cfdf1479f10365df8151ea6853492e52483112b602e0b020f2116c16dc4c97f79c7d68d8faa5543084e110d37ee52f38fd4ab5df463cdca3ae WHIRLPOOL e4aed30809313d83d506abd370365771b67ac8a76d8323f068c28f68c8c96a10a8fdd5d7fe31d7e5af5db61568d2e878b166e5e05e2543fe42b201119118e574
 DIST calculate-client-3.1.0_alpha2.tar.bz2 31171 SHA256 3ae9b8414da03aafcbf5a514e58e1402a659c459adca60850cf5ec2eae9ca81e SHA512 519989f3d71047fe97b9b15d2b783a8fe47a164e4489583a7ce5fc9150dc761670ce1271c985f3f56b6f0aa90481307ad9f586c8839eec06e5f17bb966a66b18 WHIRLPOOL 14f7648fdc7de51c397e0fe1c3961e08b619369e2ae6bf845078a5b710b0ebd39427650e435fd4f1011a3adb6e93d516537868a47bc897cc66b3cfe78190b7b5
 DIST calculate-client-3.1.0_alpha3.tar.bz2 31153 SHA256 37036da06110cfa3543f6df83ead4b0b6e0979079cc63e0ca0df3c33e4819d45 SHA512 ec822abf6facbc4aeb3b493813cd40062bdab7b44fa785a0862c3a7f05a032d66423d28df48efbbe1f28328b718b315090003e3e9498d449a560c7f8d65e1421 WHIRLPOOL bcb310e81dd8ccdb333f752a15e20a894f1e01364aa27cc377e530ad5a2033645cea7598e8a36c3e5c7afd9a223d5df18f3a10706cf5744e41434e32827676b8
+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-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
 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-3.1.0_alpha4.ebuild b/sys-apps/calculate-client/calculate-client-3.1.0_alpha4.ebuild
new file mode 100644
index 000000000..c96544ae2
--- /dev/null
+++ b/sys-apps/calculate-client/calculate-client-3.1.0_alpha4.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="3"
+SUPPORT_PYTHON_ABIS="1"
+PYTHON_DEPEND="2:2.7"
+RESTRICT_PYTHON_ABIS="2.4 2.5 2.6 3.*"
+
+inherit distutils eutils
+
+SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate3/${PN}/${P}.tar.bz2"
+
+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=""
+
+DEPEND="~sys-apps/calculate-desktop-3.1.0_alpha4
+	!<sys-apps/calculate-client-3.1.0_alpha1
+	>=dev-python/python-ldap-2.0[ssl]
+	>=sys-auth/pam_ldap-180[ssl]
+	>=sys-auth/nss_ldap-239
+	>=sys-apps/keyexec-0.1.2
+	sys-apps/keyutils
+	sys-auth/pam_keystore
+	dev-lang/swig"
+
+RDEPEND="${DEPEND}"
diff --git a/sys-apps/calculate-console-gui/Manifest b/sys-apps/calculate-console-gui/Manifest
index 58c02a71c..b01ed1aec 100644
--- a/sys-apps/calculate-console-gui/Manifest
+++ b/sys-apps/calculate-console-gui/Manifest
@@ -7,6 +7,7 @@ DIST calculate-console-gui-3.0.2.tar.bz2 326069 SHA256 550cfa4a43fe367700b4724c9
 DIST calculate-console-gui-3.1.0_alpha1.tar.bz2 319129 SHA256 391b624cc4b9758f6f74992c9f3d947f0cb12a967000a8467af857c18da0b60a SHA512 3ad74e407a270fd1c97cba6715a3358be00960cda0f159f34571cfa16d5f7bd93a567197f412ac150d368b6a633f1dbcd96ef88a646a14891d18bb705d689ec7 WHIRLPOOL d77f70e9515d60d863bb31baa3d6a47308b21594451577e7b3829355902345af1dea039e509ffa3530c575294e3a11a5b0e9394ed663dd247ba9191e8cb70357
 DIST calculate-console-gui-3.1.0_alpha2.tar.bz2 319147 SHA256 01ff3eec07d1f372e30c1bbd80e161f1002a442ad0f1973a6b69c727304d9b33 SHA512 2d600b40ad967a5dd597768b109888f90f407e3e91dd9b90667c96f4077185efc9fc123e3542070faa6d8a9ce17d67e042d91a2e9c2d2867a91e1fb20320bbef WHIRLPOOL ce30c5dee7a7a7993fd107644ce71aa1022d91e9d53881fca307abeee2716cb996de4f4c585f0d4285b7e154eae61201ea8504f98eec5944ccee834d04b39644
 DIST calculate-console-gui-3.1.0_alpha3.tar.bz2 319263 SHA256 e06424c831b85ba0db17cd0cf07cc1e9c0b1ec7f417c0b656469c915c77be21b SHA512 e6fce49c2530dc2ca4b5f45fe78b54e1152f615601b730da02f721fb7917bae2ff0e3527a53efe376b1e59955f66fca30916c460f341e43c79317215ab3d9c8e WHIRLPOOL 467165b066afd922fd29dbfc0ece641c59162151e7ea85b4a317423e459d4c22136e30d7b8cbb77847ef51a88d313365b919e559a13423a1b90d2a59c55f2455
+DIST calculate-console-gui-3.1.0_alpha4.tar.bz2 319669 SHA256 737c1f77f69c3e7d4064d80bc607092e069428135127e889c228d409a7414e9b SHA512 ab3da66985cdbfc3a8dd11644d297da011f20bc8b208430309761d81a37370a8ec136151dd491554cc43933dfb82f93c1b1b67949a9ec3a8dc21b794705e9254 WHIRLPOOL ea7a7fed16925d245b2510e91cd08887eabc993f4ff9e078195a4015aa45b221f93c1e575ac0169e52e8ff4e57a5183a5228c73c3b05bbeb05e2fd797699de64
 EBUILD calculate-console-gui-3.0.0-r1.ebuild 736 SHA256 cbe789857d18d724a0b393f4e261def9d1f5f301b399247a97111346efa67674 SHA512 620b51272b564251baeed2c9c0b4420daf64e338053b08e71ac4ef87bf92bdf76c5b25718654239b212fc1c9d802091b40f6e59be1c4dcc389e12548bbde5007 WHIRLPOOL 8ecdea9c4d58e315ce83a5f0ad893ec8571a5a3e254df541f9378e20efd3ec22db24620c1336c262403a1c1f248355165b17cd1047eacb72576bf15767ff8948
 EBUILD calculate-console-gui-3.0.0-r2.ebuild 802 SHA256 38281062f0aa91f6634d96b5fa00195274f4f4c80ff5023f2cfc22881f11696f SHA512 2c2cebec83d2de96e1b30d029b205a16a427d5e7e49b38f9c171c778bca2be1707784b28235986c8041fab0669d9495f0dfca970bd4a50b6aa8e2f4f987625b7 WHIRLPOOL 2ecac15398c382d030e8d444767b5e272c0c8f9119703fceb6b6bd208b96c5b8161055b3df54ca468c3278165fb854783b96db559b9badbffb9a2bc717b93a51
 EBUILD calculate-console-gui-3.0.0.ebuild 621 SHA256 f1df99e91299433602138980381dead15efcb74d57cb5f8c95a90124cbc65c20 SHA512 5ac03944d316762cd372bd5dc7bf44783c22f713998424d58160ddb88789766de5a9b2179e98ab0040aa50ae4539a1ed0a72efad6d838edfeed7371046087f72 WHIRLPOOL 641b9b28850bfd55b105d3ddb7e54be909c25fc77862759e99402e1fff0f968bab817ff123bf1f1f4a10ed55fd704ee4dc5dfae2c77a00b4a352e5bb0b844610
@@ -16,6 +17,7 @@ EBUILD calculate-console-gui-3.0.2.ebuild 621 SHA256 e6204076ada647d0b55c66ad626
 EBUILD calculate-console-gui-3.1.0_alpha1.ebuild 619 SHA256 241cdbfa47f64983b3be8bc12904f4f6bdffe19a263f4565bdd8d24024e25682 SHA512 a963c2b2206a312390e88ceb89a101688cc22e83415283aa6fe892f538033142d2aa25505c25ebb9341b04d182998d1a05ce23701b07daf19b7be4453334580c WHIRLPOOL 2bfc747b2fbd8898b039c5b39270ec26d95a0804a864ecb4b13fd6077240de030840e962020726d9ad561095fbde0e5a6d8485a53f23d4fb69271ff830cdcf30
 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
 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.0_alpha4.ebuild b/sys-apps/calculate-console-gui/calculate-console-gui-3.1.0_alpha4.ebuild
new file mode 100644
index 000000000..9dcc070ca
--- /dev/null
+++ b/sys-apps/calculate-console-gui/calculate-console-gui-3.1.0_alpha4.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="3"
+SUPPORT_PYTHON_ABIS="1"
+PYTHON_DEPEND="2:2.7"
+RESTRICT_PYTHON_ABIS="2.4 2.5 2.6 3.*"
+
+inherit distutils eutils
+
+SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate3/${PN}/${P}.tar.bz2"
+
+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=""
+
+DEPEND="~sys-apps/calculate-core-3.1.0_alpha4
+	dev-python/dbus-python
+	dev-python/imaging
+	dev-python/pyside[script]"
+RDEPEND="${DEPEND}"
diff --git a/sys-apps/calculate-console/Manifest b/sys-apps/calculate-console/Manifest
index 9173a523e..002f4d47d 100644
--- a/sys-apps/calculate-console/Manifest
+++ b/sys-apps/calculate-console/Manifest
@@ -5,6 +5,7 @@ DIST calculate-console-3.0.2.tar.bz2 31265 SHA256 17667d7d4afcca9607b8055f1558c9
 DIST calculate-console-3.1.0_alpha1.tar.bz2 26256 SHA256 0fcfc07953ce79c35c14a836dc025ab51577b2bb5419f3f25f83c9e7d4823e18 SHA512 6d582b621a761b7466d2540f24d38448f5d8bc824dd6c35428698e4714b02766b544834ba1c58d4188f10d3ad035f5e6df3dc06484e27d8ad3918e4a016d8f70 WHIRLPOOL 0ac6f4478ac4bb8fb26ed99e1950596950149db2ba368709ce1a52f98b8d723cab6602f9585d9dbac1eba566fc5e2f7c27e7c67349b946099a300e64f39246b7
 DIST calculate-console-3.1.0_alpha2.tar.bz2 26249 SHA256 19cc2fc5ad62726279b00d799f4bbc1f01fdc7092e566f69d191363f3f8453ae SHA512 cf1c968228d40a319c36768c708bc40098070b10a43d0970d884a8c11de15facf3ef53f7dc7ccf7e3ace77127baff6063a6147dcbccb5edd3f74568d5f32f3aa WHIRLPOOL 1b5c9ac45e2855a3ca4f68220004c094e4577a32689339e4a09eaf66e8dab0eb58ddffef8fcef04934e8c2b08c750b6018e6230a48e5c5a0967e2b9d08cb6b97
 DIST calculate-console-3.1.0_alpha3.tar.bz2 26191 SHA256 c19eb449f653330789ca49ba12f429fef1eaa1e4e874967ae81858a83588b8eb SHA512 9b844dbb7af3ca544265111f0e754f270e95f4cd919b9d9ff3be2f9dfc810fadc76139962d6d05b80ea21f37d5be8d007c6b702efe75f085e5c9c593c25c6c71 WHIRLPOOL 9009ab15d46e4048c0435a303dc62f2cb1029fdb29851fbf67b310461d13a87000aa2a3107eaedfa3f0dcd622abba15ea1b9520dd87f406563e9fa2f52e5d1d5
+DIST calculate-console-3.1.0_alpha4.tar.bz2 26278 SHA256 42bf8f44e0d6c69deaaf172b6bcc0de758d97ee3333d358153e181fff9801cf3 SHA512 7d59ea45a8ad84273c136e950a37256abcb7da12687a00422c978e0b16804fb19af34f57683d6b3c8cbd0d46235aa4675f55d54f238d039f8e44ae0e15486554 WHIRLPOOL c2348bc827f1bb48e65c67eac783a7930c6d533c55fdc4dc20d7caaf19adfeba28c12a207d8623515213906149764762d11bcd6fd2f503eb49ac13ca5e15b99e
 EBUILD calculate-console-3.0.0-r1.ebuild 654 SHA256 9d279734d612755be673a83735fc3d33d998de72d90ec7c63554cfc462605b7f SHA512 0189b4b6460dcf2982b543ba4d47291a334be6d649b2067c59bf06b5ffa3a6c40cd7e7bc0c2a2ca7e9f2e78ab100c091133a5c7184039d98a7f178e11d75e2fd WHIRLPOOL 6806da28cbb8435d82429cc3fd8f068bd5e08ef7c2aba7fa3bcf4726eb653ad270554e49d98ad2463b4545e3b7b1df1e38c282300d235310c187750a1c706fef
 EBUILD calculate-console-3.0.0.ebuild 543 SHA256 17247f3b029eb9fbba87df5a28cee166109bfc257a9c820f994cc77b18ad7fc1 SHA512 137e030e2c418f3570e86572e12f14af3787b993f2d6eb0835bc0fee253be04fe24825d7ea5570b1bb747451d8ef84e1bab6ee9b4feb824d41415f8bc9ec0983 WHIRLPOOL 0c95fca8dd9a7d87b86a4922c1f74dcfc285c7f4c78dede8e0e55118cc449f4e3d5845ca47dcf5615ec2c2844237aeab96617610c1bca839a09e4a248a39d677
 EBUILD calculate-console-3.0.1.ebuild 543 SHA256 be447edb2cbb2ae57b798192c8421478828dafbaeb698285ce57cb2dad3eb345 SHA512 f06bce8ea48634d77a4de64f11aa5fd69d2057a2ee926c7b4d860daa36523352e97c1fa8fb387a383104919e2cc062a48d210cd741f7e652c24d4c6ff9c311b3 WHIRLPOOL 4228bc337d72593241909cf3433574be8bd1b3192003d3b36ef0d551b238dc195ecadce72ecd3ae6709ef6b5bfad63cfcc2468584ac1e3692128ba9a6b629585
@@ -12,6 +13,7 @@ EBUILD calculate-console-3.0.2.ebuild 543 SHA256 d8917cba81d482105fe5bdfec77e3ed
 EBUILD calculate-console-3.1.0_alpha1.ebuild 541 SHA256 8baec98be53f25d6954254f0b4ef35c9c19acc29545c1f083dc0e0c9e55d7208 SHA512 069ad97a08be3a2e8621b4429bf43512a898c79430d41a106f7ae35e2252c795eec96e88edad572a3837e5b77c27e9618ced1fcfd1bb7a2b04e87544925f9000 WHIRLPOOL f2d52f6682bb0869bc49032cea83e1928a9bea03ad0b803d45f150ad7ee6077295af37a35f8d05dbc0d5337a012e7c7450433faa15eccf33ee23eba21535f776
 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
 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.0_alpha4.ebuild b/sys-apps/calculate-console/calculate-console-3.1.0_alpha4.ebuild
new file mode 100644
index 000000000..ce2842ca6
--- /dev/null
+++ b/sys-apps/calculate-console/calculate-console-3.1.0_alpha4.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="3"
+SUPPORT_PYTHON_ABIS="1"
+PYTHON_DEPEND="2:2.7"
+RESTRICT_PYTHON_ABIS="2.4 2.5 2.6 3.*"
+
+inherit distutils eutils
+
+SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate3/${PN}/${P}.tar.bz2"
+
+DESCRIPTION="Console client for WSDL Calculate 3"
+HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
+LICENSE="Apache-2.0"
+SLOT="3"
+KEYWORDS=""
+
+DEPEND="~sys-apps/calculate-core-3.1.0_alpha4"
+RDEPEND="${DEPEND}"
diff --git a/sys-apps/calculate-core/Manifest b/sys-apps/calculate-core/Manifest
index 81ddd9c6b..990f01bcc 100644
--- a/sys-apps/calculate-core/Manifest
+++ b/sys-apps/calculate-core/Manifest
@@ -6,6 +6,7 @@ DIST calculate-core-3.0.2.tar.bz2 86741 SHA256 f35bfe8e34df9ad9c07ac7d281b2b6a59
 DIST calculate-core-3.1.0_alpha1.tar.bz2 81410 SHA256 ec5a98a96c03986e9d57174b1c2812a2c32d17eedcdc0548ff7271c2035ebcf6 SHA512 b7dfaa96e261a90ac91ca8e134177040f85dee63eb673db376f4141d022d936bec737f5d73348f15b4e86f3dbe75cf7f608f9fa6957e389b196633b19196dce1 WHIRLPOOL 5fcc5f0c52c127a43e9f1a3a4d39d34b4ce8c0a1a1d92a19e1fec1745891fee4256ce46c3e7a9db4a68565e2de0e0f9cbb7a92826dedae27d8f76024240b7189
 DIST calculate-core-3.1.0_alpha2.tar.bz2 81455 SHA256 d140dfdfafd227997d2ea8184f8e924e28bbb71073eafc408c3b5741ac412cb0 SHA512 6db989281c4d264ceae193b2a2ea9178e123f55b50f68f8d77136bd2885f07c0002c0616e1115f0829d6870b458dbcc8c031b96db5f085d038ce758f67773213 WHIRLPOOL 4564ed67b8e02973f4731d49d327ed7e70456be4c4e50e5bfc54a12e753f54ce4b10834b3f1e1dbf0bbf00504ba776822a51280abd6fff89e53477ddfd5350f8
 DIST calculate-core-3.1.0_alpha3.tar.bz2 81681 SHA256 4666778fd5231021b93751b6a67dfa0e782a491d0f9817ecd148eb230711fb68 SHA512 1a687f62cfee23ba97bbe88311016214a396bd073159697284771fb9e200b11a5160a81d17c98bdf89b20200df3cb3f0e6c1c97783c097ff7c9a09c868cf0497 WHIRLPOOL f849c6089038144e7c3606b85f809bb735f5c72665c47dcfa75baf3e19727a25c7dd043f05938e667a6d85c800c5c2661741d15c63bde5db9fa27d208d40b29e
+DIST calculate-core-3.1.0_alpha4.tar.bz2 81592 SHA256 337642df67929e34f612018e39e5e560f9fbcad38e757caa48b33e3d269a2130 SHA512 4c0bdeda8773339d36bcbc431f8f7f0eb08fd6638bc9c97d1c2bd1d54ab6d94a7fbcfbbfa749b966f10190b1abdb283fa838cc5df313295b4886ad366605c25e WHIRLPOOL 1dc545761341d46adcebe063ff7769cbcd215901ed3707f68ae97de96cc5c5db5ebe6accd561d4b5a481823d8c783de850a1b336fdcef3a6130d3ffc4449e68e
 EBUILD calculate-core-3.0.0-r1.ebuild 1182 SHA256 aec70a532de3faaf1ee123cfb04a6286030f7a8200b59f9715f9f75831a981fe SHA512 1cfc3771806ee24522560ed0bf5cc5163cd1162485f19dccf55912b20498bd1d5cc447d9032287781f912b3c478c557ea46e8213a959f0a47ef9591a557c375d WHIRLPOOL 419aca78f789cddeb986a56a6e360f36859c04ecee7b42c2618ae55b4f3b93c6732d991e5768eacb9e8a7dbe1a761bdf112abfd9675e6594261ef2600c3bc76e
 EBUILD calculate-core-3.0.0-r2.ebuild 1244 SHA256 d0187e27b04eecf75d0344cda56bfc2a3934a9cacfb28fe1e7b234b963989633 SHA512 1ff539308156cc43db5de3b9f1f975514840fda41cff02e33f9ef7af56fb634e7aa902fcb0037b82f883e0a7da201abdd08cedaab1b62eb5a8994ebd21d8806a WHIRLPOOL 5667788e17551ab43842b63c25c7d60fd69cca13bc733b2aaa5a0dcd74a6628561dd38d40af10722f5cb4f0e1f13b98a9dbec1ed201d40254adb7104325779d9
 EBUILD calculate-core-3.0.0.ebuild 1073 SHA256 f6dd5648a4c70c5a0f73e274edfeb0057949c461ca3f81277734d967a7265249 SHA512 1fb65533bf9dfc662b2da563d085134125b16791d9564bd549a5d9d132d0ee759096af362653977f95f6ded80ff531452d488dc55c99ba9f74d955d6d6b4be5b WHIRLPOOL e82e996c3c7854f5cbbd4797dbd98e745094d2459f8a27485a942939119974a7c4f55a8a7e307bb5c20b1fa61a9691e58fcb6095f360303dae4f8eaa5a0d6aa2
@@ -14,6 +15,7 @@ EBUILD calculate-core-3.0.2.ebuild 1073 SHA256 eb6017a20bd541ee39ec536423d2e8fcd
 EBUILD calculate-core-3.1.0_alpha1.ebuild 1071 SHA256 956c34699d88aec29225177b39b2842f982e8250f22886aeb89c5d22eec08a55 SHA512 6724b6931652df46ae3d0a3c9801745959939c089e7a95c82da05e1655a53c55c30f4916e50127883c8654bbb4ea2f40a5849518fd5fa3adf40ca16252c3d601 WHIRLPOOL 888c2a03a6cc9c9ba271790ec21f6274409e829f60e399a306bd43c1d5649d139b9aaca45f37bff0dcbb329f63a98fcba89b0186e055e54e1fadbe49c55e9e30
 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
 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.0_alpha4.ebuild b/sys-apps/calculate-core/calculate-core-3.1.0_alpha4.ebuild
new file mode 100644
index 000000000..35e3ea7a2
--- /dev/null
+++ b/sys-apps/calculate-core/calculate-core-3.1.0_alpha4.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="3"
+SUPPORT_PYTHON_ABIS="1"
+PYTHON_DEPEND="2:2.7"
+RESTRICT_PYTHON_ABIS="2.4 2.5 2.6 3.*"
+
+inherit distutils eutils
+
+SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate3/${PN}/${P}.tar.bz2"
+
+DESCRIPTION="The WSDL core for Calculate 3"
+HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
+LICENSE="Apache-2.0"
+SLOT="3"
+KEYWORDS=""
+IUSE="minimal"
+
+DEPEND="~sys-apps/calculate-lib-3.1.0_alpha4
+	>=dev-python/soaplib-1.0
+	!minimal? ( dev-python/sudsds
+	net-libs/dslib
+	dev-python/pyopenssl
+	dev-libs/openssl
+	dev-python/m2crypto
+	dev-python/cherrypy )"
+RDEPEND="${DEPEND}"
+
+pkg_preinst() {
+	dosym /usr/sbin/cl-core /usr/sbin/cl-core-setup
+}
+
+pkg_postinst() {
+	einfo "For autoconfigure calculate-core for adminuser perform:"
+	einfo "  cl-core --bootstrap <username>"
+	einfo "For run calculate-core perform:"
+	einfo "  /etc/init.d/calculate-core start"
+	einfo "Add calcualte core to autorun:"
+	einfo "  rc-update add calculate-core boot"
+}
diff --git a/sys-apps/calculate-desktop/Manifest b/sys-apps/calculate-desktop/Manifest
index 930331940..0628f6e97 100644
--- a/sys-apps/calculate-desktop/Manifest
+++ b/sys-apps/calculate-desktop/Manifest
@@ -4,6 +4,7 @@ DIST calculate-desktop-2.2.30.tar.bz2 15658 SHA256 8ad79a480c4cad7915523b707d119
 DIST calculate-desktop-3.1.0_alpha1.tar.bz2 13216 SHA256 35a2b315f8d5f9551407cf99a3072d86e8269c7f708bc1b8c962612eca288415 SHA512 5e6820a0a5d2fa2a95e7e922abf4a8761f12feb5114f8c3721e4c8aae3a3b03e5d745169bd7302d8160db9984294624bf6e6dfbf86530465aa24390a52b20cb9 WHIRLPOOL 3133fb170c0a6e5b2a33601667768e20c18040a46da7aa0d6db3b71b0ff159a891bd529718c763f5e79b16f88d569445ee183e1d7507dacac2b11d67e756e0f6
 DIST calculate-desktop-3.1.0_alpha2.tar.bz2 13220 SHA256 8dc4ae82296f8dc72ab8cdfaafdbd9fe26730f277f48bcb4fd96b6c66bc45e73 SHA512 9ebe9002323ed3e744e09a26754d85a684f53f910c3858a4296eaa5279267e2293611125ad5f2140113cba1c5272eb74c3750b81110ef5352c45f515d2e11e98 WHIRLPOOL 34c548d1066443ae5e69541da01ef63535a902fc3ceff9ca65eab7cd63e9d5999768b1edfe39e52129f64fc69a5af688c527ac09f5a25d57b2730dea201af2f3
 DIST calculate-desktop-3.1.0_alpha3.tar.bz2 13217 SHA256 4b3ca07b8d5639debd8a24de18807a0907082082bd78ae58a9789537a7796081 SHA512 20c57cb6e4e5f343383db59b3eec00b0eabe5c3d3182917dbf78d33edf9217e2e892938479a9f43c4e6d5e387fd21b6d4af693c8065c6d5a6bfeeeac919b8899 WHIRLPOOL a568b5859a0d0a68eb71b13f451390356da9f1c3800590c5c944ad1c24ae3ac51d02a91b0ddfac4e683c6479b1a6a2fb67c637598023d905f61214dfe4b2835a
+DIST calculate-desktop-3.1.0_alpha4.tar.bz2 13211 SHA256 d4d14835cb7df12aaf35beddb4ce4a02301fcbbdc091ebea5aea94c8e32ed860 SHA512 1ee453361ee71704f6cd0d2bdbdccd6eb505f2144799150d6e1770c97a8c19cf6ff36b1b36a1a6e681bd6be64f587fd86e17ce228455de6b3760734973203163 WHIRLPOOL 0358babaae0eac18531b5f6d419febbf808d990295938a83b96368633e31672090f3510e0bd33d695559c4b91856e8a1e8d4f318eeb89c094adfdba527674fdb
 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
@@ -11,6 +12,7 @@ EBUILD calculate-desktop-2.2.9999.ebuild 989 SHA256 193fc2e457e70d1af04afdd99cc0
 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
 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-3.1.0_alpha4.ebuild b/sys-apps/calculate-desktop/calculate-desktop-3.1.0_alpha4.ebuild
new file mode 100644
index 000000000..59770e2a3
--- /dev/null
+++ b/sys-apps/calculate-desktop/calculate-desktop-3.1.0_alpha4.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="3"
+
+SUPPORT_PYTHON_ABIS="1"
+PYTHON_DEPEND="2:2.7"
+RESTRICT_PYTHON_ABIS="2.4 2.5 2.6 3.*"
+
+inherit distutils eutils
+
+SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate3/${PN}/${P}.tar.bz2"
+
+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=""
+IUSE=""
+
+DEPEND="~sys-apps/calculate-core-3.1.0_alpha4
+	>=dev-python/python-ldap-2.0[ssl]
+	!<sys-apps/calculate-desktop-3.1.0_alpha1"
+
+RDEPEND="${DEPEND}"
diff --git a/sys-apps/calculate-i18n/Manifest b/sys-apps/calculate-i18n/Manifest
index 5198fbb52..98d5386c0 100644
--- a/sys-apps/calculate-i18n/Manifest
+++ b/sys-apps/calculate-i18n/Manifest
@@ -7,6 +7,7 @@ DIST calculate-i18n-3.0.2.tar.bz2 33537 SHA256 4d6b8979ae5085cd8a6de76d10acda8e1
 DIST calculate-i18n-3.1.0_alpha1.tar.bz2 36534 SHA256 0f43c00d5b59bd6004c23f304346bacc510ecd3543a04d939050479e5a5a5509 SHA512 b1bbb93f8c586f44ca11719ab3ecfbe9cb478617ea68501f9ca5f6cd9b4791ab029432d588c41a450aa6d174b20dd1522bab847005b975db56f00fbe1e449fe3 WHIRLPOOL cb5cec30e3ccd11347f18d1fa7102e82645e6bad3773df292462a7204f29b632541723cc6b674b0a6643d93b7170fe236480550f47670fc9c8023c205b7f0d3c
 DIST calculate-i18n-3.1.0_alpha2.tar.bz2 36550 SHA256 784037ab030517797051b8d79222e42179e4cb606959b65a78f11aca432f742c SHA512 c5d32005b583aba1e067e1b31acfdc026131249140218c540abd38b4da9fcd8e32376e6b7de351d2d2d5ef457feae2ba20d1f4e689cacaa25b753401c2014b4a WHIRLPOOL 16d777e1e8886972872f76a79273342a4a137c8e414abf22fe67b65e6492ae0e43574e26ccabbed4da157a38837cdbdbd977ed33363a9ef80238c888a26a863f
 DIST calculate-i18n-3.1.0_alpha3.tar.bz2 45830 SHA256 ae3c8aa0a65a2dff8bab7ccfda6e787fbfcc9bb77d14c7da7a96da6a4bae6b47 SHA512 818566bbf86a9d6e2fb1a225d99fa7c423c9219b106fe9596b025dd4f731d8a3f0acc4ab40d1283cd58d20e70c01692705e66b008fd795d0ca86769891b56417 WHIRLPOOL d82e4dacf8ba411ab43a24b0c280cd48c50ef65138ecf3f74ad1b4e17309a0583700a36cae31d42f19b1fb10a21092e5dcadc9edbbf1262f5ef24d616e196f87
+DIST calculate-i18n-3.1.0_alpha4.tar.bz2 45846 SHA256 b9668bac9e13dd0f28a6b2bce2973f66882cfa4ebb383600ee252609f768b7dd SHA512 183a0be73df16e400f09fd10bda4e2b9d9322219d48c34ef4d21a00859554f52b4a2e4f86f148a6937e4183d8a11ba7a347bf8f0f4af05fb60daf67d790eed02 WHIRLPOOL 879dbbeccf3d7773f176d5df27eaa5ebe907f50a1e0e127283c7ab6555e1e3a0dce9bff66cf834b84aa50babb1087ffc21256848c4865001322b98cd126b04d8
 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
@@ -17,6 +18,7 @@ EBUILD calculate-i18n-3.0.2.ebuild 581 SHA256 aaf0648cc9e26e76e7c86fa0d9ad0841e6
 EBUILD calculate-i18n-3.1.0_alpha1.ebuild 579 SHA256 33ce253310d67f051986d8e9341207effd1490a7595dc10f378c183e97117c1d SHA512 ab52b29d514f114e91250693299f2c861b3d5167497975d8801c6eebec78f446b614a252000fc2f5236bffd32ed38bdc377d50caafe510965e4eaccf6d666ad7 WHIRLPOOL 3fae4e6c894f7d43657999891082d19777a58ffdb9c3865c1284c56fe06879c234f2284bf09932f98e2894cdcf2a9e9043dd8389ab91c4e78c0bd497b97c6b7f
 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
 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-3.1.0_alpha4.ebuild b/sys-apps/calculate-i18n/calculate-i18n-3.1.0_alpha4.ebuild
new file mode 100644
index 000000000..224910cb9
--- /dev/null
+++ b/sys-apps/calculate-i18n/calculate-i18n-3.1.0_alpha4.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="3"
+SUPPORT_PYTHON_ABIS="1"
+PYTHON_DEPEND="2:2.7"
+RESTRICT_PYTHON_ABIS="2.4 2.5 2.6 3.*"
+
+inherit distutils eutils
+
+SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate3/${PN}/${P}.tar.bz2"
+
+DESCRIPTION="The utilities for assembling tasks of Calculate Linux"
+HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
+LICENSE="Apache-2.0"
+SLOT="3"
+KEYWORDS=""
+
+RDEPEND=">=sys-apps/calculate-lib-3.1.0_alpha4"
+
+DEPEND="sys-devel/gettext
+	${DEPEND}"
diff --git a/sys-apps/calculate-install/Manifest b/sys-apps/calculate-install/Manifest
index b54bbcdca..adf8481c1 100644
--- a/sys-apps/calculate-install/Manifest
+++ b/sys-apps/calculate-install/Manifest
@@ -14,6 +14,7 @@ DIST calculate-install-3.0.2.tar.bz2 75799 SHA256 7f8b21c3d518cb2333bbf7daf2182f
 DIST calculate-install-3.1.0_alpha1.tar.bz2 74522 SHA256 2b7c332421972b3866cbc59c2ab49f3725a59e125e733421bb9e47c7a749dc39 SHA512 c23c864ebd4548d083ce40e5cf34162f341cb5430990687d68272ff42249da37696752d38ea7d9e159abea986265fa48525d604164cbe43b54eeec6423eb4626 WHIRLPOOL 5c386311aea96079215d595eb55ba34bdd10c06bd558da1ab007960389aa7beb88a31d243cc0389c1231e8af9ea7057bdcc25f357a2fc19e01bbf72c6da1219b
 DIST calculate-install-3.1.0_alpha2.tar.bz2 74371 SHA256 48aacc07d31e28e216a298a07ea96b1724f4634d928d1224e1ac3066fb923c03 SHA512 a81ea976c710d899ceedb3c19dd68cbfcc843a7caf985433f1ef2ea2f3ab9d30707de0a1b5d858715b12e51327b9d86da46475cfef5196c8d02e26ba793d07d6 WHIRLPOOL 820733aee5bd6890af07d147eaf24682716e0798a811c50a2b33269c8e1a34f559bebd0cdc289c38d03e77d70c660f7153a1b4a181d9676b818148980f2c306b
 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-3.0.0-r1.ebuild 1234 SHA256 7eb9a22d9560c6f1adcfa9e93b46485b071ac27aa51a3dee15d894540ae15522 SHA512 8647a02c5915abe4f0c24c4aee792b7282a4fa93e381ed6f71eb0688209c858d495375754f83c138db92d6cebd693d485c3b126992ec3b1a7e2295a11edb1afb WHIRLPOOL fed7162b49953ae22e1d4bbe6be5de4099bafb65af7f2b84b9f35e7bdbdbe60348b1ca9ec8d77f7b0203386f0943d62dc861242a56c051f96b2d8ec84a4c6bbe
@@ -32,6 +33,7 @@ EBUILD calculate-install-3.0.2.ebuild 1110 SHA256 8003437f147991696268df78ed838a
 EBUILD calculate-install-3.1.0_alpha1.ebuild 903 SHA256 cbdc5c5f018359f00799dbea5cb9ce828ec8b5da09dbae50a4102737c9deb12a SHA512 281cea96cba9473b6d819ecc99c78e691097fd0a5e49e404e194c5ca1c45addc3046f80278c814eca5203b6d0d0e2335f7b39bff5f49303e7dec3f17f71d4fd7 WHIRLPOOL 9d782dba947ec2aa7cb8f1061fcf8aa72d5d87c82a231cdac2b1e985bf0f7468797745b6ccbdd8ccd687110827539bee83ae9838d11339bac31be82715961d6c
 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
 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-3.1.0_alpha4.ebuild b/sys-apps/calculate-install/calculate-install-3.1.0_alpha4.ebuild
new file mode 100644
index 000000000..541014e51
--- /dev/null
+++ b/sys-apps/calculate-install/calculate-install-3.1.0_alpha4.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="3"
+SUPPORT_PYTHON_ABIS="1"
+PYTHON_DEPEND="2:2.7"
+RESTRICT_PYTHON_ABIS="2.4 2.5 2.6 3.*"
+
+inherit distutils eutils
+
+SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate3/${PN}/${P}.tar.bz2"
+
+DESCRIPTION="The program of installation Calculate Linux"
+HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
+LICENSE="Apache-2.0"
+SLOT="3"
+KEYWORDS=""
+IUSE="pxe minimal"
+
+DEPEND="~sys-apps/calculate-lib-3.1.0_alpha4
+	!<sys-apps/calculate-install-2.2.29
+	app-portage/layman
+	!app-misc/livecd-tools
+	sys-apps/iproute2[-minimal]
+	!minimal? ( sys-boot/grub
+	sys-apps/gptfdisk
+	>=sys-apps/util-linux-2.19.1
+	sys-fs/dosfstools
+	sys-fs/squashfs-tools
+	sys-block/parted )
+	pxe? ( sys-apps/calculate-server
+	net-ftp/tftp-hpa
+	net-misc/dhcp
+	net-fs/nfs-utils )"
+
+RDEPEND="${DEPEND}"
diff --git a/sys-apps/calculate-lib/Manifest b/sys-apps/calculate-lib/Manifest
index c0a5ca820..40728f2f8 100644
--- a/sys-apps/calculate-lib/Manifest
+++ b/sys-apps/calculate-lib/Manifest
@@ -19,6 +19,7 @@ DIST calculate-lib-3.0.2.tar.bz2 111261 SHA256 c493713aa6a5a88d9e43b8e253b8554ae
 DIST calculate-lib-3.1.0_alpha1.tar.bz2 115544 SHA256 6fee9aad2e4cab7483bf5b4942774a01076f423928811daf45a2785821d76df6 SHA512 42e362be6b4a582c9967cc4e5dfdba5005c608ddb53cbfedd7ada99e89cfe504191cd41412d3cc62cb77131bf462b672631aae136e06177c610359e4d76e554c WHIRLPOOL 83e6de4bbb497637f293741f11e6a4c39736b5227926649eb7b33d9afe83dfa3fde81d19a6ca9c7fdf8b9981ac3133ab50c179fa82492b45b63b0c53b322d201
 DIST calculate-lib-3.1.0_alpha2.tar.bz2 115728 SHA256 8fa4e23fb56dcc6ddfa902a8bb41e95b60a8fa0e7e6360e14771f530c3c9bc30 SHA512 c2fdd666bf8d31c9868230e27c508b73855ed19f4fcfc97355725b2b8f5bf6116e223ba4e5f770205b8553f62f8d904ae1024f0c668b278bf59be124251b57a6 WHIRLPOOL 4e61089946f08a44a024e9b343e57e6f4e110bb5d1de08df37da5e72fd94d07fcd2b6f968c73c217bc3a3a49465442d39c33b34e3cfd3c57081bc85405301aed
 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 115743 SHA256 4fb8c936303027905317bf9505e6fa0612c9f8a153c07167f05c8a589cd6015e SHA512 c5fd0f17078a6ac24b293ac6f81d3d1b3a62e36de726607444b7e479b8c7c1ae955eb3c79a8fc68b969f1a9aae4fa1ff1d3e1899bbdebbadd688dbb0e255632d WHIRLPOOL 65bdd2ec499f6303828b27fb7060ec66eef9fa7af0f0e8c39f8598e3db712cfbb92c85fcbd274f135f682b40210387960719690dcc02e07cc3e66b7d8af38194
 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.2.29-r2.ebuild 907 SHA256 2a6717b1e0fc15152866d44556eac6df94683c8226d972f97a69e07ebcefffd5 SHA512 0fdb0d3df3d719a508504696b24132ac1761ce12d273c25c490578969cff3f9f5ae6c6aa7b9ddda6032e45dee356ddc495751dcc67214060831311f5bd781b8f WHIRLPOOL 7d2c5f47e2c79d1ebca3d889035fee3f8f5c90b178c5853a8f38e8b0b00373c38ef7e7bfd24f00e27e38f46fb2804aee1b415f385e19f458d6c2a75eb505a0fc
@@ -41,6 +42,7 @@ EBUILD calculate-lib-3.0.2.ebuild 690 SHA256 c89c29f5de3f70146e98f15035366506933
 EBUILD calculate-lib-3.1.0_alpha1.ebuild 681 SHA256 6a6332013e5a56db775c6490b63b60f959528660b0982e6a414f1614c0b0ffa5 SHA512 19a71823543fe843a05a548207509ee4dcffa784c61e23c56cf17d2c651effbfc63914beb03f0977b804c5cc647407eecdcbdaed4d7478783bec46eee72a50fb WHIRLPOOL 5ffd414c804671057fe2a7a2176999eee0a75574a5043332d3c01f08b93635773800e6b5d9901993e4fbf7f95d175659d621be9231d08f8bdada2654e45f8e1d
 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
 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-3.1.0_alpha4.ebuild b/sys-apps/calculate-lib/calculate-lib-3.1.0_alpha4.ebuild
new file mode 100644
index 000000000..ea686aa37
--- /dev/null
+++ b/sys-apps/calculate-lib/calculate-lib-3.1.0_alpha4.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="3"
+SUPPORT_PYTHON_ABIS="1"
+PYTHON_DEPEND="2:2.7"
+RESTRICT_PYTHON_ABIS="2.4 2.5 2.6 3.*"
+
+inherit distutils eutils
+
+SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate3/${PN}/${P}.tar.bz2"
+
+DESCRIPTION="The library for Calculate 3"
+HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
+LICENSE="Apache-2.0"
+SLOT="3"
+KEYWORDS=""
+IUSE="minimal"
+DEPEND="!minimal? ( dev-python/py-smbpasswd )
+	>=dev-python/pyxml-0.8
+	sys-apps/iproute2
+	sys-apps/pciutils
+	sys-fs/lvm2
+	sys-fs/mdadm
+	dev-python/pyinotify
+	sys-apps/file[python]"
+RDEPEND="${DEPEND}"
diff --git a/sys-apps/calculate-utilities/Manifest b/sys-apps/calculate-utilities/Manifest
index 019edeb08..facfcf6e5 100644
--- a/sys-apps/calculate-utilities/Manifest
+++ b/sys-apps/calculate-utilities/Manifest
@@ -47,5 +47,6 @@ EBUILD calculate-utilities-3.0.2.ebuild 595 SHA256 8106f8ac1f04faf09cb84cd8a5c0d
 EBUILD calculate-utilities-3.1.0_alpha1.ebuild 763 SHA256 efaeaf827536c7e0b59670e824d1c0dada3fa96f4e5df36caf0550271fa0b371 SHA512 2f52989877ffdf4ad854ff69ac482d5b918ceddbbaf5ddfbef6e089631551799d9b5c1557c5bdaaf8cffc8d791b29fe60c9bf29e565e2f73ee2d136666e731f4 WHIRLPOOL a471b66428682949a92f7fc73a0da343f77b3fbe4139879ad4666a8c5d61f88d33967379572caa5cb8e66400fca4e7585d62dd678117ddb60e26149ec529211e
 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
 MISC ChangeLog 38731 SHA256 7e70a0bc1f3b34c0011f3874773a698a4bb96eb6d3dad10903575156bb8578bc SHA512 2de466ea990b9eac702b81fd097c3f5d06d1f4db1a4bd1d1b7380b45e551f6fd62c16564ecfc810246157d3ef1113ae373041580e70981d44752e50ed6134bc0 WHIRLPOOL 5ca0cee1ad0e9419f91ec11a9629b9a29db9fcbed4f5ae0aef1f8a2170ff58112c8580d61884c56ee410a0abc201fa8f4419cea35077fc8bb84e733f6fa6f4db
diff --git a/sys-apps/calculate-utilities/calculate-utilities-3.1.0_alpha4.ebuild b/sys-apps/calculate-utilities/calculate-utilities-3.1.0_alpha4.ebuild
new file mode 100644
index 000000000..1f342b7ff
--- /dev/null
+++ b/sys-apps/calculate-utilities/calculate-utilities-3.1.0_alpha4.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+DESCRIPTION="Calculate Utilities meta package"
+HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
+SRC_URI=""
+
+LICENSE="Apache-2.0"
+SLOT="3"
+KEYWORDS=""
+IUSE="cl_consolegui cl_client cl_desktop cl_console"
+
+RDEPEND="${RDEPEND}
+	=sys-apps/calculate-install-3.1.0_alpha4
+	=sys-apps/calculate-i18n-3.1.0_alpha4
+	=sys-apps/calculate-lib-3.1.0_alpha4
+	=sys-apps/calculate-core-3.1.0_alpha4
+	cl_client? ( =sys-apps/calculate-client-3.1.0_alpha4 )
+	cl_desktop? ( =sys-apps/calculate-desktop-3.1.0_alpha4 )
+	cl_consolegui? ( =sys-apps/calculate-console-gui-3.1.0_alpha4 )
+	cl_console? ( =sys-apps/calculate-console-3.1.0_alpha4 )
+"
+