From 15fb8cc70e137c34fd6049acdff1d80e84f060fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A5=D0=B8=D1=80=D0=B5=D1=86=D0=BA=D0=B8=D0=B9=20=D0=9C?=
 =?UTF-8?q?=D0=B8=D1=85=D0=B0=D0=B8=D0=BB?= <mh@calculate.ru>
Date: Thu, 21 Jun 2012 18:18:43 +0400
Subject: [PATCH] Unmask 2.2.29 create 3.0.0_beta1

---
 profiles/calculate/package.keywords/defaults  |  6 +--
 profiles/package.mask                         |  8 ----
 sys-apps/calculate-assemble/Manifest          |  2 +-
 .../calculate-assemble-2.2.29.ebuild          |  2 +-
 sys-apps/calculate-builder/Manifest           |  2 +-
 .../calculate-builder-2.2.29.ebuild           |  2 +-
 sys-apps/calculate-client/Manifest            |  2 +-
 .../calculate-client-2.2.29.ebuild            |  2 +-
 sys-apps/calculate-console-gui/Manifest       |  2 +
 .../calculate-console-gui-3.0.0_beta1.ebuild  | 21 ++++++++++
 sys-apps/calculate-console/Manifest           |  2 +
 .../calculate-console-3.0.0_beta1.ebuild      | 18 +++++++++
 sys-apps/calculate-core/Manifest              |  2 +
 .../calculate-core-3.0.0_beta1.ebuild         | 34 ++++++++++++++++
 sys-apps/calculate-desktop/Manifest           |  2 +-
 .../calculate-desktop-2.2.29.ebuild           |  2 +-
 sys-apps/calculate-i18n/Manifest              |  4 +-
 .../calculate-i18n-2.2.29.ebuild              |  2 +-
 .../calculate-i18n-3.0.0_beta1.ebuild         | 20 ++++++++++
 sys-apps/calculate-install/Manifest           |  2 +
 .../calculate-install-3.0.0_beta1.ebuild      | 39 +++++++++++++++++++
 sys-apps/calculate-lib/Manifest               |  4 +-
 .../calculate-lib/calculate-lib-2.2.29.ebuild |  2 +-
 .../calculate-lib-3.0.0_beta1.ebuild          | 25 ++++++++++++
 sys-apps/calculate-utilities/Manifest         |  3 +-
 .../calculate-utilities-2.2.29.ebuild         |  2 +-
 .../calculate-utilities-3.0.0_beta1.ebuild    | 24 ++++++++++++
 27 files changed, 211 insertions(+), 25 deletions(-)
 create mode 100644 sys-apps/calculate-console-gui/calculate-console-gui-3.0.0_beta1.ebuild
 create mode 100644 sys-apps/calculate-console/calculate-console-3.0.0_beta1.ebuild
 create mode 100644 sys-apps/calculate-core/calculate-core-3.0.0_beta1.ebuild
 create mode 100644 sys-apps/calculate-i18n/calculate-i18n-3.0.0_beta1.ebuild
 create mode 100644 sys-apps/calculate-install/calculate-install-3.0.0_beta1.ebuild
 create mode 100644 sys-apps/calculate-lib/calculate-lib-3.0.0_beta1.ebuild
 create mode 100644 sys-apps/calculate-utilities/calculate-utilities-3.0.0_beta1.ebuild

diff --git a/profiles/calculate/package.keywords/defaults b/profiles/calculate/package.keywords/defaults
index 7d4d9f629..24b3401dd 100644
--- a/profiles/calculate/package.keywords/defaults
+++ b/profiles/calculate/package.keywords/defaults
@@ -1,12 +1,12 @@
 <=sys-apps/portage-2.2.0 amd64 x86
 
-<=sys-apps/calculate-utilities-3.0.0 amd64 x86
+=sys-apps/calculate-utilities-3.0.0* amd64 x86
 =sys-apps/calculate-lib-3.0.0* amd64 x86
 <=sys-apps/calculate-core-3.0.0 amd64 x86
-<=sys-apps/calculate-install-3.0.0 amd64 x86
+=sys-apps/calculate-install-3.0.0* amd64 x86
 <=sys-apps/calculate-console-3.0.0 amd64 x86
 <=sys-apps/calculate-console-gui-3.0.0 amd64 x86
-<=sys-apps/calculate-i18n-3.0.0 amd64 x86
+=sys-apps/calculate-i18n-3.0.0* amd64 x86
 ~dev-python/soaplib-1.0.0 amd64 x86
 
 ~app-admin/eselect-1.3.1 amd64 x86
diff --git a/profiles/package.mask b/profiles/package.mask
index b3b33c923..b92459d12 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -34,11 +34,3 @@
 
 # Mask calculate-sources-2.6.32.25 for CDS
 #=sys-kernel/calculate-sources-2.6.32.25
-
-=sys-apps/calculate-assemble-2.2.29
-=sys-apps/calculate-builder-2.2.29
-=sys-apps/calculate-client-2.2.29
-=sys-apps/calculate-desktop-2.2.29
-=sys-apps/calculate-i18n-2.2.29
-=sys-apps/calculate-lib-2.2.29
-=sys-apps/calculate-utilities-2.2.29
diff --git a/sys-apps/calculate-assemble/Manifest b/sys-apps/calculate-assemble/Manifest
index e712c98d2..e2f25bf9d 100644
--- a/sys-apps/calculate-assemble/Manifest
+++ b/sys-apps/calculate-assemble/Manifest
@@ -5,7 +5,7 @@ AUX calculate-assemble-2.2.28-update_world_bdeps.patch 696 RMD160 aa058b4258ebec
 DIST calculate-assemble-2.2.28.tar.bz2 26649 RMD160 b1d93606159e539aeb462100f16f74c00fcaa58b SHA1 50e258ea83d6e45042d02e538202fe88c294964a SHA256 ee49670a9de34721b5f228e65430cdde0ab4e6d9f63c74b8f6b72fb487911ff8
 DIST calculate-assemble-2.2.29.tar.bz2 26801 RMD160 bdcad3c4f67c2030522005e5240a80f44e407aaa SHA1 cd4163a19664d7aaf164b644e5246305117534d6 SHA256 667ea38456ed7b66d3b20e01bc1390372c8c4e4e32c3c8b19ae6329a56f3da80
 EBUILD calculate-assemble-2.2.28-r5.ebuild 959 RMD160 00f88d26bb1ce8fc96b678daafc4f5270f5dae3b SHA1 ebf4ffdbfcc9d1adba61a5489152a5d9d6a5ef52 SHA256 1a9ffdbadab94582121fd6b9babcffa1c7dccd3918691384a6c02a10bb49f0d7
-EBUILD calculate-assemble-2.2.29.ebuild 483 RMD160 f1a17ff2f5088c3a7f41f55a3abb63a7c2173344 SHA1 f945339351093c6ff6e4d201c8e3539ea971a81a SHA256 78489a723150634fa4e9bf328f4cc0514941801c534389caaf040e32ce7cf300
+EBUILD calculate-assemble-2.2.29.ebuild 481 RMD160 17a1e11611512e000a947b55766673d6f74f8e15 SHA1 65964cc682d13c74e2f0c4941c07422f5a1a730d SHA256 ffd8934651250abbf7adde8ce2218391c1f684ee2da24c0bf429f79dc4719783
 EBUILD calculate-assemble-2.2.9999.ebuild 498 RMD160 2c78ad8ec93daa2714f37760bf62f1071160ba4b SHA1 31812083d2ac1e171b95e02519888690a747a706 SHA256 0371109c66629a5895716c2e5c867a3bb15437d9bbec95b9c5fe387de8bea62e
 MISC ChangeLog 16531 RMD160 80f48b2586d89deeb11f886bd04f748fb0ed7912 SHA1 272ed7e7e96bd24c0d887a98086de3c4aa13376f SHA256 1030550948678eea2ed6b524372f6673ecaf508f89057b3a0419a3f2a1c986f0
 MISC metadata.xml 273 RMD160 7d99331acd3ba20fc7ae361cb845f33f73d994ee SHA1 92e19e1e4c24527654168ac0cf9fe58ba78aeb4d SHA256 4e25d45ba43b2ab7f7ae8ab4cfc05c406566cfb143a87166de77fbd8d9f8a943
