diff --git a/sys-apps/calculate-client/Manifest b/sys-apps/calculate-client/Manifest
index d8bc47371..118965754 100644
--- a/sys-apps/calculate-client/Manifest
+++ b/sys-apps/calculate-client/Manifest
@@ -1,12 +1,14 @@
 AUX calculate-client-3.1.9-r3.patch 3672 SHA256 8ab2d1a33a64d5cad2190ca7fdfd4133233c1edad5f8e5a1a127dcb1c5ea810e SHA512 ae6dd5e93f8ff5fc4d282776e83046f61b4ffa1ff4aa02fb3ea6bce2548fd4ffc33091b8d95bb6397daffa0c4b72e9b32064c5bab8117180e2cd97b1083107a8 WHIRLPOOL 30f208f8b6835fb24c1f8bc21bebb08c8d85940ef6cfd5a0f97594c3ad8283f333bfca5af8ef60e2f8535fe7d1cf43b4a4737282471203909b171c08286aedb2
 AUX calculate-client-3.2.0_alpha11-r1.patch 537 SHA256 1ce3c895424edee669640db405ff29cca558e2591d416b078e9d68e8dd43633d SHA512 50b4bf1c77924ce196af458056547b02f114ca1a3ef7e97a2ddd9ca17e1a5b3bd73a227e74def867b2ae3acd09b5e2b99537a98e89b1ebf2940de3931a091bca WHIRLPOOL cb67b4a483fb3c87a72e2aa18658e46057837d0d95d19df53c8c61dcc9fac619762208a81e6c8a4b903bb856efbf1c42b53a5ecc14cc22b243186ec8f10c29d2
 DIST calculate-client-3.1.9.tar.bz2 31260 SHA256 a45cd33d150bb5d6488aaeb9a79f1784cc99ce3a069b5e580a9f7217dc016c63 SHA512 b493a04429638c1252f2154b9ce638fb6e0ced4f869c970cb1fa4dbda183fab62192b39d09f220b3808c9ec1e65d99827e40d2955c60fd7b84f2289b65f706a6 WHIRLPOOL 764260f5a625aca9dacc60e966182a2293a9756f60eaae8ffb0cc7bcb8838ec2ecc81ac3e5cc61dc3f36efe5bdebdd4e1bc6959293da1b50e9dea164add7bec3
+DIST calculate-client-3.2.0.tar.bz2 30819 SHA256 e1e5c016ace3bdc0d3ea14fe62079b00587b89a716f88626aedffc8237842397 SHA512 9bc0fe9bde9011e5909b2fd79b34c6b2d2e31e0028bf8183dfb781d6cbbb7fb32ad0b202654f67e0ec6ec88050bf16b86fe126d070c140a18c9358a804d7b897 WHIRLPOOL d8de6f382e2a0e8147983ef7a27eee5308728d75b2dd6c9af4a006d6067b3a57aebdb8db20bcaa6bca77150594d4d42a4909a6784c9478401981d0369381e022
 DIST calculate-client-3.2.0_alpha11.tar.bz2 30805 SHA256 5b9693efc5bfe97e836d802b352c7a9a10808f18d015e9b2d692636bed734619 SHA512 04ab28230a43837de576aa0334c2361b8c16542399cfbadcba85ee49c0fb958d673b88af49a7500921a9e04c9303fe68d3d62f8a5e8bbdea4a2a431367e1acb6 WHIRLPOOL 229db99d222399d6c6ea10f842792ef1ecdb7b88f350e528b31b0cddda4f4b47c553436ca49a9727cecd617fc4e8cc4cfa9cacbacfb78b85bc7502a975f5df0e
 DIST calculate-client-3.2.0_alpha12.tar.bz2 30822 SHA256 ede0096b91acc5108f9ab657046899ece10d5c08f09e37844ab0ab528f8f27af SHA512 224dcc94def36702a965a63ab9fcf3f69f613de3b764917513ee8b4f86fc0acbd3816dd1b378c182d1c4db21cf042e8987176807b8a7c277b3b89d9ef0a5697f WHIRLPOOL 593192732fc90fb3cdca2ccd3614a87e702a253f15ba13f7b69b5eee4188c14fa201665b7b939f7eef32a051002eec115facea10ffe0266bcebf9b473c026feb
 DIST calculate-client-3.2.0_beta1.tar.bz2 30828 SHA256 b00b8bc2fce1b2a8cdaedbb6c53f46748c0872a9fd9483ecbc12c9658fadf8b3 SHA512 bd87f04075b07bd81ce2457b7ad573dab2cfe4f751603b188ec2f16f728d5ca4fbae41feab5bc332843c3bf47cfc9bb72adba84995ff0e2f2e3877549218e474 WHIRLPOOL 3b388e403ebdf5e801d452813875119524d311acf42e73749e5d2f9dcd59ddf6169d42d0ec0f85299385fa111790e60a4af308d904ce16446ad310ffaa4eaa96
 DIST calculate-client-3.2.0_beta2.tar.bz2 30845 SHA256 d1654016a57295596efa379b71d10bb4f6c3c6af61bbb055135122a61c9cc2eb SHA512 d4daa51c2d8aae889222110ca72c910960d701fc3dad774e7dc78efb4f73d117413ec1d178e308b681d86b9429b9c3dd60df42daf3c4d9ea2bced6912bb70fb8 WHIRLPOOL f168d192454f543cbe2e59a662a147e69c1a0c2df3ae43fb4dc0df44f9413fc34474b1fff79d373dba078e4497b231c00a92e4ae767f3a013c367b301a9eab89
 EBUILD calculate-client-3.1.9-r3.ebuild 1021 SHA256 ec274e96f1ce33869a9b5617846850c866efb58db4cdf5a174b9775dc103d59b SHA512 cda69b303461f09ce165cafaf5979f4b49a58b6bda1c5ac317f0208b633751f54997ab75a04efdea918f435110b9d985f6add3638c7e75109c80b469cdf6bf6e WHIRLPOOL 5c4a94449a3c21dbfa95d8c8fb66364d2e519401d409cee65040938a9613029f1dc12fe61f6cefb36b3f87e0ed8dd94039b92177d2801f2588615bcd59cc1b1c
 EBUILD calculate-client-3.1.9999.ebuild 877 SHA256 83a41a61ff1be5738ae66c0738301efeae4627c36d94723f14fe62648c33251d SHA512 6730cec5c341c257d9f33bef92040f289b07376b86baa8d2a3c75b58d24fdd35a112570ab31646e4035640d847aeb7e00225cbf0a6afb0ba32ad9e875a1d54d3 WHIRLPOOL 734187762f1b2abe200baaef1fa05cf48f2517a8a8f0df64d7f41a88e45b1c6f7d3519e4351e21ef3401ab42cef6201dad0e4098490bdc152cfb3208033d7c72
+EBUILD calculate-client-3.2.0.ebuild 845 SHA256 ff8f1ca3bbcbda9f88bd25d343e5f2a9b8ff29e22eae1829207af37ff2392659 SHA512 847df48583e3c965a5800d83bc8b888a232989a066d89b8474b3f2a86ea8dec69c4f340be20c1cedb15b59e3b68fdc522a23720ef9275cecc7555aa39d419c94 WHIRLPOOL 949e69fde1068d2b9dd29f206228b608900bd055b5dc9d72ffb6a42eaa23c2e785df769f2d8ed51029a8bf5670b189daa2bbfc7e7a428aa98a6e8121db2222eb
 EBUILD calculate-client-3.2.0_alpha11-r1.ebuild 1000 SHA256 cfc54891c96de573013a49d07543801a31efc35ff32db033fbe00f56718fda3e SHA512 e3868baec992dd2ba07a628338aef8aa09ef85f9636bea0e4fcb744982d4cd89138b9eaa6eb46281a245715cc55f79c0bdd82172ef2eeaf65d45328656fc5158 WHIRLPOOL 2b6a8a7fc6c21c47a18a86f3484cd917d9bff08c9cab7dc27ab91d8e8bd9d043801534857ebf4fecbd4dd91e18a3947e54069637d25ae5e578c8b9eeb4234982
 EBUILD calculate-client-3.2.0_alpha12.ebuild 853 SHA256 0d74dbf56847f575407ef4a9b55a0dc0c86b5df703e964330845c0ea8f611802 SHA512 73148516ac73e59db5a7129dd2d366280b4f3226302b2c3796fba9827231bcc760df5987aa15a510d67557553b08871aaf9da0ea181797d718b76ead809bd5b6 WHIRLPOOL 6750e597045c3daf931dc0a6f95c5ae73e1f192bf2e4bff6e76a4044357a96ceae97b7971ad2de3c05d7f7aa433b50c5385f77acd571f537c8656df32620616f
 EBUILD calculate-client-3.2.0_beta1.ebuild 851 SHA256 b94ca3f7e2f75de27465ea6f48a658f520d4bc2e9bc36f9f7b8b2044c8a92538 SHA512 90e7f74217a2eaf7e109d6f72971b81784654798dcc32ca959497be042063f06358730ba31623e296fa5ee2e25832eb5b13c347b932ba12ef8d7ee780b7a216a WHIRLPOOL 9f646ebd697cb7a65e5aa3c82c269d1e152c818875e4366a1abaa0e3a24148dd59aaf1fd2a80d6415fd5d32a993076b747a5b3be00d59632bf92010b128355b7
diff --git a/sys-apps/calculate-client/calculate-client-3.2.0.ebuild b/sys-apps/calculate-client/calculate-client-3.2.0.ebuild
new file mode 100644
index 000000000..1796f7158
--- /dev/null
+++ b/sys-apps/calculate-client/calculate-client-3.2.0.ebuild
@@ -0,0 +1,31 @@
+# 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
+	http://mirror.yandex.ru/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="amd64 x86"
+
+DEPEND="~sys-apps/calculate-desktop-3.2.0
+	!<sys-apps/calculate-client-3.1.0
+	>=dev-python/python-ldap-2.0[ssl]
+	>=sys-auth/pam_ldap-180[ssl]
+	>=sys-auth/nss_ldap-239
+	sys-apps/keyutils
+	sys-auth/pam_keystore
+	sys-auth/pam_client
+	dev-lang/swig"
+
+RDEPEND="${DEPEND}"
diff --git a/sys-apps/calculate-console-gui/Manifest b/sys-apps/calculate-console-gui/Manifest
index 9b7b93b02..28e60c440 100644
--- a/sys-apps/calculate-console-gui/Manifest
+++ b/sys-apps/calculate-console-gui/Manifest
@@ -2,12 +2,14 @@ AUX calculate-console-gui-3.1.9-r1.patch 4463 SHA256 148d5accc9cb390b57b824e1f39
 AUX calculate-console-gui-3.2.0_alpha11-r2.patch 1606 SHA256 3227df334116aef9585d700b9820cd59fca8906d5956b8c9a879539642314e48 SHA512 57794eb289bf38fd9f041c44f3ca4766002dc62ff8f75e8cf20c98c0d4fcab3bc7399837f579515da070a48ff80b9e3667eb3145bc9b60101ffcea57533be1f0 WHIRLPOOL 88a534bae58d03822490c3c48a39b715fcacdf035a9484c69eeeecbbc1c26964244918f3e078027fc873ef88061c7f212009114b816cc6e6a2d7c85b885630dd
 AUX calculate-console-gui-3.2.0_beta1-r1.patch 318 SHA256 805b384aae90dde65e5ddf30ae920871f6634bae79e9957f24b40ccef7e85f84 SHA512 ac63accffd6182ab2a8d1881e7032a2657c56d07d1d71771d991567ac586f0c9127d36cc4ea4c9389dd0eb9fc1a5fe0cf03ed837f3838eb10e84a485b5410462 WHIRLPOOL ee95acff3f0a18483e3bdc709ac710b66a8dad4625419ee9d1e1c92f4952ae1d2e72bdb63a092f77f1c8de9ba95a1ea4c62a08bfaa7a1d45721a5a50bf659878
 DIST calculate-console-gui-3.1.9.tar.bz2 320208 SHA256 97f75cb5cef02c5f23221f613eec1b86753e2f6a1e609aa4299aec9019d3f3d1 SHA512 30296f1e162334e99caef493c6a4dc2512b1b3e9836ee9ceea2b8878a0cbb0eb4fc49588417e51197fd60a25be45d5e18155f26e240dccf0925bb506b5f0d204 WHIRLPOOL 3a73667f51455044845d61893946da26fbfa9b88bf02e6a64d87387e040bf5c092dd015afc4870d2f9804d818dda77c589142cf931b87d45dc2dcbd3bf3ec941
