Исправлена установка на btrfs.

11 years ago · 97e49b1823
parent 7838ec9e52
commit 97e49b1823
9 changed files with 1223 additions and 0 deletions
--- a/profiles/calculate.env
+++ b/profiles/calculate.env
@ -11,6 +11,7 @@ os_linux_name = Gentoo
 cl_autopartition_set = off
 cl_autopartition_table = gpt
 cl_autopartition_boot_size = 536870912
+cl_autopartition_bios_grub_size = 10485760
 cl_uuid_set = on
 os_install_ntp = ntp0.zenon.net
 os_install_proxy = ''
--- a/sys-apps/calculate-install/Manifest
+++ b/sys-apps/calculate-install/Manifest
@ -1,5 +1,6 @@
 AUX calculate-install-3.1.6-r3.patch 7194 SHA256 2e4d5e73bb4d18dbe25f508e0586c4dcfc409d9c0102223ee42ed66d90106c70 SHA512 74dc94b0614882923d104b19392e32925d7283e66f6d8e842e55cc1973ecadd6fba1d8a98c7e30d93ae577a1d2974fbe8c8cb54a20cb5fa05769743dbf65c1ab WHIRLPOOL 5147637209a4019b216a420b8a36365a849d17d809f163f83bec9bddd0ba8182be146a815d9ed5547e9ba0c19de17d70cfac0191eac148b1c23f6851cb6d4fd3
 AUX calculate-install-3.1.8-r1.patch 2525 SHA256 fd9d137e0c9448e06def0bbd8df8c7e1e20dd995658121f138efc91b588d0b7a SHA512 7e9b101ee9d3a88650b7bf1818abf387215dcb60282827e1a8d02fd4d8b0a2b9eab46d1273f31e31469ca25e03b626f651b51689b0f1831ed65bba49593ec059 WHIRLPOOL e78c1b26c08893bfc132f085b8b9b55b65fb6f349e62acaef13a8e437486276dd93b4108d347b755d5a25c0096fe3127abd715c371d4a8bc2236356a6912f6f0
+AUX calculate-install-3.1.8-r10.patch 41338 SHA256 d943c6a892c3954486d4fb85cfc4002d3f4eadcdefdf82e0d3bea9d693ea0c69 SHA512 be618f1b0db11c30a5bb32b46a09e376dbef63d7f540ec45528eaa14dff346285b7b8154996cdde19bb81051389784e7d89357fb5e3ae7aad03e3644a18c96a5 WHIRLPOOL 1ce34fc30d2b3b542a3e0210399c063a6eeb2dc852b11f5ff70cf8e04514a7e13b6fa43ef6379fb8e34b1198749a22bf36de3eb62de2985a8ffc8c49167ecb23
 AUX calculate-install-3.1.8-r2.patch 4745 SHA256 8a85bd667b53a2758375f85d29a60d9570199ff4317e1991ee58b2f7faffa232 SHA512 720b01b466f7fa32a712f4a5f99813ca1f7c4052e9c606bcbfa9e8d377d4ee5d6bb856839f5c76d6fe5f5bbd51632ad85626b63da119f6d49410253fd21420dd WHIRLPOOL 7776f9bfb7406a679ee7ad2f18ccbf48601de1c4ea2e4637c7e7418f559a7b931f13c50168eb9466dbc29b85fdc3f5b7622177e24bcad089e648cd5702cdc842
 AUX calculate-install-3.1.8-r3.patch 6265 SHA256 4786199915488125e4081350ac096c23284128e8451cce411351d761653b099a SHA512 0360d2b1b6e0fc4b87b86f3ddc405d589ad5f7237ed46cad0b050c3a8ac4c8d2dc4f78b126f7fa2a37313cebcec2b85094146280baddcc75e070874bf99eb466 WHIRLPOOL 18f6c7044c02d197493ae1380bad58561a1c72756c48e41330e92cff855f81aab85a01c6bcf69c359dcc0bb3b4bc7fd28f170b12f772a3fff4d1ae8c6e568adf
 AUX calculate-install-3.1.8-r4.patch 8350 SHA256 7e239492df59b943367954a735348753811e20f0e00bbf58c9dd4c9e175ea55d SHA512 6a68a10cd5c3827f5bab9ef83a3a60c3ff37cececb726918bc9b75d68d853204d3aaa3e66768f48b77a5d2ae2a9073de87a4c33b1626ab2e4da7ee50cc519efc WHIRLPOOL 1b0949d3c19f4a227722ef86108fb12394ff42707d70bf707a44687ce07b7da1a369210c6232730ebf02139501f53cfcb235968e4620d4272e10f037c5952f5b