diff --git a/sys-apps/calculate-assemble/calculate-assemble-2.2.29.ebuild b/sys-apps/calculate-assemble/calculate-assemble-2.2.29.ebuild
index 33714985b..673bc543d 100644
--- a/sys-apps/calculate-assemble/calculate-assemble-2.2.29.ebuild
+++ b/sys-apps/calculate-assemble/calculate-assemble-2.2.29.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="The utilities for assembling tasks of Calculate Linux"
 HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="~sys-apps/calculate-builder-2.2.29"
 
diff --git a/sys-apps/calculate-builder/Manifest b/sys-apps/calculate-builder/Manifest
index 9df0983c9..673c2d9e0 100644
--- a/sys-apps/calculate-builder/Manifest
+++ b/sys-apps/calculate-builder/Manifest
@@ -10,7 +10,7 @@ DIST calculate-builder-2.2.29.tar.bz2 29488 RMD160 eacfc31ac01a0ab627e6a746cb748
 EBUILD calculate-builder-2.2.28-r5.ebuild 921 RMD160 c63428fc034746e57ed891670c62faee2f78e0e8 SHA1 51eca69b1c27af530fbc5671cd70bcfcb3bae8fe SHA256 fe80e5d7eb41afeea2a595163d1dcc36e0b1bf5e96c00a00a37b00a8081869a6
 EBUILD calculate-builder-2.2.28-r6.ebuild 921 RMD160 c63428fc034746e57ed891670c62faee2f78e0e8 SHA1 51eca69b1c27af530fbc5671cd70bcfcb3bae8fe SHA256 fe80e5d7eb41afeea2a595163d1dcc36e0b1bf5e96c00a00a37b00a8081869a6
 EBUILD calculate-builder-2.2.28-r7.ebuild 1029 RMD160 2255cadc02463f1f8322a61dff90c371e9808723 SHA1 4b5ca153b3607b3bfdd4d49cea98b760b76b7ea1 SHA256 1e0a06bc84eab51acd01d3b634c7287b55ec0c3fd4950c73eb701a48a047cdda
-EBUILD calculate-builder-2.2.29.ebuild 585 RMD160 3a8be336abe8787b11123b2a77c617447b95c425 SHA1 fac4aa5f378a73d30b0b6fcc910ec4f732628d5d SHA256 4525520662dd99a7f722722c54af76b802807c76a71afe098ac627f3c5ae3a07
+EBUILD calculate-builder-2.2.29.ebuild 583 RMD160 8ac6d979791e4ebd088a71c2b7025314cf25be03 SHA1 3b5333f5062cba8c092e1e660cf3fd08838f32a0 SHA256 b66c2ae958f192f5647e3baa3df30631ade6effa844609301766b331684e52f3
 EBUILD calculate-builder-2.2.9999.ebuild 571 RMD160 9342f8bb6fee2525ea214551f177a21170c8f320 SHA1 640d9424326321e45c59241384d3bdec58ff0a22 SHA256 829ecb63e72f27ae5f1cab9a22b3fad06addd81e7cf0f73fb99926dfe1d52102
 MISC ChangeLog 20510 RMD160 1cfd3c3b39ed7df3e4ee34e2f39e07b38df4b701 SHA1 25f1f611fba53e73feec22c8e30f055a96bd6d92 SHA256 ae74d167577bbf08b25525958cc9a1d74ae53c4dce6dcfbdef9ddf571dbb1c56
 MISC metadata.xml 270 RMD160 b5ff308a82cd6e594c2f04731cdbe9f80a945042 SHA1 58dbf7eb15bb2e6c6c8514f483e51dfacd1c62e9 SHA256 b65e150429ecbf36cf03d094f4e3e7518f536c61289cecff6b817326703d58a0
diff --git a/sys-apps/calculate-builder/calculate-builder-2.2.29.ebuild b/sys-apps/calculate-builder/calculate-builder-2.2.29.ebuild
index 935a010da..62a8e610a 100644
--- a/sys-apps/calculate-builder/calculate-builder-2.2.29.ebuild
+++ b/sys-apps/calculate-builder/calculate-builder-2.2.29.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="The utilities for builder tasks of Calculate Linux"
 HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND=">=sys-kernel/calckernel-3.4.18
 	!<sys-apps/calculate-install-3
diff --git a/sys-apps/calculate-client/Manifest b/sys-apps/calculate-client/Manifest
index 50e9640fd..88820d8ee 100644
--- a/sys-apps/calculate-client/Manifest
+++ b/sys-apps/calculate-client/Manifest
@@ -4,7 +4,7 @@ DIST calculate-client-2.2.28.tar.bz2 32312 RMD160 1cec1eaeecabbf9e59ba3b1492c480
 DIST calculate-client-2.2.29.tar.bz2 32545 RMD160 f71641f10b9e0f1627ec2883298d396fab683951 SHA1 20486eec667c6ebcb84d7c1a8b4e8c8a8f6d78e5 SHA256 fd5a7155bb2ab84ca6d50ccfb66df0bea73c78cad6d7527e8824f5b14636acde
 EBUILD calculate-client-2.2.28-r1.ebuild 1039 RMD160 5565bd50e12982eb2d998ed4d451e38d8c8c7832 SHA1 2272c83d3603cd61e956884e1a443551dacdcabb SHA256 9daa9233860a0bf2dfc6c4d90fc15760564944cec6bb9ce68de086572e582e44
 EBUILD calculate-client-2.2.28-r2.ebuild 1119 RMD160 4adbdfe39e75159a6b48e6bd762d1c1ee6386ba3 SHA1 62248d8146d1a60557bdc05de2c5f6834e42801d SHA256 626328008480b1c4af97c65a54da3d1425d0ebdfb10a04bcfe6e994b61997261
-EBUILD calculate-client-2.2.29.ebuild 874 RMD160 4c2f209427646e270a7ad468ab029e58c4de7655 SHA1 abc1bb5152bd5288f19e28b85bde5af70511f40d SHA256 43fa309a6370c3c2d7284d5e712e59a92ed738f13264c8f6dd18f2676c67a89c
+EBUILD calculate-client-2.2.29.ebuild 872 RMD160 fc0ae22d63f5d26a06a83a92d656b7096ca80250 SHA1 040683b4574f8fee58d0d217e5b983ce97e53e64 SHA256 4f15ce7ed6a89e110e62b37eab97ad2893c77ebfd7a9b4b832589cada2be8cd3
 EBUILD calculate-client-2.2.9999.ebuild 806 RMD160 686b9579327320e9e3c9cec36388a5dfedb9aca2 SHA1 f7335176cc3b91aac9255b43e5498fdb8c05a997 SHA256 55f34c6ab89b9f85fe969de4901e0f6c93ab9219d53e8c54eedfeecf49755bbb
 MISC ChangeLog 21838 RMD160 18264c4e6c5bffe2d08e9a656e369c8d0578f3e1 SHA1 c2e4ddcab55bef7605dd5551d1205d1062fe1a33 SHA256 da16b78c8b49f3dc5b127975190881a3a6f9f52b67e56fd84fb5f7a32416d807
 MISC metadata.xml 310 RMD160 ed986dbc43c958bd57e0fb73749ee09167ee0221 SHA1 4007f716df1aa85ec65d926f246663effc382384 SHA256 5023605d36dcbb5d5fe1b1ac54f7125a4087479b5168601075a8050ed51c38c2
diff --git a/sys-apps/calculate-client/calculate-client-2.2.29.ebuild b/sys-apps/calculate-client/calculate-client-2.2.29.ebuild
index 7d11ca919..35b0fbf1c 100644
--- a/sys-apps/calculate-client/calculate-client-2.2.29.ebuild
+++ b/sys-apps/calculate-client/calculate-client-2.2.29.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="The program of setting and storing the user account in the domain"
 HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="kde xfce gnome"
 
 DEPEND="~sys-apps/calculate-desktop-2.2.29