+DIST calculate-console-gui-3.2.0.tar.bz2 433806 SHA256 3b3c837e3655d0b8ea3925030082f648529ca03a68e30cd5106e416c7e776042 SHA512 463dc3c03b1cdcdcf3885382014e9d1a5f8f85f4fe34faa3c0a60d21cc152fa0c19864b481cc487e505aad48b720b439a26e6de99e31d4e7a9491c18a1fb0624 WHIRLPOOL 6d53cce32bd64bf17fce084550ab2e9ad86014672613e25a342e0b298d6e10dcd58130845c9c6c77e0f90cf63d8ea50d99d5784c6a980832c4b86d8a7349ef3e
 DIST calculate-console-gui-3.2.0_alpha11.tar.bz2 433895 SHA256 9a9eb3293ea6041d176a2f8d83b6d991fe767a6414334c19865a8916e7a97c66 SHA512 3a4380b59fd51183c4b2724a59363735ecad4d589b2566dd29bbca2928ee00ad2476727d0e691cfe64c33325b41ea8c50f0a62f88cf4daf792be41a09b442bd0 WHIRLPOOL c1d70247723e32aeb4694ae58eb0ec9e23709db72f1bac826f51119401af6a57bb60edc45194d89ce0f9831282f959a89972e361d3eb36d81318344a66770a88
 DIST calculate-console-gui-3.2.0_alpha12.tar.bz2 433937 SHA256 3c42a3e6639ed7d204f4588569155a3021d8ca86b6ce5c1164f1694e29c241cb SHA512 a98bc278bb6f283a8e49ef028f451fe339e786675736bcdfabf1c2a58acd89d115df47b1f01fd1e2997df15b038f8d8d0a9897cc604fa77cec3baad221167eda WHIRLPOOL e953dc3ddfecbed573d679bc138184e85ce8e7af0f9758a134c8df4d3798f92f552f1b86966ee2eb07f99a0cfa04a3acbd4ef4e8db88993766e5237a0523d718
 DIST calculate-console-gui-3.2.0_beta1.tar.bz2 433904 SHA256 1f2bd675178737f692cd8555148deddcd85ba07624895ddf3ca12390cd6d2cd1 SHA512 f0173fe552520ba8b0f8d5646a11feca6371de2429783b68d8bab98cc88d030ce7d98b5f1e6e3045a3be3f8c6dcb28125b6cb1f98f96fe98a662bcc6c5c66a82 WHIRLPOOL 14869da3d18fbb3efef34a603176b539b82fb370257a78fc59284f6596cd0fc1100b75f0322d72f90af5279ddba1e54dfdfa1a177e9edbaa393c7bc8d420f970
 DIST calculate-console-gui-3.2.0_beta2.tar.bz2 433912 SHA256 752ebe81fda6d52a742b3da978917c5591d7bd6d14abc9a0d6cc04aabc45e2f5 SHA512 9ef3c9e1560d6c15f65a1a7f2d6c8f8aa8ddc877bd35cfd6f8430032bb8f2c27a6d5976fde7f327614f7e19365190c8f6d11d16a5a6466807b29201b97e74fd5 WHIRLPOOL 515551c2a501018cf7181d2d31706b137ed67c7de703a3b07be0be26b70c057bd87b01b992ac22a7f4f33a8678281f42f528329dfd6efbdcf71f1d6458e36e21
 EBUILD calculate-console-gui-3.1.9-r1.ebuild 832 SHA256 4111101f73290e73f846e2f9982ab4e3f4f5f98b457a40e17931161b48258e4c SHA512 eaeac93c61f7090a2bea66f0e19ed8bb9cdec8f401ab98b6167bfdce866d9deb61ef4b914ac7f022c0586c47999e8a8a3be0d667c5bf4d62333a854ee11f5e6e WHIRLPOOL 4ac670bf8e7530dcad575fc869a59238b92ede0efc4ae4b89c3fcdf7646e17ec4bf064ea4c40165fde873f5616714678115c9beac1cfd76ff5442679da61e182
 EBUILD calculate-console-gui-3.1.9999.ebuild 578 SHA256 25c597010320e393ada128672ffc1a2c2bfbf83a4293a929861f3d58902ffa7f SHA512 cfb7305902629820bf669b238090062c1dff92fe0f6d9c82f7192776961d2f937e7c042d66273ba2711a74d7e14006462d6585f65848838fb0d8d9f2be217cc3 WHIRLPOOL d42e0f6736a830bf53aafa3635192a05b3edbb4ac335bce223ecdd0f7bf75456aaade5a0f0625d247b836485418f5a9d3cfaea4c944cdcfd81645c1d4f4d4201
+EBUILD calculate-console-gui-3.2.0.ebuild 690 SHA256 278435c95c13aa30be5a385bfef508b8f1b710a5288a879ac71348f249271ce4 SHA512 cea2ae43e5aeb4fe8f847c1cfefcd8792860d8f95d57d76b9e3b9085db48b5bb499b510d62bc0a652ac1675423e5010c79737d44c395c521fffe1a91beba55db WHIRLPOOL b1fd5566069ff814ed77e30e452f4d0726a87e0986dffa1714b4d8d70ae19fb0efb480c9cd09d08e84f1302070be45619c476f143caaf10b09934e3465d50c3a
 EBUILD calculate-console-gui-3.2.0_alpha11-r2.ebuild 850 SHA256 5a0765a2b72e4a89eb98616980cc6f4f8810cc603cb4148389eed88d2944b33e SHA512 c610fa01db9fae26f826ad498be6a9d81d2c3f16fadec0d28d08b8d586f6b64d0fd93b368429848990c0cc2c6ee0ebe86324066fb66990a500dcb8b31b651c67 WHIRLPOOL 525456b32291e740fb9e389067039927727d02c2155311cd40f1524f23ac2b8f3caaca39bea7a5f495773565056c9cd684de6b14193cc48203580b7b3d228d98
 EBUILD calculate-console-gui-3.2.0_alpha12.ebuild 698 SHA256 f414b4ee23a1fd5817e3f0a750a3e7be9f560ec15bc830074e0bddffff719bad SHA512 d130ae97ac59475578e10a0b0a4467d27d0cc9ab5684125ada9495e25bc9a78156e2a1d755737135b99bce058bd620519a12dd13269732872c607af191c0cc05 WHIRLPOOL 9eb125cf5e58c0966c217630f1904f14725c37bf5c78ac1b90a9793b54caba00a4a2584ba8317167a6269595014b02e1696fe615102e8c58d2b950a1ea3d4d65
 EBUILD calculate-console-gui-3.2.0_beta1-r1.ebuild 844 SHA256 17729ab62cf721bbf9e827cd84463e5db7f852c369f56d681da12621adaa0581 SHA512 8cd6329c16e162176527b6045da59eacf8f1d676ffeed77750c3e903251b5b20c3518c57cae7f1abc4a227a1229de9cf0c15217db402f388af4d7e36c22cf6e7 WHIRLPOOL 6c1165a87145ef74cd9d6602414c109f587c1f1ba728bf1dd9926fa9df851a30b3a069cae589006ecbb847ec86daafc7afca8fa488b772d68d72480e71b86a51
diff --git a/sys-apps/calculate-console-gui/calculate-console-gui-3.2.0.ebuild b/sys-apps/calculate-console-gui/calculate-console-gui-3.2.0.ebuild
new file mode 100644
index 000000000..6cc2a369d
--- /dev/null
+++ b/sys-apps/calculate-console-gui/calculate-console-gui-3.2.0.ebuild
@@ -0,0 +1,25 @@
+# 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
+	http://mirror.yandex.ru/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="amd64 x86"
+
+DEPEND="~sys-apps/calculate-core-3.2.0
+	dev-python/dbus-python
+	virtual/python-imaging
+	dev-python/pyside[script]"
+RDEPEND="${DEPEND}"
diff --git a/sys-apps/calculate-console/Manifest b/sys-apps/calculate-console/Manifest
index 85ebdf45c..7cc735dd5 100644
--- a/sys-apps/calculate-console/Manifest
+++ b/sys-apps/calculate-console/Manifest
@@ -1,11 +1,13 @@
 AUX calculate-console-3.1.9-r1.patch 3310 SHA256 5edefa8453e6df13bd6e9172135fc9b7e194f7fcf783727743665f2594ec43e1 SHA512 3f7834703da042a043c5b2440cf4edff52b9265bd5fd27173c74ab06243f5c147b2985c3e4bfc8e2483ee54942183a2f97275cd161bbcc02bf097f7d91fe189c WHIRLPOOL e48d70167ad57eb5c1299ffca453229b11a1f9a28cdaa3b9899a90ed344f0636db2173b411ff722a0b363e8e49e5af8c75798d460690ac54e380cac7486c629d
 DIST calculate-console-3.1.9.tar.bz2 26009 SHA256 208f43af2c4d43a360f334eeaab7170dd589720b0fc08fd157c0bd88d4c6fa60 SHA512 cf6f6ea387b1ceec53f538a4de25389c39bcfafa7bbf344a952ae5b999125e97dd842d3dddb6dabc6b7008467b9593c97b8599cde07e01d3bbb1e77bc10d4f8b WHIRLPOOL 302d54eea8540f2c0da2a67fef44d13ec7ac79d6e4be80fdadf0354ba2df8ffce067d54b215f7a20c98392671fe4be0c48bffaa59ed1232d880b7d683a03a0da