@ -12,6 +13,7 @@ DIST calculate-install-3.1.6.tar.bz2 77530 SHA256 799a353e4ca01318508183d5e8a1eb
 DIST calculate-install-3.1.8.tar.bz2 76501 SHA256 316657b710dfd4b84784d88e34ae59cedf88bafea128be7538eef3408d9c1c69 SHA512 06c2c204ef704c7dbefbfb37d9ae994b32f75fe1b51ae9839a30c61a29914ef3cbe722bdfb6d3d049e345687cdffdb00a960d21e64ae7ca9cf39aa2c9bcfb317 WHIRLPOOL 18aef654b09c0fc8be177e34164af79e07c1148f0de23a6febd5f035cc33c76fb61583da8711328f13292d010dd6ab3d69a102002f2899d17d09ddaa59d71711
 EBUILD calculate-install-3.1.6-r3.ebuild 1042 SHA256 474f803954d18922a224ae9d754dcbd8dbba56be471e30f93db73b243fed5bb9 SHA512 0631ca0a9452835cae1d782385dd624464a06342f6332f6b8e85ccc4d53a9caf5b7cb066f9df2d31db42df7686484bd39d383969912247d7d7853e5e84876889 WHIRLPOOL 2f9f501c0ca24a94197ff354ab96aa08e26ffd12e5ce5c8261b2936178f33f3801fa100150c3d34ef7f2fa73a35b14f51b409c090a56c1021a6aaee38f1b9e70
 EBUILD calculate-install-3.1.8-r1.ebuild 1043 SHA256 b0cec08222a82f567cd8b4cd367e2e5241349cf2485bd23688824a3b8b788432 SHA512 afaeae1a025a1d3633263ecf61096d3bfc374bb2512272274cd87c005882e5c6b2ad4e21d54462412b492e348fecfba1dd6d3728070e80ee97075df8b23f9511 WHIRLPOOL 699c1f09ff83fe4dbb2fe81c802e80769848fe01efd7d82256d9444f48444e9ef39a0b1e106ba7fd789e953eb37d034827203a207739884323103ade5e271f9a
