From ba15cbb0b92e46f22fb9239907e5fd4ab4b7b026 Mon Sep 17 00:00:00 2001
From: Mike khiretskiy <mh@calculate.ru>
Date: Fri, 31 Jan 2014 10:12:47 +0400
Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=D1=8B=20live=20ebuild=20=D0=B4=D0=BB=D1=8F=20=D1=83?=
 =?UTF-8?q?=D1=82=D0=B8=D0=BB=D0=B8=D1=82=203.2.=20=D0=A0=D0=B0=D0=B7?=
 =?UTF-8?q?=D0=BC=D0=B0=D1=81=D0=BA=D0=B8=D1=80=D0=BE=D0=B2=D0=BA=D0=B0=20?=
 =?UTF-8?q?alpha1=20=D0=BF=D0=B5=D1=80=D0=B5=D0=BC=D0=B5=D1=89=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B0=20=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

package.keywords
---
 profiles/acoola/package.keywords              | 10 +++++
 sys-apps/calculate-client/Manifest            |  3 +-
 .../calculate-client-3.2.0_alpha1.ebuild      |  2 +-
 .../calculate-client-3.2.9999.ebuild          | 35 ++++++++++++++++
 sys-apps/calculate-console-gui/Manifest       |  3 +-
 .../calculate-console-gui-3.2.0_alpha1.ebuild |  2 +-
 .../calculate-console-gui-3.2.9999.ebuild     | 23 +++++++++++
 sys-apps/calculate-console/Manifest           |  3 +-
 .../calculate-console-3.2.0_alpha1.ebuild     |  2 +-
 .../calculate-console-3.2.9999.ebuild         | 23 +++++++++++
 sys-apps/calculate-core/Manifest              |  5 ++-
 .../calculate-core-3.2.0_alpha1-r1.ebuild     |  2 +-
 .../calculate-core-3.2.0_alpha1.ebuild        |  2 +-
 .../calculate-core-3.2.9999.ebuild            | 28 +++++++++++++
 sys-apps/calculate-desktop/Manifest           |  3 +-
 .../calculate-desktop-3.2.0_alpha1.ebuild     |  2 +-
 .../calculate-desktop-3.2.9999.ebuild         | 41 +++++++++++++++++++
 sys-apps/calculate-i18n/Manifest              |  3 +-
 .../calculate-i18n-3.2.0_alpha1.ebuild        |  2 +-
 .../calculate-i18n-3.2.9999.ebuild            | 24 +++++++++++
 sys-apps/calculate-install/Manifest           |  3 +-
 .../calculate-install-3.2.0_alpha1.ebuild     |  2 +-
 .../calculate-install-3.2.9999.ebuild         | 29 +++++++++++++
 sys-apps/calculate-lib/Manifest               |  5 ++-
 .../calculate-lib-3.2.0_alpha1-r1.ebuild      |  2 +-
 .../calculate-lib-3.2.0_alpha1.ebuild         |  2 +-
 .../calculate-lib-3.2.9999.ebuild             | 28 +++++++++++++
 sys-apps/calculate-update/Manifest            |  5 ++-
 .../calculate-update-3.2.0_alpha1-r1.ebuild   |  2 +-
 .../calculate-update-3.2.0_alpha1.ebuild      |  2 +-
 .../calculate-update-3.2.9999.ebuild          | 23 +++++++++++
 sys-apps/calculate-utilities/Manifest         |  5 ++-
 ...calculate-utilities-3.2.0_alpha1-r1.ebuild |  2 +-
 .../calculate-utilities-3.2.0_alpha1.ebuild   |  2 +-
 .../calculate-utilities-3.2.9999.ebuild       | 31 ++++++++++++++
 35 files changed, 333 insertions(+), 28 deletions(-)
 create mode 100644 sys-apps/calculate-client/calculate-client-3.2.9999.ebuild
 create mode 100644 sys-apps/calculate-console-gui/calculate-console-gui-3.2.9999.ebuild
 create mode 100644 sys-apps/calculate-console/calculate-console-3.2.9999.ebuild
 create mode 100644 sys-apps/calculate-core/calculate-core-3.2.9999.ebuild
 create mode 100644 sys-apps/calculate-desktop/calculate-desktop-3.2.9999.ebuild
 create mode 100644 sys-apps/calculate-i18n/calculate-i18n-3.2.9999.ebuild
 create mode 100644 sys-apps/calculate-install/calculate-install-3.2.9999.ebuild
 create mode 100644 sys-apps/calculate-lib/calculate-lib-3.2.9999.ebuild
 create mode 100644 sys-apps/calculate-update/calculate-update-3.2.9999.ebuild
 create mode 100644 sys-apps/calculate-utilities/calculate-utilities-3.2.9999.ebuild

diff --git a/profiles/acoola/package.keywords b/profiles/acoola/package.keywords
index e69de29..fcd532d 100644
--- a/profiles/acoola/package.keywords
+++ b/profiles/acoola/package.keywords
@@ -0,0 +1,10 @@
+~sys-apps/calculate-client-3.2.0_alpha1
+~sys-apps/calculate-console-gui-3.2.0_alpha1
+~sys-apps/calculate-console-3.2.0_alpha1
+~sys-apps/calculate-core-3.2.0_alpha1
+~sys-apps/calculate-desktop-3.2.0_alpha1
+~sys-apps/calculate-i18n-3.2.0_alpha1
+~sys-apps/calculate-install-3.2.0_alpha1
+~sys-apps/calculate-lib-3.2.0_alpha1
+~sys-apps/calculate-update-3.2.0_alpha1
+~sys-apps/calculate-utilities-3.2.0_alpha1
diff --git a/sys-apps/calculate-client/Manifest b/sys-apps/calculate-client/Manifest
index fc357c5..a138eb9 100644
--- a/sys-apps/calculate-client/Manifest
+++ b/sys-apps/calculate-client/Manifest
@@ -1,2 +1,3 @@
 DIST calculate-client-3.2.0_alpha1.tar.bz2 30724 SHA256 7a18e17eccaf39f562cfb4d8519cb53771b072dcaf8fd0d3870459ba7d860977 SHA512 2900d0a67b895bd300a2b8b726b698c0997634229516d163ea832fd58cbefbde69675ac309b8d25be728ef9048647c8b157d8daec60b61e62046c261526f0ab9 WHIRLPOOL 41e7758b0a7ab62667ffa4926cb5e70b86d357b0bad3bee0c216aa5821e943cf6b27cf4b5ec212c6edc85fec0c6abd405037856058b3dc9766aa0cc9a6d73fdb
