diff --git a/sys-apps/calculate-client/Manifest b/sys-apps/calculate-client/Manifest
index d324dcb57..a5d3e6e9e 100644
--- a/sys-apps/calculate-client/Manifest
+++ b/sys-apps/calculate-client/Manifest
@@ -2,6 +2,7 @@ AUX calculate-client-3.1.6-r2.patch 2173 SHA256 d2b167af98dddb8f656b41b802293e71
 DIST calculate-client-3.1.6.tar.bz2 32036 SHA256 00b5ef665b9148f2b5acc913e59534e810ec0a6c93ee037ffc12852bba3ff290 SHA512 0547fd9320f49c1b628e446298366110dbf19eea94b8e2335ec311b69a33352b575eed3a23bbaf5c24ceb602c7166d1da5c7ea73859421b9b2d6955289956790 WHIRLPOOL d725b4396398def4eb6bc0cc6575430e46ec8bb7efefd721d3ee904c0644bbbf6fc87d43fbf9060e2c71465eaed2ff1522631522f2d829527874dd0a379a9488
 DIST calculate-client-3.1.8.tar.bz2 30229 SHA256 0984d93181531340e5985255c66392a54da53dea876c71b1965d6540b4a8c410 SHA512 aac43e8df3d9a30e5e6b1975eff2bcf793c2baf8421a460ff7cf8149026ba99fd36d500ded8f3e34ce75c234eea392b91e4ac7b04935b11b18867069d088557e WHIRLPOOL cae75d2d3b6e8be59ac84a88b09148b197496e384550351e2cd3ffbd24799dd0224755605957d020f85d8f4eb75cff3feff41745b78c47c2ac57d9cc4833545d
 EBUILD calculate-client-3.1.6-r2.ebuild 942 SHA256 76532e1629b536602e982c6d12cb7345a181fb7160ba3a3531219934239120c3 SHA512 28dc00fd5a237a049ecf2f2feb7659c5f75c3f6bc52b350b0e4da2a5c5dc5b1b2bfa06ed273a3fcf4b285176277a79618de42e2eb46465c9a1964e1ce85377a5 WHIRLPOOL c672ec4b902c624ac2dedc828c83c2589b70ed5b4c14a9c0cdedeee9921d48529b9bd885240b6b7257ec332aa131f19a71862e59fb102ae207053a1a372a300d
+EBUILD calculate-client-3.1.8-r1.ebuild 821 SHA256 9ce11bb43895f97ee1c218b9c352e426c6dbe50bf0b96d7742436b77c97b9b0b SHA512 833f072d4c212fa717d000f85b3270fae2ae8192752542c1b81e649922184c59b6f524332d2e7ed98ad81ad449e691ce9d291bb9d548ec15a13e7d2b8636b2ed WHIRLPOOL 2ba62b00ac58894bfee12d7d3d96479872778bbe25bc6a37a88f7dbf871eee54fb8a01f0360347322b16ef89dd28eeaf1c7a2dbe80cabba202a6ca16b9e7c9c2
 EBUILD calculate-client-3.1.8.ebuild 806 SHA256 b7c39ada2360f3ee9cc63c9b5edb2986c9820ad4080c977e4e973bc9cdbb129f SHA512 1c342cf72d72326d30614210a477c849c3b7ca71cbb53a946a17cbcee3a6a549ea22eb3c16afbffd4f1108a47ed1428e2d7e9c3ebfc240e6769d09e02411f057 WHIRLPOOL 4a0678ab5995db203cbd870d89ac3065b0307ef4c426e2952efde3853eb6c9654a8a2255540a316e63589956103d199bc3cacf4d89207d78ae8fe1f9976259f0
 EBUILD calculate-client-3.1.9999.ebuild 879 SHA256 37385187f78bb708669b5cd2742173b117bb482c784f8f481ab7388554476d65 SHA512 87ebc2dfa965a9bb9d24af13a611e83e412cbabb12957bb14e2a1cd8b9f1951efbf690dcfa8f73711a02cfd0afbc9e9f37209ba9a3884b018c41b3a46e2e847b WHIRLPOOL 349da1bcb076af176079473ccb2fd1a4e3d8eb3ec2a7a6102272d1dd1073a8c181c49e02c89ede4b5cd829856f0c0f5db877b89eb0c6335ad678e58902db293b
 MISC ChangeLog 21989 SHA256 065aa2c75428e965caef0348105d8e5464d4103f5f2eb16bb626c7a9278208df SHA512 76ad69386d986e2e65448394d738b4d6abbeffb4af38f13dcfbfe8af64796c9b97eda68eb8cbf749fe7ef2711067da430af1cc1a764712e8df853451f903ab57 WHIRLPOOL 58b0a2837255a2eb67606072ac1a6a06e0db7079b563d3b4c9df45b5dbe0fad31c409800da635a337ad976b31bb08549e89063796e8217d46c83ba8b5e22e1b8