diff --git a/sys-apps/calculate-console-gui/Manifest b/sys-apps/calculate-console-gui/Manifest
index f3b16d1c7..c16828b7f 100644
--- a/sys-apps/calculate-console-gui/Manifest
+++ b/sys-apps/calculate-console-gui/Manifest
@@ -4,11 +4,13 @@ AUX calculate-console-gui-3.0.0_alpha6-r2.patch 107438 RMD160 86a1c744b5ae152f69
 AUX calculate-console-gui-3.0.0_alpha6-r3.patch 136437 RMD160 829a4c5e1828267135ccceef51b4814617ba1cb6 SHA1 38532845a2c7b2a811181a8012733936002ed158 SHA256 8be4c7a17f699a14d1c6e3fa2b3fdd6be0ffe4142f99a067b7f67dd00f54db65
 DIST calculate-console-gui-3.0.0_alpha5.tar.bz2 212156 RMD160 2993075e7dd50e2b60cfcb28a3d5d640b747b1f7 SHA1 1514ebd06092a6a4dfe441329d6da5845ff148b9 SHA256 13b123f747c7de38af79b618648f907eb7ac801546697b1a7abdc2983ed83132
 DIST calculate-console-gui-3.0.0_alpha6.tar.bz2 212653 RMD160 e40198d95cc8bf00b2b857b102b3ab8588205832 SHA1 8291958c2b818f45cc47435ee9e2b38de8f16044 SHA256 610116a6219dd163da2b5a710173d2884cdf20b2cceef7e499bf9ff898e491f2
+DIST calculate-console-gui-3.0.0_beta1.tar.bz2 187966 RMD160 cbf1514441d09ff2dc819f54b85eb38a0a1191a4 SHA1 ac0c8a52ab355fc0a72a3886ed53922ae6923d46 SHA256 a2684c3f896fdf2582a7eb3a09b7bd15d395cb9e1f1074964c71a7533a84f734
 EBUILD calculate-console-gui-3.0.0_alpha5-r2.ebuild 545 RMD160 01239bfe650b583dfe18375827fdef0b90fa662d SHA1 55357b377969159281c4cf1a7d0367918f2f8fef SHA256 c520503f626bb893612b1edb443a8d4eb7117c1ce5f25f01faf2e7fca7a01599
 EBUILD calculate-console-gui-3.0.0_alpha6-r1.ebuild 671 RMD160 d905ef8f556ab7a13e2ce23188953f5df79edf5f SHA1 f6ef1429134dde9ef953bca241641feefc65c137 SHA256 091cdc95e0ec60aaaecaf9ceee08ff6e38a649c5dfb9c5dc058cc999b1ab1139
 EBUILD calculate-console-gui-3.0.0_alpha6-r2.ebuild 671 RMD160 7a1c42d149c5e1666caf4a950bfbb3ff7d7310d9 SHA1 9f0dc1a57f459e73cc39a813f2a84484882a6fbb SHA256 e9415a616b1571697d9e5be64a76246ae3706bc8ce55828d107b08190a7a36ae
 EBUILD calculate-console-gui-3.0.0_alpha6-r3.ebuild 671 RMD160 13acf75810212b05d8f352c88d9e0e2588826ea9 SHA1 0641a95a77e0730292372fc45b9267f4c288b5b4 SHA256 bc71c0725705410cc7c7962f19fc818cf0631827ec5243bea088f0f1af8a3410
 EBUILD calculate-console-gui-3.0.0_alpha6.ebuild 545 RMD160 890294e6b5291bbd7cf166907655a3b585e191e2 SHA1 36e813e7d70697882ae55588b19922a0b4f90a07 SHA256 43643a88a4ce398625dc8934b0fcb8f318201962bba012639bc9e26ad43a6a58
+EBUILD calculate-console-gui-3.0.0_beta1.ebuild 544 RMD160 cf726ce0cfba1cdf174a1f044eae2173cacd209a SHA1 34e12f6cb782a741dfea63645d0ea05e8563bde1 SHA256 80f4600f3a55f1580dbcf3aaf1d4ce458509eeb36974b7e3cfe3ba5f933ed453
 EBUILD calculate-console-gui-3.0.9999.ebuild 504 RMD160 c830b9d85ec9917ae0533f09a401db484a1a14a7 SHA1 f559b89ee58d242b2400b013d92ae14470608fab SHA256 a4f8c400a6d15177eadf8dbcb935ab71649f51f7bf330dbcdc61623c0b771dcf
 MISC ChangeLog 311 RMD160 ee86e9703aa7edc9237fcfbf6d4785db8b2b02b7 SHA1 daaa733b1284e8ff962463004e4522a8fd52606b SHA256 7114941c15999cc77b940a169c8cc780476f301625ff6444f6adab83d6e9edcc
 MISC metadata.xml 267 RMD160 992d28a2f303a85ae830458db818cc7985c1f1bf SHA1 5504ab87ac7681ab6c471bb87601da726a3cb48d SHA256 1e7bf8508278ccc123ad22917ec9d37323e7e89ac15c52a56aeb6a144070a66f
diff --git a/sys-apps/calculate-console-gui/calculate-console-gui-3.0.0_beta1.ebuild b/sys-apps/calculate-console-gui/calculate-console-gui-3.0.0_beta1.ebuild
new file mode 100644
index 000000000..0d6026b54
--- /dev/null
+++ b/sys-apps/calculate-console-gui/calculate-console-gui-3.0.0_beta1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="3"
+
+inherit distutils eutils
+
+SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate3/${PN}/${P}.tar.bz2"
+
+DESCRIPTION="Qt gui console client for WSDL Calculate 3"
+HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
+LICENSE="Apache-2.0"
+SLOT="3"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="~sys-apps/calculate-core-3.0.0_beta1
+	dev-python/dbus-python
+	dev-python/imaging
+	dev-python/pyside[script]"
+RDEPEND="${DEPEND}"
diff --git a/sys-apps/calculate-console/Manifest b/sys-apps/calculate-console/Manifest
index a509e1700..0167e2ea5 100644
--- a/sys-apps/calculate-console/Manifest
+++ b/sys-apps/calculate-console/Manifest
@@ -2,10 +2,12 @@ AUX calculate-console-3.0.0_alpha6-r1.patch 65838 RMD160 e38531eb9ed3164dd3921dc
 AUX calculate-console-3.0.0_alpha6-r2.patch 76672 RMD160 2f3000ee4c40ae553b50a2686699de4a3e0e9942 SHA1 241359e1205544198fcec2bd32162ed6d049b876 SHA256 e40c88e917ec9cc9c9481b203b3955dfec4d1403d89ab73ef5ec57ac73df1e0f
 AUX calculate-console-3.0.0_alpha6-r3.patch 104104 RMD160 738b8d362fabaec2f084182008cd7f894c9106bc SHA1 e660de698253ebbcfa2480050f380ad340405f6b SHA256 68c949412880cd47135ce30b9b3e80cba30cc673e66a103a93e1b43707509dc8
 DIST calculate-console-3.0.0_alpha6.tar.bz2 30795 RMD160 5855a6bac2464cf4e21414ec73bfba9c32c06fd1 SHA1 4b8ee669c656bb837d0cb029f6f314e9fb04c067 SHA256 88c30137f9d85ad7888b9f72ef6e06d343b5d42d36d9e34510ae77917a9e89d7
+DIST calculate-console-3.0.0_beta1.tar.bz2 30770 RMD160 5179ec7a7187086d4c4483ac4b29c9ef7ea91037 SHA1 14278cd10873bb96abe7c53898b8bbfd76f7c5c6 SHA256 b3fc6fcfa1cd9cae92a51e6a4dc23e314a610be29e8361d5d870d3ac53ced6c6
 EBUILD calculate-console-3.0.0_alpha6-r1.ebuild 591 RMD160 d3bbee223102478767f34451d84e8510aceae894 SHA1 0b5ab7fadda577b20a271d2c2fbb697a00613f5d SHA256 f0638e6dc40d7372ce9a9143e7a624786cb30b99d9a5c0fcb8aeb685f6247f1c
 EBUILD calculate-console-3.0.0_alpha6-r2.ebuild 591 RMD160 79eb3ee845c0c78dfed339a9aae9a45d559809f4 SHA1 13c49c851d0263ca05eb19bae45c153f794900cf SHA256 ea29bca43651018a9e0035084157d2906ff03ad3a108edf1ee3a97908d24d80d
 EBUILD calculate-console-3.0.0_alpha6-r3.ebuild 591 RMD160 77a82209a0e061b1a764108777afa61a4ed54cec SHA1 f47204bb2c3430e5a8356c974a85e69b7839107b SHA256 aaa65c250fe56097e64261cc700f315b48139682089c3ea2519fd93f3d0f09e1
 EBUILD calculate-console-3.0.0_alpha6.ebuild 467 RMD160 655fd2ac5bf7dc06d0d10b03734cd897b4b0d3a7 SHA1 9b51df8b9f5c67228c2b52c86165971e22fb7dc2 SHA256 6bbffb71a5f17e4b6718ec72711d8404cf95d17c94001f7f21bbb9eb79df6134