-EBUILD calculate-client-3.2.0_alpha1.ebuild 828 SHA256 1b708b283362358a27f4b2659156483ed74b79c4fc6e8eccf3270872ee859616 SHA512 fecab4c38d4d1039355df6c2d2d5006d8026d507de0523eaad3e192e5bb167ae48be2b485a91e93ade34a5af6034158fea925e86550eb269b58eca609b59a1a8 WHIRLPOOL e7f09269db3c4f16050ceb1681398b1810bafb8c38f5624a9214e19f8d1f809c36f287844b17b3d937a20b1418cb41a631ca3f57c821e3c64ff028d1449297d2
+EBUILD calculate-client-3.2.0_alpha1.ebuild 830 SHA256 2c2266ea62a8d9e20cffd4de712f99a99b45fb39e150492e44015980d0fcaaea SHA512 dff3ab4a9a6637322d6fbc4ed2a6e9bd105795206167b6570b09a97f864dc611d6b6baefd3fef244275511154b60d555a973d996ca75724dcea8afaf8c3360e7 WHIRLPOOL eddc6aac56d42b0de1ccb0deed43de4b4dc4862c9f67c3c07cde426792f60679eb2f4597a71f24ceed5e652507dd8a3554391165ef68adbd1e7da43ee4293859
+EBUILD calculate-client-3.2.9999.ebuild 879 SHA256 f7cf1ba86978c78b80e7d47aceb7f97259e11f3fd17eb5b26ee41c9ede706cba SHA512 444ed5693a9e67cc94f8e105e2f6c2f8b09ee096926ba3ee3df1ae145185949e57596d6e9f96e4314c52fde45e8cb0fa93e42c85116044ebf04b62c8a82776e4 WHIRLPOOL 484adb514ae76df6325e3b917c01abf414981abc578b6cf27e4d2a5c880d42bbc3c713675e2ca9ce04b6a2afc5d203046ad04248a942a675242c3790aa964a5c
diff --git a/sys-apps/calculate-client/calculate-client-3.2.0_alpha1.ebuild b/sys-apps/calculate-client/calculate-client-3.2.0_alpha1.ebuild
index 56776dd..40da681 100644
--- a/sys-apps/calculate-client/calculate-client-3.2.0_alpha1.ebuild
+++ b/sys-apps/calculate-client/calculate-client-3.2.0_alpha1.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="The program of setting and storing the user account in the domain"
 HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
 LICENSE="Apache-2.0"
 SLOT="3"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 
 DEPEND="~sys-apps/calculate-desktop-3.2.0_alpha1
 	!<sys-apps/calculate-client-3.1.0
diff --git a/sys-apps/calculate-client/calculate-client-3.2.9999.ebuild b/sys-apps/calculate-client/calculate-client-3.2.9999.ebuild
new file mode 100644
index 0000000..3227e8e
--- /dev/null
+++ b/sys-apps/calculate-client/calculate-client-3.2.9999.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2011 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 git-2
+
+EGIT_REPO_URI="git://git.calculate.ru/calculate-3/calculate-client.git"
+
+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=""
+IUSE="kde xfce gnome"
+
+DEPEND="~sys-apps/calculate-desktop-3.2.9999
+	~sys-apps/calculate-lib-3.2.9999
+	>=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-lang/swig
+	sys-auth/pam_keystore
+	xfce? ( x11-misc/xdialog )
+	gnome? ( x11-misc/xdialog )
+	kde? ( kde-base/kdialog )"
+
+RDEPEND="${DEPEND}"
diff --git a/sys-apps/calculate-console-gui/Manifest b/sys-apps/calculate-console-gui/Manifest
index 028e88e..1fd0837 100644
--- a/sys-apps/calculate-console-gui/Manifest
+++ b/sys-apps/calculate-console-gui/Manifest
@@ -1,2 +1,3 @@
 DIST calculate-console-gui-3.2.0_alpha1.tar.bz2 320250 SHA256 8399ccbe7e1674f969f23eed8c55553cfd0b95a7f4b48ed1fa20d8f5b99996e4 SHA512 c8681b4261b4fb759e7db11c75c6c05cb84dfa21fc49a178b396e4ee255bc88c048b0030ecb51b18e6163a100ecff27466916bcf585bc41310d1d54c9a13fa5c WHIRLPOOL ac7a815f7937bd68d2e3f9d7ef6823c87933dd64b7268a16ca65a151fe17d454aec77fa6e315607b554c372e6b9cf51dd6b4e26ecdbe0143fecc5219770ddc7f
-EBUILD calculate-console-gui-3.2.0_alpha1.ebuild 632 SHA256 464e0d627cb8ffd78c2d3b443847742e6c2214f5a515b1685843342928fc8132 SHA512 5083e039e726a8b32df62e39f98f288ebeb305108533c84d9cd1da1c0b3695187972fd15d6ed453c506c7ce53ec69f1a9f15238a91de8d87e56f7c147e5ab19d WHIRLPOOL b780be927c7ace5da681185d94e605d1e311a57d6489db6e501fe4f2851f186c9412cfc971b69cde9e5ac8f1dbbc50d19159fc8bf7b065336b08e53ea3b58f40
+EBUILD calculate-console-gui-3.2.0_alpha1.ebuild 634 SHA256 795f6e1e109fdc34e5b869de81aad5763c046e464890e4adf6496eb8f29b22cf SHA512 ae799087669681e86c56d52b8aaf5b30b24e82f2053b9965c03314899b5f80c75f66dcf1ec0f87e1965bf0f94a26967607a984dd9650ebdbaade357e7c18a870 WHIRLPOOL 7b3d60a6a186b485e5b98e1041cc71568fea2b3e9ad8cfa68450133dee1ca1a254bf649e556404fdd48556dacd0a1bfbf311cd41c19f485600cd3b2c2d793fdc
+EBUILD calculate-console-gui-3.2.9999.ebuild 578 SHA256 2a87e98828f92ae2e971b1f5f2927af077e93ed7d3fadacea7f7e232c7a09348 SHA512 15da60d40befc9bba51232dd388df2397aea92ec2b25d951a34fc1a298049602370ac53a98bef42995e3ba911c76bb3a838cf5bfd5a3c4a6af7fc33e0fab34fa WHIRLPOOL 895ac120cb615db6493156e16f0a634da178a667b5c45e122218ce0cc0d6abd096827c506d7cad94f0f613b324cf5d4848e11671caf9b34bbc352ba91d9aa20c
diff --git a/sys-apps/calculate-console-gui/calculate-console-gui-3.2.0_alpha1.ebuild b/sys-apps/calculate-console-gui/calculate-console-gui-3.2.0_alpha1.ebuild
index 4332996..3284d39 100644
--- a/sys-apps/calculate-console-gui/calculate-console-gui-3.2.0_alpha1.ebuild
+++ b/sys-apps/calculate-console-gui/calculate-console-gui-3.2.0_alpha1.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Qt gui console client for WSDL Calculate 3"
 HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
 LICENSE="Apache-2.0"
 SLOT="3"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 
 DEPEND="~sys-apps/calculate-core-3.2.0_alpha1
 	dev-python/dbus-python
diff --git a/sys-apps/calculate-console-gui/calculate-console-gui-3.2.9999.ebuild b/sys-apps/calculate-console-gui/calculate-console-gui-3.2.9999.ebuild
new file mode 100644
index 0000000..0f70dee
--- /dev/null
+++ b/sys-apps/calculate-console-gui/calculate-console-gui-3.2.9999.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 git-2
+
+EGIT_REPO_URI="git://git.calculate.ru/calculate-3/calculate-console-gui.git"
+
+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=""
+IUSE=""
+
+DEPEND="~sys-apps/calculate-core-3.2.9999
+	dev-python/pyside[script]"
+RDEPEND="${DEPEND}"
diff --git a/sys-apps/calculate-console/Manifest b/sys-apps/calculate-console/Manifest
index 1b6b4f4..af7cd6a 100644
--- a/sys-apps/calculate-console/Manifest
+++ b/sys-apps/calculate-console/Manifest
@@ -1,2 +1,3 @@
 DIST calculate-console-3.2.0_alpha1.tar.bz2 26068 SHA256 7d100a5091b68363c326ea002bd16ad77453c1ab9146350bde0a2d31394f1a42 SHA512 1d03db28fef82ba45547e1a5ffeed8a588f7e6cc0121edc4d85140332899526f50eeae347d8ba10406929b1c71a6760d2d9152ef70e8b29335b9085d2b8c3006 WHIRLPOOL 762eca57fc707d9234f10ce8f2e4f709bd6f0be0c01299aafd1b7b16233166fb13d26a3503be77482e8cbf3c9269a3b62240e538e00a0984f782fa2cb2d59461
