update utilities, fix NoneType Error

sys-apps/calculate-console-gui/Manifest

@@ -5,6 +5,7 @@ AUX calculate-console-gui-3.0.0_alpha6-r3.patch 136437 RMD160 829a4c5e1828267135
 AUX calculate-console-gui-3.0.0_beta3-r1.patch 4099 RMD160 9b20a4e3116c9ad2320f1bbcc36a55bebf94ed81 SHA1 f13416160fbdca789e39f293abea87bdffd4c63c SHA256 31901112ea90d08548d5fa72b446d009137254c8da79a009d1b6f33146a65d28
 AUX calculate-console-gui-3.0.0_beta3-r2.patch 33148 RMD160 fe589072f039f1d9c4485603ce744038b91cd50b SHA1 090cd306248a84114f1b6ce5f9cc2c3e6d6899e3 SHA256 5c3c9ea7a8ecccdce16f2d0b9b333f95bd6e864abaa20c8cae430bc4a9e9042e
 AUX calculate-console-gui-3.0.0_beta3-r3.patch 50209 RMD160 f497a2bfe892e23b7c31617d97adc12410bf0fb1 SHA1 25eca03dd5dee7903a977d2c147d442910f19551 SHA256 01e04e0b572f0f40925fb6299be13c874834dc7b202b817fd4c803e89749e4ba
+AUX calculate-console-gui-3.0.0_beta3-r4.patch 54118 RMD160 d04d5953f754c8d9337bc58cc3467011b9a0aadd SHA1 495f33bbf3504621aed7f82f0bfcef5e34eafd3c SHA256 6090780dd9ef46ac6837828e278902dbcc83d3d91b172356c65101b4de81a024
 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 246480 RMD160 73ec6b1610bce29489b1605bd282f1461f4ecf90 SHA1 30832878fc1cc8267f51644b45b066f3bac28ade SHA256 6d9648ea526fe4c6c9010c36a599a7e324057f347612802569740c59eb253c0e
@@ -20,6 +21,7 @@ EBUILD calculate-console-gui-3.0.0_beta2.ebuild 544 RMD160 cb72557e2f0255c439557
 EBUILD calculate-console-gui-3.0.0_beta3-r1.ebuild 670 RMD160 e7f79feb52bf1003ab603dfcbc95e799c6644d10 SHA1 3af0c3d2c7036651f8da141ecd965a01c04bfbdc SHA256 7e5fb20e00c0f3a5f9a624cf7f7de16ce225f0ced838e22db7c01f2c4dd43297
 EBUILD calculate-console-gui-3.0.0_beta3-r2.ebuild 670 RMD160 685d33b798fe60b7ec883021d21f96a945290e71 SHA1 e068d3d09c340bcca3954e0d61061a835f518fed SHA256 41ed2b84700f7db55ca17cdeab625536d1e1b8311a6023cab0e5a9f5bbb2583a
 EBUILD calculate-console-gui-3.0.0_beta3-r3.ebuild 670 RMD160 be4f9c7922798e5cfc8dc326fd9ef1a683e070a4 SHA1 59788ee55357b5ca3bfb03aff8d581b153aaf555 SHA256 449e1eb5a15118806c4897416754248bd7def74f940a1822c1f15302c86f5897
+EBUILD calculate-console-gui-3.0.0_beta3-r4.ebuild 670 RMD160 11f219fc9b097b4b829db180a80638e48d95422a SHA1 8faeeca5b2eb9889c58c41d07e67c4baca994b23 SHA256 acc805f84730ebc81fd7513561a7054d26ec2e20f7ae692149a8972ab2ad20f1
 EBUILD calculate-console-gui-3.0.0_beta3.ebuild 544 RMD160 af6580dc8173ec834150cc8b9b61ee34e499e3a8 SHA1 f9ba77cd40bad84a09ae134664b0d2d771a285c0 SHA256 9774194c9c743c98d10bb8b7937b7ff13c18cf4155713f7ec02c3d87d24a5927
 EBUILD calculate-console-gui-3.0.9999.ebuild 504 RMD160 c830b9d85ec9917ae0533f09a401db484a1a14a7 SHA1 f559b89ee58d242b2400b013d92ae14470608fab SHA256 a4f8c400a6d15177eadf8dbcb935ab71649f51f7bf330dbcdc61623c0b771dcf
 MISC ChangeLog 311 RMD160 ee86e9703aa7edc9237fcfbf6d4785db8b2b02b7 SHA1 daaa733b1284e8ff962463004e4522a8fd52606b SHA256 7114941c15999cc77b940a169c8cc780476f301625ff6444f6adab83d6e9edcc

sys-apps/calculate-console-gui/calculate-console-gui-3.0.0_beta3-r4.ebuild

@@ -0,0 +1,29 @@
+# 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_beta3
+	dev-python/dbus-python
+	dev-python/imaging
+	dev-python/pyside[script]"
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+	unpack "${A}"
+	cd "${S}"
+
+	# some bug fix
+	epatch "${FILESDIR}/calculate-console-gui-3.0.0_beta3-r4.patch"
+}

sys-apps/calculate-console-gui/files/calculate-console-gui-3.0.0_beta3-r4.patch