+EBUILD calculate-console-3.0.0_beta1.ebuild 466 RMD160 c30867ff89aee431ba556598d5083a200754884b SHA1 6bfeaaf1f8d0a800b04eae72c13d6c6bcc2c09d3 SHA256 594f179bc7067b735ea0e297f5a59b04bc0f496eae3b44fb85fe830cb3a1b2aa
 EBUILD calculate-console-3.0.9999.ebuild 500 RMD160 2cf48b4a07375d5740bc61ef28271a05e844daf0 SHA1 e1fcf35e98b51c758c10aa98e0b83d99517d462c SHA256 8554b9ce61b890c24cf2b51913df7eb738a7ef1bdf4dbb9a7d539ab72dc3511c
 MISC ChangeLog 311 RMD160 ee86e9703aa7edc9237fcfbf6d4785db8b2b02b7 SHA1 daaa733b1284e8ff962463004e4522a8fd52606b SHA256 7114941c15999cc77b940a169c8cc780476f301625ff6444f6adab83d6e9edcc
 MISC metadata.xml 267 RMD160 992d28a2f303a85ae830458db818cc7985c1f1bf SHA1 5504ab87ac7681ab6c471bb87601da726a3cb48d SHA256 1e7bf8508278ccc123ad22917ec9d37323e7e89ac15c52a56aeb6a144070a66f
diff --git a/sys-apps/calculate-console/calculate-console-3.0.0_beta1.ebuild b/sys-apps/calculate-console/calculate-console-3.0.0_beta1.ebuild
new file mode 100644
index 000000000..42faf2859
--- /dev/null
+++ b/sys-apps/calculate-console/calculate-console-3.0.0_beta1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="3"
+
+inherit distutils eutils
+
+SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate3/${PN}/${P}.tar.bz2"
+
+DESCRIPTION="Console client for WSDL Calculate 3"
+HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
+LICENSE="Apache-2.0"
+SLOT="3"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="~sys-apps/calculate-core-3.0.0_beta1"
+RDEPEND="${DEPEND}"
diff --git a/sys-apps/calculate-core/Manifest b/sys-apps/calculate-core/Manifest
index 980edfe51..02c1211f4 100644
--- a/sys-apps/calculate-core/Manifest
+++ b/sys-apps/calculate-core/Manifest
@@ -6,6 +6,7 @@ AUX calculate-core-3.0.0_alpha6-r3.patch 37055 RMD160 a8d5ebfd360dbc2b9b5ac066f0
 AUX calculate-core-3.0.0_alpha6-r4.patch 90149 RMD160 a171cc34e5b30b4d6326cf134912ce5fcde625d9 SHA1 9b8d284bc318dc42ec009f40b45aa2f6e698a11a SHA256 379b35670aede97c5dee47647130872e76f8825c5357f9511318f655d547d83f
 DIST calculate-core-3.0.0_alpha5.tar.bz2 73303 RMD160 829ac5e43cef750a1ee1d9a264c265c18ac1bfe1 SHA1 f9f859cf376289264a8fd145ced37ae0073d3254 SHA256 11c5089cec30de3d0edbcf5c42eecae7b15e66299c445c003ab6eb791763083c
 DIST calculate-core-3.0.0_alpha6.tar.bz2 73081 RMD160 38b34fdff965f94e96fd031a7cb07f9139cf1823 SHA1 a63e4c092df70c6016acc74daa3dc71ee53ed6a8 SHA256 ce6d2ef0f946c945f1eee574283c8eb70abe6d474858c197979943d86be1044a
+DIST calculate-core-3.0.0_beta1.tar.bz2 79373 RMD160 2012f4616bf0fbc1984edbff9a8bfaceac032d81 SHA1 d03942aa8bd78d62679b82e69ac5a2130d894061 SHA256 56a22355b966dd576b66386d5f2b54ca3d909d0de33de85ad94f3d7d46c07708
 EBUILD calculate-core-3.0.0_alpha5.ebuild 882 RMD160 e327c361750f4aa73ac02c33cbaf8aad71b5f328 SHA1 e19e165e42b4dc71a36c5920ca095007dbdcc306 SHA256 8c8328b0f84c90a04ea09bfed7d95801925188a4aa400ead7af30f0a15c2c03c
 EBUILD calculate-core-3.0.0_alpha6-r1.ebuild 900 RMD160 5703dae36aa4931dd179102775fd8c57011e5a57 SHA1 1a5f8f5da54fa5932a5ce70e2b1ec78d4c5cb65b SHA256 7a7e981ee0edc034cc3a1335ed1101e62ede9ff21cfbb1b5eaafeaf5318c020c
 EBUILD calculate-core-3.0.0_alpha6-r2.ebuild 1037 RMD160 5a0fa618e92a0441ca1ba6e890e056310ceedb2e SHA1 015cd87c7394f64ba3bd53e8c05988390cc37e6a SHA256 45a3658c9442ef831bb763b13e53f75e4b5460246371b9a1c846dc635f71783f
@@ -13,6 +14,7 @@ EBUILD calculate-core-3.0.0_alpha6-r3.ebuild 1048 RMD160 6ad61016206b1934fc0db12
 EBUILD calculate-core-3.0.0_alpha6-r4.ebuild 1048 RMD160 3887b11ea457b5a404b4bcee545af39a69b1b586 SHA1 f56fefed460b635b7640c2e5e76e276161ecc4b9 SHA256 3322a314c225568abd1287461d7599df0d37c2ed7215faa36130562ce937caa4
 EBUILD calculate-core-3.0.0_alpha6-r5.ebuild 1135 RMD160 a533fb090f34563b847b94857e67d46ddf5bc24d SHA1 157682f8172a8a47e311e9c5caf719074811aa93 SHA256 62e3ad600e8f3371988829ca613d227e7a1c7482424bdaa931793fcc27875da6
 EBUILD calculate-core-3.0.0_alpha6.ebuild 900 RMD160 5703dae36aa4931dd179102775fd8c57011e5a57 SHA1 1a5f8f5da54fa5932a5ce70e2b1ec78d4c5cb65b SHA256 7a7e981ee0edc034cc3a1335ed1101e62ede9ff21cfbb1b5eaafeaf5318c020c
+EBUILD calculate-core-3.0.0_beta1.ebuild 899 RMD160 d6aabbf12893122556fdd095b285c5d2446c4f25 SHA1 7b7f2e718892549dc4f41796e3e217aa7782e3f9 SHA256 e1de46611f5566c6c545ef1146244d00e517bb5f65d6a962e2a488a48093f221
 EBUILD calculate-core-3.0.9999.ebuild 580 RMD160 e83a97ea90ff241c21111577d19b2f9d3969c17e SHA1 b431af0a8c098981cab841316e3f6d20595813b1 SHA256 e6f999684875c1d3a4eaaf75daba19d033c8fb32f36a4dd6b8e9682c3b757faa
 MISC ChangeLog 236 RMD160 edd02c5e4f0dac5e1383d48ba8142028b51bf534 SHA1 d22f18b34bdae22559bff15a113059d37820dfc7 SHA256 bbb9db87f501c1aa363583f5ae01e095020c3f600af2eb6388dbb547f6ce67b5
 MISC metadata.xml 285 RMD160 5b0ac863c35f37287feb338cfd8df84c288415ae SHA1 6618f52e6754a1e37dcd3ad32ae0e2c5d0fb9205 SHA256 821f48d3fa5fac7f73ca371b49cfc11485a7ef44cc856817e41cb1665d89b0c5