+DIST calculate-console-3.2.0.tar.bz2 24617 SHA256 355e1a5e533f33a950eb30d8d82def02723c8d56deb83c2056b559069ac36cc0 SHA512 9652843eef23416fb186e79d3c2645609dca65b2c5befd17077afe84573ef84c510c97d360412f6386d719cd35d573bf06d9ce46ef185343895f86135026748f WHIRLPOOL b90e2a89d0c564ddd0c0bf7b23438d4b8c55fb35b16d0919880a56d5e361aea457b26c5d05fd0ab498a7e276570fefc6abb113d6f29a2adbcbb76de67e8dafff
 DIST calculate-console-3.2.0_alpha11.tar.bz2 24617 SHA256 e313c73f85a00112c4efda9539e50e2ffc9c3e1af92dadc3ca346490ccfa821b SHA512 5757e8e44c7d46e6bf9b9ec58ff2b3e80bda6835037947c2159003c28e9f3043fe19235bd122769fd4c0f134aa61a45c5c126b9614c4f5d15c1ffa962e0fe660 WHIRLPOOL 7eadfe67de9862d3ff4b76d1e0bef08642cb018c6b3deaaff51ee087143db2c0a87dc174882428cef8cf62661325c49b0fd8aef0e30e2cbdf759b9370fb76444
 DIST calculate-console-3.2.0_alpha12.tar.bz2 24632 SHA256 82c7b97145879d16d02fcf8e020e976dca3c9e6abc8d2ae841e3dfc1cfb2e0b0 SHA512 9c660e9d1712ccb949dfae37238bdc2f08c6320c3d4dd201798673986d6eae41cacd1ff9d40a747751a16d857d6ea4f24e64ad5029f57df79246d897ffc67e2b WHIRLPOOL 60d0c48d6f2b9f17d494de19243d87ed5b0390e2883104972caaae60dac32d4bc9b349ce7e0549a7dd1f9443731524c1b845925d2e8dfe364cb495611657da26
 DIST calculate-console-3.2.0_beta1.tar.bz2 24634 SHA256 e659fedffe00cc39bf6819e88a02a85af31fb0b38435258a8b0d06b52c62a7d2 SHA512 ebbaa1d6090285b27bcc595f063015f1f856d7750993392911d36dd3f223e77cb34051aa03c9d32110f03a271437ee69519d083e0ffbb128b7a88c8ba02e06fb WHIRLPOOL 43800486c330966c27c683fc0a0f350cdf126f96b35f3c152401dc2dab99c658649c819052c9032c381800a590ad08e34965c1b2df7853e6b5c11a685ad4f36f
 DIST calculate-console-3.2.0_beta2.tar.bz2 24615 SHA256 2d2d12acf8532b88d0fe606c20d544733eafd30d886bd3d299532aad03f1729d SHA512 10e05cc68e3fb487129ace8adcf0748082e592d1dc73e12c3fa967d80e67f04a8e759999c170f6fdfa5e42de53f68f8729500b8c77d90592e719912086b13600 WHIRLPOOL 083c675a1adf89c8df935891a9db52d3890d57c35ceb9594486154c1770e5f3445afbf157a1011122aff6584b1039bd3d2e823dbc70089c6006d6dcdb14a3367
 EBUILD calculate-console-3.1.9-r1.ebuild 745 SHA256 555cdfddb943b7c6abddf78d09f2b1b908f900004ef5442432a439ac78b14613 SHA512 7685757a40c9034bb03093de08e4527eb6cc5a5f89e8dccff252d2feab051e66b209f32105b843cd6db673a97d9db6985df74d2e409483a26ae27960dbba9004 WHIRLPOOL c773a6123d4f207fe2d734a454ad468d60d06cfc4683cb871a82b549cd447a8a64727d96af7dd1979a1df00ff2f9e308d3d62c905f5f0a0798ef3a818eddbabe
 EBUILD calculate-console-3.1.9999.ebuild 566 SHA256 07126fb77a534b36b74395b435927a1cd7449226910635e525f7094533d035af SHA512 247967e15ede8d2cc9524bd1eea57651b6065c13739047208ca29758f68f18c93903f6ef0a3d7219e2d14354a28b8bcff8ea1360d0490b088e06ff9c5f040bc7 WHIRLPOOL 1916824bbb412b426af0d26d8a3b68bc11995a68a033bed9778d4d2c1ef52bc01f79a060face83b2e43e78b1212215702089f65b2a5f7d95b66e76f5b5fb8adb
+EBUILD calculate-console-3.2.0.ebuild 608 SHA256 f53ab93d6b8a0aae2a1669f454a16e3c32274118e56ae031c6f94b6ce0a97ad6 SHA512 b3760712015fd514697caae2a713d992127e22ca0fb2aa6ac8a6148018226c2fd72527d3a94cff29a39afbdbbd18285ff7447a91e4ab45033e40575e06eb1237 WHIRLPOOL 2b73176a5e4db9f2f5ceb167b141451e10742a3884cd9157d79251a4c074db386480706961e4fb4361631254d12239708574f4b0ced43330025eafe49a8deb85
 EBUILD calculate-console-3.2.0_alpha11.ebuild 616 SHA256 70e8802122e726db5a80c3cb4236992b648793e707a8391c33f3eb0f6df0a5e7 SHA512 9e17bb0da00336b94b70f54d10cad8e66b892d5bf7488ab69edf9592b76f18cab3b041250abaa129f7af40560cf57cf41e25f990034aaa84c03380c997be6b9f WHIRLPOOL 1dfcb46e2e769469b35d8b4149566b89ceaea3822573a71ad527090f1ca9390d81b053ed84de21c04c63930c3e1c17b9b53667d0a7a5eb599ca492375678df98
 EBUILD calculate-console-3.2.0_alpha12.ebuild 616 SHA256 c25eaa548a055dbd3e67612c73667703e254d26f7c4ed4e7e5a6e1fcf963bd75 SHA512 57d88fa17eebc6aea53eba61de90151e61ded5cd3404e1013f6038a3e0937fc6190ac9e287ca6adeff610fa0b270f888ab4485eaba9a8f2402d5409226370ccf WHIRLPOOL 7fef4f37555e4a8ae579fb68a2a839a18aea8655b401516a8339c6eede75792d8719b54a31850fb3ee748407d2b3b8670fa6b00c9f0fb424426a6544afea1880
 EBUILD calculate-console-3.2.0_beta1.ebuild 614 SHA256 d880c127bed8ce209c44330c6bd84dcc3dcd585eada3e14b4ddf1446af226437 SHA512 5b0db501ed5d08d2dc94c1fec5b2ce78b7864df2a9e21bf1973dd667d53056893e421d230008f04420e864fb9b80630a173dd5abe43d38f8ccb94cf87cc7a183 WHIRLPOOL ae1ea77d3afeaa25cbd7105636f4b641d0cf69a988801ec781de6b4eac6b1cb76c5930a8baa2b5c0b5e07a8ca69cf5126225d3f7e208783a24dfbce574f3a181
diff --git a/sys-apps/calculate-console/calculate-console-3.2.0.ebuild b/sys-apps/calculate-console/calculate-console-3.2.0.ebuild
new file mode 100644
index 000000000..3f74ff1b3
--- /dev/null
+++ b/sys-apps/calculate-console/calculate-console-3.2.0.ebuild
@@ -0,0 +1,22 @@
+# 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
+	http://mirror.yandex.ru/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="amd64 x86"
+
+DEPEND="~sys-apps/calculate-core-3.2.0"
+RDEPEND="${DEPEND}"
diff --git a/sys-apps/calculate-core/Manifest b/sys-apps/calculate-core/Manifest
index 4193096ba..1e524b1c4 100644
--- a/sys-apps/calculate-core/Manifest
+++ b/sys-apps/calculate-core/Manifest
@@ -4,6 +4,7 @@ AUX calculate-core-3.2.0_alpha11-r2.patch 4459 SHA256 236efc35218f96a80f1861b89a
 AUX calculate-core-3.2.0_beta1-r1.patch 1204 SHA256 feb9b0adc34d5c037dd3b477ba4964bee7bb73776d529f18ebe626495379ea73 SHA512 8aeeec44b528015eaea5556c6631fc073aad83ec37def922b93961deeb162ef4900bc7f432bc8f766b976afb67d7346e3cc43f084621c1cc4a9048bafa0e8389 WHIRLPOOL ee69071a7a795cb62d541804511a1f4d1afb8e3fdae37fa00c82c0c8c4bc31bb7884f2c1c69c712b54e76f5c0e72ee6ef6990cc432259ff8b7c7833565580362
 AUX calculate-core-3.2.0_beta1-r2.patch 3265 SHA256 e771036656a64faa576deb20f50f1aed1c2485e8276cb6a5d802a1fe53466f76 SHA512 18179cb82acb3fcf5808a71e0ff971fe9c4309c9b8fecc65087a8b676fe0b716e84c1ede31677054c1aa6dfb179e3b302bba900796e7f52d5e6a16fca80b1bb3 WHIRLPOOL 6d5c00d96cb83a95f459334313cc9b5e128930debceede4cb1a2813775d084c29ce25ababd87bf6631b175d96b84009944b2773374c4e66836958d6c8025d55e
 DIST calculate-core-3.1.9.tar.bz2 83760 SHA256 c7e08d1e127b32196ff55c1c0b2c58d4eb805d06604edae0d76c8bc61e0427c3 SHA512 e0124f3d40cbba1a147a11949c3f57218def6ae37575a059fb1a37c111d1d29d8dcef9a4927c7ce7fce172ca405bcf225800bed3b00d05e3a663db13e7f45e74 WHIRLPOOL 18926257d8cc4a237c08f4354eac0fa5ce82162fb8a13aa5de5d31b53ee9acb4d3b1320edb746cd552fdacbfce30405d0092d9e6be661e04c74384803459a4fc
+DIST calculate-core-3.2.0.tar.bz2 88676 SHA256 fe8cc96b58851bb272c4c6c8107c73227f5825e0b86791b94e4ea2fd3a6e4ba3 SHA512 16c0c2241555221e7f8e3438035155eda193af17fc7d21329a174b4c9d4628e96db86124449be22aa3925ee7543e07937db99b45fa93933e2cc8cd7e50b91aec WHIRLPOOL 604397a7d7efdbf7d291b01445ed2f57883ac92a17ab99958131cec961e92215f85d8a6faaf5567f56eb6b92c657877efcb486423f6235ef32281bc3a41edce1
 DIST calculate-core-3.2.0_alpha11.tar.bz2 88248 SHA256 67d04e8a8cf91f9fc27e16c8e87279aa02a721ad42a748a3ad7b5dcec1d1de68 SHA512 a8cde2db1967d2285d5d1f7a85ea491f5e7207f8da2e812e164c4cd3d36ecbb823e2946a2f3586e09adf2eff7a6911bd5277f06a151f1351adef845b07ce2c41 WHIRLPOOL 199dd4ff70fb79a30a1d8b7f0df0fb009b4506d567932d892cfeff560d26fb9308ea923bb3c1a69c298545b7f033b8a880e6ef0367624d5b2cff25ce8b0828c0
 DIST calculate-core-3.2.0_alpha12.tar.bz2 88687 SHA256 e6c990745af8914b9e941e6a11535774978fac8f5b1c39f5602368d8ad766c36 SHA512 de5378b3f87037ad07bc64085a4bb9ae7a817b7bfa870a3d261cafb0147a98f89dc0d30c3259b8928f6b9cfd866b841c5f40a78c150cf931683509de29c8798b WHIRLPOOL 1c162a2554b55aba682fafb01efa97b2f96ab9d068e5a87bd59f674236c06970fbf5eda84501d956bacd6bfcc4486fb97dedfab80580e9c45d0ac16a64331a35
 DIST calculate-core-3.2.0_beta1.tar.bz2 88557 SHA256 4889ccbf8f6dd162f6ed42913f83030d9e2601357aaaac6434041a90b53bb8a8 SHA512 0c43747d41839344977346052323901c9969372671cd79276f74e96895fdca78c5d5ebebb53c0095d15c3f295794dbc9df1a5ac6fcd9eaa2f095a64b39203e65 WHIRLPOOL 8f421b7347bbe0564eb8995534d71e7394b44d4c509b50d4d6e2f8ca83823d45541dfbd1ca65018b9b4781da1616c359909e1f8bc7826018f50be8adbb3f5694
@@ -11,6 +12,7 @@ DIST calculate-core-3.2.0_beta2.tar.bz2 88538 SHA256 bb8303bcbe8c23617f083c34237
 EBUILD calculate-core-3.1.9-r4.ebuild 1322 SHA256 68ff6cd68effb6cea2dd32a3e274d8a240f88c543bf0714926d2316c8a99572b SHA512 9a5854f5825ab13243039031b91bc991789d5c2c6f0d88eccc06ee87c6c62c04f642c4e437e44b2dfb622850a2c28cf7d3ac7ca84b7605a51114d756b42ec83e WHIRLPOOL b7d923240981d947a514c9c8cf0bde2993dd279728330a85cbd18e620097ce8232a8f28755b9aef0a7d289c0c3a983cb4674df87807230045096b1ca2cfa8da8
 EBUILD calculate-core-3.1.9-r5.ebuild 1333 SHA256 8bbcd64529be1f9e16c93dd215bbd541c225bb51edd80e6bae32f8b38c854634 SHA512 e0bc302165f265ccab6567fb7d366cd1a913d282db57f0a9b686204454c6fef5d33981bfd910c51ae691c2cc8efb6998c4a81dcc713075279df27fcbaacde1f3 WHIRLPOOL d9bbee9224d7a5a6fb006d3625a20be8fcb56da9cd62437637fbfb79e995fd572e5a16c75f8cb184e6371354585f24a4e98375491595e6e384a080b16a93c841
 EBUILD calculate-core-3.1.9999.ebuild 656 SHA256 475e34d10141354a4c60e029fc1cb74b080c3a1371d9e1e44a5e2936b7130ed4 SHA512 9ba865c5effa56079a3841a96d1a4a89d4bbc27e092042aa4a87d1b4ecde9d3a690c92c73e10b330724258aaf3138d2a58d50d18d2fbea9e657c3c5d2f8395ee WHIRLPOOL 89d3bcc657324d1ffb4265eab3e28e94e3d00fb7530c6654e75b52fe002d70f72998930729cfe3320a3ff571277e6e59c649b0df2fe071bcd9b050f9d42608eb