+EBUILD calculate-install-3.1.8-r10.ebuild 1044 SHA256 9e63b457fd08f28a6c570d091458035af86eeae0735aa86a83be7d9bae55a5f9 SHA512 a9c83bafbad5a75fec50d20dab03191aa06f2cad929b2b5b1f0835bdccc493e8265c940913d5ccef45479199189da22f7f3e3fe33945003972f58d209a83dd47 WHIRLPOOL 2dbc3ddb7ae249c19b9fe68add53cb11edfb64020f2cfd3c6c20f74794cb3ca9ab6f725d4757eaf19950c8ede9fc045122efe1fd33891c9be35fe3cc2ae265e6
 EBUILD calculate-install-3.1.8-r2.ebuild 1043 SHA256 1c7d5d8c73ee22f5735297b6d3907cfbb056e75a978a2e033862563a08e23de8 SHA512 7973f22afe6641d0d624c9df8a77d9d60dfe78da19ea3cc6c53c60ad64740b8f291b683ec0284d6aed204fc239aa1a0274ad41739b2ff44501264c3cc241f6f0 WHIRLPOOL d2abf60da36365820eb0c76415409d999546d6d0e31e1831c7347eaf483b1c375ba770c5d651ec5a0ed9b8a74fb027d98528d3ffdf9e775f5dae3b272b1bbfff
 EBUILD calculate-install-3.1.8-r3.ebuild 1043 SHA256 547c7cf9961711b2d21d414119f7ef1173b443541023f01d658f98e3a7e7d75b SHA512 09c617f331293ae40fabbedde3943e6e5007ee4d79a96d97fe49cfbcf208ce9e90db499c790a6ee5ce22f60ae7ffe527bf81bb63c30363d4a25c96a8b6ddb38a WHIRLPOOL 17c8038a0a34953826ea0f6644cca48dd09001fbc6db432ba375873143658cecd406b80625920d50d56230e811ee2845bca790c76afc14d78ae3880435499746
 EBUILD calculate-install-3.1.8-r4.ebuild 1043 SHA256 326a2601f0789b9c22538910bf65b08b7a9fe2837a6c20bfadf032936b30b6d5 SHA512 2a51ccf307c7d826a9227b5f39ad7e9468ff80ed5c3bb199805680b2f5f7cb60583633081d7d37e9349c4fa2d08e60796f925bdc673c868b3348d2abb80fced0 WHIRLPOOL 98d128f9f26a4e4af7b06f08bae94c53a120101c3adf3f467b73a6bac8367e10518afbc0ba8238aaa4f489972b332915f58f4b3b5ad9c3a5597e0002ef0f1fdb
--- a/sys-apps/calculate-install/calculate-install-3.1.8-r10.ebuild
+++ b/sys-apps/calculate-install/calculate-install-3.1.8-r10.ebuild
@ -0,0 +1,44 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="3"
+SUPPORT_PYTHON_ABIS="1"
+PYTHON_DEPEND="2:2.7"
+RESTRICT_PYTHON_ABIS="2.4 2.5 2.6 3.*"
+
+inherit distutils eutils
+
+SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate3/${PN}/${P}.tar.bz2"
+
+DESCRIPTION="The program of installation Calculate Linux"
+HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
+LICENSE="Apache-2.0"
+SLOT="3"
+KEYWORDS="amd64 x86"
+IUSE="pxe minimal"
+
+DEPEND="~sys-apps/calculate-core-3.1.8
+	!<sys-apps/calculate-install-2.2.29
+	app-portage/layman
+	>=virtual/udev-197
+	!app-misc/livecd-tools
+	sys-apps/iproute2[-minimal]
+	!minimal? ( sys-boot/grub
+	sys-apps/gptfdisk
+	>=sys-apps/util-linux-2.19.1
+	sys-fs/dosfstools
+	sys-fs/squashfs-tools
+	sys-block/parted )
+	pxe? ( sys-apps/calculate-server
+	net-ftp/tftp-hpa
+	net-misc/dhcp
+	net-fs/nfs-utils )"
+
+src_unpack() {
+    unpack "${A}"
+    cd "${S}"
+
+    # apply revision changes
+    epatch "${FILESDIR}/calculate-install-3.1.8-r10.patch"
+}
--- a/sys-apps/calculate-install/files/calculate-install-3.1.8-r10.patch
+++ b/sys-apps/calculate-install/files/calculate-install-3.1.8-r10.patch
--- a/sys-apps/calculate-lib/Manifest
+++ b/sys-apps/calculate-lib/Manifest
@ -8,6 +8,7 @@ AUX calculate-lib-3.1.6-r7.patch 18897 SHA256 c69c10571632e477023fbf7ccbb7ca9ed6
 AUX calculate-lib-3.1.8-r1.patch 964 SHA256 db745543d0c3f0e1830058b9adaec8a5ed81a85f554a87cfa4980b61083c169d SHA512 eba607867835038cfed70790dd76bb9b28a0ddef0209d277fd08ea654ff423e63d835c9581b1a14c8a59923b2bd25c4c3ad3d1720b6b04269a0e5173b108e30b WHIRLPOOL 6ae59d7b577f115f494776076a94a21f8d51b40bb02dc8e7d614acd411d9bde68c8c3b82b06e49abd869af433b364a5cc5e43ad7d752035e99027731be380e80
 AUX calculate-lib-3.1.8-r2.patch 1530 SHA256 bc7c287837bc1e2c360ff3c23bff6ce2c8d3a32a25aa90ec93e5a61afb7799c4 SHA512 c91f42e4540c04b307899a6716b6bb207ae810ae1fba71118886bf53fea411fbfbfa8340423008202e336e5fb4da5f4e8657e945b206eb4ee525b20ae9ebf921 WHIRLPOOL 0103b4365ac0e4f25bca20a16ebe994d6f9cb449f7c4862adbc97001c4fabf763d7f51b322a679ce02f4d8280bb602824f8b15ee6ab76eafee00ffdc563c510e
 AUX calculate-lib-3.1.8-r3.patch 3388 SHA256 b0d8c4611aa43dbc4c6a38b642d8970ef5abb040fb20e515abecd55e51d8316f SHA512 cb6fc3d87f244a172e2ebc089c8d73255d6aa70ce3e1f0039b03be0ed78c430bd9c3844bd4838ea1e02e8b248a0d203824014144874852843319c43aa9ae4885 WHIRLPOOL 11f73712ef5ed75ac6589ff7443b52e5c9a84c64e0ed6121fe05a3a5c54b8ee591e6f7deba96b935374d19367eab45757683d3e248eeb87b9c55845bd7297117