diff --git a/sys-apps/calculate-core/calculate-core-3.0.0_beta1.ebuild b/sys-apps/calculate-core/calculate-core-3.0.0_beta1.ebuild
new file mode 100644
index 000000000..e4ff40258
--- /dev/null
+++ b/sys-apps/calculate-core/calculate-core-3.0.0_beta1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="3"
+
+inherit distutils eutils
+
+SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate3/${PN}/${P}.tar.bz2"
+
+DESCRIPTION="The WSDL core for Calculate 3"
+HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
+LICENSE="Apache-2.0"
+SLOT="3"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="~sys-apps/calculate-lib-3.0.0_beta1
+	>=dev-python/soaplib-1.0
+	dev-python/sudsds
+	net-libs/dslib
+	dev-python/pyopenssl
+	dev-libs/openssl
+	dev-python/m2crypto
+	dev-python/cherrypy"
+RDEPEND="${DEPEND}"
+
+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 42cff7002..f0a0ec64a 100644
--- a/sys-apps/calculate-desktop/Manifest
+++ b/sys-apps/calculate-desktop/Manifest
@@ -7,7 +7,7 @@ EBUILD calculate-desktop-2.2.28-r2.ebuild 1001 RMD160 0f9d4c7e1c233ce2478bf36e06
 EBUILD calculate-desktop-2.2.28-r3.ebuild 1080 RMD160 6597977c3bee1629be330fc997f9bd68a1cbd8e3 SHA1 23ee6117b9a49791565da244a85acde60c6c484c SHA256 1505b8e8f822ab3e06dce2de5ec07d228f57b40973eb2ed84b1fba31f0faf986
 EBUILD calculate-desktop-2.2.28-r4.ebuild 1148 RMD160 4e5564f7255d5b33a30a611c00794b31534fe75e SHA1 8541fcc9dd9e3e43d5193275333e30cb4bb48ca4 SHA256 f9eb57a7db2c72df4d548842ce767abac56e012422ce3ef91b74564482a9ddce
 EBUILD calculate-desktop-2.2.28.ebuild 869 RMD160 b6086ca18273124c8abf947fdb1d5627d8b1068e SHA1 5a9101082a652a7acae70581265b6cf3098309e6 SHA256 70e309108d888a02f9416e96036dac75f6463a0377e4d5680a21cfeff34af322
-EBUILD calculate-desktop-2.2.29.ebuild 871 RMD160 29cbcb790edbaab33f9a9a211c377c2577bf03e3 SHA1 3b465675fd6509b9b1432a01ac51b792e708326d SHA256 46033763acf4f30b5888b821aff780ef69700019f0569b88eec3bf7b7653ee3a
+EBUILD calculate-desktop-2.2.29.ebuild 869 RMD160 f097c3414926b5dcd2383494038687ef697c7966 SHA1 47af00cbe83e109d489a51e27ffbe6e4ce0b386c SHA256 b58ec7516caaebffb80fc21f785a2f09511a820dfc5586f6ad1fab1baed00a0a
 EBUILD calculate-desktop-2.2.9999.ebuild 903 RMD160 c95039fb364e3a6e1cf57db69699aa7f43f3b344 SHA1 92817530d8bce919b2008217daa565ab6398030e SHA256 fc3d6b3a573bfff6cc5998c5a6d638e71c52102637433bf95511edade70a64ff
 MISC ChangeLog 16287 RMD160 4723d97ef823cbd6be7ca0db8d2e2c6ff0fb466d SHA1 c33d537cc07e7bcffcf1a3c4e6dd7a7c843604a4 SHA256 41637db72cf26ad196a316d9b443e8c048327ea924b4fb12fd77b0265feb66dc
 MISC metadata.xml 315 RMD160 36a1a8d03aed0a483def83e076f484a64d452a8b SHA1 f6e70641eab777d2417d8a7600e8d3f09f53f96f SHA256 67fea0b1af7d10c0f86e72ab40f527e99c6f81f7aace4716344bdfb97c769a18
diff --git a/sys-apps/calculate-desktop/calculate-desktop-2.2.29.ebuild b/sys-apps/calculate-desktop/calculate-desktop-2.2.29.ebuild
index c837eb7e1..44b0b0e4c 100644
--- a/sys-apps/calculate-desktop/calculate-desktop-2.2.29.ebuild
+++ b/sys-apps/calculate-desktop/calculate-desktop-2.2.29.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="The program of the desktop configuration Calculate Linux"
 HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="kde xfce gnome"
 
 DEPEND="~sys-apps/calculate-lib-2.2.29
diff --git a/sys-apps/calculate-i18n/Manifest b/sys-apps/calculate-i18n/Manifest
index 92e82a0d5..369ccd842 100644
--- a/sys-apps/calculate-i18n/Manifest
+++ b/sys-apps/calculate-i18n/Manifest
@@ -2,11 +2,13 @@ DIST calculate-i18n-2.2.28.tar.bz2 32694 RMD160 5009c0d07fe7b91fdf11fd17fa805beb
 DIST calculate-i18n-2.2.29.tar.bz2 33457 RMD160 b38ca13abc28a17e3a8e7e4cbeb41d06053cbb80 SHA1 cc393dea098617cb5d9b7544cec34175f7c5a394 SHA256 200b362bff00f90fae91fa86393e461a73ae607ef427a5990c85b54d842a65c9
 DIST calculate-i18n-3.0.0_alpha5.tar.bz2 36270 RMD160 fab1f37da37288b47d465e3e99811ebd7d37947f SHA1 9e440905bb44c10d29eeb3ce6110d5073d499b0c SHA256 c130c4948f5b7b7e9352de0cbcc72d63ce548ff5f450ac238245d87e904604d5
 DIST calculate-i18n-3.0.0_alpha6.tar.bz2 36265 RMD160 69037a434020cd002af91a96bd5ef9d7de6cc37f SHA1 85ad23ae3015b9e2e6b5d19490cbf8c09da46952 SHA256 948fb03e442213ca6d1efa1005247364c743a3ed77eba41e9a9fb045ab515c4e
+DIST calculate-i18n-3.0.0_beta1.tar.bz2 36703 RMD160 7bdf771478344463c44cfa9588455e8bc2cacb3e SHA1 d6973ccf52ab61654762c507191fde423fbf428b SHA256 92da0d7bf2a9b48737423bff9cb5dbcfe95ea55861981924eb01745920fedb5f
 EBUILD calculate-i18n-2.2.28.ebuild 682 RMD160 1555c253fcd4136044b79a4b8fec8135b9b16a0f SHA1 12fc45966b920e0e5f8d4a1952bbf6edf2d4fdf6 SHA256 7d53e3d7137c538e40166d03585aab44f918d9d0d18a21f8f66bef6862ace324
-EBUILD calculate-i18n-2.2.29.ebuild 684 RMD160 c147a74e2128bd2523da6c818a9068d8040d5340 SHA1 392a2564d6fe8806d67503a5d1911dd00768b7c7 SHA256 08efe6ca6cb680cd0541c5c9d4d12a4afd560e2ec6d9554071f0fdb6841152be
+EBUILD calculate-i18n-2.2.29.ebuild 682 RMD160 1555c253fcd4136044b79a4b8fec8135b9b16a0f SHA1 12fc45966b920e0e5f8d4a1952bbf6edf2d4fdf6 SHA256 7d53e3d7137c538e40166d03585aab44f918d9d0d18a21f8f66bef6862ace324
 EBUILD calculate-i18n-2.2.9999.ebuild 696 RMD160 007ea0a554c07b84b94599f0880cf0962a87a2a3 SHA1 c0d70603a39251f7f170d5bf8416d08ed0c0f66a SHA256 39985a22b3cc1a342ce42a96d90b9076b6f29dc7afe404fb379cc82ce6a56554
 EBUILD calculate-i18n-3.0.0_alpha5.ebuild 505 RMD160 5b7fa629656e70b2bd0eedfe81c606717c3a58ae SHA1 d667bbfcf73a9760ec836e56fdc8d3194fb65ac9 SHA256 3832a3b2bde6e1aa4897d1a1c66116fa9d0be8f6336c3afbe7d08ae6855b820e
 EBUILD calculate-i18n-3.0.0_alpha6.ebuild 505 RMD160 5b7fa629656e70b2bd0eedfe81c606717c3a58ae SHA1 d667bbfcf73a9760ec836e56fdc8d3194fb65ac9 SHA256 3832a3b2bde6e1aa4897d1a1c66116fa9d0be8f6336c3afbe7d08ae6855b820e