diff --git a/sys-apps/calculate-client/calculate-client-3.1.8-r1.ebuild b/sys-apps/calculate-client/calculate-client-3.1.8-r1.ebuild
new file mode 100644
index 000000000..54be8b8f0
--- /dev/null
+++ b/sys-apps/calculate-client/calculate-client-3.1.8-r1.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"
+
+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.1.8
+	!<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/keyexec-0.1.2
+	sys-apps/keyutils
+	dev-qt/qtdbus
+	sys-auth/pam_keystore
+	sys-auth/pam_client
+	dev-lang/swig"
+
+RDEPEND="${DEPEND}"
diff --git a/sys-apps/calculate-desktop/Manifest b/sys-apps/calculate-desktop/Manifest
index 217ce3a5a..ba2bab309 100644
--- a/sys-apps/calculate-desktop/Manifest
+++ b/sys-apps/calculate-desktop/Manifest
@@ -3,6 +3,7 @@ DIST calculate-desktop-3.1.6.tar.bz2 15486 SHA256 46782f98e36239851cbc6c4f51003b
 DIST calculate-desktop-3.1.8.tar.bz2 16696 SHA256 c90ad97383b0c7810cbac6d9f1eaf754377f407758a4df4fe7ba3acfbb3b83ca SHA512 58bf9f98d86433a5c2ae3e8d5db0a825d60740b616b59077754568b4857a1dc2cdcc818ccbafa6a3f0b0eb67a7ebc017063756a425f556e43cce7bc063074bbe WHIRLPOOL 9f05c320e93f8ce73012a1faa3ab540d8eba8e12b5d18c656eddd320ca2cdcf99e0145925258486568c7e1b5aa9c5bd95732d4ad6919c16687152f2ff8f4858a
 EBUILD calculate-desktop-3.1.6-r4.ebuild 900 SHA256 e69d0b1cde60700746805cf20ddf5e470c760596c22b122908eb1e3a55d0afdf SHA512 db0e6b9970dd207ac86dec7ca76ce65c28dfbf67d757bc2d9a6126874b8ff6caa497e1eb4c3564307aa195413ae64836655d7660cd664028f025ba2bf2da25de WHIRLPOOL 91c6b4e96b100b2c7c1cc7ba8ee27b52382ef465f08949ad44e3898de208d56eedbdf06952ab2012bf5c64d0e5486089139adc45fec7ffb079b1750ad83b1433
 EBUILD calculate-desktop-3.1.8-r1.ebuild 778 SHA256 56ee2e5a6e5c1cb86311cadc05be33248e70435cf5815ab8af3fa961f86b6c45 SHA512 4d958d42f3c00d564eb0fbdd7e581df634e5769588ae07d1f5e27382efbbb93837c8a7147cc80298f485a7d1c4ad17ca5bdb162131c3ba2f385cb20f6c2a957d WHIRLPOOL 5c880b26539ae816cfe316a60d94466ca9170839d840035ea1cc48b1c23f9cadeb345d97a369eb86b89cbbd096d346ee1ec588d46b0a2321afe4856537c2c1cc