+AUX calculate-lib-3.1.8-r4.patch 3834 SHA256 ac7a72672237ab7ea52331fc9fca1e57000502e0b3ed601b8ef6147c81c40720 SHA512 ca76b00282c0155dfe1311fc3ca8eb37308c7465ebd358e9b09581e197b65c501d703c9e0bf97177f48ac141e854b0c4880b4dde62e7ec3711bd330c79d5493f WHIRLPOOL 80cb3116fdf7be95f77de750c0dee7fd7165ae29b76aa2bd33adff6d4c7366925ffe3c6fc7b8c00313bb5b562dcd36484bb993af6723bab6d8e5fd0c31fbf19b
 DIST calculate-lib-2.1.11.tar.bz2 61687 SHA256 62976c08d4fb4810389ace6f5a99abb5a962f6c8d9053ff943d0669480fb5599 SHA512 e3bc2168a55367cf19ad3a27921b53e5e845643238bf171209ab29752c91b5d4d338a2120774764ac1c79abd93f2deff8680f8faa1407940984ea9fd6a199e67 WHIRLPOOL 0ced92ea493dd8db02b0ae1514ebbb51ee76dc6f441b4a38c984c39da2121fb81dd1f2e840c4c5b71a117a12817a2a269d85676288202aa9801f69727e3338dc
 DIST calculate-lib-2.2.31.tar.bz2 120044 SHA256 ba38052d8b2349a1c60adc589a74eb8a3ffcbf6f3c1124e4c1fb0da3aa777f12 SHA512 902871b9159f2bcf7a0cc767fb6df5b19902fce6cf9468d96f902c383a422738b65debe3094c92d1f82de2124936496f89631c6eb9670da00807b63156b101b7 WHIRLPOOL 5179ee691519f3a7faa3135d040ad64bd6d67c026ebf39bb17f7d641130a2b58641d1fe5da4f6cfbd45d4442d93508f0a5f641ef2cd8c43e1a322aab3d11f4b9
 DIST calculate-lib-3.1.6.tar.bz2 121830 SHA256 4dc08cb3246b533466457905d4fe44f7ee75266b66e8450ac7ddcb3d210980ca SHA512 578fa1f731c7b04b061abb68de8ceeb5e7cadac6858a7957f3e57f7249f9692965419da05bf3c16963c397ddbbc10a24ea5c7feda043d067f0274a52d2c56dac WHIRLPOOL ceea0a4719a5c8a0ef645f51f07bb7f813ecdb8fe8ed99f574523cd2c242223eec92c6078a15192d40a366e8231b6ff72acf63954b7f48d0f34e5c006f2eca95