-EBUILD calculate-console-3.2.0_alpha1.ebuild 550 SHA256 272190a00301ec4d8ce74b6489bc3b6c95e855990fd6b781f7ea8a81911c237e SHA512 24febbcb4087874242daac477c4926cf3c89cfa52b0be9a8df9b312f1438c6c6801e0bd562f130f4553a2a6e9c3bf0e99cf5b07ca57028f9d478a864a855eb09 WHIRLPOOL 414cabb3f3b19e873a62de79832419c453b82a731f931aa15e4f838b282b807d124d0f1b48eb170342db74fac504b59e1be6d5dd3f803dc538cd4edfe948bf94
+EBUILD calculate-console-3.2.0_alpha1.ebuild 552 SHA256 29bf3331ba8217017f5575a34b1166b40c736d7cd354ef1a30b0df8338de6944 SHA512 eaed9de8ebfedcaf29ec1ea63a3650a4540abab5b4a10cf384f272b5ae1b8bba193c0dca5819094749eb7e0c36c1bd60e9322da7010ea1392fae9deb1c57a25d WHIRLPOOL 4b1998a3d117ec2fa46326840073fb95d3c81367bfd721de5e072c2e742335a25ea23f4d32afcab6db9f7c112aef6b552281eff162444aa22a1506d9ef25b0fb
+EBUILD calculate-console-3.2.9999.ebuild 574 SHA256 590be3319c98cc65e32e30bba9ef0291aab808fccfb40f872e49d02d6ea14f6a SHA512 f704b0b010d4151483d9455baa7dcd779bb535ef02c48f98761194a330fd6af084f912766291e42341f1243b3f2d82eafcaebcd9b797eaae04cfe3d9709acad9 WHIRLPOOL 7935f5935f36c5ce28d14b09b2b5366147f3ba68d569a6940095d1ebf0eaf17c81421ae3a764dd2c01a17abdcbcff30ea45c1c592223b951d38edadcdfa731aa
diff --git a/sys-apps/calculate-console/calculate-console-3.2.0_alpha1.ebuild b/sys-apps/calculate-console/calculate-console-3.2.0_alpha1.ebuild
index f73c190..b510040 100644
--- a/sys-apps/calculate-console/calculate-console-3.2.0_alpha1.ebuild
+++ b/sys-apps/calculate-console/calculate-console-3.2.0_alpha1.ebuild
@@ -15,7 +15,7 @@ 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"
+KEYWORDS="~amd64 ~x86"
 
 DEPEND="~sys-apps/calculate-core-3.2.0_alpha1"
 RDEPEND="${DEPEND}"
diff --git a/sys-apps/calculate-console/calculate-console-3.2.9999.ebuild b/sys-apps/calculate-console/calculate-console-3.2.9999.ebuild
new file mode 100644
index 0000000..0c3a889
--- /dev/null
+++ b/sys-apps/calculate-console/calculate-console-3.2.9999.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 git-2
+
+EGIT_REPO_URI="git://git.calculate.ru/calculate-3/calculate-console.git"
+
+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=""
+IUSE=""
+
+DEPEND="~sys-apps/calculate-core-3.2.9999
+	dev-python/pyside[script]"
+RDEPEND="${DEPEND}"
diff --git a/sys-apps/calculate-core/Manifest b/sys-apps/calculate-core/Manifest
index 98414a8..199ed2b 100644
--- a/sys-apps/calculate-core/Manifest
+++ b/sys-apps/calculate-core/Manifest
@@ -1,4 +1,5 @@
 AUX calculate-core-3.2.0_alpha1-r1.patch 3909 SHA256 95338af9088ff7a8b535836c542c73aaaaeda2ae51c4fc070dee64ca015d65fe SHA512 743627d58a4c0c1ec0b57753fa5df320bbdec9102d4e6e3df63abe4e55323e4fac2de26ea22f69cb348f50070618eff5fb9b6848df0679bf73260a238507f4e0 WHIRLPOOL b186232ae83f4b40156bae4a0a66e1cde6b25768a329f7d7144cf4a4c6eee92e11319849cacb0ec2689a1f9801a96c1ae621505143c6bbc6979dd23c6fb4cade
 DIST calculate-core-3.2.0_alpha1.tar.bz2 83658 SHA256 780a4107fcf2d6ee84be721e571f595ae8eb6cebf313cf6feef9c1d64d3a6575 SHA512 906a653de9286cd4d1d922937aa6afafef9a854ebf49f0636a4ad7e5e7ae136d353fe4b8c196c037688f8df7fd3df213800d184734193058df0ebb42090866d0 WHIRLPOOL ca8fe5f238111d78a65f2d42e8f3c169b7074cd5ebd7b8a653824b23d59cdcbfbfc7146ab7d96cc34300a7d418a036729a8c7931fd020c993e97103440e90c4c
-EBUILD calculate-core-3.2.0_alpha1-r1.ebuild 1271 SHA256 e3b37d23b8ef1fc577cbf737f081bc9fe610fe02c2a061b6bb0b6db68ec042e8 SHA512 e8eda7dba5d3fd90fcbe08643e6bf60ed4368bb2afffe9c74da1dea2bdc02e0a11c9acabd073bc2871efbfeee721bbe143eca186a65aee496ffc08fd78eba22b WHIRLPOOL 968f4a01b58dc287d2d928ea6448b84e928ea1f34b1a1fe82d5bc6166e1abd3ccfc0319399ca1e09307867fde8e9548588692f9ee805863c117854bdb8fb7454
-EBUILD calculate-core-3.2.0_alpha1.ebuild 1129 SHA256 6157885be140f43eb9b64d463b469441690325a95f1188ec75d3351e89f0b0b7 SHA512 ad826d96ca70b846e83f23388c83fcec3d1d2cb5994a07bad13b5841ccf4882647d83cffc635c281d94fb6615d178521dc374141241ab24cf9cce2c9ec66ff91 WHIRLPOOL 92750d20b4d204de5413c4f5a06f026e9499a370ca0dc9206ec5f5efe7de6e16d6a495ac5ae9e5a6445411e7df90cf2bd49b979d279f4fceec3c6b1ee0a8c1a2
+EBUILD calculate-core-3.2.0_alpha1-r1.ebuild 1273 SHA256 63976ef94c626d3f910351467f2b3a82694948272883d00d4fba4903c3477ed6 SHA512 410c526fc951e3e3cc64d31a23a23528fd7dc34da410aeb26f0fa4522c151eef23ccca8786e8639ae254de73590501af12d893b85acd57dfcdc1fae7ac5c8111 WHIRLPOOL bf775eeee705c0883e36d01388463947e007ac4dcf82c3d2ca759f1546684a8c89e31c621f8d27662361e5785bc5f7070cfd279b06904a3274da51b6be6ebc81
+EBUILD calculate-core-3.2.0_alpha1.ebuild 1131 SHA256 08d7216cdc3618ae7a73f5cbce36a32d5e6aad3dbcbe4fd2eb94e5232dbe7d30 SHA512 dbe84720706bfda967d1c7758b476b83187c226894766b81c1e76012d20791d06bceefbccb5fcd92c884c7f6bd601f8e81d4af5caeb4f3adc58fab392bbd3108 WHIRLPOOL 415f3aab9b586620f68c4909d387267848053adc686fc675f9a666d8f19b93844af07d9402c2a27348f7c67b8e23f76485c5ed65b122129e064ff1bcc0c85030
+EBUILD calculate-core-3.2.9999.ebuild 656 SHA256 39383ebc527d7155b147355108ec0b069f7cad95d5fcabc33520f0fe1ee0b971 SHA512 e20a8dea6e20615baeb56069331cdc35a7c37a05afa125c7174c5082852242da446830940c962fd890bb6627d9f5cacf0848834b75bfb1a184a6acfef17f95f8 WHIRLPOOL 3e9f06bf7e2f99a46e3c681fa6f381b7b1883bb15e05c535a7acde55f9092418d0b71d95ce4b2906e8505ea73c4157620303e4e4e4e4de430f11bfd6214b4a88
diff --git a/sys-apps/calculate-core/calculate-core-3.2.0_alpha1-r1.ebuild b/sys-apps/calculate-core/calculate-core-3.2.0_alpha1-r1.ebuild
index f0748dd..29a7c40 100644
--- a/sys-apps/calculate-core/calculate-core-3.2.0_alpha1-r1.ebuild
+++ b/sys-apps/calculate-core/calculate-core-3.2.0_alpha1-r1.ebuild
@@ -15,7 +15,7 @@ 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"
+KEYWORDS="~amd64 ~x86"
 IUSE="minimal"
 
 DEPEND="~sys-apps/calculate-lib-3.2.0_alpha1