+EBUILD calculate-i18n-3.0.0_beta1.ebuild 504 RMD160 279d8e6e04ec7030ab7b78b3386199b1a95a51cd SHA1 15b8dc809c7a0b2bbe9a89826c0f59a20082c88a SHA256 f51b590f22e5e1ff0403cc8b1dc6c7f1dd18c0ca5497d4983222273465da0754
 EBUILD calculate-i18n-3.0.9999.ebuild 509 RMD160 6adb40d19ca007ea86d34ca187c1a696cb1970ee SHA1 05f86e6b1b6cf33701ca0bdc0ec390ad9af44951 SHA256 55fd4fde87b256127c8b6c59723883c4f86b36a747349fddb9253899b00e8b5e
 MISC ChangeLog 6171 RMD160 9803abc35a815c6bbf6ef23a3f9125f490dbc388 SHA1 c5e32c1c0f53761fbbf7d0e234fe5adcdb079eeb SHA256 250f8a9836f5a3bd98b6ed83196df7b7e2c1159f3079e628017c14bc44ef5963
 MISC metadata.xml 276 RMD160 d9730825fc3ad1b5ea7ba45704121ebd29e38b11 SHA1 c4c1576efbc38119efca43cfa273cb9f433f1de1 SHA256 a2312171d1cbfac41a263c0be692d3d12cfa3aab51979af64487824ae674bc2c
diff --git a/sys-apps/calculate-i18n/calculate-i18n-2.2.29.ebuild b/sys-apps/calculate-i18n/calculate-i18n-2.2.29.ebuild
index 849f6dbde..3b27e425f 100644
--- a/sys-apps/calculate-i18n/calculate-i18n-2.2.29.ebuild
+++ b/sys-apps/calculate-i18n/calculate-i18n-2.2.29.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="The utilities for assembling tasks of Calculate Linux"
 HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND=">=sys-apps/calculate-lib-2.2.19
 	!<sys-apps/calculate-install-2.2.19
diff --git a/sys-apps/calculate-i18n/calculate-i18n-3.0.0_beta1.ebuild b/sys-apps/calculate-i18n/calculate-i18n-3.0.0_beta1.ebuild
new file mode 100644
index 000000000..98273d7f3
--- /dev/null
+++ b/sys-apps/calculate-i18n/calculate-i18n-3.0.0_beta1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="3"
+
+inherit distutils eutils
+
+SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate3/${PN}/${P}.tar.bz2"
+
+DESCRIPTION="The utilities for assembling tasks of Calculate Linux"
+HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
+LICENSE="Apache-2.0"
+SLOT="3"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=sys-apps/calculate-lib-3.0.0_beta1"
+
+DEPEND="sys-devel/gettext
+	${DEPEND}"
diff --git a/sys-apps/calculate-install/Manifest b/sys-apps/calculate-install/Manifest
index 4895c2e53..a44c2f66a 100644
--- a/sys-apps/calculate-install/Manifest
+++ b/sys-apps/calculate-install/Manifest
@@ -4,10 +4,12 @@ AUX calculate-install-3.0.0_alpha4-r1.patch 807 RMD160 9544107f30291300d4e4ad5e8
 DIST calculate-install-2.2.28.tar.bz2 82743 RMD160 2cea1e7ad861522bd4036d09767b24d7135e1c9f SHA1 f897ab83dd567f6b4b6317791d615d02adb52c70 SHA256 19f858d831c069e820463543d6f89a17ee4c1c185079ecff4c301594ee41107f
 DIST calculate-install-3.0.0_alpha5.tar.bz2 74890 RMD160 f39e866350697c52c17d13ed1be7dff10a507aeb SHA1 1d63d4da43b67ddd9e03bc194ea55ece071c3cb8 SHA256 4287277093b66d0d0a6c94f825d067a61cff99bd625dea7acc92110738c2bd08
 DIST calculate-install-3.0.0_alpha6.tar.bz2 75019 RMD160 ce2729d11a61768dff072805a4a52a396cd9fc45 SHA1 3718cbfde0fbd092668a7165787ec9cf4cbcc8be SHA256 65bf6c6d4b28b203e09f925a55346f01c08e4eedbc8b9511d9ce35c61a21ce35
+DIST calculate-install-3.0.0_beta1.tar.bz2 84450 RMD160 ff9a09dc37dba0a6049ff14d4c8d5f9aa50fd622 SHA1 2cd910c45ed5e19edf9e83ce3f4fdf543a694518 SHA256 3226d9519d9f9d0a7c10f6d36248be9a6571fed0c2db04f37cf666331fde18bb
 EBUILD calculate-install-2.2.28-r1.ebuild 1035 RMD160 bcd7a3079196f6e3be618751c174d1ba052916fe SHA1 d4f528a17d77d41fa1917fbe6b50c6d9d00dcb4e SHA256 3d07209efbcf675dcfd3d9ac9b872541ead76b926093a1744dc2d002a290a4f5
 EBUILD calculate-install-2.2.9999.ebuild 611 RMD160 f90528448a4ab5c0c7ca0bfeb48bf301e303e9e0 SHA1 6273678653d87c58eeb3a0545804d7e8cf56e3bd SHA256 ab95c392853331769aabe6b26089f95238a1dd5a7d027c46483e5855d97d0c20
 EBUILD calculate-install-3.0.0_alpha5.ebuild 840 RMD160 7ebf80407f2f3ae9d33ee247530f4e7fe533044a SHA1 1651f3e2d9e89b67290aed2b9b4563f36470e840 SHA256 3c68d42a2485d530c9b462a5b787d4ad4cd6ea85aa8c02fe321e3308f0b616a2
 EBUILD calculate-install-3.0.0_alpha6.ebuild 840 RMD160 0b2c70f835cd1818be4cb37136d533e315d3010f SHA1 bdd274a26d80290b7c52234bb8ad265a30704fd7 SHA256 00e85481cb7ab34442fd61cdb64b31a649a067538eef6ba181d47971c59bf89c
+EBUILD calculate-install-3.0.0_beta1.ebuild 973 RMD160 5754828b321f8d50c9c79a68b33a9cfe7459e625 SHA1 e976f16491e4d81dc9bd50d913a1741667bad2aa SHA256 e1a70b41d3cfffd4edafd6e0572fa73d7b4bbf2b92270691f1d855da15c6a9df
 EBUILD calculate-install-3.0.9999.ebuild 609 RMD160 b1a02262dbab9319b6b916460646b526aa43a9a3 SHA1 0c64a92b658890fe5b4a5ee22f35eb143da377dc SHA256 d4cead60af00c67ddcb1aa01e2095437fb1bfe2ca7f717456048ad3e8f039a23
 MISC ChangeLog 33827 RMD160 6a48dba3484eeb1bf153dc1724e3ba441b51f89f SHA1 c42362523ac8b49b8ceb521110ba6b4d4ff01c74 SHA256 f31d9cca1055a4fbf38352f01ba9f72bf82597ff1a6436d211ac26d1acddb082
 MISC metadata.xml 464 RMD160 1ebcc1f5a20b212edaa992f8c1f3c133a5b8e401 SHA1 03860b35c3c2f7644ffb7669b4c8925c324410f5 SHA256 0e3ea52c58e77580b778f7efb9f476811c168febe02e656961c71a455e4f4d7d