@ -20,6 +21,7 @@ EBUILD calculate-lib-3.1.6-r7.ebuild 824 SHA256 5aab4e17277422301131329e5204459c
 EBUILD calculate-lib-3.1.8-r1.ebuild 824 SHA256 efdb1261df13aafc739f3ba52f278752c80679ed5e562a6384b1fbbfa6cb669e SHA512 471c37f8bc2cb1926493d16acdbacac3d0c672ff6e0bfe59830e3bae1e5b9db1c47b23204128585740ae3b8c949a70d91ff7d9ed64d15b2a12e45d4772aae782 WHIRLPOOL afc350072644d970cf149e78fccc832e47347e89b4c02cfc8bb9f2f2257e8c07539c2b08b3f75a8d01d8bd75a9bf44cf171b3ded0c417ef08ed303948aa1bba9
 EBUILD calculate-lib-3.1.8-r2.ebuild 824 SHA256 b8cf32c88f2db3f0ca7a99aafc39dc7373dac01afb3a03d593d0a1a6b4dc1d20 SHA512 67ccef05830100d64cca2d449bed7a7fb52b21e75760f6e64e5247943ef5daadab123b23d452cd980c992fa308b072411b73ea3e93a20e1cd4a9dd28da3201e2 WHIRLPOOL 05554bfe0a2013447b81ba9deee432f63379b659fbb9feb07b43b15ec62e6cbfdd8c6bc7aedd3fa1ae094efdd78d1a321508e2d53e4a6e2219f70c1f4ef78e1f
 EBUILD calculate-lib-3.1.8-r3.ebuild 824 SHA256 4fb3da3e834c22ef032cd497e99835aa7ab2c31cb9e8cd0a6cdbe6b1cc5d2a15 SHA512 9c272fdf3e3178e7d6b0bb2ddd9526540458844012581c0fcdef3a7d979744324027ad00056104467d9d6dcc8ae1d5e4f3b884735c14dba04f8d1170e497e5a5 WHIRLPOOL 6467bab45690a1bf336c90f5e5f6ee7d95e51f06160983d6c38d857d182d06e28d7017f6c167956afa77af1f1a384831e3741e357911ad6083efcfa951afcc53
+EBUILD calculate-lib-3.1.8-r4.ebuild 824 SHA256 4e1232bd35181b158e3813c7623f4e93d77289d88247c825757a11a7f69d62dd SHA512 34705e68a1128a3409489bff1cfb3153e090edd4ab9c62ea961f0bcfa30f807d28aea6f653d3a221ae6f7c61608fd3e6a64596fc182c78d0ccd022d3787bd652 WHIRLPOOL 27fbe25423e9bf661efd5da606d0702793c901497da9d552457d4d75c47088cb7ba5bf405d56caaa82b173637efddce0b004ffc8f22d7543a15412eda5b17f19
 EBUILD calculate-lib-3.1.8.ebuild 690 SHA256 c89c29f5de3f70146e98f15035366506933f03e8a5066b1ad55aeccbebdeae2c SHA512 a7277c2e5fa64a5e5840be7fc8d3df9a31f41926386c5fe6a9bed31eeed6321af5881c218d9ce7eeb12aee518edb682b438e10397dcb815cc63645100430e43e WHIRLPOOL 8f19e4d46381e26fec81e20fa35599f4658b3891d6372c921a8b1354ad3b1821ea9c78f71caebf54610e0b5aacfb6e6ded018e155e1979322406a0ac1e823d09
 EBUILD calculate-lib-3.1.9999.ebuild 708 SHA256 a1d64b7f014831bf6b0a38928d53cb55758b7a12e5f3e98fffd28025ffacbce1 SHA512 3873859a791941d421e2338b437521955da383ce986408f1a951305e2dd75a1a4f771c9ec2caa096c5c8ea6a1776d6d0ed99e025ffa786ba029cafdbadfa439b WHIRLPOOL 5ac1a10b53f810ab527a0ebe52bc87e8397e61375cf6e0acbed89d8f6b8385e72bf234e0fdce479c3a3f1652bb6e520710ce9356750a97d644c0db0a33f6facb
 MISC ChangeLog 29851 SHA256 16ca15c794bce78eefc487ed372c3d4960078fbd4c5fe4524211688d0146ef97 SHA512 be6bdf290f391529dce0deb67bf9d367e42e407601dd581f7c08d082399b5860cff2a76d4d64dd876154d51e84f34499db06c715145ac64f78d168aae7e78dbf WHIRLPOOL 2561ccd1eefe3423d97c67aff5c0fe6c8ca624e527fb885b042c8e812194bb1635d7e7d7d86c534562eb780c6b9144d92e24893f2d0696cf8a34a6a912a45788