diff --git a/sys-apps/calculate-core/calculate-core-3.2.0_alpha1.ebuild b/sys-apps/calculate-core/calculate-core-3.2.0_alpha1.ebuild
index 59292ed..bd5e92b 100644
--- a/sys-apps/calculate-core/calculate-core-3.2.0_alpha1.ebuild
+++ b/sys-apps/calculate-core/calculate-core-3.2.0_alpha1.ebuild
@@ -15,7 +15,7 @@ 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"
+KEYWORDS="~amd64 ~x86"
 IUSE="minimal"
 
 DEPEND="~sys-apps/calculate-lib-3.2.0_alpha1
diff --git a/sys-apps/calculate-core/calculate-core-3.2.9999.ebuild b/sys-apps/calculate-core/calculate-core-3.2.9999.ebuild
new file mode 100644
index 0000000..9188f3d
--- /dev/null
+++ b/sys-apps/calculate-core/calculate-core-3.2.9999.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2011 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 git-2
+
+EGIT_REPO_URI="git://git.calculate.ru/calculate-3/calculate-core.git"
+
+DESCRIPTION="The WSDL api for Calculate 3"
+HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
+LICENSE="Apache-2.0"
+SLOT="3"
+KEYWORDS=""
+IUSE=""
+
+DEPEND="~sys-apps/calculate-lib-3.2.9999
+	>=dev-python/soaplib-1.0
+	dev-python/sudsds
+	dev-python/pyopenssl
+	dev-libs/openssl
+	dev-python/m2crypto
+	dev-python/cherrypy"
+RDEPEND="${DEPEND}"
diff --git a/sys-apps/calculate-desktop/Manifest b/sys-apps/calculate-desktop/Manifest
index 2d5adbf..df68e16 100644
--- a/sys-apps/calculate-desktop/Manifest
+++ b/sys-apps/calculate-desktop/Manifest
@@ -1,2 +1,3 @@
 DIST calculate-desktop-3.2.0_alpha1.tar.bz2 16991 SHA256 ae11cc15034f6c635056d2e093138cd0ff721c16ecce0f7a964b993c531cf55f SHA512 acb9bf90d706072201a3c1c63512e6f218964e89856a704c44f0545124ab96c2e7b1871239e9527ab87579adb812acb4541bb58eebdb53b80442524b5b5cf7e4 WHIRLPOOL 53c36dbad0473a1ba6977de5488975a87e7d35d9975399bdf715a48268dce5eb1b4d0c5026acf65fd6003388d42095d5264396cca5e9c06c98b1711e51f83f65
-EBUILD calculate-desktop-3.2.0_alpha1.ebuild 770 SHA256 606c58bc5479626b8acc1bf326abec9c3f3091fa80c32c09467a2617f9769836 SHA512 6cafb302d1bda54d47fdac281d26ae33e6441feb7d0ef76b119781171395a167652908b705567b781d12c784a9761c7f90e5ae6a972800c9a98df45e141c2377 WHIRLPOOL 24625dfc716b50ff8e5c03d3df063e5bd500071c396d4de35aa4259cf28c25446cdbe2915576bf3088a0399c5344cb117e1e00c9fe0c4e41a8598026033b37d5
+EBUILD calculate-desktop-3.2.0_alpha1.ebuild 772 SHA256 4cc1a40a4bc4ccce2b878d979ef1dfb84acadad570cebabefc9a34d5f32b774c SHA512 279af8a1c6e5d017d46c2436466e0697f4be35b6975e0f1d44c0f59e8020b3130c5788e4841116a021ab6b16fed1f21052886197342eb0987d72e549f5b17ba2 WHIRLPOOL 8f512d33d5364be9ee9cce997fea18826d77ca85287c7ef146c0729e4cfbeba09e5175fd889325b793322c4feee83633177793204bc63aa773639f27fe845914
+EBUILD calculate-desktop-3.2.9999.ebuild 976 SHA256 bd8a14acad129ab9d31540ed84b0ac43db93672c8b8503fc8a67fa9806ddf33c SHA512 8369a58929caad3c2b2017589e260c17eb17e55a3f7cd257836c7c9922a6880c991f70ab3e267c21a1cc416261e091aa3e1619e06cdc8c850096a39c63968a28 WHIRLPOOL 837661bf9ab451689c25290793a92286e9bed8eb02761bd3f7757b606f7ef16f18de4a8653c6e0902e3b23fafd1f3f7b3215e7e4d1713ed9e6f70ef12ded196e
diff --git a/sys-apps/calculate-desktop/calculate-desktop-3.2.0_alpha1.ebuild b/sys-apps/calculate-desktop/calculate-desktop-3.2.0_alpha1.ebuild
index 3d90233..92fb60f 100644
--- a/sys-apps/calculate-desktop/calculate-desktop-3.2.0_alpha1.ebuild
+++ b/sys-apps/calculate-desktop/calculate-desktop-3.2.0_alpha1.ebuild
@@ -16,7 +16,7 @@ DESCRIPTION="The program of the desktop configuration Calculate Linux"
 HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
 LICENSE="Apache-2.0"
 SLOT="3"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="~sys-apps/calculate-core-3.2.0_alpha1