diff --git a/sys-apps/calculate-install/calculate-install-3.0.0_beta1.ebuild b/sys-apps/calculate-install/calculate-install-3.0.0_beta1.ebuild
new file mode 100644
index 000000000..516ab3521
--- /dev/null
+++ b/sys-apps/calculate-install/calculate-install-3.0.0_beta1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="3"
+
+inherit distutils eutils
+
+SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate3/${PN}/${P}.tar.bz2"
+
+DESCRIPTION="The program of installation Calculate Linux"
+HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
+LICENSE="Apache-2.0"
+SLOT="3"
+KEYWORDS="~amd64 ~x86"
+IUSE="minimal"
+
+DEPEND="~sys-apps/calculate-lib-3.0.0_beta1
+	app-portage/layman
+	!app-misc/livecd-tools
+	!<sys-apps/calculate-install-3.0.0_alpha1
+	sys-apps/iproute2[-minimal]
+	!minimal? ( sys-boot/grub
+	sys-apps/gptfdisk
+	>=sys-apps/util-linux-2.19.1
+	sys-fs/dosfstools
+	sys-fs/squashfs-tools
+	sys-block/parted )
+	pxe? ( sys-apps/calculate-server
+	net-ftp/tftp-hpa
+	net-misc/dhcp
+	net-fs/nfs-utils )"
+
+RDEPEND="${DEPEND}"
+
+pkg_postinst() {
+	einfo "For install wsdl for calculate-install perform:"
+	einfo "  cl-core --write-variable cl_wsdl=calculate-install"
+}
diff --git a/sys-apps/calculate-lib/Manifest b/sys-apps/calculate-lib/Manifest
index 9386a69a4..5787379b2 100644
--- a/sys-apps/calculate-lib/Manifest
+++ b/sys-apps/calculate-lib/Manifest
@@ -16,15 +16,17 @@ DIST calculate-lib-2.2.28.tar.bz2 110324 RMD160 e008b3524d61c0552d994da244a4c46c
 DIST calculate-lib-2.2.29.tar.bz2 120378 RMD160 9161d6e72cd510c8d2e3d072a6ae4d77595b8335 SHA1 74edeff26d24a91ed0c93bf78dda0f02b5c67d47 SHA256 fc79bf29059ffb1519b6356cba34ebecb2e8c3222a29735f479254c371d363a3
 DIST calculate-lib-3.0.0_alpha5.tar.bz2 114370 RMD160 823b0e8205feb3cccb5a160b9603bc61798f5b90 SHA1 722df1c65349323c37cedd3f9c56cba1b175a8c8 SHA256 f53c9e23be65cd9c951a02a8e0fd4bdcc78b23933cafb60c6bbff6b24149aa1e
 DIST calculate-lib-3.0.0_alpha6.tar.bz2 114165 RMD160 3a8bd6cf13a9360187c19d82a7c448abffd520fc SHA1 71a660cbf583f8e45f67bec278e08f7e88d119f5 SHA256 20629742008014b75b5a12f6c047259fef40d518765135a330f1059aadfba79c
+DIST calculate-lib-3.0.0_beta1.tar.bz2 115158 RMD160 afe8025bbefefe13cd656274e9f9643d36bcdda1 SHA1 8f5ff7291e3a3427852fba56659d62ccd704da74 SHA256 cf28f08975f301d5b433418d80261cada9eb4589aadd7aff1fff00e395156aec
 EBUILD calculate-lib-2.1.11-r2.ebuild 808 RMD160 8ff17c75b566a9182dcc73ad722b2409d798f59f SHA1 686ad0a1893efc8d3134f96a2f66f96ebed123e7 SHA256 e6d751948c434cae800ace9787ee2e194b34baa644aceb0426ea677bcb419d35
 EBUILD calculate-lib-2.1.9999.ebuild 481 RMD160 7a38a4d9bae891390473cf03d6bd559fe4eb0128 SHA1 1d7ff49c4dc52e6f5c01f08e9f1c78c22470740e SHA256 7115ae3b0e37f82195f2506151baa81179c5d08ae5071982ad2afd3e576b7fd9
 EBUILD calculate-lib-2.2.28-r10.ebuild 1737 RMD160 8ce0ab567c30131b9e589016acbfc03203030ca9 SHA1 0b74e7cba9ad4dfd3dcaa6607a6daa06dae9fd1e SHA256 bc2d48a9a11d46e31750da4aa59382dbe17f9ad40a43765347e392d0f8d996c0
 EBUILD calculate-lib-2.2.28-r8.ebuild 1541 RMD160 01c0de6a3b779af93663f2086614edf9e7062ad1 SHA1 ae2c7e58926a9ccebf41ffcbf97c34e23ce813b8 SHA256 f05ed411ecfa59e5a805aeb4ae0bc7ced22b6f35cb4b7c7cf0934989786f908c
 EBUILD calculate-lib-2.2.28-r9.ebuild 1617 RMD160 27edaa0591c67d706e94c2cfff11d486be724775 SHA1 23266328c58dce3502320fc48a255dafd92c5c67 SHA256 49b22eaab235902473a53d10dd77884d9853a273cc4a96782c484d6593d27cb0
-EBUILD calculate-lib-2.2.29.ebuild 719 RMD160 10c3ec8ba55650c1670aa71e48facd7129338702 SHA1 15e1ad082cf13f8e94138deeb3efee9e88e16873 SHA256 2feec49db60e2dc8861b90ac287a173cb07f76e7244f461e20bc451f5596c4f6
+EBUILD calculate-lib-2.2.29.ebuild 717 RMD160 7425301844bcc40dd9cd37609c4b0d8c291aac1a SHA1 d6ce37beb4ac5895c1e7c3f3f1622448110f3114 SHA256 5197f228339a5768387abc35e8d0bcf9e44c078d5d79aa046e04254c0621fb6e
 EBUILD calculate-lib-2.2.9999.ebuild 656 RMD160 85058ff3964a829330b506998b134bd0993e92e8 SHA1 6d6f0e7c00e2f467ee4a8fe0a587bfd45e488b79 SHA256 35451656788914b0890f8d5238f2cab70d858718eb43e38b162cd975eb89e8ca
 EBUILD calculate-lib-3.0.0_alpha5.ebuild 607 RMD160 36d16798f2933f778669f9de06eb7c84f55cc098 SHA1 1e5c88d1f7c87d62dabe4d3ba890ac759ac2467b SHA256 e43c1f47fcb1b4e19c2363511f89ee1b0f3197330c427a3603e9b6cd9e9023c6
 EBUILD calculate-lib-3.0.0_alpha6.ebuild 607 RMD160 36d16798f2933f778669f9de06eb7c84f55cc098 SHA1 1e5c88d1f7c87d62dabe4d3ba890ac759ac2467b SHA256 e43c1f47fcb1b4e19c2363511f89ee1b0f3197330c427a3603e9b6cd9e9023c6
+EBUILD calculate-lib-3.0.0_beta1.ebuild 607 RMD160 36d16798f2933f778669f9de06eb7c84f55cc098 SHA1 1e5c88d1f7c87d62dabe4d3ba890ac759ac2467b SHA256 e43c1f47fcb1b4e19c2363511f89ee1b0f3197330c427a3603e9b6cd9e9023c6
 EBUILD calculate-lib-3.0.9999.ebuild 634 RMD160 114268a839d17dfccdf12a6be3ab434de99b0fa5 SHA1 5d9330211622f89362bb47db285bb83018468cf9 SHA256 7197d2184d77097c1353ba2536d6590c1054feb188cf3c5f251e52be94bb25a3
 MISC ChangeLog 29678 RMD160 2cefd2921f069cb03c175abd7d6abd1491460495 SHA1 405b78557be75f355ca8a14782182868cb3bd52a SHA256 2d3176ee3c60fb474f938b05f6118e17b06f600a6a654def33754f15c32e78e2
 MISC metadata.xml 303 RMD160 774b65ed76939d6878496ad6ef6451849bdced05 SHA1 7d08569697a290ede98c88ab59db3cdc3037bd15 SHA256 181519d9679fd9aee9a7a9806733a50728d3da0b1e0ad54f31499200f7f5c6ec
diff --git a/sys-apps/calculate-lib/calculate-lib-2.2.29.ebuild b/sys-apps/calculate-lib/calculate-lib-2.2.29.ebuild
index 102315eef..9b4c27176 100644
--- a/sys-apps/calculate-lib/calculate-lib-2.2.29.ebuild
+++ b/sys-apps/calculate-lib/calculate-lib-2.2.29.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="The library for Calculate 2"
 HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
 LICENSE="Apache-2.0"
 SLOT="2.2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="minimal"
 DEPEND="!<sys-apps/calculate-lib-2.1.8-r1
 	!=sys-apps/calculate-lib-2.1.9