--- a/sys-apps/calculate-lib/calculate-lib-3.1.8-r4.ebuild
+++ b/sys-apps/calculate-lib/calculate-lib-3.1.8-r4.ebuild
@ -0,0 +1,36 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="3"
+SUPPORT_PYTHON_ABIS="1"
+PYTHON_DEPEND="2:2.7"
+RESTRICT_PYTHON_ABIS="2.4 2.5 2.6 3.*"
+
+inherit distutils eutils
+
+SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate3/${PN}/${P}.tar.bz2"
+
+DESCRIPTION="The 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}"
+
+src_unpack() {
+    unpack "${A}"
+    cd "${S}"
+
+    # apply revision changes
+    epatch "${FILESDIR}/calculate-lib-3.1.8-r4.patch"
+}
--- a/sys-apps/calculate-lib/files/calculate-lib-3.1.8-r4.patch
+++ b/sys-apps/calculate-lib/files/calculate-lib-3.1.8-r4.patch
@ -0,0 +1,107 @@
+diff --git calculate/lib/cl_ldap.py calculate/lib/cl_ldap.py
+index b4ee12c..802ded4 100644
+--- calculate/lib/cl_ldap.py
+++ calculate/lib/cl_ldap.py
+@@ -251,6 +251,7 @@ class ldapUser(_error):
+         if not self.ldapObj:
+             ldapObj = ldapFun(bindDn, bindPw, host)
+             if ldapObj.getError():
+                ldapObj.clearErrors()
+                 return False
+             # Устанавливаем у объекта соединение и объект LDAP функций
+             self.ldapObj = ldapObj
+diff --git calculate/lib/cl_template.py calculate/lib/cl_template.py
+index 14912c6..6c98b35 100644
+--- calculate/lib/cl_template.py
+++ calculate/lib/cl_template.py
+@@ -3948,7 +3948,7 @@ re.M|re.S)
+     def executeTemplate(self, code, execPath):
+         """Execute template"""
+         p = process(execPath,lang=self.objVar.Get('os_locale_locale'),
+-                    envdict=os.environ)
+                    envdict=dict(os.environ))
+         if "/bin/bash" in code.partition('\n')[0]:
+             p.write("""function translate() {
+ gettext -d cl_template "$*"
+diff --git calculate/lib/datavars.py calculate/lib/datavars.py
+index ffae995..1f57029 100644
+--- calculate/lib/datavars.py
+++ calculate/lib/datavars.py
+@@ -263,15 +263,15 @@ class Variable:
+         section = self.parent.iniCache[self.name]['section']
+         value = self.parent.unserialize(self.type,
+                                  value.encode('utf-8'))
+-        try:
+-            if self.mode == READONLY:
+-                raise VariableError(
+-                    _("Attempt to rewrite readonly variable %s")%
+-                    varname)
+-            else:
+        if self.mode == READONLY:
+            raise VariableError(
+                _("Attempt to rewrite readonly variable %s")%
+                self.name)
+        else:
+            try:
+                 self._set(value)
+-        except Exception as e:
+-            return False
+            except Exception as e:
+                return False
+         return True
+ 
+     def _get(self):
+@@ -1305,7 +1305,10 @@ class DataVars(SimpleDataVars):
+         if zipVars is None:
+             zipVars = self.ZipVars
+         if func:
+-            filterFunc = func
+            if func.func_code.co_argcount > 1:
+                filterFunc = lambda x:func(*x[:func.func_code.co_argcount])
+            else:
+                filterFunc = func
+         elif eq != None:
+             filterFunc = lambda x:x[0] == eq
+         elif ne != None:
+diff --git calculate/lib/utils/common.py calculate/lib/utils/common.py
+index a334435..9f13c66 100644
+--- calculate/lib/utils/common.py
+++ calculate/lib/utils/common.py
+@@ -51,7 +51,7 @@ class _error:
+         return True
+ 
+     def clearErrors(self):
+-        for i in range(len(self.error)):
+        while(self.error):
+             self.error.pop()
+ 
+ class _warning:
+diff --git calculate/lib/variables/__init__.py calculate/lib/variables/__init__.py
+index 5004263..6608f3a 100644
+--- calculate/lib/variables/__init__.py
+++ calculate/lib/variables/__init__.py
+@@ -41,4 +41,4 @@ class VariableClVer(ReadonlyVariable):
+     """
+     Package version
+     """
+-    value = "3.1.8"
+    value = "3.1.8.1"
+diff --git calculate/lib/variables/system.py calculate/lib/variables/system.py
+index 70bcf87..1e43f15 100644
+--- calculate/lib/variables/system.py
+++ calculate/lib/variables/system.py
+@@ -154,3 +154,14 @@ class VariableClUsedAction(ReadonlyVariable):
+     type = "table"
+     def get(self):
+         return []
+
+class VariableClSystemBootSet(ReadonlyVariable):
+    """
+    Система находится в стадии загрузки
+    """
+    type = "bool"
+    def get(self):
+        if os.readlink('/proc/self/fd/0') == '/dev/console':
+            return "on"
+        else:
+            return "off"
--- a/sys-apps/calculate-utilities/Manifest
+++ b/sys-apps/calculate-utilities/Manifest
@ -8,6 +8,7 @@ EBUILD calculate-utilities-3.1.8-r12.ebuild 764 SHA256 479823f019989ff30db871e21
 EBUILD calculate-utilities-3.1.8-r13.ebuild 764 SHA256 f840519f891b465bf26a120da731abc1272c139fadf917b12ad479c3e34eb8c8 SHA512 f01aea0b0a9a356b767508d0a1cb2d0b2fac54f953028b31904b27f4b728d05e457dc84c9992e7f2a7226c4355d8a89bd0ba456d5559f4394d6d0b0981e1d102 WHIRLPOOL 004970e0351a0d279e3f56cbcaba96168264cd480e8dfe0a2f49e61cc769819403da4df60f3e76409ca7c9e57b7526d8f70a870dcb20088091b0d1d212dcf635
 EBUILD calculate-utilities-3.1.8-r14.ebuild 764 SHA256 a6358d7abe6df1d1e702273d1281a9aeea4d8d164cd24a8382910ea5ff693a82 SHA512 701f79db7202b2d8e13bd20d2f3f40802eac5294bf673aa6c5e367a701d5b10694f68965c6fe8f4b9c791b026c9325c98c7c7860396639a744af7ee64d5ef338 WHIRLPOOL c42cc56b0b99a09524164d75c040312c6a4a4911104739f751eab9cba24c7dfb99e24ca0e9b533c148cc92e315e93e8d3d8db78fd206382451e79ac0b168adcc
 EBUILD calculate-utilities-3.1.8-r15.ebuild 764 SHA256 1749519559b69c322f95cc91e1dd5c094b544fd2f4225d0d40000ef3ab08046b SHA512 a1e918e2a5c38882b6554bdf53cee0bfbd6b7c2061a581e05434edc70704b6426a0adfb2afedb5d27b825d5a94f2b12ae60560bb8aad1028c9e74220247bc85b WHIRLPOOL ed70176e13d99c02f03f3a4bbcf7760053a92ce6965913b5063fc18c455ee9c0d0669395c0769397fd1f39c669dd868f43658f12e73a46929bfdae6a8cdefdcf
+EBUILD calculate-utilities-3.1.8-r16.ebuild 765 SHA256 884a68a4c527a02ce1c911f38e25e66616cd622f0e4fbe036df111e49716b150 SHA512 cc0e81ca175561cfa4bf3742641df2d6c86288a3290801a025a7938468af74dc5a3b57610ba5de2f15058ec9a393936b4891485fc84bc1fdf5ae173246de1d8a WHIRLPOOL 62b9677b39c598c21b5fcbfb4b3ba40d1b72b2b8a3bd66b789b7f8af90c5ecab14877888a8285e0e6657c5355845fc9b0436ec217a8bf41f7050d68c0b60a4d0
 EBUILD calculate-utilities-3.1.8-r2.ebuild 758 SHA256 6c9a774ddc3966c0a1c07c109eccd718fd11bfc3aea41b1b29035b07f0ec5ece SHA512 72a35fc08d180fb15bcd264c84d16887faa1b724875346b18bb48de598488c6b8eb5d763738690432b1f6184f66ed75fc2554fa4c125f57408153bc00d8d8c36 WHIRLPOOL 537c7dcd309a5a4365d3789992a93857ba0d706ae2448d4cb5abc6fc2173953df88a627595f7a3607c1c13d7401ab82e5d9e652896c957d8cc508ec4e4e153b2
 EBUILD calculate-utilities-3.1.8-r3.ebuild 758 SHA256 db3952e343cd4cd87b7e00f08ecb7fc78606599f125dd58f53a5414afff0dfd3 SHA512 fbb985c0b255fa6753c58f313c990e58dc95a4a0dd7d9c66f74d2a3d9f6cbf3a74c37efcbef8e34f050813213dc2db11eb19699984a4b7a6447067196eee5040 WHIRLPOOL 603c4c43325024f593da74918bc09c4eeb03743ebcc37c16dfca63ae8156b9ca4e44e73673f5700edf7ac662685f9173d6c4d0939fc0246eb821c4a9e4143890
 EBUILD calculate-utilities-3.1.8-r4.ebuild 758 SHA256 2b54aa30c5a8c59a364009c38382ff404ec93329a1acb1240ff05b4ac177b49b SHA512 81ec2e91290d0385a72bb681ceea15fc70e1813e81fcb53694b447efee193be690fbe7579263c767b15994573012070c49b8eec57af63587a307b61736e5bb76 WHIRLPOOL 37f238a04982487934b4b6372c1e03c70bf55a3106be5992facaffbe5dce6bd8638711631e9acee08346907414e7db8efc0c8e7972301088117644c25cdb3420
--- a/sys-apps/calculate-utilities/calculate-utilities-3.1.8-r16.ebuild
+++ b/sys-apps/calculate-utilities/calculate-utilities-3.1.8-r16.ebuild
@ -0,0 +1,26 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+DESCRIPTION="Calculate Utilities meta package"
+HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
+SRC_URI=""
+
+LICENSE="Apache-2.0"
+SLOT="3"
+KEYWORDS="amd64 x86"
+IUSE="cl_consolegui cl_client cl_desktop cl_console"
+
+RDEPEND="${RDEPEND}
+	=sys-apps/calculate-install-3.1.8-r10
+	=sys-apps/calculate-i18n-3.1.8
+	=sys-apps/calculate-lib-3.1.8-r4
+	=sys-apps/calculate-core-3.1.8-r2
+	=sys-apps/calculate-update-3.1.8
+	cl_client? ( =sys-apps/calculate-client-3.1.8-r6 )
+	cl_desktop? ( =sys-apps/calculate-desktop-3.1.8-r4 )
+	cl_consolegui? ( =sys-apps/calculate-console-gui-3.1.8 )
+	cl_console? ( =sys-apps/calculate-console-3.1.8 )
+"