+EBUILD calculate-core-3.2.0.ebuild 1198 SHA256 272537f6c53b7c2baca5b1e797978d52c18bf46d1ff630d763d9a0f83d95af81 SHA512 e9c447dc61ec99b3e0d68f94b395498cce86ad9fa6594e85a65d52b7acf60cc90ac0c1f5b8e1b54e6c367321d6f4809b0f1fef254d59a3517e5670f6ed9df1e5 WHIRLPOOL 3830c14cede148cdc16c02aa9a9cf1dc5d88f55e4053923cfc39bf52aee1015b813b6a36c99ec436805df7d2d908b6b765544c0d7e42accaf51618519f0b4cf9
 EBUILD calculate-core-3.2.0_alpha11-r1.ebuild 1340 SHA256 2d6e9a4cf92f2560748a6e3a9c1c8fbe96519f537dcb22e6662763b5725e1505 SHA512 d683b91430b0815ddddd8be666033db24c94689908cf9f8989b9d060ac0b126caf4eb7d7418ad5240447ced35c19e2bcc69151e72d814774451eab385ecb3e26 WHIRLPOOL 63abb44b79909a0fa422a10d2b67b5e46bdbc6569074a002562e19a5678bb47ccc0fa7d1a34b40be4eaf50d4588140ce1f92a4818697306c6afddcdf3531120b
 EBUILD calculate-core-3.2.0_alpha11-r2.ebuild 1338 SHA256 29c3801f9d1b0bdd1c494481e2e0eadd96410b62f88461917b6065013eaa8472 SHA512 d66d906b85a4c37faa99687b35a6f26a145b46cb3826bc993d941a5e577802c74b4e620e168c3a9813bb2df95950c2aa1c995e5a6d66594aa836c7c160d7a6d3 WHIRLPOOL a97ebe187781efa8adb8cfc23f44999b0a2ed6cc126d6e1d0c1ab5f19a937294b3624bfd3fd38196d732c4e3ce8bc45337b6237fdfbe05b5f9ff995d7996239d
 EBUILD calculate-core-3.2.0_alpha12-r1.ebuild 1206 SHA256 aba96176fb2717d49c2081302501f50c492ba9e67cd84b5deebbd2f945def462 SHA512 2d8822767602ab79515594d239cd24e406a3283ad8fe52a6405d160816bd69cf77f2cdf61ea4e14a04226ade8d92d7ac1b5ca1762b039711d9d93bdffd6ed8ed WHIRLPOOL 1e544e3931f59cd07f40c88e93ec608787b5b646b46fa8fe75aedd1b1e3f780ee5465f9c1ea31ae99d8d3d1352a8979faf9f4fd5d1ba1f2691b6301f05f3fdc4
diff --git a/sys-apps/calculate-core/calculate-core-3.2.0.ebuild b/sys-apps/calculate-core/calculate-core-3.2.0.ebuild
new file mode 100644
index 000000000..541248bc9
--- /dev/null
+++ b/sys-apps/calculate-core/calculate-core-3.2.0.ebuild
@@ -0,0 +1,44 @@
+# 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
+	http://mirror.yandex.ru/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="amd64 x86"
+IUSE="minimal"
+
+DEPEND="~sys-apps/calculate-lib-3.2.0
+	>=dev-python/soaplib-1.0
+	!minimal? ( dev-python/sudsds
+	net-libs/dslib
+	dev-python/pyopenssl
+	dev-libs/openssl
+	=dev-python/m2crypto-0.21.1-r1
+	dev-python/cherrypy )"
+RDEPEND="${DEPEND}"
+
+pkg_preinst() {
+	dosym /usr/sbin/cl-core /usr/sbin/cl-core-setup
+	dosym /usr/sbin/cl-core /usr/sbin/cl-core-patch
+}
+
+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 91232e7b4..b76bc232e 100644
--- a/sys-apps/calculate-desktop/Manifest
+++ b/sys-apps/calculate-desktop/Manifest
@@ -1,11 +1,13 @@
 AUX calculate-desktop-3.1.9-r4.patch 7701 SHA256 90fd3216a4242353c6405835095608481972dc049c8266309ab7888e299d5843 SHA512 03cd1987dd67d0acc6ac94b3a966c630d25e0913cf3106a51be6c4c3d872558c31eb0fc6f1629dd0f902827632973fcf308cdfdae41699ed64b5ecc1568d481f WHIRLPOOL b352d846a18cc2a9021d2156ecb536f5cd94d1e07dc3cf15a65aba10eaa65436367fc48f43e6fc7fa57d1a2b77b6d6a748bec069c7ce79530c3dc675c547ebc8
 DIST calculate-desktop-3.1.9.tar.bz2 16877 SHA256 1557cec5d6f50c38f356198220814998354da94c925f4001f08bcd96ed42734f SHA512 f5e7a0fdad977cdc7b24c57ee8f0d0348f35eaf199bbda02949e183b6ceee4e1b53c6309fa1bc92f794fb9a3eca6f90bc6fbd15509bb3d16878e39392fbc0500 WHIRLPOOL 7c17f00a9c788d05cd85921ef1fcab8c683938eec0536cdfa448ceace52f3d4b7bdb7991028e89abf9b974cea6b2c0c6c57c9916320ba4460937d75b3617bd36
+DIST calculate-desktop-3.2.0.tar.bz2 16957 SHA256 9acf916b6a1e929d58dd27df03f507a1a8f35187b6b312fe92d7bc0ee352f8ed SHA512 7abca6341776bc23849088cfc6f045365d2a788ef7d4be50f5e209ac73955015e510b68a46dfee35e46d6333be9474add46bf8de330ed4f49222b12fefaf0aa1 WHIRLPOOL 881e22d6a29d3233d28f83c6614f9b8fb56fce656e88eb7dc82122eb5596ca23fe4f5424b3e3119b68acd513ca47a834de47c9c988a7e9ac9c17bc95ca8d7984
 DIST calculate-desktop-3.2.0_alpha11.tar.bz2 16982 SHA256 ac9a04ebc3ae4ef6c1547100f0c5b098f46a43e94136883cf413df94ba49071b SHA512 00849d78754015f822649de74d884c75668da48bda385ed83d01adef13ec530d697bfb258e84701da32043f036d7f1a5e3590af6a882c155b6b8084976eae4f0 WHIRLPOOL b510ffd3b3208feac6a70ea277923b570efcdfb410112ef17fd47e44d991d7ff9f54a9398caf7c5550a5af5e5eefb659669d1f251c21017b4eb331342e0e8cfc
 DIST calculate-desktop-3.2.0_alpha12.tar.bz2 16992 SHA256 68a360e4b75bb747ad0caf9d40911f1317d084ce9e22e02c8248db69363093ed SHA512 b0759cda26a005e21e71383cd2a8013efd401735aa659de59f8b02a09a455bab87a0719f1f273125a3468e8a0877436b9a6468ce42cfa863c4c0cd14dec2550a WHIRLPOOL 0305dccc83cc178b443e2d71972c3cc3079a6508b222db37557e5e5d50df25006cb30afaf3a85e3dc3c589f14b18e15a65cedcff611936fdf06fe8dc5971b779
 DIST calculate-desktop-3.2.0_beta1.tar.bz2 16979 SHA256 0e2dac0582700ee5db1ae6ed4b4a38a238f19f862e6d4e1d1936504515f668b3 SHA512 c4683f41360772d8420540fbe3afc845ea41a4fc9e4007374e4d854604b57db7723571274a52e49bc8539a70071939debd150428e1106408b5f1f929db729766 WHIRLPOOL 52839e3c348c5483160b34385cc9663ba71e7b990820270827f9d8c3ed9c9d0e0c821d6f74b0fb0989eb4ee3d0fdc07ad8be9e5637ca57cbe3e4d41985c6c946
 DIST calculate-desktop-3.2.0_beta2.tar.bz2 16983 SHA256 92d4646c6c7c9eb2095d0ffe57dd5ad36314f1db8cdd4d90df67d0cd08b0540a SHA512 2f954e9944c901e2c60ab0f1162041d244d924e57926b5649a7fb396137ed03dd4bff07cfd78587ea5a4b0dde6e6a13deaa487ade78177d9f2c84b74dccaeb7b WHIRLPOOL 77d46d904630b985e8755811d6705b28001b9b5b387d842a09ca6604cd297468e429e9975fdcf084bc09a8f4748d0f7aef6077ee4389c2c8d4606f8b031cf534
 EBUILD calculate-desktop-3.1.9-r4.ebuild 959 SHA256 b78ed5b4e48e06724ff4f384d0703aebc22ddb9f2cdbc4da56436b9328890495 SHA512 15d941ef346a2db6a522d1e3ff18dc0ecabb2e99df4720fc46496524e11ab4ea075616be99316847ed26353de9b18a06e2c1938121938c29e7282396933a3bb2 WHIRLPOOL 7f2dd1989eba64d371d639e2f5927ab001a75c4dfeb51f819eddb7184f473b86ed774c7bccedc7b89a84c8cf799283a8556703b3318db742a6fe91fb9fa2ebc7
 EBUILD calculate-desktop-3.1.9999.ebuild 969 SHA256 e54580fe8b5a4b6bae4b806c738424ec026640a967dc5281aa5ac754aa20a8bd SHA512 d131b45e2c98762afde2eba1c60c77ada7ca7bd73401efe7ddd02541d4735e47aecd8d2b01c388fe05a065c8bbdfb9553a38fbec8254296f5fcb6cde573c3ee1 WHIRLPOOL 79bda235273657e18ccc0c0fc0ed0105f75cfb81b69f6871062971a959e276ff3f30ab1114a05f4c90ed1365431024f2bc6711ebca15a70d3f49974d1a28fc5f
+EBUILD calculate-desktop-3.2.0.ebuild 828 SHA256 534c22ace5463b1848786e16e5738f6e6e8a67e3ac44106127805097b04633d2 SHA512 6284abbf9163c1aa50ab751312b5dcbd57743931ad57d6836e75affa7c87914c8862b6d4afb2775a54d0862f5d96b56f2928556b539c2fc07c303d40acc1606b WHIRLPOOL 37dc578c3007b31b4b9365b854cfd5f327ddc14f1725666e0b3461f6242ac03e420aaa64c44330bce98fcc553af231b64b4dc42559ee78cc6d0f2d4d5b6b7aa5
 EBUILD calculate-desktop-3.2.0_alpha11.ebuild 836 SHA256 ab53859df98905da4ee39cff8c7c775e0fd8f2ea413de7c3dd62e5564a464849 SHA512 587ddb2a3844127decf9d965be0989f214e97f267cd8e66631e9429cf2463d881fe848f634ad039cf4eec268c8968257ad48924f74a0473e5092d448f11bcc6a WHIRLPOOL a16430f80e5cd26320ab178035d644caffece528ec96e792f6df141aab046351fff408f5de2b9a35851df0908e679745d42b5ee71b57ff16349d550966d17716
 EBUILD calculate-desktop-3.2.0_alpha12.ebuild 836 SHA256 e97586c819b0a8a17516f82c44494299362a7d0b587f5d7862cbcf6d75f23830 SHA512 8281c48acd58b4f062ff2ad7a5be1a990e01e689dc157c9616011bc1dd5a117b10e631fcd4d0d7757c873463974ecdf40fc38333dce50f5dea3768d56072d8b8 WHIRLPOOL b4962e94dd2df39b0f8ac79c5501687dd955fcac1615c77049e2a8e740502cfa76263c2ec20a1f541b26c928105335d67be0f474cbf3dd3e31d9391f1baf5116
 EBUILD calculate-desktop-3.2.0_beta1.ebuild 834 SHA256 eec0939659bfe2e20759043d467db6fa9b1cf640bed1adc738d890d3edf65aa5 SHA512 ad744e78e8ec2f9380fe95fd5028503f1461a954f4cc2565ae86002ebdf2638876a59fc3cde25485ee9c8a285c390ac60999543a24bfc0ce3ecdf0d96604d7bd WHIRLPOOL 298fc01e0e3f0d39851d466a23351f33a0bc120704f6fdb1c621a2f8f12879e272a7ee99e56ba1ed05b99b113183a89ef3c0f1c7f68668c418453c9e6d45c413