+EBUILD calculate-desktop-3.1.8-r2.ebuild 763 SHA256 6bd05b4a17c4da8c67dca8f111c22b40c79c7cf05e1d0fa620069182f787a6a7 SHA512 7e2a48245e5e89826502cd4dfa3d36e55ee6847e9d36d434d4f1eba5fea0ec3d0cae2323a1aa2746cdd0e3ef01416abf7e4328f43c587b0771cccc8d16f8b78f WHIRLPOOL c79fc7e1ec973cb2d26777e82ac1915c7d14f170a7416d26dbc2cd7ff1515954155e8afa8cd502cfb9f314f3682a90732b832ca47697338b7b862de7c2a7710e
 EBUILD calculate-desktop-3.1.8.ebuild 763 SHA256 6bd05b4a17c4da8c67dca8f111c22b40c79c7cf05e1d0fa620069182f787a6a7 SHA512 7e2a48245e5e89826502cd4dfa3d36e55ee6847e9d36d434d4f1eba5fea0ec3d0cae2323a1aa2746cdd0e3ef01416abf7e4328f43c587b0771cccc8d16f8b78f WHIRLPOOL c79fc7e1ec973cb2d26777e82ac1915c7d14f170a7416d26dbc2cd7ff1515954155e8afa8cd502cfb9f314f3682a90732b832ca47697338b7b862de7c2a7710e
 EBUILD calculate-desktop-3.1.9999.ebuild 976 SHA256 405de66b0f54804d4bc025fe786c21ca1a040d6a25928a535efbf84cacd7f505 SHA512 69ebfdc4c04f7c236f728c9938a5538b3822369cc1e1de2593a6e83178b5441ea2e37068ffcd9cf17aa92bcf00ee133ee98da0be5a5f591d69755e1159eeadac WHIRLPOOL c61f805379983ca23af188ff60a99511251a8afb27b75d0c1f08595012a579c42c2ef36603d837865a155706780ba413f0cac74457425eea0e0a59488e3dfda2
 MISC ChangeLog 16440 SHA256 2a1c3211586d5dd10a249b61e4a8abf96a27a0c4d1706715b8a563bfa8aabf07 SHA512 962d9b69daeef659f2e1d6f2a5c974d6ed152d22fa9f0ed8c35d4c27e901f976167a2fc260a71c798be29d0161c7e90fa030957b2f74e25dcf35ecdb8fdc69e4 WHIRLPOOL df646b1f4c914fcb7142365b2110eb5112f7653cfddaf1b8a79f4a8f4ac99d50b6be59d3d593a8fb9e754ed92ebbe9a2cdebe320b0941d2ddd1bb9fba85c20b0
diff --git a/sys-apps/calculate-desktop/calculate-desktop-3.1.8-r2.ebuild b/sys-apps/calculate-desktop/calculate-desktop-3.1.8-r2.ebuild
new file mode 100644
index 000000000..cae7028e1
--- /dev/null
+++ b/sys-apps/calculate-desktop/calculate-desktop-3.1.8-r2.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"
+
+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.1.8
+	>=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-utilities/Manifest b/sys-apps/calculate-utilities/Manifest
index 55ed4a8ad..7abda4b10 100644
--- a/sys-apps/calculate-utilities/Manifest
+++ b/sys-apps/calculate-utilities/Manifest
@@ -2,6 +2,7 @@ EBUILD calculate-utilities-2.2.31-r22.ebuild 676 SHA256 d2669cbd504fc4c4cf7f86ce
 EBUILD calculate-utilities-2.2.9999.ebuild 842 SHA256 56d97b7d2ce11d23b25d9036b4e2ee196b547ce1d11b0cc349a8205515b66bf1 SHA512 fc7802b92ade52210fa7381b55c48638da6d9adee6d2f03f18d6bdd0050756089b3ca8de944f4e865517554523b40737abe9f22587ecae74079eec563f80868b WHIRLPOOL f1382f0629a8dae37aaecf40cb8cbc3682bde3b43e92c9c6a84cda75897dc5d5de043233fb7a3f929749520b05fe3af94187c7a3ccdae4e252e83699d871f225
 EBUILD calculate-utilities-3.1.6-r12.ebuild 770 SHA256 620f29f93e0d5ff2d8b426946fb45b892bc5316904dc4bdc1b7a4e0750236f04 SHA512 7608d4391302e420abef7fd8236010692ea0d3aba29fadd5b8d3e3c31ef34dee29b0ee83e96c091f502c26e798975ec1c6fbc4ed51c5417b72589b64f4cc2a88 WHIRLPOOL 485e1eb97d02c22b10959aec1c2897f5c76c739fc13dda1b876c5bc47e3d52443e68067848bb894921dae1dc0e121b58e583c548ed45304033b93596d17f269a
 EBUILD calculate-utilities-3.1.8-r1.ebuild 755 SHA256 3bec5752d8439e0bb64c921fe5bd708e2f942b7555229f7a2c2cc6415e58cd63 SHA512 8f40e2fccf74a54471ad0b15c06d2e1ab5a3857c62d00d9d805aba12b016944982eceff2eb2ab3b75e6488ec85d40de75257cd23d12fc5eaccd31c841b2759ec WHIRLPOOL c93eca9734e7c9112aa5453433c77e5c37b4b0a3094e473fe39189657427ab5efdfb17c157944ea48b7438c268eedcb116a8de2ef6fbefa1947c21187075d53d