diff --git a/sys-apps/calculate-desktop/calculate-desktop-3.2.9999.ebuild b/sys-apps/calculate-desktop/calculate-desktop-3.2.9999.ebuild
new file mode 100644
index 0000000..f422cf4
--- /dev/null
+++ b/sys-apps/calculate-desktop/calculate-desktop-3.2.9999.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2011 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 git-2
+
+EGIT_REPO_URI="git://git.calculate.ru/calculate-3/calculate-desktop.git"
+
+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="kde xfce gnome"
+
+DEPEND="~sys-apps/calculate-lib-3.2.9999
+	>=dev-python/python-ldap-2.0[ssl]
+	xfce? ( x11-misc/xdialog )
+	gnome? ( x11-misc/xdialog )
+	kde? ( kde-base/kdialog )"
+
+RDEPEND="${DEPEND}"
+
+pkg_postinst() {
+	#${EROOT}/usr/lib/calculate-2.2/calculate-desktop/bin/install
+	if use kde || use xfce || use gnome;
+	then
+		ewarn "Please restart xdm for refreshing configuration files."
+	fi
+}
+
+pkg_prerm() {
+	:
+	#${EROOT}/usr/lib/calculate-2.2/calculate-desktop/bin/uninstall
+}
diff --git a/sys-apps/calculate-i18n/Manifest b/sys-apps/calculate-i18n/Manifest
index 2e002f7..739b443 100644
--- a/sys-apps/calculate-i18n/Manifest
+++ b/sys-apps/calculate-i18n/Manifest
@@ -1,2 +1,3 @@
 DIST calculate-i18n-3.2.0_alpha1.tar.bz2 61231 SHA256 7106c79fd6384acbcfe97f46d1334cae25a63b9c91731be963411df3223e5bdb SHA512 1653a8b65e9a38ba795fba1045be5c458a6f195f58edd6de950cbea493a0e1ae5b76ed9dd4476dc2327efde39c578761f8d1792db2957867a1ce588aa9597cf0 WHIRLPOOL 46f088ecff5f03dcc27394fb725ab82e25be09eb87f1d990a3989bbbba7aa426ff6e1eb87b1dcdd620df3aba85874cb6061dad2af361b9c61e9c8aac732a3590
-EBUILD calculate-i18n-3.2.0_alpha1.ebuild 589 SHA256 fb0f8f542cfa7e1bfb2d5b545d39013f18223f159fbff1fa72538d70d8f9dbf5 SHA512 b1d35ab79ebc16d838009f4800b263facea9ac2d5da25d29f4b472967b5c137959201fb24a05b456a3e390d4e33c065ca537f8364492a0f907d7c988fc2a5f51 WHIRLPOOL 875489b96cb5f70f4b64b0921fc1f5d226610875793c2f1a204246f21e6dd221fd83adc08dc91c11c8d5d04ea37ac78d5d694e10d999e863b3874dd6ebd2a238
+EBUILD calculate-i18n-3.2.0_alpha1.ebuild 591 SHA256 5ffe274215d7d2dd0a355675dff86da7e74a6c0c2ca6cce8cb345ae909cd3e20 SHA512 75bca8b32a89d672c9cea72800c074f13850b33ac369b3bdcff981b041a18d6cca490e5dd57f4d1a1618f2ee5f0676b87ea5372b9869ba61a1480b88be0107a3 WHIRLPOOL f043207a332c295e80220387087065cbcc81a9472846f406c53b849bd3841f4e730754c418b75e0535b82f4b77556cf5bd796cd52308cf3b014e05b47c231547
+EBUILD calculate-i18n-3.2.9999.ebuild 583 SHA256 aa60c513b0f672aa9618bfd8099fefaf49fa5ef9b24ee2645356da69563032fa SHA512 14b87ddb0f910e1b983ef465efdc56347abe01d4cdc11d6d81d593a2e65dcba1b79357d37952d7aa7f800fad8d30592db2e337d0fc6ca9807bdba618aff48528 WHIRLPOOL 14a1c4f1ef646aee28934e820763bd149e37860cce1ee34ac2229742980ec178fc43ba284b59a2f71a740cfa8e48ff7658a613b03eb0f84d4a10cefdd65450da
diff --git a/sys-apps/calculate-i18n/calculate-i18n-3.2.0_alpha1.ebuild b/sys-apps/calculate-i18n/calculate-i18n-3.2.0_alpha1.ebuild
index 449b062..043b0f1 100644
--- a/sys-apps/calculate-i18n/calculate-i18n-3.2.0_alpha1.ebuild
+++ b/sys-apps/calculate-i18n/calculate-i18n-3.2.0_alpha1.ebuild
@@ -15,7 +15,7 @@ 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"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND=">=sys-apps/calculate-lib-3.2.0_alpha1"
 
diff --git a/sys-apps/calculate-i18n/calculate-i18n-3.2.9999.ebuild b/sys-apps/calculate-i18n/calculate-i18n-3.2.9999.ebuild
new file mode 100644
index 0000000..804ca07
--- /dev/null
+++ b/sys-apps/calculate-i18n/calculate-i18n-3.2.9999.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2011 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 git-2
+
+EGIT_COMMIT=""
+EGIT_REPO_URI="git://git.calculate.ru/calculate-3/calculate-i18n.git"
+
+DESCRIPTION="The internationalization package for calculate utilities"
+HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
+LICENSE="Apache-2.0"
+SLOT="3"
+KEYWORDS=""
+
+RDEPEND=">=sys-apps/calculate-lib-2.2.19"
+
+DEPEND="sys-devel/gettext
+	${DEPEND}"
diff --git a/sys-apps/calculate-install/Manifest b/sys-apps/calculate-install/Manifest
index b93af4f..dc9c569 100644
--- a/sys-apps/calculate-install/Manifest
+++ b/sys-apps/calculate-install/Manifest
@@ -1,2 +1,3 @@
 DIST calculate-install-3.2.0_alpha1.tar.bz2 77373 SHA256 d636ddbfe3fa2990e5a490b6fd23cee7c1f9d2d69fcb975d62ef2cf94b78a033 SHA512 f2e1089828811d0dac18ed3d3e864dc1a543f198edf8b18a23b267b16f2583d75c4f3650ce92d7fd54de489da8b825c77b4d3fe5d788d210810f9909dca48266 WHIRLPOOL ef0d8766eb20eb8076ebcceaaa869d887ea02ccc565a149840ee645e43366de236f8f1250d9a1052e8146c6401f4562b5457cb071bf9ad49db9800ce53c99f4d
-EBUILD calculate-install-3.2.0_alpha1.ebuild 912 SHA256 95b27fc753818174f78934b7dc7bb8156c4d777b496c67de0d14016d538fac12 SHA512 885146f80973c63d591164a186f62da11ea08347def5c34a080b459be8e92511449ebe41356d827d39eb39b75a619b2e4b49c39b4158615df918b88a8b5bbf27 WHIRLPOOL 709016b33f4ad6626658cc7598770850d3ebdfdd7319b915090f9b86b052cac5d21411d8e426d9fb566029507222407937cdaa1fc2913ca5fcee17fe933cfc0c
+EBUILD calculate-install-3.2.0_alpha1.ebuild 914 SHA256 2ef6cf6b62c46fb65466a7dab039e72178fc98f77ea56104b4f327b2596cbbd4 SHA512 f0853f5ddc2c71754e5249df9c332a04accc390d7514347651a24ce4ace8e93e4ac1a763aadec5fe4de4ffe7277d6c7e477985fda9c3a9c8957afea52b7bcb74 WHIRLPOOL e443c38a254512205f1d141c3d409a44329c22ff56281da462bef683cab2bb3dc2cff416d39ed30fde512c69551005bb099ffb22e90e89f25b1de3e01afe9271
+EBUILD calculate-install-3.2.9999.ebuild 683 SHA256 e355d430ae0b2a2103d5c959adf7fa57a23d4bfa17d77c2bd698114fe6c471ce SHA512 de416bd2be0d4928fc2934724abcd3fd168ba8a945bd680a61b990d01805f3dd22c1955bb819f271357fd12bccd91c25daa058b3c667deeceb255c5d713ff0c6 WHIRLPOOL dcfb7e979a63dad506743834f09b8192fbb5ddd637fde5a6890fa7412b453fa99b7d94f3229149061469ce1a541a1560f97de875aa61a9aa301d5fe97408876c
diff --git a/sys-apps/calculate-install/calculate-install-3.2.0_alpha1.ebuild b/sys-apps/calculate-install/calculate-install-3.2.0_alpha1.ebuild
index f1e1fdf..9e56ac2 100644
--- a/sys-apps/calculate-install/calculate-install-3.2.0_alpha1.ebuild
+++ b/sys-apps/calculate-install/calculate-install-3.2.0_alpha1.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="The program of installation Calculate Linux"
 HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
 LICENSE="Apache-2.0"
 SLOT="3"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="pxe minimal"
 
 DEPEND="~sys-apps/calculate-core-3.2.0_alpha1