diff --git a/sys-apps/calculate-desktop/calculate-desktop-3.2.0.ebuild b/sys-apps/calculate-desktop/calculate-desktop-3.2.0.ebuild
new file mode 100644
index 000000000..95c01efdb
--- /dev/null
+++ b/sys-apps/calculate-desktop/calculate-desktop-3.2.0.ebuild
@@ -0,0 +1,32 @@
+# 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
+	http://mirror.yandex.ru/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="amd64 x86"
+IUSE=""
+
+DEPEND="~sys-apps/calculate-core-3.2.0
+	>=dev-python/python-ldap-2.0[ssl]
+	media-gfx/feh
+	x11-apps/xmessage
+	!<sys-apps/calculate-desktop-3.1.0_alpha1
+	sys-apps/keyutils
+	sys-auth/pam_keystore
+	sys-auth/pam_client
+	dev-lang/swig"
+RDEPEND="${DEPEND}"
diff --git a/sys-apps/calculate-i18n/Manifest b/sys-apps/calculate-i18n/Manifest
index 822955830..60a480141 100644
--- a/sys-apps/calculate-i18n/Manifest
+++ b/sys-apps/calculate-i18n/Manifest
@@ -7,6 +7,7 @@ AUX calculate-i18n-3.2.0_beta2-r2.patch 897 SHA256 bf9f148b09129d2282cc7b6c20b68
 DIST calculate-i18n-2.2.31.tar.bz2 33616 SHA256 0c0a8588b5e7d7dffd06e5d763108fc069cb65ef48965ca7c762ccdde213476b SHA512 6d9cc4c8d7696d77017db7119e53ed766b759f063d1d68804e7f816e238d83c4e69df80db739144811813a6adde0bc15253fbaf0ce257e9162fefc6043b2fed4 WHIRLPOOL ffd0185124ef89323c3fc527df2e3068aff77b5981ffaf93e3e6c54aead2913b0b60abdb939290e0689c5191902acbdefdac75effd6047cbd39db95496300f1b
 DIST calculate-i18n-2.2.32.tar.bz2 34059 SHA256 cd21ff9dd1f429327a8651691e44dc1a1b37f48705962ff4c61e53605ebe4b14 SHA512 377ae5a67b6b4a86b947a5b7465a3704ccecca9bbdacf3d8e0040190689d0e312d48d2e7824883ab9e787e1bcad0b3c61ba553ac33ccee1fe5e27c7b0e419844 WHIRLPOOL 215727ec25d0f79ad5a35994562ee8ca621242fcfeeec2c905411203883593cb3eb60a2671747c3addc736524673000ea399cd0be73e4cf818f6af53788e5b2a
 DIST calculate-i18n-3.1.9.tar.bz2 61189 SHA256 6851a341dbb66baf68d03fdb27fd0dcdb467fd5c595860bb6e6beb74b4109122 SHA512 81ee9f4c0e703c41e1c3942c549592f8b8f3d299b4c87531979ef21bb0579b901cc36c25a0746a1e21865ec328bf1f5451eac6ff4511c9be7bd1e575a4d8e575 WHIRLPOOL 2e5e44ad88705dec80077a0badfbe37fefcd9f61bfe651d71ce1844771a757b148dadb7c588627ffa755ee8c0e36b1ac762fe3126c5cee148396985abe8fb1ab
+DIST calculate-i18n-3.2.0.tar.bz2 130580 SHA256 f2243ce8eff9afe7813bd02026c5c88604db572e6786554f4cca27afaf4c21b3 SHA512 a0f18c0766a58920cf023dbc833508c4a2ac3ce8bdae059e68807ac424002aeec670a4e077649de7d27ee419043e637f3bf545eba752d0c95925d9e9d0d58c84 WHIRLPOOL caf472008539152423ac6979c8cda24213b09cc0e2663b86a0ab83b1a15ff30ac86551c627c17eb00360dbed1324a63b7e7220e103bf383a0730a516ba5cd90e
 DIST calculate-i18n-3.2.0_alpha11.tar.bz2 126521 SHA256 a537ee5b9870a7e79ce723acad61163ae0cc41b97d390bef2374c7c92671be4e SHA512 e37f677352bd66de55163c8613af8a61aa2480186b4ac7a53b62b67ff3656958cbc2a26939393f537da843283af61493866e9f401d6fc906d1999259d10b8433 WHIRLPOOL 7cc767fbbc50042193e88c8413c64f444c81c5e74f8d3d7c1f2184f885d3cc5ff6b61aaecbc0797873945f851f8b7e1eb870d5174d6c5749464492a682f708f4
 DIST calculate-i18n-3.2.0_alpha12.tar.bz2 129243 SHA256 80ba3aa4303b0b256bb0c6d1e8cb45d72f68d7540f68558ad106a40f7e03d487 SHA512 d38e61feee7d07aa66eaeda7de3b98ebefd1d7a65d3509c242e0df3d3b8ce156cb265e30de37fc7720b8a2f8d6e63168e44b63818fc9e96f42062c55d2af0424 WHIRLPOOL 93e16415618fd7a7337ed2ddb95bcf53b292e3834f4979060b572e8d7a042f018fb4d35315b3494fa91dc4821e46e2c8ff2b8575358386b05792867e64034e9d
 DIST calculate-i18n-3.2.0_beta1.tar.bz2 130326 SHA256 7b91583af9f4256778f7ba068137fae66b91a55ebded0abb33e6dc579ef49c7f SHA512 538aca332876c6ecc237b548a8d6c086ed27f8ab10c854ffbd77836437ed442da313907a3c746220ab4ce8c92539673919e71ff6e2d70381785bc16b7b206ec6 WHIRLPOOL 33383675133d0b068b3d9ea70269619387001c7e1554e74ebf2622e91681f24a628686464c3fd9944d66c633ea703efb0f7d259e273e199be0752c58c27f1922
@@ -16,6 +17,7 @@ EBUILD calculate-i18n-2.2.32.ebuild 832 SHA256 09ea7ff84e6c8d265f85ccaa6916ade59
 EBUILD calculate-i18n-2.2.9999.ebuild 770 SHA256 2c38668205a788dd9d1ed413eba96a4f628a14e6f6c7a1ba8718bbcb0842a1ca SHA512 4ddb81ebd5b5c488d7eaad86172394d502e965f5348594054ba104bf706b830987e8f57b60893898e5167184eba1b0b108a683c954c8f80498665fe069504810 WHIRLPOOL 8c0063a90e103e6bf34d4be221aeb086703688830fe3179dbd177750cb179432ec2055886330f99ba8eada65abe97fc805da90ed9f257f8c87d7384611fa677d
 EBUILD calculate-i18n-3.1.9.ebuild 647 SHA256 a853bf344a5bf912ae5b27892ca0690cea80e2e90771a1ebd1a9b0483edd0eab SHA512 0ae45c293a4c4e648d5491d3d199035f20e4cb557497aa2cb9a30de80e8e95ecf5961a1987f8c418ec8735aec732a7d08336b762ce7e1fbffa37ce4c0f520259 WHIRLPOOL ff628d245263f2bbc240eae8cb12a7b61ef2366b785bcdce2c2786e5630e3e889849132e6e7578418eaf16a7cd86c6454f1faea7907e11f23f2bc697edeb7233
 EBUILD calculate-i18n-3.1.9999.ebuild 583 SHA256 aa60c513b0f672aa9618bfd8099fefaf49fa5ef9b24ee2645356da69563032fa SHA512 14b87ddb0f910e1b983ef465efdc56347abe01d4cdc11d6d81d593a2e65dcba1b79357d37952d7aa7f800fad8d30592db2e337d0fc6ca9807bdba618aff48528 WHIRLPOOL 14a1c4f1ef646aee28934e820763bd149e37860cce1ee34ac2229742980ec178fc43ba284b59a2f71a740cfa8e48ff7658a613b03eb0f84d4a10cefdd65450da
+EBUILD calculate-i18n-3.2.0.ebuild 647 SHA256 1768600dba0e6b0214767d52e294cb2679f307cf22502c63c24d6642831de8b4 SHA512 ee4027d03abd8d044055654a26473dc7be5aeef4d3f7a6820d90dd69fa3b97843abc718c12b1d4927804bd42f0b829dbfd7ce7d4c612e30a2225552188aea2ab WHIRLPOOL 31ce22d2241fb552dacb2b14851833b45108a0c45530c55ae975ccb6b4071ea869626b9088db30e9233a23a28f47c9ac1722f48d5d3cb1141360696462f56f6b
 EBUILD calculate-i18n-3.2.0_alpha11-r2.ebuild 800 SHA256 869d0e281918abd26a813a6079506e8ab99b8937b1436175ad1da103795701be SHA512 15a004c5a86bd2a17e495f439b6c197cad74bb2bfcc279821954800d4725999239830e1c2535dfa5f8b60a00f687270f67dea4e618a79d59a1fb0ab755b8cd56 WHIRLPOOL e78a90577162923181c3dc250d5ea96fd6e94a2e1b79b87bb144e7d77f548c2dcd5f8393d64c2e6fa4695f31496476362de7d109411e08fcc3566085c3775e66
 EBUILD calculate-i18n-3.2.0_alpha12-r1.ebuild 798 SHA256 6dcbbd648605cd70fb21c71034cca905bb162b2873eadabfeb54abc0c9c39173 SHA512 9b8efe72105f1f6c4c3869f0596b07ca7e86c97cf761490db43b9a7714e68a651b06572895895e7bdcaace958066537dc279dc1fe901565a707a8db5460e4493 WHIRLPOOL c9d8925458e7cc689fe93db496c7f2690f38ef7ef055b5715f1c9108a0dc44c11abb546c231aaa789ff32497aa0832e159ad78d5431f649f785d53bbee99c21a
 EBUILD calculate-i18n-3.2.0_alpha12-r2.ebuild 798 SHA256 b85ac9a7fde60cefd58abe1b8ee24964e7ffa03df24b791f9b798f4b6a24a6f5 SHA512 420152ca390717b3ab1a9f0cff5458eb69b56dd368a47b62a3933de7b64ee7406825464f0ace5ddcd192804879974a26146268947e5ce91843ea73fc95e97156 WHIRLPOOL baad0fc018556877b56c79469e0f3e3231613b709e1a80cd7c9e0c5584ae4eb105200526eaf740687d6c954880f23fc916640f2b46c9ae13fef56fc700dfe0f0