diff --git a/sys-apps/calculate-lib/calculate-lib-3.0.0_beta1.ebuild b/sys-apps/calculate-lib/calculate-lib-3.0.0_beta1.ebuild
new file mode 100644
index 000000000..30394ee60
--- /dev/null
+++ b/sys-apps/calculate-lib/calculate-lib-3.0.0_beta1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="3"
+
+inherit distutils eutils
+
+SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate3/${PN}/${P}.tar.bz2"
+
+DESCRIPTION="The library for Calculate 3"
+HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
+LICENSE="Apache-2.0"
+SLOT="3"
+KEYWORDS="~amd64 ~x86"
+IUSE="minimal"
+DEPEND="!minimal? ( dev-python/py-smbpasswd )
+	>=dev-python/pyxml-0.8
+	sys-apps/iproute2
+	sys-apps/pciutils
+	sys-fs/lvm2
+	sys-fs/mdadm
+	dev-python/pyinotify
+	sys-apps/file[python]"
+RDEPEND="${DEPEND}"
diff --git a/sys-apps/calculate-utilities/Manifest b/sys-apps/calculate-utilities/Manifest
index c330c3f2a..a1f5e8086 100644
--- a/sys-apps/calculate-utilities/Manifest
+++ b/sys-apps/calculate-utilities/Manifest
@@ -7,7 +7,7 @@ EBUILD calculate-utilities-2.2.28-r27.ebuild 872 RMD160 8d4e068fc5e0ec4ca29a8136
 EBUILD calculate-utilities-2.2.28-r28.ebuild 872 RMD160 88ae3fe02208b7f6423ab6c489de83bb3d834fd2 SHA1 9e22a5f809b255ec1a2bb4e7bd1e605576fa487a SHA256 13bff828c92dac03430added91b348bc3874903545a138ebf4ae7d14978977ff
 EBUILD calculate-utilities-2.2.28-r29.ebuild 872 RMD160 fdf1bec718847b255330625ce0528618e9b6ccdb SHA1 90c335b3e6490a581f388a76676ca04a7b2b17ea SHA256 bb2af4726d22b294117a5394e2e424ecb16f9f960c527a2fd23917fec23d0b48
 EBUILD calculate-utilities-2.2.28-r30.ebuild 873 RMD160 0e72023e82f3af9be5926dcedb644c295ba756dd SHA1 77c9d5746a8bbd14b5149d025bed278b2b2dc9c9 SHA256 71d524f6293cc785b2a0279911a7676ca674680af47fa63c03848c4111034cb3
-EBUILD calculate-utilities-2.2.29.ebuild 779 RMD160 4f0a3a8e63de7985b79c402f7ba62479059363bd SHA1 cf41c0d02400f6c73c1119a1d1171bf1955a42dc SHA256 82f9fc582b8345b9f5ae849cfcd6c8151228cbc1104809a6391d7051471a4e5e
+EBUILD calculate-utilities-2.2.29.ebuild 777 RMD160 6fdff08ca0f396df7d47de35a31da4b7a1e7e8a7 SHA1 c029e2a5e88a2eb625604d50d7a1fc5b07a3fd0a SHA256 d4df15af0c92421568962faba7b1dcd99e44062a7dfa1a591fa47a7daa29cc88
 EBUILD calculate-utilities-2.2.9999.ebuild 842 RMD160 f2c0fdc1068614b71a37f2226dcde4883ebd2876 SHA1 99f673a52934f552589baf6d12ed9bffc03b8ebd SHA256 56d97b7d2ce11d23b25d9036b4e2ee196b547ce1d11b0cc349a8205515b66bf1
 EBUILD calculate-utilities-3.0.0_alpha5-r2.ebuild 573 RMD160 117b236c49975a49fd927b37088825c3c587f321 SHA1 8924f08f266157eb749821f70a97cb3d5bf8d73c SHA256 710d755d8fce836946b51df95f19afaa7e1ab9fa4d29df852069b77530adfe52
 EBUILD calculate-utilities-3.0.0_alpha6-r1.ebuild 639 RMD160 ab9bb7cad4eece79d51abfc70a9003dae678a4d4 SHA1 c7766af150873b08cd38421ecb8b987d2b6fbbe8 SHA256 0ce4cd722f54f34b39516137e5bdf2f92adf77c0afb9342981cbe05e385171c5
@@ -17,5 +17,6 @@ EBUILD calculate-utilities-3.0.0_alpha6-r4.ebuild 648 RMD160 39d48d9288a7461771c
 EBUILD calculate-utilities-3.0.0_alpha6-r5.ebuild 648 RMD160 4ea6f59807a95945983d9b68ee697faaa5af2143 SHA1 6eec24e8dbbde66d1081fafd62f21a45af5ad574 SHA256 c1c54c8b5dc84b55171b3dc2426e9c4688bdae0111a153c1ae93c4e16eda4776
 EBUILD calculate-utilities-3.0.0_alpha6-r6.ebuild 648 RMD160 40dc5a4c99f380f6bd07cd587695350b0735017e SHA1 e01bd56175d47b3e737f4def2ab1669e1089463b SHA256 12ff8a4ee9e24625f24ea69642c5bf43a7682a0288b338b705a8d69c50d1a800
 EBUILD calculate-utilities-3.0.0_alpha6-r7.ebuild 648 RMD160 0173c4a77e486c5070ad764ff08ebd6007548eec SHA1 5e4175e300748f4125ef47611b4504c06eb9b6ea SHA256 8ca934c7c1d9f9e32d5b5d99d90bd29072a36b05dc8f3c3c102289bba4b35b12
+EBUILD calculate-utilities-3.0.0_beta1.ebuild 633 RMD160 5a9876581f4d7e9a252e076d962e2153bf8956a7 SHA1 b87c092edbff4f1c484ba93d10e6a06aea805a45 SHA256 5ebe88d7d4e895dfd9677c7ae0844c39144d205540ab7687da031a31ee2a8563
 EBUILD calculate-utilities-3.0.9999.ebuild 552 RMD160 8883a32b9bde58b14ccc054802fe8997e49bb537 SHA1 829fea2f453d2c54a9bb24e892abe26c9f48880a SHA256 d6519794625722093224801b703a0363929a034a1189b46a2c01cc2327138e59
 MISC ChangeLog 38731 RMD160 92b8fb3bfc525c90e82302095cf8ecd4fad03563 SHA1 a8e9f6b4012f5f09b8c37e6a90506df8e405d0db SHA256 7e70a0bc1f3b34c0011f3874773a698a4bb96eb6d3dad10903575156bb8578bc
diff --git a/sys-apps/calculate-utilities/calculate-utilities-2.2.29.ebuild b/sys-apps/calculate-utilities/calculate-utilities-2.2.29.ebuild
index 6db0ac883..d9be0f02f 100644
--- a/sys-apps/calculate-utilities/calculate-utilities-2.2.29.ebuild
+++ b/sys-apps/calculate-utilities/calculate-utilities-2.2.29.ebuild
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="
 cl_assemble
 cl_builder
diff --git a/sys-apps/calculate-utilities/calculate-utilities-3.0.0_beta1.ebuild b/sys-apps/calculate-utilities/calculate-utilities-3.0.0_beta1.ebuild
new file mode 100644
index 000000000..284d5f70e
--- /dev/null
+++ b/sys-apps/calculate-utilities/calculate-utilities-3.0.0_beta1.ebuild
@@ -0,0 +1,24 @@
+# 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_console"
+
+RDEPEND="${RDEPEND}
+	=sys-apps/calculate-install-3.0.0_beta1
+	=sys-apps/calculate-i18n-3.0.0_beta1
+	=sys-apps/calculate-lib-3.0.0_beta1
+	=sys-apps/calculate-core-3.0.0_beta1
+	cl_consolegui? ( =sys-apps/calculate-console-gui-3.0.0_beta1 )
+	cl_console? ( =sys-apps/calculate-console-3.0.0_beta1 )
+"
+