diff --git a/sys-apps/calculate-install/calculate-install-3.2.9999.ebuild b/sys-apps/calculate-install/calculate-install-3.2.9999.ebuild
new file mode 100644
index 0000000..5d56eb8
--- /dev/null
+++ b/sys-apps/calculate-install/calculate-install-3.2.9999.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2011 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 git-2
+
+EGIT_REPO_URI="git://git.calculate.ru/calculate-3/calculate-install.git"
+
+DESCRIPTION="The program of installation Calculate Linux"
+HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
+LICENSE="Apache-2.0"
+SLOT="3"
+KEYWORDS=""
+IUSE="minimal"
+
+DEPEND="~sys-apps/calculate-lib-3.2.9999
+	app-portage/layman
+	!minimal? ( sys-boot/grub
+	sys-apps/gptfdisk
+	sys-fs/dosfstools
+	sys-fs/squashfs-tools
+	sys-block/parted )"
+
+RDEPEND="${DEPEND}"
diff --git a/sys-apps/calculate-lib/Manifest b/sys-apps/calculate-lib/Manifest
index b5dff97..d1c5657 100644
--- a/sys-apps/calculate-lib/Manifest
+++ b/sys-apps/calculate-lib/Manifest
@@ -1,4 +1,5 @@
 AUX calculate-lib-3.2.0_alpha1-r1.patch 1248 SHA256 6b1b3d062a082ca34c708d9700d0501225cd18a6a255ed16517b3815e619f536 SHA512 d77196c708e76fd2cb261fe6ac6d66249ceffd567a730a51b075a667c416e6c481302917874cc4dc2b982b0495695486580e79af0fa96ed54bada581badd6a37 WHIRLPOOL 0fe7e95183e80c5bd1e62b6615f7ed022ef9edd077ab6dc8c75b41afcee451544de3b653436d68b41e5ed30e29621697c5a739ca4c355e0a4c7abc2862f083ab
 DIST calculate-lib-3.2.0_alpha1.tar.bz2 121698 SHA256 a1c605690dbb8c9fa6bcccd1a3bd1ff6500e4566e9d9a8ddc1ef4967ea38fbb8 SHA512 30196b7cba04f218c2e3105951fdaaa1a8c916d5b2265a4a09d1cce7b317f7ec501cd2edb70ecb41f25a1ee4ecfa89e23e3255a4adbfbf3ba7715c384171d0a3 WHIRLPOOL 0e9525e2b728a98c02b0a11f70dc13fb3922fd7e5ac01b168d9aeaa8c2544707533a1ecbd6aea4dd28a7836288efd8a8393216a68176c32615af8417e1acd4fc
-EBUILD calculate-lib-3.2.0_alpha1-r1.ebuild 831 SHA256 a0822dc9b2a6196d950c824d08e166058c43a516b4b71f17646aa4c2100b36eb SHA512 5c439363f3f1b4f1092e76584878b82e75a10cf26b487f4fddae7980d0b14259fe8438d37c44c7601d2fa3c7323ca1234ee128c1b8e9ac4e5c452d6f47639508 WHIRLPOOL 2fc191fb9bee248bbfe0c7d60560e55f4cba29de40b1888475dbce4eeecd41459b421bc8d1e85f12fb88d97bd8c63e11d9c5dd7463fe5d4a7dd045e4922a4b51
-EBUILD calculate-lib-3.2.0_alpha1.ebuild 690 SHA256 c89c29f5de3f70146e98f15035366506933f03e8a5066b1ad55aeccbebdeae2c SHA512 a7277c2e5fa64a5e5840be7fc8d3df9a31f41926386c5fe6a9bed31eeed6321af5881c218d9ce7eeb12aee518edb682b438e10397dcb815cc63645100430e43e WHIRLPOOL 8f19e4d46381e26fec81e20fa35599f4658b3891d6372c921a8b1354ad3b1821ea9c78f71caebf54610e0b5aacfb6e6ded018e155e1979322406a0ac1e823d09
+EBUILD calculate-lib-3.2.0_alpha1-r1.ebuild 833 SHA256 4d398b3dacd343bc0e41c441705d85af6e6d125dde5f10137787e3d4f90051d0 SHA512 1f86dbaf24d469504eda091a9d6909aeb6f00ceacbbbc4cd767b5cb1af891eddbfe6e9f2cffaecc1b08f7b89e140afdf69fc78baeeb5987cc53433ea13aa239d WHIRLPOOL ac9500c3cbb72f40049e6ffe823a4863bc65424daaacd10013f495d6e42402c18e3e960dbd68b9dac823cdec168cd11d703c20f62a24e3fd24395704618f6ae8
+EBUILD calculate-lib-3.2.0_alpha1.ebuild 692 SHA256 565d13cfdd515cb534e56bdcb3c00e7182194d12c8de259851ec9fc5230b28a3 SHA512 a437100783152c3413c4184e90c5820f56529d1cee2e11dc4f0e88acfe3d3267b0fb85a3a9b04193709447f10dc4815d8c49e612ffe02e497a22acef11d68d95 WHIRLPOOL 3411233d326b21fe63e17106f425fec71a21c4cb77bee3d201b97a81870d76fa8a842e96515573b30aba88bb9209301607d8bc982f16b2406b70f9a84c8b4ee9
+EBUILD calculate-lib-3.2.9999.ebuild 708 SHA256 a1d64b7f014831bf6b0a38928d53cb55758b7a12e5f3e98fffd28025ffacbce1 SHA512 3873859a791941d421e2338b437521955da383ce986408f1a951305e2dd75a1a4f771c9ec2caa096c5c8ea6a1776d6d0ed99e025ffa786ba029cafdbadfa439b WHIRLPOOL 5ac1a10b53f810ab527a0ebe52bc87e8397e61375cf6e0acbed89d8f6b8385e72bf234e0fdce479c3a3f1652bb6e520710ce9356750a97d644c0db0a33f6facb
diff --git a/sys-apps/calculate-lib/calculate-lib-3.2.0_alpha1-r1.ebuild b/sys-apps/calculate-lib/calculate-lib-3.2.0_alpha1-r1.ebuild
index c297508..ec8ebfd 100644
--- a/sys-apps/calculate-lib/calculate-lib-3.2.0_alpha1-r1.ebuild
+++ b/sys-apps/calculate-lib/calculate-lib-3.2.0_alpha1-r1.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="The library for Calculate 3"
 HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
 LICENSE="Apache-2.0"
 SLOT="3"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="minimal"
 DEPEND="!minimal? ( dev-python/py-smbpasswd )
 	>=dev-python/pyxml-0.8