diff --git a/sys-apps/calculate-i18n/calculate-i18n-3.2.0.ebuild b/sys-apps/calculate-i18n/calculate-i18n-3.2.0.ebuild
new file mode 100644
index 000000000..5d6950585
--- /dev/null
+++ b/sys-apps/calculate-i18n/calculate-i18n-3.2.0.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
+	http://mirror.yandex.ru/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="amd64 x86"
+
+RDEPEND=">=sys-apps/calculate-lib-3.2.0"
+
+DEPEND="sys-devel/gettext
+	${RDEPEND}"
diff --git a/sys-apps/calculate-install/Manifest b/sys-apps/calculate-install/Manifest
index f5e96f378..90f4f211c 100644
--- a/sys-apps/calculate-install/Manifest
+++ b/sys-apps/calculate-install/Manifest
@@ -8,12 +8,14 @@ AUX calculate-install-3.2.0_beta1-r3.patch 5939 SHA256 06706c8ebea7f6d45fc12303e
 AUX calculate-install-3.2.0_beta1-r4.patch 6753 SHA256 6d80d547713b2d10134bb49928d40674d351c03e857ed3da2cbffbaa7c5d914f SHA512 81894344d8efc72a436d96d0be5f4dd5257c66c5a44f9b43a7f4cec035940abb628280d7c8d707b07c4aec7e1f0fe699830ce32c905a419fb9474e05385dc22e WHIRLPOOL 10a4f5658fad507cb44f3a4805459d36d70f2035f1caee5dae48961394791bbc28856f5e24e17414239743a4a404ebd3b0bb17a41463e8aea4d4b94fa9208ba8
 AUX calculate-install-3.2.0_beta1-r5.patch 7354 SHA256 e37932b2910fd2faed72936a6f057cbc77488d53a1c0387ddee45308b715b612 SHA512 b2f2487e115674bf7e13b2f1cbd3e09b0ad43dc3ea07984a5a08e8f5ed134d46e8a9653e8b9d1e5f539e391c0ba71da88bffd2871dd94df76a0b01816e5d9f44 WHIRLPOOL 0e8fc21231225fe024aeccf52adbfe3f3d120b2c5d201e2ccc01842617b78c82c29aed2fb4b03c7fb2563cd9d434c35f97654123fa873d6a871b9206f48f1d98
 DIST calculate-install-3.1.9.tar.bz2 77323 SHA256 67613113eddeb61be3c5b25187dfa62caea188a3ac84460e99bb306e07e6f97c SHA512 d680e566b95463c2310f4313fc82ba643404a8dcd6628486a1cc2354f706e44832a023fdea1a9439230d98aa233490b89f3aec2e58d9f28d37746e7cb36ffdd2 WHIRLPOOL a0616b1a7f4434813e1ae9f1df7b0fcdb25120b3736d6ba4957fb53846df01fd1c4219c887d43a9025d700957fa0d205f7091176f870da98c21292d83e42720b
+DIST calculate-install-3.2.0.tar.bz2 79564 SHA256 ee045038718677c9535b0e6eef687c3230ea428872f36a2d829346c331863603 SHA512 933a94a15a0c4a8b65809c568590bdfc55900f61dbbec872f1c9fa173a8eb0d5bf3ebdd72ac751713c14a9af50ab8f36feb166a4b9a71748159d96d1e621c8ce WHIRLPOOL f227abc52c450ddd2e08abc2f21283c6c4189d2616f1c044b0a1f86b587bda79b84338841e71c3a16db192a68b0f79929b39f84381564dfc9c840e7f8e7b6c67
 DIST calculate-install-3.2.0_alpha11.tar.bz2 77353 SHA256 f4eaa14184ff38db1e3f85f39fb610b9f7abc3373eff3232f271584e2f314c77 SHA512 0254e181c1da0108208b0b08300d40512fc45e7b75106aa7bd608d529cd2ef5a35e5a01062976688def7d5afb6bb2cacdd64eaf05420780566b22e0ef67d85ab WHIRLPOOL 58e8c38d6cf1d8c8ad6a459c643f9a9350bda07a96bcca2f87d6106c54a4dbac8b183e6889e481966e417423100820b4d6048ab471199a1a3b84758b7a3f28fd
 DIST calculate-install-3.2.0_alpha12.tar.bz2 78984 SHA256 64e734d052548d97de9b9d5c5dc0cb03e5f4d77aed991e600f17581ee9317263 SHA512 ff643d800752f0691e9727f3fc87cf73138638dee2799e14614d4e614baeeb739b3af1de8d89e5b550008ca827884430d6be0670ce6fac3a76ace5fe856a12fd WHIRLPOOL e25903a91271dfbb05580783f967991dc4808200346c35ec202b5a19b1a9026daff924c8d8a3bef762c9082b87df483264babebdef8e45a5d4794754f12e7a7d
 DIST calculate-install-3.2.0_beta1.tar.bz2 78992 SHA256 fbf4456e442839f518204ad68e4f6c28ffb9e6808d38e6cb294ba5785e536941 SHA512 40a55aaf2a66409076adbba9c6918dc8250affad7ebef75f6f6b6ae2c4041f12aea8db00cafc26bacee2754887823c10c7a4d7ce2e6328616777442a382b4ef5 WHIRLPOOL 93c02234751802e25d0a890cc029dfbe2e1189af1065270c5cd7c2de0e664718aa606acc4f46a86d01fce1dda8594b329d38842cf947493cddb159298b86448a
 DIST calculate-install-3.2.0_beta2.tar.bz2 79345 SHA256 86aa0252f035783d18ff1a2ed39f7ac26f1bf90c12f0e85d7f54cb051f76e6f3 SHA512 3c937397c440306c361adb28c6f46efbcc8bdae2bb73e4567eeaab86d7507c829bec5e1d9cb06ec21b4a1919c6af248a4bacf53c08a1717888444e05ae44cd3a WHIRLPOOL d82eff337d7d66843f06c61610afff2f9b0c562117d2529469c7e6ce97beaf8a4bdef58cc5f63af73c1a64cc8398e3b863b6fd3238625288a3983362ca582d7f
 EBUILD calculate-install-3.1.9-r16.ebuild 1109 SHA256 906d385c2d77dd4be27cd20c83c54362281e3eb2d5f5dfbe3f629bfda1ee9fda SHA512 7d1dd41d22699b61e2cfccc0788599468883baf41dfce9e4817dcb6fb8b1eebbc027bd795230207ad1dcd1704d6222dd6382cc25cdfbad9ecdbb8a46bbf58c5f WHIRLPOOL 7ab3c836a6b9e5480567e2d038208d05c1484838d5db6b73605d9605c486f69ea09010acf4aa827194da16475be37de97d0a47eaf9ea03cee069544837c06b0e
 EBUILD calculate-install-3.1.9999.ebuild 673 SHA256 6eeeb4754baf2ca92277056ae54f643cd19d8095b5e5d1630b2382196de94b7c SHA512 4d23e814664d34129f22ebdb68fc989f22eefa1be09a3442d0b9dd26052b646dedf2aac0da43a30a082a127de6ae8406e269d776d6963d7f8f190fb5e9b475df WHIRLPOOL 44245a2785e53a685827b290a496a3497e716be03baade0297643e33c42f2dedec19b9dd3cd251cd981753e39451458254709e513f7d629d73d3c45150f66d62
+EBUILD calculate-install-3.2.0.ebuild 970 SHA256 e64a25f83bdf12ebf178da88b21422c373f2bb5232a49d3ee7ac3e8e9db29667 SHA512 ea7f13d9e7190120dabfe1f1aefa2c3ee3851a7f031c1449b2edc7e685a18773fcf1491d796287247f38ab2d65599f5bc84c08f9a65a53f90dab68623a734bc6 WHIRLPOOL 3a8c36ae09ded8cf28cf678bbbf3bc0031852f1482ca7fefa5d650529617e315b390142b535217996db55d9e16cfb57b76c3ce11cb4f55236a4876326a85e8da
 EBUILD calculate-install-3.2.0_alpha11-r1.ebuild 1126 SHA256 2c065f38a38cfac5222f46c312015692512106f0a3214c5379e082c8c73284b8 SHA512 ea29b417d6bfa9cdf229a83c0f101a6900062f22bd8c6732b08241e3b3efaf2f8bfd99e93fcb10b06b8699b0d88b53bb54a2d018a3d24d321e885015a7fc4f5d WHIRLPOOL 90930c482084cfe749439de5c7c3eb51361293e651e14e45f5466849019f4b4dc8f90397a032bcb86dab44d632e1811e7aa2aba4f630143c891724121b60df1d
 EBUILD calculate-install-3.2.0_alpha12-r1.ebuild 1124 SHA256 272554d3c60542b68cd50493d84074439094e9a45f61a44cc9102aaab6fbc212 SHA512 7bdc68e687fca15698225c443137a39636546bfd7e3c5e289df484840302d9dc1585b248cb2daaee85cf64428f987ff132c30a51a3681bab21ca202307d007a4 WHIRLPOOL d403c056cada8c7f3eca3da344ced380c08f0ba93976fe5624b020e59e506733a253a4309d91d50619b4305985e04680054b6eb55b31054b00c4312604eb462d
 EBUILD calculate-install-3.2.0_alpha12-r2.ebuild 1124 SHA256 9154a8e81e06f28f61f88354d2247b9b7914010ee62559b3d85a4e03e29c5649 SHA512 8dc9ff0c8738d0d8a39a87be770898e01b5812db3f795385a32e01410cd1c62f875607015f685b0395b9a2834123e3da27f46001b9cc9bbb12ae0ae4670ccf51 WHIRLPOOL c2b4c89e65e1f94745324e8da1465d6730b2e624761266fdb1c192165cf9005afed06250bbb6411f426615cdb1501c77cde3226e90707996f06c471edbd6ce11
diff --git a/sys-apps/calculate-install/calculate-install-3.2.0.ebuild b/sys-apps/calculate-install/calculate-install-3.2.0.ebuild
new file mode 100644
index 000000000..32362e959
--- /dev/null
+++ b/sys-apps/calculate-install/calculate-install-3.2.0.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
+	http://mirror.yandex.ru/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="amd64 x86"
+IUSE="pxe minimal"
+
+DEPEND="~sys-apps/calculate-core-3.2.0
+	!<sys-apps/calculate-install-2.2.29
+	app-portage/layman
+	>=virtual/udev-197
+	!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 )"
diff --git a/sys-apps/calculate-lib/Manifest b/sys-apps/calculate-lib/Manifest
index dd86c5b68..8883de28c 100644
--- a/sys-apps/calculate-lib/Manifest
+++ b/sys-apps/calculate-lib/Manifest
@@ -23,6 +23,7 @@ DIST calculate-lib-2.1.11.tar.bz2 61687 SHA256 62976c08d4fb4810389ace6f5a99abb5a
 DIST calculate-lib-2.2.31.tar.bz2 120044 SHA256 ba38052d8b2349a1c60adc589a74eb8a3ffcbf6f3c1124e4c1fb0da3aa777f12 SHA512 902871b9159f2bcf7a0cc767fb6df5b19902fce6cf9468d96f902c383a422738b65debe3094c92d1f82de2124936496f89631c6eb9670da00807b63156b101b7 WHIRLPOOL 5179ee691519f3a7faa3135d040ad64bd6d67c026ebf39bb17f7d641130a2b58641d1fe5da4f6cfbd45d4442d93508f0a5f641ef2cd8c43e1a322aab3d11f4b9
 DIST calculate-lib-2.2.32.tar.bz2 121878 SHA256 fe85e033eb16703e9fc6dcdc06fe12dd215c56315ceed7a6eee8c732229b1cd6 SHA512 933619746b5dd2a30cc4e98080ba3f40c8131c86852f55ecfefd8a239a6625985abb7fcc5e71d3b346d811e30ab997ad1d3c2142d1b1f46a3e6387c009b3eb6a WHIRLPOOL 5f678cee97dacd18e9ba4b10534808b8def8d9b3f476b6a397b8e8da4c7eb844722da62af2c53c4aa00d41c606a2b9f474a780ad257aec5ad8175002bfe97589
 DIST calculate-lib-3.1.9.tar.bz2 119852 SHA256 f81e84b078903b2269266ca24ee68ea5818d1a96cd2781871682bf6d71a63964 SHA512 358c57692b6296f64bbaf7c150d2f7d4663270e5130593e586b38c885ed5c959a24f29db581f6836357485032d20aab25c686ced2961a94644100596d1309e0f WHIRLPOOL 7e56f10544b8e2a4ecd160271a620bdb64b87006ab0ab636d9dd4ba18f0309ff6cf802d7c0e3c2e57789f6ee73369deb8a7a9ceaa3d2dcc598fa60dd1bf26d96