+EBUILD calculate-utilities-3.1.8-r10.ebuild 764 SHA256 03420e6042f5d72200f8b445ca5b9e89b4a7b9fb7f42c8fc4eef10b08096c2b9 SHA512 bb6ed3e14c986a97918eccf2c5db9fdef81e6f326a939c7067c19b0f4595e1431a5579dd65210bf413af13029201cdec1d47c975097eda42cc0e929b7e0fe596 WHIRLPOOL 7609b5fe8649be395c26e55b557125223beb72e8a5c9542713167f16ce683faf3342689c7368ff86aa2834743afbc3549303a8f71c28932791af2eb7fd9f0457
 EBUILD calculate-utilities-3.1.8-r2.ebuild 758 SHA256 6c9a774ddc3966c0a1c07c109eccd718fd11bfc3aea41b1b29035b07f0ec5ece SHA512 72a35fc08d180fb15bcd264c84d16887faa1b724875346b18bb48de598488c6b8eb5d763738690432b1f6184f66ed75fc2554fa4c125f57408153bc00d8d8c36 WHIRLPOOL 537c7dcd309a5a4365d3789992a93857ba0d706ae2448d4cb5abc6fc2173953df88a627595f7a3607c1c13d7401ab82e5d9e652896c957d8cc508ec4e4e153b2
 EBUILD calculate-utilities-3.1.8-r3.ebuild 758 SHA256 db3952e343cd4cd87b7e00f08ecb7fc78606599f125dd58f53a5414afff0dfd3 SHA512 fbb985c0b255fa6753c58f313c990e58dc95a4a0dd7d9c66f74d2a3d9f6cbf3a74c37efcbef8e34f050813213dc2db11eb19699984a4b7a6447067196eee5040 WHIRLPOOL 603c4c43325024f593da74918bc09c4eeb03743ebcc37c16dfca63ae8156b9ca4e44e73673f5700edf7ac662685f9173d6c4d0939fc0246eb821c4a9e4143890
 EBUILD calculate-utilities-3.1.8-r4.ebuild 758 SHA256 2b54aa30c5a8c59a364009c38382ff404ec93329a1acb1240ff05b4ac177b49b SHA512 81ec2e91290d0385a72bb681ceea15fc70e1813e81fcb53694b447efee193be690fbe7579263c767b15994573012070c49b8eec57af63587a307b61736e5bb76 WHIRLPOOL 37f238a04982487934b4b6372c1e03c70bf55a3106be5992facaffbe5dce6bd8638711631e9acee08346907414e7db8efc0c8e7972301088117644c25cdb3420
diff --git a/sys-apps/calculate-utilities/calculate-utilities-3.1.8-r10.ebuild b/sys-apps/calculate-utilities/calculate-utilities-3.1.8-r10.ebuild
new file mode 100644
index 000000000..59f6b0887
--- /dev/null
+++ b/sys-apps/calculate-utilities/calculate-utilities-3.1.8-r10.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.1.8-r7
+	=sys-apps/calculate-i18n-3.1.8
+	=sys-apps/calculate-lib-3.1.8-r2
+	=sys-apps/calculate-core-3.1.8-r2
+	=sys-apps/calculate-update-3.1.8
+	cl_client? ( =sys-apps/calculate-client-3.1.8-r1 )
+	cl_desktop? ( =sys-apps/calculate-desktop-3.1.8-r2 )
+	cl_consolegui? ( =sys-apps/calculate-console-gui-3.1.8 )
+	cl_console? ( =sys-apps/calculate-console-3.1.8 )
+"