diff --git a/sys-apps/calculate-lib/calculate-lib-3.2.0_alpha1.ebuild b/sys-apps/calculate-lib/calculate-lib-3.2.0_alpha1.ebuild
index e765a3e..ba4de72 100644
--- a/sys-apps/calculate-lib/calculate-lib-3.2.0_alpha1.ebuild
+++ b/sys-apps/calculate-lib/calculate-lib-3.2.0_alpha1.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="The library for Calculate 3"
 HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
 LICENSE="Apache-2.0"
 SLOT="3"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="minimal"
 DEPEND="!minimal? ( dev-python/py-smbpasswd )
 	>=dev-python/pyxml-0.8
diff --git a/sys-apps/calculate-lib/calculate-lib-3.2.9999.ebuild b/sys-apps/calculate-lib/calculate-lib-3.2.9999.ebuild
new file mode 100644
index 0000000..bd72e3a
--- /dev/null
+++ b/sys-apps/calculate-lib/calculate-lib-3.2.9999.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2011 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 git-2
+
+EGIT_REPO_URI="git://git.calculate.ru/calculate-3/calculate-lib.git"
+
+DESCRIPTION="The library for Calculate 2"
+HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
+LICENSE="Apache-2.0"
+SLOT="3"
+KEYWORDS=""
+IUSE="minimal"
+
+DEPEND="!<sys-apps/calculate-lib-2.1.8-r1
+	!=sys-apps/calculate-lib-2.1.9
+	!=sys-apps/calculate-lib-2.1.10
+	!minimal? ( dev-python/py-smbpasswd )
+	>=dev-python/pyxml-0.8
+	dev-python/pyinotify
+	sys-apps/file[python]"
+RDEPEND="${DEPEND}"
diff --git a/sys-apps/calculate-update/Manifest b/sys-apps/calculate-update/Manifest
index d9a49d6..4ba9c61 100644
--- a/sys-apps/calculate-update/Manifest
+++ b/sys-apps/calculate-update/Manifest
@@ -1,4 +1,5 @@
 AUX calculate-update-3.2.0_alpha1-r1.patch 683 SHA256 39edbee7b73bbb34d31ce88170e5624c956f99f2535346ae4572f5b293610485 SHA512 6a9f5dd2f66fe7cbd21073b676a29ae8bb8a5884822d2ddc99321637f4475aa1ed8eda10a7ee80b7bcab4bb711bc1d2d0d44f526ee300a0fda4e2a25c0ffafb3 WHIRLPOOL 3cceb6d5a53126d7cb14ca412b48985ed235f1de898e7e304fbb12b21deaa2c0934554b121fa165f2be1ec18443279c103d99f3f5e53c07d343da291132cb0f5
 DIST calculate-update-3.2.0_alpha1.tar.bz2 14159 SHA256 6c5e73041029e93f04fe897447984c1f52f66f3486309d4e3bb741c0151dc44d SHA512 aac77b42e51f3be5f266bc3a7c233d2fa443b6316a7a618c61ef07be8e25704322bec6c39352184ee8fae227e4b2bbf276dfa038d4006be12079c71e983d16d4 WHIRLPOOL 8f395718c3332286ce47783fc42601f3dea9b9f7fd7225e5549ff8d04013a4d6a2208f103fde112b6ebf6791650a61aa5974dbfa435aecfd7d8e7b2d7ff9ae8b