+DIST calculate-lib-3.2.0.tar.bz2 133810 SHA256 4e1418b37559467e6fe210a107c5e3209499acf8655b2543fbcf98ff30417121 SHA512 3205100d5c1457d29669f46c735a4df59690cac0868fe6410dcf5b9009daac530cf0946a596486a56ad469b9185d9d8409990067b1a1e22ce0cf4c090dea5e06 WHIRLPOOL ee4dbd379d51cb15d15297977b7198fc70fcca5c07779a518f8c5129b0777e49a6894962a1a6464c30b0224a20c260bf258727b075ccdc59249ea978bfffe0eb
 DIST calculate-lib-3.2.0_alpha11.tar.bz2 132989 SHA256 a9cfb6c7fd80dd1d262b0a4dfed2020466b9195dbe6cf0a1a6e0bad6d49fcc59 SHA512 71bd007374057926590d5c85929c8af54c55c7484777984dd4dfed994a322cdfa1437e9c70ad9f4a3dbb814e8192d01de4ffe1983391212de5dab2027aba79bd WHIRLPOOL 11a22011c7004428b9ce757c5162b0b338635c068af9b458ef52297952aba42fb7f1ac798cebde0010bb7264349ebbe4cd293f76a0aaf78bc1e6e5105c97d90a
 DIST calculate-lib-3.2.0_alpha12.tar.bz2 133969 SHA256 e5d3c7308f464a516f93fa9d9a139625e01a575703758aa39e523cf42471d0fd SHA512 6528e47b28095fdd20cb43861e5be11aa12a014814aaecfc89fd8a92695a8da4224ef7132f1b03f32f61fb4c32e6e0a132aa8a06490de2fbaad67aff71a910c2 WHIRLPOOL cdceed5ccb664cc1bad29489ceac4682d1e14ef4b13fd049eed3ed2c990a27a17396fb5262bb8f388e3faeb0aaebc5bf1b0fd9be70107f2de6b0d87264b0893c
 DIST calculate-lib-3.2.0_beta1.tar.bz2 134232 SHA256 d29efc3cbd3a73a2ac6215bd7430276e992886c5a0edb208553334b1328996c7 SHA512 c7fa374e806f963722f37a1451921e1f3084863a40b67a166a709c80f8ec3dad6d7b56594019b571c0ebff7cb51ffe4ea031a5f53bba1f842daf0290320a350e WHIRLPOOL ca109f43b753c8a3379629c61499f85828b8fc80e1f016ccbc29dc07ec101f15aacca69f8b44098cf600dee035eaf636114ccf915840171af30fab09af358dc5
@@ -36,6 +37,7 @@ EBUILD calculate-lib-2.2.32.ebuild 835 SHA256 de709a93e83848e4aeb462b0c585eebbd5
 EBUILD calculate-lib-2.2.9999.ebuild 730 SHA256 ce7f2300859687d4f6c50948438bee8a8cb407fd7de56c5c48e0aba846ee6774 SHA512 789179018d82ef7c9a5428de20f529e6071380174d1e417c3a4463859d4b9ceca2a2d4ae078dbe309b976541cfba81a30348a77b6b37089b9597b862d4a45fd8 WHIRLPOOL 380084a24bf396c79fd198e1ad51d2457dcbcc5d3b59420f3794d067949cf7951766a880639bd54399f371ed0961163a03f8ea8a5e2483e512243d57408251be
 EBUILD calculate-lib-3.1.9-r14.ebuild 890 SHA256 70895acb768534c094c5c0cf73b9b6d117de07fcc57c1b331b7ba6910a1c1940 SHA512 a8722797a526535c5a68a1c131712f7e944712508d58d4a5564fdcf08dedbe9b24198b2fb6a421c5edb0ba9286d63f9dbc15913cb8968002a5ee42ea359a6a50 WHIRLPOOL 0910b06a2d8e803ea6b7af16aa382fabbfa56bcdeefea382d7e71c6a0210274e495207de4fdfdeea6bf0f8cd169b00bf0ef4f7d83947eb50d5de58d940ad1f78
 EBUILD calculate-lib-3.1.9999.ebuild 708 SHA256 a1d64b7f014831bf6b0a38928d53cb55758b7a12e5f3e98fffd28025ffacbce1 SHA512 3873859a791941d421e2338b437521955da383ce986408f1a951305e2dd75a1a4f771c9ec2caa096c5c8ea6a1776d6d0ed99e025ffa786ba029cafdbadfa439b WHIRLPOOL 5ac1a10b53f810ab527a0ebe52bc87e8397e61375cf6e0acbed89d8f6b8385e72bf234e0fdce479c3a3f1652bb6e520710ce9356750a97d644c0db0a33f6facb
+EBUILD calculate-lib-3.2.0.ebuild 779 SHA256 d9ea13ff27cd50b309c1410811a74f8c7e0a64fa7eb0671d16dd868cda9e2f0c SHA512 097f9ac684fddd8fd7e5fd6f9398c6dfb65c69beef6ae8bcdd972253ef20b90b5d03430a2ede3df5fc33913c05875acfb64a9b6b6488cb715b6a725576489ec6 WHIRLPOOL 21098a18aeef4330d207ab17cc6b2b93f8b647783f41335cc1a852949a7716faf36ad7ad6eb952abf9da0a59170479fdb3f5ea85f0a00f9072cf7beb15c1d4e4
 EBUILD calculate-lib-3.2.0_alpha11-r1.ebuild 923 SHA256 74b41c68e3349dc5fa0894ffc77c628fa1b383bb469b18f85125fd91b6a63945 SHA512 36212fd87a4e5f1372cea7877c8348cc708041dca3482fe80ce0a0249980923043f990780858623f3a810e773849043bd2fd0487193623e72b3790948505b57b WHIRLPOOL 60befc336c17308b1d4ca0ebef16aaeeb57dba816ac7f645c6719d03aeb765b04e5b4980bc4739b41372b52aa1b9fd4dc06b228f1acf07014aa3888ea8b145b5
 EBUILD calculate-lib-3.2.0_alpha12-r1.ebuild 921 SHA256 18b368a0f6747ccc7bbca328e31e1e24fc579616b939f1dbadf14f51df524c3e SHA512 4048a95f4a8d6b63a39e1996ebf400862fdc07478a14d8dd578305824a0cfe31924cfc5394a47e2acb00e024f1f9b2607137158b70157951c5fd074995be471b WHIRLPOOL bf39d807a4743ef94d670f8e9b35f4ea458b2bc4a63686a5738b5ee9bff183d4c97ea6229218328e28f9a71d9ee7783ec7845380d9c6c20f0ec3bde6e5a1c06f
 EBUILD calculate-lib-3.2.0_alpha12-r2.ebuild 921 SHA256 ad5354215046512cd343e622c2242ba986b3e9552c120c15615e6d9372de8bd6 SHA512 8fc2db7f83f8ec19bcfa317761cf41a0e4aed7228d172bd68e1cb355d6bee155c3cc64ad0e702028db501674bd7c6fea962ad5d678b2e178b7e08326def8708c WHIRLPOOL e96c89f33e0b84fdea5adc7e162818be02056442d1165bb3770ed3ca71da5811f53434b3fbb4d0a809a32be3e32d542964771f1589856967f715419fb0510645
diff --git a/sys-apps/calculate-lib/calculate-lib-3.2.0.ebuild b/sys-apps/calculate-lib/calculate-lib-3.2.0.ebuild
new file mode 100644
index 000000000..68338e67c
--- /dev/null
+++ b/sys-apps/calculate-lib/calculate-lib-3.2.0.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
+	http://mirror.yandex.ru/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="amd64 x86"
+IUSE="minimal"
+DEPEND="!minimal? ( dev-python/py-smbpasswd )
+	>=dev-python/pyxml-0.8
+	sys-apps/iproute2
+	sys-apps/pciutils
+	dev-python/progressbar
+	sys-fs/lvm2
+	sys-fs/mdadm
+	dev-python/pyinotify
+	sys-apps/file[python]"
+RDEPEND="${DEPEND}"
diff --git a/sys-apps/calculate-update/Manifest b/sys-apps/calculate-update/Manifest
index 5be09193e..bb9db6094 100644
--- a/sys-apps/calculate-update/Manifest
+++ b/sys-apps/calculate-update/Manifest
@@ -12,12 +12,14 @@ AUX calculate-update-3.2.0_beta1-r2.patch 1494 SHA256 b6a9bf30d45f39840776d96e00
 AUX calculate-update-3.2.0_beta2-r1.patch 566 SHA256 70321bed443600b7fc2515076364b28e955488676a49d16b8bb06373e3fe6a57 SHA512 19b907e63b296342d236a6badb74a6746d899ebf11c1c97fff7950d01e301a007f920989e178f92af09e90f12cc2ebad09cf46e2884f7de16c48a1f1468c817a WHIRLPOOL d705582369825849af6877f205c0cd0e22461b303be034ba9eea68c49c4d4ab358dad6cc9d1a5e3dac591f9ac67a0b3b68ef81451f2a60a8c3d348c5d5786eaa
 AUX calculate-update-3.2.0_beta2-r2.patch 4825 SHA256 31a3381e32274188e2639634334e46fe90873ff564d1143a96fac1aa6b391119 SHA512 8aec2683a297331d0d9f1f4a3c1af7e8a521725883120397efadf4aaa62c036cf8de9171b2a940d4ba6702cd6384fa328b9725d8ed10f439f716b29da40761a2 WHIRLPOOL 2f6d0649c83fb529e72a37f5f78270a79e1dc27f7c1a1ad08e06721ae77a2ecb0b948e9e6affff2a263cefbb62528c55d8b5158c7d78c469afa5cd8744886cc7
 DIST calculate-update-3.1.9.tar.bz2 6767 SHA256 26e18cc55abfd73f37468adecb0028a50e05feba080bf3a21df8b62314adaa5d SHA512 14c5d86c990285cf39c7542d792205631106a4b53cd243297ec7f8e1a074c6c4c85f389a15152da5a6405e5a5b340bb75ad59af81b9d9004002daf53762035ce WHIRLPOOL 9740c28bb439799b85b92c69a1dfa7656570340b6032d7ace3bf136777f2c6e156b8f4c4fb12c68108d57027ad1ce2c83713432c4cc71dfeee3f9e33714a6cee