@@ -0,0 +1,986 @@
+diff --git consolegui/application/CertificateClass.py consolegui/application/CertificateClass.py
+index d5ba577..2175616 100755
+--- consolegui/application/CertificateClass.py
++++ consolegui/application/CertificateClass.py
+@@ -191,7 +191,10 @@ class CertClass (QtGui.QWidget):
+         fc = open(self.default_cert_path + 'req_id', 'w')
+         fc.write(res)
+         fc.close()
+-        show_msg ( _("Your request ID = %s") %res, parent = self)
++        show_msg (_("Your request ID: %s") %res + '\n' + \
++                  _("To sign the certificate in the server use command") + \
++                  '\n'+'cl-core --sign-client ID_CLIENT_REQUEST',
++                  title = _('Request'), parent=self)
+         return 0
+ 
+     def get(self):
+@@ -266,7 +269,10 @@ class CertClass (QtGui.QWidget):
+             return 1
+         elif cert == '2':
+             show_msg (_("The request has not been reviewed yet.") + '\n' + \
+-                                        _("Your request ID = %s") %req_id)
++                      _("Your request ID: %s") %req_id + '\n'+\
++                      _("To sign the certificate in the server use command")+\
++                      '\n'+'cl-core --sign-client ID_CLIENT_REQUEST',
++                      title = _('Request'), parent = self)
+             return 1
+         elif cert == '3':
+             show_msg (_('Either the request or the signature does not match '
+diff --git consolegui/application/ConnectionTabs.py consolegui/application/ConnectionTabs.py
+index 01b3e79..5c04451 100644
+--- consolegui/application/ConnectionTabs.py
++++ consolegui/application/ConnectionTabs.py
+@@ -6,6 +6,7 @@ import dbus.mainloop.glib
+ 
+ from PySide import QtGui, QtCore
+ import sudsds, time, sys
++import os, pwd, shutil
+ import ConfigParser
+ 
+ from TrayIcon import TrayIcon
+@@ -114,6 +115,10 @@ class SelectedMethodWgt(QtGui.QWidget):
+ #        event.ignore()
+         if close_event:
+             self.set_size()
++            save_path = os.path.join('/tmp', 'calculate-' + \
++                                     pwd.getpwuid(os.getuid()).pw_name)
++            if os.path.isdir(save_path):
++                shutil.rmtree(save_path)
+             event.accept()
+         else:
+             event.ignore()
+@@ -477,6 +482,10 @@ class ToolTabWidget(QtGui.QTabWidget):
+                 if not self.close_tab(0, True):
+                     return 1
+             self.set_size()
++            save_path = os.path.join('/tmp', 'calculate-' + \
++                                     pwd.getpwuid(os.getuid()).pw_name)
++            if os.path.isdir(save_path):
++                shutil.rmtree(save_path)
+             self.app.exit()
+ 
+     def get_size(self):
+diff --git consolegui/application/ControlButton.py consolegui/application/ControlButton.py
+index 63c3e8d..d929bc7 100644
+--- consolegui/application/ControlButton.py
++++ consolegui/application/ControlButton.py
+@@ -146,6 +146,18 @@ class ControlButtonWgt(QtGui.QWidget):
+             if hasattr (self, 'button_widget'):
+                 end_layout.addWidget(self.prev_button)
+ #            self.grid.addWidget(self.prev_button, x, y)
++        else:
++            self.prev_button = QtGui.QPushButton(self)
++            self.prev_button.setText(_('Cancel').decode('utf-8'))
++
++            self.prev_button.clicked.connect(self.button_disabled)
++            self.prev_button.clicked.connect(self.clear_method_cache)
++
++            self.prev_button.setMinimumWidth(62)
++            self.prev_button.setFixedHeight(32)
++            if hasattr (self, 'button_widget'):
++                end_layout.addWidget(self.prev_button)
++
+         if main_frame.view.groups.GroupField[-1].last and not \
+                                main_frame.isBrief(self.ClientObj.param_objects\
+                                [main_frame.method_name]['step']+1) or brief:
+@@ -251,6 +263,26 @@ class ControlButtonWgt(QtGui.QWidget):
+             self.hide()
+             self._parent.back()
+ 
++    def clear_method_cache(self):
++        self.button_disabled()
++        sid = int(self.ClientObj.sid)
++
++        if hasattr (self._parent.MainFrameWgt, 'method_name'):
++            method = self._parent.MainFrameWgt.method_name
++            try:
++                res = self.ClientObj.client.service.clear_method_cache \
++                                                            (sid, method)
++            except Exception as e:
++                _print (e)
++        from calculate.consolegui.application.ConnectionTabs \
++                                                    import SelectedMethodWgt
++        if type(self.window()) == SelectedMethodWgt:
++            self.window().close()
++        else:
++            self.del_button()
++            self.hide()
++            self._parent.back()
++
+     def button_disabled(self):
+         if hasattr(self, 'next_button'):
+             self.next_button.setDisabled(True)
+diff --git consolegui/application/MainFrameResult.py consolegui/application/MainFrameResult.py
+index e922fd4..10e0c37 100755
+--- consolegui/application/MainFrameResult.py
++++ consolegui/application/MainFrameResult.py
+@@ -392,7 +392,7 @@ class MainFrameRes(QtGui.QWidget):
+         if result in [0,2]:
+             return 0
+         elif result == -1:
+-            msg = _("Certificate not found in the server database!")
++            msg = _("Certificate not found in the server!")
+         elif result == -2:
+             msg = _("Session not matching your certificate!")
+         elif result == 1:
+diff --git consolegui/application/ShortFrameResult.py consolegui/application/ShortFrameResult.py
+index dbdf7c4..8086968 100644
+--- consolegui/application/ShortFrameResult.py
++++ consolegui/application/ShortFrameResult.py
+@@ -214,6 +214,11 @@ class ShortFrameRes(QtGui.QWidget):
+     def endFrame(self, item):
+         self.work_layout.hide_kill_button()
+         self.close_all_thread()
++
++        if hasattr (self, 'taskWidget'):
++            self.taskWidget.endCurrentTask()
++            if item.message:
++                self.taskWidget.setText(item.message)
+         self._parent.control_button.add_clear_cache_button(self.cur_pid)
+         self.initUI()
+ 
+@@ -253,7 +258,7 @@ class ShortFrameRes(QtGui.QWidget):
+         if result in [0,2]:
+             return 0
+         elif result == -1:
+-            msg = _("Certificate not found in the server database!")
++            msg = _("Certificate not found in the server!")
+         elif result == -2:
+             msg = _("Session not matching your certificate!")
+         elif result == 1:
+diff --git consolegui/application/View_Process.py consolegui/application/View_Process.py
+index 67e0696..a15a1c1 100755
+--- consolegui/application/View_Process.py
++++ consolegui/application/View_Process.py
+@@ -179,7 +179,7 @@ class ViewProc(QtGui.QWidget):
+         elif result == 2:
+             msg = _("Process completed")
+         elif result == -1:
+-            msg = _("Certificate not found in the server database!")
++            msg = _("Certificate not found in the server!")
+         elif result == -2:
+             msg = _("Session not matching your certificate!")
+         elif result == 1:
+diff --git consolegui/application/client_class.py consolegui/application/client_class.py
+index 61980a3..f6c682b 100755
+--- consolegui/application/client_class.py
++++ consolegui/application/client_class.py
+@@ -508,6 +508,20 @@ class CheckingClientHTTPSConnection(CheckingHTTPSConnection):
+                 self.sock = wrap_class(sock, ca_certs=self.ca_certs, **add)
+ 
+                 return 0
++	    except OpenSSL.SSL.Error, e:
++	        if type(e.message) == list:
++		    if type(e.message[0]) == tuple:
++		        for i in e.message[0]:
++			    sys.stdout.write(i+' ')
++			    sys.stdout.flush()
++			sys.stdout.write('\n')
++			sys.stdout.flush()
++                    else:
++		        _print (e.message)
++	        else:
++		    _print (e.message)
++                HTTPSClientCertTransport.filename = None
++                return 1
+             except Exception, e:
+                 _print (e)
+                 HTTPSClientCertTransport.filename = None
+@@ -811,4 +825,4 @@ def rm_ca_from_trusted(ca_cert):
+         for cert in new_system_ca_certs:
+             fd.write(cert)
+         fd.close()
+-    return 0
+\ No newline at end of file
++    return 0
+diff --git consolegui/application/helpwidget.py consolegui/application/helpwidget.py
+index 67354b8..b2b49ef 100755
+--- consolegui/application/helpwidget.py
++++ consolegui/application/helpwidget.py
+@@ -56,7 +56,8 @@ class HelpWgt(QtGui.QWidget):
+ 
+         self.image_lbl = QtGui.QLabel(self)
+ 
+-        filename = '/usr/share/icons/Calculate/128x128/cl-core.png'
++        filename = '/usr/share/icons/Calculate/128x128/apps/' \
++                   'calculate-console.png'
+         ir = QtGui.QImageReader(filename)
+ 
+         diff = ir.size().width() / 140.0
+diff --git consolegui/application/more.py consolegui/application/more.py
+index cb3895e..01c186c 100755
+--- consolegui/application/more.py
++++ consolegui/application/more.py
+@@ -2553,9 +2553,13 @@ class ClientServiceThread(QtCore.QThread):
+         self.close_flag = True
+ 
+ class ImageLabel(QtGui.QLabel):
+-    def __init__(self, image, height_image, parent = None):
++    def __init__(self, image, height_image, parent):
+         QtGui.QLabel.__init__(self)
+-        self._parent = parent
++#        self._parent = parent
++        save_path = os.path.join('/tmp', 'calculate-' + \
++                                 pwd.getpwuid(os.getuid()).pw_name)
++        if not os.path.isdir(save_path):
++            os.mkdir(save_path)
+         repeat = None
+ 
+         image_path, filename = image.rsplit('/',1)
+@@ -2582,8 +2586,9 @@ class ImageLabel(QtGui.QLabel):
+                 fix_image = QtGui.QLabel(self)
+                 img = Image.open(fix_image_path)
+                 img.thumbnail((img.size[0],height_image), Image.ANTIALIAS)
+-                temp_file = '/tmp/%s_fix' %filename
++                temp_file = os.path.join(save_path, '%s_fix' %filename)
+                 img.save(temp_file, "JPEG")
++                os.chmod(temp_file, 0666)
+                 fix_image.setFixedWidth(img.size[0])
+                 fix_image.setStyleSheet("background-image: url(%s); " \
+                                         %temp_file)
+@@ -2598,8 +2603,9 @@ class ImageLabel(QtGui.QLabel):
+ 
+         im = Image.open(image)
+         im.thumbnail((im.size[0],height_image), Image.ANTIALIAS)
+-        temp_file = '/tmp/%s_temp' %filename
++        temp_file = os.path.join(save_path, '%s_temp' %filename)
+         im.save(temp_file, "JPEG")
++        os.chmod(temp_file, 0666)
+         style += "background-image: url(%s); " %temp_file
+         style += "background-attachment: fixed; "
+         style += "background-repeat: %s; " %repeat_dict[repeat.lower()]
+diff --git consolegui/application/session_function.py consolegui/application/session_function.py
+index 09edc90..284addd 100755
+--- consolegui/application/session_function.py
++++ consolegui/application/session_function.py
+@@ -51,17 +51,17 @@ def client_post_cert (client, lang):
+     sid = get_sid(client)
+     results = client.service.post_cert()
+     if results[0][0] == -4:
+-        show_msg (_("Certificate not found in Server Database!"), _('Error'))
++        show_msg (_("Certificate not found in the server!"), _('Error'))
+         raise Exception()
+     sid, new_session = client_sid(sid, client, results[0][0], lang)
+     if new_session:
+         _print (_(" New session"))
+     else: _print (_(" Old session"))
+-    _print (_(" Your session ID = %s") %sid)
++    _print (_(" Your session ID: %s") %sid)
+     if results[0][0] == -3:
+         _print (_("Certificate not sent!"))
+     else:
+-        _print (_(" Your certifitate ID = %d") %(results[0][0]))
++        _print (_(" Your certifitate ID: %d") %(results[0][0]))
+         try:
+             if results[0][1] == -2:
+                 _print (_("Certificate expired"))
+@@ -92,14 +92,14 @@ class ViewSessionInfo (QtGui.QWidget):
+             return 1
+ 
+         sid = get_sid(client)
+-        self.layout.addWidget(LabelWordWrap(_('Your session ID = ')+str(sid),
++        self.layout.addWidget(LabelWordWrap(_('Your session ID: ')+str(sid),
+                                             self), 4,0,1,2)
+ 
+         if results[0][0] == -3:
+             self.layout.addWidget(LabelWordWrap(_('Certificate not sent!'),
+                                                 self), 5,0,1,2)
+         else:
+-            self.layout.addWidget(LabelWordWrap(_('Your certifitate id = ') \
++            self.layout.addWidget(LabelWordWrap(_('Your certifitate id: ') \
+                             + str(results[0][0]), self), 5,0,1,2)
+             try:
+                 if results[0][1] == -2:
+diff --git data/cl-console-gui.desktop data/cl-console-gui.desktop
+index ba5fda3..26387ba 100644
+--- data/cl-console-gui.desktop
++++ data/cl-console-gui.desktop
+@@ -6,4 +6,4 @@ Exec=cl-console-gui
+ Icon=calculate-console
+ Terminal=false
+ Type=Application
+-Categories=Settings;X-XFCE-SettingsDialog;X-XFCE-SystemSettings;
+\ No newline at end of file
++Categories=Settings;X-XFCE-SettingsDialog;X-XFCE-SystemSettings;GNOME;GTK;Utility;
+diff --git ru/console_gui.po ru/console_gui.po
+index 5320e04..4249d14 100644
+--- ru/console_gui.po
++++ ru/console_gui.po
+@@ -2,9 +2,9 @@ msgid ""
+ msgstr ""
+ "Project-Id-Version: console_gui_translate\n"
+ "Report-Msgid-Bugs-To: \n"
+-"POT-Creation-Date: 2012-06-27 14:19+0300\n"
+-"PO-Revision-Date: 2012-06-27 14:20+0300\n"
+-"Last-Translator: Denis <ds@mail.ru>\n"
++"POT-Creation-Date: 2012-07-06 09:36+0300\n"
++"PO-Revision-Date: 2012-07-06 09:37+0300\n"
++"Last-Translator: Denis Spiridonov <ds.calculate.ru>\n"
+ "Language-Team: \n"
+ "Language: \n"
+ "MIME-Version: 1.0\n"
+@@ -51,26 +51,27 @@ msgid "Once the session is closed, data on %d processes will be lost!"
+ msgstr "При закрытии сессии данные %d процессa будут удалены!"
+ 
+ #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/Box.py:419
+-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ConnectionTabs.py:173
+-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:702
+-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1959
+-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2286
++#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ConnectionTabs.py:178
++#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:701
++#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1958
++#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2285
+ msgid "Yes"
+ msgstr "Да"
+ 
+ #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/Box.py:420
+-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ConnectionTabs.py:174
+-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:704
+-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1961
+-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2287
++#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ConnectionTabs.py:179
++#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:703
++#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1960
++#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2286
+ msgid "No"
+ msgstr "Нет"
+ 
+ #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/Box.py:425
+ #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/create_cert.py:117
+-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:893
+-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1077
+-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2052
++#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ControlButton.py:151
++#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:892
++#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1076
++#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2051
+ #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/conf_connection.py:50
+ #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/conf_connection.py:132
+ msgid "Cancel"
+@@ -204,8 +205,8 @@ msgid "Country (a two-character tag)"
+ msgstr "Страна (2 символа)"
+ 
+ #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/create_cert.py:103
+-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1832
+-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2036
++#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1831
++#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2035
+ #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/conf_connection.py:36
+ #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/conf_connection.py:85
+ msgid "Password"
+@@ -222,7 +223,7 @@ msgstr "Поле \"Страна\" должно состоять из двух с
+ 
+ #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/create_cert.py:142
+ #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:141
+-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:231
++#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:234
+ msgid "Input error"
+ msgstr "Ошибка ввода"
+ 
+@@ -269,8 +270,9 @@ msgid "Well killed!"
+ msgstr "Успешно убит!"
+ 
+ #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/View_Process.py:182
+-msgid "Certificate not found in the server database!"
+-msgstr "Сертификат не найден в БД сервера!"
++#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:54
++msgid "Certificate not found in the server!"
++msgstr "Не найден сертификат на сервере!"
+ 
+ #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/View_Process.py:184
+ msgid "Session not matching your certificate!"
+@@ -280,36 +282,36 @@ msgstr "Сессия не соответствует Вашему сертифи
+ msgid "Failed to kill the process!"
+ msgstr "Не удалось завершить процесс!"
+ 
+-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ConnectionTabs.py:168
++#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ConnectionTabs.py:173
+ #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/helpwidget.py:53
+-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/helpwidget.py:138
+-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ControlButton.py:225
++#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/helpwidget.py:140
++#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ControlButton.py:238
+ #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:124
+ msgid "Close"
+ msgstr "Закрыть"
+ 
+-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ConnectionTabs.py:202
++#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ConnectionTabs.py:207
+ msgid "show this help message and exit"
+ msgstr "вывод этой справки и выход"
+ 
+-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ConnectionTabs.py:205
++#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ConnectionTabs.py:210
+ msgid "language for translation"
+ msgstr "язык для перевода"
+ 
+-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ConnectionTabs.py:208
++#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ConnectionTabs.py:213
+ msgid "call method"
+ msgstr "вызов метода"
+ 
+-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ConnectionTabs.py:211
++#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ConnectionTabs.py:216
+ msgid "port number"
+ msgstr "номер порта"
+ 
+-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ConnectionTabs.py:214
++#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ConnectionTabs.py:219
+ msgid "destination host"
+ msgstr "хост назначения"
+ 
+-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ConnectionTabs.py:360
+-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ConnectionTabs.py:433
++#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ConnectionTabs.py:365
++#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ConnectionTabs.py:438
+ msgid "New connection"
+ msgstr "Новое соединение"
+ 
+@@ -347,57 +349,57 @@ msgstr "Сайт Компании"
+ msgid "Distribution website"
+ msgstr "Сайт дистрибутива"
+ 
+-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/helpwidget.py:88
+-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/helpwidget.py:168
++#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/helpwidget.py:89
++#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/helpwidget.py:170
+ msgid "Calculate Console "
+ msgstr "Calculate Console "
+ 
+-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/helpwidget.py:117
++#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/helpwidget.py:119
+ msgid "Your name:"
+ msgstr "Ваше имя:"
+ 
+-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/helpwidget.py:120
++#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/helpwidget.py:122
+ msgid "Your email:"
+ msgstr "Ваш email:"
+ 
+-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/helpwidget.py:121
+-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/helpwidget.py:124
++#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/helpwidget.py:123
++#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/helpwidget.py:126
+ msgid "Please enter a valid email. "
+ msgstr "Пожалуйста, введите существующий адрес электронной почты."
+ 
+-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/helpwidget.py:122
+-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/helpwidget.py:125
++#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/helpwidget.py:124
++#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/helpwidget.py:127
+ msgid "If the email does not exist, you will receive no letter"
+ msgstr "Если электронная почта не существует, то письмо не дойдет"
+ 
+-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/helpwidget.py:127
++#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/helpwidget.py:129
+ msgid "Subject:"
+ msgstr "Тема:"
+ 
+-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/helpwidget.py:130
++#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/helpwidget.py:132
+ msgid "Message:"
+ msgstr "Сообщение:"
+ 
+-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/helpwidget.py:133
++#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/helpwidget.py:135
+ msgid "Send a Bug"
+ msgstr "Отправить ошибку"
+ 
+-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/helpwidget.py:183
+-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:181
+-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:332
+-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:395
++#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/helpwidget.py:185
++#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:180
++#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:331
++#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:394
+ msgid "Report Bug"
+ msgstr "Сообщить об ошибке"
+ 
+-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/helpwidget.py:205
++#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/helpwidget.py:207
+ msgid "Enter a valid email!"
+ msgstr "Введите существующий адрес электронной почты!"
+ 
+-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/helpwidget.py:230
++#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/helpwidget.py:232
+ msgid "Email sent!"
+ msgstr "Письмо отправлено!"
+ 
+-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/helpwidget.py:234
++#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/helpwidget.py:236
+ msgid "Error sending!"
+ msgstr "Ошибка отправки"
+ 
+@@ -405,26 +407,21 @@ msgstr "Ошибка отправки"
+ msgid "Previous"
+ msgstr "Назад"
+ 
+-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ControlButton.py:163
+-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2047
++#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ControlButton.py:175
++#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2046
+ #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/conf_connection.py:43
+ msgid "Ok"
+ msgstr "Ok"
+ 
+-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ControlButton.py:182
++#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ControlButton.py:194
+ msgid "Next"
+ msgstr "Далее"
+ 
+-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ControlButton.py:242
++#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ControlButton.py:255
+ msgid "Error when closing the process"
+ msgstr "Ошибка закрытия процесса"
+ 
+ #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:54
+-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:89
+-msgid "Certificate not found in Server Database!"
+-msgstr "Сертификат не найден в БД сервера!"
+-
+-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:54
+ msgid "Error"
+ msgstr "Ошибка"
+ 
+@@ -438,8 +435,8 @@ msgstr "Предыдущая сессия"
+ 
+ #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:60
+ #, python-format
+-msgid " Your session ID = %s"
+-msgstr "Номер Вашей сессии = %s"
++msgid " Your session ID: %s"
++msgstr "Номер Вашей сессии: %s"
+ 
+ #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:62
+ #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:99
+@@ -448,8 +445,8 @@ msgstr "Сертификат не отправлен!"
+ 
+ #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:64
+ #, python-format
+-msgid " Your certifitate ID = %d"
+-msgstr "Номер Вашего сертификата = %d"
++msgid " Your certifitate ID: %d"
++msgstr "Номер Вашего сертификата: %d"
+ 
+ #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:67
+ msgid "Certificate expired"
+@@ -463,21 +460,25 @@ msgstr "Время жизни сертификата истекает через
+ #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:82
+ #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:150
+ #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:184
+-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:238
+-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:255
++#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:241
++#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:258
+ #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/conf_connection.py:275
+ #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/conf_connection.py:278
+ #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/conf_connection.py:285
+ msgid "Not connected!"
+ msgstr "Соединение отсутствует!"
+ 
++#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:89
++msgid "Certificate not found in Server Database!"
++msgstr "Сертификат не найден в БД сервера!"
++
+ #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:95
+-msgid "Your session ID = "
+-msgstr "Номер Вашей сессии = "
++msgid "Your session ID: "
++msgstr "Номер Вашей сессии: "
+ 
+ #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:102
+-msgid "Your certifitate id = "
+-msgstr "Номер Вашего сертификата = "
++msgid "Your certifitate id: "
++msgstr "Номер Вашего сертификата: "
+ 
+ #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:106
+ msgid "expiry certificate has passed"
+@@ -490,11 +491,11 @@ msgstr "Время жизни сертификата истекает через
+ 
+ #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:113
+ msgid "Your IP address: "
+-msgstr "Ваш IP адрес - "
++msgstr "Ваш IP адрес: "
+ 
+ #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:115
+ msgid "Your MAC address: "
+-msgstr "Ваш MAC адрес - "
++msgstr "Ваш MAC адрес: "
+ 
+ #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:120
+ msgid "Clear your session cache"
+@@ -516,89 +517,79 @@ msgstr "Кэш сессии удалён"
+ msgid "User should be not root"
+ msgstr "Пользователь должен быть не root"
+ 
+-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:27
+-#, python-format
+-msgid "No module named %s"
+-msgstr "Нет модуля %s"
+-
+-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:28
+-#, python-format
+-msgid "Cannot import name %s"
+-msgstr "Не удалось импортировать %s"
+-
+-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:147
++#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:146
+ msgid "About"
+ msgstr "О программе"
+ 
+-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:164
++#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:163
+ msgid "Info"
+ msgstr "Справка"
+ 
+-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:490
+-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:601
++#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:489
++#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:600
+ msgid "Open"
+ msgstr "Открыть"
+ 
+-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:700
+-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1963
++#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:699
++#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1962
+ msgid "Auto"
+ msgstr "Авто"
+ 
+-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1028
++#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1027
+ msgid "Clear the table"
+ msgstr "Очистить таблицу"
+ 
+-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1129
+-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1268
+-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1334
+-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1447
++#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1128
++#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1267
++#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1333
++#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1446
+ msgid "Add a row"
+ msgstr "Добавить строку"
+ 
+-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1140
++#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1139
+ msgid "Recover the table"
+ msgstr "Восстановить таблицу"
+ 
+-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1184
++#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1183
+ msgid "Check all"
+ msgstr "Отметить все"
+ 
+-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1347
++#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1346
+ msgid "Reset"
+ msgstr "Сбросить изменения"
+ 
+-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1835
+-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2042
++#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1834
++#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2041
+ msgid "Repeat"
+ msgstr "Повтор"
+ 
+-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2156
++#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2155
+ msgid "Break the process"
+ msgstr "Прервать процесс"
+ 
+-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2320
++#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2319
+ #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/conf_connection.py:360
+ msgid "You do not have a certificate. Please generate a new request and get a new certificate from the server."
+ msgstr "У Вас нет сертификата. Пожалуйста, сгенерируйте запрос на сертитфикат и получите сертификат с сервера."
+ 
+-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2401
++#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2400
+ msgid "No methods available!"
+ msgstr "Нет доступных методов!"
+ 
+-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2430
++#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2429
+ msgid "No access to the file!"
+ msgstr "Нет доступа к файлу!"
+ 
+-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2433
++#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2432
+ msgid "Failed to obtain certificate data!"
+ msgstr "Не удалось получить данные сертификата!"
+ 
+-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2436
++#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2435
+ #, python-format
+ msgid "Permission denied %s"
+ msgstr "Доступ запрещён %s"
+ 
+-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2447
++#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2446
+ msgid "Error removing the session from the server"
+ msgstr "Ошибка удаления сессии на сервере"
+ 
+@@ -630,23 +621,23 @@ msgstr "Запрос на подпись сертификата"
+ 
+ #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:99
+ #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:140
+-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:209
+-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:230
++#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:212
++#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:233
+ msgid "Enter the hostname or the IP address"
+ msgstr "Введите имя хоста или IP-адрес"
+ 
+ #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:100
+-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:210
++#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:213
+ msgid "Incorrect \"Host\" value!"
+ msgstr "Ошибка в поле \"Хост\"!"
+ 
+ #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:105
+-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:215
++#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:218
+ msgid "Enter the port number"
+ msgstr "Введите номер порта"
+ 
+ #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:105
+-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:215
++#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:218
+ msgid "Incorrect \"Port\" value!"
+ msgstr "Ошибка в поле \"Порт\"!"
+ 
+@@ -665,7 +656,7 @@ msgstr "Отправить навый запрос на подпись серт
+ 
+ #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:134
+ #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:137
+-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:226
++#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:229
+ msgid "Closing. Connection error."
+ msgstr "Ошибка соединения. Закрываюсь."
+ 
+@@ -682,56 +673,66 @@ msgid "This server has not signed the certificate!"
+ msgstr "Сервер не подписал сертификат!"
+ 
+ #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:194
+-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:269
++#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:272
+ #, python-format
+-msgid "Your request ID = %s"
+-msgstr "Номер Вашего запроса = %s"
++msgid "Your request ID: %s"
++msgstr "Номер Вашего запроса: %s"
++
++#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:195
++#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:273
++msgid "To sign the certificate in the server use command"
++msgstr "Для подписания сертификата на сервере используется команда"
+ 
+-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:200
++#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:197
++#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:275
++msgid "Request"
++msgstr "Запрос"
++
++#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:203
+ #, python-format
+ msgid "Request not sent, or file %s deleted"
+ msgstr "Запрос не был послан, или удалён файл %s"
+ 
+-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:226
++#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:229
+ #, python-format
+ msgid "Error code: %s"
+ msgstr "Код ошибки: %s"
+ 
+-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:242
++#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:245
+ #, python-format
+ msgid "Request %s not found on the client’s side"
+ msgstr "Запрос %s не найден на стороне клиента"
+ 
+-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:265
++#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:268
+ msgid "Signature request rejected!"
+ msgstr "Запрос на подпись сертификата отвергнут!"
+ 
+-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:268
++#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:271
+ msgid "The request has not been reviewed yet."
+ msgstr "Запрос на подписание сертификата ещё не рассмотрен."
+ 
+-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:272
++#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:278
+ msgid "Either the request or the signature does not match the earlier ones."
+ msgstr "Запрос или подпись не соответствуют отправленным ранее."
+ 
+-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:279
++#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:285
+ #, python-format
+ msgid "Certificate saved. Your certificate ID = %s"
+ msgstr "Сертификат сохранён! Номер Вашего сертификата = %s"
+ 
+-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:330
++#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:336
+ msgid "Field \"CN\" not found in the root certificate!"
+ msgstr "Не найдено поле \"CN\" в корневом сертификате!"
+ 
+-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:343
++#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:349
+ msgid "Filename = "
+ msgstr "Имя файла ="
+ 
+-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:344
++#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:350
+ msgid "Root certificate added"
+ msgstr "Корневой сертификат добавлен"
+ 
+-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:346
++#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:352
+ msgid "File with CA certificates now exists"
+ msgstr "Файл с сертификатом удостоверяющего центра создан"
+ 
+@@ -776,38 +777,38 @@ msgstr "Пароль неверен"
+ msgid "You do not have a certificate or your certificate does not match the server certificate. Please generate a new request and get a new certificate from the server."
+ msgstr "У вас нет сертификата или ваш сертификат не соответствует серверному сертификату. Пожалуйста, сгенерируйте запрос на сертификат и получите сертификат с сервера."
+ 
+-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ShortFrameResult.py:367
+-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ShortFrameResult.py:368
+-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ShortFrameResult.py:442
++#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ShortFrameResult.py:372
++#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ShortFrameResult.py:373
++#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ShortFrameResult.py:447
+ #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/MainFrameResult.py:513
+ #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/MainFrameResult.py:514
+ msgid "Failed to get the frame from the server."
+ msgstr "Ошибка получения фрейма с сервера."
+ 
+-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ShortFrameResult.py:369
+-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ShortFrameResult.py:443
+-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ShortFrameResult.py:485
++#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ShortFrameResult.py:374
++#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ShortFrameResult.py:448
++#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ShortFrameResult.py:490
+ #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/MainFrameResult.py:515
+ msgid "Try resfeshing this page later."
+ msgstr "Пожалуйста, обновите эту страницу позже."
+ 
+-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ShortFrameResult.py:441
++#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ShortFrameResult.py:446
+ #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/MainFrameResult.py:588
+ msgid "Failed to get the complete frame from the server."
+ msgstr "Ошибка получения полного фрейма с сервера."
+ 
+-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ShortFrameResult.py:483
+-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ShortFrameResult.py:484
++#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ShortFrameResult.py:488
++#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ShortFrameResult.py:489
+ #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/MainFrameResult.py:638
+ msgid "Failed to get progress status from the server"
+ msgstr "Ошибка получения значения прогресса с сервера"
+ 
+-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ShortFrameResult.py:596
++#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ShortFrameResult.py:601
+ #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/MainFrameResult.py:786
+ msgid "Send"
+ msgstr "Отправить"
+ 
+-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ShortFrameResult.py:629
++#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ShortFrameResult.py:634
+ #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/MainFrameResult.py:819
+ msgid "Failed to send the message (password) to the server"
+ msgstr "Ошибка отправки сообщения (пароля) на сервер"
+@@ -915,28 +916,28 @@ msgstr "Ошибка при обновлении!"
+ msgid "Update successfully completed"
+ msgstr "Обновление успешно завершено"
+ 
+-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/TrayIcon.py:144
++#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/TrayIcon.py:145
+ msgid "System control"
+ msgstr "Управление системой"
+ 
+-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/TrayIcon.py:159
+-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/TrayIcon.py:257
++#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/TrayIcon.py:161
++#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/TrayIcon.py:259
+ msgid "Show/Hide Window"
+ msgstr "Показать/спрятать окно"
+ 
+-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/TrayIcon.py:161
+-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/TrayIcon.py:168
+-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/TrayIcon.py:293
+-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/TrayIcon.py:400
++#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/TrayIcon.py:163
++#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/TrayIcon.py:170
++#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/TrayIcon.py:295
++#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/TrayIcon.py:403
+ msgid "Exit program"
+ msgstr "Выйти из программы"
+ 
+-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/TrayIcon.py:166
+-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/TrayIcon.py:367
++#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/TrayIcon.py:168
++#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/TrayIcon.py:370
+ msgid "Program settings"
+ msgstr "Настройки программы"
+ 
+-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/TrayIcon.py:239
++#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/TrayIcon.py:241
+ msgid "Update is already running"
+ msgstr "Обновление уже запущено"
+ 
+@@ -1003,8 +1004,8 @@ msgid "Certificate add"
+ msgstr "Сертификат добавлен"
+ 
+ #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/client_class.py:184
+-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/client_class.py:616
+-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/client_class.py:621
++#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/client_class.py:630
++#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/client_class.py:635
+ #, python-format
+ msgid "error creating directory %s"
+ msgstr "Ошибка при создании директории %s"
+@@ -1063,15 +1064,15 @@ msgstr "Добавление сертификата"
+ msgid "Certificate not added to trusted"
+ msgstr "Сертификат не добавлен в доверенные"
+ 
+-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/client_class.py:698
++#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/client_class.py:712
+ msgid "CRL add"
+ msgstr "Список отзыва сертификатов добавлен"
+ 
+-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/client_class.py:787
++#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/client_class.py:801
+ msgid "CA certificate delete from user trusted certificate"
+ msgstr "Сертификат Центра Авторизации удалён из пользовательского списка доверенных сертификатов"
+ 
+-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/client_class.py:807
++#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/client_class.py:821
+ msgid "CA certificate delete from system trusted certificate"
+ msgstr "Сертификат Центра Авторизации удалён из системного списка доверенных сертификатов"
+ 
+@@ -1104,3 +1105,8 @@ msgstr " Шаг "
+ msgid "Run"
+ msgstr "Выполнение"
+ 
++#~ msgid "No module named %s"
++#~ msgstr "Нет модуля %s"
++
++#~ msgid "Cannot import name %s"
++#~ msgstr "Не удалось импортировать %s"
+diff --git setup.py setup.py
+index 1dac864..e0ea590 100755
+--- setup.py
++++ setup.py
+@@ -50,7 +50,6 @@ for size in [16,22,48,64,72,96,128]:
+     data_files.append(('/usr/share/icons/Calculate/%dx%d/apps' %(size,size),
+                    glob.glob('data/%dx%d/calculate-install.png' %(size,size))))
+ 
+-
+ var_data_files = []
+ 
+ __version__ = "0.1"

sys-apps/calculate-core/Manifest

@@ -10,6 +10,7 @@ AUX calculate-core-3.0.0_beta3-r2.patch 15034 RMD160 2fceabc3e4a598a78b3d04474de
 AUX calculate-core-3.0.0_beta3-r3.patch 15659 RMD160 4b537fb5c068346d766c2ec73158153a07738689 SHA1 106911502c3e3a79d6f50959b405946880a432b2 SHA256 a0b244e23aa304ecb176cfbc8325e1511300ec1d1c0a471f4bf1b1ae0efe6a72
 AUX calculate-core-3.0.0_beta3-r4.patch 15659 RMD160 4b537fb5c068346d766c2ec73158153a07738689 SHA1 106911502c3e3a79d6f50959b405946880a432b2 SHA256 a0b244e23aa304ecb176cfbc8325e1511300ec1d1c0a471f4bf1b1ae0efe6a72
 AUX calculate-core-3.0.0_beta3-r5.patch 67136 RMD160 4b8552e87852f413f8e7bee7b01f3c3d361d83b9 SHA1 e1a2fc245d4f97ac0e4f3eab1ec3487569f4ce43 SHA256 d6961aac1d93fd67b06cc6df85a601481b9015964f2edae8d595b3949f4bc048
+AUX calculate-core-3.0.0_beta3-r6.patch 67276 RMD160 d04515f289b339ea05da3688aa2c7d6bd3ca40fd SHA1 da0afb176755f887dc0b23809ccbbb2e91e5b9d6 SHA256 d7310a40bfb46fee70dea150d108e2a5b8a5cd4c5de8a36b16aab0ebe5bea853
 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 79293 RMD160 b2231a7da9b1a1785d4e71433b070c09f0799cb6 SHA1 5c74aea5ed04bb2acd66f5f9c8d5a44263d7c2b7 SHA256 1c803a201a7581182839245adc75922650d7c73e632f9e33e9585e2394907dba
@@ -30,6 +31,7 @@ EBUILD calculate-core-3.0.0_beta3-r2.ebuild 1142 RMD160 a66ee1f5aac3dc11aaa93378
 EBUILD calculate-core-3.0.0_beta3-r3.ebuild 1133 RMD160 7ab73ea3f3c3ebc5cd3443c9bdc94e928da7f5d3 SHA1 bc10bd3cb243da6ed1e3a988f51904a648f140b6 SHA256 d7dc1e4804f52353fc0692220a98dbf95f1184a5118de7dd9de171a96fd78b17
 EBUILD calculate-core-3.0.0_beta3-r4.ebuild 1148 RMD160 b4b8b7f724bded7140ade209a2abf8189b2b53a4 SHA1 9c0e32cd6be4b76368c055c7e933f8eb21db9284 SHA256 3cc9e193e1bf87fbc5de8c15510f8b531a679725a4084929d7d90926390beb6b
 EBUILD calculate-core-3.0.0_beta3-r5.ebuild 1116 RMD160 6829942f2f1cbed06835a20dbbd3c60024c5d9a1 SHA1 c9b9b3e3c8d1e22843d61bd983b131173060e390 SHA256 b3761a7e7cc721a248fab81e2b93fe70d00011731e20d65567b5c2bd888ad603
+EBUILD calculate-core-3.0.0_beta3-r6.ebuild 1116 RMD160 f5b29bc7753609bd020c2a39571d7aa5f1b7ba08 SHA1 15faadf4bff60aeff8df7abffb354f662cf137cf SHA256 90e70901576de5f0b7585b6e0d89086959871b4ff74ee0f4a3bb71c15398648c
 EBUILD calculate-core-3.0.0_beta3.ebuild 996 RMD160 adbcd22de2cf7c5a779fc6fe07a5c726a3135d4b SHA1 043996b37dbb5e6fdfe819ffd3135377ac8f824c SHA256 55a290b8fd6cb0c98e019917ca964754041b744b3790c53eef4bd39a52ed7c53
 EBUILD calculate-core-3.0.9999.ebuild 580 RMD160 e83a97ea90ff241c21111577d19b2f9d3969c17e SHA1 b431af0a8c098981cab841316e3f6d20595813b1 SHA256 e6f999684875c1d3a4eaaf75daba19d033c8fb32f36a4dd6b8e9682c3b757faa
 MISC ChangeLog 236 RMD160 edd02c5e4f0dac5e1383d48ba8142028b51bf534 SHA1 d22f18b34bdae22559bff15a113059d37820dfc7 SHA256 bbb9db87f501c1aa363583f5ae01e095020c3f600af2eb6388dbb547f6ce67b5

sys-apps/calculate-core/calculate-core-3.0.0_beta3-r6.ebuild

@@ -0,0 +1,47 @@
+# 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"
+IUSE="minimal"
+
+DEPEND="~sys-apps/calculate-lib-3.0.0_beta3
+	>=dev-python/soaplib-1.0
+	!minimal? ( dev-python/sudsds
+	net-libs/dslib
+	dev-python/pyopenssl
+	dev-libs/openssl
+	dev-python/m2crypto
+	dev-python/cherrypy )"
+RDEPEND="${DEPEND}"
+
+pkg_preinst() {
+	dosym /usr/sbin/cl-core /usr/sbin/cl-core-setup
+}
+
+pkg_postinst() {
+	einfo "For autoconfigure calculate-core for adminuser perform:"
+	einfo "  cl-core --bootstrap <username>"
+	einfo "For run calculate-core perform:"
+	einfo "  /etc/init.d/calculate-core start"
+	einfo "Add calcualte core to autorun:"
+	einfo "  rc-update add calculate-core boot"
+}
+
+src_unpack() {
+	unpack "${A}" 
+	cd "${S}" 
+
+	#some fix bug
+	epatch "${FILESDIR}/calculate-core-3.0.0_beta3-r6.patch"
+}

sys-apps/calculate-i18n/Manifest

@@ -1,5 +1,6 @@
 AUX calculate-i18n-3.0.0_beta3-r1.patch 747 RMD160 87ca12827537c66614613ff358066fa9eb2e6ebe SHA1 c7ef9698facb89fd4505d9ac939f161f244b8c82 SHA256 590b02b72d63dbd3c2d78afce857aeb1b9563734fab6252389943591f1e7e126
 AUX calculate-i18n-3.0.0_beta3-r2.patch 1664 RMD160 abc9ee137d7edd09c1197b81825c5e8a60b226c8 SHA1 dbaf389efe5d78f2113db3ff82c714b3826ead1f SHA256 fef2fee015a5882762fc8f0c82c3224567cbd765c48a9a0d66f72f9c48c92384
+AUX calculate-i18n-3.0.0_beta3-r3.patch 1836 RMD160 7738e6fb3e5a3310646853cde0d27819a38bba9f SHA1 cf633d3f8814b2b2ae2eb89bdb78b25aa7c03096 SHA256 03235a570e4620943fdf8c2074d1b1313758e96847dfaf4da0317b735a75a3e4
 DIST calculate-i18n-2.2.28.tar.bz2 32694 RMD160 5009c0d07fe7b91fdf11fd17fa805bebfdf6ba1d SHA1 8891f1ccc6368099c70b7569e9309dbd86d7b6ee SHA256 899cef9485c48747f5810394728d1abe8473312faba1a6a9d1fb1fe8f4989fb8
 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
@@ -16,6 +17,7 @@ EBUILD calculate-i18n-3.0.0_beta1-r1.ebuild 504 RMD160 279d8e6e04ec7030ab7b78b33
 EBUILD calculate-i18n-3.0.0_beta2.ebuild 504 RMD160 18d9c647ff50c3b5f7cb08ad2503c31befae9c4e SHA1 6c9a96bbc0840a401649769ac11a8d95656937bc SHA256 5cee7ade2861ff5eb5cfffefe8429ccf84b3a854daede5bf4bcdd3d0dea3a0f8
 EBUILD calculate-i18n-3.0.0_beta3-r1.ebuild 624 RMD160 1a16a5c56e04d4452e3e78f86882a17d1aafeea1 SHA1 c2d79ac3470a5c3c3237c18b7892ac018246f74d SHA256 4d2c4e94300416807e11bb6370775358fd4e0db880b8f39a33ca8b92f71d61e2
 EBUILD calculate-i18n-3.0.0_beta3-r2.ebuild 624 RMD160 1198c228ecc3ea6811b39ef01c40dc75b2353578 SHA1 3645b3219c19af324020b5ba3c21b533eac51a47 SHA256 c2431f848e5c9cb47806aed016e4b8e5cb8844b9112c7ffd81712f41cd4bfcf8
+EBUILD calculate-i18n-3.0.0_beta3-r3.ebuild 624 RMD160 c0a7a4ea34518c5f7e67d8e994d61d9fcaa4b809 SHA1 b775e2933255c61d53e06362d23cf7c4f12fca3c SHA256 86f4e4843152fca07971a834862902ccc924e88b8dac91ca2729e715bcac8f1b
 EBUILD calculate-i18n-3.0.0_beta3.ebuild 504 RMD160 5d7625706b8d2d342396c28f658fdba86300d5df SHA1 e6df2c4256f26e7b6f63532346311c0876da85a5 SHA256 75856220162150d442a10b2961c23036636a0f09abb134b71bf7e0410bc72afe
 EBUILD calculate-i18n-3.0.9999.ebuild 509 RMD160 6adb40d19ca007ea86d34ca187c1a696cb1970ee SHA1 05f86e6b1b6cf33701ca0bdc0ec390ad9af44951 SHA256 55fd4fde87b256127c8b6c59723883c4f86b36a747349fddb9253899b00e8b5e
 MISC ChangeLog 6171 RMD160 9803abc35a815c6bbf6ef23a3f9125f490dbc388 SHA1 c5e32c1c0f53761fbbf7d0e234fe5adcdb079eeb SHA256 250f8a9836f5a3bd98b6ed83196df7b7e2c1159f3079e628017c14bc44ef5963

sys-apps/calculate-i18n/calculate-i18n-3.0.0_beta3-r3.ebuild

@@ -0,0 +1,28 @@
+# 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_beta3"
+
+DEPEND="sys-devel/gettext
+	${DEPEND}"
+
+src_unpack() {
+	unpack "${A}"
+	cd "${S}"
+
+	# fix translate
+	epatch "${FILESDIR}/calculate-i18n-3.0.0_beta3-r3.patch"
+}

sys-apps/calculate-i18n/files/calculate-i18n-3.0.0_beta3-r3.patch

@@ -0,0 +1,44 @@
+diff --git ru/cl_install3.po ru/cl_install3.po
+index 57201f6..09db66e 100644
+--- ru/cl_install3.po
++++ ru/cl_install3.po
+@@ -735,7 +735,7 @@ msgid "user settings"
+ msgstr "настройки пользователей"
+ 
+ msgid "Boot configuration is not available on LiveCD"
+-msgstr "Разметка не доступна при авторазметке"
++msgstr "Настройка загрузки не доступна на LiveCD"
+ 
+ msgid "Configure only mutable parameters"
+ msgstr "Конфигурировать только изменяемые параметры"
+@@ -1084,3 +1084,30 @@ msgstr "Конфигурировать только динамические п
+ 
+ msgid "configure only dynamic parameters"
+ msgstr "конфигурировать только динамические параметры"
++
++msgid "Network interface, DHCP, IP address and network mask (example:%s)"
++msgstr "Сетевой интерфейс, HDCP, IP-адрес и маска сети (пример:%s)"
++
++msgid "select location templates %s"
++msgstr "выбор местонахождения шаблонов %s"
++
++msgid "locate must be from list 'overlay','local','remote','clt'"
++msgstr "местонахождение шаблонов должно быть из списка 'overlay','local','remote','clt'"
++
++msgid "Location templates"
++msgstr "Местонахождение шаблонов"
++
++msgid "Overlay templates"
++msgstr "Overlay шаблоны"
++
++msgid "Local templates"
++msgstr "Локальные шаблоны"
++
++msgid "Remote templates"
++msgstr "Удалённые шаблоны"
++
++msgid "clt templates"
++msgstr "clt шаблоны"
++
++msgid "PXE installation is available for Calculate Directory Server only"
++msgstr "Установка PXE доступна только на Calculate Directory Server"

sys-apps/calculate-install/Manifest

@@ -10,6 +10,7 @@ AUX calculate-install-3.0.0_beta3-fix_icon.patch 779 RMD160 405b17549a7ceba6249f
 AUX calculate-install-3.0.0_beta3-fix_names.patch 763 RMD160 9b4c044b7ea67ffc73676d378c0f93f5b530f8ce SHA1 ba84e484f0b8647609b17351ff59518ae1e32e4e SHA256 d6f4bea659d80a8638bd72bc450fa4025fa9a4a25666021af87db8fc3637b538
 AUX calculate-install-3.0.0_beta3-fix_pxe.patch 1045 RMD160 a5e5155a73c07a72de8707b867afff94edb251ba SHA1 5c3629465fec1c841dfac14b007f2e1faec9f8f5 SHA256 a782f429b7f518d05f526f4c64693591e22b63b54a41a08d2630c5bdc42ec426
 AUX calculate-install-3.0.0_beta3-locate_templates.patch 9426 RMD160 8fa31b7fb469abe84abf97a8ea924ec9b9a37075 SHA1 1c06d9a36ea5c4d192dcc8d6eedf2ed4008d017a SHA256 f2ddbc3c0b8108914ed00f3bda0e83186469a2d3f9eb2d4c22e9b4b830dd464f
+AUX calculate-install-3.0.0_beta3-r6.patch 10115 RMD160 5dda79bef4a0057bbaf54502b88367b87dc5e90f SHA1 5d16dac3c1cff3642c773c5ac3dfb1c9d3ed7132 SHA256 447ea5fbde01773f681fe099c186d09b547497d33b57799a70071dafd1f2a501
 DIST calculate-install-2.2.28.tar.bz2 82743 RMD160 2cea1e7ad861522bd4036d09767b24d7135e1c9f SHA1 f897ab83dd567f6b4b6317791d615d02adb52c70 SHA256 19f858d831c069e820463543d6f89a17ee4c1c185079ecff4c301594ee41107f
 DIST calculate-install-2.2.29.tar.bz2 82398 RMD160 c40620015f4a22bbc4217ec64545238c20d775c2 SHA1 41489657a19f3c60c93fada41c1c0b35d9d2d2cc SHA256 0d1b5fcca2711f31fbd5680dea652fa7765ad781529ba80c5fa92cf736d73d10
 DIST calculate-install-3.0.0_alpha5.tar.bz2 74890 RMD160 f39e866350697c52c17d13ed1be7dff10a507aeb SHA1 1d63d4da43b67ddd9e03bc194ea55ece071c3cb8 SHA256 4287277093b66d0d0a6c94f825d067a61cff99bd625dea7acc92110738c2bd08
@@ -35,6 +36,7 @@ EBUILD calculate-install-3.0.0_beta3-r2.ebuild 1256 RMD160 0c4e8531e408e3f37abf4
 EBUILD calculate-install-3.0.0_beta3-r3.ebuild 1333 RMD160 4bf358c03baa0b08d108025f2bad80eef3b157e9 SHA1 7d916e08e95f8f13d8e3e0a0f8071288344eb6d9 SHA256 752b4dddfd99a3358fa796ac03f57898d3fd261b4c441f5048a000d756c484d4
 EBUILD calculate-install-3.0.0_beta3-r4.ebuild 1412 RMD160 a2096973e848806097492a96348744b272875742 SHA1 3e5fd2d488826c8bc6639aa1a8cfcfa0cbfc3f83 SHA256 08d9622fd1e38f56e09cdd80d1ec2e5f866172537fc9bbbfa646c53c2fcc480c
 EBUILD calculate-install-3.0.0_beta3-r5.ebuild 1176 RMD160 bafa995373ea077070b7b2575c82117c2ff53f6d SHA1 a262874d9b93196d06d404e19e8f4101f0e5e811 SHA256 3621d76b19ae0532fab5292c46a2bbe2a12156615dc57600ff547deca2c1fdde
+EBUILD calculate-install-3.0.0_beta3-r6.ebuild 1162 RMD160 38cb5ea6b7fd89a9128361b589182710426e9011 SHA1 7ec7c48245ba9e79eceb355ded66c9f3365d28e4 SHA256 40f9c0651cdd0579d2821499964e5fd1b0c85edf540dffca1901682d66df1e04
 EBUILD calculate-install-3.0.0_beta3.ebuild 1033 RMD160 e282f795db7496ccfbc194e68240391f09d704d7 SHA1 4c905b8cef066842bba6e0028af6de4342870111 SHA256 f72ca6be4821bd38279295345d1253b494dc17ac2176b2f83026f4645b29dd05
 EBUILD calculate-install-3.0.9999.ebuild 609 RMD160 b1a02262dbab9319b6b916460646b526aa43a9a3 SHA1 0c64a92b658890fe5b4a5ee22f35eb143da377dc SHA256 d4cead60af00c67ddcb1aa01e2095437fb1bfe2ca7f717456048ad3e8f039a23
 MISC ChangeLog 33827 RMD160 6a48dba3484eeb1bf153dc1724e3ba441b51f89f SHA1 c42362523ac8b49b8ceb521110ba6b4d4ff01c74 SHA256 f31d9cca1055a4fbf38352f01ba9f72bf82597ff1a6436d211ac26d1acddb082

sys-apps/calculate-install/calculate-install-3.0.0_beta3-r6.ebuild

@@ -0,0 +1,48 @@
+# 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="pxe minimal"
+
+DEPEND="~sys-apps/calculate-lib-3.0.0_beta3
+	!<sys-apps/calculate-install-2.2.29
+	app-portage/layman
+	!app-misc/livecd-tools
+	sys-apps/iproute2[-minimal]
+	!minimal? ( sys-boot/grub
+	sys-apps/gptfdisk
+	>=sys-apps/util-linux-2.19.1
+	sys-fs/dosfstools
+	sys-fs/squashfs-tools
+	sys-block/parted )
+	pxe? ( sys-apps/calculate-server
+	net-ftp/tftp-hpa
+	net-misc/dhcp
+	net-fs/nfs-utils )"
+
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+	unpack "${A}"
+	cd "${S}"
+
+    # locate tamplates
+	epatch "${FILESDIR}/calculate-install-3.0.0_beta3-r6.patch"
+}
+
+pkg_postinst() {
+	einfo "For install wsdl for calculate-install perform:"
+	einfo "  cl-core --append-variable cl_wsdl=calculate-install"
+	einfo "  cl-core --append-variable cl_merges=calculate-install"
+}

sys-apps/calculate-install/files/calculate-install-3.0.0_beta3-r6.patch

@@ -0,0 +1,233 @@
+diff --git data/calculate data/calculate
+index 23aaee8..70b2ad8 100644
+--- data/calculate
++++ data/calculate
+@@ -111,10 +111,10 @@ configure_users() {
+ 
+ start() {
+ 	/usr/sbin/cl-core --append-variable cl_wsdl=calculate-install
+-	/usr/sbin/cl-core --append-variable cl_merge=calculate-install
++	/usr/sbin/cl-core --append-variable cl_merges=calculate-install
+ 	install_video_driver
+ 	LANG=C create_nonroot_user
+-	LANG=C /usr/sbin/cl-core --method configure_system --no-progress --live
++	LANG=C /usr/sbin/cl-core --method setup_system --no-progress --live
+ 	LANG=C configure_users
+ 
+ 	/usr/sbin/env-update
+diff --git install/cl_install.py install/cl_install.py
+index a5f53ef..59665ac 100644
+--- install/cl_install.py
++++ install/cl_install.py
+@@ -181,14 +181,60 @@ class Install(color_print):
+         """Apply templates for root of system."""
+         #self.clVars.Set("cl_root_path","/", True)
+         self.clVars.Set("cl_chroot_path","/", True)
+-        self.clTempl = ProgressTemplate(self.setProgress,self.clVars,
+-                                        cltFilter=False)
+-        dirsFiles = self.clTempl.applyTemplates()
+-        if self.clTempl.getError():
+-            self.printERROR(self.clTempl.getError())
+-            return False
+-        else:
+-            return dirsFiles
++        templates_locate = self.clVars.Get('cl_templates_locate')
++
++#        cltObj = True if 'clt' in templates_locate else False
++        dirs_list, files_list = ([],[])
++        listTemplatePaths = self.clVars.Get("cl_template_path")
++        for location in templates_locate:
++            if location in ("overlay", "local", "remote", "clt"):
++                if len(listTemplatePaths) != 3:
++                    self.printERROR(\
++                    _("Error in template variable 'cl_template_path=%s'")\
++                    %str(listTemplatePaths))
++                    return False
++                elif location == "local":
++                    self.clVars.Set("cl_template_path",
++                                    [listTemplatePaths[1]], True)
++                elif location == "remote":
++                    self.clVars.Set("cl_template_path",
++                               [listTemplatePaths[2]], True)
++                elif location == "overlay":
++                    self.clVars.Set("cl_template_path",
++                               [listTemplatePaths[0]], True)
++                elif location == "clt":
++#                    list_paths = ['/etc'] + \
++#                                    os.environ.get('CONFIG_PROTECT').split()
++#                    for template_path in list_paths:
++#                        if not os.path.isdir(template_path):
++#                            continue
++#                        print template_path
++#                        self.clVars.Set("cl_template_path",
++#                                        [template_path], True)
++#                        self.clTempl = ProgressTemplate(self.setProgress,
++#                                                    self.clVars,cltObj=True,
++#                                                    cltFilter=True)
++#
++#                        dirsFiles = self.clTempl.applyTemplates()
++#        #                cltObj = False
++#                        print dirsFiles
++#                        dirs_list += (dirsFiles[0])
++#                        files_list += (dirsFiles[1])
++                    continue
++
++                self.clTempl = ProgressTemplate(self.setProgress, self.clVars,
++                                                cltFilter=False)
++
++                dirsFiles = self.clTempl.applyTemplates()
++                dirs_list += (dirsFiles[0])
++                files_list += (dirsFiles[1])
++        try:
++            if self.clTempl.getError():
++                self.printERROR(self.clTempl.getError())
++                return False
++        except AttributeError:
++            pass
++        return (dirs_list, files_list)
+ 
+     def applyTemplatesFlash(self,directory):
+         """Apply templates for root of system."""
+@@ -940,9 +986,8 @@ class Install(color_print):
+                         self.applyTemplatesFlash('/')
+                     else:
+                         self.startTask(
+-                            _("Configuring flash installation"))
+-                        self.applyTemplatesFlash(targetDistr.getDirectory(),
+-                                                 progress=True)
++                            _("Configuring flash installation"),progress=True)
++                        self.applyTemplatesFlash(targetDistr.getDirectory())
+                     self.endTask()
+                     self.closeClTemplate()
+                 # change boot config
+diff --git install/cl_wsdl_install.py install/cl_wsdl_install.py
+index 3cb6710..27bba63 100644
+--- install/cl_wsdl_install.py
++++ install/cl_wsdl_install.py
+@@ -76,6 +76,7 @@ class InstallInfo(ClassSerializer):
+     cl_autopartition_root_size = String
+ 
+     cl_live = Boolean
++    cl_templates_locate = Array(String)
+ 
+     os_install_pxe = Boolean
+     os_install_pxe_path = String
+@@ -154,7 +155,8 @@ class Wsdl:
+ 
+     @rpc(Integer, InstallInfo, _returns = Array(ReturnedMessage))
+     @core_method(category=__('Installation'),title=__('System installation'),
+-        image='system-installer,applications-other,drive-harddisk',
++        image='calculate-install,system-installer,applications-other,'
++              'drive-harddisk',
+         gui=True,command='cl-install',
+         rights=['install'])
+     def install ( self, sid, info):
+@@ -476,6 +478,7 @@ class Wsdl:
+         dv.Set('cl_action','merge',True)
+         dv.addGroup(None,
+             normal=("cl_live",),
++            expert=('cl_templates_locate',),
+             next_label=_("Reconfigure"))
+         return dv
+ 
+diff --git install/variables/disk.py install/variables/disk.py
+index a2e8078..0c1f411 100644
+--- install/variables/disk.py
++++ install/variables/disk.py
+@@ -1602,7 +1602,7 @@ class VariableClInstallType(Variable):
+     def check(self,value):
+         if value == "flash" and \
+             len(self.Choice('os_install_disk_single')) == 1:
+-            raise VariableError(_("Flash drive not found"))
++            raise VariableError(_("Flash drive not found")+'.')
+ 
+ class VariableOsInstallDiskSingle(Variable):
+     """
+@@ -1639,5 +1639,6 @@ class VariableOsInstallDiskSingle(Variable):
+                                  self.Get('os_disk_parent')))
+         deviceParentMap = dict(self.ZipVars('os_device_dev','os_device_name'))
+         return map(lambda x:(x,"%s (%s)"%(x,
+-                        deviceParentMap.get(diskParentMap.get(x,x),_("Unknown")))),
++                        deviceParentMap.get(diskParentMap.get(x,x),
++                        _("Unknown")))),
+                     self.availDevs())+[("","")]
+diff --git install/variables/net.py install/variables/net.py
+index df2ae35..306a396 100644
+--- install/variables/net.py
++++ install/variables/net.py
+@@ -118,7 +118,9 @@ class VariableOsInstallNetData(NetHelper,TableVariable):
+ 
+     def init(self):
+         self.label = _("Addresses")
+-        self.help = _("IP address with network (example:%s)")%"192.168.1.1/24"
++#        self.help = _("IP address with network (example:%s)")%"192.168.1.1/24"
++        self.help = _("Network interface, DHCP, IP address and network mask "
++                      "(example:%s)")%" --ip eth0:off:192.168.1.1:24"
+ 
+ class VariableOsInstallNetHostname(NetHelper,Variable):
+     """
+@@ -585,12 +587,13 @@ class VariableOsInstallNetConf(NetHelper,Variable):
+         if filter(lambda x:x.lower() == ("networkmanager"),
+            listDirectory('/etc/runlevels/boot')+
+            listDirectory('/etc/runlevels/default')) \
+-            or self.Get('os_install_root_type') == "livecd":
++            or self.Get('os_root_type') == "livecd":
+             nm = "networkmanager"
+         else:
+             nm = ""
+         for val,comment in self.Get('os_install_net_conf_available'):
+-            if nm == val:
++            if nm == val and not (self.Get('os_root_dev') == '/dev/nfs' and \
++                self.Get('os_install_root_type') == "livecd"):
+                 return nm
+         else:
+             return "openrc"
+diff --git install/variables/system.py install/variables/system.py
+index 1efd0a8..06c16a9 100644
+--- install/variables/system.py
++++ install/variables/system.py
+@@ -458,6 +458,29 @@ class VariableClLive(Variable):
+         self.label = _("Configure only dynamic parameters")
+         self.help = _("configure only dynamic parameters")
+ 
++class VariableClTemplatesLocate(Variable):
++    """
++    Location templates
++    """
++    type = "choice-list"
++    value = ['overlay','local','remote','clt']
++    element = "selecttable"
++    opt = ["-l","--locate"]
++    metavalue = "TEMPLATES"
++    untrusted = True
++
++    def init(self):
++        self.label = _("Location templates")
++        self.help = _("select location templates %s") \
++                      %"'overlay','local','remote','clt'"
++
++    def choice(self):
++        return [
++		('overlay',_('Overlay templates')),
++		('local',_('Local templates')),
++		('remote',_('Remote templates')),
++		('clt',_('clt templates'))]
++
+ class VariableOsInstallPxe(ReadonlyVariable):
+     """
+     Installation for PXE loading
+@@ -469,11 +492,12 @@ class VariableOsInstallPxe(ReadonlyVariable):
+         if value == "on":
+             if self.Get('os_linux_system') != "server":
+                 raise VariableError(
+-                    _("PXE installation is available for server only"))
++                    _("PXE installation is available for Calculate Directory "
++                      "Server only")+'.')
+             for pkg in ['net-misc/dhcp','net-ftp/tftp-hpa','net-fs/nfs-utils']:
+                 if not isPkgInstalled(pkg):
+                     raise VariableError(
+-                        _("You must to install %s package for PXE installation")
++                       _("You must to install %s package for PXE installation")
+                             %pkg)
+             try:
+                 config = cl_template.iniParser('/etc/calculate/calculate.env')

sys-apps/calculate-utilities/Manifest

@@ -40,6 +40,7 @@ EBUILD calculate-utilities-3.0.0_beta2-r8.ebuild 642 RMD160 6f39b3b6d38cdd9cd881
 EBUILD calculate-utilities-3.0.0_beta2.ebuild 633 RMD160 ec597f645428dd6bb8df8ffe43dc2f18577384e7 SHA1 aa05142c4127e678acc8d44addd29ee7bedf152e SHA256 c565e855bea69e3e4678d31b845fdbbf6c6a98666d203f4f2b65f12fc79f0bc0
 EBUILD calculate-utilities-3.0.0_beta3-r1.ebuild 636 RMD160 a769205d1c3b26593f403a8f764f499fa3ec6688 SHA1 2e863861a30da988d34964eb6ec62e130e425c3e SHA256 f6b4792108f103937ca58a8467f0158d581f16ab7573438e7666197ae4866f08
 EBUILD calculate-utilities-3.0.0_beta3-r10.ebuild 651 RMD160 1ffe14cc0ded288a06c0701b939128da0ea30dee SHA1 495e5cabb0b698daa1fe606584ef46d4e69c84f9 SHA256 60dfbfb123163dd9a7faff9acbd24eb7b93422de8f7a3aecea8114a65d6bf10e
+EBUILD calculate-utilities-3.0.0_beta3-r11.ebuild 651 RMD160 826cf0a31bf08c75aad0406dd19a3c76f836f5f4 SHA1 cd829922a9475b2a3cf64195ddb17d28b2eb446c SHA256 241f76ca38b3770abb51b195481e923e1068fe036975af805dded9ce2f13874a
 EBUILD calculate-utilities-3.0.0_beta3-r2.ebuild 639 RMD160 5e61c132391e0a811539738205b8f0ad0232114f SHA1 cf9615eb3c681a69b0ec38d2d7db478134230dd5 SHA256 0750b8f33f7aef4a3e4461dc0e7ccb0b8fa307b36f433195538394f57e82b19e
 EBUILD calculate-utilities-3.0.0_beta3-r3.ebuild 639 RMD160 70e9337e2ad7b08a93ab17e8e654a45edba584a2 SHA1 9df65265dcc3bbf2b6feb3c11ebe45ef126838f9 SHA256 c33febf18bd72c1a06e46d6f5bc43789484f0ac07fa1445b0576f01bbaea7f0a
 EBUILD calculate-utilities-3.0.0_beta3-r4.ebuild 642 RMD160 a147f96cc176a66e6402c2ff4eedeee52e62a8b8 SHA1 932562d1dcbca5102441c97f83f9ab69ed8aa6a2 SHA256 d45b696822e7f218e26e489cb47bedaaafdd3b77fcff62c4625135620183ca30

sys-apps/calculate-utilities/calculate-utilities-3.0.0_beta3-r11.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_beta3-r6
+	=sys-apps/calculate-i18n-3.0.0_beta3-r3
+	=sys-apps/calculate-lib-3.0.0_beta3-r1
+	=sys-apps/calculate-core-3.0.0_beta3-r6
+	cl_consolegui? ( =sys-apps/calculate-console-gui-3.0.0_beta3-r4 )
+	cl_console? ( =sys-apps/calculate-console-3.0.0_beta3-r2 )
+"
+