-EBUILD calculate-update-3.2.0_alpha1-r1.ebuild 747 SHA256 758df870a3b2cc3b6529107951e865547259502434ef5c8c5b5c6b48c9079cd0 SHA512 fcd2c99f30389b02060238b9423bf638da6d1039c2fa7c096f19a28a4e9590424a22a5a4e4b32fa72e718b3923afcf8fb7067d0ddd8d9d8cf9fee11ed17742f6 WHIRLPOOL 416767c021c45ea5d647ed094d9bf4351c428604fda39fb135cfb75f6047f0db7484bf1ea6f12e7cd59b7d408d6fa938e4be6bab6756ce0f226fe782e0fa6640
-EBUILD calculate-update-3.2.0_alpha1.ebuild 603 SHA256 d9000ce6457c66e254093a9ac83b162f1d0cc507ff2894debdcff722b0ae08f2 SHA512 29cf3c4098dbd1ef9aaa21ca5d52b6ccada34916f875b45a732679a2ae1b7247aa182754ecae8b7c526de29507d883c6a0be1d22484233b325ca5733dfdf8450 WHIRLPOOL 6f944310e7fe59b4f51e3a1020e78e1662cab877f34d876e7a4666174e2c14c7e79624c32255d3207c14304ae30dbee40826ce361040fc0b7fc0319b109231c4
+EBUILD calculate-update-3.2.0_alpha1-r1.ebuild 749 SHA256 59377f0c4bd1b0ab1a881a2c6ea8ed46717a709c84c07dcc1a07f161dc0b2259 SHA512 cbcbf5c5ebe2fe8e7f79b20f35f7ab5c26e48b1769c6bbffe73c41d73052627cc6eda7aed812c8bb94b98361ee0f04bf81381b6ecd3b81a52b6e8756e410b4d9 WHIRLPOOL ed5ac0355fa232190a75ec5daff8b2559435eceaac13ef3cf0a17a501eda4a264ae85e546de10cc0af42ac9b099dbe078b31c095cb7d42d4a5a8e9876b16c84e
+EBUILD calculate-update-3.2.0_alpha1.ebuild 605 SHA256 bbba2cb38551fc98a0be4b262a9dacb7c37eb9459721dc4e7bfe59f54149330a SHA512 06ca411da63d5f8eb1dce23a908d5735dc760654a54b6246b373454f39c6966e8a46f2acf7c9f86c3b70cf3cd789459dac7757ac9c5747d1fc9bf85c09b850bb WHIRLPOOL cd2d5211ebe879bdee1af43446088700fbc5609c7c87ce25c3364a0c9a42942af9a1a8a11efcf1773217def31778d1139e491a6e771bb90b9b3f56a3e20ab570
+EBUILD calculate-update-3.2.9999.ebuild 530 SHA256 9558d49a6b95f73c67f79c835e4003725ba7ae7e0492ea336737da16fe2f5005 SHA512 466bce621f4073bfbf4d34063cbb54077910baa5e40637d5d8d23044edccc9d79bb764db25e05b68969f1bd63573a1c0bc04676f45a6bbeca173503df6887767 WHIRLPOOL 0107e9b7746739a9be77664aa9e6907c9e511ac0422721d709fe63ffb4a55246a2d6c494280bd3b72e50d8e1aecb7f811cfdd112c482168bd9fa17c4ff0d5eaf
diff --git a/sys-apps/calculate-update/calculate-update-3.2.0_alpha1-r1.ebuild b/sys-apps/calculate-update/calculate-update-3.2.0_alpha1-r1.ebuild
index d7c9560..e739082 100644
--- a/sys-apps/calculate-update/calculate-update-3.2.0_alpha1-r1.ebuild
+++ b/sys-apps/calculate-update/calculate-update-3.2.0_alpha1-r1.ebuild
@@ -15,7 +15,7 @@ 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"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="~sys-apps/calculate-core-3.2.0_alpha1
diff --git a/sys-apps/calculate-update/calculate-update-3.2.0_alpha1.ebuild b/sys-apps/calculate-update/calculate-update-3.2.0_alpha1.ebuild
index 690fd3a..d67a0c8 100644
--- a/sys-apps/calculate-update/calculate-update-3.2.0_alpha1.ebuild
+++ b/sys-apps/calculate-update/calculate-update-3.2.0_alpha1.ebuild
@@ -15,7 +15,7 @@ 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"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="~sys-apps/calculate-core-3.2.0_alpha1
diff --git a/sys-apps/calculate-update/calculate-update-3.2.9999.ebuild b/sys-apps/calculate-update/calculate-update-3.2.9999.ebuild
new file mode 100644
index 0000000..b061998
--- /dev/null
+++ b/sys-apps/calculate-update/calculate-update-3.2.9999.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2011 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 git-2
+
+EGIT_REPO_URI="git://git.calculate.ru/calculate-3/${PN}.git"
+
+DESCRIPTION="The program of update Calculate Linux"
+HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
+LICENSE="Apache-2.0"
+SLOT="3"
+KEYWORDS=""
+IUSE=""
+
+DEPEND="~sys-apps/calculate-lib-3.2.9999"
+
+RDEPEND="${DEPEND}"
diff --git a/sys-apps/calculate-utilities/Manifest b/sys-apps/calculate-utilities/Manifest
index b7388d4..96127f4 100644
--- a/sys-apps/calculate-utilities/Manifest
+++ b/sys-apps/calculate-utilities/Manifest
@@ -1,2 +1,3 @@
-EBUILD calculate-utilities-3.2.0_alpha1-r1.ebuild 821 SHA256 85f6bcdbe77b73f1a0c82f2652f49dd92668c060a4cc1807e7355bf192ddf5c8 SHA512 7789e94c057ffe35020712833edf9e6548b9080273398dda887f6fe55d566f547b7013e4697ad881aadcff90025ec6e99db0156947860851100fa3d3ea1f894a WHIRLPOOL 6f9add40409b7d49d4c9b80b760e27b4965e5045167618ab073f85fb519e79713f0bd0704493f05b8281d754d6ef8d35ef3d22bbb10ea6dd1cc553ffee1bb8b9
-EBUILD calculate-utilities-3.2.0_alpha1.ebuild 812 SHA256 071147df50799142c686c4e90ae04bbd58f1939dd4de7f5152cc169ebc5a7cfd SHA512 0289587199af8c5c8be685c8aa314d1b68e122f996f4d90fa3f90ddc9ba4ee080c9482a9f27f068caf7256ade5d7a57a837b659a1e9048c256b7416f573144c7 WHIRLPOOL c5fcc6efc2bc4bfd552d253f10689a2acbfe76b222f95a9c66db8ae651e2a2097551b6e84010d898bd506dd9f531e7ef909d48463f922fa94fd57fef6ad3b01d
+EBUILD calculate-utilities-3.2.0_alpha1-r1.ebuild 823 SHA256 2b50e40a1ffe5e903a7a6f5593afa525d40e4c9779b1d251369762d696a0f2c4 SHA512 ed74da8b3492170fd565cf175495c3e2ed4f33e81cc3b96aca45713551ad2058264e7b58a9bc03f6573f2d1fe89de14b7de6f878dccf689e7944a8bf4a65bb8e WHIRLPOOL 818629c905836836820df45db67df657be07610a40c7ab034003eba5ce373c45b98e1ddf9256ac59ff2a2672485da0b62793c7dd43323306063bd8dedc83048e
+EBUILD calculate-utilities-3.2.0_alpha1.ebuild 814 SHA256 8bfda4f720daefebbdb87be5d078e7fe4e03042e0e1ddf30c907925f48c10c50 SHA512 0948e70dc1cff058f2523aab3e43ff74704128face7db74381dc014c05f628b57c2baa5531b19bb9a335198ed47904e649b724d46214bad0e069b1283256fbbf WHIRLPOOL 0d3d84b220e813e0b979d70513e75ba10605d289b65df41eb4f73b5449b271cd4f3343088e8e1696615aca5244b23e09013e89a26c6624925288edc47fd1368e
+EBUILD calculate-utilities-3.2.9999.ebuild 800 SHA256 acbb7a4e34387baa1ade9bf97637972fbfc97afa56367381d622198b5237e983 SHA512 9e0c74eb499157b6d3ace20d7e9da630660e46b74a6d575e222e1638c87f85660635187489b9312a45f193780c301d87c1dbb9a0f60414e178e8f54080c71ffd WHIRLPOOL 9b56f590f36d29d3518c66c453f97b14d083e36b62adb70a8916ae4e30b527431602a9edd40d703e5cb4296a01f8c982157b602651ee57a9c0ddb7a4c6aa2fe1
diff --git a/sys-apps/calculate-utilities/calculate-utilities-3.2.0_alpha1-r1.ebuild b/sys-apps/calculate-utilities/calculate-utilities-3.2.0_alpha1-r1.ebuild
index f82353f..549f1af 100644
--- a/sys-apps/calculate-utilities/calculate-utilities-3.2.0_alpha1-r1.ebuild
+++ b/sys-apps/calculate-utilities/calculate-utilities-3.2.0_alpha1-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE="Apache-2.0"
 SLOT="3"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="cl_consolegui cl_client cl_desktop cl_console"
 
 RDEPEND="${RDEPEND}
diff --git a/sys-apps/calculate-utilities/calculate-utilities-3.2.0_alpha1.ebuild b/sys-apps/calculate-utilities/calculate-utilities-3.2.0_alpha1.ebuild
index bcc627e..3cec1e8 100644
--- a/sys-apps/calculate-utilities/calculate-utilities-3.2.0_alpha1.ebuild
+++ b/sys-apps/calculate-utilities/calculate-utilities-3.2.0_alpha1.ebuild
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE="Apache-2.0"
 SLOT="3"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="cl_consolegui cl_client cl_desktop cl_console"
 
 RDEPEND="${RDEPEND}
diff --git a/sys-apps/calculate-utilities/calculate-utilities-3.2.9999.ebuild b/sys-apps/calculate-utilities/calculate-utilities-3.2.9999.ebuild
new file mode 100644
index 0000000..1d87f3b
--- /dev/null
+++ b/sys-apps/calculate-utilities/calculate-utilities-3.2.9999.ebuild
@@ -0,0 +1,31 @@
+# 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_console_gui
+cl_client
+cl_console
+cl_desktop"
+
+RDEPEND="${RDEPEND}
+	=sys-apps/calculate-install-3.2.9999
+	!<sys-apps/calculate-desktop-3.1
+	!<sys-apps/calculate-client-3.1
+	=sys-apps/calculate-i18n-3.2.9999
+	=sys-apps/calculate-lib-3.2.9999
+	=sys-apps/calculate-core-3.2.9999
+	cl_desktop? ( =sys-apps/calculate-desktop-3.2.9999 )
+	cl_client? ( =sys-apps/calculate-client-3.2.9999 )
+	cl_console? ( =sys-apps/calculate-console-3.2.9999 )
+	cl_console_gui? ( =sys-apps/calculate-console-gui-3.2.9999 )
+"
+