+DIST calculate-update-3.2.0.tar.bz2 32349 SHA256 c4c9cc506c61754a74b7f77e5cee641a7ac8a92109b092abf595ddb77868ed05 SHA512 707cd753ad73e59ac3016177d7f3a52a7614be0b85a7b64d0e47858541ce7d9e75531f55cf3169c3734e4bcb8e2ab145a3acdaad1e8b656ee356cb87f7624767 WHIRLPOOL d2a0bfc8d8f756584fdb8c67a1bd950659210de441f8e2cf77cec6416d90a3aaad95bdd42d901fc2b9ce50ee82b9f3c66c6ff2122c4a0250f04d8bb86abf7c7d
 DIST calculate-update-3.2.0_alpha11.tar.bz2 26372 SHA256 22e73eb2f14454a4812798715ba48ab342f6b842a41b712b6a73cf1740d132ff SHA512 6ee6dea6b977b627786e4bc84718119215d661e5bc07328c56d3b969c5b9c7a6fbe29ac2ab044e15007fac8136c65376a7fadd06e8407bdd280c97e18fd7a590 WHIRLPOOL 430ad743fbad00be523fd8b83fd9fcc6e0023130adacc99b1f4a6f9be8fa542cefa904b4989c4d72f268363298c6891898b99f7eeb59257ad1888d4da5b18dda
 DIST calculate-update-3.2.0_alpha12.tar.bz2 30602 SHA256 844992174f7a78a0948ef3848c35bd9c07103280529fc70177b652485c751e5e SHA512 5a549639f14447c4d63b6666bdb7ccec23bb03bbe3aae0dcd543a204d5fc4180bfd2a89c74c3d0e32a0b0f7d34a228aec3dc839f6f1997bea24dd6d6ad7010af WHIRLPOOL f75c1c581ffb92eacdeba4a12e4aaa4c6383591afaed65dc39e30aa1ad405533716957e9257637df2986ccdd72cf545263d0b3bceccdcfb31cd0d9f176b7ff06
 DIST calculate-update-3.2.0_beta1.tar.bz2 31107 SHA256 b6b31d8e605b726a02f7d09f11a7f2c7728e468641bc14c1affff9369e667a7a SHA512 fcd4a9fcfa54207fb4f55c9a628a3f68a59d145318e4f6354fb23dcc4391f2484d0827678f18b9fc3722946d8cdf5f5ebc2ab43e0c40a4c0833dcfca1002e164 WHIRLPOOL 2055ec6081e8b749f02d2afd080712f9aa7b58612df1bb138c71ea7b16ced00d718e4ff259c1018778ceedf8fcb0f3c8ca3cccc9eb405fc59b8c3d758ba3d27d
 DIST calculate-update-3.2.0_beta2.tar.bz2 32149 SHA256 523ce1da7096333e3710673c991cfdf923d5afd785ccced1cd2c86701ea26f49 SHA512 b5a737b350e7ec88afdf0d8cf52d6afc3313aab450a2ab8daffffd61c6be21f1bcad37a10a214adb930ac5e1a3badf4f3d293c2137133a24fb332e0ab078a118 WHIRLPOOL 2703e00c3470116796604eea7a312931ae0802591ef5af18a79b529d62eaed9ac928497b71de927cd9629cfd5785dcedcadb0e25e3c9eb6a0c6ca7cb2418712d
 EBUILD calculate-update-3.1.9.ebuild 644 SHA256 2b22a523f80a2faa437ecfbfcd972b9af3c7990c872a20fa748368245a16d6c3 SHA512 8aed0c3e142e9ca8b145bdad6b425e8fe57ced9cd104422b548ac26a6076a33a7d4d2fe88d4d4972cb4b36ab2d0f1bb54836ff24e9b3e3e96e0bb1a542ec798f WHIRLPOOL 4100e3ef87425da40ea7027cb57352f9473cf36d1ac8dcb9f19d299233423c000e0dcf1e8799d776bea3f736a262233b721e6186e2a3ee08aa6d0baf3f867416
 EBUILD calculate-update-3.1.9999.ebuild 520 SHA256 99d195766e2c5cf3c8ec30c34aa244c77559442511b37d6738d5b60d41ddfa37 SHA512 926703213c3918af07d494a0d6f13efa917cb6ae953c102a7cd5497a5988c4e6cef4b0621ad713a8431eb1b7b735856ed6fa6644b01ff14bb5942dc85bb5c27e WHIRLPOOL dadcbdaf1f7b42e18d4ab94bbb741c5576799da3f17ecef254839d989302d7f792a27a1f12967d776101636702e9fbedf34bca1b120f205fc1a2f0a7e1525c6a
+EBUILD calculate-update-3.2.0.ebuild 791 SHA256 ea65e04f6c1ecbc393aa75f526af139d1193f43dc1866724962f635405b76201 SHA512 38a38b03601c952f10041e935fe692c35d4575052d2ca9b034db73b0bf300f231861a37bc1d2291630018a3ee7ba8ad9440965858507e5145787c61838c56756 WHIRLPOOL d17cf72fc73f89610472161e23232acf735727085db2b7523455642c9990eb3a7a16392e44e110e50a22a265d0f7e2fecc414a3b41e01f9b3b6b48247ac486b8
 EBUILD calculate-update-3.2.0_alpha11-r3.ebuild 837 SHA256 17b993c0cf8b063f8e792570ad0baad978e658877707f7d118146a6ef0601f13 SHA512 eab1e83989409acc945e95ef25f20b6109ef8467f8801e0d5333bdcd93bfd3be776a6902c4c12539cc639c9048adfd7fd875b2a91e4fec2b98b16d0c9a9ea675 WHIRLPOOL 77f6430878898fa030126acd10137267be51204fbac5ed18e7ea6dcf96be37395e26eb21d69556a8506762029bc366c3f9400b47e688a48058779c6d87af659c
 EBUILD calculate-update-3.2.0_alpha11-r4.ebuild 835 SHA256 4c60e7e90fca767e748475ffb02a75150fcd5687a92482103f8e283a2f85e333 SHA512 9298e463bb852381e531ff9b10b07fd1b326a75d33f247c04a61d0e882b0f1035b20d7166f6b1ff25e510bf82f3478beafc92d344a03f1ed8475625050398b61 WHIRLPOOL 6003025d673905e04d4c110518515c83ef8ccccb10305085e3fa2d50e342277b97fb7918ea45c03de60ed1cab411a88ca0d714f42251dd4320bbe0da995ac7e8
 EBUILD calculate-update-3.2.0_alpha11-r5.ebuild 835 SHA256 f9d0c2410488f5d1735397f4a2a9044b0ff7dbd16519c61865290636bdc1e9e5 SHA512 e3069f58a56894d6e76a4ff726207ca6e844823819b3cdc42e3e261a786e74d2fde5193cfb694ed6fb65010e9b88dc6563dae532908834979313220bc6c31983 WHIRLPOOL d09f9e09ad397dfb13caae2d497f25a93f1acac10f1745c8b603b81ee14998bc10cf91752288efec590ef0e4fa56753e4dd60946c09c35e9d248560a717797be
diff --git a/sys-apps/calculate-update/calculate-update-3.2.0.ebuild b/sys-apps/calculate-update/calculate-update-3.2.0.ebuild
new file mode 100644
index 000000000..4269a73ad
--- /dev/null
+++ b/sys-apps/calculate-update/calculate-update-3.2.0.ebuild
@@ -0,0 +1,31 @@
+# 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
+	http://mirror.yandex.ru/calculate/calculate3/${PN}/${P}.tar.bz2"
+
+DESCRIPTION="The program of update Calculate Linux"
+HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
+LICENSE="Apache-2.0"
+SLOT="3"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND="~sys-apps/calculate-core-3.2.0
+	~sys-apps/calculate-install-3.2.0
+	dev-python/pexpect"
+
+RDEPEND="${DEPEND}"
+
+pkg_preinst() {
+	dosym /usr/sbin/cl-core /usr/sbin/cl-update
+	dosym /usr/sbin/cl-core /usr/sbin/cl-update-profile
+}
diff --git a/sys-apps/calculate-utilities/Manifest b/sys-apps/calculate-utilities/Manifest
index c4307cfbe..7cd5175cd 100644
--- a/sys-apps/calculate-utilities/Manifest
+++ b/sys-apps/calculate-utilities/Manifest
@@ -11,6 +11,7 @@ EBUILD calculate-utilities-2.2.9999.ebuild 831 SHA256 630a2373531bdbda2cac289c82
 EBUILD calculate-utilities-3.1.9-r34.ebuild 772 SHA256 843d57c3732232408adfdc60e09b53599d5afca31bb9ef303cec5697c45f78cf SHA512 9aefe0888d9357fbef0cf7e7807f48c3e965a15e30170481b793880a42780d2588fb9f2e3407f214c88b18917c705fc12c896e64f606b08f3e4c8487324005e8 WHIRLPOOL 3778616d8139d3011f115518e694a5d6517a8febbda8b1296578170b266a7e1017d45cc07ebd4c87c9108f2eaa4beab802b1015a3f29f9677222fc9e1d98869c
 EBUILD calculate-utilities-3.1.9-r35.ebuild 772 SHA256 48db29b3896b1a83da98b01e4a355f1781b004068bbf003d7c156f1065bf65b8 SHA512 fe4aa3c7c5546a4277356bf9da736c45bab953913cf7dce7275e8348c1d255d7c9292e8df6481cf52345de577427998e6f5a7df824f85d1c81feedca819abc4b WHIRLPOOL d6c39c1f458eb2fad7fe052e60bb0dc72e93192d4caa0fcc3d39ef8f22ea395e9cb6c99ad70d3c71f76a5c19163aeb502156ebb30b27d2d9230d1a1edcaa4b00
 EBUILD calculate-utilities-3.1.9999.ebuild 800 SHA256 9de4807341cb552ef8d4f702e9c4a0ca10c52c9d532cc2eb741cea29b92f09b5 SHA512 b35ed4d49c4943a5ad375e646bece419271900c50301153408b30dede0fe834e098baaa42a21c130730c0bc32ba09decc588277da6782d2010c18c9d8df679ae WHIRLPOOL 78e2c5ee8ef8356c4fc0275f920177778925278cad78585ed37c08048241f775030e59a0ced0696fba6379741fe865dc339d190c46b5f2173097328a73c64a24
+EBUILD calculate-utilities-3.2.0.ebuild 749 SHA256 dfbdd98f194a8aa314df2e4070ec684ea346498550fd324c8c900a09791dcd15 SHA512 f2d1cd58dfd3b4949959c515b6a13e0c668b0d0639a1c2ad506e74707dcac80d0e4364fbbdc84a06308e555a3e008a16329266a84d433e6abe2c330ae863a7d4 WHIRLPOOL eec82999f6aee54350df74bdfae439d53a92a6b2d4d6a8bbb4cd56351dec63ae62f102788acb9a4c5e140c55c48c4f357ad571d318d3bd4f970d3e997e0a57af
 EBUILD calculate-utilities-3.2.0_alpha11-r4.ebuild 844 SHA256 0bbb15587365a1e0626a43e9a3ec8e3b63da4f38b35cc75bef4a3b526130509b SHA512 c42433f911ea2a2a131b6f415daca5002cc0b19958acdbd4adc052c80b9925890f17597aae4790e5b5ee5424849a89bff0c664a65a0d95aeea6622e6edc4f64a WHIRLPOOL 893135657836ed0fb39b7a1e0c967ff0ccecd61c2dced11bb3764c82087241c113f7e5728417313aa30005a86223d01ad67082945ebfa88a857e01d1e864d5e8
 EBUILD calculate-utilities-3.2.0_alpha11-r5.ebuild 842 SHA256 b300ecbbeb548f28f2896a3b6f4699fd4004a1e7a37b92e2dd2c8bf611df025e SHA512 15b63707e7e123778bb905f5a5dcb76dddd415ac0db96ba7c25978ffe774f127c4a971f6dfe1509daa1052d59ee42248d4d4b5f084f770b05e06ef35a63a44f3 WHIRLPOOL 6cffc5b13bf05267b681c1c32b96703150c2375cf05abc300ece9c9849afe50f2f2f6364eac344cd402ce6f1b12767501665b0f10c5ba1ab07f8989c533f1560
 EBUILD calculate-utilities-3.2.0_alpha11-r6.ebuild 842 SHA256 7a922913fd6efc31007188dbf263e3eecfde52da024176b59f43afa8df38079f SHA512 a8c2e30a5180eec19ed8930c2544d4e51557ac79d3c91106f6c9524a4c184cf0ce1445aa57bbc35221a131e38f8b186b3464d4c2a7c2cfca952211808399dd80 WHIRLPOOL 7b0a4fc6c4c592f482a6c31c77d1b2c2a9d02422be72ef0665a213927926bbf697077674a2d4792a904b0650808e7ee495812ab0e84ff9a4c3eb59749cb23b04
diff --git a/sys-apps/calculate-utilities/calculate-utilities-3.2.0.ebuild b/sys-apps/calculate-utilities/calculate-utilities-3.2.0.ebuild
new file mode 100644
index 000000000..7eec6bde7
--- /dev/null
+++ b/sys-apps/calculate-utilities/calculate-utilities-3.2.0.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="amd64 x86"
+IUSE="cl_consolegui cl_client cl_desktop cl_console"
+
+RDEPEND="${RDEPEND}
+	=sys-apps/calculate-install-3.2.0
+	=sys-apps/calculate-i18n-3.2.0
+	=sys-apps/calculate-lib-3.2.0
+	=sys-apps/calculate-core-3.2.0
+	=sys-apps/calculate-update-3.2.0
+	cl_client? ( =sys-apps/calculate-client-3.2.0 )
+	cl_desktop? ( =sys-apps/calculate-desktop-3.2.0 )
+	cl_consolegui? ( =sys-apps/calculate-console-gui-3.2.0 )
+	cl_console? ( =sys-apps/calculate-console-3.2.0 )
+"